diff --git a/etc/unused_wpt_results.py b/etc/unused_wpt_results.py index 31d410cdaa5..25292ac1827 100644 --- a/etc/unused_wpt_results.py +++ b/etc/unused_wpt_results.py @@ -17,7 +17,7 @@ import os -test_root = os.path.join('tests', 'wpt', 'web-platform-tests') +test_root = os.path.join('tests', 'wpt', 'tests') meta_root = os.path.join('tests', 'wpt', 'meta') missing_dirs = [] @@ -37,7 +37,7 @@ for base_dir, dir_names, files in os.walk(meta_root): missing_dirs += [meta_dir] continue - # Turn tests/wpt/meta/foo into tests/wpt/web-platform-tests/foo. + # Turn tests/wpt/meta/foo into tests/wpt/tests/foo. test_dir = os.path.join(test_root, os.path.relpath(meta_dir, meta_root)) if not os.path.exists(test_dir): missing_dirs += [meta_dir] @@ -48,7 +48,7 @@ for base_dir, dir_names, files in os.walk(meta_root): if fname in ['__dir__.ini', 'MANIFEST.json', 'mozilla-sync']: continue - # Turn tests/wpt/meta/foo/bar.html.ini into tests/wpt/web-platform-tests/foo/bar.html. + # Turn tests/wpt/meta/foo/bar.html.ini into tests/wpt/tests/foo/bar.html. test_dir = os.path.join(test_root, os.path.relpath(base_dir, meta_root)) test_file = os.path.join(test_dir, fname) if not os.path.exists(os.path.splitext(test_file)[0]): diff --git a/etc/wpt_result_analyzer.py b/etc/wpt_result_analyzer.py index b9209ea961d..9964304eb53 100644 --- a/etc/wpt_result_analyzer.py +++ b/etc/wpt_result_analyzer.py @@ -20,7 +20,7 @@ import os -test_root = os.path.join('tests', 'wpt', 'web-platform-tests') +test_root = os.path.join('tests', 'wpt', 'tests') meta_root = os.path.join('tests', 'wpt', 'meta') test_counts = {} diff --git a/python/mach_bootstrap.py b/python/mach_bootstrap.py index 2d3d5ce8a4f..448b8d00749 100644 --- a/python/mach_bootstrap.py +++ b/python/mach_bootstrap.py @@ -136,20 +136,14 @@ def wpt_path(is_firefox, topdir, *paths): def wptrunner_path(is_firefox, topdir, *paths): wpt_root = wpt_path(is_firefox, topdir) - if is_firefox: - rel = os.path.join(wpt_root, "tests", "tools", "wptrunner") - else: - rel = os.path.join(wpt_root, "web-platform-tests", "tools", "wptrunner") + rel = os.path.join(wpt_root, "tests", "tools", "wptrunner") return os.path.join(topdir, rel, *paths) def wptserve_path(is_firefox, topdir, *paths): wpt_root = wpt_path(is_firefox, topdir) - if is_firefox: - rel = os.path.join(wpt_root, "tests", "tools", "wptserve") - else: - rel = os.path.join(wpt_root, "web-platform-tests", "tools", "wptserve") + rel = os.path.join(wpt_root, "tests", "tools", "wptserve") return os.path.join(topdir, rel, *paths) diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index 1090ec65cab..e91e642605e 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -42,7 +42,7 @@ from distutils.dir_util import copy_tree SCRIPT_PATH = os.path.split(__file__)[0] PROJECT_TOPLEVEL_PATH = os.path.abspath(os.path.join(SCRIPT_PATH, "..", "..")) -WEB_PLATFORM_TESTS_PATH = os.path.join("tests", "wpt", "web-platform-tests") +WEB_PLATFORM_TESTS_PATH = os.path.join("tests", "wpt", "tests") SERVO_TESTS_PATH = os.path.join("tests", "wpt", "mozilla", "tests") CLANGFMT_CPP_DIRS = ["support/hololens/"] @@ -711,14 +711,14 @@ class WebPlatformTestsCreator(CommandBase): if test_url is None: print("""Test path %s is not in wpt directories: -tests/wpt/web-platform-tests for tests that may be shared +tests/wpt/tests for tests that may be shared tests/wpt/mozilla/tests for Servo-only tests""" % test_path) return 1 if reference_url is None: print("""Reference path %s is not in wpt directories: -testing/web-platform/tests for tests that may be shared -testing/web-platform/mozilla/tests for Servo-only tests""" % reference_path) +tests/wpt/tests for tests that may be shared +tests/wpt/mozilla/tests for Servo-only tests""" % reference_path) return 1 if os.path.exists(test_path) and not kwargs["overwrite"]: diff --git a/python/tidy/tidy.py b/python/tidy/tidy.py index e0d09f4a7ea..45e4260ab13 100644 --- a/python/tidy/tidy.py +++ b/python/tidy/tidy.py @@ -25,7 +25,7 @@ from .licenseck import OLD_MPL, MPL, APACHE, COPYRIGHT, licenses_toml, licenses_ TOPDIR = os.path.abspath(os.path.dirname(sys.argv[0])) WPT_PATH = os.path.join(".", "tests", "wpt") -SUITES = ["web-platform-tests", os.path.join("mozilla", "tests")] +SUITES = ["tests", os.path.join("mozilla", "tests")] def wpt_path(*args): @@ -40,7 +40,7 @@ URL_REGEX = re.compile(br'https?://(?:[-\w.]|(?:%[\da-fA-F]{2}))+') # Import wptmanifest only when we do have wpt in tree, i.e. we're not # inside a Firefox checkout. if os.path.isfile(WPT_MANIFEST_PATH): - sys.path.append(wpt_path("web-platform-tests", "tools", "wptrunner", "wptrunner")) + sys.path.append(wpt_path("tests", "tools", "wptrunner", "wptrunner")) from wptmanifest import parser, node # Default configs @@ -506,7 +506,7 @@ def check_manifest_dirs(config_file, print_text=True): print('\rChecking the wpt manifest file...') p = parser.parse(lines) - paths = rec_parse(wpt_path("web-platform-tests"), p) + paths = rec_parse(wpt_path("tests"), p) for idx, path in enumerate(paths): if '_mozilla' in path or '_webgl' in path or '_webgpu' in path: continue @@ -1152,7 +1152,7 @@ class WPTLint(LintRunner): if self.stylo or self.no_wpt: return - wpt_working_dir = os.path.abspath(os.path.join(WPT_PATH, "web-platform-tests")) + wpt_working_dir = os.path.abspath(os.path.join(WPT_PATH, "tests")) for suite in SUITES: files = list(self._get_wpt_files(suite)) if not files: diff --git a/python/wpt/__init__.py b/python/wpt/__init__.py index a8276a506ce..c816a605e73 100644 --- a/python/wpt/__init__.py +++ b/python/wpt/__init__.py @@ -15,7 +15,7 @@ import mozlog.commandline SCRIPT_PATH = os.path.abspath(os.path.dirname(__file__)) SERVO_ROOT = os.path.abspath(os.path.join(SCRIPT_PATH, "..", "..")) WPT_PATH = os.path.join(SERVO_ROOT, "tests", "wpt") -WPT_TOOLS_PATH = os.path.join(WPT_PATH, "web-platform-tests", "tools") +WPT_TOOLS_PATH = os.path.join(WPT_PATH, "tests", "tools") CERTS_PATH = os.path.join(WPT_TOOLS_PATH, "certs") sys.path.insert(0, WPT_TOOLS_PATH) diff --git a/python/wpt/exporter/common.py b/python/wpt/exporter/common.py index 307edce0276..7f2393ac0dc 100644 --- a/python/wpt/exporter/common.py +++ b/python/wpt/exporter/common.py @@ -9,7 +9,7 @@ # pylint: disable=missing-docstring -UPSTREAMABLE_PATH = "tests/wpt/web-platform-tests/" +UPSTREAMABLE_PATH = "tests/wpt/tests/" NO_SYNC_SIGNAL = "[no-wpt-sync]" OPENED_NEW_UPSTREAM_PR = ( diff --git a/python/wpt/manifestupdate.py b/python/wpt/manifestupdate.py index 05d380139db..b382624c7f2 100644 --- a/python/wpt/manifestupdate.py +++ b/python/wpt/manifestupdate.py @@ -34,7 +34,7 @@ def create_parser(): def update(check_clean=True, rebuild=False, **kwargs): logger = wptlogging.setup(kwargs, {"mach": sys.stdout}) kwargs = {"config": os.path.join(WPT_PATH, "config.ini"), - "manifest_path": os.path.join(WPT_PATH, "metadata"), + "manifest_path": os.path.join(WPT_PATH, "meta"), "tests_root": None, "metadata_root": None} diff --git a/python/wpt/tests/18746.diff b/python/wpt/tests/18746.diff index ad6150c1bdb..61997053969 100644 --- a/python/wpt/tests/18746.diff +++ b/python/wpt/tests/18746.diff @@ -1,7 +1,7 @@ -diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html +diff --git a/tests/wpt/tests/fetch/api/redirect/redirect-location.html b/tests/wpt/tests/fetch/api/redirect/redirect-location.html index ac35dea54c47..135ad21d15ab 100644 ---- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html -+++ b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html +--- a/tests/wpt/tests/fetch/api/redirect/redirect-location.html ++++ b/tests/wpt/tests/fetch/api/redirect/redirect-location.html @@ -13,4 +13,5 @@ diff --git a/python/wpt/tests/add-non-utf8-file.diff b/python/wpt/tests/add-non-utf8-file.diff index bd3b755d87d..5a6a684924d 100644 --- a/python/wpt/tests/add-non-utf8-file.diff +++ b/python/wpt/tests/add-non-utf8-file.diff @@ -1,7 +1,7 @@ -diff --git a/tests/wpt/web-platform-tests/non-utf8-file.txt b/tests/wpt/web-platform-tests/non-utf8-file.txt +diff --git a/tests/wpt/tests/non-utf8-file.txt b/tests/wpt/tests/non-utf8-file.txt new file mode 100644 index 0000000..5a992e0 --- /dev/null -+++ b/tests/wpt/web-platform-tests/non-utf8-file.txt ++++ b/tests/wpt/tests/non-utf8-file.txt @@ -0,0 +1 @@ -+foo bér ÿ " ++foo bér � " diff --git a/python/wpt/tests/does-not-apply-cleanly.diff b/python/wpt/tests/does-not-apply-cleanly.diff index aa49c3bafbe..904b4ed859d 100644 --- a/python/wpt/tests/does-not-apply-cleanly.diff +++ b/python/wpt/tests/does-not-apply-cleanly.diff @@ -1,7 +1,7 @@ -diff --git a/tests/wpt/web-platform-tests/css/css-test.html b/tests/wpt/web-platform-tests/css/css-test.html +diff --git a/tests/wpt/tests/css/css-test.html b/tests/wpt/tests/css/css-test.html index cffb6eb..6100a49 100644 ---- a/tests/wpt/web-platform-tests/css/out-of-sync-test.html -+++ b/tests/wpt/web-platform-tests/css/out-of-sync-test.html +--- a/tests/wpt/tests/css/out-of-sync-test.html ++++ b/tests/wpt/tests/css/out-of-sync-test.html @@ -1,3 +1,3 @@ -

css test!

diff --git a/python/wpt/tests/move-into-wpt.diff b/python/wpt/tests/move-into-wpt.diff index 02c437cdd7b..4e5656fc0f9 100644 --- a/python/wpt/tests/move-into-wpt.diff +++ b/python/wpt/tests/move-into-wpt.diff @@ -1,4 +1,4 @@ -diff --git a/tests/wpt/mozilla/tests/mozilla/mozilla-test.html b/tests/wpt/web-platform-tests/mozilla-test.html +diff --git a/tests/wpt/mozilla/tests/mozilla/mozilla-test.html b/tests/wpt/tests/mozilla-test.html similarity index 100% rename from tests/wpt/mozilla/tests/mozilla/mozilla-test.html -rename to tests/wpt/web-platform-tests/mozilla-test.html +rename to tests/wpt/tests/mozilla-test.html diff --git a/python/wpt/tests/move-out-of-wpt.diff b/python/wpt/tests/move-out-of-wpt.diff index f81541363ec..0b0d834c437 100644 --- a/python/wpt/tests/move-out-of-wpt.diff +++ b/python/wpt/tests/move-out-of-wpt.diff @@ -1,4 +1,4 @@ -diff --git a/tests/wpt/web-platform-tests/test.html b/tests/wpt/test.html +diff --git a/tests/wpt/tests/test.html b/tests/wpt/test.html similarity index 100% -rename from tests/wpt/web-platform-tests/test.html +rename from tests/wpt/tests/test.html rename to tests/wpt/test.html diff --git a/python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/css/css-test.html b/python/wpt/tests/servo-mock/tests/wpt/tests/css/css-test.html similarity index 100% rename from python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/css/css-test.html rename to python/wpt/tests/servo-mock/tests/wpt/tests/css/css-test.html diff --git a/python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/css/out-of-sync-test.html b/python/wpt/tests/servo-mock/tests/wpt/tests/css/out-of-sync-test.html similarity index 100% rename from python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/css/out-of-sync-test.html rename to python/wpt/tests/servo-mock/tests/wpt/tests/css/out-of-sync-test.html diff --git a/python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html b/python/wpt/tests/servo-mock/tests/wpt/tests/fetch/api/redirect/redirect-location.html similarity index 100% rename from python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html rename to python/wpt/tests/servo-mock/tests/wpt/tests/fetch/api/redirect/redirect-location.html diff --git a/python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/test.html b/python/wpt/tests/servo-mock/tests/wpt/tests/test.html similarity index 100% rename from python/wpt/tests/servo-mock/tests/wpt/web-platform-tests/test.html rename to python/wpt/tests/servo-mock/tests/wpt/tests/test.html diff --git a/python/wpt/tests/wpt.diff b/python/wpt/tests/wpt.diff index 37781cf488e..5bbbd74ee5e 100644 --- a/python/wpt/tests/wpt.diff +++ b/python/wpt/tests/wpt.diff @@ -1,7 +1,7 @@ -diff --git a/tests/wpt/web-platform-tests/css/css-test.html b/tests/wpt/web-platform-tests/css/css-test.html +diff --git a/tests/wpt/tests/css/css-test.html b/tests/wpt/tests/css/css-test.html index cffb6eb..6100a49 100644 ---- a/tests/wpt/web-platform-tests/css/css-test.html -+++ b/tests/wpt/web-platform-tests/css/css-test.html +--- a/tests/wpt/tests/css/css-test.html ++++ b/tests/wpt/tests/css/css-test.html @@ -1,3 +1,3 @@ -

css test!

diff --git a/servo-tidy.toml b/servo-tidy.toml index 9de03263305..1792ef74b3c 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -133,7 +133,7 @@ directories = [ "./support/android/apk", "./support/hololens", "./tests/wpt/harness", - "./tests/wpt/web-platform-tests", + "./tests/wpt/tests", "./tests/wpt/mozilla/tests/mozilla/referrer-policy", "./tests/wpt/mozilla/tests/webgl", "./python/tidy/tests", diff --git a/tests/wpt/README.md b/tests/wpt/README.md index d7f15f7c78a..d2d4d557129 100644 --- a/tests/wpt/README.md +++ b/tests/wpt/README.md @@ -9,7 +9,7 @@ In particular, this folder contains: * `config.ini`: some configuration for the web-platform-tests. * `include.ini`: the subset of web-platform-tests we currently run. -* `web-platform-tests`: copy of the web-platform-tests. +* `tests`: copy of the web-platform-tests. * `meta`: expected failures for the web-platform-tests we run. * `mozilla`: web-platform-tests that cannot be upstreamed. @@ -24,7 +24,7 @@ stdout. A subset of tests may be run by providing positional arguments to the mach command, either as filesystem paths or as test urls e.g. - ./mach test-wpt tests/wpt/web-platform-tests/dom/historical.html + ./mach test-wpt tests/wpt/tests/dom/historical.html to run the dom/historical.html test, or @@ -59,8 +59,8 @@ can only run one WPT server at a time. To fix this: 1. Follow the steps in [**Running the tests manually**](#running-the-tests-manually) 2. Add a `break` to [start_servers in serve.py](https://github.com/servo/servo/blob/ce92b7bfbd5855aac18cb4f8a8ec59048041712e/tests/wpt/web-platform-tests/tools/serve/serve.py#L745-L783) as follows: ``` - --- a/tests/wpt/web-platform-tests/tools/serve/serve.py - +++ b/tests/wpt/web-platform-tests/tools/serve/serve.py + --- a/tests/wpt/tests/tools/serve/serve.py + +++ b/tests/wpt/tests/tools/serve/serve.py @@ -746,6 +746,7 @@ def start_servers(logger, host, ports, paths, routes, bind_address, config, mp_context, log_handlers, **kwargs): servers = defaultdict(list) diff --git a/tests/wpt/config.ini b/tests/wpt/config.ini index 192253939a4..c6703452ddc 100644 --- a/tests/wpt/config.ini +++ b/tests/wpt/config.ini @@ -12,7 +12,7 @@ sync_path = sync run-info = . [manifest:upstream] -tests = web-platform-tests +tests = tests metadata = meta url-base = / diff --git a/tests/wpt/web-platform-tests/.azure-pipelines.yml b/tests/wpt/tests/.azure-pipelines.yml similarity index 100% rename from tests/wpt/web-platform-tests/.azure-pipelines.yml rename to tests/wpt/tests/.azure-pipelines.yml diff --git a/tests/wpt/web-platform-tests/.gitattributes b/tests/wpt/tests/.gitattributes similarity index 100% rename from tests/wpt/web-platform-tests/.gitattributes rename to tests/wpt/tests/.gitattributes diff --git a/tests/wpt/web-platform-tests/.github/META.yml b/tests/wpt/tests/.github/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/.github/META.yml rename to tests/wpt/tests/.github/META.yml diff --git a/tests/wpt/web-platform-tests/.github/dependabot.yml b/tests/wpt/tests/.github/dependabot.yml similarity index 100% rename from tests/wpt/web-platform-tests/.github/dependabot.yml rename to tests/wpt/tests/.github/dependabot.yml diff --git a/tests/wpt/web-platform-tests/.github/workflows/documentation.yml b/tests/wpt/tests/.github/workflows/documentation.yml similarity index 100% rename from tests/wpt/web-platform-tests/.github/workflows/documentation.yml rename to tests/wpt/tests/.github/workflows/documentation.yml diff --git a/tests/wpt/web-platform-tests/.github/workflows/epochs.yml b/tests/wpt/tests/.github/workflows/epochs.yml similarity index 100% rename from tests/wpt/web-platform-tests/.github/workflows/epochs.yml rename to tests/wpt/tests/.github/workflows/epochs.yml diff --git a/tests/wpt/web-platform-tests/.github/workflows/interfaces.yml b/tests/wpt/tests/.github/workflows/interfaces.yml similarity index 100% rename from tests/wpt/web-platform-tests/.github/workflows/interfaces.yml rename to tests/wpt/tests/.github/workflows/interfaces.yml diff --git a/tests/wpt/web-platform-tests/.github/workflows/manifest.yml b/tests/wpt/tests/.github/workflows/manifest.yml similarity index 100% rename from tests/wpt/web-platform-tests/.github/workflows/manifest.yml rename to tests/wpt/tests/.github/workflows/manifest.yml diff --git a/tests/wpt/web-platform-tests/.github/workflows/regen_certs.yml b/tests/wpt/tests/.github/workflows/regen_certs.yml similarity index 100% rename from tests/wpt/web-platform-tests/.github/workflows/regen_certs.yml rename to tests/wpt/tests/.github/workflows/regen_certs.yml diff --git a/tests/wpt/web-platform-tests/.gitignore b/tests/wpt/tests/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/.gitignore rename to tests/wpt/tests/.gitignore diff --git a/tests/wpt/web-platform-tests/.mailmap b/tests/wpt/tests/.mailmap similarity index 100% rename from tests/wpt/web-platform-tests/.mailmap rename to tests/wpt/tests/.mailmap diff --git a/tests/wpt/web-platform-tests/.taskcluster.yml b/tests/wpt/tests/.taskcluster.yml similarity index 100% rename from tests/wpt/web-platform-tests/.taskcluster.yml rename to tests/wpt/tests/.taskcluster.yml diff --git a/tests/wpt/web-platform-tests/.well-known/README.md b/tests/wpt/tests/.well-known/README.md similarity index 100% rename from tests/wpt/web-platform-tests/.well-known/README.md rename to tests/wpt/tests/.well-known/README.md diff --git a/tests/wpt/web-platform-tests/.well-known/attribution-reporting/debug/report-aggregate-attribution b/tests/wpt/tests/.well-known/attribution-reporting/debug/report-aggregate-attribution similarity index 100% rename from tests/wpt/web-platform-tests/.well-known/attribution-reporting/debug/report-aggregate-attribution rename to tests/wpt/tests/.well-known/attribution-reporting/debug/report-aggregate-attribution diff --git a/tests/wpt/web-platform-tests/.well-known/attribution-reporting/debug/report-event-attribution b/tests/wpt/tests/.well-known/attribution-reporting/debug/report-event-attribution similarity index 100% rename from tests/wpt/web-platform-tests/.well-known/attribution-reporting/debug/report-event-attribution rename to tests/wpt/tests/.well-known/attribution-reporting/debug/report-event-attribution diff --git a/tests/wpt/web-platform-tests/.well-known/attribution-reporting/debug/verbose b/tests/wpt/tests/.well-known/attribution-reporting/debug/verbose similarity index 100% rename from tests/wpt/web-platform-tests/.well-known/attribution-reporting/debug/verbose rename to tests/wpt/tests/.well-known/attribution-reporting/debug/verbose diff --git a/tests/wpt/web-platform-tests/.well-known/attribution-reporting/report-aggregate-attribution b/tests/wpt/tests/.well-known/attribution-reporting/report-aggregate-attribution similarity index 100% rename from tests/wpt/web-platform-tests/.well-known/attribution-reporting/report-aggregate-attribution rename to tests/wpt/tests/.well-known/attribution-reporting/report-aggregate-attribution diff --git a/tests/wpt/web-platform-tests/.well-known/attribution-reporting/report-event-attribution b/tests/wpt/tests/.well-known/attribution-reporting/report-event-attribution similarity index 100% rename from tests/wpt/web-platform-tests/.well-known/attribution-reporting/report-event-attribution rename to tests/wpt/tests/.well-known/attribution-reporting/report-event-attribution diff --git a/tests/wpt/web-platform-tests/.well-known/idp-proxy/META.yml b/tests/wpt/tests/.well-known/idp-proxy/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/.well-known/idp-proxy/META.yml rename to tests/wpt/tests/.well-known/idp-proxy/META.yml diff --git a/tests/wpt/web-platform-tests/.well-known/idp-proxy/README.md b/tests/wpt/tests/.well-known/idp-proxy/README.md similarity index 100% rename from tests/wpt/web-platform-tests/.well-known/idp-proxy/README.md rename to tests/wpt/tests/.well-known/idp-proxy/README.md diff --git a/tests/wpt/web-platform-tests/.well-known/idp-proxy/mock-idp.js b/tests/wpt/tests/.well-known/idp-proxy/mock-idp.js similarity index 100% rename from tests/wpt/web-platform-tests/.well-known/idp-proxy/mock-idp.js rename to tests/wpt/tests/.well-known/idp-proxy/mock-idp.js diff --git a/tests/wpt/web-platform-tests/.well-known/private-aggregation/debug/report-shared-storage b/tests/wpt/tests/.well-known/private-aggregation/debug/report-shared-storage similarity index 100% rename from tests/wpt/web-platform-tests/.well-known/private-aggregation/debug/report-shared-storage rename to tests/wpt/tests/.well-known/private-aggregation/debug/report-shared-storage diff --git a/tests/wpt/web-platform-tests/.well-known/private-aggregation/report-shared-storage b/tests/wpt/tests/.well-known/private-aggregation/report-shared-storage similarity index 100% rename from tests/wpt/web-platform-tests/.well-known/private-aggregation/report-shared-storage rename to tests/wpt/tests/.well-known/private-aggregation/report-shared-storage diff --git a/tests/wpt/web-platform-tests/.well-known/web-identity b/tests/wpt/tests/.well-known/web-identity similarity index 100% rename from tests/wpt/web-platform-tests/.well-known/web-identity rename to tests/wpt/tests/.well-known/web-identity diff --git a/tests/wpt/web-platform-tests/CODEOWNERS b/tests/wpt/tests/CODEOWNERS similarity index 100% rename from tests/wpt/web-platform-tests/CODEOWNERS rename to tests/wpt/tests/CODEOWNERS diff --git a/tests/wpt/web-platform-tests/CODE_OF_CONDUCT.md b/tests/wpt/tests/CODE_OF_CONDUCT.md similarity index 100% rename from tests/wpt/web-platform-tests/CODE_OF_CONDUCT.md rename to tests/wpt/tests/CODE_OF_CONDUCT.md diff --git a/tests/wpt/web-platform-tests/CONTRIBUTING.md b/tests/wpt/tests/CONTRIBUTING.md similarity index 100% rename from tests/wpt/web-platform-tests/CONTRIBUTING.md rename to tests/wpt/tests/CONTRIBUTING.md diff --git a/tests/wpt/web-platform-tests/FileAPI/Blob-methods-from-detached-frame.html b/tests/wpt/tests/FileAPI/Blob-methods-from-detached-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/Blob-methods-from-detached-frame.html rename to tests/wpt/tests/FileAPI/Blob-methods-from-detached-frame.html diff --git a/tests/wpt/web-platform-tests/FileAPI/BlobURL/cross-partition.tentative.https.html b/tests/wpt/tests/FileAPI/BlobURL/cross-partition.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/BlobURL/cross-partition.tentative.https.html rename to tests/wpt/tests/FileAPI/BlobURL/cross-partition.tentative.https.html diff --git a/tests/wpt/web-platform-tests/FileAPI/BlobURL/support/file_test2.txt b/tests/wpt/tests/FileAPI/BlobURL/support/file_test2.txt similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/BlobURL/support/file_test2.txt rename to tests/wpt/tests/FileAPI/BlobURL/support/file_test2.txt diff --git a/tests/wpt/web-platform-tests/FileAPI/BlobURL/test2-manual.html b/tests/wpt/tests/FileAPI/BlobURL/test2-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/BlobURL/test2-manual.html rename to tests/wpt/tests/FileAPI/BlobURL/test2-manual.html diff --git a/tests/wpt/web-platform-tests/FileAPI/FileReader/progress_event_bubbles_cancelable.html b/tests/wpt/tests/FileAPI/FileReader/progress_event_bubbles_cancelable.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/FileReader/progress_event_bubbles_cancelable.html rename to tests/wpt/tests/FileAPI/FileReader/progress_event_bubbles_cancelable.html diff --git a/tests/wpt/web-platform-tests/FileAPI/FileReader/support/file_test1.txt b/tests/wpt/tests/FileAPI/FileReader/support/file_test1.txt similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/FileReader/support/file_test1.txt rename to tests/wpt/tests/FileAPI/FileReader/support/file_test1.txt diff --git a/tests/wpt/web-platform-tests/FileAPI/FileReader/test_errors-manual.html b/tests/wpt/tests/FileAPI/FileReader/test_errors-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/FileReader/test_errors-manual.html rename to tests/wpt/tests/FileAPI/FileReader/test_errors-manual.html diff --git a/tests/wpt/web-platform-tests/FileAPI/FileReader/test_notreadableerrors-manual.html b/tests/wpt/tests/FileAPI/FileReader/test_notreadableerrors-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/FileReader/test_notreadableerrors-manual.html rename to tests/wpt/tests/FileAPI/FileReader/test_notreadableerrors-manual.html diff --git a/tests/wpt/web-platform-tests/FileAPI/FileReader/test_securityerrors-manual.html b/tests/wpt/tests/FileAPI/FileReader/test_securityerrors-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/FileReader/test_securityerrors-manual.html rename to tests/wpt/tests/FileAPI/FileReader/test_securityerrors-manual.html diff --git a/tests/wpt/web-platform-tests/FileAPI/FileReader/workers.html b/tests/wpt/tests/FileAPI/FileReader/workers.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/FileReader/workers.html rename to tests/wpt/tests/FileAPI/FileReader/workers.html diff --git a/tests/wpt/web-platform-tests/FileAPI/FileReaderSync.worker.js b/tests/wpt/tests/FileAPI/FileReaderSync.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/FileReaderSync.worker.js rename to tests/wpt/tests/FileAPI/FileReaderSync.worker.js diff --git a/tests/wpt/web-platform-tests/FileAPI/META.yml b/tests/wpt/tests/FileAPI/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/META.yml rename to tests/wpt/tests/FileAPI/META.yml diff --git a/tests/wpt/web-platform-tests/FileAPI/blob/Blob-array-buffer.any.js b/tests/wpt/tests/FileAPI/blob/Blob-array-buffer.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/blob/Blob-array-buffer.any.js rename to tests/wpt/tests/FileAPI/blob/Blob-array-buffer.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/blob/Blob-constructor-dom.window.js b/tests/wpt/tests/FileAPI/blob/Blob-constructor-dom.window.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/blob/Blob-constructor-dom.window.js rename to tests/wpt/tests/FileAPI/blob/Blob-constructor-dom.window.js diff --git a/tests/wpt/web-platform-tests/FileAPI/blob/Blob-constructor-endings.html b/tests/wpt/tests/FileAPI/blob/Blob-constructor-endings.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/blob/Blob-constructor-endings.html rename to tests/wpt/tests/FileAPI/blob/Blob-constructor-endings.html diff --git a/tests/wpt/web-platform-tests/FileAPI/blob/Blob-constructor.any.js b/tests/wpt/tests/FileAPI/blob/Blob-constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/blob/Blob-constructor.any.js rename to tests/wpt/tests/FileAPI/blob/Blob-constructor.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/blob/Blob-in-worker.worker.js b/tests/wpt/tests/FileAPI/blob/Blob-in-worker.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/blob/Blob-in-worker.worker.js rename to tests/wpt/tests/FileAPI/blob/Blob-in-worker.worker.js diff --git a/tests/wpt/web-platform-tests/FileAPI/blob/Blob-slice-overflow.any.js b/tests/wpt/tests/FileAPI/blob/Blob-slice-overflow.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/blob/Blob-slice-overflow.any.js rename to tests/wpt/tests/FileAPI/blob/Blob-slice-overflow.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/blob/Blob-slice.any.js b/tests/wpt/tests/FileAPI/blob/Blob-slice.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/blob/Blob-slice.any.js rename to tests/wpt/tests/FileAPI/blob/Blob-slice.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/blob/Blob-stream-byob-crash.html b/tests/wpt/tests/FileAPI/blob/Blob-stream-byob-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/blob/Blob-stream-byob-crash.html rename to tests/wpt/tests/FileAPI/blob/Blob-stream-byob-crash.html diff --git a/tests/wpt/web-platform-tests/FileAPI/blob/Blob-stream-sync-xhr-crash.html b/tests/wpt/tests/FileAPI/blob/Blob-stream-sync-xhr-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/blob/Blob-stream-sync-xhr-crash.html rename to tests/wpt/tests/FileAPI/blob/Blob-stream-sync-xhr-crash.html diff --git a/tests/wpt/web-platform-tests/FileAPI/blob/Blob-stream.any.js b/tests/wpt/tests/FileAPI/blob/Blob-stream.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/blob/Blob-stream.any.js rename to tests/wpt/tests/FileAPI/blob/Blob-stream.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/blob/Blob-text.any.js b/tests/wpt/tests/FileAPI/blob/Blob-text.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/blob/Blob-text.any.js rename to tests/wpt/tests/FileAPI/blob/Blob-text.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/file/File-constructor-endings.html b/tests/wpt/tests/FileAPI/file/File-constructor-endings.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/File-constructor-endings.html rename to tests/wpt/tests/FileAPI/file/File-constructor-endings.html diff --git a/tests/wpt/web-platform-tests/FileAPI/file/File-constructor.any.js b/tests/wpt/tests/FileAPI/file/File-constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/File-constructor.any.js rename to tests/wpt/tests/FileAPI/file/File-constructor.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/file/Worker-read-file-constructor.worker.js b/tests/wpt/tests/FileAPI/file/Worker-read-file-constructor.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/Worker-read-file-constructor.worker.js rename to tests/wpt/tests/FileAPI/file/Worker-read-file-constructor.worker.js diff --git a/tests/wpt/web-platform-tests/FileAPI/file/resources/echo-content-escaped.py b/tests/wpt/tests/FileAPI/file/resources/echo-content-escaped.py similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/resources/echo-content-escaped.py rename to tests/wpt/tests/FileAPI/file/resources/echo-content-escaped.py diff --git a/tests/wpt/web-platform-tests/FileAPI/file/send-file-form-controls.html b/tests/wpt/tests/FileAPI/file/send-file-form-controls.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/send-file-form-controls.html rename to tests/wpt/tests/FileAPI/file/send-file-form-controls.html diff --git a/tests/wpt/web-platform-tests/FileAPI/file/send-file-form-iso-2022-jp.html b/tests/wpt/tests/FileAPI/file/send-file-form-iso-2022-jp.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/send-file-form-iso-2022-jp.html rename to tests/wpt/tests/FileAPI/file/send-file-form-iso-2022-jp.html diff --git a/tests/wpt/web-platform-tests/FileAPI/file/send-file-form-punctuation.html b/tests/wpt/tests/FileAPI/file/send-file-form-punctuation.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/send-file-form-punctuation.html rename to tests/wpt/tests/FileAPI/file/send-file-form-punctuation.html diff --git a/tests/wpt/web-platform-tests/FileAPI/file/send-file-form-utf-8.html b/tests/wpt/tests/FileAPI/file/send-file-form-utf-8.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/send-file-form-utf-8.html rename to tests/wpt/tests/FileAPI/file/send-file-form-utf-8.html diff --git a/tests/wpt/web-platform-tests/FileAPI/file/send-file-form-windows-1252.html b/tests/wpt/tests/FileAPI/file/send-file-form-windows-1252.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/send-file-form-windows-1252.html rename to tests/wpt/tests/FileAPI/file/send-file-form-windows-1252.html diff --git a/tests/wpt/web-platform-tests/FileAPI/file/send-file-form-x-user-defined.html b/tests/wpt/tests/FileAPI/file/send-file-form-x-user-defined.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/send-file-form-x-user-defined.html rename to tests/wpt/tests/FileAPI/file/send-file-form-x-user-defined.html diff --git a/tests/wpt/web-platform-tests/FileAPI/file/send-file-form.html b/tests/wpt/tests/FileAPI/file/send-file-form.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/send-file-form.html rename to tests/wpt/tests/FileAPI/file/send-file-form.html diff --git a/tests/wpt/web-platform-tests/FileAPI/file/send-file-formdata-controls.any.js b/tests/wpt/tests/FileAPI/file/send-file-formdata-controls.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/send-file-formdata-controls.any.js rename to tests/wpt/tests/FileAPI/file/send-file-formdata-controls.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/file/send-file-formdata-punctuation.any.js b/tests/wpt/tests/FileAPI/file/send-file-formdata-punctuation.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/send-file-formdata-punctuation.any.js rename to tests/wpt/tests/FileAPI/file/send-file-formdata-punctuation.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/file/send-file-formdata-utf-8.any.js b/tests/wpt/tests/FileAPI/file/send-file-formdata-utf-8.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/send-file-formdata-utf-8.any.js rename to tests/wpt/tests/FileAPI/file/send-file-formdata-utf-8.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/file/send-file-formdata.any.js b/tests/wpt/tests/FileAPI/file/send-file-formdata.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/file/send-file-formdata.any.js rename to tests/wpt/tests/FileAPI/file/send-file-formdata.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/fileReader.any.js b/tests/wpt/tests/FileAPI/fileReader.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/fileReader.any.js rename to tests/wpt/tests/FileAPI/fileReader.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/filelist-section/filelist.html b/tests/wpt/tests/FileAPI/filelist-section/filelist.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/filelist-section/filelist.html rename to tests/wpt/tests/FileAPI/filelist-section/filelist.html diff --git a/tests/wpt/web-platform-tests/FileAPI/filelist-section/filelist_multiple_selected_files-manual.html b/tests/wpt/tests/FileAPI/filelist-section/filelist_multiple_selected_files-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/filelist-section/filelist_multiple_selected_files-manual.html rename to tests/wpt/tests/FileAPI/filelist-section/filelist_multiple_selected_files-manual.html diff --git a/tests/wpt/web-platform-tests/FileAPI/filelist-section/filelist_selected_file-manual.html b/tests/wpt/tests/FileAPI/filelist-section/filelist_selected_file-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/filelist-section/filelist_selected_file-manual.html rename to tests/wpt/tests/FileAPI/filelist-section/filelist_selected_file-manual.html diff --git a/tests/wpt/web-platform-tests/FileAPI/filelist-section/support/upload.txt b/tests/wpt/tests/FileAPI/filelist-section/support/upload.txt similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/filelist-section/support/upload.txt rename to tests/wpt/tests/FileAPI/filelist-section/support/upload.txt diff --git a/tests/wpt/web-platform-tests/FileAPI/filelist-section/support/upload.zip b/tests/wpt/tests/FileAPI/filelist-section/support/upload.zip similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/filelist-section/support/upload.zip rename to tests/wpt/tests/FileAPI/filelist-section/support/upload.zip diff --git a/tests/wpt/web-platform-tests/FileAPI/historical.https.html b/tests/wpt/tests/FileAPI/historical.https.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/historical.https.html rename to tests/wpt/tests/FileAPI/historical.https.html diff --git a/tests/wpt/web-platform-tests/FileAPI/idlharness-manual.html b/tests/wpt/tests/FileAPI/idlharness-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/idlharness-manual.html rename to tests/wpt/tests/FileAPI/idlharness-manual.html diff --git a/tests/wpt/web-platform-tests/FileAPI/idlharness.any.js b/tests/wpt/tests/FileAPI/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/idlharness.any.js rename to tests/wpt/tests/FileAPI/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/idlharness.html b/tests/wpt/tests/FileAPI/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/idlharness.html rename to tests/wpt/tests/FileAPI/idlharness.html diff --git a/tests/wpt/web-platform-tests/FileAPI/idlharness.worker.js b/tests/wpt/tests/FileAPI/idlharness.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/idlharness.worker.js rename to tests/wpt/tests/FileAPI/idlharness.worker.js diff --git a/tests/wpt/web-platform-tests/FileAPI/progress-manual.html b/tests/wpt/tests/FileAPI/progress-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/progress-manual.html rename to tests/wpt/tests/FileAPI/progress-manual.html diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/Determining-Encoding.any.js b/tests/wpt/tests/FileAPI/reading-data-section/Determining-Encoding.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/Determining-Encoding.any.js rename to tests/wpt/tests/FileAPI/reading-data-section/Determining-Encoding.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/FileReader-event-handler-attributes.any.js b/tests/wpt/tests/FileAPI/reading-data-section/FileReader-event-handler-attributes.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/FileReader-event-handler-attributes.any.js rename to tests/wpt/tests/FileAPI/reading-data-section/FileReader-event-handler-attributes.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/FileReader-multiple-reads.any.js b/tests/wpt/tests/FileAPI/reading-data-section/FileReader-multiple-reads.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/FileReader-multiple-reads.any.js rename to tests/wpt/tests/FileAPI/reading-data-section/FileReader-multiple-reads.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_abort.any.js b/tests/wpt/tests/FileAPI/reading-data-section/filereader_abort.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_abort.any.js rename to tests/wpt/tests/FileAPI/reading-data-section/filereader_abort.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_error.any.js b/tests/wpt/tests/FileAPI/reading-data-section/filereader_error.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_error.any.js rename to tests/wpt/tests/FileAPI/reading-data-section/filereader_error.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_events.any.js b/tests/wpt/tests/FileAPI/reading-data-section/filereader_events.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_events.any.js rename to tests/wpt/tests/FileAPI/reading-data-section/filereader_events.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_file-manual.html b/tests/wpt/tests/FileAPI/reading-data-section/filereader_file-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_file-manual.html rename to tests/wpt/tests/FileAPI/reading-data-section/filereader_file-manual.html diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_file_img-manual.html b/tests/wpt/tests/FileAPI/reading-data-section/filereader_file_img-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_file_img-manual.html rename to tests/wpt/tests/FileAPI/reading-data-section/filereader_file_img-manual.html diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_readAsArrayBuffer.any.js b/tests/wpt/tests/FileAPI/reading-data-section/filereader_readAsArrayBuffer.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_readAsArrayBuffer.any.js rename to tests/wpt/tests/FileAPI/reading-data-section/filereader_readAsArrayBuffer.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_readAsBinaryString.any.js b/tests/wpt/tests/FileAPI/reading-data-section/filereader_readAsBinaryString.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_readAsBinaryString.any.js rename to tests/wpt/tests/FileAPI/reading-data-section/filereader_readAsBinaryString.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_readAsDataURL.any.js b/tests/wpt/tests/FileAPI/reading-data-section/filereader_readAsDataURL.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_readAsDataURL.any.js rename to tests/wpt/tests/FileAPI/reading-data-section/filereader_readAsDataURL.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_readAsText.any.js b/tests/wpt/tests/FileAPI/reading-data-section/filereader_readAsText.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_readAsText.any.js rename to tests/wpt/tests/FileAPI/reading-data-section/filereader_readAsText.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_readystate.any.js b/tests/wpt/tests/FileAPI/reading-data-section/filereader_readystate.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_readystate.any.js rename to tests/wpt/tests/FileAPI/reading-data-section/filereader_readystate.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_result.any.js b/tests/wpt/tests/FileAPI/reading-data-section/filereader_result.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/filereader_result.any.js rename to tests/wpt/tests/FileAPI/reading-data-section/filereader_result.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/reading-data-section/support/blue-100x100.png b/tests/wpt/tests/FileAPI/reading-data-section/support/blue-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/reading-data-section/support/blue-100x100.png rename to tests/wpt/tests/FileAPI/reading-data-section/support/blue-100x100.png diff --git a/tests/wpt/web-platform-tests/FileAPI/support/Blob.js b/tests/wpt/tests/FileAPI/support/Blob.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/support/Blob.js rename to tests/wpt/tests/FileAPI/support/Blob.js diff --git a/tests/wpt/web-platform-tests/FileAPI/support/document-domain-setter.sub.html b/tests/wpt/tests/FileAPI/support/document-domain-setter.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/support/document-domain-setter.sub.html rename to tests/wpt/tests/FileAPI/support/document-domain-setter.sub.html diff --git a/tests/wpt/web-platform-tests/FileAPI/support/empty-document.html b/tests/wpt/tests/FileAPI/support/empty-document.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/support/empty-document.html rename to tests/wpt/tests/FileAPI/support/empty-document.html diff --git a/tests/wpt/web-platform-tests/FileAPI/support/historical-serviceworker.js b/tests/wpt/tests/FileAPI/support/historical-serviceworker.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/support/historical-serviceworker.js rename to tests/wpt/tests/FileAPI/support/historical-serviceworker.js diff --git a/tests/wpt/web-platform-tests/FileAPI/support/incumbent.sub.html b/tests/wpt/tests/FileAPI/support/incumbent.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/support/incumbent.sub.html rename to tests/wpt/tests/FileAPI/support/incumbent.sub.html diff --git a/tests/wpt/web-platform-tests/FileAPI/support/send-file-form-helper.js b/tests/wpt/tests/FileAPI/support/send-file-form-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/support/send-file-form-helper.js rename to tests/wpt/tests/FileAPI/support/send-file-form-helper.js diff --git a/tests/wpt/web-platform-tests/FileAPI/support/send-file-formdata-helper.js b/tests/wpt/tests/FileAPI/support/send-file-formdata-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/support/send-file-formdata-helper.js rename to tests/wpt/tests/FileAPI/support/send-file-formdata-helper.js diff --git a/tests/wpt/web-platform-tests/FileAPI/support/upload.txt b/tests/wpt/tests/FileAPI/support/upload.txt similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/support/upload.txt rename to tests/wpt/tests/FileAPI/support/upload.txt diff --git a/tests/wpt/web-platform-tests/FileAPI/support/url-origin.html b/tests/wpt/tests/FileAPI/support/url-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/support/url-origin.html rename to tests/wpt/tests/FileAPI/support/url-origin.html diff --git a/tests/wpt/web-platform-tests/FileAPI/unicode.html b/tests/wpt/tests/FileAPI/unicode.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/unicode.html rename to tests/wpt/tests/FileAPI/unicode.html diff --git a/tests/wpt/web-platform-tests/FileAPI/url/cross-global-revoke.sub.html b/tests/wpt/tests/FileAPI/url/cross-global-revoke.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/cross-global-revoke.sub.html rename to tests/wpt/tests/FileAPI/url/cross-global-revoke.sub.html diff --git a/tests/wpt/web-platform-tests/FileAPI/url/multi-global-origin-serialization.sub.html b/tests/wpt/tests/FileAPI/url/multi-global-origin-serialization.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/multi-global-origin-serialization.sub.html rename to tests/wpt/tests/FileAPI/url/multi-global-origin-serialization.sub.html diff --git a/tests/wpt/web-platform-tests/FileAPI/url/resources/create-helper.html b/tests/wpt/tests/FileAPI/url/resources/create-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/resources/create-helper.html rename to tests/wpt/tests/FileAPI/url/resources/create-helper.html diff --git a/tests/wpt/web-platform-tests/FileAPI/url/resources/create-helper.js b/tests/wpt/tests/FileAPI/url/resources/create-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/resources/create-helper.js rename to tests/wpt/tests/FileAPI/url/resources/create-helper.js diff --git a/tests/wpt/web-platform-tests/FileAPI/url/resources/fetch-tests.js b/tests/wpt/tests/FileAPI/url/resources/fetch-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/resources/fetch-tests.js rename to tests/wpt/tests/FileAPI/url/resources/fetch-tests.js diff --git a/tests/wpt/web-platform-tests/FileAPI/url/resources/revoke-helper.html b/tests/wpt/tests/FileAPI/url/resources/revoke-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/resources/revoke-helper.html rename to tests/wpt/tests/FileAPI/url/resources/revoke-helper.html diff --git a/tests/wpt/web-platform-tests/FileAPI/url/resources/revoke-helper.js b/tests/wpt/tests/FileAPI/url/resources/revoke-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/resources/revoke-helper.js rename to tests/wpt/tests/FileAPI/url/resources/revoke-helper.js diff --git a/tests/wpt/web-platform-tests/FileAPI/url/sandboxed-iframe.html b/tests/wpt/tests/FileAPI/url/sandboxed-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/sandboxed-iframe.html rename to tests/wpt/tests/FileAPI/url/sandboxed-iframe.html diff --git a/tests/wpt/web-platform-tests/FileAPI/url/unicode-origin.sub.html b/tests/wpt/tests/FileAPI/url/unicode-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/unicode-origin.sub.html rename to tests/wpt/tests/FileAPI/url/unicode-origin.sub.html diff --git a/tests/wpt/web-platform-tests/FileAPI/url/url-charset.window.js b/tests/wpt/tests/FileAPI/url/url-charset.window.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/url-charset.window.js rename to tests/wpt/tests/FileAPI/url/url-charset.window.js diff --git a/tests/wpt/web-platform-tests/FileAPI/url/url-format.any.js b/tests/wpt/tests/FileAPI/url/url-format.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/url-format.any.js rename to tests/wpt/tests/FileAPI/url/url-format.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/url/url-in-tags-revoke.window.js b/tests/wpt/tests/FileAPI/url/url-in-tags-revoke.window.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/url-in-tags-revoke.window.js rename to tests/wpt/tests/FileAPI/url/url-in-tags-revoke.window.js diff --git a/tests/wpt/web-platform-tests/FileAPI/url/url-in-tags.window.js b/tests/wpt/tests/FileAPI/url/url-in-tags.window.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/url-in-tags.window.js rename to tests/wpt/tests/FileAPI/url/url-in-tags.window.js diff --git a/tests/wpt/web-platform-tests/FileAPI/url/url-lifetime.html b/tests/wpt/tests/FileAPI/url/url-lifetime.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/url-lifetime.html rename to tests/wpt/tests/FileAPI/url/url-lifetime.html diff --git a/tests/wpt/web-platform-tests/FileAPI/url/url-reload.window.js b/tests/wpt/tests/FileAPI/url/url-reload.window.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/url-reload.window.js rename to tests/wpt/tests/FileAPI/url/url-reload.window.js diff --git a/tests/wpt/web-platform-tests/FileAPI/url/url-with-fetch.any.js b/tests/wpt/tests/FileAPI/url/url-with-fetch.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/url-with-fetch.any.js rename to tests/wpt/tests/FileAPI/url/url-with-fetch.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/url/url-with-xhr.any.js b/tests/wpt/tests/FileAPI/url/url-with-xhr.any.js similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/url-with-xhr.any.js rename to tests/wpt/tests/FileAPI/url/url-with-xhr.any.js diff --git a/tests/wpt/web-platform-tests/FileAPI/url/url_createobjecturl_file-manual.html b/tests/wpt/tests/FileAPI/url/url_createobjecturl_file-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/url_createobjecturl_file-manual.html rename to tests/wpt/tests/FileAPI/url/url_createobjecturl_file-manual.html diff --git a/tests/wpt/web-platform-tests/FileAPI/url/url_createobjecturl_file_img-manual.html b/tests/wpt/tests/FileAPI/url/url_createobjecturl_file_img-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/url_createobjecturl_file_img-manual.html rename to tests/wpt/tests/FileAPI/url/url_createobjecturl_file_img-manual.html diff --git a/tests/wpt/web-platform-tests/FileAPI/url/url_xmlhttprequest_img-ref.html b/tests/wpt/tests/FileAPI/url/url_xmlhttprequest_img-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/url_xmlhttprequest_img-ref.html rename to tests/wpt/tests/FileAPI/url/url_xmlhttprequest_img-ref.html diff --git a/tests/wpt/web-platform-tests/FileAPI/url/url_xmlhttprequest_img.html b/tests/wpt/tests/FileAPI/url/url_xmlhttprequest_img.html similarity index 100% rename from tests/wpt/web-platform-tests/FileAPI/url/url_xmlhttprequest_img.html rename to tests/wpt/tests/FileAPI/url/url_xmlhttprequest_img.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/META.yml b/tests/wpt/tests/IndexedDB/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/META.yml rename to tests/wpt/tests/IndexedDB/META.yml diff --git a/tests/wpt/web-platform-tests/IndexedDB/README.md b/tests/wpt/tests/IndexedDB/README.md similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/README.md rename to tests/wpt/tests/IndexedDB/README.md diff --git a/tests/wpt/web-platform-tests/IndexedDB/abort-in-initial-upgradeneeded.html b/tests/wpt/tests/IndexedDB/abort-in-initial-upgradeneeded.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/abort-in-initial-upgradeneeded.html rename to tests/wpt/tests/IndexedDB/abort-in-initial-upgradeneeded.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/back-forward-cache-open-connection.window.js b/tests/wpt/tests/IndexedDB/back-forward-cache-open-connection.window.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/back-forward-cache-open-connection.window.js rename to tests/wpt/tests/IndexedDB/back-forward-cache-open-connection.window.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/back-forward-cache-open-transaction.window.js b/tests/wpt/tests/IndexedDB/back-forward-cache-open-transaction.window.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/back-forward-cache-open-transaction.window.js rename to tests/wpt/tests/IndexedDB/back-forward-cache-open-transaction.window.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/bigint_value.htm b/tests/wpt/tests/IndexedDB/bigint_value.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/bigint_value.htm rename to tests/wpt/tests/IndexedDB/bigint_value.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/bindings-inject-keys-bypass-setters.html b/tests/wpt/tests/IndexedDB/bindings-inject-keys-bypass-setters.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/bindings-inject-keys-bypass-setters.html rename to tests/wpt/tests/IndexedDB/bindings-inject-keys-bypass-setters.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/bindings-inject-values-bypass-chain.html b/tests/wpt/tests/IndexedDB/bindings-inject-values-bypass-chain.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/bindings-inject-values-bypass-chain.html rename to tests/wpt/tests/IndexedDB/bindings-inject-values-bypass-chain.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/bindings-inject-values-bypass-setters.html b/tests/wpt/tests/IndexedDB/bindings-inject-values-bypass-setters.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/bindings-inject-values-bypass-setters.html rename to tests/wpt/tests/IndexedDB/bindings-inject-values-bypass-setters.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/blob-composite-blob-reads.any.js b/tests/wpt/tests/IndexedDB/blob-composite-blob-reads.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/blob-composite-blob-reads.any.js rename to tests/wpt/tests/IndexedDB/blob-composite-blob-reads.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/blob-contenttype.any.js b/tests/wpt/tests/IndexedDB/blob-contenttype.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/blob-contenttype.any.js rename to tests/wpt/tests/IndexedDB/blob-contenttype.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/blob-delete-objectstore-db.any.js b/tests/wpt/tests/IndexedDB/blob-delete-objectstore-db.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/blob-delete-objectstore-db.any.js rename to tests/wpt/tests/IndexedDB/blob-delete-objectstore-db.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/blob-valid-after-deletion.any.js b/tests/wpt/tests/IndexedDB/blob-valid-after-deletion.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/blob-valid-after-deletion.any.js rename to tests/wpt/tests/IndexedDB/blob-valid-after-deletion.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/blob-valid-before-commit.any.js b/tests/wpt/tests/IndexedDB/blob-valid-before-commit.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/blob-valid-before-commit.any.js rename to tests/wpt/tests/IndexedDB/blob-valid-before-commit.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/clone-before-keypath-eval.html b/tests/wpt/tests/IndexedDB/clone-before-keypath-eval.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/clone-before-keypath-eval.html rename to tests/wpt/tests/IndexedDB/clone-before-keypath-eval.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/close-in-upgradeneeded.html b/tests/wpt/tests/IndexedDB/close-in-upgradeneeded.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/close-in-upgradeneeded.html rename to tests/wpt/tests/IndexedDB/close-in-upgradeneeded.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/cursor-overloads.htm b/tests/wpt/tests/IndexedDB/cursor-overloads.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/cursor-overloads.htm rename to tests/wpt/tests/IndexedDB/cursor-overloads.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/database-names-by-origin.html b/tests/wpt/tests/IndexedDB/database-names-by-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/database-names-by-origin.html rename to tests/wpt/tests/IndexedDB/database-names-by-origin.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/delete-range.any.js b/tests/wpt/tests/IndexedDB/delete-range.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/delete-range.any.js rename to tests/wpt/tests/IndexedDB/delete-range.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/delete-request-queue.html b/tests/wpt/tests/IndexedDB/delete-request-queue.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/delete-request-queue.html rename to tests/wpt/tests/IndexedDB/delete-request-queue.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/error-attributes.html b/tests/wpt/tests/IndexedDB/error-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/error-attributes.html rename to tests/wpt/tests/IndexedDB/error-attributes.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/event-dispatch-active-flag.html b/tests/wpt/tests/IndexedDB/event-dispatch-active-flag.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/event-dispatch-active-flag.html rename to tests/wpt/tests/IndexedDB/event-dispatch-active-flag.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/file_support.sub.html b/tests/wpt/tests/IndexedDB/file_support.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/file_support.sub.html rename to tests/wpt/tests/IndexedDB/file_support.sub.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/fire-error-event-exception.html b/tests/wpt/tests/IndexedDB/fire-error-event-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/fire-error-event-exception.html rename to tests/wpt/tests/IndexedDB/fire-error-event-exception.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/fire-success-event-exception.html b/tests/wpt/tests/IndexedDB/fire-success-event-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/fire-success-event-exception.html rename to tests/wpt/tests/IndexedDB/fire-success-event-exception.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/fire-upgradeneeded-event-exception.html b/tests/wpt/tests/IndexedDB/fire-upgradeneeded-event-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/fire-upgradeneeded-event-exception.html rename to tests/wpt/tests/IndexedDB/fire-upgradeneeded-event-exception.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/get-databases.any.js b/tests/wpt/tests/IndexedDB/get-databases.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/get-databases.any.js rename to tests/wpt/tests/IndexedDB/get-databases.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/globalscope-indexedDB-SameObject.html b/tests/wpt/tests/IndexedDB/globalscope-indexedDB-SameObject.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/globalscope-indexedDB-SameObject.html rename to tests/wpt/tests/IndexedDB/globalscope-indexedDB-SameObject.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/historical.html b/tests/wpt/tests/IndexedDB/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/historical.html rename to tests/wpt/tests/IndexedDB/historical.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idb-binary-key-detached.htm b/tests/wpt/tests/IndexedDB/idb-binary-key-detached.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idb-binary-key-detached.htm rename to tests/wpt/tests/IndexedDB/idb-binary-key-detached.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idb-binary-key-roundtrip.htm b/tests/wpt/tests/IndexedDB/idb-binary-key-roundtrip.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idb-binary-key-roundtrip.htm rename to tests/wpt/tests/IndexedDB/idb-binary-key-roundtrip.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idb-explicit-commit-throw.any.js b/tests/wpt/tests/IndexedDB/idb-explicit-commit-throw.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idb-explicit-commit-throw.any.js rename to tests/wpt/tests/IndexedDB/idb-explicit-commit-throw.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idb-explicit-commit.any.js b/tests/wpt/tests/IndexedDB/idb-explicit-commit.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idb-explicit-commit.any.js rename to tests/wpt/tests/IndexedDB/idb-explicit-commit.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idb-partitioned-basic.tentative.sub.html b/tests/wpt/tests/IndexedDB/idb-partitioned-basic.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idb-partitioned-basic.tentative.sub.html rename to tests/wpt/tests/IndexedDB/idb-partitioned-basic.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idb-partitioned-coverage.tentative.sub.html b/tests/wpt/tests/IndexedDB/idb-partitioned-coverage.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idb-partitioned-coverage.tentative.sub.html rename to tests/wpt/tests/IndexedDB/idb-partitioned-coverage.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idb-partitioned-persistence.tentative.sub.html b/tests/wpt/tests/IndexedDB/idb-partitioned-persistence.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idb-partitioned-persistence.tentative.sub.html rename to tests/wpt/tests/IndexedDB/idb-partitioned-persistence.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idb_binary_key_conversion.htm b/tests/wpt/tests/IndexedDB/idb_binary_key_conversion.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idb_binary_key_conversion.htm rename to tests/wpt/tests/IndexedDB/idb_binary_key_conversion.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idb_webworkers.htm b/tests/wpt/tests/IndexedDB/idb_webworkers.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idb_webworkers.htm rename to tests/wpt/tests/IndexedDB/idb_webworkers.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-advance-continue-async.htm b/tests/wpt/tests/IndexedDB/idbcursor-advance-continue-async.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-advance-continue-async.htm rename to tests/wpt/tests/IndexedDB/idbcursor-advance-continue-async.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-advance-exception-order.html b/tests/wpt/tests/IndexedDB/idbcursor-advance-exception-order.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-advance-exception-order.html rename to tests/wpt/tests/IndexedDB/idbcursor-advance-exception-order.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-advance-invalid.htm b/tests/wpt/tests/IndexedDB/idbcursor-advance-invalid.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-advance-invalid.htm rename to tests/wpt/tests/IndexedDB/idbcursor-advance-invalid.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-advance.htm b/tests/wpt/tests/IndexedDB/idbcursor-advance.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-advance.htm rename to tests/wpt/tests/IndexedDB/idbcursor-advance.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-continue-exception-order.htm b/tests/wpt/tests/IndexedDB/idbcursor-continue-exception-order.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-continue-exception-order.htm rename to tests/wpt/tests/IndexedDB/idbcursor-continue-exception-order.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-continue.htm b/tests/wpt/tests/IndexedDB/idbcursor-continue.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-continue.htm rename to tests/wpt/tests/IndexedDB/idbcursor-continue.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-continuePrimaryKey-exception-order.htm b/tests/wpt/tests/IndexedDB/idbcursor-continuePrimaryKey-exception-order.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-continuePrimaryKey-exception-order.htm rename to tests/wpt/tests/IndexedDB/idbcursor-continuePrimaryKey-exception-order.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-continuePrimaryKey-exceptions.htm b/tests/wpt/tests/IndexedDB/idbcursor-continuePrimaryKey-exceptions.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-continuePrimaryKey-exceptions.htm rename to tests/wpt/tests/IndexedDB/idbcursor-continuePrimaryKey-exceptions.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-continuePrimaryKey.htm b/tests/wpt/tests/IndexedDB/idbcursor-continuePrimaryKey.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-continuePrimaryKey.htm rename to tests/wpt/tests/IndexedDB/idbcursor-continuePrimaryKey.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-delete-exception-order.htm b/tests/wpt/tests/IndexedDB/idbcursor-delete-exception-order.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-delete-exception-order.htm rename to tests/wpt/tests/IndexedDB/idbcursor-delete-exception-order.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-direction-index-keyrange.htm b/tests/wpt/tests/IndexedDB/idbcursor-direction-index-keyrange.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-direction-index-keyrange.htm rename to tests/wpt/tests/IndexedDB/idbcursor-direction-index-keyrange.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-direction-index.htm b/tests/wpt/tests/IndexedDB/idbcursor-direction-index.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-direction-index.htm rename to tests/wpt/tests/IndexedDB/idbcursor-direction-index.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-direction-objectstore-keyrange.htm b/tests/wpt/tests/IndexedDB/idbcursor-direction-objectstore-keyrange.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-direction-objectstore-keyrange.htm rename to tests/wpt/tests/IndexedDB/idbcursor-direction-objectstore-keyrange.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-direction-objectstore.htm b/tests/wpt/tests/IndexedDB/idbcursor-direction-objectstore.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-direction-objectstore.htm rename to tests/wpt/tests/IndexedDB/idbcursor-direction-objectstore.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-direction.htm b/tests/wpt/tests/IndexedDB/idbcursor-direction.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-direction.htm rename to tests/wpt/tests/IndexedDB/idbcursor-direction.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-iterating-update.htm b/tests/wpt/tests/IndexedDB/idbcursor-iterating-update.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-iterating-update.htm rename to tests/wpt/tests/IndexedDB/idbcursor-iterating-update.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-key.htm b/tests/wpt/tests/IndexedDB/idbcursor-key.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-key.htm rename to tests/wpt/tests/IndexedDB/idbcursor-key.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-primarykey.htm b/tests/wpt/tests/IndexedDB/idbcursor-primarykey.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-primarykey.htm rename to tests/wpt/tests/IndexedDB/idbcursor-primarykey.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-request-source.html b/tests/wpt/tests/IndexedDB/idbcursor-request-source.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-request-source.html rename to tests/wpt/tests/IndexedDB/idbcursor-request-source.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-request.any.js b/tests/wpt/tests/IndexedDB/idbcursor-request.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-request.any.js rename to tests/wpt/tests/IndexedDB/idbcursor-request.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-reused.htm b/tests/wpt/tests/IndexedDB/idbcursor-reused.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-reused.htm rename to tests/wpt/tests/IndexedDB/idbcursor-reused.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-source.htm b/tests/wpt/tests/IndexedDB/idbcursor-source.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-source.htm rename to tests/wpt/tests/IndexedDB/idbcursor-source.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor-update-exception-order.htm b/tests/wpt/tests/IndexedDB/idbcursor-update-exception-order.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor-update-exception-order.htm rename to tests/wpt/tests/IndexedDB/idbcursor-update-exception-order.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index.htm b/tests/wpt/tests/IndexedDB/idbcursor_advance_index.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index.htm rename to tests/wpt/tests/IndexedDB/idbcursor_advance_index.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index2.htm b/tests/wpt/tests/IndexedDB/idbcursor_advance_index2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index2.htm rename to tests/wpt/tests/IndexedDB/idbcursor_advance_index2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index3.htm b/tests/wpt/tests/IndexedDB/idbcursor_advance_index3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index3.htm rename to tests/wpt/tests/IndexedDB/idbcursor_advance_index3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index5.htm b/tests/wpt/tests/IndexedDB/idbcursor_advance_index5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index5.htm rename to tests/wpt/tests/IndexedDB/idbcursor_advance_index5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index6.htm b/tests/wpt/tests/IndexedDB/idbcursor_advance_index6.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index6.htm rename to tests/wpt/tests/IndexedDB/idbcursor_advance_index6.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index7.htm b/tests/wpt/tests/IndexedDB/idbcursor_advance_index7.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index7.htm rename to tests/wpt/tests/IndexedDB/idbcursor_advance_index7.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index8.htm b/tests/wpt/tests/IndexedDB/idbcursor_advance_index8.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index8.htm rename to tests/wpt/tests/IndexedDB/idbcursor_advance_index8.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index9.htm b/tests/wpt/tests/IndexedDB/idbcursor_advance_index9.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_index9.htm rename to tests/wpt/tests/IndexedDB/idbcursor_advance_index9.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_objectstore.htm b/tests/wpt/tests/IndexedDB/idbcursor_advance_objectstore.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_objectstore.htm rename to tests/wpt/tests/IndexedDB/idbcursor_advance_objectstore.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_objectstore2.htm b/tests/wpt/tests/IndexedDB/idbcursor_advance_objectstore2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_objectstore2.htm rename to tests/wpt/tests/IndexedDB/idbcursor_advance_objectstore2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_objectstore3.htm b/tests/wpt/tests/IndexedDB/idbcursor_advance_objectstore3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_objectstore3.htm rename to tests/wpt/tests/IndexedDB/idbcursor_advance_objectstore3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_objectstore4.htm b/tests/wpt/tests/IndexedDB/idbcursor_advance_objectstore4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_objectstore4.htm rename to tests/wpt/tests/IndexedDB/idbcursor_advance_objectstore4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_objectstore5.htm b/tests/wpt/tests/IndexedDB/idbcursor_advance_objectstore5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_advance_objectstore5.htm rename to tests/wpt/tests/IndexedDB/idbcursor_advance_objectstore5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_delete_objectstore.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_delete_objectstore.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_delete_objectstore.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_delete_objectstore.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_index.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_index.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index2.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_index2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index2.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_index2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index3.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_index3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index3.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_index3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index4.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_index4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index4.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_index4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index5.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_index5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index5.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_index5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index6.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_index6.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index6.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_index6.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index7.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_index7.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index7.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_index7.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index8.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_index8.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_index8.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_index8.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_invalid.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_invalid.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_invalid.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_invalid.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_objectstore.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_objectstore.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_objectstore.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_objectstore.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_objectstore2.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_objectstore2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_objectstore2.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_objectstore2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_objectstore3.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_objectstore3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_objectstore3.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_objectstore3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_objectstore4.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_objectstore4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_objectstore4.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_objectstore4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_objectstore5.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_objectstore5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_objectstore5.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_objectstore5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_objectstore6.htm b/tests/wpt/tests/IndexedDB/idbcursor_continue_objectstore6.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_continue_objectstore6.htm rename to tests/wpt/tests/IndexedDB/idbcursor_continue_objectstore6.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_index.htm b/tests/wpt/tests/IndexedDB/idbcursor_delete_index.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_index.htm rename to tests/wpt/tests/IndexedDB/idbcursor_delete_index.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_index2.htm b/tests/wpt/tests/IndexedDB/idbcursor_delete_index2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_index2.htm rename to tests/wpt/tests/IndexedDB/idbcursor_delete_index2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_index3.htm b/tests/wpt/tests/IndexedDB/idbcursor_delete_index3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_index3.htm rename to tests/wpt/tests/IndexedDB/idbcursor_delete_index3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_index4.htm b/tests/wpt/tests/IndexedDB/idbcursor_delete_index4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_index4.htm rename to tests/wpt/tests/IndexedDB/idbcursor_delete_index4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_index5.htm b/tests/wpt/tests/IndexedDB/idbcursor_delete_index5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_index5.htm rename to tests/wpt/tests/IndexedDB/idbcursor_delete_index5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_objectstore.htm b/tests/wpt/tests/IndexedDB/idbcursor_delete_objectstore.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_objectstore.htm rename to tests/wpt/tests/IndexedDB/idbcursor_delete_objectstore.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_objectstore2.htm b/tests/wpt/tests/IndexedDB/idbcursor_delete_objectstore2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_objectstore2.htm rename to tests/wpt/tests/IndexedDB/idbcursor_delete_objectstore2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_objectstore3.htm b/tests/wpt/tests/IndexedDB/idbcursor_delete_objectstore3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_objectstore3.htm rename to tests/wpt/tests/IndexedDB/idbcursor_delete_objectstore3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_objectstore4.htm b/tests/wpt/tests/IndexedDB/idbcursor_delete_objectstore4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_objectstore4.htm rename to tests/wpt/tests/IndexedDB/idbcursor_delete_objectstore4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_objectstore5.htm b/tests/wpt/tests/IndexedDB/idbcursor_delete_objectstore5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_delete_objectstore5.htm rename to tests/wpt/tests/IndexedDB/idbcursor_delete_objectstore5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_iterating.htm b/tests/wpt/tests/IndexedDB/idbcursor_iterating.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_iterating.htm rename to tests/wpt/tests/IndexedDB/idbcursor_iterating.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_iterating_index.htm b/tests/wpt/tests/IndexedDB/idbcursor_iterating_index.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_iterating_index.htm rename to tests/wpt/tests/IndexedDB/idbcursor_iterating_index.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_iterating_index2.htm b/tests/wpt/tests/IndexedDB/idbcursor_iterating_index2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_iterating_index2.htm rename to tests/wpt/tests/IndexedDB/idbcursor_iterating_index2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_iterating_objectstore.htm b/tests/wpt/tests/IndexedDB/idbcursor_iterating_objectstore.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_iterating_objectstore.htm rename to tests/wpt/tests/IndexedDB/idbcursor_iterating_objectstore.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_iterating_objectstore2.htm b/tests/wpt/tests/IndexedDB/idbcursor_iterating_objectstore2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_iterating_objectstore2.htm rename to tests/wpt/tests/IndexedDB/idbcursor_iterating_objectstore2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_index.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_index.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index2.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_index2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index2.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_index2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index3.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_index3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index3.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_index3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index4.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_index4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index4.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_index4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index5.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_index5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index5.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_index5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index6.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_index6.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index6.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_index6.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index7.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_index7.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index7.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_index7.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index8.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_index8.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index8.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_index8.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index9.any.js b/tests/wpt/tests/IndexedDB/idbcursor_update_index9.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_index9.any.js rename to tests/wpt/tests/IndexedDB/idbcursor_update_index9.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_objectstore.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_objectstore.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore2.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_objectstore2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore2.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_objectstore2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore3.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_objectstore3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore3.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_objectstore3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore4.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_objectstore4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore4.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_objectstore4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore5.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_objectstore5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore5.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_objectstore5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore6.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_objectstore6.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore6.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_objectstore6.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore7.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_objectstore7.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore7.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_objectstore7.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore8.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_objectstore8.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore8.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_objectstore8.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore9.htm b/tests/wpt/tests/IndexedDB/idbcursor_update_objectstore9.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbcursor_update_objectstore9.htm rename to tests/wpt/tests/IndexedDB/idbcursor_update_objectstore9.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase-createObjectStore-exception-order.htm b/tests/wpt/tests/IndexedDB/idbdatabase-createObjectStore-exception-order.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase-createObjectStore-exception-order.htm rename to tests/wpt/tests/IndexedDB/idbdatabase-createObjectStore-exception-order.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase-deleteObjectStore-exception-order.htm b/tests/wpt/tests/IndexedDB/idbdatabase-deleteObjectStore-exception-order.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase-deleteObjectStore-exception-order.htm rename to tests/wpt/tests/IndexedDB/idbdatabase-deleteObjectStore-exception-order.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase-transaction-exception-order.html b/tests/wpt/tests/IndexedDB/idbdatabase-transaction-exception-order.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase-transaction-exception-order.html rename to tests/wpt/tests/IndexedDB/idbdatabase-transaction-exception-order.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_close.htm b/tests/wpt/tests/IndexedDB/idbdatabase_close.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_close.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_close.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_close2.htm b/tests/wpt/tests/IndexedDB/idbdatabase_close2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_close2.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_close2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore-createIndex-emptyname.htm b/tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore-createIndex-emptyname.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore-createIndex-emptyname.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore-createIndex-emptyname.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore.htm b/tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore10-1000ends.htm b/tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore10-1000ends.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore10-1000ends.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore10-1000ends.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore10-emptyname.htm b/tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore10-emptyname.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore10-emptyname.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore10-emptyname.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore11.htm b/tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore11.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore11.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore11.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore2.htm b/tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore2.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore3.htm b/tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore3.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore4.htm b/tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore4.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore5.htm b/tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore5.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore6.htm b/tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore6.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore6.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore6.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore7.htm b/tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore7.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore7.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore7.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore8-parameters.htm b/tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore8-parameters.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore8-parameters.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore8-parameters.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore9-invalidparameters.htm b/tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore9-invalidparameters.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_createObjectStore9-invalidparameters.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_createObjectStore9-invalidparameters.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_deleteObjectStore.htm b/tests/wpt/tests/IndexedDB/idbdatabase_deleteObjectStore.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_deleteObjectStore.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_deleteObjectStore.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_deleteObjectStore2.htm b/tests/wpt/tests/IndexedDB/idbdatabase_deleteObjectStore2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_deleteObjectStore2.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_deleteObjectStore2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_deleteObjectStore3.htm b/tests/wpt/tests/IndexedDB/idbdatabase_deleteObjectStore3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_deleteObjectStore3.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_deleteObjectStore3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_deleteObjectStore4-not_reused.htm b/tests/wpt/tests/IndexedDB/idbdatabase_deleteObjectStore4-not_reused.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_deleteObjectStore4-not_reused.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_deleteObjectStore4-not_reused.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_transaction.htm b/tests/wpt/tests/IndexedDB/idbdatabase_transaction.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_transaction.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_transaction.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_transaction2.htm b/tests/wpt/tests/IndexedDB/idbdatabase_transaction2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_transaction2.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_transaction2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_transaction3.htm b/tests/wpt/tests/IndexedDB/idbdatabase_transaction3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_transaction3.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_transaction3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_transaction4.htm b/tests/wpt/tests/IndexedDB/idbdatabase_transaction4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_transaction4.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_transaction4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbdatabase_transaction5.htm b/tests/wpt/tests/IndexedDB/idbdatabase_transaction5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbdatabase_transaction5.htm rename to tests/wpt/tests/IndexedDB/idbdatabase_transaction5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory-databases-opaque-origin.html b/tests/wpt/tests/IndexedDB/idbfactory-databases-opaque-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory-databases-opaque-origin.html rename to tests/wpt/tests/IndexedDB/idbfactory-databases-opaque-origin.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory-deleteDatabase-opaque-origin.html b/tests/wpt/tests/IndexedDB/idbfactory-deleteDatabase-opaque-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory-deleteDatabase-opaque-origin.html rename to tests/wpt/tests/IndexedDB/idbfactory-deleteDatabase-opaque-origin.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory-deleteDatabase-request-success.html b/tests/wpt/tests/IndexedDB/idbfactory-deleteDatabase-request-success.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory-deleteDatabase-request-success.html rename to tests/wpt/tests/IndexedDB/idbfactory-deleteDatabase-request-success.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory-open-error-properties.html b/tests/wpt/tests/IndexedDB/idbfactory-open-error-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory-open-error-properties.html rename to tests/wpt/tests/IndexedDB/idbfactory-open-error-properties.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory-open-opaque-origin.html b/tests/wpt/tests/IndexedDB/idbfactory-open-opaque-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory-open-opaque-origin.html rename to tests/wpt/tests/IndexedDB/idbfactory-open-opaque-origin.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory-open-request-error.html b/tests/wpt/tests/IndexedDB/idbfactory-open-request-error.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory-open-request-error.html rename to tests/wpt/tests/IndexedDB/idbfactory-open-request-error.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory-open-request-success.html b/tests/wpt/tests/IndexedDB/idbfactory-open-request-success.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory-open-request-success.html rename to tests/wpt/tests/IndexedDB/idbfactory-open-request-success.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory-origin-isolation.html b/tests/wpt/tests/IndexedDB/idbfactory-origin-isolation.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory-origin-isolation.html rename to tests/wpt/tests/IndexedDB/idbfactory-origin-isolation.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_cmp.htm b/tests/wpt/tests/IndexedDB/idbfactory_cmp.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_cmp.htm rename to tests/wpt/tests/IndexedDB/idbfactory_cmp.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_cmp2.htm b/tests/wpt/tests/IndexedDB/idbfactory_cmp2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_cmp2.htm rename to tests/wpt/tests/IndexedDB/idbfactory_cmp2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_cmp3.htm b/tests/wpt/tests/IndexedDB/idbfactory_cmp3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_cmp3.htm rename to tests/wpt/tests/IndexedDB/idbfactory_cmp3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_cmp4.htm b/tests/wpt/tests/IndexedDB/idbfactory_cmp4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_cmp4.htm rename to tests/wpt/tests/IndexedDB/idbfactory_cmp4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_deleteDatabase.htm b/tests/wpt/tests/IndexedDB/idbfactory_deleteDatabase.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_deleteDatabase.htm rename to tests/wpt/tests/IndexedDB/idbfactory_deleteDatabase.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_deleteDatabase2.htm b/tests/wpt/tests/IndexedDB/idbfactory_deleteDatabase2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_deleteDatabase2.htm rename to tests/wpt/tests/IndexedDB/idbfactory_deleteDatabase2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_deleteDatabase3.htm b/tests/wpt/tests/IndexedDB/idbfactory_deleteDatabase3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_deleteDatabase3.htm rename to tests/wpt/tests/IndexedDB/idbfactory_deleteDatabase3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_deleteDatabase4.htm b/tests/wpt/tests/IndexedDB/idbfactory_deleteDatabase4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_deleteDatabase4.htm rename to tests/wpt/tests/IndexedDB/idbfactory_deleteDatabase4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_open.htm b/tests/wpt/tests/IndexedDB/idbfactory_open.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_open.htm rename to tests/wpt/tests/IndexedDB/idbfactory_open.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_open10.htm b/tests/wpt/tests/IndexedDB/idbfactory_open10.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_open10.htm rename to tests/wpt/tests/IndexedDB/idbfactory_open10.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_open11.htm b/tests/wpt/tests/IndexedDB/idbfactory_open11.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_open11.htm rename to tests/wpt/tests/IndexedDB/idbfactory_open11.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_open12.htm b/tests/wpt/tests/IndexedDB/idbfactory_open12.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_open12.htm rename to tests/wpt/tests/IndexedDB/idbfactory_open12.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_open2.htm b/tests/wpt/tests/IndexedDB/idbfactory_open2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_open2.htm rename to tests/wpt/tests/IndexedDB/idbfactory_open2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_open3.htm b/tests/wpt/tests/IndexedDB/idbfactory_open3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_open3.htm rename to tests/wpt/tests/IndexedDB/idbfactory_open3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_open4.htm b/tests/wpt/tests/IndexedDB/idbfactory_open4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_open4.htm rename to tests/wpt/tests/IndexedDB/idbfactory_open4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_open5.htm b/tests/wpt/tests/IndexedDB/idbfactory_open5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_open5.htm rename to tests/wpt/tests/IndexedDB/idbfactory_open5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_open6.htm b/tests/wpt/tests/IndexedDB/idbfactory_open6.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_open6.htm rename to tests/wpt/tests/IndexedDB/idbfactory_open6.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_open7.htm b/tests/wpt/tests/IndexedDB/idbfactory_open7.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_open7.htm rename to tests/wpt/tests/IndexedDB/idbfactory_open7.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_open8.htm b/tests/wpt/tests/IndexedDB/idbfactory_open8.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_open8.htm rename to tests/wpt/tests/IndexedDB/idbfactory_open8.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbfactory_open9.htm b/tests/wpt/tests/IndexedDB/idbfactory_open9.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbfactory_open9.htm rename to tests/wpt/tests/IndexedDB/idbfactory_open9.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex-cross-realm-methods.html b/tests/wpt/tests/IndexedDB/idbindex-cross-realm-methods.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex-cross-realm-methods.html rename to tests/wpt/tests/IndexedDB/idbindex-cross-realm-methods.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex-getAll-enforcerange.html b/tests/wpt/tests/IndexedDB/idbindex-getAll-enforcerange.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex-getAll-enforcerange.html rename to tests/wpt/tests/IndexedDB/idbindex-getAll-enforcerange.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex-getAllKeys-enforcerange.html b/tests/wpt/tests/IndexedDB/idbindex-getAllKeys-enforcerange.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex-getAllKeys-enforcerange.html rename to tests/wpt/tests/IndexedDB/idbindex-getAllKeys-enforcerange.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex-multientry-arraykeypath.htm b/tests/wpt/tests/IndexedDB/idbindex-multientry-arraykeypath.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex-multientry-arraykeypath.htm rename to tests/wpt/tests/IndexedDB/idbindex-multientry-arraykeypath.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex-multientry-big.htm b/tests/wpt/tests/IndexedDB/idbindex-multientry-big.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex-multientry-big.htm rename to tests/wpt/tests/IndexedDB/idbindex-multientry-big.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex-multientry.htm b/tests/wpt/tests/IndexedDB/idbindex-multientry.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex-multientry.htm rename to tests/wpt/tests/IndexedDB/idbindex-multientry.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex-objectStore-SameObject.html b/tests/wpt/tests/IndexedDB/idbindex-objectStore-SameObject.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex-objectStore-SameObject.html rename to tests/wpt/tests/IndexedDB/idbindex-objectStore-SameObject.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex-query-exception-order.html b/tests/wpt/tests/IndexedDB/idbindex-query-exception-order.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex-query-exception-order.html rename to tests/wpt/tests/IndexedDB/idbindex-query-exception-order.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex-rename-abort.html b/tests/wpt/tests/IndexedDB/idbindex-rename-abort.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex-rename-abort.html rename to tests/wpt/tests/IndexedDB/idbindex-rename-abort.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex-rename-errors.html b/tests/wpt/tests/IndexedDB/idbindex-rename-errors.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex-rename-errors.html rename to tests/wpt/tests/IndexedDB/idbindex-rename-errors.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex-rename.html b/tests/wpt/tests/IndexedDB/idbindex-rename.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex-rename.html rename to tests/wpt/tests/IndexedDB/idbindex-rename.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex-request-source.html b/tests/wpt/tests/IndexedDB/idbindex-request-source.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex-request-source.html rename to tests/wpt/tests/IndexedDB/idbindex-request-source.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_batchGetAll.tentative.any.js b/tests/wpt/tests/IndexedDB/idbindex_batchGetAll.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_batchGetAll.tentative.any.js rename to tests/wpt/tests/IndexedDB/idbindex_batchGetAll.tentative.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_count.htm b/tests/wpt/tests/IndexedDB/idbindex_count.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_count.htm rename to tests/wpt/tests/IndexedDB/idbindex_count.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_count2.htm b/tests/wpt/tests/IndexedDB/idbindex_count2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_count2.htm rename to tests/wpt/tests/IndexedDB/idbindex_count2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_count3.htm b/tests/wpt/tests/IndexedDB/idbindex_count3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_count3.htm rename to tests/wpt/tests/IndexedDB/idbindex_count3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_count4.htm b/tests/wpt/tests/IndexedDB/idbindex_count4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_count4.htm rename to tests/wpt/tests/IndexedDB/idbindex_count4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_get.htm b/tests/wpt/tests/IndexedDB/idbindex_get.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_get.htm rename to tests/wpt/tests/IndexedDB/idbindex_get.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_get2.htm b/tests/wpt/tests/IndexedDB/idbindex_get2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_get2.htm rename to tests/wpt/tests/IndexedDB/idbindex_get2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_get3.htm b/tests/wpt/tests/IndexedDB/idbindex_get3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_get3.htm rename to tests/wpt/tests/IndexedDB/idbindex_get3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_get4.htm b/tests/wpt/tests/IndexedDB/idbindex_get4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_get4.htm rename to tests/wpt/tests/IndexedDB/idbindex_get4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_get5.htm b/tests/wpt/tests/IndexedDB/idbindex_get5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_get5.htm rename to tests/wpt/tests/IndexedDB/idbindex_get5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_get6.htm b/tests/wpt/tests/IndexedDB/idbindex_get6.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_get6.htm rename to tests/wpt/tests/IndexedDB/idbindex_get6.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_get7.htm b/tests/wpt/tests/IndexedDB/idbindex_get7.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_get7.htm rename to tests/wpt/tests/IndexedDB/idbindex_get7.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_get8.htm b/tests/wpt/tests/IndexedDB/idbindex_get8.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_get8.htm rename to tests/wpt/tests/IndexedDB/idbindex_get8.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_getAll.html b/tests/wpt/tests/IndexedDB/idbindex_getAll.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_getAll.html rename to tests/wpt/tests/IndexedDB/idbindex_getAll.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_getAllKeys.html b/tests/wpt/tests/IndexedDB/idbindex_getAllKeys.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_getAllKeys.html rename to tests/wpt/tests/IndexedDB/idbindex_getAllKeys.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey.htm b/tests/wpt/tests/IndexedDB/idbindex_getKey.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey.htm rename to tests/wpt/tests/IndexedDB/idbindex_getKey.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey2.htm b/tests/wpt/tests/IndexedDB/idbindex_getKey2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey2.htm rename to tests/wpt/tests/IndexedDB/idbindex_getKey2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey3.htm b/tests/wpt/tests/IndexedDB/idbindex_getKey3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey3.htm rename to tests/wpt/tests/IndexedDB/idbindex_getKey3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey4.htm b/tests/wpt/tests/IndexedDB/idbindex_getKey4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey4.htm rename to tests/wpt/tests/IndexedDB/idbindex_getKey4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey5.htm b/tests/wpt/tests/IndexedDB/idbindex_getKey5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey5.htm rename to tests/wpt/tests/IndexedDB/idbindex_getKey5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey6.htm b/tests/wpt/tests/IndexedDB/idbindex_getKey6.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey6.htm rename to tests/wpt/tests/IndexedDB/idbindex_getKey6.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey7.htm b/tests/wpt/tests/IndexedDB/idbindex_getKey7.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey7.htm rename to tests/wpt/tests/IndexedDB/idbindex_getKey7.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey8.htm b/tests/wpt/tests/IndexedDB/idbindex_getKey8.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_getKey8.htm rename to tests/wpt/tests/IndexedDB/idbindex_getKey8.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_indexNames.htm b/tests/wpt/tests/IndexedDB/idbindex_indexNames.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_indexNames.htm rename to tests/wpt/tests/IndexedDB/idbindex_indexNames.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_keyPath.any.js b/tests/wpt/tests/IndexedDB/idbindex_keyPath.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_keyPath.any.js rename to tests/wpt/tests/IndexedDB/idbindex_keyPath.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_openCursor.htm b/tests/wpt/tests/IndexedDB/idbindex_openCursor.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_openCursor.htm rename to tests/wpt/tests/IndexedDB/idbindex_openCursor.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_openCursor2.htm b/tests/wpt/tests/IndexedDB/idbindex_openCursor2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_openCursor2.htm rename to tests/wpt/tests/IndexedDB/idbindex_openCursor2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_openCursor3.htm b/tests/wpt/tests/IndexedDB/idbindex_openCursor3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_openCursor3.htm rename to tests/wpt/tests/IndexedDB/idbindex_openCursor3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_openKeyCursor.htm b/tests/wpt/tests/IndexedDB/idbindex_openKeyCursor.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_openKeyCursor.htm rename to tests/wpt/tests/IndexedDB/idbindex_openKeyCursor.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_openKeyCursor2.htm b/tests/wpt/tests/IndexedDB/idbindex_openKeyCursor2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_openKeyCursor2.htm rename to tests/wpt/tests/IndexedDB/idbindex_openKeyCursor2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_openKeyCursor3.htm b/tests/wpt/tests/IndexedDB/idbindex_openKeyCursor3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_openKeyCursor3.htm rename to tests/wpt/tests/IndexedDB/idbindex_openKeyCursor3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_openKeyCursor4.htm b/tests/wpt/tests/IndexedDB/idbindex_openKeyCursor4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_openKeyCursor4.htm rename to tests/wpt/tests/IndexedDB/idbindex_openKeyCursor4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_reverse_cursor.any.js b/tests/wpt/tests/IndexedDB/idbindex_reverse_cursor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_reverse_cursor.any.js rename to tests/wpt/tests/IndexedDB/idbindex_reverse_cursor.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbindex_tombstones.any.js b/tests/wpt/tests/IndexedDB/idbindex_tombstones.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbindex_tombstones.any.js rename to tests/wpt/tests/IndexedDB/idbindex_tombstones.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbkeyrange-includes.htm b/tests/wpt/tests/IndexedDB/idbkeyrange-includes.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbkeyrange-includes.htm rename to tests/wpt/tests/IndexedDB/idbkeyrange-includes.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbkeyrange.htm b/tests/wpt/tests/IndexedDB/idbkeyrange.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbkeyrange.htm rename to tests/wpt/tests/IndexedDB/idbkeyrange.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbkeyrange_incorrect.htm b/tests/wpt/tests/IndexedDB/idbkeyrange_incorrect.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbkeyrange_incorrect.htm rename to tests/wpt/tests/IndexedDB/idbkeyrange_incorrect.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-add-put-exception-order.html b/tests/wpt/tests/IndexedDB/idbobjectstore-add-put-exception-order.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-add-put-exception-order.html rename to tests/wpt/tests/IndexedDB/idbobjectstore-add-put-exception-order.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-clear-exception-order.html b/tests/wpt/tests/IndexedDB/idbobjectstore-clear-exception-order.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-clear-exception-order.html rename to tests/wpt/tests/IndexedDB/idbobjectstore-clear-exception-order.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-cross-realm-methods.html b/tests/wpt/tests/IndexedDB/idbobjectstore-cross-realm-methods.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-cross-realm-methods.html rename to tests/wpt/tests/IndexedDB/idbobjectstore-cross-realm-methods.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-delete-exception-order.html b/tests/wpt/tests/IndexedDB/idbobjectstore-delete-exception-order.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-delete-exception-order.html rename to tests/wpt/tests/IndexedDB/idbobjectstore-delete-exception-order.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-deleteIndex-exception-order.html b/tests/wpt/tests/IndexedDB/idbobjectstore-deleteIndex-exception-order.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-deleteIndex-exception-order.html rename to tests/wpt/tests/IndexedDB/idbobjectstore-deleteIndex-exception-order.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-getAll-enforcerange.html b/tests/wpt/tests/IndexedDB/idbobjectstore-getAll-enforcerange.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-getAll-enforcerange.html rename to tests/wpt/tests/IndexedDB/idbobjectstore-getAll-enforcerange.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-getAllKeys-enforcerange.html b/tests/wpt/tests/IndexedDB/idbobjectstore-getAllKeys-enforcerange.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-getAllKeys-enforcerange.html rename to tests/wpt/tests/IndexedDB/idbobjectstore-getAllKeys-enforcerange.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-index-finished.html b/tests/wpt/tests/IndexedDB/idbobjectstore-index-finished.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-index-finished.html rename to tests/wpt/tests/IndexedDB/idbobjectstore-index-finished.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-query-exception-order.html b/tests/wpt/tests/IndexedDB/idbobjectstore-query-exception-order.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-query-exception-order.html rename to tests/wpt/tests/IndexedDB/idbobjectstore-query-exception-order.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-rename-abort.html b/tests/wpt/tests/IndexedDB/idbobjectstore-rename-abort.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-rename-abort.html rename to tests/wpt/tests/IndexedDB/idbobjectstore-rename-abort.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-rename-errors.html b/tests/wpt/tests/IndexedDB/idbobjectstore-rename-errors.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-rename-errors.html rename to tests/wpt/tests/IndexedDB/idbobjectstore-rename-errors.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-rename-store.html b/tests/wpt/tests/IndexedDB/idbobjectstore-rename-store.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-rename-store.html rename to tests/wpt/tests/IndexedDB/idbobjectstore-rename-store.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-request-source.html b/tests/wpt/tests/IndexedDB/idbobjectstore-request-source.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-request-source.html rename to tests/wpt/tests/IndexedDB/idbobjectstore-request-source.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-transaction-SameObject.html b/tests/wpt/tests/IndexedDB/idbobjectstore-transaction-SameObject.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore-transaction-SameObject.html rename to tests/wpt/tests/IndexedDB/idbobjectstore-transaction-SameObject.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add10.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add10.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add10.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add10.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add11.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add11.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add11.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add11.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add12.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add12.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add12.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add12.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add13.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add13.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add13.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add13.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add14.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add14.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add14.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add14.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add15.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add15.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add15.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add15.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add16.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add16.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add16.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add16.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add2.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add2.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add3.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add3.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add4.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add4.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add5.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add5.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add6.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add6.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add6.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add6.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add7.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add7.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add7.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add7.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add8.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add8.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add8.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add8.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add9.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_add9.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_add9.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_add9.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_batchGetAll.tentative.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore_batchGetAll.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_batchGetAll.tentative.any.js rename to tests/wpt/tests/IndexedDB/idbobjectstore_batchGetAll.tentative.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_batchGetAll_largeValue.tentative.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore_batchGetAll_largeValue.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_batchGetAll_largeValue.tentative.any.js rename to tests/wpt/tests/IndexedDB/idbobjectstore_batchGetAll_largeValue.tentative.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_clear.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_clear.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_clear.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_clear.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_clear2.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_clear2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_clear2.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_clear2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_clear3.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_clear3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_clear3.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_clear3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_clear4.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_clear4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_clear4.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_clear4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_count.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_count.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_count.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_count.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_count2.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_count2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_count2.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_count2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_count3.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_count3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_count3.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_count3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_count4.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_count4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_count4.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_count4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex10.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex10.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex10.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex10.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex11.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex11.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex11.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex11.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex12.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex12.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex12.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex12.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex13.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex13.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex13.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex13.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex14-exception_order.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex14-exception_order.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex14-exception_order.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex14-exception_order.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex15-autoincrement.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex15-autoincrement.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex15-autoincrement.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex15-autoincrement.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex2.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex2.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex3-usable-right-away.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex3-usable-right-away.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex3-usable-right-away.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex3-usable-right-away.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex4-deleteIndex-event_order.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex4-deleteIndex-event_order.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex4-deleteIndex-event_order.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex4-deleteIndex-event_order.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex5-emptykeypath.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex5-emptykeypath.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex5-emptykeypath.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex5-emptykeypath.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex6-event_order.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex6-event_order.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex6-event_order.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex6-event_order.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex7-event_order.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex7-event_order.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex7-event_order.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex7-event_order.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex8-valid_keys.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex8-valid_keys.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex8-valid_keys.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex8-valid_keys.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex9-emptyname.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_createIndex9-emptyname.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex9-emptyname.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_createIndex9-emptyname.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_delete.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_delete.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_delete.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_delete.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_delete2.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_delete2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_delete2.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_delete2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_delete3.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_delete3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_delete3.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_delete3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_delete4.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_delete4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_delete4.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_delete4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_delete5.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_delete5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_delete5.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_delete5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_delete6.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_delete6.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_delete6.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_delete6.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_delete7.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_delete7.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_delete7.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_delete7.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_deleteIndex.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_deleteIndex.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_deleteIndex.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_deleteIndex.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_deleted.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_deleted.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_deleted.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_deleted.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_get.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore_get.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_get.any.js rename to tests/wpt/tests/IndexedDB/idbobjectstore_get.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_get2.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore_get2.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_get2.any.js rename to tests/wpt/tests/IndexedDB/idbobjectstore_get2.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_get3.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore_get3.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_get3.any.js rename to tests/wpt/tests/IndexedDB/idbobjectstore_get3.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_get4.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore_get4.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_get4.any.js rename to tests/wpt/tests/IndexedDB/idbobjectstore_get4.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_get5.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore_get5.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_get5.any.js rename to tests/wpt/tests/IndexedDB/idbobjectstore_get5.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_get6.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore_get6.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_get6.any.js rename to tests/wpt/tests/IndexedDB/idbobjectstore_get6.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_get7.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore_get7.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_get7.any.js rename to tests/wpt/tests/IndexedDB/idbobjectstore_get7.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_getAll.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore_getAll.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_getAll.any.js rename to tests/wpt/tests/IndexedDB/idbobjectstore_getAll.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_getAllKeys.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore_getAllKeys.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_getAllKeys.any.js rename to tests/wpt/tests/IndexedDB/idbobjectstore_getAllKeys.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_getKey.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore_getKey.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_getKey.any.js rename to tests/wpt/tests/IndexedDB/idbobjectstore_getKey.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_index.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_index.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_index.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_index.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_keyPath.any.js b/tests/wpt/tests/IndexedDB/idbobjectstore_keyPath.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_keyPath.any.js rename to tests/wpt/tests/IndexedDB/idbobjectstore_keyPath.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_openCursor.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_openCursor.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_openCursor.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_openCursor.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_openCursor_invalid.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_openCursor_invalid.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_openCursor_invalid.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_openCursor_invalid.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_openKeyCursor.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_openKeyCursor.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_openKeyCursor.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_openKeyCursor.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put10.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put10.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put10.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put10.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put11.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put11.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put11.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put11.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put12.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put12.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put12.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put12.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put13.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put13.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put13.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put13.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put14.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put14.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put14.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put14.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put15.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put15.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put15.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put15.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put16.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put16.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put16.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put16.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put2.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put2.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put2.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put2.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put3.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put3.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put3.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put3.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put4.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put4.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put4.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put4.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put5.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put5.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put5.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put5.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put6.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put6.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put6.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put6.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put7.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put7.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put7.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put7.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put8.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put8.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put8.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put8.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put9.htm b/tests/wpt/tests/IndexedDB/idbobjectstore_put9.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_put9.htm rename to tests/wpt/tests/IndexedDB/idbobjectstore_put9.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbrequest-onupgradeneeded.htm b/tests/wpt/tests/IndexedDB/idbrequest-onupgradeneeded.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbrequest-onupgradeneeded.htm rename to tests/wpt/tests/IndexedDB/idbrequest-onupgradeneeded.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbrequest_error.html b/tests/wpt/tests/IndexedDB/idbrequest_error.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbrequest_error.html rename to tests/wpt/tests/IndexedDB/idbrequest_error.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbrequest_result.html b/tests/wpt/tests/IndexedDB/idbrequest_result.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbrequest_result.html rename to tests/wpt/tests/IndexedDB/idbrequest_result.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbtransaction-db-SameObject.html b/tests/wpt/tests/IndexedDB/idbtransaction-db-SameObject.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbtransaction-db-SameObject.html rename to tests/wpt/tests/IndexedDB/idbtransaction-db-SameObject.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbtransaction-objectStore-exception-order.html b/tests/wpt/tests/IndexedDB/idbtransaction-objectStore-exception-order.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbtransaction-objectStore-exception-order.html rename to tests/wpt/tests/IndexedDB/idbtransaction-objectStore-exception-order.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbtransaction-objectStore-finished.html b/tests/wpt/tests/IndexedDB/idbtransaction-objectStore-finished.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbtransaction-objectStore-finished.html rename to tests/wpt/tests/IndexedDB/idbtransaction-objectStore-finished.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbtransaction-oncomplete.htm b/tests/wpt/tests/IndexedDB/idbtransaction-oncomplete.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbtransaction-oncomplete.htm rename to tests/wpt/tests/IndexedDB/idbtransaction-oncomplete.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbtransaction.htm b/tests/wpt/tests/IndexedDB/idbtransaction.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbtransaction.htm rename to tests/wpt/tests/IndexedDB/idbtransaction.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbtransaction_abort.htm b/tests/wpt/tests/IndexedDB/idbtransaction_abort.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbtransaction_abort.htm rename to tests/wpt/tests/IndexedDB/idbtransaction_abort.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbtransaction_objectStoreNames.html b/tests/wpt/tests/IndexedDB/idbtransaction_objectStoreNames.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbtransaction_objectStoreNames.html rename to tests/wpt/tests/IndexedDB/idbtransaction_objectStoreNames.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbversionchangeevent.htm b/tests/wpt/tests/IndexedDB/idbversionchangeevent.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idbversionchangeevent.htm rename to tests/wpt/tests/IndexedDB/idbversionchangeevent.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/idlharness.any.js b/tests/wpt/tests/IndexedDB/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/idlharness.any.js rename to tests/wpt/tests/IndexedDB/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/index_sort_order.htm b/tests/wpt/tests/IndexedDB/index_sort_order.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/index_sort_order.htm rename to tests/wpt/tests/IndexedDB/index_sort_order.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/interleaved-cursors-large.html b/tests/wpt/tests/IndexedDB/interleaved-cursors-large.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/interleaved-cursors-large.html rename to tests/wpt/tests/IndexedDB/interleaved-cursors-large.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/interleaved-cursors-small.html b/tests/wpt/tests/IndexedDB/interleaved-cursors-small.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/interleaved-cursors-small.html rename to tests/wpt/tests/IndexedDB/interleaved-cursors-small.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/key-conversion-exceptions.htm b/tests/wpt/tests/IndexedDB/key-conversion-exceptions.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/key-conversion-exceptions.htm rename to tests/wpt/tests/IndexedDB/key-conversion-exceptions.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/key_invalid.htm b/tests/wpt/tests/IndexedDB/key_invalid.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/key_invalid.htm rename to tests/wpt/tests/IndexedDB/key_invalid.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/key_valid.html b/tests/wpt/tests/IndexedDB/key_valid.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/key_valid.html rename to tests/wpt/tests/IndexedDB/key_valid.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/keygenerator-constrainterror.htm b/tests/wpt/tests/IndexedDB/keygenerator-constrainterror.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/keygenerator-constrainterror.htm rename to tests/wpt/tests/IndexedDB/keygenerator-constrainterror.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/keygenerator-explicit.html b/tests/wpt/tests/IndexedDB/keygenerator-explicit.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/keygenerator-explicit.html rename to tests/wpt/tests/IndexedDB/keygenerator-explicit.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/keygenerator-inject.html b/tests/wpt/tests/IndexedDB/keygenerator-inject.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/keygenerator-inject.html rename to tests/wpt/tests/IndexedDB/keygenerator-inject.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/keygenerator-overflow.htm b/tests/wpt/tests/IndexedDB/keygenerator-overflow.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/keygenerator-overflow.htm rename to tests/wpt/tests/IndexedDB/keygenerator-overflow.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/keygenerator.htm b/tests/wpt/tests/IndexedDB/keygenerator.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/keygenerator.htm rename to tests/wpt/tests/IndexedDB/keygenerator.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/keyorder.htm b/tests/wpt/tests/IndexedDB/keyorder.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/keyorder.htm rename to tests/wpt/tests/IndexedDB/keyorder.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/keypath-exceptions.htm b/tests/wpt/tests/IndexedDB/keypath-exceptions.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/keypath-exceptions.htm rename to tests/wpt/tests/IndexedDB/keypath-exceptions.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/keypath-special-identifiers.htm b/tests/wpt/tests/IndexedDB/keypath-special-identifiers.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/keypath-special-identifiers.htm rename to tests/wpt/tests/IndexedDB/keypath-special-identifiers.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/keypath.htm b/tests/wpt/tests/IndexedDB/keypath.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/keypath.htm rename to tests/wpt/tests/IndexedDB/keypath.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/keypath_invalid.htm b/tests/wpt/tests/IndexedDB/keypath_invalid.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/keypath_invalid.htm rename to tests/wpt/tests/IndexedDB/keypath_invalid.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/keypath_maxsize.htm b/tests/wpt/tests/IndexedDB/keypath_maxsize.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/keypath_maxsize.htm rename to tests/wpt/tests/IndexedDB/keypath_maxsize.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/large-requests-abort.html b/tests/wpt/tests/IndexedDB/large-requests-abort.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/large-requests-abort.html rename to tests/wpt/tests/IndexedDB/large-requests-abort.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/list_ordering.htm b/tests/wpt/tests/IndexedDB/list_ordering.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/list_ordering.htm rename to tests/wpt/tests/IndexedDB/list_ordering.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/name-scopes.html b/tests/wpt/tests/IndexedDB/name-scopes.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/name-scopes.html rename to tests/wpt/tests/IndexedDB/name-scopes.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/nested-cloning-large-multiple.html b/tests/wpt/tests/IndexedDB/nested-cloning-large-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/nested-cloning-large-multiple.html rename to tests/wpt/tests/IndexedDB/nested-cloning-large-multiple.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/nested-cloning-large.html b/tests/wpt/tests/IndexedDB/nested-cloning-large.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/nested-cloning-large.html rename to tests/wpt/tests/IndexedDB/nested-cloning-large.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/nested-cloning-small.html b/tests/wpt/tests/IndexedDB/nested-cloning-small.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/nested-cloning-small.html rename to tests/wpt/tests/IndexedDB/nested-cloning-small.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/objectstore_keyorder.htm b/tests/wpt/tests/IndexedDB/objectstore_keyorder.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/objectstore_keyorder.htm rename to tests/wpt/tests/IndexedDB/objectstore_keyorder.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/open-request-queue.html b/tests/wpt/tests/IndexedDB/open-request-queue.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/open-request-queue.html rename to tests/wpt/tests/IndexedDB/open-request-queue.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/parallel-cursors-upgrade.html b/tests/wpt/tests/IndexedDB/parallel-cursors-upgrade.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/parallel-cursors-upgrade.html rename to tests/wpt/tests/IndexedDB/parallel-cursors-upgrade.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/reading-autoincrement-indexes-cursors.any.js b/tests/wpt/tests/IndexedDB/reading-autoincrement-indexes-cursors.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/reading-autoincrement-indexes-cursors.any.js rename to tests/wpt/tests/IndexedDB/reading-autoincrement-indexes-cursors.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/reading-autoincrement-indexes.any.js b/tests/wpt/tests/IndexedDB/reading-autoincrement-indexes.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/reading-autoincrement-indexes.any.js rename to tests/wpt/tests/IndexedDB/reading-autoincrement-indexes.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/reading-autoincrement-store-cursors.any.js b/tests/wpt/tests/IndexedDB/reading-autoincrement-store-cursors.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/reading-autoincrement-store-cursors.any.js rename to tests/wpt/tests/IndexedDB/reading-autoincrement-store-cursors.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/reading-autoincrement-store.any.js b/tests/wpt/tests/IndexedDB/reading-autoincrement-store.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/reading-autoincrement-store.any.js rename to tests/wpt/tests/IndexedDB/reading-autoincrement-store.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/ready-state-destroyed-execution-context.html b/tests/wpt/tests/IndexedDB/ready-state-destroyed-execution-context.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/ready-state-destroyed-execution-context.html rename to tests/wpt/tests/IndexedDB/ready-state-destroyed-execution-context.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/request-abort-ordering.html b/tests/wpt/tests/IndexedDB/request-abort-ordering.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/request-abort-ordering.html rename to tests/wpt/tests/IndexedDB/request-abort-ordering.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/request-event-ordering.html b/tests/wpt/tests/IndexedDB/request-event-ordering.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/request-event-ordering.html rename to tests/wpt/tests/IndexedDB/request-event-ordering.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/request_bubble-and-capture.htm b/tests/wpt/tests/IndexedDB/request_bubble-and-capture.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/request_bubble-and-capture.htm rename to tests/wpt/tests/IndexedDB/request_bubble-and-capture.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/resources/cross-origin-helper-frame.html b/tests/wpt/tests/IndexedDB/resources/cross-origin-helper-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/resources/cross-origin-helper-frame.html rename to tests/wpt/tests/IndexedDB/resources/cross-origin-helper-frame.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/resources/file_to_save.txt b/tests/wpt/tests/IndexedDB/resources/file_to_save.txt similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/resources/file_to_save.txt rename to tests/wpt/tests/IndexedDB/resources/file_to_save.txt diff --git a/tests/wpt/web-platform-tests/IndexedDB/resources/idb-partitioned-basic-iframe.tentative.html b/tests/wpt/tests/IndexedDB/resources/idb-partitioned-basic-iframe.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/resources/idb-partitioned-basic-iframe.tentative.html rename to tests/wpt/tests/IndexedDB/resources/idb-partitioned-basic-iframe.tentative.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/resources/idb-partitioned-coverage-iframe.tentative.html b/tests/wpt/tests/IndexedDB/resources/idb-partitioned-coverage-iframe.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/resources/idb-partitioned-coverage-iframe.tentative.html rename to tests/wpt/tests/IndexedDB/resources/idb-partitioned-coverage-iframe.tentative.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/resources/idb-partitioned-persistence-iframe.tentative.html b/tests/wpt/tests/IndexedDB/resources/idb-partitioned-persistence-iframe.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/resources/idb-partitioned-persistence-iframe.tentative.html rename to tests/wpt/tests/IndexedDB/resources/idb-partitioned-persistence-iframe.tentative.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/resources/idbfactory-origin-isolation-iframe.html b/tests/wpt/tests/IndexedDB/resources/idbfactory-origin-isolation-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/resources/idbfactory-origin-isolation-iframe.html rename to tests/wpt/tests/IndexedDB/resources/idbfactory-origin-isolation-iframe.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/resources/idbworker.js b/tests/wpt/tests/IndexedDB/resources/idbworker.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/resources/idbworker.js rename to tests/wpt/tests/IndexedDB/resources/idbworker.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/resources/interleaved-cursors-common.js b/tests/wpt/tests/IndexedDB/resources/interleaved-cursors-common.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/resources/interleaved-cursors-common.js rename to tests/wpt/tests/IndexedDB/resources/interleaved-cursors-common.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/resources/nested-cloning-common.js b/tests/wpt/tests/IndexedDB/resources/nested-cloning-common.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/resources/nested-cloning-common.js rename to tests/wpt/tests/IndexedDB/resources/nested-cloning-common.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/resources/reading-autoincrement-common.js b/tests/wpt/tests/IndexedDB/resources/reading-autoincrement-common.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/resources/reading-autoincrement-common.js rename to tests/wpt/tests/IndexedDB/resources/reading-autoincrement-common.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/resources/support-promises.js b/tests/wpt/tests/IndexedDB/resources/support-promises.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/resources/support-promises.js rename to tests/wpt/tests/IndexedDB/resources/support-promises.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/resources/support.js b/tests/wpt/tests/IndexedDB/resources/support.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/resources/support.js rename to tests/wpt/tests/IndexedDB/resources/support.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/serialize-sharedarraybuffer-throws.https.html b/tests/wpt/tests/IndexedDB/serialize-sharedarraybuffer-throws.https.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/serialize-sharedarraybuffer-throws.https.html rename to tests/wpt/tests/IndexedDB/serialize-sharedarraybuffer-throws.https.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/serialize-sharedarraybuffer-throws.https.html.headers b/tests/wpt/tests/IndexedDB/serialize-sharedarraybuffer-throws.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/serialize-sharedarraybuffer-throws.https.html.headers rename to tests/wpt/tests/IndexedDB/serialize-sharedarraybuffer-throws.https.html.headers diff --git a/tests/wpt/web-platform-tests/IndexedDB/storage-buckets.https.any.js b/tests/wpt/tests/IndexedDB/storage-buckets.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/storage-buckets.https.any.js rename to tests/wpt/tests/IndexedDB/storage-buckets.https.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/string-list-ordering.htm b/tests/wpt/tests/IndexedDB/string-list-ordering.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/string-list-ordering.htm rename to tests/wpt/tests/IndexedDB/string-list-ordering.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/structured-clone-transaction-state.any.js b/tests/wpt/tests/IndexedDB/structured-clone-transaction-state.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/structured-clone-transaction-state.any.js rename to tests/wpt/tests/IndexedDB/structured-clone-transaction-state.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/structured-clone.any.js b/tests/wpt/tests/IndexedDB/structured-clone.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/structured-clone.any.js rename to tests/wpt/tests/IndexedDB/structured-clone.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-abort-generator-revert.html b/tests/wpt/tests/IndexedDB/transaction-abort-generator-revert.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-abort-generator-revert.html rename to tests/wpt/tests/IndexedDB/transaction-abort-generator-revert.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-abort-index-metadata-revert.html b/tests/wpt/tests/IndexedDB/transaction-abort-index-metadata-revert.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-abort-index-metadata-revert.html rename to tests/wpt/tests/IndexedDB/transaction-abort-index-metadata-revert.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-abort-multiple-metadata-revert.html b/tests/wpt/tests/IndexedDB/transaction-abort-multiple-metadata-revert.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-abort-multiple-metadata-revert.html rename to tests/wpt/tests/IndexedDB/transaction-abort-multiple-metadata-revert.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-abort-object-store-metadata-revert.html b/tests/wpt/tests/IndexedDB/transaction-abort-object-store-metadata-revert.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-abort-object-store-metadata-revert.html rename to tests/wpt/tests/IndexedDB/transaction-abort-object-store-metadata-revert.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-abort-request-error.html b/tests/wpt/tests/IndexedDB/transaction-abort-request-error.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-abort-request-error.html rename to tests/wpt/tests/IndexedDB/transaction-abort-request-error.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-create_in_versionchange.htm b/tests/wpt/tests/IndexedDB/transaction-create_in_versionchange.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-create_in_versionchange.htm rename to tests/wpt/tests/IndexedDB/transaction-create_in_versionchange.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-deactivation-timing.html b/tests/wpt/tests/IndexedDB/transaction-deactivation-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-deactivation-timing.html rename to tests/wpt/tests/IndexedDB/transaction-deactivation-timing.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-lifetime-blocked.htm b/tests/wpt/tests/IndexedDB/transaction-lifetime-blocked.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-lifetime-blocked.htm rename to tests/wpt/tests/IndexedDB/transaction-lifetime-blocked.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-lifetime-empty.html b/tests/wpt/tests/IndexedDB/transaction-lifetime-empty.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-lifetime-empty.html rename to tests/wpt/tests/IndexedDB/transaction-lifetime-empty.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-lifetime.htm b/tests/wpt/tests/IndexedDB/transaction-lifetime.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-lifetime.htm rename to tests/wpt/tests/IndexedDB/transaction-lifetime.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-relaxed-durability.tentative.any.js b/tests/wpt/tests/IndexedDB/transaction-relaxed-durability.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-relaxed-durability.tentative.any.js rename to tests/wpt/tests/IndexedDB/transaction-relaxed-durability.tentative.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-requestqueue.htm b/tests/wpt/tests/IndexedDB/transaction-requestqueue.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-requestqueue.htm rename to tests/wpt/tests/IndexedDB/transaction-requestqueue.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-scheduling-across-connections.any.js b/tests/wpt/tests/IndexedDB/transaction-scheduling-across-connections.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-scheduling-across-connections.any.js rename to tests/wpt/tests/IndexedDB/transaction-scheduling-across-connections.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-scheduling-across-databases.any.js b/tests/wpt/tests/IndexedDB/transaction-scheduling-across-databases.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-scheduling-across-databases.any.js rename to tests/wpt/tests/IndexedDB/transaction-scheduling-across-databases.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-scheduling-mixed-scopes.any.js b/tests/wpt/tests/IndexedDB/transaction-scheduling-mixed-scopes.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-scheduling-mixed-scopes.any.js rename to tests/wpt/tests/IndexedDB/transaction-scheduling-mixed-scopes.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-scheduling-ordering.any.js b/tests/wpt/tests/IndexedDB/transaction-scheduling-ordering.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-scheduling-ordering.any.js rename to tests/wpt/tests/IndexedDB/transaction-scheduling-ordering.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-scheduling-ro-waits-for-rw.any.js b/tests/wpt/tests/IndexedDB/transaction-scheduling-ro-waits-for-rw.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-scheduling-ro-waits-for-rw.any.js rename to tests/wpt/tests/IndexedDB/transaction-scheduling-ro-waits-for-rw.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-scheduling-rw-scopes.any.js b/tests/wpt/tests/IndexedDB/transaction-scheduling-rw-scopes.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-scheduling-rw-scopes.any.js rename to tests/wpt/tests/IndexedDB/transaction-scheduling-rw-scopes.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-scheduling-within-database.any.js b/tests/wpt/tests/IndexedDB/transaction-scheduling-within-database.any.js similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction-scheduling-within-database.any.js rename to tests/wpt/tests/IndexedDB/transaction-scheduling-within-database.any.js diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction_bubble-and-capture.htm b/tests/wpt/tests/IndexedDB/transaction_bubble-and-capture.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/transaction_bubble-and-capture.htm rename to tests/wpt/tests/IndexedDB/transaction_bubble-and-capture.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/upgrade-transaction-deactivation-timing.html b/tests/wpt/tests/IndexedDB/upgrade-transaction-deactivation-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/upgrade-transaction-deactivation-timing.html rename to tests/wpt/tests/IndexedDB/upgrade-transaction-deactivation-timing.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/upgrade-transaction-lifecycle-backend-aborted.html b/tests/wpt/tests/IndexedDB/upgrade-transaction-lifecycle-backend-aborted.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/upgrade-transaction-lifecycle-backend-aborted.html rename to tests/wpt/tests/IndexedDB/upgrade-transaction-lifecycle-backend-aborted.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/upgrade-transaction-lifecycle-committed.html b/tests/wpt/tests/IndexedDB/upgrade-transaction-lifecycle-committed.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/upgrade-transaction-lifecycle-committed.html rename to tests/wpt/tests/IndexedDB/upgrade-transaction-lifecycle-committed.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/upgrade-transaction-lifecycle-user-aborted.html b/tests/wpt/tests/IndexedDB/upgrade-transaction-lifecycle-user-aborted.html similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/upgrade-transaction-lifecycle-user-aborted.html rename to tests/wpt/tests/IndexedDB/upgrade-transaction-lifecycle-user-aborted.html diff --git a/tests/wpt/web-platform-tests/IndexedDB/value.htm b/tests/wpt/tests/IndexedDB/value.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/value.htm rename to tests/wpt/tests/IndexedDB/value.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/value_recursive.htm b/tests/wpt/tests/IndexedDB/value_recursive.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/value_recursive.htm rename to tests/wpt/tests/IndexedDB/value_recursive.htm diff --git a/tests/wpt/web-platform-tests/IndexedDB/writer-starvation.htm b/tests/wpt/tests/IndexedDB/writer-starvation.htm similarity index 100% rename from tests/wpt/web-platform-tests/IndexedDB/writer-starvation.htm rename to tests/wpt/tests/IndexedDB/writer-starvation.htm diff --git a/tests/wpt/web-platform-tests/LICENSE.md b/tests/wpt/tests/LICENSE.md similarity index 100% rename from tests/wpt/web-platform-tests/LICENSE.md rename to tests/wpt/tests/LICENSE.md diff --git a/tests/wpt/web-platform-tests/README.md b/tests/wpt/tests/README.md similarity index 100% rename from tests/wpt/web-platform-tests/README.md rename to tests/wpt/tests/README.md diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/META.yml b/tests/wpt/tests/WebCryptoAPI/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/META.yml rename to tests/wpt/tests/WebCryptoAPI/META.yml diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/README.md b/tests/wpt/tests/WebCryptoAPI/README.md similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/README.md rename to tests/wpt/tests/WebCryptoAPI/README.md diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/algorithm-discards-context.https.window.js b/tests/wpt/tests/WebCryptoAPI/algorithm-discards-context.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/algorithm-discards-context.https.window.js rename to tests/wpt/tests/WebCryptoAPI/algorithm-discards-context.https.window.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_fixtures.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_fixtures.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_fixtures.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_bits_fixtures.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/cfrg_curves_keys.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/ecdh_bits.https.any.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/ecdh_bits.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/ecdh_bits.https.any.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/ecdh_bits.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/ecdh_bits.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/ecdh_bits.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/ecdh_bits.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/ecdh_bits.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/ecdh_keys.https.any.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/ecdh_keys.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/ecdh_keys.https.any.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/ecdh_keys.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/ecdh_keys.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/ecdh_keys.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/ecdh_keys.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/ecdh_keys.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/hkdf.https.any.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/hkdf.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/hkdf.https.any.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/hkdf.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/hkdf.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/hkdf.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/hkdf.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/hkdf.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/hkdf_vectors.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/hkdf_vectors.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/hkdf_vectors.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/hkdf_vectors.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/pbkdf2.https.any.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/pbkdf2.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/pbkdf2.https.any.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/pbkdf2.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/pbkdf2.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/pbkdf2.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/pbkdf2.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/pbkdf2.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/pbkdf2_vectors.js b/tests/wpt/tests/WebCryptoAPI/derive_bits_keys/pbkdf2_vectors.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/pbkdf2_vectors.js rename to tests/wpt/tests/WebCryptoAPI/derive_bits_keys/pbkdf2_vectors.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/digest/digest.https.any.js b/tests/wpt/tests/WebCryptoAPI/digest/digest.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/digest/digest.https.any.js rename to tests/wpt/tests/WebCryptoAPI/digest/digest.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes.js b/tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes.js rename to tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_cbc.https.any.js b/tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_cbc.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_cbc.https.any.js rename to tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_cbc.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_cbc_vectors.js b/tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_cbc_vectors.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_cbc_vectors.js rename to tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_cbc_vectors.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_ctr.https.any.js b/tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_ctr.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_ctr.https.any.js rename to tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_ctr.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_ctr_vectors.js b/tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_ctr_vectors.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_ctr_vectors.js rename to tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_ctr_vectors.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_gcm.https.any.js b/tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_gcm.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_gcm.https.any.js rename to tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_gcm.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_256_iv.https.any.js b/tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_256_iv.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_256_iv.https.any.js rename to tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_256_iv.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_256_iv_fixtures.js b/tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_256_iv_fixtures.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_256_iv_fixtures.js rename to tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_256_iv_fixtures.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_96_iv_fixtures.js b/tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_96_iv_fixtures.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_96_iv_fixtures.js rename to tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_96_iv_fixtures.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_vectors.js b/tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_vectors.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_vectors.js rename to tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/aes_gcm_vectors.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/rsa.js b/tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/rsa.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/rsa.js rename to tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/rsa.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/rsa_oaep.https.any.js b/tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/rsa_oaep.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/rsa_oaep.https.any.js rename to tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/rsa_oaep.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/rsa_vectors.js b/tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/rsa_vectors.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/encrypt_decrypt/rsa_vectors.js rename to tests/wpt/tests/WebCryptoAPI/encrypt_decrypt/rsa_vectors.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CBC.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures_AES-CBC.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CBC.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures_AES-CBC.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CTR.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures_AES-CTR.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CTR.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures_AES-CTR.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-GCM.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures_AES-GCM.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-GCM.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures_AES-GCM.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-KW.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures_AES-KW.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-KW.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures_AES-KW.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDH.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures_ECDH.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDH.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures_ECDH.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDSA.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures_ECDSA.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDSA.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures_ECDSA.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_Ed25519.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures_Ed25519.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_Ed25519.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures_Ed25519.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_Ed448.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures_Ed448.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_Ed448.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures_Ed448.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_HMAC.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures_HMAC.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_HMAC.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures_HMAC.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_X25519.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures_X25519.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_X25519.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures_X25519.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_X448.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/failures_X448.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_X448.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/failures_X448.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CBC.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes_AES-CBC.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CBC.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes_AES-CBC.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CTR.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes_AES-CTR.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CTR.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes_AES-CTR.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-GCM.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes_AES-GCM.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-GCM.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes_AES-GCM.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-KW.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes_AES-KW.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-KW.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes_AES-KW.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDH.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes_ECDH.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDH.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes_ECDH.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDSA.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes_ECDSA.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDSA.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes_ECDSA.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_Ed25519.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes_Ed25519.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_Ed25519.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes_Ed25519.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_Ed448.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes_Ed448.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_Ed448.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes_Ed448.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_HMAC.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes_HMAC.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_HMAC.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes_HMAC.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_X25519.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes_X25519.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_X25519.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes_X25519.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_X448.https.any.js b/tests/wpt/tests/WebCryptoAPI/generateKey/successes_X448.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_X448.https.any.js rename to tests/wpt/tests/WebCryptoAPI/generateKey/successes_X448.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/getRandomValues.any.js b/tests/wpt/tests/WebCryptoAPI/getRandomValues.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/getRandomValues.any.js rename to tests/wpt/tests/WebCryptoAPI/getRandomValues.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/historical.any.js b/tests/wpt/tests/WebCryptoAPI/historical.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/historical.any.js rename to tests/wpt/tests/WebCryptoAPI/historical.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/idlharness.https.any.js b/tests/wpt/tests/WebCryptoAPI/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/idlharness.https.any.js rename to tests/wpt/tests/WebCryptoAPI/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/import_export/ec_importKey.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/ec_importKey.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/import_export/ec_importKey.https.any.js rename to tests/wpt/tests/WebCryptoAPI/import_export/ec_importKey.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/import_export/okp_importKey.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/import_export/okp_importKey.https.any.js rename to tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/import_export/okp_importKey_failures.js b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_failures.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/import_export/okp_importKey_failures.js rename to tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_failures.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/import_export/okp_importKey_failures_Ed25519.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_failures_Ed25519.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/import_export/okp_importKey_failures_Ed25519.https.any.js rename to tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_failures_Ed25519.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/import_export/okp_importKey_failures_Ed448.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_failures_Ed448.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/import_export/okp_importKey_failures_Ed448.https.any.js rename to tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_failures_Ed448.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/import_export/okp_importKey_failures_X25519.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_failures_X25519.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/import_export/okp_importKey_failures_X25519.https.any.js rename to tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_failures_X25519.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/import_export/okp_importKey_failures_X448.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_failures_X448.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/import_export/okp_importKey_failures_X448.https.any.js rename to tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey_failures_X448.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/import_export/rsa_importKey.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/rsa_importKey.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/import_export/rsa_importKey.https.any.js rename to tests/wpt/tests/WebCryptoAPI/import_export/rsa_importKey.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/import_export/symmetric_importKey.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/symmetric_importKey.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/import_export/symmetric_importKey.https.any.js rename to tests/wpt/tests/WebCryptoAPI/import_export/symmetric_importKey.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/randomUUID.https.any.js b/tests/wpt/tests/WebCryptoAPI/randomUUID.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/randomUUID.https.any.js rename to tests/wpt/tests/WebCryptoAPI/randomUUID.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/secure_context/crypto-subtle-secure-context-available.https.sub.html b/tests/wpt/tests/WebCryptoAPI/secure_context/crypto-subtle-secure-context-available.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/secure_context/crypto-subtle-secure-context-available.https.sub.html rename to tests/wpt/tests/WebCryptoAPI/secure_context/crypto-subtle-secure-context-available.https.sub.html diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/ecdsa.https.any.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/ecdsa.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/ecdsa.https.any.js rename to tests/wpt/tests/WebCryptoAPI/sign_verify/ecdsa.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/ecdsa.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/ecdsa.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/ecdsa.js rename to tests/wpt/tests/WebCryptoAPI/sign_verify/ecdsa.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/ecdsa_vectors.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/ecdsa_vectors.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/ecdsa_vectors.js rename to tests/wpt/tests/WebCryptoAPI/sign_verify/ecdsa_vectors.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/eddsa.https.any.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/eddsa.https.any.js rename to tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/eddsa.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/eddsa.js rename to tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/eddsa_vectors.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa_vectors.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/eddsa_vectors.js rename to tests/wpt/tests/WebCryptoAPI/sign_verify/eddsa_vectors.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/hmac.https.any.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/hmac.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/hmac.https.any.js rename to tests/wpt/tests/WebCryptoAPI/sign_verify/hmac.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/hmac.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/hmac.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/hmac.js rename to tests/wpt/tests/WebCryptoAPI/sign_verify/hmac.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/hmac_vectors.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/hmac_vectors.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/hmac_vectors.js rename to tests/wpt/tests/WebCryptoAPI/sign_verify/hmac_vectors.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/rsa.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/rsa.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/rsa.js rename to tests/wpt/tests/WebCryptoAPI/sign_verify/rsa.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/rsa_pkcs.https.any.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/rsa_pkcs.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/rsa_pkcs.https.any.js rename to tests/wpt/tests/WebCryptoAPI/sign_verify/rsa_pkcs.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/rsa_pkcs_vectors.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/rsa_pkcs_vectors.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/rsa_pkcs_vectors.js rename to tests/wpt/tests/WebCryptoAPI/sign_verify/rsa_pkcs_vectors.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/rsa_pss.https.any.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/rsa_pss.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/rsa_pss.https.any.js rename to tests/wpt/tests/WebCryptoAPI/sign_verify/rsa_pss.https.any.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/rsa_pss_vectors.js b/tests/wpt/tests/WebCryptoAPI/sign_verify/rsa_pss_vectors.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/sign_verify/rsa_pss_vectors.js rename to tests/wpt/tests/WebCryptoAPI/sign_verify/rsa_pss_vectors.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/tools/generate.py b/tests/wpt/tests/WebCryptoAPI/tools/generate.py similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/tools/generate.py rename to tests/wpt/tests/WebCryptoAPI/tools/generate.py diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/util/helpers.js b/tests/wpt/tests/WebCryptoAPI/util/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/util/helpers.js rename to tests/wpt/tests/WebCryptoAPI/util/helpers.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/util/worker-report-crypto-subtle-presence.js b/tests/wpt/tests/WebCryptoAPI/util/worker-report-crypto-subtle-presence.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/util/worker-report-crypto-subtle-presence.js rename to tests/wpt/tests/WebCryptoAPI/util/worker-report-crypto-subtle-presence.js diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/wrapKey_unwrapKey/wrapKey_unwrapKey.https.any.js b/tests/wpt/tests/WebCryptoAPI/wrapKey_unwrapKey/wrapKey_unwrapKey.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/WebCryptoAPI/wrapKey_unwrapKey/wrapKey_unwrapKey.https.any.js rename to tests/wpt/tests/WebCryptoAPI/wrapKey_unwrapKey/wrapKey_unwrapKey.https.any.js diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html b/tests/wpt/tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html rename to tests/wpt/tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html.headers b/tests/wpt/tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html.headers rename to tests/wpt/tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/tests/wpt/tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html rename to tests/wpt/tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html b/tests/wpt/tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html rename to tests/wpt/tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html b/tests/wpt/tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html rename to tests/wpt/tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html.headers b/tests/wpt/tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html.headers rename to tests/wpt/tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html b/tests/wpt/tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html rename to tests/wpt/tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html.headers b/tests/wpt/tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html.headers rename to tests/wpt/tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-iframe-access.https.html b/tests/wpt/tests/accelerometer/Accelerometer-iframe-access.https.html similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/Accelerometer-iframe-access.https.html rename to tests/wpt/tests/accelerometer/Accelerometer-iframe-access.https.html diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-supported-by-feature-policy.html b/tests/wpt/tests/accelerometer/Accelerometer-supported-by-feature-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/Accelerometer-supported-by-feature-policy.html rename to tests/wpt/tests/accelerometer/Accelerometer-supported-by-feature-policy.html diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer.https.html b/tests/wpt/tests/accelerometer/Accelerometer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/Accelerometer.https.html rename to tests/wpt/tests/accelerometer/Accelerometer.https.html diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer_insecure_context.html b/tests/wpt/tests/accelerometer/Accelerometer_insecure_context.html similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/Accelerometer_insecure_context.html rename to tests/wpt/tests/accelerometer/Accelerometer_insecure_context.html diff --git a/tests/wpt/web-platform-tests/accelerometer/GravitySensor.https.html b/tests/wpt/tests/accelerometer/GravitySensor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/GravitySensor.https.html rename to tests/wpt/tests/accelerometer/GravitySensor.https.html diff --git a/tests/wpt/web-platform-tests/accelerometer/LinearAccelerationSensor-shake-threshold-manual.https.html b/tests/wpt/tests/accelerometer/LinearAccelerationSensor-shake-threshold-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/LinearAccelerationSensor-shake-threshold-manual.https.html rename to tests/wpt/tests/accelerometer/LinearAccelerationSensor-shake-threshold-manual.https.html diff --git a/tests/wpt/web-platform-tests/accelerometer/LinearAccelerationSensor.https.html b/tests/wpt/tests/accelerometer/LinearAccelerationSensor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/LinearAccelerationSensor.https.html rename to tests/wpt/tests/accelerometer/LinearAccelerationSensor.https.html diff --git a/tests/wpt/web-platform-tests/accelerometer/META.yml b/tests/wpt/tests/accelerometer/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/META.yml rename to tests/wpt/tests/accelerometer/META.yml diff --git a/tests/wpt/web-platform-tests/accelerometer/idlharness.https.window.js b/tests/wpt/tests/accelerometer/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/accelerometer/idlharness.https.window.js rename to tests/wpt/tests/accelerometer/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/accessibility/ReadMe.md b/tests/wpt/tests/accessibility/ReadMe.md similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/ReadMe.md rename to tests/wpt/tests/accessibility/ReadMe.md diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/activedescendant-crash.html b/tests/wpt/tests/accessibility/crashtests/activedescendant-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/activedescendant-crash.html rename to tests/wpt/tests/accessibility/crashtests/activedescendant-crash.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/aom-in-destroyed-iframe.html b/tests/wpt/tests/accessibility/crashtests/aom-in-destroyed-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/aom-in-destroyed-iframe.html rename to tests/wpt/tests/accessibility/crashtests/aom-in-destroyed-iframe.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/append-image-using-illegal-map.html b/tests/wpt/tests/accessibility/crashtests/append-image-using-illegal-map.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/append-image-using-illegal-map.html rename to tests/wpt/tests/accessibility/crashtests/append-image-using-illegal-map.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/aria-hidden-with-select.html b/tests/wpt/tests/accessibility/crashtests/aria-hidden-with-select.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/aria-hidden-with-select.html rename to tests/wpt/tests/accessibility/crashtests/aria-hidden-with-select.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/aria-owns-destroyed-by-content-replacement.html b/tests/wpt/tests/accessibility/crashtests/aria-owns-destroyed-by-content-replacement.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/aria-owns-destroyed-by-content-replacement.html rename to tests/wpt/tests/accessibility/crashtests/aria-owns-destroyed-by-content-replacement.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/aria-owns-fallback-content.html b/tests/wpt/tests/accessibility/crashtests/aria-owns-fallback-content.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/aria-owns-fallback-content.html rename to tests/wpt/tests/accessibility/crashtests/aria-owns-fallback-content.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/aria-owns-reparent.html b/tests/wpt/tests/accessibility/crashtests/aria-owns-reparent.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/aria-owns-reparent.html rename to tests/wpt/tests/accessibility/crashtests/aria-owns-reparent.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/aria-owns-select.html b/tests/wpt/tests/accessibility/crashtests/aria-owns-select.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/aria-owns-select.html rename to tests/wpt/tests/accessibility/crashtests/aria-owns-select.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/bdo-table-cell.html b/tests/wpt/tests/accessibility/crashtests/bdo-table-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/bdo-table-cell.html rename to tests/wpt/tests/accessibility/crashtests/bdo-table-cell.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/computed-accessible-child-of-pseudo-element.html b/tests/wpt/tests/accessibility/crashtests/computed-accessible-child-of-pseudo-element.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/computed-accessible-child-of-pseudo-element.html rename to tests/wpt/tests/accessibility/crashtests/computed-accessible-child-of-pseudo-element.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/computed-accessible-text-node.html b/tests/wpt/tests/accessibility/crashtests/computed-accessible-text-node.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/computed-accessible-text-node.html rename to tests/wpt/tests/accessibility/crashtests/computed-accessible-text-node.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/computed-node-checked.html b/tests/wpt/tests/accessibility/crashtests/computed-node-checked.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/computed-node-checked.html rename to tests/wpt/tests/accessibility/crashtests/computed-node-checked.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/computed-node.html b/tests/wpt/tests/accessibility/crashtests/computed-node.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/computed-node.html rename to tests/wpt/tests/accessibility/crashtests/computed-node.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/content-visibility-generated-content-removal.html b/tests/wpt/tests/accessibility/crashtests/content-visibility-generated-content-removal.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/content-visibility-generated-content-removal.html rename to tests/wpt/tests/accessibility/crashtests/content-visibility-generated-content-removal.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/delayed-ignored-change.html b/tests/wpt/tests/accessibility/crashtests/delayed-ignored-change.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/delayed-ignored-change.html rename to tests/wpt/tests/accessibility/crashtests/delayed-ignored-change.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/displaylocked-serialize.html b/tests/wpt/tests/accessibility/crashtests/displaylocked-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/displaylocked-serialize.html rename to tests/wpt/tests/accessibility/crashtests/displaylocked-serialize.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/hidden-textfield-with-combobox.html b/tests/wpt/tests/accessibility/crashtests/hidden-textfield-with-combobox.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/hidden-textfield-with-combobox.html rename to tests/wpt/tests/accessibility/crashtests/hidden-textfield-with-combobox.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/iframe-owns-child.html b/tests/wpt/tests/accessibility/crashtests/iframe-owns-child.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/iframe-owns-child.html rename to tests/wpt/tests/accessibility/crashtests/iframe-owns-child.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/iframe-srcdoc.html b/tests/wpt/tests/accessibility/crashtests/iframe-srcdoc.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/iframe-srcdoc.html rename to tests/wpt/tests/accessibility/crashtests/iframe-srcdoc.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/img-map-pseudo.html b/tests/wpt/tests/accessibility/crashtests/img-map-pseudo.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/img-map-pseudo.html rename to tests/wpt/tests/accessibility/crashtests/img-map-pseudo.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/in-page-link-with-aria-hidden.html b/tests/wpt/tests/accessibility/crashtests/in-page-link-with-aria-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/in-page-link-with-aria-hidden.html rename to tests/wpt/tests/accessibility/crashtests/in-page-link-with-aria-hidden.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/included-descendant-dom-removal.html b/tests/wpt/tests/accessibility/crashtests/included-descendant-dom-removal.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/included-descendant-dom-removal.html rename to tests/wpt/tests/accessibility/crashtests/included-descendant-dom-removal.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/included-descendant-layout-removal.html b/tests/wpt/tests/accessibility/crashtests/included-descendant-layout-removal.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/included-descendant-layout-removal.html rename to tests/wpt/tests/accessibility/crashtests/included-descendant-layout-removal.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/input-time-datalist.html b/tests/wpt/tests/accessibility/crashtests/input-time-datalist.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/input-time-datalist.html rename to tests/wpt/tests/accessibility/crashtests/input-time-datalist.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/map-inside-map-2.html b/tests/wpt/tests/accessibility/crashtests/map-inside-map-2.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/map-inside-map-2.html rename to tests/wpt/tests/accessibility/crashtests/map-inside-map-2.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/map-inside-map.html b/tests/wpt/tests/accessibility/crashtests/map-inside-map.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/map-inside-map.html rename to tests/wpt/tests/accessibility/crashtests/map-inside-map.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/map-update-crash.html b/tests/wpt/tests/accessibility/crashtests/map-update-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/map-update-crash.html rename to tests/wpt/tests/accessibility/crashtests/map-update-crash.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/move-owned-inside-another-owned.html b/tests/wpt/tests/accessibility/crashtests/move-owned-inside-another-owned.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/move-owned-inside-another-owned.html rename to tests/wpt/tests/accessibility/crashtests/move-owned-inside-another-owned.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/multicol-with-text-change-role-relayout-crash.html b/tests/wpt/tests/accessibility/crashtests/multicol-with-text-change-role-relayout-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/multicol-with-text-change-role-relayout-crash.html rename to tests/wpt/tests/accessibility/crashtests/multicol-with-text-change-role-relayout-crash.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/object-with-unrendered-text-fallback.html b/tests/wpt/tests/accessibility/crashtests/object-with-unrendered-text-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/object-with-unrendered-text-fallback.html rename to tests/wpt/tests/accessibility/crashtests/object-with-unrendered-text-fallback.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/removed-from-flat-tree.html b/tests/wpt/tests/accessibility/crashtests/removed-from-flat-tree.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/removed-from-flat-tree.html rename to tests/wpt/tests/accessibility/crashtests/removed-from-flat-tree.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/serialize-with-no-document.html b/tests/wpt/tests/accessibility/crashtests/serialize-with-no-document.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/serialize-with-no-document.html rename to tests/wpt/tests/accessibility/crashtests/serialize-with-no-document.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/slot-assignment-lockup.html b/tests/wpt/tests/accessibility/crashtests/slot-assignment-lockup.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/slot-assignment-lockup.html rename to tests/wpt/tests/accessibility/crashtests/slot-assignment-lockup.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/svg-mouse-listener.html b/tests/wpt/tests/accessibility/crashtests/svg-mouse-listener.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/svg-mouse-listener.html rename to tests/wpt/tests/accessibility/crashtests/svg-mouse-listener.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/table-ignored-child.html b/tests/wpt/tests/accessibility/crashtests/table-ignored-child.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/table-ignored-child.html rename to tests/wpt/tests/accessibility/crashtests/table-ignored-child.html diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/validation-message.html b/tests/wpt/tests/accessibility/crashtests/validation-message.html similarity index 100% rename from tests/wpt/web-platform-tests/accessibility/crashtests/validation-message.html rename to tests/wpt/tests/accessibility/crashtests/validation-message.html diff --git a/tests/wpt/web-platform-tests/accname/META.yml b/tests/wpt/tests/accname/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/accname/META.yml rename to tests/wpt/tests/accname/META.yml diff --git a/tests/wpt/web-platform-tests/accname/basic.html b/tests/wpt/tests/accname/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/basic.html rename to tests/wpt/tests/accname/basic.html diff --git a/tests/wpt/web-platform-tests/accname/manual/description_1.0_combobox-focusable-manual.html b/tests/wpt/tests/accname/manual/description_1.0_combobox-focusable-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/description_1.0_combobox-focusable-manual.html rename to tests/wpt/tests/accname/manual/description_1.0_combobox-focusable-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/description_from_content_of_describedby_element-manual.html b/tests/wpt/tests/accname/manual/description_from_content_of_describedby_element-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/description_from_content_of_describedby_element-manual.html rename to tests/wpt/tests/accname/manual/description_from_content_of_describedby_element-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/description_link-with-label-manual.html b/tests/wpt/tests/accname/manual/description_link-with-label-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/description_link-with-label-manual.html rename to tests/wpt/tests/accname/manual/description_link-with-label-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/description_test_case_557-manual.html b/tests/wpt/tests/accname/manual/description_test_case_557-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/description_test_case_557-manual.html rename to tests/wpt/tests/accname/manual/description_test_case_557-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/description_test_case_664-manual.html b/tests/wpt/tests/accname/manual/description_test_case_664-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/description_test_case_664-manual.html rename to tests/wpt/tests/accname/manual/description_test_case_664-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/description_test_case_665-manual.html b/tests/wpt/tests/accname/manual/description_test_case_665-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/description_test_case_665-manual.html rename to tests/wpt/tests/accname/manual/description_test_case_665-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/description_test_case_666-manual.html b/tests/wpt/tests/accname/manual/description_test_case_666-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/description_test_case_666-manual.html rename to tests/wpt/tests/accname/manual/description_test_case_666-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/description_test_case_772-manual.html b/tests/wpt/tests/accname/manual/description_test_case_772-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/description_test_case_772-manual.html rename to tests/wpt/tests/accname/manual/description_test_case_772-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/description_test_case_773-manual.html b/tests/wpt/tests/accname/manual/description_test_case_773-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/description_test_case_773-manual.html rename to tests/wpt/tests/accname/manual/description_test_case_773-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/description_test_case_774-manual.html b/tests/wpt/tests/accname/manual/description_test_case_774-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/description_test_case_774-manual.html rename to tests/wpt/tests/accname/manual/description_test_case_774-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/description_test_case_838-manual.html b/tests/wpt/tests/accname/manual/description_test_case_838-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/description_test_case_838-manual.html rename to tests/wpt/tests/accname/manual/description_test_case_838-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/description_test_case_broken_reference-manual.html b/tests/wpt/tests/accname/manual/description_test_case_broken_reference-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/description_test_case_broken_reference-manual.html rename to tests/wpt/tests/accname/manual/description_test_case_broken_reference-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/description_test_case_one_valid_reference-manual.html b/tests/wpt/tests/accname/manual/description_test_case_one_valid_reference-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/description_test_case_one_valid_reference-manual.html rename to tests/wpt/tests/accname/manual/description_test_case_one_valid_reference-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/description_title-same-element-manual.html b/tests/wpt/tests/accname/manual/description_title-same-element-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/description_title-same-element-manual.html rename to tests/wpt/tests/accname/manual/description_title-same-element-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/foo.jpg b/tests/wpt/tests/accname/manual/foo.jpg similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/foo.jpg rename to tests/wpt/tests/accname/manual/foo.jpg diff --git a/tests/wpt/web-platform-tests/accname/manual/name_1.0_combobox-focusable-alternative-manual.html b/tests/wpt/tests/accname/manual/name_1.0_combobox-focusable-alternative-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_1.0_combobox-focusable-alternative-manual.html rename to tests/wpt/tests/accname/manual/name_1.0_combobox-focusable-alternative-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_1.0_combobox-focusable-manual.html b/tests/wpt/tests/accname/manual/name_1.0_combobox-focusable-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_1.0_combobox-focusable-manual.html rename to tests/wpt/tests/accname/manual/name_1.0_combobox-focusable-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-embedded-combobox-manual.html b/tests/wpt/tests/accname/manual/name_checkbox-label-embedded-combobox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-embedded-combobox-manual.html rename to tests/wpt/tests/accname/manual/name_checkbox-label-embedded-combobox-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-embedded-listbox-manual.html b/tests/wpt/tests/accname/manual/name_checkbox-label-embedded-listbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-embedded-listbox-manual.html rename to tests/wpt/tests/accname/manual/name_checkbox-label-embedded-listbox-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-embedded-menu-manual.html b/tests/wpt/tests/accname/manual/name_checkbox-label-embedded-menu-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-embedded-menu-manual.html rename to tests/wpt/tests/accname/manual/name_checkbox-label-embedded-menu-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-embedded-select-manual.html b/tests/wpt/tests/accname/manual/name_checkbox-label-embedded-select-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-embedded-select-manual.html rename to tests/wpt/tests/accname/manual/name_checkbox-label-embedded-select-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-embedded-slider-manual.html b/tests/wpt/tests/accname/manual/name_checkbox-label-embedded-slider-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-embedded-slider-manual.html rename to tests/wpt/tests/accname/manual/name_checkbox-label-embedded-slider-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-embedded-spinbutton-manual.html b/tests/wpt/tests/accname/manual/name_checkbox-label-embedded-spinbutton-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-embedded-spinbutton-manual.html rename to tests/wpt/tests/accname/manual/name_checkbox-label-embedded-spinbutton-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-embedded-textbox-manual.html b/tests/wpt/tests/accname/manual/name_checkbox-label-embedded-textbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-embedded-textbox-manual.html rename to tests/wpt/tests/accname/manual/name_checkbox-label-embedded-textbox-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-multiple-label-alternative-manual.html b/tests/wpt/tests/accname/manual/name_checkbox-label-multiple-label-alternative-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-multiple-label-alternative-manual.html rename to tests/wpt/tests/accname/manual/name_checkbox-label-multiple-label-alternative-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-multiple-label-manual.html b/tests/wpt/tests/accname/manual/name_checkbox-label-multiple-label-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_checkbox-label-multiple-label-manual.html rename to tests/wpt/tests/accname/manual/name_checkbox-label-multiple-label-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_checkbox-title-manual.html b/tests/wpt/tests/accname/manual/name_checkbox-title-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_checkbox-title-manual.html rename to tests/wpt/tests/accname/manual/name_checkbox-title-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_file-label-embedded-combobox-manual.html b/tests/wpt/tests/accname/manual/name_file-label-embedded-combobox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_file-label-embedded-combobox-manual.html rename to tests/wpt/tests/accname/manual/name_file-label-embedded-combobox-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_file-label-embedded-menu-manual.html b/tests/wpt/tests/accname/manual/name_file-label-embedded-menu-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_file-label-embedded-menu-manual.html rename to tests/wpt/tests/accname/manual/name_file-label-embedded-menu-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_file-label-embedded-select-manual.html b/tests/wpt/tests/accname/manual/name_file-label-embedded-select-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_file-label-embedded-select-manual.html rename to tests/wpt/tests/accname/manual/name_file-label-embedded-select-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_file-label-embedded-slider-manual.html b/tests/wpt/tests/accname/manual/name_file-label-embedded-slider-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_file-label-embedded-slider-manual.html rename to tests/wpt/tests/accname/manual/name_file-label-embedded-slider-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_file-label-embedded-spinbutton-manual.html b/tests/wpt/tests/accname/manual/name_file-label-embedded-spinbutton-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_file-label-embedded-spinbutton-manual.html rename to tests/wpt/tests/accname/manual/name_file-label-embedded-spinbutton-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_file-label-inline-block-elements-manual.html b/tests/wpt/tests/accname/manual/name_file-label-inline-block-elements-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_file-label-inline-block-elements-manual.html rename to tests/wpt/tests/accname/manual/name_file-label-inline-block-elements-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_file-label-inline-block-styles-manual.html b/tests/wpt/tests/accname/manual/name_file-label-inline-block-styles-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_file-label-inline-block-styles-manual.html rename to tests/wpt/tests/accname/manual/name_file-label-inline-block-styles-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_file-label-inline-hidden-elements-manual.html b/tests/wpt/tests/accname/manual/name_file-label-inline-hidden-elements-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_file-label-inline-hidden-elements-manual.html rename to tests/wpt/tests/accname/manual/name_file-label-inline-hidden-elements-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_file-label-owned-combobox-manual.html b/tests/wpt/tests/accname/manual/name_file-label-owned-combobox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_file-label-owned-combobox-manual.html rename to tests/wpt/tests/accname/manual/name_file-label-owned-combobox-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_file-label-owned-combobox-owned-listbox-manual.html b/tests/wpt/tests/accname/manual/name_file-label-owned-combobox-owned-listbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_file-label-owned-combobox-owned-listbox-manual.html rename to tests/wpt/tests/accname/manual/name_file-label-owned-combobox-owned-listbox-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_file-title-manual.html b/tests/wpt/tests/accname/manual/name_file-title-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_file-title-manual.html rename to tests/wpt/tests/accname/manual/name_file-title-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_from_content-manual.html b/tests/wpt/tests/accname/manual/name_from_content-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_from_content-manual.html rename to tests/wpt/tests/accname/manual/name_from_content-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_from_content_of_label-manual.html b/tests/wpt/tests/accname/manual/name_from_content_of_label-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_from_content_of_label-manual.html rename to tests/wpt/tests/accname/manual/name_from_content_of_label-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_from_content_of_labelledby_element-manual.html b/tests/wpt/tests/accname/manual/name_from_content_of_labelledby_element-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_from_content_of_labelledby_element-manual.html rename to tests/wpt/tests/accname/manual/name_from_content_of_labelledby_element-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_from_content_of_labelledby_elements_one_of_which_is_hidden-manual.html b/tests/wpt/tests/accname/manual/name_from_content_of_labelledby_elements_one_of_which_is_hidden-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_from_content_of_labelledby_elements_one_of_which_is_hidden-manual.html rename to tests/wpt/tests/accname/manual/name_from_content_of_labelledby_elements_one_of_which_is_hidden-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_heading-combobox-focusable-alternative-manual.html b/tests/wpt/tests/accname/manual/name_heading-combobox-focusable-alternative-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_heading-combobox-focusable-alternative-manual.html rename to tests/wpt/tests/accname/manual/name_heading-combobox-focusable-alternative-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_image-title-manual.html b/tests/wpt/tests/accname/manual/name_image-title-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_image-title-manual.html rename to tests/wpt/tests/accname/manual/name_image-title-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_link-mixed-content-manual.html b/tests/wpt/tests/accname/manual/name_link-mixed-content-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_link-mixed-content-manual.html rename to tests/wpt/tests/accname/manual/name_link-mixed-content-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_link-with-label-manual.html b/tests/wpt/tests/accname/manual/name_link-with-label-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_link-with-label-manual.html rename to tests/wpt/tests/accname/manual/name_link-with-label-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_password-label-embedded-combobox-manual.html b/tests/wpt/tests/accname/manual/name_password-label-embedded-combobox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_password-label-embedded-combobox-manual.html rename to tests/wpt/tests/accname/manual/name_password-label-embedded-combobox-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_password-label-embedded-menu-manual.html b/tests/wpt/tests/accname/manual/name_password-label-embedded-menu-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_password-label-embedded-menu-manual.html rename to tests/wpt/tests/accname/manual/name_password-label-embedded-menu-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_password-label-embedded-select-manual.html b/tests/wpt/tests/accname/manual/name_password-label-embedded-select-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_password-label-embedded-select-manual.html rename to tests/wpt/tests/accname/manual/name_password-label-embedded-select-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_password-label-embedded-slider-manual.html b/tests/wpt/tests/accname/manual/name_password-label-embedded-slider-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_password-label-embedded-slider-manual.html rename to tests/wpt/tests/accname/manual/name_password-label-embedded-slider-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_password-label-embedded-spinbutton-manual.html b/tests/wpt/tests/accname/manual/name_password-label-embedded-spinbutton-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_password-label-embedded-spinbutton-manual.html rename to tests/wpt/tests/accname/manual/name_password-label-embedded-spinbutton-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_password-title-manual.html b/tests/wpt/tests/accname/manual/name_password-title-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_password-title-manual.html rename to tests/wpt/tests/accname/manual/name_password-title-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_radio-label-embedded-combobox-manual.html b/tests/wpt/tests/accname/manual/name_radio-label-embedded-combobox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_radio-label-embedded-combobox-manual.html rename to tests/wpt/tests/accname/manual/name_radio-label-embedded-combobox-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_radio-label-embedded-menu-manual.html b/tests/wpt/tests/accname/manual/name_radio-label-embedded-menu-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_radio-label-embedded-menu-manual.html rename to tests/wpt/tests/accname/manual/name_radio-label-embedded-menu-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_radio-label-embedded-select-manual.html b/tests/wpt/tests/accname/manual/name_radio-label-embedded-select-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_radio-label-embedded-select-manual.html rename to tests/wpt/tests/accname/manual/name_radio-label-embedded-select-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_radio-label-embedded-slider-manual.html b/tests/wpt/tests/accname/manual/name_radio-label-embedded-slider-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_radio-label-embedded-slider-manual.html rename to tests/wpt/tests/accname/manual/name_radio-label-embedded-slider-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_radio-label-embedded-spinbutton-manual.html b/tests/wpt/tests/accname/manual/name_radio-label-embedded-spinbutton-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_radio-label-embedded-spinbutton-manual.html rename to tests/wpt/tests/accname/manual/name_radio-label-embedded-spinbutton-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_radio-title-manual.html b/tests/wpt/tests/accname/manual/name_radio-title-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_radio-title-manual.html rename to tests/wpt/tests/accname/manual/name_radio-title-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_539-manual.html b/tests/wpt/tests/accname/manual/name_test_case_539-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_539-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_539-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_540-manual.html b/tests/wpt/tests/accname/manual/name_test_case_540-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_540-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_540-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_541-manual.html b/tests/wpt/tests/accname/manual/name_test_case_541-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_541-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_541-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_543-manual.html b/tests/wpt/tests/accname/manual/name_test_case_543-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_543-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_543-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_544-manual.html b/tests/wpt/tests/accname/manual/name_test_case_544-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_544-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_544-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_545-manual.html b/tests/wpt/tests/accname/manual/name_test_case_545-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_545-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_545-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_546-manual.html b/tests/wpt/tests/accname/manual/name_test_case_546-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_546-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_546-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_547-manual.html b/tests/wpt/tests/accname/manual/name_test_case_547-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_547-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_547-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_548-manual.html b/tests/wpt/tests/accname/manual/name_test_case_548-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_548-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_548-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_549-manual.html b/tests/wpt/tests/accname/manual/name_test_case_549-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_549-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_549-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_550-manual.html b/tests/wpt/tests/accname/manual/name_test_case_550-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_550-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_550-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_551-manual.html b/tests/wpt/tests/accname/manual/name_test_case_551-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_551-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_551-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_552-manual.html b/tests/wpt/tests/accname/manual/name_test_case_552-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_552-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_552-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_553-manual.html b/tests/wpt/tests/accname/manual/name_test_case_553-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_553-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_553-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_556-manual.html b/tests/wpt/tests/accname/manual/name_test_case_556-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_556-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_556-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_557-manual.html b/tests/wpt/tests/accname/manual/name_test_case_557-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_557-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_557-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_558-manual.html b/tests/wpt/tests/accname/manual/name_test_case_558-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_558-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_558-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_559-manual.html b/tests/wpt/tests/accname/manual/name_test_case_559-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_559-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_559-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_560-manual.html b/tests/wpt/tests/accname/manual/name_test_case_560-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_560-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_560-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_561-manual.html b/tests/wpt/tests/accname/manual/name_test_case_561-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_561-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_561-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_562-manual.html b/tests/wpt/tests/accname/manual/name_test_case_562-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_562-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_562-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_563-manual.html b/tests/wpt/tests/accname/manual/name_test_case_563-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_563-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_563-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_564-manual.html b/tests/wpt/tests/accname/manual/name_test_case_564-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_564-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_564-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_565-manual.html b/tests/wpt/tests/accname/manual/name_test_case_565-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_565-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_565-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_566-manual.html b/tests/wpt/tests/accname/manual/name_test_case_566-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_566-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_566-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_596-manual.html b/tests/wpt/tests/accname/manual/name_test_case_596-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_596-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_596-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_597-manual.html b/tests/wpt/tests/accname/manual/name_test_case_597-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_597-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_597-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_598-manual.html b/tests/wpt/tests/accname/manual/name_test_case_598-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_598-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_598-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_599-manual.html b/tests/wpt/tests/accname/manual/name_test_case_599-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_599-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_599-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_600-manual.html b/tests/wpt/tests/accname/manual/name_test_case_600-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_600-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_600-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_601-manual.html b/tests/wpt/tests/accname/manual/name_test_case_601-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_601-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_601-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_602-manual.html b/tests/wpt/tests/accname/manual/name_test_case_602-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_602-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_602-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_603-manual.html b/tests/wpt/tests/accname/manual/name_test_case_603-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_603-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_603-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_604-manual.html b/tests/wpt/tests/accname/manual/name_test_case_604-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_604-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_604-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_605-manual.html b/tests/wpt/tests/accname/manual/name_test_case_605-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_605-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_605-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_606-manual.html b/tests/wpt/tests/accname/manual/name_test_case_606-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_606-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_606-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_607-manual.html b/tests/wpt/tests/accname/manual/name_test_case_607-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_607-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_607-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_608-manual.html b/tests/wpt/tests/accname/manual/name_test_case_608-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_608-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_608-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_609-manual.html b/tests/wpt/tests/accname/manual/name_test_case_609-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_609-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_609-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_610-manual.html b/tests/wpt/tests/accname/manual/name_test_case_610-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_610-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_610-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_611-manual.html b/tests/wpt/tests/accname/manual/name_test_case_611-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_611-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_611-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_612-manual.html b/tests/wpt/tests/accname/manual/name_test_case_612-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_612-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_612-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_613-manual.html b/tests/wpt/tests/accname/manual/name_test_case_613-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_613-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_613-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_614-manual.html b/tests/wpt/tests/accname/manual/name_test_case_614-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_614-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_614-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_615-manual.html b/tests/wpt/tests/accname/manual/name_test_case_615-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_615-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_615-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_616-manual.html b/tests/wpt/tests/accname/manual/name_test_case_616-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_616-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_616-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_617-manual.html b/tests/wpt/tests/accname/manual/name_test_case_617-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_617-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_617-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_618-manual.html b/tests/wpt/tests/accname/manual/name_test_case_618-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_618-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_618-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_619-manual.html b/tests/wpt/tests/accname/manual/name_test_case_619-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_619-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_619-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_620-manual.html b/tests/wpt/tests/accname/manual/name_test_case_620-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_620-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_620-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_621-manual.html b/tests/wpt/tests/accname/manual/name_test_case_621-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_621-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_621-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_659-manual.html b/tests/wpt/tests/accname/manual/name_test_case_659-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_659-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_659-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_660-manual.html b/tests/wpt/tests/accname/manual/name_test_case_660-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_660-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_660-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_661-manual.html b/tests/wpt/tests/accname/manual/name_test_case_661-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_661-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_661-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_662-manual.html b/tests/wpt/tests/accname/manual/name_test_case_662-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_662-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_662-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_663a-manual.html b/tests/wpt/tests/accname/manual/name_test_case_663a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_663a-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_663a-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_721-manual.html b/tests/wpt/tests/accname/manual/name_test_case_721-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_721-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_721-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_723-manual.html b/tests/wpt/tests/accname/manual/name_test_case_723-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_723-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_723-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_724-manual.html b/tests/wpt/tests/accname/manual/name_test_case_724-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_724-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_724-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_725-manual.html b/tests/wpt/tests/accname/manual/name_test_case_725-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_725-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_725-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_726-manual.html b/tests/wpt/tests/accname/manual/name_test_case_726-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_726-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_726-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_727-manual.html b/tests/wpt/tests/accname/manual/name_test_case_727-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_727-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_727-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_728-manual.html b/tests/wpt/tests/accname/manual/name_test_case_728-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_728-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_728-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_729-manual.html b/tests/wpt/tests/accname/manual/name_test_case_729-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_729-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_729-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_730-manual.html b/tests/wpt/tests/accname/manual/name_test_case_730-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_730-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_730-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_731-manual.html b/tests/wpt/tests/accname/manual/name_test_case_731-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_731-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_731-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_733-manual.html b/tests/wpt/tests/accname/manual/name_test_case_733-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_733-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_733-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_734-manual.html b/tests/wpt/tests/accname/manual/name_test_case_734-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_734-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_734-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_735-manual.html b/tests/wpt/tests/accname/manual/name_test_case_735-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_735-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_735-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_736-manual.html b/tests/wpt/tests/accname/manual/name_test_case_736-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_736-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_736-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_737-manual.html b/tests/wpt/tests/accname/manual/name_test_case_737-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_737-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_737-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_738-manual.html b/tests/wpt/tests/accname/manual/name_test_case_738-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_738-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_738-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_739-manual.html b/tests/wpt/tests/accname/manual/name_test_case_739-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_739-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_739-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_740-manual.html b/tests/wpt/tests/accname/manual/name_test_case_740-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_740-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_740-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_741-manual.html b/tests/wpt/tests/accname/manual/name_test_case_741-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_741-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_741-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_742-manual.html b/tests/wpt/tests/accname/manual/name_test_case_742-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_742-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_742-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_743-manual.html b/tests/wpt/tests/accname/manual/name_test_case_743-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_743-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_743-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_744-manual.html b/tests/wpt/tests/accname/manual/name_test_case_744-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_744-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_744-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_745-manual.html b/tests/wpt/tests/accname/manual/name_test_case_745-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_745-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_745-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_746-manual.html b/tests/wpt/tests/accname/manual/name_test_case_746-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_746-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_746-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_747-manual.html b/tests/wpt/tests/accname/manual/name_test_case_747-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_747-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_747-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_748-manual.html b/tests/wpt/tests/accname/manual/name_test_case_748-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_748-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_748-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_749-manual.html b/tests/wpt/tests/accname/manual/name_test_case_749-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_749-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_749-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_750-manual.html b/tests/wpt/tests/accname/manual/name_test_case_750-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_750-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_750-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_751-manual.html b/tests/wpt/tests/accname/manual/name_test_case_751-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_751-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_751-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_752-manual.html b/tests/wpt/tests/accname/manual/name_test_case_752-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_752-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_752-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_753-manual.html b/tests/wpt/tests/accname/manual/name_test_case_753-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_753-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_753-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_754-manual.html b/tests/wpt/tests/accname/manual/name_test_case_754-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_754-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_754-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_755-manual.html b/tests/wpt/tests/accname/manual/name_test_case_755-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_755-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_755-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_756-manual.html b/tests/wpt/tests/accname/manual/name_test_case_756-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_756-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_756-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_757-manual.html b/tests/wpt/tests/accname/manual/name_test_case_757-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_757-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_757-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_758-manual.html b/tests/wpt/tests/accname/manual/name_test_case_758-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_758-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_758-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_759-manual.html b/tests/wpt/tests/accname/manual/name_test_case_759-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_759-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_759-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_760-manual.html b/tests/wpt/tests/accname/manual/name_test_case_760-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_760-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_760-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_761-manual.html b/tests/wpt/tests/accname/manual/name_test_case_761-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_761-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_761-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_test_case_762-manual.html b/tests/wpt/tests/accname/manual/name_test_case_762-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_test_case_762-manual.html rename to tests/wpt/tests/accname/manual/name_test_case_762-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_text-label-embedded-combobox-manual.html b/tests/wpt/tests/accname/manual/name_text-label-embedded-combobox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_text-label-embedded-combobox-manual.html rename to tests/wpt/tests/accname/manual/name_text-label-embedded-combobox-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_text-label-embedded-menu-manual.html b/tests/wpt/tests/accname/manual/name_text-label-embedded-menu-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_text-label-embedded-menu-manual.html rename to tests/wpt/tests/accname/manual/name_text-label-embedded-menu-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_text-label-embedded-select-manual.html b/tests/wpt/tests/accname/manual/name_text-label-embedded-select-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_text-label-embedded-select-manual.html rename to tests/wpt/tests/accname/manual/name_text-label-embedded-select-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_text-label-embedded-slider-manual.html b/tests/wpt/tests/accname/manual/name_text-label-embedded-slider-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_text-label-embedded-slider-manual.html rename to tests/wpt/tests/accname/manual/name_text-label-embedded-slider-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_text-label-embedded-spinbutton-manual.html b/tests/wpt/tests/accname/manual/name_text-label-embedded-spinbutton-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_text-label-embedded-spinbutton-manual.html rename to tests/wpt/tests/accname/manual/name_text-label-embedded-spinbutton-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/name_text-title-manual.html b/tests/wpt/tests/accname/manual/name_text-title-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/name_text-title-manual.html rename to tests/wpt/tests/accname/manual/name_text-title-manual.html diff --git a/tests/wpt/web-platform-tests/accname/manual/test.png b/tests/wpt/tests/accname/manual/test.png similarity index 100% rename from tests/wpt/web-platform-tests/accname/manual/test.png rename to tests/wpt/tests/accname/manual/test.png diff --git a/tests/wpt/web-platform-tests/accname/name/ReadMe.md b/tests/wpt/tests/accname/name/ReadMe.md similarity index 100% rename from tests/wpt/web-platform-tests/accname/name/ReadMe.md rename to tests/wpt/tests/accname/name/ReadMe.md diff --git a/tests/wpt/web-platform-tests/accname/name/comp_embedded_control.html b/tests/wpt/tests/accname/name/comp_embedded_control.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/name/comp_embedded_control.html rename to tests/wpt/tests/accname/name/comp_embedded_control.html diff --git a/tests/wpt/web-platform-tests/accname/name/comp_hidden_not_referenced.html b/tests/wpt/tests/accname/name/comp_hidden_not_referenced.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/name/comp_hidden_not_referenced.html rename to tests/wpt/tests/accname/name/comp_hidden_not_referenced.html diff --git a/tests/wpt/web-platform-tests/accname/name/comp_host_language_label.html b/tests/wpt/tests/accname/name/comp_host_language_label.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/name/comp_host_language_label.html rename to tests/wpt/tests/accname/name/comp_host_language_label.html diff --git a/tests/wpt/web-platform-tests/accname/name/comp_label.html b/tests/wpt/tests/accname/name/comp_label.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/name/comp_label.html rename to tests/wpt/tests/accname/name/comp_label.html diff --git a/tests/wpt/web-platform-tests/accname/name/comp_labelledby.html b/tests/wpt/tests/accname/name/comp_labelledby.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/name/comp_labelledby.html rename to tests/wpt/tests/accname/name/comp_labelledby.html diff --git a/tests/wpt/web-platform-tests/accname/name/comp_name_from_content.html b/tests/wpt/tests/accname/name/comp_name_from_content.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/name/comp_name_from_content.html rename to tests/wpt/tests/accname/name/comp_name_from_content.html diff --git a/tests/wpt/web-platform-tests/accname/name/comp_text_node.html b/tests/wpt/tests/accname/name/comp_text_node.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/name/comp_text_node.html rename to tests/wpt/tests/accname/name/comp_text_node.html diff --git a/tests/wpt/web-platform-tests/accname/name/comp_tooltip.html b/tests/wpt/tests/accname/name/comp_tooltip.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/name/comp_tooltip.html rename to tests/wpt/tests/accname/name/comp_tooltip.html diff --git a/tests/wpt/web-platform-tests/accname/name/shadowdom/basic.html b/tests/wpt/tests/accname/name/shadowdom/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/name/shadowdom/basic.html rename to tests/wpt/tests/accname/name/shadowdom/basic.html diff --git a/tests/wpt/web-platform-tests/accname/name/shadowdom/slot.html b/tests/wpt/tests/accname/name/shadowdom/slot.html similarity index 100% rename from tests/wpt/web-platform-tests/accname/name/shadowdom/slot.html rename to tests/wpt/tests/accname/name/shadowdom/slot.html diff --git a/tests/wpt/web-platform-tests/acid/META.yml b/tests/wpt/tests/acid/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/acid/META.yml rename to tests/wpt/tests/acid/META.yml diff --git a/tests/wpt/web-platform-tests/acid/README.md b/tests/wpt/tests/acid/README.md similarity index 100% rename from tests/wpt/web-platform-tests/acid/README.md rename to tests/wpt/tests/acid/README.md diff --git a/tests/wpt/web-platform-tests/acid/acid2/404.html b/tests/wpt/tests/acid/acid2/404.html similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid2/404.html rename to tests/wpt/tests/acid/acid2/404.html diff --git a/tests/wpt/web-platform-tests/acid/acid2/px-reference.html b/tests/wpt/tests/acid/acid2/px-reference.html similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid2/px-reference.html rename to tests/wpt/tests/acid/acid2/px-reference.html diff --git a/tests/wpt/web-platform-tests/acid/acid2/reference.html b/tests/wpt/tests/acid/acid2/reference.html similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid2/reference.html rename to tests/wpt/tests/acid/acid2/reference.html diff --git a/tests/wpt/web-platform-tests/acid/acid2/reference.png b/tests/wpt/tests/acid/acid2/reference.png similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid2/reference.png rename to tests/wpt/tests/acid/acid2/reference.png diff --git a/tests/wpt/web-platform-tests/acid/acid2/reftest.html b/tests/wpt/tests/acid/acid2/reftest.html similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid2/reftest.html rename to tests/wpt/tests/acid/acid2/reftest.html diff --git a/tests/wpt/web-platform-tests/acid/acid2/test.html b/tests/wpt/tests/acid/acid2/test.html similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid2/test.html rename to tests/wpt/tests/acid/acid2/test.html diff --git a/tests/wpt/web-platform-tests/acid/acid3/empty.css b/tests/wpt/tests/acid/acid3/empty.css similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/empty.css rename to tests/wpt/tests/acid/acid3/empty.css diff --git a/tests/wpt/web-platform-tests/acid/acid3/empty.css.headers b/tests/wpt/tests/acid/acid3/empty.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/empty.css.headers rename to tests/wpt/tests/acid/acid3/empty.css.headers diff --git a/tests/wpt/web-platform-tests/acid/acid3/empty.html b/tests/wpt/tests/acid/acid3/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/empty.html rename to tests/wpt/tests/acid/acid3/empty.html diff --git a/tests/wpt/web-platform-tests/acid/acid3/empty.png b/tests/wpt/tests/acid/acid3/empty.png similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/empty.png rename to tests/wpt/tests/acid/acid3/empty.png diff --git a/tests/wpt/web-platform-tests/acid/acid3/empty.txt b/tests/wpt/tests/acid/acid3/empty.txt similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/empty.txt rename to tests/wpt/tests/acid/acid3/empty.txt diff --git a/tests/wpt/web-platform-tests/acid/acid3/empty.xml b/tests/wpt/tests/acid/acid3/empty.xml similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/empty.xml rename to tests/wpt/tests/acid/acid3/empty.xml diff --git a/tests/wpt/web-platform-tests/acid/acid3/empty.xml.headers b/tests/wpt/tests/acid/acid3/empty.xml.headers similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/empty.xml.headers rename to tests/wpt/tests/acid/acid3/empty.xml.headers diff --git a/tests/wpt/web-platform-tests/acid/acid3/favicon.ico b/tests/wpt/tests/acid/acid3/favicon.ico similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/favicon.ico rename to tests/wpt/tests/acid/acid3/favicon.ico diff --git a/tests/wpt/web-platform-tests/acid/acid3/favicon.ico.headers b/tests/wpt/tests/acid/acid3/favicon.ico.headers similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/favicon.ico.headers rename to tests/wpt/tests/acid/acid3/favicon.ico.headers diff --git a/tests/wpt/web-platform-tests/acid/acid3/numbered-tests.html b/tests/wpt/tests/acid/acid3/numbered-tests.html similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/numbered-tests.html rename to tests/wpt/tests/acid/acid3/numbered-tests.html diff --git a/tests/wpt/web-platform-tests/acid/acid3/reference.png b/tests/wpt/tests/acid/acid3/reference.png similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/reference.png rename to tests/wpt/tests/acid/acid3/reference.png diff --git a/tests/wpt/web-platform-tests/acid/acid3/reference.sub.html b/tests/wpt/tests/acid/acid3/reference.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/reference.sub.html rename to tests/wpt/tests/acid/acid3/reference.sub.html diff --git a/tests/wpt/web-platform-tests/acid/acid3/support-a.png b/tests/wpt/tests/acid/acid3/support-a.png similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/support-a.png rename to tests/wpt/tests/acid/acid3/support-a.png diff --git a/tests/wpt/web-platform-tests/acid/acid3/support-b.png b/tests/wpt/tests/acid/acid3/support-b.png similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/support-b.png rename to tests/wpt/tests/acid/acid3/support-b.png diff --git a/tests/wpt/web-platform-tests/acid/acid3/support-b.png.headers b/tests/wpt/tests/acid/acid3/support-b.png.headers similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/support-b.png.headers rename to tests/wpt/tests/acid/acid3/support-b.png.headers diff --git a/tests/wpt/web-platform-tests/acid/acid3/svg.xml b/tests/wpt/tests/acid/acid3/svg.xml similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/svg.xml rename to tests/wpt/tests/acid/acid3/svg.xml diff --git a/tests/wpt/web-platform-tests/acid/acid3/svg.xml.headers b/tests/wpt/tests/acid/acid3/svg.xml.headers similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/svg.xml.headers rename to tests/wpt/tests/acid/acid3/svg.xml.headers diff --git a/tests/wpt/web-platform-tests/acid/acid3/test.html b/tests/wpt/tests/acid/acid3/test.html similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/test.html rename to tests/wpt/tests/acid/acid3/test.html diff --git a/tests/wpt/web-platform-tests/acid/acid3/xhtml.1 b/tests/wpt/tests/acid/acid3/xhtml.1 similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/xhtml.1 rename to tests/wpt/tests/acid/acid3/xhtml.1 diff --git a/tests/wpt/web-platform-tests/acid/acid3/xhtml.1.headers b/tests/wpt/tests/acid/acid3/xhtml.1.headers similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/xhtml.1.headers rename to tests/wpt/tests/acid/acid3/xhtml.1.headers diff --git a/tests/wpt/web-platform-tests/acid/acid3/xhtml.2 b/tests/wpt/tests/acid/acid3/xhtml.2 similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/xhtml.2 rename to tests/wpt/tests/acid/acid3/xhtml.2 diff --git a/tests/wpt/web-platform-tests/acid/acid3/xhtml.2.headers b/tests/wpt/tests/acid/acid3/xhtml.2.headers similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/xhtml.2.headers rename to tests/wpt/tests/acid/acid3/xhtml.2.headers diff --git a/tests/wpt/web-platform-tests/acid/acid3/xhtml.3 b/tests/wpt/tests/acid/acid3/xhtml.3 similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/xhtml.3 rename to tests/wpt/tests/acid/acid3/xhtml.3 diff --git a/tests/wpt/web-platform-tests/acid/acid3/xhtml.3.headers b/tests/wpt/tests/acid/acid3/xhtml.3.headers similarity index 100% rename from tests/wpt/web-platform-tests/acid/acid3/xhtml.3.headers rename to tests/wpt/tests/acid/acid3/xhtml.3.headers diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html b/tests/wpt/tests/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html rename to tests/wpt/tests/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html.headers b/tests/wpt/tests/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html.headers rename to tests/wpt/tests/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/tests/wpt/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html similarity index 100% rename from tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html rename to tests/wpt/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute.https.html b/tests/wpt/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute.https.html rename to tests/wpt/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute.https.html diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html b/tests/wpt/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html rename to tests/wpt/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html.headers b/tests/wpt/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html.headers rename to tests/wpt/tests/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html b/tests/wpt/tests/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html rename to tests/wpt/tests/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html.headers b/tests/wpt/tests/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html.headers rename to tests/wpt/tests/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-iframe-access.https.html b/tests/wpt/tests/ambient-light/AmbientLightSensor-iframe-access.https.html similarity index 100% rename from tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-iframe-access.https.html rename to tests/wpt/tests/ambient-light/AmbientLightSensor-iframe-access.https.html diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-supported-by-feature-policy.html b/tests/wpt/tests/ambient-light/AmbientLightSensor-supported-by-feature-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor-supported-by-feature-policy.html rename to tests/wpt/tests/ambient-light/AmbientLightSensor-supported-by-feature-policy.html diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor.https.html b/tests/wpt/tests/ambient-light/AmbientLightSensor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor.https.html rename to tests/wpt/tests/ambient-light/AmbientLightSensor.https.html diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_insecure_context.html b/tests/wpt/tests/ambient-light/AmbientLightSensor_insecure_context.html similarity index 100% rename from tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_insecure_context.html rename to tests/wpt/tests/ambient-light/AmbientLightSensor_insecure_context.html diff --git a/tests/wpt/web-platform-tests/ambient-light/META.yml b/tests/wpt/tests/ambient-light/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/ambient-light/META.yml rename to tests/wpt/tests/ambient-light/META.yml diff --git a/tests/wpt/web-platform-tests/ambient-light/idlharness.https.window.js b/tests/wpt/tests/ambient-light/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/ambient-light/idlharness.https.window.js rename to tests/wpt/tests/ambient-light/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/animation-worklet/META.yml b/tests/wpt/tests/animation-worklet/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/META.yml rename to tests/wpt/tests/animation-worklet/META.yml diff --git a/tests/wpt/web-platform-tests/animation-worklet/animate-multiple-effects-on-different-targets-via-main-thread.https.html b/tests/wpt/tests/animation-worklet/animate-multiple-effects-on-different-targets-via-main-thread.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/animate-multiple-effects-on-different-targets-via-main-thread.https.html rename to tests/wpt/tests/animation-worklet/animate-multiple-effects-on-different-targets-via-main-thread.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/animate-non-accelerated-property.https.html b/tests/wpt/tests/animation-worklet/animate-non-accelerated-property.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/animate-non-accelerated-property.https.html rename to tests/wpt/tests/animation-worklet/animate-non-accelerated-property.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/animation-worklet-inside-iframe.https.html b/tests/wpt/tests/animation-worklet/animation-worklet-inside-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/animation-worklet-inside-iframe.https.html rename to tests/wpt/tests/animation-worklet/animation-worklet-inside-iframe.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/animator-with-options.https.html b/tests/wpt/tests/animation-worklet/animator-with-options.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/animator-with-options.https.html rename to tests/wpt/tests/animation-worklet/animator-with-options.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/cancel-non-accelerated-property.https.html b/tests/wpt/tests/animation-worklet/cancel-non-accelerated-property.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/cancel-non-accelerated-property.https.html rename to tests/wpt/tests/animation-worklet/cancel-non-accelerated-property.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/common.js b/tests/wpt/tests/animation-worklet/common.js similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/common.js rename to tests/wpt/tests/animation-worklet/common.js diff --git a/tests/wpt/web-platform-tests/animation-worklet/current-time.https.html b/tests/wpt/tests/animation-worklet/current-time.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/current-time.https.html rename to tests/wpt/tests/animation-worklet/current-time.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/idlharness.any.js b/tests/wpt/tests/animation-worklet/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/idlharness.any.js rename to tests/wpt/tests/animation-worklet/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/animation-worklet/inactive-timeline.https.html b/tests/wpt/tests/animation-worklet/inactive-timeline.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/inactive-timeline.https.html rename to tests/wpt/tests/animation-worklet/inactive-timeline.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/multiple-effects-on-same-target-driven-by-individual-local-time.https.html b/tests/wpt/tests/animation-worklet/multiple-effects-on-same-target-driven-by-individual-local-time.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/multiple-effects-on-same-target-driven-by-individual-local-time.https.html rename to tests/wpt/tests/animation-worklet/multiple-effects-on-same-target-driven-by-individual-local-time.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/playback-rate.https.html b/tests/wpt/tests/animation-worklet/playback-rate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/playback-rate.https.html rename to tests/wpt/tests/animation-worklet/playback-rate.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/references/not-translated-box-ref.html b/tests/wpt/tests/animation-worklet/references/not-translated-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/references/not-translated-box-ref.html rename to tests/wpt/tests/animation-worklet/references/not-translated-box-ref.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/references/translated-box-ref.html b/tests/wpt/tests/animation-worklet/references/translated-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/references/translated-box-ref.html rename to tests/wpt/tests/animation-worklet/references/translated-box-ref.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/resources/animator-iframe.html b/tests/wpt/tests/animation-worklet/resources/animator-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/resources/animator-iframe.html rename to tests/wpt/tests/animation-worklet/resources/animator-iframe.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/resources/iframe.html b/tests/wpt/tests/animation-worklet/resources/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/resources/iframe.html rename to tests/wpt/tests/animation-worklet/resources/iframe.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/scroll-timeline-writing-modes.https.html b/tests/wpt/tests/animation-worklet/scroll-timeline-writing-modes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/scroll-timeline-writing-modes.https.html rename to tests/wpt/tests/animation-worklet/scroll-timeline-writing-modes.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/stateful-animator.https.html b/tests/wpt/tests/animation-worklet/stateful-animator.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/stateful-animator.https.html rename to tests/wpt/tests/animation-worklet/stateful-animator.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-animator-name.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-animator-name.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-animator-name.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-animator-name.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-cancel.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-cancel.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-cancel.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-cancel.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-creation.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-creation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-creation.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-creation.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-duration.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-duration.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-duration.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-duration.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-get-computed-timing-progress-on-worklet-thread.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-get-computed-timing-progress-on-worklet-thread.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-get-computed-timing-progress-on-worklet-thread.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-get-computed-timing-progress-on-worklet-thread.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-get-timing-on-worklet-thread.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-get-timing-on-worklet-thread.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-get-timing-on-worklet-thread.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-get-timing-on-worklet-thread.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-local-time-after-duration.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-local-time-after-duration.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-local-time-after-duration.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-local-time-after-duration.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-local-time-before-start.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-local-time-before-start.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-local-time-before-start.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-local-time-before-start.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-local-time-null-1.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-local-time-null-1.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-local-time-null-1.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-local-time-null-1.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-local-time-null-2-ref.html b/tests/wpt/tests/animation-worklet/worklet-animation-local-time-null-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-local-time-null-2-ref.html rename to tests/wpt/tests/animation-worklet/worklet-animation-local-time-null-2-ref.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-local-time-null-2.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-local-time-null-2.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-local-time-null-2.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-local-time-null-2.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-pause-immediately.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-pause-immediately.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-pause-immediately.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-pause-immediately.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-pause-resume.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-pause-resume.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-pause-resume.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-pause-resume.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-pause.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-pause.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-pause.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-pause.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-play.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-play.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-play.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-play.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-set-keyframes.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-set-keyframes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-set-keyframes.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-set-keyframes.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-set-timing.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-set-timing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-set-timing.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-set-timing.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-start-delay-ref.html b/tests/wpt/tests/animation-worklet/worklet-animation-start-delay-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-start-delay-ref.html rename to tests/wpt/tests/animation-worklet/worklet-animation-start-delay-ref.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-start-delay.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-start-delay.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-start-delay.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-start-delay.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-effects-from-different-frames.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-with-effects-from-different-frames.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-effects-from-different-frames.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-with-effects-from-different-frames.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-fill-mode.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-with-fill-mode.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-fill-mode.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-with-fill-mode.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-invalid-effect.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-with-invalid-effect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-invalid-effect.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-with-invalid-effect.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-non-ascii-name-ref.html b/tests/wpt/tests/animation-worklet/worklet-animation-with-non-ascii-name-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-non-ascii-name-ref.html rename to tests/wpt/tests/animation-worklet/worklet-animation-with-non-ascii-name-ref.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-non-ascii-name.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-with-non-ascii-name.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-non-ascii-name.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-with-non-ascii-name.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-scroll-timeline-and-display-none.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-with-scroll-timeline-and-display-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-scroll-timeline-and-display-none.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-with-scroll-timeline-and-display-none.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-scroll-timeline-and-overflow-hidden-ref.html b/tests/wpt/tests/animation-worklet/worklet-animation-with-scroll-timeline-and-overflow-hidden-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-scroll-timeline-and-overflow-hidden-ref.html rename to tests/wpt/tests/animation-worklet/worklet-animation-with-scroll-timeline-and-overflow-hidden-ref.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-scroll-timeline-and-overflow-hidden.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-with-scroll-timeline-and-overflow-hidden.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-scroll-timeline-and-overflow-hidden.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-with-scroll-timeline-and-overflow-hidden.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-scroll-timeline-ref.html b/tests/wpt/tests/animation-worklet/worklet-animation-with-scroll-timeline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-scroll-timeline-ref.html rename to tests/wpt/tests/animation-worklet/worklet-animation-with-scroll-timeline-ref.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-scroll-timeline-root-scroller-ref.html b/tests/wpt/tests/animation-worklet/worklet-animation-with-scroll-timeline-root-scroller-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-scroll-timeline-root-scroller-ref.html rename to tests/wpt/tests/animation-worklet/worklet-animation-with-scroll-timeline-root-scroller-ref.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-scroll-timeline-root-scroller.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-with-scroll-timeline-root-scroller.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-scroll-timeline-root-scroller.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-with-scroll-timeline-root-scroller.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-scroll-timeline.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-with-scroll-timeline.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-with-scroll-timeline.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-with-scroll-timeline.https.html diff --git a/tests/wpt/web-platform-tests/animation-worklet/worklet-animation-without-target.https.html b/tests/wpt/tests/animation-worklet/worklet-animation-without-target.https.html similarity index 100% rename from tests/wpt/web-platform-tests/animation-worklet/worklet-animation-without-target.https.html rename to tests/wpt/tests/animation-worklet/worklet-animation-without-target.https.html diff --git a/tests/wpt/web-platform-tests/annotation-model/.editorconfig b/tests/wpt/tests/annotation-model/.editorconfig similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/.editorconfig rename to tests/wpt/tests/annotation-model/.editorconfig diff --git a/tests/wpt/web-platform-tests/annotation-model/CONTRIBUTING.md b/tests/wpt/tests/annotation-model/CONTRIBUTING.md similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/CONTRIBUTING.md rename to tests/wpt/tests/annotation-model/CONTRIBUTING.md diff --git a/tests/wpt/web-platform-tests/annotation-model/META.yml b/tests/wpt/tests/annotation-model/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/META.yml rename to tests/wpt/tests/annotation-model/META.yml diff --git a/tests/wpt/web-platform-tests/annotation-model/README.md b/tests/wpt/tests/annotation-model/README.md similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/README.md rename to tests/wpt/tests/annotation-model/README.md diff --git a/tests/wpt/web-platform-tests/annotation-model/TODO b/tests/wpt/tests/annotation-model/TODO similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/TODO rename to tests/wpt/tests/annotation-model/TODO diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationContextValidated.json b/tests/wpt/tests/annotation-model/annotations/3.1-annotationContextValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationContextValidated.json rename to tests/wpt/tests/annotation-model/annotations/3.1-annotationContextValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationIdValidated.json b/tests/wpt/tests/annotation-model/annotations/3.1-annotationIdValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationIdValidated.json rename to tests/wpt/tests/annotation-model/annotations/3.1-annotationIdValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationTypeValidated.json b/tests/wpt/tests/annotation-model/annotations/3.1-annotationTypeValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationTypeValidated.json rename to tests/wpt/tests/annotation-model/annotations/3.1-annotationTypeValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-bodyKeyFound.json b/tests/wpt/tests/annotation-model/annotations/3.1-bodyKeyFound.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.1-bodyKeyFound.json rename to tests/wpt/tests/annotation-model/annotations/3.1-bodyKeyFound.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-targetKeyFound.json b/tests/wpt/tests/annotation-model/annotations/3.1-targetKeyFound.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.1-targetKeyFound.json rename to tests/wpt/tests/annotation-model/annotations/3.1-targetKeyFound.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.2-bodyObjectsRecognized.json b/tests/wpt/tests/annotation-model/annotations/3.2-bodyObjectsRecognized.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.2-bodyObjectsRecognized.json rename to tests/wpt/tests/annotation-model/annotations/3.2-bodyObjectsRecognized.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.2-targetObjectsRecognized.json b/tests/wpt/tests/annotation-model/annotations/3.2-targetObjectsRecognized.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.2-targetObjectsRecognized.json rename to tests/wpt/tests/annotation-model/annotations/3.2-targetObjectsRecognized.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.2.5-bodyValueImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.2.5-bodyValueImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.2.5-bodyValueImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.2.5-bodyValueImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.2.5-bodyValueValidated.json b/tests/wpt/tests/annotation-model/annotations/3.2.5-bodyValueValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.2.5-bodyValueValidated.json rename to tests/wpt/tests/annotation-model/annotations/3.2.5-bodyValueValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.2.5-notBodyBodyValue.json b/tests/wpt/tests/annotation-model/annotations/3.2.5-notBodyBodyValue.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.2.5-notBodyBodyValue.json rename to tests/wpt/tests/annotation-model/annotations/3.2.5-notBodyBodyValue.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationCreatedImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.1-annotationCreatedImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationCreatedImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.1-annotationCreatedImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationCreatedValidated.json b/tests/wpt/tests/annotation-model/annotations/3.3.1-annotationCreatedValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationCreatedValidated.json rename to tests/wpt/tests/annotation-model/annotations/3.3.1-annotationCreatedValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationCreatorImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.1-annotationCreatorImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationCreatorImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.1-annotationCreatorImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationGeneratedImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.1-annotationGeneratedImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationGeneratedImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.1-annotationGeneratedImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationGeneratedValidated.json b/tests/wpt/tests/annotation-model/annotations/3.3.1-annotationGeneratedValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationGeneratedValidated.json rename to tests/wpt/tests/annotation-model/annotations/3.3.1-annotationGeneratedValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationGeneratorImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.1-annotationGeneratorImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationGeneratorImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.1-annotationGeneratorImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationModifiedImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.1-annotationModifiedImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationModifiedImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.1-annotationModifiedImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationModifiedValidated.json b/tests/wpt/tests/annotation-model/annotations/3.3.1-annotationModifiedValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationModifiedValidated.json rename to tests/wpt/tests/annotation-model/annotations/3.3.1-annotationModifiedValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationSingleCreatorImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.1-annotationSingleCreatorImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationSingleCreatorImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.1-annotationSingleCreatorImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-singleAnnotationCreatorImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.1-singleAnnotationCreatorImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-singleAnnotationCreatorImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.1-singleAnnotationCreatorImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentEmailImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentEmailImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentEmailImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentEmailImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentEmail_sha1Implemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentEmail_sha1Implemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentEmail_sha1Implemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentEmail_sha1Implemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentHomepageImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentHomepageImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentHomepageImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentHomepageImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentIdImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentIdImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentIdImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentIdImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentNameImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentNameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentNameImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentNameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentNicknameImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentNicknameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentNicknameImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentNicknameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentSingleNameImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentSingleNameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentSingleNameImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentSingleNameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentTypeImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentTypeImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationCreatorAgentTypeImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationCreatorAgentTypeImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentEmailImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentEmailImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentEmailImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentEmailImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentEmail_sha1Implemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentEmail_sha1Implemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentEmail_sha1Implemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentEmail_sha1Implemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentHomepageImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentHomepageImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentHomepageImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentHomepageImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentIdImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentIdImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentIdImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentIdImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentNameImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentNameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentNameImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentNameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentNicknameImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentNicknameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentNicknameImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentNicknameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentSingleNameImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentSingleNameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentSingleNameImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentSingleNameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentTypeImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentTypeImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentTypeImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.2-annotationGeneratorAgentTypeImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.3-annotationAudienceImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.3-annotationAudienceImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.3-annotationAudienceImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.3-annotationAudienceImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.5-annotationMotivationImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.5-annotationMotivationImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.5-annotationMotivationImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.5-annotationMotivationImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.5-annotationSingleMotivationImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.5-annotationSingleMotivationImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.5-annotationSingleMotivationImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.5-annotationSingleMotivationImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.6-annotationRightsImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.6-annotationRightsImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.6-annotationRightsImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.6-annotationRightsImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.6-annotationRightsValidated.json b/tests/wpt/tests/annotation-model/annotations/3.3.6-annotationRightsValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.6-annotationRightsValidated.json rename to tests/wpt/tests/annotation-model/annotations/3.3.6-annotationRightsValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.7-annotationCanonicalImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.7-annotationCanonicalImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.7-annotationCanonicalImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.7-annotationCanonicalImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.7-annotationCanonicalValidated.json b/tests/wpt/tests/annotation-model/annotations/3.3.7-annotationCanonicalValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.7-annotationCanonicalValidated.json rename to tests/wpt/tests/annotation-model/annotations/3.3.7-annotationCanonicalValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.7-annotationViaImplemented.json b/tests/wpt/tests/annotation-model/annotations/3.3.7-annotationViaImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.7-annotationViaImplemented.json rename to tests/wpt/tests/annotation-model/annotations/3.3.7-annotationViaImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.7-annotationViaValidated.json b/tests/wpt/tests/annotation-model/annotations/3.3.7-annotationViaValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/3.3.7-annotationViaValidated.json rename to tests/wpt/tests/annotation-model/annotations/3.3.7-annotationViaValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/4.4-annotationStylesheetImplemented.json b/tests/wpt/tests/annotation-model/annotations/4.4-annotationStylesheetImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/4.4-annotationStylesheetImplemented.json rename to tests/wpt/tests/annotation-model/annotations/4.4-annotationStylesheetImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationMusts-manual.html b/tests/wpt/tests/annotation-model/annotations/annotationMusts-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/annotationMusts-manual.html rename to tests/wpt/tests/annotation-model/annotations/annotationMusts-manual.html diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationMusts.test b/tests/wpt/tests/annotation-model/annotations/annotationMusts.test similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/annotationMusts.test rename to tests/wpt/tests/annotation-model/annotations/annotationMusts.test diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationOptionals-manual.html b/tests/wpt/tests/annotation-model/annotations/annotationOptionals-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/annotationOptionals-manual.html rename to tests/wpt/tests/annotation-model/annotations/annotationOptionals-manual.html diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationOptionals.test b/tests/wpt/tests/annotation-model/annotations/annotationOptionals.test similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/annotationOptionals.test rename to tests/wpt/tests/annotation-model/annotations/annotationOptionals.test diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationsAgentOptionals-manual.html b/tests/wpt/tests/annotation-model/annotations/annotationsAgentOptionals-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/annotationsAgentOptionals-manual.html rename to tests/wpt/tests/annotation-model/annotations/annotationsAgentOptionals-manual.html diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationsAgentOptionals.test b/tests/wpt/tests/annotation-model/annotations/annotationsAgentOptionals.test similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/annotationsAgentOptionals.test rename to tests/wpt/tests/annotation-model/annotations/annotationsAgentOptionals.test diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyEWR.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyEWR.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyEWR.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyEWR.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyFormat.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyFormat.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyFormat.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyFormat.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyLanguage.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyLanguage.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyLanguage.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyLanguage.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyProcessingLanguage.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyProcessingLanguage.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyProcessingLanguage.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyProcessingLanguage.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodySingleFormat.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodySingleFormat.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodySingleFormat.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodySingleFormat.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodySingleLanguage.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodySingleLanguage.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodySingleLanguage.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodySingleLanguage.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyTextDirection.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyTextDirection.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyTextDirection.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyTextDirection.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyTextDirectionValidated.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyTextDirectionValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyTextDirectionValidated.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-bodyTextDirectionValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targEWR.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targEWR.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targEWR.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targEWR.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targFormat.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targFormat.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targFormat.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targFormat.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targLanguage.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targLanguage.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targLanguage.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targLanguage.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targProcessingLanguage.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targProcessingLanguage.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targProcessingLanguage.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targProcessingLanguage.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targSingleFormat.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targSingleFormat.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targSingleFormat.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targSingleFormat.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targSingleLanguage.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targSingleLanguage.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targSingleLanguage.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targSingleLanguage.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targTextDirection.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targTextDirection.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targTextDirection.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targTextDirection.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targTextDirectionValidated.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targTextDirectionValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.1-targTextDirectionValidated.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.1-targTextDirectionValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.2-bodyType.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.2-bodyType.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.2-bodyType.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.2-bodyType.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.2-targType.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.2-targType.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.2-targType.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.2-targType.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyChoiceSetNoValue.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyChoiceSetNoValue.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyChoiceSetNoValue.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyChoiceSetNoValue.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyETB.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyETB.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyETB.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyETB.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyETBTypeText.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyETBTypeText.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyETBTypeText.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyETBTypeText.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyETBTypeTextualBody.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyETBTypeTextualBody.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyETBTypeTextualBody.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.4-bodyETBTypeTextualBody.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.4-targChoiceSetNoValue.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.4-targChoiceSetNoValue.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.4-targChoiceSetNoValue.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.4-targChoiceSetNoValue.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.4-targNoTypeTextualBody.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.4-targNoTypeTextualBody.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.4-targNoTypeTextualBody.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.4-targNoTypeTextualBody.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.7-bodyChoice.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.7-bodyChoice.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.7-bodyChoice.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.7-bodyChoice.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.7-bodyEWRNoItems.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.7-bodyEWRNoItems.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.7-bodyEWRNoItems.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.7-bodyEWRNoItems.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.7-bodyEmbeddedTextualNoItems.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.7-bodyEmbeddedTextualNoItems.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.7-bodyEmbeddedTextualNoItems.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.7-bodyEmbeddedTextualNoItems.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.7-bodySpecificResourceNoItems.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.7-bodySpecificResourceNoItems.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.7-bodySpecificResourceNoItems.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.7-bodySpecificResourceNoItems.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.7-targChoice.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.7-targChoice.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.7-targChoice.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.7-targChoice.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.7-targEWRNoItems.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.7-targEWRNoItems.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.7-targEWRNoItems.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.7-targEWRNoItems.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.7-targSpecificResourceNoItems.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.7-targSpecificResourceNoItems.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.2.7-targSpecificResourceNoItems.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.2.7-targSpecificResourceNoItems.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyCreated.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyCreated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyCreated.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyCreated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyCreatedValidated.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyCreatedValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyCreatedValidated.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyCreatedValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyCreator.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyCreator.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyCreator.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyCreator.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyModified.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyModified.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyModified.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyModified.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyModifiedValidated.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyModifiedValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyModifiedValidated.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-bodyModifiedValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-bodySingleCreator.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-bodySingleCreator.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-bodySingleCreator.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-bodySingleCreator.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-targCreated.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-targCreated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-targCreated.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-targCreated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-targCreatedValidated.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-targCreatedValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-targCreatedValidated.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-targCreatedValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-targCreator.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-targCreator.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-targCreator.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-targCreator.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-targModified.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-targModified.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-targModified.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-targModified.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-targModifiedValidated.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-targModifiedValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-targModifiedValidated.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-targModifiedValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-targSingleCreator.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-targSingleCreator.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.1-targSingleCreator.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.1-targSingleCreator.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentEmailImplemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentEmailImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentEmailImplemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentEmailImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentEmail_sha1Implemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentEmail_sha1Implemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentEmail_sha1Implemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentEmail_sha1Implemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentHomepageImplemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentHomepageImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentHomepageImplemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentHomepageImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentIdImplemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentIdImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentIdImplemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentIdImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentNameImplemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentNameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentNameImplemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentNameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentNicknameImplemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentNicknameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentNicknameImplemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentNicknameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentSingleNameImplemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentSingleNameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentSingleNameImplemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentSingleNameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentTypeImplemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentTypeImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentTypeImplemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-bodyCreatorAgentTypeImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentEmailImplemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentEmailImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentEmailImplemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentEmailImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentEmail_sha1Implemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentEmail_sha1Implemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentEmail_sha1Implemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentEmail_sha1Implemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentHomepageImplemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentHomepageImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentHomepageImplemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentHomepageImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentIdImplemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentIdImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentIdImplemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentIdImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentNameImplemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentNameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentNameImplemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentNameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentNicknameImplemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentNicknameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentNicknameImplemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentNicknameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentSingleNameImplemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentSingleNameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentSingleNameImplemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentSingleNameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentTypeImplemented.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentTypeImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentTypeImplemented.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.2-targCreatorAgentTypeImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.3-bodyAudience.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.3-bodyAudience.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.3-bodyAudience.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.3-bodyAudience.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.3-targAudience.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.3-targAudience.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.3-targAudience.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.3-targAudience.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.4-bodyAccessibility.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.4-bodyAccessibility.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.4-bodyAccessibility.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.4-bodyAccessibility.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.4-targAccessibility.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.4-targAccessibility.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.4-targAccessibility.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.4-targAccessibility.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.5-bodyChoiceSetNoPurpose.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.5-bodyChoiceSetNoPurpose.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.5-bodyChoiceSetNoPurpose.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.5-bodyChoiceSetNoPurpose.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.5-bodyEWRNoPurpose.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.5-bodyEWRNoPurpose.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.5-bodyEWRNoPurpose.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.5-bodyEWRNoPurpose.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.5-bodyPurpose.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.5-bodyPurpose.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.5-bodyPurpose.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.5-bodyPurpose.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.5-targChoiceSetNoPurpose.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.5-targChoiceSetNoPurpose.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.5-targChoiceSetNoPurpose.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.5-targChoiceSetNoPurpose.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.5-targEWRNoPurpose.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.5-targEWRNoPurpose.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.5-targEWRNoPurpose.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.5-targEWRNoPurpose.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.5-targPurpose.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.5-targPurpose.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.5-targPurpose.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.5-targPurpose.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.6-bodyRights.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.6-bodyRights.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.6-bodyRights.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.6-bodyRights.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.6-bodyRightsValidated.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.6-bodyRightsValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.6-bodyRightsValidated.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.6-bodyRightsValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.6-targRights.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.6-targRights.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.6-targRights.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.6-targRights.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.6-targRightsValidated.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.6-targRightsValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.6-targRightsValidated.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.6-targRightsValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyCanonical.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyCanonical.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyCanonical.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyCanonical.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyCanonicalValidated.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyCanonicalValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyCanonicalValidated.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyCanonicalValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyVia.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyVia.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyVia.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyVia.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyViaValidated.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyViaValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyViaValidated.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-bodyViaValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-targCanonical.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-targCanonical.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-targCanonical.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-targCanonical.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-targCanonicalValidated.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-targCanonicalValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-targCanonicalValidated.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-targCanonicalValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-targVia.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-targVia.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-targVia.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-targVia.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-targViaValidated.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-targViaValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/3.3.7-targViaValidated.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/3.3.7-targViaValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4-bodyChoiceSetNoSource.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/4-bodyChoiceSetNoSource.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4-bodyChoiceSetNoSource.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/4-bodyChoiceSetNoSource.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4-bodyEmbeddedTextualNoSource.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/4-bodyEmbeddedTextualNoSource.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4-bodyEmbeddedTextualNoSource.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/4-bodyEmbeddedTextualNoSource.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4-bodySpecificResource.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/4-bodySpecificResource.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4-bodySpecificResource.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/4-bodySpecificResource.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4-bodySpecificResourceNoValue.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/4-bodySpecificResourceNoValue.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4-bodySpecificResourceNoValue.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/4-bodySpecificResourceNoValue.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4-targChoiceSetNoSource.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/4-targChoiceSetNoSource.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4-targChoiceSetNoSource.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/4-targChoiceSetNoSource.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4-targSpecificResource.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/4-targSpecificResource.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4-targSpecificResource.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/4-targSpecificResource.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4-targSpecificResourceNoValue.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/4-targSpecificResourceNoValue.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4-targSpecificResourceNoValue.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/4-targSpecificResourceNoValue.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4.4-bodyStyleClass.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/4.4-bodyStyleClass.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4.4-bodyStyleClass.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/4.4-bodyStyleClass.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4.4-targStyleClass.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/4.4-targStyleClass.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4.4-targStyleClass.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/4.4-targStyleClass.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4.5-bodyRenderedVia.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/4.5-bodyRenderedVia.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4.5-bodyRenderedVia.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/4.5-bodyRenderedVia.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4.5-targRenderedVia.json b/tests/wpt/tests/annotation-model/annotations/bodiesTargets/4.5-targRenderedVia.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/bodiesTargets/4.5-targRenderedVia.json rename to tests/wpt/tests/annotation-model/annotations/bodiesTargets/4.5-targRenderedVia.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/3.2.2-targType.json b/tests/wpt/tests/annotation-model/annotations/specificResource/3.2.2-targType.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/3.2.2-targType.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/3.2.2-targType.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/3.3.3-targAudience.json b/tests/wpt/tests/annotation-model/annotations/specificResource/3.3.3-targAudience.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/3.3.3-targAudience.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/3.3.3-targAudience.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2-TextDataPositionSelectorValid.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2-TextDataPositionSelectorValid.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2-TextDataPositionSelectorValid.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2-TextDataPositionSelectorValid.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2-fragmentCssXPathSelectorValid.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2-fragmentCssXPathSelectorValid.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2-fragmentCssXPathSelectorValid.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2-fragmentCssXPathSelectorValid.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2-selectorFound.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2-selectorFound.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2-selectorFound.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2-selectorFound.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2-selectorValidIfPresent.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2-selectorValidIfPresent.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2-selectorValidIfPresent.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2-selectorValidIfPresent.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.1-conformsTo.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2.1-conformsTo.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.1-conformsTo.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2.1-conformsTo.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.1-fragmentSelector.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2.1-fragmentSelector.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.1-fragmentSelector.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2.1-fragmentSelector.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.2-cssSelector.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2.2-cssSelector.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.2-cssSelector.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2.2-cssSelector.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.3-xpathSelector.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2.3-xpathSelector.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.3-xpathSelector.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2.3-xpathSelector.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.4-prefix.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2.4-prefix.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.4-prefix.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2.4-prefix.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.4-suffix.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2.4-suffix.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.4-suffix.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2.4-suffix.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.4-textQuoteSelector.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2.4-textQuoteSelector.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.4-textQuoteSelector.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2.4-textQuoteSelector.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.4-textQuoteSelectorValid.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2.4-textQuoteSelectorValid.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.4-textQuoteSelectorValid.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2.4-textQuoteSelectorValid.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.5-textPositionSelector.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2.5-textPositionSelector.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.5-textPositionSelector.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2.5-textPositionSelector.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.6-dataPositionSelector.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2.6-dataPositionSelector.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.6-dataPositionSelector.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2.6-dataPositionSelector.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.7-svgSelector.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2.7-svgSelector.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.7-svgSelector.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2.7-svgSelector.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.7-svgSelectorValid.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2.7-svgSelectorValid.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.7-svgSelectorValid.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2.7-svgSelectorValid.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.8-rangeSelector.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2.8-rangeSelector.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.8-rangeSelector.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2.8-rangeSelector.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.8-rangeSelectorValid.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.2.8-rangeSelectorValid.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.2.8-rangeSelectorValid.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.2.8-rangeSelectorValid.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3-stateFound.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.3-stateFound.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3-stateFound.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.3-stateFound.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3-stateValidIfPresent.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.3-stateValidIfPresent.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3-stateValidIfPresent.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.3-stateValidIfPresent.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3.1-cached.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.3.1-cached.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3.1-cached.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.3.1-cached.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3.1-timeState.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.3.1-timeState.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3.1-timeState.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.3.1-timeState.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3.1-timeStateValid.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.3.1-timeStateValid.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3.1-timeStateValid.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.3.1-timeStateValid.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3.2-httpRequestStateValid.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.3.2-httpRequestStateValid.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3.2-httpRequestStateValid.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.3.2-httpRequestStateValid.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3.2-requestHeaderState.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.3.2-requestHeaderState.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3.2-requestHeaderState.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.3.2-requestHeaderState.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3.3-refinedBy.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.3.3-refinedBy.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3.3-refinedBy.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.3.3-refinedBy.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3.3-refinedByValidated.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.3.3-refinedByValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.3.3-refinedByValidated.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.3.3-refinedByValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.4-styleClass.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.4-styleClass.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.4-styleClass.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.4-styleClass.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.4-styleClassValidIfPresent.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.4-styleClassValidIfPresent.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.4-styleClassValidIfPresent.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.4-styleClassValidIfPresent.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.5-renderedVia.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.5-renderedVia.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.5-renderedVia.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.5-renderedVia.json diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.6-scope.json b/tests/wpt/tests/annotation-model/annotations/specificResource/4.6-scope.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/annotations/specificResource/4.6-scope.json rename to tests/wpt/tests/annotation-model/annotations/specificResource/4.6-scope.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/3.3.1-collectionCreatedImplemented.json b/tests/wpt/tests/annotation-model/collections/3.3.1-collectionCreatedImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/3.3.1-collectionCreatedImplemented.json rename to tests/wpt/tests/annotation-model/collections/3.3.1-collectionCreatedImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/3.3.1-collectionCreatedValidated.json b/tests/wpt/tests/annotation-model/collections/3.3.1-collectionCreatedValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/3.3.1-collectionCreatedValidated.json rename to tests/wpt/tests/annotation-model/collections/3.3.1-collectionCreatedValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/3.3.1-collectionCreatorImplemented.json b/tests/wpt/tests/annotation-model/collections/3.3.1-collectionCreatorImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/3.3.1-collectionCreatorImplemented.json rename to tests/wpt/tests/annotation-model/collections/3.3.1-collectionCreatorImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/3.3.1-collectionModifiedImplemented.json b/tests/wpt/tests/annotation-model/collections/3.3.1-collectionModifiedImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/3.3.1-collectionModifiedImplemented.json rename to tests/wpt/tests/annotation-model/collections/3.3.1-collectionModifiedImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/3.3.1-collectionModifiedValidated.json b/tests/wpt/tests/annotation-model/collections/3.3.1-collectionModifiedValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/3.3.1-collectionModifiedValidated.json rename to tests/wpt/tests/annotation-model/collections/3.3.1-collectionModifiedValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/3.3.2-collectionCreatorAgentEmailImplemented.json b/tests/wpt/tests/annotation-model/collections/3.3.2-collectionCreatorAgentEmailImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/3.3.2-collectionCreatorAgentEmailImplemented.json rename to tests/wpt/tests/annotation-model/collections/3.3.2-collectionCreatorAgentEmailImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/3.3.2-collectionCreatorAgentEmail_sha1Implemented.json b/tests/wpt/tests/annotation-model/collections/3.3.2-collectionCreatorAgentEmail_sha1Implemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/3.3.2-collectionCreatorAgentEmail_sha1Implemented.json rename to tests/wpt/tests/annotation-model/collections/3.3.2-collectionCreatorAgentEmail_sha1Implemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/3.3.2-collectionCreatorAgentHomepageImplemented.json b/tests/wpt/tests/annotation-model/collections/3.3.2-collectionCreatorAgentHomepageImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/3.3.2-collectionCreatorAgentHomepageImplemented.json rename to tests/wpt/tests/annotation-model/collections/3.3.2-collectionCreatorAgentHomepageImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/3.3.2-collectionCreatorAgentIdImplemented.json b/tests/wpt/tests/annotation-model/collections/3.3.2-collectionCreatorAgentIdImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/3.3.2-collectionCreatorAgentIdImplemented.json rename to tests/wpt/tests/annotation-model/collections/3.3.2-collectionCreatorAgentIdImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/3.3.2-collectionCreatorAgentNameImplemented.json b/tests/wpt/tests/annotation-model/collections/3.3.2-collectionCreatorAgentNameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/3.3.2-collectionCreatorAgentNameImplemented.json rename to tests/wpt/tests/annotation-model/collections/3.3.2-collectionCreatorAgentNameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/3.3.2-collectionCreatorAgentNicknameImplemented.json b/tests/wpt/tests/annotation-model/collections/3.3.2-collectionCreatorAgentNicknameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/3.3.2-collectionCreatorAgentNicknameImplemented.json rename to tests/wpt/tests/annotation-model/collections/3.3.2-collectionCreatorAgentNicknameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/3.3.2-collectionCreatorAgentTypeImplemented.json b/tests/wpt/tests/annotation-model/collections/3.3.2-collectionCreatorAgentTypeImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/3.3.2-collectionCreatorAgentTypeImplemented.json rename to tests/wpt/tests/annotation-model/collections/3.3.2-collectionCreatorAgentTypeImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/3.3.6-collectionRightsImplemented.json b/tests/wpt/tests/annotation-model/collections/3.3.6-collectionRightsImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/3.3.6-collectionRightsImplemented.json rename to tests/wpt/tests/annotation-model/collections/3.3.6-collectionRightsImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/3.3.6-collectionRightsValidated.json b/tests/wpt/tests/annotation-model/collections/3.3.6-collectionRightsValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/3.3.6-collectionRightsValidated.json rename to tests/wpt/tests/annotation-model/collections/3.3.6-collectionRightsValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionContextValidated.json b/tests/wpt/tests/annotation-model/collections/5.1-collectionContextValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionContextValidated.json rename to tests/wpt/tests/annotation-model/collections/5.1-collectionContextValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionFirstImplemented.json b/tests/wpt/tests/annotation-model/collections/5.1-collectionFirstImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionFirstImplemented.json rename to tests/wpt/tests/annotation-model/collections/5.1-collectionFirstImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionFirstValidated.json b/tests/wpt/tests/annotation-model/collections/5.1-collectionFirstValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionFirstValidated.json rename to tests/wpt/tests/annotation-model/collections/5.1-collectionFirstValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionIdValidated.json b/tests/wpt/tests/annotation-model/collections/5.1-collectionIdValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionIdValidated.json rename to tests/wpt/tests/annotation-model/collections/5.1-collectionIdValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionLabelImplemented.json b/tests/wpt/tests/annotation-model/collections/5.1-collectionLabelImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionLabelImplemented.json rename to tests/wpt/tests/annotation-model/collections/5.1-collectionLabelImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionLabelValidated.json b/tests/wpt/tests/annotation-model/collections/5.1-collectionLabelValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionLabelValidated.json rename to tests/wpt/tests/annotation-model/collections/5.1-collectionLabelValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionLastImplemented.json b/tests/wpt/tests/annotation-model/collections/5.1-collectionLastImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionLastImplemented.json rename to tests/wpt/tests/annotation-model/collections/5.1-collectionLastImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionLastValidated.json b/tests/wpt/tests/annotation-model/collections/5.1-collectionLastValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionLastValidated.json rename to tests/wpt/tests/annotation-model/collections/5.1-collectionLastValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionTotalImplemented.json b/tests/wpt/tests/annotation-model/collections/5.1-collectionTotalImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionTotalImplemented.json rename to tests/wpt/tests/annotation-model/collections/5.1-collectionTotalImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionTotalValidated.json b/tests/wpt/tests/annotation-model/collections/5.1-collectionTotalValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionTotalValidated.json rename to tests/wpt/tests/annotation-model/collections/5.1-collectionTotalValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionTypeValidated.json b/tests/wpt/tests/annotation-model/collections/5.1-collectionTypeValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/5.1-collectionTypeValidated.json rename to tests/wpt/tests/annotation-model/collections/5.1-collectionTypeValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/collectionMusts-manual.html b/tests/wpt/tests/annotation-model/collections/collectionMusts-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/collectionMusts-manual.html rename to tests/wpt/tests/annotation-model/collections/collectionMusts-manual.html diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/collectionMusts.test b/tests/wpt/tests/annotation-model/collections/collectionMusts.test similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/collectionMusts.test rename to tests/wpt/tests/annotation-model/collections/collectionMusts.test diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/collectionOptionals-manual.html b/tests/wpt/tests/annotation-model/collections/collectionOptionals-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/collectionOptionals-manual.html rename to tests/wpt/tests/annotation-model/collections/collectionOptionals-manual.html diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/collectionOptionals.test b/tests/wpt/tests/annotation-model/collections/collectionOptionals.test similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/collectionOptionals.test rename to tests/wpt/tests/annotation-model/collections/collectionOptionals.test diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.1-pageCreatedImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/3.3.1-pageCreatedImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.1-pageCreatedImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/3.3.1-pageCreatedImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.1-pageCreatedValidated.json b/tests/wpt/tests/annotation-model/collections/pages/3.3.1-pageCreatedValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.1-pageCreatedValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/3.3.1-pageCreatedValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.1-pageCreatorImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/3.3.1-pageCreatorImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.1-pageCreatorImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/3.3.1-pageCreatorImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.1-pageModifiedImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/3.3.1-pageModifiedImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.1-pageModifiedImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/3.3.1-pageModifiedImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.1-pageModifiedValidated.json b/tests/wpt/tests/annotation-model/collections/pages/3.3.1-pageModifiedValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.1-pageModifiedValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/3.3.1-pageModifiedValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentEmailImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentEmailImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentEmailImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentEmailImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentEmail_sha1Implemented.json b/tests/wpt/tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentEmail_sha1Implemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentEmail_sha1Implemented.json rename to tests/wpt/tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentEmail_sha1Implemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentHomepageImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentHomepageImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentHomepageImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentHomepageImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentIdImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentIdImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentIdImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentIdImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentNameImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentNameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentNameImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentNameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentNicknameImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentNicknameImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentNicknameImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentNicknameImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentTypeImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentTypeImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentTypeImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/3.3.2-pageCreatorAgentTypeImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.6-pageRightsImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/3.3.6-pageRightsImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.6-pageRightsImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/3.3.6-pageRightsImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.6-pageRightsValidated.json b/tests/wpt/tests/annotation-model/collections/pages/3.3.6-pageRightsValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/3.3.6-pageRightsValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/3.3.6-pageRightsValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageContextValidated.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageContextValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageContextValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageContextValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageFirstImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageFirstImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageFirstImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageFirstImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageFirstValidated.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageFirstValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageFirstValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageFirstValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageIdValidated.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageIdValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageIdValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageIdValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageItemsValidated.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageItemsValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageItemsValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageItemsValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageLabelImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageLabelImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageLabelImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageLabelImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageLabelValidated.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageLabelValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageLabelValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageLabelValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageLastImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageLastImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageLastImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageLastImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageLastValidated.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageLastValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageLastValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageLastValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageNextImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageNextImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageNextImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageNextImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageNextValidated.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageNextValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageNextValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageNextValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pagePartOfImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pagePartOfImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pagePartOfImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pagePartOfImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pagePartOfValidated.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pagePartOfValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pagePartOfValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pagePartOfValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pagePrevImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pagePrevImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pagePrevImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pagePrevImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pagePrevValidated.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pagePrevValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pagePrevValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pagePrevValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageStartIndexImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageStartIndexImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageStartIndexImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageStartIndexImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageStartIndexValidated.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageStartIndexValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageStartIndexValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageStartIndexValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageTotalImplemented.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageTotalImplemented.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageTotalImplemented.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageTotalImplemented.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageTotalValidated.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageTotalValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageTotalValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageTotalValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageTypeValidated.json b/tests/wpt/tests/annotation-model/collections/pages/5.2-pageTypeValidated.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/5.2-pageTypeValidated.json rename to tests/wpt/tests/annotation-model/collections/pages/5.2-pageTypeValidated.json diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/pageMusts-manual.html b/tests/wpt/tests/annotation-model/collections/pages/pageMusts-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/pageMusts-manual.html rename to tests/wpt/tests/annotation-model/collections/pages/pageMusts-manual.html diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/pageMusts.test b/tests/wpt/tests/annotation-model/collections/pages/pageMusts.test similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/pageMusts.test rename to tests/wpt/tests/annotation-model/collections/pages/pageMusts.test diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/pageOptionals-manual.html b/tests/wpt/tests/annotation-model/collections/pages/pageOptionals-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/pageOptionals-manual.html rename to tests/wpt/tests/annotation-model/collections/pages/pageOptionals-manual.html diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/pageOptionals.test b/tests/wpt/tests/annotation-model/collections/pages/pageOptionals.test similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/collections/pages/pageOptionals.test rename to tests/wpt/tests/annotation-model/collections/pages/pageOptionals.test diff --git a/tests/wpt/web-platform-tests/annotation-model/definitions/annotations.json b/tests/wpt/tests/annotation-model/definitions/annotations.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/definitions/annotations.json rename to tests/wpt/tests/annotation-model/definitions/annotations.json diff --git a/tests/wpt/web-platform-tests/annotation-model/definitions/bodyTarget.json b/tests/wpt/tests/annotation-model/definitions/bodyTarget.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/definitions/bodyTarget.json rename to tests/wpt/tests/annotation-model/definitions/bodyTarget.json diff --git a/tests/wpt/web-platform-tests/annotation-model/definitions/choiceSet.json b/tests/wpt/tests/annotation-model/definitions/choiceSet.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/definitions/choiceSet.json rename to tests/wpt/tests/annotation-model/definitions/choiceSet.json diff --git a/tests/wpt/web-platform-tests/annotation-model/definitions/collections.json b/tests/wpt/tests/annotation-model/definitions/collections.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/definitions/collections.json rename to tests/wpt/tests/annotation-model/definitions/collections.json diff --git a/tests/wpt/web-platform-tests/annotation-model/definitions/id.json b/tests/wpt/tests/annotation-model/definitions/id.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/definitions/id.json rename to tests/wpt/tests/annotation-model/definitions/id.json diff --git a/tests/wpt/web-platform-tests/annotation-model/definitions/otherProperties.json b/tests/wpt/tests/annotation-model/definitions/otherProperties.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/definitions/otherProperties.json rename to tests/wpt/tests/annotation-model/definitions/otherProperties.json diff --git a/tests/wpt/web-platform-tests/annotation-model/definitions/specificResource.json b/tests/wpt/tests/annotation-model/definitions/specificResource.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/definitions/specificResource.json rename to tests/wpt/tests/annotation-model/definitions/specificResource.json diff --git a/tests/wpt/web-platform-tests/annotation-model/examples/README.md b/tests/wpt/tests/annotation-model/examples/README.md similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/examples/README.md rename to tests/wpt/tests/annotation-model/examples/README.md diff --git a/tests/wpt/web-platform-tests/annotation-model/examples/example1.test b/tests/wpt/tests/annotation-model/examples/example1.test similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/examples/example1.test rename to tests/wpt/tests/annotation-model/examples/example1.test diff --git a/tests/wpt/web-platform-tests/annotation-model/examples/example2.test b/tests/wpt/tests/annotation-model/examples/example2.test similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/examples/example2.test rename to tests/wpt/tests/annotation-model/examples/example2.test diff --git a/tests/wpt/web-platform-tests/annotation-model/examples/example3.test b/tests/wpt/tests/annotation-model/examples/example3.test similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/examples/example3.test rename to tests/wpt/tests/annotation-model/examples/example3.test diff --git a/tests/wpt/web-platform-tests/annotation-model/examples/exampleContext.json b/tests/wpt/tests/annotation-model/examples/exampleContext.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/examples/exampleContext.json rename to tests/wpt/tests/annotation-model/examples/exampleContext.json diff --git a/tests/wpt/web-platform-tests/annotation-model/examples/exampleTarget.json b/tests/wpt/tests/annotation-model/examples/exampleTarget.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/examples/exampleTarget.json rename to tests/wpt/tests/annotation-model/examples/exampleTarget.json diff --git a/tests/wpt/web-platform-tests/annotation-model/scripts/JSONtest.js b/tests/wpt/tests/annotation-model/scripts/JSONtest.js similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/scripts/JSONtest.js rename to tests/wpt/tests/annotation-model/scripts/JSONtest.js diff --git a/tests/wpt/web-platform-tests/annotation-model/scripts/ajv.min.js b/tests/wpt/tests/annotation-model/scripts/ajv.min.js similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/scripts/ajv.min.js rename to tests/wpt/tests/annotation-model/scripts/ajv.min.js diff --git a/tests/wpt/web-platform-tests/annotation-model/scripts/ajv.min.js.map b/tests/wpt/tests/annotation-model/scripts/ajv.min.js.map similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/scripts/ajv.min.js.map rename to tests/wpt/tests/annotation-model/scripts/ajv.min.js.map diff --git a/tests/wpt/web-platform-tests/annotation-model/scripts/showdown.min.js b/tests/wpt/tests/annotation-model/scripts/showdown.min.js similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/scripts/showdown.min.js rename to tests/wpt/tests/annotation-model/scripts/showdown.min.js diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/make_tests.py b/tests/wpt/tests/annotation-model/tools/make_tests.py similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/make_tests.py rename to tests/wpt/tests/annotation-model/tools/make_tests.py diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example1.json b/tests/wpt/tests/annotation-model/tools/samples/example1.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example1.json rename to tests/wpt/tests/annotation-model/tools/samples/example1.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example10.json b/tests/wpt/tests/annotation-model/tools/samples/example10.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example10.json rename to tests/wpt/tests/annotation-model/tools/samples/example10.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example11.json b/tests/wpt/tests/annotation-model/tools/samples/example11.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example11.json rename to tests/wpt/tests/annotation-model/tools/samples/example11.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example12.json b/tests/wpt/tests/annotation-model/tools/samples/example12.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example12.json rename to tests/wpt/tests/annotation-model/tools/samples/example12.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example13.json b/tests/wpt/tests/annotation-model/tools/samples/example13.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example13.json rename to tests/wpt/tests/annotation-model/tools/samples/example13.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example14.json b/tests/wpt/tests/annotation-model/tools/samples/example14.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example14.json rename to tests/wpt/tests/annotation-model/tools/samples/example14.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example15.json b/tests/wpt/tests/annotation-model/tools/samples/example15.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example15.json rename to tests/wpt/tests/annotation-model/tools/samples/example15.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example16.json b/tests/wpt/tests/annotation-model/tools/samples/example16.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example16.json rename to tests/wpt/tests/annotation-model/tools/samples/example16.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example17.json b/tests/wpt/tests/annotation-model/tools/samples/example17.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example17.json rename to tests/wpt/tests/annotation-model/tools/samples/example17.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example18.json b/tests/wpt/tests/annotation-model/tools/samples/example18.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example18.json rename to tests/wpt/tests/annotation-model/tools/samples/example18.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example19.json b/tests/wpt/tests/annotation-model/tools/samples/example19.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example19.json rename to tests/wpt/tests/annotation-model/tools/samples/example19.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example2.json b/tests/wpt/tests/annotation-model/tools/samples/example2.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example2.json rename to tests/wpt/tests/annotation-model/tools/samples/example2.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example20.json b/tests/wpt/tests/annotation-model/tools/samples/example20.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example20.json rename to tests/wpt/tests/annotation-model/tools/samples/example20.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example3.json b/tests/wpt/tests/annotation-model/tools/samples/example3.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example3.json rename to tests/wpt/tests/annotation-model/tools/samples/example3.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example4.json b/tests/wpt/tests/annotation-model/tools/samples/example4.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example4.json rename to tests/wpt/tests/annotation-model/tools/samples/example4.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example5.json b/tests/wpt/tests/annotation-model/tools/samples/example5.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example5.json rename to tests/wpt/tests/annotation-model/tools/samples/example5.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example6.json b/tests/wpt/tests/annotation-model/tools/samples/example6.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example6.json rename to tests/wpt/tests/annotation-model/tools/samples/example6.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example7.json b/tests/wpt/tests/annotation-model/tools/samples/example7.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example7.json rename to tests/wpt/tests/annotation-model/tools/samples/example7.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example8.json b/tests/wpt/tests/annotation-model/tools/samples/example8.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example8.json rename to tests/wpt/tests/annotation-model/tools/samples/example8.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/samples/example9.json b/tests/wpt/tests/annotation-model/tools/samples/example9.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/samples/example9.json rename to tests/wpt/tests/annotation-model/tools/samples/example9.json diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/template_js b/tests/wpt/tests/annotation-model/tools/template_js similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/template_js rename to tests/wpt/tests/annotation-model/tools/template_js diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/template_manual b/tests/wpt/tests/annotation-model/tools/template_manual similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/template_manual rename to tests/wpt/tests/annotation-model/tools/template_manual diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/tests/README.md b/tests/wpt/tests/annotation-model/tools/tests/README.md similarity index 100% rename from tests/wpt/web-platform-tests/annotation-model/tools/tests/README.md rename to tests/wpt/tests/annotation-model/tools/tests/README.md diff --git a/tests/wpt/web-platform-tests/annotation-protocol/.editorconfig b/tests/wpt/tests/annotation-protocol/.editorconfig similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/.editorconfig rename to tests/wpt/tests/annotation-protocol/.editorconfig diff --git a/tests/wpt/web-platform-tests/annotation-protocol/CONTRIBUTING.md b/tests/wpt/tests/annotation-protocol/CONTRIBUTING.md similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/CONTRIBUTING.md rename to tests/wpt/tests/annotation-protocol/CONTRIBUTING.md diff --git a/tests/wpt/web-platform-tests/annotation-protocol/META.yml b/tests/wpt/tests/annotation-protocol/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/META.yml rename to tests/wpt/tests/annotation-protocol/META.yml diff --git a/tests/wpt/web-platform-tests/annotation-protocol/README.md b/tests/wpt/tests/annotation-protocol/README.md similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/README.md rename to tests/wpt/tests/annotation-protocol/README.md diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno1.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno1.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno1.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno1.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno1.jsonld b/tests/wpt/tests/annotation-protocol/files/annotations/anno1.jsonld similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno1.jsonld rename to tests/wpt/tests/annotation-protocol/files/annotations/anno1.jsonld diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno10.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno10.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno10.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno10.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno11.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno11.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno11.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno11.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno12.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno12.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno12.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno12.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno13.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno13.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno13.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno13.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno14.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno14.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno14.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno14.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno15.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno15.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno15.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno15.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno16.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno16.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno16.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno16.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno17.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno17.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno17.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno17.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno18.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno18.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno18.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno18.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno19.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno19.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno19.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno19.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno2.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno2.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno2.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno2.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno2.jsonld b/tests/wpt/tests/annotation-protocol/files/annotations/anno2.jsonld similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno2.jsonld rename to tests/wpt/tests/annotation-protocol/files/annotations/anno2.jsonld diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno20.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno20.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno20.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno20.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno21.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno21.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno21.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno21.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno22.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno22.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno22.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno22.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno23.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno23.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno23.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno23.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno24.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno24.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno24.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno24.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno25.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno25.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno25.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno25.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno26.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno26.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno26.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno26.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno27.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno27.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno27.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno27.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno28.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno28.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno28.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno28.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno29.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno29.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno29.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno29.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno3.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno3.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno3.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno3.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno3.jsonld b/tests/wpt/tests/annotation-protocol/files/annotations/anno3.jsonld similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno3.jsonld rename to tests/wpt/tests/annotation-protocol/files/annotations/anno3.jsonld diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno30.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno30.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno30.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno30.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno31.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno31.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno31.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno31.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno32.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno32.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno32.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno32.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno33.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno33.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno33.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno33.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno34.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno34.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno34.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno34.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno35.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno35.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno35.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno35.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno36.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno36.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno36.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno36.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno37.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno37.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno37.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno37.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno38.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno38.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno38.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno38.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno39.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno39.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno39.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno39.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno4.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno4.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno4.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno4.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno40.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno40.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno40.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno40.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno41.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno41.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno41.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno41.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno5.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno5.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno5.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno5.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno6.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno6.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno6.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno6.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno7.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno7.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno7.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno7.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno8.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno8.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno8.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno8.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno9.json b/tests/wpt/tests/annotation-protocol/files/annotations/anno9.json similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/anno9.json rename to tests/wpt/tests/annotation-protocol/files/annotations/anno9.json diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/annotation.headers b/tests/wpt/tests/annotation-protocol/files/annotations/annotation.headers similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/annotation.headers rename to tests/wpt/tests/annotation-protocol/files/annotations/annotation.headers diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/annotation.options.headers b/tests/wpt/tests/annotation-protocol/files/annotations/annotation.options.headers similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/annotation.options.headers rename to tests/wpt/tests/annotation-protocol/files/annotations/annotation.options.headers diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/collection.headers b/tests/wpt/tests/annotation-protocol/files/annotations/collection.headers similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/collection.headers rename to tests/wpt/tests/annotation-protocol/files/annotations/collection.headers diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/collection.options.headers b/tests/wpt/tests/annotation-protocol/files/annotations/collection.options.headers similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/collection.options.headers rename to tests/wpt/tests/annotation-protocol/files/annotations/collection.options.headers diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/cors.headers b/tests/wpt/tests/annotation-protocol/files/annotations/cors.headers similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/cors.headers rename to tests/wpt/tests/annotation-protocol/files/annotations/cors.headers diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/annotations/page.headers b/tests/wpt/tests/annotation-protocol/files/annotations/page.headers similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/annotations/page.headers rename to tests/wpt/tests/annotation-protocol/files/annotations/page.headers diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/index.html b/tests/wpt/tests/annotation-protocol/files/index.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/index.html rename to tests/wpt/tests/annotation-protocol/files/index.html diff --git a/tests/wpt/web-platform-tests/annotation-protocol/files/index.html.headers b/tests/wpt/tests/annotation-protocol/files/index.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/files/index.html.headers rename to tests/wpt/tests/annotation-protocol/files/index.html.headers diff --git a/tests/wpt/web-platform-tests/annotation-protocol/server/server-manual.html b/tests/wpt/tests/annotation-protocol/server/server-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/server/server-manual.html rename to tests/wpt/tests/annotation-protocol/server/server-manual.html diff --git a/tests/wpt/web-platform-tests/annotation-protocol/tools/protocol-server.py b/tests/wpt/tests/annotation-protocol/tools/protocol-server.py similarity index 100% rename from tests/wpt/web-platform-tests/annotation-protocol/tools/protocol-server.py rename to tests/wpt/tests/annotation-protocol/tools/protocol-server.py diff --git a/tests/wpt/web-platform-tests/annotation-vocab/01-validJSON-LD-manual.html b/tests/wpt/tests/annotation-vocab/01-validJSON-LD-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-vocab/01-validJSON-LD-manual.html rename to tests/wpt/tests/annotation-vocab/01-validJSON-LD-manual.html diff --git a/tests/wpt/web-platform-tests/annotation-vocab/02-context-to-triples-manual.html b/tests/wpt/tests/annotation-vocab/02-context-to-triples-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-vocab/02-context-to-triples-manual.html rename to tests/wpt/tests/annotation-vocab/02-context-to-triples-manual.html diff --git a/tests/wpt/web-platform-tests/annotation-vocab/03-graphs-are-isomorphic-manual.html b/tests/wpt/tests/annotation-vocab/03-graphs-are-isomorphic-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-vocab/03-graphs-are-isomorphic-manual.html rename to tests/wpt/tests/annotation-vocab/03-graphs-are-isomorphic-manual.html diff --git a/tests/wpt/web-platform-tests/annotation-vocab/04-graphs-convert-lossless-manual.html b/tests/wpt/tests/annotation-vocab/04-graphs-convert-lossless-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-vocab/04-graphs-convert-lossless-manual.html rename to tests/wpt/tests/annotation-vocab/04-graphs-convert-lossless-manual.html diff --git a/tests/wpt/web-platform-tests/annotation-vocab/05-ontology-parsed-as-valid-manual.html b/tests/wpt/tests/annotation-vocab/05-ontology-parsed-as-valid-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-vocab/05-ontology-parsed-as-valid-manual.html rename to tests/wpt/tests/annotation-vocab/05-ontology-parsed-as-valid-manual.html diff --git a/tests/wpt/web-platform-tests/annotation-vocab/06-ontology-internally-consistent-manual.html b/tests/wpt/tests/annotation-vocab/06-ontology-internally-consistent-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/annotation-vocab/06-ontology-internally-consistent-manual.html rename to tests/wpt/tests/annotation-vocab/06-ontology-internally-consistent-manual.html diff --git a/tests/wpt/web-platform-tests/annotation-vocab/META.yml b/tests/wpt/tests/annotation-vocab/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/annotation-vocab/META.yml rename to tests/wpt/tests/annotation-vocab/META.yml diff --git a/tests/wpt/web-platform-tests/annotation-vocab/tools/README.md b/tests/wpt/tests/annotation-vocab/tools/README.md similarity index 100% rename from tests/wpt/web-platform-tests/annotation-vocab/tools/README.md rename to tests/wpt/tests/annotation-vocab/tools/README.md diff --git a/tests/wpt/web-platform-tests/annotation-vocab/tools/anno.jsonld b/tests/wpt/tests/annotation-vocab/tools/anno.jsonld similarity index 100% rename from tests/wpt/web-platform-tests/annotation-vocab/tools/anno.jsonld rename to tests/wpt/tests/annotation-vocab/tools/anno.jsonld diff --git a/tests/wpt/web-platform-tests/annotation-vocab/tools/vocab_tester.py b/tests/wpt/tests/annotation-vocab/tools/vocab_tester.py similarity index 100% rename from tests/wpt/web-platform-tests/annotation-vocab/tools/vocab_tester.py rename to tests/wpt/tests/annotation-vocab/tools/vocab_tester.py diff --git a/tests/wpt/web-platform-tests/apng/META.yml b/tests/wpt/tests/apng/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/apng/META.yml rename to tests/wpt/tests/apng/META.yml diff --git a/tests/wpt/web-platform-tests/apng/animated-png-timeout-ref.html b/tests/wpt/tests/apng/animated-png-timeout-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/apng/animated-png-timeout-ref.html rename to tests/wpt/tests/apng/animated-png-timeout-ref.html diff --git a/tests/wpt/web-platform-tests/apng/animated-png-timeout.html b/tests/wpt/tests/apng/animated-png-timeout.html similarity index 100% rename from tests/wpt/web-platform-tests/apng/animated-png-timeout.html rename to tests/wpt/tests/apng/animated-png-timeout.html diff --git a/tests/wpt/web-platform-tests/apng/supported-in-source-type.html b/tests/wpt/tests/apng/supported-in-source-type.html similarity index 100% rename from tests/wpt/web-platform-tests/apng/supported-in-source-type.html rename to tests/wpt/tests/apng/supported-in-source-type.html diff --git a/tests/wpt/web-platform-tests/appmanifest/META.yml b/tests/wpt/tests/appmanifest/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/META.yml rename to tests/wpt/tests/appmanifest/META.yml diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/display-member-media-feature-browser-manual.html b/tests/wpt/tests/appmanifest/display-member/display-member-media-feature-browser-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/display-member-media-feature-browser-manual.html rename to tests/wpt/tests/appmanifest/display-member/display-member-media-feature-browser-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/display-member-media-feature-fullscreen-manual.html b/tests/wpt/tests/appmanifest/display-member/display-member-media-feature-fullscreen-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/display-member-media-feature-fullscreen-manual.html rename to tests/wpt/tests/appmanifest/display-member/display-member-media-feature-fullscreen-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/display-member-media-feature-minimal-ui-manual.html b/tests/wpt/tests/appmanifest/display-member/display-member-media-feature-minimal-ui-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/display-member-media-feature-minimal-ui-manual.html rename to tests/wpt/tests/appmanifest/display-member/display-member-media-feature-minimal-ui-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/display-member-media-feature-service-worker.js b/tests/wpt/tests/appmanifest/display-member/display-member-media-feature-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/display-member-media-feature-service-worker.js rename to tests/wpt/tests/appmanifest/display-member/display-member-media-feature-service-worker.js diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/display-member-media-feature-standalone-manual.html b/tests/wpt/tests/appmanifest/display-member/display-member-media-feature-standalone-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/display-member-media-feature-standalone-manual.html rename to tests/wpt/tests/appmanifest/display-member/display-member-media-feature-standalone-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-browser.webmanifest b/tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-browser.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-browser.webmanifest rename to tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-browser.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-browser.webmanifest.headers b/tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-browser.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-browser.webmanifest.headers rename to tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-browser.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-fullscreen.webmanifest b/tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-fullscreen.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-fullscreen.webmanifest rename to tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-fullscreen.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-fullscreen.webmanifest.headers b/tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-fullscreen.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-fullscreen.webmanifest.headers rename to tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-fullscreen.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-manual.js b/tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-manual.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-manual.js rename to tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-manual.js diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-minimal-ui.webmanifest b/tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-minimal-ui.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-minimal-ui.webmanifest rename to tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-minimal-ui.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-minimal-ui.webmanifest.headers b/tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-minimal-ui.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-minimal-ui.webmanifest.headers rename to tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-minimal-ui.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-standalone.webmanifest b/tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-standalone.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-standalone.webmanifest rename to tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-standalone.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-standalone.webmanifest.headers b/tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-standalone.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/resources/display-member-media-feature-standalone.webmanifest.headers rename to tests/wpt/tests/appmanifest/display-member/resources/display-member-media-feature-standalone.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/display-member/resources/icon.png b/tests/wpt/tests/appmanifest/display-member/resources/icon.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-member/resources/icon.png rename to tests/wpt/tests/appmanifest/display-member/resources/icon.png diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-app-region-window-controls-overlay-manual.tentative.html b/tests/wpt/tests/appmanifest/display-override-member/display-override-member-app-region-window-controls-overlay-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-app-region-window-controls-overlay-manual.tentative.html rename to tests/wpt/tests/appmanifest/display-override-member/display-override-member-app-region-window-controls-overlay-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-css-environment-variables-window-controls-overlay-manual.tentative.html b/tests/wpt/tests/appmanifest/display-override-member/display-override-member-css-environment-variables-window-controls-overlay-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-css-environment-variables-window-controls-overlay-manual.tentative.html rename to tests/wpt/tests/appmanifest/display-override-member/display-override-member-css-environment-variables-window-controls-overlay-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-media-feature-browser-manual.tentative.html b/tests/wpt/tests/appmanifest/display-override-member/display-override-member-media-feature-browser-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-media-feature-browser-manual.tentative.html rename to tests/wpt/tests/appmanifest/display-override-member/display-override-member-media-feature-browser-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-media-feature-fullscreen-manual.tentative.html b/tests/wpt/tests/appmanifest/display-override-member/display-override-member-media-feature-fullscreen-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-media-feature-fullscreen-manual.tentative.html rename to tests/wpt/tests/appmanifest/display-override-member/display-override-member-media-feature-fullscreen-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-media-feature-minimal-ui-manual.tentative.html b/tests/wpt/tests/appmanifest/display-override-member/display-override-member-media-feature-minimal-ui-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-media-feature-minimal-ui-manual.tentative.html rename to tests/wpt/tests/appmanifest/display-override-member/display-override-member-media-feature-minimal-ui-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-media-feature-service-worker.js b/tests/wpt/tests/appmanifest/display-override-member/display-override-member-media-feature-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-media-feature-service-worker.js rename to tests/wpt/tests/appmanifest/display-override-member/display-override-member-media-feature-service-worker.js diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-media-feature-standalone-manual.tentative.html b/tests/wpt/tests/appmanifest/display-override-member/display-override-member-media-feature-standalone-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-media-feature-standalone-manual.tentative.html rename to tests/wpt/tests/appmanifest/display-override-member/display-override-member-media-feature-standalone-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-media-feature-standalone-overrides-browser-manual.tentative.html b/tests/wpt/tests/appmanifest/display-override-member/display-override-member-media-feature-standalone-overrides-browser-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-media-feature-standalone-overrides-browser-manual.tentative.html rename to tests/wpt/tests/appmanifest/display-override-member/display-override-member-media-feature-standalone-overrides-browser-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-media-feature-window-controls-overlay-overrides-browser-manual.tentative.html b/tests/wpt/tests/appmanifest/display-override-member/display-override-member-media-feature-window-controls-overlay-overrides-browser-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/display-override-member-media-feature-window-controls-overlay-overrides-browser-manual.tentative.html rename to tests/wpt/tests/appmanifest/display-override-member/display-override-member-media-feature-window-controls-overlay-overrides-browser-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-app-region-window-controls-overlay.webmanifest b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-app-region-window-controls-overlay.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-app-region-window-controls-overlay.webmanifest rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-app-region-window-controls-overlay.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-app-region-window-controls-overlay.webmanifest.headers b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-app-region-window-controls-overlay.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-app-region-window-controls-overlay.webmanifest.headers rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-app-region-window-controls-overlay.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-css-environment-variables-window-controls-overlay.webmanifest b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-css-environment-variables-window-controls-overlay.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-css-environment-variables-window-controls-overlay.webmanifest rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-css-environment-variables-window-controls-overlay.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-css-environment-variables-window-controls-overlay.webmanifest.headers b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-css-environment-variables-window-controls-overlay.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-css-environment-variables-window-controls-overlay.webmanifest.headers rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-css-environment-variables-window-controls-overlay.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-browser.webmanifest b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-browser.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-browser.webmanifest rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-browser.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-browser.webmanifest.headers b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-browser.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-browser.webmanifest.headers rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-browser.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-fullscreen.webmanifest b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-fullscreen.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-fullscreen.webmanifest rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-fullscreen.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-fullscreen.webmanifest.headers b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-fullscreen.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-fullscreen.webmanifest.headers rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-fullscreen.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-manual.js b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-manual.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-manual.js rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-manual.js diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-minimal-ui.webmanifest b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-minimal-ui.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-minimal-ui.webmanifest rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-minimal-ui.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-minimal-ui.webmanifest.headers b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-minimal-ui.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-minimal-ui.webmanifest.headers rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-minimal-ui.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone-overrides-browser.webmanifest b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone-overrides-browser.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone-overrides-browser.webmanifest rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone-overrides-browser.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone-overrides-browser.webmanifest.headers b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone-overrides-browser.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone-overrides-browser.webmanifest.headers rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone-overrides-browser.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone.webmanifest b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone.webmanifest rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone.webmanifest.headers b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone.webmanifest.headers rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-standalone.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-window-controls-overlay-overrides-browser.webmanifest b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-window-controls-overlay-overrides-browser.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-window-controls-overlay-overrides-browser.webmanifest rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-window-controls-overlay-overrides-browser.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-window-controls-overlay-overrides-browser.webmanifest.headers b/tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-window-controls-overlay-overrides-browser.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/display-override-member-media-feature-window-controls-overlay-overrides-browser.webmanifest.headers rename to tests/wpt/tests/appmanifest/display-override-member/resources/display-override-member-media-feature-window-controls-overlay-overrides-browser.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/icon.png b/tests/wpt/tests/appmanifest/display-override-member/resources/icon.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/display-override-member/resources/icon.png rename to tests/wpt/tests/appmanifest/display-override-member/resources/icon.png diff --git a/tests/wpt/web-platform-tests/appmanifest/file_handlers-member/file_handlers-member-manual.tentative.html b/tests/wpt/tests/appmanifest/file_handlers-member/file_handlers-member-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/file_handlers-member/file_handlers-member-manual.tentative.html rename to tests/wpt/tests/appmanifest/file_handlers-member/file_handlers-member-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/appmanifest/file_handlers-member/file_handlers-member-service-worker.js b/tests/wpt/tests/appmanifest/file_handlers-member/file_handlers-member-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/file_handlers-member/file_handlers-member-service-worker.js rename to tests/wpt/tests/appmanifest/file_handlers-member/file_handlers-member-service-worker.js diff --git a/tests/wpt/web-platform-tests/appmanifest/file_handlers-member/resources/file_handlers-member.js b/tests/wpt/tests/appmanifest/file_handlers-member/resources/file_handlers-member.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/file_handlers-member/resources/file_handlers-member.js rename to tests/wpt/tests/appmanifest/file_handlers-member/resources/file_handlers-member.js diff --git a/tests/wpt/web-platform-tests/appmanifest/file_handlers-member/resources/file_handlers-member.webmanifest b/tests/wpt/tests/appmanifest/file_handlers-member/resources/file_handlers-member.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/file_handlers-member/resources/file_handlers-member.webmanifest rename to tests/wpt/tests/appmanifest/file_handlers-member/resources/file_handlers-member.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/file_handlers-member/resources/file_handlers-sample-file.txt b/tests/wpt/tests/appmanifest/file_handlers-member/resources/file_handlers-sample-file.txt similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/file_handlers-member/resources/file_handlers-sample-file.txt rename to tests/wpt/tests/appmanifest/file_handlers-member/resources/file_handlers-sample-file.txt diff --git a/tests/wpt/web-platform-tests/appmanifest/file_handlers-member/resources/icon.png b/tests/wpt/tests/appmanifest/file_handlers-member/resources/icon.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/file_handlers-member/resources/icon.png rename to tests/wpt/tests/appmanifest/file_handlers-member/resources/icon.png diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-cors-fail-manual.sub.html b/tests/wpt/tests/appmanifest/icons-member/icons-member-cors-fail-manual.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-cors-fail-manual.sub.html rename to tests/wpt/tests/appmanifest/icons-member/icons-member-cors-fail-manual.sub.html diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-cors-manual.sub.html b/tests/wpt/tests/appmanifest/icons-member/icons-member-cors-manual.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-cors-manual.sub.html rename to tests/wpt/tests/appmanifest/icons-member/icons-member-cors-manual.sub.html diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-csp-fail-manual.sub.html b/tests/wpt/tests/appmanifest/icons-member/icons-member-csp-fail-manual.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-csp-fail-manual.sub.html rename to tests/wpt/tests/appmanifest/icons-member/icons-member-csp-fail-manual.sub.html diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-csp-manual.sub.html b/tests/wpt/tests/appmanifest/icons-member/icons-member-csp-manual.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-csp-manual.sub.html rename to tests/wpt/tests/appmanifest/icons-member/icons-member-csp-manual.sub.html diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-last-matching-manual.html b/tests/wpt/tests/appmanifest/icons-member/icons-member-last-matching-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-last-matching-manual.html rename to tests/wpt/tests/appmanifest/icons-member/icons-member-last-matching-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-manual.html b/tests/wpt/tests/appmanifest/icons-member/icons-member-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-manual.html rename to tests/wpt/tests/appmanifest/icons-member/icons-member-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-next-appropriate-manual.html b/tests/wpt/tests/appmanifest/icons-member/icons-member-next-appropriate-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-next-appropriate-manual.html rename to tests/wpt/tests/appmanifest/icons-member/icons-member-next-appropriate-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-service-worker.js b/tests/wpt/tests/appmanifest/icons-member/icons-member-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/icons-member-service-worker.js rename to tests/wpt/tests/appmanifest/icons-member/icons-member-service-worker.js diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/fail.png b/tests/wpt/tests/appmanifest/icons-member/resources/fail.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/fail.png rename to tests/wpt/tests/appmanifest/icons-member/resources/fail.png diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-cors-fail.sub.webmanifest b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member-cors-fail.sub.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-cors-fail.sub.webmanifest rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member-cors-fail.sub.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-cors-fail.webmanifest.headers b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member-cors-fail.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-cors-fail.webmanifest.headers rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member-cors-fail.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-cors.sub.webmanifest b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member-cors.sub.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-cors.sub.webmanifest rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member-cors.sub.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-cors.webmanifest.headers b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member-cors.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-cors.webmanifest.headers rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member-cors.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-csp-fail.webmanifest b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member-csp-fail.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-csp-fail.webmanifest rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member-csp-fail.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-csp-fail.webmanifest.headers b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member-csp-fail.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-csp-fail.webmanifest.headers rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member-csp-fail.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-csp.sub.webmanifest b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member-csp.sub.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-csp.sub.webmanifest rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member-csp.sub.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-csp.webmanifest.headers b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member-csp.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-csp.webmanifest.headers rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member-csp.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-last-matching.webmanifest b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member-last-matching.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-last-matching.webmanifest rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member-last-matching.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-last-matching.webmanifest.headers b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member-last-matching.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-last-matching.webmanifest.headers rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member-last-matching.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-manual.js b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member-manual.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-manual.js rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member-manual.js diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-next-appropriate.webmanifest b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member-next-appropriate.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-next-appropriate.webmanifest rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member-next-appropriate.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-next-appropriate.webmanifest.headers b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member-next-appropriate.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member-next-appropriate.webmanifest.headers rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member-next-appropriate.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member.webmanifest b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member.webmanifest rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member.webmanifest.headers b/tests/wpt/tests/appmanifest/icons-member/resources/icons-member.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/icons-member.webmanifest.headers rename to tests/wpt/tests/appmanifest/icons-member/resources/icons-member.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/pass.png b/tests/wpt/tests/appmanifest/icons-member/resources/pass.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/pass.png rename to tests/wpt/tests/appmanifest/icons-member/resources/pass.png diff --git a/tests/wpt/web-platform-tests/appmanifest/icons-member/resources/pass.png.sub.headers b/tests/wpt/tests/appmanifest/icons-member/resources/pass.png.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/icons-member/resources/pass.png.sub.headers rename to tests/wpt/tests/appmanifest/icons-member/resources/pass.png.sub.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/id-member/icon.png b/tests/wpt/tests/appmanifest/id-member/icon.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/id-member/icon.png rename to tests/wpt/tests/appmanifest/id-member/icon.png diff --git a/tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update-manual-v1.html b/tests/wpt/tests/appmanifest/id-member/id-member-manifest-update-manual-v1.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update-manual-v1.html rename to tests/wpt/tests/appmanifest/id-member/id-member-manifest-update-manual-v1.html diff --git a/tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update-manual-v2.html b/tests/wpt/tests/appmanifest/id-member/id-member-manifest-update-manual-v2.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update-manual-v2.html rename to tests/wpt/tests/appmanifest/id-member/id-member-manifest-update-manual-v2.html diff --git a/tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update-manual.tentative.html b/tests/wpt/tests/appmanifest/id-member/id-member-manifest-update-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update-manual.tentative.html rename to tests/wpt/tests/appmanifest/id-member/id-member-manifest-update-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update-v1.webmanifest b/tests/wpt/tests/appmanifest/id-member/id-member-manifest-update-v1.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update-v1.webmanifest rename to tests/wpt/tests/appmanifest/id-member/id-member-manifest-update-v1.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update-v1.webmanifest.headers b/tests/wpt/tests/appmanifest/id-member/id-member-manifest-update-v1.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update-v1.webmanifest.headers rename to tests/wpt/tests/appmanifest/id-member/id-member-manifest-update-v1.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update-v2.webmanifest b/tests/wpt/tests/appmanifest/id-member/id-member-manifest-update-v2.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update-v2.webmanifest rename to tests/wpt/tests/appmanifest/id-member/id-member-manifest-update-v2.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update-v2.webmanifest.headers b/tests/wpt/tests/appmanifest/id-member/id-member-manifest-update-v2.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update-v2.webmanifest.headers rename to tests/wpt/tests/appmanifest/id-member/id-member-manifest-update-v2.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update.js b/tests/wpt/tests/appmanifest/id-member/id-member-manifest-update.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/id-member/id-member-manifest-update.js rename to tests/wpt/tests/appmanifest/id-member/id-member-manifest-update.js diff --git a/tests/wpt/web-platform-tests/appmanifest/id-member/id-member-service-worker.js b/tests/wpt/tests/appmanifest/id-member/id-member-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/id-member/id-member-service-worker.js rename to tests/wpt/tests/appmanifest/id-member/id-member-service-worker.js diff --git a/tests/wpt/web-platform-tests/appmanifest/name-member/name-member-manual.html b/tests/wpt/tests/appmanifest/name-member/name-member-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/name-member/name-member-manual.html rename to tests/wpt/tests/appmanifest/name-member/name-member-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/name-member/name-member-service-worker.js b/tests/wpt/tests/appmanifest/name-member/name-member-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/name-member/name-member-service-worker.js rename to tests/wpt/tests/appmanifest/name-member/name-member-service-worker.js diff --git a/tests/wpt/web-platform-tests/appmanifest/name-member/resources/icon.png b/tests/wpt/tests/appmanifest/name-member/resources/icon.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/name-member/resources/icon.png rename to tests/wpt/tests/appmanifest/name-member/resources/icon.png diff --git a/tests/wpt/web-platform-tests/appmanifest/name-member/resources/name-member-fail.webmanifest b/tests/wpt/tests/appmanifest/name-member/resources/name-member-fail.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/name-member/resources/name-member-fail.webmanifest rename to tests/wpt/tests/appmanifest/name-member/resources/name-member-fail.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/name-member/resources/name-member-fail.webmanifest.headers b/tests/wpt/tests/appmanifest/name-member/resources/name-member-fail.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/name-member/resources/name-member-fail.webmanifest.headers rename to tests/wpt/tests/appmanifest/name-member/resources/name-member-fail.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/name-member/resources/name-member-manual.js b/tests/wpt/tests/appmanifest/name-member/resources/name-member-manual.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/name-member/resources/name-member-manual.js rename to tests/wpt/tests/appmanifest/name-member/resources/name-member-manual.js diff --git a/tests/wpt/web-platform-tests/appmanifest/name-member/resources/name-member.webmanifest b/tests/wpt/tests/appmanifest/name-member/resources/name-member.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/name-member/resources/name-member.webmanifest rename to tests/wpt/tests/appmanifest/name-member/resources/name-member.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/name-member/resources/name-member.webmanifest.headers b/tests/wpt/tests/appmanifest/name-member/resources/name-member.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/name-member/resources/name-member.webmanifest.headers rename to tests/wpt/tests/appmanifest/name-member/resources/name-member.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/orientation-member/orientation-member-landscape-manual.html b/tests/wpt/tests/appmanifest/orientation-member/orientation-member-landscape-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/orientation-member/orientation-member-landscape-manual.html rename to tests/wpt/tests/appmanifest/orientation-member/orientation-member-landscape-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/orientation-member/orientation-member-portrait-manual.html b/tests/wpt/tests/appmanifest/orientation-member/orientation-member-portrait-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/orientation-member/orientation-member-portrait-manual.html rename to tests/wpt/tests/appmanifest/orientation-member/orientation-member-portrait-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/orientation-member/orientation-member-service-worker.js b/tests/wpt/tests/appmanifest/orientation-member/orientation-member-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/orientation-member/orientation-member-service-worker.js rename to tests/wpt/tests/appmanifest/orientation-member/orientation-member-service-worker.js diff --git a/tests/wpt/web-platform-tests/appmanifest/orientation-member/resources/icon.png b/tests/wpt/tests/appmanifest/orientation-member/resources/icon.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/orientation-member/resources/icon.png rename to tests/wpt/tests/appmanifest/orientation-member/resources/icon.png diff --git a/tests/wpt/web-platform-tests/appmanifest/orientation-member/resources/orientation-member-landscape.webmanifest b/tests/wpt/tests/appmanifest/orientation-member/resources/orientation-member-landscape.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/orientation-member/resources/orientation-member-landscape.webmanifest rename to tests/wpt/tests/appmanifest/orientation-member/resources/orientation-member-landscape.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/orientation-member/resources/orientation-member-landscape.webmanifest.headers b/tests/wpt/tests/appmanifest/orientation-member/resources/orientation-member-landscape.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/orientation-member/resources/orientation-member-landscape.webmanifest.headers rename to tests/wpt/tests/appmanifest/orientation-member/resources/orientation-member-landscape.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/orientation-member/resources/orientation-member-manual.js b/tests/wpt/tests/appmanifest/orientation-member/resources/orientation-member-manual.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/orientation-member/resources/orientation-member-manual.js rename to tests/wpt/tests/appmanifest/orientation-member/resources/orientation-member-manual.js diff --git a/tests/wpt/web-platform-tests/appmanifest/orientation-member/resources/orientation-member-portrait.webmanifest b/tests/wpt/tests/appmanifest/orientation-member/resources/orientation-member-portrait.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/orientation-member/resources/orientation-member-portrait.webmanifest rename to tests/wpt/tests/appmanifest/orientation-member/resources/orientation-member-portrait.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/orientation-member/resources/orientation-member-portrait.webmanifest.headers b/tests/wpt/tests/appmanifest/orientation-member/resources/orientation-member-portrait.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/orientation-member/resources/orientation-member-portrait.webmanifest.headers rename to tests/wpt/tests/appmanifest/orientation-member/resources/orientation-member-portrait.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/protocol_handlers-member/protocol_handlers-member-manual.tentative.html b/tests/wpt/tests/appmanifest/protocol_handlers-member/protocol_handlers-member-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/protocol_handlers-member/protocol_handlers-member-manual.tentative.html rename to tests/wpt/tests/appmanifest/protocol_handlers-member/protocol_handlers-member-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/appmanifest/protocol_handlers-member/protocol_handlers-member-service-worker.js b/tests/wpt/tests/appmanifest/protocol_handlers-member/protocol_handlers-member-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/protocol_handlers-member/protocol_handlers-member-service-worker.js rename to tests/wpt/tests/appmanifest/protocol_handlers-member/protocol_handlers-member-service-worker.js diff --git a/tests/wpt/web-platform-tests/appmanifest/protocol_handlers-member/resources/icon.png b/tests/wpt/tests/appmanifest/protocol_handlers-member/resources/icon.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/protocol_handlers-member/resources/icon.png rename to tests/wpt/tests/appmanifest/protocol_handlers-member/resources/icon.png diff --git a/tests/wpt/web-platform-tests/appmanifest/protocol_handlers-member/resources/protocol_handlers-member.webmanifest b/tests/wpt/tests/appmanifest/protocol_handlers-member/resources/protocol_handlers-member.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/protocol_handlers-member/resources/protocol_handlers-member.webmanifest rename to tests/wpt/tests/appmanifest/protocol_handlers-member/resources/protocol_handlers-member.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/protocol_handlers-member/resources/protocol_handlers-member.webmanifest.headers b/tests/wpt/tests/appmanifest/protocol_handlers-member/resources/protocol_handlers-member.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/protocol_handlers-member/resources/protocol_handlers-member.webmanifest.headers rename to tests/wpt/tests/appmanifest/protocol_handlers-member/resources/protocol_handlers-member.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/protocol_handlers-member/resources/protocol_handlers_entry.html b/tests/wpt/tests/appmanifest/protocol_handlers-member/resources/protocol_handlers_entry.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/protocol_handlers-member/resources/protocol_handlers_entry.html rename to tests/wpt/tests/appmanifest/protocol_handlers-member/resources/protocol_handlers_entry.html diff --git a/tests/wpt/web-platform-tests/appmanifest/short_name-member/resources/icon.png b/tests/wpt/tests/appmanifest/short_name-member/resources/icon.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/short_name-member/resources/icon.png rename to tests/wpt/tests/appmanifest/short_name-member/resources/icon.png diff --git a/tests/wpt/web-platform-tests/appmanifest/short_name-member/resources/short_name-member-manual.js b/tests/wpt/tests/appmanifest/short_name-member/resources/short_name-member-manual.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/short_name-member/resources/short_name-member-manual.js rename to tests/wpt/tests/appmanifest/short_name-member/resources/short_name-member-manual.js diff --git a/tests/wpt/web-platform-tests/appmanifest/short_name-member/resources/short_name-member.webmanifest b/tests/wpt/tests/appmanifest/short_name-member/resources/short_name-member.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/short_name-member/resources/short_name-member.webmanifest rename to tests/wpt/tests/appmanifest/short_name-member/resources/short_name-member.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/short_name-member/resources/short_name-member.webmanifest.headers b/tests/wpt/tests/appmanifest/short_name-member/resources/short_name-member.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/short_name-member/resources/short_name-member.webmanifest.headers rename to tests/wpt/tests/appmanifest/short_name-member/resources/short_name-member.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/short_name-member/short_name-member-manual.html b/tests/wpt/tests/appmanifest/short_name-member/short_name-member-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/short_name-member/short_name-member-manual.html rename to tests/wpt/tests/appmanifest/short_name-member/short_name-member-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/short_name-member/short_name-member-service-worker.js b/tests/wpt/tests/appmanifest/short_name-member/short_name-member-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/short_name-member/short_name-member-service-worker.js rename to tests/wpt/tests/appmanifest/short_name-member/short_name-member-service-worker.js diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/pass.png b/tests/wpt/tests/appmanifest/shortcuts-member/resources/pass.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/pass.png rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/pass.png diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/pass.png.sub.headers b/tests/wpt/tests/appmanifest/shortcuts-member/resources/pass.png.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/pass.png.sub.headers rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/pass.png.sub.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors-fail.sub.webmanifest b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors-fail.sub.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors-fail.sub.webmanifest rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors-fail.sub.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors-fail.webmanifest.headers b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors-fail.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors-fail.webmanifest.headers rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors-fail.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors.sub.webmanifest b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors.sub.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors.sub.webmanifest rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors.sub.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors.webmanifest.headers b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors.webmanifest.headers rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-cors.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp-fail.webmanifest b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp-fail.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp-fail.webmanifest rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp-fail.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp-fail.webmanifest.headers b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp-fail.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp-fail.webmanifest.headers rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp-fail.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp.sub.webmanifest b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp.sub.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp.sub.webmanifest rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp.sub.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp.webmanifest.headers b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp.webmanifest.headers rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-csp.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-manual.js b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-manual.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-manual.js rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-manual.js diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-empty-name.webmanifest b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-empty-name.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-empty-name.webmanifest rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-empty-name.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-empty-name.webmanifest.headers b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-empty-name.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-empty-name.webmanifest.headers rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-empty-name.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-invalid-url.webmanifest b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-invalid-url.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-invalid-url.webmanifest rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-invalid-url.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-invalid-url.webmanifest.headers b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-invalid-url.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-invalid-url.webmanifest.headers rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-invalid-url.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-out-of-scope-url.webmanifest b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-out-of-scope-url.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-out-of-scope-url.webmanifest rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-out-of-scope-url.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-out-of-scope-url.webmanifest.headers b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-out-of-scope-url.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-out-of-scope-url.webmanifest.headers rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-out-of-scope-url.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-name.webmanifest b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-name.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-name.webmanifest rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-name.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-name.webmanifest.headers b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-name.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-name.webmanifest.headers rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-name.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-url.webmanifest b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-url.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-url.webmanifest rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-url.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-url.webmanifest.headers b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-url.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-url.webmanifest.headers rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member-skip-for-undefined-url.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member.webmanifest b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member.webmanifest rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member.webmanifest.headers b/tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/resources/shortcuts-member.webmanifest.headers rename to tests/wpt/tests/appmanifest/shortcuts-member/resources/shortcuts-member.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcut_fail.html b/tests/wpt/tests/appmanifest/shortcuts-member/shortcut_fail.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcut_fail.html rename to tests/wpt/tests/appmanifest/shortcuts-member/shortcut_fail.html diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcut_pass.html b/tests/wpt/tests/appmanifest/shortcuts-member/shortcut_pass.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcut_pass.html rename to tests/wpt/tests/appmanifest/shortcuts-member/shortcut_pass.html diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-cors-fail-manual.sub.html b/tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-cors-fail-manual.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-cors-fail-manual.sub.html rename to tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-cors-fail-manual.sub.html diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-cors-manual.sub.html b/tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-cors-manual.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-cors-manual.sub.html rename to tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-cors-manual.sub.html diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-csp-fail-manual.sub.html b/tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-csp-fail-manual.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-csp-fail-manual.sub.html rename to tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-csp-fail-manual.sub.html diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-csp-manual.sub.html b/tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-csp-manual.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-csp-manual.sub.html rename to tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-csp-manual.sub.html diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-manual.html b/tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-manual.html rename to tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-service-worker.js b/tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-service-worker.js rename to tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-service-worker.js diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-empty-name-manual.html b/tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-empty-name-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-empty-name-manual.html rename to tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-empty-name-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-invalid-url-manual.html b/tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-invalid-url-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-invalid-url-manual.html rename to tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-invalid-url-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-out-of-scope-url-manual.html b/tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-out-of-scope-url-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-out-of-scope-url-manual.html rename to tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-out-of-scope-url-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-undefined-name-manual.html b/tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-undefined-name-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-undefined-name-manual.html rename to tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-undefined-name-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-undefined-url-manual.html b/tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-undefined-url-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-undefined-url-manual.html rename to tests/wpt/tests/appmanifest/shortcuts-member/shortcuts-member-skip-for-undefined-url-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/start_url-member/fail.html b/tests/wpt/tests/appmanifest/start_url-member/fail.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/start_url-member/fail.html rename to tests/wpt/tests/appmanifest/start_url-member/fail.html diff --git a/tests/wpt/web-platform-tests/appmanifest/start_url-member/pass.html b/tests/wpt/tests/appmanifest/start_url-member/pass.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/start_url-member/pass.html rename to tests/wpt/tests/appmanifest/start_url-member/pass.html diff --git a/tests/wpt/web-platform-tests/appmanifest/start_url-member/resources/icon.png b/tests/wpt/tests/appmanifest/start_url-member/resources/icon.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/start_url-member/resources/icon.png rename to tests/wpt/tests/appmanifest/start_url-member/resources/icon.png diff --git a/tests/wpt/web-platform-tests/appmanifest/start_url-member/resources/start_url-member-fail.sub.webmanifest b/tests/wpt/tests/appmanifest/start_url-member/resources/start_url-member-fail.sub.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/start_url-member/resources/start_url-member-fail.sub.webmanifest rename to tests/wpt/tests/appmanifest/start_url-member/resources/start_url-member-fail.sub.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/start_url-member/resources/start_url-member-fail.sub.webmanifest.headers b/tests/wpt/tests/appmanifest/start_url-member/resources/start_url-member-fail.sub.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/start_url-member/resources/start_url-member-fail.sub.webmanifest.headers rename to tests/wpt/tests/appmanifest/start_url-member/resources/start_url-member-fail.sub.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/start_url-member/resources/start_url-member-manual.js b/tests/wpt/tests/appmanifest/start_url-member/resources/start_url-member-manual.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/start_url-member/resources/start_url-member-manual.js rename to tests/wpt/tests/appmanifest/start_url-member/resources/start_url-member-manual.js diff --git a/tests/wpt/web-platform-tests/appmanifest/start_url-member/resources/start_url-member.webmanifest b/tests/wpt/tests/appmanifest/start_url-member/resources/start_url-member.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/start_url-member/resources/start_url-member.webmanifest rename to tests/wpt/tests/appmanifest/start_url-member/resources/start_url-member.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/start_url-member/resources/start_url-member.webmanifest.headers b/tests/wpt/tests/appmanifest/start_url-member/resources/start_url-member.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/start_url-member/resources/start_url-member.webmanifest.headers rename to tests/wpt/tests/appmanifest/start_url-member/resources/start_url-member.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/start_url-member/start_url-member-fail-manual.sub.html b/tests/wpt/tests/appmanifest/start_url-member/start_url-member-fail-manual.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/start_url-member/start_url-member-fail-manual.sub.html rename to tests/wpt/tests/appmanifest/start_url-member/start_url-member-fail-manual.sub.html diff --git a/tests/wpt/web-platform-tests/appmanifest/start_url-member/start_url-member-pass-manual.html b/tests/wpt/tests/appmanifest/start_url-member/start_url-member-pass-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/start_url-member/start_url-member-pass-manual.html rename to tests/wpt/tests/appmanifest/start_url-member/start_url-member-pass-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/start_url-member/start_url-member-service-worker.js b/tests/wpt/tests/appmanifest/start_url-member/start_url-member-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/start_url-member/start_url-member-service-worker.js rename to tests/wpt/tests/appmanifest/start_url-member/start_url-member-service-worker.js diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/icon.png b/tests/wpt/tests/appmanifest/theme_color-member/resources/icon.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/icon.png rename to tests/wpt/tests/appmanifest/theme_color-member/resources/icon.png diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-hsl.webmanifest b/tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-hsl.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-hsl.webmanifest rename to tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-hsl.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-hsl.webmanifest.headers b/tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-hsl.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-hsl.webmanifest.headers rename to tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-hsl.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-manual.js b/tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-manual.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-manual.js rename to tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-manual.js diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-named.webmanifest b/tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-named.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-named.webmanifest rename to tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-named.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-named.webmanifest.headers b/tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-named.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-named.webmanifest.headers rename to tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-named.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgb.webmanifest b/tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgb.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgb.webmanifest rename to tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgb.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgb.webmanifest.headers b/tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgb.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgb.webmanifest.headers rename to tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgb.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex3.webmanifest b/tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex3.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex3.webmanifest rename to tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex3.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex3.webmanifest.headers b/tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex3.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex3.webmanifest.headers rename to tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex3.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex6.webmanifest b/tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex6.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex6.webmanifest rename to tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex6.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex6.webmanifest.headers b/tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex6.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex6.webmanifest.headers rename to tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgbhex6.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgblegacy.webmanifest b/tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgblegacy.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgblegacy.webmanifest rename to tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgblegacy.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgblegacy.webmanifest.headers b/tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgblegacy.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/resources/theme_color-member-rgblegacy.webmanifest.headers rename to tests/wpt/tests/appmanifest/theme_color-member/resources/theme_color-member-rgblegacy.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/theme_color-member-hsl-manual.html b/tests/wpt/tests/appmanifest/theme_color-member/theme_color-member-hsl-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/theme_color-member-hsl-manual.html rename to tests/wpt/tests/appmanifest/theme_color-member/theme_color-member-hsl-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/theme_color-member-named-manual.html b/tests/wpt/tests/appmanifest/theme_color-member/theme_color-member-named-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/theme_color-member-named-manual.html rename to tests/wpt/tests/appmanifest/theme_color-member/theme_color-member-named-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/theme_color-member-rgb-manual.html b/tests/wpt/tests/appmanifest/theme_color-member/theme_color-member-rgb-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/theme_color-member-rgb-manual.html rename to tests/wpt/tests/appmanifest/theme_color-member/theme_color-member-rgb-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/theme_color-member-rgbhex3-manual.html b/tests/wpt/tests/appmanifest/theme_color-member/theme_color-member-rgbhex3-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/theme_color-member-rgbhex3-manual.html rename to tests/wpt/tests/appmanifest/theme_color-member/theme_color-member-rgbhex3-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/theme_color-member-rgbhex6-manual.html b/tests/wpt/tests/appmanifest/theme_color-member/theme_color-member-rgbhex6-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/theme_color-member-rgbhex6-manual.html rename to tests/wpt/tests/appmanifest/theme_color-member/theme_color-member-rgbhex6-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/theme_color-member-rgblegacy-manual.html b/tests/wpt/tests/appmanifest/theme_color-member/theme_color-member-rgblegacy-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/theme_color-member-rgblegacy-manual.html rename to tests/wpt/tests/appmanifest/theme_color-member/theme_color-member-rgblegacy-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/theme_color-member/theme_color-member-service-worker.js b/tests/wpt/tests/appmanifest/theme_color-member/theme_color-member-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/theme_color-member/theme_color-member-service-worker.js rename to tests/wpt/tests/appmanifest/theme_color-member/theme_color-member-service-worker.js diff --git a/tests/wpt/web-platform-tests/appmanifest/unrecognized-member/resources/icon.png b/tests/wpt/tests/appmanifest/unrecognized-member/resources/icon.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/unrecognized-member/resources/icon.png rename to tests/wpt/tests/appmanifest/unrecognized-member/resources/icon.png diff --git a/tests/wpt/web-platform-tests/appmanifest/unrecognized-member/resources/unrecognized-member-manual.js b/tests/wpt/tests/appmanifest/unrecognized-member/resources/unrecognized-member-manual.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/unrecognized-member/resources/unrecognized-member-manual.js rename to tests/wpt/tests/appmanifest/unrecognized-member/resources/unrecognized-member-manual.js diff --git a/tests/wpt/web-platform-tests/appmanifest/unrecognized-member/resources/unrecognized-member.webmanifest b/tests/wpt/tests/appmanifest/unrecognized-member/resources/unrecognized-member.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/unrecognized-member/resources/unrecognized-member.webmanifest rename to tests/wpt/tests/appmanifest/unrecognized-member/resources/unrecognized-member.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/unrecognized-member/resources/unrecognized-member.webmanifest.headers b/tests/wpt/tests/appmanifest/unrecognized-member/resources/unrecognized-member.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/unrecognized-member/resources/unrecognized-member.webmanifest.headers rename to tests/wpt/tests/appmanifest/unrecognized-member/resources/unrecognized-member.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/unrecognized-member/unrecognized-member-manual.html b/tests/wpt/tests/appmanifest/unrecognized-member/unrecognized-member-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/unrecognized-member/unrecognized-member-manual.html rename to tests/wpt/tests/appmanifest/unrecognized-member/unrecognized-member-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/unrecognized-member/unrecognized-member-service-worker.js b/tests/wpt/tests/appmanifest/unrecognized-member/unrecognized-member-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/unrecognized-member/unrecognized-member-service-worker.js rename to tests/wpt/tests/appmanifest/unrecognized-member/unrecognized-member-service-worker.js diff --git a/tests/wpt/web-platform-tests/appmanifest/user_preferences-member/resources/icon.png b/tests/wpt/tests/appmanifest/user_preferences-member/resources/icon.png similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/user_preferences-member/resources/icon.png rename to tests/wpt/tests/appmanifest/user_preferences-member/resources/icon.png diff --git a/tests/wpt/web-platform-tests/appmanifest/user_preferences-member/resources/user_preferences-member-manual.js b/tests/wpt/tests/appmanifest/user_preferences-member/resources/user_preferences-member-manual.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/user_preferences-member/resources/user_preferences-member-manual.js rename to tests/wpt/tests/appmanifest/user_preferences-member/resources/user_preferences-member-manual.js diff --git a/tests/wpt/web-platform-tests/appmanifest/user_preferences-member/resources/user_preferences-member.webmanifest b/tests/wpt/tests/appmanifest/user_preferences-member/resources/user_preferences-member.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/user_preferences-member/resources/user_preferences-member.webmanifest rename to tests/wpt/tests/appmanifest/user_preferences-member/resources/user_preferences-member.webmanifest diff --git a/tests/wpt/web-platform-tests/appmanifest/user_preferences-member/resources/user_preferences-member.webmanifest.headers b/tests/wpt/tests/appmanifest/user_preferences-member/resources/user_preferences-member.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/user_preferences-member/resources/user_preferences-member.webmanifest.headers rename to tests/wpt/tests/appmanifest/user_preferences-member/resources/user_preferences-member.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/appmanifest/user_preferences-member/user_preferences-member-manual.html b/tests/wpt/tests/appmanifest/user_preferences-member/user_preferences-member-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/user_preferences-member/user_preferences-member-manual.html rename to tests/wpt/tests/appmanifest/user_preferences-member/user_preferences-member-manual.html diff --git a/tests/wpt/web-platform-tests/appmanifest/user_preferences-member/user_preferences-member-service-worker.js b/tests/wpt/tests/appmanifest/user_preferences-member/user_preferences-member-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/appmanifest/user_preferences-member/user_preferences-member-service-worker.js rename to tests/wpt/tests/appmanifest/user_preferences-member/user_preferences-member-service-worker.js diff --git a/tests/wpt/web-platform-tests/attribution-reporting/__init__.py b/tests/wpt/tests/attribution-reporting/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/attribution-reporting/__init__.py rename to tests/wpt/tests/attribution-reporting/__init__.py diff --git a/tests/wpt/web-platform-tests/attribution-reporting/aggregatable-report-no-contributions.sub.https.html b/tests/wpt/tests/attribution-reporting/aggregatable-report-no-contributions.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/attribution-reporting/aggregatable-report-no-contributions.sub.https.html rename to tests/wpt/tests/attribution-reporting/aggregatable-report-no-contributions.sub.https.html diff --git a/tests/wpt/web-platform-tests/attribution-reporting/request-format.sub.https.html b/tests/wpt/tests/attribution-reporting/request-format.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/attribution-reporting/request-format.sub.https.html rename to tests/wpt/tests/attribution-reporting/request-format.sub.https.html diff --git a/tests/wpt/web-platform-tests/attribution-reporting/resources/__init__.py b/tests/wpt/tests/attribution-reporting/resources/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/attribution-reporting/resources/__init__.py rename to tests/wpt/tests/attribution-reporting/resources/__init__.py diff --git a/tests/wpt/web-platform-tests/attribution-reporting/resources/helpers.js b/tests/wpt/tests/attribution-reporting/resources/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/attribution-reporting/resources/helpers.js rename to tests/wpt/tests/attribution-reporting/resources/helpers.js diff --git a/tests/wpt/web-platform-tests/attribution-reporting/resources/reporting_origin.py b/tests/wpt/tests/attribution-reporting/resources/reporting_origin.py similarity index 100% rename from tests/wpt/web-platform-tests/attribution-reporting/resources/reporting_origin.py rename to tests/wpt/tests/attribution-reporting/resources/reporting_origin.py diff --git a/tests/wpt/web-platform-tests/attribution-reporting/resources/reports.py b/tests/wpt/tests/attribution-reporting/resources/reports.py similarity index 100% rename from tests/wpt/web-platform-tests/attribution-reporting/resources/reports.py rename to tests/wpt/tests/attribution-reporting/resources/reports.py diff --git a/tests/wpt/web-platform-tests/attribution-reporting/simple-verbose-debug-report.sub.https.html b/tests/wpt/tests/attribution-reporting/simple-verbose-debug-report.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/attribution-reporting/simple-verbose-debug-report.sub.https.html rename to tests/wpt/tests/attribution-reporting/simple-verbose-debug-report.sub.https.html diff --git a/tests/wpt/web-platform-tests/audio-output/META.yml b/tests/wpt/tests/audio-output/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/audio-output/META.yml rename to tests/wpt/tests/audio-output/META.yml diff --git a/tests/wpt/web-platform-tests/audio-output/enumerateDevices-permissions-policy.https.html b/tests/wpt/tests/audio-output/enumerateDevices-permissions-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/audio-output/enumerateDevices-permissions-policy.https.html rename to tests/wpt/tests/audio-output/enumerateDevices-permissions-policy.https.html diff --git a/tests/wpt/web-platform-tests/audio-output/enumerateDevices-with-selectAudioOutput.https.html b/tests/wpt/tests/audio-output/enumerateDevices-with-selectAudioOutput.https.html similarity index 100% rename from tests/wpt/web-platform-tests/audio-output/enumerateDevices-with-selectAudioOutput.https.html rename to tests/wpt/tests/audio-output/enumerateDevices-with-selectAudioOutput.https.html diff --git a/tests/wpt/web-platform-tests/audio-output/idlharness.https.window.js b/tests/wpt/tests/audio-output/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/audio-output/idlharness.https.window.js rename to tests/wpt/tests/audio-output/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/audio-output/removeTrack-after-setSinkId.https.html b/tests/wpt/tests/audio-output/removeTrack-after-setSinkId.https.html similarity index 100% rename from tests/wpt/web-platform-tests/audio-output/removeTrack-after-setSinkId.https.html rename to tests/wpt/tests/audio-output/removeTrack-after-setSinkId.https.html diff --git a/tests/wpt/web-platform-tests/audio-output/secure-context.html b/tests/wpt/tests/audio-output/secure-context.html similarity index 100% rename from tests/wpt/web-platform-tests/audio-output/secure-context.html rename to tests/wpt/tests/audio-output/secure-context.html diff --git a/tests/wpt/web-platform-tests/audio-output/selectAudioOutput-permissions-policy.https.sub.html b/tests/wpt/tests/audio-output/selectAudioOutput-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/audio-output/selectAudioOutput-permissions-policy.https.sub.html rename to tests/wpt/tests/audio-output/selectAudioOutput-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/audio-output/selectAudioOutput-sans-user-activation.https.html b/tests/wpt/tests/audio-output/selectAudioOutput-sans-user-activation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/audio-output/selectAudioOutput-sans-user-activation.https.html rename to tests/wpt/tests/audio-output/selectAudioOutput-sans-user-activation.https.html diff --git a/tests/wpt/web-platform-tests/audio-output/setSinkId-manual.https.html b/tests/wpt/tests/audio-output/setSinkId-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/audio-output/setSinkId-manual.https.html rename to tests/wpt/tests/audio-output/setSinkId-manual.https.html diff --git a/tests/wpt/web-platform-tests/audio-output/setSinkId-permissions-policy.https.sub.html b/tests/wpt/tests/audio-output/setSinkId-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/audio-output/setSinkId-permissions-policy.https.sub.html rename to tests/wpt/tests/audio-output/setSinkId-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/audio-output/setSinkId-with-selectAudioOutput.https.html b/tests/wpt/tests/audio-output/setSinkId-with-selectAudioOutput.https.html similarity index 100% rename from tests/wpt/web-platform-tests/audio-output/setSinkId-with-selectAudioOutput.https.html rename to tests/wpt/tests/audio-output/setSinkId-with-selectAudioOutput.https.html diff --git a/tests/wpt/web-platform-tests/audio-output/setSinkId.https.html b/tests/wpt/tests/audio-output/setSinkId.https.html similarity index 100% rename from tests/wpt/web-platform-tests/audio-output/setSinkId.https.html rename to tests/wpt/tests/audio-output/setSinkId.https.html diff --git a/tests/wpt/web-platform-tests/autoplay-policy-detection/autoplaypolicy.html b/tests/wpt/tests/autoplay-policy-detection/autoplaypolicy.html similarity index 100% rename from tests/wpt/web-platform-tests/autoplay-policy-detection/autoplaypolicy.html rename to tests/wpt/tests/autoplay-policy-detection/autoplaypolicy.html diff --git a/tests/wpt/web-platform-tests/autoplay-policy-detection/autoplaypolicy_media_element.html b/tests/wpt/tests/autoplay-policy-detection/autoplaypolicy_media_element.html similarity index 100% rename from tests/wpt/web-platform-tests/autoplay-policy-detection/autoplaypolicy_media_element.html rename to tests/wpt/tests/autoplay-policy-detection/autoplaypolicy_media_element.html diff --git a/tests/wpt/web-platform-tests/autoplay-policy-detection/idlharness.window.js b/tests/wpt/tests/autoplay-policy-detection/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/autoplay-policy-detection/idlharness.window.js rename to tests/wpt/tests/autoplay-policy-detection/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/avif/META.yml b/tests/wpt/tests/avif/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/avif/META.yml rename to tests/wpt/tests/avif/META.yml diff --git a/tests/wpt/web-platform-tests/avif/animated-avif-timeout-ref.html b/tests/wpt/tests/avif/animated-avif-timeout-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/avif/animated-avif-timeout-ref.html rename to tests/wpt/tests/avif/animated-avif-timeout-ref.html diff --git a/tests/wpt/web-platform-tests/avif/animated-avif-timeout.html b/tests/wpt/tests/avif/animated-avif-timeout.html similarity index 100% rename from tests/wpt/web-platform-tests/avif/animated-avif-timeout.html rename to tests/wpt/tests/avif/animated-avif-timeout.html diff --git a/tests/wpt/web-platform-tests/background-fetch/META.yml b/tests/wpt/tests/background-fetch/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/META.yml rename to tests/wpt/tests/background-fetch/META.yml diff --git a/tests/wpt/web-platform-tests/background-fetch/abort.https.window.js b/tests/wpt/tests/background-fetch/abort.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/abort.https.window.js rename to tests/wpt/tests/background-fetch/abort.https.window.js diff --git a/tests/wpt/web-platform-tests/background-fetch/content-security-policy.https.window.js b/tests/wpt/tests/background-fetch/content-security-policy.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/content-security-policy.https.window.js rename to tests/wpt/tests/background-fetch/content-security-policy.https.window.js diff --git a/tests/wpt/web-platform-tests/background-fetch/fetch-uploads.https.window.js b/tests/wpt/tests/background-fetch/fetch-uploads.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/fetch-uploads.https.window.js rename to tests/wpt/tests/background-fetch/fetch-uploads.https.window.js diff --git a/tests/wpt/web-platform-tests/background-fetch/fetch.https.window.js b/tests/wpt/tests/background-fetch/fetch.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/fetch.https.window.js rename to tests/wpt/tests/background-fetch/fetch.https.window.js diff --git a/tests/wpt/web-platform-tests/background-fetch/get-ids.https.window.js b/tests/wpt/tests/background-fetch/get-ids.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/get-ids.https.window.js rename to tests/wpt/tests/background-fetch/get-ids.https.window.js diff --git a/tests/wpt/web-platform-tests/background-fetch/get.https.window.js b/tests/wpt/tests/background-fetch/get.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/get.https.window.js rename to tests/wpt/tests/background-fetch/get.https.window.js diff --git a/tests/wpt/web-platform-tests/background-fetch/idlharness.https.any.js b/tests/wpt/tests/background-fetch/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/idlharness.https.any.js rename to tests/wpt/tests/background-fetch/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/background-fetch/match.https.window.js b/tests/wpt/tests/background-fetch/match.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/match.https.window.js rename to tests/wpt/tests/background-fetch/match.https.window.js diff --git a/tests/wpt/web-platform-tests/background-fetch/mixed-content-and-allowed-schemes.https.window.js b/tests/wpt/tests/background-fetch/mixed-content-and-allowed-schemes.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/mixed-content-and-allowed-schemes.https.window.js rename to tests/wpt/tests/background-fetch/mixed-content-and-allowed-schemes.https.window.js diff --git a/tests/wpt/web-platform-tests/background-fetch/port-blocking.https.window.js b/tests/wpt/tests/background-fetch/port-blocking.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/port-blocking.https.window.js rename to tests/wpt/tests/background-fetch/port-blocking.https.window.js diff --git a/tests/wpt/web-platform-tests/background-fetch/resources/feature-name.txt b/tests/wpt/tests/background-fetch/resources/feature-name.txt similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/resources/feature-name.txt rename to tests/wpt/tests/background-fetch/resources/feature-name.txt diff --git a/tests/wpt/web-platform-tests/background-fetch/resources/upload.py b/tests/wpt/tests/background-fetch/resources/upload.py similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/resources/upload.py rename to tests/wpt/tests/background-fetch/resources/upload.py diff --git a/tests/wpt/web-platform-tests/background-fetch/resources/utils.js b/tests/wpt/tests/background-fetch/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/resources/utils.js rename to tests/wpt/tests/background-fetch/resources/utils.js diff --git a/tests/wpt/web-platform-tests/background-fetch/service_workers/sw-abort.js b/tests/wpt/tests/background-fetch/service_workers/sw-abort.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/service_workers/sw-abort.js rename to tests/wpt/tests/background-fetch/service_workers/sw-abort.js diff --git a/tests/wpt/web-platform-tests/background-fetch/service_workers/sw-helpers.js b/tests/wpt/tests/background-fetch/service_workers/sw-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/service_workers/sw-helpers.js rename to tests/wpt/tests/background-fetch/service_workers/sw-helpers.js diff --git a/tests/wpt/web-platform-tests/background-fetch/service_workers/sw-update-ui.js b/tests/wpt/tests/background-fetch/service_workers/sw-update-ui.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/service_workers/sw-update-ui.js rename to tests/wpt/tests/background-fetch/service_workers/sw-update-ui.js diff --git a/tests/wpt/web-platform-tests/background-fetch/service_workers/sw.js b/tests/wpt/tests/background-fetch/service_workers/sw.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/service_workers/sw.js rename to tests/wpt/tests/background-fetch/service_workers/sw.js diff --git a/tests/wpt/web-platform-tests/background-fetch/update-ui.https.window.js b/tests/wpt/tests/background-fetch/update-ui.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/background-fetch/update-ui.https.window.js rename to tests/wpt/tests/background-fetch/update-ui.https.window.js diff --git a/tests/wpt/web-platform-tests/background-sync/META.yml b/tests/wpt/tests/background-sync/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/background-sync/META.yml rename to tests/wpt/tests/background-sync/META.yml diff --git a/tests/wpt/web-platform-tests/background-sync/idlharness.https.any.js b/tests/wpt/tests/background-sync/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/background-sync/idlharness.https.any.js rename to tests/wpt/tests/background-sync/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/background-sync/service_workers/sw.js b/tests/wpt/tests/background-sync/service_workers/sw.js similarity index 100% rename from tests/wpt/web-platform-tests/background-sync/service_workers/sw.js rename to tests/wpt/tests/background-sync/service_workers/sw.js diff --git a/tests/wpt/web-platform-tests/badging/META.yml b/tests/wpt/tests/badging/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/badging/META.yml rename to tests/wpt/tests/badging/META.yml diff --git a/tests/wpt/web-platform-tests/badging/badge-error.https.html b/tests/wpt/tests/badging/badge-error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/badging/badge-error.https.html rename to tests/wpt/tests/badging/badge-error.https.html diff --git a/tests/wpt/web-platform-tests/badging/badge-success.https.html b/tests/wpt/tests/badging/badge-success.https.html similarity index 100% rename from tests/wpt/web-platform-tests/badging/badge-success.https.html rename to tests/wpt/tests/badging/badge-success.https.html diff --git a/tests/wpt/web-platform-tests/badging/idlharness.https.any.js b/tests/wpt/tests/badging/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/badging/idlharness.https.any.js rename to tests/wpt/tests/badging/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/badging/non-fully-active.https.html b/tests/wpt/tests/badging/non-fully-active.https.html similarity index 100% rename from tests/wpt/web-platform-tests/badging/non-fully-active.https.html rename to tests/wpt/tests/badging/non-fully-active.https.html diff --git a/tests/wpt/web-platform-tests/badging/resources/setAppBadge_iframe.html b/tests/wpt/tests/badging/resources/setAppBadge_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/badging/resources/setAppBadge_iframe.html rename to tests/wpt/tests/badging/resources/setAppBadge_iframe.html diff --git a/tests/wpt/web-platform-tests/badging/setAppBadge_cross_origin.sub.https.html b/tests/wpt/tests/badging/setAppBadge_cross_origin.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/badging/setAppBadge_cross_origin.sub.https.html rename to tests/wpt/tests/badging/setAppBadge_cross_origin.sub.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/META.yml b/tests/wpt/tests/battery-status/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/META.yml rename to tests/wpt/tests/battery-status/META.yml diff --git a/tests/wpt/web-platform-tests/battery-status/api-defined.https.html b/tests/wpt/tests/battery-status/api-defined.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/api-defined.https.html rename to tests/wpt/tests/battery-status/api-defined.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/battery-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/tests/battery-status/battery-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html rename to tests/wpt/tests/battery-status/battery-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html diff --git a/tests/wpt/web-platform-tests/battery-status/battery-allowed-by-permissions-policy-attribute.https.sub.html b/tests/wpt/tests/battery-status/battery-allowed-by-permissions-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-allowed-by-permissions-policy-attribute.https.sub.html rename to tests/wpt/tests/battery-status/battery-allowed-by-permissions-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/battery-status/battery-allowed-by-permissions-policy.https.sub.html b/tests/wpt/tests/battery-status/battery-allowed-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-allowed-by-permissions-policy.https.sub.html rename to tests/wpt/tests/battery-status/battery-allowed-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/battery-status/battery-allowed-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/battery-status/battery-allowed-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-allowed-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/battery-status/battery-allowed-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/battery-status/battery-allowed-in-same-origin-iframe.https.html b/tests/wpt/tests/battery-status/battery-allowed-in-same-origin-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-allowed-in-same-origin-iframe.https.html rename to tests/wpt/tests/battery-status/battery-allowed-in-same-origin-iframe.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/battery-charging-manual.https.html b/tests/wpt/tests/battery-status/battery-charging-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-charging-manual.https.html rename to tests/wpt/tests/battery-status/battery-charging-manual.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/battery-default-permissions-policy.https.sub.html b/tests/wpt/tests/battery-status/battery-default-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-default-permissions-policy.https.sub.html rename to tests/wpt/tests/battery-status/battery-default-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/battery-status/battery-disabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/battery-status/battery-disabled-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-disabled-by-permissions-policy.https.sub.html rename to tests/wpt/tests/battery-status/battery-disabled-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/battery-status/battery-disabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/battery-status/battery-disabled-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-disabled-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/battery-status/battery-disabled-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/battery-status/battery-disallowed-in-cross-origin-iframe.https.sub.html b/tests/wpt/tests/battery-status/battery-disallowed-in-cross-origin-iframe.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-disallowed-in-cross-origin-iframe.https.sub.html rename to tests/wpt/tests/battery-status/battery-disallowed-in-cross-origin-iframe.https.sub.html diff --git a/tests/wpt/web-platform-tests/battery-status/battery-discharging-manual.https.html b/tests/wpt/tests/battery-status/battery-discharging-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-discharging-manual.https.html rename to tests/wpt/tests/battery-status/battery-discharging-manual.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/battery-full-manual.https.html b/tests/wpt/tests/battery-status/battery-full-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-full-manual.https.html rename to tests/wpt/tests/battery-status/battery-full-manual.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/battery-plugging-in-manual.https.html b/tests/wpt/tests/battery-status/battery-plugging-in-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-plugging-in-manual.https.html rename to tests/wpt/tests/battery-status/battery-plugging-in-manual.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/battery-promise-window.https.html b/tests/wpt/tests/battery-status/battery-promise-window.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-promise-window.https.html rename to tests/wpt/tests/battery-status/battery-promise-window.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/battery-promise.https.html b/tests/wpt/tests/battery-status/battery-promise.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-promise.https.html rename to tests/wpt/tests/battery-status/battery-promise.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/battery-unplugging-manual.https.html b/tests/wpt/tests/battery-status/battery-unplugging-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/battery-unplugging-manual.https.html rename to tests/wpt/tests/battery-status/battery-unplugging-manual.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/idlharness.https.window.js b/tests/wpt/tests/battery-status/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/idlharness.https.window.js rename to tests/wpt/tests/battery-status/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/battery-status/multiple-promises-after-resolve.https.html b/tests/wpt/tests/battery-status/multiple-promises-after-resolve.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/multiple-promises-after-resolve.https.html rename to tests/wpt/tests/battery-status/multiple-promises-after-resolve.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/multiple-promises.https.html b/tests/wpt/tests/battery-status/multiple-promises.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/multiple-promises.https.html rename to tests/wpt/tests/battery-status/multiple-promises.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/no-leak-on-detached-use.https.html b/tests/wpt/tests/battery-status/no-leak-on-detached-use.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/no-leak-on-detached-use.https.html rename to tests/wpt/tests/battery-status/no-leak-on-detached-use.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/page-visibility.https.html b/tests/wpt/tests/battery-status/page-visibility.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/page-visibility.https.html rename to tests/wpt/tests/battery-status/page-visibility.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/promise-with-eventlisteners.https.html b/tests/wpt/tests/battery-status/promise-with-eventlisteners.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/promise-with-eventlisteners.https.html rename to tests/wpt/tests/battery-status/promise-with-eventlisteners.https.html diff --git a/tests/wpt/web-platform-tests/battery-status/resources/battery-status-helpers.js b/tests/wpt/tests/battery-status/resources/battery-status-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/resources/battery-status-helpers.js rename to tests/wpt/tests/battery-status/resources/battery-status-helpers.js diff --git a/tests/wpt/web-platform-tests/battery-status/resources/support-iframe.html b/tests/wpt/tests/battery-status/resources/support-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/resources/support-iframe.html rename to tests/wpt/tests/battery-status/resources/support-iframe.html diff --git a/tests/wpt/web-platform-tests/battery-status/resources/support-window-open.html b/tests/wpt/tests/battery-status/resources/support-window-open.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/resources/support-window-open.html rename to tests/wpt/tests/battery-status/resources/support-window-open.html diff --git a/tests/wpt/web-platform-tests/battery-status/resources/window-postmessage-open-close.html b/tests/wpt/tests/battery-status/resources/window-postmessage-open-close.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/resources/window-postmessage-open-close.html rename to tests/wpt/tests/battery-status/resources/window-postmessage-open-close.html diff --git a/tests/wpt/web-platform-tests/battery-status/restricted-level-precision.https.html b/tests/wpt/tests/battery-status/restricted-level-precision.https.html similarity index 100% rename from tests/wpt/web-platform-tests/battery-status/restricted-level-precision.https.html rename to tests/wpt/tests/battery-status/restricted-level-precision.https.html diff --git a/tests/wpt/web-platform-tests/beacon/META.yml b/tests/wpt/tests/beacon/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/beacon/META.yml rename to tests/wpt/tests/beacon/META.yml diff --git a/tests/wpt/web-platform-tests/beacon/beacon-basic.https.window.js b/tests/wpt/tests/beacon/beacon-basic.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/beacon/beacon-basic.https.window.js rename to tests/wpt/tests/beacon/beacon-basic.https.window.js diff --git a/tests/wpt/web-platform-tests/beacon/beacon-common.sub.js b/tests/wpt/tests/beacon/beacon-common.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/beacon/beacon-common.sub.js rename to tests/wpt/tests/beacon/beacon-common.sub.js diff --git a/tests/wpt/web-platform-tests/beacon/beacon-cors.https.window.js b/tests/wpt/tests/beacon/beacon-cors.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/beacon/beacon-cors.https.window.js rename to tests/wpt/tests/beacon/beacon-cors.https.window.js diff --git a/tests/wpt/web-platform-tests/beacon/beacon-navigate.https.window.js b/tests/wpt/tests/beacon/beacon-navigate.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/beacon/beacon-navigate.https.window.js rename to tests/wpt/tests/beacon/beacon-navigate.https.window.js diff --git a/tests/wpt/web-platform-tests/beacon/beacon-redirect.https.window.js b/tests/wpt/tests/beacon/beacon-redirect.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/beacon/beacon-redirect.https.window.js rename to tests/wpt/tests/beacon/beacon-redirect.https.window.js diff --git a/tests/wpt/web-platform-tests/beacon/headers/header-content-type-and-body.html b/tests/wpt/tests/beacon/headers/header-content-type-and-body.html similarity index 100% rename from tests/wpt/web-platform-tests/beacon/headers/header-content-type-and-body.html rename to tests/wpt/tests/beacon/headers/header-content-type-and-body.html diff --git a/tests/wpt/web-platform-tests/beacon/headers/header-referrer-no-referrer-when-downgrade.https.html b/tests/wpt/tests/beacon/headers/header-referrer-no-referrer-when-downgrade.https.html similarity index 100% rename from tests/wpt/web-platform-tests/beacon/headers/header-referrer-no-referrer-when-downgrade.https.html rename to tests/wpt/tests/beacon/headers/header-referrer-no-referrer-when-downgrade.https.html diff --git a/tests/wpt/web-platform-tests/beacon/headers/header-referrer-no-referrer.html b/tests/wpt/tests/beacon/headers/header-referrer-no-referrer.html similarity index 100% rename from tests/wpt/web-platform-tests/beacon/headers/header-referrer-no-referrer.html rename to tests/wpt/tests/beacon/headers/header-referrer-no-referrer.html diff --git a/tests/wpt/web-platform-tests/beacon/headers/header-referrer-origin-when-cross-origin.html b/tests/wpt/tests/beacon/headers/header-referrer-origin-when-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/beacon/headers/header-referrer-origin-when-cross-origin.html rename to tests/wpt/tests/beacon/headers/header-referrer-origin-when-cross-origin.html diff --git a/tests/wpt/web-platform-tests/beacon/headers/header-referrer-origin.html b/tests/wpt/tests/beacon/headers/header-referrer-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/beacon/headers/header-referrer-origin.html rename to tests/wpt/tests/beacon/headers/header-referrer-origin.html diff --git a/tests/wpt/web-platform-tests/beacon/headers/header-referrer-same-origin.html b/tests/wpt/tests/beacon/headers/header-referrer-same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/beacon/headers/header-referrer-same-origin.html rename to tests/wpt/tests/beacon/headers/header-referrer-same-origin.html diff --git a/tests/wpt/web-platform-tests/beacon/headers/header-referrer-strict-origin-when-cross-origin.https.html b/tests/wpt/tests/beacon/headers/header-referrer-strict-origin-when-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/beacon/headers/header-referrer-strict-origin-when-cross-origin.https.html rename to tests/wpt/tests/beacon/headers/header-referrer-strict-origin-when-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/beacon/headers/header-referrer-strict-origin.https.html b/tests/wpt/tests/beacon/headers/header-referrer-strict-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/beacon/headers/header-referrer-strict-origin.https.html rename to tests/wpt/tests/beacon/headers/header-referrer-strict-origin.https.html diff --git a/tests/wpt/web-platform-tests/beacon/headers/header-referrer-unsafe-url.https.html b/tests/wpt/tests/beacon/headers/header-referrer-unsafe-url.https.html similarity index 100% rename from tests/wpt/web-platform-tests/beacon/headers/header-referrer-unsafe-url.https.html rename to tests/wpt/tests/beacon/headers/header-referrer-unsafe-url.https.html diff --git a/tests/wpt/web-platform-tests/beacon/headers/header-referrer.js b/tests/wpt/tests/beacon/headers/header-referrer.js similarity index 100% rename from tests/wpt/web-platform-tests/beacon/headers/header-referrer.js rename to tests/wpt/tests/beacon/headers/header-referrer.js diff --git a/tests/wpt/web-platform-tests/beacon/idlharness.any.js b/tests/wpt/tests/beacon/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/beacon/idlharness.any.js rename to tests/wpt/tests/beacon/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/beacon/resources/beacon.py b/tests/wpt/tests/beacon/resources/beacon.py similarity index 100% rename from tests/wpt/web-platform-tests/beacon/resources/beacon.py rename to tests/wpt/tests/beacon/resources/beacon.py diff --git a/tests/wpt/web-platform-tests/beacon/resources/content-type-and-body.py b/tests/wpt/tests/beacon/resources/content-type-and-body.py similarity index 100% rename from tests/wpt/web-platform-tests/beacon/resources/content-type-and-body.py rename to tests/wpt/tests/beacon/resources/content-type-and-body.py diff --git a/tests/wpt/web-platform-tests/beacon/resources/inspect-header.py b/tests/wpt/tests/beacon/resources/inspect-header.py similarity index 100% rename from tests/wpt/web-platform-tests/beacon/resources/inspect-header.py rename to tests/wpt/tests/beacon/resources/inspect-header.py diff --git a/tests/wpt/web-platform-tests/bluetooth/META.yml b/tests/wpt/tests/bluetooth/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/META.yml rename to tests/wpt/tests/bluetooth/META.yml diff --git a/tests/wpt/web-platform-tests/bluetooth/README.md b/tests/wpt/tests/bluetooth/README.md similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/README.md rename to tests/wpt/tests/bluetooth/README.md diff --git a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-absent-getAvailability.https.window.js b/tests/wpt/tests/bluetooth/adapter/adapter-absent-getAvailability.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/adapter/adapter-absent-getAvailability.https.window.js rename to tests/wpt/tests/bluetooth/adapter/adapter-absent-getAvailability.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-added-getAvailability.https.window.js b/tests/wpt/tests/bluetooth/adapter/adapter-added-getAvailability.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/adapter/adapter-added-getAvailability.https.window.js rename to tests/wpt/tests/bluetooth/adapter/adapter-added-getAvailability.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-off-getAvailability.https.window.js b/tests/wpt/tests/bluetooth/adapter/adapter-powered-off-getAvailability.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-off-getAvailability.https.window.js rename to tests/wpt/tests/bluetooth/adapter/adapter-powered-off-getAvailability.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-on-getAvailability.https.window.js b/tests/wpt/tests/bluetooth/adapter/adapter-powered-on-getAvailability.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-on-getAvailability.https.window.js rename to tests/wpt/tests/bluetooth/adapter/adapter-powered-on-getAvailability.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-on-off-on-getAvailability.https.window.js b/tests/wpt/tests/bluetooth/adapter/adapter-powered-on-off-on-getAvailability.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-on-off-on-getAvailability.https.window.js rename to tests/wpt/tests/bluetooth/adapter/adapter-powered-on-off-on-getAvailability.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-removed-getAvailability.https.window.js b/tests/wpt/tests/bluetooth/adapter/adapter-removed-getAvailability.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/adapter/adapter-removed-getAvailability.https.window.js rename to tests/wpt/tests/bluetooth/adapter/adapter-removed-getAvailability.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/adapter/cross-origin-iframe-getAvailability.sub.https.window.js b/tests/wpt/tests/bluetooth/adapter/cross-origin-iframe-getAvailability.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/adapter/cross-origin-iframe-getAvailability.sub.https.window.js rename to tests/wpt/tests/bluetooth/adapter/cross-origin-iframe-getAvailability.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/characteristicProperties.https.window.js b/tests/wpt/tests/bluetooth/characteristic/characteristicProperties.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/characteristicProperties.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/characteristicProperties.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/detachedIframe.https.window.js b/tests/wpt/tests/bluetooth/characteristic/getDescriptor/detachedIframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/detachedIframe.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/getDescriptor/detachedIframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-characteristic-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/getDescriptor/gen-characteristic-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-characteristic-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/getDescriptor/gen-characteristic-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-descriptor-get-same-object.https.window.js b/tests/wpt/tests/bluetooth/characteristic/getDescriptor/gen-descriptor-get-same-object.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-descriptor-get-same-object.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/getDescriptor/gen-descriptor-get-same-object.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-service-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/getDescriptor/gen-service-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-service-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/getDescriptor/gen-service-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/detachedIframe.https.window.js b/tests/wpt/tests/bluetooth/characteristic/getDescriptors/detachedIframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/detachedIframe.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/getDescriptors/detachedIframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-descriptor-get-same-object.https.window.js b/tests/wpt/tests/bluetooth/characteristic/getDescriptors/gen-descriptor-get-same-object.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-descriptor-get-same-object.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/getDescriptors/gen-descriptor-get-same-object.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/service-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/notifications/service-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/service-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/notifications/service-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js b/tests/wpt/tests/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/detachedIframe.https.window.js b/tests/wpt/tests/bluetooth/characteristic/readValue/detachedIframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/detachedIframe.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/readValue/detachedIframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/event-is-fired.https.window.js b/tests/wpt/tests/bluetooth/characteristic/readValue/event-is-fired.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/event-is-fired.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/readValue/event-is-fired.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/gen-characteristic-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/readValue/gen-characteristic-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/gen-characteristic-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/readValue/gen-characteristic-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-succeeds.https.window.js b/tests/wpt/tests/bluetooth/characteristic/readValue/read-succeeds.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-succeeds.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/readValue/read-succeeds.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-updates-value.https.window.js b/tests/wpt/tests/bluetooth/characteristic/readValue/read-updates-value.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-updates-value.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/readValue/read-updates-value.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/service-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/readValue/service-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/service-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/readValue/service-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-from-2-characteristics.https.window.js b/tests/wpt/tests/bluetooth/characteristic/service-same-from-2-characteristics.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-from-2-characteristics.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/service-same-from-2-characteristics.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-object.https.window.js b/tests/wpt/tests/bluetooth/characteristic/service-same-object.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-object.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/service-same-object.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/startNotifications/detachedIframe.https.window.js b/tests/wpt/tests/bluetooth/characteristic/startNotifications/detachedIframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/startNotifications/detachedIframe.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/startNotifications/detachedIframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/startNotifications/gen-characteristic-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/startNotifications/gen-characteristic-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/startNotifications/gen-characteristic-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/startNotifications/gen-characteristic-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/stopNotifications/detachedIframe.https.window.js b/tests/wpt/tests/bluetooth/characteristic/stopNotifications/detachedIframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/stopNotifications/detachedIframe.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/stopNotifications/detachedIframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/detachedIframe.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValue/detachedIframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/detachedIframe.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValue/detachedIframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/gen-characteristic-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValue/gen-characteristic-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/gen-characteristic-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValue/gen-characteristic-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/service-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValue/service-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/service-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValue/service-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/write-succeeds.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValue/write-succeeds.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/write-succeeds.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValue/write-succeeds.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithResponse/buffer-is-detached.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValueWithResponse/buffer-is-detached.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithResponse/buffer-is-detached.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValueWithResponse/buffer-is-detached.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithResponse/characteristic-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValueWithResponse/characteristic-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithResponse/characteristic-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValueWithResponse/characteristic-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithResponse/gen-characteristic-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValueWithResponse/gen-characteristic-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithResponse/gen-characteristic-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValueWithResponse/gen-characteristic-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithResponse/service-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValueWithResponse/service-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithResponse/service-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValueWithResponse/service-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithResponse/write-succeeds.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValueWithResponse/write-succeeds.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithResponse/write-succeeds.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValueWithResponse/write-succeeds.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithoutResponse/buffer-is-detached.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValueWithoutResponse/buffer-is-detached.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithoutResponse/buffer-is-detached.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValueWithoutResponse/buffer-is-detached.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithoutResponse/characteristic-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValueWithoutResponse/characteristic-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithoutResponse/characteristic-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValueWithoutResponse/characteristic-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithoutResponse/gen-characteristic-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValueWithoutResponse/gen-characteristic-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithoutResponse/gen-characteristic-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValueWithoutResponse/gen-characteristic-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithoutResponse/service-is-removed.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValueWithoutResponse/service-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithoutResponse/service-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValueWithoutResponse/service-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithoutResponse/write-succeeds.https.window.js b/tests/wpt/tests/bluetooth/characteristic/writeValueWithoutResponse/write-succeeds.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/characteristic/writeValueWithoutResponse/write-succeeds.https.window.js rename to tests/wpt/tests/bluetooth/characteristic/writeValueWithoutResponse/write-succeeds.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/descriptor/readValue/detachedIframe.https.window.js b/tests/wpt/tests/bluetooth/descriptor/readValue/detachedIframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/descriptor/readValue/detachedIframe.https.window.js rename to tests/wpt/tests/bluetooth/descriptor/readValue/detachedIframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/descriptor/readValue/gen-service-is-removed.https.window.js b/tests/wpt/tests/bluetooth/descriptor/readValue/gen-service-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/descriptor/readValue/gen-service-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/descriptor/readValue/gen-service-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/descriptor/readValue/read-succeeds.https.window.js b/tests/wpt/tests/bluetooth/descriptor/readValue/read-succeeds.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/descriptor/readValue/read-succeeds.https.window.js rename to tests/wpt/tests/bluetooth/descriptor/readValue/read-succeeds.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/descriptor/writeValue/buffer-is-detached.https.window.js b/tests/wpt/tests/bluetooth/descriptor/writeValue/buffer-is-detached.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/descriptor/writeValue/buffer-is-detached.https.window.js rename to tests/wpt/tests/bluetooth/descriptor/writeValue/buffer-is-detached.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/descriptor/writeValue/detachedIframe.https.window.js b/tests/wpt/tests/bluetooth/descriptor/writeValue/detachedIframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/descriptor/writeValue/detachedIframe.https.window.js rename to tests/wpt/tests/bluetooth/descriptor/writeValue/detachedIframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/descriptor/writeValue/gen-service-is-removed.https.window.js b/tests/wpt/tests/bluetooth/descriptor/writeValue/gen-service-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/descriptor/writeValue/gen-service-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/descriptor/writeValue/gen-service-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/forget/connect-after-forget.https.window.js b/tests/wpt/tests/bluetooth/device/forget/connect-after-forget.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/forget/connect-after-forget.https.window.js rename to tests/wpt/tests/bluetooth/device/forget/connect-after-forget.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/forget/detachedIframe.https.window.js b/tests/wpt/tests/bluetooth/device/forget/detachedIframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/forget/detachedIframe.https.window.js rename to tests/wpt/tests/bluetooth/device/forget/detachedIframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/forget/getDevices.https.window.js b/tests/wpt/tests/bluetooth/device/forget/getDevices.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/forget/getDevices.https.window.js rename to tests/wpt/tests/bluetooth/device/forget/getDevices.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/disconnected.https.window.js b/tests/wpt/tests/bluetooth/device/gattserverdisconnected-event/disconnected.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/disconnected.https.window.js rename to tests/wpt/tests/bluetooth/device/gattserverdisconnected-event/disconnected.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/disconnected_gc.https.window.js b/tests/wpt/tests/bluetooth/device/gattserverdisconnected-event/disconnected_gc.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/disconnected_gc.https.window.js rename to tests/wpt/tests/bluetooth/device/gattserverdisconnected-event/disconnected_gc.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/one-event-per-disconnection.https.window.js b/tests/wpt/tests/bluetooth/device/gattserverdisconnected-event/one-event-per-disconnection.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/one-event-per-disconnection.https.window.js rename to tests/wpt/tests/bluetooth/device/gattserverdisconnected-event/one-event-per-disconnection.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/reconnect-during-disconnected-event.https.window.js b/tests/wpt/tests/bluetooth/device/gattserverdisconnected-event/reconnect-during-disconnected-event.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/reconnect-during-disconnected-event.https.window.js rename to tests/wpt/tests/bluetooth/device/gattserverdisconnected-event/reconnect-during-disconnected-event.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/abort-before-watchAdvertisements.https.window.js b/tests/wpt/tests/bluetooth/device/watchAdvertisements/abort-before-watchAdvertisements.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/abort-before-watchAdvertisements.https.window.js rename to tests/wpt/tests/bluetooth/device/watchAdvertisements/abort-before-watchAdvertisements.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/abort-pending-operation.https.window.js b/tests/wpt/tests/bluetooth/device/watchAdvertisements/abort-pending-operation.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/abort-pending-operation.https.window.js rename to tests/wpt/tests/bluetooth/device/watchAdvertisements/abort-pending-operation.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/abort-signal-stops-events.https.window.js b/tests/wpt/tests/bluetooth/device/watchAdvertisements/abort-signal-stops-events.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/abort-signal-stops-events.https.window.js rename to tests/wpt/tests/bluetooth/device/watchAdvertisements/abort-signal-stops-events.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/abort-subsequent-watchAdvertisements-call-stops-events.https.window.js b/tests/wpt/tests/bluetooth/device/watchAdvertisements/abort-subsequent-watchAdvertisements-call-stops-events.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/abort-subsequent-watchAdvertisements-call-stops-events.https.window.js rename to tests/wpt/tests/bluetooth/device/watchAdvertisements/abort-subsequent-watchAdvertisements-call-stops-events.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/advertisementreceived-event-fired.https.window.js b/tests/wpt/tests/bluetooth/device/watchAdvertisements/advertisementreceived-event-fired.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/advertisementreceived-event-fired.https.window.js rename to tests/wpt/tests/bluetooth/device/watchAdvertisements/advertisementreceived-event-fired.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/blocklisted-manufacturer-data-filtered-from-event.https.window.js b/tests/wpt/tests/bluetooth/device/watchAdvertisements/blocklisted-manufacturer-data-filtered-from-event.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/blocklisted-manufacturer-data-filtered-from-event.https.window.js rename to tests/wpt/tests/bluetooth/device/watchAdvertisements/blocklisted-manufacturer-data-filtered-from-event.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/concurrent-watchAdvertisements-calls.https.window.js b/tests/wpt/tests/bluetooth/device/watchAdvertisements/concurrent-watchAdvertisements-calls.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/concurrent-watchAdvertisements-calls.https.window.js rename to tests/wpt/tests/bluetooth/device/watchAdvertisements/concurrent-watchAdvertisements-calls.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/detachedIframe.https.window.js b/tests/wpt/tests/bluetooth/device/watchAdvertisements/detachedIframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/detachedIframe.https.window.js rename to tests/wpt/tests/bluetooth/device/watchAdvertisements/detachedIframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/service-and-manufacturer-data-filtered-from-event.https.window.js b/tests/wpt/tests/bluetooth/device/watchAdvertisements/service-and-manufacturer-data-filtered-from-event.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/service-and-manufacturer-data-filtered-from-event.https.window.js rename to tests/wpt/tests/bluetooth/device/watchAdvertisements/service-and-manufacturer-data-filtered-from-event.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/subsequent-watchAdvertisements-call.https.window.js b/tests/wpt/tests/bluetooth/device/watchAdvertisements/subsequent-watchAdvertisements-call.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/subsequent-watchAdvertisements-call.https.window.js rename to tests/wpt/tests/bluetooth/device/watchAdvertisements/subsequent-watchAdvertisements-call.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/watching-two-devices-abort-one-watchAdvertisements.https.window.js b/tests/wpt/tests/bluetooth/device/watchAdvertisements/watching-two-devices-abort-one-watchAdvertisements.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/watching-two-devices-abort-one-watchAdvertisements.https.window.js rename to tests/wpt/tests/bluetooth/device/watchAdvertisements/watching-two-devices-abort-one-watchAdvertisements.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/watching-two-devices.https.window.js b/tests/wpt/tests/bluetooth/device/watchAdvertisements/watching-two-devices.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/device/watchAdvertisements/watching-two-devices.https.window.js rename to tests/wpt/tests/bluetooth/device/watchAdvertisements/watching-two-devices.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/generate.py b/tests/wpt/tests/bluetooth/generate.py similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/generate.py rename to tests/wpt/tests/bluetooth/generate.py diff --git a/tests/wpt/web-platform-tests/bluetooth/generate_test.py b/tests/wpt/tests/bluetooth/generate_test.py similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/generate_test.py rename to tests/wpt/tests/bluetooth/generate_test.py diff --git a/tests/wpt/web-platform-tests/bluetooth/getAvailability/reject_opaque_origin.https.html b/tests/wpt/tests/bluetooth/getAvailability/reject_opaque_origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/getAvailability/reject_opaque_origin.https.html rename to tests/wpt/tests/bluetooth/getAvailability/reject_opaque_origin.https.html diff --git a/tests/wpt/web-platform-tests/bluetooth/getAvailability/reject_opaque_origin.https.html.headers b/tests/wpt/tests/bluetooth/getAvailability/reject_opaque_origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/getAvailability/reject_opaque_origin.https.html.headers rename to tests/wpt/tests/bluetooth/getAvailability/reject_opaque_origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/bluetooth/getAvailability/sandboxed_iframe.https.window.js b/tests/wpt/tests/bluetooth/getAvailability/sandboxed_iframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/getAvailability/sandboxed_iframe.https.window.js rename to tests/wpt/tests/bluetooth/getAvailability/sandboxed_iframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/getDevices/granted-devices-with-services.https.window.js b/tests/wpt/tests/bluetooth/getDevices/granted-devices-with-services.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/getDevices/granted-devices-with-services.https.window.js rename to tests/wpt/tests/bluetooth/getDevices/granted-devices-with-services.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/getDevices/no-granted-devices.https.window.js b/tests/wpt/tests/bluetooth/getDevices/no-granted-devices.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/getDevices/no-granted-devices.https.window.js rename to tests/wpt/tests/bluetooth/getDevices/no-granted-devices.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/getDevices/reject_opaque_origin.https.html b/tests/wpt/tests/bluetooth/getDevices/reject_opaque_origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/getDevices/reject_opaque_origin.https.html rename to tests/wpt/tests/bluetooth/getDevices/reject_opaque_origin.https.html diff --git a/tests/wpt/web-platform-tests/bluetooth/getDevices/reject_opaque_origin.https.html.headers b/tests/wpt/tests/bluetooth/getDevices/reject_opaque_origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/getDevices/reject_opaque_origin.https.html.headers rename to tests/wpt/tests/bluetooth/getDevices/reject_opaque_origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/bluetooth/getDevices/returns-same-bluetooth-device-object.https.window.js b/tests/wpt/tests/bluetooth/getDevices/returns-same-bluetooth-device-object.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/getDevices/returns-same-bluetooth-device-object.https.window.js rename to tests/wpt/tests/bluetooth/getDevices/returns-same-bluetooth-device-object.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/getDevices/sandboxed_iframe.https.window.js b/tests/wpt/tests/bluetooth/getDevices/sandboxed_iframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/getDevices/sandboxed_iframe.https.window.js rename to tests/wpt/tests/bluetooth/getDevices/sandboxed_iframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/idl/idl-Bluetooth.https.window.js b/tests/wpt/tests/bluetooth/idl/idl-Bluetooth.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/idl/idl-Bluetooth.https.window.js rename to tests/wpt/tests/bluetooth/idl/idl-Bluetooth.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/idl/idl-BluetoothDevice.https.window.js b/tests/wpt/tests/bluetooth/idl/idl-BluetoothDevice.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/idl/idl-BluetoothDevice.https.window.js rename to tests/wpt/tests/bluetooth/idl/idl-BluetoothDevice.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/idl/idl-BluetoothUUID.window.js b/tests/wpt/tests/bluetooth/idl/idl-BluetoothUUID.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/idl/idl-BluetoothUUID.window.js rename to tests/wpt/tests/bluetooth/idl/idl-BluetoothUUID.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/idl/idl-NavigatorBluetooth.https.window.js b/tests/wpt/tests/bluetooth/idl/idl-NavigatorBluetooth.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/idl/idl-NavigatorBluetooth.https.window.js rename to tests/wpt/tests/bluetooth/idl/idl-NavigatorBluetooth.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/idl/idl-NavigatorBluetooth.window.js b/tests/wpt/tests/bluetooth/idl/idl-NavigatorBluetooth.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/idl/idl-NavigatorBluetooth.window.js rename to tests/wpt/tests/bluetooth/idl/idl-NavigatorBluetooth.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/idl/idlharness.tentative.https.window.js b/tests/wpt/tests/bluetooth/idl/idlharness.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/idl/idlharness.tentative.https.window.js rename to tests/wpt/tests/bluetooth/idl/idlharness.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/acceptAllDevices/device-with-empty-name.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/acceptAllDevices/device-with-empty-name.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/acceptAllDevices/device-with-empty-name.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/acceptAllDevices/device-with-empty-name.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/acceptAllDevices/device-with-name.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/acceptAllDevices/device-with-name.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/acceptAllDevices/device-with-name.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/acceptAllDevices/device-with-name.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/acceptAllDevices/optional-services-missing.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/acceptAllDevices/optional-services-missing.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/acceptAllDevices/optional-services-missing.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/acceptAllDevices/optional-services-missing.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/acceptAllDevices/optional-services-present.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/acceptAllDevices/optional-services-present.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/acceptAllDevices/optional-services-present.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/acceptAllDevices/optional-services-present.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/blocklisted-manufacturer-data-in-filter.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/blocklisted-manufacturer-data-in-filter.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/blocklisted-manufacturer-data-in-filter.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/blocklisted-manufacturer-data-in-filter.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/blocklisted-service-in-filter.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/blocklisted-service-in-filter.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/blocklisted-service-in-filter.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/blocklisted-service-in-filter.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/blocklisted-service-in-optionalServices.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/blocklisted-service-in-optionalServices.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/blocklisted-service-in-optionalServices.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/blocklisted-service-in-optionalServices.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/data-prefix-and-mask-size.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/data-prefix-and-mask-size.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/data-prefix-and-mask-size.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/data-prefix-and-mask-size.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/dataPrefix-buffer-is-detached.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/dataPrefix-buffer-is-detached.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/dataPrefix-buffer-is-detached.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/dataPrefix-buffer-is-detached.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/device-name-longer-than-29-bytes.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/device-name-longer-than-29-bytes.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/device-name-longer-than-29-bytes.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/device-name-longer-than-29-bytes.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-dataPrefix.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-dataPrefix.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-dataPrefix.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-dataPrefix.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-exclusion-filter.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-exclusion-filter.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-exclusion-filter.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-exclusion-filter.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-exclusion-filters-member.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-exclusion-filters-member.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-exclusion-filters-member.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-exclusion-filters-member.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-filter.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-filter.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-filter.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-filter.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-filters-member.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-filters-member.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-filters-member.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-filters-member.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-manufacturerData-member.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-manufacturerData-member.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-manufacturerData-member.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-manufacturerData-member.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-namePrefix.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-namePrefix.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-namePrefix.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-namePrefix.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-services-member.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-services-member.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/empty-services-member.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/empty-services-member.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/exclusion-filters-require-filters.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/exclusion-filters-require-filters.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/exclusion-filters-require-filters.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/exclusion-filters-require-filters.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/filters-xor-acceptAllDevices.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/filters-xor-acceptAllDevices.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/filters-xor-acceptAllDevices.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/filters-xor-acceptAllDevices.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/invalid-companyIdentifier.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/invalid-companyIdentifier.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/invalid-companyIdentifier.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/invalid-companyIdentifier.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/mask-buffer-is-detached.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/mask-buffer-is-detached.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/mask-buffer-is-detached.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/mask-buffer-is-detached.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-name-unicode.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-name-unicode.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-name-unicode.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-name-unicode.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-name.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-name.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-name.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-name.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-namePrefix-unicode.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-namePrefix-unicode.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-namePrefix-unicode.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-namePrefix-unicode.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-namePrefix.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-namePrefix.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-namePrefix.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-exceeded-namePrefix.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-name-unicode.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-name-unicode.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-name-unicode.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-name-unicode.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-name.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-name.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-name.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-name.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-namePrefix-unicode.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-namePrefix-unicode.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-namePrefix-unicode.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-namePrefix-unicode.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-namePrefix.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-namePrefix.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/max-length-namePrefix.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/max-length-namePrefix.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/no-arguments.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/no-arguments.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/no-arguments.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/no-arguments.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/same-company-identifier.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/same-company-identifier.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/same-company-identifier.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/same-company-identifier.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-name.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-name.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-name.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-name.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-namePrefix.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-namePrefix.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-namePrefix.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-namePrefix.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-optionalServices-member.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-optionalServices-member.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-optionalServices-member.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-optionalServices-member.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-services-member.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-services-member.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-services-member.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-services-member.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/cross-origin-iframe.sub.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/cross-origin-iframe.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/cross-origin-iframe.sub.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/cross-origin-iframe.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/discovery-succeeds.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/discovery-succeeds.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/discovery-succeeds.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/discovery-succeeds.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/doesnt-consume-user-gesture.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/doesnt-consume-user-gesture.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/doesnt-consume-user-gesture.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/doesnt-consume-user-gesture.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/filter-matches.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/filter-matches.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/filter-matches.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/filter-matches.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/le-not-supported.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/le-not-supported.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/le-not-supported.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/le-not-supported.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/manufacturer-data-filter-matches.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/manufacturer-data-filter-matches.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/manufacturer-data-filter-matches.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/manufacturer-data-filter-matches.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/not-processing-user-gesture.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/not-processing-user-gesture.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/not-processing-user-gesture.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/not-processing-user-gesture.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/radio-not-present.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/radio-not-present.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/radio-not-present.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/radio-not-present.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/reject_opaque_origin.https.html b/tests/wpt/tests/bluetooth/requestDevice/reject_opaque_origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/reject_opaque_origin.https.html rename to tests/wpt/tests/bluetooth/requestDevice/reject_opaque_origin.https.html diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/reject_opaque_origin.https.html.headers b/tests/wpt/tests/bluetooth/requestDevice/reject_opaque_origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/reject_opaque_origin.https.html.headers rename to tests/wpt/tests/bluetooth/requestDevice/reject_opaque_origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/request-from-iframe.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/request-from-iframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/request-from-iframe.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/request-from-iframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/request-from-sandboxed-iframe.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/request-from-sandboxed-iframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/request-from-sandboxed-iframe.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/request-from-sandboxed-iframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/same-device.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/same-device.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/same-device.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/same-device.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/sandboxed_iframe.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/sandboxed_iframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/sandboxed_iframe.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/sandboxed_iframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestDevice/single-filter-single-service.https.window.js b/tests/wpt/tests/bluetooth/requestDevice/single-filter-single-service.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestDevice/single-filter-single-service.https.window.js rename to tests/wpt/tests/bluetooth/requestDevice/single-filter-single-service.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/requestLEScan/reject_opaque_origin.https.html b/tests/wpt/tests/bluetooth/requestLEScan/reject_opaque_origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestLEScan/reject_opaque_origin.https.html rename to tests/wpt/tests/bluetooth/requestLEScan/reject_opaque_origin.https.html diff --git a/tests/wpt/web-platform-tests/bluetooth/requestLEScan/reject_opaque_origin.https.html.headers b/tests/wpt/tests/bluetooth/requestLEScan/reject_opaque_origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestLEScan/reject_opaque_origin.https.html.headers rename to tests/wpt/tests/bluetooth/requestLEScan/reject_opaque_origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/bluetooth/requestLEScan/sandboxed_iframe.https.window.js b/tests/wpt/tests/bluetooth/requestLEScan/sandboxed_iframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/requestLEScan/sandboxed_iframe.https.window.js rename to tests/wpt/tests/bluetooth/requestLEScan/sandboxed_iframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-fake-devices.js b/tests/wpt/tests/bluetooth/resources/bluetooth-fake-devices.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-fake-devices.js rename to tests/wpt/tests/bluetooth/resources/bluetooth-fake-devices.js diff --git a/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-scanning-helpers.js b/tests/wpt/tests/bluetooth/resources/bluetooth-scanning-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-scanning-helpers.js rename to tests/wpt/tests/bluetooth/resources/bluetooth-scanning-helpers.js diff --git a/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-test.js b/tests/wpt/tests/bluetooth/resources/bluetooth-test.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-test.js rename to tests/wpt/tests/bluetooth/resources/bluetooth-test.js diff --git a/tests/wpt/web-platform-tests/bluetooth/resources/health-thermometer-iframe.html b/tests/wpt/tests/bluetooth/resources/health-thermometer-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/resources/health-thermometer-iframe.html rename to tests/wpt/tests/bluetooth/resources/health-thermometer-iframe.html diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/base_test_js.template b/tests/wpt/tests/bluetooth/script-tests/base_test_js.template similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/base_test_js.template rename to tests/wpt/tests/bluetooth/script-tests/base_test_js.template diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/characteristic/characteristic-is-removed.js b/tests/wpt/tests/bluetooth/script-tests/characteristic/characteristic-is-removed.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/characteristic/characteristic-is-removed.js rename to tests/wpt/tests/bluetooth/script-tests/characteristic/characteristic-is-removed.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/characteristic/descriptor-get-same-object.js b/tests/wpt/tests/bluetooth/script-tests/characteristic/descriptor-get-same-object.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/characteristic/descriptor-get-same-object.js rename to tests/wpt/tests/bluetooth/script-tests/characteristic/descriptor-get-same-object.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/characteristic/service-is-removed.js b/tests/wpt/tests/bluetooth/script-tests/characteristic/service-is-removed.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/characteristic/service-is-removed.js rename to tests/wpt/tests/bluetooth/script-tests/characteristic/service-is-removed.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/descriptor/service-is-removed.js b/tests/wpt/tests/bluetooth/script-tests/descriptor/service-is-removed.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/descriptor/service-is-removed.js rename to tests/wpt/tests/bluetooth/script-tests/descriptor/service-is-removed.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/disconnect-called-before.js b/tests/wpt/tests/bluetooth/script-tests/server/disconnect-called-before.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/disconnect-called-before.js rename to tests/wpt/tests/bluetooth/script-tests/server/disconnect-called-before.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/disconnect-called-during-error.js b/tests/wpt/tests/bluetooth/script-tests/server/disconnect-called-during-error.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/disconnect-called-during-error.js rename to tests/wpt/tests/bluetooth/script-tests/server/disconnect-called-during-error.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/disconnect-called-during-success.js b/tests/wpt/tests/bluetooth/script-tests/server/disconnect-called-during-success.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/disconnect-called-during-success.js rename to tests/wpt/tests/bluetooth/script-tests/server/disconnect-called-during-success.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/disconnect-discovery-timeout.js b/tests/wpt/tests/bluetooth/script-tests/server/disconnect-discovery-timeout.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/disconnect-discovery-timeout.js rename to tests/wpt/tests/bluetooth/script-tests/server/disconnect-discovery-timeout.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/disconnect-invalidates-objects.js b/tests/wpt/tests/bluetooth/script-tests/server/disconnect-invalidates-objects.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/disconnect-invalidates-objects.js rename to tests/wpt/tests/bluetooth/script-tests/server/disconnect-invalidates-objects.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/disconnected-device.js b/tests/wpt/tests/bluetooth/script-tests/server/disconnected-device.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/disconnected-device.js rename to tests/wpt/tests/bluetooth/script-tests/server/disconnected-device.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/discovery-complete-no-permission-absent-service.js b/tests/wpt/tests/bluetooth/script-tests/server/discovery-complete-no-permission-absent-service.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/discovery-complete-no-permission-absent-service.js rename to tests/wpt/tests/bluetooth/script-tests/server/discovery-complete-no-permission-absent-service.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/discovery-complete-service-not-found.js b/tests/wpt/tests/bluetooth/script-tests/server/discovery-complete-service-not-found.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/discovery-complete-service-not-found.js rename to tests/wpt/tests/bluetooth/script-tests/server/discovery-complete-service-not-found.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/garbage-collection-ran-during-error.js b/tests/wpt/tests/bluetooth/script-tests/server/garbage-collection-ran-during-error.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/garbage-collection-ran-during-error.js rename to tests/wpt/tests/bluetooth/script-tests/server/garbage-collection-ran-during-error.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/garbage-collection-ran-during-success.js b/tests/wpt/tests/bluetooth/script-tests/server/garbage-collection-ran-during-success.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/garbage-collection-ran-during-success.js rename to tests/wpt/tests/bluetooth/script-tests/server/garbage-collection-ran-during-success.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/get-different-service-after-reconnection.js b/tests/wpt/tests/bluetooth/script-tests/server/get-different-service-after-reconnection.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/get-different-service-after-reconnection.js rename to tests/wpt/tests/bluetooth/script-tests/server/get-different-service-after-reconnection.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/get-same-object.js b/tests/wpt/tests/bluetooth/script-tests/server/get-same-object.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/get-same-object.js rename to tests/wpt/tests/bluetooth/script-tests/server/get-same-object.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/invalid-service-name.js b/tests/wpt/tests/bluetooth/script-tests/server/invalid-service-name.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/invalid-service-name.js rename to tests/wpt/tests/bluetooth/script-tests/server/invalid-service-name.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/no-permission-absent-service.js b/tests/wpt/tests/bluetooth/script-tests/server/no-permission-absent-service.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/no-permission-absent-service.js rename to tests/wpt/tests/bluetooth/script-tests/server/no-permission-absent-service.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/no-permission-for-any-service.js b/tests/wpt/tests/bluetooth/script-tests/server/no-permission-for-any-service.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/no-permission-for-any-service.js rename to tests/wpt/tests/bluetooth/script-tests/server/no-permission-for-any-service.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/no-permission-present-service.js b/tests/wpt/tests/bluetooth/script-tests/server/no-permission-present-service.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/no-permission-present-service.js rename to tests/wpt/tests/bluetooth/script-tests/server/no-permission-present-service.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/server/service-not-found.js b/tests/wpt/tests/bluetooth/script-tests/server/service-not-found.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/server/service-not-found.js rename to tests/wpt/tests/bluetooth/script-tests/server/service-not-found.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/service/blocklisted-characteristic.js b/tests/wpt/tests/bluetooth/script-tests/service/blocklisted-characteristic.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/service/blocklisted-characteristic.js rename to tests/wpt/tests/bluetooth/script-tests/service/blocklisted-characteristic.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/service/characteristic-not-found.js b/tests/wpt/tests/bluetooth/script-tests/service/characteristic-not-found.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/service/characteristic-not-found.js rename to tests/wpt/tests/bluetooth/script-tests/service/characteristic-not-found.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/service/garbage-collection-ran-during-error.js b/tests/wpt/tests/bluetooth/script-tests/service/garbage-collection-ran-during-error.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/service/garbage-collection-ran-during-error.js rename to tests/wpt/tests/bluetooth/script-tests/service/garbage-collection-ran-during-error.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/service/get-same-object.js b/tests/wpt/tests/bluetooth/script-tests/service/get-same-object.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/service/get-same-object.js rename to tests/wpt/tests/bluetooth/script-tests/service/get-same-object.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/service/invalid-characteristic-name.js b/tests/wpt/tests/bluetooth/script-tests/service/invalid-characteristic-name.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/service/invalid-characteristic-name.js rename to tests/wpt/tests/bluetooth/script-tests/service/invalid-characteristic-name.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/service/reconnect-during.js b/tests/wpt/tests/bluetooth/script-tests/service/reconnect-during.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/service/reconnect-during.js rename to tests/wpt/tests/bluetooth/script-tests/service/reconnect-during.js diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/service/service-is-removed.js b/tests/wpt/tests/bluetooth/script-tests/service/service-is-removed.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/script-tests/service/service-is-removed.js rename to tests/wpt/tests/bluetooth/script-tests/service/service-is-removed.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/connect/connection-succeeds.https.window.js b/tests/wpt/tests/bluetooth/server/connect/connection-succeeds.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/connect/connection-succeeds.https.window.js rename to tests/wpt/tests/bluetooth/server/connect/connection-succeeds.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/connect/detachedIframe.https.window.js b/tests/wpt/tests/bluetooth/server/connect/detachedIframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/connect/detachedIframe.https.window.js rename to tests/wpt/tests/bluetooth/server/connect/detachedIframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/connect/garbage-collection-ran-during-success.https.window.js b/tests/wpt/tests/bluetooth/server/connect/garbage-collection-ran-during-success.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/connect/garbage-collection-ran-during-success.https.window.js rename to tests/wpt/tests/bluetooth/server/connect/garbage-collection-ran-during-success.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/connect/get-same-gatt-server.https.window.js b/tests/wpt/tests/bluetooth/server/connect/get-same-gatt-server.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/connect/get-same-gatt-server.https.window.js rename to tests/wpt/tests/bluetooth/server/connect/get-same-gatt-server.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/device-same-object.https.window.js b/tests/wpt/tests/bluetooth/server/device-same-object.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/device-same-object.https.window.js rename to tests/wpt/tests/bluetooth/server/device-same-object.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/disconnect/connect-disconnect-twice.https.window.js b/tests/wpt/tests/bluetooth/server/disconnect/connect-disconnect-twice.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/disconnect/connect-disconnect-twice.https.window.js rename to tests/wpt/tests/bluetooth/server/disconnect/connect-disconnect-twice.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/disconnect/detach-gc.https.window.js b/tests/wpt/tests/bluetooth/server/disconnect/detach-gc.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/disconnect/detach-gc.https.window.js rename to tests/wpt/tests/bluetooth/server/disconnect/detach-gc.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/disconnect/detachedIframe.https.window.js b/tests/wpt/tests/bluetooth/server/disconnect/detachedIframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/disconnect/detachedIframe.https.window.js rename to tests/wpt/tests/bluetooth/server/disconnect/detachedIframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.window.js b/tests/wpt/tests/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.window.js rename to tests/wpt/tests/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/disconnect/gc-detach.https.window.js b/tests/wpt/tests/bluetooth/server/disconnect/gc-detach.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/disconnect/gc-detach.https.window.js rename to tests/wpt/tests/bluetooth/server/disconnect/gc-detach.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-before.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-disconnect-called-before.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-before.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-disconnect-called-before.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-error.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-error.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-error.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-error.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-success.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-success.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-success.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-success.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-discovery-timeout.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-disconnect-discovery-timeout.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-discovery-timeout.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-disconnect-discovery-timeout.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-invalidates-objects.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-disconnect-invalidates-objects.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-invalidates-objects.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-disconnect-invalidates-objects.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnected-device.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-disconnected-device.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnected-device.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-disconnected-device.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-discovery-complete-no-permission-absent-service.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-discovery-complete-no-permission-absent-service.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-discovery-complete-no-permission-absent-service.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-discovery-complete-no-permission-absent-service.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-discovery-complete-service-not-found.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-discovery-complete-service-not-found.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-discovery-complete-service-not-found.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-discovery-complete-service-not-found.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-error.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-error.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-error.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-error.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-success.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-success.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-success.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-success.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-get-different-service-after-reconnection.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-get-different-service-after-reconnection.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-get-different-service-after-reconnection.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-get-different-service-after-reconnection.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-get-same-object.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-get-same-object.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-get-same-object.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-get-same-object.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-invalid-service-name.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-invalid-service-name.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-invalid-service-name.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-invalid-service-name.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-absent-service.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-no-permission-absent-service.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-absent-service.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-no-permission-absent-service.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-for-any-service.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-no-permission-for-any-service.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-for-any-service.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-no-permission-for-any-service.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-present-service.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-no-permission-present-service.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-present-service.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-no-permission-present-service.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-service-not-found.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/gen-service-not-found.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-service-not-found.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/gen-service-not-found.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/service-found.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/service-found.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/service-found.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/service-found.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/blocklisted-services.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/blocklisted-services.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/blocklisted-services.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/blocklisted-services.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/correct-services.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/correct-services.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/correct-services.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/correct-services.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-discovery-timeout-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-discovery-timeout-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-discovery-timeout-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-discovery-timeout-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-discovery-timeout.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-discovery-timeout.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-discovery-timeout.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-discovery-timeout.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnected-device-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnected-device-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnected-device-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnected-device-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnected-device.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnected-device.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnected-device.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-disconnected-device.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-no-permission-absent-service-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-no-permission-absent-service-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-no-permission-absent-service-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-no-permission-absent-service-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-service-not-found-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-service-not-found-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-service-not-found-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-service-not-found-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-same-object-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-get-same-object-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-same-object-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-get-same-object-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-same-object.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-get-same-object.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-same-object.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-get-same-object.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-invalid-service-name.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-invalid-service-name.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-invalid-service-name.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-invalid-service-name.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-absent-service-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-no-permission-absent-service-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-absent-service-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-no-permission-absent-service-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-present-service-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-no-permission-present-service-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-present-service-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-no-permission-present-service-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-service-not-found-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-service-not-found-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-service-not-found-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/gen-service-not-found-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/services-found.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/services-found.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/services-found.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/services-found.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/services-not-found.https.window.js b/tests/wpt/tests/bluetooth/server/getPrimaryServices/services-not-found.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/services-not-found.https.window.js rename to tests/wpt/tests/bluetooth/server/getPrimaryServices/services-not-found.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/detachedIframe.https.window.js b/tests/wpt/tests/bluetooth/service/detachedIframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/detachedIframe.https.window.js rename to tests/wpt/tests/bluetooth/service/detachedIframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/device-same-from-2-services.https.window.js b/tests/wpt/tests/bluetooth/service/device-same-from-2-services.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/device-same-from-2-services.https.window.js rename to tests/wpt/tests/bluetooth/service/device-same-from-2-services.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/device-same-object.https.window.js b/tests/wpt/tests/bluetooth/service/device-same-object.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/device-same-object.https.window.js rename to tests/wpt/tests/bluetooth/service/device-same-object.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/characteristic-found.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristic/characteristic-found.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/characteristic-found.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristic/characteristic-found.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/detachedIframe.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristic/detachedIframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/detachedIframe.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristic/detachedIframe.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-blocklisted-characteristic.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristic/gen-blocklisted-characteristic.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-blocklisted-characteristic.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristic/gen-blocklisted-characteristic.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-characteristic-not-found.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristic/gen-characteristic-not-found.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-characteristic-not-found.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristic/gen-characteristic-not-found.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-garbage-collection-ran-during-error.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristic/gen-garbage-collection-ran-during-error.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-garbage-collection-ran-during-error.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristic/gen-garbage-collection-ran-during-error.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-get-same-object.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristic/gen-get-same-object.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-get-same-object.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristic/gen-get-same-object.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-invalid-characteristic-name.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristic/gen-invalid-characteristic-name.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-invalid-characteristic-name.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristic/gen-invalid-characteristic-name.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-reconnect-during.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristic/gen-reconnect-during.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-reconnect-during.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristic/gen-reconnect-during.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-service-is-removed.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristic/gen-service-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-service-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristic/gen-service-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/blocklisted-characteristics.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/blocklisted-characteristics.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/blocklisted-characteristics.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/blocklisted-characteristics.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/characteristics-found-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/characteristics-found-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/characteristics-found-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/characteristics-found-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/characteristics-found.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/characteristics-found.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/characteristics-found.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/characteristics-found.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/characteristics-not-found.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/characteristics-not-found.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/characteristics-not-found.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/characteristics-not-found.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-characteristic-not-found-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/gen-characteristic-not-found-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-characteristic-not-found-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/gen-characteristic-not-found-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-get-same-object-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/gen-get-same-object-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-get-same-object-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/gen-get-same-object-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-get-same-object.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/gen-get-same-object.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-get-same-object.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/gen-get-same-object.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-invalid-characteristic-name.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/gen-invalid-characteristic-name.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-invalid-characteristic-name.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/gen-invalid-characteristic-name.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-reconnect-during-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/gen-reconnect-during-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-reconnect-during-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/gen-reconnect-during-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-reconnect-during.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/gen-reconnect-during.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-reconnect-during.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/gen-reconnect-during.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-service-is-removed-with-uuid.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/gen-service-is-removed-with-uuid.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-service-is-removed-with-uuid.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/gen-service-is-removed-with-uuid.https.window.js diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-service-is-removed.https.window.js b/tests/wpt/tests/bluetooth/service/getCharacteristics/gen-service-is-removed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-service-is-removed.https.window.js rename to tests/wpt/tests/bluetooth/service/getCharacteristics/gen-service-is-removed.https.window.js diff --git a/tests/wpt/web-platform-tests/browsing-topics/browsing-topics-permissions-policy-default.tentative.https.sub.html b/tests/wpt/tests/browsing-topics/browsing-topics-permissions-policy-default.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/browsing-topics-permissions-policy-default.tentative.https.sub.html rename to tests/wpt/tests/browsing-topics/browsing-topics-permissions-policy-default.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/browsing-topics-permissions-policy-none.tentative.https.sub.html b/tests/wpt/tests/browsing-topics/browsing-topics-permissions-policy-none.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/browsing-topics-permissions-policy-none.tentative.https.sub.html rename to tests/wpt/tests/browsing-topics/browsing-topics-permissions-policy-none.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/browsing-topics-permissions-policy-none.tentative.https.sub.html.headers b/tests/wpt/tests/browsing-topics/browsing-topics-permissions-policy-none.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/browsing-topics-permissions-policy-none.tentative.https.sub.html.headers rename to tests/wpt/tests/browsing-topics/browsing-topics-permissions-policy-none.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/browsing-topics/browsing-topics-permissions-policy-self.tentative.https.sub.html b/tests/wpt/tests/browsing-topics/browsing-topics-permissions-policy-self.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/browsing-topics-permissions-policy-self.tentative.https.sub.html rename to tests/wpt/tests/browsing-topics/browsing-topics-permissions-policy-self.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/browsing-topics-permissions-policy-self.tentative.https.sub.html.headers b/tests/wpt/tests/browsing-topics/browsing-topics-permissions-policy-self.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/browsing-topics-permissions-policy-self.tentative.https.sub.html.headers rename to tests/wpt/tests/browsing-topics/browsing-topics-permissions-policy-self.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/browsing-topics/document-api-insecure-context.tentative.http.html b/tests/wpt/tests/browsing-topics/document-api-insecure-context.tentative.http.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/document-api-insecure-context.tentative.http.html rename to tests/wpt/tests/browsing-topics/document-api-insecure-context.tentative.http.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/document-api.tentative.https.html b/tests/wpt/tests/browsing-topics/document-api.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/document-api.tentative.https.html rename to tests/wpt/tests/browsing-topics/document-api.tentative.https.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/fetch-topics-header-not-visible-in-service-worker.tentative.https.html b/tests/wpt/tests/browsing-topics/fetch-topics-header-not-visible-in-service-worker.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/fetch-topics-header-not-visible-in-service-worker.tentative.https.html rename to tests/wpt/tests/browsing-topics/fetch-topics-header-not-visible-in-service-worker.tentative.https.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/fetch-topics-insecure-context.tentative.http.html b/tests/wpt/tests/browsing-topics/fetch-topics-insecure-context.tentative.http.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/fetch-topics-insecure-context.tentative.http.html rename to tests/wpt/tests/browsing-topics/fetch-topics-insecure-context.tentative.http.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/fetch-topics.tentative.https.html b/tests/wpt/tests/browsing-topics/fetch-topics.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/fetch-topics.tentative.https.html rename to tests/wpt/tests/browsing-topics/fetch-topics.tentative.https.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/fetch-without-topics-flag.tentative.https.html b/tests/wpt/tests/browsing-topics/fetch-without-topics-flag.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/fetch-without-topics-flag.tentative.https.html rename to tests/wpt/tests/browsing-topics/fetch-without-topics-flag.tentative.https.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/iframe-topics-attribute-insecure-context.tentative.http.sub.html b/tests/wpt/tests/browsing-topics/iframe-topics-attribute-insecure-context.tentative.http.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/iframe-topics-attribute-insecure-context.tentative.http.sub.html rename to tests/wpt/tests/browsing-topics/iframe-topics-attribute-insecure-context.tentative.http.sub.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/iframe-topics-attribute.tentative.https.html b/tests/wpt/tests/browsing-topics/iframe-topics-attribute.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/iframe-topics-attribute.tentative.https.html rename to tests/wpt/tests/browsing-topics/iframe-topics-attribute.tentative.https.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/resources/check-topics-request-header-notify-parent.py b/tests/wpt/tests/browsing-topics/resources/check-topics-request-header-notify-parent.py similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/resources/check-topics-request-header-notify-parent.py rename to tests/wpt/tests/browsing-topics/resources/check-topics-request-header-notify-parent.py diff --git a/tests/wpt/web-platform-tests/browsing-topics/resources/check-topics-request-header.py b/tests/wpt/tests/browsing-topics/resources/check-topics-request-header.py similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/resources/check-topics-request-header.py rename to tests/wpt/tests/browsing-topics/resources/check-topics-request-header.py diff --git a/tests/wpt/web-platform-tests/browsing-topics/resources/document-api-notify-parent.tentative.https.html b/tests/wpt/tests/browsing-topics/resources/document-api-notify-parent.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/resources/document-api-notify-parent.tentative.https.html rename to tests/wpt/tests/browsing-topics/resources/document-api-notify-parent.tentative.https.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/resources/empty.html b/tests/wpt/tests/browsing-topics/resources/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/resources/empty.html rename to tests/wpt/tests/browsing-topics/resources/empty.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/resources/fetch-topics-header-not-visible-in-service-worker-helper.tentative.https.html b/tests/wpt/tests/browsing-topics/resources/fetch-topics-header-not-visible-in-service-worker-helper.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/resources/fetch-topics-header-not-visible-in-service-worker-helper.tentative.https.html rename to tests/wpt/tests/browsing-topics/resources/fetch-topics-header-not-visible-in-service-worker-helper.tentative.https.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/resources/fetch-topics.js b/tests/wpt/tests/browsing-topics/resources/fetch-topics.js similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/resources/fetch-topics.js rename to tests/wpt/tests/browsing-topics/resources/fetch-topics.js diff --git a/tests/wpt/web-platform-tests/browsing-topics/resources/header-util.sub.js b/tests/wpt/tests/browsing-topics/resources/header-util.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/resources/header-util.sub.js rename to tests/wpt/tests/browsing-topics/resources/header-util.sub.js diff --git a/tests/wpt/web-platform-tests/browsing-topics/resources/intercept-request.js b/tests/wpt/tests/browsing-topics/resources/intercept-request.js similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/resources/intercept-request.js rename to tests/wpt/tests/browsing-topics/resources/intercept-request.js diff --git a/tests/wpt/web-platform-tests/browsing-topics/resources/permissions-policy-util.sub.js b/tests/wpt/tests/browsing-topics/resources/permissions-policy-util.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/resources/permissions-policy-util.sub.js rename to tests/wpt/tests/browsing-topics/resources/permissions-policy-util.sub.js diff --git a/tests/wpt/web-platform-tests/browsing-topics/resources/topics-not-allowed-for-service-worker-fetch-helper.tentative.https.html b/tests/wpt/tests/browsing-topics/resources/topics-not-allowed-for-service-worker-fetch-helper.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/resources/topics-not-allowed-for-service-worker-fetch-helper.tentative.https.html rename to tests/wpt/tests/browsing-topics/resources/topics-not-allowed-for-service-worker-fetch-helper.tentative.https.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/topics-not-allowed-for-service-worker-fetch.tentative.https.html b/tests/wpt/tests/browsing-topics/topics-not-allowed-for-service-worker-fetch.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/topics-not-allowed-for-service-worker-fetch.tentative.https.html rename to tests/wpt/tests/browsing-topics/topics-not-allowed-for-service-worker-fetch.tentative.https.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/xhr-topics-insecure-context.tentative.http.html b/tests/wpt/tests/browsing-topics/xhr-topics-insecure-context.tentative.http.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/xhr-topics-insecure-context.tentative.http.html rename to tests/wpt/tests/browsing-topics/xhr-topics-insecure-context.tentative.http.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/xhr-topics.tentative.https.html b/tests/wpt/tests/browsing-topics/xhr-topics.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/xhr-topics.tentative.https.html rename to tests/wpt/tests/browsing-topics/xhr-topics.tentative.https.html diff --git a/tests/wpt/web-platform-tests/browsing-topics/xhr-without-topics-attribute.tentative.https.html b/tests/wpt/tests/browsing-topics/xhr-without-topics-attribute.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/browsing-topics/xhr-without-topics-attribute.tentative.https.html rename to tests/wpt/tests/browsing-topics/xhr-without-topics-attribute.tentative.https.html diff --git a/tests/wpt/web-platform-tests/clear-site-data/META.yml b/tests/wpt/tests/clear-site-data/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/clear-site-data/META.yml rename to tests/wpt/tests/clear-site-data/META.yml diff --git a/tests/wpt/web-platform-tests/clear-site-data/executionContexts.sub.html b/tests/wpt/tests/clear-site-data/executionContexts.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clear-site-data/executionContexts.sub.html rename to tests/wpt/tests/clear-site-data/executionContexts.sub.html diff --git a/tests/wpt/web-platform-tests/clear-site-data/navigation-insecure.html b/tests/wpt/tests/clear-site-data/navigation-insecure.html similarity index 100% rename from tests/wpt/web-platform-tests/clear-site-data/navigation-insecure.html rename to tests/wpt/tests/clear-site-data/navigation-insecure.html diff --git a/tests/wpt/web-platform-tests/clear-site-data/navigation.https.html b/tests/wpt/tests/clear-site-data/navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clear-site-data/navigation.https.html rename to tests/wpt/tests/clear-site-data/navigation.https.html diff --git a/tests/wpt/web-platform-tests/clear-site-data/resource.html b/tests/wpt/tests/clear-site-data/resource.html similarity index 100% rename from tests/wpt/web-platform-tests/clear-site-data/resource.html rename to tests/wpt/tests/clear-site-data/resource.html diff --git a/tests/wpt/web-platform-tests/clear-site-data/storage.https.html b/tests/wpt/tests/clear-site-data/storage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clear-site-data/storage.https.html rename to tests/wpt/tests/clear-site-data/storage.https.html diff --git a/tests/wpt/web-platform-tests/clear-site-data/support/controlled-endpoint.py b/tests/wpt/tests/clear-site-data/support/controlled-endpoint.py similarity index 100% rename from tests/wpt/web-platform-tests/clear-site-data/support/controlled-endpoint.py rename to tests/wpt/tests/clear-site-data/support/controlled-endpoint.py diff --git a/tests/wpt/web-platform-tests/clear-site-data/support/echo-clear-site-data.py b/tests/wpt/tests/clear-site-data/support/echo-clear-site-data.py similarity index 100% rename from tests/wpt/web-platform-tests/clear-site-data/support/echo-clear-site-data.py rename to tests/wpt/tests/clear-site-data/support/echo-clear-site-data.py diff --git a/tests/wpt/web-platform-tests/clear-site-data/support/iframe_executionContexts.html b/tests/wpt/tests/clear-site-data/support/iframe_executionContexts.html similarity index 100% rename from tests/wpt/web-platform-tests/clear-site-data/support/iframe_executionContexts.html rename to tests/wpt/tests/clear-site-data/support/iframe_executionContexts.html diff --git a/tests/wpt/web-platform-tests/clear-site-data/support/page_using_service_worker.html b/tests/wpt/tests/clear-site-data/support/page_using_service_worker.html similarity index 100% rename from tests/wpt/web-platform-tests/clear-site-data/support/page_using_service_worker.html rename to tests/wpt/tests/clear-site-data/support/page_using_service_worker.html diff --git a/tests/wpt/web-platform-tests/clear-site-data/support/page_with_resource.sub.html b/tests/wpt/tests/clear-site-data/support/page_with_resource.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clear-site-data/support/page_with_resource.sub.html rename to tests/wpt/tests/clear-site-data/support/page_with_resource.sub.html diff --git a/tests/wpt/web-platform-tests/clear-site-data/support/send_report.html b/tests/wpt/tests/clear-site-data/support/send_report.html similarity index 100% rename from tests/wpt/web-platform-tests/clear-site-data/support/send_report.html rename to tests/wpt/tests/clear-site-data/support/send_report.html diff --git a/tests/wpt/web-platform-tests/clear-site-data/support/service_worker.js b/tests/wpt/tests/clear-site-data/support/service_worker.js similarity index 100% rename from tests/wpt/web-platform-tests/clear-site-data/support/service_worker.js rename to tests/wpt/tests/clear-site-data/support/service_worker.js diff --git a/tests/wpt/web-platform-tests/clear-site-data/support/test_utils.sub.js b/tests/wpt/tests/clear-site-data/support/test_utils.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/clear-site-data/support/test_utils.sub.js rename to tests/wpt/tests/clear-site-data/support/test_utils.sub.js diff --git a/tests/wpt/web-platform-tests/client-hints/META.yml b/tests/wpt/tests/client-hints/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/META.yml rename to tests/wpt/tests/client-hints/META.yml diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-change.https.html b/tests/wpt/tests/client-hints/accept-ch-change.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-change.https.html rename to tests/wpt/tests/client-hints/accept-ch-change.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-malformed-header.https.html b/tests/wpt/tests/client-hints/accept-ch-malformed-header.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-malformed-header.https.html rename to tests/wpt/tests/client-hints/accept-ch-malformed-header.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-malformed-header.https.html.headers b/tests/wpt/tests/client-hints/accept-ch-malformed-header.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-malformed-header.https.html.headers rename to tests/wpt/tests/client-hints/accept-ch-malformed-header.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/README.md b/tests/wpt/tests/client-hints/accept-ch-stickiness/README.md similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/README.md rename to tests/wpt/tests/client-hints/accept-ch-stickiness/README.md diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-iframe-not-setting-other-origins.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-iframe-not-setting-other-origins.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-iframe-not-setting-other-origins.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-iframe-not-setting-other-origins.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-iframe-not-setting-own-origin.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-iframe-not-setting-own-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-iframe-not-setting-own-origin.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-iframe-not-setting-own-origin.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-iframe-redirect-with-fp-delegation.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-iframe-redirect-with-fp-delegation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-iframe-redirect-with-fp-delegation.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-iframe-redirect-with-fp-delegation.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-iframe-redirect-with-fp-delegation.https.html.headers b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-iframe-redirect-with-fp-delegation.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-iframe-redirect-with-fp-delegation.https.html.headers rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-iframe-redirect-with-fp-delegation.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-navigation-redirect.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-navigation-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-navigation-redirect.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-navigation-redirect.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-navigation-redirect.https.html.headers b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-navigation-redirect.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-navigation-redirect.https.html.headers rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-navigation-redirect.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-navigation.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-navigation.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-navigation.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect-with-fp-delegation.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect-with-fp-delegation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect-with-fp-delegation.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect-with-fp-delegation.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect-with-fp-delegation.https.html.headers b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect-with-fp-delegation.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect-with-fp-delegation.https.html.headers rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect-with-fp-delegation.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect.https.html.headers b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect.https.html.headers rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-subresource-redirect.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-subresource-with-feature-policy.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-subresource-with-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-subresource-with-feature-policy.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-subresource-with-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-subresource.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-subresource.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-subresource.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-subresource.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-syncxhr-redirect.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-syncxhr-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-syncxhr-redirect.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-syncxhr-redirect.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-syncxhr-redirect.https.html.headers b/tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-syncxhr-redirect.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/cross-origin-syncxhr-redirect.https.html.headers rename to tests/wpt/tests/client-hints/accept-ch-stickiness/cross-origin-syncxhr-redirect.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-iframe-not-setting-other-origins.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-iframe-not-setting-other-origins.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-iframe-not-setting-other-origins.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-iframe-not-setting-other-origins.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-iframe-not-setting-own-origin.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-iframe-not-setting-own-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-iframe-not-setting-own-origin.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-iframe-not-setting-own-origin.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-navigation.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-navigation.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-navigation.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-subresource.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-subresource.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-subresource.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/http-equiv-cross-origin-subresource.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/http-equiv-same-origin-iframe.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/http-equiv-same-origin-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/http-equiv-same-origin-iframe.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/http-equiv-same-origin-iframe.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/http-equiv-same-origin-navigation.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/http-equiv-same-origin-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/http-equiv-same-origin-navigation.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/http-equiv-same-origin-navigation.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/http-equiv-same-origin-subresource.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/http-equiv-same-origin-subresource.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/http-equiv-same-origin-subresource.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/http-equiv-same-origin-subresource.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-iframe-not-setting-other-origins.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-iframe-not-setting-other-origins.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-iframe-not-setting-other-origins.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-iframe-not-setting-other-origins.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-iframe-not-setting-own-origin.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-iframe-not-setting-own-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-iframe-not-setting-own-origin.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-iframe-not-setting-own-origin.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-navigation.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-navigation.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-navigation.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-subresource.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-subresource.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-subresource.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-cross-origin-subresource.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-iframe-with-hints.https.sub.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-iframe-with-hints.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-iframe-with-hints.https.sub.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-iframe-with-hints.https.sub.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-iframe-without-hints.https.sub.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-iframe-without-hints.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-iframe-without-hints.https.sub.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-iframe-without-hints.https.sub.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-subresource-with-hints.https.sub.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-subresource-with-hints.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-subresource-with-hints.https.sub.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-subresource-with-hints.https.sub.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-subresource-without-hints.https.sub.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-subresource-without-hints.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-subresource-without-hints.https.sub.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-delegate-ch-cross-origin-subresource-without-hints.https.sub.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-same-origin-iframe.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-same-origin-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-same-origin-iframe.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-same-origin-iframe.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-same-origin-navigation.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-same-origin-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-same-origin-navigation.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-same-origin-navigation.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-same-origin-subresource.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-same-origin-subresource.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/meta-equiv-same-origin-subresource.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/meta-equiv-same-origin-subresource.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch-and-redir.py b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/accept-ch-and-redir.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch-and-redir.py rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/accept-ch-and-redir.py diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch-blank.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/accept-ch-blank.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch-blank.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/accept-ch-blank.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch-blank.html.headers b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/accept-ch-blank.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch-blank.html.headers rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/accept-ch-blank.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch-test.js b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/accept-ch-test.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch-test.js rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/accept-ch-test.js diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/accept-ch.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/accept-ch.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch.html.headers b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/accept-ch.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch.html.headers rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/accept-ch.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/clear-site-data.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/clear-site-data.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/clear-site-data.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/clear-site-data.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/clear-site-data.html.headers b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/clear-site-data.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/clear-site-data.html.headers rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/clear-site-data.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/do-expect-received.py b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/do-expect-received.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/do-expect-received.py rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/do-expect-received.py diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/do-not-expect-client-hints-headers.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/do-not-expect-client-hints-headers.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/do-not-expect-client-hints-headers.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/do-not-expect-client-hints-headers.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/do-not-expect-received.py b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/do-not-expect-received.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/do-not-expect-received.py rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/do-not-expect-received.py diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/echo-client-hints-received.py b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/echo-client-hints-received.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/echo-client-hints-received.py rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/echo-client-hints-received.py diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/expect-client-hints-headers.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/expect-client-hints-headers.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/expect-client-hints-headers.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/expect-client-hints-headers.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/expect-received.py b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/expect-received.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/expect-received.py rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/expect-received.py diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/feature-policy-with-cross-origin-subresource.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/feature-policy-with-cross-origin-subresource.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/feature-policy-with-cross-origin-subresource.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/feature-policy-with-cross-origin-subresource.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/feature-policy-with-cross-origin-subresource.html.headers b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/feature-policy-with-cross-origin-subresource.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/feature-policy-with-cross-origin-subresource.html.headers rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/feature-policy-with-cross-origin-subresource.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/http-equiv-accept-ch.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/http-equiv-accept-ch.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/http-equiv-accept-ch.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/http-equiv-accept-ch.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/http-equiv-accept-ch.html.headers b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/http-equiv-accept-ch.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/http-equiv-accept-ch.html.headers rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/http-equiv-accept-ch.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/meta-equiv-delegate-ch.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/meta-equiv-delegate-ch.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/meta-equiv-delegate-ch.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/meta-equiv-delegate-ch.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/meta-equiv-delegate-ch.html.headers b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/meta-equiv-delegate-ch.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/meta-equiv-delegate-ch.html.headers rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/meta-equiv-delegate-ch.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/no-accept-ch.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/no-accept-ch.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/no-accept-ch.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/no-accept-ch.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/no-accept-ch.html.headers b/tests/wpt/tests/client-hints/accept-ch-stickiness/resources/no-accept-ch.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/no-accept-ch.html.headers rename to tests/wpt/tests/client-hints/accept-ch-stickiness/resources/no-accept-ch.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-iframe.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-iframe.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-iframe.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-navigation-empty-accept-ch.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-navigation-empty-accept-ch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-navigation-empty-accept-ch.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-navigation-empty-accept-ch.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-navigation-no-accept-ch.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-navigation-no-accept-ch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-navigation-no-accept-ch.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-navigation-no-accept-ch.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-navigation-redirect.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-navigation-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-navigation-redirect.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-navigation-redirect.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-navigation.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-navigation.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-navigation.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-subresource-redirect-opted-in.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-subresource-redirect-opted-in.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-subresource-redirect-opted-in.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-subresource-redirect-opted-in.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-subresource-redirect-opted-in.https.html.headers b/tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-subresource-redirect-opted-in.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-subresource-redirect-opted-in.https.html.headers rename to tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-subresource-redirect-opted-in.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-subresource-redirect.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-subresource-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-subresource-redirect.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-subresource-redirect.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-subresource.https.html b/tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-subresource.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/same-origin-subresource.https.html rename to tests/wpt/tests/client-hints/accept-ch-stickiness/same-origin-subresource.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch.wildcard.https.sub.html b/tests/wpt/tests/client-hints/accept-ch.wildcard.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch.wildcard.https.sub.html rename to tests/wpt/tests/client-hints/accept-ch.wildcard.https.sub.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch.wildcard.https.sub.html.sub.headers b/tests/wpt/tests/client-hints/accept-ch.wildcard.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch.wildcard.https.sub.html.sub.headers rename to tests/wpt/tests/client-hints/accept-ch.wildcard.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch/__dir__.headers b/tests/wpt/tests/client-hints/accept-ch/__dir__.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch/__dir__.headers rename to tests/wpt/tests/client-hints/accept-ch/__dir__.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch/answers.sub.https.html b/tests/wpt/tests/client-hints/accept-ch/answers.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch/answers.sub.https.html rename to tests/wpt/tests/client-hints/accept-ch/answers.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch/cache-revalidation.https.html b/tests/wpt/tests/client-hints/accept-ch/cache-revalidation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch/cache-revalidation.https.html rename to tests/wpt/tests/client-hints/accept-ch/cache-revalidation.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch/feature-policy-navigation/__dir__.headers b/tests/wpt/tests/client-hints/accept-ch/feature-policy-navigation/__dir__.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch/feature-policy-navigation/__dir__.headers rename to tests/wpt/tests/client-hints/accept-ch/feature-policy-navigation/__dir__.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch/feature-policy-navigation/feature-policy.https.html b/tests/wpt/tests/client-hints/accept-ch/feature-policy-navigation/feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch/feature-policy-navigation/feature-policy.https.html rename to tests/wpt/tests/client-hints/accept-ch/feature-policy-navigation/feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch/feature-policy-navigation/feature-policy.https.html.headers b/tests/wpt/tests/client-hints/accept-ch/feature-policy-navigation/feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch/feature-policy-navigation/feature-policy.https.html.headers rename to tests/wpt/tests/client-hints/accept-ch/feature-policy-navigation/feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch/feature-policy-navigation/no-feature-policy.https.html b/tests/wpt/tests/client-hints/accept-ch/feature-policy-navigation/no-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch/feature-policy-navigation/no-feature-policy.https.html rename to tests/wpt/tests/client-hints/accept-ch/feature-policy-navigation/no-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch/feature-policy.sub.https.html b/tests/wpt/tests/client-hints/accept-ch/feature-policy.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch/feature-policy.sub.https.html rename to tests/wpt/tests/client-hints/accept-ch/feature-policy.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch/feature-policy.sub.https.html.headers b/tests/wpt/tests/client-hints/accept-ch/feature-policy.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch/feature-policy.sub.https.html.headers rename to tests/wpt/tests/client-hints/accept-ch/feature-policy.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch/meta/resource-in-markup-accept-ch.https.html b/tests/wpt/tests/client-hints/accept-ch/meta/resource-in-markup-accept-ch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch/meta/resource-in-markup-accept-ch.https.html rename to tests/wpt/tests/client-hints/accept-ch/meta/resource-in-markup-accept-ch.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch/meta/resource-in-markup-delegate-ch.https.html b/tests/wpt/tests/client-hints/accept-ch/meta/resource-in-markup-delegate-ch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch/meta/resource-in-markup-delegate-ch.https.html rename to tests/wpt/tests/client-hints/accept-ch/meta/resource-in-markup-delegate-ch.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch/no-feature-policy.sub.https.html b/tests/wpt/tests/client-hints/accept-ch/no-feature-policy.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch/no-feature-policy.sub.https.html rename to tests/wpt/tests/client-hints/accept-ch/no-feature-policy.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch/non-secure.http.html b/tests/wpt/tests/client-hints/accept-ch/non-secure.http.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/accept-ch/non-secure.http.html rename to tests/wpt/tests/client-hints/accept-ch/non-secure.http.html diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/critical-ch.navigation-timing.no-restart.https.html b/tests/wpt/tests/client-hints/critical-ch/critical-ch.navigation-timing.no-restart.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/critical-ch.navigation-timing.no-restart.https.html rename to tests/wpt/tests/client-hints/critical-ch/critical-ch.navigation-timing.no-restart.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/critical-ch.navigation-timing.restart.https.html b/tests/wpt/tests/client-hints/critical-ch/critical-ch.navigation-timing.restart.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/critical-ch.navigation-timing.restart.https.html rename to tests/wpt/tests/client-hints/critical-ch/critical-ch.navigation-timing.restart.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/critical-ch.navigation-timing.restart.https.html.headers b/tests/wpt/tests/client-hints/critical-ch/critical-ch.navigation-timing.restart.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/critical-ch.navigation-timing.restart.https.html.headers rename to tests/wpt/tests/client-hints/critical-ch/critical-ch.navigation-timing.restart.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/iframe.https.window.js b/tests/wpt/tests/client-hints/critical-ch/iframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/iframe.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/iframe.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/mis-matched-count.https.window.js b/tests/wpt/tests/client-hints/critical-ch/mis-matched-count.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/mis-matched-count.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/mis-matched-count.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/mis-matched.https.window.js b/tests/wpt/tests/client-hints/critical-ch/mis-matched.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/mis-matched.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/mis-matched.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/mis-matched.multiple.https.window.js b/tests/wpt/tests/client-hints/critical-ch/mis-matched.multiple.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/mis-matched.multiple.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/mis-matched.multiple.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/navigation.cross-origin.https.window.js b/tests/wpt/tests/client-hints/critical-ch/navigation.cross-origin.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/navigation.cross-origin.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/navigation.cross-origin.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/navigation.cross-origin.multiple.https.window.js b/tests/wpt/tests/client-hints/critical-ch/navigation.cross-origin.multiple.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/navigation.cross-origin.multiple.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/navigation.cross-origin.multiple.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/navigation.same-origin.https.window.js b/tests/wpt/tests/client-hints/critical-ch/navigation.same-origin.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/navigation.same-origin.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/navigation.same-origin.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/navigation.same-origin.multiple.https.window.js b/tests/wpt/tests/client-hints/critical-ch/navigation.same-origin.multiple.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/navigation.same-origin.multiple.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/navigation.same-origin.multiple.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/non-secure.http.window.js b/tests/wpt/tests/client-hints/critical-ch/non-secure.http.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/non-secure.http.window.js rename to tests/wpt/tests/client-hints/critical-ch/non-secure.http.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.critical.cross-origin.https.window.js b/tests/wpt/tests/client-hints/critical-ch/redirect.critical.cross-origin.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.critical.cross-origin.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/redirect.critical.cross-origin.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.critical.cross-origin.multiple.https.window.js b/tests/wpt/tests/client-hints/critical-ch/redirect.critical.cross-origin.multiple.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.critical.cross-origin.multiple.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/redirect.critical.cross-origin.multiple.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.critical.same-origin.https.window.js b/tests/wpt/tests/client-hints/critical-ch/redirect.critical.same-origin.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.critical.same-origin.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/redirect.critical.same-origin.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.critical.same-origin.multiple.https.window.js b/tests/wpt/tests/client-hints/critical-ch/redirect.critical.same-origin.multiple.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.critical.same-origin.multiple.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/redirect.critical.same-origin.multiple.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.cross-origin.https.window.js b/tests/wpt/tests/client-hints/critical-ch/redirect.cross-origin.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.cross-origin.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/redirect.cross-origin.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.cross-origin.multiple.https.window.js b/tests/wpt/tests/client-hints/critical-ch/redirect.cross-origin.multiple.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.cross-origin.multiple.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/redirect.cross-origin.multiple.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.same-origin.https.window.js b/tests/wpt/tests/client-hints/critical-ch/redirect.same-origin.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.same-origin.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/redirect.same-origin.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.same-origin.multiple.https.window.js b/tests/wpt/tests/client-hints/critical-ch/redirect.same-origin.multiple.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/redirect.same-origin.multiple.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/redirect.same-origin.multiple.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/request-count.https.window.js b/tests/wpt/tests/client-hints/critical-ch/request-count.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/request-count.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/request-count.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/request-count.multiple.https.window.js b/tests/wpt/tests/client-hints/critical-ch/request-count.multiple.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/request-count.multiple.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/request-count.multiple.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/resources/echo-critical-hint.py b/tests/wpt/tests/client-hints/critical-ch/resources/echo-critical-hint.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/resources/echo-critical-hint.py rename to tests/wpt/tests/client-hints/critical-ch/resources/echo-critical-hint.py diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/resources/redirect-critical-hint.py b/tests/wpt/tests/client-hints/critical-ch/resources/redirect-critical-hint.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/resources/redirect-critical-hint.py rename to tests/wpt/tests/client-hints/critical-ch/resources/redirect-critical-hint.py diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/resources/util.js b/tests/wpt/tests/client-hints/critical-ch/resources/util.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/resources/util.js rename to tests/wpt/tests/client-hints/critical-ch/resources/util.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/subresource.https.window.js b/tests/wpt/tests/client-hints/critical-ch/subresource.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/subresource.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/subresource.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/critical-ch/unsafe-method.https.window.js b/tests/wpt/tests/client-hints/critical-ch/unsafe-method.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/critical-ch/unsafe-method.https.window.js rename to tests/wpt/tests/client-hints/critical-ch/unsafe-method.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/http-equiv-accept-ch-iframe.https.html b/tests/wpt/tests/client-hints/http-equiv-accept-ch-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/http-equiv-accept-ch-iframe.https.html rename to tests/wpt/tests/client-hints/http-equiv-accept-ch-iframe.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/http-equiv-accept-ch-malformed-header.https.html b/tests/wpt/tests/client-hints/http-equiv-accept-ch-malformed-header.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/http-equiv-accept-ch-malformed-header.https.html rename to tests/wpt/tests/client-hints/http-equiv-accept-ch-malformed-header.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/http-equiv-accept-ch-merge.https.html b/tests/wpt/tests/client-hints/http-equiv-accept-ch-merge.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/http-equiv-accept-ch-merge.https.html rename to tests/wpt/tests/client-hints/http-equiv-accept-ch-merge.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/http-equiv-accept-ch-merge.https.html.headers b/tests/wpt/tests/client-hints/http-equiv-accept-ch-merge.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/http-equiv-accept-ch-merge.https.html.headers rename to tests/wpt/tests/client-hints/http-equiv-accept-ch-merge.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/http-equiv-accept-ch-non-secure.http.html b/tests/wpt/tests/client-hints/http-equiv-accept-ch-non-secure.http.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/http-equiv-accept-ch-non-secure.http.html rename to tests/wpt/tests/client-hints/http-equiv-accept-ch-non-secure.http.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html.headers b/tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html.headers rename to tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_all.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html.headers b/tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html.headers rename to tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_none.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html.headers b/tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html.headers rename to tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_self.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html.sub.headers b/tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html.sub.headers rename to tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_some.sub.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html.headers b/tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html.headers rename to tests/wpt/tests/client-hints/inner-delegation/accept_ch_delegation_to_src.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe_iframe.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe_iframe.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe_iframe.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_all_iframe_iframe.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe_iframe.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe_iframe.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe_iframe.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_none_iframe_iframe.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe_iframe.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe_iframe.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe_iframe.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_self_iframe_iframe.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html.headers b/tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html.headers rename to tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html.sub.headers b/tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html.sub.headers rename to tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_some_iframe_iframe.sub.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe_iframe.sub.https.html b/tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe_iframe.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe_iframe.sub.https.html rename to tests/wpt/tests/client-hints/inner-delegation/resources/accept_ch_delegation_to_src_iframe_iframe.sub.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py b/tests/wpt/tests/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py rename to tests/wpt/tests/client-hints/inner-delegation/resources/was-sec-ch-device-memory-received.py diff --git a/tests/wpt/web-platform-tests/client-hints/meta-equiv-delegate-ch-iframe.https.html b/tests/wpt/tests/client-hints/meta-equiv-delegate-ch-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/meta-equiv-delegate-ch-iframe.https.html rename to tests/wpt/tests/client-hints/meta-equiv-delegate-ch-iframe.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/meta-equiv-delegate-ch-injection.https.html b/tests/wpt/tests/client-hints/meta-equiv-delegate-ch-injection.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/meta-equiv-delegate-ch-injection.https.html rename to tests/wpt/tests/client-hints/meta-equiv-delegate-ch-injection.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/meta-equiv-delegate-ch-malformed-header.https.html b/tests/wpt/tests/client-hints/meta-equiv-delegate-ch-malformed-header.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/meta-equiv-delegate-ch-malformed-header.https.html rename to tests/wpt/tests/client-hints/meta-equiv-delegate-ch-malformed-header.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/meta-equiv-delegate-ch-merge.https.html b/tests/wpt/tests/client-hints/meta-equiv-delegate-ch-merge.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/meta-equiv-delegate-ch-merge.https.html rename to tests/wpt/tests/client-hints/meta-equiv-delegate-ch-merge.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/meta-equiv-delegate-ch-merge.https.html.headers b/tests/wpt/tests/client-hints/meta-equiv-delegate-ch-merge.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/meta-equiv-delegate-ch-merge.https.html.headers rename to tests/wpt/tests/client-hints/meta-equiv-delegate-ch-merge.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/meta-equiv-delegate-ch-non-secure.http.html b/tests/wpt/tests/client-hints/meta-equiv-delegate-ch-non-secure.http.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/meta-equiv-delegate-ch-non-secure.http.html rename to tests/wpt/tests/client-hints/meta-equiv-delegate-ch-non-secure.http.html diff --git a/tests/wpt/web-platform-tests/client-hints/resources/accept-ch-different.html b/tests/wpt/tests/client-hints/resources/accept-ch-different.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/accept-ch-different.html rename to tests/wpt/tests/client-hints/resources/accept-ch-different.html diff --git a/tests/wpt/web-platform-tests/client-hints/resources/accept-ch-different.html.headers b/tests/wpt/tests/client-hints/resources/accept-ch-different.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/accept-ch-different.html.headers rename to tests/wpt/tests/client-hints/resources/accept-ch-different.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/resources/accept-ch-empty.html b/tests/wpt/tests/client-hints/resources/accept-ch-empty.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/accept-ch-empty.html rename to tests/wpt/tests/client-hints/resources/accept-ch-empty.html diff --git a/tests/wpt/web-platform-tests/client-hints/resources/accept-ch-empty.html.headers b/tests/wpt/tests/client-hints/resources/accept-ch-empty.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/accept-ch-empty.html.headers rename to tests/wpt/tests/client-hints/resources/accept-ch-empty.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/resources/accept-ch-malformed.html b/tests/wpt/tests/client-hints/resources/accept-ch-malformed.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/accept-ch-malformed.html rename to tests/wpt/tests/client-hints/resources/accept-ch-malformed.html diff --git a/tests/wpt/web-platform-tests/client-hints/resources/accept-ch-malformed.html.headers b/tests/wpt/tests/client-hints/resources/accept-ch-malformed.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/accept-ch-malformed.html.headers rename to tests/wpt/tests/client-hints/resources/accept-ch-malformed.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/resources/accept-ch-mixed.html b/tests/wpt/tests/client-hints/resources/accept-ch-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/accept-ch-mixed.html rename to tests/wpt/tests/client-hints/resources/accept-ch-mixed.html diff --git a/tests/wpt/web-platform-tests/client-hints/resources/accept-ch-mixed.html.headers b/tests/wpt/tests/client-hints/resources/accept-ch-mixed.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/accept-ch-mixed.html.headers rename to tests/wpt/tests/client-hints/resources/accept-ch-mixed.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/resources/accept-ch-split.html b/tests/wpt/tests/client-hints/resources/accept-ch-split.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/accept-ch-split.html rename to tests/wpt/tests/client-hints/resources/accept-ch-split.html diff --git a/tests/wpt/web-platform-tests/client-hints/resources/accept-ch-split.html.headers b/tests/wpt/tests/client-hints/resources/accept-ch-split.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/accept-ch-split.html.headers rename to tests/wpt/tests/client-hints/resources/accept-ch-split.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/resources/accept-ch.html b/tests/wpt/tests/client-hints/resources/accept-ch.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/accept-ch.html rename to tests/wpt/tests/client-hints/resources/accept-ch.html diff --git a/tests/wpt/web-platform-tests/client-hints/resources/accept-ch.html.headers b/tests/wpt/tests/client-hints/resources/accept-ch.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/accept-ch.html.headers rename to tests/wpt/tests/client-hints/resources/accept-ch.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/resources/accept-ch.wildcard.iframe.https.sub.html b/tests/wpt/tests/client-hints/resources/accept-ch.wildcard.iframe.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/accept-ch.wildcard.iframe.https.sub.html rename to tests/wpt/tests/client-hints/resources/accept-ch.wildcard.iframe.https.sub.html diff --git a/tests/wpt/web-platform-tests/client-hints/resources/accept-ch.wildcard.iframe.https.sub.html.sub.headers b/tests/wpt/tests/client-hints/resources/accept-ch.wildcard.iframe.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/accept-ch.wildcard.iframe.https.sub.html.sub.headers rename to tests/wpt/tests/client-hints/resources/accept-ch.wildcard.iframe.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/client-hints/resources/clienthintslist.py b/tests/wpt/tests/client-hints/resources/clienthintslist.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/clienthintslist.py rename to tests/wpt/tests/client-hints/resources/clienthintslist.py diff --git a/tests/wpt/web-platform-tests/client-hints/resources/echo-client-hints-received.py b/tests/wpt/tests/client-hints/resources/echo-client-hints-received.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/echo-client-hints-received.py rename to tests/wpt/tests/client-hints/resources/echo-client-hints-received.py diff --git a/tests/wpt/web-platform-tests/client-hints/resources/echo-ua-client-hints-received.py b/tests/wpt/tests/client-hints/resources/echo-ua-client-hints-received.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/echo-ua-client-hints-received.py rename to tests/wpt/tests/client-hints/resources/echo-ua-client-hints-received.py diff --git a/tests/wpt/web-platform-tests/client-hints/resources/expect-client-hints-headers-iframe.py b/tests/wpt/tests/client-hints/resources/expect-client-hints-headers-iframe.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/expect-client-hints-headers-iframe.py rename to tests/wpt/tests/client-hints/resources/expect-client-hints-headers-iframe.py diff --git a/tests/wpt/web-platform-tests/client-hints/resources/expect-client-hints-headers.html b/tests/wpt/tests/client-hints/resources/expect-client-hints-headers.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/expect-client-hints-headers.html rename to tests/wpt/tests/client-hints/resources/expect-client-hints-headers.html diff --git a/tests/wpt/web-platform-tests/client-hints/resources/expect-different-client-hints-headers.html b/tests/wpt/tests/client-hints/resources/expect-different-client-hints-headers.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/expect-different-client-hints-headers.html rename to tests/wpt/tests/client-hints/resources/expect-different-client-hints-headers.html diff --git a/tests/wpt/web-platform-tests/client-hints/resources/expect-no-client-hints-headers.html b/tests/wpt/tests/client-hints/resources/expect-no-client-hints-headers.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/expect-no-client-hints-headers.html rename to tests/wpt/tests/client-hints/resources/expect-no-client-hints-headers.html diff --git a/tests/wpt/web-platform-tests/client-hints/resources/export.js b/tests/wpt/tests/client-hints/resources/export.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/export.js rename to tests/wpt/tests/client-hints/resources/export.js diff --git a/tests/wpt/web-platform-tests/client-hints/resources/feature-policy-navigation.js b/tests/wpt/tests/client-hints/resources/feature-policy-navigation.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/feature-policy-navigation.js rename to tests/wpt/tests/client-hints/resources/feature-policy-navigation.js diff --git a/tests/wpt/web-platform-tests/client-hints/resources/open-and-add-load-event.js b/tests/wpt/tests/client-hints/resources/open-and-add-load-event.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/open-and-add-load-event.js rename to tests/wpt/tests/client-hints/resources/open-and-add-load-event.js diff --git a/tests/wpt/web-platform-tests/client-hints/resources/script-set-dpr-header.py b/tests/wpt/tests/client-hints/resources/script-set-dpr-header.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/script-set-dpr-header.py rename to tests/wpt/tests/client-hints/resources/script-set-dpr-header.py diff --git a/tests/wpt/web-platform-tests/client-hints/resources/sec-ch-ua.py b/tests/wpt/tests/client-hints/resources/sec-ch-ua.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/sec-ch-ua.py rename to tests/wpt/tests/client-hints/resources/sec-ch-ua.py diff --git a/tests/wpt/web-platform-tests/client-hints/resources/stale-echo-client-hints.py b/tests/wpt/tests/client-hints/resources/stale-echo-client-hints.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/stale-echo-client-hints.py rename to tests/wpt/tests/client-hints/resources/stale-echo-client-hints.py diff --git a/tests/wpt/web-platform-tests/client-hints/resources/viewport-frame.py b/tests/wpt/tests/client-hints/resources/viewport-frame.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/viewport-frame.py rename to tests/wpt/tests/client-hints/resources/viewport-frame.py diff --git a/tests/wpt/web-platform-tests/client-hints/resources/viewport-measurement.html b/tests/wpt/tests/client-hints/resources/viewport-measurement.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/viewport-measurement.html rename to tests/wpt/tests/client-hints/resources/viewport-measurement.html diff --git a/tests/wpt/web-platform-tests/client-hints/resources/viewport.py b/tests/wpt/tests/client-hints/resources/viewport.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/resources/viewport.py rename to tests/wpt/tests/client-hints/resources/viewport.py diff --git a/tests/wpt/web-platform-tests/client-hints/sandbox/__dir__.headers b/tests/wpt/tests/client-hints/sandbox/__dir__.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sandbox/__dir__.headers rename to tests/wpt/tests/client-hints/sandbox/__dir__.headers diff --git a/tests/wpt/web-platform-tests/client-hints/sandbox/iframe-csp-same-origin.https.html b/tests/wpt/tests/client-hints/sandbox/iframe-csp-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sandbox/iframe-csp-same-origin.https.html rename to tests/wpt/tests/client-hints/sandbox/iframe-csp-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/sandbox/iframe-csp-same-origin.https.html.headers b/tests/wpt/tests/client-hints/sandbox/iframe-csp-same-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sandbox/iframe-csp-same-origin.https.html.headers rename to tests/wpt/tests/client-hints/sandbox/iframe-csp-same-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/sandbox/iframe-csp.https.html b/tests/wpt/tests/client-hints/sandbox/iframe-csp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sandbox/iframe-csp.https.html rename to tests/wpt/tests/client-hints/sandbox/iframe-csp.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/sandbox/iframe-csp.https.html.headers b/tests/wpt/tests/client-hints/sandbox/iframe-csp.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sandbox/iframe-csp.https.html.headers rename to tests/wpt/tests/client-hints/sandbox/iframe-csp.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/sandbox/iframe-iframe-popups.https.html b/tests/wpt/tests/client-hints/sandbox/iframe-iframe-popups.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sandbox/iframe-iframe-popups.https.html rename to tests/wpt/tests/client-hints/sandbox/iframe-iframe-popups.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/sandbox/iframe-popups-escape-sandbox.https.html b/tests/wpt/tests/client-hints/sandbox/iframe-popups-escape-sandbox.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sandbox/iframe-popups-escape-sandbox.https.html rename to tests/wpt/tests/client-hints/sandbox/iframe-popups-escape-sandbox.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/sandbox/iframe-popups.https.html b/tests/wpt/tests/client-hints/sandbox/iframe-popups.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sandbox/iframe-popups.https.html rename to tests/wpt/tests/client-hints/sandbox/iframe-popups.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/sandbox/iframe-same-origin.https.html b/tests/wpt/tests/client-hints/sandbox/iframe-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sandbox/iframe-same-origin.https.html rename to tests/wpt/tests/client-hints/sandbox/iframe-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/sandbox/iframe.https.html b/tests/wpt/tests/client-hints/sandbox/iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sandbox/iframe.https.html rename to tests/wpt/tests/client-hints/sandbox/iframe.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/sandbox/resources/embedded-popup-expect-hints.html b/tests/wpt/tests/client-hints/sandbox/resources/embedded-popup-expect-hints.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sandbox/resources/embedded-popup-expect-hints.html rename to tests/wpt/tests/client-hints/sandbox/resources/embedded-popup-expect-hints.html diff --git a/tests/wpt/web-platform-tests/client-hints/sandbox/resources/embedded-popup-expect-no-hints.html b/tests/wpt/tests/client-hints/sandbox/resources/embedded-popup-expect-no-hints.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sandbox/resources/embedded-popup-expect-no-hints.html rename to tests/wpt/tests/client-hints/sandbox/resources/embedded-popup-expect-no-hints.html diff --git a/tests/wpt/web-platform-tests/client-hints/sandbox/resources/iframe-with-embedded-popup-expect-no-hints.html b/tests/wpt/tests/client-hints/sandbox/resources/iframe-with-embedded-popup-expect-no-hints.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sandbox/resources/iframe-with-embedded-popup-expect-no-hints.html rename to tests/wpt/tests/client-hints/sandbox/resources/iframe-with-embedded-popup-expect-no-hints.html diff --git a/tests/wpt/web-platform-tests/client-hints/sandbox/resources/util.js b/tests/wpt/tests/client-hints/sandbox/resources/util.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sandbox/resources/util.js rename to tests/wpt/tests/client-hints/sandbox/resources/util.js diff --git a/tests/wpt/web-platform-tests/client-hints/sec-ch-quotes.https.html b/tests/wpt/tests/client-hints/sec-ch-quotes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sec-ch-quotes.https.html rename to tests/wpt/tests/client-hints/sec-ch-quotes.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/sec-ch-quotes.https.html.headers b/tests/wpt/tests/client-hints/sec-ch-quotes.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sec-ch-quotes.https.html.headers rename to tests/wpt/tests/client-hints/sec-ch-quotes.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/sec-ch-ua.http.html b/tests/wpt/tests/client-hints/sec-ch-ua.http.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sec-ch-ua.http.html rename to tests/wpt/tests/client-hints/sec-ch-ua.http.html diff --git a/tests/wpt/web-platform-tests/client-hints/sec-ch-ua.https.html b/tests/wpt/tests/client-hints/sec-ch-ua.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/sec-ch-ua.https.html rename to tests/wpt/tests/client-hints/sec-ch-ua.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/critical-ch/echo-hint-in-html.py b/tests/wpt/tests/client-hints/service-workers/critical-ch/echo-hint-in-html.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/critical-ch/echo-hint-in-html.py rename to tests/wpt/tests/client-hints/service-workers/critical-ch/echo-hint-in-html.py diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/critical-ch/foo.html b/tests/wpt/tests/client-hints/service-workers/critical-ch/foo.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/critical-ch/foo.html rename to tests/wpt/tests/client-hints/service-workers/critical-ch/foo.html diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/critical-ch/foo.html.headers b/tests/wpt/tests/client-hints/service-workers/critical-ch/foo.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/critical-ch/foo.html.headers rename to tests/wpt/tests/client-hints/service-workers/critical-ch/foo.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/critical-ch/intercept-request.js b/tests/wpt/tests/client-hints/service-workers/critical-ch/intercept-request.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/critical-ch/intercept-request.js rename to tests/wpt/tests/client-hints/service-workers/critical-ch/intercept-request.js diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/critical-ch/navigation-preload.js b/tests/wpt/tests/client-hints/service-workers/critical-ch/navigation-preload.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/critical-ch/navigation-preload.js rename to tests/wpt/tests/client-hints/service-workers/critical-ch/navigation-preload.js diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/critical-ch/new-request.js b/tests/wpt/tests/client-hints/service-workers/critical-ch/new-request.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/critical-ch/new-request.js rename to tests/wpt/tests/client-hints/service-workers/critical-ch/new-request.js diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/critical-ch/passthrough-request.js b/tests/wpt/tests/client-hints/service-workers/critical-ch/passthrough-request.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/critical-ch/passthrough-request.js rename to tests/wpt/tests/client-hints/service-workers/critical-ch/passthrough-request.js diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/intercept-request-critical.https.window.js b/tests/wpt/tests/client-hints/service-workers/intercept-request-critical.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/intercept-request-critical.https.window.js rename to tests/wpt/tests/client-hints/service-workers/intercept-request-critical.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/intercept-request.https.html b/tests/wpt/tests/client-hints/service-workers/intercept-request.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/intercept-request.https.html rename to tests/wpt/tests/client-hints/service-workers/intercept-request.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/intercept-request.https.html.headers b/tests/wpt/tests/client-hints/service-workers/intercept-request.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/intercept-request.https.html.headers rename to tests/wpt/tests/client-hints/service-workers/intercept-request.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/navigation-preload-critical.https.window.js b/tests/wpt/tests/client-hints/service-workers/navigation-preload-critical.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/navigation-preload-critical.https.window.js rename to tests/wpt/tests/client-hints/service-workers/navigation-preload-critical.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/navigation-preload.https.html b/tests/wpt/tests/client-hints/service-workers/navigation-preload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/navigation-preload.https.html rename to tests/wpt/tests/client-hints/service-workers/navigation-preload.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/navigation-preload.https.html.headers b/tests/wpt/tests/client-hints/service-workers/navigation-preload.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/navigation-preload.https.html.headers rename to tests/wpt/tests/client-hints/service-workers/navigation-preload.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/new-request-critical.https.window.js b/tests/wpt/tests/client-hints/service-workers/new-request-critical.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/new-request-critical.https.window.js rename to tests/wpt/tests/client-hints/service-workers/new-request-critical.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/new-request.https.html b/tests/wpt/tests/client-hints/service-workers/new-request.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/new-request.https.html rename to tests/wpt/tests/client-hints/service-workers/new-request.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/new-request.https.html.headers b/tests/wpt/tests/client-hints/service-workers/new-request.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/new-request.https.html.headers rename to tests/wpt/tests/client-hints/service-workers/new-request.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/passthrough-request-critical.https.window.js b/tests/wpt/tests/client-hints/service-workers/passthrough-request-critical.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/passthrough-request-critical.https.window.js rename to tests/wpt/tests/client-hints/service-workers/passthrough-request-critical.https.window.js diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/passthrough-request.https.html b/tests/wpt/tests/client-hints/service-workers/passthrough-request.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/passthrough-request.https.html rename to tests/wpt/tests/client-hints/service-workers/passthrough-request.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/passthrough-request.https.html.headers b/tests/wpt/tests/client-hints/service-workers/passthrough-request.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/passthrough-request.https.html.headers rename to tests/wpt/tests/client-hints/service-workers/passthrough-request.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/resources/echo-hint-in-html.py b/tests/wpt/tests/client-hints/service-workers/resources/echo-hint-in-html.py similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/resources/echo-hint-in-html.py rename to tests/wpt/tests/client-hints/service-workers/resources/echo-hint-in-html.py diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/resources/foo.html b/tests/wpt/tests/client-hints/service-workers/resources/foo.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/resources/foo.html rename to tests/wpt/tests/client-hints/service-workers/resources/foo.html diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/resources/intercept-request.js b/tests/wpt/tests/client-hints/service-workers/resources/intercept-request.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/resources/intercept-request.js rename to tests/wpt/tests/client-hints/service-workers/resources/intercept-request.js diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/resources/navigation-preload.js b/tests/wpt/tests/client-hints/service-workers/resources/navigation-preload.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/resources/navigation-preload.js rename to tests/wpt/tests/client-hints/service-workers/resources/navigation-preload.js diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/resources/new-request.js b/tests/wpt/tests/client-hints/service-workers/resources/new-request.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/resources/new-request.js rename to tests/wpt/tests/client-hints/service-workers/resources/new-request.js diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/resources/passthrough-request.js b/tests/wpt/tests/client-hints/service-workers/resources/passthrough-request.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/resources/passthrough-request.js rename to tests/wpt/tests/client-hints/service-workers/resources/passthrough-request.js diff --git a/tests/wpt/web-platform-tests/client-hints/service-workers/resources/util.js b/tests/wpt/tests/client-hints/service-workers/resources/util.js similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/service-workers/resources/util.js rename to tests/wpt/tests/client-hints/service-workers/resources/util.js diff --git a/tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-iframe.https.html b/tests/wpt/tests/client-hints/viewport-size/viewport-size-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-iframe.https.html rename to tests/wpt/tests/client-hints/viewport-size/viewport-size-iframe.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-iframe.https.html.headers b/tests/wpt/tests/client-hints/viewport-size/viewport-size-iframe.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-iframe.https.html.headers rename to tests/wpt/tests/client-hints/viewport-size/viewport-size-iframe.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-subresource.https.html b/tests/wpt/tests/client-hints/viewport-size/viewport-size-subresource.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-subresource.https.html rename to tests/wpt/tests/client-hints/viewport-size/viewport-size-subresource.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-subresource.https.html.headers b/tests/wpt/tests/client-hints/viewport-size/viewport-size-subresource.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-subresource.https.html.headers rename to tests/wpt/tests/client-hints/viewport-size/viewport-size-subresource.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-window-different-dimensions.https.html b/tests/wpt/tests/client-hints/viewport-size/viewport-size-window-different-dimensions.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-window-different-dimensions.https.html rename to tests/wpt/tests/client-hints/viewport-size/viewport-size-window-different-dimensions.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-window-different-dimensions.https.html.headers b/tests/wpt/tests/client-hints/viewport-size/viewport-size-window-different-dimensions.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-window-different-dimensions.https.html.headers rename to tests/wpt/tests/client-hints/viewport-size/viewport-size-window-different-dimensions.https.html.headers diff --git a/tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-window.https.html b/tests/wpt/tests/client-hints/viewport-size/viewport-size-window.https.html similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-window.https.html rename to tests/wpt/tests/client-hints/viewport-size/viewport-size-window.https.html diff --git a/tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-window.https.html.headers b/tests/wpt/tests/client-hints/viewport-size/viewport-size-window.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/client-hints/viewport-size/viewport-size-window.https.html.headers rename to tests/wpt/tests/client-hints/viewport-size/viewport-size-window.https.html.headers diff --git a/tests/wpt/web-platform-tests/clipboard-apis/META.yml b/tests/wpt/tests/clipboard-apis/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/META.yml rename to tests/wpt/tests/clipboard-apis/META.yml diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-custom-formats-write-fail.tentative.https.html b/tests/wpt/tests/clipboard-apis/async-custom-formats-write-fail.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-custom-formats-write-fail.tentative.https.html rename to tests/wpt/tests/clipboard-apis/async-custom-formats-write-fail.tentative.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-custom-formats-write-read-web-prefix.tentative.https.html b/tests/wpt/tests/clipboard-apis/async-custom-formats-write-read-web-prefix.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-custom-formats-write-read-web-prefix.tentative.https.html rename to tests/wpt/tests/clipboard-apis/async-custom-formats-write-read-web-prefix.tentative.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-custom-formats-write-read-without-web-prefix.tentative.https.html b/tests/wpt/tests/clipboard-apis/async-custom-formats-write-read-without-web-prefix.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-custom-formats-write-read-without-web-prefix.tentative.https.html rename to tests/wpt/tests/clipboard-apis/async-custom-formats-write-read-without-web-prefix.tentative.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-custom-formats-write-read.tentative.https.html b/tests/wpt/tests/clipboard-apis/async-custom-formats-write-read.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-custom-formats-write-read.tentative.https.html rename to tests/wpt/tests/clipboard-apis/async-custom-formats-write-read.tentative.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-html-script-removal.https.html b/tests/wpt/tests/clipboard-apis/async-html-script-removal.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-html-script-removal.https.html rename to tests/wpt/tests/clipboard-apis/async-html-script-removal.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-basics.https.html b/tests/wpt/tests/clipboard-apis/async-navigator-clipboard-basics.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-basics.https.html rename to tests/wpt/tests/clipboard-apis/async-navigator-clipboard-basics.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-read-resource-load.https.html b/tests/wpt/tests/clipboard-apis/async-navigator-clipboard-read-resource-load.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-read-resource-load.https.html rename to tests/wpt/tests/clipboard-apis/async-navigator-clipboard-read-resource-load.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-read-sanitize.https.html b/tests/wpt/tests/clipboard-apis/async-navigator-clipboard-read-sanitize.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-read-sanitize.https.html rename to tests/wpt/tests/clipboard-apis/async-navigator-clipboard-read-sanitize.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-write-multiple.tentative.https.sub.html b/tests/wpt/tests/clipboard-apis/async-navigator-clipboard-write-multiple.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-write-multiple.tentative.https.sub.html rename to tests/wpt/tests/clipboard-apis/async-navigator-clipboard-write-multiple.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-promise-write-blobs-read-blobs.https.html b/tests/wpt/tests/clipboard-apis/async-promise-write-blobs-read-blobs.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-promise-write-blobs-read-blobs.https.html rename to tests/wpt/tests/clipboard-apis/async-promise-write-blobs-read-blobs.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-svg-script-removal.https.html b/tests/wpt/tests/clipboard-apis/async-svg-script-removal.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-svg-script-removal.https.html rename to tests/wpt/tests/clipboard-apis/async-svg-script-removal.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-unsanitized-html-formats-write-read.tentative.https.html b/tests/wpt/tests/clipboard-apis/async-unsanitized-html-formats-write-read.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-unsanitized-html-formats-write-read.tentative.https.html rename to tests/wpt/tests/clipboard-apis/async-unsanitized-html-formats-write-read.tentative.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-unsanitized-plaintext-formats-write-read.tentative.https.html b/tests/wpt/tests/clipboard-apis/async-unsanitized-plaintext-formats-write-read.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-unsanitized-plaintext-formats-write-read.tentative.https.html rename to tests/wpt/tests/clipboard-apis/async-unsanitized-plaintext-formats-write-read.tentative.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-unsanitized-standard-html-formats-write-read.tentative.https.html b/tests/wpt/tests/clipboard-apis/async-unsanitized-standard-html-formats-write-read.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-unsanitized-standard-html-formats-write-read.tentative.https.html rename to tests/wpt/tests/clipboard-apis/async-unsanitized-standard-html-formats-write-read.tentative.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-unsanitized-standard-html-read-fail.tentative.https.html b/tests/wpt/tests/clipboard-apis/async-unsanitized-standard-html-read-fail.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-unsanitized-standard-html-read-fail.tentative.https.html rename to tests/wpt/tests/clipboard-apis/async-unsanitized-standard-html-read-fail.tentative.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-write-blobs-read-blobs.https.html b/tests/wpt/tests/clipboard-apis/async-write-blobs-read-blobs.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-write-blobs-read-blobs.https.html rename to tests/wpt/tests/clipboard-apis/async-write-blobs-read-blobs.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-write-html-read-html.https.html b/tests/wpt/tests/clipboard-apis/async-write-html-read-html.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-write-html-read-html.https.html rename to tests/wpt/tests/clipboard-apis/async-write-html-read-html.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-write-image-read-image.https.html b/tests/wpt/tests/clipboard-apis/async-write-image-read-image.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-write-image-read-image.https.html rename to tests/wpt/tests/clipboard-apis/async-write-image-read-image.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-write-svg-read-svg.https.html b/tests/wpt/tests/clipboard-apis/async-write-svg-read-svg.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/async-write-svg-read-svg.https.html rename to tests/wpt/tests/clipboard-apis/async-write-svg-read-svg.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/clipboard-events-synthetic.html b/tests/wpt/tests/clipboard-apis/clipboard-events-synthetic.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/clipboard-events-synthetic.html rename to tests/wpt/tests/clipboard-apis/clipboard-events-synthetic.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/clipboard-file-manual.html b/tests/wpt/tests/clipboard-apis/clipboard-file-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/clipboard-file-manual.html rename to tests/wpt/tests/clipboard-apis/clipboard-file-manual.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/clipboard-item.https.html b/tests/wpt/tests/clipboard-apis/clipboard-item.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/clipboard-item.https.html rename to tests/wpt/tests/clipboard-apis/clipboard-item.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/clipboard-on-detached-iframe.https.html b/tests/wpt/tests/clipboard-apis/detached-iframe/clipboard-on-detached-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/clipboard-on-detached-iframe.https.html rename to tests/wpt/tests/clipboard-apis/detached-iframe/clipboard-on-detached-iframe.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/read-on-detaching-iframe.https.html b/tests/wpt/tests/clipboard-apis/detached-iframe/read-on-detaching-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/read-on-detaching-iframe.https.html rename to tests/wpt/tests/clipboard-apis/detached-iframe/read-on-detaching-iframe.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/write-on-detaching-iframe.https.html b/tests/wpt/tests/clipboard-apis/detached-iframe/write-on-detaching-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/write-on-detaching-iframe.https.html rename to tests/wpt/tests/clipboard-apis/detached-iframe/write-on-detaching-iframe.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/write-read-on-detached-iframe.https.html b/tests/wpt/tests/clipboard-apis/detached-iframe/write-read-on-detached-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/write-read-on-detached-iframe.https.html rename to tests/wpt/tests/clipboard-apis/detached-iframe/write-read-on-detached-iframe.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/writeText-readText-on-detached-iframe.https.html b/tests/wpt/tests/clipboard-apis/detached-iframe/writeText-readText-on-detached-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/writeText-readText-on-detached-iframe.https.html rename to tests/wpt/tests/clipboard-apis/detached-iframe/writeText-readText-on-detached-iframe.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/events/copy-event.html b/tests/wpt/tests/clipboard-apis/events/copy-event.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/events/copy-event.html rename to tests/wpt/tests/clipboard-apis/events/copy-event.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/events/cut-event-manual.html b/tests/wpt/tests/clipboard-apis/events/cut-event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/events/cut-event-manual.html rename to tests/wpt/tests/clipboard-apis/events/cut-event-manual.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/events/paste-event-manual.html b/tests/wpt/tests/clipboard-apis/events/paste-event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/events/paste-event-manual.html rename to tests/wpt/tests/clipboard-apis/events/paste-event-manual.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-disabled-by-feature-policy.tentative.https.sub.html b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-disabled-by-feature-policy.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-disabled-by-feature-policy.tentative.https.sub.html rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-disabled-by-feature-policy.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-disabled-by-feature-policy.tentative.https.sub.html.headers b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-disabled-by-feature-policy.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-disabled-by-feature-policy.tentative.https.sub.html.headers rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-disabled-by-feature-policy.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-attribute-cross-origin-tentative.https.sub.html b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-attribute-cross-origin-tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-attribute-cross-origin-tentative.https.sub.html rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-attribute-cross-origin-tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-attribute-tentative.https.sub.html b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-attribute-tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-attribute-tentative.https.sub.html rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-attribute-tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-cross-origin-tentative.https.sub.html b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-cross-origin-tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-cross-origin-tentative.https.sub.html rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-cross-origin-tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-cross-origin.tentative.https.sub.html.headers b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-cross-origin.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-cross-origin.tentative.https.sub.html.headers rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy-cross-origin.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy.tentative.https.sub.html b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy.tentative.https.sub.html rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy.tentative.https.sub.html.headers b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy.tentative.https.sub.html.headers rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html.headers b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html.headers rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-disabled-by-feature-policy.tentative.https.sub.html b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-disabled-by-feature-policy.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-disabled-by-feature-policy.tentative.https.sub.html rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-disabled-by-feature-policy.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-disabled-by-feature-policy.tentative.https.sub.html.headers b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-disabled-by-feature-policy.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-disabled-by-feature-policy.tentative.https.sub.html.headers rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-disabled-by-feature-policy.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-attribute-cross-origin-tentative.https.sub.html b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-attribute-cross-origin-tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-attribute-cross-origin-tentative.https.sub.html rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-attribute-cross-origin-tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-attribute-tentative.https.sub.html b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-attribute-tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-attribute-tentative.https.sub.html rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-attribute-tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-cross-origin-tentative.https.sub.html b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-cross-origin-tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-cross-origin-tentative.https.sub.html rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-cross-origin-tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-cross-origin.tentative.https.sub.html.headers b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-cross-origin.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-cross-origin.tentative.https.sub.html.headers rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy-cross-origin.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy.tentative.https.sub.html b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy.tentative.https.sub.html rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy.tentative.https.sub.html.headers b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy.tentative.https.sub.html.headers rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html.headers b/tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html.headers rename to tests/wpt/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/clipboard-apis/idlharness.https.window.js b/tests/wpt/tests/clipboard-apis/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/idlharness.https.window.js rename to tests/wpt/tests/clipboard-apis/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/clipboard-apis/permissions/readText-denied.https.html b/tests/wpt/tests/clipboard-apis/permissions/readText-denied.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/permissions/readText-denied.https.html rename to tests/wpt/tests/clipboard-apis/permissions/readText-denied.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/permissions/readText-granted.https.html b/tests/wpt/tests/clipboard-apis/permissions/readText-granted.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/permissions/readText-granted.https.html rename to tests/wpt/tests/clipboard-apis/permissions/readText-granted.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/permissions/writeText-denied.https.html b/tests/wpt/tests/clipboard-apis/permissions/writeText-denied.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/permissions/writeText-denied.https.html rename to tests/wpt/tests/clipboard-apis/permissions/writeText-denied.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/permissions/writeText-granted.https.html b/tests/wpt/tests/clipboard-apis/permissions/writeText-granted.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/permissions/writeText-granted.https.html rename to tests/wpt/tests/clipboard-apis/permissions/writeText-granted.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/resources/copied-file.txt b/tests/wpt/tests/clipboard-apis/resources/copied-file.txt similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/resources/copied-file.txt rename to tests/wpt/tests/clipboard-apis/resources/copied-file.txt diff --git a/tests/wpt/web-platform-tests/clipboard-apis/resources/greenbox.png b/tests/wpt/tests/clipboard-apis/resources/greenbox.png similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/resources/greenbox.png rename to tests/wpt/tests/clipboard-apis/resources/greenbox.png diff --git a/tests/wpt/web-platform-tests/clipboard-apis/resources/page.html b/tests/wpt/tests/clipboard-apis/resources/page.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/resources/page.html rename to tests/wpt/tests/clipboard-apis/resources/page.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/resources/user-activation.js b/tests/wpt/tests/clipboard-apis/resources/user-activation.js similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/resources/user-activation.js rename to tests/wpt/tests/clipboard-apis/resources/user-activation.js diff --git a/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-write-read.https.html b/tests/wpt/tests/clipboard-apis/text-write-read/async-write-read.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-write-read.https.html rename to tests/wpt/tests/clipboard-apis/text-write-read/async-write-read.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-write-readText.https.html b/tests/wpt/tests/clipboard-apis/text-write-read/async-write-readText.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-write-readText.https.html rename to tests/wpt/tests/clipboard-apis/text-write-read/async-write-readText.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-writeText-read.https.html b/tests/wpt/tests/clipboard-apis/text-write-read/async-writeText-read.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-writeText-read.https.html rename to tests/wpt/tests/clipboard-apis/text-write-read/async-writeText-read.https.html diff --git a/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-writeText-readText.https.html b/tests/wpt/tests/clipboard-apis/text-write-read/async-writeText-readText.https.html similarity index 100% rename from tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-writeText-readText.https.html rename to tests/wpt/tests/clipboard-apis/text-write-read/async-writeText-readText.https.html diff --git a/tests/wpt/web-platform-tests/close-watcher/META.yml b/tests/wpt/tests/close-watcher/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/close-watcher/META.yml rename to tests/wpt/tests/close-watcher/META.yml diff --git a/tests/wpt/web-platform-tests/close-watcher/abortsignal.html b/tests/wpt/tests/close-watcher/abortsignal.html similarity index 100% rename from tests/wpt/web-platform-tests/close-watcher/abortsignal.html rename to tests/wpt/tests/close-watcher/abortsignal.html diff --git a/tests/wpt/web-platform-tests/close-watcher/after-other-listeners.html b/tests/wpt/tests/close-watcher/after-other-listeners.html similarity index 100% rename from tests/wpt/web-platform-tests/close-watcher/after-other-listeners.html rename to tests/wpt/tests/close-watcher/after-other-listeners.html diff --git a/tests/wpt/web-platform-tests/close-watcher/basic.html b/tests/wpt/tests/close-watcher/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/close-watcher/basic.html rename to tests/wpt/tests/close-watcher/basic.html diff --git a/tests/wpt/web-platform-tests/close-watcher/frame-removal.html b/tests/wpt/tests/close-watcher/frame-removal.html similarity index 100% rename from tests/wpt/web-platform-tests/close-watcher/frame-removal.html rename to tests/wpt/tests/close-watcher/frame-removal.html diff --git a/tests/wpt/web-platform-tests/close-watcher/resources/helpers.js b/tests/wpt/tests/close-watcher/resources/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/close-watcher/resources/helpers.js rename to tests/wpt/tests/close-watcher/resources/helpers.js diff --git a/tests/wpt/web-platform-tests/close-watcher/user-activation-multiple-plus-free.html b/tests/wpt/tests/close-watcher/user-activation-multiple-plus-free.html similarity index 100% rename from tests/wpt/web-platform-tests/close-watcher/user-activation-multiple-plus-free.html rename to tests/wpt/tests/close-watcher/user-activation-multiple-plus-free.html diff --git a/tests/wpt/web-platform-tests/close-watcher/user-activation.html b/tests/wpt/tests/close-watcher/user-activation.html similarity index 100% rename from tests/wpt/web-platform-tests/close-watcher/user-activation.html rename to tests/wpt/tests/close-watcher/user-activation.html diff --git a/tests/wpt/web-platform-tests/common/CustomCorsResponse.py b/tests/wpt/tests/common/CustomCorsResponse.py similarity index 100% rename from tests/wpt/web-platform-tests/common/CustomCorsResponse.py rename to tests/wpt/tests/common/CustomCorsResponse.py diff --git a/tests/wpt/web-platform-tests/common/META.yml b/tests/wpt/tests/common/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/common/META.yml rename to tests/wpt/tests/common/META.yml diff --git a/tests/wpt/web-platform-tests/common/PrefixedLocalStorage.js b/tests/wpt/tests/common/PrefixedLocalStorage.js similarity index 100% rename from tests/wpt/web-platform-tests/common/PrefixedLocalStorage.js rename to tests/wpt/tests/common/PrefixedLocalStorage.js diff --git a/tests/wpt/web-platform-tests/common/PrefixedLocalStorage.js.headers b/tests/wpt/tests/common/PrefixedLocalStorage.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/common/PrefixedLocalStorage.js.headers rename to tests/wpt/tests/common/PrefixedLocalStorage.js.headers diff --git a/tests/wpt/web-platform-tests/common/PrefixedPostMessage.js b/tests/wpt/tests/common/PrefixedPostMessage.js similarity index 100% rename from tests/wpt/web-platform-tests/common/PrefixedPostMessage.js rename to tests/wpt/tests/common/PrefixedPostMessage.js diff --git a/tests/wpt/web-platform-tests/common/PrefixedPostMessage.js.headers b/tests/wpt/tests/common/PrefixedPostMessage.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/common/PrefixedPostMessage.js.headers rename to tests/wpt/tests/common/PrefixedPostMessage.js.headers diff --git a/tests/wpt/web-platform-tests/common/README.md b/tests/wpt/tests/common/README.md similarity index 100% rename from tests/wpt/web-platform-tests/common/README.md rename to tests/wpt/tests/common/README.md diff --git a/tests/wpt/web-platform-tests/common/__init__.py b/tests/wpt/tests/common/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/common/__init__.py rename to tests/wpt/tests/common/__init__.py diff --git a/tests/wpt/web-platform-tests/common/arrays.js b/tests/wpt/tests/common/arrays.js similarity index 100% rename from tests/wpt/web-platform-tests/common/arrays.js rename to tests/wpt/tests/common/arrays.js diff --git a/tests/wpt/web-platform-tests/common/blank-with-cors.html b/tests/wpt/tests/common/blank-with-cors.html similarity index 100% rename from tests/wpt/web-platform-tests/common/blank-with-cors.html rename to tests/wpt/tests/common/blank-with-cors.html diff --git a/tests/wpt/web-platform-tests/common/blank-with-cors.html.headers b/tests/wpt/tests/common/blank-with-cors.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/common/blank-with-cors.html.headers rename to tests/wpt/tests/common/blank-with-cors.html.headers diff --git a/tests/wpt/web-platform-tests/common/blank.html b/tests/wpt/tests/common/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/common/blank.html rename to tests/wpt/tests/common/blank.html diff --git a/tests/wpt/web-platform-tests/common/custom-cors-response.js b/tests/wpt/tests/common/custom-cors-response.js similarity index 100% rename from tests/wpt/web-platform-tests/common/custom-cors-response.js rename to tests/wpt/tests/common/custom-cors-response.js diff --git a/tests/wpt/web-platform-tests/common/dispatcher/README.md b/tests/wpt/tests/common/dispatcher/README.md similarity index 100% rename from tests/wpt/web-platform-tests/common/dispatcher/README.md rename to tests/wpt/tests/common/dispatcher/README.md diff --git a/tests/wpt/web-platform-tests/common/dispatcher/dispatcher.js b/tests/wpt/tests/common/dispatcher/dispatcher.js similarity index 100% rename from tests/wpt/web-platform-tests/common/dispatcher/dispatcher.js rename to tests/wpt/tests/common/dispatcher/dispatcher.js diff --git a/tests/wpt/web-platform-tests/common/dispatcher/dispatcher.py b/tests/wpt/tests/common/dispatcher/dispatcher.py similarity index 100% rename from tests/wpt/web-platform-tests/common/dispatcher/dispatcher.py rename to tests/wpt/tests/common/dispatcher/dispatcher.py diff --git a/tests/wpt/web-platform-tests/common/dispatcher/executor-service-worker.js b/tests/wpt/tests/common/dispatcher/executor-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/common/dispatcher/executor-service-worker.js rename to tests/wpt/tests/common/dispatcher/executor-service-worker.js diff --git a/tests/wpt/web-platform-tests/common/dispatcher/executor-worker.js b/tests/wpt/tests/common/dispatcher/executor-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/common/dispatcher/executor-worker.js rename to tests/wpt/tests/common/dispatcher/executor-worker.js diff --git a/tests/wpt/web-platform-tests/common/dispatcher/executor.html b/tests/wpt/tests/common/dispatcher/executor.html similarity index 100% rename from tests/wpt/web-platform-tests/common/dispatcher/executor.html rename to tests/wpt/tests/common/dispatcher/executor.html diff --git a/tests/wpt/web-platform-tests/common/dispatcher/remote-executor.html b/tests/wpt/tests/common/dispatcher/remote-executor.html similarity index 100% rename from tests/wpt/web-platform-tests/common/dispatcher/remote-executor.html rename to tests/wpt/tests/common/dispatcher/remote-executor.html diff --git a/tests/wpt/web-platform-tests/common/domain-setter.sub.html b/tests/wpt/tests/common/domain-setter.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/common/domain-setter.sub.html rename to tests/wpt/tests/common/domain-setter.sub.html diff --git a/tests/wpt/web-platform-tests/common/dummy.xhtml b/tests/wpt/tests/common/dummy.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/common/dummy.xhtml rename to tests/wpt/tests/common/dummy.xhtml diff --git a/tests/wpt/web-platform-tests/common/dummy.xml b/tests/wpt/tests/common/dummy.xml similarity index 100% rename from tests/wpt/web-platform-tests/common/dummy.xml rename to tests/wpt/tests/common/dummy.xml diff --git a/tests/wpt/web-platform-tests/common/echo.py b/tests/wpt/tests/common/echo.py similarity index 100% rename from tests/wpt/web-platform-tests/common/echo.py rename to tests/wpt/tests/common/echo.py diff --git a/tests/wpt/web-platform-tests/common/gc.js b/tests/wpt/tests/common/gc.js similarity index 100% rename from tests/wpt/web-platform-tests/common/gc.js rename to tests/wpt/tests/common/gc.js diff --git a/tests/wpt/web-platform-tests/common/get-host-info.sub.js b/tests/wpt/tests/common/get-host-info.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/common/get-host-info.sub.js rename to tests/wpt/tests/common/get-host-info.sub.js diff --git a/tests/wpt/web-platform-tests/common/get-host-info.sub.js.headers b/tests/wpt/tests/common/get-host-info.sub.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/common/get-host-info.sub.js.headers rename to tests/wpt/tests/common/get-host-info.sub.js.headers diff --git a/tests/wpt/web-platform-tests/common/media.js b/tests/wpt/tests/common/media.js similarity index 100% rename from tests/wpt/web-platform-tests/common/media.js rename to tests/wpt/tests/common/media.js diff --git a/tests/wpt/web-platform-tests/common/media.js.headers b/tests/wpt/tests/common/media.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/common/media.js.headers rename to tests/wpt/tests/common/media.js.headers diff --git a/tests/wpt/web-platform-tests/common/object-association.js b/tests/wpt/tests/common/object-association.js similarity index 100% rename from tests/wpt/web-platform-tests/common/object-association.js rename to tests/wpt/tests/common/object-association.js diff --git a/tests/wpt/web-platform-tests/common/object-association.js.headers b/tests/wpt/tests/common/object-association.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/common/object-association.js.headers rename to tests/wpt/tests/common/object-association.js.headers diff --git a/tests/wpt/web-platform-tests/common/performance-timeline-utils.js b/tests/wpt/tests/common/performance-timeline-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/common/performance-timeline-utils.js rename to tests/wpt/tests/common/performance-timeline-utils.js diff --git a/tests/wpt/web-platform-tests/common/performance-timeline-utils.js.headers b/tests/wpt/tests/common/performance-timeline-utils.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/common/performance-timeline-utils.js.headers rename to tests/wpt/tests/common/performance-timeline-utils.js.headers diff --git a/tests/wpt/web-platform-tests/common/proxy-all.sub.pac b/tests/wpt/tests/common/proxy-all.sub.pac similarity index 100% rename from tests/wpt/web-platform-tests/common/proxy-all.sub.pac rename to tests/wpt/tests/common/proxy-all.sub.pac diff --git a/tests/wpt/web-platform-tests/common/redirect-opt-in.py b/tests/wpt/tests/common/redirect-opt-in.py similarity index 100% rename from tests/wpt/web-platform-tests/common/redirect-opt-in.py rename to tests/wpt/tests/common/redirect-opt-in.py diff --git a/tests/wpt/web-platform-tests/common/redirect.py b/tests/wpt/tests/common/redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/common/redirect.py rename to tests/wpt/tests/common/redirect.py diff --git a/tests/wpt/web-platform-tests/common/refresh.py b/tests/wpt/tests/common/refresh.py similarity index 100% rename from tests/wpt/web-platform-tests/common/refresh.py rename to tests/wpt/tests/common/refresh.py diff --git a/tests/wpt/web-platform-tests/common/reftest-wait.js b/tests/wpt/tests/common/reftest-wait.js similarity index 100% rename from tests/wpt/web-platform-tests/common/reftest-wait.js rename to tests/wpt/tests/common/reftest-wait.js diff --git a/tests/wpt/web-platform-tests/common/reftest-wait.js.headers b/tests/wpt/tests/common/reftest-wait.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/common/reftest-wait.js.headers rename to tests/wpt/tests/common/reftest-wait.js.headers diff --git a/tests/wpt/web-platform-tests/common/rendering-utils.js b/tests/wpt/tests/common/rendering-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/common/rendering-utils.js rename to tests/wpt/tests/common/rendering-utils.js diff --git a/tests/wpt/web-platform-tests/common/sab.js b/tests/wpt/tests/common/sab.js similarity index 100% rename from tests/wpt/web-platform-tests/common/sab.js rename to tests/wpt/tests/common/sab.js diff --git a/tests/wpt/web-platform-tests/common/security-features/README.md b/tests/wpt/tests/common/security-features/README.md similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/README.md rename to tests/wpt/tests/common/security-features/README.md diff --git a/tests/wpt/web-platform-tests/common/security-features/__init__.py b/tests/wpt/tests/common/security-features/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/__init__.py rename to tests/wpt/tests/common/security-features/__init__.py diff --git a/tests/wpt/web-platform-tests/common/security-features/resources/common.sub.js b/tests/wpt/tests/common/security-features/resources/common.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/resources/common.sub.js rename to tests/wpt/tests/common/security-features/resources/common.sub.js diff --git a/tests/wpt/web-platform-tests/common/security-features/resources/common.sub.js.headers b/tests/wpt/tests/common/security-features/resources/common.sub.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/resources/common.sub.js.headers rename to tests/wpt/tests/common/security-features/resources/common.sub.js.headers diff --git a/tests/wpt/web-platform-tests/common/security-features/scope/__init__.py b/tests/wpt/tests/common/security-features/scope/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/scope/__init__.py rename to tests/wpt/tests/common/security-features/scope/__init__.py diff --git a/tests/wpt/web-platform-tests/common/security-features/scope/document.py b/tests/wpt/tests/common/security-features/scope/document.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/scope/document.py rename to tests/wpt/tests/common/security-features/scope/document.py diff --git a/tests/wpt/web-platform-tests/common/security-features/scope/template/document.html.template b/tests/wpt/tests/common/security-features/scope/template/document.html.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/scope/template/document.html.template rename to tests/wpt/tests/common/security-features/scope/template/document.html.template diff --git a/tests/wpt/web-platform-tests/common/security-features/scope/template/worker.js.template b/tests/wpt/tests/common/security-features/scope/template/worker.js.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/scope/template/worker.js.template rename to tests/wpt/tests/common/security-features/scope/template/worker.js.template diff --git a/tests/wpt/web-platform-tests/common/security-features/scope/util.py b/tests/wpt/tests/common/security-features/scope/util.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/scope/util.py rename to tests/wpt/tests/common/security-features/scope/util.py diff --git a/tests/wpt/web-platform-tests/common/security-features/scope/worker.py b/tests/wpt/tests/common/security-features/scope/worker.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/scope/worker.py rename to tests/wpt/tests/common/security-features/scope/worker.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/__init__.py b/tests/wpt/tests/common/security-features/subresource/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/__init__.py rename to tests/wpt/tests/common/security-features/subresource/__init__.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/audio.py b/tests/wpt/tests/common/security-features/subresource/audio.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/audio.py rename to tests/wpt/tests/common/security-features/subresource/audio.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/document.py b/tests/wpt/tests/common/security-features/subresource/document.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/document.py rename to tests/wpt/tests/common/security-features/subresource/document.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/empty.py b/tests/wpt/tests/common/security-features/subresource/empty.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/empty.py rename to tests/wpt/tests/common/security-features/subresource/empty.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/font.py b/tests/wpt/tests/common/security-features/subresource/font.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/font.py rename to tests/wpt/tests/common/security-features/subresource/font.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/image.py b/tests/wpt/tests/common/security-features/subresource/image.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/image.py rename to tests/wpt/tests/common/security-features/subresource/image.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/referrer.py b/tests/wpt/tests/common/security-features/subresource/referrer.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/referrer.py rename to tests/wpt/tests/common/security-features/subresource/referrer.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/script.py b/tests/wpt/tests/common/security-features/subresource/script.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/script.py rename to tests/wpt/tests/common/security-features/subresource/script.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/shared-worker.py b/tests/wpt/tests/common/security-features/subresource/shared-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/shared-worker.py rename to tests/wpt/tests/common/security-features/subresource/shared-worker.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/static-import.py b/tests/wpt/tests/common/security-features/subresource/static-import.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/static-import.py rename to tests/wpt/tests/common/security-features/subresource/static-import.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/stylesheet.py b/tests/wpt/tests/common/security-features/subresource/stylesheet.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/stylesheet.py rename to tests/wpt/tests/common/security-features/subresource/stylesheet.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/subresource.py b/tests/wpt/tests/common/security-features/subresource/subresource.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/subresource.py rename to tests/wpt/tests/common/security-features/subresource/subresource.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/svg.py b/tests/wpt/tests/common/security-features/subresource/svg.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/svg.py rename to tests/wpt/tests/common/security-features/subresource/svg.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/template/document.html.template b/tests/wpt/tests/common/security-features/subresource/template/document.html.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/template/document.html.template rename to tests/wpt/tests/common/security-features/subresource/template/document.html.template diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/template/font.css.template b/tests/wpt/tests/common/security-features/subresource/template/font.css.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/template/font.css.template rename to tests/wpt/tests/common/security-features/subresource/template/font.css.template diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/template/image.css.template b/tests/wpt/tests/common/security-features/subresource/template/image.css.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/template/image.css.template rename to tests/wpt/tests/common/security-features/subresource/template/image.css.template diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/template/script.js.template b/tests/wpt/tests/common/security-features/subresource/template/script.js.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/template/script.js.template rename to tests/wpt/tests/common/security-features/subresource/template/script.js.template diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/template/shared-worker.js.template b/tests/wpt/tests/common/security-features/subresource/template/shared-worker.js.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/template/shared-worker.js.template rename to tests/wpt/tests/common/security-features/subresource/template/shared-worker.js.template diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/template/static-import.js.template b/tests/wpt/tests/common/security-features/subresource/template/static-import.js.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/template/static-import.js.template rename to tests/wpt/tests/common/security-features/subresource/template/static-import.js.template diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/template/svg.css.template b/tests/wpt/tests/common/security-features/subresource/template/svg.css.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/template/svg.css.template rename to tests/wpt/tests/common/security-features/subresource/template/svg.css.template diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/template/svg.embedded.template b/tests/wpt/tests/common/security-features/subresource/template/svg.embedded.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/template/svg.embedded.template rename to tests/wpt/tests/common/security-features/subresource/template/svg.embedded.template diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/template/worker.js.template b/tests/wpt/tests/common/security-features/subresource/template/worker.js.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/template/worker.js.template rename to tests/wpt/tests/common/security-features/subresource/template/worker.js.template diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/video.py b/tests/wpt/tests/common/security-features/subresource/video.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/video.py rename to tests/wpt/tests/common/security-features/subresource/video.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/worker.py b/tests/wpt/tests/common/security-features/subresource/worker.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/worker.py rename to tests/wpt/tests/common/security-features/subresource/worker.py diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/xhr.py b/tests/wpt/tests/common/security-features/subresource/xhr.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/subresource/xhr.py rename to tests/wpt/tests/common/security-features/subresource/xhr.py diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/format_spec_src_json.py b/tests/wpt/tests/common/security-features/tools/format_spec_src_json.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/tools/format_spec_src_json.py rename to tests/wpt/tests/common/security-features/tools/format_spec_src_json.py diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/generate.py b/tests/wpt/tests/common/security-features/tools/generate.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/tools/generate.py rename to tests/wpt/tests/common/security-features/tools/generate.py diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/spec.src.json b/tests/wpt/tests/common/security-features/tools/spec.src.json similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/tools/spec.src.json rename to tests/wpt/tests/common/security-features/tools/spec.src.json diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/spec_validator.py b/tests/wpt/tests/common/security-features/tools/spec_validator.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/tools/spec_validator.py rename to tests/wpt/tests/common/security-features/tools/spec_validator.py diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/template/disclaimer.template b/tests/wpt/tests/common/security-features/tools/template/disclaimer.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/tools/template/disclaimer.template rename to tests/wpt/tests/common/security-features/tools/template/disclaimer.template diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/template/spec_json.js.template b/tests/wpt/tests/common/security-features/tools/template/spec_json.js.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/tools/template/spec_json.js.template rename to tests/wpt/tests/common/security-features/tools/template/spec_json.js.template diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/template/test.debug.html.template b/tests/wpt/tests/common/security-features/tools/template/test.debug.html.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/tools/template/test.debug.html.template rename to tests/wpt/tests/common/security-features/tools/template/test.debug.html.template diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/template/test.release.html.template b/tests/wpt/tests/common/security-features/tools/template/test.release.html.template similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/tools/template/test.release.html.template rename to tests/wpt/tests/common/security-features/tools/template/test.release.html.template diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/util.py b/tests/wpt/tests/common/security-features/tools/util.py similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/tools/util.py rename to tests/wpt/tests/common/security-features/tools/util.py diff --git a/tests/wpt/web-platform-tests/common/security-features/types.md b/tests/wpt/tests/common/security-features/types.md similarity index 100% rename from tests/wpt/web-platform-tests/common/security-features/types.md rename to tests/wpt/tests/common/security-features/types.md diff --git a/tests/wpt/web-platform-tests/common/slow-redirect.py b/tests/wpt/tests/common/slow-redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/common/slow-redirect.py rename to tests/wpt/tests/common/slow-redirect.py diff --git a/tests/wpt/web-platform-tests/common/slow.py b/tests/wpt/tests/common/slow.py similarity index 100% rename from tests/wpt/web-platform-tests/common/slow.py rename to tests/wpt/tests/common/slow.py diff --git a/tests/wpt/web-platform-tests/common/square.png b/tests/wpt/tests/common/square.png similarity index 100% rename from tests/wpt/web-platform-tests/common/square.png rename to tests/wpt/tests/common/square.png diff --git a/tests/wpt/web-platform-tests/common/stringifiers.js b/tests/wpt/tests/common/stringifiers.js similarity index 100% rename from tests/wpt/web-platform-tests/common/stringifiers.js rename to tests/wpt/tests/common/stringifiers.js diff --git a/tests/wpt/web-platform-tests/common/stringifiers.js.headers b/tests/wpt/tests/common/stringifiers.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/common/stringifiers.js.headers rename to tests/wpt/tests/common/stringifiers.js.headers diff --git a/tests/wpt/web-platform-tests/common/subset-tests-by-key.js b/tests/wpt/tests/common/subset-tests-by-key.js similarity index 100% rename from tests/wpt/web-platform-tests/common/subset-tests-by-key.js rename to tests/wpt/tests/common/subset-tests-by-key.js diff --git a/tests/wpt/web-platform-tests/common/subset-tests.js b/tests/wpt/tests/common/subset-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/common/subset-tests.js rename to tests/wpt/tests/common/subset-tests.js diff --git a/tests/wpt/web-platform-tests/common/test-setting-immutable-prototype.js b/tests/wpt/tests/common/test-setting-immutable-prototype.js similarity index 100% rename from tests/wpt/web-platform-tests/common/test-setting-immutable-prototype.js rename to tests/wpt/tests/common/test-setting-immutable-prototype.js diff --git a/tests/wpt/web-platform-tests/common/test-setting-immutable-prototype.js.headers b/tests/wpt/tests/common/test-setting-immutable-prototype.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/common/test-setting-immutable-prototype.js.headers rename to tests/wpt/tests/common/test-setting-immutable-prototype.js.headers diff --git a/tests/wpt/web-platform-tests/common/text-plain.txt b/tests/wpt/tests/common/text-plain.txt similarity index 100% rename from tests/wpt/web-platform-tests/common/text-plain.txt rename to tests/wpt/tests/common/text-plain.txt diff --git a/tests/wpt/web-platform-tests/common/third_party/reftest-analyzer.xhtml b/tests/wpt/tests/common/third_party/reftest-analyzer.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/common/third_party/reftest-analyzer.xhtml rename to tests/wpt/tests/common/third_party/reftest-analyzer.xhtml diff --git a/tests/wpt/web-platform-tests/common/utils.js b/tests/wpt/tests/common/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/common/utils.js rename to tests/wpt/tests/common/utils.js diff --git a/tests/wpt/web-platform-tests/common/utils.js.headers b/tests/wpt/tests/common/utils.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/common/utils.js.headers rename to tests/wpt/tests/common/utils.js.headers diff --git a/tests/wpt/web-platform-tests/common/window-name-setter.html b/tests/wpt/tests/common/window-name-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/common/window-name-setter.html rename to tests/wpt/tests/common/window-name-setter.html diff --git a/tests/wpt/web-platform-tests/common/worklet-reftest.js b/tests/wpt/tests/common/worklet-reftest.js similarity index 100% rename from tests/wpt/web-platform-tests/common/worklet-reftest.js rename to tests/wpt/tests/common/worklet-reftest.js diff --git a/tests/wpt/web-platform-tests/common/worklet-reftest.js.headers b/tests/wpt/tests/common/worklet-reftest.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/common/worklet-reftest.js.headers rename to tests/wpt/tests/common/worklet-reftest.js.headers diff --git a/tests/wpt/web-platform-tests/compat/META.yml b/tests/wpt/tests/compat/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/compat/META.yml rename to tests/wpt/tests/compat/META.yml diff --git a/tests/wpt/web-platform-tests/compat/css-style-declaration-alias-enumeration.html b/tests/wpt/tests/compat/css-style-declaration-alias-enumeration.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/css-style-declaration-alias-enumeration.html rename to tests/wpt/tests/compat/css-style-declaration-alias-enumeration.html diff --git a/tests/wpt/web-platform-tests/compat/green-ref.html b/tests/wpt/tests/compat/green-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/green-ref.html rename to tests/wpt/tests/compat/green-ref.html diff --git a/tests/wpt/web-platform-tests/compat/historical.html b/tests/wpt/tests/compat/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/historical.html rename to tests/wpt/tests/compat/historical.html diff --git a/tests/wpt/web-platform-tests/compat/idlharness.window.js b/tests/wpt/tests/compat/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/compat/idlharness.window.js rename to tests/wpt/tests/compat/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/compat/webkit-background-origin-text-ref.html b/tests/wpt/tests/compat/webkit-background-origin-text-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-background-origin-text-ref.html rename to tests/wpt/tests/compat/webkit-background-origin-text-ref.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-background-origin-text.html b/tests/wpt/tests/compat/webkit-background-origin-text.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-background-origin-text.html rename to tests/wpt/tests/compat/webkit-background-origin-text.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-clamp-bottom-border-ref.html b/tests/wpt/tests/compat/webkit-box-clamp-bottom-border-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-clamp-bottom-border-ref.html rename to tests/wpt/tests/compat/webkit-box-clamp-bottom-border-ref.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-clamp-bottom-border.html b/tests/wpt/tests/compat/webkit-box-clamp-bottom-border.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-clamp-bottom-border.html rename to tests/wpt/tests/compat/webkit-box-clamp-bottom-border.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-clamp-visibility-change-ref.html b/tests/wpt/tests/compat/webkit-box-clamp-visibility-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-clamp-visibility-change-ref.html rename to tests/wpt/tests/compat/webkit-box-clamp-visibility-change-ref.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-clamp-visibility-change.html b/tests/wpt/tests/compat/webkit-box-clamp-visibility-change.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-clamp-visibility-change.html rename to tests/wpt/tests/compat/webkit-box-clamp-visibility-change.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-fieldset-ref.html b/tests/wpt/tests/compat/webkit-box-fieldset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-fieldset-ref.html rename to tests/wpt/tests/compat/webkit-box-fieldset-ref.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-fieldset.html b/tests/wpt/tests/compat/webkit-box-fieldset.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-fieldset.html rename to tests/wpt/tests/compat/webkit-box-fieldset.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-fixed-position-child.html b/tests/wpt/tests/compat/webkit-box-fixed-position-child.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-fixed-position-child.html rename to tests/wpt/tests/compat/webkit-box-fixed-position-child.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-horizontal-reverse-variants-ref.html b/tests/wpt/tests/compat/webkit-box-horizontal-reverse-variants-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-horizontal-reverse-variants-ref.html rename to tests/wpt/tests/compat/webkit-box-horizontal-reverse-variants-ref.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-horizontal-reverse-variants.html b/tests/wpt/tests/compat/webkit-box-horizontal-reverse-variants.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-horizontal-reverse-variants.html rename to tests/wpt/tests/compat/webkit-box-horizontal-reverse-variants.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-horizontal-rtl-variants-ref.html b/tests/wpt/tests/compat/webkit-box-horizontal-rtl-variants-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-horizontal-rtl-variants-ref.html rename to tests/wpt/tests/compat/webkit-box-horizontal-rtl-variants-ref.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-horizontal-rtl-variants.html b/tests/wpt/tests/compat/webkit-box-horizontal-rtl-variants.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-horizontal-rtl-variants.html rename to tests/wpt/tests/compat/webkit-box-horizontal-rtl-variants.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-ignore-box-pack.html b/tests/wpt/tests/compat/webkit-box-ignore-box-pack.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-ignore-box-pack.html rename to tests/wpt/tests/compat/webkit-box-ignore-box-pack.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-removing-triggering-anonymous-merge.html b/tests/wpt/tests/compat/webkit-box-removing-triggering-anonymous-merge.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-removing-triggering-anonymous-merge.html rename to tests/wpt/tests/compat/webkit-box-removing-triggering-anonymous-merge.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-rtl-flex-ref.html b/tests/wpt/tests/compat/webkit-box-rtl-flex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-rtl-flex-ref.html rename to tests/wpt/tests/compat/webkit-box-rtl-flex-ref.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-rtl-flex.html b/tests/wpt/tests/compat/webkit-box-rtl-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-rtl-flex.html rename to tests/wpt/tests/compat/webkit-box-rtl-flex.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-box-vertically-centered.html b/tests/wpt/tests/compat/webkit-box-vertically-centered.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-box-vertically-centered.html rename to tests/wpt/tests/compat/webkit-box-vertically-centered.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-gradient-comma.html b/tests/wpt/tests/compat/webkit-gradient-comma.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-gradient-comma.html rename to tests/wpt/tests/compat/webkit-gradient-comma.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-linear-gradient-diff-unprefixed-ref.html b/tests/wpt/tests/compat/webkit-linear-gradient-diff-unprefixed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-linear-gradient-diff-unprefixed-ref.html rename to tests/wpt/tests/compat/webkit-linear-gradient-diff-unprefixed-ref.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-linear-gradient-diff-unprefixed.html b/tests/wpt/tests/compat/webkit-linear-gradient-diff-unprefixed.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-linear-gradient-diff-unprefixed.html rename to tests/wpt/tests/compat/webkit-linear-gradient-diff-unprefixed.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-linear-gradient-line-bottom.html b/tests/wpt/tests/compat/webkit-linear-gradient-line-bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-linear-gradient-line-bottom.html rename to tests/wpt/tests/compat/webkit-linear-gradient-line-bottom.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-linear-gradient-line-left.html b/tests/wpt/tests/compat/webkit-linear-gradient-line-left.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-linear-gradient-line-left.html rename to tests/wpt/tests/compat/webkit-linear-gradient-line-left.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-linear-gradient-line-right.html b/tests/wpt/tests/compat/webkit-linear-gradient-line-right.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-linear-gradient-line-right.html rename to tests/wpt/tests/compat/webkit-linear-gradient-line-right.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-linear-gradient-line-top.html b/tests/wpt/tests/compat/webkit-linear-gradient-line-top.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-linear-gradient-line-top.html rename to tests/wpt/tests/compat/webkit-linear-gradient-line-top.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-mask-box-enumeration.html b/tests/wpt/tests/compat/webkit-mask-box-enumeration.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-mask-box-enumeration.html rename to tests/wpt/tests/compat/webkit-mask-box-enumeration.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-radial-gradient-radii.html b/tests/wpt/tests/compat/webkit-radial-gradient-radii.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-radial-gradient-radii.html rename to tests/wpt/tests/compat/webkit-radial-gradient-radii.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-currentColor.html b/tests/wpt/tests/compat/webkit-text-fill-color-currentColor.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-currentColor.html rename to tests/wpt/tests/compat/webkit-text-fill-color-currentColor.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-001-ref.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-001-ref.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-001-ref.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-001a.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-001a.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-001a.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-001b.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-001b.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-001b.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-001c.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-001c.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-001c.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-001c.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-001d.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-001d.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-001d.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-001d.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-002-ref.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-002-ref.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-002-ref.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-002.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-002.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-002.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-002.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-003-ref.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-003-ref.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-003-ref.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-003.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-003.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-003.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-003.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-004-ref.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-004-ref.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-004-ref.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-004.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-004.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-004.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-004.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-005-ref.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-005-ref.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-005-ref.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-005.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-005.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-005.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-005.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-006-ref.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-006-ref.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-006-ref.html diff --git a/tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-006.html b/tests/wpt/tests/compat/webkit-text-fill-color-property-006.html similarity index 100% rename from tests/wpt/web-platform-tests/compat/webkit-text-fill-color-property-006.html rename to tests/wpt/tests/compat/webkit-text-fill-color-property-006.html diff --git a/tests/wpt/web-platform-tests/compression/META.yml b/tests/wpt/tests/compression/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/compression/META.yml rename to tests/wpt/tests/compression/META.yml diff --git a/tests/wpt/web-platform-tests/compression/compression-bad-chunks.tentative.any.js b/tests/wpt/tests/compression/compression-bad-chunks.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/compression-bad-chunks.tentative.any.js rename to tests/wpt/tests/compression/compression-bad-chunks.tentative.any.js diff --git a/tests/wpt/web-platform-tests/compression/compression-constructor-error.tentative.any.js b/tests/wpt/tests/compression/compression-constructor-error.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/compression-constructor-error.tentative.any.js rename to tests/wpt/tests/compression/compression-constructor-error.tentative.any.js diff --git a/tests/wpt/web-platform-tests/compression/compression-including-empty-chunk.tentative.any.js b/tests/wpt/tests/compression/compression-including-empty-chunk.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/compression-including-empty-chunk.tentative.any.js rename to tests/wpt/tests/compression/compression-including-empty-chunk.tentative.any.js diff --git a/tests/wpt/web-platform-tests/compression/compression-large-flush-output.any.js b/tests/wpt/tests/compression/compression-large-flush-output.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/compression-large-flush-output.any.js rename to tests/wpt/tests/compression/compression-large-flush-output.any.js diff --git a/tests/wpt/web-platform-tests/compression/compression-multiple-chunks.tentative.any.js b/tests/wpt/tests/compression/compression-multiple-chunks.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/compression-multiple-chunks.tentative.any.js rename to tests/wpt/tests/compression/compression-multiple-chunks.tentative.any.js diff --git a/tests/wpt/web-platform-tests/compression/compression-output-length.tentative.any.js b/tests/wpt/tests/compression/compression-output-length.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/compression-output-length.tentative.any.js rename to tests/wpt/tests/compression/compression-output-length.tentative.any.js diff --git a/tests/wpt/web-platform-tests/compression/compression-stream.tentative.any.js b/tests/wpt/tests/compression/compression-stream.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/compression-stream.tentative.any.js rename to tests/wpt/tests/compression/compression-stream.tentative.any.js diff --git a/tests/wpt/web-platform-tests/compression/compression-with-detach.tentative.window.js b/tests/wpt/tests/compression/compression-with-detach.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/compression-with-detach.tentative.window.js rename to tests/wpt/tests/compression/compression-with-detach.tentative.window.js diff --git a/tests/wpt/web-platform-tests/compression/decompression-bad-chunks.tentative.any.js b/tests/wpt/tests/compression/decompression-bad-chunks.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/decompression-bad-chunks.tentative.any.js rename to tests/wpt/tests/compression/decompression-bad-chunks.tentative.any.js diff --git a/tests/wpt/web-platform-tests/compression/decompression-buffersource.tentative.any.js b/tests/wpt/tests/compression/decompression-buffersource.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/decompression-buffersource.tentative.any.js rename to tests/wpt/tests/compression/decompression-buffersource.tentative.any.js diff --git a/tests/wpt/web-platform-tests/compression/decompression-constructor-error.tentative.any.js b/tests/wpt/tests/compression/decompression-constructor-error.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/decompression-constructor-error.tentative.any.js rename to tests/wpt/tests/compression/decompression-constructor-error.tentative.any.js diff --git a/tests/wpt/web-platform-tests/compression/decompression-correct-input.tentative.any.js b/tests/wpt/tests/compression/decompression-correct-input.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/decompression-correct-input.tentative.any.js rename to tests/wpt/tests/compression/decompression-correct-input.tentative.any.js diff --git a/tests/wpt/web-platform-tests/compression/decompression-corrupt-input.tentative.any.js b/tests/wpt/tests/compression/decompression-corrupt-input.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/decompression-corrupt-input.tentative.any.js rename to tests/wpt/tests/compression/decompression-corrupt-input.tentative.any.js diff --git a/tests/wpt/web-platform-tests/compression/decompression-empty-input.tentative.any.js b/tests/wpt/tests/compression/decompression-empty-input.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/decompression-empty-input.tentative.any.js rename to tests/wpt/tests/compression/decompression-empty-input.tentative.any.js diff --git a/tests/wpt/web-platform-tests/compression/decompression-split-chunk.tentative.any.js b/tests/wpt/tests/compression/decompression-split-chunk.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/decompression-split-chunk.tentative.any.js rename to tests/wpt/tests/compression/decompression-split-chunk.tentative.any.js diff --git a/tests/wpt/web-platform-tests/compression/decompression-uint8array-output.tentative.any.js b/tests/wpt/tests/compression/decompression-uint8array-output.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/decompression-uint8array-output.tentative.any.js rename to tests/wpt/tests/compression/decompression-uint8array-output.tentative.any.js diff --git a/tests/wpt/web-platform-tests/compression/decompression-with-detach.tentative.window.js b/tests/wpt/tests/compression/decompression-with-detach.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/decompression-with-detach.tentative.window.js rename to tests/wpt/tests/compression/decompression-with-detach.tentative.window.js diff --git a/tests/wpt/web-platform-tests/compression/idlharness-shadowrealm.window.js b/tests/wpt/tests/compression/idlharness-shadowrealm.window.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/idlharness-shadowrealm.window.js rename to tests/wpt/tests/compression/idlharness-shadowrealm.window.js diff --git a/tests/wpt/web-platform-tests/compression/idlharness.https.any.js b/tests/wpt/tests/compression/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/idlharness.https.any.js rename to tests/wpt/tests/compression/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/compression/resources/concatenate-stream.js b/tests/wpt/tests/compression/resources/concatenate-stream.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/resources/concatenate-stream.js rename to tests/wpt/tests/compression/resources/concatenate-stream.js diff --git a/tests/wpt/web-platform-tests/compression/third_party/pako/LICENSE b/tests/wpt/tests/compression/third_party/pako/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/compression/third_party/pako/LICENSE rename to tests/wpt/tests/compression/third_party/pako/LICENSE diff --git a/tests/wpt/web-platform-tests/compression/third_party/pako/README b/tests/wpt/tests/compression/third_party/pako/README similarity index 100% rename from tests/wpt/web-platform-tests/compression/third_party/pako/README rename to tests/wpt/tests/compression/third_party/pako/README diff --git a/tests/wpt/web-platform-tests/compression/third_party/pako/pako_inflate.min.js b/tests/wpt/tests/compression/third_party/pako/pako_inflate.min.js similarity index 100% rename from tests/wpt/web-platform-tests/compression/third_party/pako/pako_inflate.min.js rename to tests/wpt/tests/compression/third_party/pako/pako_inflate.min.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/README.md b/tests/wpt/tests/compute-pressure/README.md similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/README.md rename to tests/wpt/tests/compute-pressure/README.md diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_basic.tentative.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_basic.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_basic.tentative.https.any.js rename to tests/wpt/tests/compute-pressure/compute_pressure_basic.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_cross_origin_focus_control.tentative.https.window.js b/tests/wpt/tests/compute-pressure/compute_pressure_cross_origin_focus_control.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_cross_origin_focus_control.tentative.https.window.js rename to tests/wpt/tests/compute-pressure/compute_pressure_cross_origin_focus_control.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_detached_iframe.tentative.https.html b/tests/wpt/tests/compute-pressure/compute_pressure_detached_iframe.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_detached_iframe.tentative.https.html rename to tests/wpt/tests/compute-pressure/compute_pressure_detached_iframe.tentative.https.html diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_disconnect.tentative.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_disconnect.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_disconnect.tentative.https.any.js rename to tests/wpt/tests/compute-pressure/compute_pressure_disconnect.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_disconnect_idempotent.tentative.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_disconnect_idempotent.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_disconnect_idempotent.tentative.https.any.js rename to tests/wpt/tests/compute-pressure/compute_pressure_disconnect_idempotent.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_disconnect_immediately.tentative.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_disconnect_immediately.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_disconnect_immediately.tentative.https.any.js rename to tests/wpt/tests/compute-pressure/compute_pressure_disconnect_immediately.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_duplicate_updates.tentative.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_duplicate_updates.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_duplicate_updates.tentative.https.any.js rename to tests/wpt/tests/compute-pressure/compute_pressure_duplicate_updates.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_factors.tentative.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_factors.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_factors.tentative.https.any.js rename to tests/wpt/tests/compute-pressure/compute_pressure_factors.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_multiple.tentative.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_multiple.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_multiple.tentative.https.any.js rename to tests/wpt/tests/compute-pressure/compute_pressure_multiple.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_observe_idempotent.tentative.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_observe_idempotent.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_observe_idempotent.tentative.https.any.js rename to tests/wpt/tests/compute-pressure/compute_pressure_observe_idempotent.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_observe_unobserve_failure.tentative.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_observe_unobserve_failure.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_observe_unobserve_failure.tentative.https.any.js rename to tests/wpt/tests/compute-pressure/compute_pressure_observe_unobserve_failure.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_options.tentative.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_options.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_options.tentative.https.any.js rename to tests/wpt/tests/compute-pressure/compute_pressure_options.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_privacy_test.tentative.https.window.js b/tests/wpt/tests/compute-pressure/compute_pressure_privacy_test.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_privacy_test.tentative.https.window.js rename to tests/wpt/tests/compute-pressure/compute_pressure_privacy_test.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_same_origin_focus_control.tentative.https.window.js b/tests/wpt/tests/compute-pressure/compute_pressure_same_origin_focus_control.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_same_origin_focus_control.tentative.https.window.js rename to tests/wpt/tests/compute-pressure/compute_pressure_same_origin_focus_control.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_supported_sources.tentative.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_supported_sources.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_supported_sources.tentative.https.any.js rename to tests/wpt/tests/compute-pressure/compute_pressure_supported_sources.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_take_records.tentative.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_take_records.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_take_records.tentative.https.any.js rename to tests/wpt/tests/compute-pressure/compute_pressure_take_records.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_timestamp.tentative.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_timestamp.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_timestamp.tentative.https.any.js rename to tests/wpt/tests/compute-pressure/compute_pressure_timestamp.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/compute_pressure_update_toJSON.tentative.https.any.js b/tests/wpt/tests/compute-pressure/compute_pressure_update_toJSON.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/compute_pressure_update_toJSON.tentative.https.any.js rename to tests/wpt/tests/compute-pressure/compute_pressure_update_toJSON.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/idlharness.https.any.js b/tests/wpt/tests/compute-pressure/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/idlharness.https.any.js rename to tests/wpt/tests/compute-pressure/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy-attribute-redirect-on-load.https.html b/tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy-attribute-redirect-on-load.https.html similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy-attribute-redirect-on-load.https.html rename to tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy-attribute-redirect-on-load.https.html diff --git a/tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy-attribute.https.html b/tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy-attribute.https.html rename to tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy-attribute.https.html diff --git a/tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy.https.html b/tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy.https.html rename to tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy.https.html diff --git a/tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy.https.html.headers b/tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy.https.html.headers rename to tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-allowed-by-permissions-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-allowed-on-self-origin-by-permissions-policy.https.html b/tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-allowed-on-self-origin-by-permissions-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-allowed-on-self-origin-by-permissions-policy.https.html rename to tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-allowed-on-self-origin-by-permissions-policy.https.html diff --git a/tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-allowed-on-self-origin-by-permissions-policy.https.html.headers b/tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-allowed-on-self-origin-by-permissions-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-allowed-on-self-origin-by-permissions-policy.https.html.headers rename to tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-allowed-on-self-origin-by-permissions-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-default-permissions-policy.https.html b/tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-default-permissions-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-default-permissions-policy.https.html rename to tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-default-permissions-policy.https.html diff --git a/tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-disabled-by-permissions-policy.https.html b/tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-disabled-by-permissions-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-disabled-by-permissions-policy.https.html rename to tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-disabled-by-permissions-policy.https.html diff --git a/tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-disabled-by-permissions-policy.https.html.headers b/tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-disabled-by-permissions-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-disabled-by-permissions-policy.https.html.headers rename to tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-disabled-by-permissions-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-supported-by-permissions-policy.html b/tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-supported-by-permissions-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/permissions-policy/compute-pressure-supported-by-permissions-policy.html rename to tests/wpt/tests/compute-pressure/permissions-policy/compute-pressure-supported-by-permissions-policy.html diff --git a/tests/wpt/web-platform-tests/compute-pressure/resources/compute-pressure-allowed-by-permissions-policy-worker.js b/tests/wpt/tests/compute-pressure/resources/compute-pressure-allowed-by-permissions-policy-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/resources/compute-pressure-allowed-by-permissions-policy-worker.js rename to tests/wpt/tests/compute-pressure/resources/compute-pressure-allowed-by-permissions-policy-worker.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/resources/compute-pressure-disabled-by-permissions-policy-worker.js b/tests/wpt/tests/compute-pressure/resources/compute-pressure-disabled-by-permissions-policy-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/resources/compute-pressure-disabled-by-permissions-policy-worker.js rename to tests/wpt/tests/compute-pressure/resources/compute-pressure-disabled-by-permissions-policy-worker.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/resources/pressure-helpers.js b/tests/wpt/tests/compute-pressure/resources/pressure-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/resources/pressure-helpers.js rename to tests/wpt/tests/compute-pressure/resources/pressure-helpers.js diff --git a/tests/wpt/web-platform-tests/compute-pressure/resources/support-iframe.html b/tests/wpt/tests/compute-pressure/resources/support-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/compute-pressure/resources/support-iframe.html rename to tests/wpt/tests/compute-pressure/resources/support-iframe.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/META.yml b/tests/wpt/tests/conformance-checkers/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/META.yml rename to tests/wpt/tests/conformance-checkers/META.yml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/Makefile b/tests/wpt/tests/conformance-checkers/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/Makefile rename to tests/wpt/tests/conformance-checkers/Makefile diff --git a/tests/wpt/web-platform-tests/conformance-checkers/README.md b/tests/wpt/tests/conformance-checkers/README.md similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/README.md rename to tests/wpt/tests/conformance-checkers/README.md diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/_/780.htm b/tests/wpt/tests/conformance-checkers/html-aria/_/780.htm similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/_/780.htm rename to tests/wpt/tests/conformance-checkers/html-aria/_/780.htm diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/ariatree.html b/tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/ariatree.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/ariatree.html rename to tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/ariatree.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/ariatree2.html b/tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/ariatree2.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/ariatree2.html rename to tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/ariatree2.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/css/img/expander.gif b/tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/css/img/expander.gif similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/css/img/expander.gif rename to tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/css/img/expander.gif diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/css/treebox.css b/tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/css/treebox.css similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/css/treebox.css rename to tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/css/treebox.css diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/css/treesimple.css b/tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/css/treesimple.css similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/css/treesimple.css rename to tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/css/treesimple.css diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/js/aria.js b/tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/js/aria.js similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/js/aria.js rename to tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/js/aria.js diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/js/init.js b/tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/js/init.js similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/js/init.js rename to tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/js/init.js diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/js/prototype.js b/tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/js/prototype.js similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/_functional/tree/js/prototype.js rename to tests/wpt/tests/conformance-checkers/html-aria/_functional/tree/js/prototype.js diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-input/checkbox-title.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-input/checkbox-title.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-input/checkbox-title.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-input/checkbox-title.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-input/file-title.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-input/file-title.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-input/file-title.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-input/file-title.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-input/password-title.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-input/password-title.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-input/password-title.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-input/password-title.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-input/radio-title.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-input/radio-title.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-input/radio-title.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-input/radio-title.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-input/text-title.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-input/text-title.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-input/text-title.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-input/text-title.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/673.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/673.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/673.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/673.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/674.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/674.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/674.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/674.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/675.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/675.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/675.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/675.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/676.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/676.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/676.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/676.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/677.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/677.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/677.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/677.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/678.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/678.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/678.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/678.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/679.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/679.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/679.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/679.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/680.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/680.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/680.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/680.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/681.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/681.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/681.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/681.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/682.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/682.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/682.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/682.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/683.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/683.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/683.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/683.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/684.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/684.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/684.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/684.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/685.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/685.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/685.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/685.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/686.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/686.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/686.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/686.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/687.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/687.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/687.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/687.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/688.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/688.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/688.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/688.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/689.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/689.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/689.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/689.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/690.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/690.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/690.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/690.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/691.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/691.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/691.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/691.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/692.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/692.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/692.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/692.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/693.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/693.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/693.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/693.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/694.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/694.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/694.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/694.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/695.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/695.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/695.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/695.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/696.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/696.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/696.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/696.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/697.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/697.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/697.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/697.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/698.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/698.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/698.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/698.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/699.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/699.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/699.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/699.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/700.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/700.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/700.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/700.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/701.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/701.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/701.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/701.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/702.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/702.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/702.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/702.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/703.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/703.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/703.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/703.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/704.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/704.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/704.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/704.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/705.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/705.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/705.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/705.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/706.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/706.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/706.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/706.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/707.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/707.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/707.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/707.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/708.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/708.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/708.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/708.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/709.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/709.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/709.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/709.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/710.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/710.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/710.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/710.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/711.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/711.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/711.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/711.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/712.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/712.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/712.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/712.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/713.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/713.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/713.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/713.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/714.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/714.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/714.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/714.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/715.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/715.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/715.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/715.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/716.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/716.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/716.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/716.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/717.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/717.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/717.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/717.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/718.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/718.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/718.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/718.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/719.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/719.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/719.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/719.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/720.html b/tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/720.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/accessible-name-updates/720.html rename to tests/wpt/tests/conformance-checkers/html-aria/accessible-name-updates/720.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/aria-describedby/772.html b/tests/wpt/tests/conformance-checkers/html-aria/aria-describedby/772.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/aria-describedby/772.html rename to tests/wpt/tests/conformance-checkers/html-aria/aria-describedby/772.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/aria-describedby/773.html b/tests/wpt/tests/conformance-checkers/html-aria/aria-describedby/773.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/aria-describedby/773.html rename to tests/wpt/tests/conformance-checkers/html-aria/aria-describedby/773.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/aria-describedby/774.html b/tests/wpt/tests/conformance-checkers/html-aria/aria-describedby/774.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/aria-describedby/774.html rename to tests/wpt/tests/conformance-checkers/html-aria/aria-describedby/774.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/aria-describedby/838.html b/tests/wpt/tests/conformance-checkers/html-aria/aria-describedby/838.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/aria-describedby/838.html rename to tests/wpt/tests/conformance-checkers/html-aria/aria-describedby/838.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/567.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/567.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/567.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/567.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/568.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/568.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/568.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/568.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/569.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/569.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/569.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/569.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/571-haswarn.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/571-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/571-haswarn.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/571-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/572-haswarn.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/572-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/572-haswarn.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/572-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/573-haswarn.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/573-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/573-haswarn.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/573-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/574.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/574.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/574.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/574.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/575.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/575.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/575.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/575.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/576.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/576.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/576.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/576.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/577.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/577.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/577.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/577.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/578.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/578.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/578.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/578.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/579.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/579.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/579.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/579.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/580.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/580.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/580.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/580.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/581.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/581.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/581.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/581.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/582.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/582.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/582.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/582.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/584.html b/tests/wpt/tests/conformance-checkers/html-aria/author-requirements/584.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/author-requirements/584.html rename to tests/wpt/tests/conformance-checkers/html-aria/author-requirements/584.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/button-pressed/589.html b/tests/wpt/tests/conformance-checkers/html-aria/button-pressed/589.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/button-pressed/589.html rename to tests/wpt/tests/conformance-checkers/html-aria/button-pressed/589.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/button-pressed/590.html b/tests/wpt/tests/conformance-checkers/html-aria/button-pressed/590.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/button-pressed/590.html rename to tests/wpt/tests/conformance-checkers/html-aria/button-pressed/590.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/combobox-autocomplete-list/div-haswarn.html b/tests/wpt/tests/conformance-checkers/html-aria/combobox-autocomplete-list/div-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/combobox-autocomplete-list/div-haswarn.html rename to tests/wpt/tests/conformance-checkers/html-aria/combobox-autocomplete-list/div-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/combobox-autocomplete-list/input.html b/tests/wpt/tests/conformance-checkers/html-aria/combobox-autocomplete-list/input.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/combobox-autocomplete-list/input.html rename to tests/wpt/tests/conformance-checkers/html-aria/combobox-autocomplete-list/input.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/css-attr-sel/default.png b/tests/wpt/tests/conformance-checkers/html-aria/css-attr-sel/default.png similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/css-attr-sel/default.png rename to tests/wpt/tests/conformance-checkers/html-aria/css-attr-sel/default.png diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/css-attr-sel/state-1.png b/tests/wpt/tests/conformance-checkers/html-aria/css-attr-sel/state-1.png similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/css-attr-sel/state-1.png rename to tests/wpt/tests/conformance-checkers/html-aria/css-attr-sel/state-1.png diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/css-attr-sel/state-2.png b/tests/wpt/tests/conformance-checkers/html-aria/css-attr-sel/state-2.png similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/css-attr-sel/state-2.png rename to tests/wpt/tests/conformance-checkers/html-aria/css-attr-sel/state-2.png diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/css-attr-sel/state-3.png b/tests/wpt/tests/conformance-checkers/html-aria/css-attr-sel/state-3.png similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/css-attr-sel/state-3.png rename to tests/wpt/tests/conformance-checkers/html-aria/css-attr-sel/state-3.png diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/css-attr-sel/state-4.png b/tests/wpt/tests/conformance-checkers/html-aria/css-attr-sel/state-4.png similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/css-attr-sel/state-4.png rename to tests/wpt/tests/conformance-checkers/html-aria/css-attr-sel/state-4.png diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-disparity-haswarn.html b/tests/wpt/tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-disparity-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-disparity-haswarn.html rename to tests/wpt/tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-disparity-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-norole-haswarn.html b/tests/wpt/tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-norole-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-norole-haswarn.html rename to tests/wpt/tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-norole-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-role-haswarn.html b/tests/wpt/tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-role-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-role-haswarn.html rename to tests/wpt/tests/conformance-checkers/html-aria/host-language/implicit-semantics-checkbox-role-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/input-range-valuetext.htm b/tests/wpt/tests/conformance-checkers/html-aria/host-language/input-range-valuetext.htm similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/host-language/input-range-valuetext.htm rename to tests/wpt/tests/conformance-checkers/html-aria/host-language/input-range-valuetext.htm diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/live-events/test-case-live-event-1-haswarn.html b/tests/wpt/tests/conformance-checkers/html-aria/live-events/test-case-live-event-1-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/live-events/test-case-live-event-1-haswarn.html rename to tests/wpt/tests/conformance-checkers/html-aria/live-events/test-case-live-event-1-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/live-events/test-case-live-event-2.html b/tests/wpt/tests/conformance-checkers/html-aria/live-events/test-case-live-event-2.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/live-events/test-case-live-event-2.html rename to tests/wpt/tests/conformance-checkers/html-aria/live-events/test-case-live-event-2.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/live-events/test-case-live-event-3.html b/tests/wpt/tests/conformance-checkers/html-aria/live-events/test-case-live-event-3.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/live-events/test-case-live-event-3.html rename to tests/wpt/tests/conformance-checkers/html-aria/live-events/test-case-live-event-3.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/live-events/test-case-live-event-4.html b/tests/wpt/tests/conformance-checkers/html-aria/live-events/test-case-live-event-4.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/live-events/test-case-live-event-4.html rename to tests/wpt/tests/conformance-checkers/html-aria/live-events/test-case-live-event-4.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/live-events/test-case-live-event-5.html b/tests/wpt/tests/conformance-checkers/html-aria/live-events/test-case-live-event-5.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/live-events/test-case-live-event-5.html rename to tests/wpt/tests/conformance-checkers/html-aria/live-events/test-case-live-event-5.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/live-events/test-case-live-event-6.html b/tests/wpt/tests/conformance-checkers/html-aria/live-events/test-case-live-event-6.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/live-events/test-case-live-event-6.html rename to tests/wpt/tests/conformance-checkers/html-aria/live-events/test-case-live-event-6.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/mixed-value/585.html b/tests/wpt/tests/conformance-checkers/html-aria/mixed-value/585.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/mixed-value/585.html rename to tests/wpt/tests/conformance-checkers/html-aria/mixed-value/585.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/mixed-value/586.html b/tests/wpt/tests/conformance-checkers/html-aria/mixed-value/586.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/mixed-value/586.html rename to tests/wpt/tests/conformance-checkers/html-aria/mixed-value/586.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/596.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/596.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/596.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/596.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/597-haswarn.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/597-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/597-haswarn.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/597-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/598-haswarn.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/598-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/598-haswarn.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/598-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/599-haswarn.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/599-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/599-haswarn.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/599-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/600.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/600.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/600.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/600.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/601.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/601.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/601.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/601.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/602.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/602.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/602.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/602.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/603.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/603.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/603.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/603.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/604.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/604.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/604.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/604.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/605.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/605.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/605.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/605.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/606.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/606.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/606.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/606.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/607.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/607.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/607.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/607.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/608.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/608.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/608.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/608.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/837.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/837.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-general/837.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-general/837.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-img/557-isvalid.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-img/557-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-img/557-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-img/557-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-img/565-isvalid.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-img/565-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-img/565-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-img/565-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-img/566-isvalid.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-img/566-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-img/566-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-img/566-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-img/foo.jpg b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-img/foo.jpg similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-img/foo.jpg rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-img/foo.jpg diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-img/test.png b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-img/test.png similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-img/test.png rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-img/test.png diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/538.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/538.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/538.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/538.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/542.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/542.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/542.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/542.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/543.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/543.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/543.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/543.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/544.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/544.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/544.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/544.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/545.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/545.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/545.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/545.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/546.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/546.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/546.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/546.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/551.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/551.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/551.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/551.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/552.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/552.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/552.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/552.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/553.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/553.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/553.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/553.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/609.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/609.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/609.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/609.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/610.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/610.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/610.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/610.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/611.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/611.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/611.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/611.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/612.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/612.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/612.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/612.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/613.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/613.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/613.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/613.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/614.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/614.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/614.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/614.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/615.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/615.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/615.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/615.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/659.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/659.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/659.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/659.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/660.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/660.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/660.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/660.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/661.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/661.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/661.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/661.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/662.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/662.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/662.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/662.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/663.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/663.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/663.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/663.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/721.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/721.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/721.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/721.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/723.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/723.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/723.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/723.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/724.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/724.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/724.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/724.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/725.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/725.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/725.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/725.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/748.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/748.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/748.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/748.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/749.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/749.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/749.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/749.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/750.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/750.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/750.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/750.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/751.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/751.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/751.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/751.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/753.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/753.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/753.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/753.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/754.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/754.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/754.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/754.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/755.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/755.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/755.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/755.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/756.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/756.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/756.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/756.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/758.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/758.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/758.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/758.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/759.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/759.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/759.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/759.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/760.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/760.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/760.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/760.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/761.html b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/761.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/761.html rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/761.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/foo.jpg b/tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/foo.jpg similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/name-computation-input/foo.jpg rename to tests/wpt/tests/conformance-checkers/html-aria/name-computation-input/foo.jpg diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/859.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/859.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/859.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/859.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/860.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/860.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/860.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/860.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/861.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/861.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/861.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/861.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/863.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/863.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/863.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/863.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/864.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/864.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/864.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/864.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/865.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/865.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/865.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/865.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/866.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/866.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/866.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/866.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/867.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/867.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/867.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/867.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/868.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/868.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/868.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/868.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/869.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/869.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/869.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/869.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/871.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/871.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/871.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/871.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/872.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/872.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/872.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/872.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/873.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/873.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/873.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/873.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/874.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/874.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/874.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/874.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/875.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/875.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/875.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/875.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/879.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/879.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/879.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/879.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/880.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/880.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/880.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/880.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/887.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/887.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/887.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/887.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/888.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/888.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/888.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/888.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/889.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/889.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/889.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/889.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/890.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/890.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/890.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/890.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/891.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/891.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/891.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/891.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/892.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/892.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/892.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/892.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/893.html b/tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/893.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/namefromauthor-requ/893.html rename to tests/wpt/tests/conformance-checkers/html-aria/namefromauthor-requ/893.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/noaria.html b/tests/wpt/tests/conformance-checkers/html-aria/noaria.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/noaria.html rename to tests/wpt/tests/conformance-checkers/html-aria/noaria.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/497-novalid.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/497-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/497-novalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/497-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/498-novalid.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/498-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/498-novalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/498-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/499-novalid.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/499-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/499-novalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/499-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/500-novalid.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/500-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/500-novalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/500-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/501-novalid.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/501-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/501-novalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/501-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/502-novalid.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/502-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/502-novalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/502-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/503-novalid.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/503-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/503-novalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/503-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/504-novalid.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/504-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/504-novalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/504-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/505-novalid.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/505-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/505-novalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/505-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/506-novalid.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/506-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/506-novalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/506-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/507-novalid.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/507-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/507-novalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/507-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/509-novalid.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/509-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/509-novalid.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/509-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/510.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/510.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/510.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/510.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/511.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/511.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/511.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/511.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/512.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/512.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/512.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/512.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/513.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/513.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/513.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/513.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/514.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/514.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/514.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/514.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/515.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/515.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/515.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/515.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/516.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/516.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/516.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/516.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/517.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/517.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/517.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/517.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/518.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/518.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/518.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/518.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/519.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/519.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/519.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/519.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/520.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/520.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/520.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/520.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/521.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/521.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/521.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/521.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/522.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/522.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/522.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/522.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/523-haswarn.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/523-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/523-haswarn.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/523-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/524.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/524.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/524.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/524.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/525.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/525.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/525.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/525.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/527.html b/tests/wpt/tests/conformance-checkers/html-aria/presentation-role/527.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentation-role/527.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentation-role/527.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentational-children/testcase-839.html b/tests/wpt/tests/conformance-checkers/html-aria/presentational-children/testcase-839.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentational-children/testcase-839.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentational-children/testcase-839.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentational-children/testcase-840.html b/tests/wpt/tests/conformance-checkers/html-aria/presentational-children/testcase-840.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentational-children/testcase-840.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentational-children/testcase-840.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentational-children/testcase-842.html b/tests/wpt/tests/conformance-checkers/html-aria/presentational-children/testcase-842.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentational-children/testcase-842.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentational-children/testcase-842.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentational-children/testcase-843.html b/tests/wpt/tests/conformance-checkers/html-aria/presentational-children/testcase-843.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentational-children/testcase-843.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentational-children/testcase-843.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentational-children/testcase-844.html b/tests/wpt/tests/conformance-checkers/html-aria/presentational-children/testcase-844.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/presentational-children/testcase-844.html rename to tests/wpt/tests/conformance-checkers/html-aria/presentational-children/testcase-844.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-atomic-false.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-atomic-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-atomic-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-atomic-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-atomic-true.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-atomic-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-atomic-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-atomic-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-atomic.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-atomic.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-atomic.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-atomic.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-busy-false.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-busy-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-busy-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-busy-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-busy-true.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-busy-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-busy-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-busy-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-controls-obj1-obj2.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-controls-obj1-obj2.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-controls-obj1-obj2.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-controls-obj1-obj2.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-controls-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-controls-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-controls-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-controls-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-describedby-obj1-obj2.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-describedby-obj1-obj2.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-describedby-obj1-obj2.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-describedby-obj1-obj2.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-describedby-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-describedby-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-describedby-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-describedby-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-disabled-false.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-disabled-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-disabled-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-disabled-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-disabled-true.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-disabled-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-disabled-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-disabled-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-copy.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-copy.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-copy.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-copy.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-execute.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-execute.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-execute.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-execute.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-link.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-link.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-link.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-link.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-move.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-move.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-move.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-move.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-none.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-none.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-none.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-none.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-popup.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-popup.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-dropeffect-popup.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-flowto-obj1-obj2.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-flowto-obj1-obj2.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-flowto-obj1-obj2.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-flowto-obj1-obj2.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-flowto-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-flowto-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-flowto-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-flowto-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-grabbed-false.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-grabbed-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-grabbed-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-grabbed-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-grabbed-true.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-grabbed-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-grabbed-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-grabbed-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-grabbed-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-grabbed-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-grabbed-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-grabbed-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-haspopup-false.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-haspopup-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-haspopup-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-haspopup-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-haspopup-true.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-haspopup-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-haspopup-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-haspopup-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-hidden-false.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-hidden-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-hidden-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-hidden-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-hidden-true.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-hidden-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-hidden-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-hidden-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-false.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-grammar.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-grammar.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-grammar.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-grammar.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-spelling.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-spelling.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-spelling.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-spelling.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-true.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-invalid-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-label-Test-string-value-haswarn.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-label-Test-string-value-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-label-Test-string-value-haswarn.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-label-Test-string-value-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-labelledby-obj1-obj2.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-labelledby-obj1-obj2.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-labelledby-obj1-obj2.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-labelledby-obj1-obj2.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-labelledby-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-labelledby-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-labelledby-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-labelledby-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-live-assertive.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-live-assertive.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-live-assertive.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-live-assertive.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-live-off.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-live-off.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-live-off.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-live-off.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-live-polite.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-live-polite.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-live-polite.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-live-polite.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-owns-obj1-obj2.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-owns-obj1-obj2.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-owns-obj1-obj2.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-owns-obj1-obj2.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-owns-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-owns-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-owns-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-owns-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-additions-text.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-additions-text.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-additions-text.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-additions-text.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-additions.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-additions.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-additions.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-additions.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-all.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-all.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-all.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-all.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-removals.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-removals.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-removals.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-removals.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-text.html b/tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-text.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-text.html rename to tests/wpt/tests/conformance-checkers/html-aria/properties-global-norole/properties-global-norole-aria-relevant-text.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/relevant-state/591.html b/tests/wpt/tests/conformance-checkers/html-aria/relevant-state/591.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/relevant-state/591.html rename to tests/wpt/tests/conformance-checkers/html-aria/relevant-state/591.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/relevant-state/592.html b/tests/wpt/tests/conformance-checkers/html-aria/relevant-state/592.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/relevant-state/592.html rename to tests/wpt/tests/conformance-checkers/html-aria/relevant-state/592.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/relevant-state/593.html b/tests/wpt/tests/conformance-checkers/html-aria/relevant-state/593.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/relevant-state/593.html rename to tests/wpt/tests/conformance-checkers/html-aria/relevant-state/593.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-alert.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-alert.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-alert.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-alert.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-alertdialog.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-alertdialog.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-alertdialog.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-alertdialog.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-application.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-application.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-application.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-application.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-article.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-article.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-article.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-article.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-banner.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-banner.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-banner.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-banner.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-button.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-button.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-button.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-button.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-complementary.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-complementary.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-complementary.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-complementary.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-contentinfo.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-contentinfo.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-contentinfo.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-contentinfo.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-definition.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-definition.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-definition.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-definition.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-dialog.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-dialog.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-dialog.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-dialog.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-directory.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-directory.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-directory.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-directory.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-document.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-document.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-document.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-document.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-form.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-form.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-form.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-form.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-grid.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-grid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-grid.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-grid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-group.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-group.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-group.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-group.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-heading.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-heading.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-heading.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-heading.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-img.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-img.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-img.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-img.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-link.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-link.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-link.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-link.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-list.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-list.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-list.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-list.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-listbox-parent-combobox.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-listbox-parent-combobox.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-listbox-parent-combobox.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-listbox-parent-combobox.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-listbox.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-listbox.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-listbox.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-listbox.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-log.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-log.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-log.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-log.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-main.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-main.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-main.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-main.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-marquee.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-marquee.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-marquee.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-marquee.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-math.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-math.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-math.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-math.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-menu.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-menu.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-menu.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-menu.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-menubar.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-menubar.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-menubar.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-menubar.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-navigation.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-navigation.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-navigation.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-note.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-note.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-note.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-note.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-option.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-option.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-option.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-option.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-presentation.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-presentation.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-presentation.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-presentation.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-progressbar.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-progressbar.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-progressbar.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-progressbar.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-radiogroup.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-radiogroup.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-radiogroup.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-radiogroup.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-region.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-region.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-region.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-region.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-rowheader.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-rowheader.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-rowheader.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-rowheader.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-search.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-search.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-search.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-search.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-separator.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-separator.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-separator.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-separator.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-status.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-status.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-status.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-status.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tablist.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tablist.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tablist.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tablist.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tabpanel.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tabpanel.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tabpanel.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tabpanel.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-textbox.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-textbox.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-textbox.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-textbox.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-timer.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-timer.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-timer.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-timer.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-toolbar.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-toolbar.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-toolbar.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-toolbar.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tooltip.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tooltip.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tooltip.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tooltip.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tree.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tree.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tree.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-tree.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-treegrid.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-treegrid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-treegrid.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-plain-concrete/roles-plain-concrete-treegrid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-atomic-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-atomic-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-atomic-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-atomic-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-atomic-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-atomic-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-atomic-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-atomic-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-busy-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-busy-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-busy-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-busy-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-busy-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-busy-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-busy-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-busy-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-controls-obj1-obj2.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-controls-obj1-obj2.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-controls-obj1-obj2.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-controls-obj1-obj2.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-controls-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-controls-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-controls-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-controls-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-describedby-obj1-obj2.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-describedby-obj1-obj2.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-describedby-obj1-obj2.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-describedby-obj1-obj2.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-describedby-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-describedby-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-describedby-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-describedby-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-disabled-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-disabled-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-disabled-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-disabled-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-disabled-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-disabled-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-disabled-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-disabled-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-copy.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-copy.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-copy.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-copy.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-execute.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-execute.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-execute.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-execute.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-link.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-link.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-link.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-link.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-move.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-move.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-move.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-move.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-none.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-none.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-none.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-none.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-popup.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-popup.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-dropeffect-popup.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-flowto-obj1-obj2.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-flowto-obj1-obj2.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-flowto-obj1-obj2.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-flowto-obj1-obj2.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-flowto-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-flowto-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-flowto-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-flowto-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-grabbed-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-grabbed-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-grabbed-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-grabbed-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-grabbed-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-grabbed-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-grabbed-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-grabbed-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-grabbed-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-grabbed-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-grabbed-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-grabbed-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-haspopup-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-haspopup-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-haspopup-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-haspopup-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-haspopup-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-haspopup-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-haspopup-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-haspopup-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-hidden-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-hidden-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-hidden-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-hidden-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-hidden-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-hidden-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-hidden-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-hidden-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-grammar.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-grammar.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-grammar.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-grammar.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-spelling.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-spelling.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-spelling.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-spelling.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-invalid-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-label-Test-string-value.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-label-Test-string-value.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-label-Test-string-value.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-label-Test-string-value.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-labelledby-obj1-obj2.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-labelledby-obj1-obj2.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-labelledby-obj1-obj2.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-labelledby-obj1-obj2.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-labelledby-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-labelledby-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-labelledby-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-labelledby-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-live-assertive.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-live-assertive.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-live-assertive.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-live-assertive.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-live-off.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-live-off.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-live-off.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-live-off.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-live-polite.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-live-polite.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-live-polite.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-live-polite.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-owns-obj1-obj2.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-owns-obj1-obj2.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-owns-obj1-obj2.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-owns-obj1-obj2.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-owns-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-owns-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-owns-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-owns-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-additions-text.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-additions-text.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-additions-text.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-additions-text.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-additions.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-additions.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-additions.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-additions.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-all.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-all.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-all.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-all.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-removals.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-removals.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-removals.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-removals.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-text.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-text.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-text.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-global/roles-properties-global-main-aria-relevant-text.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required-inherited/menuitemcheckbox-aria-checked-mixed.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required-inherited/menuitemcheckbox-aria-checked-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required-inherited/menuitemcheckbox-aria-checked-mixed.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required-inherited/menuitemcheckbox-aria-checked-mixed.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required-inherited/menuitemcheckbox-aria-checked-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required-inherited/menuitemcheckbox-aria-checked-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required-inherited/menuitemcheckbox-aria-checked-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required-inherited/menuitemcheckbox-aria-checked-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-mixed.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-mixed.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-mixed.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required-inherited/radio-aria-checked-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-mixed.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-mixed.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-mixed.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-checkbox-aria-checked-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-combobox-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-combobox-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-combobox-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-combobox-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-combobox-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-combobox-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-combobox-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-combobox-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-combobox-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-combobox-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-combobox-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-required/roles-properties-required-combobox-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alert-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alert-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alert-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alert-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alert-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alert-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alert-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alert-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alert-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alert-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alert-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alert-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alertdialog-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alertdialog-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alertdialog-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alertdialog-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alertdialog-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alertdialog-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alertdialog-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alertdialog-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alertdialog-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alertdialog-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alertdialog-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/alertdialog-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/application-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/application-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/application-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/application-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/application-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/application-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/application-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/application-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/application-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/application-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/application-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/application-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/article-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/article-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/article-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/article-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/article-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/article-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/article-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/article-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/article-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/article-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/article-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/article-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/banner-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/banner-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/banner-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/banner-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/banner-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/banner-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/banner-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/banner-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/banner-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/banner-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/banner-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/banner-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-readonly-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-readonly-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-readonly-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-readonly-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-readonly-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-readonly-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-readonly-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-readonly-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-required-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-required-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-required-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-required-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-required-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-required-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-required-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-required-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-selected-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-selected-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-selected-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-selected-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-selected-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-selected-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-selected-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-selected-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-selected-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-selected-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-selected-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/columnheader-aria-selected-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-activedescendant-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-activedescendant-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-activedescendant-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-activedescendant-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/combobox-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/complementary-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/complementary-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/complementary-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/complementary-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/complementary-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/complementary-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/complementary-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/complementary-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/complementary-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/complementary-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/complementary-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/complementary-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/contentinfo-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/contentinfo-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/contentinfo-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/contentinfo-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/contentinfo-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/contentinfo-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/contentinfo-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/contentinfo-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/contentinfo-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/contentinfo-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/contentinfo-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/contentinfo-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/definition-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/definition-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/definition-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/definition-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/definition-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/definition-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/definition-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/definition-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/definition-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/definition-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/definition-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/definition-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/dialog-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/dialog-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/dialog-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/dialog-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/dialog-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/dialog-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/dialog-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/dialog-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/dialog-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/dialog-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/dialog-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/dialog-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/directory-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/directory-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/directory-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/directory-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/directory-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/directory-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/directory-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/directory-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/directory-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/directory-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/directory-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/directory-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/form-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/form-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/form-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/form-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/form-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/form-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/form-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/form-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/form-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/form-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/form-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/form-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-activedescendant-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-activedescendant-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-activedescendant-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-activedescendant-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/grid-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/gridcell-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/gridcell-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/gridcell-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/gridcell-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/gridcell-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/gridcell-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/gridcell-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/gridcell-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/group-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/group-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/group-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/group-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/group-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/group-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/group-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/group-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/group-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/group-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/group-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/group-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/heading-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/heading-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/heading-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/heading-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/heading-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/heading-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/heading-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/heading-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/heading-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/heading-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/heading-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/heading-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/img-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/img-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/img-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/img-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/img-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/img-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/img-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/img-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/img-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/img-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/img-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/img-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/list-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/list-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/list-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/list-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/list-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/list-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/list-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/list-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/list-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/list-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/list-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/list-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-activedescendant-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-activedescendant-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-activedescendant-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-activedescendant-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/listbox-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/log-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/log-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/log-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/log-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/log-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/log-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/log-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/log-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/log-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/log-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/log-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/log-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/main-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/main-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/main-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/main-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/main-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/main-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/main-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/main-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/main-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/main-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/main-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/main-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/marquee-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/marquee-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/marquee-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/marquee-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/marquee-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/marquee-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/marquee-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/marquee-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/marquee-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/marquee-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/marquee-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/marquee-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/math-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/math-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/math-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/math-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/math-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/math-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/math-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/math-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/math-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/math-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/math-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/math-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-activedescendant-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-activedescendant-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-activedescendant-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-activedescendant-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menu-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-activedescendant-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-activedescendant-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-activedescendant-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-activedescendant-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menubar-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-mixed.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-mixed.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-mixed.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/menuitemradio-aria-checked-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/navigation-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/navigation-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/navigation-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/navigation-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/navigation-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/navigation-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/navigation-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/navigation-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/navigation-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/navigation-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/navigation-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/navigation-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/note-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/note-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/note-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/note-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/note-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/note-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/note-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/note-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/note-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/note-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/note-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/note-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuemax-1.1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuemax-1.1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuemax-1.1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuemax-1.1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuemin-1.1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuemin-1.1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuemin-1.1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuemin-1.1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuenow-1.1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuenow-1.1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuenow-1.1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuenow-1.1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuetext-Test-string-value.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuetext-Test-string-value.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuetext-Test-string-value.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/progressbar-aria-valuetext-Test-string-value.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radio-aria-checked-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radio-aria-checked-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radio-aria-checked-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radio-aria-checked-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radio-aria-checked-mixed.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radio-aria-checked-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radio-aria-checked-mixed.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radio-aria-checked-mixed.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radio-aria-checked-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radio-aria-checked-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radio-aria-checked-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radio-aria-checked-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radiogroup-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radiogroup-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radiogroup-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radiogroup-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radiogroup-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radiogroup-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radiogroup-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radiogroup-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radiogroup-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radiogroup-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radiogroup-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/radiogroup-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/region-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/region-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/region-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/region-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/region-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/region-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/region-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/region-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/region-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/region-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/region-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/region-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/row-aria-activedescendant-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/row-aria-activedescendant-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/row-aria-activedescendant-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/row-aria-activedescendant-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowgroup-aria-activedescendant-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowgroup-aria-activedescendant-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowgroup-aria-activedescendant-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowgroup-aria-activedescendant-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-readonly-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-readonly-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-readonly-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-readonly-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-readonly-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-readonly-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-readonly-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-readonly-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-required-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-required-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-required-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-required-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-required-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-required-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-required-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-required-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-selected-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-selected-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-selected-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-selected-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-selected-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-selected-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-selected-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-selected-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-selected-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-selected-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-selected-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/rowheader-aria-selected-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/search-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/search-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/search-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/search-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/search-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/search-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/search-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/search-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/search-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/search-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/search-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/search-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/status-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/status-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/status-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/status-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/status-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/status-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/status-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/status-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/status-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/status-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/status-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/status-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tab-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tab-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tab-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tab-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tab-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tab-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tab-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tab-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tab-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tab-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tab-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tab-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-activedescendant-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-activedescendant-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-activedescendant-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-activedescendant-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tablist-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tabpanel-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tabpanel-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tabpanel-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tabpanel-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tabpanel-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tabpanel-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tabpanel-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tabpanel-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tabpanel-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tabpanel-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tabpanel-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tabpanel-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/timer-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/timer-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/timer-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/timer-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/timer-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/timer-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/timer-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/timer-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/timer-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/timer-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/timer-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/timer-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-activedescendant-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-activedescendant-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-activedescendant-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-activedescendant-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/toolbar-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tooltip-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tooltip-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tooltip-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tooltip-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tooltip-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tooltip-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tooltip-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tooltip-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tooltip-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tooltip-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tooltip-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tooltip-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-activedescendant-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-activedescendant-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-activedescendant-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-activedescendant-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/tree-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-activedescendant-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-activedescendant-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-activedescendant-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-activedescendant-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-level-1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-level-1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-level-1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-level-1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-multiselectable-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-multiselectable-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-multiselectable-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-multiselectable-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-multiselectable-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-multiselectable-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-multiselectable-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-multiselectable-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-readonly-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-readonly-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-readonly-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-readonly-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-readonly-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-readonly-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-readonly-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-readonly-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-required-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-required-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-required-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-required-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-required-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-required-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-required-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treegrid-aria-required-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-mixed.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-mixed.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-mixed.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-checked-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-level-1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-level-1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-level-1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-level-1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-posinset-1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-posinset-1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-posinset-1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-posinset-1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-selected-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-selected-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-selected-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-selected-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-selected-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-selected-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-selected-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-selected-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-selected-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-selected-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-selected-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-selected-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-setsize-1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-setsize-1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-setsize-1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported-inherited/treeitem-aria-setsize-1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-mixed.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-mixed.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-mixed.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-button-aria-pressed-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-ascending.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-ascending.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-ascending.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-ascending.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-descending.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-descending.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-descending.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-descending.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-none.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-none.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-none.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-none.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-other.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-other.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-other.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-columnheader-aria-sort-other.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-both.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-both.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-both.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-both.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-inline.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-inline.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-inline.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-list.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-list.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-list.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-list.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-none.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-none.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-none.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-combobox-aria-autocomplete-none.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-document-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-document-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-document-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-document-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-document-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-document-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-document-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-document-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-document-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-document-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-document-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-document-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-multiselectable-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-multiselectable-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-multiselectable-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-multiselectable-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-multiselectable-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-multiselectable-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-multiselectable-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-multiselectable-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-readonly-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-readonly-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-readonly-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-readonly-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-readonly-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-readonly-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-readonly-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-grid-aria-readonly-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-readonly-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-readonly-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-readonly-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-readonly-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-readonly-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-readonly-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-readonly-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-readonly-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-required-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-required-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-required-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-required-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-required-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-required-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-required-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-required-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-selected-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-selected-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-selected-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-selected-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-selected-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-selected-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-selected-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-selected-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-selected-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-selected-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-selected-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-gridcell-aria-selected-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-heading-aria-level-1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-heading-aria-level-1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-heading-aria-level-1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-heading-aria-level-1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-link-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-link-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-link-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-link-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-link-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-link-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-link-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-link-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-link-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-link-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-link-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-link-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-multiselectable-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-multiselectable-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-multiselectable-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-multiselectable-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-multiselectable-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-multiselectable-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-multiselectable-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-multiselectable-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-required-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-required-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-required-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-required-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-required-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-required-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-required-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listbox-aria-required-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listitem-aria-level-1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listitem-aria-level-1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listitem-aria-level-1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listitem-aria-level-1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listitem-aria-posinset-1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listitem-aria-posinset-1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listitem-aria-posinset-1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listitem-aria-posinset-1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listitem-aria-setsize-1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listitem-aria-setsize-1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listitem-aria-setsize-1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-listitem-aria-setsize-1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-mixed.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-mixed.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-mixed.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-checked-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-posinset-1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-posinset-1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-posinset-1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-posinset-1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-selected-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-selected-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-selected-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-selected-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-selected-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-selected-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-selected-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-selected-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-selected-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-selected-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-selected-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-selected-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-setsize-1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-setsize-1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-setsize-1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-option-aria-setsize-1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-radiogroup-aria-required-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-radiogroup-aria-required-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-radiogroup-aria-required-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-radiogroup-aria-required-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-radiogroup-aria-required-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-radiogroup-aria-required-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-radiogroup-aria-required-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-radiogroup-aria-required-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-level-1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-level-1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-level-1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-level-1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-selected-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-selected-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-selected-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-selected-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-selected-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-selected-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-selected-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-selected-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-selected-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-selected-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-selected-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-row-aria-selected-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-ascending.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-ascending.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-ascending.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-ascending.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-descending.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-descending.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-descending.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-descending.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-none.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-none.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-none.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-none.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-other.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-other.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-other.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-rowheader-aria-sort-other.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-expanded-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-expanded-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-expanded-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-expanded-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-expanded-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-expanded-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-expanded-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-expanded-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-expanded-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-expanded-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-expanded-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-expanded-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-orientation-horizontal.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-orientation-horizontal.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-orientation-horizontal.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-orientation-horizontal.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-orientation-vertical.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-orientation-vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-orientation-vertical.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-separator-aria-orientation-vertical.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tab-aria-selected-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tab-aria-selected-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tab-aria-selected-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tab-aria-selected-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tab-aria-selected-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tab-aria-selected-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tab-aria-selected-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tab-aria-selected-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tab-aria-selected-undefined.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tab-aria-selected-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tab-aria-selected-undefined.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tab-aria-selected-undefined.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tablist-aria-level-1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tablist-aria-level-1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tablist-aria-level-1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tablist-aria-level-1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-activedescendant-obj1.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-activedescendant-obj1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-activedescendant-obj1.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-activedescendant-obj1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-both.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-both.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-both.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-both.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-inline.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-inline.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-inline.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-list.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-list.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-list.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-list.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-none.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-none.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-none.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-autocomplete-none.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-multiline-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-multiline-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-multiline-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-multiline-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-multiline-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-multiline-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-multiline-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-multiline-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-readonly-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-readonly-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-readonly-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-readonly-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-readonly-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-readonly-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-readonly-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-readonly-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-required-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-required-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-required-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-required-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-required-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-required-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-required-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-textbox-aria-required-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-multiselectable-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-multiselectable-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-multiselectable-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-multiselectable-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-multiselectable-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-multiselectable-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-multiselectable-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-multiselectable-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-required-false.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-required-false.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-required-false.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-required-false.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-required-true.html b/tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-required-true.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-required-true.html rename to tests/wpt/tests/conformance-checkers/html-aria/roles-properties-supported/roles-properties-supported-tree-aria-required-true.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/selected-state/670.html b/tests/wpt/tests/conformance-checkers/html-aria/selected-state/670.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/selected-state/670.html rename to tests/wpt/tests/conformance-checkers/html-aria/selected-state/670.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/selected-state/671.html b/tests/wpt/tests/conformance-checkers/html-aria/selected-state/671.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/selected-state/671.html rename to tests/wpt/tests/conformance-checkers/html-aria/selected-state/671.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/selected-state/672.html b/tests/wpt/tests/conformance-checkers/html-aria/selected-state/672.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/selected-state/672.html rename to tests/wpt/tests/conformance-checkers/html-aria/selected-state/672.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/setsize-posinset-level/setsize-posinset-level-1.html b/tests/wpt/tests/conformance-checkers/html-aria/setsize-posinset-level/setsize-posinset-level-1.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/setsize-posinset-level/setsize-posinset-level-1.html rename to tests/wpt/tests/conformance-checkers/html-aria/setsize-posinset-level/setsize-posinset-level-1.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/setsize-posinset-level/setsize-posinset-level-5.html b/tests/wpt/tests/conformance-checkers/html-aria/setsize-posinset-level/setsize-posinset-level-5.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/setsize-posinset-level/setsize-posinset-level-5.html rename to tests/wpt/tests/conformance-checkers/html-aria/setsize-posinset-level/setsize-posinset-level-5.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/setsize-posinset-level/setsize-posinset-level-6.html b/tests/wpt/tests/conformance-checkers/html-aria/setsize-posinset-level/setsize-posinset-level-6.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/setsize-posinset-level/setsize-posinset-level-6.html rename to tests/wpt/tests/conformance-checkers/html-aria/setsize-posinset-level/setsize-posinset-level-6.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/setsize-posinset-level/testcase-769.html b/tests/wpt/tests/conformance-checkers/html-aria/setsize-posinset-level/testcase-769.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/setsize-posinset-level/testcase-769.html rename to tests/wpt/tests/conformance-checkers/html-aria/setsize-posinset-level/testcase-769.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/stability-of-dom/669.html b/tests/wpt/tests/conformance-checkers/html-aria/stability-of-dom/669.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/stability-of-dom/669.html rename to tests/wpt/tests/conformance-checkers/html-aria/stability-of-dom/669.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-listbox-multiselectable-A.html b/tests/wpt/tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-listbox-multiselectable-A.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-listbox-multiselectable-A.html rename to tests/wpt/tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-listbox-multiselectable-A.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-listbox-multiselectable-B.html b/tests/wpt/tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-listbox-multiselectable-B.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-listbox-multiselectable-B.html rename to tests/wpt/tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-listbox-multiselectable-B.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-listbox-multiselectable-C.html b/tests/wpt/tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-listbox-multiselectable-C.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-listbox-multiselectable-C.html rename to tests/wpt/tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-listbox-multiselectable-C.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-multiselectable-D.html b/tests/wpt/tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-multiselectable-D.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-multiselectable-D.html rename to tests/wpt/tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-multiselectable-D.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-tree-multiselectable-C.html b/tests/wpt/tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-tree-multiselectable-C.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-tree-multiselectable-C.html rename to tests/wpt/tests/conformance-checkers/html-aria/testcases-multiselectable/testcase-tree-multiselectable-C.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters1html.html b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters1html.html rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters2html.html b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters2html.html rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters2htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters2htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters2htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters2htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters3html.html b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters3html.html rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters3htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters3htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters3htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters3htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters4html.html b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters4html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters4html.html rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/html/allowedcharacters4html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters3xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters3xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters3xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters3xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters4xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters4xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters4xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters4xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters6xml.xml b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters6xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters6xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters6xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters7xml.xml b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters7xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters7xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters7xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters7xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters7xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters7xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters7xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters8xml.xml b/tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters8xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters8xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/allowedcharacters/xml/allowedcharacters8xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/html/dir1html.html b/tests/wpt/tests/conformance-checkers/html-its/directionality/html/dir1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/html/dir1html.html rename to tests/wpt/tests/conformance-checkers/html-its/directionality/html/dir1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/html/dir2html.html b/tests/wpt/tests/conformance-checkers/html-its/directionality/html/dir2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/html/dir2html.html rename to tests/wpt/tests/conformance-checkers/html-its/directionality/html/dir2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/html/dir3html.html b/tests/wpt/tests/conformance-checkers/html-its/directionality/html/dir3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/html/dir3html.html rename to tests/wpt/tests/conformance-checkers/html-its/directionality/html/dir3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/html/dir3htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/directionality/html/dir3htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/html/dir3htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/directionality/html/dir3htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/html/dir4html.html b/tests/wpt/tests/conformance-checkers/html-its/directionality/html/dir4html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/html/dir4html.html rename to tests/wpt/tests/conformance-checkers/html-its/directionality/html/dir4html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir2xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir2xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir2xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir2xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir6xml.xml b/tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir6xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir6xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir6xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir6xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir6xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/directionality/xml/dir6xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/directionality/xml/dir6xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/html/domain1html.html b/tests/wpt/tests/conformance-checkers/html-its/domain/html/domain1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/html/domain1html.html rename to tests/wpt/tests/conformance-checkers/html-its/domain/html/domain1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/html/domain1htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/domain/html/domain1htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/html/domain1htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/domain/html/domain1htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/html/domain2html.html b/tests/wpt/tests/conformance-checkers/html-its/domain/html/domain2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/html/domain2html.html rename to tests/wpt/tests/conformance-checkers/html-its/domain/html/domain2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/html/domain2htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/domain/html/domain2htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/html/domain2htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/domain/html/domain2htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/html/domain3html.html b/tests/wpt/tests/conformance-checkers/html-its/domain/html/domain3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/html/domain3html.html rename to tests/wpt/tests/conformance-checkers/html-its/domain/html/domain3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/html/domain3htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/domain/html/domain3htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/html/domain3htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/domain/html/domain3htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/html/domain4html.html b/tests/wpt/tests/conformance-checkers/html-its/domain/html/domain4html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/html/domain4html.html rename to tests/wpt/tests/conformance-checkers/html-its/domain/html/domain4html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain4xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain4xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain4xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain4xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain5xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain5xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain5xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain5xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain6xml.xml b/tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain6xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain6xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain6xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain7xml.xml b/tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain7xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain7xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain7xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain7xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain7xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/domain/xml/domain7xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/domain/xml/domain7xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/html/withintext1html.html b/tests/wpt/tests/conformance-checkers/html-its/elementswithintext/html/withintext1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/html/withintext1html.html rename to tests/wpt/tests/conformance-checkers/html-its/elementswithintext/html/withintext1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/html/withintext1htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/elementswithintext/html/withintext1htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/html/withintext1htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/elementswithintext/html/withintext1htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/html/withintext2html.html b/tests/wpt/tests/conformance-checkers/html-its/elementswithintext/html/withintext2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/html/withintext2html.html rename to tests/wpt/tests/conformance-checkers/html-its/elementswithintext/html/withintext2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/html/withintext3html.html b/tests/wpt/tests/conformance-checkers/html-its/elementswithintext/html/withintext3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/html/withintext3html.html rename to tests/wpt/tests/conformance-checkers/html-its/elementswithintext/html/withintext3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/html/withintext3htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/elementswithintext/html/withintext3htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/html/withintext3htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/elementswithintext/html/withintext3htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/html/withintext4html.html b/tests/wpt/tests/conformance-checkers/html-its/elementswithintext/html/withintext4html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/html/withintext4html.html rename to tests/wpt/tests/conformance-checkers/html-its/elementswithintext/html/withintext4html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext2xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext2xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext2xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext2xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext6xml.xml b/tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext6xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext6xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext6xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext6xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext6xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/elementswithintext/xml/withintext6xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/elementswithintext/xml/withintext6xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/html/externalresource1html.html b/tests/wpt/tests/conformance-checkers/html-its/externalresource/html/externalresource1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/html/externalresource1html.html rename to tests/wpt/tests/conformance-checkers/html-its/externalresource/html/externalresource1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/html/externalresource1htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/externalresource/html/externalresource1htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/html/externalresource1htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/externalresource/html/externalresource1htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/html/externalresource2html.html b/tests/wpt/tests/conformance-checkers/html-its/externalresource/html/externalresource2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/html/externalresource2html.html rename to tests/wpt/tests/conformance-checkers/html-its/externalresource/html/externalresource2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/html/externalresource2htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/externalresource/html/externalresource2htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/html/externalresource2htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/externalresource/html/externalresource2htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/html/externalresource3html.html b/tests/wpt/tests/conformance-checkers/html-its/externalresource/html/externalresource3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/html/externalresource3html.html rename to tests/wpt/tests/conformance-checkers/html-its/externalresource/html/externalresource3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource2xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource2xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource2xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource2xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource3xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource3xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource3xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource3xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource5xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource5xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/externalresource/xml/externalresource5xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/externalresource/xml/externalresource5xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/html/idvalue1html.html b/tests/wpt/tests/conformance-checkers/html-its/idvalue/html/idvalue1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/html/idvalue1html.html rename to tests/wpt/tests/conformance-checkers/html-its/idvalue/html/idvalue1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/html/idvalue1htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/idvalue/html/idvalue1htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/html/idvalue1htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/idvalue/html/idvalue1htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/html/idvalue2html.html b/tests/wpt/tests/conformance-checkers/html-its/idvalue/html/idvalue2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/html/idvalue2html.html rename to tests/wpt/tests/conformance-checkers/html-its/idvalue/html/idvalue2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/html/idvalue2htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/idvalue/html/idvalue2htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/html/idvalue2htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/idvalue/html/idvalue2htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/html/idvalue3html.html b/tests/wpt/tests/conformance-checkers/html-its/idvalue/html/idvalue3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/html/idvalue3html.html rename to tests/wpt/tests/conformance-checkers/html-its/idvalue/html/idvalue3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/xml/idvalue1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/idvalue/xml/idvalue1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/xml/idvalue1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/idvalue/xml/idvalue1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/xml/idvalue2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/idvalue/xml/idvalue2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/xml/idvalue2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/idvalue/xml/idvalue2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/xml/idvalue3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/idvalue/xml/idvalue3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/xml/idvalue3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/idvalue/xml/idvalue3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/xml/idvalue3xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/idvalue/xml/idvalue3xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/xml/idvalue3xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/idvalue/xml/idvalue3xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/xml/idvalue4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/idvalue/xml/idvalue4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/xml/idvalue4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/idvalue/xml/idvalue4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/xml/idvalue4xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/idvalue/xml/idvalue4xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/xml/idvalue4xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/idvalue/xml/idvalue4xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/xml/idvalue5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/idvalue/xml/idvalue5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/idvalue/xml/idvalue5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/idvalue/xml/idvalue5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/html/languageinfo1html.html b/tests/wpt/tests/conformance-checkers/html-its/languageinformation/html/languageinfo1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/html/languageinfo1html.html rename to tests/wpt/tests/conformance-checkers/html-its/languageinformation/html/languageinfo1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/html/languageinfo1htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/languageinformation/html/languageinfo1htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/html/languageinfo1htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/languageinformation/html/languageinfo1htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/html/languageinfo2html.html b/tests/wpt/tests/conformance-checkers/html-its/languageinformation/html/languageinfo2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/html/languageinfo2html.html rename to tests/wpt/tests/conformance-checkers/html-its/languageinformation/html/languageinfo2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/html/languageinfo2htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/languageinformation/html/languageinfo2htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/html/languageinfo2htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/languageinformation/html/languageinfo2htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/html/languageinfo3html.html b/tests/wpt/tests/conformance-checkers/html-its/languageinformation/html/languageinfo3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/html/languageinfo3html.html rename to tests/wpt/tests/conformance-checkers/html-its/languageinformation/html/languageinfo3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/xml/languageinfo1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/languageinformation/xml/languageinfo1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/xml/languageinfo1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/languageinformation/xml/languageinfo1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/xml/languageinfo2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/languageinformation/xml/languageinfo2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/xml/languageinfo2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/languageinformation/xml/languageinfo2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/xml/languageinfo2xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/languageinformation/xml/languageinfo2xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/xml/languageinfo2xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/languageinformation/xml/languageinfo2xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/xml/languageinfo3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/languageinformation/xml/languageinfo3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/xml/languageinfo3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/languageinformation/xml/languageinfo3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/xml/languageinfo4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/languageinformation/xml/languageinfo4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/xml/languageinfo4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/languageinformation/xml/languageinfo4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/xml/languageinfo4xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/languageinformation/xml/languageinfo4xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/languageinformation/xml/languageinfo4xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/languageinformation/xml/languageinfo4xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/html/locale1html.html b/tests/wpt/tests/conformance-checkers/html-its/localefilter/html/locale1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/html/locale1html.html rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/html/locale1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/html/locale1htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/localefilter/html/locale1htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/html/locale1htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/html/locale1htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/html/locale2html.html b/tests/wpt/tests/conformance-checkers/html-its/localefilter/html/locale2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/html/locale2html.html rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/html/locale2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/html/locale3html.html b/tests/wpt/tests/conformance-checkers/html-its/localefilter/html/locale3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/html/locale3html.html rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/html/locale3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/html/locale3htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/localefilter/html/locale3htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/html/locale3htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/html/locale3htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/html/locale4html.html b/tests/wpt/tests/conformance-checkers/html-its/localefilter/html/locale4html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/html/locale4html.html rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/html/locale4html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/html/locale5html.html b/tests/wpt/tests/conformance-checkers/html-its/localefilter/html/locale5html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/html/locale5html.html rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/html/locale5html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale3xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale3xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale3xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale3xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale4xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale4xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale4xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale4xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale6xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale6xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale6xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale6xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale7xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale7xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale7xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale7xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale7xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale7xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale7xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale7xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale8xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale8xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localefilter/xml/locale8xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localefilter/xml/locale8xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote1html.html b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote1html.html rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote1htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote1htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote1htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote1htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote2html.html b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote2html.html rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote2htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote2htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote2htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote2htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote3html.html b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote3html.html rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote3htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote3htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote3htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote3htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote4html.html b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote4html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote4html.html rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote4html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote4htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote4htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote4htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote4htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote5html.html b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote5html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote5html.html rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote5html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote5htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote5htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote5htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote5htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote6html.html b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote6html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote6html.html rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote6html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote6htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote6htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote6htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote6htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote7html.html b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote7html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote7html.html rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote7html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote8html.html b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote8html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote8html.html rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote8html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote8htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote8htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote8htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote8htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote9html.html b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote9html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/html/locnote9html.html rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/html/locnote9html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote10xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote10xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote10xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote10xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote11xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote11xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote11xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote11xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote11xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote11xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote11xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote11xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote5xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote5xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote5xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote5xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote6xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote6xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote6xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote6xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote7xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote7xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote7xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote7xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote8xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote8xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote8xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote8xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote9xml.xml b/tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote9xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/localizationnote/xml/locnote9xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/localizationnote/xml/locnote9xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue10html.html b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue10html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue10html.html rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue10html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue1html.html b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue1html.html rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue1htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue1htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue1htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue1htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue2html.html b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue2html.html rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue2htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue2htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue2htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue2htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue3html.html b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue3html.html rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue3htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue3htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue3htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue3htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue4html.html b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue4html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue4html.html rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue4html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue5html.html b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue5html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue5html.html rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue5html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue6html.html b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue6html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue6html.html rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue6html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue7html.html b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue7html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue7html.html rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue7html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue8html.html b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue8html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue8html.html rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue8html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue8htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue8htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue8htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue8htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue9html.html b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue9html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue9html.html rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue9html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue9htmlstandoff.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue9htmlstandoff.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue9htmlstandoff.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/html/locqualityissue9htmlstandoff.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue10xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue10xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue10xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue10xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue11xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue11xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue11xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue11xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue12xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue12xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue12xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue12xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue12xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue12xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue12xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue12xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue13xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue13xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue13xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue13xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue5xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue5xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue5xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue5xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue6xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue6xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue6xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue6xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue7xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue7xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue7xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue7xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue8xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue8xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue8xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue8xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue9xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue9xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue9xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityissue/xml/locqualityissue9xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityrating/html/locqualityrating1html.html b/tests/wpt/tests/conformance-checkers/html-its/locqualityrating/html/locqualityrating1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityrating/html/locqualityrating1html.html rename to tests/wpt/tests/conformance-checkers/html-its/locqualityrating/html/locqualityrating1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityrating/html/locqualityrating2html.html b/tests/wpt/tests/conformance-checkers/html-its/locqualityrating/html/locqualityrating2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityrating/html/locqualityrating2html.html rename to tests/wpt/tests/conformance-checkers/html-its/locqualityrating/html/locqualityrating2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/locqualityrating/xml/locqualityrating4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence1html.html b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence1html.html rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence2html.html b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence2html.html rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence2htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence2htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence2htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence2htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence3html.html b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence3html.html rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence3htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence3htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence3htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence3htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence4html.html b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence4html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence4html.html rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence4html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence4htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence4htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence4htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence4htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence5html.html b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence5html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence5html.html rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/html/mtconfidence5html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence2xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence2xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence2xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence2xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence5xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence5xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence5xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence5xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence6xml.xml b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence6xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence6xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence6xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence7xml.xml b/tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence7xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence7xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/mtconfidence/xml/mtconfidence7xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace3xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace3xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace3xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace3xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace6xml.xml b/tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace6xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace6xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace6xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace6xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace6xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/preservespace/xml/preservespace6xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/preservespace/xml/preservespace6xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance1html.html b/tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance1html.html rename to tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance1htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance1htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance1htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance1htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance2html.html b/tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance2html.html rename to tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance3html.html b/tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance3html.html rename to tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance4html.html b/tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance4html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance4html.html rename to tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance4html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance5html.html b/tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance5html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance5html.html rename to tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance5html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance5htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance5htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance5htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance5htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance6html.html b/tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance6html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance6html.html rename to tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance6html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance6htmlstandoff.xml b/tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance6htmlstandoff.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance6htmlstandoff.xml rename to tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance6htmlstandoff.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance7html.html b/tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance7html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance7html.html rename to tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance7html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance7htmlstandoff.html b/tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance7htmlstandoff.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance7htmlstandoff.html rename to tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance7htmlstandoff.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance8html.html b/tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance8html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/html/provenance8html.html rename to tests/wpt/tests/conformance-checkers/html-its/provenance/html/provenance8html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance3xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance3xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance3xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance3xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance4xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance4xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance4xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance4xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance6xml.xml b/tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance6xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance6xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance6xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance6xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance6xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance6xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance6xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance7xml.xml b/tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance7xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance7xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance7xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance8xml.xml b/tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance8xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/provenance/xml/provenance8xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/provenance/xml/provenance8xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/html/storagesize1html.html b/tests/wpt/tests/conformance-checkers/html-its/storagesize/html/storagesize1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/html/storagesize1html.html rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/html/storagesize1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/html/storagesize2html.html b/tests/wpt/tests/conformance-checkers/html-its/storagesize/html/storagesize2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/html/storagesize2html.html rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/html/storagesize2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/html/storagesize2htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/storagesize/html/storagesize2htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/html/storagesize2htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/html/storagesize2htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/html/storagesize3html.html b/tests/wpt/tests/conformance-checkers/html-its/storagesize/html/storagesize3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/html/storagesize3html.html rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/html/storagesize3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/html/storagesize3htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/storagesize/html/storagesize3htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/html/storagesize3htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/html/storagesize3htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/html/storagesize4html.html b/tests/wpt/tests/conformance-checkers/html-its/storagesize/html/storagesize4html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/html/storagesize4html.html rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/html/storagesize4html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize3xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize3xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize3xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize3xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize4xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize4xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize4xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize4xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize6xml.xml b/tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize6xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize6xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize6xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize7xml.xml b/tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize7xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize7xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize7xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize7xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize7xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize7xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize7xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize8xml.xml b/tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize8xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize8xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize8xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize9xml.xml b/tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize9xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/storagesize/xml/storagesize9xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/storagesize/xml/storagesize9xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/html/targetpointer1html.html b/tests/wpt/tests/conformance-checkers/html-its/targetpointer/html/targetpointer1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/html/targetpointer1html.html rename to tests/wpt/tests/conformance-checkers/html-its/targetpointer/html/targetpointer1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/html/targetpointer1htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/targetpointer/html/targetpointer1htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/html/targetpointer1htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/targetpointer/html/targetpointer1htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/html/targetpointer2html.html b/tests/wpt/tests/conformance-checkers/html-its/targetpointer/html/targetpointer2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/html/targetpointer2html.html rename to tests/wpt/tests/conformance-checkers/html-its/targetpointer/html/targetpointer2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/html/targetpointer2htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/targetpointer/html/targetpointer2htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/html/targetpointer2htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/targetpointer/html/targetpointer2htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/html/targetpointer3html.html b/tests/wpt/tests/conformance-checkers/html-its/targetpointer/html/targetpointer3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/html/targetpointer3html.html rename to tests/wpt/tests/conformance-checkers/html-its/targetpointer/html/targetpointer3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/xml/targetpointer1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/targetpointer/xml/targetpointer1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/xml/targetpointer1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/targetpointer/xml/targetpointer1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/xml/targetpointer2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/targetpointer/xml/targetpointer2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/xml/targetpointer2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/targetpointer/xml/targetpointer2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/xml/targetpointer2xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/targetpointer/xml/targetpointer2xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/xml/targetpointer2xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/targetpointer/xml/targetpointer2xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/xml/targetpointer3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/targetpointer/xml/targetpointer3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/xml/targetpointer3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/targetpointer/xml/targetpointer3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/xml/targetpointer4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/targetpointer/xml/targetpointer4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/xml/targetpointer4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/targetpointer/xml/targetpointer4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/xml/targetpointer4xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/targetpointer/xml/targetpointer4xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/targetpointer/xml/targetpointer4xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/targetpointer/xml/targetpointer4xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology1html.html b/tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology1html.html rename to tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology1htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology1htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology1htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology1htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology2html.html b/tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology2html.html rename to tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology2htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology2htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology2htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology2htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology3html.html b/tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology3html.html rename to tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology4html.html b/tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology4html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology4html.html rename to tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology4html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology4htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology4htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology4htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology4htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology5html.html b/tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology5html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology5html.html rename to tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology5html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology6html.html b/tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology6html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/html/terminology6html.html rename to tests/wpt/tests/conformance-checkers/html-its/terminology/html/terminology6html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology4xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology4xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology4xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology4xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology6xml.xml b/tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology6xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology6xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology6xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology7xml.xml b/tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology7xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology7xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology7xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology8xml.xml b/tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology8xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology8xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology8xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology8xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology8xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology8xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology8xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology9xml.xml b/tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology9xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/terminology/xml/terminology9xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/terminology/xml/terminology9xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis1html.html b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis1html.html rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis1htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis1htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis1htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis1htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis2html.html b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis2html.html rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis2htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis2htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis2htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis2htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis3html.html b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis3html.html rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis3htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis3htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis3htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis3htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis4html.html b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis4html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis4html.html rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis4html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis5html.html b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis5html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/html/textanalysis5html.html rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/html/textanalysis5html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis2xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis2xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis2xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis2xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis4xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis4xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis4xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis4xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis6xml.xml b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis6xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis6xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis6xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis7xml.xml b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis7xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis7xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis7xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis8xml.xml b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis8xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis8xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis8xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis8xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis8xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/textanalysis/xml/textanalysis8xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/textanalysis/xml/textanalysis8xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate1html.html b/tests/wpt/tests/conformance-checkers/html-its/translate/html/translate1html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate1html.html rename to tests/wpt/tests/conformance-checkers/html-its/translate/html/translate1html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate1htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/html/translate1htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate1htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/html/translate1htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate2html.html b/tests/wpt/tests/conformance-checkers/html-its/translate/html/translate2html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate2html.html rename to tests/wpt/tests/conformance-checkers/html-its/translate/html/translate2html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate3html.html b/tests/wpt/tests/conformance-checkers/html-its/translate/html/translate3html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate3html.html rename to tests/wpt/tests/conformance-checkers/html-its/translate/html/translate3html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate3htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/html/translate3htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate3htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/html/translate3htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate4html.html b/tests/wpt/tests/conformance-checkers/html-its/translate/html/translate4html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate4html.html rename to tests/wpt/tests/conformance-checkers/html-its/translate/html/translate4html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate4htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/html/translate4htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate4htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/html/translate4htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate5html.html b/tests/wpt/tests/conformance-checkers/html-its/translate/html/translate5html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate5html.html rename to tests/wpt/tests/conformance-checkers/html-its/translate/html/translate5html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate5htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/html/translate5htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate5htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/html/translate5htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate6html.html b/tests/wpt/tests/conformance-checkers/html-its/translate/html/translate6html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate6html.html rename to tests/wpt/tests/conformance-checkers/html-its/translate/html/translate6html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate6htmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/html/translate6htmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate6htmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/html/translate6htmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate7html.html b/tests/wpt/tests/conformance-checkers/html-its/translate/html/translate7html.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/html/translate7html.html rename to tests/wpt/tests/conformance-checkers/html-its/translate/html/translate7html.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate10xml.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate10xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate10xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate10xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate10xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate10xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate10xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate10xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate1xml.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate1xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate1xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate1xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate2xml.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate2xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate2xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate2xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate2xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate2xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate2xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate2xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate3xml.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate3xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate3xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate3xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate3xmlrules.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate3xmlrules.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate3xmlrules.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate3xmlrules.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate4xml.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate4xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate4xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate4xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate5xml.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate5xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate5xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate5xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate6xml.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate6xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate6xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate6xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate7xml.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate7xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate7xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate7xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate8xml.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate8xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate8xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate8xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate9xml.xml b/tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate9xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-its/translate/xml/translate9xml.xml rename to tests/wpt/tests/conformance-checkers/html-its/translate/xml/translate9xml.xml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0001-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0001-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0001-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0001-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0006-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0006-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0006-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0006-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0007-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0007-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0007-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0007-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0008-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0008-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0008-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0008-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0009-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0009-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0009-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0009-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0010-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0010-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0010-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0010-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0014-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0014-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0014-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0014-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0015-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0015-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0015-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0015-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0017-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0017-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0017-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0017-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0018-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0018-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0018-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0018-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0019-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0019-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0019-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0019-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0020-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0020-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0020-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0020-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0021-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0021-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0021-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0021-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0023-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0023-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0023-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0023-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0025-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0025-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0025-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0025-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0026-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0026-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0026-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0026-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0027-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0027-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0027-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0027-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0029-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0029-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0029-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0029-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0030-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0030-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0030-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0030-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0031-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0031-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0031-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0031-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0032-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0032-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0032-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0032-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0033-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0033-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0033-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0033-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0034-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0034-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0034-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0034-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0035-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0035-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0035-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0035-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0036-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0036-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0036-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0036-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0037-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0037-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0037-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0037-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0038-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0038-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0038-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0038-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0039-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0039-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0039-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0039-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0041-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0041-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0041-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0041-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0048-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0048-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0048-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0048-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0049-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0049-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0049-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0049-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0050-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0050-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0050-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0050-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0051-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0051-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0051-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0051-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0052-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0052-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0052-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0052-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0053-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0053-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0053-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0053-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0054-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0054-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0054-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0054-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0055-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0055-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0055-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0055-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0056-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0056-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0056-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0056-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0057-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0057-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0057-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0057-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0059-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0059-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0059-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0059-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0060-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0060-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0060-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0060-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0063-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0063-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0063-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0063-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0064-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0064-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0064-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0064-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0065-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0065-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0065-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0065-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0066-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0066-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0066-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0066-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0067-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0067-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0067-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0067-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0068-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0068-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0068-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0068-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0069-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0069-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0069-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0069-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0070-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0070-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0070-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0070-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0071-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0071-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0071-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0071-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0072-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0072-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0072-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0072-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0073-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0073-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0073-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0073-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0074-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0074-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0074-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0074-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0075-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0075-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0075-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0075-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0079-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0079-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0079-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0079-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0080-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0080-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0080-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0080-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0083-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0083-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0083-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0083-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0084-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0084-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0084-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0084-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0085-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0085-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0085-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0085-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0087-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0087-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0087-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0087-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0088-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0088-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0088-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0088-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0089-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0089-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0089-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0089-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0091-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0091-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0091-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0091-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0093-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0093-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0093-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0093-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0099-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0099-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0099-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0099-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0104-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0104-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0104-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0104-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0106-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0106-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0106-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0106-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0107-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0107-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0107-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0107-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0109-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0109-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0109-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0109-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0110-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0110-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0110-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0110-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0111-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0111-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0111-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0111-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0112-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0112-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0112-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0112-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0114-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0114-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0114-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0114-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0115-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0115-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0115-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0115-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0117-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0117-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0117-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0117-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0118-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0118-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0118-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0118-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0119-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0119-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0119-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0119-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0120-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0120-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0120-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0120-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0122-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0122-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0122-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0122-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0126-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0126-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0126-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0126-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0131-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0131-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0131-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0131-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0134-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0134-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0134-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0134-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0140-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0140-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0140-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0140-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0147-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0147-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0147-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0147-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0174-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0174-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0174-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0174-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0175-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0175-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0175-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0175-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0176-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0176-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0176-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0176-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0177-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0177-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0177-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0177-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0178-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0178-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0178-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0178-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0179-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0179-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0179-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0179-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0180-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0180-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0180-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0180-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0181-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0181-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0181-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0181-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0182-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0182-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0182-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0182-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0183-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0183-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0183-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0183-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0186-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0186-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0186-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0186-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0187-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0187-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0187-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0187-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0188-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0188-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0188-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0188-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0189-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0189-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0189-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0189-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0190-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0190-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0190-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0190-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0196-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0196-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0196-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0196-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0197-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0197-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0197-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0197-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0206-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0206-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0206-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0206-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0207-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0207-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0207-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0207-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0213-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0213-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0213-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0213-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0214-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0214-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0214-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0214-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0216-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0216-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0216-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0216-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0217-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0217-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0217-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0217-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0218-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0218-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0218-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0218-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0219-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0219-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0219-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0219-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0220-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0220-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0220-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0220-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0221-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0221-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0221-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0221-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0222-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0222-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0222-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0222-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0223-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0223-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0223-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0223-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0224-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0224-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0224-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0224-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0225-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0225-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0225-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0225-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0226-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0226-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0226-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0226-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0227-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0227-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0227-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0227-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0228-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0228-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0228-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0228-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0229-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0229-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0229-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0229-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0230-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0230-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0230-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0230-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0231-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0231-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0231-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0231-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0232-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0232-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0232-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0232-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0233-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0233-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0233-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0233-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0234-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0234-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0234-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0234-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0235-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0235-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0235-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0235-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0237-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0237-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0237-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0237-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0238-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0238-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0238-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0238-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0239-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0239-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0239-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0239-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0240-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0240-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0240-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0240-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0241-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0241-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0241-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0241-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0242-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0242-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0242-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0242-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0243-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0243-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0243-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0243-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0244-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0244-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0244-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0244-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0245-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0245-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0245-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0245-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0246-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0246-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0246-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0246-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0247-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0247-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0247-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0247-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0248-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0248-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0248-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0248-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0249-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0249-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0249-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0249-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0250-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0250-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0250-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0250-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0251-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0251-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0251-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0251-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0252-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0252-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0252-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0252-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0253-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0253-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0253-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0253-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0254-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0254-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0254-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0254-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0255-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0255-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0255-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0255-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0257-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0257-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0257-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0257-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0258-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0258-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0258-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0258-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0259-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0259-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0259-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0259-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0261-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0261-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0261-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0261-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0262-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0262-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0262-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0262-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0263-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0263-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0263-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0263-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0264-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0264-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0264-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0264-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0265-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0265-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0265-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0265-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0266-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0266-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0266-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0266-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0267-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0267-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0267-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0267-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0268-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0268-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0268-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0268-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0269-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0269-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0269-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0269-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0271-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0271-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0271-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0271-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0272-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0272-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0272-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0272-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0273-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0273-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0273-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0273-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0274-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0274-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0274-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0274-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0275-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0275-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0275-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0275-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0276-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0276-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0276-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0276-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0277-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0277-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0277-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0277-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0278-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0278-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0278-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0278-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0279-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0279-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0279-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0279-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0280-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0280-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0280-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0280-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0281-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0281-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0281-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0281-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0282-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0282-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0282-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0282-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0283-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0283-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0283-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0283-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0284-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0284-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0284-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0284-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0285-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0285-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0285-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0285-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0287-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0287-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0287-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0287-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0289-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0289-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0289-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0289-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0290-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0290-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0290-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0290-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0291-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0291-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0291-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0291-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0292-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0292-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0292-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0292-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0293-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0293-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0293-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0293-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0296-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0296-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0296-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0296-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0297-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0297-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0297-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0297-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0298-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0298-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0298-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0298-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0299-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0299-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0299-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0299-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0300-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0300-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0300-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0300-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0301-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0301-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0301-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0301-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0302-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0302-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0302-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0302-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0303-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0303-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0303-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0303-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0305-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0305-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0305-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0305-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0306-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0306-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0306-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0306-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0307-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0307-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0307-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0307-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0308-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0308-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0308-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0308-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0309-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0309-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0309-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0309-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0310-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0310-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0310-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0310-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0311-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0311-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0311-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0311-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0312-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0312-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0312-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0312-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0313-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0313-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0313-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0313-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0314-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0314-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0314-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0314-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0315-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0315-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0315-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0315-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0316-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0316-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0316-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0316-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0317-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0317-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0317-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0317-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0318-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0318-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0318-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0318-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0319-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0319-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0319-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0319-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0320-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0320-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0320-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0320-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0321-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0321-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0321-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0321-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0322-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0322-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0322-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0322-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0323-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0323-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0323-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0323-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0324-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0324-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0324-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0324-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0325-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0325-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0325-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0325-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0326-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0326-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0326-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0326-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0327-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0327-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0327-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0327-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0328-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0328-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0328-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0328-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0329-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0329-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0329-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0329-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0330-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0330-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0330-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0330-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0331-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfa/0331-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfa/0331-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfa/0331-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0015-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0015-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0015-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0015-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0021-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0021-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0021-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0021-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0023-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0023-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0023-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0023-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0030-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0030-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0030-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0030-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0050-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0050-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0050-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0050-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0052-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0052-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0052-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0052-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0053-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0053-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0053-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0053-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0066-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0066-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0066-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0066-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0067-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0067-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0067-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0067-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0071-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0071-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0071-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0071-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0074-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0074-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0074-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0074-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0075-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0075-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0075-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0075-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0089-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0089-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0089-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0089-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0115-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0115-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0115-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0115-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0117-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0117-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0117-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0117-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0134-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0134-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0134-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0134-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0140-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0140-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0140-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0140-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0147.novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0147.novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0147.novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0147.novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0214-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0214-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0214-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0214-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0235-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0235-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0235-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0235-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0238-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0238-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0238-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0238-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0239-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0239-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0239-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0239-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0240-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0240-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0240-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0240-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0241-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0241-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0241-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0241-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0242-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0242-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0242-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0242-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0255-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0255-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0255-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0255-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0259-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0259-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0259-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0259-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0263-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0263-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0263-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0263-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0264-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0264-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0264-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0264-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0272-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0272-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0272-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0272-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0273-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0273-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0273-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0273-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0274-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0274-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0274-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0274-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0275-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0275-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0275-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0275-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0276-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0276-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0276-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0276-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0277-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0277-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0277-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0277-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0281-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0281-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0281-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0281-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0282-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0282-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0282-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0282-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0283-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0283-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0283-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0283-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0287-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0287-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0287-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0287-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0296-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0296-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0296-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0296-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0301-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0301-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0301-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0301-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0302-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0302-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0302-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0302-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0305-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0305-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0305-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0305-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0306-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0306-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0306-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0306-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0307-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0307-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0307-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0307-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0311-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0311-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0311-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0311-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0312-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0312-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0312-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0312-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0313-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0313-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0313-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0313-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0319-novalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0319-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0319-novalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0319-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0321-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0321-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0321-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0321-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0322-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0322-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0322-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0322-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0323-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0323-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0323-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0323-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0324-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0324-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0324-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0324-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0325-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0325-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0325-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0325-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0326-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0326-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0326-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0326-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0327-isvalid.html b/tests/wpt/tests/conformance-checkers/html-rdfalite/0327-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-rdfalite/0327-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-rdfalite/0327-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/0001isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/0001isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/0001isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/0001isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-dom-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-dom-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-dom-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-dom-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-dom-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-dom-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-dom-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-dom-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-05-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-05-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-05-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-05-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-06-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-06-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-06-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-06-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-07-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-07-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-07-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-07-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-08-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-08-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-08-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-08-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-09-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-09-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-09-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-09-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-10-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-10-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-10-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-10-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-11-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-11-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-11-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-11-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-12-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-12-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-12-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-12-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-13-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-13-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-13-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-13-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-14-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-14-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-14-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-14-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-15-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-15-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-15-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-15-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-17-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-17-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-17-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-17-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-19-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-19-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-19-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-19-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-20-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-20-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-20-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-20-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-21-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-21-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-21-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-21-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-22-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-22-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-22-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-22-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-23-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-23-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-23-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-23-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-24-t-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-24-t-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-24-t-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-24-t-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-25-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-25-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-25-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-25-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-26-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-26-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-26-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-26-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-27-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-27-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-27-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-27-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-28-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-28-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-28-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-28-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-29-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-29-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-29-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-29-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-30-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-30-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-30-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-30-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-31-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-31-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-31-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-31-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-32-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-32-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-32-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-32-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-33-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-33-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-33-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-33-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-34-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-34-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-34-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-34-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-35-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-35-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-35-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-35-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-36-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-36-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-36-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-36-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-37-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-37-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-37-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-37-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-38-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-38-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-38-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-38-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-39-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-39-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-39-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-39-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-40-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-40-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-40-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-40-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-41-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-41-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-41-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-41-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-44-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-44-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-44-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-44-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-46-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-46-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-46-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-46-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-52-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-52-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-52-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-52-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-53-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-53-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-53-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-53-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-60-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-60-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-60-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-60-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-61-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-61-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-61-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-61-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-62-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-62-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-62-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-62-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-63-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-63-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-63-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-63-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-64-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-64-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-64-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-64-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-65-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-65-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-65-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-65-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-66-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-66-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-66-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-66-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-67-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-67-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-67-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-67-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-68-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-68-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-68-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-68-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-69-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-69-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-69-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-69-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-70-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-70-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-70-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-70-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-77-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-77-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-77-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-77-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-78-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-78-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-78-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-78-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-80-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-80-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-80-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-80-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-81-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-81-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-81-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-81-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-82-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-82-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-82-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-82-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-83-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-83-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-83-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-83-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-84-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-84-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-84-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-84-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-85-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-85-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-85-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-85-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-86-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-86-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-86-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-86-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-87-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-87-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-87-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-87-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-88-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-88-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-88-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-88-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-89-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-89-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-89-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-89-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-90-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-90-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-90-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-90-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-91-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-91-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-91-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-91-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-92-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-elem-92-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-elem-92-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-elem-92-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-interact-events-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-interact-events-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-interact-events-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-interact-events-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-interact-pevents-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-interact-pevents-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-interact-pevents-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-interact-pevents-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-interact-pevents-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-interact-pevents-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-interact-pevents-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-interact-pevents-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-interact-pevents-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-interact-pevents-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-interact-pevents-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-interact-pevents-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-interact-pevents-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-interact-pevents-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-interact-pevents-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-interact-pevents-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-pservers-grad-01-b-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-pservers-grad-01-b-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-pservers-grad-01-b-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-pservers-grad-01-b-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-script-elem-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-script-elem-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-script-elem-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-script-elem-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-struct-dom-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/animate-struct-dom-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/animate-struct-dom-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/animate-struct-dom-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/color-prof-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/color-prof-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/color-prof-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/color-prof-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/color-prop-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/color-prop-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/color-prop-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/color-prop-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/color-prop-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/color-prop-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/color-prop-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/color-prop-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/color-prop-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/color-prop-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/color-prop-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/color-prop-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/color-prop-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/color-prop-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/color-prop-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/color-prop-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/color-prop-05-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/color-prop-05-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/color-prop-05-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/color-prop-05-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/conform-viewers-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/conform-viewers-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/conform-viewers-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/conform-viewers-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/conform-viewers-03-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/conform-viewers-03-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/conform-viewers-03-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/conform-viewers-03-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-coord-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-coord-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-coord-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-coord-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-coord-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-coord-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-coord-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-coord-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-dom-01-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-dom-01-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-dom-01-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-dom-01-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-dom-02-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-dom-02-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-dom-02-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-dom-02-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-dom-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-dom-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-dom-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-dom-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-dom-04-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-dom-04-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-dom-04-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-dom-04-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-trans-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-trans-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-trans-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-trans-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-trans-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-trans-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-trans-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-trans-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-05-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-trans-05-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-05-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-trans-05-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-06-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-trans-06-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-06-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-trans-06-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-07-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-trans-07-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-07-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-trans-07-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-08-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-trans-08-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-08-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-trans-08-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-09-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-trans-09-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-09-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-trans-09-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-10-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-trans-10-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-10-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-trans-10-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-11-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-trans-11-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-11-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-trans-11-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-12-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-trans-12-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-12-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-trans-12-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-13-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-trans-13-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-13-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-trans-13-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-14-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-trans-14-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-trans-14-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-trans-14-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-transformattr-01-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-transformattr-01-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-transformattr-01-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-transformattr-01-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-transformattr-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-transformattr-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-transformattr-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-transformattr-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-transformattr-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-transformattr-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-transformattr-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-transformattr-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-transformattr-04-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-transformattr-04-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-transformattr-04-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-transformattr-04-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-transformattr-05-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-transformattr-05-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-transformattr-05-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-transformattr-05-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-units-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-units-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-units-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-units-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-units-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-units-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-units-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-units-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-units-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-units-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-units-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-units-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-viewattr-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/coords-viewattr-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/coords-viewattr-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/coords-viewattr-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/extend-namespace-01-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/extend-namespace-01-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/extend-namespace-01-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/extend-namespace-01-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-background-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-background-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-background-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-background-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-blend-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-blend-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-blend-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-blend-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-color-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-color-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-color-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-color-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-color-02-b-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-color-02-b-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-color-02-b-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-color-02-b-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-composite-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-composite-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-composite-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-composite-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-composite-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-composite-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-composite-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-composite-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-composite-04-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-composite-04-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-composite-04-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-composite-04-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-composite-05-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-composite-05-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-composite-05-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-composite-05-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-comptran-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-comptran-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-comptran-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-comptran-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-conv-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-conv-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-conv-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-conv-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-conv-02-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-conv-02-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-conv-02-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-conv-02-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-conv-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-conv-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-conv-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-conv-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-conv-04-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-conv-04-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-conv-04-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-conv-04-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-conv-05-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-conv-05-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-conv-05-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-conv-05-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-diffuse-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-diffuse-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-diffuse-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-diffuse-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-displace-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-displace-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-displace-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-displace-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-displace-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-displace-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-displace-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-displace-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-example-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-example-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-example-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-example-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-felem-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-felem-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-felem-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-felem-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-felem-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-felem-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-felem-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-felem-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-gauss-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-gauss-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-gauss-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-gauss-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-gauss-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-gauss-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-gauss-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-gauss-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-gauss-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-gauss-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-gauss-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-gauss-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-image-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-image-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-image-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-image-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-image-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-image-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-image-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-image-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-image-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-image-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-image-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-image-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-image-04-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-image-04-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-image-04-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-image-04-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-image-05-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-image-05-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-image-05-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-image-05-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-light-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-light-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-light-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-light-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-light-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-light-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-light-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-light-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-light-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-light-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-light-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-light-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-light-04-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-light-04-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-light-04-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-light-04-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-light-05-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-light-05-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-light-05-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-light-05-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-morph-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-morph-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-morph-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-morph-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-offset-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-offset-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-offset-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-offset-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-offset-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-offset-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-offset-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-offset-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-overview-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-overview-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-overview-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-overview-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-overview-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-overview-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-overview-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-overview-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-overview-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-overview-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-overview-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-overview-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-specular-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-specular-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-specular-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-specular-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-tile-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-tile-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-tile-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-tile-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-turb-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-turb-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-turb-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-turb-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-turb-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/filters-turb-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/filters-turb-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/filters-turb-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-desc-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-desc-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-desc-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-desc-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-desc-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-desc-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-desc-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-desc-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-desc-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-desc-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-desc-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-desc-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-desc-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-desc-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-desc-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-desc-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-desc-05-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-desc-05-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-desc-05-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-desc-05-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-elem-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-elem-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-elem-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-elem-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-elem-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-elem-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-elem-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-elem-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-elem-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-elem-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-elem-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-elem-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-elem-04-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-elem-04-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-elem-04-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-elem-04-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-elem-05-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-elem-05-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-elem-05-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-elem-05-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-elem-06-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-elem-06-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-elem-06-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-elem-06-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-elem-07-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-elem-07-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-elem-07-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-elem-07-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-glyph-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-glyph-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-glyph-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-glyph-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-glyph-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-glyph-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-glyph-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-glyph-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-glyph-04-t-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-glyph-04-t-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-glyph-04-t-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-glyph-04-t-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-kern-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-kern-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-kern-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-kern-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-overview-201-t-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/fonts-overview-201-t-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/fonts-overview-201-t-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/fonts-overview-201-t-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/imp-path-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/imp-path-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/imp-path-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/imp-path-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-cursor-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-cursor-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-cursor-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-cursor-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-dom-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-dom-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-dom-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-dom-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-events-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-events-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-events-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-events-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-events-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-events-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-events-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-events-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-events-202-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-events-202-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-events-202-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-events-202-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-events-203-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-events-203-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-events-203-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-events-203-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-order-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-order-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-order-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-order-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-order-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-order-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-order-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-order-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-order-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-order-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-order-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-order-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-05-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-05-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-05-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-05-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-07-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-07-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-07-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-07-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-08-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-08-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-08-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-08-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-09-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-09-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-09-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-09-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-10-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-10-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pevents-10-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-pevents-10-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pointer-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-pointer-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pointer-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-pointer-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pointer-02-t-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-pointer-02-t-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pointer-02-t-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-pointer-02-t-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pointer-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-pointer-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pointer-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-pointer-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pointer-04-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-pointer-04-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-pointer-04-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-pointer-04-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-zoom-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-zoom-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-zoom-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-zoom-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-zoom-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-zoom-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-zoom-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-zoom-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-zoom-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/interact-zoom-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/interact-zoom-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/interact-zoom-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/linking-a-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/linking-a-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/linking-a-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/linking-a-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/linking-a-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/linking-a-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-05-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/linking-a-05-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-05-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/linking-a-05-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-07-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/linking-a-07-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-07-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/linking-a-07-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-08-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/linking-a-08-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-08-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/linking-a-08-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-09-b-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/linking-a-09-b-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-09-b-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/linking-a-09-b-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-10-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/linking-a-10-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-a-10-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/linking-a-10-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-frag-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/linking-frag-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-frag-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/linking-frag-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-uri-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/linking-uri-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-uri-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/linking-uri-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-uri-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/linking-uri-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-uri-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/linking-uri-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-uri-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/linking-uri-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/linking-uri-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/linking-uri-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-filter-01-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-filter-01-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-filter-01-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-filter-01-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-intro-01-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-intro-01-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-intro-01-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-intro-01-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-mask-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-mask-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-mask-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-mask-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-mask-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-mask-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-mask-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-mask-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-opacity-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-opacity-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-opacity-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-opacity-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-path-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-path-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-path-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-path-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-path-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-path-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-04-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-path-04-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-04-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-path-04-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-05-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-path-05-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-05-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-path-05-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-06-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-path-06-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-06-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-path-06-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-07-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-path-07-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-07-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-path-07-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-08-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-path-08-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-08-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-path-08-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-09-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-path-09-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-09-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-path-09-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-10-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-path-10-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-10-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-path-10-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-11-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-path-11-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-11-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-path-11-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-12-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-path-12-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-12-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-path-12-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-13-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-path-13-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-13-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-path-13-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-14-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/masking-path-14-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/masking-path-14-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/masking-path-14-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/metadata-example-01-t-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/metadata-example-01-t-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/metadata-example-01-t-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/metadata-example-01-t-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-control-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-control-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-control-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-control-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-control-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-control-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-control-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-control-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-control-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-control-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-control-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-control-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-control-04-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-control-04-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-control-04-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-control-04-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-control-05-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-control-05-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-control-05-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-control-05-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-control-06-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-control-06-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-control-06-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-control-06-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-fill-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-fill-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-fill-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-fill-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-fill-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-fill-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-fill-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-fill-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-fill-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-fill-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-fill-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-fill-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-fill-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-fill-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-fill-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-fill-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-fill-05-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-fill-05-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-fill-05-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-fill-05-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-marker-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-marker-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-marker-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-marker-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-marker-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-marker-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-04-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-marker-04-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-04-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-marker-04-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-05-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-marker-05-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-05-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-marker-05-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-06-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-marker-06-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-06-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-marker-06-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-07-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-marker-07-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-07-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-marker-07-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-properties-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-marker-properties-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-marker-properties-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-marker-properties-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-render-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-render-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-render-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-render-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-render-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-render-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-render-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-render-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-05-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-05-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-05-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-05-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-06-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-06-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-06-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-06-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-07-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-07-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-07-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-07-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-08-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-08-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-08-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-08-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-09-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-09-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-09-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-09-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-10-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-10-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/painting-stroke-10-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/painting-stroke-10-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-05-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-05-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-05-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-05-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-06-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-06-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-06-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-06-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-07-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-07-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-07-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-07-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-08-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-08-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-08-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-08-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-09-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-09-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-09-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-09-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-10-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-10-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-10-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-10-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-12-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-12-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-12-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-12-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-13-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-13-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-13-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-13-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-14-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-14-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-14-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-14-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-15-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-15-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-15-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-15-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-16-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-16-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-16-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-16-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-17-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-17-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-17-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-17-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-18-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-18-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-18-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-18-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-19-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-19-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-19-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-19-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-20-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-data-20-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-data-20-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-data-20-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-dom-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-dom-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-dom-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-dom-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-dom-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/paths-dom-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/paths-dom-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/paths-dom-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-04-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-04-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-04-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-04-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-05-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-05-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-05-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-05-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-06-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-06-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-06-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-06-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-07-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-07-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-07-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-07-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-08-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-08-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-08-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-08-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-09-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-09-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-09-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-09-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-10-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-10-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-10-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-10-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-11-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-11-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-11-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-11-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-12-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-12-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-12-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-12-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-13-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-13-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-13-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-13-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-14-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-14-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-14-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-14-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-15-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-15-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-15-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-15-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-16-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-16-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-16-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-16-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-17-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-17-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-17-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-17-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-18-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-18-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-18-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-18-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-20-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-20-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-20-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-20-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-21-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-21-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-21-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-21-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-22-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-22-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-22-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-22-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-23-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-23-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-23-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-23-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-24-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-24-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-24-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-24-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-stops-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-stops-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-grad-stops-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-grad-stops-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-04-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-04-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-04-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-04-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-05-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-05-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-05-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-05-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-06-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-06-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-06-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-06-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-07-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-07-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-07-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-07-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-08-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-08-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-08-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-08-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-09-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-09-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/pservers-pattern-09-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/pservers-pattern-09-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/render-elems-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/render-elems-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/render-elems-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/render-elems-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/render-elems-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/render-elems-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/render-elems-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/render-elems-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/render-elems-06-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/render-elems-06-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/render-elems-06-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/render-elems-06-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/render-elems-07-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/render-elems-07-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/render-elems-07-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/render-elems-07-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/render-elems-08-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/render-elems-08-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/render-elems-08-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/render-elems-08-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/render-groups-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/render-groups-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/render-groups-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/render-groups-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/render-groups-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/render-groups-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/render-groups-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/render-groups-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/script-handle-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/script-handle-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/script-handle-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/script-handle-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/script-handle-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/script-handle-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/script-handle-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/script-handle-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/script-handle-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/script-handle-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/script-handle-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/script-handle-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/script-handle-04-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/script-handle-04-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/script-handle-04-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/script-handle-04-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/script-specify-01-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/script-specify-01-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/script-specify-01-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/script-specify-01-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/script-specify-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/script-specify-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/script-specify-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/script-specify-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-circle-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-circle-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-circle-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-circle-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-circle-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-circle-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-circle-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-circle-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-ellipse-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-ellipse-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-ellipse-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-ellipse-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-ellipse-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-ellipse-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-ellipse-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-ellipse-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-ellipse-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-ellipse-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-ellipse-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-ellipse-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-grammar-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-grammar-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-grammar-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-grammar-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-intro-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-intro-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-intro-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-intro-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-intro-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-intro-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-intro-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-intro-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-line-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-line-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-line-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-line-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-line-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-line-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-line-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-line-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-polygon-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-polygon-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-polygon-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-polygon-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-polygon-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-polygon-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-polygon-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-polygon-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-polygon-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-polygon-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-polygon-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-polygon-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-polyline-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-polyline-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-polyline-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-polyline-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-polyline-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-polyline-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-polyline-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-polyline-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-rect-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-rect-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-rect-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-rect-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-rect-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-rect-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-rect-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-rect-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-rect-03-t-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-rect-03-t-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-rect-03-t-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-rect-03-t-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-rect-04-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-rect-04-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-rect-04-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-rect-04-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-rect-05-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-rect-05-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-rect-05-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-rect-05-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-rect-06-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-rect-06-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-rect-06-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-rect-06-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-rect-07-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/shapes-rect-07-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/shapes-rect-07-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/shapes-rect-07-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-cond-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-cond-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-cond-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-cond-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-cond-02-t-haswarn.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-cond-02-t-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-cond-02-t-haswarn.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-cond-02-t-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-cond-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-cond-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-cond-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-cond-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-cond-overview-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-cond-overview-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-cond-overview-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-cond-overview-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-cond-overview-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-cond-overview-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-cond-overview-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-cond-overview-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-cond-overview-04-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-cond-overview-04-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-cond-overview-04-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-cond-overview-04-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-cond-overview-05-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-cond-overview-05-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-cond-overview-05-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-cond-overview-05-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-defs-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-defs-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-defs-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-defs-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-04-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-04-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-04-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-04-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-05-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-05-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-05-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-05-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-06-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-06-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-06-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-06-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-07-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-07-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-07-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-07-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-08-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-08-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-08-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-08-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-11-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-11-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-11-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-11-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-12-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-12-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-12-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-12-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-13-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-13-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-13-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-13-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-14-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-14-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-14-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-14-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-15-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-15-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-15-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-15-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-16-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-16-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-16-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-16-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-17-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-17-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-17-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-17-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-18-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-18-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-18-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-18-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-19-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-19-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-19-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-19-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-20-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-dom-20-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-dom-20-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-dom-20-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-frag-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-frag-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-frag-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-frag-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-frag-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-frag-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-frag-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-frag-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-frag-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-frag-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-frag-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-frag-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-frag-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-frag-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-frag-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-frag-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-frag-05-t-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-frag-05-t-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-frag-05-t-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-frag-05-t-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-frag-06-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-frag-06-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-frag-06-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-frag-06-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-group-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-group-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-group-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-group-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-group-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-group-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-group-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-group-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-group-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-group-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-group-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-group-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-05-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-05-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-05-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-05-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-06-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-06-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-06-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-06-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-07-t-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-07-t-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-07-t-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-07-t-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-08-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-08-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-08-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-08-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-09-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-09-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-09-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-09-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-10-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-10-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-10-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-10-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-11-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-11-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-11-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-11-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-12-b-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-12-b-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-12-b-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-12-b-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-13-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-13-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-13-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-13-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-14-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-14-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-14-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-14-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-15-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-15-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-15-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-15-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-16-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-16-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-16-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-16-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-17-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-17-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-17-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-17-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-18-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-18-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-18-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-18-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-19-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-image-19-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-image-19-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-image-19-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-svg-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-svg-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-svg-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-svg-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-svg-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-svg-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-svg-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-svg-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-svg-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-svg-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-svg-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-svg-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-symbol-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-symbol-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-symbol-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-symbol-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-use-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-use-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-03-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-use-03-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-03-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-use-03-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-04-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-use-04-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-04-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-use-04-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-05-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-use-05-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-05-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-use-05-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-06-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-use-06-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-06-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-use-06-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-07-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-use-07-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-07-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-use-07-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-08-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-use-08-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-08-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-use-08-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-09-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-use-09-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-09-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-use-09-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-10-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-use-10-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-10-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-use-10-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-11-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-use-11-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-11-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-use-11-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-12-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-use-12-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-12-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-use-12-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-13-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-use-13-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-13-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-use-13-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-14-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-use-14-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-14-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-use-14-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-15-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/struct-use-15-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/struct-use-15-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/struct-use-15-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-class-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-class-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-class-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-class-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-css-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-css-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-css-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-css-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-css-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-css-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-04-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-css-04-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-04-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-css-04-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-05-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-css-05-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-05-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-css-05-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-06-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-css-06-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-06-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-css-06-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-07-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-css-07-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-07-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-css-07-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-08-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-css-08-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-08-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-css-08-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-09-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-css-09-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-09-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-css-09-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-10-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-css-10-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-css-10-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-css-10-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-elem-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-elem-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-elem-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-elem-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-inherit-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-inherit-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-inherit-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-inherit-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-pres-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-pres-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-pres-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-pres-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-pres-02-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-pres-02-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-pres-02-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-pres-02-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-pres-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-pres-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-pres-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-pres-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-pres-04-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-pres-04-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-pres-04-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-pres-04-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-pres-05-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/styling-pres-05-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/styling-pres-05-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/styling-pres-05-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/svgdom-over-01-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/svgdom-over-01-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/svgdom-over-01-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/svgdom-over-01-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-align-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-align-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-align-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-align-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-align-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-align-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-04-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-align-04-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-04-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-align-04-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-05-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-align-05-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-05-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-align-05-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-06-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-align-06-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-06-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-align-06-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-07-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-align-07-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-07-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-align-07-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-08-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-align-08-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-align-08-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-align-08-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-altglyph-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-altglyph-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-altglyph-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-altglyph-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-altglyph-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-altglyph-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-altglyph-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-altglyph-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-altglyph-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-altglyph-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-altglyph-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-altglyph-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-bidi-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-bidi-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-bidi-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-bidi-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-deco-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-deco-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-deco-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-deco-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-dom-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-dom-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-dom-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-dom-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-dom-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-dom-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-dom-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-dom-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-dom-03-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-dom-03-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-dom-03-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-dom-03-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-dom-04-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-dom-04-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-dom-04-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-dom-04-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-dom-05-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-dom-05-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-dom-05-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-dom-05-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-fonts-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-fonts-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-02-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-fonts-02-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-02-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-fonts-02-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-03-t-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-fonts-03-t-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-03-t-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-fonts-03-t-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-fonts-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-fonts-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-05-f-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-fonts-05-f-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-05-f-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-fonts-05-f-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-202-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-fonts-202-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-202-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-fonts-202-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-203-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-fonts-203-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-203-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-fonts-203-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-204-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-fonts-204-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-fonts-204-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-fonts-204-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-01-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-intro-01-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-01-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-intro-01-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-intro-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-intro-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-intro-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-intro-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-intro-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-intro-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-05-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-intro-05-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-05-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-intro-05-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-06-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-intro-06-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-06-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-intro-06-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-07-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-intro-07-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-07-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-intro-07-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-09-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-intro-09-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-09-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-intro-09-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-10-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-intro-10-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-10-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-intro-10-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-11-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-intro-11-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-11-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-intro-11-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-12-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-intro-12-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-intro-12-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-intro-12-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-path-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-path-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-path-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-path-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-path-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-path-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-path-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-path-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-spacing-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-spacing-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-spacing-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-spacing-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-text-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-text-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-text-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-text-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-04-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-text-04-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-04-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-text-04-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-05-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-text-05-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-05-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-text-05-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-06-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-text-06-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-06-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-text-06-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-07-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-text-07-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-07-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-text-07-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-08-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-text-08-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-08-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-text-08-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-09-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-text-09-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-09-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-text-09-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-10-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-text-10-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-10-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-text-10-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-11-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-text-11-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-11-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-text-11-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-12-t-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-text-12-t-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-text-12-t-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-text-12-t-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-tref-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-tref-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-tref-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-tref-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-tselect-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-tselect-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-tselect-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-tselect-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-tselect-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-tselect-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-tselect-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-tselect-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-tselect-03-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-tselect-03-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-tselect-03-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-tselect-03-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-tspan-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-tspan-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-tspan-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-tspan-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-tspan-02-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/text-tspan-02-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/text-tspan-02-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/text-tspan-02-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-basic-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-basic-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-basic-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-basic-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-basic-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-basic-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-basic-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-basic-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-01-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-dom-01-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-01-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-dom-01-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-02-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-dom-02-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-02-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-dom-02-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-03-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-dom-03-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-03-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-dom-03-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-04-b-novalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-dom-04-b-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-04-b-novalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-dom-04-b-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-05-b-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-dom-05-b-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-05-b-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-dom-05-b-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-06-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-dom-06-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-06-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-dom-06-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-07-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-dom-07-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-07-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-dom-07-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-08-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-dom-08-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-08-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-dom-08-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-svgfittoviewbox-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-dom-svgfittoviewbox-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-svgfittoviewbox-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-dom-svgfittoviewbox-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-svglengthlist-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-dom-svglengthlist-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-svglengthlist-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-dom-svglengthlist-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-svgnumberlist-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-dom-svgnumberlist-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-svgnumberlist-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-dom-svgnumberlist-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-svgstringlist-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-dom-svgstringlist-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-svgstringlist-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-dom-svgstringlist-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-svgtransformable-01-f-isvalid.html b/tests/wpt/tests/conformance-checkers/html-svg/types-dom-svgtransformable-01-f-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html-svg/types-dom-svgtransformable-01-f-isvalid.html rename to tests/wpt/tests/conformance-checkers/html-svg/types-dom-svgtransformable-01-f-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/Makefile b/tests/wpt/tests/conformance-checkers/html/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/Makefile rename to tests/wpt/tests/conformance-checkers/html/Makefile diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/attributes/accesskey/duplicate-key-labels-novalid.html b/tests/wpt/tests/conformance-checkers/html/attributes/accesskey/duplicate-key-labels-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/attributes/accesskey/duplicate-key-labels-novalid.html rename to tests/wpt/tests/conformance-checkers/html/attributes/accesskey/duplicate-key-labels-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/attributes/accesskey/multi-character-key-label-novalid.html b/tests/wpt/tests/conformance-checkers/html/attributes/accesskey/multi-character-key-label-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/attributes/accesskey/multi-character-key-label-novalid.html rename to tests/wpt/tests/conformance-checkers/html/attributes/accesskey/multi-character-key-label-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/attributes/data/no-characters-after-hyphen-novalid.html b/tests/wpt/tests/conformance-checkers/html/attributes/data/no-characters-after-hyphen-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/attributes/data/no-characters-after-hyphen-novalid.html rename to tests/wpt/tests/conformance-checkers/html/attributes/data/no-characters-after-hyphen-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/attributes/data/not-xml-serializable-novalid.html b/tests/wpt/tests/conformance-checkers/html/attributes/data/not-xml-serializable-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/attributes/data/not-xml-serializable-novalid.html rename to tests/wpt/tests/conformance-checkers/html/attributes/data/not-xml-serializable-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/attributes/data/value-isvalid.html b/tests/wpt/tests/conformance-checkers/html/attributes/data/value-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/attributes/data/value-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/attributes/data/value-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/attributes/lang/deprecated-tag-haswarn.html b/tests/wpt/tests/conformance-checkers/html/attributes/lang/deprecated-tag-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/attributes/lang/deprecated-tag-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/attributes/lang/deprecated-tag-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/attributes/lang/empty-isvalid.html b/tests/wpt/tests/conformance-checkers/html/attributes/lang/empty-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/attributes/lang/empty-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/attributes/lang/empty-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/attributes/lang/extlang-bad-novalid.html b/tests/wpt/tests/conformance-checkers/html/attributes/lang/extlang-bad-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/attributes/lang/extlang-bad-novalid.html rename to tests/wpt/tests/conformance-checkers/html/attributes/lang/extlang-bad-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/attributes/lang/xmllang-different-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/attributes/lang/xmllang-different-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/attributes/lang/xmllang-different-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/attributes/lang/xmllang-different-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/attributes/lang/xmllang-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/attributes/lang/xmllang-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/attributes/lang/xmllang-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/attributes/lang/xmllang-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/attributes/lang/xmllang-same-isvalid.html b/tests/wpt/tests/conformance-checkers/html/attributes/lang/xmllang-same-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/attributes/lang/xmllang-same-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/attributes/lang/xmllang-same-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/attributes/role/unrecognized-role-name-novalid.html b/tests/wpt/tests/conformance-checkers/html/attributes/role/unrecognized-role-name-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/attributes/role/unrecognized-role-name-novalid.html rename to tests/wpt/tests/conformance-checkers/html/attributes/role/unrecognized-role-name-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/attributes/spellcheck/value-bad-novalid.html b/tests/wpt/tests/conformance-checkers/html/attributes/spellcheck/value-bad-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/attributes/spellcheck/value-bad-novalid.html rename to tests/wpt/tests/conformance-checkers/html/attributes/spellcheck/value-bad-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/attributes/spellcheck/value-isvalid.html b/tests/wpt/tests/conformance-checkers/html/attributes/spellcheck/value-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/attributes/spellcheck/value-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/attributes/spellcheck/value-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/download-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/download-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/download-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/download-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/download-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/download-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/download-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/download-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/href/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/href/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/href/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/media-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/media-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/media-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/media-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/name-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/a/name-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/a/name-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/a/name-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/abbr/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/abbr/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/abbr/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/abbr/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/abbr/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/abbr/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/abbr/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/abbr/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/address/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/address/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/address/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/address/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/address/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/address/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/address/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/address/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/download-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/download-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/download-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/download-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href-empty-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href-empty-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href-empty-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href-empty-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/href/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/href/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/href/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/media-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/media-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/media-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/media-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/area/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/area/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/area/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/audio/src/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/audio/src/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/audio/src/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href-and-target-missing-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href-and-target-missing-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href-and-target-missing-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href-and-target-missing-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href-empty-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href-empty-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href-empty-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href-empty-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-contains-pile-of-poo-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-contains-pile-of-poo-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-contains-pile-of-poo-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-contains-pile-of-poo-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-contains-question-mark-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-contains-question-mark-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-contains-question-mark-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-contains-question-mark-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-empty-hash-only-no-path-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-empty-hash-only-no-path-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-empty-hash-only-no-path-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-empty-hash-only-no-path-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-non-ascii-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-non-ascii-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-non-ascii-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-non-ascii-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-semicolon-question-mark-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-semicolon-question-mark-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-semicolon-question-mark-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-semicolon-question-mark-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-slash-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-slash-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/fragment-slash-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/fragment-slash-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-192.0x00A80001-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-192.0x00A80001-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-192.0x00A80001-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-192.0x00A80001-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-IP-address-broken-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-IP-address-broken-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-IP-address-broken-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-IP-address-broken-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-IP-address-fullwidth-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-IP-address-fullwidth-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-IP-address-fullwidth-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-IP-address-fullwidth-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-IP-address-percent-encoded-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-IP-address-percent-encoded-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-IP-address-percent-encoded-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-IP-address-percent-encoded-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-exotic-dot-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-exotic-dot-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-exotic-dot-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-exotic-dot-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-exotic-whitespace-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-exotic-whitespace-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-exotic-whitespace-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-exotic-whitespace-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-fullwidth-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-fullwidth-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-fullwidth-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-fullwidth-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-idn-unicode-han-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-idn-unicode-han-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-idn-unicode-han-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-idn-unicode-han-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-ipv6-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-ipv6-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-ipv6-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-ipv6-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-ipv6-port-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-ipv6-port-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-ipv6-port-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-ipv6-port-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-is-pile-of-poo-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-is-pile-of-poo-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-is-pile-of-poo-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-is-pile-of-poo-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-colon-colon-number-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-colon-colon-number-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-colon-colon-number-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-colon-colon-number-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-colon-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-colon-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-colon-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-colon-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-contains-pile-of-poo-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-contains-pile-of-poo-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-contains-pile-of-poo-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-contains-pile-of-poo-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-chars-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-chars-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-chars-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-chars-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-colon-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-colon-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-colon-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-colon-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-hash-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-hash-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-hash-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-hash-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-letter-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-letter-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-letter-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-letter-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-number-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-number-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-number-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-number-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-slash-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-slash-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-colon-slash-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-colon-slash-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-non-ascii-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-non-ascii-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-non-ascii-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-non-ascii-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-dot-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-dot-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-dot-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-dot-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-mixed-case-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-mixed-case-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-mixed-case-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-mixed-case-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-multiple-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-multiple-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-multiple-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-multiple-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-slash-plus-slashes-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-slash-plus-slashes-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-slash-plus-slashes-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-slash-plus-slashes-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-slash-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-slash-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-slash-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-slash-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-space-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-space-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-space-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-space-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-u0000-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-u0000-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-u0000-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-u0000-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-u0091-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-u0091-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-percent-encoded-u0091-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-percent-encoded-u0091-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-simple-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-simple-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-simple-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-simple-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-slash-colon-number-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-slash-colon-number-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-slash-colon-number-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-slash-colon-number-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-slash-only-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-slash-only-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-slash-only-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-slash-only-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-slash-pile-of-poo-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-slash-pile-of-poo-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-slash-pile-of-poo-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-slash-pile-of-poo-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-starts-with-pile-of-poo-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-starts-with-pile-of-poo-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-starts-with-pile-of-poo-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-starts-with-pile-of-poo-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-u202E-u202D-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-u202E-u202D-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-u202E-u202D-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-u202E-u202D-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-uFEFF-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-uFEFF-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-uFEFF-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-uFEFF-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-unicode-han-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/path-unicode-han-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/path-unicode-han-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/path-unicode-han-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-0-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/port-0-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-0-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/port-0-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-00000000000000-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/port-00000000000000-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-00000000000000-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/port-00000000000000-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-00000000000000000000080-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/port-00000000000000000000080-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-00000000000000000000080-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/port-00000000000000000000080-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-none-but-colon-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/port-none-but-colon-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-none-but-colon-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/port-none-but-colon-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/query-contains-pile-of-poo-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/query-contains-pile-of-poo-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/query-contains-pile-of-poo-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/query-contains-pile-of-poo-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/query-contains-question-mark-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/query-contains-question-mark-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/query-contains-question-mark-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/query-contains-question-mark-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/query-empty-no-path-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/query-empty-no-path-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/query-empty-no-path-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/query-empty-no-path-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-data-no-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-data-no-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-data-no-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-data-no-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-host-empty-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-host-empty-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-host-empty-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-host-empty-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-host-included-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-host-included-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-host-included-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-host-included-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-no-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-no-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-no-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-no-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-scheme-only-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-scheme-only-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-scheme-only-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-scheme-only-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-single-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-single-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-single-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-single-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-slash-only-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-slash-only-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-slash-only-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-slash-only-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-c-bar-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-c-bar-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-c-bar-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-c-bar-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-only-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-only-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-only-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-only-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-slash-only-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-slash-only-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-slash-only-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-slash-slash-slash-only-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-uppercase-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-uppercase-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-file-uppercase-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-file-uppercase-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-ftps-no-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-ftps-no-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-ftps-no-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-ftps-no-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-ftps-single-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-ftps-single-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-ftps-single-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-ftps-single-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-gopher-no-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-gopher-no-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-gopher-no-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-gopher-no-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-gopher-single-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-gopher-single-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-gopher-single-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-gopher-single-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-javascript-single-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-javascript-single-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-javascript-single-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-javascript-single-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-mailto-no-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-mailto-no-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-mailto-no-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-mailto-no-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-mailto-single-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-mailto-single-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-mailto-single-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-mailto-single-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-none-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-none-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-none-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-none-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-no-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-no-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-no-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-no-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-path-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-path-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-path-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-path-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-path-leading-slashes-chars-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-path-leading-slashes-chars-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-path-leading-slashes-chars-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-path-leading-slashes-chars-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-path-leading-slashes-colon-slashes-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-path-leading-slashes-colon-slashes-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-path-leading-slashes-colon-slashes-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-path-leading-slashes-colon-slashes-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-path-leading-slashes-only-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-path-leading-slashes-only-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-path-leading-slashes-only-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-path-leading-slashes-only-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-single-letter-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-single-letter-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-single-letter-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-single-letter-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-single-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-single-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-single-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-single-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-slash-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-slash-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-private-slash-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-private-slash-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-schemeless-relative-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-schemeless-relative-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-schemeless-relative-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-schemeless-relative-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-ws-single-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-ws-single-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-ws-single-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-ws-single-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-wss-no-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-wss-no-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-wss-no-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-wss-no-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-wss-single-slash-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-wss-single-slash-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/scheme-wss-single-slash-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/scheme-wss-single-slash-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-empty-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-empty-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-empty-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-empty-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-host-port-path-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-host-port-path-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-host-port-path-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-host-port-path-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-password-empty-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-password-empty-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-password-empty-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-password-empty-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-user-empty-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-user-empty-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-user-empty-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-user-empty-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-username-contains-percent-encoded-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-username-contains-percent-encoded-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-username-contains-percent-encoded-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-username-contains-percent-encoded-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-username-non-alpha-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-username-non-alpha-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/base/href/userinfo-username-non-alpha-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/base/href/userinfo-username-non-alpha-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/bdo/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/bdo/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/bdo/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/bdo/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/bdo/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/bdo/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/bdo/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/bdo/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite-empty-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite-empty-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite-empty-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite-empty-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/cite/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/cite/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/blockquote/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/blockquote/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/blockquote/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/br/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/br/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/br/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/br/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/br/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/br/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/br/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/br/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/button/formaction/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/button/formaction/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/button/formaction/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/canvas/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/canvas/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/canvas/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/canvas/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/canvas/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/canvas/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/canvas/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/canvas/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/cite/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/cite/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/cite/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/cite/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/cite/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/cite/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/cite/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/cite/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/code/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/code/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/code/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/code/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/code/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/code/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/code/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/code/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dd/dd-hgroup-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dd/dd-hgroup-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dd/dd-hgroup-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dd/dd-hgroup-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite-empty-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite-empty-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite-empty-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite-empty-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/cite/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/cite/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/cite/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-0004-02-29-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-0004-02-29-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-0004-02-29-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-0004-02-29-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-0005-02-29-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-0005-02-29-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-0005-02-29-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-0005-02-29-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-0214-09-29-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-0214-09-29-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-0214-09-29-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-0214-09-29-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-1900-02-29-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-1900-02-29-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-1900-02-29-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-1900-02-29-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-1969-02-29-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-1969-02-29-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-1969-02-29-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-1969-02-29-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-20014-09-29-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-20014-09-29-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-20014-09-29-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-20014-09-29-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-2014-02-29-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-2014-02-29-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-2014-02-29-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-2014-02-29-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-2100-02-29-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-2100-02-29-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-2100-02-29-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-2100-02-29-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-2200-02-29-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-2200-02-29-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-2200-02-29-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-2200-02-29-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-01-32-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-day-01-32-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-01-32-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-day-01-32-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-03-32-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-day-03-32-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-03-32-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-day-03-32-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-04-31-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-day-04-31-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-04-31-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-day-04-31-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-05-32-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-day-05-32-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-05-32-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-day-05-32-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-06-31-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-day-06-31-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-06-31-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-day-06-31-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-07-32-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-day-07-32-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-07-32-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-day-07-32-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-08-32-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-day-08-32-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-08-32-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-day-08-32-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-09-31-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-day-09-31-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-09-31-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-day-09-31-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-10-32-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-day-10-32-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-10-32-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-day-10-32-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-11-31-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-day-11-31-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-11-31-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-day-11-31-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-12-32-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-day-12-32-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-12-32-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-day-12-32-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-missing-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-day-missing-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-missing-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-day-missing-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-one-digit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-day-one-digit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-one-digit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-day-one-digit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-three-digits-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-day-three-digits-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-day-three-digits-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-day-three-digits-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-iso8601-YYYYMMDD-no-hyphen-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-iso8601-YYYYMMDD-no-hyphen-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-iso8601-YYYYMMDD-no-hyphen-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-iso8601-YYYYMMDD-no-hyphen-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-leading-bom-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-leading-bom-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-leading-bom-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-leading-bom-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-leading-whitespace-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-leading-whitespace-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-leading-whitespace-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-leading-whitespace-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-month-00-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-month-00-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-month-00-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-month-00-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-month-13-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-month-13-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-month-13-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-month-13-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-month-missing-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-month-missing-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-month-missing-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-month-missing-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-month-one-digit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-month-one-digit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-month-one-digit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-month-one-digit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-month-three-digits-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-month-three-digits-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-month-three-digits-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-month-three-digits-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-non-ascii-digit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-non-ascii-digit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-non-ascii-digit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-non-ascii-digit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-trailing-U+0000-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-trailing-U+0000-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-trailing-U+0000-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-trailing-U+0000-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-trailing-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-trailing-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-trailing-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-trailing-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-trailing-whitespace-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-trailing-whitespace-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-trailing-whitespace-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-trailing-whitespace-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-wrong-day-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-wrong-day-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-wrong-day-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-wrong-day-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-wrong-month-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-wrong-month-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-wrong-month-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-wrong-month-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-year-0000-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-year-0000-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-year-0000-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-year-0000-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-year-five-digits-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-year-five-digits-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-year-five-digits-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-year-five-digits-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-year-negative-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-year-negative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-year-negative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-year-negative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-year-three-digits-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/date-year-three-digits-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/date-year-three-digits-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/date-year-three-digits-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/datetime-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/datetime-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/datetime-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/datetime-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/duration-P-form-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/duration-P-form-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/duration-P-form-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/duration-P-form-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/duration-time-component-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/duration-time-component-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/duration-time-component-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/duration-time-component-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-2400-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-2400-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-2400-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-2400-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-60-minutes-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-60-minutes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-60-minutes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-60-minutes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-60-seconds-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-60-seconds-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-60-seconds-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-60-seconds-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-bad-fraction-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-bad-fraction-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-bad-fraction-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-bad-fraction-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-four-digit-fraction-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-four-digit-fraction-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-four-digit-fraction-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-four-digit-fraction-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-hour-one-digit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-hour-one-digit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-hour-one-digit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-hour-one-digit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-hour-three-digits-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-hour-three-digits-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-hour-three-digits-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-hour-three-digits-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-iso8601-hh-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-iso8601-hh-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-iso8601-hh-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-iso8601-hh-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-iso8601-hhmm-no-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-iso8601-hhmm-no-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-iso8601-hhmm-no-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-iso8601-hhmm-no-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-iso8601-hhmmss-no-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-iso8601-hhmmss-no-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-iso8601-hhmmss-no-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-iso8601-hhmmss-no-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-lowercase-z-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-lowercase-z-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-lowercase-z-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-lowercase-z-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-minutes-one-digit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-minutes-one-digit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-minutes-one-digit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-minutes-one-digit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-minutes-three-digits-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-minutes-three-digits-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-minutes-three-digits-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-minutes-three-digits-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-missing-minutes-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-missing-minutes-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-missing-minutes-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-missing-minutes-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-missing-seconds-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-missing-seconds-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-missing-seconds-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-missing-seconds-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-nbsp-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-nbsp-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-nbsp-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-nbsp-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-seconds-one-digit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-seconds-one-digit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-seconds-one-digit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-seconds-one-digit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-seconds-three-digits-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-seconds-three-digits-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-seconds-three-digits-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-seconds-three-digits-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-space-before-timezone-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-space-before-timezone-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-space-before-timezone-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-space-before-timezone-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-60-minutes-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-60-minutes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-60-minutes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-60-minutes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-iso8601-two-digit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-iso8601-two-digit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-iso8601-two-digit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-iso8601-two-digit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-lowercase-t-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-lowercase-t-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-lowercase-t-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-lowercase-t-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-minus-1300-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-minus-1300-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-minus-1300-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-minus-1300-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-minus-2400-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-minus-2400-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-minus-2400-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-minus-2400-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-minutes-15-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-minutes-15-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-minutes-15-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-minutes-15-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-multiple-spaces-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-multiple-spaces-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-multiple-spaces-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-multiple-spaces-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-non-T-character-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-non-T-character-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-non-T-character-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-non-T-character-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-offset-colon-start-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-offset-colon-start-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-offset-colon-start-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-offset-colon-start-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-offset-space-start-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-offset-space-start-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-offset-space-start-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-offset-space-start-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-one-digit-hour-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-one-digit-hour-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-one-digit-hour-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-one-digit-hour-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-one-digit-minute-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-one-digit-minute-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-one-digit-minute-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-one-digit-minute-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-plus-1500-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-plus-1500-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-plus-1500-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-plus-1500-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-plus-2400-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-plus-2400-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-plus-2400-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-plus-2400-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-three-digit-hour-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-three-digit-hour-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-three-digit-hour-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-three-digit-hour-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-three-digit-minute-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-three-digit-minute-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-three-digit-minute-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-three-digit-minute-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-with-seconds-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-with-seconds-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-with-seconds-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-timezone-with-seconds-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-with-both-T-and-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-with-both-T-and-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-with-both-T-and-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-with-both-T-and-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-wrong-minutes-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-wrong-minutes-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-wrong-minutes-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-wrong-minutes-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-wrong-seconds-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-wrong-seconds-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-wrong-seconds-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-wrong-seconds-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-zero-digit-fraction-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-zero-digit-fraction-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/global-date-and-time-zero-digit-fraction-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/global-date-and-time-zero-digit-fraction-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/local-date-and-time-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/local-date-and-time-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/local-date-and-time-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/local-date-and-time-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/month-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/month-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/month-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/month-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/time-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/time-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/time-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/time-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/week-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/week-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/week-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/week-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/year-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/year-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/year-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/year-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/yearless-date-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/del/yearless-date-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/del/yearless-date-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/del/yearless-date-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dfn/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dfn/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dfn/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dfn/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dfn/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dfn/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dfn/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dfn/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dialog/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dialog/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dialog/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dialog/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/div/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/div/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/div/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/div/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/div/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/div/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/div/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/div/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/article-in-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/article-in-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/article-in-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/article-in-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/aside-in-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/aside-in-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/aside-in-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/aside-in-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/dd-in-template-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/dd-in-template-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/dd-in-template-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/dd-in-template-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/div-contains-dl-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/div-contains-dl-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/div-contains-dl-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/div-contains-dl-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/div-contains-text-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/div-contains-text-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/div-contains-text-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/div-contains-text-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/div-multiple-groups-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/div-multiple-groups-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/div-multiple-groups-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/div-multiple-groups-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/div-splitting-groups-2-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/div-splitting-groups-2-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/div-splitting-groups-2-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/div-splitting-groups-2-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/div-splitting-groups-3-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/div-splitting-groups-3-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/div-splitting-groups-3-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/div-splitting-groups-3-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/div-splitting-groups-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/div-splitting-groups-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/div-splitting-groups-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/div-splitting-groups-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/dl-contains-dl-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/dl-contains-dl-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/dl-contains-dl-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/dl-contains-dl-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/dl-contains-text-2-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/dl-contains-text-2-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/dl-contains-text-2-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/dl-contains-text-2-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/dl-contains-text-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/dl-contains-text-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/dl-contains-text-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/dl-contains-text-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/dl-in-p-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/dl-in-p-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/dl-in-p-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/dl-in-p-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/dl-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/dl-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/dl-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/dl-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/dt-in-template-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/dt-in-template-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/dt-in-template-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/dt-in-template-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/empty-div-2-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/empty-div-2-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/empty-div-2-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/empty-div-2-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/empty-div-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/empty-div-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/empty-div-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/empty-div-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/first-dd-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/first-dd-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/first-dd-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/first-dd-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/footer-in-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/footer-in-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/footer-in-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/footer-in-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/h1-in-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/h1-in-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/h1-in-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/h1-in-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/h2-in-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/h2-in-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/h2-in-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/h2-in-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/h3-in-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/h3-in-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/h3-in-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/h3-in-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/h4-in-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/h4-in-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/h4-in-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/h4-in-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/h5-in-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/h5-in-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/h5-in-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/h5-in-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/h6-in-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/h6-in-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/h6-in-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/h6-in-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/header-in-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/header-in-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/header-in-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/header-in-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/hgroup-in-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/hgroup-in-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/hgroup-in-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/hgroup-in-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/last-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/last-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/last-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/last-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/mixed-div-dt-dd-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/mixed-div-dt-dd-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/mixed-div-dt-dd-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/mixed-div-dt-dd-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/mixed-dt-dd-div-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/mixed-dt-dd-div-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/mixed-dt-dd-div-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/mixed-dt-dd-div-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/nav-in-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/nav-in-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/nav-in-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/nav-in-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/nested-divs-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/nested-divs-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/nested-divs-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/nested-divs-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/only-dd-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/only-dd-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/only-dd-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/only-dd-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/only-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/only-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/only-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/only-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/section-in-dt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/dl/section-in-dt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/dl/section-in-dt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/dl/section-in-dt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/em/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/em/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/em/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/em/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/em/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/em/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/em/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/em/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/height-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/height-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/height-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/height-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/src/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/src/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/src/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/type-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/type-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/type-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/type-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/width-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/embed/width-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/embed/width-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/embed/width-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/footer/nested-footer-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/footer/nested-footer-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/footer/nested-footer-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/footer/nested-footer-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/footer/nested-header-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/footer/nested-header-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/footer/nested-header-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/footer/nested-header-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/form/action/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/form/action/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/form/action/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/h1/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/h1/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/h1/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/h1/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/h1/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/h1/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/h1/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/h1/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/h2/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/h2/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/h2/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/h2/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/h2/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/h2/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/h2/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/h2/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/h3/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/h3/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/h3/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/h3/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/h3/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/h3/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/h3/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/h3/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/h4/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/h4/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/h4/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/h4/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/h4/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/h4/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/h4/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/h4/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/h5/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/h5/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/h5/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/h5/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/h5/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/h5/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/h5/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/h5/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/h6/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/h6/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/h6/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/h6/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/h6/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/h6/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/h6/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/h6/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/header/nested-footer-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/header/nested-footer-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/header/nested-footer-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/header/nested-footer-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/header/nested-header-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/header/nested-header-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/header/nested-header-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/header/nested-header-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/hr/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/hr/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/hr/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/hr/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/hr/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/hr/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/hr/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/hr/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/i/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/i/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/i/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/i/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/i/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/i/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/i/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/i/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/iframe/src/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/iframe/src/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/iframe/src/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/src/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/src/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/src/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/usemap-bad-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/usemap-bad-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/usemap-bad-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/usemap-bad-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/usemap-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/usemap-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/usemap-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/usemap-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/width-height-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/width-height-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/width-height-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/width-height-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/width-height-negative-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/img/width-height-negative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/img/width-height-negative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/img/width-height-negative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/autocomplete-address-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/autocomplete-address-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/autocomplete-address-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/autocomplete-address-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/autocomplete-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/autocomplete-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/autocomplete-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/autocomplete-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/autocomplete-section-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/autocomplete-section-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/autocomplete-section-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/autocomplete-section-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/autocomplete-text-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/autocomplete-text-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/autocomplete-text-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/autocomplete-text-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/autocomplete-token-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/autocomplete-token-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/autocomplete-token-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/autocomplete-token-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/autocomplete-work-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/autocomplete-work-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/autocomplete-work-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/autocomplete-work-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/list-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/list-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/list-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/list-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-formaction/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-image-src/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-image-src/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-submit-formaction/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value-empty-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value-empty-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value-empty-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value-empty-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/fragment-empty-hash-only-no-path-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/fragment-empty-hash-only-no-path-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/fragment-empty-hash-only-no-path-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/fragment-empty-hash-only-no-path-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/fragment-non-ascii-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/fragment-non-ascii-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/fragment-non-ascii-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/fragment-non-ascii-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/fragment-semicolon-question-mark-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/fragment-semicolon-question-mark-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/fragment-semicolon-question-mark-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/fragment-semicolon-question-mark-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/fragment-slash-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/fragment-slash-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/fragment-slash-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/fragment-slash-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-percent-encoded-slash-plus-slashes-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-percent-encoded-slash-plus-slashes-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-percent-encoded-slash-plus-slashes-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-percent-encoded-slash-plus-slashes-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-percent-encoded-slash-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-percent-encoded-slash-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-percent-encoded-slash-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-percent-encoded-slash-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-simple-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-simple-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-simple-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-simple-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-slash-only-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-slash-only-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-slash-only-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-slash-only-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/query-empty-no-path-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/query-empty-no-path-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/query-empty-no-path-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/query-empty-no-path-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-schemeless-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-schemeless-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-schemeless-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-schemeless-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/input/type-url-value/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/input/type-url-value/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite-empty-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite-empty-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite-empty-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite-empty-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/cite/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/cite/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/cite/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-0004-02-29-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-0004-02-29-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-0004-02-29-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-0004-02-29-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-0005-02-29-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-0005-02-29-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-0005-02-29-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-0005-02-29-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-0214-09-29-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-0214-09-29-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-0214-09-29-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-0214-09-29-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-1900-02-29-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-1900-02-29-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-1900-02-29-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-1900-02-29-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-1969-02-29-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-1969-02-29-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-1969-02-29-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-1969-02-29-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-20014-09-29-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-20014-09-29-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-20014-09-29-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-20014-09-29-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-2014-02-29-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-2014-02-29-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-2014-02-29-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-2014-02-29-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-2100-02-29-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-2100-02-29-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-2100-02-29-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-2100-02-29-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-2200-02-29-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-2200-02-29-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-2200-02-29-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-2200-02-29-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-01-32-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-01-32-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-01-32-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-01-32-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-03-32-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-03-32-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-03-32-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-03-32-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-04-31-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-04-31-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-04-31-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-04-31-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-05-32-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-05-32-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-05-32-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-05-32-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-06-31-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-06-31-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-06-31-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-06-31-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-07-32-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-07-32-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-07-32-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-07-32-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-08-32-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-08-32-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-08-32-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-08-32-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-09-31-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-09-31-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-09-31-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-09-31-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-10-32-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-10-32-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-10-32-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-10-32-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-11-31-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-11-31-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-11-31-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-11-31-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-12-32-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-12-32-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-12-32-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-12-32-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-missing-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-missing-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-missing-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-missing-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-one-digit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-one-digit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-one-digit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-one-digit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-three-digits-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-three-digits-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-day-three-digits-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-day-three-digits-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-iso8601-YYYYMMDD-no-hyphen-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-iso8601-YYYYMMDD-no-hyphen-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-iso8601-YYYYMMDD-no-hyphen-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-iso8601-YYYYMMDD-no-hyphen-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-leading-bom-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-leading-bom-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-leading-bom-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-leading-bom-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-leading-whitespace-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-leading-whitespace-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-leading-whitespace-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-leading-whitespace-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-month-00-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-month-00-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-month-00-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-month-00-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-month-13-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-month-13-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-month-13-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-month-13-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-month-missing-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-month-missing-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-month-missing-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-month-missing-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-month-one-digit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-month-one-digit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-month-one-digit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-month-one-digit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-month-three-digits-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-month-three-digits-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-month-three-digits-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-month-three-digits-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-non-ascii-digit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-non-ascii-digit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-non-ascii-digit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-non-ascii-digit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-trailing-U+0000-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-trailing-U+0000-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-trailing-U+0000-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-trailing-U+0000-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-trailing-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-trailing-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-trailing-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-trailing-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-trailing-whitespace-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-trailing-whitespace-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-trailing-whitespace-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-trailing-whitespace-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-wrong-day-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-wrong-day-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-wrong-day-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-wrong-day-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-wrong-month-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-wrong-month-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-wrong-month-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-wrong-month-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-year-0000-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-year-0000-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-year-0000-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-year-0000-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-year-five-digits-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-year-five-digits-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-year-five-digits-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-year-five-digits-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-year-negative-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-year-negative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-year-negative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-year-negative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-year-three-digits-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/date-year-three-digits-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/date-year-three-digits-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/date-year-three-digits-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/datetime-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/datetime-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/datetime-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/datetime-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/duration-P-form-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/duration-P-form-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/duration-P-form-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/duration-P-form-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/duration-time-component-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/duration-time-component-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/duration-time-component-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/duration-time-component-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-2400-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-2400-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-2400-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-2400-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-60-minutes-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-60-minutes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-60-minutes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-60-minutes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-60-seconds-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-60-seconds-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-60-seconds-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-60-seconds-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-bad-fraction-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-bad-fraction-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-bad-fraction-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-bad-fraction-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-four-digit-fraction-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-four-digit-fraction-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-four-digit-fraction-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-four-digit-fraction-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-hour-one-digit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-hour-one-digit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-hour-one-digit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-hour-one-digit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-hour-three-digits-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-hour-three-digits-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-hour-three-digits-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-hour-three-digits-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-iso8601-hh-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-iso8601-hh-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-iso8601-hh-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-iso8601-hh-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-iso8601-hhmm-no-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-iso8601-hhmm-no-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-iso8601-hhmm-no-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-iso8601-hhmm-no-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-iso8601-hhmmss-no-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-iso8601-hhmmss-no-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-iso8601-hhmmss-no-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-iso8601-hhmmss-no-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-lowercase-z-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-lowercase-z-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-lowercase-z-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-lowercase-z-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-minutes-one-digit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-minutes-one-digit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-minutes-one-digit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-minutes-one-digit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-minutes-three-digits-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-minutes-three-digits-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-minutes-three-digits-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-minutes-three-digits-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-missing-minutes-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-missing-minutes-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-missing-minutes-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-missing-minutes-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-missing-seconds-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-missing-seconds-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-missing-seconds-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-missing-seconds-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-nbsp-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-nbsp-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-nbsp-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-nbsp-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-seconds-one-digit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-seconds-one-digit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-seconds-one-digit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-seconds-one-digit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-seconds-three-digits-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-seconds-three-digits-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-seconds-three-digits-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-seconds-three-digits-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-space-before-timezone-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-space-before-timezone-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-space-before-timezone-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-space-before-timezone-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-60-minutes-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-60-minutes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-60-minutes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-60-minutes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-iso8601-two-digit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-iso8601-two-digit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-iso8601-two-digit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-iso8601-two-digit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-lowercase-t-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-lowercase-t-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-lowercase-t-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-lowercase-t-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-minus-1300-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-minus-1300-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-minus-1300-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-minus-1300-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-minus-2400-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-minus-2400-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-minus-2400-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-minus-2400-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-minutes-15-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-minutes-15-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-minutes-15-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-minutes-15-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-multiple-spaces-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-multiple-spaces-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-multiple-spaces-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-multiple-spaces-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-non-T-character-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-non-T-character-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-non-T-character-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-non-T-character-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-offset-colon-start-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-offset-colon-start-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-offset-colon-start-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-offset-colon-start-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-offset-space-start-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-offset-space-start-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-offset-space-start-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-offset-space-start-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-one-digit-hour-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-one-digit-hour-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-one-digit-hour-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-one-digit-hour-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-one-digit-minute-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-one-digit-minute-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-one-digit-minute-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-one-digit-minute-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-plus-1500-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-plus-1500-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-plus-1500-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-plus-1500-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-plus-2400-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-plus-2400-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-plus-2400-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-plus-2400-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-three-digit-hour-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-three-digit-hour-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-three-digit-hour-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-three-digit-hour-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-three-digit-minute-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-three-digit-minute-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-three-digit-minute-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-three-digit-minute-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-with-seconds-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-with-seconds-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-with-seconds-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-timezone-with-seconds-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-with-both-T-and-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-with-both-T-and-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-with-both-T-and-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-with-both-T-and-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-wrong-minutes-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-wrong-minutes-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-wrong-minutes-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-wrong-minutes-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-wrong-seconds-separator-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-wrong-seconds-separator-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-wrong-seconds-separator-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-wrong-seconds-separator-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-zero-digit-fraction-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-zero-digit-fraction-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/global-date-and-time-zero-digit-fraction-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/global-date-and-time-zero-digit-fraction-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/local-date-and-time-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/local-date-and-time-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/local-date-and-time-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/local-date-and-time-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/month-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/month-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/month-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/month-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/time-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/time-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/time-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/time-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/week-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/week-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/week-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/week-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/year-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/year-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/year-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/year-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/yearless-date-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ins/yearless-date-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ins/yearless-date-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ins/yearless-date-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/kbd/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/kbd/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/kbd/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/kbd/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/kbd/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/kbd/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/kbd/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/kbd/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/challenge-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/keygen/challenge-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/challenge-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/keygen/challenge-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/id-bad-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/keygen/id-bad-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/id-bad-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/keygen/id-bad-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/id-missing-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/keygen/id-missing-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/id-missing-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/keygen/id-missing-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/id-redundant-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/keygen/id-redundant-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/id-redundant-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/keygen/id-redundant-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/keygen-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/keygen/keygen-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/keygen-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/keygen/keygen-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/keytype-bad-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/keygen/keytype-bad-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/keytype-bad-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/keygen/keytype-bad-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/keytype-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/keygen/keytype-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/keytype-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/keygen/keytype-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/keytype-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/keygen/keytype-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/keytype-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/keygen/keytype-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/model-also-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/keygen/model-also-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/model-also-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/keygen/model-also-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/keygen/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/keygen/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/no-attributes-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/keygen/no-attributes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/no-attributes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/keygen/no-attributes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/non-void-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/keygen/non-void-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/keygen/non-void-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/keygen/non-void-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/label/for-descendant-no-id-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/label/for-descendant-no-id-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/label/for-descendant-no-id-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/label/for-descendant-no-id-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/label/for-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/label/for-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/label/for-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/label/for-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/label/multiple-descendants-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/label/multiple-descendants-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/label/multiple-descendants-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/label/multiple-descendants-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href-missing-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href-missing-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href-missing-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href-missing-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/href/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/href/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/href/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/imagesizes-no-imagesrcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/imagesizes-no-imagesrcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/imagesizes-no-imagesrcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/imagesizes-no-imagesrcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/imagesrcset-no-as-image-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/imagesrcset-no-as-image-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/imagesrcset-no-as-image-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/imagesrcset-no-as-image-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/imagesrcset-no-preload-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/imagesrcset-no-preload-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/imagesrcset-no-preload-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/imagesrcset-no-preload-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/imagesrcset-valid.html b/tests/wpt/tests/conformance-checkers/html/elements/link/imagesrcset-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/link/imagesrcset-valid.html rename to tests/wpt/tests/conformance-checkers/html/elements/link/imagesrcset-valid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/map/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/map/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/map/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/map/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/map/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/map/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/map/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/map/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/mark/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/mark/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/mark/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/mark/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/meta/names-registered-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/meta/names-registered-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/meta/names-registered-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/meta/names-registered-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/meta/names-standard-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/meta/names-standard-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/meta/names-standard-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/meta/names-standard-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/meta/refresh-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/meta/refresh-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/meta/refresh-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/meta/refresh-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/noscript/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/noscript/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/noscript/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/noscript/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data-type-missing-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data-type-missing-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data-type-missing-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data-type-missing-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/data/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/data/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/data/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/object/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/object/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/object/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ol/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ol/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ol/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ol/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ol/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ol/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ol/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ol/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/option/label-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/option/label-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/option/label-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/option/label-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/option/label-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/option/label-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/option/label-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/option/label-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/option/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/option/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/option/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/option/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/option/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/option/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/option/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/option/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/p/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/p/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/p/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/p/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/p/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/p/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/p/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/p/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/param/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/param/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/param/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/param/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/param/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/param/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/param/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/param/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-media-all-spaces-with-following-source-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-media-all-spaces-with-following-source-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-media-all-spaces-with-following-source-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-media-all-spaces-with-following-source-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-media-all-with-following-source-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-media-all-with-following-source-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-media-all-with-following-source-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-media-all-with-following-source-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-media-empty-with-following-source-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-media-empty-with-following-source-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-media-empty-with-following-source-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-media-empty-with-following-source-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-media-spaces-with-following-source-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-media-spaces-with-following-source-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-media-spaces-with-following-source-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-media-spaces-with-following-source-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-media-uppercase-with-following-source-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-media-uppercase-with-following-source-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-media-uppercase-with-following-source-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-media-uppercase-with-following-source-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-sizes-with-following-source-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-sizes-with-following-source-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-sizes-with-following-source-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-sizes-with-following-source-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-img-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-img-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-img-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-img-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-source-media-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-source-media-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-source-media-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-source-media-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-source-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-source-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-source-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-source-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-source-type-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-source-type-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-source-type-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/always-matching-source-with-following-source-type-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/audio-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/audio-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/audio-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/audio-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/html-syntax-img-end-tag-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/html-syntax-img-end-tag-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/html-syntax-img-end-tag-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/html-syntax-img-end-tag-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/html-syntax-picture-no-end-tag-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/html-syntax-picture-no-end-tag-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/html-syntax-picture-no-end-tag-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/html-syntax-picture-no-end-tag-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/html-syntax-picture-slash-no-end-tag-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/html-syntax-picture-slash-no-end-tag-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/html-syntax-picture-slash-no-end-tag-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/html-syntax-picture-slash-no-end-tag-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/html-syntax-picture-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/html-syntax-picture-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/html-syntax-picture-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/html-syntax-picture-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/html-syntax-source-end-tag-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/html-syntax-source-end-tag-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/html-syntax-source-end-tag-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/html-syntax-source-end-tag-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-no-src-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/img-no-src-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-no-src-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/img-no-src-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-no-src-with-picture-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/img-no-src-with-picture-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-no-src-with-picture-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/img-no-src-with-picture-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-no-src-with-source-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/img-no-src-with-source-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-no-src-with-source-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/img-no-src-with-source-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-no-src-with-srcset-and-picture-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/img-no-src-with-srcset-and-picture-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-no-src-with-srcset-and-picture-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/img-no-src-with-srcset-and-picture-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-no-src-with-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/img-no-src-with-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-no-src-with-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/img-no-src-with-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-srcset-no-descriptor-with-sizes-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/img-srcset-no-descriptor-with-sizes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-srcset-no-descriptor-with-sizes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/img-srcset-no-descriptor-with-sizes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-srcset-w-and-x-width-sizes-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/img-srcset-w-and-x-width-sizes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-srcset-w-and-x-width-sizes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/img-srcset-w-and-x-width-sizes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-srcset-w-no-sizes-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/img-srcset-w-no-sizes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-srcset-w-no-sizes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/img-srcset-w-no-sizes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-type-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/img-type-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-type-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/img-type-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-type-with-picture-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/img-type-with-picture-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-type-with-picture-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/img-type-with-picture-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-with-sizes-no-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/img-with-sizes-no-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/img-with-sizes-no-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/img-with-sizes-no-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/input-type-image-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/input-type-image-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/input-type-image-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/input-type-image-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-br-after-img-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-br-after-img-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-br-after-img-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-br-after-img-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-br-after-source-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-br-after-source-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-br-after-source-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-br-after-source-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-br-before-img-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-br-before-img-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-br-before-img-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-br-before-img-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-br-before-source-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-br-before-source-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-br-before-source-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-br-before-source-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-figure-wrapping-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-figure-wrapping-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-figure-wrapping-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-figure-wrapping-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-input-type-hidden-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-input-type-hidden-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-input-type-hidden-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-input-type-hidden-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-math-nog-img-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-math-nog-img-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-math-nog-img-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-math-nog-img-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-noscript-after-source-no-img-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-noscript-after-source-no-img-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-noscript-after-source-no-img-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-noscript-after-source-no-img-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-noscript-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-noscript-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-noscript-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-noscript-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-p-after-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-p-after-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-p-after-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-p-after-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-p-before-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-p-before-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-p-before-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-p-before-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-p-wrapping-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-p-wrapping-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-p-wrapping-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-p-wrapping-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-picture-before-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-picture-before-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-picture-before-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-picture-before-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-picture-wrapping-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-picture-wrapping-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-picture-wrapping-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-picture-wrapping-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-span-after-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-span-after-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-span-after-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-span-after-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-span-before-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-span-before-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-span-before-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-span-before-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-span-wrapping-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-span-wrapping-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-span-wrapping-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-span-wrapping-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-style-scroped-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-style-scroped-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-style-scroped-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-style-scroped-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-svg-no-img-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-svg-no-img-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-svg-no-img-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-svg-no-img-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-svg-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-svg-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-svg-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-svg-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-text-after-img-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-text-after-img-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-text-after-img-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-text-after-img-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-text-after-source-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-text-after-source-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-text-after-source-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-text-after-source-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-text-before-img-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-text-before-img-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-text-before-img-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-text-before-img-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-text-before-source-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-text-before-source-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-text-before-source-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-text-before-source-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-video-before-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-video-before-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-video-before-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-video-before-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-video-no-img-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/junk-video-no-img-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/junk-video-no-img-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/junk-video-no-img-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/link-rel-icon-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/link-rel-icon-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/link-rel-icon-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/link-rel-icon-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/missing-img-empty-picture-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/missing-img-empty-picture-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/missing-img-empty-picture-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/missing-img-empty-picture-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/missing-img-only-script-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/missing-img-only-script-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/missing-img-only-script-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/missing-img-only-script-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/missing-img-only-source-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/missing-img-only-source-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/missing-img-only-source-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/missing-img-only-source-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/missing-img-script-and-source-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/missing-img-script-and-source-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/missing-img-script-and-source-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/missing-img-script-and-source-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/missing-img-source-and-script-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/missing-img-source-and-script-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/missing-img-source-and-script-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/missing-img-source-and-script-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/multiple-img-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/multiple-img-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/multiple-img-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/multiple-img-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/multiple-img-with-script-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/multiple-img-with-script-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/multiple-img-with-script-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/multiple-img-with-script-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/multiple-img-with-source-and-script-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/multiple-img-with-source-and-script-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/multiple-img-with-source-and-script-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/multiple-img-with-source-and-script-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/multiple-img-with-source-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/multiple-img-with-source-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/multiple-img-with-source-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/multiple-img-with-source-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/object-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/object-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/object-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/object-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/parent-dl-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/parent-dl-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/parent-dl-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/parent-dl-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/parent-hgroup-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/parent-hgroup-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/parent-hgroup-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/parent-hgroup-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/parent-noscript-in-head-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/parent-noscript-in-head-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/parent-noscript-in-head-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/parent-noscript-in-head-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/parent-rp-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/parent-rp-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/parent-rp-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/parent-rp-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/parent-ul-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/parent-ul-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/parent-ul-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/parent-ul-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-align-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-align-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-align-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-align-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-alt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-alt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-alt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-alt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-aria-role-application-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-aria-role-application-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-aria-role-application-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-aria-role-application-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-aria-role-button-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-aria-role-button-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-aria-role-button-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-aria-role-button-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-aria-role-img-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-aria-role-img-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-aria-role-img-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-aria-role-img-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-aria-role-presentation-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-aria-role-presentation-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-aria-role-presentation-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-aria-role-presentation-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-aria-role-region-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-aria-role-region-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-aria-role-region-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-aria-role-region-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-border-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-border-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-border-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-border-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-crossorigin-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-crossorigin-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-crossorigin-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-crossorigin-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-height-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-height-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-height-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-height-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-hspace-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-hspace-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-hspace-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-hspace-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-ismap-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-ismap-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-ismap-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-ismap-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-longdesc-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-longdesc-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-longdesc-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-longdesc-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-lowsrc-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-lowsrc-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-lowsrc-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-lowsrc-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-media-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-media-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-media-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-media-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-name-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-name-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-name-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-name-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-sizes-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-sizes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-sizes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-sizes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-src-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-src-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-src-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-src-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-usemap-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-usemap-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-usemap-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-usemap-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-vspace-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-vspace-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-vspace-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-vspace-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-width-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/picture-width-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/picture-width-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/picture-width-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-auto-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-auto-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-auto-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-auto-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-comma-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-comma-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-comma-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-comma-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-css-comment-after-plus-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-css-comment-after-plus-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-css-comment-after-plus-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-css-comment-after-plus-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-css-comment-before-unit-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-css-comment-before-unit-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-css-comment-before-unit-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-css-comment-before-unit-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-default-first-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-default-first-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-default-first-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-default-first-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-default-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-default-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-default-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-default-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-deg-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-deg-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-deg-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-deg-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-dpcm-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-dpcm-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-dpcm-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-dpcm-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-dpi-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-dpi-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-dpi-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-dpi-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-dppx-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-dppx-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-dppx-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-dppx-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-foo-bar-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-foo-bar-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-foo-bar-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-foo-bar-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-grad-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-grad-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-grad-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-grad-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-hz-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-hz-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-hz-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-hz-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-inherit-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-inherit-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-inherit-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-inherit-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-initial-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-initial-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-initial-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-initial-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-junk-in-default-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-junk-in-default-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-junk-in-default-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-junk-in-default-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-junk-in-source-size-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-junk-in-source-size-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-junk-in-source-size-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-junk-in-source-size-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-khz-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-khz-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-khz-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-khz-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-all-and-min-width-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-all-and-min-width-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-all-and-min-width-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-all-and-min-width-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-all-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-all-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-all-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-all-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-bad-junk-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-bad-junk-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-bad-junk-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-bad-junk-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-general-enclosed-junk-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-general-enclosed-junk-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-general-enclosed-junk-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-general-enclosed-junk-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-min-width-no-parenthesis-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-min-width-no-parenthesis-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-min-width-no-parenthesis-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-media-min-width-no-parenthesis-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-ms-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-ms-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-ms-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-ms-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-negative-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-negative-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-negative-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-negative-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-no-unit-in-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-no-unit-in-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-no-unit-in-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-no-unit-in-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-percent-in-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-percent-in-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-percent-in-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-percent-in-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-rad-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-rad-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-rad-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-rad-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-s-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-s-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-s-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-s-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-scientific-notation-negative-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-scientific-notation-negative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-scientific-notation-negative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-scientific-notation-negative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-scientific-notation-non-integer-in-exponent-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-scientific-notation-non-integer-in-exponent-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-scientific-notation-non-integer-in-exponent-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-scientific-notation-non-integer-in-exponent-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-trailing-comma-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-trailing-comma-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-trailing-comma-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-trailing-comma-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-trailing-junk-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-trailing-junk-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-trailing-junk-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-trailing-junk-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-turn-source-size-value-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-turn-source-size-value-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-turn-source-size-value-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-turn-source-size-value-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-two-defaults-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-two-defaults-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/sizes-microsyntax-two-defaults-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/sizes-microsyntax-two-defaults-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-after-img-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-after-img-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-after-img-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-after-img-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-align-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-align-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-align-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-align-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-alt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-alt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-alt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-alt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-aria-role-img-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-aria-role-img-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-aria-role-img-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-aria-role-img-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-aria-role-presentation-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-aria-role-presentation-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-aria-role-presentation-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-aria-role-presentation-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-before-and-after-img-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-before-and-after-img-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-before-and-after-img-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-before-and-after-img-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-border-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-border-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-border-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-border-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-crossorigin-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-crossorigin-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-crossorigin-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-crossorigin-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-hspace-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-hspace-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-hspace-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-hspace-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-ismap-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-ismap-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-ismap-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-ismap-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-longdesc-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-longdesc-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-longdesc-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-longdesc-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-name-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-name-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-name-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-name-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-no-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-no-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-no-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-no-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-no-srcset-with-media-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-no-srcset-with-media-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-no-srcset-with-media-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-no-srcset-with-media-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-no-srcset-with-sizes-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-no-srcset-with-sizes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-no-srcset-with-sizes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-no-srcset-with-sizes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-no-srcset-with-type-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-no-srcset-with-type-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-no-srcset-with-type-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-no-srcset-with-type-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-src-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-src-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-src-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-src-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-src-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-src-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-src-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-src-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-srcset-h-with-sizes-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-srcset-h-with-sizes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-srcset-h-with-sizes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-srcset-h-with-sizes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-srcset-w-and-x-with-sizes-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-srcset-w-and-x-with-sizes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-srcset-w-and-x-with-sizes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-srcset-w-and-x-with-sizes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-srcset-w-no-sizes-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-srcset-w-no-sizes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-srcset-w-no-sizes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-srcset-w-no-sizes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-srcset-x-with-sizes-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-srcset-x-with-sizes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-srcset-x-with-sizes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-srcset-x-with-sizes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-type-srcset-w-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-type-srcset-w-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-type-srcset-w-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-type-srcset-w-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-usemap-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-usemap-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-usemap-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-usemap-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-vspace-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/source-vspace-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/source-vspace-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/source-vspace-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-broken-url-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-broken-url-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-broken-url-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-broken-url-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-comma-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-comma-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-comma-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-comma-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-css-comment-after-descriptor-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-css-comment-after-descriptor-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-css-comment-after-descriptor-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-css-comment-after-descriptor-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-curly-bracket-junk-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-curly-bracket-junk-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-curly-bracket-junk-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-curly-bracket-junk-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-function-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-function-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-function-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-function-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-h-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-h-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-h-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-h-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-infinity-x-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-infinity-x-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-infinity-x-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-infinity-x-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-leading-comma-multiple-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-leading-comma-multiple-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-leading-comma-multiple-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-leading-comma-multiple-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-leading-comma-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-leading-comma-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-leading-comma-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-leading-comma-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-leading-dot-x-valid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-leading-dot-x-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-leading-dot-x-valid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-leading-dot-x-valid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-nan-x-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-nan-x-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-nan-x-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-nan-x-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-w-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-w-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-w-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-w-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-x-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-x-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-x-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-x-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-zero-w-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-zero-w-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-zero-w-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-zero-w-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-zero-x-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-zero-x-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-zero-x-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-negative-zero-x-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-non-integer-w-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-non-integer-w-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-non-integer-w-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-non-integer-w-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-parenthesis-junk-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-parenthesis-junk-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-parenthesis-junk-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-parenthesis-junk-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-pipe-junk-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-pipe-junk-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-pipe-junk-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-pipe-junk-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-plus-w-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-plus-w-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-plus-w-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-plus-w-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-plus-x-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-plus-x-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-plus-x-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-plus-x-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-scientific-notation-w-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-scientific-notation-w-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-scientific-notation-w-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-scientific-notation-w-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-square-bracket-junk-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-square-bracket-junk-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-square-bracket-junk-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-square-bracket-junk-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-trailing-comma-multiple-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-trailing-comma-multiple-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-trailing-comma-multiple-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-trailing-comma-multiple-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-trailing-comma-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-trailing-comma-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-trailing-comma-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-trailing-comma-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-1x-and-omitted-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-1x-and-omitted-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-1x-and-omitted-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-1x-and-omitted-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-2x-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-2x-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-2x-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-2x-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-integer-and-decimals-x-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-integer-and-decimals-x-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-integer-and-decimals-x-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-integer-and-decimals-x-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-w-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-w-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-w-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-unique-descriptors-w-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-uppercase-w-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-uppercase-w-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-uppercase-w-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-uppercase-w-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-w-and-h-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-w-and-h-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-w-and-h-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-w-and-h-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-w-and-no-descriptor-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-w-and-no-descriptor-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-w-and-no-descriptor-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-w-and-no-descriptor-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-x-and-h-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-x-and-h-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-x-and-h-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-x-and-h-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-x-and-w-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-x-and-w-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-x-and-w-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-x-and-w-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-zero-w-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-zero-w-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-zero-w-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-zero-w-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-zero-x-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-zero-x-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/srcset-microsyntax-zero-x-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/srcset-microsyntax-zero-x-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/svg-image-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/svg-image-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/svg-image-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/svg-image-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/track-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/track-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/track-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/track-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/video-source-media-src-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/video-source-media-src-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/video-source-media-src-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/video-source-media-src-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/video-source-sizes-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/video-source-sizes-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/video-source-sizes-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/video-source-sizes-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/video-source-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/video-source-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/video-source-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/video-source-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/video-source-srcset-src-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/video-source-srcset-src-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/video-source-srcset-src-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/video-source-srcset-src-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/video-srcset-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/picture/video-srcset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/picture/video-srcset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/picture/video-srcset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/pre/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/pre/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/pre/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/pre/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/pre/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/pre/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/pre/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/pre/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite-empty-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite-empty-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite-empty-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite-empty-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/cite/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/cite/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/cite/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/q/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/q/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/q/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ruby/empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ruby/empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ruby/empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ruby/empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ruby/missing-rt-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ruby/missing-rt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ruby/missing-rt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ruby/missing-rt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/s/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/s/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/s/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/s/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/samp/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/samp/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/samp/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/samp/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/samp/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/samp/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/samp/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/samp/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/language-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/language-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/language-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/language-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/src/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/src/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/src/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/streams-demo-append-child-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/streams-demo-append-child-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/streams-demo-append-child-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/streams-demo-append-child-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/streams-demo-streaming-element-backpressure-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/streams-demo-streaming-element-backpressure-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/streams-demo-streaming-element-backpressure-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/streams-demo-streaming-element-backpressure-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/streams-demo-streaming-element-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/script/streams-demo-streaming-element-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/script/streams-demo-streaming-element-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/script/streams-demo-streaming-element-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/small/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/small/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/small/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/small/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/small/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/small/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/small/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/small/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/source/src/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/source/src/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/source/src/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/span/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/span/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/span/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/span/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/span/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/span/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/span/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/span/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/strong/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/strong/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/strong/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/strong/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/strong/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/strong/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/strong/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/strong/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/html-spec-comms-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/style/html-spec-comms-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/html-spec-comms-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/style/html-spec-comms-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/style/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/style/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/scoped-as-div-child-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/style/scoped-as-div-child-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/scoped-as-div-child-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/style/scoped-as-div-child-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/scoped-as-p-child-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/style/scoped-as-p-child-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/scoped-as-p-child-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/style/scoped-as-p-child-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/scoped-in-head-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/style/scoped-in-head-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/scoped-in-head-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/style/scoped-in-head-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/scoped-model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/style/scoped-model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/scoped-model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/style/scoped-model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/scoped-multiple-adjacent-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/style/scoped-multiple-adjacent-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/scoped-multiple-adjacent-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/style/scoped-multiple-adjacent-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/scoped-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/style/scoped-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/scoped-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/style/scoped-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/type-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/style/type-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/type-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/style/type-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/sub/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/sub/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/sub/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/sub/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/sub/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/sub/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/sub/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/sub/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/sup/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/sup/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/sup/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/sup/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/sup/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/sup/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/sup/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/sup/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/Alexis_of_Russia-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/table/integrity/Alexis_of_Russia-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/Alexis_of_Russia-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/table/integrity/Alexis_of_Russia-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/Feodor_I_of_Russia-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/table/integrity/Feodor_I_of_Russia-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/Feodor_I_of_Russia-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/table/integrity/Feodor_I_of_Russia-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/Naser_al-Din_Shah_Qajar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/table/integrity/Naser_al-Din_Shah_Qajar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/Naser_al-Din_Shah_Qajar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/table/integrity/Naser_al-Din_Shah_Qajar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/vertical-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/table/integrity/vertical-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/vertical-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/table/integrity/vertical-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/model-input-child-hidden-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/table/model-input-child-hidden-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/model-input-child-hidden-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/table/model-input-child-hidden-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/model-input-child-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/table/model-input-child-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/model-input-child-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/table/model-input-child-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/model-input-type-child-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/table/model-input-type-child-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/model-input-type-child-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/table/model-input-type-child-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/time/datetime-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/time/datetime-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/time/datetime-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/time/datetime-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/title/empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/title/empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/title/empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/title/empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/title/missing-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/title/missing-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/title/missing-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/title/missing-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/track/src/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/track/src/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/track/src/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/u/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/u/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/u/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/u/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ul/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ul/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ul/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ul/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/ul/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/ul/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/ul/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/ul/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/var/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/var/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/var/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/var/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/var/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/var/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/var/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/var/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/model-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/model-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/model-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/model-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/model-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/model-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/model-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/model-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster-whitespace-only-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster-whitespace-only-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster-whitespace-only-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster-whitespace-only-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/poster/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/poster/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/poster/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src-isvalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/elements/video/src/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/elements/video/src/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/elements/video/src/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/001-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/001-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/001-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/001-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/001-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/001-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/001-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/001-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/002-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/002-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/002-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/002-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/002-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/002-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/002-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/002-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/003-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/003-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/003-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/003-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/003-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/003-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/003-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/003-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/004-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/004-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/004-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/004-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/005-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/005-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/005-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/005-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/005-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/005-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/005-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/005-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/006-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/006-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/006-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/006-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/006-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/006-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/006-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/006-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/007-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/007-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/007-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/007-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/007-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/007-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/007-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/007-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/008-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/008-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/008-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/008-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/008-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/008-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/008-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/008-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/009-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/009-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/009-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/009-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/009-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/009-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/009-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/009-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/010-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/010-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/010-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/010-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/010-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/010-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/010-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/010-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/011-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/011-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/011-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/011-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/011-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/011-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/011-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/011-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/012-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/012-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/012-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/012-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/012-valid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/012-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/012-valid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/012-valid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/013-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/013-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/013-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/013-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/013-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/013-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/013-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/013-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/014-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/014-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/014-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/014-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/014-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/014-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/014-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/014-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/015-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/015-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/015-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/015-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/016-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/016-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/016-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/016-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/017-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/017-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/017-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/017-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/018-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/018-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/018-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/018-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/019-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/019-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/019-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/019-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/019-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/019-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/019-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/019-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/020-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/020-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/020-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/020-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/020-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/020-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/020-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/020-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/021-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/021-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/021-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/021-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/022-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/022-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/022-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/022-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/023-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/023-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/023-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/023-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/024-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/024-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/024-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/024-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/025-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/025-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/025-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/025-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/026-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/026-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/026-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/026-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/027-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/027-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/027-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/027-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/028-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/028-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/028-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/028-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/029-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/029-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/029-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/029-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/030-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/030-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/030-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/030-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/031-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/031-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/031-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/031-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/032-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/032-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/032-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/032-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/033-isvalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/033-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/033-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/033-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/device-aspect-ratio-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/device-aspect-ratio-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/device-aspect-ratio-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/device-aspect-ratio-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/projection-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/projection-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/projection-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/projection-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/source-isvalid.txt b/tests/wpt/tests/conformance-checkers/html/media-queries/source-isvalid.txt similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/source-isvalid.txt rename to tests/wpt/tests/conformance-checkers/html/media-queries/source-isvalid.txt diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/source-novalid.txt b/tests/wpt/tests/conformance-checkers/html/media-queries/source-novalid.txt similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/source-novalid.txt rename to tests/wpt/tests/conformance-checkers/html/media-queries/source-novalid.txt diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/tv-novalid.html b/tests/wpt/tests/conformance-checkers/html/media-queries/tv-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/media-queries/tv-novalid.html rename to tests/wpt/tests/conformance-checkers/html/media-queries/tv-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid-empty-isvalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid-empty-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid-empty-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid-empty-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid-isvalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid-scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid-scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid-scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid-scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-file-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-file-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-file-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-file-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-file-single-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-file-single-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-file-single-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-file-single-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-file-slash-slash-abc-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-file-slash-slash-abc-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-file-slash-slash-abc-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-file-slash-slash-abc-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-file-triple-slash-c-bar-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-file-triple-slash-c-bar-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-file-triple-slash-c-bar-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-file-triple-slash-c-bar-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemid/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemid/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemid/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype-isvalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype-scheme-data-contains-fragment-haswarn.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype-scheme-data-contains-fragment-haswarn.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype-scheme-data-contains-fragment-haswarn.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype-scheme-data-contains-fragment-haswarn.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/fragment-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/fragment-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/fragment-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/fragment-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/fragment-contains-hash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/fragment-contains-hash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/fragment-contains-hash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/fragment-contains-hash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/fragment-empty-hash-only-no-path-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/fragment-empty-hash-only-no-path-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/fragment-empty-hash-only-no-path-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/fragment-empty-hash-only-no-path-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/fragment-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/fragment-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/fragment-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/fragment-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/fragment-non-ascii-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/fragment-non-ascii-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/fragment-non-ascii-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/fragment-non-ascii-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/fragment-semicolon-question-mark-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/fragment-semicolon-question-mark-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/fragment-semicolon-question-mark-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/fragment-semicolon-question-mark-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/fragment-slash-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/fragment-slash-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/fragment-slash-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/fragment-slash-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-double-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-double-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-double-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-double-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-double-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-double-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-double-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-double-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-empty-userinfo-empty-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-empty-userinfo-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-empty-userinfo-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-empty-userinfo-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-empty-with-userinfo-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-empty-with-userinfo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-empty-with-userinfo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-empty-with-userinfo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-hostname-in-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-hostname-in-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-hostname-in-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-hostname-in-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-invalid-unicode-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-invalid-unicode-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-invalid-unicode-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-invalid-unicode-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-invalid-unicode-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-invalid-unicode-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-invalid-unicode-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-invalid-unicode-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-square-brackets-port-contains-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-square-brackets-port-contains-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-square-brackets-port-contains-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-square-brackets-port-contains-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-u0000-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-u0000-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-u0000-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-u0000-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-u0000-percent-encoded-percent-encoded-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-u0000-percent-encoded-percent-encoded-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/host-u0000-percent-encoded-percent-encoded-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/host-u0000-percent-encoded-percent-encoded-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-bare-percent-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-bare-percent-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-bare-percent-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-bare-percent-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-contains-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-contains-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-contains-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-contains-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-leading-backslash-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-leading-backslash-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-leading-backslash-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-leading-backslash-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-leading-colon-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-leading-colon-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-leading-colon-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-leading-colon-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-leading-colon-chars-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-leading-colon-chars-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-leading-colon-chars-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-leading-colon-chars-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-percent-encoded-malformed-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-percent-encoded-malformed-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-percent-encoded-malformed-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-percent-encoded-malformed-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-percent-encoded-slash-plus-slashes-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-percent-encoded-slash-plus-slashes-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-percent-encoded-slash-plus-slashes-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-percent-encoded-slash-plus-slashes-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-percent-encoded-slash-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-percent-encoded-slash-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-percent-encoded-slash-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-percent-encoded-slash-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-relative-square-brackets-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-relative-square-brackets-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-relative-square-brackets-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-relative-square-brackets-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-simple-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-simple-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-simple-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-simple-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-slash-only-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-slash-only-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-slash-only-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-slash-only-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-u0091-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-u0091-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/path-u0091-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/path-u0091-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-999999-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-999999-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-999999-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-999999-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-leading-colon-bracket-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-leading-colon-bracket-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-leading-colon-bracket-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-leading-colon-bracket-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-leading-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-leading-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-leading-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-leading-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-leading-dash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-leading-dash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-leading-dash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-leading-dash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-multiple-letters-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-multiple-letters-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-multiple-letters-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-multiple-letters-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-single-letter-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-single-letter-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-single-letter-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-single-letter-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/port-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/port-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/query-empty-no-path-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/query-empty-no-path-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/query-empty-no-path-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/query-empty-no-path-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/query-leading-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/query-leading-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/query-leading-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/query-leading-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/query-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/query-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/query-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/query-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-data-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-data-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-data-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-data-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-ftp-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-ftp-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-ftp-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-ftp-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-ftp-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-ftp-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-ftp-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-ftp-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-http-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-http-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-http-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-http-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-http-no-slash-colon-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-http-no-slash-colon-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-http-no-slash-colon-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-http-no-slash-colon-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-http-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-http-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-http-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-http-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-http-no-slash-square-bracket-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-http-no-slash-square-bracket-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-http-no-slash-square-bracket-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-http-no-slash-square-bracket-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-http-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-http-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-http-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-http-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-https-no-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-https-no-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-https-no-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-https-no-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-https-single-slash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-https-single-slash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-https-single-slash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-https-single-slash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-schemeless-relative-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-schemeless-relative-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-schemeless-relative-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-schemeless-relative-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-cr-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-cr-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-cr-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-cr-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-newline-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-newline-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-newline-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-newline-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-space-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-space-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-space-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-space-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-tab-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-tab-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-tab-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/scheme-trailing-tab-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/userinfo-backslash-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/userinfo-backslash-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/userinfo-backslash-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/userinfo-backslash-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/userinfo-password-bad-chars-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/userinfo-password-bad-chars-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/userinfo-password-bad-chars-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/userinfo-password-bad-chars-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/userinfo-password-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/userinfo-password-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/userinfo-password-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/userinfo-password-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/userinfo-username-contains-at-sign-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/userinfo-username-contains-at-sign-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/userinfo-username-contains-at-sign-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/userinfo-username-contains-at-sign-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/userinfo-username-contains-pile-of-poo-novalid.html b/tests/wpt/tests/conformance-checkers/html/microdata/itemtype/userinfo-username-contains-pile-of-poo-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/microdata/itemtype/userinfo-username-contains-pile-of-poo-novalid.html rename to tests/wpt/tests/conformance-checkers/html/microdata/itemtype/userinfo-username-contains-pile-of-poo-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/001-isvalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/001-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/001-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/001-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/001-novalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/001-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/001-novalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/001-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/002-isvalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/002-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/002-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/002-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/002-novalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/002-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/002-novalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/002-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/003-isvalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/003-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/003-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/003-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/003-novalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/003-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/003-novalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/003-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/004-isvalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/004-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/004-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/004-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/004-novalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/004-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/004-novalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/004-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/005-isvalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/005-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/005-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/005-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/005-novalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/005-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/005-novalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/005-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/006-isvalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/006-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/006-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/006-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/006-novalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/006-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/006-novalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/006-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/007-isvalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/007-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/007-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/007-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/007-novalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/007-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/007-novalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/007-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/008-isvalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/008-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/008-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/008-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/008-novalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/008-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/008-novalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/008-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/009-isvalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/009-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/009-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/009-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/009-novalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/009-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/009-novalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/009-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/010-isvalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/010-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/010-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/010-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/010-novalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/010-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/010-novalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/010-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/011-isvalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/011-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/011-isvalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/011-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/011-novalid.html b/tests/wpt/tests/conformance-checkers/html/mime-types/011-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/011-novalid.html rename to tests/wpt/tests/conformance-checkers/html/mime-types/011-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/source-isvalid.txt b/tests/wpt/tests/conformance-checkers/html/mime-types/source-isvalid.txt similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/source-isvalid.txt rename to tests/wpt/tests/conformance-checkers/html/mime-types/source-isvalid.txt diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/source-novalid.txt b/tests/wpt/tests/conformance-checkers/html/mime-types/source-novalid.txt similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/mime-types/source-novalid.txt rename to tests/wpt/tests/conformance-checkers/html/mime-types/source-novalid.txt diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/acronym-novalid.html b/tests/wpt/tests/conformance-checkers/html/obsolete/acronym-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/acronym-novalid.html rename to tests/wpt/tests/conformance-checkers/html/obsolete/acronym-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/applet-novalid.html b/tests/wpt/tests/conformance-checkers/html/obsolete/applet-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/applet-novalid.html rename to tests/wpt/tests/conformance-checkers/html/obsolete/applet-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/basefont-novalid.html b/tests/wpt/tests/conformance-checkers/html/obsolete/basefont-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/basefont-novalid.html rename to tests/wpt/tests/conformance-checkers/html/obsolete/basefont-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/big-novalid.html b/tests/wpt/tests/conformance-checkers/html/obsolete/big-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/big-novalid.html rename to tests/wpt/tests/conformance-checkers/html/obsolete/big-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/center-novalid.html b/tests/wpt/tests/conformance-checkers/html/obsolete/center-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/center-novalid.html rename to tests/wpt/tests/conformance-checkers/html/obsolete/center-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/dir-novalid.html b/tests/wpt/tests/conformance-checkers/html/obsolete/dir-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/dir-novalid.html rename to tests/wpt/tests/conformance-checkers/html/obsolete/dir-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/font-novalid.html b/tests/wpt/tests/conformance-checkers/html/obsolete/font-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/font-novalid.html rename to tests/wpt/tests/conformance-checkers/html/obsolete/font-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/frameset-novalid.html b/tests/wpt/tests/conformance-checkers/html/obsolete/frameset-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/frameset-novalid.html rename to tests/wpt/tests/conformance-checkers/html/obsolete/frameset-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/noframes-novalid.html b/tests/wpt/tests/conformance-checkers/html/obsolete/noframes-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/noframes-novalid.html rename to tests/wpt/tests/conformance-checkers/html/obsolete/noframes-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/profile-novalid.html b/tests/wpt/tests/conformance-checkers/html/obsolete/profile-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/profile-novalid.html rename to tests/wpt/tests/conformance-checkers/html/obsolete/profile-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/strike-novalid.html b/tests/wpt/tests/conformance-checkers/html/obsolete/strike-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/strike-novalid.html rename to tests/wpt/tests/conformance-checkers/html/obsolete/strike-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/tt-novalid.html b/tests/wpt/tests/conformance-checkers/html/obsolete/tt-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/obsolete/tt-novalid.html rename to tests/wpt/tests/conformance-checkers/html/obsolete/tt-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/other/applet-novalid.html b/tests/wpt/tests/conformance-checkers/html/other/applet-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/other/applet-novalid.html rename to tests/wpt/tests/conformance-checkers/html/other/applet-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/other/obj-novalid.html b/tests/wpt/tests/conformance-checkers/html/other/obj-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/other/obj-novalid.html rename to tests/wpt/tests/conformance-checkers/html/other/obj-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/parser/cr-charref-novalid.html b/tests/wpt/tests/conformance-checkers/html/parser/cr-charref-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/parser/cr-charref-novalid.html rename to tests/wpt/tests/conformance-checkers/html/parser/cr-charref-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/parser/range-charref-novalid.html b/tests/wpt/tests/conformance-checkers/html/parser/range-charref-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/parser/range-charref-novalid.html rename to tests/wpt/tests/conformance-checkers/html/parser/range-charref-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/parser/u000b-charref-novalid.html b/tests/wpt/tests/conformance-checkers/html/parser/u000b-charref-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/parser/u000b-charref-novalid.html rename to tests/wpt/tests/conformance-checkers/html/parser/u000b-charref-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/parser/u000b-novalid.html b/tests/wpt/tests/conformance-checkers/html/parser/u000b-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/parser/u000b-novalid.html rename to tests/wpt/tests/conformance-checkers/html/parser/u000b-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/parser/u007f-charref-novalid.html b/tests/wpt/tests/conformance-checkers/html/parser/u007f-charref-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/parser/u007f-charref-novalid.html rename to tests/wpt/tests/conformance-checkers/html/parser/u007f-charref-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/parser/u10ffff-charref-novalid.html b/tests/wpt/tests/conformance-checkers/html/parser/u10ffff-charref-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/parser/u10ffff-charref-novalid.html rename to tests/wpt/tests/conformance-checkers/html/parser/u10ffff-charref-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/parser/ufffe-charref-novalid.html b/tests/wpt/tests/conformance-checkers/html/parser/ufffe-charref-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/parser/ufffe-charref-novalid.html rename to tests/wpt/tests/conformance-checkers/html/parser/ufffe-charref-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/parser/unassigned-charref-novalid.html b/tests/wpt/tests/conformance-checkers/html/parser/unassigned-charref-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/html/parser/unassigned-charref-novalid.html rename to tests/wpt/tests/conformance-checkers/html/parser/unassigned-charref-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/index.html b/tests/wpt/tests/conformance-checkers/index.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/index.html rename to tests/wpt/tests/conformance-checkers/index.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/messages.json b/tests/wpt/tests/conformance-checkers/messages.json similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/messages.json rename to tests/wpt/tests/conformance-checkers/messages.json diff --git a/tests/wpt/web-platform-tests/conformance-checkers/select/autocomplete-address-novalid.html b/tests/wpt/tests/conformance-checkers/select/autocomplete-address-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/select/autocomplete-address-novalid.html rename to tests/wpt/tests/conformance-checkers/select/autocomplete-address-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/select/autocomplete-empty-novalid.html b/tests/wpt/tests/conformance-checkers/select/autocomplete-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/select/autocomplete-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/select/autocomplete-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/select/autocomplete-isvalid.html b/tests/wpt/tests/conformance-checkers/select/autocomplete-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/select/autocomplete-isvalid.html rename to tests/wpt/tests/conformance-checkers/select/autocomplete-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/select/autocomplete-section-novalid.html b/tests/wpt/tests/conformance-checkers/select/autocomplete-section-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/select/autocomplete-section-novalid.html rename to tests/wpt/tests/conformance-checkers/select/autocomplete-section-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/select/autocomplete-token-novalid.html b/tests/wpt/tests/conformance-checkers/select/autocomplete-token-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/select/autocomplete-token-novalid.html rename to tests/wpt/tests/conformance-checkers/select/autocomplete-token-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/select/autocomplete-work-novalid.html b/tests/wpt/tests/conformance-checkers/select/autocomplete-work-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/select/autocomplete-work-novalid.html rename to tests/wpt/tests/conformance-checkers/select/autocomplete-work-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/textarea/autocomplete-address-novalid.html b/tests/wpt/tests/conformance-checkers/textarea/autocomplete-address-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/textarea/autocomplete-address-novalid.html rename to tests/wpt/tests/conformance-checkers/textarea/autocomplete-address-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/textarea/autocomplete-empty-novalid.html b/tests/wpt/tests/conformance-checkers/textarea/autocomplete-empty-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/textarea/autocomplete-empty-novalid.html rename to tests/wpt/tests/conformance-checkers/textarea/autocomplete-empty-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/textarea/autocomplete-isvalid.html b/tests/wpt/tests/conformance-checkers/textarea/autocomplete-isvalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/textarea/autocomplete-isvalid.html rename to tests/wpt/tests/conformance-checkers/textarea/autocomplete-isvalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/textarea/autocomplete-section-novalid.html b/tests/wpt/tests/conformance-checkers/textarea/autocomplete-section-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/textarea/autocomplete-section-novalid.html rename to tests/wpt/tests/conformance-checkers/textarea/autocomplete-section-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/textarea/autocomplete-token-novalid.html b/tests/wpt/tests/conformance-checkers/textarea/autocomplete-token-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/textarea/autocomplete-token-novalid.html rename to tests/wpt/tests/conformance-checkers/textarea/autocomplete-token-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/textarea/autocomplete-work-novalid.html b/tests/wpt/tests/conformance-checkers/textarea/autocomplete-work-novalid.html similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/textarea/autocomplete-work-novalid.html rename to tests/wpt/tests/conformance-checkers/textarea/autocomplete-work-novalid.html diff --git a/tests/wpt/web-platform-tests/conformance-checkers/tools/dl.py b/tests/wpt/tests/conformance-checkers/tools/dl.py similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/tools/dl.py rename to tests/wpt/tests/conformance-checkers/tools/dl.py diff --git a/tests/wpt/web-platform-tests/conformance-checkers/tools/ins-del-datetime.py b/tests/wpt/tests/conformance-checkers/tools/ins-del-datetime.py similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/tools/ins-del-datetime.py rename to tests/wpt/tests/conformance-checkers/tools/ins-del-datetime.py diff --git a/tests/wpt/web-platform-tests/conformance-checkers/tools/picture.py b/tests/wpt/tests/conformance-checkers/tools/picture.py similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/tools/picture.py rename to tests/wpt/tests/conformance-checkers/tools/picture.py diff --git a/tests/wpt/web-platform-tests/conformance-checkers/tools/url.py b/tests/wpt/tests/conformance-checkers/tools/url.py similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/tools/url.py rename to tests/wpt/tests/conformance-checkers/tools/url.py diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/accesskey/003-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/attributes/accesskey/003-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/accesskey/003-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/attributes/accesskey/003-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/accesskey/004-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/attributes/accesskey/004-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/accesskey/004-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/attributes/accesskey/004-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/data/002-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/attributes/data/002-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/data/002-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/attributes/data/002-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/spellcheck/050-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/attributes/spellcheck/050-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/spellcheck/050-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/attributes/spellcheck/050-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/spellcheck/051-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/attributes/spellcheck/051-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/spellcheck/051-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/attributes/spellcheck/051-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/spellcheck/052-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/attributes/spellcheck/052-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/spellcheck/052-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/attributes/spellcheck/052-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/spellcheck/053-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/attributes/spellcheck/053-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/spellcheck/053-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/attributes/spellcheck/053-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/spellcheck/350-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/attributes/spellcheck/350-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/attributes/spellcheck/350-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/attributes/spellcheck/350-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/a/100-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/a/100-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/a/100-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/a/100-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/address/029-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/address/029-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/address/029-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/address/029-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/base/001-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/base/001-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/base/001-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/base/001-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/blockquote/028-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/blockquote/028-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/blockquote/028-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/blockquote/028-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/code/010-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/code/010-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/code/010-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/code/010-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/del/041-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/del/041-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/del/041-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/del/041-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/dialog/001-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/dialog/001-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/dialog/001-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/dialog/001-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/dl/032-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/dl/032-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/dl/032-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/dl/032-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/em/006-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/em/006-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/em/006-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/em/006-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/embed/001-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/embed/001-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/embed/001-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/embed/001-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/embed/002-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/embed/002-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/embed/002-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/embed/002-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/embed/003-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/embed/003-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/embed/003-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/embed/003-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/figure/002-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/figure/002-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/figure/002-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/figure/002-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/figure/101-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/figure/101-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/figure/101-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/figure/101-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/figure/102-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/figure/102-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/figure/102-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/figure/102-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/figure/103-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/figure/103-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/figure/103-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/figure/103-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/figure/104-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/figure/104-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/figure/104-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/figure/104-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/figure/304-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/figure/304-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/figure/304-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/figure/304-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/footer/001-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/footer/001-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/footer/001-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/footer/001-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/footer/003-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/footer/003-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/footer/003-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/footer/003-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/header/001-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/header/001-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/header/001-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/header/001-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/header/002-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/header/002-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/header/002-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/header/002-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/iframe/042-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/iframe/042-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/iframe/042-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/iframe/042-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/iframe/042-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/iframe/042-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/iframe/042-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/iframe/042-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/img/003-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/img/003-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/img/003-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/img/003-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/img/004-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/img/004-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/img/004-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/img/004-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/img/043-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/img/043-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/img/043-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/img/043-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/img/051-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/img/051-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/img/051-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/img/051-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/img/051-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/img/051-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/img/051-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/img/051-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/img/052-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/img/052-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/img/052-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/img/052-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/img/302-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/img/302-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/img/302-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/img/302-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/input/003-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/input/003-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/input/003-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/input/003-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/ins/040-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/ins/040-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/ins/040-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/ins/040-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/054-also-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/054-also-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/054-also-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/054-also-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/054-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/054-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/054-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/054-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/055-also-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/055-also-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/055-also-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/055-also-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/056-also-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/056-also-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/056-also-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/056-also-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/056-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/056-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/056-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/056-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/057-also-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/057-also-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/057-also-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/057-also-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/057-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/057-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/057-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/057-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/058-also-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/058-also-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/058-also-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/058-also-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/058-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/058-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/058-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/058-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/059-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/059-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/059-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/059-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/060-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/060-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/060-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/060-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/061-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/061-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/061-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/061-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/154-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/154-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/154-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/154-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/157-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/157-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/157-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/157-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/359-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/359-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/359-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/359-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/360-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/360-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/360-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/360-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/361-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/361-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/361-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/361-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/keygen-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/keygen-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/keygen/keygen-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/keygen/keygen-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/link/001-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/link/001-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/link/001-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/link/001-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/map/048-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/map/048-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/map/048-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/map/048-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/mark/009-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/mark/009-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/mark/009-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/mark/009-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/embed-contextmenu-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/menu/embed-contextmenu-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/embed-contextmenu-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/menu/embed-contextmenu-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menu-containing-hr-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menu-containing-hr-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menu-containing-hr-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menu-containing-hr-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menu-containing-menu-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menu-containing-menu-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menu-containing-menu-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menu-containing-menu-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menu-containing-text-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menu-containing-text-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menu-containing-text-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menu-containing-text-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menu-type-context-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menu-type-context-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menu-type-context-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menu-type-context-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menu-type-popup-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menu-type-popup-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menu-type-popup-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menu-type-popup-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menu-type-toolbar-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menu-type-toolbar-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menu-type-toolbar-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menu-type-toolbar-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menu-valid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menu-valid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menu-valid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menu-valid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menuitem-children-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menuitem-children-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menuitem-children-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menuitem-children-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menuitem-label-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menuitem-label-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/menuitem-label-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/menu/menuitem-label-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/p-contextmenu-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/menu/p-contextmenu-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/menu/p-contextmenu-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/menu/p-contextmenu-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/meter/002-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/meter/002-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/meter/002-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/meter/002-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/meter/003-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/meter/003-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/meter/003-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/meter/003-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/meter/010-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/meter/010-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/meter/010-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/meter/010-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/meter/011-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/meter/011-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/meter/011-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/meter/011-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/meter/012-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/meter/012-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/meter/012-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/meter/012-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/meter/110-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/meter/110-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/meter/110-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/meter/110-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/meter/312-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/meter/312-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/meter/312-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/meter/312-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/object/001-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/object/001-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/object/001-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/object/001-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/object/044-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/object/044-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/object/044-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/object/044-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/ol/031-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/ol/031-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/ol/031-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/ol/031-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/p/025-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/p/025-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/p/025-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/p/025-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/pre/027-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/pre/027-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/pre/027-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/pre/027-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/progress/002-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/progress/002-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/progress/002-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/progress/002-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/progress/008-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/progress/008-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/progress/008-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/progress/008-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/progress/009-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/progress/009-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/progress/009-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/progress/009-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/progress/108-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/progress/108-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/progress/108-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/progress/108-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/progress/309-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/progress/309-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/progress/309-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/progress/309-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/q/013-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/q/013-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/q/013-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/q/013-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/ruby/001-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/ruby/001-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/ruby/001-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/ruby/001-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/ruby/002-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/ruby/002-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/ruby/002-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/ruby/002-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/samp/011-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/samp/011-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/samp/011-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/samp/011-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/script/001-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/script/001-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/script/001-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/script/001-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/span/014-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/span/014-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/span/014-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/span/014-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/strong/007-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/strong/007-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/strong/007-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/strong/007-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/strong/008-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/strong/008-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/strong/008-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/strong/008-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/201-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/table/201-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/201-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/table/201-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/201-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/table/201-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/201-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/table/201-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/202-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/table/202-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/202-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/table/202-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/202-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/table/202-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/202-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/table/202-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/203-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/table/203-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/203-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/table/203-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/203-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/table/203-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/203-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/table/203-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/204-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/table/204-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/204-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/table/204-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/204-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/table/204-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/204-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/table/204-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/205-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/table/205-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/table/205-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/table/205-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/time/001-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/time/001-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/time/001-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/time/001-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/ul/030-isvalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/elements/ul/030-isvalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/elements/ul/030-isvalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/elements/ul/030-isvalid.xhtml diff --git a/tests/wpt/web-platform-tests/conformance-checkers/xhtml/other/045-novalid.xhtml b/tests/wpt/tests/conformance-checkers/xhtml/other/045-novalid.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/conformance-checkers/xhtml/other/045-novalid.xhtml rename to tests/wpt/tests/conformance-checkers/xhtml/other/045-novalid.xhtml diff --git a/tests/wpt/web-platform-tests/console/META.yml b/tests/wpt/tests/console/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/console/META.yml rename to tests/wpt/tests/console/META.yml diff --git a/tests/wpt/web-platform-tests/console/console-count-logging-manual.html b/tests/wpt/tests/console/console-count-logging-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/console/console-count-logging-manual.html rename to tests/wpt/tests/console/console-count-logging-manual.html diff --git a/tests/wpt/web-platform-tests/console/console-countReset-logging-manual.html b/tests/wpt/tests/console/console-countReset-logging-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/console/console-countReset-logging-manual.html rename to tests/wpt/tests/console/console-countReset-logging-manual.html diff --git a/tests/wpt/web-platform-tests/console/console-is-a-namespace.any.js b/tests/wpt/tests/console/console-is-a-namespace.any.js similarity index 100% rename from tests/wpt/web-platform-tests/console/console-is-a-namespace.any.js rename to tests/wpt/tests/console/console-is-a-namespace.any.js diff --git a/tests/wpt/web-platform-tests/console/console-label-conversion.any.js b/tests/wpt/tests/console/console-label-conversion.any.js similarity index 100% rename from tests/wpt/web-platform-tests/console/console-label-conversion.any.js rename to tests/wpt/tests/console/console-label-conversion.any.js diff --git a/tests/wpt/web-platform-tests/console/console-log-shadowrealm-manual.html b/tests/wpt/tests/console/console-log-shadowrealm-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/console/console-log-shadowrealm-manual.html rename to tests/wpt/tests/console/console-log-shadowrealm-manual.html diff --git a/tests/wpt/web-platform-tests/console/console-namespace-object-class-string.any.js b/tests/wpt/tests/console/console-namespace-object-class-string.any.js similarity index 100% rename from tests/wpt/web-platform-tests/console/console-namespace-object-class-string.any.js rename to tests/wpt/tests/console/console-namespace-object-class-string.any.js diff --git a/tests/wpt/web-platform-tests/console/console-number-format-specifiers-symbol-manual.html b/tests/wpt/tests/console/console-number-format-specifiers-symbol-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/console/console-number-format-specifiers-symbol-manual.html rename to tests/wpt/tests/console/console-number-format-specifiers-symbol-manual.html diff --git a/tests/wpt/web-platform-tests/console/console-string-format-specifier-symbol-manual.html b/tests/wpt/tests/console/console-string-format-specifier-symbol-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/console/console-string-format-specifier-symbol-manual.html rename to tests/wpt/tests/console/console-string-format-specifier-symbol-manual.html diff --git a/tests/wpt/web-platform-tests/console/console-tests-historical.any.js b/tests/wpt/tests/console/console-tests-historical.any.js similarity index 100% rename from tests/wpt/web-platform-tests/console/console-tests-historical.any.js rename to tests/wpt/tests/console/console-tests-historical.any.js diff --git a/tests/wpt/web-platform-tests/console/console-timing-logging-manual.html b/tests/wpt/tests/console/console-timing-logging-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/console/console-timing-logging-manual.html rename to tests/wpt/tests/console/console-timing-logging-manual.html diff --git a/tests/wpt/web-platform-tests/console/idlharness-shadowrealm.window.js b/tests/wpt/tests/console/idlharness-shadowrealm.window.js similarity index 100% rename from tests/wpt/web-platform-tests/console/idlharness-shadowrealm.window.js rename to tests/wpt/tests/console/idlharness-shadowrealm.window.js diff --git a/tests/wpt/web-platform-tests/console/idlharness.any.js b/tests/wpt/tests/console/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/console/idlharness.any.js rename to tests/wpt/tests/console/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/contacts/META.yml b/tests/wpt/tests/contacts/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/contacts/META.yml rename to tests/wpt/tests/contacts/META.yml diff --git a/tests/wpt/web-platform-tests/contacts/contacts-select.https.window.js b/tests/wpt/tests/contacts/contacts-select.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/contacts/contacts-select.https.window.js rename to tests/wpt/tests/contacts/contacts-select.https.window.js diff --git a/tests/wpt/web-platform-tests/contacts/resources/helpers.js b/tests/wpt/tests/contacts/resources/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/contacts/resources/helpers.js rename to tests/wpt/tests/contacts/resources/helpers.js diff --git a/tests/wpt/web-platform-tests/contacts/resources/non-main-frame-select.html b/tests/wpt/tests/contacts/resources/non-main-frame-select.html similarity index 100% rename from tests/wpt/web-platform-tests/contacts/resources/non-main-frame-select.html rename to tests/wpt/tests/contacts/resources/non-main-frame-select.html diff --git a/tests/wpt/web-platform-tests/content-dpr/content-dpr-various-elements-ref.html b/tests/wpt/tests/content-dpr/content-dpr-various-elements-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/content-dpr-various-elements-ref.html rename to tests/wpt/tests/content-dpr/content-dpr-various-elements-ref.html diff --git a/tests/wpt/web-platform-tests/content-dpr/content-dpr-various-elements.html b/tests/wpt/tests/content-dpr/content-dpr-various-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/content-dpr-various-elements.html rename to tests/wpt/tests/content-dpr/content-dpr-various-elements.html diff --git a/tests/wpt/web-platform-tests/content-dpr/image-pseudo-element-content-dpr-ref.html b/tests/wpt/tests/content-dpr/image-pseudo-element-content-dpr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/image-pseudo-element-content-dpr-ref.html rename to tests/wpt/tests/content-dpr/image-pseudo-element-content-dpr-ref.html diff --git a/tests/wpt/web-platform-tests/content-dpr/image-pseudo-element-content-dpr.html b/tests/wpt/tests/content-dpr/image-pseudo-element-content-dpr.html similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/image-pseudo-element-content-dpr.html rename to tests/wpt/tests/content-dpr/image-pseudo-element-content-dpr.html diff --git a/tests/wpt/web-platform-tests/content-dpr/image-with-content-dpr-and-explicit-dimensions-ref.html b/tests/wpt/tests/content-dpr/image-with-content-dpr-and-explicit-dimensions-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/image-with-content-dpr-and-explicit-dimensions-ref.html rename to tests/wpt/tests/content-dpr/image-with-content-dpr-and-explicit-dimensions-ref.html diff --git a/tests/wpt/web-platform-tests/content-dpr/image-with-content-dpr-and-explicit-dimensions.html b/tests/wpt/tests/content-dpr/image-with-content-dpr-and-explicit-dimensions.html similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/image-with-content-dpr-and-explicit-dimensions.html rename to tests/wpt/tests/content-dpr/image-with-content-dpr-and-explicit-dimensions.html diff --git a/tests/wpt/web-platform-tests/content-dpr/image-with-dpr-header.html b/tests/wpt/tests/content-dpr/image-with-dpr-header.html similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/image-with-dpr-header.html rename to tests/wpt/tests/content-dpr/image-with-dpr-header.html diff --git a/tests/wpt/web-platform-tests/content-dpr/resources/background.png b/tests/wpt/tests/content-dpr/resources/background.png similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/resources/background.png rename to tests/wpt/tests/content-dpr/resources/background.png diff --git a/tests/wpt/web-platform-tests/content-dpr/resources/background.svg b/tests/wpt/tests/content-dpr/resources/background.svg similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/resources/background.svg rename to tests/wpt/tests/content-dpr/resources/background.svg diff --git a/tests/wpt/web-platform-tests/content-dpr/resources/dpr.py b/tests/wpt/tests/content-dpr/resources/dpr.py similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/resources/dpr.py rename to tests/wpt/tests/content-dpr/resources/dpr.py diff --git a/tests/wpt/web-platform-tests/content-dpr/resources/square.png b/tests/wpt/tests/content-dpr/resources/square.png similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/resources/square.png rename to tests/wpt/tests/content-dpr/resources/square.png diff --git a/tests/wpt/web-platform-tests/content-dpr/tiled-background-image-with-content-dpr-ref.html b/tests/wpt/tests/content-dpr/tiled-background-image-with-content-dpr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/tiled-background-image-with-content-dpr-ref.html rename to tests/wpt/tests/content-dpr/tiled-background-image-with-content-dpr-ref.html diff --git a/tests/wpt/web-platform-tests/content-dpr/tiled-background-image-with-content-dpr.html b/tests/wpt/tests/content-dpr/tiled-background-image-with-content-dpr.html similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/tiled-background-image-with-content-dpr.html rename to tests/wpt/tests/content-dpr/tiled-background-image-with-content-dpr.html diff --git a/tests/wpt/web-platform-tests/content-dpr/tiled-background-svg-image-with-content-dpr-ref.html b/tests/wpt/tests/content-dpr/tiled-background-svg-image-with-content-dpr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/tiled-background-svg-image-with-content-dpr-ref.html rename to tests/wpt/tests/content-dpr/tiled-background-svg-image-with-content-dpr-ref.html diff --git a/tests/wpt/web-platform-tests/content-dpr/tiled-background-svg-image-with-content-dpr.html b/tests/wpt/tests/content-dpr/tiled-background-svg-image-with-content-dpr.html similarity index 100% rename from tests/wpt/web-platform-tests/content-dpr/tiled-background-svg-image-with-content-dpr.html rename to tests/wpt/tests/content-dpr/tiled-background-svg-image-with-content-dpr.html diff --git a/tests/wpt/web-platform-tests/content-index/META.yml b/tests/wpt/tests/content-index/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/content-index/META.yml rename to tests/wpt/tests/content-index/META.yml diff --git a/tests/wpt/web-platform-tests/content-index/content-index.https.window.js b/tests/wpt/tests/content-index/content-index.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/content-index/content-index.https.window.js rename to tests/wpt/tests/content-index/content-index.https.window.js diff --git a/tests/wpt/web-platform-tests/content-index/idlharness.https.any.js b/tests/wpt/tests/content-index/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/content-index/idlharness.https.any.js rename to tests/wpt/tests/content-index/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/content-index/resources.js b/tests/wpt/tests/content-index/resources.js similarity index 100% rename from tests/wpt/web-platform-tests/content-index/resources.js rename to tests/wpt/tests/content-index/resources.js diff --git a/tests/wpt/web-platform-tests/content-index/resources/sw.js b/tests/wpt/tests/content-index/resources/sw.js similarity index 100% rename from tests/wpt/web-platform-tests/content-index/resources/sw.js rename to tests/wpt/tests/content-index/resources/sw.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/META.yml b/tests/wpt/tests/content-security-policy/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/META.yml rename to tests/wpt/tests/content-security-policy/META.yml diff --git a/tests/wpt/web-platform-tests/content-security-policy/README.css b/tests/wpt/tests/content-security-policy/README.css similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/README.css rename to tests/wpt/tests/content-security-policy/README.css diff --git a/tests/wpt/web-platform-tests/content-security-policy/README.html b/tests/wpt/tests/content-security-policy/README.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/README.html rename to tests/wpt/tests/content-security-policy/README.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/base-uri/base-uri-allow-leading-zero-port.sub.html b/tests/wpt/tests/content-security-policy/base-uri/base-uri-allow-leading-zero-port.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/base-uri/base-uri-allow-leading-zero-port.sub.html rename to tests/wpt/tests/content-security-policy/base-uri/base-uri-allow-leading-zero-port.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/base-uri/base-uri-allow.sub.html b/tests/wpt/tests/content-security-policy/base-uri/base-uri-allow.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/base-uri/base-uri-allow.sub.html rename to tests/wpt/tests/content-security-policy/base-uri/base-uri-allow.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/base-uri/base-uri-deny-url-encoded-host.sub.html b/tests/wpt/tests/content-security-policy/base-uri/base-uri-deny-url-encoded-host.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/base-uri/base-uri-deny-url-encoded-host.sub.html rename to tests/wpt/tests/content-security-policy/base-uri/base-uri-deny-url-encoded-host.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/base-uri/base-uri-deny.sub.html b/tests/wpt/tests/content-security-policy/base-uri/base-uri-deny.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/base-uri/base-uri-deny.sub.html rename to tests/wpt/tests/content-security-policy/base-uri/base-uri-deny.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/base-uri/base-uri_iframe_sandbox.sub.html b/tests/wpt/tests/content-security-policy/base-uri/base-uri_iframe_sandbox.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/base-uri/base-uri_iframe_sandbox.sub.html rename to tests/wpt/tests/content-security-policy/base-uri/base-uri_iframe_sandbox.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html b/tests/wpt/tests/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html rename to tests/wpt/tests/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/blob/blob-urls-do-not-match-self.sub.html b/tests/wpt/tests/content-security-policy/blob/blob-urls-do-not-match-self.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/blob/blob-urls-do-not-match-self.sub.html rename to tests/wpt/tests/content-security-policy/blob/blob-urls-do-not-match-self.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/blob/blob-urls-match-blob.sub.html b/tests/wpt/tests/content-security-policy/blob/blob-urls-match-blob.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/blob/blob-urls-match-blob.sub.html rename to tests/wpt/tests/content-security-policy/blob/blob-urls-match-blob.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/blob/self-doesnt-match-blob.sub.html b/tests/wpt/tests/content-security-policy/blob/self-doesnt-match-blob.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/blob/self-doesnt-match-blob.sub.html rename to tests/wpt/tests/content-security-policy/blob/self-doesnt-match-blob.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/blob/star-doesnt-match-blob.sub.html b/tests/wpt/tests/content-security-policy/blob/star-doesnt-match-blob.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/blob/star-doesnt-match-blob.sub.html rename to tests/wpt/tests/content-security-policy/blob/star-doesnt-match-blob.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html b/tests/wpt/tests/content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html rename to tests/wpt/tests/content-security-policy/child-src/child-src-about-blank-allowed-by-default.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html b/tests/wpt/tests/content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html rename to tests/wpt/tests/content-security-policy/child-src/child-src-about-blank-allowed-by-scheme.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-allowed.sub.html b/tests/wpt/tests/content-security-policy/child-src/child-src-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-allowed.sub.html rename to tests/wpt/tests/content-security-policy/child-src/child-src-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-blocked.sub.html b/tests/wpt/tests/content-security-policy/child-src/child-src-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-blocked.sub.html rename to tests/wpt/tests/content-security-policy/child-src/child-src-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html b/tests/wpt/tests/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html rename to tests/wpt/tests/content-security-policy/child-src/child-src-conflicting-frame-src.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-cross-origin-load.sub.html b/tests/wpt/tests/content-security-policy/child-src/child-src-cross-origin-load.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-cross-origin-load.sub.html rename to tests/wpt/tests/content-security-policy/child-src/child-src-cross-origin-load.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-redirect-blocked.sub.html b/tests/wpt/tests/content-security-policy/child-src/child-src-redirect-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-redirect-blocked.sub.html rename to tests/wpt/tests/content-security-policy/child-src/child-src-redirect-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-worker-allowed.sub.html b/tests/wpt/tests/content-security-policy/child-src/child-src-worker-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-worker-allowed.sub.html rename to tests/wpt/tests/content-security-policy/child-src/child-src-worker-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-worker-blocked.sub.html b/tests/wpt/tests/content-security-policy/child-src/child-src-worker-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/child-src/child-src-worker-blocked.sub.html rename to tests/wpt/tests/content-security-policy/child-src/child-src-worker-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-allowed.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-beacon-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-allowed.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/connect-src-beacon-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/connect-src-beacon-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/connect-src-beacon-redirect-to-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-allowed.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-eventsource-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-allowed.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/connect-src-eventsource-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/connect-src-eventsource-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/connect-src-eventsource-redirect-to-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-allowed.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-websocket-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-allowed.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/connect-src-websocket-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/connect-src-websocket-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-self.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-websocket-self.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-websocket-self.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/connect-src-websocket-self.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-allowed.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-xmlhttprequest-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-allowed.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/connect-src-xmlhttprequest-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/connect-src-xmlhttprequest-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/resources/simple-event-stream b/tests/wpt/tests/content-security-policy/connect-src/resources/simple-event-stream similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/resources/simple-event-stream rename to tests/wpt/tests/content-security-policy/connect-src/resources/simple-event-stream diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/resources/simple-event-stream.headers b/tests/wpt/tests/content-security-policy/connect-src/resources/simple-event-stream.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/resources/simple-event-stream.headers rename to tests/wpt/tests/content-security-policy/connect-src/resources/simple-event-stream.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/shared-worker-connect-src-allowed.sub.html b/tests/wpt/tests/content-security-policy/connect-src/shared-worker-connect-src-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/shared-worker-connect-src-allowed.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/shared-worker-connect-src-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/shared-worker-connect-src-blocked.sub.html b/tests/wpt/tests/content-security-policy/connect-src/shared-worker-connect-src-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/shared-worker-connect-src-blocked.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/shared-worker-connect-src-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/support/shared-worker-make-xhr-allowed.sub.js b/tests/wpt/tests/content-security-policy/connect-src/support/shared-worker-make-xhr-allowed.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/support/shared-worker-make-xhr-allowed.sub.js rename to tests/wpt/tests/content-security-policy/connect-src/support/shared-worker-make-xhr-allowed.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js b/tests/wpt/tests/content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js rename to tests/wpt/tests/content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js.sub.headers b/tests/wpt/tests/content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js.sub.headers rename to tests/wpt/tests/content-security-policy/connect-src/support/shared-worker-make-xhr-blocked.sub.js.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js b/tests/wpt/tests/content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js rename to tests/wpt/tests/content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js.sub.headers b/tests/wpt/tests/content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js.sub.headers rename to tests/wpt/tests/content-security-policy/connect-src/support/worker-make-xhr-blocked.sub.js.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/support/worker-make-xhr.sub.js b/tests/wpt/tests/content-security-policy/connect-src/support/worker-make-xhr.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/support/worker-make-xhr.sub.js rename to tests/wpt/tests/content-security-policy/connect-src/support/worker-make-xhr.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-connect-src-allowed.sub.html b/tests/wpt/tests/content-security-policy/connect-src/worker-connect-src-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-connect-src-allowed.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/worker-connect-src-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-connect-src-blocked.sub.html b/tests/wpt/tests/content-security-policy/connect-src/worker-connect-src-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-connect-src-blocked.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/worker-connect-src-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-from-guid.sub.html b/tests/wpt/tests/content-security-policy/connect-src/worker-from-guid.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/connect-src/worker-from-guid.sub.html rename to tests/wpt/tests/content-security-policy/connect-src/worker-from-guid.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-inline-allowed.sub.html b/tests/wpt/tests/content-security-policy/default-src/default-src-inline-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-inline-allowed.sub.html rename to tests/wpt/tests/content-security-policy/default-src/default-src-inline-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-inline-blocked.sub.html b/tests/wpt/tests/content-security-policy/default-src/default-src-inline-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-inline-blocked.sub.html rename to tests/wpt/tests/content-security-policy/default-src/default-src-inline-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-sri_hash.sub.html b/tests/wpt/tests/content-security-policy/default-src/default-src-sri_hash.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-sri_hash.sub.html rename to tests/wpt/tests/content-security-policy/default-src/default-src-sri_hash.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-sri_hash.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/default-src/default-src-sri_hash.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-sri_hash.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/default-src/default-src-sri_hash.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-strict_dynamic_and_unsafe_inline.html b/tests/wpt/tests/content-security-policy/default-src/default-src-strict_dynamic_and_unsafe_inline.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/default-src/default-src-strict_dynamic_and_unsafe_inline.html rename to tests/wpt/tests/content-security-policy/default-src/default-src-strict_dynamic_and_unsafe_inline.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/default-src/externalScript.js b/tests/wpt/tests/content-security-policy/default-src/externalScript.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/default-src/externalScript.js rename to tests/wpt/tests/content-security-policy/default-src/externalScript.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/default-src/simpleSourcedScript.js b/tests/wpt/tests/content-security-policy/default-src/simpleSourcedScript.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/default-src/simpleSourcedScript.js rename to tests/wpt/tests/content-security-policy/default-src/simpleSourcedScript.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/META.yml b/tests/wpt/tests/content-security-policy/embedded-enforcement/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/META.yml rename to tests/wpt/tests/content-security-policy/embedded-enforcement/META.yml diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/allow_csp_from-header.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/allow_csp_from-header.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/allow_csp_from-header.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/allow_csp_from-header.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/blocked-iframe-are-cross-origin.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/blocked-iframe-are-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/blocked-iframe-are-cross-origin.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/blocked-iframe-are-cross-origin.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/change-csp-attribute-and-history-navigation.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/change-csp-attribute-and-history-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/change-csp-attribute-and-history-navigation.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/change-csp-attribute-and-history-navigation.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/idlharness.window.js b/tests/wpt/tests/content-security-policy/embedded-enforcement/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/idlharness.window.js rename to tests/wpt/tests/content-security-policy/embedded-enforcement/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/iframe-csp-attribute.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/iframe-csp-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/iframe-csp-attribute.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/iframe-csp-attribute.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/required-csp-header-cascade.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/required-csp-header-cascade.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/required-csp-header-cascade.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/required-csp-header-cascade.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/required_csp-header-crlf.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/required_csp-header-crlf.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/required_csp-header-crlf.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/required_csp-header-crlf.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/required_csp-header.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/required_csp-header.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/required_csp-header.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/required_csp-header.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-hashes.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-hashes.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-hashes.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-hashes.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-hosts.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-hosts.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-hosts.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-hosts.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-paths.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-paths.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-paths.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-paths.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-ports.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-ports.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-ports.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-ports.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-protocols.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-protocols.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-protocols.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-protocols.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-nonces.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-nonces.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-nonces.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-nonces.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-none.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-none.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-none.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-none.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-self.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-self.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-self.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-self.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-source_list-wildcards.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-source_list-wildcards.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-source_list-wildcards.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-source_list-wildcards.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-strict_dynamic.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-strict_dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-strict_dynamic.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-strict_dynamic.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_eval.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_eval.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_eval.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_eval.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_hashes.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_hashes.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_hashes.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_hashes.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_inline.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_inline.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_inline.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_inline.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/support/echo-allow-csp-from.py b/tests/wpt/tests/content-security-policy/embedded-enforcement/support/echo-allow-csp-from.py similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/support/echo-allow-csp-from.py rename to tests/wpt/tests/content-security-policy/embedded-enforcement/support/echo-allow-csp-from.py diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/support/echo-policy-multiple.py b/tests/wpt/tests/content-security-policy/embedded-enforcement/support/echo-policy-multiple.py similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/support/echo-policy-multiple.py rename to tests/wpt/tests/content-security-policy/embedded-enforcement/support/echo-policy-multiple.py diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/support/echo-required-csp.py b/tests/wpt/tests/content-security-policy/embedded-enforcement/support/echo-required-csp.py similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/support/echo-required-csp.py rename to tests/wpt/tests/content-security-policy/embedded-enforcement/support/echo-required-csp.py diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/support/embed-img-and-message-top.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/support/embed-img-and-message-top.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/support/embed-img-and-message-top.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/support/embed-img-and-message-top.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/support/executor.html b/tests/wpt/tests/content-security-policy/embedded-enforcement/support/executor.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/support/executor.html rename to tests/wpt/tests/content-security-policy/embedded-enforcement/support/executor.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/support/testharness-helper.sub.js b/tests/wpt/tests/content-security-policy/embedded-enforcement/support/testharness-helper.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/support/testharness-helper.sub.js rename to tests/wpt/tests/content-security-policy/embedded-enforcement/support/testharness-helper.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/font-src/font-match-allowed.sub.html b/tests/wpt/tests/content-security-policy/font-src/font-match-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/font-src/font-match-allowed.sub.html rename to tests/wpt/tests/content-security-policy/font-src/font-match-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/font-src/font-mismatch-blocked.sub.html b/tests/wpt/tests/content-security-policy/font-src/font-mismatch-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/font-src/font-mismatch-blocked.sub.html rename to tests/wpt/tests/content-security-policy/font-src/font-mismatch-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/font-src/font-none-blocked.sub.html b/tests/wpt/tests/content-security-policy/font-src/font-none-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/font-src/font-none-blocked.sub.html rename to tests/wpt/tests/content-security-policy/font-src/font-none-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/font-src/font-self-allowed.html b/tests/wpt/tests/content-security-policy/font-src/font-self-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/font-src/font-self-allowed.html rename to tests/wpt/tests/content-security-policy/font-src/font-self-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/font-src/font-stylesheet-font-blocked.sub.html b/tests/wpt/tests/content-security-policy/font-src/font-stylesheet-font-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/font-src/font-stylesheet-font-blocked.sub.html rename to tests/wpt/tests/content-security-policy/font-src/font-stylesheet-font-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-self-allowed-target-blank.html b/tests/wpt/tests/content-security-policy/form-action/form-action-self-allowed-target-blank.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-self-allowed-target-blank.html rename to tests/wpt/tests/content-security-policy/form-action/form-action-self-allowed-target-blank.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-allowed-target-blank.sub.html b/tests/wpt/tests/content-security-policy/form-action/form-action-src-allowed-target-blank.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-allowed-target-blank.sub.html rename to tests/wpt/tests/content-security-policy/form-action/form-action-src-allowed-target-blank.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-allowed-target-frame.sub.html b/tests/wpt/tests/content-security-policy/form-action/form-action-src-allowed-target-frame.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-allowed-target-frame.sub.html rename to tests/wpt/tests/content-security-policy/form-action/form-action-src-allowed-target-frame.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-allowed.sub.html b/tests/wpt/tests/content-security-policy/form-action/form-action-src-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-allowed.sub.html rename to tests/wpt/tests/content-security-policy/form-action/form-action-src-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-blocked.sub.html b/tests/wpt/tests/content-security-policy/form-action/form-action-src-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-blocked.sub.html rename to tests/wpt/tests/content-security-policy/form-action/form-action-src-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-default-ignored.sub.html b/tests/wpt/tests/content-security-policy/form-action/form-action-src-default-ignored.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-default-ignored.sub.html rename to tests/wpt/tests/content-security-policy/form-action/form-action-src-default-ignored.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-get-allowed.sub.html b/tests/wpt/tests/content-security-policy/form-action/form-action-src-get-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-get-allowed.sub.html rename to tests/wpt/tests/content-security-policy/form-action/form-action-src-get-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-get-blocked.sub.html b/tests/wpt/tests/content-security-policy/form-action/form-action-src-get-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-get-blocked.sub.html rename to tests/wpt/tests/content-security-policy/form-action/form-action-src-get-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html b/tests/wpt/tests/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html rename to tests/wpt/tests/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/form-action/form-action-src-javascript-blocked.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-javascript-prevented.html b/tests/wpt/tests/content-security-policy/form-action/form-action-src-javascript-prevented.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-javascript-prevented.html rename to tests/wpt/tests/content-security-policy/form-action/form-action-src-javascript-prevented.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-redirect-allowed-target-blank.sub.html b/tests/wpt/tests/content-security-policy/form-action/form-action-src-redirect-allowed-target-blank.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-redirect-allowed-target-blank.sub.html rename to tests/wpt/tests/content-security-policy/form-action/form-action-src-redirect-allowed-target-blank.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-redirect-allowed-target-frame.sub.html b/tests/wpt/tests/content-security-policy/form-action/form-action-src-redirect-allowed-target-frame.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-redirect-allowed-target-frame.sub.html rename to tests/wpt/tests/content-security-policy/form-action/form-action-src-redirect-allowed-target-frame.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-redirect-blocked.sub.html b/tests/wpt/tests/content-security-policy/form-action/form-action-src-redirect-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/form-action-src-redirect-blocked.sub.html rename to tests/wpt/tests/content-security-policy/form-action/form-action-src-redirect-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/support/post-message-to-opener.sub.html b/tests/wpt/tests/content-security-policy/form-action/support/post-message-to-opener.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/support/post-message-to-opener.sub.html rename to tests/wpt/tests/content-security-policy/form-action/support/post-message-to-opener.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/form-action/support/post-message-to-parent.sub.html b/tests/wpt/tests/content-security-policy/form-action/support/post-message-to-parent.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/form-action/support/post-message-to-parent.sub.html rename to tests/wpt/tests/content-security-policy/form-action/support/post-message-to-parent.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-from-serviceworker.https.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-from-serviceworker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-from-serviceworker.https.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-from-serviceworker.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-star-allow.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-star-allow.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-star-allow.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-star-allow.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-allow.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-allow.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-allow.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-allow.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-none-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-none-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-none-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-none-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-url-allow.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-url-allow.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-url-allow.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-url-allow.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-url-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-url-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-url-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-url-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-sandboxed-cross-url-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-sandboxed-cross-url-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-sandboxed-cross-url-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-sandboxed-cross-url-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-none-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-none-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-none-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-none-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-star-allow.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-star-allow.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-star-allow.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-star-allow.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-url-allow.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-url-allow.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-url-allow.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-url-allow.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-url-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-url-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-url-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-cross-url-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-none-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-none-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-none-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-none-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-self-allow.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-self-allow.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-self-allow.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-self-allow.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-star-allow.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-star-allow.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-star-allow.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-star-allow.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-url-allow.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-url-allow.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-url-allow.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-url-allow.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-url-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-url-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-url-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-same-in-same-url-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-none-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-none-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-none-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-none-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-overrides-xfo.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-overrides-xfo.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-overrides-xfo.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-overrides-xfo.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-sandbox-same-origin-self.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-sandbox-same-origin-self.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-sandbox-same-origin-self.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-sandbox-same-origin-self.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-self-allow.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-self-allow.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-self-allow.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-self-allow.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-self-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-self-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-self-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-self-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-star-allow-crossorigin.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-star-allow-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-star-allow-crossorigin.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-star-allow-crossorigin.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-star-allow-sameorigin.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-star-allow-sameorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-star-allow-sameorigin.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-star-allow-sameorigin.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-url-allow.sub.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-url-allow.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-url-allow.sub.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-url-allow.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-url-block.html b/tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-url-block.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/frame-ancestors-url-block.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/frame-ancestors-url-block.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/report-blocked-frame.sub.html b/tests/wpt/tests/content-security-policy/frame-ancestors/report-blocked-frame.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/report-blocked-frame.sub.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/report-blocked-frame.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/report-only-frame.sub.html b/tests/wpt/tests/content-security-policy/frame-ancestors/report-only-frame.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/report-only-frame.sub.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/report-only-frame.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/content-security-policy-report-only.sub.html b/tests/wpt/tests/content-security-policy/frame-ancestors/support/content-security-policy-report-only.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/content-security-policy-report-only.sub.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/support/content-security-policy-report-only.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/content-security-policy-report-only.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/frame-ancestors/support/content-security-policy-report-only.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/content-security-policy-report-only.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/frame-ancestors/support/content-security-policy-report-only.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/content-security-policy.sub.html b/tests/wpt/tests/content-security-policy/frame-ancestors/support/content-security-policy.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/content-security-policy.sub.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/support/content-security-policy.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/content-security-policy.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/frame-ancestors/support/content-security-policy.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/content-security-policy.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/frame-ancestors/support/content-security-policy.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/frame-ancestors-and-x-frame-options.sub.html b/tests/wpt/tests/content-security-policy/frame-ancestors/support/frame-ancestors-and-x-frame-options.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/frame-ancestors-and-x-frame-options.sub.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/support/frame-ancestors-and-x-frame-options.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/frame-ancestors-and-x-frame-options.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/frame-ancestors/support/frame-ancestors-and-x-frame-options.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/frame-ancestors-and-x-frame-options.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/frame-ancestors/support/frame-ancestors-and-x-frame-options.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/frame-ancestors-test.sub.js b/tests/wpt/tests/content-security-policy/frame-ancestors/support/frame-ancestors-test.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/frame-ancestors-test.sub.js rename to tests/wpt/tests/content-security-policy/frame-ancestors/support/frame-ancestors-test.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/frame-ancestors.sub.html b/tests/wpt/tests/content-security-policy/frame-ancestors/support/frame-ancestors.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/frame-ancestors.sub.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/support/frame-ancestors.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/frame-ancestors.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/frame-ancestors/support/frame-ancestors.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/frame-ancestors.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/frame-ancestors/support/frame-ancestors.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/frame-in-frame.sub.html b/tests/wpt/tests/content-security-policy/frame-ancestors/support/frame-in-frame.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/frame-in-frame.sub.html rename to tests/wpt/tests/content-security-policy/frame-ancestors/support/frame-in-frame.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/frame-in-frame.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/frame-ancestors/support/frame-in-frame.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/frame-in-frame.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/frame-ancestors/support/frame-in-frame.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/service-worker.js b/tests/wpt/tests/content-security-policy/frame-ancestors/support/service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-ancestors/support/service-worker.js rename to tests/wpt/tests/content-security-policy/frame-ancestors/support/service-worker.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-about-blank-allowed-by-default.sub.html b/tests/wpt/tests/content-security-policy/frame-src/frame-src-about-blank-allowed-by-default.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-about-blank-allowed-by-default.sub.html rename to tests/wpt/tests/content-security-policy/frame-src/frame-src-about-blank-allowed-by-default.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-about-blank-allowed-by-scheme.sub.html b/tests/wpt/tests/content-security-policy/frame-src/frame-src-about-blank-allowed-by-scheme.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-about-blank-allowed-by-scheme.sub.html rename to tests/wpt/tests/content-security-policy/frame-src/frame-src-about-blank-allowed-by-scheme.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-allowed.sub.html b/tests/wpt/tests/content-security-policy/frame-src/frame-src-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-allowed.sub.html rename to tests/wpt/tests/content-security-policy/frame-src/frame-src-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-blocked.sub.html b/tests/wpt/tests/content-security-policy/frame-src/frame-src-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-blocked.sub.html rename to tests/wpt/tests/content-security-policy/frame-src/frame-src-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-cross-origin-load.sub.html b/tests/wpt/tests/content-security-policy/frame-src/frame-src-cross-origin-load.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-cross-origin-load.sub.html rename to tests/wpt/tests/content-security-policy/frame-src/frame-src-cross-origin-load.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-cross-origin-same-document-navigation.window.js b/tests/wpt/tests/content-security-policy/frame-src/frame-src-cross-origin-same-document-navigation.window.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-cross-origin-same-document-navigation.window.js rename to tests/wpt/tests/content-security-policy/frame-src/frame-src-cross-origin-same-document-navigation.window.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-redirect.html b/tests/wpt/tests/content-security-policy/frame-src/frame-src-redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-redirect.html rename to tests/wpt/tests/content-security-policy/frame-src/frame-src-redirect.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-redirect.html.headers b/tests/wpt/tests/content-security-policy/frame-src/frame-src-redirect.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-redirect.html.headers rename to tests/wpt/tests/content-security-policy/frame-src/frame-src-redirect.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-same-document-meta.sub.html b/tests/wpt/tests/content-security-policy/frame-src/frame-src-same-document-meta.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-same-document-meta.sub.html rename to tests/wpt/tests/content-security-policy/frame-src/frame-src-same-document-meta.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-same-document.sub.html b/tests/wpt/tests/content-security-policy/frame-src/frame-src-same-document.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-same-document.sub.html rename to tests/wpt/tests/content-security-policy/frame-src/frame-src-same-document.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-same-document.sub.html.headers b/tests/wpt/tests/content-security-policy/frame-src/frame-src-same-document.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-same-document.sub.html.headers rename to tests/wpt/tests/content-security-policy/frame-src/frame-src-same-document.sub.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html b/tests/wpt/tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html rename to tests/wpt/tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html.headers b/tests/wpt/tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html.headers rename to tests/wpt/tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-self-unique-origin.html b/tests/wpt/tests/content-security-policy/frame-src/frame-src-self-unique-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-self-unique-origin.html rename to tests/wpt/tests/content-security-policy/frame-src/frame-src-self-unique-origin.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/support/frame.html b/tests/wpt/tests/content-security-policy/frame-src/support/frame.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/support/frame.html rename to tests/wpt/tests/content-security-policy/frame-src/support/frame.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/support/testharness-helper.sub.js b/tests/wpt/tests/content-security-policy/frame-src/support/testharness-helper.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/frame-src/support/testharness-helper.sub.js rename to tests/wpt/tests/content-security-policy/frame-src/support/testharness-helper.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.http.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.http.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html.headers b/tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html.headers rename to tests/wpt/tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/script-tag.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/script-tag.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/script-tag.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/script-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/script-tag.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/script-tag.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-animation-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-animation-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-animation.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-animation.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-audio-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-audio-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-audio.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-audio.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-layout-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-layout-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-layout.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-layout.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-paint-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-paint-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-paint.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-paint.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-self/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/script-tag.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/script-tag.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/script-tag.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/script-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/script-tag.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/script-tag.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/script-tag.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/script-tag.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/script-tag.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/script-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/script-tag.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/script-tag.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-animation-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-animation-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-animation.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-animation.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-audio-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-audio-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-audio.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-audio.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-layout-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-layout-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-layout.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-layout.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-paint-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-paint-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-paint.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-paint.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-none/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/script-tag.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/script-tag.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/script-tag.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/script-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/script-tag.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/script-tag.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-animation-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-animation-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-animation.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-animation.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-audio-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-audio-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-audio.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-audio.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-layout-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-layout-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-layout.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-layout.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-paint-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-paint-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-paint.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-paint.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-self/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/script-tag.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/script-tag.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/script-tag.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/script-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/script-tag.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/script-tag.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-classic.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-classic.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-classic.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-classic.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-module.http.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-module.http.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-module.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-module.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint-import-data.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint-import-data.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint.https.html b/tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint.https.html rename to tests/wpt/tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/304-response-should-update-csp.sub.html b/tests/wpt/tests/content-security-policy/generic/304-response-should-update-csp.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/304-response-should-update-csp.sub.html rename to tests/wpt/tests/content-security-policy/generic/304-response-should-update-csp.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/cspro-not-enforced-in-worker.html b/tests/wpt/tests/content-security-policy/generic/cspro-not-enforced-in-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/cspro-not-enforced-in-worker.html rename to tests/wpt/tests/content-security-policy/generic/cspro-not-enforced-in-worker.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/cspro-not-enforced-in-worker.html.sub.headers b/tests/wpt/tests/content-security-policy/generic/cspro-not-enforced-in-worker.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/cspro-not-enforced-in-worker.html.sub.headers rename to tests/wpt/tests/content-security-policy/generic/cspro-not-enforced-in-worker.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/directive-name-case-insensitive.sub.html b/tests/wpt/tests/content-security-policy/generic/directive-name-case-insensitive.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/directive-name-case-insensitive.sub.html rename to tests/wpt/tests/content-security-policy/generic/directive-name-case-insensitive.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/duplicate-directive.sub.html b/tests/wpt/tests/content-security-policy/generic/duplicate-directive.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/duplicate-directive.sub.html rename to tests/wpt/tests/content-security-policy/generic/duplicate-directive.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/eval-typecheck-callout-order.tentative.html b/tests/wpt/tests/content-security-policy/generic/eval-typecheck-callout-order.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/eval-typecheck-callout-order.tentative.html rename to tests/wpt/tests/content-security-policy/generic/eval-typecheck-callout-order.tentative.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/eval-typecheck-callout-order.tentative.html.headers b/tests/wpt/tests/content-security-policy/generic/eval-typecheck-callout-order.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/eval-typecheck-callout-order.tentative.html.headers rename to tests/wpt/tests/content-security-policy/generic/eval-typecheck-callout-order.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/fail-0_1.js b/tests/wpt/tests/content-security-policy/generic/fail-0_1.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/fail-0_1.js rename to tests/wpt/tests/content-security-policy/generic/fail-0_1.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/filesystem-urls-do-not-match-self.sub.html b/tests/wpt/tests/content-security-policy/generic/filesystem-urls-do-not-match-self.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/filesystem-urls-do-not-match-self.sub.html rename to tests/wpt/tests/content-security-policy/generic/filesystem-urls-do-not-match-self.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/filesystem-urls-match-filesystem.sub.html b/tests/wpt/tests/content-security-policy/generic/filesystem-urls-match-filesystem.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/filesystem-urls-match-filesystem.sub.html rename to tests/wpt/tests/content-security-policy/generic/filesystem-urls-match-filesystem.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-img-src.html b/tests/wpt/tests/content-security-policy/generic/generic-0_1-img-src.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-img-src.html rename to tests/wpt/tests/content-security-policy/generic/generic-0_1-img-src.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-script-src.html b/tests/wpt/tests/content-security-policy/generic/generic-0_1-script-src.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_1-script-src.html rename to tests/wpt/tests/content-security-policy/generic/generic-0_1-script-src.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10.sub.html b/tests/wpt/tests/content-security-policy/generic/generic-0_10.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10.sub.html rename to tests/wpt/tests/content-security-policy/generic/generic-0_10.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10_1.sub.html b/tests/wpt/tests/content-security-policy/generic/generic-0_10_1.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_10_1.sub.html rename to tests/wpt/tests/content-security-policy/generic/generic-0_10_1.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2.html b/tests/wpt/tests/content-security-policy/generic/generic-0_2.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2.html rename to tests/wpt/tests/content-security-policy/generic/generic-0_2.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_2.sub.html b/tests/wpt/tests/content-security-policy/generic/generic-0_2_2.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_2.sub.html rename to tests/wpt/tests/content-security-policy/generic/generic-0_2_2.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_3.html b/tests/wpt/tests/content-security-policy/generic/generic-0_2_3.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_2_3.html rename to tests/wpt/tests/content-security-policy/generic/generic-0_2_3.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8.sub.html b/tests/wpt/tests/content-security-policy/generic/generic-0_8.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8.sub.html rename to tests/wpt/tests/content-security-policy/generic/generic-0_8.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8_1.sub.html b/tests/wpt/tests/content-security-policy/generic/generic-0_8_1.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_8_1.sub.html rename to tests/wpt/tests/content-security-policy/generic/generic-0_8_1.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_9.sub.html b/tests/wpt/tests/content-security-policy/generic/generic-0_9.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/generic-0_9.sub.html rename to tests/wpt/tests/content-security-policy/generic/generic-0_9.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/invalid-characters-in-policy.html b/tests/wpt/tests/content-security-policy/generic/invalid-characters-in-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/invalid-characters-in-policy.html rename to tests/wpt/tests/content-security-policy/generic/invalid-characters-in-policy.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/negativeTests.js b/tests/wpt/tests/content-security-policy/generic/negativeTests.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/negativeTests.js rename to tests/wpt/tests/content-security-policy/generic/negativeTests.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/no-default-src.sub.html b/tests/wpt/tests/content-security-policy/generic/no-default-src.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/no-default-src.sub.html rename to tests/wpt/tests/content-security-policy/generic/no-default-src.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/no-default-src.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/generic/no-default-src.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/no-default-src.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/generic/no-default-src.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/only-valid-whitespaces-are-allowed.html b/tests/wpt/tests/content-security-policy/generic/only-valid-whitespaces-are-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/only-valid-whitespaces-are-allowed.html rename to tests/wpt/tests/content-security-policy/generic/only-valid-whitespaces-are-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/pass-0_1.js b/tests/wpt/tests/content-security-policy/generic/pass-0_1.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/pass-0_1.js rename to tests/wpt/tests/content-security-policy/generic/pass-0_1.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/policy-does-not-affect-child.sub.html b/tests/wpt/tests/content-security-policy/generic/policy-does-not-affect-child.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/policy-does-not-affect-child.sub.html rename to tests/wpt/tests/content-security-policy/generic/policy-does-not-affect-child.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/policy-inherited-correctly-by-plznavigate.html b/tests/wpt/tests/content-security-policy/generic/policy-inherited-correctly-by-plznavigate.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/policy-inherited-correctly-by-plznavigate.html rename to tests/wpt/tests/content-security-policy/generic/policy-inherited-correctly-by-plznavigate.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/policy-inherited-correctly-by-plznavigate.html.sub.headers b/tests/wpt/tests/content-security-policy/generic/policy-inherited-correctly-by-plznavigate.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/policy-inherited-correctly-by-plznavigate.html.sub.headers rename to tests/wpt/tests/content-security-policy/generic/policy-inherited-correctly-by-plznavigate.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/positiveTest.js b/tests/wpt/tests/content-security-policy/generic/positiveTest.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/positiveTest.js rename to tests/wpt/tests/content-security-policy/generic/positiveTest.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/support/304-response.py b/tests/wpt/tests/content-security-policy/generic/support/304-response.py similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/support/304-response.py rename to tests/wpt/tests/content-security-policy/generic/support/304-response.py diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/support/eval.js b/tests/wpt/tests/content-security-policy/generic/support/eval.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/support/eval.js rename to tests/wpt/tests/content-security-policy/generic/support/eval.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/support/load_img_and_post_result_header.html b/tests/wpt/tests/content-security-policy/generic/support/load_img_and_post_result_header.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/support/load_img_and_post_result_header.html rename to tests/wpt/tests/content-security-policy/generic/support/load_img_and_post_result_header.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/support/load_img_and_post_result_header.html.sub.headers b/tests/wpt/tests/content-security-policy/generic/support/load_img_and_post_result_header.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/support/load_img_and_post_result_header.html.sub.headers rename to tests/wpt/tests/content-security-policy/generic/support/load_img_and_post_result_header.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/support/load_img_and_post_result_meta.sub.html b/tests/wpt/tests/content-security-policy/generic/support/load_img_and_post_result_meta.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/support/load_img_and_post_result_meta.sub.html rename to tests/wpt/tests/content-security-policy/generic/support/load_img_and_post_result_meta.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/support/log-pass.html b/tests/wpt/tests/content-security-policy/generic/support/log-pass.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/support/log-pass.html rename to tests/wpt/tests/content-security-policy/generic/support/log-pass.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/support/sandboxed-eval.sub.html b/tests/wpt/tests/content-security-policy/generic/support/sandboxed-eval.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/support/sandboxed-eval.sub.html rename to tests/wpt/tests/content-security-policy/generic/support/sandboxed-eval.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/support/sandboxed-eval.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/generic/support/sandboxed-eval.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/support/sandboxed-eval.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/generic/support/sandboxed-eval.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/test-case.sub.js b/tests/wpt/tests/content-security-policy/generic/test-case.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/test-case.sub.js rename to tests/wpt/tests/content-security-policy/generic/test-case.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/unreached.js b/tests/wpt/tests/content-security-policy/generic/unreached.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/unreached.js rename to tests/wpt/tests/content-security-policy/generic/unreached.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/wildcardHostTest.js b/tests/wpt/tests/content-security-policy/generic/wildcardHostTest.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/wildcardHostTest.js rename to tests/wpt/tests/content-security-policy/generic/wildcardHostTest.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/wildcardHostTestFailure.js b/tests/wpt/tests/content-security-policy/generic/wildcardHostTestFailure.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/wildcardHostTestFailure.js rename to tests/wpt/tests/content-security-policy/generic/wildcardHostTestFailure.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/wildcardHostTestSuceeds.js b/tests/wpt/tests/content-security-policy/generic/wildcardHostTestSuceeds.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/wildcardHostTestSuceeds.js rename to tests/wpt/tests/content-security-policy/generic/wildcardHostTestSuceeds.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/wildcardPortTest.js b/tests/wpt/tests/content-security-policy/generic/wildcardPortTest.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/wildcardPortTest.js rename to tests/wpt/tests/content-security-policy/generic/wildcardPortTest.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/wildcardPortTestSuceeds.js b/tests/wpt/tests/content-security-policy/generic/wildcardPortTestSuceeds.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/generic/wildcardPortTestSuceeds.js rename to tests/wpt/tests/content-security-policy/generic/wildcardPortTestSuceeds.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/img-src/icon-allowed.sub.html b/tests/wpt/tests/content-security-policy/img-src/icon-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/img-src/icon-allowed.sub.html rename to tests/wpt/tests/content-security-policy/img-src/icon-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/img-src/icon-blocked.sub.html b/tests/wpt/tests/content-security-policy/img-src/icon-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/img-src/icon-blocked.sub.html rename to tests/wpt/tests/content-security-policy/img-src/icon-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/img-src/img-src-4_1.sub.html b/tests/wpt/tests/content-security-policy/img-src/img-src-4_1.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/img-src/img-src-4_1.sub.html rename to tests/wpt/tests/content-security-policy/img-src/img-src-4_1.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/img-src/img-src-full-host-wildcard-blocked.sub.html b/tests/wpt/tests/content-security-policy/img-src/img-src-full-host-wildcard-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/img-src/img-src-full-host-wildcard-blocked.sub.html rename to tests/wpt/tests/content-security-policy/img-src/img-src-full-host-wildcard-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/img-src/img-src-host-partial-wildcard-allowed.sub.html b/tests/wpt/tests/content-security-policy/img-src/img-src-host-partial-wildcard-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/img-src/img-src-host-partial-wildcard-allowed.sub.html rename to tests/wpt/tests/content-security-policy/img-src/img-src-host-partial-wildcard-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/img-src/img-src-none-blocks.html b/tests/wpt/tests/content-security-policy/img-src/img-src-none-blocks.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/img-src/img-src-none-blocks.html rename to tests/wpt/tests/content-security-policy/img-src/img-src-none-blocks.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/img-src/img-src-port-wildcard-allowed.sub.html b/tests/wpt/tests/content-security-policy/img-src/img-src-port-wildcard-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/img-src/img-src-port-wildcard-allowed.sub.html rename to tests/wpt/tests/content-security-policy/img-src/img-src-port-wildcard-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/img-src/img-src-self-unique-origin.html b/tests/wpt/tests/content-security-policy/img-src/img-src-self-unique-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/img-src/img-src-self-unique-origin.html rename to tests/wpt/tests/content-security-policy/img-src/img-src-self-unique-origin.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/img-src/img-src-wildcard-allowed.html b/tests/wpt/tests/content-security-policy/img-src/img-src-wildcard-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/img-src/img-src-wildcard-allowed.html rename to tests/wpt/tests/content-security-policy/img-src/img-src-wildcard-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/img-src/report-blocked-data-uri.sub.html b/tests/wpt/tests/content-security-policy/img-src/report-blocked-data-uri.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/img-src/report-blocked-data-uri.sub.html rename to tests/wpt/tests/content-security-policy/img-src/report-blocked-data-uri.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-inherits-from-meta-http-equiv-with-invalid-characters.html b/tests/wpt/tests/content-security-policy/inheritance/blob-inherits-from-meta-http-equiv-with-invalid-characters.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-inherits-from-meta-http-equiv-with-invalid-characters.html rename to tests/wpt/tests/content-security-policy/inheritance/blob-inherits-from-meta-http-equiv-with-invalid-characters.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-url-in-child-frame-self-navigate-inherits.sub.html b/tests/wpt/tests/content-security-policy/inheritance/blob-url-in-child-frame-self-navigate-inherits.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-url-in-child-frame-self-navigate-inherits.sub.html rename to tests/wpt/tests/content-security-policy/inheritance/blob-url-in-child-frame-self-navigate-inherits.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-url-in-main-window-self-navigate-inherits.sub.html b/tests/wpt/tests/content-security-policy/inheritance/blob-url-in-main-window-self-navigate-inherits.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-url-in-main-window-self-navigate-inherits.sub.html rename to tests/wpt/tests/content-security-policy/inheritance/blob-url-in-main-window-self-navigate-inherits.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-url-inherits-from-initiator.sub.html b/tests/wpt/tests/content-security-policy/inheritance/blob-url-inherits-from-initiator.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/blob-url-inherits-from-initiator.sub.html rename to tests/wpt/tests/content-security-policy/inheritance/blob-url-inherits-from-initiator.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/document-write-iframe.html b/tests/wpt/tests/content-security-policy/inheritance/document-write-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/document-write-iframe.html rename to tests/wpt/tests/content-security-policy/inheritance/document-write-iframe.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/frame-src-javascript-url.html b/tests/wpt/tests/content-security-policy/inheritance/frame-src-javascript-url.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/frame-src-javascript-url.html rename to tests/wpt/tests/content-security-policy/inheritance/frame-src-javascript-url.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/history-iframe.sub.html b/tests/wpt/tests/content-security-policy/inheritance/history-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/history-iframe.sub.html rename to tests/wpt/tests/content-security-policy/inheritance/history-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/history.sub.html b/tests/wpt/tests/content-security-policy/inheritance/history.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/history.sub.html rename to tests/wpt/tests/content-security-policy/inheritance/history.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe-all-local-schemes-inherit-self.sub.html b/tests/wpt/tests/content-security-policy/inheritance/iframe-all-local-schemes-inherit-self.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe-all-local-schemes-inherit-self.sub.html rename to tests/wpt/tests/content-security-policy/inheritance/iframe-all-local-schemes-inherit-self.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe-all-local-schemes.sub.html b/tests/wpt/tests/content-security-policy/inheritance/iframe-all-local-schemes.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe-all-local-schemes.sub.html rename to tests/wpt/tests/content-security-policy/inheritance/iframe-all-local-schemes.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe-srcdoc-history-inheritance.html b/tests/wpt/tests/content-security-policy/inheritance/iframe-srcdoc-history-inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe-srcdoc-history-inheritance.html rename to tests/wpt/tests/content-security-policy/inheritance/iframe-srcdoc-history-inheritance.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe-srcdoc-inheritance.html b/tests/wpt/tests/content-security-policy/inheritance/iframe-srcdoc-inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/iframe-srcdoc-inheritance.html rename to tests/wpt/tests/content-security-policy/inheritance/iframe-srcdoc-inheritance.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/inheritance-from-initiator.sub.html b/tests/wpt/tests/content-security-policy/inheritance/inheritance-from-initiator.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/inheritance-from-initiator.sub.html rename to tests/wpt/tests/content-security-policy/inheritance/inheritance-from-initiator.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/inherited-csp-list-modifications-are-local.html b/tests/wpt/tests/content-security-policy/inheritance/inherited-csp-list-modifications-are-local.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/inherited-csp-list-modifications-are-local.html rename to tests/wpt/tests/content-security-policy/inheritance/inherited-csp-list-modifications-are-local.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/javascript-url-open-in-main-window.html b/tests/wpt/tests/content-security-policy/inheritance/javascript-url-open-in-main-window.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/javascript-url-open-in-main-window.html rename to tests/wpt/tests/content-security-policy/inheritance/javascript-url-open-in-main-window.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/javascript-url-srcdoc-cross-origin-iframe-inheritance.html b/tests/wpt/tests/content-security-policy/inheritance/javascript-url-srcdoc-cross-origin-iframe-inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/javascript-url-srcdoc-cross-origin-iframe-inheritance.html rename to tests/wpt/tests/content-security-policy/inheritance/javascript-url-srcdoc-cross-origin-iframe-inheritance.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/location-reload.html b/tests/wpt/tests/content-security-policy/inheritance/location-reload.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/location-reload.html rename to tests/wpt/tests/content-security-policy/inheritance/location-reload.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-blob-scheme.html b/tests/wpt/tests/content-security-policy/inheritance/sandboxed-blob-scheme.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-blob-scheme.html rename to tests/wpt/tests/content-security-policy/inheritance/sandboxed-blob-scheme.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-blob-scheme.html.sub.headers b/tests/wpt/tests/content-security-policy/inheritance/sandboxed-blob-scheme.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-blob-scheme.html.sub.headers rename to tests/wpt/tests/content-security-policy/inheritance/sandboxed-blob-scheme.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-data-scheme.html b/tests/wpt/tests/content-security-policy/inheritance/sandboxed-data-scheme.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-data-scheme.html rename to tests/wpt/tests/content-security-policy/inheritance/sandboxed-data-scheme.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-data-scheme.html.sub.headers b/tests/wpt/tests/content-security-policy/inheritance/sandboxed-data-scheme.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/sandboxed-data-scheme.html.sub.headers rename to tests/wpt/tests/content-security-policy/inheritance/sandboxed-data-scheme.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/empty.html b/tests/wpt/tests/content-security-policy/inheritance/support/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/support/empty.html rename to tests/wpt/tests/content-security-policy/inheritance/support/empty.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/iframe-do.sub.html b/tests/wpt/tests/content-security-policy/inheritance/support/iframe-do.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/support/iframe-do.sub.html rename to tests/wpt/tests/content-security-policy/inheritance/support/iframe-do.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/javascript-url-srcdoc-cross-origin-iframe-inheritance-helper.sub.html b/tests/wpt/tests/content-security-policy/inheritance/support/javascript-url-srcdoc-cross-origin-iframe-inheritance-helper.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/support/javascript-url-srcdoc-cross-origin-iframe-inheritance-helper.sub.html rename to tests/wpt/tests/content-security-policy/inheritance/support/javascript-url-srcdoc-cross-origin-iframe-inheritance-helper.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/message-opener-and-navigate-back.html b/tests/wpt/tests/content-security-policy/inheritance/support/message-opener-and-navigate-back.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/support/message-opener-and-navigate-back.html rename to tests/wpt/tests/content-security-policy/inheritance/support/message-opener-and-navigate-back.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/message-top-and-navigate-back.html b/tests/wpt/tests/content-security-policy/inheritance/support/message-top-and-navigate-back.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/support/message-top-and-navigate-back.html rename to tests/wpt/tests/content-security-policy/inheritance/support/message-top-and-navigate-back.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/navigate-parent-to-blob.html b/tests/wpt/tests/content-security-policy/inheritance/support/navigate-parent-to-blob.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/support/navigate-parent-to-blob.html rename to tests/wpt/tests/content-security-policy/inheritance/support/navigate-parent-to-blob.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/navigate-self-to-blob.html b/tests/wpt/tests/content-security-policy/inheritance/support/navigate-self-to-blob.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/support/navigate-self-to-blob.html rename to tests/wpt/tests/content-security-policy/inheritance/support/navigate-self-to-blob.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/navigate-self-to-blob.html.sub.headers b/tests/wpt/tests/content-security-policy/inheritance/support/navigate-self-to-blob.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/support/navigate-self-to-blob.html.sub.headers rename to tests/wpt/tests/content-security-policy/inheritance/support/navigate-self-to-blob.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/navigate-self-to-javascript.html b/tests/wpt/tests/content-security-policy/inheritance/support/navigate-self-to-javascript.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/support/navigate-self-to-javascript.html rename to tests/wpt/tests/content-security-policy/inheritance/support/navigate-self-to-javascript.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/postmessage-opener.html b/tests/wpt/tests/content-security-policy/inheritance/support/postmessage-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/support/postmessage-opener.html rename to tests/wpt/tests/content-security-policy/inheritance/support/postmessage-opener.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/postmessage-top.html b/tests/wpt/tests/content-security-policy/inheritance/support/postmessage-top.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/support/postmessage-top.html rename to tests/wpt/tests/content-security-policy/inheritance/support/postmessage-top.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/support/srcdoc-child-frame.html b/tests/wpt/tests/content-security-policy/inheritance/support/srcdoc-child-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/support/srcdoc-child-frame.html rename to tests/wpt/tests/content-security-policy/inheritance/support/srcdoc-child-frame.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-blob-scheme.html b/tests/wpt/tests/content-security-policy/inheritance/unsandboxed-blob-scheme.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-blob-scheme.html rename to tests/wpt/tests/content-security-policy/inheritance/unsandboxed-blob-scheme.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-blob-scheme.html.sub.headers b/tests/wpt/tests/content-security-policy/inheritance/unsandboxed-blob-scheme.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-blob-scheme.html.sub.headers rename to tests/wpt/tests/content-security-policy/inheritance/unsandboxed-blob-scheme.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-data-scheme.html b/tests/wpt/tests/content-security-policy/inheritance/unsandboxed-data-scheme.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-data-scheme.html rename to tests/wpt/tests/content-security-policy/inheritance/unsandboxed-data-scheme.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-data-scheme.html.sub.headers b/tests/wpt/tests/content-security-policy/inheritance/unsandboxed-data-scheme.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/unsandboxed-data-scheme.html.sub.headers rename to tests/wpt/tests/content-security-policy/inheritance/unsandboxed-data-scheme.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/window-open-local-after-network-scheme.sub.html b/tests/wpt/tests/content-security-policy/inheritance/window-open-local-after-network-scheme.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/window-open-local-after-network-scheme.sub.html rename to tests/wpt/tests/content-security-policy/inheritance/window-open-local-after-network-scheme.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inheritance/window.html b/tests/wpt/tests/content-security-policy/inheritance/window.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inheritance/window.html rename to tests/wpt/tests/content-security-policy/inheritance/window.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/dedicatedworker-connect-src.html b/tests/wpt/tests/content-security-policy/inside-worker/dedicatedworker-connect-src.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/dedicatedworker-connect-src.html rename to tests/wpt/tests/content-security-policy/inside-worker/dedicatedworker-connect-src.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/dedicatedworker-connect-src.html.sub.headers b/tests/wpt/tests/content-security-policy/inside-worker/dedicatedworker-connect-src.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/dedicatedworker-connect-src.html.sub.headers rename to tests/wpt/tests/content-security-policy/inside-worker/dedicatedworker-connect-src.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/dedicatedworker-report-only.html b/tests/wpt/tests/content-security-policy/inside-worker/dedicatedworker-report-only.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/dedicatedworker-report-only.html rename to tests/wpt/tests/content-security-policy/inside-worker/dedicatedworker-report-only.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/dedicatedworker-report-only.html.sub.headers b/tests/wpt/tests/content-security-policy/inside-worker/dedicatedworker-report-only.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/dedicatedworker-report-only.html.sub.headers rename to tests/wpt/tests/content-security-policy/inside-worker/dedicatedworker-report-only.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/dedicatedworker-script-src.html b/tests/wpt/tests/content-security-policy/inside-worker/dedicatedworker-script-src.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/dedicatedworker-script-src.html rename to tests/wpt/tests/content-security-policy/inside-worker/dedicatedworker-script-src.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/dedicatedworker-script-src.html.sub.headers b/tests/wpt/tests/content-security-policy/inside-worker/dedicatedworker-script-src.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/dedicatedworker-script-src.html.sub.headers rename to tests/wpt/tests/content-security-policy/inside-worker/dedicatedworker-script-src.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/serviceworker-connect-src.https.sub.html b/tests/wpt/tests/content-security-policy/inside-worker/serviceworker-connect-src.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/serviceworker-connect-src.https.sub.html rename to tests/wpt/tests/content-security-policy/inside-worker/serviceworker-connect-src.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/serviceworker-report-only.https.sub.html b/tests/wpt/tests/content-security-policy/inside-worker/serviceworker-report-only.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/serviceworker-report-only.https.sub.html rename to tests/wpt/tests/content-security-policy/inside-worker/serviceworker-report-only.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/serviceworker-script-src.https.sub.html b/tests/wpt/tests/content-security-policy/inside-worker/serviceworker-script-src.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/serviceworker-script-src.https.sub.html rename to tests/wpt/tests/content-security-policy/inside-worker/serviceworker-script-src.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/sharedworker-connect-src.sub.html b/tests/wpt/tests/content-security-policy/inside-worker/sharedworker-connect-src.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/sharedworker-connect-src.sub.html rename to tests/wpt/tests/content-security-policy/inside-worker/sharedworker-connect-src.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/sharedworker-report-only.sub.html b/tests/wpt/tests/content-security-policy/inside-worker/sharedworker-report-only.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/sharedworker-report-only.sub.html rename to tests/wpt/tests/content-security-policy/inside-worker/sharedworker-report-only.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/sharedworker-script-src.sub.html b/tests/wpt/tests/content-security-policy/inside-worker/sharedworker-script-src.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/sharedworker-script-src.sub.html rename to tests/wpt/tests/content-security-policy/inside-worker/sharedworker-script-src.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/support/connect-src-allow.sub.js b/tests/wpt/tests/content-security-policy/inside-worker/support/connect-src-allow.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/support/connect-src-allow.sub.js rename to tests/wpt/tests/content-security-policy/inside-worker/support/connect-src-allow.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/support/connect-src-self-report-only.sub.js b/tests/wpt/tests/content-security-policy/inside-worker/support/connect-src-self-report-only.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/support/connect-src-self-report-only.sub.js rename to tests/wpt/tests/content-security-policy/inside-worker/support/connect-src-self-report-only.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/support/connect-src-self-report-only.sub.js.sub.headers b/tests/wpt/tests/content-security-policy/inside-worker/support/connect-src-self-report-only.sub.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/support/connect-src-self-report-only.sub.js.sub.headers rename to tests/wpt/tests/content-security-policy/inside-worker/support/connect-src-self-report-only.sub.js.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/support/connect-src-self.sub.js b/tests/wpt/tests/content-security-policy/inside-worker/support/connect-src-self.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/support/connect-src-self.sub.js rename to tests/wpt/tests/content-security-policy/inside-worker/support/connect-src-self.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/support/script-src-allow.sub.js b/tests/wpt/tests/content-security-policy/inside-worker/support/script-src-allow.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/support/script-src-allow.sub.js rename to tests/wpt/tests/content-security-policy/inside-worker/support/script-src-allow.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/inside-worker/support/script-src-self.sub.js b/tests/wpt/tests/content-security-policy/inside-worker/support/script-src-self.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/inside-worker/support/script-src-self.sub.js rename to tests/wpt/tests/content-security-policy/inside-worker/support/script-src-self.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1.html b/tests/wpt/tests/content-security-policy/media-src/media-src-7_1.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1.html rename to tests/wpt/tests/content-security-policy/media-src/media-src-7_1.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1_2.sub.html b/tests/wpt/tests/content-security-policy/media-src/media-src-7_1_2.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_1_2.sub.html rename to tests/wpt/tests/content-security-policy/media-src/media-src-7_1_2.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2.html b/tests/wpt/tests/content-security-policy/media-src/media-src-7_2.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2.html rename to tests/wpt/tests/content-security-policy/media-src/media-src-7_2.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2_2.sub.html b/tests/wpt/tests/content-security-policy/media-src/media-src-7_2_2.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_2_2.sub.html rename to tests/wpt/tests/content-security-policy/media-src/media-src-7_2_2.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3.sub.html b/tests/wpt/tests/content-security-policy/media-src/media-src-7_3.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3.sub.html rename to tests/wpt/tests/content-security-policy/media-src/media-src-7_3.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3_2.sub.html b/tests/wpt/tests/content-security-policy/media-src/media-src-7_3_2.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-7_3_2.sub.html rename to tests/wpt/tests/content-security-policy/media-src/media-src-7_3_2.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-blocked.sub.html b/tests/wpt/tests/content-security-policy/media-src/media-src-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-blocked.sub.html rename to tests/wpt/tests/content-security-policy/media-src/media-src-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-redir-bug.sub.html b/tests/wpt/tests/content-security-policy/media-src/media-src-redir-bug.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/media-src/media-src-redir-bug.sub.html rename to tests/wpt/tests/content-security-policy/media-src/media-src-redir-bug.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/meta/combine-header-and-meta-policies.sub.html b/tests/wpt/tests/content-security-policy/meta/combine-header-and-meta-policies.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/meta/combine-header-and-meta-policies.sub.html rename to tests/wpt/tests/content-security-policy/meta/combine-header-and-meta-policies.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/meta/combine-header-and-meta-policies.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/meta/combine-header-and-meta-policies.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/meta/combine-header-and-meta-policies.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/meta/combine-header-and-meta-policies.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/meta/meta-img-src.html b/tests/wpt/tests/content-security-policy/meta/meta-img-src.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/meta/meta-img-src.html rename to tests/wpt/tests/content-security-policy/meta/meta-img-src.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/meta/meta-modified.html b/tests/wpt/tests/content-security-policy/meta/meta-modified.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/meta/meta-modified.html rename to tests/wpt/tests/content-security-policy/meta/meta-modified.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/meta/meta-outside-head.sub.html b/tests/wpt/tests/content-security-policy/meta/meta-outside-head.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/meta/meta-outside-head.sub.html rename to tests/wpt/tests/content-security-policy/meta/meta-outside-head.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/meta/meta-outside-head.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/meta/meta-outside-head.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/meta/meta-outside-head.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/meta/meta-outside-head.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/meta/sandbox-iframe.html b/tests/wpt/tests/content-security-policy/meta/sandbox-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/meta/sandbox-iframe.html rename to tests/wpt/tests/content-security-policy/meta/sandbox-iframe.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/meta/support/metaHelper.js b/tests/wpt/tests/content-security-policy/meta/support/metaHelper.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/meta/support/metaHelper.js rename to tests/wpt/tests/content-security-policy/meta/support/metaHelper.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/anchor-navigation-always-allowed.html b/tests/wpt/tests/content-security-policy/navigate-to/anchor-navigation-always-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/anchor-navigation-always-allowed.html rename to tests/wpt/tests/content-security-policy/navigate-to/anchor-navigation-always-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/anchor-navigation-always-allowed.html.headers b/tests/wpt/tests/content-security-policy/navigate-to/anchor-navigation-always-allowed.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/anchor-navigation-always-allowed.html.headers rename to tests/wpt/tests/content-security-policy/navigate-to/anchor-navigation-always-allowed.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-allowed.html b/tests/wpt/tests/content-security-policy/navigate-to/child-navigates-parent-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-allowed.html rename to tests/wpt/tests/content-security-policy/navigate-to/child-navigates-parent-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-allowed.html.headers b/tests/wpt/tests/content-security-policy/navigate-to/child-navigates-parent-allowed.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-allowed.html.headers rename to tests/wpt/tests/content-security-policy/navigate-to/child-navigates-parent-allowed.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html.headers b/tests/wpt/tests/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html.headers rename to tests/wpt/tests/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-blocks.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-blocks.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-blocks.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-blocks.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-allows.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-allows.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-allows.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-allows.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-blocks.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-blocks.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-blocks.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-blocks.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-allowed.html b/tests/wpt/tests/content-security-policy/navigate-to/form-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-allowed.html rename to tests/wpt/tests/content-security-policy/navigate-to/form-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-blocked.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/form-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-blocked.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/form-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-cross-origin-allowed.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/form-cross-origin-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-cross-origin-allowed.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/form-cross-origin-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-cross-origin-blocked.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/form-cross-origin-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-cross-origin-blocked.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/form-cross-origin-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-redirected-allowed.html b/tests/wpt/tests/content-security-policy/navigate-to/form-redirected-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-redirected-allowed.html rename to tests/wpt/tests/content-security-policy/navigate-to/form-redirected-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-redirected-blocked.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/form-redirected-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-redirected-blocked.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/form-redirected-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-allowed.html b/tests/wpt/tests/content-security-policy/navigate-to/href-location-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-allowed.html rename to tests/wpt/tests/content-security-policy/navigate-to/href-location-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-blocked.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/href-location-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-blocked.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/href-location-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-cross-origin-allowed.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/href-location-cross-origin-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-cross-origin-allowed.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/href-location-cross-origin-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-cross-origin-blocked.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/href-location-cross-origin-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-cross-origin-blocked.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/href-location-cross-origin-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-redirected-allowed.html b/tests/wpt/tests/content-security-policy/navigate-to/href-location-redirected-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-redirected-allowed.html rename to tests/wpt/tests/content-security-policy/navigate-to/href-location-redirected-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-redirected-blocked.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/href-location-redirected-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-redirected-blocked.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/href-location-redirected-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-allowed.html b/tests/wpt/tests/content-security-policy/navigate-to/link-click-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-allowed.html rename to tests/wpt/tests/content-security-policy/navigate-to/link-click-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-blocked.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/link-click-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-blocked.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/link-click-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-cross-origin-allowed.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/link-click-cross-origin-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-cross-origin-allowed.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/link-click-cross-origin-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-cross-origin-blocked.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/link-click-cross-origin-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-cross-origin-blocked.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/link-click-cross-origin-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-redirected-allowed.html b/tests/wpt/tests/content-security-policy/navigate-to/link-click-redirected-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-redirected-allowed.html rename to tests/wpt/tests/content-security-policy/navigate-to/link-click-redirected-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-redirected-blocked.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/link-click-redirected-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-redirected-blocked.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/link-click-redirected-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-allowed.html b/tests/wpt/tests/content-security-policy/navigate-to/meta-refresh-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-allowed.html rename to tests/wpt/tests/content-security-policy/navigate-to/meta-refresh-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-blocked.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/meta-refresh-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-blocked.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/meta-refresh-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-cross-origin-allowed.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/meta-refresh-cross-origin-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-cross-origin-allowed.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/meta-refresh-cross-origin-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-cross-origin-blocked.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/meta-refresh-cross-origin-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-cross-origin-blocked.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/meta-refresh-cross-origin-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-redirected-allowed.html b/tests/wpt/tests/content-security-policy/navigate-to/meta-refresh-redirected-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-redirected-allowed.html rename to tests/wpt/tests/content-security-policy/navigate-to/meta-refresh-redirected-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-redirected-blocked.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/meta-refresh-redirected-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-redirected-blocked.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/meta-refresh-redirected-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-allowed.html b/tests/wpt/tests/content-security-policy/navigate-to/parent-navigates-child-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-allowed.html rename to tests/wpt/tests/content-security-policy/navigate-to/parent-navigates-child-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-allowed.html.headers b/tests/wpt/tests/content-security-policy/navigate-to/parent-navigates-child-allowed.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-allowed.html.headers rename to tests/wpt/tests/content-security-policy/navigate-to/parent-navigates-child-allowed.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html b/tests/wpt/tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html rename to tests/wpt/tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html.sub.headers b/tests/wpt/tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html.sub.headers rename to tests/wpt/tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/spv-only-sent-to-initiator.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/spv-only-sent-to-initiator.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/spv-only-sent-to-initiator.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/spv-only-sent-to-initiator.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/delayed_frame.py b/tests/wpt/tests/content-security-policy/navigate-to/support/delayed_frame.py similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/delayed_frame.py rename to tests/wpt/tests/content-security-policy/navigate-to/support/delayed_frame.py diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/navigate_parent.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/support/navigate_parent.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/navigate_parent.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/support/navigate_parent.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/navigate_parent.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/navigate-to/support/navigate_parent.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/navigate_parent.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/navigate-to/support/navigate_parent.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/post_message_to_frame_owner.html b/tests/wpt/tests/content-security-policy/navigate-to/support/post_message_to_frame_owner.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/post_message_to_frame_owner.html rename to tests/wpt/tests/content-security-policy/navigate-to/support/post_message_to_frame_owner.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/redirect_to_post_message_to_frame_owner.py b/tests/wpt/tests/content-security-policy/navigate-to/support/redirect_to_post_message_to_frame_owner.py similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/redirect_to_post_message_to_frame_owner.py rename to tests/wpt/tests/content-security-policy/navigate-to/support/redirect_to_post_message_to_frame_owner.py diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/spv-test-iframe1.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/support/spv-test-iframe1.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/spv-test-iframe1.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/support/spv-test-iframe1.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/spv-test-iframe1.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/navigate-to/support/spv-test-iframe1.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/spv-test-iframe1.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/navigate-to/support/spv-test-iframe1.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/spv-test-iframe2.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/support/spv-test-iframe2.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/spv-test-iframe2.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/support/spv-test-iframe2.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/spv-test-iframe3.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/support/spv-test-iframe3.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/spv-test-iframe3.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/support/spv-test-iframe3.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/wait_for_navigation.html b/tests/wpt/tests/content-security-policy/navigate-to/support/wait_for_navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/wait_for_navigation.html rename to tests/wpt/tests/content-security-policy/navigate-to/support/wait_for_navigation.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/wait_for_navigation.html.sub.headers b/tests/wpt/tests/content-security-policy/navigate-to/support/wait_for_navigation.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/wait_for_navigation.html.sub.headers rename to tests/wpt/tests/content-security-policy/navigate-to/support/wait_for_navigation.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/unsafe-allow-redirects/allowed-end-of-chain-because-of-same-origin.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/unsafe-allow-redirects/allowed-end-of-chain-because-of-same-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/unsafe-allow-redirects/allowed-end-of-chain-because-of-same-origin.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/unsafe-allow-redirects/allowed-end-of-chain-because-of-same-origin.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/unsafe-allow-redirects/allowed-end-of-chain.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/unsafe-allow-redirects/allowed-end-of-chain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/unsafe-allow-redirects/allowed-end-of-chain.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/unsafe-allow-redirects/allowed-end-of-chain.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/unsafe-allow-redirects/blocked-end-of-chain.sub.html b/tests/wpt/tests/content-security-policy/navigate-to/unsafe-allow-redirects/blocked-end-of-chain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/unsafe-allow-redirects/blocked-end-of-chain.sub.html rename to tests/wpt/tests/content-security-policy/navigate-to/unsafe-allow-redirects/blocked-end-of-chain.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigation/javascript-url-navigation-inherits-csp.html b/tests/wpt/tests/content-security-policy/navigation/javascript-url-navigation-inherits-csp.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigation/javascript-url-navigation-inherits-csp.html rename to tests/wpt/tests/content-security-policy/navigation/javascript-url-navigation-inherits-csp.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigation/support/frame-with-csp.sub.html b/tests/wpt/tests/content-security-policy/navigation/support/frame-with-csp.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigation/support/frame-with-csp.sub.html rename to tests/wpt/tests/content-security-policy/navigation/support/frame-with-csp.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigation/support/test_csp_self_window.sub.html b/tests/wpt/tests/content-security-policy/navigation/support/test_csp_self_window.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigation/support/test_csp_self_window.sub.html rename to tests/wpt/tests/content-security-policy/navigation/support/test_csp_self_window.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigation/support/test_csp_self_window.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/navigation/support/test_csp_self_window.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigation/support/test_csp_self_window.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/navigation/support/test_csp_self_window.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html b/tests/wpt/tests/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html rename to tests/wpt/tests/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp-disallow.html b/tests/wpt/tests/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp-disallow.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp-disallow.html rename to tests/wpt/tests/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp-disallow.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp.html b/tests/wpt/tests/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp.html rename to tests/wpt/tests/content-security-policy/navigation/to-javascript-parent-initiated-parent-csp.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigation/to-javascript-url-frame-src.html b/tests/wpt/tests/content-security-policy/navigation/to-javascript-url-frame-src.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigation/to-javascript-url-frame-src.html rename to tests/wpt/tests/content-security-policy/navigation/to-javascript-url-frame-src.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigation/to-javascript-url-script-src.html b/tests/wpt/tests/content-security-policy/navigation/to-javascript-url-script-src.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/navigation/to-javascript-url-script-src.html rename to tests/wpt/tests/content-security-policy/navigation/to-javascript-url-script-src.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/nonce-hiding-move-document.html b/tests/wpt/tests/content-security-policy/nonce-hiding/nonce-hiding-move-document.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/nonce-hiding-move-document.html rename to tests/wpt/tests/content-security-policy/nonce-hiding/nonce-hiding-move-document.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/nonces.html b/tests/wpt/tests/content-security-policy/nonce-hiding/nonces.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/nonces.html rename to tests/wpt/tests/content-security-policy/nonce-hiding/nonces.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/nonces.html.headers b/tests/wpt/tests/content-security-policy/nonce-hiding/nonces.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/nonces.html.headers rename to tests/wpt/tests/content-security-policy/nonce-hiding/nonces.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/script-nonces-hidden-meta.sub.html b/tests/wpt/tests/content-security-policy/nonce-hiding/script-nonces-hidden-meta.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/script-nonces-hidden-meta.sub.html rename to tests/wpt/tests/content-security-policy/nonce-hiding/script-nonces-hidden-meta.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/script-nonces-hidden.html b/tests/wpt/tests/content-security-policy/nonce-hiding/script-nonces-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/script-nonces-hidden.html rename to tests/wpt/tests/content-security-policy/nonce-hiding/script-nonces-hidden.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/script-nonces-hidden.html.headers b/tests/wpt/tests/content-security-policy/nonce-hiding/script-nonces-hidden.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/script-nonces-hidden.html.headers rename to tests/wpt/tests/content-security-policy/nonce-hiding/script-nonces-hidden.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden-meta.sub.html b/tests/wpt/tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden-meta.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden-meta.sub.html rename to tests/wpt/tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden-meta.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html b/tests/wpt/tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html rename to tests/wpt/tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html.headers b/tests/wpt/tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html.headers rename to tests/wpt/tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-no-url-allowed.html b/tests/wpt/tests/content-security-policy/object-src/object-src-no-url-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-no-url-allowed.html rename to tests/wpt/tests/content-security-policy/object-src/object-src-no-url-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-no-url-allowed.html.sub.headers b/tests/wpt/tests/content-security-policy/object-src/object-src-no-url-allowed.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-no-url-allowed.html.sub.headers rename to tests/wpt/tests/content-security-policy/object-src/object-src-no-url-allowed.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-no-url-blocked.html b/tests/wpt/tests/content-security-policy/object-src/object-src-no-url-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-no-url-blocked.html rename to tests/wpt/tests/content-security-policy/object-src/object-src-no-url-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-allowed.html b/tests/wpt/tests/content-security-policy/object-src/object-src-url-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-allowed.html rename to tests/wpt/tests/content-security-policy/object-src/object-src-url-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-allowed.html.sub.headers b/tests/wpt/tests/content-security-policy/object-src/object-src-url-allowed.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-allowed.html.sub.headers rename to tests/wpt/tests/content-security-policy/object-src/object-src-url-allowed.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-blocked.html b/tests/wpt/tests/content-security-policy/object-src/object-src-url-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-blocked.html rename to tests/wpt/tests/content-security-policy/object-src/object-src-url-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-embed-allowed.html b/tests/wpt/tests/content-security-policy/object-src/object-src-url-embed-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-embed-allowed.html rename to tests/wpt/tests/content-security-policy/object-src/object-src-url-embed-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-embed-allowed.html.sub.headers b/tests/wpt/tests/content-security-policy/object-src/object-src-url-embed-allowed.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-embed-allowed.html.sub.headers rename to tests/wpt/tests/content-security-policy/object-src/object-src-url-embed-allowed.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-embed-blocked.html b/tests/wpt/tests/content-security-policy/object-src/object-src-url-embed-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-embed-blocked.html rename to tests/wpt/tests/content-security-policy/object-src/object-src-url-embed-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-redirect-allowed.html b/tests/wpt/tests/content-security-policy/object-src/object-src-url-redirect-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-redirect-allowed.html rename to tests/wpt/tests/content-security-policy/object-src/object-src-url-redirect-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-redirect-allowed.html.sub.headers b/tests/wpt/tests/content-security-policy/object-src/object-src-url-redirect-allowed.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-redirect-allowed.html.sub.headers rename to tests/wpt/tests/content-security-policy/object-src/object-src-url-redirect-allowed.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-redirect-blocked.sub.html b/tests/wpt/tests/content-security-policy/object-src/object-src-url-redirect-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/object-src/object-src-url-redirect-blocked.sub.html rename to tests/wpt/tests/content-security-policy/object-src/object-src-url-redirect-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/parsing/invalid-directive.html b/tests/wpt/tests/content-security-policy/parsing/invalid-directive.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/parsing/invalid-directive.html rename to tests/wpt/tests/content-security-policy/parsing/invalid-directive.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugin-types-ignored.html b/tests/wpt/tests/content-security-policy/plugin-types/plugin-types-ignored.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugin-types-ignored.html rename to tests/wpt/tests/content-security-policy/plugin-types/plugin-types-ignored.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugin-types-ignored.html.sub.headers b/tests/wpt/tests/content-security-policy/plugin-types/plugin-types-ignored.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/plugin-types/plugin-types-ignored.html.sub.headers rename to tests/wpt/tests/content-security-policy/plugin-types/plugin-types-ignored.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/report-to-directive-allowed-in-meta.https.sub.html b/tests/wpt/tests/content-security-policy/reporting-api/report-to-directive-allowed-in-meta.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/report-to-directive-allowed-in-meta.https.sub.html rename to tests/wpt/tests/content-security-policy/reporting-api/report-to-directive-allowed-in-meta.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/report-to-directive-allowed-in-meta.https.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting-api/report-to-directive-allowed-in-meta.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/report-to-directive-allowed-in-meta.https.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting-api/report-to-directive-allowed-in-meta.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-doesnt-send-reports-without-violation.https.sub.html b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-doesnt-send-reports-without-violation.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-doesnt-send-reports-without-violation.https.sub.html rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-doesnt-send-reports-without-violation.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-doesnt-send-reports-without-violation.https.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-doesnt-send-reports-without-violation.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-doesnt-send-reports-without-violation.https.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-doesnt-send-reports-without-violation.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-only-sends-reports-on-violation.https.sub.html b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-only-sends-reports-on-violation.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-only-sends-reports-on-violation.https.sub.html rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-only-sends-reports-on-violation.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-only-sends-reports-on-violation.https.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-only-sends-reports-on-violation.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-only-sends-reports-on-violation.https.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-only-sends-reports-on-violation.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-to-only-sends-reports-to-first-endpoint.https.sub.html b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-to-only-sends-reports-to-first-endpoint.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-to-only-sends-reports-to-first-endpoint.https.sub.html rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-to-only-sends-reports-to-first-endpoint.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-to-only-sends-reports-to-first-endpoint.https.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-to-only-sends-reports-to-first-endpoint.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-to-only-sends-reports-to-first-endpoint.https.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-to-only-sends-reports-to-first-endpoint.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-1.https.sub.html b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-1.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-1.https.sub.html rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-1.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-1.https.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-1.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-1.https.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-1.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-2.https.sub.html b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-2.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-2.https.sub.html rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-2.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-2.https.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-2.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-2.https.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-report-to-overrides-report-uri-2.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-sends-reports-on-violation.https.sub.html b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-sends-reports-on-violation.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-sends-reports-on-violation.https.sub.html rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-sends-reports-on-violation.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-sends-reports-on-violation.https.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-sends-reports-on-violation.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-sends-reports-on-violation.https.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-sends-reports-on-violation.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-works-on-frame-ancestors.https.sub.html b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-works-on-frame-ancestors.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-works-on-frame-ancestors.https.sub.html rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-works-on-frame-ancestors.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-works-on-frame-ancestors.https.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-works-on-frame-ancestors.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-works-on-frame-ancestors.https.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-works-on-frame-ancestors.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-works-on-frame-src.https.sub.html b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-works-on-frame-src.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-works-on-frame-src.https.sub.html rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-works-on-frame-src.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-works-on-frame-src.https.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting-api/reporting-api-works-on-frame-src.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/reporting-api-works-on-frame-src.https.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting-api/reporting-api-works-on-frame-src.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/support/non-embeddable-frame.html b/tests/wpt/tests/content-security-policy/reporting-api/support/non-embeddable-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/support/non-embeddable-frame.html rename to tests/wpt/tests/content-security-policy/reporting-api/support/non-embeddable-frame.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting-api/support/non-embeddable-frame.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting-api/support/non-embeddable-frame.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting-api/support/non-embeddable-frame.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting-api/support/non-embeddable-frame.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/multiple-report-policies.html b/tests/wpt/tests/content-security-policy/reporting/multiple-report-policies.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/multiple-report-policies.html rename to tests/wpt/tests/content-security-policy/reporting/multiple-report-policies.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/multiple-report-policies.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/multiple-report-policies.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/multiple-report-policies.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/multiple-report-policies.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/post-redirect-stacktrace.https.html b/tests/wpt/tests/content-security-policy/reporting/post-redirect-stacktrace.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/post-redirect-stacktrace.https.html rename to tests/wpt/tests/content-security-policy/reporting/post-redirect-stacktrace.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/post-redirect-stacktrace.https.html.headers b/tests/wpt/tests/content-security-policy/reporting/post-redirect-stacktrace.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/post-redirect-stacktrace.https.html.headers rename to tests/wpt/tests/content-security-policy/reporting/post-redirect-stacktrace.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-and-enforce.html b/tests/wpt/tests/content-security-policy/reporting/report-and-enforce.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-and-enforce.html rename to tests/wpt/tests/content-security-policy/reporting/report-and-enforce.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-and-enforce.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-and-enforce.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-and-enforce.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-and-enforce.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-blocked-data-uri.html b/tests/wpt/tests/content-security-policy/reporting/report-blocked-data-uri.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-blocked-data-uri.html rename to tests/wpt/tests/content-security-policy/reporting/report-blocked-data-uri.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-blocked-data-uri.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-blocked-data-uri.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-blocked-data-uri.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-blocked-data-uri.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-blocked-uri-cross-origin.sub.html b/tests/wpt/tests/content-security-policy/reporting/report-blocked-uri-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-blocked-uri-cross-origin.sub.html rename to tests/wpt/tests/content-security-policy/reporting/report-blocked-uri-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-blocked-uri-cross-origin.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-blocked-uri-cross-origin.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-blocked-uri-cross-origin.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-blocked-uri-cross-origin.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-blocked-uri.html b/tests/wpt/tests/content-security-policy/reporting/report-blocked-uri.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-blocked-uri.html rename to tests/wpt/tests/content-security-policy/reporting/report-blocked-uri.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-blocked-uri.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-blocked-uri.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-blocked-uri.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-blocked-uri.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-clips-sample.https.html b/tests/wpt/tests/content-security-policy/reporting/report-clips-sample.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-clips-sample.https.html rename to tests/wpt/tests/content-security-policy/reporting/report-clips-sample.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-cross-origin-no-cookies.sub.html b/tests/wpt/tests/content-security-policy/reporting/report-cross-origin-no-cookies.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-cross-origin-no-cookies.sub.html rename to tests/wpt/tests/content-security-policy/reporting/report-cross-origin-no-cookies.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-cross-origin-no-cookies.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-cross-origin-no-cookies.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-cross-origin-no-cookies.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-cross-origin-no-cookies.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-frame-ancestors-with-x-frame-options.sub.html b/tests/wpt/tests/content-security-policy/reporting/report-frame-ancestors-with-x-frame-options.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-frame-ancestors-with-x-frame-options.sub.html rename to tests/wpt/tests/content-security-policy/reporting/report-frame-ancestors-with-x-frame-options.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-frame-ancestors.sub.html b/tests/wpt/tests/content-security-policy/reporting/report-frame-ancestors.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-frame-ancestors.sub.html rename to tests/wpt/tests/content-security-policy/reporting/report-frame-ancestors.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-multiple-violations-01.html b/tests/wpt/tests/content-security-policy/reporting/report-multiple-violations-01.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-multiple-violations-01.html rename to tests/wpt/tests/content-security-policy/reporting/report-multiple-violations-01.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-multiple-violations-01.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-multiple-violations-01.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-multiple-violations-01.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-multiple-violations-01.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-multiple-violations-02.html b/tests/wpt/tests/content-security-policy/reporting/report-multiple-violations-02.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-multiple-violations-02.html rename to tests/wpt/tests/content-security-policy/reporting/report-multiple-violations-02.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-multiple-violations-02.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-multiple-violations-02.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-multiple-violations-02.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-multiple-violations-02.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-only-in-meta.sub.html b/tests/wpt/tests/content-security-policy/reporting/report-only-in-meta.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-only-in-meta.sub.html rename to tests/wpt/tests/content-security-policy/reporting/report-only-in-meta.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-only-in-meta.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-only-in-meta.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-only-in-meta.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-only-in-meta.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-only-unsafe-eval.html b/tests/wpt/tests/content-security-policy/reporting/report-only-unsafe-eval.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-only-unsafe-eval.html rename to tests/wpt/tests/content-security-policy/reporting/report-only-unsafe-eval.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-only-unsafe-eval.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-only-unsafe-eval.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-only-unsafe-eval.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-only-unsafe-eval.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-original-url-on-mixed-content-frame.https.sub.html b/tests/wpt/tests/content-security-policy/reporting/report-original-url-on-mixed-content-frame.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-original-url-on-mixed-content-frame.https.sub.html rename to tests/wpt/tests/content-security-policy/reporting/report-original-url-on-mixed-content-frame.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-original-url-on-mixed-content-frame.https.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-original-url-on-mixed-content-frame.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-original-url-on-mixed-content-frame.https.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-original-url-on-mixed-content-frame.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-original-url.sub.html b/tests/wpt/tests/content-security-policy/reporting/report-original-url.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-original-url.sub.html rename to tests/wpt/tests/content-security-policy/reporting/report-original-url.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-original-url.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-original-url.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-original-url.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-original-url.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-preload-and-consume.https.html b/tests/wpt/tests/content-security-policy/reporting/report-preload-and-consume.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-preload-and-consume.https.html rename to tests/wpt/tests/content-security-policy/reporting/report-preload-and-consume.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-same-origin-with-cookies.html b/tests/wpt/tests/content-security-policy/reporting/report-same-origin-with-cookies.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-same-origin-with-cookies.html rename to tests/wpt/tests/content-security-policy/reporting/report-same-origin-with-cookies.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-same-origin-with-cookies.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-same-origin-with-cookies.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-same-origin-with-cookies.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-same-origin-with-cookies.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-strips-fragment.html b/tests/wpt/tests/content-security-policy/reporting/report-strips-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-strips-fragment.html rename to tests/wpt/tests/content-security-policy/reporting/report-strips-fragment.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-effective-directive.html b/tests/wpt/tests/content-security-policy/reporting/report-uri-effective-directive.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-effective-directive.html rename to tests/wpt/tests/content-security-policy/reporting/report-uri-effective-directive.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-effective-directive.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-uri-effective-directive.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-effective-directive.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-uri-effective-directive.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-from-child-frame.html b/tests/wpt/tests/content-security-policy/reporting/report-uri-from-child-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-from-child-frame.html rename to tests/wpt/tests/content-security-policy/reporting/report-uri-from-child-frame.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-from-inline-javascript.html b/tests/wpt/tests/content-security-policy/reporting/report-uri-from-inline-javascript.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-from-inline-javascript.html rename to tests/wpt/tests/content-security-policy/reporting/report-uri-from-inline-javascript.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-from-inline-javascript.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-uri-from-inline-javascript.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-from-inline-javascript.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-uri-from-inline-javascript.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-from-javascript.html b/tests/wpt/tests/content-security-policy/reporting/report-uri-from-javascript.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-from-javascript.html rename to tests/wpt/tests/content-security-policy/reporting/report-uri-from-javascript.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-from-javascript.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-uri-from-javascript.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-from-javascript.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-uri-from-javascript.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-multiple-reversed.html b/tests/wpt/tests/content-security-policy/reporting/report-uri-multiple-reversed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-multiple-reversed.html rename to tests/wpt/tests/content-security-policy/reporting/report-uri-multiple-reversed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-multiple-reversed.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-uri-multiple-reversed.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-multiple-reversed.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-uri-multiple-reversed.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-multiple.html b/tests/wpt/tests/content-security-policy/reporting/report-uri-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-multiple.html rename to tests/wpt/tests/content-security-policy/reporting/report-uri-multiple.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-multiple.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-uri-multiple.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-multiple.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-uri-multiple.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-scheme-relative.html b/tests/wpt/tests/content-security-policy/reporting/report-uri-scheme-relative.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-scheme-relative.html rename to tests/wpt/tests/content-security-policy/reporting/report-uri-scheme-relative.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-scheme-relative.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/report-uri-scheme-relative.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/report-uri-scheme-relative.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/report-uri-scheme-relative.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/support/generate-csp-report.html b/tests/wpt/tests/content-security-policy/reporting/support/generate-csp-report.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/support/generate-csp-report.html rename to tests/wpt/tests/content-security-policy/reporting/support/generate-csp-report.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/support/generate-csp-report.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/support/generate-csp-report.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/support/generate-csp-report.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/support/generate-csp-report.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/support/not-embeddable-frame.py b/tests/wpt/tests/content-security-policy/reporting/support/not-embeddable-frame.py similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/support/not-embeddable-frame.py rename to tests/wpt/tests/content-security-policy/reporting/support/not-embeddable-frame.py diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/support/preload-csp-report.https.sub.html b/tests/wpt/tests/content-security-policy/reporting/support/preload-csp-report.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/support/preload-csp-report.https.sub.html rename to tests/wpt/tests/content-security-policy/reporting/support/preload-csp-report.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/support/preload-csp-report.https.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/reporting/support/preload-csp-report.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/support/preload-csp-report.https.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/reporting/support/preload-csp-report.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/support/redirect-throw-function.sub.py b/tests/wpt/tests/content-security-policy/reporting/support/redirect-throw-function.sub.py similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/support/redirect-throw-function.sub.py rename to tests/wpt/tests/content-security-policy/reporting/support/redirect-throw-function.sub.py diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/support/set-cookie.py b/tests/wpt/tests/content-security-policy/reporting/support/set-cookie.py similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/support/set-cookie.py rename to tests/wpt/tests/content-security-policy/reporting/support/set-cookie.py diff --git a/tests/wpt/web-platform-tests/content-security-policy/reporting/support/throw-function.js b/tests/wpt/tests/content-security-policy/reporting/support/throw-function.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/reporting/support/throw-function.js rename to tests/wpt/tests/content-security-policy/reporting/support/throw-function.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-allowed-by-any-directive.sub.html b/tests/wpt/tests/content-security-policy/resource-hints/prefetch-allowed-by-any-directive.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-allowed-by-any-directive.sub.html rename to tests/wpt/tests/content-security-policy/resource-hints/prefetch-allowed-by-any-directive.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-allowed-by-default.html b/tests/wpt/tests/content-security-policy/resource-hints/prefetch-allowed-by-default.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-allowed-by-default.html rename to tests/wpt/tests/content-security-policy/resource-hints/prefetch-allowed-by-default.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-allowed-no-default.html b/tests/wpt/tests/content-security-policy/resource-hints/prefetch-allowed-no-default.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-allowed-no-default.html rename to tests/wpt/tests/content-security-policy/resource-hints/prefetch-allowed-no-default.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-allowed-with-conflicting-permissive-policies.html b/tests/wpt/tests/content-security-policy/resource-hints/prefetch-allowed-with-conflicting-permissive-policies.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-allowed-with-conflicting-permissive-policies.html rename to tests/wpt/tests/content-security-policy/resource-hints/prefetch-allowed-with-conflicting-permissive-policies.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-blocked-by-default-multiple-policies.html b/tests/wpt/tests/content-security-policy/resource-hints/prefetch-blocked-by-default-multiple-policies.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-blocked-by-default-multiple-policies.html rename to tests/wpt/tests/content-security-policy/resource-hints/prefetch-blocked-by-default-multiple-policies.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-blocked-by-default.html b/tests/wpt/tests/content-security-policy/resource-hints/prefetch-blocked-by-default.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-blocked-by-default.html rename to tests/wpt/tests/content-security-policy/resource-hints/prefetch-blocked-by-default.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-generate-directives.html b/tests/wpt/tests/content-security-policy/resource-hints/prefetch-generate-directives.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-generate-directives.html rename to tests/wpt/tests/content-security-policy/resource-hints/prefetch-generate-directives.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-ignores-prefetch-src.sub.html b/tests/wpt/tests/content-security-policy/resource-hints/prefetch-ignores-prefetch-src.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-ignores-prefetch-src.sub.html rename to tests/wpt/tests/content-security-policy/resource-hints/prefetch-ignores-prefetch-src.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-no-csp.html b/tests/wpt/tests/content-security-policy/resource-hints/prefetch-no-csp.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/resource-hints/prefetch-no-csp.html rename to tests/wpt/tests/content-security-policy/resource-hints/prefetch-no-csp.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/iframe-inside-csp.sub.html b/tests/wpt/tests/content-security-policy/sandbox/iframe-inside-csp.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/iframe-inside-csp.sub.html rename to tests/wpt/tests/content-security-policy/sandbox/iframe-inside-csp.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/meta-element.sub.html b/tests/wpt/tests/content-security-policy/sandbox/meta-element.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/meta-element.sub.html rename to tests/wpt/tests/content-security-policy/sandbox/meta-element.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-allow-scripts-subframe.sub.html b/tests/wpt/tests/content-security-policy/sandbox/sandbox-allow-scripts-subframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-allow-scripts-subframe.sub.html rename to tests/wpt/tests/content-security-policy/sandbox/sandbox-allow-scripts-subframe.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-allow-scripts.sub.html b/tests/wpt/tests/content-security-policy/sandbox/sandbox-allow-scripts.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-allow-scripts.sub.html rename to tests/wpt/tests/content-security-policy/sandbox/sandbox-allow-scripts.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-empty-subframe.sub.html b/tests/wpt/tests/content-security-policy/sandbox/sandbox-empty-subframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-empty-subframe.sub.html rename to tests/wpt/tests/content-security-policy/sandbox/sandbox-empty-subframe.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-empty.sub.html b/tests/wpt/tests/content-security-policy/sandbox/sandbox-empty.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/sandbox-empty.sub.html rename to tests/wpt/tests/content-security-policy/sandbox/sandbox-empty.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/service-worker-sandbox.https.html b/tests/wpt/tests/content-security-policy/sandbox/service-worker-sandbox.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/service-worker-sandbox.https.html rename to tests/wpt/tests/content-security-policy/sandbox/service-worker-sandbox.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/shared-worker-sandbox.html b/tests/wpt/tests/content-security-policy/sandbox/shared-worker-sandbox.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/shared-worker-sandbox.html rename to tests/wpt/tests/content-security-policy/sandbox/shared-worker-sandbox.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/empty.html b/tests/wpt/tests/content-security-policy/sandbox/support/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/support/empty.html rename to tests/wpt/tests/content-security-policy/sandbox/support/empty.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/post-origin-on-load-worker.js b/tests/wpt/tests/content-security-policy/sandbox/support/post-origin-on-load-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/support/post-origin-on-load-worker.js rename to tests/wpt/tests/content-security-policy/sandbox/support/post-origin-on-load-worker.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html b/tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html rename to tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-data-iframe.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html b/tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html rename to tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-eval.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-post-message-to-parent.html b/tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-post-message-to-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-post-message-to-parent.html rename to tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-post-message-to-parent.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-post-property-to-opener.html b/tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-post-property-to-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-post-property-to-opener.html rename to tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-post-property-to-opener.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-post-property-to-opener.html.sub.headers b/tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-post-property-to-opener.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-post-property-to-opener.html.sub.headers rename to tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-post-property-to-opener.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-service-worker.js b/tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-service-worker.js rename to tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-service-worker.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-service-worker.js.headers b/tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-service-worker.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-service-worker.js.headers rename to tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-service-worker.js.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-shared-worker.js b/tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-shared-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-shared-worker.js rename to tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-shared-worker.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-shared-worker.js.headers b/tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-shared-worker.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/support/sandboxed-shared-worker.js.headers rename to tests/wpt/tests/content-security-policy/sandbox/support/sandboxed-shared-worker.js.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/support/unsandboxed-post-property-to-opener.html b/tests/wpt/tests/content-security-policy/sandbox/support/unsandboxed-post-property-to-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/support/unsandboxed-post-property-to-opener.html rename to tests/wpt/tests/content-security-policy/sandbox/support/unsandboxed-post-property-to-opener.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/window-reuse-sandboxed.html b/tests/wpt/tests/content-security-policy/sandbox/window-reuse-sandboxed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/window-reuse-sandboxed.html rename to tests/wpt/tests/content-security-policy/sandbox/window-reuse-sandboxed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/sandbox/window-reuse-unsandboxed.html b/tests/wpt/tests/content-security-policy/sandbox/window-reuse-unsandboxed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/sandbox/window-reuse-unsandboxed.html rename to tests/wpt/tests/content-security-policy/sandbox/window-reuse-unsandboxed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/script-src-attr-allowed-src-blocked.html b/tests/wpt/tests/content-security-policy/script-src-attr-elem/script-src-attr-allowed-src-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/script-src-attr-allowed-src-blocked.html rename to tests/wpt/tests/content-security-policy/script-src-attr-elem/script-src-attr-allowed-src-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/script-src-attr-blocked-src-allowed.html b/tests/wpt/tests/content-security-policy/script-src-attr-elem/script-src-attr-blocked-src-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/script-src-attr-blocked-src-allowed.html rename to tests/wpt/tests/content-security-policy/script-src-attr-elem/script-src-attr-blocked-src-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/script-src-elem-allowed-attr-blocked.html b/tests/wpt/tests/content-security-policy/script-src-attr-elem/script-src-elem-allowed-attr-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/script-src-elem-allowed-attr-blocked.html rename to tests/wpt/tests/content-security-policy/script-src-attr-elem/script-src-elem-allowed-attr-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/script-src-elem-allowed-src-blocked.html b/tests/wpt/tests/content-security-policy/script-src-attr-elem/script-src-elem-allowed-src-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/script-src-elem-allowed-src-blocked.html rename to tests/wpt/tests/content-security-policy/script-src-attr-elem/script-src-elem-allowed-src-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/script-src-elem-blocked-attr-allowed.html b/tests/wpt/tests/content-security-policy/script-src-attr-elem/script-src-elem-blocked-attr-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/script-src-elem-blocked-attr-allowed.html rename to tests/wpt/tests/content-security-policy/script-src-attr-elem/script-src-elem-blocked-attr-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/script-src-elem-blocked-src-allowed.html b/tests/wpt/tests/content-security-policy/script-src-attr-elem/script-src-elem-blocked-src-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/script-src-elem-blocked-src-allowed.html rename to tests/wpt/tests/content-security-policy/script-src-attr-elem/script-src-elem-blocked-src-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/strict-dynamic-elem-allowed-src-blocked.html b/tests/wpt/tests/content-security-policy/script-src-attr-elem/strict-dynamic-elem-allowed-src-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/strict-dynamic-elem-allowed-src-blocked.html rename to tests/wpt/tests/content-security-policy/script-src-attr-elem/strict-dynamic-elem-allowed-src-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/strict-dynamic-elem-blocked-src-allowed.sub.html b/tests/wpt/tests/content-security-policy/script-src-attr-elem/strict-dynamic-elem-blocked-src-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/strict-dynamic-elem-blocked-src-allowed.sub.html rename to tests/wpt/tests/content-security-policy/script-src-attr-elem/strict-dynamic-elem-blocked-src-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/support/t_done.js b/tests/wpt/tests/content-security-policy/script-src-attr-elem/support/t_done.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/support/t_done.js rename to tests/wpt/tests/content-security-policy/script-src-attr-elem/support/t_done.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/support/t_fail.js b/tests/wpt/tests/content-security-policy/script-src-attr-elem/support/t_fail.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src-attr-elem/support/t_fail.js rename to tests/wpt/tests/content-security-policy/script-src-attr-elem/support/t_fail.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/10_1_support_1.js b/tests/wpt/tests/content-security-policy/script-src/10_1_support_1.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/10_1_support_1.js rename to tests/wpt/tests/content-security-policy/script-src/10_1_support_1.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/10_1_support_2.js b/tests/wpt/tests/content-security-policy/script-src/10_1_support_2.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/10_1_support_2.js rename to tests/wpt/tests/content-security-policy/script-src/10_1_support_2.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/addInlineTestsWithDOMManipulation.js b/tests/wpt/tests/content-security-policy/script-src/addInlineTestsWithDOMManipulation.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/addInlineTestsWithDOMManipulation.js rename to tests/wpt/tests/content-security-policy/script-src/addInlineTestsWithDOMManipulation.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/buildInlineWorker.js b/tests/wpt/tests/content-security-policy/script-src/buildInlineWorker.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/buildInlineWorker.js rename to tests/wpt/tests/content-security-policy/script-src/buildInlineWorker.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/crossoriginScript.js b/tests/wpt/tests/content-security-policy/script-src/crossoriginScript.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/crossoriginScript.js rename to tests/wpt/tests/content-security-policy/script-src/crossoriginScript.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/crossoriginScript.js.headers b/tests/wpt/tests/content-security-policy/script-src/crossoriginScript.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/crossoriginScript.js.headers rename to tests/wpt/tests/content-security-policy/script-src/crossoriginScript.js.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html b/tests/wpt/tests/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html rename to tests/wpt/tests/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode.html b/tests/wpt/tests/content-security-policy/script-src/eval-allowed-in-report-only-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode.html rename to tests/wpt/tests/content-security-policy/script-src/eval-allowed-in-report-only-mode.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/eval-allowed-in-report-only-mode.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/eval-allowed-in-report-only-mode.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/externalScript.js b/tests/wpt/tests/content-security-policy/script-src/externalScript.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/externalScript.js rename to tests/wpt/tests/content-security-policy/script-src/externalScript.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-1.html b/tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-1.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-1.html rename to tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-1.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-1.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-1.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-1.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-1.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-3.html b/tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-3.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-3.html rename to tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-3.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-3.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-3.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-3.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-3.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-7.html b/tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-7.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-7.html rename to tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-7.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-7.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-7.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-7.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-7.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-9.html b/tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-9.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-9.html rename to tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-9.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-9.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-9.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-9.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-9.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8-lone-surrogate.html b/tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8-lone-surrogate.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8-lone-surrogate.html rename to tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8-lone-surrogate.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8-lone-surrogate.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8-lone-surrogate.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8-lone-surrogate.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8-lone-surrogate.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8.html b/tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8.html rename to tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/hash-always-converted-to-utf-8/utf-8.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/injected-inline-script-allowed.sub.html b/tests/wpt/tests/content-security-policy/script-src/injected-inline-script-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/injected-inline-script-allowed.sub.html rename to tests/wpt/tests/content-security-policy/script-src/injected-inline-script-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/injected-inline-script-blocked.sub.html b/tests/wpt/tests/content-security-policy/script-src/injected-inline-script-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/injected-inline-script-blocked.sub.html rename to tests/wpt/tests/content-security-policy/script-src/injected-inline-script-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/inlineSuccessTest.js b/tests/wpt/tests/content-security-policy/script-src/inlineSuccessTest.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/inlineSuccessTest.js rename to tests/wpt/tests/content-security-policy/script-src/inlineSuccessTest.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/inlineTests.js b/tests/wpt/tests/content-security-policy/script-src/inlineTests.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/inlineTests.js rename to tests/wpt/tests/content-security-policy/script-src/inlineTests.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/javascript-window-open-blocked.html b/tests/wpt/tests/content-security-policy/script-src/javascript-window-open-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/javascript-window-open-blocked.html rename to tests/wpt/tests/content-security-policy/script-src/javascript-window-open-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/javascript-window-open-blocked.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/javascript-window-open-blocked.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/javascript-window-open-blocked.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/javascript-window-open-blocked.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/nonce-enforce-blocked.html b/tests/wpt/tests/content-security-policy/script-src/nonce-enforce-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/nonce-enforce-blocked.html rename to tests/wpt/tests/content-security-policy/script-src/nonce-enforce-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_1.html b/tests/wpt/tests/content-security-policy/script-src/script-src-1_1.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_1.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-1_1.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10.html b/tests/wpt/tests/content-security-policy/script-src/script-src-1_10.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-1_10.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10_1.html b/tests/wpt/tests/content-security-policy/script-src/script-src-1_10_1.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_10_1.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-1_10_1.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2.html b/tests/wpt/tests/content-security-policy/script-src/script-src-1_2.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-1_2.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2_1.html b/tests/wpt/tests/content-security-policy/script-src/script-src-1_2_1.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_2_1.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-1_2_1.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_3.html b/tests/wpt/tests/content-security-policy/script-src/script-src-1_3.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_3.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-1_3.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4.html b/tests/wpt/tests/content-security-policy/script-src/script-src-1_4.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-1_4.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_1.html b/tests/wpt/tests/content-security-policy/script-src/script-src-1_4_1.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_1.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-1_4_1.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_2.html b/tests/wpt/tests/content-security-policy/script-src/script-src-1_4_2.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-1_4_2.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-1_4_2.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html b/tests/wpt/tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html b/tests/wpt/tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-multiple-policies-one-using-hashing-algorithms.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-overrides-default-src.sub.html b/tests/wpt/tests/content-security-policy/script-src/script-src-overrides-default-src.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-overrides-default-src.sub.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-overrides-default-src.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html b/tests/wpt/tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-report-only-policy-works-with-external-hash-policy.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html b/tests/wpt/tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-report-only-policy-works-with-hash-policy.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-sri_hash.sub.html b/tests/wpt/tests/content-security-policy/script-src/script-src-sri_hash.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-sri_hash.sub.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-sri_hash.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-sri_hash.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-sri_hash.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-sri_hash.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-sri_hash.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_eval.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_eval.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_eval.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_eval.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_eval.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_eval.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_eval.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_eval.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_new_function.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_new_function.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_new_function.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_new_function.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_new_function.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_new_function.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_new_function.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_and_unsafe_eval_new_function.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_discard_source_expressions.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_discard_source_expressions.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_discard_source_expressions.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_discard_source_expressions.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_discard_source_expressions.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_discard_source_expressions.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_discard_source_expressions.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_discard_source_expressions.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_different_nonce.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_different_nonce.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_different_nonce.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_different_nonce.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_different_nonce.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_different_nonce.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_different_nonce.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_different_nonce.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_honor_source_expressions.sub.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_honor_source_expressions.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_honor_source_expressions.sub.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_honor_source_expressions.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_honor_source_expressions.sub.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_honor_source_expressions.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_honor_source_expressions.sub.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_honor_source_expressions.sub.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_report_only.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_report_only.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_report_only.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_report_only.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_report_only.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_report_only.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_report_only.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_double_policy_report_only.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_eval.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_eval.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_eval.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_eval.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_eval.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_eval.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_eval.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_eval.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_hashes.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_in_img-src.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_in_img-src.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_in_img-src.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_in_img-src.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_in_img-src.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_in_img-src.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_in_img-src.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_in_img-src.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_javascript_uri.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_javascript_uri.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_javascript_uri.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_javascript_uri.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_javascript_uri.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_javascript_uri.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_javascript_uri.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_javascript_uri.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_meta_tag.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_meta_tag.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_meta_tag.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_meta_tag.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_meta_tag.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_meta_tag.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_meta_tag.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_meta_tag.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_new_function.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_new_function.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_new_function.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_new_function.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_new_function.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_new_function.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_new_function.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_new_function.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted_incorrect_nonce.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted_incorrect_nonce.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted_incorrect_nonce.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted_incorrect_nonce.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted_incorrect_nonce.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted_incorrect_nonce.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted_incorrect_nonce.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_non_parser_inserted_incorrect_nonce.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted_correct_nonce.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted_correct_nonce.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted_correct_nonce.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted_correct_nonce.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted_correct_nonce.html.headers b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted_correct_nonce.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted_correct_nonce.html.headers rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_parser_inserted_correct_nonce.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_worker-importScripts.https.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_worker-importScripts.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_worker-importScripts.https.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_worker-importScripts.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_worker.https.html b/tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-strict_dynamic_worker.https.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-strict_dynamic_worker.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-wildcards-disallowed.html b/tests/wpt/tests/content-security-policy/script-src/script-src-wildcards-disallowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/script-src-wildcards-disallowed.html rename to tests/wpt/tests/content-security-policy/script-src/script-src-wildcards-disallowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-allowed.sub.html b/tests/wpt/tests/content-security-policy/script-src/scripthash-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-allowed.sub.html rename to tests/wpt/tests/content-security-policy/script-src/scripthash-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-base64url-converts-to-base64.sub.html b/tests/wpt/tests/content-security-policy/script-src/scripthash-base64url-converts-to-base64.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-base64url-converts-to-base64.sub.html rename to tests/wpt/tests/content-security-policy/script-src/scripthash-base64url-converts-to-base64.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-basic-blocked-error-event.html b/tests/wpt/tests/content-security-policy/script-src/scripthash-basic-blocked-error-event.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-basic-blocked-error-event.html rename to tests/wpt/tests/content-security-policy/script-src/scripthash-basic-blocked-error-event.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-basic-blocked.sub.html b/tests/wpt/tests/content-security-policy/script-src/scripthash-basic-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-basic-blocked.sub.html rename to tests/wpt/tests/content-security-policy/script-src/scripthash-basic-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-case-insensitive.sub.html b/tests/wpt/tests/content-security-policy/script-src/scripthash-case-insensitive.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-case-insensitive.sub.html rename to tests/wpt/tests/content-security-policy/script-src/scripthash-case-insensitive.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-changed-1.html b/tests/wpt/tests/content-security-policy/script-src/scripthash-changed-1.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-changed-1.html rename to tests/wpt/tests/content-security-policy/script-src/scripthash-changed-1.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-changed-2.html b/tests/wpt/tests/content-security-policy/script-src/scripthash-changed-2.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-changed-2.html rename to tests/wpt/tests/content-security-policy/script-src/scripthash-changed-2.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-default-src.sub.html b/tests/wpt/tests/content-security-policy/script-src/scripthash-default-src.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-default-src.sub.html rename to tests/wpt/tests/content-security-policy/script-src/scripthash-default-src.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-ignore-unsafeinline.sub.html b/tests/wpt/tests/content-security-policy/script-src/scripthash-ignore-unsafeinline.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-ignore-unsafeinline.sub.html rename to tests/wpt/tests/content-security-policy/script-src/scripthash-ignore-unsafeinline.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-unicode-normalization.sub.html b/tests/wpt/tests/content-security-policy/script-src/scripthash-unicode-normalization.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scripthash-unicode-normalization.sub.html rename to tests/wpt/tests/content-security-policy/script-src/scripthash-unicode-normalization.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-allowed.sub.html b/tests/wpt/tests/content-security-policy/script-src/scriptnonce-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-allowed.sub.html rename to tests/wpt/tests/content-security-policy/script-src/scriptnonce-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-and-scripthash.sub.html b/tests/wpt/tests/content-security-policy/script-src/scriptnonce-and-scripthash.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-and-scripthash.sub.html rename to tests/wpt/tests/content-security-policy/script-src/scriptnonce-and-scripthash.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-basic-blocked.sub.html b/tests/wpt/tests/content-security-policy/script-src/scriptnonce-basic-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-basic-blocked.sub.html rename to tests/wpt/tests/content-security-policy/script-src/scriptnonce-basic-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-changed-1.html b/tests/wpt/tests/content-security-policy/script-src/scriptnonce-changed-1.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-changed-1.html rename to tests/wpt/tests/content-security-policy/script-src/scriptnonce-changed-1.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-changed-2.html b/tests/wpt/tests/content-security-policy/script-src/scriptnonce-changed-2.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-changed-2.html rename to tests/wpt/tests/content-security-policy/script-src/scriptnonce-changed-2.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-ignore-unsafeinline.sub.html b/tests/wpt/tests/content-security-policy/script-src/scriptnonce-ignore-unsafeinline.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-ignore-unsafeinline.sub.html rename to tests/wpt/tests/content-security-policy/script-src/scriptnonce-ignore-unsafeinline.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-redirect.sub.html b/tests/wpt/tests/content-security-policy/script-src/scriptnonce-redirect.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-redirect.sub.html rename to tests/wpt/tests/content-security-policy/script-src/scriptnonce-redirect.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-specified-source.sub.html b/tests/wpt/tests/content-security-policy/script-src/scriptnonce-specified-source.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-specified-source.sub.html rename to tests/wpt/tests/content-security-policy/script-src/scriptnonce-specified-source.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-specified-source.sub.html.sub.headers b/tests/wpt/tests/content-security-policy/script-src/scriptnonce-specified-source.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/scriptnonce-specified-source.sub.html.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/scriptnonce-specified-source.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/simpleSourcedScript.js b/tests/wpt/tests/content-security-policy/script-src/simpleSourcedScript.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/simpleSourcedScript.js rename to tests/wpt/tests/content-security-policy/script-src/simpleSourcedScript.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/srcdoc-doesnt-bypass-script-src.sub.html b/tests/wpt/tests/content-security-policy/script-src/srcdoc-doesnt-bypass-script-src.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/srcdoc-doesnt-bypass-script-src.sub.html rename to tests/wpt/tests/content-security-policy/script-src/srcdoc-doesnt-bypass-script-src.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/change-scripthash-before-execute.js b/tests/wpt/tests/content-security-policy/script-src/support/change-scripthash-before-execute.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/change-scripthash-before-execute.js rename to tests/wpt/tests/content-security-policy/script-src/support/change-scripthash-before-execute.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/change-scriptnonce-before-execute.js b/tests/wpt/tests/content-security-policy/script-src/support/change-scriptnonce-before-execute.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/change-scriptnonce-before-execute.js rename to tests/wpt/tests/content-security-policy/script-src/support/change-scriptnonce-before-execute.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/empty.css b/tests/wpt/tests/content-security-policy/script-src/support/empty.css similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/empty.css rename to tests/wpt/tests/content-security-policy/script-src/support/empty.css diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/inject-script.js b/tests/wpt/tests/content-security-policy/script-src/support/inject-script.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/inject-script.js rename to tests/wpt/tests/content-security-policy/script-src/support/inject-script.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/inline-script-should-be-blocked.js b/tests/wpt/tests/content-security-policy/script-src/support/inline-script-should-be-blocked.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/inline-script-should-be-blocked.js rename to tests/wpt/tests/content-security-policy/script-src/support/inline-script-should-be-blocked.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/post-message.js b/tests/wpt/tests/content-security-policy/script-src/support/post-message.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/post-message.js rename to tests/wpt/tests/content-security-policy/script-src/support/post-message.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-eval.js b/tests/wpt/tests/content-security-policy/script-src/support/worker-eval.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-eval.js rename to tests/wpt/tests/content-security-policy/script-src/support/worker-eval.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-eval.js.sub.headers b/tests/wpt/tests/content-security-policy/script-src/support/worker-eval.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-eval.js.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/support/worker-eval.js.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-function-function.js b/tests/wpt/tests/content-security-policy/script-src/support/worker-function-function.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-function-function.js rename to tests/wpt/tests/content-security-policy/script-src/support/worker-function-function.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-function-function.js.sub.headers b/tests/wpt/tests/content-security-policy/script-src/support/worker-function-function.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-function-function.js.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/support/worker-function-function.js.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-importscripts.js b/tests/wpt/tests/content-security-policy/script-src/support/worker-with-script-src-none-importscripts.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-importscripts.js rename to tests/wpt/tests/content-security-policy/script-src/support/worker-with-script-src-none-importscripts.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-importscripts.js.sub.headers b/tests/wpt/tests/content-security-policy/script-src/support/worker-with-script-src-none-importscripts.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-importscripts.js.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/support/worker-with-script-src-none-importscripts.js.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-set-timeout.js b/tests/wpt/tests/content-security-policy/script-src/support/worker-with-script-src-none-set-timeout.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-set-timeout.js rename to tests/wpt/tests/content-security-policy/script-src/support/worker-with-script-src-none-set-timeout.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-set-timeout.js.sub.headers b/tests/wpt/tests/content-security-policy/script-src/support/worker-with-script-src-none-set-timeout.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/support/worker-with-script-src-none-set-timeout.js.sub.headers rename to tests/wpt/tests/content-security-policy/script-src/support/worker-with-script-src-none-set-timeout.js.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-data-set-timeout.sub.html b/tests/wpt/tests/content-security-policy/script-src/worker-data-set-timeout.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/worker-data-set-timeout.sub.html rename to tests/wpt/tests/content-security-policy/script-src/worker-data-set-timeout.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-eval-blocked.sub.html b/tests/wpt/tests/content-security-policy/script-src/worker-eval-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/worker-eval-blocked.sub.html rename to tests/wpt/tests/content-security-policy/script-src/worker-eval-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-function-function-blocked.sub.html b/tests/wpt/tests/content-security-policy/script-src/worker-function-function-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/worker-function-function-blocked.sub.html rename to tests/wpt/tests/content-security-policy/script-src/worker-function-function-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-importscripts.sub.html b/tests/wpt/tests/content-security-policy/script-src/worker-importscripts.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/worker-importscripts.sub.html rename to tests/wpt/tests/content-security-policy/script-src/worker-importscripts.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-script-src.sub.html b/tests/wpt/tests/content-security-policy/script-src/worker-script-src.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/worker-script-src.sub.html rename to tests/wpt/tests/content-security-policy/script-src/worker-script-src.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/worker-set-timeout.sub.html b/tests/wpt/tests/content-security-policy/script-src/worker-set-timeout.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/script-src/worker-set-timeout.sub.html rename to tests/wpt/tests/content-security-policy/script-src/worker-set-timeout.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/blockeduri-eval.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/blockeduri-eval.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/blockeduri-eval.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/blockeduri-eval.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/blockeduri-inline.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/blockeduri-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/blockeduri-inline.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/blockeduri-inline.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/blockeduri-ws-wss-scheme.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/blockeduri-ws-wss-scheme.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/blockeduri-ws-wss-scheme.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/blockeduri-ws-wss-scheme.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/constructor-required-fields.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/constructor-required-fields.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/constructor-required-fields.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/constructor-required-fields.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/idlharness.window.js b/tests/wpt/tests/content-security-policy/securitypolicyviolation/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/idlharness.window.js rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/img-src-redirect-upgrade-reporting.https.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/img-src-redirect-upgrade-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/img-src-redirect-upgrade-reporting.https.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/img-src-redirect-upgrade-reporting.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/img-src-redirect-upgrade-reporting.https.html.headers b/tests/wpt/tests/content-security-policy/securitypolicyviolation/img-src-redirect-upgrade-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/img-src-redirect-upgrade-reporting.https.html.headers rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/img-src-redirect-upgrade-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/img-src-redirect.sub.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/img-src-redirect.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/img-src-redirect.sub.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/img-src-redirect.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/inside-dedicated-worker.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/inside-dedicated-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/inside-dedicated-worker.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/inside-dedicated-worker.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/inside-service-worker.https.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/inside-service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/inside-service-worker.https.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/inside-service-worker.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/inside-shared-worker.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/inside-shared-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/inside-shared-worker.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/inside-shared-worker.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/script-sample-no-opt-in.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/script-sample-no-opt-in.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/script-sample-no-opt-in.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/script-sample-no-opt-in.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/script-sample.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/script-sample.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/script-sample.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/script-sample.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-cross-origin-image-from-script.sub.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-cross-origin-image-from-script.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-cross-origin-image-from-script.sub.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-cross-origin-image-from-script.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-cross-origin-image.sub.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-cross-origin-image.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-cross-origin-image.sub.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-cross-origin-image.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image-from-script.sub.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image-from-script.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image-from-script.sub.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image-from-script.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image.sub.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image.sub.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/securitypolicyviolation-block-image.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/source-file-blob-scheme.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/source-file-blob-scheme.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/source-file-blob-scheme.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/source-file-blob-scheme.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/source-file-data-scheme.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/source-file-data-scheme.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/source-file-data-scheme.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/source-file-data-scheme.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/source-file.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/source-file.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/source-file.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/source-file.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/style-sample-no-opt-in.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/style-sample-no-opt-in.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/style-sample-no-opt-in.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/style-sample-no-opt-in.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/style-sample.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/style-sample.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/style-sample.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/style-sample.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/support/inside-worker.sub.js b/tests/wpt/tests/content-security-policy/securitypolicyviolation/support/inside-worker.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/support/inside-worker.sub.js rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/support/inside-worker.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/support/inside-worker.sub.js.headers b/tests/wpt/tests/content-security-policy/securitypolicyviolation/support/inside-worker.sub.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/support/inside-worker.sub.js.headers rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/support/inside-worker.sub.js.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/support/testharness-helper.sub.js b/tests/wpt/tests/content-security-policy/securitypolicyviolation/support/testharness-helper.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/support/testharness-helper.sub.js rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/support/testharness-helper.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/targeting.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/targeting.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/targeting.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/targeting.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/upgrade-insecure-requests-reporting.https.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/upgrade-insecure-requests-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/upgrade-insecure-requests-reporting.https.html rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/upgrade-insecure-requests-reporting.https.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/upgrade-insecure-requests-reporting.https.html.headers b/tests/wpt/tests/content-security-policy/securitypolicyviolation/upgrade-insecure-requests-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/upgrade-insecure-requests-reporting.https.html.headers rename to tests/wpt/tests/content-security-policy/securitypolicyviolation/upgrade-insecure-requests-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/spec.src.json b/tests/wpt/tests/content-security-policy/spec.src.json similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/spec.src.json rename to tests/wpt/tests/content-security-policy/spec.src.json diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src-attr-elem/style-src-attr-allowed-src-blocked.html b/tests/wpt/tests/content-security-policy/style-src-attr-elem/style-src-attr-allowed-src-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src-attr-elem/style-src-attr-allowed-src-blocked.html rename to tests/wpt/tests/content-security-policy/style-src-attr-elem/style-src-attr-allowed-src-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src-attr-elem/style-src-attr-blocked-src-allowed.html b/tests/wpt/tests/content-security-policy/style-src-attr-elem/style-src-attr-blocked-src-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src-attr-elem/style-src-attr-blocked-src-allowed.html rename to tests/wpt/tests/content-security-policy/style-src-attr-elem/style-src-attr-blocked-src-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src-attr-elem/style-src-elem-allowed-attr-blocked.html b/tests/wpt/tests/content-security-policy/style-src-attr-elem/style-src-elem-allowed-attr-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src-attr-elem/style-src-elem-allowed-attr-blocked.html rename to tests/wpt/tests/content-security-policy/style-src-attr-elem/style-src-elem-allowed-attr-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src-attr-elem/style-src-elem-allowed-src-blocked.html b/tests/wpt/tests/content-security-policy/style-src-attr-elem/style-src-elem-allowed-src-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src-attr-elem/style-src-elem-allowed-src-blocked.html rename to tests/wpt/tests/content-security-policy/style-src-attr-elem/style-src-elem-allowed-src-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src-attr-elem/style-src-elem-blocked-attr-allowed.html b/tests/wpt/tests/content-security-policy/style-src-attr-elem/style-src-elem-blocked-attr-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src-attr-elem/style-src-elem-blocked-attr-allowed.html rename to tests/wpt/tests/content-security-policy/style-src-attr-elem/style-src-elem-blocked-attr-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src-attr-elem/style-src-elem-blocked-src-allowed.html b/tests/wpt/tests/content-security-policy/style-src-attr-elem/style-src-elem-blocked-src-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src-attr-elem/style-src-elem-blocked-src-allowed.html rename to tests/wpt/tests/content-security-policy/style-src-attr-elem/style-src-elem-blocked-src-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/injected-inline-style-allowed.sub.html b/tests/wpt/tests/content-security-policy/style-src/injected-inline-style-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/injected-inline-style-allowed.sub.html rename to tests/wpt/tests/content-security-policy/style-src/injected-inline-style-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/injected-inline-style-blocked.sub.html b/tests/wpt/tests/content-security-policy/style-src/injected-inline-style-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/injected-inline-style-blocked.sub.html rename to tests/wpt/tests/content-security-policy/style-src/injected-inline-style-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html b/tests/wpt/tests/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html rename to tests/wpt/tests/content-security-policy/style-src/inline-style-allowed-while-cloning-objects.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-allowed.sub.html b/tests/wpt/tests/content-security-policy/style-src/inline-style-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-allowed.sub.html rename to tests/wpt/tests/content-security-policy/style-src/inline-style-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-allowed.sub.html b/tests/wpt/tests/content-security-policy/style-src/inline-style-attribute-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-allowed.sub.html rename to tests/wpt/tests/content-security-policy/style-src/inline-style-attribute-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-blocked.sub.html b/tests/wpt/tests/content-security-policy/style-src/inline-style-attribute-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-blocked.sub.html rename to tests/wpt/tests/content-security-policy/style-src/inline-style-attribute-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-on-html.sub.html b/tests/wpt/tests/content-security-policy/style-src/inline-style-attribute-on-html.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-attribute-on-html.sub.html rename to tests/wpt/tests/content-security-policy/style-src/inline-style-attribute-on-html.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-blocked.sub.html b/tests/wpt/tests/content-security-policy/style-src/inline-style-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/inline-style-blocked.sub.html rename to tests/wpt/tests/content-security-policy/style-src/inline-style-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/resources/allowed.css b/tests/wpt/tests/content-security-policy/style-src/resources/allowed.css similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/resources/allowed.css rename to tests/wpt/tests/content-security-policy/style-src/resources/allowed.css diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/resources/style-src-import.sub.css b/tests/wpt/tests/content-security-policy/style-src/resources/style-src-import.sub.css similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/resources/style-src-import.sub.css rename to tests/wpt/tests/content-security-policy/style-src/resources/style-src-import.sub.css diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/resources/style-src-inject-style.js b/tests/wpt/tests/content-security-policy/style-src/resources/style-src-inject-style.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/resources/style-src-inject-style.js rename to tests/wpt/tests/content-security-policy/style-src/resources/style-src-inject-style.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/resources/style-src.css b/tests/wpt/tests/content-security-policy/style-src/resources/style-src.css similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/resources/style-src.css rename to tests/wpt/tests/content-security-policy/style-src/resources/style-src.css diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-allowed.sub.html b/tests/wpt/tests/content-security-policy/style-src/style-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-allowed.sub.html rename to tests/wpt/tests/content-security-policy/style-src/style-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-blocked.html b/tests/wpt/tests/content-security-policy/style-src/style-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-blocked.html rename to tests/wpt/tests/content-security-policy/style-src/style-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-error-event-fires.html b/tests/wpt/tests/content-security-policy/style-src/style-src-error-event-fires.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-error-event-fires.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-error-event-fires.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-hash-allowed.html b/tests/wpt/tests/content-security-policy/style-src/style-src-hash-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-hash-allowed.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-hash-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-hash-blocked.html b/tests/wpt/tests/content-security-policy/style-src/style-src-hash-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-hash-blocked.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-hash-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-hash-case-insensitive.html b/tests/wpt/tests/content-security-policy/style-src/style-src-hash-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-hash-case-insensitive.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-hash-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-hash-default-src-allowed.html b/tests/wpt/tests/content-security-policy/style-src/style-src-hash-default-src-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-hash-default-src-allowed.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-hash-default-src-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-imported-style-allowed.sub.html b/tests/wpt/tests/content-security-policy/style-src/style-src-imported-style-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-imported-style-allowed.sub.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-imported-style-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-imported-style-blocked.html b/tests/wpt/tests/content-security-policy/style-src/style-src-imported-style-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-imported-style-blocked.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-imported-style-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-injected-inline-style-allowed-with-content-hash.html b/tests/wpt/tests/content-security-policy/style-src/style-src-injected-inline-style-allowed-with-content-hash.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-injected-inline-style-allowed-with-content-hash.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-injected-inline-style-allowed-with-content-hash.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-injected-inline-style-allowed.html b/tests/wpt/tests/content-security-policy/style-src/style-src-injected-inline-style-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-injected-inline-style-allowed.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-injected-inline-style-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-injected-inline-style-blocked.html b/tests/wpt/tests/content-security-policy/style-src/style-src-injected-inline-style-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-injected-inline-style-blocked.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-injected-inline-style-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-injected-stylesheet-allowed.sub.html b/tests/wpt/tests/content-security-policy/style-src/style-src-injected-stylesheet-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-injected-stylesheet-allowed.sub.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-injected-stylesheet-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-injected-stylesheet-blocked.sub.html b/tests/wpt/tests/content-security-policy/style-src/style-src-injected-stylesheet-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-injected-stylesheet-blocked.sub.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-injected-stylesheet-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-inline-style-allowed.html b/tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-inline-style-allowed.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-inline-style-attribute-allowed.html b/tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-attribute-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-inline-style-attribute-allowed.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-attribute-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-inline-style-attribute-blocked.html b/tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-attribute-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-inline-style-attribute-blocked.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-attribute-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-inline-style-blocked.html b/tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-inline-style-blocked.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-inline-style-nonce-allowed.html b/tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-nonce-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-inline-style-nonce-allowed.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-nonce-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-inline-style-nonce-blocked-error-event.html b/tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-nonce-blocked-error-event.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-inline-style-nonce-blocked-error-event.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-nonce-blocked-error-event.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-inline-style-nonce-blocked.html b/tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-nonce-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-inline-style-nonce-blocked.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-inline-style-nonce-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-multiple-policies-multiple-hashing-algorithms.html b/tests/wpt/tests/content-security-policy/style-src/style-src-multiple-policies-multiple-hashing-algorithms.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-multiple-policies-multiple-hashing-algorithms.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-multiple-policies-multiple-hashing-algorithms.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers b/tests/wpt/tests/content-security-policy/style-src/style-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers rename to tests/wpt/tests/content-security-policy/style-src/style-src-multiple-policies-multiple-hashing-algorithms.html.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-none-blocked.html b/tests/wpt/tests/content-security-policy/style-src/style-src-none-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-none-blocked.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-none-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-star-allowed.html b/tests/wpt/tests/content-security-policy/style-src/style-src-star-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-star-allowed.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-star-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-stylesheet-nonce-allowed.html b/tests/wpt/tests/content-security-policy/style-src/style-src-stylesheet-nonce-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-stylesheet-nonce-allowed.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-stylesheet-nonce-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-stylesheet-nonce-blocked.html b/tests/wpt/tests/content-security-policy/style-src/style-src-stylesheet-nonce-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/style-src-stylesheet-nonce-blocked.html rename to tests/wpt/tests/content-security-policy/style-src/style-src-stylesheet-nonce-blocked.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-allowed.sub.html b/tests/wpt/tests/content-security-policy/style-src/stylehash-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-allowed.sub.html rename to tests/wpt/tests/content-security-policy/style-src/stylehash-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-basic-blocked.sub.html b/tests/wpt/tests/content-security-policy/style-src/stylehash-basic-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-basic-blocked.sub.html rename to tests/wpt/tests/content-security-policy/style-src/stylehash-basic-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-default-src.sub.html b/tests/wpt/tests/content-security-policy/style-src/stylehash-default-src.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/stylehash-default-src.sub.html rename to tests/wpt/tests/content-security-policy/style-src/stylehash-default-src.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/stylenonce-allowed.sub.html b/tests/wpt/tests/content-security-policy/style-src/stylenonce-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/stylenonce-allowed.sub.html rename to tests/wpt/tests/content-security-policy/style-src/stylenonce-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/stylenonce-blocked.sub.html b/tests/wpt/tests/content-security-policy/style-src/stylenonce-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/stylenonce-blocked.sub.html rename to tests/wpt/tests/content-security-policy/style-src/stylenonce-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/style-src/support/inject-style.js b/tests/wpt/tests/content-security-policy/style-src/support/inject-style.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/style-src/support/inject-style.js rename to tests/wpt/tests/content-security-policy/style-src/support/inject-style.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/alert-pass.js b/tests/wpt/tests/content-security-policy/support/alert-pass.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/alert-pass.js rename to tests/wpt/tests/content-security-policy/support/alert-pass.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/alertAssert.sub.js b/tests/wpt/tests/content-security-policy/support/alertAssert.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/alertAssert.sub.js rename to tests/wpt/tests/content-security-policy/support/alertAssert.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/checkReport.sub.js b/tests/wpt/tests/content-security-policy/support/checkReport.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/checkReport.sub.js rename to tests/wpt/tests/content-security-policy/support/checkReport.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/dedicated-worker-helper.js b/tests/wpt/tests/content-security-policy/support/dedicated-worker-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/dedicated-worker-helper.js rename to tests/wpt/tests/content-security-policy/support/dedicated-worker-helper.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/document-write-alert-fail.js b/tests/wpt/tests/content-security-policy/support/document-write-alert-fail.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/document-write-alert-fail.js rename to tests/wpt/tests/content-security-policy/support/document-write-alert-fail.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/echo-policy.py b/tests/wpt/tests/content-security-policy/support/echo-policy.py similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/echo-policy.py rename to tests/wpt/tests/content-security-policy/support/echo-policy.py diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/fail.asis b/tests/wpt/tests/content-security-policy/support/fail.asis similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/fail.asis rename to tests/wpt/tests/content-security-policy/support/fail.asis diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/fail.html b/tests/wpt/tests/content-security-policy/support/fail.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/fail.html rename to tests/wpt/tests/content-security-policy/support/fail.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/fail.js b/tests/wpt/tests/content-security-policy/support/fail.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/fail.js rename to tests/wpt/tests/content-security-policy/support/fail.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/fail.png b/tests/wpt/tests/content-security-policy/support/fail.png similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/fail.png rename to tests/wpt/tests/content-security-policy/support/fail.png diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/file-prefetch-allowed.html b/tests/wpt/tests/content-security-policy/support/file-prefetch-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/file-prefetch-allowed.html rename to tests/wpt/tests/content-security-policy/support/file-prefetch-allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/fonts.css b/tests/wpt/tests/content-security-policy/support/fonts.css similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/fonts.css rename to tests/wpt/tests/content-security-policy/support/fonts.css diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/import-scripts.js b/tests/wpt/tests/content-security-policy/support/import-scripts.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/import-scripts.js rename to tests/wpt/tests/content-security-policy/support/import-scripts.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/inject-image.js b/tests/wpt/tests/content-security-policy/support/inject-image.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/inject-image.js rename to tests/wpt/tests/content-security-policy/support/inject-image.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/inject-image.sub.js b/tests/wpt/tests/content-security-policy/support/inject-image.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/inject-image.sub.js rename to tests/wpt/tests/content-security-policy/support/inject-image.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/logTest.sub.js b/tests/wpt/tests/content-security-policy/support/logTest.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/logTest.sub.js rename to tests/wpt/tests/content-security-policy/support/logTest.sub.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/manifest.json b/tests/wpt/tests/content-security-policy/support/manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/manifest.json rename to tests/wpt/tests/content-security-policy/support/manifest.json diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/media/flash.swf b/tests/wpt/tests/content-security-policy/support/media/flash.swf similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/media/flash.swf rename to tests/wpt/tests/content-security-policy/support/media/flash.swf diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/nonce-should-be-blocked.js b/tests/wpt/tests/content-security-policy/support/nonce-should-be-blocked.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/nonce-should-be-blocked.js rename to tests/wpt/tests/content-security-policy/support/nonce-should-be-blocked.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/pass.png b/tests/wpt/tests/content-security-policy/support/pass.png similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/pass.png rename to tests/wpt/tests/content-security-policy/support/pass.png diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/pass2.png b/tests/wpt/tests/content-security-policy/support/pass2.png similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/pass2.png rename to tests/wpt/tests/content-security-policy/support/pass2.png diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/ping.js b/tests/wpt/tests/content-security-policy/support/ping.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/ping.js rename to tests/wpt/tests/content-security-policy/support/ping.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/post-message.js b/tests/wpt/tests/content-security-policy/support/post-message.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/post-message.js rename to tests/wpt/tests/content-security-policy/support/post-message.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/postmessage-fail.html b/tests/wpt/tests/content-security-policy/support/postmessage-fail.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/postmessage-fail.html rename to tests/wpt/tests/content-security-policy/support/postmessage-fail.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/postmessage-pass-to-opener.html b/tests/wpt/tests/content-security-policy/support/postmessage-pass-to-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/postmessage-pass-to-opener.html rename to tests/wpt/tests/content-security-policy/support/postmessage-pass-to-opener.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/postmessage-pass.html b/tests/wpt/tests/content-security-policy/support/postmessage-pass.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/postmessage-pass.html rename to tests/wpt/tests/content-security-policy/support/postmessage-pass.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/prefetch-helper.js b/tests/wpt/tests/content-security-policy/support/prefetch-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/prefetch-helper.js rename to tests/wpt/tests/content-security-policy/support/prefetch-helper.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/prefetch-subresource.css b/tests/wpt/tests/content-security-policy/support/prefetch-subresource.css similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/prefetch-subresource.css rename to tests/wpt/tests/content-security-policy/support/prefetch-subresource.css diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/prefetch-subresource.css.headers b/tests/wpt/tests/content-security-policy/support/prefetch-subresource.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/prefetch-subresource.css.headers rename to tests/wpt/tests/content-security-policy/support/prefetch-subresource.css.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/prefetch-with-csp.html b/tests/wpt/tests/content-security-policy/support/prefetch-with-csp.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/prefetch-with-csp.html rename to tests/wpt/tests/content-security-policy/support/prefetch-with-csp.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/resource.py b/tests/wpt/tests/content-security-policy/support/resource.py similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/resource.py rename to tests/wpt/tests/content-security-policy/support/resource.py diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/service-worker-helper.js b/tests/wpt/tests/content-security-policy/support/service-worker-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/service-worker-helper.js rename to tests/wpt/tests/content-security-policy/support/service-worker-helper.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/shared-worker-helper.js b/tests/wpt/tests/content-security-policy/support/shared-worker-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/shared-worker-helper.js rename to tests/wpt/tests/content-security-policy/support/shared-worker-helper.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/siblingPath.js b/tests/wpt/tests/content-security-policy/support/siblingPath.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/siblingPath.js rename to tests/wpt/tests/content-security-policy/support/siblingPath.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/testharness-helper.js b/tests/wpt/tests/content-security-policy/support/testharness-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/testharness-helper.js rename to tests/wpt/tests/content-security-policy/support/testharness-helper.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/var-a.js b/tests/wpt/tests/content-security-policy/support/var-a.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/support/var-a.js rename to tests/wpt/tests/content-security-policy/support/var-a.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/svg/including.sub.svg b/tests/wpt/tests/content-security-policy/svg/including.sub.svg similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/svg/including.sub.svg rename to tests/wpt/tests/content-security-policy/svg/including.sub.svg diff --git a/tests/wpt/web-platform-tests/content-security-policy/svg/including.sub.svg.sub.headers b/tests/wpt/tests/content-security-policy/svg/including.sub.svg.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/svg/including.sub.svg.sub.headers rename to tests/wpt/tests/content-security-policy/svg/including.sub.svg.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/svg/object-in-svg-foreignobject.sub.html b/tests/wpt/tests/content-security-policy/svg/object-in-svg-foreignobject.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/svg/object-in-svg-foreignobject.sub.html rename to tests/wpt/tests/content-security-policy/svg/object-in-svg-foreignobject.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/svg/scripted.svg b/tests/wpt/tests/content-security-policy/svg/scripted.svg similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/svg/scripted.svg rename to tests/wpt/tests/content-security-policy/svg/scripted.svg diff --git a/tests/wpt/web-platform-tests/content-security-policy/svg/scripted.svg.sub.headers b/tests/wpt/tests/content-security-policy/svg/scripted.svg.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/svg/scripted.svg.sub.headers rename to tests/wpt/tests/content-security-policy/svg/scripted.svg.sub.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/svg/svg-from-guid.html b/tests/wpt/tests/content-security-policy/svg/svg-from-guid.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/svg/svg-from-guid.html rename to tests/wpt/tests/content-security-policy/svg/svg-from-guid.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/svg/svg-inline.sub.html b/tests/wpt/tests/content-security-policy/svg/svg-inline.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/svg/svg-inline.sub.html rename to tests/wpt/tests/content-security-policy/svg/svg-inline.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/svg/svg-policy-resource-doc-includes.html b/tests/wpt/tests/content-security-policy/svg/svg-policy-resource-doc-includes.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/svg/svg-policy-resource-doc-includes.html rename to tests/wpt/tests/content-security-policy/svg/svg-policy-resource-doc-includes.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/svg/svg-policy-with-resource.html b/tests/wpt/tests/content-security-policy/svg/svg-policy-with-resource.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/svg/svg-policy-with-resource.html rename to tests/wpt/tests/content-security-policy/svg/svg-policy-with-resource.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-allowed.sub.html b/tests/wpt/tests/content-security-policy/unsafe-eval/eval-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-allowed.sub.html rename to tests/wpt/tests/content-security-policy/unsafe-eval/eval-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked-and-sends-report.sub.html b/tests/wpt/tests/content-security-policy/unsafe-eval/eval-blocked-and-sends-report.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked-and-sends-report.sub.html rename to tests/wpt/tests/content-security-policy/unsafe-eval/eval-blocked-and-sends-report.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.html b/tests/wpt/tests/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.html rename to tests/wpt/tests/content-security-policy/unsafe-eval/eval-blocked-in-about-blank-iframe.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked.sub.html b/tests/wpt/tests/content-security-policy/unsafe-eval/eval-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-blocked.sub.html rename to tests/wpt/tests/content-security-policy/unsafe-eval/eval-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-in-iframe.html b/tests/wpt/tests/content-security-policy/unsafe-eval/eval-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-in-iframe.html rename to tests/wpt/tests/content-security-policy/unsafe-eval/eval-in-iframe.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-allowed.sub.html b/tests/wpt/tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-allowed.sub.html rename to tests/wpt/tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-blocked.sub.html b/tests/wpt/tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-blocked.sub.html rename to tests/wpt/tests/content-security-policy/unsafe-eval/eval-scripts-setInterval-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-allowed.sub.html b/tests/wpt/tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-allowed.sub.html rename to tests/wpt/tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-blocked.sub.html b/tests/wpt/tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-blocked.sub.html rename to tests/wpt/tests/content-security-policy/unsafe-eval/eval-scripts-setTimeout-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/function-constructor-allowed.sub.html b/tests/wpt/tests/content-security-policy/unsafe-eval/function-constructor-allowed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/function-constructor-allowed.sub.html rename to tests/wpt/tests/content-security-policy/unsafe-eval/function-constructor-allowed.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/function-constructor-blocked.sub.html b/tests/wpt/tests/content-security-policy/unsafe-eval/function-constructor-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/function-constructor-blocked.sub.html rename to tests/wpt/tests/content-security-policy/unsafe-eval/function-constructor-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/support/echo-eval-with-policy.py b/tests/wpt/tests/content-security-policy/unsafe-eval/support/echo-eval-with-policy.py similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-eval/support/echo-eval-with-policy.py rename to tests/wpt/tests/content-security-policy/unsafe-eval/support/echo-eval-with-policy.py diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href_blank-script-src-attr.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href_blank-script-src-attr.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href_blank-script-src-attr.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href_blank-script-src-attr.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href_blank-script-src-elem.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href_blank-script-src-elem.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href_blank-script-src-elem.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href_blank-script-src-elem.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href_blank.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href_blank.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href_blank.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_allowed-href_blank.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_allowed-window_location.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_allowed-window_location.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_allowed-window_location.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_allowed-window_location.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_allowed-window_open.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_allowed-window_open.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_allowed-window_open.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_allowed-window_open.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank-script-src-attr.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank-script-src-attr.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank-script-src-attr.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank-script-src-attr.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank-script-src-elem.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank-script-src-elem.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank-script-src-elem.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank-script-src-elem.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-href_blank.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-window_location.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-window_location.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-window_location.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-window_location.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-window_open.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-window_open.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-window_open.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_missing_unsafe_hashes-window_open.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank-script-src-attr.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank-script-src-attr.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank-script-src-attr.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank-script-src-attr.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank-script-src-elem.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank-script-src-elem.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank-script-src-elem.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank-script-src-elem.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-href_blank.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-window_location.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-window_location.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-window_location.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-window_location.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-window_open.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-window_open.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-window_open.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/javascript_src_denied_wrong_hash-window_open.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/script_event_handlers_allowed.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/script_event_handlers_allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/script_event_handlers_allowed.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/script_event_handlers_allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/script_event_handlers_denied_missing_unsafe_hashes.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/script_event_handlers_denied_missing_unsafe_hashes.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/script_event_handlers_denied_missing_unsafe_hashes.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/script_event_handlers_denied_missing_unsafe_hashes.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/script_event_handlers_denied_wrong_hash.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/script_event_handlers_denied_wrong_hash.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/script_event_handlers_denied_wrong_hash.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/script_event_handlers_denied_wrong_hash.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/style_attribute_allowed.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/style_attribute_allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/style_attribute_allowed.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/style_attribute_allowed.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/style_attribute_denied_missing_unsafe_hashes.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/style_attribute_denied_missing_unsafe_hashes.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/style_attribute_denied_missing_unsafe_hashes.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/style_attribute_denied_missing_unsafe_hashes.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/style_attribute_denied_wrong_hash.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/style_attribute_denied_wrong_hash.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/style_attribute_denied_wrong_hash.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/style_attribute_denied_wrong_hash.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/support/child_window_location_navigate.sub.html b/tests/wpt/tests/content-security-policy/unsafe-hashes/support/child_window_location_navigate.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/support/child_window_location_navigate.sub.html rename to tests/wpt/tests/content-security-policy/unsafe-hashes/support/child_window_location_navigate.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/support/helper.js b/tests/wpt/tests/content-security-policy/unsafe-hashes/support/helper.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/unsafe-hashes/support/helper.js rename to tests/wpt/tests/content-security-policy/unsafe-hashes/support/helper.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/default-src-blocks-wasm.any.js b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/default-src-blocks-wasm.any.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/default-src-blocks-wasm.any.js rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/default-src-blocks-wasm.any.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/default-src-blocks-wasm.any.js.headers b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/default-src-blocks-wasm.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/default-src-blocks-wasm.any.js.headers rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/default-src-blocks-wasm.any.js.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/default-src-unsafe-eval-allows-wasm.any.js b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/default-src-unsafe-eval-allows-wasm.any.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/default-src-unsafe-eval-allows-wasm.any.js rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/default-src-unsafe-eval-allows-wasm.any.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/default-src-unsafe-eval-allows-wasm.any.js.headers b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/default-src-unsafe-eval-allows-wasm.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/default-src-unsafe-eval-allows-wasm.any.js.headers rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/default-src-unsafe-eval-allows-wasm.any.js.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/default-src-wasm-unsafe-eval-allows-wasm.any.js b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/default-src-wasm-unsafe-eval-allows-wasm.any.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/default-src-wasm-unsafe-eval-allows-wasm.any.js rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/default-src-wasm-unsafe-eval-allows-wasm.any.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/default-src-wasm-unsafe-eval-allows-wasm.any.js.headers b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/default-src-wasm-unsafe-eval-allows-wasm.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/default-src-wasm-unsafe-eval-allows-wasm.any.js.headers rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/default-src-wasm-unsafe-eval-allows-wasm.any.js.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/postMessage-wasm-module.html b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/postMessage-wasm-module.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/postMessage-wasm-module.html rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/postMessage-wasm-module.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-blocks-wasm.any.js b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-blocks-wasm.any.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-blocks-wasm.any.js rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-blocks-wasm.any.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-blocks-wasm.any.js.headers b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-blocks-wasm.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-blocks-wasm.any.js.headers rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-blocks-wasm.any.js.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-spv-asynch.any.js b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-spv-asynch.any.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-spv-asynch.any.js rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-spv-asynch.any.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-spv-asynch.any.js.headers b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-spv-asynch.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-spv-asynch.any.js.headers rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-spv-asynch.any.js.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-unsafe-eval-allows-wasm.any.js b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-unsafe-eval-allows-wasm.any.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-unsafe-eval-allows-wasm.any.js rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-unsafe-eval-allows-wasm.any.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-unsafe-eval-allows-wasm.any.js.headers b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-unsafe-eval-allows-wasm.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-unsafe-eval-allows-wasm.any.js.headers rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-unsafe-eval-allows-wasm.any.js.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-wasm-unsafe-eval-allows-wasm.any.js b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-wasm-unsafe-eval-allows-wasm.any.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-wasm-unsafe-eval-allows-wasm.any.js rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-wasm-unsafe-eval-allows-wasm.any.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-wasm-unsafe-eval-allows-wasm.any.js.headers b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-wasm-unsafe-eval-allows-wasm.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/script-src-wasm-unsafe-eval-allows-wasm.any.js.headers rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/script-src-wasm-unsafe-eval-allows-wasm.any.js.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/support/iframe.html b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/support/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/support/iframe.html rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/support/iframe.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/support/iframe.html.headers b/tests/wpt/tests/content-security-policy/wasm-unsafe-eval/support/iframe.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/wasm-unsafe-eval/support/iframe.html.headers rename to tests/wpt/tests/content-security-policy/wasm-unsafe-eval/support/iframe.html.headers diff --git a/tests/wpt/web-platform-tests/content-security-policy/webrtc/webrtc-allowed-default-src-none.html b/tests/wpt/tests/content-security-policy/webrtc/webrtc-allowed-default-src-none.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/webrtc/webrtc-allowed-default-src-none.html rename to tests/wpt/tests/content-security-policy/webrtc/webrtc-allowed-default-src-none.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/webrtc/webrtc-allowed-explicit.html b/tests/wpt/tests/content-security-policy/webrtc/webrtc-allowed-explicit.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/webrtc/webrtc-allowed-explicit.html rename to tests/wpt/tests/content-security-policy/webrtc/webrtc-allowed-explicit.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/webrtc/webrtc-allowed-nopolicy.html b/tests/wpt/tests/content-security-policy/webrtc/webrtc-allowed-nopolicy.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/webrtc/webrtc-allowed-nopolicy.html rename to tests/wpt/tests/content-security-policy/webrtc/webrtc-allowed-nopolicy.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/webrtc/webrtc-blocked-explicit.html b/tests/wpt/tests/content-security-policy/webrtc/webrtc-blocked-explicit.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/webrtc/webrtc-blocked-explicit.html rename to tests/wpt/tests/content-security-policy/webrtc/webrtc-blocked-explicit.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/webrtc/webrtc-blocked-unknown.html b/tests/wpt/tests/content-security-policy/webrtc/webrtc-blocked-unknown.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/webrtc/webrtc-blocked-unknown.html rename to tests/wpt/tests/content-security-policy/webrtc/webrtc-blocked-unknown.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/webrtc/webrtc.js b/tests/wpt/tests/content-security-policy/webrtc/webrtc.js similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/webrtc/webrtc.js rename to tests/wpt/tests/content-security-policy/webrtc/webrtc.js diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-child.sub.html b/tests/wpt/tests/content-security-policy/worker-src/dedicated-child.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-child.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/dedicated-child.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-fallback.sub.html b/tests/wpt/tests/content-security-policy/worker-src/dedicated-fallback.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-fallback.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/dedicated-fallback.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-list.sub.html b/tests/wpt/tests/content-security-policy/worker-src/dedicated-list.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-list.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/dedicated-list.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-none.sub.html b/tests/wpt/tests/content-security-policy/worker-src/dedicated-none.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-none.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/dedicated-none.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-self.sub.html b/tests/wpt/tests/content-security-policy/worker-src/dedicated-self.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-self.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/dedicated-self.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-worker-src-child-fallback-blocked.sub.html b/tests/wpt/tests/content-security-policy/worker-src/dedicated-worker-src-child-fallback-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-worker-src-child-fallback-blocked.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/dedicated-worker-src-child-fallback-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-worker-src-child-fallback.sub.html b/tests/wpt/tests/content-security-policy/worker-src/dedicated-worker-src-child-fallback.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-worker-src-child-fallback.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/dedicated-worker-src-child-fallback.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-worker-src-default-fallback.sub.html b/tests/wpt/tests/content-security-policy/worker-src/dedicated-worker-src-default-fallback.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-worker-src-default-fallback.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/dedicated-worker-src-default-fallback.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-worker-src-script-fallback.sub.html b/tests/wpt/tests/content-security-policy/worker-src/dedicated-worker-src-script-fallback.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-worker-src-script-fallback.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/dedicated-worker-src-script-fallback.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-worker-src-self-fallback.sub.html b/tests/wpt/tests/content-security-policy/worker-src/dedicated-worker-src-self-fallback.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/dedicated-worker-src-self-fallback.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/dedicated-worker-src-self-fallback.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/service-child.https.sub.html b/tests/wpt/tests/content-security-policy/worker-src/service-child.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/service-child.https.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/service-child.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/service-fallback.https.sub.html b/tests/wpt/tests/content-security-policy/worker-src/service-fallback.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/service-fallback.https.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/service-fallback.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/service-list.https.sub.html b/tests/wpt/tests/content-security-policy/worker-src/service-list.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/service-list.https.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/service-list.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/service-none.https.sub.html b/tests/wpt/tests/content-security-policy/worker-src/service-none.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/service-none.https.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/service-none.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/service-self.https.sub.html b/tests/wpt/tests/content-security-policy/worker-src/service-self.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/service-self.https.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/service-self.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/service-worker-src-child-fallback-blocked.https.sub.html b/tests/wpt/tests/content-security-policy/worker-src/service-worker-src-child-fallback-blocked.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/service-worker-src-child-fallback-blocked.https.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/service-worker-src-child-fallback-blocked.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/service-worker-src-child-fallback.https.sub.html b/tests/wpt/tests/content-security-policy/worker-src/service-worker-src-child-fallback.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/service-worker-src-child-fallback.https.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/service-worker-src-child-fallback.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/service-worker-src-default-fallback.https.sub.html b/tests/wpt/tests/content-security-policy/worker-src/service-worker-src-default-fallback.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/service-worker-src-default-fallback.https.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/service-worker-src-default-fallback.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/service-worker-src-script-fallback.https.sub.html b/tests/wpt/tests/content-security-policy/worker-src/service-worker-src-script-fallback.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/service-worker-src-script-fallback.https.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/service-worker-src-script-fallback.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/service-worker-src-self-fallback.https.sub.html b/tests/wpt/tests/content-security-policy/worker-src/service-worker-src-self-fallback.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/service-worker-src-self-fallback.https.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/service-worker-src-self-fallback.https.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-child.sub.html b/tests/wpt/tests/content-security-policy/worker-src/shared-child.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-child.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/shared-child.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-fallback.sub.html b/tests/wpt/tests/content-security-policy/worker-src/shared-fallback.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-fallback.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/shared-fallback.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-list.sub.html b/tests/wpt/tests/content-security-policy/worker-src/shared-list.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-list.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/shared-list.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-none.sub.html b/tests/wpt/tests/content-security-policy/worker-src/shared-none.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-none.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/shared-none.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-self.sub.html b/tests/wpt/tests/content-security-policy/worker-src/shared-self.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-self.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/shared-self.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-worker-src-child-fallback-blocked.sub.html b/tests/wpt/tests/content-security-policy/worker-src/shared-worker-src-child-fallback-blocked.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-worker-src-child-fallback-blocked.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/shared-worker-src-child-fallback-blocked.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-worker-src-child-fallback.sub.html b/tests/wpt/tests/content-security-policy/worker-src/shared-worker-src-child-fallback.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-worker-src-child-fallback.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/shared-worker-src-child-fallback.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-worker-src-default-fallback.sub.html b/tests/wpt/tests/content-security-policy/worker-src/shared-worker-src-default-fallback.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-worker-src-default-fallback.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/shared-worker-src-default-fallback.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-worker-src-script-fallback.sub.html b/tests/wpt/tests/content-security-policy/worker-src/shared-worker-src-script-fallback.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-worker-src-script-fallback.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/shared-worker-src-script-fallback.sub.html diff --git a/tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-worker-src-self-fallback.sub.html b/tests/wpt/tests/content-security-policy/worker-src/shared-worker-src-self-fallback.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/content-security-policy/worker-src/shared-worker-src-self-fallback.sub.html rename to tests/wpt/tests/content-security-policy/worker-src/shared-worker-src-self-fallback.sub.html diff --git a/tests/wpt/web-platform-tests/contenteditable/META.yml b/tests/wpt/tests/contenteditable/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/contenteditable/META.yml rename to tests/wpt/tests/contenteditable/META.yml diff --git a/tests/wpt/web-platform-tests/contenteditable/plaintext-only.html b/tests/wpt/tests/contenteditable/plaintext-only.html similarity index 100% rename from tests/wpt/web-platform-tests/contenteditable/plaintext-only.html rename to tests/wpt/tests/contenteditable/plaintext-only.html diff --git a/tests/wpt/web-platform-tests/contenteditable/synthetic-height-ref.html b/tests/wpt/tests/contenteditable/synthetic-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/contenteditable/synthetic-height-ref.html rename to tests/wpt/tests/contenteditable/synthetic-height-ref.html diff --git a/tests/wpt/web-platform-tests/contenteditable/synthetic-height.tentative.html b/tests/wpt/tests/contenteditable/synthetic-height.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/contenteditable/synthetic-height.tentative.html rename to tests/wpt/tests/contenteditable/synthetic-height.tentative.html diff --git a/tests/wpt/web-platform-tests/cookie-store/META.yml b/tests/wpt/tests/cookie-store/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/META.yml rename to tests/wpt/tests/cookie-store/META.yml diff --git a/tests/wpt/web-platform-tests/cookie-store/README.md b/tests/wpt/tests/cookie-store/README.md similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/README.md rename to tests/wpt/tests/cookie-store/README.md diff --git a/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_document_cookie.https.window.js b/tests/wpt/tests/cookie-store/change_eventhandler_for_document_cookie.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_document_cookie.https.window.js rename to tests/wpt/tests/cookie-store/change_eventhandler_for_document_cookie.https.window.js diff --git a/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.https.window.js b/tests/wpt/tests/cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.https.window.js rename to tests/wpt/tests/cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.https.window.js diff --git a/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_and_no_value.https.window.js b/tests/wpt/tests/cookie-store/change_eventhandler_for_no_name_and_no_value.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_and_no_value.https.window.js rename to tests/wpt/tests/cookie-store/change_eventhandler_for_no_name_and_no_value.https.window.js diff --git a/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_equals_in_value.https.window.js b/tests/wpt/tests/cookie-store/change_eventhandler_for_no_name_equals_in_value.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_equals_in_value.https.window.js rename to tests/wpt/tests/cookie-store/change_eventhandler_for_no_name_equals_in_value.https.window.js diff --git a/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_multiple_values.https.window.js b/tests/wpt/tests/cookie-store/change_eventhandler_for_no_name_multiple_values.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_multiple_values.https.window.js rename to tests/wpt/tests/cookie-store/change_eventhandler_for_no_name_multiple_values.https.window.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieListItem_attributes.https.any.js b/tests/wpt/tests/cookie-store/cookieListItem_attributes.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieListItem_attributes.https.any.js rename to tests/wpt/tests/cookie-store/cookieListItem_attributes.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStoreManager_getSubscriptions_empty.https.any.js b/tests/wpt/tests/cookie-store/cookieStoreManager_getSubscriptions_empty.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStoreManager_getSubscriptions_empty.https.any.js rename to tests/wpt/tests/cookie-store/cookieStoreManager_getSubscriptions_empty.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStoreManager_getSubscriptions_multiple.https.any.js b/tests/wpt/tests/cookie-store/cookieStoreManager_getSubscriptions_multiple.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStoreManager_getSubscriptions_multiple.https.any.js rename to tests/wpt/tests/cookie-store/cookieStoreManager_getSubscriptions_multiple.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStoreManager_getSubscriptions_single.https.any.js b/tests/wpt/tests/cookie-store/cookieStoreManager_getSubscriptions_single.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStoreManager_getSubscriptions_single.https.any.js rename to tests/wpt/tests/cookie-store/cookieStoreManager_getSubscriptions_single.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_arguments.https.any.js b/tests/wpt/tests/cookie-store/cookieStore_delete_arguments.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_arguments.https.any.js rename to tests/wpt/tests/cookie-store/cookieStore_delete_arguments.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_basic.https.any.js b/tests/wpt/tests/cookie-store/cookieStore_delete_basic.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_basic.https.any.js rename to tests/wpt/tests/cookie-store/cookieStore_delete_basic.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_arguments.https.window.js b/tests/wpt/tests/cookie-store/cookieStore_event_arguments.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_event_arguments.https.window.js rename to tests/wpt/tests/cookie-store/cookieStore_event_arguments.https.window.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_basic.https.window.js b/tests/wpt/tests/cookie-store/cookieStore_event_basic.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_event_basic.https.window.js rename to tests/wpt/tests/cookie-store/cookieStore_event_basic.https.window.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_delete.https.window.js b/tests/wpt/tests/cookie-store/cookieStore_event_delete.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_event_delete.https.window.js rename to tests/wpt/tests/cookie-store/cookieStore_event_delete.https.window.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_overwrite.https.window.js b/tests/wpt/tests/cookie-store/cookieStore_event_overwrite.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_event_overwrite.https.window.js rename to tests/wpt/tests/cookie-store/cookieStore_event_overwrite.https.window.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_arguments.https.any.js b/tests/wpt/tests/cookie-store/cookieStore_getAll_arguments.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_arguments.https.any.js rename to tests/wpt/tests/cookie-store/cookieStore_getAll_arguments.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_multiple.https.any.js b/tests/wpt/tests/cookie-store/cookieStore_getAll_multiple.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_multiple.https.any.js rename to tests/wpt/tests/cookie-store/cookieStore_getAll_multiple.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_set_basic.https.any.js b/tests/wpt/tests/cookie-store/cookieStore_getAll_set_basic.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_set_basic.https.any.js rename to tests/wpt/tests/cookie-store/cookieStore_getAll_set_basic.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_arguments.https.any.js b/tests/wpt/tests/cookie-store/cookieStore_get_arguments.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_get_arguments.https.any.js rename to tests/wpt/tests/cookie-store/cookieStore_get_arguments.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_delete_basic.https.any.js b/tests/wpt/tests/cookie-store/cookieStore_get_delete_basic.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_get_delete_basic.https.any.js rename to tests/wpt/tests/cookie-store/cookieStore_get_delete_basic.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_across_frames.https.html b/tests/wpt/tests/cookie-store/cookieStore_get_set_across_frames.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_across_frames.https.html rename to tests/wpt/tests/cookie-store/cookieStore_get_set_across_frames.https.html diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_across_origins.sub.https.html b/tests/wpt/tests/cookie-store/cookieStore_get_set_across_origins.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_across_origins.sub.https.html rename to tests/wpt/tests/cookie-store/cookieStore_get_set_across_origins.sub.https.html diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_basic.https.any.js b/tests/wpt/tests/cookie-store/cookieStore_get_set_basic.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_basic.https.any.js rename to tests/wpt/tests/cookie-store/cookieStore_get_set_basic.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_ordering.https.any.js b/tests/wpt/tests/cookie-store/cookieStore_get_set_ordering.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_ordering.https.any.js rename to tests/wpt/tests/cookie-store/cookieStore_get_set_ordering.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_in_detached_frame.https.html b/tests/wpt/tests/cookie-store/cookieStore_in_detached_frame.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_in_detached_frame.https.html rename to tests/wpt/tests/cookie-store/cookieStore_in_detached_frame.https.html diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_opaque_origin.https.html b/tests/wpt/tests/cookie-store/cookieStore_opaque_origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_opaque_origin.https.html rename to tests/wpt/tests/cookie-store/cookieStore_opaque_origin.https.html diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_set_arguments.https.any.js b/tests/wpt/tests/cookie-store/cookieStore_set_arguments.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_set_arguments.https.any.js rename to tests/wpt/tests/cookie-store/cookieStore_set_arguments.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_special_names.https.any.js b/tests/wpt/tests/cookie-store/cookieStore_special_names.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_special_names.https.any.js rename to tests/wpt/tests/cookie-store/cookieStore_special_names.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_subscribe_arguments.https.any.js b/tests/wpt/tests/cookie-store/cookieStore_subscribe_arguments.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_subscribe_arguments.https.any.js rename to tests/wpt/tests/cookie-store/cookieStore_subscribe_arguments.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_subscriptions_empty.https.window.js b/tests/wpt/tests/cookie-store/cookieStore_subscriptions_empty.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_subscriptions_empty.https.window.js rename to tests/wpt/tests/cookie-store/cookieStore_subscriptions_empty.https.window.js diff --git a/tests/wpt/web-platform-tests/cookie-store/encoding.https.any.js b/tests/wpt/tests/cookie-store/encoding.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/encoding.https.any.js rename to tests/wpt/tests/cookie-store/encoding.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/httponly_cookies.https.window.js b/tests/wpt/tests/cookie-store/httponly_cookies.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/httponly_cookies.https.window.js rename to tests/wpt/tests/cookie-store/httponly_cookies.https.window.js diff --git a/tests/wpt/web-platform-tests/cookie-store/idlharness.tentative.https.any.js b/tests/wpt/tests/cookie-store/idlharness.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/idlharness.tentative.https.any.js rename to tests/wpt/tests/cookie-store/idlharness.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/resources/always_changing_sw.sub.js b/tests/wpt/tests/cookie-store/resources/always_changing_sw.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/resources/always_changing_sw.sub.js rename to tests/wpt/tests/cookie-store/resources/always_changing_sw.sub.js diff --git a/tests/wpt/web-platform-tests/cookie-store/resources/cookie-test-helpers.js b/tests/wpt/tests/cookie-store/resources/cookie-test-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/resources/cookie-test-helpers.js rename to tests/wpt/tests/cookie-store/resources/cookie-test-helpers.js diff --git a/tests/wpt/web-platform-tests/cookie-store/resources/cookie_helper.py b/tests/wpt/tests/cookie-store/resources/cookie_helper.py similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/resources/cookie_helper.py rename to tests/wpt/tests/cookie-store/resources/cookie_helper.py diff --git a/tests/wpt/web-platform-tests/cookie-store/resources/empty_sw.js b/tests/wpt/tests/cookie-store/resources/empty_sw.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/resources/empty_sw.js rename to tests/wpt/tests/cookie-store/resources/empty_sw.js diff --git a/tests/wpt/web-platform-tests/cookie-store/resources/helper_iframe.sub.html b/tests/wpt/tests/cookie-store/resources/helper_iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/resources/helper_iframe.sub.html rename to tests/wpt/tests/cookie-store/resources/helper_iframe.sub.html diff --git a/tests/wpt/web-platform-tests/cookie-store/resources/helpers.js b/tests/wpt/tests/cookie-store/resources/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/resources/helpers.js rename to tests/wpt/tests/cookie-store/resources/helpers.js diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_cross_origin.https.sub.html b/tests/wpt/tests/cookie-store/serviceworker_cookieStore_cross_origin.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_cross_origin.https.sub.html rename to tests/wpt/tests/cookie-store/serviceworker_cookieStore_cross_origin.https.sub.html diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_cross_origin.js b/tests/wpt/tests/cookie-store/serviceworker_cookieStore_cross_origin.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_cross_origin.js rename to tests/wpt/tests/cookie-store/serviceworker_cookieStore_cross_origin.js diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions_reset.https.html b/tests/wpt/tests/cookie-store/serviceworker_cookieStore_subscriptions_reset.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions_reset.https.html rename to tests/wpt/tests/cookie-store/serviceworker_cookieStore_subscriptions_reset.https.html diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_mismatched_subscription.https.any.js b/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_mismatched_subscription.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_mismatched_subscription.https.any.js rename to tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_mismatched_subscription.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_multiple_subscriptions.https.any.js b/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_multiple_subscriptions.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_multiple_subscriptions.https.any.js rename to tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_multiple_subscriptions.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_overlapping_subscriptions.https.any.js b/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_overlapping_subscriptions.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_overlapping_subscriptions.https.any.js rename to tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_overlapping_subscriptions.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_single_subscription.https.any.js b/tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_single_subscription.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_single_subscription.https.any.js rename to tests/wpt/tests/cookie-store/serviceworker_cookiechange_eventhandler_single_subscription.https.any.js diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_oncookiechange_eventhandler_single_subscription.https.any.js b/tests/wpt/tests/cookie-store/serviceworker_oncookiechange_eventhandler_single_subscription.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cookie-store/serviceworker_oncookiechange_eventhandler_single_subscription.https.any.js rename to tests/wpt/tests/cookie-store/serviceworker_oncookiechange_eventhandler_single_subscription.https.any.js diff --git a/tests/wpt/web-platform-tests/cookies/META.yml b/tests/wpt/tests/cookies/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/cookies/META.yml rename to tests/wpt/tests/cookies/META.yml diff --git a/tests/wpt/web-platform-tests/cookies/README.md b/tests/wpt/tests/cookies/README.md similarity index 100% rename from tests/wpt/web-platform-tests/cookies/README.md rename to tests/wpt/tests/cookies/README.md diff --git a/tests/wpt/web-platform-tests/cookies/__init__.py b/tests/wpt/tests/cookies/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/__init__.py rename to tests/wpt/tests/cookies/__init__.py diff --git a/tests/wpt/web-platform-tests/cookies/attributes/attributes-ctl.sub.html b/tests/wpt/tests/cookies/attributes/attributes-ctl.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/attributes-ctl.sub.html rename to tests/wpt/tests/cookies/attributes/attributes-ctl.sub.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/domain.sub.html b/tests/wpt/tests/cookies/attributes/domain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/domain.sub.html rename to tests/wpt/tests/cookies/attributes/domain.sub.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/expires.html b/tests/wpt/tests/cookies/attributes/expires.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/expires.html rename to tests/wpt/tests/cookies/attributes/expires.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/invalid.html b/tests/wpt/tests/cookies/attributes/invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/invalid.html rename to tests/wpt/tests/cookies/attributes/invalid.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/max-age.html b/tests/wpt/tests/cookies/attributes/max-age.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/max-age.html rename to tests/wpt/tests/cookies/attributes/max-age.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/path-redirect.html b/tests/wpt/tests/cookies/attributes/path-redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/path-redirect.html rename to tests/wpt/tests/cookies/attributes/path-redirect.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/path.html b/tests/wpt/tests/cookies/attributes/path.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/path.html rename to tests/wpt/tests/cookies/attributes/path.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/resources/domain-child.sub.html b/tests/wpt/tests/cookies/attributes/resources/domain-child.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/resources/domain-child.sub.html rename to tests/wpt/tests/cookies/attributes/resources/domain-child.sub.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/resources/path-redirect-shared.js b/tests/wpt/tests/cookies/attributes/resources/path-redirect-shared.js similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/resources/path-redirect-shared.js rename to tests/wpt/tests/cookies/attributes/resources/path-redirect-shared.js diff --git a/tests/wpt/web-platform-tests/cookies/attributes/resources/path.html b/tests/wpt/tests/cookies/attributes/resources/path.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/resources/path.html rename to tests/wpt/tests/cookies/attributes/resources/path.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/resources/path.html.headers b/tests/wpt/tests/cookies/attributes/resources/path.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/resources/path.html.headers rename to tests/wpt/tests/cookies/attributes/resources/path.html.headers diff --git a/tests/wpt/web-platform-tests/cookies/attributes/resources/path/one.html b/tests/wpt/tests/cookies/attributes/resources/path/one.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/resources/path/one.html rename to tests/wpt/tests/cookies/attributes/resources/path/one.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/resources/path/three.html b/tests/wpt/tests/cookies/attributes/resources/path/three.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/resources/path/three.html rename to tests/wpt/tests/cookies/attributes/resources/path/three.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/resources/path/two.html b/tests/wpt/tests/cookies/attributes/resources/path/two.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/resources/path/two.html rename to tests/wpt/tests/cookies/attributes/resources/path/two.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/resources/pathfakeout.html b/tests/wpt/tests/cookies/attributes/resources/pathfakeout.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/resources/pathfakeout.html rename to tests/wpt/tests/cookies/attributes/resources/pathfakeout.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/resources/pathfakeout/one.html b/tests/wpt/tests/cookies/attributes/resources/pathfakeout/one.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/resources/pathfakeout/one.html rename to tests/wpt/tests/cookies/attributes/resources/pathfakeout/one.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/resources/secure-non-secure-child.html b/tests/wpt/tests/cookies/attributes/resources/secure-non-secure-child.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/resources/secure-non-secure-child.html rename to tests/wpt/tests/cookies/attributes/resources/secure-non-secure-child.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/secure-non-secure.html b/tests/wpt/tests/cookies/attributes/secure-non-secure.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/secure-non-secure.html rename to tests/wpt/tests/cookies/attributes/secure-non-secure.html diff --git a/tests/wpt/web-platform-tests/cookies/attributes/secure.https.html b/tests/wpt/tests/cookies/attributes/secure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/attributes/secure.https.html rename to tests/wpt/tests/cookies/attributes/secure.https.html diff --git a/tests/wpt/web-platform-tests/cookies/cookie-enabled-noncookie-frame.html b/tests/wpt/tests/cookies/cookie-enabled-noncookie-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/cookie-enabled-noncookie-frame.html rename to tests/wpt/tests/cookies/cookie-enabled-noncookie-frame.html diff --git a/tests/wpt/web-platform-tests/cookies/domain/domain-attribute-host-with-and-without-leading-period.sub.https.html b/tests/wpt/tests/cookies/domain/domain-attribute-host-with-and-without-leading-period.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/domain/domain-attribute-host-with-and-without-leading-period.sub.https.html rename to tests/wpt/tests/cookies/domain/domain-attribute-host-with-and-without-leading-period.sub.https.html diff --git a/tests/wpt/web-platform-tests/cookies/domain/domain-attribute-host-with-and-without-leading-period.sub.https.html.sub.headers b/tests/wpt/tests/cookies/domain/domain-attribute-host-with-and-without-leading-period.sub.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/cookies/domain/domain-attribute-host-with-and-without-leading-period.sub.https.html.sub.headers rename to tests/wpt/tests/cookies/domain/domain-attribute-host-with-and-without-leading-period.sub.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/cookies/domain/domain-attribute-host-with-leading-period.sub.https.html b/tests/wpt/tests/cookies/domain/domain-attribute-host-with-leading-period.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/domain/domain-attribute-host-with-leading-period.sub.https.html rename to tests/wpt/tests/cookies/domain/domain-attribute-host-with-leading-period.sub.https.html diff --git a/tests/wpt/web-platform-tests/cookies/domain/domain-attribute-host-with-leading-period.sub.https.html.sub.headers b/tests/wpt/tests/cookies/domain/domain-attribute-host-with-leading-period.sub.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/cookies/domain/domain-attribute-host-with-leading-period.sub.https.html.sub.headers rename to tests/wpt/tests/cookies/domain/domain-attribute-host-with-leading-period.sub.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/cookies/domain/domain-attribute-idn-host.sub.https.html b/tests/wpt/tests/cookies/domain/domain-attribute-idn-host.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/domain/domain-attribute-idn-host.sub.https.html rename to tests/wpt/tests/cookies/domain/domain-attribute-idn-host.sub.https.html diff --git a/tests/wpt/web-platform-tests/cookies/domain/domain-attribute-matches-host.sub.https.html b/tests/wpt/tests/cookies/domain/domain-attribute-matches-host.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/domain/domain-attribute-matches-host.sub.https.html rename to tests/wpt/tests/cookies/domain/domain-attribute-matches-host.sub.https.html diff --git a/tests/wpt/web-platform-tests/cookies/domain/domain-attribute-matches-host.sub.https.html.sub.headers b/tests/wpt/tests/cookies/domain/domain-attribute-matches-host.sub.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/cookies/domain/domain-attribute-matches-host.sub.https.html.sub.headers rename to tests/wpt/tests/cookies/domain/domain-attribute-matches-host.sub.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/cookies/domain/domain-attribute-missing.sub.html b/tests/wpt/tests/cookies/domain/domain-attribute-missing.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/domain/domain-attribute-missing.sub.html rename to tests/wpt/tests/cookies/domain/domain-attribute-missing.sub.html diff --git a/tests/wpt/web-platform-tests/cookies/domain/domain-attribute-missing.sub.html.headers b/tests/wpt/tests/cookies/domain/domain-attribute-missing.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/cookies/domain/domain-attribute-missing.sub.html.headers rename to tests/wpt/tests/cookies/domain/domain-attribute-missing.sub.html.headers diff --git a/tests/wpt/web-platform-tests/cookies/domain/support/idn-child.sub.https.html b/tests/wpt/tests/cookies/domain/support/idn-child.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/domain/support/idn-child.sub.https.html rename to tests/wpt/tests/cookies/domain/support/idn-child.sub.https.html diff --git a/tests/wpt/web-platform-tests/cookies/domain/support/idn.py b/tests/wpt/tests/cookies/domain/support/idn.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/domain/support/idn.py rename to tests/wpt/tests/cookies/domain/support/idn.py diff --git a/tests/wpt/web-platform-tests/cookies/encoding/charset.html b/tests/wpt/tests/cookies/encoding/charset.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/encoding/charset.html rename to tests/wpt/tests/cookies/encoding/charset.html diff --git a/tests/wpt/web-platform-tests/cookies/meta-blocked.html b/tests/wpt/tests/cookies/meta-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/meta-blocked.html rename to tests/wpt/tests/cookies/meta-blocked.html diff --git a/tests/wpt/web-platform-tests/cookies/name/name-ctl.html b/tests/wpt/tests/cookies/name/name-ctl.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/name/name-ctl.html rename to tests/wpt/tests/cookies/name/name-ctl.html diff --git a/tests/wpt/web-platform-tests/cookies/name/name.html b/tests/wpt/tests/cookies/name/name.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/name/name.html rename to tests/wpt/tests/cookies/name/name.html diff --git a/tests/wpt/web-platform-tests/cookies/navigated-away.html b/tests/wpt/tests/cookies/navigated-away.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/navigated-away.html rename to tests/wpt/tests/cookies/navigated-away.html diff --git a/tests/wpt/web-platform-tests/cookies/ordering/ordering.sub.html b/tests/wpt/tests/cookies/ordering/ordering.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/ordering/ordering.sub.html rename to tests/wpt/tests/cookies/ordering/ordering.sub.html diff --git a/tests/wpt/web-platform-tests/cookies/ordering/resources/ordering-child.sub.html b/tests/wpt/tests/cookies/ordering/resources/ordering-child.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/ordering/resources/ordering-child.sub.html rename to tests/wpt/tests/cookies/ordering/resources/ordering-child.sub.html diff --git a/tests/wpt/web-platform-tests/cookies/partitioned-cookies/partitioned-cookies.tentative.https.html b/tests/wpt/tests/cookies/partitioned-cookies/partitioned-cookies.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/partitioned-cookies/partitioned-cookies.tentative.https.html rename to tests/wpt/tests/cookies/partitioned-cookies/partitioned-cookies.tentative.https.html diff --git a/tests/wpt/web-platform-tests/cookies/partitioned-cookies/resources/partitioned-cookies-cross-site-embed.html b/tests/wpt/tests/cookies/partitioned-cookies/resources/partitioned-cookies-cross-site-embed.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/partitioned-cookies/resources/partitioned-cookies-cross-site-embed.html rename to tests/wpt/tests/cookies/partitioned-cookies/resources/partitioned-cookies-cross-site-embed.html diff --git a/tests/wpt/web-platform-tests/cookies/partitioned-cookies/resources/partitioned-cookies-cross-site-window.html b/tests/wpt/tests/cookies/partitioned-cookies/resources/partitioned-cookies-cross-site-window.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/partitioned-cookies/resources/partitioned-cookies-cross-site-window.html rename to tests/wpt/tests/cookies/partitioned-cookies/resources/partitioned-cookies-cross-site-window.html diff --git a/tests/wpt/web-platform-tests/cookies/partitioned-cookies/resources/test-helpers.js b/tests/wpt/tests/cookies/partitioned-cookies/resources/test-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/cookies/partitioned-cookies/resources/test-helpers.js rename to tests/wpt/tests/cookies/partitioned-cookies/resources/test-helpers.js diff --git a/tests/wpt/web-platform-tests/cookies/path/default.html b/tests/wpt/tests/cookies/path/default.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/path/default.html rename to tests/wpt/tests/cookies/path/default.html diff --git a/tests/wpt/web-platform-tests/cookies/path/match.html b/tests/wpt/tests/cookies/path/match.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/path/match.html rename to tests/wpt/tests/cookies/path/match.html diff --git a/tests/wpt/web-platform-tests/cookies/prefix/__host.document-cookie.html b/tests/wpt/tests/cookies/prefix/__host.document-cookie.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/prefix/__host.document-cookie.html rename to tests/wpt/tests/cookies/prefix/__host.document-cookie.html diff --git a/tests/wpt/web-platform-tests/cookies/prefix/__host.document-cookie.https.html b/tests/wpt/tests/cookies/prefix/__host.document-cookie.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/prefix/__host.document-cookie.https.html rename to tests/wpt/tests/cookies/prefix/__host.document-cookie.https.html diff --git a/tests/wpt/web-platform-tests/cookies/prefix/__host.header.html b/tests/wpt/tests/cookies/prefix/__host.header.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/prefix/__host.header.html rename to tests/wpt/tests/cookies/prefix/__host.header.html diff --git a/tests/wpt/web-platform-tests/cookies/prefix/__host.header.https.html b/tests/wpt/tests/cookies/prefix/__host.header.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/prefix/__host.header.https.html rename to tests/wpt/tests/cookies/prefix/__host.header.https.html diff --git a/tests/wpt/web-platform-tests/cookies/prefix/__secure.document-cookie.html b/tests/wpt/tests/cookies/prefix/__secure.document-cookie.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/prefix/__secure.document-cookie.html rename to tests/wpt/tests/cookies/prefix/__secure.document-cookie.html diff --git a/tests/wpt/web-platform-tests/cookies/prefix/__secure.document-cookie.https.html b/tests/wpt/tests/cookies/prefix/__secure.document-cookie.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/prefix/__secure.document-cookie.https.html rename to tests/wpt/tests/cookies/prefix/__secure.document-cookie.https.html diff --git a/tests/wpt/web-platform-tests/cookies/prefix/__secure.header.html b/tests/wpt/tests/cookies/prefix/__secure.header.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/prefix/__secure.header.html rename to tests/wpt/tests/cookies/prefix/__secure.header.html diff --git a/tests/wpt/web-platform-tests/cookies/prefix/__secure.header.https.html b/tests/wpt/tests/cookies/prefix/__secure.header.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/prefix/__secure.header.https.html rename to tests/wpt/tests/cookies/prefix/__secure.header.https.html diff --git a/tests/wpt/web-platform-tests/cookies/prefix/document-cookie.non-secure.html b/tests/wpt/tests/cookies/prefix/document-cookie.non-secure.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/prefix/document-cookie.non-secure.html rename to tests/wpt/tests/cookies/prefix/document-cookie.non-secure.html diff --git a/tests/wpt/web-platform-tests/cookies/resources/__init__.py b/tests/wpt/tests/cookies/resources/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/__init__.py rename to tests/wpt/tests/cookies/resources/__init__.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/cookie-helper.sub.js b/tests/wpt/tests/cookies/resources/cookie-helper.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/cookie-helper.sub.js rename to tests/wpt/tests/cookies/resources/cookie-helper.sub.js diff --git a/tests/wpt/web-platform-tests/cookies/resources/cookie-test.js b/tests/wpt/tests/cookies/resources/cookie-test.js similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/cookie-test.js rename to tests/wpt/tests/cookies/resources/cookie-test.js diff --git a/tests/wpt/web-platform-tests/cookies/resources/cookie.py b/tests/wpt/tests/cookies/resources/cookie.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/cookie.py rename to tests/wpt/tests/cookies/resources/cookie.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/drop.py b/tests/wpt/tests/cookies/resources/drop.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/drop.py rename to tests/wpt/tests/cookies/resources/drop.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/dropSameSite.py b/tests/wpt/tests/cookies/resources/dropSameSite.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/dropSameSite.py rename to tests/wpt/tests/cookies/resources/dropSameSite.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/dropSameSiteMultiAttribute.py b/tests/wpt/tests/cookies/resources/dropSameSiteMultiAttribute.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/dropSameSiteMultiAttribute.py rename to tests/wpt/tests/cookies/resources/dropSameSiteMultiAttribute.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/dropSameSiteNone.py b/tests/wpt/tests/cookies/resources/dropSameSiteNone.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/dropSameSiteNone.py rename to tests/wpt/tests/cookies/resources/dropSameSiteNone.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/dropSecure.py b/tests/wpt/tests/cookies/resources/dropSecure.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/dropSecure.py rename to tests/wpt/tests/cookies/resources/dropSecure.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/echo-cookie.html b/tests/wpt/tests/cookies/resources/echo-cookie.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/echo-cookie.html rename to tests/wpt/tests/cookies/resources/echo-cookie.html diff --git a/tests/wpt/web-platform-tests/cookies/resources/echo-json.py b/tests/wpt/tests/cookies/resources/echo-json.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/echo-json.py rename to tests/wpt/tests/cookies/resources/echo-json.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/helpers.py b/tests/wpt/tests/cookies/resources/helpers.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/helpers.py rename to tests/wpt/tests/cookies/resources/helpers.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/imgIfMatch.py b/tests/wpt/tests/cookies/resources/imgIfMatch.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/imgIfMatch.py rename to tests/wpt/tests/cookies/resources/imgIfMatch.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/list-cookies-for-script.py b/tests/wpt/tests/cookies/resources/list-cookies-for-script.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/list-cookies-for-script.py rename to tests/wpt/tests/cookies/resources/list-cookies-for-script.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/list.py b/tests/wpt/tests/cookies/resources/list.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/list.py rename to tests/wpt/tests/cookies/resources/list.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/navigate.html b/tests/wpt/tests/cookies/resources/navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/navigate.html rename to tests/wpt/tests/cookies/resources/navigate.html diff --git a/tests/wpt/web-platform-tests/cookies/resources/postToParent.py b/tests/wpt/tests/cookies/resources/postToParent.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/postToParent.py rename to tests/wpt/tests/cookies/resources/postToParent.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/redirectWithCORSHeaders.py b/tests/wpt/tests/cookies/resources/redirectWithCORSHeaders.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/redirectWithCORSHeaders.py rename to tests/wpt/tests/cookies/resources/redirectWithCORSHeaders.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/set-cookie.py b/tests/wpt/tests/cookies/resources/set-cookie.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/set-cookie.py rename to tests/wpt/tests/cookies/resources/set-cookie.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/set.py b/tests/wpt/tests/cookies/resources/set.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/set.py rename to tests/wpt/tests/cookies/resources/set.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/setSameSite.py b/tests/wpt/tests/cookies/resources/setSameSite.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/setSameSite.py rename to tests/wpt/tests/cookies/resources/setSameSite.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/setSameSiteDomain.py b/tests/wpt/tests/cookies/resources/setSameSiteDomain.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/setSameSiteDomain.py rename to tests/wpt/tests/cookies/resources/setSameSiteDomain.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/setSameSiteMultiAttribute.py b/tests/wpt/tests/cookies/resources/setSameSiteMultiAttribute.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/setSameSiteMultiAttribute.py rename to tests/wpt/tests/cookies/resources/setSameSiteMultiAttribute.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/setSameSiteNone.py b/tests/wpt/tests/cookies/resources/setSameSiteNone.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/setSameSiteNone.py rename to tests/wpt/tests/cookies/resources/setSameSiteNone.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/setSecure.py b/tests/wpt/tests/cookies/resources/setSecure.py similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/setSecure.py rename to tests/wpt/tests/cookies/resources/setSecure.py diff --git a/tests/wpt/web-platform-tests/cookies/resources/testharness-helpers.js b/tests/wpt/tests/cookies/resources/testharness-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/cookies/resources/testharness-helpers.js rename to tests/wpt/tests/cookies/resources/testharness-helpers.js diff --git a/tests/wpt/web-platform-tests/cookies/samesite-none-secure/cookies-without-samesite-must-be-secure.https.html b/tests/wpt/tests/cookies/samesite-none-secure/cookies-without-samesite-must-be-secure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite-none-secure/cookies-without-samesite-must-be-secure.https.html rename to tests/wpt/tests/cookies/samesite-none-secure/cookies-without-samesite-must-be-secure.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/about-blank-nested.https.html b/tests/wpt/tests/cookies/samesite/about-blank-nested.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/about-blank-nested.https.html rename to tests/wpt/tests/cookies/samesite/about-blank-nested.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/about-blank-subresource.https.html b/tests/wpt/tests/cookies/samesite/about-blank-subresource.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/about-blank-subresource.https.html rename to tests/wpt/tests/cookies/samesite/about-blank-subresource.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/about-blank-toplevel.https.html b/tests/wpt/tests/cookies/samesite/about-blank-toplevel.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/about-blank-toplevel.https.html rename to tests/wpt/tests/cookies/samesite/about-blank-toplevel.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/fetch.https.html b/tests/wpt/tests/cookies/samesite/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/fetch.https.html rename to tests/wpt/tests/cookies/samesite/fetch.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank-reload.https.html b/tests/wpt/tests/cookies/samesite/form-get-blank-reload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/form-get-blank-reload.https.html rename to tests/wpt/tests/cookies/samesite/form-get-blank-reload.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank.https.html b/tests/wpt/tests/cookies/samesite/form-get-blank.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/form-get-blank.https.html rename to tests/wpt/tests/cookies/samesite/form-get-blank.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank-reload.https.html b/tests/wpt/tests/cookies/samesite/form-post-blank-reload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/form-post-blank-reload.https.html rename to tests/wpt/tests/cookies/samesite/form-post-blank-reload.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank.https.html b/tests/wpt/tests/cookies/samesite/form-post-blank.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/form-post-blank.https.html rename to tests/wpt/tests/cookies/samesite/form-post-blank.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/get_all_cookies-default-samesite.html b/tests/wpt/tests/cookies/samesite/get_all_cookies-default-samesite.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/get_all_cookies-default-samesite.html rename to tests/wpt/tests/cookies/samesite/get_all_cookies-default-samesite.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/get_named_cookie-default-samesite.html b/tests/wpt/tests/cookies/samesite/get_named_cookie-default-samesite.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/get_named_cookie-default-samesite.html rename to tests/wpt/tests/cookies/samesite/get_named_cookie-default-samesite.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/iframe-reload.https.html b/tests/wpt/tests/cookies/samesite/iframe-reload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/iframe-reload.https.html rename to tests/wpt/tests/cookies/samesite/iframe-reload.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/iframe.document.https.html b/tests/wpt/tests/cookies/samesite/iframe.document.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/iframe.document.https.html rename to tests/wpt/tests/cookies/samesite/iframe.document.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/iframe.https.html b/tests/wpt/tests/cookies/samesite/iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/iframe.https.html rename to tests/wpt/tests/cookies/samesite/iframe.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/img.https.html b/tests/wpt/tests/cookies/samesite/img.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/img.https.html rename to tests/wpt/tests/cookies/samesite/img.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/multiple-samesite-attributes.https.html b/tests/wpt/tests/cookies/samesite/multiple-samesite-attributes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/multiple-samesite-attributes.https.html rename to tests/wpt/tests/cookies/samesite/multiple-samesite-attributes.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/resources/echo-cookies.html b/tests/wpt/tests/cookies/samesite/resources/echo-cookies.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/resources/echo-cookies.html rename to tests/wpt/tests/cookies/samesite/resources/echo-cookies.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/resources/iframe-navigate-report.html b/tests/wpt/tests/cookies/samesite/resources/iframe-navigate-report.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/resources/iframe-navigate-report.html rename to tests/wpt/tests/cookies/samesite/resources/iframe-navigate-report.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/resources/iframe-subresource-report.html b/tests/wpt/tests/cookies/samesite/resources/iframe-subresource-report.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/resources/iframe-subresource-report.html rename to tests/wpt/tests/cookies/samesite/resources/iframe-subresource-report.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/resources/iframe.document.html b/tests/wpt/tests/cookies/samesite/resources/iframe.document.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/resources/iframe.document.html rename to tests/wpt/tests/cookies/samesite/resources/iframe.document.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/resources/navigate-iframe.html b/tests/wpt/tests/cookies/samesite/resources/navigate-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/resources/navigate-iframe.html rename to tests/wpt/tests/cookies/samesite/resources/navigate-iframe.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/resources/navigate.html b/tests/wpt/tests/cookies/samesite/resources/navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/resources/navigate.html rename to tests/wpt/tests/cookies/samesite/resources/navigate.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/resources/puppet.html b/tests/wpt/tests/cookies/samesite/resources/puppet.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/resources/puppet.html rename to tests/wpt/tests/cookies/samesite/resources/puppet.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/sandbox-iframe-nested.https.html b/tests/wpt/tests/cookies/samesite/sandbox-iframe-nested.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/sandbox-iframe-nested.https.html rename to tests/wpt/tests/cookies/samesite/sandbox-iframe-nested.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/sandbox-iframe-subresource.https.html b/tests/wpt/tests/cookies/samesite/sandbox-iframe-subresource.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/sandbox-iframe-subresource.https.html rename to tests/wpt/tests/cookies/samesite/sandbox-iframe-subresource.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/setcookie-lax.https.html b/tests/wpt/tests/cookies/samesite/setcookie-lax.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/setcookie-lax.https.html rename to tests/wpt/tests/cookies/samesite/setcookie-lax.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/setcookie-navigation.https.html b/tests/wpt/tests/cookies/samesite/setcookie-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/setcookie-navigation.https.html rename to tests/wpt/tests/cookies/samesite/setcookie-navigation.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/window-open-reload.https.html b/tests/wpt/tests/cookies/samesite/window-open-reload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/window-open-reload.https.html rename to tests/wpt/tests/cookies/samesite/window-open-reload.https.html diff --git a/tests/wpt/web-platform-tests/cookies/samesite/window-open.https.html b/tests/wpt/tests/cookies/samesite/window-open.https.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/samesite/window-open.https.html rename to tests/wpt/tests/cookies/samesite/window-open.https.html diff --git a/tests/wpt/web-platform-tests/cookies/schemeful-same-site/resources/navigateToInsecurePostToParent.html b/tests/wpt/tests/cookies/schemeful-same-site/resources/navigateToInsecurePostToParent.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/schemeful-same-site/resources/navigateToInsecurePostToParent.html rename to tests/wpt/tests/cookies/schemeful-same-site/resources/navigateToInsecurePostToParent.html diff --git a/tests/wpt/web-platform-tests/cookies/schemeful-same-site/schemeful-iframe-subresource.tentative.html b/tests/wpt/tests/cookies/schemeful-same-site/schemeful-iframe-subresource.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/schemeful-same-site/schemeful-iframe-subresource.tentative.html rename to tests/wpt/tests/cookies/schemeful-same-site/schemeful-iframe-subresource.tentative.html diff --git a/tests/wpt/web-platform-tests/cookies/schemeful-same-site/schemeful-navigation.tentative.html b/tests/wpt/tests/cookies/schemeful-same-site/schemeful-navigation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/schemeful-same-site/schemeful-navigation.tentative.html rename to tests/wpt/tests/cookies/schemeful-same-site/schemeful-navigation.tentative.html diff --git a/tests/wpt/web-platform-tests/cookies/schemeful-same-site/schemeful-subresource.tentative.html b/tests/wpt/tests/cookies/schemeful-same-site/schemeful-subresource.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/schemeful-same-site/schemeful-subresource.tentative.html rename to tests/wpt/tests/cookies/schemeful-same-site/schemeful-subresource.tentative.html diff --git a/tests/wpt/web-platform-tests/cookies/schemeful-same-site/schemeful-websockets.sub.tentative.html b/tests/wpt/tests/cookies/schemeful-same-site/schemeful-websockets.sub.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/schemeful-same-site/schemeful-websockets.sub.tentative.html rename to tests/wpt/tests/cookies/schemeful-same-site/schemeful-websockets.sub.tentative.html diff --git a/tests/wpt/web-platform-tests/cookies/secure/set-from-dom.https.sub.html b/tests/wpt/tests/cookies/secure/set-from-dom.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/secure/set-from-dom.https.sub.html rename to tests/wpt/tests/cookies/secure/set-from-dom.https.sub.html diff --git a/tests/wpt/web-platform-tests/cookies/secure/set-from-dom.sub.html b/tests/wpt/tests/cookies/secure/set-from-dom.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/secure/set-from-dom.sub.html rename to tests/wpt/tests/cookies/secure/set-from-dom.sub.html diff --git a/tests/wpt/web-platform-tests/cookies/secure/set-from-http.https.sub.html b/tests/wpt/tests/cookies/secure/set-from-http.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/secure/set-from-http.https.sub.html rename to tests/wpt/tests/cookies/secure/set-from-http.https.sub.html diff --git a/tests/wpt/web-platform-tests/cookies/secure/set-from-http.https.sub.html.headers b/tests/wpt/tests/cookies/secure/set-from-http.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/cookies/secure/set-from-http.https.sub.html.headers rename to tests/wpt/tests/cookies/secure/set-from-http.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/cookies/secure/set-from-http.sub.html b/tests/wpt/tests/cookies/secure/set-from-http.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/secure/set-from-http.sub.html rename to tests/wpt/tests/cookies/secure/set-from-http.sub.html diff --git a/tests/wpt/web-platform-tests/cookies/secure/set-from-http.sub.html.headers b/tests/wpt/tests/cookies/secure/set-from-http.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/cookies/secure/set-from-http.sub.html.headers rename to tests/wpt/tests/cookies/secure/set-from-http.sub.html.headers diff --git a/tests/wpt/web-platform-tests/cookies/secure/set-from-ws.sub.html b/tests/wpt/tests/cookies/secure/set-from-ws.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/secure/set-from-ws.sub.html rename to tests/wpt/tests/cookies/secure/set-from-ws.sub.html diff --git a/tests/wpt/web-platform-tests/cookies/secure/set-from-wss.https.sub.html b/tests/wpt/tests/cookies/secure/set-from-wss.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/secure/set-from-wss.https.sub.html rename to tests/wpt/tests/cookies/secure/set-from-wss.https.sub.html diff --git a/tests/wpt/web-platform-tests/cookies/size/attributes.www.sub.html b/tests/wpt/tests/cookies/size/attributes.www.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/size/attributes.www.sub.html rename to tests/wpt/tests/cookies/size/attributes.www.sub.html diff --git a/tests/wpt/web-platform-tests/cookies/size/name-and-value.html b/tests/wpt/tests/cookies/size/name-and-value.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/size/name-and-value.html rename to tests/wpt/tests/cookies/size/name-and-value.html diff --git a/tests/wpt/web-platform-tests/cookies/value/value-ctl.html b/tests/wpt/tests/cookies/value/value-ctl.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/value/value-ctl.html rename to tests/wpt/tests/cookies/value/value-ctl.html diff --git a/tests/wpt/web-platform-tests/cookies/value/value.html b/tests/wpt/tests/cookies/value/value.html similarity index 100% rename from tests/wpt/web-platform-tests/cookies/value/value.html rename to tests/wpt/tests/cookies/value/value.html diff --git a/tests/wpt/web-platform-tests/core-aam/META.yml b/tests/wpt/tests/core-aam/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/META.yml rename to tests/wpt/tests/core-aam/META.yml diff --git a/tests/wpt/web-platform-tests/core-aam/README.md b/tests/wpt/tests/core-aam/README.md similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/README.md rename to tests/wpt/tests/core-aam/README.md diff --git a/tests/wpt/web-platform-tests/core-aam/abstract_role_not_mapped-manual.html b/tests/wpt/tests/core-aam/abstract_role_not_mapped-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/abstract_role_not_mapped-manual.html rename to tests/wpt/tests/core-aam/abstract_role_not_mapped-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/alert-manual.html b/tests/wpt/tests/core-aam/alert-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/alert-manual.html rename to tests/wpt/tests/core-aam/alert-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/alertdialog-manual.html b/tests/wpt/tests/core-aam/alertdialog-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/alertdialog-manual.html rename to tests/wpt/tests/core-aam/alertdialog-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/application-manual.html b/tests/wpt/tests/core-aam/application-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/application-manual.html rename to tests/wpt/tests/core-aam/application-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-atomic_false-manual.html b/tests/wpt/tests/core-aam/aria-atomic_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-atomic_false-manual.html rename to tests/wpt/tests/core-aam/aria-atomic_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-atomic_true-manual.html b/tests/wpt/tests/core-aam/aria-atomic_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-atomic_true-manual.html rename to tests/wpt/tests/core-aam/aria-atomic_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_both-manual.html b/tests/wpt/tests/core-aam/aria-autocomplete_both-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-autocomplete_both-manual.html rename to tests/wpt/tests/core-aam/aria-autocomplete_both-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_inline-manual.html b/tests/wpt/tests/core-aam/aria-autocomplete_inline-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-autocomplete_inline-manual.html rename to tests/wpt/tests/core-aam/aria-autocomplete_inline-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_list-manual.html b/tests/wpt/tests/core-aam/aria-autocomplete_list-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-autocomplete_list-manual.html rename to tests/wpt/tests/core-aam/aria-autocomplete_list-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-braillelabel-manual.html b/tests/wpt/tests/core-aam/aria-braillelabel-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-braillelabel-manual.html rename to tests/wpt/tests/core-aam/aria-braillelabel-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-brailleroledescription-manual.html b/tests/wpt/tests/core-aam/aria-brailleroledescription-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-brailleroledescription-manual.html rename to tests/wpt/tests/core-aam/aria-brailleroledescription-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-brailleroledescription_is_empty-manual.html b/tests/wpt/tests/core-aam/aria-brailleroledescription_is_empty-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-brailleroledescription_is_empty-manual.html rename to tests/wpt/tests/core-aam/aria-brailleroledescription_is_empty-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-busy_false-manual.html b/tests/wpt/tests/core-aam/aria-busy_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-busy_false-manual.html rename to tests/wpt/tests/core-aam/aria-busy_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-busy_true-manual.html b/tests/wpt/tests/core-aam/aria-busy_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-busy_true-manual.html rename to tests/wpt/tests/core-aam/aria-busy_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-busy_value_changes-manual.html b/tests/wpt/tests/core-aam/aria-busy_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-busy_value_changes-manual.html rename to tests/wpt/tests/core-aam/aria-busy_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-checked_false_on_checkbox-manual.html b/tests/wpt/tests/core-aam/aria-checked_false_on_checkbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-checked_false_on_checkbox-manual.html rename to tests/wpt/tests/core-aam/aria-checked_false_on_checkbox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-checked_false_on_menuitemradio-manual.html b/tests/wpt/tests/core-aam/aria-checked_false_on_menuitemradio-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-checked_false_on_menuitemradio-manual.html rename to tests/wpt/tests/core-aam/aria-checked_false_on_menuitemradio-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-checked_mixed-manual.html b/tests/wpt/tests/core-aam/aria-checked_mixed-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-checked_mixed-manual.html rename to tests/wpt/tests/core-aam/aria-checked_mixed-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-checked_true_on_checkbox-manual.html b/tests/wpt/tests/core-aam/aria-checked_true_on_checkbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-checked_true_on_checkbox-manual.html rename to tests/wpt/tests/core-aam/aria-checked_true_on_checkbox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-checked_true_on_menuitemradio-manual.html b/tests/wpt/tests/core-aam/aria-checked_true_on_menuitemradio-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-checked_true_on_menuitemradio-manual.html rename to tests/wpt/tests/core-aam/aria-checked_true_on_menuitemradio-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-checked_value_changes-manual.html b/tests/wpt/tests/core-aam/aria-checked_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-checked_value_changes-manual.html rename to tests/wpt/tests/core-aam/aria-checked_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-colcount-manual.html b/tests/wpt/tests/core-aam/aria-colcount-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-colcount-manual.html rename to tests/wpt/tests/core-aam/aria-colcount-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-colindex-manual.html b/tests/wpt/tests/core-aam/aria-colindex-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-colindex-manual.html rename to tests/wpt/tests/core-aam/aria-colindex-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-colspan-manual.html b/tests/wpt/tests/core-aam/aria-colspan-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-colspan-manual.html rename to tests/wpt/tests/core-aam/aria-colspan-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-controls-manual.html b/tests/wpt/tests/core-aam/aria-controls-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-controls-manual.html rename to tests/wpt/tests/core-aam/aria-controls-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-current_value_changes-manual.html b/tests/wpt/tests/core-aam/aria-current_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-current_value_changes-manual.html rename to tests/wpt/tests/core-aam/aria-current_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-current_with_non-false_allowed_value-manual.html b/tests/wpt/tests/core-aam/aria-current_with_non-false_allowed_value-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-current_with_non-false_allowed_value-manual.html rename to tests/wpt/tests/core-aam/aria-current_with_non-false_allowed_value-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-current_with_unrecognized_value-manual.html b/tests/wpt/tests/core-aam/aria-current_with_unrecognized_value-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-current_with_unrecognized_value-manual.html rename to tests/wpt/tests/core-aam/aria-current_with_unrecognized_value-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-describedby-manual.html b/tests/wpt/tests/core-aam/aria-describedby-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-describedby-manual.html rename to tests/wpt/tests/core-aam/aria-describedby-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-details-manual.html b/tests/wpt/tests/core-aam/aria-details-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-details-manual.html rename to tests/wpt/tests/core-aam/aria-details-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-disabled_false-manual.html b/tests/wpt/tests/core-aam/aria-disabled_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-disabled_false-manual.html rename to tests/wpt/tests/core-aam/aria-disabled_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-disabled_true-manual.html b/tests/wpt/tests/core-aam/aria-disabled_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-disabled_true-manual.html rename to tests/wpt/tests/core-aam/aria-disabled_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-disabled_value_changes-manual.html b/tests/wpt/tests/core-aam/aria-disabled_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-disabled_value_changes-manual.html rename to tests/wpt/tests/core-aam/aria-disabled_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_copy-manual.html b/tests/wpt/tests/core-aam/aria-dropeffect_copy-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-dropeffect_copy-manual.html rename to tests/wpt/tests/core-aam/aria-dropeffect_copy-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_execute-manual.html b/tests/wpt/tests/core-aam/aria-dropeffect_execute-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-dropeffect_execute-manual.html rename to tests/wpt/tests/core-aam/aria-dropeffect_execute-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_link-manual.html b/tests/wpt/tests/core-aam/aria-dropeffect_link-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-dropeffect_link-manual.html rename to tests/wpt/tests/core-aam/aria-dropeffect_link-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_move-manual.html b/tests/wpt/tests/core-aam/aria-dropeffect_move-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-dropeffect_move-manual.html rename to tests/wpt/tests/core-aam/aria-dropeffect_move-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_none-manual.html b/tests/wpt/tests/core-aam/aria-dropeffect_none-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-dropeffect_none-manual.html rename to tests/wpt/tests/core-aam/aria-dropeffect_none-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_popup-manual.html b/tests/wpt/tests/core-aam/aria-dropeffect_popup-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-dropeffect_popup-manual.html rename to tests/wpt/tests/core-aam/aria-dropeffect_popup-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_value_changes-manual.html b/tests/wpt/tests/core-aam/aria-dropeffect_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-dropeffect_value_changes-manual.html rename to tests/wpt/tests/core-aam/aria-dropeffect_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-errormessage_aria-invalid_false-manual.html b/tests/wpt/tests/core-aam/aria-errormessage_aria-invalid_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-errormessage_aria-invalid_false-manual.html rename to tests/wpt/tests/core-aam/aria-errormessage_aria-invalid_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-errormessage_aria-invalid_true-manual.html b/tests/wpt/tests/core-aam/aria-errormessage_aria-invalid_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-errormessage_aria-invalid_true-manual.html rename to tests/wpt/tests/core-aam/aria-errormessage_aria-invalid_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_false-manual.html b/tests/wpt/tests/core-aam/aria-expanded_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_false-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_not_supported_on_alert-manual.html b/tests/wpt/tests/core-aam/aria-expanded_not_supported_on_alert-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_not_supported_on_alert-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_not_supported_on_alert-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_not_supported_on_banner-manual.html b/tests/wpt/tests/core-aam/aria-expanded_not_supported_on_banner-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_not_supported_on_banner-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_not_supported_on_banner-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_not_supported_on_dialog-manual.html b/tests/wpt/tests/core-aam/aria-expanded_not_supported_on_dialog-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_not_supported_on_dialog-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_not_supported_on_dialog-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_not_supported_on_feed-manual.html b/tests/wpt/tests/core-aam/aria-expanded_not_supported_on_feed-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_not_supported_on_feed-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_not_supported_on_feed-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_not_supported_on_form-manual.html b/tests/wpt/tests/core-aam/aria-expanded_not_supported_on_form-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_not_supported_on_form-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_not_supported_on_form-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_not_supported_on_group-manual.html b/tests/wpt/tests/core-aam/aria-expanded_not_supported_on_group-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_not_supported_on_group-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_not_supported_on_group-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_true-manual.html b/tests/wpt/tests/core-aam/aria-expanded_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_true-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_true_on_application-manual.html b/tests/wpt/tests/core-aam/aria-expanded_true_on_application-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_true_on_application-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_true_on_application-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_true_on_checkbox-manual.html b/tests/wpt/tests/core-aam/aria-expanded_true_on_checkbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_true_on_checkbox-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_true_on_checkbox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_true_on_menuitem-manual.html b/tests/wpt/tests/core-aam/aria-expanded_true_on_menuitem-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_true_on_menuitem-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_true_on_menuitem-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_true_on_menuitemcheckbox-manual.html b/tests/wpt/tests/core-aam/aria-expanded_true_on_menuitemcheckbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_true_on_menuitemcheckbox-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_true_on_menuitemcheckbox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_true_on_menuitemradio-manual.html b/tests/wpt/tests/core-aam/aria-expanded_true_on_menuitemradio-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_true_on_menuitemradio-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_true_on_menuitemradio-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_true_on_switch-manual.html b/tests/wpt/tests/core-aam/aria-expanded_true_on_switch-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_true_on_switch-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_true_on_switch-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_value_changes-manual.html b/tests/wpt/tests/core-aam/aria-expanded_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-expanded_value_changes-manual.html rename to tests/wpt/tests/core-aam/aria-expanded_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-flowto-manual.html b/tests/wpt/tests/core-aam/aria-flowto-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-flowto-manual.html rename to tests/wpt/tests/core-aam/aria-flowto-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-grabbed_false-manual.html b/tests/wpt/tests/core-aam/aria-grabbed_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-grabbed_false-manual.html rename to tests/wpt/tests/core-aam/aria-grabbed_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-grabbed_true-manual.html b/tests/wpt/tests/core-aam/aria-grabbed_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-grabbed_true-manual.html rename to tests/wpt/tests/core-aam/aria-grabbed_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-grabbed_value_changes-manual.html b/tests/wpt/tests/core-aam/aria-grabbed_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-grabbed_value_changes-manual.html rename to tests/wpt/tests/core-aam/aria-grabbed_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_dialog-manual.html b/tests/wpt/tests/core-aam/aria-haspopup_dialog-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-haspopup_dialog-manual.html rename to tests/wpt/tests/core-aam/aria-haspopup_dialog-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_false-manual.html b/tests/wpt/tests/core-aam/aria-haspopup_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-haspopup_false-manual.html rename to tests/wpt/tests/core-aam/aria-haspopup_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_listbox-manual.html b/tests/wpt/tests/core-aam/aria-haspopup_listbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-haspopup_listbox-manual.html rename to tests/wpt/tests/core-aam/aria-haspopup_listbox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_menu-manual.html b/tests/wpt/tests/core-aam/aria-haspopup_menu-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-haspopup_menu-manual.html rename to tests/wpt/tests/core-aam/aria-haspopup_menu-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_tree-manual.html b/tests/wpt/tests/core-aam/aria-haspopup_tree-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-haspopup_tree-manual.html rename to tests/wpt/tests/core-aam/aria-haspopup_tree-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_true-manual.html b/tests/wpt/tests/core-aam/aria-haspopup_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-haspopup_true-manual.html rename to tests/wpt/tests/core-aam/aria-haspopup_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-hidden_true-manual.html b/tests/wpt/tests/core-aam/aria-hidden_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-hidden_true-manual.html rename to tests/wpt/tests/core-aam/aria-hidden_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-hidden_true_when_element_is_focused_or_fires_event-manual.html b/tests/wpt/tests/core-aam/aria-hidden_true_when_element_is_focused_or_fires_event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-hidden_true_when_element_is_focused_or_fires_event-manual.html rename to tests/wpt/tests/core-aam/aria-hidden_true_when_element_is_focused_or_fires_event-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-invalid_false-manual.html b/tests/wpt/tests/core-aam/aria-invalid_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-invalid_false-manual.html rename to tests/wpt/tests/core-aam/aria-invalid_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-invalid_grammar-manual.html b/tests/wpt/tests/core-aam/aria-invalid_grammar-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-invalid_grammar-manual.html rename to tests/wpt/tests/core-aam/aria-invalid_grammar-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-invalid_spelling-manual.html b/tests/wpt/tests/core-aam/aria-invalid_spelling-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-invalid_spelling-manual.html rename to tests/wpt/tests/core-aam/aria-invalid_spelling-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-invalid_true-manual.html b/tests/wpt/tests/core-aam/aria-invalid_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-invalid_true-manual.html rename to tests/wpt/tests/core-aam/aria-invalid_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-invalid_value_changes-manual.html b/tests/wpt/tests/core-aam/aria-invalid_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-invalid_value_changes-manual.html rename to tests/wpt/tests/core-aam/aria-invalid_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-invalid_with_unrecognized_value-manual.html b/tests/wpt/tests/core-aam/aria-invalid_with_unrecognized_value-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-invalid_with_unrecognized_value-manual.html rename to tests/wpt/tests/core-aam/aria-invalid_with_unrecognized_value-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-keyshortcuts-manual.html b/tests/wpt/tests/core-aam/aria-keyshortcuts-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-keyshortcuts-manual.html rename to tests/wpt/tests/core-aam/aria-keyshortcuts-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-label-manual.html b/tests/wpt/tests/core-aam/aria-label-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-label-manual.html rename to tests/wpt/tests/core-aam/aria-label-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-labelledby-manual.html b/tests/wpt/tests/core-aam/aria-labelledby-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-labelledby-manual.html rename to tests/wpt/tests/core-aam/aria-labelledby-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-level_on_heading-manual.html b/tests/wpt/tests/core-aam/aria-level_on_heading-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-level_on_heading-manual.html rename to tests/wpt/tests/core-aam/aria-level_on_heading-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-level_on_non-heading-manual.html b/tests/wpt/tests/core-aam/aria-level_on_non-heading-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-level_on_non-heading-manual.html rename to tests/wpt/tests/core-aam/aria-level_on_non-heading-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-live_assertive-manual.html b/tests/wpt/tests/core-aam/aria-live_assertive-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-live_assertive-manual.html rename to tests/wpt/tests/core-aam/aria-live_assertive-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-live_off-manual.html b/tests/wpt/tests/core-aam/aria-live_off-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-live_off-manual.html rename to tests/wpt/tests/core-aam/aria-live_off-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-live_polite-manual.html b/tests/wpt/tests/core-aam/aria-live_polite-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-live_polite-manual.html rename to tests/wpt/tests/core-aam/aria-live_polite-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-modal_false-manual.html b/tests/wpt/tests/core-aam/aria-modal_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-modal_false-manual.html rename to tests/wpt/tests/core-aam/aria-modal_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-modal_true-manual.html b/tests/wpt/tests/core-aam/aria-modal_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-modal_true-manual.html rename to tests/wpt/tests/core-aam/aria-modal_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-multiline_false-manual.html b/tests/wpt/tests/core-aam/aria-multiline_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-multiline_false-manual.html rename to tests/wpt/tests/core-aam/aria-multiline_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-multiline_true-manual.html b/tests/wpt/tests/core-aam/aria-multiline_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-multiline_true-manual.html rename to tests/wpt/tests/core-aam/aria-multiline_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-multiselectable_false-manual.html b/tests/wpt/tests/core-aam/aria-multiselectable_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-multiselectable_false-manual.html rename to tests/wpt/tests/core-aam/aria-multiselectable_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-multiselectable_true-manual.html b/tests/wpt/tests/core-aam/aria-multiselectable_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-multiselectable_true-manual.html rename to tests/wpt/tests/core-aam/aria-multiselectable_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-orientation_horizontal-manual.html b/tests/wpt/tests/core-aam/aria-orientation_horizontal-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-orientation_horizontal-manual.html rename to tests/wpt/tests/core-aam/aria-orientation_horizontal-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-orientation_undefined-manual.html b/tests/wpt/tests/core-aam/aria-orientation_undefined-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-orientation_undefined-manual.html rename to tests/wpt/tests/core-aam/aria-orientation_undefined-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-orientation_vertical-manual.html b/tests/wpt/tests/core-aam/aria-orientation_vertical-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-orientation_vertical-manual.html rename to tests/wpt/tests/core-aam/aria-orientation_vertical-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-owns_may_need_manual_verification-manual.html b/tests/wpt/tests/core-aam/aria-owns_may_need_manual_verification-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-owns_may_need_manual_verification-manual.html rename to tests/wpt/tests/core-aam/aria-owns_may_need_manual_verification-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-placeholder-manual.html b/tests/wpt/tests/core-aam/aria-placeholder-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-placeholder-manual.html rename to tests/wpt/tests/core-aam/aria-placeholder-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-posinset-manual.html b/tests/wpt/tests/core-aam/aria-posinset-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-posinset-manual.html rename to tests/wpt/tests/core-aam/aria-posinset-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-posinset_and_aria-setsize_on_treegrid_row-manual.html b/tests/wpt/tests/core-aam/aria-posinset_and_aria-setsize_on_treegrid_row-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-posinset_and_aria-setsize_on_treegrid_row-manual.html rename to tests/wpt/tests/core-aam/aria-posinset_and_aria-setsize_on_treegrid_row-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-pressed_false-manual.html b/tests/wpt/tests/core-aam/aria-pressed_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-pressed_false-manual.html rename to tests/wpt/tests/core-aam/aria-pressed_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-pressed_mixed-manual.html b/tests/wpt/tests/core-aam/aria-pressed_mixed-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-pressed_mixed-manual.html rename to tests/wpt/tests/core-aam/aria-pressed_mixed-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-pressed_true-manual.html b/tests/wpt/tests/core-aam/aria-pressed_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-pressed_true-manual.html rename to tests/wpt/tests/core-aam/aria-pressed_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-pressed_value_changes-manual.html b/tests/wpt/tests/core-aam/aria-pressed_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-pressed_value_changes-manual.html rename to tests/wpt/tests/core-aam/aria-pressed_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-readonly_false-manual.html b/tests/wpt/tests/core-aam/aria-readonly_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-readonly_false-manual.html rename to tests/wpt/tests/core-aam/aria-readonly_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-readonly_is_unspecified_on_gridcell-manual.html b/tests/wpt/tests/core-aam/aria-readonly_is_unspecified_on_gridcell-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-readonly_is_unspecified_on_gridcell-manual.html rename to tests/wpt/tests/core-aam/aria-readonly_is_unspecified_on_gridcell-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_checkbox-manual.html b/tests/wpt/tests/core-aam/aria-readonly_true_on_checkbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_checkbox-manual.html rename to tests/wpt/tests/core-aam/aria-readonly_true_on_checkbox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_radiogroup-manual.html b/tests/wpt/tests/core-aam/aria-readonly_true_on_radiogroup-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_radiogroup-manual.html rename to tests/wpt/tests/core-aam/aria-readonly_true_on_radiogroup-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_textbox-manual.html b/tests/wpt/tests/core-aam/aria-readonly_true_on_textbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_textbox-manual.html rename to tests/wpt/tests/core-aam/aria-readonly_true_on_textbox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-readonly_value_changes-manual.html b/tests/wpt/tests/core-aam/aria-readonly_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-readonly_value_changes-manual.html rename to tests/wpt/tests/core-aam/aria-readonly_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-relevant-manual.html b/tests/wpt/tests/core-aam/aria-relevant-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-relevant-manual.html rename to tests/wpt/tests/core-aam/aria-relevant-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-required_true-manual.html b/tests/wpt/tests/core-aam/aria-required_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-required_true-manual.html rename to tests/wpt/tests/core-aam/aria-required_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-required_true_on_checkbox-manual.html b/tests/wpt/tests/core-aam/aria-required_true_on_checkbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-required_true_on_checkbox-manual.html rename to tests/wpt/tests/core-aam/aria-required_true_on_checkbox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-required_value_changes-manual.html b/tests/wpt/tests/core-aam/aria-required_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-required_value_changes-manual.html rename to tests/wpt/tests/core-aam/aria-required_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-roledescription-manual.html b/tests/wpt/tests/core-aam/aria-roledescription-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-roledescription-manual.html rename to tests/wpt/tests/core-aam/aria-roledescription-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-roledescription_is_empty_or_whitespace_characters-manual.html b/tests/wpt/tests/core-aam/aria-roledescription_is_empty_or_whitespace_characters-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-roledescription_is_empty_or_whitespace_characters-manual.html rename to tests/wpt/tests/core-aam/aria-roledescription_is_empty_or_whitespace_characters-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-rowcount-manual.html b/tests/wpt/tests/core-aam/aria-rowcount-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-rowcount-manual.html rename to tests/wpt/tests/core-aam/aria-rowcount-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-rowindex-manual.html b/tests/wpt/tests/core-aam/aria-rowindex-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-rowindex-manual.html rename to tests/wpt/tests/core-aam/aria-rowindex-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-rowspan-manual.html b/tests/wpt/tests/core-aam/aria-rowspan-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-rowspan-manual.html rename to tests/wpt/tests/core-aam/aria-rowspan-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-selected_false-manual.html b/tests/wpt/tests/core-aam/aria-selected_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-selected_false-manual.html rename to tests/wpt/tests/core-aam/aria-selected_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-selected_true-manual.html b/tests/wpt/tests/core-aam/aria-selected_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-selected_true-manual.html rename to tests/wpt/tests/core-aam/aria-selected_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-setsize_-1-manual.html b/tests/wpt/tests/core-aam/aria-setsize_-1-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-setsize_-1-manual.html rename to tests/wpt/tests/core-aam/aria-setsize_-1-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-setsize_3-manual.html b/tests/wpt/tests/core-aam/aria-setsize_3-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-setsize_3-manual.html rename to tests/wpt/tests/core-aam/aria-setsize_3-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-sort_ascending-manual.html b/tests/wpt/tests/core-aam/aria-sort_ascending-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-sort_ascending-manual.html rename to tests/wpt/tests/core-aam/aria-sort_ascending-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-sort_descending-manual.html b/tests/wpt/tests/core-aam/aria-sort_descending-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-sort_descending-manual.html rename to tests/wpt/tests/core-aam/aria-sort_descending-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-sort_none-manual.html b/tests/wpt/tests/core-aam/aria-sort_none-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-sort_none-manual.html rename to tests/wpt/tests/core-aam/aria-sort_none-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-sort_other-manual.html b/tests/wpt/tests/core-aam/aria-sort_other-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-sort_other-manual.html rename to tests/wpt/tests/core-aam/aria-sort_other-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-valuemax-manual.html b/tests/wpt/tests/core-aam/aria-valuemax-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-valuemax-manual.html rename to tests/wpt/tests/core-aam/aria-valuemax-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-valuemin-manual.html b/tests/wpt/tests/core-aam/aria-valuemin-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-valuemin-manual.html rename to tests/wpt/tests/core-aam/aria-valuemin-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-valuenow-manual.html b/tests/wpt/tests/core-aam/aria-valuenow-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-valuenow-manual.html rename to tests/wpt/tests/core-aam/aria-valuenow-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-valuenow_value_changes-manual.html b/tests/wpt/tests/core-aam/aria-valuenow_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-valuenow_value_changes-manual.html rename to tests/wpt/tests/core-aam/aria-valuenow_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-valuetext-manual.html b/tests/wpt/tests/core-aam/aria-valuetext-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-valuetext-manual.html rename to tests/wpt/tests/core-aam/aria-valuetext-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-valuetext_on_spinbutton-manual.html b/tests/wpt/tests/core-aam/aria-valuetext_on_spinbutton-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-valuetext_on_spinbutton-manual.html rename to tests/wpt/tests/core-aam/aria-valuetext_on_spinbutton-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/aria-valuetext_value_changes-manual.html b/tests/wpt/tests/core-aam/aria-valuetext_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/aria-valuetext_value_changes-manual.html rename to tests/wpt/tests/core-aam/aria-valuetext_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/article-manual.html b/tests/wpt/tests/core-aam/article-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/article-manual.html rename to tests/wpt/tests/core-aam/article-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/banner-manual.html b/tests/wpt/tests/core-aam/banner-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/banner-manual.html rename to tests/wpt/tests/core-aam/banner-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/blockquote-manual.html b/tests/wpt/tests/core-aam/blockquote-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/blockquote-manual.html rename to tests/wpt/tests/core-aam/blockquote-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/button_with_aria-haspopup_dialog-manual.html b/tests/wpt/tests/core-aam/button_with_aria-haspopup_dialog-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/button_with_aria-haspopup_dialog-manual.html rename to tests/wpt/tests/core-aam/button_with_aria-haspopup_dialog-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/button_with_aria-haspopup_true-manual.html b/tests/wpt/tests/core-aam/button_with_aria-haspopup_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/button_with_aria-haspopup_true-manual.html rename to tests/wpt/tests/core-aam/button_with_aria-haspopup_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/button_with_default_values_for_aria-pressed_and_aria-haspopup-manual.html b/tests/wpt/tests/core-aam/button_with_default_values_for_aria-pressed_and_aria-haspopup-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/button_with_default_values_for_aria-pressed_and_aria-haspopup-manual.html rename to tests/wpt/tests/core-aam/button_with_default_values_for_aria-pressed_and_aria-haspopup-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/button_with_defined_value_for_aria-pressed-manual.html b/tests/wpt/tests/core-aam/button_with_defined_value_for_aria-pressed-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/button_with_defined_value_for_aria-pressed-manual.html rename to tests/wpt/tests/core-aam/button_with_defined_value_for_aria-pressed-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/caption-manual.html b/tests/wpt/tests/core-aam/caption-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/caption-manual.html rename to tests/wpt/tests/core-aam/caption-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/cell-manual.html b/tests/wpt/tests/core-aam/cell-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/cell-manual.html rename to tests/wpt/tests/core-aam/cell-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/checkbox-manual.html b/tests/wpt/tests/core-aam/checkbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/checkbox-manual.html rename to tests/wpt/tests/core-aam/checkbox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/code-manual.html b/tests/wpt/tests/core-aam/code-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/code-manual.html rename to tests/wpt/tests/core-aam/code-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/columnheader-manual.html b/tests/wpt/tests/core-aam/columnheader-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/columnheader-manual.html rename to tests/wpt/tests/core-aam/columnheader-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/combobox-manual.html b/tests/wpt/tests/core-aam/combobox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/combobox-manual.html rename to tests/wpt/tests/core-aam/combobox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/combobox-value-calculation-manual.html b/tests/wpt/tests/core-aam/combobox-value-calculation-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/combobox-value-calculation-manual.html rename to tests/wpt/tests/core-aam/combobox-value-calculation-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/complementary-manual.html b/tests/wpt/tests/core-aam/complementary-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/complementary-manual.html rename to tests/wpt/tests/core-aam/complementary-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/contentinfo-manual.html b/tests/wpt/tests/core-aam/contentinfo-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/contentinfo-manual.html rename to tests/wpt/tests/core-aam/contentinfo-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/definition-manual.html b/tests/wpt/tests/core-aam/definition-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/definition-manual.html rename to tests/wpt/tests/core-aam/definition-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/deletion-manual.html b/tests/wpt/tests/core-aam/deletion-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/deletion-manual.html rename to tests/wpt/tests/core-aam/deletion-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/dialog-manual.html b/tests/wpt/tests/core-aam/dialog-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/dialog-manual.html rename to tests/wpt/tests/core-aam/dialog-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/directory-manual.html b/tests/wpt/tests/core-aam/directory-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/directory-manual.html rename to tests/wpt/tests/core-aam/directory-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/document-manual.html b/tests/wpt/tests/core-aam/document-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/document-manual.html rename to tests/wpt/tests/core-aam/document-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/emphasis-manual.html b/tests/wpt/tests/core-aam/emphasis-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/emphasis-manual.html rename to tests/wpt/tests/core-aam/emphasis-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_css_display_none-manual.html b/tests/wpt/tests/core-aam/exclude_element_hidden_with_css_display_none-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_css_display_none-manual.html rename to tests/wpt/tests/core-aam/exclude_element_hidden_with_css_display_none-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_css_visibility_hidden-manual.html b/tests/wpt/tests/core-aam/exclude_element_hidden_with_css_visibility_hidden-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_css_visibility_hidden-manual.html rename to tests/wpt/tests/core-aam/exclude_element_hidden_with_css_visibility_hidden-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_html5_hidden-manual.html b/tests/wpt/tests/core-aam/exclude_element_hidden_with_html5_hidden-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_html5_hidden-manual.html rename to tests/wpt/tests/core-aam/exclude_element_hidden_with_html5_hidden-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/feed-manual.html b/tests/wpt/tests/core-aam/feed-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/feed-manual.html rename to tests/wpt/tests/core-aam/feed-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/figure-manual.html b/tests/wpt/tests/core-aam/figure-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/figure-manual.html rename to tests/wpt/tests/core-aam/figure-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/form-manual.html b/tests/wpt/tests/core-aam/form-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/form-manual.html rename to tests/wpt/tests/core-aam/form-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/generic-manual.html b/tests/wpt/tests/core-aam/generic-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/generic-manual.html rename to tests/wpt/tests/core-aam/generic-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/generic_roledescription_prohibited-manual.html b/tests/wpt/tests/core-aam/generic_roledescription_prohibited-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/generic_roledescription_prohibited-manual.html rename to tests/wpt/tests/core-aam/generic_roledescription_prohibited-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/grid-level-not-supported-manual.html b/tests/wpt/tests/core-aam/grid-level-not-supported-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/grid-level-not-supported-manual.html rename to tests/wpt/tests/core-aam/grid-level-not-supported-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/grid-manual.html b/tests/wpt/tests/core-aam/grid-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/grid-manual.html rename to tests/wpt/tests/core-aam/grid-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/gridcell-manual.html b/tests/wpt/tests/core-aam/gridcell-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/gridcell-manual.html rename to tests/wpt/tests/core-aam/gridcell-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/group-manual.html b/tests/wpt/tests/core-aam/group-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/group-manual.html rename to tests/wpt/tests/core-aam/group-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/group_as_child_of_listbox-manual.html b/tests/wpt/tests/core-aam/group_as_child_of_listbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/group_as_child_of_listbox-manual.html rename to tests/wpt/tests/core-aam/group_as_child_of_listbox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/heading-manual.html b/tests/wpt/tests/core-aam/heading-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/heading-manual.html rename to tests/wpt/tests/core-aam/heading-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/heading-no-level-manual.html b/tests/wpt/tests/core-aam/heading-no-level-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/heading-no-level-manual.html rename to tests/wpt/tests/core-aam/heading-no-level-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/img-manual.html b/tests/wpt/tests/core-aam/img-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/img-manual.html rename to tests/wpt/tests/core-aam/img-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-controls-manual.html b/tests/wpt/tests/core-aam/include_element_referenced_by_global_aria-controls-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-controls-manual.html rename to tests/wpt/tests/core-aam/include_element_referenced_by_global_aria-controls-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-describedby-manual.html b/tests/wpt/tests/core-aam/include_element_referenced_by_global_aria-describedby-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-describedby-manual.html rename to tests/wpt/tests/core-aam/include_element_referenced_by_global_aria-describedby-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-details-manual.html b/tests/wpt/tests/core-aam/include_element_referenced_by_global_aria-details-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-details-manual.html rename to tests/wpt/tests/core-aam/include_element_referenced_by_global_aria-details-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-errormessage-manual.html b/tests/wpt/tests/core-aam/include_element_referenced_by_global_aria-errormessage-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-errormessage-manual.html rename to tests/wpt/tests/core-aam/include_element_referenced_by_global_aria-errormessage-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-flowto-manual.html b/tests/wpt/tests/core-aam/include_element_referenced_by_global_aria-flowto-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-flowto-manual.html rename to tests/wpt/tests/core-aam/include_element_referenced_by_global_aria-flowto-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-labelledby-manual.html b/tests/wpt/tests/core-aam/include_element_referenced_by_global_aria-labelledby-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-labelledby-manual.html rename to tests/wpt/tests/core-aam/include_element_referenced_by_global_aria-labelledby-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-owns-manual.html b/tests/wpt/tests/core-aam/include_element_referenced_by_global_aria-owns-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-owns-manual.html rename to tests/wpt/tests/core-aam/include_element_referenced_by_global_aria-owns-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_that_is_focusable-manual.html b/tests/wpt/tests/core-aam/include_element_that_is_focusable-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/include_element_that_is_focusable-manual.html rename to tests/wpt/tests/core-aam/include_element_that_is_focusable-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_with_id_inside_element_with_aria-activedescendant-manual.html b/tests/wpt/tests/core-aam/include_element_with_id_inside_element_with_aria-activedescendant-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/include_element_with_id_inside_element_with_aria-activedescendant-manual.html rename to tests/wpt/tests/core-aam/include_element_with_id_inside_element_with_aria-activedescendant-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/insertion-manual.html b/tests/wpt/tests/core-aam/insertion-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/insertion-manual.html rename to tests/wpt/tests/core-aam/insertion-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/invalid_role_not_mapped-manual.html b/tests/wpt/tests/core-aam/invalid_role_not_mapped-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/invalid_role_not_mapped-manual.html rename to tests/wpt/tests/core-aam/invalid_role_not_mapped-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/link-manual.html b/tests/wpt/tests/core-aam/link-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/link-manual.html rename to tests/wpt/tests/core-aam/link-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/list-manual.html b/tests/wpt/tests/core-aam/list-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/list-manual.html rename to tests/wpt/tests/core-aam/list-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/listbox_not_owned_by_or_child_of_combobox-manual.html b/tests/wpt/tests/core-aam/listbox_not_owned_by_or_child_of_combobox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/listbox_not_owned_by_or_child_of_combobox-manual.html rename to tests/wpt/tests/core-aam/listbox_not_owned_by_or_child_of_combobox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/listbox_owned_by_or_child_of_combobox-manual.html b/tests/wpt/tests/core-aam/listbox_owned_by_or_child_of_combobox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/listbox_owned_by_or_child_of_combobox-manual.html rename to tests/wpt/tests/core-aam/listbox_owned_by_or_child_of_combobox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/listitem-manual.html b/tests/wpt/tests/core-aam/listitem-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/listitem-manual.html rename to tests/wpt/tests/core-aam/listitem-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/log-manual.html b/tests/wpt/tests/core-aam/log-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/log-manual.html rename to tests/wpt/tests/core-aam/log-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/main-manual.html b/tests/wpt/tests/core-aam/main-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/main-manual.html rename to tests/wpt/tests/core-aam/main-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/mark-manual.html b/tests/wpt/tests/core-aam/mark-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/mark-manual.html rename to tests/wpt/tests/core-aam/mark-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/marquee-manual.html b/tests/wpt/tests/core-aam/marquee-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/marquee-manual.html rename to tests/wpt/tests/core-aam/marquee-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/math-manual.html b/tests/wpt/tests/core-aam/math-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/math-manual.html rename to tests/wpt/tests/core-aam/math-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/math_role_children_are_not_presentational-manual.html b/tests/wpt/tests/core-aam/math_role_children_are_not_presentational-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/math_role_children_are_not_presentational-manual.html rename to tests/wpt/tests/core-aam/math_role_children_are_not_presentational-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/menu-manual.html b/tests/wpt/tests/core-aam/menu-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/menu-manual.html rename to tests/wpt/tests/core-aam/menu-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/menu_child_of_menu_item-manual.html b/tests/wpt/tests/core-aam/menu_child_of_menu_item-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/menu_child_of_menu_item-manual.html rename to tests/wpt/tests/core-aam/menu_child_of_menu_item-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/menubar-manual.html b/tests/wpt/tests/core-aam/menubar-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/menubar-manual.html rename to tests/wpt/tests/core-aam/menubar-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/menuitem-manual.html b/tests/wpt/tests/core-aam/menuitem-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/menuitem-manual.html rename to tests/wpt/tests/core-aam/menuitem-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/menuitemcheckbox-manual.html b/tests/wpt/tests/core-aam/menuitemcheckbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/menuitemcheckbox-manual.html rename to tests/wpt/tests/core-aam/menuitemcheckbox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/menuitemcheckbox_child_of_group-manual.html b/tests/wpt/tests/core-aam/menuitemcheckbox_child_of_group-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/menuitemcheckbox_child_of_group-manual.html rename to tests/wpt/tests/core-aam/menuitemcheckbox_child_of_group-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/menuitemradio-manual.html b/tests/wpt/tests/core-aam/menuitemradio-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/menuitemradio-manual.html rename to tests/wpt/tests/core-aam/menuitemradio-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/meter-manual.html b/tests/wpt/tests/core-aam/meter-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/meter-manual.html rename to tests/wpt/tests/core-aam/meter-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/navigation-manual.html b/tests/wpt/tests/core-aam/navigation-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/navigation-manual.html rename to tests/wpt/tests/core-aam/navigation-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/none-manual.html b/tests/wpt/tests/core-aam/none-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/none-manual.html rename to tests/wpt/tests/core-aam/none-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/none_used_on_element_that_is_focused_or_fires_event-manual.html b/tests/wpt/tests/core-aam/none_used_on_element_that_is_focused_or_fires_event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/none_used_on_element_that_is_focused_or_fires_event-manual.html rename to tests/wpt/tests/core-aam/none_used_on_element_that_is_focused_or_fires_event-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/none_used_on_table_element_with_td_children-manual.html b/tests/wpt/tests/core-aam/none_used_on_table_element_with_td_children-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/none_used_on_table_element_with_td_children-manual.html rename to tests/wpt/tests/core-aam/none_used_on_table_element_with_td_children-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/none_used_on_ul_element_with_li_children-manual.html b/tests/wpt/tests/core-aam/none_used_on_ul_element_with_li_children-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/none_used_on_ul_element_with_li_children-manual.html rename to tests/wpt/tests/core-aam/none_used_on_ul_element_with_li_children-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/note-manual.html b/tests/wpt/tests/core-aam/note-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/note-manual.html rename to tests/wpt/tests/core-aam/note-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/option_inside_combobox-manual.html b/tests/wpt/tests/core-aam/option_inside_combobox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/option_inside_combobox-manual.html rename to tests/wpt/tests/core-aam/option_inside_combobox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/option_not_inside_combobox-manual.html b/tests/wpt/tests/core-aam/option_not_inside_combobox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/option_not_inside_combobox-manual.html rename to tests/wpt/tests/core-aam/option_not_inside_combobox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/paragraph-manual.html b/tests/wpt/tests/core-aam/paragraph-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/paragraph-manual.html rename to tests/wpt/tests/core-aam/paragraph-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/presentation-manual.html b/tests/wpt/tests/core-aam/presentation-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/presentation-manual.html rename to tests/wpt/tests/core-aam/presentation-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/presentation_used_on_element_that_is_focused_or_fires_event-manual.html b/tests/wpt/tests/core-aam/presentation_used_on_element_that_is_focused_or_fires_event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/presentation_used_on_element_that_is_focused_or_fires_event-manual.html rename to tests/wpt/tests/core-aam/presentation_used_on_element_that_is_focused_or_fires_event-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/presentation_used_on_table_element_with_td_children-manual.html b/tests/wpt/tests/core-aam/presentation_used_on_table_element_with_td_children-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/presentation_used_on_table_element_with_td_children-manual.html rename to tests/wpt/tests/core-aam/presentation_used_on_table_element_with_td_children-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/presentation_used_on_ul_element_with_li_children-manual.html b/tests/wpt/tests/core-aam/presentation_used_on_ul_element_with_li_children-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/presentation_used_on_ul_element_with_li_children-manual.html rename to tests/wpt/tests/core-aam/presentation_used_on_ul_element_with_li_children-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/progressbar-manual.html b/tests/wpt/tests/core-aam/progressbar-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/progressbar-manual.html rename to tests/wpt/tests/core-aam/progressbar-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/progressbar-no-min-or-max-manual.html b/tests/wpt/tests/core-aam/progressbar-no-min-or-max-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/progressbar-no-min-or-max-manual.html rename to tests/wpt/tests/core-aam/progressbar-no-min-or-max-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/radio-manual.html b/tests/wpt/tests/core-aam/radio-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/radio-manual.html rename to tests/wpt/tests/core-aam/radio-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/radiogroup-manual.html b/tests/wpt/tests/core-aam/radiogroup-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/radiogroup-manual.html rename to tests/wpt/tests/core-aam/radiogroup-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/region_with_an_accessible_name-manual.html b/tests/wpt/tests/core-aam/region_with_an_accessible_name-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/region_with_an_accessible_name-manual.html rename to tests/wpt/tests/core-aam/region_with_an_accessible_name-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/region_without_an_accessible_name-manual.html b/tests/wpt/tests/core-aam/region_without_an_accessible_name-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/region_without_an_accessible_name-manual.html rename to tests/wpt/tests/core-aam/region_without_an_accessible_name-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/row_inside_treegrid-manual.html b/tests/wpt/tests/core-aam/row_inside_treegrid-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/row_inside_treegrid-manual.html rename to tests/wpt/tests/core-aam/row_inside_treegrid-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/row_not_inside_treegrid-manual.html b/tests/wpt/tests/core-aam/row_not_inside_treegrid-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/row_not_inside_treegrid-manual.html rename to tests/wpt/tests/core-aam/row_not_inside_treegrid-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/rowgroup-manual.html b/tests/wpt/tests/core-aam/rowgroup-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/rowgroup-manual.html rename to tests/wpt/tests/core-aam/rowgroup-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/rowgroup-no-name-from-contents-manual.html b/tests/wpt/tests/core-aam/rowgroup-no-name-from-contents-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/rowgroup-no-name-from-contents-manual.html rename to tests/wpt/tests/core-aam/rowgroup-no-name-from-contents-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/rowheader-manual.html b/tests/wpt/tests/core-aam/rowheader-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/rowheader-manual.html rename to tests/wpt/tests/core-aam/rowheader-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/scrollbar-manual.html b/tests/wpt/tests/core-aam/scrollbar-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/scrollbar-manual.html rename to tests/wpt/tests/core-aam/scrollbar-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/search-manual.html b/tests/wpt/tests/core-aam/search-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/search-manual.html rename to tests/wpt/tests/core-aam/search-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/searchbox-manual.html b/tests/wpt/tests/core-aam/searchbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/searchbox-manual.html rename to tests/wpt/tests/core-aam/searchbox-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/separator_focusable-manual.html b/tests/wpt/tests/core-aam/separator_focusable-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/separator_focusable-manual.html rename to tests/wpt/tests/core-aam/separator_focusable-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/separator_non-focusable-manual.html b/tests/wpt/tests/core-aam/separator_non-focusable-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/separator_non-focusable-manual.html rename to tests/wpt/tests/core-aam/separator_non-focusable-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/slider-manual.html b/tests/wpt/tests/core-aam/slider-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/slider-manual.html rename to tests/wpt/tests/core-aam/slider-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/spinbutton-manual.html b/tests/wpt/tests/core-aam/spinbutton-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/spinbutton-manual.html rename to tests/wpt/tests/core-aam/spinbutton-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/status-manual.html b/tests/wpt/tests/core-aam/status-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/status-manual.html rename to tests/wpt/tests/core-aam/status-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/strong-manual.html b/tests/wpt/tests/core-aam/strong-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/strong-manual.html rename to tests/wpt/tests/core-aam/strong-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/subscript-manual.html b/tests/wpt/tests/core-aam/subscript-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/subscript-manual.html rename to tests/wpt/tests/core-aam/subscript-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/suggestion-manual.html b/tests/wpt/tests/core-aam/suggestion-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/suggestion-manual.html rename to tests/wpt/tests/core-aam/suggestion-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/superscript-manual.html b/tests/wpt/tests/core-aam/superscript-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/superscript-manual.html rename to tests/wpt/tests/core-aam/superscript-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/switch-manual.html b/tests/wpt/tests/core-aam/switch-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/switch-manual.html rename to tests/wpt/tests/core-aam/switch-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/tab-manual.html b/tests/wpt/tests/core-aam/tab-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/tab-manual.html rename to tests/wpt/tests/core-aam/tab-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/table-manual.html b/tests/wpt/tests/core-aam/table-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/table-manual.html rename to tests/wpt/tests/core-aam/table-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/tablist-level-not-supported-manual.html b/tests/wpt/tests/core-aam/tablist-level-not-supported-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/tablist-level-not-supported-manual.html rename to tests/wpt/tests/core-aam/tablist-level-not-supported-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/tablist-manual.html b/tests/wpt/tests/core-aam/tablist-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/tablist-manual.html rename to tests/wpt/tests/core-aam/tablist-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/tabpanel-manual.html b/tests/wpt/tests/core-aam/tabpanel-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/tabpanel-manual.html rename to tests/wpt/tests/core-aam/tabpanel-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/term-manual.html b/tests/wpt/tests/core-aam/term-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/term-manual.html rename to tests/wpt/tests/core-aam/term-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/textbox_when_aria-multiline_is_false-manual.html b/tests/wpt/tests/core-aam/textbox_when_aria-multiline_is_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/textbox_when_aria-multiline_is_false-manual.html rename to tests/wpt/tests/core-aam/textbox_when_aria-multiline_is_false-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/textbox_when_aria-multiline_is_true-manual.html b/tests/wpt/tests/core-aam/textbox_when_aria-multiline_is_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/textbox_when_aria-multiline_is_true-manual.html rename to tests/wpt/tests/core-aam/textbox_when_aria-multiline_is_true-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/time-manual.html b/tests/wpt/tests/core-aam/time-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/time-manual.html rename to tests/wpt/tests/core-aam/time-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/timer-manual.html b/tests/wpt/tests/core-aam/timer-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/timer-manual.html rename to tests/wpt/tests/core-aam/timer-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/toolbar-manual.html b/tests/wpt/tests/core-aam/toolbar-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/toolbar-manual.html rename to tests/wpt/tests/core-aam/toolbar-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/tooltip-manual.html b/tests/wpt/tests/core-aam/tooltip-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/tooltip-manual.html rename to tests/wpt/tests/core-aam/tooltip-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/tree-manual.html b/tests/wpt/tests/core-aam/tree-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/tree-manual.html rename to tests/wpt/tests/core-aam/tree-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/treegrid-manual.html b/tests/wpt/tests/core-aam/treegrid-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/treegrid-manual.html rename to tests/wpt/tests/core-aam/treegrid-manual.html diff --git a/tests/wpt/web-platform-tests/core-aam/treeitem-manual.html b/tests/wpt/tests/core-aam/treeitem-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/core-aam/treeitem-manual.html rename to tests/wpt/tests/core-aam/treeitem-manual.html diff --git a/tests/wpt/web-platform-tests/cors/304.htm b/tests/wpt/tests/cors/304.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/304.htm rename to tests/wpt/tests/cors/304.htm diff --git a/tests/wpt/web-platform-tests/cors/META.yml b/tests/wpt/tests/cors/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/cors/META.yml rename to tests/wpt/tests/cors/META.yml diff --git a/tests/wpt/web-platform-tests/cors/README.md b/tests/wpt/tests/cors/README.md similarity index 100% rename from tests/wpt/web-platform-tests/cors/README.md rename to tests/wpt/tests/cors/README.md diff --git a/tests/wpt/web-platform-tests/cors/access-control-expose-headers-parsing.window.js b/tests/wpt/tests/cors/access-control-expose-headers-parsing.window.js similarity index 100% rename from tests/wpt/web-platform-tests/cors/access-control-expose-headers-parsing.window.js rename to tests/wpt/tests/cors/access-control-expose-headers-parsing.window.js diff --git a/tests/wpt/web-platform-tests/cors/basic.htm b/tests/wpt/tests/cors/basic.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/basic.htm rename to tests/wpt/tests/cors/basic.htm diff --git a/tests/wpt/web-platform-tests/cors/client-hint-request-headers-2.tentative.htm b/tests/wpt/tests/cors/client-hint-request-headers-2.tentative.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/client-hint-request-headers-2.tentative.htm rename to tests/wpt/tests/cors/client-hint-request-headers-2.tentative.htm diff --git a/tests/wpt/web-platform-tests/cors/client-hint-request-headers.htm b/tests/wpt/tests/cors/client-hint-request-headers.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/client-hint-request-headers.htm rename to tests/wpt/tests/cors/client-hint-request-headers.htm diff --git a/tests/wpt/web-platform-tests/cors/cors-safelisted-request-header.any.js b/tests/wpt/tests/cors/cors-safelisted-request-header.any.js similarity index 100% rename from tests/wpt/web-platform-tests/cors/cors-safelisted-request-header.any.js rename to tests/wpt/tests/cors/cors-safelisted-request-header.any.js diff --git a/tests/wpt/web-platform-tests/cors/credentials-flag.htm b/tests/wpt/tests/cors/credentials-flag.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/credentials-flag.htm rename to tests/wpt/tests/cors/credentials-flag.htm diff --git a/tests/wpt/web-platform-tests/cors/image-tainting-in-cross-origin-iframe.sub.html b/tests/wpt/tests/cors/image-tainting-in-cross-origin-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cors/image-tainting-in-cross-origin-iframe.sub.html rename to tests/wpt/tests/cors/image-tainting-in-cross-origin-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/cors/late-upload-events.htm b/tests/wpt/tests/cors/late-upload-events.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/late-upload-events.htm rename to tests/wpt/tests/cors/late-upload-events.htm diff --git a/tests/wpt/web-platform-tests/cors/origin.htm b/tests/wpt/tests/cors/origin.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/origin.htm rename to tests/wpt/tests/cors/origin.htm diff --git a/tests/wpt/web-platform-tests/cors/preflight-cache-partitioning.sub.window.js b/tests/wpt/tests/cors/preflight-cache-partitioning.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/cors/preflight-cache-partitioning.sub.window.js rename to tests/wpt/tests/cors/preflight-cache-partitioning.sub.window.js diff --git a/tests/wpt/web-platform-tests/cors/preflight-cache.htm b/tests/wpt/tests/cors/preflight-cache.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/preflight-cache.htm rename to tests/wpt/tests/cors/preflight-cache.htm diff --git a/tests/wpt/web-platform-tests/cors/preflight-failure.htm b/tests/wpt/tests/cors/preflight-failure.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/preflight-failure.htm rename to tests/wpt/tests/cors/preflight-failure.htm diff --git a/tests/wpt/web-platform-tests/cors/redirect-origin.htm b/tests/wpt/tests/cors/redirect-origin.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/redirect-origin.htm rename to tests/wpt/tests/cors/redirect-origin.htm diff --git a/tests/wpt/web-platform-tests/cors/redirect-preflight-2.htm b/tests/wpt/tests/cors/redirect-preflight-2.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/redirect-preflight-2.htm rename to tests/wpt/tests/cors/redirect-preflight-2.htm diff --git a/tests/wpt/web-platform-tests/cors/redirect-preflight.htm b/tests/wpt/tests/cors/redirect-preflight.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/redirect-preflight.htm rename to tests/wpt/tests/cors/redirect-preflight.htm diff --git a/tests/wpt/web-platform-tests/cors/redirect-userinfo.htm b/tests/wpt/tests/cors/redirect-userinfo.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/redirect-userinfo.htm rename to tests/wpt/tests/cors/redirect-userinfo.htm diff --git a/tests/wpt/web-platform-tests/cors/remote-origin.htm b/tests/wpt/tests/cors/remote-origin.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/remote-origin.htm rename to tests/wpt/tests/cors/remote-origin.htm diff --git a/tests/wpt/web-platform-tests/cors/request-headers.htm b/tests/wpt/tests/cors/request-headers.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/request-headers.htm rename to tests/wpt/tests/cors/request-headers.htm diff --git a/tests/wpt/web-platform-tests/cors/resources/304.py b/tests/wpt/tests/cors/resources/304.py similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/304.py rename to tests/wpt/tests/cors/resources/304.py diff --git a/tests/wpt/web-platform-tests/cors/resources/access-control-expose-headers.json b/tests/wpt/tests/cors/resources/access-control-expose-headers.json similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/access-control-expose-headers.json rename to tests/wpt/tests/cors/resources/access-control-expose-headers.json diff --git a/tests/wpt/web-platform-tests/cors/resources/cache-304.py b/tests/wpt/tests/cors/resources/cache-304.py similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/cache-304.py rename to tests/wpt/tests/cors/resources/cache-304.py diff --git a/tests/wpt/web-platform-tests/cors/resources/checkandremove.py b/tests/wpt/tests/cors/resources/checkandremove.py similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/checkandremove.py rename to tests/wpt/tests/cors/resources/checkandremove.py diff --git a/tests/wpt/web-platform-tests/cors/resources/cors-cookie.py b/tests/wpt/tests/cors/resources/cors-cookie.py similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/cors-cookie.py rename to tests/wpt/tests/cors/resources/cors-cookie.py diff --git a/tests/wpt/web-platform-tests/cors/resources/cors-headers.asis b/tests/wpt/tests/cors/resources/cors-headers.asis similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/cors-headers.asis rename to tests/wpt/tests/cors/resources/cors-headers.asis diff --git a/tests/wpt/web-platform-tests/cors/resources/cors-makeheader.py b/tests/wpt/tests/cors/resources/cors-makeheader.py similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/cors-makeheader.py rename to tests/wpt/tests/cors/resources/cors-makeheader.py diff --git a/tests/wpt/web-platform-tests/cors/resources/expose-headers.py b/tests/wpt/tests/cors/resources/expose-headers.py similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/expose-headers.py rename to tests/wpt/tests/cors/resources/expose-headers.py diff --git a/tests/wpt/web-platform-tests/cors/resources/image-tainting-checker.sub.html b/tests/wpt/tests/cors/resources/image-tainting-checker.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/image-tainting-checker.sub.html rename to tests/wpt/tests/cors/resources/image-tainting-checker.sub.html diff --git a/tests/wpt/web-platform-tests/cors/resources/preflight-cache-partitioning-iframe.sub.html b/tests/wpt/tests/cors/resources/preflight-cache-partitioning-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/preflight-cache-partitioning-iframe.sub.html rename to tests/wpt/tests/cors/resources/preflight-cache-partitioning-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/cors/resources/preflight-cache-partitioning.sub.html b/tests/wpt/tests/cors/resources/preflight-cache-partitioning.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/preflight-cache-partitioning.sub.html rename to tests/wpt/tests/cors/resources/preflight-cache-partitioning.sub.html diff --git a/tests/wpt/web-platform-tests/cors/resources/preflight-partitioning.py b/tests/wpt/tests/cors/resources/preflight-partitioning.py similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/preflight-partitioning.py rename to tests/wpt/tests/cors/resources/preflight-partitioning.py diff --git a/tests/wpt/web-platform-tests/cors/resources/preflight.py b/tests/wpt/tests/cors/resources/preflight.py similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/preflight.py rename to tests/wpt/tests/cors/resources/preflight.py diff --git a/tests/wpt/web-platform-tests/cors/resources/remote-xhrer.html b/tests/wpt/tests/cors/resources/remote-xhrer.html similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/remote-xhrer.html rename to tests/wpt/tests/cors/resources/remote-xhrer.html diff --git a/tests/wpt/web-platform-tests/cors/resources/status.py b/tests/wpt/tests/cors/resources/status.py similarity index 100% rename from tests/wpt/web-platform-tests/cors/resources/status.py rename to tests/wpt/tests/cors/resources/status.py diff --git a/tests/wpt/web-platform-tests/cors/response-headers.htm b/tests/wpt/tests/cors/response-headers.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/response-headers.htm rename to tests/wpt/tests/cors/response-headers.htm diff --git a/tests/wpt/web-platform-tests/cors/script-304.html b/tests/wpt/tests/cors/script-304.html similarity index 100% rename from tests/wpt/web-platform-tests/cors/script-304.html rename to tests/wpt/tests/cors/script-304.html diff --git a/tests/wpt/web-platform-tests/cors/simple-requests-ch.tentative.htm b/tests/wpt/tests/cors/simple-requests-ch.tentative.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/simple-requests-ch.tentative.htm rename to tests/wpt/tests/cors/simple-requests-ch.tentative.htm diff --git a/tests/wpt/web-platform-tests/cors/simple-requests.htm b/tests/wpt/tests/cors/simple-requests.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/simple-requests.htm rename to tests/wpt/tests/cors/simple-requests.htm diff --git a/tests/wpt/web-platform-tests/cors/status-async.htm b/tests/wpt/tests/cors/status-async.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/status-async.htm rename to tests/wpt/tests/cors/status-async.htm diff --git a/tests/wpt/web-platform-tests/cors/status-preflight.htm b/tests/wpt/tests/cors/status-preflight.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/status-preflight.htm rename to tests/wpt/tests/cors/status-preflight.htm diff --git a/tests/wpt/web-platform-tests/cors/status.htm b/tests/wpt/tests/cors/status.htm similarity index 100% rename from tests/wpt/web-platform-tests/cors/status.htm rename to tests/wpt/tests/cors/status.htm diff --git a/tests/wpt/web-platform-tests/cors/support.js b/tests/wpt/tests/cors/support.js similarity index 100% rename from tests/wpt/web-platform-tests/cors/support.js rename to tests/wpt/tests/cors/support.js diff --git a/tests/wpt/web-platform-tests/credential-management/META.yml b/tests/wpt/tests/credential-management/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/META.yml rename to tests/wpt/tests/credential-management/META.yml diff --git a/tests/wpt/web-platform-tests/credential-management/credentialscontainer-create-basics.https.html b/tests/wpt/tests/credential-management/credentialscontainer-create-basics.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/credentialscontainer-create-basics.https.html rename to tests/wpt/tests/credential-management/credentialscontainer-create-basics.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/credentialscontainer-prevent-silent-access.https.html b/tests/wpt/tests/credential-management/credentialscontainer-prevent-silent-access.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/credentialscontainer-prevent-silent-access.https.html rename to tests/wpt/tests/credential-management/credentialscontainer-prevent-silent-access.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-context.https.html b/tests/wpt/tests/credential-management/fedcm-context.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-context.https.html rename to tests/wpt/tests/credential-management/fedcm-context.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-cross-origin-policy.https.html b/tests/wpt/tests/credential-management/fedcm-cross-origin-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-cross-origin-policy.https.html rename to tests/wpt/tests/credential-management/fedcm-cross-origin-policy.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-cross-origin-policy.https.html.sub.headers b/tests/wpt/tests/credential-management/fedcm-cross-origin-policy.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-cross-origin-policy.https.html.sub.headers rename to tests/wpt/tests/credential-management/fedcm-cross-origin-policy.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-csp.https.html b/tests/wpt/tests/credential-management/fedcm-csp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-csp.https.html rename to tests/wpt/tests/credential-management/fedcm-csp.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-csp.https.html.sub.headers b/tests/wpt/tests/credential-management/fedcm-csp.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-csp.https.html.sub.headers rename to tests/wpt/tests/credential-management/fedcm-csp.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-iframe.https.html b/tests/wpt/tests/credential-management/fedcm-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-iframe.https.html rename to tests/wpt/tests/credential-management/fedcm-iframe.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-loginhint.https.html b/tests/wpt/tests/credential-management/fedcm-loginhint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-loginhint.https.html rename to tests/wpt/tests/credential-management/fedcm-loginhint.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-logout-rps.https.html b/tests/wpt/tests/credential-management/fedcm-logout-rps.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-logout-rps.https.html rename to tests/wpt/tests/credential-management/fedcm-logout-rps.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-logout-rps.https.html.headers b/tests/wpt/tests/credential-management/fedcm-logout-rps.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-logout-rps.https.html.headers rename to tests/wpt/tests/credential-management/fedcm-logout-rps.https.html.headers diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/abort-multiple-gets-through-first-idp.https.html b/tests/wpt/tests/credential-management/fedcm-multi-idp/abort-multiple-gets-through-first-idp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/abort-multiple-gets-through-first-idp.https.html rename to tests/wpt/tests/credential-management/fedcm-multi-idp/abort-multiple-gets-through-first-idp.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/abort-multiple-gets-through-second-idp.https.html b/tests/wpt/tests/credential-management/fedcm-multi-idp/abort-multiple-gets-through-second-idp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/abort-multiple-gets-through-second-idp.https.html rename to tests/wpt/tests/credential-management/fedcm-multi-idp/abort-multiple-gets-through-second-idp.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/get-before-and-after-onload.https.html b/tests/wpt/tests/credential-management/fedcm-multi-idp/get-before-and-after-onload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/get-before-and-after-onload.https.html rename to tests/wpt/tests/credential-management/fedcm-multi-idp/get-before-and-after-onload.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/get-before-and-during-onload.https.html b/tests/wpt/tests/credential-management/fedcm-multi-idp/get-before-and-during-onload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/get-before-and-during-onload.https.html rename to tests/wpt/tests/credential-management/fedcm-multi-idp/get-before-and-during-onload.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/get-before-onload-and-during-dom-content-loaded.https.html b/tests/wpt/tests/credential-management/fedcm-multi-idp/get-before-onload-and-during-dom-content-loaded.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/get-before-onload-and-during-dom-content-loaded.https.html rename to tests/wpt/tests/credential-management/fedcm-multi-idp/get-before-onload-and-during-dom-content-loaded.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/multiple-gets-after-abort.https.html b/tests/wpt/tests/credential-management/fedcm-multi-idp/multiple-gets-after-abort.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/multiple-gets-after-abort.https.html rename to tests/wpt/tests/credential-management/fedcm-multi-idp/multiple-gets-after-abort.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/multiple-gets-after-onload.https.html b/tests/wpt/tests/credential-management/fedcm-multi-idp/multiple-gets-after-onload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/multiple-gets-after-onload.https.html rename to tests/wpt/tests/credential-management/fedcm-multi-idp/multiple-gets-after-onload.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/multiple-gets-before-onload.https.html b/tests/wpt/tests/credential-management/fedcm-multi-idp/multiple-gets-before-onload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/multiple-gets-before-onload.https.html rename to tests/wpt/tests/credential-management/fedcm-multi-idp/multiple-gets-before-onload.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/multiple-gets-during-onload.https.html b/tests/wpt/tests/credential-management/fedcm-multi-idp/multiple-gets-during-onload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/multiple-gets-during-onload.https.html rename to tests/wpt/tests/credential-management/fedcm-multi-idp/multiple-gets-during-onload.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/single-get-after-onload.https.html b/tests/wpt/tests/credential-management/fedcm-multi-idp/single-get-after-onload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/single-get-after-onload.https.html rename to tests/wpt/tests/credential-management/fedcm-multi-idp/single-get-after-onload.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/single-get-before-onload.https.html b/tests/wpt/tests/credential-management/fedcm-multi-idp/single-get-before-onload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/single-get-before-onload.https.html rename to tests/wpt/tests/credential-management/fedcm-multi-idp/single-get-before-onload.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/single-get-during-onload.https.html b/tests/wpt/tests/credential-management/fedcm-multi-idp/single-get-during-onload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-multi-idp/single-get-during-onload.https.html rename to tests/wpt/tests/credential-management/fedcm-multi-idp/single-get-during-onload.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-network-requests.https.html b/tests/wpt/tests/credential-management/fedcm-network-requests.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-network-requests.https.html rename to tests/wpt/tests/credential-management/fedcm-network-requests.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/fedcm-userinfo.https.html b/tests/wpt/tests/credential-management/fedcm-userinfo.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/fedcm-userinfo.https.html rename to tests/wpt/tests/credential-management/fedcm-userinfo.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/federatedcredential-framed-get.sub.https.html b/tests/wpt/tests/credential-management/federatedcredential-framed-get.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/federatedcredential-framed-get.sub.https.html rename to tests/wpt/tests/credential-management/federatedcredential-framed-get.sub.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/idlharness.https.window.js b/tests/wpt/tests/credential-management/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/idlharness.https.window.js rename to tests/wpt/tests/credential-management/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/credential-management/otpcredential-get-basics.https.html b/tests/wpt/tests/credential-management/otpcredential-get-basics.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/otpcredential-get-basics.https.html rename to tests/wpt/tests/credential-management/otpcredential-get-basics.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/otpcredential-iframe.https.html b/tests/wpt/tests/credential-management/otpcredential-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/otpcredential-iframe.https.html rename to tests/wpt/tests/credential-management/otpcredential-iframe.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/passwordcredential-framed-get.sub.https.html b/tests/wpt/tests/credential-management/passwordcredential-framed-get.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/passwordcredential-framed-get.sub.https.html rename to tests/wpt/tests/credential-management/passwordcredential-framed-get.sub.https.html diff --git a/tests/wpt/web-platform-tests/credential-management/require_securecontext.html b/tests/wpt/tests/credential-management/require_securecontext.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/require_securecontext.html rename to tests/wpt/tests/credential-management/require_securecontext.html diff --git a/tests/wpt/web-platform-tests/credential-management/support/README.md b/tests/wpt/tests/credential-management/support/README.md similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/README.md rename to tests/wpt/tests/credential-management/support/README.md diff --git a/tests/wpt/web-platform-tests/credential-management/support/echoing-nester.html b/tests/wpt/tests/credential-management/support/echoing-nester.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/echoing-nester.html rename to tests/wpt/tests/credential-management/support/echoing-nester.html diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm-helper.sub.js b/tests/wpt/tests/credential-management/support/fedcm-helper.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm-helper.sub.js rename to tests/wpt/tests/credential-management/support/fedcm-helper.sub.js diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm-iframe-level2.html b/tests/wpt/tests/credential-management/support/fedcm-iframe-level2.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm-iframe-level2.html rename to tests/wpt/tests/credential-management/support/fedcm-iframe-level2.html diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm-iframe.html b/tests/wpt/tests/credential-management/support/fedcm-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm-iframe.html rename to tests/wpt/tests/credential-management/support/fedcm-iframe.html diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm-mock.js b/tests/wpt/tests/credential-management/support/fedcm-mock.js similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm-mock.js rename to tests/wpt/tests/credential-management/support/fedcm-mock.js diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm-mojojs-helper.js b/tests/wpt/tests/credential-management/support/fedcm-mojojs-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm-mojojs-helper.js rename to tests/wpt/tests/credential-management/support/fedcm-mojojs-helper.js diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/accounts.py b/tests/wpt/tests/credential-management/support/fedcm/accounts.py similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/accounts.py rename to tests/wpt/tests/credential-management/support/fedcm/accounts.py diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/client_metadata.py b/tests/wpt/tests/credential-management/support/fedcm/client_metadata.py similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/client_metadata.py rename to tests/wpt/tests/credential-management/support/fedcm/client_metadata.py diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/client_metadata.py.headers b/tests/wpt/tests/credential-management/support/fedcm/client_metadata.py.headers similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/client_metadata.py.headers rename to tests/wpt/tests/credential-management/support/fedcm/client_metadata.py.headers diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/client_metadata_clear_count.py b/tests/wpt/tests/credential-management/support/fedcm/client_metadata_clear_count.py similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/client_metadata_clear_count.py rename to tests/wpt/tests/credential-management/support/fedcm/client_metadata_clear_count.py diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/intercept_service_worker.js b/tests/wpt/tests/credential-management/support/fedcm/intercept_service_worker.js similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/intercept_service_worker.js rename to tests/wpt/tests/credential-management/support/fedcm/intercept_service_worker.js diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/keys.py b/tests/wpt/tests/credential-management/support/fedcm/keys.py similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/keys.py rename to tests/wpt/tests/credential-management/support/fedcm/keys.py diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/manifest-not-in-list.json b/tests/wpt/tests/credential-management/support/fedcm/manifest-not-in-list.json similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/manifest-not-in-list.json rename to tests/wpt/tests/credential-management/support/fedcm/manifest-not-in-list.json diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/manifest.py b/tests/wpt/tests/credential-management/support/fedcm/manifest.py similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/manifest.py rename to tests/wpt/tests/credential-management/support/fedcm/manifest.py diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/manifest_redirect_accounts.json b/tests/wpt/tests/credential-management/support/fedcm/manifest_redirect_accounts.json similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/manifest_redirect_accounts.json rename to tests/wpt/tests/credential-management/support/fedcm/manifest_redirect_accounts.json diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/manifest_redirect_token.json b/tests/wpt/tests/credential-management/support/fedcm/manifest_redirect_token.json similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/manifest_redirect_token.json rename to tests/wpt/tests/credential-management/support/fedcm/manifest_redirect_token.json diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/manifest_with_single_account.json b/tests/wpt/tests/credential-management/support/fedcm/manifest_with_single_account.json similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/manifest_with_single_account.json rename to tests/wpt/tests/credential-management/support/fedcm/manifest_with_single_account.json diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/manifest_with_two_accounts.json b/tests/wpt/tests/credential-management/support/fedcm/manifest_with_two_accounts.json similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/manifest_with_two_accounts.json rename to tests/wpt/tests/credential-management/support/fedcm/manifest_with_two_accounts.json diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/select_manifest_in_root_manifest.py b/tests/wpt/tests/credential-management/support/fedcm/select_manifest_in_root_manifest.py similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/select_manifest_in_root_manifest.py rename to tests/wpt/tests/credential-management/support/fedcm/select_manifest_in_root_manifest.py diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/simple.html b/tests/wpt/tests/credential-management/support/fedcm/simple.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/simple.html rename to tests/wpt/tests/credential-management/support/fedcm/simple.html diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/single_account.py b/tests/wpt/tests/credential-management/support/fedcm/single_account.py similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/single_account.py rename to tests/wpt/tests/credential-management/support/fedcm/single_account.py diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/token.py b/tests/wpt/tests/credential-management/support/fedcm/token.py similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/token.py rename to tests/wpt/tests/credential-management/support/fedcm/token.py diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/token_with_account_id.py b/tests/wpt/tests/credential-management/support/fedcm/token_with_account_id.py similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/token_with_account_id.py rename to tests/wpt/tests/credential-management/support/fedcm/token_with_account_id.py diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/two_accounts.py b/tests/wpt/tests/credential-management/support/fedcm/two_accounts.py similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/two_accounts.py rename to tests/wpt/tests/credential-management/support/fedcm/two_accounts.py diff --git a/tests/wpt/web-platform-tests/credential-management/support/fedcm/userinfo-iframe.html b/tests/wpt/tests/credential-management/support/fedcm/userinfo-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/fedcm/userinfo-iframe.html rename to tests/wpt/tests/credential-management/support/fedcm/userinfo-iframe.html diff --git a/tests/wpt/web-platform-tests/credential-management/support/federatedcredential-get.html b/tests/wpt/tests/credential-management/support/federatedcredential-get.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/federatedcredential-get.html rename to tests/wpt/tests/credential-management/support/federatedcredential-get.html diff --git a/tests/wpt/web-platform-tests/credential-management/support/otpcredential-helper.js b/tests/wpt/tests/credential-management/support/otpcredential-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/otpcredential-helper.js rename to tests/wpt/tests/credential-management/support/otpcredential-helper.js diff --git a/tests/wpt/web-platform-tests/credential-management/support/otpcredential-iframe.html b/tests/wpt/tests/credential-management/support/otpcredential-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/otpcredential-iframe.html rename to tests/wpt/tests/credential-management/support/otpcredential-iframe.html diff --git a/tests/wpt/web-platform-tests/credential-management/support/passwordcredential-get.html b/tests/wpt/tests/credential-management/support/passwordcredential-get.html similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/passwordcredential-get.html rename to tests/wpt/tests/credential-management/support/passwordcredential-get.html diff --git a/tests/wpt/web-platform-tests/credential-management/support/set_cookie b/tests/wpt/tests/credential-management/support/set_cookie similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/set_cookie rename to tests/wpt/tests/credential-management/support/set_cookie diff --git a/tests/wpt/web-platform-tests/credential-management/support/set_cookie.headers b/tests/wpt/tests/credential-management/support/set_cookie.headers similarity index 100% rename from tests/wpt/web-platform-tests/credential-management/support/set_cookie.headers rename to tests/wpt/tests/credential-management/support/set_cookie.headers diff --git a/tests/wpt/web-platform-tests/css/.htaccess b/tests/wpt/tests/css/.htaccess similarity index 100% rename from tests/wpt/web-platform-tests/css/.htaccess rename to tests/wpt/tests/css/.htaccess diff --git a/tests/wpt/web-platform-tests/css/CSS1/META.yml b/tests/wpt/tests/css/CSS1/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS1/META.yml rename to tests/wpt/tests/css/CSS1/META.yml diff --git a/tests/wpt/web-platform-tests/css/CSS1/list-marker-inside-whitespace-001.xml b/tests/wpt/tests/css/CSS1/list-marker-inside-whitespace-001.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS1/list-marker-inside-whitespace-001.xml rename to tests/wpt/tests/css/CSS1/list-marker-inside-whitespace-001.xml diff --git a/tests/wpt/web-platform-tests/css/CSS1/support/css1test566a.png b/tests/wpt/tests/css/CSS1/support/css1test566a.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS1/support/css1test566a.png rename to tests/wpt/tests/css/CSS1/support/css1test566a.png diff --git a/tests/wpt/web-platform-tests/css/CSS1/support/list-marker-inside-whitespace-001.png b/tests/wpt/tests/css/CSS1/support/list-marker-inside-whitespace-001.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS1/support/list-marker-inside-whitespace-001.png rename to tests/wpt/tests/css/CSS1/support/list-marker-inside-whitespace-001.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/.htaccess b/tests/wpt/tests/css/CSS2/.htaccess similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/.htaccess rename to tests/wpt/tests/css/CSS2/.htaccess diff --git a/tests/wpt/web-platform-tests/css/CSS2/META.yml b/tests/wpt/tests/css/CSS2/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/META.yml rename to tests/wpt/tests/css/CSS2/META.yml diff --git a/tests/wpt/web-platform-tests/css/CSS2/Makefile b/tests/wpt/tests/css/CSS2/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/Makefile rename to tests/wpt/tests/css/CSS2/Makefile diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-001-ref.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-001-ref.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-001.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-001.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-004-ref.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-004-ref.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-004a.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-004a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-004a.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-004a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-004b.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-004b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-004b.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-004b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-004c.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-004c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-004c.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-004c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-004d.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-004d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-004d.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-004d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-004e.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-004e.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-004e.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-004e.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-004f.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-004f.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-004f.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-004f.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-005-ref.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-005-ref.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-005a.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-005a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-005a.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-005a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-005b.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-005b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-005b.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-005b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-005c.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-005c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-005c.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-005c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-005d.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-005d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-005d.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-005d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-007-ref.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-007-ref.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-007.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-007.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-009-ref.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-009-ref.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-009a.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-009a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-009a.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-009a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-009b.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-009b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-009b.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-009b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-009e.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-009e.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-009e.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-009e.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-009f.xht b/tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-009f.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-containing-block-initial-009f.xht rename to tests/wpt/tests/css/CSS2/abspos/abspos-containing-block-initial-009f.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-in-block-in-inline-in-relpos-inline.html b/tests/wpt/tests/css/CSS2/abspos/abspos-in-block-in-inline-in-relpos-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/abspos-in-block-in-inline-in-relpos-inline.html rename to tests/wpt/tests/css/CSS2/abspos/abspos-in-block-in-inline-in-relpos-inline.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/adjacent-to-relpos-inline-in-inline-that-had-block.html b/tests/wpt/tests/css/CSS2/abspos/adjacent-to-relpos-inline-in-inline-that-had-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/adjacent-to-relpos-inline-in-inline-that-had-block.html rename to tests/wpt/tests/css/CSS2/abspos/adjacent-to-relpos-inline-in-inline-that-had-block.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/adjacent-to-relpos-inline-that-had-block.html b/tests/wpt/tests/css/CSS2/abspos/adjacent-to-relpos-inline-that-had-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/adjacent-to-relpos-inline-that-had-block.html rename to tests/wpt/tests/css/CSS2/abspos/adjacent-to-relpos-inline-that-had-block.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/between-float-and-text.html b/tests/wpt/tests/css/CSS2/abspos/between-float-and-text.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/between-float-and-text.html rename to tests/wpt/tests/css/CSS2/abspos/between-float-and-text.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/hypothetical-box-dynamic-ref.html b/tests/wpt/tests/css/CSS2/abspos/hypothetical-box-dynamic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/hypothetical-box-dynamic-ref.html rename to tests/wpt/tests/css/CSS2/abspos/hypothetical-box-dynamic-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/hypothetical-box-dynamic.html b/tests/wpt/tests/css/CSS2/abspos/hypothetical-box-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/hypothetical-box-dynamic.html rename to tests/wpt/tests/css/CSS2/abspos/hypothetical-box-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/hypothetical-inline-alone-on-second-line-ref.html b/tests/wpt/tests/css/CSS2/abspos/hypothetical-inline-alone-on-second-line-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/hypothetical-inline-alone-on-second-line-ref.html rename to tests/wpt/tests/css/CSS2/abspos/hypothetical-inline-alone-on-second-line-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/hypothetical-inline-alone-on-second-line.html b/tests/wpt/tests/css/CSS2/abspos/hypothetical-inline-alone-on-second-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/hypothetical-inline-alone-on-second-line.html rename to tests/wpt/tests/css/CSS2/abspos/hypothetical-inline-alone-on-second-line.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/remove-block-between-inline-and-abspos.html b/tests/wpt/tests/css/CSS2/abspos/remove-block-between-inline-and-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/remove-block-between-inline-and-abspos.html rename to tests/wpt/tests/css/CSS2/abspos/remove-block-between-inline-and-abspos.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/static-fixed-inside-abspos.html b/tests/wpt/tests/css/CSS2/abspos/static-fixed-inside-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/static-fixed-inside-abspos.html rename to tests/wpt/tests/css/CSS2/abspos/static-fixed-inside-abspos.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/static-inside-inline-block-ref.html b/tests/wpt/tests/css/CSS2/abspos/static-inside-inline-block-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/static-inside-inline-block-ref.html rename to tests/wpt/tests/css/CSS2/abspos/static-inside-inline-block-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/static-inside-inline-block.html b/tests/wpt/tests/css/CSS2/abspos/static-inside-inline-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/static-inside-inline-block.html rename to tests/wpt/tests/css/CSS2/abspos/static-inside-inline-block.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/static-inside-table-cell.html b/tests/wpt/tests/css/CSS2/abspos/static-inside-table-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/static-inside-table-cell.html rename to tests/wpt/tests/css/CSS2/abspos/static-inside-table-cell.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/table-caption-is-containing-block-001.html b/tests/wpt/tests/css/CSS2/abspos/table-caption-is-containing-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/table-caption-is-containing-block-001.html rename to tests/wpt/tests/css/CSS2/abspos/table-caption-is-containing-block-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/table-caption-passes-abspos-up-001.html b/tests/wpt/tests/css/CSS2/abspos/table-caption-passes-abspos-up-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/abspos/table-caption-passes-abspos-up-001.html rename to tests/wpt/tests/css/CSS2/abspos/table-caption-passes-abspos-up-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-001-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-001-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-003-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-003-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-006.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-006.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-006a.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-006a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-006a.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-006a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-007.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-007.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-008.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-008.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-009.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-009.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-010.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-010.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-011.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-011.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-012.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-012.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-013.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-013.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-014.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-014.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-015.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-015.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-016.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-016.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-017.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-017.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-018.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-018.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-019.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-019.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-020.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-020.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-021.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-021.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-022.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-022.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-023.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-023.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-024.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-024.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-025.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-025.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-026-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-026-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-026.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-026.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-027.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-027.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-028.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-028.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-029.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-029.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-030-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-030-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-030-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-030-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-030.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-030.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-031.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-031.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-032.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-032.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-033.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-033.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-034.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-034.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-035.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-035.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-036.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-036.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-037.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-037.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-038.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-038.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-039.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-039.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-040.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-040.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-041.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-041.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-042.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-042.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-043-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-043-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-043-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-043-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-043.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-043.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-044.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-044.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-045.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-045.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-046.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-046.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-047.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-047.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-048.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-048.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-049.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-049.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-050.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-050.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-051.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-051.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-052.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-052.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-053.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-053.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-054.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-054.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-055.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-055.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-056.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-056.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-057.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-057.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-058.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-058.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-059.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-059.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-060.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-060.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-061.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-061.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-062.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-062.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-063.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-063.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-064.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-064.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-065.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-065.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-066.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-066.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-067.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-067.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-068.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-068.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-069.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-069.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-070.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-070.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-071.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-071.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-072.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-072.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-073.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-073.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-074.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-074.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-075.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-075.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-076.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-076.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-077.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-077.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-078.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-078.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-079.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-079.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-080.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-080.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-081.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-081.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-082.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-082.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-083.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-083.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-084.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-084.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-085.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-085.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-086.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-086.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-087-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-087-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-087-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-087-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-087.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-087.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-087.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-088.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-088.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-089.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-089.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-090-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-090-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-090-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-090-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-090.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-090.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-091.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-091.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-092.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-092.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-093.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-093.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-094.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-094.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-095.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-095.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-096.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-096.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-097.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-097.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-098.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-098.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-099.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-099.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-100.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-100.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-101.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-101.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-102.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-102.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-103.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-103.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-104.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-104.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-105.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-105.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-106.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-106.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-107.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-107.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-108.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-108.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-109.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-109.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-110.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-110.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-111.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-111.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-112.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-112.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-113.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-113.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-114.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-114.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-115.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-115.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-116.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-116.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-117.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-117.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-118.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-118.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-119.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-119.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-120.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-120.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-121.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-121.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-122.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-122.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-123.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-123.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-124.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-124.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-124.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-125.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-125.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-125.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-126.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-126.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-127.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-127.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-128.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-128.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-128.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-129.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-129.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-130-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-130-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-130-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-130-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-130.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-130.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-130.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-131.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-131.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-131.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-132.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-132.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-132.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-133.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-133.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-133.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-133.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-134.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-134.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-134.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-134.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-135.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-135.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-135.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-136.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-136.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-136.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-136.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-137.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-137.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-137.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-137.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-138.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-138.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-138.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-139.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-139.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-139.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-139.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-140.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-140.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-140.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-141.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-141.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-141.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-142.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-142.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-142.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-143.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-143.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-143.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-144.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-144.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-144.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-145.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-145.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-146.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-146.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-146.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-146.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-147.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-147.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-147.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-147.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-148.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-148.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-148.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-148.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-149.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-149.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-149.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-149.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-150.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-150.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-150.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-150.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-151.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-151.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-151.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-151.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-152.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-152.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-152.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-152.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-153.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-153.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-153.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-153.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-154.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-154.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-154.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-154.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-155.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-155.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-155.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-155.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-156.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-156.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-156.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-156.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-157.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-157.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-157.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-157.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-158.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-158.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-158.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-158.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-159.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-159.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-159.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-159.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-160.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-160.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-160.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-160.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-161.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-161.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-161.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-161.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-162.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-162.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-162.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-162.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-163.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-163.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-163.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-163.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-164.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-164.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-164.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-164.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-165.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-165.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-165.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-165.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-166.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-166.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-166.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-166.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-167.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-167.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-167.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-167.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-168.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-168.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-168.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-168.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-169.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-169.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-169.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-169.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-170.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-170.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-170.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-170.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-171.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-171.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-171.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-171.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-172.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-172.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-172.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-172.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-173.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-173.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-173.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-173.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-174.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-174.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-174.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-174.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-175.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-175.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-175.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-175.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-176.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-176.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-176.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-176.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-177.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-177.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-177.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-177.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-178.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-178.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-178.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-178.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-179.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-179.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-179.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-179.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-180.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-180.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-180.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-180.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-181.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-181.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-181.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-181.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-182.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-182.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-182.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-182.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-183.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-183.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-183.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-183.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-184.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-184.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-184.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-184.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-185.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-185.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-185.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-185.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-186.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-186.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-186.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-186.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-187.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-187.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-187.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-187.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-188.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-188.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-188.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-188.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-189.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-189.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-189.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-189.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-190.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-190.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-190.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-190.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-191.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-191.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-191.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-191.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-192.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-192.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-192.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-192.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-193.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-193.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-193.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-193.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-194.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-194.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-194.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-194.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-195.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-195.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-195.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-195.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-196.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-196.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-196.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-196.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-197.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-197.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-197.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-197.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-198.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-198.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-198.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-198.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-199.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-199.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-199.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-199.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-200.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-200.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-200.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-200.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-201.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-201.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-201.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-201.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-202.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-202.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-202.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-202.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-203.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-203.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-203.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-203.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-204.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-204.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-204.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-204.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-205.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-205.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-205.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-205.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-206.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-206.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-206.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-206.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-207.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-207.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-207.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-207.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-208.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-208.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-208.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-208.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-209.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-209.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-209.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-209.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-210.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-210.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-210.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-210.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-211.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-211.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-211.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-211.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-212.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-212.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-212.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-212.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-213.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-213.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-213.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-213.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-214.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-214.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-214.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-214.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-215.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-215.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-215.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-215.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-216.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-216.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-216.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-216.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-217.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-217.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-217.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-217.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-218.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-218.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-218.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-218.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-219.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-219.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-219.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-219.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-220.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-220.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-220.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-220.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-221.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-221.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-221.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-221.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-222.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-222.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-222.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-222.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-223.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-223.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-223.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-223.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-224.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-224.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-224.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-224.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-225.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-225.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-225.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-225.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-226.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-226.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-226.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-226.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-227.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-227.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-227.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-227.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-228.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-228.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-228.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-228.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-229.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-229.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-229.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-229.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-230.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-230.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-230.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-230.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-231.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-231.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-231.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-231.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-232.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-232.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-232.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-232.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-233.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-233.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-233.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-233.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-234.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-234.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-234.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-234.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-235.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-235.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-235.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-235.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-236.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-236.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-236.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-236.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-237.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-237.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-237.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-237.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-238.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-238.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-238.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-238.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-239.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-239.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-239.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-239.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-240.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-240.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-240.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-240.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-241.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-241.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-241.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-241.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-242.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-242.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-242.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-242.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-243.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-243.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-243.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-243.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-244.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-244.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-244.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-244.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-245.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-245.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-245.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-245.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-246.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-246.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-246.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-246.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-247.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-247.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-247.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-247.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-248.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-248.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-248.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-248.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-249.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-249.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-249.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-249.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-250.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-250.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-250.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-250.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-251.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-251.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-251.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-251.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-252.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-252.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-252.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-252.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-253.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-253.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-253.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-253.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-254.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-254.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-254.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-254.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-255.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-255.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-255.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-255.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-256.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-256.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-256.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-256.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-257.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-257.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-257.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-257.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-258.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-258.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-258.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-258.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-259.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-259.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-259.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-259.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-260.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-260.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-260.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-260.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-261.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-261.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-261.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-261.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-262.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-262.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-262.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-262.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-263.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-263.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-263.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-263.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-264.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-264.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-264.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-264.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-265.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-265.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-265.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-265.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-266.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-266.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-266.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-266.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-267.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-267.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-267.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-267.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-268.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-268.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-268.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-268.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-269.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-269.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-269.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-269.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-270.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-270.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-270.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-270.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-271.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-271.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-271.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-271.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-272.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-272.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-272.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-272.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-273.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-273.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-273.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-273.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-274.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-274.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-274.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-274.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-275.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-275.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-275.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-275.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-276.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-276.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-276.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-276.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-277.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-277.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-277.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-277.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-278.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-278.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-278.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-278.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-279.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-279.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-279.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-279.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-280.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-280.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-280.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-280.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-281.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-281.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-281.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-281.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-282.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-282.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-282.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-282.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-283.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-283.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-283.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-283.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-284.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-284.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-284.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-284.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-285.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-285.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-285.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-285.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-286.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-286.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-286.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-286.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-287.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-287.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-287.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-287.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-288.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-288.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-288.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-288.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-289.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-289.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-289.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-289.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-290.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-290.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-290.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-290.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-291.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-291.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-291.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-291.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-292.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-292.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-292.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-292.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-293.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-293.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-293.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-293.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-294.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-294.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-294.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-294.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-295.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-295.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-295.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-295.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-296.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-296.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-296.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-296.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-297.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-297.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-297.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-297.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-298.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-298.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-298.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-298.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-299.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-299.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-299.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-299.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-300.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-300.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-300.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-300.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-301.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-301.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-301.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-301.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-302.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-302.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-302.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-302.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-303.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-303.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-303.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-303.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-304.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-304.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-304.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-304.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-305.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-305.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-305.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-305.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-306.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-306.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-306.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-306.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-307.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-307.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-307.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-307.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-308.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-308.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-308.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-308.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-309.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-309.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-309.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-309.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-310.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-310.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-310.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-310.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-311.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-311.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-311.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-311.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-312.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-312.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-312.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-312.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-313.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-313.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-313.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-313.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-314.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-314.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-314.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-314.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-315.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-315.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-315.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-315.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-316.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-316.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-316.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-316.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-317.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-317.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-317.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-317.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-318.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-318.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-318.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-318.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-319.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-319.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-319.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-319.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-320.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-320.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-320.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-320.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-321.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-321.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-321.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-321.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-322.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-322.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-322.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-322.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-323.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-323.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-323.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-323.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-324.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-324.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-324.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-324.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-325.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-325.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-325.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-325.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-326-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-326-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-326-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-326-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-326.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-326.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-326.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-326.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-327.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-327.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-327.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-327.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-328-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-328-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-328-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-328-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-328.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-328.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-328.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-328.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-329-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-329-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-329-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-329-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-329.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-329.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-329.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-329.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-330.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-330.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-330.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-330.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-alpha-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-alpha-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-alpha-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-alpha-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-alpha-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-alpha-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-alpha-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-alpha-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-alpha-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-alpha-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-alpha-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-alpha-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-alpha-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-alpha-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-alpha-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-alpha-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-alpha-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-alpha-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-alpha-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-alpha-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-alpha-README b/tests/wpt/tests/css/CSS2/backgrounds/background-alpha-README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-alpha-README rename to tests/wpt/tests/css/CSS2/backgrounds/background-alpha-README diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-animated-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-animated-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-animated-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-animated-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-006.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-007.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-008.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-009.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-010.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-012.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-013.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-014.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-015.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-006.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-006.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-007.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-007.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-008.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-008.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-009-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-009-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-009.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-009.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-010.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-010.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-006.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-007.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-008.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-009.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-010.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-012.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-013.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-014.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-015.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-attachment-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-attachment-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-bg-pos-204-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-bg-pos-204-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-bg-pos-204-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-bg-pos-204-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-bg-pos-204.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-bg-pos-204.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-bg-pos-204.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-bg-pos-204.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-bg-pos-205.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-bg-pos-205.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-bg-pos-205.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-bg-pos-205.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-bg-pos-206.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-bg-pos-206.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-bg-pos-206.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-bg-pos-206.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-bg-pos-207.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-bg-pos-207.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-bg-pos-207.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-bg-pos-207.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-bg-pos-208-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-bg-pos-208-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-bg-pos-208-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-bg-pos-208-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-bg-pos-208.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-bg-pos-208.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-bg-pos-208.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-bg-pos-208.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-body-001-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-body-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-body-001-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-body-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-body-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-body-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-body-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-body-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-body-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-body-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-body-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-body-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-body-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-body-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-body-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-body-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-001-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-001-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-002-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-002-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-003-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-003-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-004-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-004-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-005-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-005-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-006-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-006-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-006.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-006.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-007.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-007.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-008.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-008.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-009-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-009-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-009.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-009.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-010-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-010-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-010.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-010.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-011-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-011-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-011.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-011.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-012-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-012-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-012.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-012.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-013-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-013-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-013.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-013.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-014-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-014-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-014.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-014.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-015-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-015-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-015.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-015.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-016-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-016-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-016.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-016.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-017-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-017-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-017.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-017.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-018.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-018.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-019-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-019-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-019.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-019.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-020-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-020-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-020.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-020.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-021-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-021-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-021.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-021.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-022-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-022-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-022.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-022.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-023.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-023.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-024.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-024.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-025-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-025-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-025.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-025.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-026-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-026-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-026.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-026.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-027-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-027-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-027.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-027.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-028-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-028-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-028.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-028.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-029-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-029-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-029-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-029-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-029.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-029.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-030.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-030.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-031.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-031.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-032-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-032-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-032-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-032-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-032.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-032.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-033-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-033-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-033-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-033-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-033.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-033.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-034-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-034-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-034-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-034-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-034.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-034.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-035-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-035-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-035-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-035-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-035.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-035.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-036.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-036.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-037-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-037-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-037-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-037-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-037.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-037.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-038-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-038-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-038-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-038-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-038.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-038.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-039-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-039-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-039-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-039-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-039.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-039.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-040-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-040-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-040-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-040-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-040.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-040.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-041-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-041-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-041-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-041-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-041.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-041.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-042-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-042-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-042-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-042-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-042.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-042.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-043-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-043-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-043-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-043-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-043.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-043.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-044-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-044-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-044-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-044-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-044.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-044.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-045-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-045-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-045-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-045-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-045.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-045.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-046.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-046.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-047.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-047.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-048.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-048.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-049-020202-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-049-020202-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-049-020202-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-049-020202-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-049-030303-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-049-030303-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-049-030303-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-049-030303-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-049.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-049.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-050.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-050.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-051.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-051.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-052-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-052-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-052-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-052-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-052.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-052.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-053.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-053.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-054-fcfcfc-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-054-fcfcfc-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-054-fcfcfc-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-054-fcfcfc-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-054-fdfdfd-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-054-fdfdfd-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-054-fdfdfd-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-054-fdfdfd-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-054.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-054.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-055.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-055.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-056.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-056.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-057.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-057.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-058.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-058.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-059.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-059.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-060.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-060.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-061.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-061.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-062.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-062.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-063-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-063-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-063-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-063-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-063.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-063.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-064.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-064.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-065.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-065.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-066.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-066.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-067.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-067.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-068.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-068.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-069.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-069.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-070-020000-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-070-020000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-070-020000-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-070-020000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-070-030000-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-070-030000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-070-030000-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-070-030000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-070.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-070.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-071.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-071.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-072.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-072.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-073-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-073-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-073-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-073-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-073.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-073.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-074.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-074.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-075-fc0000-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-075-fc0000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-075-fc0000-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-075-fc0000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-075-fd0000-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-075-fd0000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-075-fd0000-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-075-fd0000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-075.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-075.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-076.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-076.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-077.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-077.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-078.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-078.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-079.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-079.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-080.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-080.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-081.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-081.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-082.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-082.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-083-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-083-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-083-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-083-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-083.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-083.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-084.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-084.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-085.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-085.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-086.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-086.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-087.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-087.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-087.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-088.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-088.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-089.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-089.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-090-000200-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-090-000200-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-090-000200-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-090-000200-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-090-000300-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-090-000300-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-090-000300-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-090-000300-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-090.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-090.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-091.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-091.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-092.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-092.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-093-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-093-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-093-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-093-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-093.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-093.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-094.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-094.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-095-00fc00-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-095-00fc00-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-095-00fc00-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-095-00fc00-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-095-00fd00-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-095-00fd00-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-095-00fd00-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-095-00fd00-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-095.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-095.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-096.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-096.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-097.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-097.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-098.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-098.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-099.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-099.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-100.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-100.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-101.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-101.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-102.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-102.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-103-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-103-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-103.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-103.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-104.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-104.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-105.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-105.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-106.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-106.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-107.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-107.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-108.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-108.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-109.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-109.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-110-000002-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-110-000002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-110-000002-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-110-000002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-110-000003-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-110-000003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-110-000003-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-110-000003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-110.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-110.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-111.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-111.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-112.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-112.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-113-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-113-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-113.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-113.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-114.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-114.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-115-0000fc-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-115-0000fc-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-115-0000fc-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-115-0000fc-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-115-0000fd-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-115-0000fd-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-115-0000fd-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-115-0000fd-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-115.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-115.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-116.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-116.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-117.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-117.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-118.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-118.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-119.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-119.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-120.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-120.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-121.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-121.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-122.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-122.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-123-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-123-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-123-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-123-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-123.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-123.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-124.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-124.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-124.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-125.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-125.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-125.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-126.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-126.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-127.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-127.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-128.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-128.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-128.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-129-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-129-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-129-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-129-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-129.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-129.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-130.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-130.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-130.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-131.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-131.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-131.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-132-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-132-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-132-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-132-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-132.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-132.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-132.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-133.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-133.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-133.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-133.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-134.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-134.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-134.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-134.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-135-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-135-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-135-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-135-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-135.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-135.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-135.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-136-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-136-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-136-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-136-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-136.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-136.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-136.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-136.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-137.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-137.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-137.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-137.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-138-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-138-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-138-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-138-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-138.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-138.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-138.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-139-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-139-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-139-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-139-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-139.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-139.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-139.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-139.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-140-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-140-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-140-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-140-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-140.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-140.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-140.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-141.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-141.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-141.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-142-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-142-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-142-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-142-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-142.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-142.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-142.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-143-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-143-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-143-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-143-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-143.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-143.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-143.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-144.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-144.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-144.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-145-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-145-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-145-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-145-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-145.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-145.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-174.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-174.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-174.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-174.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-175-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-175-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-175-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-175-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-175.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-175.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-175.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-175.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-006.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-007.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-008.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-009.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-010.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-012.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-013.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-014.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-015.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-color-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-color-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-cover-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-cover-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-cover-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-cover-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-cover-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-cover-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-cover-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-cover-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-cover-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-cover-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-cover-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-cover-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-cover-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-cover-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-cover-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-cover-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-html-body-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-html-body-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-html-body-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-html-body-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-iframes-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-iframes-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-iframes-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-iframes-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-006.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-007.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-008.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-009.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-010.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-012.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-013.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-014.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-015.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-002-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-002-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-004-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-004-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-attachment-001-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-attachment-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-attachment-001-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-attachment-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-attachment-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-attachment-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-cover-attachment-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-cover-attachment-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-transparency-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-image-transparency-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-image-transparency-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-image-transparency-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-006.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-006.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-007.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-007.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-008.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-008.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-009.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-009.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-010.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-010.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-intrinsic-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-intrinsic-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-001-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-001-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-002-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-002-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-004-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-004-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-006.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-006.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-007-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-007-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-007.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-007.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-008.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-008.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-016.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-016.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-017.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-017.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-018.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-018.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-019.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-019.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-020.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-020.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-028.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-028.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-029.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-029.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-030.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-030.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-031.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-031.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-032.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-032.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-040.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-040.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-041.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-041.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-042.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-042.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-043.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-043.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-044.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-044.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-052.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-052.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-053.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-053.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-054.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-054.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-055.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-055.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-056.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-056.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-064.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-064.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-065.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-065.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-066.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-066.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-067.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-067.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-068.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-068.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-076.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-076.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-077.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-077.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-078.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-078.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-079.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-079.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-080.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-080.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-088.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-088.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-089.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-089.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-090.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-090.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-091.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-091.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-092.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-092.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-100.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-100.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-101.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-101.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-102.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-102.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-103.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-103.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-104.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-104.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-109.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-109.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-110.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-110.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-111.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-111.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-112.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-112.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-113-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-113-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-113.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-113.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-114-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-114-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-114-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-114-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-114.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-114.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-115-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-115-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-115-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-115-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-115.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-115.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-116-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-116-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-116-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-116-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-116.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-116.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-117-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-117-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-117-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-117-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-117.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-117.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-118.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-118.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-119-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-119-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-119-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-119-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-119.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-119.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-120.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-120.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-121.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-121.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-122.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-122.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-123.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-123.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-124.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-124.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-124.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-125.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-125.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-125.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-126.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-126.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-127-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-127-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-127-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-127-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-127.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-127.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-128.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-128.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-128.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-129-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-129-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-129-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-129-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-129.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-129.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-130.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-130.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-130.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-131.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-131.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-131.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-132.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-132.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-132.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-133.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-133.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-133.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-133.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-134.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-134.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-134.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-134.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-135.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-135.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-135.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-136.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-136.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-136.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-136.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-137.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-137.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-137.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-137.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-138.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-138.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-138.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-139.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-139.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-139.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-139.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-140.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-140.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-140.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-141.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-141.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-141.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-142.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-142.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-142.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-143.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-143.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-143.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-144.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-144.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-144.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-145.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-145.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-146.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-146.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-146.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-146.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-147.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-147.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-147.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-147.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-148.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-148.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-148.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-148.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-149.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-149.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-149.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-149.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-150.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-150.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-150.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-150.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-151.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-151.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-151.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-151.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-152-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-152-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-152-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-152-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-152.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-152.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-152.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-152.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-201.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-201.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-201.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-201.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-202.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-202.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-202.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-202.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-203.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-203.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-203.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-203.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001a-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001a-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001a.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001a.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001b-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001b-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001b.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001b.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001c.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001c.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001d.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001d.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001e-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001e-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001e-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001e-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001e.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001e.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-001e.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-001e.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002a.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-002a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002a.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-002a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002b.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-002b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002b.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-002b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002c.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-002c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002c.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-002c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002d.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-002d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002d.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-002d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002e.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-002e.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-002e.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-002e.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003a.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-003a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003a.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-003a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003b.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-003b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003b.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-003b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003c.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-003c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003c.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-003c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003d.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-003d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003d.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-003d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003e.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-003e.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-003e.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-003e.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005a.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-005a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005a.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-005a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005b.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-005b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005b.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-005b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005c.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-005c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005c.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-005c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005d.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-005d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005d.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-005d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005e.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-005e.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-005e.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-005e.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006a.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-006a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006a.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-006a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006b.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-006b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006b.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-006b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006c.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-006c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006c.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-006c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006d.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-006d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006d.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-006d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006e.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-006e.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-006e.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-006e.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-007.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-007a.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-007a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-007a.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-007a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-008.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-009.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-010.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-012.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-013.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-013d.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-013d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-013d.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-013d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-013e.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-013e.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-013e.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-013e.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-014.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-015.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-position-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-position-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-001-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-001-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-002-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-002-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-003-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-003-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-004-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-004-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-006.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-007.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-008.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-009.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-010.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-012.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-013.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-014.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-015.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-repeat-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-repeat-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-reset-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-reset-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-reset-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-reset-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-001-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-001-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-002-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-002-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-002.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-002.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-003.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-003.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-004-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-004-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-004.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-004.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-005-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-005-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-005.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-005.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-006-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-006-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-006.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-006.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-007-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-007-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-007.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-007.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-008-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-008-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-008.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-008.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-009.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-009.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-010-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-010-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-010.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-010.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-011-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-011-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-011.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-011.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-012a-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-012a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-012a-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-012a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-012a.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-012a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-012a.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-012a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-012b-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-012b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-012b-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-012b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-012b.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-012b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-012b.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-012b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-013a-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-013a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-013a-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-013a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-013a.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-013a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-013a.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-013a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-013b-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-013b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-013b-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-013b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-013b.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-013b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-013b.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-013b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-014a-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-014a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-014a-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-014a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-014a.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-014a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-014a.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-014a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-014b-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-014b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-014b-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-014b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-014b.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-014b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-014b.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-014b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-015-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-015-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-015.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-015.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-016-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-016-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-016.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-016.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-017-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-017-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-017.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-017.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-018-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-018-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-018.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-018.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-019-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-019-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-019.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-019.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-020-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-020-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-020.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-020.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-023-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-023-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-023.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-023.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-024-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-024-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-024-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-024-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-024.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-024.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-101-ref.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-101-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-101-ref.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-101-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-101.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-101.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-102.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-102.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-103.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-root-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-root-103.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-root-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-transparency-001.xht b/tests/wpt/tests/css/CSS2/backgrounds/background-transparency-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/background-transparency-001.xht rename to tests/wpt/tests/css/CSS2/backgrounds/background-transparency-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000001_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/000001_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000001_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/000001_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000002_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/000002_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000002_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/000002_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000003_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/000003_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000003_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/000003_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000066_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/000066_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000066_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/000066_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/00007f_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/00007f_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/00007f_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/00007f_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000080_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/000080_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000080_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/000080_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/0000fc_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/0000fc_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/0000fc_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/0000fc_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/0000fd_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/0000fd_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/0000fd_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/0000fd_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/0000fe_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/0000fe_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/0000fe_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/0000fe_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000100_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/000100_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000100_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/000100_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000200_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/000200_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000200_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/000200_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000300_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/000300_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000300_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/000300_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/000_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/001_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/001_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/001_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/001_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/006600_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/006600_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/006600_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/006600_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/007f00_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/007f00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/007f00_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/007f00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/008000_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/008000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/008000_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/008000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/009_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/009_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/009_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/009_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/00e_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/00e_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/00e_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/00e_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/00f_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/00f_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/00f_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/00f_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/00fc00_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/00fc00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/00fc00_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/00fc00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/00fd00_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/00fd00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/00fd00_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/00fd00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/00fe00_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/00fe00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/00fe00_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/00fe00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/010000_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/010000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/010000_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/010000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/010101_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/010101_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/010101_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/010101_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/010_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/010_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/010_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/010_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/020000_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/020000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/020000_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/020000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/020202_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/020202_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/020202_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/020202_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/030000_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/030000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/030000_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/030000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/030303_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/030303_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/030303_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/030303_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/090_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/090_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/090_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/090_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/0e0_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/0e0_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/0e0_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/0e0_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/0f0_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/0f0_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/0f0_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/0f0_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/100_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/100_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/100_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/100_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/100x100-lime.png b/tests/wpt/tests/css/CSS2/backgrounds/support/100x100-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/100x100-lime.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/100x100-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/100x100-red.png b/tests/wpt/tests/css/CSS2/backgrounds/support/100x100-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/100x100-red.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/100x100-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/111_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/111_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/111_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/111_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/1x1-green.png b/tests/wpt/tests/css/CSS2/backgrounds/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/backgrounds/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/backgrounds/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/backgrounds/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/1x1-red.png b/tests/wpt/tests/css/CSS2/backgrounds/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/1x1-white.png b/tests/wpt/tests/css/CSS2/backgrounds/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/backgrounds/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/60x60-green.png b/tests/wpt/tests/css/CSS2/backgrounds/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/660000_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/660000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/660000_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/660000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/666666_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/666666_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/666666_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/666666_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/7f0000_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/7f0000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/7f0000_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/7f0000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/7f7f7f_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/7f7f7f_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/7f7f7f_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/7f7f7f_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/800000_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/800000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/800000_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/800000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/808080_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/808080_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/808080_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/808080_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/900_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/900_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/900_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/900_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/999_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/999_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/999_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/999_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/README b/tests/wpt/tests/css/CSS2/backgrounds/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/README rename to tests/wpt/tests/css/CSS2/backgrounds/support/README diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/animated.gif b/tests/wpt/tests/css/CSS2/backgrounds/support/animated.gif similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/animated.gif rename to tests/wpt/tests/css/CSS2/backgrounds/support/animated.gif diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/aqua_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/aqua_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/aqua_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/aqua_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-alpha-test.png b/tests/wpt/tests/css/CSS2/backgrounds/support/background-alpha-test.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-alpha-test.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/background-alpha-test.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-iframes-001.html b/tests/wpt/tests/css/CSS2/backgrounds/support/background-iframes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-iframes-001.html rename to tests/wpt/tests/css/CSS2/backgrounds/support/background-iframes-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-bottom-center.png b/tests/wpt/tests/css/CSS2/backgrounds/support/background-position-bottom-center.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-bottom-center.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/background-position-bottom-center.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-bottom-left.png b/tests/wpt/tests/css/CSS2/backgrounds/support/background-position-bottom-left.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-bottom-left.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/background-position-bottom-left.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-bottom-right.png b/tests/wpt/tests/css/CSS2/backgrounds/support/background-position-bottom-right.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-bottom-right.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/background-position-bottom-right.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-center-center.png b/tests/wpt/tests/css/CSS2/backgrounds/support/background-position-center-center.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-center-center.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/background-position-center-center.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-center-left.png b/tests/wpt/tests/css/CSS2/backgrounds/support/background-position-center-left.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-center-left.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/background-position-center-left.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-center-right.png b/tests/wpt/tests/css/CSS2/backgrounds/support/background-position-center-right.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-center-right.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/background-position-center-right.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-top-center.png b/tests/wpt/tests/css/CSS2/backgrounds/support/background-position-top-center.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-top-center.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/background-position-top-center.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-top-left.png b/tests/wpt/tests/css/CSS2/backgrounds/support/background-position-top-left.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-top-left.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/background-position-top-left.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-top-right.png b/tests/wpt/tests/css/CSS2/backgrounds/support/background-position-top-right.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/background-position-top-right.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/background-position-top-right.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/bar_with_corner_dot.png b/tests/wpt/tests/css/CSS2/backgrounds/support/bar_with_corner_dot.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/bar_with_corner_dot.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/bar_with_corner_dot.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/black15x15.png b/tests/wpt/tests/css/CSS2/backgrounds/support/black15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/black15x15.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/black15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/black20x20.png b/tests/wpt/tests/css/CSS2/backgrounds/support/black20x20.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/black20x20.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/black20x20.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/blue-orange-rectangle.png b/tests/wpt/tests/css/CSS2/backgrounds/support/blue-orange-rectangle.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/blue-orange-rectangle.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/blue-orange-rectangle.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/blue15x15.png b/tests/wpt/tests/css/CSS2/backgrounds/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/blue96x96.png b/tests/wpt/tests/css/CSS2/backgrounds/support/blue96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/blue96x96.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/blue96x96.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/bordered-rectangle.png b/tests/wpt/tests/css/CSS2/backgrounds/support/bordered-rectangle.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/bordered-rectangle.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/bordered-rectangle.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/cat-128.png b/tests/wpt/tests/css/CSS2/backgrounds/support/cat-128.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/cat-128.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/cat-128.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/cat-830.png b/tests/wpt/tests/css/CSS2/backgrounds/support/cat-830.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/cat-830.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/cat-830.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/cat.png b/tests/wpt/tests/css/CSS2/backgrounds/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/cat.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/diamond.png b/tests/wpt/tests/css/CSS2/backgrounds/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/diamond.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/e00_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/e00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/e00_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/e00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/eee_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/eee_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/eee_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/eee_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/f00_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/f00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/f00_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/f00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fc0000_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/fc0000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fc0000_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/fc0000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fcfcfc_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/fcfcfc_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fcfcfc_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/fcfcfc_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fd0000_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/fd0000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fd0000_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/fd0000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fdfdfd_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/fdfdfd_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fdfdfd_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/fdfdfd_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fe0000_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/fe0000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fe0000_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/fe0000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fefefe_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/fefefe_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fefefe_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/fefefe_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fff_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/fff_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fff_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/fff_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fuchsia_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/fuchsia_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/fuchsia_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/fuchsia_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-height-ratio.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-height-ratio.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-height-ratio.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-height-ratio.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-height.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-height.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-height.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-none.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-none.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-none.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-none.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-ratio-landscape.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-ratio-landscape.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-ratio-landscape.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-ratio-landscape.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-ratio-portrait.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-ratio-portrait.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-ratio-portrait.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-ratio-portrait.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-width-height.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-width-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-width-height.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-width-height.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-width-pc-height-pc.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-width-pc-height-pc.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-width-pc-height-pc.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-width-pc-height-pc.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-width-ratio.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-width-ratio.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-width-ratio.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-width-ratio.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-width.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-width.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-intrinsic-width.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/green-intrinsic-width.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-landscape.png b/tests/wpt/tests/css/CSS2/backgrounds/support/green-landscape.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-landscape.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/green-landscape.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-portrait.png b/tests/wpt/tests/css/CSS2/backgrounds/support/green-portrait.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green-portrait.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/green-portrait.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green15x15.png b/tests/wpt/tests/css/CSS2/backgrounds/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green15x15.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green_box.png b/tests/wpt/tests/css/CSS2/backgrounds/support/green_box.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/green_box.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/green_box.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/margin-collapse-2em-space.png b/tests/wpt/tests/css/CSS2/backgrounds/support/margin-collapse-2em-space.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/margin-collapse-2em-space.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/margin-collapse-2em-space.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/margin-collapse-4em-space.png b/tests/wpt/tests/css/CSS2/backgrounds/support/margin-collapse-4em-space.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/margin-collapse-4em-space.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/margin-collapse-4em-space.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/maroon_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/maroon_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/maroon_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/maroon_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/olive_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/olive_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/olive_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/olive_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/orange-PASS-300x150.png b/tests/wpt/tests/css/CSS2/backgrounds/support/orange-PASS-300x150.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/orange-PASS-300x150.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/orange-PASS-300x150.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/orange15x15.png b/tests/wpt/tests/css/CSS2/backgrounds/support/orange15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/orange15x15.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/orange15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/orange_box.png b/tests/wpt/tests/css/CSS2/backgrounds/support/orange_box.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/orange_box.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/orange_box.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/backgrounds/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/backgrounds/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/backgrounds/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/backgrounds/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/purple_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/purple_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/purple_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/purple_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-height-ratio.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-height-ratio.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-height-ratio.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-height-ratio.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-height.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-height.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-height.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-none.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-none.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-none.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-none.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-ratio-landscape.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-ratio-landscape.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-ratio-landscape.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-ratio-landscape.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-ratio-portrait.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-ratio-portrait.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-ratio-portrait.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-ratio-portrait.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-width-height.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-width-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-width-height.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-width-height.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-width-pc-height-pc.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-width-pc-height-pc.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-width-pc-height-pc.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-width-pc-height-pc.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-width-ratio.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-width-ratio.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-width-ratio.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-width-ratio.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-width.svg b/tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-width.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-intrinsic-width.svg rename to tests/wpt/tests/css/CSS2/backgrounds/support/red-intrinsic-width.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-landscape.png b/tests/wpt/tests/css/CSS2/backgrounds/support/red-landscape.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-landscape.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/red-landscape.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-portrait.png b/tests/wpt/tests/css/CSS2/backgrounds/support/red-portrait.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red-portrait.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/red-portrait.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red15x15.png b/tests/wpt/tests/css/CSS2/backgrounds/support/red15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red15x15.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/red15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red_box.png b/tests/wpt/tests/css/CSS2/backgrounds/support/red_box.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/red_box.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/red_box.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/ring.png b/tests/wpt/tests/css/CSS2/backgrounds/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/ring.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/ruler-h-200px-400px.png b/tests/wpt/tests/css/CSS2/backgrounds/support/ruler-h-200px-400px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/ruler-h-200px-400px.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/ruler-h-200px-400px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/ruler-v-100px-200px-300px.png b/tests/wpt/tests/css/CSS2/backgrounds/support/ruler-v-100px-200px-300px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/ruler-v-100px-200px-300px.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/ruler-v-100px-200px-300px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/silver_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/silver_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/silver_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/silver_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/square-purple.png b/tests/wpt/tests/css/CSS2/backgrounds/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/square-purple.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/square-teal.png b/tests/wpt/tests/css/CSS2/backgrounds/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/square-teal.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/square-white.png b/tests/wpt/tests/css/CSS2/backgrounds/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/square-white.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/backgrounds/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-green.png b/tests/wpt/tests/css/CSS2/backgrounds/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/backgrounds/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/backgrounds/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-red.png b/tests/wpt/tests/css/CSS2/backgrounds/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-teal.png b/tests/wpt/tests/css/CSS2/backgrounds/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-teal.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-white.png b/tests/wpt/tests/css/CSS2/backgrounds/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/backgrounds/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/teal_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/teal_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/teal_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/teal_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/test-bl.png b/tests/wpt/tests/css/CSS2/backgrounds/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/test-bl.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/test-br.png b/tests/wpt/tests/css/CSS2/backgrounds/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/test-br.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/test-outer.png b/tests/wpt/tests/css/CSS2/backgrounds/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/test-outer.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/test-tl.png b/tests/wpt/tests/css/CSS2/backgrounds/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/test-tl.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/test-tr.png b/tests/wpt/tests/css/CSS2/backgrounds/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/test-tr.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/transparent_green.png b/tests/wpt/tests/css/CSS2/backgrounds/support/transparent_green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/transparent_green.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/transparent_green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/yellow_color.png b/tests/wpt/tests/css/CSS2/backgrounds/support/yellow_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/backgrounds/support/yellow_color.png rename to tests/wpt/tests/css/CSS2/backgrounds/support/yellow_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-005.xht b/tests/wpt/tests/css/CSS2/bidi-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-005.xht rename to tests/wpt/tests/css/CSS2/bidi-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-006.xht b/tests/wpt/tests/css/CSS2/bidi-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-006.xht rename to tests/wpt/tests/css/CSS2/bidi-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-007.xht b/tests/wpt/tests/css/CSS2/bidi-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-007.xht rename to tests/wpt/tests/css/CSS2/bidi-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-008.xht b/tests/wpt/tests/css/CSS2/bidi-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-008.xht rename to tests/wpt/tests/css/CSS2/bidi-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-009.xht b/tests/wpt/tests/css/CSS2/bidi-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-009.xht rename to tests/wpt/tests/css/CSS2/bidi-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-010.xht b/tests/wpt/tests/css/CSS2/bidi-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-010.xht rename to tests/wpt/tests/css/CSS2/bidi-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-overflow-scroll-001.xht b/tests/wpt/tests/css/CSS2/bidi-overflow-scroll-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-overflow-scroll-001.xht rename to tests/wpt/tests/css/CSS2/bidi-overflow-scroll-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-001-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-001-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-001.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-001.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-002-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-002-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-002.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-002.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-003-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-003-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-003.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-003.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-004-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-004-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-004.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-004.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-005a-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-005a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-005a-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-005a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-005a.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-005a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-005a.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-005a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-005b-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-005b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-005b-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-005b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-005b.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-005b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-005b.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-005b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-006a.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-006a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-006a.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-006a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-006b.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-006b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-006b.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-006b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-007a-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-007a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-007a-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-007a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-007a.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-007a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-007a.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-007a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-007b-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-007b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-007b-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-007b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-007b.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-007b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-007b.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-007b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-008a-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-008a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-008a-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-008a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-008a.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-008a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-008a.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-008a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-008b-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-008b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-008b-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-008b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-008b.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-008b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-008b.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-008b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-009a.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-009a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-009a.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-009a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-009b.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-009b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-009b.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-009b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-010a.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-010a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-010a.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-010a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-010b.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-010b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-010b.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-010b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-011-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-011-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-011.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-011.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-alt-001.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-alt-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-alt-001.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-alt-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-001-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-001-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-001.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-001.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-002.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-002.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-003.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-003.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-004.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-004.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-005.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-005.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-006.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-006.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-007-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-007-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-007.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-007.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-008.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-008.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-009.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-009.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-010-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-010-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-010.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-010.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-011.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-011.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-012.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-012.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-013.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-013.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-014.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-014.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-015.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-015.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-016-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-016-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-016.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-016.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-017.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-017.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-018.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-018.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-019-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-019-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-019.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-019.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-020.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-020.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-021.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-021.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-022.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-022.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-023.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-023.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-024.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-024.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-025-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-025-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-025.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-025.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-026.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-026.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-027.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-027.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-028.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-028.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-029.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-029.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-030.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-030.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-031.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-031.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-032.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-032.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-033.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-033.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-034-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-034-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-034-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-034-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-034.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-034.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-035.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-035.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-036.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-036.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-037.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-037.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-038.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-038.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-039.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-039.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-040.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-040.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-041.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-041.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-042.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-042.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-043-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-043-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-043-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-043-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-043.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-043.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-044.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-044.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-045.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-box-model-045.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-box-model-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-breaking-001-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-breaking-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-breaking-001-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-breaking-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-breaking-001.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-breaking-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-breaking-001.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-breaking-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-breaking-002-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-breaking-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-breaking-002-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-breaking-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-breaking-002.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-breaking-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-breaking-002.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-breaking-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-breaking-003-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-breaking-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-breaking-003-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-breaking-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-breaking-003.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-breaking-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-breaking-003.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-breaking-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-glyph-mirroring-001-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-glyph-mirroring-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-glyph-mirroring-001-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-glyph-mirroring-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-glyph-mirroring-001.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-glyph-mirroring-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-glyph-mirroring-001.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-glyph-mirroring-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-glyph-mirroring-002-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-glyph-mirroring-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-glyph-mirroring-002-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-glyph-mirroring-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-glyph-mirroring-002.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-glyph-mirroring-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-glyph-mirroring-002.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-glyph-mirroring-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-inline-001-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-inline-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-inline-001-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-inline-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-inline-001.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-inline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-inline-001.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-inline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-inline-002.xht b/tests/wpt/tests/css/CSS2/bidi-text/bidi-inline-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/bidi-inline-002.xht rename to tests/wpt/tests/css/CSS2/bidi-text/bidi-inline-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-001-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-001-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-001.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-001.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-002-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-002-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-002.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-002.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-003.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-003.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-001.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-002.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-003.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-004.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-005.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-006.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-007-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-007-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-007.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-008-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-008-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-008.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-009.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-010.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-012.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-013.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-014.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-015.xht b/tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/direction-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/bidi-text/direction-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/line-breaking-bidi-001-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/line-breaking-bidi-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/line-breaking-bidi-001-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/line-breaking-bidi-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/line-breaking-bidi-001.xht b/tests/wpt/tests/css/CSS2/bidi-text/line-breaking-bidi-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/line-breaking-bidi-001.xht rename to tests/wpt/tests/css/CSS2/bidi-text/line-breaking-bidi-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/line-breaking-bidi-002-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/line-breaking-bidi-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/line-breaking-bidi-002-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/line-breaking-bidi-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/line-breaking-bidi-002.xht b/tests/wpt/tests/css/CSS2/bidi-text/line-breaking-bidi-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/line-breaking-bidi-002.xht rename to tests/wpt/tests/css/CSS2/bidi-text/line-breaking-bidi-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/line-breaking-bidi-003-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/line-breaking-bidi-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/line-breaking-bidi-003-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/line-breaking-bidi-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/line-breaking-bidi-003.xht b/tests/wpt/tests/css/CSS2/bidi-text/line-breaking-bidi-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/line-breaking-bidi-003.xht rename to tests/wpt/tests/css/CSS2/bidi-text/line-breaking-bidi-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/1x1-green.png b/tests/wpt/tests/css/CSS2/bidi-text/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/bidi-text/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/bidi-text/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/bidi-text/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/1x1-red.png b/tests/wpt/tests/css/CSS2/bidi-text/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/1x1-white.png b/tests/wpt/tests/css/CSS2/bidi-text/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/bidi-text/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/60x60-green.png b/tests/wpt/tests/css/CSS2/bidi-text/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/a-green.css b/tests/wpt/tests/css/CSS2/bidi-text/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/a-green.css rename to tests/wpt/tests/css/CSS2/bidi-text/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/b-green.css b/tests/wpt/tests/css/CSS2/bidi-text/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/b-green.css rename to tests/wpt/tests/css/CSS2/bidi-text/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/black15x15.png b/tests/wpt/tests/css/CSS2/bidi-text/support/black15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/black15x15.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/black15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/blue15x15.png b/tests/wpt/tests/css/CSS2/bidi-text/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/c-red.css b/tests/wpt/tests/css/CSS2/bidi-text/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/c-red.css rename to tests/wpt/tests/css/CSS2/bidi-text/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/cat.png b/tests/wpt/tests/css/CSS2/bidi-text/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/cat.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/diamond.png b/tests/wpt/tests/css/CSS2/bidi-text/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/diamond.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/green15x15.png b/tests/wpt/tests/css/CSS2/bidi-text/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/green15x15.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/bidi-text/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/bidi-text/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/bidi-text/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/bidi-text/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/ring.png b/tests/wpt/tests/css/CSS2/bidi-text/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/ring.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/square-purple.png b/tests/wpt/tests/css/CSS2/bidi-text/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/square-purple.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/square-teal.png b/tests/wpt/tests/css/CSS2/bidi-text/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/square-teal.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/square-white.png b/tests/wpt/tests/css/CSS2/bidi-text/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/square-white.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/bidi-text/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-green.png b/tests/wpt/tests/css/CSS2/bidi-text/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/bidi-text/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/bidi-text/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-red.png b/tests/wpt/tests/css/CSS2/bidi-text/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-teal.png b/tests/wpt/tests/css/CSS2/bidi-text/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-teal.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-white.png b/tests/wpt/tests/css/CSS2/bidi-text/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/bidi-text/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/test-bl.png b/tests/wpt/tests/css/CSS2/bidi-text/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/test-bl.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/test-br.png b/tests/wpt/tests/css/CSS2/bidi-text/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/test-br.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/test-outer.png b/tests/wpt/tests/css/CSS2/bidi-text/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/test-outer.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/test-tl.png b/tests/wpt/tests/css/CSS2/bidi-text/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/test-tl.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/test-tr.png b/tests/wpt/tests/css/CSS2/bidi-text/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/support/test-tr.png rename to tests/wpt/tests/css/CSS2/bidi-text/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-001.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-001.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-002-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-002-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-002.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-002.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-003.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-003.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-004.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-004.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-001.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-002.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-003.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-004.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-005.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-006.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-007.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-008.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-009-ref.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-009-ref.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-009.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-010.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-012.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-013.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-014.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-015.xht b/tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/bidi-text/unicode-bidi-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/bidi-text/unicode-bidi-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/border-seams-001.xht b/tests/wpt/tests/css/CSS2/border-seams-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/border-seams-001.xht rename to tests/wpt/tests/css/CSS2/border-seams-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-001.xht b/tests/wpt/tests/css/CSS2/borders/border-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-002.xht b/tests/wpt/tests/css/CSS2/borders/border-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-003-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-003-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-003.xht b/tests/wpt/tests/css/CSS2/borders/border-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-004.xht b/tests/wpt/tests/css/CSS2/borders/border-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-005-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-005-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-005.xht b/tests/wpt/tests/css/CSS2/borders/border-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-006-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-006-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-006.xht b/tests/wpt/tests/css/CSS2/borders/border-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-007.xht b/tests/wpt/tests/css/CSS2/borders/border-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-008.xht b/tests/wpt/tests/css/CSS2/borders/border-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-009.xht b/tests/wpt/tests/css/CSS2/borders/border-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-010.xht b/tests/wpt/tests/css/CSS2/borders/border-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-011.xht b/tests/wpt/tests/css/CSS2/borders/border-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-012.xht b/tests/wpt/tests/css/CSS2/borders/border-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-013.xht b/tests/wpt/tests/css/CSS2/borders/border-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-014.xht b/tests/wpt/tests/css/CSS2/borders/border-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-015.xht b/tests/wpt/tests/css/CSS2/borders/border-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-016.xht b/tests/wpt/tests/css/CSS2/borders/border-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-016.xht rename to tests/wpt/tests/css/CSS2/borders/border-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-017.xht b/tests/wpt/tests/css/CSS2/borders/border-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-017.xht rename to tests/wpt/tests/css/CSS2/borders/border-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-018.xht b/tests/wpt/tests/css/CSS2/borders/border-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-018.xht rename to tests/wpt/tests/css/CSS2/borders/border-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-001.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-002.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-003.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-004.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-005-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-005-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-005.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-006.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-007.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-008.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-009.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-010.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-011.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-012.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-013.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-014.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-015.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-016-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-016-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-016.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-016.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-017.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-017.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-018-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-018-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-018.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-018.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-001.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-002.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-003-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-003-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-003.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-004-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-004-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-004.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-005-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-005-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-005.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-006-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-006-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-006.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-007.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-008.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-009-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-009-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-009.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-010-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-010-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-010.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-011-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-011-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-011.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-012-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-012-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-012.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-013.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-014-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-014-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-014.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-015-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-015-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-015.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-016-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-016-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-016.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-016.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-017-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-017-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-017.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-017.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-018.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-018.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-019-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-019-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-019.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-019.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-020-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-020-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-020.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-020.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-021-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-021-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-021.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-021.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-022-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-022-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-022.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-022.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-023.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-023.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-024.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-024.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-025.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-025.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-026-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-026-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-026.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-026.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-027-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-027-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-027.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-027.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-028-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-028-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-028.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-028.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-029.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-029.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-030.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-030.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-031.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-031.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-032-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-032-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-032-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-032-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-032.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-032.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-033.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-033.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-034-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-034-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-034-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-034-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-034.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-034.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-035.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-035.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-036.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-036.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-037-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-037-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-037-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-037-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-037.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-037.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-038-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-038-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-038-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-038-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-038.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-038.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-039-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-039-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-039-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-039-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-039.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-039.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-040.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-040.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-041.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-041.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-042-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-042-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-042-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-042-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-042.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-042.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-043.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-043.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-044-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-044-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-044-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-044-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-044.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-044.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-045.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-045.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-046.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-046.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-047.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-047.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-048.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-048.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-049-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-049-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-049-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-049-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-049.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-049.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-050.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-050.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-051.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-051.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-052-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-052-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-052-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-052-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-052.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-052.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-053.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-053.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-054-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-054-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-054-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-054-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-054.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-054.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-055.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-055.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-056.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-056.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-057.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-057.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-058.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-058.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-059.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-059.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-060.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-060.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-061.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-061.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-062.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-062.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-063-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-063-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-063-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-063-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-063.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-063.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-064.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-064.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-065.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-065.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-066.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-066.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-067.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-067.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-068.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-068.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-069.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-069.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-070-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-070-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-070-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-070-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-070.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-070.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-071.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-071.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-072.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-072.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-073-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-073-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-073-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-073-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-073.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-073.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-074.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-074.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-075-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-075-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-075-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-075-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-075.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-075.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-076.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-076.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-077.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-077.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-078.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-078.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-079.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-079.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-080.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-080.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-081.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-081.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-082.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-082.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-083-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-083-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-083-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-083-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-083.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-083.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-084.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-084.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-085.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-085.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-086.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-086.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-087.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-087.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-087.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-088.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-088.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-089.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-089.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-090-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-090-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-090-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-090-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-090.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-090.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-091.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-091.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-092.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-092.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-093-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-093-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-093-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-093-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-093.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-093.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-094.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-094.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-095-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-095-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-095-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-095-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-095.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-095.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-096.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-096.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-097.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-097.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-098.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-098.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-099.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-099.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-100-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-100-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-100-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-100-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-100.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-100.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-101.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-101.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-102.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-102.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-103-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-103-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-103.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-103.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-104.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-104.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-105.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-105.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-106.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-106.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-107.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-107.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-108.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-108.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-109.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-109.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-110-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-110-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-110-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-110-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-110.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-110.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-111.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-111.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-112.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-112.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-113-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-113-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-113.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-113.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-114.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-114.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-115-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-115-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-115-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-115-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-115.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-115.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-116.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-116.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-117.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-117.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-118.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-118.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-119.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-119.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-120.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-120.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-121.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-121.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-122.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-122.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-123-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-123-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-123-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-123-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-123.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-123.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-124.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-124.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-124.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-125.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-125.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-125.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-126.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-126.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-127.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-127.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-128.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-128.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-128.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-129-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-129-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-129-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-129-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-129.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-129.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-130.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-130.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-130.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-131-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-131-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-131-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-131-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-131.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-131.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-131.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-132-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-132-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-132-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-132-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-132.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-132.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-132.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-133-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-133-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-133-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-133-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-133.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-133.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-133.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-133.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-134-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-134-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-134-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-134-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-134.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-134.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-134.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-134.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-135-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-135-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-135-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-135-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-135.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-135.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-135.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-136-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-136-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-136-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-136-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-136.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-136.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-136.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-136.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-137-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-137-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-137-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-137-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-137.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-137.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-137.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-137.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-138-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-138-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-138-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-138-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-138.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-138.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-138.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-139-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-139-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-139-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-139-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-139.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-139.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-139.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-139.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-140-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-140-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-140-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-140-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-140.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-140.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-140.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-141-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-141-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-141-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-141-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-141.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-141.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-141.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-142-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-142-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-142-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-142-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-142.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-142.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-142.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-143-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-143-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-143-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-143-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-143.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-143.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-143.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-144-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-144-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-144-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-144-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-144.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-144.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-144.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-145-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-145-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-145-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-145-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-145.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-145.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-174.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-174.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-174.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-174.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-175.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-175.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-175.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-175.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-color-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-color-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-001.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-002.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-003.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-004.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-005-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-005-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-005.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-006.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-007.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-008.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-009.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-010.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-011.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-style-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-style-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-001.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-002.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-003-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-003-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-003.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-004.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-005.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-006-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-006-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-006.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-007.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-012-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-012-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-012.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-013.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-014.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-015.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-016.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-016.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-017.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-017.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-018.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-018.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-023.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-023.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-024.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-024.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-025-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-025-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-025.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-025.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-026.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-026.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-027.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-027.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-028.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-028.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-029.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-029.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-034.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-034.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-035.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-035.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-036.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-036.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-037.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-037.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-038.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-038.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-039.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-039.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-040.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-040.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-045.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-045.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-046.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-046.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-047.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-047.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-048.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-048.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-049.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-049.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-050.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-050.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-051.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-051.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-056.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-056.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-057.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-057.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-058-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-058-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-058-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-058-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-058.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-058.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-059.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-059.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-060.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-060.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-061-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-061-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-061-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-061-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-061.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-061.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-062.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-062.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-067.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-067.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-068.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-068.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-069-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-069-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-069-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-069-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-069.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-069.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-070.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-070.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-071.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-071.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-072-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-072-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-072-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-072-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-072.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-072.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-073.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-073.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-078.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-078.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-079.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-079.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-080.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-080.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-081.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-081.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-082.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-082.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-083.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-083.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-084.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-084.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-089.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-089.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-090.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-090.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-091.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-091.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-092.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-092.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-093.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-093.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-094.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-094.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-095.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-095.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-bottom-width-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-bottom-width-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-color-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-001.xht b/tests/wpt/tests/css/CSS2/borders/border-color-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-002.xht b/tests/wpt/tests/css/CSS2/borders/border-color-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-003.xht b/tests/wpt/tests/css/CSS2/borders/border-color-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-004.xht b/tests/wpt/tests/css/CSS2/borders/border-color-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-005-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-color-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-005-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-005.xht b/tests/wpt/tests/css/CSS2/borders/border-color-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-006-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-color-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-006-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-006.xht b/tests/wpt/tests/css/CSS2/borders/border-color-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-007.xht b/tests/wpt/tests/css/CSS2/borders/border-color-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-008.xht b/tests/wpt/tests/css/CSS2/borders/border-color-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-009.xht b/tests/wpt/tests/css/CSS2/borders/border-color-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-010-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-color-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-010-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-010.xht b/tests/wpt/tests/css/CSS2/borders/border-color-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-011-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-color-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-011-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-011.xht b/tests/wpt/tests/css/CSS2/borders/border-color-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-012-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-color-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-012-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-012.xht b/tests/wpt/tests/css/CSS2/borders/border-color-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-color-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-color-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-color-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-color-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-color-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-color-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-color-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-color-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-color-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-color-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-color-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-color-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-color-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-color-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-shorthand-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-color-shorthand-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-shorthand-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-shorthand-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-shorthand-001.xht b/tests/wpt/tests/css/CSS2/borders/border-color-shorthand-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-shorthand-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-shorthand-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-shorthand-002.xht b/tests/wpt/tests/css/CSS2/borders/border-color-shorthand-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-shorthand-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-shorthand-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-shorthand-003.xht b/tests/wpt/tests/css/CSS2/borders/border-color-shorthand-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-shorthand-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-shorthand-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-color-shorthand-004.xht b/tests/wpt/tests/css/CSS2/borders/border-color-shorthand-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-color-shorthand-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-color-shorthand-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-conflict-style-101-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-conflict-style-101-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-conflict-style-101-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-conflict-style-101-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-conflict-style-101.xht b/tests/wpt/tests/css/CSS2/borders/border-conflict-style-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-conflict-style-101.xht rename to tests/wpt/tests/css/CSS2/borders/border-conflict-style-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-conflict-style-102.xht b/tests/wpt/tests/css/CSS2/borders/border-conflict-style-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-conflict-style-102.xht rename to tests/wpt/tests/css/CSS2/borders/border-conflict-style-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-conflict-style-103.xht b/tests/wpt/tests/css/CSS2/borders/border-conflict-style-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-conflict-style-103.xht rename to tests/wpt/tests/css/CSS2/borders/border-conflict-style-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-conflict-style-104.xht b/tests/wpt/tests/css/CSS2/borders/border-conflict-style-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-conflict-style-104.xht rename to tests/wpt/tests/css/CSS2/borders/border-conflict-style-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-conflict-style-105.xht b/tests/wpt/tests/css/CSS2/borders/border-conflict-style-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-conflict-style-105.xht rename to tests/wpt/tests/css/CSS2/borders/border-conflict-style-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-conflict-style-106.xht b/tests/wpt/tests/css/CSS2/borders/border-conflict-style-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-conflict-style-106.xht rename to tests/wpt/tests/css/CSS2/borders/border-conflict-style-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-dynamic-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-dynamic-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-dynamic-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-dynamic-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-dynamic-001.xht b/tests/wpt/tests/css/CSS2/borders/border-dynamic-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-dynamic-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-dynamic-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-dynamic-002.xht b/tests/wpt/tests/css/CSS2/borders/border-dynamic-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-dynamic-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-dynamic-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-001.xht b/tests/wpt/tests/css/CSS2/borders/border-left-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-002.xht b/tests/wpt/tests/css/CSS2/borders/border-left-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-003-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-left-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-003-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-003.xht b/tests/wpt/tests/css/CSS2/borders/border-left-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-004.xht b/tests/wpt/tests/css/CSS2/borders/border-left-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-005-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-left-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-005-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-005.xht b/tests/wpt/tests/css/CSS2/borders/border-left-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-006.xht b/tests/wpt/tests/css/CSS2/borders/border-left-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-007.xht b/tests/wpt/tests/css/CSS2/borders/border-left-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-008.xht b/tests/wpt/tests/css/CSS2/borders/border-left-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-009.xht b/tests/wpt/tests/css/CSS2/borders/border-left-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-010.xht b/tests/wpt/tests/css/CSS2/borders/border-left-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-011.xht b/tests/wpt/tests/css/CSS2/borders/border-left-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-012.xht b/tests/wpt/tests/css/CSS2/borders/border-left-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-013.xht b/tests/wpt/tests/css/CSS2/borders/border-left-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-014.xht b/tests/wpt/tests/css/CSS2/borders/border-left-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-015.xht b/tests/wpt/tests/css/CSS2/borders/border-left-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-016.xht b/tests/wpt/tests/css/CSS2/borders/border-left-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-016.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-017.xht b/tests/wpt/tests/css/CSS2/borders/border-left-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-017.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-018-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-left-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-018-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-018.xht b/tests/wpt/tests/css/CSS2/borders/border-left-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-018.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-left-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-001.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-002.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-003.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-004.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-005.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-006.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-007.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-008.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-009.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-010.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-011.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-012.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-013.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-014.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-015.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-016.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-016.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-017.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-017.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-018.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-018.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-019.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-019.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-020.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-020.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-021.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-021.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-022.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-022.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-023.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-023.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-024.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-024.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-025.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-025.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-026.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-026.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-027.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-027.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-028.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-028.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-029.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-029.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-030.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-030.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-031.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-031.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-032.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-032.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-033.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-033.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-034.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-034.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-035.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-035.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-036.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-036.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-037.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-037.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-038.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-038.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-039.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-039.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-040.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-040.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-041.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-041.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-042.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-042.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-043.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-043.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-044.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-044.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-045.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-045.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-046.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-046.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-047.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-047.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-048.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-048.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-049.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-049.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-050.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-050.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-051.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-051.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-052.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-052.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-053.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-053.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-054.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-054.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-055.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-055.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-056.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-056.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-057.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-057.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-058.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-058.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-059.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-059.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-060.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-060.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-061.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-061.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-062.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-062.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-063.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-063.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-064.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-064.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-065.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-065.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-066.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-066.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-067.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-067.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-068.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-068.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-069.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-069.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-070.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-070.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-071.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-071.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-072.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-072.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-073.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-073.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-074.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-074.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-075.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-075.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-076.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-076.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-077.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-077.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-078.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-078.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-079.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-079.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-080.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-080.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-081.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-081.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-082.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-082.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-083.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-083.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-084.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-084.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-085.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-085.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-086.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-086.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-087.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-087.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-087.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-088.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-088.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-089.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-089.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-090.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-090.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-091.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-091.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-092.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-092.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-093.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-093.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-094.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-094.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-095.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-095.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-096.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-096.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-097.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-097.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-098.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-098.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-099.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-099.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-100.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-100.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-101.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-101.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-102.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-102.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-103.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-103.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-104.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-104.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-105.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-105.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-106.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-106.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-107.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-107.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-108.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-108.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-109.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-109.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-110.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-110.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-111.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-111.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-112.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-112.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-113.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-113.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-114.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-114.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-115.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-115.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-116.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-116.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-117.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-117.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-118.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-118.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-119.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-119.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-120.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-120.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-121.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-121.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-122.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-122.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-123.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-123.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-124.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-124.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-124.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-125.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-125.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-125.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-126.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-126.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-127.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-127.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-128.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-128.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-128.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-129.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-129.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-130.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-130.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-130.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-131.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-131.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-131.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-132.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-132.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-132.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-133.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-133.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-133.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-133.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-134.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-134.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-134.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-134.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-135.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-135.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-135.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-136.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-136.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-136.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-136.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-137.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-137.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-137.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-137.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-138.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-138.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-138.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-139.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-139.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-139.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-139.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-140.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-140.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-140.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-141.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-141.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-141.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-142.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-142.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-142.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-143.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-143.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-143.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-144.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-144.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-144.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-145.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-145.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-174-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-174-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-174-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-174-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-174.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-174.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-174.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-174.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-175.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-175.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-175.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-175.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-color-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-color-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-001.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-002.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-003.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-004.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-005-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-005-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-005.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-006.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-007.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-008.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-009.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-010.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-011.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-style-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-style-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-001.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-002.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-003-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-003-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-003.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-004.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-005.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-006-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-006-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-006.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-007.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-012.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-013.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-015.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-016.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-016.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-017.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-017.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-018.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-018.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-023.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-023.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-024.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-024.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-025-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-025-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-025.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-025.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-026.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-026.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-027.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-027.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-028.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-028.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-029.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-029.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-034.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-034.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-035.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-035.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-036.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-036.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-037.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-037.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-038.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-038.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-039.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-039.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-040.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-040.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-045.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-045.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-046.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-046.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-047.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-047.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-048.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-048.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-049.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-049.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-050.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-050.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-051.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-051.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-056.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-056.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-057.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-057.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-058.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-058.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-059.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-059.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-060.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-060.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-061-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-061-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-061-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-061-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-061.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-061.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-062.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-062.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-067.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-067.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-068.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-068.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-069-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-069-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-069-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-069-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-069.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-069.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-070.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-070.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-071.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-071.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-072-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-072-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-072-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-072-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-072.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-072.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-073.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-073.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-078.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-078.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-079.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-079.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-080.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-080.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-081.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-081.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-082.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-082.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-083.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-083.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-084.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-084.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-089.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-089.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-090.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-090.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-091.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-091.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-092.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-092.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-093.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-093.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-094.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-094.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-095-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-095-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-095-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-095-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-095.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-095.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-left-width-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-left-width-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-001.xht b/tests/wpt/tests/css/CSS2/borders/border-right-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-002.xht b/tests/wpt/tests/css/CSS2/borders/border-right-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-003-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-003-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-003.xht b/tests/wpt/tests/css/CSS2/borders/border-right-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-004.xht b/tests/wpt/tests/css/CSS2/borders/border-right-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-005-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-005-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-005.xht b/tests/wpt/tests/css/CSS2/borders/border-right-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-006.xht b/tests/wpt/tests/css/CSS2/borders/border-right-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-007.xht b/tests/wpt/tests/css/CSS2/borders/border-right-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-008.xht b/tests/wpt/tests/css/CSS2/borders/border-right-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-009.xht b/tests/wpt/tests/css/CSS2/borders/border-right-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-010.xht b/tests/wpt/tests/css/CSS2/borders/border-right-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-011.xht b/tests/wpt/tests/css/CSS2/borders/border-right-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-012.xht b/tests/wpt/tests/css/CSS2/borders/border-right-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-013.xht b/tests/wpt/tests/css/CSS2/borders/border-right-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-014.xht b/tests/wpt/tests/css/CSS2/borders/border-right-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-015.xht b/tests/wpt/tests/css/CSS2/borders/border-right-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-016.xht b/tests/wpt/tests/css/CSS2/borders/border-right-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-016.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-017.xht b/tests/wpt/tests/css/CSS2/borders/border-right-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-017.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-018-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-018-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-018.xht b/tests/wpt/tests/css/CSS2/borders/border-right-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-018.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-right-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-right-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-right-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-right-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-right-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-right-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-right-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-right-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-right-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-right-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-right-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-right-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-right-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-right-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-001.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-002.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-003-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-003-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-003.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-004-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-004-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-004.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-005-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-005-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-005.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-006-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-006-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-006.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-007-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-007-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-007.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-008.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-009-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-009-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-009.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-010-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-010-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-010.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-011-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-011-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-011.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-012-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-012-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-012.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-013.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-014-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-014-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-014.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-015-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-015-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-015.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-016-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-016-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-016.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-016.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-017-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-017-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-017.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-017.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-018.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-018.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-019-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-019-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-019.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-019.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-020-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-020-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-020.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-020.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-021-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-021-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-021.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-021.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-022-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-022-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-022.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-022.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-023.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-023.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-024.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-024.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-025.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-025.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-026-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-026-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-026.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-026.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-027-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-027-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-027.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-027.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-028-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-028-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-028.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-028.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-029.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-029.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-030.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-030.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-031.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-031.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-032-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-032-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-032-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-032-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-032.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-032.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-033.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-033.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-034-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-034-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-034-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-034-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-034.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-034.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-035.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-035.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-036.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-036.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-037-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-037-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-037-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-037-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-037.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-037.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-038-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-038-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-038-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-038-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-038.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-038.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-039-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-039-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-039-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-039-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-039.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-039.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-040.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-040.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-041.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-041.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-042-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-042-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-042-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-042-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-042.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-042.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-043.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-043.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-044-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-044-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-044-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-044-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-044.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-044.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-045.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-045.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-046.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-046.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-047.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-047.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-048.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-048.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-049-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-049-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-049-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-049-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-049.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-049.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-050.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-050.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-051.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-051.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-052-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-052-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-052-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-052-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-052.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-052.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-053.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-053.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-054-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-054-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-054-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-054-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-054.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-054.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-055.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-055.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-056.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-056.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-057.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-057.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-058.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-058.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-059.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-059.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-060.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-060.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-061.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-061.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-062.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-062.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-063-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-063-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-063-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-063-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-063.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-063.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-064.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-064.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-065.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-065.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-066.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-066.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-067.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-067.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-068.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-068.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-069.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-069.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-070-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-070-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-070-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-070-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-070.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-070.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-071.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-071.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-072.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-072.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-073-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-073-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-073-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-073-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-073.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-073.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-074.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-074.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-075-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-075-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-075-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-075-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-075.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-075.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-076.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-076.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-077.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-077.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-078.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-078.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-079.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-079.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-080.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-080.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-081.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-081.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-082.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-082.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-083-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-083-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-083-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-083-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-083.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-083.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-084.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-084.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-085.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-085.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-086.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-086.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-087.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-087.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-087.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-088.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-088.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-089.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-089.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-090-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-090-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-090-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-090-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-090.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-090.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-091.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-091.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-092.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-092.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-093-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-093-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-093-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-093-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-093.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-093.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-094.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-094.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-095-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-095-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-095-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-095-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-095.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-095.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-096.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-096.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-097.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-097.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-098.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-098.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-099.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-099.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-100-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-100-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-100-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-100-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-100.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-100.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-101.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-101.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-102.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-102.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-103-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-103-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-103.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-103.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-104.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-104.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-105.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-105.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-106.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-106.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-107.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-107.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-108.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-108.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-109.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-109.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-110-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-110-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-110-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-110-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-110.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-110.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-111.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-111.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-112.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-112.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-113-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-113-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-113.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-113.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-114.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-114.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-115-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-115-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-115-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-115-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-115.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-115.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-116.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-116.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-117.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-117.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-118.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-118.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-119.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-119.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-120.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-120.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-121.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-121.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-122.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-122.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-123-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-123-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-123-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-123-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-123.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-123.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-124.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-124.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-124.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-125.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-125.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-125.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-126.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-126.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-127.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-127.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-128.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-128.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-128.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-129-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-129-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-129-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-129-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-129.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-129.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-130.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-130.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-130.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-131-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-131-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-131-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-131-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-131.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-131.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-131.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-132-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-132-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-132-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-132-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-132.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-132.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-132.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-133-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-133-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-133-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-133-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-133.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-133.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-133.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-133.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-134-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-134-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-134-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-134-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-134.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-134.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-134.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-134.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-135-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-135-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-135-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-135-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-135.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-135.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-135.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-136-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-136-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-136-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-136-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-136.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-136.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-136.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-136.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-137-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-137-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-137-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-137-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-137.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-137.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-137.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-137.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-138-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-138-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-138-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-138-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-138.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-138.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-138.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-139-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-139-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-139-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-139-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-139.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-139.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-139.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-139.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-140-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-140-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-140-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-140-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-140.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-140.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-140.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-141-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-141-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-141-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-141-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-141.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-141.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-141.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-142-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-142-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-142-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-142-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-142.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-142.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-142.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-143-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-143-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-143-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-143-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-143.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-143.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-143.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-144-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-144-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-144-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-144-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-144.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-144.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-144.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-145-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-145-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-145-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-145-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-145.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-145.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-174.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-174.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-174.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-174.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-175-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-175-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-175-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-175-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-175.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-175.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-175.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-175.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-color-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-color-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-001.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-002.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-003.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-004.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-005-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-005-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-005.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-006.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-007.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-008.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-009.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-010.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-011.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-style-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-style-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-001.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-002.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-003.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-004.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-005.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-006.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-007.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-012.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-013.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-015.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-016.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-016.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-017.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-017.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-018.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-018.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-023.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-023.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-024.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-024.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-025.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-025.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-026.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-026.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-027.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-027.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-028.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-028.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-029.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-029.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-034.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-034.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-035.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-035.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-036.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-036.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-037.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-037.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-038.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-038.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-039.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-039.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-040.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-040.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-045.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-045.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-046.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-046.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-047.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-047.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-048.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-048.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-049.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-049.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-050.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-050.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-051.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-051.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-056.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-056.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-057.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-057.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-058.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-058.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-059.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-059.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-060.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-060.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-061.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-061.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-062.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-062.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-067.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-067.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-068.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-068.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-069.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-069.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-070.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-070.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-071.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-071.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-072.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-072.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-073.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-073.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-078.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-078.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-079.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-079.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-080.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-080.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-081.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-081.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-082.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-082.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-083.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-083.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-084.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-084.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-089.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-089.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-090.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-090.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-091.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-091.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-092.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-092.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-093.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-093.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-094.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-094.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-095-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-095-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-095-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-095-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-095.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-095.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-right-width-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-right-width-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-shorthands-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-shorthands-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-shorthands-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-shorthands-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-shorthands-001.xht b/tests/wpt/tests/css/CSS2/borders/border-shorthands-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-shorthands-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-shorthands-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-shorthands-002.xht b/tests/wpt/tests/css/CSS2/borders/border-shorthands-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-shorthands-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-shorthands-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-shorthands-003-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-shorthands-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-shorthands-003-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-shorthands-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-shorthands-003.xht b/tests/wpt/tests/css/CSS2/borders/border-shorthands-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-shorthands-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-shorthands-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-001.xht b/tests/wpt/tests/css/CSS2/borders/border-style-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-002.xht b/tests/wpt/tests/css/CSS2/borders/border-style-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-003.xht b/tests/wpt/tests/css/CSS2/borders/border-style-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-004.xht b/tests/wpt/tests/css/CSS2/borders/border-style-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-005.xht b/tests/wpt/tests/css/CSS2/borders/border-style-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-006.xht b/tests/wpt/tests/css/CSS2/borders/border-style-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-007.xht b/tests/wpt/tests/css/CSS2/borders/border-style-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-008.xht b/tests/wpt/tests/css/CSS2/borders/border-style-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-009.xht b/tests/wpt/tests/css/CSS2/borders/border-style-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-010.xht b/tests/wpt/tests/css/CSS2/borders/border-style-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-016.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-017.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-018.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-018.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-019.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-019.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-020.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-020.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-021.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-021.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-022.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-022.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-023.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-023.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-024.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-024.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-025.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-025.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-026.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-026.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-027.xht b/tests/wpt/tests/css/CSS2/borders/border-style-applies-to-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-applies-to-027.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-applies-to-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-initial-001.xht b/tests/wpt/tests/css/CSS2/borders/border-style-initial-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-initial-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-initial-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-rendering-001.xht b/tests/wpt/tests/css/CSS2/borders/border-style-rendering-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-rendering-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-rendering-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-rendering-002.xht b/tests/wpt/tests/css/CSS2/borders/border-style-rendering-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-rendering-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-rendering-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-rendering-003.xht b/tests/wpt/tests/css/CSS2/borders/border-style-rendering-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-rendering-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-rendering-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-rendering-004.xht b/tests/wpt/tests/css/CSS2/borders/border-style-rendering-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-rendering-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-rendering-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-shorthand-001.xht b/tests/wpt/tests/css/CSS2/borders/border-style-shorthand-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-shorthand-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-shorthand-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-shorthand-002.xht b/tests/wpt/tests/css/CSS2/borders/border-style-shorthand-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-shorthand-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-shorthand-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-shorthand-003.xht b/tests/wpt/tests/css/CSS2/borders/border-style-shorthand-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-shorthand-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-shorthand-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-style-shorthand-004.xht b/tests/wpt/tests/css/CSS2/borders/border-style-shorthand-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-style-shorthand-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-style-shorthand-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-001.xht b/tests/wpt/tests/css/CSS2/borders/border-top-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-002.xht b/tests/wpt/tests/css/CSS2/borders/border-top-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-003.xht b/tests/wpt/tests/css/CSS2/borders/border-top-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-004.xht b/tests/wpt/tests/css/CSS2/borders/border-top-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-005-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-top-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-005-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-005.xht b/tests/wpt/tests/css/CSS2/borders/border-top-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-006.xht b/tests/wpt/tests/css/CSS2/borders/border-top-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-007.xht b/tests/wpt/tests/css/CSS2/borders/border-top-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-008.xht b/tests/wpt/tests/css/CSS2/borders/border-top-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-009.xht b/tests/wpt/tests/css/CSS2/borders/border-top-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-010.xht b/tests/wpt/tests/css/CSS2/borders/border-top-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-011.xht b/tests/wpt/tests/css/CSS2/borders/border-top-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-012.xht b/tests/wpt/tests/css/CSS2/borders/border-top-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-013.xht b/tests/wpt/tests/css/CSS2/borders/border-top-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-014.xht b/tests/wpt/tests/css/CSS2/borders/border-top-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-015.xht b/tests/wpt/tests/css/CSS2/borders/border-top-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-016.xht b/tests/wpt/tests/css/CSS2/borders/border-top-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-016.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-017.xht b/tests/wpt/tests/css/CSS2/borders/border-top-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-017.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-018-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-top-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-018-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-018.xht b/tests/wpt/tests/css/CSS2/borders/border-top-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-018.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-top-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-top-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-top-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-top-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-top-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-top-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-top-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-top-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-top-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-top-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-top-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-top-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-top-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-top-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-001.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-002.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-003.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-004.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-005.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-006.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-007.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-008.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-009.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-010.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-011.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-012.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-013.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-014.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-015.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-016.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-016.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-017.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-017.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-018.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-018.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-019.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-019.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-020.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-020.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-021.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-021.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-022.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-022.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-023.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-023.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-024.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-024.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-025.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-025.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-026.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-026.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-027.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-027.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-028.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-028.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-029.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-029.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-030.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-030.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-031.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-031.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-032.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-032.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-033.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-033.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-034.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-034.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-035.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-035.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-036.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-036.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-037.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-037.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-038.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-038.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-039.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-039.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-040.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-040.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-041.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-041.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-042.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-042.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-043.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-043.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-044.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-044.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-045.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-045.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-046.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-046.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-047.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-047.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-048.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-048.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-049.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-049.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-050.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-050.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-051.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-051.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-052.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-052.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-053.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-053.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-054.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-054.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-055.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-055.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-056.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-056.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-057.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-057.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-058.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-058.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-059.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-059.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-060.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-060.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-061.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-061.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-062.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-062.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-063.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-063.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-064.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-064.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-065.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-065.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-066.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-066.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-067.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-067.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-068.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-068.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-069.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-069.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-070.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-070.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-071.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-071.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-072.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-072.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-073.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-073.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-074.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-074.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-075.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-075.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-076.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-076.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-077.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-077.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-078.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-078.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-079.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-079.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-080.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-080.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-081.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-081.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-082.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-082.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-083.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-083.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-084.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-084.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-085.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-085.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-086.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-086.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-087.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-087.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-087.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-088.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-088.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-089.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-089.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-090.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-090.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-091.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-091.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-092.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-092.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-093.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-093.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-094.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-094.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-095.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-095.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-096.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-096.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-097.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-097.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-098.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-098.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-099.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-099.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-100.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-100.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-101.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-101.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-102.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-102.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-103.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-103.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-104.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-104.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-105.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-105.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-106.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-106.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-107.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-107.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-108.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-108.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-109.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-109.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-110.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-110.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-111.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-111.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-112.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-112.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-113.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-113.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-114.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-114.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-115.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-115.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-116.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-116.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-117.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-117.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-118.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-118.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-119.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-119.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-120.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-120.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-121.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-121.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-122.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-122.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-123.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-123.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-124.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-124.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-124.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-125.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-125.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-125.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-126.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-126.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-127.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-127.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-128.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-128.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-128.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-129.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-129.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-130.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-130.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-130.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-131.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-131.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-131.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-132.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-132.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-132.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-133.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-133.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-133.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-133.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-134.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-134.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-134.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-134.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-135.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-135.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-135.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-136.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-136.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-136.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-136.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-137.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-137.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-137.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-137.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-138.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-138.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-138.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-139.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-139.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-139.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-139.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-140.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-140.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-140.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-141.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-141.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-141.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-142.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-142.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-142.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-143.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-143.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-143.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-144.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-144.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-144.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-145.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-145.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-174.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-174.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-174.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-174.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-175.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-175.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-175.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-175.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-color-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-color-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-001.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-002.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-003.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-004.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-005.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-006.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-007.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-008.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-009.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-010.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-011.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-style-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-style-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-001.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-002.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-003.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-004.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-005.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-006.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-007.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-012-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-012-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-012.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-013.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-014.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-015.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-016.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-016.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-017.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-017.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-018.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-018.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-023.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-023.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-024.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-024.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-025.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-025.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-026.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-026.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-027.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-027.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-028.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-028.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-029.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-029.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-034.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-034.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-035.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-035.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-036.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-036.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-037.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-037.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-038.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-038.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-039.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-039.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-040.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-040.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-045.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-045.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-046.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-046.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-047.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-047.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-048.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-048.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-049.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-049.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-050.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-050.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-051.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-051.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-056.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-056.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-057.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-057.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-058.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-058.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-059.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-059.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-060.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-060.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-061.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-061.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-062.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-062.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-067.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-067.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-068.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-068.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-069.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-069.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-070.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-070.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-071.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-071.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-072.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-072.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-073.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-073.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-078.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-078.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-079.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-079.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-080.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-080.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-081.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-081.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-082.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-082.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-083.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-083.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-084.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-084.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-089.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-089.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-090.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-090.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-091.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-091.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-092.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-092.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-093.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-093.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-094.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-094.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-095-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-095-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-095-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-095-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-095.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-095.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-top-width-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-001.xht b/tests/wpt/tests/css/CSS2/borders/border-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-002-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-002-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-002.xht b/tests/wpt/tests/css/CSS2/borders/border-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-003-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-003-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-003.xht b/tests/wpt/tests/css/CSS2/borders/border-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-004-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-004-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-004.xht b/tests/wpt/tests/css/CSS2/borders/border-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-005-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-005-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-005.xht b/tests/wpt/tests/css/CSS2/borders/border-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-006-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-006-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-006.xht b/tests/wpt/tests/css/CSS2/borders/border-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-007-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-007-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-007.xht b/tests/wpt/tests/css/CSS2/borders/border-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-008-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-008-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-008.xht b/tests/wpt/tests/css/CSS2/borders/border-width-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-009-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-009-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-009.xht b/tests/wpt/tests/css/CSS2/borders/border-width-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-010-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-010-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-010.xht b/tests/wpt/tests/css/CSS2/borders/border-width-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-011.xht b/tests/wpt/tests/css/CSS2/borders/border-width-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-011.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-012.xht b/tests/wpt/tests/css/CSS2/borders/border-width-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-013.xht b/tests/wpt/tests/css/CSS2/borders/border-width-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-014-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-014-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-014.xht b/tests/wpt/tests/css/CSS2/borders/border-width-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-001.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-002.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-003.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-004.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-005.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-006.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-007.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-008-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-008-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-008.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-009-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-009-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-009.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-010.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-012.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-013.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-014.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-015.xht b/tests/wpt/tests/css/CSS2/borders/border-width-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-comparison-001.xht b/tests/wpt/tests/css/CSS2/borders/border-width-comparison-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-comparison-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-comparison-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-001-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-shorthand-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-001-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-shorthand-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-001.xht b/tests/wpt/tests/css/CSS2/borders/border-width-shorthand-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-001.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-shorthand-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-002-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-shorthand-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-002-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-shorthand-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-002.xht b/tests/wpt/tests/css/CSS2/borders/border-width-shorthand-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-002.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-shorthand-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-003-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-shorthand-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-003-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-shorthand-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-003.xht b/tests/wpt/tests/css/CSS2/borders/border-width-shorthand-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-003.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-shorthand-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-004-ref.xht b/tests/wpt/tests/css/CSS2/borders/border-width-shorthand-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-004-ref.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-shorthand-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-004.xht b/tests/wpt/tests/css/CSS2/borders/border-width-shorthand-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/border-width-shorthand-004.xht rename to tests/wpt/tests/css/CSS2/borders/border-width-shorthand-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/discrete-no-interpolation.html b/tests/wpt/tests/css/CSS2/borders/discrete-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/discrete-no-interpolation.html rename to tests/wpt/tests/css/CSS2/borders/discrete-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/double-border-width-001.xht b/tests/wpt/tests/css/CSS2/borders/double-border-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/double-border-width-001.xht rename to tests/wpt/tests/css/CSS2/borders/double-border-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/groove-default.html b/tests/wpt/tests/css/CSS2/borders/groove-default.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/groove-default.html rename to tests/wpt/tests/css/CSS2/borders/groove-default.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/groove-ridge-default-notref.html b/tests/wpt/tests/css/CSS2/borders/groove-ridge-default-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/groove-ridge-default-notref.html rename to tests/wpt/tests/css/CSS2/borders/groove-ridge-default-notref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/ltr-borders-001.xht b/tests/wpt/tests/css/CSS2/borders/ltr-borders-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/ltr-borders-001.xht rename to tests/wpt/tests/css/CSS2/borders/ltr-borders-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/ridge-default.html b/tests/wpt/tests/css/CSS2/borders/ridge-default.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/ridge-default.html rename to tests/wpt/tests/css/CSS2/borders/ridge-default.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/rtl-borders-001.xht b/tests/wpt/tests/css/CSS2/borders/rtl-borders-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/rtl-borders-001.xht rename to tests/wpt/tests/css/CSS2/borders/rtl-borders-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/shand-border-000-ref.xht b/tests/wpt/tests/css/CSS2/borders/shand-border-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/shand-border-000-ref.xht rename to tests/wpt/tests/css/CSS2/borders/shand-border-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/shand-border-000.xht b/tests/wpt/tests/css/CSS2/borders/shand-border-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/shand-border-000.xht rename to tests/wpt/tests/css/CSS2/borders/shand-border-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/shand-border-001.xht b/tests/wpt/tests/css/CSS2/borders/shand-border-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/shand-border-001.xht rename to tests/wpt/tests/css/CSS2/borders/shand-border-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/000001_color.png b/tests/wpt/tests/css/CSS2/borders/support/000001_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/000001_color.png rename to tests/wpt/tests/css/CSS2/borders/support/000001_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/000002_color.png b/tests/wpt/tests/css/CSS2/borders/support/000002_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/000002_color.png rename to tests/wpt/tests/css/CSS2/borders/support/000002_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/00007f_color.png b/tests/wpt/tests/css/CSS2/borders/support/00007f_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/00007f_color.png rename to tests/wpt/tests/css/CSS2/borders/support/00007f_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/000080_color.png b/tests/wpt/tests/css/CSS2/borders/support/000080_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/000080_color.png rename to tests/wpt/tests/css/CSS2/borders/support/000080_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/0000fc_color.png b/tests/wpt/tests/css/CSS2/borders/support/0000fc_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/0000fc_color.png rename to tests/wpt/tests/css/CSS2/borders/support/0000fc_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/0000fe_color.png b/tests/wpt/tests/css/CSS2/borders/support/0000fe_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/0000fe_color.png rename to tests/wpt/tests/css/CSS2/borders/support/0000fe_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/000100_color.png b/tests/wpt/tests/css/CSS2/borders/support/000100_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/000100_color.png rename to tests/wpt/tests/css/CSS2/borders/support/000100_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/000200_color.png b/tests/wpt/tests/css/CSS2/borders/support/000200_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/000200_color.png rename to tests/wpt/tests/css/CSS2/borders/support/000200_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/000_color.png b/tests/wpt/tests/css/CSS2/borders/support/000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/000_color.png rename to tests/wpt/tests/css/CSS2/borders/support/000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/001_color.png b/tests/wpt/tests/css/CSS2/borders/support/001_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/001_color.png rename to tests/wpt/tests/css/CSS2/borders/support/001_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/007f00_color.png b/tests/wpt/tests/css/CSS2/borders/support/007f00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/007f00_color.png rename to tests/wpt/tests/css/CSS2/borders/support/007f00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/008000_color.png b/tests/wpt/tests/css/CSS2/borders/support/008000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/008000_color.png rename to tests/wpt/tests/css/CSS2/borders/support/008000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/009_color.png b/tests/wpt/tests/css/CSS2/borders/support/009_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/009_color.png rename to tests/wpt/tests/css/CSS2/borders/support/009_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/00e_color.png b/tests/wpt/tests/css/CSS2/borders/support/00e_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/00e_color.png rename to tests/wpt/tests/css/CSS2/borders/support/00e_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/00f_color.png b/tests/wpt/tests/css/CSS2/borders/support/00f_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/00f_color.png rename to tests/wpt/tests/css/CSS2/borders/support/00f_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/00fc00_color.png b/tests/wpt/tests/css/CSS2/borders/support/00fc00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/00fc00_color.png rename to tests/wpt/tests/css/CSS2/borders/support/00fc00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/00fe00_color.png b/tests/wpt/tests/css/CSS2/borders/support/00fe00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/00fe00_color.png rename to tests/wpt/tests/css/CSS2/borders/support/00fe00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/010000_color.png b/tests/wpt/tests/css/CSS2/borders/support/010000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/010000_color.png rename to tests/wpt/tests/css/CSS2/borders/support/010000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/010101_color.png b/tests/wpt/tests/css/CSS2/borders/support/010101_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/010101_color.png rename to tests/wpt/tests/css/CSS2/borders/support/010101_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/010_color.png b/tests/wpt/tests/css/CSS2/borders/support/010_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/010_color.png rename to tests/wpt/tests/css/CSS2/borders/support/010_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/020000_color.png b/tests/wpt/tests/css/CSS2/borders/support/020000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/020000_color.png rename to tests/wpt/tests/css/CSS2/borders/support/020000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/020202_color.png b/tests/wpt/tests/css/CSS2/borders/support/020202_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/020202_color.png rename to tests/wpt/tests/css/CSS2/borders/support/020202_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/090_color.png b/tests/wpt/tests/css/CSS2/borders/support/090_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/090_color.png rename to tests/wpt/tests/css/CSS2/borders/support/090_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/0e0_color.png b/tests/wpt/tests/css/CSS2/borders/support/0e0_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/0e0_color.png rename to tests/wpt/tests/css/CSS2/borders/support/0e0_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/0f0_color.png b/tests/wpt/tests/css/CSS2/borders/support/0f0_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/0f0_color.png rename to tests/wpt/tests/css/CSS2/borders/support/0f0_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/100_color.png b/tests/wpt/tests/css/CSS2/borders/support/100_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/100_color.png rename to tests/wpt/tests/css/CSS2/borders/support/100_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/111_color.png b/tests/wpt/tests/css/CSS2/borders/support/111_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/111_color.png rename to tests/wpt/tests/css/CSS2/borders/support/111_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/1x1-green.png b/tests/wpt/tests/css/CSS2/borders/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/borders/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/borders/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/borders/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/borders/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/borders/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/borders/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/borders/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/1x1-red.png b/tests/wpt/tests/css/CSS2/borders/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/borders/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/1x1-white.png b/tests/wpt/tests/css/CSS2/borders/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/borders/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/borders/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/borders/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/60x60-green.png b/tests/wpt/tests/css/CSS2/borders/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/borders/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/7f0000_color.png b/tests/wpt/tests/css/CSS2/borders/support/7f0000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/7f0000_color.png rename to tests/wpt/tests/css/CSS2/borders/support/7f0000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/7f7f7f_color.png b/tests/wpt/tests/css/CSS2/borders/support/7f7f7f_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/7f7f7f_color.png rename to tests/wpt/tests/css/CSS2/borders/support/7f7f7f_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/800000_color.png b/tests/wpt/tests/css/CSS2/borders/support/800000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/800000_color.png rename to tests/wpt/tests/css/CSS2/borders/support/800000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/808080_color.png b/tests/wpt/tests/css/CSS2/borders/support/808080_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/808080_color.png rename to tests/wpt/tests/css/CSS2/borders/support/808080_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/900_color.png b/tests/wpt/tests/css/CSS2/borders/support/900_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/900_color.png rename to tests/wpt/tests/css/CSS2/borders/support/900_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/999_color.png b/tests/wpt/tests/css/CSS2/borders/support/999_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/999_color.png rename to tests/wpt/tests/css/CSS2/borders/support/999_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/a-green.css b/tests/wpt/tests/css/CSS2/borders/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/a-green.css rename to tests/wpt/tests/css/CSS2/borders/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/aqua_color.png b/tests/wpt/tests/css/CSS2/borders/support/aqua_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/aqua_color.png rename to tests/wpt/tests/css/CSS2/borders/support/aqua_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/b-green.css b/tests/wpt/tests/css/CSS2/borders/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/b-green.css rename to tests/wpt/tests/css/CSS2/borders/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/black15x15.png b/tests/wpt/tests/css/CSS2/borders/support/black15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/black15x15.png rename to tests/wpt/tests/css/CSS2/borders/support/black15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/blue15x15.png b/tests/wpt/tests/css/CSS2/borders/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/borders/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/c-red.css b/tests/wpt/tests/css/CSS2/borders/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/c-red.css rename to tests/wpt/tests/css/CSS2/borders/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/cat.png b/tests/wpt/tests/css/CSS2/borders/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/cat.png rename to tests/wpt/tests/css/CSS2/borders/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/diamond.png b/tests/wpt/tests/css/CSS2/borders/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/diamond.png rename to tests/wpt/tests/css/CSS2/borders/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/e00_color.png b/tests/wpt/tests/css/CSS2/borders/support/e00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/e00_color.png rename to tests/wpt/tests/css/CSS2/borders/support/e00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/eee_color.png b/tests/wpt/tests/css/CSS2/borders/support/eee_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/eee_color.png rename to tests/wpt/tests/css/CSS2/borders/support/eee_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/f00_color.png b/tests/wpt/tests/css/CSS2/borders/support/f00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/f00_color.png rename to tests/wpt/tests/css/CSS2/borders/support/f00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/fc0000_color.png b/tests/wpt/tests/css/CSS2/borders/support/fc0000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/fc0000_color.png rename to tests/wpt/tests/css/CSS2/borders/support/fc0000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/fcfcfc_color.png b/tests/wpt/tests/css/CSS2/borders/support/fcfcfc_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/fcfcfc_color.png rename to tests/wpt/tests/css/CSS2/borders/support/fcfcfc_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/fe0000_color.png b/tests/wpt/tests/css/CSS2/borders/support/fe0000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/fe0000_color.png rename to tests/wpt/tests/css/CSS2/borders/support/fe0000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/fefefe_color.png b/tests/wpt/tests/css/CSS2/borders/support/fefefe_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/fefefe_color.png rename to tests/wpt/tests/css/CSS2/borders/support/fefefe_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/fff_color.png b/tests/wpt/tests/css/CSS2/borders/support/fff_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/fff_color.png rename to tests/wpt/tests/css/CSS2/borders/support/fff_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/fuchsia_color.png b/tests/wpt/tests/css/CSS2/borders/support/fuchsia_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/fuchsia_color.png rename to tests/wpt/tests/css/CSS2/borders/support/fuchsia_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/green15x15.png b/tests/wpt/tests/css/CSS2/borders/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/green15x15.png rename to tests/wpt/tests/css/CSS2/borders/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/ltr-borders-001.png b/tests/wpt/tests/css/CSS2/borders/support/ltr-borders-001.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/ltr-borders-001.png rename to tests/wpt/tests/css/CSS2/borders/support/ltr-borders-001.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/maroon_color.png b/tests/wpt/tests/css/CSS2/borders/support/maroon_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/maroon_color.png rename to tests/wpt/tests/css/CSS2/borders/support/maroon_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/olive_color.png b/tests/wpt/tests/css/CSS2/borders/support/olive_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/olive_color.png rename to tests/wpt/tests/css/CSS2/borders/support/olive_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/borders/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/borders/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/borders/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/borders/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/borders/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/borders/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/borders/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/borders/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/purple_color.png b/tests/wpt/tests/css/CSS2/borders/support/purple_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/purple_color.png rename to tests/wpt/tests/css/CSS2/borders/support/purple_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/ring.png b/tests/wpt/tests/css/CSS2/borders/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/ring.png rename to tests/wpt/tests/css/CSS2/borders/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/silver_color.png b/tests/wpt/tests/css/CSS2/borders/support/silver_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/silver_color.png rename to tests/wpt/tests/css/CSS2/borders/support/silver_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/square-purple.png b/tests/wpt/tests/css/CSS2/borders/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/square-purple.png rename to tests/wpt/tests/css/CSS2/borders/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/square-teal.png b/tests/wpt/tests/css/CSS2/borders/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/square-teal.png rename to tests/wpt/tests/css/CSS2/borders/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/square-white.png b/tests/wpt/tests/css/CSS2/borders/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/square-white.png rename to tests/wpt/tests/css/CSS2/borders/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-aqua.png b/tests/wpt/tests/css/CSS2/borders/support/swatch-aqua.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-aqua.png rename to tests/wpt/tests/css/CSS2/borders/support/swatch-aqua.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/borders/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/borders/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-green.png b/tests/wpt/tests/css/CSS2/borders/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/borders/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/borders/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/borders/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/borders/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/borders/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-red.png b/tests/wpt/tests/css/CSS2/borders/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/borders/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-white.png b/tests/wpt/tests/css/CSS2/borders/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/borders/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/borders/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/borders/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/teal_color.png b/tests/wpt/tests/css/CSS2/borders/support/teal_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/teal_color.png rename to tests/wpt/tests/css/CSS2/borders/support/teal_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/test-bl.png b/tests/wpt/tests/css/CSS2/borders/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/test-bl.png rename to tests/wpt/tests/css/CSS2/borders/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/test-br.png b/tests/wpt/tests/css/CSS2/borders/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/test-br.png rename to tests/wpt/tests/css/CSS2/borders/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/test-outer.png b/tests/wpt/tests/css/CSS2/borders/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/test-outer.png rename to tests/wpt/tests/css/CSS2/borders/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/test-tl.png b/tests/wpt/tests/css/CSS2/borders/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/test-tl.png rename to tests/wpt/tests/css/CSS2/borders/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/test-tr.png b/tests/wpt/tests/css/CSS2/borders/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/test-tr.png rename to tests/wpt/tests/css/CSS2/borders/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/support/yellow_color.png b/tests/wpt/tests/css/CSS2/borders/support/yellow_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/borders/support/yellow_color.png rename to tests/wpt/tests/css/CSS2/borders/support/yellow_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/anonymous-box-generation-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/anonymous-box-generation-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/anonymous-box-generation-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/anonymous-box-generation-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/anonymous-box-generation-001.xht b/tests/wpt/tests/css/CSS2/box-display/anonymous-box-generation-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/anonymous-box-generation-001.xht rename to tests/wpt/tests/css/CSS2/box-display/anonymous-box-generation-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/anonymous-boxes-inheritance-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/anonymous-boxes-inheritance-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/anonymous-boxes-inheritance-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/anonymous-boxes-inheritance-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht b/tests/wpt/tests/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht rename to tests/wpt/tests/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/anonymous-inline-whitespace-001.xht b/tests/wpt/tests/css/CSS2/box-display/anonymous-inline-whitespace-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/anonymous-inline-whitespace-001.xht rename to tests/wpt/tests/css/CSS2/box-display/anonymous-inline-whitespace-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-001.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-001.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-002.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-002.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-003-ref.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-003-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-003.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-003.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-004.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-004.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-005.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-005.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-006.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-006.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-007-ref.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-007-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-007.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-007.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-008-ref.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-008-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-008.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-008.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-relpos-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-relpos-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-relpos-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-relpos-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-relpos-001.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-relpos-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-relpos-001.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-relpos-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-relpos-002.xht b/tests/wpt/tests/css/CSS2/box-display/block-in-inline-relpos-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/block-in-inline-relpos-002.xht rename to tests/wpt/tests/css/CSS2/box-display/block-in-inline-relpos-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/box-generation-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/box-generation-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/box-generation-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/box-generation-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/box-generation-001.xht b/tests/wpt/tests/css/CSS2/box-display/box-generation-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/box-generation-001.xht rename to tests/wpt/tests/css/CSS2/box-display/box-generation-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/box-generation-002-ref.xht b/tests/wpt/tests/css/CSS2/box-display/box-generation-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/box-generation-002-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/box-generation-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/box-generation-002.xht b/tests/wpt/tests/css/CSS2/box-display/box-generation-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/box-generation-002.xht rename to tests/wpt/tests/css/CSS2/box-display/box-generation-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/box-generation-003.xht b/tests/wpt/tests/css/CSS2/box-display/box-generation-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/box-generation-003.xht rename to tests/wpt/tests/css/CSS2/box-display/box-generation-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-001.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-001.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-002.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-002.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-003.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-003.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-004.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-004.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-005.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-005.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-006.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-006.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-007-ref.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-007-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-007.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-007.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-008-ref.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-008-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-008.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-008.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-009-ref.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-009-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-009.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-009.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-010.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-010.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-011.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-011.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-013.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-013.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-015.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-015.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-017.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-017.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-018.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-018.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-019-ref.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-019-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-019.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-019.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-020-ref.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-020-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-020.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-020.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-021.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-021.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-022.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-022.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-023-ref.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-023-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-023.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-023.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-024.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-024.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-025.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-025.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-026.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-026.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-027-ref.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-027-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-027.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-027.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-028-ref.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-028-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-028.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-028.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-029-ref.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-029-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-029-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-029-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-029.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-029.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-030-ref.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-030-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-030-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-030-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-030.xht b/tests/wpt/tests/css/CSS2/box-display/containing-block-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/containing-block-030.xht rename to tests/wpt/tests/css/CSS2/box-display/containing-block-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/delete-block-in-inlines-beginning-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/delete-block-in-inlines-beginning-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/delete-block-in-inlines-beginning-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/delete-block-in-inlines-beginning-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/delete-block-in-inlines-beginning-001.xht b/tests/wpt/tests/css/CSS2/box-display/delete-block-in-inlines-beginning-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/delete-block-in-inlines-beginning-001.xht rename to tests/wpt/tests/css/CSS2/box-display/delete-block-in-inlines-beginning-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/delete-block-in-inlines-end-001.xht b/tests/wpt/tests/css/CSS2/box-display/delete-block-in-inlines-end-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/delete-block-in-inlines-end-001.xht rename to tests/wpt/tests/css/CSS2/box-display/delete-block-in-inlines-end-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/delete-block-in-inlines-middle-001.xht b/tests/wpt/tests/css/CSS2/box-display/delete-block-in-inlines-middle-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/delete-block-in-inlines-middle-001.xht rename to tests/wpt/tests/css/CSS2/box-display/delete-block-in-inlines-middle-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/delete-inline-in-blocks-beginning-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/delete-inline-in-blocks-beginning-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/delete-inline-in-blocks-beginning-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/delete-inline-in-blocks-beginning-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/delete-inline-in-blocks-beginning-001.xht b/tests/wpt/tests/css/CSS2/box-display/delete-inline-in-blocks-beginning-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/delete-inline-in-blocks-beginning-001.xht rename to tests/wpt/tests/css/CSS2/box-display/delete-inline-in-blocks-beginning-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/delete-inline-in-blocks-end-001.xht b/tests/wpt/tests/css/CSS2/box-display/delete-inline-in-blocks-end-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/delete-inline-in-blocks-end-001.xht rename to tests/wpt/tests/css/CSS2/box-display/delete-inline-in-blocks-end-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/delete-inline-in-blocks-middle-001.xht b/tests/wpt/tests/css/CSS2/box-display/delete-inline-in-blocks-middle-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/delete-inline-in-blocks-middle-001.xht rename to tests/wpt/tests/css/CSS2/box-display/delete-inline-in-blocks-middle-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/delete-inline-in-blocks-middle-002-ref.xht b/tests/wpt/tests/css/CSS2/box-display/delete-inline-in-blocks-middle-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/delete-inline-in-blocks-middle-002-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/delete-inline-in-blocks-middle-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/delete-inline-in-blocks-middle-002.xht b/tests/wpt/tests/css/CSS2/box-display/delete-inline-in-blocks-middle-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/delete-inline-in-blocks-middle-002.xht rename to tests/wpt/tests/css/CSS2/box-display/delete-inline-in-blocks-middle-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/delete-inline-in-blocks-middle-003.xht b/tests/wpt/tests/css/CSS2/box-display/delete-inline-in-blocks-middle-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/delete-inline-in-blocks-middle-003.xht rename to tests/wpt/tests/css/CSS2/box-display/delete-inline-in-blocks-middle-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/descendant-display-none-001.xht b/tests/wpt/tests/css/CSS2/box-display/descendant-display-none-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/descendant-display-none-001.xht rename to tests/wpt/tests/css/CSS2/box-display/descendant-display-none-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/descendant-display-override-001.xht b/tests/wpt/tests/css/CSS2/box-display/descendant-display-override-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/descendant-display-override-001.xht rename to tests/wpt/tests/css/CSS2/box-display/descendant-display-override-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/display-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/display-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-001.xht b/tests/wpt/tests/css/CSS2/box-display/display-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-001.xht rename to tests/wpt/tests/css/CSS2/box-display/display-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-002-ref.xht b/tests/wpt/tests/css/CSS2/box-display/display-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-002-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/display-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-002.xht b/tests/wpt/tests/css/CSS2/box-display/display-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-002.xht rename to tests/wpt/tests/css/CSS2/box-display/display-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-003.xht b/tests/wpt/tests/css/CSS2/box-display/display-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-003.xht rename to tests/wpt/tests/css/CSS2/box-display/display-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-005.xht b/tests/wpt/tests/css/CSS2/box-display/display-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-005.xht rename to tests/wpt/tests/css/CSS2/box-display/display-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-006.xht b/tests/wpt/tests/css/CSS2/box-display/display-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-006.xht rename to tests/wpt/tests/css/CSS2/box-display/display-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-007.xht b/tests/wpt/tests/css/CSS2/box-display/display-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-007.xht rename to tests/wpt/tests/css/CSS2/box-display/display-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-008-ref.xht b/tests/wpt/tests/css/CSS2/box-display/display-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-008-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/display-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-008.xht b/tests/wpt/tests/css/CSS2/box-display/display-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-008.xht rename to tests/wpt/tests/css/CSS2/box-display/display-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-009.xht b/tests/wpt/tests/css/CSS2/box-display/display-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-009.xht rename to tests/wpt/tests/css/CSS2/box-display/display-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-010-ref.xht b/tests/wpt/tests/css/CSS2/box-display/display-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-010-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/display-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-010.xht b/tests/wpt/tests/css/CSS2/box-display/display-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-010.xht rename to tests/wpt/tests/css/CSS2/box-display/display-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-011.xht b/tests/wpt/tests/css/CSS2/box-display/display-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-011.xht rename to tests/wpt/tests/css/CSS2/box-display/display-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-012-ref.xht b/tests/wpt/tests/css/CSS2/box-display/display-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-012-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/display-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-012.xht b/tests/wpt/tests/css/CSS2/box-display/display-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-012.xht rename to tests/wpt/tests/css/CSS2/box-display/display-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-013.xht b/tests/wpt/tests/css/CSS2/box-display/display-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-013.xht rename to tests/wpt/tests/css/CSS2/box-display/display-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-014.xht b/tests/wpt/tests/css/CSS2/box-display/display-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-014.xht rename to tests/wpt/tests/css/CSS2/box-display/display-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-015.xht b/tests/wpt/tests/css/CSS2/box-display/display-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-015.xht rename to tests/wpt/tests/css/CSS2/box-display/display-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-016.xht b/tests/wpt/tests/css/CSS2/box-display/display-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-016.xht rename to tests/wpt/tests/css/CSS2/box-display/display-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-017.xht b/tests/wpt/tests/css/CSS2/box-display/display-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-017.xht rename to tests/wpt/tests/css/CSS2/box-display/display-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-018-ref.xht b/tests/wpt/tests/css/CSS2/box-display/display-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-018-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/display-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-018.xht b/tests/wpt/tests/css/CSS2/box-display/display-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-018.xht rename to tests/wpt/tests/css/CSS2/box-display/display-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-applies-to-001.xht b/tests/wpt/tests/css/CSS2/box-display/display-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/box-display/display-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-applies-to-002.xht b/tests/wpt/tests/css/CSS2/box-display/display-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/box-display/display-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-change-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/display-change-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-change-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/display-change-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-change-001.xht b/tests/wpt/tests/css/CSS2/box-display/display-change-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-change-001.xht rename to tests/wpt/tests/css/CSS2/box-display/display-change-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-initial-001.xht b/tests/wpt/tests/css/CSS2/box-display/display-initial-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-initial-001.xht rename to tests/wpt/tests/css/CSS2/box-display/display-initial-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-none-001.xht b/tests/wpt/tests/css/CSS2/box-display/display-none-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-none-001.xht rename to tests/wpt/tests/css/CSS2/box-display/display-none-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-none-002.xht b/tests/wpt/tests/css/CSS2/box-display/display-none-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-none-002.xht rename to tests/wpt/tests/css/CSS2/box-display/display-none-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/display-none-003.xht b/tests/wpt/tests/css/CSS2/box-display/display-none-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/display-none-003.xht rename to tests/wpt/tests/css/CSS2/box-display/display-none-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-001.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-001.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-002-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-002-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-002.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-002.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-003-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-003-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-003.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-003.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-001.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-001.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-002-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-002-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-002.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-002.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-003-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-003-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-003.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-003.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-001.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-001.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-002-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-002-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-002.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-002.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-003-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-003-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-003.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-003.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-inlines-beginning-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-inlines-beginning-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-inlines-beginning-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-inlines-beginning-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-inlines-beginning-001.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-inlines-beginning-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-inlines-beginning-001.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-inlines-beginning-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-inlines-end-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-inlines-end-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-inlines-end-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-inlines-end-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-inlines-end-001.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-inlines-end-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-inlines-end-001.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-inlines-end-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-inlines-middle-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-inlines-middle-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-inlines-middle-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-inlines-middle-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-inlines-middle-001.xht b/tests/wpt/tests/css/CSS2/box-display/insert-block-in-inlines-middle-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-block-in-inlines-middle-001.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-block-in-inlines-middle-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-beginning-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-beginning-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-beginning-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-beginning-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-beginning-001.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-beginning-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-beginning-001.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-beginning-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-end-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-end-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-end-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-end-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-end-001.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-end-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-end-001.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-end-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-middle-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-middle-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-middle-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-middle-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-middle-001.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-middle-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-middle-001.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-middle-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-middle-002-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-middle-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-middle-002-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-middle-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-middle-002.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-middle-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-middle-002.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-middle-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-002-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-002-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-002.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-002.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-003-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-003-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-003.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-003.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-002-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-002-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-002.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-002.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-003-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-003-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-003.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-003.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-002-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-002-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-002.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-002.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-003-ref.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-003-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-003.xht b/tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-003.xht rename to tests/wpt/tests/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/root-box-002-ref.xht b/tests/wpt/tests/css/CSS2/box-display/root-box-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/root-box-002-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/root-box-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/root-box-002.xht b/tests/wpt/tests/css/CSS2/box-display/root-box-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/root-box-002.xht rename to tests/wpt/tests/css/CSS2/box-display/root-box-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/root-box-003-ref.xht b/tests/wpt/tests/css/CSS2/box-display/root-box-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/root-box-003-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/root-box-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/root-box-003.xht b/tests/wpt/tests/css/CSS2/box-display/root-box-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/root-box-003.xht rename to tests/wpt/tests/css/CSS2/box-display/root-box-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/root-canvas-001-ref.xht b/tests/wpt/tests/css/CSS2/box-display/root-canvas-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/root-canvas-001-ref.xht rename to tests/wpt/tests/css/CSS2/box-display/root-canvas-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/root-canvas-001.xht b/tests/wpt/tests/css/CSS2/box-display/root-canvas-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/root-canvas-001.xht rename to tests/wpt/tests/css/CSS2/box-display/root-canvas-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/1x1-green.png b/tests/wpt/tests/css/CSS2/box-display/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/box-display/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/box-display/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/box-display/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/box-display/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/box-display/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/box-display/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/box-display/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/1x1-red.png b/tests/wpt/tests/css/CSS2/box-display/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/box-display/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/1x1-white.png b/tests/wpt/tests/css/CSS2/box-display/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/box-display/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/box-display/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/box-display/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/60x60-green.png b/tests/wpt/tests/css/CSS2/box-display/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/box-display/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/a-green.css b/tests/wpt/tests/css/CSS2/box-display/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/a-green.css rename to tests/wpt/tests/css/CSS2/box-display/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/b-green.css b/tests/wpt/tests/css/CSS2/box-display/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/b-green.css rename to tests/wpt/tests/css/CSS2/box-display/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/blue15x15.png b/tests/wpt/tests/css/CSS2/box-display/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/box-display/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/blue96x96.png b/tests/wpt/tests/css/CSS2/box-display/support/blue96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/blue96x96.png rename to tests/wpt/tests/css/CSS2/box-display/support/blue96x96.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/c-red.css b/tests/wpt/tests/css/CSS2/box-display/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/c-red.css rename to tests/wpt/tests/css/CSS2/box-display/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/cat.png b/tests/wpt/tests/css/CSS2/box-display/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/cat.png rename to tests/wpt/tests/css/CSS2/box-display/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/diamond.png b/tests/wpt/tests/css/CSS2/box-display/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/diamond.png rename to tests/wpt/tests/css/CSS2/box-display/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/green15x15.png b/tests/wpt/tests/css/CSS2/box-display/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/green15x15.png rename to tests/wpt/tests/css/CSS2/box-display/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/box-display/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/box-display/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/box-display/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/box-display/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/box-display/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/box-display/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/box-display/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/box-display/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/ring.png b/tests/wpt/tests/css/CSS2/box-display/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/ring.png rename to tests/wpt/tests/css/CSS2/box-display/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/root-canvas-001a.html b/tests/wpt/tests/css/CSS2/box-display/support/root-canvas-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/root-canvas-001a.html rename to tests/wpt/tests/css/CSS2/box-display/support/root-canvas-001a.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/square-purple.png b/tests/wpt/tests/css/CSS2/box-display/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/square-purple.png rename to tests/wpt/tests/css/CSS2/box-display/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/square-teal.png b/tests/wpt/tests/css/CSS2/box-display/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/square-teal.png rename to tests/wpt/tests/css/CSS2/box-display/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/square-white.png b/tests/wpt/tests/css/CSS2/box-display/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/square-white.png rename to tests/wpt/tests/css/CSS2/box-display/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/box-display/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/box-display/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/swatch-green.png b/tests/wpt/tests/css/CSS2/box-display/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/box-display/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/box-display/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/box-display/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/box-display/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/box-display/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/swatch-red.png b/tests/wpt/tests/css/CSS2/box-display/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/box-display/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/swatch-white.png b/tests/wpt/tests/css/CSS2/box-display/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/box-display/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/box-display/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/box-display/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/test-bl.png b/tests/wpt/tests/css/CSS2/box-display/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/test-bl.png rename to tests/wpt/tests/css/CSS2/box-display/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/test-br.png b/tests/wpt/tests/css/CSS2/box-display/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/test-br.png rename to tests/wpt/tests/css/CSS2/box-display/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/test-outer.png b/tests/wpt/tests/css/CSS2/box-display/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/test-outer.png rename to tests/wpt/tests/css/CSS2/box-display/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/test-tl.png b/tests/wpt/tests/css/CSS2/box-display/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/test-tl.png rename to tests/wpt/tests/css/CSS2/box-display/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/test-tr.png b/tests/wpt/tests/css/CSS2/box-display/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/test-tr.png rename to tests/wpt/tests/css/CSS2/box-display/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/viewport-004-firstcanvas.htm b/tests/wpt/tests/css/CSS2/box-display/support/viewport-004-firstcanvas.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/viewport-004-firstcanvas.htm rename to tests/wpt/tests/css/CSS2/box-display/support/viewport-004-firstcanvas.htm diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/support/viewport-004-secondcanvas.htm b/tests/wpt/tests/css/CSS2/box-display/support/viewport-004-secondcanvas.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/support/viewport-004-secondcanvas.htm rename to tests/wpt/tests/css/CSS2/box-display/support/viewport-004-secondcanvas.htm diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/viewport-001.xht b/tests/wpt/tests/css/CSS2/box-display/viewport-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/viewport-001.xht rename to tests/wpt/tests/css/CSS2/box-display/viewport-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/viewport-002.xht b/tests/wpt/tests/css/CSS2/box-display/viewport-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/viewport-002.xht rename to tests/wpt/tests/css/CSS2/box-display/viewport-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/viewport-003.xht b/tests/wpt/tests/css/CSS2/box-display/viewport-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/viewport-003.xht rename to tests/wpt/tests/css/CSS2/box-display/viewport-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box-display/viewport-004.xht b/tests/wpt/tests/css/CSS2/box-display/viewport-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box-display/viewport-004.xht rename to tests/wpt/tests/css/CSS2/box-display/viewport-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/left-ltr-ref.xht b/tests/wpt/tests/css/CSS2/box/left-ltr-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/left-ltr-ref.xht rename to tests/wpt/tests/css/CSS2/box/left-ltr-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/left-rtl-ref.xht b/tests/wpt/tests/css/CSS2/box/left-rtl-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/left-rtl-ref.xht rename to tests/wpt/tests/css/CSS2/box/left-rtl-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/ltr-basic.xht b/tests/wpt/tests/css/CSS2/box/ltr-basic.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/ltr-basic.xht rename to tests/wpt/tests/css/CSS2/box/ltr-basic.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/ltr-ib.xht b/tests/wpt/tests/css/CSS2/box/ltr-ib.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/ltr-ib.xht rename to tests/wpt/tests/css/CSS2/box/ltr-ib.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/ltr-span-only-ib.xht b/tests/wpt/tests/css/CSS2/box/ltr-span-only-ib.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/ltr-span-only-ib.xht rename to tests/wpt/tests/css/CSS2/box/ltr-span-only-ib.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/ltr-span-only.xht b/tests/wpt/tests/css/CSS2/box/ltr-span-only.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/ltr-span-only.xht rename to tests/wpt/tests/css/CSS2/box/ltr-span-only.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/right-ltr-ref.xht b/tests/wpt/tests/css/CSS2/box/right-ltr-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/right-ltr-ref.xht rename to tests/wpt/tests/css/CSS2/box/right-ltr-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/right-rtl-ref.xht b/tests/wpt/tests/css/CSS2/box/right-rtl-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/right-rtl-ref.xht rename to tests/wpt/tests/css/CSS2/box/right-rtl-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/rtl-basic.xht b/tests/wpt/tests/css/CSS2/box/rtl-basic.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/rtl-basic.xht rename to tests/wpt/tests/css/CSS2/box/rtl-basic.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/rtl-ib.xht b/tests/wpt/tests/css/CSS2/box/rtl-ib.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/rtl-ib.xht rename to tests/wpt/tests/css/CSS2/box/rtl-ib.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/rtl-linebreak-notref1.xht b/tests/wpt/tests/css/CSS2/box/rtl-linebreak-notref1.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/rtl-linebreak-notref1.xht rename to tests/wpt/tests/css/CSS2/box/rtl-linebreak-notref1.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/rtl-linebreak-notref2.xht b/tests/wpt/tests/css/CSS2/box/rtl-linebreak-notref2.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/rtl-linebreak-notref2.xht rename to tests/wpt/tests/css/CSS2/box/rtl-linebreak-notref2.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/rtl-linebreak-ref.xht b/tests/wpt/tests/css/CSS2/box/rtl-linebreak-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/rtl-linebreak-ref.xht rename to tests/wpt/tests/css/CSS2/box/rtl-linebreak-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/rtl-linebreak.xht b/tests/wpt/tests/css/CSS2/box/rtl-linebreak.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/rtl-linebreak.xht rename to tests/wpt/tests/css/CSS2/box/rtl-linebreak.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/rtl-span-only-ib.xht b/tests/wpt/tests/css/CSS2/box/rtl-span-only-ib.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/rtl-span-only-ib.xht rename to tests/wpt/tests/css/CSS2/box/rtl-span-only-ib.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/box/rtl-span-only.xht b/tests/wpt/tests/css/CSS2/box/rtl-span-only.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/box/rtl-span-only.xht rename to tests/wpt/tests/css/CSS2/box/rtl-span-only.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/.htaccess b/tests/wpt/tests/css/CSS2/cascade-import/.htaccess similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/.htaccess rename to tests/wpt/tests/css/CSS2/cascade-import/.htaccess diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/README b/tests/wpt/tests/css/CSS2/cascade-import/README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/README rename to tests/wpt/tests/css/CSS2/cascade-import/README diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-001.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-001.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-002.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-002.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-002.xht.headers b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-002.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-002.xht.headers rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-002.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-003.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-003.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-004.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-004.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-005.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-005.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-006.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-006.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-007.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-007.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-008.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-008.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-009.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-009.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-010.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-010.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-011.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-011.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-012.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-012.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-001.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-001.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-002.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-002.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-003.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-003.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-004.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-004.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-005.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-005.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-006.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-006.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-README b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-README rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-README diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-control.xht b/tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-control.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/cascade-import-dynamic-control.xht rename to tests/wpt/tests/css/CSS2/cascade-import/cascade-import-dynamic-control.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002a.css b/tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002a.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002a.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002a.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002b.css b/tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002b.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002b.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002b.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002c.css b/tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002c.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002c.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002c.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002d.css b/tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002d.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002d.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002d.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002e.css b/tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002e.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002e.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002e.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002f.css b/tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002f.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002f.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002f.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002i.css b/tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002i.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002i.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002i.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002j.css b/tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002j.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002j.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002j.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002k.css b/tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002k.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002k.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002k.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002m.css b/tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002m.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002m.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002m.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002n.css b/tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002n.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002n.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002n.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002o.css b/tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002o.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002o.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002o.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002p.css b/tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002p.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/cascade-import-002p.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/cascade-import-002p.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/import-green.css b/tests/wpt/tests/css/CSS2/cascade-import/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/import-green.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/import-red.css b/tests/wpt/tests/css/CSS2/cascade-import/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade-import/support/import-red.css rename to tests/wpt/tests/css/CSS2/cascade-import/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-001.xht b/tests/wpt/tests/css/CSS2/cascade/at-import-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-001.xht rename to tests/wpt/tests/css/CSS2/cascade/at-import-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-002.xht b/tests/wpt/tests/css/CSS2/cascade/at-import-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-002.xht rename to tests/wpt/tests/css/CSS2/cascade/at-import-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-003.xht b/tests/wpt/tests/css/CSS2/cascade/at-import-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-003.xht rename to tests/wpt/tests/css/CSS2/cascade/at-import-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-004.xht b/tests/wpt/tests/css/CSS2/cascade/at-import-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-004.xht rename to tests/wpt/tests/css/CSS2/cascade/at-import-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-005.xht b/tests/wpt/tests/css/CSS2/cascade/at-import-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-005.xht rename to tests/wpt/tests/css/CSS2/cascade/at-import-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-006.xht b/tests/wpt/tests/css/CSS2/cascade/at-import-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-006.xht rename to tests/wpt/tests/css/CSS2/cascade/at-import-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-007.xht b/tests/wpt/tests/css/CSS2/cascade/at-import-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-007.xht rename to tests/wpt/tests/css/CSS2/cascade/at-import-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-008.xht b/tests/wpt/tests/css/CSS2/cascade/at-import-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-008.xht rename to tests/wpt/tests/css/CSS2/cascade/at-import-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-009.xht b/tests/wpt/tests/css/CSS2/cascade/at-import-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-009.xht rename to tests/wpt/tests/css/CSS2/cascade/at-import-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-010.xht b/tests/wpt/tests/css/CSS2/cascade/at-import-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-010.xht rename to tests/wpt/tests/css/CSS2/cascade/at-import-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-011.xht b/tests/wpt/tests/css/CSS2/cascade/at-import-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/at-import-011.xht rename to tests/wpt/tests/css/CSS2/cascade/at-import-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-001.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-001.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-002.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-002.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-003.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-003.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-004.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-004.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-005.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-005.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-006.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-006.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-007.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-007.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-008.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-008.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-009.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-009.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-009a-ref.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-009a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-009a-ref.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-009a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-009a.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-009a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-009a.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-009a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-009b-ref.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-009b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-009b-ref.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-009b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-009b.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-009b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-009b.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-009b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-010.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-010.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-011.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-011.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-012-ref.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-012-ref.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-012.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-012.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-precedence-001.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-precedence-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-precedence-001.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-precedence-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-precedence-002.xht b/tests/wpt/tests/css/CSS2/cascade/cascade-precedence-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/cascade-precedence-002.xht rename to tests/wpt/tests/css/CSS2/cascade/cascade-precedence-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/default-stylesheet-001.xht b/tests/wpt/tests/css/CSS2/cascade/default-stylesheet-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/default-stylesheet-001.xht rename to tests/wpt/tests/css/CSS2/cascade/default-stylesheet-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-001.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-001.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-002.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-002.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-003.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-003.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-004.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-004.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-005.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-005.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-006.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-006.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-007.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-007.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-008.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-008.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-009.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-009.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-010.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-010.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-011.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-011.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-012.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-012.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-013.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-013.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-014.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-014.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-015.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-015.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-017.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-017.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-018.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-018.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-019.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-019.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-020.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-020.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-021.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-021.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-022.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-022.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-023.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-023.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-024.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-024.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-025.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-025.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-027.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-027.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-028.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-028.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-029.xht b/tests/wpt/tests/css/CSS2/cascade/html-attribute-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-attribute-029.xht rename to tests/wpt/tests/css/CSS2/cascade/html-attribute-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-precedence-001.xht b/tests/wpt/tests/css/CSS2/cascade/html-precedence-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-precedence-001.xht rename to tests/wpt/tests/css/CSS2/cascade/html-precedence-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-precedence-002.xht b/tests/wpt/tests/css/CSS2/cascade/html-precedence-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-precedence-002.xht rename to tests/wpt/tests/css/CSS2/cascade/html-precedence-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-precedence-003.xht b/tests/wpt/tests/css/CSS2/cascade/html-precedence-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-precedence-003.xht rename to tests/wpt/tests/css/CSS2/cascade/html-precedence-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-precedence-004-ref.xht b/tests/wpt/tests/css/CSS2/cascade/html-precedence-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-precedence-004-ref.xht rename to tests/wpt/tests/css/CSS2/cascade/html-precedence-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-precedence-004.xht b/tests/wpt/tests/css/CSS2/cascade/html-precedence-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-precedence-004.xht rename to tests/wpt/tests/css/CSS2/cascade/html-precedence-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/html-precedence-005.xht b/tests/wpt/tests/css/CSS2/cascade/html-precedence-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/html-precedence-005.xht rename to tests/wpt/tests/css/CSS2/cascade/html-precedence-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-001.xht b/tests/wpt/tests/css/CSS2/cascade/inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-001.xht rename to tests/wpt/tests/css/CSS2/cascade/inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-002.xht b/tests/wpt/tests/css/CSS2/cascade/inherit-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-002.xht rename to tests/wpt/tests/css/CSS2/cascade/inherit-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-003.xht b/tests/wpt/tests/css/CSS2/cascade/inherit-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-003.xht rename to tests/wpt/tests/css/CSS2/cascade/inherit-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-004.xht b/tests/wpt/tests/css/CSS2/cascade/inherit-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-004.xht rename to tests/wpt/tests/css/CSS2/cascade/inherit-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-border-padding-000.xht b/tests/wpt/tests/css/CSS2/cascade/inherit-border-padding-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-border-padding-000.xht rename to tests/wpt/tests/css/CSS2/cascade/inherit-border-padding-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-computed-001-ref.html b/tests/wpt/tests/css/CSS2/cascade/inherit-computed-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-computed-001-ref.html rename to tests/wpt/tests/css/CSS2/cascade/inherit-computed-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-computed-001.html b/tests/wpt/tests/css/CSS2/cascade/inherit-computed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-computed-001.html rename to tests/wpt/tests/css/CSS2/cascade/inherit-computed-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-computed-002-ref.html b/tests/wpt/tests/css/CSS2/cascade/inherit-computed-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-computed-002-ref.html rename to tests/wpt/tests/css/CSS2/cascade/inherit-computed-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-computed-002.html b/tests/wpt/tests/css/CSS2/cascade/inherit-computed-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/inherit-computed-002.html rename to tests/wpt/tests/css/CSS2/cascade/inherit-computed-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/inherited-value-001.xht b/tests/wpt/tests/css/CSS2/cascade/inherited-value-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/inherited-value-001.xht rename to tests/wpt/tests/css/CSS2/cascade/inherited-value-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/inherited-value-002.xht b/tests/wpt/tests/css/CSS2/cascade/inherited-value-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/inherited-value-002.xht rename to tests/wpt/tests/css/CSS2/cascade/inherited-value-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/non-inherited-value-001.xht b/tests/wpt/tests/css/CSS2/cascade/non-inherited-value-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/non-inherited-value-001.xht rename to tests/wpt/tests/css/CSS2/cascade/non-inherited-value-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/sort-by-order-001.xht b/tests/wpt/tests/css/CSS2/cascade/sort-by-order-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/sort-by-order-001.xht rename to tests/wpt/tests/css/CSS2/cascade/sort-by-order-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-001.xht b/tests/wpt/tests/css/CSS2/cascade/specificity-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-001.xht rename to tests/wpt/tests/css/CSS2/cascade/specificity-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-002.xht b/tests/wpt/tests/css/CSS2/cascade/specificity-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-002.xht rename to tests/wpt/tests/css/CSS2/cascade/specificity-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-003.xht b/tests/wpt/tests/css/CSS2/cascade/specificity-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-003.xht rename to tests/wpt/tests/css/CSS2/cascade/specificity-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-004.xht b/tests/wpt/tests/css/CSS2/cascade/specificity-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-004.xht rename to tests/wpt/tests/css/CSS2/cascade/specificity-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-005.xht b/tests/wpt/tests/css/CSS2/cascade/specificity-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-005.xht rename to tests/wpt/tests/css/CSS2/cascade/specificity-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-006.xht b/tests/wpt/tests/css/CSS2/cascade/specificity-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-006.xht rename to tests/wpt/tests/css/CSS2/cascade/specificity-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-007.xht b/tests/wpt/tests/css/CSS2/cascade/specificity-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-007.xht rename to tests/wpt/tests/css/CSS2/cascade/specificity-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-008.xht b/tests/wpt/tests/css/CSS2/cascade/specificity-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-008.xht rename to tests/wpt/tests/css/CSS2/cascade/specificity-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-009.xht b/tests/wpt/tests/css/CSS2/cascade/specificity-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-009.xht rename to tests/wpt/tests/css/CSS2/cascade/specificity-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-011-ref.xht b/tests/wpt/tests/css/CSS2/cascade/specificity-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-011-ref.xht rename to tests/wpt/tests/css/CSS2/cascade/specificity-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-011.xht b/tests/wpt/tests/css/CSS2/cascade/specificity-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-011.xht rename to tests/wpt/tests/css/CSS2/cascade/specificity-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-012.xht b/tests/wpt/tests/css/CSS2/cascade/specificity-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-012.xht rename to tests/wpt/tests/css/CSS2/cascade/specificity-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-013-ref.xht b/tests/wpt/tests/css/CSS2/cascade/specificity-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-013-ref.xht rename to tests/wpt/tests/css/CSS2/cascade/specificity-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-013.xht b/tests/wpt/tests/css/CSS2/cascade/specificity-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/specificity-013.xht rename to tests/wpt/tests/css/CSS2/cascade/specificity-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/1x1-green.png b/tests/wpt/tests/css/CSS2/cascade/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/cascade/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/cascade/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/cascade/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/cascade/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/cascade/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/cascade/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/cascade/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/1x1-red.png b/tests/wpt/tests/css/CSS2/cascade/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/cascade/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/1x1-white.png b/tests/wpt/tests/css/CSS2/cascade/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/cascade/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/cascade/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/cascade/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/60x60-green.png b/tests/wpt/tests/css/CSS2/cascade/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/cascade/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/a-green.css b/tests/wpt/tests/css/CSS2/cascade/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/a-green.css rename to tests/wpt/tests/css/CSS2/cascade/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/at-import-001.css b/tests/wpt/tests/css/CSS2/cascade/support/at-import-001.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/at-import-001.css rename to tests/wpt/tests/css/CSS2/cascade/support/at-import-001.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/at-import-002.css b/tests/wpt/tests/css/CSS2/cascade/support/at-import-002.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/at-import-002.css rename to tests/wpt/tests/css/CSS2/cascade/support/at-import-002.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/at-import-004.css b/tests/wpt/tests/css/CSS2/cascade/support/at-import-004.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/at-import-004.css rename to tests/wpt/tests/css/CSS2/cascade/support/at-import-004.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/at-import-005.css b/tests/wpt/tests/css/CSS2/cascade/support/at-import-005.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/at-import-005.css rename to tests/wpt/tests/css/CSS2/cascade/support/at-import-005.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/at-import-006.css b/tests/wpt/tests/css/CSS2/cascade/support/at-import-006.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/at-import-006.css rename to tests/wpt/tests/css/CSS2/cascade/support/at-import-006.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/at-import-007.css b/tests/wpt/tests/css/CSS2/cascade/support/at-import-007.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/at-import-007.css rename to tests/wpt/tests/css/CSS2/cascade/support/at-import-007.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/b-green.css b/tests/wpt/tests/css/CSS2/cascade/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/b-green.css rename to tests/wpt/tests/css/CSS2/cascade/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/blue15x15.png b/tests/wpt/tests/css/CSS2/cascade/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/cascade/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/c-red.css b/tests/wpt/tests/css/CSS2/cascade/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/c-red.css rename to tests/wpt/tests/css/CSS2/cascade/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/cascade-007.css b/tests/wpt/tests/css/CSS2/cascade/support/cascade-007.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/cascade-007.css rename to tests/wpt/tests/css/CSS2/cascade/support/cascade-007.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/cascade-012.css b/tests/wpt/tests/css/CSS2/cascade/support/cascade-012.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/cascade-012.css rename to tests/wpt/tests/css/CSS2/cascade/support/cascade-012.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/cascade.css b/tests/wpt/tests/css/CSS2/cascade/support/cascade.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/cascade.css rename to tests/wpt/tests/css/CSS2/cascade/support/cascade.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/cat.png b/tests/wpt/tests/css/CSS2/cascade/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/cat.png rename to tests/wpt/tests/css/CSS2/cascade/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/diamond.png b/tests/wpt/tests/css/CSS2/cascade/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/diamond.png rename to tests/wpt/tests/css/CSS2/cascade/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/green15x15.png b/tests/wpt/tests/css/CSS2/cascade/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/green15x15.png rename to tests/wpt/tests/css/CSS2/cascade/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/html-attribute-017-frame.htm b/tests/wpt/tests/css/CSS2/cascade/support/html-attribute-017-frame.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/html-attribute-017-frame.htm rename to tests/wpt/tests/css/CSS2/cascade/support/html-attribute-017-frame.htm diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/html-attribute-021-frame.htm b/tests/wpt/tests/css/CSS2/cascade/support/html-attribute-021-frame.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/html-attribute-021-frame.htm rename to tests/wpt/tests/css/CSS2/cascade/support/html-attribute-021-frame.htm diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/html-attribute-022-frame.htm b/tests/wpt/tests/css/CSS2/cascade/support/html-attribute-022-frame.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/html-attribute-022-frame.htm rename to tests/wpt/tests/css/CSS2/cascade/support/html-attribute-022-frame.htm diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/html-precedence-003.css b/tests/wpt/tests/css/CSS2/cascade/support/html-precedence-003.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/html-precedence-003.css rename to tests/wpt/tests/css/CSS2/cascade/support/html-precedence-003.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/import-green.css b/tests/wpt/tests/css/CSS2/cascade/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/import-green.css rename to tests/wpt/tests/css/CSS2/cascade/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/import-red.css b/tests/wpt/tests/css/CSS2/cascade/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/import-red.css rename to tests/wpt/tests/css/CSS2/cascade/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/cascade/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/cascade/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/cascade/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/cascade/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/cascade/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/cascade/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/cascade/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/cascade/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/red15x15.png b/tests/wpt/tests/css/CSS2/cascade/support/red15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/red15x15.png rename to tests/wpt/tests/css/CSS2/cascade/support/red15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/ring.png b/tests/wpt/tests/css/CSS2/cascade/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/ring.png rename to tests/wpt/tests/css/CSS2/cascade/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/square-purple.png b/tests/wpt/tests/css/CSS2/cascade/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/square-purple.png rename to tests/wpt/tests/css/CSS2/cascade/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/square-teal.png b/tests/wpt/tests/css/CSS2/cascade/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/square-teal.png rename to tests/wpt/tests/css/CSS2/cascade/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/square-white.png b/tests/wpt/tests/css/CSS2/cascade/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/square-white.png rename to tests/wpt/tests/css/CSS2/cascade/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/cascade/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/cascade/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/swatch-green.png b/tests/wpt/tests/css/CSS2/cascade/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/cascade/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/cascade/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/cascade/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/cascade/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/cascade/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/swatch-red.png b/tests/wpt/tests/css/CSS2/cascade/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/cascade/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/swatch-white.png b/tests/wpt/tests/css/CSS2/cascade/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/cascade/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/cascade/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/cascade/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/test-bl.png b/tests/wpt/tests/css/CSS2/cascade/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/test-bl.png rename to tests/wpt/tests/css/CSS2/cascade/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/test-br.png b/tests/wpt/tests/css/CSS2/cascade/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/test-br.png rename to tests/wpt/tests/css/CSS2/cascade/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/test-outer.png b/tests/wpt/tests/css/CSS2/cascade/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/test-outer.png rename to tests/wpt/tests/css/CSS2/cascade/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/test-tl.png b/tests/wpt/tests/css/CSS2/cascade/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/test-tl.png rename to tests/wpt/tests/css/CSS2/cascade/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/test-tr.png b/tests/wpt/tests/css/CSS2/cascade/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/test-tr.png rename to tests/wpt/tests/css/CSS2/cascade/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/support/user-stylesheet.css b/tests/wpt/tests/css/CSS2/cascade/support/user-stylesheet.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/support/user-stylesheet.css rename to tests/wpt/tests/css/CSS2/cascade/support/user-stylesheet.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-001.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-001.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-002.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-002.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-003.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-003.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-004.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-004.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-005.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-005.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-006.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-006.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-007.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-007.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-008.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-008.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-009.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-009.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-010.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-010.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-011.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-011.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-012.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-012.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-013.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-013.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-014.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-014.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-015.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-015.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-016.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-016.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-017.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-017.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-018.xht b/tests/wpt/tests/css/CSS2/cascade/user-stylesheet-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/cascade/user-stylesheet-018.xht rename to tests/wpt/tests/css/CSS2/cascade/user-stylesheet-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/bidi-color-001.xht b/tests/wpt/tests/css/CSS2/colors/bidi-color-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/bidi-color-001.xht rename to tests/wpt/tests/css/CSS2/colors/bidi-color-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-001-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-001-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-001.xht b/tests/wpt/tests/css/CSS2/colors/color-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-001.xht rename to tests/wpt/tests/css/CSS2/colors/color-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-002-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-002-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-002.xht b/tests/wpt/tests/css/CSS2/colors/color-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-002.xht rename to tests/wpt/tests/css/CSS2/colors/color-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-003-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-003-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-003.xht b/tests/wpt/tests/css/CSS2/colors/color-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-003.xht rename to tests/wpt/tests/css/CSS2/colors/color-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-004-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-004-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-004.xht b/tests/wpt/tests/css/CSS2/colors/color-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-004.xht rename to tests/wpt/tests/css/CSS2/colors/color-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-005-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-005-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-005.xht b/tests/wpt/tests/css/CSS2/colors/color-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-005.xht rename to tests/wpt/tests/css/CSS2/colors/color-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-006-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-006-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-006.xht b/tests/wpt/tests/css/CSS2/colors/color-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-006.xht rename to tests/wpt/tests/css/CSS2/colors/color-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-007.xht b/tests/wpt/tests/css/CSS2/colors/color-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-007.xht rename to tests/wpt/tests/css/CSS2/colors/color-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-008.xht b/tests/wpt/tests/css/CSS2/colors/color-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-008.xht rename to tests/wpt/tests/css/CSS2/colors/color-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-009-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-009-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-009.xht b/tests/wpt/tests/css/CSS2/colors/color-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-009.xht rename to tests/wpt/tests/css/CSS2/colors/color-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-010-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-010-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-010.xht b/tests/wpt/tests/css/CSS2/colors/color-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-010.xht rename to tests/wpt/tests/css/CSS2/colors/color-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-011-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-011-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-011.xht b/tests/wpt/tests/css/CSS2/colors/color-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-011.xht rename to tests/wpt/tests/css/CSS2/colors/color-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-012-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-012-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-012.xht b/tests/wpt/tests/css/CSS2/colors/color-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-012.xht rename to tests/wpt/tests/css/CSS2/colors/color-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-013.xht b/tests/wpt/tests/css/CSS2/colors/color-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-013.xht rename to tests/wpt/tests/css/CSS2/colors/color-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-014-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-014-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-014.xht b/tests/wpt/tests/css/CSS2/colors/color-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-014.xht rename to tests/wpt/tests/css/CSS2/colors/color-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-015-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-015-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-015.xht b/tests/wpt/tests/css/CSS2/colors/color-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-015.xht rename to tests/wpt/tests/css/CSS2/colors/color-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-016-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-016-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-016.xht b/tests/wpt/tests/css/CSS2/colors/color-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-016.xht rename to tests/wpt/tests/css/CSS2/colors/color-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-017-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-017-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-017.xht b/tests/wpt/tests/css/CSS2/colors/color-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-017.xht rename to tests/wpt/tests/css/CSS2/colors/color-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-018.xht b/tests/wpt/tests/css/CSS2/colors/color-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-018.xht rename to tests/wpt/tests/css/CSS2/colors/color-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-019-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-019-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-019.xht b/tests/wpt/tests/css/CSS2/colors/color-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-019.xht rename to tests/wpt/tests/css/CSS2/colors/color-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-020-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-020-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-020.xht b/tests/wpt/tests/css/CSS2/colors/color-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-020.xht rename to tests/wpt/tests/css/CSS2/colors/color-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-021-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-021-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-021.xht b/tests/wpt/tests/css/CSS2/colors/color-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-021.xht rename to tests/wpt/tests/css/CSS2/colors/color-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-022-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-022-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-022.xht b/tests/wpt/tests/css/CSS2/colors/color-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-022.xht rename to tests/wpt/tests/css/CSS2/colors/color-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-023.xht b/tests/wpt/tests/css/CSS2/colors/color-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-023.xht rename to tests/wpt/tests/css/CSS2/colors/color-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-024.xht b/tests/wpt/tests/css/CSS2/colors/color-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-024.xht rename to tests/wpt/tests/css/CSS2/colors/color-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-025.xht b/tests/wpt/tests/css/CSS2/colors/color-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-025.xht rename to tests/wpt/tests/css/CSS2/colors/color-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-026-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-026-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-026.xht b/tests/wpt/tests/css/CSS2/colors/color-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-026.xht rename to tests/wpt/tests/css/CSS2/colors/color-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-027-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-027-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-027.xht b/tests/wpt/tests/css/CSS2/colors/color-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-027.xht rename to tests/wpt/tests/css/CSS2/colors/color-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-028-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-028-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-028.xht b/tests/wpt/tests/css/CSS2/colors/color-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-028.xht rename to tests/wpt/tests/css/CSS2/colors/color-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-029.xht b/tests/wpt/tests/css/CSS2/colors/color-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-029.xht rename to tests/wpt/tests/css/CSS2/colors/color-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-031.xht b/tests/wpt/tests/css/CSS2/colors/color-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-031.xht rename to tests/wpt/tests/css/CSS2/colors/color-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-032-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-032-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-032-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-032-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-032.xht b/tests/wpt/tests/css/CSS2/colors/color-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-032.xht rename to tests/wpt/tests/css/CSS2/colors/color-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-033-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-033-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-033-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-033-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-033.xht b/tests/wpt/tests/css/CSS2/colors/color-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-033.xht rename to tests/wpt/tests/css/CSS2/colors/color-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-034-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-034-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-034-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-034-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-034.xht b/tests/wpt/tests/css/CSS2/colors/color-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-034.xht rename to tests/wpt/tests/css/CSS2/colors/color-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-035.xht b/tests/wpt/tests/css/CSS2/colors/color-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-035.xht rename to tests/wpt/tests/css/CSS2/colors/color-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-036.xht b/tests/wpt/tests/css/CSS2/colors/color-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-036.xht rename to tests/wpt/tests/css/CSS2/colors/color-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-037-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-037-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-037-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-037-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-037.xht b/tests/wpt/tests/css/CSS2/colors/color-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-037.xht rename to tests/wpt/tests/css/CSS2/colors/color-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-038.xht b/tests/wpt/tests/css/CSS2/colors/color-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-038.xht rename to tests/wpt/tests/css/CSS2/colors/color-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-039-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-039-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-039-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-039-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-039.xht b/tests/wpt/tests/css/CSS2/colors/color-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-039.xht rename to tests/wpt/tests/css/CSS2/colors/color-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-040.xht b/tests/wpt/tests/css/CSS2/colors/color-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-040.xht rename to tests/wpt/tests/css/CSS2/colors/color-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-041.xht b/tests/wpt/tests/css/CSS2/colors/color-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-041.xht rename to tests/wpt/tests/css/CSS2/colors/color-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-042-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-042-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-042-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-042-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-042.xht b/tests/wpt/tests/css/CSS2/colors/color-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-042.xht rename to tests/wpt/tests/css/CSS2/colors/color-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-043.xht b/tests/wpt/tests/css/CSS2/colors/color-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-043.xht rename to tests/wpt/tests/css/CSS2/colors/color-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-044-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-044-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-044-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-044-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-044.xht b/tests/wpt/tests/css/CSS2/colors/color-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-044.xht rename to tests/wpt/tests/css/CSS2/colors/color-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-045.xht b/tests/wpt/tests/css/CSS2/colors/color-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-045.xht rename to tests/wpt/tests/css/CSS2/colors/color-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-046.xht b/tests/wpt/tests/css/CSS2/colors/color-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-046.xht rename to tests/wpt/tests/css/CSS2/colors/color-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-047.xht b/tests/wpt/tests/css/CSS2/colors/color-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-047.xht rename to tests/wpt/tests/css/CSS2/colors/color-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-048.xht b/tests/wpt/tests/css/CSS2/colors/color-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-048.xht rename to tests/wpt/tests/css/CSS2/colors/color-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-049-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-049-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-049-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-049-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-049.xht b/tests/wpt/tests/css/CSS2/colors/color-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-049.xht rename to tests/wpt/tests/css/CSS2/colors/color-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-050.xht b/tests/wpt/tests/css/CSS2/colors/color-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-050.xht rename to tests/wpt/tests/css/CSS2/colors/color-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-051.xht b/tests/wpt/tests/css/CSS2/colors/color-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-051.xht rename to tests/wpt/tests/css/CSS2/colors/color-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-052-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-052-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-052-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-052-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-052.xht b/tests/wpt/tests/css/CSS2/colors/color-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-052.xht rename to tests/wpt/tests/css/CSS2/colors/color-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-053.xht b/tests/wpt/tests/css/CSS2/colors/color-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-053.xht rename to tests/wpt/tests/css/CSS2/colors/color-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-054-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-054-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-054-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-054-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-054.xht b/tests/wpt/tests/css/CSS2/colors/color-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-054.xht rename to tests/wpt/tests/css/CSS2/colors/color-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-055.xht b/tests/wpt/tests/css/CSS2/colors/color-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-055.xht rename to tests/wpt/tests/css/CSS2/colors/color-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-056.xht b/tests/wpt/tests/css/CSS2/colors/color-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-056.xht rename to tests/wpt/tests/css/CSS2/colors/color-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-057.xht b/tests/wpt/tests/css/CSS2/colors/color-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-057.xht rename to tests/wpt/tests/css/CSS2/colors/color-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-058.xht b/tests/wpt/tests/css/CSS2/colors/color-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-058.xht rename to tests/wpt/tests/css/CSS2/colors/color-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-059.xht b/tests/wpt/tests/css/CSS2/colors/color-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-059.xht rename to tests/wpt/tests/css/CSS2/colors/color-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-060.xht b/tests/wpt/tests/css/CSS2/colors/color-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-060.xht rename to tests/wpt/tests/css/CSS2/colors/color-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-061.xht b/tests/wpt/tests/css/CSS2/colors/color-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-061.xht rename to tests/wpt/tests/css/CSS2/colors/color-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-062.xht b/tests/wpt/tests/css/CSS2/colors/color-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-062.xht rename to tests/wpt/tests/css/CSS2/colors/color-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-063-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-063-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-063-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-063-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-063.xht b/tests/wpt/tests/css/CSS2/colors/color-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-063.xht rename to tests/wpt/tests/css/CSS2/colors/color-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-064.xht b/tests/wpt/tests/css/CSS2/colors/color-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-064.xht rename to tests/wpt/tests/css/CSS2/colors/color-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-065.xht b/tests/wpt/tests/css/CSS2/colors/color-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-065.xht rename to tests/wpt/tests/css/CSS2/colors/color-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-066.xht b/tests/wpt/tests/css/CSS2/colors/color-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-066.xht rename to tests/wpt/tests/css/CSS2/colors/color-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-067.xht b/tests/wpt/tests/css/CSS2/colors/color-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-067.xht rename to tests/wpt/tests/css/CSS2/colors/color-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-068.xht b/tests/wpt/tests/css/CSS2/colors/color-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-068.xht rename to tests/wpt/tests/css/CSS2/colors/color-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-069.xht b/tests/wpt/tests/css/CSS2/colors/color-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-069.xht rename to tests/wpt/tests/css/CSS2/colors/color-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-070-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-070-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-070-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-070-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-070.xht b/tests/wpt/tests/css/CSS2/colors/color-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-070.xht rename to tests/wpt/tests/css/CSS2/colors/color-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-071.xht b/tests/wpt/tests/css/CSS2/colors/color-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-071.xht rename to tests/wpt/tests/css/CSS2/colors/color-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-072.xht b/tests/wpt/tests/css/CSS2/colors/color-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-072.xht rename to tests/wpt/tests/css/CSS2/colors/color-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-073-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-073-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-073-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-073-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-073.xht b/tests/wpt/tests/css/CSS2/colors/color-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-073.xht rename to tests/wpt/tests/css/CSS2/colors/color-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-074.xht b/tests/wpt/tests/css/CSS2/colors/color-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-074.xht rename to tests/wpt/tests/css/CSS2/colors/color-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-075-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-075-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-075-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-075-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-075.xht b/tests/wpt/tests/css/CSS2/colors/color-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-075.xht rename to tests/wpt/tests/css/CSS2/colors/color-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-076.xht b/tests/wpt/tests/css/CSS2/colors/color-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-076.xht rename to tests/wpt/tests/css/CSS2/colors/color-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-077.xht b/tests/wpt/tests/css/CSS2/colors/color-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-077.xht rename to tests/wpt/tests/css/CSS2/colors/color-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-078.xht b/tests/wpt/tests/css/CSS2/colors/color-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-078.xht rename to tests/wpt/tests/css/CSS2/colors/color-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-079.xht b/tests/wpt/tests/css/CSS2/colors/color-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-079.xht rename to tests/wpt/tests/css/CSS2/colors/color-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-080.xht b/tests/wpt/tests/css/CSS2/colors/color-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-080.xht rename to tests/wpt/tests/css/CSS2/colors/color-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-081.xht b/tests/wpt/tests/css/CSS2/colors/color-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-081.xht rename to tests/wpt/tests/css/CSS2/colors/color-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-082.xht b/tests/wpt/tests/css/CSS2/colors/color-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-082.xht rename to tests/wpt/tests/css/CSS2/colors/color-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-083-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-083-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-083-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-083-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-083.xht b/tests/wpt/tests/css/CSS2/colors/color-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-083.xht rename to tests/wpt/tests/css/CSS2/colors/color-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-084.xht b/tests/wpt/tests/css/CSS2/colors/color-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-084.xht rename to tests/wpt/tests/css/CSS2/colors/color-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-085.xht b/tests/wpt/tests/css/CSS2/colors/color-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-085.xht rename to tests/wpt/tests/css/CSS2/colors/color-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-086.xht b/tests/wpt/tests/css/CSS2/colors/color-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-086.xht rename to tests/wpt/tests/css/CSS2/colors/color-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-087.xht b/tests/wpt/tests/css/CSS2/colors/color-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-087.xht rename to tests/wpt/tests/css/CSS2/colors/color-087.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-088.xht b/tests/wpt/tests/css/CSS2/colors/color-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-088.xht rename to tests/wpt/tests/css/CSS2/colors/color-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-089.xht b/tests/wpt/tests/css/CSS2/colors/color-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-089.xht rename to tests/wpt/tests/css/CSS2/colors/color-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-090-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-090-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-090-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-090-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-090.xht b/tests/wpt/tests/css/CSS2/colors/color-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-090.xht rename to tests/wpt/tests/css/CSS2/colors/color-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-091.xht b/tests/wpt/tests/css/CSS2/colors/color-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-091.xht rename to tests/wpt/tests/css/CSS2/colors/color-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-092.xht b/tests/wpt/tests/css/CSS2/colors/color-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-092.xht rename to tests/wpt/tests/css/CSS2/colors/color-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-093-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-093-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-093-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-093-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-093.xht b/tests/wpt/tests/css/CSS2/colors/color-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-093.xht rename to tests/wpt/tests/css/CSS2/colors/color-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-094.xht b/tests/wpt/tests/css/CSS2/colors/color-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-094.xht rename to tests/wpt/tests/css/CSS2/colors/color-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-095-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-095-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-095-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-095-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-095.xht b/tests/wpt/tests/css/CSS2/colors/color-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-095.xht rename to tests/wpt/tests/css/CSS2/colors/color-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-096.xht b/tests/wpt/tests/css/CSS2/colors/color-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-096.xht rename to tests/wpt/tests/css/CSS2/colors/color-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-097.xht b/tests/wpt/tests/css/CSS2/colors/color-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-097.xht rename to tests/wpt/tests/css/CSS2/colors/color-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-098.xht b/tests/wpt/tests/css/CSS2/colors/color-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-098.xht rename to tests/wpt/tests/css/CSS2/colors/color-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-099.xht b/tests/wpt/tests/css/CSS2/colors/color-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-099.xht rename to tests/wpt/tests/css/CSS2/colors/color-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-100.xht b/tests/wpt/tests/css/CSS2/colors/color-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-100.xht rename to tests/wpt/tests/css/CSS2/colors/color-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-101.xht b/tests/wpt/tests/css/CSS2/colors/color-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-101.xht rename to tests/wpt/tests/css/CSS2/colors/color-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-102.xht b/tests/wpt/tests/css/CSS2/colors/color-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-102.xht rename to tests/wpt/tests/css/CSS2/colors/color-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-103-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-103-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-103.xht b/tests/wpt/tests/css/CSS2/colors/color-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-103.xht rename to tests/wpt/tests/css/CSS2/colors/color-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-104.xht b/tests/wpt/tests/css/CSS2/colors/color-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-104.xht rename to tests/wpt/tests/css/CSS2/colors/color-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-105.xht b/tests/wpt/tests/css/CSS2/colors/color-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-105.xht rename to tests/wpt/tests/css/CSS2/colors/color-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-106.xht b/tests/wpt/tests/css/CSS2/colors/color-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-106.xht rename to tests/wpt/tests/css/CSS2/colors/color-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-107.xht b/tests/wpt/tests/css/CSS2/colors/color-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-107.xht rename to tests/wpt/tests/css/CSS2/colors/color-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-108.xht b/tests/wpt/tests/css/CSS2/colors/color-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-108.xht rename to tests/wpt/tests/css/CSS2/colors/color-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-109.xht b/tests/wpt/tests/css/CSS2/colors/color-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-109.xht rename to tests/wpt/tests/css/CSS2/colors/color-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-110-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-110-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-110-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-110-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-110.xht b/tests/wpt/tests/css/CSS2/colors/color-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-110.xht rename to tests/wpt/tests/css/CSS2/colors/color-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-111.xht b/tests/wpt/tests/css/CSS2/colors/color-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-111.xht rename to tests/wpt/tests/css/CSS2/colors/color-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-112.xht b/tests/wpt/tests/css/CSS2/colors/color-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-112.xht rename to tests/wpt/tests/css/CSS2/colors/color-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-113-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-113-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-113.xht b/tests/wpt/tests/css/CSS2/colors/color-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-113.xht rename to tests/wpt/tests/css/CSS2/colors/color-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-114.xht b/tests/wpt/tests/css/CSS2/colors/color-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-114.xht rename to tests/wpt/tests/css/CSS2/colors/color-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-115-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-115-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-115-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-115-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-115.xht b/tests/wpt/tests/css/CSS2/colors/color-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-115.xht rename to tests/wpt/tests/css/CSS2/colors/color-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-116.xht b/tests/wpt/tests/css/CSS2/colors/color-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-116.xht rename to tests/wpt/tests/css/CSS2/colors/color-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-117.xht b/tests/wpt/tests/css/CSS2/colors/color-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-117.xht rename to tests/wpt/tests/css/CSS2/colors/color-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-118.xht b/tests/wpt/tests/css/CSS2/colors/color-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-118.xht rename to tests/wpt/tests/css/CSS2/colors/color-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-119.xht b/tests/wpt/tests/css/CSS2/colors/color-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-119.xht rename to tests/wpt/tests/css/CSS2/colors/color-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-120.xht b/tests/wpt/tests/css/CSS2/colors/color-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-120.xht rename to tests/wpt/tests/css/CSS2/colors/color-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-121.xht b/tests/wpt/tests/css/CSS2/colors/color-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-121.xht rename to tests/wpt/tests/css/CSS2/colors/color-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-122.xht b/tests/wpt/tests/css/CSS2/colors/color-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-122.xht rename to tests/wpt/tests/css/CSS2/colors/color-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-123-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-123-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-123-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-123-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-123.xht b/tests/wpt/tests/css/CSS2/colors/color-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-123.xht rename to tests/wpt/tests/css/CSS2/colors/color-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-124.xht b/tests/wpt/tests/css/CSS2/colors/color-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-124.xht rename to tests/wpt/tests/css/CSS2/colors/color-124.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-125.xht b/tests/wpt/tests/css/CSS2/colors/color-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-125.xht rename to tests/wpt/tests/css/CSS2/colors/color-125.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-126.xht b/tests/wpt/tests/css/CSS2/colors/color-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-126.xht rename to tests/wpt/tests/css/CSS2/colors/color-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-127.xht b/tests/wpt/tests/css/CSS2/colors/color-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-127.xht rename to tests/wpt/tests/css/CSS2/colors/color-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-128.xht b/tests/wpt/tests/css/CSS2/colors/color-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-128.xht rename to tests/wpt/tests/css/CSS2/colors/color-128.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-129-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-129-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-129-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-129-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-129.xht b/tests/wpt/tests/css/CSS2/colors/color-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-129.xht rename to tests/wpt/tests/css/CSS2/colors/color-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-130-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-130-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-130-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-130-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-130.xht b/tests/wpt/tests/css/CSS2/colors/color-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-130.xht rename to tests/wpt/tests/css/CSS2/colors/color-130.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-131-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-131-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-131-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-131-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-131.xht b/tests/wpt/tests/css/CSS2/colors/color-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-131.xht rename to tests/wpt/tests/css/CSS2/colors/color-131.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-132-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-132-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-132-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-132-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-132.xht b/tests/wpt/tests/css/CSS2/colors/color-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-132.xht rename to tests/wpt/tests/css/CSS2/colors/color-132.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-133-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-133-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-133-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-133-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-133.xht b/tests/wpt/tests/css/CSS2/colors/color-133.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-133.xht rename to tests/wpt/tests/css/CSS2/colors/color-133.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-134-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-134-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-134-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-134-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-134.xht b/tests/wpt/tests/css/CSS2/colors/color-134.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-134.xht rename to tests/wpt/tests/css/CSS2/colors/color-134.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-135-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-135-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-135-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-135-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-135.xht b/tests/wpt/tests/css/CSS2/colors/color-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-135.xht rename to tests/wpt/tests/css/CSS2/colors/color-135.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-136-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-136-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-136-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-136-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-136.xht b/tests/wpt/tests/css/CSS2/colors/color-136.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-136.xht rename to tests/wpt/tests/css/CSS2/colors/color-136.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-137-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-137-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-137-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-137-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-137.xht b/tests/wpt/tests/css/CSS2/colors/color-137.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-137.xht rename to tests/wpt/tests/css/CSS2/colors/color-137.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-138-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-138-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-138-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-138-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-138.xht b/tests/wpt/tests/css/CSS2/colors/color-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-138.xht rename to tests/wpt/tests/css/CSS2/colors/color-138.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-139-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-139-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-139-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-139-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-139.xht b/tests/wpt/tests/css/CSS2/colors/color-139.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-139.xht rename to tests/wpt/tests/css/CSS2/colors/color-139.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-140-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-140-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-140-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-140-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-140.xht b/tests/wpt/tests/css/CSS2/colors/color-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-140.xht rename to tests/wpt/tests/css/CSS2/colors/color-140.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-141-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-141-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-141-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-141-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-141.xht b/tests/wpt/tests/css/CSS2/colors/color-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-141.xht rename to tests/wpt/tests/css/CSS2/colors/color-141.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-142-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-142-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-142-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-142-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-142.xht b/tests/wpt/tests/css/CSS2/colors/color-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-142.xht rename to tests/wpt/tests/css/CSS2/colors/color-142.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-143-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-143-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-143-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-143-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-143.xht b/tests/wpt/tests/css/CSS2/colors/color-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-143.xht rename to tests/wpt/tests/css/CSS2/colors/color-143.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-144-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-144-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-144-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-144-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-144.xht b/tests/wpt/tests/css/CSS2/colors/color-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-144.xht rename to tests/wpt/tests/css/CSS2/colors/color-144.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-145-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-145-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-145-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-145-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-145.xht b/tests/wpt/tests/css/CSS2/colors/color-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-145.xht rename to tests/wpt/tests/css/CSS2/colors/color-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-174.xht b/tests/wpt/tests/css/CSS2/colors/color-174.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-174.xht rename to tests/wpt/tests/css/CSS2/colors/color-174.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-175-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-175-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-175-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-175-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-175.xht b/tests/wpt/tests/css/CSS2/colors/color-175.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-175.xht rename to tests/wpt/tests/css/CSS2/colors/color-175.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-176.xht b/tests/wpt/tests/css/CSS2/colors/color-176.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-176.xht rename to tests/wpt/tests/css/CSS2/colors/color-176.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-177.xht b/tests/wpt/tests/css/CSS2/colors/color-177.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-177.xht rename to tests/wpt/tests/css/CSS2/colors/color-177.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-001.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-002.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-003.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-004.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-005-ref.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-005-ref.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-005.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-006.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-007.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-008.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-009.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-010.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-012.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-013.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-014.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-015.xht b/tests/wpt/tests/css/CSS2/colors/color-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/color-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/colors/color-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/colors-007-ref.xht b/tests/wpt/tests/css/CSS2/colors/colors-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/colors-007-ref.xht rename to tests/wpt/tests/css/CSS2/colors/colors-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/colors-007.xht b/tests/wpt/tests/css/CSS2/colors/colors-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/colors-007.xht rename to tests/wpt/tests/css/CSS2/colors/colors-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/000001_color.png b/tests/wpt/tests/css/CSS2/colors/support/000001_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/000001_color.png rename to tests/wpt/tests/css/CSS2/colors/support/000001_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/000002_color.png b/tests/wpt/tests/css/CSS2/colors/support/000002_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/000002_color.png rename to tests/wpt/tests/css/CSS2/colors/support/000002_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/00007f_color.png b/tests/wpt/tests/css/CSS2/colors/support/00007f_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/00007f_color.png rename to tests/wpt/tests/css/CSS2/colors/support/00007f_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/000080_color.png b/tests/wpt/tests/css/CSS2/colors/support/000080_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/000080_color.png rename to tests/wpt/tests/css/CSS2/colors/support/000080_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/0000fc_color.png b/tests/wpt/tests/css/CSS2/colors/support/0000fc_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/0000fc_color.png rename to tests/wpt/tests/css/CSS2/colors/support/0000fc_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/0000fe_color.png b/tests/wpt/tests/css/CSS2/colors/support/0000fe_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/0000fe_color.png rename to tests/wpt/tests/css/CSS2/colors/support/0000fe_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/000100_color.png b/tests/wpt/tests/css/CSS2/colors/support/000100_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/000100_color.png rename to tests/wpt/tests/css/CSS2/colors/support/000100_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/000200_color.png b/tests/wpt/tests/css/CSS2/colors/support/000200_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/000200_color.png rename to tests/wpt/tests/css/CSS2/colors/support/000200_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/000_color.png b/tests/wpt/tests/css/CSS2/colors/support/000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/000_color.png rename to tests/wpt/tests/css/CSS2/colors/support/000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/001_color.png b/tests/wpt/tests/css/CSS2/colors/support/001_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/001_color.png rename to tests/wpt/tests/css/CSS2/colors/support/001_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/007f00_color.png b/tests/wpt/tests/css/CSS2/colors/support/007f00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/007f00_color.png rename to tests/wpt/tests/css/CSS2/colors/support/007f00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/008000_color.png b/tests/wpt/tests/css/CSS2/colors/support/008000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/008000_color.png rename to tests/wpt/tests/css/CSS2/colors/support/008000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/009_color.png b/tests/wpt/tests/css/CSS2/colors/support/009_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/009_color.png rename to tests/wpt/tests/css/CSS2/colors/support/009_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/00e_color.png b/tests/wpt/tests/css/CSS2/colors/support/00e_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/00e_color.png rename to tests/wpt/tests/css/CSS2/colors/support/00e_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/00f_color.png b/tests/wpt/tests/css/CSS2/colors/support/00f_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/00f_color.png rename to tests/wpt/tests/css/CSS2/colors/support/00f_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/00fc00_color.png b/tests/wpt/tests/css/CSS2/colors/support/00fc00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/00fc00_color.png rename to tests/wpt/tests/css/CSS2/colors/support/00fc00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/00fe00_color.png b/tests/wpt/tests/css/CSS2/colors/support/00fe00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/00fe00_color.png rename to tests/wpt/tests/css/CSS2/colors/support/00fe00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/010000_color.png b/tests/wpt/tests/css/CSS2/colors/support/010000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/010000_color.png rename to tests/wpt/tests/css/CSS2/colors/support/010000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/010101_color.png b/tests/wpt/tests/css/CSS2/colors/support/010101_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/010101_color.png rename to tests/wpt/tests/css/CSS2/colors/support/010101_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/010_color.png b/tests/wpt/tests/css/CSS2/colors/support/010_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/010_color.png rename to tests/wpt/tests/css/CSS2/colors/support/010_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/020000_color.png b/tests/wpt/tests/css/CSS2/colors/support/020000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/020000_color.png rename to tests/wpt/tests/css/CSS2/colors/support/020000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/020202_color.png b/tests/wpt/tests/css/CSS2/colors/support/020202_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/020202_color.png rename to tests/wpt/tests/css/CSS2/colors/support/020202_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/090_color.png b/tests/wpt/tests/css/CSS2/colors/support/090_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/090_color.png rename to tests/wpt/tests/css/CSS2/colors/support/090_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/0e0_color.png b/tests/wpt/tests/css/CSS2/colors/support/0e0_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/0e0_color.png rename to tests/wpt/tests/css/CSS2/colors/support/0e0_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/0f0_color.png b/tests/wpt/tests/css/CSS2/colors/support/0f0_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/0f0_color.png rename to tests/wpt/tests/css/CSS2/colors/support/0f0_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/100_color.png b/tests/wpt/tests/css/CSS2/colors/support/100_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/100_color.png rename to tests/wpt/tests/css/CSS2/colors/support/100_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/111_color.png b/tests/wpt/tests/css/CSS2/colors/support/111_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/111_color.png rename to tests/wpt/tests/css/CSS2/colors/support/111_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/1x1-green.png b/tests/wpt/tests/css/CSS2/colors/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/colors/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/colors/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/colors/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/colors/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/colors/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/colors/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/colors/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/1x1-red.png b/tests/wpt/tests/css/CSS2/colors/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/colors/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/1x1-white.png b/tests/wpt/tests/css/CSS2/colors/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/colors/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/colors/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/colors/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/60x60-green.png b/tests/wpt/tests/css/CSS2/colors/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/colors/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/7f0000_color.png b/tests/wpt/tests/css/CSS2/colors/support/7f0000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/7f0000_color.png rename to tests/wpt/tests/css/CSS2/colors/support/7f0000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/7f7f7f_color.png b/tests/wpt/tests/css/CSS2/colors/support/7f7f7f_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/7f7f7f_color.png rename to tests/wpt/tests/css/CSS2/colors/support/7f7f7f_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/800000_color.png b/tests/wpt/tests/css/CSS2/colors/support/800000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/800000_color.png rename to tests/wpt/tests/css/CSS2/colors/support/800000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/808080_color.png b/tests/wpt/tests/css/CSS2/colors/support/808080_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/808080_color.png rename to tests/wpt/tests/css/CSS2/colors/support/808080_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/900_color.png b/tests/wpt/tests/css/CSS2/colors/support/900_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/900_color.png rename to tests/wpt/tests/css/CSS2/colors/support/900_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/999_color.png b/tests/wpt/tests/css/CSS2/colors/support/999_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/999_color.png rename to tests/wpt/tests/css/CSS2/colors/support/999_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/a-green.css b/tests/wpt/tests/css/CSS2/colors/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/a-green.css rename to tests/wpt/tests/css/CSS2/colors/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/aqua_color.png b/tests/wpt/tests/css/CSS2/colors/support/aqua_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/aqua_color.png rename to tests/wpt/tests/css/CSS2/colors/support/aqua_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/b-green.css b/tests/wpt/tests/css/CSS2/colors/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/b-green.css rename to tests/wpt/tests/css/CSS2/colors/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/blue15x15.png b/tests/wpt/tests/css/CSS2/colors/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/colors/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/c-red.css b/tests/wpt/tests/css/CSS2/colors/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/c-red.css rename to tests/wpt/tests/css/CSS2/colors/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/cat.png b/tests/wpt/tests/css/CSS2/colors/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/cat.png rename to tests/wpt/tests/css/CSS2/colors/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/diamond.png b/tests/wpt/tests/css/CSS2/colors/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/diamond.png rename to tests/wpt/tests/css/CSS2/colors/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/e00_color.png b/tests/wpt/tests/css/CSS2/colors/support/e00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/e00_color.png rename to tests/wpt/tests/css/CSS2/colors/support/e00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/eee_color.png b/tests/wpt/tests/css/CSS2/colors/support/eee_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/eee_color.png rename to tests/wpt/tests/css/CSS2/colors/support/eee_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/f00_color.png b/tests/wpt/tests/css/CSS2/colors/support/f00_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/f00_color.png rename to tests/wpt/tests/css/CSS2/colors/support/f00_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/fc0000_color.png b/tests/wpt/tests/css/CSS2/colors/support/fc0000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/fc0000_color.png rename to tests/wpt/tests/css/CSS2/colors/support/fc0000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/fcfcfc_color.png b/tests/wpt/tests/css/CSS2/colors/support/fcfcfc_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/fcfcfc_color.png rename to tests/wpt/tests/css/CSS2/colors/support/fcfcfc_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/fe0000_color.png b/tests/wpt/tests/css/CSS2/colors/support/fe0000_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/fe0000_color.png rename to tests/wpt/tests/css/CSS2/colors/support/fe0000_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/fefefe_color.png b/tests/wpt/tests/css/CSS2/colors/support/fefefe_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/fefefe_color.png rename to tests/wpt/tests/css/CSS2/colors/support/fefefe_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/fff_color.png b/tests/wpt/tests/css/CSS2/colors/support/fff_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/fff_color.png rename to tests/wpt/tests/css/CSS2/colors/support/fff_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/fuchsia_color.png b/tests/wpt/tests/css/CSS2/colors/support/fuchsia_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/fuchsia_color.png rename to tests/wpt/tests/css/CSS2/colors/support/fuchsia_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/green15x15.png b/tests/wpt/tests/css/CSS2/colors/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/green15x15.png rename to tests/wpt/tests/css/CSS2/colors/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/maroon_color.png b/tests/wpt/tests/css/CSS2/colors/support/maroon_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/maroon_color.png rename to tests/wpt/tests/css/CSS2/colors/support/maroon_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/olive_color.png b/tests/wpt/tests/css/CSS2/colors/support/olive_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/olive_color.png rename to tests/wpt/tests/css/CSS2/colors/support/olive_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/colors/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/colors/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/colors/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/colors/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/colors/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/colors/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/colors/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/colors/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/purple_color.png b/tests/wpt/tests/css/CSS2/colors/support/purple_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/purple_color.png rename to tests/wpt/tests/css/CSS2/colors/support/purple_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/ring.png b/tests/wpt/tests/css/CSS2/colors/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/ring.png rename to tests/wpt/tests/css/CSS2/colors/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/silver_color.png b/tests/wpt/tests/css/CSS2/colors/support/silver_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/silver_color.png rename to tests/wpt/tests/css/CSS2/colors/support/silver_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/square-purple.png b/tests/wpt/tests/css/CSS2/colors/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/square-purple.png rename to tests/wpt/tests/css/CSS2/colors/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/square-teal.png b/tests/wpt/tests/css/CSS2/colors/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/square-teal.png rename to tests/wpt/tests/css/CSS2/colors/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/square-white.png b/tests/wpt/tests/css/CSS2/colors/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/square-white.png rename to tests/wpt/tests/css/CSS2/colors/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/colors/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/colors/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/swatch-green.png b/tests/wpt/tests/css/CSS2/colors/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/colors/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/colors/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/colors/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/colors/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/colors/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/swatch-red.png b/tests/wpt/tests/css/CSS2/colors/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/colors/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/swatch-white.png b/tests/wpt/tests/css/CSS2/colors/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/colors/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/colors/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/colors/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/teal_color.png b/tests/wpt/tests/css/CSS2/colors/support/teal_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/teal_color.png rename to tests/wpt/tests/css/CSS2/colors/support/teal_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/test-bl.png b/tests/wpt/tests/css/CSS2/colors/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/test-bl.png rename to tests/wpt/tests/css/CSS2/colors/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/test-br.png b/tests/wpt/tests/css/CSS2/colors/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/test-br.png rename to tests/wpt/tests/css/CSS2/colors/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/test-outer.png b/tests/wpt/tests/css/CSS2/colors/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/test-outer.png rename to tests/wpt/tests/css/CSS2/colors/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/test-tl.png b/tests/wpt/tests/css/CSS2/colors/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/test-tl.png rename to tests/wpt/tests/css/CSS2/colors/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/test-tr.png b/tests/wpt/tests/css/CSS2/colors/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/test-tr.png rename to tests/wpt/tests/css/CSS2/colors/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/support/yellow_color.png b/tests/wpt/tests/css/CSS2/colors/support/yellow_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/support/yellow_color.png rename to tests/wpt/tests/css/CSS2/colors/support/yellow_color.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/colors/table-backgrounds-bs-row-002.xht b/tests/wpt/tests/css/CSS2/colors/table-backgrounds-bs-row-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/colors/table-backgrounds-bs-row-002.xht rename to tests/wpt/tests/css/CSS2/colors/table-backgrounds-bs-row-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css-e-notation-ref-1.html b/tests/wpt/tests/css/CSS2/css-e-notation-ref-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css-e-notation-ref-1.html rename to tests/wpt/tests/css/CSS2/css-e-notation-ref-1.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css-e-notation-ref-2.html b/tests/wpt/tests/css/CSS2/css-e-notation-ref-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css-e-notation-ref-2.html rename to tests/wpt/tests/css/CSS2/css-e-notation-ref-2.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css-e-notation-test-1.html b/tests/wpt/tests/css/CSS2/css-e-notation-test-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css-e-notation-test-1.html rename to tests/wpt/tests/css/CSS2/css-e-notation-test-1.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css-e-notation-test-2.html b/tests/wpt/tests/css/CSS2/css-e-notation-test-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css-e-notation-test-2.html rename to tests/wpt/tests/css/CSS2/css-e-notation-test-2.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/README b/tests/wpt/tests/css/CSS2/css1/README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/README rename to tests/wpt/tests/css/CSS2/css1/README diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c11-import-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c11-import-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c11-import-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c11-import-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c11-import-000.xht b/tests/wpt/tests/css/CSS2/css1/c11-import-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c11-import-000.xht rename to tests/wpt/tests/css/CSS2/css1/c11-import-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c12-grouping-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c12-grouping-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c12-grouping-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c12-grouping-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c12-grouping-000.xht b/tests/wpt/tests/css/CSS2/css1/c12-grouping-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c12-grouping-000.xht rename to tests/wpt/tests/css/CSS2/css1/c12-grouping-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c13-inh-underlin-000.xht b/tests/wpt/tests/css/CSS2/css1/c13-inh-underlin-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c13-inh-underlin-000.xht rename to tests/wpt/tests/css/CSS2/css1/c13-inh-underlin-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c13-inheritance-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c13-inheritance-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c13-inheritance-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c13-inheritance-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c13-inheritance-000.xht b/tests/wpt/tests/css/CSS2/css1/c13-inheritance-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c13-inheritance-000.xht rename to tests/wpt/tests/css/CSS2/css1/c13-inheritance-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c14-classes-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c14-classes-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c14-classes-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c14-classes-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c14-classes-000.xht b/tests/wpt/tests/css/CSS2/css1/c14-classes-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c14-classes-000.xht rename to tests/wpt/tests/css/CSS2/css1/c14-classes-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c15-ids-000.xht b/tests/wpt/tests/css/CSS2/css1/c15-ids-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c15-ids-000.xht rename to tests/wpt/tests/css/CSS2/css1/c15-ids-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c15-ids-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c15-ids-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c15-ids-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c15-ids-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c15-ids-001.xht b/tests/wpt/tests/css/CSS2/css1/c15-ids-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c15-ids-001.xht rename to tests/wpt/tests/css/CSS2/css1/c15-ids-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c16-descendant-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c16-descendant-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c16-descendant-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c16-descendant-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c16-descendant-000.xht b/tests/wpt/tests/css/CSS2/css1/c16-descendant-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c16-descendant-000.xht rename to tests/wpt/tests/css/CSS2/css1/c16-descendant-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c16-descendant-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c16-descendant-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c16-descendant-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c16-descendant-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c16-descendant-001.xht b/tests/wpt/tests/css/CSS2/css1/c16-descendant-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c16-descendant-001.xht rename to tests/wpt/tests/css/CSS2/css1/c16-descendant-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c16-descendant-002.xht b/tests/wpt/tests/css/CSS2/css1/c16-descendant-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c16-descendant-002.xht rename to tests/wpt/tests/css/CSS2/css1/c16-descendant-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c17-comments-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c17-comments-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c17-comments-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c17-comments-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c17-comments-000.xht b/tests/wpt/tests/css/CSS2/css1/c17-comments-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c17-comments-000.xht rename to tests/wpt/tests/css/CSS2/css1/c17-comments-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c17-comments-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c17-comments-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c17-comments-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c17-comments-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c17-comments-001.xht b/tests/wpt/tests/css/CSS2/css1/c17-comments-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c17-comments-001.xht rename to tests/wpt/tests/css/CSS2/css1/c17-comments-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c21-activ-ln-000.xht b/tests/wpt/tests/css/CSS2/css1/c21-activ-ln-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c21-activ-ln-000.xht rename to tests/wpt/tests/css/CSS2/css1/c21-activ-ln-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c21-focus-ln-000.xht b/tests/wpt/tests/css/CSS2/css1/c21-focus-ln-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c21-focus-ln-000.xht rename to tests/wpt/tests/css/CSS2/css1/c21-focus-ln-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c21-hover-ln-000.xht b/tests/wpt/tests/css/CSS2/css1/c21-hover-ln-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c21-hover-ln-000.xht rename to tests/wpt/tests/css/CSS2/css1/c21-hover-ln-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c21-pseu-cls-000.xht b/tests/wpt/tests/css/CSS2/css1/c21-pseu-cls-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c21-pseu-cls-000.xht rename to tests/wpt/tests/css/CSS2/css1/c21-pseu-cls-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c21-pseu-id-000.xht b/tests/wpt/tests/css/CSS2/css1/c21-pseu-id-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c21-pseu-id-000.xht rename to tests/wpt/tests/css/CSS2/css1/c21-pseu-id-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c21-pseud-anch-000.xht b/tests/wpt/tests/css/CSS2/css1/c21-pseud-anch-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c21-pseud-anch-000.xht rename to tests/wpt/tests/css/CSS2/css1/c21-pseud-anch-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c21-pseud-link-000.xht b/tests/wpt/tests/css/CSS2/css1/c21-pseud-link-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c21-pseud-link-000.xht rename to tests/wpt/tests/css/CSS2/css1/c21-pseud-link-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c21-pseud-link-001.xht b/tests/wpt/tests/css/CSS2/css1/c21-pseud-link-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c21-pseud-link-001.xht rename to tests/wpt/tests/css/CSS2/css1/c21-pseud-link-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c21-pseud-link-002.xht b/tests/wpt/tests/css/CSS2/css1/c21-pseud-link-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c21-pseud-link-002.xht rename to tests/wpt/tests/css/CSS2/css1/c21-pseud-link-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c21-pseud-link-003.xht b/tests/wpt/tests/css/CSS2/css1/c21-pseud-link-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c21-pseud-link-003.xht rename to tests/wpt/tests/css/CSS2/css1/c21-pseud-link-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c23-first-line-000.xht b/tests/wpt/tests/css/CSS2/css1/c23-first-line-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c23-first-line-000.xht rename to tests/wpt/tests/css/CSS2/css1/c23-first-line-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c24-first-lttr-000.xht b/tests/wpt/tests/css/CSS2/css1/c24-first-lttr-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c24-first-lttr-000.xht rename to tests/wpt/tests/css/CSS2/css1/c24-first-lttr-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c25-pseudo-elmnt-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c25-pseudo-elmnt-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c25-pseudo-elmnt-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c25-pseudo-elmnt-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c25-pseudo-elmnt-000.xht b/tests/wpt/tests/css/CSS2/css1/c25-pseudo-elmnt-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c25-pseudo-elmnt-000.xht rename to tests/wpt/tests/css/CSS2/css1/c25-pseudo-elmnt-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c26-psudo-nest-000.xht b/tests/wpt/tests/css/CSS2/css1/c26-psudo-nest-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c26-psudo-nest-000.xht rename to tests/wpt/tests/css/CSS2/css1/c26-psudo-nest-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c31-important-000.xht b/tests/wpt/tests/css/CSS2/css1/c31-important-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c31-important-000.xht rename to tests/wpt/tests/css/CSS2/css1/c31-important-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c32-cascading-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c32-cascading-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c32-cascading-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c32-cascading-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c32-cascading-000.xht b/tests/wpt/tests/css/CSS2/css1/c32-cascading-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c32-cascading-000.xht rename to tests/wpt/tests/css/CSS2/css1/c32-cascading-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c411-vt-mrgn-000.xht b/tests/wpt/tests/css/CSS2/css1/c411-vt-mrgn-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c411-vt-mrgn-000.xht rename to tests/wpt/tests/css/CSS2/css1/c411-vt-mrgn-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c412-blockw-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c412-blockw-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c412-blockw-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c412-blockw-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c412-blockw-000.xht b/tests/wpt/tests/css/CSS2/css1/c412-blockw-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c412-blockw-000.xht rename to tests/wpt/tests/css/CSS2/css1/c412-blockw-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c412-hz-box-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c412-hz-box-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c412-hz-box-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c412-hz-box-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c412-hz-box-000.xht b/tests/wpt/tests/css/CSS2/css1/c412-hz-box-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c412-hz-box-000.xht rename to tests/wpt/tests/css/CSS2/css1/c412-hz-box-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-000.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-000.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-001.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-001.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-002.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-002.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-003.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-003.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-fit-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-fit-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-000.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-fit-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-000.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-fit-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-fit-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-fit-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-001.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-fit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-001.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-fit-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-002-ref.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-fit-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-002-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-fit-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-002.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-fit-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-002.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-fit-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-fit-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-fit-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-003.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-fit-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-003.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-fit-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-004-ref.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-fit-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-004-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-fit-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-004.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-fit-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-004.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-fit-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-005-ref.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-fit-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-005-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-fit-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-005.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-fit-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-005.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-fit-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-006-ref.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-fit-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-006-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-fit-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-006.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-fit-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-fit-006.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-fit-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-ln-000.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-ln-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-ln-000.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-ln-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-ln-001.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-ln-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-ln-001.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-ln-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-ln-002.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-ln-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-ln-002.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-ln-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-ln-003.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-ln-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-ln-003.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-ln-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-wrap-000.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-wrap-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-wrap-000.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-wrap-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-wrap-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-wrap-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-wrap-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-wrap-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-wrap-001.xht b/tests/wpt/tests/css/CSS2/css1/c414-flt-wrap-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c414-flt-wrap-001.xht rename to tests/wpt/tests/css/CSS2/css1/c414-flt-wrap-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c42-ibx-ht-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c42-ibx-ht-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c42-ibx-ht-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c42-ibx-ht-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c42-ibx-ht-000.xht b/tests/wpt/tests/css/CSS2/css1/c42-ibx-ht-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c42-ibx-ht-000.xht rename to tests/wpt/tests/css/CSS2/css1/c42-ibx-ht-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c42-ibx-pad-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c42-ibx-pad-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c42-ibx-pad-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c42-ibx-pad-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c42-ibx-pad-000.xht b/tests/wpt/tests/css/CSS2/css1/c42-ibx-pad-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c42-ibx-pad-000.xht rename to tests/wpt/tests/css/CSS2/css1/c42-ibx-pad-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c43-center-000.xht b/tests/wpt/tests/css/CSS2/css1/c43-center-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c43-center-000.xht rename to tests/wpt/tests/css/CSS2/css1/c43-center-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c43-rpl-bbx-000.xht b/tests/wpt/tests/css/CSS2/css1/c43-rpl-bbx-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c43-rpl-bbx-000.xht rename to tests/wpt/tests/css/CSS2/css1/c43-rpl-bbx-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c43-rpl-bbx-001.xht b/tests/wpt/tests/css/CSS2/css1/c43-rpl-bbx-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c43-rpl-bbx-001.xht rename to tests/wpt/tests/css/CSS2/css1/c43-rpl-bbx-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c43-rpl-bbx-002-ref.xht b/tests/wpt/tests/css/CSS2/css1/c43-rpl-bbx-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c43-rpl-bbx-002-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c43-rpl-bbx-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c43-rpl-bbx-002.xht b/tests/wpt/tests/css/CSS2/css1/c43-rpl-bbx-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c43-rpl-bbx-002.xht rename to tests/wpt/tests/css/CSS2/css1/c43-rpl-bbx-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c43-rpl-ibx-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c43-rpl-ibx-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c43-rpl-ibx-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c43-rpl-ibx-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c43-rpl-ibx-000.xht b/tests/wpt/tests/css/CSS2/css1/c43-rpl-ibx-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c43-rpl-ibx-000.xht rename to tests/wpt/tests/css/CSS2/css1/c43-rpl-ibx-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c44-ln-box-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c44-ln-box-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c44-ln-box-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c44-ln-box-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c44-ln-box-000.xht b/tests/wpt/tests/css/CSS2/css1/c44-ln-box-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c44-ln-box-000.xht rename to tests/wpt/tests/css/CSS2/css1/c44-ln-box-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c44-ln-box-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c44-ln-box-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c44-ln-box-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c44-ln-box-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c44-ln-box-001.xht b/tests/wpt/tests/css/CSS2/css1/c44-ln-box-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c44-ln-box-001.xht rename to tests/wpt/tests/css/CSS2/css1/c44-ln-box-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c44-ln-box-002-ref.xht b/tests/wpt/tests/css/CSS2/css1/c44-ln-box-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c44-ln-box-002-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c44-ln-box-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c44-ln-box-002.xht b/tests/wpt/tests/css/CSS2/css1/c44-ln-box-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c44-ln-box-002.xht rename to tests/wpt/tests/css/CSS2/css1/c44-ln-box-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c44-ln-box-003.xht b/tests/wpt/tests/css/CSS2/css1/c44-ln-box-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c44-ln-box-003.xht rename to tests/wpt/tests/css/CSS2/css1/c44-ln-box-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c45-bg-canvas-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c45-bg-canvas-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c45-bg-canvas-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c45-bg-canvas-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c45-bg-canvas-000.xht b/tests/wpt/tests/css/CSS2/css1/c45-bg-canvas-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c45-bg-canvas-000.xht rename to tests/wpt/tests/css/CSS2/css1/c45-bg-canvas-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c522-font-family-000.xht b/tests/wpt/tests/css/CSS2/css1/c522-font-family-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c522-font-family-000.xht rename to tests/wpt/tests/css/CSS2/css1/c522-font-family-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c523-font-style-000.xht b/tests/wpt/tests/css/CSS2/css1/c523-font-style-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c523-font-style-000.xht rename to tests/wpt/tests/css/CSS2/css1/c523-font-style-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c524-font-var-000.xht b/tests/wpt/tests/css/CSS2/css1/c524-font-var-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c524-font-var-000.xht rename to tests/wpt/tests/css/CSS2/css1/c524-font-var-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c525-font-wt-000.xht b/tests/wpt/tests/css/CSS2/css1/c525-font-wt-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c525-font-wt-000.xht rename to tests/wpt/tests/css/CSS2/css1/c525-font-wt-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c526-font-sz-000.xht b/tests/wpt/tests/css/CSS2/css1/c526-font-sz-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c526-font-sz-000.xht rename to tests/wpt/tests/css/CSS2/css1/c526-font-sz-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c526-font-sz-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c526-font-sz-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c526-font-sz-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c526-font-sz-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c526-font-sz-001.xht b/tests/wpt/tests/css/CSS2/css1/c526-font-sz-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c526-font-sz-001.xht rename to tests/wpt/tests/css/CSS2/css1/c526-font-sz-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c526-font-sz-002-ref.xht b/tests/wpt/tests/css/CSS2/css1/c526-font-sz-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c526-font-sz-002-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c526-font-sz-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c526-font-sz-002.xht b/tests/wpt/tests/css/CSS2/css1/c526-font-sz-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c526-font-sz-002.xht rename to tests/wpt/tests/css/CSS2/css1/c526-font-sz-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c526-font-sz-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c526-font-sz-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c526-font-sz-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c526-font-sz-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c526-font-sz-003.xht b/tests/wpt/tests/css/CSS2/css1/c526-font-sz-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c526-font-sz-003.xht rename to tests/wpt/tests/css/CSS2/css1/c526-font-sz-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-000.xht b/tests/wpt/tests/css/CSS2/css1/c527-font-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-000.xht rename to tests/wpt/tests/css/CSS2/css1/c527-font-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-001.xht b/tests/wpt/tests/css/CSS2/css1/c527-font-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-001.xht rename to tests/wpt/tests/css/CSS2/css1/c527-font-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-002.xht b/tests/wpt/tests/css/CSS2/css1/c527-font-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-002.xht rename to tests/wpt/tests/css/CSS2/css1/c527-font-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-003.xht b/tests/wpt/tests/css/CSS2/css1/c527-font-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-003.xht rename to tests/wpt/tests/css/CSS2/css1/c527-font-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-004.xht b/tests/wpt/tests/css/CSS2/css1/c527-font-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-004.xht rename to tests/wpt/tests/css/CSS2/css1/c527-font-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-005.xht b/tests/wpt/tests/css/CSS2/css1/c527-font-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-005.xht rename to tests/wpt/tests/css/CSS2/css1/c527-font-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-006.xht b/tests/wpt/tests/css/CSS2/css1/c527-font-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-006.xht rename to tests/wpt/tests/css/CSS2/css1/c527-font-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-007.xht b/tests/wpt/tests/css/CSS2/css1/c527-font-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-007.xht rename to tests/wpt/tests/css/CSS2/css1/c527-font-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-008.xht b/tests/wpt/tests/css/CSS2/css1/c527-font-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-008.xht rename to tests/wpt/tests/css/CSS2/css1/c527-font-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-009.xht b/tests/wpt/tests/css/CSS2/css1/c527-font-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-009.xht rename to tests/wpt/tests/css/CSS2/css1/c527-font-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-10.xht b/tests/wpt/tests/css/CSS2/css1/c527-font-10.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c527-font-10.xht rename to tests/wpt/tests/css/CSS2/css1/c527-font-10.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c531-color-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c531-color-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c531-color-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c531-color-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c531-color-000.xht b/tests/wpt/tests/css/CSS2/css1/c531-color-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c531-color-000.xht rename to tests/wpt/tests/css/CSS2/css1/c531-color-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c532-bgcolor-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c532-bgcolor-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c532-bgcolor-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c532-bgcolor-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c532-bgcolor-000.xht b/tests/wpt/tests/css/CSS2/css1/c532-bgcolor-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c532-bgcolor-000.xht rename to tests/wpt/tests/css/CSS2/css1/c532-bgcolor-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c532-bgcolor-001.xht b/tests/wpt/tests/css/CSS2/css1/c532-bgcolor-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c532-bgcolor-001.xht rename to tests/wpt/tests/css/CSS2/css1/c532-bgcolor-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c533-bgimage-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c533-bgimage-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c533-bgimage-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c533-bgimage-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c533-bgimage-000.xht b/tests/wpt/tests/css/CSS2/css1/c533-bgimage-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c533-bgimage-000.xht rename to tests/wpt/tests/css/CSS2/css1/c533-bgimage-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c533-bgimage-001.xht b/tests/wpt/tests/css/CSS2/css1/c533-bgimage-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c533-bgimage-001.xht rename to tests/wpt/tests/css/CSS2/css1/c533-bgimage-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgre-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c534-bgre-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgre-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c534-bgre-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgre-000.xht b/tests/wpt/tests/css/CSS2/css1/c534-bgre-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgre-000.xht rename to tests/wpt/tests/css/CSS2/css1/c534-bgre-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgre-001.xht b/tests/wpt/tests/css/CSS2/css1/c534-bgre-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgre-001.xht rename to tests/wpt/tests/css/CSS2/css1/c534-bgre-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgreps-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c534-bgreps-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgreps-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c534-bgreps-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgreps-000.xht b/tests/wpt/tests/css/CSS2/css1/c534-bgreps-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgreps-000.xht rename to tests/wpt/tests/css/CSS2/css1/c534-bgreps-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgreps-001.xht b/tests/wpt/tests/css/CSS2/css1/c534-bgreps-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgreps-001.xht rename to tests/wpt/tests/css/CSS2/css1/c534-bgreps-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgreps-002.xht b/tests/wpt/tests/css/CSS2/css1/c534-bgreps-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgreps-002.xht rename to tests/wpt/tests/css/CSS2/css1/c534-bgreps-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgreps-003.xht b/tests/wpt/tests/css/CSS2/css1/c534-bgreps-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgreps-003.xht rename to tests/wpt/tests/css/CSS2/css1/c534-bgreps-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgreps-004.xht b/tests/wpt/tests/css/CSS2/css1/c534-bgreps-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgreps-004.xht rename to tests/wpt/tests/css/CSS2/css1/c534-bgreps-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgreps-005.xht b/tests/wpt/tests/css/CSS2/css1/c534-bgreps-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c534-bgreps-005.xht rename to tests/wpt/tests/css/CSS2/css1/c534-bgreps-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c535-bg-fixd-000.xht b/tests/wpt/tests/css/CSS2/css1/c535-bg-fixd-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c535-bg-fixd-000.xht rename to tests/wpt/tests/css/CSS2/css1/c535-bg-fixd-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c536-bgpos-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c536-bgpos-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c536-bgpos-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c536-bgpos-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c536-bgpos-000.xht b/tests/wpt/tests/css/CSS2/css1/c536-bgpos-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c536-bgpos-000.xht rename to tests/wpt/tests/css/CSS2/css1/c536-bgpos-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c536-bgpos-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c536-bgpos-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c536-bgpos-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c536-bgpos-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c536-bgpos-001.xht b/tests/wpt/tests/css/CSS2/css1/c536-bgpos-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c536-bgpos-001.xht rename to tests/wpt/tests/css/CSS2/css1/c536-bgpos-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c537-bgfxps-000.xht b/tests/wpt/tests/css/CSS2/css1/c537-bgfxps-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c537-bgfxps-000.xht rename to tests/wpt/tests/css/CSS2/css1/c537-bgfxps-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c541-word-sp-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c541-word-sp-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c541-word-sp-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c541-word-sp-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c541-word-sp-000.xht b/tests/wpt/tests/css/CSS2/css1/c541-word-sp-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c541-word-sp-000.xht rename to tests/wpt/tests/css/CSS2/css1/c541-word-sp-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c541-word-sp-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c541-word-sp-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c541-word-sp-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c541-word-sp-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c541-word-sp-001.xht b/tests/wpt/tests/css/CSS2/css1/c541-word-sp-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c541-word-sp-001.xht rename to tests/wpt/tests/css/CSS2/css1/c541-word-sp-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c542-letter-sp-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c542-letter-sp-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c542-letter-sp-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c542-letter-sp-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c542-letter-sp-000.xht b/tests/wpt/tests/css/CSS2/css1/c542-letter-sp-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c542-letter-sp-000.xht rename to tests/wpt/tests/css/CSS2/css1/c542-letter-sp-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c542-letter-sp-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c542-letter-sp-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c542-letter-sp-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c542-letter-sp-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c542-letter-sp-001.xht b/tests/wpt/tests/css/CSS2/css1/c542-letter-sp-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c542-letter-sp-001.xht rename to tests/wpt/tests/css/CSS2/css1/c542-letter-sp-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c543-txt-decor-000.xht b/tests/wpt/tests/css/CSS2/css1/c543-txt-decor-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c543-txt-decor-000.xht rename to tests/wpt/tests/css/CSS2/css1/c543-txt-decor-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c544-valgn-000.xht b/tests/wpt/tests/css/CSS2/css1/c544-valgn-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c544-valgn-000.xht rename to tests/wpt/tests/css/CSS2/css1/c544-valgn-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c544-valgn-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c544-valgn-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c544-valgn-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c544-valgn-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c544-valgn-001.xht b/tests/wpt/tests/css/CSS2/css1/c544-valgn-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c544-valgn-001.xht rename to tests/wpt/tests/css/CSS2/css1/c544-valgn-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c544-valgn-002.xht b/tests/wpt/tests/css/CSS2/css1/c544-valgn-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c544-valgn-002.xht rename to tests/wpt/tests/css/CSS2/css1/c544-valgn-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c544-valgn-003.xht b/tests/wpt/tests/css/CSS2/css1/c544-valgn-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c544-valgn-003.xht rename to tests/wpt/tests/css/CSS2/css1/c544-valgn-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c544-valgn-004.xht b/tests/wpt/tests/css/CSS2/css1/c544-valgn-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c544-valgn-004.xht rename to tests/wpt/tests/css/CSS2/css1/c544-valgn-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c545-txttrans-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c545-txttrans-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c545-txttrans-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c545-txttrans-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c545-txttrans-000.xht b/tests/wpt/tests/css/CSS2/css1/c545-txttrans-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c545-txttrans-000.xht rename to tests/wpt/tests/css/CSS2/css1/c545-txttrans-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c546-txt-align-000.xht b/tests/wpt/tests/css/CSS2/css1/c546-txt-align-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c546-txt-align-000.xht rename to tests/wpt/tests/css/CSS2/css1/c546-txt-align-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c547-indent-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c547-indent-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c547-indent-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c547-indent-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c547-indent-000.xht b/tests/wpt/tests/css/CSS2/css1/c547-indent-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c547-indent-000.xht rename to tests/wpt/tests/css/CSS2/css1/c547-indent-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c547-indent-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c547-indent-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c547-indent-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c547-indent-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c547-indent-001.xht b/tests/wpt/tests/css/CSS2/css1/c547-indent-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c547-indent-001.xht rename to tests/wpt/tests/css/CSS2/css1/c547-indent-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c548-leadin-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c548-leadin-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c548-leadin-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c548-leadin-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c548-leadin-000.xht b/tests/wpt/tests/css/CSS2/css1/c548-leadin-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c548-leadin-000.xht rename to tests/wpt/tests/css/CSS2/css1/c548-leadin-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c548-ln-ht-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c548-ln-ht-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-000.xht b/tests/wpt/tests/css/CSS2/css1/c548-ln-ht-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-000.xht rename to tests/wpt/tests/css/CSS2/css1/c548-ln-ht-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c548-ln-ht-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c548-ln-ht-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-001.xht b/tests/wpt/tests/css/CSS2/css1/c548-ln-ht-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-001.xht rename to tests/wpt/tests/css/CSS2/css1/c548-ln-ht-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-002.xht b/tests/wpt/tests/css/CSS2/css1/c548-ln-ht-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-002.xht rename to tests/wpt/tests/css/CSS2/css1/c548-ln-ht-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c548-ln-ht-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c548-ln-ht-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-003.xht b/tests/wpt/tests/css/CSS2/css1/c548-ln-ht-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-003.xht rename to tests/wpt/tests/css/CSS2/css1/c548-ln-ht-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-004-ref.xht b/tests/wpt/tests/css/CSS2/css1/c548-ln-ht-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-004-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c548-ln-ht-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-004.xht b/tests/wpt/tests/css/CSS2/css1/c548-ln-ht-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c548-ln-ht-004.xht rename to tests/wpt/tests/css/CSS2/css1/c548-ln-ht-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5501-imrgn-t-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5501-imrgn-t-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5501-imrgn-t-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5501-imrgn-t-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5501-imrgn-t-000.xht b/tests/wpt/tests/css/CSS2/css1/c5501-imrgn-t-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5501-imrgn-t-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5501-imrgn-t-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5501-mrgn-t-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5501-mrgn-t-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5501-mrgn-t-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5501-mrgn-t-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5501-mrgn-t-000.xht b/tests/wpt/tests/css/CSS2/css1/c5501-mrgn-t-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5501-mrgn-t-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5501-mrgn-t-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-000.xht b/tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-001.xht b/tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-002-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-002-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-002.xht b/tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-003.xht b/tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-004-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-004-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-004.xht b/tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-004.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-005-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-005-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-005.xht b/tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-005.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-006-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-006-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-006.xht b/tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-imrgn-r-006.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-imrgn-r-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-mrgn-r-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5502-mrgn-r-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-mrgn-r-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-mrgn-r-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-mrgn-r-000.xht b/tests/wpt/tests/css/CSS2/css1/c5502-mrgn-r-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-mrgn-r-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-mrgn-r-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-mrgn-r-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5502-mrgn-r-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-mrgn-r-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-mrgn-r-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-mrgn-r-001.xht b/tests/wpt/tests/css/CSS2/css1/c5502-mrgn-r-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-mrgn-r-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-mrgn-r-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-mrgn-r-002.xht b/tests/wpt/tests/css/CSS2/css1/c5502-mrgn-r-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-mrgn-r-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-mrgn-r-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-mrgn-r-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5502-mrgn-r-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-mrgn-r-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-mrgn-r-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5502-mrgn-r-003.xht b/tests/wpt/tests/css/CSS2/css1/c5502-mrgn-r-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5502-mrgn-r-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5502-mrgn-r-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5503-imrgn-b-000.xht b/tests/wpt/tests/css/CSS2/css1/c5503-imrgn-b-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5503-imrgn-b-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5503-imrgn-b-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5503-mrgn-b-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5503-mrgn-b-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5503-mrgn-b-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5503-mrgn-b-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5503-mrgn-b-000.xht b/tests/wpt/tests/css/CSS2/css1/c5503-mrgn-b-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5503-mrgn-b-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5503-mrgn-b-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-000.xht b/tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-001.xht b/tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-002-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-002-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-002.xht b/tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-003.xht b/tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-004.xht b/tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-004.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-005-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-005-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-005.xht b/tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-005.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-006-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-006-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-006.xht b/tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-imrgn-l-006.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-imrgn-l-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-mrgn-l-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5504-mrgn-l-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-mrgn-l-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-mrgn-l-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-mrgn-l-000.xht b/tests/wpt/tests/css/CSS2/css1/c5504-mrgn-l-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-mrgn-l-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-mrgn-l-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-mrgn-l-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5504-mrgn-l-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-mrgn-l-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-mrgn-l-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-mrgn-l-001.xht b/tests/wpt/tests/css/CSS2/css1/c5504-mrgn-l-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-mrgn-l-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-mrgn-l-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-mrgn-l-002.xht b/tests/wpt/tests/css/CSS2/css1/c5504-mrgn-l-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-mrgn-l-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-mrgn-l-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-mrgn-l-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5504-mrgn-l-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-mrgn-l-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-mrgn-l-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5504-mrgn-l-003.xht b/tests/wpt/tests/css/CSS2/css1/c5504-mrgn-l-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5504-mrgn-l-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5504-mrgn-l-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5505-imrgn-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5505-imrgn-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5505-imrgn-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5505-imrgn-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5505-imrgn-000.xht b/tests/wpt/tests/css/CSS2/css1/c5505-imrgn-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5505-imrgn-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5505-imrgn-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5505-mrgn-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5505-mrgn-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5505-mrgn-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5505-mrgn-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5505-mrgn-000.xht b/tests/wpt/tests/css/CSS2/css1/c5505-mrgn-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5505-mrgn-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5505-mrgn-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5505-mrgn-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5505-mrgn-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5505-mrgn-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5505-mrgn-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5505-mrgn-001.xht b/tests/wpt/tests/css/CSS2/css1/c5505-mrgn-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5505-mrgn-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5505-mrgn-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5505-mrgn-002.xht b/tests/wpt/tests/css/CSS2/css1/c5505-mrgn-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5505-mrgn-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5505-mrgn-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5505-mrgn-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5505-mrgn-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5505-mrgn-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5505-mrgn-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5505-mrgn-003.xht b/tests/wpt/tests/css/CSS2/css1/c5505-mrgn-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5505-mrgn-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5505-mrgn-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5506-ipadn-t-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5506-ipadn-t-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5506-ipadn-t-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5506-ipadn-t-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5506-ipadn-t-000.xht b/tests/wpt/tests/css/CSS2/css1/c5506-ipadn-t-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5506-ipadn-t-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5506-ipadn-t-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5506-ipadn-t-001.xht b/tests/wpt/tests/css/CSS2/css1/c5506-ipadn-t-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5506-ipadn-t-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5506-ipadn-t-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5506-ipadn-t-002-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5506-ipadn-t-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5506-ipadn-t-002-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5506-ipadn-t-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5506-ipadn-t-002.xht b/tests/wpt/tests/css/CSS2/css1/c5506-ipadn-t-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5506-ipadn-t-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5506-ipadn-t-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5506-padn-t-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5506-padn-t-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5506-padn-t-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5506-padn-t-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5506-padn-t-000.xht b/tests/wpt/tests/css/CSS2/css1/c5506-padn-t-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5506-padn-t-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5506-padn-t-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5507-ipadn-r-000.xht b/tests/wpt/tests/css/CSS2/css1/c5507-ipadn-r-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5507-ipadn-r-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5507-ipadn-r-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5507-ipadn-r-001.xht b/tests/wpt/tests/css/CSS2/css1/c5507-ipadn-r-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5507-ipadn-r-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5507-ipadn-r-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5507-ipadn-r-002.xht b/tests/wpt/tests/css/CSS2/css1/c5507-ipadn-r-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5507-ipadn-r-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5507-ipadn-r-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5507-ipadn-r-003.xht b/tests/wpt/tests/css/CSS2/css1/c5507-ipadn-r-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5507-ipadn-r-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5507-ipadn-r-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5507-ipadn-r-004-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5507-ipadn-r-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5507-ipadn-r-004-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5507-ipadn-r-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5507-ipadn-r-004.xht b/tests/wpt/tests/css/CSS2/css1/c5507-ipadn-r-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5507-ipadn-r-004.xht rename to tests/wpt/tests/css/CSS2/css1/c5507-ipadn-r-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5507-padn-r-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5507-padn-r-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-000.xht b/tests/wpt/tests/css/CSS2/css1/c5507-padn-r-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5507-padn-r-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5507-padn-r-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5507-padn-r-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-001.xht b/tests/wpt/tests/css/CSS2/css1/c5507-padn-r-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5507-padn-r-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-002-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5507-padn-r-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-002-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5507-padn-r-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-002.xht b/tests/wpt/tests/css/CSS2/css1/c5507-padn-r-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5507-padn-r-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5507-padn-r-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5507-padn-r-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-003.xht b/tests/wpt/tests/css/CSS2/css1/c5507-padn-r-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5507-padn-r-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5507-padn-r-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5508-ipadn-b-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5508-ipadn-b-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5508-ipadn-b-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5508-ipadn-b-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5508-ipadn-b-000.xht b/tests/wpt/tests/css/CSS2/css1/c5508-ipadn-b-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5508-ipadn-b-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5508-ipadn-b-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5508-ipadn-b-001.xht b/tests/wpt/tests/css/CSS2/css1/c5508-ipadn-b-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5508-ipadn-b-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5508-ipadn-b-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5508-ipadn-b-002.xht b/tests/wpt/tests/css/CSS2/css1/c5508-ipadn-b-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5508-ipadn-b-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5508-ipadn-b-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5508-ipadn-b-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5508-ipadn-b-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5508-ipadn-b-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5508-ipadn-b-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5508-ipadn-b-003.xht b/tests/wpt/tests/css/CSS2/css1/c5508-ipadn-b-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5508-ipadn-b-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5508-ipadn-b-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5509-ipadn-l-000.xht b/tests/wpt/tests/css/CSS2/css1/c5509-ipadn-l-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5509-ipadn-l-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5509-ipadn-l-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5509-ipadn-l-001.xht b/tests/wpt/tests/css/CSS2/css1/c5509-ipadn-l-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5509-ipadn-l-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5509-ipadn-l-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5509-ipadn-l-002.xht b/tests/wpt/tests/css/CSS2/css1/c5509-ipadn-l-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5509-ipadn-l-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5509-ipadn-l-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5509-ipadn-l-003.xht b/tests/wpt/tests/css/CSS2/css1/c5509-ipadn-l-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5509-ipadn-l-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5509-ipadn-l-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5509-ipadn-l-004-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5509-ipadn-l-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5509-ipadn-l-004-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5509-ipadn-l-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5509-ipadn-l-004.xht b/tests/wpt/tests/css/CSS2/css1/c5509-ipadn-l-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5509-ipadn-l-004.xht rename to tests/wpt/tests/css/CSS2/css1/c5509-ipadn-l-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5509-padn-l-000.xht b/tests/wpt/tests/css/CSS2/css1/c5509-padn-l-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5509-padn-l-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5509-padn-l-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5509-padn-l-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5509-padn-l-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5509-padn-l-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5509-padn-l-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5509-padn-l-001.xht b/tests/wpt/tests/css/CSS2/css1/c5509-padn-l-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5509-padn-l-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5509-padn-l-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5509-padn-l-002-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5509-padn-l-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5509-padn-l-002-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5509-padn-l-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5509-padn-l-002.xht b/tests/wpt/tests/css/CSS2/css1/c5509-padn-l-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5509-padn-l-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5509-padn-l-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5509-padn-l-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5509-padn-l-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5509-padn-l-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5509-padn-l-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5509-padn-l-003.xht b/tests/wpt/tests/css/CSS2/css1/c5509-padn-l-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5509-padn-l-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5509-padn-l-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5510-ipadn-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5510-ipadn-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5510-ipadn-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5510-ipadn-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5510-ipadn-000.xht b/tests/wpt/tests/css/CSS2/css1/c5510-ipadn-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5510-ipadn-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5510-ipadn-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5510-padn-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5510-padn-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5510-padn-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5510-padn-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5510-padn-000.xht b/tests/wpt/tests/css/CSS2/css1/c5510-padn-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5510-padn-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5510-padn-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5510-padn-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5510-padn-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5510-padn-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5510-padn-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5510-padn-001.xht b/tests/wpt/tests/css/CSS2/css1/c5510-padn-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5510-padn-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5510-padn-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5510-padn-002-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5510-padn-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5510-padn-002-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5510-padn-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5510-padn-002.xht b/tests/wpt/tests/css/CSS2/css1/c5510-padn-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5510-padn-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5510-padn-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5511-brdr-tw-000.xht b/tests/wpt/tests/css/CSS2/css1/c5511-brdr-tw-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5511-brdr-tw-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5511-brdr-tw-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5511-brdr-tw-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5511-brdr-tw-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5511-brdr-tw-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5511-brdr-tw-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5511-brdr-tw-001.xht b/tests/wpt/tests/css/CSS2/css1/c5511-brdr-tw-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5511-brdr-tw-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5511-brdr-tw-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5511-brdr-tw-002.xht b/tests/wpt/tests/css/CSS2/css1/c5511-brdr-tw-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5511-brdr-tw-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5511-brdr-tw-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5511-brdr-tw-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5511-brdr-tw-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5511-brdr-tw-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5511-brdr-tw-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5511-brdr-tw-003.xht b/tests/wpt/tests/css/CSS2/css1/c5511-brdr-tw-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5511-brdr-tw-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5511-brdr-tw-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5511-ibrdr-tw-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5511-ibrdr-tw-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5511-ibrdr-tw-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5511-ibrdr-tw-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5511-ibrdr-tw-000.xht b/tests/wpt/tests/css/CSS2/css1/c5511-ibrdr-tw-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5511-ibrdr-tw-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5511-ibrdr-tw-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5512-brdr-rw-000.xht b/tests/wpt/tests/css/CSS2/css1/c5512-brdr-rw-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5512-brdr-rw-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5512-brdr-rw-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5512-brdr-rw-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5512-brdr-rw-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5512-brdr-rw-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5512-brdr-rw-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5512-brdr-rw-001.xht b/tests/wpt/tests/css/CSS2/css1/c5512-brdr-rw-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5512-brdr-rw-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5512-brdr-rw-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5512-brdr-rw-002.xht b/tests/wpt/tests/css/CSS2/css1/c5512-brdr-rw-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5512-brdr-rw-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5512-brdr-rw-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5512-brdr-rw-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5512-brdr-rw-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5512-brdr-rw-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5512-brdr-rw-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5512-brdr-rw-003.xht b/tests/wpt/tests/css/CSS2/css1/c5512-brdr-rw-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5512-brdr-rw-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5512-brdr-rw-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5512-ibrdr-rw-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5512-ibrdr-rw-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5512-ibrdr-rw-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5512-ibrdr-rw-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5512-ibrdr-rw-000.xht b/tests/wpt/tests/css/CSS2/css1/c5512-ibrdr-rw-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5512-ibrdr-rw-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5512-ibrdr-rw-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5513-brdr-bw-000.xht b/tests/wpt/tests/css/CSS2/css1/c5513-brdr-bw-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5513-brdr-bw-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5513-brdr-bw-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5513-brdr-bw-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5513-brdr-bw-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5513-brdr-bw-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5513-brdr-bw-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5513-brdr-bw-001.xht b/tests/wpt/tests/css/CSS2/css1/c5513-brdr-bw-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5513-brdr-bw-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5513-brdr-bw-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5513-brdr-bw-002.xht b/tests/wpt/tests/css/CSS2/css1/c5513-brdr-bw-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5513-brdr-bw-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5513-brdr-bw-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5513-brdr-bw-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5513-brdr-bw-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5513-brdr-bw-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5513-brdr-bw-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5513-brdr-bw-003.xht b/tests/wpt/tests/css/CSS2/css1/c5513-brdr-bw-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5513-brdr-bw-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5513-brdr-bw-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5513-ibrdr-bw-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5513-ibrdr-bw-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5513-ibrdr-bw-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5513-ibrdr-bw-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5513-ibrdr-bw-000.xht b/tests/wpt/tests/css/CSS2/css1/c5513-ibrdr-bw-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5513-ibrdr-bw-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5513-ibrdr-bw-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5514-brdr-lw-000.xht b/tests/wpt/tests/css/CSS2/css1/c5514-brdr-lw-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5514-brdr-lw-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5514-brdr-lw-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5514-brdr-lw-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5514-brdr-lw-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5514-brdr-lw-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5514-brdr-lw-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5514-brdr-lw-001.xht b/tests/wpt/tests/css/CSS2/css1/c5514-brdr-lw-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5514-brdr-lw-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5514-brdr-lw-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5514-brdr-lw-002.xht b/tests/wpt/tests/css/CSS2/css1/c5514-brdr-lw-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5514-brdr-lw-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5514-brdr-lw-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5514-brdr-lw-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5514-brdr-lw-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5514-brdr-lw-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5514-brdr-lw-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5514-brdr-lw-003.xht b/tests/wpt/tests/css/CSS2/css1/c5514-brdr-lw-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5514-brdr-lw-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5514-brdr-lw-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5514-ibrdr-lw-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5514-ibrdr-lw-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5514-ibrdr-lw-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5514-ibrdr-lw-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5514-ibrdr-lw-000.xht b/tests/wpt/tests/css/CSS2/css1/c5514-ibrdr-lw-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5514-ibrdr-lw-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5514-ibrdr-lw-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5515-brdr-w-000.xht b/tests/wpt/tests/css/CSS2/css1/c5515-brdr-w-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5515-brdr-w-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5515-brdr-w-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5515-brdr-w-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5515-brdr-w-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5515-brdr-w-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5515-brdr-w-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5515-brdr-w-001.xht b/tests/wpt/tests/css/CSS2/css1/c5515-brdr-w-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5515-brdr-w-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5515-brdr-w-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5515-brdr-w-002.xht b/tests/wpt/tests/css/CSS2/css1/c5515-brdr-w-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5515-brdr-w-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5515-brdr-w-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5515-ibrdr-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5515-ibrdr-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5515-ibrdr-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5515-ibrdr-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5515-ibrdr-000.xht b/tests/wpt/tests/css/CSS2/css1/c5515-ibrdr-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5515-ibrdr-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5515-ibrdr-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5516-brdr-c-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5516-brdr-c-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5516-brdr-c-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5516-brdr-c-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5516-brdr-c-000.xht b/tests/wpt/tests/css/CSS2/css1/c5516-brdr-c-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5516-brdr-c-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5516-brdr-c-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5516-ibrdr-c-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5516-ibrdr-c-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5516-ibrdr-c-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5516-ibrdr-c-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5516-ibrdr-c-000.xht b/tests/wpt/tests/css/CSS2/css1/c5516-ibrdr-c-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5516-ibrdr-c-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5516-ibrdr-c-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5517-brdr-s-000.xht b/tests/wpt/tests/css/CSS2/css1/c5517-brdr-s-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5517-brdr-s-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5517-brdr-s-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5517-ibrdr-s-000.xht b/tests/wpt/tests/css/CSS2/css1/c5517-ibrdr-s-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5517-ibrdr-s-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5517-ibrdr-s-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5518-brdr-t-000.xht b/tests/wpt/tests/css/CSS2/css1/c5518-brdr-t-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5518-brdr-t-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5518-brdr-t-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5518-brdr-t-001.xht b/tests/wpt/tests/css/CSS2/css1/c5518-brdr-t-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5518-brdr-t-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5518-brdr-t-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5518-ibrdr-t-000.xht b/tests/wpt/tests/css/CSS2/css1/c5518-ibrdr-t-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5518-ibrdr-t-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5518-ibrdr-t-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5519-brdr-r-000.xht b/tests/wpt/tests/css/CSS2/css1/c5519-brdr-r-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5519-brdr-r-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5519-brdr-r-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5519-brdr-r-001.xht b/tests/wpt/tests/css/CSS2/css1/c5519-brdr-r-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5519-brdr-r-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5519-brdr-r-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5519-brdr-r-002.xht b/tests/wpt/tests/css/CSS2/css1/c5519-brdr-r-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5519-brdr-r-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5519-brdr-r-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5519-ibrdr-r-000.xht b/tests/wpt/tests/css/CSS2/css1/c5519-ibrdr-r-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5519-ibrdr-r-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5519-ibrdr-r-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5520-brdr-b-000.xht b/tests/wpt/tests/css/CSS2/css1/c5520-brdr-b-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5520-brdr-b-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5520-brdr-b-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5520-brdr-b-001.xht b/tests/wpt/tests/css/CSS2/css1/c5520-brdr-b-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5520-brdr-b-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5520-brdr-b-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5520-ibrdr-b-000.xht b/tests/wpt/tests/css/CSS2/css1/c5520-ibrdr-b-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5520-ibrdr-b-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5520-ibrdr-b-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5521-brdr-l-000.xht b/tests/wpt/tests/css/CSS2/css1/c5521-brdr-l-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5521-brdr-l-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5521-brdr-l-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5521-brdr-l-001.xht b/tests/wpt/tests/css/CSS2/css1/c5521-brdr-l-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5521-brdr-l-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5521-brdr-l-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5521-brdr-l-002.xht b/tests/wpt/tests/css/CSS2/css1/c5521-brdr-l-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5521-brdr-l-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5521-brdr-l-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5521-ibrdr-l-000.xht b/tests/wpt/tests/css/CSS2/css1/c5521-ibrdr-l-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5521-ibrdr-l-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5521-ibrdr-l-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5522-brdr-000.xht b/tests/wpt/tests/css/CSS2/css1/c5522-brdr-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5522-brdr-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5522-brdr-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5522-brdr-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5522-brdr-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5522-brdr-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5522-brdr-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5522-brdr-001.xht b/tests/wpt/tests/css/CSS2/css1/c5522-brdr-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5522-brdr-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5522-brdr-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5522-brdr-002.xht b/tests/wpt/tests/css/CSS2/css1/c5522-brdr-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5522-brdr-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5522-brdr-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5522-ibrdr-000.xht b/tests/wpt/tests/css/CSS2/css1/c5522-ibrdr-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5522-ibrdr-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5522-ibrdr-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5523-width-000.xht b/tests/wpt/tests/css/CSS2/css1/c5523-width-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5523-width-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5523-width-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5523-width-001.xht b/tests/wpt/tests/css/CSS2/css1/c5523-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5523-width-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5523-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5523-width-002.xht b/tests/wpt/tests/css/CSS2/css1/c5523-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5523-width-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5523-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5524-height-000.xht b/tests/wpt/tests/css/CSS2/css1/c5524-height-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5524-height-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5524-height-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5524-height-001.xht b/tests/wpt/tests/css/CSS2/css1/c5524-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5524-height-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5524-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5524-height-002.xht b/tests/wpt/tests/css/CSS2/css1/c5524-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5524-height-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5524-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-flt-l-000.xht b/tests/wpt/tests/css/CSS2/css1/c5525-flt-l-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-flt-l-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-flt-l-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-flt-r-000.xht b/tests/wpt/tests/css/CSS2/css1/c5525-flt-r-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-flt-r-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-flt-r-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltblck-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltblck-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltblck-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltblck-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltblck-000.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltblck-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltblck-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltblck-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltblck-001.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltblck-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltblck-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltblck-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltcont-000.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltcont-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltcont-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltcont-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltinln-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltinln-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltinln-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltinln-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltinln-000.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltinln-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltinln-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltinln-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltmrgn-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltmrgn-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltmrgn-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltmrgn-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltmrgn-000.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltmrgn-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltmrgn-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltmrgn-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltmult-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltmult-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltmult-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltmult-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltmult-000.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltmult-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltmult-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltmult-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltwidth-000.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltwidth-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltwidth-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltwidth-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltwidth-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltwidth-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltwidth-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltwidth-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltwidth-001.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltwidth-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltwidth-001.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltwidth-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltwidth-002.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltwidth-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltwidth-002.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltwidth-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltwidth-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltwidth-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltwidth-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltwidth-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltwidth-003.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltwidth-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltwidth-003.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltwidth-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltwrap-000.xht b/tests/wpt/tests/css/CSS2/css1/c5525-fltwrap-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5525-fltwrap-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5525-fltwrap-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5526-fltclr-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5526-fltclr-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5526-fltclr-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5526-fltclr-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5526-fltclr-000.xht b/tests/wpt/tests/css/CSS2/css1/c5526-fltclr-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5526-fltclr-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5526-fltclr-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5526-flthw-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c5526-flthw-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5526-flthw-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c5526-flthw-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5526-flthw-000.xht b/tests/wpt/tests/css/CSS2/css1/c5526-flthw-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5526-flthw-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5526-flthw-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c5526c-display-000.xht b/tests/wpt/tests/css/CSS2/css1/c5526c-display-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c5526c-display-000.xht rename to tests/wpt/tests/css/CSS2/css1/c5526c-display-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c561-list-displ-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c561-list-displ-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c561-list-displ-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c561-list-displ-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c561-list-displ-000.xht b/tests/wpt/tests/css/CSS2/css1/c561-list-displ-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c561-list-displ-000.xht rename to tests/wpt/tests/css/CSS2/css1/c561-list-displ-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c562-white-sp-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c562-white-sp-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c562-white-sp-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c562-white-sp-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c562-white-sp-000.xht b/tests/wpt/tests/css/CSS2/css1/c562-white-sp-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c562-white-sp-000.xht rename to tests/wpt/tests/css/CSS2/css1/c562-white-sp-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c563-list-type-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c563-list-type-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c563-list-type-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c563-list-type-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c563-list-type-000.xht b/tests/wpt/tests/css/CSS2/css1/c563-list-type-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c563-list-type-000.xht rename to tests/wpt/tests/css/CSS2/css1/c563-list-type-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c563-list-type-001.xht b/tests/wpt/tests/css/CSS2/css1/c563-list-type-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c563-list-type-001.xht rename to tests/wpt/tests/css/CSS2/css1/c563-list-type-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c564-list-img-000.xht b/tests/wpt/tests/css/CSS2/css1/c564-list-img-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c564-list-img-000.xht rename to tests/wpt/tests/css/CSS2/css1/c564-list-img-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c565-list-pos-000.xht b/tests/wpt/tests/css/CSS2/css1/c565-list-pos-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c565-list-pos-000.xht rename to tests/wpt/tests/css/CSS2/css1/c565-list-pos-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c565-list-pos-001.xht b/tests/wpt/tests/css/CSS2/css1/c565-list-pos-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c565-list-pos-001.xht rename to tests/wpt/tests/css/CSS2/css1/c565-list-pos-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c566-list-stl-001.xht b/tests/wpt/tests/css/CSS2/css1/c566-list-stl-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c566-list-stl-001.xht rename to tests/wpt/tests/css/CSS2/css1/c566-list-stl-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c61-ex-len-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c61-ex-len-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c61-ex-len-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c61-ex-len-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c61-ex-len-000.xht b/tests/wpt/tests/css/CSS2/css1/c61-ex-len-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c61-ex-len-000.xht rename to tests/wpt/tests/css/CSS2/css1/c61-ex-len-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c61-rel-len-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c61-rel-len-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c61-rel-len-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c61-rel-len-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c61-rel-len-000.xht b/tests/wpt/tests/css/CSS2/css1/c61-rel-len-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c61-rel-len-000.xht rename to tests/wpt/tests/css/CSS2/css1/c61-rel-len-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c62-percent-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c62-percent-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c62-percent-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c62-percent-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c62-percent-000.xht b/tests/wpt/tests/css/CSS2/css1/c62-percent-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c62-percent-000.xht rename to tests/wpt/tests/css/CSS2/css1/c62-percent-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c63-color-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c63-color-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c63-color-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c63-color-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c63-color-000.xht b/tests/wpt/tests/css/CSS2/css1/c63-color-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c63-color-000.xht rename to tests/wpt/tests/css/CSS2/css1/c63-color-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c64-uri-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c64-uri-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c64-uri-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c64-uri-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c64-uri-000.xht b/tests/wpt/tests/css/CSS2/css1/c64-uri-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c64-uri-000.xht rename to tests/wpt/tests/css/CSS2/css1/c64-uri-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-000-ref.xht b/tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-000-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-000.xht b/tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-000.xht rename to tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-001-ref.xht b/tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-001-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-001.xht b/tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-001.xht rename to tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-002-ref.xht b/tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-002-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-002.xht b/tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-002.xht rename to tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-003-ref.xht b/tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-003-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-003.xht b/tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-003.xht rename to tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-004-ref.xht b/tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-004-ref.xht rename to tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-004.xht b/tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/c71-fwd-parsing-004.xht rename to tests/wpt/tests/css/CSS2/css1/c71-fwd-parsing-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/1x1-green.png b/tests/wpt/tests/css/CSS2/css1/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/css1/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/css1/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/css1/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/css1/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/css1/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/css1/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/css1/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/1x1-red.png b/tests/wpt/tests/css/CSS2/css1/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/css1/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/1x1-white.png b/tests/wpt/tests/css/CSS2/css1/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/css1/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/LOCK b/tests/wpt/tests/css/CSS2/css1/support/LOCK similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/LOCK rename to tests/wpt/tests/css/CSS2/css1/support/LOCK diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/README b/tests/wpt/tests/css/CSS2/css1/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/README rename to tests/wpt/tests/css/CSS2/css1/support/README diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/a-green.css b/tests/wpt/tests/css/CSS2/css1/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/a-green.css rename to tests/wpt/tests/css/CSS2/css1/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/b-green.css b/tests/wpt/tests/css/CSS2/css1/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/b-green.css rename to tests/wpt/tests/css/CSS2/css1/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/blue15x15.png b/tests/wpt/tests/css/CSS2/css1/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/css1/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/blue20x20.png b/tests/wpt/tests/css/CSS2/css1/support/blue20x20.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/blue20x20.png rename to tests/wpt/tests/css/CSS2/css1/support/blue20x20.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/c-red.css b/tests/wpt/tests/css/CSS2/css1/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/c-red.css rename to tests/wpt/tests/css/CSS2/css1/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/cat.png b/tests/wpt/tests/css/CSS2/css1/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/cat.png rename to tests/wpt/tests/css/CSS2/css1/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test412a.png b/tests/wpt/tests/css/CSS2/css1/support/css1test412a.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test412a.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test412a.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test412b-a.png b/tests/wpt/tests/css/CSS2/css1/support/css1test412b-a.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test412b-a.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test412b-a.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test412b-b.png b/tests/wpt/tests/css/CSS2/css1/support/css1test412b-b.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test412b-b.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test412b-b.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test42a.png b/tests/wpt/tests/css/CSS2/css1/support/css1test42a.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test42a.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test42a.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test44a.png b/tests/wpt/tests/css/CSS2/css1/support/css1test44a.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test44a.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test44a.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test44b.png b/tests/wpt/tests/css/CSS2/css1/support/css1test44b.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test44b.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test44b.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test44c.png b/tests/wpt/tests/css/CSS2/css1/support/css1test44c.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test44c.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test44c.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test44d.png b/tests/wpt/tests/css/CSS2/css1/support/css1test44d.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test44d.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test44d.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test544b.png b/tests/wpt/tests/css/CSS2/css1/support/css1test544b.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test544b.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test544b.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test545.png b/tests/wpt/tests/css/CSS2/css1/support/css1test545.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test545.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test545.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test548d.png b/tests/wpt/tests/css/CSS2/css1/support/css1test548d.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test548d.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test548d.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test548e.png b/tests/wpt/tests/css/CSS2/css1/support/css1test548e.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test548e.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test548e.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5510-i.png b/tests/wpt/tests/css/CSS2/css1/support/css1test5510-i.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5510-i.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test5510-i.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525b-0.png b/tests/wpt/tests/css/CSS2/css1/support/css1test5525b-0.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525b-0.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test5525b-0.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525b-1.png b/tests/wpt/tests/css/CSS2/css1/support/css1test5525b-1.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525b-1.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test5525b-1.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525b-2.png b/tests/wpt/tests/css/CSS2/css1/support/css1test5525b-2.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525b-2.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test5525b-2.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525b-3.png b/tests/wpt/tests/css/CSS2/css1/support/css1test5525b-3.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525b-3.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test5525b-3.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525b-4.png b/tests/wpt/tests/css/CSS2/css1/support/css1test5525b-4.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525b-4.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test5525b-4.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525b-5.png b/tests/wpt/tests/css/CSS2/css1/support/css1test5525b-5.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525b-5.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test5525b-5.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525b-6.png b/tests/wpt/tests/css/CSS2/css1/support/css1test5525b-6.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525b-6.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test5525b-6.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525ce-1.png b/tests/wpt/tests/css/CSS2/css1/support/css1test5525ce-1.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525ce-1.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test5525ce-1.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525ce-2.png b/tests/wpt/tests/css/CSS2/css1/support/css1test5525ce-2.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525ce-2.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test5525ce-2.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525cf-0.png b/tests/wpt/tests/css/CSS2/css1/support/css1test5525cf-0.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525cf-0.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test5525cf-0.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525cf-1.png b/tests/wpt/tests/css/CSS2/css1/support/css1test5525cf-1.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5525cf-1.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test5525cf-1.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5526.png b/tests/wpt/tests/css/CSS2/css1/support/css1test5526.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5526.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test5526.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5526c.png b/tests/wpt/tests/css/CSS2/css1/support/css1test5526c.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test5526c.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test5526c.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test562.png b/tests/wpt/tests/css/CSS2/css1/support/css1test562.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test562.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test562.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test566a.png b/tests/wpt/tests/css/CSS2/css1/support/css1test566a.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test566a.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test566a.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test62-inner.png b/tests/wpt/tests/css/CSS2/css1/support/css1test62-inner.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test62-inner.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test62-inner.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test62-outer.png b/tests/wpt/tests/css/CSS2/css1/support/css1test62-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test62-outer.png rename to tests/wpt/tests/css/CSS2/css1/support/css1test62-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test64a.css b/tests/wpt/tests/css/CSS2/css1/support/css1test64a.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test64a.css rename to tests/wpt/tests/css/CSS2/css1/support/css1test64a.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test64b.css b/tests/wpt/tests/css/CSS2/css1/support/css1test64b.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/css1test64b.css rename to tests/wpt/tests/css/CSS2/css1/support/css1test64b.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/green15x15.png b/tests/wpt/tests/css/CSS2/css1/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/green15x15.png rename to tests/wpt/tests/css/CSS2/css1/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/pattern-gg-gr.png b/tests/wpt/tests/css/CSS2/css1/support/pattern-gg-gr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/pattern-gg-gr.png rename to tests/wpt/tests/css/CSS2/css1/support/pattern-gg-gr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/css1/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/css1/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/css1/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/css1/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/css1/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/css1/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/css1/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/css1/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/ruler-h-50%.png b/tests/wpt/tests/css/CSS2/css1/support/ruler-h-50%.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/ruler-h-50%.png rename to tests/wpt/tests/css/CSS2/css1/support/ruler-h-50%.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/ruler-h-50px.png b/tests/wpt/tests/css/CSS2/css1/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/ruler-h-50px.png rename to tests/wpt/tests/css/CSS2/css1/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/ruler-v-100px.png b/tests/wpt/tests/css/CSS2/css1/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/ruler-v-100px.png rename to tests/wpt/tests/css/CSS2/css1/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/ruler-v-50px.png b/tests/wpt/tests/css/CSS2/css1/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/ruler-v-50px.png rename to tests/wpt/tests/css/CSS2/css1/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/square-purple.png b/tests/wpt/tests/css/CSS2/css1/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/square-purple.png rename to tests/wpt/tests/css/CSS2/css1/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/square-teal.png b/tests/wpt/tests/css/CSS2/css1/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/square-teal.png rename to tests/wpt/tests/css/CSS2/css1/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/square-white.png b/tests/wpt/tests/css/CSS2/css1/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/square-white.png rename to tests/wpt/tests/css/CSS2/css1/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/support/README b/tests/wpt/tests/css/CSS2/css1/support/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/support/README rename to tests/wpt/tests/css/CSS2/css1/support/support/README diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/support/swatch-green.png b/tests/wpt/tests/css/CSS2/css1/support/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/css1/support/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/support/swatch-red.png b/tests/wpt/tests/css/CSS2/css1/support/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/css1/support/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-aqua.png b/tests/wpt/tests/css/CSS2/css1/support/swatch-aqua.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-aqua.png rename to tests/wpt/tests/css/CSS2/css1/support/swatch-aqua.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/css1/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/css1/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-green.png b/tests/wpt/tests/css/CSS2/css1/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/css1/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/css1/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/css1/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/css1/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/css1/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-red.png b/tests/wpt/tests/css/CSS2/css1/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/css1/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-white.png b/tests/wpt/tests/css/CSS2/css1/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/css1/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/css1/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/css1/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/test-bl.png b/tests/wpt/tests/css/CSS2/css1/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/test-bl.png rename to tests/wpt/tests/css/CSS2/css1/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/test-br.png b/tests/wpt/tests/css/CSS2/css1/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/test-br.png rename to tests/wpt/tests/css/CSS2/css1/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/test-inner-half-size.png b/tests/wpt/tests/css/CSS2/css1/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/test-inner-half-size.png rename to tests/wpt/tests/css/CSS2/css1/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/test-outer.png b/tests/wpt/tests/css/CSS2/css1/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/test-outer.png rename to tests/wpt/tests/css/CSS2/css1/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/test-tl.png b/tests/wpt/tests/css/CSS2/css1/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/test-tl.png rename to tests/wpt/tests/css/CSS2/css1/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css1/support/test-tr.png b/tests/wpt/tests/css/CSS2/css1/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css1/support/test-tr.png rename to tests/wpt/tests/css/CSS2/css1/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-001-ref.html b/tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-001-ref.html rename to tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-001.html b/tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-001.html rename to tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-002-ref.html b/tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-002-ref.html rename to tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-002.html b/tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-002.html rename to tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-003-ref.html b/tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-003-ref.html rename to tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-003.html b/tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-003.html rename to tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-003.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-004.html b/tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-004.html rename to tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-004.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-005-ref.html b/tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-005-ref.html rename to tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-005.html b/tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-005.html rename to tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-005.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-006.html b/tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-006.html rename to tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-006.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-007-ref.html b/tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-007-ref.html rename to tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-007.html b/tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-007.html rename to tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-007.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-008.html b/tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-008.html rename to tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-008.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-009.html b/tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/css21-errata/s-11-1-1b-009.html rename to tests/wpt/tests/css/CSS2/css21-errata/s-11-1-1b-009.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-non-replaced-width-margin-000-ref.xht b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-non-replaced-width-margin-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-non-replaced-width-margin-000-ref.xht rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-non-replaced-width-margin-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-non-replaced-width-margin-000.xht b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-non-replaced-width-margin-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-non-replaced-width-margin-000.xht rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-non-replaced-width-margin-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-replaced-width-margin-000-ref.xht b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-replaced-width-margin-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-replaced-width-margin-000-ref.xht rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-replaced-width-margin-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-replaced-width-margin-000.xht b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-replaced-width-margin-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-replaced-width-margin-000.xht rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/abspos-replaced-width-margin-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/anonymous-boxes-001.xht b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/anonymous-boxes-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/anonymous-boxes-001.xht rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/anonymous-boxes-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/reference/ref-green-box-100x100.xht b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/reference/ref-green-box-100x100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/reference/ref-green-box-100x100.xht rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/reference/ref-green-box-100x100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/reference/ref-green-box-120x120.xht b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/reference/ref-green-box-120x120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/reference/ref-green-box-120x120.xht rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/reference/ref-green-box-120x120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-green.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-red.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-white.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/a-green.css b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/a-green.css rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/abspos-replaced-width-margin-000-narrow.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/abspos-replaced-width-margin-000-narrow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/abspos-replaced-width-margin-000-narrow.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/abspos-replaced-width-margin-000-narrow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/abspos-replaced-width-margin-000-wide.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/abspos-replaced-width-margin-000-wide.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/abspos-replaced-width-margin-000-wide.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/abspos-replaced-width-margin-000-wide.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/b-green.css b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/b-green.css rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/c-red.css b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/c-red.css rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/import-green.css b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/import-green.css rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/import-red.css b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/import-red.css rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/square-purple.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/square-purple.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/square-teal.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/square-teal.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/square-white.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/square-white.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-green.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-red.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-white.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/csswg-issues/submitted/css2.1/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjacent-floats-001-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/adjacent-floats-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjacent-floats-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/adjacent-floats-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjacent-floats-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/adjacent-floats-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjacent-floats-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/adjacent-floats-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-before-clearance.html b/tests/wpt/tests/css/CSS2/floats-clear/adjoining-float-before-clearance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-before-clearance.html rename to tests/wpt/tests/css/CSS2/floats-clear/adjoining-float-before-clearance.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance-002.html b/tests/wpt/tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance-002.html rename to tests/wpt/tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance-003.html b/tests/wpt/tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance-003.html rename to tests/wpt/tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance-003.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance-004.html b/tests/wpt/tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance-004.html rename to tests/wpt/tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance-004.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance.html b/tests/wpt/tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance.html rename to tests/wpt/tests/css/CSS2/floats-clear/adjoining-float-nested-forced-clearance.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-new-fc-crash.html b/tests/wpt/tests/css/CSS2/floats-clear/adjoining-float-new-fc-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-new-fc-crash.html rename to tests/wpt/tests/css/CSS2/floats-clear/adjoining-float-new-fc-crash.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-new-fc.html b/tests/wpt/tests/css/CSS2/floats-clear/adjoining-float-new-fc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-new-fc.html rename to tests/wpt/tests/css/CSS2/floats-clear/adjoining-float-new-fc.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-001-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-002-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-002-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-002.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-002.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-003-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-003-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-003.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-003.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-004.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-004.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-005.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-005.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-after-top-margin.html b/tests/wpt/tests/css/CSS2/floats-clear/clear-after-top-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-after-top-margin.html rename to tests/wpt/tests/css/CSS2/floats-clear/clear-after-top-margin.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-000-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-000-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-000.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-000.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-002.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-003.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-004.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-005.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-006.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-007.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-008-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-008-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-008.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-009-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-009-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-009.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-010.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-012.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-013.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-014.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-015.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-001-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-002-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-002-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-002.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-002.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-003-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-003-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-003.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-003.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-004-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-004-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-004.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-004.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-005-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-005-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-005.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-clearance-calculation-005.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-clearance-calculation-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-default-inheritance-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-default-inheritance-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-default-inheritance-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-default-inheritance-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-001-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-002-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-002-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-002.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-002.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-003-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-003-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-003.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-003.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-004-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-004-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-004.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-004.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-005-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-005-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-005.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-005.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-006-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-006-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-006.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-006.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-007.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-007.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-008.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-008.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-009-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-009-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-009.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-float-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-float-009.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-float-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-initial-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-initial-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-initial-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-initial-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-inline-001-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-inline-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-inline-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-inline-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-inline-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/clear-inline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-inline-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clear-inline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-no-interpolation.html b/tests/wpt/tests/css/CSS2/floats-clear/clear-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-no-interpolation.html rename to tests/wpt/tests/css/CSS2/floats-clear/clear-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-on-child-with-margins-2.html b/tests/wpt/tests/css/CSS2/floats-clear/clear-on-child-with-margins-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-on-child-with-margins-2.html rename to tests/wpt/tests/css/CSS2/floats-clear/clear-on-child-with-margins-2.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-on-child-with-margins.html b/tests/wpt/tests/css/CSS2/floats-clear/clear-on-child-with-margins.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-on-child-with-margins.html rename to tests/wpt/tests/css/CSS2/floats-clear/clear-on-child-with-margins.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-on-parent-and-child.html b/tests/wpt/tests/css/CSS2/floats-clear/clear-on-parent-and-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-on-parent-and-child.html rename to tests/wpt/tests/css/CSS2/floats-clear/clear-on-parent-and-child.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-on-parent-with-margins-no-clearance.html b/tests/wpt/tests/css/CSS2/floats-clear/clear-on-parent-with-margins-no-clearance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-on-parent-with-margins-no-clearance.html rename to tests/wpt/tests/css/CSS2/floats-clear/clear-on-parent-with-margins-no-clearance.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-on-parent-with-margins.html b/tests/wpt/tests/css/CSS2/floats-clear/clear-on-parent-with-margins.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-on-parent-with-margins.html rename to tests/wpt/tests/css/CSS2/floats-clear/clear-on-parent-with-margins.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-on-parent.html b/tests/wpt/tests/css/CSS2/floats-clear/clear-on-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-on-parent.html rename to tests/wpt/tests/css/CSS2/floats-clear/clear-on-parent.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-with-top-margin-after-cleared-empty-block.html b/tests/wpt/tests/css/CSS2/floats-clear/clear-with-top-margin-after-cleared-empty-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-with-top-margin-after-cleared-empty-block.html rename to tests/wpt/tests/css/CSS2/floats-clear/clear-with-top-margin-after-cleared-empty-block.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clearance-006-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/clearance-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clearance-006-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clearance-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clearance-006.xht b/tests/wpt/tests/css/CSS2/floats-clear/clearance-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clearance-006.xht rename to tests/wpt/tests/css/CSS2/floats-clear/clearance-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clearance-containing-fragmented-float-crash.html b/tests/wpt/tests/css/CSS2/floats-clear/clearance-containing-fragmented-float-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/clearance-containing-fragmented-float-crash.html rename to tests/wpt/tests/css/CSS2/floats-clear/clearance-containing-fragmented-float-crash.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-002.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-002.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-003-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-003-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-003.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-003.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-004.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-004.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-005-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-005-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-005.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-005.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-006-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-006-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-006.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-006.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-001a.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-001a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-001a.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-001a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-002.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-003.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-004.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-004a.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-004a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-004a.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-004a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-005.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-006.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-007.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-008-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-008-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-008.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-008a.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-008a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-008a.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-008a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-009.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-010.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-012.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-013.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-014.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-015.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-height-001-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-height-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-height-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-height-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-height-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-height-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-001-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-002-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-002-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-002.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-002.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-003-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-003-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-003.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-003.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-004.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-004.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-005.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-005.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-006.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-006.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-007.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-007.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-008.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-008.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-009.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-009.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-010.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-010.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-011.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-011.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-012.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-012.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-013.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-non-replaced-width-013.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-non-replaced-width-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-001-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-002-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-002-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-002.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-002.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-003-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-003-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-003.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-003.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-004-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-004-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-004.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-004.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-005-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-005-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-005.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-005.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-006-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-006-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-006.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-006.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-007.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-height-007.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-height-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-002.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-002.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-003.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-003.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-004.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-004.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-005.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-005.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-006-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-006-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-006.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-006.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-007-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-007-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-007.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-007.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-008-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-008-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-008.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-008.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-009-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-009-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-009.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-009.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-011-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-011-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-011.xht b/tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/float-replaced-width-011.xht rename to tests/wpt/tests/css/CSS2/floats-clear/float-replaced-width-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floating-replaced-height-008.xht b/tests/wpt/tests/css/CSS2/floats-clear/floating-replaced-height-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floating-replaced-height-008.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floating-replaced-height-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-001-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-002-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-002-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-002.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-002.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-003.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-003.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-004-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-004-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-004.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-004.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-005-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-005-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-005.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-005.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-006-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-006-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-006.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-006.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-007-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-007-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-007.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-007.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-008.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-008.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-009-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-009-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-009.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-009.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-014-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-014-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-014.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-014.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-015.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-015.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-016.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-016.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-019-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-019-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-019.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-019.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-020.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-020.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-021.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-021.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-022-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-022-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-022.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-022.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-023-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-023-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-023.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-023.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-024-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-024-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-024-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-024-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-024.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-024.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-025-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-025-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-025.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-025.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-026-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-026-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-026.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-026.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-027-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-027-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-027.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-027.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-028-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-028-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-028.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-028.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-029-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-029-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-029-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-029-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-029.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-029.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-030-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-030-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-030-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-030-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-030.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-030.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-031-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-031-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-031-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-031-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-031.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-031.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-036-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-036-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-036-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-036-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-036.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-036.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-037.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-037.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-038-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-038-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-038-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-038-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-038.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-038.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-039.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-039.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-040.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-040.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-041-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-041-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-041-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-041-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-041.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-041.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-043-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-043-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-043-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-043-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-043.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-043.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-101-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-101-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-101-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-101-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-101.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-101.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-102.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-102.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-103.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-103.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-104.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-104.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-105.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-105.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-106.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-106.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-108.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-108.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-109.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-109.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-110.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-110.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-111-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-111-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-111-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-111-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-111.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-111.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-112-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-112-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-112-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-112-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-112.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-112.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-113-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-113-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-113.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-113.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-114-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-114-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-114-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-114-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-114.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-114.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-115-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-115-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-115-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-115-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-115.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-115.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-116-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-116-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-116-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-116-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-116.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-116.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-117.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-117.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-118-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-118-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-118-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-118-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-118.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-118.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-119-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-119-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-119-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-119-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-119.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-119.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-120.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-120.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-121-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-121-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-121-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-121-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-121.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-121.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-122-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-122-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-122-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-122-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-122.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-122.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-123-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-123-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-123-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-123-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-123.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-123.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-124-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-124-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-124-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-124-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-124.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-124.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-124.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-125-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-125-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-125-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-125-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-125.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-125.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-125.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-126.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-126.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-127.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-127.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-128.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-128.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-128.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-129.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-129.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-130.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-130.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-130.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-131.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-131.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-131.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-132-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-132-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-132-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-132-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-132.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-132.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-132.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-133-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-133-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-133-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-133-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-133.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-133.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-133.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-133.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-134.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-134.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-134.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-134.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-135-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-135-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-135-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-135-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-135.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-135.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-135.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-136-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-136-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-136-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-136-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-136.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-136.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-136.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-136.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-137.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-137.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-137.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-137.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-138-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-138-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-138-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-138-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-138.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-138.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-138.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-139-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-139-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-139-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-139-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-139.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-139.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-139.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-139.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-140.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-140.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-140.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-141-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-141-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-141-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-141-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-141.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-141.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-141.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-142-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-142-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-142-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-142-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-142.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-142.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-142.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-143-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-143-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-143-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-143-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-143.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-143.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-143.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-144-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-144-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-144-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-144-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-144.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-144.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-144.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-145-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-145-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-145-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-145-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-145.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-145.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-146-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-146-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-146-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-146-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-146.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-146.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-146.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-146.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-147-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-147-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-147-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-147-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-147.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-147.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-147.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-147.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-149-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-149-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-149-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-149-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-149.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-149.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-149.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-149.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-150-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-150-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-150-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-150-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-150.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-150.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-150.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-150.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-151.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-151.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-151.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-151.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-152.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-152.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-152.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-152.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-153-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-153-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-153-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-153-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-153.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-153.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-153.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-153.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-154-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-154-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-154-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-154-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-154.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-154.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-154.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-154.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-bfc-001-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-bfc-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-bfc-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-bfc-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-bfc-001.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-bfc-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-bfc-001.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-bfc-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-bfc-002.xht b/tests/wpt/tests/css/CSS2/floats-clear/floats-bfc-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-bfc-002.xht rename to tests/wpt/tests/css/CSS2/floats-clear/floats-bfc-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-000-ref.html b/tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-000-ref.html rename to tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-000.html b/tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-000.html rename to tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-000.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-001.html b/tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-001.html rename to tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-002.html b/tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-002.html rename to tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-003.html b/tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-003.html rename to tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-003.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-000-ref.html b/tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-000-ref.html rename to tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-000.html b/tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-000.html rename to tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-000.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-001.html b/tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-001.html rename to tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-002.html b/tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-002.html rename to tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-003.html b/tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-003.html rename to tests/wpt/tests/css/CSS2/floats-clear/floats-clear-multicol-balancing-003.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-018.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-018.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-023.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-023.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-024-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-024-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-024-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-024-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-024.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-024.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-027.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-027.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-031-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-031-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-031-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-031-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-031.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-031.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-033.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-033.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-034.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-034.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-035.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-035.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-121-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-121-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-121-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-121-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-121.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-121.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-122.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-122.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-123-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-123-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-123-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-123-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-123.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-123.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-125-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-125-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-125-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-125-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-125.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-125.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-125.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-134-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-134-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-134-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-134-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-134.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-134.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-134.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-134.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-135-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-135-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-135-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-135-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-135.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-135.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-135.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-142-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-142-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-142-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-142-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-142.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-142.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-142.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-157-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-157-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-157-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-157-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-157.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-157.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-157.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-157.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-158-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-158-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-158-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-158-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-158.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-158.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-158.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-158.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-164.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-164.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-164.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-164.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-165-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-165-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-165-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-165-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-165.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-165.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-165.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-165.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-166.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-166.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-166.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-166.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-002-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-002-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-002.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-002.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-003-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-003-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-003.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-003.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-005.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-005.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-008.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-008.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-009.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-009.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-011.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-011.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-012-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-012-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-012.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-012.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-013.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-013.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-014-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-014-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-014.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-014.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-015-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-015-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-015.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-015.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-016-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-016-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-016.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-016.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-017-ref.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-017-ref.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-017.xht b/tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/margin-collapse-clear-017.xht rename to tests/wpt/tests/css/CSS2/floats-clear/margin-collapse-clear-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/negative-clearance-after-adjoining-float.html b/tests/wpt/tests/css/CSS2/floats-clear/negative-clearance-after-adjoining-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/negative-clearance-after-adjoining-float.html rename to tests/wpt/tests/css/CSS2/floats-clear/negative-clearance-after-adjoining-float.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/negative-clearance-after-bottom-margin.html b/tests/wpt/tests/css/CSS2/floats-clear/negative-clearance-after-bottom-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/negative-clearance-after-bottom-margin.html rename to tests/wpt/tests/css/CSS2/floats-clear/negative-clearance-after-bottom-margin.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/nested-clearance-new-formatting-context.html b/tests/wpt/tests/css/CSS2/floats-clear/nested-clearance-new-formatting-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/nested-clearance-new-formatting-context.html rename to tests/wpt/tests/css/CSS2/floats-clear/nested-clearance-new-formatting-context.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float.html b/tests/wpt/tests/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float.html rename to tests/wpt/tests/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html b/tests/wpt/tests/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html rename to tests/wpt/tests/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-due-to-large-margin.html b/tests/wpt/tests/css/CSS2/floats-clear/no-clearance-due-to-large-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-due-to-large-margin.html rename to tests/wpt/tests/css/CSS2/floats-clear/no-clearance-due-to-large-margin.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/remove-block-before-self-collapsing-sibling-with-clearance.html b/tests/wpt/tests/css/CSS2/floats-clear/remove-block-before-self-collapsing-sibling-with-clearance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/remove-block-before-self-collapsing-sibling-with-clearance.html rename to tests/wpt/tests/css/CSS2/floats-clear/remove-block-before-self-collapsing-sibling-with-clearance.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/second-float-inside-empty-cleared-block-after-margin.html b/tests/wpt/tests/css/CSS2/floats-clear/second-float-inside-empty-cleared-block-after-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/second-float-inside-empty-cleared-block-after-margin.html rename to tests/wpt/tests/css/CSS2/floats-clear/second-float-inside-empty-cleared-block-after-margin.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/second-float-inside-empty-cleared-block.html b/tests/wpt/tests/css/CSS2/floats-clear/second-float-inside-empty-cleared-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/second-float-inside-empty-cleared-block.html rename to tests/wpt/tests/css/CSS2/floats-clear/second-float-inside-empty-cleared-block.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/1x1-green.png b/tests/wpt/tests/css/CSS2/floats-clear/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/floats-clear/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/floats-clear/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/floats-clear/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/1x1-red.png b/tests/wpt/tests/css/CSS2/floats-clear/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/1x1-white.png b/tests/wpt/tests/css/CSS2/floats-clear/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/floats-clear/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/60x60-green.png b/tests/wpt/tests/css/CSS2/floats-clear/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/a-green.css b/tests/wpt/tests/css/CSS2/floats-clear/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/a-green.css rename to tests/wpt/tests/css/CSS2/floats-clear/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/b-green.css b/tests/wpt/tests/css/CSS2/floats-clear/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/b-green.css rename to tests/wpt/tests/css/CSS2/floats-clear/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/black15x15.png b/tests/wpt/tests/css/CSS2/floats-clear/support/black15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/black15x15.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/black15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/blue15x15.png b/tests/wpt/tests/css/CSS2/floats-clear/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/c-red.css b/tests/wpt/tests/css/CSS2/floats-clear/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/c-red.css rename to tests/wpt/tests/css/CSS2/floats-clear/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/cat.png b/tests/wpt/tests/css/CSS2/floats-clear/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/cat.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/clear-clearance-calculation-001.png b/tests/wpt/tests/css/CSS2/floats-clear/support/clear-clearance-calculation-001.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/clear-clearance-calculation-001.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/clear-clearance-calculation-001.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/clear-clearance-calculation-002.png b/tests/wpt/tests/css/CSS2/floats-clear/support/clear-clearance-calculation-002.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/clear-clearance-calculation-002.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/clear-clearance-calculation-002.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/clear-clearance-calculation-003.png b/tests/wpt/tests/css/CSS2/floats-clear/support/clear-clearance-calculation-003.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/clear-clearance-calculation-003.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/clear-clearance-calculation-003.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/diamond.png b/tests/wpt/tests/css/CSS2/floats-clear/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/diamond.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/floats-005.png b/tests/wpt/tests/css/CSS2/floats-clear/support/floats-005.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/floats-005.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/floats-005.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/green-rectangle-50wideBy10tall.png b/tests/wpt/tests/css/CSS2/floats-clear/support/green-rectangle-50wideBy10tall.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/green-rectangle-50wideBy10tall.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/green-rectangle-50wideBy10tall.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/green15x15.png b/tests/wpt/tests/css/CSS2/floats-clear/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/green15x15.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/margin-collapse-2em-space.png b/tests/wpt/tests/css/CSS2/floats-clear/support/margin-collapse-2em-space.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/margin-collapse-2em-space.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/margin-collapse-2em-space.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/margin-collapse-4em-space.png b/tests/wpt/tests/css/CSS2/floats-clear/support/margin-collapse-4em-space.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/margin-collapse-4em-space.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/margin-collapse-4em-space.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/floats-clear/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/floats-clear/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/floats-clear/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/floats-clear/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/ring.png b/tests/wpt/tests/css/CSS2/floats-clear/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/ring.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/ruler-v-100px-200px-300px.png b/tests/wpt/tests/css/CSS2/floats-clear/support/ruler-v-100px-200px-300px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/ruler-v-100px-200px-300px.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/ruler-v-100px-200px-300px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/square-purple.png b/tests/wpt/tests/css/CSS2/floats-clear/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/square-purple.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/square-teal.png b/tests/wpt/tests/css/CSS2/floats-clear/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/square-teal.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/square-white.png b/tests/wpt/tests/css/CSS2/floats-clear/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/square-white.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/floats-clear/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-green.png b/tests/wpt/tests/css/CSS2/floats-clear/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/floats-clear/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/floats-clear/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-purple.png b/tests/wpt/tests/css/CSS2/floats-clear/support/swatch-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-purple.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/swatch-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-red.png b/tests/wpt/tests/css/CSS2/floats-clear/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-white.png b/tests/wpt/tests/css/CSS2/floats-clear/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/floats-clear/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/test-bl.png b/tests/wpt/tests/css/CSS2/floats-clear/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/test-bl.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/test-br.png b/tests/wpt/tests/css/CSS2/floats-clear/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/test-br.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/test-outer.png b/tests/wpt/tests/css/CSS2/floats-clear/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/test-outer.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/test-tl.png b/tests/wpt/tests/css/CSS2/floats-clear/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/test-tl.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/test-tr.png b/tests/wpt/tests/css/CSS2/floats-clear/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats-clear/support/test-tr.png rename to tests/wpt/tests/css/CSS2/floats-clear/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/adjoining-floats-dynamic.html b/tests/wpt/tests/css/CSS2/floats/adjoining-floats-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/adjoining-floats-dynamic.html rename to tests/wpt/tests/css/CSS2/floats/adjoining-floats-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/computed-float-position-absolute.html b/tests/wpt/tests/css/CSS2/floats/computed-float-position-absolute.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/computed-float-position-absolute.html rename to tests/wpt/tests/css/CSS2/floats/computed-float-position-absolute.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-in-nested-multicol-001.html b/tests/wpt/tests/css/CSS2/floats/float-in-nested-multicol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-in-nested-multicol-001.html rename to tests/wpt/tests/css/CSS2/floats/float-in-nested-multicol-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-in-self-painting-inline.html b/tests/wpt/tests/css/CSS2/floats/float-in-self-painting-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-in-self-painting-inline.html rename to tests/wpt/tests/css/CSS2/floats/float-in-self-painting-inline.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-no-content-beside-001-ref.html b/tests/wpt/tests/css/CSS2/floats/float-no-content-beside-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-no-content-beside-001-ref.html rename to tests/wpt/tests/css/CSS2/floats/float-no-content-beside-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-no-content-beside-001.html b/tests/wpt/tests/css/CSS2/floats/float-no-content-beside-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-no-content-beside-001.html rename to tests/wpt/tests/css/CSS2/floats/float-no-content-beside-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-no-interpolation.html b/tests/wpt/tests/css/CSS2/floats/float-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-no-interpolation.html rename to tests/wpt/tests/css/CSS2/floats/float-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-1-notref.html b/tests/wpt/tests/css/CSS2/floats/float-nowrap-1-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-1-notref.html rename to tests/wpt/tests/css/CSS2/floats/float-nowrap-1-notref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-1.html b/tests/wpt/tests/css/CSS2/floats/float-nowrap-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-1.html rename to tests/wpt/tests/css/CSS2/floats/float-nowrap-1.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-2.html b/tests/wpt/tests/css/CSS2/floats/float-nowrap-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-2.html rename to tests/wpt/tests/css/CSS2/floats/float-nowrap-2.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-3-ref.html b/tests/wpt/tests/css/CSS2/floats/float-nowrap-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-3-ref.html rename to tests/wpt/tests/css/CSS2/floats/float-nowrap-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-3.html b/tests/wpt/tests/css/CSS2/floats/float-nowrap-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-3.html rename to tests/wpt/tests/css/CSS2/floats/float-nowrap-3.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-4-ref.html b/tests/wpt/tests/css/CSS2/floats/float-nowrap-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-4-ref.html rename to tests/wpt/tests/css/CSS2/floats/float-nowrap-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-4.html b/tests/wpt/tests/css/CSS2/floats/float-nowrap-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-4.html rename to tests/wpt/tests/css/CSS2/floats/float-nowrap-4.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-5-ref.html b/tests/wpt/tests/css/CSS2/floats/float-nowrap-5-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-5-ref.html rename to tests/wpt/tests/css/CSS2/floats/float-nowrap-5-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-5.html b/tests/wpt/tests/css/CSS2/floats/float-nowrap-5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-5.html rename to tests/wpt/tests/css/CSS2/floats/float-nowrap-5.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-6.html b/tests/wpt/tests/css/CSS2/floats/float-nowrap-6.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-6.html rename to tests/wpt/tests/css/CSS2/floats/float-nowrap-6.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-7.html b/tests/wpt/tests/css/CSS2/floats/float-nowrap-7.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-7.html rename to tests/wpt/tests/css/CSS2/floats/float-nowrap-7.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-8.html b/tests/wpt/tests/css/CSS2/floats/float-nowrap-8.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-8.html rename to tests/wpt/tests/css/CSS2/floats/float-nowrap-8.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-9.html b/tests/wpt/tests/css/CSS2/floats/float-nowrap-9.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-nowrap-9.html rename to tests/wpt/tests/css/CSS2/floats/float-nowrap-9.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-paint-relayout.html b/tests/wpt/tests/css/CSS2/floats/float-paint-relayout.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-paint-relayout.html rename to tests/wpt/tests/css/CSS2/floats/float-paint-relayout.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-root-ref.html b/tests/wpt/tests/css/CSS2/floats/float-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-root-ref.html rename to tests/wpt/tests/css/CSS2/floats/float-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-root.html b/tests/wpt/tests/css/CSS2/floats/float-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-root.html rename to tests/wpt/tests/css/CSS2/floats/float-root.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-table-align-left-quirk-ref.html b/tests/wpt/tests/css/CSS2/floats/float-table-align-left-quirk-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-table-align-left-quirk-ref.html rename to tests/wpt/tests/css/CSS2/floats/float-table-align-left-quirk-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-table-align-left-quirk.html b/tests/wpt/tests/css/CSS2/floats/float-table-align-left-quirk.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-table-align-left-quirk.html rename to tests/wpt/tests/css/CSS2/floats/float-table-align-left-quirk.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-under-flatten-under-preserve-3d.html b/tests/wpt/tests/css/CSS2/floats/float-under-flatten-under-preserve-3d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-under-flatten-under-preserve-3d.html rename to tests/wpt/tests/css/CSS2/floats/float-under-flatten-under-preserve-3d.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-with-absolutely-positioned-child-with-static-inset-ref.html b/tests/wpt/tests/css/CSS2/floats/float-with-absolutely-positioned-child-with-static-inset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-with-absolutely-positioned-child-with-static-inset-ref.html rename to tests/wpt/tests/css/CSS2/floats/float-with-absolutely-positioned-child-with-static-inset-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/float-with-absolutely-positioned-child-with-static-inset.html b/tests/wpt/tests/css/CSS2/floats/float-with-absolutely-positioned-child-with-static-inset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/float-with-absolutely-positioned-child-with-static-inset.html rename to tests/wpt/tests/css/CSS2/floats/float-with-absolutely-positioned-child-with-static-inset.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floated-table-wider-than-specified.html b/tests/wpt/tests/css/CSS2/floats/floated-table-wider-than-specified.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floated-table-wider-than-specified.html rename to tests/wpt/tests/css/CSS2/floats/floated-table-wider-than-specified.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-in-table-caption-001-ref.html b/tests/wpt/tests/css/CSS2/floats/floats-in-table-caption-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-in-table-caption-001-ref.html rename to tests/wpt/tests/css/CSS2/floats/floats-in-table-caption-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-in-table-caption-001.html b/tests/wpt/tests/css/CSS2/floats/floats-in-table-caption-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-in-table-caption-001.html rename to tests/wpt/tests/css/CSS2/floats/floats-in-table-caption-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-line-wrap-shifted-001-ref.html b/tests/wpt/tests/css/CSS2/floats/floats-line-wrap-shifted-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-line-wrap-shifted-001-ref.html rename to tests/wpt/tests/css/CSS2/floats/floats-line-wrap-shifted-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-line-wrap-shifted-001.html b/tests/wpt/tests/css/CSS2/floats/floats-line-wrap-shifted-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-line-wrap-shifted-001.html rename to tests/wpt/tests/css/CSS2/floats/floats-line-wrap-shifted-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-001.html b/tests/wpt/tests/css/CSS2/floats/floats-placement-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-001.html rename to tests/wpt/tests/css/CSS2/floats/floats-placement-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-002.html b/tests/wpt/tests/css/CSS2/floats/floats-placement-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-002.html rename to tests/wpt/tests/css/CSS2/floats/floats-placement-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-003.html b/tests/wpt/tests/css/CSS2/floats/floats-placement-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-003.html rename to tests/wpt/tests/css/CSS2/floats/floats-placement-003.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-004.html b/tests/wpt/tests/css/CSS2/floats/floats-placement-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-004.html rename to tests/wpt/tests/css/CSS2/floats/floats-placement-004.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-005-ref.html b/tests/wpt/tests/css/CSS2/floats/floats-placement-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-005-ref.html rename to tests/wpt/tests/css/CSS2/floats/floats-placement-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-005.html b/tests/wpt/tests/css/CSS2/floats/floats-placement-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-005.html rename to tests/wpt/tests/css/CSS2/floats/floats-placement-005.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-006.html b/tests/wpt/tests/css/CSS2/floats/floats-placement-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-006.html rename to tests/wpt/tests/css/CSS2/floats/floats-placement-006.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-007.html b/tests/wpt/tests/css/CSS2/floats/floats-placement-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-007.html rename to tests/wpt/tests/css/CSS2/floats/floats-placement-007.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-008.html b/tests/wpt/tests/css/CSS2/floats/floats-placement-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-008.html rename to tests/wpt/tests/css/CSS2/floats/floats-placement-008.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-001-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-001a.xht b/tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-001a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-001a.xht rename to tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-001a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-001b.xht b/tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-001b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-001b.xht rename to tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-001b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-001c.xht b/tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-001c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-001c.xht rename to tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-001c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-003-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-003-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-003.xht b/tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-003.xht rename to tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-004-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-004-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-004-ref2.xht b/tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-004-ref2.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-004-ref2.xht rename to tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-004-ref2.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-004.xht b/tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-placement-vertical-004.xht rename to tests/wpt/tests/css/CSS2/floats/floats-placement-vertical-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-left-001-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-left-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-left-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-left-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-left-001.xht b/tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-left-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-left-001.xht rename to tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-left-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-left-002-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-left-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-left-002-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-left-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-left-002.xht b/tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-left-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-left-002.xht rename to tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-left-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-right-001-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-right-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-right-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-right-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-right-001.xht b/tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-right-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-right-001.xht rename to tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-right-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-right-002-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-right-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-right-002-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-right-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-right-002.xht b/tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-right-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule3-outside-right-002.xht rename to tests/wpt/tests/css/CSS2/floats/floats-rule3-outside-right-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule7-outside-left-001-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-rule7-outside-left-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule7-outside-left-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-rule7-outside-left-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule7-outside-left-001.xht b/tests/wpt/tests/css/CSS2/floats/floats-rule7-outside-left-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule7-outside-left-001.xht rename to tests/wpt/tests/css/CSS2/floats/floats-rule7-outside-left-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule7-outside-right-001-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-rule7-outside-right-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule7-outside-right-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-rule7-outside-right-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule7-outside-right-001.xht b/tests/wpt/tests/css/CSS2/floats/floats-rule7-outside-right-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-rule7-outside-right-001.xht rename to tests/wpt/tests/css/CSS2/floats/floats-rule7-outside-right-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-saturated-position-crash.html b/tests/wpt/tests/css/CSS2/floats/floats-saturated-position-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-saturated-position-crash.html rename to tests/wpt/tests/css/CSS2/floats/floats-saturated-position-crash.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-left-overflow-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-left-overflow-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-left-overflow-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-left-overflow-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-left-overflow.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-left-overflow.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-left-overflow.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-left-overflow.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-left-table-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-left-table-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-left-table-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-left-table-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-left-table.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-left-table.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-left-table.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-left-table.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-right-overflow-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-right-overflow-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-right-overflow-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-right-overflow-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-right-overflow.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-right-overflow.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-right-overflow.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-right-overflow.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-right-table-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-right-table-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-right-table-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-right-table-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-right-table.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-right-table.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-001-right-table.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-001-right-table.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-002-left-overflow.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-002-left-overflow.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-002-left-overflow.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-002-left-overflow.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-002-left-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-002-left-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-002-left-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-002-left-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-002-left-table.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-002-left-table.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-002-left-table.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-002-left-table.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-002-right-overflow.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-002-right-overflow.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-002-right-overflow.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-002-right-overflow.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-002-right-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-002-right-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-002-right-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-002-right-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-002-right-table.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-002-right-table.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-002-right-table.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-002-right-table.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-left-overflow-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-left-overflow-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-left-overflow-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-left-overflow-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-left-overflow.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-left-overflow.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-left-overflow.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-left-overflow.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-left-table-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-left-table-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-left-table-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-left-table-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-left-table.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-left-table.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-left-table.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-left-table.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-right-overflow-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-right-overflow-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-right-overflow-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-right-overflow-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-right-overflow.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-right-overflow.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-right-overflow.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-right-overflow.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-right-table-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-right-table-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-right-table-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-right-table-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-right-table.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-right-table.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-003-right-table.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-003-right-table.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-004-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-004-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-004.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-004.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-005-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-005-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-005.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-005.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-006-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-006-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-006.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-006.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-007-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-007-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-007.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-007.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-outside-001-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-outside-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-outside-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-outside-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-outside-001.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-outside-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-outside-001.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-outside-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-001-ref.html b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-001-ref.html rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-001.html b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-001.html rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-001a.tentative.html b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-001a.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-001a.tentative.html rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-001a.tentative.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-002-ref.html b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-002-ref.html rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-002.tentative.html b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-002.tentative.html rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-003-ref.html b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-003-ref.html rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-003.tentative.html b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-003.tentative.html rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-004.html b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-004.html rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-004.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-005.html b/tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-bfc-with-margin-005.html rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-bfc-with-margin-005.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-001l-notref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-001l-notref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-001l-notref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-001l-notref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-001l-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-001l-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-001l-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-001l-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-001r-notref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-001r-notref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-001r-notref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-001r-notref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-001r-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-001r-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-001r-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-001r-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-002l-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-002l-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-002l-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-002l-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-002r-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-002r-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-002r-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-002r-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-003l-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-003l-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-003l-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-003l-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-003r-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-003r-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-003r-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-003r-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-bfc-001l.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-bfc-001l.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-bfc-001l.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-bfc-001l.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-bfc-001r.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-bfc-001r.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-bfc-001r.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-bfc-001r.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-bfc-002l.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-bfc-002l.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-bfc-002l.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-bfc-002l.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-bfc-002r.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-bfc-002r.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-bfc-002r.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-bfc-002r.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-bfc-003l.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-bfc-003l.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-bfc-003l.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-bfc-003l.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-bfc-003r.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-bfc-003r.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-bfc-003r.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-bfc-003r.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-inline-001l.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-inline-001l.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-inline-001l.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-inline-001l.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-inline-001r.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-inline-001r.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-inline-001r.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-inline-001r.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-inline-002l.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-inline-002l.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-inline-002l.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-inline-002l.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-inline-002r.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-inline-002r.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-inline-002r.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-inline-002r.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-inline-003l.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-inline-003l.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-inline-003l.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-inline-003l.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-inline-003r.xht b/tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-inline-003r.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-wrap-top-below-inline-003r.xht rename to tests/wpt/tests/css/CSS2/floats/floats-wrap-top-below-inline-003r.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-zero-height-wrap-001-ref.xht b/tests/wpt/tests/css/CSS2/floats/floats-zero-height-wrap-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-zero-height-wrap-001-ref.xht rename to tests/wpt/tests/css/CSS2/floats/floats-zero-height-wrap-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-zero-height-wrap-001.xht b/tests/wpt/tests/css/CSS2/floats/floats-zero-height-wrap-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-zero-height-wrap-001.xht rename to tests/wpt/tests/css/CSS2/floats/floats-zero-height-wrap-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-zero-height-wrap-002.xht b/tests/wpt/tests/css/CSS2/floats/floats-zero-height-wrap-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/floats-zero-height-wrap-002.xht rename to tests/wpt/tests/css/CSS2/floats/floats-zero-height-wrap-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/hit-test-floats-001.html b/tests/wpt/tests/css/CSS2/floats/hit-test-floats-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/hit-test-floats-001.html rename to tests/wpt/tests/css/CSS2/floats/hit-test-floats-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/hit-test-floats-002.html b/tests/wpt/tests/css/CSS2/floats/hit-test-floats-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/hit-test-floats-002.html rename to tests/wpt/tests/css/CSS2/floats/hit-test-floats-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/hit-test-floats-003.html b/tests/wpt/tests/css/CSS2/floats/hit-test-floats-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/hit-test-floats-003.html rename to tests/wpt/tests/css/CSS2/floats/hit-test-floats-003.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/hit-test-floats-004.html b/tests/wpt/tests/css/CSS2/floats/hit-test-floats-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/hit-test-floats-004.html rename to tests/wpt/tests/css/CSS2/floats/hit-test-floats-004.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/hit-test-floats-005.html b/tests/wpt/tests/css/CSS2/floats/hit-test-floats-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/hit-test-floats-005.html rename to tests/wpt/tests/css/CSS2/floats/hit-test-floats-005.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/intrinsic-size-float-and-line.html b/tests/wpt/tests/css/CSS2/floats/intrinsic-size-float-and-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/intrinsic-size-float-and-line.html rename to tests/wpt/tests/css/CSS2/floats/intrinsic-size-float-and-line.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/line-pushed-by-floats-crash.html b/tests/wpt/tests/css/CSS2/floats/line-pushed-by-floats-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/line-pushed-by-floats-crash.html rename to tests/wpt/tests/css/CSS2/floats/line-pushed-by-floats-crash.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/list-item-taller-than-opportunity-001.html b/tests/wpt/tests/css/CSS2/floats/list-item-taller-than-opportunity-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/list-item-taller-than-opportunity-001.html rename to tests/wpt/tests/css/CSS2/floats/list-item-taller-than-opportunity-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/negative-block-margin-pushing-float-out-of-block-formatting-context-ref.html b/tests/wpt/tests/css/CSS2/floats/negative-block-margin-pushing-float-out-of-block-formatting-context-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/negative-block-margin-pushing-float-out-of-block-formatting-context-ref.html rename to tests/wpt/tests/css/CSS2/floats/negative-block-margin-pushing-float-out-of-block-formatting-context-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/negative-block-margin-pushing-float-out-of-block-formatting-context.html b/tests/wpt/tests/css/CSS2/floats/negative-block-margin-pushing-float-out-of-block-formatting-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/negative-block-margin-pushing-float-out-of-block-formatting-context.html rename to tests/wpt/tests/css/CSS2/floats/negative-block-margin-pushing-float-out-of-block-formatting-context.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/negative-margin-float-positioning.html b/tests/wpt/tests/css/CSS2/floats/negative-margin-float-positioning.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/negative-margin-float-positioning.html rename to tests/wpt/tests/css/CSS2/floats/negative-margin-float-positioning.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-beside-adjoining-float-2.html b/tests/wpt/tests/css/CSS2/floats/new-fc-beside-adjoining-float-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-beside-adjoining-float-2.html rename to tests/wpt/tests/css/CSS2/floats/new-fc-beside-adjoining-float-2.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-beside-adjoining-float.html b/tests/wpt/tests/css/CSS2/floats/new-fc-beside-adjoining-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-beside-adjoining-float.html rename to tests/wpt/tests/css/CSS2/floats/new-fc-beside-adjoining-float.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-beside-float-with-margin-rtl.html b/tests/wpt/tests/css/CSS2/floats/new-fc-beside-float-with-margin-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-beside-float-with-margin-rtl.html rename to tests/wpt/tests/css/CSS2/floats/new-fc-beside-float-with-margin-rtl.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-beside-float-with-margin.html b/tests/wpt/tests/css/CSS2/floats/new-fc-beside-float-with-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-beside-float-with-margin.html rename to tests/wpt/tests/css/CSS2/floats/new-fc-beside-float-with-margin.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-relayout.html b/tests/wpt/tests/css/CSS2/floats/new-fc-relayout.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-relayout.html rename to tests/wpt/tests/css/CSS2/floats/new-fc-relayout.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-separates-from-float-2.html b/tests/wpt/tests/css/CSS2/floats/new-fc-separates-from-float-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-separates-from-float-2.html rename to tests/wpt/tests/css/CSS2/floats/new-fc-separates-from-float-2.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-separates-from-float-3.html b/tests/wpt/tests/css/CSS2/floats/new-fc-separates-from-float-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-separates-from-float-3.html rename to tests/wpt/tests/css/CSS2/floats/new-fc-separates-from-float-3.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-separates-from-float.html b/tests/wpt/tests/css/CSS2/floats/new-fc-separates-from-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-separates-from-float.html rename to tests/wpt/tests/css/CSS2/floats/new-fc-separates-from-float.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/overflow-scroll-float-paint-order-ref.html b/tests/wpt/tests/css/CSS2/floats/overflow-scroll-float-paint-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/overflow-scroll-float-paint-order-ref.html rename to tests/wpt/tests/css/CSS2/floats/overflow-scroll-float-paint-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/overflow-scroll-float-paint-order.html b/tests/wpt/tests/css/CSS2/floats/overflow-scroll-float-paint-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/overflow-scroll-float-paint-order.html rename to tests/wpt/tests/css/CSS2/floats/overflow-scroll-float-paint-order.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/overhanging-float-paint-order-ref.html b/tests/wpt/tests/css/CSS2/floats/overhanging-float-paint-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/overhanging-float-paint-order-ref.html rename to tests/wpt/tests/css/CSS2/floats/overhanging-float-paint-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/overhanging-float-paint-order.html b/tests/wpt/tests/css/CSS2/floats/overhanging-float-paint-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/overhanging-float-paint-order.html rename to tests/wpt/tests/css/CSS2/floats/overhanging-float-paint-order.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/remove-block-between-inline-and-float.html b/tests/wpt/tests/css/CSS2/floats/remove-block-between-inline-and-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/remove-block-between-inline-and-float.html rename to tests/wpt/tests/css/CSS2/floats/remove-block-between-inline-and-float.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/remove-float-in-first-line.html b/tests/wpt/tests/css/CSS2/floats/remove-float-in-first-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/remove-float-in-first-line.html rename to tests/wpt/tests/css/CSS2/floats/remove-float-in-first-line.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/remove-float-then-abspos-in-inline.html b/tests/wpt/tests/css/CSS2/floats/remove-float-then-abspos-in-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/remove-float-then-abspos-in-inline.html rename to tests/wpt/tests/css/CSS2/floats/remove-float-then-abspos-in-inline.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/zero-available-space-float-positioning.html b/tests/wpt/tests/css/CSS2/floats/zero-available-space-float-positioning.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/zero-available-space-float-positioning.html rename to tests/wpt/tests/css/CSS2/floats/zero-available-space-float-positioning.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/zero-space-between-floats-001.html b/tests/wpt/tests/css/CSS2/floats/zero-space-between-floats-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/zero-space-between-floats-001.html rename to tests/wpt/tests/css/CSS2/floats/zero-space-between-floats-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/zero-space-between-floats-002.html b/tests/wpt/tests/css/CSS2/floats/zero-space-between-floats-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/zero-space-between-floats-002.html rename to tests/wpt/tests/css/CSS2/floats/zero-space-between-floats-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/zero-space-between-floats-003.html b/tests/wpt/tests/css/CSS2/floats/zero-space-between-floats-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/zero-space-between-floats-003.html rename to tests/wpt/tests/css/CSS2/floats/zero-space-between-floats-003.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/zero-space-between-floats-004.html b/tests/wpt/tests/css/CSS2/floats/zero-space-between-floats-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/zero-space-between-floats-004.html rename to tests/wpt/tests/css/CSS2/floats/zero-space-between-floats-004.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/zero-width-floats-positioning.tentative.html b/tests/wpt/tests/css/CSS2/floats/zero-width-floats-positioning.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/zero-width-floats-positioning.tentative.html rename to tests/wpt/tests/css/CSS2/floats/zero-width-floats-positioning.tentative.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/zero-width-floats.html b/tests/wpt/tests/css/CSS2/floats/zero-width-floats.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/floats/zero-width-floats.html rename to tests/wpt/tests/css/CSS2/floats/zero-width-floats.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-003-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-003-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-004.xht b/tests/wpt/tests/css/CSS2/fonts/font-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-004.xht rename to tests/wpt/tests/css/CSS2/fonts/font-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-005.xht b/tests/wpt/tests/css/CSS2/fonts/font-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-005.xht rename to tests/wpt/tests/css/CSS2/fonts/font-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-006.xht b/tests/wpt/tests/css/CSS2/fonts/font-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-006.xht rename to tests/wpt/tests/css/CSS2/fonts/font-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-007.xht b/tests/wpt/tests/css/CSS2/fonts/font-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-007.xht rename to tests/wpt/tests/css/CSS2/fonts/font-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-008.xht b/tests/wpt/tests/css/CSS2/fonts/font-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-008.xht rename to tests/wpt/tests/css/CSS2/fonts/font-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-009.xht b/tests/wpt/tests/css/CSS2/fonts/font-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-009.xht rename to tests/wpt/tests/css/CSS2/fonts/font-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-010.xht b/tests/wpt/tests/css/CSS2/fonts/font-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-010.xht rename to tests/wpt/tests/css/CSS2/fonts/font-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-011.xht b/tests/wpt/tests/css/CSS2/fonts/font-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-011.xht rename to tests/wpt/tests/css/CSS2/fonts/font-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-012.xht b/tests/wpt/tests/css/CSS2/fonts/font-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-012.xht rename to tests/wpt/tests/css/CSS2/fonts/font-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-013.xht b/tests/wpt/tests/css/CSS2/fonts/font-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-013.xht rename to tests/wpt/tests/css/CSS2/fonts/font-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-014.xht b/tests/wpt/tests/css/CSS2/fonts/font-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-014.xht rename to tests/wpt/tests/css/CSS2/fonts/font-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-015.xht b/tests/wpt/tests/css/CSS2/fonts/font-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-015.xht rename to tests/wpt/tests/css/CSS2/fonts/font-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-016.xht b/tests/wpt/tests/css/CSS2/fonts/font-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-016.xht rename to tests/wpt/tests/css/CSS2/fonts/font-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-017.xht b/tests/wpt/tests/css/CSS2/fonts/font-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-017.xht rename to tests/wpt/tests/css/CSS2/fonts/font-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-018.xht b/tests/wpt/tests/css/CSS2/fonts/font-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-018.xht rename to tests/wpt/tests/css/CSS2/fonts/font-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-019.xht b/tests/wpt/tests/css/CSS2/fonts/font-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-019.xht rename to tests/wpt/tests/css/CSS2/fonts/font-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-020.xht b/tests/wpt/tests/css/CSS2/fonts/font-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-020.xht rename to tests/wpt/tests/css/CSS2/fonts/font-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-021.xht b/tests/wpt/tests/css/CSS2/fonts/font-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-021.xht rename to tests/wpt/tests/css/CSS2/fonts/font-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-022.xht b/tests/wpt/tests/css/CSS2/fonts/font-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-022.xht rename to tests/wpt/tests/css/CSS2/fonts/font-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-023.xht b/tests/wpt/tests/css/CSS2/fonts/font-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-023.xht rename to tests/wpt/tests/css/CSS2/fonts/font-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-024.xht b/tests/wpt/tests/css/CSS2/fonts/font-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-024.xht rename to tests/wpt/tests/css/CSS2/fonts/font-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-025.xht b/tests/wpt/tests/css/CSS2/fonts/font-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-025.xht rename to tests/wpt/tests/css/CSS2/fonts/font-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-026.xht b/tests/wpt/tests/css/CSS2/fonts/font-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-026.xht rename to tests/wpt/tests/css/CSS2/fonts/font-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-027.xht b/tests/wpt/tests/css/CSS2/fonts/font-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-027.xht rename to tests/wpt/tests/css/CSS2/fonts/font-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-028.xht b/tests/wpt/tests/css/CSS2/fonts/font-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-028.xht rename to tests/wpt/tests/css/CSS2/fonts/font-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-029.xht b/tests/wpt/tests/css/CSS2/fonts/font-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-029.xht rename to tests/wpt/tests/css/CSS2/fonts/font-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-030.xht b/tests/wpt/tests/css/CSS2/fonts/font-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-030.xht rename to tests/wpt/tests/css/CSS2/fonts/font-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-031.xht b/tests/wpt/tests/css/CSS2/fonts/font-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-031.xht rename to tests/wpt/tests/css/CSS2/fonts/font-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-032.xht b/tests/wpt/tests/css/CSS2/fonts/font-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-032.xht rename to tests/wpt/tests/css/CSS2/fonts/font-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-033.xht b/tests/wpt/tests/css/CSS2/fonts/font-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-033.xht rename to tests/wpt/tests/css/CSS2/fonts/font-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-034.xht b/tests/wpt/tests/css/CSS2/fonts/font-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-034.xht rename to tests/wpt/tests/css/CSS2/fonts/font-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-035.xht b/tests/wpt/tests/css/CSS2/fonts/font-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-035.xht rename to tests/wpt/tests/css/CSS2/fonts/font-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-036.xht b/tests/wpt/tests/css/CSS2/fonts/font-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-036.xht rename to tests/wpt/tests/css/CSS2/fonts/font-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-037.xht b/tests/wpt/tests/css/CSS2/fonts/font-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-037.xht rename to tests/wpt/tests/css/CSS2/fonts/font-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-038.xht b/tests/wpt/tests/css/CSS2/fonts/font-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-038.xht rename to tests/wpt/tests/css/CSS2/fonts/font-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-039.xht b/tests/wpt/tests/css/CSS2/fonts/font-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-039.xht rename to tests/wpt/tests/css/CSS2/fonts/font-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-040.xht b/tests/wpt/tests/css/CSS2/fonts/font-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-040.xht rename to tests/wpt/tests/css/CSS2/fonts/font-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-041.xht b/tests/wpt/tests/css/CSS2/fonts/font-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-041.xht rename to tests/wpt/tests/css/CSS2/fonts/font-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-042.xht b/tests/wpt/tests/css/CSS2/fonts/font-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-042.xht rename to tests/wpt/tests/css/CSS2/fonts/font-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-043.xht b/tests/wpt/tests/css/CSS2/fonts/font-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-043.xht rename to tests/wpt/tests/css/CSS2/fonts/font-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-044.xht b/tests/wpt/tests/css/CSS2/fonts/font-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-044.xht rename to tests/wpt/tests/css/CSS2/fonts/font-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-045.xht b/tests/wpt/tests/css/CSS2/fonts/font-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-045.xht rename to tests/wpt/tests/css/CSS2/fonts/font-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-046.xht b/tests/wpt/tests/css/CSS2/fonts/font-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-046.xht rename to tests/wpt/tests/css/CSS2/fonts/font-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-047.xht b/tests/wpt/tests/css/CSS2/fonts/font-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-047.xht rename to tests/wpt/tests/css/CSS2/fonts/font-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-048.xht b/tests/wpt/tests/css/CSS2/fonts/font-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-048.xht rename to tests/wpt/tests/css/CSS2/fonts/font-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-049.xht b/tests/wpt/tests/css/CSS2/fonts/font-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-049.xht rename to tests/wpt/tests/css/CSS2/fonts/font-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-050.xht b/tests/wpt/tests/css/CSS2/fonts/font-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-050.xht rename to tests/wpt/tests/css/CSS2/fonts/font-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-051-ref.xht b/tests/wpt/tests/css/CSS2/fonts/font-051-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-051-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/font-051-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-051.xht b/tests/wpt/tests/css/CSS2/fonts/font-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-051.xht rename to tests/wpt/tests/css/CSS2/fonts/font-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-052.xht b/tests/wpt/tests/css/CSS2/fonts/font-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-052.xht rename to tests/wpt/tests/css/CSS2/fonts/font-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-144.xht b/tests/wpt/tests/css/CSS2/fonts/font-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-144.xht rename to tests/wpt/tests/css/CSS2/fonts/font-144.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-145.xht b/tests/wpt/tests/css/CSS2/fonts/font-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-145.xht rename to tests/wpt/tests/css/CSS2/fonts/font-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-146-ref.xht b/tests/wpt/tests/css/CSS2/fonts/font-146-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-146-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/font-146-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-146.xht b/tests/wpt/tests/css/CSS2/fonts/font-146.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-146.xht rename to tests/wpt/tests/css/CSS2/fonts/font-146.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-147.xht b/tests/wpt/tests/css/CSS2/fonts/font-147.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-147.xht rename to tests/wpt/tests/css/CSS2/fonts/font-147.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-148-ref.xht b/tests/wpt/tests/css/CSS2/fonts/font-148-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-148-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/font-148-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-148.xht b/tests/wpt/tests/css/CSS2/fonts/font-148.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-148.xht rename to tests/wpt/tests/css/CSS2/fonts/font-148.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-005.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-006.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-007.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-008.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-009.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-010.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-011.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-014.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-015.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-016.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-017.xht b/tests/wpt/tests/css/CSS2/fonts/font-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/fonts/font-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-004.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-004.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-005.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-005.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-006.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-006.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-007.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-007.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-008-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-family-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-008-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-family-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-008.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-008.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-009-ref.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-009-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-009.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-009.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-011-ref.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-011-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-011.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-011.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-012.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-012.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-013-ref.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-013-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-013.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-013.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-014.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-014.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-015.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-015.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-016.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-016.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-005.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-006.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-007.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-008.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-009.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-010.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-011.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-014.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-015.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-016.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-017.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-001-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-001-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-002-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-002-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-004.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-004.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-005-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-005-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-005.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-005.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-006-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-006-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-006.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-invalid-characters-006.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-invalid-characters-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-001-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-001-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-002a-ref.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-002a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-002a-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-002a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-002a.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-002a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-002a.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-002a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-004.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-004.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-004a.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-004a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-004a.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-004a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-005-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-005-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-005.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-005.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-006.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-006.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-007.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-007.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-009.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-009.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-010.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-010.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-011.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-011.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-012.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-012.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-013.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-013.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-014.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-014.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-015.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-015.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-016.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-016.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-017.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-rule-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-rule-017.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-rule-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-valid-characters-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-valid-characters-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-valid-characters-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-valid-characters-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-valid-characters-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-family-valid-characters-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-valid-characters-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-family-valid-characters-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-valid-characters-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-family-valid-characters-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-family-valid-characters-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-family-valid-characters-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-matching-rule-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-matching-rule-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-006.xht b/tests/wpt/tests/css/CSS2/fonts/font-matching-rule-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-006.xht rename to tests/wpt/tests/css/CSS2/fonts/font-matching-rule-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-008.xht b/tests/wpt/tests/css/CSS2/fonts/font-matching-rule-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-008.xht rename to tests/wpt/tests/css/CSS2/fonts/font-matching-rule-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-009.xht b/tests/wpt/tests/css/CSS2/fonts/font-matching-rule-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-009.xht rename to tests/wpt/tests/css/CSS2/fonts/font-matching-rule-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-010.xht b/tests/wpt/tests/css/CSS2/fonts/font-matching-rule-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-010.xht rename to tests/wpt/tests/css/CSS2/fonts/font-matching-rule-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-012.xht b/tests/wpt/tests/css/CSS2/fonts/font-matching-rule-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-012.xht rename to tests/wpt/tests/css/CSS2/fonts/font-matching-rule-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-013.xht b/tests/wpt/tests/css/CSS2/fonts/font-matching-rule-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-013.xht rename to tests/wpt/tests/css/CSS2/fonts/font-matching-rule-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-014.xht b/tests/wpt/tests/css/CSS2/fonts/font-matching-rule-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-matching-rule-014.xht rename to tests/wpt/tests/css/CSS2/fonts/font-matching-rule-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-004.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-004.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-005.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-005.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-006.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-006.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-007.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-007.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-012.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-012.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-013.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-013.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-014.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-014.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-015.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-015.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-016.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-016.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-017.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-017.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-018.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-018.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-023.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-023.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-024.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-024.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-025.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-025.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-026.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-026.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-027.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-027.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-028.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-028.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-029.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-029.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-034.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-034.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-035.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-035.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-036.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-036.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-037.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-037.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-038.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-038.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-039.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-039.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-040.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-040.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-045.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-045.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-046.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-046.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-047.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-047.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-048.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-048.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-049.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-049.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-050.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-050.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-051.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-051.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-056.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-056.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-057.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-057.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-058.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-058.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-059.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-059.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-060.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-060.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-061.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-061.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-062.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-062.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-067.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-067.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-068.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-068.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-069.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-069.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-070.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-070.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-071.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-071.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-072.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-072.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-073.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-073.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-078.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-078.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-079.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-079.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-080.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-080.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-081.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-081.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-082.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-082.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-083.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-083.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-084.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-084.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-089.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-089.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-090.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-090.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-091.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-091.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-092.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-092.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-093.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-093.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-094.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-094.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-095.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-095.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-100.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-100.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-101.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-101.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-102.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-102.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-103.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-103.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-104.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-104.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-105.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-105.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-106.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-106.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-107.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-107.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-108.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-108.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-109.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-109.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-110.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-110.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-111.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-111.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-112.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-112.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-113.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-113.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-114.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-114.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-115.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-115.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-116.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-116.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-117.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-117.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-118.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-118.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-119.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-119.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-120-ref.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-120-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-120-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-120-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-120.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-120.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-121-ref.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-121-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-121-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-121-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-121.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-121.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-122-ref.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-122-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-122-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-122-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-122.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-122.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-123-ref.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-123-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-123-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-123-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-123.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-123.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-124.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-124.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-124.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-005.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-006.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-007.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-008.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-009.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-010.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-011.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-014.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-015.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-016.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-017.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-rule-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-rule-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-rule-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-rule-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-rule-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-rule-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-rule-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-rule-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-rule-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-rule-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-rule-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-rule-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-rule-004.xht b/tests/wpt/tests/css/CSS2/fonts/font-size-rule-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-size-rule-004.xht rename to tests/wpt/tests/css/CSS2/fonts/font-size-rule-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-004.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-004.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-001-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-001-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-005.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-006.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-007.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-008.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-009.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-010.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-011.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-014.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-015.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-016.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-017.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-rule-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-style-rule-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-style-rule-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-style-rule-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-systemfont-rule-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-systemfont-rule-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-systemfont-rule-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-systemfont-rule-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-systemfont-rule-004.xht b/tests/wpt/tests/css/CSS2/fonts/font-systemfont-rule-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-systemfont-rule-004.xht rename to tests/wpt/tests/css/CSS2/fonts/font-systemfont-rule-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-001-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-variant-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-001-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-variant-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-004.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-004.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-005.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-006.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-007.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-008.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-009.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-010.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-011.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-014.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-015.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-016.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-017.xht b/tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-variant-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/fonts/font-variant-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-008.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-008.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-010.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-010.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-011.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-011.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-012.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-012.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-013.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-013.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-014.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-014.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-015.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-015.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-016.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-016.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-017.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-017.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-018.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-018.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-100-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-weight-100-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-100-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-weight-100-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-900-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-weight-900-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-900-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-weight-900-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-005.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-006.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-007.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-008.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-009.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-010.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-011.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-014.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-015.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-016.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-017.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-bold-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-weight-bold-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-bold-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-weight-bold-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-normal-ref.html b/tests/wpt/tests/css/CSS2/fonts/font-weight-normal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-normal-ref.html rename to tests/wpt/tests/css/CSS2/fonts/font-weight-normal-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-001.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-rule-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-001.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-rule-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-002.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-rule-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-002.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-rule-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-003.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-rule-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-003.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-rule-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-004.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-rule-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-004.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-rule-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-005.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-rule-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-005.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-rule-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-006.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-rule-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-006.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-rule-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-007.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-rule-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-007.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-rule-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-008.xht b/tests/wpt/tests/css/CSS2/fonts/font-weight-rule-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/font-weight-rule-008.xht rename to tests/wpt/tests/css/CSS2/fonts/font-weight-rule-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-009.xht b/tests/wpt/tests/css/CSS2/fonts/fonts-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-009.xht rename to tests/wpt/tests/css/CSS2/fonts/fonts-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-010-ref.xht b/tests/wpt/tests/css/CSS2/fonts/fonts-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-010-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/fonts-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-010.xht b/tests/wpt/tests/css/CSS2/fonts/fonts-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-010.xht rename to tests/wpt/tests/css/CSS2/fonts/fonts-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-011-ref.xht b/tests/wpt/tests/css/CSS2/fonts/fonts-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-011-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/fonts-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-011.xht b/tests/wpt/tests/css/CSS2/fonts/fonts-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-011.xht rename to tests/wpt/tests/css/CSS2/fonts/fonts-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-012-ref.xht b/tests/wpt/tests/css/CSS2/fonts/fonts-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-012-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/fonts-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-012.xht b/tests/wpt/tests/css/CSS2/fonts/fonts-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-012.xht rename to tests/wpt/tests/css/CSS2/fonts/fonts-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-013-ref.xht b/tests/wpt/tests/css/CSS2/fonts/fonts-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-013-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/fonts-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-013.xht b/tests/wpt/tests/css/CSS2/fonts/fonts-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-013.xht rename to tests/wpt/tests/css/CSS2/fonts/fonts-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-014.xht b/tests/wpt/tests/css/CSS2/fonts/fonts-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/fonts-014.xht rename to tests/wpt/tests/css/CSS2/fonts/fonts-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/shand-font-000-ref.xht b/tests/wpt/tests/css/CSS2/fonts/shand-font-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/shand-font-000-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/shand-font-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/shand-font-000.xht b/tests/wpt/tests/css/CSS2/fonts/shand-font-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/shand-font-000.xht rename to tests/wpt/tests/css/CSS2/fonts/shand-font-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/shand-font-001.xht b/tests/wpt/tests/css/CSS2/fonts/shand-font-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/shand-font-001.xht rename to tests/wpt/tests/css/CSS2/fonts/shand-font-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/shand-font-002-ref.xht b/tests/wpt/tests/css/CSS2/fonts/shand-font-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/shand-font-002-ref.xht rename to tests/wpt/tests/css/CSS2/fonts/shand-font-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/shand-font-002.xht b/tests/wpt/tests/css/CSS2/fonts/shand-font-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/shand-font-002.xht rename to tests/wpt/tests/css/CSS2/fonts/shand-font-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/shand-font-003.xht b/tests/wpt/tests/css/CSS2/fonts/shand-font-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/shand-font-003.xht rename to tests/wpt/tests/css/CSS2/fonts/shand-font-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/1x1-green.png b/tests/wpt/tests/css/CSS2/fonts/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/fonts/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/fonts/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/fonts/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/fonts/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/fonts/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/fonts/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/fonts/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/1x1-red.png b/tests/wpt/tests/css/CSS2/fonts/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/fonts/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/1x1-white.png b/tests/wpt/tests/css/CSS2/fonts/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/fonts/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/fonts/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/fonts/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/60x60-green.png b/tests/wpt/tests/css/CSS2/fonts/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/fonts/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/a-green.css b/tests/wpt/tests/css/CSS2/fonts/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/a-green.css rename to tests/wpt/tests/css/CSS2/fonts/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/b-green.css b/tests/wpt/tests/css/CSS2/fonts/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/b-green.css rename to tests/wpt/tests/css/CSS2/fonts/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/black96x96.png b/tests/wpt/tests/css/CSS2/fonts/support/black96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/black96x96.png rename to tests/wpt/tests/css/CSS2/fonts/support/black96x96.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/blue15x15.png b/tests/wpt/tests/css/CSS2/fonts/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/fonts/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/c-red.css b/tests/wpt/tests/css/CSS2/fonts/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/c-red.css rename to tests/wpt/tests/css/CSS2/fonts/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/cat.png b/tests/wpt/tests/css/CSS2/fonts/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/cat.png rename to tests/wpt/tests/css/CSS2/fonts/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/diamond.png b/tests/wpt/tests/css/CSS2/fonts/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/diamond.png rename to tests/wpt/tests/css/CSS2/fonts/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/green15x15.png b/tests/wpt/tests/css/CSS2/fonts/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/green15x15.png rename to tests/wpt/tests/css/CSS2/fonts/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/fonts/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/fonts/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/fonts/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/fonts/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/fonts/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/fonts/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/fonts/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/fonts/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/ring.png b/tests/wpt/tests/css/CSS2/fonts/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/ring.png rename to tests/wpt/tests/css/CSS2/fonts/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/square-purple.png b/tests/wpt/tests/css/CSS2/fonts/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/square-purple.png rename to tests/wpt/tests/css/CSS2/fonts/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/square-teal.png b/tests/wpt/tests/css/CSS2/fonts/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/square-teal.png rename to tests/wpt/tests/css/CSS2/fonts/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/square-white.png b/tests/wpt/tests/css/CSS2/fonts/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/square-white.png rename to tests/wpt/tests/css/CSS2/fonts/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/fonts/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/fonts/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/swatch-green.png b/tests/wpt/tests/css/CSS2/fonts/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/fonts/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/fonts/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/fonts/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/fonts/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/fonts/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/swatch-red.png b/tests/wpt/tests/css/CSS2/fonts/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/fonts/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/swatch-white.png b/tests/wpt/tests/css/CSS2/fonts/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/fonts/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/fonts/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/fonts/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/test-bl.png b/tests/wpt/tests/css/CSS2/fonts/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/test-bl.png rename to tests/wpt/tests/css/CSS2/fonts/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/test-br.png b/tests/wpt/tests/css/CSS2/fonts/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/test-br.png rename to tests/wpt/tests/css/CSS2/fonts/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/test-outer.png b/tests/wpt/tests/css/CSS2/fonts/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/test-outer.png rename to tests/wpt/tests/css/CSS2/fonts/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/test-tl.png b/tests/wpt/tests/css/CSS2/fonts/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/test-tl.png rename to tests/wpt/tests/css/CSS2/fonts/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/fonts/support/test-tr.png b/tests/wpt/tests/css/CSS2/fonts/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/fonts/support/test-tr.png rename to tests/wpt/tests/css/CSS2/fonts/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-001.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-001.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-002.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-002.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-003.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-003.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-004.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-004.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-005.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-005.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-006.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-006.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-007.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-007.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-008.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-008.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-009.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-009.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-010.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-010.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-011.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-011.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-012.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-012.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-013.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-013.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-014.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-014.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-015.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-015.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-016.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-016.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-017.xht b/tests/wpt/tests/css/CSS2/generate/list-style-position-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/list-style-position-017.xht rename to tests/wpt/tests/css/CSS2/generate/list-style-position-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/1x1-green.png b/tests/wpt/tests/css/CSS2/generate/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/generate/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/generate/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/generate/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/generate/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/generate/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/generate/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/generate/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/1x1-red.png b/tests/wpt/tests/css/CSS2/generate/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/generate/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/1x1-white.png b/tests/wpt/tests/css/CSS2/generate/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/generate/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/generate/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/generate/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/60x60-green.png b/tests/wpt/tests/css/CSS2/generate/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/generate/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/a-green.css b/tests/wpt/tests/css/CSS2/generate/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/a-green.css rename to tests/wpt/tests/css/CSS2/generate/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/b-green.css b/tests/wpt/tests/css/CSS2/generate/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/b-green.css rename to tests/wpt/tests/css/CSS2/generate/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/bidi-list-style-image-001.png b/tests/wpt/tests/css/CSS2/generate/support/bidi-list-style-image-001.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/bidi-list-style-image-001.png rename to tests/wpt/tests/css/CSS2/generate/support/bidi-list-style-image-001.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/c-red.css b/tests/wpt/tests/css/CSS2/generate/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/c-red.css rename to tests/wpt/tests/css/CSS2/generate/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/cat.png b/tests/wpt/tests/css/CSS2/generate/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/cat.png rename to tests/wpt/tests/css/CSS2/generate/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/import-green.css b/tests/wpt/tests/css/CSS2/generate/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/import-green.css rename to tests/wpt/tests/css/CSS2/generate/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/import-red.css b/tests/wpt/tests/css/CSS2/generate/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/import-red.css rename to tests/wpt/tests/css/CSS2/generate/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/ruler-h-50%.png b/tests/wpt/tests/css/CSS2/generate/support/ruler-h-50%.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/ruler-h-50%.png rename to tests/wpt/tests/css/CSS2/generate/support/ruler-h-50%.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/ruler-h-50px.png b/tests/wpt/tests/css/CSS2/generate/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/ruler-h-50px.png rename to tests/wpt/tests/css/CSS2/generate/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/ruler-v-100px.png b/tests/wpt/tests/css/CSS2/generate/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/ruler-v-100px.png rename to tests/wpt/tests/css/CSS2/generate/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/ruler-v-50px.png b/tests/wpt/tests/css/CSS2/generate/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/ruler-v-50px.png rename to tests/wpt/tests/css/CSS2/generate/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/square-purple.png b/tests/wpt/tests/css/CSS2/generate/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/square-purple.png rename to tests/wpt/tests/css/CSS2/generate/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/square-teal.png b/tests/wpt/tests/css/CSS2/generate/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/square-teal.png rename to tests/wpt/tests/css/CSS2/generate/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/square-white.png b/tests/wpt/tests/css/CSS2/generate/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/square-white.png rename to tests/wpt/tests/css/CSS2/generate/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/support/swatch-green.png b/tests/wpt/tests/css/CSS2/generate/support/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/generate/support/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/support/swatch-red.png b/tests/wpt/tests/css/CSS2/generate/support/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/generate/support/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/generate/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/generate/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/swatch-green.png b/tests/wpt/tests/css/CSS2/generate/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/generate/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/generate/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/generate/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/generate/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/generate/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/swatch-red.png b/tests/wpt/tests/css/CSS2/generate/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/generate/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/swatch-white.png b/tests/wpt/tests/css/CSS2/generate/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/generate/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/generate/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/generate/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/test-bl.png b/tests/wpt/tests/css/CSS2/generate/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/test-bl.png rename to tests/wpt/tests/css/CSS2/generate/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/test-br.png b/tests/wpt/tests/css/CSS2/generate/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/test-br.png rename to tests/wpt/tests/css/CSS2/generate/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/test-inner-half-size.png b/tests/wpt/tests/css/CSS2/generate/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/test-inner-half-size.png rename to tests/wpt/tests/css/CSS2/generate/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/test-outer.png b/tests/wpt/tests/css/CSS2/generate/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/test-outer.png rename to tests/wpt/tests/css/CSS2/generate/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/test-tl.png b/tests/wpt/tests/css/CSS2/generate/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/test-tl.png rename to tests/wpt/tests/css/CSS2/generate/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generate/support/test-tr.png b/tests/wpt/tests/css/CSS2/generate/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generate/support/test-tr.png rename to tests/wpt/tests/css/CSS2/generate/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-001-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-001-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-001.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-002-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-002-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-002.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-003-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-003-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-003.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-003.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-005.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-005.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-006.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-006.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-007.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-007.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-008.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-008.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-009.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-009.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-010.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-010.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-011.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-011.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-012-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-012-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-012.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-012.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-013.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-013.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-014.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-014.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-015.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-015.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-016.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-016.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-017.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-017.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-018.xht b/tests/wpt/tests/css/CSS2/generated-content/after-content-display-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-content-display-018.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-content-display-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-inheritable-001-ref.html b/tests/wpt/tests/css/CSS2/generated-content/after-inheritable-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-inheritable-001-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/after-inheritable-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-inheritable-001.xht b/tests/wpt/tests/css/CSS2/generated-content/after-inheritable-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-inheritable-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-inheritable-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-inheritable-002-ref.html b/tests/wpt/tests/css/CSS2/generated-content/after-inheritable-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-inheritable-002-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/after-inheritable-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-inheritable-002.xht b/tests/wpt/tests/css/CSS2/generated-content/after-inheritable-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-inheritable-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-inheritable-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-location-001-ref.html b/tests/wpt/tests/css/CSS2/generated-content/after-location-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-location-001-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/after-location-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/after-location-001.xht b/tests/wpt/tests/css/CSS2/generated-content/after-location-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/after-location-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/after-location-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-001.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-002.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-011-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-011-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-011.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-011.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-display-types-001-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-display-types-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-display-types-001-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-display-types-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-display-types-001.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-display-types-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-display-types-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-display-types-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-dynamic-attr-001-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-dynamic-attr-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-dynamic-attr-001-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-dynamic-attr-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-dynamic-attr-001.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-dynamic-attr-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-dynamic-attr-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-dynamic-attr-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-dynamic-restyle-001-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-dynamic-restyle-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-dynamic-restyle-001-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-dynamic-restyle-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-dynamic-restyle-001.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-dynamic-restyle-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-dynamic-restyle-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-dynamic-restyle-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-floated-001-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-floated-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-floated-001-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-floated-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-floated-001.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-floated-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-floated-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-floated-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-images-001-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-images-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-images-001-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-images-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-images-001.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-images-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-images-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-images-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-positioned-001-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-positioned-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-positioned-001-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-positioned-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-positioned-001.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-positioned-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-positioned-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-positioned-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-positioned-002-ref.html b/tests/wpt/tests/css/CSS2/generated-content/before-after-positioned-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-positioned-002-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/before-after-positioned-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-positioned-002.html b/tests/wpt/tests/css/CSS2/generated-content/before-after-positioned-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-positioned-002.html rename to tests/wpt/tests/css/CSS2/generated-content/before-after-positioned-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-positioned-003.html b/tests/wpt/tests/css/CSS2/generated-content/before-after-positioned-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-positioned-003.html rename to tests/wpt/tests/css/CSS2/generated-content/before-after-positioned-003.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-positioned-004-ref.html b/tests/wpt/tests/css/CSS2/generated-content/before-after-positioned-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-positioned-004-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/before-after-positioned-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-positioned-004.html b/tests/wpt/tests/css/CSS2/generated-content/before-after-positioned-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-positioned-004.html rename to tests/wpt/tests/css/CSS2/generated-content/before-after-positioned-004.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-table-parts-001-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-table-parts-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-table-parts-001-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-table-parts-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-table-parts-001.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-table-parts-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-table-parts-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-table-parts-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-table-whitespace-001-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-table-whitespace-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-table-whitespace-001-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-table-whitespace-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-table-whitespace-001.xht b/tests/wpt/tests/css/CSS2/generated-content/before-after-table-whitespace-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-after-table-whitespace-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-after-table-whitespace-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-001.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-002.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-003-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-003-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-003.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-003.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-005.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-005.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-006.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-006.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-007.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-007.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-008.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-008.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-009.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-009.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-010.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-010.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-011.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-011.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-012.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-012.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-013.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-013.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-014.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-014.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-015.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-015.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-016.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-016.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-017.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-017.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-018.xht b/tests/wpt/tests/css/CSS2/generated-content/before-content-display-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-content-display-018.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-content-display-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-inheritable-001.xht b/tests/wpt/tests/css/CSS2/generated-content/before-inheritable-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-inheritable-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-inheritable-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-inheritable-002.xht b/tests/wpt/tests/css/CSS2/generated-content/before-inheritable-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-inheritable-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-inheritable-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-location-001-ref.html b/tests/wpt/tests/css/CSS2/generated-content/before-location-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-location-001-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/before-location-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/before-location-001.xht b/tests/wpt/tests/css/CSS2/generated-content/before-location-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/before-location-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/before-location-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/bidi-generated-content-001-ref.html b/tests/wpt/tests/css/CSS2/generated-content/bidi-generated-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/bidi-generated-content-001-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/bidi-generated-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/bidi-generated-content-001.xht b/tests/wpt/tests/css/CSS2/generated-content/bidi-generated-content-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/bidi-generated-content-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/bidi-generated-content-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/bidi-generated-content-002-ref.html b/tests/wpt/tests/css/CSS2/generated-content/bidi-generated-content-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/bidi-generated-content-002-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/bidi-generated-content-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/bidi-generated-content-002.xht b/tests/wpt/tests/css/CSS2/generated-content/bidi-generated-content-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/bidi-generated-content-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/bidi-generated-content-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-001-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-001-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-001.xht b/tests/wpt/tests/css/CSS2/generated-content/content-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-002.xht b/tests/wpt/tests/css/CSS2/generated-content/content-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-003-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-003-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-003.xht b/tests/wpt/tests/css/CSS2/generated-content/content-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-003.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-004.xht b/tests/wpt/tests/css/CSS2/generated-content/content-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-004.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-005-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-005-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-005.xht b/tests/wpt/tests/css/CSS2/generated-content/content-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-005.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-006-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-006-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-006.xht b/tests/wpt/tests/css/CSS2/generated-content/content-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-006.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-007-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-007-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-007.xht b/tests/wpt/tests/css/CSS2/generated-content/content-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-007.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-008.xht b/tests/wpt/tests/css/CSS2/generated-content/content-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-008.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-009.xht b/tests/wpt/tests/css/CSS2/generated-content/content-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-009.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-010-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-010-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-010.xht b/tests/wpt/tests/css/CSS2/generated-content/content-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-010.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-011-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-011-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-011.xht b/tests/wpt/tests/css/CSS2/generated-content/content-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-011.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-012-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-012-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-012.xht b/tests/wpt/tests/css/CSS2/generated-content/content-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-012.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-013-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-013-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-013.xht b/tests/wpt/tests/css/CSS2/generated-content/content-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-013.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-014-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-014-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-014.xht b/tests/wpt/tests/css/CSS2/generated-content/content-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-014.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-015-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-015-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-015.xht b/tests/wpt/tests/css/CSS2/generated-content/content-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-015.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-016-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-016-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-016.xht b/tests/wpt/tests/css/CSS2/generated-content/content-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-016.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-017-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-017-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-017.xht b/tests/wpt/tests/css/CSS2/generated-content/content-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-017.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-018.xht b/tests/wpt/tests/css/CSS2/generated-content/content-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-018.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-019.xht b/tests/wpt/tests/css/CSS2/generated-content/content-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-019.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-020.xht b/tests/wpt/tests/css/CSS2/generated-content/content-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-020.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-021-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-021-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-021.xht b/tests/wpt/tests/css/CSS2/generated-content/content-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-021.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-022-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-022-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-022.xht b/tests/wpt/tests/css/CSS2/generated-content/content-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-022.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-023-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-023-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-023.xht b/tests/wpt/tests/css/CSS2/generated-content/content-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-023.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-024.xht b/tests/wpt/tests/css/CSS2/generated-content/content-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-024.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-025.xht b/tests/wpt/tests/css/CSS2/generated-content/content-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-025.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-026-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-026-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-026-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-026-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-026.xht b/tests/wpt/tests/css/CSS2/generated-content/content-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-026.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-027-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-027-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-027.xht b/tests/wpt/tests/css/CSS2/generated-content/content-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-027.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-028-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-028-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-028-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-028-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-028.xht b/tests/wpt/tests/css/CSS2/generated-content/content-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-028.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-029-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-029-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-029-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-029-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-029.xht b/tests/wpt/tests/css/CSS2/generated-content/content-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-029.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-030-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-030-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-030-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-030-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-030.xht b/tests/wpt/tests/css/CSS2/generated-content/content-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-030.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-031-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-031-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-031-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-031-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-031.xht b/tests/wpt/tests/css/CSS2/generated-content/content-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-031.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-032-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-032-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-032-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-032-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-032.xht b/tests/wpt/tests/css/CSS2/generated-content/content-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-032.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-033-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-033-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-033-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-033-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-033.xht b/tests/wpt/tests/css/CSS2/generated-content/content-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-033.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-034.xht b/tests/wpt/tests/css/CSS2/generated-content/content-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-034.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-035.xht b/tests/wpt/tests/css/CSS2/generated-content/content-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-035.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-036.xht b/tests/wpt/tests/css/CSS2/generated-content/content-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-036.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-037-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-037-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-037-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-037-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-037.xht b/tests/wpt/tests/css/CSS2/generated-content/content-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-037.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-038.xht b/tests/wpt/tests/css/CSS2/generated-content/content-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-038.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-039.xht b/tests/wpt/tests/css/CSS2/generated-content/content-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-039.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-040-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-040-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-040-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-040-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-040.xht b/tests/wpt/tests/css/CSS2/generated-content/content-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-040.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-041-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-041-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-041-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-041-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-041.xht b/tests/wpt/tests/css/CSS2/generated-content/content-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-041.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-042-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-042-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-042-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-042-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-042.xht b/tests/wpt/tests/css/CSS2/generated-content/content-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-042.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-043-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-043-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-043-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-043-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-043.xht b/tests/wpt/tests/css/CSS2/generated-content/content-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-043.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-046.xht b/tests/wpt/tests/css/CSS2/generated-content/content-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-046.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-047-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-047-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-047-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-047-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-047.xht b/tests/wpt/tests/css/CSS2/generated-content/content-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-047.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-048-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-048-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-048-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-048-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-048.xht b/tests/wpt/tests/css/CSS2/generated-content/content-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-048.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-049.xht b/tests/wpt/tests/css/CSS2/generated-content/content-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-049.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-050-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-050-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-050-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-050-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-050.xht b/tests/wpt/tests/css/CSS2/generated-content/content-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-050.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-051.xht b/tests/wpt/tests/css/CSS2/generated-content/content-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-051.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-052-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-052-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-052-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-052-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-052.xht b/tests/wpt/tests/css/CSS2/generated-content/content-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-052.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-053-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-053-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-053-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-053-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-053.xht b/tests/wpt/tests/css/CSS2/generated-content/content-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-053.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-054.xht b/tests/wpt/tests/css/CSS2/generated-content/content-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-054.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-056.xht b/tests/wpt/tests/css/CSS2/generated-content/content-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-056.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-057.xht b/tests/wpt/tests/css/CSS2/generated-content/content-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-057.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-063-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-063-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-063-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-063-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-063.xht b/tests/wpt/tests/css/CSS2/generated-content/content-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-063.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-065.xht b/tests/wpt/tests/css/CSS2/generated-content/content-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-065.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-066.xht b/tests/wpt/tests/css/CSS2/generated-content/content-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-066.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-067.xht b/tests/wpt/tests/css/CSS2/generated-content/content-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-067.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-068-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-068-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-068-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-068-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-068.xht b/tests/wpt/tests/css/CSS2/generated-content/content-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-068.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-070-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-070-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-070-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-070-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-070.xht b/tests/wpt/tests/css/CSS2/generated-content/content-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-070.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-072-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-072-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-072-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-072-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-072.xht b/tests/wpt/tests/css/CSS2/generated-content/content-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-072.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-073-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-073-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-073-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-073-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-073.xht b/tests/wpt/tests/css/CSS2/generated-content/content-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-073.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-075-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-075-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-075-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-075-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-075.xht b/tests/wpt/tests/css/CSS2/generated-content/content-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-075.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-076.xht b/tests/wpt/tests/css/CSS2/generated-content/content-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-076.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-077.xht b/tests/wpt/tests/css/CSS2/generated-content/content-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-077.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-078.xht b/tests/wpt/tests/css/CSS2/generated-content/content-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-078.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-080-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-080-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-080-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-080-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-080.xht b/tests/wpt/tests/css/CSS2/generated-content/content-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-080.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-081-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-081-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-081-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-081-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-081.xht b/tests/wpt/tests/css/CSS2/generated-content/content-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-081.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-082-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-082-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-082-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-082-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-082.xht b/tests/wpt/tests/css/CSS2/generated-content/content-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-082.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-083-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-083-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-083-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-083-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-083.xht b/tests/wpt/tests/css/CSS2/generated-content/content-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-083.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-085.xht b/tests/wpt/tests/css/CSS2/generated-content/content-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-085.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-086.xht b/tests/wpt/tests/css/CSS2/generated-content/content-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-086.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-089-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-089-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-089-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-089-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-089.xht b/tests/wpt/tests/css/CSS2/generated-content/content-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-089.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-090-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-090-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-090-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-090-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-090.xht b/tests/wpt/tests/css/CSS2/generated-content/content-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-090.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-091-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-091-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-091-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-091-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-091.xht b/tests/wpt/tests/css/CSS2/generated-content/content-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-091.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-096-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-096-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-096-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-096-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-096.xht b/tests/wpt/tests/css/CSS2/generated-content/content-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-096.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-097-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-097-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-097-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-097-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-097.xht b/tests/wpt/tests/css/CSS2/generated-content/content-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-097.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-099.xht b/tests/wpt/tests/css/CSS2/generated-content/content-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-099.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-100-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-100-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-100-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-100-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-100.xht b/tests/wpt/tests/css/CSS2/generated-content/content-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-100.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-103-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-103-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-103-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-103-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-103.xht b/tests/wpt/tests/css/CSS2/generated-content/content-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-103.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-105.xht b/tests/wpt/tests/css/CSS2/generated-content/content-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-105.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-107.xht b/tests/wpt/tests/css/CSS2/generated-content/content-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-107.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-108.xht b/tests/wpt/tests/css/CSS2/generated-content/content-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-108.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-109.xht b/tests/wpt/tests/css/CSS2/generated-content/content-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-109.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-110.xht b/tests/wpt/tests/css/CSS2/generated-content/content-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-110.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-111.xht b/tests/wpt/tests/css/CSS2/generated-content/content-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-111.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-112.xht b/tests/wpt/tests/css/CSS2/generated-content/content-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-112.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-113-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-113-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-113-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-113-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-113.xht b/tests/wpt/tests/css/CSS2/generated-content/content-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-113.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-114.xht b/tests/wpt/tests/css/CSS2/generated-content/content-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-114.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-115.xht b/tests/wpt/tests/css/CSS2/generated-content/content-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-115.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-116.xht b/tests/wpt/tests/css/CSS2/generated-content/content-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-116.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-117.xht b/tests/wpt/tests/css/CSS2/generated-content/content-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-117.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-118.xht b/tests/wpt/tests/css/CSS2/generated-content/content-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-118.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-119.xht b/tests/wpt/tests/css/CSS2/generated-content/content-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-119.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-121.xht b/tests/wpt/tests/css/CSS2/generated-content/content-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-121.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-122.xht b/tests/wpt/tests/css/CSS2/generated-content/content-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-122.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-123.xht b/tests/wpt/tests/css/CSS2/generated-content/content-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-123.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-126-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-126-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-126-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-126-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-126.xht b/tests/wpt/tests/css/CSS2/generated-content/content-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-126.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-127.xht b/tests/wpt/tests/css/CSS2/generated-content/content-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-127.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-129.xht b/tests/wpt/tests/css/CSS2/generated-content/content-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-129.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-130.xht b/tests/wpt/tests/css/CSS2/generated-content/content-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-130.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-130.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-131.xht b/tests/wpt/tests/css/CSS2/generated-content/content-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-131.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-131.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-132-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-132-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-132-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-132-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-132.xht b/tests/wpt/tests/css/CSS2/generated-content/content-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-132.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-132.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-135-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-135-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-135-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-135-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-135.xht b/tests/wpt/tests/css/CSS2/generated-content/content-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-135.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-135.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-136-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-136-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-136-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-136-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-136.xht b/tests/wpt/tests/css/CSS2/generated-content/content-136.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-136.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-136.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-138.xht b/tests/wpt/tests/css/CSS2/generated-content/content-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-138.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-138.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-140.xht b/tests/wpt/tests/css/CSS2/generated-content/content-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-140.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-140.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-141-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-141-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-141-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-141-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-141.xht b/tests/wpt/tests/css/CSS2/generated-content/content-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-141.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-141.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-142.xht b/tests/wpt/tests/css/CSS2/generated-content/content-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-142.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-142.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-143-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-143-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-143-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-143-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-143.xht b/tests/wpt/tests/css/CSS2/generated-content/content-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-143.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-143.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-144-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-144-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-144-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-144-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-144.xht b/tests/wpt/tests/css/CSS2/generated-content/content-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-144.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-144.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-145.xht b/tests/wpt/tests/css/CSS2/generated-content/content-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-145.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-146.xht b/tests/wpt/tests/css/CSS2/generated-content/content-146.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-146.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-146.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-147-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-147-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-147-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-147-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-147.xht b/tests/wpt/tests/css/CSS2/generated-content/content-147.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-147.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-147.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-149-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-149-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-149-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-149-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-149.xht b/tests/wpt/tests/css/CSS2/generated-content/content-149.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-149.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-149.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-150-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-150-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-150-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-150-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-150.xht b/tests/wpt/tests/css/CSS2/generated-content/content-150.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-150.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-150.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-151.xht b/tests/wpt/tests/css/CSS2/generated-content/content-151.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-151.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-151.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-152.xht b/tests/wpt/tests/css/CSS2/generated-content/content-152.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-152.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-152.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-153.xht b/tests/wpt/tests/css/CSS2/generated-content/content-153.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-153.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-153.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-155-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-155-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-155-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-155-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-155.xht b/tests/wpt/tests/css/CSS2/generated-content/content-155.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-155.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-155.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-156-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-156-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-156-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-156-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-156.xht b/tests/wpt/tests/css/CSS2/generated-content/content-156.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-156.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-156.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-157.xht b/tests/wpt/tests/css/CSS2/generated-content/content-157.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-157.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-157.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-158-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-158-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-158-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-158-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-158.xht b/tests/wpt/tests/css/CSS2/generated-content/content-158.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-158.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-158.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-159-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-159-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-159-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-159-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-159.xht b/tests/wpt/tests/css/CSS2/generated-content/content-159.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-159.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-159.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-160.xht b/tests/wpt/tests/css/CSS2/generated-content/content-160.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-160.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-160.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-171-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-171-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-171-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-171-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-171.xht b/tests/wpt/tests/css/CSS2/generated-content/content-171.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-171.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-171.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-172-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-172-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-172-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-172-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-172.xht b/tests/wpt/tests/css/CSS2/generated-content/content-172.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-172.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-172.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-173-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-173-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-173-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-173-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-173.xht b/tests/wpt/tests/css/CSS2/generated-content/content-173.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-173.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-173.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-174-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-174-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-174-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-174-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-174.xht b/tests/wpt/tests/css/CSS2/generated-content/content-174.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-174.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-174.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-175-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-175-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-175-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-175-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-175.xht b/tests/wpt/tests/css/CSS2/generated-content/content-175.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-175.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-175.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-177-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-177-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-177-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-177-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-177.xht b/tests/wpt/tests/css/CSS2/generated-content/content-177.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-177.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-177.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-178.xht b/tests/wpt/tests/css/CSS2/generated-content/content-178.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-178.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-178.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-applies-to-001.xht b/tests/wpt/tests/css/CSS2/generated-content/content-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-attr-001.xht b/tests/wpt/tests/css/CSS2/generated-content/content-attr-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-attr-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-attr-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-attr-002.xht b/tests/wpt/tests/css/CSS2/generated-content/content-attr-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-attr-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-attr-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-attr-case-001.html b/tests/wpt/tests/css/CSS2/generated-content/content-attr-case-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-attr-case-001.html rename to tests/wpt/tests/css/CSS2/generated-content/content-attr-case-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-attr-case-002.xht b/tests/wpt/tests/css/CSS2/generated-content/content-attr-case-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-attr-case-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-attr-case-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-auto-reset-001-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-auto-reset-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-auto-reset-001-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-auto-reset-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-auto-reset-001.xht b/tests/wpt/tests/css/CSS2/generated-content/content-auto-reset-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-auto-reset-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-auto-reset-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-000-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-000-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-000.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-000.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-001.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-002-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-002-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-002.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-003-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-003-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-003.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-003.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-004-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-004-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-004.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-004.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-005.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-005.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-006-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-006-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-006.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-006.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-007-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-007-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-007.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-007.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-008-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-008-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-008.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-008.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-009-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-009-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-009.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-009.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-010-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-010-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-010.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-010.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-011-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-011-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-011.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-011.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-012.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-012.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-013-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-013-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-013.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-013.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-014.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-014.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-015-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-015-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-015.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-015.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-016.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counter-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counter-016.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counter-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-000.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-000.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-001.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-002.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-003.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-003.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-004.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-004.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-005.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-005.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-006.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-006.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-007.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-007.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-008.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-008.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-009.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-009.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-010.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-010.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-011.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-011.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-012.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-012.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-013.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-013.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-014.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-014.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-015.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-015.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-016.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-016.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-017.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-017.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-018.xht b/tests/wpt/tests/css/CSS2/generated-content/content-counters-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-counters-018.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-counters-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-inherit-001.xht b/tests/wpt/tests/css/CSS2/generated-content/content-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-inherit-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-inherit-002-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/content-inherit-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-inherit-002-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-inherit-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-inherit-002.xht b/tests/wpt/tests/css/CSS2/generated-content/content-inherit-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-inherit-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-inherit-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-newline-001-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-newline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-newline-001-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-newline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-newline-001.xht b/tests/wpt/tests/css/CSS2/generated-content/content-newline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-newline-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-newline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-uri-001.xht b/tests/wpt/tests/css/CSS2/generated-content/content-uri-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-uri-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-uri-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-001-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-white-space-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-001-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-white-space-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-001.xht b/tests/wpt/tests/css/CSS2/generated-content/content-white-space-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-white-space-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-002-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-white-space-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-002-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-white-space-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-002.xht b/tests/wpt/tests/css/CSS2/generated-content/content-white-space-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-white-space-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-003-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-white-space-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-003-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-white-space-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-003.xht b/tests/wpt/tests/css/CSS2/generated-content/content-white-space-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-003.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-white-space-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-004-ref.html b/tests/wpt/tests/css/CSS2/generated-content/content-white-space-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-004-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/content-white-space-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-004.xht b/tests/wpt/tests/css/CSS2/generated-content/content-white-space-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/content-white-space-004.xht rename to tests/wpt/tests/css/CSS2/generated-content/content-white-space-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counter-increment-000.xht b/tests/wpt/tests/css/CSS2/generated-content/counter-increment-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counter-increment-000.xht rename to tests/wpt/tests/css/CSS2/generated-content/counter-increment-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counter-increment-001.xht b/tests/wpt/tests/css/CSS2/generated-content/counter-increment-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counter-increment-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/counter-increment-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counter-increment-002.xht b/tests/wpt/tests/css/CSS2/generated-content/counter-increment-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counter-increment-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/counter-increment-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counter-reset-000.xht b/tests/wpt/tests/css/CSS2/generated-content/counter-reset-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counter-reset-000.xht rename to tests/wpt/tests/css/CSS2/generated-content/counter-reset-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counter-reset-001.xht b/tests/wpt/tests/css/CSS2/generated-content/counter-reset-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counter-reset-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/counter-reset-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counter-reset-002.xht b/tests/wpt/tests/css/CSS2/generated-content/counter-reset-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counter-reset-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/counter-reset-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-hidden-000-ref.html b/tests/wpt/tests/css/CSS2/generated-content/counters-hidden-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-hidden-000-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/counters-hidden-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-hidden-000.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-hidden-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-hidden-000.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-hidden-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-hidden-001.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-hidden-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-hidden-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-hidden-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-hidden-002-ref.html b/tests/wpt/tests/css/CSS2/generated-content/counters-hidden-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-hidden-002-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/counters-hidden-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-hidden-002.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-hidden-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-hidden-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-hidden-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-multi-000-ref.html b/tests/wpt/tests/css/CSS2/generated-content/counters-multi-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-multi-000-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/counters-multi-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-multi-000.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-multi-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-multi-000.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-multi-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-multi-001.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-multi-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-multi-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-multi-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-order-000-ref.html b/tests/wpt/tests/css/CSS2/generated-content/counters-order-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-order-000-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/counters-order-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-order-000.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-order-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-order-000.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-order-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-order-001.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-order-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-order-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-order-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-root-000-ref.html b/tests/wpt/tests/css/CSS2/generated-content/counters-root-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-root-000-ref.html rename to tests/wpt/tests/css/CSS2/generated-content/counters-root-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-root-000.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-root-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-root-000.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-root-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-000.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-scope-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-000.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-scope-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-001.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-scope-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-scope-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-002.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-scope-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-scope-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-003.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-scope-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-003.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-scope-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-004.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-scope-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-004.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-scope-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-implied-000.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-scope-implied-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-implied-000.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-scope-implied-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-implied-001.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-scope-implied-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-implied-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-scope-implied-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-implied-002.xht b/tests/wpt/tests/css/CSS2/generated-content/counters-scope-implied-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/counters-scope-implied-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/counters-scope-implied-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/multiple-content-values-001.xht b/tests/wpt/tests/css/CSS2/generated-content/multiple-content-values-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/multiple-content-values-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/multiple-content-values-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/other-attribute-001.xht b/tests/wpt/tests/css/CSS2/generated-content/other-attribute-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/other-attribute-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/other-attribute-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-001.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-002.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-003.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-003.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-004.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-004.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-005.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-005.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-006.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-006.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-007.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-007.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-008.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-008.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-009.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-009.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-010.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-010.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-011.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-011.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-012.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-012.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-013.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-013.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-014.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-014.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-015.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-015.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-016.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-016.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-017.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-017.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-018.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-018.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-019.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-019.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-020.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-020.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-021.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-021.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-022.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-022.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-023.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-023.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-024.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-024.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-025.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-025.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-026.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-026.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-027.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-027.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-028.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-028.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-029.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-029.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-030.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-030.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-031.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-031.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-032.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-032.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-033.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-033.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-034.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-034.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-035-ref.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-035-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-035-ref.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-035-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-035.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-035.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-035a.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-035a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-035a.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-035a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-036.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-036.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-001.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-002.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-003.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-004.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-005.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-006.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-007.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-008.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-009.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-010.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-012.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-013.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-014.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-015.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-negative-001.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-negative-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-negative-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-negative-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-page-001.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-page-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-page-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-page-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-repeat-001.xht b/tests/wpt/tests/css/CSS2/generated-content/quotes-repeat-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/quotes-repeat-001.xht rename to tests/wpt/tests/css/CSS2/generated-content/quotes-repeat-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/1x1-green.png b/tests/wpt/tests/css/CSS2/generated-content/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/generated-content/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/generated-content/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/generated-content/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/generated-content/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/generated-content/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/generated-content/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/generated-content/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/1x1-red.png b/tests/wpt/tests/css/CSS2/generated-content/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/generated-content/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/1x1-white.png b/tests/wpt/tests/css/CSS2/generated-content/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/generated-content/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/generated-content/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/generated-content/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/60x60-green.png b/tests/wpt/tests/css/CSS2/generated-content/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/generated-content/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/a-green.css b/tests/wpt/tests/css/CSS2/generated-content/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/a-green.css rename to tests/wpt/tests/css/CSS2/generated-content/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/b-green.css b/tests/wpt/tests/css/CSS2/generated-content/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/b-green.css rename to tests/wpt/tests/css/CSS2/generated-content/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/blue15x15.png b/tests/wpt/tests/css/CSS2/generated-content/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/generated-content/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/c-red.css b/tests/wpt/tests/css/CSS2/generated-content/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/c-red.css rename to tests/wpt/tests/css/CSS2/generated-content/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/cat.png b/tests/wpt/tests/css/CSS2/generated-content/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/cat.png rename to tests/wpt/tests/css/CSS2/generated-content/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/content-attr-002.css b/tests/wpt/tests/css/CSS2/generated-content/support/content-attr-002.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/content-attr-002.css rename to tests/wpt/tests/css/CSS2/generated-content/support/content-attr-002.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/diamond.png b/tests/wpt/tests/css/CSS2/generated-content/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/diamond.png rename to tests/wpt/tests/css/CSS2/generated-content/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/green15x15.png b/tests/wpt/tests/css/CSS2/generated-content/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/green15x15.png rename to tests/wpt/tests/css/CSS2/generated-content/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/generated-content/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/generated-content/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/generated-content/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/generated-content/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/generated-content/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/generated-content/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/generated-content/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/generated-content/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/ring.png b/tests/wpt/tests/css/CSS2/generated-content/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/ring.png rename to tests/wpt/tests/css/CSS2/generated-content/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/square-outline-32x32.png b/tests/wpt/tests/css/CSS2/generated-content/support/square-outline-32x32.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/square-outline-32x32.png rename to tests/wpt/tests/css/CSS2/generated-content/support/square-outline-32x32.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/square-purple.png b/tests/wpt/tests/css/CSS2/generated-content/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/square-purple.png rename to tests/wpt/tests/css/CSS2/generated-content/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/square-teal.png b/tests/wpt/tests/css/CSS2/generated-content/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/square-teal.png rename to tests/wpt/tests/css/CSS2/generated-content/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/square-white.png b/tests/wpt/tests/css/CSS2/generated-content/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/square-white.png rename to tests/wpt/tests/css/CSS2/generated-content/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/generated-content/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/generated-content/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/swatch-green.png b/tests/wpt/tests/css/CSS2/generated-content/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/generated-content/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/generated-content/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/generated-content/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/generated-content/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/generated-content/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/swatch-red.png b/tests/wpt/tests/css/CSS2/generated-content/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/generated-content/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/swatch-white.png b/tests/wpt/tests/css/CSS2/generated-content/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/generated-content/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/generated-content/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/generated-content/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/test-bl.png b/tests/wpt/tests/css/CSS2/generated-content/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/test-bl.png rename to tests/wpt/tests/css/CSS2/generated-content/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/test-br.png b/tests/wpt/tests/css/CSS2/generated-content/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/test-br.png rename to tests/wpt/tests/css/CSS2/generated-content/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/test-outer.png b/tests/wpt/tests/css/CSS2/generated-content/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/test-outer.png rename to tests/wpt/tests/css/CSS2/generated-content/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/test-tl.png b/tests/wpt/tests/css/CSS2/generated-content/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/test-tl.png rename to tests/wpt/tests/css/CSS2/generated-content/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/generated-content/support/test-tr.png b/tests/wpt/tests/css/CSS2/generated-content/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/generated-content/support/test-tr.png rename to tests/wpt/tests/css/CSS2/generated-content/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/META.yml b/tests/wpt/tests/css/CSS2/i18n/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/META.yml rename to tests/wpt/tests/css/CSS2/i18n/META.yml diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/.htaccess b/tests/wpt/tests/css/CSS2/i18n/syndata/.htaccess similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/.htaccess rename to tests/wpt/tests/css/CSS2/i18n/syndata/.htaccess diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-001.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-001.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-001.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-001.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-001.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-001.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-002.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-002.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-002.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-002.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-002.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-002.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-003.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-003.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-003.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-003.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-003.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-003.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-004.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-004.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-004.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-004.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-004.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-004.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-005.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-005.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-005.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-005.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-005.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-005.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-006.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-006.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-006.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-006.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-006.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-006.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-007.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-007.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-007.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-007.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-007.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-007.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-008.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-008.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-008.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-008.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-008.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-008.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-009.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-009.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-009.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-009.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-009.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-009.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-010.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-010.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-010.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-010.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-010.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-010.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-011.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-011.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-011.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-011.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-011.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-011.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-012.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-012.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-012.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-012.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-012.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-012.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-013.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-013.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-013.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-013.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-013.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-013.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-014.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-014.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-014.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-014.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-014.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-014.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-015.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-015.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-015.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-015.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-015.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-015.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-016.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-016.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-016.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-016.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-016.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-016.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-017.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-017.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-017.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-017.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-017.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-017.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-018.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-018.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-018.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-018.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-018.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-018.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-019.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-019.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-019.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-019.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-019.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-019.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-020.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-020.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-020.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-020.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-020.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-020.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-021.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-021.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-021.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-021.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-021.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-021.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-022.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-022.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-022.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-022.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-022.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-022.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-023.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-023.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-023.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-023.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-023.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-023.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-024.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-024.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-024.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-024.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-024.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-024.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-025.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-025.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-025.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-025.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-025.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-025.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-026.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-026.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-026.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-026.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-026.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-026.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-027.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-027.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-027.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-027.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-027.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-027.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-028.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-028.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-028.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-028.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-028.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-028.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-029.xht b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-029.xht rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-029.xht.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-029.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/character-encoding-029.xht.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/character-encoding-029.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/.htaccess b/tests/wpt/tests/css/CSS2/i18n/syndata/support/.htaccess similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/.htaccess rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/.htaccess diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/1x1-green.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/1x1-red.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/1x1-white.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/60x60-green.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/a-green.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/a-green.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/b-green.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/b-green.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom-charset1.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/bom-charset1.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom-charset1.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/bom-charset1.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom-charset1.css.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/support/bom-charset1.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom-charset1.css.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/bom-charset1.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom-charset15.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/bom-charset15.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom-charset15.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/bom-charset15.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom-charset15.css.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/support/bom-charset15.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom-charset15.css.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/bom-charset15.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom-charsetutf8.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/bom-charsetutf8.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom-charsetutf8.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/bom-charsetutf8.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom-charsetutf8uc.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/bom-charsetutf8uc.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom-charsetutf8uc.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/bom-charsetutf8uc.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/bom.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/bom.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom.css.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/support/bom.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bom.css.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/bom.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bordered-rectangle.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/bordered-rectangle.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/bordered-rectangle.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/bordered-rectangle.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/c-red.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/c-red.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/cat.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/cat.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset-unknown.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/charset-unknown.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset-unknown.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/charset-unknown.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset1.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/charset1.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset1.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/charset1.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset1.css.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/support/charset1.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset1.css.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/charset1.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15-beforespaces.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15-beforespaces.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15-beforespaces.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15-beforespaces.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15-blankline.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15-blankline.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15-blankline.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15-blankline.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15-endspaces.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15-endspaces.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15-endspaces.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15-endspaces.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15-linebreak.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15-linebreak.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15-linebreak.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15-linebreak.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15-midspaces.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15-midspaces.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15-midspaces.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15-midspaces.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15-nocolon.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15-nocolon.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15-nocolon.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15-nocolon.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15-singlequotes.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15-singlequotes.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15-singlequotes.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15-singlequotes.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15.css.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset15.css.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/charset15.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset8.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/charset8.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset8.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/charset8.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset8.css.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/support/charset8.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/charset8.css.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/charset8.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/diamond.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/diamond.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/equal.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/equal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/equal.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/equal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http1-bom.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/http1-bom.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http1-bom.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/http1-bom.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http1-bom.css.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/support/http1-bom.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http1-bom.css.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/http1-bom.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http1-charset8.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/http1-charset8.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http1-charset8.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/http1-charset8.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http1-charset8.css.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/support/http1-charset8.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http1-charset8.css.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/http1-charset8.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http1.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/http1.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http1.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/http1.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http1.css.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/support/http1.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http1.css.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/http1.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http15.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/http15.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http15.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/http15.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http15.css.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/support/http15.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http15.css.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/http15.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http8-charset1.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/http8-charset1.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http8-charset1.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/http8-charset1.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http8-charset1.css.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/support/http8-charset1.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http8-charset1.css.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/http8-charset1.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http8.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/http8.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http8.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/http8.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http8.css.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/support/http8.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/http8.css.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/http8.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/illegalcharset.css.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/support/illegalcharset.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/illegalcharset.css.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/illegalcharset.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/import-green.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/import-green.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/import-red.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/import-red.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/none.css b/tests/wpt/tests/css/CSS2/i18n/syndata/support/none.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/none.css rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/none.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/none.css.headers b/tests/wpt/tests/css/CSS2/i18n/syndata/support/none.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/none.css.headers rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/none.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/notequal.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/notequal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/notequal.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/notequal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/ring.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/ring.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/ruler-h-50%.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/ruler-h-50%.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/ruler-h-50%.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/ruler-h-50%.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/ruler-h-50px.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/ruler-h-50px.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/ruler-v-100px.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/ruler-v-100px.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/ruler-v-50px.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/ruler-v-50px.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/square-purple.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/square-purple.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/square-teal.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/square-teal.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/square-white.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/square-white.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/support/swatch-green.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/support/swatch-red.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/swatch-green.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/swatch-red.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/swatch-white.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/test-bl.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/test-bl.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/test-br.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/test-br.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/test-inner-half-size.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/test-inner-half-size.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/test-outer.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/test-outer.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/test-tl.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/test-tl.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/test-tr.png b/tests/wpt/tests/css/CSS2/i18n/syndata/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/syndata/support/test-tr.png rename to tests/wpt/tests/css/CSS2/i18n/syndata/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-001.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-001.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-002.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-002.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-003.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-003.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-004.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-004.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-005.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-005.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-006.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-006.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-007.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-007.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-008.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-008.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-009.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-009.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-010.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-010.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-011.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-011.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-012.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-012.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-013.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-013.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-014.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-014.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-015.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-015.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-016.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-016.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-017.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-017.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-018.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-018.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-019.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-019.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-020.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-020.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-021.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-021.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-022.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-022.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-023.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-023.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-024.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-024.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-025.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-025.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-026.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-026.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-027.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-027.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-028.xht b/tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/direction-unicode-bidi-028.xht rename to tests/wpt/tests/css/CSS2/i18n/visuren/direction-unicode-bidi-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-001.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-001.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-001.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-001.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-002.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-002.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-002.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-002.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-003.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-003.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-003.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-003.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-004.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-004.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-004.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-004.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-005.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-005.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-005.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-005.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-006.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-006.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-006.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-006.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-007.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-007.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-007.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-007.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-008.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-008.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-008.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-008.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-011.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-011.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-011.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-011.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-012.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-012.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-012.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-012.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-013.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-013.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-013.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-013.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-014.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-014.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-014.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-014.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-015.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-015.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-015.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-015.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-016.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-016.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-016.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-016.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-017.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-017.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-017.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-017.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-018.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-018.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-018.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-018.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-019.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-019.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-019.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-019.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-020.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-020.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-020.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-020.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-021.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-021.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-021.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-021.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-024.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-024.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-024.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-024.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-025.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-025.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-025.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-025.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-026.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-026.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-026.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-026.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-027.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-027.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-027.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-027.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-028.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-028.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-028.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/direction-unicode-bidi-028.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/same.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/same.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/same.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/same.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/samenot.png b/tests/wpt/tests/css/CSS2/i18n/visuren/support/samenot.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/i18n/visuren/support/samenot.png rename to tests/wpt/tests/css/CSS2/i18n/visuren/support/samenot.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/inline-svg-100-percent-in-body.html b/tests/wpt/tests/css/CSS2/inline-svg-100-percent-in-body.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/inline-svg-100-percent-in-body.html rename to tests/wpt/tests/css/CSS2/inline-svg-100-percent-in-body.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/inline-svg-intrinsic-size-100-percent-1.html b/tests/wpt/tests/css/CSS2/inline-svg-intrinsic-size-100-percent-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/inline-svg-intrinsic-size-100-percent-1.html rename to tests/wpt/tests/css/CSS2/inline-svg-intrinsic-size-100-percent-1.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/inline-svg-intrinsic-size-100-percent-2.html b/tests/wpt/tests/css/CSS2/inline-svg-intrinsic-size-100-percent-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/inline-svg-intrinsic-size-100-percent-2.html rename to tests/wpt/tests/css/CSS2/inline-svg-intrinsic-size-100-percent-2.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/inline-svg-margin-padding-border.html b/tests/wpt/tests/css/CSS2/inline-svg-margin-padding-border.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/inline-svg-margin-padding-border.html rename to tests/wpt/tests/css/CSS2/inline-svg-margin-padding-border.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/animations/line-height-interpolation.html b/tests/wpt/tests/css/CSS2/linebox/animations/line-height-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/animations/line-height-interpolation.html rename to tests/wpt/tests/css/CSS2/linebox/animations/line-height-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/anonymous-inline-inherit-001-ref.html b/tests/wpt/tests/css/CSS2/linebox/anonymous-inline-inherit-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/anonymous-inline-inherit-001-ref.html rename to tests/wpt/tests/css/CSS2/linebox/anonymous-inline-inherit-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/anonymous-inline-inherit-001.html b/tests/wpt/tests/css/CSS2/linebox/anonymous-inline-inherit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/anonymous-inline-inherit-001.html rename to tests/wpt/tests/css/CSS2/linebox/anonymous-inline-inherit-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/baseline-block-with-overflow-001-ref.html b/tests/wpt/tests/css/CSS2/linebox/baseline-block-with-overflow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/baseline-block-with-overflow-001-ref.html rename to tests/wpt/tests/css/CSS2/linebox/baseline-block-with-overflow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/baseline-block-with-overflow-001.html b/tests/wpt/tests/css/CSS2/linebox/baseline-block-with-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/baseline-block-with-overflow-001.html rename to tests/wpt/tests/css/CSS2/linebox/baseline-block-with-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/border-padding-bleed-001-ref.xht b/tests/wpt/tests/css/CSS2/linebox/border-padding-bleed-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/border-padding-bleed-001-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/border-padding-bleed-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/border-padding-bleed-001.xht b/tests/wpt/tests/css/CSS2/linebox/border-padding-bleed-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/border-padding-bleed-001.xht rename to tests/wpt/tests/css/CSS2/linebox/border-padding-bleed-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/border-padding-bleed-002.xht b/tests/wpt/tests/css/CSS2/linebox/border-padding-bleed-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/border-padding-bleed-002.xht rename to tests/wpt/tests/css/CSS2/linebox/border-padding-bleed-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/border-padding-bleed-003.xht b/tests/wpt/tests/css/CSS2/linebox/border-padding-bleed-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/border-padding-bleed-003.xht rename to tests/wpt/tests/css/CSS2/linebox/border-padding-bleed-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/crashtests/dir-change-simplifed-crash.html b/tests/wpt/tests/css/CSS2/linebox/crashtests/dir-change-simplifed-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/crashtests/dir-change-simplifed-crash.html rename to tests/wpt/tests/css/CSS2/linebox/crashtests/dir-change-simplifed-crash.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/crashtests/inline-block-baseline-crash.html b/tests/wpt/tests/css/CSS2/linebox/crashtests/inline-block-baseline-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/crashtests/inline-block-baseline-crash.html rename to tests/wpt/tests/css/CSS2/linebox/crashtests/inline-block-baseline-crash.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/empty-inline-001.xht b/tests/wpt/tests/css/CSS2/linebox/empty-inline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/empty-inline-001.xht rename to tests/wpt/tests/css/CSS2/linebox/empty-inline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/empty-inline-002-ref.xht b/tests/wpt/tests/css/CSS2/linebox/empty-inline-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/empty-inline-002-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/empty-inline-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/empty-inline-002.xht b/tests/wpt/tests/css/CSS2/linebox/empty-inline-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/empty-inline-002.xht rename to tests/wpt/tests/css/CSS2/linebox/empty-inline-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/empty-inline-003-ref.xht b/tests/wpt/tests/css/CSS2/linebox/empty-inline-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/empty-inline-003-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/empty-inline-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/empty-inline-003.xht b/tests/wpt/tests/css/CSS2/linebox/empty-inline-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/empty-inline-003.xht rename to tests/wpt/tests/css/CSS2/linebox/empty-inline-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/fractional-line-height.html b/tests/wpt/tests/css/CSS2/linebox/fractional-line-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/fractional-line-height.html rename to tests/wpt/tests/css/CSS2/linebox/fractional-line-height.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/iframe-in-block-in-inline-ref.html b/tests/wpt/tests/css/CSS2/linebox/iframe-in-block-in-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/iframe-in-block-in-inline-ref.html rename to tests/wpt/tests/css/CSS2/linebox/iframe-in-block-in-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/iframe-in-block-in-inline.html b/tests/wpt/tests/css/CSS2/linebox/iframe-in-block-in-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/iframe-in-block-in-inline.html rename to tests/wpt/tests/css/CSS2/linebox/iframe-in-block-in-inline.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/iframe-in-wrapped-span-ref.html b/tests/wpt/tests/css/CSS2/linebox/iframe-in-wrapped-span-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/iframe-in-wrapped-span-ref.html rename to tests/wpt/tests/css/CSS2/linebox/iframe-in-wrapped-span-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/iframe-in-wrapped-span.html b/tests/wpt/tests/css/CSS2/linebox/iframe-in-wrapped-span.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/iframe-in-wrapped-span.html rename to tests/wpt/tests/css/CSS2/linebox/iframe-in-wrapped-span.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-box-001-ref.xht b/tests/wpt/tests/css/CSS2/linebox/inline-box-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-box-001-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-box-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-box-001.xht b/tests/wpt/tests/css/CSS2/linebox/inline-box-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-box-001.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-box-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-box-002-ref.xht b/tests/wpt/tests/css/CSS2/linebox/inline-box-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-box-002-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-box-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-box-002.xht b/tests/wpt/tests/css/CSS2/linebox/inline-box-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-box-002.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-box-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-children-root-linebox-crash-001.html b/tests/wpt/tests/css/CSS2/linebox/inline-children-root-linebox-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-children-root-linebox-crash-001.html rename to tests/wpt/tests/css/CSS2/linebox/inline-children-root-linebox-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-001-ref.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-001-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-001.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-001.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-002-ref.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-002-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-002.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-002.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-003-ref.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-003-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-003.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-003.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-004.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-004.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-005.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-005.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-006.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-006.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-007.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-007.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-008-ref.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-008-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-008.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-008.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-009-ref.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-009-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-009.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-009.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-010.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-010.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-010b.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-010b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-010b.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-010b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-010c.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-010c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-010c.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-010c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-010d.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-010d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-010d.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-010d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-011-ref.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-011-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-011.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-011.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-012.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-012.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-013-ref.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-013-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-013.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-013.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-014.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-014.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-015-ref.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-015-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-015.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-015.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-016.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-016.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-017.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-017.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-018.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-018.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-019.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-019.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-020.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-020.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-021.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-021.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-022-ref.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-022-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-022.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-022.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-023-ref.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-023-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-023.xht b/tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-formatting-context-023.xht rename to tests/wpt/tests/css/CSS2/linebox/inline-formatting-context-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-negative-margin-001.html b/tests/wpt/tests/css/CSS2/linebox/inline-negative-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-negative-margin-001.html rename to tests/wpt/tests/css/CSS2/linebox/inline-negative-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/inline-negative-margin-minmax-crash-001.html b/tests/wpt/tests/css/CSS2/linebox/inline-negative-margin-minmax-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/inline-negative-margin-minmax-crash-001.html rename to tests/wpt/tests/css/CSS2/linebox/inline-negative-margin-minmax-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/leading-001-ref.xht b/tests/wpt/tests/css/CSS2/linebox/leading-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/leading-001-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/leading-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/leading-001.xht b/tests/wpt/tests/css/CSS2/linebox/leading-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/leading-001.xht rename to tests/wpt/tests/css/CSS2/linebox/leading-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-box-height-001.xht b/tests/wpt/tests/css/CSS2/linebox/line-box-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-box-height-001.xht rename to tests/wpt/tests/css/CSS2/linebox/line-box-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-box-height-002-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-box-height-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-box-height-002-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-box-height-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-box-height-002.xht b/tests/wpt/tests/css/CSS2/linebox/line-box-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-box-height-002.xht rename to tests/wpt/tests/css/CSS2/linebox/line-box-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-breaking-font-size-zero-001-ref.html b/tests/wpt/tests/css/CSS2/linebox/line-breaking-font-size-zero-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-breaking-font-size-zero-001-ref.html rename to tests/wpt/tests/css/CSS2/linebox/line-breaking-font-size-zero-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-breaking-font-size-zero-001.html b/tests/wpt/tests/css/CSS2/linebox/line-breaking-font-size-zero-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-breaking-font-size-zero-001.html rename to tests/wpt/tests/css/CSS2/linebox/line-breaking-font-size-zero-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-001.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-001.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-002-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-002-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-002.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-002.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-003.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-003.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-004.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-004.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-005.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-005.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-006-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-006-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-006.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-006.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-007.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-007.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-012.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-012.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-013.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-013.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-014.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-014.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-015.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-015.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-016.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-016.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-017.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-017.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-018.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-018.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-023.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-023.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-024.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-024.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-025-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-025-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-025.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-025.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-026.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-026.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-027.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-027.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-028.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-028.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-029.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-029.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-034.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-034.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-035.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-035.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-036.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-036.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-037.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-037.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-038.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-038.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-039.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-039.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-040.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-040.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-045.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-045.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-046.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-046.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-047.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-047.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-048.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-048.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-049.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-049.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-050.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-050.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-051.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-051.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-056.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-056.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-057.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-057.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-058.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-058.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-059.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-059.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-060.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-060.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-061-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-061-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-061-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-061-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-061.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-061.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-062.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-062.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-067.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-067.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-068.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-068.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-069-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-069-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-069-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-069-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-069.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-069.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-070.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-070.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-071.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-071.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-072-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-072-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-072-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-072-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-072.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-072.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-073.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-073.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-078.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-078.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-079.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-079.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-080.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-080.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-081.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-081.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-082.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-082.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-083.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-083.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-084.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-084.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-089.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-089.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-090.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-090.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-091.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-091.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-092.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-092.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-093.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-093.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-094.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-094.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-095.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-095.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-100.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-100.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-101.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-101.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-102-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-102-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-102-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-102-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-102.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-102.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-103.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-103.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-104.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-104.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-105-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-105-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-105-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-105-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-105.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-105.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-106.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-106.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-111.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-111.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-112.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-112.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-121-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-121-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-121-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-121-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-121.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-121.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-122.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-122.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-123.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-123.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-124.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-124.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-124.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-125-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-125-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-125-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-125-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-125.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-125.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-125.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-126-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-126-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-126-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-126-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-126.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-126.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-127-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-127-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-127-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-127-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-127.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-127.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-128-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-128-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-128-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-128-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-128.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-128.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-128.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-129.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-129.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-001.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-002.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-003.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-004.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-005-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-005-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-005.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-006.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-007.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-008.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-009.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-010.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-012.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-013.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-014.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-015.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-016-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-016-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-016.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-bleed-001-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-bleed-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-bleed-001-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-bleed-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-bleed-001.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-bleed-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-bleed-001.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-bleed-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-bleed-002-ref.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-bleed-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-bleed-002-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-bleed-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-bleed-002.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-bleed-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-bleed-002.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-bleed-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-bleed-003.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-bleed-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-bleed-003.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-bleed-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-largest-001.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-largest-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-largest-001.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-largest-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-normal-recommendation-001.xht b/tests/wpt/tests/css/CSS2/linebox/line-height-normal-recommendation-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-normal-recommendation-001.xht rename to tests/wpt/tests/css/CSS2/linebox/line-height-normal-recommendation-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-oof-descendants-001-ref.html b/tests/wpt/tests/css/CSS2/linebox/line-height-oof-descendants-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-oof-descendants-001-ref.html rename to tests/wpt/tests/css/CSS2/linebox/line-height-oof-descendants-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-oof-descendants-001.html b/tests/wpt/tests/css/CSS2/linebox/line-height-oof-descendants-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/line-height-oof-descendants-001.html rename to tests/wpt/tests/css/CSS2/linebox/line-height-oof-descendants-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/needs-layout-transform.html b/tests/wpt/tests/css/CSS2/linebox/needs-layout-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/needs-layout-transform.html rename to tests/wpt/tests/css/CSS2/linebox/needs-layout-transform.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/support/1x1-green.png b/tests/wpt/tests/css/CSS2/linebox/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/linebox/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/support/1x1-white.png b/tests/wpt/tests/css/CSS2/linebox/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/linebox/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/support/black15x15.png b/tests/wpt/tests/css/CSS2/linebox/support/black15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/support/black15x15.png rename to tests/wpt/tests/css/CSS2/linebox/support/black15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/support/blue96x96.png b/tests/wpt/tests/css/CSS2/linebox/support/blue96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/support/blue96x96.png rename to tests/wpt/tests/css/CSS2/linebox/support/blue96x96.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/support/green15x15.png b/tests/wpt/tests/css/CSS2/linebox/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/support/green15x15.png rename to tests/wpt/tests/css/CSS2/linebox/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/support/green_box.png b/tests/wpt/tests/css/CSS2/linebox/support/green_box.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/support/green_box.png rename to tests/wpt/tests/css/CSS2/linebox/support/green_box.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/support/iframe-inner.html b/tests/wpt/tests/css/CSS2/linebox/support/iframe-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/support/iframe-inner.html rename to tests/wpt/tests/css/CSS2/linebox/support/iframe-inner.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/support/inline-formatting-context-022.png b/tests/wpt/tests/css/CSS2/linebox/support/inline-formatting-context-022.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/support/inline-formatting-context-022.png rename to tests/wpt/tests/css/CSS2/linebox/support/inline-formatting-context-022.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/support/ruler-v-100px-200px.png b/tests/wpt/tests/css/CSS2/linebox/support/ruler-v-100px-200px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/support/ruler-v-100px-200px.png rename to tests/wpt/tests/css/CSS2/linebox/support/ruler-v-100px-200px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/linebox/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/linebox/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/linebox/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/linebox/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/support/swatch-teal.png b/tests/wpt/tests/css/CSS2/linebox/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/support/swatch-teal.png rename to tests/wpt/tests/css/CSS2/linebox/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/support/swatch-white.png b/tests/wpt/tests/css/CSS2/linebox/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/linebox/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-004-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-004-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-004.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-004.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-005.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-005.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-006.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-006.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-007-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-007-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-007.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-007.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-008.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-008.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-016.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-016.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-017.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-017.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-018.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-018.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-019.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-019.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-020.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-020.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-028.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-028.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-029.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-029.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-030.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-030.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-031.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-031.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-032.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-032.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-040.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-040.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-041.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-041.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-042.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-042.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-043.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-043.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-044.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-044.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-052.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-052.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-053.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-053.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-054.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-054.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-055.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-055.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-056.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-056.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-064.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-064.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-065.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-065.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-066.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-066.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-067.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-067.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-068.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-068.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-076.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-076.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-077.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-077.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-078.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-078.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-079-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-079-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-079-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-079-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-079.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-079.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-080.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-080.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-088.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-088.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-089.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-089.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-090.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-090.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-091.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-091.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-092.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-092.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-100.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-100.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-101.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-101.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-102.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-102.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-103-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-103-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-103.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-103.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-104.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-104.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-109.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-109.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-110.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-110.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-111.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-111.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-112.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-112.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-113.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-113.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-114.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-114.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-115.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-115.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-116.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-116.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-117.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-117.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-117a-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-117a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-117a-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-117a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-117a.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-117a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-117a.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-117a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-118.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-118.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-118a-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-118a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-118a-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-118a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-118a.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-118a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-118a.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-118a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-119.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-119.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-120.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-120.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-121-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-121-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-121-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-121-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-121.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-121.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-001.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-002.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-003.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-004.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-005.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-006.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-007-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-007-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-007.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-008-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-008-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-008.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-009.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-010.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-012.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-013.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-014.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-015.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-001-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-001-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-001.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-001.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-002.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-002.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-003-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-003-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-003.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-003.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-004.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-004.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-004a-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-004a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-004a-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-004a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-004a.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-004a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-004a.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-004a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-005.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-005.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-005a.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-005a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-005a.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-005a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-006.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-006.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-006a.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-006a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-006a.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-006a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-007-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-007-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-007.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-007.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-008-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-008-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-008.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-008.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-009.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-009.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-010.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-baseline-010.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-baseline-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-boxes-001.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-boxes-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-boxes-001.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-boxes-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-negative-leading-001-ref.html b/tests/wpt/tests/css/CSS2/linebox/vertical-align-negative-leading-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-negative-leading-001-ref.html rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-negative-leading-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-negative-leading-001.html b/tests/wpt/tests/css/CSS2/linebox/vertical-align-negative-leading-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-negative-leading-001.html rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-negative-leading-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-nested-top-001-ref.html b/tests/wpt/tests/css/CSS2/linebox/vertical-align-nested-top-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-nested-top-001-ref.html rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-nested-top-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-nested-top-001.html b/tests/wpt/tests/css/CSS2/linebox/vertical-align-nested-top-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-nested-top-001.html rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-nested-top-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-sub-001-ref.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-sub-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-sub-001-ref.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-sub-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-sub-001.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-sub-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-sub-001.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-sub-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-super-001.xht b/tests/wpt/tests/css/CSS2/linebox/vertical-align-super-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-super-001.xht rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-super-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-top-bottom-001.html b/tests/wpt/tests/css/CSS2/linebox/vertical-align-top-bottom-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-top-bottom-001.html rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-top-bottom-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-top-bottom-padding-ref.html b/tests/wpt/tests/css/CSS2/linebox/vertical-align-top-bottom-padding-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-top-bottom-padding-ref.html rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-top-bottom-padding-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-top-bottom-padding.html b/tests/wpt/tests/css/CSS2/linebox/vertical-align-top-bottom-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-top-bottom-padding.html rename to tests/wpt/tests/css/CSS2/linebox/vertical-align-top-bottom-padding.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/video-needs-layout-crash.html b/tests/wpt/tests/css/CSS2/linebox/video-needs-layout-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/linebox/video-needs-layout-crash.html rename to tests/wpt/tests/css/CSS2/linebox/video-needs-layout-crash.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-003.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-003.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-004.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-004.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-005.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-005.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-006.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-006.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-007.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-007.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-008.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-008.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-009.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-009.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-010.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-010.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-011.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-011.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-012.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-012.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-013.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-013.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-014-ref.html b/tests/wpt/tests/css/CSS2/lists/counter-increment-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-014-ref.html rename to tests/wpt/tests/css/CSS2/lists/counter-increment-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-014.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-014.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-015.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-015.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-016.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-016.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-017.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-017.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-018.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-018.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-019.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-019.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-020.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-020.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-021-ref.html b/tests/wpt/tests/css/CSS2/lists/counter-increment-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-021-ref.html rename to tests/wpt/tests/css/CSS2/lists/counter-increment-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-021.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-021.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-022.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-022.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-023.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-023.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-024.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-024.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-025.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-025.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-026.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-026.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-027-ref.html b/tests/wpt/tests/css/CSS2/lists/counter-increment-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-027-ref.html rename to tests/wpt/tests/css/CSS2/lists/counter-increment-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-027.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-027.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-028.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-028.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-029.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-029.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-030.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-030.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-031.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-031.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-032.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-032.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-033.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-033.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-034-ref.html b/tests/wpt/tests/css/CSS2/lists/counter-increment-034-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-034-ref.html rename to tests/wpt/tests/css/CSS2/lists/counter-increment-034-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-034.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-034.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-035.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-035.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-036.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-036.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-037.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-037.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-038.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-038.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-039.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-039.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-040-ref.html b/tests/wpt/tests/css/CSS2/lists/counter-increment-040-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-040-ref.html rename to tests/wpt/tests/css/CSS2/lists/counter-increment-040-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-040.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-040.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-041.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-041.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-042.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-042.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-043.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-043.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-044.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-044.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-045.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-045.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-046.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-046.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-047-ref.html b/tests/wpt/tests/css/CSS2/lists/counter-increment-047-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-047-ref.html rename to tests/wpt/tests/css/CSS2/lists/counter-increment-047-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-047.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-047.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-048.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-048.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-049.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-049.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-050.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-050.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-051.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-051.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-052.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-052.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-053-ref.html b/tests/wpt/tests/css/CSS2/lists/counter-increment-053-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-053-ref.html rename to tests/wpt/tests/css/CSS2/lists/counter-increment-053-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-053.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-053.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-054-ref.html b/tests/wpt/tests/css/CSS2/lists/counter-increment-054-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-054-ref.html rename to tests/wpt/tests/css/CSS2/lists/counter-increment-054-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-054.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-054.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-055-ref.html b/tests/wpt/tests/css/CSS2/lists/counter-increment-055-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-055-ref.html rename to tests/wpt/tests/css/CSS2/lists/counter-increment-055-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-055.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-055.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-056.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-056.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-001.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-002.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-003.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-004.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-005.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-006.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-007.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-008.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-009.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-010.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-012.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-013.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-014.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-015.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-auto-reset-001.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-auto-reset-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-auto-reset-001.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-auto-reset-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-display-001.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-display-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-display-001.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-display-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-display-002.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-display-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-display-002.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-display-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-display-003.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-display-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-display-003.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-display-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-display-004.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-display-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-display-004.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-display-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-multiple-001.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-multiple-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-multiple-001.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-multiple-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-not-generated-001.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-not-generated-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-not-generated-001.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-not-generated-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-visibility-001.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-visibility-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-visibility-001.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-visibility-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-visibility-002.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-visibility-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-visibility-002.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-visibility-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-visibility-003.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-visibility-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-visibility-003.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-visibility-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-visibility-004.xht b/tests/wpt/tests/css/CSS2/lists/counter-increment-visibility-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-increment-visibility-004.xht rename to tests/wpt/tests/css/CSS2/lists/counter-increment-visibility-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-003.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-003.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-004.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-004.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-005.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-005.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-006.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-006.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-007.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-007.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-008.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-008.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-009.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-009.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-010.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-010.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-011.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-011.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-012.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-012.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-013.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-013.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-014.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-014.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-015.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-015.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-016.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-016.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-017.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-017.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-018.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-018.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-019.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-019.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-020.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-020.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-021.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-021.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-022.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-022.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-023.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-023.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-024.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-024.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-025.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-025.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-026.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-026.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-027.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-027.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-028.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-028.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-029.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-029.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-030.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-030.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-031.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-031.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-032.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-032.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-033.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-033.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-034.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-034.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-035.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-035.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-036.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-036.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-037.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-037.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-038.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-038.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-039.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-039.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-040.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-040.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-041.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-041.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-042.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-042.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-043.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-043.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-044.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-044.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-045.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-045.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-046.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-046.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-047.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-047.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-048.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-048.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-049.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-049.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-050.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-050.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-051.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-051.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-052.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-052.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-053.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-053.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-054.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-054.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-055.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-055.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-056.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-056.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-001.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-002.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-003.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-004.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-005.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-006.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-007.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-008.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-009.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-010.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-012.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-013.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-014.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-015.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-display-001.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-display-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-display-001.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-display-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-increment-001.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-increment-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-increment-001.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-increment-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-increment-002-ref.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-increment-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-increment-002-ref.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-increment-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-increment-002.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-increment-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-increment-002.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-increment-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-multiple-001.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-multiple-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-multiple-001.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-multiple-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-not-generated-001.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-not-generated-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-not-generated-001.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-not-generated-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-sibling-001.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-sibling-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-sibling-001.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-sibling-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-visibility-001.xht b/tests/wpt/tests/css/CSS2/lists/counter-reset-visibility-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-visibility-001.xht rename to tests/wpt/tests/css/CSS2/lists/counter-reset-visibility-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/increment-counter-001.xht b/tests/wpt/tests/css/CSS2/lists/increment-counter-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/increment-counter-001.xht rename to tests/wpt/tests/css/CSS2/lists/increment-counter-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-alignment-001.xht b/tests/wpt/tests/css/CSS2/lists/list-alignment-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-alignment-001.xht rename to tests/wpt/tests/css/CSS2/lists/list-alignment-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-bidi-000.xht b/tests/wpt/tests/css/CSS2/lists/list-bidi-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-bidi-000.xht rename to tests/wpt/tests/css/CSS2/lists/list-bidi-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-001.xht b/tests/wpt/tests/css/CSS2/lists/list-style-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-001.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-002.xht b/tests/wpt/tests/css/CSS2/lists/list-style-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-002.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-003.xht b/tests/wpt/tests/css/CSS2/lists/list-style-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-003.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-004.xht b/tests/wpt/tests/css/CSS2/lists/list-style-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-004.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-005.xht b/tests/wpt/tests/css/CSS2/lists/list-style-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-005.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-006.xht b/tests/wpt/tests/css/CSS2/lists/list-style-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-006.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-007.xht b/tests/wpt/tests/css/CSS2/lists/list-style-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-007.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-008.xht b/tests/wpt/tests/css/CSS2/lists/list-style-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-008.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-009.xht b/tests/wpt/tests/css/CSS2/lists/list-style-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-009.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-010.xht b/tests/wpt/tests/css/CSS2/lists/list-style-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-010.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-011.xht b/tests/wpt/tests/css/CSS2/lists/list-style-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-011.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-012.xht b/tests/wpt/tests/css/CSS2/lists/list-style-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-012.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-013.xht b/tests/wpt/tests/css/CSS2/lists/list-style-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-013.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-014.xht b/tests/wpt/tests/css/CSS2/lists/list-style-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-014.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-015.xht b/tests/wpt/tests/css/CSS2/lists/list-style-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-015.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-016.xht b/tests/wpt/tests/css/CSS2/lists/list-style-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-016.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-017.xht b/tests/wpt/tests/css/CSS2/lists/list-style-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-017.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-018.xht b/tests/wpt/tests/css/CSS2/lists/list-style-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-018.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-019-ref.xht b/tests/wpt/tests/css/CSS2/lists/list-style-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-019-ref.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-019.xht b/tests/wpt/tests/css/CSS2/lists/list-style-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-019.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-020-ref.xht b/tests/wpt/tests/css/CSS2/lists/list-style-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-020-ref.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-020.xht b/tests/wpt/tests/css/CSS2/lists/list-style-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-020.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-021-ref.xht b/tests/wpt/tests/css/CSS2/lists/list-style-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-021-ref.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-021.xht b/tests/wpt/tests/css/CSS2/lists/list-style-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-021.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-001.xht b/tests/wpt/tests/css/CSS2/lists/list-style-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-002.xht b/tests/wpt/tests/css/CSS2/lists/list-style-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-003.xht b/tests/wpt/tests/css/CSS2/lists/list-style-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-004.xht b/tests/wpt/tests/css/CSS2/lists/list-style-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-005.xht b/tests/wpt/tests/css/CSS2/lists/list-style-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-006.xht b/tests/wpt/tests/css/CSS2/lists/list-style-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-007.xht b/tests/wpt/tests/css/CSS2/lists/list-style-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-008.xht b/tests/wpt/tests/css/CSS2/lists/list-style-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-009.xht b/tests/wpt/tests/css/CSS2/lists/list-style-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-010.xht b/tests/wpt/tests/css/CSS2/lists/list-style-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-012.xht b/tests/wpt/tests/css/CSS2/lists/list-style-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-013.xht b/tests/wpt/tests/css/CSS2/lists/list-style-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-014.xht b/tests/wpt/tests/css/CSS2/lists/list-style-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-015.xht b/tests/wpt/tests/css/CSS2/lists/list-style-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-001.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-001.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-002.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-002.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-003.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-003.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-004-ref.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-004-ref.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-004.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-004.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-005-ref.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-005-ref.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-005.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-005.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-006.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-006.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-007-ref.html b/tests/wpt/tests/css/CSS2/lists/list-style-image-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-007-ref.html rename to tests/wpt/tests/css/CSS2/lists/list-style-image-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-007.html b/tests/wpt/tests/css/CSS2/lists/list-style-image-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-007.html rename to tests/wpt/tests/css/CSS2/lists/list-style-image-007.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-001.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-002.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-003.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-004.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-005.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-006.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-007.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-008.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-009.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-010.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-012.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-013.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-014.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-015.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-available-001.xht b/tests/wpt/tests/css/CSS2/lists/list-style-image-available-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-image-available-001.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-image-available-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-none-001.xht b/tests/wpt/tests/css/CSS2/lists/list-style-none-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-none-001.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-none-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-018-ref.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-018-ref.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-018.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-018.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-019.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-019.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-020.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-020.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-021.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-021.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-022.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-022.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-023-ref.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-023-ref.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-023.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-023.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-024-ref.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-024-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-024-ref.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-024-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-024.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-024.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-025.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-025.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-001.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-002.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-003.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-004.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-005.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-006.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-007.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-008.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-009.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-010.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-012.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-013.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-014.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-015.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-inside-002.xht b/tests/wpt/tests/css/CSS2/lists/list-style-position-inside-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-position-inside-002.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-position-inside-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-001.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-001.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-002.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-002.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-003.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-003.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-004.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-004.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-005.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-005.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-006.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-006.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-007.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-007.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-008.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-008.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-009.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-009.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-010.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-010.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-011.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-011.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-012.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-012.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-013.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-013.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-014.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-014.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-015.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-015.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-016.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-016.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-017.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-017.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-018.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-018.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-001.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-002.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-003.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-004.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-005.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-006.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-007.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-008.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-009.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-010.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-012.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-013.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-014.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-015.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-armenian-001.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-armenian-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-armenian-001.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-armenian-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-georgian-001.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-georgian-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-georgian-001.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-georgian-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-lower-greek-001.xht b/tests/wpt/tests/css/CSS2/lists/list-style-type-lower-greek-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/list-style-type-lower-greek-001.xht rename to tests/wpt/tests/css/CSS2/lists/list-style-type-lower-greek-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/lists-alpha-wrap-001.xht b/tests/wpt/tests/css/CSS2/lists/lists-alpha-wrap-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/lists-alpha-wrap-001.xht rename to tests/wpt/tests/css/CSS2/lists/lists-alpha-wrap-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/lists-backgrounds-001.xht b/tests/wpt/tests/css/CSS2/lists/lists-backgrounds-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/lists-backgrounds-001.xht rename to tests/wpt/tests/css/CSS2/lists/lists-backgrounds-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/markers-rtl-001.xht b/tests/wpt/tests/css/CSS2/lists/markers-rtl-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/markers-rtl-001.xht rename to tests/wpt/tests/css/CSS2/lists/markers-rtl-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/reset-counter-001.xht b/tests/wpt/tests/css/CSS2/lists/reset-counter-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/reset-counter-001.xht rename to tests/wpt/tests/css/CSS2/lists/reset-counter-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/1x1-green.png b/tests/wpt/tests/css/CSS2/lists/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/lists/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/lists/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/lists/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/lists/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/lists/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/lists/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/lists/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/1x1-red.png b/tests/wpt/tests/css/CSS2/lists/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/lists/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/1x1-white.png b/tests/wpt/tests/css/CSS2/lists/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/lists/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/lists/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/lists/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/60x60-green.png b/tests/wpt/tests/css/CSS2/lists/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/lists/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/README b/tests/wpt/tests/css/CSS2/lists/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/README rename to tests/wpt/tests/css/CSS2/lists/support/README diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/a-green.css b/tests/wpt/tests/css/CSS2/lists/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/a-green.css rename to tests/wpt/tests/css/CSS2/lists/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/b-green.css b/tests/wpt/tests/css/CSS2/lists/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/b-green.css rename to tests/wpt/tests/css/CSS2/lists/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/blue15x15.png b/tests/wpt/tests/css/CSS2/lists/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/lists/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/c-red.css b/tests/wpt/tests/css/CSS2/lists/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/c-red.css rename to tests/wpt/tests/css/CSS2/lists/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/cat.png b/tests/wpt/tests/css/CSS2/lists/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/cat.png rename to tests/wpt/tests/css/CSS2/lists/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/diamond.png b/tests/wpt/tests/css/CSS2/lists/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/diamond.png rename to tests/wpt/tests/css/CSS2/lists/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/green15x15.png b/tests/wpt/tests/css/CSS2/lists/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/green15x15.png rename to tests/wpt/tests/css/CSS2/lists/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/lists/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/lists/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/lists/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/lists/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/lists/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/lists/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/lists/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/lists/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/red15x15.png b/tests/wpt/tests/css/CSS2/lists/support/red15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/red15x15.png rename to tests/wpt/tests/css/CSS2/lists/support/red15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/ring.png b/tests/wpt/tests/css/CSS2/lists/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/ring.png rename to tests/wpt/tests/css/CSS2/lists/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/square-purple.png b/tests/wpt/tests/css/CSS2/lists/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/square-purple.png rename to tests/wpt/tests/css/CSS2/lists/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/square-teal.png b/tests/wpt/tests/css/CSS2/lists/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/square-teal.png rename to tests/wpt/tests/css/CSS2/lists/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/square-white.png b/tests/wpt/tests/css/CSS2/lists/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/square-white.png rename to tests/wpt/tests/css/CSS2/lists/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/lists/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/lists/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/swatch-green.png b/tests/wpt/tests/css/CSS2/lists/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/lists/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/lists/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/lists/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/lists/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/lists/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/swatch-red.png b/tests/wpt/tests/css/CSS2/lists/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/lists/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/swatch-white.png b/tests/wpt/tests/css/CSS2/lists/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/lists/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/lists/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/lists/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/test-bl.png b/tests/wpt/tests/css/CSS2/lists/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/test-bl.png rename to tests/wpt/tests/css/CSS2/lists/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/test-br.png b/tests/wpt/tests/css/CSS2/lists/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/test-br.png rename to tests/wpt/tests/css/CSS2/lists/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/test-outer.png b/tests/wpt/tests/css/CSS2/lists/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/test-outer.png rename to tests/wpt/tests/css/CSS2/lists/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/test-tl.png b/tests/wpt/tests/css/CSS2/lists/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/test-tl.png rename to tests/wpt/tests/css/CSS2/lists/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/support/test-tr.png b/tests/wpt/tests/css/CSS2/lists/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/lists/support/test-tr.png rename to tests/wpt/tests/css/CSS2/lists/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-002-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-002-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-003-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-003-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-004-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-004-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-005-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-005-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-006-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-006-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-007-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-007-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-008-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-008-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-009-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-009-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-009.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-009.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-009-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-009-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-009.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-010.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-014.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-backgrounds-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-backgrounds-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-backgrounds-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-backgrounds-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-backgrounds-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-backgrounds-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-backgrounds-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-backgrounds-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-backgrounds-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-backgrounds-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-backgrounds-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-backgrounds-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-border-padding-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-border-padding-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-border-padding-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-border-padding-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-border-padding-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-border-padding-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-border-padding-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-border-padding-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-border-padding-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-border-padding-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-border-padding-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-border-padding-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-border-padding-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-border-padding-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-border-padding-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-border-padding-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-007-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-007-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-016.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-016.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-017.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-017.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-018.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-018.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-019-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-019-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-019.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-019.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-020.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-020.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-028.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-028.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-029.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-029.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-030.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-030.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-031-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-031-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-031-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-031-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-031.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-031.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-032.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-032.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-040.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-040.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-041.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-041.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-042.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-042.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-043-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-043-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-043-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-043-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-043.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-043.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-044.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-044.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-052.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-052.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-053.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-053.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-054.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-054.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-055.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-055.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-056.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-056.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-064.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-064.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-065.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-065.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-066.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-066.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-067-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-067-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-067-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-067-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-067.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-067.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-068.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-068.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-076.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-076.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-077.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-077.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-078.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-078.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-079-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-079-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-079-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-079-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-079.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-079.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-080.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-080.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-088.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-088.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-089.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-089.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-090.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-090.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-091-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-091-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-091-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-091-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-091.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-091.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-092.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-092.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-100-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-100-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-100-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-100-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-100.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-100.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-101.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-101.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-102.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-102.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-103-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-103-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-103.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-103.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-104.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-104.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-109.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-109.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-110.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-110.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-111.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-111.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-112.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-112.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-113.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-113.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-009-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-009-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-009.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-010.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-014.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-bottom-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-002-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-002-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-003-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-003-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-004-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-004-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-009.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-009.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-010-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-010-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-010.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-010.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-011.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-011.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-013-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-013-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-014.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-014.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-015a.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-015a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-015a.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-015a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-016.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-016.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-017-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-017-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-017.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-017.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-019.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-019.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-020-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-020-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-020.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-020.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-021.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-021.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-022.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-022.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-025.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-025.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-026.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-026.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-028.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-028.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-029.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-029.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-030.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-030.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-032.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-032.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-037-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-037-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-037-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-037-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-037.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-037.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-038-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-038-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-038-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-038-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-038.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-038.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-039.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-039.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-040.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-040.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-041.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-041.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-101-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-101-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-101-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-101-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-101.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-101.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-102.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-102.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-103-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-103-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-103.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-103.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-104.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-104.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-105.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-105.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-106-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-106-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-106-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-106-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-106.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-106.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-107.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-107.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-108.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-108.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-109.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-109.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-110-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-110-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-110-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-110-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-110.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-110.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-111.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-111.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-112.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-112.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-113-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-113-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-113.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-113.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-114-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-114-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-114-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-114-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-114.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-114.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-115-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-115-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-115-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-115-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-115.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-115.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-116.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-116.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-117.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-117.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-118.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-118.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-119.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-119.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-120.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-120.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-126.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-126.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-127.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-127.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-128.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-128.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-128.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-129.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-129.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-130-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-130-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-130-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-130-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-130.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-130.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-130.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-131-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-131-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-131-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-131-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-131.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-131.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-131.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-132.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-132.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-132.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-133.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-133.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-133.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-133.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-137-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-137-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-137-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-137-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-137.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-137.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-137.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-137.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-138.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-138.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-138.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-139.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-139.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-139.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-139.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-140.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-140.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-140.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-141.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-141.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-141.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-143.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-143.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-143.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-145.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-145.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-146.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-146.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-146.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-146.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-147.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-147.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-147.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-147.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-148.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-148.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-148.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-148.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-151.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-151.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-151.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-151.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-154.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-154.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-154.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-154.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-155-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-155-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-155-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-155-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-155.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-155.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-155.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-155.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-156-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-156-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-156-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-156-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-156.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-156.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-156.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-156.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-159-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-159-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-159-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-159-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-159.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-159.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-159.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-159.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-160.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-160.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-160.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-160.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-162.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-162.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-162.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-162.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-163.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-163.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-163.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-163.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-clear-000.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-clear-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-clear-000.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-clear-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-clear-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-clear-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-clear-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-clear-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-clear-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-clear-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-clear-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-clear-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-clear-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-clear-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-clear-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-clear-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-clear-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-clear-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-clear-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-clear-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-clear-010.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-clear-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-clear-010.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-clear-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-002-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-002-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-collapse-min-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-em-inherit-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-em-inherit-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-em-inherit-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-em-inherit-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-inline-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-inline-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-inline-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-inline-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-inline-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-inline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-inline-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-inline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-inline-002-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-inline-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-inline-002-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-inline-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-inline-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-inline-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-inline-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-inline-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-004-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-004-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-007-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-007-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-016.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-016.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-017.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-017.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-018.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-018.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-019-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-019-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-019.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-019.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-020.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-020.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-028.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-028.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-029.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-029.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-030.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-030.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-031-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-031-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-031-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-031-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-031.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-031.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-032.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-032.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-040.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-040.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-041.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-041.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-042.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-042.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-043-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-043-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-043-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-043-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-043.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-043.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-044.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-044.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-052.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-052.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-053.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-053.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-054.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-054.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-055.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-055.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-056.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-056.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-064.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-064.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-065.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-065.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-066.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-066.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-067-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-067-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-067-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-067-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-067.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-067.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-068.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-068.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-076.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-076.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-077.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-077.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-078.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-078.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-079-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-079-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-079-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-079-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-079.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-079.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-080.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-080.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-088.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-088.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-089.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-089.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-090.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-090.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-091.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-091.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-092.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-092.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-100.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-100.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-101.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-101.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-102.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-102.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-103-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-103-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-103.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-103.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-104.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-104.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-109.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-109.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-110.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-110.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-111.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-111.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-112.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-112.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-113-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-113-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-113.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-113.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-009-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-009-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-009.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-010.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-014.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-left-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-left-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-percentage-inherit-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-percentage-inherit-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-percentage-inherit-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-percentage-inherit-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-percentage-inherit-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-percentage-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-percentage-inherit-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-percentage-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-percentage-undefined-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-percentage-undefined-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-percentage-undefined-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-percentage-undefined-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-016.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-016.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-017.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-017.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-018.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-018.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-019.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-019.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-020.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-020.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-028.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-028.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-029.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-029.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-030.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-030.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-031.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-031.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-032.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-032.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-040.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-040.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-041.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-041.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-042.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-042.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-043.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-043.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-044.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-044.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-052.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-052.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-053.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-053.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-054.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-054.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-055.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-055.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-056.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-056.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-064.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-064.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-065.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-065.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-066.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-066.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-067.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-067.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-068.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-068.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-076.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-076.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-077.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-077.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-078.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-078.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-079.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-079.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-080.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-080.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-088.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-088.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-089.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-089.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-090.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-090.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-091.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-091.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-092.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-092.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-100-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-100-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-100-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-100-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-100.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-100.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-101.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-101.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-102.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-102.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-103-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-103-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-103.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-103.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-104.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-104.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-109.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-109.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-110.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-110.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-111.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-111.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-112.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-112.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-113-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-113-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-113.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-113.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-009.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-010.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-014.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-right-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-right-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-shorthand-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-shorthand-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-shorthand-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-shorthand-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-shorthand-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-shorthand-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-shorthand-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-shorthand-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-shorthand-002-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-shorthand-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-shorthand-002-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-shorthand-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-shorthand-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-shorthand-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-shorthand-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-shorthand-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-shorthand-003-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-shorthand-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-shorthand-003-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-shorthand-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-shorthand-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-shorthand-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-shorthand-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-shorthand-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-shorthand-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-shorthand-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-shorthand-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-shorthand-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-007-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-007-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-016.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-016.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-017.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-017.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-018.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-018.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-019-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-019-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-019.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-019.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-020.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-020.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-028.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-028.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-029.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-029.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-030.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-030.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-031-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-031-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-031-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-031-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-031.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-031.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-032.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-032.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-040.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-040.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-041.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-041.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-042.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-042.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-043-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-043-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-043-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-043-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-043.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-043.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-044.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-044.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-052.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-052.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-053.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-053.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-054.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-054.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-055.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-055.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-056.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-056.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-064.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-064.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-065.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-065.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-066.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-066.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-067-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-067-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-067-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-067-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-067.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-067.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-068.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-068.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-076.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-076.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-077.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-077.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-078.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-078.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-079-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-079-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-079-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-079-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-079.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-079.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-080.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-080.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-088.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-088.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-089.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-089.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-090.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-090.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-091.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-091.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-092.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-092.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-100.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-100.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-101.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-101.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-102.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-102.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-103-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-103-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-103.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-103.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-104.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-104.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-109.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-109.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-110.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-110.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-111.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-111.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-112.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-112.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-113-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-113-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-113.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-113.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-009.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-010.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-012-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-012-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-013-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-013-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-014.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/margin-top-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/margin-top-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-004-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-004-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-005-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-005-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-006-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-006-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-007-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-007-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-008-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-008-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-009-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-009-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-009.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-009.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-009.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-010.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-014.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-016.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-017.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-background-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-background-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-background-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-background-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-background-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-background-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-background-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-background-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-014.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-014.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-016.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-016.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-017.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-017.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-018.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-018.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-023.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-023.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-024.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-024.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-025.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-025.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-026.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-026.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-027.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-027.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-028.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-028.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-029.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-029.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-034.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-034.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-035.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-035.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-036.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-036.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-037.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-037.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-038.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-038.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-039.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-039.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-040.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-040.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-045.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-045.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-046.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-046.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-047.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-047.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-048.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-048.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-049.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-049.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-050.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-050.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-051.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-051.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-056.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-056.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-057.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-057.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-058.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-058.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-059.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-059.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-060.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-060.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-061.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-061.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-062.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-062.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-067.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-067.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-068.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-068.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-069.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-069.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-070.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-070.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-071.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-071.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-072.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-072.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-073.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-073.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-078.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-078.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-079.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-079.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-080.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-080.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-081.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-081.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-082.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-082.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-083.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-083.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-084.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-084.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-089.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-089.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-090.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-090.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-091-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-091-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-091-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-091-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-091.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-091.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-092.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-092.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-093.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-093.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-094.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-094.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-095.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-095.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-100.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-100.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-101.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-101.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-102.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-102.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-103-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-103-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-103.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-103.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-007-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-007-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-009.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-010.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-014.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-bottom-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-em-inherit-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-em-inherit-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-em-inherit-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-em-inherit-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-em-inherit-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-em-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-em-inherit-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-em-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-016.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-016.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-017.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-017.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-018.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-018.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-023.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-023.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-024.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-024.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-025.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-025.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-026.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-026.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-027.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-027.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-028.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-028.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-029.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-029.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-034.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-034.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-035.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-035.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-036-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-036-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-036-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-036-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-036.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-036.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-037.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-037.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-038.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-038.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-039.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-039.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-040.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-040.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-045.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-045.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-046.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-046.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-047-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-047-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-047-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-047-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-047.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-047.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-048.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-048.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-049.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-049.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-050.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-050.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-051.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-051.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-056.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-056.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-057.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-057.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-058.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-058.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-059.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-059.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-060.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-060.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-061.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-061.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-062.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-062.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-067.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-067.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-068.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-068.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-069.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-069.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-070.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-070.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-071.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-071.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-072.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-072.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-073.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-073.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-078.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-078.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-079.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-079.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-080.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-080.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-081.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-081.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-082.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-082.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-083.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-083.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-084.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-084.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-089.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-089.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-090.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-090.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-091-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-091-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-091-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-091-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-091.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-091.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-092.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-092.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-093.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-093.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-094.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-094.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-095.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-095.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-100.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-100.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-101.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-101.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-102.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-102.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-103-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-103-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-103.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-103.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-008-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-008-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-009.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-010-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-010-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-010.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-014.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-left-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-left-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-percentage-inherit-001-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-percentage-inherit-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-percentage-inherit-001-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-percentage-inherit-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-percentage-inherit-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-percentage-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-percentage-inherit-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-percentage-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-percentage-undefined-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-percentage-undefined-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-percentage-undefined-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-percentage-undefined-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-003-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-003-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-006-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-006-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-016.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-016.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-017-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-017-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-017.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-017.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-018.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-018.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-023.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-023.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-024.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-024.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-025-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-025-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-025.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-025.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-026.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-026.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-027.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-027.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-028-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-028-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-028.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-028.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-029.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-029.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-034.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-034.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-035.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-035.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-036.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-036.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-037.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-037.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-038.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-038.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-039-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-039-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-039-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-039-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-039.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-039.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-040.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-040.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-045.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-045.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-046.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-046.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-047.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-047.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-048.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-048.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-049.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-049.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-050.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-050.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-051.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-051.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-056.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-056.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-057.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-057.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-058.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-058.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-059.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-059.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-060.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-060.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-061-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-061-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-061-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-061-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-061.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-061.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-062.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-062.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-067.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-067.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-068.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-068.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-069-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-069-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-069-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-069-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-069.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-069.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-070.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-070.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-071.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-071.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-072-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-072-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-072-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-072-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-072.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-072.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-073.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-073.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-078.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-078.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-079.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-079.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-080-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-080-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-080-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-080-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-080.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-080.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-081.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-081.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-082.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-082.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-083-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-083-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-083-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-083-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-083.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-083.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-084.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-084.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-089-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-089-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-089-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-089-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-089.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-089.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-090.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-090.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-091-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-091-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-091-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-091-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-091.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-091.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-092.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-092.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-093.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-093.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-094.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-094.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-095.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-095.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-100.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-100.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-101.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-101.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-102.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-102.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-103.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-103.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-009.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-010.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-014.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-right-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-right-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-shorthand-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-shorthand-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-shorthand-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-shorthand-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-shorthand-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-shorthand-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-shorthand-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-shorthand-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-shorthand-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-shorthand-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-shorthand-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-shorthand-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-shorthand-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-shorthand-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-shorthand-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-shorthand-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-014.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-014.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-016.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-016.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-017.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-017.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-018.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-018.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-023.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-023.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-024.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-024.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-025.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-025.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-026.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-026.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-027.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-027.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-028.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-028.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-029.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-029.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-034.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-034.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-035.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-035.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-036.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-036.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-037.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-037.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-038.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-038.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-039.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-039.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-040.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-040.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-045.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-045.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-046.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-046.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-047.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-047.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-048.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-048.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-049.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-049.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-050.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-050.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-051.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-051.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-056.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-056.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-057.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-057.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-058.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-058.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-059.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-059.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-060.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-060.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-061.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-061.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-062.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-062.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-067.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-067.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-068.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-068.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-069.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-069.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-070.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-070.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-071.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-071.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-072.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-072.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-073.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-073.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-078.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-078.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-079.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-079.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-080.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-080.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-081.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-081.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-082.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-082.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-083.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-083.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-084.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-084.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-089.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-089.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-090.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-090.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-091-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-091-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-091-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-091-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-091.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-091.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-092.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-092.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-093.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-093.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-094.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-094.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-095.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-095.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-100.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-100.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-101.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-101.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-102.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-102.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-103-ref.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-103-ref.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-103.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-103.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-001.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-002.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-003.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-004.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-005.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-006.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-007.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-008.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-009.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-010.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-012.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-013.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-014.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-015.xht b/tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/padding-top-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/margin-padding-clear/padding-top-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/100x100-lime.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/100x100-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/100x100-lime.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/100x100-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/100x100-red.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/100x100-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/100x100-red.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/100x100-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/blue15x15.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/diamond.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/diamond.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/green15x15.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/green15x15.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/margin-border-padding-002.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/margin-border-padding-002.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/margin-border-padding-002.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/margin-border-padding-002.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/margin-collapse-013.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/margin-collapse-013.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/margin-collapse-013.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/margin-collapse-013.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/margin-collapse-020.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/margin-collapse-020.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/margin-collapse-020.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/margin-collapse-020.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/margin-collapse-2em-space.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/margin-collapse-2em-space.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/margin-collapse-2em-space.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/margin-collapse-2em-space.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/margin-collapse-4em-space.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/margin-collapse-4em-space.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/margin-collapse-4em-space.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/margin-collapse-4em-space.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/ring.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/ring.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/shorthand-001.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/shorthand-001.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/shorthand-001.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/shorthand-001.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/shorthand-002.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/shorthand-002.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/shorthand-002.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/shorthand-002.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/shorthand-003.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/shorthand-003.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/shorthand-003.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/shorthand-003.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/shorthand-004.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/shorthand-004.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/shorthand-004.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/shorthand-004.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/swatch-green.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/swatch-white.png b/tests/wpt/tests/css/CSS2/margin-padding-clear/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/margin-padding-clear/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/margin-padding-clear/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-001.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-001.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-002.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-002.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-003.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-003.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-004.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-004.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-005.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-005.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-006.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-006.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-007.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-007.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-008.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-008.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-009.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-009.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-010.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-010.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-011.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-011.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-012.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-012.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-013.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-013.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-014.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-014.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-015.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-015.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-016.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-016.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-017.xht b/tests/wpt/tests/css/CSS2/media/media-dependency-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/media-dependency-017.xht rename to tests/wpt/tests/css/CSS2/media/media-dependency-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/support/blue15x15.png b/tests/wpt/tests/css/CSS2/media/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/media/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/support/diamond.png b/tests/wpt/tests/css/CSS2/media/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/support/diamond.png rename to tests/wpt/tests/css/CSS2/media/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/support/green15x15.png b/tests/wpt/tests/css/CSS2/media/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/support/green15x15.png rename to tests/wpt/tests/css/CSS2/media/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/support/media-dependency-green.css b/tests/wpt/tests/css/CSS2/media/support/media-dependency-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/support/media-dependency-green.css rename to tests/wpt/tests/css/CSS2/media/support/media-dependency-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/support/media-dependency-red.css b/tests/wpt/tests/css/CSS2/media/support/media-dependency-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/support/media-dependency-red.css rename to tests/wpt/tests/css/CSS2/media/support/media-dependency-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/media/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/media/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/media/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/media/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/support/ring.png b/tests/wpt/tests/css/CSS2/media/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/support/ring.png rename to tests/wpt/tests/css/CSS2/media/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/media/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/media/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/media/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/media/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/auto-margins-root-element.html b/tests/wpt/tests/css/CSS2/normal-flow/auto-margins-root-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/auto-margins-root-element.html rename to tests/wpt/tests/css/CSS2/normal-flow/auto-margins-root-element.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-context-height-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-context-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-context-height-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-context-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-context-height-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-context-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-context-height-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-context-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-context-height-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-context-height-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-context-height-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-context-height-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-context-height-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-context-height-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-context-height-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-context-height-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-004-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-004-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-005-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-005-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-006-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-006-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-008-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-008-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-008.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-008.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-009.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-009.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-010.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-010.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-011-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-011-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-011.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-011.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-015-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-015-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-formatting-contexts-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-formatting-contexts-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-align-001-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-align-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-align-001-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-align-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-align-001.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-align-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-align-001.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-align-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-align-justify-001-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-align-justify-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-align-justify-001-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-align-justify-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-align-justify-001.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-align-justify-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-align-justify-001.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-align-justify-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-align-last-001-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-align-last-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-align-last-001-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-align-last-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-align-last-001.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-align-last-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-align-last-001.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-align-last-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-append-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-append-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-append-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-append-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-append-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-append-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-append-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-append-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-append-002-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-append-002-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-append-002-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-append-002-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-append-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-append-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-append-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-append-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-append-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-append-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-append-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-append-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-baseline-001-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-baseline-001-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-baseline-001.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-baseline-001.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-client-rects-001.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-client-rects-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-client-rects-001.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-client-rects-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-004-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-004-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-empty-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-empty-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-first-line-001-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-first-line-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-first-line-001-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-first-line-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-first-line-001.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-first-line-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-first-line-001.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-first-line-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-first-line-002-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-first-line-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-first-line-002-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-first-line-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-first-line-002.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-first-line-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-first-line-002.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-first-line-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-float-between-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-float-between-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-float-between-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-float-between-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-float-between-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-float-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-float-between-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-float-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-float-in-layer-001-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-float-in-layer-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-float-in-layer-001-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-float-in-layer-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-float-in-layer-001.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-float-in-layer-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-float-in-layer-001.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-float-in-layer-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-hittest-001.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-hittest-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-hittest-001.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-hittest-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-hittest-002.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-hittest-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-hittest-002.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-hittest-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-hittest-float-001.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-hittest-float-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-hittest-float-001.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-hittest-float-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-hittest-margin.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-hittest-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-hittest-margin.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-hittest-margin.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001a.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001a.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001b.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001b.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001c.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001c.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001d.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001d.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001e.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001e.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001e.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001e.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001f.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001f.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001f.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001f.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001g.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001g.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001g.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001g.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001h.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001h.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001h.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001h.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001i.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001i.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001i.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001i.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001j.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001j.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001j.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001j.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001k.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001k.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001k.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001k.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001l.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001l.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-001l.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-001l.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002a.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002a.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002b.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002b.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002c.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002c.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002d.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002d.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002e.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002e.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002e.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002e.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002f.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002f.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002f.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002f.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002g.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002g.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002g.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002g.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002h.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002h.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002h.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002h.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002i.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002i.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-002i.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-002i.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-003-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-003-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-003-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-003-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-004-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-004-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-004-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-004-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-004-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-004-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-006-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-006-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-006-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-006-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-006-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-006-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-007-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-007-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-007-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-007-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-007-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-007-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-008-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-008-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-008-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-008-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-008-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-008-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-008a.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-008a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-008a.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-008a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-008b.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-008b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-008b.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-008b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-008c.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-008c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-008c.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-008c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-009-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-009-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-009-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-009-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-009-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-009-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-009.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-009.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-010-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-010-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-010-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-010-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-010-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-010-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-010.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-010.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-011-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-011-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-011-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-011-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-011-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-011-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-011.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-011.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-012-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-012-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-012-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-012-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-012-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-012-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-013-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-013-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-013-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-013-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-013-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-013-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-014-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-014-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-014-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-014-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-014-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-014-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-015-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-015-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-015-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-015-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-015-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-015-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-016-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-016-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-016-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-016-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-016-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-016-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-016a.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-016a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-016a.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-016a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-016b.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-016b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-016b.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-016b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-017-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-017-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-017.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-017.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-018.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-018.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-018.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-019-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-019-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-019.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-019.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-019.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-020-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-020-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-020.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-insert-020.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-insert-020.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-001a.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-001a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-001a.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-001a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-001b.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-001b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-001b.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-001b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-002a.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-002a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-002a.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-002a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-002b.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-002b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-002b.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-002b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-003-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-003-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-003.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-003.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-003.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-004-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-004-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-004.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-margins-004.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-margins-004.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-nested-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-nested-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-nested-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-nested-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-nested-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-nested-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-nested-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-nested-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-nested-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-nested-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-nested-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-nested-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-nested-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-nested-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-nested-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-nested-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-percents-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-percents-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-percents-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-percents-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-percents-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-percents-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-percents-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-percents-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-000-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-000-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-000.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-000.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-001-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-001-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-001-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-001-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-003-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-003-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-003-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-003-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-004-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-004-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-004-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-004-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-004-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-004-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-005-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-005-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-005-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-005-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-005-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-005-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-006-nosplit-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-006-nosplit-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-006-nosplit-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-006-nosplit-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-006-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-006-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-remove-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-remove-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-vertical-align-001-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-vertical-align-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-vertical-align-001-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-vertical-align-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-vertical-align-001.html b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-vertical-align-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-vertical-align-001.html rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-vertical-align-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-whitespace-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-whitespace-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-whitespace-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-whitespace-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-whitespace-001a.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-whitespace-001a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-whitespace-001a.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-whitespace-001a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-whitespace-001b.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-whitespace-001b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-in-inline-whitespace-001b.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-in-inline-whitespace-001b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-005-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-005-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-008.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-008.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-009-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-009-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-009.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-009.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-010.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-010.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-011.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-011.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-height-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-height-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-004-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-004-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-005-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-005-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-007-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-007-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-008.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-non-replaced-width-008.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-non-replaced-width-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-004-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-004-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-005-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-005-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-006-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-006-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-height-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-height-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-width-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-width-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-width-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-width-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-width-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-width-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-width-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-width-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-width-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-width-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-width-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-width-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-width-006-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-width-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-width-006-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-width-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-width-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/block-replaced-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/block-replaced-width-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/block-replaced-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-011-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-011-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-011.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-011.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-013-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-013-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-014-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-014-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-017.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-017.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-018-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-018-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-018.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-018.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-019-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-019-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-019.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-019.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-020-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-020-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-020.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-020.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-021.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-021.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-022.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-022.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-025-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-025-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-025.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-025.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-026-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-026-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-026.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-026.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-027.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-027.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-028.xht b/tests/wpt/tests/css/CSS2/normal-flow/blocks-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/blocks-028.xht rename to tests/wpt/tests/css/CSS2/normal-flow/blocks-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/canvas-paint-order-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/canvas-paint-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/canvas-paint-order-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/canvas-paint-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/canvas-paint-order.html b/tests/wpt/tests/css/CSS2/normal-flow/canvas-paint-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/canvas-paint-order.html rename to tests/wpt/tests/css/CSS2/normal-flow/canvas-paint-order.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/child-bottom-margin-in-unresolvable-percentage-height.html b/tests/wpt/tests/css/CSS2/normal-flow/child-bottom-margin-in-unresolvable-percentage-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/child-bottom-margin-in-unresolvable-percentage-height.html rename to tests/wpt/tests/css/CSS2/normal-flow/child-bottom-margin-in-unresolvable-percentage-height.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-margin-bottom.html b/tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-margin-bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-margin-bottom.html rename to tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-margin-bottom.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-margin-left.html b/tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-margin-left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-margin-left.html rename to tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-margin-left.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-margin-right.html b/tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-margin-right.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-margin-right.html rename to tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-margin-right.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-margin-top.html b/tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-margin-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-margin-top.html rename to tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-margin-top.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-padding-bottom.html b/tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-padding-bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-padding-bottom.html rename to tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-padding-bottom.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-padding-left.html b/tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-padding-left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-padding-left.html rename to tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-padding-left.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-padding-right.html b/tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-padding-right.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-padding-right.html rename to tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-padding-right.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-padding-top.html b/tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-padding-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/containing-block-percent-padding-top.html rename to tests/wpt/tests/css/CSS2/normal-flow/containing-block-percent-padding-top.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/crashtests/block-in-inline-ax-crash.html b/tests/wpt/tests/css/CSS2/normal-flow/crashtests/block-in-inline-ax-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/crashtests/block-in-inline-ax-crash.html rename to tests/wpt/tests/css/CSS2/normal-flow/crashtests/block-in-inline-ax-crash.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/cross-domain-iframe-paint-order-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/cross-domain-iframe-paint-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/cross-domain-iframe-paint-order-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/cross-domain-iframe-paint-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/cross-domain-iframe-paint-order.sub.html b/tests/wpt/tests/css/CSS2/normal-flow/cross-domain-iframe-paint-order.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/cross-domain-iframe-paint-order.sub.html rename to tests/wpt/tests/css/CSS2/normal-flow/cross-domain-iframe-paint-order.sub.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/dynamic-percentage-height.html b/tests/wpt/tests/css/CSS2/normal-flow/dynamic-percentage-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/dynamic-percentage-height.html rename to tests/wpt/tests/css/CSS2/normal-flow/dynamic-percentage-height.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/float-percentage-resolution-quirks-mode.html b/tests/wpt/tests/css/CSS2/normal-flow/float-percentage-resolution-quirks-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/float-percentage-resolution-quirks-mode.html rename to tests/wpt/tests/css/CSS2/normal-flow/float-percentage-resolution-quirks-mode.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-006-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-006-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-017.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-017.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-018.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-018.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-023.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-023.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-024.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-024.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-025-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-025-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-025.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-025.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-026.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-026.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-027.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-027.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-028.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-028.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-029.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-029.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-034.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-034.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-035.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-035.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-036.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-036.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-037.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-037.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-038.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-038.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-039.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-039.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-040.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-040.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-045.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-045.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-046.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-046.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-047.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-047.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-048.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-048.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-049.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-049.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-050.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-050.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-051.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-051.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-056.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-056.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-057.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-057.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-058-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-058-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-058-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-058-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-058.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-058.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-059.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-059.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-060.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-060.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-061-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-061-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-061-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-061-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-061.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-061.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-062.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-062.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-067-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-067-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-067-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-067-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-067.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-067.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-068.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-068.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-069-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-069-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-069-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-069-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-069.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-069.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-070.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-070.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-071.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-071.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-072-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-072-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-072-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-072-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-072.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-072.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-073.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-073.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-078.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-078.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-079.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-079.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-080-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-080-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-080-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-080-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-080.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-080.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-081.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-081.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-082.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-082.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-083.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-083.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-084.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-084.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-089.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-089.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-090.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-090.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-091.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-091.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-092.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-092.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-093.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-093.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-094.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-094.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-095.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-095.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-100.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-100.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-101.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-101.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-102.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-102.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-103.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-103.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-104.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-104.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-111-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-111-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-111-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-111-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-111.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-111.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-112-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-112-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-112-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-112-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-112.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-112.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-113-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-113-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-113.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-113.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-114-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-114-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-114-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-114-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-114.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-114.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-008.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-009.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-010.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-inherit-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-inherit-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-percentage-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-percentage-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-percentage-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-percentage-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-percentage-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-percentage-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-percentage-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-percentage-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-percentage-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-percentage-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-percentage-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-percentage-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-percentage-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-percentage-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-percentage-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-percentage-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-percentage-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-percentage-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-percentage-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-percentage-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-percentage-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-percentage-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-percentage-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-percentage-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-percentage-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/height-percentage-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/height-percentage-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/height-percentage-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/hit-test-anonymous-block.html b/tests/wpt/tests/css/CSS2/normal-flow/hit-test-anonymous-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/hit-test-anonymous-block.html rename to tests/wpt/tests/css/CSS2/normal-flow/hit-test-anonymous-block.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-000-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-000-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-000.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-000.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-height-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-height-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-height-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-height-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-height-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-height-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-height-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-height-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-height-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-height-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-height-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-height-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-height-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-height-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-height-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-height-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-width-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-width-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-width-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-width-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-width-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-width-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-width-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-width-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-width-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-width-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-width-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-width-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-width-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-width-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-width-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-width-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-width-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-non-replaced-width-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-non-replaced-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-008.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-008.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-009.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-height-009.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-height-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-006-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-006-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-008.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-replaced-width-008.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-replaced-width-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-valign-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-valign-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-valign-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-valign-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-valign-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-valign-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-valign-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-valign-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-valign-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-valign-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-valign-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-valign-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-valign-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-valign-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-valign-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-valign-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-width-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-width-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-width-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-width-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-width-001a.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-width-001a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-width-001a.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-width-001a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-width-001b.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-width-001b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-width-001b.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-width-001b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-width-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-width-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-width-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-width-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-width-002a.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-width-002a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-width-002a.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-width-002a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-width-002b.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-width-002b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-width-002b.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-width-002b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-004-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-004-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-block-zorder-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-block-zorder-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-non-replaced-height-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-non-replaced-height-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-non-replaced-height-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-non-replaced-height-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-non-replaced-height-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-non-replaced-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-non-replaced-height-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-non-replaced-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-non-replaced-height-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-non-replaced-height-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-non-replaced-height-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-non-replaced-height-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-non-replaced-width-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-non-replaced-width-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-non-replaced-width-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-non-replaced-width-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-non-replaced-width-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-non-replaced-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-non-replaced-width-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-non-replaced-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-non-replaced-width-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-non-replaced-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-non-replaced-width-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-non-replaced-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-008.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-008.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-009.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-009.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-010.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-010.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-011.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-height-011.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-height-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-008.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-008.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-009.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-009.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-011-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-011-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-011.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-011.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-012-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-012-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-014-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-014-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-017.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-replaced-width-017.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-replaced-width-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-002a.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-002a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-002a.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-002a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-002b.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-002b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-002b.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-002b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-height-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-height-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-height-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-height-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-height-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-height-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-height-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-height-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-height-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-height-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-height-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-height-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-valign-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-valign-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-valign-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-valign-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-valign-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-valign-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-valign-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-valign-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-width-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-width-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-width-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-width-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-width-001a.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-width-001a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-width-001a.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-width-001a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-width-001b.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-width-001b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-width-001b.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-width-001b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-width-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-width-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-width-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-width-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-width-002a.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-width-002a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-width-002a.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-width-002a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-width-002b.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-width-002b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-width-002b.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-width-002b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-004-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-004-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inline-table-zorder-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inline-table-zorder-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-009.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-009.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-010.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-010.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-011.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-011.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-013-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-013-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-016-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-016-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-017-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-017-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-017.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-017.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-020-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-020-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-020.xht b/tests/wpt/tests/css/CSS2/normal-flow/inlines-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/inlines-020.xht rename to tests/wpt/tests/css/CSS2/normal-flow/inlines-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/intrinsic-size-with-negative-margins.html b/tests/wpt/tests/css/CSS2/normal-flow/intrinsic-size-with-negative-margins.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/intrinsic-size-with-negative-margins.html rename to tests/wpt/tests/css/CSS2/normal-flow/intrinsic-size-with-negative-margins.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapse-through-percentage-height-block.html b/tests/wpt/tests/css/CSS2/normal-flow/margin-collapse-through-percentage-height-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapse-through-percentage-height-block.html rename to tests/wpt/tests/css/CSS2/normal-flow/margin-collapse-through-percentage-height-block.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapse-through-percentage-padding.html b/tests/wpt/tests/css/CSS2/normal-flow/margin-collapse-through-percentage-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapse-through-percentage-padding.html rename to tests/wpt/tests/css/CSS2/normal-flow/margin-collapse-through-percentage-padding.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapse-through-zero-height-block.html b/tests/wpt/tests/css/CSS2/normal-flow/margin-collapse-through-zero-height-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapse-through-zero-height-block.html rename to tests/wpt/tests/css/CSS2/normal-flow/margin-collapse-through-zero-height-block.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-dynamic.html b/tests/wpt/tests/css/CSS2/normal-flow/margin-collapsing-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-dynamic.html rename to tests/wpt/tests/css/CSS2/normal-flow/margin-collapsing-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-in-table-caption-001.html b/tests/wpt/tests/css/CSS2/normal-flow/margin-collapsing-in-table-caption-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-in-table-caption-001.html rename to tests/wpt/tests/css/CSS2/normal-flow/margin-collapsing-in-table-caption-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-in-table-caption-002.html b/tests/wpt/tests/css/CSS2/normal-flow/margin-collapsing-in-table-caption-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-in-table-caption-002.html rename to tests/wpt/tests/css/CSS2/normal-flow/margin-collapsing-in-table-caption-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-017.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-017.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-018.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-018.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-023.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-023.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-024.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-024.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-025-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-025-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-025.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-025.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-026.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-026.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-027.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-027.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-028.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-028.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-029.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-029.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-034.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-034.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-035.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-035.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-036-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-036-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-036-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-036-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-036.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-036.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-037.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-037.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-038.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-038.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-039.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-039.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-040.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-040.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-045.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-045.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-046.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-046.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-047-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-047-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-047-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-047-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-047.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-047.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-048.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-048.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-049.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-049.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-050.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-050.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-051.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-051.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-056.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-056.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-057.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-057.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-058-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-058-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-058-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-058-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-058.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-058.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-059.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-059.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-060.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-060.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-061.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-061.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-062.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-062.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-067.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-067.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-068.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-068.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-069-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-069-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-069-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-069-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-069.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-069.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-070.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-070.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-071.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-071.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-072.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-072.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-073.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-073.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-078.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-078.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-079.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-079.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-080.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-080.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-081.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-081.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-082.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-082.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-083.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-083.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-084.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-084.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-089.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-089.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-090.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-090.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-091.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-091.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-092.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-092.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-093.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-093.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-094.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-094.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-095.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-095.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-100.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-100.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-101.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-101.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-102.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-102.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-103.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-103.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-104.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-104.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-105.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-105.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-106.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-106.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-107-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-107-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-107-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-107-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-107.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-107.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-108.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-108.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-109.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-109.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-110-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-110-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-110-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-110-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-110.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-110.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-111.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-111.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-008.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-009.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-010.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-max-width-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-max-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-max-width-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-max-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-percentage-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-percentage-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-percentage-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-percentage-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-percentage-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-percentage-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-percentage-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-percentage-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-percentage-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-percentage-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-percentage-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-percentage-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-percentage-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-percentage-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-percentage-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-percentage-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-percentage-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-height-percentage-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-percentage-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-percentage-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-separates-margin.html b/tests/wpt/tests/css/CSS2/normal-flow/max-height-separates-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-height-separates-margin.html rename to tests/wpt/tests/css/CSS2/normal-flow/max-height-separates-margin.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-006-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-006-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-017.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-017.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-018.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-018.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-023.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-023.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-024.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-024.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-025-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-025-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-025.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-025.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-026.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-026.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-027.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-027.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-028.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-028.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-029.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-029.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-034.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-034.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-035.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-035.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-036-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-036-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-036-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-036-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-036.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-036.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-037.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-037.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-038.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-038.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-039.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-039.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-040.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-040.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-045.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-045.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-046.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-046.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-047-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-047-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-047-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-047-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-047.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-047.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-048.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-048.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-049.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-049.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-050.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-050.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-051.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-051.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-056.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-056.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-057.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-057.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-058.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-058.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-059.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-059.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-060.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-060.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-061-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-061-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-061-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-061-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-061.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-061.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-062.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-062.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-067.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-067.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-068.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-068.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-069-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-069-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-069-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-069-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-069.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-069.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-070.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-070.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-071.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-071.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-072-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-072-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-072-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-072-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-072.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-072.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-073.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-073.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-078.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-078.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-079.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-079.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-080.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-080.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-081.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-081.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-082.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-082.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-083.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-083.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-084.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-084.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-089.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-089.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-090.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-090.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-091.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-091.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-092.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-092.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-093.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-093.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-094.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-094.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-095.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-095.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-100.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-100.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-101.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-101.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-102.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-102.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-103.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-103.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-104.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-104.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-105-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-105-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-105-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-105-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-105.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-105.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-106.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-106.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-107-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-107-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-107-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-107-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-107.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-107.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-108.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-108.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-110.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-110.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-008.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-009.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-010.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-percentage-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-percentage-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-percentage-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-percentage-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-percentage-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-percentage-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-percentage-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-percentage-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-percentage-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-percentage-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-percentage-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-percentage-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-percentage-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/max-width-percentage-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/max-width-percentage-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/max-width-percentage-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-017.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-017.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-018.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-018.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-023.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-023.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-024.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-024.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-025.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-025.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-026.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-026.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-027.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-027.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-028.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-028.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-029.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-029.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-034.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-034.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-035.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-035.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-036.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-036.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-037.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-037.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-038.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-038.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-039.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-039.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-040.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-040.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-045.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-045.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-046.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-046.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-047.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-047.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-048.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-048.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-049.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-049.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-050.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-050.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-051.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-051.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-056.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-056.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-057.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-057.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-058.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-058.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-059.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-059.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-060.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-060.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-061.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-061.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-062.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-062.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-067-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-067-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-067-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-067-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-067.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-067.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-068.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-068.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-069.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-069.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-070.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-070.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-071.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-071.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-072.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-072.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-073.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-073.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-078.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-078.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-079.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-079.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-080.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-080.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-081.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-081.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-082.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-082.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-083.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-083.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-084.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-084.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-089.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-089.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-090.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-090.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-091.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-091.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-092.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-092.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-093.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-093.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-094.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-094.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-095.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-095.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-100.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-100.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-101.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-101.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-102.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-102.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-103.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-103.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-104.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-104.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-105.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-105.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-106.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-106.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-111-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-111-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-111-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-111-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-111.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-111.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-112.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-112.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-113.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-113.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-008.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-009.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-010.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-percentage-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-percentage-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-percentage-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-percentage-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-percentage-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-percentage-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-percentage-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-percentage-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-percentage-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-percentage-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-percentage-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-percentage-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-percentage-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-height-percentage-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-percentage-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-percentage-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-separates-margin.html b/tests/wpt/tests/css/CSS2/normal-flow/min-height-separates-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-height-separates-margin.html rename to tests/wpt/tests/css/CSS2/normal-flow/min-height-separates-margin.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-017.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-017.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-018.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-018.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-023.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-023.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-024.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-024.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-025.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-025.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-026.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-026.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-027.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-027.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-028.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-028.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-029.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-029.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-034.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-034.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-035.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-035.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-036.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-036.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-037.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-037.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-038.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-038.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-039.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-039.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-040.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-040.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-045.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-045.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-046.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-046.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-047.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-047.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-048.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-048.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-049.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-049.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-050.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-050.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-051.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-051.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-056.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-056.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-057.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-057.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-058.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-058.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-059.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-059.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-060.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-060.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-061.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-061.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-062.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-062.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-067.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-067.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-068.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-068.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-069.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-069.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-070.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-070.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-071.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-071.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-072.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-072.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-073.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-073.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-078.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-078.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-079.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-079.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-080.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-080.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-081.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-081.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-082.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-082.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-083.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-083.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-084.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-084.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-089.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-089.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-090.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-090.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-091.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-091.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-092.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-092.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-093.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-093.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-094.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-094.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-095.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-095.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-100.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-100.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-101.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-101.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-102.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-102.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-103.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-103.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-008.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-009.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-010.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-percentage-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-percentage-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-percentage-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-percentage-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-percentage-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-percentage-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-percentage-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-percentage-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-percentage-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/min-width-percentage-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/min-width-percentage-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/min-width-percentage-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/negative-margin-001-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/negative-margin-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/negative-margin-001-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/negative-margin-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/negative-margin-001.html b/tests/wpt/tests/css/CSS2/normal-flow/negative-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/negative-margin-001.html rename to tests/wpt/tests/css/CSS2/normal-flow/negative-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/negative-margin-shrinking-container-size-001.html b/tests/wpt/tests/css/CSS2/normal-flow/negative-margin-shrinking-container-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/negative-margin-shrinking-container-size-001.html rename to tests/wpt/tests/css/CSS2/normal-flow/negative-margin-shrinking-container-size-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/negative-margin-shrinking-container-size-002.html b/tests/wpt/tests/css/CSS2/normal-flow/negative-margin-shrinking-container-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/negative-margin-shrinking-container-size-002.html rename to tests/wpt/tests/css/CSS2/normal-flow/negative-margin-shrinking-container-size-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/overflow-scroll-paint-order-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/overflow-scroll-paint-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/overflow-scroll-paint-order-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/overflow-scroll-paint-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/overflow-scroll-paint-order.html b/tests/wpt/tests/css/CSS2/normal-flow/overflow-scroll-paint-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/overflow-scroll-paint-order.html rename to tests/wpt/tests/css/CSS2/normal-flow/overflow-scroll-paint-order.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-elements-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/replaced-elements-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-elements-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/replaced-elements-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-002-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-002-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-003-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-003-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-005-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-005-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-ratio-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-ratio-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-intrinsic-ratio-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/replaced-intrinsic-ratio-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-min-max-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/replaced-min-max-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/replaced-min-max-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/replaced-min-max-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/resizable-iframe-paint-order-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/resizable-iframe-paint-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/resizable-iframe-paint-order-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/resizable-iframe-paint-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/resizable-iframe-paint-order.html b/tests/wpt/tests/css/CSS2/normal-flow/resizable-iframe-paint-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/resizable-iframe-paint-order.html rename to tests/wpt/tests/css/CSS2/normal-flow/resizable-iframe-paint-order.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/root-box-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/root-box-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/root-box-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/root-box-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/root-box-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/root-box-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/root-box-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/root-box-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/1x1-gray.png b/tests/wpt/tests/css/CSS2/normal-flow/support/1x1-gray.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/1x1-gray.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/1x1-gray.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/1x1-green.png b/tests/wpt/tests/css/CSS2/normal-flow/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/1x1-red.png b/tests/wpt/tests/css/CSS2/normal-flow/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/1x1-white.png b/tests/wpt/tests/css/CSS2/normal-flow/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/60x60-green.png b/tests/wpt/tests/css/CSS2/normal-flow/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/black96x96.png b/tests/wpt/tests/css/CSS2/normal-flow/support/black96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/black96x96.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/black96x96.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/blue15x15.png b/tests/wpt/tests/css/CSS2/normal-flow/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/blue96x96.png b/tests/wpt/tests/css/CSS2/normal-flow/support/blue96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/blue96x96.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/blue96x96.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/cat.png b/tests/wpt/tests/css/CSS2/normal-flow/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/cat.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/diamond.png b/tests/wpt/tests/css/CSS2/normal-flow/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/diamond.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/green-rectangle-50wideBy10tall.png b/tests/wpt/tests/css/CSS2/normal-flow/support/green-rectangle-50wideBy10tall.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/green-rectangle-50wideBy10tall.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/green-rectangle-50wideBy10tall.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/green.html b/tests/wpt/tests/css/CSS2/normal-flow/support/green.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/green.html rename to tests/wpt/tests/css/CSS2/normal-flow/support/green.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/green15x15.png b/tests/wpt/tests/css/CSS2/normal-flow/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/green15x15.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/green200x200.png b/tests/wpt/tests/css/CSS2/normal-flow/support/green200x200.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/green200x200.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/green200x200.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/intrinsic-ratio.svg b/tests/wpt/tests/css/CSS2/normal-flow/support/intrinsic-ratio.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/intrinsic-ratio.svg rename to tests/wpt/tests/css/CSS2/normal-flow/support/intrinsic-ratio.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/margin-collapse-2em-space.png b/tests/wpt/tests/css/CSS2/normal-flow/support/margin-collapse-2em-space.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/margin-collapse-2em-space.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/margin-collapse-2em-space.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/normal-flow/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/normal-flow/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-intrinsic-001.svg b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-intrinsic-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-intrinsic-001.svg rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-intrinsic-001.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-intrinsic-002.svg b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-intrinsic-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-intrinsic-002.svg rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-intrinsic-002.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-intrinsic-003.svg b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-intrinsic-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-intrinsic-003.svg rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-intrinsic-003.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-intrinsic-004.svg b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-intrinsic-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-intrinsic-004.svg rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-intrinsic-004.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-intrinsic-005.svg b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-intrinsic-005.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-intrinsic-005.svg rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-intrinsic-005.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-1.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-1.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-1.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-1.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-10.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-10.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-10.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-10.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-11.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-11.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-11.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-11.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-12.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-12.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-12.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-12.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-13.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-13.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-13.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-13.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-14.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-14.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-14.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-14.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-15.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-15.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-16.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-16.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-16.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-17.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-17.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-17.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-17.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-18.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-18.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-18.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-18.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-19.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-19.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-19.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-19.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-2.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-2.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-2.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-2.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-3.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-3.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-3.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-3.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-4.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-4.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-4.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-4.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-5.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-5.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-5.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-5.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-6.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-6.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-6.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-6.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-7.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-7.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-7.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-7.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-8.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-8.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-8.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-8.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-9.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-9.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max-9.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max-9.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max.png b/tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/replaced-min-max.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/replaced-min-max.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/ring.png b/tests/wpt/tests/css/CSS2/normal-flow/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/ring.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/swatch-aqua.png b/tests/wpt/tests/css/CSS2/normal-flow/support/swatch-aqua.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/swatch-aqua.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/swatch-aqua.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/normal-flow/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/swatch-green.png b/tests/wpt/tests/css/CSS2/normal-flow/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/normal-flow/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/swatch-red.png b/tests/wpt/tests/css/CSS2/normal-flow/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/swatch-teal.png b/tests/wpt/tests/css/CSS2/normal-flow/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/swatch-teal.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/test-bl.png b/tests/wpt/tests/css/CSS2/normal-flow/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/test-bl.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/test-br.png b/tests/wpt/tests/css/CSS2/normal-flow/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/test-br.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/test-tl.png b/tests/wpt/tests/css/CSS2/normal-flow/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/test-tl.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/test-tr.png b/tests/wpt/tests/css/CSS2/normal-flow/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/support/test-tr.png rename to tests/wpt/tests/css/CSS2/normal-flow/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/table-in-inline-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/table-in-inline-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/table-in-inline-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/table-in-inline-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/table-in-inline-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/table-in-inline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/table-in-inline-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/table-in-inline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/unresolvable-max-height.html b/tests/wpt/tests/css/CSS2/normal-flow/unresolvable-max-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/unresolvable-max-height.html rename to tests/wpt/tests/css/CSS2/normal-flow/unresolvable-max-height.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/unresolvable-min-height.html b/tests/wpt/tests/css/CSS2/normal-flow/unresolvable-min-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/unresolvable-min-height.html rename to tests/wpt/tests/css/CSS2/normal-flow/unresolvable-min-height.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/video-paint-order-ref.html b/tests/wpt/tests/css/CSS2/normal-flow/video-paint-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/video-paint-order-ref.html rename to tests/wpt/tests/css/CSS2/normal-flow/video-paint-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/video-paint-order.html b/tests/wpt/tests/css/CSS2/normal-flow/video-paint-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/video-paint-order.html rename to tests/wpt/tests/css/CSS2/normal-flow/video-paint-order.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-017.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-017.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-018.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-018.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-023.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-023.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-024.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-024.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-025.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-025.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-026.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-026.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-027.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-027.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-028.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-028.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-029.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-029.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-034.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-034.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-035.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-035.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-036.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-036.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-037.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-037.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-038.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-038.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-039.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-039.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-040.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-040.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-045.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-045.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-046.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-046.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-047.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-047.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-048.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-048.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-049.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-049.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-050.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-050.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-051.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-051.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-056.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-056.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-057.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-057.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-058.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-058.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-059.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-059.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-060.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-060.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-061.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-061.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-062.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-062.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-067.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-067.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-068.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-068.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-069.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-069.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-070.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-070.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-071.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-071.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-072.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-072.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-073.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-073.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-078.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-078.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-079.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-079.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-080.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-080.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-081.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-081.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-082.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-082.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-083.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-083.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-084.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-084.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-089.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-089.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-090.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-090.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-091.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-091.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-092.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-092.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-093.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-093.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-094.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-094.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-095.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-095.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-100.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-100.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-101.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-101.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-102.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-102.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-103-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-103-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-103.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-103.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-104.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-104.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-003.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-004.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-005.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-006.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-007.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-008.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-009.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-010.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-012.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-013.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-014.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-015.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-016.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-inherit-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-inherit-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-non-replaced-inline-001-ref.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-non-replaced-inline-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-non-replaced-inline-001-ref.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-non-replaced-inline-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-non-replaced-inline-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-non-replaced-inline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-non-replaced-inline-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-non-replaced-inline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-percentage-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-percentage-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-percentage-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-percentage-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-percentage-002.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-percentage-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-percentage-002.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-percentage-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-replaced-element-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-replaced-element-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-replaced-element-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-replaced-element-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-undefined-001.xht b/tests/wpt/tests/css/CSS2/normal-flow/width-undefined-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/normal-flow/width-undefined-001.xht rename to tests/wpt/tests/css/CSS2/normal-flow/width-undefined-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/other-formats/background-color-176.html b/tests/wpt/tests/css/CSS2/other-formats/background-color-176.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/other-formats/background-color-176.html rename to tests/wpt/tests/css/CSS2/other-formats/background-color-176.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/other-formats/control-characters-001.html b/tests/wpt/tests/css/CSS2/other-formats/control-characters-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/other-formats/control-characters-001.html rename to tests/wpt/tests/css/CSS2/other-formats/control-characters-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/other-formats/xml-lang-selectors-001.html b/tests/wpt/tests/css/CSS2/other-formats/xml-lang-selectors-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/other-formats/xml-lang-selectors-001.html rename to tests/wpt/tests/css/CSS2/other-formats/xml-lang-selectors-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/other-formats/xml-lang-selectors-002.html b/tests/wpt/tests/css/CSS2/other-formats/xml-lang-selectors-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/other-formats/xml-lang-selectors-002.html rename to tests/wpt/tests/css/CSS2/other-formats/xml-lang-selectors-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/other-formats/xml/README b/tests/wpt/tests/css/CSS2/other-formats/xml/README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/other-formats/xml/README rename to tests/wpt/tests/css/CSS2/other-formats/xml/README diff --git a/tests/wpt/web-platform-tests/css/CSS2/other-formats/xml/background-18.css b/tests/wpt/tests/css/CSS2/other-formats/xml/background-18.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/other-formats/xml/background-18.css rename to tests/wpt/tests/css/CSS2/other-formats/xml/background-18.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/other-formats/xml/background-18.xml b/tests/wpt/tests/css/CSS2/other-formats/xml/background-18.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/other-formats/xml/background-18.xml rename to tests/wpt/tests/css/CSS2/other-formats/xml/background-18.xml diff --git a/tests/wpt/web-platform-tests/css/CSS2/other-formats/xml/background-19-alt.xml b/tests/wpt/tests/css/CSS2/other-formats/xml/background-19-alt.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/other-formats/xml/background-19-alt.xml rename to tests/wpt/tests/css/CSS2/other-formats/xml/background-19-alt.xml diff --git a/tests/wpt/web-platform-tests/css/CSS2/other-formats/xml/background-19.css b/tests/wpt/tests/css/CSS2/other-formats/xml/background-19.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/other-formats/xml/background-19.css rename to tests/wpt/tests/css/CSS2/other-formats/xml/background-19.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/other-formats/xml/background-19.xml b/tests/wpt/tests/css/CSS2/other-formats/xml/background-19.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/other-formats/xml/background-19.xml rename to tests/wpt/tests/css/CSS2/other-formats/xml/background-19.xml diff --git a/tests/wpt/web-platform-tests/css/CSS2/other-formats/xml/background-20.xml b/tests/wpt/tests/css/CSS2/other-formats/xml/background-20.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/other-formats/xml/background-20.xml rename to tests/wpt/tests/css/CSS2/other-formats/xml/background-20.xml diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/at-page-rule-001.xht b/tests/wpt/tests/css/CSS2/page-box/at-page-rule-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/at-page-rule-001.xht rename to tests/wpt/tests/css/CSS2/page-box/at-page-rule-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/at-page-rule-002-a.xht b/tests/wpt/tests/css/CSS2/page-box/at-page-rule-002-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/at-page-rule-002-a.xht rename to tests/wpt/tests/css/CSS2/page-box/at-page-rule-002-a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/at-page-rule-002-b.xht b/tests/wpt/tests/css/CSS2/page-box/at-page-rule-002-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/at-page-rule-002-b.xht rename to tests/wpt/tests/css/CSS2/page-box/at-page-rule-002-b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/at-page-rule-002-c.xht b/tests/wpt/tests/css/CSS2/page-box/at-page-rule-002-c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/at-page-rule-002-c.xht rename to tests/wpt/tests/css/CSS2/page-box/at-page-rule-002-c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/first-page-selectors-001.xht b/tests/wpt/tests/css/CSS2/page-box/first-page-selectors-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/first-page-selectors-001.xht rename to tests/wpt/tests/css/CSS2/page-box/first-page-selectors-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/first-page-selectors-002.xht b/tests/wpt/tests/css/CSS2/page-box/first-page-selectors-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/first-page-selectors-002.xht rename to tests/wpt/tests/css/CSS2/page-box/first-page-selectors-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/first-page-selectors-003.xht b/tests/wpt/tests/css/CSS2/page-box/first-page-selectors-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/first-page-selectors-003.xht rename to tests/wpt/tests/css/CSS2/page-box/first-page-selectors-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/first-page-selectors-004.xht b/tests/wpt/tests/css/CSS2/page-box/first-page-selectors-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/first-page-selectors-004.xht rename to tests/wpt/tests/css/CSS2/page-box/first-page-selectors-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-box-000.xht b/tests/wpt/tests/css/CSS2/page-box/page-box-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-box-000.xht rename to tests/wpt/tests/css/CSS2/page-box/page-box-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-000.xht b/tests/wpt/tests/css/CSS2/page-box/page-container-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-000.xht rename to tests/wpt/tests/css/CSS2/page-box/page-container-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-001.xht b/tests/wpt/tests/css/CSS2/page-box/page-container-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-001.xht rename to tests/wpt/tests/css/CSS2/page-box/page-container-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-002.xht b/tests/wpt/tests/css/CSS2/page-box/page-container-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-002.xht rename to tests/wpt/tests/css/CSS2/page-box/page-container-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-003.xht b/tests/wpt/tests/css/CSS2/page-box/page-container-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-003.xht rename to tests/wpt/tests/css/CSS2/page-box/page-container-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-004.xht b/tests/wpt/tests/css/CSS2/page-box/page-container-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-004.xht rename to tests/wpt/tests/css/CSS2/page-box/page-container-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-005.xht b/tests/wpt/tests/css/CSS2/page-box/page-container-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-005.xht rename to tests/wpt/tests/css/CSS2/page-box/page-container-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-006.xht b/tests/wpt/tests/css/CSS2/page-box/page-container-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-006.xht rename to tests/wpt/tests/css/CSS2/page-box/page-container-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-007.xht b/tests/wpt/tests/css/CSS2/page-box/page-container-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-007.xht rename to tests/wpt/tests/css/CSS2/page-box/page-container-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-008.xht b/tests/wpt/tests/css/CSS2/page-box/page-container-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-008.xht rename to tests/wpt/tests/css/CSS2/page-box/page-container-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-009.xht b/tests/wpt/tests/css/CSS2/page-box/page-container-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-009.xht rename to tests/wpt/tests/css/CSS2/page-box/page-container-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-010.xht b/tests/wpt/tests/css/CSS2/page-box/page-container-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-010.xht rename to tests/wpt/tests/css/CSS2/page-box/page-container-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-011.xht b/tests/wpt/tests/css/CSS2/page-box/page-container-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-container-011.xht rename to tests/wpt/tests/css/CSS2/page-box/page-container-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-grammar-001.xht b/tests/wpt/tests/css/CSS2/page-box/page-grammar-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-grammar-001.xht rename to tests/wpt/tests/css/CSS2/page-box/page-grammar-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-grammar-002.xht b/tests/wpt/tests/css/CSS2/page-box/page-grammar-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-grammar-002.xht rename to tests/wpt/tests/css/CSS2/page-box/page-grammar-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-margin-000.xht b/tests/wpt/tests/css/CSS2/page-box/page-margin-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-margin-000.xht rename to tests/wpt/tests/css/CSS2/page-box/page-margin-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-margin-001.xht b/tests/wpt/tests/css/CSS2/page-box/page-margin-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-margin-001.xht rename to tests/wpt/tests/css/CSS2/page-box/page-margin-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-margin-002.xht b/tests/wpt/tests/css/CSS2/page-box/page-margin-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-margin-002.xht rename to tests/wpt/tests/css/CSS2/page-box/page-margin-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-props-100-a.xht b/tests/wpt/tests/css/CSS2/page-box/page-props-100-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-props-100-a.xht rename to tests/wpt/tests/css/CSS2/page-box/page-props-100-a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-props-100-b.xht b/tests/wpt/tests/css/CSS2/page-box/page-props-100-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-props-100-b.xht rename to tests/wpt/tests/css/CSS2/page-box/page-props-100-b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-props-101.xht b/tests/wpt/tests/css/CSS2/page-box/page-props-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-props-101.xht rename to tests/wpt/tests/css/CSS2/page-box/page-props-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-props-102.xht b/tests/wpt/tests/css/CSS2/page-box/page-props-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-props-102.xht rename to tests/wpt/tests/css/CSS2/page-box/page-props-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-props-103.xht b/tests/wpt/tests/css/CSS2/page-box/page-props-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-props-103.xht rename to tests/wpt/tests/css/CSS2/page-box/page-props-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-selectors-001.xht b/tests/wpt/tests/css/CSS2/page-box/page-selectors-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-selectors-001.xht rename to tests/wpt/tests/css/CSS2/page-box/page-selectors-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-selectors-002.xht b/tests/wpt/tests/css/CSS2/page-box/page-selectors-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-selectors-002.xht rename to tests/wpt/tests/css/CSS2/page-box/page-selectors-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-selectors-003.xht b/tests/wpt/tests/css/CSS2/page-box/page-selectors-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-selectors-003.xht rename to tests/wpt/tests/css/CSS2/page-box/page-selectors-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-selectors-004.xht b/tests/wpt/tests/css/CSS2/page-box/page-selectors-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-selectors-004.xht rename to tests/wpt/tests/css/CSS2/page-box/page-selectors-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/page-selectors-006.xht b/tests/wpt/tests/css/CSS2/page-box/page-selectors-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/page-selectors-006.xht rename to tests/wpt/tests/css/CSS2/page-box/page-selectors-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/support/README b/tests/wpt/tests/css/CSS2/page-box/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/support/README rename to tests/wpt/tests/css/CSS2/page-box/support/README diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/support/blue15x15.png b/tests/wpt/tests/css/CSS2/page-box/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/page-box/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/support/cat.png b/tests/wpt/tests/css/CSS2/page-box/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/support/cat.png rename to tests/wpt/tests/css/CSS2/page-box/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/support/diamond.png b/tests/wpt/tests/css/CSS2/page-box/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/support/diamond.png rename to tests/wpt/tests/css/CSS2/page-box/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/support/green15x15.png b/tests/wpt/tests/css/CSS2/page-box/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/support/green15x15.png rename to tests/wpt/tests/css/CSS2/page-box/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/support/page-container-007.png b/tests/wpt/tests/css/CSS2/page-box/support/page-container-007.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/support/page-container-007.png rename to tests/wpt/tests/css/CSS2/page-box/support/page-container-007.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/support/ring.png b/tests/wpt/tests/css/CSS2/page-box/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/support/ring.png rename to tests/wpt/tests/css/CSS2/page-box/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/page-box/support/w3c_home.png b/tests/wpt/tests/css/CSS2/page-box/support/w3c_home.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/page-box/support/w3c_home.png rename to tests/wpt/tests/css/CSS2/page-box/support/w3c_home.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-001a.xht b/tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-001a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-001a.xht rename to tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-001a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-001b.xht b/tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-001b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-001b.xht rename to tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-001b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-001c.xht b/tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-001c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-001c.xht rename to tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-001c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-002.xht b/tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-002.xht rename to tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-003.xht b/tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-003.xht rename to tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-004.xht b/tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-004.xht rename to tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-005.xht b/tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-005.xht rename to tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-006.xht b/tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-006.xht rename to tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-007a.xht b/tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-007a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-007a.xht rename to tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-007a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-007b.xht b/tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-007b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/allowed-page-breaks-007b.xht rename to tests/wpt/tests/css/CSS2/pagination/allowed-page-breaks-007b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-1-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-1-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-1-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-1-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-10-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-10-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-10-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-10-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-11-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-11-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-11-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-11-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-12-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-12-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-12-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-12-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-13-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-13-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-13-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-13-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-14-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-14-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-14-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-14-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-14-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-14-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-14-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-14-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-15-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-15-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-15-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-15-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-15-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-15-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-15-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-15-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-2-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-2-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-2-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-2-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-3-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-3-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-3-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-3-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-4-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-4-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-4-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-4-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-5-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-5-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-5-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-5-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-6-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-6-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-6-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-6-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-7-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-7-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-7-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-7-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-8-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-8-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-8-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-8-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-8-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-8-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-8-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-8-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-9-print.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-9-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-9-print.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-9-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-1-print.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-1-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-1-print.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-1-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-2-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-2-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-2-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-2-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-2-print.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-2-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-2-print.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-2-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-3-print.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-3-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-3-print.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-3-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-4-print.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-4-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-4-print.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-4-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-5-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-5-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-5-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-5-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-5-print.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-5-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-5-print.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-5-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-6-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-6-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-6-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-6-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-6-print.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-6-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-6-print.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-6-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-7-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-7-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-7-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-7-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-7-print.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-7-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-7-print.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-7-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-8-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-8-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-8-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-8-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-8-print.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-8-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-8-print.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-8-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-9-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-9-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-9-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-9-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-9-print.html b/tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-9-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-9-print.html rename to tests/wpt/tests/css/CSS2/pagination/float-page-break-inside-avoid-9-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/forced-page-breaks-000.xht b/tests/wpt/tests/css/CSS2/pagination/forced-page-breaks-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/forced-page-breaks-000.xht rename to tests/wpt/tests/css/CSS2/pagination/forced-page-breaks-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/forced-page-breaks-001.xht b/tests/wpt/tests/css/CSS2/pagination/forced-page-breaks-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/forced-page-breaks-001.xht rename to tests/wpt/tests/css/CSS2/pagination/forced-page-breaks-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/inline-page-break-inside-avoid-1-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/inline-page-break-inside-avoid-1-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/inline-page-break-inside-avoid-1-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/inline-page-break-inside-avoid-1-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/inline-page-break-inside-avoid-1-print.html b/tests/wpt/tests/css/CSS2/pagination/inline-page-break-inside-avoid-1-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/inline-page-break-inside-avoid-1-print.html rename to tests/wpt/tests/css/CSS2/pagination/inline-page-break-inside-avoid-1-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/orphans-001.xht b/tests/wpt/tests/css/CSS2/pagination/orphans-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/orphans-001.xht rename to tests/wpt/tests/css/CSS2/pagination/orphans-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/orphans-002.xht b/tests/wpt/tests/css/CSS2/pagination/orphans-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/orphans-002.xht rename to tests/wpt/tests/css/CSS2/pagination/orphans-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/orphans-003.xht b/tests/wpt/tests/css/CSS2/pagination/orphans-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/orphans-003.xht rename to tests/wpt/tests/css/CSS2/pagination/orphans-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/orphans-004a.xht b/tests/wpt/tests/css/CSS2/pagination/orphans-004a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/orphans-004a.xht rename to tests/wpt/tests/css/CSS2/pagination/orphans-004a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/orphans-004b.xht b/tests/wpt/tests/css/CSS2/pagination/orphans-004b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/orphans-004b.xht rename to tests/wpt/tests/css/CSS2/pagination/orphans-004b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-000.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-after-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-000.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-after-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-001.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-after-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-001.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-after-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-002.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-after-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-002.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-after-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-003.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-after-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-003.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-after-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-004.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-after-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-004.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-after-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-005.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-after-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-005.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-after-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-006.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-after-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-006.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-after-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-007.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-after-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-007.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-after-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-008.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-after-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-008.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-after-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-009.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-after-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-009.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-after-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-010.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-after-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-after-010.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-after-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-000.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-before-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-000.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-before-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-001.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-before-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-001.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-before-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-002.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-before-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-002.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-before-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-003.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-before-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-003.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-before-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-004.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-before-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-004.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-before-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-005.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-before-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-005.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-before-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-006.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-before-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-006.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-before-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-007-b.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-before-007-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-007-b.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-before-007-b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-007.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-before-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-007.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-before-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-008.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-before-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-008.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-before-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-009.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-before-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-009.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-before-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-010.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-before-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-010.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-before-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-011.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-before-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-011.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-before-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-020.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-before-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-before-020.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-before-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-inside-000.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-inside-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-inside-000.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-inside-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-inside-001.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-inside-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-inside-001.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-inside-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-inside-002.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-inside-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-inside-002.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-inside-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-inside-003.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-inside-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-inside-003.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-inside-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-inside-004.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-inside-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-inside-004.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-inside-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-inside-005.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-inside-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-inside-005.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-inside-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-inside-006.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-inside-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-inside-006.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-inside-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-margins-001.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-margins-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-margins-001.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-margins-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-margins-002.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-margins-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-margins-002.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-margins-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-margins-003.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-margins-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-margins-003.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-margins-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-margins-004.xht b/tests/wpt/tests/css/CSS2/pagination/page-break-margins-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-break-margins-004.xht rename to tests/wpt/tests/css/CSS2/pagination/page-break-margins-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-breaks-100.xht b/tests/wpt/tests/css/CSS2/pagination/page-breaks-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-breaks-100.xht rename to tests/wpt/tests/css/CSS2/pagination/page-breaks-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/page-breaks-101.xht b/tests/wpt/tests/css/CSS2/pagination/page-breaks-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/page-breaks-101.xht rename to tests/wpt/tests/css/CSS2/pagination/page-breaks-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/row-page-break-inside-avoid-1-print.html b/tests/wpt/tests/css/CSS2/pagination/row-page-break-inside-avoid-1-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/row-page-break-inside-avoid-1-print.html rename to tests/wpt/tests/css/CSS2/pagination/row-page-break-inside-avoid-1-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/row-page-break-inside-avoid-2-print.html b/tests/wpt/tests/css/CSS2/pagination/row-page-break-inside-avoid-2-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/row-page-break-inside-avoid-2-print.html rename to tests/wpt/tests/css/CSS2/pagination/row-page-break-inside-avoid-2-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-1-print.html b/tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-1-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-1-print.html rename to tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-1-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-2-print.html b/tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-2-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-2-print.html rename to tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-2-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-3-print.html b/tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-3-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-3-print.html rename to tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-3-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-4-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-4-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-4-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-4-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-4-print.html b/tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-4-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-4-print.html rename to tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-4-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print.html b/tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print.html rename to tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-6-print.html b/tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-6-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-6-print.html rename to tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-6-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-7-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-7-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-7-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-7-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-7-print.html b/tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-7-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-7-print.html rename to tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-7-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-8-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-8-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-8-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-8-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-8-print.html b/tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-8-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-8-print.html rename to tests/wpt/tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-8-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/1x1-green.png b/tests/wpt/tests/css/CSS2/pagination/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/pagination/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/pagination/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/pagination/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/pagination/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/pagination/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/pagination/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/pagination/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/1x1-red.png b/tests/wpt/tests/css/CSS2/pagination/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/pagination/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/1x1-white.png b/tests/wpt/tests/css/CSS2/pagination/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/pagination/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/pagination/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/pagination/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/60x60-green.png b/tests/wpt/tests/css/CSS2/pagination/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/pagination/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/a-green.css b/tests/wpt/tests/css/CSS2/pagination/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/a-green.css rename to tests/wpt/tests/css/CSS2/pagination/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/b-green.css b/tests/wpt/tests/css/CSS2/pagination/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/b-green.css rename to tests/wpt/tests/css/CSS2/pagination/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/blue15x15.png b/tests/wpt/tests/css/CSS2/pagination/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/pagination/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/c-red.css b/tests/wpt/tests/css/CSS2/pagination/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/c-red.css rename to tests/wpt/tests/css/CSS2/pagination/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/cat.png b/tests/wpt/tests/css/CSS2/pagination/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/cat.png rename to tests/wpt/tests/css/CSS2/pagination/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/diamond.png b/tests/wpt/tests/css/CSS2/pagination/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/diamond.png rename to tests/wpt/tests/css/CSS2/pagination/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/green15x15.png b/tests/wpt/tests/css/CSS2/pagination/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/green15x15.png rename to tests/wpt/tests/css/CSS2/pagination/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/pagination/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/pagination/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/pagination/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/pagination/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/ring.png b/tests/wpt/tests/css/CSS2/pagination/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/ring.png rename to tests/wpt/tests/css/CSS2/pagination/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/square-purple.png b/tests/wpt/tests/css/CSS2/pagination/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/square-purple.png rename to tests/wpt/tests/css/CSS2/pagination/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/square-teal.png b/tests/wpt/tests/css/CSS2/pagination/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/square-teal.png rename to tests/wpt/tests/css/CSS2/pagination/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/square-white.png b/tests/wpt/tests/css/CSS2/pagination/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/square-white.png rename to tests/wpt/tests/css/CSS2/pagination/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/swatch-green.png b/tests/wpt/tests/css/CSS2/pagination/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/pagination/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/pagination/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/pagination/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/pagination/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/pagination/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/swatch-red.png b/tests/wpt/tests/css/CSS2/pagination/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/pagination/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/swatch-white.png b/tests/wpt/tests/css/CSS2/pagination/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/pagination/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/pagination/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/pagination/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/test-bl.png b/tests/wpt/tests/css/CSS2/pagination/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/test-bl.png rename to tests/wpt/tests/css/CSS2/pagination/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/test-br.png b/tests/wpt/tests/css/CSS2/pagination/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/test-br.png rename to tests/wpt/tests/css/CSS2/pagination/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/test-outer.png b/tests/wpt/tests/css/CSS2/pagination/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/test-outer.png rename to tests/wpt/tests/css/CSS2/pagination/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/test-tl.png b/tests/wpt/tests/css/CSS2/pagination/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/test-tl.png rename to tests/wpt/tests/css/CSS2/pagination/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/support/test-tr.png b/tests/wpt/tests/css/CSS2/pagination/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/support/test-tr.png rename to tests/wpt/tests/css/CSS2/pagination/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-1-print.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-1-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-1-print.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-1-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-2-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-2-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-2-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-2-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-2-print.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-2-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-2-print.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-2-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-3-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-3-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-3-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-3-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-3-print.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-3-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-3-print.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-3-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-4-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-4-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-4-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-4-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-4-print.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-4-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-4-print.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-4-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-5-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-5-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-5-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-5-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-5-print.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-5-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-5-print.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-5-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-6-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-6-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-6-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-6-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-6-print.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-6-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-6-print.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-6-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-7-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-7-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-7-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-7-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-7-print.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-7-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-7-print.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-7-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-8-print.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-8-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-8-print.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-8-print.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-print-ref.html b/tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-print-ref.html rename to tests/wpt/tests/css/CSS2/pagination/table-page-break-inside-avoid-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/widows-001.xht b/tests/wpt/tests/css/CSS2/pagination/widows-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/widows-001.xht rename to tests/wpt/tests/css/CSS2/pagination/widows-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/widows-002.xht b/tests/wpt/tests/css/CSS2/pagination/widows-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/widows-002.xht rename to tests/wpt/tests/css/CSS2/pagination/widows-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/widows-003.xht b/tests/wpt/tests/css/CSS2/pagination/widows-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/widows-003.xht rename to tests/wpt/tests/css/CSS2/pagination/widows-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/widows-004a.xht b/tests/wpt/tests/css/CSS2/pagination/widows-004a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/widows-004a.xht rename to tests/wpt/tests/css/CSS2/pagination/widows-004a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/pagination/widows-004b.xht b/tests/wpt/tests/css/CSS2/pagination/widows-004b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/pagination/widows-004b.xht rename to tests/wpt/tests/css/CSS2/pagination/widows-004b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-001.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-001.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-002-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-002-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-002.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-002.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-003-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-003-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-003.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-003.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-004.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-004.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-005.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-005.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-006-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-006-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-006.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-006.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-007-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-007-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-007.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-007.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-008-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-008-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-008.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-008.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-009-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-009-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-009.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-009.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-010.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-010.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-011.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-011.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-012.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-012.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-013.html b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-height-013.html rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-height-013.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-001-ref.html b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-001-ref.html rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-001.html b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-001.html rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-001.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-001.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-002-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-002-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-002.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-002.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-003-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-003-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-003.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-003.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-004.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-004.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-005.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-005.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-006.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-006.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-007-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-007-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-007.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-007.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-008-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-008-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-008.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-008.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-009-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-009-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-009.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-009.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-010.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-010.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-011.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-011.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-012.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-max-height-012.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-max-height-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-min-001.html b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-min-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-min-001.html rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-min-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-min-max-001-ref.html b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-min-max-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-min-max-001-ref.html rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-min-max-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-min-max-001.html b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-min-max-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-min-max-001.html rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-min-max-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-001.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-001.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-002-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-002-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-002.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-002.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-003-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-003-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-003.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-003.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-004.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-004.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-005.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-005.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-006.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-006.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-007.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-007.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-008-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-008-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-008.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-008.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-009.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-009.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-010.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-010.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-011.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-011.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-012.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-012.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-013.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-013.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-014.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-014.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-015-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-015-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-015.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-015.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-016.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-016.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-017-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-017-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-017.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-017.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-018.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-018.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-019.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-019.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-020.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-020.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-021-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-021-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-021.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-021.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-022.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-022.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-023.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-023.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-024.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-024.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-025-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-025-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-025.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-025.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-026-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-026-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-026.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-026.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-027.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-027.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-028.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-non-replaced-width-028.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-non-replaced-width-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-001.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-001.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-002-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-002-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-002.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-002.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-003.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-003.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-004-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-004-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-004.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-004.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-005-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-005-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-005.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-005.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-006-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-006-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-006.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-006.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-007-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-007-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-007.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-007.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-008-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-008-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-008.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-008.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-009.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-009.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-010-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-010-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-010.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-010.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-011-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-011-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-011.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-011.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-012-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-012-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-012.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-012.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-013-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-013-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-013.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-013.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-014-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-014-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-014.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-014.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-016.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-016.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-017.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-017.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-018.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-018.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-019.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-019.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-020.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-020.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-021.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-021.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-022.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-022.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-023.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-023.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-024.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-024.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-025.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-025.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-026.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-026.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-027.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-027.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-028.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-028.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-029.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-029.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-030.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-030.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-031.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-031.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-032.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-032.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-033.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-033.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-034.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-034.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-035.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-035.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-036.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-height-036.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-height-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-001.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-001.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-002-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-002-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-002.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-002.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003a-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003a-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003a.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003a.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003b-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003b-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003b.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003b.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003c-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003c-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003c-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003c-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003c.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-003c.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-003c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-004-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-004-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-004.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-004.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-006-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-006-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-006.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-006.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-008.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-008.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-009.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-009.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-010.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-010.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-011.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-011.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-013.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-013.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-015-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-015-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-015.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-015.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-020-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-020-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-020.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-020.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-022-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-022-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-022.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-022.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-023-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-023-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-023.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-023.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-024-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-024-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-024-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-024-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-024.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-024.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-025-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-025-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-025.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-025.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-027-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-027-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-027.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-027.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-029.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-029.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-030.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-030.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-031.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-031.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-032.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-032.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-034.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-034.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-036-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-036-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-036-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-036-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-036.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-036.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-037-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-037-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-037-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-037-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-037.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-037.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-038-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-038-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-038-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-038-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-038.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-038.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-039-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-039-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-039-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-039-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-039.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-039.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-041-ref.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-041-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-041-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-041-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-041.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-041.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-043.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-043.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-048.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-048.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-050.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-050.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-051.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-051.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-052.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-052.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-053.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-053.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-055.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-055.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-057.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-057.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-062.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-062.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-064.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-064.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-065.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-065.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-066.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-066.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-067.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-067.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-069.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-069.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-071.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-071.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-076.xht b/tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/absolute-replaced-width-076.xht rename to tests/wpt/tests/css/CSS2/positioning/absolute-replaced-width-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-001.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-001.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-002-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-002-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-002.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-002.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-003.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-003.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-004.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-004.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-006.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-006.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-007-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-007-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-007.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-007.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-008-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-008-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-008.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-008.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-009-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-009-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-009.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-009.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-010.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-010.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-011-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-011-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-011.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-011.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-012.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-012.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-013-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-013-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-013.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-013.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-014.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-014.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-015.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-015.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-016.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-016.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-017.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-017.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-018.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-018.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-019.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-019.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-020.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-020.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-022.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-022.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-023.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-023.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-024-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-024-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-024-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-024-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-024.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-024.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-025-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-025-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-025.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-025.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-026.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-026.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-027.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-027.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-028-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-028-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-028.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-028.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-block-level-001-ref.html b/tests/wpt/tests/css/CSS2/positioning/abspos-block-level-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-block-level-001-ref.html rename to tests/wpt/tests/css/CSS2/positioning/abspos-block-level-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-block-level-001.html b/tests/wpt/tests/css/CSS2/positioning/abspos-block-level-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-block-level-001.html rename to tests/wpt/tests/css/CSS2/positioning/abspos-block-level-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-change-in-inline-block.html b/tests/wpt/tests/css/CSS2/positioning/abspos-change-in-inline-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-change-in-inline-block.html rename to tests/wpt/tests/css/CSS2/positioning/abspos-change-in-inline-block.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-001.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-001.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-002.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-002.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-003.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-003.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-004.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-004.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-005.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-005.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-006.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-006.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-007.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-007.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-008.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-008.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-009.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-009.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-010-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-010-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-010.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-containing-block-010.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-containing-block-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-float-with-inline-container-ref.html b/tests/wpt/tests/css/CSS2/positioning/abspos-float-with-inline-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-float-with-inline-container-ref.html rename to tests/wpt/tests/css/CSS2/positioning/abspos-float-with-inline-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-float-with-inline-container.html b/tests/wpt/tests/css/CSS2/positioning/abspos-float-with-inline-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-float-with-inline-container.html rename to tests/wpt/tests/css/CSS2/positioning/abspos-float-with-inline-container.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-001.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-inline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-001.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-inline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-002.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-inline-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-002.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-inline-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-003.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-inline-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-003.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-inline-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-004.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-inline-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-004.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-inline-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-005.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-inline-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-005.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-inline-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-006.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-inline-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-006.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-inline-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-007-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-inline-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-007-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-inline-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-007.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-inline-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-007.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-inline-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-008.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-inline-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-008.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-inline-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-container-in-inline-block.html b/tests/wpt/tests/css/CSS2/positioning/abspos-inline-container-in-inline-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-inline-container-in-inline-block.html rename to tests/wpt/tests/css/CSS2/positioning/abspos-inline-container-in-inline-block.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-negative-margin-001-ref.html b/tests/wpt/tests/css/CSS2/positioning/abspos-negative-margin-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-negative-margin-001-ref.html rename to tests/wpt/tests/css/CSS2/positioning/abspos-negative-margin-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-negative-margin-001.html b/tests/wpt/tests/css/CSS2/positioning/abspos-negative-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-negative-margin-001.html rename to tests/wpt/tests/css/CSS2/positioning/abspos-negative-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-001.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-001.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-002-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-002-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-002.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-002.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-003-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-003-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-003.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-003.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-004-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-004-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-004.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-004.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-005-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-005-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-005.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-005.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-006-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-006-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-006.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-006.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-007.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-007.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-008.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-008.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-009.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-009.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-010-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-010-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-010.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-010.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-011-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-011-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-011.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-011.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-012.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-overflow-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-overflow-012.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-overflow-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-paged-001.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-paged-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-paged-001.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-paged-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-paged-002.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-paged-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-paged-002.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-paged-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-001.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-001.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-002.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-002.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-003.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-003.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-004.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-004.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-005-ref.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-width-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-005-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-width-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-005.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-005.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-change-inline-container-001-ref.html b/tests/wpt/tests/css/CSS2/positioning/abspos-width-change-inline-container-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-change-inline-container-001-ref.html rename to tests/wpt/tests/css/CSS2/positioning/abspos-width-change-inline-container-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-change-inline-container-001.html b/tests/wpt/tests/css/CSS2/positioning/abspos-width-change-inline-container-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-width-change-inline-container-001.html rename to tests/wpt/tests/css/CSS2/positioning/abspos-width-change-inline-container-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-zero-width-001.xht b/tests/wpt/tests/css/CSS2/positioning/abspos-zero-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/abspos-zero-width-001.xht rename to tests/wpt/tests/css/CSS2/positioning/abspos-zero-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/auto-position-rtl-child-viewport-scrollbar-ref.html b/tests/wpt/tests/css/CSS2/positioning/auto-position-rtl-child-viewport-scrollbar-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/auto-position-rtl-child-viewport-scrollbar-ref.html rename to tests/wpt/tests/css/CSS2/positioning/auto-position-rtl-child-viewport-scrollbar-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/auto-position-rtl-child-viewport-scrollbar.html b/tests/wpt/tests/css/CSS2/positioning/auto-position-rtl-child-viewport-scrollbar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/auto-position-rtl-child-viewport-scrollbar.html rename to tests/wpt/tests/css/CSS2/positioning/auto-position-rtl-child-viewport-scrollbar.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-004.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-004.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-005.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-005.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-006.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-006.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-007-ref.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-007-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-007.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-007.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-008.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-008.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-016.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-016.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-017.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-017.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-018.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-018.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-019-ref.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-019-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-019.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-019.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-020.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-020.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-028.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-028.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-029.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-029.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-030.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-030.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-031.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-031.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-032.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-032.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-040.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-040.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-041.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-041.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-042.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-042.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-043.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-043.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-044.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-044.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-052.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-052.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-053.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-053.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-054.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-054.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-055.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-055.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-056.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-056.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-064.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-064.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-065.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-065.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-066.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-066.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-067.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-067.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-068.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-068.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-076.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-076.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-077.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-077.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-078.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-078.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-079-ref.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-079-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-079-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-079-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-079.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-079.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-080.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-080.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-088.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-088.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-089.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-089.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-090.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-090.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-091.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-091.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-092.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-092.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-100.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-100.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-101.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-101.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-102.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-102.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-103.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-103.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-104.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-104.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-109.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-109.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-110.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-110.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-111.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-111.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-112.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-112.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-113-ref.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-113-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-113.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-113.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-001.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-002.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-003.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-004.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-005.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-006.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-007.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-008.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-009.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-010.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-012.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-013.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-014.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-015.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-offset-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-offset-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-001.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-offset-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-001.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-offset-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-002.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-offset-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-002.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-offset-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-003.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-offset-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-003.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-offset-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-percentage-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-offset-percentage-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-percentage-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-offset-percentage-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-percentage-001.xht b/tests/wpt/tests/css/CSS2/positioning/bottom-offset-percentage-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-percentage-001.xht rename to tests/wpt/tests/css/CSS2/positioning/bottom-offset-percentage-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/detach-abspos-before-layout.html b/tests/wpt/tests/css/CSS2/positioning/detach-abspos-before-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/detach-abspos-before-layout.html rename to tests/wpt/tests/css/CSS2/positioning/detach-abspos-before-layout.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-001.xht b/tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-001.xht rename to tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-002-ref.xht b/tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-002-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-002.xht b/tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-002.xht rename to tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-003.xht b/tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-003.xht rename to tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-004.xht b/tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-004.xht rename to tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-005.xht b/tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-005.xht rename to tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-005a.xht b/tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-005a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-005a.xht rename to tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-005a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-005b.xht b/tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-005b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/dynamic-top-change-005b.xht rename to tests/wpt/tests/css/CSS2/positioning/dynamic-top-change-005b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/inline-static-position-001.html b/tests/wpt/tests/css/CSS2/positioning/inline-static-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/inline-static-position-001.html rename to tests/wpt/tests/css/CSS2/positioning/inline-static-position-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-004-ref.xht b/tests/wpt/tests/css/CSS2/positioning/left-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-004-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/left-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-004.xht b/tests/wpt/tests/css/CSS2/positioning/left-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-004.xht rename to tests/wpt/tests/css/CSS2/positioning/left-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-005.xht b/tests/wpt/tests/css/CSS2/positioning/left-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-005.xht rename to tests/wpt/tests/css/CSS2/positioning/left-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-006.xht b/tests/wpt/tests/css/CSS2/positioning/left-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-006.xht rename to tests/wpt/tests/css/CSS2/positioning/left-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-007-ref.xht b/tests/wpt/tests/css/CSS2/positioning/left-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-007-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/left-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-007.xht b/tests/wpt/tests/css/CSS2/positioning/left-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-007.xht rename to tests/wpt/tests/css/CSS2/positioning/left-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-008.xht b/tests/wpt/tests/css/CSS2/positioning/left-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-008.xht rename to tests/wpt/tests/css/CSS2/positioning/left-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-016.xht b/tests/wpt/tests/css/CSS2/positioning/left-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-016.xht rename to tests/wpt/tests/css/CSS2/positioning/left-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-017.xht b/tests/wpt/tests/css/CSS2/positioning/left-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-017.xht rename to tests/wpt/tests/css/CSS2/positioning/left-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-018.xht b/tests/wpt/tests/css/CSS2/positioning/left-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-018.xht rename to tests/wpt/tests/css/CSS2/positioning/left-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-019.xht b/tests/wpt/tests/css/CSS2/positioning/left-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-019.xht rename to tests/wpt/tests/css/CSS2/positioning/left-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-020.xht b/tests/wpt/tests/css/CSS2/positioning/left-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-020.xht rename to tests/wpt/tests/css/CSS2/positioning/left-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-028.xht b/tests/wpt/tests/css/CSS2/positioning/left-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-028.xht rename to tests/wpt/tests/css/CSS2/positioning/left-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-029.xht b/tests/wpt/tests/css/CSS2/positioning/left-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-029.xht rename to tests/wpt/tests/css/CSS2/positioning/left-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-030.xht b/tests/wpt/tests/css/CSS2/positioning/left-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-030.xht rename to tests/wpt/tests/css/CSS2/positioning/left-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-031-ref.xht b/tests/wpt/tests/css/CSS2/positioning/left-031-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-031-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/left-031-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-031.xht b/tests/wpt/tests/css/CSS2/positioning/left-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-031.xht rename to tests/wpt/tests/css/CSS2/positioning/left-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-032.xht b/tests/wpt/tests/css/CSS2/positioning/left-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-032.xht rename to tests/wpt/tests/css/CSS2/positioning/left-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-040.xht b/tests/wpt/tests/css/CSS2/positioning/left-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-040.xht rename to tests/wpt/tests/css/CSS2/positioning/left-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-041.xht b/tests/wpt/tests/css/CSS2/positioning/left-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-041.xht rename to tests/wpt/tests/css/CSS2/positioning/left-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-042.xht b/tests/wpt/tests/css/CSS2/positioning/left-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-042.xht rename to tests/wpt/tests/css/CSS2/positioning/left-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-043.xht b/tests/wpt/tests/css/CSS2/positioning/left-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-043.xht rename to tests/wpt/tests/css/CSS2/positioning/left-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-044.xht b/tests/wpt/tests/css/CSS2/positioning/left-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-044.xht rename to tests/wpt/tests/css/CSS2/positioning/left-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-052.xht b/tests/wpt/tests/css/CSS2/positioning/left-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-052.xht rename to tests/wpt/tests/css/CSS2/positioning/left-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-053.xht b/tests/wpt/tests/css/CSS2/positioning/left-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-053.xht rename to tests/wpt/tests/css/CSS2/positioning/left-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-054.xht b/tests/wpt/tests/css/CSS2/positioning/left-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-054.xht rename to tests/wpt/tests/css/CSS2/positioning/left-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-055.xht b/tests/wpt/tests/css/CSS2/positioning/left-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-055.xht rename to tests/wpt/tests/css/CSS2/positioning/left-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-056.xht b/tests/wpt/tests/css/CSS2/positioning/left-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-056.xht rename to tests/wpt/tests/css/CSS2/positioning/left-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-064.xht b/tests/wpt/tests/css/CSS2/positioning/left-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-064.xht rename to tests/wpt/tests/css/CSS2/positioning/left-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-065.xht b/tests/wpt/tests/css/CSS2/positioning/left-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-065.xht rename to tests/wpt/tests/css/CSS2/positioning/left-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-066.xht b/tests/wpt/tests/css/CSS2/positioning/left-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-066.xht rename to tests/wpt/tests/css/CSS2/positioning/left-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-067.xht b/tests/wpt/tests/css/CSS2/positioning/left-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-067.xht rename to tests/wpt/tests/css/CSS2/positioning/left-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-068.xht b/tests/wpt/tests/css/CSS2/positioning/left-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-068.xht rename to tests/wpt/tests/css/CSS2/positioning/left-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-076.xht b/tests/wpt/tests/css/CSS2/positioning/left-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-076.xht rename to tests/wpt/tests/css/CSS2/positioning/left-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-077.xht b/tests/wpt/tests/css/CSS2/positioning/left-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-077.xht rename to tests/wpt/tests/css/CSS2/positioning/left-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-078.xht b/tests/wpt/tests/css/CSS2/positioning/left-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-078.xht rename to tests/wpt/tests/css/CSS2/positioning/left-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-079-ref.xht b/tests/wpt/tests/css/CSS2/positioning/left-079-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-079-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/left-079-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-079.xht b/tests/wpt/tests/css/CSS2/positioning/left-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-079.xht rename to tests/wpt/tests/css/CSS2/positioning/left-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-080.xht b/tests/wpt/tests/css/CSS2/positioning/left-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-080.xht rename to tests/wpt/tests/css/CSS2/positioning/left-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-088.xht b/tests/wpt/tests/css/CSS2/positioning/left-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-088.xht rename to tests/wpt/tests/css/CSS2/positioning/left-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-089.xht b/tests/wpt/tests/css/CSS2/positioning/left-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-089.xht rename to tests/wpt/tests/css/CSS2/positioning/left-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-090.xht b/tests/wpt/tests/css/CSS2/positioning/left-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-090.xht rename to tests/wpt/tests/css/CSS2/positioning/left-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-091.xht b/tests/wpt/tests/css/CSS2/positioning/left-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-091.xht rename to tests/wpt/tests/css/CSS2/positioning/left-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-092.xht b/tests/wpt/tests/css/CSS2/positioning/left-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-092.xht rename to tests/wpt/tests/css/CSS2/positioning/left-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-100.xht b/tests/wpt/tests/css/CSS2/positioning/left-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-100.xht rename to tests/wpt/tests/css/CSS2/positioning/left-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-101.xht b/tests/wpt/tests/css/CSS2/positioning/left-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-101.xht rename to tests/wpt/tests/css/CSS2/positioning/left-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-102.xht b/tests/wpt/tests/css/CSS2/positioning/left-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-102.xht rename to tests/wpt/tests/css/CSS2/positioning/left-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-103.xht b/tests/wpt/tests/css/CSS2/positioning/left-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-103.xht rename to tests/wpt/tests/css/CSS2/positioning/left-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-104.xht b/tests/wpt/tests/css/CSS2/positioning/left-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-104.xht rename to tests/wpt/tests/css/CSS2/positioning/left-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-109.xht b/tests/wpt/tests/css/CSS2/positioning/left-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-109.xht rename to tests/wpt/tests/css/CSS2/positioning/left-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-110.xht b/tests/wpt/tests/css/CSS2/positioning/left-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-110.xht rename to tests/wpt/tests/css/CSS2/positioning/left-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-111.xht b/tests/wpt/tests/css/CSS2/positioning/left-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-111.xht rename to tests/wpt/tests/css/CSS2/positioning/left-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-112.xht b/tests/wpt/tests/css/CSS2/positioning/left-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-112.xht rename to tests/wpt/tests/css/CSS2/positioning/left-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-113-ref.xht b/tests/wpt/tests/css/CSS2/positioning/left-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-113-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/left-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-113.xht b/tests/wpt/tests/css/CSS2/positioning/left-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-113.xht rename to tests/wpt/tests/css/CSS2/positioning/left-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-001.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-002.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-003.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-004.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-005.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-006.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-007.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-008.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-009.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-010.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-012.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-013.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-014.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-015.xht b/tests/wpt/tests/css/CSS2/positioning/left-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/positioning/left-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/left-offset-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/left-offset-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-001.xht b/tests/wpt/tests/css/CSS2/positioning/left-offset-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-001.xht rename to tests/wpt/tests/css/CSS2/positioning/left-offset-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-002.xht b/tests/wpt/tests/css/CSS2/positioning/left-offset-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-002.xht rename to tests/wpt/tests/css/CSS2/positioning/left-offset-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-003-ref.xht b/tests/wpt/tests/css/CSS2/positioning/left-offset-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-003-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/left-offset-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-003.xht b/tests/wpt/tests/css/CSS2/positioning/left-offset-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-003.xht rename to tests/wpt/tests/css/CSS2/positioning/left-offset-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-percentage-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/left-offset-percentage-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-percentage-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/left-offset-percentage-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-percentage-001.xht b/tests/wpt/tests/css/CSS2/positioning/left-offset-percentage-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-percentage-001.xht rename to tests/wpt/tests/css/CSS2/positioning/left-offset-percentage-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-percentage-002-ref.xht b/tests/wpt/tests/css/CSS2/positioning/left-offset-percentage-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-percentage-002-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/left-offset-percentage-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-percentage-002.xht b/tests/wpt/tests/css/CSS2/positioning/left-offset-percentage-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/left-offset-percentage-002.xht rename to tests/wpt/tests/css/CSS2/positioning/left-offset-percentage-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/line-break-after-leading-float.html b/tests/wpt/tests/css/CSS2/positioning/line-break-after-leading-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/line-break-after-leading-float.html rename to tests/wpt/tests/css/CSS2/positioning/line-break-after-leading-float.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/line-break-after-leading-oof-001-ref.html b/tests/wpt/tests/css/CSS2/positioning/line-break-after-leading-oof-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/line-break-after-leading-oof-001-ref.html rename to tests/wpt/tests/css/CSS2/positioning/line-break-after-leading-oof-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/line-break-after-leading-oof-001.html b/tests/wpt/tests/css/CSS2/positioning/line-break-after-leading-oof-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/line-break-after-leading-oof-001.html rename to tests/wpt/tests/css/CSS2/positioning/line-break-after-leading-oof-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-001.xht b/tests/wpt/tests/css/CSS2/positioning/position-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-001.xht rename to tests/wpt/tests/css/CSS2/positioning/position-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-002.xht b/tests/wpt/tests/css/CSS2/positioning/position-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-002.xht rename to tests/wpt/tests/css/CSS2/positioning/position-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-003.xht b/tests/wpt/tests/css/CSS2/positioning/position-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-003.xht rename to tests/wpt/tests/css/CSS2/positioning/position-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-004.xht b/tests/wpt/tests/css/CSS2/positioning/position-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-004.xht rename to tests/wpt/tests/css/CSS2/positioning/position-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-005.xht b/tests/wpt/tests/css/CSS2/positioning/position-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-005.xht rename to tests/wpt/tests/css/CSS2/positioning/position-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-006-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-006-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-006.xht b/tests/wpt/tests/css/CSS2/positioning/position-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-006.xht rename to tests/wpt/tests/css/CSS2/positioning/position-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-001.xht b/tests/wpt/tests/css/CSS2/positioning/position-absolute-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-001.xht rename to tests/wpt/tests/css/CSS2/positioning/position-absolute-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-002-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-absolute-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-002-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-absolute-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-002.xht b/tests/wpt/tests/css/CSS2/positioning/position-absolute-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-002.xht rename to tests/wpt/tests/css/CSS2/positioning/position-absolute-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-003.xht b/tests/wpt/tests/css/CSS2/positioning/position-absolute-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-003.xht rename to tests/wpt/tests/css/CSS2/positioning/position-absolute-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-004-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-absolute-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-004-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-absolute-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-004.xht b/tests/wpt/tests/css/CSS2/positioning/position-absolute-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-004.xht rename to tests/wpt/tests/css/CSS2/positioning/position-absolute-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-005.xht b/tests/wpt/tests/css/CSS2/positioning/position-absolute-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-005.xht rename to tests/wpt/tests/css/CSS2/positioning/position-absolute-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-006.xht b/tests/wpt/tests/css/CSS2/positioning/position-absolute-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-006.xht rename to tests/wpt/tests/css/CSS2/positioning/position-absolute-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-007-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-absolute-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-007-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-absolute-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-007.xht b/tests/wpt/tests/css/CSS2/positioning/position-absolute-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-007.xht rename to tests/wpt/tests/css/CSS2/positioning/position-absolute-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-008.xht b/tests/wpt/tests/css/CSS2/positioning/position-absolute-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-absolute-008.xht rename to tests/wpt/tests/css/CSS2/positioning/position-absolute-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-001.xht b/tests/wpt/tests/css/CSS2/positioning/position-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/positioning/position-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-002.xht b/tests/wpt/tests/css/CSS2/positioning/position-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/positioning/position-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-003.xht b/tests/wpt/tests/css/CSS2/positioning/position-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/positioning/position-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-004.xht b/tests/wpt/tests/css/CSS2/positioning/position-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/positioning/position-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-005.xht b/tests/wpt/tests/css/CSS2/positioning/position-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/positioning/position-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-006.xht b/tests/wpt/tests/css/CSS2/positioning/position-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/positioning/position-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-007.xht b/tests/wpt/tests/css/CSS2/positioning/position-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/positioning/position-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-008.xht b/tests/wpt/tests/css/CSS2/positioning/position-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/positioning/position-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-009.xht b/tests/wpt/tests/css/CSS2/positioning/position-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/positioning/position-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-010.xht b/tests/wpt/tests/css/CSS2/positioning/position-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/positioning/position-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-012.xht b/tests/wpt/tests/css/CSS2/positioning/position-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/positioning/position-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-013.xht b/tests/wpt/tests/css/CSS2/positioning/position-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/positioning/position-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-014.xht b/tests/wpt/tests/css/CSS2/positioning/position-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/positioning/position-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-015.xht b/tests/wpt/tests/css/CSS2/positioning/position-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/positioning/position-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-001.xht b/tests/wpt/tests/css/CSS2/positioning/position-fixed-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-001.xht rename to tests/wpt/tests/css/CSS2/positioning/position-fixed-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-002.xht b/tests/wpt/tests/css/CSS2/positioning/position-fixed-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-002.xht rename to tests/wpt/tests/css/CSS2/positioning/position-fixed-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-003.xht b/tests/wpt/tests/css/CSS2/positioning/position-fixed-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-003.xht rename to tests/wpt/tests/css/CSS2/positioning/position-fixed-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-004.xht b/tests/wpt/tests/css/CSS2/positioning/position-fixed-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-004.xht rename to tests/wpt/tests/css/CSS2/positioning/position-fixed-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-005.xht b/tests/wpt/tests/css/CSS2/positioning/position-fixed-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-005.xht rename to tests/wpt/tests/css/CSS2/positioning/position-fixed-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-006.xht b/tests/wpt/tests/css/CSS2/positioning/position-fixed-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-006.xht rename to tests/wpt/tests/css/CSS2/positioning/position-fixed-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-007-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-fixed-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-007-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-fixed-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-007.xht b/tests/wpt/tests/css/CSS2/positioning/position-fixed-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-fixed-007.xht rename to tests/wpt/tests/css/CSS2/positioning/position-fixed-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-001.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-001.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-002.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-002.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-003-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-003-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-003.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-003.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-004-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-004-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-004.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-004.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-005-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-005-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-005.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-005.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-006.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-006.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-007.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-007.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-008.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-008.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-009.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-009.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-010.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-010.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-013.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-013.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-014-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-014-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-014.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-014.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-015.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-015.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-016-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-016-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-016.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-016.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-017.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-017.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-018-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-018-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-018.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-018.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-019.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-019.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-020.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-020.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-021.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-021.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-022.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-022.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-027-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-027-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-027.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-027.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-028-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-028-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-028.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-028.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-029.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-029.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-030-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-030-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-030-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-030-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-030.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-030.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-031-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-031-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-031-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-031-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-031.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-031.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-032-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-032-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-032-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-032-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-032.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-032.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-033-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-033-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-033-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-033-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-033.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-033.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-034.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-034.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-035-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-035-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-035-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-035-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-035.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-035.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-036.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-036.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-037-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-037-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-037-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-037-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-037.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-037.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-038-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-038-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-038-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-038-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-038.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-038.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-nested-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-nested-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-nested-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-nested-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-nested-001.xht b/tests/wpt/tests/css/CSS2/positioning/position-relative-nested-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-relative-nested-001.xht rename to tests/wpt/tests/css/CSS2/positioning/position-relative-nested-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-static-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/position-static-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-static-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/position-static-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/position-static-001.xht b/tests/wpt/tests/css/CSS2/positioning/position-static-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/position-static-001.xht rename to tests/wpt/tests/css/CSS2/positioning/position-static-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/positioning-float-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/positioning-float-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/positioning-float-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/positioning-float-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/positioning-float-001.xht b/tests/wpt/tests/css/CSS2/positioning/positioning-float-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/positioning-float-001.xht rename to tests/wpt/tests/css/CSS2/positioning/positioning-float-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/positioning-float-002-ref.xht b/tests/wpt/tests/css/CSS2/positioning/positioning-float-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/positioning-float-002-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/positioning-float-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/positioning-float-002.xht b/tests/wpt/tests/css/CSS2/positioning/positioning-float-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/positioning-float-002.xht rename to tests/wpt/tests/css/CSS2/positioning/positioning-float-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/relpos-calcs-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/relpos-calcs-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-001.xht b/tests/wpt/tests/css/CSS2/positioning/relpos-calcs-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-001.xht rename to tests/wpt/tests/css/CSS2/positioning/relpos-calcs-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-002.xht b/tests/wpt/tests/css/CSS2/positioning/relpos-calcs-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-002.xht rename to tests/wpt/tests/css/CSS2/positioning/relpos-calcs-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-003.xht b/tests/wpt/tests/css/CSS2/positioning/relpos-calcs-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-003.xht rename to tests/wpt/tests/css/CSS2/positioning/relpos-calcs-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-004.xht b/tests/wpt/tests/css/CSS2/positioning/relpos-calcs-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-004.xht rename to tests/wpt/tests/css/CSS2/positioning/relpos-calcs-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-005.xht b/tests/wpt/tests/css/CSS2/positioning/relpos-calcs-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-005.xht rename to tests/wpt/tests/css/CSS2/positioning/relpos-calcs-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-006.xht b/tests/wpt/tests/css/CSS2/positioning/relpos-calcs-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-006.xht rename to tests/wpt/tests/css/CSS2/positioning/relpos-calcs-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-007.xht b/tests/wpt/tests/css/CSS2/positioning/relpos-calcs-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-calcs-007.xht rename to tests/wpt/tests/css/CSS2/positioning/relpos-calcs-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-percentage-left-in-scrollable-2.html b/tests/wpt/tests/css/CSS2/positioning/relpos-percentage-left-in-scrollable-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-percentage-left-in-scrollable-2.html rename to tests/wpt/tests/css/CSS2/positioning/relpos-percentage-left-in-scrollable-2.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-percentage-left-in-scrollable.html b/tests/wpt/tests/css/CSS2/positioning/relpos-percentage-left-in-scrollable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-percentage-left-in-scrollable.html rename to tests/wpt/tests/css/CSS2/positioning/relpos-percentage-left-in-scrollable.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-percentage-top-in-scrollable.html b/tests/wpt/tests/css/CSS2/positioning/relpos-percentage-top-in-scrollable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/relpos-percentage-top-in-scrollable.html rename to tests/wpt/tests/css/CSS2/positioning/relpos-percentage-top-in-scrollable.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-004-ref.xht b/tests/wpt/tests/css/CSS2/positioning/right-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-004-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/right-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-004.xht b/tests/wpt/tests/css/CSS2/positioning/right-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-004.xht rename to tests/wpt/tests/css/CSS2/positioning/right-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-005.xht b/tests/wpt/tests/css/CSS2/positioning/right-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-005.xht rename to tests/wpt/tests/css/CSS2/positioning/right-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-006.xht b/tests/wpt/tests/css/CSS2/positioning/right-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-006.xht rename to tests/wpt/tests/css/CSS2/positioning/right-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-007-ref.xht b/tests/wpt/tests/css/CSS2/positioning/right-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-007-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/right-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-007.xht b/tests/wpt/tests/css/CSS2/positioning/right-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-007.xht rename to tests/wpt/tests/css/CSS2/positioning/right-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-008.xht b/tests/wpt/tests/css/CSS2/positioning/right-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-008.xht rename to tests/wpt/tests/css/CSS2/positioning/right-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-016.xht b/tests/wpt/tests/css/CSS2/positioning/right-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-016.xht rename to tests/wpt/tests/css/CSS2/positioning/right-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-017.xht b/tests/wpt/tests/css/CSS2/positioning/right-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-017.xht rename to tests/wpt/tests/css/CSS2/positioning/right-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-018.xht b/tests/wpt/tests/css/CSS2/positioning/right-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-018.xht rename to tests/wpt/tests/css/CSS2/positioning/right-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-019-ref.xht b/tests/wpt/tests/css/CSS2/positioning/right-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-019-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/right-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-019.xht b/tests/wpt/tests/css/CSS2/positioning/right-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-019.xht rename to tests/wpt/tests/css/CSS2/positioning/right-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-020.xht b/tests/wpt/tests/css/CSS2/positioning/right-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-020.xht rename to tests/wpt/tests/css/CSS2/positioning/right-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-028.xht b/tests/wpt/tests/css/CSS2/positioning/right-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-028.xht rename to tests/wpt/tests/css/CSS2/positioning/right-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-029.xht b/tests/wpt/tests/css/CSS2/positioning/right-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-029.xht rename to tests/wpt/tests/css/CSS2/positioning/right-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-030.xht b/tests/wpt/tests/css/CSS2/positioning/right-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-030.xht rename to tests/wpt/tests/css/CSS2/positioning/right-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-031-ref.xht b/tests/wpt/tests/css/CSS2/positioning/right-031-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-031-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/right-031-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-031.xht b/tests/wpt/tests/css/CSS2/positioning/right-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-031.xht rename to tests/wpt/tests/css/CSS2/positioning/right-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-032.xht b/tests/wpt/tests/css/CSS2/positioning/right-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-032.xht rename to tests/wpt/tests/css/CSS2/positioning/right-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-040.xht b/tests/wpt/tests/css/CSS2/positioning/right-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-040.xht rename to tests/wpt/tests/css/CSS2/positioning/right-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-041.xht b/tests/wpt/tests/css/CSS2/positioning/right-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-041.xht rename to tests/wpt/tests/css/CSS2/positioning/right-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-042.xht b/tests/wpt/tests/css/CSS2/positioning/right-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-042.xht rename to tests/wpt/tests/css/CSS2/positioning/right-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-043.xht b/tests/wpt/tests/css/CSS2/positioning/right-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-043.xht rename to tests/wpt/tests/css/CSS2/positioning/right-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-044.xht b/tests/wpt/tests/css/CSS2/positioning/right-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-044.xht rename to tests/wpt/tests/css/CSS2/positioning/right-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-052.xht b/tests/wpt/tests/css/CSS2/positioning/right-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-052.xht rename to tests/wpt/tests/css/CSS2/positioning/right-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-053.xht b/tests/wpt/tests/css/CSS2/positioning/right-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-053.xht rename to tests/wpt/tests/css/CSS2/positioning/right-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-054.xht b/tests/wpt/tests/css/CSS2/positioning/right-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-054.xht rename to tests/wpt/tests/css/CSS2/positioning/right-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-055.xht b/tests/wpt/tests/css/CSS2/positioning/right-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-055.xht rename to tests/wpt/tests/css/CSS2/positioning/right-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-056.xht b/tests/wpt/tests/css/CSS2/positioning/right-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-056.xht rename to tests/wpt/tests/css/CSS2/positioning/right-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-064.xht b/tests/wpt/tests/css/CSS2/positioning/right-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-064.xht rename to tests/wpt/tests/css/CSS2/positioning/right-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-065.xht b/tests/wpt/tests/css/CSS2/positioning/right-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-065.xht rename to tests/wpt/tests/css/CSS2/positioning/right-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-066.xht b/tests/wpt/tests/css/CSS2/positioning/right-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-066.xht rename to tests/wpt/tests/css/CSS2/positioning/right-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-067.xht b/tests/wpt/tests/css/CSS2/positioning/right-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-067.xht rename to tests/wpt/tests/css/CSS2/positioning/right-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-068.xht b/tests/wpt/tests/css/CSS2/positioning/right-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-068.xht rename to tests/wpt/tests/css/CSS2/positioning/right-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-076.xht b/tests/wpt/tests/css/CSS2/positioning/right-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-076.xht rename to tests/wpt/tests/css/CSS2/positioning/right-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-077.xht b/tests/wpt/tests/css/CSS2/positioning/right-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-077.xht rename to tests/wpt/tests/css/CSS2/positioning/right-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-078.xht b/tests/wpt/tests/css/CSS2/positioning/right-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-078.xht rename to tests/wpt/tests/css/CSS2/positioning/right-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-079-ref.xht b/tests/wpt/tests/css/CSS2/positioning/right-079-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-079-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/right-079-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-079.xht b/tests/wpt/tests/css/CSS2/positioning/right-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-079.xht rename to tests/wpt/tests/css/CSS2/positioning/right-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-080.xht b/tests/wpt/tests/css/CSS2/positioning/right-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-080.xht rename to tests/wpt/tests/css/CSS2/positioning/right-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-088.xht b/tests/wpt/tests/css/CSS2/positioning/right-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-088.xht rename to tests/wpt/tests/css/CSS2/positioning/right-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-089.xht b/tests/wpt/tests/css/CSS2/positioning/right-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-089.xht rename to tests/wpt/tests/css/CSS2/positioning/right-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-090.xht b/tests/wpt/tests/css/CSS2/positioning/right-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-090.xht rename to tests/wpt/tests/css/CSS2/positioning/right-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-091.xht b/tests/wpt/tests/css/CSS2/positioning/right-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-091.xht rename to tests/wpt/tests/css/CSS2/positioning/right-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-092.xht b/tests/wpt/tests/css/CSS2/positioning/right-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-092.xht rename to tests/wpt/tests/css/CSS2/positioning/right-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-100-ref.xht b/tests/wpt/tests/css/CSS2/positioning/right-100-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-100-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/right-100-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-100.xht b/tests/wpt/tests/css/CSS2/positioning/right-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-100.xht rename to tests/wpt/tests/css/CSS2/positioning/right-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-101.xht b/tests/wpt/tests/css/CSS2/positioning/right-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-101.xht rename to tests/wpt/tests/css/CSS2/positioning/right-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-102.xht b/tests/wpt/tests/css/CSS2/positioning/right-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-102.xht rename to tests/wpt/tests/css/CSS2/positioning/right-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-103-ref.xht b/tests/wpt/tests/css/CSS2/positioning/right-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-103-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/right-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-103.xht b/tests/wpt/tests/css/CSS2/positioning/right-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-103.xht rename to tests/wpt/tests/css/CSS2/positioning/right-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-104.xht b/tests/wpt/tests/css/CSS2/positioning/right-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-104.xht rename to tests/wpt/tests/css/CSS2/positioning/right-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-109.xht b/tests/wpt/tests/css/CSS2/positioning/right-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-109.xht rename to tests/wpt/tests/css/CSS2/positioning/right-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-110.xht b/tests/wpt/tests/css/CSS2/positioning/right-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-110.xht rename to tests/wpt/tests/css/CSS2/positioning/right-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-111.xht b/tests/wpt/tests/css/CSS2/positioning/right-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-111.xht rename to tests/wpt/tests/css/CSS2/positioning/right-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-112.xht b/tests/wpt/tests/css/CSS2/positioning/right-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-112.xht rename to tests/wpt/tests/css/CSS2/positioning/right-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-113.xht b/tests/wpt/tests/css/CSS2/positioning/right-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-113.xht rename to tests/wpt/tests/css/CSS2/positioning/right-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-001.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-002.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-003.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-004.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-005.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-006.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-007.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-008.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-009.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-010.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-012.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-013.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-014.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-015.xht b/tests/wpt/tests/css/CSS2/positioning/right-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/positioning/right-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-offset-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/right-offset-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-offset-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/right-offset-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-offset-001.xht b/tests/wpt/tests/css/CSS2/positioning/right-offset-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-offset-001.xht rename to tests/wpt/tests/css/CSS2/positioning/right-offset-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-offset-002.xht b/tests/wpt/tests/css/CSS2/positioning/right-offset-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-offset-002.xht rename to tests/wpt/tests/css/CSS2/positioning/right-offset-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-offset-003.xht b/tests/wpt/tests/css/CSS2/positioning/right-offset-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-offset-003.xht rename to tests/wpt/tests/css/CSS2/positioning/right-offset-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-offset-004.xht b/tests/wpt/tests/css/CSS2/positioning/right-offset-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-offset-004.xht rename to tests/wpt/tests/css/CSS2/positioning/right-offset-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-offset-percentage-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/right-offset-percentage-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-offset-percentage-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/right-offset-percentage-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/right-offset-percentage-001.xht b/tests/wpt/tests/css/CSS2/positioning/right-offset-percentage-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/right-offset-percentage-001.xht rename to tests/wpt/tests/css/CSS2/positioning/right-offset-percentage-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/100x100-lime.png b/tests/wpt/tests/css/CSS2/positioning/support/100x100-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/100x100-lime.png rename to tests/wpt/tests/css/CSS2/positioning/support/100x100-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/100x100-red.png b/tests/wpt/tests/css/CSS2/positioning/support/100x100-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/100x100-red.png rename to tests/wpt/tests/css/CSS2/positioning/support/100x100-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/1x1-green.png b/tests/wpt/tests/css/CSS2/positioning/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/positioning/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/positioning/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/positioning/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/positioning/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/positioning/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/positioning/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/positioning/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/1x1-red.png b/tests/wpt/tests/css/CSS2/positioning/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/positioning/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/1x1-white.png b/tests/wpt/tests/css/CSS2/positioning/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/positioning/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/positioning/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/positioning/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/60x60-green.png b/tests/wpt/tests/css/CSS2/positioning/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/positioning/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/a-green.css b/tests/wpt/tests/css/CSS2/positioning/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/a-green.css rename to tests/wpt/tests/css/CSS2/positioning/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/b-green.css b/tests/wpt/tests/css/CSS2/positioning/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/b-green.css rename to tests/wpt/tests/css/CSS2/positioning/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/black15x15.png b/tests/wpt/tests/css/CSS2/positioning/support/black15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/black15x15.png rename to tests/wpt/tests/css/CSS2/positioning/support/black15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/blue15x15.png b/tests/wpt/tests/css/CSS2/positioning/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/positioning/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/blue96x96.png b/tests/wpt/tests/css/CSS2/positioning/support/blue96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/blue96x96.png rename to tests/wpt/tests/css/CSS2/positioning/support/blue96x96.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/c-red.css b/tests/wpt/tests/css/CSS2/positioning/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/c-red.css rename to tests/wpt/tests/css/CSS2/positioning/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/cat.png b/tests/wpt/tests/css/CSS2/positioning/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/cat.png rename to tests/wpt/tests/css/CSS2/positioning/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/diamond.png b/tests/wpt/tests/css/CSS2/positioning/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/diamond.png rename to tests/wpt/tests/css/CSS2/positioning/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/green-rectangle-50wideBy10tall.png b/tests/wpt/tests/css/CSS2/positioning/support/green-rectangle-50wideBy10tall.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/green-rectangle-50wideBy10tall.png rename to tests/wpt/tests/css/CSS2/positioning/support/green-rectangle-50wideBy10tall.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/green15x15.png b/tests/wpt/tests/css/CSS2/positioning/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/green15x15.png rename to tests/wpt/tests/css/CSS2/positioning/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/green_box.png b/tests/wpt/tests/css/CSS2/positioning/support/green_box.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/green_box.png rename to tests/wpt/tests/css/CSS2/positioning/support/green_box.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/positioning/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/positioning/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/positioning/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/positioning/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/red_box.png b/tests/wpt/tests/css/CSS2/positioning/support/red_box.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/red_box.png rename to tests/wpt/tests/css/CSS2/positioning/support/red_box.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/ring.png b/tests/wpt/tests/css/CSS2/positioning/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/ring.png rename to tests/wpt/tests/css/CSS2/positioning/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/square-purple.png b/tests/wpt/tests/css/CSS2/positioning/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/square-purple.png rename to tests/wpt/tests/css/CSS2/positioning/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/square-teal.png b/tests/wpt/tests/css/CSS2/positioning/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/square-teal.png rename to tests/wpt/tests/css/CSS2/positioning/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/square-white.png b/tests/wpt/tests/css/CSS2/positioning/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/square-white.png rename to tests/wpt/tests/css/CSS2/positioning/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/positioning/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/positioning/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/swatch-green.png b/tests/wpt/tests/css/CSS2/positioning/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/positioning/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/positioning/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/positioning/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/positioning/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/positioning/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/swatch-red.png b/tests/wpt/tests/css/CSS2/positioning/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/positioning/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/swatch-white.png b/tests/wpt/tests/css/CSS2/positioning/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/positioning/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/positioning/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/positioning/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/test-bl.png b/tests/wpt/tests/css/CSS2/positioning/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/test-bl.png rename to tests/wpt/tests/css/CSS2/positioning/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/test-br.png b/tests/wpt/tests/css/CSS2/positioning/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/test-br.png rename to tests/wpt/tests/css/CSS2/positioning/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/test-outer.png b/tests/wpt/tests/css/CSS2/positioning/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/test-outer.png rename to tests/wpt/tests/css/CSS2/positioning/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/test-tl.png b/tests/wpt/tests/css/CSS2/positioning/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/test-tl.png rename to tests/wpt/tests/css/CSS2/positioning/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/support/test-tr.png b/tests/wpt/tests/css/CSS2/positioning/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/support/test-tr.png rename to tests/wpt/tests/css/CSS2/positioning/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/toogle-abspos-on-relpos-inline-child.html b/tests/wpt/tests/css/CSS2/positioning/toogle-abspos-on-relpos-inline-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/toogle-abspos-on-relpos-inline-child.html rename to tests/wpt/tests/css/CSS2/positioning/toogle-abspos-on-relpos-inline-child.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-004.xht b/tests/wpt/tests/css/CSS2/positioning/top-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-004.xht rename to tests/wpt/tests/css/CSS2/positioning/top-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-005.xht b/tests/wpt/tests/css/CSS2/positioning/top-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-005.xht rename to tests/wpt/tests/css/CSS2/positioning/top-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-006.xht b/tests/wpt/tests/css/CSS2/positioning/top-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-006.xht rename to tests/wpt/tests/css/CSS2/positioning/top-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-007-ref.xht b/tests/wpt/tests/css/CSS2/positioning/top-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-007-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/top-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-007.xht b/tests/wpt/tests/css/CSS2/positioning/top-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-007.xht rename to tests/wpt/tests/css/CSS2/positioning/top-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-008.xht b/tests/wpt/tests/css/CSS2/positioning/top-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-008.xht rename to tests/wpt/tests/css/CSS2/positioning/top-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-016.xht b/tests/wpt/tests/css/CSS2/positioning/top-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-016.xht rename to tests/wpt/tests/css/CSS2/positioning/top-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-017.xht b/tests/wpt/tests/css/CSS2/positioning/top-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-017.xht rename to tests/wpt/tests/css/CSS2/positioning/top-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-018.xht b/tests/wpt/tests/css/CSS2/positioning/top-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-018.xht rename to tests/wpt/tests/css/CSS2/positioning/top-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-019-ref.xht b/tests/wpt/tests/css/CSS2/positioning/top-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-019-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/top-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-019.xht b/tests/wpt/tests/css/CSS2/positioning/top-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-019.xht rename to tests/wpt/tests/css/CSS2/positioning/top-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-020.xht b/tests/wpt/tests/css/CSS2/positioning/top-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-020.xht rename to tests/wpt/tests/css/CSS2/positioning/top-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-028.xht b/tests/wpt/tests/css/CSS2/positioning/top-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-028.xht rename to tests/wpt/tests/css/CSS2/positioning/top-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-029.xht b/tests/wpt/tests/css/CSS2/positioning/top-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-029.xht rename to tests/wpt/tests/css/CSS2/positioning/top-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-030.xht b/tests/wpt/tests/css/CSS2/positioning/top-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-030.xht rename to tests/wpt/tests/css/CSS2/positioning/top-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-031.xht b/tests/wpt/tests/css/CSS2/positioning/top-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-031.xht rename to tests/wpt/tests/css/CSS2/positioning/top-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-032.xht b/tests/wpt/tests/css/CSS2/positioning/top-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-032.xht rename to tests/wpt/tests/css/CSS2/positioning/top-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-040.xht b/tests/wpt/tests/css/CSS2/positioning/top-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-040.xht rename to tests/wpt/tests/css/CSS2/positioning/top-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-041.xht b/tests/wpt/tests/css/CSS2/positioning/top-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-041.xht rename to tests/wpt/tests/css/CSS2/positioning/top-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-042.xht b/tests/wpt/tests/css/CSS2/positioning/top-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-042.xht rename to tests/wpt/tests/css/CSS2/positioning/top-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-043.xht b/tests/wpt/tests/css/CSS2/positioning/top-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-043.xht rename to tests/wpt/tests/css/CSS2/positioning/top-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-044.xht b/tests/wpt/tests/css/CSS2/positioning/top-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-044.xht rename to tests/wpt/tests/css/CSS2/positioning/top-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-052.xht b/tests/wpt/tests/css/CSS2/positioning/top-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-052.xht rename to tests/wpt/tests/css/CSS2/positioning/top-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-053.xht b/tests/wpt/tests/css/CSS2/positioning/top-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-053.xht rename to tests/wpt/tests/css/CSS2/positioning/top-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-054.xht b/tests/wpt/tests/css/CSS2/positioning/top-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-054.xht rename to tests/wpt/tests/css/CSS2/positioning/top-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-055.xht b/tests/wpt/tests/css/CSS2/positioning/top-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-055.xht rename to tests/wpt/tests/css/CSS2/positioning/top-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-056.xht b/tests/wpt/tests/css/CSS2/positioning/top-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-056.xht rename to tests/wpt/tests/css/CSS2/positioning/top-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-064.xht b/tests/wpt/tests/css/CSS2/positioning/top-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-064.xht rename to tests/wpt/tests/css/CSS2/positioning/top-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-065.xht b/tests/wpt/tests/css/CSS2/positioning/top-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-065.xht rename to tests/wpt/tests/css/CSS2/positioning/top-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-066.xht b/tests/wpt/tests/css/CSS2/positioning/top-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-066.xht rename to tests/wpt/tests/css/CSS2/positioning/top-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-067.xht b/tests/wpt/tests/css/CSS2/positioning/top-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-067.xht rename to tests/wpt/tests/css/CSS2/positioning/top-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-068.xht b/tests/wpt/tests/css/CSS2/positioning/top-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-068.xht rename to tests/wpt/tests/css/CSS2/positioning/top-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-076.xht b/tests/wpt/tests/css/CSS2/positioning/top-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-076.xht rename to tests/wpt/tests/css/CSS2/positioning/top-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-077.xht b/tests/wpt/tests/css/CSS2/positioning/top-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-077.xht rename to tests/wpt/tests/css/CSS2/positioning/top-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-078.xht b/tests/wpt/tests/css/CSS2/positioning/top-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-078.xht rename to tests/wpt/tests/css/CSS2/positioning/top-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-079-ref.xht b/tests/wpt/tests/css/CSS2/positioning/top-079-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-079-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/top-079-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-079.xht b/tests/wpt/tests/css/CSS2/positioning/top-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-079.xht rename to tests/wpt/tests/css/CSS2/positioning/top-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-080.xht b/tests/wpt/tests/css/CSS2/positioning/top-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-080.xht rename to tests/wpt/tests/css/CSS2/positioning/top-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-088.xht b/tests/wpt/tests/css/CSS2/positioning/top-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-088.xht rename to tests/wpt/tests/css/CSS2/positioning/top-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-089.xht b/tests/wpt/tests/css/CSS2/positioning/top-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-089.xht rename to tests/wpt/tests/css/CSS2/positioning/top-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-090.xht b/tests/wpt/tests/css/CSS2/positioning/top-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-090.xht rename to tests/wpt/tests/css/CSS2/positioning/top-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-091.xht b/tests/wpt/tests/css/CSS2/positioning/top-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-091.xht rename to tests/wpt/tests/css/CSS2/positioning/top-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-092.xht b/tests/wpt/tests/css/CSS2/positioning/top-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-092.xht rename to tests/wpt/tests/css/CSS2/positioning/top-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-100.xht b/tests/wpt/tests/css/CSS2/positioning/top-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-100.xht rename to tests/wpt/tests/css/CSS2/positioning/top-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-101.xht b/tests/wpt/tests/css/CSS2/positioning/top-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-101.xht rename to tests/wpt/tests/css/CSS2/positioning/top-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-102.xht b/tests/wpt/tests/css/CSS2/positioning/top-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-102.xht rename to tests/wpt/tests/css/CSS2/positioning/top-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-103.xht b/tests/wpt/tests/css/CSS2/positioning/top-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-103.xht rename to tests/wpt/tests/css/CSS2/positioning/top-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-104.xht b/tests/wpt/tests/css/CSS2/positioning/top-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-104.xht rename to tests/wpt/tests/css/CSS2/positioning/top-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-109.xht b/tests/wpt/tests/css/CSS2/positioning/top-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-109.xht rename to tests/wpt/tests/css/CSS2/positioning/top-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-110.xht b/tests/wpt/tests/css/CSS2/positioning/top-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-110.xht rename to tests/wpt/tests/css/CSS2/positioning/top-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-111.xht b/tests/wpt/tests/css/CSS2/positioning/top-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-111.xht rename to tests/wpt/tests/css/CSS2/positioning/top-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-112.xht b/tests/wpt/tests/css/CSS2/positioning/top-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-112.xht rename to tests/wpt/tests/css/CSS2/positioning/top-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-113-ref.xht b/tests/wpt/tests/css/CSS2/positioning/top-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-113-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/top-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-113.xht b/tests/wpt/tests/css/CSS2/positioning/top-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-113.xht rename to tests/wpt/tests/css/CSS2/positioning/top-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-001.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-002.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-003.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-004.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-005.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-006.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-007.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-008.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-009.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-010.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-012.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-013.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-014.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-015.xht b/tests/wpt/tests/css/CSS2/positioning/top-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/positioning/top-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-offset-001.xht b/tests/wpt/tests/css/CSS2/positioning/top-offset-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-offset-001.xht rename to tests/wpt/tests/css/CSS2/positioning/top-offset-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-offset-002.xht b/tests/wpt/tests/css/CSS2/positioning/top-offset-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-offset-002.xht rename to tests/wpt/tests/css/CSS2/positioning/top-offset-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-offset-003-ref.xht b/tests/wpt/tests/css/CSS2/positioning/top-offset-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-offset-003-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/top-offset-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-offset-003.xht b/tests/wpt/tests/css/CSS2/positioning/top-offset-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-offset-003.xht rename to tests/wpt/tests/css/CSS2/positioning/top-offset-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-offset-percentage-001-ref.xht b/tests/wpt/tests/css/CSS2/positioning/top-offset-percentage-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-offset-percentage-001-ref.xht rename to tests/wpt/tests/css/CSS2/positioning/top-offset-percentage-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-offset-percentage-001.xht b/tests/wpt/tests/css/CSS2/positioning/top-offset-percentage-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-offset-percentage-001.xht rename to tests/wpt/tests/css/CSS2/positioning/top-offset-percentage-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/top-offset-percentage-002.xht b/tests/wpt/tests/css/CSS2/positioning/top-offset-percentage-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/positioning/top-offset-percentage-002.xht rename to tests/wpt/tests/css/CSS2/positioning/top-offset-percentage-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/60x60-green.html b/tests/wpt/tests/css/CSS2/reference/60x60-green.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/60x60-green.html rename to tests/wpt/tests/css/CSS2/reference/60x60-green.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/bidi-005-ref.xht b/tests/wpt/tests/css/CSS2/reference/bidi-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/bidi-005-ref.xht rename to tests/wpt/tests/css/CSS2/reference/bidi-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/bidi-007-ref.xht b/tests/wpt/tests/css/CSS2/reference/bidi-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/bidi-007-ref.xht rename to tests/wpt/tests/css/CSS2/reference/bidi-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/border-seams-001.xht b/tests/wpt/tests/css/CSS2/reference/border-seams-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/border-seams-001.xht rename to tests/wpt/tests/css/CSS2/reference/border-seams-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/boxes_same_color_100px_black_50px_margin.xht b/tests/wpt/tests/css/CSS2/reference/boxes_same_color_100px_black_50px_margin.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/boxes_same_color_100px_black_50px_margin.xht rename to tests/wpt/tests/css/CSS2/reference/boxes_same_color_100px_black_50px_margin.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/filler-text-below-green.xht b/tests/wpt/tests/css/CSS2/reference/filler-text-below-green.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/filler-text-below-green.xht rename to tests/wpt/tests/css/CSS2/reference/filler-text-below-green.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/float-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/reference/float-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/float-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/reference/float-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/inline-svg-100-percent-in-body-ref.html b/tests/wpt/tests/css/CSS2/reference/inline-svg-100-percent-in-body-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/inline-svg-100-percent-in-body-ref.html rename to tests/wpt/tests/css/CSS2/reference/inline-svg-100-percent-in-body-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/inline-svg-margin-padding-border-ref.html b/tests/wpt/tests/css/CSS2/reference/inline-svg-margin-padding-border-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/inline-svg-margin-padding-border-ref.html rename to tests/wpt/tests/css/CSS2/reference/inline-svg-margin-padding-border-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/margin-collapse-002-ref.xht b/tests/wpt/tests/css/CSS2/reference/margin-collapse-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/margin-collapse-002-ref.xht rename to tests/wpt/tests/css/CSS2/reference/margin-collapse-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/no-red-filler-text-ref.xht b/tests/wpt/tests/css/CSS2/reference/no-red-filler-text-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/no-red-filler-text-ref.xht rename to tests/wpt/tests/css/CSS2/reference/no-red-filler-text-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/no-red-on-blank-page-ref.xht b/tests/wpt/tests/css/CSS2/reference/no-red-on-blank-page-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/no-red-on-blank-page-ref.xht rename to tests/wpt/tests/css/CSS2/reference/no-red-on-blank-page-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/no_red_bold_italic_small-caps_ahem.html b/tests/wpt/tests/css/CSS2/reference/no_red_bold_italic_small-caps_ahem.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/no_red_bold_italic_small-caps_ahem.html rename to tests/wpt/tests/css/CSS2/reference/no_red_bold_italic_small-caps_ahem.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/pass-if-number-0-30px.xht b/tests/wpt/tests/css/CSS2/reference/pass-if-number-0-30px.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/pass-if-number-0-30px.xht rename to tests/wpt/tests/css/CSS2/reference/pass-if-number-0-30px.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/pass_if_box_ahem.html b/tests/wpt/tests/css/CSS2/reference/pass_if_box_ahem.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/pass_if_box_ahem.html rename to tests/wpt/tests/css/CSS2/reference/pass_if_box_ahem.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/ref-black-96px-square-no-red.xht b/tests/wpt/tests/css/CSS2/reference/ref-black-96px-square-no-red.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/ref-black-96px-square-no-red.xht rename to tests/wpt/tests/css/CSS2/reference/ref-black-96px-square-no-red.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/ref-filled-black-96px-square.xht b/tests/wpt/tests/css/CSS2/reference/ref-filled-black-96px-square.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/ref-filled-black-96px-square.xht rename to tests/wpt/tests/css/CSS2/reference/ref-filled-black-96px-square.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/ref-filled-green-100px-square.xht b/tests/wpt/tests/css/CSS2/reference/ref-filled-green-100px-square.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/ref-filled-green-100px-square.xht rename to tests/wpt/tests/css/CSS2/reference/ref-filled-green-100px-square.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/ref-green-background.xht b/tests/wpt/tests/css/CSS2/reference/ref-green-background.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/ref-green-background.xht rename to tests/wpt/tests/css/CSS2/reference/ref-green-background.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/ref-if-there-is-no-red.xht b/tests/wpt/tests/css/CSS2/reference/ref-if-there-is-no-red.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/ref-if-there-is-no-red.xht rename to tests/wpt/tests/css/CSS2/reference/ref-if-there-is-no-red.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/ref-no-vert-space-between.xht b/tests/wpt/tests/css/CSS2/reference/ref-no-vert-space-between.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/ref-no-vert-space-between.xht rename to tests/wpt/tests/css/CSS2/reference/ref-no-vert-space-between.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/ref-nothing-below.xht b/tests/wpt/tests/css/CSS2/reference/ref-nothing-below.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/ref-nothing-below.xht rename to tests/wpt/tests/css/CSS2/reference/ref-nothing-below.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/ref-this-text-should-be-green.xht b/tests/wpt/tests/css/CSS2/reference/ref-this-text-should-be-green.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/ref-this-text-should-be-green.xht rename to tests/wpt/tests/css/CSS2/reference/ref-this-text-should-be-green.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/ref-transparent-or-black-square-black.xht b/tests/wpt/tests/css/CSS2/reference/ref-transparent-or-black-square-black.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/ref-transparent-or-black-square-black.xht rename to tests/wpt/tests/css/CSS2/reference/ref-transparent-or-black-square-black.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/reference/ref-transparent-or-black-square-transparent.xht b/tests/wpt/tests/css/CSS2/reference/ref-transparent-or-black-square-transparent.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/reference/ref-transparent-or-black-square-transparent.xht rename to tests/wpt/tests/css/CSS2/reference/ref-transparent-or-black-square-transparent.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/run-in/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/run-in/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/run-in/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/run-in/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/adjacent-000-ref.xht b/tests/wpt/tests/css/CSS2/sec5/adjacent-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/adjacent-000-ref.xht rename to tests/wpt/tests/css/CSS2/sec5/adjacent-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/adjacent-000.xht b/tests/wpt/tests/css/CSS2/sec5/adjacent-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/adjacent-000.xht rename to tests/wpt/tests/css/CSS2/sec5/adjacent-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/adjacent-001.xht b/tests/wpt/tests/css/CSS2/sec5/adjacent-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/adjacent-001.xht rename to tests/wpt/tests/css/CSS2/sec5/adjacent-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/adjacent-002.xht b/tests/wpt/tests/css/CSS2/sec5/adjacent-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/adjacent-002.xht rename to tests/wpt/tests/css/CSS2/sec5/adjacent-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-000.xht b/tests/wpt/tests/css/CSS2/sec5/attribute-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-000.xht rename to tests/wpt/tests/css/CSS2/sec5/attribute-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-001.xht b/tests/wpt/tests/css/CSS2/sec5/attribute-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-001.xht rename to tests/wpt/tests/css/CSS2/sec5/attribute-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-002.xht b/tests/wpt/tests/css/CSS2/sec5/attribute-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-002.xht rename to tests/wpt/tests/css/CSS2/sec5/attribute-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-003.xht b/tests/wpt/tests/css/CSS2/sec5/attribute-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-003.xht rename to tests/wpt/tests/css/CSS2/sec5/attribute-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-004.xht b/tests/wpt/tests/css/CSS2/sec5/attribute-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-004.xht rename to tests/wpt/tests/css/CSS2/sec5/attribute-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-005.xht b/tests/wpt/tests/css/CSS2/sec5/attribute-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-005.xht rename to tests/wpt/tests/css/CSS2/sec5/attribute-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-006.xht b/tests/wpt/tests/css/CSS2/sec5/attribute-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-006.xht rename to tests/wpt/tests/css/CSS2/sec5/attribute-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-007.xht b/tests/wpt/tests/css/CSS2/sec5/attribute-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-007.xht rename to tests/wpt/tests/css/CSS2/sec5/attribute-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-ref.xht b/tests/wpt/tests/css/CSS2/sec5/attribute-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/attribute-ref.xht rename to tests/wpt/tests/css/CSS2/sec5/attribute-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/class-000-ref.html b/tests/wpt/tests/css/CSS2/sec5/class-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/class-000-ref.html rename to tests/wpt/tests/css/CSS2/sec5/class-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/class-000.xht b/tests/wpt/tests/css/CSS2/sec5/class-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/class-000.xht rename to tests/wpt/tests/css/CSS2/sec5/class-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/class-001.xht b/tests/wpt/tests/css/CSS2/sec5/class-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/class-001.xht rename to tests/wpt/tests/css/CSS2/sec5/class-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/class-002-ref.html b/tests/wpt/tests/css/CSS2/sec5/class-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/class-002-ref.html rename to tests/wpt/tests/css/CSS2/sec5/class-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/class-002.xht b/tests/wpt/tests/css/CSS2/sec5/class-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/class-002.xht rename to tests/wpt/tests/css/CSS2/sec5/class-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/descendant-selector-000-ref.xht b/tests/wpt/tests/css/CSS2/sec5/descendant-selector-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/descendant-selector-000-ref.xht rename to tests/wpt/tests/css/CSS2/sec5/descendant-selector-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/descendant-selector-000.xht b/tests/wpt/tests/css/CSS2/sec5/descendant-selector-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/descendant-selector-000.xht rename to tests/wpt/tests/css/CSS2/sec5/descendant-selector-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/descendant-selector-001.xht b/tests/wpt/tests/css/CSS2/sec5/descendant-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/descendant-selector-001.xht rename to tests/wpt/tests/css/CSS2/sec5/descendant-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/dynamic-pseudo-classes-000.xht b/tests/wpt/tests/css/CSS2/sec5/dynamic-pseudo-classes-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/dynamic-pseudo-classes-000.xht rename to tests/wpt/tests/css/CSS2/sec5/dynamic-pseudo-classes-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/dynamic-pseudo-classes-001.xht b/tests/wpt/tests/css/CSS2/sec5/dynamic-pseudo-classes-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/dynamic-pseudo-classes-001.xht rename to tests/wpt/tests/css/CSS2/sec5/dynamic-pseudo-classes-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/dynamic-pseudo-classes-002.xht b/tests/wpt/tests/css/CSS2/sec5/dynamic-pseudo-classes-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/dynamic-pseudo-classes-002.xht rename to tests/wpt/tests/css/CSS2/sec5/dynamic-pseudo-classes-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/dynamic-pseudo-classes-003.xht b/tests/wpt/tests/css/CSS2/sec5/dynamic-pseudo-classes-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/dynamic-pseudo-classes-003.xht rename to tests/wpt/tests/css/CSS2/sec5/dynamic-pseudo-classes-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/first-child-000-ref.html b/tests/wpt/tests/css/CSS2/sec5/first-child-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/first-child-000-ref.html rename to tests/wpt/tests/css/CSS2/sec5/first-child-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/first-child-000.xht b/tests/wpt/tests/css/CSS2/sec5/first-child-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/first-child-000.xht rename to tests/wpt/tests/css/CSS2/sec5/first-child-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/first-child-001.xht b/tests/wpt/tests/css/CSS2/sec5/first-child-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/first-child-001.xht rename to tests/wpt/tests/css/CSS2/sec5/first-child-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/first-letter-000.xht b/tests/wpt/tests/css/CSS2/sec5/first-letter-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/first-letter-000.xht rename to tests/wpt/tests/css/CSS2/sec5/first-letter-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/first-line-000-ref.html b/tests/wpt/tests/css/CSS2/sec5/first-line-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/first-line-000-ref.html rename to tests/wpt/tests/css/CSS2/sec5/first-line-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/first-line-000.xht b/tests/wpt/tests/css/CSS2/sec5/first-line-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/first-line-000.xht rename to tests/wpt/tests/css/CSS2/sec5/first-line-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/grouping-000-notref.xht b/tests/wpt/tests/css/CSS2/sec5/grouping-000-notref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/grouping-000-notref.xht rename to tests/wpt/tests/css/CSS2/sec5/grouping-000-notref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/grouping-000-ref.xht b/tests/wpt/tests/css/CSS2/sec5/grouping-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/grouping-000-ref.xht rename to tests/wpt/tests/css/CSS2/sec5/grouping-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/grouping-000.xht b/tests/wpt/tests/css/CSS2/sec5/grouping-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/grouping-000.xht rename to tests/wpt/tests/css/CSS2/sec5/grouping-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/grouping-001.xht b/tests/wpt/tests/css/CSS2/sec5/grouping-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/grouping-001.xht rename to tests/wpt/tests/css/CSS2/sec5/grouping-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/id-000.xht b/tests/wpt/tests/css/CSS2/sec5/id-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/id-000.xht rename to tests/wpt/tests/css/CSS2/sec5/id-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/sec5/id-001.xht b/tests/wpt/tests/css/CSS2/sec5/id-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/sec5/id-001.xht rename to tests/wpt/tests/css/CSS2/sec5/id-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/section-index.xht b/tests/wpt/tests/css/CSS2/section-index.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/section-index.xht rename to tests/wpt/tests/css/CSS2/section-index.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-007-ref.html b/tests/wpt/tests/css/CSS2/selector/attribute-value-selector-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-007-ref.html rename to tests/wpt/tests/css/CSS2/selector/attribute-value-selector-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-007.html b/tests/wpt/tests/css/CSS2/selector/attribute-value-selector-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-007.html rename to tests/wpt/tests/css/CSS2/selector/attribute-value-selector-007.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-008-ref.html b/tests/wpt/tests/css/CSS2/selector/attribute-value-selector-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-008-ref.html rename to tests/wpt/tests/css/CSS2/selector/attribute-value-selector-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-008.xht b/tests/wpt/tests/css/CSS2/selector/attribute-value-selector-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-008.xht rename to tests/wpt/tests/css/CSS2/selector/attribute-value-selector-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-009-ref.html b/tests/wpt/tests/css/CSS2/selector/attribute-value-selector-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-009-ref.html rename to tests/wpt/tests/css/CSS2/selector/attribute-value-selector-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-009.xht b/tests/wpt/tests/css/CSS2/selector/attribute-value-selector-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-009.xht rename to tests/wpt/tests/css/CSS2/selector/attribute-value-selector-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-010-ref.html b/tests/wpt/tests/css/CSS2/selector/attribute-value-selector-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-010-ref.html rename to tests/wpt/tests/css/CSS2/selector/attribute-value-selector-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-010.html b/tests/wpt/tests/css/CSS2/selector/attribute-value-selector-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selector/attribute-value-selector-010.html rename to tests/wpt/tests/css/CSS2/selector/attribute-value-selector-010.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selector/lang-pseudoclass-001-ref.html b/tests/wpt/tests/css/CSS2/selector/lang-pseudoclass-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selector/lang-pseudoclass-001-ref.html rename to tests/wpt/tests/css/CSS2/selector/lang-pseudoclass-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selector/lang-pseudoclass-001.html b/tests/wpt/tests/css/CSS2/selector/lang-pseudoclass-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selector/lang-pseudoclass-001.html rename to tests/wpt/tests/css/CSS2/selector/lang-pseudoclass-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selector/lang-pseudoclass-002.xht b/tests/wpt/tests/css/CSS2/selector/lang-pseudoclass-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selector/lang-pseudoclass-002.xht rename to tests/wpt/tests/css/CSS2/selector/lang-pseudoclass-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/.htaccess b/tests/wpt/tests/css/CSS2/selectors/.htaccess similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/.htaccess rename to tests/wpt/tests/css/CSS2/selectors/.htaccess diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/active-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/active-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/active-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/active-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/active-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/active-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/active-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/active-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/attribute-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/attribute-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/attribute-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/attribute-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-token-selector-002-ref.xht b/tests/wpt/tests/css/CSS2/selectors/attribute-token-selector-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-token-selector-002-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/attribute-token-selector-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-token-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/attribute-token-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-token-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/attribute-token-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-value-selector-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/attribute-value-selector-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-value-selector-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/attribute-value-selector-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-value-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/attribute-value-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-value-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/attribute-value-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-value-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/attribute-value-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-value-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/attribute-value-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-value-selector-003.xht b/tests/wpt/tests/css/CSS2/selectors/attribute-value-selector-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-value-selector-003.xht rename to tests/wpt/tests/css/CSS2/selectors/attribute-value-selector-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-value-selector-004.xht b/tests/wpt/tests/css/CSS2/selectors/attribute-value-selector-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-value-selector-004.xht rename to tests/wpt/tests/css/CSS2/selectors/attribute-value-selector-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-value-selector-005.html b/tests/wpt/tests/css/CSS2/selectors/attribute-value-selector-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-value-selector-005.html rename to tests/wpt/tests/css/CSS2/selectors/attribute-value-selector-005.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-value-selector-006.xht b/tests/wpt/tests/css/CSS2/selectors/attribute-value-selector-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/attribute-value-selector-006.xht rename to tests/wpt/tests/css/CSS2/selectors/attribute-value-selector-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/before-after-selector-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/before-after-selector-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/before-after-selector-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/before-after-selector-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/before-after-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/before-after-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/before-after-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/before-after-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/before-first-letter-selector-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/before-first-letter-selector-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/before-first-letter-selector-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/before-first-letter-selector-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/before-first-letter-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/before-first-letter-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/before-first-letter-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/before-first-letter-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/bidi-first-letter-001.xht b/tests/wpt/tests/css/CSS2/selectors/bidi-first-letter-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/bidi-first-letter-001.xht rename to tests/wpt/tests/css/CSS2/selectors/bidi-first-letter-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/bidi-first-letter-002.xht b/tests/wpt/tests/css/CSS2/selectors/bidi-first-letter-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/bidi-first-letter-002.xht rename to tests/wpt/tests/css/CSS2/selectors/bidi-first-letter-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/bidi-first-letter-003.xht b/tests/wpt/tests/css/CSS2/selectors/bidi-first-letter-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/bidi-first-letter-003.xht rename to tests/wpt/tests/css/CSS2/selectors/bidi-first-letter-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/bidi-first-letter-004.xht b/tests/wpt/tests/css/CSS2/selectors/bidi-first-letter-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/bidi-first-letter-004.xht rename to tests/wpt/tests/css/CSS2/selectors/bidi-first-letter-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/bidi-first-letter-005.xht b/tests/wpt/tests/css/CSS2/selectors/bidi-first-letter-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/bidi-first-letter-005.xht rename to tests/wpt/tests/css/CSS2/selectors/bidi-first-letter-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/bidi-first-letter-006.xht b/tests/wpt/tests/css/CSS2/selectors/bidi-first-letter-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/bidi-first-letter-006.xht rename to tests/wpt/tests/css/CSS2/selectors/bidi-first-letter-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/child-selector-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/child-selector-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/child-selector-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/child-selector-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/child-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/child-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/child-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/child-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/child-selector-002-ref.xht b/tests/wpt/tests/css/CSS2/selectors/child-selector-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/child-selector-002-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/child-selector-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/child-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/child-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/child-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/child-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/child-selector-003-ref.xht b/tests/wpt/tests/css/CSS2/selectors/child-selector-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/child-selector-003-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/child-selector-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/child-selector-003.xht b/tests/wpt/tests/css/CSS2/selectors/child-selector-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/child-selector-003.xht rename to tests/wpt/tests/css/CSS2/selectors/child-selector-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/class-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/class-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/class-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/class-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-003.xht b/tests/wpt/tests/css/CSS2/selectors/class-selector-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-003.xht rename to tests/wpt/tests/css/CSS2/selectors/class-selector-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-004.xht b/tests/wpt/tests/css/CSS2/selectors/class-selector-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-004.xht rename to tests/wpt/tests/css/CSS2/selectors/class-selector-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-005.xht b/tests/wpt/tests/css/CSS2/selectors/class-selector-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-005.xht rename to tests/wpt/tests/css/CSS2/selectors/class-selector-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-006.xht b/tests/wpt/tests/css/CSS2/selectors/class-selector-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-006.xht rename to tests/wpt/tests/css/CSS2/selectors/class-selector-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-007.xht b/tests/wpt/tests/css/CSS2/selectors/class-selector-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-007.xht rename to tests/wpt/tests/css/CSS2/selectors/class-selector-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-008.xht b/tests/wpt/tests/css/CSS2/selectors/class-selector-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-008.xht rename to tests/wpt/tests/css/CSS2/selectors/class-selector-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-009.xht b/tests/wpt/tests/css/CSS2/selectors/class-selector-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-009.xht rename to tests/wpt/tests/css/CSS2/selectors/class-selector-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-010.xht b/tests/wpt/tests/css/CSS2/selectors/class-selector-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-010.xht rename to tests/wpt/tests/css/CSS2/selectors/class-selector-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-011.xht b/tests/wpt/tests/css/CSS2/selectors/class-selector-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-011.xht rename to tests/wpt/tests/css/CSS2/selectors/class-selector-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-012-ref.html b/tests/wpt/tests/css/CSS2/selectors/class-selector-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-012-ref.html rename to tests/wpt/tests/css/CSS2/selectors/class-selector-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-012.xht b/tests/wpt/tests/css/CSS2/selectors/class-selector-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/class-selector-012.xht rename to tests/wpt/tests/css/CSS2/selectors/class-selector-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/combinator-001.xht b/tests/wpt/tests/css/CSS2/selectors/combinator-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/combinator-001.xht rename to tests/wpt/tests/css/CSS2/selectors/combinator-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/combinator-002.xht b/tests/wpt/tests/css/CSS2/selectors/combinator-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/combinator-002.xht rename to tests/wpt/tests/css/CSS2/selectors/combinator-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/combinator-003.xht b/tests/wpt/tests/css/CSS2/selectors/combinator-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/combinator-003.xht rename to tests/wpt/tests/css/CSS2/selectors/combinator-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/combinator-004.xht b/tests/wpt/tests/css/CSS2/selectors/combinator-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/combinator-004.xht rename to tests/wpt/tests/css/CSS2/selectors/combinator-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-003.xht b/tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-003.xht rename to tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-004.xht b/tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-004.xht rename to tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-005.xht b/tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-005.xht rename to tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-006.xht b/tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-006.xht rename to tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-007.xht b/tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-007.xht rename to tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-008.xht b/tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-008.xht rename to tests/wpt/tests/css/CSS2/selectors/default-attribute-selector-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/descendent-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/descendent-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-002-ref.xht b/tests/wpt/tests/css/CSS2/selectors/descendent-selector-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-002-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/descendent-selector-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/descendent-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/descendent-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-003.xht b/tests/wpt/tests/css/CSS2/selectors/descendent-selector-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-003.xht rename to tests/wpt/tests/css/CSS2/selectors/descendent-selector-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-004-ref.xht b/tests/wpt/tests/css/CSS2/selectors/descendent-selector-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-004-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/descendent-selector-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-004.xht b/tests/wpt/tests/css/CSS2/selectors/descendent-selector-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-004.xht rename to tests/wpt/tests/css/CSS2/selectors/descendent-selector-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-005.xht b/tests/wpt/tests/css/CSS2/selectors/descendent-selector-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-005.xht rename to tests/wpt/tests/css/CSS2/selectors/descendent-selector-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-006.xht b/tests/wpt/tests/css/CSS2/selectors/descendent-selector-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-006.xht rename to tests/wpt/tests/css/CSS2/selectors/descendent-selector-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-007.xht b/tests/wpt/tests/css/CSS2/selectors/descendent-selector-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-007.xht rename to tests/wpt/tests/css/CSS2/selectors/descendent-selector-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-008.xht b/tests/wpt/tests/css/CSS2/selectors/descendent-selector-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-008.xht rename to tests/wpt/tests/css/CSS2/selectors/descendent-selector-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-009.xht b/tests/wpt/tests/css/CSS2/selectors/descendent-selector-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-009.xht rename to tests/wpt/tests/css/CSS2/selectors/descendent-selector-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-010.xht b/tests/wpt/tests/css/CSS2/selectors/descendent-selector-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-010.xht rename to tests/wpt/tests/css/CSS2/selectors/descendent-selector-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-011.xht b/tests/wpt/tests/css/CSS2/selectors/descendent-selector-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/descendent-selector-011.xht rename to tests/wpt/tests/css/CSS2/selectors/descendent-selector-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/dom-hover-001.xht b/tests/wpt/tests/css/CSS2/selectors/dom-hover-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/dom-hover-001.xht rename to tests/wpt/tests/css/CSS2/selectors/dom-hover-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/dom-hover-002.xht b/tests/wpt/tests/css/CSS2/selectors/dom-hover-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/dom-hover-002.xht rename to tests/wpt/tests/css/CSS2/selectors/dom-hover-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/dynamic-sibling-combinator-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/dynamic-sibling-combinator-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/dynamic-sibling-combinator-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/dynamic-sibling-combinator-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/dynamic-sibling-combinator-001.xht b/tests/wpt/tests/css/CSS2/selectors/dynamic-sibling-combinator-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/dynamic-sibling-combinator-001.xht rename to tests/wpt/tests/css/CSS2/selectors/dynamic-sibling-combinator-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-child-selector-001-ref.html b/tests/wpt/tests/css/CSS2/selectors/first-child-selector-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-child-selector-001-ref.html rename to tests/wpt/tests/css/CSS2/selectors/first-child-selector-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-child-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/first-child-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-child-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/first-child-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-child-selector-002-ref.html b/tests/wpt/tests/css/CSS2/selectors/first-child-selector-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-child-selector-002-ref.html rename to tests/wpt/tests/css/CSS2/selectors/first-child-selector-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-child-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/first-child-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-child-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/first-child-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-child-selector-003.xht b/tests/wpt/tests/css/CSS2/selectors/first-child-selector-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-child-selector-003.xht rename to tests/wpt/tests/css/CSS2/selectors/first-child-selector-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-001.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-001.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-abspos-ref.html b/tests/wpt/tests/css/CSS2/selectors/first-letter-abspos-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-abspos-ref.html rename to tests/wpt/tests/css/CSS2/selectors/first-letter-abspos-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-abspos.html b/tests/wpt/tests/css/CSS2/selectors/first-letter-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-abspos.html rename to tests/wpt/tests/css/CSS2/selectors/first-letter-abspos.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-dynamic-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-dynamic-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-dynamic-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-dynamic-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-dynamic-001.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-dynamic-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-dynamic-001.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-dynamic-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-dynamic-002-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-dynamic-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-dynamic-002-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-dynamic-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-dynamic-002.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-dynamic-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-dynamic-002.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-dynamic-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-dynamic-003-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-dynamic-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-dynamic-003-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-dynamic-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-dynamic-003a.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-dynamic-003a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-dynamic-003a.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-dynamic-003a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-dynamic-003b.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-dynamic-003b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-dynamic-003b.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-dynamic-003b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-inherit-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-inherit-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-inherit-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-inherit-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-inherit-001.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-inherit-001.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-nested-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-nested-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-001.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-nested-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-001.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-nested-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-002.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-nested-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-002.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-nested-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-003.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-nested-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-003.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-nested-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-004.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-nested-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-004.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-nested-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-005.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-nested-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-005.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-nested-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-006.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-nested-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-006.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-nested-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-007.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-nested-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-nested-007.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-nested-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-001.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-001.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-002-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-002-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-002.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-002.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-003-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-003-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-003.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-003.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-004-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-004-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-004.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-004.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-005-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-005-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-005.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-005.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-006-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-006-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-006.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-006.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-007-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-007-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-007.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-007.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-008-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-008-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-008.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-008.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-009-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-009-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-009.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-009.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-010-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-010-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-010.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-010.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-012-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-012-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-012.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-012.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-013-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-013-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-013.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-013.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-014-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-014-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-014.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-014.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-015-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-015-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-015.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-015.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-016-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-016-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-016.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-016.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-017-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-017-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-017.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-017.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-018-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-018-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-018.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-018.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-019-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-019-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-019.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-019.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-020-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-020-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-020.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-020.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-021-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-021-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-021.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-021.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-022-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-022-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-022.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-022.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-023-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-023-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-023.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-023.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-024-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-024-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-024-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-024-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-024.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-024.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-025-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-025-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-025.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-025.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-026-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-026-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-026.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-026.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-027-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-027-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-027.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-027.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-028-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-028-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-028.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-028.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-029-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-029-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-029-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-029-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-029.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-029.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-030-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-030-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-030-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-030-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-030.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-030.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-031-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-031-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-031-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-031-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-031.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-031.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-032-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-032-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-032-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-032-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-032.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-032.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-033-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-033-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-033-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-033-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-033.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-033.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-034-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-034-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-034-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-034-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-034.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-034.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-035-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-035-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-035-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-035-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-035.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-035.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-036-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-036-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-036-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-036-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-036.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-036.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-037-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-037-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-037-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-037-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-037.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-037.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-038-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-038-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-038-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-038-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-038.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-038.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-039-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-039-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-039-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-039-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-039.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-039.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-040-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-040-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-040-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-040-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-040.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-040.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-041-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-041-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-041-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-041-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-041.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-041.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-042-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-042-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-042-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-042-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-042.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-042.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-043-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-043-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-043-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-043-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-043.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-043.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-044-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-044-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-044-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-044-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-044.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-044.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-045-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-045-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-045-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-045-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-045.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-045.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-046-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-046-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-046-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-046-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-046.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-046.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-047-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-047-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-047-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-047-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-047.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-047.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-048-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-048-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-048-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-048-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-048.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-048.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-049-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-049-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-049-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-049-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-049.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-049.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-050-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-050-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-050-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-050-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-050.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-050.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-051-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-051-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-051-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-051-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-051.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-051.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-052-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-052-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-052-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-052-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-052.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-052.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-053-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-053-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-053-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-053-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-053.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-053.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-054-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-054-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-054-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-054-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-054.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-054.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-055-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-055-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-055-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-055-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-055.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-055.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-056-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-056-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-056-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-056-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-056.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-056.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-057-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-057-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-057-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-057-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-057.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-057.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-058-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-058-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-058-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-058-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-058.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-058.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-059-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-059-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-059-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-059-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-059.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-059.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-060-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-060-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-060-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-060-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-060.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-060.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-061-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-061-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-061-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-061-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-061.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-061.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-062-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-062-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-062-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-062-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-062.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-062.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-063-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-063-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-063-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-063-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-063.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-063.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-064-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-064-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-064-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-064-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-064.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-064.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-065-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-065-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-065-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-065-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-065.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-065.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-066-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-066-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-066-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-066-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-066.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-066.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-067-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-067-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-067-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-067-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-067.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-067.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-068-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-068-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-068-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-068-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-068.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-068.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-069-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-069-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-069-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-069-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-069.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-069.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-070-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-070-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-070-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-070-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-070.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-070.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-071-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-071-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-071-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-071-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-071.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-071.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-072-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-072-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-072-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-072-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-072.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-072.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-073-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-073-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-073-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-073-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-073.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-073.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-074-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-074-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-074-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-074-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-074.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-074.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-075-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-075-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-075-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-075-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-075.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-075.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-076-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-076-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-076-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-076-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-076.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-076.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-077-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-077-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-077-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-077-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-077.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-077.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-078-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-078-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-078-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-078-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-078.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-078.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-079-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-079-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-079-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-079-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-079.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-079.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-080-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-080-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-080-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-080-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-080.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-080.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-081-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-081-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-081-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-081-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-081.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-081.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-082-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-082-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-082-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-082-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-082.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-082.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-083-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-083-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-083-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-083-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-083.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-083.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-084-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-084-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-084-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-084-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-084.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-084.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-085-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-085-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-085-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-085-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-085.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-085.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-086-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-086-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-086-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-086-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-086.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-086.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-087-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-087-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-087-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-087-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-087.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-087.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-087.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-088-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-088-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-088-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-088-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-088.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-088.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-089-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-089-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-089-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-089-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-089.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-089.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-090-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-090-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-090-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-090-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-090.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-090.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-091-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-091-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-091-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-091-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-091.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-091.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-092-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-092-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-092-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-092-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-092.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-092.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-093-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-093-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-093-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-093-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-093.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-093.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-094-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-094-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-094-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-094-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-094.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-094.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-095-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-095-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-095-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-095-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-095.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-095.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-096-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-096-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-096-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-096-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-096.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-096.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-097-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-097-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-097-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-097-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-097.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-097.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-098-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-098-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-098-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-098-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-098.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-098.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-099-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-099-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-099-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-099-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-099.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-099.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-100-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-100-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-100-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-100-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-100.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-100.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-101-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-101-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-101-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-101-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-101.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-101.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-102-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-102-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-102-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-102-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-102.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-102.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-103-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-103-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-103.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-103.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-104-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-104-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-104-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-104-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-104.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-104.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-105-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-105-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-105-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-105-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-105.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-105.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-106-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-106-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-106-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-106-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-106.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-106.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-107-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-107-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-107-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-107-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-107.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-107.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-108-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-108-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-108-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-108-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-108.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-108.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-109-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-109-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-109-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-109-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-109.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-109.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-110-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-110-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-110-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-110-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-110.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-110.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-111-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-111-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-111-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-111-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-111.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-111.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-112-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-112-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-112-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-112-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-112.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-112.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-113-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-113-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-113.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-113.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-115-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-115-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-115-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-115-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-115.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-115.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-116-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-116-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-116-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-116-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-116.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-116.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-117-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-117-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-117-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-117-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-117.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-117.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-118-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-118-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-118-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-118-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-118.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-118.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-119-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-119-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-119-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-119-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-119.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-119.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-120-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-120-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-120-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-120-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-120.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-120.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-121-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-121-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-121-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-121-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-121.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-121.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-122-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-122-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-122-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-122-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-122.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-122.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-123-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-123-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-123-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-123-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-123.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-123.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-124-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-124-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-124-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-124-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-124.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-124.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-124.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-125-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-125-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-125-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-125-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-125.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-125.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-125.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-126-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-126-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-126-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-126-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-126.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-126.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-127-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-127-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-127-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-127-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-127.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-127.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-128-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-128-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-128-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-128-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-128.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-128.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-128.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-129-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-129-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-129-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-129-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-129.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-129.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-130-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-130-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-130-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-130-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-130.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-130.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-130.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-131-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-131-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-131-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-131-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-131.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-131.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-131.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-132-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-132-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-132-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-132-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-132.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-132.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-132.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-133-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-133-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-133-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-133-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-133.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-133.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-133.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-133.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-134-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-134-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-134-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-134-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-134.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-134.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-134.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-134.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-135-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-135-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-135-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-135-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-135.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-135.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-135.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-136-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-136-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-136-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-136-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-136.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-136.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-136.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-136.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-137-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-137-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-137-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-137-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-137.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-137.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-137.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-137.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-138-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-138-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-138-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-138-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-138.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-138.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-138.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-139-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-139-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-139-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-139-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-139.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-139.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-139.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-139.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-140-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-140-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-140-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-140-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-140.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-140.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-140.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-141-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-141-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-141-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-141-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-141.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-141.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-141.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-142-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-142-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-142-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-142-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-142.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-142.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-142.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-143-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-143-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-143-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-143-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-143.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-143.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-143.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-144-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-144-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-144-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-144-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-144.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-144.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-144.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-145-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-145-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-145-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-145-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-145.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-145.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-146-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-146-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-146-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-146-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-146.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-146.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-146.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-146.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-147-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-147-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-147-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-147-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-147.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-147.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-147.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-147.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-148-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-148-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-148-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-148-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-148.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-148.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-148.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-148.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-149-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-149-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-149-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-149-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-149.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-149.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-149.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-149.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-150-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-150-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-150-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-150-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-150.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-150.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-150.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-150.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-151-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-151-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-151-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-151-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-151.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-151.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-151.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-151.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-152-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-152-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-152-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-152-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-152.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-152.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-152.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-152.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-153-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-153-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-153-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-153-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-153.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-153.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-153.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-153.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-154-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-154-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-154-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-154-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-154.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-154.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-154.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-154.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-155-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-155-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-155-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-155-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-155.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-155.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-155.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-155.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-156-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-156-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-156-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-156-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-156.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-156.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-156.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-156.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-157-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-157-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-157-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-157-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-157.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-157.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-157.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-157.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-158-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-158-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-158-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-158-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-158.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-158.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-158.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-158.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-159-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-159-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-159-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-159-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-159.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-159.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-159.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-159.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-160-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-160-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-160-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-160-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-160.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-160.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-160.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-160.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-161-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-161-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-161-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-161-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-161.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-161.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-161.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-161.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-162-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-162-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-162-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-162-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-162.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-162.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-162.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-162.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-163-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-163-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-163-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-163-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-163.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-163.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-163.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-163.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-164-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-164-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-164-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-164-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-164.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-164.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-164.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-164.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-165-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-165-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-165-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-165-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-165.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-165.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-165.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-165.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-166-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-166-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-166-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-166-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-166.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-166.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-166.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-166.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-167-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-167-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-167-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-167-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-167.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-167.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-167.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-167.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-168-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-168-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-168-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-168-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-168.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-168.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-168.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-168.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-169-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-169-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-169-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-169-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-169.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-169.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-169.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-169.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-170-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-170-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-170-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-170-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-170.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-170.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-170.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-170.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-171-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-171-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-171-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-171-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-171.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-171.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-171.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-171.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-172-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-172-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-172-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-172-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-172.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-172.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-172.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-172.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-173-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-173-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-173-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-173-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-173.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-173.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-173.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-173.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-174-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-174-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-174-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-174-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-174.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-174.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-174.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-174.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-175-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-175-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-175-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-175-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-175.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-175.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-175.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-175.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-176-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-176-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-176-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-176-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-176.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-176.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-176.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-176.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-177-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-177-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-177-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-177-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-177.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-177.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-177.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-177.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-178-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-178-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-178-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-178-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-178.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-178.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-178.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-178.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-179-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-179-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-179-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-179-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-179.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-179.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-179.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-179.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-180-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-180-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-180-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-180-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-180.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-180.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-180.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-180.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-181-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-181-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-181-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-181-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-181.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-181.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-181.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-181.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-182-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-182-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-182-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-182-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-182.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-182.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-182.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-182.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-183-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-183-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-183-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-183-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-183.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-183.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-183.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-183.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-185-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-185-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-185-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-185-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-185.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-185.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-185.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-185.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-186-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-186-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-186-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-186-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-186.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-186.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-186.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-186.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-187-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-187-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-187-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-187-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-187.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-187.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-187.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-187.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-188-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-188-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-188-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-188-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-188.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-188.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-188.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-188.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-189-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-189-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-189-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-189-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-189.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-189.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-189.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-189.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-190-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-190-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-190-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-190-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-190.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-190.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-190.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-190.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-191-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-191-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-191-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-191-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-191.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-191.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-191.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-191.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-192-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-192-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-192-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-192-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-192.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-192.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-192.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-192.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-193-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-193-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-193-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-193-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-193.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-193.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-193.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-193.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-194-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-194-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-194-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-194-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-194.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-194.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-194.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-194.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-195-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-195-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-195-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-195-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-195.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-195.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-195.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-195.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-196-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-196-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-196-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-196-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-196.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-196.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-196.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-196.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-197-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-197-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-197-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-197-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-197.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-197.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-197.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-197.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-198-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-198-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-198-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-198-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-198.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-198.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-198.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-198.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-199-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-199-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-199-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-199-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-199.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-199.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-199.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-199.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-200-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-200-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-200-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-200-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-200.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-200.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-200.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-200.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-201-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-201-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-201-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-201-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-201.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-201.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-201.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-201.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-202-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-202-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-202-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-202-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-202.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-202.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-202.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-202.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-203-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-203-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-203-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-203-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-203.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-203.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-203.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-203.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-204-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-204-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-204-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-204-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-204.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-204.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-204.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-204.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-205-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-205-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-205-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-205-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-205.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-205.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-205.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-205.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-206-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-206-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-206-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-206-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-206.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-206.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-206.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-206.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-207-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-207-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-207-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-207-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-207.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-207.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-207.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-207.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-208-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-208-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-208-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-208-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-208.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-208.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-208.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-208.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-211-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-211-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-211-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-211-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-211.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-211.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-211.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-211.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-212-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-212-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-212-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-212-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-212.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-212.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-212.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-212.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-213-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-213-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-213-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-213-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-213.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-213.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-213.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-213.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-214-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-214-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-214-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-214-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-214.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-214.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-214.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-214.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-215-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-215-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-215-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-215-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-215.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-215.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-215.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-215.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-216-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-216-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-216-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-216-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-216.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-216.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-216.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-216.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-217-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-217-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-217-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-217-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-217.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-217.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-217.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-217.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-218-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-218-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-218-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-218-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-218.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-218.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-218.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-218.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-219-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-219-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-219-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-219-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-219.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-219.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-219.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-219.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-220-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-220-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-220-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-220-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-220.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-220.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-220.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-220.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-221-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-221-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-221-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-221-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-221.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-221.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-221.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-221.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-222-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-222-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-222-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-222-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-222.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-222.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-222.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-222.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-223-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-223-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-223-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-223-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-223.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-223.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-223.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-223.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-224-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-224-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-224-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-224-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-224.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-224.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-224.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-224.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-225-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-225-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-225-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-225-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-225.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-225.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-225.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-225.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-226-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-226-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-226-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-226-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-226.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-226.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-226.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-226.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-227-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-227-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-227-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-227-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-227.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-227.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-227.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-227.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-228-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-228-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-228-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-228-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-228.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-228.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-228.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-228.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-229-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-229-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-229-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-229-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-229.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-229.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-229.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-229.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-230-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-230-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-230-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-230-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-230.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-230.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-230.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-230.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-231-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-231-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-231-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-231-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-231.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-231.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-231.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-231.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-232-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-232-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-232-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-232-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-232.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-232.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-232.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-232.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-233-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-233-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-233-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-233-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-233.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-233.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-233.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-233.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-234-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-234-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-234-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-234-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-234.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-234.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-234.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-234.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-235-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-235-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-235-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-235-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-235.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-235.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-235.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-235.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-236-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-236-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-236-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-236-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-236.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-236.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-236.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-236.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-237-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-237-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-237-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-237-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-237.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-237.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-237.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-237.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-238-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-238-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-238-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-238-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-238.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-238.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-238.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-238.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-239-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-239-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-239-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-239-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-239.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-239.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-239.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-239.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-240-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-240-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-240-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-240-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-240.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-240.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-240.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-240.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-241-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-241-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-241-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-241-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-241.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-241.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-241.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-241.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-242-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-242-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-242-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-242-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-242.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-242.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-242.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-242.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-243-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-243-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-243-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-243-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-243.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-243.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-243.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-243.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-244-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-244-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-244-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-244-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-244.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-244.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-244.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-244.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-245-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-245-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-245-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-245-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-245.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-245.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-245.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-245.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-246-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-246-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-246-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-246-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-246.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-246.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-246.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-246.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-247-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-247-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-247-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-247-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-247.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-247.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-247.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-247.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-248-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-248-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-248-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-248-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-248.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-248.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-248.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-248.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-249-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-249-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-249-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-249-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-249.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-249.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-249.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-249.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-250-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-250-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-250-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-250-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-250.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-250.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-250.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-250.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-251-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-251-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-251-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-251-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-251.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-251.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-251.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-251.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-252-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-252-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-252-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-252-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-252.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-252.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-252.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-252.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-253-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-253-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-253-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-253-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-253.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-253.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-253.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-253.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-254-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-254-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-254-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-254-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-254.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-254.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-254.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-254.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-255-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-255-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-255-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-255-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-255.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-255.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-255.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-255.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-256-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-256-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-256-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-256-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-256.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-256.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-256.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-256.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-257-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-257-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-257-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-257-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-257.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-257.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-257.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-257.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-258-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-258-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-258-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-258-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-258.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-258.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-258.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-258.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-259-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-259-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-259-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-259-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-259.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-259.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-259.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-259.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-260-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-260-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-260-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-260-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-260.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-260.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-260.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-260.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-262-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-262-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-262-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-262-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-262.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-262.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-262.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-262.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-263-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-263-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-263-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-263-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-263.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-263.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-263.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-263.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-264-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-264-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-264-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-264-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-264.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-264.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-264.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-264.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-265-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-265-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-265-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-265-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-265.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-265.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-265.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-265.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-266-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-266-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-266-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-266-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-266.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-266.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-266.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-266.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-267-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-267-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-267-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-267-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-267.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-267.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-267.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-267.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-268-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-268-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-268-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-268-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-268.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-268.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-268.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-268.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-269-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-269-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-269-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-269-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-269.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-269.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-269.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-269.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-270-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-270-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-270-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-270-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-270.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-270.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-270.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-270.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-271-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-271-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-271-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-271-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-271.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-271.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-271.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-271.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-272-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-272-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-272-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-272-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-272.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-272.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-272.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-272.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-273-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-273-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-273-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-273-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-273.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-273.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-273.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-273.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-274-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-274-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-274-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-274-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-274.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-274.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-274.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-274.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-275-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-275-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-275-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-275-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-275.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-275.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-275.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-275.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-276-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-276-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-276-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-276-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-276.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-276.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-276.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-276.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-277-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-277-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-277-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-277-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-277.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-277.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-277.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-277.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-278-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-278-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-278-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-278-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-278.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-278.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-278.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-278.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-279-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-279-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-279-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-279-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-279.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-279.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-279.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-279.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-280-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-280-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-280-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-280-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-280.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-280.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-280.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-280.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-281-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-281-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-281-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-281-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-281.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-281.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-281.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-281.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-282-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-282-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-282-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-282-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-282.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-282.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-282.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-282.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-283-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-283-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-283-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-283-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-283.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-283.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-283.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-283.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-284-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-284-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-284-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-284-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-284.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-284.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-284.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-284.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-285-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-285-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-285-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-285-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-285.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-285.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-285.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-285.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-286-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-286-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-286-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-286-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-286.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-286.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-286.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-286.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-287-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-287-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-287-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-287-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-287.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-287.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-287.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-287.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-288-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-288-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-288-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-288-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-288.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-288.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-288.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-288.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-289-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-289-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-289-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-289-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-289.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-289.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-289.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-289.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-290-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-290-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-290-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-290-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-290.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-290.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-290.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-290.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-291-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-291-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-291-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-291-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-291.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-291.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-291.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-291.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-292-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-292-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-292-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-292-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-292.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-292.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-292.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-292.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-293-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-293-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-293-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-293-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-293.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-293.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-293.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-293.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-294-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-294-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-294-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-294-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-294.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-294.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-294.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-294.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-295-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-295-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-295-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-295-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-295.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-295.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-295.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-295.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-296-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-296-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-296-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-296-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-296.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-296.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-296.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-296.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-297-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-297-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-297-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-297-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-297.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-297.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-297.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-297.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-298-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-298-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-298-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-298-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-298.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-298.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-298.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-298.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-299-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-299-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-299-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-299-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-299.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-299.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-299.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-299.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-300-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-300-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-300-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-300-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-300.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-300.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-300.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-300.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-301-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-301-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-301-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-301-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-301.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-301.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-301.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-301.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-302-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-302-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-302-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-302-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-302.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-302.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-302.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-302.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-303-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-303-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-303-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-303-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-303.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-303.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-303.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-303.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-304-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-304-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-304-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-304-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-304.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-304.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-304.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-304.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-305-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-305-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-305-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-305-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-305.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-305.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-305.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-305.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-306-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-306-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-306-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-306-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-306.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-306.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-306.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-306.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-307-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-307-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-307-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-307-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-307.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-307.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-307.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-307.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-308-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-308-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-308-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-308-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-308.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-308.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-308.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-308.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-309-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-309-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-309-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-309-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-309.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-309.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-309.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-309.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-310-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-310-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-310-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-310-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-310.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-310.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-310.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-310.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-311-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-311-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-311-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-311-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-311.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-311.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-311.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-311.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-312-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-312-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-312-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-312-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-312.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-312.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-312.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-312.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-313-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-313-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-313-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-313-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-313.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-313.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-313.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-313.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-314-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-314-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-314-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-314-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-314.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-314.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-314.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-314.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-315-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-315-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-315-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-315-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-315.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-315.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-315.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-315.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-316-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-316-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-316-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-316-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-316.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-316.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-316.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-316.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-317-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-317-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-317-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-317-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-317.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-317.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-317.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-317.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-318-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-318-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-318-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-318-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-318.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-318.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-318.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-318.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-319-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-319-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-319-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-319-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-319.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-319.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-319.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-319.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-320-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-320-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-320-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-320-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-320.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-320.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-320.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-320.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-321-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-321-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-321-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-321-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-321.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-321.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-321.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-321.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-322-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-322-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-322-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-322-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-322.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-322.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-322.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-322.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-323-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-323-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-323-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-323-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-323.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-323.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-323.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-323.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-324-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-324-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-324-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-324-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-324.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-324.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-324.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-324.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-325-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-325-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-325-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-325-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-325.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-325.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-325.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-325.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-326-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-326-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-326-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-326-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-326.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-326.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-326.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-326.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-327-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-327-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-327-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-327-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-327.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-327.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-327.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-327.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-328-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-328-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-328-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-328-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-328.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-328.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-328.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-328.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-329-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-329-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-329-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-329-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-329.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-329.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-329.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-329.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-330-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-330-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-330-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-330-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-330.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-330.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-330.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-330.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-331-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-331-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-331-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-331-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-331.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-331.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-331.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-331.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-332-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-332-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-332-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-332-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-332.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-332.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-332.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-332.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-333-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-333-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-333-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-333-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-333.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-333.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-333.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-333.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-334-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-334-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-334-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-334-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-334.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-334.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-334.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-334.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-335-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-335-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-335-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-335-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-335.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-335.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-335.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-335.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-336-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-336-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-336-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-336-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-336.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-336.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-336.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-336.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-337-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-337-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-337-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-337-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-337.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-337.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-337.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-337.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-338-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-338-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-338-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-338-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-338.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-338.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-338.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-338.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-339-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-339-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-339-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-339-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-339.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-339.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-339.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-339.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-340-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-340-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-340-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-340-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-340.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-340.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-340.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-340.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-341-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-341-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-341-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-341-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-341.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-341.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-341.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-341.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-342-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-342-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-342-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-342-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-342.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-342.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-342.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-342.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-343-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-343-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-343-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-343-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-343.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-343.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-343.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-343.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-344-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-344-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-344-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-344-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-344.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-344.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-344.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-344.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-345-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-345-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-345-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-345-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-345.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-345.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-345.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-345.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-346-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-346-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-346-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-346-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-346.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-346.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-346.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-346.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-347-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-347-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-347-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-347-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-347.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-347.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-347.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-347.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-348-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-348-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-348-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-348-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-348.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-348.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-348.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-348.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-349-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-349-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-349-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-349-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-349.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-349.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-349.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-349.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-350-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-350-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-350-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-350-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-350.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-350.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-350.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-350.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-351-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-351-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-351-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-351-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-351.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-351.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-351.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-351.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-352-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-352-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-352-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-352-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-352.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-352.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-352.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-352.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-353-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-353-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-353-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-353-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-353.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-353.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-353.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-353.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-354-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-354-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-354-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-354-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-354.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-354.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-354.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-354.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-355-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-355-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-355-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-355-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-355.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-355.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-355.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-355.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-356-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-356-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-356-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-356-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-356.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-356.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-356.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-356.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-357-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-357-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-357-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-357-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-357.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-357.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-357.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-357.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-359-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-359-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-359-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-359-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-359.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-359.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-359.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-359.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-360-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-360-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-360-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-360-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-360.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-360.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-360.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-360.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-361-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-361-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-361-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-361-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-361.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-361.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-361.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-361.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-362-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-362-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-362-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-362-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-362.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-362.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-362.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-362.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-363-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-363-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-363-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-363-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-363.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-363.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-363.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-363.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-364-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-364-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-364-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-364-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-364.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-364.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-364.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-364.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-365-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-365-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-365-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-365-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-365.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-365.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-365.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-365.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-366-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-366-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-366-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-366-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-366.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-366.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-366.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-366.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-367-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-367-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-367-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-367-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-367.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-367.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-367.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-367.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-368-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-368-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-368-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-368-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-368.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-368.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-368.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-368.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-369-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-369-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-369-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-369-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-369.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-369.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-369.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-369.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-370-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-370-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-370-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-370-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-370.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-370.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-370.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-370.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-371-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-371-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-371-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-371-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-371.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-371.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-371.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-371.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-372-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-372-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-372-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-372-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-372.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-372.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-372.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-372.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-373-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-373-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-373-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-373-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-373.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-373.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-373.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-373.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-374-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-374-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-374-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-374-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-374.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-374.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-374.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-374.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-375-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-375-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-375-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-375-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-375.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-375.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-375.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-375.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-376-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-376-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-376-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-376-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-376.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-376.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-376.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-376.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-377-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-377-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-377-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-377-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-377.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-377.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-377.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-377.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-378-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-378-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-378-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-378-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-378.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-378.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-378.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-378.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-379-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-379-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-379-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-379-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-379.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-379.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-379.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-379.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-380-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-380-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-380-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-380-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-380.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-380.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-380.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-380.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-381-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-381-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-381-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-381-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-381.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-381.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-381.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-381.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-382-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-382-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-382-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-382-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-382.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-382.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-382.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-382.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-383-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-383-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-383-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-383-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-383.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-383.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-383.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-383.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-384-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-384-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-384-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-384-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-384.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-384.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-384.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-384.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-385-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-385-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-385-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-385-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-385.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-385.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-385.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-385.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-386-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-386-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-386-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-386-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-386.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-386.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-386.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-386.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-387-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-387-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-387-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-387-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-387.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-387.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-387.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-387.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-388-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-388-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-388-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-388-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-388.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-388.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-388.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-388.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-389-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-389-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-389-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-389-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-389.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-389.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-389.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-389.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-390-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-390-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-390-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-390-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-390.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-390.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-390.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-390.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-391-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-391-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-391-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-391-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-391.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-391.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-391.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-391.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-392-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-392-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-392-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-392-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-392.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-392.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-392.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-392.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-393-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-393-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-393-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-393-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-393.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-393.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-393.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-393.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-394-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-394-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-394-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-394-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-394.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-394.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-394.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-394.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-395-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-395-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-395-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-395-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-395.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-395.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-395.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-395.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-396-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-396-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-396-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-396-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-396.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-396.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-396.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-396.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-397-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-397-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-397-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-397-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-397.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-397.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-397.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-397.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-398-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-398-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-398-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-398-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-398.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-398.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-398.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-398.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-399-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-399-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-399-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-399-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-399.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-399.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-399.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-399.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-400-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-400-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-400-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-400-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-400.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-400.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-400.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-400.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-401-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-401-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-401-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-401-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-401.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-401.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-401.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-401.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-402-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-402-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-402-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-402-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-402.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-402.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-402.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-402.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-403-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-403-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-403-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-403-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-403.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-403.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-403.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-403.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-404-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-404-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-404-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-404-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-404.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-404.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-404.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-404.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-405-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-405-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-405-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-405-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-405.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-405.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-405.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-405.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-406-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-406-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-406-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-406-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-406.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-406.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-406.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-406.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-407-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-407-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-407-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-407-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-407.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-407.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-407.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-407.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-408-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-408-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-408-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-408-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-408.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-408.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-408.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-408.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-409-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-409-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-409-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-409-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-409.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-409.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-409.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-409.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-410-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-410-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-410-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-410-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-410.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-410.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-410.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-410.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-411-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-411-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-411-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-411-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-411.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-411.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-411.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-411.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-412-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-412-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-412-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-412-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-412.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-412.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-punctuation-412.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-punctuation-412.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-quote-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-quote-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-quote-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-quote-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-quote-001.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-quote-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-quote-001.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-quote-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-quote-002.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-quote-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-quote-002.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-quote-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-quote-003.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-quote-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-quote-003.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-quote-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-quote-004.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-quote-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-quote-004.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-quote-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-quote-005.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-quote-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-quote-005.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-quote-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-quote-006.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-quote-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-quote-006.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-quote-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-000-ref.html b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-000-ref.html rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-000.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-000.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-001-ref.html b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-001-ref.html rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-002-ref.html b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-002-ref.html rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-003-ref.html b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-003-ref.html rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-003.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-003.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-004.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-004.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-005-ref.html b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-005-ref.html rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-005.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-005.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-006.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-006.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-007-ref.html b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-007-ref.html rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-007.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-007.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-008.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-008.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-009.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-009.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-010.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-010.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-011.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-011.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-012.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-012.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-013.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-013.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-014.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-014.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-015.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-015.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-016.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-016.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-017.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-017.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-018.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-018.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-019.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-019.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-020.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-020.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-021.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-021.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-022.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-022.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-023.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-023.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-024.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-024.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-025.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-025.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-026.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-026.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-027.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-027.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-028-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-028-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-028.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-028.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-029.xht b/tests/wpt/tests/css/CSS2/selectors/first-letter-selector-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-letter-selector-029.xht rename to tests/wpt/tests/css/CSS2/selectors/first-letter-selector-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-001.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-001.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-floats-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-floats-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-floats-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-floats-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-floats-001.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-floats-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-floats-001.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-floats-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-floats-002.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-floats-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-floats-002.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-floats-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-floats-003.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-floats-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-floats-003.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-floats-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-floats-004.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-floats-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-floats-004.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-floats-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-inherit-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-inherit-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-inherit-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-inherit-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-inherit-001.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-inherit-001.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-inherit-002-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-inherit-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-inherit-002-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-inherit-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-inherit-002.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-inherit-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-inherit-002.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-inherit-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-inherit-003-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-inherit-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-inherit-003-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-inherit-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-inherit-003.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-inherit-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-inherit-003.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-inherit-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-001.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-001.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-002.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-002.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-004.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-004.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-005.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-005.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-007.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-007.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-008.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-008.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-010.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-010.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-011.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-011.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-012-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-012-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-012.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-012.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-013-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-013-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-013.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-013.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-014.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-014.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-015-ref.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-015-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-015.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-015.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-016.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-016.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-017.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-017.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-018.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-018.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-019.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-019.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-020.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-020.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-021.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-021.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-README b/tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-pseudo-README rename to tests/wpt/tests/css/CSS2/selectors/first-line-pseudo-README diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-003.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-003.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-004.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-004.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-006.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-006.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-007.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-007.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-008.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-008.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-009.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-009.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-010.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-010.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-011.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-011.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-012.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-012.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-013.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-013.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-014.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-014.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-015.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-015.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-016.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-016.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-017.xht b/tests/wpt/tests/css/CSS2/selectors/first-line-selector-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/first-line-selector-017.xht rename to tests/wpt/tests/css/CSS2/selectors/first-line-selector-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/focus-pseudo-class-001.xht b/tests/wpt/tests/css/CSS2/selectors/focus-pseudo-class-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/focus-pseudo-class-001.xht rename to tests/wpt/tests/css/CSS2/selectors/focus-pseudo-class-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/focus-pseudo-class-002.xht b/tests/wpt/tests/css/CSS2/selectors/focus-pseudo-class-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/focus-pseudo-class-002.xht rename to tests/wpt/tests/css/CSS2/selectors/focus-pseudo-class-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/focus-pseudo-class-003.xht b/tests/wpt/tests/css/CSS2/selectors/focus-pseudo-class-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/focus-pseudo-class-003.xht rename to tests/wpt/tests/css/CSS2/selectors/focus-pseudo-class-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/focus-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/focus-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/focus-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/focus-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/grouping-002-notref.xht b/tests/wpt/tests/css/CSS2/selectors/grouping-002-notref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/grouping-002-notref.xht rename to tests/wpt/tests/css/CSS2/selectors/grouping-002-notref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/grouping-002-ref.xht b/tests/wpt/tests/css/CSS2/selectors/grouping-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/grouping-002-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/grouping-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/grouping-002.xht b/tests/wpt/tests/css/CSS2/selectors/grouping-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/grouping-002.xht rename to tests/wpt/tests/css/CSS2/selectors/grouping-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/hover-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/hover-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/hover-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/hover-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/hover-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/hover-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/hover-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/hover-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/hover-selector-003.xht b/tests/wpt/tests/css/CSS2/selectors/hover-selector-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/hover-selector-003.xht rename to tests/wpt/tests/css/CSS2/selectors/hover-selector-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/html-case-sensitivity-001.html b/tests/wpt/tests/css/CSS2/selectors/html-case-sensitivity-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/html-case-sensitivity-001.html rename to tests/wpt/tests/css/CSS2/selectors/html-case-sensitivity-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/id-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/id-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/id-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/id-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/id-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/id-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/id-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/id-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/id-selector-004.xht b/tests/wpt/tests/css/CSS2/selectors/id-selector-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/id-selector-004.xht rename to tests/wpt/tests/css/CSS2/selectors/id-selector-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/id-selector-005.xht b/tests/wpt/tests/css/CSS2/selectors/id-selector-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/id-selector-005.xht rename to tests/wpt/tests/css/CSS2/selectors/id-selector-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/id-selector-006.xht b/tests/wpt/tests/css/CSS2/selectors/id-selector-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/id-selector-006.xht rename to tests/wpt/tests/css/CSS2/selectors/id-selector-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/lang-selector-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/lang-selector-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/lang-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/lang-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/lang-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/lang-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-003.xht b/tests/wpt/tests/css/CSS2/selectors/lang-selector-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-003.xht rename to tests/wpt/tests/css/CSS2/selectors/lang-selector-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-004-ref.html b/tests/wpt/tests/css/CSS2/selectors/lang-selector-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-004-ref.html rename to tests/wpt/tests/css/CSS2/selectors/lang-selector-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-004.xht b/tests/wpt/tests/css/CSS2/selectors/lang-selector-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-004.xht rename to tests/wpt/tests/css/CSS2/selectors/lang-selector-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-005.xht b/tests/wpt/tests/css/CSS2/selectors/lang-selector-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-005.xht rename to tests/wpt/tests/css/CSS2/selectors/lang-selector-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-005.xht.headers b/tests/wpt/tests/css/CSS2/selectors/lang-selector-005.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-005.xht.headers rename to tests/wpt/tests/css/CSS2/selectors/lang-selector-005.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-006.xht b/tests/wpt/tests/css/CSS2/selectors/lang-selector-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/lang-selector-006.xht rename to tests/wpt/tests/css/CSS2/selectors/lang-selector-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/link-visited-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/link-visited-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/link-visited-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/link-visited-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/link-visited-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/link-visited-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/link-visited-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/link-visited-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/link-visited-selector-003.xht b/tests/wpt/tests/css/CSS2/selectors/link-visited-selector-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/link-visited-selector-003.xht rename to tests/wpt/tests/css/CSS2/selectors/link-visited-selector-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/link-visited-selector-004.xht b/tests/wpt/tests/css/CSS2/selectors/link-visited-selector-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/link-visited-selector-004.xht rename to tests/wpt/tests/css/CSS2/selectors/link-visited-selector-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/link-visited-selector-005.xht b/tests/wpt/tests/css/CSS2/selectors/link-visited-selector-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/link-visited-selector-005.xht rename to tests/wpt/tests/css/CSS2/selectors/link-visited-selector-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-001.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-001.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-002.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-002.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-003.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-003.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-005.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-005.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-006.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-006.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-007.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-007.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-008-ref.html b/tests/wpt/tests/css/CSS2/selectors/pseudo-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-008-ref.html rename to tests/wpt/tests/css/CSS2/selectors/pseudo-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-008.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-008.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-009.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-009.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-010.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-010.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-011.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-011.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-012.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-012.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-013.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-013.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-014.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-014.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-015.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-015.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-016.xht b/tests/wpt/tests/css/CSS2/selectors/pseudo-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/pseudo-016.xht rename to tests/wpt/tests/css/CSS2/selectors/pseudo-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/selectors-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/selectors-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/selectors-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/selectors-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/selectors-001.xht b/tests/wpt/tests/css/CSS2/selectors/selectors-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/selectors-001.xht rename to tests/wpt/tests/css/CSS2/selectors/selectors-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/selectors-002-ref.xht b/tests/wpt/tests/css/CSS2/selectors/selectors-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/selectors-002-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/selectors-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/selectors-002.xht b/tests/wpt/tests/css/CSS2/selectors/selectors-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/selectors-002.xht rename to tests/wpt/tests/css/CSS2/selectors/selectors-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/selectors-parsing-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/selectors-parsing-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/selectors-parsing-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/selectors-parsing-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/selectors-parsing-001.xht b/tests/wpt/tests/css/CSS2/selectors/selectors-parsing-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/selectors-parsing-001.xht rename to tests/wpt/tests/css/CSS2/selectors/selectors-parsing-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/sibling-selector-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/sibling-selector-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/sibling-selector-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/sibling-selector-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/sibling-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/sibling-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/sibling-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/sibling-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/sibling-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/sibling-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/sibling-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/sibling-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/sibling-selector-003-ref.xht b/tests/wpt/tests/css/CSS2/selectors/sibling-selector-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/sibling-selector-003-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/sibling-selector-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/sibling-selector-003.xht b/tests/wpt/tests/css/CSS2/selectors/sibling-selector-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/sibling-selector-003.xht rename to tests/wpt/tests/css/CSS2/selectors/sibling-selector-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/1x1-green.png b/tests/wpt/tests/css/CSS2/selectors/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/selectors/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/selectors/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/selectors/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/selectors/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/selectors/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/selectors/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/selectors/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/1x1-red.png b/tests/wpt/tests/css/CSS2/selectors/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/selectors/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/1x1-white.png b/tests/wpt/tests/css/CSS2/selectors/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/selectors/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/selectors/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/selectors/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/60x60-green.png b/tests/wpt/tests/css/CSS2/selectors/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/selectors/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/a-green.css b/tests/wpt/tests/css/CSS2/selectors/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/a-green.css rename to tests/wpt/tests/css/CSS2/selectors/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/b-green.css b/tests/wpt/tests/css/CSS2/selectors/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/b-green.css rename to tests/wpt/tests/css/CSS2/selectors/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/blue15x15.png b/tests/wpt/tests/css/CSS2/selectors/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/selectors/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/c-red.css b/tests/wpt/tests/css/CSS2/selectors/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/c-red.css rename to tests/wpt/tests/css/CSS2/selectors/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/cat.png b/tests/wpt/tests/css/CSS2/selectors/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/cat.png rename to tests/wpt/tests/css/CSS2/selectors/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/diamond.png b/tests/wpt/tests/css/CSS2/selectors/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/diamond.png rename to tests/wpt/tests/css/CSS2/selectors/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/green15x15.png b/tests/wpt/tests/css/CSS2/selectors/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/green15x15.png rename to tests/wpt/tests/css/CSS2/selectors/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/selectors/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/selectors/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/selectors/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/selectors/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/selectors/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/selectors/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/selectors/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/selectors/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/ring.png b/tests/wpt/tests/css/CSS2/selectors/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/ring.png rename to tests/wpt/tests/css/CSS2/selectors/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/square-purple.png b/tests/wpt/tests/css/CSS2/selectors/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/square-purple.png rename to tests/wpt/tests/css/CSS2/selectors/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/square-teal.png b/tests/wpt/tests/css/CSS2/selectors/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/square-teal.png rename to tests/wpt/tests/css/CSS2/selectors/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/square-white.png b/tests/wpt/tests/css/CSS2/selectors/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/square-white.png rename to tests/wpt/tests/css/CSS2/selectors/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/selectors/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/selectors/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/swatch-green.png b/tests/wpt/tests/css/CSS2/selectors/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/selectors/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/selectors/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/selectors/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/selectors/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/selectors/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/swatch-red.png b/tests/wpt/tests/css/CSS2/selectors/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/selectors/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/swatch-white.png b/tests/wpt/tests/css/CSS2/selectors/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/selectors/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/selectors/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/selectors/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/test-bl.png b/tests/wpt/tests/css/CSS2/selectors/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/test-bl.png rename to tests/wpt/tests/css/CSS2/selectors/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/test-br.png b/tests/wpt/tests/css/CSS2/selectors/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/test-br.png rename to tests/wpt/tests/css/CSS2/selectors/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/test-outer.png b/tests/wpt/tests/css/CSS2/selectors/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/test-outer.png rename to tests/wpt/tests/css/CSS2/selectors/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/test-tl.png b/tests/wpt/tests/css/CSS2/selectors/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/test-tl.png rename to tests/wpt/tests/css/CSS2/selectors/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/support/test-tr.png b/tests/wpt/tests/css/CSS2/selectors/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/support/test-tr.png rename to tests/wpt/tests/css/CSS2/selectors/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/type-selector-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/type-selector-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/type-selector-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/type-selector-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/type-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/type-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/type-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/type-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-001-notref.xht b/tests/wpt/tests/css/CSS2/selectors/universal-selector-001-notref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-001-notref.xht rename to tests/wpt/tests/css/CSS2/selectors/universal-selector-001-notref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-001-ref.xht b/tests/wpt/tests/css/CSS2/selectors/universal-selector-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-001-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/universal-selector-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-001.xht b/tests/wpt/tests/css/CSS2/selectors/universal-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-001.xht rename to tests/wpt/tests/css/CSS2/selectors/universal-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-002-notref.xht b/tests/wpt/tests/css/CSS2/selectors/universal-selector-002-notref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-002-notref.xht rename to tests/wpt/tests/css/CSS2/selectors/universal-selector-002-notref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-002-ref.xht b/tests/wpt/tests/css/CSS2/selectors/universal-selector-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-002-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/universal-selector-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-002.xht b/tests/wpt/tests/css/CSS2/selectors/universal-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-002.xht rename to tests/wpt/tests/css/CSS2/selectors/universal-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-003.xht b/tests/wpt/tests/css/CSS2/selectors/universal-selector-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-003.xht rename to tests/wpt/tests/css/CSS2/selectors/universal-selector-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-004.xht b/tests/wpt/tests/css/CSS2/selectors/universal-selector-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-004.xht rename to tests/wpt/tests/css/CSS2/selectors/universal-selector-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-005-ref.xht b/tests/wpt/tests/css/CSS2/selectors/universal-selector-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-005-ref.xht rename to tests/wpt/tests/css/CSS2/selectors/universal-selector-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-005.xht b/tests/wpt/tests/css/CSS2/selectors/universal-selector-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/selectors/universal-selector-005.xht rename to tests/wpt/tests/css/CSS2/selectors/universal-selector-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/stacking-context/composite-change-after-scroll-preserves-stacking-order-ref.html b/tests/wpt/tests/css/CSS2/stacking-context/composite-change-after-scroll-preserves-stacking-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/stacking-context/composite-change-after-scroll-preserves-stacking-order-ref.html rename to tests/wpt/tests/css/CSS2/stacking-context/composite-change-after-scroll-preserves-stacking-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/stacking-context/composite-change-after-scroll-preserves-stacking-order.html b/tests/wpt/tests/css/CSS2/stacking-context/composite-change-after-scroll-preserves-stacking-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/stacking-context/composite-change-after-scroll-preserves-stacking-order.html rename to tests/wpt/tests/css/CSS2/stacking-context/composite-change-after-scroll-preserves-stacking-order.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-affects-block-in-inline-ref.html b/tests/wpt/tests/css/CSS2/stacking-context/opacity-affects-block-in-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-affects-block-in-inline-ref.html rename to tests/wpt/tests/css/CSS2/stacking-context/opacity-affects-block-in-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-affects-block-in-inline.html b/tests/wpt/tests/css/CSS2/stacking-context/opacity-affects-block-in-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-affects-block-in-inline.html rename to tests/wpt/tests/css/CSS2/stacking-context/opacity-affects-block-in-inline.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-change-parent-stacking-context-ref.html b/tests/wpt/tests/css/CSS2/stacking-context/opacity-change-parent-stacking-context-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-change-parent-stacking-context-ref.html rename to tests/wpt/tests/css/CSS2/stacking-context/opacity-change-parent-stacking-context-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-change-parent-stacking-context.html b/tests/wpt/tests/css/CSS2/stacking-context/opacity-change-parent-stacking-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-change-parent-stacking-context.html rename to tests/wpt/tests/css/CSS2/stacking-context/opacity-change-parent-stacking-context.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-change-twice-stacking-context-ref.html b/tests/wpt/tests/css/CSS2/stacking-context/opacity-change-twice-stacking-context-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-change-twice-stacking-context-ref.html rename to tests/wpt/tests/css/CSS2/stacking-context/opacity-change-twice-stacking-context-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-change-twice-stacking-context.html b/tests/wpt/tests/css/CSS2/stacking-context/opacity-change-twice-stacking-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-change-twice-stacking-context.html rename to tests/wpt/tests/css/CSS2/stacking-context/opacity-change-twice-stacking-context.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-transition-change-parent-stacking-context-ref.html b/tests/wpt/tests/css/CSS2/stacking-context/opacity-transition-change-parent-stacking-context-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-transition-change-parent-stacking-context-ref.html rename to tests/wpt/tests/css/CSS2/stacking-context/opacity-transition-change-parent-stacking-context-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-transition-change-parent-stacking-context.html b/tests/wpt/tests/css/CSS2/stacking-context/opacity-transition-change-parent-stacking-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/stacking-context/opacity-transition-change-parent-stacking-context.html rename to tests/wpt/tests/css/CSS2/stacking-context/opacity-transition-change-parent-stacking-context.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/stacking-context/zindex-affects-block-in-inline-ref.html b/tests/wpt/tests/css/CSS2/stacking-context/zindex-affects-block-in-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/stacking-context/zindex-affects-block-in-inline-ref.html rename to tests/wpt/tests/css/CSS2/stacking-context/zindex-affects-block-in-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/stacking-context/zindex-affects-block-in-inline.html b/tests/wpt/tests/css/CSS2/stacking-context/zindex-affects-block-in-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/stacking-context/zindex-affects-block-in-inline.html rename to tests/wpt/tests/css/CSS2/stacking-context/zindex-affects-block-in-inline.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/100x100-lime.png b/tests/wpt/tests/css/CSS2/support/100x100-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/100x100-lime.png rename to tests/wpt/tests/css/CSS2/support/100x100-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/100x100-red.png b/tests/wpt/tests/css/CSS2/support/100x100-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/100x100-red.png rename to tests/wpt/tests/css/CSS2/support/100x100-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/1x1-green.png b/tests/wpt/tests/css/CSS2/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/1x1-red.png b/tests/wpt/tests/css/CSS2/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/1x1-white.png b/tests/wpt/tests/css/CSS2/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/200x200-red.png b/tests/wpt/tests/css/CSS2/support/200x200-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/200x200-red.png rename to tests/wpt/tests/css/CSS2/support/200x200-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/50x50-green.png b/tests/wpt/tests/css/CSS2/support/50x50-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/50x50-green.png rename to tests/wpt/tests/css/CSS2/support/50x50-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/60x60-green.png b/tests/wpt/tests/css/CSS2/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/README b/tests/wpt/tests/css/CSS2/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/README rename to tests/wpt/tests/css/CSS2/support/README diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/abspos-zero-width-001.png b/tests/wpt/tests/css/CSS2/support/abspos-zero-width-001.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/abspos-zero-width-001.png rename to tests/wpt/tests/css/CSS2/support/abspos-zero-width-001.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/bar_with_corner_dot.png b/tests/wpt/tests/css/CSS2/support/bar_with_corner_dot.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/bar_with_corner_dot.png rename to tests/wpt/tests/css/CSS2/support/bar_with_corner_dot.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/black15x15.png b/tests/wpt/tests/css/CSS2/support/black15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/black15x15.png rename to tests/wpt/tests/css/CSS2/support/black15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/black96x96.png b/tests/wpt/tests/css/CSS2/support/black96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/black96x96.png rename to tests/wpt/tests/css/CSS2/support/black96x96.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/blue-orange-rectangle.png b/tests/wpt/tests/css/CSS2/support/blue-orange-rectangle.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/blue-orange-rectangle.png rename to tests/wpt/tests/css/CSS2/support/blue-orange-rectangle.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/blue15x15.png b/tests/wpt/tests/css/CSS2/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/blue20x20.png b/tests/wpt/tests/css/CSS2/support/blue20x20.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/blue20x20.png rename to tests/wpt/tests/css/CSS2/support/blue20x20.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/blue96x96.png b/tests/wpt/tests/css/CSS2/support/blue96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/blue96x96.png rename to tests/wpt/tests/css/CSS2/support/blue96x96.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/cat.png b/tests/wpt/tests/css/CSS2/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/cat.png rename to tests/wpt/tests/css/CSS2/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/diamond.png b/tests/wpt/tests/css/CSS2/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/diamond.png rename to tests/wpt/tests/css/CSS2/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/green15x15.png b/tests/wpt/tests/css/CSS2/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/green15x15.png rename to tests/wpt/tests/css/CSS2/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/green200x200.png b/tests/wpt/tests/css/CSS2/support/green200x200.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/green200x200.png rename to tests/wpt/tests/css/CSS2/support/green200x200.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/green_box.png b/tests/wpt/tests/css/CSS2/support/green_box.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/green_box.png rename to tests/wpt/tests/css/CSS2/support/green_box.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/margin-collapse-2em-space.png b/tests/wpt/tests/css/CSS2/support/margin-collapse-2em-space.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/margin-collapse-2em-space.png rename to tests/wpt/tests/css/CSS2/support/margin-collapse-2em-space.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/margin-collapse-4em-space.png b/tests/wpt/tests/css/CSS2/support/margin-collapse-4em-space.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/margin-collapse-4em-space.png rename to tests/wpt/tests/css/CSS2/support/margin-collapse-4em-space.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/orange15x15.png b/tests/wpt/tests/css/CSS2/support/orange15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/orange15x15.png rename to tests/wpt/tests/css/CSS2/support/orange15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/orange_box.png b/tests/wpt/tests/css/CSS2/support/orange_box.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/orange_box.png rename to tests/wpt/tests/css/CSS2/support/orange_box.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/pattern-gg-gr-100x100.png b/tests/wpt/tests/css/CSS2/support/pattern-gg-gr-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/pattern-gg-gr-100x100.png rename to tests/wpt/tests/css/CSS2/support/pattern-gg-gr-100x100.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/red15x15.png b/tests/wpt/tests/css/CSS2/support/red15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/red15x15.png rename to tests/wpt/tests/css/CSS2/support/red15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/red_box.png b/tests/wpt/tests/css/CSS2/support/red_box.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/red_box.png rename to tests/wpt/tests/css/CSS2/support/red_box.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/ring.png b/tests/wpt/tests/css/CSS2/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/ring.png rename to tests/wpt/tests/css/CSS2/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/ruler-h-200px-400px.png b/tests/wpt/tests/css/CSS2/support/ruler-h-200px-400px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/ruler-h-200px-400px.png rename to tests/wpt/tests/css/CSS2/support/ruler-h-200px-400px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/ruler-v-100px-200px.png b/tests/wpt/tests/css/CSS2/support/ruler-v-100px-200px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/ruler-v-100px-200px.png rename to tests/wpt/tests/css/CSS2/support/ruler-v-100px-200px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/square-outline-32x32.png b/tests/wpt/tests/css/CSS2/support/square-outline-32x32.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/square-outline-32x32.png rename to tests/wpt/tests/css/CSS2/support/square-outline-32x32.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/square-purple.png b/tests/wpt/tests/css/CSS2/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/square-purple.png rename to tests/wpt/tests/css/CSS2/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/square-teal.png b/tests/wpt/tests/css/CSS2/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/square-teal.png rename to tests/wpt/tests/css/CSS2/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/square-white.png b/tests/wpt/tests/css/CSS2/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/square-white.png rename to tests/wpt/tests/css/CSS2/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/swatch-aqua.png b/tests/wpt/tests/css/CSS2/support/swatch-aqua.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/swatch-aqua.png rename to tests/wpt/tests/css/CSS2/support/swatch-aqua.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/swatch-fuchsia.png b/tests/wpt/tests/css/CSS2/support/swatch-fuchsia.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/swatch-fuchsia.png rename to tests/wpt/tests/css/CSS2/support/swatch-fuchsia.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/swatch-green.png b/tests/wpt/tests/css/CSS2/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/swatch-olive.png b/tests/wpt/tests/css/CSS2/support/swatch-olive.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/swatch-olive.png rename to tests/wpt/tests/css/CSS2/support/swatch-olive.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/swatch-red.png b/tests/wpt/tests/css/CSS2/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/swatch-teal.png b/tests/wpt/tests/css/CSS2/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/swatch-teal.png rename to tests/wpt/tests/css/CSS2/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/swatch-white.png b/tests/wpt/tests/css/CSS2/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/test-bl.png b/tests/wpt/tests/css/CSS2/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/test-bl.png rename to tests/wpt/tests/css/CSS2/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/test-br.png b/tests/wpt/tests/css/CSS2/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/test-br.png rename to tests/wpt/tests/css/CSS2/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/test-outer.png b/tests/wpt/tests/css/CSS2/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/test-outer.png rename to tests/wpt/tests/css/CSS2/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/test-tl.png b/tests/wpt/tests/css/CSS2/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/test-tl.png rename to tests/wpt/tests/css/CSS2/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/test-tr.png b/tests/wpt/tests/css/CSS2/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/test-tr.png rename to tests/wpt/tests/css/CSS2/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/support/transparent_green.png b/tests/wpt/tests/css/CSS2/support/transparent_green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/support/transparent_green.png rename to tests/wpt/tests/css/CSS2/support/transparent_green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/.htaccess b/tests/wpt/tests/css/CSS2/syntax/.htaccess similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/.htaccess rename to tests/wpt/tests/css/CSS2/syntax/.htaccess diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-001-ref.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-001-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-001.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-001.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-002.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-002.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-003.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-003.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-004.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-004.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-005.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-005.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-006.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-006.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-007.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-007.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-008.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-008.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-009.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-009.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-010.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-010.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-011.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-011.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-012.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-012.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-013.html b/tests/wpt/tests/css/CSS2/syntax/at-charset-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-013.html rename to tests/wpt/tests/css/CSS2/syntax/at-charset-013.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-014.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-014.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-015.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-015.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-016.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-016.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-019.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-019.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-020.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-020.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-021.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-021.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-024.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-024.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-025.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-025.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-026.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-026.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-027.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-027.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-028.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-028.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-029.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-029.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-030.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-030.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-033.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-033.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-034.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-034.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-035.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-035.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-036.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-036.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-037.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-037.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-038.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-038.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-039-ref.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-039-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-039-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-039-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-039.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-039.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-040.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-040.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-041.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-041.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-042.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-042.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-043.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-043.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-044.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-044.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-045.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-045.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-046.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-046.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-047.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-047.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-048.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-048.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-049.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-049.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-050.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-050.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-051.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-051.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-052.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-052.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-053.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-053.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-054.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-054.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-055.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-055.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-056.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-056.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-057.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-057.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-058.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-058.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-059.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-059.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-060.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-060.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-061.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-061.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-071.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-071.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-071.xht.headers b/tests/wpt/tests/css/CSS2/syntax/at-charset-071.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-071.xht.headers rename to tests/wpt/tests/css/CSS2/syntax/at-charset-071.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-072.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-072.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-072.xht.headers b/tests/wpt/tests/css/CSS2/syntax/at-charset-072.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-072.xht.headers rename to tests/wpt/tests/css/CSS2/syntax/at-charset-072.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-073.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-073.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-073.xht.headers b/tests/wpt/tests/css/CSS2/syntax/at-charset-073.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-073.xht.headers rename to tests/wpt/tests/css/CSS2/syntax/at-charset-073.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-074.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-074.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-074.xht.headers b/tests/wpt/tests/css/CSS2/syntax/at-charset-074.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-074.xht.headers rename to tests/wpt/tests/css/CSS2/syntax/at-charset-074.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-075.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-075.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-075.xht.headers b/tests/wpt/tests/css/CSS2/syntax/at-charset-075.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-075.xht.headers rename to tests/wpt/tests/css/CSS2/syntax/at-charset-075.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-076.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-076.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-076.xht.headers b/tests/wpt/tests/css/CSS2/syntax/at-charset-076.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-076.xht.headers rename to tests/wpt/tests/css/CSS2/syntax/at-charset-076.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-077.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-077.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-077.xht.headers b/tests/wpt/tests/css/CSS2/syntax/at-charset-077.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-077.xht.headers rename to tests/wpt/tests/css/CSS2/syntax/at-charset-077.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-quotes-001.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-quotes-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-quotes-001.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-quotes-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-ref.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-space-001.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-space-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-space-001.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-space-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-space-002.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-space-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-space-002.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-space-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-utf16-be-001.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-utf16-be-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-utf16-be-001.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-utf16-be-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-utf16-be-002.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-utf16-be-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-utf16-be-002.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-utf16-be-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-utf16-be-003.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-utf16-be-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-utf16-be-003.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-utf16-be-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-utf16-le-001.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-utf16-le-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-utf16-le-001.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-utf16-le-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-utf16-le-002.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-utf16-le-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-utf16-le-002.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-utf16-le-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-utf16-le-003.xht b/tests/wpt/tests/css/CSS2/syntax/at-charset-utf16-le-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-charset-utf16-le-003.xht rename to tests/wpt/tests/css/CSS2/syntax/at-charset-utf16-le-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-keywords-000.xht b/tests/wpt/tests/css/CSS2/syntax/at-keywords-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-keywords-000.xht rename to tests/wpt/tests/css/CSS2/syntax/at-keywords-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-keywords-001.xht b/tests/wpt/tests/css/CSS2/syntax/at-keywords-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-keywords-001.xht rename to tests/wpt/tests/css/CSS2/syntax/at-keywords-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-keywords-002.xht b/tests/wpt/tests/css/CSS2/syntax/at-keywords-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-keywords-002.xht rename to tests/wpt/tests/css/CSS2/syntax/at-keywords-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-001.xht b/tests/wpt/tests/css/CSS2/syntax/at-rule-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-001.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rule-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-002.xht b/tests/wpt/tests/css/CSS2/syntax/at-rule-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-002.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rule-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-003.xht b/tests/wpt/tests/css/CSS2/syntax/at-rule-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-003.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rule-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-004.xht b/tests/wpt/tests/css/CSS2/syntax/at-rule-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-004.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rule-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-005.xht b/tests/wpt/tests/css/CSS2/syntax/at-rule-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-005.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rule-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-006.xht b/tests/wpt/tests/css/CSS2/syntax/at-rule-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-006.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rule-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-007.xht b/tests/wpt/tests/css/CSS2/syntax/at-rule-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-007.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rule-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-008.xht b/tests/wpt/tests/css/CSS2/syntax/at-rule-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-008.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rule-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-009.xht b/tests/wpt/tests/css/CSS2/syntax/at-rule-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-009.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rule-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-010.xht b/tests/wpt/tests/css/CSS2/syntax/at-rule-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-010.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rule-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-011.xht b/tests/wpt/tests/css/CSS2/syntax/at-rule-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-011.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rule-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-012.xht b/tests/wpt/tests/css/CSS2/syntax/at-rule-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-012.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rule-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-013-ref.xht b/tests/wpt/tests/css/CSS2/syntax/at-rule-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-013-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rule-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-013.xht b/tests/wpt/tests/css/CSS2/syntax/at-rule-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rule-013.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rule-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rules-000.xht b/tests/wpt/tests/css/CSS2/syntax/at-rules-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rules-000.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rules-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rules-001.xht b/tests/wpt/tests/css/CSS2/syntax/at-rules-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rules-001.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rules-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rules-002.xht b/tests/wpt/tests/css/CSS2/syntax/at-rules-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rules-002.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rules-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rules-003.xht b/tests/wpt/tests/css/CSS2/syntax/at-rules-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rules-003.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rules-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/at-rules-004.xht b/tests/wpt/tests/css/CSS2/syntax/at-rules-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/at-rules-004.xht rename to tests/wpt/tests/css/CSS2/syntax/at-rules-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/bad-selector-001.xht b/tests/wpt/tests/css/CSS2/syntax/bad-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/bad-selector-001.xht rename to tests/wpt/tests/css/CSS2/syntax/bad-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-001-ref.xht b/tests/wpt/tests/css/CSS2/syntax/blocks-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-001-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/blocks-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-001.xht b/tests/wpt/tests/css/CSS2/syntax/blocks-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-001.xht rename to tests/wpt/tests/css/CSS2/syntax/blocks-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-002.xht b/tests/wpt/tests/css/CSS2/syntax/blocks-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-002.xht rename to tests/wpt/tests/css/CSS2/syntax/blocks-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-003.xht b/tests/wpt/tests/css/CSS2/syntax/blocks-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-003.xht rename to tests/wpt/tests/css/CSS2/syntax/blocks-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-004.xht b/tests/wpt/tests/css/CSS2/syntax/blocks-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-004.xht rename to tests/wpt/tests/css/CSS2/syntax/blocks-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-005.xht b/tests/wpt/tests/css/CSS2/syntax/blocks-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-005.xht rename to tests/wpt/tests/css/CSS2/syntax/blocks-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-006.xht b/tests/wpt/tests/css/CSS2/syntax/blocks-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-006.xht rename to tests/wpt/tests/css/CSS2/syntax/blocks-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-and-strings-001.xht b/tests/wpt/tests/css/CSS2/syntax/blocks-and-strings-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/blocks-and-strings-001.xht rename to tests/wpt/tests/css/CSS2/syntax/blocks-and-strings-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-000.xht b/tests/wpt/tests/css/CSS2/syntax/case-sensitive-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-000.xht rename to tests/wpt/tests/css/CSS2/syntax/case-sensitive-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-001.xht b/tests/wpt/tests/css/CSS2/syntax/case-sensitive-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-001.xht rename to tests/wpt/tests/css/CSS2/syntax/case-sensitive-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-003-ref.xht b/tests/wpt/tests/css/CSS2/syntax/case-sensitive-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-003-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/case-sensitive-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-003.xht b/tests/wpt/tests/css/CSS2/syntax/case-sensitive-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-003.xht rename to tests/wpt/tests/css/CSS2/syntax/case-sensitive-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-004.xht b/tests/wpt/tests/css/CSS2/syntax/case-sensitive-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-004.xht rename to tests/wpt/tests/css/CSS2/syntax/case-sensitive-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-005-ref.xht b/tests/wpt/tests/css/CSS2/syntax/case-sensitive-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-005-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/case-sensitive-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-005.xht b/tests/wpt/tests/css/CSS2/syntax/case-sensitive-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-005.xht rename to tests/wpt/tests/css/CSS2/syntax/case-sensitive-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-006.html b/tests/wpt/tests/css/CSS2/syntax/case-sensitive-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-006.html rename to tests/wpt/tests/css/CSS2/syntax/case-sensitive-006.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-007.xht b/tests/wpt/tests/css/CSS2/syntax/case-sensitive-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-007.xht rename to tests/wpt/tests/css/CSS2/syntax/case-sensitive-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-008.xht b/tests/wpt/tests/css/CSS2/syntax/case-sensitive-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/case-sensitive-008.xht rename to tests/wpt/tests/css/CSS2/syntax/case-sensitive-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-031.xht b/tests/wpt/tests/css/CSS2/syntax/character-encoding-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-031.xht rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-031.xht.headers b/tests/wpt/tests/css/CSS2/syntax/character-encoding-031.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-031.xht.headers rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-031.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-032.xht b/tests/wpt/tests/css/CSS2/syntax/character-encoding-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-032.xht rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-032.xht.headers b/tests/wpt/tests/css/CSS2/syntax/character-encoding-032.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-032.xht.headers rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-032.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-033.xht b/tests/wpt/tests/css/CSS2/syntax/character-encoding-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-033.xht rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-033.xht.headers b/tests/wpt/tests/css/CSS2/syntax/character-encoding-033.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-033.xht.headers rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-033.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-034.xht b/tests/wpt/tests/css/CSS2/syntax/character-encoding-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-034.xht rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-034.xht.headers b/tests/wpt/tests/css/CSS2/syntax/character-encoding-034.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-034.xht.headers rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-034.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-035.xht b/tests/wpt/tests/css/CSS2/syntax/character-encoding-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-035.xht rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-035.xht.headers b/tests/wpt/tests/css/CSS2/syntax/character-encoding-035.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-035.xht.headers rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-035.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-036.xht b/tests/wpt/tests/css/CSS2/syntax/character-encoding-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-036.xht rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-036.xht.headers b/tests/wpt/tests/css/CSS2/syntax/character-encoding-036.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-036.xht.headers rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-036.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-037.xht b/tests/wpt/tests/css/CSS2/syntax/character-encoding-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-037.xht rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-037.xht.headers b/tests/wpt/tests/css/CSS2/syntax/character-encoding-037.xht.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-037.xht.headers rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-037.xht.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-038.xht b/tests/wpt/tests/css/CSS2/syntax/character-encoding-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-038.xht rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-041-ref.xht b/tests/wpt/tests/css/CSS2/syntax/character-encoding-041-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-041-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-041-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-041.xht b/tests/wpt/tests/css/CSS2/syntax/character-encoding-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-encoding-041.xht rename to tests/wpt/tests/css/CSS2/syntax/character-encoding-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/character-representation-001.xht b/tests/wpt/tests/css/CSS2/syntax/character-representation-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/character-representation-001.xht rename to tests/wpt/tests/css/CSS2/syntax/character-representation-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/characters-0080-009F-001-ref.xht b/tests/wpt/tests/css/CSS2/syntax/characters-0080-009F-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/characters-0080-009F-001-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/characters-0080-009F-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/characters-0080-009F-001.xht b/tests/wpt/tests/css/CSS2/syntax/characters-0080-009F-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/characters-0080-009F-001.xht rename to tests/wpt/tests/css/CSS2/syntax/characters-0080-009F-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/charset-attr-001.xht b/tests/wpt/tests/css/CSS2/syntax/charset-attr-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/charset-attr-001.xht rename to tests/wpt/tests/css/CSS2/syntax/charset-attr-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/colors-001.xht b/tests/wpt/tests/css/CSS2/syntax/colors-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/colors-001.xht rename to tests/wpt/tests/css/CSS2/syntax/colors-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/colors-002.xht b/tests/wpt/tests/css/CSS2/syntax/colors-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/colors-002.xht rename to tests/wpt/tests/css/CSS2/syntax/colors-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/colors-003.xht b/tests/wpt/tests/css/CSS2/syntax/colors-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/colors-003.xht rename to tests/wpt/tests/css/CSS2/syntax/colors-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/colors-004.xht b/tests/wpt/tests/css/CSS2/syntax/colors-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/colors-004.xht rename to tests/wpt/tests/css/CSS2/syntax/colors-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/colors-005.xht b/tests/wpt/tests/css/CSS2/syntax/colors-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/colors-005.xht rename to tests/wpt/tests/css/CSS2/syntax/colors-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/colors-006-ref.xht b/tests/wpt/tests/css/CSS2/syntax/colors-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/colors-006-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/colors-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/colors-006.xht b/tests/wpt/tests/css/CSS2/syntax/colors-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/colors-006.xht rename to tests/wpt/tests/css/CSS2/syntax/colors-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/comments-001.xht b/tests/wpt/tests/css/CSS2/syntax/comments-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/comments-001.xht rename to tests/wpt/tests/css/CSS2/syntax/comments-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/comments-002.xht b/tests/wpt/tests/css/CSS2/syntax/comments-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/comments-002.xht rename to tests/wpt/tests/css/CSS2/syntax/comments-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/comments-003.xht b/tests/wpt/tests/css/CSS2/syntax/comments-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/comments-003.xht rename to tests/wpt/tests/css/CSS2/syntax/comments-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/comments-004.xht b/tests/wpt/tests/css/CSS2/syntax/comments-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/comments-004.xht rename to tests/wpt/tests/css/CSS2/syntax/comments-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/comments-005.xht b/tests/wpt/tests/css/CSS2/syntax/comments-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/comments-005.xht rename to tests/wpt/tests/css/CSS2/syntax/comments-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/comments-006.xht b/tests/wpt/tests/css/CSS2/syntax/comments-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/comments-006.xht rename to tests/wpt/tests/css/CSS2/syntax/comments-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/comments-007.xht b/tests/wpt/tests/css/CSS2/syntax/comments-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/comments-007.xht rename to tests/wpt/tests/css/CSS2/syntax/comments-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/comments-008.xht b/tests/wpt/tests/css/CSS2/syntax/comments-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/comments-008.xht rename to tests/wpt/tests/css/CSS2/syntax/comments-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/comments-009.xht b/tests/wpt/tests/css/CSS2/syntax/comments-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/comments-009.xht rename to tests/wpt/tests/css/CSS2/syntax/comments-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/content-type-000-ref.xht b/tests/wpt/tests/css/CSS2/syntax/content-type-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/content-type-000-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/content-type-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/content-type-000.xht b/tests/wpt/tests/css/CSS2/syntax/content-type-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/content-type-000.xht rename to tests/wpt/tests/css/CSS2/syntax/content-type-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/content-type-001.xht b/tests/wpt/tests/css/CSS2/syntax/content-type-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/content-type-001.xht rename to tests/wpt/tests/css/CSS2/syntax/content-type-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-001-ref.xht b/tests/wpt/tests/css/CSS2/syntax/core-syntax-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-001-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/core-syntax-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-001.xht b/tests/wpt/tests/css/CSS2/syntax/core-syntax-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-001.xht rename to tests/wpt/tests/css/CSS2/syntax/core-syntax-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-006-ref.xht b/tests/wpt/tests/css/CSS2/syntax/core-syntax-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-006-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/core-syntax-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-006.xht b/tests/wpt/tests/css/CSS2/syntax/core-syntax-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-006.xht rename to tests/wpt/tests/css/CSS2/syntax/core-syntax-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-007-ref.xht b/tests/wpt/tests/css/CSS2/syntax/core-syntax-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-007-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/core-syntax-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-007.xht b/tests/wpt/tests/css/CSS2/syntax/core-syntax-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-007.xht rename to tests/wpt/tests/css/CSS2/syntax/core-syntax-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-008.xht b/tests/wpt/tests/css/CSS2/syntax/core-syntax-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-008.xht rename to tests/wpt/tests/css/CSS2/syntax/core-syntax-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-009.xht b/tests/wpt/tests/css/CSS2/syntax/core-syntax-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/core-syntax-009.xht rename to tests/wpt/tests/css/CSS2/syntax/core-syntax-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/counters-001-ref.xht b/tests/wpt/tests/css/CSS2/syntax/counters-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/counters-001-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/counters-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/counters-001.xht b/tests/wpt/tests/css/CSS2/syntax/counters-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/counters-001.xht rename to tests/wpt/tests/css/CSS2/syntax/counters-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/counters-002.xht b/tests/wpt/tests/css/CSS2/syntax/counters-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/counters-002.xht rename to tests/wpt/tests/css/CSS2/syntax/counters-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/counters-003-ref.xht b/tests/wpt/tests/css/CSS2/syntax/counters-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/counters-003-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/counters-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/counters-003.xht b/tests/wpt/tests/css/CSS2/syntax/counters-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/counters-003.xht rename to tests/wpt/tests/css/CSS2/syntax/counters-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/counters-004-ref.xht b/tests/wpt/tests/css/CSS2/syntax/counters-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/counters-004-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/counters-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/counters-004.xht b/tests/wpt/tests/css/CSS2/syntax/counters-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/counters-004.xht rename to tests/wpt/tests/css/CSS2/syntax/counters-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/counters-005.xht b/tests/wpt/tests/css/CSS2/syntax/counters-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/counters-005.xht rename to tests/wpt/tests/css/CSS2/syntax/counters-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/counters-006.xht b/tests/wpt/tests/css/CSS2/syntax/counters-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/counters-006.xht rename to tests/wpt/tests/css/CSS2/syntax/counters-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/counters-007.xht b/tests/wpt/tests/css/CSS2/syntax/counters-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/counters-007.xht rename to tests/wpt/tests/css/CSS2/syntax/counters-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/counters-008.xht b/tests/wpt/tests/css/CSS2/syntax/counters-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/counters-008.xht rename to tests/wpt/tests/css/CSS2/syntax/counters-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/counters-009.xht b/tests/wpt/tests/css/CSS2/syntax/counters-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/counters-009.xht rename to tests/wpt/tests/css/CSS2/syntax/counters-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/counters-010-ref.xht b/tests/wpt/tests/css/CSS2/syntax/counters-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/counters-010-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/counters-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/counters-010.xht b/tests/wpt/tests/css/CSS2/syntax/counters-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/counters-010.xht rename to tests/wpt/tests/css/CSS2/syntax/counters-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/declaration-001.xht b/tests/wpt/tests/css/CSS2/syntax/declaration-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/declaration-001.xht rename to tests/wpt/tests/css/CSS2/syntax/declaration-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/declaration-002.xht b/tests/wpt/tests/css/CSS2/syntax/declaration-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/declaration-002.xht rename to tests/wpt/tests/css/CSS2/syntax/declaration-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/declaration-003.xht b/tests/wpt/tests/css/CSS2/syntax/declaration-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/declaration-003.xht rename to tests/wpt/tests/css/CSS2/syntax/declaration-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/declaration-004.xht b/tests/wpt/tests/css/CSS2/syntax/declaration-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/declaration-004.xht rename to tests/wpt/tests/css/CSS2/syntax/declaration-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/declaration-005.xht b/tests/wpt/tests/css/CSS2/syntax/declaration-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/declaration-005.xht rename to tests/wpt/tests/css/CSS2/syntax/declaration-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/declaration-006.xht b/tests/wpt/tests/css/CSS2/syntax/declaration-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/declaration-006.xht rename to tests/wpt/tests/css/CSS2/syntax/declaration-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/declaration-whitespace-001.xht b/tests/wpt/tests/css/CSS2/syntax/declaration-whitespace-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/declaration-whitespace-001.xht rename to tests/wpt/tests/css/CSS2/syntax/declaration-whitespace-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/declarations-009-ref.xht b/tests/wpt/tests/css/CSS2/syntax/declarations-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/declarations-009-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/declarations-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/declarations-009.xht b/tests/wpt/tests/css/CSS2/syntax/declarations-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/declarations-009.xht rename to tests/wpt/tests/css/CSS2/syntax/declarations-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/eof-001.xht b/tests/wpt/tests/css/CSS2/syntax/eof-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/eof-001.xht rename to tests/wpt/tests/css/CSS2/syntax/eof-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/eof-002.xht b/tests/wpt/tests/css/CSS2/syntax/eof-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/eof-002.xht rename to tests/wpt/tests/css/CSS2/syntax/eof-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/eof-003.xht b/tests/wpt/tests/css/CSS2/syntax/eof-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/eof-003.xht rename to tests/wpt/tests/css/CSS2/syntax/eof-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/eof-004.xht b/tests/wpt/tests/css/CSS2/syntax/eof-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/eof-004.xht rename to tests/wpt/tests/css/CSS2/syntax/eof-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/eof-005.xht b/tests/wpt/tests/css/CSS2/syntax/eof-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/eof-005.xht rename to tests/wpt/tests/css/CSS2/syntax/eof-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/eof-006.xht b/tests/wpt/tests/css/CSS2/syntax/eof-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/eof-006.xht rename to tests/wpt/tests/css/CSS2/syntax/eof-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/eof-007.xht b/tests/wpt/tests/css/CSS2/syntax/eof-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/eof-007.xht rename to tests/wpt/tests/css/CSS2/syntax/eof-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-001.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-ident-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-001.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-ident-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-002.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-ident-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-002.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-ident-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-003.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-ident-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-003.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-ident-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-004.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-ident-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-004.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-ident-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-char-001.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-ident-char-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-char-001.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-ident-char-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-spaces-001.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-ident-spaces-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-spaces-001.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-ident-spaces-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-spaces-002.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-ident-spaces-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-spaces-002.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-ident-spaces-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-spaces-003.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-ident-spaces-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-spaces-003.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-ident-spaces-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-spaces-004.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-ident-spaces-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-spaces-004.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-ident-spaces-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-spaces-005.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-ident-spaces-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-spaces-005.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-ident-spaces-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-spaces-006.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-ident-spaces-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-spaces-006.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-ident-spaces-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-spaces-007.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-ident-spaces-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-ident-spaces-007.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-ident-spaces-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-newline-001-ref.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-newline-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-newline-001-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-newline-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-newline-001.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-newline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-newline-001.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-newline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-url-001-ref.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-url-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-url-001-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-url-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-url-001.xht b/tests/wpt/tests/css/CSS2/syntax/escaped-url-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-url-001.xht rename to tests/wpt/tests/css/CSS2/syntax/escaped-url-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-000-ref.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-000-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-000.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-000.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-001.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-001.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-002.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-002.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-003.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-003.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-004.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-004.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-005.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-005.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-006.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-006.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-007.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-007.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-008.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-008.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-009.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-009.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-010.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-010.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-011.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-011.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-012.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-012.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-013-ref.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-013-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-013.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-013.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-014.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-014.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-015.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-015.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-016.xht b/tests/wpt/tests/css/CSS2/syntax/escapes-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/escapes-016.xht rename to tests/wpt/tests/css/CSS2/syntax/escapes-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-000-ref.xht b/tests/wpt/tests/css/CSS2/syntax/ident-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-000-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-000.xht b/tests/wpt/tests/css/CSS2/syntax/ident-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-000.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-001.xht b/tests/wpt/tests/css/CSS2/syntax/ident-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-001.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-002.xht b/tests/wpt/tests/css/CSS2/syntax/ident-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-002.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-003-ref.xht b/tests/wpt/tests/css/CSS2/syntax/ident-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-003-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-003.xht b/tests/wpt/tests/css/CSS2/syntax/ident-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-003.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-004.xht b/tests/wpt/tests/css/CSS2/syntax/ident-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-004.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-005.xht b/tests/wpt/tests/css/CSS2/syntax/ident-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-005.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-006.xht b/tests/wpt/tests/css/CSS2/syntax/ident-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-006.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-007.xht b/tests/wpt/tests/css/CSS2/syntax/ident-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-007.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-008.xht b/tests/wpt/tests/css/CSS2/syntax/ident-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-008.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-009.xht b/tests/wpt/tests/css/CSS2/syntax/ident-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-009.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-010.xht b/tests/wpt/tests/css/CSS2/syntax/ident-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-010.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-011.xht b/tests/wpt/tests/css/CSS2/syntax/ident-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-011.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-012-ref.xht b/tests/wpt/tests/css/CSS2/syntax/ident-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-012-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-012.xht b/tests/wpt/tests/css/CSS2/syntax/ident-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-012.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-013.xht b/tests/wpt/tests/css/CSS2/syntax/ident-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-013.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-014.xht b/tests/wpt/tests/css/CSS2/syntax/ident-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-014.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-015.xht b/tests/wpt/tests/css/CSS2/syntax/ident-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-015.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-016.xht b/tests/wpt/tests/css/CSS2/syntax/ident-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-016.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-017.xht b/tests/wpt/tests/css/CSS2/syntax/ident-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-017.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-018.xht b/tests/wpt/tests/css/CSS2/syntax/ident-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-018.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ident-019.xht b/tests/wpt/tests/css/CSS2/syntax/ident-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ident-019.xht rename to tests/wpt/tests/css/CSS2/syntax/ident-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ignored-rules-001.xht b/tests/wpt/tests/css/CSS2/syntax/ignored-rules-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ignored-rules-001.xht rename to tests/wpt/tests/css/CSS2/syntax/ignored-rules-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ignored-rules-002.xht b/tests/wpt/tests/css/CSS2/syntax/ignored-rules-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ignored-rules-002.xht rename to tests/wpt/tests/css/CSS2/syntax/ignored-rules-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ignored-rules-003.xht b/tests/wpt/tests/css/CSS2/syntax/ignored-rules-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ignored-rules-003.xht rename to tests/wpt/tests/css/CSS2/syntax/ignored-rules-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ignored-rules-004.xht b/tests/wpt/tests/css/CSS2/syntax/ignored-rules-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ignored-rules-004.xht rename to tests/wpt/tests/css/CSS2/syntax/ignored-rules-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ignored-rules-005.xht b/tests/wpt/tests/css/CSS2/syntax/ignored-rules-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ignored-rules-005.xht rename to tests/wpt/tests/css/CSS2/syntax/ignored-rules-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ignored-rules-006.xht b/tests/wpt/tests/css/CSS2/syntax/ignored-rules-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ignored-rules-006.xht rename to tests/wpt/tests/css/CSS2/syntax/ignored-rules-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/ignored-rules-007.xht b/tests/wpt/tests/css/CSS2/syntax/ignored-rules-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/ignored-rules-007.xht rename to tests/wpt/tests/css/CSS2/syntax/ignored-rules-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/import-000.xht b/tests/wpt/tests/css/CSS2/syntax/import-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/import-000.xht rename to tests/wpt/tests/css/CSS2/syntax/import-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/import-001.xht b/tests/wpt/tests/css/CSS2/syntax/import-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/import-001.xht rename to tests/wpt/tests/css/CSS2/syntax/import-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/invalid-at-rule-001.xht b/tests/wpt/tests/css/CSS2/syntax/invalid-at-rule-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/invalid-at-rule-001.xht rename to tests/wpt/tests/css/CSS2/syntax/invalid-at-rule-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/invalid-decl-at-rule-001.xht b/tests/wpt/tests/css/CSS2/syntax/invalid-decl-at-rule-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/invalid-decl-at-rule-001.xht rename to tests/wpt/tests/css/CSS2/syntax/invalid-decl-at-rule-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/invalid-decl-at-rule-002.xht b/tests/wpt/tests/css/CSS2/syntax/invalid-decl-at-rule-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/invalid-decl-at-rule-002.xht rename to tests/wpt/tests/css/CSS2/syntax/invalid-decl-at-rule-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/keywords-000.xht b/tests/wpt/tests/css/CSS2/syntax/keywords-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/keywords-000.xht rename to tests/wpt/tests/css/CSS2/syntax/keywords-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/keywords-001-ref.xht b/tests/wpt/tests/css/CSS2/syntax/keywords-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/keywords-001-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/keywords-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/keywords-001.xht b/tests/wpt/tests/css/CSS2/syntax/keywords-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/keywords-001.xht rename to tests/wpt/tests/css/CSS2/syntax/keywords-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-001.xht b/tests/wpt/tests/css/CSS2/syntax/malformed-decl-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-001.xht rename to tests/wpt/tests/css/CSS2/syntax/malformed-decl-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-002.xht b/tests/wpt/tests/css/CSS2/syntax/malformed-decl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-002.xht rename to tests/wpt/tests/css/CSS2/syntax/malformed-decl-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-003.xht b/tests/wpt/tests/css/CSS2/syntax/malformed-decl-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-003.xht rename to tests/wpt/tests/css/CSS2/syntax/malformed-decl-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-004.xht b/tests/wpt/tests/css/CSS2/syntax/malformed-decl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-004.xht rename to tests/wpt/tests/css/CSS2/syntax/malformed-decl-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-005.xht b/tests/wpt/tests/css/CSS2/syntax/malformed-decl-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-005.xht rename to tests/wpt/tests/css/CSS2/syntax/malformed-decl-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-006.xht b/tests/wpt/tests/css/CSS2/syntax/malformed-decl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-006.xht rename to tests/wpt/tests/css/CSS2/syntax/malformed-decl-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-007.xht b/tests/wpt/tests/css/CSS2/syntax/malformed-decl-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-007.xht rename to tests/wpt/tests/css/CSS2/syntax/malformed-decl-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-008.xht b/tests/wpt/tests/css/CSS2/syntax/malformed-decl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-008.xht rename to tests/wpt/tests/css/CSS2/syntax/malformed-decl-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-block-001-ref.xht b/tests/wpt/tests/css/CSS2/syntax/malformed-decl-block-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-block-001-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/malformed-decl-block-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-block-001.xht b/tests/wpt/tests/css/CSS2/syntax/malformed-decl-block-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/malformed-decl-block-001.xht rename to tests/wpt/tests/css/CSS2/syntax/malformed-decl-block-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/matching-brackets-001-ref.xht b/tests/wpt/tests/css/CSS2/syntax/matching-brackets-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/matching-brackets-001-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/matching-brackets-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/matching-brackets-001.xht b/tests/wpt/tests/css/CSS2/syntax/matching-brackets-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/matching-brackets-001.xht rename to tests/wpt/tests/css/CSS2/syntax/matching-brackets-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/matching-brackets-002-ref.xht b/tests/wpt/tests/css/CSS2/syntax/matching-brackets-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/matching-brackets-002-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/matching-brackets-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/matching-brackets-002.xht b/tests/wpt/tests/css/CSS2/syntax/matching-brackets-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/matching-brackets-002.xht rename to tests/wpt/tests/css/CSS2/syntax/matching-brackets-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/matching-brackets-003.xht b/tests/wpt/tests/css/CSS2/syntax/matching-brackets-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/matching-brackets-003.xht rename to tests/wpt/tests/css/CSS2/syntax/matching-brackets-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-keywords-001.xht b/tests/wpt/tests/css/CSS2/syntax/quoted-keywords-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-keywords-001.xht rename to tests/wpt/tests/css/CSS2/syntax/quoted-keywords-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-keywords-002.xht b/tests/wpt/tests/css/CSS2/syntax/quoted-keywords-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-keywords-002.xht rename to tests/wpt/tests/css/CSS2/syntax/quoted-keywords-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-string-001-ref.xht b/tests/wpt/tests/css/CSS2/syntax/quoted-string-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-string-001-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/quoted-string-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-string-001.xht b/tests/wpt/tests/css/CSS2/syntax/quoted-string-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-string-001.xht rename to tests/wpt/tests/css/CSS2/syntax/quoted-string-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-string-002-ref.xht b/tests/wpt/tests/css/CSS2/syntax/quoted-string-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-string-002-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/quoted-string-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-string-002.xht b/tests/wpt/tests/css/CSS2/syntax/quoted-string-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-string-002.xht rename to tests/wpt/tests/css/CSS2/syntax/quoted-string-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-string-003.xht b/tests/wpt/tests/css/CSS2/syntax/quoted-string-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-string-003.xht rename to tests/wpt/tests/css/CSS2/syntax/quoted-string-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-string-004.xht b/tests/wpt/tests/css/CSS2/syntax/quoted-string-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/quoted-string-004.xht rename to tests/wpt/tests/css/CSS2/syntax/quoted-string-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/scientific-notation-001-ref.xht b/tests/wpt/tests/css/CSS2/syntax/scientific-notation-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/scientific-notation-001-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/scientific-notation-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/scientific-notation-001.xht b/tests/wpt/tests/css/CSS2/syntax/scientific-notation-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/scientific-notation-001.xht rename to tests/wpt/tests/css/CSS2/syntax/scientific-notation-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/sgml-comments-000.xht b/tests/wpt/tests/css/CSS2/syntax/sgml-comments-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/sgml-comments-000.xht rename to tests/wpt/tests/css/CSS2/syntax/sgml-comments-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/sgml-comments-001.xht b/tests/wpt/tests/css/CSS2/syntax/sgml-comments-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/sgml-comments-001.xht rename to tests/wpt/tests/css/CSS2/syntax/sgml-comments-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/sgml-comments-002-ref.xht b/tests/wpt/tests/css/CSS2/syntax/sgml-comments-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/sgml-comments-002-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/sgml-comments-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/sgml-comments-002.xht b/tests/wpt/tests/css/CSS2/syntax/sgml-comments-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/sgml-comments-002.xht rename to tests/wpt/tests/css/CSS2/syntax/sgml-comments-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/signed-numbers-001-ref.xht b/tests/wpt/tests/css/CSS2/syntax/signed-numbers-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/signed-numbers-001-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/signed-numbers-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/signed-numbers-001.xht b/tests/wpt/tests/css/CSS2/syntax/signed-numbers-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/signed-numbers-001.xht rename to tests/wpt/tests/css/CSS2/syntax/signed-numbers-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/signed-numbers-002.xht b/tests/wpt/tests/css/CSS2/syntax/signed-numbers-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/signed-numbers-002.xht rename to tests/wpt/tests/css/CSS2/syntax/signed-numbers-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/square-brackets-001.xht b/tests/wpt/tests/css/CSS2/syntax/square-brackets-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/square-brackets-001.xht rename to tests/wpt/tests/css/CSS2/syntax/square-brackets-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/strings-000.xht b/tests/wpt/tests/css/CSS2/syntax/strings-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/strings-000.xht rename to tests/wpt/tests/css/CSS2/syntax/strings-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/'green block.png b/tests/wpt/tests/css/CSS2/syntax/support/'green block.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/'green block.png rename to tests/wpt/tests/css/CSS2/syntax/support/'green block.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/,uri-014.png b/tests/wpt/tests/css/CSS2/syntax/support/,uri-014.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/,uri-014.png rename to tests/wpt/tests/css/CSS2/syntax/support/,uri-014.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/1x1-green.png b/tests/wpt/tests/css/CSS2/syntax/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/syntax/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/syntax/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/syntax/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/syntax/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/syntax/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/syntax/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/syntax/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/1x1-red.png b/tests/wpt/tests/css/CSS2/syntax/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/syntax/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/1x1-white.png b/tests/wpt/tests/css/CSS2/syntax/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/syntax/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/syntax/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/syntax/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/60x60-green.png b/tests/wpt/tests/css/CSS2/syntax/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/syntax/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/a-green.css b/tests/wpt/tests/css/CSS2/syntax/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/a-green.css rename to tests/wpt/tests/css/CSS2/syntax/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-001.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-001.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-001.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-001.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-001.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-001.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-001.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-001.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-002.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-002.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-002.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-002.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-002.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-002.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-002.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-002.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-003.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-003.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-003.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-003.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-003.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-003.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-003.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-003.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-007.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-007.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-007.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-007.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-008.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-008.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-008.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-008.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-009.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-009.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-009.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-009.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-010.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-010.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-010.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-010.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-011.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-011.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-011.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-011.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-012.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-012.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-012.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-012.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-013.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-013.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-013.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-013.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-014.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-014.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-014.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-014.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-015.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-015.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-015.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-015.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-016.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-016.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-016.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-016.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-017.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-017.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-017.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-017.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-018.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-018.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-018.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-018.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-019.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-019.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-019.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-019.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-020.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-020.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-020.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-020.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-021.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-021.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-021.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-021.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-022.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-022.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-022.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-022.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-023.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-023.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-023.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-023.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-024.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-024.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-024.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-024.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-025.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-025.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-025.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-025.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-026.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-026.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-026.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-026.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-027.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-027.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-027.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-027.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-028.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-028.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-028.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-028.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-029.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-029.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-029.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-029.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-030.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-030.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-030.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-030.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-031.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-031.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-031.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-031.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-032.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-032.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-032.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-032.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-033.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-033.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-033.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-033.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-034.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-034.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-034.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-034.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-035.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-035.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-035.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-035.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-036.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-036.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-036.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-036.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-037.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-037.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-037.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-037.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-038.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-038.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-038.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-038.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-039.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-039.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-039.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-039.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-040.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-040.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-040.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-040.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-041.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-041.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-041.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-041.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-042.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-042.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-042.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-042.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-043.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-043.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-043.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-043.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-044.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-044.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-044.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-044.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-045.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-045.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-045.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-045.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-046.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-046.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-046.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-046.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-047.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-047.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-047.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-047.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-048.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-048.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-048.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-048.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-049.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-049.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-049.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-049.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-050.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-050.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-050.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-050.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-051.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-051.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-051.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-051.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-052.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-052.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-052.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-052.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-053.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-053.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-053.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-053.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-054.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-054.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-054.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-054.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-055.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-055.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-055.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-055.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-056.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-056.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-056.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-056.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-057.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-057.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-057.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-057.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-058.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-058.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-058.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-058.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-059.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-059.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-059.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-059.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-060.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-060.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-060.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-060.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-071.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-071.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-071.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-071.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-071.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-071.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-071.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-071.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-072.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-072.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-072.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-072.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-072.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-072.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-072.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-072.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-073.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-073.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-073.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-073.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-073.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-073.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-073.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-073.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-074.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-074.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-074.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-074.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-074.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-074.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-074.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-074.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-075.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-075.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-075.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-075.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-075.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-075.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-075.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-075.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-076.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-076.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-076.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-076.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-076.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-076.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-076.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-076.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-077.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-077.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-077.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-077.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-077.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-077.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-077.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-077.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-quotes-001.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-quotes-001.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-quotes-001.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-quotes-001.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-space-001.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-space-001.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-space-001.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-space-001.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-space-002.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-space-002.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-space-002.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-space-002.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-utf16-be-001.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-utf16-be-001.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-utf16-be-001.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-utf16-be-001.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-utf16-be-002.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-utf16-be-002.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-utf16-be-002.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-utf16-be-002.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-utf16-be-003.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-utf16-be-003.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-utf16-be-003.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-utf16-be-003.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-utf16-le-001.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-utf16-le-001.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-utf16-le-001.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-utf16-le-001.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-utf16-le-002.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-utf16-le-002.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-utf16-le-002.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-utf16-le-002.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-utf16-le-003.css b/tests/wpt/tests/css/CSS2/syntax/support/at-charset-utf16-le-003.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-charset-utf16-le-003.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-charset-utf16-le-003.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-rule-green.css b/tests/wpt/tests/css/CSS2/syntax/support/at-rule-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-rule-green.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-rule-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-rule-red.css b/tests/wpt/tests/css/CSS2/syntax/support/at-rule-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/at-rule-red.css rename to tests/wpt/tests/css/CSS2/syntax/support/at-rule-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/b-green.css b/tests/wpt/tests/css/CSS2/syntax/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/b-green.css rename to tests/wpt/tests/css/CSS2/syntax/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/c-red.css b/tests/wpt/tests/css/CSS2/syntax/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/c-red.css rename to tests/wpt/tests/css/CSS2/syntax/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/cat.png b/tests/wpt/tests/css/CSS2/syntax/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/cat.png rename to tests/wpt/tests/css/CSS2/syntax/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-031.css b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-031.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-031.css rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-031.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-031.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-031.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-031.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-031.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-032.css b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-032.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-032.css rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-032.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-032.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-032.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-032.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-032.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-033.css b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-033.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-033.css rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-033.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-033.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-033.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-033.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-033.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-034.css b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-034.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-034.css rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-034.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-034.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-034.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-034.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-034.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-035.css b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-035.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-035.css rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-035.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-035.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-035.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-035.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-035.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-036.css b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-036.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-036.css rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-036.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-036.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-036.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-036.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-036.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-037.css b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-037.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-037.css rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-037.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-037.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-037.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-037.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-037.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-038.css b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-038.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-038.css rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-038.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-041.css b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-041.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-041.css rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-041.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-041.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/character-encoding-041.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/character-encoding-041.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/character-encoding-041.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/charset-attr-001.css b/tests/wpt/tests/css/CSS2/syntax/support/charset-attr-001.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/charset-attr-001.css rename to tests/wpt/tests/css/CSS2/syntax/support/charset-attr-001.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/core-syntax-009.css b/tests/wpt/tests/css/CSS2/syntax/support/core-syntax-009.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/core-syntax-009.css rename to tests/wpt/tests/css/CSS2/syntax/support/core-syntax-009.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/diamond.png b/tests/wpt/tests/css/CSS2/syntax/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/diamond.png rename to tests/wpt/tests/css/CSS2/syntax/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/eof-green.css b/tests/wpt/tests/css/CSS2/syntax/support/eof-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/eof-green.css rename to tests/wpt/tests/css/CSS2/syntax/support/eof-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/green15x15.png b/tests/wpt/tests/css/CSS2/syntax/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/green15x15.png rename to tests/wpt/tests/css/CSS2/syntax/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/import-green.css b/tests/wpt/tests/css/CSS2/syntax/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/import-green.css rename to tests/wpt/tests/css/CSS2/syntax/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/import-red.css b/tests/wpt/tests/css/CSS2/syntax/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/import-red.css rename to tests/wpt/tests/css/CSS2/syntax/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/syntax/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/syntax/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/syntax/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/syntax/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/syntax/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/syntax/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/syntax/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/syntax/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/plaintext-css.txt b/tests/wpt/tests/css/CSS2/syntax/support/plaintext-css.txt similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/plaintext-css.txt rename to tests/wpt/tests/css/CSS2/syntax/support/plaintext-css.txt diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/plaintext.css b/tests/wpt/tests/css/CSS2/syntax/support/plaintext.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/plaintext.css rename to tests/wpt/tests/css/CSS2/syntax/support/plaintext.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/plaintext.css.headers b/tests/wpt/tests/css/CSS2/syntax/support/plaintext.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/plaintext.css.headers rename to tests/wpt/tests/css/CSS2/syntax/support/plaintext.css.headers diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/ring.png b/tests/wpt/tests/css/CSS2/syntax/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/ring.png rename to tests/wpt/tests/css/CSS2/syntax/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/square-purple.png b/tests/wpt/tests/css/CSS2/syntax/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/square-purple.png rename to tests/wpt/tests/css/CSS2/syntax/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/square-teal.png b/tests/wpt/tests/css/CSS2/syntax/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/square-teal.png rename to tests/wpt/tests/css/CSS2/syntax/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/square-white.png b/tests/wpt/tests/css/CSS2/syntax/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/square-white.png rename to tests/wpt/tests/css/CSS2/syntax/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/syntax/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/syntax/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/swatch-green.png b/tests/wpt/tests/css/CSS2/syntax/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/syntax/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/syntax/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/syntax/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/syntax/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/syntax/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/swatch-red.png b/tests/wpt/tests/css/CSS2/syntax/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/syntax/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/swatch-white.png b/tests/wpt/tests/css/CSS2/syntax/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/syntax/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/syntax/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/syntax/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/test-bl.png b/tests/wpt/tests/css/CSS2/syntax/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/test-bl.png rename to tests/wpt/tests/css/CSS2/syntax/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/test-br.png b/tests/wpt/tests/css/CSS2/syntax/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/test-br.png rename to tests/wpt/tests/css/CSS2/syntax/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/test-outer.png b/tests/wpt/tests/css/CSS2/syntax/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/test-outer.png rename to tests/wpt/tests/css/CSS2/syntax/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/test-tl.png b/tests/wpt/tests/css/CSS2/syntax/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/test-tl.png rename to tests/wpt/tests/css/CSS2/syntax/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/test-tr.png b/tests/wpt/tests/css/CSS2/syntax/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/test-tr.png rename to tests/wpt/tests/css/CSS2/syntax/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/uri-001.css b/tests/wpt/tests/css/CSS2/syntax/support/uri-001.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/uri-001.css rename to tests/wpt/tests/css/CSS2/syntax/support/uri-001.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/support/uri-002.css b/tests/wpt/tests/css/CSS2/syntax/support/uri-002.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/support/uri-002.css rename to tests/wpt/tests/css/CSS2/syntax/support/uri-002.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/unterminated-string-001.xht b/tests/wpt/tests/css/CSS2/syntax/unterminated-string-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/unterminated-string-001.xht rename to tests/wpt/tests/css/CSS2/syntax/unterminated-string-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-001.xht b/tests/wpt/tests/css/CSS2/syntax/uri-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-001.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-002.xht b/tests/wpt/tests/css/CSS2/syntax/uri-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-002.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-003.xht b/tests/wpt/tests/css/CSS2/syntax/uri-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-003.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-004.xht b/tests/wpt/tests/css/CSS2/syntax/uri-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-004.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-005.xht b/tests/wpt/tests/css/CSS2/syntax/uri-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-005.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-006.xht b/tests/wpt/tests/css/CSS2/syntax/uri-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-006.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-007.xht b/tests/wpt/tests/css/CSS2/syntax/uri-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-007.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-008.xht b/tests/wpt/tests/css/CSS2/syntax/uri-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-008.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-009.xht b/tests/wpt/tests/css/CSS2/syntax/uri-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-009.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-010.xht b/tests/wpt/tests/css/CSS2/syntax/uri-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-010.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-011.xht b/tests/wpt/tests/css/CSS2/syntax/uri-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-011.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-012-ref.xht b/tests/wpt/tests/css/CSS2/syntax/uri-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-012-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-012.xht b/tests/wpt/tests/css/CSS2/syntax/uri-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-012.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-013-ref.xht b/tests/wpt/tests/css/CSS2/syntax/uri-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-013-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-013.xht b/tests/wpt/tests/css/CSS2/syntax/uri-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-013.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-014.xht b/tests/wpt/tests/css/CSS2/syntax/uri-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-014.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-015.xht b/tests/wpt/tests/css/CSS2/syntax/uri-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-015.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-016-ref.xht b/tests/wpt/tests/css/CSS2/syntax/uri-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-016-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-016.xht b/tests/wpt/tests/css/CSS2/syntax/uri-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-016.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-017-ref.xht b/tests/wpt/tests/css/CSS2/syntax/uri-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-017-ref.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-017.xht b/tests/wpt/tests/css/CSS2/syntax/uri-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-017.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/uri-018.xht b/tests/wpt/tests/css/CSS2/syntax/uri-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/uri-018.xht rename to tests/wpt/tests/css/CSS2/syntax/uri-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/whitespace-001.xht b/tests/wpt/tests/css/CSS2/syntax/whitespace-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/whitespace-001.xht rename to tests/wpt/tests/css/CSS2/syntax/whitespace-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/whitespace-002.xht b/tests/wpt/tests/css/CSS2/syntax/whitespace-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/syntax/whitespace-002.xht rename to tests/wpt/tests/css/CSS2/syntax/whitespace-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/anonymous-table-box-width-001.xht b/tests/wpt/tests/css/CSS2/tables/anonymous-table-box-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/anonymous-table-box-width-001.xht rename to tests/wpt/tests/css/CSS2/tables/anonymous-table-box-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/background-table-001.xht b/tests/wpt/tests/css/CSS2/tables/background-table-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/background-table-001.xht rename to tests/wpt/tests/css/CSS2/tables/background-table-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/background-table-002.xht b/tests/wpt/tests/css/CSS2/tables/background-table-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/background-table-002.xht rename to tests/wpt/tests/css/CSS2/tables/background-table-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/background-table-003.xht b/tests/wpt/tests/css/CSS2/tables/background-table-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/background-table-003.xht rename to tests/wpt/tests/css/CSS2/tables/background-table-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/background-table-README b/tests/wpt/tests/css/CSS2/tables/background-table-README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/background-table-README rename to tests/wpt/tests/css/CSS2/tables/background-table-README diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/basic-css-table-001.xht b/tests/wpt/tests/css/CSS2/tables/basic-css-table-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/basic-css-table-001.xht rename to tests/wpt/tests/css/CSS2/tables/basic-css-table-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/basic-html-table-001.xht b/tests/wpt/tests/css/CSS2/tables/basic-html-table-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/basic-html-table-001.xht rename to tests/wpt/tests/css/CSS2/tables/basic-html-table-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/bidi-border-collapse-001.xht b/tests/wpt/tests/css/CSS2/tables/bidi-border-collapse-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/bidi-border-collapse-001.xht rename to tests/wpt/tests/css/CSS2/tables/bidi-border-collapse-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/bidi-border-collapse-002.xht b/tests/wpt/tests/css/CSS2/tables/bidi-border-collapse-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/bidi-border-collapse-002.xht rename to tests/wpt/tests/css/CSS2/tables/bidi-border-collapse-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/bidi-border-collapse-003.xht b/tests/wpt/tests/css/CSS2/tables/bidi-border-collapse-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/bidi-border-collapse-003.xht rename to tests/wpt/tests/css/CSS2/tables/bidi-border-collapse-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/bidi-border-collapse-004.xht b/tests/wpt/tests/css/CSS2/tables/bidi-border-collapse-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/bidi-border-collapse-004.xht rename to tests/wpt/tests/css/CSS2/tables/bidi-border-collapse-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-001.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-002.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-003.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-004.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-004.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-005-ref.html b/tests/wpt/tests/css/CSS2/tables/border-collapse-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-005-ref.html rename to tests/wpt/tests/css/CSS2/tables/border-collapse-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-005.html b/tests/wpt/tests/css/CSS2/tables/border-collapse-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-005.html rename to tests/wpt/tests/css/CSS2/tables/border-collapse-005.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-001.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-002.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-003.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-005.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-006.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-007.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-008.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-009.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-010.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-011.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-012.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-013.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-014.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-015.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-016.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-017.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-001.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-002-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-002-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-002.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-003-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-003-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-003.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-004-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-004-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-004.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-004.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-005-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-005-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-005.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-cell-005.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-cell-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-colgroup-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-colgroup-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-colgroup-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-colgroup-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-colgroup-001.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-colgroup-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-colgroup-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-colgroup-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-colgroup-002-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-colgroup-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-colgroup-002-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-colgroup-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-colgroup-002.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-colgroup-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-colgroup-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-colgroup-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-colgroup-003-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-colgroup-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-colgroup-003-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-colgroup-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-colgroup-003.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-colgroup-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-colgroup-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-colgroup-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-column-001.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-column-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-column-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-column-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-column-002.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-column-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-column-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-column-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-column-003.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-column-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-column-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-column-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-row-001.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-row-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-row-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-row-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-row-002.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-row-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-row-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-row-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-row-003.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-row-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-row-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-row-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-001.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-002-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-002-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-002.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-003-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-003-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-003.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-rowgroup-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-table-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-table-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-table-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-table-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-table-001.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-table-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-table-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-table-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-table-002-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-table-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-table-002-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-table-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-table-002.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-table-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-table-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-table-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-table-003-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-table-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-table-003-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-table-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-table-003.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-table-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-dynamic-table-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-dynamic-table-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-empty-row-ref.html b/tests/wpt/tests/css/CSS2/tables/border-collapse-empty-row-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-empty-row-ref.html rename to tests/wpt/tests/css/CSS2/tables/border-collapse-empty-row-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-empty-row.html b/tests/wpt/tests/css/CSS2/tables/border-collapse-empty-row.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-empty-row.html rename to tests/wpt/tests/css/CSS2/tables/border-collapse-empty-row.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-inherited-001.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-inherited-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-inherited-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-inherited-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-initial-001.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-initial-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-initial-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-initial-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-no-interpolation.html b/tests/wpt/tests/css/CSS2/tables/border-collapse-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-no-interpolation.html rename to tests/wpt/tests/css/CSS2/tables/border-collapse-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-offset-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-offset-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-001.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-offset-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-offset-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-002-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-offset-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-002-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-offset-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-002.xht b/tests/wpt/tests/css/CSS2/tables/border-collapse-offset-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-collapse-offset-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001a.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-001a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001a.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-001a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001b.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-001b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001b.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-001b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001c.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-001c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001c.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-001c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001d-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-001d-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001d-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-001d-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001d.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-001d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001d.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-001d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001e-ref.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-001e-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001e-ref.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-001e-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001e.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-001e.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-001e.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-001e.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-002.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-003.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-004.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-004.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-005.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-005.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-006.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-006.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-007.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-007.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-008.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-008.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-009.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-009.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-010.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-010.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-011.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-011.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-012.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-012.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-013.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-013.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-014.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-014.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-015.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-015.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-016.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-016.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-017.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-017.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-018.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-018.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-019.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-019.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-020.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-020.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-021.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-021.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-021a.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-021a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-021a.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-021a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-022.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-022.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-023.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-023.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-024.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-024.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-025.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-025.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-026.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-026.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-027.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-027.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-028.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-028.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-029.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-029.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-030.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-030.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-031.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-031.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-032.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-032.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-033.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-033.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-034.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-034.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-035.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-035.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-036.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-036.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-037.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-037.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-038.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-038.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-039.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-element-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-element-039.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-element-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-example-001.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-example-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-example-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-example-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-example-002.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-example-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-example-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-example-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-resolution-001.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-resolution-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-resolution-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-resolution-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-resolution-002.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-resolution-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-resolution-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-resolution-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-resolution-003.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-resolution-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-resolution-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-resolution-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-resolution-004.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-resolution-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-resolution-004.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-resolution-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-resolution-005.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-resolution-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-resolution-005.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-resolution-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-resolution-006.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-resolution-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-resolution-006.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-resolution-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-001.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-002.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-003.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-004.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-004.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-005.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-005.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-006.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-006.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-007.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-007.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-008.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-008.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-009.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-009.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-010.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-010.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-011.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-011.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-012.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-012.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-013.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-013.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-014.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-014.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-015.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-015.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-016.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-016.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-017.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-017.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-018.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-018.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-019.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-019.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-020.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-020.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-021.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-021.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-022.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-022.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-023.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-023.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-024.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-024.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-025.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-025.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-026.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-026.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-027.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-027.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-028.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-028.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-029.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-029.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-030.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-030.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-031.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-031.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-032.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-032.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-033.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-033.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-034.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-034.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-035.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-035.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-036.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-036.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-037.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-037.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-038.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-038.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-039.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-039.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-040.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-040.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-041.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-041.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-042.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-042.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-043.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-043.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-044.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-044.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-045.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-045.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-046.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-046.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-047.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-047.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-048.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-048.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-049.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-049.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-050.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-050.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-051.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-051.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-052.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-052.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-053.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-053.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-054.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-054.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-055.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-055.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-056.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-056.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-057.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-057.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-058.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-058.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-059.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-059.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-060.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-060.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-061.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-061.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-062.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-062.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-063.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-063.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-064.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-064.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-065.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-065.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-066.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-066.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-067.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-067.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-068.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-068.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-069.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-069.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-070.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-070.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-071.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-071.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-072.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-072.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-073.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-073.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-074.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-074.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-075.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-075.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-076.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-076.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-077.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-077.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-078.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-078.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-079.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-079.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-080.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-080.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-081.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-081.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-082.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-082.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-083.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-083.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-084.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-084.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-085.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-085.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-086.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-086.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-087.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-087.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-087.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-088.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-088.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-089.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-089.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-090.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-090.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-091.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-091.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-092.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-092.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-093.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-093.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-094.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-094.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-095.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-095.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-096.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-096.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-097.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-097.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-098.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-098.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-099.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-099.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-100.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-style-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-style-100.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-style-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-000.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-000.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-001.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-002.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-003.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-004.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-004.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-005.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-005.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-006.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-006.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-007.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-007.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-008.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-008.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-009.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-009.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-010.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-010.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-011.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-011.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-012.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-012.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-013.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-013.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-014.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-014.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-015.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-015.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-016.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-016.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-017.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-017.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-018.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-018.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-019.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-019.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-020.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-020.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-021.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-021.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-022.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-022.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-023.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-023.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-024.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-024.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-025.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-025.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-026.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-026.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-027.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-027.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-028.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-028.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-029.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-029.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-030.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-030.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-031.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-031.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-032.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-032.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-033.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-033.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-034.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-034.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-035.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-035.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-036.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-036.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-037.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-037.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-038.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-038.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-039.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-039.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-040.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-040.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-041.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-041.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-042.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-042.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-043.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-043.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-044.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-044.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-045.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-045.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-046.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-046.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-047.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-047.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-048.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-048.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-049.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-049.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-050.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-050.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-051.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-051.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-052.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-052.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-053.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-053.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-054.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-054.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-055.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-055.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-056.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-056.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-057.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-057.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-058.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-058.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-059.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-059.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-060.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-060.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-061.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-061.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-062.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-062.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-063.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-063.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-064.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-064.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-065.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-065.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-066.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-066.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-067.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-067.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-068.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-068.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-069.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-069.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-070.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-070.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-071.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-071.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-072.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-072.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-073.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-073.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-074.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-074.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-075.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-075.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-076.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-076.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-077.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-077.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-078.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-078.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-079.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-079.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-080.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-080.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-081.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-081.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-082.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-082.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-083.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-083.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-084.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-084.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-085.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-085.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-086.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-086.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-087.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-087.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-087.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-088.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-088.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-089.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-089.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-090.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-090.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-091.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-091.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-092.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-092.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-093.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-093.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-094.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-094.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-095.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-095.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-096.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-096.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-097.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-097.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-098.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-098.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-099.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-w-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-w-099.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-w-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-001.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-002.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-003.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-004.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-004.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-005.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-005.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-006.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-006.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-007.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-007.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-008.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-008.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-009.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-009.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-010.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-010.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-011.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-011.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-012.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-012.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-013.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-013.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-014.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-014.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-015.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-015.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-016.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-016.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-017.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-017.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-018.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-018.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-019.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-019.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-020.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-020.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-021.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-021.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-022.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-022.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-023.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-023.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-024.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-024.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-025.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-025.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-026.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-026.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-027.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-027.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-028.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-028.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-029.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-029.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-030.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-030.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-031.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-031.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-032.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-032.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-033.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-033.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-034.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-034.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-035.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-035.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-036.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-036.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-037.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-037.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-038.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-038.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-039.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-039.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-040.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-040.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-041.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-041.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-042.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-042.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-043.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-043.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-044.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-044.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-045.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-045.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-046.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-046.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-047.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-047.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-048.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-048.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-049.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-049.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-050.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-050.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-051.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-051.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-052.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-052.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-053.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-053.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-054.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-054.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-055.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-055.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-056.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-056.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-057.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-057.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-058.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-058.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-059.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-059.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-060.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-060.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-061.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-061.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-062.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-062.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-063.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-063.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-064.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-064.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-065.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-065.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-066.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-066.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-067.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-067.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-068.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-068.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-069.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-069.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-070.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-070.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-071.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-071.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-072.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-072.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-073.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-073.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-074.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-074.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-075.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-075.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-076.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-076.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-077.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-077.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-078.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-078.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-079.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-079.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-080.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-080.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-081.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-081.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-082.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-082.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-083.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-083.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-084.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-084.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-085.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-085.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-086.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-086.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-087.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-087.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-087.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-088.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-088.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-089.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-089.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-090.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-090.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-091.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-091.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-092.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-092.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-093.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-093.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-094.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-094.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-095.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-095.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-096.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-096.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-097.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-097.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-098.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-098.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-099.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-099.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-100.xht b/tests/wpt/tests/css/CSS2/tables/border-conflict-width-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-conflict-width-100.xht rename to tests/wpt/tests/css/CSS2/tables/border-conflict-width-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-001.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-002.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-003.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-004.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-004.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-005.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-005.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-006.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-006.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-007.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-007.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-012.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-012.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-013.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-013.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-014.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-014.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-015.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-015.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-016.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-016.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-017.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-017.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-018.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-018.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-023.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-023.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-024.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-024.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-025.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-025.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-026.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-026.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-027.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-027.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-028.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-028.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-029.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-029.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-034.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-034.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-035.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-035.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-036.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-036.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-037.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-037.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-038.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-038.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-039.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-039.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-040.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-040.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-045.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-045.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-046.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-046.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-047.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-047.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-048.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-048.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-049.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-049.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-050.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-050.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-051.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-051.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-056.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-056.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-057.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-057.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-058.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-058.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-059.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-059.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-060.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-060.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-061.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-061.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-062.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-062.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-067.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-067.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-068.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-068.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-069.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-069.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-070.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-070.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-071.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-071.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-072.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-072.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-073.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-073.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-078.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-078.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-079.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-079.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-081.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-081.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-082.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-082.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-083.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-083.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-084.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-084.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-089.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-089.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-090.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-090.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-091.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-091.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-092.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-092.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-093.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-093.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-094.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-094.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-001.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-002.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-003.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-005.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-006.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-007.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-008.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-009.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-010.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-011.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-012.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-013.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-014.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-015.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-016.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-017.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-inherited-001.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-inherited-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-inherited-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-inherited-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-initial-001.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-initial-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-initial-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-initial-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-initial-002.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-initial-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-initial-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-initial-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-percentage-001.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-percentage-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-percentage-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-percentage-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-values-001.xht b/tests/wpt/tests/css/CSS2/tables/border-spacing-values-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-spacing-values-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-spacing-values-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-style-inset-001.xht b/tests/wpt/tests/css/CSS2/tables/border-style-inset-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-style-inset-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-style-inset-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-style-inset-002.xht b/tests/wpt/tests/css/CSS2/tables/border-style-inset-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-style-inset-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-style-inset-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-style-outset-001.xht b/tests/wpt/tests/css/CSS2/tables/border-style-outset-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-style-outset-001.xht rename to tests/wpt/tests/css/CSS2/tables/border-style-outset-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-style-outset-002.xht b/tests/wpt/tests/css/CSS2/tables/border-style-outset-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/border-style-outset-002.xht rename to tests/wpt/tests/css/CSS2/tables/border-style-outset-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-position-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/caption-position-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-position-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/caption-position-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-position-001.xht b/tests/wpt/tests/css/CSS2/tables/caption-position-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-position-001.xht rename to tests/wpt/tests/css/CSS2/tables/caption-position-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-001.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-001.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-002.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-002.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-003.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-003.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-001-ref.html b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-001-ref.html rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-001.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-002-ref.html b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-002-ref.html rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-002.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-003-ref.html b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-003-ref.html rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-003.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-005.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-006-ref.html b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-006-ref.html rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-006.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-007.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-008-ref.html b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-008-ref.html rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-008.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-009.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-010.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-011.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-012.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-013.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-014.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-015.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-016.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-017-ref.html b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-017-ref.html rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-017.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-example-001.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-example-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-example-001.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-example-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-inherited-001.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-inherited-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-inherited-001.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-inherited-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-initial-001.xht b/tests/wpt/tests/css/CSS2/tables/caption-side-initial-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-side-initial-001.xht rename to tests/wpt/tests/css/CSS2/tables/caption-side-initial-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-vs-table-box-001.xht b/tests/wpt/tests/css/CSS2/tables/caption-vs-table-box-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-vs-table-box-001.xht rename to tests/wpt/tests/css/CSS2/tables/caption-vs-table-box-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/caption-vs-table-box-002.xht b/tests/wpt/tests/css/CSS2/tables/caption-vs-table-box-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/caption-vs-table-box-002.xht rename to tests/wpt/tests/css/CSS2/tables/caption-vs-table-box-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-001-ref.html b/tests/wpt/tests/css/CSS2/tables/collapsing-border-model-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-001-ref.html rename to tests/wpt/tests/css/CSS2/tables/collapsing-border-model-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-001.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-border-model-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-001.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-border-model-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-002.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-border-model-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-002.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-border-model-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-003-ref.html b/tests/wpt/tests/css/CSS2/tables/collapsing-border-model-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-003-ref.html rename to tests/wpt/tests/css/CSS2/tables/collapsing-border-model-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-003.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-border-model-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-003.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-border-model-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-004.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-border-model-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-004.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-border-model-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-005.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-border-model-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-005.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-border-model-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-006.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-border-model-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-006.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-border-model-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-007.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-border-model-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-007.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-border-model-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-008.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-border-model-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-008.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-border-model-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-009.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-border-model-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-009.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-border-model-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-010a.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-border-model-010a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-010a.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-border-model-010a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-010b.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-border-model-010b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-border-model-010b.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-border-model-010b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-001.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-001.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-002.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-002.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-003.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-003.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-004.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-004.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-005.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-005.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-006.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-006.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-007.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-007.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-008.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-008.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-009.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-009.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-010.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-010.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-011.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-011.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-012.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-012.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-013.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-013.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-014.xht b/tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/collapsing-table-borders-014.xht rename to tests/wpt/tests/css/CSS2/tables/collapsing-table-borders-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-background-001.xht b/tests/wpt/tests/css/CSS2/tables/column-background-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-background-001.xht rename to tests/wpt/tests/css/CSS2/tables/column-background-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-background-002.xht b/tests/wpt/tests/css/CSS2/tables/column-background-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-background-002.xht rename to tests/wpt/tests/css/CSS2/tables/column-background-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-border-001.xht b/tests/wpt/tests/css/CSS2/tables/column-border-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-border-001.xht rename to tests/wpt/tests/css/CSS2/tables/column-border-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-border-002.xht b/tests/wpt/tests/css/CSS2/tables/column-border-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-border-002.xht rename to tests/wpt/tests/css/CSS2/tables/column-border-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-horizontal-alignment-001.xht b/tests/wpt/tests/css/CSS2/tables/column-horizontal-alignment-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-horizontal-alignment-001.xht rename to tests/wpt/tests/css/CSS2/tables/column-horizontal-alignment-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-horizontal-alignment-002.xht b/tests/wpt/tests/css/CSS2/tables/column-horizontal-alignment-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-horizontal-alignment-002.xht rename to tests/wpt/tests/css/CSS2/tables/column-horizontal-alignment-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-horizontal-alignment-003.xht b/tests/wpt/tests/css/CSS2/tables/column-horizontal-alignment-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-horizontal-alignment-003.xht rename to tests/wpt/tests/css/CSS2/tables/column-horizontal-alignment-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-horizontal-alignment-004.xht b/tests/wpt/tests/css/CSS2/tables/column-horizontal-alignment-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-horizontal-alignment-004.xht rename to tests/wpt/tests/css/CSS2/tables/column-horizontal-alignment-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-horizontal-alignment-005.xht b/tests/wpt/tests/css/CSS2/tables/column-horizontal-alignment-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-horizontal-alignment-005.xht rename to tests/wpt/tests/css/CSS2/tables/column-horizontal-alignment-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-visibility-001.xht b/tests/wpt/tests/css/CSS2/tables/column-visibility-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-visibility-001.xht rename to tests/wpt/tests/css/CSS2/tables/column-visibility-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-visibility-002.xht b/tests/wpt/tests/css/CSS2/tables/column-visibility-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-visibility-002.xht rename to tests/wpt/tests/css/CSS2/tables/column-visibility-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-visibility-003.xht b/tests/wpt/tests/css/CSS2/tables/column-visibility-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-visibility-003.xht rename to tests/wpt/tests/css/CSS2/tables/column-visibility-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-visibility-004-ref.xht b/tests/wpt/tests/css/CSS2/tables/column-visibility-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-visibility-004-ref.xht rename to tests/wpt/tests/css/CSS2/tables/column-visibility-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-visibility-004.xht b/tests/wpt/tests/css/CSS2/tables/column-visibility-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-visibility-004.xht rename to tests/wpt/tests/css/CSS2/tables/column-visibility-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-width-001.xht b/tests/wpt/tests/css/CSS2/tables/column-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-width-001.xht rename to tests/wpt/tests/css/CSS2/tables/column-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/column-width-002.xht b/tests/wpt/tests/css/CSS2/tables/column-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/column-width-002.xht rename to tests/wpt/tests/css/CSS2/tables/column-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/columns-001.xht b/tests/wpt/tests/css/CSS2/tables/columns-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/columns-001.xht rename to tests/wpt/tests/css/CSS2/tables/columns-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/data-alignment-001.xht b/tests/wpt/tests/css/CSS2/tables/data-alignment-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/data-alignment-001.xht rename to tests/wpt/tests/css/CSS2/tables/data-alignment-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/data-alignment-002.xht b/tests/wpt/tests/css/CSS2/tables/data-alignment-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/data-alignment-002.xht rename to tests/wpt/tests/css/CSS2/tables/data-alignment-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/data-alignment-003.xht b/tests/wpt/tests/css/CSS2/tables/data-alignment-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/data-alignment-003.xht rename to tests/wpt/tests/css/CSS2/tables/data-alignment-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/data-alignment-004.xht b/tests/wpt/tests/css/CSS2/tables/data-alignment-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/data-alignment-004.xht rename to tests/wpt/tests/css/CSS2/tables/data-alignment-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cell-visibility-hidden-001.xht b/tests/wpt/tests/css/CSS2/tables/empty-cell-visibility-hidden-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cell-visibility-hidden-001.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cell-visibility-hidden-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-001.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-001.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-002.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-002.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-003.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-003.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-004.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-004.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-005.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-005.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-006.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-006.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-007.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-007.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-008.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-008.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-009.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-009.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-010.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-010.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-011.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-011.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-012.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-012.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-013.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-013.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-014.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-014.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-001.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-002.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-003.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-005.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-006.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-007.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-008.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-009.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-010.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-011.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-012.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-013.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-014.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-015.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-016.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-017.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-exceptions-001.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-exceptions-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-exceptions-001.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-exceptions-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-exceptions-002.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-exceptions-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-exceptions-002.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-exceptions-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-exceptions-003.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-exceptions-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-exceptions-003.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-exceptions-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-exceptions-004.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-exceptions-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-exceptions-004.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-exceptions-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-in-collapsed-border-model-001.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-in-collapsed-border-model-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-in-collapsed-border-model-001.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-in-collapsed-border-model-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-inherited-001.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-inherited-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-inherited-001.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-inherited-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-initial-001.xht b/tests/wpt/tests/css/CSS2/tables/empty-cells-initial-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-initial-001.xht rename to tests/wpt/tests/css/CSS2/tables/empty-cells-initial-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-no-interpolation.html b/tests/wpt/tests/css/CSS2/tables/empty-cells-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/empty-cells-no-interpolation.html rename to tests/wpt/tests/css/CSS2/tables/empty-cells-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-001.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-001.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-002.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-002.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-002a-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-002a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-002a-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-002a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-002a.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-002a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-002a.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-002a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a01-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a01-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a01-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a01-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a01.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a01.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a01.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a01.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a02-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a02-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a02-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a02-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a02.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a02.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a02.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a02.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a03.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a03.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a03.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a03.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a04.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a04.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a04.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a04.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a05.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a05.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a05.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a05.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a06.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a06.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003a06.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003a06.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b01-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b01-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b01-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b01-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b01.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b01.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b01.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b01.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b02-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b02-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b02-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b02-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b02.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b02.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b02.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b02.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b03.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b03.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b03.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b03.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b04.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b04.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b04.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b04.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b05.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b05.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b05.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b05.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b06.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b06.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b06.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b06.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b07-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b07-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b07-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b07-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b07.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b07.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b07.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b07.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b08-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b08-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b08-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b08-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b08.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b08.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b08.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b08.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b09-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b09-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b09-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b09-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b09.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b09.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b09.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b09.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b10-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b10-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b10-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b10-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b10.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b10.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b10.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b10.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b11-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b11-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b11-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b11-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b11.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b11.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b11.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b11.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b12-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b12-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b12-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b12-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b12.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b12.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003b12.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003b12.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c01-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c01-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c01-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c01-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c01.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c01.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c01.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c01.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c02-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c02-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c02-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c02-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c02.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c02.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c02.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c02.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c03-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c03-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c03-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c03-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c03.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c03.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c03.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c03.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c04-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c04-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c04-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c04-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c04.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c04.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c04.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c04.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c05-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c05-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c05-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c05-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c05.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c05.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c05.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c05.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c06-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c06-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c06-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c06-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c06.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c06.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c06.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c06.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c07-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c07-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c07-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c07-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c07.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c07.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c07.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c07.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c08-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c08-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c08-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c08-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c08.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c08.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003c08.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003c08.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d01-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d01-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d01-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d01-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d01.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d01.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d01.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d01.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d02-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d02-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d02-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d02-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d02.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d02.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d02.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d02.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d03.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d03.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d03.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d03.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d04.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d04.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d04.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d04.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d05.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d05.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d05.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d05.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d06.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d06.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003d06.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003d06.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e01-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e01-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e01-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e01-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e01.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e01.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e01.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e01.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e02-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e02-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e02-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e02-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e02.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e02.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e02.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e02.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e03.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e03.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e03.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e03.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e04.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e04.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e04.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e04.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e05.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e05.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e05.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e05.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e06.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e06.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e06.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e06.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e07-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e07-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e07-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e07-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e07.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e07.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e07.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e07.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e08-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e08-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e08-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e08-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e08.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e08.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e08.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e08.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e09-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e09-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e09-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e09-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e09.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e09.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e09.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e09.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e10-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e10-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e10-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e10-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e10.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e10.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e10.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e10.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e11-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e11-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e11-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e11-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e11.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e11.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e11.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e11.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e12-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e12-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e12-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e12-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e12.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e12.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003e12.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003e12.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f01-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f01-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f01-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f01-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f01.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f01.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f01.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f01.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f02-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f02-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f02-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f02-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f02.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f02.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f02.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f02.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f03-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f03-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f03-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f03-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f03.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f03.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f03.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f03.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f04-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f04-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f04-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f04-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f04.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f04.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f04.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f04.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f05-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f05-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f05-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f05-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f05.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f05.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f05.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f05.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f06-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f06-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f06-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f06-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f06.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f06.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f06.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f06.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f07-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f07-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f07-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f07-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f07.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f07.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f07.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f07.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f08-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f08-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f08-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f08-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f08.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f08.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-003f08.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-003f08.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-004.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-004.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-005.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-005.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-006.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-006.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-007.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-007.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-009.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-009.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-010.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-010.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-011.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-011.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-012.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-012.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-013.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-013.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-014.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-014.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-015.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-015.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-016.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-016.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-017-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-017-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-017.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-017.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-018.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-018.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-019.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-019.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-020.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-020.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-021-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-021-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-021.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-021.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-022-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-022-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-022.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-022.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-023-ref.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-023-ref.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-023.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-023.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-025.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-025.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-026.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-026.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-027.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-027.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-028.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-028.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-029.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-029.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-030.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-030.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-031.xht b/tests/wpt/tests/css/CSS2/tables/fixed-table-layout-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/fixed-table-layout-031.xht rename to tests/wpt/tests/css/CSS2/tables/fixed-table-layout-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/frameset-border-spacing-001.xht b/tests/wpt/tests/css/CSS2/tables/frameset-border-spacing-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/frameset-border-spacing-001.xht rename to tests/wpt/tests/css/CSS2/tables/frameset-border-spacing-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/height-table-cell-001.xht b/tests/wpt/tests/css/CSS2/tables/height-table-cell-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/height-table-cell-001.xht rename to tests/wpt/tests/css/CSS2/tables/height-table-cell-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/height-width-inline-table-001.xht b/tests/wpt/tests/css/CSS2/tables/height-width-inline-table-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/height-width-inline-table-001.xht rename to tests/wpt/tests/css/CSS2/tables/height-width-inline-table-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/height-width-inline-table-001a.xht b/tests/wpt/tests/css/CSS2/tables/height-width-inline-table-001a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/height-width-inline-table-001a.xht rename to tests/wpt/tests/css/CSS2/tables/height-width-inline-table-001a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/height-width-inline-table-001b.xht b/tests/wpt/tests/css/CSS2/tables/height-width-inline-table-001b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/height-width-inline-table-001b.xht rename to tests/wpt/tests/css/CSS2/tables/height-width-inline-table-001b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/height-width-inline-table-001c.xht b/tests/wpt/tests/css/CSS2/tables/height-width-inline-table-001c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/height-width-inline-table-001c.xht rename to tests/wpt/tests/css/CSS2/tables/height-width-inline-table-001c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/height-width-inline-table-001d.xht b/tests/wpt/tests/css/CSS2/tables/height-width-inline-table-001d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/height-width-inline-table-001d.xht rename to tests/wpt/tests/css/CSS2/tables/height-width-inline-table-001d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/height-width-inline-table-001e.xht b/tests/wpt/tests/css/CSS2/tables/height-width-inline-table-001e.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/height-width-inline-table-001e.xht rename to tests/wpt/tests/css/CSS2/tables/height-width-inline-table-001e.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/height-width-table-001.xht b/tests/wpt/tests/css/CSS2/tables/height-width-table-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/height-width-table-001.xht rename to tests/wpt/tests/css/CSS2/tables/height-width-table-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/height-width-table-001a.xht b/tests/wpt/tests/css/CSS2/tables/height-width-table-001a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/height-width-table-001a.xht rename to tests/wpt/tests/css/CSS2/tables/height-width-table-001a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/height-width-table-001b.xht b/tests/wpt/tests/css/CSS2/tables/height-width-table-001b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/height-width-table-001b.xht rename to tests/wpt/tests/css/CSS2/tables/height-width-table-001b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/height-width-table-001c.xht b/tests/wpt/tests/css/CSS2/tables/height-width-table-001c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/height-width-table-001c.xht rename to tests/wpt/tests/css/CSS2/tables/height-width-table-001c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/height-width-table-001d.xht b/tests/wpt/tests/css/CSS2/tables/height-width-table-001d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/height-width-table-001d.xht rename to tests/wpt/tests/css/CSS2/tables/height-width-table-001d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/height-width-table-001e.xht b/tests/wpt/tests/css/CSS2/tables/height-width-table-001e.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/height-width-table-001e.xht rename to tests/wpt/tests/css/CSS2/tables/height-width-table-001e.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/inline-table-001.xht b/tests/wpt/tests/css/CSS2/tables/inline-table-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/inline-table-001.xht rename to tests/wpt/tests/css/CSS2/tables/inline-table-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/missing-cell-rendering-001.xht b/tests/wpt/tests/css/CSS2/tables/missing-cell-rendering-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/missing-cell-rendering-001.xht rename to tests/wpt/tests/css/CSS2/tables/missing-cell-rendering-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/padding-applies-to-013a.xht b/tests/wpt/tests/css/CSS2/tables/padding-applies-to-013a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/padding-applies-to-013a.xht rename to tests/wpt/tests/css/CSS2/tables/padding-applies-to-013a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/reference/no_red_3x3_monospace_table-ref.xht b/tests/wpt/tests/css/CSS2/tables/reference/no_red_3x3_monospace_table-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/reference/no_red_3x3_monospace_table-ref.xht rename to tests/wpt/tests/css/CSS2/tables/reference/no_red_3x3_monospace_table-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/reference/no_red_antialiasing_a_bc_d-ref.xht b/tests/wpt/tests/css/CSS2/tables/reference/no_red_antialiasing_a_bc_d-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/reference/no_red_antialiasing_a_bc_d-ref.xht rename to tests/wpt/tests/css/CSS2/tables/reference/no_red_antialiasing_a_bc_d-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/reference/table-anonymous-border-spacing-ref.xht b/tests/wpt/tests/css/CSS2/tables/reference/table-anonymous-border-spacing-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/reference/table-anonymous-border-spacing-ref.xht rename to tests/wpt/tests/css/CSS2/tables/reference/table-anonymous-border-spacing-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/reference/table-anonymous-text-indent-ref.xht b/tests/wpt/tests/css/CSS2/tables/reference/table-anonymous-text-indent-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/reference/table-anonymous-text-indent-ref.xht rename to tests/wpt/tests/css/CSS2/tables/reference/table-anonymous-text-indent-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/reference/table-margin-004-ref.xht b/tests/wpt/tests/css/CSS2/tables/reference/table-margin-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/reference/table-margin-004-ref.xht rename to tests/wpt/tests/css/CSS2/tables/reference/table-margin-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/row-visibility-001.xht b/tests/wpt/tests/css/CSS2/tables/row-visibility-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/row-visibility-001.xht rename to tests/wpt/tests/css/CSS2/tables/row-visibility-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/row-visibility-002.xht b/tests/wpt/tests/css/CSS2/tables/row-visibility-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/row-visibility-002.xht rename to tests/wpt/tests/css/CSS2/tables/row-visibility-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/row-visibility-003.xht b/tests/wpt/tests/css/CSS2/tables/row-visibility-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/row-visibility-003.xht rename to tests/wpt/tests/css/CSS2/tables/row-visibility-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/row-visibility-004.xht b/tests/wpt/tests/css/CSS2/tables/row-visibility-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/row-visibility-004.xht rename to tests/wpt/tests/css/CSS2/tables/row-visibility-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-001.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-001.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-003.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-003.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-003a.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-003a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-003a.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-003a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-003b-ref.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-003b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-003b-ref.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-003b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-003b.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-003b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-003b.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-003b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004a.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-004a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004a.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-004a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004b.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-004b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004b.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-004b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004c.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-004c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004c.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-004c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004d-ref.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-004d-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004d-ref.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-004d-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004d.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-004d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004d.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-004d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004e-ref.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-004e-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004e-ref.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-004e-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004e.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-004e.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-004e.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-004e.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-006.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-006.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-007-ref.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-007-ref.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-007.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-007.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-008.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-008.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-009.xht b/tests/wpt/tests/css/CSS2/tables/separated-border-model-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/separated-border-model-009.xht rename to tests/wpt/tests/css/CSS2/tables/separated-border-model-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/1x1-green.png b/tests/wpt/tests/css/CSS2/tables/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/tables/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/tables/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/tables/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/tables/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/tables/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/tables/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/tables/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/1x1-red.png b/tests/wpt/tests/css/CSS2/tables/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/tables/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/1x1-white.png b/tests/wpt/tests/css/CSS2/tables/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/tables/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/tables/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/tables/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/60x60-green.png b/tests/wpt/tests/css/CSS2/tables/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/tables/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/a-green.css b/tests/wpt/tests/css/CSS2/tables/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/a-green.css rename to tests/wpt/tests/css/CSS2/tables/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/b-green.css b/tests/wpt/tests/css/CSS2/tables/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/b-green.css rename to tests/wpt/tests/css/CSS2/tables/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/bar_with_corner_dot.png b/tests/wpt/tests/css/CSS2/tables/support/bar_with_corner_dot.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/bar_with_corner_dot.png rename to tests/wpt/tests/css/CSS2/tables/support/bar_with_corner_dot.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/blue-orange-rectangle.png b/tests/wpt/tests/css/CSS2/tables/support/blue-orange-rectangle.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/blue-orange-rectangle.png rename to tests/wpt/tests/css/CSS2/tables/support/blue-orange-rectangle.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/blue15x15.png b/tests/wpt/tests/css/CSS2/tables/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/tables/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/border_conflict_example_001.png b/tests/wpt/tests/css/CSS2/tables/support/border_conflict_example_001.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/border_conflict_example_001.png rename to tests/wpt/tests/css/CSS2/tables/support/border_conflict_example_001.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/border_conflict_example_002.png b/tests/wpt/tests/css/CSS2/tables/support/border_conflict_example_002.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/border_conflict_example_002.png rename to tests/wpt/tests/css/CSS2/tables/support/border_conflict_example_002.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/c-red.css b/tests/wpt/tests/css/CSS2/tables/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/c-red.css rename to tests/wpt/tests/css/CSS2/tables/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/cat.png b/tests/wpt/tests/css/CSS2/tables/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/cat.png rename to tests/wpt/tests/css/CSS2/tables/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/diamond.png b/tests/wpt/tests/css/CSS2/tables/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/diamond.png rename to tests/wpt/tests/css/CSS2/tables/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/frameset-border-spacing-001.htm b/tests/wpt/tests/css/CSS2/tables/support/frameset-border-spacing-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/frameset-border-spacing-001.htm rename to tests/wpt/tests/css/CSS2/tables/support/frameset-border-spacing-001.htm diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/green15x15.png b/tests/wpt/tests/css/CSS2/tables/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/green15x15.png rename to tests/wpt/tests/css/CSS2/tables/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/tables/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/tables/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/tables/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/tables/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/tables/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/tables/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/tables/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/tables/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/repeatable-diagonal-gradient-with-ticks.png b/tests/wpt/tests/css/CSS2/tables/support/repeatable-diagonal-gradient-with-ticks.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/repeatable-diagonal-gradient-with-ticks.png rename to tests/wpt/tests/css/CSS2/tables/support/repeatable-diagonal-gradient-with-ticks.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/ring.png b/tests/wpt/tests/css/CSS2/tables/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/ring.png rename to tests/wpt/tests/css/CSS2/tables/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/ruler-h-200px-400px.png b/tests/wpt/tests/css/CSS2/tables/support/ruler-h-200px-400px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/ruler-h-200px-400px.png rename to tests/wpt/tests/css/CSS2/tables/support/ruler-h-200px-400px.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/square-purple.png b/tests/wpt/tests/css/CSS2/tables/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/square-purple.png rename to tests/wpt/tests/css/CSS2/tables/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/square-teal.png b/tests/wpt/tests/css/CSS2/tables/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/square-teal.png rename to tests/wpt/tests/css/CSS2/tables/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/square-white.png b/tests/wpt/tests/css/CSS2/tables/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/square-white.png rename to tests/wpt/tests/css/CSS2/tables/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/tables/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/tables/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/swatch-green.png b/tests/wpt/tests/css/CSS2/tables/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/tables/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/tables/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/tables/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/tables/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/tables/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/swatch-red.png b/tests/wpt/tests/css/CSS2/tables/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/tables/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/swatch-white.png b/tests/wpt/tests/css/CSS2/tables/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/tables/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/tables/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/tables/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/test-bl.png b/tests/wpt/tests/css/CSS2/tables/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/test-bl.png rename to tests/wpt/tests/css/CSS2/tables/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/test-br.png b/tests/wpt/tests/css/CSS2/tables/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/test-br.png rename to tests/wpt/tests/css/CSS2/tables/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/test-outer.png b/tests/wpt/tests/css/CSS2/tables/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/test-outer.png rename to tests/wpt/tests/css/CSS2/tables/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/test-tl.png b/tests/wpt/tests/css/CSS2/tables/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/test-tl.png rename to tests/wpt/tests/css/CSS2/tables/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/support/test-tr.png b/tests/wpt/tests/css/CSS2/tables/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/support/test-tr.png rename to tests/wpt/tests/css/CSS2/tables/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-001.xht b/tests/wpt/tests/css/CSS2/tables/table-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-002.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-003.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-004.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-004.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-005.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-005.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-006.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-006.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-007.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-007.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-008.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-008.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-009.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-009.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-010.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-010.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-011.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-011.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-012.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-012.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-013.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-013.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-014.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-014.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-015.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-015.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-016.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-016.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-017.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-017.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-018.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-018.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-019.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-block-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-block-019.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-block-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-border-spacing.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-border-spacing.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-border-spacing.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-border-spacing.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-000.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-000.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-001.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-002.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-003.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-004.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-004.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-005.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-005.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-006.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-006.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-007.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-007.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-008.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-008.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-009.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-009.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-010.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-010.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-011.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-011.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-012.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-012.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-013.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-013.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-014.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-014.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-015.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-015.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-016.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-016.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-017.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-017.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-018.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-018.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-019.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-019.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-020.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-020.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-021.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-021.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-022.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-022.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-023.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-023.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-024.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-024.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-025.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-025.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-026.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-026.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-027.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-027.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-028.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-028.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-029.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-029.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-030.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-030.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-031.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-031.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-032.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-032.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-033.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-033.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-034.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-034.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-035.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-035.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-036.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-036.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-037.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-037.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-038.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-038.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-039.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-039.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-040.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-040.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-041.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-041.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-042.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-042.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-043.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-043.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-044.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-044.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-045.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-045.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-046.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-046.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-047.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-047.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-048.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-048.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-049.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-049.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-050.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-050.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-051.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-051.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-052.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-052.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-053.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-053.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-054.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-054.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-055.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-055.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-056.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-056.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-057.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-057.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-058.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-058.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-059.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-059.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-060.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-060.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-061.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-061.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-062.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-062.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-063.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-063.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-064.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-064.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-065.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-065.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-066.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-066.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-067.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-067.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-068.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-068.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-069.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-069.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-070.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-070.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-071.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-071.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-072.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-072.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-073.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-073.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-074.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-074.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-075.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-075.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-076.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-076.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-077.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-077.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-078.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-078.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-079.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-079.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-080.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-080.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-081.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-081.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-082.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-082.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-083.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-083.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-084.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-084.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-085.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-085.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-086.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-086.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-087.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-087.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-087.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-088.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-088.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-089.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-089.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-090.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-090.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-091.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-091.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-092.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-092.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-093.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-093.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-094.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-094.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-095.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-095.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-096.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-096.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-097.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-097.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-098.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-098.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-099.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-099.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-100.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-100.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-101.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-101.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-102.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-102.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-103.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-103.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-104.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-104.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-105.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-105.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-106.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-106.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-107.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-107.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-108.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-108.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-109.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-109.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-110.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-110.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-111.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-111.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-112.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-112.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-113.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-113.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-114.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-114.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-115.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-115.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-116.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-116.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-117.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-117.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-118.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-118.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-119.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-119.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-120.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-120.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-121.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-121.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-122.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-122.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-123.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-123.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-124.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-124.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-124.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-125.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-125.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-125.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-126.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-126.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-127.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-127.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-128.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-128.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-128.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-129.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-129.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-130.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-130.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-130.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-131.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-131.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-131.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-132.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-132.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-132.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-133.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-133.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-133.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-133.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-134.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-134.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-134.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-134.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-135.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-135.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-135.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-136.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-136.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-136.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-136.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-137.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-137.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-137.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-137.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-138.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-138.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-138.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-139.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-139.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-139.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-139.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-140.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-140.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-140.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-141.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-141.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-141.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-142.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-142.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-142.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-143.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-143.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-143.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-144.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-144.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-144.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-145.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-145.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-146.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-146.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-146.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-146.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-147.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-147.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-147.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-147.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-148.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-148.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-148.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-148.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-149.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-149.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-149.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-149.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-150.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-150.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-150.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-150.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-151.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-151.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-151.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-151.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-152.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-152.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-152.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-152.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-153.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-153.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-153.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-153.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-154.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-154.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-154.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-154.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-155.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-155.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-155.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-155.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-156.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-156.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-156.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-156.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-157.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-157.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-157.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-157.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-158.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-158.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-158.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-158.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-159.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-159.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-159.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-159.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-160.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-160.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-160.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-160.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-161.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-161.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-161.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-161.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-162.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-162.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-162.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-162.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-163.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-163.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-163.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-163.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-164.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-164.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-164.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-164.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-165.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-165.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-165.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-165.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-166.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-166.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-166.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-166.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-167.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-167.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-167.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-167.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-168.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-168.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-168.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-168.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-169.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-169.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-169.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-169.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-170.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-170.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-170.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-170.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-171.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-171.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-171.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-171.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-172.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-172.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-172.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-172.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-173.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-173.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-173.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-173.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-174.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-174.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-174.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-174.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-175.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-175.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-175.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-175.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-176.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-176.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-176.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-176.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-177.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-177.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-177.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-177.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-178.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-178.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-178.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-178.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-179.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-179.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-179.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-179.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-180.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-180.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-180.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-180.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-181.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-181.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-181.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-181.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-182.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-182.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-182.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-182.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-183.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-183.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-183.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-183.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-184.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-184.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-184.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-184.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-185.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-185.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-185.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-185.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-186.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-186.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-186.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-186.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-187.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-187.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-187.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-187.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-188.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-188.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-188.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-188.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-189.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-189.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-189.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-189.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-190.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-190.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-190.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-190.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-191.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-191.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-191.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-191.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-192.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-192.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-192.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-192.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-193.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-193.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-193.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-193.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-194.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-194.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-194.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-194.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-195.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-195.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-195.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-195.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-196.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-196.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-196.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-196.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-197.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-197.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-197.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-197.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-198.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-198.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-198.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-198.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-199.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-199.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-199.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-199.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-200.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-200.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-200.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-200.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-201.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-201.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-201.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-201.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-202.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-202.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-202.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-202.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-203.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-203.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-203.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-203.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-204.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-204.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-204.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-204.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-205.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-205.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-205.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-205.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-206.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-206.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-206.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-206.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-207.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-207.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-207.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-207.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-208.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-208.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-208.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-208.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-209.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-209.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-209.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-209.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-210.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-210.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-210.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-210.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-211-ref.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-211-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-211-ref.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-211-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-211.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-211.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-objects-211.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-objects-211.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-text-indent.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-text-indent.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-text-indent.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-text-indent.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-whitespace-001.xht b/tests/wpt/tests/css/CSS2/tables/table-anonymous-whitespace-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-anonymous-whitespace-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-anonymous-whitespace-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-background-edge-and-border-model-001.xht b/tests/wpt/tests/css/CSS2/tables/table-background-edge-and-border-model-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-background-edge-and-border-model-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-background-edge-and-border-model-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-background-edge-and-border-model-002.xht b/tests/wpt/tests/css/CSS2/tables/table-background-edge-and-border-model-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-background-edge-and-border-model-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-background-edge-and-border-model-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-cell-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-cell-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-cell-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-cell-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-cell-001.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-cell-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-cell-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-cell-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-colgroup-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-colgroup-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-colgroup-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-colgroup-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-colgroup-001.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-colgroup-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-colgroup-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-colgroup-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-column-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-column-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-column-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-column-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-column-001.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-column-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-column-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-column-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-row-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-row-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-row-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-row-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-row-001.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-row-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-row-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-row-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-rowgroup-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-rowgroup-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-rowgroup-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-rowgroup-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-rowgroup-001.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-rowgroup-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-rowgroup-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-rowgroup-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-table-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-table-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-table-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-table-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-table-001.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-table-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bc-table-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bc-table-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-cell-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-cell-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-cell-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-cell-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-cell-001.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-cell-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-cell-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-cell-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-colgroup-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-colgroup-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-colgroup-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-colgroup-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-colgroup-001.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-colgroup-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-colgroup-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-colgroup-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-column-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-column-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-column-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-column-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-column-001.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-column-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-column-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-column-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-row-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-row-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-row-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-row-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-row-001.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-row-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-row-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-row-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-rowgroup-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-rowgroup-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-rowgroup-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-rowgroup-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-rowgroup-001.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-rowgroup-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-rowgroup-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-rowgroup-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-table-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-table-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-table-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-table-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-table-001.xht b/tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-table-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-backgrounds-bs-table-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-backgrounds-bs-table-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-borders-001.xht b/tests/wpt/tests/css/CSS2/tables/table-borders-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-borders-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-borders-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-borders-002.xht b/tests/wpt/tests/css/CSS2/tables/table-borders-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-borders-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-borders-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-borders-003.xht b/tests/wpt/tests/css/CSS2/tables/table-borders-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-borders-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-borders-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-borders-004.xht b/tests/wpt/tests/css/CSS2/tables/table-borders-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-borders-004.xht rename to tests/wpt/tests/css/CSS2/tables/table-borders-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-borders-005.xht b/tests/wpt/tests/css/CSS2/tables/table-borders-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-borders-005.xht rename to tests/wpt/tests/css/CSS2/tables/table-borders-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-caption-001.xht b/tests/wpt/tests/css/CSS2/tables/table-caption-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-caption-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-caption-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-caption-002.xht b/tests/wpt/tests/css/CSS2/tables/table-caption-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-caption-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-caption-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-caption-003.xht b/tests/wpt/tests/css/CSS2/tables/table-caption-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-caption-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-caption-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-caption-horizontal-alignment-001.xht b/tests/wpt/tests/css/CSS2/tables/table-caption-horizontal-alignment-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-caption-horizontal-alignment-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-caption-horizontal-alignment-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-caption-margins-001.xht b/tests/wpt/tests/css/CSS2/tables/table-caption-margins-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-caption-margins-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-caption-margins-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-caption-optional-001.xht b/tests/wpt/tests/css/CSS2/tables/table-caption-optional-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-caption-optional-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-caption-optional-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-caption-optional-002.xht b/tests/wpt/tests/css/CSS2/tables/table-caption-optional-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-caption-optional-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-caption-optional-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-cell-001.xht b/tests/wpt/tests/css/CSS2/tables/table-cell-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-cell-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-cell-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-cell-002.xht b/tests/wpt/tests/css/CSS2/tables/table-cell-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-cell-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-cell-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-column-001.xht b/tests/wpt/tests/css/CSS2/tables/table-column-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-column-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-column-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-column-group-001.xht b/tests/wpt/tests/css/CSS2/tables/table-column-group-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-column-group-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-column-group-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-column-rendering-001.xht b/tests/wpt/tests/css/CSS2/tables/table-column-rendering-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-column-rendering-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-column-rendering-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-column-rendering-002.xht b/tests/wpt/tests/css/CSS2/tables/table-column-rendering-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-column-rendering-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-column-rendering-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-column-rendering-003.xht b/tests/wpt/tests/css/CSS2/tables/table-column-rendering-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-column-rendering-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-column-rendering-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-column-rendering-004.xht b/tests/wpt/tests/css/CSS2/tables/table-column-rendering-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-column-rendering-004.xht rename to tests/wpt/tests/css/CSS2/tables/table-column-rendering-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-columns-example-001.xht b/tests/wpt/tests/css/CSS2/tables/table-columns-example-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-columns-example-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-columns-example-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-columns-example-002.xht b/tests/wpt/tests/css/CSS2/tables/table-columns-example-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-columns-example-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-columns-example-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-columns-example-003.xht b/tests/wpt/tests/css/CSS2/tables/table-columns-example-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-columns-example-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-columns-example-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-footer-group-001.xht b/tests/wpt/tests/css/CSS2/tables/table-footer-group-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-footer-group-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-footer-group-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-footer-group-002.xht b/tests/wpt/tests/css/CSS2/tables/table-footer-group-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-footer-group-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-footer-group-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-footer-group-003.xht b/tests/wpt/tests/css/CSS2/tables/table-footer-group-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-footer-group-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-footer-group-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-footer-group-004.xht b/tests/wpt/tests/css/CSS2/tables/table-footer-group-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-footer-group-004.xht rename to tests/wpt/tests/css/CSS2/tables/table-footer-group-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-footer-group-005.xht b/tests/wpt/tests/css/CSS2/tables/table-footer-group-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-footer-group-005.xht rename to tests/wpt/tests/css/CSS2/tables/table-footer-group-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-header-group-001.xht b/tests/wpt/tests/css/CSS2/tables/table-header-group-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-header-group-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-header-group-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-header-group-002.xht b/tests/wpt/tests/css/CSS2/tables/table-header-group-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-header-group-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-header-group-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-header-group-003.xht b/tests/wpt/tests/css/CSS2/tables/table-header-group-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-header-group-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-header-group-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-header-group-004.xht b/tests/wpt/tests/css/CSS2/tables/table-header-group-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-header-group-004.xht rename to tests/wpt/tests/css/CSS2/tables/table-header-group-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-header-group-005.xht b/tests/wpt/tests/css/CSS2/tables/table-header-group-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-header-group-005.xht rename to tests/wpt/tests/css/CSS2/tables/table-header-group-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-001.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-002.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-003.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-004.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-004.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-008.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-008.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-008a.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-008a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-008a.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-008a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-008b.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-008b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-008b.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-008b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-008c.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-008c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-008c.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-008c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-009.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-009.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-010.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-010.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-011.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-011.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-012.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-012.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-013.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-013.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-014.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-014.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-015.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-015.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-016.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-016.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-017.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-017.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-018.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-018.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-019.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-019.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-020.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-020.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-021.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-021.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-022.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-022.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-023.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-023.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-024.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-024.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-025.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-025.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-026.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-026.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-027.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-027.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-028.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-028.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-029.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-029.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-030.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-030.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-031.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-031.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-032.xht b/tests/wpt/tests/css/CSS2/tables/table-height-algorithm-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-height-algorithm-032.xht rename to tests/wpt/tests/css/CSS2/tables/table-height-algorithm-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-intro-example-001.xht b/tests/wpt/tests/css/CSS2/tables/table-intro-example-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-intro-example-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-intro-example-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-intro-example-002.xht b/tests/wpt/tests/css/CSS2/tables/table-intro-example-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-intro-example-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-intro-example-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-intro-example-003.xht b/tests/wpt/tests/css/CSS2/tables/table-intro-example-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-intro-example-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-intro-example-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-intro-example-004.xht b/tests/wpt/tests/css/CSS2/tables/table-intro-example-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-intro-example-004.xht rename to tests/wpt/tests/css/CSS2/tables/table-intro-example-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-001.xht b/tests/wpt/tests/css/CSS2/tables/table-layer-transparency-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-layer-transparency-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-002.xht b/tests/wpt/tests/css/CSS2/tables/table-layer-transparency-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-layer-transparency-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-003.xht b/tests/wpt/tests/css/CSS2/tables/table-layer-transparency-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-layer-transparency-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-004.xht b/tests/wpt/tests/css/CSS2/tables/table-layer-transparency-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-004.xht rename to tests/wpt/tests/css/CSS2/tables/table-layer-transparency-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-005.xht b/tests/wpt/tests/css/CSS2/tables/table-layer-transparency-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-005.xht rename to tests/wpt/tests/css/CSS2/tables/table-layer-transparency-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-006.xht b/tests/wpt/tests/css/CSS2/tables/table-layer-transparency-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-006.xht rename to tests/wpt/tests/css/CSS2/tables/table-layer-transparency-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-007.xht b/tests/wpt/tests/css/CSS2/tables/table-layer-transparency-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-007.xht rename to tests/wpt/tests/css/CSS2/tables/table-layer-transparency-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-008.xht b/tests/wpt/tests/css/CSS2/tables/table-layer-transparency-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-008.xht rename to tests/wpt/tests/css/CSS2/tables/table-layer-transparency-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-009.xht b/tests/wpt/tests/css/CSS2/tables/table-layer-transparency-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-009.xht rename to tests/wpt/tests/css/CSS2/tables/table-layer-transparency-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-010.xht b/tests/wpt/tests/css/CSS2/tables/table-layer-transparency-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-010.xht rename to tests/wpt/tests/css/CSS2/tables/table-layer-transparency-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-011.xht b/tests/wpt/tests/css/CSS2/tables/table-layer-transparency-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-011.xht rename to tests/wpt/tests/css/CSS2/tables/table-layer-transparency-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-example-001.xht b/tests/wpt/tests/css/CSS2/tables/table-layer-transparency-example-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layer-transparency-example-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-layer-transparency-example-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-001.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-002.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-003.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-001.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-002.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-003.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-005.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-006.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-007.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-008.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-009.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-010.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-011.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-012.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-013.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-014.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-015.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-016.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-017.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-inherited-001.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-inherited-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-inherited-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-inherited-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-initial-001.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-initial-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-initial-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-initial-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-property-001.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-property-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-property-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-property-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-property-002.xht b/tests/wpt/tests/css/CSS2/tables/table-layout-property-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-layout-property-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-layout-property-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-margin-001.xht b/tests/wpt/tests/css/CSS2/tables/table-margin-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-margin-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-margin-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-margin-002.xht b/tests/wpt/tests/css/CSS2/tables/table-margin-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-margin-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-margin-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-margin-003.xht b/tests/wpt/tests/css/CSS2/tables/table-margin-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-margin-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-margin-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-margin-004.xht b/tests/wpt/tests/css/CSS2/tables/table-margin-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-margin-004.xht rename to tests/wpt/tests/css/CSS2/tables/table-margin-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-organization-001.xht b/tests/wpt/tests/css/CSS2/tables/table-organization-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-organization-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-organization-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-organization-002.xht b/tests/wpt/tests/css/CSS2/tables/table-organization-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-organization-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-organization-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-percent-width-001.xht b/tests/wpt/tests/css/CSS2/tables/table-percent-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-percent-width-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-percent-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-row-001.xht b/tests/wpt/tests/css/CSS2/tables/table-row-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-row-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-row-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-row-group-001.xht b/tests/wpt/tests/css/CSS2/tables/table-row-group-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-row-group-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-row-group-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-valign-001.xht b/tests/wpt/tests/css/CSS2/tables/table-valign-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-valign-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-valign-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-valign-002.xht b/tests/wpt/tests/css/CSS2/tables/table-valign-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-valign-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-valign-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-001-ref.xht b/tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-001-ref.xht rename to tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-001.xht b/tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-002.xht b/tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-003.xht b/tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-004.xht b/tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-004.xht rename to tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-005.xht b/tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-005.xht rename to tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-006.xht b/tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-006.xht rename to tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-007.xht b/tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-vertical-align-baseline-007.xht rename to tests/wpt/tests/css/CSS2/tables/table-vertical-align-baseline-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-001.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-001.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-002.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-002.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-003.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-003.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-004.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-004.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-005.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-005.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-006.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-006.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-007.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-007.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-008.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-008.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-009.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-009.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-010.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-010.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-011.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-011.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-012.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-012.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-013.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-013.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-014.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-014.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-015.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-015.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-016.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-016.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-017.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-017.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-018.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-018.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-019.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-019.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-020.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-020.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-021.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-021.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-022.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-022.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-023.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-023.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-026a.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-026a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-026a.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-026a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-026b.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-026b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-026b.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-026b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-026c.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-026c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-026c.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-026c.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-026d.xht b/tests/wpt/tests/css/CSS2/tables/table-visual-layout-026d.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/table-visual-layout-026d.xht rename to tests/wpt/tests/css/CSS2/tables/table-visual-layout-026d.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/tables-001.xht b/tests/wpt/tests/css/CSS2/tables/tables-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/tables-001.xht rename to tests/wpt/tests/css/CSS2/tables/tables-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/tables-002.xht b/tests/wpt/tests/css/CSS2/tables/tables-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/tables-002.xht rename to tests/wpt/tests/css/CSS2/tables/tables-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/tables-003.xht b/tests/wpt/tests/css/CSS2/tables/tables-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/tables-003.xht rename to tests/wpt/tests/css/CSS2/tables/tables-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/tables-004.xht b/tests/wpt/tests/css/CSS2/tables/tables-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/tables-004.xht rename to tests/wpt/tests/css/CSS2/tables/tables-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/tables-101.xht b/tests/wpt/tests/css/CSS2/tables/tables-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/tables-101.xht rename to tests/wpt/tests/css/CSS2/tables/tables-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/tables-102.xht b/tests/wpt/tests/css/CSS2/tables/tables-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/tables/tables-102.xht rename to tests/wpt/tests/css/CSS2/tables/tables-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/bidi-flag-emoji-02-ref.html b/tests/wpt/tests/css/CSS2/text/bidi-flag-emoji-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/bidi-flag-emoji-02-ref.html rename to tests/wpt/tests/css/CSS2/text/bidi-flag-emoji-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/bidi-flag-emoji-02.html b/tests/wpt/tests/css/CSS2/text/bidi-flag-emoji-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/bidi-flag-emoji-02.html rename to tests/wpt/tests/css/CSS2/text/bidi-flag-emoji-02.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/bidi-flag-emoji-ref.html b/tests/wpt/tests/css/CSS2/text/bidi-flag-emoji-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/bidi-flag-emoji-ref.html rename to tests/wpt/tests/css/CSS2/text/bidi-flag-emoji-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/bidi-flag-emoji.html b/tests/wpt/tests/css/CSS2/text/bidi-flag-emoji.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/bidi-flag-emoji.html rename to tests/wpt/tests/css/CSS2/text/bidi-flag-emoji.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/bidi-span-001-ref.html b/tests/wpt/tests/css/CSS2/text/bidi-span-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/bidi-span-001-ref.html rename to tests/wpt/tests/css/CSS2/text/bidi-span-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/bidi-span-001.html b/tests/wpt/tests/css/CSS2/text/bidi-span-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/bidi-span-001.html rename to tests/wpt/tests/css/CSS2/text/bidi-span-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/bidi-span-002-ref.html b/tests/wpt/tests/css/CSS2/text/bidi-span-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/bidi-span-002-ref.html rename to tests/wpt/tests/css/CSS2/text/bidi-span-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/bidi-span-002.html b/tests/wpt/tests/css/CSS2/text/bidi-span-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/bidi-span-002.html rename to tests/wpt/tests/css/CSS2/text/bidi-span-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/bidi-span-003-ref.html b/tests/wpt/tests/css/CSS2/text/bidi-span-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/bidi-span-003-ref.html rename to tests/wpt/tests/css/CSS2/text/bidi-span-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/bidi-span-003.html b/tests/wpt/tests/css/CSS2/text/bidi-span-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/bidi-span-003.html rename to tests/wpt/tests/css/CSS2/text/bidi-span-003.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/bidi-text-decoration-underline-001.xht b/tests/wpt/tests/css/CSS2/text/bidi-text-decoration-underline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/bidi-text-decoration-underline-001.xht rename to tests/wpt/tests/css/CSS2/text/bidi-text-decoration-underline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/combining-characters-002.xht b/tests/wpt/tests/css/CSS2/text/combining-characters-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/combining-characters-002.xht rename to tests/wpt/tests/css/CSS2/text/combining-characters-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/control-characters-002.xht b/tests/wpt/tests/css/CSS2/text/control-characters-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/control-characters-002.xht rename to tests/wpt/tests/css/CSS2/text/control-characters-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/crashtests/bidi-inline-fragment-oof-crash.html b/tests/wpt/tests/css/CSS2/text/crashtests/bidi-inline-fragment-oof-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/crashtests/bidi-inline-fragment-oof-crash.html rename to tests/wpt/tests/css/CSS2/text/crashtests/bidi-inline-fragment-oof-crash.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-004-ref.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-004-ref.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-004.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-004.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-005.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-005.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-006.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-006.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-007-ref.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-007-ref.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-007.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-007.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-008.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-008.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-016.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-016.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-017.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-017.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-018.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-018.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-019.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-019.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-020.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-020.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-028.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-028.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-029.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-029.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-030.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-030.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-031.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-031.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-032.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-032.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-040.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-040.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-041.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-041.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-042.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-042.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-043.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-043.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-044.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-044.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-052.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-052.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-053.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-053.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-054.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-054.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-055.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-055.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-056.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-056.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-064.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-064.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-065.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-065.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-066.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-066.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-067.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-067.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-068.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-068.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-076.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-076.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-077.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-077.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-078.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-078.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-079-ref.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-079-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-079-ref.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-079-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-079.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-079.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-080.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-080.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-088.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-088.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-089.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-089.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-090.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-090.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-091-ref.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-091-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-091-ref.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-091-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-091.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-091.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-092.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-092.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-097.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-097.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-098.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-098.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-099.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-099.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-100.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-100.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-101.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-101.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-102-ref.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-102-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-102-ref.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-102-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-102.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-102.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-001.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-002.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-003-ref.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-003.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-005-ref.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-005-ref.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-005.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-006.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-007-ref.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-007-ref.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-007.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-008.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-009.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-010.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-011.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-012-ref.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-012-ref.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-012.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-013.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-014.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-015.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-justify-001-ref.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-justify-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-justify-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-justify-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-justify-001.xht b/tests/wpt/tests/css/CSS2/text/letter-spacing-justify-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-justify-001.xht rename to tests/wpt/tests/css/CSS2/text/letter-spacing-justify-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/painting-order-underline-001-ref.xht b/tests/wpt/tests/css/CSS2/text/painting-order-underline-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/painting-order-underline-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/painting-order-underline-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/painting-order-underline-001.xht b/tests/wpt/tests/css/CSS2/text/painting-order-underline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/painting-order-underline-001.xht rename to tests/wpt/tests/css/CSS2/text/painting-order-underline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/1x1-green.png b/tests/wpt/tests/css/CSS2/text/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/text/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/text/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/text/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/text/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/text/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/text/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/text/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/1x1-red.png b/tests/wpt/tests/css/CSS2/text/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/text/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/1x1-white.png b/tests/wpt/tests/css/CSS2/text/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/text/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/text/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/text/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/60x60-green.png b/tests/wpt/tests/css/CSS2/text/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/text/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/a-green.css b/tests/wpt/tests/css/CSS2/text/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/a-green.css rename to tests/wpt/tests/css/CSS2/text/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/b-green.css b/tests/wpt/tests/css/CSS2/text/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/b-green.css rename to tests/wpt/tests/css/CSS2/text/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/black15x15.png b/tests/wpt/tests/css/CSS2/text/support/black15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/black15x15.png rename to tests/wpt/tests/css/CSS2/text/support/black15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/blue15x15.png b/tests/wpt/tests/css/CSS2/text/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/text/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/c-red.css b/tests/wpt/tests/css/CSS2/text/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/c-red.css rename to tests/wpt/tests/css/CSS2/text/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/cat.png b/tests/wpt/tests/css/CSS2/text/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/cat.png rename to tests/wpt/tests/css/CSS2/text/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/diamond.png b/tests/wpt/tests/css/CSS2/text/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/diamond.png rename to tests/wpt/tests/css/CSS2/text/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/green15x15.png b/tests/wpt/tests/css/CSS2/text/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/green15x15.png rename to tests/wpt/tests/css/CSS2/text/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/text/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/text/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/text/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/text/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/text/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/text/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/text/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/text/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/ring.png b/tests/wpt/tests/css/CSS2/text/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/ring.png rename to tests/wpt/tests/css/CSS2/text/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/square-purple.png b/tests/wpt/tests/css/CSS2/text/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/square-purple.png rename to tests/wpt/tests/css/CSS2/text/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/square-teal.png b/tests/wpt/tests/css/CSS2/text/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/square-teal.png rename to tests/wpt/tests/css/CSS2/text/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/square-white.png b/tests/wpt/tests/css/CSS2/text/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/square-white.png rename to tests/wpt/tests/css/CSS2/text/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-aqua.png b/tests/wpt/tests/css/CSS2/text/support/swatch-aqua.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-aqua.png rename to tests/wpt/tests/css/CSS2/text/support/swatch-aqua.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/text/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/text/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-green.png b/tests/wpt/tests/css/CSS2/text/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/text/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/text/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/text/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/text/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/text/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-red.png b/tests/wpt/tests/css/CSS2/text/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/text/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-teal.png b/tests/wpt/tests/css/CSS2/text/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-teal.png rename to tests/wpt/tests/css/CSS2/text/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-white.png b/tests/wpt/tests/css/CSS2/text/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/text/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/text/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/text/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/test-bl.png b/tests/wpt/tests/css/CSS2/text/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/test-bl.png rename to tests/wpt/tests/css/CSS2/text/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/test-br.png b/tests/wpt/tests/css/CSS2/text/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/test-br.png rename to tests/wpt/tests/css/CSS2/text/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/test-outer.png b/tests/wpt/tests/css/CSS2/text/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/test-outer.png rename to tests/wpt/tests/css/CSS2/text/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/test-tl.png b/tests/wpt/tests/css/CSS2/text/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/test-tl.png rename to tests/wpt/tests/css/CSS2/text/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/support/test-tr.png b/tests/wpt/tests/css/CSS2/text/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/support/test-tr.png rename to tests/wpt/tests/css/CSS2/text/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-001.xht b/tests/wpt/tests/css/CSS2/text/text-align-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-001.xht rename to tests/wpt/tests/css/CSS2/text/text-align-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-002.xht b/tests/wpt/tests/css/CSS2/text/text-align-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-002.xht rename to tests/wpt/tests/css/CSS2/text/text-align-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-003.xht b/tests/wpt/tests/css/CSS2/text/text-align-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-003.xht rename to tests/wpt/tests/css/CSS2/text/text-align-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-004.xht b/tests/wpt/tests/css/CSS2/text/text-align-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-004.xht rename to tests/wpt/tests/css/CSS2/text/text-align-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-005.xht b/tests/wpt/tests/css/CSS2/text/text-align-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-005.xht rename to tests/wpt/tests/css/CSS2/text/text-align-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-001.xht b/tests/wpt/tests/css/CSS2/text/text-align-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/text/text-align-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-002.xht b/tests/wpt/tests/css/CSS2/text/text-align-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/text/text-align-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-003.xht b/tests/wpt/tests/css/CSS2/text/text-align-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/text/text-align-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-005.xht b/tests/wpt/tests/css/CSS2/text/text-align-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/text/text-align-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-006.xht b/tests/wpt/tests/css/CSS2/text/text-align-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/text/text-align-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-007.xht b/tests/wpt/tests/css/CSS2/text/text-align-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/text/text-align-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-008.xht b/tests/wpt/tests/css/CSS2/text/text-align-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/text/text-align-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-009.xht b/tests/wpt/tests/css/CSS2/text/text-align-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/text/text-align-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-010.xht b/tests/wpt/tests/css/CSS2/text/text-align-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/text/text-align-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-011.xht b/tests/wpt/tests/css/CSS2/text/text-align-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/text/text-align-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-012.xht b/tests/wpt/tests/css/CSS2/text/text-align-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/text/text-align-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-013.xht b/tests/wpt/tests/css/CSS2/text/text-align-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/text/text-align-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-014.xht b/tests/wpt/tests/css/CSS2/text/text-align-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/text/text-align-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-015.xht b/tests/wpt/tests/css/CSS2/text/text-align-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/text/text-align-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-001.xht b/tests/wpt/tests/css/CSS2/text/text-align-bidi-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-001.xht rename to tests/wpt/tests/css/CSS2/text/text-align-bidi-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-002.xht b/tests/wpt/tests/css/CSS2/text/text-align-bidi-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-002.xht rename to tests/wpt/tests/css/CSS2/text/text-align-bidi-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-003.xht b/tests/wpt/tests/css/CSS2/text/text-align-bidi-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-003.xht rename to tests/wpt/tests/css/CSS2/text/text-align-bidi-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-004.xht b/tests/wpt/tests/css/CSS2/text/text-align-bidi-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-004.xht rename to tests/wpt/tests/css/CSS2/text/text-align-bidi-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-005.xht b/tests/wpt/tests/css/CSS2/text/text-align-bidi-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-005.xht rename to tests/wpt/tests/css/CSS2/text/text-align-bidi-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-006.xht b/tests/wpt/tests/css/CSS2/text/text-align-bidi-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-006.xht rename to tests/wpt/tests/css/CSS2/text/text-align-bidi-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-007.xht b/tests/wpt/tests/css/CSS2/text/text-align-bidi-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-007.xht rename to tests/wpt/tests/css/CSS2/text/text-align-bidi-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-008.xht b/tests/wpt/tests/css/CSS2/text/text-align-bidi-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-008.xht rename to tests/wpt/tests/css/CSS2/text/text-align-bidi-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-009.xht b/tests/wpt/tests/css/CSS2/text/text-align-bidi-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-009.xht rename to tests/wpt/tests/css/CSS2/text/text-align-bidi-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-010.xht b/tests/wpt/tests/css/CSS2/text/text-align-bidi-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-010.xht rename to tests/wpt/tests/css/CSS2/text/text-align-bidi-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-011-ref.xht b/tests/wpt/tests/css/CSS2/text/text-align-bidi-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-011-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-align-bidi-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-011.xht b/tests/wpt/tests/css/CSS2/text/text-align-bidi-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-011.xht rename to tests/wpt/tests/css/CSS2/text/text-align-bidi-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-012.xht b/tests/wpt/tests/css/CSS2/text/text-align-bidi-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-012.xht rename to tests/wpt/tests/css/CSS2/text/text-align-bidi-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-013.xht b/tests/wpt/tests/css/CSS2/text/text-align-bidi-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-013.xht rename to tests/wpt/tests/css/CSS2/text/text-align-bidi-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-inherit-001.xht b/tests/wpt/tests/css/CSS2/text/text-align-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-inherit-001.xht rename to tests/wpt/tests/css/CSS2/text/text-align-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-001-ref.xht b/tests/wpt/tests/css/CSS2/text/text-align-white-space-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-align-white-space-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-001.xht b/tests/wpt/tests/css/CSS2/text/text-align-white-space-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-001.xht rename to tests/wpt/tests/css/CSS2/text/text-align-white-space-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-002-ref.xht b/tests/wpt/tests/css/CSS2/text/text-align-white-space-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-align-white-space-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-002.xht b/tests/wpt/tests/css/CSS2/text/text-align-white-space-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-002.xht rename to tests/wpt/tests/css/CSS2/text/text-align-white-space-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-004-ref.xht b/tests/wpt/tests/css/CSS2/text/text-align-white-space-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-004-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-align-white-space-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-004.xht b/tests/wpt/tests/css/CSS2/text/text-align-white-space-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-004.xht rename to tests/wpt/tests/css/CSS2/text/text-align-white-space-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-005-ref.xht b/tests/wpt/tests/css/CSS2/text/text-align-white-space-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-005-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-align-white-space-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-005.xht b/tests/wpt/tests/css/CSS2/text/text-align-white-space-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-005.xht rename to tests/wpt/tests/css/CSS2/text/text-align-white-space-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-006.xht b/tests/wpt/tests/css/CSS2/text/text-align-white-space-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-006.xht rename to tests/wpt/tests/css/CSS2/text/text-align-white-space-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-008-ref.xht b/tests/wpt/tests/css/CSS2/text/text-align-white-space-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-008-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-align-white-space-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-008.xht b/tests/wpt/tests/css/CSS2/text/text-align-white-space-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-008.xht rename to tests/wpt/tests/css/CSS2/text/text-align-white-space-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-002.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-002.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-003.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-003.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-004.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-004.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-005.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-005.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-006.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-006.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-007.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-007.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-008.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-008.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-009.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-009.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-010.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-010.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-011.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-011.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-012.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-012.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-013.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-013.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-014.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-014.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-015.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-015.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-016.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-016.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-017.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-017.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-018.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-018.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-019.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-019.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-020.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-020.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-021.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-021.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-022.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-022.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-023.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-023.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-024.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-024.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-025.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-025.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-026.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-026.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-027.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-027.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-028.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-028.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-029.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-029.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-030.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-030.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-031.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-031.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-032.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-032.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-033.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-033.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-034.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-034.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-035.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-035.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-036.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-036.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-037.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-037.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-038.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-038.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-039.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-039.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-040.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-040.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-041.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-041.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-042.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-042.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-043.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-043.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-044.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-044.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-045.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-045.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-046.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-046.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-047.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-047.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-048.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-048.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-049.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-049.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-050.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-050.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-051.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-051.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-052.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-052.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-053.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-053.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-054.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-054.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-055.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-055.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-056.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-056.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-057.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-057.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-058.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-058.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-059.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-059.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-060.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-060.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-061.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-061.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-062.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-062.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-063.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-063.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-064.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-064.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-065.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-065.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-066.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-066.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-067.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-067.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-068.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-068.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-069.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-069.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-070.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-070.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-071.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-071.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-072.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-072.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-073.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-073.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-074.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-074.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-081.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-081.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-082.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-082.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-083.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-083.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-084.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-084.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-085.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-085.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-086.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-086.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-087.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-087.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-087.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-088.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-088.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-089.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-089.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-a-element-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-a-element-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-a-element-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-a-element-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-002.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-003.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-005.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-006.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-007.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-008.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-009.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-010.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-011.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-012.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-013.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-014.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-015.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-border-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-border-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-border-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-border-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-border-002.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-border-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-border-002.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-border-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-border-003.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-border-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-border-003.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-border-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-color-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-color-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-color-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-color-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-color-002.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-color-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-color-002.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-color-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-image-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-image-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-image-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-image-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-margin-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-margin-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-margin-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-margin-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-margin-002.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-margin-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-margin-002.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-margin-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-margin-003.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-margin-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-margin-003.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-margin-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-padding-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-padding-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-padding-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-padding-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-padding-002.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-padding-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-padding-002.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-padding-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-padding-003.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-padding-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-padding-003.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-padding-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-parent-child-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-parent-child-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-parent-child-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-parent-child-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-position-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-position-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-position-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-position-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-propagation-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-propagation-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-propagation-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-propagation-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-propagation-002.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-propagation-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-propagation-002.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-propagation-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-propagation-003.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-propagation-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-propagation-003.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-propagation-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-propagation-004.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-propagation-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-propagation-004.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-propagation-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-propagation-005.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-propagation-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-propagation-005.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-propagation-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-propagation-006.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-propagation-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-propagation-006.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-propagation-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-propagation-007.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-propagation-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-propagation-007.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-propagation-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-relative-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-relative-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-relative-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-relative-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-space-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-space-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-002.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-space-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-002.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-space-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-003.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-space-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-003.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-space-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-004.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-space-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-004.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-space-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-005.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-space-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-005.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-space-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-006.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-space-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-006.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-space-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-007.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-space-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-007.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-space-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-008.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-space-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-008.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-space-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-009.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-space-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-space-009.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-space-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-thickness-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-thickness-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-thickness-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-thickness-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-length-001-ref.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-va-length-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-length-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-va-length-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-length-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-va-length-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-length-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-va-length-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-length-002-ref.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-va-length-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-length-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-va-length-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-length-002.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-va-length-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-length-002.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-va-length-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-sub-super-001.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-va-sub-super-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-sub-super-001.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-va-sub-super-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-sub-super-002.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-va-sub-super-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-sub-super-002.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-va-sub-super-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-sub-super-003.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-va-sub-super-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-sub-super-003.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-va-sub-super-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-sub-super-004.xht b/tests/wpt/tests/css/CSS2/text/text-decoration-va-sub-super-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-decoration-va-sub-super-004.xht rename to tests/wpt/tests/css/CSS2/text/text-decoration-va-sub-super-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-004-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-004-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-004.xht b/tests/wpt/tests/css/CSS2/text/text-indent-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-004.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-005.xht b/tests/wpt/tests/css/CSS2/text/text-indent-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-005.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-006.xht b/tests/wpt/tests/css/CSS2/text/text-indent-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-006.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-007.xht b/tests/wpt/tests/css/CSS2/text/text-indent-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-007.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-008.xht b/tests/wpt/tests/css/CSS2/text/text-indent-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-008.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-010-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-010-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-010.xht b/tests/wpt/tests/css/CSS2/text/text-indent-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-010.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-011-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-011-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-011.xht b/tests/wpt/tests/css/CSS2/text/text-indent-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-011.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-012-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-012-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-012.xht b/tests/wpt/tests/css/CSS2/text/text-indent-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-012.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-013-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-013-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-013.xht b/tests/wpt/tests/css/CSS2/text/text-indent-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-013.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-014-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-014-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-014.xht b/tests/wpt/tests/css/CSS2/text/text-indent-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-014.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-016.xht b/tests/wpt/tests/css/CSS2/text/text-indent-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-016.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-017.xht b/tests/wpt/tests/css/CSS2/text/text-indent-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-017.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-018.xht b/tests/wpt/tests/css/CSS2/text/text-indent-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-018.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-019.xht b/tests/wpt/tests/css/CSS2/text/text-indent-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-019.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-020.xht b/tests/wpt/tests/css/CSS2/text/text-indent-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-020.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-028.xht b/tests/wpt/tests/css/CSS2/text/text-indent-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-028.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-029.xht b/tests/wpt/tests/css/CSS2/text/text-indent-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-029.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-030.xht b/tests/wpt/tests/css/CSS2/text/text-indent-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-030.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-031.xht b/tests/wpt/tests/css/CSS2/text/text-indent-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-031.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-032.xht b/tests/wpt/tests/css/CSS2/text/text-indent-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-032.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-040.xht b/tests/wpt/tests/css/CSS2/text/text-indent-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-040.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-041.xht b/tests/wpt/tests/css/CSS2/text/text-indent-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-041.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-042.xht b/tests/wpt/tests/css/CSS2/text/text-indent-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-042.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-043.xht b/tests/wpt/tests/css/CSS2/text/text-indent-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-043.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-044.xht b/tests/wpt/tests/css/CSS2/text/text-indent-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-044.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-052.xht b/tests/wpt/tests/css/CSS2/text/text-indent-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-052.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-053.xht b/tests/wpt/tests/css/CSS2/text/text-indent-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-053.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-054.xht b/tests/wpt/tests/css/CSS2/text/text-indent-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-054.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-055.xht b/tests/wpt/tests/css/CSS2/text/text-indent-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-055.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-056.xht b/tests/wpt/tests/css/CSS2/text/text-indent-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-056.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-064.xht b/tests/wpt/tests/css/CSS2/text/text-indent-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-064.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-065.xht b/tests/wpt/tests/css/CSS2/text/text-indent-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-065.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-066.xht b/tests/wpt/tests/css/CSS2/text/text-indent-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-066.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-067.xht b/tests/wpt/tests/css/CSS2/text/text-indent-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-067.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-068.xht b/tests/wpt/tests/css/CSS2/text/text-indent-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-068.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-076.xht b/tests/wpt/tests/css/CSS2/text/text-indent-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-076.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-077.xht b/tests/wpt/tests/css/CSS2/text/text-indent-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-077.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-078.xht b/tests/wpt/tests/css/CSS2/text/text-indent-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-078.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-079.xht b/tests/wpt/tests/css/CSS2/text/text-indent-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-079.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-080.xht b/tests/wpt/tests/css/CSS2/text/text-indent-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-080.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-088.xht b/tests/wpt/tests/css/CSS2/text/text-indent-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-088.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-089.xht b/tests/wpt/tests/css/CSS2/text/text-indent-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-089.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-090.xht b/tests/wpt/tests/css/CSS2/text/text-indent-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-090.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-091-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-091-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-091-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-091-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-091.xht b/tests/wpt/tests/css/CSS2/text/text-indent-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-091.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-092.xht b/tests/wpt/tests/css/CSS2/text/text-indent-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-092.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-100.xht b/tests/wpt/tests/css/CSS2/text/text-indent-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-100.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-101.xht b/tests/wpt/tests/css/CSS2/text/text-indent-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-101.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-102.xht b/tests/wpt/tests/css/CSS2/text/text-indent-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-102.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-103-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-103-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-103-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-103-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-103.xht b/tests/wpt/tests/css/CSS2/text/text-indent-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-103.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-104.xht b/tests/wpt/tests/css/CSS2/text/text-indent-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-104.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-109.xht b/tests/wpt/tests/css/CSS2/text/text-indent-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-109.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-110.xht b/tests/wpt/tests/css/CSS2/text/text-indent-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-110.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-111.xht b/tests/wpt/tests/css/CSS2/text/text-indent-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-111.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-112.xht b/tests/wpt/tests/css/CSS2/text/text-indent-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-112.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-113-ref-margin.xht b/tests/wpt/tests/css/CSS2/text/text-indent-113-ref-margin.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-113-ref-margin.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-113-ref-margin.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-113.xht b/tests/wpt/tests/css/CSS2/text/text-indent-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-113.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-114-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-114-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-114-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-114-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-114.xht b/tests/wpt/tests/css/CSS2/text/text-indent-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-114.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-115-ref-block-margin.xht b/tests/wpt/tests/css/CSS2/text/text-indent-115-ref-block-margin.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-115-ref-block-margin.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-115-ref-block-margin.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-115-ref-inline-margin.xht b/tests/wpt/tests/css/CSS2/text/text-indent-115-ref-inline-margin.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-115-ref-inline-margin.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-115-ref-inline-margin.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-115.xht b/tests/wpt/tests/css/CSS2/text/text-indent-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-115.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-001.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-002-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-002.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-003-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-003.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-005.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-006.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-007-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-007-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-007.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-008.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-009.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-010.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-011.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-012-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-012-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-012.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-013.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-014.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-015.xht b/tests/wpt/tests/css/CSS2/text/text-indent-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-inherited-001-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-inherited-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-inherited-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-inherited-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-inherited-001.xht b/tests/wpt/tests/css/CSS2/text/text-indent-inherited-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-inherited-001.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-inherited-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-001-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-001.xht b/tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-001.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-002-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-002.xht b/tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-002.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-003-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-003.xht b/tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-003.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-004-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-004-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-004.xht b/tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-004.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-intrinsic-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-on-blank-line-rtl-left-align-ref.html b/tests/wpt/tests/css/CSS2/text/text-indent-on-blank-line-rtl-left-align-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-on-blank-line-rtl-left-align-ref.html rename to tests/wpt/tests/css/CSS2/text/text-indent-on-blank-line-rtl-left-align-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-on-blank-line-rtl-left-align.html b/tests/wpt/tests/css/CSS2/text/text-indent-on-blank-line-rtl-left-align.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-on-blank-line-rtl-left-align.html rename to tests/wpt/tests/css/CSS2/text/text-indent-on-blank-line-rtl-left-align.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-001.xht b/tests/wpt/tests/css/CSS2/text/text-indent-overflow-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-001.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-overflow-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-002-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-overflow-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-overflow-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-002.xht b/tests/wpt/tests/css/CSS2/text/text-indent-overflow-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-002.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-overflow-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-003-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-overflow-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-overflow-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-003.xht b/tests/wpt/tests/css/CSS2/text/text-indent-overflow-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-003.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-overflow-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-004.xht b/tests/wpt/tests/css/CSS2/text/text-indent-overflow-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-004.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-overflow-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-percent-001-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-percent-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-percent-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-percent-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-percent-001.xht b/tests/wpt/tests/css/CSS2/text/text-indent-percent-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-percent-001.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-percent-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-001-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-rtl-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-rtl-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-001.xht b/tests/wpt/tests/css/CSS2/text/text-indent-rtl-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-001.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-rtl-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-002-ref.xht b/tests/wpt/tests/css/CSS2/text/text-indent-rtl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-rtl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-002.xht b/tests/wpt/tests/css/CSS2/text/text-indent-rtl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-002.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-rtl-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht b/tests/wpt/tests/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001-ref-float.xht b/tests/wpt/tests/css/CSS2/text/text-indent-wrap-001-ref-float.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001-ref-float.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-wrap-001-ref-float.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001-ref-inline-margin.xht b/tests/wpt/tests/css/CSS2/text/text-indent-wrap-001-ref-inline-margin.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001-ref-inline-margin.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-wrap-001-ref-inline-margin.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001.xht b/tests/wpt/tests/css/CSS2/text/text-indent-wrap-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001.xht rename to tests/wpt/tests/css/CSS2/text/text-indent-wrap-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-001-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-001.xht b/tests/wpt/tests/css/CSS2/text/text-transform-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-001.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-002-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-002.xht b/tests/wpt/tests/css/CSS2/text/text-transform-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-002.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-003-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-003.xht b/tests/wpt/tests/css/CSS2/text/text-transform-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-003.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-004-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-004-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-004.xht b/tests/wpt/tests/css/CSS2/text/text-transform-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-004.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-005.xht b/tests/wpt/tests/css/CSS2/text/text-transform-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-005.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-001.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-002.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-003-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-003.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-005.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-006.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-007.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-008.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-009.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-010.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-011.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-012.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-013.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-014.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-015.xht b/tests/wpt/tests/css/CSS2/text/text-transform-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-001-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-001.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-001.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-002-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-002.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-002.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-003-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-003.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-003.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-004-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-004-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-004.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-004.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-005-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-005-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-005.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-005.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-006-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-006-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-006.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-006.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-007-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-007-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-007.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-007.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-008-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-008-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-008.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-008.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-009-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-009-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-009.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-009.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-010-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-010-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-010.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-010.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-011-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-011-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-011.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-011.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-012-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-012-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-012.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-012.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-013-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-013-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-013.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-013.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-014-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-014-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-014.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-014.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-015-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-015-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-015.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-015.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-016-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-016-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-016.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-016.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-017-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-017-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-017.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-017.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-018-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-018-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-018.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-018.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-019-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-019-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-019.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-019.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-020-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-020-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-020.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-020.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-021-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-021-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-021.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-021.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-022-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-022-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-022.xht b/tests/wpt/tests/css/CSS2/text/text-transform-bicameral-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-022.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-bicameral-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-001-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-cap-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-cap-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-001.xht b/tests/wpt/tests/css/CSS2/text/text-transform-cap-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-001.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-cap-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-002.xht b/tests/wpt/tests/css/CSS2/text/text-transform-cap-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-002.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-cap-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-003-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-cap-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-cap-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-003.xht b/tests/wpt/tests/css/CSS2/text/text-transform-cap-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-003.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-cap-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-lowercase-001-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-lowercase-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-lowercase-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-lowercase-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-lowercase-001.xht b/tests/wpt/tests/css/CSS2/text/text-transform-lowercase-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-lowercase-001.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-lowercase-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-unicase-001-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-unicase-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-unicase-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-unicase-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-unicase-001.xht b/tests/wpt/tests/css/CSS2/text/text-transform-unicase-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-unicase-001.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-unicase-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-001-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-uppercase-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-uppercase-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-001.xht b/tests/wpt/tests/css/CSS2/text/text-transform-uppercase-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-001.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-uppercase-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-002-ref.xht b/tests/wpt/tests/css/CSS2/text/text-transform-uppercase-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-uppercase-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-002.xht b/tests/wpt/tests/css/CSS2/text/text-transform-uppercase-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-002.xht rename to tests/wpt/tests/css/CSS2/text/text-transform-uppercase-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-001-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-002-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-002.xht b/tests/wpt/tests/css/CSS2/text/white-space-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-002.xht rename to tests/wpt/tests/css/CSS2/text/white-space-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-003.xht b/tests/wpt/tests/css/CSS2/text/white-space-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-003.xht rename to tests/wpt/tests/css/CSS2/text/white-space-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-004-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-004-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-004.xht b/tests/wpt/tests/css/CSS2/text/white-space-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-004.xht rename to tests/wpt/tests/css/CSS2/text/white-space-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-005.xht b/tests/wpt/tests/css/CSS2/text/white-space-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-005.xht rename to tests/wpt/tests/css/CSS2/text/white-space-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-006.xht b/tests/wpt/tests/css/CSS2/text/white-space-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-006.xht rename to tests/wpt/tests/css/CSS2/text/white-space-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-007-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-007-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-007.xht b/tests/wpt/tests/css/CSS2/text/white-space-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-007.xht rename to tests/wpt/tests/css/CSS2/text/white-space-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-008-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-008-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-008.xht b/tests/wpt/tests/css/CSS2/text/white-space-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-008.xht rename to tests/wpt/tests/css/CSS2/text/white-space-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-002.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-003-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-003.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-005.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-006.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-007.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-008.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-009.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-010.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-011.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-012.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-013.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-014.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-015.xht b/tests/wpt/tests/css/CSS2/text/white-space-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/text/white-space-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-bidirectionality-001-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-bidirectionality-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-bidirectionality-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-bidirectionality-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-bidirectionality-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-bidirectionality-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-bidirectionality-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-bidirectionality-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-001-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-002.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-002.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-003-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-003.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-003.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-004-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-004-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-004.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-004.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-005.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-005.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-bidi-001-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-bidi-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-bidi-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-bidi-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-bidi-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-bidi-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-bidi-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-bidi-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-bidi-002.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-bidi-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-bidi-002.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-bidi-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-bidi-003-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-bidi-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-bidi-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-bidi-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-bidi-003.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-bidi-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-bidi-003.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-bidi-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-breaks-001-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-breaks-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-breaks-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-breaks-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-breaks-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-collapsing-breaks-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-collapsing-breaks-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-collapsing-breaks-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-control-characters-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-control-characters-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-control-characters-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-control-characters-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-generated-content-before-001-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-generated-content-before-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-generated-content-before-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-generated-content-before-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-generated-content-before-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-generated-content-before-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-generated-content-before-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-generated-content-before-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-mixed-001-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-mixed-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-mixed-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-mixed-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-mixed-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-mixed-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-mixed-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-mixed-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-mixed-002-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-mixed-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-mixed-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-mixed-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-mixed-002.xht b/tests/wpt/tests/css/CSS2/text/white-space-mixed-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-mixed-002.xht rename to tests/wpt/tests/css/CSS2/text/white-space-mixed-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-mixed-003-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-mixed-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-mixed-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-mixed-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-mixed-003.xht b/tests/wpt/tests/css/CSS2/text/white-space-mixed-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-mixed-003.xht rename to tests/wpt/tests/css/CSS2/text/white-space-mixed-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-mixed-004.xht b/tests/wpt/tests/css/CSS2/text/white-space-mixed-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-mixed-004.xht rename to tests/wpt/tests/css/CSS2/text/white-space-mixed-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-001-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-002.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-002.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-003-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-003.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-003.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-004.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-004.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-005-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-005-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-005.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-005.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-006.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-006.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-007-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-007-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-007.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-007.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-008-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-008-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-008.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-008.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-009-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-009-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-009.xht b/tests/wpt/tests/css/CSS2/text/white-space-normal-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-normal-009.xht rename to tests/wpt/tests/css/CSS2/text/white-space-normal-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-nowrap-001-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-nowrap-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-nowrap-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-nowrap-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-nowrap-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-nowrap-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-nowrap-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-nowrap-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-nowrap-005.xht b/tests/wpt/tests/css/CSS2/text/white-space-nowrap-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-nowrap-005.xht rename to tests/wpt/tests/css/CSS2/text/white-space-nowrap-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-nowrap-006.xht b/tests/wpt/tests/css/CSS2/text/white-space-nowrap-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-nowrap-006.xht rename to tests/wpt/tests/css/CSS2/text/white-space-nowrap-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-nowrap-attribute-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-nowrap-attribute-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-nowrap-attribute-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-nowrap-attribute-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-p-element-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-p-element-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-p-element-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-p-element-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-001-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-pre-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-pre-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-pre-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-pre-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-002-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-pre-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-pre-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-002.xht b/tests/wpt/tests/css/CSS2/text/white-space-pre-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-002.xht rename to tests/wpt/tests/css/CSS2/text/white-space-pre-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-005.xht b/tests/wpt/tests/css/CSS2/text/white-space-pre-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-005.xht rename to tests/wpt/tests/css/CSS2/text/white-space-pre-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-006.xht b/tests/wpt/tests/css/CSS2/text/white-space-pre-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-006.xht rename to tests/wpt/tests/css/CSS2/text/white-space-pre-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-007.xht b/tests/wpt/tests/css/CSS2/text/white-space-pre-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-007.xht rename to tests/wpt/tests/css/CSS2/text/white-space-pre-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-element-001-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-pre-element-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-element-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-pre-element-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-element-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-pre-element-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-element-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-pre-element-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-001.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-001.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-002-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-002.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-002.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-003.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-003.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-004.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-004.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-005-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-005-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-005.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-005.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-006-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-006-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-006.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-006.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-007.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-007.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-008.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-008.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-009.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-009.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-010.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-010.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-011.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-011.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-012.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-012.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-013-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-013-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-013.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-013.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-014-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-014-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-014.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-014.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-015-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-015-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-015.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-015.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-016-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-016-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-016.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-016.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-017.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-017.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-018.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-018.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-019.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-019.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-020.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-020.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-021.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-021.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-022.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-022.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-023.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-023.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-024.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-024.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-025.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-025.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-026.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-026.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-027.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-027.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-028.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-028.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-029.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-029.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-030.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-030.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-031-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-031-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-031-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-031-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-031.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-031.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-032.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-032.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-033.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-033.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-034.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-034.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-035.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-035.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-036.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-036.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-037-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-037-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-037-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-037-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-037.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-037.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-038.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-038.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-039.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-039.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-040.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-040.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-041.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-041.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-042-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-042-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-042-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-042-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-042.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-042.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-043-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-043-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-043-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-043-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-043.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-043.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-044.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-044.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-045.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-045.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-046-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-046-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-046-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-046-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-046.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-046.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-047.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-047.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-048-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-048-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-048-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-048-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-048.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-048.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-049-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-049-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-049-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-049-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-049.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-049.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-050.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-050.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-051.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-051.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-052-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-052-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-052-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-052-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-052.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-052.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-053.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-053.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-054-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-054-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-054-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-054-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-054.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-054.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-055-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-055-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-055-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-055-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-055.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-055.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-056-ref.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-056-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-056-ref.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-056-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-056.xht b/tests/wpt/tests/css/CSS2/text/white-space-processing-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-056.xht rename to tests/wpt/tests/css/CSS2/text/white-space-processing-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-004-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-004-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-004.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-004.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-005.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-005.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-006.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-006.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-007-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-007-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-007.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-007.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-008.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-008.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-016.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-016.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-017.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-017.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-018.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-018.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-019.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-019.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-020.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-020.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-028.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-028.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-029.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-029.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-030.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-030.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-031.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-031.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-032.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-032.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-040.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-040.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-041.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-041.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-042.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-042.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-043.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-043.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-044.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-044.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-052.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-052.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-053.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-053.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-054.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-054.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-055.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-055.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-056.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-056.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-064.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-064.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-065.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-065.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-066.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-066.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-067.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-067.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-068.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-068.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-076.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-076.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-077.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-077.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-078.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-078.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-079.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-079.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-080.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-080.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-088.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-088.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-089.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-089.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-090.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-090.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-091-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-091-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-091-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-091-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-091.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-091.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-092.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-092.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-097.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-097.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-098.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-098.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-099.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-099.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-100.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-100.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-101.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-101.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-001.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-002.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-003-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-003.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-005.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-006.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-007-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-007-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-007.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-008.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-009.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-010.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-011.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-011.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-012-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-012-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-012.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-013.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-014.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-015.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-001-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-characters-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-characters-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-001.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-characters-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-001.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-characters-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-002-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-characters-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-characters-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-002.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-characters-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-002.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-characters-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-003-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-characters-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-characters-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-003.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-characters-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-003.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-characters-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-justify-001-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-justify-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-justify-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-justify-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-justify-001.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-justify-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-justify-001.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-justify-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-001-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-001-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-001.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-001.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-002-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-002-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-002.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-002.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-003-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-003-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-003.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-003.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-004-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-004-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-004.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-004.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-005-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-005-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-005.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-005.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-006-ref.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-006-ref.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-006.xht b/tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-006.xht rename to tests/wpt/tests/css/CSS2/text/word-spacing-remove-space-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-001.xht b/tests/wpt/tests/css/CSS2/ui/cursor-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-001.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-002.xht b/tests/wpt/tests/css/CSS2/ui/cursor-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-002.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-003.xht b/tests/wpt/tests/css/CSS2/ui/cursor-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-003.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-004.xht b/tests/wpt/tests/css/CSS2/ui/cursor-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-004.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-005.xht b/tests/wpt/tests/css/CSS2/ui/cursor-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-005.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-006.xht b/tests/wpt/tests/css/CSS2/ui/cursor-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-006.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-007.xht b/tests/wpt/tests/css/CSS2/ui/cursor-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-007.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-008.xht b/tests/wpt/tests/css/CSS2/ui/cursor-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-008.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-009.xht b/tests/wpt/tests/css/CSS2/ui/cursor-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-009.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-010.xht b/tests/wpt/tests/css/CSS2/ui/cursor-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-010.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-011.xht b/tests/wpt/tests/css/CSS2/ui/cursor-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-011.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-012.xht b/tests/wpt/tests/css/CSS2/ui/cursor-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-012.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-013.xht b/tests/wpt/tests/css/CSS2/ui/cursor-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-013.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-014.xht b/tests/wpt/tests/css/CSS2/ui/cursor-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-014.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-015.xht b/tests/wpt/tests/css/CSS2/ui/cursor-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-015.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-016.xht b/tests/wpt/tests/css/CSS2/ui/cursor-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-016.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-017.xht b/tests/wpt/tests/css/CSS2/ui/cursor-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-017.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-018.xht b/tests/wpt/tests/css/CSS2/ui/cursor-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-018.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-019.xht b/tests/wpt/tests/css/CSS2/ui/cursor-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-019.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-020.xht b/tests/wpt/tests/css/CSS2/ui/cursor-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-020.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-021.xht b/tests/wpt/tests/css/CSS2/ui/cursor-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-021.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-022.xht b/tests/wpt/tests/css/CSS2/ui/cursor-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-022.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-023.xht b/tests/wpt/tests/css/CSS2/ui/cursor-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-023.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-024.xht b/tests/wpt/tests/css/CSS2/ui/cursor-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-024.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-001.xht b/tests/wpt/tests/css/CSS2/ui/cursor-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-002.xht b/tests/wpt/tests/css/CSS2/ui/cursor-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-003.xht b/tests/wpt/tests/css/CSS2/ui/cursor-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-004.xht b/tests/wpt/tests/css/CSS2/ui/cursor-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-005.xht b/tests/wpt/tests/css/CSS2/ui/cursor-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-006.xht b/tests/wpt/tests/css/CSS2/ui/cursor-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-007.xht b/tests/wpt/tests/css/CSS2/ui/cursor-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-008.xht b/tests/wpt/tests/css/CSS2/ui/cursor-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-009.xht b/tests/wpt/tests/css/CSS2/ui/cursor-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-010.xht b/tests/wpt/tests/css/CSS2/ui/cursor-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-012.xht b/tests/wpt/tests/css/CSS2/ui/cursor-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-013.xht b/tests/wpt/tests/css/CSS2/ui/cursor-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-014.xht b/tests/wpt/tests/css/CSS2/ui/cursor-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-015.xht b/tests/wpt/tests/css/CSS2/ui/cursor-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-fallback-001.xht b/tests/wpt/tests/css/CSS2/ui/cursor-fallback-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-fallback-001.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-fallback-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/cursor-url-001.xht b/tests/wpt/tests/css/CSS2/ui/cursor-url-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/cursor-url-001.xht rename to tests/wpt/tests/css/CSS2/ui/cursor-url-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-002.xht b/tests/wpt/tests/css/CSS2/ui/outline-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-002.xht rename to tests/wpt/tests/css/CSS2/ui/outline-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-003.xht b/tests/wpt/tests/css/CSS2/ui/outline-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-003.xht rename to tests/wpt/tests/css/CSS2/ui/outline-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-004.xht b/tests/wpt/tests/css/CSS2/ui/outline-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-004.xht rename to tests/wpt/tests/css/CSS2/ui/outline-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-005.xht b/tests/wpt/tests/css/CSS2/ui/outline-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-005.xht rename to tests/wpt/tests/css/CSS2/ui/outline-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-006.xht b/tests/wpt/tests/css/CSS2/ui/outline-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-006.xht rename to tests/wpt/tests/css/CSS2/ui/outline-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-007.xht b/tests/wpt/tests/css/CSS2/ui/outline-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-007.xht rename to tests/wpt/tests/css/CSS2/ui/outline-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-008.xht b/tests/wpt/tests/css/CSS2/ui/outline-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-008.xht rename to tests/wpt/tests/css/CSS2/ui/outline-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-009.xht b/tests/wpt/tests/css/CSS2/ui/outline-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-009.xht rename to tests/wpt/tests/css/CSS2/ui/outline-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-010.xht b/tests/wpt/tests/css/CSS2/ui/outline-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-010.xht rename to tests/wpt/tests/css/CSS2/ui/outline-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-011.xht b/tests/wpt/tests/css/CSS2/ui/outline-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-011.xht rename to tests/wpt/tests/css/CSS2/ui/outline-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-012.xht b/tests/wpt/tests/css/CSS2/ui/outline-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-012.xht rename to tests/wpt/tests/css/CSS2/ui/outline-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-013.xht b/tests/wpt/tests/css/CSS2/ui/outline-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-013.xht rename to tests/wpt/tests/css/CSS2/ui/outline-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-014.xht b/tests/wpt/tests/css/CSS2/ui/outline-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-014.xht rename to tests/wpt/tests/css/CSS2/ui/outline-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-015.xht b/tests/wpt/tests/css/CSS2/ui/outline-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-015.xht rename to tests/wpt/tests/css/CSS2/ui/outline-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-016.xht b/tests/wpt/tests/css/CSS2/ui/outline-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-016.xht rename to tests/wpt/tests/css/CSS2/ui/outline-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-017.xht b/tests/wpt/tests/css/CSS2/ui/outline-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-017.xht rename to tests/wpt/tests/css/CSS2/ui/outline-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-018.xht b/tests/wpt/tests/css/CSS2/ui/outline-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-018.xht rename to tests/wpt/tests/css/CSS2/ui/outline-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-019.xht b/tests/wpt/tests/css/CSS2/ui/outline-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-019.xht rename to tests/wpt/tests/css/CSS2/ui/outline-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-020.xht b/tests/wpt/tests/css/CSS2/ui/outline-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-020.xht rename to tests/wpt/tests/css/CSS2/ui/outline-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-002.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-003.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-004.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-005.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-006.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-007.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-008.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-009.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-010.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-012.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-013.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-014.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-015.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-016-ref.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-016-ref.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-016.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-017.xht b/tests/wpt/tests/css/CSS2/ui/outline-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/ui/outline-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-002.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-002.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-003.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-003.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-004.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-004.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-005.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-005.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-006.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-006.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-007.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-007.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-008.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-008.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-009.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-009.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-010.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-010.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-011.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-011.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-012.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-012.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-013.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-013.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-014.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-014.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-015.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-015.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-016.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-016.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-017.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-017.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-018.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-018.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-019.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-019.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-020.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-020.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-021.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-021.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-022.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-022.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-022.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-023.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-023.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-024.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-024.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-025.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-025.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-026.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-026.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-027.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-027.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-028.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-028.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-029.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-029.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-030.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-030.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-031.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-031.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-032.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-032.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-033.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-033.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-033.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-034.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-034.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-035.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-035.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-036.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-036.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-037.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-037.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-038.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-038.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-039.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-039.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-040.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-040.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-041.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-041.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-042.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-042.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-043.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-043.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-044.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-044.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-045.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-045.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-046.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-046.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-047.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-047.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-048.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-048.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-049-ref.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-049-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-049-ref.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-049-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-049.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-049.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-050.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-050.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-051.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-051.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-052-ref.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-052-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-052-ref.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-052-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-052.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-052.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-053.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-053.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-054-ref.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-054-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-054-ref.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-054-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-054.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-054.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-055.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-055.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-056.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-056.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-057.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-057.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-058.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-058.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-059.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-059.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-060.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-060.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-061.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-061.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-062.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-062.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-063.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-063.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-063.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-064.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-064.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-065.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-065.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-066.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-066.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-067.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-067.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-068.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-068.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-069.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-069.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-070-ref.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-070-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-070-ref.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-070-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-070.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-070.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-071.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-071.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-072.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-072.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-073-ref.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-073-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-073-ref.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-073-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-073.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-073.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-074.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-074.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-074.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-075-ref.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-075-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-075-ref.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-075-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-075.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-075.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-075.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-076.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-076.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-077.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-077.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-078.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-078.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-079.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-079.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-080.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-080.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-081.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-081.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-082.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-082.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-083.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-083.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-084.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-084.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-085.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-085.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-085.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-086.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-086.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-086.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-087.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-087.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-087.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-088.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-088.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-089.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-089.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-090-ref.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-090-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-090-ref.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-090-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-090.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-090.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-091.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-091.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-092.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-092.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-093-ref.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-093-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-093-ref.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-093-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-093.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-093.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-094.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-094.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-095-ref.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-095-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-095-ref.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-095-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-095.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-095.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-096.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-096.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-097.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-097.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-098.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-098.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-099.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-099.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-100.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-100.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-101.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-101.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-102.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-102.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-103.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-103.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-103.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-104.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-104.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-104.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-105.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-105.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-105.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-106.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-106.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-106.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-107.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-107.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-107.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-108.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-108.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-108.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-109.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-109.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-110-ref.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-110-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-110-ref.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-110-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-110.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-110.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-110.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-111.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-111.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-111.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-112.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-112.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-112.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-113-ref.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-113-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-113-ref.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-113-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-113.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-113.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-113.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-114.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-114.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-115-ref.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-115-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-115-ref.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-115-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-115.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-115.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-116.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-116.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-116.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-117.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-117.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-117.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-118.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-118.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-118.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-119.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-119.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-119.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-120.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-120.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-120.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-121.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-121.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-121.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-122.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-122.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-122.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-123.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-123.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-123.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-124.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-124.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-124.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-125.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-125.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-125.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-126.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-126.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-126.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-127.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-127.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-127.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-128.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-128.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-128.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-129.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-129.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-129.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-130.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-130.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-130.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-131.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-131.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-131.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-132.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-132.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-132.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-133.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-133.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-133.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-133.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-134.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-134.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-134.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-134.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-135.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-135.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-135.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-136.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-136.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-136.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-136.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-137.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-137.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-137.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-137.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-138.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-138.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-138.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-139.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-139.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-139.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-139.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-140.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-140.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-140.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-141.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-141.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-141.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-142.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-142.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-142.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-143.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-143.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-143.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-144.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-144.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-144.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-145.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-145.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-145.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-174.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-174.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-174.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-174.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-175.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-175.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-175.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-175.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-176.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-176.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-176.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-176.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-002.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-003.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-004.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-005.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-006.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-007.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-008.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-009.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-010.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-012.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-013.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-014.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-015.xht b/tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-color-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/ui/outline-color-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-focus-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-focus-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-focus-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-focus-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-individual-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-individual-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-individual-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-individual-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-individual-002.xht b/tests/wpt/tests/css/CSS2/ui/outline-individual-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-individual-002.xht rename to tests/wpt/tests/css/CSS2/ui/outline-individual-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-individual-003.xht b/tests/wpt/tests/css/CSS2/ui/outline-individual-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-individual-003.xht rename to tests/wpt/tests/css/CSS2/ui/outline-individual-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-individual-004.xht b/tests/wpt/tests/css/CSS2/ui/outline-individual-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-individual-004.xht rename to tests/wpt/tests/css/CSS2/ui/outline-individual-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-layout-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-layout-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-layout-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-layout-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-layout-002.xht b/tests/wpt/tests/css/CSS2/ui/outline-layout-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-layout-002.xht rename to tests/wpt/tests/css/CSS2/ui/outline-layout-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-layout-003.xht b/tests/wpt/tests/css/CSS2/ui/outline-layout-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-layout-003.xht rename to tests/wpt/tests/css/CSS2/ui/outline-layout-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-layout-004.xht b/tests/wpt/tests/css/CSS2/ui/outline-layout-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-layout-004.xht rename to tests/wpt/tests/css/CSS2/ui/outline-layout-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-layout-005.xht b/tests/wpt/tests/css/CSS2/ui/outline-layout-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-layout-005.xht rename to tests/wpt/tests/css/CSS2/ui/outline-layout-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-no-relayout-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-no-relayout-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-no-relayout-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-no-relayout-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-overlap-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-overlap-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-overlap-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-overlap-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-pseudo-selector-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-pseudo-selector-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-pseudo-selector-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-pseudo-selector-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-pseudo-selector-002.xht b/tests/wpt/tests/css/CSS2/ui/outline-pseudo-selector-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-pseudo-selector-002.xht rename to tests/wpt/tests/css/CSS2/ui/outline-pseudo-selector-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-pseudo-selector-003.xht b/tests/wpt/tests/css/CSS2/ui/outline-pseudo-selector-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-pseudo-selector-003.xht rename to tests/wpt/tests/css/CSS2/ui/outline-pseudo-selector-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-002.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-002.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-003.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-003.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-004.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-004.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-005.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-005.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-006.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-006.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-007.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-007.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-008.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-008.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-009.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-009.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-010.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-010.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-002.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-003.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-004.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-005.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-006.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-007.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-008.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-009.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-010.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-012.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-013.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-014.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-015.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-hidden-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-style-hidden-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-style-hidden-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-style-hidden-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-002.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-002.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-003.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-003.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-004.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-004.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-005.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-005.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-006.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-006.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-007.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-007.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-012.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-012.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-013.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-013.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-014.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-014.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-015.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-015.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-016.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-016.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-017.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-017.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-018.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-018.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-023.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-023.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-023.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-024.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-024.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-024.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-025.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-025.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-025.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-026.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-026.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-026.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-027.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-027.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-027.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-028.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-028.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-029.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-029.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-034.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-034.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-034.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-035.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-035.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-035.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-036.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-036.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-036.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-037.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-037.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-037.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-038.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-038.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-038.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-039.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-039.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-039.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-040.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-040.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-045.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-045.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-045.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-046.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-046.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-046.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-047.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-047.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-047.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-048.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-048.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-048.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-049.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-049.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-049.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-050.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-050.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-050.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-051.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-051.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-051.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-056.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-056.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-057.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-057.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-057.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-058.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-058.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-058.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-059.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-059.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-059.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-060.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-060.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-060.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-061.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-061.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-061.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-062.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-062.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-062.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-067.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-067.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-068.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-068.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-069.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-069.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-069.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-070.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-070.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-070.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-071.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-071.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-071.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-072.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-072.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-072.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-073.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-073.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-073.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-078.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-078.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-079.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-079.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-080.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-080.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-081.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-081.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-081.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-082.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-082.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-082.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-083.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-083.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-083.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-084.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-084.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-084.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-089.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-089.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-090.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-090.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-091.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-091.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-092.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-092.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-093.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-093.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-093.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-094.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-094.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-094.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-095.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-095.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-095.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-096-ref.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-096-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-096-ref.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-096-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-096.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-096.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-096.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-001.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-002.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-003.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-004.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-005.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-006.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-007.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-008.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-009.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-010.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-012.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-013.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-014.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-015.xht b/tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/outline-width-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/ui/outline-width-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-001.xht b/tests/wpt/tests/css/CSS2/ui/overflow-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-001.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-002.xht b/tests/wpt/tests/css/CSS2/ui/overflow-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-002.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-003.xht b/tests/wpt/tests/css/CSS2/ui/overflow-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-003.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-004.xht b/tests/wpt/tests/css/CSS2/ui/overflow-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-004.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-005.xht b/tests/wpt/tests/css/CSS2/ui/overflow-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-005.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-ancestors-001.xht b/tests/wpt/tests/css/CSS2/ui/overflow-ancestors-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-ancestors-001.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-ancestors-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-001.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-002.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-003.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-004.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-005.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-006.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-007.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-008.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-009.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-010.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-012.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-013.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-014.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-015.xht b/tests/wpt/tests/css/CSS2/ui/overflow-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-html-body-001.xht b/tests/wpt/tests/css/CSS2/ui/overflow-html-body-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-html-body-001.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-html-body-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-parent-001.xht b/tests/wpt/tests/css/CSS2/ui/overflow-parent-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-parent-001.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-parent-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-print-001.xht b/tests/wpt/tests/css/CSS2/ui/overflow-print-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-print-001.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-print-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-root-001.xht b/tests/wpt/tests/css/CSS2/ui/overflow-root-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-root-001.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-root-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-scrollbar-001.xht b/tests/wpt/tests/css/CSS2/ui/overflow-scrollbar-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-scrollbar-001.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-scrollbar-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/overflow-visible-viewport-001.xht b/tests/wpt/tests/css/CSS2/ui/overflow-visible-viewport-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/overflow-visible-viewport-001.xht rename to tests/wpt/tests/css/CSS2/ui/overflow-visible-viewport-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/1x1-green.png b/tests/wpt/tests/css/CSS2/ui/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/ui/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/ui/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/ui/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/ui/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/ui/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/ui/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/ui/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/1x1-red.png b/tests/wpt/tests/css/CSS2/ui/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/ui/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/1x1-white.png b/tests/wpt/tests/css/CSS2/ui/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/ui/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/ui/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/ui/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/60x60-green.png b/tests/wpt/tests/css/CSS2/ui/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/ui/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/a-green.css b/tests/wpt/tests/css/CSS2/ui/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/a-green.css rename to tests/wpt/tests/css/CSS2/ui/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/animated.gif b/tests/wpt/tests/css/CSS2/ui/support/animated.gif similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/animated.gif rename to tests/wpt/tests/css/CSS2/ui/support/animated.gif diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/b-green.css b/tests/wpt/tests/css/CSS2/ui/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/b-green.css rename to tests/wpt/tests/css/CSS2/ui/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/blue15x15.png b/tests/wpt/tests/css/CSS2/ui/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/ui/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/c-red.css b/tests/wpt/tests/css/CSS2/ui/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/c-red.css rename to tests/wpt/tests/css/CSS2/ui/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/cat.gif b/tests/wpt/tests/css/CSS2/ui/support/cat.gif similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/cat.gif rename to tests/wpt/tests/css/CSS2/ui/support/cat.gif diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/cat.png b/tests/wpt/tests/css/CSS2/ui/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/cat.png rename to tests/wpt/tests/css/CSS2/ui/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/cursor.cur b/tests/wpt/tests/css/CSS2/ui/support/cursor.cur similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/cursor.cur rename to tests/wpt/tests/css/CSS2/ui/support/cursor.cur diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/cursor.png b/tests/wpt/tests/css/CSS2/ui/support/cursor.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/cursor.png rename to tests/wpt/tests/css/CSS2/ui/support/cursor.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/diamond.png b/tests/wpt/tests/css/CSS2/ui/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/diamond.png rename to tests/wpt/tests/css/CSS2/ui/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/fail.cur b/tests/wpt/tests/css/CSS2/ui/support/fail.cur similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/fail.cur rename to tests/wpt/tests/css/CSS2/ui/support/fail.cur diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/green15x15.png b/tests/wpt/tests/css/CSS2/ui/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/green15x15.png rename to tests/wpt/tests/css/CSS2/ui/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/ui/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/ui/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/ui/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/ui/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/ui/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/ui/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/ui/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/ui/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/ring.png b/tests/wpt/tests/css/CSS2/ui/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/ring.png rename to tests/wpt/tests/css/CSS2/ui/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/square-purple.png b/tests/wpt/tests/css/CSS2/ui/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/square-purple.png rename to tests/wpt/tests/css/CSS2/ui/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/square-teal.png b/tests/wpt/tests/css/CSS2/ui/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/square-teal.png rename to tests/wpt/tests/css/CSS2/ui/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/square-white.png b/tests/wpt/tests/css/CSS2/ui/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/square-white.png rename to tests/wpt/tests/css/CSS2/ui/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/ui/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/ui/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/swatch-green.png b/tests/wpt/tests/css/CSS2/ui/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/ui/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/ui/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/ui/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/ui/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/ui/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/swatch-red.png b/tests/wpt/tests/css/CSS2/ui/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/ui/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/swatch-white.png b/tests/wpt/tests/css/CSS2/ui/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/ui/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/ui/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/ui/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/test-bl.png b/tests/wpt/tests/css/CSS2/ui/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/test-bl.png rename to tests/wpt/tests/css/CSS2/ui/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/test-br.png b/tests/wpt/tests/css/CSS2/ui/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/test-br.png rename to tests/wpt/tests/css/CSS2/ui/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/test-outer.png b/tests/wpt/tests/css/CSS2/ui/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/test-outer.png rename to tests/wpt/tests/css/CSS2/ui/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/test-tl.png b/tests/wpt/tests/css/CSS2/ui/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/test-tl.png rename to tests/wpt/tests/css/CSS2/ui/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/support/test-tr.png b/tests/wpt/tests/css/CSS2/ui/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/support/test-tr.png rename to tests/wpt/tests/css/CSS2/ui/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/ui/system-colors-001.xht b/tests/wpt/tests/css/CSS2/ui/system-colors-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/ui/system-colors-001.xht rename to tests/wpt/tests/css/CSS2/ui/system-colors-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/color-000-ref.xht b/tests/wpt/tests/css/CSS2/values/color-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/color-000-ref.xht rename to tests/wpt/tests/css/CSS2/values/color-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/color-000.xht b/tests/wpt/tests/css/CSS2/values/color-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/color-000.xht rename to tests/wpt/tests/css/CSS2/values/color-000.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-001.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-001.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-002.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-002.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-003.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-003.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-004.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-004.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-005.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-005.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-006.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-006.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-007-ref.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-007-ref.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-007.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-007.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-009-ref.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-009-ref.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-009.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-009.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-010-ref.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-010-ref.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-010.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-010.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-011-ref.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-011-ref.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-011.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-011.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-012-ref.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-012-ref.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-012.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-012.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-013-ref.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-013-ref.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-013.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-013.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-015-ref-a.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-015-ref-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-015-ref-a.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-015-ref-a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-015-ref-b.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-015-ref-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-015-ref-b.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-015-ref-b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-015.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-015.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-016.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-016.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-017.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-017.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-018-ref.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-018-ref.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-018.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-018.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-019-ref.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-019-ref.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-019.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-019.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-021-ref.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-021-ref.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-021.xht b/tests/wpt/tests/css/CSS2/values/numbers-units-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/numbers-units-021.xht rename to tests/wpt/tests/css/CSS2/values/numbers-units-021.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/1x1-green.png b/tests/wpt/tests/css/CSS2/values/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/values/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/values/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/values/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/values/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/values/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/values/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/values/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/1x1-red.png b/tests/wpt/tests/css/CSS2/values/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/values/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/1x1-white.png b/tests/wpt/tests/css/CSS2/values/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/values/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/values/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/values/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/60x60-green.png b/tests/wpt/tests/css/CSS2/values/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/values/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/README b/tests/wpt/tests/css/CSS2/values/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/README rename to tests/wpt/tests/css/CSS2/values/support/README diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/a-green.css b/tests/wpt/tests/css/CSS2/values/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/a-green.css rename to tests/wpt/tests/css/CSS2/values/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/b-green.css b/tests/wpt/tests/css/CSS2/values/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/b-green.css rename to tests/wpt/tests/css/CSS2/values/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/blue15x15.png b/tests/wpt/tests/css/CSS2/values/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/values/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/c-red.css b/tests/wpt/tests/css/CSS2/values/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/c-red.css rename to tests/wpt/tests/css/CSS2/values/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/cat.png b/tests/wpt/tests/css/CSS2/values/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/cat.png rename to tests/wpt/tests/css/CSS2/values/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/diamond.png b/tests/wpt/tests/css/CSS2/values/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/diamond.png rename to tests/wpt/tests/css/CSS2/values/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/green15x15.png b/tests/wpt/tests/css/CSS2/values/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/green15x15.png rename to tests/wpt/tests/css/CSS2/values/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/values/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/values/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/values/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/values/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/values/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/values/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/values/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/values/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/ring.png b/tests/wpt/tests/css/CSS2/values/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/ring.png rename to tests/wpt/tests/css/CSS2/values/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/square-purple.png b/tests/wpt/tests/css/CSS2/values/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/square-purple.png rename to tests/wpt/tests/css/CSS2/values/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/square-teal.png b/tests/wpt/tests/css/CSS2/values/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/square-teal.png rename to tests/wpt/tests/css/CSS2/values/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/square-white.png b/tests/wpt/tests/css/CSS2/values/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/square-white.png rename to tests/wpt/tests/css/CSS2/values/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/values/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/values/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/swatch-green.png b/tests/wpt/tests/css/CSS2/values/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/values/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/values/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/values/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/values/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/values/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/swatch-red.png b/tests/wpt/tests/css/CSS2/values/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/values/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/swatch-white.png b/tests/wpt/tests/css/CSS2/values/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/values/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/values/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/values/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/test-bl.png b/tests/wpt/tests/css/CSS2/values/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/test-bl.png rename to tests/wpt/tests/css/CSS2/values/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/test-br.png b/tests/wpt/tests/css/CSS2/values/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/test-br.png rename to tests/wpt/tests/css/CSS2/values/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/test-outer.png b/tests/wpt/tests/css/CSS2/values/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/test-outer.png rename to tests/wpt/tests/css/CSS2/values/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/test-tl.png b/tests/wpt/tests/css/CSS2/values/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/test-tl.png rename to tests/wpt/tests/css/CSS2/values/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/support/test-tr.png b/tests/wpt/tests/css/CSS2/values/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/support/test-tr.png rename to tests/wpt/tests/css/CSS2/values/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/units-001-ref.xht b/tests/wpt/tests/css/CSS2/values/units-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/units-001-ref.xht rename to tests/wpt/tests/css/CSS2/values/units-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/units-001.xht b/tests/wpt/tests/css/CSS2/values/units-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/units-001.xht rename to tests/wpt/tests/css/CSS2/values/units-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/units-002-ref.xht b/tests/wpt/tests/css/CSS2/values/units-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/units-002-ref.xht rename to tests/wpt/tests/css/CSS2/values/units-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/units-002.xht b/tests/wpt/tests/css/CSS2/values/units-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/units-002.xht rename to tests/wpt/tests/css/CSS2/values/units-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/units-003-ref.xht b/tests/wpt/tests/css/CSS2/values/units-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/units-003-ref.xht rename to tests/wpt/tests/css/CSS2/values/units-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/units-003.xht b/tests/wpt/tests/css/CSS2/values/units-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/units-003.xht rename to tests/wpt/tests/css/CSS2/values/units-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/units-004-ref.xht b/tests/wpt/tests/css/CSS2/values/units-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/units-004-ref.xht rename to tests/wpt/tests/css/CSS2/values/units-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/units-004.xht b/tests/wpt/tests/css/CSS2/values/units-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/units-004.xht rename to tests/wpt/tests/css/CSS2/values/units-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/units-005-ref.xht b/tests/wpt/tests/css/CSS2/values/units-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/units-005-ref.xht rename to tests/wpt/tests/css/CSS2/values/units-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/units-005.xht b/tests/wpt/tests/css/CSS2/values/units-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/units-005.xht rename to tests/wpt/tests/css/CSS2/values/units-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/units-006-ref.xht b/tests/wpt/tests/css/CSS2/values/units-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/units-006-ref.xht rename to tests/wpt/tests/css/CSS2/values/units-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/units-006.xht b/tests/wpt/tests/css/CSS2/values/units-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/units-006.xht rename to tests/wpt/tests/css/CSS2/values/units-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/units-008.xht b/tests/wpt/tests/css/CSS2/values/units-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/units-008.xht rename to tests/wpt/tests/css/CSS2/values/units-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/values/units-009.xht b/tests/wpt/tests/css/CSS2/values/units-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/values/units-009.xht rename to tests/wpt/tests/css/CSS2/values/units-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/content-height-001.html b/tests/wpt/tests/css/CSS2/visudet/content-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/content-height-001.html rename to tests/wpt/tests/css/CSS2/visudet/content-height-001.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/content-height-002.html b/tests/wpt/tests/css/CSS2/visudet/content-height-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/content-height-002.html rename to tests/wpt/tests/css/CSS2/visudet/content-height-002.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/content-height-003.html b/tests/wpt/tests/css/CSS2/visudet/content-height-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/content-height-003.html rename to tests/wpt/tests/css/CSS2/visudet/content-height-003.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/content-height-004.html b/tests/wpt/tests/css/CSS2/visudet/content-height-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/content-height-004.html rename to tests/wpt/tests/css/CSS2/visudet/content-height-004.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/content-height-005.html b/tests/wpt/tests/css/CSS2/visudet/content-height-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/content-height-005.html rename to tests/wpt/tests/css/CSS2/visudet/content-height-005.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/height-applies-to-010a-ref.xht b/tests/wpt/tests/css/CSS2/visudet/height-applies-to-010a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/height-applies-to-010a-ref.xht rename to tests/wpt/tests/css/CSS2/visudet/height-applies-to-010a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/height-applies-to-010a.xht b/tests/wpt/tests/css/CSS2/visudet/height-applies-to-010a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/height-applies-to-010a.xht rename to tests/wpt/tests/css/CSS2/visudet/height-applies-to-010a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/height-computed-001-ref.xht b/tests/wpt/tests/css/CSS2/visudet/height-computed-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/height-computed-001-ref.xht rename to tests/wpt/tests/css/CSS2/visudet/height-computed-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/height-computed-001.xht b/tests/wpt/tests/css/CSS2/visudet/height-computed-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/height-computed-001.xht rename to tests/wpt/tests/css/CSS2/visudet/height-computed-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/height-computed-002-ref.xht b/tests/wpt/tests/css/CSS2/visudet/height-computed-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/height-computed-002-ref.xht rename to tests/wpt/tests/css/CSS2/visudet/height-computed-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/height-computed-002.xht b/tests/wpt/tests/css/CSS2/visudet/height-computed-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/height-computed-002.xht rename to tests/wpt/tests/css/CSS2/visudet/height-computed-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/height-percentage-003a-ref.xht b/tests/wpt/tests/css/CSS2/visudet/height-percentage-003a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/height-percentage-003a-ref.xht rename to tests/wpt/tests/css/CSS2/visudet/height-percentage-003a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/height-percentage-003a.xht b/tests/wpt/tests/css/CSS2/visudet/height-percentage-003a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/height-percentage-003a.xht rename to tests/wpt/tests/css/CSS2/visudet/height-percentage-003a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/height-percentage-004-ref.xht b/tests/wpt/tests/css/CSS2/visudet/height-percentage-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/height-percentage-004-ref.xht rename to tests/wpt/tests/css/CSS2/visudet/height-percentage-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/height-percentage-004.xht b/tests/wpt/tests/css/CSS2/visudet/height-percentage-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/height-percentage-004.xht rename to tests/wpt/tests/css/CSS2/visudet/height-percentage-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-001-ref.xht b/tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-001-ref.xht rename to tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-001.xht b/tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-001.xht rename to tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-002.xht b/tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-002.xht rename to tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-003.xht b/tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-003.xht rename to tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-004.xht b/tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-004.xht rename to tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-005.xht b/tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-005.xht rename to tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-006.xht b/tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-006.xht rename to tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-010-ref.xht b/tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-010-ref.xht rename to tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-010.xht b/tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-010.xht rename to tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-011.xht b/tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-011.xht rename to tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-012.xht b/tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-012.xht rename to tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-013.xht b/tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-013.xht rename to tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-014.xht b/tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-014.xht rename to tests/wpt/tests/css/CSS2/visudet/inline-block-baseline-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/line-height-201.html b/tests/wpt/tests/css/CSS2/visudet/line-height-201.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/line-height-201.html rename to tests/wpt/tests/css/CSS2/visudet/line-height-201.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/line-height-202.html b/tests/wpt/tests/css/CSS2/visudet/line-height-202.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/line-height-202.html rename to tests/wpt/tests/css/CSS2/visudet/line-height-202.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/line-height-203.html b/tests/wpt/tests/css/CSS2/visudet/line-height-203.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/line-height-203.html rename to tests/wpt/tests/css/CSS2/visudet/line-height-203.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/line-height-204.html b/tests/wpt/tests/css/CSS2/visudet/line-height-204.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/line-height-204.html rename to tests/wpt/tests/css/CSS2/visudet/line-height-204.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/line-height-205.html b/tests/wpt/tests/css/CSS2/visudet/line-height-205.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/line-height-205.html rename to tests/wpt/tests/css/CSS2/visudet/line-height-205.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/line-height-206.html b/tests/wpt/tests/css/CSS2/visudet/line-height-206.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/line-height-206.html rename to tests/wpt/tests/css/CSS2/visudet/line-height-206.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/max-width-109.xht b/tests/wpt/tests/css/CSS2/visudet/max-width-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/max-width-109.xht rename to tests/wpt/tests/css/CSS2/visudet/max-width-109.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/reference/content-height-001-ref.html b/tests/wpt/tests/css/CSS2/visudet/reference/content-height-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/reference/content-height-001-ref.html rename to tests/wpt/tests/css/CSS2/visudet/reference/content-height-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/reference/content-height-002-ref.html b/tests/wpt/tests/css/CSS2/visudet/reference/content-height-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/reference/content-height-002-ref.html rename to tests/wpt/tests/css/CSS2/visudet/reference/content-height-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/reference/content-height-003-ref.html b/tests/wpt/tests/css/CSS2/visudet/reference/content-height-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/reference/content-height-003-ref.html rename to tests/wpt/tests/css/CSS2/visudet/reference/content-height-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/reference/content-height-004-ref.html b/tests/wpt/tests/css/CSS2/visudet/reference/content-height-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/reference/content-height-004-ref.html rename to tests/wpt/tests/css/CSS2/visudet/reference/content-height-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/reference/content-height-005-ref.html b/tests/wpt/tests/css/CSS2/visudet/reference/content-height-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/reference/content-height-005-ref.html rename to tests/wpt/tests/css/CSS2/visudet/reference/content-height-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/reference/line-height-201-ref.html b/tests/wpt/tests/css/CSS2/visudet/reference/line-height-201-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/reference/line-height-201-ref.html rename to tests/wpt/tests/css/CSS2/visudet/reference/line-height-201-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/reference/line-height-202-ref.html b/tests/wpt/tests/css/CSS2/visudet/reference/line-height-202-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/reference/line-height-202-ref.html rename to tests/wpt/tests/css/CSS2/visudet/reference/line-height-202-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/reference/line-height-203-ref.html b/tests/wpt/tests/css/CSS2/visudet/reference/line-height-203-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/reference/line-height-203-ref.html rename to tests/wpt/tests/css/CSS2/visudet/reference/line-height-203-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/reference/line-height-206-ref.html b/tests/wpt/tests/css/CSS2/visudet/reference/line-height-206-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/reference/line-height-206-ref.html rename to tests/wpt/tests/css/CSS2/visudet/reference/line-height-206-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-all-auto-ref.html b/tests/wpt/tests/css/CSS2/visudet/replaced-elements-all-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-all-auto-ref.html rename to tests/wpt/tests/css/CSS2/visudet/replaced-elements-all-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-all-auto.html b/tests/wpt/tests/css/CSS2/visudet/replaced-elements-all-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-all-auto.html rename to tests/wpt/tests/css/CSS2/visudet/replaced-elements-all-auto.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-height-20-ref.html b/tests/wpt/tests/css/CSS2/visudet/replaced-elements-height-20-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-height-20-ref.html rename to tests/wpt/tests/css/CSS2/visudet/replaced-elements-height-20-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-height-20.html b/tests/wpt/tests/css/CSS2/visudet/replaced-elements-height-20.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-height-20.html rename to tests/wpt/tests/css/CSS2/visudet/replaced-elements-height-20.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-max-height-20.html b/tests/wpt/tests/css/CSS2/visudet/replaced-elements-max-height-20.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-max-height-20.html rename to tests/wpt/tests/css/CSS2/visudet/replaced-elements-max-height-20.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-max-width-40.html b/tests/wpt/tests/css/CSS2/visudet/replaced-elements-max-width-40.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-max-width-40.html rename to tests/wpt/tests/css/CSS2/visudet/replaced-elements-max-width-40.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-height-20.html b/tests/wpt/tests/css/CSS2/visudet/replaced-elements-min-height-20.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-height-20.html rename to tests/wpt/tests/css/CSS2/visudet/replaced-elements-min-height-20.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-height-40-ref.html b/tests/wpt/tests/css/CSS2/visudet/replaced-elements-min-height-40-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-height-40-ref.html rename to tests/wpt/tests/css/CSS2/visudet/replaced-elements-min-height-40-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-height-40.html b/tests/wpt/tests/css/CSS2/visudet/replaced-elements-min-height-40.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-height-40.html rename to tests/wpt/tests/css/CSS2/visudet/replaced-elements-min-height-40.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-width-40.html b/tests/wpt/tests/css/CSS2/visudet/replaced-elements-min-width-40.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-width-40.html rename to tests/wpt/tests/css/CSS2/visudet/replaced-elements-min-width-40.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-width-80-ref.html b/tests/wpt/tests/css/CSS2/visudet/replaced-elements-min-width-80-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-width-80-ref.html rename to tests/wpt/tests/css/CSS2/visudet/replaced-elements-min-width-80-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-width-80.html b/tests/wpt/tests/css/CSS2/visudet/replaced-elements-min-width-80.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-width-80.html rename to tests/wpt/tests/css/CSS2/visudet/replaced-elements-min-width-80.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-width-40-ref.html b/tests/wpt/tests/css/CSS2/visudet/replaced-elements-width-40-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-width-40-ref.html rename to tests/wpt/tests/css/CSS2/visudet/replaced-elements-width-40-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-width-40.html b/tests/wpt/tests/css/CSS2/visudet/replaced-elements-width-40.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-width-40.html rename to tests/wpt/tests/css/CSS2/visudet/replaced-elements-width-40.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/support/1x1-green.png b/tests/wpt/tests/css/CSS2/visudet/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/visudet/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/support/height-25-no-ratio.svg b/tests/wpt/tests/css/CSS2/visudet/support/height-25-no-ratio.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/support/height-25-no-ratio.svg rename to tests/wpt/tests/css/CSS2/visudet/support/height-25-no-ratio.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/support/height-25-ratio-2.svg b/tests/wpt/tests/css/CSS2/visudet/support/height-25-ratio-2.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/support/height-25-ratio-2.svg rename to tests/wpt/tests/css/CSS2/visudet/support/height-25-ratio-2.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/support/height-25-width-50.svg b/tests/wpt/tests/css/CSS2/visudet/support/height-25-width-50.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/support/height-25-width-50.svg rename to tests/wpt/tests/css/CSS2/visudet/support/height-25-width-50.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/support/no-ratio.svg b/tests/wpt/tests/css/CSS2/visudet/support/no-ratio.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/support/no-ratio.svg rename to tests/wpt/tests/css/CSS2/visudet/support/no-ratio.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/support/ratio-2.svg b/tests/wpt/tests/css/CSS2/visudet/support/ratio-2.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/support/ratio-2.svg rename to tests/wpt/tests/css/CSS2/visudet/support/ratio-2.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/visudet/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/visudet/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/support/width-50-no-ratio.svg b/tests/wpt/tests/css/CSS2/visudet/support/width-50-no-ratio.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/support/width-50-no-ratio.svg rename to tests/wpt/tests/css/CSS2/visudet/support/width-50-no-ratio.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/support/width-50-ratio-2.svg b/tests/wpt/tests/css/CSS2/visudet/support/width-50-ratio-2.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visudet/support/width-50-ratio-2.svg rename to tests/wpt/tests/css/CSS2/visudet/support/width-50-ratio-2.svg diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/animation/visibility-interpolation.html b/tests/wpt/tests/css/CSS2/visufx/animation/visibility-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/animation/visibility-interpolation.html rename to tests/wpt/tests/css/CSS2/visufx/animation/visibility-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-001.xht b/tests/wpt/tests/css/CSS2/visufx/clip-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-001.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-004.xht b/tests/wpt/tests/css/CSS2/visufx/clip-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-004.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-005.xht b/tests/wpt/tests/css/CSS2/visufx/clip-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-005.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-006.xht b/tests/wpt/tests/css/CSS2/visufx/clip-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-006.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-007.xht b/tests/wpt/tests/css/CSS2/visufx/clip-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-007.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-008.xht b/tests/wpt/tests/css/CSS2/visufx/clip-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-008.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-016.xht b/tests/wpt/tests/css/CSS2/visufx/clip-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-016.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-017.xht b/tests/wpt/tests/css/CSS2/visufx/clip-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-017.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-018.xht b/tests/wpt/tests/css/CSS2/visufx/clip-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-018.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-019.xht b/tests/wpt/tests/css/CSS2/visufx/clip-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-019.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-020.xht b/tests/wpt/tests/css/CSS2/visufx/clip-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-020.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-020.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-028.xht b/tests/wpt/tests/css/CSS2/visufx/clip-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-028.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-028.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-029.xht b/tests/wpt/tests/css/CSS2/visufx/clip-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-029.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-029.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-030.xht b/tests/wpt/tests/css/CSS2/visufx/clip-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-030.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-030.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-031.xht b/tests/wpt/tests/css/CSS2/visufx/clip-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-031.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-031.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-032.xht b/tests/wpt/tests/css/CSS2/visufx/clip-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-032.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-032.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-040.xht b/tests/wpt/tests/css/CSS2/visufx/clip-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-040.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-040.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-041.xht b/tests/wpt/tests/css/CSS2/visufx/clip-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-041.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-041.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-042.xht b/tests/wpt/tests/css/CSS2/visufx/clip-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-042.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-042.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-043.xht b/tests/wpt/tests/css/CSS2/visufx/clip-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-043.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-043.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-044.xht b/tests/wpt/tests/css/CSS2/visufx/clip-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-044.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-044.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-052.xht b/tests/wpt/tests/css/CSS2/visufx/clip-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-052.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-052.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-053.xht b/tests/wpt/tests/css/CSS2/visufx/clip-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-053.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-053.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-054.xht b/tests/wpt/tests/css/CSS2/visufx/clip-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-054.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-054.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-055.xht b/tests/wpt/tests/css/CSS2/visufx/clip-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-055.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-055.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-056.xht b/tests/wpt/tests/css/CSS2/visufx/clip-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-056.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-056.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-064.xht b/tests/wpt/tests/css/CSS2/visufx/clip-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-064.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-064.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-065.xht b/tests/wpt/tests/css/CSS2/visufx/clip-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-065.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-065.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-066.xht b/tests/wpt/tests/css/CSS2/visufx/clip-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-066.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-066.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-067.xht b/tests/wpt/tests/css/CSS2/visufx/clip-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-067.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-067.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-068.xht b/tests/wpt/tests/css/CSS2/visufx/clip-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-068.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-068.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-076.xht b/tests/wpt/tests/css/CSS2/visufx/clip-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-076.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-076.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-077.xht b/tests/wpt/tests/css/CSS2/visufx/clip-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-077.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-077.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-078.xht b/tests/wpt/tests/css/CSS2/visufx/clip-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-078.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-078.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-079.xht b/tests/wpt/tests/css/CSS2/visufx/clip-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-079.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-079.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-080.xht b/tests/wpt/tests/css/CSS2/visufx/clip-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-080.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-080.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-088.xht b/tests/wpt/tests/css/CSS2/visufx/clip-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-088.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-088.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-089.xht b/tests/wpt/tests/css/CSS2/visufx/clip-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-089.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-089.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-090.xht b/tests/wpt/tests/css/CSS2/visufx/clip-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-090.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-090.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-091.xht b/tests/wpt/tests/css/CSS2/visufx/clip-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-091.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-091.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-092.xht b/tests/wpt/tests/css/CSS2/visufx/clip-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-092.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-092.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-097.xht b/tests/wpt/tests/css/CSS2/visufx/clip-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-097.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-097.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-098.xht b/tests/wpt/tests/css/CSS2/visufx/clip-098.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-098.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-098.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-099.xht b/tests/wpt/tests/css/CSS2/visufx/clip-099.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-099.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-099.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-100.xht b/tests/wpt/tests/css/CSS2/visufx/clip-100.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-100.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-100.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-101.xht b/tests/wpt/tests/css/CSS2/visufx/clip-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-101.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-101.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-102.xht b/tests/wpt/tests/css/CSS2/visufx/clip-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-102.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-102.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-inherit-001.xht b/tests/wpt/tests/css/CSS2/visufx/clip-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-inherit-001.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-non-absolute-001.xht b/tests/wpt/tests/css/CSS2/visufx/clip-non-absolute-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-non-absolute-001.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-non-absolute-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-rect-001.xht b/tests/wpt/tests/css/CSS2/visufx/clip-rect-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-rect-001.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-rect-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clip-shape-001.xht b/tests/wpt/tests/css/CSS2/visufx/clip-shape-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clip-shape-001.xht rename to tests/wpt/tests/css/CSS2/visufx/clip-shape-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-001.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-001.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-002.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-002.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-003.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-003.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-004.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-004.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-005.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-005.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-006.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-006.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-007.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-007.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-008.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-008.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-009.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-009.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-010.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-010.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-011.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-011.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-012.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-012.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-013.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-013.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-014.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-014.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-015.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-015.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-016.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-016.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-017.xht b/tests/wpt/tests/css/CSS2/visufx/clipping-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-017.xht rename to tests/wpt/tests/css/CSS2/visufx/clipping-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-README b/tests/wpt/tests/css/CSS2/visufx/clipping-README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/clipping-README rename to tests/wpt/tests/css/CSS2/visufx/clipping-README diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-006.xht b/tests/wpt/tests/css/CSS2/visufx/overflow-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-006.xht rename to tests/wpt/tests/css/CSS2/visufx/overflow-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-007.xht b/tests/wpt/tests/css/CSS2/visufx/overflow-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-007.xht rename to tests/wpt/tests/css/CSS2/visufx/overflow-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-008.xht b/tests/wpt/tests/css/CSS2/visufx/overflow-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-008.xht rename to tests/wpt/tests/css/CSS2/visufx/overflow-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-009.html b/tests/wpt/tests/css/CSS2/visufx/overflow-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-009.html rename to tests/wpt/tests/css/CSS2/visufx/overflow-009.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-applies-to-001-ref.xht b/tests/wpt/tests/css/CSS2/visufx/overflow-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-applies-to-001-ref.xht rename to tests/wpt/tests/css/CSS2/visufx/overflow-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-applies-to-001.xht b/tests/wpt/tests/css/CSS2/visufx/overflow-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/visufx/overflow-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-propagation-001a.html b/tests/wpt/tests/css/CSS2/visufx/overflow-propagation-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-propagation-001a.html rename to tests/wpt/tests/css/CSS2/visufx/overflow-propagation-001a.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-propagation-001b.html b/tests/wpt/tests/css/CSS2/visufx/overflow-propagation-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-propagation-001b.html rename to tests/wpt/tests/css/CSS2/visufx/overflow-propagation-001b.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-propagation-001c.html b/tests/wpt/tests/css/CSS2/visufx/overflow-propagation-001c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-propagation-001c.html rename to tests/wpt/tests/css/CSS2/visufx/overflow-propagation-001c.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/shape-spaces-001.xht b/tests/wpt/tests/css/CSS2/visufx/shape-spaces-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/shape-spaces-001.xht rename to tests/wpt/tests/css/CSS2/visufx/shape-spaces-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/support/1x1-green.png b/tests/wpt/tests/css/CSS2/visufx/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/visufx/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/visufx/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/visufx/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/support/overflow-propagation-001-ref.html b/tests/wpt/tests/css/CSS2/visufx/support/overflow-propagation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/support/overflow-propagation-001-ref.html rename to tests/wpt/tests/css/CSS2/visufx/support/overflow-propagation-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-001.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-001.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-002.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-002.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-003.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-003.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-004.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-004.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-005.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-005.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-001.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-002.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-003.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-004.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-005.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-006.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-007.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-008.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-009.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-010.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-012.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-013.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-014.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-015.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-block-001.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-block-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-block-001.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-block-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-collapse-001.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-collapse-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-collapse-001.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-collapse-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-descendants-001.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-descendants-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-descendants-001.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-descendants-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-layout-001.xht b/tests/wpt/tests/css/CSS2/visufx/visibility-layout-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visufx/visibility-layout-001.xht rename to tests/wpt/tests/css/CSS2/visufx/visibility-layout-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/anonymous-boxes-001a-ref.xht b/tests/wpt/tests/css/CSS2/visuren/anonymous-boxes-001a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/anonymous-boxes-001a-ref.xht rename to tests/wpt/tests/css/CSS2/visuren/anonymous-boxes-001a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/anonymous-boxes-001a.xht b/tests/wpt/tests/css/CSS2/visuren/anonymous-boxes-001a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/anonymous-boxes-001a.xht rename to tests/wpt/tests/css/CSS2/visuren/anonymous-boxes-001a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/anonymous-boxes-001b-ref.xht b/tests/wpt/tests/css/CSS2/visuren/anonymous-boxes-001b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/anonymous-boxes-001b-ref.xht rename to tests/wpt/tests/css/CSS2/visuren/anonymous-boxes-001b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/anonymous-boxes-001b.xht b/tests/wpt/tests/css/CSS2/visuren/anonymous-boxes-001b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/anonymous-boxes-001b.xht rename to tests/wpt/tests/css/CSS2/visuren/anonymous-boxes-001b.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-direction-001.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-direction-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-direction-001.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-direction-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-direction-002.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-direction-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-direction-002.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-direction-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-display-block-001.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-display-block-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-display-block-001.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-display-block-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-list-001.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-list-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-list-001.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-list-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-list-002.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-list-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-list-002.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-list-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-list-003.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-list-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-list-003.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-list-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-list-004.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-list-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-list-004.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-list-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-list-005.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-list-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-list-005.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-list-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-list-006.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-list-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-list-006.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-list-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-list-007.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-list-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-list-007.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-list-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-override-001.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-override-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-override-001.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-override-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-override-002.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-override-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-override-002.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-override-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-override-003.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-override-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-override-003.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-override-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-override-004.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-override-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-override-004.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-override-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-override-005.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-override-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-override-005.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-override-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-position-fixed-001.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-position-fixed-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-position-fixed-001.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-position-fixed-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-table-001.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-table-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-table-001.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-table-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-table-002.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-table-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-table-002.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-table-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-unicode-bidi-001.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-unicode-bidi-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-unicode-bidi-001.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-unicode-bidi-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-unicode-bidi-003.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-unicode-bidi-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-unicode-bidi-003.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-unicode-bidi-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-unicode-bidi-004.xht b/tests/wpt/tests/css/CSS2/visuren/bidi-unicode-bidi-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/bidi-unicode-bidi-004.xht rename to tests/wpt/tests/css/CSS2/visuren/bidi-unicode-bidi-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/box-offsets-abs-pos-001.xht b/tests/wpt/tests/css/CSS2/visuren/box-offsets-abs-pos-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/box-offsets-abs-pos-001.xht rename to tests/wpt/tests/css/CSS2/visuren/box-offsets-abs-pos-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/box-offsets-rel-pos-001.xht b/tests/wpt/tests/css/CSS2/visuren/box-offsets-rel-pos-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/box-offsets-rel-pos-001.xht rename to tests/wpt/tests/css/CSS2/visuren/box-offsets-rel-pos-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/box-offsets-rel-pos-002-ref.xht b/tests/wpt/tests/css/CSS2/visuren/box-offsets-rel-pos-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/box-offsets-rel-pos-002-ref.xht rename to tests/wpt/tests/css/CSS2/visuren/box-offsets-rel-pos-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/box-offsets-rel-pos-002.xht b/tests/wpt/tests/css/CSS2/visuren/box-offsets-rel-pos-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/box-offsets-rel-pos-002.xht rename to tests/wpt/tests/css/CSS2/visuren/box-offsets-rel-pos-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/clear-applies-to-016.xht b/tests/wpt/tests/css/CSS2/visuren/clear-applies-to-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/clear-applies-to-016.xht rename to tests/wpt/tests/css/CSS2/visuren/clear-applies-to-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/clear-applies-to-017.xht b/tests/wpt/tests/css/CSS2/visuren/clear-applies-to-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/clear-applies-to-017.xht rename to tests/wpt/tests/css/CSS2/visuren/clear-applies-to-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-1-ref.html b/tests/wpt/tests/css/CSS2/visuren/emptyspan-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-1-ref.html rename to tests/wpt/tests/css/CSS2/visuren/emptyspan-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-1.html b/tests/wpt/tests/css/CSS2/visuren/emptyspan-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-1.html rename to tests/wpt/tests/css/CSS2/visuren/emptyspan-1.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-2-ref.html b/tests/wpt/tests/css/CSS2/visuren/emptyspan-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-2-ref.html rename to tests/wpt/tests/css/CSS2/visuren/emptyspan-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-2.html b/tests/wpt/tests/css/CSS2/visuren/emptyspan-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-2.html rename to tests/wpt/tests/css/CSS2/visuren/emptyspan-2.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-3-ref.html b/tests/wpt/tests/css/CSS2/visuren/emptyspan-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-3-ref.html rename to tests/wpt/tests/css/CSS2/visuren/emptyspan-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-3.html b/tests/wpt/tests/css/CSS2/visuren/emptyspan-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-3.html rename to tests/wpt/tests/css/CSS2/visuren/emptyspan-3.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-4-ref.html b/tests/wpt/tests/css/CSS2/visuren/emptyspan-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-4-ref.html rename to tests/wpt/tests/css/CSS2/visuren/emptyspan-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-4.html b/tests/wpt/tests/css/CSS2/visuren/emptyspan-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/emptyspan-4.html rename to tests/wpt/tests/css/CSS2/visuren/emptyspan-4.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/fixed-pos-stacking-001-ref.xht b/tests/wpt/tests/css/CSS2/visuren/fixed-pos-stacking-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/fixed-pos-stacking-001-ref.xht rename to tests/wpt/tests/css/CSS2/visuren/fixed-pos-stacking-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/fixed-pos-stacking-001.xht b/tests/wpt/tests/css/CSS2/visuren/fixed-pos-stacking-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/fixed-pos-stacking-001.xht rename to tests/wpt/tests/css/CSS2/visuren/fixed-pos-stacking-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/float-inside-inline-between-blocks-1-ref.html b/tests/wpt/tests/css/CSS2/visuren/float-inside-inline-between-blocks-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/float-inside-inline-between-blocks-1-ref.html rename to tests/wpt/tests/css/CSS2/visuren/float-inside-inline-between-blocks-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/float-inside-inline-between-blocks-1.html b/tests/wpt/tests/css/CSS2/visuren/float-inside-inline-between-blocks-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/float-inside-inline-between-blocks-1.html rename to tests/wpt/tests/css/CSS2/visuren/float-inside-inline-between-blocks-1.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/inherit-static-offset-001.xht b/tests/wpt/tests/css/CSS2/visuren/inherit-static-offset-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/inherit-static-offset-001.xht rename to tests/wpt/tests/css/CSS2/visuren/inherit-static-offset-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/inherit-static-offset-002.xht b/tests/wpt/tests/css/CSS2/visuren/inherit-static-offset-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/inherit-static-offset-002.xht rename to tests/wpt/tests/css/CSS2/visuren/inherit-static-offset-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/inherit-static-offset-003.xht b/tests/wpt/tests/css/CSS2/visuren/inherit-static-offset-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/inherit-static-offset-003.xht rename to tests/wpt/tests/css/CSS2/visuren/inherit-static-offset-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/inline-formatting-context-001-ref.xht b/tests/wpt/tests/css/CSS2/visuren/inline-formatting-context-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/inline-formatting-context-001-ref.xht rename to tests/wpt/tests/css/CSS2/visuren/inline-formatting-context-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/inline-formatting-context-001.xht b/tests/wpt/tests/css/CSS2/visuren/inline-formatting-context-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/inline-formatting-context-001.xht rename to tests/wpt/tests/css/CSS2/visuren/inline-formatting-context-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/left-offset-position-fixed-001-ref.xht b/tests/wpt/tests/css/CSS2/visuren/left-offset-position-fixed-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/left-offset-position-fixed-001-ref.xht rename to tests/wpt/tests/css/CSS2/visuren/left-offset-position-fixed-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/left-offset-position-fixed-001.xht b/tests/wpt/tests/css/CSS2/visuren/left-offset-position-fixed-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/left-offset-position-fixed-001.xht rename to tests/wpt/tests/css/CSS2/visuren/left-offset-position-fixed-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/percent-height-1-ref.html b/tests/wpt/tests/css/CSS2/visuren/percent-height-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/percent-height-1-ref.html rename to tests/wpt/tests/css/CSS2/visuren/percent-height-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/percent-height-1.html b/tests/wpt/tests/css/CSS2/visuren/percent-height-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/percent-height-1.html rename to tests/wpt/tests/css/CSS2/visuren/percent-height-1.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/position-absolute-008a.xht b/tests/wpt/tests/css/CSS2/visuren/position-absolute-008a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/position-absolute-008a.xht rename to tests/wpt/tests/css/CSS2/visuren/position-absolute-008a.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/position-absolute-percentage-inherit-001-ref.xht b/tests/wpt/tests/css/CSS2/visuren/position-absolute-percentage-inherit-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/position-absolute-percentage-inherit-001-ref.xht rename to tests/wpt/tests/css/CSS2/visuren/position-absolute-percentage-inherit-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/position-absolute-percentage-inherit-001.xht b/tests/wpt/tests/css/CSS2/visuren/position-absolute-percentage-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/position-absolute-percentage-inherit-001.xht rename to tests/wpt/tests/css/CSS2/visuren/position-absolute-percentage-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-1-noib-ref.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-1-noib-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-1-noib-ref.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-1-noib-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-1-ref.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-1-ref.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-1.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-1.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-1.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-2-ref.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-2-ref.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-2.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-2.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-2.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-3-noib-ref.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-3-noib-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-3-noib-ref.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-3-noib-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-3-ref.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-3-ref.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-3.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-3.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-3.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-4-noib-ref.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-4-noib-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-4-noib-ref.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-4-noib-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-4-ref.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-4-ref.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-4.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-4.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-4.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-5-noib-ref.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-5-noib-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-5-noib-ref.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-5-noib-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-5-ref.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-5-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-5-ref.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-5-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-5.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-5.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-5.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-6-noib-ref.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-6-noib-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-6-noib-ref.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-6-noib-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-6-ref.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-6-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-6-ref.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-6-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-6.html b/tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-6.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-from-split-inline-6.html rename to tests/wpt/tests/css/CSS2/visuren/remove-from-split-inline-6.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-split-inline-1-ref.html b/tests/wpt/tests/css/CSS2/visuren/remove-split-inline-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-split-inline-1-ref.html rename to tests/wpt/tests/css/CSS2/visuren/remove-split-inline-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/remove-split-inline-1.html b/tests/wpt/tests/css/CSS2/visuren/remove-split-inline-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/remove-split-inline-1.html rename to tests/wpt/tests/css/CSS2/visuren/remove-split-inline-1.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/right-offset-position-fixed-001-ref.xht b/tests/wpt/tests/css/CSS2/visuren/right-offset-position-fixed-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/right-offset-position-fixed-001-ref.xht rename to tests/wpt/tests/css/CSS2/visuren/right-offset-position-fixed-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/right-offset-position-fixed-001.xht b/tests/wpt/tests/css/CSS2/visuren/right-offset-position-fixed-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/right-offset-position-fixed-001.xht rename to tests/wpt/tests/css/CSS2/visuren/right-offset-position-fixed-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/split-inner-inline-1-ref.html b/tests/wpt/tests/css/CSS2/visuren/split-inner-inline-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/split-inner-inline-1-ref.html rename to tests/wpt/tests/css/CSS2/visuren/split-inner-inline-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/split-inner-inline-1.html b/tests/wpt/tests/css/CSS2/visuren/split-inner-inline-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/split-inner-inline-1.html rename to tests/wpt/tests/css/CSS2/visuren/split-inner-inline-1.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/split-inner-inline-2-ref.html b/tests/wpt/tests/css/CSS2/visuren/split-inner-inline-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/split-inner-inline-2-ref.html rename to tests/wpt/tests/css/CSS2/visuren/split-inner-inline-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/split-inner-inline-2.html b/tests/wpt/tests/css/CSS2/visuren/split-inner-inline-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/split-inner-inline-2.html rename to tests/wpt/tests/css/CSS2/visuren/split-inner-inline-2.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/support/100x100-lime.png b/tests/wpt/tests/css/CSS2/visuren/support/100x100-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/support/100x100-lime.png rename to tests/wpt/tests/css/CSS2/visuren/support/100x100-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/support/100x100-red.png b/tests/wpt/tests/css/CSS2/visuren/support/100x100-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/support/100x100-red.png rename to tests/wpt/tests/css/CSS2/visuren/support/100x100-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/support/1x1-green.png b/tests/wpt/tests/css/CSS2/visuren/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/visuren/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/support/green_box.png b/tests/wpt/tests/css/CSS2/visuren/support/green_box.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/support/green_box.png rename to tests/wpt/tests/css/CSS2/visuren/support/green_box.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/support/pattern-gg-gr-100x100.png b/tests/wpt/tests/css/CSS2/visuren/support/pattern-gg-gr-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/support/pattern-gg-gr-100x100.png rename to tests/wpt/tests/css/CSS2/visuren/support/pattern-gg-gr-100x100.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/table-pseudo-in-part3-1-ref.html b/tests/wpt/tests/css/CSS2/visuren/table-pseudo-in-part3-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/table-pseudo-in-part3-1-ref.html rename to tests/wpt/tests/css/CSS2/visuren/table-pseudo-in-part3-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/table-pseudo-in-part3-1.html b/tests/wpt/tests/css/CSS2/visuren/table-pseudo-in-part3-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/table-pseudo-in-part3-1.html rename to tests/wpt/tests/css/CSS2/visuren/table-pseudo-in-part3-1.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/top-114-ref.xht b/tests/wpt/tests/css/CSS2/visuren/top-114-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/top-114-ref.xht rename to tests/wpt/tests/css/CSS2/visuren/top-114-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/top-114.xht b/tests/wpt/tests/css/CSS2/visuren/top-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/top-114.xht rename to tests/wpt/tests/css/CSS2/visuren/top-114.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/top-115-ref.xht b/tests/wpt/tests/css/CSS2/visuren/top-115-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/top-115-ref.xht rename to tests/wpt/tests/css/CSS2/visuren/top-115-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/top-115.xht b/tests/wpt/tests/css/CSS2/visuren/top-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/top-115.xht rename to tests/wpt/tests/css/CSS2/visuren/top-115.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/whitespace-present-1-ref.html b/tests/wpt/tests/css/CSS2/visuren/whitespace-present-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/whitespace-present-1-ref.html rename to tests/wpt/tests/css/CSS2/visuren/whitespace-present-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/whitespace-present-1a.html b/tests/wpt/tests/css/CSS2/visuren/whitespace-present-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/whitespace-present-1a.html rename to tests/wpt/tests/css/CSS2/visuren/whitespace-present-1a.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/whitespace-present-1b.html b/tests/wpt/tests/css/CSS2/visuren/whitespace-present-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/visuren/whitespace-present-1b.html rename to tests/wpt/tests/css/CSS2/visuren/whitespace-present-1b.html diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/stack-floats-001-ref.xht b/tests/wpt/tests/css/CSS2/zindex/stack-floats-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/stack-floats-001-ref.xht rename to tests/wpt/tests/css/CSS2/zindex/stack-floats-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/stack-floats-001.xht b/tests/wpt/tests/css/CSS2/zindex/stack-floats-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/stack-floats-001.xht rename to tests/wpt/tests/css/CSS2/zindex/stack-floats-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/stack-floats-002.xht b/tests/wpt/tests/css/CSS2/zindex/stack-floats-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/stack-floats-002.xht rename to tests/wpt/tests/css/CSS2/zindex/stack-floats-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/stack-floats-003.xht b/tests/wpt/tests/css/CSS2/zindex/stack-floats-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/stack-floats-003.xht rename to tests/wpt/tests/css/CSS2/zindex/stack-floats-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/stack-floats-004.xht b/tests/wpt/tests/css/CSS2/zindex/stack-floats-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/stack-floats-004.xht rename to tests/wpt/tests/css/CSS2/zindex/stack-floats-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/stack-floats-README b/tests/wpt/tests/css/CSS2/zindex/stack-floats-README similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/stack-floats-README rename to tests/wpt/tests/css/CSS2/zindex/stack-floats-README diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/stack-overflow-001.xht b/tests/wpt/tests/css/CSS2/zindex/stack-overflow-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/stack-overflow-001.xht rename to tests/wpt/tests/css/CSS2/zindex/stack-overflow-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/1x1-green.png b/tests/wpt/tests/css/CSS2/zindex/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/1x1-green.png rename to tests/wpt/tests/css/CSS2/zindex/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/1x1-lime.png b/tests/wpt/tests/css/CSS2/zindex/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/1x1-lime.png rename to tests/wpt/tests/css/CSS2/zindex/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/1x1-maroon.png b/tests/wpt/tests/css/CSS2/zindex/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/1x1-maroon.png rename to tests/wpt/tests/css/CSS2/zindex/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/1x1-navy.png b/tests/wpt/tests/css/CSS2/zindex/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/1x1-navy.png rename to tests/wpt/tests/css/CSS2/zindex/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/1x1-red.png b/tests/wpt/tests/css/CSS2/zindex/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/1x1-red.png rename to tests/wpt/tests/css/CSS2/zindex/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/1x1-white.png b/tests/wpt/tests/css/CSS2/zindex/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/1x1-white.png rename to tests/wpt/tests/css/CSS2/zindex/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/60x60-gg-rr.png b/tests/wpt/tests/css/CSS2/zindex/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/60x60-gg-rr.png rename to tests/wpt/tests/css/CSS2/zindex/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/60x60-green.png b/tests/wpt/tests/css/CSS2/zindex/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/60x60-green.png rename to tests/wpt/tests/css/CSS2/zindex/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/a-green.css b/tests/wpt/tests/css/CSS2/zindex/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/a-green.css rename to tests/wpt/tests/css/CSS2/zindex/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/b-green.css b/tests/wpt/tests/css/CSS2/zindex/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/b-green.css rename to tests/wpt/tests/css/CSS2/zindex/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/blue15x15.png b/tests/wpt/tests/css/CSS2/zindex/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/blue15x15.png rename to tests/wpt/tests/css/CSS2/zindex/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/c-red.css b/tests/wpt/tests/css/CSS2/zindex/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/c-red.css rename to tests/wpt/tests/css/CSS2/zindex/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/cat.png b/tests/wpt/tests/css/CSS2/zindex/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/cat.png rename to tests/wpt/tests/css/CSS2/zindex/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/diamond.png b/tests/wpt/tests/css/CSS2/zindex/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/diamond.png rename to tests/wpt/tests/css/CSS2/zindex/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/green15x15.png b/tests/wpt/tests/css/CSS2/zindex/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/green15x15.png rename to tests/wpt/tests/css/CSS2/zindex/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/CSS2/zindex/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/CSS2/zindex/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/CSS2/zindex/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/CSS2/zindex/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/CSS2/zindex/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/CSS2/zindex/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/pattern-tr.png b/tests/wpt/tests/css/CSS2/zindex/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/pattern-tr.png rename to tests/wpt/tests/css/CSS2/zindex/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/ring.png b/tests/wpt/tests/css/CSS2/zindex/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/ring.png rename to tests/wpt/tests/css/CSS2/zindex/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/square-purple.png b/tests/wpt/tests/css/CSS2/zindex/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/square-purple.png rename to tests/wpt/tests/css/CSS2/zindex/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/square-teal.png b/tests/wpt/tests/css/CSS2/zindex/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/square-teal.png rename to tests/wpt/tests/css/CSS2/zindex/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/square-white.png b/tests/wpt/tests/css/CSS2/zindex/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/square-white.png rename to tests/wpt/tests/css/CSS2/zindex/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/swatch-blue.png b/tests/wpt/tests/css/CSS2/zindex/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/swatch-blue.png rename to tests/wpt/tests/css/CSS2/zindex/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/swatch-green.png b/tests/wpt/tests/css/CSS2/zindex/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/swatch-green.png rename to tests/wpt/tests/css/CSS2/zindex/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/swatch-lime.png b/tests/wpt/tests/css/CSS2/zindex/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/swatch-lime.png rename to tests/wpt/tests/css/CSS2/zindex/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/swatch-orange.png b/tests/wpt/tests/css/CSS2/zindex/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/swatch-orange.png rename to tests/wpt/tests/css/CSS2/zindex/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/swatch-red.png b/tests/wpt/tests/css/CSS2/zindex/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/swatch-red.png rename to tests/wpt/tests/css/CSS2/zindex/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/swatch-white.png b/tests/wpt/tests/css/CSS2/zindex/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/swatch-white.png rename to tests/wpt/tests/css/CSS2/zindex/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/swatch-yellow.png b/tests/wpt/tests/css/CSS2/zindex/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/swatch-yellow.png rename to tests/wpt/tests/css/CSS2/zindex/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/test-bl.png b/tests/wpt/tests/css/CSS2/zindex/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/test-bl.png rename to tests/wpt/tests/css/CSS2/zindex/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/test-br.png b/tests/wpt/tests/css/CSS2/zindex/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/test-br.png rename to tests/wpt/tests/css/CSS2/zindex/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/test-outer.png b/tests/wpt/tests/css/CSS2/zindex/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/test-outer.png rename to tests/wpt/tests/css/CSS2/zindex/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/test-tl.png b/tests/wpt/tests/css/CSS2/zindex/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/test-tl.png rename to tests/wpt/tests/css/CSS2/zindex/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/support/test-tr.png b/tests/wpt/tests/css/CSS2/zindex/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/support/test-tr.png rename to tests/wpt/tests/css/CSS2/zindex/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-001.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-001.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-002.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-002.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-003.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-003.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-004.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-004.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-005.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-005.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-006.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-006.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-007.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-007.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-008.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-008.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-009.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-009.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-010.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-010.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-011.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-011.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-011.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-012.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-012.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-013.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-013.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-014.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-014.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-015.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-015.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-016.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-016.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-016.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-017.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-017.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-017.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-018.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-018.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-018.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-019.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-019.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-019.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-001-ref.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-abspos-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-001-ref.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-abspos-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-001.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-abspos-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-001.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-abspos-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-002.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-abspos-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-002.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-abspos-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-003.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-abspos-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-003.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-abspos-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-004.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-abspos-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-004.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-abspos-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-005.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-abspos-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-005.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-abspos-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-006.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-abspos-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-006.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-abspos-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-007.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-abspos-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-007.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-abspos-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-008.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-abspos-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-008.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-abspos-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-009.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-abspos-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-abspos-009.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-abspos-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-001.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-001.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-002.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-002.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-003.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-003.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-004.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-004.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-005.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-005.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-005.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-006.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-006.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-006.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-007.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-007.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-007.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-008.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-008.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-008.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-009.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-009.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-009.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-010.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-010.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-010.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-012.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-012.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-012.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-013.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-013.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-013.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-014.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-014.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-014.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-015.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-applies-to-015.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-applies-to-015.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-dynamic-001.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-dynamic-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-dynamic-001.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-dynamic-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-stack-001.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-stack-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-stack-001.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-stack-001.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-stack-002.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-stack-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-stack-002.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-stack-002.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-stack-003.xht b/tests/wpt/tests/css/CSS2/zindex/z-index-stack-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zindex/z-index-stack-003.xht rename to tests/wpt/tests/css/CSS2/zindex/z-index-stack-003.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zorder/z-index-020-ref.xht b/tests/wpt/tests/css/CSS2/zorder/z-index-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zorder/z-index-020-ref.xht rename to tests/wpt/tests/css/CSS2/zorder/z-index-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zorder/z-index-020-ref2.xht b/tests/wpt/tests/css/CSS2/zorder/z-index-020-ref2.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zorder/z-index-020-ref2.xht rename to tests/wpt/tests/css/CSS2/zorder/z-index-020-ref2.xht diff --git a/tests/wpt/web-platform-tests/css/CSS2/zorder/z-index-020.xht b/tests/wpt/tests/css/CSS2/zorder/z-index-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/CSS2/zorder/z-index-020.xht rename to tests/wpt/tests/css/CSS2/zorder/z-index-020.xht diff --git a/tests/wpt/web-platform-tests/css/README.md b/tests/wpt/tests/css/README.md similarity index 100% rename from tests/wpt/web-platform-tests/css/README.md rename to tests/wpt/tests/css/README.md diff --git a/tests/wpt/web-platform-tests/css/WOFF2/META.yml b/tests/wpt/tests/css/WOFF2/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/META.yml rename to tests/wpt/tests/css/WOFF2/META.yml diff --git a/tests/wpt/web-platform-tests/css/WOFF2/available-001.xht b/tests/wpt/tests/css/WOFF2/available-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/available-001.xht rename to tests/wpt/tests/css/WOFF2/available-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/available-002.xht b/tests/wpt/tests/css/WOFF2/available-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/available-002.xht rename to tests/wpt/tests/css/WOFF2/available-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-001-ref.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-001-ref.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-001.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-001.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-002-ref.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-002-ref.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-002.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-002.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-003-ref.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-003-ref.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-003.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-003.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-004-ref.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-004-ref.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-004.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-004.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-005-ref.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-005-ref.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-005.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-005.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-005.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-006-ref.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-006-ref.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-006.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-006.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-007-ref.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-007-ref.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-007.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-007.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-007.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-008-ref.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-008-ref.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-008.xht b/tests/wpt/tests/css/WOFF2/blocks-extraneous-data-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-extraneous-data-008.xht rename to tests/wpt/tests/css/WOFF2/blocks-extraneous-data-008.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-001-ref.xht b/tests/wpt/tests/css/WOFF2/blocks-overlap-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-001-ref.xht rename to tests/wpt/tests/css/WOFF2/blocks-overlap-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-001.xht b/tests/wpt/tests/css/WOFF2/blocks-overlap-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-001.xht rename to tests/wpt/tests/css/WOFF2/blocks-overlap-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-002-ref.xht b/tests/wpt/tests/css/WOFF2/blocks-overlap-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-002-ref.xht rename to tests/wpt/tests/css/WOFF2/blocks-overlap-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-002.xht b/tests/wpt/tests/css/WOFF2/blocks-overlap-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-002.xht rename to tests/wpt/tests/css/WOFF2/blocks-overlap-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-003-ref.xht b/tests/wpt/tests/css/WOFF2/blocks-overlap-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-003-ref.xht rename to tests/wpt/tests/css/WOFF2/blocks-overlap-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-003.xht b/tests/wpt/tests/css/WOFF2/blocks-overlap-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/blocks-overlap-003.xht rename to tests/wpt/tests/css/WOFF2/blocks-overlap-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-alt-255uint16-001-ref.xht b/tests/wpt/tests/css/WOFF2/datatypes-alt-255uint16-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/datatypes-alt-255uint16-001-ref.xht rename to tests/wpt/tests/css/WOFF2/datatypes-alt-255uint16-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-alt-255uint16-001.xht b/tests/wpt/tests/css/WOFF2/datatypes-alt-255uint16-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/datatypes-alt-255uint16-001.xht rename to tests/wpt/tests/css/WOFF2/datatypes-alt-255uint16-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-001-ref.xht b/tests/wpt/tests/css/WOFF2/datatypes-invalid-base128-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-001-ref.xht rename to tests/wpt/tests/css/WOFF2/datatypes-invalid-base128-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-001.xht b/tests/wpt/tests/css/WOFF2/datatypes-invalid-base128-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-001.xht rename to tests/wpt/tests/css/WOFF2/datatypes-invalid-base128-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-002-ref.xht b/tests/wpt/tests/css/WOFF2/datatypes-invalid-base128-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-002-ref.xht rename to tests/wpt/tests/css/WOFF2/datatypes-invalid-base128-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-002.xht b/tests/wpt/tests/css/WOFF2/datatypes-invalid-base128-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-002.xht rename to tests/wpt/tests/css/WOFF2/datatypes-invalid-base128-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-003-ref.xht b/tests/wpt/tests/css/WOFF2/datatypes-invalid-base128-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-003-ref.xht rename to tests/wpt/tests/css/WOFF2/datatypes-invalid-base128-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-003.xht b/tests/wpt/tests/css/WOFF2/datatypes-invalid-base128-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/datatypes-invalid-base128-003.xht rename to tests/wpt/tests/css/WOFF2/datatypes-invalid-base128-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/directory-knowntags-001-ref.xht b/tests/wpt/tests/css/WOFF2/directory-knowntags-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/directory-knowntags-001-ref.xht rename to tests/wpt/tests/css/WOFF2/directory-knowntags-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/directory-knowntags-001.xht b/tests/wpt/tests/css/WOFF2/directory-knowntags-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/directory-knowntags-001.xht rename to tests/wpt/tests/css/WOFF2/directory-knowntags-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/directory-mismatched-tables-001-ref.xht b/tests/wpt/tests/css/WOFF2/directory-mismatched-tables-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/directory-mismatched-tables-001-ref.xht rename to tests/wpt/tests/css/WOFF2/directory-mismatched-tables-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/directory-mismatched-tables-001.xht b/tests/wpt/tests/css/WOFF2/directory-mismatched-tables-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/directory-mismatched-tables-001.xht rename to tests/wpt/tests/css/WOFF2/directory-mismatched-tables-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-length-001-ref.xht b/tests/wpt/tests/css/WOFF2/header-length-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/header-length-001-ref.xht rename to tests/wpt/tests/css/WOFF2/header-length-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-length-001.xht b/tests/wpt/tests/css/WOFF2/header-length-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/header-length-001.xht rename to tests/wpt/tests/css/WOFF2/header-length-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-length-002-ref.xht b/tests/wpt/tests/css/WOFF2/header-length-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/header-length-002-ref.xht rename to tests/wpt/tests/css/WOFF2/header-length-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-length-002.xht b/tests/wpt/tests/css/WOFF2/header-length-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/header-length-002.xht rename to tests/wpt/tests/css/WOFF2/header-length-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-numTables-001-ref.xht b/tests/wpt/tests/css/WOFF2/header-numTables-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/header-numTables-001-ref.xht rename to tests/wpt/tests/css/WOFF2/header-numTables-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-numTables-001.xht b/tests/wpt/tests/css/WOFF2/header-numTables-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/header-numTables-001.xht rename to tests/wpt/tests/css/WOFF2/header-numTables-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-reserved-001-ref.xht b/tests/wpt/tests/css/WOFF2/header-reserved-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/header-reserved-001-ref.xht rename to tests/wpt/tests/css/WOFF2/header-reserved-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-reserved-001.xht b/tests/wpt/tests/css/WOFF2/header-reserved-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/header-reserved-001.xht rename to tests/wpt/tests/css/WOFF2/header-reserved-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-signature-001-ref.xht b/tests/wpt/tests/css/WOFF2/header-signature-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/header-signature-001-ref.xht rename to tests/wpt/tests/css/WOFF2/header-signature-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-signature-001.xht b/tests/wpt/tests/css/WOFF2/header-signature-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/header-signature-001.xht rename to tests/wpt/tests/css/WOFF2/header-signature-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-001-ref.xht b/tests/wpt/tests/css/WOFF2/header-totalsfntsize-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-001-ref.xht rename to tests/wpt/tests/css/WOFF2/header-totalsfntsize-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-001.xht b/tests/wpt/tests/css/WOFF2/header-totalsfntsize-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-001.xht rename to tests/wpt/tests/css/WOFF2/header-totalsfntsize-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-002-ref.xht b/tests/wpt/tests/css/WOFF2/header-totalsfntsize-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-002-ref.xht rename to tests/wpt/tests/css/WOFF2/header-totalsfntsize-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-002.xht b/tests/wpt/tests/css/WOFF2/header-totalsfntsize-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/header-totalsfntsize-002.xht rename to tests/wpt/tests/css/WOFF2/header-totalsfntsize-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadata-noeffect-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadata-noeffect-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-001.xht b/tests/wpt/tests/css/WOFF2/metadata-noeffect-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-001.xht rename to tests/wpt/tests/css/WOFF2/metadata-noeffect-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-002-ref.xht b/tests/wpt/tests/css/WOFF2/metadata-noeffect-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-002-ref.xht rename to tests/wpt/tests/css/WOFF2/metadata-noeffect-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-002.xht b/tests/wpt/tests/css/WOFF2/metadata-noeffect-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadata-noeffect-002.xht rename to tests/wpt/tests/css/WOFF2/metadata-noeffect-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-authoritative-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-authoritative-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-authoritative-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-authoritative-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-authoritative-001.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-authoritative-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-authoritative-001.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-authoritative-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-001.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-001.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-002-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-002-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-002.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-002.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-003-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-003-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-003.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-003.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-004-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-004-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-004.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-004.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-005-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-005-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-005.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-005.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-005.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-006-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-006-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-006.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-encoding-006.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-encoding-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-001.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-001.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-002-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-002-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-002.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-002.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-003-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-003-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-003.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-003.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-004-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-004-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-004.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-004.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-005-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-005-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-005.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-005.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-005.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-006-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-006-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-006.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-006.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-007-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-007-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-007.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-007.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-007.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-008-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-008-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-008.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-008.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-008.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-009-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-009-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-009.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-009.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-009.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-010-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-010-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-010.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-010.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-010.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-011-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-011-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-011.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-011.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-011.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-012-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-012-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-012.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-012.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-012.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-013-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-013-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-013.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-013.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-013.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-014-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-014-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-014.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-014.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-014.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-015-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-015-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-015.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-015.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-015.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-016-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-016-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-016.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-016.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-016.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-017-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-017-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-017.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-017.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-017.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-018-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-018-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-018.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-018.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-018.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-019-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-019-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-019.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-019.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-019.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-020-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-020-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-020.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-020.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-020.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-021-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-021-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-021.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-021.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-021.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-022-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-022-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-022.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-022.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-022.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-023-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-023-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-023.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-023.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-023.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-024-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-024-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-024-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-024-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-024.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-024.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-024.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-025-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-025-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-025.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-025.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-025.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-026-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-026-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-026.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-026.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-026.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-027-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-027-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-027.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-027.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-027.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-028-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-028-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-028.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-028.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-028.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-029-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-029-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-029-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-029-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-029.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-029.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-029.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-030-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-030-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-030-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-030-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-030.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-copyright-030.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-copyright-030.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-001.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-001.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-002-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-002-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-002.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-002.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-003-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-003-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-003.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-003.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-004-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-004-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-004.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-004.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-005-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-005-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-005.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-005.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-005.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-006-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-006-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-006.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-006.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-007-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-007-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-007.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-007.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-007.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-008-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-008-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-008.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-008.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-008.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-009-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-009-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-009.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-009.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-009.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-010-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-010-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-010.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-010.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-010.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-011-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-011-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-011.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credit-011.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credit-011.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-001.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-001.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-002-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-002-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-002.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-002.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-003-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-003-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-003.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-003.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-004-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-004-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-004.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-004.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-005-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-005-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-005.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-005.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-005.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-006-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-006-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-006.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-006.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-007-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-007-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-007.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-credits-007.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-credits-007.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-001.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-001.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-002-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-002-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-002.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-002.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-003-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-003-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-003.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-003.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-004-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-004-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-004.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-004.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-005-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-005-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-005.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-005.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-005.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-006-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-006-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-006.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-006.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-007-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-007-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-007.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-007.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-007.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-008-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-008-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-008.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-008.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-008.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-009-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-009-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-009.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-009.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-009.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-010-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-010-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-010.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-010.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-010.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-011-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-011-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-011.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-011.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-011.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-012-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-012-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-012.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-012.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-012.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-013-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-013-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-013.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-013.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-013.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-014-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-014-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-014.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-014.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-014.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-015-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-015-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-015.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-015.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-015.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-016-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-016-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-016.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-016.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-016.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-017-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-017-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-017.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-017.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-017.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-018-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-018-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-018.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-018.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-018.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-019-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-019-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-019.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-019.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-019.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-020-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-020-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-020.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-020.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-020.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-021-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-021-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-021.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-021.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-021.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-022-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-022-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-022.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-022.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-022.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-023-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-023-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-023.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-023.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-023.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-024-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-024-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-024-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-024-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-024.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-024.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-024.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-025-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-025-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-025.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-025.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-025.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-026-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-026-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-026.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-026.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-026.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-027-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-027-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-027.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-027.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-027.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-028-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-028-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-028.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-028.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-028.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-029-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-029-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-029-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-029-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-029.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-029.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-029.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-030-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-030-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-030-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-030-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-030.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-030.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-030.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-031-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-031-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-031-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-031-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-031.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-031.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-031.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-032-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-032-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-032-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-032-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-032.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-description-032.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-description-032.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-001.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-001.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-002-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-002-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-002.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-002.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-003-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-003-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-003.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-003.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-004-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-004-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-004.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-004.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-005-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-005-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-005.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-005.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-005.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-006-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-006-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-006.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-006.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-007-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-007-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-007.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-007.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-007.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-008-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-008-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-008.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-008.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-008.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-009-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-009-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-009.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-009.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-009.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-010-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-010-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-010.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-010.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-010.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-011-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-011-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-011.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-011.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-011.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-012-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-012-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-012.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-012.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-012.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-013-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-013-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-013.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-013.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-013.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-014-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-014-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-014.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-014.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-014.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-015-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-015-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-015.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-015.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-015.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-016-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-016-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-016.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-016.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-016.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-017-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-017-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-017.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-017.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-017.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-018-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-018-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-018.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-018.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-018.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-019-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-019-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-019.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-019.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-019.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-020-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-020-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-020.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-020.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-020.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-021-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-021-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-021.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-021.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-021.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-022-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-022-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-022.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-022.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-022.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-023-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-023-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-023.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-023.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-023.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-024-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-024-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-024-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-024-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-024.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-024.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-024.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-025-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-025-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-025.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-025.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-025.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-026-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-026-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-026.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-026.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-026.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-027-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-027-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-027.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-027.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-027.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-028-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-028-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-028.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-028.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-028.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-029-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-029-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-029-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-029-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-029.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-029.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-029.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-030-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-030-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-030-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-030-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-030.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-030.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-030.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-031-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-031-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-031-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-031-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-031.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-031.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-031.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-032-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-032-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-032-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-032-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-032.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-032.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-032.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-033-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-033-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-033-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-033-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-033.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-033.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-033.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-034-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-034-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-034-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-034-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-034.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-034.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-034.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-035-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-035-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-035-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-035-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-035.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-035.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-035.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-036-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-036-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-036-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-036-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-036.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-036.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-036.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-037-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-037-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-037-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-037-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-037.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-037.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-037.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-038-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-038-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-038-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-038-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-038.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-038.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-038.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-039-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-039-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-039-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-039-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-039.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-039.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-039.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-040-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-040-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-040-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-040-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-040.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-040.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-040.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-041-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-041-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-041-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-041-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-041.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-041.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-041.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-042-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-042-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-042-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-042-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-042.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-042.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-042.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-043-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-043-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-043-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-043-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-043.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-043.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-043.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-044-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-044-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-044-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-044-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-044.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-044.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-044.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-045-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-045-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-045-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-045-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-045.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-045.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-045.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-046-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-046-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-046-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-046-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-046.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-046.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-046.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-047-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-047-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-047-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-047-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-047.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-047.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-047.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-048-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-048-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-048-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-048-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-048.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-048.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-048.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-049-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-049-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-049-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-049-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-049.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-049.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-049.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-050-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-050-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-050-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-050-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-050.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-extension-050.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-extension-050.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-001.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-001.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-002-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-002-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-002.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-002.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-003-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-003-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-003.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-003.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-004-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-004-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-004.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-004.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-005-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-005-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-005.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-005.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-005.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-006-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-006-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-006.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-006.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-007-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-007-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-007.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-007.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-007.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-008-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-008-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-008.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-008.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-008.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-009-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-009-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-009.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-009.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-009.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-010-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-010-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-010.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-010.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-010.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-011-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-011-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-011.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-011.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-011.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-012-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-012-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-012.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-012.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-012.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-013-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-013-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-013.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-013.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-013.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-014-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-014-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-014.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-014.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-014.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-015-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-015-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-015.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-015.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-015.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-016-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-016-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-016.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-016.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-016.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-017-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-017-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-017.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-017.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-017.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-018-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-018-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-018.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-018.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-018.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-019-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-019-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-019.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-019.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-019.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-020-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-020-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-020.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-020.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-020.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-021-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-021-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-021.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-021.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-021.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-022-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-022-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-022.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-022.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-022.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-023-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-023-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-023.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-023.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-023.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-024-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-024-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-024-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-024-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-024.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-024.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-024.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-025-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-025-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-025.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-025.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-025.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-026-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-026-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-026.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-026.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-026.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-027-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-027-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-027.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-027.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-027.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-028-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-028-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-028.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-028.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-028.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-029-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-029-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-029-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-029-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-029.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-029.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-029.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-030-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-030-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-030-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-030-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-030.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-030.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-030.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-031-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-031-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-031-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-031-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-031.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-031.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-031.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-032-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-032-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-032-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-032-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-032.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-032.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-032.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-033-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-033-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-033-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-033-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-033.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-license-033.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-license-033.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-001.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-001.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-002-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-002-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-002.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-002.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-003-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-003-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-003.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-003.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-004-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-004-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-004.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-004.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-005-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-005-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-005.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-005.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-005.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-006-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-006-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-006.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-006.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-007-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-007-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-007.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-007.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-007.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-008-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-008-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-008.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-008.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-008.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-009-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-009-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-009.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-009.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-009.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-010-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-010-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-010.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-licensee-010.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-licensee-010.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-001.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-001.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-002-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-002-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-002.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-002.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-003-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-003-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-003.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-003.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-004-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-004-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-004.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-004.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-005-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-005-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-005.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-005.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-005.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-006-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-006-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-006.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-metadata-006.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-metadata-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-001.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-001.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-002-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-002-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-002.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-002.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-003-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-003-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-003.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-003.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-004-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-004-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-004.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-004.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-005-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-005-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-005.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-005.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-005.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-006-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-006-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-006.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-006.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-007-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-007-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-007.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-007.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-007.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-008-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-008-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-008.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-008.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-008.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-009-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-009-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-009.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-009.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-009.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-010-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-010-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-010.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-010.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-010.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-011-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-011-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-011.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-011.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-011.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-012-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-012-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-012.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-012.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-012.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-013-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-013-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-013.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-013.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-013.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-014-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-014-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-014.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-014.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-014.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-015-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-015-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-015.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-015.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-015.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-016-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-016-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-016.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-016.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-016.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-017-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-017-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-017.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-017.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-017.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-018-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-018-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-018.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-018.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-018.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-019-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-019-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-019.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-019.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-019.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-020-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-020-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-020.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-020.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-020.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-021-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-021-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-021.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-021.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-021.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-022-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-022-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-022.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-022.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-022.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-023-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-023-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-023.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-023.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-023.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-024-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-024-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-024-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-024-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-024.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-024.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-024.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-025-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-025-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-025.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-025.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-025.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-026-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-026-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-026.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-026.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-026.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-027-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-027-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-027.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-027.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-027.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-028-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-028-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-028.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-028.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-028.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-029-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-029-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-029-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-029-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-029.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-029.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-029.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-030-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-030-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-030-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-030-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-030.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-trademark-030.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-trademark-030.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-001.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-001.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-002-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-002-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-002.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-002.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-003-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-003-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-003.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-003.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-005-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-005-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-005.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-005.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-005.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-006-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-006-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-006.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-006.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-007-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-007-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-007.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-uniqueid-007.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-uniqueid-007.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-001.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-001.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-002-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-002-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-002.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-002.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-003-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-003-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-003.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-003.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-004-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-004-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-004.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-004.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-006-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-006-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-006.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-006.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-007-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-007-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-007.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-007.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-007.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-008-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-008-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-008.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-008.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-008.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-009-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-009-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-009.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-009.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-009.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-010-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-010-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-010.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-010.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-010.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-011-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-011-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-011.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-011.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-011.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-012-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-012-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-012.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-schema-vendor-012.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-schema-vendor-012.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-001-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-001-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-001.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-001.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-002-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-002-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-002.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-002.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-003-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-003-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-003.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-003.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-004-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-004-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-004.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-004.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-005-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-005-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-005.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-005.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-005.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-006-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-006-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-006.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-006.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-007-ref.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-007-ref.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-007.xht b/tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/metadatadisplay-well-formed-007.xht rename to tests/wpt/tests/css/WOFF2/metadatadisplay-well-formed-007.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-001-ref.xht b/tests/wpt/tests/css/WOFF2/privatedata-noeffect-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-001-ref.xht rename to tests/wpt/tests/css/WOFF2/privatedata-noeffect-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-001.xht b/tests/wpt/tests/css/WOFF2/privatedata-noeffect-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-001.xht rename to tests/wpt/tests/css/WOFF2/privatedata-noeffect-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-002-ref.xht b/tests/wpt/tests/css/WOFF2/privatedata-noeffect-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-002-ref.xht rename to tests/wpt/tests/css/WOFF2/privatedata-noeffect-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-002.xht b/tests/wpt/tests/css/WOFF2/privatedata-noeffect-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/privatedata-noeffect-002.xht rename to tests/wpt/tests/css/WOFF2/privatedata-noeffect-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-CFF-Fallback.otf b/tests/wpt/tests/css/WOFF2/support/SFNT-CFF-Fallback.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-CFF-Fallback.otf rename to tests/wpt/tests/css/WOFF2/support/SFNT-CFF-Fallback.otf diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-CFF-Reference.otf b/tests/wpt/tests/css/WOFF2/support/SFNT-CFF-Reference.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-CFF-Reference.otf rename to tests/wpt/tests/css/WOFF2/support/SFNT-CFF-Reference.otf diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-TTF-Fallback.ttf b/tests/wpt/tests/css/WOFF2/support/SFNT-TTF-Fallback.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-TTF-Fallback.ttf rename to tests/wpt/tests/css/WOFF2/support/SFNT-TTF-Fallback.ttf diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-TTF-Reference.ttf b/tests/wpt/tests/css/WOFF2/support/SFNT-TTF-Reference.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/SFNT-TTF-Reference.ttf rename to tests/wpt/tests/css/WOFF2/support/SFNT-TTF-Reference.ttf diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/available-001a.xht b/tests/wpt/tests/css/WOFF2/support/available-001a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/available-001a.xht rename to tests/wpt/tests/css/WOFF2/support/available-001a.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/available-001b.xht b/tests/wpt/tests/css/WOFF2/support/available-001b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/available-001b.xht rename to tests/wpt/tests/css/WOFF2/support/available-001b.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/available-002.woff2 b/tests/wpt/tests/css/WOFF2/support/available-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/available-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/available-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/available-002a.xht b/tests/wpt/tests/css/WOFF2/support/available-002a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/available-002a.xht rename to tests/wpt/tests/css/WOFF2/support/available-002a.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/available-002b.xht b/tests/wpt/tests/css/WOFF2/support/available-002b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/available-002b.xht rename to tests/wpt/tests/css/WOFF2/support/available-002b.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-001.woff2 b/tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-002.woff2 b/tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-003.woff2 b/tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-004.woff2 b/tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-005.woff2 b/tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-005.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-005.woff2 rename to tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-005.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-006.woff2 b/tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-007.woff2 b/tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-007.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-007.woff2 rename to tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-007.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-008.woff2 b/tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-008.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/blocks-extraneous-data-008.woff2 rename to tests/wpt/tests/css/WOFF2/support/blocks-extraneous-data-008.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/blocks-overlap-001.woff2 b/tests/wpt/tests/css/WOFF2/support/blocks-overlap-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/blocks-overlap-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/blocks-overlap-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/blocks-overlap-002.woff2 b/tests/wpt/tests/css/WOFF2/support/blocks-overlap-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/blocks-overlap-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/blocks-overlap-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/blocks-overlap-003.woff2 b/tests/wpt/tests/css/WOFF2/support/blocks-overlap-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/blocks-overlap-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/blocks-overlap-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/datatypes-alt-255uint16-001.woff2 b/tests/wpt/tests/css/WOFF2/support/datatypes-alt-255uint16-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/datatypes-alt-255uint16-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/datatypes-alt-255uint16-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/datatypes-invalid-base128-001.woff2 b/tests/wpt/tests/css/WOFF2/support/datatypes-invalid-base128-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/datatypes-invalid-base128-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/datatypes-invalid-base128-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/datatypes-invalid-base128-002.woff2 b/tests/wpt/tests/css/WOFF2/support/datatypes-invalid-base128-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/datatypes-invalid-base128-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/datatypes-invalid-base128-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/datatypes-invalid-base128-003.woff2 b/tests/wpt/tests/css/WOFF2/support/datatypes-invalid-base128-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/datatypes-invalid-base128-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/datatypes-invalid-base128-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/directory-knowntags-001.woff2 b/tests/wpt/tests/css/WOFF2/support/directory-knowntags-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/directory-knowntags-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/directory-knowntags-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/directory-mismatched-tables-001.woff2 b/tests/wpt/tests/css/WOFF2/support/directory-mismatched-tables-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/directory-mismatched-tables-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/directory-mismatched-tables-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/header-length-001.woff2 b/tests/wpt/tests/css/WOFF2/support/header-length-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/header-length-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/header-length-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/header-length-002.woff2 b/tests/wpt/tests/css/WOFF2/support/header-length-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/header-length-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/header-length-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/header-numTables-001.woff2 b/tests/wpt/tests/css/WOFF2/support/header-numTables-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/header-numTables-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/header-numTables-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/header-reserved-001.woff2 b/tests/wpt/tests/css/WOFF2/support/header-reserved-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/header-reserved-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/header-reserved-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/header-signature-001.woff2 b/tests/wpt/tests/css/WOFF2/support/header-signature-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/header-signature-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/header-signature-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/header-totalsfntsize-001.woff2 b/tests/wpt/tests/css/WOFF2/support/header-totalsfntsize-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/header-totalsfntsize-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/header-totalsfntsize-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/header-totalsfntsize-002.woff2 b/tests/wpt/tests/css/WOFF2/support/header-totalsfntsize-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/header-totalsfntsize-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/header-totalsfntsize-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/index.css b/tests/wpt/tests/css/WOFF2/support/index.css similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/index.css rename to tests/wpt/tests/css/WOFF2/support/index.css diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadata-noeffect-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadata-noeffect-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadata-noeffect-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadata-noeffect-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadata-noeffect-002.woff2 b/tests/wpt/tests/css/WOFF2/support/metadata-noeffect-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadata-noeffect-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadata-noeffect-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-authoritative-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-authoritative-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-authoritative-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-authoritative-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-encoding-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-encoding-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-encoding-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-encoding-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-encoding-002.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-encoding-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-encoding-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-encoding-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-encoding-003.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-encoding-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-encoding-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-encoding-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-encoding-004.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-encoding-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-encoding-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-encoding-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-encoding-005.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-encoding-005.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-encoding-005.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-encoding-005.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-encoding-006.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-encoding-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-encoding-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-encoding-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-002.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-003.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-004.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-005.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-005.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-005.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-005.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-006.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-007.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-007.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-007.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-007.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-008.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-008.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-008.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-008.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-009.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-009.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-009.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-009.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-010.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-010.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-010.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-010.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-011.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-011.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-011.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-011.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-012.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-012.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-012.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-012.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-013.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-013.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-013.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-013.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-014.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-014.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-014.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-014.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-015.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-015.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-015.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-015.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-016.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-016.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-016.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-016.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-017.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-017.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-017.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-017.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-018.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-018.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-018.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-018.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-019.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-019.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-019.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-019.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-020.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-020.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-020.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-020.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-021.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-021.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-021.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-021.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-022.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-022.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-022.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-022.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-023.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-023.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-023.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-023.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-024.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-024.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-024.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-024.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-025.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-025.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-025.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-025.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-026.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-026.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-026.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-026.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-027.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-027.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-027.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-027.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-028.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-028.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-028.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-028.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-029.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-029.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-029.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-029.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-030.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-030.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-copyright-030.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-copyright-030.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-002.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-003.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-004.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-005.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-005.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-005.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-005.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-006.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-007.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-007.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-007.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-007.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-008.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-008.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-008.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-008.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-009.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-009.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-009.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-009.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-010.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-010.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-010.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-010.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-011.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-011.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credit-011.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credit-011.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credits-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credits-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credits-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credits-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credits-002.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credits-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credits-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credits-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credits-003.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credits-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credits-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credits-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credits-004.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credits-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credits-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credits-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credits-005.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credits-005.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credits-005.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credits-005.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credits-006.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credits-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credits-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credits-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credits-007.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credits-007.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-credits-007.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-credits-007.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-002.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-003.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-004.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-005.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-005.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-005.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-005.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-006.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-007.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-007.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-007.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-007.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-008.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-008.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-008.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-008.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-009.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-009.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-009.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-009.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-010.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-010.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-010.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-010.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-011.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-011.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-011.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-011.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-012.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-012.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-012.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-012.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-013.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-013.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-013.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-013.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-014.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-014.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-014.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-014.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-015.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-015.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-015.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-015.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-016.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-016.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-016.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-016.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-017.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-017.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-017.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-017.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-018.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-018.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-018.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-018.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-019.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-019.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-019.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-019.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-020.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-020.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-020.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-020.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-021.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-021.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-021.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-021.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-022.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-022.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-022.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-022.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-023.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-023.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-023.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-023.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-024.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-024.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-024.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-024.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-025.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-025.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-025.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-025.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-026.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-026.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-026.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-026.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-027.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-027.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-027.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-027.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-028.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-028.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-028.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-028.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-029.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-029.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-029.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-029.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-030.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-030.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-030.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-030.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-031.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-031.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-031.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-031.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-032.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-032.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-description-032.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-description-032.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-002.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-003.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-004.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-005.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-005.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-005.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-005.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-006.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-007.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-007.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-007.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-007.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-008.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-008.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-008.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-008.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-009.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-009.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-009.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-009.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-010.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-010.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-010.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-010.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-011.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-011.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-011.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-011.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-012.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-012.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-012.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-012.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-013.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-013.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-013.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-013.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-014.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-014.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-014.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-014.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-015.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-015.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-015.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-015.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-016.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-016.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-016.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-016.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-017.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-017.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-017.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-017.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-018.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-018.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-018.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-018.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-019.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-019.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-019.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-019.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-020.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-020.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-020.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-020.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-021.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-021.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-021.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-021.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-022.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-022.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-022.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-022.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-023.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-023.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-023.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-023.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-024.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-024.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-024.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-024.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-025.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-025.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-025.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-025.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-026.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-026.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-026.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-026.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-027.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-027.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-027.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-027.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-028.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-028.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-028.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-028.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-029.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-029.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-029.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-029.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-030.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-030.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-030.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-030.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-031.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-031.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-031.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-031.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-032.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-032.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-032.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-032.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-033.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-033.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-033.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-033.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-034.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-034.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-034.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-034.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-035.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-035.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-035.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-035.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-036.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-036.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-036.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-036.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-037.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-037.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-037.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-037.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-038.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-038.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-038.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-038.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-039.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-039.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-039.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-039.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-040.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-040.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-040.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-040.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-041.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-041.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-041.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-041.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-042.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-042.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-042.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-042.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-043.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-043.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-043.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-043.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-044.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-044.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-044.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-044.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-045.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-045.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-045.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-045.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-046.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-046.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-046.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-046.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-047.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-047.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-047.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-047.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-048.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-048.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-048.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-048.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-049.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-049.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-049.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-049.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-050.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-050.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-extension-050.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-extension-050.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-002.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-003.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-004.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-005.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-005.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-005.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-005.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-006.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-007.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-007.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-007.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-007.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-008.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-008.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-008.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-008.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-009.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-009.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-009.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-009.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-010.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-010.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-010.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-010.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-011.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-011.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-011.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-011.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-012.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-012.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-012.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-012.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-013.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-013.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-013.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-013.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-014.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-014.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-014.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-014.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-015.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-015.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-015.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-015.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-016.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-016.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-016.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-016.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-017.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-017.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-017.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-017.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-018.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-018.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-018.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-018.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-019.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-019.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-019.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-019.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-020.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-020.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-020.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-020.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-021.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-021.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-021.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-021.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-022.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-022.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-022.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-022.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-023.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-023.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-023.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-023.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-024.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-024.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-024.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-024.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-025.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-025.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-025.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-025.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-026.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-026.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-026.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-026.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-027.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-027.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-027.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-027.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-028.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-028.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-028.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-028.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-029.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-029.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-029.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-029.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-030.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-030.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-030.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-030.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-031.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-031.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-031.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-031.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-032.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-032.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-032.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-032.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-033.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-033.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-license-033.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-license-033.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-002.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-003.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-004.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-005.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-005.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-005.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-005.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-006.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-007.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-007.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-007.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-007.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-008.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-008.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-008.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-008.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-009.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-009.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-009.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-009.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-010.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-010.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-licensee-010.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-licensee-010.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-metadata-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-metadata-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-metadata-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-metadata-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-metadata-002.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-metadata-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-metadata-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-metadata-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-metadata-003.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-metadata-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-metadata-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-metadata-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-metadata-004.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-metadata-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-metadata-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-metadata-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-metadata-005.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-metadata-005.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-metadata-005.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-metadata-005.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-metadata-006.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-metadata-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-metadata-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-metadata-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-002.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-003.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-004.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-005.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-005.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-005.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-005.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-006.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-007.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-007.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-007.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-007.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-008.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-008.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-008.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-008.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-009.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-009.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-009.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-009.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-010.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-010.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-010.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-010.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-011.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-011.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-011.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-011.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-012.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-012.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-012.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-012.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-013.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-013.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-013.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-013.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-014.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-014.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-014.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-014.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-015.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-015.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-015.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-015.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-016.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-016.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-016.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-016.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-017.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-017.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-017.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-017.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-018.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-018.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-018.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-018.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-019.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-019.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-019.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-019.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-020.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-020.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-020.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-020.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-021.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-021.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-021.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-021.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-022.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-022.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-022.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-022.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-023.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-023.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-023.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-023.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-024.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-024.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-024.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-024.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-025.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-025.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-025.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-025.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-026.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-026.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-026.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-026.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-027.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-027.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-027.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-027.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-028.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-028.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-028.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-028.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-029.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-029.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-029.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-029.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-030.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-030.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-trademark-030.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-trademark-030.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-002.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-003.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-005.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-005.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-005.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-005.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-006.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-007.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-007.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-007.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-uniqueid-007.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-002.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-003.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-004.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-006.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-007.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-007.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-007.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-007.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-008.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-008.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-008.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-008.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-009.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-009.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-009.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-009.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-010.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-010.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-010.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-010.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-011.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-011.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-011.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-011.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-012.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-012.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-schema-vendor-012.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-schema-vendor-012.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-well-formed-001.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-well-formed-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-well-formed-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-well-formed-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-well-formed-002.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-well-formed-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-well-formed-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-well-formed-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-well-formed-003.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-well-formed-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-well-formed-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-well-formed-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-well-formed-004.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-well-formed-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-well-formed-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-well-formed-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-well-formed-005.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-well-formed-005.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-well-formed-005.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-well-formed-005.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-well-formed-006.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-well-formed-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-well-formed-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-well-formed-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-well-formed-007.woff2 b/tests/wpt/tests/css/WOFF2/support/metadatadisplay-well-formed-007.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/metadatadisplay-well-formed-007.woff2 rename to tests/wpt/tests/css/WOFF2/support/metadatadisplay-well-formed-007.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/privatedata-noeffect-001.woff2 b/tests/wpt/tests/css/WOFF2/support/privatedata-noeffect-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/privatedata-noeffect-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/privatedata-noeffect-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/privatedata-noeffect-002.woff2 b/tests/wpt/tests/css/WOFF2/support/privatedata-noeffect-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/privatedata-noeffect-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/privatedata-noeffect-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-bad-origlength-loca-001.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-bad-origlength-loca-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-bad-origlength-loca-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-bad-origlength-loca-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-bad-origlength-loca-002.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-bad-origlength-loca-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-bad-origlength-loca-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-bad-origlength-loca-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-brotli-001.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-brotli-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-brotli-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-brotli-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-decompressed-length-001.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-decompressed-length-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-decompressed-length-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-decompressed-length-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-decompressed-length-002.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-decompressed-length-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-decompressed-length-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-decompressed-length-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-decompressed-length-003.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-decompressed-length-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-decompressed-length-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-decompressed-length-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-decompressed-length-004.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-decompressed-length-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-decompressed-length-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-decompressed-length-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-extraneous-data-001.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-extraneous-data-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-extraneous-data-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-extraneous-data-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-glyf-bbox-001.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-glyf-bbox-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-glyf-bbox-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-glyf-bbox-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-glyf-bbox-002.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-glyf-bbox-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-glyf-bbox-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-glyf-bbox-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-glyf-bbox-003.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-glyf-bbox-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-glyf-bbox-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-glyf-bbox-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-glyf-origlength-001.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-glyf-origlength-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-glyf-origlength-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-glyf-origlength-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-glyf-origlength-002.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-glyf-origlength-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-glyf-origlength-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-glyf-origlength-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-glyf-origlength-003.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-glyf-origlength-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-glyf-origlength-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-glyf-origlength-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-non-zero-loca-001.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-non-zero-loca-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-non-zero-loca-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-non-zero-loca-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-recontruct-loca-001.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-recontruct-loca-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-recontruct-loca-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-recontruct-loca-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-transform-bad-flag-001.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-transform-bad-flag-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-transform-bad-flag-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-transform-bad-flag-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-transform-bad-flag-002.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-transform-bad-flag-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-transform-bad-flag-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-transform-bad-flag-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-transform-hmtx-001.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-transform-hmtx-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-transform-hmtx-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-transform-hmtx-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-transform-hmtx-002.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-transform-hmtx-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-transform-hmtx-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-transform-hmtx-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-transform-hmtx-003.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-transform-hmtx-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-transform-hmtx-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-transform-hmtx-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-transform-hmtx-004.woff2 b/tests/wpt/tests/css/WOFF2/support/tabledata-transform-hmtx-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/tabledata-transform-hmtx-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/tabledata-transform-hmtx-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/test-fonts.css b/tests/wpt/tests/css/WOFF2/support/test-fonts.css similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/test-fonts.css rename to tests/wpt/tests/css/WOFF2/support/test-fonts.css diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/valid-001.woff2 b/tests/wpt/tests/css/WOFF2/support/valid-001.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/valid-001.woff2 rename to tests/wpt/tests/css/WOFF2/support/valid-001.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/valid-002.woff2 b/tests/wpt/tests/css/WOFF2/support/valid-002.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/valid-002.woff2 rename to tests/wpt/tests/css/WOFF2/support/valid-002.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/valid-003.woff2 b/tests/wpt/tests/css/WOFF2/support/valid-003.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/valid-003.woff2 rename to tests/wpt/tests/css/WOFF2/support/valid-003.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/valid-004.woff2 b/tests/wpt/tests/css/WOFF2/support/valid-004.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/valid-004.woff2 rename to tests/wpt/tests/css/WOFF2/support/valid-004.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/valid-005.woff2 b/tests/wpt/tests/css/WOFF2/support/valid-005.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/valid-005.woff2 rename to tests/wpt/tests/css/WOFF2/support/valid-005.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/valid-006.woff2 b/tests/wpt/tests/css/WOFF2/support/valid-006.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/valid-006.woff2 rename to tests/wpt/tests/css/WOFF2/support/valid-006.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/valid-007.woff2 b/tests/wpt/tests/css/WOFF2/support/valid-007.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/valid-007.woff2 rename to tests/wpt/tests/css/WOFF2/support/valid-007.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/support/valid-008.woff2 b/tests/wpt/tests/css/WOFF2/support/valid-008.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/support/valid-008.woff2 rename to tests/wpt/tests/css/WOFF2/support/valid-008.woff2 diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-001-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-bad-origlength-loca-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-001-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-bad-origlength-loca-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-001.xht b/tests/wpt/tests/css/WOFF2/tabledata-bad-origlength-loca-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-001.xht rename to tests/wpt/tests/css/WOFF2/tabledata-bad-origlength-loca-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-002-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-bad-origlength-loca-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-002-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-bad-origlength-loca-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-002.xht b/tests/wpt/tests/css/WOFF2/tabledata-bad-origlength-loca-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-bad-origlength-loca-002.xht rename to tests/wpt/tests/css/WOFF2/tabledata-bad-origlength-loca-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-brotli-001-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-brotli-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-brotli-001-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-brotli-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-brotli-001.xht b/tests/wpt/tests/css/WOFF2/tabledata-brotli-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-brotli-001.xht rename to tests/wpt/tests/css/WOFF2/tabledata-brotli-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-001-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-001-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-001.xht b/tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-001.xht rename to tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-002-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-002-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-002.xht b/tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-002.xht rename to tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-003-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-003-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-003.xht b/tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-003.xht rename to tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-004-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-004-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-004.xht b/tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-decompressed-length-004.xht rename to tests/wpt/tests/css/WOFF2/tabledata-decompressed-length-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-extraneous-data-001-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-extraneous-data-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-extraneous-data-001-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-extraneous-data-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-extraneous-data-001.xht b/tests/wpt/tests/css/WOFF2/tabledata-extraneous-data-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-extraneous-data-001.xht rename to tests/wpt/tests/css/WOFF2/tabledata-extraneous-data-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-001-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-glyf-bbox-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-001-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-glyf-bbox-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-001.xht b/tests/wpt/tests/css/WOFF2/tabledata-glyf-bbox-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-001.xht rename to tests/wpt/tests/css/WOFF2/tabledata-glyf-bbox-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-002-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-glyf-bbox-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-002-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-glyf-bbox-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-002.xht b/tests/wpt/tests/css/WOFF2/tabledata-glyf-bbox-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-002.xht rename to tests/wpt/tests/css/WOFF2/tabledata-glyf-bbox-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-003-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-glyf-bbox-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-003-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-glyf-bbox-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-003.xht b/tests/wpt/tests/css/WOFF2/tabledata-glyf-bbox-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-bbox-003.xht rename to tests/wpt/tests/css/WOFF2/tabledata-glyf-bbox-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-001-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-glyf-origlength-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-001-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-glyf-origlength-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-001.xht b/tests/wpt/tests/css/WOFF2/tabledata-glyf-origlength-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-001.xht rename to tests/wpt/tests/css/WOFF2/tabledata-glyf-origlength-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-002-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-glyf-origlength-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-002-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-glyf-origlength-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-002.xht b/tests/wpt/tests/css/WOFF2/tabledata-glyf-origlength-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-002.xht rename to tests/wpt/tests/css/WOFF2/tabledata-glyf-origlength-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-003-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-glyf-origlength-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-003-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-glyf-origlength-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-003.xht b/tests/wpt/tests/css/WOFF2/tabledata-glyf-origlength-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-glyf-origlength-003.xht rename to tests/wpt/tests/css/WOFF2/tabledata-glyf-origlength-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-non-zero-loca-001-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-non-zero-loca-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-non-zero-loca-001-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-non-zero-loca-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-non-zero-loca-001.xht b/tests/wpt/tests/css/WOFF2/tabledata-non-zero-loca-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-non-zero-loca-001.xht rename to tests/wpt/tests/css/WOFF2/tabledata-non-zero-loca-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-recontruct-loca-001-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-recontruct-loca-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-recontruct-loca-001-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-recontruct-loca-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-recontruct-loca-001.xht b/tests/wpt/tests/css/WOFF2/tabledata-recontruct-loca-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-recontruct-loca-001.xht rename to tests/wpt/tests/css/WOFF2/tabledata-recontruct-loca-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-001-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-transform-bad-flag-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-001-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-transform-bad-flag-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-001.xht b/tests/wpt/tests/css/WOFF2/tabledata-transform-bad-flag-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-001.xht rename to tests/wpt/tests/css/WOFF2/tabledata-transform-bad-flag-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-002-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-transform-bad-flag-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-002-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-transform-bad-flag-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-002.xht b/tests/wpt/tests/css/WOFF2/tabledata-transform-bad-flag-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-bad-flag-002.xht rename to tests/wpt/tests/css/WOFF2/tabledata-transform-bad-flag-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-001-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-001-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-001.xht b/tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-001.xht rename to tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-002-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-002-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-002.xht b/tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-002.xht rename to tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-003-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-003-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-003.xht b/tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-003.xht rename to tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-004-ref.xht b/tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-004-ref.xht rename to tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-004.xht b/tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/tabledata-transform-hmtx-004.xht rename to tests/wpt/tests/css/WOFF2/tabledata-transform-hmtx-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/testcaseindex.xht b/tests/wpt/tests/css/WOFF2/testcaseindex.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/testcaseindex.xht rename to tests/wpt/tests/css/WOFF2/testcaseindex.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-001-ref.xht b/tests/wpt/tests/css/WOFF2/valid-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-001-ref.xht rename to tests/wpt/tests/css/WOFF2/valid-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-001.xht b/tests/wpt/tests/css/WOFF2/valid-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-001.xht rename to tests/wpt/tests/css/WOFF2/valid-001.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-002-ref.xht b/tests/wpt/tests/css/WOFF2/valid-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-002-ref.xht rename to tests/wpt/tests/css/WOFF2/valid-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-002.xht b/tests/wpt/tests/css/WOFF2/valid-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-002.xht rename to tests/wpt/tests/css/WOFF2/valid-002.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-003-ref.xht b/tests/wpt/tests/css/WOFF2/valid-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-003-ref.xht rename to tests/wpt/tests/css/WOFF2/valid-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-003.xht b/tests/wpt/tests/css/WOFF2/valid-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-003.xht rename to tests/wpt/tests/css/WOFF2/valid-003.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-004-ref.xht b/tests/wpt/tests/css/WOFF2/valid-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-004-ref.xht rename to tests/wpt/tests/css/WOFF2/valid-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-004.xht b/tests/wpt/tests/css/WOFF2/valid-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-004.xht rename to tests/wpt/tests/css/WOFF2/valid-004.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-005-ref.xht b/tests/wpt/tests/css/WOFF2/valid-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-005-ref.xht rename to tests/wpt/tests/css/WOFF2/valid-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-005.xht b/tests/wpt/tests/css/WOFF2/valid-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-005.xht rename to tests/wpt/tests/css/WOFF2/valid-005.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-006-ref.xht b/tests/wpt/tests/css/WOFF2/valid-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-006-ref.xht rename to tests/wpt/tests/css/WOFF2/valid-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-006.xht b/tests/wpt/tests/css/WOFF2/valid-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-006.xht rename to tests/wpt/tests/css/WOFF2/valid-006.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-007-ref.xht b/tests/wpt/tests/css/WOFF2/valid-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-007-ref.xht rename to tests/wpt/tests/css/WOFF2/valid-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-007.xht b/tests/wpt/tests/css/WOFF2/valid-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-007.xht rename to tests/wpt/tests/css/WOFF2/valid-007.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-008-ref.xht b/tests/wpt/tests/css/WOFF2/valid-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-008-ref.xht rename to tests/wpt/tests/css/WOFF2/valid-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/WOFF2/valid-008.xht b/tests/wpt/tests/css/WOFF2/valid-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/WOFF2/valid-008.xht rename to tests/wpt/tests/css/WOFF2/valid-008.xht diff --git a/tests/wpt/web-platform-tests/css/compositing/Blending_in_a_group_with_filter-ref.html b/tests/wpt/tests/css/compositing/Blending_in_a_group_with_filter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/Blending_in_a_group_with_filter-ref.html rename to tests/wpt/tests/css/compositing/Blending_in_a_group_with_filter-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/Blending_in_a_group_with_filter.html b/tests/wpt/tests/css/compositing/Blending_in_a_group_with_filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/Blending_in_a_group_with_filter.html rename to tests/wpt/tests/css/compositing/Blending_in_a_group_with_filter.html diff --git a/tests/wpt/web-platform-tests/css/compositing/Blending_in_a_group_with_opacity-ref.html b/tests/wpt/tests/css/compositing/Blending_in_a_group_with_opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/Blending_in_a_group_with_opacity-ref.html rename to tests/wpt/tests/css/compositing/Blending_in_a_group_with_opacity-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/Blending_in_a_group_with_opacity.html b/tests/wpt/tests/css/compositing/Blending_in_a_group_with_opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/Blending_in_a_group_with_opacity.html rename to tests/wpt/tests/css/compositing/Blending_in_a_group_with_opacity.html diff --git a/tests/wpt/web-platform-tests/css/compositing/META.yml b/tests/wpt/tests/css/compositing/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/META.yml rename to tests/wpt/tests/css/compositing/META.yml diff --git a/tests/wpt/web-platform-tests/css/compositing/Text_with_SVG_background-ref.html b/tests/wpt/tests/css/compositing/Text_with_SVG_background-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/Text_with_SVG_background-ref.html rename to tests/wpt/tests/css/compositing/Text_with_SVG_background-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/Text_with_SVG_background.html b/tests/wpt/tests/css/compositing/Text_with_SVG_background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/Text_with_SVG_background.html rename to tests/wpt/tests/css/compositing/Text_with_SVG_background.html diff --git a/tests/wpt/web-platform-tests/css/compositing/background-blending/background-blend-mode-gradient-image.html b/tests/wpt/tests/css/compositing/background-blending/background-blend-mode-gradient-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/background-blending/background-blend-mode-gradient-image.html rename to tests/wpt/tests/css/compositing/background-blending/background-blend-mode-gradient-image.html diff --git a/tests/wpt/web-platform-tests/css/compositing/background-blending/background-blend-mode-plus-lighter.html b/tests/wpt/tests/css/compositing/background-blending/background-blend-mode-plus-lighter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/background-blending/background-blend-mode-plus-lighter.html rename to tests/wpt/tests/css/compositing/background-blending/background-blend-mode-plus-lighter.html diff --git a/tests/wpt/web-platform-tests/css/compositing/background-blending/reference/background-blend-mode-gradient-image-ref.html b/tests/wpt/tests/css/compositing/background-blending/reference/background-blend-mode-gradient-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/background-blending/reference/background-blend-mode-gradient-image-ref.html rename to tests/wpt/tests/css/compositing/background-blending/reference/background-blend-mode-gradient-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/background-blending/reference/background-blend-mode-plus-lighter-ref.html b/tests/wpt/tests/css/compositing/background-blending/reference/background-blend-mode-plus-lighter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/background-blending/reference/background-blend-mode-plus-lighter-ref.html rename to tests/wpt/tests/css/compositing/background-blending/reference/background-blend-mode-plus-lighter-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/background-blending/support/red.png b/tests/wpt/tests/css/compositing/background-blending/support/red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/background-blending/support/red.png rename to tests/wpt/tests/css/compositing/background-blending/support/red.png diff --git a/tests/wpt/web-platform-tests/css/compositing/compositing_simple_div-ref.html b/tests/wpt/tests/css/compositing/compositing_simple_div-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/compositing_simple_div-ref.html rename to tests/wpt/tests/css/compositing/compositing_simple_div-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/compositing_simple_div.html b/tests/wpt/tests/css/compositing/compositing_simple_div.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/compositing_simple_div.html rename to tests/wpt/tests/css/compositing/compositing_simple_div.html diff --git a/tests/wpt/web-platform-tests/css/compositing/inheritance.html b/tests/wpt/tests/css/compositing/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/inheritance.html rename to tests/wpt/tests/css/compositing/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/compositing/isolation/animation/isolation-no-interpolation.html b/tests/wpt/tests/css/compositing/isolation/animation/isolation-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/isolation/animation/isolation-no-interpolation.html rename to tests/wpt/tests/css/compositing/isolation/animation/isolation-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/compositing/isolation/blend-isolation.html b/tests/wpt/tests/css/compositing/isolation/blend-isolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/isolation/blend-isolation.html rename to tests/wpt/tests/css/compositing/isolation/blend-isolation.html diff --git a/tests/wpt/web-platform-tests/css/compositing/line-with-svg-background-ref.html b/tests/wpt/tests/css/compositing/line-with-svg-background-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/line-with-svg-background-ref.html rename to tests/wpt/tests/css/compositing/line-with-svg-background-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/line-with-svg-background.html b/tests/wpt/tests/css/compositing/line-with-svg-background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/line-with-svg-background.html rename to tests/wpt/tests/css/compositing/line-with-svg-background.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-animation.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-animation.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-animation.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-interposed.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-interposed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-interposed.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-interposed.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-scroll.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-scroll.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-scroll.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-with-transparent-pixels.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-with-transparent-pixels.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-with-transparent-pixels.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-with-transparent-pixels.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-with-3D-transform.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-with-3D-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-with-3D-transform.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-with-3D-transform.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-with-transform-and-perspective.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-with-transform-and-perspective.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-with-transform-and-perspective.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-blended-with-transform-and-perspective.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-blending-with-sibling.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-blending-with-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-blending-with-sibling.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-blending-with-sibling.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-border-image.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-border-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-border-image.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-border-image.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-canvas-parent.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-canvas-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-canvas-parent.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-canvas-parent.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-canvas-sibling.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-canvas-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-canvas-sibling.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-canvas-sibling.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-creates-stacking-context.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-creates-stacking-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-creates-stacking-context.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-creates-stacking-context.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-filter.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-filter.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-filter.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-iframe-parent.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-iframe-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-iframe-parent.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-iframe-parent.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-iframe-sibling.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-iframe-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-iframe-sibling.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-iframe-sibling.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-image.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-image.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-image.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-mask.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-mask.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-mask.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-mask.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-overflowing-child-of-blended-element.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-overflowing-child-of-blended-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-overflowing-child-of-blended-element.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-overflowing-child-of-blended-element.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-overflowing-child.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-overflowing-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-overflowing-child.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-overflowing-child.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-paragraph-background-image.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-paragraph-background-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-paragraph-background-image.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-paragraph-background-image.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-element-overflow-hidden-and-border-radius.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-element-overflow-hidden-and-border-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-element-overflow-hidden-and-border-radius.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-element-overflow-hidden-and-border-radius.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-element-overflow-scroll-blended-position-fixed.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-element-overflow-scroll-blended-position-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-element-overflow-scroll-blended-position-fixed.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-element-overflow-scroll-blended-position-fixed.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-element-overflow-scroll.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-element-overflow-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-element-overflow-scroll.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-element-overflow-scroll.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform-and-transition.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform-and-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform-and-transition.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform-and-transition.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-text.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-text.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-text.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-text.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parsing.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-parsing.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-parsing.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-basic.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-basic.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-basic.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-svg-basic.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-svg-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-svg-basic.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-svg-basic.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-svg.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-svg.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-svg.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-rotated-clip.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-rotated-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-rotated-clip.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-rotated-clip.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-script.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-script.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-script.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-script.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-sibling-with-3D-transform-and-transition.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-sibling-with-3D-transform-and-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-sibling-with-3D-transform-and-transition.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-sibling-with-3D-transform-and-transition.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-sibling-with-3D-transform.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-sibling-with-3D-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-sibling-with-3D-transform.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-sibling-with-3D-transform.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-simple.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-simple.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-simple.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-simple.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-stacking-context-001.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-stacking-context-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-stacking-context-001.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-stacking-context-001.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-stacking-context-creates-isolation.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-stacking-context-creates-isolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-stacking-context-creates-isolation.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-stacking-context-creates-isolation.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-svg.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-svg.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-svg.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-video-sibling.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-video-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-video-sibling.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-video-sibling.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-video.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-video.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-video.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-video.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-with-transform-and-preserve-3D.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-with-transform-and-preserve-3D.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/mix-blend-mode-with-transform-and-preserve-3D.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-with-transform-and-preserve-3D.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/green-square.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/green-square.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/green-square.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/green-square.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-animation-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-animation-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-element-overflow-hidden-and-border-radius-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-element-overflow-hidden-and-border-radius-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-element-overflow-hidden-and-border-radius-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-element-overflow-hidden-and-border-radius-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-element-overflow-scroll-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-element-overflow-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-element-overflow-scroll-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-element-overflow-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-element-with-transparent-pixels-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-element-with-transparent-pixels-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-element-with-transparent-pixels-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-element-with-transparent-pixels-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-with-3D-transform-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-with-3D-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-with-3D-transform-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-with-3D-transform-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-with-transform-and-perspective-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-with-transform-and-perspective-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-with-transform-and-perspective-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-blended-with-transform-and-perspective-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-border-image-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-border-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-border-image-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-border-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-both-parent-and-blended-with-3D-transform-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-both-parent-and-blended-with-3D-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-both-parent-and-blended-with-3D-transform-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-both-parent-and-blended-with-3D-transform-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-canvas-parent-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-canvas-parent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-canvas-parent-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-canvas-parent-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-canvas-sibling-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-canvas-sibling-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-canvas-sibling-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-canvas-sibling-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-filter-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-filter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-filter-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-filter-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-iframe-parent-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-iframe-parent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-iframe-parent-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-iframe-parent-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-iframe-sibling-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-iframe-sibling-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-iframe-sibling-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-iframe-sibling-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-image-notref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-image-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-image-notref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-image-notref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-mask-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-mask-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-mask-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-mask-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-overflowing-child-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-overflowing-child-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-overflowing-child-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-overflowing-child-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-paragraph-background-image-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-paragraph-background-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-paragraph-background-image-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-paragraph-background-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-paragraph-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-paragraph-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-paragraph-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-paragraph-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-element-overflow-hidden-and-border-radius-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-element-overflow-hidden-and-border-radius-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-element-overflow-hidden-and-border-radius-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-element-overflow-hidden-and-border-radius-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-element-overflow-scroll-blended-position-fixed-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-element-overflow-scroll-blended-position-fixed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-element-overflow-scroll-blended-position-fixed-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-element-overflow-scroll-blended-position-fixed-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-element-overflow-scroll-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-element-overflow-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-element-overflow-scroll-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-element-overflow-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-with-3D-transform-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-with-3D-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-with-3D-transform-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-with-3D-transform-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-with-border-radius-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-with-border-radius-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-with-border-radius-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-with-border-radius-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-with-text-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-with-text-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-with-text-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-parent-with-text-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-basic-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-basic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-basic-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-basic-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-svg-basic-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-svg-basic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-svg-basic-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-svg-basic-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-svg-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-svg-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-plus-lighter-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-rotated-clip-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-rotated-clip-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-rotated-clip-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-rotated-clip-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-script-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-script-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-script-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-script-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-sibling-with-3D-transform-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-sibling-with-3D-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-sibling-with-3D-transform-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-sibling-with-3D-transform-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-stacking-context-001-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-stacking-context-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-stacking-context-001-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-stacking-context-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-stacking-context-creates-isolation-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-stacking-context-creates-isolation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-stacking-context-creates-isolation-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-stacking-context-creates-isolation-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-svg-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-svg-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-video-notref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-video-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-video-notref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-video-notref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-video-sibling-notref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-video-sibling-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-video-sibling-notref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-video-sibling-notref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-with-transform-and-preserve-3D-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-with-transform-and-preserve-3D-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-with-transform-and-preserve-3D-ref.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/reference/mix-blend-mode-with-transform-and-preserve-3D-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/RGB_Circles.mov b/tests/wpt/tests/css/compositing/mix-blend-mode/support/RGB_Circles.mov similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/RGB_Circles.mov rename to tests/wpt/tests/css/compositing/mix-blend-mode/support/RGB_Circles.mov diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/RGB_Circles.mp4 b/tests/wpt/tests/css/compositing/mix-blend-mode/support/RGB_Circles.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/RGB_Circles.mp4 rename to tests/wpt/tests/css/compositing/mix-blend-mode/support/RGB_Circles.mp4 diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/RGB_Circles.oggtheora.ogv b/tests/wpt/tests/css/compositing/mix-blend-mode/support/RGB_Circles.oggtheora.ogv similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/RGB_Circles.oggtheora.ogv rename to tests/wpt/tests/css/compositing/mix-blend-mode/support/RGB_Circles.oggtheora.ogv diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/RGB_Circles.webmhd.webm b/tests/wpt/tests/css/compositing/mix-blend-mode/support/RGB_Circles.webmhd.webm similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/RGB_Circles.webmhd.webm rename to tests/wpt/tests/css/compositing/mix-blend-mode/support/RGB_Circles.webmhd.webm diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/RGB_Circles.webmsd.webm b/tests/wpt/tests/css/compositing/mix-blend-mode/support/RGB_Circles.webmsd.webm similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/RGB_Circles.webmsd.webm rename to tests/wpt/tests/css/compositing/mix-blend-mode/support/RGB_Circles.webmsd.webm diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/red.png b/tests/wpt/tests/css/compositing/mix-blend-mode/support/red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/red.png rename to tests/wpt/tests/css/compositing/mix-blend-mode/support/red.png diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/red_circle.mp4 b/tests/wpt/tests/css/compositing/mix-blend-mode/support/red_circle.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/red_circle.mp4 rename to tests/wpt/tests/css/compositing/mix-blend-mode/support/red_circle.mp4 diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/red_circle.svg b/tests/wpt/tests/css/compositing/mix-blend-mode/support/red_circle.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/red_circle.svg rename to tests/wpt/tests/css/compositing/mix-blend-mode/support/red_circle.svg diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/red_square.html b/tests/wpt/tests/css/compositing/mix-blend-mode/support/red_square.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/red_square.html rename to tests/wpt/tests/css/compositing/mix-blend-mode/support/red_square.html diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/red_square.svg b/tests/wpt/tests/css/compositing/mix-blend-mode/support/red_square.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/red_square.svg rename to tests/wpt/tests/css/compositing/mix-blend-mode/support/red_square.svg diff --git a/tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/yellow_square.svg b/tests/wpt/tests/css/compositing/mix-blend-mode/support/yellow_square.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/mix-blend-mode/support/yellow_square.svg rename to tests/wpt/tests/css/compositing/mix-blend-mode/support/yellow_square.svg diff --git a/tests/wpt/web-platform-tests/css/compositing/opacity-and-transform-animation-crash.html b/tests/wpt/tests/css/compositing/opacity-and-transform-animation-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/opacity-and-transform-animation-crash.html rename to tests/wpt/tests/css/compositing/opacity-and-transform-animation-crash.html diff --git a/tests/wpt/web-platform-tests/css/compositing/parsing/background-blend-mode-computed.html b/tests/wpt/tests/css/compositing/parsing/background-blend-mode-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/parsing/background-blend-mode-computed.html rename to tests/wpt/tests/css/compositing/parsing/background-blend-mode-computed.html diff --git a/tests/wpt/web-platform-tests/css/compositing/parsing/background-blend-mode-invalid.html b/tests/wpt/tests/css/compositing/parsing/background-blend-mode-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/parsing/background-blend-mode-invalid.html rename to tests/wpt/tests/css/compositing/parsing/background-blend-mode-invalid.html diff --git a/tests/wpt/web-platform-tests/css/compositing/parsing/background-blend-mode-valid.html b/tests/wpt/tests/css/compositing/parsing/background-blend-mode-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/parsing/background-blend-mode-valid.html rename to tests/wpt/tests/css/compositing/parsing/background-blend-mode-valid.html diff --git a/tests/wpt/web-platform-tests/css/compositing/parsing/isolation-computed.html b/tests/wpt/tests/css/compositing/parsing/isolation-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/parsing/isolation-computed.html rename to tests/wpt/tests/css/compositing/parsing/isolation-computed.html diff --git a/tests/wpt/web-platform-tests/css/compositing/parsing/isolation-invalid.html b/tests/wpt/tests/css/compositing/parsing/isolation-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/parsing/isolation-invalid.html rename to tests/wpt/tests/css/compositing/parsing/isolation-invalid.html diff --git a/tests/wpt/web-platform-tests/css/compositing/parsing/isolation-valid.html b/tests/wpt/tests/css/compositing/parsing/isolation-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/parsing/isolation-valid.html rename to tests/wpt/tests/css/compositing/parsing/isolation-valid.html diff --git a/tests/wpt/web-platform-tests/css/compositing/parsing/mix-blend-mode-computed.html b/tests/wpt/tests/css/compositing/parsing/mix-blend-mode-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/parsing/mix-blend-mode-computed.html rename to tests/wpt/tests/css/compositing/parsing/mix-blend-mode-computed.html diff --git a/tests/wpt/web-platform-tests/css/compositing/parsing/mix-blend-mode-invalid.html b/tests/wpt/tests/css/compositing/parsing/mix-blend-mode-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/parsing/mix-blend-mode-invalid.html rename to tests/wpt/tests/css/compositing/parsing/mix-blend-mode-invalid.html diff --git a/tests/wpt/web-platform-tests/css/compositing/parsing/mix-blend-mode-valid.html b/tests/wpt/tests/css/compositing/parsing/mix-blend-mode-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/parsing/mix-blend-mode-valid.html rename to tests/wpt/tests/css/compositing/parsing/mix-blend-mode-valid.html diff --git a/tests/wpt/web-platform-tests/css/compositing/root-element-background-transparency-ref.html b/tests/wpt/tests/css/compositing/root-element-background-transparency-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/root-element-background-transparency-ref.html rename to tests/wpt/tests/css/compositing/root-element-background-transparency-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/root-element-background-transparency.html b/tests/wpt/tests/css/compositing/root-element-background-transparency.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/root-element-background-transparency.html rename to tests/wpt/tests/css/compositing/root-element-background-transparency.html diff --git a/tests/wpt/web-platform-tests/css/compositing/root-element-blend-mode-ref.html b/tests/wpt/tests/css/compositing/root-element-blend-mode-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/root-element-blend-mode-ref.html rename to tests/wpt/tests/css/compositing/root-element-blend-mode-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/root-element-blend-mode.html b/tests/wpt/tests/css/compositing/root-element-blend-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/root-element-blend-mode.html rename to tests/wpt/tests/css/compositing/root-element-blend-mode.html diff --git a/tests/wpt/web-platform-tests/css/compositing/root-element-filter-background-clip-text-crash.html b/tests/wpt/tests/css/compositing/root-element-filter-background-clip-text-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/root-element-filter-background-clip-text-crash.html rename to tests/wpt/tests/css/compositing/root-element-filter-background-clip-text-crash.html diff --git a/tests/wpt/web-platform-tests/css/compositing/root-element-filter-ref.html b/tests/wpt/tests/css/compositing/root-element-filter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/root-element-filter-ref.html rename to tests/wpt/tests/css/compositing/root-element-filter-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/root-element-filter.html b/tests/wpt/tests/css/compositing/root-element-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/root-element-filter.html rename to tests/wpt/tests/css/compositing/root-element-filter.html diff --git a/tests/wpt/web-platform-tests/css/compositing/root-element-opacity-change-ref.html b/tests/wpt/tests/css/compositing/root-element-opacity-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/root-element-opacity-change-ref.html rename to tests/wpt/tests/css/compositing/root-element-opacity-change-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/root-element-opacity-change.html b/tests/wpt/tests/css/compositing/root-element-opacity-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/root-element-opacity-change.html rename to tests/wpt/tests/css/compositing/root-element-opacity-change.html diff --git a/tests/wpt/web-platform-tests/css/compositing/root-element-opacity-ref.html b/tests/wpt/tests/css/compositing/root-element-opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/root-element-opacity-ref.html rename to tests/wpt/tests/css/compositing/root-element-opacity-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/root-element-opacity.html b/tests/wpt/tests/css/compositing/root-element-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/root-element-opacity.html rename to tests/wpt/tests/css/compositing/root-element-opacity.html diff --git a/tests/wpt/web-platform-tests/css/compositing/support/plus-lighter.js b/tests/wpt/tests/css/compositing/support/plus-lighter.js similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/support/plus-lighter.js rename to tests/wpt/tests/css/compositing/support/plus-lighter.js diff --git a/tests/wpt/web-platform-tests/css/compositing/support/utils.js b/tests/wpt/tests/css/compositing/support/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/support/utils.js rename to tests/wpt/tests/css/compositing/support/utils.js diff --git a/tests/wpt/web-platform-tests/css/compositing/svg/mix-blend-mode-in-svg-image.html b/tests/wpt/tests/css/compositing/svg/mix-blend-mode-in-svg-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/svg/mix-blend-mode-in-svg-image.html rename to tests/wpt/tests/css/compositing/svg/mix-blend-mode-in-svg-image.html diff --git a/tests/wpt/web-platform-tests/css/compositing/svg/mix-blend-mode-svg-rectangle.html b/tests/wpt/tests/css/compositing/svg/mix-blend-mode-svg-rectangle.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/svg/mix-blend-mode-svg-rectangle.html rename to tests/wpt/tests/css/compositing/svg/mix-blend-mode-svg-rectangle.html diff --git a/tests/wpt/web-platform-tests/css/compositing/svg/reference/mix-blend-mode-in-svg-image-ref.html b/tests/wpt/tests/css/compositing/svg/reference/mix-blend-mode-in-svg-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/svg/reference/mix-blend-mode-in-svg-image-ref.html rename to tests/wpt/tests/css/compositing/svg/reference/mix-blend-mode-in-svg-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/svg/reference/mix-blend-mode-svg-rectangle-ref.html b/tests/wpt/tests/css/compositing/svg/reference/mix-blend-mode-svg-rectangle-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/svg/reference/mix-blend-mode-svg-rectangle-ref.html rename to tests/wpt/tests/css/compositing/svg/reference/mix-blend-mode-svg-rectangle-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/svg/support/green_square_blending.svg b/tests/wpt/tests/css/compositing/svg/support/green_square_blending.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/svg/support/green_square_blending.svg rename to tests/wpt/tests/css/compositing/svg/support/green_square_blending.svg diff --git a/tests/wpt/web-platform-tests/css/compositing/test-plan/css-blending-test-plan-proposal.html b/tests/wpt/tests/css/compositing/test-plan/css-blending-test-plan-proposal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/test-plan/css-blending-test-plan-proposal.html rename to tests/wpt/tests/css/compositing/test-plan/css-blending-test-plan-proposal.html diff --git a/tests/wpt/web-platform-tests/css/compositing/test-plan/test-plan.html b/tests/wpt/tests/css/compositing/test-plan/test-plan.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/test-plan/test-plan.html rename to tests/wpt/tests/css/compositing/test-plan/test-plan.html diff --git a/tests/wpt/web-platform-tests/css/compositing/test-plan/test-plan.src.html b/tests/wpt/tests/css/compositing/test-plan/test-plan.src.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/test-plan/test-plan.src.html rename to tests/wpt/tests/css/compositing/test-plan/test-plan.src.html diff --git a/tests/wpt/web-platform-tests/css/compositing/test-plan/test_template.png b/tests/wpt/tests/css/compositing/test-plan/test_template.png similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/test-plan/test_template.png rename to tests/wpt/tests/css/compositing/test-plan/test_template.png diff --git a/tests/wpt/web-platform-tests/css/compositing/text-with-svg-background-ref.html b/tests/wpt/tests/css/compositing/text-with-svg-background-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/text-with-svg-background-ref.html rename to tests/wpt/tests/css/compositing/text-with-svg-background-ref.html diff --git a/tests/wpt/web-platform-tests/css/compositing/text-with-svg-background.html b/tests/wpt/tests/css/compositing/text-with-svg-background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/compositing/text-with-svg-background.html rename to tests/wpt/tests/css/compositing/text-with-svg-background.html diff --git a/tests/wpt/web-platform-tests/css/css-align/META.yml b/tests/wpt/tests/css/css-align/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/META.yml rename to tests/wpt/tests/css/css-align/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-align/animation/align-no-interpolation.html b/tests/wpt/tests/css/css-align/animation/align-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/animation/align-no-interpolation.html rename to tests/wpt/tests/css/css-align/animation/align-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-align/animation/column-gap-composition.html b/tests/wpt/tests/css/css-align/animation/column-gap-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/animation/column-gap-composition.html rename to tests/wpt/tests/css/css-align/animation/column-gap-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-align/animation/column-gap-interpolation.html b/tests/wpt/tests/css/css-align/animation/column-gap-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/animation/column-gap-interpolation.html rename to tests/wpt/tests/css/css-align/animation/column-gap-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-align/animation/justify-no-interpolation.html b/tests/wpt/tests/css/css-align/animation/justify-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/animation/justify-no-interpolation.html rename to tests/wpt/tests/css/css-align/animation/justify-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-align/animation/row-gap-composition.html b/tests/wpt/tests/css/css-align/animation/row-gap-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/animation/row-gap-composition.html rename to tests/wpt/tests/css/css-align/animation/row-gap-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-align/animation/row-gap-interpolation.html b/tests/wpt/tests/css/css-align/animation/row-gap-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/animation/row-gap-interpolation.html rename to tests/wpt/tests/css/css-align/animation/row-gap-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-of-scrollable-1a.html b/tests/wpt/tests/css/css-align/baseline-of-scrollable-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-of-scrollable-1a.html rename to tests/wpt/tests/css/css-align/baseline-of-scrollable-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-of-scrollable-1b.html b/tests/wpt/tests/css/css-align/baseline-of-scrollable-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-of-scrollable-1b.html rename to tests/wpt/tests/css/css-align/baseline-of-scrollable-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-of-scrollable-2.html b/tests/wpt/tests/css/css-align/baseline-of-scrollable-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-of-scrollable-2.html rename to tests/wpt/tests/css/css-align/baseline-of-scrollable-2.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-rules/grid-item-input-type-number-ref.html b/tests/wpt/tests/css/css-align/baseline-rules/grid-item-input-type-number-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-rules/grid-item-input-type-number-ref.html rename to tests/wpt/tests/css/css-align/baseline-rules/grid-item-input-type-number-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-rules/grid-item-input-type-number.html b/tests/wpt/tests/css/css-align/baseline-rules/grid-item-input-type-number.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-rules/grid-item-input-type-number.html rename to tests/wpt/tests/css/css-align/baseline-rules/grid-item-input-type-number.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-rules/grid-item-input-type-text-ref.html b/tests/wpt/tests/css/css-align/baseline-rules/grid-item-input-type-text-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-rules/grid-item-input-type-text-ref.html rename to tests/wpt/tests/css/css-align/baseline-rules/grid-item-input-type-text-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-rules/grid-item-input-type-text.html b/tests/wpt/tests/css/css-align/baseline-rules/grid-item-input-type-text.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-rules/grid-item-input-type-text.html rename to tests/wpt/tests/css/css-align/baseline-rules/grid-item-input-type-text.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-rules/inline-table-inline-block-baseline-ref.html b/tests/wpt/tests/css/css-align/baseline-rules/inline-table-inline-block-baseline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-rules/inline-table-inline-block-baseline-ref.html rename to tests/wpt/tests/css/css-align/baseline-rules/inline-table-inline-block-baseline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-rules/inline-table-inline-block-baseline-vert-rl-ref.html b/tests/wpt/tests/css/css-align/baseline-rules/inline-table-inline-block-baseline-vert-rl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-rules/inline-table-inline-block-baseline-vert-rl-ref.html rename to tests/wpt/tests/css/css-align/baseline-rules/inline-table-inline-block-baseline-vert-rl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-rules/inline-table-inline-block-baseline-vert-rl.html b/tests/wpt/tests/css/css-align/baseline-rules/inline-table-inline-block-baseline-vert-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-rules/inline-table-inline-block-baseline-vert-rl.html rename to tests/wpt/tests/css/css-align/baseline-rules/inline-table-inline-block-baseline-vert-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-rules/inline-table-inline-block-baseline.html b/tests/wpt/tests/css/css-align/baseline-rules/inline-table-inline-block-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-rules/inline-table-inline-block-baseline.html rename to tests/wpt/tests/css/css-align/baseline-rules/inline-table-inline-block-baseline.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-rules/synthesized-baseline-flexbox-001.html b/tests/wpt/tests/css/css-align/baseline-rules/synthesized-baseline-flexbox-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-rules/synthesized-baseline-flexbox-001.html rename to tests/wpt/tests/css/css-align/baseline-rules/synthesized-baseline-flexbox-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-rules/synthesized-baseline-grid-001.html b/tests/wpt/tests/css/css-align/baseline-rules/synthesized-baseline-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-rules/synthesized-baseline-grid-001.html rename to tests/wpt/tests/css/css-align/baseline-rules/synthesized-baseline-grid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-rules/synthesized-baseline-inline-block-001.html b/tests/wpt/tests/css/css-align/baseline-rules/synthesized-baseline-inline-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-rules/synthesized-baseline-inline-block-001.html rename to tests/wpt/tests/css/css-align/baseline-rules/synthesized-baseline-inline-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-rules/synthesized-baseline-table-cell-001-ref.html b/tests/wpt/tests/css/css-align/baseline-rules/synthesized-baseline-table-cell-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-rules/synthesized-baseline-table-cell-001-ref.html rename to tests/wpt/tests/css/css-align/baseline-rules/synthesized-baseline-table-cell-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/baseline-rules/synthesized-baseline-table-cell-001.html b/tests/wpt/tests/css/css-align/baseline-rules/synthesized-baseline-table-cell-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/baseline-rules/synthesized-baseline-table-cell-001.html rename to tests/wpt/tests/css/css-align/baseline-rules/synthesized-baseline-table-cell-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-align-content-001.html b/tests/wpt/tests/css/css-align/content-distribution/parse-align-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-align-content-001.html rename to tests/wpt/tests/css/css-align/content-distribution/parse-align-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-align-content-002.html b/tests/wpt/tests/css/css-align/content-distribution/parse-align-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-align-content-002.html rename to tests/wpt/tests/css/css-align/content-distribution/parse-align-content-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-align-content-003.html b/tests/wpt/tests/css/css-align/content-distribution/parse-align-content-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-align-content-003.html rename to tests/wpt/tests/css/css-align/content-distribution/parse-align-content-003.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-align-content-004.html b/tests/wpt/tests/css/css-align/content-distribution/parse-align-content-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-align-content-004.html rename to tests/wpt/tests/css/css-align/content-distribution/parse-align-content-004.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-align-content-005.html b/tests/wpt/tests/css/css-align/content-distribution/parse-align-content-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-align-content-005.html rename to tests/wpt/tests/css/css-align/content-distribution/parse-align-content-005.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-justify-content-001.html b/tests/wpt/tests/css/css-align/content-distribution/parse-justify-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-justify-content-001.html rename to tests/wpt/tests/css/css-align/content-distribution/parse-justify-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-justify-content-002.html b/tests/wpt/tests/css/css-align/content-distribution/parse-justify-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-justify-content-002.html rename to tests/wpt/tests/css/css-align/content-distribution/parse-justify-content-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-justify-content-003.html b/tests/wpt/tests/css/css-align/content-distribution/parse-justify-content-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-justify-content-003.html rename to tests/wpt/tests/css/css-align/content-distribution/parse-justify-content-003.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-justify-content-004.html b/tests/wpt/tests/css/css-align/content-distribution/parse-justify-content-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-justify-content-004.html rename to tests/wpt/tests/css/css-align/content-distribution/parse-justify-content-004.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-justify-content-005.html b/tests/wpt/tests/css/css-align/content-distribution/parse-justify-content-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/parse-justify-content-005.html rename to tests/wpt/tests/css/css-align/content-distribution/parse-justify-content-005.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-001.html b/tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-001.html rename to tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-002.html b/tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-002.html rename to tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-003.html b/tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-003.html rename to tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-003.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-004.html b/tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-004.html rename to tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-004.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-005.html b/tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-005.html rename to tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-005.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-006.html b/tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-006.html rename to tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-006.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-007-ref.html b/tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-007-ref.html rename to tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-007.html b/tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-007.html rename to tests/wpt/tests/css/css-align/content-distribution/place-content-shorthand-007.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/justify-items-legacy-001.html b/tests/wpt/tests/css/css-align/default-alignment/justify-items-legacy-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/justify-items-legacy-001.html rename to tests/wpt/tests/css/css-align/default-alignment/justify-items-legacy-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-align-items-001.html b/tests/wpt/tests/css/css-align/default-alignment/parse-align-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-align-items-001.html rename to tests/wpt/tests/css/css-align/default-alignment/parse-align-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-align-items-002.html b/tests/wpt/tests/css/css-align/default-alignment/parse-align-items-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-align-items-002.html rename to tests/wpt/tests/css/css-align/default-alignment/parse-align-items-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-align-items-003.html b/tests/wpt/tests/css/css-align/default-alignment/parse-align-items-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-align-items-003.html rename to tests/wpt/tests/css/css-align/default-alignment/parse-align-items-003.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-align-items-004.html b/tests/wpt/tests/css/css-align/default-alignment/parse-align-items-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-align-items-004.html rename to tests/wpt/tests/css/css-align/default-alignment/parse-align-items-004.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-align-items-005.html b/tests/wpt/tests/css/css-align/default-alignment/parse-align-items-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-align-items-005.html rename to tests/wpt/tests/css/css-align/default-alignment/parse-align-items-005.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-justify-items-001.html b/tests/wpt/tests/css/css-align/default-alignment/parse-justify-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-justify-items-001.html rename to tests/wpt/tests/css/css-align/default-alignment/parse-justify-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-justify-items-002.html b/tests/wpt/tests/css/css-align/default-alignment/parse-justify-items-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-justify-items-002.html rename to tests/wpt/tests/css/css-align/default-alignment/parse-justify-items-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-justify-items-003.html b/tests/wpt/tests/css/css-align/default-alignment/parse-justify-items-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-justify-items-003.html rename to tests/wpt/tests/css/css-align/default-alignment/parse-justify-items-003.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-justify-items-004.html b/tests/wpt/tests/css/css-align/default-alignment/parse-justify-items-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-justify-items-004.html rename to tests/wpt/tests/css/css-align/default-alignment/parse-justify-items-004.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-justify-items-005.html b/tests/wpt/tests/css/css-align/default-alignment/parse-justify-items-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-justify-items-005.html rename to tests/wpt/tests/css/css-align/default-alignment/parse-justify-items-005.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-justify-items-006.html b/tests/wpt/tests/css/css-align/default-alignment/parse-justify-items-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/parse-justify-items-006.html rename to tests/wpt/tests/css/css-align/default-alignment/parse-justify-items-006.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-001.html b/tests/wpt/tests/css/css-align/default-alignment/place-items-shorthand-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-001.html rename to tests/wpt/tests/css/css-align/default-alignment/place-items-shorthand-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-002.html b/tests/wpt/tests/css/css-align/default-alignment/place-items-shorthand-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-002.html rename to tests/wpt/tests/css/css-align/default-alignment/place-items-shorthand-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-003.html b/tests/wpt/tests/css/css-align/default-alignment/place-items-shorthand-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-003.html rename to tests/wpt/tests/css/css-align/default-alignment/place-items-shorthand-003.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-004.html b/tests/wpt/tests/css/css-align/default-alignment/place-items-shorthand-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-004.html rename to tests/wpt/tests/css/css-align/default-alignment/place-items-shorthand-004.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-005.html b/tests/wpt/tests/css/css-align/default-alignment/place-items-shorthand-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-005.html rename to tests/wpt/tests/css/css-align/default-alignment/place-items-shorthand-005.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-006.html b/tests/wpt/tests/css/css-align/default-alignment/place-items-shorthand-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-006.html rename to tests/wpt/tests/css/css-align/default-alignment/place-items-shorthand-006.html diff --git a/tests/wpt/web-platform-tests/css/css-align/default-alignment/shorthand-serialization-001.html b/tests/wpt/tests/css/css-align/default-alignment/shorthand-serialization-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/default-alignment/shorthand-serialization-001.html rename to tests/wpt/tests/css/css-align/default-alignment/shorthand-serialization-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/distribution-values/space-evenly-001.html b/tests/wpt/tests/css/css-align/distribution-values/space-evenly-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/distribution-values/space-evenly-001.html rename to tests/wpt/tests/css/css-align/distribution-values/space-evenly-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/column-gap-animation-001.html b/tests/wpt/tests/css/css-align/gaps/column-gap-animation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/column-gap-animation-001.html rename to tests/wpt/tests/css/css-align/gaps/column-gap-animation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/column-gap-animation-002.html b/tests/wpt/tests/css/css-align/gaps/column-gap-animation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/column-gap-animation-002.html rename to tests/wpt/tests/css/css-align/gaps/column-gap-animation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/column-gap-animation-003.html b/tests/wpt/tests/css/css-align/gaps/column-gap-animation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/column-gap-animation-003.html rename to tests/wpt/tests/css/css-align/gaps/column-gap-animation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/column-gap-parsing-001.html b/tests/wpt/tests/css/css-align/gaps/column-gap-parsing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/column-gap-parsing-001.html rename to tests/wpt/tests/css/css-align/gaps/column-gap-parsing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/gap-animation-001.html b/tests/wpt/tests/css/css-align/gaps/gap-animation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/gap-animation-001.html rename to tests/wpt/tests/css/css-align/gaps/gap-animation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/gap-animation-002.html b/tests/wpt/tests/css/css-align/gaps/gap-animation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/gap-animation-002.html rename to tests/wpt/tests/css/css-align/gaps/gap-animation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/gap-animation-003.html b/tests/wpt/tests/css/css-align/gaps/gap-animation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/gap-animation-003.html rename to tests/wpt/tests/css/css-align/gaps/gap-animation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/gap-animation-004.html b/tests/wpt/tests/css/css-align/gaps/gap-animation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/gap-animation-004.html rename to tests/wpt/tests/css/css-align/gaps/gap-animation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/gap-normal-computed-001.html b/tests/wpt/tests/css/css-align/gaps/gap-normal-computed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/gap-normal-computed-001.html rename to tests/wpt/tests/css/css-align/gaps/gap-normal-computed-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/gap-normal-used-001.html b/tests/wpt/tests/css/css-align/gaps/gap-normal-used-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/gap-normal-used-001.html rename to tests/wpt/tests/css/css-align/gaps/gap-normal-used-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/gap-normal-used-002.html b/tests/wpt/tests/css/css-align/gaps/gap-normal-used-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/gap-normal-used-002.html rename to tests/wpt/tests/css/css-align/gaps/gap-normal-used-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/gap-parsing-001.html b/tests/wpt/tests/css/css-align/gaps/gap-parsing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/gap-parsing-001.html rename to tests/wpt/tests/css/css-align/gaps/gap-parsing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/grid-column-gap-parsing-001.html b/tests/wpt/tests/css/css-align/gaps/grid-column-gap-parsing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/grid-column-gap-parsing-001.html rename to tests/wpt/tests/css/css-align/gaps/grid-column-gap-parsing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/grid-gap-parsing-001.html b/tests/wpt/tests/css/css-align/gaps/grid-gap-parsing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/grid-gap-parsing-001.html rename to tests/wpt/tests/css/css-align/gaps/grid-gap-parsing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/grid-row-gap-parsing-001.html b/tests/wpt/tests/css/css-align/gaps/grid-row-gap-parsing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/grid-row-gap-parsing-001.html rename to tests/wpt/tests/css/css-align/gaps/grid-row-gap-parsing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/row-gap-animation-001.html b/tests/wpt/tests/css/css-align/gaps/row-gap-animation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/row-gap-animation-001.html rename to tests/wpt/tests/css/css-align/gaps/row-gap-animation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/row-gap-animation-002.html b/tests/wpt/tests/css/css-align/gaps/row-gap-animation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/row-gap-animation-002.html rename to tests/wpt/tests/css/css-align/gaps/row-gap-animation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/row-gap-animation-003.html b/tests/wpt/tests/css/css-align/gaps/row-gap-animation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/row-gap-animation-003.html rename to tests/wpt/tests/css/css-align/gaps/row-gap-animation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-align/gaps/row-gap-parsing-001.html b/tests/wpt/tests/css/css-align/gaps/row-gap-parsing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/gaps/row-gap-parsing-001.html rename to tests/wpt/tests/css/css-align/gaps/row-gap-parsing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/inheritance.html b/tests/wpt/tests/css/css-align/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/inheritance.html rename to tests/wpt/tests/css/css-align/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/align-content-computed.html b/tests/wpt/tests/css/css-align/parsing/align-content-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/align-content-computed.html rename to tests/wpt/tests/css/css-align/parsing/align-content-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/align-content-invalid.html b/tests/wpt/tests/css/css-align/parsing/align-content-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/align-content-invalid.html rename to tests/wpt/tests/css/css-align/parsing/align-content-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/align-content-valid.html b/tests/wpt/tests/css/css-align/parsing/align-content-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/align-content-valid.html rename to tests/wpt/tests/css/css-align/parsing/align-content-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/align-items-computed.html b/tests/wpt/tests/css/css-align/parsing/align-items-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/align-items-computed.html rename to tests/wpt/tests/css/css-align/parsing/align-items-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/align-items-invalid.html b/tests/wpt/tests/css/css-align/parsing/align-items-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/align-items-invalid.html rename to tests/wpt/tests/css/css-align/parsing/align-items-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/align-items-valid.html b/tests/wpt/tests/css/css-align/parsing/align-items-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/align-items-valid.html rename to tests/wpt/tests/css/css-align/parsing/align-items-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/align-self-computed.html b/tests/wpt/tests/css/css-align/parsing/align-self-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/align-self-computed.html rename to tests/wpt/tests/css/css-align/parsing/align-self-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/align-self-invalid.html b/tests/wpt/tests/css/css-align/parsing/align-self-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/align-self-invalid.html rename to tests/wpt/tests/css/css-align/parsing/align-self-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/align-self-valid.html b/tests/wpt/tests/css/css-align/parsing/align-self-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/align-self-valid.html rename to tests/wpt/tests/css/css-align/parsing/align-self-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/align-tracks-computed.html b/tests/wpt/tests/css/css-align/parsing/align-tracks-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/align-tracks-computed.html rename to tests/wpt/tests/css/css-align/parsing/align-tracks-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/align-tracks-invalid.html b/tests/wpt/tests/css/css-align/parsing/align-tracks-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/align-tracks-invalid.html rename to tests/wpt/tests/css/css-align/parsing/align-tracks-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/align-tracks-valid.html b/tests/wpt/tests/css/css-align/parsing/align-tracks-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/align-tracks-valid.html rename to tests/wpt/tests/css/css-align/parsing/align-tracks-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-computed.html b/tests/wpt/tests/css/css-align/parsing/column-gap-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-computed.html rename to tests/wpt/tests/css/css-align/parsing/column-gap-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-invalid.html b/tests/wpt/tests/css/css-align/parsing/column-gap-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-invalid.html rename to tests/wpt/tests/css/css-align/parsing/column-gap-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-valid.html b/tests/wpt/tests/css/css-align/parsing/column-gap-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/column-gap-valid.html rename to tests/wpt/tests/css/css-align/parsing/column-gap-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/gap-computed.html b/tests/wpt/tests/css/css-align/parsing/gap-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/gap-computed.html rename to tests/wpt/tests/css/css-align/parsing/gap-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/gap-invalid.html b/tests/wpt/tests/css/css-align/parsing/gap-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/gap-invalid.html rename to tests/wpt/tests/css/css-align/parsing/gap-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/gap-shorthand.html b/tests/wpt/tests/css/css-align/parsing/gap-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/gap-shorthand.html rename to tests/wpt/tests/css/css-align/parsing/gap-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/gap-valid.html b/tests/wpt/tests/css/css-align/parsing/gap-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/gap-valid.html rename to tests/wpt/tests/css/css-align/parsing/gap-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/justify-content-computed.html b/tests/wpt/tests/css/css-align/parsing/justify-content-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/justify-content-computed.html rename to tests/wpt/tests/css/css-align/parsing/justify-content-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/justify-content-invalid.html b/tests/wpt/tests/css/css-align/parsing/justify-content-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/justify-content-invalid.html rename to tests/wpt/tests/css/css-align/parsing/justify-content-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/justify-content-valid.html b/tests/wpt/tests/css/css-align/parsing/justify-content-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/justify-content-valid.html rename to tests/wpt/tests/css/css-align/parsing/justify-content-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/justify-items-computed.html b/tests/wpt/tests/css/css-align/parsing/justify-items-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/justify-items-computed.html rename to tests/wpt/tests/css/css-align/parsing/justify-items-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/justify-items-invalid.html b/tests/wpt/tests/css/css-align/parsing/justify-items-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/justify-items-invalid.html rename to tests/wpt/tests/css/css-align/parsing/justify-items-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/justify-items-valid.html b/tests/wpt/tests/css/css-align/parsing/justify-items-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/justify-items-valid.html rename to tests/wpt/tests/css/css-align/parsing/justify-items-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/justify-self-computed.html b/tests/wpt/tests/css/css-align/parsing/justify-self-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/justify-self-computed.html rename to tests/wpt/tests/css/css-align/parsing/justify-self-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/justify-self-invalid.html b/tests/wpt/tests/css/css-align/parsing/justify-self-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/justify-self-invalid.html rename to tests/wpt/tests/css/css-align/parsing/justify-self-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/justify-self-valid.html b/tests/wpt/tests/css/css-align/parsing/justify-self-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/justify-self-valid.html rename to tests/wpt/tests/css/css-align/parsing/justify-self-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/justify-tracks-computed.html b/tests/wpt/tests/css/css-align/parsing/justify-tracks-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/justify-tracks-computed.html rename to tests/wpt/tests/css/css-align/parsing/justify-tracks-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/justify-tracks-invalid.html b/tests/wpt/tests/css/css-align/parsing/justify-tracks-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/justify-tracks-invalid.html rename to tests/wpt/tests/css/css-align/parsing/justify-tracks-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/justify-tracks-valid.html b/tests/wpt/tests/css/css-align/parsing/justify-tracks-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/justify-tracks-valid.html rename to tests/wpt/tests/css/css-align/parsing/justify-tracks-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/place-content-computed.html b/tests/wpt/tests/css/css-align/parsing/place-content-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/place-content-computed.html rename to tests/wpt/tests/css/css-align/parsing/place-content-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/place-content-invalid.html b/tests/wpt/tests/css/css-align/parsing/place-content-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/place-content-invalid.html rename to tests/wpt/tests/css/css-align/parsing/place-content-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/place-content-shorthand.html b/tests/wpt/tests/css/css-align/parsing/place-content-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/place-content-shorthand.html rename to tests/wpt/tests/css/css-align/parsing/place-content-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/place-content-valid.html b/tests/wpt/tests/css/css-align/parsing/place-content-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/place-content-valid.html rename to tests/wpt/tests/css/css-align/parsing/place-content-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/place-items-computed.html b/tests/wpt/tests/css/css-align/parsing/place-items-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/place-items-computed.html rename to tests/wpt/tests/css/css-align/parsing/place-items-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/place-items-invalid.html b/tests/wpt/tests/css/css-align/parsing/place-items-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/place-items-invalid.html rename to tests/wpt/tests/css/css-align/parsing/place-items-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/place-items-shorthand.html b/tests/wpt/tests/css/css-align/parsing/place-items-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/place-items-shorthand.html rename to tests/wpt/tests/css/css-align/parsing/place-items-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/place-items-valid.html b/tests/wpt/tests/css/css-align/parsing/place-items-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/place-items-valid.html rename to tests/wpt/tests/css/css-align/parsing/place-items-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/place-self-computed.html b/tests/wpt/tests/css/css-align/parsing/place-self-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/place-self-computed.html rename to tests/wpt/tests/css/css-align/parsing/place-self-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/place-self-invalid.html b/tests/wpt/tests/css/css-align/parsing/place-self-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/place-self-invalid.html rename to tests/wpt/tests/css/css-align/parsing/place-self-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/place-self-shorthand.html b/tests/wpt/tests/css/css-align/parsing/place-self-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/place-self-shorthand.html rename to tests/wpt/tests/css/css-align/parsing/place-self-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/place-self-valid.html b/tests/wpt/tests/css/css-align/parsing/place-self-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/place-self-valid.html rename to tests/wpt/tests/css/css-align/parsing/place-self-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-computed.html b/tests/wpt/tests/css/css-align/parsing/row-gap-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-computed.html rename to tests/wpt/tests/css/css-align/parsing/row-gap-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-invalid.html b/tests/wpt/tests/css/css-align/parsing/row-gap-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-invalid.html rename to tests/wpt/tests/css/css-align/parsing/row-gap-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-valid.html b/tests/wpt/tests/css/css-align/parsing/row-gap-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/parsing/row-gap-valid.html rename to tests/wpt/tests/css/css-align/parsing/row-gap-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-align/reference/baseline-of-scrollable-1-ref.html b/tests/wpt/tests/css/css-align/reference/baseline-of-scrollable-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/reference/baseline-of-scrollable-1-ref.html rename to tests/wpt/tests/css/css-align/reference/baseline-of-scrollable-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/reference/baseline-of-scrollable-2-ref.html b/tests/wpt/tests/css/css-align/reference/baseline-of-scrollable-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/reference/baseline-of-scrollable-2-ref.html rename to tests/wpt/tests/css/css-align/reference/baseline-of-scrollable-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/reference/ttwf-reftest-alignContent-ref.html b/tests/wpt/tests/css/css-align/reference/ttwf-reftest-alignContent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/reference/ttwf-reftest-alignContent-ref.html rename to tests/wpt/tests/css/css-align/reference/ttwf-reftest-alignContent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/resources/alignment-parsing-utils.js b/tests/wpt/tests/css/css-align/resources/alignment-parsing-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/resources/alignment-parsing-utils.js rename to tests/wpt/tests/css/css-align/resources/alignment-parsing-utils.js diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-align-self-001.html b/tests/wpt/tests/css/css-align/self-alignment/parse-align-self-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-align-self-001.html rename to tests/wpt/tests/css/css-align/self-alignment/parse-align-self-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-align-self-002.html b/tests/wpt/tests/css/css-align/self-alignment/parse-align-self-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-align-self-002.html rename to tests/wpt/tests/css/css-align/self-alignment/parse-align-self-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-align-self-003.html b/tests/wpt/tests/css/css-align/self-alignment/parse-align-self-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-align-self-003.html rename to tests/wpt/tests/css/css-align/self-alignment/parse-align-self-003.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-align-self-004.html b/tests/wpt/tests/css/css-align/self-alignment/parse-align-self-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-align-self-004.html rename to tests/wpt/tests/css/css-align/self-alignment/parse-align-self-004.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-align-self-005.html b/tests/wpt/tests/css/css-align/self-alignment/parse-align-self-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-align-self-005.html rename to tests/wpt/tests/css/css-align/self-alignment/parse-align-self-005.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-justify-self-001.html b/tests/wpt/tests/css/css-align/self-alignment/parse-justify-self-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-justify-self-001.html rename to tests/wpt/tests/css/css-align/self-alignment/parse-justify-self-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-justify-self-002.html b/tests/wpt/tests/css/css-align/self-alignment/parse-justify-self-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-justify-self-002.html rename to tests/wpt/tests/css/css-align/self-alignment/parse-justify-self-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-justify-self-003.html b/tests/wpt/tests/css/css-align/self-alignment/parse-justify-self-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-justify-self-003.html rename to tests/wpt/tests/css/css-align/self-alignment/parse-justify-self-003.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-justify-self-004.html b/tests/wpt/tests/css/css-align/self-alignment/parse-justify-self-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-justify-self-004.html rename to tests/wpt/tests/css/css-align/self-alignment/parse-justify-self-004.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-justify-self-005.html b/tests/wpt/tests/css/css-align/self-alignment/parse-justify-self-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/parse-justify-self-005.html rename to tests/wpt/tests/css/css-align/self-alignment/parse-justify-self-005.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-001.html b/tests/wpt/tests/css/css-align/self-alignment/place-self-shorthand-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-001.html rename to tests/wpt/tests/css/css-align/self-alignment/place-self-shorthand-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-002.html b/tests/wpt/tests/css/css-align/self-alignment/place-self-shorthand-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-002.html rename to tests/wpt/tests/css/css-align/self-alignment/place-self-shorthand-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-003.html b/tests/wpt/tests/css/css-align/self-alignment/place-self-shorthand-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-003.html rename to tests/wpt/tests/css/css-align/self-alignment/place-self-shorthand-003.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-004.html b/tests/wpt/tests/css/css-align/self-alignment/place-self-shorthand-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-004.html rename to tests/wpt/tests/css/css-align/self-alignment/place-self-shorthand-004.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-005.html b/tests/wpt/tests/css/css-align/self-alignment/place-self-shorthand-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-005.html rename to tests/wpt/tests/css/css-align/self-alignment/place-self-shorthand-005.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-006.html b/tests/wpt/tests/css/css-align/self-alignment/place-self-shorthand-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-006.html rename to tests/wpt/tests/css/css-align/self-alignment/place-self-shorthand-006.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-001-ref.html b/tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-001-ref.html rename to tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-001.html b/tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-001.html rename to tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-002-ref.html b/tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-002-ref.html rename to tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-002.html b/tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-002.html rename to tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-003-ref.html b/tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-003-ref.html rename to tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-003.html b/tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-003.html rename to tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-flex-003.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-001-ref.html b/tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-001-ref.html rename to tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-001.html b/tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-001.html rename to tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-002-ref.html b/tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-002-ref.html rename to tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-002.html b/tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-002.html rename to tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-002.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-003-ref.html b/tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-003-ref.html rename to tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-003.html b/tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-003.html rename to tests/wpt/tests/css/css-align/self-alignment/self-align-safe-unsafe-grid-003.html diff --git a/tests/wpt/web-platform-tests/css/css-align/ttwf-reftest-alignContent.html b/tests/wpt/tests/css/css-align/ttwf-reftest-alignContent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-align/ttwf-reftest-alignContent.html rename to tests/wpt/tests/css/css-align/ttwf-reftest-alignContent.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-default-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-default-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-default-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-default-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-default-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-default-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-default-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-default-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-default-003.html b/tests/wpt/tests/css/css-anchor-position/anchor-default-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-default-003.html rename to tests/wpt/tests/css/css-anchor-position/anchor-default-003.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-default-basics.html b/tests/wpt/tests/css/css-anchor-position/anchor-default-basics.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-default-basics.html rename to tests/wpt/tests/css/css-anchor-position/anchor-default-basics.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-default-ref.html b/tests/wpt/tests/css/css-anchor-position/anchor-default-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-default-ref.html rename to tests/wpt/tests/css/css-anchor-position/anchor-default-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-getComputedStyle.html b/tests/wpt/tests/css/css-anchor-position/anchor-getComputedStyle.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-getComputedStyle.html rename to tests/wpt/tests/css/css-anchor-position/anchor-getComputedStyle.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-name-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-name-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-name-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-name-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-003.html b/tests/wpt/tests/css/css-anchor-position/anchor-name-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-003.html rename to tests/wpt/tests/css/css-anchor-position/anchor-name-003.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-basics.html b/tests/wpt/tests/css/css-anchor-position/anchor-name-basics.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-basics.html rename to tests/wpt/tests/css/css-anchor-position/anchor-name-basics.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-cross-shadow.html b/tests/wpt/tests/css/css-anchor-position/anchor-name-cross-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-cross-shadow.html rename to tests/wpt/tests/css/css-anchor-position/anchor-name-cross-shadow.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-in-shadow-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-name-in-shadow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-in-shadow-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-name-in-shadow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-in-shadow.html b/tests/wpt/tests/css/css-anchor-position/anchor-name-in-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-in-shadow.html rename to tests/wpt/tests/css/css-anchor-position/anchor-name-in-shadow.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-inline-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-name-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-inline-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-name-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-multicol-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-name-multicol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-multicol-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-name-multicol-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-multicol-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-name-multicol-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-multicol-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-name-multicol-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-multicol-003.html b/tests/wpt/tests/css/css-anchor-position/anchor-name-multicol-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-multicol-003.html rename to tests/wpt/tests/css/css-anchor-position/anchor-name-multicol-003.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-multicol-004.html b/tests/wpt/tests/css/css-anchor-position/anchor-name-multicol-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-name-multicol-004.html rename to tests/wpt/tests/css/css-anchor-position/anchor-name-multicol-004.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-non-oof-inherit.html b/tests/wpt/tests/css/css-anchor-position/anchor-non-oof-inherit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-non-oof-inherit.html rename to tests/wpt/tests/css/css-anchor-position/anchor-non-oof-inherit.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-parse-invalid.html b/tests/wpt/tests/css/css-anchor-position/anchor-parse-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-parse-invalid.html rename to tests/wpt/tests/css/css-anchor-position/anchor-parse-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-parse-valid.html b/tests/wpt/tests/css/css-anchor-position/anchor-parse-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-parse-valid.html rename to tests/wpt/tests/css/css-anchor-position/anchor-parse-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-003.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-003.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-003.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-004.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-004.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-004.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-auto-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-auto-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-auto-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-auto-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-auto-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-auto-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-auto-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-auto-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-auto-003.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-auto-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-auto-003.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-auto-003.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-borders-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-borders-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-borders-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-borders-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-borders-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-borders-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-borders-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-borders-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-dynamic-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-dynamic-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-dynamic-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-dynamic-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-dynamic-003.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-dynamic-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-dynamic-003.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-dynamic-003.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-dynamic-004.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-dynamic-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-dynamic-004.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-dynamic-004.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-grid-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-grid-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-grid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-inline-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-inline-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-inline-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-inline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-inline-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-inline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-inline-003.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-inline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-inline-003.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-inline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-inline-004.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-inline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-inline-004.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-inline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-003.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-003.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-003.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-004.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-004.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-004.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-005.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-005.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-005.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-006.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-006.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-006.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-colspan-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-colspan-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-colspan-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-colspan-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-colspan-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-colspan-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-colspan-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-colspan-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-fixed-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-fixed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-fixed-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-fixed-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-nested-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-nested-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-multicol-nested-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-nested-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-principal-box.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-principal-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-principal-box.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-principal-box.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-top-layer-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-top-layer-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-top-layer-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-top-layer-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-top-layer-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-top-layer-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-top-layer-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-top-layer-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-top-layer-003.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-top-layer-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-top-layer-003.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-top-layer-003.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-top-layer-004.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-top-layer-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-top-layer-004.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-top-layer-004.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-top-layer-005.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-top-layer-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-top-layer-005.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-top-layer-005.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-top-layer-006.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-top-layer-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-top-layer-006.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-top-layer-006.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-top-layer-ref.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-top-layer-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-top-layer-ref.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-top-layer-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-writing-modes-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-writing-modes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-writing-modes-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-writing-modes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-writing-modes-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-writing-modes-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-position-writing-modes-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-position-writing-modes-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-query-custom-property-registration.html b/tests/wpt/tests/css/css-anchor-position/anchor-query-custom-property-registration.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-query-custom-property-registration.html rename to tests/wpt/tests/css/css-anchor-position/anchor-query-custom-property-registration.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-query-fallback.html b/tests/wpt/tests/css/css-anchor-position/anchor-query-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-query-fallback.html rename to tests/wpt/tests/css/css-anchor-position/anchor-query-fallback.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-003.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-003.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-003.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-004.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-004.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-004.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-basics.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-basics.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-basics.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-basics.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-composited-scrolling-001-crash.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-composited-scrolling-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-composited-scrolling-001-crash.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-composited-scrolling-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-composited-scrolling-002-crash.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-composited-scrolling-002-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-composited-scrolling-002-crash.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-composited-scrolling-002-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-composited-scrolling-003-crash.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-composited-scrolling-003-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-composited-scrolling-003-crash.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-composited-scrolling-003-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-composited-scrolling-004-crash.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-composited-scrolling-004-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-composited-scrolling-004-crash.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-composited-scrolling-004-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-composited-scrolling-005-crash.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-composited-scrolling-005-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-composited-scrolling-005-crash.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-composited-scrolling-005-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-composited-scrolling-006.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-composited-scrolling-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-composited-scrolling-006.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-composited-scrolling-006.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-003.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-003.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-003.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-004.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-004.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-004.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-005.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-005.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-005.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-006.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-006.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-006.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-007.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-007.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-007.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-008.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-008.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-008.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-009.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-009.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-009.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-010.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-010.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-010.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-011.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fallback-position-011.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-fallback-position-011.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fixedpos.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-fixedpos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-fixedpos.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-fixedpos.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-js-expose.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-js-expose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-js-expose.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-js-expose.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-nested.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-nested.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-update-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-update-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-update-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-update-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-update-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-update-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-update-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-update-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-update-003.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-update-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-update-003.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-update-003.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-update-004.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-update-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-update-004.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-update-004.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-update-005.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-update-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-update-005.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-update-005.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-update-006.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-update-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-update-006.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-update-006.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-update-007.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-update-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-update-007.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-update-007.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-vlr.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-vlr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-vlr.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-vlr.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-vrl.html b/tests/wpt/tests/css/css-anchor-position/anchor-scroll-vrl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-scroll-vrl.html rename to tests/wpt/tests/css/css-anchor-position/anchor-scroll-vrl.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-size-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-size-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-size-minmax-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-size-minmax-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-size-minmax-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-size-minmax-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-size-parse-invalid.html b/tests/wpt/tests/css/css-anchor-position/anchor-size-parse-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-size-parse-invalid.html rename to tests/wpt/tests/css/css-anchor-position/anchor-size-parse-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-size-parse-valid.html b/tests/wpt/tests/css/css-anchor-position/anchor-size-parse-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-size-parse-valid.html rename to tests/wpt/tests/css/css-anchor-position/anchor-size-parse-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-size-replaced-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-size-replaced-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-size-replaced-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-size-replaced-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-size-writing-modes-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-size-writing-modes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-size-writing-modes-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-size-writing-modes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-transition-001.html b/tests/wpt/tests/css/css-anchor-position/anchor-transition-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-transition-001.html rename to tests/wpt/tests/css/css-anchor-position/anchor-transition-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-transition-002.html b/tests/wpt/tests/css/css-anchor-position/anchor-transition-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-transition-002.html rename to tests/wpt/tests/css/css-anchor-position/anchor-transition-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/anchor-transition-003.html b/tests/wpt/tests/css/css-anchor-position/anchor-transition-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/anchor-transition-003.html rename to tests/wpt/tests/css/css-anchor-position/anchor-transition-003.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/at-fallback-position-allowed-declarations.html b/tests/wpt/tests/css/css-anchor-position/at-fallback-position-allowed-declarations.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/at-fallback-position-allowed-declarations.html rename to tests/wpt/tests/css/css-anchor-position/at-fallback-position-allowed-declarations.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/at-fallback-position-parse.html b/tests/wpt/tests/css/css-anchor-position/at-fallback-position-parse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/at-fallback-position-parse.html rename to tests/wpt/tests/css/css-anchor-position/at-fallback-position-parse.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/at-position-fallback-invalidation-shadow-dom.html b/tests/wpt/tests/css/css-anchor-position/at-position-fallback-invalidation-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/at-position-fallback-invalidation-shadow-dom.html rename to tests/wpt/tests/css/css-anchor-position/at-position-fallback-invalidation-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/at-position-fallback-invalidation.html b/tests/wpt/tests/css/css-anchor-position/at-position-fallback-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/at-position-fallback-invalidation.html rename to tests/wpt/tests/css/css-anchor-position/at-position-fallback-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-001.html b/tests/wpt/tests/css/css-anchor-position/position-fallback-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-001.html rename to tests/wpt/tests/css/css-anchor-position/position-fallback-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-002.html b/tests/wpt/tests/css/css-anchor-position/position-fallback-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-002.html rename to tests/wpt/tests/css/css-anchor-position/position-fallback-002.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-003.html b/tests/wpt/tests/css/css-anchor-position/position-fallback-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-003.html rename to tests/wpt/tests/css/css-anchor-position/position-fallback-003.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-basics.html b/tests/wpt/tests/css/css-anchor-position/position-fallback-basics.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-basics.html rename to tests/wpt/tests/css/css-anchor-position/position-fallback-basics.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-cascade-layer-reorder.html b/tests/wpt/tests/css/css-anchor-position/position-fallback-cascade-layer-reorder.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-cascade-layer-reorder.html rename to tests/wpt/tests/css/css-anchor-position/position-fallback-cascade-layer-reorder.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-custom-property.html b/tests/wpt/tests/css/css-anchor-position/position-fallback-custom-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-custom-property.html rename to tests/wpt/tests/css/css-anchor-position/position-fallback-custom-property.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-dynamic.html b/tests/wpt/tests/css/css-anchor-position/position-fallback-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-dynamic.html rename to tests/wpt/tests/css/css-anchor-position/position-fallback-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-grid-001.html b/tests/wpt/tests/css/css-anchor-position/position-fallback-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-grid-001.html rename to tests/wpt/tests/css/css-anchor-position/position-fallback-grid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-tree-scoped.html b/tests/wpt/tests/css/css-anchor-position/position-fallback-tree-scoped.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/position-fallback-tree-scoped.html rename to tests/wpt/tests/css/css-anchor-position/position-fallback-tree-scoped.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-composited-scrolling-006-ref.html b/tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-composited-scrolling-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-composited-scrolling-006-ref.html rename to tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-composited-scrolling-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-fixedpos-ref.html b/tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-fixedpos-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-fixedpos-ref.html rename to tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-fixedpos-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-nested-ref.html b/tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-nested-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-nested-ref.html rename to tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-nested-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-ref.html b/tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-ref.html rename to tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-update-005-ref.html b/tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-update-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-update-005-ref.html rename to tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-update-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-update-006-ref.html b/tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-update-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-update-006-ref.html rename to tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-update-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-vlr-ref.html b/tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-vlr-ref.html rename to tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-vrl-ref.html b/tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-vrl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/reference/anchor-scroll-vrl-ref.html rename to tests/wpt/tests/css/css-anchor-position/reference/anchor-scroll-vrl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/reference/sticky-anchor-position-invalid-ref.html b/tests/wpt/tests/css/css-anchor-position/reference/sticky-anchor-position-invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/reference/sticky-anchor-position-invalid-ref.html rename to tests/wpt/tests/css/css-anchor-position/reference/sticky-anchor-position-invalid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/sticky-anchor-position-invalid.html b/tests/wpt/tests/css/css-anchor-position/sticky-anchor-position-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/sticky-anchor-position-invalid.html rename to tests/wpt/tests/css/css-anchor-position/sticky-anchor-position-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/support/green-16x16.png b/tests/wpt/tests/css/css-anchor-position/support/green-16x16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/support/green-16x16.png rename to tests/wpt/tests/css/css-anchor-position/support/green-16x16.png diff --git a/tests/wpt/web-platform-tests/css/css-anchor-position/support/test-common.js b/tests/wpt/tests/css/css-anchor-position/support/test-common.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-anchor-position/support/test-common.js rename to tests/wpt/tests/css/css-anchor-position/support/test-common.js diff --git a/tests/wpt/web-platform-tests/css/css-animations/AnimationEffect-getComputedTiming.tentative.html b/tests/wpt/tests/css/css-animations/AnimationEffect-getComputedTiming.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/AnimationEffect-getComputedTiming.tentative.html rename to tests/wpt/tests/css/css-animations/AnimationEffect-getComputedTiming.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/AnimationEffect-updateTiming.tentative.html b/tests/wpt/tests/css/css-animations/AnimationEffect-updateTiming.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/AnimationEffect-updateTiming.tentative.html rename to tests/wpt/tests/css/css-animations/AnimationEffect-updateTiming.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-animationName.tentative.html b/tests/wpt/tests/css/css-animations/CSSAnimation-animationName.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-animationName.tentative.html rename to tests/wpt/tests/css/css-animations/CSSAnimation-animationName.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-canceling.tentative.html b/tests/wpt/tests/css/css-animations/CSSAnimation-canceling.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-canceling.tentative.html rename to tests/wpt/tests/css/css-animations/CSSAnimation-canceling.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-compositeOrder.tentative.html b/tests/wpt/tests/css/css-animations/CSSAnimation-compositeOrder.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-compositeOrder.tentative.html rename to tests/wpt/tests/css/css-animations/CSSAnimation-compositeOrder.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-effect.tentative.html b/tests/wpt/tests/css/css-animations/CSSAnimation-effect.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-effect.tentative.html rename to tests/wpt/tests/css/css-animations/CSSAnimation-effect.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-finished.tentative.html b/tests/wpt/tests/css/css-animations/CSSAnimation-finished.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-finished.tentative.html rename to tests/wpt/tests/css/css-animations/CSSAnimation-finished.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-getCurrentTime.tentative.html b/tests/wpt/tests/css/css-animations/CSSAnimation-getCurrentTime.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-getCurrentTime.tentative.html rename to tests/wpt/tests/css/css-animations/CSSAnimation-getCurrentTime.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-getKeyframes-crash.html b/tests/wpt/tests/css/css-animations/CSSAnimation-getKeyframes-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-getKeyframes-crash.html rename to tests/wpt/tests/css/css-animations/CSSAnimation-getKeyframes-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-id.tentative.html b/tests/wpt/tests/css/css-animations/CSSAnimation-id.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-id.tentative.html rename to tests/wpt/tests/css/css-animations/CSSAnimation-id.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-pausing.tentative.html b/tests/wpt/tests/css/css-animations/CSSAnimation-pausing.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-pausing.tentative.html rename to tests/wpt/tests/css/css-animations/CSSAnimation-pausing.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-playState.tentative.html b/tests/wpt/tests/css/css-animations/CSSAnimation-playState.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-playState.tentative.html rename to tests/wpt/tests/css/css-animations/CSSAnimation-playState.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-ready.tentative.html b/tests/wpt/tests/css/css-animations/CSSAnimation-ready.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-ready.tentative.html rename to tests/wpt/tests/css/css-animations/CSSAnimation-ready.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-startTime.tentative.html b/tests/wpt/tests/css/css-animations/CSSAnimation-startTime.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-startTime.tentative.html rename to tests/wpt/tests/css/css-animations/CSSAnimation-startTime.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/Document-getAnimations.tentative.html b/tests/wpt/tests/css/css-animations/Document-getAnimations.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/Document-getAnimations.tentative.html rename to tests/wpt/tests/css/css-animations/Document-getAnimations.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html b/tests/wpt/tests/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html rename to tests/wpt/tests/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/Element-getAnimations.tentative.html b/tests/wpt/tests/css/css-animations/Element-getAnimations.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/Element-getAnimations.tentative.html rename to tests/wpt/tests/css/css-animations/Element-getAnimations.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/KeyframeEffect-getKeyframes.tentative.html b/tests/wpt/tests/css/css-animations/KeyframeEffect-getKeyframes.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/KeyframeEffect-getKeyframes.tentative.html rename to tests/wpt/tests/css/css-animations/KeyframeEffect-getKeyframes.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/KeyframeEffect-setKeyframes.tentative.html b/tests/wpt/tests/css/css-animations/KeyframeEffect-setKeyframes.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/KeyframeEffect-setKeyframes.tentative.html rename to tests/wpt/tests/css/css-animations/KeyframeEffect-setKeyframes.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/KeyframeEffect-target.tentative.html b/tests/wpt/tests/css/css-animations/KeyframeEffect-target.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/KeyframeEffect-target.tentative.html rename to tests/wpt/tests/css/css-animations/KeyframeEffect-target.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/META.yml b/tests/wpt/tests/css/css-animations/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/META.yml rename to tests/wpt/tests/css/css-animations/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-base-response-001.html b/tests/wpt/tests/css/css-animations/animation-base-response-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-base-response-001.html rename to tests/wpt/tests/css/css-animations/animation-base-response-001.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-base-response-002.html b/tests/wpt/tests/css/css-animations/animation-base-response-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-base-response-002.html rename to tests/wpt/tests/css/css-animations/animation-base-response-002.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-base-response-003.html b/tests/wpt/tests/css/css-animations/animation-base-response-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-base-response-003.html rename to tests/wpt/tests/css/css-animations/animation-base-response-003.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-base-response-004.html b/tests/wpt/tests/css/css-animations/animation-base-response-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-base-response-004.html rename to tests/wpt/tests/css/css-animations/animation-base-response-004.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-before-initial-box-construction-001.html b/tests/wpt/tests/css/css-animations/animation-before-initial-box-construction-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-before-initial-box-construction-001.html rename to tests/wpt/tests/css/css-animations/animation-before-initial-box-construction-001.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-canceled-by-parent-details-element-being-closed.html b/tests/wpt/tests/css/css-animations/animation-canceled-by-parent-details-element-being-closed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-canceled-by-parent-details-element-being-closed.html rename to tests/wpt/tests/css/css-animations/animation-canceled-by-parent-details-element-being-closed.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-change-underlying-value-changed-in-flight.html b/tests/wpt/tests/css/css-animations/animation-change-underlying-value-changed-in-flight.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-change-underlying-value-changed-in-flight.html rename to tests/wpt/tests/css/css-animations/animation-change-underlying-value-changed-in-flight.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-common-ref.html b/tests/wpt/tests/css/css-animations/animation-common-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-common-ref.html rename to tests/wpt/tests/css/css-animations/animation-common-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-composition-keyframes.html b/tests/wpt/tests/css/css-animations/animation-composition-keyframes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-composition-keyframes.html rename to tests/wpt/tests/css/css-animations/animation-composition-keyframes.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-composition.html b/tests/wpt/tests/css/css-animations/animation-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-composition.html rename to tests/wpt/tests/css/css-animations/animation-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-css-variable-in-keyframe-adjusted.html b/tests/wpt/tests/css/css-animations/animation-css-variable-in-keyframe-adjusted.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-css-variable-in-keyframe-adjusted.html rename to tests/wpt/tests/css/css-animations/animation-css-variable-in-keyframe-adjusted.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-delay-001-manual.html b/tests/wpt/tests/css/css-animations/animation-delay-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-delay-001-manual.html rename to tests/wpt/tests/css/css-animations/animation-delay-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-delay-002-manual.html b/tests/wpt/tests/css/css-animations/animation-delay-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-delay-002-manual.html rename to tests/wpt/tests/css/css-animations/animation-delay-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-delay-003-manual.html b/tests/wpt/tests/css/css-animations/animation-delay-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-delay-003-manual.html rename to tests/wpt/tests/css/css-animations/animation-delay-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-delay-004-manual.html b/tests/wpt/tests/css/css-animations/animation-delay-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-delay-004-manual.html rename to tests/wpt/tests/css/css-animations/animation-delay-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-delay-005-manual.html b/tests/wpt/tests/css/css-animations/animation-delay-005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-delay-005-manual.html rename to tests/wpt/tests/css/css-animations/animation-delay-005-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-delay-006-manual.html b/tests/wpt/tests/css/css-animations/animation-delay-006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-delay-006-manual.html rename to tests/wpt/tests/css/css-animations/animation-delay-006-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-delay-007-manual.html b/tests/wpt/tests/css/css-animations/animation-delay-007-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-delay-007-manual.html rename to tests/wpt/tests/css/css-animations/animation-delay-007-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-delay-008.html b/tests/wpt/tests/css/css-animations/animation-delay-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-delay-008.html rename to tests/wpt/tests/css/css-animations/animation-delay-008.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-delay-009.html b/tests/wpt/tests/css/css-animations/animation-delay-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-delay-009.html rename to tests/wpt/tests/css/css-animations/animation-delay-009.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-delay-010.html b/tests/wpt/tests/css/css-animations/animation-delay-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-delay-010.html rename to tests/wpt/tests/css/css-animations/animation-delay-010.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-delay-011.html b/tests/wpt/tests/css/css-animations/animation-delay-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-delay-011.html rename to tests/wpt/tests/css/css-animations/animation-delay-011.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-direction-001-manual.html b/tests/wpt/tests/css/css-animations/animation-direction-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-direction-001-manual.html rename to tests/wpt/tests/css/css-animations/animation-direction-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-direction-002-manual.html b/tests/wpt/tests/css/css-animations/animation-direction-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-direction-002-manual.html rename to tests/wpt/tests/css/css-animations/animation-direction-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-direction-003-manual.html b/tests/wpt/tests/css/css-animations/animation-direction-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-direction-003-manual.html rename to tests/wpt/tests/css/css-animations/animation-direction-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-direction-004-manual.html b/tests/wpt/tests/css/css-animations/animation-direction-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-direction-004-manual.html rename to tests/wpt/tests/css/css-animations/animation-direction-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-direction-005-manual.html b/tests/wpt/tests/css/css-animations/animation-direction-005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-direction-005-manual.html rename to tests/wpt/tests/css/css-animations/animation-direction-005-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-direction-006-manual.html b/tests/wpt/tests/css/css-animations/animation-direction-006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-direction-006-manual.html rename to tests/wpt/tests/css/css-animations/animation-direction-006-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-display-manual.html b/tests/wpt/tests/css/css-animations/animation-display-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-display-manual.html rename to tests/wpt/tests/css/css-animations/animation-display-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-duration-001-manual.html b/tests/wpt/tests/css/css-animations/animation-duration-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-duration-001-manual.html rename to tests/wpt/tests/css/css-animations/animation-duration-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-duration-002-manual.html b/tests/wpt/tests/css/css-animations/animation-duration-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-duration-002-manual.html rename to tests/wpt/tests/css/css-animations/animation-duration-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-duration-003-manual.html b/tests/wpt/tests/css/css-animations/animation-duration-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-duration-003-manual.html rename to tests/wpt/tests/css/css-animations/animation-duration-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-duration-004-manual.html b/tests/wpt/tests/css/css-animations/animation-duration-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-duration-004-manual.html rename to tests/wpt/tests/css/css-animations/animation-duration-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-duration-005-manual.html b/tests/wpt/tests/css/css-animations/animation-duration-005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-duration-005-manual.html rename to tests/wpt/tests/css/css-animations/animation-duration-005-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-duration-006-manual.html b/tests/wpt/tests/css/css-animations/animation-duration-006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-duration-006-manual.html rename to tests/wpt/tests/css/css-animations/animation-duration-006-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-duration-007-manual.html b/tests/wpt/tests/css/css-animations/animation-duration-007-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-duration-007-manual.html rename to tests/wpt/tests/css/css-animations/animation-duration-007-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-duration-008-manual.html b/tests/wpt/tests/css/css-animations/animation-duration-008-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-duration-008-manual.html rename to tests/wpt/tests/css/css-animations/animation-duration-008-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-fill-mode-001-manual.html b/tests/wpt/tests/css/css-animations/animation-fill-mode-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-fill-mode-001-manual.html rename to tests/wpt/tests/css/css-animations/animation-fill-mode-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-fill-mode-002-manual.html b/tests/wpt/tests/css/css-animations/animation-fill-mode-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-fill-mode-002-manual.html rename to tests/wpt/tests/css/css-animations/animation-fill-mode-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-fill-mode-003-manual.html b/tests/wpt/tests/css/css-animations/animation-fill-mode-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-fill-mode-003-manual.html rename to tests/wpt/tests/css/css-animations/animation-fill-mode-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-fill-mode-004-manual.html b/tests/wpt/tests/css/css-animations/animation-fill-mode-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-fill-mode-004-manual.html rename to tests/wpt/tests/css/css-animations/animation-fill-mode-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-fill-mode-005-manual.html b/tests/wpt/tests/css/css-animations/animation-fill-mode-005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-fill-mode-005-manual.html rename to tests/wpt/tests/css/css-animations/animation-fill-mode-005-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-fill-mode-006-manual.html b/tests/wpt/tests/css/css-animations/animation-fill-mode-006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-fill-mode-006-manual.html rename to tests/wpt/tests/css/css-animations/animation-fill-mode-006-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-important-001.html b/tests/wpt/tests/css/css-animations/animation-important-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-important-001.html rename to tests/wpt/tests/css/css-animations/animation-important-001.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-important-002-ref.html b/tests/wpt/tests/css/css-animations/animation-important-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-important-002-ref.html rename to tests/wpt/tests/css/css-animations/animation-important-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-important-002.html b/tests/wpt/tests/css/css-animations/animation-important-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-important-002.html rename to tests/wpt/tests/css/css-animations/animation-important-002.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-001-manual.html b/tests/wpt/tests/css/css-animations/animation-iteration-count-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-001-manual.html rename to tests/wpt/tests/css/css-animations/animation-iteration-count-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-002-manual.html b/tests/wpt/tests/css/css-animations/animation-iteration-count-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-002-manual.html rename to tests/wpt/tests/css/css-animations/animation-iteration-count-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-003-manual.html b/tests/wpt/tests/css/css-animations/animation-iteration-count-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-003-manual.html rename to tests/wpt/tests/css/css-animations/animation-iteration-count-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-004-manual.html b/tests/wpt/tests/css/css-animations/animation-iteration-count-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-004-manual.html rename to tests/wpt/tests/css/css-animations/animation-iteration-count-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-005-manual.html b/tests/wpt/tests/css/css-animations/animation-iteration-count-005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-005-manual.html rename to tests/wpt/tests/css/css-animations/animation-iteration-count-005-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-006-manual.html b/tests/wpt/tests/css/css-animations/animation-iteration-count-006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-006-manual.html rename to tests/wpt/tests/css/css-animations/animation-iteration-count-006-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-007-manual.html b/tests/wpt/tests/css/css-animations/animation-iteration-count-007-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-007-manual.html rename to tests/wpt/tests/css/css-animations/animation-iteration-count-007-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-008-manual.html b/tests/wpt/tests/css/css-animations/animation-iteration-count-008-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-008-manual.html rename to tests/wpt/tests/css/css-animations/animation-iteration-count-008-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-009.html b/tests/wpt/tests/css/css-animations/animation-iteration-count-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-009.html rename to tests/wpt/tests/css/css-animations/animation-iteration-count-009.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-calc.html b/tests/wpt/tests/css/css-animations/animation-iteration-count-calc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-iteration-count-calc.html rename to tests/wpt/tests/css/css-animations/animation-iteration-count-calc.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-iteration-event-manual.html b/tests/wpt/tests/css/css-animations/animation-iteration-event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-iteration-event-manual.html rename to tests/wpt/tests/css/css-animations/animation-iteration-event-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-keyframes-001-manual.html b/tests/wpt/tests/css/css-animations/animation-keyframes-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-keyframes-001-manual.html rename to tests/wpt/tests/css/css-animations/animation-keyframes-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-keyframes-002-manual.html b/tests/wpt/tests/css/css-animations/animation-keyframes-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-keyframes-002-manual.html rename to tests/wpt/tests/css/css-animations/animation-keyframes-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-keyframes-003-manual.html b/tests/wpt/tests/css/css-animations/animation-keyframes-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-keyframes-003-manual.html rename to tests/wpt/tests/css/css-animations/animation-keyframes-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-multiple-from-to-keyframes-with-only-timing-function.html b/tests/wpt/tests/css/css-animations/animation-multiple-from-to-keyframes-with-only-timing-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-multiple-from-to-keyframes-with-only-timing-function.html rename to tests/wpt/tests/css/css-animations/animation-multiple-from-to-keyframes-with-only-timing-function.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-name-001-manual.html b/tests/wpt/tests/css/css-animations/animation-name-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-name-001-manual.html rename to tests/wpt/tests/css/css-animations/animation-name-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-name-002-manual.html b/tests/wpt/tests/css/css-animations/animation-name-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-name-002-manual.html rename to tests/wpt/tests/css/css-animations/animation-name-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-name-003-manual.html b/tests/wpt/tests/css/css-animations/animation-name-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-name-003-manual.html rename to tests/wpt/tests/css/css-animations/animation-name-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-name-004-manual.html b/tests/wpt/tests/css/css-animations/animation-name-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-name-004-manual.html rename to tests/wpt/tests/css/css-animations/animation-name-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-name-005-manual.html b/tests/wpt/tests/css/css-animations/animation-name-005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-name-005-manual.html rename to tests/wpt/tests/css/css-animations/animation-name-005-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-name-006-manual.html b/tests/wpt/tests/css/css-animations/animation-name-006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-name-006-manual.html rename to tests/wpt/tests/css/css-animations/animation-name-006-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-opacity-pause-and-set-time-ref.html b/tests/wpt/tests/css/css-animations/animation-opacity-pause-and-set-time-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-opacity-pause-and-set-time-ref.html rename to tests/wpt/tests/css/css-animations/animation-opacity-pause-and-set-time-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-opacity-pause-and-set-time.html b/tests/wpt/tests/css/css-animations/animation-opacity-pause-and-set-time.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-opacity-pause-and-set-time.html rename to tests/wpt/tests/css/css-animations/animation-opacity-pause-and-set-time.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-play-state-001-manual.html b/tests/wpt/tests/css/css-animations/animation-play-state-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-play-state-001-manual.html rename to tests/wpt/tests/css/css-animations/animation-play-state-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-play-state-002-manual.html b/tests/wpt/tests/css/css-animations/animation-play-state-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-play-state-002-manual.html rename to tests/wpt/tests/css/css-animations/animation-play-state-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-play-state-003-manual.html b/tests/wpt/tests/css/css-animations/animation-play-state-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-play-state-003-manual.html rename to tests/wpt/tests/css/css-animations/animation-play-state-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-play-state-004-manual.html b/tests/wpt/tests/css/css-animations/animation-play-state-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-play-state-004-manual.html rename to tests/wpt/tests/css/css-animations/animation-play-state-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-play-state-005.tentative.html b/tests/wpt/tests/css/css-animations/animation-play-state-005.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-play-state-005.tentative.html rename to tests/wpt/tests/css/css-animations/animation-play-state-005.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-pseudo-dynamic-001-ref.html b/tests/wpt/tests/css/css-animations/animation-pseudo-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-pseudo-dynamic-001-ref.html rename to tests/wpt/tests/css/css-animations/animation-pseudo-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-pseudo-dynamic-001.html b/tests/wpt/tests/css/css-animations/animation-pseudo-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-pseudo-dynamic-001.html rename to tests/wpt/tests/css/css-animations/animation-pseudo-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-shorthand-001-manual.html b/tests/wpt/tests/css/css-animations/animation-shorthand-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-shorthand-001-manual.html rename to tests/wpt/tests/css/css-animations/animation-shorthand-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-shorthand-002-manual.html b/tests/wpt/tests/css/css-animations/animation-shorthand-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-shorthand-002-manual.html rename to tests/wpt/tests/css/css-animations/animation-shorthand-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-shorthand-003-manual.html b/tests/wpt/tests/css/css-animations/animation-shorthand-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-shorthand-003-manual.html rename to tests/wpt/tests/css/css-animations/animation-shorthand-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-style-element-replaced-with-keyframes-rule-of-same-name.html b/tests/wpt/tests/css/css-animations/animation-style-element-replaced-with-keyframes-rule-of-same-name.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-style-element-replaced-with-keyframes-rule-of-same-name.html rename to tests/wpt/tests/css/css-animations/animation-style-element-replaced-with-keyframes-rule-of-same-name.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-001-manual.html b/tests/wpt/tests/css/css-animations/animation-timing-function-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-001-manual.html rename to tests/wpt/tests/css/css-animations/animation-timing-function-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-002-manual.html b/tests/wpt/tests/css/css-animations/animation-timing-function-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-002-manual.html rename to tests/wpt/tests/css/css-animations/animation-timing-function-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-003-manual.html b/tests/wpt/tests/css/css-animations/animation-timing-function-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-003-manual.html rename to tests/wpt/tests/css/css-animations/animation-timing-function-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-004-manual.html b/tests/wpt/tests/css/css-animations/animation-timing-function-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-004-manual.html rename to tests/wpt/tests/css/css-animations/animation-timing-function-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-005-manual.html b/tests/wpt/tests/css/css-animations/animation-timing-function-005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-005-manual.html rename to tests/wpt/tests/css/css-animations/animation-timing-function-005-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-006-manual.html b/tests/wpt/tests/css/css-animations/animation-timing-function-006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-006-manual.html rename to tests/wpt/tests/css/css-animations/animation-timing-function-006-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-007-manual.html b/tests/wpt/tests/css/css-animations/animation-timing-function-007-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-007-manual.html rename to tests/wpt/tests/css/css-animations/animation-timing-function-007-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-008-manual.html b/tests/wpt/tests/css/css-animations/animation-timing-function-008-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-008-manual.html rename to tests/wpt/tests/css/css-animations/animation-timing-function-008-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-009-manual.html b/tests/wpt/tests/css/css-animations/animation-timing-function-009-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-009-manual.html rename to tests/wpt/tests/css/css-animations/animation-timing-function-009-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-010-manual.html b/tests/wpt/tests/css/css-animations/animation-timing-function-010-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-010-manual.html rename to tests/wpt/tests/css/css-animations/animation-timing-function-010-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-011-manual.html b/tests/wpt/tests/css/css-animations/animation-timing-function-011-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-011-manual.html rename to tests/wpt/tests/css/css-animations/animation-timing-function-011-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-012-manual.html b/tests/wpt/tests/css/css-animations/animation-timing-function-012-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-timing-function-012-manual.html rename to tests/wpt/tests/css/css-animations/animation-timing-function-012-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-transform-pause-and-set-time-ref.html b/tests/wpt/tests/css/css-animations/animation-transform-pause-and-set-time-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-transform-pause-and-set-time-ref.html rename to tests/wpt/tests/css/css-animations/animation-transform-pause-and-set-time-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-transform-pause-and-set-time.html b/tests/wpt/tests/css/css-animations/animation-transform-pause-and-set-time.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animation-transform-pause-and-set-time.html rename to tests/wpt/tests/css/css-animations/animation-transform-pause-and-set-time.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animationevent-interface.html b/tests/wpt/tests/css/css-animations/animationevent-interface.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animationevent-interface.html rename to tests/wpt/tests/css/css-animations/animationevent-interface.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animationevent-interface.js b/tests/wpt/tests/css/css-animations/animationevent-interface.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animationevent-interface.js rename to tests/wpt/tests/css/css-animations/animationevent-interface.js diff --git a/tests/wpt/web-platform-tests/css/css-animations/animationevent-marker-pseudoelement.html b/tests/wpt/tests/css/css-animations/animationevent-marker-pseudoelement.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animationevent-marker-pseudoelement.html rename to tests/wpt/tests/css/css-animations/animationevent-marker-pseudoelement.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animationevent-pseudoelement.html b/tests/wpt/tests/css/css-animations/animationevent-pseudoelement.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animationevent-pseudoelement.html rename to tests/wpt/tests/css/css-animations/animationevent-pseudoelement.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animationevent-types.html b/tests/wpt/tests/css/css-animations/animationevent-types.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animationevent-types.html rename to tests/wpt/tests/css/css-animations/animationevent-types.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/animationstart-and-animationend-events-manual.html b/tests/wpt/tests/css/css-animations/animationstart-and-animationend-events-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/animationstart-and-animationend-events-manual.html rename to tests/wpt/tests/css/css-animations/animationstart-and-animationend-events-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/cancel-animation-shadow-slot-invalidation.html b/tests/wpt/tests/css/css-animations/cancel-animation-shadow-slot-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/cancel-animation-shadow-slot-invalidation.html rename to tests/wpt/tests/css/css-animations/cancel-animation-shadow-slot-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/computed-style-animation-parsing.html b/tests/wpt/tests/css/css-animations/computed-style-animation-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/computed-style-animation-parsing.html rename to tests/wpt/tests/css/css-animations/computed-style-animation-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/crashtests/replace-keyframes-animating-filter-001.html b/tests/wpt/tests/css/css-animations/crashtests/replace-keyframes-animating-filter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/crashtests/replace-keyframes-animating-filter-001.html rename to tests/wpt/tests/css/css-animations/crashtests/replace-keyframes-animating-filter-001.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/dialog-animation.html b/tests/wpt/tests/css/css-animations/dialog-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/dialog-animation.html rename to tests/wpt/tests/css/css-animations/dialog-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/dialog-backdrop-animation.html b/tests/wpt/tests/css/css-animations/dialog-backdrop-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/dialog-backdrop-animation.html rename to tests/wpt/tests/css/css-animations/dialog-backdrop-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/display-interpolation.html b/tests/wpt/tests/css/css-animations/display-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/display-interpolation.html rename to tests/wpt/tests/css/css-animations/display-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/display-none-dont-cancel.tentative.html b/tests/wpt/tests/css/css-animations/display-none-dont-cancel.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/display-none-dont-cancel.tentative.html rename to tests/wpt/tests/css/css-animations/display-none-dont-cancel.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/event-dispatch.tentative.html b/tests/wpt/tests/css/css-animations/event-dispatch.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/event-dispatch.tentative.html rename to tests/wpt/tests/css/css-animations/event-dispatch.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/event-order.tentative.html b/tests/wpt/tests/css/css-animations/event-order.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/event-order.tentative.html rename to tests/wpt/tests/css/css-animations/event-order.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/flip-running-animation-via-variable-ref.html b/tests/wpt/tests/css/css-animations/flip-running-animation-via-variable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/flip-running-animation-via-variable-ref.html rename to tests/wpt/tests/css/css-animations/flip-running-animation-via-variable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/flip-running-animation-via-variable.html b/tests/wpt/tests/css/css-animations/flip-running-animation-via-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/flip-running-animation-via-variable.html rename to tests/wpt/tests/css/css-animations/flip-running-animation-via-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/historical.html b/tests/wpt/tests/css/css-animations/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/historical.html rename to tests/wpt/tests/css/css-animations/historical.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/idlharness.html b/tests/wpt/tests/css/css-animations/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/idlharness.html rename to tests/wpt/tests/css/css-animations/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/inheritance-pseudo-element-ref.html b/tests/wpt/tests/css/css-animations/inheritance-pseudo-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/inheritance-pseudo-element-ref.html rename to tests/wpt/tests/css/css-animations/inheritance-pseudo-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/inheritance-pseudo-element.html b/tests/wpt/tests/css/css-animations/inheritance-pseudo-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/inheritance-pseudo-element.html rename to tests/wpt/tests/css/css-animations/inheritance-pseudo-element.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/inheritance.html b/tests/wpt/tests/css/css-animations/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/inheritance.html rename to tests/wpt/tests/css/css-animations/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/keyframes-remove-documentElement-crash.html b/tests/wpt/tests/css/css-animations/keyframes-remove-documentElement-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/keyframes-remove-documentElement-crash.html rename to tests/wpt/tests/css/css-animations/keyframes-remove-documentElement-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/keyframes-unrelated-custom-property.html b/tests/wpt/tests/css/css-animations/keyframes-unrelated-custom-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/keyframes-unrelated-custom-property.html rename to tests/wpt/tests/css/css-animations/keyframes-unrelated-custom-property.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/keyframes-zero-angle-crash.html b/tests/wpt/tests/css/css-animations/keyframes-zero-angle-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/keyframes-zero-angle-crash.html rename to tests/wpt/tests/css/css-animations/keyframes-zero-angle-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/missing-values-first-keyframe.html b/tests/wpt/tests/css/css-animations/missing-values-first-keyframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/missing-values-first-keyframe.html rename to tests/wpt/tests/css/css-animations/missing-values-first-keyframe.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/missing-values-last-keyframe.html b/tests/wpt/tests/css/css-animations/missing-values-last-keyframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/missing-values-last-keyframe.html rename to tests/wpt/tests/css/css-animations/missing-values-last-keyframe.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/nested-scale-animations-ref.html b/tests/wpt/tests/css/css-animations/nested-scale-animations-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/nested-scale-animations-ref.html rename to tests/wpt/tests/css/css-animations/nested-scale-animations-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/nested-scale-animations.html b/tests/wpt/tests/css/css-animations/nested-scale-animations.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/nested-scale-animations.html rename to tests/wpt/tests/css/css-animations/nested-scale-animations.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-composition-computed.tentative.html b/tests/wpt/tests/css/css-animations/parsing/animation-composition-computed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-composition-computed.tentative.html rename to tests/wpt/tests/css/css-animations/parsing/animation-composition-computed.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-composition-invalid.tentative.html b/tests/wpt/tests/css/css-animations/parsing/animation-composition-invalid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-composition-invalid.tentative.html rename to tests/wpt/tests/css/css-animations/parsing/animation-composition-invalid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-composition-valid.tentative.html b/tests/wpt/tests/css/css-animations/parsing/animation-composition-valid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-composition-valid.tentative.html rename to tests/wpt/tests/css/css-animations/parsing/animation-composition-valid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-computed.html rename to tests/wpt/tests/css/css-animations/parsing/animation-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-delay-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-computed.html rename to tests/wpt/tests/css/css-animations/parsing/animation-delay-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-end-computed.tentative.html b/tests/wpt/tests/css/css-animations/parsing/animation-delay-end-computed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-end-computed.tentative.html rename to tests/wpt/tests/css/css-animations/parsing/animation-delay-end-computed.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-end-invalid.tentative.html b/tests/wpt/tests/css/css-animations/parsing/animation-delay-end-invalid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-end-invalid.tentative.html rename to tests/wpt/tests/css/css-animations/parsing/animation-delay-end-invalid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-end-valid.tentative.html b/tests/wpt/tests/css/css-animations/parsing/animation-delay-end-valid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-end-valid.tentative.html rename to tests/wpt/tests/css/css-animations/parsing/animation-delay-end-valid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-delay-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-invalid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-delay-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-shorthand-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-delay-shorthand-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-shorthand-computed.html rename to tests/wpt/tests/css/css-animations/parsing/animation-delay-shorthand-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-shorthand.html b/tests/wpt/tests/css/css-animations/parsing/animation-delay-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-shorthand.html rename to tests/wpt/tests/css/css-animations/parsing/animation-delay-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-start-computed.tentative.html b/tests/wpt/tests/css/css-animations/parsing/animation-delay-start-computed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-start-computed.tentative.html rename to tests/wpt/tests/css/css-animations/parsing/animation-delay-start-computed.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-start-invalid.tentative.html b/tests/wpt/tests/css/css-animations/parsing/animation-delay-start-invalid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-start-invalid.tentative.html rename to tests/wpt/tests/css/css-animations/parsing/animation-delay-start-invalid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-start-valid.tentative.html b/tests/wpt/tests/css/css-animations/parsing/animation-delay-start-valid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-start-valid.tentative.html rename to tests/wpt/tests/css/css-animations/parsing/animation-delay-start-valid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-delay-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-delay-valid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-delay-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-direction-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-direction-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-direction-computed.html rename to tests/wpt/tests/css/css-animations/parsing/animation-direction-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-direction-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-direction-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-direction-invalid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-direction-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-direction-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-direction-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-direction-valid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-direction-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-duration-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-duration-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-duration-computed.html rename to tests/wpt/tests/css/css-animations/parsing/animation-duration-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-duration-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-duration-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-duration-invalid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-duration-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-duration-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-duration-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-duration-valid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-duration-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-fill-mode-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-fill-mode-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-fill-mode-computed.html rename to tests/wpt/tests/css/css-animations/parsing/animation-fill-mode-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-fill-mode-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-fill-mode-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-fill-mode-invalid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-fill-mode-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-fill-mode-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-fill-mode-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-fill-mode-valid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-fill-mode-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-invalid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-iteration-count-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-iteration-count-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-iteration-count-computed.html rename to tests/wpt/tests/css/css-animations/parsing/animation-iteration-count-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-iteration-count-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-iteration-count-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-iteration-count-invalid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-iteration-count-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-iteration-count-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-iteration-count-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-iteration-count-valid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-iteration-count-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-name-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-name-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-name-computed.html rename to tests/wpt/tests/css/css-animations/parsing/animation-name-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-name-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-name-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-name-invalid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-name-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-name-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-name-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-name-valid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-name-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-play-state-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-play-state-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-play-state-computed.html rename to tests/wpt/tests/css/css-animations/parsing/animation-play-state-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-play-state-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-play-state-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-play-state-invalid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-play-state-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-play-state-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-play-state-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-play-state-valid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-play-state-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-range-end-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-range-end-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-range-end-computed.html rename to tests/wpt/tests/css/css-animations/parsing/animation-range-end-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-range-end-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-range-end-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-range-end-invalid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-range-end-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-range-end-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-range-end-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-range-end-valid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-range-end-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-range-shorthand.html b/tests/wpt/tests/css/css-animations/parsing/animation-range-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-range-shorthand.html rename to tests/wpt/tests/css/css-animations/parsing/animation-range-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-range-start-computed.html b/tests/wpt/tests/css/css-animations/parsing/animation-range-start-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-range-start-computed.html rename to tests/wpt/tests/css/css-animations/parsing/animation-range-start-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-range-start-invalid.html b/tests/wpt/tests/css/css-animations/parsing/animation-range-start-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-range-start-invalid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-range-start-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-range-start-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-range-start-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-range-start-valid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-range-start-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-shorthand.html b/tests/wpt/tests/css/css-animations/parsing/animation-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-shorthand.html rename to tests/wpt/tests/css/css-animations/parsing/animation-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/animation-valid.html b/tests/wpt/tests/css/css-animations/parsing/animation-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/animation-valid.html rename to tests/wpt/tests/css/css-animations/parsing/animation-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/keyframes-allowed-properties.html b/tests/wpt/tests/css/css-animations/parsing/keyframes-allowed-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/keyframes-allowed-properties.html rename to tests/wpt/tests/css/css-animations/parsing/keyframes-allowed-properties.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/keyframes-name-invalid.html b/tests/wpt/tests/css/css-animations/parsing/keyframes-name-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/keyframes-name-invalid.html rename to tests/wpt/tests/css/css-animations/parsing/keyframes-name-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/parsing/keyframes-name-valid.html b/tests/wpt/tests/css/css-animations/parsing/keyframes-name-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/parsing/keyframes-name-valid.html rename to tests/wpt/tests/css/css-animations/parsing/keyframes-name-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/pending-style-changes-001.html b/tests/wpt/tests/css/css-animations/pending-style-changes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/pending-style-changes-001.html rename to tests/wpt/tests/css/css-animations/pending-style-changes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/responsive/column-rule-color-001.html b/tests/wpt/tests/css/css-animations/responsive/column-rule-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/responsive/column-rule-color-001.html rename to tests/wpt/tests/css/css-animations/responsive/column-rule-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/responsive/column-width-001.html b/tests/wpt/tests/css/css-animations/responsive/column-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/responsive/column-width-001.html rename to tests/wpt/tests/css/css-animations/responsive/column-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/responsive/line-height.html b/tests/wpt/tests/css/css-animations/responsive/line-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/responsive/line-height.html rename to tests/wpt/tests/css/css-animations/responsive/line-height.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/sample-on-last-keyframe.html b/tests/wpt/tests/css/css-animations/sample-on-last-keyframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/sample-on-last-keyframe.html rename to tests/wpt/tests/css/css-animations/sample-on-last-keyframe.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/simultaneous-animations-crash.html b/tests/wpt/tests/css/css-animations/simultaneous-animations-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/simultaneous-animations-crash.html rename to tests/wpt/tests/css/css-animations/simultaneous-animations-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/style-animation-parsing.html b/tests/wpt/tests/css/css-animations/style-animation-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/style-animation-parsing.html rename to tests/wpt/tests/css/css-animations/style-animation-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/support/empty-sheet.css b/tests/wpt/tests/css/css-animations/support/empty-sheet.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/support/empty-sheet.css rename to tests/wpt/tests/css/css-animations/support/empty-sheet.css diff --git a/tests/wpt/web-platform-tests/css/css-animations/support/testcommon.js b/tests/wpt/tests/css/css-animations/support/testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/support/testcommon.js rename to tests/wpt/tests/css/css-animations/support/testcommon.js diff --git a/tests/wpt/web-platform-tests/css/css-animations/svg-transform-animation-ref.html b/tests/wpt/tests/css/css-animations/svg-transform-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/svg-transform-animation-ref.html rename to tests/wpt/tests/css/css-animations/svg-transform-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/svg-transform-animation.html b/tests/wpt/tests/css/css-animations/svg-transform-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/svg-transform-animation.html rename to tests/wpt/tests/css/css-animations/svg-transform-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/transform-animation-under-large-scale-ref.html b/tests/wpt/tests/css/css-animations/transform-animation-under-large-scale-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/transform-animation-under-large-scale-ref.html rename to tests/wpt/tests/css/css-animations/transform-animation-under-large-scale-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/transform-animation-under-large-scale.html b/tests/wpt/tests/css/css-animations/transform-animation-under-large-scale.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/transform-animation-under-large-scale.html rename to tests/wpt/tests/css/css-animations/transform-animation-under-large-scale.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/transition-properties-not-animatable.html b/tests/wpt/tests/css/css-animations/transition-properties-not-animatable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/transition-properties-not-animatable.html rename to tests/wpt/tests/css/css-animations/transition-properties-not-animatable.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/translation-animation-on-important-property-ref.html b/tests/wpt/tests/css/css-animations/translation-animation-on-important-property-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/translation-animation-on-important-property-ref.html rename to tests/wpt/tests/css/css-animations/translation-animation-on-important-property-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/translation-animation-on-important-property.html b/tests/wpt/tests/css/css-animations/translation-animation-on-important-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/translation-animation-on-important-property.html rename to tests/wpt/tests/css/css-animations/translation-animation-on-important-property.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/translation-animation-subpixel-offset-ref.html b/tests/wpt/tests/css/css-animations/translation-animation-subpixel-offset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/translation-animation-subpixel-offset-ref.html rename to tests/wpt/tests/css/css-animations/translation-animation-subpixel-offset-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/translation-animation-subpixel-offset.html b/tests/wpt/tests/css/css-animations/translation-animation-subpixel-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/translation-animation-subpixel-offset.html rename to tests/wpt/tests/css/css-animations/translation-animation-subpixel-offset.html diff --git a/tests/wpt/web-platform-tests/css/css-animations/webkit-writing-mode-crash.html b/tests/wpt/tests/css/css-animations/webkit-writing-mode-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-animations/webkit-writing-mode-crash.html rename to tests/wpt/tests/css/css-animations/webkit-writing-mode-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/META.yml b/tests/wpt/tests/css/css-backgrounds/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/META.yml rename to tests/wpt/tests/css/css-backgrounds/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-backdrop-infinite-duration-crash.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-backdrop-infinite-duration-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-backdrop-infinite-duration-crash.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-backdrop-infinite-duration-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-element-not-visible-at-current-viewport-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-element-not-visible-at-current-viewport-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-element-not-visible-at-current-viewport-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-element-not-visible-at-current-viewport-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-element-not-visible-at-current-viewport.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-element-not-visible-at-current-viewport.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-element-not-visible-at-current-viewport.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-element-not-visible-at-current-viewport.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-additive-keyframe-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-additive-keyframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-additive-keyframe-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-additive-keyframe-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-additive-keyframe.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-additive-keyframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-additive-keyframe.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-additive-keyframe.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-0-percent-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-0-percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-0-percent-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-0-percent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-0-percent.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-0-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-0-percent.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-0-percent.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-100-percent-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-100-percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-100-percent-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-100-percent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-100-percent.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-100-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-100-percent.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-missing-100-percent.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-replace-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-replace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-replace-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-replace-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-replace.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-replace.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-replace.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fallback-replace.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-field-crash.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-field-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-field-crash.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-field-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fragmented-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fragmented-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fragmented-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fragmented-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fragmented.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fragmented.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fragmented.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-fragmented.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-half-opaque-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-half-opaque-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-half-opaque-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-half-opaque-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-half-opaque.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-half-opaque.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-half-opaque.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-half-opaque.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-in-body-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-in-body-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-in-body-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-in-body-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-in-body.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-in-body.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-in-body.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-in-body.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-non-empty-no-draw-crash.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-non-empty-no-draw-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-non-empty-no-draw-crash.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-non-empty-no-draw-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-non-zero-size-element-change-to-zero-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-non-zero-size-element-change-to-zero-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-non-zero-size-element-change-to-zero-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-non-zero-size-element-change-to-zero-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-non-zero-size-element-change-to-zero.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-non-zero-size-element-change-to-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-non-zero-size-element-change-to-zero.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-non-zero-size-element-change-to-zero.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-pseudo-element-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-pseudo-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-pseudo-element-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-pseudo-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-pseudo-element.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-pseudo-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-pseudo-element.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-pseudo-element.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-removed-element-crash.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-removed-element-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-removed-element-crash.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-removed-element-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-single-keyframe-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-single-keyframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-single-keyframe-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-single-keyframe-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-single-keyframe.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-single-keyframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-single-keyframe.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-single-keyframe.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-three-keyframes1.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-three-keyframes1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-three-keyframes1.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-three-keyframes1.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-three-keyframes2-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-three-keyframes2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-three-keyframes2-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-three-keyframes2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-three-keyframes2.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-three-keyframes2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-three-keyframes2.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-three-keyframes2.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-three-keyframes3.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-three-keyframes3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-three-keyframes3.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-three-keyframes3.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-will-change-contents-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-will-change-contents-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-will-change-contents-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-will-change-contents-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-will-change-contents.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-will-change-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-will-change-contents.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-will-change-contents.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-blur-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-blur-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-blur-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-blur-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-blur.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-blur.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-blur.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-blur.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-images-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-images-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-images-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-images-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-images.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-images.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-images.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-images.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-mask-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-mask-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-mask-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-mask-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-mask.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-mask.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-mask.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-mask.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-table1-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-table1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-table1-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-table1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-table1.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-table1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-table1.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-table1.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-table2.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-table2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-table2.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-table2.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-table3.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-table3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-table3.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-table3.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-table4.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-table4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-table4.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-table4.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-zero-playbackRate-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-zero-playbackRate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-zero-playbackRate-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-zero-playbackRate-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-zero-playbackRate.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-zero-playbackRate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-zero-playbackRate.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-with-zero-playbackRate.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-zero-size-element-change-to-non-zero-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-zero-size-element-change-to-non-zero-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-zero-size-element-change-to-non-zero-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-zero-size-element-change-to-non-zero-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-zero-size-element-change-to-non-zero.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-zero-size-element-change-to-non-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-zero-size-element-change-to-non-zero.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-zero-size-element-change-to-non-zero.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-zero-size-element-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-zero-size-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-zero-size-element-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-zero-size-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-zero-size-element.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-zero-size-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-zero-size-element.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation-zero-size-element.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-scroll-into-viewport-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-scroll-into-viewport-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-scroll-into-viewport-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-scroll-into-viewport-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-scroll-into-viewport.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-scroll-into-viewport.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-scroll-into-viewport.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-scroll-into-viewport.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-transition-currentcolor-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-transition-currentcolor-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-transition-currentcolor-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-transition-currentcolor-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-transition-currentcolor.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-transition-currentcolor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-transition-currentcolor.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-transition-currentcolor.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-transition.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-transition.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-transparent-animation-in-body-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-transparent-animation-in-body-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-transparent-animation-in-body-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-transparent-animation-in-body-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-transparent-animation-in-body.html b/tests/wpt/tests/css/css-backgrounds/animations/background-color-transparent-animation-in-body.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-transparent-animation-in-body.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-color-transparent-animation-in-body.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-image-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/background-image-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-image-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-image-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-position-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/background-position-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-position-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-position-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-position-origin-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/background-position-origin-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-position-origin-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-position-origin-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-position-x-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/background-position-x-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-position-x-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-position-x-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-position-y-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/background-position-y-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-position-y-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-position-y-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-size-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/background-size-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-size-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/background-size-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-bottom-left-radius-composition.html b/tests/wpt/tests/css/css-backgrounds/animations/border-bottom-left-radius-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-bottom-left-radius-composition.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-bottom-left-radius-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-bottom-right-radius-composition.html b/tests/wpt/tests/css/css-backgrounds/animations/border-bottom-right-radius-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-bottom-right-radius-composition.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-bottom-right-radius-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-bottom-width-composition.html b/tests/wpt/tests/css/css-backgrounds/animations/border-bottom-width-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-bottom-width-composition.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-bottom-width-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-color-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/border-color-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-color-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-color-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-outset-composition.html b/tests/wpt/tests/css/css-backgrounds/animations/border-image-outset-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-outset-composition.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-image-outset-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-outset-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/border-image-outset-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-outset-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-image-outset-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-slice-composition.html b/tests/wpt/tests/css/css-backgrounds/animations/border-image-slice-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-slice-composition.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-image-slice-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-slice-interpolation-stability.html b/tests/wpt/tests/css/css-backgrounds/animations/border-image-slice-interpolation-stability.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-slice-interpolation-stability.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-image-slice-interpolation-stability.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-slice-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/border-image-slice-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-slice-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-image-slice-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-source-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/border-image-source-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-source-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-image-source-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-width-composition.html b/tests/wpt/tests/css/css-backgrounds/animations/border-image-width-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-width-composition.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-image-width-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-width-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/border-image-width-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-image-width-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-image-width-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-left-width-composition.html b/tests/wpt/tests/css/css-backgrounds/animations/border-left-width-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-left-width-composition.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-left-width-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-radius-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/border-radius-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-radius-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-radius-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-right-width-composition.html b/tests/wpt/tests/css/css-backgrounds/animations/border-right-width-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-right-width-composition.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-right-width-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-top-left-radius-composition.html b/tests/wpt/tests/css/css-backgrounds/animations/border-top-left-radius-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-top-left-radius-composition.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-top-left-radius-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-top-right-radius-composition.html b/tests/wpt/tests/css/css-backgrounds/animations/border-top-right-radius-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-top-right-radius-composition.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-top-right-radius-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-top-width-composition.html b/tests/wpt/tests/css/css-backgrounds/animations/border-top-width-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-top-width-composition.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-top-width-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-width-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/border-width-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/border-width-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/border-width-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/box-shadow-composition.html b/tests/wpt/tests/css/css-backgrounds/animations/box-shadow-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/box-shadow-composition.html rename to tests/wpt/tests/css/css-backgrounds/animations/box-shadow-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/box-shadow-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/box-shadow-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/box-shadow-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/box-shadow-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/discrete-no-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/discrete-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/discrete-no-interpolation.html rename to tests/wpt/tests/css/css-backgrounds/animations/discrete-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-animation-with-zero-alpha-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-animation-with-zero-alpha-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-animation-with-zero-alpha-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-animation-with-zero-alpha-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-animation-with-zero-alpha.html b/tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-animation-with-zero-alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-animation-with-zero-alpha.html rename to tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-animation-with-zero-alpha.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-transition-obscured-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-transition-obscured-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-transition-obscured-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-transition-obscured-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-transition-obscured.html b/tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-transition-obscured.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-transition-obscured.html rename to tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-transition-obscured.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-delay-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-delay-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-delay-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-delay-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-delay.html b/tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-delay.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-delay.html rename to tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-delay.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-initially-transparent-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-initially-transparent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-initially-transparent-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-initially-transparent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-initially-transparent.html b/tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-initially-transparent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-initially-transparent.html rename to tests/wpt/tests/css/css-backgrounds/animations/invalidation/background-color-transition-with-initially-transparent.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length1-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/two-background-color-animation-diff-length1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length1-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/two-background-color-animation-diff-length1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length1.html b/tests/wpt/tests/css/css-backgrounds/animations/two-background-color-animation-diff-length1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length1.html rename to tests/wpt/tests/css/css-backgrounds/animations/two-background-color-animation-diff-length1.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length2-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/two-background-color-animation-diff-length2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length2-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/two-background-color-animation-diff-length2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length2.html b/tests/wpt/tests/css/css-backgrounds/animations/two-background-color-animation-diff-length2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length2.html rename to tests/wpt/tests/css/css-backgrounds/animations/two-background-color-animation-diff-length2.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length3-ref.html b/tests/wpt/tests/css/css-backgrounds/animations/two-background-color-animation-diff-length3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length3-ref.html rename to tests/wpt/tests/css/css-backgrounds/animations/two-background-color-animation-diff-length3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length3.html b/tests/wpt/tests/css/css-backgrounds/animations/two-background-color-animation-diff-length3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length3.html rename to tests/wpt/tests/css/css-backgrounds/animations/two-background-color-animation-diff-length3.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-331.html b/tests/wpt/tests/css/css-backgrounds/background-331.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-331.html rename to tests/wpt/tests/css/css-backgrounds/background-331.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-332.html b/tests/wpt/tests/css/css-backgrounds/background-332.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-332.html rename to tests/wpt/tests/css/css-backgrounds/background-332.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-333.html b/tests/wpt/tests/css/css-backgrounds/background-333.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-333.html rename to tests/wpt/tests/css/css-backgrounds/background-333.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-334.html b/tests/wpt/tests/css/css-backgrounds/background-334.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-334.html rename to tests/wpt/tests/css/css-backgrounds/background-334.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-335.html b/tests/wpt/tests/css/css-backgrounds/background-335.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-335.html rename to tests/wpt/tests/css/css-backgrounds/background-335.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-336.html b/tests/wpt/tests/css/css-backgrounds/background-336.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-336.html rename to tests/wpt/tests/css/css-backgrounds/background-336.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-350.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-350.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-350.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-350.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-353.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-353.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-353.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-353.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-fixed-border-radius-offset-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-fixed-border-radius-offset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-fixed-border-radius-offset-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-fixed-border-radius-offset-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-fixed-border-radius-offset.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-fixed-border-radius-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-fixed-border-radius-offset.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-fixed-border-radius-offset.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-fixed-inline-scrolled-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-fixed-inline-scrolled-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-fixed-inline-scrolled-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-fixed-inline-scrolled-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-fixed-inline-scrolled.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-fixed-inline-scrolled.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-fixed-inline-scrolled.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-fixed-inline-scrolled.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-fixed-inside-transform-1-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-fixed-inside-transform-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-fixed-inside-transform-1-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-fixed-inside-transform-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-fixed-inside-transform-1.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-fixed-inside-transform-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-fixed-inside-transform-1.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-fixed-inside-transform-1.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-fixed.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-fixed.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-fixed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local-hidden.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local-hidden.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local-hidden.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local-scrolling.htm b/tests/wpt/tests/css/css-backgrounds/background-attachment-local-scrolling.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local-scrolling.htm rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local-scrolling.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/aqua-yellow-32x32.png b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/aqua-yellow-32x32.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/aqua-yellow-32x32.png rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/aqua-yellow-32x32.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-1-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-1-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-1.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-1.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-1.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-2.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-2.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-2.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-3-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-3-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-3.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-3.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-3.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-6-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-6-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-6-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-6-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-6.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-6.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-6.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-6.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-1-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-1-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-1.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-1.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-1.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-2.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-2.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-2.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-3-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-3-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-3.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-3.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-3.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-4-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-4-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-4.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-4.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-4.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-5.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-5.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-5.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-6-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-6-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-6-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-6-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-6.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-6.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-6.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-6.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-4-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-4-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-4.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-4.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-4.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-5-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-5-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-5-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-5-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-5.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-5.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-local-positioning-5.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-margin-root-001-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-margin-root-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-margin-root-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-margin-root-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-margin-root-001.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-margin-root-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-margin-root-001.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-margin-root-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-margin-root-002-ref.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-margin-root-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-margin-root-002-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-margin-root-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-margin-root-002.html b/tests/wpt/tests/css/css-backgrounds/background-attachment-margin-root-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-attachment-margin-root-002.html rename to tests/wpt/tests/css/css-backgrounds/background-attachment-margin-root-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-001.html b/tests/wpt/tests/css/css-backgrounds/background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-001.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-002.html b/tests/wpt/tests/css/css-backgrounds/background-clip-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-002.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-003.html b/tests/wpt/tests/css/css-backgrounds/background-clip-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-003.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-003.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-004.html b/tests/wpt/tests/css/css-backgrounds/background-clip-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-004.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-004.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-005.html b/tests/wpt/tests/css/css-backgrounds/background-clip-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-005.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-005.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-006.html b/tests/wpt/tests/css/css-backgrounds/background-clip-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-006.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-006.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-007.html b/tests/wpt/tests/css/css-backgrounds/background-clip-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-007.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-007.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-008.html b/tests/wpt/tests/css/css-backgrounds/background-clip-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-008.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-008.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-009.html b/tests/wpt/tests/css/css-backgrounds/background-clip-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-009.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-009.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-010.html b/tests/wpt/tests/css/css-backgrounds/background-clip-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-010.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-010.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-color-ref.html b/tests/wpt/tests/css/css-backgrounds/background-clip-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-color-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-color-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-color-repaint-ref.html b/tests/wpt/tests/css/css-backgrounds/background-clip-color-repaint-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-color-repaint-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-color-repaint-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-color-repaint.html b/tests/wpt/tests/css/css-backgrounds/background-clip-color-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-color-repaint.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-color-repaint.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-color.html b/tests/wpt/tests/css/css-backgrounds/background-clip-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-color.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-color.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-content-box-001.html b/tests/wpt/tests/css/css-backgrounds/background-clip-content-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-content-box-001.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-content-box-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-content-box-002.html b/tests/wpt/tests/css/css-backgrounds/background-clip-content-box-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-content-box-002.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-content-box-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-content-box.html b/tests/wpt/tests/css/css-backgrounds/background-clip-content-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-content-box.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-content-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-padding-box-001.html b/tests/wpt/tests/css/css-backgrounds/background-clip-padding-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-padding-box-001.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-padding-box-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-padding-box-with-border-radius.html b/tests/wpt/tests/css/css-backgrounds/background-clip-padding-box-with-border-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-padding-box-with-border-radius.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-padding-box-with-border-radius.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-root.html b/tests/wpt/tests/css/css-backgrounds/background-clip-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-root.html rename to tests/wpt/tests/css/css-backgrounds/background-clip-root.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-border-box.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-border-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-border-box.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-border-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-border-box_with_position.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-border-box_with_position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-border-box_with_position.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-border-box_with_position.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-border-box_with_radius.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-border-box_with_radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-border-box_with_radius.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-border-box_with_radius.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-border-box_with_size.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-border-box_with_size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-border-box_with_size.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-border-box_with_size.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-content-box.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-content-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-content-box.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-content-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-content-box_with_position.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-content-box_with_position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-content-box_with_position.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-content-box_with_position.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-content-box_with_radius.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-content-box_with_radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-content-box_with_radius.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-content-box_with_radius.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-content-box_with_size.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-content-box_with_size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-content-box_with_size.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-content-box_with_size.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-padding-box.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-padding-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-padding-box.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-padding-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-padding-box_with_position.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-padding-box_with_position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-padding-box_with_position.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-padding-box_with_position.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-padding-box_with_radius.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-padding-box_with_radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-padding-box_with_radius.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-padding-box_with_radius.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-padding-box_with_size.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-padding-box_with_size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-padding-box_with_size.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-padding-box_with_size.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-rounded-corner-ref.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-rounded-corner-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-rounded-corner-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-rounded-corner-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-rounded-corner.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-rounded-corner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-rounded-corner.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-rounded-corner.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-text-dynamic-2-ref.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-text-dynamic-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-text-dynamic-2-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-text-dynamic-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-text-dynamic-2.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-text-dynamic-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-text-dynamic-2.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-text-dynamic-2.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-text-flex-ref.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-text-flex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-text-flex-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-text-flex-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-text-flex.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-text-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-text-flex.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-text-flex.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-text-multi-line-ref.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-text-multi-line-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-text-multi-line-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-text-multi-line-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-text-multi-line.html b/tests/wpt/tests/css/css-backgrounds/background-clip/clip-text-multi-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/clip-text-multi-line.html rename to tests/wpt/tests/css/css-backgrounds/background-clip/clip-text-multi-line.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/list.txt b/tests/wpt/tests/css/css-backgrounds/background-clip/list.txt similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip/list.txt rename to tests/wpt/tests/css/css-backgrounds/background-clip/list.txt diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip_padding-box.html b/tests/wpt/tests/css/css-backgrounds/background-clip_padding-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-clip_padding-box.html rename to tests/wpt/tests/css/css-backgrounds/background-clip_padding-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-applied-to-rounded-inline-element.htm b/tests/wpt/tests/css/css-backgrounds/background-color-applied-to-rounded-inline-element.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-applied-to-rounded-inline-element.htm rename to tests/wpt/tests/css/css-backgrounds/background-color-applied-to-rounded-inline-element.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-001.html b/tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-001.html rename to tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-002.html b/tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-002.html rename to tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-003.html b/tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-003.html rename to tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-004.html b/tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-004.html rename to tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-005.html b/tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-005.html rename to tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-006.html b/tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-006.html rename to tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-006.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-007.html b/tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-007.html rename to tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-007.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-008.html b/tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-008.html rename to tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-008.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-009.html b/tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-009.html rename to tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-009.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-ref.html b/tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-body-propagation-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-color-body-propagation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-border-box.htm b/tests/wpt/tests/css/css-backgrounds/background-color-border-box.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-border-box.htm rename to tests/wpt/tests/css/css-backgrounds/background-color-border-box.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-clip.html b/tests/wpt/tests/css/css-backgrounds/background-color-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-clip.html rename to tests/wpt/tests/css/css-backgrounds/background-color-clip.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-no-body-propagation-ref.html b/tests/wpt/tests/css/css-backgrounds/background-color-no-body-propagation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-no-body-propagation-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-color-no-body-propagation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-root-propagation-001.html b/tests/wpt/tests/css/css-backgrounds/background-color-root-propagation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-root-propagation-001.html rename to tests/wpt/tests/css/css-backgrounds/background-color-root-propagation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-color-root-propagation-002.html b/tests/wpt/tests/css/css-backgrounds/background-color-root-propagation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-color-root-propagation-002.html rename to tests/wpt/tests/css/css-backgrounds/background-color-root-propagation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-gradient-subpixel-fills-area.html b/tests/wpt/tests/css/css-backgrounds/background-gradient-subpixel-fills-area.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-gradient-subpixel-fills-area.html rename to tests/wpt/tests/css/css-backgrounds/background-gradient-subpixel-fills-area.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-001.html b/tests/wpt/tests/css/css-backgrounds/background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-001.html rename to tests/wpt/tests/css/css-backgrounds/background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-002.html b/tests/wpt/tests/css/css-backgrounds/background-image-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-002.html rename to tests/wpt/tests/css/css-backgrounds/background-image-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-003.html b/tests/wpt/tests/css/css-backgrounds/background-image-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-003.html rename to tests/wpt/tests/css/css-backgrounds/background-image-003.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-004.html b/tests/wpt/tests/css/css-backgrounds/background-image-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-004.html rename to tests/wpt/tests/css/css-backgrounds/background-image-004.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-005.html b/tests/wpt/tests/css/css-backgrounds/background-image-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-005.html rename to tests/wpt/tests/css/css-backgrounds/background-image-005.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-006.html b/tests/wpt/tests/css/css-backgrounds/background-image-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-006.html rename to tests/wpt/tests/css/css-backgrounds/background-image-006.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-007.html b/tests/wpt/tests/css/css-backgrounds/background-image-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-007.html rename to tests/wpt/tests/css/css-backgrounds/background-image-007.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-centered-ref.html b/tests/wpt/tests/css/css-backgrounds/background-image-centered-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-centered-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-image-centered-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-centered-with-border-radius.html b/tests/wpt/tests/css/css-backgrounds/background-image-centered-with-border-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-centered-with-border-radius.html rename to tests/wpt/tests/css/css-backgrounds/background-image-centered-with-border-radius.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-centered.html b/tests/wpt/tests/css/css-backgrounds/background-image-centered.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-centered.html rename to tests/wpt/tests/css/css-backgrounds/background-image-centered.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-cors-no-reload.html b/tests/wpt/tests/css/css-backgrounds/background-image-cors-no-reload.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-cors-no-reload.html rename to tests/wpt/tests/css/css-backgrounds/background-image-cors-no-reload.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-cover-zoomed-1.html b/tests/wpt/tests/css/css-backgrounds/background-image-cover-zoomed-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-cover-zoomed-1.html rename to tests/wpt/tests/css/css-backgrounds/background-image-cover-zoomed-1.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-first-letter.html b/tests/wpt/tests/css/css-backgrounds/background-image-first-letter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-first-letter.html rename to tests/wpt/tests/css/css-backgrounds/background-image-first-letter.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-first-line.html b/tests/wpt/tests/css/css-backgrounds/background-image-first-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-first-line.html rename to tests/wpt/tests/css/css-backgrounds/background-image-first-line.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-conic-repaint-ref.html b/tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-conic-repaint-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-conic-repaint-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-conic-repaint-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-conic-repaint.html b/tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-conic-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-conic-repaint.html rename to tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-conic-repaint.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-linear-repaint-ref.html b/tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-linear-repaint-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-linear-repaint-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-linear-repaint-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-linear-repaint.html b/tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-linear-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-linear-repaint.html rename to tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-linear-repaint.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-radial-repaint-ref.html b/tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-radial-repaint-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-radial-repaint-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-radial-repaint-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-radial-repaint.html b/tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-radial-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-radial-repaint.html rename to tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-radial-repaint.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-visited-ref.html b/tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-visited-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-visited-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-visited-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-visited.html b/tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-visited.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-gradient-currentcolor-visited.html rename to tests/wpt/tests/css/css-backgrounds/background-image-gradient-currentcolor-visited.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-large-with-auto.html b/tests/wpt/tests/css/css-backgrounds/background-image-large-with-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-large-with-auto.html rename to tests/wpt/tests/css/css-backgrounds/background-image-large-with-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-none-gradient-repaint.html b/tests/wpt/tests/css/css-backgrounds/background-image-none-gradient-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-none-gradient-repaint.html rename to tests/wpt/tests/css/css-backgrounds/background-image-none-gradient-repaint.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-shared-stylesheet-ref.html b/tests/wpt/tests/css/css-backgrounds/background-image-shared-stylesheet-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-shared-stylesheet-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-image-shared-stylesheet-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-shared-stylesheet.html b/tests/wpt/tests/css/css-backgrounds/background-image-shared-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-shared-stylesheet.html rename to tests/wpt/tests/css/css-backgrounds/background-image-shared-stylesheet.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-table-cells-straddling-no-repeat.html b/tests/wpt/tests/css/css-backgrounds/background-image-table-cells-straddling-no-repeat.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-table-cells-straddling-no-repeat.html rename to tests/wpt/tests/css/css-backgrounds/background-image-table-cells-straddling-no-repeat.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-table-cells-zoomed.html b/tests/wpt/tests/css/css-backgrounds/background-image-table-cells-zoomed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-table-cells-zoomed.html rename to tests/wpt/tests/css/css-backgrounds/background-image-table-cells-zoomed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-with-border-radius-fidelity.html b/tests/wpt/tests/css/css-backgrounds/background-image-with-border-radius-fidelity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-image-with-border-radius-fidelity.html rename to tests/wpt/tests/css/css-backgrounds/background-image-with-border-radius-fidelity.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-iframe-root-ref.html b/tests/wpt/tests/css/css-backgrounds/background-margin-iframe-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-iframe-root-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-margin-iframe-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-iframe-root.html b/tests/wpt/tests/css/css-backgrounds/background-margin-iframe-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-iframe-root.html rename to tests/wpt/tests/css/css-backgrounds/background-margin-iframe-root.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-root-ref.html b/tests/wpt/tests/css/css-backgrounds/background-margin-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-root-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-margin-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-root.html b/tests/wpt/tests/css/css-backgrounds/background-margin-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-root.html rename to tests/wpt/tests/css/css-backgrounds/background-margin-root.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-transformed-root-ref.html b/tests/wpt/tests/css/css-backgrounds/background-margin-transformed-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-transformed-root-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-margin-transformed-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-transformed-root.html b/tests/wpt/tests/css/css-backgrounds/background-margin-transformed-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-transformed-root.html rename to tests/wpt/tests/css/css-backgrounds/background-margin-transformed-root.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-will-change-root-ref.html b/tests/wpt/tests/css/css-backgrounds/background-margin-will-change-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-will-change-root-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-margin-will-change-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-will-change-root.html b/tests/wpt/tests/css/css-backgrounds/background-margin-will-change-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-margin-will-change-root.html rename to tests/wpt/tests/css/css-backgrounds/background-margin-will-change-root.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-none-none-and-color-ref.html b/tests/wpt/tests/css/css-backgrounds/background-none-none-and-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-none-none-and-color-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-none-none-and-color-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-none-none-and-color.html b/tests/wpt/tests/css/css-backgrounds/background-none-none-and-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-none-none-and-color.html rename to tests/wpt/tests/css/css-backgrounds/background-none-none-and-color.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-001.html b/tests/wpt/tests/css/css-backgrounds/background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-001.html rename to tests/wpt/tests/css/css-backgrounds/background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-002.html b/tests/wpt/tests/css/css-backgrounds/background-origin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-002.html rename to tests/wpt/tests/css/css-backgrounds/background-origin-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-003.html b/tests/wpt/tests/css/css-backgrounds/background-origin-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-003.html rename to tests/wpt/tests/css/css-backgrounds/background-origin-003.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-004.html b/tests/wpt/tests/css/css-backgrounds/background-origin-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-004.html rename to tests/wpt/tests/css/css-backgrounds/background-origin-004.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-005.html b/tests/wpt/tests/css/css-backgrounds/background-origin-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-005.html rename to tests/wpt/tests/css/css-backgrounds/background-origin-005.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-006.html b/tests/wpt/tests/css/css-backgrounds/background-origin-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-006.html rename to tests/wpt/tests/css/css-backgrounds/background-origin-006.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-007.html b/tests/wpt/tests/css/css-backgrounds/background-origin-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-007.html rename to tests/wpt/tests/css/css-backgrounds/background-origin-007.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-008.html b/tests/wpt/tests/css/css-backgrounds/background-origin-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin-008.html rename to tests/wpt/tests/css/css-backgrounds/background-origin-008.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/list.txt b/tests/wpt/tests/css/css-backgrounds/background-origin/list.txt similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/list.txt rename to tests/wpt/tests/css/css-backgrounds/background-origin/list.txt diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-border-box.html b/tests/wpt/tests/css/css-backgrounds/background-origin/origin-border-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-border-box.html rename to tests/wpt/tests/css/css-backgrounds/background-origin/origin-border-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-border-box_with_position.html b/tests/wpt/tests/css/css-backgrounds/background-origin/origin-border-box_with_position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-border-box_with_position.html rename to tests/wpt/tests/css/css-backgrounds/background-origin/origin-border-box_with_position.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-border-box_with_radius.html b/tests/wpt/tests/css/css-backgrounds/background-origin/origin-border-box_with_radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-border-box_with_radius.html rename to tests/wpt/tests/css/css-backgrounds/background-origin/origin-border-box_with_radius.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-border-box_with_size.html b/tests/wpt/tests/css/css-backgrounds/background-origin/origin-border-box_with_size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-border-box_with_size.html rename to tests/wpt/tests/css/css-backgrounds/background-origin/origin-border-box_with_size.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-content-box.html b/tests/wpt/tests/css/css-backgrounds/background-origin/origin-content-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-content-box.html rename to tests/wpt/tests/css/css-backgrounds/background-origin/origin-content-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-content-box_with_position.html b/tests/wpt/tests/css/css-backgrounds/background-origin/origin-content-box_with_position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-content-box_with_position.html rename to tests/wpt/tests/css/css-backgrounds/background-origin/origin-content-box_with_position.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-content-box_with_radius.html b/tests/wpt/tests/css/css-backgrounds/background-origin/origin-content-box_with_radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-content-box_with_radius.html rename to tests/wpt/tests/css/css-backgrounds/background-origin/origin-content-box_with_radius.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-content-box_with_size.html b/tests/wpt/tests/css/css-backgrounds/background-origin/origin-content-box_with_size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-content-box_with_size.html rename to tests/wpt/tests/css/css-backgrounds/background-origin/origin-content-box_with_size.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-padding-box.html b/tests/wpt/tests/css/css-backgrounds/background-origin/origin-padding-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-padding-box.html rename to tests/wpt/tests/css/css-backgrounds/background-origin/origin-padding-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-padding-box_with_position.html b/tests/wpt/tests/css/css-backgrounds/background-origin/origin-padding-box_with_position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-padding-box_with_position.html rename to tests/wpt/tests/css/css-backgrounds/background-origin/origin-padding-box_with_position.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-padding-box_with_radius.html b/tests/wpt/tests/css/css-backgrounds/background-origin/origin-padding-box_with_radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-padding-box_with_radius.html rename to tests/wpt/tests/css/css-backgrounds/background-origin/origin-padding-box_with_radius.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-padding-box_with_size.html b/tests/wpt/tests/css/css-backgrounds/background-origin/origin-padding-box_with_size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-origin/origin-padding-box_with_size.html rename to tests/wpt/tests/css/css-backgrounds/background-origin/origin-padding-box_with_size.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-paint-order-001.html b/tests/wpt/tests/css/css-backgrounds/background-paint-order-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-paint-order-001.html rename to tests/wpt/tests/css/css-backgrounds/background-paint-order-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-position-calc-minmax-001.html b/tests/wpt/tests/css/css-backgrounds/background-position-calc-minmax-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-position-calc-minmax-001.html rename to tests/wpt/tests/css/css-backgrounds/background-position-calc-minmax-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-position-negative-percentage-comparison.html b/tests/wpt/tests/css/css-backgrounds/background-position-negative-percentage-comparison.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-position-negative-percentage-comparison.html rename to tests/wpt/tests/css/css-backgrounds/background-position-negative-percentage-comparison.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-position-subpixel-at-border.tentative.html b/tests/wpt/tests/css/css-backgrounds/background-position-subpixel-at-border.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-position-subpixel-at-border.tentative.html rename to tests/wpt/tests/css/css-backgrounds/background-position-subpixel-at-border.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-position-three-four-values.html b/tests/wpt/tests/css/css-backgrounds/background-position-three-four-values.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-position-three-four-values.html rename to tests/wpt/tests/css/css-backgrounds/background-position-three-four-values.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-position-xy-three-four-values-passthru.html b/tests/wpt/tests/css/css-backgrounds/background-position-xy-three-four-values-passthru.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-position-xy-three-four-values-passthru.html rename to tests/wpt/tests/css/css-backgrounds/background-position-xy-three-four-values-passthru.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-position/reference/subpixel-position-center-ref.tentative.html b/tests/wpt/tests/css/css-backgrounds/background-position/reference/subpixel-position-center-ref.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-position/reference/subpixel-position-center-ref.tentative.html rename to tests/wpt/tests/css/css-backgrounds/background-position/reference/subpixel-position-center-ref.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-position/subpixel-position-center.tentative.html b/tests/wpt/tests/css/css-backgrounds/background-position/subpixel-position-center.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-position/subpixel-position-center.tentative.html rename to tests/wpt/tests/css/css-backgrounds/background-position/subpixel-position-center.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-001.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-round-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-001.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-round-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-002.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-round-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-002.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-round-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-1-ref.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-round-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-1-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-round-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-1a.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-round-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-1a.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-round-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-1b.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-round-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-1b.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-round-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-1c.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-round-1c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-1c.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-round-1c.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-1d.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-round-1d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-1d.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-round-1d.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-1e.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-round-1e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-1e.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-round-1e.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-2-ref.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-round-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-2-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-round-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-2.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-round-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-2.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-round-2.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-3-ref.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-round-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-3-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-round-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-3.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-round-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-3.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-round-3.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-4-ref.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-round-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-4-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-round-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-4.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-round-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-round-4.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-round-4.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-1-ref.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-1-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-10-ref.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-10-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-10-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-10-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-10.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-10.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-10.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-10.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-1a.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-1a.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-1b.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-1b.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-1c.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-1c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-1c.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-1c.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-2-ref.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-2-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-2.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-2.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-2.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-3-ref.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-3-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-3.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-3.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-3.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-4-ref.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-4-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-4.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-4.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-4.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-5-ref.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-5-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-5-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-5-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-5.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-5.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-5.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-6-ref.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-6-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-6-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-6-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-6.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-6.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-6.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-6.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-7-ref.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-7-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-7-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-7-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-7.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-7.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-7.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-7.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-8-ref.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-8-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-8-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-8-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-8.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-8.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-8.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-8.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-9-ref.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-9-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-9-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-9-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-9.html b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-9.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-9.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-9.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-padding-box.htm b/tests/wpt/tests/css/css-backgrounds/background-repeat-space-padding-box.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat-space-padding-box.htm rename to tests/wpt/tests/css/css-backgrounds/background-repeat-space-padding-box.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/background-repeat-no-repeat.xht b/tests/wpt/tests/css/css-backgrounds/background-repeat/background-repeat-no-repeat.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/background-repeat-no-repeat.xht rename to tests/wpt/tests/css/css-backgrounds/background-repeat/background-repeat-no-repeat.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/background-repeat-repeat-x.xht b/tests/wpt/tests/css/css-backgrounds/background-repeat/background-repeat-repeat-x.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/background-repeat-repeat-x.xht rename to tests/wpt/tests/css/css-backgrounds/background-repeat/background-repeat-repeat-x.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/background-repeat-repeat-y.xht b/tests/wpt/tests/css/css-backgrounds/background-repeat/background-repeat-repeat-y.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/background-repeat-repeat-y.xht rename to tests/wpt/tests/css/css-backgrounds/background-repeat/background-repeat-repeat-y.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht b/tests/wpt/tests/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht rename to tests/wpt/tests/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/background-repeat-round.xht b/tests/wpt/tests/css/css-backgrounds/background-repeat/background-repeat-round.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/background-repeat-round.xht rename to tests/wpt/tests/css/css-backgrounds/background-repeat/background-repeat-round.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/background-repeat-space.xht b/tests/wpt/tests/css/css-backgrounds/background-repeat/background-repeat-space.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/background-repeat-space.xht rename to tests/wpt/tests/css/css-backgrounds/background-repeat/background-repeat-space.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/gradient-repeat-spaced-with-borders.html b/tests/wpt/tests/css/css-backgrounds/background-repeat/gradient-repeat-spaced-with-borders.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/gradient-repeat-spaced-with-borders.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat/gradient-repeat-spaced-with-borders.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/background-repeat-no-repeat.xht b/tests/wpt/tests/css/css-backgrounds/background-repeat/reference/background-repeat-no-repeat.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/background-repeat-no-repeat.xht rename to tests/wpt/tests/css/css-backgrounds/background-repeat/reference/background-repeat-no-repeat.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/background-repeat-repeat-x.xht b/tests/wpt/tests/css/css-backgrounds/background-repeat/reference/background-repeat-repeat-x.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/background-repeat-repeat-x.xht rename to tests/wpt/tests/css/css-backgrounds/background-repeat/reference/background-repeat-repeat-x.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/background-repeat-repeat-y.xht b/tests/wpt/tests/css/css-backgrounds/background-repeat/reference/background-repeat-repeat-y.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/background-repeat-repeat-y.xht rename to tests/wpt/tests/css/css-backgrounds/background-repeat/reference/background-repeat-repeat-y.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/background-repeat-round-roundup.xht b/tests/wpt/tests/css/css-backgrounds/background-repeat/reference/background-repeat-round-roundup.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/background-repeat-round-roundup.xht rename to tests/wpt/tests/css/css-backgrounds/background-repeat/reference/background-repeat-round-roundup.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/background-repeat-round.xht b/tests/wpt/tests/css/css-backgrounds/background-repeat/reference/background-repeat-round.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/background-repeat-round.xht rename to tests/wpt/tests/css/css-backgrounds/background-repeat/reference/background-repeat-round.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/background-repeat-space.xht b/tests/wpt/tests/css/css-backgrounds/background-repeat/reference/background-repeat-space.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/background-repeat-space.xht rename to tests/wpt/tests/css/css-backgrounds/background-repeat/reference/background-repeat-space.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/gradient-repeat-spaced-with-borders.html b/tests/wpt/tests/css/css-backgrounds/background-repeat/reference/gradient-repeat-spaced-with-borders.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/gradient-repeat-spaced-with-borders.html rename to tests/wpt/tests/css/css-backgrounds/background-repeat/reference/gradient-repeat-spaced-with-borders.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/support/rectangle-96x60.png b/tests/wpt/tests/css/css-backgrounds/background-repeat/reference/support/rectangle-96x60.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/reference/support/rectangle-96x60.png rename to tests/wpt/tests/css/css-backgrounds/background-repeat/reference/support/rectangle-96x60.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/support/rectangle-96x60.png b/tests/wpt/tests/css/css-backgrounds/background-repeat/support/rectangle-96x60.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-repeat/support/rectangle-96x60.png rename to tests/wpt/tests/css/css-backgrounds/background-repeat/support/rectangle-96x60.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-rounded-image-clip-001.html b/tests/wpt/tests/css/css-backgrounds/background-rounded-image-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-rounded-image-clip-001.html rename to tests/wpt/tests/css/css-backgrounds/background-rounded-image-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-rounded-image-clip-002.html b/tests/wpt/tests/css/css-backgrounds/background-rounded-image-clip-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-rounded-image-clip-002.html rename to tests/wpt/tests/css/css-backgrounds/background-rounded-image-clip-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-001.html b/tests/wpt/tests/css/css-backgrounds/background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-001.html rename to tests/wpt/tests/css/css-backgrounds/background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-002.html b/tests/wpt/tests/css/css-backgrounds/background-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-002.html rename to tests/wpt/tests/css/css-backgrounds/background-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-003.html b/tests/wpt/tests/css/css-backgrounds/background-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-003.html rename to tests/wpt/tests/css/css-backgrounds/background-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-005.html b/tests/wpt/tests/css/css-backgrounds/background-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-005.html rename to tests/wpt/tests/css/css-backgrounds/background-size-005.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-006.html b/tests/wpt/tests/css/css-backgrounds/background-size-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-006.html rename to tests/wpt/tests/css/css-backgrounds/background-size-006.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-007.html b/tests/wpt/tests/css/css-backgrounds/background-size-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-007.html rename to tests/wpt/tests/css/css-backgrounds/background-size-007.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-008.html b/tests/wpt/tests/css/css-backgrounds/background-size-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-008.html rename to tests/wpt/tests/css/css-backgrounds/background-size-008.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-009.html b/tests/wpt/tests/css/css-backgrounds/background-size-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-009.html rename to tests/wpt/tests/css/css-backgrounds/background-size-009.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-010.html b/tests/wpt/tests/css/css-backgrounds/background-size-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-010.html rename to tests/wpt/tests/css/css-backgrounds/background-size-010.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-011.html b/tests/wpt/tests/css/css-backgrounds/background-size-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-011.html rename to tests/wpt/tests/css/css-backgrounds/background-size-011.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-012.html b/tests/wpt/tests/css/css-backgrounds/background-size-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-012.html rename to tests/wpt/tests/css/css-backgrounds/background-size-012.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-013.html b/tests/wpt/tests/css/css-backgrounds/background-size-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-013.html rename to tests/wpt/tests/css/css-backgrounds/background-size-013.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-014.html b/tests/wpt/tests/css/css-backgrounds/background-size-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-014.html rename to tests/wpt/tests/css/css-backgrounds/background-size-014.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-015.html b/tests/wpt/tests/css/css-backgrounds/background-size-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-015.html rename to tests/wpt/tests/css/css-backgrounds/background-size-015.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-016.html b/tests/wpt/tests/css/css-backgrounds/background-size-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-016.html rename to tests/wpt/tests/css/css-backgrounds/background-size-016.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-017.html b/tests/wpt/tests/css/css-backgrounds/background-size-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-017.html rename to tests/wpt/tests/css/css-backgrounds/background-size-017.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-018.html b/tests/wpt/tests/css/css-backgrounds/background-size-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-018.html rename to tests/wpt/tests/css/css-backgrounds/background-size-018.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-019.html b/tests/wpt/tests/css/css-backgrounds/background-size-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-019.html rename to tests/wpt/tests/css/css-backgrounds/background-size-019.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-020.html b/tests/wpt/tests/css/css-backgrounds/background-size-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-020.html rename to tests/wpt/tests/css/css-backgrounds/background-size-020.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-021.html b/tests/wpt/tests/css/css-backgrounds/background-size-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-021.html rename to tests/wpt/tests/css/css-backgrounds/background-size-021.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-022.html b/tests/wpt/tests/css/css-backgrounds/background-size-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-022.html rename to tests/wpt/tests/css/css-backgrounds/background-size-022.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-023.html b/tests/wpt/tests/css/css-backgrounds/background-size-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-023.html rename to tests/wpt/tests/css/css-backgrounds/background-size-023.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-024.html b/tests/wpt/tests/css/css-backgrounds/background-size-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-024.html rename to tests/wpt/tests/css/css-backgrounds/background-size-024.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-025.html b/tests/wpt/tests/css/css-backgrounds/background-size-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-025.html rename to tests/wpt/tests/css/css-backgrounds/background-size-025.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-026.html b/tests/wpt/tests/css/css-backgrounds/background-size-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-026.html rename to tests/wpt/tests/css/css-backgrounds/background-size-026.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-027.html b/tests/wpt/tests/css/css-backgrounds/background-size-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-027.html rename to tests/wpt/tests/css/css-backgrounds/background-size-027.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-028.html b/tests/wpt/tests/css/css-backgrounds/background-size-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-028.html rename to tests/wpt/tests/css/css-backgrounds/background-size-028.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-029.html b/tests/wpt/tests/css/css-backgrounds/background-size-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-029.html rename to tests/wpt/tests/css/css-backgrounds/background-size-029.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-030.html b/tests/wpt/tests/css/css-backgrounds/background-size-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-030.html rename to tests/wpt/tests/css/css-backgrounds/background-size-030.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-031.html b/tests/wpt/tests/css/css-backgrounds/background-size-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-031.html rename to tests/wpt/tests/css/css-backgrounds/background-size-031.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-032.html b/tests/wpt/tests/css/css-backgrounds/background-size-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-032.html rename to tests/wpt/tests/css/css-backgrounds/background-size-032.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-033.html b/tests/wpt/tests/css/css-backgrounds/background-size-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-033.html rename to tests/wpt/tests/css/css-backgrounds/background-size-033.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-034.html b/tests/wpt/tests/css/css-backgrounds/background-size-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-034.html rename to tests/wpt/tests/css/css-backgrounds/background-size-034.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-041.html b/tests/wpt/tests/css/css-backgrounds/background-size-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-041.html rename to tests/wpt/tests/css/css-backgrounds/background-size-041.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-042.html b/tests/wpt/tests/css/css-backgrounds/background-size-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-042.html rename to tests/wpt/tests/css/css-backgrounds/background-size-042.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-043.html b/tests/wpt/tests/css/css-backgrounds/background-size-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-043.html rename to tests/wpt/tests/css/css-backgrounds/background-size-043.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-044.html b/tests/wpt/tests/css/css-backgrounds/background-size-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-044.html rename to tests/wpt/tests/css/css-backgrounds/background-size-044.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-applies-to-block.htm b/tests/wpt/tests/css/css-backgrounds/background-size-applies-to-block.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-applies-to-block.htm rename to tests/wpt/tests/css/css-backgrounds/background-size-applies-to-block.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-aspect-ratio.htm b/tests/wpt/tests/css/css-backgrounds/background-size-aspect-ratio.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-aspect-ratio.htm rename to tests/wpt/tests/css/css-backgrounds/background-size-aspect-ratio.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-contain-001.html b/tests/wpt/tests/css/css-backgrounds/background-size-contain-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-contain-001.html rename to tests/wpt/tests/css/css-backgrounds/background-size-contain-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-contain-002.html b/tests/wpt/tests/css/css-backgrounds/background-size-contain-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-contain-002.html rename to tests/wpt/tests/css/css-backgrounds/background-size-contain-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-cover-001.html b/tests/wpt/tests/css/css-backgrounds/background-size-cover-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-cover-001.html rename to tests/wpt/tests/css/css-backgrounds/background-size-cover-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-cover-002.html b/tests/wpt/tests/css/css-backgrounds/background-size-cover-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-cover-002.html rename to tests/wpt/tests/css/css-backgrounds/background-size-cover-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-cover-003-ref.html b/tests/wpt/tests/css/css-backgrounds/background-size-cover-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-cover-003-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-size-cover-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-cover-003.html b/tests/wpt/tests/css/css-backgrounds/background-size-cover-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-cover-003.html rename to tests/wpt/tests/css/css-backgrounds/background-size-cover-003.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-one-value-1x1-image.html b/tests/wpt/tests/css/css-backgrounds/background-size-one-value-1x1-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-one-value-1x1-image.html rename to tests/wpt/tests/css/css-backgrounds/background-size-one-value-1x1-image.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-percentage-root-ref.html b/tests/wpt/tests/css/css-backgrounds/background-size-percentage-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-percentage-root-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-size-percentage-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-percentage-root.html b/tests/wpt/tests/css/css-backgrounds/background-size-percentage-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-percentage-root.html rename to tests/wpt/tests/css/css-backgrounds/background-size-percentage-root.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size-with-negative-value.html b/tests/wpt/tests/css/css-backgrounds/background-size-with-negative-value.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size-with-negative-value.html rename to tests/wpt/tests/css/css-backgrounds/background-size-with-negative-value.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-contain.xht b/tests/wpt/tests/css/css-backgrounds/background-size/background-size-contain.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-contain.xht rename to tests/wpt/tests/css/css-backgrounds/background-size/background-size-contain.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-cover-contain-001.xht b/tests/wpt/tests/css/css-backgrounds/background-size/background-size-cover-contain-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-cover-contain-001.xht rename to tests/wpt/tests/css/css-backgrounds/background-size/background-size-cover-contain-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-cover-contain-002.xht b/tests/wpt/tests/css/css-backgrounds/background-size/background-size-cover-contain-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-cover-contain-002.xht rename to tests/wpt/tests/css/css-backgrounds/background-size/background-size-cover-contain-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-cover-svg.html b/tests/wpt/tests/css/css-backgrounds/background-size/background-size-cover-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-cover-svg.html rename to tests/wpt/tests/css/css-backgrounds/background-size/background-size-cover-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-cover.xht b/tests/wpt/tests/css/css-backgrounds/background-size/background-size-cover.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-cover.xht rename to tests/wpt/tests/css/css-backgrounds/background-size/background-size-cover.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-near-zero-color.html b/tests/wpt/tests/css/css-backgrounds/background-size/background-size-near-zero-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-near-zero-color.html rename to tests/wpt/tests/css/css-backgrounds/background-size/background-size-near-zero-color.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-near-zero-gradient.html b/tests/wpt/tests/css/css-backgrounds/background-size/background-size-near-zero-gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-near-zero-gradient.html rename to tests/wpt/tests/css/css-backgrounds/background-size/background-size-near-zero-gradient.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-near-zero-png.html b/tests/wpt/tests/css/css-backgrounds/background-size/background-size-near-zero-png.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-near-zero-png.html rename to tests/wpt/tests/css/css-backgrounds/background-size/background-size-near-zero-png.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-near-zero-svg.html b/tests/wpt/tests/css/css-backgrounds/background-size/background-size-near-zero-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/background-size-near-zero-svg.html rename to tests/wpt/tests/css/css-backgrounds/background-size/background-size-near-zero-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/reference/background-size-contain.xht b/tests/wpt/tests/css/css-backgrounds/background-size/reference/background-size-contain.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/reference/background-size-contain.xht rename to tests/wpt/tests/css/css-backgrounds/background-size/reference/background-size-contain.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/reference/background-size-cover-svg-ref.html b/tests/wpt/tests/css/css-backgrounds/background-size/reference/background-size-cover-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/reference/background-size-cover-svg-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-size/reference/background-size-cover-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/reference/background-size-cover.xht b/tests/wpt/tests/css/css-backgrounds/background-size/reference/background-size-cover.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/reference/background-size-cover.xht rename to tests/wpt/tests/css/css-backgrounds/background-size/reference/background-size-cover.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/reference/background-size-near-zero-ref.html b/tests/wpt/tests/css/css-backgrounds/background-size/reference/background-size-near-zero-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/reference/background-size-near-zero-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-size/reference/background-size-near-zero-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/reference/support/rectangle-96x60.png b/tests/wpt/tests/css/css-backgrounds/background-size/reference/support/rectangle-96x60.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/reference/support/rectangle-96x60.png rename to tests/wpt/tests/css/css-backgrounds/background-size/reference/support/rectangle-96x60.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/support/200x200-red.png b/tests/wpt/tests/css/css-backgrounds/background-size/support/200x200-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/support/200x200-red.png rename to tests/wpt/tests/css/css-backgrounds/background-size/support/200x200-red.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/support/50x50-green.png b/tests/wpt/tests/css/css-backgrounds/background-size/support/50x50-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/support/50x50-green.png rename to tests/wpt/tests/css/css-backgrounds/background-size/support/50x50-green.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/support/50x50-green.svg b/tests/wpt/tests/css/css-backgrounds/background-size/support/50x50-green.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/support/50x50-green.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/support/50x50-green.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/support/rectangle-2560x208.svg b/tests/wpt/tests/css/css-backgrounds/background-size/support/rectangle-2560x208.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/support/rectangle-2560x208.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/support/rectangle-2560x208.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/support/rectangle-96x60.png b/tests/wpt/tests/css/css-backgrounds/background-size/support/rectangle-96x60.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/support/rectangle-96x60.png rename to tests/wpt/tests/css/css-backgrounds/background-size/support/rectangle-96x60.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-001.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-001.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-002.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-002.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-003.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-003.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-003.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-004.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-004.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-004.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-005.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-005.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-005.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-006.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-006.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-006.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-007.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-007.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-007.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-008.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-008.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-008.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-009.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-009.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-009.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-010.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-010.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-010.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-011.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-011.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-011.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-012.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-012.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-012.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-013.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-013.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-013.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-014.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-014.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-014.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-015.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-015.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-015.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-016.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-016.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-016.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-017.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-017.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-017.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-018.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-018.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-018.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-019.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-019.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-019.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-020.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-020.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-020.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-021.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-021.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-021.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-022.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-022.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-022.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-023.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-023.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-023.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-024.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-024.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-024.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-025.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-025.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-025.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-026.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-026.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-026.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-027.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-027.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-027.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-028.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-028.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-028.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-029.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/background-size-vector-029.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/background-size-vector-029.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/diagonal-percentage-vector-background.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/diagonal-percentage-vector-background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/diagonal-percentage-vector-background.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/diagonal-percentage-vector-background.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-001-ref.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-008-ref.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-008-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-021-ref.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-021-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-022-ref.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-022-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/background-size-vector-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/diagonal-percentage-vector-background-ref.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/diagonal-percentage-vector-background-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/diagonal-percentage-vector-background-ref.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/diagonal-percentage-vector-background-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime128x16-aqua128x16.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime128x16-aqua128x16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime128x16-aqua128x16.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime128x16-aqua128x16.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime128x192-aqua128x192.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime128x192-aqua128x192.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime128x192-aqua128x192.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime128x192-aqua128x192.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime16x128-aqua16x128.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime16x128-aqua16x128.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime16x128-aqua16x128.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime16x128-aqua16x128.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime16x192-aqua16x192.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime16x192-aqua16x192.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime16x192-aqua16x192.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime16x192-aqua16x192.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime24x192-aqua24x192.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime24x192-aqua24x192.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime24x192-aqua24x192.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime24x192-aqua24x192.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime2x16-aqua2x16.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime2x16-aqua2x16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime2x16-aqua2x16.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime2x16-aqua2x16.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime8x16-aqua8x16.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime8x16-aqua8x16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime8x16-aqua8x16.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-t-lime8x16-aqua8x16.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-empty.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-empty.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-empty.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-empty.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime192x384-aqua192x384.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime192x384-aqua192x384.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime192x384-aqua192x384.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime192x384-aqua192x384.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x16-aqua256x16.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x16-aqua256x16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x16-aqua256x16.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x16-aqua256x16.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x384-aqua256x384.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x384-aqua256x384.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x384-aqua256x384.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x384-aqua256x384.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x512-aqua256x256.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x512-aqua256x256.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x512-aqua256x256.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x512-aqua256x256.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x768.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x768.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x768.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime256x768.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime2x16-aqua2x16.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime2x16-aqua2x16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime2x16-aqua2x16.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime2x16-aqua2x16.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime32x128-aqua32x128.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime32x128-aqua32x128.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime32x128-aqua32x128.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime32x128-aqua32x128.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime48x384-aqua48x384.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime48x384-aqua48x384.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime48x384-aqua48x384.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime48x384-aqua48x384.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime4x16-aqua4x16.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime4x16-aqua4x16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime4x16-aqua4x16.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime4x16-aqua4x16.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime8x16-aqua8x16.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime8x16-aqua8x16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime8x16-aqua8x16.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime8x16-aqua8x16.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime8x32-aqua8x32.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime8x32-aqua8x32.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime8x32-aqua8x32.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-tall-lime8x32-aqua8x32.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-empty.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-empty.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-empty.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-empty.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x128-aqua12x128.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x128-aqua12x128.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x128-aqua12x128.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x128-aqua12x128.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x16-aqua12x16.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x16-aqua12x16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x16-aqua12x16.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x16-aqua12x16.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x24-aqua12x24.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x24-aqua12x24.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x24-aqua12x24.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x24-aqua12x24.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x96-aqua12x96.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x96-aqua12x96.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x96-aqua12x96.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime12x96-aqua12x96.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime16x128-aqua16x128.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime16x128-aqua16x128.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime16x128-aqua16x128.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime16x128-aqua16x128.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime2x16-aqua2x16.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime2x16-aqua2x16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime2x16-aqua2x16.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime2x16-aqua2x16.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime64x128-aqua64x128.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime64x128-aqua64x128.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime64x128-aqua64x128.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime64x128-aqua64x128.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime768x128-aqua768x128.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime768x128-aqua768x128.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime768x128-aqua768x128.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime768x128-aqua768x128.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime768x16-aqua768x16.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime768x16-aqua768x16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime768x16-aqua768x16.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime768x16-aqua768x16.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime768x256.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime768x256.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime768x256.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime768x256.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime8x128-aqua8x128.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime8x128-aqua8x128.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime8x128-aqua8x128.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime8x128-aqua8x128.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime8x16-aqua8x16.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime8x16-aqua8x16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime8x16-aqua8x16.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime8x16-aqua8x16.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime8x64-aqua8x64.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime8x64-aqua8x64.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime8x64-aqua8x64.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/reference/ref-wide-lime8x64-aqua8x64.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/diagonal-scaled-fixed.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/diagonal-scaled-fixed.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/diagonal-scaled-fixed.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/diagonal-scaled-fixed.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/diagonal-scaled.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/diagonal-scaled.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/diagonal-scaled.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/diagonal-scaled.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/intrinsic-ratio-no-dimensions.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/intrinsic-ratio-no-dimensions.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/intrinsic-ratio-no-dimensions.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/intrinsic-ratio-no-dimensions.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/intrinsic-ratio-zero-height.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/intrinsic-ratio-zero-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/intrinsic-ratio-zero-height.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/intrinsic-ratio-zero-height.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/intrinsic-ratio-zero-width.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/intrinsic-ratio-zero-width.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/intrinsic-ratio-zero-width.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/intrinsic-ratio-zero-width.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-nonpercent-height-viewbox.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-nonpercent-height-viewbox.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-nonpercent-height-viewbox.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-nonpercent-height-viewbox.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-nonpercent-height.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-nonpercent-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-nonpercent-height.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-nonpercent-height.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-omitted-height-extreme-viewbox.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-omitted-height-extreme-viewbox.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-omitted-height-extreme-viewbox.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-omitted-height-extreme-viewbox.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-omitted-height-viewbox.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-omitted-height-viewbox.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-omitted-height-viewbox.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-omitted-height-viewbox.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-omitted-height.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-omitted-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-omitted-height.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-omitted-height.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-percent-height-viewbox.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-percent-height-viewbox.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-percent-height-viewbox.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-percent-height-viewbox.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-percent-height.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-percent-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-percent-height.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/nonpercent-width-percent-height.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/omitted-width-nonpercent-height-extreme-viewbox.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/omitted-width-nonpercent-height-extreme-viewbox.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/omitted-width-nonpercent-height-extreme-viewbox.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/omitted-width-nonpercent-height-extreme-viewbox.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/omitted-width-nonpercent-height-viewbox.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/omitted-width-nonpercent-height-viewbox.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/omitted-width-nonpercent-height-viewbox.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/omitted-width-nonpercent-height-viewbox.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/omitted-width-nonpercent-height.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/omitted-width-nonpercent-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/omitted-width-nonpercent-height.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/omitted-width-nonpercent-height.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/omitted-width-omitted-height-viewbox.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/omitted-width-omitted-height-viewbox.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/omitted-width-omitted-height-viewbox.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/omitted-width-omitted-height-viewbox.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/omitted-width-omitted-height.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/omitted-width-omitted-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/omitted-width-omitted-height.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/omitted-width-omitted-height.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/omitted-width-percent-height-viewbox.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/omitted-width-percent-height-viewbox.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/omitted-width-percent-height-viewbox.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/omitted-width-percent-height-viewbox.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/omitted-width-percent-height.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/omitted-width-percent-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/omitted-width-percent-height.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/omitted-width-percent-height.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/percent-width-nonpercent-height-viewbox.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/percent-width-nonpercent-height-viewbox.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/percent-width-nonpercent-height-viewbox.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/percent-width-nonpercent-height-viewbox.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/percent-width-nonpercent-height.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/percent-width-nonpercent-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/percent-width-nonpercent-height.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/percent-width-nonpercent-height.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/percent-width-omitted-height-viewbox.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/percent-width-omitted-height-viewbox.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/percent-width-omitted-height-viewbox.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/percent-width-omitted-height-viewbox.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/percent-width-omitted-height.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/percent-width-omitted-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/percent-width-omitted-height.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/percent-width-omitted-height.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/percent-width-percent-height-viewbox.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/percent-width-percent-height-viewbox.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/percent-width-percent-height-viewbox.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/percent-width-percent-height-viewbox.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/percent-width-percent-height.svg b/tests/wpt/tests/css/css-backgrounds/background-size/vector/support/percent-width-percent-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/support/percent-width-percent-height.svg rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/support/percent-width-percent-height.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto--omitted-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto--omitted-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto--omitted-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto--omitted-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto--percent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--nonpercent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--omitted-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--auto-32px--percent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--nonpercent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--omitted-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--percent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--width.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--contain--width.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--contain--width.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height--crisp.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height--crisp.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height--crisp.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height--crisp.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height-viewbox--crisp.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height-viewbox--crisp.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height-viewbox--crisp.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height-viewbox--crisp.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--nonpercent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--omitted-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--percent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--width.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/tall--cover--width.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/tall--cover--width.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--nonpercent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--omitted-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--12px-auto--percent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--nonpercent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--omitted-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto--percent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--nonpercent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--omitted-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--auto-32px--percent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--nonpercent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--omitted-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--percent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--width.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--contain--width.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--contain--width.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--nonpercent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--omitted-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-nonpercent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-nonpercent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-nonpercent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-nonpercent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-nonpercent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-nonpercent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-nonpercent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-nonpercent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-omitted-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-omitted-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-omitted-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-omitted-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-omitted-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-omitted-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-omitted-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-omitted-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-percent-height-viewbox.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-percent-height-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-percent-height-viewbox.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-percent-height-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-percent-height.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-percent-height.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--percent-width-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--width.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/wide--cover--width.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/wide--cover--width.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-height-ratio-5px-auto.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-height-ratio-5px-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-height-ratio-5px-auto.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-height-ratio-5px-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-height-ratio-auto-5px.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-height-ratio-auto-5px.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-height-ratio-auto-5px.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-height-ratio-auto-5px.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-height-ratio-auto-auto.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-height-ratio-auto-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-height-ratio-auto-auto.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-height-ratio-auto-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-height-ratio-contain.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-height-ratio-contain.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-height-ratio-contain.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-height-ratio-contain.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-height-ratio-cover.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-height-ratio-cover.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-height-ratio-cover.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-height-ratio-cover.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-5px-auto.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-5px-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-5px-auto.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-5px-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-auto-5px.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-auto-5px.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-auto-5px.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-auto-5px.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-auto-auto.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-auto-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-auto-auto.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-auto-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-contain.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-contain.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-contain.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-contain.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-cover.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-cover.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-cover.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-ratio-no-dimensions-cover.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-5px-auto.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-width-ratio-5px-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-5px-auto.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-width-ratio-5px-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-auto-5px.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-width-ratio-auto-5px.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-auto-5px.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-width-ratio-auto-5px.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-auto-auto.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-width-ratio-auto-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-auto-auto.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-width-ratio-auto-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-contain.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-width-ratio-contain.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-contain.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-width-ratio-contain.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-cover.html b/tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-width-ratio-cover.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-cover.html rename to tests/wpt/tests/css/css-backgrounds/background-size/vector/zero-width-ratio-cover.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background_color_padding_box.htm b/tests/wpt/tests/css/css-backgrounds/background_color_padding_box.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background_color_padding_box.htm rename to tests/wpt/tests/css/css-backgrounds/background_color_padding_box.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background_properties_greater_than_images.htm b/tests/wpt/tests/css/css-backgrounds/background_properties_greater_than_images.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background_properties_greater_than_images.htm rename to tests/wpt/tests/css/css-backgrounds/background_properties_greater_than_images.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background_repeat_space_border_box.htm b/tests/wpt/tests/css/css-backgrounds/background_repeat_space_border_box.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background_repeat_space_border_box.htm rename to tests/wpt/tests/css/css-backgrounds/background_repeat_space_border_box.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background_repeat_space_content_box.htm b/tests/wpt/tests/css/css-backgrounds/background_repeat_space_content_box.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/background_repeat_space_content_box.htm rename to tests/wpt/tests/css/css-backgrounds/background_repeat_space_content_box.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/bg-color-with-gradient-ref.html b/tests/wpt/tests/css/css-backgrounds/bg-color-with-gradient-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/bg-color-with-gradient-ref.html rename to tests/wpt/tests/css/css-backgrounds/bg-color-with-gradient-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/bg-color-with-gradient.html b/tests/wpt/tests/css/css-backgrounds/bg-color-with-gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/bg-color-with-gradient.html rename to tests/wpt/tests/css/css-backgrounds/bg-color-with-gradient.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-001.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-001.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-002.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-002.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-004-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-004-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-004.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-004.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-005-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-005-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-005.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-005.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-010.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-010.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-011.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-011.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-012.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-012.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-013.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-013.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-014.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-left-radius-014.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-left-radius-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-001.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-001.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-002.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-002.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-004-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-004-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-004.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-004.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-005-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-005-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-005.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-005.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-010.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-010.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-011.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-011.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-012.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-012.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-013.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-013.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-014.xht b/tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-right-radius-014.xht rename to tests/wpt/tests/css/css-backgrounds/border-bottom-right-radius-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-width-medium.html b/tests/wpt/tests/css/css-backgrounds/border-bottom-width-medium.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-width-medium.html rename to tests/wpt/tests/css/css-backgrounds/border-bottom-width-medium.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-width-thick.html b/tests/wpt/tests/css/css-backgrounds/border-bottom-width-thick.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-width-thick.html rename to tests/wpt/tests/css/css-backgrounds/border-bottom-width-thick.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-width-thin.html b/tests/wpt/tests/css/css-backgrounds/border-bottom-width-thin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-bottom-width-thin.html rename to tests/wpt/tests/css/css-backgrounds/border-bottom-width-thin.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-color_transparent.html b/tests/wpt/tests/css/css-backgrounds/border-color_transparent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-color_transparent.html rename to tests/wpt/tests/css/css-backgrounds/border-color_transparent.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-002.html b/tests/wpt/tests/css/css-backgrounds/border-image-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-002.html rename to tests/wpt/tests/css/css-backgrounds/border-image-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-003.html b/tests/wpt/tests/css/css-backgrounds/border-image-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-003.html rename to tests/wpt/tests/css/css-backgrounds/border-image-003.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-004.html b/tests/wpt/tests/css/css-backgrounds/border-image-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-004.html rename to tests/wpt/tests/css/css-backgrounds/border-image-004.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-006.html b/tests/wpt/tests/css/css-backgrounds/border-image-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-006.html rename to tests/wpt/tests/css/css-backgrounds/border-image-006.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-007.html b/tests/wpt/tests/css/css-backgrounds/border-image-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-007.html rename to tests/wpt/tests/css/css-backgrounds/border-image-007.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-011.html b/tests/wpt/tests/css/css-backgrounds/border-image-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-011.html rename to tests/wpt/tests/css/css-backgrounds/border-image-011.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-012.html b/tests/wpt/tests/css/css-backgrounds/border-image-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-012.html rename to tests/wpt/tests/css/css-backgrounds/border-image-012.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-017.xht b/tests/wpt/tests/css/css-backgrounds/border-image-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-017.xht rename to tests/wpt/tests/css/css-backgrounds/border-image-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-018.xht b/tests/wpt/tests/css/css-backgrounds/border-image-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-018.xht rename to tests/wpt/tests/css/css-backgrounds/border-image-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-019.xht b/tests/wpt/tests/css/css-backgrounds/border-image-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-019.xht rename to tests/wpt/tests/css/css-backgrounds/border-image-019.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-020.xht b/tests/wpt/tests/css/css-backgrounds/border-image-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-020.xht rename to tests/wpt/tests/css/css-backgrounds/border-image-020.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-13.html b/tests/wpt/tests/css/css-backgrounds/border-image-13.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-13.html rename to tests/wpt/tests/css/css-backgrounds/border-image-13.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-14.html b/tests/wpt/tests/css/css-backgrounds/border-image-14.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-14.html rename to tests/wpt/tests/css/css-backgrounds/border-image-14.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-15.html b/tests/wpt/tests/css/css-backgrounds/border-image-15.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-15.html rename to tests/wpt/tests/css/css-backgrounds/border-image-15.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-16.html b/tests/wpt/tests/css/css-backgrounds/border-image-16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-16.html rename to tests/wpt/tests/css/css-backgrounds/border-image-16.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-calc-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-calc-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-calc-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-calc-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-calc.html b/tests/wpt/tests/css/css-backgrounds/border-image-calc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-calc.html rename to tests/wpt/tests/css/css-backgrounds/border-image-calc.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-displayed-with-transparent-border-color-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-displayed-with-transparent-border-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-displayed-with-transparent-border-color-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-displayed-with-transparent-border-color-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-displayed-with-transparent-border-color.html b/tests/wpt/tests/css/css-backgrounds/border-image-displayed-with-transparent-border-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-displayed-with-transparent-border-color.html rename to tests/wpt/tests/css/css-backgrounds/border-image-displayed-with-transparent-border-color.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-image-type-001.htm b/tests/wpt/tests/css/css-backgrounds/border-image-image-type-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-image-type-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-image-type-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-image-type-002.htm b/tests/wpt/tests/css/css-backgrounds/border-image-image-type-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-image-type-002.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-image-type-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-image-type-003.htm b/tests/wpt/tests/css/css-backgrounds/border-image-image-type-003.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-image-type-003.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-image-type-003.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-outset-001.htm b/tests/wpt/tests/css/css-backgrounds/border-image-outset-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-outset-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-outset-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-outset-002.htm b/tests/wpt/tests/css/css-backgrounds/border-image-outset-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-outset-002.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-outset-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-outset-003-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-outset-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-outset-003-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-outset-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-outset-003.html b/tests/wpt/tests/css/css-backgrounds/border-image-outset-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-outset-003.html rename to tests/wpt/tests/css/css-backgrounds/border-image-outset-003.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-001.htm b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-002.htm b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-002.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-003.htm b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-003.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-003.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-003.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-004.htm b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-004.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-004.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-004.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-005.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-005.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-005.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-1-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-1-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-1.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-1.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-1.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-repeat-001.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-repeat-001.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-round-1-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-round-1-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-round-1.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-round-1.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-1.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-round-2-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-round-2-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-round-2.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-round-2.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-2.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-round.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-round.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-round.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-011.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-011.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-011.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-1-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-1-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-1.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-1.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-1.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-10-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-10-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-10-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-10-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-10.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-10.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-10.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-10.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-2-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-2-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-2.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-2.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-2.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-3-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-3-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-3.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-3.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-3.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-4-ref-1.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-4-ref-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-4-ref-1.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-4-ref-1.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-4-ref-2.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-4-ref-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-4-ref-2.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-4-ref-2.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-4.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-4.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-4.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-5-ref-1.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-5-ref-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-5-ref-1.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-5-ref-1.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-5-ref-2.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-5-ref-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-5-ref-2.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-5-ref-2.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-5.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-5.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-5.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-6-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-6-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-6-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-6-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-6.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-6.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-6.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-6.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-7-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-7-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-7-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-7-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-7.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-7.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-7.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-7.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-8-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-8-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-8-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-8-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-8.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-8.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-8.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-8.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-9.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-9.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat-space-9.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat-space-9.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat_repeatnegx_none_50px.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat_repeatnegx_none_50px.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-repeat_repeatnegx_none_50px.html rename to tests/wpt/tests/css/css-backgrounds/border-image-repeat_repeatnegx_none_50px.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-round-and-stretch.html b/tests/wpt/tests/css/css-backgrounds/border-image-round-and-stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-round-and-stretch.html rename to tests/wpt/tests/css/css-backgrounds/border-image-round-and-stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-shorthand-001.htm b/tests/wpt/tests/css/css-backgrounds/border-image-shorthand-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-shorthand-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-shorthand-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-shorthand-002.htm b/tests/wpt/tests/css/css-backgrounds/border-image-shorthand-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-shorthand-002.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-shorthand-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-shorthand-003.htm b/tests/wpt/tests/css/css-backgrounds/border-image-shorthand-003.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-shorthand-003.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-shorthand-003.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-001.xht b/tests/wpt/tests/css/css-backgrounds/border-image-slice-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-001.xht rename to tests/wpt/tests/css/css-backgrounds/border-image-slice-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-002.xht b/tests/wpt/tests/css/css-backgrounds/border-image-slice-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-002.xht rename to tests/wpt/tests/css/css-backgrounds/border-image-slice-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-003.xht b/tests/wpt/tests/css/css-backgrounds/border-image-slice-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-003.xht rename to tests/wpt/tests/css/css-backgrounds/border-image-slice-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-004.htm b/tests/wpt/tests/css/css-backgrounds/border-image-slice-004.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-004.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-slice-004.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-005.htm b/tests/wpt/tests/css/css-backgrounds/border-image-slice-005.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-005.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-slice-005.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-006.htm b/tests/wpt/tests/css/css-backgrounds/border-image-slice-006.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-006.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-slice-006.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-007.htm b/tests/wpt/tests/css/css-backgrounds/border-image-slice-007.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-007.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-slice-007.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-fill-001.html b/tests/wpt/tests/css/css-backgrounds/border-image-slice-fill-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-fill-001.html rename to tests/wpt/tests/css/css-backgrounds/border-image-slice-fill-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-fill-002.html b/tests/wpt/tests/css/css-backgrounds/border-image-slice-fill-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-fill-002.html rename to tests/wpt/tests/css/css-backgrounds/border-image-slice-fill-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-fill-003.html b/tests/wpt/tests/css/css-backgrounds/border-image-slice-fill-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-fill-003.html rename to tests/wpt/tests/css/css-backgrounds/border-image-slice-fill-003.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-percentage.html b/tests/wpt/tests/css/css-backgrounds/border-image-slice-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-percentage.html rename to tests/wpt/tests/css/css-backgrounds/border-image-slice-percentage.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-shorthand-reset.html b/tests/wpt/tests/css/css-backgrounds/border-image-slice-shorthand-reset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-slice-shorthand-reset.html rename to tests/wpt/tests/css/css-backgrounds/border-image-slice-shorthand-reset.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-space-001.html b/tests/wpt/tests/css/css-backgrounds/border-image-space-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-space-001.html rename to tests/wpt/tests/css/css-backgrounds/border-image-space-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-001.htm b/tests/wpt/tests/css/css-backgrounds/border-image-width-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-width-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-002.htm b/tests/wpt/tests/css/css-backgrounds/border-image-width-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-002.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-width-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-003.htm b/tests/wpt/tests/css/css-backgrounds/border-image-width-003.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-003.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-width-003.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-004.htm b/tests/wpt/tests/css/css-backgrounds/border-image-width-004.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-004.htm rename to tests/wpt/tests/css/css-backgrounds/border-image-width-004.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-005.xht b/tests/wpt/tests/css/css-backgrounds/border-image-width-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-005.xht rename to tests/wpt/tests/css/css-backgrounds/border-image-width-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-006.xht b/tests/wpt/tests/css/css-backgrounds/border-image-width-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-006.xht rename to tests/wpt/tests/css/css-backgrounds/border-image-width-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-007.xht b/tests/wpt/tests/css/css-backgrounds/border-image-width-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-007.xht rename to tests/wpt/tests/css/css-backgrounds/border-image-width-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-008-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-width-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-008-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-width-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-008.html b/tests/wpt/tests/css/css-backgrounds/border-image-width-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-008.html rename to tests/wpt/tests/css/css-backgrounds/border-image-width-008.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-009.html b/tests/wpt/tests/css/css-backgrounds/border-image-width-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-009.html rename to tests/wpt/tests/css/css-backgrounds/border-image-width-009.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-should-extend-to-padding-ref.html b/tests/wpt/tests/css/css-backgrounds/border-image-width-should-extend-to-padding-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-should-extend-to-padding-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-image-width-should-extend-to-padding-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-should-extend-to-padding.html b/tests/wpt/tests/css/css-backgrounds/border-image-width-should-extend-to-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-image-width-should-extend-to-padding.html rename to tests/wpt/tests/css/css-backgrounds/border-image-width-should-extend-to-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-images.html b/tests/wpt/tests/css/css-backgrounds/border-images.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-images.html rename to tests/wpt/tests/css/css-backgrounds/border-images.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-left-width-medium.html b/tests/wpt/tests/css/css-backgrounds/border-left-width-medium.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-left-width-medium.html rename to tests/wpt/tests/css/css-backgrounds/border-left-width-medium.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-left-width-thick.html b/tests/wpt/tests/css/css-backgrounds/border-left-width-thick.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-left-width-thick.html rename to tests/wpt/tests/css/css-backgrounds/border-left-width-thick.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-left-width-thin.html b/tests/wpt/tests/css/css-backgrounds/border-left-width-thin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-left-width-thin.html rename to tests/wpt/tests/css/css-backgrounds/border-left-width-thin.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-001-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-001-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-001.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-001.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-002-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-002-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-002.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-002.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-003-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-003-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-003.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-003.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-004-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-004-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-004.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-004.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-005-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-005-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-005.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-005.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-006-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-006-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-006.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-006.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-007-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-007-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-007.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-007.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-008.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-008.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-009-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-009-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-009.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-009.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-010-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-010-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-010.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-010.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-011-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-011-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-011.xht b/tests/wpt/tests/css/css-backgrounds/border-radius-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-011.xht rename to tests/wpt/tests/css/css-backgrounds/border-radius-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-012-ref.html b/tests/wpt/tests/css/css-backgrounds/border-radius-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-012-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-radius-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-012.html b/tests/wpt/tests/css/css-backgrounds/border-radius-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-012.html rename to tests/wpt/tests/css/css-backgrounds/border-radius-012.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-013.html b/tests/wpt/tests/css/css-backgrounds/border-radius-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-013.html rename to tests/wpt/tests/css/css-backgrounds/border-radius-013.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-001.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-002.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-002.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-003.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-003.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-003.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-003.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-004.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-004.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-004.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-004.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-005.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-005.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-005.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-005.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-006.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-006.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-006.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-006.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-007.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-007.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-007.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-007.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-008.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-008.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-008.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-008.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-009.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-009.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-009.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-009.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-010.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-010.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-010.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-010.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-011.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-011.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-011.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-011.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-012.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-012.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-012.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-012.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-013.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-013.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-013.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-013.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-014.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-014.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-014.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-014.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-015.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-015.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-015.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-015.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-016.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-016.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-016.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-016.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-017.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-017.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-applies-to-017.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-applies-to-017.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clip-001.html b/tests/wpt/tests/css/css-backgrounds/border-radius-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clip-001.html rename to tests/wpt/tests/css/css-backgrounds/border-radius-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clip-002.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-clip-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clip-002.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-clip-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clipping-002.html b/tests/wpt/tests/css/css-backgrounds/border-radius-clipping-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clipping-002.html rename to tests/wpt/tests/css/css-backgrounds/border-radius-clipping-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clipping-with-transform-001-ref.html b/tests/wpt/tests/css/css-backgrounds/border-radius-clipping-with-transform-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clipping-with-transform-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-radius-clipping-with-transform-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clipping-with-transform-001.html b/tests/wpt/tests/css/css-backgrounds/border-radius-clipping-with-transform-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-clipping-with-transform-001.html rename to tests/wpt/tests/css/css-backgrounds/border-radius-clipping-with-transform-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-content-edge-001.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-content-edge-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-content-edge-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-content-edge-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-css-text.html b/tests/wpt/tests/css/css-backgrounds/border-radius-css-text.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-css-text.html rename to tests/wpt/tests/css/css-backgrounds/border-radius-css-text.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-different-width-001.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-different-width-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-different-width-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-different-width-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-dynamic-from-no-radius-ref.html b/tests/wpt/tests/css/css-backgrounds/border-radius-dynamic-from-no-radius-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-dynamic-from-no-radius-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-radius-dynamic-from-no-radius-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-dynamic-from-no-radius.html b/tests/wpt/tests/css/css-backgrounds/border-radius-dynamic-from-no-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-dynamic-from-no-radius.html rename to tests/wpt/tests/css/css-backgrounds/border-radius-dynamic-from-no-radius.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-horizontal-value-is-zero.html b/tests/wpt/tests/css/css-backgrounds/border-radius-horizontal-value-is-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-horizontal-value-is-zero.html rename to tests/wpt/tests/css/css-backgrounds/border-radius-horizontal-value-is-zero.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-initial-value-001.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-initial-value-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-initial-value-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-initial-value-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-not-inherited-001.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-not-inherited-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-not-inherited-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-not-inherited-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-overflow-hidden.html b/tests/wpt/tests/css/css-backgrounds/border-radius-overflow-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-overflow-hidden.html rename to tests/wpt/tests/css/css-backgrounds/border-radius-overflow-hidden.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-shorthand-001.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-shorthand-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-shorthand-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-shorthand-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-shorthand-002-ref.html b/tests/wpt/tests/css/css-backgrounds/border-radius-shorthand-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-shorthand-002-ref.html rename to tests/wpt/tests/css/css-backgrounds/border-radius-shorthand-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-shorthand-002.html b/tests/wpt/tests/css/css-backgrounds/border-radius-shorthand-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-shorthand-002.html rename to tests/wpt/tests/css/css-backgrounds/border-radius-shorthand-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-style-001.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-style-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-style-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-style-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-style-002.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-style-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-style-002.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-style-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-style-003.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-style-003.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-style-003.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-style-003.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-style-004.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-style-004.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-style-004.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-style-004.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-style-005.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-style-005.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-style-005.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-style-005.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-sum-of-radii-001.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-sum-of-radii-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-sum-of-radii-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-sum-of-radii-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-sum-of-radii-002.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-sum-of-radii-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-sum-of-radii-002.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-sum-of-radii-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-with-three-values-001.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-with-three-values-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-with-three-values-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-with-three-values-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-with-two-values-001.htm b/tests/wpt/tests/css/css-backgrounds/border-radius-with-two-values-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-with-two-values-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-radius-with-two-values-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-right-width-medium.html b/tests/wpt/tests/css/css-backgrounds/border-right-width-medium.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-right-width-medium.html rename to tests/wpt/tests/css/css-backgrounds/border-right-width-medium.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-right-width-thick.html b/tests/wpt/tests/css/css-backgrounds/border-right-width-thick.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-right-width-thick.html rename to tests/wpt/tests/css/css-backgrounds/border-right-width-thick.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-right-width-thin.html b/tests/wpt/tests/css/css-backgrounds/border-right-width-thin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-right-width-thin.html rename to tests/wpt/tests/css/css-backgrounds/border-right-width-thin.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-001.xht b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-001.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-002.xht b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-002.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-004-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-004-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-004.xht b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-004.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-005-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-005-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-005.xht b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-005.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-010.xht b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-010.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-011.xht b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-011.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-012.xht b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-012.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-013.xht b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-013.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-014.xht b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-014.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-values-001.htm b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-values-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-values-001.htm rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-values-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-values-002.htm b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-values-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-values-002.htm rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-values-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-values-003.htm b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-values-003.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-values-003.htm rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-values-003.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-values-004.htm b/tests/wpt/tests/css/css-backgrounds/border-top-left-radius-values-004.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-left-radius-values-004.htm rename to tests/wpt/tests/css/css-backgrounds/border-top-left-radius-values-004.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-001.xht b/tests/wpt/tests/css/css-backgrounds/border-top-right-radius-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-001.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-right-radius-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-002.xht b/tests/wpt/tests/css/css-backgrounds/border-top-right-radius-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-002.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-right-radius-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-004-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-top-right-radius-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-004-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-right-radius-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-004.xht b/tests/wpt/tests/css/css-backgrounds/border-top-right-radius-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-004.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-right-radius-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-005-ref.xht b/tests/wpt/tests/css/css-backgrounds/border-top-right-radius-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-005-ref.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-right-radius-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-005.xht b/tests/wpt/tests/css/css-backgrounds/border-top-right-radius-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-005.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-right-radius-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-010.xht b/tests/wpt/tests/css/css-backgrounds/border-top-right-radius-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-010.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-right-radius-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-011.xht b/tests/wpt/tests/css/css-backgrounds/border-top-right-radius-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-011.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-right-radius-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-012.xht b/tests/wpt/tests/css/css-backgrounds/border-top-right-radius-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-012.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-right-radius-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-013.xht b/tests/wpt/tests/css/css-backgrounds/border-top-right-radius-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-013.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-right-radius-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-014.xht b/tests/wpt/tests/css/css-backgrounds/border-top-right-radius-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-014.xht rename to tests/wpt/tests/css/css-backgrounds/border-top-right-radius-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-values-004.htm b/tests/wpt/tests/css/css-backgrounds/border-top-right-radius-values-004.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-right-radius-values-004.htm rename to tests/wpt/tests/css/css-backgrounds/border-top-right-radius-values-004.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-width-medium.html b/tests/wpt/tests/css/css-backgrounds/border-top-width-medium.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-width-medium.html rename to tests/wpt/tests/css/css-backgrounds/border-top-width-medium.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-width-thick.html b/tests/wpt/tests/css/css-backgrounds/border-top-width-thick.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-width-thick.html rename to tests/wpt/tests/css/css-backgrounds/border-top-width-thick.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-top-width-thin.html b/tests/wpt/tests/css/css-backgrounds/border-top-width-thin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-top-width-thin.html rename to tests/wpt/tests/css/css-backgrounds/border-top-width-thin.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-cssom.html b/tests/wpt/tests/css/css-backgrounds/border-width-cssom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-width-cssom.html rename to tests/wpt/tests/css/css-backgrounds/border-width-cssom.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-pixel-snapping-001-a.html b/tests/wpt/tests/css/css-backgrounds/border-width-pixel-snapping-001-a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-width-pixel-snapping-001-a.html rename to tests/wpt/tests/css/css-backgrounds/border-width-pixel-snapping-001-a.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-pixel-snapping-001-b.html b/tests/wpt/tests/css/css-backgrounds/border-width-pixel-snapping-001-b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-width-pixel-snapping-001-b.html rename to tests/wpt/tests/css/css-backgrounds/border-width-pixel-snapping-001-b.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-a.html b/tests/wpt/tests/css/css-backgrounds/border-width-small-values-001-a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-a.html rename to tests/wpt/tests/css/css-backgrounds/border-width-small-values-001-a.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-b.html b/tests/wpt/tests/css/css-backgrounds/border-width-small-values-001-b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-b.html rename to tests/wpt/tests/css/css-backgrounds/border-width-small-values-001-b.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-c.html b/tests/wpt/tests/css/css-backgrounds/border-width-small-values-001-c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-c.html rename to tests/wpt/tests/css/css-backgrounds/border-width-small-values-001-c.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-d.html b/tests/wpt/tests/css/css-backgrounds/border-width-small-values-001-d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-d.html rename to tests/wpt/tests/css/css-backgrounds/border-width-small-values-001-d.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-e.html b/tests/wpt/tests/css/css-backgrounds/border-width-small-values-001-e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-e.html rename to tests/wpt/tests/css/css-backgrounds/border-width-small-values-001-e.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-001.htm b/tests/wpt/tests/css/css-backgrounds/box-shadow-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-001.htm rename to tests/wpt/tests/css/css-backgrounds/box-shadow-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-002.htm b/tests/wpt/tests/css/css-backgrounds/box-shadow-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-002.htm rename to tests/wpt/tests/css/css-backgrounds/box-shadow-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-003.htm b/tests/wpt/tests/css/css-backgrounds/box-shadow-003.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-003.htm rename to tests/wpt/tests/css/css-backgrounds/box-shadow-003.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-004.htm b/tests/wpt/tests/css/css-backgrounds/box-shadow-004.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-004.htm rename to tests/wpt/tests/css/css-backgrounds/box-shadow-004.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-005.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-005.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-005.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-029.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-029.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-029.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-039.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-039.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-039.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-040.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-040.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-040.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-041.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-041.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-041.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-042.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-042.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-042.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-body.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-body.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-body.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-body.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-border-radius-001.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-border-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-border-radius-001.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-border-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-calc-ref.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-calc-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-calc-ref.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-calc-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-calc.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-calc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-calc.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-calc.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-currentcolor-ref.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-currentcolor-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-currentcolor-ref.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-currentcolor-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-currentcolor.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-currentcolor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-currentcolor.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-currentcolor.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-inset-without-border-radius.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-inset-without-border-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-inset-without-border-radius.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-inset-without-border-radius.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-invalid-001.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-invalid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-invalid-001.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-invalid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-multiple-001.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-multiple-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-multiple-001.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-multiple-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-outset-without-border-radius-001.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-outset-without-border-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-outset-without-border-radius-001.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-outset-without-border-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-overlapping-001.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-overlapping-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-overlapping-001.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-overlapping-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-overlapping-002.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-overlapping-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-overlapping-002.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-overlapping-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-overlapping-003.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-overlapping-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-overlapping-003.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-overlapping-003.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-overlapping-004.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-overlapping-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-overlapping-004.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-overlapping-004.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-000-ref.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-radius-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-000-ref.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-radius-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-000.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-radius-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-000.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-radius-000.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-001-ref.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-radius-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-radius-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-001.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-001.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-table-border-collapse-001.html b/tests/wpt/tests/css/css-backgrounds/box-shadow-table-border-collapse-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-table-border-collapse-001.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow-table-border-collapse-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/box-shadow-blur-definition-001.xht b/tests/wpt/tests/css/css-backgrounds/box-shadow/box-shadow-blur-definition-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/box-shadow-blur-definition-001.xht rename to tests/wpt/tests/css/css-backgrounds/box-shadow/box-shadow-blur-definition-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-001-ref.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-001.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-001.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-002-ref.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-002-ref.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-002.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-002.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-003-ref.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-003-ref.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-003.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-003.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-001-ref.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-001.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-001.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-002-ref.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-002-ref.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-002.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-002.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-003-ref.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-003-ref.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-003.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-003.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/support/box-shadow-blur-definition-001-dark-bound.png b/tests/wpt/tests/css/css-backgrounds/box-shadow/support/box-shadow-blur-definition-001-dark-bound.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/support/box-shadow-blur-definition-001-dark-bound.png rename to tests/wpt/tests/css/css-backgrounds/box-shadow/support/box-shadow-blur-definition-001-dark-bound.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/support/box-shadow-blur-definition-001-light-bound.png b/tests/wpt/tests/css/css-backgrounds/box-shadow/support/box-shadow-blur-definition-001-light-bound.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/support/box-shadow-blur-definition-001-light-bound.png rename to tests/wpt/tests/css/css-backgrounds/box-shadow/support/box-shadow-blur-definition-001-light-bound.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/tools/box-shadow-blur-definition-001-image-generator.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/tools/box-shadow-blur-definition-001-image-generator.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow/tools/box-shadow-blur-definition-001-image-generator.html rename to tests/wpt/tests/css/css-backgrounds/box-shadow/tools/box-shadow-blur-definition-001-image-generator.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/child-move-reveals-parent-background-ref.html b/tests/wpt/tests/css/css-backgrounds/child-move-reveals-parent-background-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/child-move-reveals-parent-background-ref.html rename to tests/wpt/tests/css/css-backgrounds/child-move-reveals-parent-background-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/child-move-reveals-parent-background.html b/tests/wpt/tests/css/css-backgrounds/child-move-reveals-parent-background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/child-move-reveals-parent-background.html rename to tests/wpt/tests/css/css-backgrounds/child-move-reveals-parent-background.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/color-behind-images.htm b/tests/wpt/tests/css/css-backgrounds/color-behind-images.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/color-behind-images.htm rename to tests/wpt/tests/css/css-backgrounds/color-behind-images.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-background-repaint-expected.xht b/tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-background-repaint-expected.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-background-repaint-expected.xht rename to tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-background-repaint-expected.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-background-repaint-parent-expected.xht b/tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-background-repaint-parent-expected.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-background-repaint-parent-expected.xht rename to tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-background-repaint-parent-expected.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-background-repaint-parent.html b/tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-background-repaint-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-background-repaint-parent.html rename to tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-background-repaint-parent.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-background-repaint.html b/tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-background-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-background-repaint.html rename to tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-background-repaint.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-border-repaint-parent.html b/tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-border-repaint-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-border-repaint-parent.html rename to tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-border-repaint-parent.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-border-repaint.html b/tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-border-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-border-repaint.html rename to tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-border-repaint.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint-expected.xht b/tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint-expected.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint-expected.xht rename to tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint-expected.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint-parent-expected.xht b/tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint-parent-expected.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint-parent-expected.xht rename to tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint-parent-expected.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint-parent.html b/tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint-parent.html rename to tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint-parent.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint.html b/tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint.html rename to tests/wpt/tests/css/css-backgrounds/color-mix-currentcolor-outline-repaint.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css-border-radius-001.html b/tests/wpt/tests/css/css-backgrounds/css-border-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css-border-radius-001.html rename to tests/wpt/tests/css/css-backgrounds/css-border-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css-box-shadow-001.html b/tests/wpt/tests/css/css-backgrounds/css-box-shadow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css-box-shadow-001.html rename to tests/wpt/tests/css/css-backgrounds/css-box-shadow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-clip-border-box.html b/tests/wpt/tests/css/css-backgrounds/css3-background-clip-border-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-clip-border-box.html rename to tests/wpt/tests/css/css-backgrounds/css3-background-clip-border-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-clip-content-box.html b/tests/wpt/tests/css/css-backgrounds/css3-background-clip-content-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-clip-content-box.html rename to tests/wpt/tests/css/css-backgrounds/css3-background-clip-content-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-clip-padding-box.html b/tests/wpt/tests/css/css-backgrounds/css3-background-clip-padding-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-clip-padding-box.html rename to tests/wpt/tests/css/css-backgrounds/css3-background-clip-padding-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-clip.html b/tests/wpt/tests/css/css-backgrounds/css3-background-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-clip.html rename to tests/wpt/tests/css/css-backgrounds/css3-background-clip.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-origin-border-box.html b/tests/wpt/tests/css/css-backgrounds/css3-background-origin-border-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-origin-border-box.html rename to tests/wpt/tests/css/css-backgrounds/css3-background-origin-border-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-origin-content-box.html b/tests/wpt/tests/css/css-backgrounds/css3-background-origin-content-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-origin-content-box.html rename to tests/wpt/tests/css/css-backgrounds/css3-background-origin-content-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-origin-padding-box.html b/tests/wpt/tests/css/css-backgrounds/css3-background-origin-padding-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-origin-padding-box.html rename to tests/wpt/tests/css/css-backgrounds/css3-background-origin-padding-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-size-001.html b/tests/wpt/tests/css/css-backgrounds/css3-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-size-001.html rename to tests/wpt/tests/css/css-backgrounds/css3-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-size-contain.html b/tests/wpt/tests/css/css-backgrounds/css3-background-size-contain.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-size-contain.html rename to tests/wpt/tests/css/css-backgrounds/css3-background-size-contain.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-size.html b/tests/wpt/tests/css/css-backgrounds/css3-background-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css3-background-size.html rename to tests/wpt/tests/css/css-backgrounds/css3-background-size.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-border-image-repeat-repeat.html b/tests/wpt/tests/css/css-backgrounds/css3-border-image-repeat-repeat.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css3-border-image-repeat-repeat.html rename to tests/wpt/tests/css/css-backgrounds/css3-border-image-repeat-repeat.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-border-image-repeat-stretch.html b/tests/wpt/tests/css/css-backgrounds/css3-border-image-repeat-stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css3-border-image-repeat-stretch.html rename to tests/wpt/tests/css/css-backgrounds/css3-border-image-repeat-stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-border-image-source.html b/tests/wpt/tests/css/css-backgrounds/css3-border-image-source.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css3-border-image-source.html rename to tests/wpt/tests/css/css-backgrounds/css3-border-image-source.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-box-shadow.html b/tests/wpt/tests/css/css-backgrounds/css3-box-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/css3-box-shadow.html rename to tests/wpt/tests/css/css-backgrounds/css3-box-shadow.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/currentcolor-border-repaint-parent.html b/tests/wpt/tests/css/css-backgrounds/currentcolor-border-repaint-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/currentcolor-border-repaint-parent.html rename to tests/wpt/tests/css/css-backgrounds/currentcolor-border-repaint-parent.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/document-canvas-remove-body-ref.html b/tests/wpt/tests/css/css-backgrounds/document-canvas-remove-body-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/document-canvas-remove-body-ref.html rename to tests/wpt/tests/css/css-backgrounds/document-canvas-remove-body-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/document-canvas-remove-body.html b/tests/wpt/tests/css/css-backgrounds/document-canvas-remove-body.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/document-canvas-remove-body.html rename to tests/wpt/tests/css/css-backgrounds/document-canvas-remove-body.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/fieldset-inset-shadow-ref.html b/tests/wpt/tests/css/css-backgrounds/fieldset-inset-shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/fieldset-inset-shadow-ref.html rename to tests/wpt/tests/css/css-backgrounds/fieldset-inset-shadow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/fieldset-inset-shadow.html b/tests/wpt/tests/css/css-backgrounds/fieldset-inset-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/fieldset-inset-shadow.html rename to tests/wpt/tests/css/css-backgrounds/fieldset-inset-shadow.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/first-letter-space-not-selected.html b/tests/wpt/tests/css/css-backgrounds/first-letter-space-not-selected.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/first-letter-space-not-selected.html rename to tests/wpt/tests/css/css-backgrounds/first-letter-space-not-selected.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/gradient-wrong-interpolation-crash.html b/tests/wpt/tests/css/css-backgrounds/gradient-wrong-interpolation-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/gradient-wrong-interpolation-crash.html rename to tests/wpt/tests/css/css-backgrounds/gradient-wrong-interpolation-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/hidpi/simple-bg-color-ref.html b/tests/wpt/tests/css/css-backgrounds/hidpi/simple-bg-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/hidpi/simple-bg-color-ref.html rename to tests/wpt/tests/css/css-backgrounds/hidpi/simple-bg-color-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/hidpi/simple-bg-color.html b/tests/wpt/tests/css/css-backgrounds/hidpi/simple-bg-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/hidpi/simple-bg-color.html rename to tests/wpt/tests/css/css-backgrounds/hidpi/simple-bg-color.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/inheritance.sub.html b/tests/wpt/tests/css/css-backgrounds/inheritance.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/inheritance.sub.html rename to tests/wpt/tests/css/css-backgrounds/inheritance.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/inline-background-rtl-001.html b/tests/wpt/tests/css/css-backgrounds/inline-background-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/inline-background-rtl-001.html rename to tests/wpt/tests/css/css-backgrounds/inline-background-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/inner-border-non-renderable-ref.html b/tests/wpt/tests/css/css-backgrounds/inner-border-non-renderable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/inner-border-non-renderable-ref.html rename to tests/wpt/tests/css/css-backgrounds/inner-border-non-renderable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/inner-border-non-renderable.html b/tests/wpt/tests/css/css-backgrounds/inner-border-non-renderable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/inner-border-non-renderable.html rename to tests/wpt/tests/css/css-backgrounds/inner-border-non-renderable.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/inset-box-shadow-scroll-ref.html b/tests/wpt/tests/css/css-backgrounds/inset-box-shadow-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/inset-box-shadow-scroll-ref.html rename to tests/wpt/tests/css/css-backgrounds/inset-box-shadow-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/inset-box-shadow-scroll.html b/tests/wpt/tests/css/css-backgrounds/inset-box-shadow-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/inset-box-shadow-scroll.html rename to tests/wpt/tests/css/css-backgrounds/inset-box-shadow-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/inset-box-shadow-stacking-context-scroll.html b/tests/wpt/tests/css/css-backgrounds/inset-box-shadow-stacking-context-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/inset-box-shadow-stacking-context-scroll.html rename to tests/wpt/tests/css/css-backgrounds/inset-box-shadow-stacking-context-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/justfortest.html b/tests/wpt/tests/css/css-backgrounds/justfortest.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/justfortest.html rename to tests/wpt/tests/css/css-backgrounds/justfortest.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/linear-gradient-calc-crash.html b/tests/wpt/tests/css/css-backgrounds/linear-gradient-calc-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/linear-gradient-calc-crash.html rename to tests/wpt/tests/css/css-backgrounds/linear-gradient-calc-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/linear-gradient-currentcolor-first-line-ref.html b/tests/wpt/tests/css/css-backgrounds/linear-gradient-currentcolor-first-line-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/linear-gradient-currentcolor-first-line-ref.html rename to tests/wpt/tests/css/css-backgrounds/linear-gradient-currentcolor-first-line-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/linear-gradient-currentcolor-first-line.html b/tests/wpt/tests/css/css-backgrounds/linear-gradient-currentcolor-first-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/linear-gradient-currentcolor-first-line.html rename to tests/wpt/tests/css/css-backgrounds/linear-gradient-currentcolor-first-line.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/local-attachment-content-box-scroll-ref.html b/tests/wpt/tests/css/css-backgrounds/local-attachment-content-box-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/local-attachment-content-box-scroll-ref.html rename to tests/wpt/tests/css/css-backgrounds/local-attachment-content-box-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/local-attachment-content-box-scroll.html b/tests/wpt/tests/css/css-backgrounds/local-attachment-content-box-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/local-attachment-content-box-scroll.html rename to tests/wpt/tests/css/css-backgrounds/local-attachment-content-box-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/none-as-image-layer.htm b/tests/wpt/tests/css/css-backgrounds/none-as-image-layer.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/none-as-image-layer.htm rename to tests/wpt/tests/css/css-backgrounds/none-as-image-layer.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/order-of-images.htm b/tests/wpt/tests/css/css-backgrounds/order-of-images.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/order-of-images.htm rename to tests/wpt/tests/css/css-backgrounds/order-of-images.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-attachment-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-attachment-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-attachment-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-attachment-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-attachment-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-attachment-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-attachment-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-attachment-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-attachment-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-attachment-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-attachment-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-attachment-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-clip-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-clip-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-clip-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-clip-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-clip-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-clip-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-clip-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-clip-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-clip-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-clip-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-clip-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-clip-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-color-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-color-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-color-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-color-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-color-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-color-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-color-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-color-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-color-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-color-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-color-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-color-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-image-computed.sub.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-image-computed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-image-computed.sub.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-image-computed.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-image-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-image-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-image-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-image-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-image-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-image-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-image-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-image-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-origin-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-origin-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-origin-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-origin-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-origin-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-origin-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-origin-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-origin-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-origin-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-origin-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-origin-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-origin-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-position-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-position-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-position-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-position-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-position-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-position-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-x-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-position-x-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-x-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-position-x-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-x-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-position-x-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-x-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-position-x-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-x-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-position-x-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-x-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-position-x-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-y-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-position-y-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-y-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-position-y-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-y-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-position-y-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-y-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-position-y-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-y-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-position-y-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-position-y-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-position-y-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-repeat-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-repeat-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-repeat-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-repeat-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-repeat-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-repeat-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-repeat-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-repeat-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-repeat-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-repeat-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-repeat-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-repeat-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-shorthand-serialization.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-shorthand-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-shorthand-serialization.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-shorthand-serialization.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-size-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-size-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-size-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-size-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-size-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-size-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-size-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-size-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-size-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-size-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-size-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-size-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/background-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/background-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-color-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-color-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-color-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-color-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-color-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-color-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-color-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-color-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-color-shorthand.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-color-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-color-shorthand.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-color-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-color-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-color-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-color-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-color-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-outset-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-outset-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-outset-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-outset-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-outset-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-outset-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-outset-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-outset-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-outset-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-outset-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-outset-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-outset-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-repeat-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-repeat-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-repeat-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-repeat-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-repeat-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-repeat-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-repeat-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-repeat-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-repeat-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-repeat-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-repeat-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-repeat-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-shorthand.sub.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-shorthand.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-shorthand.sub.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-shorthand.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-slice-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-slice-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-slice-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-slice-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-slice-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-slice-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-slice-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-slice-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-slice-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-slice-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-slice-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-slice-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-source-computed.sub.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-source-computed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-source-computed.sub.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-source-computed.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-source-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-source-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-source-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-source-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-source-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-source-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-source-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-source-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-width-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-width-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-width-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-width-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-width-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-width-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-width-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-width-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-width-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-image-width-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-image-width-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-image-width-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-radius-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-radius-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-radius-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-radius-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-radius-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-radius-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-shorthand.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-shorthand.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-style-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-style-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-style-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-style-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-style-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-style-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-style-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-style-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-style-shorthand.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-style-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-style-shorthand.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-style-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-style-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-style-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-style-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-style-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-width-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-width-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-width-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-width-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-width-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-width-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-width-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-width-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-width-shorthand.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-width-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-width-shorthand.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-width-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-width-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/border-width-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-width-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/border-width-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/box-shadow-computed.html b/tests/wpt/tests/css/css-backgrounds/parsing/box-shadow-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/box-shadow-computed.html rename to tests/wpt/tests/css/css-backgrounds/parsing/box-shadow-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/box-shadow-invalid.html b/tests/wpt/tests/css/css-backgrounds/parsing/box-shadow-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/box-shadow-invalid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/box-shadow-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/box-shadow-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/box-shadow-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/box-shadow-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/box-shadow-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/webkit-border-radius-valid.html b/tests/wpt/tests/css/css-backgrounds/parsing/webkit-border-radius-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/parsing/webkit-border-radius-valid.html rename to tests/wpt/tests/css/css-backgrounds/parsing/webkit-border-radius-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/60x60-green-background.html b/tests/wpt/tests/css/css-backgrounds/reference/60x60-green-background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/60x60-green-background.html rename to tests/wpt/tests/css/css-backgrounds/reference/60x60-green-background.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-334-ref.xht b/tests/wpt/tests/css/css-backgrounds/reference/background-334-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-334-ref.xht rename to tests/wpt/tests/css/css-backgrounds/reference/background-334-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-attachment-local-hidden-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-attachment-local-hidden-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-attachment-local-hidden-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-attachment-local-hidden-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-clip-002-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-clip-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-clip-002-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-clip-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-clip-004-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-clip-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-clip-004-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-clip-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-clip-005-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-clip-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-clip-005-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-clip-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-clip-content-box-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-clip-content-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-clip-content-box-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-clip-content-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-clip-padding-box-with-border-radius-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-clip-padding-box-with-border-radius-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-clip-padding-box-with-border-radius-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-clip-padding-box-with-border-radius-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-color-clip.html b/tests/wpt/tests/css/css-backgrounds/reference/background-color-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-color-clip.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-color-clip.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-gradient-subpixel-fills-area-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-gradient-subpixel-fills-area-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-gradient-subpixel-fills-area-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-gradient-subpixel-fills-area-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-image-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-image-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-centered-with-border-radius-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-image-centered-with-border-radius-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-centered-with-border-radius-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-image-centered-with-border-radius-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-cover-zoomed-1-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-image-cover-zoomed-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-cover-zoomed-1-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-image-cover-zoomed-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-first-letter-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-image-first-letter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-first-letter-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-image-first-letter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-first-line-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-image-first-line-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-first-line-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-image-first-line-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-large-with-auto-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-image-large-with-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-large-with-auto-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-image-large-with-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-table-cells-zoomed-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-image-table-cells-zoomed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-table-cells-zoomed-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-image-table-cells-zoomed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-with-border-radius-fidelity-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-image-with-border-radius-fidelity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-with-border-radius-fidelity-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-image-with-border-radius-fidelity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-origin-002-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-origin-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-origin-002-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-origin-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-origin-004-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-origin-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-origin-004-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-origin-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-origin-005-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-origin-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-origin-005-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-origin-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-origin-006-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-origin-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-origin-006-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-origin-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-origin-007-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-origin-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-origin-007-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-origin-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-paint-order-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-paint-order-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-paint-order-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-paint-order-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-position-negative-percentage-comparison-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-position-negative-percentage-comparison-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-position-negative-percentage-comparison-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-position-negative-percentage-comparison-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-position-subpixel-at-border-ref.tentative.html b/tests/wpt/tests/css/css-backgrounds/reference/background-position-subpixel-at-border-ref.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-position-subpixel-at-border-ref.tentative.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-position-subpixel-at-border-ref.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-position-three-four-values-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-position-three-four-values-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-position-three-four-values-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-position-three-four-values-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-rounded-image-clip.html b/tests/wpt/tests/css/css-backgrounds/reference/background-rounded-image-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-rounded-image-clip.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-rounded-image-clip.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-002-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-size-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-002-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-size-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-006-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-size-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-006-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-size-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-021-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-size-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-021-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-size-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-025-ref.xht b/tests/wpt/tests/css/css-backgrounds/reference/background-size-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-025-ref.xht rename to tests/wpt/tests/css/css-backgrounds/reference/background-size-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-026-ref.xht b/tests/wpt/tests/css/css-backgrounds/reference/background-size-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-026-ref.xht rename to tests/wpt/tests/css/css-backgrounds/reference/background-size-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-027-ref.xht b/tests/wpt/tests/css/css-backgrounds/reference/background-size-027-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-027-ref.xht rename to tests/wpt/tests/css/css-backgrounds/reference/background-size-027-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-028-ref.xht b/tests/wpt/tests/css/css-backgrounds/reference/background-size-028-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-028-ref.xht rename to tests/wpt/tests/css/css-backgrounds/reference/background-size-028-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-029-ref.xht b/tests/wpt/tests/css/css-backgrounds/reference/background-size-029-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-029-ref.xht rename to tests/wpt/tests/css/css-backgrounds/reference/background-size-029-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-031-ref.xht b/tests/wpt/tests/css/css-backgrounds/reference/background-size-031-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-031-ref.xht rename to tests/wpt/tests/css/css-backgrounds/reference/background-size-031-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-041-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-size-041-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-041-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-size-041-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-043-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-size-043-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-043-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-size-043-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-one-value-1x1-image-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/background-size-one-value-1x1-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-size-one-value-1x1-image-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/background-size-one-value-1x1-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background_clip_padding-box.html b/tests/wpt/tests/css/css-backgrounds/reference/background_clip_padding-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/background_clip_padding-box.html rename to tests/wpt/tests/css/css-backgrounds/reference/background_clip_padding-box.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-006-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-006-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-007-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-007-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-012-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-012-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-image-type-003-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-image-type-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-image-type-003-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-image-type-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-repeat-005-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-repeat-005-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-repeat-repeat-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-repeat-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-repeat-repeat-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-repeat-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-repeat-round-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-round-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-repeat-round-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-round-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-repeat-space-011-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-space-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-repeat-space-011-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-repeat-space-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-round-and-stretch-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-round-and-stretch-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-round-and-stretch-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-round-and-stretch-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-shorthand-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-shorthand-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-shorthand-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-shorthand-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-shorthand-002-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-shorthand-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-shorthand-002-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-shorthand-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-shorthand-003-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-shorthand-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-shorthand-003-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-shorthand-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-slice-005-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-slice-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-slice-005-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-slice-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-slice-007-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-slice-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-slice-007-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-slice-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-slice-fill-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-slice-fill-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-slice-fill-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-slice-fill-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-slice-fill-002-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-slice-fill-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-slice-fill-002-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-slice-fill-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-space-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-space-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-space-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-space-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-width-009-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-image-width-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-image-width-009-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-image-width-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-radius-clip-002-ref.htm b/tests/wpt/tests/css/css-backgrounds/reference/border-radius-clip-002-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-radius-clip-002-ref.htm rename to tests/wpt/tests/css/css-backgrounds/reference/border-radius-clip-002-ref.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-radius-clipping-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-radius-clipping-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-radius-clipping-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-radius-clipping-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-radius-horizontal-value-is-zero-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-radius-horizontal-value-is-zero-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-radius-horizontal-value-is-zero-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-radius-horizontal-value-is-zero-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-right-width-1px-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-right-width-1px-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-right-width-1px-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-right-width-1px-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-right-width-3px-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-right-width-3px-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-right-width-3px-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-right-width-3px-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-right-width-5px-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-right-width-5px-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-right-width-5px-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-right-width-5px-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-top-width-1px-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-top-width-1px-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-top-width-1px-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-top-width-1px-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-top-width-3px-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-top-width-3px-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-top-width-3px-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-top-width-3px-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-top-width-5px-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-top-width-5px-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-top-width-5px-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-top-width-5px-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-width-pixel-snapping-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-width-pixel-snapping-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-width-pixel-snapping-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-width-pixel-snapping-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-width-small-values-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/border-width-small-values-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-width-small-values-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/border-width-small-values-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-005-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/box-shadow-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-005-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/box-shadow-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-039-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/box-shadow-039-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-039-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/box-shadow-039-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-040-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/box-shadow-040-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-040-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/box-shadow-040-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-041-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/box-shadow-041-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-041-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/box-shadow-041-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-042-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/box-shadow-042-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-042-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/box-shadow-042-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-body-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/box-shadow-body-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-body-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/box-shadow-body-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-border-radius-001-notref.html b/tests/wpt/tests/css/css-backgrounds/reference/box-shadow-border-radius-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-border-radius-001-notref.html rename to tests/wpt/tests/css/css-backgrounds/reference/box-shadow-border-radius-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-border-radius-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/box-shadow-border-radius-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-border-radius-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/box-shadow-border-radius-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-inset-without-border-radius-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/box-shadow-inset-without-border-radius-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-inset-without-border-radius-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/box-shadow-inset-without-border-radius-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-multiple-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/box-shadow-multiple-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-multiple-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/box-shadow-multiple-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-outset-without-border-radius-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/box-shadow-outset-without-border-radius-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-outset-without-border-radius-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/box-shadow-outset-without-border-radius-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-overlapping-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/box-shadow-overlapping-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-overlapping-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/box-shadow-overlapping-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-overlapping-003-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/box-shadow-overlapping-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-overlapping-003-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/box-shadow-overlapping-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-table-border-collapse-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/box-shadow-table-border-collapse-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/box-shadow-table-border-collapse-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/box-shadow-table-border-collapse-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css-border-radius-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css-border-radius-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css-border-radius-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css-border-radius-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css-box-shadow-ref-001.html b/tests/wpt/tests/css/css-backgrounds/reference/css-box-shadow-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css-box-shadow-ref-001.html rename to tests/wpt/tests/css/css-backgrounds/reference/css-box-shadow-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-clip-border-box-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css3-background-clip-border-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-clip-border-box-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css3-background-clip-border-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-clip-content-box-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css3-background-clip-content-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-clip-content-box-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css3-background-clip-content-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-clip-padding-box-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css3-background-clip-padding-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-clip-padding-box-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css3-background-clip-padding-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-clip-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css3-background-clip-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-clip-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css3-background-clip-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-origin-border-box-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css3-background-origin-border-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-origin-border-box-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css3-background-origin-border-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-origin-content-box-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css3-background-origin-content-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-origin-content-box-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css3-background-origin-content-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-origin-padding-box-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css3-background-origin-padding-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-origin-padding-box-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css3-background-origin-padding-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-size-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css3-background-size-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-size-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css3-background-size-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-size-contain-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css3-background-size-contain-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-size-contain-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css3-background-size-contain-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-size-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css3-background-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-background-size-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css3-background-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-border-image-repeat-repeat-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css3-border-image-repeat-repeat-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-border-image-repeat-repeat-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css3-border-image-repeat-repeat-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-border-image-repeat-stretch-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css3-border-image-repeat-stretch-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-border-image-repeat-stretch-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css3-border-image-repeat-stretch-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-border-image-source-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css3-border-image-source-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-border-image-source-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css3-border-image-source-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-box-shadow-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/css3-box-shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-box-shadow-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/css3-box-shadow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/first-letter-space-not-selected-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/first-letter-space-not-selected-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/first-letter-space-not-selected-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/first-letter-space-not-selected-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/inline-background-rtl-001-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/inline-background-rtl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/inline-background-rtl-001-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/inline-background-rtl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/order-of-images-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/order-of-images-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/order-of-images-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/order-of-images-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/ref-filled-black-96px-square.xht b/tests/wpt/tests/css/css-backgrounds/reference/ref-filled-black-96px-square.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/ref-filled-black-96px-square.xht rename to tests/wpt/tests/css/css-backgrounds/reference/ref-filled-black-96px-square.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/ref-filled-green-100px-square.xht b/tests/wpt/tests/css/css-backgrounds/reference/ref-filled-green-100px-square.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/ref-filled-green-100px-square.xht rename to tests/wpt/tests/css/css-backgrounds/reference/ref-filled-green-100px-square.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/ref-if-there-is-no-red.xht b/tests/wpt/tests/css/css-backgrounds/reference/ref-if-there-is-no-red.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/ref-if-there-is-no-red.xht rename to tests/wpt/tests/css/css-backgrounds/reference/ref-if-there-is-no-red.xht diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/reference.html b/tests/wpt/tests/css/css-backgrounds/reference/reference.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/reference.html rename to tests/wpt/tests/css/css-backgrounds/reference/reference.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/subpixel-repeat-no-repeat-mix-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/subpixel-repeat-no-repeat-mix-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/subpixel-repeat-no-repeat-mix-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/subpixel-repeat-no-repeat-mix-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/ttwf-reftest-borderRadius-ref.html b/tests/wpt/tests/css/css-backgrounds/reference/ttwf-reftest-borderRadius-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/reference/ttwf-reftest-borderRadius-ref.html rename to tests/wpt/tests/css/css-backgrounds/reference/ttwf-reftest-borderRadius-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/resources/blue-100.png b/tests/wpt/tests/css/css-backgrounds/resources/blue-100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/resources/blue-100.png rename to tests/wpt/tests/css/css-backgrounds/resources/blue-100.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/resources/green-100.png b/tests/wpt/tests/css/css-backgrounds/resources/green-100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/resources/green-100.png rename to tests/wpt/tests/css/css-backgrounds/resources/green-100.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/resources/green-bottom.png b/tests/wpt/tests/css/css-backgrounds/resources/green-bottom.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/resources/green-bottom.png rename to tests/wpt/tests/css/css-backgrounds/resources/green-bottom.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/resources/green-right.png b/tests/wpt/tests/css/css-backgrounds/resources/green-right.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/resources/green-right.png rename to tests/wpt/tests/css/css-backgrounds/resources/green-right.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/resources/green1x50.png b/tests/wpt/tests/css/css-backgrounds/resources/green1x50.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/resources/green1x50.png rename to tests/wpt/tests/css/css-backgrounds/resources/green1x50.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/resources/green50x1.png b/tests/wpt/tests/css/css-backgrounds/resources/green50x1.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/resources/green50x1.png rename to tests/wpt/tests/css/css-backgrounds/resources/green50x1.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/resources/stripes-100.png b/tests/wpt/tests/css/css-backgrounds/resources/stripes-100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/resources/stripes-100.png rename to tests/wpt/tests/css/css-backgrounds/resources/stripes-100.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/scroll-positioned-multiple-background-images.html b/tests/wpt/tests/css/css-backgrounds/scroll-positioned-multiple-background-images.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/scroll-positioned-multiple-background-images.html rename to tests/wpt/tests/css/css-backgrounds/scroll-positioned-multiple-background-images.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/subpixel-repeat-no-repeat-mix.html b/tests/wpt/tests/css/css-backgrounds/subpixel-repeat-no-repeat-mix.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/subpixel-repeat-no-repeat-mix.html rename to tests/wpt/tests/css/css-backgrounds/subpixel-repeat-no-repeat-mix.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/100x100-blue-and-orange.png b/tests/wpt/tests/css/css-backgrounds/support/100x100-blue-and-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/100x100-blue-and-orange.png rename to tests/wpt/tests/css/css-backgrounds/support/100x100-blue-and-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/100x100-gr-rr.png b/tests/wpt/tests/css/css-backgrounds/support/100x100-gr-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/100x100-gr-rr.png rename to tests/wpt/tests/css/css-backgrounds/support/100x100-gr-rr.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/100x100-green-with-red-corners.png b/tests/wpt/tests/css/css-backgrounds/support/100x100-green-with-red-corners.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/100x100-green-with-red-corners.png rename to tests/wpt/tests/css/css-backgrounds/support/100x100-green-with-red-corners.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/100x100-red.png b/tests/wpt/tests/css/css-backgrounds/support/100x100-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/100x100-red.png rename to tests/wpt/tests/css/css-backgrounds/support/100x100-red.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/1x1-green.png b/tests/wpt/tests/css/css-backgrounds/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/1x1-green.png rename to tests/wpt/tests/css/css-backgrounds/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/1x1-lime.png b/tests/wpt/tests/css/css-backgrounds/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/1x1-lime.png rename to tests/wpt/tests/css/css-backgrounds/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/1x1-maroon.png b/tests/wpt/tests/css/css-backgrounds/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/1x1-maroon.png rename to tests/wpt/tests/css/css-backgrounds/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/1x1-navy.png b/tests/wpt/tests/css/css-backgrounds/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/1x1-navy.png rename to tests/wpt/tests/css/css-backgrounds/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/1x1-red.png b/tests/wpt/tests/css/css-backgrounds/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/1x1-red.png rename to tests/wpt/tests/css/css-backgrounds/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/1x1-white.png b/tests/wpt/tests/css/css-backgrounds/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/1x1-white.png rename to tests/wpt/tests/css/css-backgrounds/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/40px-wide-20px-tall-green-rect.png b/tests/wpt/tests/css/css-backgrounds/support/40px-wide-20px-tall-green-rect.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/40px-wide-20px-tall-green-rect.png rename to tests/wpt/tests/css/css-backgrounds/support/40px-wide-20px-tall-green-rect.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/500x500-red-with-green-center.png b/tests/wpt/tests/css/css-backgrounds/support/500x500-red-with-green-center.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/500x500-red-with-green-center.png rename to tests/wpt/tests/css/css-backgrounds/support/500x500-red-with-green-center.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/500x500-white-red-green-irreg-polygon.png b/tests/wpt/tests/css/css-backgrounds/support/500x500-white-red-green-irreg-polygon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/500x500-white-red-green-irreg-polygon.png rename to tests/wpt/tests/css/css-backgrounds/support/500x500-white-red-green-irreg-polygon.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/50x50-green.png b/tests/wpt/tests/css/css-backgrounds/support/50x50-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/50x50-green.png rename to tests/wpt/tests/css/css-backgrounds/support/50x50-green.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/60x60-gg-rr.png b/tests/wpt/tests/css/css-backgrounds/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/60x60-gg-rr.png rename to tests/wpt/tests/css/css-backgrounds/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/60x60-green.png b/tests/wpt/tests/css/css-backgrounds/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/60x60-green.png rename to tests/wpt/tests/css/css-backgrounds/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/9-colored-areas.png b/tests/wpt/tests/css/css-backgrounds/support/9-colored-areas.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/9-colored-areas.png rename to tests/wpt/tests/css/css-backgrounds/support/9-colored-areas.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/9grid40-30-20-10-green.png b/tests/wpt/tests/css/css-backgrounds/support/9grid40-30-20-10-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/9grid40-30-20-10-green.png rename to tests/wpt/tests/css/css-backgrounds/support/9grid40-30-20-10-green.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/9grid40-30-20-10-red-old.png b/tests/wpt/tests/css/css-backgrounds/support/9grid40-30-20-10-red-old.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/9grid40-30-20-10-red-old.png rename to tests/wpt/tests/css/css-backgrounds/support/9grid40-30-20-10-red-old.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/9grid40-30-20-10-red.png b/tests/wpt/tests/css/css-backgrounds/support/9grid40-30-20-10-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/9grid40-30-20-10-red.png rename to tests/wpt/tests/css/css-backgrounds/support/9grid40-30-20-10-red.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/a-green.css b/tests/wpt/tests/css/css-backgrounds/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/a-green.css rename to tests/wpt/tests/css/css-backgrounds/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/aqua-yellow-32x32.png b/tests/wpt/tests/css/css-backgrounds/support/aqua-yellow-32x32.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/aqua-yellow-32x32.png rename to tests/wpt/tests/css/css-backgrounds/support/aqua-yellow-32x32.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/aqua-yellow-37x37.png b/tests/wpt/tests/css/css-backgrounds/support/aqua-yellow-37x37.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/aqua-yellow-37x37.png rename to tests/wpt/tests/css/css-backgrounds/support/aqua-yellow-37x37.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/aqua_color.png b/tests/wpt/tests/css/css-backgrounds/support/aqua_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/aqua_color.png rename to tests/wpt/tests/css/css-backgrounds/support/aqua_color.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/b-green.css b/tests/wpt/tests/css/css-backgrounds/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/b-green.css rename to tests/wpt/tests/css/css-backgrounds/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/bg.jpg b/tests/wpt/tests/css/css-backgrounds/support/bg.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/bg.jpg rename to tests/wpt/tests/css/css-backgrounds/support/bg.jpg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/bg_flower.gif b/tests/wpt/tests/css/css-backgrounds/support/bg_flower.gif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/bg_flower.gif rename to tests/wpt/tests/css/css-backgrounds/support/bg_flower.gif diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/black96x96.png b/tests/wpt/tests/css/css-backgrounds/support/black96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/black96x96.png rename to tests/wpt/tests/css/css-backgrounds/support/black96x96.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/black_color.png b/tests/wpt/tests/css/css-backgrounds/support/black_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/black_color.png rename to tests/wpt/tests/css/css-backgrounds/support/black_color.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/blue-and-red-diamonds-81x81.png b/tests/wpt/tests/css/css-backgrounds/support/blue-and-red-diamonds-81x81.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/blue-and-red-diamonds-81x81.png rename to tests/wpt/tests/css/css-backgrounds/support/blue-and-red-diamonds-81x81.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/blue-diamond-27x27.png b/tests/wpt/tests/css/css-backgrounds/support/blue-diamond-27x27.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/blue-diamond-27x27.png rename to tests/wpt/tests/css/css-backgrounds/support/blue-diamond-27x27.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/blue-diamond.png b/tests/wpt/tests/css/css-backgrounds/support/blue-diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/blue-diamond.png rename to tests/wpt/tests/css/css-backgrounds/support/blue-diamond.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/blue96x96.png b/tests/wpt/tests/css/css-backgrounds/support/blue96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/blue96x96.png rename to tests/wpt/tests/css/css-backgrounds/support/blue96x96.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/blue_color.png b/tests/wpt/tests/css/css-backgrounds/support/blue_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/blue_color.png rename to tests/wpt/tests/css/css-backgrounds/support/blue_color.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/border-image-repeat-space-011.png b/tests/wpt/tests/css/css-backgrounds/support/border-image-repeat-space-011.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/border-image-repeat-space-011.png rename to tests/wpt/tests/css/css-backgrounds/support/border-image-repeat-space-011.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/border-image.jpg b/tests/wpt/tests/css/css-backgrounds/support/border-image.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/border-image.jpg rename to tests/wpt/tests/css/css-backgrounds/support/border-image.jpg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/border.png b/tests/wpt/tests/css/css-backgrounds/support/border.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/border.png rename to tests/wpt/tests/css/css-backgrounds/support/border.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/c-red.css b/tests/wpt/tests/css/css-backgrounds/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/c-red.css rename to tests/wpt/tests/css/css-backgrounds/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/cat.png b/tests/wpt/tests/css/css-backgrounds/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/cat.png rename to tests/wpt/tests/css/css-backgrounds/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/css3.png b/tests/wpt/tests/css/css-backgrounds/support/css3.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/css3.png rename to tests/wpt/tests/css/css-backgrounds/support/css3.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/green-1000x10.png b/tests/wpt/tests/css/css-backgrounds/support/green-1000x10.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/green-1000x10.png rename to tests/wpt/tests/css/css-backgrounds/support/green-1000x10.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/green-10x1000.png b/tests/wpt/tests/css/css-backgrounds/support/green-10x1000.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/green-10x1000.png rename to tests/wpt/tests/css/css-backgrounds/support/green-10x1000.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/green-150-150.png b/tests/wpt/tests/css/css-backgrounds/support/green-150-150.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/green-150-150.png rename to tests/wpt/tests/css/css-backgrounds/support/green-150-150.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/green-60-60.png b/tests/wpt/tests/css/css-backgrounds/support/green-60-60.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/green-60-60.png rename to tests/wpt/tests/css/css-backgrounds/support/green-60-60.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/green-60x60-red-5px-border.png b/tests/wpt/tests/css/css-backgrounds/support/green-60x60-red-5px-border.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/green-60x60-red-5px-border.png rename to tests/wpt/tests/css/css-backgrounds/support/green-60x60-red-5px-border.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/green.png b/tests/wpt/tests/css/css-backgrounds/support/green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/green.png rename to tests/wpt/tests/css/css-backgrounds/support/green.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/green_color.png b/tests/wpt/tests/css/css-backgrounds/support/green_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/green_color.png rename to tests/wpt/tests/css/css-backgrounds/support/green_color.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/img-ref-1.png b/tests/wpt/tests/css/css-backgrounds/support/img-ref-1.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/img-ref-1.png rename to tests/wpt/tests/css/css-backgrounds/support/img-ref-1.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/img-ref-2.png b/tests/wpt/tests/css/css-backgrounds/support/img-ref-2.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/img-ref-2.png rename to tests/wpt/tests/css/css-backgrounds/support/img-ref-2.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/import-green.css b/tests/wpt/tests/css/css-backgrounds/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/import-green.css rename to tests/wpt/tests/css/css-backgrounds/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/import-red.css b/tests/wpt/tests/css/css-backgrounds/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/import-red.css rename to tests/wpt/tests/css/css-backgrounds/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/new-red-diamond-27x27.png b/tests/wpt/tests/css/css-backgrounds/support/new-red-diamond-27x27.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/new-red-diamond-27x27.png rename to tests/wpt/tests/css/css-backgrounds/support/new-red-diamond-27x27.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/orange-intrinsic-none.svg b/tests/wpt/tests/css/css-backgrounds/support/orange-intrinsic-none.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/orange-intrinsic-none.svg rename to tests/wpt/tests/css/css-backgrounds/support/orange-intrinsic-none.svg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/orange_color.png b/tests/wpt/tests/css/css-backgrounds/support/orange_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/orange_color.png rename to tests/wpt/tests/css/css-backgrounds/support/orange_color.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/outline-5px-10px-15px-20px-green.png b/tests/wpt/tests/css/css-backgrounds/support/outline-5px-10px-15px-20px-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/outline-5px-10px-15px-20px-green.png rename to tests/wpt/tests/css/css-backgrounds/support/outline-5px-10px-15px-20px-green.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-gr-rr-200x200.png b/tests/wpt/tests/css/css-backgrounds/support/pattern-gr-rr-200x200.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-gr-rr-200x200.png rename to tests/wpt/tests/css/css-backgrounds/support/pattern-gr-rr-200x200.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/css-backgrounds/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/css-backgrounds/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/css-backgrounds/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/css-backgrounds/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-rg-rr-200x200.png b/tests/wpt/tests/css/css-backgrounds/support/pattern-rg-rr-200x200.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-rg-rr-200x200.png rename to tests/wpt/tests/css/css-backgrounds/support/pattern-rg-rr-200x200.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/css-backgrounds/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/css-backgrounds/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-rr-gr-200x200.png b/tests/wpt/tests/css/css-backgrounds/support/pattern-rr-gr-200x200.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-rr-gr-200x200.png rename to tests/wpt/tests/css/css-backgrounds/support/pattern-rr-gr-200x200.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-rr-rg-200x200.png b/tests/wpt/tests/css/css-backgrounds/support/pattern-rr-rg-200x200.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-rr-rg-200x200.png rename to tests/wpt/tests/css/css-backgrounds/support/pattern-rr-rg-200x200.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-tr.png b/tests/wpt/tests/css/css-backgrounds/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/pattern-tr.png rename to tests/wpt/tests/css/css-backgrounds/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/red-diamond.png b/tests/wpt/tests/css/css-backgrounds/support/red-diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/red-diamond.png rename to tests/wpt/tests/css/css-backgrounds/support/red-diamond.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/red.png b/tests/wpt/tests/css/css-backgrounds/support/red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/red.png rename to tests/wpt/tests/css/css-backgrounds/support/red.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/red_color.png b/tests/wpt/tests/css/css-backgrounds/support/red_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/red_color.png rename to tests/wpt/tests/css/css-backgrounds/support/red_color.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-bl.png b/tests/wpt/tests/css/css-backgrounds/support/reticule-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-bl.png rename to tests/wpt/tests/css/css-backgrounds/support/reticule-bl.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-bo.png b/tests/wpt/tests/css/css-backgrounds/support/reticule-bo.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-bo.png rename to tests/wpt/tests/css/css-backgrounds/support/reticule-bo.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-br.png b/tests/wpt/tests/css/css-backgrounds/support/reticule-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-br.png rename to tests/wpt/tests/css/css-backgrounds/support/reticule-br.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-ct.png b/tests/wpt/tests/css/css-backgrounds/support/reticule-ct.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-ct.png rename to tests/wpt/tests/css/css-backgrounds/support/reticule-ct.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-le.png b/tests/wpt/tests/css/css-backgrounds/support/reticule-le.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-le.png rename to tests/wpt/tests/css/css-backgrounds/support/reticule-le.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-ri.png b/tests/wpt/tests/css/css-backgrounds/support/reticule-ri.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-ri.png rename to tests/wpt/tests/css/css-backgrounds/support/reticule-ri.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-tl.png b/tests/wpt/tests/css/css-backgrounds/support/reticule-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-tl.png rename to tests/wpt/tests/css/css-backgrounds/support/reticule-tl.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-to.png b/tests/wpt/tests/css/css-backgrounds/support/reticule-to.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-to.png rename to tests/wpt/tests/css/css-backgrounds/support/reticule-to.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-tr.png b/tests/wpt/tests/css/css-backgrounds/support/reticule-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule-tr.png rename to tests/wpt/tests/css/css-backgrounds/support/reticule-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule.png b/tests/wpt/tests/css/css-backgrounds/support/reticule.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/reticule.png rename to tests/wpt/tests/css/css-backgrounds/support/reticule.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/ruler-h-50%.png b/tests/wpt/tests/css/css-backgrounds/support/ruler-h-50%.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/ruler-h-50%.png rename to tests/wpt/tests/css/css-backgrounds/support/ruler-h-50%.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/ruler-h-50px.png b/tests/wpt/tests/css/css-backgrounds/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/ruler-h-50px.png rename to tests/wpt/tests/css/css-backgrounds/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/ruler-v-100px.png b/tests/wpt/tests/css/css-backgrounds/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/ruler-v-100px.png rename to tests/wpt/tests/css/css-backgrounds/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/ruler-v-50px.png b/tests/wpt/tests/css/css-backgrounds/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/ruler-v-50px.png rename to tests/wpt/tests/css/css-backgrounds/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/square-purple.png b/tests/wpt/tests/css/css-backgrounds/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/square-purple.png rename to tests/wpt/tests/css/css-backgrounds/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/square-teal.png b/tests/wpt/tests/css/css-backgrounds/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/square-teal.png rename to tests/wpt/tests/css/css-backgrounds/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/square-white.png b/tests/wpt/tests/css/css-backgrounds/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/square-white.png rename to tests/wpt/tests/css/css-backgrounds/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/swatch-blue.png b/tests/wpt/tests/css/css-backgrounds/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/swatch-blue.png rename to tests/wpt/tests/css/css-backgrounds/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/swatch-green.png b/tests/wpt/tests/css/css-backgrounds/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/swatch-green.png rename to tests/wpt/tests/css/css-backgrounds/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/swatch-lime.png b/tests/wpt/tests/css/css-backgrounds/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/swatch-lime.png rename to tests/wpt/tests/css/css-backgrounds/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/swatch-orange.png b/tests/wpt/tests/css/css-backgrounds/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/swatch-orange.png rename to tests/wpt/tests/css/css-backgrounds/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/swatch-red.png b/tests/wpt/tests/css/css-backgrounds/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/swatch-red.png rename to tests/wpt/tests/css/css-backgrounds/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/swatch-white.png b/tests/wpt/tests/css/css-backgrounds/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/swatch-white.png rename to tests/wpt/tests/css/css-backgrounds/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/swatch-yellow.png b/tests/wpt/tests/css/css-backgrounds/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/swatch-yellow.png rename to tests/wpt/tests/css/css-backgrounds/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/table-head.jpg b/tests/wpt/tests/css/css-backgrounds/support/table-head.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/table-head.jpg rename to tests/wpt/tests/css/css-backgrounds/support/table-head.jpg diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/test-bl.png b/tests/wpt/tests/css/css-backgrounds/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/test-bl.png rename to tests/wpt/tests/css/css-backgrounds/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/test-br.png b/tests/wpt/tests/css/css-backgrounds/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/test-br.png rename to tests/wpt/tests/css/css-backgrounds/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/test-inner-half-size.png b/tests/wpt/tests/css/css-backgrounds/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/test-inner-half-size.png rename to tests/wpt/tests/css/css-backgrounds/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/test-outer.png b/tests/wpt/tests/css/css-backgrounds/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/test-outer.png rename to tests/wpt/tests/css/css-backgrounds/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/test-tl.png b/tests/wpt/tests/css/css-backgrounds/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/test-tl.png rename to tests/wpt/tests/css/css-backgrounds/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/test-tr.png b/tests/wpt/tests/css/css-backgrounds/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/test-tr.png rename to tests/wpt/tests/css/css-backgrounds/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/white_color.png b/tests/wpt/tests/css/css-backgrounds/support/white_color.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/white_color.png rename to tests/wpt/tests/css/css-backgrounds/support/white_color.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/y.png b/tests/wpt/tests/css/css-backgrounds/support/y.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/support/y.png rename to tests/wpt/tests/css/css-backgrounds/support/y.png diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/table-cell-background-local-ref.html b/tests/wpt/tests/css/css-backgrounds/table-cell-background-local-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/table-cell-background-local-ref.html rename to tests/wpt/tests/css/css-backgrounds/table-cell-background-local-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/table-cell-background-local.html b/tests/wpt/tests/css/css-backgrounds/table-cell-background-local.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/table-cell-background-local.html rename to tests/wpt/tests/css/css-backgrounds/table-cell-background-local.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/tiny-foreignObject-double-border-radius-crash.html b/tests/wpt/tests/css/css-backgrounds/tiny-foreignObject-double-border-radius-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/tiny-foreignObject-double-border-radius-crash.html rename to tests/wpt/tests/css/css-backgrounds/tiny-foreignObject-double-border-radius-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand-missing-bottom.htm b/tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand-missing-bottom.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand-missing-bottom.htm rename to tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand-missing-bottom.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand-missing-left.htm b/tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand-missing-left.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand-missing-left.htm rename to tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand-missing-left.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand-missing-right.htm b/tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand-missing-right.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand-missing-right.htm rename to tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand-missing-right.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand.htm b/tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand.htm rename to tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-color-shorthand.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-color.htm b/tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-color.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-color.htm rename to tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-color.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-style-double.htm b/tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-style-double.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-style-double.htm rename to tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-style-double.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-style-shorthand-missing-bottom.htm b/tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-style-shorthand-missing-bottom.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-style-shorthand-missing-bottom.htm rename to tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-style-shorthand-missing-bottom.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-style-shorthand-missing-left.htm b/tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-style-shorthand-missing-left.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-style-shorthand-missing-left.htm rename to tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-style-shorthand-missing-left.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-style-shorthand.htm b/tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-style-shorthand.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-style-shorthand.htm rename to tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-style-shorthand.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-style-values.htm b/tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-style-values.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-style-values.htm rename to tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-style-values.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-style.htm b/tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-style.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-css3background-border-style.htm rename to tests/wpt/tests/css/css-backgrounds/ttwf-css3background-border-style.htm diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-reftest-borderRadius.html b/tests/wpt/tests/css/css-backgrounds/ttwf-reftest-borderRadius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-backgrounds/ttwf-reftest-borderRadius.html rename to tests/wpt/tests/css/css-backgrounds/ttwf-reftest-borderRadius.html diff --git a/tests/wpt/web-platform-tests/css/css-borders/border-radius-greater-than-width.html b/tests/wpt/tests/css/css-borders/border-radius-greater-than-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-borders/border-radius-greater-than-width.html rename to tests/wpt/tests/css/css-borders/border-radius-greater-than-width.html diff --git a/tests/wpt/web-platform-tests/css/css-borders/border-width-rounding.tentative.html b/tests/wpt/tests/css/css-borders/border-width-rounding.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-borders/border-width-rounding.tentative.html rename to tests/wpt/tests/css/css-borders/border-width-rounding.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-borders/borders-on-sub-unit-sized-elements.html b/tests/wpt/tests/css/css-borders/borders-on-sub-unit-sized-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-borders/borders-on-sub-unit-sized-elements.html rename to tests/wpt/tests/css/css-borders/borders-on-sub-unit-sized-elements.html diff --git a/tests/wpt/web-platform-tests/css/css-borders/reference/border-radius-greater-than-width-ref.html b/tests/wpt/tests/css/css-borders/reference/border-radius-greater-than-width-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-borders/reference/border-radius-greater-than-width-ref.html rename to tests/wpt/tests/css/css-borders/reference/border-radius-greater-than-width-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-borders/reference/borders-on-sub-unit-sized-elements-ref.html b/tests/wpt/tests/css/css-borders/reference/borders-on-sub-unit-sized-elements-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-borders/reference/borders-on-sub-unit-sized-elements-ref.html rename to tests/wpt/tests/css/css-borders/reference/borders-on-sub-unit-sized-elements-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-borders/reference/subpixel-border-width-ref.tentative.html b/tests/wpt/tests/css/css-borders/reference/subpixel-border-width-ref.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-borders/reference/subpixel-border-width-ref.tentative.html rename to tests/wpt/tests/css/css-borders/reference/subpixel-border-width-ref.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-borders/reference/subpixel-borders-with-child-border-box-sizing-ref.html b/tests/wpt/tests/css/css-borders/reference/subpixel-borders-with-child-border-box-sizing-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-borders/reference/subpixel-borders-with-child-border-box-sizing-ref.html rename to tests/wpt/tests/css/css-borders/reference/subpixel-borders-with-child-border-box-sizing-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-borders/reference/subpixel-borders-with-child-ref.html b/tests/wpt/tests/css/css-borders/reference/subpixel-borders-with-child-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-borders/reference/subpixel-borders-with-child-ref.html rename to tests/wpt/tests/css/css-borders/reference/subpixel-borders-with-child-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-borders/subpixel-border-width.tentative.html b/tests/wpt/tests/css/css-borders/subpixel-border-width.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-borders/subpixel-border-width.tentative.html rename to tests/wpt/tests/css/css-borders/subpixel-border-width.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-borders/subpixel-borders-with-child-border-box-sizing.html b/tests/wpt/tests/css/css-borders/subpixel-borders-with-child-border-box-sizing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-borders/subpixel-borders-with-child-border-box-sizing.html rename to tests/wpt/tests/css/css-borders/subpixel-borders-with-child-border-box-sizing.html diff --git a/tests/wpt/web-platform-tests/css/css-borders/subpixel-borders-with-child.html b/tests/wpt/tests/css/css-borders/subpixel-borders-with-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-borders/subpixel-borders-with-child.html rename to tests/wpt/tests/css/css-borders/subpixel-borders-with-child.html diff --git a/tests/wpt/web-platform-tests/css/css-box/META.yml b/tests/wpt/tests/css/css-box/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/META.yml rename to tests/wpt/tests/css/css-box/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-box/animation/margin-bottom-composition.html b/tests/wpt/tests/css/css-box/animation/margin-bottom-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/animation/margin-bottom-composition.html rename to tests/wpt/tests/css/css-box/animation/margin-bottom-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-box/animation/margin-interpolation.html b/tests/wpt/tests/css/css-box/animation/margin-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/animation/margin-interpolation.html rename to tests/wpt/tests/css/css-box/animation/margin-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-box/animation/margin-left-composition.html b/tests/wpt/tests/css/css-box/animation/margin-left-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/animation/margin-left-composition.html rename to tests/wpt/tests/css/css-box/animation/margin-left-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-box/animation/margin-right-composition.html b/tests/wpt/tests/css/css-box/animation/margin-right-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/animation/margin-right-composition.html rename to tests/wpt/tests/css/css-box/animation/margin-right-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-box/animation/margin-top-composition.html b/tests/wpt/tests/css/css-box/animation/margin-top-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/animation/margin-top-composition.html rename to tests/wpt/tests/css/css-box/animation/margin-top-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-box/animation/padding-bottom-composition.html b/tests/wpt/tests/css/css-box/animation/padding-bottom-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/animation/padding-bottom-composition.html rename to tests/wpt/tests/css/css-box/animation/padding-bottom-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-box/animation/padding-interpolation.html b/tests/wpt/tests/css/css-box/animation/padding-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/animation/padding-interpolation.html rename to tests/wpt/tests/css/css-box/animation/padding-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-box/animation/padding-left-composition.html b/tests/wpt/tests/css/css-box/animation/padding-left-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/animation/padding-left-composition.html rename to tests/wpt/tests/css/css-box/animation/padding-left-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-box/animation/padding-right-composition.html b/tests/wpt/tests/css/css-box/animation/padding-right-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/animation/padding-right-composition.html rename to tests/wpt/tests/css/css-box/animation/padding-right-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-box/animation/padding-top-composition.html b/tests/wpt/tests/css/css-box/animation/padding-top-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/animation/padding-top-composition.html rename to tests/wpt/tests/css/css-box/animation/padding-top-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-box/box-chrome-crash-001.html b/tests/wpt/tests/css/css-box/box-chrome-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/box-chrome-crash-001.html rename to tests/wpt/tests/css/css-box/box-chrome-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/css-box/inheritance.html b/tests/wpt/tests/css/css-box/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/inheritance.html rename to tests/wpt/tests/css/css-box/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-block-001.html b/tests/wpt/tests/css/css-box/margin-trim/block-container-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-block-001.html rename to tests/wpt/tests/css/css-box/margin-trim/block-container-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-block-002.html b/tests/wpt/tests/css/css-box/margin-trim/block-container-block-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-block-002.html rename to tests/wpt/tests/css/css-box/margin-trim/block-container-block-002.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-block-end-001.html b/tests/wpt/tests/css/css-box/margin-trim/block-container-block-end-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-block-end-001.html rename to tests/wpt/tests/css/css-box/margin-trim/block-container-block-end-001.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-block-end-002.html b/tests/wpt/tests/css/css-box/margin-trim/block-container-block-end-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-block-end-002.html rename to tests/wpt/tests/css/css-box/margin-trim/block-container-block-end-002.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-block-start-001.html b/tests/wpt/tests/css/css-box/margin-trim/block-container-block-start-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-block-start-001.html rename to tests/wpt/tests/css/css-box/margin-trim/block-container-block-start-001.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-block-start-002.html b/tests/wpt/tests/css/css-box/margin-trim/block-container-block-start-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-block-start-002.html rename to tests/wpt/tests/css/css-box/margin-trim/block-container-block-start-002.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-non-adjoining-item-ref.html b/tests/wpt/tests/css/css-box/margin-trim/block-container-non-adjoining-item-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-non-adjoining-item-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/block-container-non-adjoining-item-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-non-adjoining-item.html b/tests/wpt/tests/css/css-box/margin-trim/block-container-non-adjoining-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-non-adjoining-item.html rename to tests/wpt/tests/css/css-box/margin-trim/block-container-non-adjoining-item.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-replaced-block-end.html b/tests/wpt/tests/css/css-box/margin-trim/block-container-replaced-block-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-replaced-block-end.html rename to tests/wpt/tests/css/css-box/margin-trim/block-container-replaced-block-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-replaced-block-start.html b/tests/wpt/tests/css/css-box/margin-trim/block-container-replaced-block-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-replaced-block-start.html rename to tests/wpt/tests/css/css-box/margin-trim/block-container-replaced-block-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-replaced-block.html b/tests/wpt/tests/css/css-box/margin-trim/block-container-replaced-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/block-container-replaced-block.html rename to tests/wpt/tests/css/css-box/margin-trim/block-container-replaced-block.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/block-container-block-end-nested-child.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/block-container-block-end-nested-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/block-container-block-end-nested-child.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/block-container-block-end-nested-child.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/block-container-block-end-with-self-collapsing-children.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/block-container-block-end-with-self-collapsing-children.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/block-container-block-end-with-self-collapsing-children.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/block-container-block-end-with-self-collapsing-children.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/block-container-block-end.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/block-container-block-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/block-container-block-end.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/block-container-block-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/block-container-block-start-child-with-border.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/block-container-block-start-child-with-border.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/block-container-block-start-child-with-border.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/block-container-block-start-child-with-border.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/block-container-block-start-self-collapsing-nested.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/block-container-block-start-self-collapsing-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/block-container-block-start-self-collapsing-nested.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/block-container-block-start-self-collapsing-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/block-container-block-start.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/block-container-block-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/block-container-block-start.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/block-container-block-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-block-end.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-block-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-block-end.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-block-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-block-start.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-block-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-block-start.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-block-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-inline-end.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-inline-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-inline-end.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-inline-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-inline-start.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-inline-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-inline-start.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-inline-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-block-end.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-block-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-block-end.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-block-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-block-start.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-block-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-block-start.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-block-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-block.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-block.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-block.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-inline-end.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-inline-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-inline-end.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-inline-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-inline-start.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-inline-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-inline-start.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-multi-line-inline-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-style-change-triggers-layout-block-start.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-style-change-triggers-layout-block-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-style-change-triggers-layout-block-start.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-column-style-change-triggers-layout-block-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-block-end.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-block-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-block-end.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-block-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-block-start.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-block-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-block-start.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-block-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-block.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-block.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-block.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-inline-end.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-inline-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-inline-end.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-inline-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-inline-start.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-inline-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-inline-start.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-inline-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-block-end.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-block-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-block-end.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-block-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-block-start.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-block-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-block-start.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-block-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-block.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-block.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-block.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-inline-end.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-inline-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-inline-end.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-inline-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-inline-start.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-inline-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-inline-start.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/flexbox-row-multi-line-inline-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/grid-block-end-column-auto-flow.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/grid-block-end-column-auto-flow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/grid-block-end-column-auto-flow.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/grid-block-end-column-auto-flow.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/grid-block-end-item-spans-multiple-rows.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/grid-block-end-item-spans-multiple-rows.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/grid-block-end-item-spans-multiple-rows.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/grid-block-end-item-spans-multiple-rows.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/grid-block-end.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/grid-block-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/grid-block-end.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/grid-block-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/grid-inline-start-item-negative-span.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/grid-inline-start-item-negative-span.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/grid-inline-start-item-negative-span.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/grid-inline-start-item-negative-span.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/grid-inline-start.html b/tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/grid-inline-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/computed-margin-values/grid-inline-start.html rename to tests/wpt/tests/css/css-box/margin-trim/computed-margin-values/grid-inline-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-block-end-trimmed-only-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-block-end-trimmed-only-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-block-end-trimmed-only-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-block-end-trimmed-only-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-block-end-trimmed-only.html b/tests/wpt/tests/css/css-box/margin-trim/flex-block-end-trimmed-only.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-block-end-trimmed-only.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-block-end-trimmed-only.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-block-start-trimmed-only-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-block-start-trimmed-only-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-block-start-trimmed-only-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-block-start-trimmed-only-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-block-start-trimmed-only.html b/tests/wpt/tests/css/css-box/margin-trim/flex-block-start-trimmed-only.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-block-start-trimmed-only.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-block-start-trimmed-only.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-block-trimmed-only-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-block-trimmed-only-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-block-trimmed-only-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-block-trimmed-only-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-block-trimmed-only.html b/tests/wpt/tests/css/css-box/margin-trim/flex-block-trimmed-only.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-block-trimmed-only.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-block-trimmed-only.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-block-multiline.html b/tests/wpt/tests/css/css-box/margin-trim/flex-column-block-multiline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-block-multiline.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-column-block-multiline.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-grow.html b/tests/wpt/tests/css/css-box/margin-trim/flex-column-grow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-grow.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-column-grow.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-inline-multiline-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-column-inline-multiline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-inline-multiline-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-column-inline-multiline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-inline-multiline.html b/tests/wpt/tests/css/css-box/margin-trim/flex-column-inline-multiline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-inline-multiline.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-column-inline-multiline.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-orthogonal-item.html b/tests/wpt/tests/css/css-box/margin-trim/flex-column-orthogonal-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-orthogonal-item.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-column-orthogonal-item.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-shrink.html b/tests/wpt/tests/css/css-box/margin-trim/flex-column-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-shrink.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-column-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-end-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-end-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-end-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-end-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-end.html b/tests/wpt/tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-end.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-start-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-start-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-start-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-start.html b/tests/wpt/tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-start.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block.html b/tests/wpt/tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-column-style-change-triggers-layout-block.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-inline-end-trimmed-only-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-inline-end-trimmed-only-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-inline-end-trimmed-only-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-inline-end-trimmed-only-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-inline-end-trimmed-only.html b/tests/wpt/tests/css/css-box/margin-trim/flex-inline-end-trimmed-only.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-inline-end-trimmed-only.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-inline-end-trimmed-only.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-inline-start-trimmed-only-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-inline-start-trimmed-only-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-inline-start-trimmed-only-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-inline-start-trimmed-only-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-inline-start-trimmed-only.html b/tests/wpt/tests/css/css-box/margin-trim/flex-inline-start-trimmed-only.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-inline-start-trimmed-only.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-inline-start-trimmed-only.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-inline-trimmed-only-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-inline-trimmed-only-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-inline-trimmed-only-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-inline-trimmed-only-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-inline-trimmed-only.html b/tests/wpt/tests/css/css-box/margin-trim/flex-inline-trimmed-only.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-inline-trimmed-only.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-inline-trimmed-only.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-block-multiline-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-row-block-multiline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-block-multiline-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-row-block-multiline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-block-multiline.html b/tests/wpt/tests/css/css-box/margin-trim/flex-row-block-multiline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-block-multiline.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-row-block-multiline.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-grow.html b/tests/wpt/tests/css/css-box/margin-trim/flex-row-grow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-grow.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-row-grow.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-inline-multiline.html b/tests/wpt/tests/css/css-box/margin-trim/flex-row-inline-multiline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-inline-multiline.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-row-inline-multiline.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-orthogonal-item.html b/tests/wpt/tests/css/css-box/margin-trim/flex-row-orthogonal-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-orthogonal-item.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-row-orthogonal-item.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-shrink.html b/tests/wpt/tests/css/css-box/margin-trim/flex-row-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-shrink.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-row-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-end-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-end-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-end-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-end-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-end.html b/tests/wpt/tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-end.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-start-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-start-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-start-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-start.html b/tests/wpt/tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-start.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline.html b/tests/wpt/tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-row-style-change-triggers-layout-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-trim-all-margins-ref.html b/tests/wpt/tests/css/css-box/margin-trim/flex-trim-all-margins-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-trim-all-margins-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-trim-all-margins-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-trim-all-margins.html b/tests/wpt/tests/css/css-box/margin-trim/flex-trim-all-margins.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/flex-trim-all-margins.html rename to tests/wpt/tests/css/css-box/margin-trim/flex-trim-all-margins.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-block-end-ref.html b/tests/wpt/tests/css/css-box/margin-trim/grid-block-end-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-block-end-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/grid-block-end-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-block-end.html b/tests/wpt/tests/css/css-box/margin-trim/grid-block-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-block-end.html rename to tests/wpt/tests/css/css-box/margin-trim/grid-block-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-block-start-ref.html b/tests/wpt/tests/css/css-box/margin-trim/grid-block-start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-block-start-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/grid-block-start-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-block-start.html b/tests/wpt/tests/css/css-box/margin-trim/grid-block-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-block-start.html rename to tests/wpt/tests/css/css-box/margin-trim/grid-block-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-block.html b/tests/wpt/tests/css/css-box/margin-trim/grid-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-block.html rename to tests/wpt/tests/css/css-box/margin-trim/grid-block.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-inline-end-ref.html b/tests/wpt/tests/css/css-box/margin-trim/grid-inline-end-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-inline-end-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/grid-inline-end-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-inline-end.html b/tests/wpt/tests/css/css-box/margin-trim/grid-inline-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-inline-end.html rename to tests/wpt/tests/css/css-box/margin-trim/grid-inline-end.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-inline-start-ref.html b/tests/wpt/tests/css/css-box/margin-trim/grid-inline-start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-inline-start-ref.html rename to tests/wpt/tests/css/css-box/margin-trim/grid-inline-start-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-inline-start.html b/tests/wpt/tests/css/css-box/margin-trim/grid-inline-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-inline-start.html rename to tests/wpt/tests/css/css-box/margin-trim/grid-inline-start.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-inline.html b/tests/wpt/tests/css/css-box/margin-trim/grid-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-inline.html rename to tests/wpt/tests/css/css-box/margin-trim/grid-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-trim-ignores-collapsed-tracks.html b/tests/wpt/tests/css/css-box/margin-trim/grid-trim-ignores-collapsed-tracks.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/margin-trim/grid-trim-ignores-collapsed-tracks.html rename to tests/wpt/tests/css/css-box/margin-trim/grid-trim-ignores-collapsed-tracks.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/clear-computed.html b/tests/wpt/tests/css/css-box/parsing/clear-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/clear-computed.html rename to tests/wpt/tests/css/css-box/parsing/clear-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/clear-invalid.html b/tests/wpt/tests/css/css-box/parsing/clear-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/clear-invalid.html rename to tests/wpt/tests/css/css-box/parsing/clear-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/clear-valid.html b/tests/wpt/tests/css/css-box/parsing/clear-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/clear-valid.html rename to tests/wpt/tests/css/css-box/parsing/clear-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/float-computed.html b/tests/wpt/tests/css/css-box/parsing/float-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/float-computed.html rename to tests/wpt/tests/css/css-box/parsing/float-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/float-invalid.html b/tests/wpt/tests/css/css-box/parsing/float-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/float-invalid.html rename to tests/wpt/tests/css/css-box/parsing/float-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/float-valid.html b/tests/wpt/tests/css/css-box/parsing/float-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/float-valid.html rename to tests/wpt/tests/css/css-box/parsing/float-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/height-invalid.html b/tests/wpt/tests/css/css-box/parsing/height-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/height-invalid.html rename to tests/wpt/tests/css/css-box/parsing/height-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/height-valid.html b/tests/wpt/tests/css/css-box/parsing/height-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/height-valid.html rename to tests/wpt/tests/css/css-box/parsing/height-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/margin-computed.html b/tests/wpt/tests/css/css-box/parsing/margin-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/margin-computed.html rename to tests/wpt/tests/css/css-box/parsing/margin-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/margin-invalid.html b/tests/wpt/tests/css/css-box/parsing/margin-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/margin-invalid.html rename to tests/wpt/tests/css/css-box/parsing/margin-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/margin-shorthand.html b/tests/wpt/tests/css/css-box/parsing/margin-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/margin-shorthand.html rename to tests/wpt/tests/css/css-box/parsing/margin-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/margin-trim-computed.html b/tests/wpt/tests/css/css-box/parsing/margin-trim-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/margin-trim-computed.html rename to tests/wpt/tests/css/css-box/parsing/margin-trim-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/margin-trim.html b/tests/wpt/tests/css/css-box/parsing/margin-trim.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/margin-trim.html rename to tests/wpt/tests/css/css-box/parsing/margin-trim.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/margin-valid.html b/tests/wpt/tests/css/css-box/parsing/margin-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/margin-valid.html rename to tests/wpt/tests/css/css-box/parsing/margin-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/max-height-invalid.html b/tests/wpt/tests/css/css-box/parsing/max-height-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/max-height-invalid.html rename to tests/wpt/tests/css/css-box/parsing/max-height-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/max-height-valid.html b/tests/wpt/tests/css/css-box/parsing/max-height-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/max-height-valid.html rename to tests/wpt/tests/css/css-box/parsing/max-height-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/max-width-invalid.html b/tests/wpt/tests/css/css-box/parsing/max-width-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/max-width-invalid.html rename to tests/wpt/tests/css/css-box/parsing/max-width-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/max-width-valid.html b/tests/wpt/tests/css/css-box/parsing/max-width-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/max-width-valid.html rename to tests/wpt/tests/css/css-box/parsing/max-width-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/overflow-invalid.html b/tests/wpt/tests/css/css-box/parsing/overflow-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/overflow-invalid.html rename to tests/wpt/tests/css/css-box/parsing/overflow-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/overflow-valid.html b/tests/wpt/tests/css/css-box/parsing/overflow-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/overflow-valid.html rename to tests/wpt/tests/css/css-box/parsing/overflow-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/padding-computed.html b/tests/wpt/tests/css/css-box/parsing/padding-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/padding-computed.html rename to tests/wpt/tests/css/css-box/parsing/padding-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/padding-invalid.html b/tests/wpt/tests/css/css-box/parsing/padding-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/padding-invalid.html rename to tests/wpt/tests/css/css-box/parsing/padding-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/padding-shorthand.html b/tests/wpt/tests/css/css-box/parsing/padding-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/padding-shorthand.html rename to tests/wpt/tests/css/css-box/parsing/padding-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/padding-valid.html b/tests/wpt/tests/css/css-box/parsing/padding-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/padding-valid.html rename to tests/wpt/tests/css/css-box/parsing/padding-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/visibility-computed.html b/tests/wpt/tests/css/css-box/parsing/visibility-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/visibility-computed.html rename to tests/wpt/tests/css/css-box/parsing/visibility-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/visibility-invalid.html b/tests/wpt/tests/css/css-box/parsing/visibility-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/visibility-invalid.html rename to tests/wpt/tests/css/css-box/parsing/visibility-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/visibility-valid.html b/tests/wpt/tests/css/css-box/parsing/visibility-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/visibility-valid.html rename to tests/wpt/tests/css/css-box/parsing/visibility-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/width-invalid.html b/tests/wpt/tests/css/css-box/parsing/width-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/width-invalid.html rename to tests/wpt/tests/css/css-box/parsing/width-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-box/parsing/width-valid.html b/tests/wpt/tests/css/css-box/parsing/width-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-box/parsing/width-valid.html rename to tests/wpt/tests/css/css-box/parsing/width-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-break/META.yml b/tests/wpt/tests/css/css-break/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/META.yml rename to tests/wpt/tests/css/css-break/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-break/abspos-in-clipped-overflow-print-ref.html b/tests/wpt/tests/css/css-break/abspos-in-clipped-overflow-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/abspos-in-clipped-overflow-print-ref.html rename to tests/wpt/tests/css/css-break/abspos-in-clipped-overflow-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/abspos-in-clipped-overflow-print.html b/tests/wpt/tests/css/css-break/abspos-in-clipped-overflow-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/abspos-in-clipped-overflow-print.html rename to tests/wpt/tests/css/css-break/abspos-in-clipped-overflow-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/abspos-in-offset-relpos.html b/tests/wpt/tests/css/css-break/abspos-in-offset-relpos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/abspos-in-offset-relpos.html rename to tests/wpt/tests/css/css-break/abspos-in-offset-relpos.html diff --git a/tests/wpt/web-platform-tests/css/css-break/abspos-in-opacity-000-ref.html b/tests/wpt/tests/css/css-break/abspos-in-opacity-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/abspos-in-opacity-000-ref.html rename to tests/wpt/tests/css/css-break/abspos-in-opacity-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/abspos-in-opacity-000.html b/tests/wpt/tests/css/css-break/abspos-in-opacity-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/abspos-in-opacity-000.html rename to tests/wpt/tests/css/css-break/abspos-in-opacity-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/abspos-in-opacity-001-ref.html b/tests/wpt/tests/css/css-break/abspos-in-opacity-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/abspos-in-opacity-001-ref.html rename to tests/wpt/tests/css/css-break/abspos-in-opacity-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/abspos-in-opacity-001.html b/tests/wpt/tests/css/css-break/abspos-in-opacity-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/abspos-in-opacity-001.html rename to tests/wpt/tests/css/css-break/abspos-in-opacity-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/abspos-in-opacity-002.html b/tests/wpt/tests/css/css-break/abspos-in-opacity-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/abspos-in-opacity-002.html rename to tests/wpt/tests/css/css-break/abspos-in-opacity-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/abspos-in-opacity-003.html b/tests/wpt/tests/css/css-break/abspos-in-opacity-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/abspos-in-opacity-003.html rename to tests/wpt/tests/css/css-break/abspos-in-opacity-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/abspos-inside-relpos-inside-monolithic.html b/tests/wpt/tests/css/css-break/abspos-inside-relpos-inside-monolithic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/abspos-inside-relpos-inside-monolithic.html rename to tests/wpt/tests/css/css-break/abspos-inside-relpos-inside-monolithic.html diff --git a/tests/wpt/web-platform-tests/css/css-break/animation/break-no-interpolation.html b/tests/wpt/tests/css/css-break/animation/break-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/animation/break-no-interpolation.html rename to tests/wpt/tests/css/css-break/animation/break-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-break/animation/orphans-interpolation.html b/tests/wpt/tests/css/css-break/animation/orphans-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/animation/orphans-interpolation.html rename to tests/wpt/tests/css/css-break/animation/orphans-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-break/animation/widows-interpolation.html b/tests/wpt/tests/css/css-break/animation/widows-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/animation/widows-interpolation.html rename to tests/wpt/tests/css/css-break/animation/widows-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-break/area-crash.html b/tests/wpt/tests/css/css-break/area-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/area-crash.html rename to tests/wpt/tests/css/css-break/area-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/area-in-inline-crash.html b/tests/wpt/tests/css/css-break/area-in-inline-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/area-in-inline-crash.html rename to tests/wpt/tests/css/css-break/area-in-inline-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/auto-overflow-inside-second-abspos-fragment-crash.html b/tests/wpt/tests/css/css-break/auto-overflow-inside-second-abspos-fragment-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/auto-overflow-inside-second-abspos-fragment-crash.html rename to tests/wpt/tests/css/css-break/auto-overflow-inside-second-abspos-fragment-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/avoid-border-break.html b/tests/wpt/tests/css/css-break/avoid-border-break.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/avoid-border-break.html rename to tests/wpt/tests/css/css-break/avoid-border-break.html diff --git a/tests/wpt/web-platform-tests/css/css-break/background-attachment-fixed-ref.html b/tests/wpt/tests/css/css-break/background-attachment-fixed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/background-attachment-fixed-ref.html rename to tests/wpt/tests/css/css-break/background-attachment-fixed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/background-attachment-fixed.html b/tests/wpt/tests/css/css-break/background-attachment-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/background-attachment-fixed.html rename to tests/wpt/tests/css/css-break/background-attachment-fixed.html diff --git a/tests/wpt/web-platform-tests/css/css-break/background-image-000-ref.html b/tests/wpt/tests/css/css-break/background-image-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/background-image-000-ref.html rename to tests/wpt/tests/css/css-break/background-image-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/background-image-000.html b/tests/wpt/tests/css/css-break/background-image-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/background-image-000.html rename to tests/wpt/tests/css/css-break/background-image-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/background-image-001-ref.html b/tests/wpt/tests/css/css-break/background-image-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/background-image-001-ref.html rename to tests/wpt/tests/css/css-break/background-image-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/background-image-001.html b/tests/wpt/tests/css/css-break/background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/background-image-001.html rename to tests/wpt/tests/css/css-break/background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/background-image-002-ref.html b/tests/wpt/tests/css/css-break/background-image-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/background-image-002-ref.html rename to tests/wpt/tests/css/css-break/background-image-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/background-image-002.html b/tests/wpt/tests/css/css-break/background-image-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/background-image-002.html rename to tests/wpt/tests/css/css-break/background-image-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-001-wm-vlr-print.html b/tests/wpt/tests/css/css-break/block-001-wm-vlr-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-001-wm-vlr-print.html rename to tests/wpt/tests/css/css-break/block-001-wm-vlr-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-001-wm-vlr-ref.html b/tests/wpt/tests/css/css-break/block-001-wm-vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-001-wm-vlr-ref.html rename to tests/wpt/tests/css/css-break/block-001-wm-vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-001-wm-vrl-print.html b/tests/wpt/tests/css/css-break/block-001-wm-vrl-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-001-wm-vrl-print.html rename to tests/wpt/tests/css/css-break/block-001-wm-vrl-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-001-wm-vrl-ref.html b/tests/wpt/tests/css/css-break/block-001-wm-vrl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-001-wm-vrl-ref.html rename to tests/wpt/tests/css/css-break/block-001-wm-vrl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-002-wm-vlr-print.html b/tests/wpt/tests/css/css-break/block-002-wm-vlr-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-002-wm-vlr-print.html rename to tests/wpt/tests/css/css-break/block-002-wm-vlr-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-002-wm-vlr-ref.html b/tests/wpt/tests/css/css-break/block-002-wm-vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-002-wm-vlr-ref.html rename to tests/wpt/tests/css/css-break/block-002-wm-vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-002-wm-vrl-print.html b/tests/wpt/tests/css/css-break/block-002-wm-vrl-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-002-wm-vrl-print.html rename to tests/wpt/tests/css/css-break/block-002-wm-vrl-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-002-wm-vrl-ref.html b/tests/wpt/tests/css/css-break/block-002-wm-vrl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-002-wm-vrl-ref.html rename to tests/wpt/tests/css/css-break/block-002-wm-vrl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-end-aligned-abspos-nested.html b/tests/wpt/tests/css/css-break/block-end-aligned-abspos-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-end-aligned-abspos-nested.html rename to tests/wpt/tests/css/css-break/block-end-aligned-abspos-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-end-aligned-abspos-with-overflow-ref.html b/tests/wpt/tests/css/css-break/block-end-aligned-abspos-with-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-end-aligned-abspos-with-overflow-ref.html rename to tests/wpt/tests/css/css-break/block-end-aligned-abspos-with-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-end-aligned-abspos-with-overflow.html b/tests/wpt/tests/css/css-break/block-end-aligned-abspos-with-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-end-aligned-abspos-with-overflow.html rename to tests/wpt/tests/css/css-break/block-end-aligned-abspos-with-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-end-aligned-abspos.html b/tests/wpt/tests/css/css-break/block-end-aligned-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-end-aligned-abspos.html rename to tests/wpt/tests/css/css-break/block-end-aligned-abspos.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-in-inline-000.html b/tests/wpt/tests/css/css-break/block-in-inline-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-in-inline-000.html rename to tests/wpt/tests/css/css-break/block-in-inline-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-in-inline-001.html b/tests/wpt/tests/css/css-break/block-in-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-in-inline-001.html rename to tests/wpt/tests/css/css-break/block-in-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-in-inline-002.html b/tests/wpt/tests/css/css-break/block-in-inline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-in-inline-002.html rename to tests/wpt/tests/css/css-break/block-in-inline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-in-inline-003.html b/tests/wpt/tests/css/css-break/block-in-inline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-in-inline-003.html rename to tests/wpt/tests/css/css-break/block-in-inline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-in-inline-004-crash.html b/tests/wpt/tests/css/css-break/block-in-inline-004-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-in-inline-004-crash.html rename to tests/wpt/tests/css/css-break/block-in-inline-004-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-in-inline-004.html b/tests/wpt/tests/css/css-break/block-in-inline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-in-inline-004.html rename to tests/wpt/tests/css/css-break/block-in-inline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-in-inline-005-crash.html b/tests/wpt/tests/css/css-break/block-in-inline-005-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-in-inline-005-crash.html rename to tests/wpt/tests/css/css-break/block-in-inline-005-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-in-inline-006-crash.html b/tests/wpt/tests/css/css-break/block-in-inline-006-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-in-inline-006-crash.html rename to tests/wpt/tests/css/css-break/block-in-inline-006-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-in-inline-007-crash.html b/tests/wpt/tests/css/css-break/block-in-inline-007-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-in-inline-007-crash.html rename to tests/wpt/tests/css/css-break/block-in-inline-007-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-max-height-001-ref.html b/tests/wpt/tests/css/css-break/block-max-height-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-max-height-001-ref.html rename to tests/wpt/tests/css/css-break/block-max-height-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-max-height-001.html b/tests/wpt/tests/css/css-break/block-max-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-max-height-001.html rename to tests/wpt/tests/css/css-break/block-max-height-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-max-height-001b-ref.html b/tests/wpt/tests/css/css-break/block-max-height-001b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-max-height-001b-ref.html rename to tests/wpt/tests/css/css-break/block-max-height-001b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-max-height-001b.html b/tests/wpt/tests/css/css-break/block-max-height-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-max-height-001b.html rename to tests/wpt/tests/css/css-break/block-max-height-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-max-height-002.html b/tests/wpt/tests/css/css-break/block-max-height-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-max-height-002.html rename to tests/wpt/tests/css/css-break/block-max-height-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-max-height-002b.html b/tests/wpt/tests/css/css-break/block-max-height-002b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-max-height-002b.html rename to tests/wpt/tests/css/css-break/block-max-height-002b.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-max-height-003.html b/tests/wpt/tests/css/css-break/block-max-height-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-max-height-003.html rename to tests/wpt/tests/css/css-break/block-max-height-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-max-height-003b.html b/tests/wpt/tests/css/css-break/block-max-height-003b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-max-height-003b.html rename to tests/wpt/tests/css/css-break/block-max-height-003b.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-max-height-004-ref.html b/tests/wpt/tests/css/css-break/block-max-height-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-max-height-004-ref.html rename to tests/wpt/tests/css/css-break/block-max-height-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-max-height-004.html b/tests/wpt/tests/css/css-break/block-max-height-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-max-height-004.html rename to tests/wpt/tests/css/css-break/block-max-height-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-min-height-001-ref.html b/tests/wpt/tests/css/css-break/block-min-height-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-min-height-001-ref.html rename to tests/wpt/tests/css/css-break/block-min-height-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-min-height-001.html b/tests/wpt/tests/css/css-break/block-min-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-min-height-001.html rename to tests/wpt/tests/css/css-break/block-min-height-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-min-height-001b-ref.html b/tests/wpt/tests/css/css-break/block-min-height-001b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-min-height-001b-ref.html rename to tests/wpt/tests/css/css-break/block-min-height-001b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/block-min-height-001b.html b/tests/wpt/tests/css/css-break/block-min-height-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/block-min-height-001b.html rename to tests/wpt/tests/css/css-break/block-min-height-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-000-ref.html b/tests/wpt/tests/css/css-break/borders-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-000-ref.html rename to tests/wpt/tests/css/css-break/borders-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-000.html b/tests/wpt/tests/css/css-break/borders-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-000.html rename to tests/wpt/tests/css/css-break/borders-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-001-ref.html b/tests/wpt/tests/css/css-break/borders-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-001-ref.html rename to tests/wpt/tests/css/css-break/borders-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-001.html b/tests/wpt/tests/css/css-break/borders-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-001.html rename to tests/wpt/tests/css/css-break/borders-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-002-ref.html b/tests/wpt/tests/css/css-break/borders-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-002-ref.html rename to tests/wpt/tests/css/css-break/borders-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-002.html b/tests/wpt/tests/css/css-break/borders-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-002.html rename to tests/wpt/tests/css/css-break/borders-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-003-ref.html b/tests/wpt/tests/css/css-break/borders-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-003-ref.html rename to tests/wpt/tests/css/css-break/borders-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-003.html b/tests/wpt/tests/css/css-break/borders-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-003.html rename to tests/wpt/tests/css/css-break/borders-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-004-ref.html b/tests/wpt/tests/css/css-break/borders-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-004-ref.html rename to tests/wpt/tests/css/css-break/borders-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-004.html b/tests/wpt/tests/css/css-break/borders-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-004.html rename to tests/wpt/tests/css/css-break/borders-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-005-ref.html b/tests/wpt/tests/css/css-break/borders-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-005-ref.html rename to tests/wpt/tests/css/css-break/borders-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-005.html b/tests/wpt/tests/css/css-break/borders-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-005.html rename to tests/wpt/tests/css/css-break/borders-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-006-ref.html b/tests/wpt/tests/css/css-break/borders-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-006-ref.html rename to tests/wpt/tests/css/css-break/borders-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-006.html b/tests/wpt/tests/css/css-break/borders-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-006.html rename to tests/wpt/tests/css/css-break/borders-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-007-ref.html b/tests/wpt/tests/css/css-break/borders-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-007-ref.html rename to tests/wpt/tests/css/css-break/borders-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-007.html b/tests/wpt/tests/css/css-break/borders-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/borders-007.html rename to tests/wpt/tests/css/css-break/borders-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/box-decoration-break-clone-001.html b/tests/wpt/tests/css/css-break/box-decoration-break-clone-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/box-decoration-break-clone-001.html rename to tests/wpt/tests/css/css-break/box-decoration-break-clone-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/box-decoration-break-clone-002.html b/tests/wpt/tests/css/css-break/box-decoration-break-clone-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/box-decoration-break-clone-002.html rename to tests/wpt/tests/css/css-break/box-decoration-break-clone-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/box-decoration-break-clone-003.html b/tests/wpt/tests/css/css-break/box-decoration-break-clone-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/box-decoration-break-clone-003.html rename to tests/wpt/tests/css/css-break/box-decoration-break-clone-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/box-decoration-break-clone-004.html b/tests/wpt/tests/css/css-break/box-decoration-break-clone-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/box-decoration-break-clone-004.html rename to tests/wpt/tests/css/css-break/box-decoration-break-clone-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/box-shadow-001-ref.html b/tests/wpt/tests/css/css-break/box-shadow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/box-shadow-001-ref.html rename to tests/wpt/tests/css/css-break/box-shadow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/box-shadow-001.html b/tests/wpt/tests/css/css-break/box-shadow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/box-shadow-001.html rename to tests/wpt/tests/css/css-break/box-shadow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/box-shadow-002-ref.html b/tests/wpt/tests/css/css-break/box-shadow-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/box-shadow-002-ref.html rename to tests/wpt/tests/css/css-break/box-shadow-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/box-shadow-002.html b/tests/wpt/tests/css/css-break/box-shadow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/box-shadow-002.html rename to tests/wpt/tests/css/css-break/box-shadow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/box-shadow-003-ref.html b/tests/wpt/tests/css/css-break/box-shadow-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/box-shadow-003-ref.html rename to tests/wpt/tests/css/css-break/box-shadow-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/box-shadow-003.html b/tests/wpt/tests/css/css-break/box-shadow-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/box-shadow-003.html rename to tests/wpt/tests/css/css-break/box-shadow-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/box-shadow-004-ref.html b/tests/wpt/tests/css/css-break/box-shadow-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/box-shadow-004-ref.html rename to tests/wpt/tests/css/css-break/box-shadow-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/box-shadow-004.html b/tests/wpt/tests/css/css-break/box-shadow-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/box-shadow-004.html rename to tests/wpt/tests/css/css-break/box-shadow-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/br-clear-all.html b/tests/wpt/tests/css/css-break/br-clear-all.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/br-clear-all.html rename to tests/wpt/tests/css/css-break/br-clear-all.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-after-in-parallel-flow-crash.html b/tests/wpt/tests/css/css-break/break-after-in-parallel-flow-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-after-in-parallel-flow-crash.html rename to tests/wpt/tests/css/css-break/break-after-in-parallel-flow-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-after-oof-before-preceding-pushed-float-crash.html b/tests/wpt/tests/css/css-break/break-after-oof-before-preceding-pushed-float-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-after-oof-before-preceding-pushed-float-crash.html rename to tests/wpt/tests/css/css-break/break-after-oof-before-preceding-pushed-float-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-at-end-container-edge-000.html b/tests/wpt/tests/css/css-break/break-at-end-container-edge-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-at-end-container-edge-000.html rename to tests/wpt/tests/css/css-break/break-at-end-container-edge-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-at-end-container-edge-001.html b/tests/wpt/tests/css/css-break/break-at-end-container-edge-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-at-end-container-edge-001.html rename to tests/wpt/tests/css/css-break/break-at-end-container-edge-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-at-end-container-edge-002.html b/tests/wpt/tests/css/css-break/break-at-end-container-edge-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-at-end-container-edge-002.html rename to tests/wpt/tests/css/css-break/break-at-end-container-edge-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-at-end-container-edge-003.html b/tests/wpt/tests/css/css-break/break-at-end-container-edge-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-at-end-container-edge-003.html rename to tests/wpt/tests/css/css-break/break-at-end-container-edge-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-at-end-container-edge-004.html b/tests/wpt/tests/css/css-break/break-at-end-container-edge-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-at-end-container-edge-004.html rename to tests/wpt/tests/css/css-break/break-at-end-container-edge-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-before-always-001.xht b/tests/wpt/tests/css/css-break/break-before-always-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-before-always-001.xht rename to tests/wpt/tests/css/css-break/break-before-always-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-break/break-before-float-after-line-after-floats-crash.html b/tests/wpt/tests/css/css-break/break-before-float-after-line-after-floats-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-before-float-after-line-after-floats-crash.html rename to tests/wpt/tests/css/css-break/break-before-float-after-line-after-floats-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-before-with-no-fragmentation-crash.html b/tests/wpt/tests/css/css-break/break-before-with-no-fragmentation-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-before-with-no-fragmentation-crash.html rename to tests/wpt/tests/css/css-break/break-before-with-no-fragmentation-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-000.html b/tests/wpt/tests/css/css-break/break-between-avoid-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-000.html rename to tests/wpt/tests/css/css-break/break-between-avoid-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-001.html b/tests/wpt/tests/css/css-break/break-between-avoid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-001.html rename to tests/wpt/tests/css/css-break/break-between-avoid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-002.html b/tests/wpt/tests/css/css-break/break-between-avoid-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-002.html rename to tests/wpt/tests/css/css-break/break-between-avoid-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-003.html b/tests/wpt/tests/css/css-break/break-between-avoid-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-003.html rename to tests/wpt/tests/css/css-break/break-between-avoid-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-004.html b/tests/wpt/tests/css/css-break/break-between-avoid-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-004.html rename to tests/wpt/tests/css/css-break/break-between-avoid-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-005.html b/tests/wpt/tests/css/css-break/break-between-avoid-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-005.html rename to tests/wpt/tests/css/css-break/break-between-avoid-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-006.html b/tests/wpt/tests/css/css-break/break-between-avoid-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-006.html rename to tests/wpt/tests/css/css-break/break-between-avoid-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-007.html b/tests/wpt/tests/css/css-break/break-between-avoid-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-007.html rename to tests/wpt/tests/css/css-break/break-between-avoid-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-008.html b/tests/wpt/tests/css/css-break/break-between-avoid-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-008.html rename to tests/wpt/tests/css/css-break/break-between-avoid-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-009.html b/tests/wpt/tests/css/css-break/break-between-avoid-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-009.html rename to tests/wpt/tests/css/css-break/break-between-avoid-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-010.html b/tests/wpt/tests/css/css-break/break-between-avoid-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-010.html rename to tests/wpt/tests/css/css-break/break-between-avoid-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-011.html b/tests/wpt/tests/css/css-break/break-between-avoid-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-011.html rename to tests/wpt/tests/css/css-break/break-between-avoid-011.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-012.html b/tests/wpt/tests/css/css-break/break-between-avoid-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-012.html rename to tests/wpt/tests/css/css-break/break-between-avoid-012.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-013.html b/tests/wpt/tests/css/css-break/break-between-avoid-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-013.html rename to tests/wpt/tests/css/css-break/break-between-avoid-013.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-avoid-014.html b/tests/wpt/tests/css/css-break/break-between-avoid-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-avoid-014.html rename to tests/wpt/tests/css/css-break/break-between-avoid-014.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-force-000.html b/tests/wpt/tests/css/css-break/break-between-force-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-force-000.html rename to tests/wpt/tests/css/css-break/break-between-force-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-force-001.html b/tests/wpt/tests/css/css-break/break-between-force-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-force-001.html rename to tests/wpt/tests/css/css-break/break-between-force-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-between-force-002.html b/tests/wpt/tests/css/css-break/break-between-force-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-between-force-002.html rename to tests/wpt/tests/css/css-break/break-between-force-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-float-dynamic-001.html b/tests/wpt/tests/css/css-break/break-float-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-float-dynamic-001.html rename to tests/wpt/tests/css/css-break/break-float-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-float-dynamic-002.html b/tests/wpt/tests/css/css-break/break-float-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-float-dynamic-002.html rename to tests/wpt/tests/css/css-break/break-float-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-inside-avoid-min-block-size-1-ref.html b/tests/wpt/tests/css/css-break/break-inside-avoid-min-block-size-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-inside-avoid-min-block-size-1-ref.html rename to tests/wpt/tests/css/css-break/break-inside-avoid-min-block-size-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-inside-avoid-min-block-size-1.html b/tests/wpt/tests/css/css-break/break-inside-avoid-min-block-size-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-inside-avoid-min-block-size-1.html rename to tests/wpt/tests/css/css-break/break-inside-avoid-min-block-size-1.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-inside-avoid-min-block-size-2-ref.html b/tests/wpt/tests/css/css-break/break-inside-avoid-min-block-size-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-inside-avoid-min-block-size-2-ref.html rename to tests/wpt/tests/css/css-break/break-inside-avoid-min-block-size-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-inside-avoid-min-block-size-2.html b/tests/wpt/tests/css/css-break/break-inside-avoid-min-block-size-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-inside-avoid-min-block-size-2.html rename to tests/wpt/tests/css/css-break/break-inside-avoid-min-block-size-2.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-inside-avoid-multicol-001-print-ref.html b/tests/wpt/tests/css/css-break/break-inside-avoid-multicol-001-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-inside-avoid-multicol-001-print-ref.html rename to tests/wpt/tests/css/css-break/break-inside-avoid-multicol-001-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-inside-avoid-multicol-001-print.html b/tests/wpt/tests/css/css-break/break-inside-avoid-multicol-001-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-inside-avoid-multicol-001-print.html rename to tests/wpt/tests/css/css-break/break-inside-avoid-multicol-001-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-nested-float-in-table-001-print-ref.html b/tests/wpt/tests/css/css-break/break-nested-float-in-table-001-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-nested-float-in-table-001-print-ref.html rename to tests/wpt/tests/css/css-break/break-nested-float-in-table-001-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-nested-float-in-table-001-print.html b/tests/wpt/tests/css/css-break/break-nested-float-in-table-001-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-nested-float-in-table-001-print.html rename to tests/wpt/tests/css/css-break/break-nested-float-in-table-001-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/break-overflowed-block-dynamic-001.html b/tests/wpt/tests/css/css-break/break-overflowed-block-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/break-overflowed-block-dynamic-001.html rename to tests/wpt/tests/css/css-break/break-overflowed-block-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/change-block-background.html b/tests/wpt/tests/css/css-break/change-block-background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/change-block-background.html rename to tests/wpt/tests/css/css-break/change-block-background.html diff --git a/tests/wpt/web-platform-tests/css/css-break/change-break-after.html b/tests/wpt/tests/css/css-break/change-break-after.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/change-break-after.html rename to tests/wpt/tests/css/css-break/change-break-after.html diff --git a/tests/wpt/web-platform-tests/css/css-break/change-break-after2.html b/tests/wpt/tests/css/css-break/change-break-after2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/change-break-after2.html rename to tests/wpt/tests/css/css-break/change-break-after2.html diff --git a/tests/wpt/web-platform-tests/css/css-break/change-break-before.html b/tests/wpt/tests/css/css-break/change-break-before.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/change-break-before.html rename to tests/wpt/tests/css/css-break/change-break-before.html diff --git a/tests/wpt/web-platform-tests/css/css-break/change-break-inside.html b/tests/wpt/tests/css/css-break/change-break-inside.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/change-break-inside.html rename to tests/wpt/tests/css/css-break/change-break-inside.html diff --git a/tests/wpt/web-platform-tests/css/css-break/change-inline-color-ref.html b/tests/wpt/tests/css/css-break/change-inline-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/change-inline-color-ref.html rename to tests/wpt/tests/css/css-break/change-inline-color-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/change-inline-color.html b/tests/wpt/tests/css/css-break/change-inline-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/change-inline-color.html rename to tests/wpt/tests/css/css-break/change-inline-color.html diff --git a/tests/wpt/web-platform-tests/css/css-break/chrome-bug-1283776-000-crash.html b/tests/wpt/tests/css/css-break/chrome-bug-1283776-000-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/chrome-bug-1283776-000-crash.html rename to tests/wpt/tests/css/css-break/chrome-bug-1283776-000-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/chrome-bug-1283776-001-crash.html b/tests/wpt/tests/css/css-break/chrome-bug-1283776-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/chrome-bug-1283776-001-crash.html rename to tests/wpt/tests/css/css-break/chrome-bug-1283776-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/chrome-bug-1285596-crash.html b/tests/wpt/tests/css/css-break/chrome-bug-1285596-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/chrome-bug-1285596-crash.html rename to tests/wpt/tests/css/css-break/chrome-bug-1285596-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/chrome-bug-1287342-crash.html b/tests/wpt/tests/css/css-break/chrome-bug-1287342-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/chrome-bug-1287342-crash.html rename to tests/wpt/tests/css/css-break/chrome-bug-1287342-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/chrome-bug-1288769-000-crash.html b/tests/wpt/tests/css/css-break/chrome-bug-1288769-000-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/chrome-bug-1288769-000-crash.html rename to tests/wpt/tests/css/css-break/chrome-bug-1288769-000-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/chrome-bug-1288769-001-crash.html b/tests/wpt/tests/css/css-break/chrome-bug-1288769-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/chrome-bug-1288769-001-crash.html rename to tests/wpt/tests/css/css-break/chrome-bug-1288769-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/chrome-bug-1289999-crash.https.html b/tests/wpt/tests/css/css-break/chrome-bug-1289999-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/chrome-bug-1289999-crash.https.html rename to tests/wpt/tests/css/css-break/chrome-bug-1289999-crash.https.html diff --git a/tests/wpt/web-platform-tests/css/css-break/chrome-bug-1318455-crash.html b/tests/wpt/tests/css/css-break/chrome-bug-1318455-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/chrome-bug-1318455-crash.html rename to tests/wpt/tests/css/css-break/chrome-bug-1318455-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/class-c-breakpoint-after-float-000.html b/tests/wpt/tests/css/css-break/class-c-breakpoint-after-float-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/class-c-breakpoint-after-float-000.html rename to tests/wpt/tests/css/css-break/class-c-breakpoint-after-float-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/class-c-breakpoint-after-float-001.html b/tests/wpt/tests/css/css-break/class-c-breakpoint-after-float-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/class-c-breakpoint-after-float-001.html rename to tests/wpt/tests/css/css-break/class-c-breakpoint-after-float-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/class-c-breakpoint-after-float-002.html b/tests/wpt/tests/css/css-break/class-c-breakpoint-after-float-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/class-c-breakpoint-after-float-002.html rename to tests/wpt/tests/css/css-break/class-c-breakpoint-after-float-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/class-c-breakpoint-after-float-003.html b/tests/wpt/tests/css/css-break/class-c-breakpoint-after-float-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/class-c-breakpoint-after-float-003.html rename to tests/wpt/tests/css/css-break/class-c-breakpoint-after-float-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/class-c-breakpoint-after-float-004.html b/tests/wpt/tests/css/css-break/class-c-breakpoint-after-float-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/class-c-breakpoint-after-float-004.html rename to tests/wpt/tests/css/css-break/class-c-breakpoint-after-float-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/clear-br-in-size-containment-crash.html b/tests/wpt/tests/css/css-break/clear-br-in-size-containment-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/clear-br-in-size-containment-crash.html rename to tests/wpt/tests/css/css-break/clear-br-in-size-containment-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/clear-float-in-size-containment-crash.html b/tests/wpt/tests/css/css-break/clear-float-in-size-containment-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/clear-float-in-size-containment-crash.html rename to tests/wpt/tests/css/css-break/clear-float-in-size-containment-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/clear-past-float-with-oof-twice-crash.html b/tests/wpt/tests/css/css-break/clear-past-float-with-oof-twice-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/clear-past-float-with-oof-twice-crash.html rename to tests/wpt/tests/css/css-break/clear-past-float-with-oof-twice-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/clearance-parallel-flow-001.html b/tests/wpt/tests/css/css-break/clearance-parallel-flow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/clearance-parallel-flow-001.html rename to tests/wpt/tests/css/css-break/clearance-parallel-flow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/clearance-parallel-flow-002.html b/tests/wpt/tests/css/css-break/clearance-parallel-flow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/clearance-parallel-flow-002.html rename to tests/wpt/tests/css/css-break/clearance-parallel-flow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/clearance-self-collapsing-past-fragmented-float.html b/tests/wpt/tests/css/css-break/clearance-self-collapsing-past-fragmented-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/clearance-self-collapsing-past-fragmented-float.html rename to tests/wpt/tests/css/css-break/clearance-self-collapsing-past-fragmented-float.html diff --git a/tests/wpt/web-platform-tests/css/css-break/clipping-001.html b/tests/wpt/tests/css/css-break/clipping-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/clipping-001.html rename to tests/wpt/tests/css/css-break/clipping-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/clipping-002.html b/tests/wpt/tests/css/css-break/clipping-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/clipping-002.html rename to tests/wpt/tests/css/css-break/clipping-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/column-balancing-with-oofs-crash.html b/tests/wpt/tests/css/css-break/column-balancing-with-oofs-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/column-balancing-with-oofs-crash.html rename to tests/wpt/tests/css/css-break/column-balancing-with-oofs-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/contain-strict-with-opacity-and-oof-ref.html b/tests/wpt/tests/css/css-break/contain-strict-with-opacity-and-oof-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/contain-strict-with-opacity-and-oof-ref.html rename to tests/wpt/tests/css/css-break/contain-strict-with-opacity-and-oof-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/contain-strict-with-opacity-and-oof.html b/tests/wpt/tests/css/css-break/contain-strict-with-opacity-and-oof.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/contain-strict-with-opacity-and-oof.html rename to tests/wpt/tests/css/css-break/contain-strict-with-opacity-and-oof.html diff --git a/tests/wpt/web-platform-tests/css/css-break/empty-fieldset-tall-bottom-padding-crash.html b/tests/wpt/tests/css/css-break/empty-fieldset-tall-bottom-padding-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/empty-fieldset-tall-bottom-padding-crash.html rename to tests/wpt/tests/css/css-break/empty-fieldset-tall-bottom-padding-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/empty-multicol-at-scrollport-edge.html b/tests/wpt/tests/css/css-break/empty-multicol-at-scrollport-edge.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/empty-multicol-at-scrollport-edge.html rename to tests/wpt/tests/css/css-break/empty-multicol-at-scrollport-edge.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-001-ref.html b/tests/wpt/tests/css/css-break/fieldset-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fieldset-001-ref.html rename to tests/wpt/tests/css/css-break/fieldset-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-001.html b/tests/wpt/tests/css/css-break/fieldset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fieldset-001.html rename to tests/wpt/tests/css/css-break/fieldset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-002-ref.html b/tests/wpt/tests/css/css-break/fieldset-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fieldset-002-ref.html rename to tests/wpt/tests/css/css-break/fieldset-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-002.html b/tests/wpt/tests/css/css-break/fieldset-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fieldset-002.html rename to tests/wpt/tests/css/css-break/fieldset-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-003-ref.html b/tests/wpt/tests/css/css-break/fieldset-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fieldset-003-ref.html rename to tests/wpt/tests/css/css-break/fieldset-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-003.html b/tests/wpt/tests/css/css-break/fieldset-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fieldset-003.html rename to tests/wpt/tests/css/css-break/fieldset-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-004-ref.html b/tests/wpt/tests/css/css-break/fieldset-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fieldset-004-ref.html rename to tests/wpt/tests/css/css-break/fieldset-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-004.html b/tests/wpt/tests/css/css-break/fieldset-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fieldset-004.html rename to tests/wpt/tests/css/css-break/fieldset-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-005.html b/tests/wpt/tests/css/css-break/fieldset-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fieldset-005.html rename to tests/wpt/tests/css/css-break/fieldset-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-006.html b/tests/wpt/tests/css/css-break/fieldset-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fieldset-006.html rename to tests/wpt/tests/css/css-break/fieldset-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-007.html b/tests/wpt/tests/css/css-break/fieldset-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fieldset-007.html rename to tests/wpt/tests/css/css-break/fieldset-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset.html b/tests/wpt/tests/css/css-break/fieldset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fieldset.html rename to tests/wpt/tests/css/css-break/fieldset.html diff --git a/tests/wpt/web-platform-tests/css/css-break/firefox-bug1693616-001-crash.html b/tests/wpt/tests/css/css-break/firefox-bug1693616-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/firefox-bug1693616-001-crash.html rename to tests/wpt/tests/css/css-break/firefox-bug1693616-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/firefox-bug1693616-002-crash.html b/tests/wpt/tests/css/css-break/firefox-bug1693616-002-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/firefox-bug1693616-002-crash.html rename to tests/wpt/tests/css/css-break/firefox-bug1693616-002-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flex-item-padding-block-in-inline-crash.html b/tests/wpt/tests/css/css-break/flex-item-padding-block-in-inline-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flex-item-padding-block-in-inline-crash.html rename to tests/wpt/tests/css/css-break/flex-item-padding-block-in-inline-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/button-in-multicol-crash.html b/tests/wpt/tests/css/css-break/flexbox/button-in-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/button-in-multicol-crash.html rename to tests/wpt/tests/css/css-break/flexbox/button-in-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/fixed-flex-item-inside-abs-flex-in-multicol-crash.html b/tests/wpt/tests/css/css-break/flexbox/fixed-flex-item-inside-abs-flex-in-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/fixed-flex-item-inside-abs-flex-in-multicol-crash.html rename to tests/wpt/tests/css/css-break/flexbox/fixed-flex-item-inside-abs-flex-in-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-001.html b/tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-001.html rename to tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-002.html b/tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-002.html rename to tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-003.html b/tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-003.html rename to tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-004.html b/tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-004.html rename to tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-005.html b/tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-005.html rename to tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-006.html b/tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-006.html rename to tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-007.tentative.html b/tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-007.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-007.tentative.html rename to tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-007.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-008.html b/tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-008.html rename to tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-009.html b/tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-009.html rename to tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-010.html b/tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-010.html rename to tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-011.html b/tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-container-fragmentation-011.html rename to tests/wpt/tests/css/css-break/flexbox/flex-container-fragmentation-011.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-fragmented-with-float-descendant-001-ref.html b/tests/wpt/tests/css/css-break/flexbox/flex-fragmented-with-float-descendant-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-fragmented-with-float-descendant-001-ref.html rename to tests/wpt/tests/css/css-break/flexbox/flex-fragmented-with-float-descendant-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-fragmented-with-float-descendant-001.html b/tests/wpt/tests/css/css-break/flexbox/flex-fragmented-with-float-descendant-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-fragmented-with-float-descendant-001.html rename to tests/wpt/tests/css/css-break/flexbox/flex-fragmented-with-float-descendant-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-item-content-overflow-001-ref.html b/tests/wpt/tests/css/css-break/flexbox/flex-item-content-overflow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-item-content-overflow-001-ref.html rename to tests/wpt/tests/css/css-break/flexbox/flex-item-content-overflow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-item-content-overflow-001a.html b/tests/wpt/tests/css/css-break/flexbox/flex-item-content-overflow-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-item-content-overflow-001a.html rename to tests/wpt/tests/css/css-break/flexbox/flex-item-content-overflow-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-item-content-overflow-001b.html b/tests/wpt/tests/css/css-break/flexbox/flex-item-content-overflow-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-item-content-overflow-001b.html rename to tests/wpt/tests/css/css-break/flexbox/flex-item-content-overflow-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-item-content-overflow-002a.html b/tests/wpt/tests/css/css-break/flexbox/flex-item-content-overflow-002a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-item-content-overflow-002a.html rename to tests/wpt/tests/css/css-break/flexbox/flex-item-content-overflow-002a.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-item-content-overflow-002b.html b/tests/wpt/tests/css/css-break/flexbox/flex-item-content-overflow-002b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-item-content-overflow-002b.html rename to tests/wpt/tests/css/css-break/flexbox/flex-item-content-overflow-002b.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flex-item-content-overflow-003.html b/tests/wpt/tests/css/css-break/flexbox/flex-item-content-overflow-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flex-item-content-overflow-003.html rename to tests/wpt/tests/css/css-break/flexbox/flex-item-content-overflow-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/flexbox-fragmentation-layout-001-crash.html b/tests/wpt/tests/css/css-break/flexbox/flexbox-fragmentation-layout-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/flexbox-fragmentation-layout-001-crash.html rename to tests/wpt/tests/css/css-break/flexbox/flexbox-fragmentation-layout-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/float-in-webkit-box-in-multicol-crash.html b/tests/wpt/tests/css/css-break/flexbox/float-in-webkit-box-in-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/float-in-webkit-box-in-multicol-crash.html rename to tests/wpt/tests/css/css-break/flexbox/float-in-webkit-box-in-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/image-in-fragmented-flexbox-crash-001.html b/tests/wpt/tests/css/css-break/flexbox/image-in-fragmented-flexbox-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/image-in-fragmented-flexbox-crash-001.html rename to tests/wpt/tests/css/css-break/flexbox/image-in-fragmented-flexbox-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/image-in-fragmented-flexbox-crash-002.html b/tests/wpt/tests/css/css-break/flexbox/image-in-fragmented-flexbox-crash-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/image-in-fragmented-flexbox-crash-002.html rename to tests/wpt/tests/css/css-break/flexbox/image-in-fragmented-flexbox-crash-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/increase-fragmentainer-size-flex-item-trailing-margin.html b/tests/wpt/tests/css/css-break/flexbox/increase-fragmentainer-size-flex-item-trailing-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/increase-fragmentainer-size-flex-item-trailing-margin.html rename to tests/wpt/tests/css/css-break/flexbox/increase-fragmentainer-size-flex-item-trailing-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/monolithic-item-in-fragmented-flexbox-crash.html b/tests/wpt/tests/css/css-break/flexbox/monolithic-item-in-fragmented-flexbox-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/monolithic-item-in-fragmented-flexbox-crash.html rename to tests/wpt/tests/css/css-break/flexbox/monolithic-item-in-fragmented-flexbox-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/monolithic-overflow-001.tentative.html b/tests/wpt/tests/css/css-break/flexbox/monolithic-overflow-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/monolithic-overflow-001.tentative.html rename to tests/wpt/tests/css/css-break/flexbox/monolithic-overflow-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/monolithic-overflow-002.tentative.html b/tests/wpt/tests/css/css-break/flexbox/monolithic-overflow-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/monolithic-overflow-002.tentative.html rename to tests/wpt/tests/css/css-break/flexbox/monolithic-overflow-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/monolithic-overflow-003.tentative.html b/tests/wpt/tests/css/css-break/flexbox/monolithic-overflow-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/monolithic-overflow-003.tentative.html rename to tests/wpt/tests/css/css-break/flexbox/monolithic-overflow-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/monolithic-overflow-004.tentative.html b/tests/wpt/tests/css/css-break/flexbox/monolithic-overflow-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/monolithic-overflow-004.tentative.html rename to tests/wpt/tests/css/css-break/flexbox/monolithic-overflow-004.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-001.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-001.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-002.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-002.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-003.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-003.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-004.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-004.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-005.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-005.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-006.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-006.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-007.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-007.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-008.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-008.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-009.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-009.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-010.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-010.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-011.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-011.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-011.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-012.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-012.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-012.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-013.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-013.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-013.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-014.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-014.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-014.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-015.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-015.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-015.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-016.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-016.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-016.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-017.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-017.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-017.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-018.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-018.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-018.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-019.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-019.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-019.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-020.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-020.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-020.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-021.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-021.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-021.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-022.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-022.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-022.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-023.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-023.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-023.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-024.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-024.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-024.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-025.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-025.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-025.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-026.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-026.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-026.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-027.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-027.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-027.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-028.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-028.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-028.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-029.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-029.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-029.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-030.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-030.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-030.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-031.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-031.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-031.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-032.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-032.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-032.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-033.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-033.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-033.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-034.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-034.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-034.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-035.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-035.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-035.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-036.tentative.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-036.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-036.tentative.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-036.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-037.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-037.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-037.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-038.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-038.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-038.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-039.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-039.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-039.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-040.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-040.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-040.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-041-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-041-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-041-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-041-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-041.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-041.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-041.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-042-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-042-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-042-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-042-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-042.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-042.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-042.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-043-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-043-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-043-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-043-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-043.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-043.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-043.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-044-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-044-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-044-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-044-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-044.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-044.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-044.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-045.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-045.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-045.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-046.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-046.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-046.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-047.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-047.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-047.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-048.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-048.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-048.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-049.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-049.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-049.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-050.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-050.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-050.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-051.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-051.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-051.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-052.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-052.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-052.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-053.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-053.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-053.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-053.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-001.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-001.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-002.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-002.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-003.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-003.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-004.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-004.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-005.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-005.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-006.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-006.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-007.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-007.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-008.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-008.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-009.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-009.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-010.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-010.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-011.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-011.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-011.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-012.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-012.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-012.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-013.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-013.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-013.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-014.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-014.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-014.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-015.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-015.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-015.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-016.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-016.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-016.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-017.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-017.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-017.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-018.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-018.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-018.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-019.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-019.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-019.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-020.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-020.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-020.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-021.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-021.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-021.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-022.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-022.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-022.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-023.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-023.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-023.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-024.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-024.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-024.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-025.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-025.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-025.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-026.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-026.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-026.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-027.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-027.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-027.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-028.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-028.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-028.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-029.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-029.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-029.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-030.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-030.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-030.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-031.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-031.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-031.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-032.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-032.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-032.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-033.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-033.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-033.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-034.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-034.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-034.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-035.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-035.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-035.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-036.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-036.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-036.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-037.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-037.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-037.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-038.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-038.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-038.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-039.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-039.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-039.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-040.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-040.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-040.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-041.tentative.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-041.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-041.tentative.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-041.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-042.tentative.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-042.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-042.tentative.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-042.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-043.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-043.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-043.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-044.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-044.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-044.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-045.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-045.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-045.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-046.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-046.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-046.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-047-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-047-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-047-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-047-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-047.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-047.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-047.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-048-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-048-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-048-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-048-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-048.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-048.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-048.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-049-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-049-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-049-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-049-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-049.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-049.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-049.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-050-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-050-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-050-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-050-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-050.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-050.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-050.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-051.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-051.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-051.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-052.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-052.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-052.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-053.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-053.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-053.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-053.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-054.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-054.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-054.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-054.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-055.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-055.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-055.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-055.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-056.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-056.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-056.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-056.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-057.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-057.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-057.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-057.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-058.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-058.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-058.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-058.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-059.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-059.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-059.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-059.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-060.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-060.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-060.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-060.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-061.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-061.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-061.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-061.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-062.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-062.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-062.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-062.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-063-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-064-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-065-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-065-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-065-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-065-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-065.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-065.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-065.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-065.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-066.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-066.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-066.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-066.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-067-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-067-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-067-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-067-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-067.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-067.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-067.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-067.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-068-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-068-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-068-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-068-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-068.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-068.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-068.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-068.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-069-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-069-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-069-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-069-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-069.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-069.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-069.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-069.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-070-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-070-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-070-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-070-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-070.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-070.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-070.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-070.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-071-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-071-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-071-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-071-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-071.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-071.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-071.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-071.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-072.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-072.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-072.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-072.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-073.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-073.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-073.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-073.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-074.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-074.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-074.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-074.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-075-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print-ref.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print.html rename to tests/wpt/tests/css/css-break/flexbox/multi-line-row-flex-fragmentation-076-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/nested-flex-item-expansion-in-mulicol.html b/tests/wpt/tests/css/css-break/flexbox/nested-flex-item-expansion-in-mulicol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/nested-flex-item-expansion-in-mulicol.html rename to tests/wpt/tests/css/css-break/flexbox/nested-flex-item-expansion-in-mulicol.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/quirks-flex-in-multicol-crash.html b/tests/wpt/tests/css/css-break/flexbox/quirks-flex-in-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/quirks-flex-in-multicol-crash.html rename to tests/wpt/tests/css/css-break/flexbox/quirks-flex-in-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-001.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-001.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-002.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-002.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-003.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-003.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-004.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-004.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-005.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-005.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-006.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-006.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-007.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-007.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-008.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-008.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-009.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-009.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-010.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-010.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-011.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-011.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-011.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-012.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-012.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-012.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-013.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-013.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-013.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-014.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-014.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-014.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-015.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-015.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-015.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-016.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-016.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-016.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-017.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-017.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-017.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-018.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-018.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-018.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-019.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-019.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-019.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-020.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-020.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-020.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-021.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-021.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-021.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-022.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-022.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-022.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-023.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-023.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-023.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-024.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-024.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-024.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-025.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-025.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-025.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-026.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-026.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-026.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-027.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-027.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-027.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-028.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-028.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-028.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-029.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-029.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-029.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-030.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-030.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-030.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-031.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-031.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-031.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-032.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-032.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-032.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-033.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-033.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-033.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-034.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-034.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-034.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-035.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-035.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-035.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-036.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-036.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-036.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-037.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-037.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-037.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-038.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-038.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-038.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-039.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-039.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-039.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-040-ref.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-040-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-040-ref.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-040-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-040.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-040.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-040.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-041.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-041.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-041.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-042.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-042.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-042.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-043.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-043.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-043.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-044.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-044.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-044.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-045.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-045.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-045.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-046.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-046.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-046.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-047.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-047.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-047.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-048.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-048.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-048.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-049.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-049.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-049.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-050.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-050.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-050.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-051.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-051.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-051.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-052.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-052.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-052.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-053.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-053.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-053.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-053.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-054.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-054.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-054.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-054.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-055.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-055.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-055.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-055.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-056.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-056.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-056.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-056.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-057.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-057.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-057.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-057.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-058.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-058.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-058.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-058.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-059.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-059.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-059.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-059.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print-ref.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-060-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-061.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-061.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-061.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-061.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-062.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-062.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-062.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-062.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-063.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-063.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-063.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-063.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-064.html b/tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-064.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-column-flex-fragmentation-064.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-column-flex-fragmentation-064.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-001.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-001.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-002.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-002.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-003.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-003.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-004.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-004.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-005.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-005.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-006.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-006.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-007.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-007.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-008.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-008.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-009.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-009.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-010.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-010.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-011.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-011.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-011.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-012.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-012.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-012.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-013.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-013.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-013.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-014.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-014.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-014.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-015.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-015.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-015.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-016.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-016.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-016.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-017.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-017.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-017.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-018.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-018.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-018.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-019.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-019.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-019.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-020.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-020.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-020.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-021.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-021.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-021.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-022.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-022.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-022.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-023.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-023.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-023.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-024.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-024.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-024.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-025.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-025.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-025.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-026.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-026.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-026.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-027-ref.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-027-ref.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-027.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-027.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-027.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-028.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-028.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-028.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-029.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-029.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-029.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-030.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-030.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-030.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-031.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-031.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-031.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-032.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-032.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-032.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-033.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-033.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-033.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-034.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-034.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-034.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-035.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-035.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-035.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-036.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-036.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-036.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-037.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-037.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-037.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-038.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-038.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-038.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-039.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-039.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-039.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-040.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-040.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-040.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-041.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-041.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-041.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print-ref.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print-ref.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-042-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-043.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-043.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-043.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-044-ref.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-044-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-044-ref.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-044-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-044.html b/tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/single-line-row-flex-fragmentation-044.html rename to tests/wpt/tests/css/css-break/flexbox/single-line-row-flex-fragmentation-044.html diff --git a/tests/wpt/web-platform-tests/css/css-break/flexbox/slider-in-multicol-crash.html b/tests/wpt/tests/css/css-break/flexbox/slider-in-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/flexbox/slider-in-multicol-crash.html rename to tests/wpt/tests/css/css-break/flexbox/slider-in-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-000.html b/tests/wpt/tests/css/css-break/float-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-000.html rename to tests/wpt/tests/css/css-break/float-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-001.html b/tests/wpt/tests/css/css-break/float-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-001.html rename to tests/wpt/tests/css/css-break/float-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-002.html b/tests/wpt/tests/css/css-break/float-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-002.html rename to tests/wpt/tests/css/css-break/float-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-003.html b/tests/wpt/tests/css/css-break/float-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-003.html rename to tests/wpt/tests/css/css-break/float-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-004.html b/tests/wpt/tests/css/css-break/float-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-004.html rename to tests/wpt/tests/css/css-break/float-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-005.html b/tests/wpt/tests/css/css-break/float-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-005.html rename to tests/wpt/tests/css/css-break/float-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-006.html b/tests/wpt/tests/css/css-break/float-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-006.html rename to tests/wpt/tests/css/css-break/float-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-007.html b/tests/wpt/tests/css/css-break/float-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-007.html rename to tests/wpt/tests/css/css-break/float-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-008.html b/tests/wpt/tests/css/css-break/float-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-008.html rename to tests/wpt/tests/css/css-break/float-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-009-ref.html b/tests/wpt/tests/css/css-break/float-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-009-ref.html rename to tests/wpt/tests/css/css-break/float-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-009.html b/tests/wpt/tests/css/css-break/float-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-009.html rename to tests/wpt/tests/css/css-break/float-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-010.html b/tests/wpt/tests/css/css-break/float-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-010.html rename to tests/wpt/tests/css/css-break/float-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-011-crash.html b/tests/wpt/tests/css/css-break/float-011-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-011-crash.html rename to tests/wpt/tests/css/css-break/float-011-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-012.html b/tests/wpt/tests/css/css-break/float-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-012.html rename to tests/wpt/tests/css/css-break/float-012.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-after-self-collapsing-block-in-inline-crash.html b/tests/wpt/tests/css/css-break/float-after-self-collapsing-block-in-inline-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-after-self-collapsing-block-in-inline-crash.html rename to tests/wpt/tests/css/css-break/float-after-self-collapsing-block-in-inline-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-in-self-collapsing-block-000.html b/tests/wpt/tests/css/css-break/float-in-self-collapsing-block-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-in-self-collapsing-block-000.html rename to tests/wpt/tests/css/css-break/float-in-self-collapsing-block-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-in-self-collapsing-block-001.html b/tests/wpt/tests/css/css-break/float-in-self-collapsing-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-in-self-collapsing-block-001.html rename to tests/wpt/tests/css/css-break/float-in-self-collapsing-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-inside-small-block.html b/tests/wpt/tests/css/css-break/float-inside-small-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-inside-small-block.html rename to tests/wpt/tests/css/css-break/float-inside-small-block.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-stretching-bfc-000.html b/tests/wpt/tests/css/css-break/float-stretching-bfc-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-stretching-bfc-000.html rename to tests/wpt/tests/css/css-break/float-stretching-bfc-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-stretching-bfc-001.html b/tests/wpt/tests/css/css-break/float-stretching-bfc-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-stretching-bfc-001.html rename to tests/wpt/tests/css/css-break/float-stretching-bfc-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print-ref.html b/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print-ref.html rename to tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print.html b/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print.html rename to tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-001-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print-ref.html b/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print-ref.html rename to tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print.html b/tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print.html rename to tests/wpt/tests/css/css-break/float-with-large-margin-bottom-cross-page-002-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/floated-multicol-in-multicol-crash.html b/tests/wpt/tests/css/css-break/floated-multicol-in-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/floated-multicol-in-multicol-crash.html rename to tests/wpt/tests/css/css-break/floated-multicol-in-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/floats-and-text-narrow-and-short-dynamic-ref.html b/tests/wpt/tests/css/css-break/floats-and-text-narrow-and-short-dynamic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/floats-and-text-narrow-and-short-dynamic-ref.html rename to tests/wpt/tests/css/css-break/floats-and-text-narrow-and-short-dynamic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/floats-and-text-narrow-and-short-dynamic.html b/tests/wpt/tests/css/css-break/floats-and-text-narrow-and-short-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/floats-and-text-narrow-and-short-dynamic.html rename to tests/wpt/tests/css/css-break/floats-and-text-narrow-and-short-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-break/forced-break-at-fragmentainer-start-000.html b/tests/wpt/tests/css/css-break/forced-break-at-fragmentainer-start-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/forced-break-at-fragmentainer-start-000.html rename to tests/wpt/tests/css/css-break/forced-break-at-fragmentainer-start-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/forced-break-at-fragmentainer-start-001.html b/tests/wpt/tests/css/css-break/forced-break-at-fragmentainer-start-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/forced-break-at-fragmentainer-start-001.html rename to tests/wpt/tests/css/css-break/forced-break-at-fragmentainer-start-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/form-control.html b/tests/wpt/tests/css/css-break/form-control.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/form-control.html rename to tests/wpt/tests/css/css-break/form-control.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fragmentainer-1px-clamping-000-crash.html b/tests/wpt/tests/css/css-break/fragmentainer-1px-clamping-000-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fragmentainer-1px-clamping-000-crash.html rename to tests/wpt/tests/css/css-break/fragmentainer-1px-clamping-000-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fragmentainer-1px-clamping-001-crash.html b/tests/wpt/tests/css/css-break/fragmentainer-1px-clamping-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fragmentainer-1px-clamping-001-crash.html rename to tests/wpt/tests/css/css-break/fragmentainer-1px-clamping-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fragmented-autowidth-fc-root-beside-floats-ref.html b/tests/wpt/tests/css/css-break/fragmented-autowidth-fc-root-beside-floats-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fragmented-autowidth-fc-root-beside-floats-ref.html rename to tests/wpt/tests/css/css-break/fragmented-autowidth-fc-root-beside-floats-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fragmented-autowidth-fc-root-beside-floats.html b/tests/wpt/tests/css/css-break/fragmented-autowidth-fc-root-beside-floats.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fragmented-autowidth-fc-root-beside-floats.html rename to tests/wpt/tests/css/css-break/fragmented-autowidth-fc-root-beside-floats.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fragmented-empty-contenteditable-crash.html b/tests/wpt/tests/css/css-break/fragmented-empty-contenteditable-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fragmented-empty-contenteditable-crash.html rename to tests/wpt/tests/css/css-break/fragmented-empty-contenteditable-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fragmented-float-in-inline-crash.html b/tests/wpt/tests/css/css-break/fragmented-float-in-inline-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fragmented-float-in-inline-crash.html rename to tests/wpt/tests/css/css-break/fragmented-float-in-inline-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fragmented-float-overflowing-container.html b/tests/wpt/tests/css/css-break/fragmented-float-overflowing-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fragmented-float-overflowing-container.html rename to tests/wpt/tests/css/css-break/fragmented-float-overflowing-container.html diff --git a/tests/wpt/web-platform-tests/css/css-break/fragmented-oof-in-inline-crash.html b/tests/wpt/tests/css/css-break/fragmented-oof-in-inline-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/fragmented-oof-in-inline-crash.html rename to tests/wpt/tests/css/css-break/fragmented-oof-in-inline-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-001.html b/tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-001.html rename to tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-002.html b/tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-002.html rename to tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-003.html b/tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-003.html rename to tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-004.html b/tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-004.html rename to tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-005.html b/tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-005.html rename to tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-006.html b/tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-006.html rename to tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-007.html b/tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-007.html rename to tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-008.html b/tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-008.html rename to tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-009.html b/tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-009.html rename to tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-010.html b/tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-010.html rename to tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-011.html b/tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-container-fragmentation-011.html rename to tests/wpt/tests/css/css-break/grid/grid-container-fragmentation-011.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-008.html b/tests/wpt/tests/css/css-break/grid/grid-item-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-008.html rename to tests/wpt/tests/css/css-break/grid/grid-item-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-009.html b/tests/wpt/tests/css/css-break/grid/grid-item-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-009.html rename to tests/wpt/tests/css/css-break/grid/grid-item-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-001.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-001.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-002.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-002.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-003.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-003.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-004.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-004.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-005.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-005.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-006.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-006.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-007.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-007.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-008.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-008.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-009.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-009.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-010.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-010.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-011.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-011.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-011.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-012.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-012.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-012.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-013.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-013.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-013.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-014.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-014.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-014.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-015.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-015.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-015.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-016.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-016.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-016.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-017.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-017.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-017.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-018.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-018.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-018.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-019.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-019.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-019.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-020.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-020.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-020.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-021.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-021.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-021.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-022.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-022.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-022.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-023.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-023.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-023.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-024.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-024.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-024.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-025.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-025.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-025.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-026.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-026.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-026.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-027.tentative.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-027.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-027.tentative.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-027.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-028.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-028.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-028.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-029.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-029.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-029.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-030.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-030.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-030.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-031.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-031.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-031.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-032.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-032.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-032.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-033.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-033.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-033.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-034.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-034.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-034.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-035.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-035.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-035.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-036.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-036.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-036.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-037.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-037.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-037.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-038.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-038.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-038.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-039.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-039.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-039.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-040.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-040.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-040.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-041.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-041.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-041.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-042.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-042.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-042.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-043.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-043.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-043.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-044.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-044.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-044.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-045.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-045.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-045.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-046.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-046.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-046.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-047.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-047.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-047.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-048.html b/tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-fragmentation-048.html rename to tests/wpt/tests/css/css-break/grid/grid-item-fragmentation-048.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-infinite-expansion.html b/tests/wpt/tests/css/css-break/grid/grid-item-infinite-expansion.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-infinite-expansion.html rename to tests/wpt/tests/css/css-break/grid/grid-item-infinite-expansion.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-001.html b/tests/wpt/tests/css/css-break/grid/grid-item-oof-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-001.html rename to tests/wpt/tests/css/css-break/grid/grid-item-oof-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-002.html b/tests/wpt/tests/css/css-break/grid/grid-item-oof-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-002.html rename to tests/wpt/tests/css/css-break/grid/grid-item-oof-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-003.html b/tests/wpt/tests/css/css-break/grid/grid-item-oof-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-003.html rename to tests/wpt/tests/css/css-break/grid/grid-item-oof-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-004.html b/tests/wpt/tests/css/css-break/grid/grid-item-oof-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-004.html rename to tests/wpt/tests/css/css-break/grid/grid-item-oof-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-005.html b/tests/wpt/tests/css/css-break/grid/grid-item-oof-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-005.html rename to tests/wpt/tests/css/css-break/grid/grid-item-oof-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-006.html b/tests/wpt/tests/css/css-break/grid/grid-item-oof-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-006.html rename to tests/wpt/tests/css/css-break/grid/grid-item-oof-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-007.html b/tests/wpt/tests/css/css-break/grid/grid-item-oof-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-007.html rename to tests/wpt/tests/css/css-break/grid/grid-item-oof-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-008.html b/tests/wpt/tests/css/css-break/grid/grid-item-oof-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-008.html rename to tests/wpt/tests/css/css-break/grid/grid-item-oof-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-009.html b/tests/wpt/tests/css/css-break/grid/grid-item-oof-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-009.html rename to tests/wpt/tests/css/css-break/grid/grid-item-oof-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-010.html b/tests/wpt/tests/css/css-break/grid/grid-item-oof-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-010.html rename to tests/wpt/tests/css/css-break/grid/grid-item-oof-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-011.html b/tests/wpt/tests/css/css-break/grid/grid-item-oof-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-011.html rename to tests/wpt/tests/css/css-break/grid/grid-item-oof-011.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-crash.html b/tests/wpt/tests/css/css-break/grid/grid-item-oof-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-oof-crash.html rename to tests/wpt/tests/css/css-break/grid/grid-item-oof-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-overflow-001.html b/tests/wpt/tests/css/css-break/grid/grid-item-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-overflow-001.html rename to tests/wpt/tests/css/css-break/grid/grid-item-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-placement-crash-multiple.html b/tests/wpt/tests/css/css-break/grid/grid-item-placement-crash-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-placement-crash-multiple.html rename to tests/wpt/tests/css/css-break/grid/grid-item-placement-crash-multiple.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-item-placement-crash.html b/tests/wpt/tests/css/css-break/grid/grid-item-placement-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-item-placement-crash.html rename to tests/wpt/tests/css/css-break/grid/grid-item-placement-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-large-end-border-crash.html b/tests/wpt/tests/css/css-break/grid/grid-large-end-border-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-large-end-border-crash.html rename to tests/wpt/tests/css/css-break/grid/grid-large-end-border-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/grid-nested-columns-crash.html b/tests/wpt/tests/css/css-break/grid/grid-nested-columns-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/grid-nested-columns-crash.html rename to tests/wpt/tests/css/css-break/grid/grid-nested-columns-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-001.tentative.html b/tests/wpt/tests/css/css-break/grid/monolithic-overflow-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-001.tentative.html rename to tests/wpt/tests/css/css-break/grid/monolithic-overflow-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-002.tentative.html b/tests/wpt/tests/css/css-break/grid/monolithic-overflow-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-002.tentative.html rename to tests/wpt/tests/css/css-break/grid/monolithic-overflow-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-003.tentative.html b/tests/wpt/tests/css/css-break/grid/monolithic-overflow-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-003.tentative.html rename to tests/wpt/tests/css/css-break/grid/monolithic-overflow-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-004.tentative.html b/tests/wpt/tests/css/css-break/grid/monolithic-overflow-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-004.tentative.html rename to tests/wpt/tests/css/css-break/grid/monolithic-overflow-004.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-005.html b/tests/wpt/tests/css/css-break/grid/monolithic-overflow-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-005.html rename to tests/wpt/tests/css/css-break/grid/monolithic-overflow-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-006.html b/tests/wpt/tests/css/css-break/grid/monolithic-overflow-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-006.html rename to tests/wpt/tests/css/css-break/grid/monolithic-overflow-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-007.html b/tests/wpt/tests/css/css-break/grid/monolithic-overflow-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-007.html rename to tests/wpt/tests/css/css-break/grid/monolithic-overflow-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-008.html b/tests/wpt/tests/css/css-break/grid/monolithic-overflow-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-008.html rename to tests/wpt/tests/css/css-break/grid/monolithic-overflow-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-009.html b/tests/wpt/tests/css/css-break/grid/monolithic-overflow-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/grid/monolithic-overflow-009.html rename to tests/wpt/tests/css/css-break/grid/monolithic-overflow-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/hit-test-hidden-overflow.html b/tests/wpt/tests/css/css-break/hit-test-hidden-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/hit-test-hidden-overflow.html rename to tests/wpt/tests/css/css-break/hit-test-hidden-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-break/hit-test-inline-fragmentation-with-border-radius.html b/tests/wpt/tests/css/css-break/hit-test-inline-fragmentation-with-border-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/hit-test-inline-fragmentation-with-border-radius.html rename to tests/wpt/tests/css/css-break/hit-test-inline-fragmentation-with-border-radius.html diff --git a/tests/wpt/web-platform-tests/css/css-break/hit-test-transformed-inline.html b/tests/wpt/tests/css/css-break/hit-test-transformed-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/hit-test-transformed-inline.html rename to tests/wpt/tests/css/css-break/hit-test-transformed-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-break/hit-test-transformed.html b/tests/wpt/tests/css/css-break/hit-test-transformed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/hit-test-transformed.html rename to tests/wpt/tests/css/css-break/hit-test-transformed.html diff --git a/tests/wpt/web-platform-tests/css/css-break/iframe-in-repeated-table-header-crash.html b/tests/wpt/tests/css/css-break/iframe-in-repeated-table-header-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/iframe-in-repeated-table-header-crash.html rename to tests/wpt/tests/css/css-break/iframe-in-repeated-table-header-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/increase-fragmentainer-size-tall-border.html b/tests/wpt/tests/css/css-break/increase-fragmentainer-size-tall-border.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/increase-fragmentainer-size-tall-border.html rename to tests/wpt/tests/css/css-break/increase-fragmentainer-size-tall-border.html diff --git a/tests/wpt/web-platform-tests/css/css-break/inheritance.html b/tests/wpt/tests/css/css-break/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/inheritance.html rename to tests/wpt/tests/css/css-break/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-break/ink-overflow-001-print.html b/tests/wpt/tests/css/css-break/ink-overflow-001-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/ink-overflow-001-print.html rename to tests/wpt/tests/css/css-break/ink-overflow-001-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/ink-overflow-002.html b/tests/wpt/tests/css/css-break/ink-overflow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/ink-overflow-002.html rename to tests/wpt/tests/css/css-break/ink-overflow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/large-text-node-oof-crash.html b/tests/wpt/tests/css/css-break/large-text-node-oof-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/large-text-node-oof-crash.html rename to tests/wpt/tests/css/css-break/large-text-node-oof-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/line-after-unbreakable-float-after-padding-ref.html b/tests/wpt/tests/css/css-break/line-after-unbreakable-float-after-padding-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/line-after-unbreakable-float-after-padding-ref.html rename to tests/wpt/tests/css/css-break/line-after-unbreakable-float-after-padding-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/line-after-unbreakable-float-after-padding.html b/tests/wpt/tests/css/css-break/line-after-unbreakable-float-after-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/line-after-unbreakable-float-after-padding.html rename to tests/wpt/tests/css/css-break/line-after-unbreakable-float-after-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-break/line-and-fragmentainer-break-before-float-crash.html b/tests/wpt/tests/css/css-break/line-and-fragmentainer-break-before-float-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/line-and-fragmentainer-break-before-float-crash.html rename to tests/wpt/tests/css/css-break/line-and-fragmentainer-break-before-float-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/line-pushed-by-float-000.html b/tests/wpt/tests/css/css-break/line-pushed-by-float-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/line-pushed-by-float-000.html rename to tests/wpt/tests/css/css-break/line-pushed-by-float-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/line-pushed-by-float-001.html b/tests/wpt/tests/css/css-break/line-pushed-by-float-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/line-pushed-by-float-001.html rename to tests/wpt/tests/css/css-break/line-pushed-by-float-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/margin-after-overflowed-block.html b/tests/wpt/tests/css/css-break/margin-after-overflowed-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/margin-after-overflowed-block.html rename to tests/wpt/tests/css/css-break/margin-after-overflowed-block.html diff --git a/tests/wpt/web-platform-tests/css/css-break/max-height-with-margin-pushed-below-fragmentation-line-crash.html b/tests/wpt/tests/css/css-break/max-height-with-margin-pushed-below-fragmentation-line-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/max-height-with-margin-pushed-below-fragmentation-line-crash.html rename to tests/wpt/tests/css/css-break/max-height-with-margin-pushed-below-fragmentation-line-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/monolithic-content-with-forced-break-001.html b/tests/wpt/tests/css/css-break/monolithic-content-with-forced-break-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/monolithic-content-with-forced-break-001.html rename to tests/wpt/tests/css/css-break/monolithic-content-with-forced-break-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/monolithic-content-with-forced-break-002.html b/tests/wpt/tests/css/css-break/monolithic-content-with-forced-break-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/monolithic-content-with-forced-break-002.html rename to tests/wpt/tests/css/css-break/monolithic-content-with-forced-break-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/monolithic-content-with-forced-break-003.html b/tests/wpt/tests/css/css-break/monolithic-content-with-forced-break-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/monolithic-content-with-forced-break-003.html rename to tests/wpt/tests/css/css-break/monolithic-content-with-forced-break-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/monolithic-overflow-001.tentative.html b/tests/wpt/tests/css/css-break/monolithic-overflow-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/monolithic-overflow-001.tentative.html rename to tests/wpt/tests/css/css-break/monolithic-overflow-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/monolithic-overflow-002.tentative.html b/tests/wpt/tests/css/css-break/monolithic-overflow-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/monolithic-overflow-002.tentative.html rename to tests/wpt/tests/css/css-break/monolithic-overflow-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/monolithic-overflow-003.tentative.html b/tests/wpt/tests/css/css-break/monolithic-overflow-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/monolithic-overflow-003.tentative.html rename to tests/wpt/tests/css/css-break/monolithic-overflow-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/monolithic-overflow-004.tentative.html b/tests/wpt/tests/css/css-break/monolithic-overflow-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/monolithic-overflow-004.tentative.html rename to tests/wpt/tests/css/css-break/monolithic-overflow-004.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/monolithic-overflow-005.tentative.html b/tests/wpt/tests/css/css-break/monolithic-overflow-005.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/monolithic-overflow-005.tentative.html rename to tests/wpt/tests/css/css-break/monolithic-overflow-005.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/monolithic-overflow-006.tentative.html b/tests/wpt/tests/css/css-break/monolithic-overflow-006.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/monolithic-overflow-006.tentative.html rename to tests/wpt/tests/css/css-break/monolithic-overflow-006.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/monolithic-with-overflow-lr.html b/tests/wpt/tests/css/css-break/monolithic-with-overflow-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/monolithic-with-overflow-lr.html rename to tests/wpt/tests/css/css-break/monolithic-with-overflow-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-break/monolithic-with-overflow-rl.html b/tests/wpt/tests/css/css-break/monolithic-with-overflow-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/monolithic-with-overflow-rl.html rename to tests/wpt/tests/css/css-break/monolithic-with-overflow-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-break/monolithic-with-overflow.html b/tests/wpt/tests/css/css-break/monolithic-with-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/monolithic-with-overflow.html rename to tests/wpt/tests/css/css-break/monolithic-with-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-break/nested-fixedpos-in-inline-crash-000.html b/tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-crash-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/nested-fixedpos-in-inline-crash-000.html rename to tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-crash-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/nested-fixedpos-in-inline-crash-001.html b/tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/nested-fixedpos-in-inline-crash-001.html rename to tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/nested-fixedpos-in-inline-crash-002.html b/tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-crash-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/nested-fixedpos-in-inline-crash-002.html rename to tests/wpt/tests/css/css-break/nested-fixedpos-in-inline-crash-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/nested-float-in-multicol-crash.html b/tests/wpt/tests/css/css-break/nested-float-in-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/nested-float-in-multicol-crash.html rename to tests/wpt/tests/css/css-break/nested-float-in-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-001.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-001.html rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-002.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-002.html rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-003.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-003.html rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-004.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-004.html rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-005.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-005.html rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-006.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-006.html rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-007.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-007.html rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-008.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-008.html rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanner-and-oof-crash-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanners-and-oofs-crash.html b/tests/wpt/tests/css/css-break/nested-multicol-with-spanners-and-oofs-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/nested-multicol-with-spanners-and-oofs-crash.html rename to tests/wpt/tests/css/css-break/nested-multicol-with-spanners-and-oofs-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/nested-oof-in-multicol-crash.html b/tests/wpt/tests/css/css-break/nested-oof-in-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/nested-oof-in-multicol-crash.html rename to tests/wpt/tests/css/css-break/nested-oof-in-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/no-room-for-line-in-first-fragmentainer-crash.html b/tests/wpt/tests/css/css-break/no-room-for-line-in-first-fragmentainer-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/no-room-for-line-in-first-fragmentainer-crash.html rename to tests/wpt/tests/css/css-break/no-room-for-line-in-first-fragmentainer-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/offset-top-block-in-inline.html b/tests/wpt/tests/css/css-break/offset-top-block-in-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/offset-top-block-in-inline.html rename to tests/wpt/tests/css/css-break/offset-top-block-in-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-break/orphans-in-parallel-flow.html b/tests/wpt/tests/css/css-break/orphans-in-parallel-flow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/orphans-in-parallel-flow.html rename to tests/wpt/tests/css/css-break/orphans-in-parallel-flow.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-inline-with-negative-offset-crash.html b/tests/wpt/tests/css/css-break/out-of-flow-in-inline-with-negative-offset-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-inline-with-negative-offset-crash.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-inline-with-negative-offset-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-001-ref.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-001-ref.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-001.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-001.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-002.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-002.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-003.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-003.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004-ref.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004-ref.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-005.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-005.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-006.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-006.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-007.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-007.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-008.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-008.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-009.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-009.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-010.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-010.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-011.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-011.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-011.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-012.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-012.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-012.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-013.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-013.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-013.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-014-ref.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-014-ref.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-014.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-014.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-014.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-015.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-015.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-015.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-016.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-016.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-016.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-017.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-017.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-017.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-018.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-018.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-018.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-019-ref.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-019-ref.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-019.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-019.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-019.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-020.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-020.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-020.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-021.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-021.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-021.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-022.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-022.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-022.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-023.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-023.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-023.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-024.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-024.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-024.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-025.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-025.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-025.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-026.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-026.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-026.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-027.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-027.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-027.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-028.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-028.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-028.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-029.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-029.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-029.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-030.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-030.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-030.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-031.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-031.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-031.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-032.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-032.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-032.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-033.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-033.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-033.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-034.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-034.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-034.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-035.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-035.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-035.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-036.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-036.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-036.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-037.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-037.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-037.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-038.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-038.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-038.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-039.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-039.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-039.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-040.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-040.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-040.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-041.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-041.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-041.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-042.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-042.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-042.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-043.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-043.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-043.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-044.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-044.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-044.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-045.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-045.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-045.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-046.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-046.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-046.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-047.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-047.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-047.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-048.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-048.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-048.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-049.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-049.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-049.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-050.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-050.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-050.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-051.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-051.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-051.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-052.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-052.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-052.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-053.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-053.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-053.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-053.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-054.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-054.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-054.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-054.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-055.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-055.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-055.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-055.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-056.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-056.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-056.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-056.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-057.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-057.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-057.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-057.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-058.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-058.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-058.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-058.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-059.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-059.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-059.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-059.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-060.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-060.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-060.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-060.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-061.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-061.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-061.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-061.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-062.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-062.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-062.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-062.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-063.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-063.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-063.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-063.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-064.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-064.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-064.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-064.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-065.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-065.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-065.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-065.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-066.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-066.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-066.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-066.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-067.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-067.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-067.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-067.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-068.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-068.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-068.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-068.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-069.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-069.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-069.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-069.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-070.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-070.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-070.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-070.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-071.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-071.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-071.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-071.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-072.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-072.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-072.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-072.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-073.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-073.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-073.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-073.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-074.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-074.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-074.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-074.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-075.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-075.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-075.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-075.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-076.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-076.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-076.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-076.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-077.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-077.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-077.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-077.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-078.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-078.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-078.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-078.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-079.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-079.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-079.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-079.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-080.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-080.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-080.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-080.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-081.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-081.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-081.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-081.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-082.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-082.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-082.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-082.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-083.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-083.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-083.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-083.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-084.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-084.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-084.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-084.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-085.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-085.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-085.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-085.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-086.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-086.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-086.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-086.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-087.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-087.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-087.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-087.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-088.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-088.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-088.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-088.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-089.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-089.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-089.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-089.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-090.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-090.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-090.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-090.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-091.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-091.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-091.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-091.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-092.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-092.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-092.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-092.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-093-ref.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-093-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-093-ref.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-093-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-093.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-093.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-093.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-093.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-094.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-094.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-094.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-094.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-095.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-095.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-095.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-095.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-096.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-096.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-096.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-096.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-097.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-097.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-097.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-097.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-098.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-098.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-098.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-098.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-099.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-099.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-099.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-099.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-100.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-100.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-100.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-100.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-101.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-101.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-101.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-101.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-102.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-102.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-102.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-102.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-103.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-103.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-103.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-103.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-104.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-104.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-104.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-104.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-105-ref.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-105-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-105-ref.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-105-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-105.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-105.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-105.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-105.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-106-ref.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-106-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-106-ref.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-106-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-106.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-106.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-106.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-106.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-107.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-107.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-107.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-107.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-108.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-108.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-108.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-108.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-109.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-109.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-109.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-109.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-110.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-110.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-110.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-110.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-111.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-111.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-111.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-111.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-112.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-112.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-112.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-112.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-113.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-113.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-113.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-113.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-114.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-114.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-114.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-114.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-115.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-115.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-115.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-115.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-116.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-116.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-116.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-116.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-crash.html b/tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-crash.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-multicolumn-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-nested-spanner-multicol-crash.html b/tests/wpt/tests/css/css-break/out-of-flow-in-nested-spanner-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-nested-spanner-multicol-crash.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-nested-spanner-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-new-column-crash.html b/tests/wpt/tests/css/css-break/out-of-flow-in-new-column-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-new-column-crash.html rename to tests/wpt/tests/css/css-break/out-of-flow-in-new-column-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-with-negative-offset-crash.html b/tests/wpt/tests/css/css-break/out-of-flow-with-negative-offset-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-with-negative-offset-crash.html rename to tests/wpt/tests/css/css-break/out-of-flow-with-negative-offset-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-auto-height-with-bottom-padding-crash.html b/tests/wpt/tests/css/css-break/overflow-auto-height-with-bottom-padding-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-auto-height-with-bottom-padding-crash.html rename to tests/wpt/tests/css/css-break/overflow-auto-height-with-bottom-padding-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-000.html b/tests/wpt/tests/css/css-break/overflow-clip-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-000.html rename to tests/wpt/tests/css/css-break/overflow-clip-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-001.html b/tests/wpt/tests/css/css-break/overflow-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-001.html rename to tests/wpt/tests/css/css-break/overflow-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-002.html b/tests/wpt/tests/css/css-break/overflow-clip-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-002.html rename to tests/wpt/tests/css/css-break/overflow-clip-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-003.html b/tests/wpt/tests/css/css-break/overflow-clip-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-003.html rename to tests/wpt/tests/css/css-break/overflow-clip-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-004.html b/tests/wpt/tests/css/css-break/overflow-clip-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-004.html rename to tests/wpt/tests/css/css-break/overflow-clip-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-005.html b/tests/wpt/tests/css/css-break/overflow-clip-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-005.html rename to tests/wpt/tests/css/css-break/overflow-clip-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-006.html b/tests/wpt/tests/css/css-break/overflow-clip-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-006.html rename to tests/wpt/tests/css/css-break/overflow-clip-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-007.html b/tests/wpt/tests/css/css-break/overflow-clip-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-007.html rename to tests/wpt/tests/css/css-break/overflow-clip-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-008.html b/tests/wpt/tests/css/css-break/overflow-clip-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-008.html rename to tests/wpt/tests/css/css-break/overflow-clip-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-009.html b/tests/wpt/tests/css/css-break/overflow-clip-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-009.html rename to tests/wpt/tests/css/css-break/overflow-clip-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-010.html b/tests/wpt/tests/css/css-break/overflow-clip-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-010.html rename to tests/wpt/tests/css/css-break/overflow-clip-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-011.html b/tests/wpt/tests/css/css-break/overflow-clip-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-011.html rename to tests/wpt/tests/css/css-break/overflow-clip-011.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-012.html b/tests/wpt/tests/css/css-break/overflow-clip-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-012.html rename to tests/wpt/tests/css/css-break/overflow-clip-012.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-013.html b/tests/wpt/tests/css/css-break/overflow-clip-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-013.html rename to tests/wpt/tests/css/css-break/overflow-clip-013.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-014.html b/tests/wpt/tests/css/css-break/overflow-clip-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-014.html rename to tests/wpt/tests/css/css-break/overflow-clip-014.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-015.html b/tests/wpt/tests/css/css-break/overflow-clip-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-015.html rename to tests/wpt/tests/css/css-break/overflow-clip-015.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-016.html b/tests/wpt/tests/css/css-break/overflow-clip-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-016.html rename to tests/wpt/tests/css/css-break/overflow-clip-016.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflow-clip-017.html b/tests/wpt/tests/css/css-break/overflow-clip-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflow-clip-017.html rename to tests/wpt/tests/css/css-break/overflow-clip-017.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflowed-abs-pos-with-percentage-height-print-ref.html b/tests/wpt/tests/css/css-break/overflowed-abs-pos-with-percentage-height-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflowed-abs-pos-with-percentage-height-print-ref.html rename to tests/wpt/tests/css/css-break/overflowed-abs-pos-with-percentage-height-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflowed-abs-pos-with-percentage-height-print.html b/tests/wpt/tests/css/css-break/overflowed-abs-pos-with-percentage-height-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflowed-abs-pos-with-percentage-height-print.html rename to tests/wpt/tests/css/css-break/overflowed-abs-pos-with-percentage-height-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflowed-block-with-no-room-after-000.html b/tests/wpt/tests/css/css-break/overflowed-block-with-no-room-after-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflowed-block-with-no-room-after-000.html rename to tests/wpt/tests/css/css-break/overflowed-block-with-no-room-after-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflowed-block-with-no-room-after-001.html b/tests/wpt/tests/css/css-break/overflowed-block-with-no-room-after-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflowed-block-with-no-room-after-001.html rename to tests/wpt/tests/css/css-break/overflowed-block-with-no-room-after-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflowed-block-with-room-after-000.html b/tests/wpt/tests/css/css-break/overflowed-block-with-room-after-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflowed-block-with-room-after-000.html rename to tests/wpt/tests/css/css-break/overflowed-block-with-room-after-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflowed-block-with-room-after-001.html b/tests/wpt/tests/css/css-break/overflowed-block-with-room-after-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflowed-block-with-room-after-001.html rename to tests/wpt/tests/css/css-break/overflowed-block-with-room-after-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflowed-block-with-room-after-002.html b/tests/wpt/tests/css/css-break/overflowed-block-with-room-after-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflowed-block-with-room-after-002.html rename to tests/wpt/tests/css/css-break/overflowed-block-with-room-after-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflowed-block-with-room-after-003.html b/tests/wpt/tests/css/css-break/overflowed-block-with-room-after-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflowed-block-with-room-after-003.html rename to tests/wpt/tests/css/css-break/overflowed-block-with-room-after-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflowed-block-with-room-after-004.html b/tests/wpt/tests/css/css-break/overflowed-block-with-room-after-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflowed-block-with-room-after-004.html rename to tests/wpt/tests/css/css-break/overflowed-block-with-room-after-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflowing-block-print-ref.html b/tests/wpt/tests/css/css-break/overflowing-block-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflowing-block-print-ref.html rename to tests/wpt/tests/css/css-break/overflowing-block-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/overflowing-block-print.html b/tests/wpt/tests/css/css-break/overflowing-block-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/overflowing-block-print.html rename to tests/wpt/tests/css/css-break/overflowing-block-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/page-break-legacy-shorthands.html b/tests/wpt/tests/css/css-break/page-break-legacy-shorthands.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/page-break-legacy-shorthands.html rename to tests/wpt/tests/css/css-break/page-break-legacy-shorthands.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parallel-flow-trailing-margin-001.html b/tests/wpt/tests/css/css-break/parallel-flow-trailing-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parallel-flow-trailing-margin-001.html rename to tests/wpt/tests/css/css-break/parallel-flow-trailing-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parallel-flow-trailing-margin-002.html b/tests/wpt/tests/css/css-break/parallel-flow-trailing-margin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parallel-flow-trailing-margin-002.html rename to tests/wpt/tests/css/css-break/parallel-flow-trailing-margin-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parallel-flow-trailing-margin-003-crash.html b/tests/wpt/tests/css/css-break/parallel-flow-trailing-margin-003-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parallel-flow-trailing-margin-003-crash.html rename to tests/wpt/tests/css/css-break/parallel-flow-trailing-margin-003-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/box-decoration-break-computed.html b/tests/wpt/tests/css/css-break/parsing/box-decoration-break-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/box-decoration-break-computed.html rename to tests/wpt/tests/css/css-break/parsing/box-decoration-break-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/box-decoration-break-invalid.html b/tests/wpt/tests/css/css-break/parsing/box-decoration-break-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/box-decoration-break-invalid.html rename to tests/wpt/tests/css/css-break/parsing/box-decoration-break-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/box-decoration-break-valid.html b/tests/wpt/tests/css/css-break/parsing/box-decoration-break-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/box-decoration-break-valid.html rename to tests/wpt/tests/css/css-break/parsing/box-decoration-break-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/break-after-computed.html b/tests/wpt/tests/css/css-break/parsing/break-after-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/break-after-computed.html rename to tests/wpt/tests/css/css-break/parsing/break-after-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/break-after-invalid.html b/tests/wpt/tests/css/css-break/parsing/break-after-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/break-after-invalid.html rename to tests/wpt/tests/css/css-break/parsing/break-after-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/break-after-valid.html b/tests/wpt/tests/css/css-break/parsing/break-after-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/break-after-valid.html rename to tests/wpt/tests/css/css-break/parsing/break-after-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/break-before-computed.html b/tests/wpt/tests/css/css-break/parsing/break-before-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/break-before-computed.html rename to tests/wpt/tests/css/css-break/parsing/break-before-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/break-before-invalid.html b/tests/wpt/tests/css/css-break/parsing/break-before-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/break-before-invalid.html rename to tests/wpt/tests/css/css-break/parsing/break-before-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/break-before-valid.html b/tests/wpt/tests/css/css-break/parsing/break-before-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/break-before-valid.html rename to tests/wpt/tests/css/css-break/parsing/break-before-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/break-inside-computed.html b/tests/wpt/tests/css/css-break/parsing/break-inside-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/break-inside-computed.html rename to tests/wpt/tests/css/css-break/parsing/break-inside-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/break-inside-invalid.html b/tests/wpt/tests/css/css-break/parsing/break-inside-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/break-inside-invalid.html rename to tests/wpt/tests/css/css-break/parsing/break-inside-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/break-inside-valid.html b/tests/wpt/tests/css/css-break/parsing/break-inside-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/break-inside-valid.html rename to tests/wpt/tests/css/css-break/parsing/break-inside-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/orphans-computed.html b/tests/wpt/tests/css/css-break/parsing/orphans-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/orphans-computed.html rename to tests/wpt/tests/css/css-break/parsing/orphans-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/orphans-invalid.html b/tests/wpt/tests/css/css-break/parsing/orphans-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/orphans-invalid.html rename to tests/wpt/tests/css/css-break/parsing/orphans-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/orphans-valid.html b/tests/wpt/tests/css/css-break/parsing/orphans-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/orphans-valid.html rename to tests/wpt/tests/css/css-break/parsing/orphans-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/widows-computed.html b/tests/wpt/tests/css/css-break/parsing/widows-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/widows-computed.html rename to tests/wpt/tests/css/css-break/parsing/widows-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/widows-invalid.html b/tests/wpt/tests/css/css-break/parsing/widows-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/widows-invalid.html rename to tests/wpt/tests/css/css-break/parsing/widows-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-break/parsing/widows-valid.html b/tests/wpt/tests/css/css-break/parsing/widows-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/parsing/widows-valid.html rename to tests/wpt/tests/css/css-break/parsing/widows-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-break/reference/widows-001-ref.html b/tests/wpt/tests/css/css-break/reference/widows-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/reference/widows-001-ref.html rename to tests/wpt/tests/css/css-break/reference/widows-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/reference/widows-block-in-inline-001-ref.html b/tests/wpt/tests/css/css-break/reference/widows-block-in-inline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/reference/widows-block-in-inline-001-ref.html rename to tests/wpt/tests/css/css-break/reference/widows-block-in-inline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-001-ref.html b/tests/wpt/tests/css/css-break/reference/widows-orphans-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-001-ref.html rename to tests/wpt/tests/css/css-break/reference/widows-orphans-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-008-ref.html b/tests/wpt/tests/css/css-break/reference/widows-orphans-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-008-ref.html rename to tests/wpt/tests/css/css-break/reference/widows-orphans-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-009-ref.html b/tests/wpt/tests/css/css-break/reference/widows-orphans-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-009-ref.html rename to tests/wpt/tests/css/css-break/reference/widows-orphans-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-010-ref.html b/tests/wpt/tests/css/css-break/reference/widows-orphans-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-010-ref.html rename to tests/wpt/tests/css/css-break/reference/widows-orphans-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-011-ref.html b/tests/wpt/tests/css/css-break/reference/widows-orphans-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-011-ref.html rename to tests/wpt/tests/css/css-break/reference/widows-orphans-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-012-ref.html b/tests/wpt/tests/css/css-break/reference/widows-orphans-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-012-ref.html rename to tests/wpt/tests/css/css-break/reference/widows-orphans-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-013-ref.html b/tests/wpt/tests/css/css-break/reference/widows-orphans-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-013-ref.html rename to tests/wpt/tests/css/css-break/reference/widows-orphans-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-014-ref.html b/tests/wpt/tests/css/css-break/reference/widows-orphans-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-014-ref.html rename to tests/wpt/tests/css/css-break/reference/widows-orphans-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-016-ref.html b/tests/wpt/tests/css/css-break/reference/widows-orphans-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-016-ref.html rename to tests/wpt/tests/css/css-break/reference/widows-orphans-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-017-ref.html b/tests/wpt/tests/css/css-break/reference/widows-orphans-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/reference/widows-orphans-017-ref.html rename to tests/wpt/tests/css/css-break/reference/widows-orphans-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/relpos-inline-hit-testing.html b/tests/wpt/tests/css/css-break/relpos-inline-hit-testing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/relpos-inline-hit-testing.html rename to tests/wpt/tests/css/css-break/relpos-inline-hit-testing.html diff --git a/tests/wpt/web-platform-tests/css/css-break/relpos-inline-ref.html b/tests/wpt/tests/css/css-break/relpos-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/relpos-inline-ref.html rename to tests/wpt/tests/css/css-break/relpos-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/relpos-inline.html b/tests/wpt/tests/css/css-break/relpos-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/relpos-inline.html rename to tests/wpt/tests/css/css-break/relpos-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-break/remove-inline-child.html b/tests/wpt/tests/css/css-break/remove-inline-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/remove-inline-child.html rename to tests/wpt/tests/css/css-break/remove-inline-child.html diff --git a/tests/wpt/web-platform-tests/css/css-break/resumed-float-and-inline-block-crash.html b/tests/wpt/tests/css/css-break/resumed-float-and-inline-block-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/resumed-float-and-inline-block-crash.html rename to tests/wpt/tests/css/css-break/resumed-float-and-inline-block-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/rounded-clipped-border-ref.html b/tests/wpt/tests/css/css-break/rounded-clipped-border-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/rounded-clipped-border-ref.html rename to tests/wpt/tests/css/css-break/rounded-clipped-border-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/rounded-clipped-border.html b/tests/wpt/tests/css/css-break/rounded-clipped-border.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/rounded-clipped-border.html rename to tests/wpt/tests/css/css-break/rounded-clipped-border.html diff --git a/tests/wpt/web-platform-tests/css/css-break/ruby-000.html b/tests/wpt/tests/css/css-break/ruby-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/ruby-000.html rename to tests/wpt/tests/css/css-break/ruby-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/ruby-001.html b/tests/wpt/tests/css/css-break/ruby-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/ruby-001.html rename to tests/wpt/tests/css/css-break/ruby-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/ruby-002.html b/tests/wpt/tests/css/css-break/ruby-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/ruby-002.html rename to tests/wpt/tests/css/css-break/ruby-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/ruby-003.html b/tests/wpt/tests/css/css-break/ruby-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/ruby-003.html rename to tests/wpt/tests/css/css-break/ruby-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/svg-with-transform.html b/tests/wpt/tests/css/css-break/svg-with-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/svg-with-transform.html rename to tests/wpt/tests/css/css-break/svg-with-transform.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table-cell-padding-block-in-inline-crash.html b/tests/wpt/tests/css/css-break/table-cell-padding-block-in-inline-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table-cell-padding-block-in-inline-crash.html rename to tests/wpt/tests/css/css-break/table-cell-padding-block-in-inline-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/border-collapse-001.html b/tests/wpt/tests/css/css-break/table/border-collapse-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/border-collapse-001.html rename to tests/wpt/tests/css/css-break/table/border-collapse-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/border-spacing-at-breaks.tentative.html b/tests/wpt/tests/css/css-break/table/border-spacing-at-breaks.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/border-spacing-at-breaks.tentative.html rename to tests/wpt/tests/css/css-break/table/border-spacing-at-breaks.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/border-spacing.html b/tests/wpt/tests/css/css-break/table/border-spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/border-spacing.html rename to tests/wpt/tests/css/css-break/table/border-spacing.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/bottom-padding-repeated-header-crash.html b/tests/wpt/tests/css/css-break/table/bottom-padding-repeated-header-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/bottom-padding-repeated-header-crash.html rename to tests/wpt/tests/css/css-break/table/bottom-padding-repeated-header-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-after-table-cell-child.html b/tests/wpt/tests/css/css-break/table/break-after-table-cell-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-after-table-cell-child.html rename to tests/wpt/tests/css/css-break/table/break-after-table-cell-child.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-after-table-cell.html b/tests/wpt/tests/css/css-break/table/break-after-table-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-after-table-cell.html rename to tests/wpt/tests/css/css-break/table/break-after-table-cell.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-001.html b/tests/wpt/tests/css/css-break/table/break-avoidance-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-001.html rename to tests/wpt/tests/css/css-break/table/break-avoidance-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-002.html b/tests/wpt/tests/css/css-break/table/break-avoidance-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-002.html rename to tests/wpt/tests/css/css-break/table/break-avoidance-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-003.html b/tests/wpt/tests/css/css-break/table/break-avoidance-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-003.html rename to tests/wpt/tests/css/css-break/table/break-avoidance-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-004.html b/tests/wpt/tests/css/css-break/table/break-avoidance-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-004.html rename to tests/wpt/tests/css/css-break/table/break-avoidance-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-005.html b/tests/wpt/tests/css/css-break/table/break-avoidance-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-005.html rename to tests/wpt/tests/css/css-break/table/break-avoidance-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-006.html b/tests/wpt/tests/css/css-break/table/break-avoidance-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-006.html rename to tests/wpt/tests/css/css-break/table/break-avoidance-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-007.html b/tests/wpt/tests/css/css-break/table/break-avoidance-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-007.html rename to tests/wpt/tests/css/css-break/table/break-avoidance-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-in-table-in-grid.html b/tests/wpt/tests/css/css-break/table/break-avoidance-in-table-in-grid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-avoidance-in-table-in-grid.html rename to tests/wpt/tests/css/css-break/table/break-avoidance-in-table-in-grid.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-before-expansion-001.html b/tests/wpt/tests/css/css-break/table/break-before-expansion-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-before-expansion-001.html rename to tests/wpt/tests/css/css-break/table/break-before-expansion-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-before-expansion-002.html b/tests/wpt/tests/css/css-break/table/break-before-expansion-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-before-expansion-002.html rename to tests/wpt/tests/css/css-break/table/break-before-expansion-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-before-repeated-footer-instead-of-border-crash.html b/tests/wpt/tests/css/css-break/table/break-before-repeated-footer-instead-of-border-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-before-repeated-footer-instead-of-border-crash.html rename to tests/wpt/tests/css/css-break/table/break-before-repeated-footer-instead-of-border-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-before-second-row.html b/tests/wpt/tests/css/css-break/table/break-before-second-row.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-before-second-row.html rename to tests/wpt/tests/css/css-break/table/break-before-second-row.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-before-table-cell-child.html b/tests/wpt/tests/css/css-break/table/break-before-table-cell-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-before-table-cell-child.html rename to tests/wpt/tests/css/css-break/table/break-before-table-cell-child.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-before-table-cell.html b/tests/wpt/tests/css/css-break/table/break-before-table-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-before-table-cell.html rename to tests/wpt/tests/css/css-break/table/break-before-table-cell.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-inside-cell-000.html b/tests/wpt/tests/css/css-break/table/break-inside-cell-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-inside-cell-000.html rename to tests/wpt/tests/css/css-break/table/break-inside-cell-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/break-inside-cell-001.html b/tests/wpt/tests/css/css-break/table/break-inside-cell-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/break-inside-cell-001.html rename to tests/wpt/tests/css/css-break/table/break-inside-cell-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/caption-bottom-margin-at-boundary-crash.html b/tests/wpt/tests/css/css-break/table/caption-bottom-margin-at-boundary-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/caption-bottom-margin-at-boundary-crash.html rename to tests/wpt/tests/css/css-break/table/caption-bottom-margin-at-boundary-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/caption-margin-001.html b/tests/wpt/tests/css/css-break/table/caption-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/caption-margin-001.html rename to tests/wpt/tests/css/css-break/table/caption-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/caption-margin-002.html b/tests/wpt/tests/css/css-break/table/caption-margin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/caption-margin-002.html rename to tests/wpt/tests/css/css-break/table/caption-margin-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/caption-margin-003.html b/tests/wpt/tests/css/css-break/table/caption-margin-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/caption-margin-003.html rename to tests/wpt/tests/css/css-break/table/caption-margin-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/caption-margin-004.html b/tests/wpt/tests/css/css-break/table/caption-margin-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/caption-margin-004.html rename to tests/wpt/tests/css/css-break/table/caption-margin-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/cell-large-bottom-padding-crash.html b/tests/wpt/tests/css/css-break/table/cell-large-bottom-padding-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/cell-large-bottom-padding-crash.html rename to tests/wpt/tests/css/css-break/table/cell-large-bottom-padding-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/dynamic-caption-child-change-001.html b/tests/wpt/tests/css/css-break/table/dynamic-caption-child-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/dynamic-caption-child-change-001.html rename to tests/wpt/tests/css/css-break/table/dynamic-caption-child-change-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/dynamic-caption-child-change-002-crash.html b/tests/wpt/tests/css/css-break/table/dynamic-caption-child-change-002-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/dynamic-caption-child-change-002-crash.html rename to tests/wpt/tests/css/css-break/table/dynamic-caption-child-change-002-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/final-border-spacing-at-fragmentainer-boundary.html b/tests/wpt/tests/css/css-break/table/final-border-spacing-at-fragmentainer-boundary.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/final-border-spacing-at-fragmentainer-boundary.html rename to tests/wpt/tests/css/css-break/table/final-border-spacing-at-fragmentainer-boundary.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/inside-flex-001.html b/tests/wpt/tests/css/css-break/table/inside-flex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/inside-flex-001.html rename to tests/wpt/tests/css/css-break/table/inside-flex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/monolithic-overflow-001.tentative.html b/tests/wpt/tests/css/css-break/table/monolithic-overflow-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/monolithic-overflow-001.tentative.html rename to tests/wpt/tests/css/css-break/table/monolithic-overflow-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/monolithic-overflow-002.tentative.html b/tests/wpt/tests/css/css-break/table/monolithic-overflow-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/monolithic-overflow-002.tentative.html rename to tests/wpt/tests/css/css-break/table/monolithic-overflow-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/monolithic-overflow-003.tentative.html b/tests/wpt/tests/css/css-break/table/monolithic-overflow-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/monolithic-overflow-003.tentative.html rename to tests/wpt/tests/css/css-break/table/monolithic-overflow-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/monolithic-overflow-004.tentative.html b/tests/wpt/tests/css/css-break/table/monolithic-overflow-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/monolithic-overflow-004.tentative.html rename to tests/wpt/tests/css/css-break/table/monolithic-overflow-004.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/monolithic-overflow-005.html b/tests/wpt/tests/css/css-break/table/monolithic-overflow-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/monolithic-overflow-005.html rename to tests/wpt/tests/css/css-break/table/monolithic-overflow-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/monolithic-overflow-006.html b/tests/wpt/tests/css/css-break/table/monolithic-overflow-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/monolithic-overflow-006.html rename to tests/wpt/tests/css/css-break/table/monolithic-overflow-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/oof-in-cell-with-alignment-001.html b/tests/wpt/tests/css/css-break/table/oof-in-cell-with-alignment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/oof-in-cell-with-alignment-001.html rename to tests/wpt/tests/css/css-break/table/oof-in-cell-with-alignment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/oof-in-cell-with-alignment-002.html b/tests/wpt/tests/css/css-break/table/oof-in-cell-with-alignment-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/oof-in-cell-with-alignment-002.html rename to tests/wpt/tests/css/css-break/table/oof-in-cell-with-alignment-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/oof-in-cell-with-alignment-003.html b/tests/wpt/tests/css/css-break/table/oof-in-cell-with-alignment-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/oof-in-cell-with-alignment-003.html rename to tests/wpt/tests/css/css-break/table/oof-in-cell-with-alignment-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/oof-in-cell-with-alignment-004.html b/tests/wpt/tests/css/css-break/table/oof-in-cell-with-alignment-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/oof-in-cell-with-alignment-004.html rename to tests/wpt/tests/css/css-break/table/oof-in-cell-with-alignment-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/overflow-scroll-row.html b/tests/wpt/tests/css/css-break/table/overflow-scroll-row.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/overflow-scroll-row.html rename to tests/wpt/tests/css/css-break/table/overflow-scroll-row.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/overflow-scroll-section.html b/tests/wpt/tests/css/css-break/table/overflow-scroll-section.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/overflow-scroll-section.html rename to tests/wpt/tests/css/css-break/table/overflow-scroll-section.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/abspos-in-monolithic.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/abspos-in-monolithic.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/abspos-in-monolithic.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/abspos-in-monolithic.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/abspos-uncontained-text-ref.html b/tests/wpt/tests/css/css-break/table/repeated-section/abspos-uncontained-text-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/abspos-uncontained-text-ref.html rename to tests/wpt/tests/css/css-break/table/repeated-section/abspos-uncontained-text-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/abspos-uncontained-text.html b/tests/wpt/tests/css/css-break/table/repeated-section/abspos-uncontained-text.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/abspos-uncontained-text.html rename to tests/wpt/tests/css/css-break/table/repeated-section/abspos-uncontained-text.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/abspos-uncontained.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/abspos-uncontained.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/abspos-uncontained.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/abspos-uncontained.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/abspos.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/abspos.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/abspos.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/abspos.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/background-001.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/background-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/background-001.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/background-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/balanced-inner-multicol-ref.html b/tests/wpt/tests/css/css-break/table/repeated-section/balanced-inner-multicol-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/balanced-inner-multicol-ref.html rename to tests/wpt/tests/css/css-break/table/repeated-section/balanced-inner-multicol-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/balanced-inner-multicol.html b/tests/wpt/tests/css/css-break/table/repeated-section/balanced-inner-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/balanced-inner-multicol.html rename to tests/wpt/tests/css/css-break/table/repeated-section/balanced-inner-multicol.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/block-in-inline.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/block-in-inline.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/block-in-inline.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/block-in-inline.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/border-spacing-taller-than-fragmentainer-001-crash.html b/tests/wpt/tests/css/css-break/table/repeated-section/border-spacing-taller-than-fragmentainer-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/border-spacing-taller-than-fragmentainer-001-crash.html rename to tests/wpt/tests/css/css-break/table/repeated-section/border-spacing-taller-than-fragmentainer-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/border-spacing-taller-than-fragmentainer-002-crash.html b/tests/wpt/tests/css/css-break/table/repeated-section/border-spacing-taller-than-fragmentainer-002-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/border-spacing-taller-than-fragmentainer-002-crash.html rename to tests/wpt/tests/css/css-break/table/repeated-section/border-spacing-taller-than-fragmentainer-002-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/border-spacing-taller-than-fragmentainer-003-crash.html b/tests/wpt/tests/css/css-break/table/repeated-section/border-spacing-taller-than-fragmentainer-003-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/border-spacing-taller-than-fragmentainer-003-crash.html rename to tests/wpt/tests/css/css-break/table/repeated-section/border-spacing-taller-than-fragmentainer-003-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/break-avoidance-in-bottom-caption.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/break-avoidance-in-bottom-caption.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/break-avoidance-in-bottom-caption.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/break-avoidance-in-bottom-caption.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/captions.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/captions.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/captions.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/captions.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/fixedpos-in-footer-forced-break-print-ref.html b/tests/wpt/tests/css/css-break/table/repeated-section/fixedpos-in-footer-forced-break-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/fixedpos-in-footer-forced-break-print-ref.html rename to tests/wpt/tests/css/css-break/table/repeated-section/fixedpos-in-footer-forced-break-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/fixedpos-in-footer-forced-break-print.html b/tests/wpt/tests/css/css-break/table/repeated-section/fixedpos-in-footer-forced-break-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/fixedpos-in-footer-forced-break-print.html rename to tests/wpt/tests/css/css-break/table/repeated-section/fixedpos-in-footer-forced-break-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/footer.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/footer.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/footer.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/footer.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/header-after-break.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/header-after-break.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/header-after-break.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/header-after-break.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/header-footer.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/header-footer.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/header-footer.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/header-footer.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/header.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/header.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/header.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/header.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/hit-test-relative-in-transform.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/hit-test-relative-in-transform.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/hit-test-relative-in-transform.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/hit-test-relative-in-transform.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/hit-test-relative.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/hit-test-relative.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/hit-test-relative.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/hit-test-relative.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/hit-test.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/hit-test.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/hit-test.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/hit-test.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/image.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/image.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/image.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/image.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/inline-block.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/inline-block.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/inline-block.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/inline-block.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/multicol.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/multicol.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/multicol.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/multicol.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/multiple-row-groups.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/multiple-row-groups.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/multiple-row-groups.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/multiple-row-groups.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/nested-repeated-header-crash.html b/tests/wpt/tests/css/css-break/table/repeated-section/nested-repeated-header-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/nested-repeated-header-crash.html rename to tests/wpt/tests/css/css-break/table/repeated-section/nested-repeated-header-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/repeated-header-border-spacing.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/repeated-header-border-spacing.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/repeated-header-border-spacing.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/repeated-header-border-spacing.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/repeated-section-in-clipped-overflow-001.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/repeated-section-in-clipped-overflow-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/repeated-section-in-clipped-overflow-001.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/repeated-section-in-clipped-overflow-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/repeated-section-in-clipped-overflow-002.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/repeated-section-in-clipped-overflow-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/repeated-section-in-clipped-overflow-002.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/repeated-section-in-clipped-overflow-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/repeated-section-in-clipped-overflow-003.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/repeated-section-in-clipped-overflow-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/repeated-section-in-clipped-overflow-003.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/repeated-section-in-clipped-overflow-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/special-elements-crash.html b/tests/wpt/tests/css/css-break/table/repeated-section/special-elements-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/special-elements-crash.html rename to tests/wpt/tests/css/css-break/table/repeated-section/special-elements-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/tall-monolithic-after-repeated-header.tentative.html b/tests/wpt/tests/css/css-break/table/repeated-section/tall-monolithic-after-repeated-header.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/tall-monolithic-after-repeated-header.tentative.html rename to tests/wpt/tests/css/css-break/table/repeated-section/tall-monolithic-after-repeated-header.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-001-ref.html b/tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-001-ref.html rename to tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-001.html b/tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-001.html rename to tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-002-ref.html b/tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-002-ref.html rename to tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-002.html b/tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-002.html rename to tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-003-crash.html b/tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-003-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-003-crash.html rename to tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-003-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-004-crash.html b/tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-004-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-004-crash.html rename to tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-004-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-005-crash.html b/tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-005-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-005-crash.html rename to tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-005-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-006-crash.html b/tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-006-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/repeated-section/variable-fragmentainer-size-006-crash.html rename to tests/wpt/tests/css/css-break/table/repeated-section/variable-fragmentainer-size-006-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/section-with-overflow-000.html b/tests/wpt/tests/css/css-break/table/section-with-overflow-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/section-with-overflow-000.html rename to tests/wpt/tests/css/css-break/table/section-with-overflow-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/section-with-overflow-001.html b/tests/wpt/tests/css/css-break/table/section-with-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/section-with-overflow-001.html rename to tests/wpt/tests/css/css-break/table/section-with-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/section-with-overflow-002.html b/tests/wpt/tests/css/css-break/table/section-with-overflow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/section-with-overflow-002.html rename to tests/wpt/tests/css/css-break/table/section-with-overflow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/sections-and-captions-mixed-order-ref.html b/tests/wpt/tests/css/css-break/table/sections-and-captions-mixed-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/sections-and-captions-mixed-order-ref.html rename to tests/wpt/tests/css/css-break/table/sections-and-captions-mixed-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/sections-and-captions-mixed-order.html b/tests/wpt/tests/css/css-break/table/sections-and-captions-mixed-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/sections-and-captions-mixed-order.html rename to tests/wpt/tests/css/css-break/table/sections-and-captions-mixed-order.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-001.html b/tests/wpt/tests/css/css-break/table/specified-block-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-001.html rename to tests/wpt/tests/css/css-break/table/specified-block-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-002.html b/tests/wpt/tests/css/css-break/table/specified-block-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-002.html rename to tests/wpt/tests/css/css-break/table/specified-block-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-003.html b/tests/wpt/tests/css/css-break/table/specified-block-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-003.html rename to tests/wpt/tests/css/css-break/table/specified-block-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-004.html b/tests/wpt/tests/css/css-break/table/specified-block-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-004.html rename to tests/wpt/tests/css/css-break/table/specified-block-size-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-005.html b/tests/wpt/tests/css/css-break/table/specified-block-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-005.html rename to tests/wpt/tests/css/css-break/table/specified-block-size-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-006.html b/tests/wpt/tests/css/css-break/table/specified-block-size-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-006.html rename to tests/wpt/tests/css/css-break/table/specified-block-size-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-007-ref.html b/tests/wpt/tests/css/css-break/table/specified-block-size-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-007-ref.html rename to tests/wpt/tests/css/css-break/table/specified-block-size-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-007.html b/tests/wpt/tests/css/css-break/table/specified-block-size-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-007.html rename to tests/wpt/tests/css/css-break/table/specified-block-size-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-008.html b/tests/wpt/tests/css/css-break/table/specified-block-size-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/specified-block-size-008.html rename to tests/wpt/tests/css/css-break/table/specified-block-size-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-border-000.html b/tests/wpt/tests/css/css-break/table/table-border-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-border-000.html rename to tests/wpt/tests/css/css-break/table/table-border-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-border-001.html b/tests/wpt/tests/css/css-break/table/table-border-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-border-001.html rename to tests/wpt/tests/css/css-break/table/table-border-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-border-002.html b/tests/wpt/tests/css/css-break/table/table-border-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-border-002.html rename to tests/wpt/tests/css/css-break/table/table-border-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-border-003.html b/tests/wpt/tests/css/css-break/table/table-border-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-border-003.html rename to tests/wpt/tests/css/css-break/table/table-border-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-border-004.html b/tests/wpt/tests/css/css-break/table/table-border-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-border-004.html rename to tests/wpt/tests/css/css-break/table/table-border-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-border-005.html b/tests/wpt/tests/css/css-break/table/table-border-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-border-005.html rename to tests/wpt/tests/css/css-break/table/table-border-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-border-006.html b/tests/wpt/tests/css/css-break/table/table-border-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-border-006.html rename to tests/wpt/tests/css/css-break/table/table-border-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-border-007-ref.html b/tests/wpt/tests/css/css-break/table/table-border-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-border-007-ref.html rename to tests/wpt/tests/css/css-break/table/table-border-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-border-007.html b/tests/wpt/tests/css/css-break/table/table-border-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-border-007.html rename to tests/wpt/tests/css/css-break/table/table-border-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-border-008-ref.html b/tests/wpt/tests/css/css-break/table/table-border-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-border-008-ref.html rename to tests/wpt/tests/css/css-break/table/table-border-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-border-008.html b/tests/wpt/tests/css/css-break/table/table-border-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-border-008.html rename to tests/wpt/tests/css/css-break/table/table-border-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-caption-and-cells-fixed-width-ref.html b/tests/wpt/tests/css/css-break/table/table-caption-and-cells-fixed-width-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-caption-and-cells-fixed-width-ref.html rename to tests/wpt/tests/css/css-break/table/table-caption-and-cells-fixed-width-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-caption-and-cells-fixed-width.html b/tests/wpt/tests/css/css-break/table/table-caption-and-cells-fixed-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-caption-and-cells-fixed-width.html rename to tests/wpt/tests/css/css-break/table/table-caption-and-cells-fixed-width.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-caption-and-cells-ref.html b/tests/wpt/tests/css/css-break/table/table-caption-and-cells-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-caption-and-cells-ref.html rename to tests/wpt/tests/css/css-break/table/table-caption-and-cells-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-caption-and-cells.html b/tests/wpt/tests/css/css-break/table/table-caption-and-cells.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-caption-and-cells.html rename to tests/wpt/tests/css/css-break/table/table-caption-and-cells.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-caption-with-block-ref.html b/tests/wpt/tests/css/css-break/table/table-caption-with-block-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-caption-with-block-ref.html rename to tests/wpt/tests/css/css-break/table/table-caption-with-block-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-caption-with-block.html b/tests/wpt/tests/css/css-break/table/table-caption-with-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-caption-with-block.html rename to tests/wpt/tests/css/css-break/table/table-caption-with-block.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-cell-border-001.html b/tests/wpt/tests/css/css-break/table/table-cell-border-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-cell-border-001.html rename to tests/wpt/tests/css/css-break/table/table-cell-border-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-001.html b/tests/wpt/tests/css/css-break/table/table-cell-expansion-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-001.html rename to tests/wpt/tests/css/css-break/table/table-cell-expansion-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-002.html b/tests/wpt/tests/css/css-break/table/table-cell-expansion-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-002.html rename to tests/wpt/tests/css/css-break/table/table-cell-expansion-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-003.html b/tests/wpt/tests/css/css-break/table/table-cell-expansion-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-003.html rename to tests/wpt/tests/css/css-break/table/table-cell-expansion-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-004.html b/tests/wpt/tests/css/css-break/table/table-cell-expansion-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-004.html rename to tests/wpt/tests/css/css-break/table/table-cell-expansion-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-005.html b/tests/wpt/tests/css/css-break/table/table-cell-expansion-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-005.html rename to tests/wpt/tests/css/css-break/table/table-cell-expansion-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-006.html b/tests/wpt/tests/css/css-break/table/table-cell-expansion-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-006.html rename to tests/wpt/tests/css/css-break/table/table-cell-expansion-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-007.html b/tests/wpt/tests/css/css-break/table/table-cell-expansion-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-007.html rename to tests/wpt/tests/css/css-break/table/table-cell-expansion-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-008.html b/tests/wpt/tests/css/css-break/table/table-cell-expansion-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-008.html rename to tests/wpt/tests/css/css-break/table/table-cell-expansion-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-009.html b/tests/wpt/tests/css/css-break/table/table-cell-expansion-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-009.html rename to tests/wpt/tests/css/css-break/table/table-cell-expansion-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-010.html b/tests/wpt/tests/css/css-break/table/table-cell-expansion-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-cell-expansion-010.html rename to tests/wpt/tests/css/css-break/table/table-cell-expansion-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-col-paint-htb-ltr-ref.html b/tests/wpt/tests/css/css-break/table/table-col-paint-htb-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-col-paint-htb-ltr-ref.html rename to tests/wpt/tests/css/css-break/table/table-col-paint-htb-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-col-paint-htb-ltr.html b/tests/wpt/tests/css/css-break/table/table-col-paint-htb-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-col-paint-htb-ltr.html rename to tests/wpt/tests/css/css-break/table/table-col-paint-htb-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-col-paint-vlr-rtl-ref.html b/tests/wpt/tests/css/css-break/table/table-col-paint-vlr-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-col-paint-vlr-rtl-ref.html rename to tests/wpt/tests/css/css-break/table/table-col-paint-vlr-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-col-paint-vlr-rtl.html b/tests/wpt/tests/css/css-break/table/table-col-paint-vlr-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-col-paint-vlr-rtl.html rename to tests/wpt/tests/css/css-break/table/table-col-paint-vlr-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-col-paint-vrl-rtl-ref.html b/tests/wpt/tests/css/css-break/table/table-col-paint-vrl-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-col-paint-vrl-rtl-ref.html rename to tests/wpt/tests/css/css-break/table/table-col-paint-vrl-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-col-paint-vrl-rtl.html b/tests/wpt/tests/css/css-break/table/table-col-paint-vrl-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-col-paint-vrl-rtl.html rename to tests/wpt/tests/css/css-break/table/table-col-paint-vrl-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-at-boundary-ref.html b/tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-at-boundary-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-at-boundary-ref.html rename to tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-at-boundary-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-at-boundary.tentative.html b/tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-at-boundary.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-at-boundary.tentative.html rename to tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-at-boundary.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-htb-ltr-ref.html b/tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-htb-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-htb-ltr-ref.html rename to tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-htb-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-htb-ltr.html b/tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-htb-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-htb-ltr.html rename to tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-htb-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-vlr-rtl-ref.html b/tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-vlr-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-vlr-rtl-ref.html rename to tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-vlr-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-vlr-rtl.html b/tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-vlr-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-vlr-rtl.html rename to tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-vlr-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-vrl-ltr-ref.html b/tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-vrl-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-vrl-ltr-ref.html rename to tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-vrl-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-vrl-ltr.html b/tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-vrl-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-collapsed-borders-paint-vrl-ltr.html rename to tests/wpt/tests/css/css-break/table/table-collapsed-borders-paint-vrl-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-grid-paint-htb-ltr-ref.html b/tests/wpt/tests/css/css-break/table/table-grid-paint-htb-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-grid-paint-htb-ltr-ref.html rename to tests/wpt/tests/css/css-break/table/table-grid-paint-htb-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-grid-paint-htb-ltr.html b/tests/wpt/tests/css/css-break/table/table-grid-paint-htb-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-grid-paint-htb-ltr.html rename to tests/wpt/tests/css/css-break/table/table-grid-paint-htb-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-grid-paint-vlr-rtl-ref.html b/tests/wpt/tests/css/css-break/table/table-grid-paint-vlr-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-grid-paint-vlr-rtl-ref.html rename to tests/wpt/tests/css/css-break/table/table-grid-paint-vlr-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-grid-paint-vlr-rtl.html b/tests/wpt/tests/css/css-break/table/table-grid-paint-vlr-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-grid-paint-vlr-rtl.html rename to tests/wpt/tests/css/css-break/table/table-grid-paint-vlr-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-grid-paint-vrl-rtl-ref.html b/tests/wpt/tests/css/css-break/table/table-grid-paint-vrl-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-grid-paint-vrl-rtl-ref.html rename to tests/wpt/tests/css/css-break/table/table-grid-paint-vrl-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-grid-paint-vrl-rtl.html b/tests/wpt/tests/css/css-break/table/table-grid-paint-vrl-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-grid-paint-vrl-rtl.html rename to tests/wpt/tests/css/css-break/table/table-grid-paint-vrl-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-in-abspos-multicol-with-nested-meter-crash.html b/tests/wpt/tests/css/css-break/table/table-in-abspos-multicol-with-nested-meter-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-in-abspos-multicol-with-nested-meter-crash.html rename to tests/wpt/tests/css/css-break/table/table-in-abspos-multicol-with-nested-meter-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-parts-offsetheight.html b/tests/wpt/tests/css/css-break/table/table-parts-offsetheight.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-parts-offsetheight.html rename to tests/wpt/tests/css/css-break/table/table-parts-offsetheight.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-parts-offsets-vertical-lr.tentative.html b/tests/wpt/tests/css/css-break/table/table-parts-offsets-vertical-lr.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-parts-offsets-vertical-lr.tentative.html rename to tests/wpt/tests/css/css-break/table/table-parts-offsets-vertical-lr.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-parts-offsets-vertical-rl.tentative.html b/tests/wpt/tests/css/css-break/table/table-parts-offsets-vertical-rl.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-parts-offsets-vertical-rl.tentative.html rename to tests/wpt/tests/css/css-break/table/table-parts-offsets-vertical-rl.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-parts-offsets.tentative.html b/tests/wpt/tests/css/css-break/table/table-parts-offsets.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-parts-offsets.tentative.html rename to tests/wpt/tests/css/css-break/table/table-parts-offsets.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-row-end-border-1-crash.html b/tests/wpt/tests/css/css-break/table/table-row-end-border-1-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-row-end-border-1-crash.html rename to tests/wpt/tests/css/css-break/table/table-row-end-border-1-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-row-end-border-2-crash.html b/tests/wpt/tests/css/css-break/table/table-row-end-border-2-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-row-end-border-2-crash.html rename to tests/wpt/tests/css/css-break/table/table-row-end-border-2-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-row-end-padding-crash.html b/tests/wpt/tests/css/css-break/table/table-row-end-padding-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-row-end-padding-crash.html rename to tests/wpt/tests/css/css-break/table/table-row-end-padding-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-row-paint-htb-ltr-ref.html b/tests/wpt/tests/css/css-break/table/table-row-paint-htb-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-row-paint-htb-ltr-ref.html rename to tests/wpt/tests/css/css-break/table/table-row-paint-htb-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-row-paint-htb-ltr.html b/tests/wpt/tests/css/css-break/table/table-row-paint-htb-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-row-paint-htb-ltr.html rename to tests/wpt/tests/css/css-break/table/table-row-paint-htb-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-row-paint-vlr-rtl-ref.html b/tests/wpt/tests/css/css-break/table/table-row-paint-vlr-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-row-paint-vlr-rtl-ref.html rename to tests/wpt/tests/css/css-break/table/table-row-paint-vlr-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-row-paint-vlr-rtl.html b/tests/wpt/tests/css/css-break/table/table-row-paint-vlr-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-row-paint-vlr-rtl.html rename to tests/wpt/tests/css/css-break/table/table-row-paint-vlr-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-row-paint-vrl-rtl-ref.html b/tests/wpt/tests/css/css-break/table/table-row-paint-vrl-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-row-paint-vrl-rtl-ref.html rename to tests/wpt/tests/css/css-break/table/table-row-paint-vrl-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-row-paint-vrl-rtl.html b/tests/wpt/tests/css/css-break/table/table-row-paint-vrl-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-row-paint-vrl-rtl.html rename to tests/wpt/tests/css/css-break/table/table-row-paint-vrl-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-rowspan-001.html b/tests/wpt/tests/css/css-break/table/table-rowspan-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-rowspan-001.html rename to tests/wpt/tests/css/css-break/table/table-rowspan-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-section-paint-htb-ltr-ref.html b/tests/wpt/tests/css/css-break/table/table-section-paint-htb-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-section-paint-htb-ltr-ref.html rename to tests/wpt/tests/css/css-break/table/table-section-paint-htb-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-section-paint-htb-ltr.html b/tests/wpt/tests/css/css-break/table/table-section-paint-htb-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-section-paint-htb-ltr.html rename to tests/wpt/tests/css/css-break/table/table-section-paint-htb-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-section-paint-vlr-rtl-ref.html b/tests/wpt/tests/css/css-break/table/table-section-paint-vlr-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-section-paint-vlr-rtl-ref.html rename to tests/wpt/tests/css/css-break/table/table-section-paint-vlr-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-section-paint-vlr-rtl.html b/tests/wpt/tests/css/css-break/table/table-section-paint-vlr-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-section-paint-vlr-rtl.html rename to tests/wpt/tests/css/css-break/table/table-section-paint-vlr-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-section-paint-vrl-rtl-ref.html b/tests/wpt/tests/css/css-break/table/table-section-paint-vrl-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-section-paint-vrl-rtl-ref.html rename to tests/wpt/tests/css/css-break/table/table-section-paint-vrl-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/table-section-paint-vrl-rtl.html b/tests/wpt/tests/css/css-break/table/table-section-paint-vrl-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/table-section-paint-vrl-rtl.html rename to tests/wpt/tests/css/css-break/table/table-section-paint-vrl-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/tall-bottom-aligned-cell-with-bottom-padding.html b/tests/wpt/tests/css/css-break/table/tall-bottom-aligned-cell-with-bottom-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/tall-bottom-aligned-cell-with-bottom-padding.html rename to tests/wpt/tests/css/css-break/table/tall-bottom-aligned-cell-with-bottom-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/tall-padding-crash.html b/tests/wpt/tests/css/css-break/table/tall-padding-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/tall-padding-crash.html rename to tests/wpt/tests/css/css-break/table/tall-padding-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/truncated-border-spacing-at-fragmentainer-end.html b/tests/wpt/tests/css/css-break/table/truncated-border-spacing-at-fragmentainer-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/truncated-border-spacing-at-fragmentainer-end.html rename to tests/wpt/tests/css/css-break/table/truncated-border-spacing-at-fragmentainer-end.html diff --git a/tests/wpt/web-platform-tests/css/css-break/table/zero-height-repeated-footer-crash.html b/tests/wpt/tests/css/css-break/table/zero-height-repeated-footer-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/table/zero-height-repeated-footer-crash.html rename to tests/wpt/tests/css/css-break/table/zero-height-repeated-footer-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-break-inside-avoid-at-start.html b/tests/wpt/tests/css/css-break/tall-break-inside-avoid-at-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-break-inside-avoid-at-start.html rename to tests/wpt/tests/css/css-break/tall-break-inside-avoid-at-start.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-content-inside-constrained-block-000.tentative.html b/tests/wpt/tests/css/css-break/tall-content-inside-constrained-block-000.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-content-inside-constrained-block-000.tentative.html rename to tests/wpt/tests/css/css-break/tall-content-inside-constrained-block-000.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-content-inside-constrained-block-001.tentative.html b/tests/wpt/tests/css/css-break/tall-content-inside-constrained-block-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-content-inside-constrained-block-001.tentative.html rename to tests/wpt/tests/css/css-break/tall-content-inside-constrained-block-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-content-inside-constrained-block-002.tentative.html b/tests/wpt/tests/css/css-break/tall-content-inside-constrained-block-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-content-inside-constrained-block-002.tentative.html rename to tests/wpt/tests/css/css-break/tall-content-inside-constrained-block-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-content-inside-constrained-block-003.tentative.html b/tests/wpt/tests/css/css-break/tall-content-inside-constrained-block-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-content-inside-constrained-block-003.tentative.html rename to tests/wpt/tests/css/css-break/tall-content-inside-constrained-block-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-content-inside-constrained-block-004.tentative.html b/tests/wpt/tests/css/css-break/tall-content-inside-constrained-block-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-content-inside-constrained-block-004.tentative.html rename to tests/wpt/tests/css/css-break/tall-content-inside-constrained-block-004.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-content-inside-constrained-block-005.tentative.html b/tests/wpt/tests/css/css-break/tall-content-inside-constrained-block-005.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-content-inside-constrained-block-005.tentative.html rename to tests/wpt/tests/css/css-break/tall-content-inside-constrained-block-005.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-content-inside-constrained-block-006.tentative.html b/tests/wpt/tests/css/css-break/tall-content-inside-constrained-block-006.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-content-inside-constrained-block-006.tentative.html rename to tests/wpt/tests/css/css-break/tall-content-inside-constrained-block-006.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-float-pushed-to-next-fragmentainer-000.html b/tests/wpt/tests/css/css-break/tall-float-pushed-to-next-fragmentainer-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-float-pushed-to-next-fragmentainer-000.html rename to tests/wpt/tests/css/css-break/tall-float-pushed-to-next-fragmentainer-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-float-pushed-to-next-fragmentainer-001.html b/tests/wpt/tests/css/css-break/tall-float-pushed-to-next-fragmentainer-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-float-pushed-to-next-fragmentainer-001.html rename to tests/wpt/tests/css/css-break/tall-float-pushed-to-next-fragmentainer-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-float-pushed-to-next-fragmentainer-002.html b/tests/wpt/tests/css/css-break/tall-float-pushed-to-next-fragmentainer-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-float-pushed-to-next-fragmentainer-002.html rename to tests/wpt/tests/css/css-break/tall-float-pushed-to-next-fragmentainer-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-float-pushed-to-next-fragmentainer-003.html b/tests/wpt/tests/css/css-break/tall-float-pushed-to-next-fragmentainer-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-float-pushed-to-next-fragmentainer-003.html rename to tests/wpt/tests/css/css-break/tall-float-pushed-to-next-fragmentainer-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-line-in-short-fragmentainer-000.html b/tests/wpt/tests/css/css-break/tall-line-in-short-fragmentainer-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-line-in-short-fragmentainer-000.html rename to tests/wpt/tests/css/css-break/tall-line-in-short-fragmentainer-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-line-in-short-fragmentainer-001.html b/tests/wpt/tests/css/css-break/tall-line-in-short-fragmentainer-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-line-in-short-fragmentainer-001.html rename to tests/wpt/tests/css/css-break/tall-line-in-short-fragmentainer-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/tall-line-in-short-fragmentainer-002.html b/tests/wpt/tests/css/css-break/tall-line-in-short-fragmentainer-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/tall-line-in-short-fragmentainer-002.html rename to tests/wpt/tests/css/css-break/tall-line-in-short-fragmentainer-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/trailing-child-margin-000.html b/tests/wpt/tests/css/css-break/trailing-child-margin-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/trailing-child-margin-000.html rename to tests/wpt/tests/css/css-break/trailing-child-margin-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/trailing-child-margin-001.html b/tests/wpt/tests/css/css-break/trailing-child-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/trailing-child-margin-001.html rename to tests/wpt/tests/css/css-break/trailing-child-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/trailing-child-margin-002.html b/tests/wpt/tests/css/css-break/trailing-child-margin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/trailing-child-margin-002.html rename to tests/wpt/tests/css/css-break/trailing-child-margin-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-000.html b/tests/wpt/tests/css/css-break/transform-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-000.html rename to tests/wpt/tests/css/css-break/transform-000.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-001.html b/tests/wpt/tests/css/css-break/transform-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-001.html rename to tests/wpt/tests/css/css-break/transform-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-002.html b/tests/wpt/tests/css/css-break/transform-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-002.html rename to tests/wpt/tests/css/css-break/transform-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-003.html b/tests/wpt/tests/css/css-break/transform-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-003.html rename to tests/wpt/tests/css/css-break/transform-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-004.html b/tests/wpt/tests/css/css-break/transform-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-004.html rename to tests/wpt/tests/css/css-break/transform-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-005.html b/tests/wpt/tests/css/css-break/transform-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-005.html rename to tests/wpt/tests/css/css-break/transform-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-006-ref.html b/tests/wpt/tests/css/css-break/transform-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-006-ref.html rename to tests/wpt/tests/css/css-break/transform-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-006.html b/tests/wpt/tests/css/css-break/transform-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-006.html rename to tests/wpt/tests/css/css-break/transform-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-007-ref.html b/tests/wpt/tests/css/css-break/transform-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-007-ref.html rename to tests/wpt/tests/css/css-break/transform-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-007.html b/tests/wpt/tests/css/css-break/transform-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-007.html rename to tests/wpt/tests/css/css-break/transform-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-008-ref.html b/tests/wpt/tests/css/css-break/transform-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-008-ref.html rename to tests/wpt/tests/css/css-break/transform-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-008.html b/tests/wpt/tests/css/css-break/transform-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-008.html rename to tests/wpt/tests/css/css-break/transform-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-009-ref.html b/tests/wpt/tests/css/css-break/transform-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-009-ref.html rename to tests/wpt/tests/css/css-break/transform-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-009.html b/tests/wpt/tests/css/css-break/transform-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-009.html rename to tests/wpt/tests/css/css-break/transform-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-010.html b/tests/wpt/tests/css/css-break/transform-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-010.html rename to tests/wpt/tests/css/css-break/transform-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-011.html b/tests/wpt/tests/css/css-break/transform-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-011.html rename to tests/wpt/tests/css/css-break/transform-011.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-012.html b/tests/wpt/tests/css/css-break/transform-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-012.html rename to tests/wpt/tests/css/css-break/transform-012.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-013.html b/tests/wpt/tests/css/css-break/transform-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-013.html rename to tests/wpt/tests/css/css-break/transform-013.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-014.html b/tests/wpt/tests/css/css-break/transform-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-014.html rename to tests/wpt/tests/css/css-break/transform-014.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-015.html b/tests/wpt/tests/css/css-break/transform-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-015.html rename to tests/wpt/tests/css/css-break/transform-015.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-016.html b/tests/wpt/tests/css/css-break/transform-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-016.html rename to tests/wpt/tests/css/css-break/transform-016.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-017.html b/tests/wpt/tests/css/css-break/transform-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-017.html rename to tests/wpt/tests/css/css-break/transform-017.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-018.html b/tests/wpt/tests/css/css-break/transform-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-018.html rename to tests/wpt/tests/css/css-break/transform-018.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-019.html b/tests/wpt/tests/css/css-break/transform-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-019.html rename to tests/wpt/tests/css/css-break/transform-019.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-020.html b/tests/wpt/tests/css/css-break/transform-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-020.html rename to tests/wpt/tests/css/css-break/transform-020.html diff --git a/tests/wpt/web-platform-tests/css/css-break/transform-021.html b/tests/wpt/tests/css/css-break/transform-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/transform-021.html rename to tests/wpt/tests/css/css-break/transform-021.html diff --git a/tests/wpt/web-platform-tests/css/css-break/truncated-margin-at-fragmentainer-end-001.html b/tests/wpt/tests/css/css-break/truncated-margin-at-fragmentainer-end-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/truncated-margin-at-fragmentainer-end-001.html rename to tests/wpt/tests/css/css-break/truncated-margin-at-fragmentainer-end-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/truncated-margin-at-fragmentainer-end-002.html b/tests/wpt/tests/css/css-break/truncated-margin-at-fragmentainer-end-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/truncated-margin-at-fragmentainer-end-002.html rename to tests/wpt/tests/css/css-break/truncated-margin-at-fragmentainer-end-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/uncontained-oof-in-inline-after-break-000-crash.html b/tests/wpt/tests/css/css-break/uncontained-oof-in-inline-after-break-000-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/uncontained-oof-in-inline-after-break-000-crash.html rename to tests/wpt/tests/css/css-break/uncontained-oof-in-inline-after-break-000-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/uncontained-oof-in-inline-after-break-001-crash.html b/tests/wpt/tests/css/css-break/uncontained-oof-in-inline-after-break-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/uncontained-oof-in-inline-after-break-001-crash.html rename to tests/wpt/tests/css/css-break/uncontained-oof-in-inline-after-break-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/underflow-from-next-page-print-ref.html b/tests/wpt/tests/css/css-break/underflow-from-next-page-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/underflow-from-next-page-print-ref.html rename to tests/wpt/tests/css/css-break/underflow-from-next-page-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-break/underflow-from-next-page-print.html b/tests/wpt/tests/css/css-break/underflow-from-next-page-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/underflow-from-next-page-print.html rename to tests/wpt/tests/css/css-break/underflow-from-next-page-print.html diff --git a/tests/wpt/web-platform-tests/css/css-break/wide-line-after-floats-crash.html b/tests/wpt/tests/css/css-break/wide-line-after-floats-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/wide-line-after-floats-crash.html rename to tests/wpt/tests/css/css-break/wide-line-after-floats-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-001.html b/tests/wpt/tests/css/css-break/widows-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-001.html rename to tests/wpt/tests/css/css-break/widows-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-block-in-inline-001.html b/tests/wpt/tests/css/css-break/widows-block-in-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-block-in-inline-001.html rename to tests/wpt/tests/css/css-break/widows-block-in-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-001.html b/tests/wpt/tests/css/css-break/widows-orphans-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-001.html rename to tests/wpt/tests/css/css-break/widows-orphans-001.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-002.html b/tests/wpt/tests/css/css-break/widows-orphans-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-002.html rename to tests/wpt/tests/css/css-break/widows-orphans-002.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-003.html b/tests/wpt/tests/css/css-break/widows-orphans-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-003.html rename to tests/wpt/tests/css/css-break/widows-orphans-003.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-004.html b/tests/wpt/tests/css/css-break/widows-orphans-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-004.html rename to tests/wpt/tests/css/css-break/widows-orphans-004.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-005.html b/tests/wpt/tests/css/css-break/widows-orphans-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-005.html rename to tests/wpt/tests/css/css-break/widows-orphans-005.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-006.html b/tests/wpt/tests/css/css-break/widows-orphans-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-006.html rename to tests/wpt/tests/css/css-break/widows-orphans-006.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-007.html b/tests/wpt/tests/css/css-break/widows-orphans-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-007.html rename to tests/wpt/tests/css/css-break/widows-orphans-007.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-008.html b/tests/wpt/tests/css/css-break/widows-orphans-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-008.html rename to tests/wpt/tests/css/css-break/widows-orphans-008.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-009.html b/tests/wpt/tests/css/css-break/widows-orphans-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-009.html rename to tests/wpt/tests/css/css-break/widows-orphans-009.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-010.html b/tests/wpt/tests/css/css-break/widows-orphans-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-010.html rename to tests/wpt/tests/css/css-break/widows-orphans-010.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-011.html b/tests/wpt/tests/css/css-break/widows-orphans-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-011.html rename to tests/wpt/tests/css/css-break/widows-orphans-011.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-012.html b/tests/wpt/tests/css/css-break/widows-orphans-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-012.html rename to tests/wpt/tests/css/css-break/widows-orphans-012.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-013.html b/tests/wpt/tests/css/css-break/widows-orphans-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-013.html rename to tests/wpt/tests/css/css-break/widows-orphans-013.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-014.html b/tests/wpt/tests/css/css-break/widows-orphans-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-014.html rename to tests/wpt/tests/css/css-break/widows-orphans-014.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-015.html b/tests/wpt/tests/css/css-break/widows-orphans-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-015.html rename to tests/wpt/tests/css/css-break/widows-orphans-015.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-016.html b/tests/wpt/tests/css/css-break/widows-orphans-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-016.html rename to tests/wpt/tests/css/css-break/widows-orphans-016.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-017.html b/tests/wpt/tests/css/css-break/widows-orphans-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-017.html rename to tests/wpt/tests/css/css-break/widows-orphans-017.html diff --git a/tests/wpt/web-platform-tests/css/css-break/widows-orphans-018.html b/tests/wpt/tests/css/css-break/widows-orphans-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/widows-orphans-018.html rename to tests/wpt/tests/css/css-break/widows-orphans-018.html diff --git a/tests/wpt/web-platform-tests/css/css-break/will-change-filter.html b/tests/wpt/tests/css/css-break/will-change-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-break/will-change-filter.html rename to tests/wpt/tests/css/css-break/will-change-filter.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/META.yml b/tests/wpt/tests/css/css-cascade/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/META.yml rename to tests/wpt/tests/css/css-cascade/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-001-ref.html b/tests/wpt/tests/css/css-cascade/all-prop-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-001-ref.html rename to tests/wpt/tests/css/css-cascade/all-prop-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-001.html b/tests/wpt/tests/css/css-cascade/all-prop-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-001.html rename to tests/wpt/tests/css/css-cascade/all-prop-001.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-002.html b/tests/wpt/tests/css/css-cascade/all-prop-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-002.html rename to tests/wpt/tests/css/css-cascade/all-prop-002.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-inherit-color.html b/tests/wpt/tests/css/css-cascade/all-prop-inherit-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-inherit-color.html rename to tests/wpt/tests/css/css-cascade/all-prop-inherit-color.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-initial-color.html b/tests/wpt/tests/css/css-cascade/all-prop-initial-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-initial-color.html rename to tests/wpt/tests/css/css-cascade/all-prop-initial-color.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-initial-visited-ref.html b/tests/wpt/tests/css/css-cascade/all-prop-initial-visited-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-initial-visited-ref.html rename to tests/wpt/tests/css/css-cascade/all-prop-initial-visited-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-initial-visited.html b/tests/wpt/tests/css/css-cascade/all-prop-initial-visited.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-initial-visited.html rename to tests/wpt/tests/css/css-cascade/all-prop-initial-visited.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-initial-xml.html b/tests/wpt/tests/css/css-cascade/all-prop-initial-xml.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-initial-xml.html rename to tests/wpt/tests/css/css-cascade/all-prop-initial-xml.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-revert-color.html b/tests/wpt/tests/css/css-cascade/all-prop-revert-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-revert-color.html rename to tests/wpt/tests/css/css-cascade/all-prop-revert-color.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-revert-layer-noop.html b/tests/wpt/tests/css/css-cascade/all-prop-revert-layer-noop.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-revert-layer-noop.html rename to tests/wpt/tests/css/css-cascade/all-prop-revert-layer-noop.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-revert-layer.html b/tests/wpt/tests/css/css-cascade/all-prop-revert-layer.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-revert-layer.html rename to tests/wpt/tests/css/css-cascade/all-prop-revert-layer.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-revert-noop.html b/tests/wpt/tests/css/css-cascade/all-prop-revert-noop.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-revert-noop.html rename to tests/wpt/tests/css/css-cascade/all-prop-revert-noop.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-revert-visited-ref.html b/tests/wpt/tests/css/css-cascade/all-prop-revert-visited-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-revert-visited-ref.html rename to tests/wpt/tests/css/css-cascade/all-prop-revert-visited-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-revert-visited.html b/tests/wpt/tests/css/css-cascade/all-prop-revert-visited.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-revert-visited.html rename to tests/wpt/tests/css/css-cascade/all-prop-revert-visited.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-unset-color.html b/tests/wpt/tests/css/css-cascade/all-prop-unset-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-unset-color.html rename to tests/wpt/tests/css/css-cascade/all-prop-unset-color.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-unset-visited-ref.html b/tests/wpt/tests/css/css-cascade/all-prop-unset-visited-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-unset-visited-ref.html rename to tests/wpt/tests/css/css-cascade/all-prop-unset-visited-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-unset-visited.html b/tests/wpt/tests/css/css-cascade/all-prop-unset-visited.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/all-prop-unset-visited.html rename to tests/wpt/tests/css/css-cascade/all-prop-unset-visited.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/at-scope-parsing.html b/tests/wpt/tests/css/css-cascade/at-scope-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/at-scope-parsing.html rename to tests/wpt/tests/css/css-cascade/at-scope-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/idlharness.html b/tests/wpt/tests/css/css-cascade/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/idlharness.html rename to tests/wpt/tests/css/css-cascade/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/import-conditional-001.html b/tests/wpt/tests/css/css-cascade/import-conditional-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/import-conditional-001.html rename to tests/wpt/tests/css/css-cascade/import-conditional-001.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/import-conditional-002.html b/tests/wpt/tests/css/css-cascade/import-conditional-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/import-conditional-002.html rename to tests/wpt/tests/css/css-cascade/import-conditional-002.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/import-conditions.html b/tests/wpt/tests/css/css-cascade/import-conditions.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/import-conditions.html rename to tests/wpt/tests/css/css-cascade/import-conditions.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/import-removal.html b/tests/wpt/tests/css/css-cascade/import-removal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/import-removal.html rename to tests/wpt/tests/css/css-cascade/import-removal.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/important-prop-ref.html b/tests/wpt/tests/css/css-cascade/important-prop-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/important-prop-ref.html rename to tests/wpt/tests/css/css-cascade/important-prop-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/important-prop.html b/tests/wpt/tests/css/css-cascade/important-prop.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/important-prop.html rename to tests/wpt/tests/css/css-cascade/important-prop.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/important-transition-manual.html b/tests/wpt/tests/css/css-cascade/important-transition-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/important-transition-manual.html rename to tests/wpt/tests/css/css-cascade/important-transition-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/important-vs-inline-001.html b/tests/wpt/tests/css/css-cascade/important-vs-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/important-vs-inline-001.html rename to tests/wpt/tests/css/css-cascade/important-vs-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/important-vs-inline-002.html b/tests/wpt/tests/css/css-cascade/important-vs-inline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/important-vs-inline-002.html rename to tests/wpt/tests/css/css-cascade/important-vs-inline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/important-vs-inline-003.html b/tests/wpt/tests/css/css-cascade/important-vs-inline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/important-vs-inline-003.html rename to tests/wpt/tests/css/css-cascade/important-vs-inline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/inherit-initial.html b/tests/wpt/tests/css/css-cascade/inherit-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/inherit-initial.html rename to tests/wpt/tests/css/css-cascade/inherit-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/initial-background-color.html b/tests/wpt/tests/css/css-cascade/initial-background-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/initial-background-color.html rename to tests/wpt/tests/css/css-cascade/initial-background-color.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/initial-color-background-001-ref.html b/tests/wpt/tests/css/css-cascade/initial-color-background-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/initial-color-background-001-ref.html rename to tests/wpt/tests/css/css-cascade/initial-color-background-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/initial-color-background-001.html b/tests/wpt/tests/css/css-cascade/initial-color-background-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/initial-color-background-001.html rename to tests/wpt/tests/css/css-cascade/initial-color-background-001.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-basic.html b/tests/wpt/tests/css/css-cascade/layer-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-basic.html rename to tests/wpt/tests/css/css-cascade/layer-basic.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-counter-style-override.html b/tests/wpt/tests/css/css-cascade/layer-counter-style-override.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-counter-style-override.html rename to tests/wpt/tests/css/css-cascade/layer-counter-style-override.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-cssom-order-reverse-at-property.html b/tests/wpt/tests/css/css-cascade/layer-cssom-order-reverse-at-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-cssom-order-reverse-at-property.html rename to tests/wpt/tests/css/css-cascade/layer-cssom-order-reverse-at-property.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-cssom-order-reverse.html b/tests/wpt/tests/css/css-cascade/layer-cssom-order-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-cssom-order-reverse.html rename to tests/wpt/tests/css/css-cascade/layer-cssom-order-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-font-face-override.html b/tests/wpt/tests/css/css-cascade/layer-font-face-override.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-font-face-override.html rename to tests/wpt/tests/css/css-cascade/layer-font-face-override.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-import.html b/tests/wpt/tests/css/css-cascade/layer-import.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-import.html rename to tests/wpt/tests/css/css-cascade/layer-import.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-important.html b/tests/wpt/tests/css/css-cascade/layer-important.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-important.html rename to tests/wpt/tests/css/css-cascade/layer-important.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-keyframes-override.html b/tests/wpt/tests/css/css-cascade/layer-keyframes-override.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-keyframes-override.html rename to tests/wpt/tests/css/css-cascade/layer-keyframes-override.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-media-query.html b/tests/wpt/tests/css/css-cascade/layer-media-query.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-media-query.html rename to tests/wpt/tests/css/css-cascade/layer-media-query.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-media-toggle.html b/tests/wpt/tests/css/css-cascade/layer-media-toggle.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-media-toggle.html rename to tests/wpt/tests/css/css-cascade/layer-media-toggle.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-property-override.html b/tests/wpt/tests/css/css-cascade/layer-property-override.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-property-override.html rename to tests/wpt/tests/css/css-cascade/layer-property-override.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-replaceSync-clears-stale.html b/tests/wpt/tests/css/css-cascade/layer-replaceSync-clears-stale.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-replaceSync-clears-stale.html rename to tests/wpt/tests/css/css-cascade/layer-replaceSync-clears-stale.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-rules-cssom.html b/tests/wpt/tests/css/css-cascade/layer-rules-cssom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-rules-cssom.html rename to tests/wpt/tests/css/css-cascade/layer-rules-cssom.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-slotted-rule.html b/tests/wpt/tests/css/css-cascade/layer-slotted-rule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-slotted-rule.html rename to tests/wpt/tests/css/css-cascade/layer-slotted-rule.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-statement-before-import.html b/tests/wpt/tests/css/css-cascade/layer-statement-before-import.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-statement-before-import.html rename to tests/wpt/tests/css/css-cascade/layer-statement-before-import.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-statement-copy-crash.html b/tests/wpt/tests/css/css-cascade/layer-statement-copy-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-statement-copy-crash.html rename to tests/wpt/tests/css/css-cascade/layer-statement-copy-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-stylesheet-sharing-important.html b/tests/wpt/tests/css/css-cascade/layer-stylesheet-sharing-important.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-stylesheet-sharing-important.html rename to tests/wpt/tests/css/css-cascade/layer-stylesheet-sharing-important.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-stylesheet-sharing-ref.html b/tests/wpt/tests/css/css-cascade/layer-stylesheet-sharing-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-stylesheet-sharing-ref.html rename to tests/wpt/tests/css/css-cascade/layer-stylesheet-sharing-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-stylesheet-sharing.html b/tests/wpt/tests/css/css-cascade/layer-stylesheet-sharing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-stylesheet-sharing.html rename to tests/wpt/tests/css/css-cascade/layer-stylesheet-sharing.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/layer-vs-inline-style.html b/tests/wpt/tests/css/css-cascade/layer-vs-inline-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/layer-vs-inline-style.html rename to tests/wpt/tests/css/css-cascade/layer-vs-inline-style.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/parsing/all-invalid.html b/tests/wpt/tests/css/css-cascade/parsing/all-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/parsing/all-invalid.html rename to tests/wpt/tests/css/css-cascade/parsing/all-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/parsing/all-valid.html b/tests/wpt/tests/css/css-cascade/parsing/all-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/parsing/all-valid.html rename to tests/wpt/tests/css/css-cascade/parsing/all-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/parsing/layer-import-parsing.html b/tests/wpt/tests/css/css-cascade/parsing/layer-import-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/parsing/layer-import-parsing.html rename to tests/wpt/tests/css/css-cascade/parsing/layer-import-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/parsing/layer.html b/tests/wpt/tests/css/css-cascade/parsing/layer.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/parsing/layer.html rename to tests/wpt/tests/css/css-cascade/parsing/layer.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/parsing/supports-import-parsing.html b/tests/wpt/tests/css/css-cascade/parsing/supports-import-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/parsing/supports-import-parsing.html rename to tests/wpt/tests/css/css-cascade/parsing/supports-import-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/presentational-hints-cascade.html b/tests/wpt/tests/css/css-cascade/presentational-hints-cascade.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/presentational-hints-cascade.html rename to tests/wpt/tests/css/css-cascade/presentational-hints-cascade.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/presentational-hints-rollback.html b/tests/wpt/tests/css/css-cascade/presentational-hints-rollback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/presentational-hints-rollback.html rename to tests/wpt/tests/css/css-cascade/presentational-hints-rollback.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/reference/all-green.html b/tests/wpt/tests/css/css-cascade/reference/all-green.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/reference/all-green.html rename to tests/wpt/tests/css/css-cascade/reference/all-green.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/reference/ref-filled-green-100px-square.xht b/tests/wpt/tests/css/css-cascade/reference/ref-filled-green-100px-square.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/reference/ref-filled-green-100px-square.xht rename to tests/wpt/tests/css/css-cascade/reference/ref-filled-green-100px-square.xht diff --git a/tests/wpt/web-platform-tests/css/css-cascade/reference/ref-green-text.html b/tests/wpt/tests/css/css-cascade/reference/ref-green-text.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/reference/ref-green-text.html rename to tests/wpt/tests/css/css-cascade/reference/ref-green-text.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/resources/scope.css b/tests/wpt/tests/css/css-cascade/resources/scope.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/resources/scope.css rename to tests/wpt/tests/css/css-cascade/resources/scope.css diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-001.html b/tests/wpt/tests/css/css-cascade/revert-layer-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-001.html rename to tests/wpt/tests/css/css-cascade/revert-layer-001.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-002.html b/tests/wpt/tests/css/css-cascade/revert-layer-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-002.html rename to tests/wpt/tests/css/css-cascade/revert-layer-002.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-003.html b/tests/wpt/tests/css/css-cascade/revert-layer-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-003.html rename to tests/wpt/tests/css/css-cascade/revert-layer-003.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-004.html b/tests/wpt/tests/css/css-cascade/revert-layer-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-004.html rename to tests/wpt/tests/css/css-cascade/revert-layer-004.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-005.html b/tests/wpt/tests/css/css-cascade/revert-layer-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-005.html rename to tests/wpt/tests/css/css-cascade/revert-layer-005.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-006.html b/tests/wpt/tests/css/css-cascade/revert-layer-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-006.html rename to tests/wpt/tests/css/css-cascade/revert-layer-006.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-007.html b/tests/wpt/tests/css/css-cascade/revert-layer-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-007.html rename to tests/wpt/tests/css/css-cascade/revert-layer-007.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-008.html b/tests/wpt/tests/css/css-cascade/revert-layer-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-008.html rename to tests/wpt/tests/css/css-cascade/revert-layer-008.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-009.html b/tests/wpt/tests/css/css-cascade/revert-layer-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-009.html rename to tests/wpt/tests/css/css-cascade/revert-layer-009.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-010.html b/tests/wpt/tests/css/css-cascade/revert-layer-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-010.html rename to tests/wpt/tests/css/css-cascade/revert-layer-010.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-011.html b/tests/wpt/tests/css/css-cascade/revert-layer-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-011.html rename to tests/wpt/tests/css/css-cascade/revert-layer-011.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-012.html b/tests/wpt/tests/css/css-cascade/revert-layer-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-012.html rename to tests/wpt/tests/css/css-cascade/revert-layer-012.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-013.html b/tests/wpt/tests/css/css-cascade/revert-layer-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-013.html rename to tests/wpt/tests/css/css-cascade/revert-layer-013.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-014.html b/tests/wpt/tests/css/css-cascade/revert-layer-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-014.html rename to tests/wpt/tests/css/css-cascade/revert-layer-014.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-015-ref.html b/tests/wpt/tests/css/css-cascade/revert-layer-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-015-ref.html rename to tests/wpt/tests/css/css-cascade/revert-layer-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-layer-015.html b/tests/wpt/tests/css/css-cascade/revert-layer-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-layer-015.html rename to tests/wpt/tests/css/css-cascade/revert-layer-015.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-val-001.html b/tests/wpt/tests/css/css-cascade/revert-val-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-val-001.html rename to tests/wpt/tests/css/css-cascade/revert-val-001.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-val-002.html b/tests/wpt/tests/css/css-cascade/revert-val-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-val-002.html rename to tests/wpt/tests/css/css-cascade/revert-val-002.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-val-003.html b/tests/wpt/tests/css/css-cascade/revert-val-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-val-003.html rename to tests/wpt/tests/css/css-cascade/revert-val-003.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-val-004.html b/tests/wpt/tests/css/css-cascade/revert-val-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-val-004.html rename to tests/wpt/tests/css/css-cascade/revert-val-004.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-val-005.html b/tests/wpt/tests/css/css-cascade/revert-val-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-val-005.html rename to tests/wpt/tests/css/css-cascade/revert-val-005.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-val-006.html b/tests/wpt/tests/css/css-cascade/revert-val-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-val-006.html rename to tests/wpt/tests/css/css-cascade/revert-val-006.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-val-007.html b/tests/wpt/tests/css/css-cascade/revert-val-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-val-007.html rename to tests/wpt/tests/css/css-cascade/revert-val-007.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-val-008.html b/tests/wpt/tests/css/css-cascade/revert-val-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-val-008.html rename to tests/wpt/tests/css/css-cascade/revert-val-008.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-val-009.html b/tests/wpt/tests/css/css-cascade/revert-val-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-val-009.html rename to tests/wpt/tests/css/css-cascade/revert-val-009.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-val-010.html b/tests/wpt/tests/css/css-cascade/revert-val-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-val-010.html rename to tests/wpt/tests/css/css-cascade/revert-val-010.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/revert-val-011.html b/tests/wpt/tests/css/css-cascade/revert-val-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/revert-val-011.html rename to tests/wpt/tests/css/css-cascade/revert-val-011.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-container.html b/tests/wpt/tests/css/css-cascade/scope-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-container.html rename to tests/wpt/tests/css/css-cascade/scope-container.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-cssom.html b/tests/wpt/tests/css/css-cascade/scope-cssom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-cssom.html rename to tests/wpt/tests/css/css-cascade/scope-cssom.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-deep.html b/tests/wpt/tests/css/css-cascade/scope-deep.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-deep.html rename to tests/wpt/tests/css/css-cascade/scope-deep.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-evaluation.html b/tests/wpt/tests/css/css-cascade/scope-evaluation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-evaluation.html rename to tests/wpt/tests/css/css-cascade/scope-evaluation.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-implicit-external.html b/tests/wpt/tests/css/css-cascade/scope-implicit-external.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-implicit-external.html rename to tests/wpt/tests/css/css-cascade/scope-implicit-external.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-implicit.html b/tests/wpt/tests/css/css-cascade/scope-implicit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-implicit.html rename to tests/wpt/tests/css/css-cascade/scope-implicit.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-invalidation.html b/tests/wpt/tests/css/css-cascade/scope-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-invalidation.html rename to tests/wpt/tests/css/css-cascade/scope-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-layer.html b/tests/wpt/tests/css/css-cascade/scope-layer.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-layer.html rename to tests/wpt/tests/css/css-cascade/scope-layer.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-media.html b/tests/wpt/tests/css/css-cascade/scope-media.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-media.html rename to tests/wpt/tests/css/css-cascade/scope-media.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-nesting.html b/tests/wpt/tests/css/css-cascade/scope-nesting.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-nesting.html rename to tests/wpt/tests/css/css-cascade/scope-nesting.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-proximity.html b/tests/wpt/tests/css/css-cascade/scope-proximity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-proximity.html rename to tests/wpt/tests/css/css-cascade/scope-proximity.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-shadow.html b/tests/wpt/tests/css/css-cascade/scope-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-shadow.html rename to tests/wpt/tests/css/css-cascade/scope-shadow.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-specificity.html b/tests/wpt/tests/css/css-cascade/scope-specificity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-specificity.html rename to tests/wpt/tests/css/css-cascade/scope-specificity.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-starting-style.html b/tests/wpt/tests/css/css-cascade/scope-starting-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-starting-style.html rename to tests/wpt/tests/css/css-cascade/scope-starting-style.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/scope-supports.html b/tests/wpt/tests/css/css-cascade/scope-supports.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/scope-supports.html rename to tests/wpt/tests/css/css-cascade/scope-supports.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/support/test-green.css b/tests/wpt/tests/css/css-cascade/support/test-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/support/test-green.css rename to tests/wpt/tests/css/css-cascade/support/test-green.css diff --git a/tests/wpt/web-platform-tests/css/css-cascade/support/test-red.css b/tests/wpt/tests/css/css-cascade/support/test-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/support/test-red.css rename to tests/wpt/tests/css/css-cascade/support/test-red.css diff --git a/tests/wpt/web-platform-tests/css/css-cascade/unset-val-001.html b/tests/wpt/tests/css/css-cascade/unset-val-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/unset-val-001.html rename to tests/wpt/tests/css/css-cascade/unset-val-001.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/unset-val-002.html b/tests/wpt/tests/css/css-cascade/unset-val-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/unset-val-002.html rename to tests/wpt/tests/css/css-cascade/unset-val-002.html diff --git a/tests/wpt/web-platform-tests/css/css-cascade/unset-value-storage.html b/tests/wpt/tests/css/css-cascade/unset-value-storage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-cascade/unset-value-storage.html rename to tests/wpt/tests/css/css-cascade/unset-value-storage.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/META.yml b/tests/wpt/tests/css/css-color-adjust/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/META.yml rename to tests/wpt/tests/css/css-color-adjust/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/animation/color-scheme-no-interpolation.html b/tests/wpt/tests/css/css-color-adjust/animation/color-scheme-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/animation/color-scheme-no-interpolation.html rename to tests/wpt/tests/css/css-color-adjust/animation/color-scheme-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/animation/forced-color-adjust-no-interpolation.html b/tests/wpt/tests/css/css-color-adjust/animation/forced-color-adjust-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/animation/forced-color-adjust-no-interpolation.html rename to tests/wpt/tests/css/css-color-adjust/animation/forced-color-adjust-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/inheritance.html b/tests/wpt/tests/css/css-color-adjust/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/inheritance.html rename to tests/wpt/tests/css/css-color-adjust/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-computed.html b/tests/wpt/tests/css/css-color-adjust/parsing/color-scheme-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-computed.html rename to tests/wpt/tests/css/css-color-adjust/parsing/color-scheme-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-invalid.html b/tests/wpt/tests/css/css-color-adjust/parsing/color-scheme-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-invalid.html rename to tests/wpt/tests/css/css-color-adjust/parsing/color-scheme-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-valid.html b/tests/wpt/tests/css/css-color-adjust/parsing/color-scheme-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-valid.html rename to tests/wpt/tests/css/css-color-adjust/parsing/color-scheme-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/parsing/print-color-adjust.html b/tests/wpt/tests/css/css-color-adjust/parsing/print-color-adjust.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/parsing/print-color-adjust.html rename to tests/wpt/tests/css/css-color-adjust/parsing/print-color-adjust.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox-notref.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox-notref.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-color-property.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-color-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-color-property.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-color-property.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-alpha.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-alpha.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-alpha.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-opaque-cross-origin.sub.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-opaque-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-opaque-cross-origin.sub.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-opaque-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-opaque.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-opaque.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-opaque.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-opaque.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-used-preferred-ref.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-used-preferred-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-used-preferred-ref.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-used-preferred-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-used-preferred.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-used-preferred.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-used-preferred.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-used-preferred.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-ref.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-ref.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-preferred-ref.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-preferred-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-preferred-ref.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-preferred-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-preferred.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-preferred.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-preferred.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-preferred.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-root-background.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-root-background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-root-background.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-root-background.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-system-colors.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-system-colors.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-system-colors.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-system-colors.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-table-border-currentcolor-responsive-ref.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-table-border-currentcolor-responsive-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-table-border-currentcolor-responsive-ref.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-table-border-currentcolor-responsive-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-table-border-currentcolor-responsive.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-table-border-currentcolor-responsive.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-table-border-currentcolor-responsive.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-table-border-currentcolor-responsive.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-visited-link-initial-ref.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-visited-link-initial-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-visited-link-initial-ref.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-visited-link-initial-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-visited-link-initial.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-visited-link-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-visited-link-initial.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-visited-link-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame-alpha.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame-alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame-alpha.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame-alpha.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame-opaque.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame-opaque.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame-opaque.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame-opaque.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame-ref.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame-ref.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/support/dark-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/support/prefers-color-scheme-blue-purple.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/support/prefers-color-scheme-blue-purple.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/support/prefers-color-scheme-blue-purple.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/support/prefers-color-scheme-blue-purple.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/support/prefers-color-scheme.svg b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/support/prefers-color-scheme.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/support/prefers-color-scheme.svg rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/support/prefers-color-scheme.svg diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/svg-as-image-ref.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/svg-as-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/svg-as-image-ref.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/svg-as-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/svg-as-image.html b/tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/svg-as-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/svg-as-image.html rename to tests/wpt/tests/css/css-color-adjust/rendering/dark-color-scheme/svg-as-image.html diff --git a/tests/wpt/web-platform-tests/css/css-color/009900-image-ref.html b/tests/wpt/tests/css/css-color/009900-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/009900-image-ref.html rename to tests/wpt/tests/css/css-color/009900-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/009900-tagged-image-ref.html b/tests/wpt/tests/css/css-color/009900-tagged-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/009900-tagged-image-ref.html rename to tests/wpt/tests/css/css-color/009900-tagged-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/LICENSE b/tests/wpt/tests/css/css-color/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/LICENSE rename to tests/wpt/tests/css/css-color/LICENSE diff --git a/tests/wpt/web-platform-tests/css/css-color/META.yml b/tests/wpt/tests/css/css-color/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/META.yml rename to tests/wpt/tests/css/css-color/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-color/a98rgb-001.html b/tests/wpt/tests/css/css-color/a98rgb-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/a98rgb-001.html rename to tests/wpt/tests/css/css-color/a98rgb-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/a98rgb-002.html b/tests/wpt/tests/css/css-color/a98rgb-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/a98rgb-002.html rename to tests/wpt/tests/css/css-color/a98rgb-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/a98rgb-003-ref.html b/tests/wpt/tests/css/css-color/a98rgb-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/a98rgb-003-ref.html rename to tests/wpt/tests/css/css-color/a98rgb-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/a98rgb-003.html b/tests/wpt/tests/css/css-color/a98rgb-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/a98rgb-003.html rename to tests/wpt/tests/css/css-color/a98rgb-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/a98rgb-004-ref.html b/tests/wpt/tests/css/css-color/a98rgb-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/a98rgb-004-ref.html rename to tests/wpt/tests/css/css-color/a98rgb-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/a98rgb-004.html b/tests/wpt/tests/css/css-color/a98rgb-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/a98rgb-004.html rename to tests/wpt/tests/css/css-color/a98rgb-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/animation/color-composition.html b/tests/wpt/tests/css/css-color/animation/color-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/animation/color-composition.html rename to tests/wpt/tests/css/css-color/animation/color-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-color/animation/color-interpolation.html b/tests/wpt/tests/css/css-color/animation/color-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/animation/color-interpolation.html rename to tests/wpt/tests/css/css-color/animation/color-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-color/animation/opacity-animation-ending-correctly-001-ref.html b/tests/wpt/tests/css/css-color/animation/opacity-animation-ending-correctly-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/animation/opacity-animation-ending-correctly-001-ref.html rename to tests/wpt/tests/css/css-color/animation/opacity-animation-ending-correctly-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/animation/opacity-animation-ending-correctly-001.html b/tests/wpt/tests/css/css-color/animation/opacity-animation-ending-correctly-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/animation/opacity-animation-ending-correctly-001.html rename to tests/wpt/tests/css/css-color/animation/opacity-animation-ending-correctly-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/animation/opacity-animation-ending-correctly-002.html b/tests/wpt/tests/css/css-color/animation/opacity-animation-ending-correctly-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/animation/opacity-animation-ending-correctly-002.html rename to tests/wpt/tests/css/css-color/animation/opacity-animation-ending-correctly-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/animation/opacity-interpolation.html b/tests/wpt/tests/css/css-color/animation/opacity-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/animation/opacity-interpolation.html rename to tests/wpt/tests/css/css-color/animation/opacity-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-color/at-color-profile-001.html b/tests/wpt/tests/css/css-color/at-color-profile-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/at-color-profile-001.html rename to tests/wpt/tests/css/css-color/at-color-profile-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/background-color-hsl-001-ref.html b/tests/wpt/tests/css/css-color/background-color-hsl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/background-color-hsl-001-ref.html rename to tests/wpt/tests/css/css-color/background-color-hsl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/background-color-hsl-001.html b/tests/wpt/tests/css/css-color/background-color-hsl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/background-color-hsl-001.html rename to tests/wpt/tests/css/css-color/background-color-hsl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/background-color-hsl-002-ref.html b/tests/wpt/tests/css/css-color/background-color-hsl-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/background-color-hsl-002-ref.html rename to tests/wpt/tests/css/css-color/background-color-hsl-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/background-color-hsl-002.html b/tests/wpt/tests/css/css-color/background-color-hsl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/background-color-hsl-002.html rename to tests/wpt/tests/css/css-color/background-color-hsl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/background-color-hsl-003-ref.html b/tests/wpt/tests/css/css-color/background-color-hsl-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/background-color-hsl-003-ref.html rename to tests/wpt/tests/css/css-color/background-color-hsl-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/background-color-hsl-003.html b/tests/wpt/tests/css/css-color/background-color-hsl-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/background-color-hsl-003.html rename to tests/wpt/tests/css/css-color/background-color-hsl-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/background-color-hsl-004-ref.html b/tests/wpt/tests/css/css-color/background-color-hsl-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/background-color-hsl-004-ref.html rename to tests/wpt/tests/css/css-color/background-color-hsl-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/background-color-hsl-004.html b/tests/wpt/tests/css/css-color/background-color-hsl-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/background-color-hsl-004.html rename to tests/wpt/tests/css/css-color/background-color-hsl-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/background-color-rgb-001-ref.html b/tests/wpt/tests/css/css-color/background-color-rgb-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/background-color-rgb-001-ref.html rename to tests/wpt/tests/css/css-color/background-color-rgb-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/background-color-rgb-001.html b/tests/wpt/tests/css/css-color/background-color-rgb-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/background-color-rgb-001.html rename to tests/wpt/tests/css/css-color/background-color-rgb-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/background-color-rgb-002-ref.html b/tests/wpt/tests/css/css-color/background-color-rgb-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/background-color-rgb-002-ref.html rename to tests/wpt/tests/css/css-color/background-color-rgb-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/background-color-rgb-002.html b/tests/wpt/tests/css/css-color/background-color-rgb-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/background-color-rgb-002.html rename to tests/wpt/tests/css/css-color/background-color-rgb-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/background-color-rgb-003-ref.html b/tests/wpt/tests/css/css-color/background-color-rgb-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/background-color-rgb-003-ref.html rename to tests/wpt/tests/css/css-color/background-color-rgb-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/background-color-rgb-003.html b/tests/wpt/tests/css/css-color/background-color-rgb-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/background-color-rgb-003.html rename to tests/wpt/tests/css/css-color/background-color-rgb-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/blacksquare-ref.html b/tests/wpt/tests/css/css-color/blacksquare-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/blacksquare-ref.html rename to tests/wpt/tests/css/css-color/blacksquare-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/blacktext-ref.html b/tests/wpt/tests/css/css-color/blacktext-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/blacktext-ref.html rename to tests/wpt/tests/css/css-color/blacktext-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/body-opacity-0-to-1-stacking-context.html b/tests/wpt/tests/css/css-color/body-opacity-0-to-1-stacking-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/body-opacity-0-to-1-stacking-context.html rename to tests/wpt/tests/css/css-color/body-opacity-0-to-1-stacking-context.html diff --git a/tests/wpt/web-platform-tests/css/css-color/border-bottom-color.xht b/tests/wpt/tests/css/css-color/border-bottom-color.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/border-bottom-color.xht rename to tests/wpt/tests/css/css-color/border-bottom-color.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/border-color-ref.xht b/tests/wpt/tests/css/css-color/border-color-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/border-color-ref.xht rename to tests/wpt/tests/css/css-color/border-color-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/border-left-color.xht b/tests/wpt/tests/css/css-color/border-left-color.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/border-left-color.xht rename to tests/wpt/tests/css/css-color/border-left-color.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/border-right-color.xht b/tests/wpt/tests/css/css-color/border-right-color.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/border-right-color.xht rename to tests/wpt/tests/css/css-color/border-right-color.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/border-top-color.xht b/tests/wpt/tests/css/css-color/border-top-color.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/border-top-color.xht rename to tests/wpt/tests/css/css-color/border-top-color.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/canvas-change-opacity.html b/tests/wpt/tests/css/css-color/canvas-change-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/canvas-change-opacity.html rename to tests/wpt/tests/css/css-color/canvas-change-opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-001.html b/tests/wpt/tests/css/css-color/color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-001.html rename to tests/wpt/tests/css/css-color/color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-002.html b/tests/wpt/tests/css/css-color/color-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-002.html rename to tests/wpt/tests/css/css-color/color-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-003.html b/tests/wpt/tests/css/css-color/color-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-003.html rename to tests/wpt/tests/css/css-color/color-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-contrast-001.html b/tests/wpt/tests/css/css-color/color-contrast-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-contrast-001.html rename to tests/wpt/tests/css/css-color/color-contrast-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-initial-canvastext.html b/tests/wpt/tests/css/css-color/color-initial-canvastext.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-initial-canvastext.html rename to tests/wpt/tests/css/css-color/color-initial-canvastext.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-basic-001-ref.html b/tests/wpt/tests/css/css-color/color-mix-basic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-basic-001-ref.html rename to tests/wpt/tests/css/css-color/color-mix-basic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-basic-001.html b/tests/wpt/tests/css/css-color/color-mix-basic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-basic-001.html rename to tests/wpt/tests/css/css-color/color-mix-basic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-001-ref.html b/tests/wpt/tests/css/css-color/color-mix-currentcolor-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-001-ref.html rename to tests/wpt/tests/css/css-color/color-mix-currentcolor-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-001.html b/tests/wpt/tests/css/css-color/color-mix-currentcolor-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-001.html rename to tests/wpt/tests/css/css-color/color-mix-currentcolor-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-002-ref.html b/tests/wpt/tests/css/css-color/color-mix-currentcolor-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-002-ref.html rename to tests/wpt/tests/css/css-color/color-mix-currentcolor-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-002.html b/tests/wpt/tests/css/css-color/color-mix-currentcolor-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-002.html rename to tests/wpt/tests/css/css-color/color-mix-currentcolor-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-003-ref.html b/tests/wpt/tests/css/css-color/color-mix-currentcolor-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-003-ref.html rename to tests/wpt/tests/css/css-color/color-mix-currentcolor-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-003.html b/tests/wpt/tests/css/css-color/color-mix-currentcolor-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-003.html rename to tests/wpt/tests/css/css-color/color-mix-currentcolor-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-nested-for-color-property-ref.html b/tests/wpt/tests/css/css-color/color-mix-currentcolor-nested-for-color-property-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-nested-for-color-property-ref.html rename to tests/wpt/tests/css/css-color/color-mix-currentcolor-nested-for-color-property-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-nested-for-color-property.html b/tests/wpt/tests/css/css-color/color-mix-currentcolor-nested-for-color-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-currentcolor-nested-for-color-property.html rename to tests/wpt/tests/css/css-color/color-mix-currentcolor-nested-for-color-property.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-non-srgb-001-ref.html b/tests/wpt/tests/css/css-color/color-mix-non-srgb-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-non-srgb-001-ref.html rename to tests/wpt/tests/css/css-color/color-mix-non-srgb-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-non-srgb-001.html b/tests/wpt/tests/css/css-color/color-mix-non-srgb-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-non-srgb-001.html rename to tests/wpt/tests/css/css-color/color-mix-non-srgb-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-percents-01-ref.html b/tests/wpt/tests/css/css-color/color-mix-percents-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-percents-01-ref.html rename to tests/wpt/tests/css/css-color/color-mix-percents-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-percents-01.html b/tests/wpt/tests/css/css-color/color-mix-percents-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-percents-01.html rename to tests/wpt/tests/css/css-color/color-mix-percents-01.html diff --git a/tests/wpt/web-platform-tests/css/css-color/color-mix-percents-02.html b/tests/wpt/tests/css/css-color/color-mix-percents-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/color-mix-percents-02.html rename to tests/wpt/tests/css/css-color/color-mix-percents-02.html diff --git a/tests/wpt/web-platform-tests/css/css-color/composited-filters-under-opacity-ref.html b/tests/wpt/tests/css/css-color/composited-filters-under-opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/composited-filters-under-opacity-ref.html rename to tests/wpt/tests/css/css-color/composited-filters-under-opacity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/composited-filters-under-opacity.html b/tests/wpt/tests/css/css-color/composited-filters-under-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/composited-filters-under-opacity.html rename to tests/wpt/tests/css/css-color/composited-filters-under-opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-color/currentcolor-001.html b/tests/wpt/tests/css/css-color/currentcolor-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/currentcolor-001.html rename to tests/wpt/tests/css/css-color/currentcolor-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/currentcolor-002.html b/tests/wpt/tests/css/css-color/currentcolor-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/currentcolor-002.html rename to tests/wpt/tests/css/css-color/currentcolor-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/currentcolor-003-ref.html b/tests/wpt/tests/css/css-color/currentcolor-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/currentcolor-003-ref.html rename to tests/wpt/tests/css/css-color/currentcolor-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/currentcolor-003.html b/tests/wpt/tests/css/css-color/currentcolor-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/currentcolor-003.html rename to tests/wpt/tests/css/css-color/currentcolor-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-001.html b/tests/wpt/tests/css/css-color/deprecated-sameas-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-001.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-002.html b/tests/wpt/tests/css/css-color/deprecated-sameas-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-002.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-003.html b/tests/wpt/tests/css/css-color/deprecated-sameas-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-003.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-004.html b/tests/wpt/tests/css/css-color/deprecated-sameas-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-004.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-005.html b/tests/wpt/tests/css/css-color/deprecated-sameas-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-005.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-006.html b/tests/wpt/tests/css/css-color/deprecated-sameas-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-006.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-006.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-007.html b/tests/wpt/tests/css/css-color/deprecated-sameas-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-007.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-007.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-008.html b/tests/wpt/tests/css/css-color/deprecated-sameas-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-008.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-008.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-009.html b/tests/wpt/tests/css/css-color/deprecated-sameas-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-009.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-009.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-010.html b/tests/wpt/tests/css/css-color/deprecated-sameas-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-010.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-010.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-011.html b/tests/wpt/tests/css/css-color/deprecated-sameas-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-011.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-011.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-012.html b/tests/wpt/tests/css/css-color/deprecated-sameas-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-012.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-012.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-013.html b/tests/wpt/tests/css/css-color/deprecated-sameas-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-013.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-013.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-014.html b/tests/wpt/tests/css/css-color/deprecated-sameas-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-014.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-014.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-015.html b/tests/wpt/tests/css/css-color/deprecated-sameas-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-015.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-015.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-016.html b/tests/wpt/tests/css/css-color/deprecated-sameas-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-016.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-016.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-017.html b/tests/wpt/tests/css/css-color/deprecated-sameas-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-017.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-017.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-018.html b/tests/wpt/tests/css/css-color/deprecated-sameas-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-018.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-018.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-019.html b/tests/wpt/tests/css/css-color/deprecated-sameas-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-019.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-019.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-020.html b/tests/wpt/tests/css/css-color/deprecated-sameas-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-020.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-020.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-021.html b/tests/wpt/tests/css/css-color/deprecated-sameas-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-021.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-021.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-022.html b/tests/wpt/tests/css/css-color/deprecated-sameas-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-022.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-022.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-023.html b/tests/wpt/tests/css/css-color/deprecated-sameas-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-023.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-023.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-ButtonBorder-ref.html b/tests/wpt/tests/css/css-color/deprecated-sameas-ButtonBorder-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-ButtonBorder-ref.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-ButtonBorder-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-ButtonFace-ref.html b/tests/wpt/tests/css/css-color/deprecated-sameas-ButtonFace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-ButtonFace-ref.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-ButtonFace-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-Canvas-ref.html b/tests/wpt/tests/css/css-color/deprecated-sameas-Canvas-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-Canvas-ref.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-Canvas-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-CanvasText-ref.html b/tests/wpt/tests/css/css-color/deprecated-sameas-CanvasText-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-CanvasText-ref.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-CanvasText-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-GrayText-ref.html b/tests/wpt/tests/css/css-color/deprecated-sameas-GrayText-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/deprecated-sameas-GrayText-ref.html rename to tests/wpt/tests/css/css-color/deprecated-sameas-GrayText-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/display-p3-001.html b/tests/wpt/tests/css/css-color/display-p3-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/display-p3-001.html rename to tests/wpt/tests/css/css-color/display-p3-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/display-p3-002.html b/tests/wpt/tests/css/css-color/display-p3-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/display-p3-002.html rename to tests/wpt/tests/css/css-color/display-p3-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/display-p3-003.html b/tests/wpt/tests/css/css-color/display-p3-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/display-p3-003.html rename to tests/wpt/tests/css/css-color/display-p3-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/display-p3-004-ref.html b/tests/wpt/tests/css/css-color/display-p3-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/display-p3-004-ref.html rename to tests/wpt/tests/css/css-color/display-p3-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/display-p3-004.html b/tests/wpt/tests/css/css-color/display-p3-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/display-p3-004.html rename to tests/wpt/tests/css/css-color/display-p3-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/display-p3-005.html b/tests/wpt/tests/css/css-color/display-p3-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/display-p3-005.html rename to tests/wpt/tests/css/css-color/display-p3-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/display-p3-006.html b/tests/wpt/tests/css/css-color/display-p3-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/display-p3-006.html rename to tests/wpt/tests/css/css-color/display-p3-006.html diff --git a/tests/wpt/web-platform-tests/css/css-color/filters-under-will-change-opacity.html b/tests/wpt/tests/css/css-color/filters-under-will-change-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/filters-under-will-change-opacity.html rename to tests/wpt/tests/css/css-color/filters-under-will-change-opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-color/greensquare-090-ref.html b/tests/wpt/tests/css/css-color/greensquare-090-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/greensquare-090-ref.html rename to tests/wpt/tests/css/css-color/greensquare-090-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/greensquare-display-p3-ref.html b/tests/wpt/tests/css/css-color/greensquare-display-p3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/greensquare-display-p3-ref.html rename to tests/wpt/tests/css/css-color/greensquare-display-p3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/greensquare-ref.html b/tests/wpt/tests/css/css-color/greensquare-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/greensquare-ref.html rename to tests/wpt/tests/css/css-color/greensquare-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/greentext-ref.html b/tests/wpt/tests/css/css-color/greentext-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/greentext-ref.html rename to tests/wpt/tests/css/css-color/greentext-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hex-001.html b/tests/wpt/tests/css/css-color/hex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hex-001.html rename to tests/wpt/tests/css/css-color/hex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hex-002.html b/tests/wpt/tests/css/css-color/hex-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hex-002.html rename to tests/wpt/tests/css/css-color/hex-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hex-003-ref.html b/tests/wpt/tests/css/css-color/hex-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hex-003-ref.html rename to tests/wpt/tests/css/css-color/hex-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hex-003.html b/tests/wpt/tests/css/css-color/hex-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hex-003.html rename to tests/wpt/tests/css/css-color/hex-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hex-004.html b/tests/wpt/tests/css/css-color/hex-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hex-004.html rename to tests/wpt/tests/css/css-color/hex-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-001.html b/tests/wpt/tests/css/css-color/hsl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsl-001.html rename to tests/wpt/tests/css/css-color/hsl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-002.html b/tests/wpt/tests/css/css-color/hsl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsl-002.html rename to tests/wpt/tests/css/css-color/hsl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-003.html b/tests/wpt/tests/css/css-color/hsl-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsl-003.html rename to tests/wpt/tests/css/css-color/hsl-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-004.html b/tests/wpt/tests/css/css-color/hsl-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsl-004.html rename to tests/wpt/tests/css/css-color/hsl-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-005.html b/tests/wpt/tests/css/css-color/hsl-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsl-005.html rename to tests/wpt/tests/css/css-color/hsl-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-006.html b/tests/wpt/tests/css/css-color/hsl-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsl-006.html rename to tests/wpt/tests/css/css-color/hsl-006.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-007.html b/tests/wpt/tests/css/css-color/hsl-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsl-007.html rename to tests/wpt/tests/css/css-color/hsl-007.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsl-008.html b/tests/wpt/tests/css/css-color/hsl-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsl-008.html rename to tests/wpt/tests/css/css-color/hsl-008.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-001.html b/tests/wpt/tests/css/css-color/hsla-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsla-001.html rename to tests/wpt/tests/css/css-color/hsla-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-002.html b/tests/wpt/tests/css/css-color/hsla-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsla-002.html rename to tests/wpt/tests/css/css-color/hsla-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-003.html b/tests/wpt/tests/css/css-color/hsla-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsla-003.html rename to tests/wpt/tests/css/css-color/hsla-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-004.html b/tests/wpt/tests/css/css-color/hsla-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsla-004.html rename to tests/wpt/tests/css/css-color/hsla-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-005.html b/tests/wpt/tests/css/css-color/hsla-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsla-005.html rename to tests/wpt/tests/css/css-color/hsla-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-006.html b/tests/wpt/tests/css/css-color/hsla-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsla-006.html rename to tests/wpt/tests/css/css-color/hsla-006.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-007.html b/tests/wpt/tests/css/css-color/hsla-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsla-007.html rename to tests/wpt/tests/css/css-color/hsla-007.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hsla-008.html b/tests/wpt/tests/css/css-color/hsla-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hsla-008.html rename to tests/wpt/tests/css/css-color/hsla-008.html diff --git a/tests/wpt/web-platform-tests/css/css-color/htaccess b/tests/wpt/tests/css/css-color/htaccess similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/htaccess rename to tests/wpt/tests/css/css-color/htaccess diff --git a/tests/wpt/web-platform-tests/css/css-color/hwb-001.html b/tests/wpt/tests/css/css-color/hwb-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hwb-001.html rename to tests/wpt/tests/css/css-color/hwb-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hwb-002.html b/tests/wpt/tests/css/css-color/hwb-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hwb-002.html rename to tests/wpt/tests/css/css-color/hwb-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hwb-003-ref.html b/tests/wpt/tests/css/css-color/hwb-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hwb-003-ref.html rename to tests/wpt/tests/css/css-color/hwb-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hwb-003.html b/tests/wpt/tests/css/css-color/hwb-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hwb-003.html rename to tests/wpt/tests/css/css-color/hwb-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hwb-004-ref.html b/tests/wpt/tests/css/css-color/hwb-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hwb-004-ref.html rename to tests/wpt/tests/css/css-color/hwb-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hwb-004.html b/tests/wpt/tests/css/css-color/hwb-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hwb-004.html rename to tests/wpt/tests/css/css-color/hwb-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hwb-005-ref.html b/tests/wpt/tests/css/css-color/hwb-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hwb-005-ref.html rename to tests/wpt/tests/css/css-color/hwb-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/hwb-005.html b/tests/wpt/tests/css/css-color/hwb-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/hwb-005.html rename to tests/wpt/tests/css/css-color/hwb-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/inheritance.html b/tests/wpt/tests/css/css-color/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/inheritance.html rename to tests/wpt/tests/css/css-color/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-color/inline-opacity-float-child.html b/tests/wpt/tests/css/css-color/inline-opacity-float-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/inline-opacity-float-child.html rename to tests/wpt/tests/css/css-color/inline-opacity-float-child.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-001.html b/tests/wpt/tests/css/css-color/lab-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-001.html rename to tests/wpt/tests/css/css-color/lab-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-002.html b/tests/wpt/tests/css/css-color/lab-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-002.html rename to tests/wpt/tests/css/css-color/lab-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-003.html b/tests/wpt/tests/css/css-color/lab-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-003.html rename to tests/wpt/tests/css/css-color/lab-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-004-ref.html b/tests/wpt/tests/css/css-color/lab-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-004-ref.html rename to tests/wpt/tests/css/css-color/lab-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-004.html b/tests/wpt/tests/css/css-color/lab-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-004.html rename to tests/wpt/tests/css/css-color/lab-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-005-ref.html b/tests/wpt/tests/css/css-color/lab-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-005-ref.html rename to tests/wpt/tests/css/css-color/lab-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-005.html b/tests/wpt/tests/css/css-color/lab-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-005.html rename to tests/wpt/tests/css/css-color/lab-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-006-ref.html b/tests/wpt/tests/css/css-color/lab-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-006-ref.html rename to tests/wpt/tests/css/css-color/lab-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-006.html b/tests/wpt/tests/css/css-color/lab-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-006.html rename to tests/wpt/tests/css/css-color/lab-006.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-007-ref.html b/tests/wpt/tests/css/css-color/lab-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-007-ref.html rename to tests/wpt/tests/css/css-color/lab-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-007.html b/tests/wpt/tests/css/css-color/lab-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-007.html rename to tests/wpt/tests/css/css-color/lab-007.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-008.html b/tests/wpt/tests/css/css-color/lab-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-008.html rename to tests/wpt/tests/css/css-color/lab-008.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-l-over-100-1.html b/tests/wpt/tests/css/css-color/lab-l-over-100-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-l-over-100-1.html rename to tests/wpt/tests/css/css-color/lab-l-over-100-1.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-l-over-100-2.html b/tests/wpt/tests/css/css-color/lab-l-over-100-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-l-over-100-2.html rename to tests/wpt/tests/css/css-color/lab-l-over-100-2.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-l-over-100-ref.html b/tests/wpt/tests/css/css-color/lab-l-over-100-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lab-l-over-100-ref.html rename to tests/wpt/tests/css/css-color/lab-l-over-100-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-001.html b/tests/wpt/tests/css/css-color/lch-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-001.html rename to tests/wpt/tests/css/css-color/lch-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-002.html b/tests/wpt/tests/css/css-color/lch-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-002.html rename to tests/wpt/tests/css/css-color/lch-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-003.html b/tests/wpt/tests/css/css-color/lch-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-003.html rename to tests/wpt/tests/css/css-color/lch-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-004-ref.html b/tests/wpt/tests/css/css-color/lch-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-004-ref.html rename to tests/wpt/tests/css/css-color/lch-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-004.html b/tests/wpt/tests/css/css-color/lch-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-004.html rename to tests/wpt/tests/css/css-color/lch-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-005-ref.html b/tests/wpt/tests/css/css-color/lch-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-005-ref.html rename to tests/wpt/tests/css/css-color/lch-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-005.html b/tests/wpt/tests/css/css-color/lch-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-005.html rename to tests/wpt/tests/css/css-color/lch-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-006-ref.html b/tests/wpt/tests/css/css-color/lch-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-006-ref.html rename to tests/wpt/tests/css/css-color/lch-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-006.html b/tests/wpt/tests/css/css-color/lch-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-006.html rename to tests/wpt/tests/css/css-color/lch-006.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-007-ref.html b/tests/wpt/tests/css/css-color/lch-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-007-ref.html rename to tests/wpt/tests/css/css-color/lch-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-007.html b/tests/wpt/tests/css/css-color/lch-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-007.html rename to tests/wpt/tests/css/css-color/lch-007.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-008.html b/tests/wpt/tests/css/css-color/lch-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-008.html rename to tests/wpt/tests/css/css-color/lch-008.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-009.html b/tests/wpt/tests/css/css-color/lch-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-009.html rename to tests/wpt/tests/css/css-color/lch-009.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-010.html b/tests/wpt/tests/css/css-color/lch-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-010.html rename to tests/wpt/tests/css/css-color/lch-010.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-l-over-100-1.html b/tests/wpt/tests/css/css-color/lch-l-over-100-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-l-over-100-1.html rename to tests/wpt/tests/css/css-color/lch-l-over-100-1.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-l-over-100-2.html b/tests/wpt/tests/css/css-color/lch-l-over-100-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-l-over-100-2.html rename to tests/wpt/tests/css/css-color/lch-l-over-100-2.html diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-l-over-100-ref.html b/tests/wpt/tests/css/css-color/lch-l-over-100-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/lch-l-over-100-ref.html rename to tests/wpt/tests/css/css-color/lch-l-over-100-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/mossgreensquare-ref.html b/tests/wpt/tests/css/css-color/mossgreensquare-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/mossgreensquare-ref.html rename to tests/wpt/tests/css/css-color/mossgreensquare-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/named-001.html b/tests/wpt/tests/css/css-color/named-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/named-001.html rename to tests/wpt/tests/css/css-color/named-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/nested-color-mix-with-currentcolor.html b/tests/wpt/tests/css/css-color/nested-color-mix-with-currentcolor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/nested-color-mix-with-currentcolor.html rename to tests/wpt/tests/css/css-color/nested-color-mix-with-currentcolor.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklab-001.html b/tests/wpt/tests/css/css-color/oklab-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklab-001.html rename to tests/wpt/tests/css/css-color/oklab-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklab-002.html b/tests/wpt/tests/css/css-color/oklab-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklab-002.html rename to tests/wpt/tests/css/css-color/oklab-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklab-003.html b/tests/wpt/tests/css/css-color/oklab-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklab-003.html rename to tests/wpt/tests/css/css-color/oklab-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklab-004-ref.html b/tests/wpt/tests/css/css-color/oklab-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklab-004-ref.html rename to tests/wpt/tests/css/css-color/oklab-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklab-004.html b/tests/wpt/tests/css/css-color/oklab-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklab-004.html rename to tests/wpt/tests/css/css-color/oklab-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklab-005-ref.html b/tests/wpt/tests/css/css-color/oklab-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklab-005-ref.html rename to tests/wpt/tests/css/css-color/oklab-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklab-005.html b/tests/wpt/tests/css/css-color/oklab-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklab-005.html rename to tests/wpt/tests/css/css-color/oklab-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklab-006-ref.html b/tests/wpt/tests/css/css-color/oklab-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklab-006-ref.html rename to tests/wpt/tests/css/css-color/oklab-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklab-006.html b/tests/wpt/tests/css/css-color/oklab-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklab-006.html rename to tests/wpt/tests/css/css-color/oklab-006.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklab-007-ref.html b/tests/wpt/tests/css/css-color/oklab-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklab-007-ref.html rename to tests/wpt/tests/css/css-color/oklab-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklab-007.html b/tests/wpt/tests/css/css-color/oklab-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklab-007.html rename to tests/wpt/tests/css/css-color/oklab-007.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklab-008.html b/tests/wpt/tests/css/css-color/oklab-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklab-008.html rename to tests/wpt/tests/css/css-color/oklab-008.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklab-009.html b/tests/wpt/tests/css/css-color/oklab-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklab-009.html rename to tests/wpt/tests/css/css-color/oklab-009.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-001.html b/tests/wpt/tests/css/css-color/oklch-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-001.html rename to tests/wpt/tests/css/css-color/oklch-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-002.html b/tests/wpt/tests/css/css-color/oklch-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-002.html rename to tests/wpt/tests/css/css-color/oklch-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-003.html b/tests/wpt/tests/css/css-color/oklch-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-003.html rename to tests/wpt/tests/css/css-color/oklch-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-004-ref.html b/tests/wpt/tests/css/css-color/oklch-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-004-ref.html rename to tests/wpt/tests/css/css-color/oklch-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-004.html b/tests/wpt/tests/css/css-color/oklch-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-004.html rename to tests/wpt/tests/css/css-color/oklch-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-005-ref.html b/tests/wpt/tests/css/css-color/oklch-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-005-ref.html rename to tests/wpt/tests/css/css-color/oklch-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-005.html b/tests/wpt/tests/css/css-color/oklch-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-005.html rename to tests/wpt/tests/css/css-color/oklch-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-006-ref.html b/tests/wpt/tests/css/css-color/oklch-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-006-ref.html rename to tests/wpt/tests/css/css-color/oklch-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-006.html b/tests/wpt/tests/css/css-color/oklch-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-006.html rename to tests/wpt/tests/css/css-color/oklch-006.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-007-ref.html b/tests/wpt/tests/css/css-color/oklch-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-007-ref.html rename to tests/wpt/tests/css/css-color/oklch-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-007.html b/tests/wpt/tests/css/css-color/oklch-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-007.html rename to tests/wpt/tests/css/css-color/oklch-007.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-008.html b/tests/wpt/tests/css/css-color/oklch-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-008.html rename to tests/wpt/tests/css/css-color/oklch-008.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-009.html b/tests/wpt/tests/css/css-color/oklch-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-009.html rename to tests/wpt/tests/css/css-color/oklch-009.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-010.html b/tests/wpt/tests/css/css-color/oklch-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-010.html rename to tests/wpt/tests/css/css-color/oklch-010.html diff --git a/tests/wpt/web-platform-tests/css/css-color/oklch-011.html b/tests/wpt/tests/css/css-color/oklch-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/oklch-011.html rename to tests/wpt/tests/css/css-color/oklch-011.html diff --git a/tests/wpt/web-platform-tests/css/css-color/opacity-overlapping-letters-ref.html b/tests/wpt/tests/css/css-color/opacity-overlapping-letters-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/opacity-overlapping-letters-ref.html rename to tests/wpt/tests/css/css-color/opacity-overlapping-letters-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/opacity-overlapping-letters.html b/tests/wpt/tests/css/css-color/opacity-overlapping-letters.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/opacity-overlapping-letters.html rename to tests/wpt/tests/css/css-color/opacity-overlapping-letters.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-color-contrast-function.html b/tests/wpt/tests/css/css-color/parsing/color-computed-color-contrast-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-color-contrast-function.html rename to tests/wpt/tests/css/css-color/parsing/color-computed-color-contrast-function.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-color-function.html b/tests/wpt/tests/css/css-color/parsing/color-computed-color-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-color-function.html rename to tests/wpt/tests/css/css-color/parsing/color-computed-color-function.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-color-mix-function.html b/tests/wpt/tests/css/css-color/parsing/color-computed-color-mix-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-color-mix-function.html rename to tests/wpt/tests/css/css-color/parsing/color-computed-color-mix-function.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-hex-color.html b/tests/wpt/tests/css/css-color/parsing/color-computed-hex-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-hex-color.html rename to tests/wpt/tests/css/css-color/parsing/color-computed-hex-color.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-hsl.html b/tests/wpt/tests/css/css-color/parsing/color-computed-hsl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-hsl.html rename to tests/wpt/tests/css/css-color/parsing/color-computed-hsl.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-hwb.html b/tests/wpt/tests/css/css-color/parsing/color-computed-hwb.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-hwb.html rename to tests/wpt/tests/css/css-color/parsing/color-computed-hwb.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-lab.html b/tests/wpt/tests/css/css-color/parsing/color-computed-lab.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-lab.html rename to tests/wpt/tests/css/css-color/parsing/color-computed-lab.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-named-color.html b/tests/wpt/tests/css/css-color/parsing/color-computed-named-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-named-color.html rename to tests/wpt/tests/css/css-color/parsing/color-computed-named-color.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-relative-color.html b/tests/wpt/tests/css/css-color/parsing/color-computed-relative-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-relative-color.html rename to tests/wpt/tests/css/css-color/parsing/color-computed-relative-color.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-rgb.html b/tests/wpt/tests/css/css-color/parsing/color-computed-rgb.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-computed-rgb.html rename to tests/wpt/tests/css/css-color/parsing/color-computed-rgb.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-computed.html b/tests/wpt/tests/css/css-color/parsing/color-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-computed.html rename to tests/wpt/tests/css/css-color/parsing/color-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-color-contrast-function.html b/tests/wpt/tests/css/css-color/parsing/color-invalid-color-contrast-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-color-contrast-function.html rename to tests/wpt/tests/css/css-color/parsing/color-invalid-color-contrast-function.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-color-function.html b/tests/wpt/tests/css/css-color/parsing/color-invalid-color-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-color-function.html rename to tests/wpt/tests/css/css-color/parsing/color-invalid-color-function.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-color-mix-function.html b/tests/wpt/tests/css/css-color/parsing/color-invalid-color-mix-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-color-mix-function.html rename to tests/wpt/tests/css/css-color/parsing/color-invalid-color-mix-function.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-hex-color.html b/tests/wpt/tests/css/css-color/parsing/color-invalid-hex-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-hex-color.html rename to tests/wpt/tests/css/css-color/parsing/color-invalid-hex-color.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-hsl.html b/tests/wpt/tests/css/css-color/parsing/color-invalid-hsl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-hsl.html rename to tests/wpt/tests/css/css-color/parsing/color-invalid-hsl.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-hwb.html b/tests/wpt/tests/css/css-color/parsing/color-invalid-hwb.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-hwb.html rename to tests/wpt/tests/css/css-color/parsing/color-invalid-hwb.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-lab.html b/tests/wpt/tests/css/css-color/parsing/color-invalid-lab.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-lab.html rename to tests/wpt/tests/css/css-color/parsing/color-invalid-lab.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-named-color.html b/tests/wpt/tests/css/css-color/parsing/color-invalid-named-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-named-color.html rename to tests/wpt/tests/css/css-color/parsing/color-invalid-named-color.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-relative-color.html b/tests/wpt/tests/css/css-color/parsing/color-invalid-relative-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-relative-color.html rename to tests/wpt/tests/css/css-color/parsing/color-invalid-relative-color.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-rgb.html b/tests/wpt/tests/css/css-color/parsing/color-invalid-rgb.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid-rgb.html rename to tests/wpt/tests/css/css-color/parsing/color-invalid-rgb.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid.html b/tests/wpt/tests/css/css-color/parsing/color-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-invalid.html rename to tests/wpt/tests/css/css-color/parsing/color-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-mix-out-of-gamut.html b/tests/wpt/tests/css/css-color/parsing/color-mix-out-of-gamut.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-mix-out-of-gamut.html rename to tests/wpt/tests/css/css-color/parsing/color-mix-out-of-gamut.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-color-contrast-function.html b/tests/wpt/tests/css/css-color/parsing/color-valid-color-contrast-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-color-contrast-function.html rename to tests/wpt/tests/css/css-color/parsing/color-valid-color-contrast-function.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-color-function.html b/tests/wpt/tests/css/css-color/parsing/color-valid-color-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-color-function.html rename to tests/wpt/tests/css/css-color/parsing/color-valid-color-function.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-color-mix-function.html b/tests/wpt/tests/css/css-color/parsing/color-valid-color-mix-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-color-mix-function.html rename to tests/wpt/tests/css/css-color/parsing/color-valid-color-mix-function.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-hsl.html b/tests/wpt/tests/css/css-color/parsing/color-valid-hsl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-hsl.html rename to tests/wpt/tests/css/css-color/parsing/color-valid-hsl.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-hwb.html b/tests/wpt/tests/css/css-color/parsing/color-valid-hwb.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-hwb.html rename to tests/wpt/tests/css/css-color/parsing/color-valid-hwb.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-lab.html b/tests/wpt/tests/css/css-color/parsing/color-valid-lab.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-lab.html rename to tests/wpt/tests/css/css-color/parsing/color-valid-lab.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-relative-color.html b/tests/wpt/tests/css/css-color/parsing/color-valid-relative-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-relative-color.html rename to tests/wpt/tests/css/css-color/parsing/color-valid-relative-color.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-rgb.html b/tests/wpt/tests/css/css-color/parsing/color-valid-rgb.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-rgb.html rename to tests/wpt/tests/css/css-color/parsing/color-valid-rgb.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-system-color.html b/tests/wpt/tests/css/css-color/parsing/color-valid-system-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-valid-system-color.html rename to tests/wpt/tests/css/css-color/parsing/color-valid-system-color.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/color-valid.html b/tests/wpt/tests/css/css-color/parsing/color-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/color-valid.html rename to tests/wpt/tests/css/css-color/parsing/color-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/opacity-computed.html b/tests/wpt/tests/css/css-color/parsing/opacity-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/opacity-computed.html rename to tests/wpt/tests/css/css-color/parsing/opacity-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/opacity-invalid.html b/tests/wpt/tests/css/css-color/parsing/opacity-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/opacity-invalid.html rename to tests/wpt/tests/css/css-color/parsing/opacity-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-color/parsing/opacity-valid.html b/tests/wpt/tests/css/css-color/parsing/opacity-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/parsing/opacity-valid.html rename to tests/wpt/tests/css/css-color/parsing/opacity-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-001.html b/tests/wpt/tests/css/css-color/predefined-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/predefined-001.html rename to tests/wpt/tests/css/css-color/predefined-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-002.html b/tests/wpt/tests/css/css-color/predefined-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/predefined-002.html rename to tests/wpt/tests/css/css-color/predefined-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-005.html b/tests/wpt/tests/css/css-color/predefined-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/predefined-005.html rename to tests/wpt/tests/css/css-color/predefined-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-006.html b/tests/wpt/tests/css/css-color/predefined-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/predefined-006.html rename to tests/wpt/tests/css/css-color/predefined-006.html diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-007.html b/tests/wpt/tests/css/css-color/predefined-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/predefined-007.html rename to tests/wpt/tests/css/css-color/predefined-007.html diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-008.html b/tests/wpt/tests/css/css-color/predefined-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/predefined-008.html rename to tests/wpt/tests/css/css-color/predefined-008.html diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-009.html b/tests/wpt/tests/css/css-color/predefined-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/predefined-009.html rename to tests/wpt/tests/css/css-color/predefined-009.html diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-010.html b/tests/wpt/tests/css/css-color/predefined-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/predefined-010.html rename to tests/wpt/tests/css/css-color/predefined-010.html diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-011.html b/tests/wpt/tests/css/css-color/predefined-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/predefined-011.html rename to tests/wpt/tests/css/css-color/predefined-011.html diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-012.html b/tests/wpt/tests/css/css-color/predefined-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/predefined-012.html rename to tests/wpt/tests/css/css-color/predefined-012.html diff --git a/tests/wpt/web-platform-tests/css/css-color/predefined-016.html b/tests/wpt/tests/css/css-color/predefined-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/predefined-016.html rename to tests/wpt/tests/css/css-color/predefined-016.html diff --git a/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-001.html b/tests/wpt/tests/css/css-color/prophoto-rgb-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-001.html rename to tests/wpt/tests/css/css-color/prophoto-rgb-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-002.html b/tests/wpt/tests/css/css-color/prophoto-rgb-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-002.html rename to tests/wpt/tests/css/css-color/prophoto-rgb-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-003-ref.html b/tests/wpt/tests/css/css-color/prophoto-rgb-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-003-ref.html rename to tests/wpt/tests/css/css-color/prophoto-rgb-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-003.html b/tests/wpt/tests/css/css-color/prophoto-rgb-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-003.html rename to tests/wpt/tests/css/css-color/prophoto-rgb-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-004-ref.html b/tests/wpt/tests/css/css-color/prophoto-rgb-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-004-ref.html rename to tests/wpt/tests/css/css-color/prophoto-rgb-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-004.html b/tests/wpt/tests/css/css-color/prophoto-rgb-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-004.html rename to tests/wpt/tests/css/css-color/prophoto-rgb-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-005.html b/tests/wpt/tests/css/css-color/prophoto-rgb-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/prophoto-rgb-005.html rename to tests/wpt/tests/css/css-color/prophoto-rgb-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rebeccapurple-ref.html b/tests/wpt/tests/css/css-color/rebeccapurple-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rebeccapurple-ref.html rename to tests/wpt/tests/css/css-color/rebeccapurple-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rec2020-001.html b/tests/wpt/tests/css/css-color/rec2020-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rec2020-001.html rename to tests/wpt/tests/css/css-color/rec2020-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rec2020-002.html b/tests/wpt/tests/css/css-color/rec2020-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rec2020-002.html rename to tests/wpt/tests/css/css-color/rec2020-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rec2020-003-ref.html b/tests/wpt/tests/css/css-color/rec2020-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rec2020-003-ref.html rename to tests/wpt/tests/css/css-color/rec2020-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rec2020-003.html b/tests/wpt/tests/css/css-color/rec2020-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rec2020-003.html rename to tests/wpt/tests/css/css-color/rec2020-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rec2020-004-ref.html b/tests/wpt/tests/css/css-color/rec2020-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rec2020-004-ref.html rename to tests/wpt/tests/css/css-color/rec2020-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rec2020-004.html b/tests/wpt/tests/css/css-color/rec2020-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rec2020-004.html rename to tests/wpt/tests/css/css-color/rec2020-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rec2020-005.html b/tests/wpt/tests/css/css-color/rec2020-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rec2020-005.html rename to tests/wpt/tests/css/css-color/rec2020-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/reference/system-color-hightlights-vs-getSelection-001-ref.html b/tests/wpt/tests/css/css-color/reference/system-color-hightlights-vs-getSelection-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/reference/system-color-hightlights-vs-getSelection-001-ref.html rename to tests/wpt/tests/css/css-color/reference/system-color-hightlights-vs-getSelection-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-001.html b/tests/wpt/tests/css/css-color/rgb-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgb-001.html rename to tests/wpt/tests/css/css-color/rgb-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-002.html b/tests/wpt/tests/css/css-color/rgb-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgb-002.html rename to tests/wpt/tests/css/css-color/rgb-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-003.html b/tests/wpt/tests/css/css-color/rgb-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgb-003.html rename to tests/wpt/tests/css/css-color/rgb-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-004.html b/tests/wpt/tests/css/css-color/rgb-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgb-004.html rename to tests/wpt/tests/css/css-color/rgb-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-005.html b/tests/wpt/tests/css/css-color/rgb-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgb-005.html rename to tests/wpt/tests/css/css-color/rgb-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-006.html b/tests/wpt/tests/css/css-color/rgb-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgb-006.html rename to tests/wpt/tests/css/css-color/rgb-006.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-007.html b/tests/wpt/tests/css/css-color/rgb-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgb-007.html rename to tests/wpt/tests/css/css-color/rgb-007.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgb-008.html b/tests/wpt/tests/css/css-color/rgb-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgb-008.html rename to tests/wpt/tests/css/css-color/rgb-008.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-001.html b/tests/wpt/tests/css/css-color/rgba-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgba-001.html rename to tests/wpt/tests/css/css-color/rgba-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-002.html b/tests/wpt/tests/css/css-color/rgba-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgba-002.html rename to tests/wpt/tests/css/css-color/rgba-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-003.html b/tests/wpt/tests/css/css-color/rgba-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgba-003.html rename to tests/wpt/tests/css/css-color/rgba-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-004.html b/tests/wpt/tests/css/css-color/rgba-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgba-004.html rename to tests/wpt/tests/css/css-color/rgba-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-005.html b/tests/wpt/tests/css/css-color/rgba-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgba-005.html rename to tests/wpt/tests/css/css-color/rgba-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-006.html b/tests/wpt/tests/css/css-color/rgba-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgba-006.html rename to tests/wpt/tests/css/css-color/rgba-006.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-007.html b/tests/wpt/tests/css/css-color/rgba-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgba-007.html rename to tests/wpt/tests/css/css-color/rgba-007.html diff --git a/tests/wpt/web-platform-tests/css/css-color/rgba-008.html b/tests/wpt/tests/css/css-color/rgba-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/rgba-008.html rename to tests/wpt/tests/css/css-color/rgba-008.html diff --git a/tests/wpt/web-platform-tests/css/css-color/srgb-linear-001.html b/tests/wpt/tests/css/css-color/srgb-linear-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/srgb-linear-001.html rename to tests/wpt/tests/css/css-color/srgb-linear-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/srgb-linear-002.html b/tests/wpt/tests/css/css-color/srgb-linear-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/srgb-linear-002.html rename to tests/wpt/tests/css/css-color/srgb-linear-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/srgb-linear-003-ref.html b/tests/wpt/tests/css/css-color/srgb-linear-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/srgb-linear-003-ref.html rename to tests/wpt/tests/css/css-color/srgb-linear-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/srgb-linear-003.html b/tests/wpt/tests/css/css-color/srgb-linear-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/srgb-linear-003.html rename to tests/wpt/tests/css/css-color/srgb-linear-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/srgb-linear-004-ref.html b/tests/wpt/tests/css/css-color/srgb-linear-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/srgb-linear-004-ref.html rename to tests/wpt/tests/css/css-color/srgb-linear-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/srgb-linear-004.html b/tests/wpt/tests/css/css-color/srgb-linear-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/srgb-linear-004.html rename to tests/wpt/tests/css/css-color/srgb-linear-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/support/009900-sRGB.png b/tests/wpt/tests/css/css-color/support/009900-sRGB.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/support/009900-sRGB.png rename to tests/wpt/tests/css/css-color/support/009900-sRGB.png diff --git a/tests/wpt/web-platform-tests/css/css-color/support/009900.png b/tests/wpt/tests/css/css-color/support/009900.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/support/009900.png rename to tests/wpt/tests/css/css-color/support/009900.png diff --git a/tests/wpt/web-platform-tests/css/css-color/support/swap-990000-iCCP.png b/tests/wpt/tests/css/css-color/support/swap-990000-iCCP.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/support/swap-990000-iCCP.png rename to tests/wpt/tests/css/css-color/support/swap-990000-iCCP.png diff --git a/tests/wpt/web-platform-tests/css/css-color/support/swapped.icc b/tests/wpt/tests/css/css-color/support/swapped.icc similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/support/swapped.icc rename to tests/wpt/tests/css/css-color/support/swapped.icc diff --git a/tests/wpt/web-platform-tests/css/css-color/system-color-compute.html b/tests/wpt/tests/css/css-color/system-color-compute.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/system-color-compute.html rename to tests/wpt/tests/css/css-color/system-color-compute.html diff --git a/tests/wpt/web-platform-tests/css/css-color/system-color-consistency.html b/tests/wpt/tests/css/css-color/system-color-consistency.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/system-color-consistency.html rename to tests/wpt/tests/css/css-color/system-color-consistency.html diff --git a/tests/wpt/web-platform-tests/css/css-color/system-color-hightlights-vs-getSelection-001.html b/tests/wpt/tests/css/css-color/system-color-hightlights-vs-getSelection-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/system-color-hightlights-vs-getSelection-001.html rename to tests/wpt/tests/css/css-color/system-color-hightlights-vs-getSelection-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t31-color-currentColor-b-ref.html b/tests/wpt/tests/css/css-color/t31-color-currentColor-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t31-color-currentColor-b-ref.html rename to tests/wpt/tests/css/css-color/t31-color-currentColor-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t31-color-currentColor-b.xht b/tests/wpt/tests/css/css-color/t31-color-currentColor-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t31-color-currentColor-b.xht rename to tests/wpt/tests/css/css-color/t31-color-currentColor-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t31-color-text-a-ref.xht b/tests/wpt/tests/css/css-color/t31-color-text-a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t31-color-text-a-ref.xht rename to tests/wpt/tests/css/css-color/t31-color-text-a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t31-color-text-a.xht b/tests/wpt/tests/css/css-color/t31-color-text-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t31-color-text-a.xht rename to tests/wpt/tests/css/css-color/t31-color-text-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.0-a-ref.html b/tests/wpt/tests/css/css-color/t32-opacity-basic-0.0-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.0-a-ref.html rename to tests/wpt/tests/css/css-color/t32-opacity-basic-0.0-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.0-a.xht b/tests/wpt/tests/css/css-color/t32-opacity-basic-0.0-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.0-a.xht rename to tests/wpt/tests/css/css-color/t32-opacity-basic-0.0-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.6-a-ref.html b/tests/wpt/tests/css/css-color/t32-opacity-basic-0.6-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.6-a-ref.html rename to tests/wpt/tests/css/css-color/t32-opacity-basic-0.6-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.6-a.xht b/tests/wpt/tests/css/css-color/t32-opacity-basic-0.6-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-0.6-a.xht rename to tests/wpt/tests/css/css-color/t32-opacity-basic-0.6-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-1.0-a-ref.html b/tests/wpt/tests/css/css-color/t32-opacity-basic-1.0-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-1.0-a-ref.html rename to tests/wpt/tests/css/css-color/t32-opacity-basic-1.0-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-1.0-a.xht b/tests/wpt/tests/css/css-color/t32-opacity-basic-1.0-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-basic-1.0-a.xht rename to tests/wpt/tests/css/css-color/t32-opacity-basic-1.0-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-clamping-0.0-b.xht b/tests/wpt/tests/css/css-color/t32-opacity-clamping-0.0-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-clamping-0.0-b.xht rename to tests/wpt/tests/css/css-color/t32-opacity-clamping-0.0-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-clamping-1.0-b-ref.html b/tests/wpt/tests/css/css-color/t32-opacity-clamping-1.0-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-clamping-1.0-b-ref.html rename to tests/wpt/tests/css/css-color/t32-opacity-clamping-1.0-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-clamping-1.0-b.xht b/tests/wpt/tests/css/css-color/t32-opacity-clamping-1.0-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-clamping-1.0-b.xht rename to tests/wpt/tests/css/css-color/t32-opacity-clamping-1.0-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-b-ref.html b/tests/wpt/tests/css/css-color/t32-opacity-offscreen-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-b-ref.html rename to tests/wpt/tests/css/css-color/t32-opacity-offscreen-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-b.xht b/tests/wpt/tests/css/css-color/t32-opacity-offscreen-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-b.xht rename to tests/wpt/tests/css/css-color/t32-opacity-offscreen-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-multiple-boxes-1-c-ref.html b/tests/wpt/tests/css/css-color/t32-opacity-offscreen-multiple-boxes-1-c-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-multiple-boxes-1-c-ref.html rename to tests/wpt/tests/css/css-color/t32-opacity-offscreen-multiple-boxes-1-c-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-multiple-boxes-1-c.xht b/tests/wpt/tests/css/css-color/t32-opacity-offscreen-multiple-boxes-1-c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-multiple-boxes-1-c.xht rename to tests/wpt/tests/css/css-color/t32-opacity-offscreen-multiple-boxes-1-c.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-multiple-boxes-2-c-ref.html b/tests/wpt/tests/css/css-color/t32-opacity-offscreen-multiple-boxes-2-c-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-multiple-boxes-2-c-ref.html rename to tests/wpt/tests/css/css-color/t32-opacity-offscreen-multiple-boxes-2-c-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-multiple-boxes-2-c.xht b/tests/wpt/tests/css/css-color/t32-opacity-offscreen-multiple-boxes-2-c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-multiple-boxes-2-c.xht rename to tests/wpt/tests/css/css-color/t32-opacity-offscreen-multiple-boxes-2-c.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-with-alpha-c-ref.html b/tests/wpt/tests/css/css-color/t32-opacity-offscreen-with-alpha-c-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-with-alpha-c-ref.html rename to tests/wpt/tests/css/css-color/t32-opacity-offscreen-with-alpha-c-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-with-alpha-c.xht b/tests/wpt/tests/css/css-color/t32-opacity-offscreen-with-alpha-c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-offscreen-with-alpha-c.xht rename to tests/wpt/tests/css/css-color/t32-opacity-offscreen-with-alpha-c.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-zorder-c-ref.html b/tests/wpt/tests/css/css-color/t32-opacity-zorder-c-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-zorder-c-ref.html rename to tests/wpt/tests/css/css-color/t32-opacity-zorder-c-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t32-opacity-zorder-c.xht b/tests/wpt/tests/css/css-color/t32-opacity-zorder-c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t32-opacity-zorder-c.xht rename to tests/wpt/tests/css/css-color/t32-opacity-zorder-c.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t41-html4-keywords-a-ref.html b/tests/wpt/tests/css/css-color/t41-html4-keywords-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t41-html4-keywords-a-ref.html rename to tests/wpt/tests/css/css-color/t41-html4-keywords-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t41-html4-keywords-a.xht b/tests/wpt/tests/css/css-color/t41-html4-keywords-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t41-html4-keywords-a.xht rename to tests/wpt/tests/css/css-color/t41-html4-keywords-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-clip-outside-gamut-b-ref.html b/tests/wpt/tests/css/css-color/t421-rgb-clip-outside-gamut-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t421-rgb-clip-outside-gamut-b-ref.html rename to tests/wpt/tests/css/css-color/t421-rgb-clip-outside-gamut-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-clip-outside-gamut-b.xht b/tests/wpt/tests/css/css-color/t421-rgb-clip-outside-gamut-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t421-rgb-clip-outside-gamut-b.xht rename to tests/wpt/tests/css/css-color/t421-rgb-clip-outside-gamut-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-func-int-a.xht b/tests/wpt/tests/css/css-color/t421-rgb-func-int-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t421-rgb-func-int-a.xht rename to tests/wpt/tests/css/css-color/t421-rgb-func-int-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-func-no-mixed-f.xht b/tests/wpt/tests/css/css-color/t421-rgb-func-no-mixed-f.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t421-rgb-func-no-mixed-f.xht rename to tests/wpt/tests/css/css-color/t421-rgb-func-no-mixed-f.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-func-pct-a.xht b/tests/wpt/tests/css/css-color/t421-rgb-func-pct-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t421-rgb-func-pct-a.xht rename to tests/wpt/tests/css/css-color/t421-rgb-func-pct-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-func-whitespace-b.xht b/tests/wpt/tests/css/css-color/t421-rgb-func-whitespace-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t421-rgb-func-whitespace-b.xht rename to tests/wpt/tests/css/css-color/t421-rgb-func-whitespace-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex-parsing-f.xht b/tests/wpt/tests/css/css-color/t421-rgb-hex-parsing-f.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex-parsing-f.xht rename to tests/wpt/tests/css/css-color/t421-rgb-hex-parsing-f.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex3-a.xht b/tests/wpt/tests/css/css-color/t421-rgb-hex3-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex3-a.xht rename to tests/wpt/tests/css/css-color/t421-rgb-hex3-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex3-expand-b-ref.html b/tests/wpt/tests/css/css-color/t421-rgb-hex3-expand-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex3-expand-b-ref.html rename to tests/wpt/tests/css/css-color/t421-rgb-hex3-expand-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex3-expand-b.xht b/tests/wpt/tests/css/css-color/t421-rgb-hex3-expand-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex3-expand-b.xht rename to tests/wpt/tests/css/css-color/t421-rgb-hex3-expand-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex6-a.xht b/tests/wpt/tests/css/css-color/t421-rgb-hex6-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t421-rgb-hex6-a.xht rename to tests/wpt/tests/css/css-color/t421-rgb-hex6-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-values-meaning-b-ref.html b/tests/wpt/tests/css/css-color/t421-rgb-values-meaning-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t421-rgb-values-meaning-b-ref.html rename to tests/wpt/tests/css/css-color/t421-rgb-values-meaning-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t421-rgb-values-meaning-b.xht b/tests/wpt/tests/css/css-color/t421-rgb-values-meaning-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t421-rgb-values-meaning-b.xht rename to tests/wpt/tests/css/css-color/t421-rgb-values-meaning-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-a0.0-a.xht b/tests/wpt/tests/css/css-color/t422-rgba-a0.0-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-a0.0-a.xht rename to tests/wpt/tests/css/css-color/t422-rgba-a0.0-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-a0.6-a.xht b/tests/wpt/tests/css/css-color/t422-rgba-a0.6-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-a0.6-a.xht rename to tests/wpt/tests/css/css-color/t422-rgba-a0.6-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-a1.0-a-ref.html b/tests/wpt/tests/css/css-color/t422-rgba-a1.0-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-a1.0-a-ref.html rename to tests/wpt/tests/css/css-color/t422-rgba-a1.0-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-a1.0-a.xht b/tests/wpt/tests/css/css-color/t422-rgba-a1.0-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-a1.0-a.xht rename to tests/wpt/tests/css/css-color/t422-rgba-a1.0-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-clamping-a0.0-b-ref.html b/tests/wpt/tests/css/css-color/t422-rgba-clamping-a0.0-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-clamping-a0.0-b-ref.html rename to tests/wpt/tests/css/css-color/t422-rgba-clamping-a0.0-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-clamping-a0.0-b.xht b/tests/wpt/tests/css/css-color/t422-rgba-clamping-a0.0-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-clamping-a0.0-b.xht rename to tests/wpt/tests/css/css-color/t422-rgba-clamping-a0.0-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-clamping-a1.0-b-ref.html b/tests/wpt/tests/css/css-color/t422-rgba-clamping-a1.0-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-clamping-a1.0-b-ref.html rename to tests/wpt/tests/css/css-color/t422-rgba-clamping-a1.0-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-clamping-a1.0-b.xht b/tests/wpt/tests/css/css-color/t422-rgba-clamping-a1.0-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-clamping-a1.0-b.xht rename to tests/wpt/tests/css/css-color/t422-rgba-clamping-a1.0-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-clip-outside-device-gamut-b-ref.html b/tests/wpt/tests/css/css-color/t422-rgba-clip-outside-device-gamut-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-clip-outside-device-gamut-b-ref.html rename to tests/wpt/tests/css/css-color/t422-rgba-clip-outside-device-gamut-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-clip-outside-device-gamut-b.xht b/tests/wpt/tests/css/css-color/t422-rgba-clip-outside-device-gamut-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-clip-outside-device-gamut-b.xht rename to tests/wpt/tests/css/css-color/t422-rgba-clip-outside-device-gamut-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-func-int-a-ref.html b/tests/wpt/tests/css/css-color/t422-rgba-func-int-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-func-int-a-ref.html rename to tests/wpt/tests/css/css-color/t422-rgba-func-int-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-func-int-a.xht b/tests/wpt/tests/css/css-color/t422-rgba-func-int-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-func-int-a.xht rename to tests/wpt/tests/css/css-color/t422-rgba-func-int-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-func-no-mixed-f-ref.html b/tests/wpt/tests/css/css-color/t422-rgba-func-no-mixed-f-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-func-no-mixed-f-ref.html rename to tests/wpt/tests/css/css-color/t422-rgba-func-no-mixed-f-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-func-no-mixed-f.xht b/tests/wpt/tests/css/css-color/t422-rgba-func-no-mixed-f.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-func-no-mixed-f.xht rename to tests/wpt/tests/css/css-color/t422-rgba-func-no-mixed-f.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-func-pct-a.xht b/tests/wpt/tests/css/css-color/t422-rgba-func-pct-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-func-pct-a.xht rename to tests/wpt/tests/css/css-color/t422-rgba-func-pct-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-func-whitespace-b-ref.html b/tests/wpt/tests/css/css-color/t422-rgba-func-whitespace-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-func-whitespace-b-ref.html rename to tests/wpt/tests/css/css-color/t422-rgba-func-whitespace-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-func-whitespace-b.xht b/tests/wpt/tests/css/css-color/t422-rgba-func-whitespace-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-func-whitespace-b.xht rename to tests/wpt/tests/css/css-color/t422-rgba-func-whitespace-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-values-meaning-b-ref.html b/tests/wpt/tests/css/css-color/t422-rgba-values-meaning-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-values-meaning-b-ref.html rename to tests/wpt/tests/css/css-color/t422-rgba-values-meaning-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t422-rgba-values-meaning-b.xht b/tests/wpt/tests/css/css-color/t422-rgba-values-meaning-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t422-rgba-values-meaning-b.xht rename to tests/wpt/tests/css/css-color/t422-rgba-values-meaning-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t423-transparent-1-a.xht b/tests/wpt/tests/css/css-color/t423-transparent-1-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t423-transparent-1-a.xht rename to tests/wpt/tests/css/css-color/t423-transparent-1-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t423-transparent-2-a-ref.html b/tests/wpt/tests/css/css-color/t423-transparent-2-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t423-transparent-2-a-ref.html rename to tests/wpt/tests/css/css-color/t423-transparent-2-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t423-transparent-2-a.xht b/tests/wpt/tests/css/css-color/t423-transparent-2-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t423-transparent-2-a.xht rename to tests/wpt/tests/css/css-color/t423-transparent-2-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-basic-a-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-basic-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-basic-a-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-basic-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-basic-a.xht b/tests/wpt/tests/css/css-color/t424-hsl-basic-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-basic-a.xht rename to tests/wpt/tests/css/css-color/t424-hsl-basic-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-clip-outside-gamut-b-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-clip-outside-gamut-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-clip-outside-gamut-b-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-clip-outside-gamut-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-clip-outside-gamut-b.xht b/tests/wpt/tests/css/css-color/t424-hsl-clip-outside-gamut-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-clip-outside-gamut-b.xht rename to tests/wpt/tests/css/css-color/t424-hsl-clip-outside-gamut-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-h-rotating-b-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-h-rotating-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-h-rotating-b-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-h-rotating-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-h-rotating-b.xht b/tests/wpt/tests/css/css-color/t424-hsl-h-rotating-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-h-rotating-b.xht rename to tests/wpt/tests/css/css-color/t424-hsl-h-rotating-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-parsing-f-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-parsing-f-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-parsing-f-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-parsing-f-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-parsing-f.xht b/tests/wpt/tests/css/css-color/t424-hsl-parsing-f.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-parsing-f.xht rename to tests/wpt/tests/css/css-color/t424-hsl-parsing-f.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-1-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-1-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-1.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-1.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-1.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-10-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-10-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-10-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-10-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-10.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-10.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-10.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-10.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-11-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-11-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-11-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-11-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-11.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-11.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-11.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-11.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-12-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-12-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-12-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-12-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-12.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-12.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-12.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-12.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-13-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-13-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-13-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-13-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-13.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-13.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-13.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-13.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-14-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-14-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-14-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-14-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-14.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-14.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-14.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-14.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-15-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-15-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-15-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-15-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-15.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-15.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-15.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-15.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-2-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-2-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-2.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-2.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-2.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-3-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-3-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-3.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-3.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-3.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-4-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-4-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-4.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-4.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-4.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-5-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-5-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-5-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-5-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-5.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-5.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-5.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-6-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-6-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-6-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-6-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-6.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-6.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-6.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-6.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-7-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-7-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-7-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-7-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-7.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-7.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-7.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-7.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-8-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-8-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-8-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-8-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-8.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-8.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-8.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-8.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-9-ref.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-9-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-9-ref.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-9-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-9.html b/tests/wpt/tests/css/css-color/t424-hsl-values-b-9.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t424-hsl-values-b-9.html rename to tests/wpt/tests/css/css-color/t424-hsl-values-b-9.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t425-hsla-basic-a-ref.html b/tests/wpt/tests/css/css-color/t425-hsla-basic-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t425-hsla-basic-a-ref.html rename to tests/wpt/tests/css/css-color/t425-hsla-basic-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t425-hsla-basic-a.xht b/tests/wpt/tests/css/css-color/t425-hsla-basic-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t425-hsla-basic-a.xht rename to tests/wpt/tests/css/css-color/t425-hsla-basic-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t425-hsla-clip-outside-device-gamut-b-ref.html b/tests/wpt/tests/css/css-color/t425-hsla-clip-outside-device-gamut-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t425-hsla-clip-outside-device-gamut-b-ref.html rename to tests/wpt/tests/css/css-color/t425-hsla-clip-outside-device-gamut-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t425-hsla-clip-outside-device-gamut-b.xht b/tests/wpt/tests/css/css-color/t425-hsla-clip-outside-device-gamut-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t425-hsla-clip-outside-device-gamut-b.xht rename to tests/wpt/tests/css/css-color/t425-hsla-clip-outside-device-gamut-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t425-hsla-h-rotating-b-ref.html b/tests/wpt/tests/css/css-color/t425-hsla-h-rotating-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t425-hsla-h-rotating-b-ref.html rename to tests/wpt/tests/css/css-color/t425-hsla-h-rotating-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t425-hsla-h-rotating-b.xht b/tests/wpt/tests/css/css-color/t425-hsla-h-rotating-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t425-hsla-h-rotating-b.xht rename to tests/wpt/tests/css/css-color/t425-hsla-h-rotating-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t425-hsla-parsing-f.xht b/tests/wpt/tests/css/css-color/t425-hsla-parsing-f.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t425-hsla-parsing-f.xht rename to tests/wpt/tests/css/css-color/t425-hsla-parsing-f.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t425-hsla-values-b-ref.html b/tests/wpt/tests/css/css-color/t425-hsla-values-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t425-hsla-values-b-ref.html rename to tests/wpt/tests/css/css-color/t425-hsla-values-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t425-hsla-values-b.xht b/tests/wpt/tests/css/css-color/t425-hsla-values-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t425-hsla-values-b.xht rename to tests/wpt/tests/css/css-color/t425-hsla-values-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t43-svg-keywords-a-ref.html b/tests/wpt/tests/css/css-color/t43-svg-keywords-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t43-svg-keywords-a-ref.html rename to tests/wpt/tests/css/css-color/t43-svg-keywords-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t43-svg-keywords-a.xht b/tests/wpt/tests/css/css-color/t43-svg-keywords-a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t43-svg-keywords-a.xht rename to tests/wpt/tests/css/css-color/t43-svg-keywords-a.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t44-currentcolor-background-b-ref.html b/tests/wpt/tests/css/css-color/t44-currentcolor-background-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t44-currentcolor-background-b-ref.html rename to tests/wpt/tests/css/css-color/t44-currentcolor-background-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t44-currentcolor-background-b.xht b/tests/wpt/tests/css/css-color/t44-currentcolor-background-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t44-currentcolor-background-b.xht rename to tests/wpt/tests/css/css-color/t44-currentcolor-background-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t44-currentcolor-border-b-ref.html b/tests/wpt/tests/css/css-color/t44-currentcolor-border-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t44-currentcolor-border-b-ref.html rename to tests/wpt/tests/css/css-color/t44-currentcolor-border-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/t44-currentcolor-border-b.xht b/tests/wpt/tests/css/css-color/t44-currentcolor-border-b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t44-currentcolor-border-b.xht rename to tests/wpt/tests/css/css-color/t44-currentcolor-border-b.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t44-currentcolor-inherited-c-ref.xht b/tests/wpt/tests/css/css-color/t44-currentcolor-inherited-c-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t44-currentcolor-inherited-c-ref.xht rename to tests/wpt/tests/css/css-color/t44-currentcolor-inherited-c-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/t44-currentcolor-inherited-c.xht b/tests/wpt/tests/css/css-color/t44-currentcolor-inherited-c.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/t44-currentcolor-inherited-c.xht rename to tests/wpt/tests/css/css-color/t44-currentcolor-inherited-c.xht diff --git a/tests/wpt/web-platform-tests/css/css-color/tagged-images-001.html b/tests/wpt/tests/css/css-color/tagged-images-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/tagged-images-001.html rename to tests/wpt/tests/css/css-color/tagged-images-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/tagged-images-002.html b/tests/wpt/tests/css/css-color/tagged-images-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/tagged-images-002.html rename to tests/wpt/tests/css/css-color/tagged-images-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/tagged-images-003.html b/tests/wpt/tests/css/css-color/tagged-images-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/tagged-images-003.html rename to tests/wpt/tests/css/css-color/tagged-images-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/tagged-images-004.html b/tests/wpt/tests/css/css-color/tagged-images-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/tagged-images-004.html rename to tests/wpt/tests/css/css-color/tagged-images-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/untagged-images-001.html b/tests/wpt/tests/css/css-color/untagged-images-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/untagged-images-001.html rename to tests/wpt/tests/css/css-color/untagged-images-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/whitesquare-ref.html b/tests/wpt/tests/css/css-color/whitesquare-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/whitesquare-ref.html rename to tests/wpt/tests/css/css-color/whitesquare-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/whitetext-ref.html b/tests/wpt/tests/css/css-color/whitetext-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/whitetext-ref.html rename to tests/wpt/tests/css/css-color/whitetext-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-001.html b/tests/wpt/tests/css/css-color/xyz-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-001.html rename to tests/wpt/tests/css/css-color/xyz-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-002.html b/tests/wpt/tests/css/css-color/xyz-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-002.html rename to tests/wpt/tests/css/css-color/xyz-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-003-ref.html b/tests/wpt/tests/css/css-color/xyz-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-003-ref.html rename to tests/wpt/tests/css/css-color/xyz-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-003.html b/tests/wpt/tests/css/css-color/xyz-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-003.html rename to tests/wpt/tests/css/css-color/xyz-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-004-ref.html b/tests/wpt/tests/css/css-color/xyz-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-004-ref.html rename to tests/wpt/tests/css/css-color/xyz-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-004.html b/tests/wpt/tests/css/css-color/xyz-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-004.html rename to tests/wpt/tests/css/css-color/xyz-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-005.html b/tests/wpt/tests/css/css-color/xyz-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-005.html rename to tests/wpt/tests/css/css-color/xyz-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-d50-001.html b/tests/wpt/tests/css/css-color/xyz-d50-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-d50-001.html rename to tests/wpt/tests/css/css-color/xyz-d50-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-d50-002.html b/tests/wpt/tests/css/css-color/xyz-d50-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-d50-002.html rename to tests/wpt/tests/css/css-color/xyz-d50-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-d50-003-ref.html b/tests/wpt/tests/css/css-color/xyz-d50-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-d50-003-ref.html rename to tests/wpt/tests/css/css-color/xyz-d50-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-d50-003.html b/tests/wpt/tests/css/css-color/xyz-d50-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-d50-003.html rename to tests/wpt/tests/css/css-color/xyz-d50-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-d50-004-ref.html b/tests/wpt/tests/css/css-color/xyz-d50-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-d50-004-ref.html rename to tests/wpt/tests/css/css-color/xyz-d50-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-d50-004.html b/tests/wpt/tests/css/css-color/xyz-d50-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-d50-004.html rename to tests/wpt/tests/css/css-color/xyz-d50-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-d50-005.html b/tests/wpt/tests/css/css-color/xyz-d50-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-d50-005.html rename to tests/wpt/tests/css/css-color/xyz-d50-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-d65-001.html b/tests/wpt/tests/css/css-color/xyz-d65-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-d65-001.html rename to tests/wpt/tests/css/css-color/xyz-d65-001.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-d65-002.html b/tests/wpt/tests/css/css-color/xyz-d65-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-d65-002.html rename to tests/wpt/tests/css/css-color/xyz-d65-002.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-d65-003-ref.html b/tests/wpt/tests/css/css-color/xyz-d65-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-d65-003-ref.html rename to tests/wpt/tests/css/css-color/xyz-d65-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-d65-003.html b/tests/wpt/tests/css/css-color/xyz-d65-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-d65-003.html rename to tests/wpt/tests/css/css-color/xyz-d65-003.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-d65-004-ref.html b/tests/wpt/tests/css/css-color/xyz-d65-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-d65-004-ref.html rename to tests/wpt/tests/css/css-color/xyz-d65-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-d65-004.html b/tests/wpt/tests/css/css-color/xyz-d65-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-d65-004.html rename to tests/wpt/tests/css/css-color/xyz-d65-004.html diff --git a/tests/wpt/web-platform-tests/css/css-color/xyz-d65-005.html b/tests/wpt/tests/css/css-color/xyz-d65-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/xyz-d65-005.html rename to tests/wpt/tests/css/css-color/xyz-d65-005.html diff --git a/tests/wpt/web-platform-tests/css/css-color/yellowsquare-ref.html b/tests/wpt/tests/css/css-color/yellowsquare-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-color/yellowsquare-ref.html rename to tests/wpt/tests/css/css-color/yellowsquare-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/META.yml b/tests/wpt/tests/css/css-conditional/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/META.yml rename to tests/wpt/tests/css/css-conditional/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-media-001.html b/tests/wpt/tests/css/css-conditional/at-media-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-media-001.html rename to tests/wpt/tests/css/css-conditional/at-media-001.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-media-002.html b/tests/wpt/tests/css/css-conditional/at-media-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-media-002.html rename to tests/wpt/tests/css/css-conditional/at-media-002.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-media-003.html b/tests/wpt/tests/css/css-conditional/at-media-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-media-003.html rename to tests/wpt/tests/css/css-conditional/at-media-003.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-media-content-001.html b/tests/wpt/tests/css/css-conditional/at-media-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-media-content-001.html rename to tests/wpt/tests/css/css-conditional/at-media-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-media-content-002.html b/tests/wpt/tests/css/css-conditional/at-media-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-media-content-002.html rename to tests/wpt/tests/css/css-conditional/at-media-content-002.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-media-content-003.html b/tests/wpt/tests/css/css-conditional/at-media-content-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-media-content-003.html rename to tests/wpt/tests/css/css-conditional/at-media-content-003.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-media-content-004.html b/tests/wpt/tests/css/css-conditional/at-media-content-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-media-content-004.html rename to tests/wpt/tests/css/css-conditional/at-media-content-004.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-media-dynamic-001.html b/tests/wpt/tests/css/css-conditional/at-media-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-media-dynamic-001.html rename to tests/wpt/tests/css/css-conditional/at-media-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-media-whitespace-optional-001.html b/tests/wpt/tests/css/css-conditional/at-media-whitespace-optional-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-media-whitespace-optional-001.html rename to tests/wpt/tests/css/css-conditional/at-media-whitespace-optional-001.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-media-whitespace-optional-002.html b/tests/wpt/tests/css/css-conditional/at-media-whitespace-optional-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-media-whitespace-optional-002.html rename to tests/wpt/tests/css/css-conditional/at-media-whitespace-optional-002.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-001-ref.html b/tests/wpt/tests/css/css-conditional/at-supports-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-001-ref.html rename to tests/wpt/tests/css/css-conditional/at-supports-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-001.html b/tests/wpt/tests/css/css-conditional/at-supports-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-001.html rename to tests/wpt/tests/css/css-conditional/at-supports-001.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-002.html b/tests/wpt/tests/css/css-conditional/at-supports-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-002.html rename to tests/wpt/tests/css/css-conditional/at-supports-002.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-003.html b/tests/wpt/tests/css/css-conditional/at-supports-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-003.html rename to tests/wpt/tests/css/css-conditional/at-supports-003.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-004.html b/tests/wpt/tests/css/css-conditional/at-supports-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-004.html rename to tests/wpt/tests/css/css-conditional/at-supports-004.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-005.html b/tests/wpt/tests/css/css-conditional/at-supports-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-005.html rename to tests/wpt/tests/css/css-conditional/at-supports-005.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-006.html b/tests/wpt/tests/css/css-conditional/at-supports-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-006.html rename to tests/wpt/tests/css/css-conditional/at-supports-006.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-007.html b/tests/wpt/tests/css/css-conditional/at-supports-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-007.html rename to tests/wpt/tests/css/css-conditional/at-supports-007.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-008.html b/tests/wpt/tests/css/css-conditional/at-supports-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-008.html rename to tests/wpt/tests/css/css-conditional/at-supports-008.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-009.html b/tests/wpt/tests/css/css-conditional/at-supports-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-009.html rename to tests/wpt/tests/css/css-conditional/at-supports-009.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-010.html b/tests/wpt/tests/css/css-conditional/at-supports-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-010.html rename to tests/wpt/tests/css/css-conditional/at-supports-010.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-011.html b/tests/wpt/tests/css/css-conditional/at-supports-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-011.html rename to tests/wpt/tests/css/css-conditional/at-supports-011.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-012.html b/tests/wpt/tests/css/css-conditional/at-supports-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-012.html rename to tests/wpt/tests/css/css-conditional/at-supports-012.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-013.html b/tests/wpt/tests/css/css-conditional/at-supports-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-013.html rename to tests/wpt/tests/css/css-conditional/at-supports-013.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-014.html b/tests/wpt/tests/css/css-conditional/at-supports-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-014.html rename to tests/wpt/tests/css/css-conditional/at-supports-014.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-015.html b/tests/wpt/tests/css/css-conditional/at-supports-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-015.html rename to tests/wpt/tests/css/css-conditional/at-supports-015.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-016.html b/tests/wpt/tests/css/css-conditional/at-supports-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-016.html rename to tests/wpt/tests/css/css-conditional/at-supports-016.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-017.html b/tests/wpt/tests/css/css-conditional/at-supports-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-017.html rename to tests/wpt/tests/css/css-conditional/at-supports-017.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-018.html b/tests/wpt/tests/css/css-conditional/at-supports-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-018.html rename to tests/wpt/tests/css/css-conditional/at-supports-018.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-019.html b/tests/wpt/tests/css/css-conditional/at-supports-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-019.html rename to tests/wpt/tests/css/css-conditional/at-supports-019.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-020.html b/tests/wpt/tests/css/css-conditional/at-supports-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-020.html rename to tests/wpt/tests/css/css-conditional/at-supports-020.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-021.html b/tests/wpt/tests/css/css-conditional/at-supports-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-021.html rename to tests/wpt/tests/css/css-conditional/at-supports-021.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-022.html b/tests/wpt/tests/css/css-conditional/at-supports-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-022.html rename to tests/wpt/tests/css/css-conditional/at-supports-022.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-023.html b/tests/wpt/tests/css/css-conditional/at-supports-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-023.html rename to tests/wpt/tests/css/css-conditional/at-supports-023.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-024.html b/tests/wpt/tests/css/css-conditional/at-supports-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-024.html rename to tests/wpt/tests/css/css-conditional/at-supports-024.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-025.html b/tests/wpt/tests/css/css-conditional/at-supports-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-025.html rename to tests/wpt/tests/css/css-conditional/at-supports-025.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-026.html b/tests/wpt/tests/css/css-conditional/at-supports-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-026.html rename to tests/wpt/tests/css/css-conditional/at-supports-026.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-027-ref.html b/tests/wpt/tests/css/css-conditional/at-supports-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-027-ref.html rename to tests/wpt/tests/css/css-conditional/at-supports-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-027.html b/tests/wpt/tests/css/css-conditional/at-supports-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-027.html rename to tests/wpt/tests/css/css-conditional/at-supports-027.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-028.html b/tests/wpt/tests/css/css-conditional/at-supports-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-028.html rename to tests/wpt/tests/css/css-conditional/at-supports-028.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-029.html b/tests/wpt/tests/css/css-conditional/at-supports-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-029.html rename to tests/wpt/tests/css/css-conditional/at-supports-029.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-030.html b/tests/wpt/tests/css/css-conditional/at-supports-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-030.html rename to tests/wpt/tests/css/css-conditional/at-supports-030.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-031.html b/tests/wpt/tests/css/css-conditional/at-supports-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-031.html rename to tests/wpt/tests/css/css-conditional/at-supports-031.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-032.html b/tests/wpt/tests/css/css-conditional/at-supports-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-032.html rename to tests/wpt/tests/css/css-conditional/at-supports-032.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-033.html b/tests/wpt/tests/css/css-conditional/at-supports-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-033.html rename to tests/wpt/tests/css/css-conditional/at-supports-033.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-034.html b/tests/wpt/tests/css/css-conditional/at-supports-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-034.html rename to tests/wpt/tests/css/css-conditional/at-supports-034.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-035.html b/tests/wpt/tests/css/css-conditional/at-supports-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-035.html rename to tests/wpt/tests/css/css-conditional/at-supports-035.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-036.html b/tests/wpt/tests/css/css-conditional/at-supports-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-036.html rename to tests/wpt/tests/css/css-conditional/at-supports-036.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-037.html b/tests/wpt/tests/css/css-conditional/at-supports-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-037.html rename to tests/wpt/tests/css/css-conditional/at-supports-037.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-038.html b/tests/wpt/tests/css/css-conditional/at-supports-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-038.html rename to tests/wpt/tests/css/css-conditional/at-supports-038.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-039.html b/tests/wpt/tests/css/css-conditional/at-supports-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-039.html rename to tests/wpt/tests/css/css-conditional/at-supports-039.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-043.html b/tests/wpt/tests/css/css-conditional/at-supports-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-043.html rename to tests/wpt/tests/css/css-conditional/at-supports-043.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-044.html b/tests/wpt/tests/css/css-conditional/at-supports-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-044.html rename to tests/wpt/tests/css/css-conditional/at-supports-044.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-045.html b/tests/wpt/tests/css/css-conditional/at-supports-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-045.html rename to tests/wpt/tests/css/css-conditional/at-supports-045.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-046.html b/tests/wpt/tests/css/css-conditional/at-supports-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-046.html rename to tests/wpt/tests/css/css-conditional/at-supports-046.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-content-001.html b/tests/wpt/tests/css/css-conditional/at-supports-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-content-001.html rename to tests/wpt/tests/css/css-conditional/at-supports-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-content-002.html b/tests/wpt/tests/css/css-conditional/at-supports-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-content-002.html rename to tests/wpt/tests/css/css-conditional/at-supports-content-002.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-content-003.html b/tests/wpt/tests/css/css-conditional/at-supports-content-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-content-003.html rename to tests/wpt/tests/css/css-conditional/at-supports-content-003.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-content-004.html b/tests/wpt/tests/css/css-conditional/at-supports-content-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-content-004.html rename to tests/wpt/tests/css/css-conditional/at-supports-content-004.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-font-format-001.html b/tests/wpt/tests/css/css-conditional/at-supports-font-format-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-font-format-001.html rename to tests/wpt/tests/css/css-conditional/at-supports-font-format-001.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-font-tech-001.html b/tests/wpt/tests/css/css-conditional/at-supports-font-tech-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-font-tech-001.html rename to tests/wpt/tests/css/css-conditional/at-supports-font-tech-001.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-namespace-001.html b/tests/wpt/tests/css/css-conditional/at-supports-namespace-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-namespace-001.html rename to tests/wpt/tests/css/css-conditional/at-supports-namespace-001.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-namespace-002.html b/tests/wpt/tests/css/css-conditional/at-supports-namespace-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-namespace-002.html rename to tests/wpt/tests/css/css-conditional/at-supports-namespace-002.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-001.html b/tests/wpt/tests/css/css-conditional/at-supports-selector-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-001.html rename to tests/wpt/tests/css/css-conditional/at-supports-selector-001.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-002.html b/tests/wpt/tests/css/css-conditional/at-supports-selector-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-002.html rename to tests/wpt/tests/css/css-conditional/at-supports-selector-002.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-003.html b/tests/wpt/tests/css/css-conditional/at-supports-selector-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-003.html rename to tests/wpt/tests/css/css-conditional/at-supports-selector-003.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-004.html b/tests/wpt/tests/css/css-conditional/at-supports-selector-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-004.html rename to tests/wpt/tests/css/css-conditional/at-supports-selector-004.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-detecting-invalid-in-logical-combinations-ref.html b/tests/wpt/tests/css/css-conditional/at-supports-selector-detecting-invalid-in-logical-combinations-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-detecting-invalid-in-logical-combinations-ref.html rename to tests/wpt/tests/css/css-conditional/at-supports-selector-detecting-invalid-in-logical-combinations-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-detecting-invalid-in-logical-combinations.html b/tests/wpt/tests/css/css-conditional/at-supports-selector-detecting-invalid-in-logical-combinations.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-detecting-invalid-in-logical-combinations.html rename to tests/wpt/tests/css/css-conditional/at-supports-selector-detecting-invalid-in-logical-combinations.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-file-selector-button.html b/tests/wpt/tests/css/css-conditional/at-supports-selector-file-selector-button.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-file-selector-button.html rename to tests/wpt/tests/css/css-conditional/at-supports-selector-file-selector-button.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-placeholder.html b/tests/wpt/tests/css/css-conditional/at-supports-selector-placeholder.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-selector-placeholder.html rename to tests/wpt/tests/css/css-conditional/at-supports-selector-placeholder.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-whitespace.html b/tests/wpt/tests/css/css-conditional/at-supports-whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/at-supports-whitespace.html rename to tests/wpt/tests/css/css-conditional/at-supports-whitespace.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-001.xht b/tests/wpt/tests/css/css-conditional/css-supports-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-001.xht rename to tests/wpt/tests/css/css-conditional/css-supports-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-002.xht b/tests/wpt/tests/css/css-conditional/css-supports-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-002.xht rename to tests/wpt/tests/css/css-conditional/css-supports-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-003.xht b/tests/wpt/tests/css/css-conditional/css-supports-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-003.xht rename to tests/wpt/tests/css/css-conditional/css-supports-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-004.xht b/tests/wpt/tests/css/css-conditional/css-supports-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-004.xht rename to tests/wpt/tests/css/css-conditional/css-supports-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-005.xht b/tests/wpt/tests/css/css-conditional/css-supports-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-005.xht rename to tests/wpt/tests/css/css-conditional/css-supports-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-006.xht b/tests/wpt/tests/css/css-conditional/css-supports-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-006.xht rename to tests/wpt/tests/css/css-conditional/css-supports-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-007.xht b/tests/wpt/tests/css/css-conditional/css-supports-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-007.xht rename to tests/wpt/tests/css/css-conditional/css-supports-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-008.xht b/tests/wpt/tests/css/css-conditional/css-supports-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-008.xht rename to tests/wpt/tests/css/css-conditional/css-supports-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-009.xht b/tests/wpt/tests/css/css-conditional/css-supports-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-009.xht rename to tests/wpt/tests/css/css-conditional/css-supports-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-010.xht b/tests/wpt/tests/css/css-conditional/css-supports-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-010.xht rename to tests/wpt/tests/css/css-conditional/css-supports-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-011.xht b/tests/wpt/tests/css/css-conditional/css-supports-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-011.xht rename to tests/wpt/tests/css/css-conditional/css-supports-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-012.xht b/tests/wpt/tests/css/css-conditional/css-supports-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-012.xht rename to tests/wpt/tests/css/css-conditional/css-supports-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-013.xht b/tests/wpt/tests/css/css-conditional/css-supports-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-013.xht rename to tests/wpt/tests/css/css-conditional/css-supports-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-014.xht b/tests/wpt/tests/css/css-conditional/css-supports-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-014.xht rename to tests/wpt/tests/css/css-conditional/css-supports-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-015.xht b/tests/wpt/tests/css/css-conditional/css-supports-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-015.xht rename to tests/wpt/tests/css/css-conditional/css-supports-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-016.xht b/tests/wpt/tests/css/css-conditional/css-supports-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-016.xht rename to tests/wpt/tests/css/css-conditional/css-supports-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-017.xht b/tests/wpt/tests/css/css-conditional/css-supports-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-017.xht rename to tests/wpt/tests/css/css-conditional/css-supports-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-018.xht b/tests/wpt/tests/css/css-conditional/css-supports-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-018.xht rename to tests/wpt/tests/css/css-conditional/css-supports-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-019.xht b/tests/wpt/tests/css/css-conditional/css-supports-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-019.xht rename to tests/wpt/tests/css/css-conditional/css-supports-019.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-020.xht b/tests/wpt/tests/css/css-conditional/css-supports-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-020.xht rename to tests/wpt/tests/css/css-conditional/css-supports-020.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-021.xht b/tests/wpt/tests/css/css-conditional/css-supports-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-021.xht rename to tests/wpt/tests/css/css-conditional/css-supports-021.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-022.xht b/tests/wpt/tests/css/css-conditional/css-supports-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-022.xht rename to tests/wpt/tests/css/css-conditional/css-supports-022.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-023.xht b/tests/wpt/tests/css/css-conditional/css-supports-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-023.xht rename to tests/wpt/tests/css/css-conditional/css-supports-023.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-024.xht b/tests/wpt/tests/css/css-conditional/css-supports-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-024.xht rename to tests/wpt/tests/css/css-conditional/css-supports-024.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-025.xht b/tests/wpt/tests/css/css-conditional/css-supports-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-025.xht rename to tests/wpt/tests/css/css-conditional/css-supports-025.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-026.xht b/tests/wpt/tests/css/css-conditional/css-supports-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-026.xht rename to tests/wpt/tests/css/css-conditional/css-supports-026.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-029.xht b/tests/wpt/tests/css/css-conditional/css-supports-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-029.xht rename to tests/wpt/tests/css/css-conditional/css-supports-029.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-030.xht b/tests/wpt/tests/css/css-conditional/css-supports-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-030.xht rename to tests/wpt/tests/css/css-conditional/css-supports-030.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-031.xht b/tests/wpt/tests/css/css-conditional/css-supports-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-031.xht rename to tests/wpt/tests/css/css-conditional/css-supports-031.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-032.xht b/tests/wpt/tests/css/css-conditional/css-supports-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-032.xht rename to tests/wpt/tests/css/css-conditional/css-supports-032.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-033.xht b/tests/wpt/tests/css/css-conditional/css-supports-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-033.xht rename to tests/wpt/tests/css/css-conditional/css-supports-033.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-034.xht b/tests/wpt/tests/css/css-conditional/css-supports-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-034.xht rename to tests/wpt/tests/css/css-conditional/css-supports-034.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-035.xht b/tests/wpt/tests/css/css-conditional/css-supports-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-035.xht rename to tests/wpt/tests/css/css-conditional/css-supports-035.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-036.xht b/tests/wpt/tests/css/css-conditional/css-supports-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-036.xht rename to tests/wpt/tests/css/css-conditional/css-supports-036.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-037.xht b/tests/wpt/tests/css/css-conditional/css-supports-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-037.xht rename to tests/wpt/tests/css/css-conditional/css-supports-037.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-038.xht b/tests/wpt/tests/css/css-conditional/css-supports-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-038.xht rename to tests/wpt/tests/css/css-conditional/css-supports-038.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-039.xht b/tests/wpt/tests/css/css-conditional/css-supports-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-039.xht rename to tests/wpt/tests/css/css-conditional/css-supports-039.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-040.xht b/tests/wpt/tests/css/css-conditional/css-supports-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-040.xht rename to tests/wpt/tests/css/css-conditional/css-supports-040.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-041.xht b/tests/wpt/tests/css/css-conditional/css-supports-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-041.xht rename to tests/wpt/tests/css/css-conditional/css-supports-041.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-042.xht b/tests/wpt/tests/css/css-conditional/css-supports-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-042.xht rename to tests/wpt/tests/css/css-conditional/css-supports-042.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-043.xht b/tests/wpt/tests/css/css-conditional/css-supports-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-043.xht rename to tests/wpt/tests/css/css-conditional/css-supports-043.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-044.xht b/tests/wpt/tests/css/css-conditional/css-supports-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-044.xht rename to tests/wpt/tests/css/css-conditional/css-supports-044.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-045.xht b/tests/wpt/tests/css/css-conditional/css-supports-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-045.xht rename to tests/wpt/tests/css/css-conditional/css-supports-045.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/css-supports-046.xht b/tests/wpt/tests/css/css-conditional/css-supports-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/css-supports-046.xht rename to tests/wpt/tests/css/css-conditional/css-supports-046.xht diff --git a/tests/wpt/web-platform-tests/css/css-conditional/idlharness.html b/tests/wpt/tests/css/css-conditional/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/idlharness.html rename to tests/wpt/tests/css/css-conditional/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/js/001.html b/tests/wpt/tests/css/css-conditional/js/001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/js/001.html rename to tests/wpt/tests/css/css-conditional/js/001.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/js/CSS-supports-CSSStyleDeclaration.html b/tests/wpt/tests/css/css-conditional/js/CSS-supports-CSSStyleDeclaration.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/js/CSS-supports-CSSStyleDeclaration.html rename to tests/wpt/tests/css/css-conditional/js/CSS-supports-CSSStyleDeclaration.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/js/CSS-supports-L3.html b/tests/wpt/tests/css/css-conditional/js/CSS-supports-L3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/js/CSS-supports-L3.html rename to tests/wpt/tests/css/css-conditional/js/CSS-supports-L3.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/js/CSS-supports-L4.html b/tests/wpt/tests/css/css-conditional/js/CSS-supports-L4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/js/CSS-supports-L4.html rename to tests/wpt/tests/css/css-conditional/js/CSS-supports-L4.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/js/CSS-supports-L5.html b/tests/wpt/tests/css/css-conditional/js/CSS-supports-L5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/js/CSS-supports-L5.html rename to tests/wpt/tests/css/css-conditional/js/CSS-supports-L5.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/js/CSS-supports-selector-detecting-invalid-in-logical-combinations.html b/tests/wpt/tests/css/css-conditional/js/CSS-supports-selector-detecting-invalid-in-logical-combinations.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/js/CSS-supports-selector-detecting-invalid-in-logical-combinations.html rename to tests/wpt/tests/css/css-conditional/js/CSS-supports-selector-detecting-invalid-in-logical-combinations.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/js/conditional-CSSGroupingRule.html b/tests/wpt/tests/css/css-conditional/js/conditional-CSSGroupingRule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/js/conditional-CSSGroupingRule.html rename to tests/wpt/tests/css/css-conditional/js/conditional-CSSGroupingRule.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/js/supports-conditionText.html b/tests/wpt/tests/css/css-conditional/js/supports-conditionText.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/js/supports-conditionText.html rename to tests/wpt/tests/css/css-conditional/js/supports-conditionText.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/reference/background-lime.html b/tests/wpt/tests/css/css-conditional/reference/background-lime.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/reference/background-lime.html rename to tests/wpt/tests/css/css-conditional/reference/background-lime.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/support/at-media-dynamic-001-inner.html b/tests/wpt/tests/css/css-conditional/support/at-media-dynamic-001-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/support/at-media-dynamic-001-inner.html rename to tests/wpt/tests/css/css-conditional/support/at-media-dynamic-001-inner.html diff --git a/tests/wpt/web-platform-tests/css/css-conditional/support/fail.css b/tests/wpt/tests/css/css-conditional/support/fail.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/support/fail.css rename to tests/wpt/tests/css/css-conditional/support/fail.css diff --git a/tests/wpt/web-platform-tests/css/css-conditional/support/pass.xht b/tests/wpt/tests/css/css-conditional/support/pass.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-conditional/support/pass.xht rename to tests/wpt/tests/css/css-conditional/support/pass.xht diff --git a/tests/wpt/web-platform-tests/css/css-contain/META.yml b/tests/wpt/tests/css/css-contain/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/META.yml rename to tests/wpt/tests/css/css-contain/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-animation-001.html b/tests/wpt/tests/css/css-contain/contain-animation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-animation-001.html rename to tests/wpt/tests/css/css-contain/contain-animation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-bg-001.html b/tests/wpt/tests/css/css-contain/contain-body-bg-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-bg-001.html rename to tests/wpt/tests/css/css-contain/contain-body-bg-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-bg-002.html b/tests/wpt/tests/css/css-contain/contain-body-bg-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-bg-002.html rename to tests/wpt/tests/css/css-contain/contain-body-bg-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-bg-003.html b/tests/wpt/tests/css/css-contain/contain-body-bg-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-bg-003.html rename to tests/wpt/tests/css/css-contain/contain-body-bg-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-bg-004.html b/tests/wpt/tests/css/css-contain/contain-body-bg-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-bg-004.html rename to tests/wpt/tests/css/css-contain/contain-body-bg-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-dir-001.html b/tests/wpt/tests/css/css-contain/contain-body-dir-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-dir-001.html rename to tests/wpt/tests/css/css-contain/contain-body-dir-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-dir-002.html b/tests/wpt/tests/css/css-contain/contain-body-dir-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-dir-002.html rename to tests/wpt/tests/css/css-contain/contain-body-dir-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-dir-003.html b/tests/wpt/tests/css/css-contain/contain-body-dir-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-dir-003.html rename to tests/wpt/tests/css/css-contain/contain-body-dir-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-dir-004.html b/tests/wpt/tests/css/css-contain/contain-body-dir-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-dir-004.html rename to tests/wpt/tests/css/css-contain/contain-body-dir-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-overflow-001.html b/tests/wpt/tests/css/css-contain/contain-body-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-overflow-001.html rename to tests/wpt/tests/css/css-contain/contain-body-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-overflow-002.html b/tests/wpt/tests/css/css-contain/contain-body-overflow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-overflow-002.html rename to tests/wpt/tests/css/css-contain/contain-body-overflow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-overflow-003.html b/tests/wpt/tests/css/css-contain/contain-body-overflow-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-overflow-003.html rename to tests/wpt/tests/css/css-contain/contain-body-overflow-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-overflow-004.html b/tests/wpt/tests/css/css-contain/contain-body-overflow-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-overflow-004.html rename to tests/wpt/tests/css/css-contain/contain-body-overflow-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-t-o-001.html b/tests/wpt/tests/css/css-contain/contain-body-t-o-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-t-o-001.html rename to tests/wpt/tests/css/css-contain/contain-body-t-o-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-t-o-002.html b/tests/wpt/tests/css/css-contain/contain-body-t-o-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-t-o-002.html rename to tests/wpt/tests/css/css-contain/contain-body-t-o-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-t-o-003.html b/tests/wpt/tests/css/css-contain/contain-body-t-o-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-t-o-003.html rename to tests/wpt/tests/css/css-contain/contain-body-t-o-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-t-o-004.html b/tests/wpt/tests/css/css-contain/contain-body-t-o-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-t-o-004.html rename to tests/wpt/tests/css/css-contain/contain-body-t-o-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-w-m-001.html b/tests/wpt/tests/css/css-contain/contain-body-w-m-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-w-m-001.html rename to tests/wpt/tests/css/css-contain/contain-body-w-m-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-w-m-002.html b/tests/wpt/tests/css/css-contain/contain-body-w-m-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-w-m-002.html rename to tests/wpt/tests/css/css-contain/contain-body-w-m-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-w-m-003.html b/tests/wpt/tests/css/css-contain/contain-body-w-m-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-w-m-003.html rename to tests/wpt/tests/css/css-contain/contain-body-w-m-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-body-w-m-004.html b/tests/wpt/tests/css/css-contain/contain-body-w-m-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-body-w-m-004.html rename to tests/wpt/tests/css/css-contain/contain-body-w-m-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-chrome-thcrash-001.html b/tests/wpt/tests/css/css-contain/contain-chrome-thcrash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-chrome-thcrash-001.html rename to tests/wpt/tests/css/css-contain/contain-chrome-thcrash-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-content-001.html b/tests/wpt/tests/css/css-contain/contain-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-content-001.html rename to tests/wpt/tests/css/css-contain/contain-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-content-002.html b/tests/wpt/tests/css/css-contain/contain-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-content-002.html rename to tests/wpt/tests/css/css-contain/contain-content-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-content-003.html b/tests/wpt/tests/css/css-contain/contain-content-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-content-003.html rename to tests/wpt/tests/css/css-contain/contain-content-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-content-004.html b/tests/wpt/tests/css/css-contain/contain-content-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-content-004.html rename to tests/wpt/tests/css/css-contain/contain-content-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-content-011.html b/tests/wpt/tests/css/css-contain/contain-content-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-content-011.html rename to tests/wpt/tests/css/css-contain/contain-content-011.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-crash.html b/tests/wpt/tests/css/css-contain/contain-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-crash.html rename to tests/wpt/tests/css/css-contain/contain-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-flexbox-outline.html b/tests/wpt/tests/css/css-contain/contain-flexbox-outline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-flexbox-outline.html rename to tests/wpt/tests/css/css-contain/contain-flexbox-outline.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-bg-001.html b/tests/wpt/tests/css/css-contain/contain-html-bg-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-bg-001.html rename to tests/wpt/tests/css/css-contain/contain-html-bg-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-bg-002.html b/tests/wpt/tests/css/css-contain/contain-html-bg-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-bg-002.html rename to tests/wpt/tests/css/css-contain/contain-html-bg-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-bg-003.html b/tests/wpt/tests/css/css-contain/contain-html-bg-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-bg-003.html rename to tests/wpt/tests/css/css-contain/contain-html-bg-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-bg-004.html b/tests/wpt/tests/css/css-contain/contain-html-bg-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-bg-004.html rename to tests/wpt/tests/css/css-contain/contain-html-bg-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-dir-001.html b/tests/wpt/tests/css/css-contain/contain-html-dir-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-dir-001.html rename to tests/wpt/tests/css/css-contain/contain-html-dir-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-dir-002.html b/tests/wpt/tests/css/css-contain/contain-html-dir-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-dir-002.html rename to tests/wpt/tests/css/css-contain/contain-html-dir-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-dir-003.html b/tests/wpt/tests/css/css-contain/contain-html-dir-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-dir-003.html rename to tests/wpt/tests/css/css-contain/contain-html-dir-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-dir-004.html b/tests/wpt/tests/css/css-contain/contain-html-dir-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-dir-004.html rename to tests/wpt/tests/css/css-contain/contain-html-dir-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-overflow-001.html b/tests/wpt/tests/css/css-contain/contain-html-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-overflow-001.html rename to tests/wpt/tests/css/css-contain/contain-html-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-overflow-002.html b/tests/wpt/tests/css/css-contain/contain-html-overflow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-overflow-002.html rename to tests/wpt/tests/css/css-contain/contain-html-overflow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-overflow-003.html b/tests/wpt/tests/css/css-contain/contain-html-overflow-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-overflow-003.html rename to tests/wpt/tests/css/css-contain/contain-html-overflow-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-overflow-004.html b/tests/wpt/tests/css/css-contain/contain-html-overflow-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-overflow-004.html rename to tests/wpt/tests/css/css-contain/contain-html-overflow-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-t-o-001.html b/tests/wpt/tests/css/css-contain/contain-html-t-o-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-t-o-001.html rename to tests/wpt/tests/css/css-contain/contain-html-t-o-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-t-o-002.html b/tests/wpt/tests/css/css-contain/contain-html-t-o-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-t-o-002.html rename to tests/wpt/tests/css/css-contain/contain-html-t-o-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-t-o-003.html b/tests/wpt/tests/css/css-contain/contain-html-t-o-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-t-o-003.html rename to tests/wpt/tests/css/css-contain/contain-html-t-o-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-t-o-004.html b/tests/wpt/tests/css/css-contain/contain-html-t-o-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-t-o-004.html rename to tests/wpt/tests/css/css-contain/contain-html-t-o-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-w-m-001.html b/tests/wpt/tests/css/css-contain/contain-html-w-m-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-w-m-001.html rename to tests/wpt/tests/css/css-contain/contain-html-w-m-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-w-m-002.html b/tests/wpt/tests/css/css-contain/contain-html-w-m-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-w-m-002.html rename to tests/wpt/tests/css/css-contain/contain-html-w-m-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-w-m-003.html b/tests/wpt/tests/css/css-contain/contain-html-w-m-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-w-m-003.html rename to tests/wpt/tests/css/css-contain/contain-html-w-m-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-html-w-m-004.html b/tests/wpt/tests/css/css-contain/contain-html-w-m-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-html-w-m-004.html rename to tests/wpt/tests/css/css-contain/contain-html-w-m-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-bfc-floats-001-ref.html b/tests/wpt/tests/css/css-contain/contain-inline-size-bfc-floats-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-bfc-floats-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-bfc-floats-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-bfc-floats-001.html b/tests/wpt/tests/css/css-contain/contain-inline-size-bfc-floats-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-bfc-floats-001.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-bfc-floats-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-bfc-floats-002-ref.html b/tests/wpt/tests/css/css-contain/contain-inline-size-bfc-floats-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-bfc-floats-002-ref.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-bfc-floats-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-bfc-floats-002.html b/tests/wpt/tests/css/css-contain/contain-inline-size-bfc-floats-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-bfc-floats-002.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-bfc-floats-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-fieldset-ref.html b/tests/wpt/tests/css/css-contain/contain-inline-size-fieldset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-fieldset-ref.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-fieldset-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-fieldset.html b/tests/wpt/tests/css/css-contain/contain-inline-size-fieldset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-fieldset.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-fieldset.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-flex.html b/tests/wpt/tests/css/css-contain/contain-inline-size-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-flex.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-flex.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-flexitem.html b/tests/wpt/tests/css/css-contain/contain-inline-size-flexitem.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-flexitem.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-flexitem.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-grid.html b/tests/wpt/tests/css/css-contain/contain-inline-size-grid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-grid.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-grid.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-intrinsic.html b/tests/wpt/tests/css/css-contain/contain-inline-size-intrinsic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-intrinsic.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-intrinsic.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-legend-ref.html b/tests/wpt/tests/css/css-contain/contain-inline-size-legend-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-legend-ref.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-legend-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-legend.html b/tests/wpt/tests/css/css-contain/contain-inline-size-legend.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-legend.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-legend.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-multicol.html b/tests/wpt/tests/css/css-contain/contain-inline-size-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-multicol.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-multicol.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-regular-container.html b/tests/wpt/tests/css/css-contain/contain-inline-size-regular-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-regular-container.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-regular-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-removed.html b/tests/wpt/tests/css/css-contain/contain-inline-size-removed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-removed.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-removed.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-replaced.html b/tests/wpt/tests/css/css-contain/contain-inline-size-replaced.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-replaced.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-replaced.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-table.html b/tests/wpt/tests/css/css-contain/contain-inline-size-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-table.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-table.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-vertical-rl-.html b/tests/wpt/tests/css/css-contain/contain-inline-size-vertical-rl-.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-inline-size-vertical-rl-.html rename to tests/wpt/tests/css/css-contain/contain-inline-size-vertical-rl-.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-001.html b/tests/wpt/tests/css/css-contain/contain-layout-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-002.html b/tests/wpt/tests/css/css-contain/contain-layout-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-002.html rename to tests/wpt/tests/css/css-contain/contain-layout-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-003.html b/tests/wpt/tests/css/css-contain/contain-layout-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-003.html rename to tests/wpt/tests/css/css-contain/contain-layout-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-004.html b/tests/wpt/tests/css/css-contain/contain-layout-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-004.html rename to tests/wpt/tests/css/css-contain/contain-layout-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-005.html b/tests/wpt/tests/css/css-contain/contain-layout-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-005.html rename to tests/wpt/tests/css/css-contain/contain-layout-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-006.html b/tests/wpt/tests/css/css-contain/contain-layout-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-006.html rename to tests/wpt/tests/css/css-contain/contain-layout-006.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-007.html b/tests/wpt/tests/css/css-contain/contain-layout-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-007.html rename to tests/wpt/tests/css/css-contain/contain-layout-007.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-009.html b/tests/wpt/tests/css/css-contain/contain-layout-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-009.html rename to tests/wpt/tests/css/css-contain/contain-layout-009.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-010.html b/tests/wpt/tests/css/css-contain/contain-layout-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-010.html rename to tests/wpt/tests/css/css-contain/contain-layout-010.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-011.html b/tests/wpt/tests/css/css-contain/contain-layout-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-011.html rename to tests/wpt/tests/css/css-contain/contain-layout-011.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-012.html b/tests/wpt/tests/css/css-contain/contain-layout-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-012.html rename to tests/wpt/tests/css/css-contain/contain-layout-012.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-013.html b/tests/wpt/tests/css/css-contain/contain-layout-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-013.html rename to tests/wpt/tests/css/css-contain/contain-layout-013.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-014.html b/tests/wpt/tests/css/css-contain/contain-layout-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-014.html rename to tests/wpt/tests/css/css-contain/contain-layout-014.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-016.html b/tests/wpt/tests/css/css-contain/contain-layout-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-016.html rename to tests/wpt/tests/css/css-contain/contain-layout-016.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-017.html b/tests/wpt/tests/css/css-contain/contain-layout-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-017.html rename to tests/wpt/tests/css/css-contain/contain-layout-017.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-018.html b/tests/wpt/tests/css/css-contain/contain-layout-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-018.html rename to tests/wpt/tests/css/css-contain/contain-layout-018.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-019.html b/tests/wpt/tests/css/css-contain/contain-layout-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-019.html rename to tests/wpt/tests/css/css-contain/contain-layout-019.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-020.html b/tests/wpt/tests/css/css-contain/contain-layout-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-020.html rename to tests/wpt/tests/css/css-contain/contain-layout-020.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-021.html b/tests/wpt/tests/css/css-contain/contain-layout-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-021.html rename to tests/wpt/tests/css/css-contain/contain-layout-021.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-baseline-001.html b/tests/wpt/tests/css/css-contain/contain-layout-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-baseline-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-baseline-002.html b/tests/wpt/tests/css/css-contain/contain-layout-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-baseline-002.html rename to tests/wpt/tests/css/css-contain/contain-layout-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-baseline-003.html b/tests/wpt/tests/css/css-contain/contain-layout-baseline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-baseline-003.html rename to tests/wpt/tests/css/css-contain/contain-layout-baseline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-baseline-004.html b/tests/wpt/tests/css/css-contain/contain-layout-baseline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-baseline-004.html rename to tests/wpt/tests/css/css-contain/contain-layout-baseline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-baseline-005.html b/tests/wpt/tests/css/css-contain/contain-layout-baseline-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-baseline-005.html rename to tests/wpt/tests/css/css-contain/contain-layout-baseline-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-breaks-001.html b/tests/wpt/tests/css/css-contain/contain-layout-breaks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-breaks-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-breaks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-breaks-002.html b/tests/wpt/tests/css/css-contain/contain-layout-breaks-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-breaks-002.html rename to tests/wpt/tests/css/css-contain/contain-layout-breaks-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-button-001.html b/tests/wpt/tests/css/css-contain/contain-layout-button-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-button-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-button-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-cell-001.html b/tests/wpt/tests/css/css-contain/contain-layout-cell-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-cell-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-cell-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-cell-002.html b/tests/wpt/tests/css/css-contain/contain-layout-cell-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-cell-002.html rename to tests/wpt/tests/css/css-contain/contain-layout-cell-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-containing-block-absolute-001.html b/tests/wpt/tests/css/css-contain/contain-layout-containing-block-absolute-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-containing-block-absolute-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-containing-block-absolute-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-containing-block-fixed-001.html b/tests/wpt/tests/css/css-contain/contain-layout-containing-block-fixed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-containing-block-fixed-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-containing-block-fixed-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-flexbox-001.html b/tests/wpt/tests/css/css-contain/contain-layout-flexbox-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-flexbox-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-flexbox-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-formatting-context-float-001.html b/tests/wpt/tests/css/css-contain/contain-layout-formatting-context-float-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-formatting-context-float-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-formatting-context-float-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-formatting-context-margin-001-ref.html b/tests/wpt/tests/css/css-contain/contain-layout-formatting-context-margin-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-formatting-context-margin-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-layout-formatting-context-margin-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-formatting-context-margin-001.html b/tests/wpt/tests/css/css-contain/contain-layout-formatting-context-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-formatting-context-margin-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-formatting-context-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-grid-001.html b/tests/wpt/tests/css/css-contain/contain-layout-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-grid-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-grid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ifc-022.html b/tests/wpt/tests/css/css-contain/contain-layout-ifc-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ifc-022.html rename to tests/wpt/tests/css/css-contain/contain-layout-ifc-022.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ignored-cases-ib-split-001-ref.html b/tests/wpt/tests/css/css-contain/contain-layout-ignored-cases-ib-split-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ignored-cases-ib-split-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-layout-ignored-cases-ib-split-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ignored-cases-ib-split-001.html b/tests/wpt/tests/css/css-contain/contain-layout-ignored-cases-ib-split-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ignored-cases-ib-split-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-ignored-cases-ib-split-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-001.html b/tests/wpt/tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-002-ref.html b/tests/wpt/tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-002-ref.html rename to tests/wpt/tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-002.html b/tests/wpt/tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-002.html rename to tests/wpt/tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-003-ref.html b/tests/wpt/tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-003-ref.html rename to tests/wpt/tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-003.html b/tests/wpt/tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-003.html rename to tests/wpt/tests/css/css-contain/contain-layout-ignored-cases-no-principal-box-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-independent-formatting-context-001.html b/tests/wpt/tests/css/css-contain/contain-layout-independent-formatting-context-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-independent-formatting-context-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-independent-formatting-context-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-independent-formatting-context-002.html b/tests/wpt/tests/css/css-contain/contain-layout-independent-formatting-context-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-independent-formatting-context-002.html rename to tests/wpt/tests/css/css-contain/contain-layout-independent-formatting-context-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-independent-formatting-context-003.html b/tests/wpt/tests/css/css-contain/contain-layout-independent-formatting-context-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-independent-formatting-context-003.html rename to tests/wpt/tests/css/css-contain/contain-layout-independent-formatting-context-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-013.html b/tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-013.html rename to tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-013.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-014.html b/tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-014.html rename to tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-014.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-015.html b/tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-015.html rename to tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-015.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-016.html b/tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-016.html rename to tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-016.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-017.html b/tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-017.html rename to tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-017.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-018.html b/tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-018.html rename to tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-018.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-019.html b/tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-019.html rename to tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-019.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-020.html b/tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-ink-overflow-020.html rename to tests/wpt/tests/css/css-contain/contain-layout-ink-overflow-020.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-overflow-001-ref.html b/tests/wpt/tests/css/css-contain/contain-layout-overflow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-overflow-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-layout-overflow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-overflow-001.html b/tests/wpt/tests/css/css-contain/contain-layout-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-overflow-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-overflow-002-ref.html b/tests/wpt/tests/css/css-contain/contain-layout-overflow-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-overflow-002-ref.html rename to tests/wpt/tests/css/css-contain/contain-layout-overflow-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-overflow-002.html b/tests/wpt/tests/css/css-contain/contain-layout-overflow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-overflow-002.html rename to tests/wpt/tests/css/css-contain/contain-layout-overflow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-size-003.html b/tests/wpt/tests/css/css-contain/contain-layout-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-size-003.html rename to tests/wpt/tests/css/css-contain/contain-layout-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-stacking-context-001.html b/tests/wpt/tests/css/css-contain/contain-layout-stacking-context-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-stacking-context-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-stacking-context-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-suppress-baseline-001-ref.html b/tests/wpt/tests/css/css-contain/contain-layout-suppress-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-suppress-baseline-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-layout-suppress-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-suppress-baseline-001.html b/tests/wpt/tests/css/css-contain/contain-layout-suppress-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-suppress-baseline-001.html rename to tests/wpt/tests/css/css-contain/contain-layout-suppress-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-suppress-baseline-002-ref.html b/tests/wpt/tests/css/css-contain/contain-layout-suppress-baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-suppress-baseline-002-ref.html rename to tests/wpt/tests/css/css-contain/contain-layout-suppress-baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-suppress-baseline-002.html b/tests/wpt/tests/css/css-contain/contain-layout-suppress-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-layout-suppress-baseline-002.html rename to tests/wpt/tests/css/css-contain/contain-layout-suppress-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-001.html b/tests/wpt/tests/css/css-contain/contain-paint-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-002.html b/tests/wpt/tests/css/css-contain/contain-paint-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-002.html rename to tests/wpt/tests/css/css-contain/contain-paint-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-004.html b/tests/wpt/tests/css/css-contain/contain-paint-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-004.html rename to tests/wpt/tests/css/css-contain/contain-paint-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-005.html b/tests/wpt/tests/css/css-contain/contain-paint-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-005.html rename to tests/wpt/tests/css/css-contain/contain-paint-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-006.html b/tests/wpt/tests/css/css-contain/contain-paint-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-006.html rename to tests/wpt/tests/css/css-contain/contain-paint-006.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-007.html b/tests/wpt/tests/css/css-contain/contain-paint-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-007.html rename to tests/wpt/tests/css/css-contain/contain-paint-007.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-008.html b/tests/wpt/tests/css/css-contain/contain-paint-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-008.html rename to tests/wpt/tests/css/css-contain/contain-paint-008.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-009.html b/tests/wpt/tests/css/css-contain/contain-paint-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-009.html rename to tests/wpt/tests/css/css-contain/contain-paint-009.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-010.html b/tests/wpt/tests/css/css-contain/contain-paint-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-010.html rename to tests/wpt/tests/css/css-contain/contain-paint-010.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-011.html b/tests/wpt/tests/css/css-contain/contain-paint-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-011.html rename to tests/wpt/tests/css/css-contain/contain-paint-011.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-012.html b/tests/wpt/tests/css/css-contain/contain-paint-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-012.html rename to tests/wpt/tests/css/css-contain/contain-paint-012.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-014.html b/tests/wpt/tests/css/css-contain/contain-paint-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-014.html rename to tests/wpt/tests/css/css-contain/contain-paint-014.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-015.html b/tests/wpt/tests/css/css-contain/contain-paint-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-015.html rename to tests/wpt/tests/css/css-contain/contain-paint-015.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-016.html b/tests/wpt/tests/css/css-contain/contain-paint-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-016.html rename to tests/wpt/tests/css/css-contain/contain-paint-016.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-017.html b/tests/wpt/tests/css/css-contain/contain-paint-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-017.html rename to tests/wpt/tests/css/css-contain/contain-paint-017.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-018.html b/tests/wpt/tests/css/css-contain/contain-paint-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-018.html rename to tests/wpt/tests/css/css-contain/contain-paint-018.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-019.html b/tests/wpt/tests/css/css-contain/contain-paint-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-019.html rename to tests/wpt/tests/css/css-contain/contain-paint-019.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-020.html b/tests/wpt/tests/css/css-contain/contain-paint-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-020.html rename to tests/wpt/tests/css/css-contain/contain-paint-020.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-021.html b/tests/wpt/tests/css/css-contain/contain-paint-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-021.html rename to tests/wpt/tests/css/css-contain/contain-paint-021.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-022.html b/tests/wpt/tests/css/css-contain/contain-paint-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-022.html rename to tests/wpt/tests/css/css-contain/contain-paint-022.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-023.html b/tests/wpt/tests/css/css-contain/contain-paint-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-023.html rename to tests/wpt/tests/css/css-contain/contain-paint-023.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-024.html b/tests/wpt/tests/css/css-contain/contain-paint-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-024.html rename to tests/wpt/tests/css/css-contain/contain-paint-024.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-025.html b/tests/wpt/tests/css/css-contain/contain-paint-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-025.html rename to tests/wpt/tests/css/css-contain/contain-paint-025.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-026.html b/tests/wpt/tests/css/css-contain/contain-paint-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-026.html rename to tests/wpt/tests/css/css-contain/contain-paint-026.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-047.html b/tests/wpt/tests/css/css-contain/contain-paint-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-047.html rename to tests/wpt/tests/css/css-contain/contain-paint-047.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-048.html b/tests/wpt/tests/css/css-contain/contain-paint-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-048.html rename to tests/wpt/tests/css/css-contain/contain-paint-048.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-049.html b/tests/wpt/tests/css/css-contain/contain-paint-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-049.html rename to tests/wpt/tests/css/css-contain/contain-paint-049.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-050-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-050-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-050-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-050-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-050.html b/tests/wpt/tests/css/css-contain/contain-paint-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-050.html rename to tests/wpt/tests/css/css-contain/contain-paint-050.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-baseline-001.html b/tests/wpt/tests/css/css-contain/contain-paint-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-baseline-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-cell-001.html b/tests/wpt/tests/css/css-contain/contain-paint-cell-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-cell-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-cell-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-cell-002.html b/tests/wpt/tests/css/css-contain/contain-paint-cell-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-cell-002.html rename to tests/wpt/tests/css/css-contain/contain-paint-cell-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-change-opacity.html b/tests/wpt/tests/css/css-contain/contain-paint-change-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-change-opacity.html rename to tests/wpt/tests/css/css-contain/contain-paint-change-opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-001-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-001.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-002-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-002-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-002.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-002.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-003-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-003-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-003.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-003.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-004-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-004-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-004.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-004.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-005.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-005.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-006-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-006-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-006.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-006.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-006.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-011.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-011.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-011.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-012.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-012.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-012.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-013.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-013.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-013.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-014.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-014.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-014.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-015.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-015.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-015.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-016.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-016.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-016.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-017.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-017.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-017.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-018.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-018.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-018.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-019.html b/tests/wpt/tests/css/css-contain/contain-paint-clip-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-clip-019.html rename to tests/wpt/tests/css/css-contain/contain-paint-clip-019.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-containing-block-absolute-001-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-containing-block-absolute-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-containing-block-absolute-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-containing-block-absolute-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-containing-block-absolute-001.html b/tests/wpt/tests/css/css-contain/contain-paint-containing-block-absolute-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-containing-block-absolute-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-containing-block-absolute-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-containing-block-fixed-001-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-containing-block-fixed-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-containing-block-fixed-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-containing-block-fixed-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-containing-block-fixed-001.html b/tests/wpt/tests/css/css-contain/contain-paint-containing-block-fixed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-containing-block-fixed-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-containing-block-fixed-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-formatting-context-float-001-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-formatting-context-float-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-formatting-context-float-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-formatting-context-float-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-formatting-context-float-001.html b/tests/wpt/tests/css/css-contain/contain-paint-formatting-context-float-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-formatting-context-float-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-formatting-context-float-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-formatting-context-margin-001-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-formatting-context-margin-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-formatting-context-margin-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-formatting-context-margin-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-formatting-context-margin-001.html b/tests/wpt/tests/css/css-contain/contain-paint-formatting-context-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-formatting-context-margin-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-formatting-context-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-ifc-011.html b/tests/wpt/tests/css/css-contain/contain-paint-ifc-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-ifc-011.html rename to tests/wpt/tests/css/css-contain/contain-paint-ifc-011.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-ib-split-001-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-ib-split-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-ib-split-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-ib-split-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-ib-split-001.html b/tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-ib-split-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-ib-split-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-ib-split-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-internal-table-001-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-internal-table-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-internal-table-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-internal-table-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-internal-table-001a.html b/tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-internal-table-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-internal-table-001a.html rename to tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-internal-table-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-internal-table-001b.html b/tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-internal-table-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-internal-table-001b.html rename to tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-internal-table-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-no-principal-box-001-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-no-principal-box-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-no-principal-box-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-no-principal-box-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-no-principal-box-001.html b/tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-no-principal-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-no-principal-box-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-no-principal-box-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-ruby-containing-block-001-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-ruby-containing-block-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-ruby-containing-block-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-ruby-containing-block-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-ruby-containing-block-001.html b/tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-ruby-containing-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-ruby-containing-block-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-ruby-containing-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-ruby-stacking-and-clipping-001-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-ruby-stacking-and-clipping-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-ruby-stacking-and-clipping-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-ruby-stacking-and-clipping-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-ruby-stacking-and-clipping-001.html b/tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-ruby-stacking-and-clipping-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-ignored-cases-ruby-stacking-and-clipping-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-ignored-cases-ruby-stacking-and-clipping-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-independent-formatting-context-001.html b/tests/wpt/tests/css/css-contain/contain-paint-independent-formatting-context-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-independent-formatting-context-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-independent-formatting-context-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-independent-formatting-context-002.html b/tests/wpt/tests/css/css-contain/contain-paint-independent-formatting-context-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-independent-formatting-context-002.html rename to tests/wpt/tests/css/css-contain/contain-paint-independent-formatting-context-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-independent-formatting-context-003.html b/tests/wpt/tests/css/css-contain/contain-paint-independent-formatting-context-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-independent-formatting-context-003.html rename to tests/wpt/tests/css/css-contain/contain-paint-independent-formatting-context-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-size-001.html b/tests/wpt/tests/css/css-contain/contain-paint-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-size-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-size-002.html b/tests/wpt/tests/css/css-contain/contain-paint-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-size-002.html rename to tests/wpt/tests/css/css-contain/contain-paint-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-size-003.html b/tests/wpt/tests/css/css-contain/contain-paint-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-size-003.html rename to tests/wpt/tests/css/css-contain/contain-paint-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-stacking-context-001-ref.html b/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-stacking-context-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-stacking-context-001a.html b/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-stacking-context-001a.html rename to tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-stacking-context-001b.html b/tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-stacking-context-001b.html rename to tests/wpt/tests/css/css-contain/contain-paint-stacking-context-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-table-001.html b/tests/wpt/tests/css/css-contain/contain-paint-table-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-table-001.html rename to tests/wpt/tests/css/css-contain/contain-paint-table-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-table-002.html b/tests/wpt/tests/css/css-contain/contain-paint-table-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-paint-table-002.html rename to tests/wpt/tests/css/css-contain/contain-paint-table-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-001.html b/tests/wpt/tests/css/css-contain/contain-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-001.html rename to tests/wpt/tests/css/css-contain/contain-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-002.html b/tests/wpt/tests/css/css-contain/contain-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-002.html rename to tests/wpt/tests/css/css-contain/contain-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-003.html b/tests/wpt/tests/css/css-contain/contain-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-003.html rename to tests/wpt/tests/css/css-contain/contain-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-004.html b/tests/wpt/tests/css/css-contain/contain-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-004.html rename to tests/wpt/tests/css/css-contain/contain-size-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-005.html b/tests/wpt/tests/css/css-contain/contain-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-005.html rename to tests/wpt/tests/css/css-contain/contain-size-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-006.html b/tests/wpt/tests/css/css-contain/contain-size-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-006.html rename to tests/wpt/tests/css/css-contain/contain-size-006.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-007.html b/tests/wpt/tests/css/css-contain/contain-size-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-007.html rename to tests/wpt/tests/css/css-contain/contain-size-007.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-008.html b/tests/wpt/tests/css/css-contain/contain-size-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-008.html rename to tests/wpt/tests/css/css-contain/contain-size-008.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-009.html b/tests/wpt/tests/css/css-contain/contain-size-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-009.html rename to tests/wpt/tests/css/css-contain/contain-size-009.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-010.html b/tests/wpt/tests/css/css-contain/contain-size-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-010.html rename to tests/wpt/tests/css/css-contain/contain-size-010.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-011.html b/tests/wpt/tests/css/css-contain/contain-size-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-011.html rename to tests/wpt/tests/css/css-contain/contain-size-011.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-012.html b/tests/wpt/tests/css/css-contain/contain-size-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-012.html rename to tests/wpt/tests/css/css-contain/contain-size-012.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-012b.html b/tests/wpt/tests/css/css-contain/contain-size-012b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-012b.html rename to tests/wpt/tests/css/css-contain/contain-size-012b.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-013.html b/tests/wpt/tests/css/css-contain/contain-size-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-013.html rename to tests/wpt/tests/css/css-contain/contain-size-013.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-021.html b/tests/wpt/tests/css/css-contain/contain-size-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-021.html rename to tests/wpt/tests/css/css-contain/contain-size-021.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-023.html b/tests/wpt/tests/css/css-contain/contain-size-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-023.html rename to tests/wpt/tests/css/css-contain/contain-size-023.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-025.html b/tests/wpt/tests/css/css-contain/contain-size-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-025.html rename to tests/wpt/tests/css/css-contain/contain-size-025.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-027.html b/tests/wpt/tests/css/css-contain/contain-size-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-027.html rename to tests/wpt/tests/css/css-contain/contain-size-027.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-041.html b/tests/wpt/tests/css/css-contain/contain-size-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-041.html rename to tests/wpt/tests/css/css-contain/contain-size-041.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-042.html b/tests/wpt/tests/css/css-contain/contain-size-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-042.html rename to tests/wpt/tests/css/css-contain/contain-size-042.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-051.html b/tests/wpt/tests/css/css-contain/contain-size-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-051.html rename to tests/wpt/tests/css/css-contain/contain-size-051.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-052.html b/tests/wpt/tests/css/css-contain/contain-size-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-052.html rename to tests/wpt/tests/css/css-contain/contain-size-052.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-056.html b/tests/wpt/tests/css/css-contain/contain-size-056.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-056.html rename to tests/wpt/tests/css/css-contain/contain-size-056.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-061.html b/tests/wpt/tests/css/css-contain/contain-size-061.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-061.html rename to tests/wpt/tests/css/css-contain/contain-size-061.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-062.html b/tests/wpt/tests/css/css-contain/contain-size-062.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-062.html rename to tests/wpt/tests/css/css-contain/contain-size-062.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-063.html b/tests/wpt/tests/css/css-contain/contain-size-063.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-063.html rename to tests/wpt/tests/css/css-contain/contain-size-063.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-064.html b/tests/wpt/tests/css/css-contain/contain-size-064.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-064.html rename to tests/wpt/tests/css/css-contain/contain-size-064.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-baseline-001.html b/tests/wpt/tests/css/css-contain/contain-size-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-baseline-001.html rename to tests/wpt/tests/css/css-contain/contain-size-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-block-001-ref.html b/tests/wpt/tests/css/css-contain/contain-size-block-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-block-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-block-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-block-001.html b/tests/wpt/tests/css/css-contain/contain-size-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-block-001.html rename to tests/wpt/tests/css/css-contain/contain-size-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-block-002-ref.html b/tests/wpt/tests/css/css-contain/contain-size-block-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-block-002-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-block-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-block-002.html b/tests/wpt/tests/css/css-contain/contain-size-block-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-block-002.html rename to tests/wpt/tests/css/css-contain/contain-size-block-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-block-003-ref.html b/tests/wpt/tests/css/css-contain/contain-size-block-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-block-003-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-block-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-block-003.html b/tests/wpt/tests/css/css-contain/contain-size-block-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-block-003.html rename to tests/wpt/tests/css/css-contain/contain-size-block-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-block-004-ref.html b/tests/wpt/tests/css/css-contain/contain-size-block-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-block-004-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-block-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-block-004.html b/tests/wpt/tests/css/css-contain/contain-size-block-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-block-004.html rename to tests/wpt/tests/css/css-contain/contain-size-block-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-borders.html b/tests/wpt/tests/css/css-contain/contain-size-borders.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-borders.html rename to tests/wpt/tests/css/css-contain/contain-size-borders.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-breaks-001.html b/tests/wpt/tests/css/css-contain/contain-size-breaks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-breaks-001.html rename to tests/wpt/tests/css/css-contain/contain-size-breaks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-button-001.html b/tests/wpt/tests/css/css-contain/contain-size-button-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-button-001.html rename to tests/wpt/tests/css/css-contain/contain-size-button-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-button-002-ref.html b/tests/wpt/tests/css/css-contain/contain-size-button-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-button-002-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-button-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-button-002.html b/tests/wpt/tests/css/css-contain/contain-size-button-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-button-002.html rename to tests/wpt/tests/css/css-contain/contain-size-button-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-fieldset-001.html b/tests/wpt/tests/css/css-contain/contain-size-fieldset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-fieldset-001.html rename to tests/wpt/tests/css/css-contain/contain-size-fieldset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-fieldset-002.html b/tests/wpt/tests/css/css-contain/contain-size-fieldset-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-fieldset-002.html rename to tests/wpt/tests/css/css-contain/contain-size-fieldset-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-fieldset-003-ref.html b/tests/wpt/tests/css/css-contain/contain-size-fieldset-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-fieldset-003-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-fieldset-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-fieldset-003.html b/tests/wpt/tests/css/css-contain/contain-size-fieldset-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-fieldset-003.html rename to tests/wpt/tests/css/css-contain/contain-size-fieldset-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-fieldset-004-ref.html b/tests/wpt/tests/css/css-contain/contain-size-fieldset-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-fieldset-004-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-fieldset-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-fieldset-004.html b/tests/wpt/tests/css/css-contain/contain-size-fieldset-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-fieldset-004.html rename to tests/wpt/tests/css/css-contain/contain-size-fieldset-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-flex-001-ref.html b/tests/wpt/tests/css/css-contain/contain-size-flex-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-flex-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-flex-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-flex-001.html b/tests/wpt/tests/css/css-contain/contain-size-flex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-flex-001.html rename to tests/wpt/tests/css/css-contain/contain-size-flex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-flexbox-001.html b/tests/wpt/tests/css/css-contain/contain-size-flexbox-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-flexbox-001.html rename to tests/wpt/tests/css/css-contain/contain-size-flexbox-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-flexbox-002.html b/tests/wpt/tests/css/css-contain/contain-size-flexbox-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-flexbox-002.html rename to tests/wpt/tests/css/css-contain/contain-size-flexbox-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-grid-001.html b/tests/wpt/tests/css/css-contain/contain-size-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-grid-001.html rename to tests/wpt/tests/css/css-contain/contain-size-grid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-grid-002.html b/tests/wpt/tests/css/css-contain/contain-size-grid-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-grid-002.html rename to tests/wpt/tests/css/css-contain/contain-size-grid-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-grid-003.html b/tests/wpt/tests/css/css-contain/contain-size-grid-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-grid-003.html rename to tests/wpt/tests/css/css-contain/contain-size-grid-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-grid-004.html b/tests/wpt/tests/css/css-contain/contain-size-grid-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-grid-004.html rename to tests/wpt/tests/css/css-contain/contain-size-grid-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-grid-005.html b/tests/wpt/tests/css/css-contain/contain-size-grid-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-grid-005.html rename to tests/wpt/tests/css/css-contain/contain-size-grid-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-grid-006.html b/tests/wpt/tests/css/css-contain/contain-size-grid-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-grid-006.html rename to tests/wpt/tests/css/css-contain/contain-size-grid-006.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-001-ref.html b/tests/wpt/tests/css/css-contain/contain-size-inline-block-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-inline-block-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-001.html b/tests/wpt/tests/css/css-contain/contain-size-inline-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-001.html rename to tests/wpt/tests/css/css-contain/contain-size-inline-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-002-ref.html b/tests/wpt/tests/css/css-contain/contain-size-inline-block-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-002-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-inline-block-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-002.html b/tests/wpt/tests/css/css-contain/contain-size-inline-block-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-002.html rename to tests/wpt/tests/css/css-contain/contain-size-inline-block-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-003-ref.html b/tests/wpt/tests/css/css-contain/contain-size-inline-block-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-003-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-inline-block-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-003.html b/tests/wpt/tests/css/css-contain/contain-size-inline-block-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-003.html rename to tests/wpt/tests/css/css-contain/contain-size-inline-block-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-004-ref.html b/tests/wpt/tests/css/css-contain/contain-size-inline-block-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-004-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-inline-block-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-004.html b/tests/wpt/tests/css/css-contain/contain-size-inline-block-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-block-004.html rename to tests/wpt/tests/css/css-contain/contain-size-inline-block-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-flex-001-ref.html b/tests/wpt/tests/css/css-contain/contain-size-inline-flex-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-flex-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-inline-flex-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-flex-001.html b/tests/wpt/tests/css/css-contain/contain-size-inline-flex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-inline-flex-001.html rename to tests/wpt/tests/css/css-contain/contain-size-inline-flex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-monolithic-001.html b/tests/wpt/tests/css/css-contain/contain-size-monolithic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-monolithic-001.html rename to tests/wpt/tests/css/css-contain/contain-size-monolithic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-monolithic-002.html b/tests/wpt/tests/css/css-contain/contain-size-monolithic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-monolithic-002.html rename to tests/wpt/tests/css/css-contain/contain-size-monolithic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-001.html b/tests/wpt/tests/css/css-contain/contain-size-multicol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-001.html rename to tests/wpt/tests/css/css-contain/contain-size-multicol-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-002-ref.html b/tests/wpt/tests/css/css-contain/contain-size-multicol-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-002-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-multicol-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-002.html b/tests/wpt/tests/css/css-contain/contain-size-multicol-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-002.html rename to tests/wpt/tests/css/css-contain/contain-size-multicol-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-003-ref.html b/tests/wpt/tests/css/css-contain/contain-size-multicol-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-003-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-multicol-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-003.html b/tests/wpt/tests/css/css-contain/contain-size-multicol-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-003.html rename to tests/wpt/tests/css/css-contain/contain-size-multicol-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-004-ref.html b/tests/wpt/tests/css/css-contain/contain-size-multicol-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-004-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-multicol-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-004.html b/tests/wpt/tests/css/css-contain/contain-size-multicol-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-004.html rename to tests/wpt/tests/css/css-contain/contain-size-multicol-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-as-flex-item.html b/tests/wpt/tests/css/css-contain/contain-size-multicol-as-flex-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-multicol-as-flex-item.html rename to tests/wpt/tests/css/css-contain/contain-size-multicol-as-flex-item.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-removed.html b/tests/wpt/tests/css/css-contain/contain-size-removed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-removed.html rename to tests/wpt/tests/css/css-contain/contain-size-removed.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-001.html b/tests/wpt/tests/css/css-contain/contain-size-replaced-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-001.html rename to tests/wpt/tests/css/css-contain/contain-size-replaced-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-002.html b/tests/wpt/tests/css/css-contain/contain-size-replaced-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-002.html rename to tests/wpt/tests/css/css-contain/contain-size-replaced-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-003-ref.html b/tests/wpt/tests/css/css-contain/contain-size-replaced-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-003-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-replaced-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-003a.html b/tests/wpt/tests/css/css-contain/contain-size-replaced-003a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-003a.html rename to tests/wpt/tests/css/css-contain/contain-size-replaced-003a.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-003b.html b/tests/wpt/tests/css/css-contain/contain-size-replaced-003b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-003b.html rename to tests/wpt/tests/css/css-contain/contain-size-replaced-003b.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-003c.html b/tests/wpt/tests/css/css-contain/contain-size-replaced-003c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-003c.html rename to tests/wpt/tests/css/css-contain/contain-size-replaced-003c.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-004-ref.html b/tests/wpt/tests/css/css-contain/contain-size-replaced-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-004-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-replaced-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-004.html b/tests/wpt/tests/css/css-contain/contain-size-replaced-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-004.html rename to tests/wpt/tests/css/css-contain/contain-size-replaced-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-005-ref.html b/tests/wpt/tests/css/css-contain/contain-size-replaced-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-005-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-replaced-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-005.html b/tests/wpt/tests/css/css-contain/contain-size-replaced-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-005.html rename to tests/wpt/tests/css/css-contain/contain-size-replaced-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-006-ref.html b/tests/wpt/tests/css/css-contain/contain-size-replaced-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-006-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-replaced-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-006.html b/tests/wpt/tests/css/css-contain/contain-size-replaced-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-006.html rename to tests/wpt/tests/css/css-contain/contain-size-replaced-006.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-007.html b/tests/wpt/tests/css/css-contain/contain-size-replaced-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-007.html rename to tests/wpt/tests/css/css-contain/contain-size-replaced-007.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-scrollbars-001.html b/tests/wpt/tests/css/css-contain/contain-size-scrollbars-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-scrollbars-001.html rename to tests/wpt/tests/css/css-contain/contain-size-scrollbars-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-scrollbars-002.html b/tests/wpt/tests/css/css-contain/contain-size-scrollbars-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-scrollbars-002.html rename to tests/wpt/tests/css/css-contain/contain-size-scrollbars-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-scrollbars-003.html b/tests/wpt/tests/css/css-contain/contain-size-scrollbars-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-scrollbars-003.html rename to tests/wpt/tests/css/css-contain/contain-size-scrollbars-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-scrollbars-004.html b/tests/wpt/tests/css/css-contain/contain-size-scrollbars-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-scrollbars-004.html rename to tests/wpt/tests/css/css-contain/contain-size-scrollbars-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-select-001.html b/tests/wpt/tests/css/css-contain/contain-size-select-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-select-001.html rename to tests/wpt/tests/css/css-contain/contain-size-select-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-select-002.html b/tests/wpt/tests/css/css-contain/contain-size-select-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-select-002.html rename to tests/wpt/tests/css/css-contain/contain-size-select-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-001-ref.html b/tests/wpt/tests/css/css-contain/contain-size-select-elem-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-select-elem-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-001.html b/tests/wpt/tests/css/css-contain/contain-size-select-elem-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-001.html rename to tests/wpt/tests/css/css-contain/contain-size-select-elem-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-002-ref.html b/tests/wpt/tests/css/css-contain/contain-size-select-elem-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-002-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-select-elem-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-002.html b/tests/wpt/tests/css/css-contain/contain-size-select-elem-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-002.html rename to tests/wpt/tests/css/css-contain/contain-size-select-elem-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-003-ref.html b/tests/wpt/tests/css/css-contain/contain-size-select-elem-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-003-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-select-elem-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-003.html b/tests/wpt/tests/css/css-contain/contain-size-select-elem-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-003.html rename to tests/wpt/tests/css/css-contain/contain-size-select-elem-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-004-ref.html b/tests/wpt/tests/css/css-contain/contain-size-select-elem-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-004-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-select-elem-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-004.html b/tests/wpt/tests/css/css-contain/contain-size-select-elem-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-004.html rename to tests/wpt/tests/css/css-contain/contain-size-select-elem-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-005-ref.html b/tests/wpt/tests/css/css-contain/contain-size-select-elem-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-005-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-select-elem-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-005.html b/tests/wpt/tests/css/css-contain/contain-size-select-elem-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-select-elem-005.html rename to tests/wpt/tests/css/css-contain/contain-size-select-elem-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-table-caption-001-ref.html b/tests/wpt/tests/css/css-contain/contain-size-table-caption-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-table-caption-001-ref.html rename to tests/wpt/tests/css/css-contain/contain-size-table-caption-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-table-caption-001.html b/tests/wpt/tests/css/css-contain/contain-size-table-caption-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-size-table-caption-001.html rename to tests/wpt/tests/css/css-contain/contain-size-table-caption-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-strict-001.html b/tests/wpt/tests/css/css-contain/contain-strict-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-strict-001.html rename to tests/wpt/tests/css/css-contain/contain-strict-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-strict-002.html b/tests/wpt/tests/css/css-contain/contain-strict-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-strict-002.html rename to tests/wpt/tests/css/css-contain/contain-strict-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-strict-003.html b/tests/wpt/tests/css/css-contain/contain-strict-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-strict-003.html rename to tests/wpt/tests/css/css-contain/contain-strict-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-strict-011.html b/tests/wpt/tests/css/css-contain/contain-strict-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-strict-011.html rename to tests/wpt/tests/css/css-contain/contain-strict-011.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-baseline-001.html b/tests/wpt/tests/css/css-contain/contain-style-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-baseline-001.html rename to tests/wpt/tests/css/css-contain/contain-style-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-001.html b/tests/wpt/tests/css/css-contain/contain-style-breaks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-001.html rename to tests/wpt/tests/css/css-contain/contain-style-breaks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-002.html b/tests/wpt/tests/css/css-contain/contain-style-breaks-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-002.html rename to tests/wpt/tests/css/css-contain/contain-style-breaks-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-003.html b/tests/wpt/tests/css/css-contain/contain-style-breaks-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-003.html rename to tests/wpt/tests/css/css-contain/contain-style-breaks-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-004.html b/tests/wpt/tests/css/css-contain/contain-style-breaks-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-004.html rename to tests/wpt/tests/css/css-contain/contain-style-breaks-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-005.html b/tests/wpt/tests/css/css-contain/contain-style-breaks-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-005.html rename to tests/wpt/tests/css/css-contain/contain-style-breaks-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-001.html b/tests/wpt/tests/css/css-contain/contain-style-counters-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-001.html rename to tests/wpt/tests/css/css-contain/contain-style-counters-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-002.html b/tests/wpt/tests/css/css-contain/contain-style-counters-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-002.html rename to tests/wpt/tests/css/css-contain/contain-style-counters-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-003.html b/tests/wpt/tests/css/css-contain/contain-style-counters-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-003.html rename to tests/wpt/tests/css/css-contain/contain-style-counters-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-004.html b/tests/wpt/tests/css/css-contain/contain-style-counters-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-004.html rename to tests/wpt/tests/css/css-contain/contain-style-counters-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-005.html b/tests/wpt/tests/css/css-contain/contain-style-counters-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-005.html rename to tests/wpt/tests/css/css-contain/contain-style-counters-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-ref.html b/tests/wpt/tests/css/css-contain/contain-style-counters-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-counters-ref.html rename to tests/wpt/tests/css/css-contain/contain-style-counters-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-ol-ordinal-li-container.html b/tests/wpt/tests/css/css-contain/contain-style-ol-ordinal-li-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-ol-ordinal-li-container.html rename to tests/wpt/tests/css/css-contain/contain-style-ol-ordinal-li-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-ol-ordinal-pseudo-reversed.html b/tests/wpt/tests/css/css-contain/contain-style-ol-ordinal-pseudo-reversed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-ol-ordinal-pseudo-reversed.html rename to tests/wpt/tests/css/css-contain/contain-style-ol-ordinal-pseudo-reversed.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-ol-ordinal-pseudo.html b/tests/wpt/tests/css/css-contain/contain-style-ol-ordinal-pseudo.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-ol-ordinal-pseudo.html rename to tests/wpt/tests/css/css-contain/contain-style-ol-ordinal-pseudo.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-ol-ordinal-reversed.html b/tests/wpt/tests/css/css-contain/contain-style-ol-ordinal-reversed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-ol-ordinal-reversed.html rename to tests/wpt/tests/css/css-contain/contain-style-ol-ordinal-reversed.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-ol-ordinal-start-reversed.html b/tests/wpt/tests/css/css-contain/contain-style-ol-ordinal-start-reversed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-ol-ordinal-start-reversed.html rename to tests/wpt/tests/css/css-contain/contain-style-ol-ordinal-start-reversed.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-ol-ordinal-start.html b/tests/wpt/tests/css/css-contain/contain-style-ol-ordinal-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-ol-ordinal-start.html rename to tests/wpt/tests/css/css-contain/contain-style-ol-ordinal-start.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-ol-ordinal.html b/tests/wpt/tests/css/css-contain/contain-style-ol-ordinal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-style-ol-ordinal.html rename to tests/wpt/tests/css/css-contain/contain-style-ol-ordinal.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-subgrid-001.html b/tests/wpt/tests/css/css-contain/contain-subgrid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/contain-subgrid-001.html rename to tests/wpt/tests/css/css-contain/contain-subgrid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/animation-container-size.html b/tests/wpt/tests/css/css-contain/container-queries/animation-container-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/animation-container-size.html rename to tests/wpt/tests/css/css-contain/container-queries/animation-container-size.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/animation-container-type-dynamic.html b/tests/wpt/tests/css/css-contain/container-queries/animation-container-type-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/animation-container-type-dynamic.html rename to tests/wpt/tests/css/css-contain/container-queries/animation-container-type-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/animation-nested-animation.html b/tests/wpt/tests/css/css-contain/container-queries/animation-nested-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/animation-nested-animation.html rename to tests/wpt/tests/css/css-contain/container-queries/animation-nested-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/animation-nested-transition.html b/tests/wpt/tests/css/css-contain/container-queries/animation-nested-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/animation-nested-transition.html rename to tests/wpt/tests/css/css-contain/container-queries/animation-nested-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/aspect-ratio-feature-evaluation.html b/tests/wpt/tests/css/css-contain/container-queries/aspect-ratio-feature-evaluation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/aspect-ratio-feature-evaluation.html rename to tests/wpt/tests/css/css-contain/container-queries/aspect-ratio-feature-evaluation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/at-container-parsing.html b/tests/wpt/tests/css/css-contain/container-queries/at-container-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/at-container-parsing.html rename to tests/wpt/tests/css/css-contain/container-queries/at-container-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/at-container-serialization.html b/tests/wpt/tests/css/css-contain/container-queries/at-container-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/at-container-serialization.html rename to tests/wpt/tests/css/css-contain/container-queries/at-container-serialization.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/at-container-style-parsing.html b/tests/wpt/tests/css/css-contain/container-queries/at-container-style-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/at-container-style-parsing.html rename to tests/wpt/tests/css/css-contain/container-queries/at-container-style-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/at-container-style-serialization.html b/tests/wpt/tests/css/css-contain/container-queries/at-container-style-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/at-container-style-serialization.html rename to tests/wpt/tests/css/css-contain/container-queries/at-container-style-serialization.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/auto-scrollbars.html b/tests/wpt/tests/css/css-contain/container-queries/auto-scrollbars.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/auto-scrollbars.html rename to tests/wpt/tests/css/css-contain/container-queries/auto-scrollbars.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/backdrop-invalidation.html b/tests/wpt/tests/css/css-contain/container-queries/backdrop-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/backdrop-invalidation.html rename to tests/wpt/tests/css/css-contain/container-queries/backdrop-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/calc-evaluation.html b/tests/wpt/tests/css/css-contain/container-queries/calc-evaluation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/calc-evaluation.html rename to tests/wpt/tests/css/css-contain/container-queries/calc-evaluation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/canvas-as-container-001.html b/tests/wpt/tests/css/css-contain/container-queries/canvas-as-container-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/canvas-as-container-001.html rename to tests/wpt/tests/css/css-contain/container-queries/canvas-as-container-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/canvas-as-container-002.html b/tests/wpt/tests/css/css-contain/container-queries/canvas-as-container-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/canvas-as-container-002.html rename to tests/wpt/tests/css/css-contain/container-queries/canvas-as-container-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/canvas-as-container-003.html b/tests/wpt/tests/css/css-contain/container-queries/canvas-as-container-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/canvas-as-container-003.html rename to tests/wpt/tests/css/css-contain/container-queries/canvas-as-container-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/canvas-as-container-004.html b/tests/wpt/tests/css/css-contain/container-queries/canvas-as-container-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/canvas-as-container-004.html rename to tests/wpt/tests/css/css-contain/container-queries/canvas-as-container-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/canvas-as-container-005.html b/tests/wpt/tests/css/css-contain/container-queries/canvas-as-container-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/canvas-as-container-005.html rename to tests/wpt/tests/css/css-contain/container-queries/canvas-as-container-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/canvas-as-container-006.html b/tests/wpt/tests/css/css-contain/container-queries/canvas-as-container-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/canvas-as-container-006.html rename to tests/wpt/tests/css/css-contain/container-queries/canvas-as-container-006.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/change-display-in-container-ref.html b/tests/wpt/tests/css/css-contain/container-queries/change-display-in-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/change-display-in-container-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/change-display-in-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/change-display-in-container.html b/tests/wpt/tests/css/css-contain/container-queries/change-display-in-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/change-display-in-container.html rename to tests/wpt/tests/css/css-contain/container-queries/change-display-in-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/chrome-legacy-skip-recalc.html b/tests/wpt/tests/css/css-contain/container-queries/chrome-legacy-skip-recalc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/chrome-legacy-skip-recalc.html rename to tests/wpt/tests/css/css-contain/container-queries/chrome-legacy-skip-recalc.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/column-spanner-in-container.html b/tests/wpt/tests/css/css-contain/container-queries/column-spanner-in-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/column-spanner-in-container.html rename to tests/wpt/tests/css/css-contain/container-queries/column-spanner-in-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/conditional-container-status.html b/tests/wpt/tests/css/css-contain/container-queries/conditional-container-status.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/conditional-container-status.html rename to tests/wpt/tests/css/css-contain/container-queries/conditional-container-status.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-computed.html b/tests/wpt/tests/css/css-contain/container-queries/container-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-computed.html rename to tests/wpt/tests/css/css-contain/container-queries/container-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-for-cue-ref.html b/tests/wpt/tests/css/css-contain/container-queries/container-for-cue-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-for-cue-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/container-for-cue-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-for-cue.html b/tests/wpt/tests/css/css-contain/container-queries/container-for-cue.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-for-cue.html rename to tests/wpt/tests/css/css-contain/container-queries/container-for-cue.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-for-shadow-dom.html b/tests/wpt/tests/css/css-contain/container-queries/container-for-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-for-shadow-dom.html rename to tests/wpt/tests/css/css-contain/container-queries/container-for-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-inheritance.html b/tests/wpt/tests/css/css-contain/container-queries/container-inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-inheritance.html rename to tests/wpt/tests/css/css-contain/container-queries/container-inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-inner-at-rules.html b/tests/wpt/tests/css/css-contain/container-queries/container-inner-at-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-inner-at-rules.html rename to tests/wpt/tests/css/css-contain/container-queries/container-inner-at-rules.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-inside-multicol-with-table.html b/tests/wpt/tests/css/css-contain/container-queries/container-inside-multicol-with-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-inside-multicol-with-table.html rename to tests/wpt/tests/css/css-contain/container-queries/container-inside-multicol-with-table.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-longhand-animation-type.html b/tests/wpt/tests/css/css-contain/container-queries/container-longhand-animation-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-longhand-animation-type.html rename to tests/wpt/tests/css/css-contain/container-queries/container-longhand-animation-type.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-name-computed.html b/tests/wpt/tests/css/css-contain/container-queries/container-name-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-name-computed.html rename to tests/wpt/tests/css/css-contain/container-queries/container-name-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-name-invalidation.html b/tests/wpt/tests/css/css-contain/container-queries/container-name-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-name-invalidation.html rename to tests/wpt/tests/css/css-contain/container-queries/container-name-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-name-parsing.html b/tests/wpt/tests/css/css-contain/container-queries/container-name-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-name-parsing.html rename to tests/wpt/tests/css/css-contain/container-queries/container-name-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-name-tree-scoped.html b/tests/wpt/tests/css/css-contain/container-queries/container-name-tree-scoped.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-name-tree-scoped.html rename to tests/wpt/tests/css/css-contain/container-queries/container-name-tree-scoped.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-nested.html b/tests/wpt/tests/css/css-contain/container-queries/container-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-nested.html rename to tests/wpt/tests/css/css-contain/container-queries/container-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-parsing.html b/tests/wpt/tests/css/css-contain/container-queries/container-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-parsing.html rename to tests/wpt/tests/css/css-contain/container-queries/container-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-selection.html b/tests/wpt/tests/css/css-contain/container-queries/container-selection.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-selection.html rename to tests/wpt/tests/css/css-contain/container-queries/container-selection.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-size-invalidation-after-load.html b/tests/wpt/tests/css/css-contain/container-queries/container-size-invalidation-after-load.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-size-invalidation-after-load.html rename to tests/wpt/tests/css/css-contain/container-queries/container-size-invalidation-after-load.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-size-invalidation.html b/tests/wpt/tests/css/css-contain/container-queries/container-size-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-size-invalidation.html rename to tests/wpt/tests/css/css-contain/container-queries/container-size-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-size-nested-invalidation.html b/tests/wpt/tests/css/css-contain/container-queries/container-size-nested-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-size-nested-invalidation.html rename to tests/wpt/tests/css/css-contain/container-queries/container-size-nested-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-size-shadow-invalidation.html b/tests/wpt/tests/css/css-contain/container-queries/container-size-shadow-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-size-shadow-invalidation.html rename to tests/wpt/tests/css/css-contain/container-queries/container-size-shadow-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-type-computed.html b/tests/wpt/tests/css/css-contain/container-queries/container-type-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-type-computed.html rename to tests/wpt/tests/css/css-contain/container-queries/container-type-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-type-containment.html b/tests/wpt/tests/css/css-contain/container-queries/container-type-containment.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-type-containment.html rename to tests/wpt/tests/css/css-contain/container-queries/container-type-containment.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-type-invalidation.html b/tests/wpt/tests/css/css-contain/container-queries/container-type-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-type-invalidation.html rename to tests/wpt/tests/css/css-contain/container-queries/container-type-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-type-layout-invalidation.html b/tests/wpt/tests/css/css-contain/container-queries/container-type-layout-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-type-layout-invalidation.html rename to tests/wpt/tests/css/css-contain/container-queries/container-type-layout-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-type-parsing.html b/tests/wpt/tests/css/css-contain/container-queries/container-type-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-type-parsing.html rename to tests/wpt/tests/css/css-contain/container-queries/container-type-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-animation.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-animation.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-basic.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-basic.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-basic.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-computational-independence.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-computational-independence.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-computational-independence.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-computational-independence.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-content-box.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-content-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-content-box.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-content-box.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-gradient-invalidation.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-gradient-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-gradient-invalidation.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-gradient-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-gradient-ref.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-gradient-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-gradient-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-gradient-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-gradient.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-gradient.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-gradient.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-in-at-container-dynamic.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-in-at-container-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-in-at-container-dynamic.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-in-at-container-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-in-at-container-fallback.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-in-at-container-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-in-at-container-fallback.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-in-at-container-fallback.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-in-at-container.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-in-at-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-in-at-container.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-in-at-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-ineligible-container.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-ineligible-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-ineligible-container.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-ineligible-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-invalidation.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-invalidation.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-media-queries.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-media-queries.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-media-queries.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-media-queries.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-rule-cache-ref.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-rule-cache-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-rule-cache-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-rule-cache-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-rule-cache.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-rule-cache.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-rule-cache.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-rule-cache.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-selection.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-selection.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-selection.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-selection.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-shadow.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-shadow.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-shadow.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-sharing-via-rule-node-ref.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-sharing-via-rule-node-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-sharing-via-rule-node-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-sharing-via-rule-node-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-sharing-via-rule-node.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-sharing-via-rule-node.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-sharing-via-rule-node.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-sharing-via-rule-node.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-small-viewport-fallback.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-small-viewport-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-small-viewport-fallback.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-small-viewport-fallback.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-svglength.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-svglength.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-svglength.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-svglength.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-typed-om.html b/tests/wpt/tests/css/css-contain/container-queries/container-units-typed-om.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/container-units-typed-om.html rename to tests/wpt/tests/css/css-contain/container-queries/container-units-typed-om.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/counters-flex-circular.html b/tests/wpt/tests/css/css-contain/container-queries/counters-flex-circular.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/counters-flex-circular.html rename to tests/wpt/tests/css/css-contain/container-queries/counters-flex-circular.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/counters-in-container-dynamic.html b/tests/wpt/tests/css/css-contain/container-queries/counters-in-container-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/counters-in-container-dynamic.html rename to tests/wpt/tests/css/css-contain/container-queries/counters-in-container-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/counters-in-container.html b/tests/wpt/tests/css/css-contain/container-queries/counters-in-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/counters-in-container.html rename to tests/wpt/tests/css/css-contain/container-queries/counters-in-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/counters-ref.html b/tests/wpt/tests/css/css-contain/container-queries/counters-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/counters-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/counters-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/br-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/br-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/br-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/br-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/canvas-as-container-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/canvas-as-container-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/canvas-as-container-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/canvas-as-container-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-bug-1289718-000-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-bug-1289718-000-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-bug-1289718-000-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-bug-1289718-000-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-bug-1289718-001-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-bug-1289718-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-bug-1289718-001-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-bug-1289718-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-bug-1346969-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-bug-1346969-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-bug-1346969-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-bug-1346969-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-bug-1362391-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-bug-1362391-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-bug-1362391-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-bug-1362391-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-bug-1429955-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-bug-1429955-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-bug-1429955-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-bug-1429955-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-layout-root-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-layout-root-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-layout-root-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-layout-root-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-quotes-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-quotes-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-quotes-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-quotes-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-remove-insert-evaluator-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-remove-insert-evaluator-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/chrome-remove-insert-evaluator-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-remove-insert-evaluator-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/columns-in-table-001-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/columns-in-table-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/columns-in-table-001-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/columns-in-table-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/columns-in-table-002-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/columns-in-table-002-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/columns-in-table-002-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/columns-in-table-002-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/container-in-canvas-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/container-in-canvas-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/container-in-canvas-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/container-in-canvas-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/container-type-change-chrome-legacy-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/container-type-change-chrome-legacy-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/container-type-change-chrome-legacy-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/container-type-change-chrome-legacy-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/dialog-backdrop-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/dialog-backdrop-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/dialog-backdrop-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/dialog-backdrop-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/dirty-rowgroup-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/dirty-rowgroup-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/dirty-rowgroup-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/dirty-rowgroup-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/flex-in-columns-000-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/flex-in-columns-000-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/flex-in-columns-000-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/flex-in-columns-000-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/flex-in-columns-001-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/flex-in-columns-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/flex-in-columns-001-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/flex-in-columns-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/flex-in-columns-002-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/flex-in-columns-002-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/flex-in-columns-002-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/flex-in-columns-002-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/flex-in-columns-003-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/flex-in-columns-003-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/flex-in-columns-003-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/flex-in-columns-003-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/focus-inside-content-visibility-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/focus-inside-content-visibility-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/focus-inside-content-visibility-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/focus-inside-content-visibility-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/force-sibling-style-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/force-sibling-style-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/force-sibling-style-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/force-sibling-style-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/grid-in-columns-000-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/grid-in-columns-000-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/grid-in-columns-000-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/grid-in-columns-000-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/grid-in-columns-001-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/grid-in-columns-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/grid-in-columns-001-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/grid-in-columns-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/grid-in-columns-002-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/grid-in-columns-002-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/grid-in-columns-002-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/grid-in-columns-002-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/grid-in-columns-003-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/grid-in-columns-003-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/grid-in-columns-003-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/grid-in-columns-003-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/iframe-init-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/iframe-init-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/iframe-init-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/iframe-init-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/inline-multicol-inside-container-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/inline-multicol-inside-container-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/inline-multicol-inside-container-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/inline-multicol-inside-container-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/inline-with-columns-000-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/inline-with-columns-000-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/inline-with-columns-000-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/inline-with-columns-000-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/inline-with-columns-001-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/inline-with-columns-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/inline-with-columns-001-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/inline-with-columns-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/input-column-group-container-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/input-column-group-container-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/input-column-group-container-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/input-column-group-container-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/input-placeholder-inline-size-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/input-placeholder-inline-size-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/input-placeholder-inline-size-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/input-placeholder-inline-size-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/marker-gcs-after-disconnect-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/marker-gcs-after-disconnect-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/marker-gcs-after-disconnect-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/marker-gcs-after-disconnect-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/math-block-container-child-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/math-block-container-child-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/math-block-container-child-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/math-block-container-child-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/orthogonal-replaced-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/orthogonal-replaced-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/orthogonal-replaced-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/orthogonal-replaced-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/pseudo-container-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/pseudo-container-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/pseudo-container-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/pseudo-container-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/reversed-ol-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/reversed-ol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/reversed-ol-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/reversed-ol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/size-change-during-transition-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/size-change-during-transition-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/size-change-during-transition-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/size-change-during-transition-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/svg-layout-root-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/svg-layout-root-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/svg-layout-root-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/svg-layout-root-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/svg-text-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/svg-text-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/svg-text-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/svg-text-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/table-in-columns-000-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/table-in-columns-000-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/table-in-columns-000-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/table-in-columns-000-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/table-in-columns-001-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/table-in-columns-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/table-in-columns-001-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/table-in-columns-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/table-in-columns-002-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/table-in-columns-002-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/table-in-columns-002-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/table-in-columns-002-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/table-in-columns-003-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/table-in-columns-003-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/table-in-columns-003-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/table-in-columns-003-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/table-in-columns-004-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/table-in-columns-004-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/table-in-columns-004-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/table-in-columns-004-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/table-in-columns-005-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/table-in-columns-005-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/crashtests/table-in-columns-005-crash.html rename to tests/wpt/tests/css/css-contain/container-queries/crashtests/table-in-columns-005-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/custom-layout-container-001.https.html b/tests/wpt/tests/css/css-contain/container-queries/custom-layout-container-001.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/custom-layout-container-001.https.html rename to tests/wpt/tests/css/css-contain/container-queries/custom-layout-container-001.https.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/custom-property-style-queries.html b/tests/wpt/tests/css/css-contain/container-queries/custom-property-style-queries.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/custom-property-style-queries.html rename to tests/wpt/tests/css/css-contain/container-queries/custom-property-style-queries.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/custom-property-style-query-change.html b/tests/wpt/tests/css/css-contain/container-queries/custom-property-style-query-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/custom-property-style-query-change.html rename to tests/wpt/tests/css/css-contain/container-queries/custom-property-style-query-change.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/deep-nested-inline-size-containers.html b/tests/wpt/tests/css/css-contain/container-queries/deep-nested-inline-size-containers.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/deep-nested-inline-size-containers.html rename to tests/wpt/tests/css/css-contain/container-queries/deep-nested-inline-size-containers.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/dialog-backdrop-create.html b/tests/wpt/tests/css/css-contain/container-queries/dialog-backdrop-create.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/dialog-backdrop-create.html rename to tests/wpt/tests/css/css-contain/container-queries/dialog-backdrop-create.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/dialog-backdrop-remove.html b/tests/wpt/tests/css/css-contain/container-queries/dialog-backdrop-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/dialog-backdrop-remove.html rename to tests/wpt/tests/css/css-contain/container-queries/dialog-backdrop-remove.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/display-contents-dynamic-style-queries.html b/tests/wpt/tests/css/css-contain/container-queries/display-contents-dynamic-style-queries.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/display-contents-dynamic-style-queries.html rename to tests/wpt/tests/css/css-contain/container-queries/display-contents-dynamic-style-queries.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/display-contents.html b/tests/wpt/tests/css/css-contain/container-queries/display-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/display-contents.html rename to tests/wpt/tests/css/css-contain/container-queries/display-contents.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/display-in-container-ref.html b/tests/wpt/tests/css/css-contain/container-queries/display-in-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/display-in-container-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/display-in-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/display-in-container.html b/tests/wpt/tests/css/css-contain/container-queries/display-in-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/display-in-container.html rename to tests/wpt/tests/css/css-contain/container-queries/display-in-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/display-none.html b/tests/wpt/tests/css/css-contain/container-queries/display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/display-none.html rename to tests/wpt/tests/css/css-contain/container-queries/display-none.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/fieldset-legend-change-ref.html b/tests/wpt/tests/css/css-contain/container-queries/fieldset-legend-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/fieldset-legend-change-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/fieldset-legend-change-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/fieldset-legend-change.html b/tests/wpt/tests/css/css-contain/container-queries/fieldset-legend-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/fieldset-legend-change.html rename to tests/wpt/tests/css/css-contain/container-queries/fieldset-legend-change.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/font-relative-calc-dynamic.html b/tests/wpt/tests/css/css-contain/container-queries/font-relative-calc-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/font-relative-calc-dynamic.html rename to tests/wpt/tests/css/css-contain/container-queries/font-relative-calc-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic.html b/tests/wpt/tests/css/css-contain/container-queries/font-relative-units-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/font-relative-units-dynamic.html rename to tests/wpt/tests/css/css-contain/container-queries/font-relative-units-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/font-relative-units.html b/tests/wpt/tests/css/css-contain/container-queries/font-relative-units.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/font-relative-units.html rename to tests/wpt/tests/css/css-contain/container-queries/font-relative-units.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/fragmented-container-001.html b/tests/wpt/tests/css/css-contain/container-queries/fragmented-container-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/fragmented-container-001.html rename to tests/wpt/tests/css/css-contain/container-queries/fragmented-container-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/get-animations.html b/tests/wpt/tests/css/css-contain/container-queries/get-animations.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/get-animations.html rename to tests/wpt/tests/css/css-contain/container-queries/get-animations.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/grid-container.html b/tests/wpt/tests/css/css-contain/container-queries/grid-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/grid-container.html rename to tests/wpt/tests/css/css-contain/container-queries/grid-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/grid-item-container.html b/tests/wpt/tests/css/css-contain/container-queries/grid-item-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/grid-item-container.html rename to tests/wpt/tests/css/css-contain/container-queries/grid-item-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/idlharness.html b/tests/wpt/tests/css/css-contain/container-queries/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/idlharness.html rename to tests/wpt/tests/css/css-contain/container-queries/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/iframe-in-container-invalidation.html b/tests/wpt/tests/css/css-contain/container-queries/iframe-in-container-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/iframe-in-container-invalidation.html rename to tests/wpt/tests/css/css-contain/container-queries/iframe-in-container-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/iframe-invalidation.html b/tests/wpt/tests/css/css-contain/container-queries/iframe-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/iframe-invalidation.html rename to tests/wpt/tests/css/css-contain/container-queries/iframe-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/ineligible-containment.html b/tests/wpt/tests/css/css-contain/container-queries/ineligible-containment.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/ineligible-containment.html rename to tests/wpt/tests/css/css-contain/container-queries/ineligible-containment.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/inline-size-and-min-width.html b/tests/wpt/tests/css/css-contain/container-queries/inline-size-and-min-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/inline-size-and-min-width.html rename to tests/wpt/tests/css/css-contain/container-queries/inline-size-and-min-width.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/inline-size-bfc-floats-ref.html b/tests/wpt/tests/css/css-contain/container-queries/inline-size-bfc-floats-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/inline-size-bfc-floats-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/inline-size-bfc-floats-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/inline-size-bfc-floats.html b/tests/wpt/tests/css/css-contain/container-queries/inline-size-bfc-floats.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/inline-size-bfc-floats.html rename to tests/wpt/tests/css/css-contain/container-queries/inline-size-bfc-floats.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/inline-size-containment-vertical-rl.html b/tests/wpt/tests/css/css-contain/container-queries/inline-size-containment-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/inline-size-containment-vertical-rl.html rename to tests/wpt/tests/css/css-contain/container-queries/inline-size-containment-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/inline-size-containment.html b/tests/wpt/tests/css/css-contain/container-queries/inline-size-containment.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/inline-size-containment.html rename to tests/wpt/tests/css/css-contain/container-queries/inline-size-containment.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/inner-first-line-non-matching-ref.html b/tests/wpt/tests/css/css-contain/container-queries/inner-first-line-non-matching-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/inner-first-line-non-matching-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/inner-first-line-non-matching-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/inner-first-line-non-matching.html b/tests/wpt/tests/css/css-contain/container-queries/inner-first-line-non-matching.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/inner-first-line-non-matching.html rename to tests/wpt/tests/css/css-contain/container-queries/inner-first-line-non-matching.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/layout-dependent-focus.html b/tests/wpt/tests/css/css-contain/container-queries/layout-dependent-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/layout-dependent-focus.html rename to tests/wpt/tests/css/css-contain/container-queries/layout-dependent-focus.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/multicol-container-001.html b/tests/wpt/tests/css/css-contain/container-queries/multicol-container-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/multicol-container-001.html rename to tests/wpt/tests/css/css-contain/container-queries/multicol-container-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/multicol-inside-container.html b/tests/wpt/tests/css/css-contain/container-queries/multicol-inside-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/multicol-inside-container.html rename to tests/wpt/tests/css/css-contain/container-queries/multicol-inside-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/nested-query-containers.html b/tests/wpt/tests/css/css-contain/container-queries/nested-query-containers.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/nested-query-containers.html rename to tests/wpt/tests/css/css-contain/container-queries/nested-query-containers.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/nested-size-style-container-invalidation.html b/tests/wpt/tests/css/css-contain/container-queries/nested-size-style-container-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/nested-size-style-container-invalidation.html rename to tests/wpt/tests/css/css-contain/container-queries/nested-size-style-container-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/never-match-container.html b/tests/wpt/tests/css/css-contain/container-queries/never-match-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/never-match-container.html rename to tests/wpt/tests/css/css-contain/container-queries/never-match-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/orthogonal-wm-container-query.html b/tests/wpt/tests/css/css-contain/container-queries/orthogonal-wm-container-query.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/orthogonal-wm-container-query.html rename to tests/wpt/tests/css/css-contain/container-queries/orthogonal-wm-container-query.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/percentage-padding-orthogonal.html b/tests/wpt/tests/css/css-contain/container-queries/percentage-padding-orthogonal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/percentage-padding-orthogonal.html rename to tests/wpt/tests/css/css-contain/container-queries/percentage-padding-orthogonal.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-001.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-001.html rename to tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-002-ref.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-002-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-002.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-002.html rename to tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-002b-ref.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-002b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-002b-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-002b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-002b.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-002b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-002b.html rename to tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-002b.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-003.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-003.html rename to tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-004.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-004.html rename to tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-005.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-005.html rename to tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-006.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-006.html rename to tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-006.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-007.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-007.html rename to tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-007.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-008.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/pseudo-elements-008.html rename to tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-008.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/query-content-box.html b/tests/wpt/tests/css/css-contain/container-queries/query-content-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/query-content-box.html rename to tests/wpt/tests/css/css-contain/container-queries/query-content-box.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/query-evaluation-style.html b/tests/wpt/tests/css/css-contain/container-queries/query-evaluation-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/query-evaluation-style.html rename to tests/wpt/tests/css/css-contain/container-queries/query-evaluation-style.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/query-evaluation.html b/tests/wpt/tests/css/css-contain/container-queries/query-evaluation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/query-evaluation.html rename to tests/wpt/tests/css/css-contain/container-queries/query-evaluation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/reattach-container-with-dirty-child.html b/tests/wpt/tests/css/css-contain/container-queries/reattach-container-with-dirty-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/reattach-container-with-dirty-child.html rename to tests/wpt/tests/css/css-contain/container-queries/reattach-container-with-dirty-child.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/resize-while-content-visibility-hidden-ref.html b/tests/wpt/tests/css/css-contain/container-queries/resize-while-content-visibility-hidden-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/resize-while-content-visibility-hidden-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/resize-while-content-visibility-hidden-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/resize-while-content-visibility-hidden.html b/tests/wpt/tests/css/css-contain/container-queries/resize-while-content-visibility-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/resize-while-content-visibility-hidden.html rename to tests/wpt/tests/css/css-contain/container-queries/resize-while-content-visibility-hidden.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/sibling-layout-dependency.html b/tests/wpt/tests/css/css-contain/container-queries/sibling-layout-dependency.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/sibling-layout-dependency.html rename to tests/wpt/tests/css/css-contain/container-queries/sibling-layout-dependency.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/size-container-no-principal-box.html b/tests/wpt/tests/css/css-contain/container-queries/size-container-no-principal-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/size-container-no-principal-box.html rename to tests/wpt/tests/css/css-contain/container-queries/size-container-no-principal-box.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/size-container-with-quotes-ref.html b/tests/wpt/tests/css/css-contain/container-queries/size-container-with-quotes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/size-container-with-quotes-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/size-container-with-quotes-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/size-container-with-quotes.html b/tests/wpt/tests/css/css-contain/container-queries/size-container-with-quotes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/size-container-with-quotes.html rename to tests/wpt/tests/css/css-contain/container-queries/size-container-with-quotes.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/size-feature-evaluation.html b/tests/wpt/tests/css/css-contain/container-queries/size-feature-evaluation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/size-feature-evaluation.html rename to tests/wpt/tests/css/css-contain/container-queries/size-feature-evaluation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/style-change-in-container.html b/tests/wpt/tests/css/css-contain/container-queries/style-change-in-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/style-change-in-container.html rename to tests/wpt/tests/css/css-contain/container-queries/style-change-in-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/style-container-for-shadow-dom.html b/tests/wpt/tests/css/css-contain/container-queries/style-container-for-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/style-container-for-shadow-dom.html rename to tests/wpt/tests/css/css-contain/container-queries/style-container-for-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/style-container-invalidation-inheritance.html b/tests/wpt/tests/css/css-contain/container-queries/style-container-invalidation-inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/style-container-invalidation-inheritance.html rename to tests/wpt/tests/css/css-contain/container-queries/style-container-invalidation-inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/style-not-sharing-float.html b/tests/wpt/tests/css/css-contain/container-queries/style-not-sharing-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/style-not-sharing-float.html rename to tests/wpt/tests/css/css-contain/container-queries/style-not-sharing-float.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/style-query-with-unknown-width.html b/tests/wpt/tests/css/css-contain/container-queries/style-query-with-unknown-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/style-query-with-unknown-width.html rename to tests/wpt/tests/css/css-contain/container-queries/style-query-with-unknown-width.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/support/cq-testcommon.js b/tests/wpt/tests/css/css-contain/container-queries/support/cq-testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/support/cq-testcommon.js rename to tests/wpt/tests/css/css-contain/container-queries/support/cq-testcommon.js diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/support/test.vtt b/tests/wpt/tests/css/css-contain/container-queries/support/test.vtt similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/support/test.vtt rename to tests/wpt/tests/css/css-contain/container-queries/support/test.vtt diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/svg-foreignobject-child-container.html b/tests/wpt/tests/css/css-contain/container-queries/svg-foreignobject-child-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/svg-foreignobject-child-container.html rename to tests/wpt/tests/css/css-contain/container-queries/svg-foreignobject-child-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/svg-foreignobject-no-size-container-ref.html b/tests/wpt/tests/css/css-contain/container-queries/svg-foreignobject-no-size-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/svg-foreignobject-no-size-container-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/svg-foreignobject-no-size-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/svg-foreignobject-no-size-container.html b/tests/wpt/tests/css/css-contain/container-queries/svg-foreignobject-no-size-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/svg-foreignobject-no-size-container.html rename to tests/wpt/tests/css/css-contain/container-queries/svg-foreignobject-no-size-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/svg-g-no-size-container-ref.html b/tests/wpt/tests/css/css-contain/container-queries/svg-g-no-size-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/svg-g-no-size-container-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/svg-g-no-size-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/svg-g-no-size-container.html b/tests/wpt/tests/css/css-contain/container-queries/svg-g-no-size-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/svg-g-no-size-container.html rename to tests/wpt/tests/css/css-contain/container-queries/svg-g-no-size-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/svg-root-size-container.html b/tests/wpt/tests/css/css-contain/container-queries/svg-root-size-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/svg-root-size-container.html rename to tests/wpt/tests/css/css-contain/container-queries/svg-root-size-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/table-inside-container-changing-display-ref.html b/tests/wpt/tests/css/css-contain/container-queries/table-inside-container-changing-display-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/table-inside-container-changing-display-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/table-inside-container-changing-display-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/table-inside-container-changing-display.html b/tests/wpt/tests/css/css-contain/container-queries/table-inside-container-changing-display.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/table-inside-container-changing-display.html rename to tests/wpt/tests/css/css-contain/container-queries/table-inside-container-changing-display.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/top-layer-dialog-backdrop-ref.html b/tests/wpt/tests/css/css-contain/container-queries/top-layer-dialog-backdrop-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/top-layer-dialog-backdrop-ref.html rename to tests/wpt/tests/css/css-contain/container-queries/top-layer-dialog-backdrop-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/top-layer-dialog-backdrop.html b/tests/wpt/tests/css/css-contain/container-queries/top-layer-dialog-backdrop.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/top-layer-dialog-backdrop.html rename to tests/wpt/tests/css/css-contain/container-queries/top-layer-dialog-backdrop.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/top-layer-dialog-container.html b/tests/wpt/tests/css/css-contain/container-queries/top-layer-dialog-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/top-layer-dialog-container.html rename to tests/wpt/tests/css/css-contain/container-queries/top-layer-dialog-container.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/top-layer-dialog.html b/tests/wpt/tests/css/css-contain/container-queries/top-layer-dialog.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/top-layer-dialog.html rename to tests/wpt/tests/css/css-contain/container-queries/top-layer-dialog.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/top-layer-nested-dialog.html b/tests/wpt/tests/css/css-contain/container-queries/top-layer-nested-dialog.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/top-layer-nested-dialog.html rename to tests/wpt/tests/css/css-contain/container-queries/top-layer-nested-dialog.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/transition-scrollbars.html b/tests/wpt/tests/css/css-contain/container-queries/transition-scrollbars.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/transition-scrollbars.html rename to tests/wpt/tests/css/css-contain/container-queries/transition-scrollbars.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/transition-style-change-event-002.html b/tests/wpt/tests/css/css-contain/container-queries/transition-style-change-event-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/transition-style-change-event-002.html rename to tests/wpt/tests/css/css-contain/container-queries/transition-style-change-event-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/transition-style-change-event.html b/tests/wpt/tests/css/css-contain/container-queries/transition-style-change-event.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/transition-style-change-event.html rename to tests/wpt/tests/css/css-contain/container-queries/transition-style-change-event.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/unsupported-axis.html b/tests/wpt/tests/css/css-contain/container-queries/unsupported-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/unsupported-axis.html rename to tests/wpt/tests/css/css-contain/container-queries/unsupported-axis.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/viewport-units-dynamic.html b/tests/wpt/tests/css/css-contain/container-queries/viewport-units-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/viewport-units-dynamic.html rename to tests/wpt/tests/css/css-contain/container-queries/viewport-units-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/viewport-units.html b/tests/wpt/tests/css/css-contain/container-queries/viewport-units.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/viewport-units.html rename to tests/wpt/tests/css/css-contain/container-queries/viewport-units.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/whitespace-update-after-removal.html b/tests/wpt/tests/css/css-contain/container-queries/whitespace-update-after-removal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/container-queries/whitespace-update-after-removal.html rename to tests/wpt/tests/css/css-contain/container-queries/whitespace-update-after-removal.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/animation-display-lock.html b/tests/wpt/tests/css/css-contain/content-visibility/animation-display-lock.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/animation-display-lock.html rename to tests/wpt/tests/css/css-contain/content-visibility/animation-display-lock.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/container-focus-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/container-focus-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/container-focus-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/container-focus-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/container-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/container-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/container-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/container-with-child-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/container-with-child-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/container-with-child-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/container-with-child-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/container-with-pos-children-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/container-with-pos-children-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/container-with-pos-children-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/container-with-pos-children-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-001.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-001.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-002.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-002.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-003-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-003-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-003.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-003.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-004-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-004-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-004.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-004.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-005.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-005.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-006.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-006.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-006.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-007.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-007.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-007.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-008.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-008.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-008.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-009.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-009.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-009.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-010.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-010.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-010.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-011.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-011.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-011.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-012.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-012.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-012.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-013.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-013.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-013.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-014.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-014.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-014.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-015.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-015.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-015.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-016.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-016.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-016.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-017.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-017.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-017.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-018.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-018.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-018.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-019-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-019-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-019.sub.https.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-019.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-019.sub.https.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-019.sub.https.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-020-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-020-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-020.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-020.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-020.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-021-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-021-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-021.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-021.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-021.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-022-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-022-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-022.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-022.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-022.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-023-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-023-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-023.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-023.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-023.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-024-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-024-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-024.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-024.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-024.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-025-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-025-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-025.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-025.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-025.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-026.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-026.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-026.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-027-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-027-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-027.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-027.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-027.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-028.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-028.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-028.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-029.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-029.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-029.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-030.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-030.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-030.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-031.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-031.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-031.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-032-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-032-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-032-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-032-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-032.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-032.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-032.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-033-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-033-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-033-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-033-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-033.sub.https.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-033.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-033.sub.https.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-033.sub.https.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-034-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-034-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-034-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-034-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-034.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-034.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-034.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-035.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-035.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-035.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-036.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-036.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-036.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-037.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-037.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-037.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-038.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-038.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-038.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-039.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-039.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-039.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-040.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-040.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-040.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-041.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-041.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-041.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-042-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-042-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-042-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-042-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-042.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-042.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-042.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-043.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-043.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-043.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-044.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-044.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-044.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-045.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-045.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-045.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-046.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-046.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-046.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-047.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-047.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-047.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-048.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-048.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-048.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-049-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-049-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-049-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-049-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-049.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-049.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-049.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-050.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-050.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-050.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-051.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-051.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-051.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-052.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-052.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-052.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-053.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-053.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-053.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-053.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-054.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-054.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-054.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-054.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-055.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-055.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-055.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-055.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-056.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-056.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-056.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-056.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-057.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-057.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-057.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-057.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-058-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-058-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-058-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-058-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-058.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-058.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-058.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-058.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-060.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-060.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-060.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-060.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-061.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-061.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-061.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-061.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-062.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-062.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-062.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-062.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-063.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-063.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-063.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-063.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-064-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-064-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-064-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-064-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-064.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-064.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-064.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-064.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-065.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-065.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-065.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-065.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-066.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-066.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-066.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-066.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-067.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-067.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-067.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-067.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-068.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-068.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-068.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-068.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-069.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-069.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-069.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-069.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-070.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-070.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-070.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-070.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-071.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-071.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-071.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-071.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-072.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-072.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-072.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-072.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-073.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-073.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-073.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-073.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-074-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-074-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-074-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-074-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-074.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-074.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-074.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-074.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-075-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-075-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-075-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-075-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-075.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-075.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-075.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-075.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-076.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-076.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-076.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-076.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-077.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-077.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-077.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-077.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-078-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-078-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-078-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-078-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-078.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-078.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-078.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-078.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-079-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-079-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-079-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-079-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-079.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-079.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-079.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-079.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-080.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-080.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-080.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-080.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-081.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-081.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-081.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-081.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-082.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-082.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-082.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-082.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-083.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-083.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-083.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-083.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-084.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-084.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-084.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-084.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-applied-to-th-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-applied-to-th-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-applied-to-th-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-applied-to-th-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-in-iframe-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-in-iframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-in-iframe-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-in-iframe-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-in-iframe.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-in-iframe.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-in-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-intrinsic-width.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-intrinsic-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-intrinsic-width.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-intrinsic-width.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-nested-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-nested-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-nested-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-nested-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-nested.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-nested.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-selection-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-selection-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-selection-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-selection-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-state-changed-first-observation.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-state-changed-first-observation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-state-changed-first-observation.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-state-changed-first-observation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-state-changed-removed.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-state-changed-removed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-state-changed-removed.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-state-changed-removed.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-state-changed.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-state-changed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-auto-state-changed.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-auto-state-changed.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-canvas-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-canvas-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-canvas-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-canvas-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-canvas.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-canvas.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-canvas.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-continuations-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-continuations-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-continuations-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-continuations-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-fieldset-size-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-fieldset-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-fieldset-size-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-fieldset-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-fieldset-size.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-fieldset-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-fieldset-size.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-fieldset-size.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-forced-layout-client-rects.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-forced-layout-client-rects.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-forced-layout-client-rects.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-forced-layout-client-rects.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-form-controls-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-form-controls-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-form-controls-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-form-controls-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-hit-test-contents-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-hit-test-contents-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-hit-test-contents-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-hit-test-contents-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-img.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-img.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-img.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-img.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-in-svg-000-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-in-svg-000-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-in-svg-000-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-in-svg-000-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-input-image.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-input-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-input-image.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-input-image.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-interpolation.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-interpolation.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-output-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-output-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-output-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-output-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-resize-observer-no-error-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-resize-observer-no-error-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-resize-observer-no-error-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-resize-observer-no-error-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-resize-observer-no-error.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-resize-observer-no-error.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-resize-observer-no-error.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-resize-observer-no-error.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-selection-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-selection-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-selection-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-selection-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-svg.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-svg.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-video-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-video-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-video-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-video-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-video.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-video.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-video.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-video.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-000.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-000.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-000.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-001.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-001.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-002.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-002.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-003.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-003.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-004.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-004.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-005.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-005.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-006.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-006.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-006.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-hide-after-addition.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-hide-after-addition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-hide-after-addition.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-popover-top-layer-hide-after-addition.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-000.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-000.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-000.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-001.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-001.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-002.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-002.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-003.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-003.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-004.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-004.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-005.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-005.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-005.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-006.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-006.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-006.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-hide-after-addition.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-hide-after-addition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-with-top-layer-hide-after-addition.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-visibility-with-top-layer-hide-after-addition.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-with-popover-top-layer-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-with-popover-top-layer-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-with-popover-top-layer-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-with-popover-top-layer-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-with-top-layer-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-with-top-layer-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-with-top-layer-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/content-with-top-layer-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/contentvisibility-nestedslot-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/contentvisibility-nestedslot-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/contentvisibility-nestedslot-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/contentvisibility-nestedslot-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/crashtests/content-visibility-transition-finished-001.html b/tests/wpt/tests/css/css-contain/content-visibility/crashtests/content-visibility-transition-finished-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/crashtests/content-visibility-transition-finished-001.html rename to tests/wpt/tests/css/css-contain/content-visibility/crashtests/content-visibility-transition-finished-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/crashtests/first-line-and-inline-block.html b/tests/wpt/tests/css/css-contain/content-visibility/crashtests/first-line-and-inline-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/crashtests/first-line-and-inline-block.html rename to tests/wpt/tests/css/css-contain/content-visibility/crashtests/first-line-and-inline-block.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/detach-locked-slot-children-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/detach-locked-slot-children-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/detach-locked-slot-children-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/detach-locked-slot-children-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/document-element-computed-style.html b/tests/wpt/tests/css/css-contain/content-visibility/document-element-computed-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/document-element-computed-style.html rename to tests/wpt/tests/css/css-contain/content-visibility/document-element-computed-style.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/dynamic-change-paint-fully-obscuring-child-001.html b/tests/wpt/tests/css/css-contain/content-visibility/dynamic-change-paint-fully-obscuring-child-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/dynamic-change-paint-fully-obscuring-child-001.html rename to tests/wpt/tests/css/css-contain/content-visibility/dynamic-change-paint-fully-obscuring-child-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/element-reassigned-to-skipped-slot.html b/tests/wpt/tests/css/css-contain/content-visibility/element-reassigned-to-skipped-slot.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/element-reassigned-to-skipped-slot.html rename to tests/wpt/tests/css/css-contain/content-visibility/element-reassigned-to-skipped-slot.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/element-reassigned-to-slot-in-skipped-subtree.html b/tests/wpt/tests/css/css-contain/content-visibility/element-reassigned-to-slot-in-skipped-subtree.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/element-reassigned-to-slot-in-skipped-subtree.html rename to tests/wpt/tests/css/css-contain/content-visibility/element-reassigned-to-slot-in-skipped-subtree.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/hidden-execcommand-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/hidden-execcommand-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/hidden-execcommand-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/hidden-execcommand-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/hidden-pseudo-element-removed-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/hidden-pseudo-element-removed-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/hidden-pseudo-element-removed-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/hidden-pseudo-element-removed-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/inheritance.html b/tests/wpt/tests/css/css-contain/content-visibility/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/inheritance.html rename to tests/wpt/tests/css/css-contain/content-visibility/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/inline-container-with-child-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/inline-container-with-child-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/inline-container-with-child-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/inline-container-with-child-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/meter-selection-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/meter-selection-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/meter-selection-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/meter-selection-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/parsing/content-visibility-computed.html b/tests/wpt/tests/css/css-contain/content-visibility/parsing/content-visibility-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/parsing/content-visibility-computed.html rename to tests/wpt/tests/css/css-contain/content-visibility/parsing/content-visibility-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/parsing/content-visibility-invalid.html b/tests/wpt/tests/css/css-contain/content-visibility/parsing/content-visibility-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/parsing/content-visibility-invalid.html rename to tests/wpt/tests/css/css-contain/content-visibility/parsing/content-visibility-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/parsing/content-visibility-valid.html b/tests/wpt/tests/css/css-contain/content-visibility/parsing/content-visibility-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/parsing/content-visibility-valid.html rename to tests/wpt/tests/css/css-contain/content-visibility/parsing/content-visibility-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/positioned-container-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/positioned-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/positioned-container-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/positioned-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/resources/circles.svg b/tests/wpt/tests/css/css-contain/content-visibility/resources/circles.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/resources/circles.svg rename to tests/wpt/tests/css/css-contain/content-visibility/resources/circles.svg diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/resources/dice.png b/tests/wpt/tests/css/css-contain/content-visibility/resources/dice.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/resources/dice.png rename to tests/wpt/tests/css/css-contain/content-visibility/resources/dice.png diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/resources/frame.html b/tests/wpt/tests/css/css-contain/content-visibility/resources/frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/resources/frame.html rename to tests/wpt/tests/css/css-contain/content-visibility/resources/frame.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/resources/slot-content-visibility.html b/tests/wpt/tests/css/css-contain/content-visibility/resources/slot-content-visibility.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/resources/slot-content-visibility.html rename to tests/wpt/tests/css/css-contain/content-visibility/resources/slot-content-visibility.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/resources/text-fragment-target-auto.html b/tests/wpt/tests/css/css-contain/content-visibility/resources/text-fragment-target-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/resources/text-fragment-target-auto.html rename to tests/wpt/tests/css/css-contain/content-visibility/resources/text-fragment-target-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/scrollIntoView-target-with-contents-hidden-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/scrollIntoView-target-with-contents-hidden-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/scrollIntoView-target-with-contents-hidden-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/scrollIntoView-target-with-contents-hidden-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/scrollIntoView-target-with-contents-hidden.html b/tests/wpt/tests/css/css-contain/content-visibility/scrollIntoView-target-with-contents-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/scrollIntoView-target-with-contents-hidden.html rename to tests/wpt/tests/css/css-contain/content-visibility/scrollIntoView-target-with-contents-hidden.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/scrollIntoView-with-focus-target-with-contents-hidden-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/scrollIntoView-with-focus-target-with-contents-hidden-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/scrollIntoView-with-focus-target-with-contents-hidden-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/scrollIntoView-with-focus-target-with-contents-hidden-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/scrollIntoView-with-focus-target-with-contents-hidden.html b/tests/wpt/tests/css/css-contain/content-visibility/scrollIntoView-with-focus-target-with-contents-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/scrollIntoView-with-focus-target-with-contents-hidden.html rename to tests/wpt/tests/css/css-contain/content-visibility/scrollIntoView-with-focus-target-with-contents-hidden.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-1-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-1-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-1-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-1-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-10-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-10-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-10-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-10-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-11-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-11-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-11-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-11-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-12-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-12-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-12-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-12-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-13-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-13-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-13-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-13-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-14-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-14-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-14-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-14-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-15-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-15-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-15-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-15-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-16-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-16-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-16-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-16-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-17-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-17-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-17-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-17-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-18-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-18-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-18-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-18-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-19-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-19-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-19-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-19-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-2-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-2-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-2-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-2-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-20-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-20-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-20-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-20-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-21-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-21-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-21-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-21-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-22-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-22-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-22-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-22-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-3-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-3-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-3-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-3-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-4-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-4-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-4-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-4-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-5-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-5-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-5-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-5-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-6-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-6-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-6-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-6-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-7-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-7-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-7-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-7-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-8-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-8-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-8-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-8-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-9-crash.html b/tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-9-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/slot-content-visibility-9-crash.html rename to tests/wpt/tests/css/css-contain/content-visibility/slot-content-visibility-9-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/spacer-and-container-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/spacer-and-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/spacer-and-container-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/spacer-and-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/spacer-and-container-scrolled-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/spacer-and-container-scrolled-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/spacer-and-container-scrolled-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/spacer-and-container-scrolled-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/spacer-with-popover-top-layer-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/spacer-with-popover-top-layer-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/spacer-with-popover-top-layer-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/spacer-with-popover-top-layer-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/spacer-with-top-layer-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/spacer-with-top-layer-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/content-visibility/spacer-with-top-layer-ref.html rename to tests/wpt/tests/css/css-contain/content-visibility/spacer-with-top-layer-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-001.html b/tests/wpt/tests/css/css-contain/counter-scoping-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/counter-scoping-001.html rename to tests/wpt/tests/css/css-contain/counter-scoping-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-002.html b/tests/wpt/tests/css/css-contain/counter-scoping-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/counter-scoping-002.html rename to tests/wpt/tests/css/css-contain/counter-scoping-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-003.html b/tests/wpt/tests/css/css-contain/counter-scoping-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/counter-scoping-003.html rename to tests/wpt/tests/css/css-contain/counter-scoping-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/crashtests/contain-nested-crash-001.html b/tests/wpt/tests/css/css-contain/crashtests/contain-nested-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/crashtests/contain-nested-crash-001.html rename to tests/wpt/tests/css/css-contain/crashtests/contain-nested-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/crashtests/contain-nested-crash-002.html b/tests/wpt/tests/css/css-contain/crashtests/contain-nested-crash-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/crashtests/contain-nested-crash-002.html rename to tests/wpt/tests/css/css-contain/crashtests/contain-nested-crash-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/crashtests/contain-nested-crash-003.html b/tests/wpt/tests/css/css-contain/crashtests/contain-nested-crash-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/crashtests/contain-nested-crash-003.html rename to tests/wpt/tests/css/css-contain/crashtests/contain-nested-crash-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/crashtests/contain-nested-crash-004.html b/tests/wpt/tests/css/css-contain/crashtests/contain-nested-crash-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/crashtests/contain-nested-crash-004.html rename to tests/wpt/tests/css/css-contain/crashtests/contain-nested-crash-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/inheritance.html b/tests/wpt/tests/css/css-contain/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/inheritance.html rename to tests/wpt/tests/css/css-contain/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/parsing/contain-computed-children.html b/tests/wpt/tests/css/css-contain/parsing/contain-computed-children.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/parsing/contain-computed-children.html rename to tests/wpt/tests/css/css-contain/parsing/contain-computed-children.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/parsing/contain-computed.html b/tests/wpt/tests/css/css-contain/parsing/contain-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/parsing/contain-computed.html rename to tests/wpt/tests/css/css-contain/parsing/contain-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/parsing/contain-invalid.html b/tests/wpt/tests/css/css-contain/parsing/contain-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/parsing/contain-invalid.html rename to tests/wpt/tests/css/css-contain/parsing/contain-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/parsing/contain-valid.html b/tests/wpt/tests/css/css-contain/parsing/contain-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/parsing/contain-valid.html rename to tests/wpt/tests/css/css-contain/parsing/contain-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-001.html b/tests/wpt/tests/css/css-contain/quote-scoping-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/quote-scoping-001.html rename to tests/wpt/tests/css/css-contain/quote-scoping-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-002.html b/tests/wpt/tests/css/css-contain/quote-scoping-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/quote-scoping-002.html rename to tests/wpt/tests/css/css-contain/quote-scoping-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-003.html b/tests/wpt/tests/css/css-contain/quote-scoping-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/quote-scoping-003.html rename to tests/wpt/tests/css/css-contain/quote-scoping-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-004.html b/tests/wpt/tests/css/css-contain/quote-scoping-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/quote-scoping-004.html rename to tests/wpt/tests/css/css-contain/quote-scoping-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-empty-style-boundaries.html b/tests/wpt/tests/css/css-contain/quote-scoping-empty-style-boundaries.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/quote-scoping-empty-style-boundaries.html rename to tests/wpt/tests/css/css-contain/quote-scoping-empty-style-boundaries.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-invalidation-001.html b/tests/wpt/tests/css/css-contain/quote-scoping-invalidation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/quote-scoping-invalidation-001.html rename to tests/wpt/tests/css/css-contain/quote-scoping-invalidation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-invalidation-002.html b/tests/wpt/tests/css/css-contain/quote-scoping-invalidation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/quote-scoping-invalidation-002.html rename to tests/wpt/tests/css/css-contain/quote-scoping-invalidation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-invalidation-003.html b/tests/wpt/tests/css/css-contain/quote-scoping-invalidation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/quote-scoping-invalidation-003.html rename to tests/wpt/tests/css/css-contain/quote-scoping-invalidation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-invalidation-004.html b/tests/wpt/tests/css/css-contain/quote-scoping-invalidation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/quote-scoping-invalidation-004.html rename to tests/wpt/tests/css/css-contain/quote-scoping-invalidation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-baseline-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-baseline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-baseline-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-baseline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-body-bg-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-body-bg-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-body-bg-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-body-bg-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-body-overflow-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-body-overflow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-body-overflow-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-body-overflow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-body-t-o-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-body-t-o-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-body-t-o-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-body-t-o-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-body-w-m-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-body-w-m-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-body-w-m-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-body-w-m-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-content-011-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-content-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-content-011-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-content-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-020-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-020-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-021-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-021-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-baseline-004-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-baseline-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-baseline-004-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-baseline-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-baseline-005-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-baseline-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-baseline-005-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-baseline-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-breaks-002-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-breaks-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-breaks-002-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-breaks-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-button-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-button-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-button-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-button-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-cell-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-cell-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-cell-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-cell-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-flexbox-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-flexbox-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-flexbox-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-flexbox-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-grid-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-grid-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-grid-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-grid-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-ifc-022-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-ifc-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-ifc-022-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-ifc-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-ink-overflow-013-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-ink-overflow-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-ink-overflow-013-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-ink-overflow-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-ink-overflow-014-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-ink-overflow-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-ink-overflow-014-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-ink-overflow-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-ink-overflow-015-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-ink-overflow-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-ink-overflow-015-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-ink-overflow-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-ink-overflow-019-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-ink-overflow-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-ink-overflow-019-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-ink-overflow-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-ink-overflow-020-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-ink-overflow-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-ink-overflow-020-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-ink-overflow-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-size-003-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-layout-size-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-layout-size-003-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-layout-size-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-paint-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-paint-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-007-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-paint-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-007-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-paint-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-008-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-paint-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-008-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-paint-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-022-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-paint-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-022-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-paint-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-047-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-paint-047-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-047-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-paint-047-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-clip-015-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-paint-clip-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-clip-015-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-paint-clip-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-clip-019-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-paint-clip-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-clip-019-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-paint-clip-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-ifc-011-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-paint-ifc-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-ifc-011-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-paint-ifc-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-independent-formatting-context-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-paint-independent-formatting-context-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-independent-formatting-context-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-paint-independent-formatting-context-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-independent-formatting-context-003-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-paint-independent-formatting-context-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-independent-formatting-context-003-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-paint-independent-formatting-context-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-size-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-paint-size-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-size-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-paint-size-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-size-003-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-paint-size-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-paint-size-003-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-paint-size-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-004-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-004-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-005-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-005-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-021-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-021-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-022-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-022-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-023-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-023-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-025-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-025-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-027-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-027-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-051-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-051-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-051-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-051-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-056-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-056-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-056-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-056-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-061-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-061-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-061-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-061-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-062-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-062-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-062-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-062-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-063-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-063-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-063-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-063-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-064-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-064-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-064-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-064-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-breaks-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-breaks-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-breaks-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-breaks-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-button-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-button-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-button-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-button-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-fieldset-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-fieldset-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-fieldset-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-fieldset-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-fieldset-002-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-fieldset-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-fieldset-002-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-fieldset-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-flexbox-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-flexbox-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-flexbox-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-flexbox-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-flexbox-002-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-flexbox-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-flexbox-002-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-flexbox-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-grid-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-grid-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-grid-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-grid-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-grid-005-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-grid-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-grid-005-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-grid-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-monolithic-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-monolithic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-monolithic-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-monolithic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-scrollbars-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-scrollbars-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-scrollbars-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-scrollbars-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-scrollbars-004-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-scrollbars-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-scrollbars-004-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-scrollbars-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-select-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-size-select-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-size-select-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-size-select-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-strict-011-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-strict-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-strict-011-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-strict-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-breaks-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-breaks-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-breaks-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-style-breaks-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-breaks-004-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-breaks-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-breaks-004-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-style-breaks-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-counters-001-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-counters-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-counters-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-style-counters-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-counters-003-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-counters-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-counters-003-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-style-counters-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-counters-004-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-counters-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-counters-004-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-style-counters-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-counters-005-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-counters-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-counters-005-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-style-counters-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-ol-ordinal-li-container-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-ol-ordinal-li-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-ol-ordinal-li-container-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-style-ol-ordinal-li-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-ol-ordinal-pseudo-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-ol-ordinal-pseudo-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-ol-ordinal-pseudo-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-style-ol-ordinal-pseudo-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-ol-ordinal-pseudo-reversed-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-ol-ordinal-pseudo-reversed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-ol-ordinal-pseudo-reversed-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-style-ol-ordinal-pseudo-reversed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-ol-ordinal-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-ol-ordinal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-ol-ordinal-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-style-ol-ordinal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-ol-ordinal-reversed-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-ol-ordinal-reversed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-ol-ordinal-reversed-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-style-ol-ordinal-reversed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-ol-ordinal-start-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-ol-ordinal-start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-ol-ordinal-start-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-style-ol-ordinal-start-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-ol-ordinal-start-reversed-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-ol-ordinal-start-reversed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-style-ol-ordinal-start-reversed-ref.html rename to tests/wpt/tests/css/css-contain/reference/contain-style-ol-ordinal-start-reversed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-subgrid-001.html b/tests/wpt/tests/css/css-contain/reference/contain-subgrid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/contain-subgrid-001.html rename to tests/wpt/tests/css/css-contain/reference/contain-subgrid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/counter-scoping-001-ref.html b/tests/wpt/tests/css/css-contain/reference/counter-scoping-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/counter-scoping-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/counter-scoping-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/counter-scoping-003-ref.html b/tests/wpt/tests/css/css-contain/reference/counter-scoping-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/counter-scoping-003-ref.html rename to tests/wpt/tests/css/css-contain/reference/counter-scoping-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/pass_if_pass_below_clipped.html b/tests/wpt/tests/css/css-contain/reference/pass_if_pass_below_clipped.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/pass_if_pass_below_clipped.html rename to tests/wpt/tests/css/css-contain/reference/pass_if_pass_below_clipped.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-001-ref.html b/tests/wpt/tests/css/css-contain/reference/quote-scoping-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/quote-scoping-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-002-ref.html b/tests/wpt/tests/css/css-contain/reference/quote-scoping-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-002-ref.html rename to tests/wpt/tests/css/css-contain/reference/quote-scoping-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-003-ref.html b/tests/wpt/tests/css/css-contain/reference/quote-scoping-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-003-ref.html rename to tests/wpt/tests/css/css-contain/reference/quote-scoping-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-empty-style-boundaries-ref.html b/tests/wpt/tests/css/css-contain/reference/quote-scoping-empty-style-boundaries-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-empty-style-boundaries-ref.html rename to tests/wpt/tests/css/css-contain/reference/quote-scoping-empty-style-boundaries-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-invalidation-001-ref.html b/tests/wpt/tests/css/css-contain/reference/quote-scoping-invalidation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-invalidation-001-ref.html rename to tests/wpt/tests/css/css-contain/reference/quote-scoping-invalidation-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-invalidation-002-ref.html b/tests/wpt/tests/css/css-contain/reference/quote-scoping-invalidation-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-invalidation-002-ref.html rename to tests/wpt/tests/css/css-contain/reference/quote-scoping-invalidation-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-invalidation-003-ref.html b/tests/wpt/tests/css/css-contain/reference/quote-scoping-invalidation-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-invalidation-003-ref.html rename to tests/wpt/tests/css/css-contain/reference/quote-scoping-invalidation-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-invalidation-004-ref.html b/tests/wpt/tests/css/css-contain/reference/quote-scoping-invalidation-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/quote-scoping-invalidation-004-ref.html rename to tests/wpt/tests/css/css-contain/reference/quote-scoping-invalidation-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/ref-if-there-is-no-red.xht b/tests/wpt/tests/css/css-contain/reference/ref-if-there-is-no-red.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/reference/ref-if-there-is-no-red.xht rename to tests/wpt/tests/css/css-contain/reference/ref-if-there-is-no-red.xht diff --git a/tests/wpt/web-platform-tests/css/css-contain/support/60x60-green.png b/tests/wpt/tests/css/css-contain/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/support/60x60-green.png rename to tests/wpt/tests/css/css-contain/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/css-contain/support/blue-100x100.png b/tests/wpt/tests/css/css-contain/support/blue-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/support/blue-100x100.png rename to tests/wpt/tests/css/css-contain/support/blue-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-contain/support/blue50wBy25h.png b/tests/wpt/tests/css/css-contain/support/blue50wBy25h.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/support/blue50wBy25h.png rename to tests/wpt/tests/css/css-contain/support/blue50wBy25h.png diff --git a/tests/wpt/web-platform-tests/css/css-contain/support/blue50wBy46h.png b/tests/wpt/tests/css/css-contain/support/blue50wBy46h.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/support/blue50wBy46h.png rename to tests/wpt/tests/css/css-contain/support/blue50wBy46h.png diff --git a/tests/wpt/web-platform-tests/css/css-contain/support/pattern-gg-gr-100x100.png b/tests/wpt/tests/css/css-contain/support/pattern-gg-gr-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/support/pattern-gg-gr-100x100.png rename to tests/wpt/tests/css/css-contain/support/pattern-gg-gr-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-contain/support/swatch-blue.png b/tests/wpt/tests/css/css-contain/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/support/swatch-blue.png rename to tests/wpt/tests/css/css-contain/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-contain/support/swatch-orange.png b/tests/wpt/tests/css/css-contain/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/support/swatch-orange.png rename to tests/wpt/tests/css/css-contain/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-contain/support/swatch-red.png b/tests/wpt/tests/css/css-contain/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/support/swatch-red.png rename to tests/wpt/tests/css/css-contain/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-contain/support/swatch-yellow.png b/tests/wpt/tests/css/css-contain/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/support/swatch-yellow.png rename to tests/wpt/tests/css/css-contain/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/css-contain/support/white.webm b/tests/wpt/tests/css/css-contain/support/white.webm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-contain/support/white.webm rename to tests/wpt/tests/css/css-contain/support/white.webm diff --git a/tests/wpt/web-platform-tests/css/css-content/META.yml b/tests/wpt/tests/css/css-content/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/META.yml rename to tests/wpt/tests/css/css-content/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-content/attr-case-sensitivity-001.html b/tests/wpt/tests/css/css-content/attr-case-sensitivity-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/attr-case-sensitivity-001.html rename to tests/wpt/tests/css/css-content/attr-case-sensitivity-001.html diff --git a/tests/wpt/web-platform-tests/css/css-content/attr-case-sensitivity-002.html b/tests/wpt/tests/css/css-content/attr-case-sensitivity-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/attr-case-sensitivity-002.html rename to tests/wpt/tests/css/css-content/attr-case-sensitivity-002.html diff --git a/tests/wpt/web-platform-tests/css/css-content/attr-case-sensitivity-003.html b/tests/wpt/tests/css/css-content/attr-case-sensitivity-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/attr-case-sensitivity-003.html rename to tests/wpt/tests/css/css-content/attr-case-sensitivity-003.html diff --git a/tests/wpt/web-platform-tests/css/css-content/attr-case-sensitivity-ref-001.html b/tests/wpt/tests/css/css-content/attr-case-sensitivity-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/attr-case-sensitivity-ref-001.html rename to tests/wpt/tests/css/css-content/attr-case-sensitivity-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-content/attr-case-sensitivity-ref-002.html b/tests/wpt/tests/css/css-content/attr-case-sensitivity-ref-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/attr-case-sensitivity-ref-002.html rename to tests/wpt/tests/css/css-content/attr-case-sensitivity-ref-002.html diff --git a/tests/wpt/web-platform-tests/css/css-content/attr-case-sensitivity-ref-003.html b/tests/wpt/tests/css/css-content/attr-case-sensitivity-ref-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/attr-case-sensitivity-ref-003.html rename to tests/wpt/tests/css/css-content/attr-case-sensitivity-ref-003.html diff --git a/tests/wpt/web-platform-tests/css/css-content/computed-value.html b/tests/wpt/tests/css/css-content/computed-value.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/computed-value.html rename to tests/wpt/tests/css/css-content/computed-value.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-animation.html b/tests/wpt/tests/css/css-content/content-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-animation.html rename to tests/wpt/tests/css/css-content/content-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-no-interpolation.html b/tests/wpt/tests/css/css-content/content-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-no-interpolation.html rename to tests/wpt/tests/css/css-content/content-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-details-ref.html b/tests/wpt/tests/css/css-content/content-none-details-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-details-ref.html rename to tests/wpt/tests/css/css-content/content-none-details-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-details.html b/tests/wpt/tests/css/css-content/content-none-details.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-details.html rename to tests/wpt/tests/css/css-content/content-none-details.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-fieldset-ref.html b/tests/wpt/tests/css/css-content/content-none-fieldset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-fieldset-ref.html rename to tests/wpt/tests/css/css-content/content-none-fieldset-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-fieldset.html b/tests/wpt/tests/css/css-content/content-none-fieldset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-fieldset.html rename to tests/wpt/tests/css/css-content/content-none-fieldset.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-input-ref.html b/tests/wpt/tests/css/css-content/content-none-input-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-input-ref.html rename to tests/wpt/tests/css/css-content/content-none-input-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-input.html b/tests/wpt/tests/css/css-content/content-none-input.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-input.html rename to tests/wpt/tests/css/css-content/content-none-input.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-math-ref.html b/tests/wpt/tests/css/css-content/content-none-math-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-math-ref.html rename to tests/wpt/tests/css/css-content/content-none-math-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-math.html b/tests/wpt/tests/css/css-content/content-none-math.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-math.html rename to tests/wpt/tests/css/css-content/content-none-math.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-option-ref.html b/tests/wpt/tests/css/css-content/content-none-option-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-option-ref.html rename to tests/wpt/tests/css/css-content/content-none-option-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-option.html b/tests/wpt/tests/css/css-content/content-none-option.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-option.html rename to tests/wpt/tests/css/css-content/content-none-option.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-root-block-ref.html b/tests/wpt/tests/css/css-content/content-none-root-block-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-root-block-ref.html rename to tests/wpt/tests/css/css-content/content-none-root-block-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-root-block.html b/tests/wpt/tests/css/css-content/content-none-root-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-root-block.html rename to tests/wpt/tests/css/css-content/content-none-root-block.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-root-columns-ref.html b/tests/wpt/tests/css/css-content/content-none-root-columns-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-root-columns-ref.html rename to tests/wpt/tests/css/css-content/content-none-root-columns-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-root-columns.html b/tests/wpt/tests/css/css-content/content-none-root-columns.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-root-columns.html rename to tests/wpt/tests/css/css-content/content-none-root-columns.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-root-flex-ref.html b/tests/wpt/tests/css/css-content/content-none-root-flex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-root-flex-ref.html rename to tests/wpt/tests/css/css-content/content-none-root-flex-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-root-flex.html b/tests/wpt/tests/css/css-content/content-none-root-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-root-flex.html rename to tests/wpt/tests/css/css-content/content-none-root-flex.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-root-grid-ref.html b/tests/wpt/tests/css/css-content/content-none-root-grid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-root-grid-ref.html rename to tests/wpt/tests/css/css-content/content-none-root-grid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-root-grid.html b/tests/wpt/tests/css/css-content/content-none-root-grid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-root-grid.html rename to tests/wpt/tests/css/css-content/content-none-root-grid.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-root-ruby-ref.html b/tests/wpt/tests/css/css-content/content-none-root-ruby-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-root-ruby-ref.html rename to tests/wpt/tests/css/css-content/content-none-root-ruby-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-root-ruby.html b/tests/wpt/tests/css/css-content/content-none-root-ruby.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-root-ruby.html rename to tests/wpt/tests/css/css-content/content-none-root-ruby.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-root-table-ref.html b/tests/wpt/tests/css/css-content/content-none-root-table-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-root-table-ref.html rename to tests/wpt/tests/css/css-content/content-none-root-table-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-root-table.html b/tests/wpt/tests/css/css-content/content-none-root-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-root-table.html rename to tests/wpt/tests/css/css-content/content-none-root-table.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-select-1-ref.html b/tests/wpt/tests/css/css-content/content-none-select-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-select-1-ref.html rename to tests/wpt/tests/css/css-content/content-none-select-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-select-1.html b/tests/wpt/tests/css/css-content/content-none-select-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-select-1.html rename to tests/wpt/tests/css/css-content/content-none-select-1.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-select-2-ref.html b/tests/wpt/tests/css/css-content/content-none-select-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-select-2-ref.html rename to tests/wpt/tests/css/css-content/content-none-select-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-select-2.html b/tests/wpt/tests/css/css-content/content-none-select-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-select-2.html rename to tests/wpt/tests/css/css-content/content-none-select-2.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-span-dynamic.html b/tests/wpt/tests/css/css-content/content-none-span-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-span-dynamic.html rename to tests/wpt/tests/css/css-content/content-none-span-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-span-ref.html b/tests/wpt/tests/css/css-content/content-none-span-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-span-ref.html rename to tests/wpt/tests/css/css-content/content-none-span-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-span.html b/tests/wpt/tests/css/css-content/content-none-span.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-span.html rename to tests/wpt/tests/css/css-content/content-none-span.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-table-ref.html b/tests/wpt/tests/css/css-content/content-none-table-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-table-ref.html rename to tests/wpt/tests/css/css-content/content-none-table-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/content-none-table.html b/tests/wpt/tests/css/css-content/content-none-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/content-none-table.html rename to tests/wpt/tests/css/css-content/content-none-table.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement-alt-ref.html b/tests/wpt/tests/css/css-content/element-replacement-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement-alt-ref.html rename to tests/wpt/tests/css/css-content/element-replacement-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement-alt.html b/tests/wpt/tests/css/css-content/element-replacement-alt.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement-alt.html rename to tests/wpt/tests/css/css-content/element-replacement-alt.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement-display-contents.html b/tests/wpt/tests/css/css-content/element-replacement-display-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement-display-contents.html rename to tests/wpt/tests/css/css-content/element-replacement-display-contents.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement-display-none.html b/tests/wpt/tests/css/css-content/element-replacement-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement-display-none.html rename to tests/wpt/tests/css/css-content/element-replacement-display-none.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement-dynamic.html b/tests/wpt/tests/css/css-content/element-replacement-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement-dynamic.html rename to tests/wpt/tests/css/css-content/element-replacement-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement-gradient-ref.html b/tests/wpt/tests/css/css-content/element-replacement-gradient-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement-gradient-ref.html rename to tests/wpt/tests/css/css-content/element-replacement-gradient-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement-gradient.html b/tests/wpt/tests/css/css-content/element-replacement-gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement-gradient.html rename to tests/wpt/tests/css/css-content/element-replacement-gradient.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement-image-alt.html b/tests/wpt/tests/css/css-content/element-replacement-image-alt.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement-image-alt.html rename to tests/wpt/tests/css/css-content/element-replacement-image-alt.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement-image-no-src-ref.html b/tests/wpt/tests/css/css-content/element-replacement-image-no-src-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement-image-no-src-ref.html rename to tests/wpt/tests/css/css-content/element-replacement-image-no-src-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement-image-no-src.tentative.html b/tests/wpt/tests/css/css-content/element-replacement-image-no-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement-image-no-src.tentative.html rename to tests/wpt/tests/css/css-content/element-replacement-image-no-src.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement-image-src.tentative.html b/tests/wpt/tests/css/css-content/element-replacement-image-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement-image-src.tentative.html rename to tests/wpt/tests/css/css-content/element-replacement-image-src.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement-on-replaced-element-ref.html b/tests/wpt/tests/css/css-content/element-replacement-on-replaced-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement-on-replaced-element-ref.html rename to tests/wpt/tests/css/css-content/element-replacement-on-replaced-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement-on-replaced-element.tentative.html b/tests/wpt/tests/css/css-content/element-replacement-on-replaced-element.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement-on-replaced-element.tentative.html rename to tests/wpt/tests/css/css-content/element-replacement-on-replaced-element.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement-ref.html b/tests/wpt/tests/css/css-content/element-replacement-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement-ref.html rename to tests/wpt/tests/css/css-content/element-replacement-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/element-replacement.html b/tests/wpt/tests/css/css-content/element-replacement.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/element-replacement.html rename to tests/wpt/tests/css/css-content/element-replacement.html diff --git a/tests/wpt/web-platform-tests/css/css-content/inheritance.html b/tests/wpt/tests/css/css-content/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/inheritance.html rename to tests/wpt/tests/css/css-content/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-content/pseudo-element-inline-box-ref.html b/tests/wpt/tests/css/css-content/pseudo-element-inline-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/pseudo-element-inline-box-ref.html rename to tests/wpt/tests/css/css-content/pseudo-element-inline-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/pseudo-element-inline-box.html b/tests/wpt/tests/css/css-content/pseudo-element-inline-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/pseudo-element-inline-box.html rename to tests/wpt/tests/css/css-content/pseudo-element-inline-box.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-001.html b/tests/wpt/tests/css/css-content/quotes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-001.html rename to tests/wpt/tests/css/css-content/quotes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-002.html b/tests/wpt/tests/css/css-content/quotes-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-002.html rename to tests/wpt/tests/css/css-content/quotes-002.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-003.html b/tests/wpt/tests/css/css-content/quotes-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-003.html rename to tests/wpt/tests/css/css-content/quotes-003.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-004.html b/tests/wpt/tests/css/css-content/quotes-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-004.html rename to tests/wpt/tests/css/css-content/quotes-004.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-005.html b/tests/wpt/tests/css/css-content/quotes-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-005.html rename to tests/wpt/tests/css/css-content/quotes-005.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-006.html b/tests/wpt/tests/css/css-content/quotes-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-006.html rename to tests/wpt/tests/css/css-content/quotes-006.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-007.html b/tests/wpt/tests/css/css-content/quotes-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-007.html rename to tests/wpt/tests/css/css-content/quotes-007.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-008.html b/tests/wpt/tests/css/css-content/quotes-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-008.html rename to tests/wpt/tests/css/css-content/quotes-008.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-009.html b/tests/wpt/tests/css/css-content/quotes-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-009.html rename to tests/wpt/tests/css/css-content/quotes-009.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-010.html b/tests/wpt/tests/css/css-content/quotes-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-010.html rename to tests/wpt/tests/css/css-content/quotes-010.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-011.html b/tests/wpt/tests/css/css-content/quotes-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-011.html rename to tests/wpt/tests/css/css-content/quotes-011.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-012.html b/tests/wpt/tests/css/css-content/quotes-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-012.html rename to tests/wpt/tests/css/css-content/quotes-012.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-013.html b/tests/wpt/tests/css/css-content/quotes-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-013.html rename to tests/wpt/tests/css/css-content/quotes-013.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-014.html b/tests/wpt/tests/css/css-content/quotes-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-014.html rename to tests/wpt/tests/css/css-content/quotes-014.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-015.html b/tests/wpt/tests/css/css-content/quotes-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-015.html rename to tests/wpt/tests/css/css-content/quotes-015.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-016.html b/tests/wpt/tests/css/css-content/quotes-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-016.html rename to tests/wpt/tests/css/css-content/quotes-016.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-017.html b/tests/wpt/tests/css/css-content/quotes-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-017.html rename to tests/wpt/tests/css/css-content/quotes-017.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-018.html b/tests/wpt/tests/css/css-content/quotes-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-018.html rename to tests/wpt/tests/css/css-content/quotes-018.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-019.html b/tests/wpt/tests/css/css-content/quotes-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-019.html rename to tests/wpt/tests/css/css-content/quotes-019.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-020.html b/tests/wpt/tests/css/css-content/quotes-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-020.html rename to tests/wpt/tests/css/css-content/quotes-020.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-021.html b/tests/wpt/tests/css/css-content/quotes-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-021.html rename to tests/wpt/tests/css/css-content/quotes-021.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-022.html b/tests/wpt/tests/css/css-content/quotes-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-022.html rename to tests/wpt/tests/css/css-content/quotes-022.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-023.html b/tests/wpt/tests/css/css-content/quotes-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-023.html rename to tests/wpt/tests/css/css-content/quotes-023.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-024.html b/tests/wpt/tests/css/css-content/quotes-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-024.html rename to tests/wpt/tests/css/css-content/quotes-024.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-025.html b/tests/wpt/tests/css/css-content/quotes-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-025.html rename to tests/wpt/tests/css/css-content/quotes-025.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-026.html b/tests/wpt/tests/css/css-content/quotes-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-026.html rename to tests/wpt/tests/css/css-content/quotes-026.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-027.html b/tests/wpt/tests/css/css-content/quotes-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-027.html rename to tests/wpt/tests/css/css-content/quotes-027.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-028.html b/tests/wpt/tests/css/css-content/quotes-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-028.html rename to tests/wpt/tests/css/css-content/quotes-028.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-029.html b/tests/wpt/tests/css/css-content/quotes-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-029.html rename to tests/wpt/tests/css/css-content/quotes-029.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-030.html b/tests/wpt/tests/css/css-content/quotes-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-030.html rename to tests/wpt/tests/css/css-content/quotes-030.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-031.html b/tests/wpt/tests/css/css-content/quotes-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-031.html rename to tests/wpt/tests/css/css-content/quotes-031.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-032.html b/tests/wpt/tests/css/css-content/quotes-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-032.html rename to tests/wpt/tests/css/css-content/quotes-032.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-033.html b/tests/wpt/tests/css/css-content/quotes-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-033.html rename to tests/wpt/tests/css/css-content/quotes-033.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-034.html b/tests/wpt/tests/css/css-content/quotes-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-034.html rename to tests/wpt/tests/css/css-content/quotes-034.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-first-letter-001.html b/tests/wpt/tests/css/css-content/quotes-first-letter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-first-letter-001.html rename to tests/wpt/tests/css/css-content/quotes-first-letter-001.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-first-letter-002.html b/tests/wpt/tests/css/css-content/quotes-first-letter-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-first-letter-002.html rename to tests/wpt/tests/css/css-content/quotes-first-letter-002.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-first-letter-003.html b/tests/wpt/tests/css/css-content/quotes-first-letter-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-first-letter-003.html rename to tests/wpt/tests/css/css-content/quotes-first-letter-003.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-first-letter-004.html b/tests/wpt/tests/css/css-content/quotes-first-letter-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-first-letter-004.html rename to tests/wpt/tests/css/css-content/quotes-first-letter-004.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-first-letter-005.html b/tests/wpt/tests/css/css-content/quotes-first-letter-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-first-letter-005.html rename to tests/wpt/tests/css/css-content/quotes-first-letter-005.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-slot-scoping-ref.html b/tests/wpt/tests/css/css-content/quotes-slot-scoping-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-slot-scoping-ref.html rename to tests/wpt/tests/css/css-content/quotes-slot-scoping-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/quotes-slot-scoping.html b/tests/wpt/tests/css/css-content/quotes-slot-scoping.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/quotes-slot-scoping.html rename to tests/wpt/tests/css/css-content/quotes-slot-scoping.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-001-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-001-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-002-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-002-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-003-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-003-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-004-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-004-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-005-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-005-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-006-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-006-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-007-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-007-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-008-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-008-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-009-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-009-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-010-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-010-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-011-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-011-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-012-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-012-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-013-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-013-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-014-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-014-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-015-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-015-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-016-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-016-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-017-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-017-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-018-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-018-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-019-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-019-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-020-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-020-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-021-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-021-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-022-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-022-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-023-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-023-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-024-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-024-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-025-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-025-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-026-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-026-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-026-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-026-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-027-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-027-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-028-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-028-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-028-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-028-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-029-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-029-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-029-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-029-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-030-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-030-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-030-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-030-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-031-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-031-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-031-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-031-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-032-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-032-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-032-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-032-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-033-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-033-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-033-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-033-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-034-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-034-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-034-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-034-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-first-letter-001-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-first-letter-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-first-letter-001-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-first-letter-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/reference/quotes-first-letter-002-ref.html b/tests/wpt/tests/css/css-content/reference/quotes-first-letter-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/reference/quotes-first-letter-002-ref.html rename to tests/wpt/tests/css/css-content/reference/quotes-first-letter-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-content/resources/rect.svg b/tests/wpt/tests/css/css-content/resources/rect.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-content/resources/rect.svg rename to tests/wpt/tests/css/css-content/resources/rect.svg diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/META.yml b/tests/wpt/tests/css/css-counter-styles/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/META.yml rename to tests/wpt/tests/css/css-counter-styles/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/README b/tests/wpt/tests/css/css-counter-styles/README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/README rename to tests/wpt/tests/css/css-counter-styles/README diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/arabic-indic/css3-counter-styles-101-ref.html b/tests/wpt/tests/css/css-counter-styles/arabic-indic/css3-counter-styles-101-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/arabic-indic/css3-counter-styles-101-ref.html rename to tests/wpt/tests/css/css-counter-styles/arabic-indic/css3-counter-styles-101-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/arabic-indic/css3-counter-styles-101.html b/tests/wpt/tests/css/css-counter-styles/arabic-indic/css3-counter-styles-101.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/arabic-indic/css3-counter-styles-101.html rename to tests/wpt/tests/css/css-counter-styles/arabic-indic/css3-counter-styles-101.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/arabic-indic/css3-counter-styles-102-ref.html b/tests/wpt/tests/css/css-counter-styles/arabic-indic/css3-counter-styles-102-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/arabic-indic/css3-counter-styles-102-ref.html rename to tests/wpt/tests/css/css-counter-styles/arabic-indic/css3-counter-styles-102-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/arabic-indic/css3-counter-styles-102.html b/tests/wpt/tests/css/css-counter-styles/arabic-indic/css3-counter-styles-102.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/arabic-indic/css3-counter-styles-102.html rename to tests/wpt/tests/css/css-counter-styles/arabic-indic/css3-counter-styles-102.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/arabic-indic/css3-counter-styles-103-ref.html b/tests/wpt/tests/css/css-counter-styles/arabic-indic/css3-counter-styles-103-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/arabic-indic/css3-counter-styles-103-ref.html rename to tests/wpt/tests/css/css-counter-styles/arabic-indic/css3-counter-styles-103-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/arabic-indic/css3-counter-styles-103.html b/tests/wpt/tests/css/css-counter-styles/arabic-indic/css3-counter-styles-103.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/arabic-indic/css3-counter-styles-103.html rename to tests/wpt/tests/css/css-counter-styles/arabic-indic/css3-counter-styles-103.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-006-ref.html b/tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-006-ref.html rename to tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-006.html b/tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-006.html rename to tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-006.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-007-ref.html b/tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-007-ref.html rename to tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-007.html b/tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-007.html rename to tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-007.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-008-ref.html b/tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-008-ref.html rename to tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-008.html b/tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-008.html rename to tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-008.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-009-ref.html b/tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-009-ref.html rename to tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-009.html b/tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/armenian/css3-counter-styles-009.html rename to tests/wpt/tests/css/css-counter-styles/armenian/css3-counter-styles-009.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/bengali/css3-counter-styles-116-ref.html b/tests/wpt/tests/css/css-counter-styles/bengali/css3-counter-styles-116-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/bengali/css3-counter-styles-116-ref.html rename to tests/wpt/tests/css/css-counter-styles/bengali/css3-counter-styles-116-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/bengali/css3-counter-styles-116.html b/tests/wpt/tests/css/css-counter-styles/bengali/css3-counter-styles-116.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/bengali/css3-counter-styles-116.html rename to tests/wpt/tests/css/css-counter-styles/bengali/css3-counter-styles-116.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/bengali/css3-counter-styles-117-ref.html b/tests/wpt/tests/css/css-counter-styles/bengali/css3-counter-styles-117-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/bengali/css3-counter-styles-117-ref.html rename to tests/wpt/tests/css/css-counter-styles/bengali/css3-counter-styles-117-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/bengali/css3-counter-styles-117.html b/tests/wpt/tests/css/css-counter-styles/bengali/css3-counter-styles-117.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/bengali/css3-counter-styles-117.html rename to tests/wpt/tests/css/css-counter-styles/bengali/css3-counter-styles-117.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/bengali/css3-counter-styles-118-ref.html b/tests/wpt/tests/css/css-counter-styles/bengali/css3-counter-styles-118-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/bengali/css3-counter-styles-118-ref.html rename to tests/wpt/tests/css/css-counter-styles/bengali/css3-counter-styles-118-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/bengali/css3-counter-styles-118.html b/tests/wpt/tests/css/css-counter-styles/bengali/css3-counter-styles-118.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/bengali/css3-counter-styles-118.html rename to tests/wpt/tests/css/css-counter-styles/bengali/css3-counter-styles-118.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cambodian/css3-counter-styles-158-ref.html b/tests/wpt/tests/css/css-counter-styles/cambodian/css3-counter-styles-158-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cambodian/css3-counter-styles-158-ref.html rename to tests/wpt/tests/css/css-counter-styles/cambodian/css3-counter-styles-158-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cambodian/css3-counter-styles-158.html b/tests/wpt/tests/css/css-counter-styles/cambodian/css3-counter-styles-158.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cambodian/css3-counter-styles-158.html rename to tests/wpt/tests/css/css-counter-styles/cambodian/css3-counter-styles-158.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cambodian/css3-counter-styles-159-ref.html b/tests/wpt/tests/css/css-counter-styles/cambodian/css3-counter-styles-159-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cambodian/css3-counter-styles-159-ref.html rename to tests/wpt/tests/css/css-counter-styles/cambodian/css3-counter-styles-159-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cambodian/css3-counter-styles-159.html b/tests/wpt/tests/css/css-counter-styles/cambodian/css3-counter-styles-159.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cambodian/css3-counter-styles-159.html rename to tests/wpt/tests/css/css-counter-styles/cambodian/css3-counter-styles-159.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cambodian/css3-counter-styles-160-ref.html b/tests/wpt/tests/css/css-counter-styles/cambodian/css3-counter-styles-160-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cambodian/css3-counter-styles-160-ref.html rename to tests/wpt/tests/css/css-counter-styles/cambodian/css3-counter-styles-160-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cambodian/css3-counter-styles-160.html b/tests/wpt/tests/css/css-counter-styles/cambodian/css3-counter-styles-160.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cambodian/css3-counter-styles-160.html rename to tests/wpt/tests/css/css-counter-styles/cambodian/css3-counter-styles-160.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/counter-cjk-decimal-ref.html b/tests/wpt/tests/css/css-counter-styles/cjk-decimal/counter-cjk-decimal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/counter-cjk-decimal-ref.html rename to tests/wpt/tests/css/css-counter-styles/cjk-decimal/counter-cjk-decimal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/counter-cjk-decimal.html b/tests/wpt/tests/css/css-counter-styles/cjk-decimal/counter-cjk-decimal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/counter-cjk-decimal.html rename to tests/wpt/tests/css/css-counter-styles/cjk-decimal/counter-cjk-decimal.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-001-ref.html b/tests/wpt/tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-001-ref.html rename to tests/wpt/tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-001.html b/tests/wpt/tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-001.html rename to tests/wpt/tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-001.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-004-ref.html b/tests/wpt/tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-004-ref.html rename to tests/wpt/tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-004.html b/tests/wpt/tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-004.html rename to tests/wpt/tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-004.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-005-ref.html b/tests/wpt/tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-005-ref.html rename to tests/wpt/tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-005.html b/tests/wpt/tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-005.html rename to tests/wpt/tests/css/css-counter-styles/cjk-decimal/css3-counter-styles-005.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-201-ref.html b/tests/wpt/tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-201-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-201-ref.html rename to tests/wpt/tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-201-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-201.html b/tests/wpt/tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-201.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-201.html rename to tests/wpt/tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-201.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-202-ref.html b/tests/wpt/tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-202-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-202-ref.html rename to tests/wpt/tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-202-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-202.html b/tests/wpt/tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-202.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-202.html rename to tests/wpt/tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-202.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-203-ref.html b/tests/wpt/tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-203-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-203-ref.html rename to tests/wpt/tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-203-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-203.html b/tests/wpt/tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-203.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-203.html rename to tests/wpt/tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-203.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-204-ref.html b/tests/wpt/tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-204-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-204-ref.html rename to tests/wpt/tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-204-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-204.html b/tests/wpt/tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-204.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-204.html rename to tests/wpt/tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-204.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-205-ref.html b/tests/wpt/tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-205-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-205-ref.html rename to tests/wpt/tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-205-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-205.html b/tests/wpt/tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-205.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-205.html rename to tests/wpt/tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-205.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-206-ref.html b/tests/wpt/tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-206-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-206-ref.html rename to tests/wpt/tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-206-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-206.html b/tests/wpt/tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-206.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-206.html rename to tests/wpt/tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-206.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-name-case-sensitive-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-name-case-sensitive-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-name-case-sensitive-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-name-case-sensitive-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-name-case-sensitive.html b/tests/wpt/tests/css/css-counter-styles/counter-name-case-sensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-name-case-sensitive.html rename to tests/wpt/tests/css/css-counter-styles/counter-name-case-sensitive.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/access-from-shadow-dom-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/access-from-shadow-dom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/access-from-shadow-dom-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/access-from-shadow-dom-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/access-from-shadow-dom.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/access-from-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/access-from-shadow-dom.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/access-from-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/additive-symbols-syntax.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/additive-symbols-syntax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/additive-symbols-syntax.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/additive-symbols-syntax.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/broken-symbols-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/broken-symbols-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/broken-symbols-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/broken-symbols-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/broken-symbols.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/broken-symbols.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/broken-symbols.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/broken-symbols.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/dependent-builtin-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/dependent-builtin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/dependent-builtin-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/dependent-builtin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/dependent-builtin.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/dependent-builtin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/dependent-builtin.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/dependent-builtin.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback-invalid-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback-invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback-invalid-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback-invalid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-fallback.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative-invalid-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative-invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative-invalid-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative-invalid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-negative.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad-invalid-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad-invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad-invalid-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad-invalid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-pad.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix-invalid-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix-invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix-invalid-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix-invalid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-prefix.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-range-invalid-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-range-invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-range-invalid-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-range-invalid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-range-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-range-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-range-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-range-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-range-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-range-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-range-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-range-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-range.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-range.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-range.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-range.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix-invalid-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix-invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix-invalid-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix-invalid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-suffix.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols-invalid-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols-invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols-invalid-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols-invalid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/descriptor-symbols.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/disclosure-styles-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/disclosure-styles-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/disclosure-styles-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/disclosure-styles-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/disclosure-styles.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/disclosure-styles.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/disclosure-styles.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/disclosure-styles.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/empty-string-symbol-notref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/empty-string-symbol-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/empty-string-symbol-notref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/empty-string-symbol-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/empty-string-symbol.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/empty-string-symbol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/empty-string-symbol.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/empty-string-symbol.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/fallback.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/fallback.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/fallback.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/fallbacks-in-shadow-dom-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/fallbacks-in-shadow-dom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/fallbacks-in-shadow-dom-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/fallbacks-in-shadow-dom-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/fallbacks-in-shadow-dom.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/fallbacks-in-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/fallbacks-in-shadow-dom.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/fallbacks-in-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/name-case-sensitivity-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/name-case-sensitivity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/name-case-sensitivity-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/name-case-sensitivity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/name-case-sensitivity.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/name-case-sensitivity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/name-case-sensitivity.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/name-case-sensitivity.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/name-syntax.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/name-syntax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/name-syntax.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/name-syntax.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/negative-syntax.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/negative-syntax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/negative-syntax.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/negative-syntax.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/override-in-shadow-dom-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/override-in-shadow-dom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/override-in-shadow-dom-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/override-in-shadow-dom-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/override-in-shadow-dom.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/override-in-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/override-in-shadow-dom.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/override-in-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/pad-syntax.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/pad-syntax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/pad-syntax.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/pad-syntax.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/prefix-suffix-syntax.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/prefix-suffix-syntax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/prefix-suffix-syntax.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/prefix-suffix-syntax.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/range-syntax.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/range-syntax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/range-syntax.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/range-syntax.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/redefine-attr-mapping-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/redefine-attr-mapping-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/redefine-attr-mapping-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/redefine-attr-mapping-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/redefine-attr-mapping.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/redefine-attr-mapping.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/redefine-attr-mapping.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/redefine-attr-mapping.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/redefine-builtin-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/redefine-builtin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/redefine-builtin-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/redefine-builtin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/redefine-builtin.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/redefine-builtin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/redefine-builtin.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/redefine-builtin.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/shadow-dom-part-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/shadow-dom-part-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/shadow-dom-part-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/shadow-dom-part-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/shadow-dom-part.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/shadow-dom-part.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/shadow-dom-part.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/shadow-dom-part.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/speak-as-manual.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/speak-as-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/speak-as-manual.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/speak-as-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/speak-as-syntax.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/speak-as-syntax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/speak-as-syntax.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/speak-as-syntax.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/support/counter-style-testcommon.js b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/support/counter-style-testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/support/counter-style-testcommon.js rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/support/counter-style-testcommon.js diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/support/ref-common.css b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/support/ref-common.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/support/ref-common.css rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/support/ref-common.css diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/support/test-common.css b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/support/test-common.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/support/test-common.css rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/support/test-common.css diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/symbols-function-invalid-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/symbols-function-invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/symbols-function-invalid-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/symbols-function-invalid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/symbols-function-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/symbols-function-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/symbols-function-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/symbols-function-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/symbols-function-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/symbols-function-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/symbols-function-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/symbols-function-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/symbols-function.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/symbols-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/symbols-function.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/symbols-function.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/symbols-syntax.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/symbols-syntax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/symbols-syntax.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/symbols-syntax.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-additive-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-additive-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-additive-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-additive-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-additive-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-additive-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-additive-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-additive-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-additive.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-additive.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-additive.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-additive.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-alphabetic-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-alphabetic-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-alphabetic-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-alphabetic-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-alphabetic-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-alphabetic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-alphabetic-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-alphabetic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-alphabetic.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-alphabetic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-alphabetic.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-alphabetic.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-common-invalid-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-common-invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-common-invalid-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-common-invalid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-common-invalid2-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-common-invalid2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-common-invalid2-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-common-invalid2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-cyclic-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-cyclic-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-cyclic-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-cyclic-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-cyclic-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-cyclic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-cyclic-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-cyclic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-cyclic.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-cyclic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-cyclic.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-cyclic.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-extends-fixed-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-extends-fixed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-extends-fixed-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-extends-fixed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-extends-fixed.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-extends-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-extends-fixed.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-extends-fixed.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-extends-invalid-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-extends-invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-extends-invalid-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-extends-invalid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-extends-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-extends-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-extends-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-extends-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-extends-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-extends-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-extends-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-extends-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-extends.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-extends.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-extends.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-extends.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-fixed-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-fixed-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-fixed-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-fixed-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-fixed-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-fixed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-fixed-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-fixed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-fixed.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-fixed.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-fixed.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-numeric-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-numeric-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-numeric-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-numeric-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-numeric-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-numeric-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-numeric-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-numeric-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-numeric.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-numeric.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-numeric.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-numeric.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-symbolic-invalid.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-symbolic-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-symbolic-invalid.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-symbolic-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-symbolic-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-symbolic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-symbolic-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-symbolic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-symbolic.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-symbolic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-symbolic.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-symbolic.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-syntax.html b/tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-syntax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-style-at-rule/system-syntax.html rename to tests/wpt/tests/css/css-counter-styles/counter-style-at-rule/system-syntax.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-suffix-ref.html b/tests/wpt/tests/css/css-counter-styles/counter-suffix-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-suffix-ref.html rename to tests/wpt/tests/css/css-counter-styles/counter-suffix-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/counter-suffix.html b/tests/wpt/tests/css/css-counter-styles/counter-suffix.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/counter-suffix.html rename to tests/wpt/tests/css/css-counter-styles/counter-suffix.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-additive-symbols-setter-invalid.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-additive-symbols-setter-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-additive-symbols-setter-invalid.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-additive-symbols-setter-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-additive-symbols-setter-ref.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-additive-symbols-setter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-additive-symbols-setter-ref.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-additive-symbols-setter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-additive-symbols-setter.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-additive-symbols-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-additive-symbols-setter.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-additive-symbols-setter.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-fallback-setter-invalid.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-fallback-setter-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-fallback-setter-invalid.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-fallback-setter-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-fallback-setter-ref.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-fallback-setter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-fallback-setter-ref.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-fallback-setter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-fallback-setter.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-fallback-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-fallback-setter.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-fallback-setter.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-name-setter-invalid.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-name-setter-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-name-setter-invalid.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-name-setter-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-name-setter-ref.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-name-setter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-name-setter-ref.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-name-setter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-name-setter.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-name-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-name-setter.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-name-setter.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-negative-setter-invalid.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-negative-setter-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-negative-setter-invalid.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-negative-setter-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-negative-setter-ref.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-negative-setter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-negative-setter-ref.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-negative-setter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-negative-setter.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-negative-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-negative-setter.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-negative-setter.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-pad-setter-invalid.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-pad-setter-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-pad-setter-invalid.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-pad-setter-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-pad-setter-ref.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-pad-setter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-pad-setter-ref.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-pad-setter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-pad-setter.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-pad-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-pad-setter.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-pad-setter.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-prefix-suffix-setter-invalid.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-prefix-suffix-setter-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-prefix-suffix-setter-invalid.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-prefix-suffix-setter-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-prefix-suffix-setter-ref.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-prefix-suffix-setter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-prefix-suffix-setter-ref.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-prefix-suffix-setter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-prefix-suffix-setter.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-prefix-suffix-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-prefix-suffix-setter.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-prefix-suffix-setter.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-range-setter-invalid.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-range-setter-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-range-setter-invalid.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-range-setter-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-range-setter-ref.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-range-setter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-range-setter-ref.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-range-setter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-range-setter.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-range-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-range-setter.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-range-setter.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-symbols-setter-invalid.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-symbols-setter-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-symbols-setter-invalid.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-symbols-setter-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-symbols-setter-ref.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-symbols-setter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-symbols-setter-ref.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-symbols-setter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-symbols-setter.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-symbols-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-symbols-setter.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-symbols-setter.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-system-setter-1.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-system-setter-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-system-setter-1.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-system-setter-1.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-system-setter-2.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-system-setter-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-system-setter-2.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-system-setter-2.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-system-setter-invalid.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-system-setter-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-system-setter-invalid.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-system-setter-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-system-setter-ref.html b/tests/wpt/tests/css/css-counter-styles/cssom/cssom-system-setter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/cssom/cssom-system-setter-ref.html rename to tests/wpt/tests/css/css-counter-styles/cssom/cssom-system-setter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/devanagari/css3-counter-styles-119-ref.html b/tests/wpt/tests/css/css-counter-styles/devanagari/css3-counter-styles-119-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/devanagari/css3-counter-styles-119-ref.html rename to tests/wpt/tests/css/css-counter-styles/devanagari/css3-counter-styles-119-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/devanagari/css3-counter-styles-119.html b/tests/wpt/tests/css/css-counter-styles/devanagari/css3-counter-styles-119.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/devanagari/css3-counter-styles-119.html rename to tests/wpt/tests/css/css-counter-styles/devanagari/css3-counter-styles-119.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/devanagari/css3-counter-styles-120-ref.html b/tests/wpt/tests/css/css-counter-styles/devanagari/css3-counter-styles-120-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/devanagari/css3-counter-styles-120-ref.html rename to tests/wpt/tests/css/css-counter-styles/devanagari/css3-counter-styles-120-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/devanagari/css3-counter-styles-120.html b/tests/wpt/tests/css/css-counter-styles/devanagari/css3-counter-styles-120.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/devanagari/css3-counter-styles-120.html rename to tests/wpt/tests/css/css-counter-styles/devanagari/css3-counter-styles-120.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/devanagari/css3-counter-styles-121-ref.html b/tests/wpt/tests/css/css-counter-styles/devanagari/css3-counter-styles-121-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/devanagari/css3-counter-styles-121-ref.html rename to tests/wpt/tests/css/css-counter-styles/devanagari/css3-counter-styles-121-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/devanagari/css3-counter-styles-121.html b/tests/wpt/tests/css/css-counter-styles/devanagari/css3-counter-styles-121.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/devanagari/css3-counter-styles-121.html rename to tests/wpt/tests/css/css-counter-styles/devanagari/css3-counter-styles-121.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/ethiopic-numeric/counter-ethiopic-numeric-ref.html b/tests/wpt/tests/css/css-counter-styles/ethiopic-numeric/counter-ethiopic-numeric-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/ethiopic-numeric/counter-ethiopic-numeric-ref.html rename to tests/wpt/tests/css/css-counter-styles/ethiopic-numeric/counter-ethiopic-numeric-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/ethiopic-numeric/counter-ethiopic-numeric.html b/tests/wpt/tests/css/css-counter-styles/ethiopic-numeric/counter-ethiopic-numeric.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/ethiopic-numeric/counter-ethiopic-numeric.html rename to tests/wpt/tests/css/css-counter-styles/ethiopic-numeric/counter-ethiopic-numeric.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/ethiopic-numeric/css3-counter-styles-068.html b/tests/wpt/tests/css/css-counter-styles/ethiopic-numeric/css3-counter-styles-068.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/ethiopic-numeric/css3-counter-styles-068.html rename to tests/wpt/tests/css/css-counter-styles/ethiopic-numeric/css3-counter-styles-068.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/ethiopic-numeric/css3-counter-styles-069.html b/tests/wpt/tests/css/css-counter-styles/ethiopic-numeric/css3-counter-styles-069.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/ethiopic-numeric/css3-counter-styles-069.html rename to tests/wpt/tests/css/css-counter-styles/ethiopic-numeric/css3-counter-styles-069.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/ethiopic-numeric/css3-counter-styles-070.html b/tests/wpt/tests/css/css-counter-styles/ethiopic-numeric/css3-counter-styles-070.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/ethiopic-numeric/css3-counter-styles-070.html rename to tests/wpt/tests/css/css-counter-styles/ethiopic-numeric/css3-counter-styles-070.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-010-ref.html b/tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-010-ref.html rename to tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-010.html b/tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-010.html rename to tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-010.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-011-ref.html b/tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-011-ref.html rename to tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-011.html b/tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-011.html rename to tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-011.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-012-ref.html b/tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-012-ref.html rename to tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-012.html b/tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-012.html rename to tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-012.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-014-ref.html b/tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-014-ref.html rename to tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-014.html b/tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/georgian/css3-counter-styles-014.html rename to tests/wpt/tests/css/css-counter-styles/georgian/css3-counter-styles-014.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/gujarati/css3-counter-styles-122-ref.html b/tests/wpt/tests/css/css-counter-styles/gujarati/css3-counter-styles-122-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/gujarati/css3-counter-styles-122-ref.html rename to tests/wpt/tests/css/css-counter-styles/gujarati/css3-counter-styles-122-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/gujarati/css3-counter-styles-122.html b/tests/wpt/tests/css/css-counter-styles/gujarati/css3-counter-styles-122.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/gujarati/css3-counter-styles-122.html rename to tests/wpt/tests/css/css-counter-styles/gujarati/css3-counter-styles-122.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/gujarati/css3-counter-styles-123-ref.html b/tests/wpt/tests/css/css-counter-styles/gujarati/css3-counter-styles-123-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/gujarati/css3-counter-styles-123-ref.html rename to tests/wpt/tests/css/css-counter-styles/gujarati/css3-counter-styles-123-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/gujarati/css3-counter-styles-123.html b/tests/wpt/tests/css/css-counter-styles/gujarati/css3-counter-styles-123.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/gujarati/css3-counter-styles-123.html rename to tests/wpt/tests/css/css-counter-styles/gujarati/css3-counter-styles-123.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/gujarati/css3-counter-styles-124-ref.html b/tests/wpt/tests/css/css-counter-styles/gujarati/css3-counter-styles-124-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/gujarati/css3-counter-styles-124-ref.html rename to tests/wpt/tests/css/css-counter-styles/gujarati/css3-counter-styles-124-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/gujarati/css3-counter-styles-124.html b/tests/wpt/tests/css/css-counter-styles/gujarati/css3-counter-styles-124.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/gujarati/css3-counter-styles-124.html rename to tests/wpt/tests/css/css-counter-styles/gujarati/css3-counter-styles-124.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/gurmukhi/css3-counter-styles-125-ref.html b/tests/wpt/tests/css/css-counter-styles/gurmukhi/css3-counter-styles-125-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/gurmukhi/css3-counter-styles-125-ref.html rename to tests/wpt/tests/css/css-counter-styles/gurmukhi/css3-counter-styles-125-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/gurmukhi/css3-counter-styles-125.html b/tests/wpt/tests/css/css-counter-styles/gurmukhi/css3-counter-styles-125.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/gurmukhi/css3-counter-styles-125.html rename to tests/wpt/tests/css/css-counter-styles/gurmukhi/css3-counter-styles-125.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/gurmukhi/css3-counter-styles-126-ref.html b/tests/wpt/tests/css/css-counter-styles/gurmukhi/css3-counter-styles-126-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/gurmukhi/css3-counter-styles-126-ref.html rename to tests/wpt/tests/css/css-counter-styles/gurmukhi/css3-counter-styles-126-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/gurmukhi/css3-counter-styles-126.html b/tests/wpt/tests/css/css-counter-styles/gurmukhi/css3-counter-styles-126.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/gurmukhi/css3-counter-styles-126.html rename to tests/wpt/tests/css/css-counter-styles/gurmukhi/css3-counter-styles-126.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/gurmukhi/css3-counter-styles-127-ref.html b/tests/wpt/tests/css/css-counter-styles/gurmukhi/css3-counter-styles-127-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/gurmukhi/css3-counter-styles-127-ref.html rename to tests/wpt/tests/css/css-counter-styles/gurmukhi/css3-counter-styles-127-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/gurmukhi/css3-counter-styles-127.html b/tests/wpt/tests/css/css-counter-styles/gurmukhi/css3-counter-styles-127.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/gurmukhi/css3-counter-styles-127.html rename to tests/wpt/tests/css/css-counter-styles/gurmukhi/css3-counter-styles-127.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/counter-hebrew-nested-ref.html b/tests/wpt/tests/css/css-counter-styles/hebrew/counter-hebrew-nested-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/counter-hebrew-nested-ref.html rename to tests/wpt/tests/css/css-counter-styles/hebrew/counter-hebrew-nested-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/counter-hebrew-nested.html b/tests/wpt/tests/css/css-counter-styles/hebrew/counter-hebrew-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/counter-hebrew-nested.html rename to tests/wpt/tests/css/css-counter-styles/hebrew/counter-hebrew-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-015-ref.html b/tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-015-ref.html rename to tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-015.html b/tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-015.html rename to tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-015.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-016-ref.html b/tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-016-ref.html rename to tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-016.html b/tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-016.html rename to tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-016.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-016a-alt-ref.html b/tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-016a-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-016a-alt-ref.html rename to tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-016a-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-016a-ref.html b/tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-016a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-016a-ref.html rename to tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-016a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-016a.html b/tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-016a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-016a.html rename to tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-016a.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-017-ref.html b/tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-017-ref.html rename to tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-017.html b/tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hebrew/css3-counter-styles-017.html rename to tests/wpt/tests/css/css-counter-styles/hebrew/css3-counter-styles-017.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-033-ref.html b/tests/wpt/tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-033-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-033-ref.html rename to tests/wpt/tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-033-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-033.html b/tests/wpt/tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-033.html rename to tests/wpt/tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-033.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-034-ref.html b/tests/wpt/tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-034-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-034-ref.html rename to tests/wpt/tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-034-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-034.html b/tests/wpt/tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-034.html rename to tests/wpt/tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-034.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-035-ref.html b/tests/wpt/tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-035-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-035-ref.html rename to tests/wpt/tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-035-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-035.html b/tests/wpt/tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-035.html rename to tests/wpt/tests/css/css-counter-styles/hiragana-iroha/css3-counter-styles-035.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hiragana/css3-counter-styles-030-ref.html b/tests/wpt/tests/css/css-counter-styles/hiragana/css3-counter-styles-030-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hiragana/css3-counter-styles-030-ref.html rename to tests/wpt/tests/css/css-counter-styles/hiragana/css3-counter-styles-030-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hiragana/css3-counter-styles-030.html b/tests/wpt/tests/css/css-counter-styles/hiragana/css3-counter-styles-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hiragana/css3-counter-styles-030.html rename to tests/wpt/tests/css/css-counter-styles/hiragana/css3-counter-styles-030.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hiragana/css3-counter-styles-031-ref.html b/tests/wpt/tests/css/css-counter-styles/hiragana/css3-counter-styles-031-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hiragana/css3-counter-styles-031-ref.html rename to tests/wpt/tests/css/css-counter-styles/hiragana/css3-counter-styles-031-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hiragana/css3-counter-styles-031.html b/tests/wpt/tests/css/css-counter-styles/hiragana/css3-counter-styles-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hiragana/css3-counter-styles-031.html rename to tests/wpt/tests/css/css-counter-styles/hiragana/css3-counter-styles-031.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hiragana/css3-counter-styles-032-ref.html b/tests/wpt/tests/css/css-counter-styles/hiragana/css3-counter-styles-032-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hiragana/css3-counter-styles-032-ref.html rename to tests/wpt/tests/css/css-counter-styles/hiragana/css3-counter-styles-032-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/hiragana/css3-counter-styles-032.html b/tests/wpt/tests/css/css-counter-styles/hiragana/css3-counter-styles-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/hiragana/css3-counter-styles-032.html rename to tests/wpt/tests/css/css-counter-styles/hiragana/css3-counter-styles-032.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/idlharness.html b/tests/wpt/tests/css/css-counter-styles/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/idlharness.html rename to tests/wpt/tests/css/css-counter-styles/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/counter-japanese-formal-ref.html b/tests/wpt/tests/css/css-counter-styles/japanese-formal/counter-japanese-formal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/counter-japanese-formal-ref.html rename to tests/wpt/tests/css/css-counter-styles/japanese-formal/counter-japanese-formal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/counter-japanese-formal.html b/tests/wpt/tests/css/css-counter-styles/japanese-formal/counter-japanese-formal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/counter-japanese-formal.html rename to tests/wpt/tests/css/css-counter-styles/japanese-formal/counter-japanese-formal.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-047-ref.html b/tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-047-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-047-ref.html rename to tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-047-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-047.html b/tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-047.html rename to tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-047.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-048-ref.html b/tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-048-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-048-ref.html rename to tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-048-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-048.html b/tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-048.html rename to tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-048.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-049-alt-ref.html b/tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-049-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-049-alt-ref.html rename to tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-049-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-049-ref.html b/tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-049-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-049-ref.html rename to tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-049-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-049.html b/tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-049.html rename to tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-049.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-050-ref.html b/tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-050-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-050-ref.html rename to tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-050-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-050.html b/tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-050.html rename to tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-050.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-051-ref.html b/tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-051-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-051-ref.html rename to tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-051-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-051.html b/tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-formal/css3-counter-styles-051.html rename to tests/wpt/tests/css/css-counter-styles/japanese-formal/css3-counter-styles-051.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/counter-japanese-informal-ref.html b/tests/wpt/tests/css/css-counter-styles/japanese-informal/counter-japanese-informal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/counter-japanese-informal-ref.html rename to tests/wpt/tests/css/css-counter-styles/japanese-informal/counter-japanese-informal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/counter-japanese-informal.html b/tests/wpt/tests/css/css-counter-styles/japanese-informal/counter-japanese-informal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/counter-japanese-informal.html rename to tests/wpt/tests/css/css-counter-styles/japanese-informal/counter-japanese-informal.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-042-ref.html b/tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-042-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-042-ref.html rename to tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-042-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-042.html b/tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-042.html rename to tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-042.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-043-ref.html b/tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-043-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-043-ref.html rename to tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-043-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-043.html b/tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-043.html rename to tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-043.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-044-alt-ref.html b/tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-044-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-044-alt-ref.html rename to tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-044-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-044-ref.html b/tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-044-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-044-ref.html rename to tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-044-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-044.html b/tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-044.html rename to tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-044.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-045-ref.html b/tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-045-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-045-ref.html rename to tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-045-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-045.html b/tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-045.html rename to tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-045.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-046-ref.html b/tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-046-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-046-ref.html rename to tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-046-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-046.html b/tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/japanese-informal/css3-counter-styles-046.html rename to tests/wpt/tests/css/css-counter-styles/japanese-informal/css3-counter-styles-046.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/kannada/css3-counter-styles-128-ref.html b/tests/wpt/tests/css/css-counter-styles/kannada/css3-counter-styles-128-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/kannada/css3-counter-styles-128-ref.html rename to tests/wpt/tests/css/css-counter-styles/kannada/css3-counter-styles-128-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/kannada/css3-counter-styles-128.html b/tests/wpt/tests/css/css-counter-styles/kannada/css3-counter-styles-128.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/kannada/css3-counter-styles-128.html rename to tests/wpt/tests/css/css-counter-styles/kannada/css3-counter-styles-128.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/kannada/css3-counter-styles-129-ref.html b/tests/wpt/tests/css/css-counter-styles/kannada/css3-counter-styles-129-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/kannada/css3-counter-styles-129-ref.html rename to tests/wpt/tests/css/css-counter-styles/kannada/css3-counter-styles-129-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/kannada/css3-counter-styles-129.html b/tests/wpt/tests/css/css-counter-styles/kannada/css3-counter-styles-129.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/kannada/css3-counter-styles-129.html rename to tests/wpt/tests/css/css-counter-styles/kannada/css3-counter-styles-129.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/kannada/css3-counter-styles-130-ref.html b/tests/wpt/tests/css/css-counter-styles/kannada/css3-counter-styles-130-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/kannada/css3-counter-styles-130-ref.html rename to tests/wpt/tests/css/css-counter-styles/kannada/css3-counter-styles-130-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/kannada/css3-counter-styles-130.html b/tests/wpt/tests/css/css-counter-styles/kannada/css3-counter-styles-130.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/kannada/css3-counter-styles-130.html rename to tests/wpt/tests/css/css-counter-styles/kannada/css3-counter-styles-130.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-039-ref.html b/tests/wpt/tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-039-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-039-ref.html rename to tests/wpt/tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-039-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-039.html b/tests/wpt/tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-039.html rename to tests/wpt/tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-039.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-040-ref.html b/tests/wpt/tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-040-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-040-ref.html rename to tests/wpt/tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-040-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-040.html b/tests/wpt/tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-040.html rename to tests/wpt/tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-040.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-041-ref.html b/tests/wpt/tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-041-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-041-ref.html rename to tests/wpt/tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-041-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-041.html b/tests/wpt/tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-041.html rename to tests/wpt/tests/css/css-counter-styles/katakana-iroha/css3-counter-styles-041.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/katakana/css3-counter-styles-036-ref.html b/tests/wpt/tests/css/css-counter-styles/katakana/css3-counter-styles-036-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/katakana/css3-counter-styles-036-ref.html rename to tests/wpt/tests/css/css-counter-styles/katakana/css3-counter-styles-036-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/katakana/css3-counter-styles-036.html b/tests/wpt/tests/css/css-counter-styles/katakana/css3-counter-styles-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/katakana/css3-counter-styles-036.html rename to tests/wpt/tests/css/css-counter-styles/katakana/css3-counter-styles-036.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/katakana/css3-counter-styles-037-ref.html b/tests/wpt/tests/css/css-counter-styles/katakana/css3-counter-styles-037-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/katakana/css3-counter-styles-037-ref.html rename to tests/wpt/tests/css/css-counter-styles/katakana/css3-counter-styles-037-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/katakana/css3-counter-styles-037.html b/tests/wpt/tests/css/css-counter-styles/katakana/css3-counter-styles-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/katakana/css3-counter-styles-037.html rename to tests/wpt/tests/css/css-counter-styles/katakana/css3-counter-styles-037.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/katakana/css3-counter-styles-038-ref.html b/tests/wpt/tests/css/css-counter-styles/katakana/css3-counter-styles-038-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/katakana/css3-counter-styles-038-ref.html rename to tests/wpt/tests/css/css-counter-styles/katakana/css3-counter-styles-038-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/katakana/css3-counter-styles-038.html b/tests/wpt/tests/css/css-counter-styles/katakana/css3-counter-styles-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/katakana/css3-counter-styles-038.html rename to tests/wpt/tests/css/css-counter-styles/katakana/css3-counter-styles-038.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/khmer/css3-counter-styles-161-ref.html b/tests/wpt/tests/css/css-counter-styles/khmer/css3-counter-styles-161-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/khmer/css3-counter-styles-161-ref.html rename to tests/wpt/tests/css/css-counter-styles/khmer/css3-counter-styles-161-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/khmer/css3-counter-styles-161.html b/tests/wpt/tests/css/css-counter-styles/khmer/css3-counter-styles-161.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/khmer/css3-counter-styles-161.html rename to tests/wpt/tests/css/css-counter-styles/khmer/css3-counter-styles-161.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/khmer/css3-counter-styles-162-ref.html b/tests/wpt/tests/css/css-counter-styles/khmer/css3-counter-styles-162-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/khmer/css3-counter-styles-162-ref.html rename to tests/wpt/tests/css/css-counter-styles/khmer/css3-counter-styles-162-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/khmer/css3-counter-styles-162.html b/tests/wpt/tests/css/css-counter-styles/khmer/css3-counter-styles-162.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/khmer/css3-counter-styles-162.html rename to tests/wpt/tests/css/css-counter-styles/khmer/css3-counter-styles-162.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/khmer/css3-counter-styles-163-ref.html b/tests/wpt/tests/css/css-counter-styles/khmer/css3-counter-styles-163-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/khmer/css3-counter-styles-163-ref.html rename to tests/wpt/tests/css/css-counter-styles/khmer/css3-counter-styles-163-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/khmer/css3-counter-styles-163.html b/tests/wpt/tests/css/css-counter-styles/khmer/css3-counter-styles-163.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/khmer/css3-counter-styles-163.html rename to tests/wpt/tests/css/css-counter-styles/khmer/css3-counter-styles-163.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/counter-korean-hangul-formal-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/counter-korean-hangul-formal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/counter-korean-hangul-formal-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/counter-korean-hangul-formal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/counter-korean-hangul-formal.html b/tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/counter-korean-hangul-formal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/counter-korean-hangul-formal.html rename to tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/counter-korean-hangul-formal.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-052-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-052-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-052-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-052-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-052.html b/tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-052.html rename to tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-052.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-053-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-053-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-053-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-053-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-053.html b/tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-053.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-053.html rename to tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-053.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-054-alt-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-054-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-054-alt-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-054-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-054-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-054-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-054-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-054-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-054.html b/tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-054.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-054.html rename to tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-054.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-055-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-055-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-055-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-055-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-055.html b/tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-055.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-055.html rename to tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-055.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-056-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-056-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-056-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-056-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-056.html b/tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-056.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-056.html rename to tests/wpt/tests/css/css-counter-styles/korean-hangul-formal/css3-counter-styles-056.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/counter-korean-hanja-formal-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/counter-korean-hanja-formal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/counter-korean-hanja-formal-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/counter-korean-hanja-formal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/counter-korean-hanja-formal.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/counter-korean-hanja-formal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/counter-korean-hanja-formal.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/counter-korean-hanja-formal.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-062-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-062-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-062-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-062-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-062.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-062.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-062.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-062.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-063-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-063-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-063-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-063-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-063.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-063.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-063.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-063.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-064-alt-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-064-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-064-alt-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-064-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-064-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-064-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-064-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-064-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-064.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-064.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-064.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-064.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-065-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-065-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-065-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-065-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-065.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-065.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-065.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-065.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-066-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-066-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-066-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-066-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-066.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-066.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-066.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-formal/css3-counter-styles-066.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/counter-korean-hanja-informal-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/counter-korean-hanja-informal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/counter-korean-hanja-informal-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/counter-korean-hanja-informal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/counter-korean-hanja-informal.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/counter-korean-hanja-informal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/counter-korean-hanja-informal.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/counter-korean-hanja-informal.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-057-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-057-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-057-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-057-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-057.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-057.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-057.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-057.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-058-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-058-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-058-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-058-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-058.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-058.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-058.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-058.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-059-alt-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-059-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-059-alt-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-059-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-059-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-059-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-059-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-059-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-059.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-059.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-059.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-059.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-060-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-060-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-060-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-060-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-060.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-060.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-060.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-060.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-061-ref.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-061-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-061-ref.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-061-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-061.html b/tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-061.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-061.html rename to tests/wpt/tests/css/css-counter-styles/korean-hanja-informal/css3-counter-styles-061.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lao/css3-counter-styles-131-ref.html b/tests/wpt/tests/css/css-counter-styles/lao/css3-counter-styles-131-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lao/css3-counter-styles-131-ref.html rename to tests/wpt/tests/css/css-counter-styles/lao/css3-counter-styles-131-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lao/css3-counter-styles-131.html b/tests/wpt/tests/css/css-counter-styles/lao/css3-counter-styles-131.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lao/css3-counter-styles-131.html rename to tests/wpt/tests/css/css-counter-styles/lao/css3-counter-styles-131.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lao/css3-counter-styles-132-ref.html b/tests/wpt/tests/css/css-counter-styles/lao/css3-counter-styles-132-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lao/css3-counter-styles-132-ref.html rename to tests/wpt/tests/css/css-counter-styles/lao/css3-counter-styles-132-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lao/css3-counter-styles-132.html b/tests/wpt/tests/css/css-counter-styles/lao/css3-counter-styles-132.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lao/css3-counter-styles-132.html rename to tests/wpt/tests/css/css-counter-styles/lao/css3-counter-styles-132.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lao/css3-counter-styles-133-ref.html b/tests/wpt/tests/css/css-counter-styles/lao/css3-counter-styles-133-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lao/css3-counter-styles-133-ref.html rename to tests/wpt/tests/css/css-counter-styles/lao/css3-counter-styles-133-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lao/css3-counter-styles-133.html b/tests/wpt/tests/css/css-counter-styles/lao/css3-counter-styles-133.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lao/css3-counter-styles-133.html rename to tests/wpt/tests/css/css-counter-styles/lao/css3-counter-styles-133.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-111-ref.html b/tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-111-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-111-ref.html rename to tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-111-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-111.html b/tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-111.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-111.html rename to tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-111.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-112-ref.html b/tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-112-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-112-ref.html rename to tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-112-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-112.html b/tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-112.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-112.html rename to tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-112.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-114-ref.html b/tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-114-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-114-ref.html rename to tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-114-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-114.html b/tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-114.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-114.html rename to tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-114.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-115-ref.html b/tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-115-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-115-ref.html rename to tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-115-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-115.html b/tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-115.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-armenian/css3-counter-styles-115.html rename to tests/wpt/tests/css/css-counter-styles/lower-armenian/css3-counter-styles-115.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-greek/css3-counter-styles-027-ref.html b/tests/wpt/tests/css/css-counter-styles/lower-greek/css3-counter-styles-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-greek/css3-counter-styles-027-ref.html rename to tests/wpt/tests/css/css-counter-styles/lower-greek/css3-counter-styles-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-greek/css3-counter-styles-027.html b/tests/wpt/tests/css/css-counter-styles/lower-greek/css3-counter-styles-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-greek/css3-counter-styles-027.html rename to tests/wpt/tests/css/css-counter-styles/lower-greek/css3-counter-styles-027.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-greek/css3-counter-styles-028-ref.html b/tests/wpt/tests/css/css-counter-styles/lower-greek/css3-counter-styles-028-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-greek/css3-counter-styles-028-ref.html rename to tests/wpt/tests/css/css-counter-styles/lower-greek/css3-counter-styles-028-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-greek/css3-counter-styles-028.html b/tests/wpt/tests/css/css-counter-styles/lower-greek/css3-counter-styles-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-greek/css3-counter-styles-028.html rename to tests/wpt/tests/css/css-counter-styles/lower-greek/css3-counter-styles-028.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-greek/css3-counter-styles-029-ref.html b/tests/wpt/tests/css/css-counter-styles/lower-greek/css3-counter-styles-029-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-greek/css3-counter-styles-029-ref.html rename to tests/wpt/tests/css/css-counter-styles/lower-greek/css3-counter-styles-029-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-greek/css3-counter-styles-029.html b/tests/wpt/tests/css/css-counter-styles/lower-greek/css3-counter-styles-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-greek/css3-counter-styles-029.html rename to tests/wpt/tests/css/css-counter-styles/lower-greek/css3-counter-styles-029.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-019-ref.html b/tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-019-ref.html rename to tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-019.html b/tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-019.html rename to tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-019.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-020-ref.html b/tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-020-ref.html rename to tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-020.html b/tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-020.html rename to tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-020.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-020a-ref.html b/tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-020a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-020a-ref.html rename to tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-020a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-020a.html b/tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-020a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-020a.html rename to tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-020a.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-020b-ref.html b/tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-020b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-020b-ref.html rename to tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-020b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-020b.html b/tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-020b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-020b.html rename to tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-020b.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-021-ref.html b/tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-021-ref.html rename to tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-021.html b/tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-021.html rename to tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-021.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-022-ref.html b/tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-022-ref.html rename to tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-022.html b/tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/lower-roman/css3-counter-styles-022.html rename to tests/wpt/tests/css/css-counter-styles/lower-roman/css3-counter-styles-022.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/malayalam/css3-counter-styles-134-ref.html b/tests/wpt/tests/css/css-counter-styles/malayalam/css3-counter-styles-134-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/malayalam/css3-counter-styles-134-ref.html rename to tests/wpt/tests/css/css-counter-styles/malayalam/css3-counter-styles-134-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/malayalam/css3-counter-styles-134.html b/tests/wpt/tests/css/css-counter-styles/malayalam/css3-counter-styles-134.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/malayalam/css3-counter-styles-134.html rename to tests/wpt/tests/css/css-counter-styles/malayalam/css3-counter-styles-134.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/malayalam/css3-counter-styles-135-ref.html b/tests/wpt/tests/css/css-counter-styles/malayalam/css3-counter-styles-135-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/malayalam/css3-counter-styles-135-ref.html rename to tests/wpt/tests/css/css-counter-styles/malayalam/css3-counter-styles-135-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/malayalam/css3-counter-styles-135.html b/tests/wpt/tests/css/css-counter-styles/malayalam/css3-counter-styles-135.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/malayalam/css3-counter-styles-135.html rename to tests/wpt/tests/css/css-counter-styles/malayalam/css3-counter-styles-135.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/malayalam/css3-counter-styles-136-ref.html b/tests/wpt/tests/css/css-counter-styles/malayalam/css3-counter-styles-136-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/malayalam/css3-counter-styles-136-ref.html rename to tests/wpt/tests/css/css-counter-styles/malayalam/css3-counter-styles-136-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/malayalam/css3-counter-styles-136.html b/tests/wpt/tests/css/css-counter-styles/malayalam/css3-counter-styles-136.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/malayalam/css3-counter-styles-136.html rename to tests/wpt/tests/css/css-counter-styles/malayalam/css3-counter-styles-136.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/mongolian/css3-counter-styles-137-ref.html b/tests/wpt/tests/css/css-counter-styles/mongolian/css3-counter-styles-137-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/mongolian/css3-counter-styles-137-ref.html rename to tests/wpt/tests/css/css-counter-styles/mongolian/css3-counter-styles-137-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/mongolian/css3-counter-styles-137.html b/tests/wpt/tests/css/css-counter-styles/mongolian/css3-counter-styles-137.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/mongolian/css3-counter-styles-137.html rename to tests/wpt/tests/css/css-counter-styles/mongolian/css3-counter-styles-137.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/mongolian/css3-counter-styles-138-ref.html b/tests/wpt/tests/css/css-counter-styles/mongolian/css3-counter-styles-138-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/mongolian/css3-counter-styles-138-ref.html rename to tests/wpt/tests/css/css-counter-styles/mongolian/css3-counter-styles-138-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/mongolian/css3-counter-styles-138.html b/tests/wpt/tests/css/css-counter-styles/mongolian/css3-counter-styles-138.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/mongolian/css3-counter-styles-138.html rename to tests/wpt/tests/css/css-counter-styles/mongolian/css3-counter-styles-138.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/mongolian/css3-counter-styles-139-ref.html b/tests/wpt/tests/css/css-counter-styles/mongolian/css3-counter-styles-139-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/mongolian/css3-counter-styles-139-ref.html rename to tests/wpt/tests/css/css-counter-styles/mongolian/css3-counter-styles-139-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/mongolian/css3-counter-styles-139.html b/tests/wpt/tests/css/css-counter-styles/mongolian/css3-counter-styles-139.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/mongolian/css3-counter-styles-139.html rename to tests/wpt/tests/css/css-counter-styles/mongolian/css3-counter-styles-139.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/myanmar/css3-counter-styles-140-ref.html b/tests/wpt/tests/css/css-counter-styles/myanmar/css3-counter-styles-140-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/myanmar/css3-counter-styles-140-ref.html rename to tests/wpt/tests/css/css-counter-styles/myanmar/css3-counter-styles-140-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/myanmar/css3-counter-styles-140.html b/tests/wpt/tests/css/css-counter-styles/myanmar/css3-counter-styles-140.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/myanmar/css3-counter-styles-140.html rename to tests/wpt/tests/css/css-counter-styles/myanmar/css3-counter-styles-140.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/myanmar/css3-counter-styles-141-ref.html b/tests/wpt/tests/css/css-counter-styles/myanmar/css3-counter-styles-141-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/myanmar/css3-counter-styles-141-ref.html rename to tests/wpt/tests/css/css-counter-styles/myanmar/css3-counter-styles-141-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/myanmar/css3-counter-styles-141.html b/tests/wpt/tests/css/css-counter-styles/myanmar/css3-counter-styles-141.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/myanmar/css3-counter-styles-141.html rename to tests/wpt/tests/css/css-counter-styles/myanmar/css3-counter-styles-141.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/myanmar/css3-counter-styles-142-ref.html b/tests/wpt/tests/css/css-counter-styles/myanmar/css3-counter-styles-142-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/myanmar/css3-counter-styles-142-ref.html rename to tests/wpt/tests/css/css-counter-styles/myanmar/css3-counter-styles-142-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/myanmar/css3-counter-styles-142.html b/tests/wpt/tests/css/css-counter-styles/myanmar/css3-counter-styles-142.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/myanmar/css3-counter-styles-142.html rename to tests/wpt/tests/css/css-counter-styles/myanmar/css3-counter-styles-142.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/oriya/css3-counter-styles-143-ref.html b/tests/wpt/tests/css/css-counter-styles/oriya/css3-counter-styles-143-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/oriya/css3-counter-styles-143-ref.html rename to tests/wpt/tests/css/css-counter-styles/oriya/css3-counter-styles-143-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/oriya/css3-counter-styles-143.html b/tests/wpt/tests/css/css-counter-styles/oriya/css3-counter-styles-143.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/oriya/css3-counter-styles-143.html rename to tests/wpt/tests/css/css-counter-styles/oriya/css3-counter-styles-143.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/oriya/css3-counter-styles-144-ref.html b/tests/wpt/tests/css/css-counter-styles/oriya/css3-counter-styles-144-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/oriya/css3-counter-styles-144-ref.html rename to tests/wpt/tests/css/css-counter-styles/oriya/css3-counter-styles-144-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/oriya/css3-counter-styles-144.html b/tests/wpt/tests/css/css-counter-styles/oriya/css3-counter-styles-144.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/oriya/css3-counter-styles-144.html rename to tests/wpt/tests/css/css-counter-styles/oriya/css3-counter-styles-144.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/oriya/css3-counter-styles-145-ref.html b/tests/wpt/tests/css/css-counter-styles/oriya/css3-counter-styles-145-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/oriya/css3-counter-styles-145-ref.html rename to tests/wpt/tests/css/css-counter-styles/oriya/css3-counter-styles-145-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/oriya/css3-counter-styles-145.html b/tests/wpt/tests/css/css-counter-styles/oriya/css3-counter-styles-145.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/oriya/css3-counter-styles-145.html rename to tests/wpt/tests/css/css-counter-styles/oriya/css3-counter-styles-145.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/persian/css3-counter-styles-104-ref.html b/tests/wpt/tests/css/css-counter-styles/persian/css3-counter-styles-104-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/persian/css3-counter-styles-104-ref.html rename to tests/wpt/tests/css/css-counter-styles/persian/css3-counter-styles-104-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/persian/css3-counter-styles-104.html b/tests/wpt/tests/css/css-counter-styles/persian/css3-counter-styles-104.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/persian/css3-counter-styles-104.html rename to tests/wpt/tests/css/css-counter-styles/persian/css3-counter-styles-104.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/persian/css3-counter-styles-105-ref.html b/tests/wpt/tests/css/css-counter-styles/persian/css3-counter-styles-105-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/persian/css3-counter-styles-105-ref.html rename to tests/wpt/tests/css/css-counter-styles/persian/css3-counter-styles-105-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/persian/css3-counter-styles-105.html b/tests/wpt/tests/css/css-counter-styles/persian/css3-counter-styles-105.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/persian/css3-counter-styles-105.html rename to tests/wpt/tests/css/css-counter-styles/persian/css3-counter-styles-105.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/persian/css3-counter-styles-106-ref.html b/tests/wpt/tests/css/css-counter-styles/persian/css3-counter-styles-106-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/persian/css3-counter-styles-106-ref.html rename to tests/wpt/tests/css/css-counter-styles/persian/css3-counter-styles-106-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/persian/css3-counter-styles-106.html b/tests/wpt/tests/css/css-counter-styles/persian/css3-counter-styles-106.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/persian/css3-counter-styles-106.html rename to tests/wpt/tests/css/css-counter-styles/persian/css3-counter-styles-106.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/counter-simp-chinese-formal-ref.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/counter-simp-chinese-formal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/counter-simp-chinese-formal-ref.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/counter-simp-chinese-formal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/counter-simp-chinese-formal.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/counter-simp-chinese-formal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/counter-simp-chinese-formal.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/counter-simp-chinese-formal.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-076-ref.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-076-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-076-ref.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-076-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-076.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-076.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-076.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-076.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-077-ref.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-077-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-077-ref.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-077-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-077.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-077.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-077.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-077.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-078-alt-ref.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-078-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-078-alt-ref.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-078-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-078-ref.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-078-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-078-ref.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-078-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-078.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-078.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-078.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-078.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-079-ref.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-079-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-079-ref.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-079-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-079.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-079.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-079.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-079.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-080-ref.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-080-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-080-ref.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-080-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-080.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-080.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-080.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-formal/css3-counter-styles-080.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/counter-simp-chinese-informal-ref.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/counter-simp-chinese-informal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/counter-simp-chinese-informal-ref.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/counter-simp-chinese-informal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/counter-simp-chinese-informal.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/counter-simp-chinese-informal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/counter-simp-chinese-informal.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/counter-simp-chinese-informal.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-071-ref.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-071-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-071-ref.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-071-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-071.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-071.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-071.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-071.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-072-ref.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-072-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-072-ref.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-072-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-072.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-072.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-072.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-072.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-073-alt-ref.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-073-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-073-alt-ref.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-073-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-073-ref.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-073-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-073-ref.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-073-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-073.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-073.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-073.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-073.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-074-ref.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-074-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-074-ref.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-074-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-074.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-074.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-074.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-074.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-075-ref.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-075-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-075-ref.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-075-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-075.html b/tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-075.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-075.html rename to tests/wpt/tests/css/css-counter-styles/simp-chinese-informal/css3-counter-styles-075.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/tamil/css3-counter-styles-146-ref.html b/tests/wpt/tests/css/css-counter-styles/tamil/css3-counter-styles-146-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/tamil/css3-counter-styles-146-ref.html rename to tests/wpt/tests/css/css-counter-styles/tamil/css3-counter-styles-146-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/tamil/css3-counter-styles-146.html b/tests/wpt/tests/css/css-counter-styles/tamil/css3-counter-styles-146.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/tamil/css3-counter-styles-146.html rename to tests/wpt/tests/css/css-counter-styles/tamil/css3-counter-styles-146.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/tamil/css3-counter-styles-147-ref.html b/tests/wpt/tests/css/css-counter-styles/tamil/css3-counter-styles-147-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/tamil/css3-counter-styles-147-ref.html rename to tests/wpt/tests/css/css-counter-styles/tamil/css3-counter-styles-147-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/tamil/css3-counter-styles-147.html b/tests/wpt/tests/css/css-counter-styles/tamil/css3-counter-styles-147.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/tamil/css3-counter-styles-147.html rename to tests/wpt/tests/css/css-counter-styles/tamil/css3-counter-styles-147.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/tamil/css3-counter-styles-148-ref.html b/tests/wpt/tests/css/css-counter-styles/tamil/css3-counter-styles-148-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/tamil/css3-counter-styles-148-ref.html rename to tests/wpt/tests/css/css-counter-styles/tamil/css3-counter-styles-148-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/tamil/css3-counter-styles-148.html b/tests/wpt/tests/css/css-counter-styles/tamil/css3-counter-styles-148.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/tamil/css3-counter-styles-148.html rename to tests/wpt/tests/css/css-counter-styles/tamil/css3-counter-styles-148.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/telugu/css3-counter-styles-149-ref.html b/tests/wpt/tests/css/css-counter-styles/telugu/css3-counter-styles-149-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/telugu/css3-counter-styles-149-ref.html rename to tests/wpt/tests/css/css-counter-styles/telugu/css3-counter-styles-149-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/telugu/css3-counter-styles-149.html b/tests/wpt/tests/css/css-counter-styles/telugu/css3-counter-styles-149.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/telugu/css3-counter-styles-149.html rename to tests/wpt/tests/css/css-counter-styles/telugu/css3-counter-styles-149.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/telugu/css3-counter-styles-150-ref.html b/tests/wpt/tests/css/css-counter-styles/telugu/css3-counter-styles-150-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/telugu/css3-counter-styles-150-ref.html rename to tests/wpt/tests/css/css-counter-styles/telugu/css3-counter-styles-150-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/telugu/css3-counter-styles-150.html b/tests/wpt/tests/css/css-counter-styles/telugu/css3-counter-styles-150.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/telugu/css3-counter-styles-150.html rename to tests/wpt/tests/css/css-counter-styles/telugu/css3-counter-styles-150.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/telugu/css3-counter-styles-151-ref.html b/tests/wpt/tests/css/css-counter-styles/telugu/css3-counter-styles-151-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/telugu/css3-counter-styles-151-ref.html rename to tests/wpt/tests/css/css-counter-styles/telugu/css3-counter-styles-151-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/telugu/css3-counter-styles-151.html b/tests/wpt/tests/css/css-counter-styles/telugu/css3-counter-styles-151.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/telugu/css3-counter-styles-151.html rename to tests/wpt/tests/css/css-counter-styles/telugu/css3-counter-styles-151.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/thai/css3-counter-styles-152-ref.html b/tests/wpt/tests/css/css-counter-styles/thai/css3-counter-styles-152-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/thai/css3-counter-styles-152-ref.html rename to tests/wpt/tests/css/css-counter-styles/thai/css3-counter-styles-152-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/thai/css3-counter-styles-152.html b/tests/wpt/tests/css/css-counter-styles/thai/css3-counter-styles-152.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/thai/css3-counter-styles-152.html rename to tests/wpt/tests/css/css-counter-styles/thai/css3-counter-styles-152.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/thai/css3-counter-styles-153-ref.html b/tests/wpt/tests/css/css-counter-styles/thai/css3-counter-styles-153-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/thai/css3-counter-styles-153-ref.html rename to tests/wpt/tests/css/css-counter-styles/thai/css3-counter-styles-153-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/thai/css3-counter-styles-153.html b/tests/wpt/tests/css/css-counter-styles/thai/css3-counter-styles-153.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/thai/css3-counter-styles-153.html rename to tests/wpt/tests/css/css-counter-styles/thai/css3-counter-styles-153.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/thai/css3-counter-styles-154-ref.html b/tests/wpt/tests/css/css-counter-styles/thai/css3-counter-styles-154-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/thai/css3-counter-styles-154-ref.html rename to tests/wpt/tests/css/css-counter-styles/thai/css3-counter-styles-154-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/thai/css3-counter-styles-154.html b/tests/wpt/tests/css/css-counter-styles/thai/css3-counter-styles-154.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/thai/css3-counter-styles-154.html rename to tests/wpt/tests/css/css-counter-styles/thai/css3-counter-styles-154.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/tibetan/css3-counter-styles-155-ref.html b/tests/wpt/tests/css/css-counter-styles/tibetan/css3-counter-styles-155-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/tibetan/css3-counter-styles-155-ref.html rename to tests/wpt/tests/css/css-counter-styles/tibetan/css3-counter-styles-155-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/tibetan/css3-counter-styles-155.html b/tests/wpt/tests/css/css-counter-styles/tibetan/css3-counter-styles-155.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/tibetan/css3-counter-styles-155.html rename to tests/wpt/tests/css/css-counter-styles/tibetan/css3-counter-styles-155.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/tibetan/css3-counter-styles-156-ref.html b/tests/wpt/tests/css/css-counter-styles/tibetan/css3-counter-styles-156-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/tibetan/css3-counter-styles-156-ref.html rename to tests/wpt/tests/css/css-counter-styles/tibetan/css3-counter-styles-156-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/tibetan/css3-counter-styles-156.html b/tests/wpt/tests/css/css-counter-styles/tibetan/css3-counter-styles-156.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/tibetan/css3-counter-styles-156.html rename to tests/wpt/tests/css/css-counter-styles/tibetan/css3-counter-styles-156.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/tibetan/css3-counter-styles-157-ref.html b/tests/wpt/tests/css/css-counter-styles/tibetan/css3-counter-styles-157-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/tibetan/css3-counter-styles-157-ref.html rename to tests/wpt/tests/css/css-counter-styles/tibetan/css3-counter-styles-157-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/tibetan/css3-counter-styles-157.html b/tests/wpt/tests/css/css-counter-styles/tibetan/css3-counter-styles-157.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/tibetan/css3-counter-styles-157.html rename to tests/wpt/tests/css/css-counter-styles/tibetan/css3-counter-styles-157.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/counter-trad-chinese-formal-ref.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/counter-trad-chinese-formal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/counter-trad-chinese-formal-ref.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/counter-trad-chinese-formal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/counter-trad-chinese-formal.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/counter-trad-chinese-formal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/counter-trad-chinese-formal.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/counter-trad-chinese-formal.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-086-ref.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-086-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-086-ref.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-086-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-086.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-086.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-086.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-086.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-087-ref.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-087-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-087-ref.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-087-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-087.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-087.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-087.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-087.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-088-alt-ref.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-088-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-088-alt-ref.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-088-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-088-ref.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-088-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-088-ref.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-088-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-088.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-088.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-088.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-088.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-089-ref.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-089-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-089-ref.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-089-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-089.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-089.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-089.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-089.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-090-ref.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-090-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-090-ref.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-090-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-090.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-090.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-090.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-formal/css3-counter-styles-090.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/counter-trad-chinese-informal-ref.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/counter-trad-chinese-informal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/counter-trad-chinese-informal-ref.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/counter-trad-chinese-informal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/counter-trad-chinese-informal.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/counter-trad-chinese-informal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/counter-trad-chinese-informal.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/counter-trad-chinese-informal.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-081-ref.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-081-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-081-ref.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-081-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-081.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-081.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-081.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-081.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-082-ref.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-082-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-082-ref.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-082-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-082.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-082.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-082.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-082.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-083-alt-ref.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-083-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-083-alt-ref.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-083-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-083-ref.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-083-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-083-ref.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-083-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-083.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-083.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-083.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-083.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-084-ref.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-084-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-084-ref.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-084-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-084.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-084.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-084.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-084.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-085-ref.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-085-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-085-ref.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-085-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-085.html b/tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-085.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-085.html rename to tests/wpt/tests/css/css-counter-styles/trad-chinese-informal/css3-counter-styles-085.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-107-ref.html b/tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-107-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-107-ref.html rename to tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-107-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-107.html b/tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-107.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-107.html rename to tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-107.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-108-ref.html b/tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-108-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-108-ref.html rename to tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-108-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-108.html b/tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-108.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-108.html rename to tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-108.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-109-ref.html b/tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-109-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-109-ref.html rename to tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-109-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-109.html b/tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-109.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-109.html rename to tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-109.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-110-ref.html b/tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-110-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-110-ref.html rename to tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-110-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-110.html b/tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-110.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-armenian/css3-counter-styles-110.html rename to tests/wpt/tests/css/css-counter-styles/upper-armenian/css3-counter-styles-110.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-023-ref.html b/tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-023-ref.html rename to tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-023.html b/tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-023.html rename to tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-023.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-024-ref.html b/tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-024-ref.html rename to tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-024.html b/tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-024.html rename to tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-024.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-024a-ref.html b/tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-024a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-024a-ref.html rename to tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-024a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-024a.html b/tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-024a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-024a.html rename to tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-024a.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-025-ref.html b/tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-025-ref.html rename to tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-025.html b/tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-025.html rename to tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-025.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-026-ref.html b/tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-026-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-026-ref.html rename to tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-026-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-026.html b/tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-counter-styles/upper-roman/css3-counter-styles-026.html rename to tests/wpt/tests/css/css-counter-styles/upper-roman/css3-counter-styles-026.html diff --git a/tests/wpt/web-platform-tests/css/css-device-adapt/META.yml b/tests/wpt/tests/css/css-device-adapt/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-device-adapt/META.yml rename to tests/wpt/tests/css/css-device-adapt/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-device-adapt/documentElement-clientWidth-on-minimum-scale-size.tentative.html b/tests/wpt/tests/css/css-device-adapt/documentElement-clientWidth-on-minimum-scale-size.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-device-adapt/documentElement-clientWidth-on-minimum-scale-size.tentative.html rename to tests/wpt/tests/css/css-device-adapt/documentElement-clientWidth-on-minimum-scale-size.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-device-adapt/viewport-user-scalable-no-clamp-to-max.tentative.html b/tests/wpt/tests/css/css-device-adapt/viewport-user-scalable-no-clamp-to-max.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-device-adapt/viewport-user-scalable-no-clamp-to-max.tentative.html rename to tests/wpt/tests/css/css-device-adapt/viewport-user-scalable-no-clamp-to-max.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-device-adapt/viewport-user-scalable-no-clamp-to-min.tentative.html b/tests/wpt/tests/css/css-device-adapt/viewport-user-scalable-no-clamp-to-min.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-device-adapt/viewport-user-scalable-no-clamp-to-min.tentative.html rename to tests/wpt/tests/css/css-device-adapt/viewport-user-scalable-no-clamp-to-min.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-device-adapt/viewport-user-scalable-no-wide-content.tentative.html b/tests/wpt/tests/css/css-device-adapt/viewport-user-scalable-no-wide-content.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-device-adapt/viewport-user-scalable-no-wide-content.tentative.html rename to tests/wpt/tests/css/css-device-adapt/viewport-user-scalable-no-wide-content.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-display/META.yml b/tests/wpt/tests/css/css-display/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/META.yml rename to tests/wpt/tests/css/css-display/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-display/animations/display-interpolation.html b/tests/wpt/tests/css/css-display/animations/display-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/animations/display-interpolation.html rename to tests/wpt/tests/css/css-display/animations/display-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-display/animations/display-interpolation.tentative.html b/tests/wpt/tests/css/css-display/animations/display-interpolation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/animations/display-interpolation.tentative.html rename to tests/wpt/tests/css/css-display/animations/display-interpolation.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-change-iframe.html b/tests/wpt/tests/css/css-display/display-change-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-change-iframe.html rename to tests/wpt/tests/css/css-display/display-change-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-change-object-iframe.html b/tests/wpt/tests/css/css-display/display-change-object-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-change-object-iframe.html rename to tests/wpt/tests/css/css-display/display-change-object-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-alignment-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-alignment-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-alignment-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-alignment-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-alignment-001.html b/tests/wpt/tests/css/css-display/display-contents-alignment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-alignment-001.html rename to tests/wpt/tests/css/css-display/display-contents-alignment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-alignment-002-ref.html b/tests/wpt/tests/css/css-display/display-contents-alignment-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-alignment-002-ref.html rename to tests/wpt/tests/css/css-display/display-contents-alignment-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-alignment-002.html b/tests/wpt/tests/css/css-display/display-contents-alignment-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-alignment-002.html rename to tests/wpt/tests/css/css-display/display-contents-alignment-002.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-before-after-001.html b/tests/wpt/tests/css/css-display/display-contents-before-after-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-before-after-001.html rename to tests/wpt/tests/css/css-display/display-contents-before-after-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-before-after-002.html b/tests/wpt/tests/css/css-display/display-contents-before-after-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-before-after-002.html rename to tests/wpt/tests/css/css-display/display-contents-before-after-002.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-before-after-003.html b/tests/wpt/tests/css/css-display/display-contents-before-after-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-before-after-003.html rename to tests/wpt/tests/css/css-display/display-contents-before-after-003.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-block-001.html b/tests/wpt/tests/css/css-display/display-contents-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-block-001.html rename to tests/wpt/tests/css/css-display/display-contents-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-block-002-ref.html b/tests/wpt/tests/css/css-display/display-contents-block-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-block-002-ref.html rename to tests/wpt/tests/css/css-display/display-contents-block-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-block-002.html b/tests/wpt/tests/css/css-display/display-contents-block-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-block-002.html rename to tests/wpt/tests/css/css-display/display-contents-block-002.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-blockify-dynamic.html b/tests/wpt/tests/css/css-display/display-contents-blockify-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-blockify-dynamic.html rename to tests/wpt/tests/css/css-display/display-contents-blockify-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-button.html b/tests/wpt/tests/css/css-display/display-contents-button.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-button.html rename to tests/wpt/tests/css/css-display/display-contents-button.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-computed-style.html b/tests/wpt/tests/css/css-display/display-contents-computed-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-computed-style.html rename to tests/wpt/tests/css/css-display/display-contents-computed-style.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-details-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-details-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-details-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-details-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-details-001.html b/tests/wpt/tests/css/css-display/display-contents-details-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-details-001.html rename to tests/wpt/tests/css/css-display/display-contents-details-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-details.html b/tests/wpt/tests/css/css-display/display-contents-details.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-details.html rename to tests/wpt/tests/css/css-display/display-contents-details.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-before-after-001.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-before-after-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-before-after-001.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-before-after-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-before-after-first-letter-001.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-before-after-first-letter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-before-after-first-letter-001.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-before-after-first-letter-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-fieldset-legend-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-fieldset-legend-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-fieldset-legend-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-fieldset-legend-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-fieldset-legend-001.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-fieldset-legend-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-fieldset-legend-001.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-fieldset-legend-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-flex-001-inline.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-flex-001-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-flex-001-inline.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-flex-001-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-flex-001-none.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-flex-001-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-flex-001-none.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-flex-001-none.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-flex-002-inline.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-flex-002-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-flex-002-inline.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-flex-002-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-flex-002-none.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-flex-002-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-flex-002-none.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-flex-002-none.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-flex-003-inline.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-flex-003-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-flex-003-inline.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-flex-003-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-flex-003-none.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-flex-003-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-flex-003-none.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-flex-003-none.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-generated-content-fieldset-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-generated-content-fieldset-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-generated-content-fieldset-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-generated-content-fieldset-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-generated-content-fieldset-001.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-generated-content-fieldset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-generated-content-fieldset-001.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-generated-content-fieldset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-inline-flex-001-inline.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-inline-flex-001-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-inline-flex-001-inline.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-inline-flex-001-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-inline-flex-001-none.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-inline-flex-001-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-inline-flex-001-none.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-inline-flex-001-none.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-list-001-inline.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-list-001-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-list-001-inline.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-list-001-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-list-001-none.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-list-001-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-list-001-none.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-list-001-none.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-multicol-001-inline.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-multicol-001-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-multicol-001-inline.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-multicol-001-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-multicol-001-none.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-multicol-001-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-multicol-001-none.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-multicol-001-none.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-pseudo-insertion-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-pseudo-insertion-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-pseudo-insertion-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-pseudo-insertion-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-pseudo-insertion-001.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-pseudo-insertion-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-pseudo-insertion-001.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-pseudo-insertion-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-table-001-inline.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-table-001-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-table-001-inline.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-table-001-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-table-001-none.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-table-001-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-table-001-none.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-table-001-none.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-table-002-inline.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-table-002-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-table-002-inline.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-table-002-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-table-002-none.html b/tests/wpt/tests/css/css-display/display-contents-dynamic-table-002-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-table-002-none.html rename to tests/wpt/tests/css/css-display/display-contents-dynamic-table-002-none.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset-002-ref.html b/tests/wpt/tests/css/css-display/display-contents-fieldset-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset-002-ref.html rename to tests/wpt/tests/css/css-display/display-contents-fieldset-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset-002.html b/tests/wpt/tests/css/css-display/display-contents-fieldset-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset-002.html rename to tests/wpt/tests/css/css-display/display-contents-fieldset-002.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset-nested-legend-ref.html b/tests/wpt/tests/css/css-display/display-contents-fieldset-nested-legend-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset-nested-legend-ref.html rename to tests/wpt/tests/css/css-display/display-contents-fieldset-nested-legend-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset-nested-legend.html b/tests/wpt/tests/css/css-display/display-contents-fieldset-nested-legend.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset-nested-legend.html rename to tests/wpt/tests/css/css-display/display-contents-fieldset-nested-legend.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset.html b/tests/wpt/tests/css/css-display/display-contents-fieldset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset.html rename to tests/wpt/tests/css/css-display/display-contents-fieldset.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-first-letter-001.html b/tests/wpt/tests/css/css-display/display-contents-first-letter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-first-letter-001.html rename to tests/wpt/tests/css/css-display/display-contents-first-letter-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-first-letter-002.html b/tests/wpt/tests/css/css-display/display-contents-first-letter-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-first-letter-002.html rename to tests/wpt/tests/css/css-display/display-contents-first-letter-002.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-first-line-001.html b/tests/wpt/tests/css/css-display/display-contents-first-line-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-first-line-001.html rename to tests/wpt/tests/css/css-display/display-contents-first-line-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-first-line-002.html b/tests/wpt/tests/css/css-display/display-contents-first-line-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-first-line-002.html rename to tests/wpt/tests/css/css-display/display-contents-first-line-002.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-flex-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-flex-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-flex-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-flex-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-flex-001.html b/tests/wpt/tests/css/css-display/display-contents-flex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-flex-001.html rename to tests/wpt/tests/css/css-display/display-contents-flex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-flex-002-ref.html b/tests/wpt/tests/css/css-display/display-contents-flex-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-flex-002-ref.html rename to tests/wpt/tests/css/css-display/display-contents-flex-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-flex-002.html b/tests/wpt/tests/css/css-display/display-contents-flex-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-flex-002.html rename to tests/wpt/tests/css/css-display/display-contents-flex-002.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-flex-003.html b/tests/wpt/tests/css/css-display/display-contents-flex-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-flex-003.html rename to tests/wpt/tests/css/css-display/display-contents-flex-003.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-float-001.html b/tests/wpt/tests/css/css-display/display-contents-float-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-float-001.html rename to tests/wpt/tests/css/css-display/display-contents-float-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-inline-001.html b/tests/wpt/tests/css/css-display/display-contents-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-inline-001.html rename to tests/wpt/tests/css/css-display/display-contents-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-inline-flex-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-inline-flex-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-inline-flex-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-inline-flex-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-inline-flex-001.html b/tests/wpt/tests/css/css-display/display-contents-inline-flex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-inline-flex-001.html rename to tests/wpt/tests/css/css-display/display-contents-inline-flex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-line-height-ref.html b/tests/wpt/tests/css/css-display/display-contents-line-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-line-height-ref.html rename to tests/wpt/tests/css/css-display/display-contents-line-height-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-line-height.html b/tests/wpt/tests/css/css-display/display-contents-line-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-line-height.html rename to tests/wpt/tests/css/css-display/display-contents-line-height.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-list-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-list-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-list-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-list-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-list-001.html b/tests/wpt/tests/css/css-display/display-contents-list-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-list-001.html rename to tests/wpt/tests/css/css-display/display-contents-list-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-multicol-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-multicol-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-multicol-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-multicol-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-multicol-001.html b/tests/wpt/tests/css/css-display/display-contents-multicol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-multicol-001.html rename to tests/wpt/tests/css/css-display/display-contents-multicol-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-oof-001.html b/tests/wpt/tests/css/css-display/display-contents-oof-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-oof-001.html rename to tests/wpt/tests/css/css-display/display-contents-oof-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-oof-002.html b/tests/wpt/tests/css/css-display/display-contents-oof-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-oof-002.html rename to tests/wpt/tests/css/css-display/display-contents-oof-002.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-parsing-001.html b/tests/wpt/tests/css/css-display/display-contents-parsing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-parsing-001.html rename to tests/wpt/tests/css/css-display/display-contents-parsing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-pass-green-no-red-ref.html b/tests/wpt/tests/css/css-display/display-contents-pass-green-no-red-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-pass-green-no-red-ref.html rename to tests/wpt/tests/css/css-display/display-contents-pass-green-no-red-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-pass-no-red-ref.html b/tests/wpt/tests/css/css-display/display-contents-pass-no-red-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-pass-no-red-ref.html rename to tests/wpt/tests/css/css-display/display-contents-pass-no-red-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-pass-ref.html b/tests/wpt/tests/css/css-display/display-contents-pass-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-pass-ref.html rename to tests/wpt/tests/css/css-display/display-contents-pass-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-root-background-ref.html b/tests/wpt/tests/css/css-display/display-contents-root-background-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-root-background-ref.html rename to tests/wpt/tests/css/css-display/display-contents-root-background-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-root-background.html b/tests/wpt/tests/css/css-display/display-contents-root-background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-root-background.html rename to tests/wpt/tests/css/css-display/display-contents-root-background.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-shadow-dom-1-ref.html b/tests/wpt/tests/css/css-display/display-contents-shadow-dom-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-shadow-dom-1-ref.html rename to tests/wpt/tests/css/css-display/display-contents-shadow-dom-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-shadow-dom-1.html b/tests/wpt/tests/css/css-display/display-contents-shadow-dom-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-shadow-dom-1.html rename to tests/wpt/tests/css/css-display/display-contents-shadow-dom-1.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-shadow-host-whitespace.html b/tests/wpt/tests/css/css-display/display-contents-shadow-host-whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-shadow-host-whitespace.html rename to tests/wpt/tests/css/css-display/display-contents-shadow-host-whitespace.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-sharing-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-sharing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-sharing-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-sharing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-sharing-001.html b/tests/wpt/tests/css/css-display/display-contents-sharing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-sharing-001.html rename to tests/wpt/tests/css/css-display/display-contents-sharing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-slot-attach-whitespace.html b/tests/wpt/tests/css/css-display/display-contents-slot-attach-whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-slot-attach-whitespace.html rename to tests/wpt/tests/css/css-display/display-contents-slot-attach-whitespace.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-state-change-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-state-change-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-state-change-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-state-change-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-state-change-001.html b/tests/wpt/tests/css/css-display/display-contents-state-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-state-change-001.html rename to tests/wpt/tests/css/css-display/display-contents-state-change-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-suppression-dynamic-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-suppression-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-suppression-dynamic-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-suppression-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-suppression-dynamic-001.html b/tests/wpt/tests/css/css-display/display-contents-suppression-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-suppression-dynamic-001.html rename to tests/wpt/tests/css/css-display/display-contents-suppression-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-svg-anchor-child.html b/tests/wpt/tests/css/css-display/display-contents-svg-anchor-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-svg-anchor-child.html rename to tests/wpt/tests/css/css-display/display-contents-svg-anchor-child.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-svg-elements-ref.html b/tests/wpt/tests/css/css-display/display-contents-svg-elements-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-svg-elements-ref.html rename to tests/wpt/tests/css/css-display/display-contents-svg-elements-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-svg-elements.html b/tests/wpt/tests/css/css-display/display-contents-svg-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-svg-elements.html rename to tests/wpt/tests/css/css-display/display-contents-svg-elements.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-svg-switch-child.html b/tests/wpt/tests/css/css-display/display-contents-svg-switch-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-svg-switch-child.html rename to tests/wpt/tests/css/css-display/display-contents-svg-switch-child.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-table-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-table-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-table-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-table-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-table-001.html b/tests/wpt/tests/css/css-display/display-contents-table-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-table-001.html rename to tests/wpt/tests/css/css-display/display-contents-table-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-table-002-ref.html b/tests/wpt/tests/css/css-display/display-contents-table-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-table-002-ref.html rename to tests/wpt/tests/css/css-display/display-contents-table-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-table-002.html b/tests/wpt/tests/css/css-display/display-contents-table-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-table-002.html rename to tests/wpt/tests/css/css-display/display-contents-table-002.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-td-001.html b/tests/wpt/tests/css/css-display/display-contents-td-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-td-001.html rename to tests/wpt/tests/css/css-display/display-contents-td-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-text-inherit-002.html b/tests/wpt/tests/css/css-display/display-contents-text-inherit-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-text-inherit-002.html rename to tests/wpt/tests/css/css-display/display-contents-text-inherit-002.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-text-inherit-ref.html b/tests/wpt/tests/css/css-display/display-contents-text-inherit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-text-inherit-ref.html rename to tests/wpt/tests/css/css-display/display-contents-text-inherit-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-text-inherit.html b/tests/wpt/tests/css/css-display/display-contents-text-inherit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-text-inherit.html rename to tests/wpt/tests/css/css-display/display-contents-text-inherit.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-text-only-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-text-only-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-text-only-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-text-only-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-text-only-001.html b/tests/wpt/tests/css/css-display/display-contents-text-only-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-text-only-001.html rename to tests/wpt/tests/css/css-display/display-contents-text-only-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-tr-001-ref.html b/tests/wpt/tests/css/css-display/display-contents-tr-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-tr-001-ref.html rename to tests/wpt/tests/css/css-display/display-contents-tr-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-tr-001.html b/tests/wpt/tests/css/css-display/display-contents-tr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-tr-001.html rename to tests/wpt/tests/css/css-display/display-contents-tr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-unusual-html-elements-none.html b/tests/wpt/tests/css/css-display/display-contents-unusual-html-elements-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-unusual-html-elements-none.html rename to tests/wpt/tests/css/css-display/display-contents-unusual-html-elements-none.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-whitespace-inside-inline-ref.html b/tests/wpt/tests/css/css-display/display-contents-whitespace-inside-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-whitespace-inside-inline-ref.html rename to tests/wpt/tests/css/css-display/display-contents-whitespace-inside-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-whitespace-inside-inline.html b/tests/wpt/tests/css/css-display/display-contents-whitespace-inside-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-contents-whitespace-inside-inline.html rename to tests/wpt/tests/css/css-display/display-contents-whitespace-inside-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-first-line-001.html b/tests/wpt/tests/css/css-display/display-first-line-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-first-line-001.html rename to tests/wpt/tests/css/css-display/display-first-line-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-first-line-002-ref.html b/tests/wpt/tests/css/css-display/display-first-line-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-first-line-002-ref.html rename to tests/wpt/tests/css/css-display/display-first-line-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-first-line-002.html b/tests/wpt/tests/css/css-display/display-first-line-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-first-line-002.html rename to tests/wpt/tests/css/css-display/display-first-line-002.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-flow-root-001-ref.html b/tests/wpt/tests/css/css-display/display-flow-root-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-flow-root-001-ref.html rename to tests/wpt/tests/css/css-display/display-flow-root-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-flow-root-001.html b/tests/wpt/tests/css/css-display/display-flow-root-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-flow-root-001.html rename to tests/wpt/tests/css/css-display/display-flow-root-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-flow-root-002-ref.html b/tests/wpt/tests/css/css-display/display-flow-root-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-flow-root-002-ref.html rename to tests/wpt/tests/css/css-display/display-flow-root-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-flow-root-002.html b/tests/wpt/tests/css/css-display/display-flow-root-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-flow-root-002.html rename to tests/wpt/tests/css/css-display/display-flow-root-002.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-flow-root-list-item-001-ref.html b/tests/wpt/tests/css/css-display/display-flow-root-list-item-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-flow-root-list-item-001-ref.html rename to tests/wpt/tests/css/css-display/display-flow-root-list-item-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-flow-root-list-item-001.html b/tests/wpt/tests/css/css-display/display-flow-root-list-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-flow-root-list-item-001.html rename to tests/wpt/tests/css/css-display/display-flow-root-list-item-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-inline-dynamic-001-ref.html b/tests/wpt/tests/css/css-display/display-inline-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-inline-dynamic-001-ref.html rename to tests/wpt/tests/css/css-display/display-inline-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-inline-dynamic-001.html b/tests/wpt/tests/css/css-display/display-inline-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-inline-dynamic-001.html rename to tests/wpt/tests/css/css-display/display-inline-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-list-item-height-after-dom-change.html b/tests/wpt/tests/css/css-display/display-list-item-height-after-dom-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-list-item-height-after-dom-change.html rename to tests/wpt/tests/css/css-display/display-list-item-height-after-dom-change.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-math-on-non-mathml-elements.html b/tests/wpt/tests/css/css-display/display-math-on-non-mathml-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-math-on-non-mathml-elements.html rename to tests/wpt/tests/css/css-display/display-math-on-non-mathml-elements.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-math-on-pseudo-elements-001.html b/tests/wpt/tests/css/css-display/display-math-on-pseudo-elements-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-math-on-pseudo-elements-001.html rename to tests/wpt/tests/css/css-display/display-math-on-pseudo-elements-001.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-math-on-pseudo-elements-002-ref.html b/tests/wpt/tests/css/css-display/display-math-on-pseudo-elements-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-math-on-pseudo-elements-002-ref.html rename to tests/wpt/tests/css/css-display/display-math-on-pseudo-elements-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-math-on-pseudo-elements-002.html b/tests/wpt/tests/css/css-display/display-math-on-pseudo-elements-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-math-on-pseudo-elements-002.html rename to tests/wpt/tests/css/css-display/display-math-on-pseudo-elements-002.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-none-inline-img-ref.html b/tests/wpt/tests/css/css-display/display-none-inline-img-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-none-inline-img-ref.html rename to tests/wpt/tests/css/css-display/display-none-inline-img-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-none-inline-img.html b/tests/wpt/tests/css/css-display/display-none-inline-img.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-none-inline-img.html rename to tests/wpt/tests/css/css-display/display-none-inline-img.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-none-root-hit-test-crash.html b/tests/wpt/tests/css/css-display/display-none-root-hit-test-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-none-root-hit-test-crash.html rename to tests/wpt/tests/css/css-display/display-none-root-hit-test-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-with-float-dynamic.html b/tests/wpt/tests/css/css-display/display-with-float-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-with-float-dynamic.html rename to tests/wpt/tests/css/css-display/display-with-float-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-display/display-with-float.html b/tests/wpt/tests/css/css-display/display-with-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/display-with-float.html rename to tests/wpt/tests/css/css-display/display-with-float.html diff --git a/tests/wpt/web-platform-tests/css/css-display/inheritance.html b/tests/wpt/tests/css/css-display/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/inheritance.html rename to tests/wpt/tests/css/css-display/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-display/parsing/display-computed.html b/tests/wpt/tests/css/css-display/parsing/display-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/parsing/display-computed.html rename to tests/wpt/tests/css/css-display/parsing/display-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-display/parsing/display-invalid.html b/tests/wpt/tests/css/css-display/parsing/display-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/parsing/display-invalid.html rename to tests/wpt/tests/css/css-display/parsing/display-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-display/parsing/display-valid.html b/tests/wpt/tests/css/css-display/parsing/display-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/parsing/display-valid.html rename to tests/wpt/tests/css/css-display/parsing/display-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/after-content-display-004.xht b/tests/wpt/tests/css/css-display/run-in/after-content-display-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/after-content-display-004.xht rename to tests/wpt/tests/css/css-display/run-in/after-content-display-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/anonymous-box-generation-002.xht b/tests/wpt/tests/css/css-display/run-in/anonymous-box-generation-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/anonymous-box-generation-002.xht rename to tests/wpt/tests/css/css-display/run-in/anonymous-box-generation-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/background-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/background-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/background-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/background-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/background-attachment-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/background-attachment-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/background-attachment-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/background-attachment-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/background-color-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/background-color-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/background-color-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/background-color-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/background-image-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/background-image-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/background-image-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/background-image-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/background-position-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/background-position-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/background-position-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/background-position-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/background-repeat-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/background-repeat-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/background-repeat-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/background-repeat-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/before-content-display-004.xht b/tests/wpt/tests/css/css-display/run-in/before-content-display-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/before-content-display-004.xht rename to tests/wpt/tests/css/css-display/run-in/before-content-display-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-bottom-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-bottom-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-bottom-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-bottom-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-bottom-color-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-bottom-color-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-bottom-color-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-bottom-color-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-bottom-style-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-bottom-style-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-bottom-style-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-bottom-style-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-bottom-width-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-bottom-width-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-bottom-width-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-bottom-width-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-collapse-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/border-collapse-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-collapse-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/border-collapse-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-color-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-color-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-color-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-color-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-left-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-left-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-left-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-left-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-left-color-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-left-color-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-left-color-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-left-color-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-left-style-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-left-style-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-left-style-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-left-style-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-left-width-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-left-width-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-left-width-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-left-width-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-right-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-right-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-right-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-right-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-right-color-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-right-color-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-right-color-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-right-color-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-right-style-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-right-style-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-right-style-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-right-style-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-right-width-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-right-width-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-right-width-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-right-width-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-spacing-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/border-spacing-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-spacing-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/border-spacing-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-style-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-style-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-style-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-style-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-top-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-top-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-top-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-top-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-top-color-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-top-color-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-top-color-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-top-color-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-top-style-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-top-style-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-top-style-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-top-style-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-top-width-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-top-width-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-top-width-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-top-width-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/border-width-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/border-width-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/border-width-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/border-width-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/bottom-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/bottom-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/bottom-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/bottom-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/caption-side-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/caption-side-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/caption-side-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/caption-side-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/clear-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/clear-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/clear-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/clear-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/clear-runin-001.xht b/tests/wpt/tests/css/css-display/run-in/clear-runin-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/clear-runin-001.xht rename to tests/wpt/tests/css/css-display/run-in/clear-runin-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/color-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/color-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/color-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/color-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/counter-increment-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/counter-increment-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/counter-increment-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/counter-increment-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/counter-reset-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/counter-reset-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/counter-reset-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/counter-reset-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/cursor-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/cursor-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/cursor-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/cursor-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/direction-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/direction-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/direction-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/direction-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/display-004.xht b/tests/wpt/tests/css/css-display/run-in/display-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/display-004.xht rename to tests/wpt/tests/css/css-display/run-in/display-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/empty-cells-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/empty-cells-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/empty-cells-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/empty-cells-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/first-line-pseudo-009.xht b/tests/wpt/tests/css/css-display/run-in/first-line-pseudo-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/first-line-pseudo-009.xht rename to tests/wpt/tests/css/css-display/run-in/first-line-pseudo-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/float-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/float-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/float-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/float-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/font-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/font-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/font-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/font-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/font-family-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/font-family-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/font-family-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/font-family-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/font-size-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/font-size-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/font-size-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/font-size-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/font-style-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/font-style-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/font-style-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/font-style-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/font-variant-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/font-variant-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/font-variant-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/font-variant-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/font-weight-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/font-weight-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/font-weight-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/font-weight-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/height-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/height-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/height-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/height-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/left-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/left-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/left-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/left-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/letter-spacing-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/letter-spacing-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/letter-spacing-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/letter-spacing-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/line-height-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/line-height-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/line-height-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/line-height-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/list-style-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/list-style-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/list-style-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/list-style-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/list-style-image-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/list-style-image-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/list-style-image-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/list-style-image-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/list-style-position-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/list-style-position-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/list-style-position-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/list-style-position-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/list-style-type-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/list-style-type-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/list-style-type-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/list-style-type-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/margin-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/margin-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/margin-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/margin-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/margin-bottom-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/margin-bottom-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/margin-bottom-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/margin-bottom-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/margin-left-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/margin-left-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/margin-left-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/margin-left-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/margin-right-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/margin-right-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/margin-right-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/margin-right-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/margin-top-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/margin-top-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/margin-top-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/margin-top-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/max-height-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/max-height-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/max-height-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/max-height-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/max-width-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/max-width-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/max-width-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/max-width-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/min-height-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/min-height-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/min-height-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/min-height-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/min-width-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/min-width-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/min-width-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/min-width-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/outline-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/outline-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/outline-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/outline-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/outline-color-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/outline-color-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/outline-color-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/outline-color-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/outline-style-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/outline-style-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/outline-style-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/outline-style-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/outline-width-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/outline-width-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/outline-width-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/outline-width-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/overflow-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/overflow-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/overflow-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/overflow-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/padding-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/padding-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/padding-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/padding-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/padding-bottom-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/padding-bottom-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/padding-bottom-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/padding-bottom-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/padding-left-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/padding-left-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/padding-left-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/padding-left-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/padding-right-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/padding-right-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/padding-right-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/padding-right-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/padding-top-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/padding-top-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/padding-top-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/padding-top-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/position-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/position-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/position-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/position-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/quotes-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/quotes-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/quotes-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/quotes-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/right-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/right-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/right-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/right-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-004.xht b/tests/wpt/tests/css/css-display/run-in/run-in-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-004.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-005.xht b/tests/wpt/tests/css/css-display/run-in/run-in-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-005.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-006.xht b/tests/wpt/tests/css/css-display/run-in/run-in-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-006.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-007.xht b/tests/wpt/tests/css/css-display/run-in/run-in-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-007.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-008.xht b/tests/wpt/tests/css/css-display/run-in/run-in-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-008.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-009.xht b/tests/wpt/tests/css/css-display/run-in/run-in-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-009.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-010.xht b/tests/wpt/tests/css/css-display/run-in/run-in-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-010.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-011.xht b/tests/wpt/tests/css/css-display/run-in/run-in-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-011.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-012.xht b/tests/wpt/tests/css/css-display/run-in/run-in-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-012.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-013.xht b/tests/wpt/tests/css/css-display/run-in/run-in-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-013.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-abspos-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-abspos-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-abspos-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-abspos-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-abspos-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-abspos-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-abspos-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-abspos-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-abspos-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-abspos-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-abspos-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-abspos-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-004.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-004.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-005.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-005.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-006.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-006.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-007-ref.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-007-ref.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-007.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-007.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-008.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-008.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-009.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-009.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-010.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-010.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-011.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-011.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-012.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-012.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-013.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-013.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-014.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-014.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-015.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-015.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-016.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-016.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-017.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-017.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-018.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-018.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-ref.xht b/tests/wpt/tests/css/css-display/run-in/run-in-basic-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-basic-ref.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-basic-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-block-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-block-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-block-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-block-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-block-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-block-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-block-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-block-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-block-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-block-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-block-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-block-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-block-ref.xht b/tests/wpt/tests/css/css-display/run-in/run-in-block-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-block-ref.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-block-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-breaking-001-ref.xht b/tests/wpt/tests/css/css-display/run-in/run-in-breaking-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-breaking-001-ref.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-breaking-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-breaking-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-breaking-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-breaking-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-breaking-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-breaking-002-ref.xht b/tests/wpt/tests/css/css-display/run-in/run-in-breaking-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-breaking-002-ref.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-breaking-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-breaking-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-breaking-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-breaking-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-breaking-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-clear-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-clear-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-clear-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-clear-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-clear-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-clear-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-clear-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-clear-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-abspos-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-abspos-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-abspos-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-abspos-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-block-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-block-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-block-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-block-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-block-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-block-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-004.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-block-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-004.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-block-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-005.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-block-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-005.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-block-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-inside-inline-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-block-inside-inline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-inside-inline-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-block-inside-inline-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-inside-inline-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-block-inside-inline-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-inside-inline-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-block-inside-inline-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-inside-inline-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-block-inside-inline-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-block-inside-inline-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-block-inside-inline-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-float-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-float-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-float-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-float-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-004.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-004.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-005.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-005.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-006.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-006.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-007.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-007.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-block-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-block-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-block-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-block-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-table-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-table-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-inline-table-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-inline-table-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-relpos-block-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-relpos-block-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-relpos-block-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-relpos-block-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-relpos-block-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-relpos-block-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-relpos-block-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-relpos-block-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-relpos-block-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-relpos-block-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-relpos-block-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-relpos-block-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-run-in-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-run-in-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-run-in-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-run-in-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-run-in-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-run-in-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-run-in-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-run-in-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-run-in-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-run-in-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-run-in-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-run-in-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-table-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-table-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-table-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-table-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-table-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-table-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-caption-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-table-caption-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-caption-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-table-caption-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-cell-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-table-cell-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-cell-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-table-cell-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-column-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-table-column-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-column-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-table-column-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-column-group-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-table-column-group-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-column-group-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-table-column-group-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-inside-inline-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-table-inside-inline-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-inside-inline-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-table-inside-inline-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-inside-inline-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-table-inside-inline-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-inside-inline-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-table-inside-inline-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-inside-inline-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-table-inside-inline-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-inside-inline-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-table-inside-inline-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-row-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-table-row-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-row-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-table-row-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-row-group-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-contains-table-row-group-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-contains-table-row-group-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-contains-table-row-group-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-display-none-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-display-none-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-display-none-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-display-none-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-display-none-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-display-none-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-display-none-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-display-none-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-display-none-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-display-none-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-display-none-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-display-none-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-fixedpos-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-fixedpos-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-fixedpos-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-fixedpos-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-fixedpos-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-fixedpos-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-fixedpos-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-fixedpos-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-fixedpos-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-fixedpos-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-fixedpos-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-fixedpos-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-float-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-float-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-float-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-float-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-float-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-float-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-float-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-float-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-float-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-float-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-float-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-float-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inherit-001-ref.xht b/tests/wpt/tests/css/css-display/run-in/run-in-inherit-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inherit-001-ref.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-inherit-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inherit-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inherit-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inheritance-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-inheritance-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inheritance-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-inheritance-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-inline-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-inline-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-inline-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-inline-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-inline-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-inline-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-block-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-inline-block-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-block-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-inline-block-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-block-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-inline-block-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-block-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-inline-block-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-block-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-inline-block-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-block-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-inline-block-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-table-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-inline-table-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-table-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-inline-table-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-table-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-inline-table-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-table-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-inline-table-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-table-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-inline-table-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-inline-table-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-inline-table-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-linebox-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-linebox-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-linebox-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-linebox-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-linebox-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-linebox-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-linebox-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-linebox-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-listitem-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-listitem-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-listitem-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-listitem-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-listitem-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-listitem-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-listitem-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-listitem-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-listitem-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-listitem-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-listitem-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-listitem-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-pre-ref.xht b/tests/wpt/tests/css/css-display/run-in/run-in-pre-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-pre-ref.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-pre-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-relpos-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-relpos-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-relpos-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-relpos-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-relpos-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-relpos-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-relpos-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-relpos-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-relpos-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-relpos-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-relpos-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-relpos-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-replaced-001-ref.xht b/tests/wpt/tests/css/css-display/run-in/run-in-replaced-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-replaced-001-ref.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-replaced-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-replaced-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-replaced-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-replaced-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-replaced-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-restyle-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-restyle-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-restyle-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-restyle-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-restyle-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-restyle-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-restyle-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-restyle-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-restyle-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-restyle-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-restyle-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-restyle-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-004.xht b/tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-004.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-005.xht b/tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-005.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-006.xht b/tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-006.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-007.xht b/tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-007.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-008.xht b/tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-run-in-between-008.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-run-in-between-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-table-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-table-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-table-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-table-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-table-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-table-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-cell-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-table-cell-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-cell-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-table-cell-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-cell-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-table-cell-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-cell-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-table-cell-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-cell-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-table-cell-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-cell-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-table-cell-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-row-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-table-row-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-row-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-table-row-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-row-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-table-row-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-row-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-table-row-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-row-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-table-row-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-table-row-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-table-row-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-text-between-001.xht b/tests/wpt/tests/css/css-display/run-in/run-in-text-between-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-text-between-001.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-text-between-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-text-between-002.xht b/tests/wpt/tests/css/css-display/run-in/run-in-text-between-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-text-between-002.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-text-between-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-text-between-003.xht b/tests/wpt/tests/css/css-display/run-in/run-in-text-between-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-text-between-003.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-text-between-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-text-between-004.xht b/tests/wpt/tests/css/css-display/run-in/run-in-text-between-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-text-between-004.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-text-between-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-text-between-005.xht b/tests/wpt/tests/css/css-display/run-in/run-in-text-between-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-text-between-005.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-text-between-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/run-in-text-ref.xht b/tests/wpt/tests/css/css-display/run-in/run-in-text-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/run-in-text-ref.xht rename to tests/wpt/tests/css/css-display/run-in/run-in-text-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/support/black15x15.png b/tests/wpt/tests/css/css-display/run-in/support/black15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/support/black15x15.png rename to tests/wpt/tests/css/css-display/run-in/support/black15x15.png diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/support/blue15x15.png b/tests/wpt/tests/css/css-display/run-in/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/support/blue15x15.png rename to tests/wpt/tests/css/css-display/run-in/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/support/blue96x96.png b/tests/wpt/tests/css/css-display/run-in/support/blue96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/support/blue96x96.png rename to tests/wpt/tests/css/css-display/run-in/support/blue96x96.png diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/support/green15x15.png b/tests/wpt/tests/css/css-display/run-in/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/support/green15x15.png rename to tests/wpt/tests/css/css-display/run-in/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/support/swatch-blue.png b/tests/wpt/tests/css/css-display/run-in/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/support/swatch-blue.png rename to tests/wpt/tests/css/css-display/run-in/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/table-anonymous-block-001.xht b/tests/wpt/tests/css/css-display/run-in/table-anonymous-block-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/table-anonymous-block-001.xht rename to tests/wpt/tests/css/css-display/run-in/table-anonymous-block-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/table-layout-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/table-layout-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/table-layout-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/table-layout-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/text-align-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/text-align-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/text-align-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/text-align-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/text-decoration-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/text-decoration-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/text-decoration-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/text-decoration-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/text-indent-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/text-indent-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/text-indent-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/text-indent-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/text-transform-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/text-transform-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/text-transform-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/text-transform-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/top-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/top-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/top-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/top-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/unicode-bidi-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/unicode-bidi-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/unicode-bidi-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/unicode-bidi-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/vertical-align-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/vertical-align-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/vertical-align-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/vertical-align-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/visibility-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/visibility-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/visibility-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/visibility-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/white-space-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/white-space-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/white-space-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/white-space-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/width-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/width-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/width-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/width-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/word-spacing-applies-to-004.xht b/tests/wpt/tests/css/css-display/run-in/word-spacing-applies-to-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/word-spacing-applies-to-004.xht rename to tests/wpt/tests/css/css-display/run-in/word-spacing-applies-to-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/run-in/z-index-applies-to-011.xht b/tests/wpt/tests/css/css-display/run-in/z-index-applies-to-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/run-in/z-index-applies-to-011.xht rename to tests/wpt/tests/css/css-display/run-in/z-index-applies-to-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-display/select-4-option-optgroup-display-none-ref.html b/tests/wpt/tests/css/css-display/select-4-option-optgroup-display-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/select-4-option-optgroup-display-none-ref.html rename to tests/wpt/tests/css/css-display/select-4-option-optgroup-display-none-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-display/select-4-option-optgroup-display-none.html b/tests/wpt/tests/css/css-display/select-4-option-optgroup-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/select-4-option-optgroup-display-none.html rename to tests/wpt/tests/css/css-display/select-4-option-optgroup-display-none.html diff --git a/tests/wpt/web-platform-tests/css/css-display/support/acid.css b/tests/wpt/tests/css/css-display/support/acid.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/support/acid.css rename to tests/wpt/tests/css/css-display/support/acid.css diff --git a/tests/wpt/web-platform-tests/css/css-display/support/red-square.html b/tests/wpt/tests/css/css-display/support/red-square.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/support/red-square.html rename to tests/wpt/tests/css/css-display/support/red-square.html diff --git a/tests/wpt/web-platform-tests/css/css-display/support/swatch-orange.png b/tests/wpt/tests/css/css-display/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/support/swatch-orange.png rename to tests/wpt/tests/css/css-display/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-display/support/util.js b/tests/wpt/tests/css/css-display/support/util.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/support/util.js rename to tests/wpt/tests/css/css-display/support/util.js diff --git a/tests/wpt/web-platform-tests/css/css-display/textarea-display.html b/tests/wpt/tests/css/css-display/textarea-display.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-display/textarea-display.html rename to tests/wpt/tests/css/css-display/textarea-display.html diff --git a/tests/wpt/web-platform-tests/css/css-easing/META.yml b/tests/wpt/tests/css/css-easing/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-easing/META.yml rename to tests/wpt/tests/css/css-easing/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-easing/cubic-bezier-timing-functions-output.html b/tests/wpt/tests/css/css-easing/cubic-bezier-timing-functions-output.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-easing/cubic-bezier-timing-functions-output.html rename to tests/wpt/tests/css/css-easing/cubic-bezier-timing-functions-output.html diff --git a/tests/wpt/web-platform-tests/css/css-easing/linear-timing-functions-output.tentative.html b/tests/wpt/tests/css/css-easing/linear-timing-functions-output.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-easing/linear-timing-functions-output.tentative.html rename to tests/wpt/tests/css/css-easing/linear-timing-functions-output.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-easing/linear-timing-functions-syntax.tentative.html b/tests/wpt/tests/css/css-easing/linear-timing-functions-syntax.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-easing/linear-timing-functions-syntax.tentative.html rename to tests/wpt/tests/css/css-easing/linear-timing-functions-syntax.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-easing/step-timing-functions-output.html b/tests/wpt/tests/css/css-easing/step-timing-functions-output.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-easing/step-timing-functions-output.html rename to tests/wpt/tests/css/css-easing/step-timing-functions-output.html diff --git a/tests/wpt/web-platform-tests/css/css-easing/step-timing-functions-syntax.html b/tests/wpt/tests/css/css-easing/step-timing-functions-syntax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-easing/step-timing-functions-syntax.html rename to tests/wpt/tests/css/css-easing/step-timing-functions-syntax.html diff --git a/tests/wpt/web-platform-tests/css/css-easing/testcommon.js b/tests/wpt/tests/css/css-easing/testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-easing/testcommon.js rename to tests/wpt/tests/css/css-easing/testcommon.js diff --git a/tests/wpt/web-platform-tests/css/css-easing/timing-functions-syntax-computed.html b/tests/wpt/tests/css/css-easing/timing-functions-syntax-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-easing/timing-functions-syntax-computed.html rename to tests/wpt/tests/css/css-easing/timing-functions-syntax-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-easing/timing-functions-syntax-invalid.html b/tests/wpt/tests/css/css-easing/timing-functions-syntax-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-easing/timing-functions-syntax-invalid.html rename to tests/wpt/tests/css/css-easing/timing-functions-syntax-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-easing/timing-functions-syntax-valid.html b/tests/wpt/tests/css/css-easing/timing-functions-syntax-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-easing/timing-functions-syntax-valid.html rename to tests/wpt/tests/css/css-easing/timing-functions-syntax-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-env/META.yml b/tests/wpt/tests/css/css-env/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-env/META.yml rename to tests/wpt/tests/css/css-env/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-env/at-supports.tentative.html b/tests/wpt/tests/css/css-env/at-supports.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-env/at-supports.tentative.html rename to tests/wpt/tests/css/css-env/at-supports.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-env/env-in-custom-properties.tentative.html b/tests/wpt/tests/css/css-env/env-in-custom-properties.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-env/env-in-custom-properties.tentative.html rename to tests/wpt/tests/css/css-env/env-in-custom-properties.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-env/fallback-nested-var.tentative.html b/tests/wpt/tests/css/css-env/fallback-nested-var.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-env/fallback-nested-var.tentative.html rename to tests/wpt/tests/css/css-env/fallback-nested-var.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-env/indexed-env.tentative.html b/tests/wpt/tests/css/css-env/indexed-env.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-env/indexed-env.tentative.html rename to tests/wpt/tests/css/css-env/indexed-env.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-env/seralization-round-tripping.tentative.html b/tests/wpt/tests/css/css-env/seralization-round-tripping.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-env/seralization-round-tripping.tentative.html rename to tests/wpt/tests/css/css-env/seralization-round-tripping.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-env/supports-script.tentative.html b/tests/wpt/tests/css/css-env/supports-script.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-env/supports-script.tentative.html rename to tests/wpt/tests/css/css-env/supports-script.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-env/syntax.tentative.html b/tests/wpt/tests/css/css-env/syntax.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-env/syntax.tentative.html rename to tests/wpt/tests/css/css-env/syntax.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-env/unknown-env-names-override-previous.tentative.html b/tests/wpt/tests/css/css-env/unknown-env-names-override-previous.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-env/unknown-env-names-override-previous.tentative.html rename to tests/wpt/tests/css/css-env/unknown-env-names-override-previous.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/META.yml b/tests/wpt/tests/css/css-exclusions/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/META.yml rename to tests/wpt/tests/css/css-exclusions/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-01-ref.xht b/tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-01-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-01-ref.xht rename to tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-01-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-01.xht b/tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-01.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-01.xht rename to tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-01.xht diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-02-ref.xht b/tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-02-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-02-ref.xht rename to tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-02-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-02.xht b/tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-02.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-02.xht rename to tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-02.xht diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-03-ref.xht b/tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-03-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-03-ref.xht rename to tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-03-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-03.xht b/tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-03.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-03.xht rename to tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-03.xht diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-04-ref.xht b/tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-04-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-04-ref.xht rename to tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-04-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-04.xht b/tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-04.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-04.xht rename to tests/wpt/tests/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-04.xht diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/inheritance.html b/tests/wpt/tests/css/css-exclusions/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/inheritance.html rename to tests/wpt/tests/css/css-exclusions/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/resources/helper.js b/tests/wpt/tests/css/css-exclusions/resources/helper.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/resources/helper.js rename to tests/wpt/tests/css/css-exclusions/resources/helper.js diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/wrap-flow-001.html b/tests/wpt/tests/css/css-exclusions/wrap-flow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/wrap-flow-001.html rename to tests/wpt/tests/css/css-exclusions/wrap-flow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/wrap-flow-002.html b/tests/wpt/tests/css/css-exclusions/wrap-flow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/wrap-flow-002.html rename to tests/wpt/tests/css/css-exclusions/wrap-flow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/wrap-flow-003.html b/tests/wpt/tests/css/css-exclusions/wrap-flow-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/wrap-flow-003.html rename to tests/wpt/tests/css/css-exclusions/wrap-flow-003.html diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/wrap-flow-004.html b/tests/wpt/tests/css/css-exclusions/wrap-flow-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/wrap-flow-004.html rename to tests/wpt/tests/css/css-exclusions/wrap-flow-004.html diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/wrap-flow-005.html b/tests/wpt/tests/css/css-exclusions/wrap-flow-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/wrap-flow-005.html rename to tests/wpt/tests/css/css-exclusions/wrap-flow-005.html diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/wrap-flow-006.html b/tests/wpt/tests/css/css-exclusions/wrap-flow-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/wrap-flow-006.html rename to tests/wpt/tests/css/css-exclusions/wrap-flow-006.html diff --git a/tests/wpt/web-platform-tests/css/css-exclusions/wrap-through-001.html b/tests/wpt/tests/css/css-exclusions/wrap-through-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-exclusions/wrap-through-001.html rename to tests/wpt/tests/css/css-exclusions/wrap-through-001.html diff --git a/tests/wpt/web-platform-tests/css/css-fill-stroke/META.yml b/tests/wpt/tests/css/css-fill-stroke/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fill-stroke/META.yml rename to tests/wpt/tests/css/css-fill-stroke/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-fill-stroke/paint-order-001.tentative.html b/tests/wpt/tests/css/css-fill-stroke/paint-order-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fill-stroke/paint-order-001.tentative.html rename to tests/wpt/tests/css/css-fill-stroke/paint-order-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fill-stroke/reference/paint-order-001-ref.tentative.html b/tests/wpt/tests/css/css-fill-stroke/reference/paint-order-001-ref.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fill-stroke/reference/paint-order-001-ref.tentative.html rename to tests/wpt/tests/css/css-fill-stroke/reference/paint-order-001-ref.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/META.yml b/tests/wpt/tests/css/css-flexbox/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/META.yml rename to tests/wpt/tests/css/css-flexbox/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-htb-ltr.html b/tests/wpt/tests/css/css-flexbox/abspos/abspos-autopos-htb-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-htb-ltr.html rename to tests/wpt/tests/css/css-flexbox/abspos/abspos-autopos-htb-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-htb-rtl.html b/tests/wpt/tests/css/css-flexbox/abspos/abspos-autopos-htb-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-htb-rtl.html rename to tests/wpt/tests/css/css-flexbox/abspos/abspos-autopos-htb-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vlr-ltr.html b/tests/wpt/tests/css/css-flexbox/abspos/abspos-autopos-vlr-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vlr-ltr.html rename to tests/wpt/tests/css/css-flexbox/abspos/abspos-autopos-vlr-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vlr-rtl.html b/tests/wpt/tests/css/css-flexbox/abspos/abspos-autopos-vlr-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vlr-rtl.html rename to tests/wpt/tests/css/css-flexbox/abspos/abspos-autopos-vlr-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vrl-ltr.html b/tests/wpt/tests/css/css-flexbox/abspos/abspos-autopos-vrl-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vrl-ltr.html rename to tests/wpt/tests/css/css-flexbox/abspos/abspos-autopos-vrl-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vrl-rtl.html b/tests/wpt/tests/css/css-flexbox/abspos/abspos-autopos-vrl-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-autopos-vrl-rtl.html rename to tests/wpt/tests/css/css-flexbox/abspos/abspos-autopos-vrl-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-descendent-001.html b/tests/wpt/tests/css/css-flexbox/abspos/abspos-descendent-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/abspos-descendent-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/abspos-descendent-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/dynamic-align-self-001.html b/tests/wpt/tests/css/css-flexbox/abspos/dynamic-align-self-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/dynamic-align-self-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/dynamic-align-self-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001-ref.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001-ref.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-safe-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001-ref.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001-ref.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-fallback-justify-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-rtl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-vertWM-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001-ref.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001-ref.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-justify-self-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001-ref.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001-ref.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002-ref.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002-ref.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-003-ref.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-003-ref.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-003.html b/tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-003.html rename to tests/wpt/tests/css/css-flexbox/abspos/flex-abspos-staticpos-margin-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-001-ref.html b/tests/wpt/tests/css/css-flexbox/abspos/flexbox-abspos-child-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-001-ref.html rename to tests/wpt/tests/css/css-flexbox/abspos/flexbox-abspos-child-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-001a.html b/tests/wpt/tests/css/css-flexbox/abspos/flexbox-abspos-child-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-001a.html rename to tests/wpt/tests/css/css-flexbox/abspos/flexbox-abspos-child-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-001b.html b/tests/wpt/tests/css/css-flexbox/abspos/flexbox-abspos-child-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-001b.html rename to tests/wpt/tests/css/css-flexbox/abspos/flexbox-abspos-child-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-002-ref.html b/tests/wpt/tests/css/css-flexbox/abspos/flexbox-abspos-child-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-002-ref.html rename to tests/wpt/tests/css/css-flexbox/abspos/flexbox-abspos-child-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-002.html b/tests/wpt/tests/css/css-flexbox/abspos/flexbox-abspos-child-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox-abspos-child-002.html rename to tests/wpt/tests/css/css-flexbox/abspos/flexbox-abspos-child-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox_absolute-atomic-ref.html b/tests/wpt/tests/css/css-flexbox/abspos/flexbox_absolute-atomic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox_absolute-atomic-ref.html rename to tests/wpt/tests/css/css-flexbox/abspos/flexbox_absolute-atomic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox_absolute-atomic.html b/tests/wpt/tests/css/css-flexbox/abspos/flexbox_absolute-atomic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox_absolute-atomic.html rename to tests/wpt/tests/css/css-flexbox/abspos/flexbox_absolute-atomic.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox_inline-abspos.html b/tests/wpt/tests/css/css-flexbox/abspos/flexbox_inline-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/flexbox_inline-abspos.html rename to tests/wpt/tests/css/css-flexbox/abspos/flexbox_inline-abspos.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-001.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-002.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-002.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-003.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-003.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-004.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-004.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-005-ref.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-005-ref.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-005.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-005.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-006.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-006.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-007.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-007.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-008.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-008.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-009.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-009.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-009.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-010.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-010.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-010.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-011.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-011.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-011.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-012.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-012.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-012.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-013.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-013.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-013.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-014.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-014.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-014.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-015.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-015.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-015.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-001-ref.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-containing-block-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-001-ref.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-containing-block-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-001.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-containing-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-001.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-containing-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-002-ref.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-containing-block-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-002-ref.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-containing-block-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-002.html b/tests/wpt/tests/css/css-flexbox/abspos/position-absolute-containing-block-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/abspos/position-absolute-containing-block-002.html rename to tests/wpt/tests/css/css-flexbox/abspos/position-absolute-containing-block-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-baseline.html b/tests/wpt/tests/css/css-flexbox/align-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-baseline.html rename to tests/wpt/tests/css/css-flexbox/align-baseline.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-001.htm b/tests/wpt/tests/css/css-flexbox/align-content-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-001.htm rename to tests/wpt/tests/css/css-flexbox/align-content-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-002.htm b/tests/wpt/tests/css/css-flexbox/align-content-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-002.htm rename to tests/wpt/tests/css/css-flexbox/align-content-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-003.htm b/tests/wpt/tests/css/css-flexbox/align-content-003.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-003.htm rename to tests/wpt/tests/css/css-flexbox/align-content-003.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-004.htm b/tests/wpt/tests/css/css-flexbox/align-content-004.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-004.htm rename to tests/wpt/tests/css/css-flexbox/align-content-004.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-005.htm b/tests/wpt/tests/css/css-flexbox/align-content-005.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-005.htm rename to tests/wpt/tests/css/css-flexbox/align-content-005.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-006.htm b/tests/wpt/tests/css/css-flexbox/align-content-006.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-006.htm rename to tests/wpt/tests/css/css-flexbox/align-content-006.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-horiz-001a.html b/tests/wpt/tests/css/css-flexbox/align-content-horiz-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-horiz-001a.html rename to tests/wpt/tests/css/css-flexbox/align-content-horiz-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-horiz-001b.html b/tests/wpt/tests/css/css-flexbox/align-content-horiz-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-horiz-001b.html rename to tests/wpt/tests/css/css-flexbox/align-content-horiz-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-horiz-002.html b/tests/wpt/tests/css/css-flexbox/align-content-horiz-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-horiz-002.html rename to tests/wpt/tests/css/css-flexbox/align-content-horiz-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-vert-001a.html b/tests/wpt/tests/css/css-flexbox/align-content-vert-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-vert-001a.html rename to tests/wpt/tests/css/css-flexbox/align-content-vert-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-vert-001b.html b/tests/wpt/tests/css/css-flexbox/align-content-vert-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-vert-001b.html rename to tests/wpt/tests/css/css-flexbox/align-content-vert-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-vert-002.html b/tests/wpt/tests/css/css-flexbox/align-content-vert-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-vert-002.html rename to tests/wpt/tests/css/css-flexbox/align-content-vert-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-wmvert-001.html b/tests/wpt/tests/css/css-flexbox/align-content-wmvert-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-wmvert-001.html rename to tests/wpt/tests/css/css-flexbox/align-content-wmvert-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-wrap-001.html b/tests/wpt/tests/css/css-flexbox/align-content-wrap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-wrap-001.html rename to tests/wpt/tests/css/css-flexbox/align-content-wrap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-wrap-002.html b/tests/wpt/tests/css/css-flexbox/align-content-wrap-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-wrap-002.html rename to tests/wpt/tests/css/css-flexbox/align-content-wrap-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-wrap-003.html b/tests/wpt/tests/css/css-flexbox/align-content-wrap-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-wrap-003.html rename to tests/wpt/tests/css/css-flexbox/align-content-wrap-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-wrap-004.html b/tests/wpt/tests/css/css-flexbox/align-content-wrap-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-wrap-004.html rename to tests/wpt/tests/css/css-flexbox/align-content-wrap-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content-wrap-005.html b/tests/wpt/tests/css/css-flexbox/align-content-wrap-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content-wrap-005.html rename to tests/wpt/tests/css/css-flexbox/align-content-wrap-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content_center.html b/tests/wpt/tests/css/css-flexbox/align-content_center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content_center.html rename to tests/wpt/tests/css/css-flexbox/align-content_center.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content_flex-end.html b/tests/wpt/tests/css/css-flexbox/align-content_flex-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content_flex-end.html rename to tests/wpt/tests/css/css-flexbox/align-content_flex-end.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content_flex-start.html b/tests/wpt/tests/css/css-flexbox/align-content_flex-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content_flex-start.html rename to tests/wpt/tests/css/css-flexbox/align-content_flex-start.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content_space-around.html b/tests/wpt/tests/css/css-flexbox/align-content_space-around.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content_space-around.html rename to tests/wpt/tests/css/css-flexbox/align-content_space-around.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content_space-between.html b/tests/wpt/tests/css/css-flexbox/align-content_space-between.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content_space-between.html rename to tests/wpt/tests/css/css-flexbox/align-content_space-between.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-content_stretch.html b/tests/wpt/tests/css/css-flexbox/align-content_stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-content_stretch.html rename to tests/wpt/tests/css/css-flexbox/align-content_stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-001.htm b/tests/wpt/tests/css/css-flexbox/align-items-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-001.htm rename to tests/wpt/tests/css/css-flexbox/align-items-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-002.htm b/tests/wpt/tests/css/css-flexbox/align-items-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-002.htm rename to tests/wpt/tests/css/css-flexbox/align-items-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-003.htm b/tests/wpt/tests/css/css-flexbox/align-items-003.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-003.htm rename to tests/wpt/tests/css/css-flexbox/align-items-003.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-004.htm b/tests/wpt/tests/css/css-flexbox/align-items-004.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-004.htm rename to tests/wpt/tests/css/css-flexbox/align-items-004.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-005.htm b/tests/wpt/tests/css/css-flexbox/align-items-005.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-005.htm rename to tests/wpt/tests/css/css-flexbox/align-items-005.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-006.html b/tests/wpt/tests/css/css-flexbox/align-items-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-006.html rename to tests/wpt/tests/css/css-flexbox/align-items-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-007.html b/tests/wpt/tests/css/css-flexbox/align-items-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-007.html rename to tests/wpt/tests/css/css-flexbox/align-items-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-008.html b/tests/wpt/tests/css/css-flexbox/align-items-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-008.html rename to tests/wpt/tests/css/css-flexbox/align-items-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-009.html b/tests/wpt/tests/css/css-flexbox/align-items-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-009.html rename to tests/wpt/tests/css/css-flexbox/align-items-009.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-horz-ref.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-column-horz-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-horz-ref.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-column-horz-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-horz.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-column-horz.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-horz.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-column-horz.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-lr-flexbox-item.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-lr-flexbox-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-lr-flexbox-item.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-lr-flexbox-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-lr-grid-item.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-lr-grid-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-lr-grid-item.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-lr-grid-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-lr-items.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-lr-items.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-lr-items.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-lr-items.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-lr-table-item.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-lr-table-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-lr-table-item.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-lr-table-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-ref.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-ref.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-rl-flexbox-item.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-rl-flexbox-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-rl-flexbox-item.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-rl-flexbox-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-rl-grid-item.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-rl-grid-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-rl-grid-item.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-rl-grid-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-rl-items.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-rl-items.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-rl-items.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-rl-items.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-rl-table-item.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-rl-table-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert-rl-table-item.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert-rl-table-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-column-vert.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-column-vert.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-overflow-non-visible.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-overflow-non-visible.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-overflow-non-visible.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-overflow-non-visible.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-row-horz-ref.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-row-horz-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-row-horz-ref.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-row-horz-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-row-horz.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-row-horz.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-row-horz.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-row-horz.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-row-vert-ref.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-row-vert-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-row-vert-ref.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-row-vert-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-row-vert.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-row-vert.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-row-vert.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-row-vert.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-flexbox-item.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-flexbox-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-flexbox-item.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-flexbox-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-grid-item.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-grid-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-grid-item.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-grid-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-items.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-items.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-items.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-items.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-table-item.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-table-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-table-item.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-lr-column-horz-table-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-flexbox-item.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-flexbox-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-flexbox-item.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-flexbox-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-grid-item.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-grid-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-grid-item.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-grid-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-items.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-items.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-items.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-items.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-table-item.html b/tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-table-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-table-item.html rename to tests/wpt/tests/css/css-flexbox/align-items-baseline-vert-rl-column-horz-table-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-001.html b/tests/wpt/tests/css/css-flexbox/align-self-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-001.html rename to tests/wpt/tests/css/css-flexbox/align-self-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-002.html b/tests/wpt/tests/css/css-flexbox/align-self-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-002.html rename to tests/wpt/tests/css/css-flexbox/align-self-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-003.html b/tests/wpt/tests/css/css-flexbox/align-self-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-003.html rename to tests/wpt/tests/css/css-flexbox/align-self-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-004.html b/tests/wpt/tests/css/css-flexbox/align-self-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-004.html rename to tests/wpt/tests/css/css-flexbox/align-self-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-005.html b/tests/wpt/tests/css/css-flexbox/align-self-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-005.html rename to tests/wpt/tests/css/css-flexbox/align-self-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-006.html b/tests/wpt/tests/css/css-flexbox/align-self-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-006.html rename to tests/wpt/tests/css/css-flexbox/align-self-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-007.html b/tests/wpt/tests/css/css-flexbox/align-self-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-007.html rename to tests/wpt/tests/css/css-flexbox/align-self-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-008.html b/tests/wpt/tests/css/css-flexbox/align-self-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-008.html rename to tests/wpt/tests/css/css-flexbox/align-self-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-009.html b/tests/wpt/tests/css/css-flexbox/align-self-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-009.html rename to tests/wpt/tests/css/css-flexbox/align-self-009.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-010.html b/tests/wpt/tests/css/css-flexbox/align-self-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-010.html rename to tests/wpt/tests/css/css-flexbox/align-self-010.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-011.html b/tests/wpt/tests/css/css-flexbox/align-self-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-011.html rename to tests/wpt/tests/css/css-flexbox/align-self-011.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-012.html b/tests/wpt/tests/css/css-flexbox/align-self-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-012.html rename to tests/wpt/tests/css/css-flexbox/align-self-012.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-013.html b/tests/wpt/tests/css/css-flexbox/align-self-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-013.html rename to tests/wpt/tests/css/css-flexbox/align-self-013.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-014.html b/tests/wpt/tests/css/css-flexbox/align-self-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-014.html rename to tests/wpt/tests/css/css-flexbox/align-self-014.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/align-self-015.html b/tests/wpt/tests/css/css-flexbox/align-self-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/align-self-015.html rename to tests/wpt/tests/css/css-flexbox/align-self-015.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-001.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-001.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-002.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-002.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-003.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-003.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-004.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-004.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-005.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-005.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-006.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-006.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-007.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-007.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-fieldset-001.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-fieldset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-fieldset-001.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-fieldset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-fieldset-002.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-fieldset-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-fieldset-002.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-fieldset-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-fieldset-003.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-fieldset-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-fieldset-003.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-fieldset-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-flex-001.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-flex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-flex-001.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-flex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-flex-002.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-flex-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-flex-002.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-flex-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-flex-003.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-flex-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-flex-003.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-flex-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-flex-004.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-flex-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-flex-004.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-flex-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-grid-001.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-grid-001.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-grid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-grid-002.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-grid-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-grid-002.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-grid-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-grid-003.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-grid-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-grid-003.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-grid-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-line-clamp-001.tentative.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-line-clamp-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-line-clamp-001.tentative.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-line-clamp-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-line-clamp-002.tentative.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-line-clamp-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-line-clamp-002.tentative.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-line-clamp-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-line-clamp-003.tentative.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-line-clamp-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-line-clamp-003.tentative.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-line-clamp-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-multicol-001.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-multicol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-multicol-001.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-multicol-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-multicol-002.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-multicol-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-multicol-002.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-multicol-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-multicol-003.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-multicol-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-multicol-003.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-multicol-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-overflow-001.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-overflow-001.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-overflow-002.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-overflow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-overflow-002.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-overflow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-overflow-003.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-overflow-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-overflow-003.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-overflow-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-table-001.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-table-001.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-table-002.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-table-002.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-table-003.html b/tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/alignment/flex-align-baseline-table-003.html rename to tests/wpt/tests/css/css-flexbox/alignment/flex-align-baseline-table-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/animation/discrete-no-interpolation.html b/tests/wpt/tests/css/css-flexbox/animation/discrete-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/animation/discrete-no-interpolation.html rename to tests/wpt/tests/css/css-flexbox/animation/discrete-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/animation/flex-basis-composition.html b/tests/wpt/tests/css/css-flexbox/animation/flex-basis-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/animation/flex-basis-composition.html rename to tests/wpt/tests/css/css-flexbox/animation/flex-basis-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/animation/flex-basis-interpolation.html b/tests/wpt/tests/css/css-flexbox/animation/flex-basis-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/animation/flex-basis-interpolation.html rename to tests/wpt/tests/css/css-flexbox/animation/flex-basis-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/animation/flex-grow-interpolation.html b/tests/wpt/tests/css/css-flexbox/animation/flex-grow-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/animation/flex-grow-interpolation.html rename to tests/wpt/tests/css/css-flexbox/animation/flex-grow-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/animation/flex-shrink-interpolation.html b/tests/wpt/tests/css/css-flexbox/animation/flex-shrink-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/animation/flex-shrink-interpolation.html rename to tests/wpt/tests/css/css-flexbox/animation/flex-shrink-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/animation/order-interpolation.html b/tests/wpt/tests/css/css-flexbox/animation/order-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/animation/order-interpolation.html rename to tests/wpt/tests/css/css-flexbox/animation/order-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/anonymous-block.html b/tests/wpt/tests/css/css-flexbox/anonymous-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/anonymous-block.html rename to tests/wpt/tests/css/css-flexbox/anonymous-block.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/anonymous-flex-item-001.html b/tests/wpt/tests/css/css-flexbox/anonymous-flex-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/anonymous-flex-item-001.html rename to tests/wpt/tests/css/css-flexbox/anonymous-flex-item-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/anonymous-flex-item-002.html b/tests/wpt/tests/css/css-flexbox/anonymous-flex-item-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/anonymous-flex-item-002.html rename to tests/wpt/tests/css/css-flexbox/anonymous-flex-item-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/anonymous-flex-item-003.html b/tests/wpt/tests/css/css-flexbox/anonymous-flex-item-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/anonymous-flex-item-003.html rename to tests/wpt/tests/css/css-flexbox/anonymous-flex-item-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/anonymous-flex-item-004.html b/tests/wpt/tests/css/css-flexbox/anonymous-flex-item-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/anonymous-flex-item-004.html rename to tests/wpt/tests/css/css-flexbox/anonymous-flex-item-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/anonymous-flex-item-005.html b/tests/wpt/tests/css/css-flexbox/anonymous-flex-item-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/anonymous-flex-item-005.html rename to tests/wpt/tests/css/css-flexbox/anonymous-flex-item-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/anonymous-flex-item-006.html b/tests/wpt/tests/css/css-flexbox/anonymous-flex-item-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/anonymous-flex-item-006.html rename to tests/wpt/tests/css/css-flexbox/anonymous-flex-item-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/anonymous-flex-item-split-ref.html b/tests/wpt/tests/css/css-flexbox/anonymous-flex-item-split-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/anonymous-flex-item-split-ref.html rename to tests/wpt/tests/css/css-flexbox/anonymous-flex-item-split-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-001.html b/tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-001.html rename to tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-002.html b/tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-002.html rename to tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-003.html b/tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-003.html rename to tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-004.html b/tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-004.html rename to tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-005.html b/tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-005.html rename to tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-006.html b/tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-006.html rename to tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-007-ref.html b/tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-007-ref.html rename to tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-007.html b/tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/aspect-ratio-intrinsic-size-007.html rename to tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/auto-height-column-with-border-and-padding.html b/tests/wpt/tests/css/css-flexbox/auto-height-column-with-border-and-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/auto-height-column-with-border-and-padding.html rename to tests/wpt/tests/css/css-flexbox/auto-height-column-with-border-and-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/auto-height-with-flex.html b/tests/wpt/tests/css/css-flexbox/auto-height-with-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/auto-height-with-flex.html rename to tests/wpt/tests/css/css-flexbox/auto-height-with-flex.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-001-ref.html b/tests/wpt/tests/css/css-flexbox/auto-margins-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-001-ref.html rename to tests/wpt/tests/css/css-flexbox/auto-margins-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-001.html b/tests/wpt/tests/css/css-flexbox/auto-margins-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-001.html rename to tests/wpt/tests/css/css-flexbox/auto-margins-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-002.html b/tests/wpt/tests/css/css-flexbox/auto-margins-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-002.html rename to tests/wpt/tests/css/css-flexbox/auto-margins-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-003.html b/tests/wpt/tests/css/css-flexbox/auto-margins-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-003.html rename to tests/wpt/tests/css/css-flexbox/auto-margins-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/baseline-synthesis-001.html b/tests/wpt/tests/css/css-flexbox/baseline-synthesis-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/baseline-synthesis-001.html rename to tests/wpt/tests/css/css-flexbox/baseline-synthesis-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/baseline-synthesis-002.html b/tests/wpt/tests/css/css-flexbox/baseline-synthesis-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/baseline-synthesis-002.html rename to tests/wpt/tests/css/css-flexbox/baseline-synthesis-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/baseline-synthesis-003.html b/tests/wpt/tests/css/css-flexbox/baseline-synthesis-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/baseline-synthesis-003.html rename to tests/wpt/tests/css/css-flexbox/baseline-synthesis-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/baseline-synthesis-004.html b/tests/wpt/tests/css/css-flexbox/baseline-synthesis-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/baseline-synthesis-004.html rename to tests/wpt/tests/css/css-flexbox/baseline-synthesis-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/box-sizing-001.html b/tests/wpt/tests/css/css-flexbox/box-sizing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/box-sizing-001.html rename to tests/wpt/tests/css/css-flexbox/box-sizing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/box-sizing-min-max-sizes-001.html b/tests/wpt/tests/css/css-flexbox/box-sizing-min-max-sizes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/box-sizing-min-max-sizes-001.html rename to tests/wpt/tests/css/css-flexbox/box-sizing-min-max-sizes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-001-print.html b/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-001-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-001-print.html rename to tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-001-print.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-002-print.html b/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-002-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-002-print.html rename to tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-002-print.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-print-ref.html b/tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-print-ref.html rename to tests/wpt/tests/css/css-flexbox/break-nested-float-in-flex-item-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/canvas-contain-size.html b/tests/wpt/tests/css/css-flexbox/canvas-contain-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/canvas-contain-size.html rename to tests/wpt/tests/css/css-flexbox/canvas-contain-size.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/canvas-dynamic-change-001.html b/tests/wpt/tests/css/css-flexbox/canvas-dynamic-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/canvas-dynamic-change-001.html rename to tests/wpt/tests/css/css-flexbox/canvas-dynamic-change-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/change-column-flex-width.html b/tests/wpt/tests/css/css-flexbox/change-column-flex-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/change-column-flex-width.html rename to tests/wpt/tests/css/css-flexbox/change-column-flex-width.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/column-flex-child-with-overflow-scroll.html b/tests/wpt/tests/css/css-flexbox/column-flex-child-with-overflow-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/column-flex-child-with-overflow-scroll.html rename to tests/wpt/tests/css/css-flexbox/column-flex-child-with-overflow-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/column-intrinsic-size-aspect-ratio-crash.html b/tests/wpt/tests/css/css-flexbox/column-intrinsic-size-aspect-ratio-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/column-intrinsic-size-aspect-ratio-crash.html rename to tests/wpt/tests/css/css-flexbox/column-intrinsic-size-aspect-ratio-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/column-reverse-gap.html b/tests/wpt/tests/css/css-flexbox/column-reverse-gap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/column-reverse-gap.html rename to tests/wpt/tests/css/css-flexbox/column-reverse-gap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/columns-height-set-via-top-bottom.html b/tests/wpt/tests/css/css-flexbox/columns-height-set-via-top-bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/columns-height-set-via-top-bottom.html rename to tests/wpt/tests/css/css-flexbox/columns-height-set-via-top-bottom.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/contain-size-layout-abspos-flex-container-crash.html b/tests/wpt/tests/css/css-flexbox/contain-size-layout-abspos-flex-container-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/contain-size-layout-abspos-flex-container-crash.html rename to tests/wpt/tests/css/css-flexbox/contain-size-layout-abspos-flex-container-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/content-height-with-scrollbars.html b/tests/wpt/tests/css/css-flexbox/content-height-with-scrollbars.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/content-height-with-scrollbars.html rename to tests/wpt/tests/css/css-flexbox/content-height-with-scrollbars.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/cross-axis-scrollbar.html b/tests/wpt/tests/css/css-flexbox/cross-axis-scrollbar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/cross-axis-scrollbar.html rename to tests/wpt/tests/css/css-flexbox/cross-axis-scrollbar.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-box-justify-content.html b/tests/wpt/tests/css/css-flexbox/css-box-justify-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/css-box-justify-content.html rename to tests/wpt/tests/css/css-flexbox/css-box-justify-content.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-height-animation-stretch-ref.html b/tests/wpt/tests/css/css-flexbox/css-flexbox-height-animation-stretch-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-height-animation-stretch-ref.html rename to tests/wpt/tests/css/css-flexbox/css-flexbox-height-animation-stretch-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-height-animation-stretch.html b/tests/wpt/tests/css/css-flexbox/css-flexbox-height-animation-stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-height-animation-stretch.html rename to tests/wpt/tests/css/css-flexbox/css-flexbox-height-animation-stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-img-expand-evenly.html b/tests/wpt/tests/css/css-flexbox/css-flexbox-img-expand-evenly.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-img-expand-evenly.html rename to tests/wpt/tests/css/css-flexbox/css-flexbox-img-expand-evenly.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-row-ref.html b/tests/wpt/tests/css/css-flexbox/css-flexbox-row-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-row-ref.html rename to tests/wpt/tests/css/css-flexbox/css-flexbox-row-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-row-reverse-wrap-reverse.html b/tests/wpt/tests/css/css-flexbox/css-flexbox-row-reverse-wrap-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-row-reverse-wrap-reverse.html rename to tests/wpt/tests/css/css-flexbox/css-flexbox-row-reverse-wrap-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-row-reverse-wrap.html b/tests/wpt/tests/css/css-flexbox/css-flexbox-row-reverse-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-row-reverse-wrap.html rename to tests/wpt/tests/css/css-flexbox/css-flexbox-row-reverse-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-row-reverse.html b/tests/wpt/tests/css/css-flexbox/css-flexbox-row-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-row-reverse.html rename to tests/wpt/tests/css/css-flexbox/css-flexbox-row-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-row-wrap-reverse.html b/tests/wpt/tests/css/css-flexbox/css-flexbox-row-wrap-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-row-wrap-reverse.html rename to tests/wpt/tests/css/css-flexbox/css-flexbox-row-wrap-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-row-wrap.html b/tests/wpt/tests/css/css-flexbox/css-flexbox-row-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-row-wrap.html rename to tests/wpt/tests/css/css-flexbox/css-flexbox-row-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-row.html b/tests/wpt/tests/css/css-flexbox/css-flexbox-row.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-row.html rename to tests/wpt/tests/css/css-flexbox/css-flexbox-row.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-test1-ref.html b/tests/wpt/tests/css/css-flexbox/css-flexbox-test1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-test1-ref.html rename to tests/wpt/tests/css/css-flexbox/css-flexbox-test1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-test1.html b/tests/wpt/tests/css/css-flexbox/css-flexbox-test1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/css-flexbox-test1.html rename to tests/wpt/tests/css/css-flexbox/css-flexbox-test1.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/display-flex-001.htm b/tests/wpt/tests/css/css-flexbox/display-flex-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/display-flex-001.htm rename to tests/wpt/tests/css/css-flexbox/display-flex-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-baseline-change-nested.html b/tests/wpt/tests/css/css-flexbox/dynamic-baseline-change-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-baseline-change-nested.html rename to tests/wpt/tests/css/css-flexbox/dynamic-baseline-change-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-baseline-change-ref.html b/tests/wpt/tests/css/css-flexbox/dynamic-baseline-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-baseline-change-ref.html rename to tests/wpt/tests/css/css-flexbox/dynamic-baseline-change-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-baseline-change.html b/tests/wpt/tests/css/css-flexbox/dynamic-baseline-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-baseline-change.html rename to tests/wpt/tests/css/css-flexbox/dynamic-baseline-change.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-bsize-change-ref.html b/tests/wpt/tests/css/css-flexbox/dynamic-bsize-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-bsize-change-ref.html rename to tests/wpt/tests/css/css-flexbox/dynamic-bsize-change-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-bsize-change.html b/tests/wpt/tests/css/css-flexbox/dynamic-bsize-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-bsize-change.html rename to tests/wpt/tests/css/css-flexbox/dynamic-bsize-change.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-change-simplified-layout-002.html b/tests/wpt/tests/css/css-flexbox/dynamic-change-simplified-layout-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-change-simplified-layout-002.html rename to tests/wpt/tests/css/css-flexbox/dynamic-change-simplified-layout-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-change-simplified-layout.html b/tests/wpt/tests/css/css-flexbox/dynamic-change-simplified-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-change-simplified-layout.html rename to tests/wpt/tests/css/css-flexbox/dynamic-change-simplified-layout.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-grid-flex-abspos.html b/tests/wpt/tests/css/css-flexbox/dynamic-grid-flex-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-grid-flex-abspos.html rename to tests/wpt/tests/css/css-flexbox/dynamic-grid-flex-abspos.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-isize-change-001-ref.html b/tests/wpt/tests/css/css-flexbox/dynamic-isize-change-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-isize-change-001-ref.html rename to tests/wpt/tests/css/css-flexbox/dynamic-isize-change-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-isize-change-001.html b/tests/wpt/tests/css/css-flexbox/dynamic-isize-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-isize-change-001.html rename to tests/wpt/tests/css/css-flexbox/dynamic-isize-change-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-isize-change-002.html b/tests/wpt/tests/css/css-flexbox/dynamic-isize-change-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-isize-change-002.html rename to tests/wpt/tests/css/css-flexbox/dynamic-isize-change-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-isize-change-003.html b/tests/wpt/tests/css/css-flexbox/dynamic-isize-change-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-isize-change-003.html rename to tests/wpt/tests/css/css-flexbox/dynamic-isize-change-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-isize-change-004.html b/tests/wpt/tests/css/css-flexbox/dynamic-isize-change-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-isize-change-004.html rename to tests/wpt/tests/css/css-flexbox/dynamic-isize-change-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-orthogonal-flex-item.html b/tests/wpt/tests/css/css-flexbox/dynamic-orthogonal-flex-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-orthogonal-flex-item.html rename to tests/wpt/tests/css/css-flexbox/dynamic-orthogonal-flex-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/dynamic-stretch-change.html b/tests/wpt/tests/css/css-flexbox/dynamic-stretch-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/dynamic-stretch-change.html rename to tests/wpt/tests/css/css-flexbox/dynamic-stretch-change.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/fieldset-as-container-justify-center.tentative.html b/tests/wpt/tests/css/css-flexbox/fieldset-as-container-justify-center.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/fieldset-as-container-justify-center.tentative.html rename to tests/wpt/tests/css/css-flexbox/fieldset-as-container-justify-center.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/fieldset-as-item-dynamic.html b/tests/wpt/tests/css/css-flexbox/fieldset-as-item-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/fieldset-as-item-dynamic.html rename to tests/wpt/tests/css/css-flexbox/fieldset-as-item-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/fieldset-as-item-overflow-ref.html b/tests/wpt/tests/css/css-flexbox/fieldset-as-item-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/fieldset-as-item-overflow-ref.html rename to tests/wpt/tests/css/css-flexbox/fieldset-as-item-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/fieldset-as-item-overflow.html b/tests/wpt/tests/css/css-flexbox/fieldset-as-item-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/fieldset-as-item-overflow.html rename to tests/wpt/tests/css/css-flexbox/fieldset-as-item-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/fieldset-baseline-alignment-ref.html b/tests/wpt/tests/css/css-flexbox/fieldset-baseline-alignment-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/fieldset-baseline-alignment-ref.html rename to tests/wpt/tests/css/css-flexbox/fieldset-baseline-alignment-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/fieldset-baseline-alignment.html b/tests/wpt/tests/css/css-flexbox/fieldset-baseline-alignment.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/fieldset-baseline-alignment.html rename to tests/wpt/tests/css/css-flexbox/fieldset-baseline-alignment.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/fit-content-item-001.html b/tests/wpt/tests/css/css-flexbox/fit-content-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/fit-content-item-001.html rename to tests/wpt/tests/css/css-flexbox/fit-content-item-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/fit-content-item-002.html b/tests/wpt/tests/css/css-flexbox/fit-content-item-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/fit-content-item-002.html rename to tests/wpt/tests/css/css-flexbox/fit-content-item-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/fit-content-item-003.html b/tests/wpt/tests/css/css-flexbox/fit-content-item-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/fit-content-item-003.html rename to tests/wpt/tests/css/css-flexbox/fit-content-item-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/fit-content-item-004.html b/tests/wpt/tests/css/css-flexbox/fit-content-item-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/fit-content-item-004.html rename to tests/wpt/tests/css/css-flexbox/fit-content-item-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/fixed-table-layout-with-percentage-width-in-flex-item-ref.html b/tests/wpt/tests/css/css-flexbox/fixed-table-layout-with-percentage-width-in-flex-item-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/fixed-table-layout-with-percentage-width-in-flex-item-ref.html rename to tests/wpt/tests/css/css-flexbox/fixed-table-layout-with-percentage-width-in-flex-item-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/fixed-table-layout-with-percentage-width-in-flex-item.html b/tests/wpt/tests/css/css-flexbox/fixed-table-layout-with-percentage-width-in-flex-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/fixed-table-layout-with-percentage-width-in-flex-item.html rename to tests/wpt/tests/css/css-flexbox/fixed-table-layout-with-percentage-width-in-flex-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/fixedpos-video-in-abspos-quirk-crash.html b/tests/wpt/tests/css/css-flexbox/fixedpos-video-in-abspos-quirk-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/fixedpos-video-in-abspos-quirk-crash.html rename to tests/wpt/tests/css/css-flexbox/fixedpos-video-in-abspos-quirk-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-001.htm b/tests/wpt/tests/css/css-flexbox/flex-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-001.htm rename to tests/wpt/tests/css/css-flexbox/flex-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-002.htm b/tests/wpt/tests/css/css-flexbox/flex-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-002.htm rename to tests/wpt/tests/css/css-flexbox/flex-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-003.htm b/tests/wpt/tests/css/css-flexbox/flex-003.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-003.htm rename to tests/wpt/tests/css/css-flexbox/flex-003.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-004.htm b/tests/wpt/tests/css/css-flexbox/flex-004.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-004.htm rename to tests/wpt/tests/css/css-flexbox/flex-004.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-align-content-center.html b/tests/wpt/tests/css/css-flexbox/flex-align-content-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-align-content-center.html rename to tests/wpt/tests/css/css-flexbox/flex-align-content-center.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-align-content-end.html b/tests/wpt/tests/css/css-flexbox/flex-align-content-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-align-content-end.html rename to tests/wpt/tests/css/css-flexbox/flex-align-content-end.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-align-content-space-around.html b/tests/wpt/tests/css/css-flexbox/flex-align-content-space-around.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-align-content-space-around.html rename to tests/wpt/tests/css/css-flexbox/flex-align-content-space-around.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-align-content-space-between.html b/tests/wpt/tests/css/css-flexbox/flex-align-content-space-between.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-align-content-space-between.html rename to tests/wpt/tests/css/css-flexbox/flex-align-content-space-between.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-align-content-start.html b/tests/wpt/tests/css/css-flexbox/flex-align-content-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-align-content-start.html rename to tests/wpt/tests/css/css-flexbox/flex-align-content-start.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-001.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-001.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-002.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-002.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-003.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-003.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-004.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-004.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-005.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-005.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-006.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-006.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-007.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-007.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-008.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-008.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-009.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-009.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-009.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-010.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-010.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-010.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-011.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-011.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-011.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-012.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-012.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-012.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-013.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-013.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-013.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-014.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-014.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-014.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-015.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-015.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-015.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-016.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-016.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-016.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-017.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-017.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-017.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-018.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-column-018.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-column-018.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-001.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-001.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-002.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-002.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-003.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-003.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-004.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-004.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-005.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-005.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-006.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-006.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-007.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-007.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-008.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-008.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-009.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-009.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-009.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-010.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-010.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-010.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-011.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-011.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-011.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-012.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-012.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-012.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-013.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-013.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-013.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-014.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-014.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-014.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-015.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-015.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-015.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-016.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-016.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-016.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-017.html b/tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-017.html rename to tests/wpt/tests/css/css-flexbox/flex-aspect-ratio-img-row-017.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-001.html b/tests/wpt/tests/css/css-flexbox/flex-basis-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-001.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-002.html b/tests/wpt/tests/css/css-flexbox/flex-basis-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-002.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-003.html b/tests/wpt/tests/css/css-flexbox/flex-basis-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-003.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-004.html b/tests/wpt/tests/css/css-flexbox/flex-basis-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-004.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-005.html b/tests/wpt/tests/css/css-flexbox/flex-basis-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-005.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-006.html b/tests/wpt/tests/css/css-flexbox/flex-basis-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-006.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-007.html b/tests/wpt/tests/css/css-flexbox/flex-basis-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-007.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-008.html b/tests/wpt/tests/css/css-flexbox/flex-basis-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-008.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-009.html b/tests/wpt/tests/css/css-flexbox/flex-basis-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-009.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-009.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-010.html b/tests/wpt/tests/css/css-flexbox/flex-basis-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-010.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-010.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-011-ref.html b/tests/wpt/tests/css/css-flexbox/flex-basis-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-011-ref.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-011.html b/tests/wpt/tests/css/css-flexbox/flex-basis-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-011.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-011.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-012.html b/tests/wpt/tests/css/css-flexbox/flex-basis-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-012.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-012.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-intrinsics-001.html b/tests/wpt/tests/css/css-flexbox/flex-basis-intrinsics-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-intrinsics-001.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-intrinsics-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-item-margins-001.html b/tests/wpt/tests/css/css-flexbox/flex-basis-item-margins-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-basis-item-margins-001.html rename to tests/wpt/tests/css/css-flexbox/flex-basis-item-margins-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-box-wrap.html b/tests/wpt/tests/css/css-flexbox/flex-box-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-box-wrap.html rename to tests/wpt/tests/css/css-flexbox/flex-box-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-child-percent-basis-resize-1-ref.html b/tests/wpt/tests/css/css-flexbox/flex-child-percent-basis-resize-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-child-percent-basis-resize-1-ref.html rename to tests/wpt/tests/css/css-flexbox/flex-child-percent-basis-resize-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-child-percent-basis-resize-1.html b/tests/wpt/tests/css/css-flexbox/flex-child-percent-basis-resize-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-child-percent-basis-resize-1.html rename to tests/wpt/tests/css/css-flexbox/flex-child-percent-basis-resize-1.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-column-relayout-assert.html b/tests/wpt/tests/css/css-flexbox/flex-column-relayout-assert.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-column-relayout-assert.html rename to tests/wpt/tests/css/css-flexbox/flex-column-relayout-assert.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-container-margin.html b/tests/wpt/tests/css/css-flexbox/flex-container-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-container-margin.html rename to tests/wpt/tests/css/css-flexbox/flex-container-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-container-max-content-001-ref.html b/tests/wpt/tests/css/css-flexbox/flex-container-max-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-container-max-content-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flex-container-max-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-container-max-content-001.html b/tests/wpt/tests/css/css-flexbox/flex-container-max-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-container-max-content-001.html rename to tests/wpt/tests/css/css-flexbox/flex-container-max-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-container-min-content-001-ref.html b/tests/wpt/tests/css/css-flexbox/flex-container-min-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-container-min-content-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flex-container-min-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-container-min-content-001.html b/tests/wpt/tests/css/css-flexbox/flex-container-min-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-container-min-content-001.html rename to tests/wpt/tests/css/css-flexbox/flex-container-min-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-001-visual.html b/tests/wpt/tests/css/css-flexbox/flex-direction-column-001-visual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-001-visual.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-column-001-visual.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-overlap-001.html b/tests/wpt/tests/css/css-flexbox/flex-direction-column-overlap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-overlap-001.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-column-overlap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-reverse-001-visual.html b/tests/wpt/tests/css/css-flexbox/flex-direction-column-reverse-001-visual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-reverse-001-visual.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-column-reverse-001-visual.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-reverse-002-visual.html b/tests/wpt/tests/css/css-flexbox/flex-direction-column-reverse-002-visual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-reverse-002-visual.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-column-reverse-002-visual.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-reverse.html b/tests/wpt/tests/css/css-flexbox/flex-direction-column-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column-reverse.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-column-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column.html b/tests/wpt/tests/css/css-flexbox/flex-direction-column.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-column.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-column.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-modify.html b/tests/wpt/tests/css/css-flexbox/flex-direction-modify.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-modify.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-modify.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-001-visual.html b/tests/wpt/tests/css/css-flexbox/flex-direction-row-001-visual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-001-visual.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-row-001-visual.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-002-visual.html b/tests/wpt/tests/css/css-flexbox/flex-direction-row-002-visual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-002-visual.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-row-002-visual.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-reverse-001-visual.html b/tests/wpt/tests/css/css-flexbox/flex-direction-row-reverse-001-visual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-reverse-001-visual.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-row-reverse-001-visual.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-reverse-002-visual.html b/tests/wpt/tests/css/css-flexbox/flex-direction-row-reverse-002-visual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-reverse-002-visual.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-row-reverse-002-visual.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-reverse.html b/tests/wpt/tests/css/css-flexbox/flex-direction-row-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-reverse.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-row-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-vertical-ref.html b/tests/wpt/tests/css/css-flexbox/flex-direction-row-vertical-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-vertical-ref.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-row-vertical-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-vertical.html b/tests/wpt/tests/css/css-flexbox/flex-direction-row-vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-row-vertical.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-row-vertical.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-with-element-insert.html b/tests/wpt/tests/css/css-flexbox/flex-direction-with-element-insert.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction-with-element-insert.html rename to tests/wpt/tests/css/css-flexbox/flex-direction-with-element-insert.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-direction.html b/tests/wpt/tests/css/css-flexbox/flex-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-direction.html rename to tests/wpt/tests/css/css-flexbox/flex-direction.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-factor-less-than-one.html b/tests/wpt/tests/css/css-flexbox/flex-factor-less-than-one.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-factor-less-than-one.html rename to tests/wpt/tests/css/css-flexbox/flex-factor-less-than-one.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-001-ref.html b/tests/wpt/tests/css/css-flexbox/flex-flow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-001.html b/tests/wpt/tests/css/css-flexbox/flex-flow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-001.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-002-ref.html b/tests/wpt/tests/css/css-flexbox/flex-flow-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-002.html b/tests/wpt/tests/css/css-flexbox/flex-flow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-002.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-003.html b/tests/wpt/tests/css/css-flexbox/flex-flow-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-003.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-004.html b/tests/wpt/tests/css/css-flexbox/flex-flow-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-004.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-005.html b/tests/wpt/tests/css/css-flexbox/flex-flow-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-005.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-006.html b/tests/wpt/tests/css/css-flexbox/flex-flow-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-006.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-007-ref.html b/tests/wpt/tests/css/css-flexbox/flex-flow-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-007-ref.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-007.html b/tests/wpt/tests/css/css-flexbox/flex-flow-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-007.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-008.html b/tests/wpt/tests/css/css-flexbox/flex-flow-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-008.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-009.html b/tests/wpt/tests/css/css-flexbox/flex-flow-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-009.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-009.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-010.html b/tests/wpt/tests/css/css-flexbox/flex-flow-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-010.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-010.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-011.html b/tests/wpt/tests/css/css-flexbox/flex-flow-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-011.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-011.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-012.html b/tests/wpt/tests/css/css-flexbox/flex-flow-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-012.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-012.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-013.html b/tests/wpt/tests/css/css-flexbox/flex-flow-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-flow-013.html rename to tests/wpt/tests/css/css-flexbox/flex-flow-013.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-001-ref.xht b/tests/wpt/tests/css/css-flexbox/flex-grow-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-001-ref.xht rename to tests/wpt/tests/css/css-flexbox/flex-grow-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-001.xht b/tests/wpt/tests/css/css-flexbox/flex-grow-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-001.xht rename to tests/wpt/tests/css/css-flexbox/flex-grow-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-002.html b/tests/wpt/tests/css/css-flexbox/flex-grow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-002.html rename to tests/wpt/tests/css/css-flexbox/flex-grow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-003.html b/tests/wpt/tests/css/css-flexbox/flex-grow-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-003.html rename to tests/wpt/tests/css/css-flexbox/flex-grow-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-004.html b/tests/wpt/tests/css/css-flexbox/flex-grow-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-004.html rename to tests/wpt/tests/css/css-flexbox/flex-grow-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-005.html b/tests/wpt/tests/css/css-flexbox/flex-grow-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-005.html rename to tests/wpt/tests/css/css-flexbox/flex-grow-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-006.html b/tests/wpt/tests/css/css-flexbox/flex-grow-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-006.html rename to tests/wpt/tests/css/css-flexbox/flex-grow-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-007.html b/tests/wpt/tests/css/css-flexbox/flex-grow-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-007.html rename to tests/wpt/tests/css/css-flexbox/flex-grow-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-008.html b/tests/wpt/tests/css/css-flexbox/flex-grow-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-grow-008.html rename to tests/wpt/tests/css/css-flexbox/flex-grow-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-height-min-content.html b/tests/wpt/tests/css/css-flexbox/flex-height-min-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-height-min-content.html rename to tests/wpt/tests/css/css-flexbox/flex-height-min-content.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-inline.html b/tests/wpt/tests/css/css-flexbox/flex-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-inline.html rename to tests/wpt/tests/css/css-flexbox/flex-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-and-percentage-abspos.html b/tests/wpt/tests/css/css-flexbox/flex-item-and-percentage-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-item-and-percentage-abspos.html rename to tests/wpt/tests/css/css-flexbox/flex-item-and-percentage-abspos.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-compressible-001.html b/tests/wpt/tests/css/css-flexbox/flex-item-compressible-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-item-compressible-001.html rename to tests/wpt/tests/css/css-flexbox/flex-item-compressible-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-compressible-002.html b/tests/wpt/tests/css/css-flexbox/flex-item-compressible-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-item-compressible-002.html rename to tests/wpt/tests/css/css-flexbox/flex-item-compressible-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-contains-size-layout-001.html b/tests/wpt/tests/css/css-flexbox/flex-item-contains-size-layout-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-item-contains-size-layout-001.html rename to tests/wpt/tests/css/css-flexbox/flex-item-contains-size-layout-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-contains-strict.html b/tests/wpt/tests/css/css-flexbox/flex-item-contains-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-item-contains-strict.html rename to tests/wpt/tests/css/css-flexbox/flex-item-contains-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-transferred-sizes-padding-border-sizing.html b/tests/wpt/tests/css/css-flexbox/flex-item-transferred-sizes-padding-border-sizing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-item-transferred-sizes-padding-border-sizing.html rename to tests/wpt/tests/css/css-flexbox/flex-item-transferred-sizes-padding-border-sizing.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-transferred-sizes-padding-content-sizing.html b/tests/wpt/tests/css/css-flexbox/flex-item-transferred-sizes-padding-content-sizing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-item-transferred-sizes-padding-content-sizing.html rename to tests/wpt/tests/css/css-flexbox/flex-item-transferred-sizes-padding-content-sizing.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-vertical-align.html b/tests/wpt/tests/css/css-flexbox/flex-item-vertical-align.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-item-vertical-align.html rename to tests/wpt/tests/css/css-flexbox/flex-item-vertical-align.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-item-z-ordering-001.html b/tests/wpt/tests/css/css-flexbox/flex-item-z-ordering-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-item-z-ordering-001.html rename to tests/wpt/tests/css/css-flexbox/flex-item-z-ordering-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse.html b/tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse.html rename to tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-row-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-row-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-row-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-row-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-row-reverse.html b/tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-row-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-row-reverse.html rename to tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-reverse-row-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse.html b/tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse.html rename to tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-with-row-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-with-row-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-with-row-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-with-row-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-with-row-reverse.html b/tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-with-row-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-lines/multi-line-wrap-with-row-reverse.html rename to tests/wpt/tests/css/css-flexbox/flex-lines/multi-line-wrap-with-row-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-margin-no-collapse.html b/tests/wpt/tests/css/css-flexbox/flex-margin-no-collapse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-margin-no-collapse.html rename to tests/wpt/tests/css/css-flexbox/flex-margin-no-collapse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-001.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-001.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-002.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-002.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-003.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-003.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-004.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-004.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-005.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-005.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-006.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-006.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-007.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-007.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-008.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-008.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-009.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-009.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-009.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-010.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-010.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-010.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-011.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-011.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-012.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-012.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-012.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-013.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-013.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-013.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-014.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-014.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-014.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-015.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-015.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-015.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-016.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-016.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-016.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-017.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-017.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-017.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-018.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-018.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-018.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-019.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-019.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-019.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-020.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-020.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-020.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-021.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-021.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-021.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-022.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-022.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-022.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-023.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-023.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-023.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-024.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-024.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-024.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-025.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-025.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-025.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-026.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-026.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-026.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-027.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-027.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-027.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-028.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-028.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-028.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-029.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-029.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-029.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-030.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-030.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-030.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-031.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-031.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-height-flex-items-031.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-size-001.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-size-001.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-size-002.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-size-002.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-size-003.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-size-003.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-001.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-001.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-002.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-002.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-003.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-003.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-004.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-004.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-005.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-005.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-006.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-006.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-007.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-007.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-008.xht b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-008.xht rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-009.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-009.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-009.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-010.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-010.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-010.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-011.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-011.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-011.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-012.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-012.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-012.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-013.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-013.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-013.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-014.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-014.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-014.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-015.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-015.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-015.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-016.html b/tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-width-flex-items-016.html rename to tests/wpt/tests/css/css-flexbox/flex-minimum-width-flex-items-016.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-one-sets-flex-basis-to-zero-px.html b/tests/wpt/tests/css/css-flexbox/flex-one-sets-flex-basis-to-zero-px.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-one-sets-flex-basis-to-zero-px.html rename to tests/wpt/tests/css/css-flexbox/flex-one-sets-flex-basis-to-zero-px.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-order-ref.html b/tests/wpt/tests/css/css-flexbox/flex-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-order-ref.html rename to tests/wpt/tests/css/css-flexbox/flex-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-order.html b/tests/wpt/tests/css/css-flexbox/flex-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-order.html rename to tests/wpt/tests/css/css-flexbox/flex-order.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-outer-flexbox-column-recalculate-height-on-resize-001.html b/tests/wpt/tests/css/css-flexbox/flex-outer-flexbox-column-recalculate-height-on-resize-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-outer-flexbox-column-recalculate-height-on-resize-001.html rename to tests/wpt/tests/css/css-flexbox/flex-outer-flexbox-column-recalculate-height-on-resize-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-shorthand-flex-basis-middle.html b/tests/wpt/tests/css/css-flexbox/flex-shorthand-flex-basis-middle.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-shorthand-flex-basis-middle.html rename to tests/wpt/tests/css/css-flexbox/flex-shorthand-flex-basis-middle.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-001.html b/tests/wpt/tests/css/css-flexbox/flex-shrink-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-001.html rename to tests/wpt/tests/css/css-flexbox/flex-shrink-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-002.html b/tests/wpt/tests/css/css-flexbox/flex-shrink-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-002.html rename to tests/wpt/tests/css/css-flexbox/flex-shrink-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-003.html b/tests/wpt/tests/css/css-flexbox/flex-shrink-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-003.html rename to tests/wpt/tests/css/css-flexbox/flex-shrink-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-004.html b/tests/wpt/tests/css/css-flexbox/flex-shrink-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-004.html rename to tests/wpt/tests/css/css-flexbox/flex-shrink-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-005.html b/tests/wpt/tests/css/css-flexbox/flex-shrink-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-005.html rename to tests/wpt/tests/css/css-flexbox/flex-shrink-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-006.html b/tests/wpt/tests/css/css-flexbox/flex-shrink-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-006.html rename to tests/wpt/tests/css/css-flexbox/flex-shrink-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-007.html b/tests/wpt/tests/css/css-flexbox/flex-shrink-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-007.html rename to tests/wpt/tests/css/css-flexbox/flex-shrink-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-008.html b/tests/wpt/tests/css/css-flexbox/flex-shrink-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-008.html rename to tests/wpt/tests/css/css-flexbox/flex-shrink-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-large-value-crash.html b/tests/wpt/tests/css/css-flexbox/flex-shrink-large-value-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-shrink-large-value-crash.html rename to tests/wpt/tests/css/css-flexbox/flex-shrink-large-value-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-vertical-align-effect.html b/tests/wpt/tests/css/css-flexbox/flex-vertical-align-effect.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-vertical-align-effect.html rename to tests/wpt/tests/css/css-flexbox/flex-vertical-align-effect.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-002.html b/tests/wpt/tests/css/css-flexbox/flex-wrap-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-002.html rename to tests/wpt/tests/css/css-flexbox/flex-wrap-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-003.html b/tests/wpt/tests/css/css-flexbox/flex-wrap-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-003.html rename to tests/wpt/tests/css/css-flexbox/flex-wrap-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-004.html b/tests/wpt/tests/css/css-flexbox/flex-wrap-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-004.html rename to tests/wpt/tests/css/css-flexbox/flex-wrap-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-005.html b/tests/wpt/tests/css/css-flexbox/flex-wrap-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-005.html rename to tests/wpt/tests/css/css-flexbox/flex-wrap-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-006.html b/tests/wpt/tests/css/css-flexbox/flex-wrap-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-006.html rename to tests/wpt/tests/css/css-flexbox/flex-wrap-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-items-center-nested-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-align-items-center-nested-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-items-center-nested-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-align-items-center-nested-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-items-center-nested-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-align-items-center-nested-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-items-center-nested-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-align-items-center-nested-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-002-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-002-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-002-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-002-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-002.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-002.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-002.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-003-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-003-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-003-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-003-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-004-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-004-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-004-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-004-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-004.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-004.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-004.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-005-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-005-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-005-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-005-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-005.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-005.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-005.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-007-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-007-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-007-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-007-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-008-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-008-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-008-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-008-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-001-block.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-001-block.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-001-block.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-001-block.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-001-table.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-001-table.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-001-table.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-001-table.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-002-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-002-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-002-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-002-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-002.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-002.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-002.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-003-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-003-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-003-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-003-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-003.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-003.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-003.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-004-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-004-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-004-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-004-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-004.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-004.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-004.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-005-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-005-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-005-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-005-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-005.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-005.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-horiz-005.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-stretch-vert-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-stretch-vert-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-stretch-vert-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-stretch-vert-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-stretch-vert-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-stretch-vert-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-stretch-vert-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-stretch-vert-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-002-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-002-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-002-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-002-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-002.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-002.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-002.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-003-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-003-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-003-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-003-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-003.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-003.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-003.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-004-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-004-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-004-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-004-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-004.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-004.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-004.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-002-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-002-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-002-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-002-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-003-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-003-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-003-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-003-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-004-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-004-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-004-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-004-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-005-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-005-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-005-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-005-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-anonymous-items-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-anonymous-items-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-anonymous-items-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-anonymous-items-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-anonymous-items-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-anonymous-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-anonymous-items-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-anonymous-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-empty-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-empty-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001a.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-empty-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-empty-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001b.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-empty-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-empty-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-003-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-003-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-003.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-004-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-004-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-004.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-004.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-vert-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-vert-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-vert-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-vert-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-vert-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-vert-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-vert-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-multi-line-vert-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-nested-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-nested-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-nested-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-nested-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-nested-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-nested-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-nested-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-nested-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-single-item-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-single-item-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-single-item-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-single-item-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-single-item-001a.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-single-item-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-single-item-001a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-single-item-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-single-item-001b.html b/tests/wpt/tests/css/css-flexbox/flexbox-baseline-single-item-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-single-item-001b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-baseline-single-item-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-horiz-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-block-horiz-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-horiz-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-block-horiz-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-horiz-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-block-horiz-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-horiz-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-block-horiz-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-vert-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-block-vert-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-vert-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-block-vert-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-vert-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-block-vert-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-vert-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-block-vert-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-vert-001v.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-block-vert-001v.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-vert-001v.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-block-vert-001v.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-horiz-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-canvas-horiz-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-horiz-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-canvas-horiz-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-horiz-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-canvas-horiz-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-horiz-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-canvas-horiz-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-vert-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-canvas-vert-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-vert-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-canvas-vert-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-vert-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-canvas-vert-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-vert-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-canvas-vert-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-horiz-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-fieldset-horiz-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-horiz-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-fieldset-horiz-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-horiz-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-fieldset-horiz-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-horiz-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-fieldset-horiz-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-vert-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-fieldset-vert-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-vert-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-fieldset-vert-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-vert-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-fieldset-vert-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-vert-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-fieldset-vert-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-horiz-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-iframe-horiz-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-horiz-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-iframe-horiz-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-horiz-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-iframe-horiz-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-horiz-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-iframe-horiz-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-vert-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-iframe-vert-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-vert-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-iframe-vert-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-vert-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-iframe-vert-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-vert-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-iframe-vert-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-horiz-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-img-horiz-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-horiz-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-img-horiz-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-horiz-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-img-horiz-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-horiz-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-img-horiz-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-vert-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-img-vert-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-vert-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-img-vert-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-vert-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-img-vert-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-vert-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-img-vert-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-horiz-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-textarea-horiz-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-horiz-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-textarea-horiz-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-horiz-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-textarea-horiz-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-horiz-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-textarea-horiz-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-vert-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-textarea-vert-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-vert-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-textarea-vert-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-vert-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-textarea-vert-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-vert-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-textarea-vert-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-horiz-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-video-horiz-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-horiz-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-video-horiz-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-horiz-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-video-horiz-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-horiz-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-video-horiz-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-vert-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-video-vert-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-vert-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-video-vert-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-vert-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-basic-video-vert-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-vert-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-basic-video-vert-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-break-request-horiz-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-break-request-horiz-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-001a.html b/tests/wpt/tests/css/css-flexbox/flexbox-break-request-horiz-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-001a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-break-request-horiz-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-001b.html b/tests/wpt/tests/css/css-flexbox/flexbox-break-request-horiz-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-001b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-break-request-horiz-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-break-request-horiz-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-break-request-horiz-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-002a.html b/tests/wpt/tests/css/css-flexbox/flexbox-break-request-horiz-002a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-002a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-break-request-horiz-002a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-002b.html b/tests/wpt/tests/css/css-flexbox/flexbox-break-request-horiz-002b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-002b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-break-request-horiz-002b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-break-request-vert-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-break-request-vert-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-001a.html b/tests/wpt/tests/css/css-flexbox/flexbox-break-request-vert-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-001a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-break-request-vert-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-001b.html b/tests/wpt/tests/css/css-flexbox/flexbox-break-request-vert-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-001b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-break-request-vert-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-break-request-vert-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-break-request-vert-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-002a.html b/tests/wpt/tests/css/css-flexbox/flexbox-break-request-vert-002a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-002a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-break-request-vert-002a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-002b.html b/tests/wpt/tests/css/css-flexbox/flexbox-break-request-vert-002b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-002b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-break-request-vert-002b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-baseline-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-baseline-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-baseline-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-baseline-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-horiz-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-horiz-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-horiz-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-horiz-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-horiz-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-horiz-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-horiz-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-horiz-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-003-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-horiz-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-003-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-horiz-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-horiz-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-003.html rename to tests/wpt/tests/css/css-flexbox/flexbox-collapsed-item-horiz-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-003-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-003-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-003.html rename to tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-004-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-004-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-004.html b/tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-004.html rename to tests/wpt/tests/css/css-flexbox/flexbox-column-row-gap-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-cross-size-constrained-percentage-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-definite-cross-size-constrained-percentage-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-cross-size-constrained-percentage-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-definite-cross-size-constrained-percentage-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-cross-size-constrained-percentage.html b/tests/wpt/tests/css/css-flexbox/flexbox-definite-cross-size-constrained-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-cross-size-constrained-percentage.html rename to tests/wpt/tests/css/css-flexbox/flexbox-definite-cross-size-constrained-percentage.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-003.html rename to tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-004.html b/tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-004.html rename to tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-005-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-005-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-005.html b/tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-005.html rename to tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-006.html b/tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-006.html rename to tests/wpt/tests/css/css-flexbox/flexbox-definite-sizes-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-dyn-resize-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-dyn-resize-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-dyn-resize-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-dyn-resize-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-dyn-resize-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-dyn-resize-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-dyn-resize-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-dyn-resize-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001a.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001b.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002a.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-002a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-002a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002b.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-002b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-002b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-003-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-003-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-003a.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-003a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-003a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-003a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-003b.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-003b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-003b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-003b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-004-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-004-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-004a.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-004a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-004a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-004a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-004b.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-004b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-004b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-basis-content-004b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-direction-column-percentage-ignored.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-direction-column-percentage-ignored.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-direction-column-percentage-ignored.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-direction-column-percentage-ignored.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-direction-column-reverse.htm b/tests/wpt/tests/css/css-flexbox/flexbox-flex-direction-column-reverse.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-direction-column-reverse.htm rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-direction-column-reverse.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-direction-column.htm b/tests/wpt/tests/css/css-flexbox/flexbox-flex-direction-column.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-direction-column.htm rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-direction-column.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-direction-default.htm b/tests/wpt/tests/css/css-flexbox/flexbox-flex-direction-default.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-direction-default.htm rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-direction-default.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-direction-row-reverse.htm b/tests/wpt/tests/css/css-flexbox/flexbox-flex-direction-row-reverse.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-direction-row-reverse.htm rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-direction-row-reverse.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-direction-row.htm b/tests/wpt/tests/css/css-flexbox/flexbox-flex-direction-row.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-direction-row.htm rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-direction-row.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-flow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-flow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-flow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-flow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-flow-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-flow-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-flow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-flow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-default.htm b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-default.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-default.htm rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-default.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-flexing-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-flexing-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-flexing-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-flexing-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-flexing.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-flexing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-flexing.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-flexing.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-horiz-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-horiz-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-horiz-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-horiz-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-horiz-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-horiz-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-horiz-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-horiz-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-nowrap.htm b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-nowrap.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-nowrap.htm rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-nowrap.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-vert-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-vert-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-vert-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-vert-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-vert-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-vert-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-vert-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-vert-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-wrap-reverse.htm b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-wrap-reverse.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-wrap-reverse.htm rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-wrap-reverse.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-wrap.htm b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-wrap.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-wrap.htm rename to tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-wrap.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-gap-position-absolute-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-gap-position-absolute-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-gap-position-absolute-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-gap-position-absolute-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-gap-position-absolute.html b/tests/wpt/tests/css/css-flexbox/flexbox-gap-position-absolute.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-gap-position-absolute.html rename to tests/wpt/tests/css/css-flexbox/flexbox-gap-position-absolute.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-iframe-intrinsic-size-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-iframe-intrinsic-size-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-iframe-intrinsic-size-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-iframe-intrinsic-size-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-iframe-intrinsic-size-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-iframe-intrinsic-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-iframe-intrinsic-size-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-iframe-intrinsic-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-items-as-stacking-contexts-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-items-as-stacking-contexts-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-items-as-stacking-contexts-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-items-as-stacking-contexts-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-items-as-stacking-contexts-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-items-as-stacking-contexts-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-items-as-stacking-contexts-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-items-as-stacking-contexts-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-003-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-items-as-stacking-contexts-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-003-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-items-as-stacking-contexts-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-items-as-stacking-contexts-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-003.html rename to tests/wpt/tests/css/css-flexbox/flexbox-items-as-stacking-contexts-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-001a.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-001a.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-001a.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-001a.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-001b.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-001b.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-001b.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-001b.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-002-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-002-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-002-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-002-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-003-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-003-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-003-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-003-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-003.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-003.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-003.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-004-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-004-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-004-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-004-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-005-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-005-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-005-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-005-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-005.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-005.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-005.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-006-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-006-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-006-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-006-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-006.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-006.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-horiz-006.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-001b.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-001b.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-001b.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-001b.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-002-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-002-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-002-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-002-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-002.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-002.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-002.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-003-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-003-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-003-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-003-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-003.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-003.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-003.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-004-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-004-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-004-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-004-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-004.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-004.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-004.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-005-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-005-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-005-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-005-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-005.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-005.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-005.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-006-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-006-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-006-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-006-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-006.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-006.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-vert-006.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-wmvert-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-wmvert-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-wmvert-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-wmvert-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-wmvert-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-wmvert-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-wmvert-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-wmvert-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-wmvert-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-justify-content-wmvert-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-wmvert-003.html rename to tests/wpt/tests/css/css-flexbox/flexbox-justify-content-wmvert-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-lines-must-be-stretched-by-default.html b/tests/wpt/tests/css/css-flexbox/flexbox-lines-must-be-stretched-by-default.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-lines-must-be-stretched-by-default.html rename to tests/wpt/tests/css/css-flexbox/flexbox-lines-must-be-stretched-by-default.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-margin-auto-horiz-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-margin-auto-horiz-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-margin-auto-horiz-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-margin-auto-horiz-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-002-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-margin-auto-horiz-002-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-002-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-margin-auto-horiz-002-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-002.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-margin-auto-horiz-002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-002.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-margin-auto-horiz-002.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-reverse-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-001-reverse-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-reverse-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-001-reverse-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-reverse.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-001-reverse.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-reverse.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-001-reverse.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-rtl.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-001-rtl.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-rtl.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-001-rtl.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-002-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-002-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002a.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-002a.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002a.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-002a.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002b.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-002b.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002b.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-002b.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002v.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-002v.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002v.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-002v.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-003-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-003-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003-reverse-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-003-reverse-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003-reverse-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-003-reverse-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003-reverse.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-003-reverse.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003-reverse.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-003-reverse.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-003.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003v.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-003v.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003v.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-003v.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-004-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-004-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-004-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-004-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-004.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-004.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-mbp-horiz-004.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002a.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-002a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-002a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002b.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-002b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-002b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002c.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-002c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002c.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-002c.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-003-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-003-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-003.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-004-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-004-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-004.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-004.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-height-auto-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002a.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-002a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-002a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002b.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-002b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-002b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002c.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-002c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002c.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-002c.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-003-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-003-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-003.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-004-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-004-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-004.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-004.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-005.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-005.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-006.html b/tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-006.html rename to tests/wpt/tests/css/css-flexbox/flexbox-min-width-auto-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-order-from-lowest.html b/tests/wpt/tests/css/css-flexbox/flexbox-order-from-lowest.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-order-from-lowest.html rename to tests/wpt/tests/css/css-flexbox/flexbox-order-from-lowest.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-order-only-flexitems.html b/tests/wpt/tests/css/css-flexbox/flexbox-order-only-flexitems.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-order-only-flexitems.html rename to tests/wpt/tests/css/css-flexbox/flexbox-order-only-flexitems.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-003-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-003-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-003.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-004-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-004-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-004.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-004.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-005-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-005-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-005.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-005.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-horiz-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-padding-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-padding-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-padding-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-padding-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-padding-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-padding-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-padding-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-padding-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-003-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-003-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-003.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-004-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-004-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-004.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-004.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-005-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-005-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-005.html b/tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-005.html rename to tests/wpt/tests/css/css-flexbox/flexbox-overflow-vert-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-paint-ordering-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-paint-ordering-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-paint-ordering-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-paint-ordering-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-002-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-paint-ordering-002-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-002-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-paint-ordering-002-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-002.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-paint-ordering-002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-002.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-paint-ordering-002.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-003-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-paint-ordering-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-003-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-paint-ordering-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-paint-ordering-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-003.html rename to tests/wpt/tests/css/css-flexbox/flexbox-paint-ordering-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-root-node-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-root-node-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-root-node-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-root-node-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-root-node-001a.html b/tests/wpt/tests/css/css-flexbox/flexbox-root-node-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-root-node-001a.html rename to tests/wpt/tests/css/css-flexbox/flexbox-root-node-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-root-node-001b.html b/tests/wpt/tests/css/css-flexbox/flexbox-root-node-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-root-node-001b.html rename to tests/wpt/tests/css/css-flexbox/flexbox-root-node-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-safe-overflow-position-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-safe-overflow-position-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-safe-overflow-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-safe-overflow-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-safe-overflow-position-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-safe-overflow-position-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-safe-overflow-position-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-003.html rename to tests/wpt/tests/css/css-flexbox/flexbox-safe-overflow-position-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-004.html b/tests/wpt/tests/css/css-flexbox/flexbox-safe-overflow-position-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-004.html rename to tests/wpt/tests/css/css-flexbox/flexbox-safe-overflow-position-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-005.html b/tests/wpt/tests/css/css-flexbox/flexbox-safe-overflow-position-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-005.html rename to tests/wpt/tests/css/css-flexbox/flexbox-safe-overflow-position-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-006.html b/tests/wpt/tests/css/css-flexbox/flexbox-safe-overflow-position-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-006.html rename to tests/wpt/tests/css/css-flexbox/flexbox-safe-overflow-position-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-1-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-single-line-clamp-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-1-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-single-line-clamp-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-1.html b/tests/wpt/tests/css/css-flexbox/flexbox-single-line-clamp-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-1.html rename to tests/wpt/tests/css/css-flexbox/flexbox-single-line-clamp-1.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-2-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-single-line-clamp-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-2-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-single-line-clamp-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-2.html b/tests/wpt/tests/css/css-flexbox/flexbox-single-line-clamp-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-2.html rename to tests/wpt/tests/css/css-flexbox/flexbox-single-line-clamp-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-3-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-single-line-clamp-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-3-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-single-line-clamp-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-3.html b/tests/wpt/tests/css/css-flexbox/flexbox-single-line-clamp-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-3.html rename to tests/wpt/tests/css/css-flexbox/flexbox-single-line-clamp-3.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-sizing-horiz-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-sizing-horiz-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-sizing-horiz-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-sizing-horiz-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-002-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-sizing-horiz-002-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-002-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-sizing-horiz-002-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-002.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-sizing-horiz-002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-002.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-sizing-horiz-002.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-sizing-vert-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-sizing-vert-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-sizing-vert-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-sizing-vert-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-002-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-sizing-vert-002-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-002-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-sizing-vert-002-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-002.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-sizing-vert-002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-002.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-sizing-vert-002.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-table-fixup-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-table-fixup-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-table-fixup-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-table-fixup-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-table-fixup-001.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-table-fixup-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-table-fixup-001.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-table-fixup-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-001-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-whitespace-handling-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-001-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-whitespace-handling-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-001b.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-whitespace-handling-001b.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-001b.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-whitespace-handling-001b.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-002-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-whitespace-handling-002-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-002-ref.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-whitespace-handling-002-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-002.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-whitespace-handling-002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-002.xhtml rename to tests/wpt/tests/css/css-flexbox/flexbox-whitespace-handling-002.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-multi-column-property.html b/tests/wpt/tests/css/css-flexbox/flexbox-with-multi-column-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-multi-column-property.html rename to tests/wpt/tests/css/css-flexbox/flexbox-with-multi-column-property.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-with-pseudo-elements-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-with-pseudo-elements-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-with-pseudo-elements-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-with-pseudo-elements-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-with-pseudo-elements-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-with-pseudo-elements-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-with-pseudo-elements-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-with-pseudo-elements-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-003-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-with-pseudo-elements-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-003-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-with-pseudo-elements-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-with-pseudo-elements-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-003.html rename to tests/wpt/tests/css/css-flexbox/flexbox-with-pseudo-elements-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-001.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-003-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-003-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-003.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-004-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-004-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-004.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-004.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-005-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-005-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-005.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-005.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-006-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-006-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-006.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-006.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-007-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-007-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-007.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-007.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-008-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-008-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-008.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-008.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-009-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-009-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-009.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-009.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-009.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-010-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-010-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-010.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-010.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-010.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-011-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-011-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-011.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-011.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-011.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-012-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-012-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-012.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-012.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-012.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-013-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-013-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-013.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-013.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-013.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-014-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-014-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-014.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-014.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-014.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-015-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-015-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-015.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-015.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-015.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-016-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-016-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-016.html b/tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-016.html rename to tests/wpt/tests/css/css-flexbox/flexbox-writing-mode-016.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-center-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-content-center-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-center-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-content-center-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-center.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-content-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-center.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-content-center.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-flexend-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-content-flexend-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-flexend-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-content-flexend-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-flexend.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-content-flexend.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-flexend.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-content-flexend.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-flexstart-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-content-flexstart-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-flexstart-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-content-flexstart-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-flexstart.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-content-flexstart.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-flexstart.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-content-flexstart.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-spacearound-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-content-spacearound-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-spacearound-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-content-spacearound-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-spacearound.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-content-spacearound.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-spacearound.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-content-spacearound.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-spacebetween-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-content-spacebetween-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-spacebetween-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-content-spacebetween-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-spacebetween.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-content-spacebetween.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-spacebetween.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-content-spacebetween.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-stretch-2-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-content-stretch-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-stretch-2-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-content-stretch-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-stretch-2.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-content-stretch-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-stretch-2.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-content-stretch-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-stretch-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-content-stretch-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-stretch-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-content-stretch-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-stretch.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-content-stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-content-stretch.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-content-stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-baseline-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-baseline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-baseline-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-baseline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-baseline.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-baseline.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-baseline.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-center-2-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-center-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-center-2-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-center-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-center-2.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-center-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-center-2.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-center-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-center-3.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-center-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-center-3.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-center-3.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-center-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-center-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-center-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-center-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-center.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-center.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-center.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexend-2-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexend-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexend-2-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexend-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexend-2.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexend-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexend-2.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexend-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexend-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexend-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexend-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexend-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexend.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexend.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexend.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexend.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexstart-2-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexstart-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexstart-2-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexstart-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexstart-2.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexstart-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexstart-2.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexstart-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexstart-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexstart-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexstart-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexstart-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexstart.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexstart.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-flexstart.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-flexstart.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-stretch-2-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-stretch-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-stretch-2-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-stretch-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-stretch-2.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-stretch-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-stretch-2.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-stretch-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-stretch-3.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-stretch-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-stretch-3.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-stretch-3.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-stretch-4.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-stretch-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-stretch-4.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-stretch-4.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-stretch-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-stretch-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-stretch-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-stretch-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-stretch.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-items-stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-items-stretch.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-items-stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-auto-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-self-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-auto-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-self-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-auto.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-self-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-auto.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-self-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-baseline-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-self-baseline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-baseline-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-self-baseline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-baseline.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-self-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-baseline.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-self-baseline.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-center-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-self-center-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-center-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-self-center-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-center.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-self-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-center.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-self-center.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-flexend-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-self-flexend-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-flexend-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-self-flexend-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-flexend.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-self-flexend.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-flexend.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-self-flexend.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-flexstart-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-self-flexstart-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-flexstart-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-self-flexstart-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-flexstart.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-self-flexstart.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-flexstart.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-self-flexstart.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-stretch-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-self-stretch-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-stretch-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-self-stretch-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-stretch.html b/tests/wpt/tests/css/css-flexbox/flexbox_align-self-stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_align-self-stretch.html rename to tests/wpt/tests/css/css-flexbox/flexbox_align-self-stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_block.html b/tests/wpt/tests/css/css-flexbox/flexbox_block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_block.html rename to tests/wpt/tests/css/css-flexbox/flexbox_block.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_box-clear-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_box-clear-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_box-clear-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_box-clear-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_box-clear.html b/tests/wpt/tests/css/css-flexbox/flexbox_box-clear.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_box-clear.html rename to tests/wpt/tests/css/css-flexbox/flexbox_box-clear.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_columns-flexitems-2-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_columns-flexitems-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_columns-flexitems-2-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_columns-flexitems-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_columns-flexitems-2.html b/tests/wpt/tests/css/css-flexbox/flexbox_columns-flexitems-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_columns-flexitems-2.html rename to tests/wpt/tests/css/css-flexbox/flexbox_columns-flexitems-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_columns-flexitems-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_columns-flexitems-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_columns-flexitems-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_columns-flexitems-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_columns-flexitems.html b/tests/wpt/tests/css/css-flexbox/flexbox_columns-flexitems.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_columns-flexitems.html rename to tests/wpt/tests/css/css-flexbox/flexbox_columns-flexitems.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_columns-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_columns-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_columns-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_columns-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_columns.html b/tests/wpt/tests/css/css-flexbox/flexbox_columns.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_columns.html rename to tests/wpt/tests/css/css-flexbox/flexbox_columns.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_direction-column-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_direction-column-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_direction-column-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_direction-column-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_direction-column-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_direction-column-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_direction-column-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_direction-column-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_direction-column-reverse.html b/tests/wpt/tests/css/css-flexbox/flexbox_direction-column-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_direction-column-reverse.html rename to tests/wpt/tests/css/css-flexbox/flexbox_direction-column-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_direction-column.html b/tests/wpt/tests/css/css-flexbox/flexbox_direction-column.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_direction-column.html rename to tests/wpt/tests/css/css-flexbox/flexbox_direction-column.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_direction-row-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_direction-row-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_direction-row-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_direction-row-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_direction-row-reverse.html b/tests/wpt/tests/css/css-flexbox/flexbox_direction-row-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_direction-row-reverse.html rename to tests/wpt/tests/css/css-flexbox/flexbox_direction-row-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_display-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_display-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_display-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_display-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_display.html b/tests/wpt/tests/css/css-flexbox/flexbox_display.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_display.html rename to tests/wpt/tests/css/css-flexbox/flexbox_display.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_fbfc-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_fbfc-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_fbfc-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_fbfc-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_fbfc.html b/tests/wpt/tests/css/css-flexbox/flexbox_fbfc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_fbfc.html rename to tests/wpt/tests/css/css-flexbox/flexbox_fbfc.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_fbfc2-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_fbfc2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_fbfc2-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_fbfc2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_fbfc2.html b/tests/wpt/tests/css/css-flexbox/flexbox_fbfc2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_fbfc2.html rename to tests/wpt/tests/css/css-flexbox/flexbox_fbfc2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_first-letter.html b/tests/wpt/tests/css/css-flexbox/flexbox_first-letter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_first-letter.html rename to tests/wpt/tests/css/css-flexbox/flexbox_first-letter.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_first-line-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_first-line-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_first-line-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_first-line-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_first-line.html b/tests/wpt/tests/css/css-flexbox/flexbox_first-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_first-line.html rename to tests/wpt/tests/css/css-flexbox/flexbox_first-line.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-0-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-0-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-0-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-0-unitless.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-0-unitless.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-0-unitless.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-0-unitless.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-0.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-0.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-1-unitless-basis.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-1-unitless-basis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-1-unitless-basis.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-1-unitless-basis.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-N-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-N-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-N-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-N-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-N-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-N-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-N-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-N-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-N-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-N-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-N-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-N-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-N-unitless-basis.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-N-unitless-basis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-N-unitless-basis.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-N-unitless-basis.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-N.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-N.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-N.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-N.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-Npercent-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-Npercent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-Npercent-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-Npercent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-Npercent-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-Npercent-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-Npercent-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-Npercent-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-Npercent-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-Npercent-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-Npercent-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-Npercent-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-Npercent.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-Npercent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-Npercent.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-Npercent.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-auto-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-auto-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-auto-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-auto-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-auto-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-auto-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-auto-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-auto-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-auto-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-auto-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-auto.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0-auto.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-0.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-0-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-0-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-0-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-0-unitless.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-0-unitless.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-0-unitless.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-0-unitless.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-0.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-0.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-1-unitless-basis.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-1-unitless-basis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-1-unitless-basis.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-1-unitless-basis.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-N-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-N-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-N-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-N-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-N-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-N-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-N-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-N-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-N-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-N-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-N-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-N-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-N-unitless-basis.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-N-unitless-basis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-N-unitless-basis.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-N-unitless-basis.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-N.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-N.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-N.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-N.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-Npercent-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-Npercent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-Npercent-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-Npercent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-Npercent-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-Npercent-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-Npercent-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-Npercent-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-Npercent-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-Npercent-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-Npercent-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-Npercent-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-Npercent.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-Npercent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-Npercent.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-Npercent.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-auto-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-auto-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-auto-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-auto-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-auto-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-auto-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-auto-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-auto-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-auto-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-auto-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-auto.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1-auto.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-1.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-1.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-0-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-0-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-0-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-0-unitless.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-0-unitless.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-0-unitless.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-0-unitless.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-0.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-0.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-N-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-N-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-N-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-N-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-N-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-N-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-N-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-N-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-N-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-N-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-N-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-N-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-N.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-N.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-N.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-N.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-Npercent-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-Npercent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-Npercent-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-Npercent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-Npercent-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-Npercent-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-Npercent-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-Npercent-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-Npercent-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-Npercent-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-Npercent-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-Npercent-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-Npercent.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-Npercent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-Npercent.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-Npercent.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-auto-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-auto-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-auto-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-auto-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-auto-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-auto-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-auto-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-auto-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-auto-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-auto-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-auto.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N-auto.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-N.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-N.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-auto.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-0-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-0-auto.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-0-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-0-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-0-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-0-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-0-unitless.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-0-unitless.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-0-unitless.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-0-unitless.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-0.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-0.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-N-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-N-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-N-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-N-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-N-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-N-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-N-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-N-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-N-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-N-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-N-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-N-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-N.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-N.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-N.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-N.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-Npercent-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-Npercent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-Npercent-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-Npercent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-Npercent-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-Npercent-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-Npercent-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-Npercent-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-Npercent-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-Npercent-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-Npercent-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-Npercent-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-Npercent.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-Npercent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-Npercent.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-Npercent.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-auto-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-auto-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-auto-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-auto-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-auto-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-auto-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-auto-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-auto-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-auto-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-auto-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-auto.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0-auto.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-0.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-0-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-0-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-0-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-0-unitless.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-0-unitless.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-0-unitless.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-0-unitless.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-0.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-0.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-N-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-N-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-N-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-N-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-N-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-N-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-N-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-N-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-N-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-N-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-N-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-N-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-N.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-N.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-N.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-N.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-Npercent-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-Npercent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-Npercent-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-Npercent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-Npercent-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-Npercent-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-Npercent-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-Npercent-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-Npercent-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-Npercent-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-Npercent-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-Npercent-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-Npercent.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-Npercent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-Npercent.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-Npercent.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-auto-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-auto-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-auto-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-auto-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-auto-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-auto-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-auto-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-auto-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-auto-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-auto-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-auto.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1-auto.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-1.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-1.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-0-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-0-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-0-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-0-unitless.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-0-unitless.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-0-unitless.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-0-unitless.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-0.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-0.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-N-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-N-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-N-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-N-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-N-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-N-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-N-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-N-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-N-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-N-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-N-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-N-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-N.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-N.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-N.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-N.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-Npercent-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-Npercent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-Npercent-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-Npercent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-Npercent-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-Npercent-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-Npercent-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-Npercent-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-Npercent-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-Npercent-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-Npercent-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-Npercent-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-Npercent.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-Npercent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-Npercent.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-Npercent.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-auto-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-auto-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-auto-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-auto-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-auto-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-auto-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-auto-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-auto-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-auto-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-auto-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-auto.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N-auto.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-1-N.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-1-N.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-0-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-0-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-0-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-0-unitless.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-0-unitless.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-0-unitless.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-0-unitless.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-0.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-0.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-N-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-N-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-N-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-N-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-N-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-N-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-N-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-N-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-N-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-N-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-N-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-N-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-N.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-N.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-N.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-N.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-Npercent-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-Npercent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-Npercent-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-Npercent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-Npercent-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-Npercent-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-Npercent-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-Npercent-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-Npercent-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-Npercent-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-Npercent-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-Npercent-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-Npercent.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-Npercent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-Npercent.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-Npercent.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-auto-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-auto-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-auto-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-auto-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-auto-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-auto-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-auto-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-auto-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-auto-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-auto-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-auto.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0-auto.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-0.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-0-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-0-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-0-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-0-unitless.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-0-unitless.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-0-unitless.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-0-unitless.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-0.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-0.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-N-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-N-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-N-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-N-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-N-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-N-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-N-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-N-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-N-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-N-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-N-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-N-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-N.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-N.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-N.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-N.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-Npercent-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-Npercent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-Npercent-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-Npercent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-Npercent-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-Npercent-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-Npercent-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-Npercent-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-Npercent-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-Npercent-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-Npercent-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-Npercent-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-Npercent.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-Npercent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-Npercent.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-Npercent.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-auto-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-auto-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-auto-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-auto-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-auto-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-auto-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-auto-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-auto-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-auto-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-auto-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-auto.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1-auto.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-1.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-1.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-0-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-0-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-0-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-0-unitless.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-0-unitless.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-0-unitless.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-0-unitless.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-0.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-0.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-N-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-N-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-N-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-N-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-N-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-N-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-N-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-N-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-N-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-N-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-N-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-N-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-N.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-N.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-N.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-N.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-Npercent-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-Npercent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-Npercent-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-Npercent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-Npercent-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-Npercent-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-Npercent-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-Npercent-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-Npercent-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-Npercent-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-Npercent-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-Npercent-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-Npercent.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-Npercent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-Npercent.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-Npercent.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-auto-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-auto-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-auto-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-auto-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-auto-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-auto-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-auto-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-auto-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-auto-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-auto-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-auto.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N-auto.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-N-N.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-N-N.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-auto-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-auto-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-auto.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-auto.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-basis-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-basis-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-basis-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-basis-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-basis-shrink-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-basis-shrink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-basis-shrink-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-basis-shrink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-basis-shrink.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-basis-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-basis-shrink.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-basis-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-basis.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-basis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-basis.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-basis.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-formatting-interop-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-formatting-interop-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-formatting-interop-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-formatting-interop-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-formatting-interop.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-formatting-interop.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-formatting-interop.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-formatting-interop.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-initial-2-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-initial-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-initial-2-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-initial-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-initial-2.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-initial-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-initial-2.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-initial-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-initial-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-initial-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-initial-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-initial-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-initial.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-initial.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-mixed-basis-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-mixed-basis-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-mixed-basis-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-mixed-basis-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-mixed-basis.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-mixed-basis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-mixed-basis.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-mixed-basis.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-variable-auto-basis-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-variable-auto-basis-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-variable-auto-basis-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-variable-auto-basis-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-variable-auto-basis.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-variable-auto-basis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-variable-auto-basis.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-variable-auto-basis.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-variable-zero-basis-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-variable-zero-basis-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-variable-zero-basis-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-variable-zero-basis-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-variable-zero-basis.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-variable-zero-basis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural-variable-zero-basis.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-natural-variable-zero-basis.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-natural.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-natural.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-natural.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-none-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-none-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-none-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-none-wrappable-content-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-none-wrappable-content-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-none-wrappable-content-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-none-wrappable-content-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-none-wrappable-content.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-none-wrappable-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-none-wrappable-content.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-none-wrappable-content.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-none.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-none.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-none.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-unitless-basis-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flex-unitless-basis-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flex-unitless-basis-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flex-unitless-basis-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-reverse-wrap-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flow-column-reverse-wrap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-reverse-wrap-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flow-column-reverse-wrap-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-reverse-wrap-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flow-column-reverse-wrap-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-reverse-wrap-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flow-column-reverse-wrap-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-reverse-wrap-reverse.html b/tests/wpt/tests/css/css-flexbox/flexbox_flow-column-reverse-wrap-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-reverse-wrap-reverse.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flow-column-reverse-wrap-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-reverse-wrap.html b/tests/wpt/tests/css/css-flexbox/flexbox_flow-column-reverse-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-reverse-wrap.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flow-column-reverse-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-wrap-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flow-column-wrap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-wrap-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flow-column-wrap-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-wrap-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flow-column-wrap-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-wrap-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flow-column-wrap-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-wrap-reverse.html b/tests/wpt/tests/css/css-flexbox/flexbox_flow-column-wrap-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-wrap-reverse.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flow-column-wrap-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-wrap.html b/tests/wpt/tests/css/css-flexbox/flexbox_flow-column-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-column-wrap.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flow-column-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-row-wrap-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flow-row-wrap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-row-wrap-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flow-row-wrap-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-row-wrap-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_flow-row-wrap-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-row-wrap-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flow-row-wrap-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-row-wrap-reverse.html b/tests/wpt/tests/css/css-flexbox/flexbox_flow-row-wrap-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-row-wrap-reverse.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flow-row-wrap-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-row-wrap.html b/tests/wpt/tests/css/css-flexbox/flexbox_flow-row-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_flow-row-wrap.html rename to tests/wpt/tests/css/css-flexbox/flexbox_flow-row-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-flex-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_generated-flex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-flex-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_generated-flex-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-flex.html b/tests/wpt/tests/css/css-flexbox/flexbox_generated-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-flex.html rename to tests/wpt/tests/css/css-flexbox/flexbox_generated-flex.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-nested-flex.html b/tests/wpt/tests/css/css-flexbox/flexbox_generated-nested-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-nested-flex.html rename to tests/wpt/tests/css/css-flexbox/flexbox_generated-nested-flex.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_generated-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_generated-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated.html b/tests/wpt/tests/css/css-flexbox/flexbox_generated.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_generated.html rename to tests/wpt/tests/css/css-flexbox/flexbox_generated.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_inline-float.html b/tests/wpt/tests/css/css-flexbox/flexbox_inline-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_inline-float.html rename to tests/wpt/tests/css/css-flexbox/flexbox_inline-float.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_inline-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_inline-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_inline.html b/tests/wpt/tests/css/css-flexbox/flexbox_inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_inline.html rename to tests/wpt/tests/css/css-flexbox/flexbox_inline.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-bottom-float-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_item-bottom-float-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-bottom-float-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_item-bottom-float-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-bottom-float.html b/tests/wpt/tests/css/css-flexbox/flexbox_item-bottom-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-bottom-float.html rename to tests/wpt/tests/css/css-flexbox/flexbox_item-bottom-float.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-clear-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_item-clear-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-clear-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_item-clear-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-clear.html b/tests/wpt/tests/css/css-flexbox/flexbox_item-clear.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-clear.html rename to tests/wpt/tests/css/css-flexbox/flexbox_item-clear.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-float-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_item-float-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-float-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_item-float-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-float.html b/tests/wpt/tests/css/css-flexbox/flexbox_item-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-float.html rename to tests/wpt/tests/css/css-flexbox/flexbox_item-float.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-top-float-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_item-top-float-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-top-float-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_item-top-float-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-top-float.html b/tests/wpt/tests/css/css-flexbox/flexbox_item-top-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-top-float.html rename to tests/wpt/tests/css/css-flexbox/flexbox_item-top-float.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-vertical-align-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_item-vertical-align-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-vertical-align-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_item-vertical-align-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-vertical-align.html b/tests/wpt/tests/css/css-flexbox/flexbox_item-vertical-align.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_item-vertical-align.html rename to tests/wpt/tests/css/css-flexbox/flexbox_item-vertical-align.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-center-overflow.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-center-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-center-overflow.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-center-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-center-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-center-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-center-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-center-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-center.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-center.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-center.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-end-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-end-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-end-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-end-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-end-rtl-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-end-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-end-rtl-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-end-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-end-rtl.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-end-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-end-rtl.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-end-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-end.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-end.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-end.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-flex-end-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-flex-end-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-flex-end-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-flex-end-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-flex-end.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-flex-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-flex-end.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-flex-end.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-flex-start-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-flex-start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-flex-start-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-flex-start-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-flex-start.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-flex-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-flex-start.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-flex-start.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-left-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-left-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-left-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-left-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-left-001.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-left-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-left-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-left-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-left-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-left-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-left-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-left-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-left-002.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-left-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-left-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-left-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-right-001-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-right-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-right-001-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-right-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-right-001.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-right-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-right-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-right-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-right-002-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-right-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-right-002-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-right-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-right-002.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-right-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-right-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-right-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-rtl-001.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-rtl-001.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-rtl-002.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-rtl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-rtl-002.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-rtl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacearound-negative-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacearound-negative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacearound-negative-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacearound-negative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacearound-negative.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacearound-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacearound-negative.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacearound-negative.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacearound-only-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacearound-only-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacearound-only-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacearound-only-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacearound-only.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacearound-only.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacearound-only.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacearound-only.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacearound-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacearound-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacearound-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacearound-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacearound.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacearound.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacearound.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacearound.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacebetween-negative-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacebetween-negative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacebetween-negative-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacebetween-negative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacebetween-negative.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacebetween-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacebetween-negative.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacebetween-negative.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacebetween-only-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacebetween-only-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacebetween-only-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacebetween-only-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacebetween-only.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacebetween-only.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacebetween-only.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacebetween-only.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacebetween-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacebetween-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacebetween-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacebetween-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacebetween.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacebetween.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-spacebetween.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-spacebetween.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-start-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-start-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-start-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-start-rtl-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-start-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-start-rtl-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-start-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-start-rtl.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-start-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-start-rtl.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-start-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-start.html b/tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_justifycontent-start.html rename to tests/wpt/tests/css/css-flexbox/flexbox_justifycontent-start.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto-overflow-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_margin-auto-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto-overflow-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_margin-auto-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto-overflow.html b/tests/wpt/tests/css/css-flexbox/flexbox_margin-auto-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto-overflow.html rename to tests/wpt/tests/css/css-flexbox/flexbox_margin-auto-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_margin-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_margin-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto.html b/tests/wpt/tests/css/css-flexbox/flexbox_margin-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-auto.html rename to tests/wpt/tests/css/css-flexbox/flexbox_margin-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-collapse-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_margin-collapse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-collapse-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_margin-collapse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-left-ex-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_margin-left-ex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-left-ex-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_margin-left-ex-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-left-ex.html b/tests/wpt/tests/css/css-flexbox/flexbox_margin-left-ex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-left-ex.html rename to tests/wpt/tests/css/css-flexbox/flexbox_margin-left-ex.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_margin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_margin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin.html b/tests/wpt/tests/css/css-flexbox/flexbox_margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_margin.html rename to tests/wpt/tests/css/css-flexbox/flexbox_margin.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_nested-flex.html b/tests/wpt/tests/css/css-flexbox/flexbox_nested-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_nested-flex.html rename to tests/wpt/tests/css/css-flexbox/flexbox_nested-flex.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_object-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_object-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_object-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_object-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_object.html b/tests/wpt/tests/css/css-flexbox/flexbox_object.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_object.html rename to tests/wpt/tests/css/css-flexbox/flexbox_object.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_order-abspos-space-around-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_order-abspos-space-around-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_order-abspos-space-around-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_order-abspos-space-around-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_order-abspos-space-around.html b/tests/wpt/tests/css/css-flexbox/flexbox_order-abspos-space-around.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_order-abspos-space-around.html rename to tests/wpt/tests/css/css-flexbox/flexbox_order-abspos-space-around.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_order-box-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_order-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_order-box-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_order-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_order-box.html b/tests/wpt/tests/css/css-flexbox/flexbox_order-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_order-box.html rename to tests/wpt/tests/css/css-flexbox/flexbox_order-box.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_order-noninteger-invalid.html b/tests/wpt/tests/css/css-flexbox/flexbox_order-noninteger-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_order-noninteger-invalid.html rename to tests/wpt/tests/css/css-flexbox/flexbox_order-noninteger-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_order-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_order-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_order.html b/tests/wpt/tests/css/css-flexbox/flexbox_order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_order.html rename to tests/wpt/tests/css/css-flexbox/flexbox_order.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_quirks_body.html b/tests/wpt/tests/css/css-flexbox/flexbox_quirks_body.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_quirks_body.html rename to tests/wpt/tests/css/css-flexbox/flexbox_quirks_body.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rowspan-overflow-automatic.html b/tests/wpt/tests/css/css-flexbox/flexbox_rowspan-overflow-automatic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rowspan-overflow-automatic.html rename to tests/wpt/tests/css/css-flexbox/flexbox_rowspan-overflow-automatic.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rowspan-overflow.html b/tests/wpt/tests/css/css-flexbox/flexbox_rowspan-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rowspan-overflow.html rename to tests/wpt/tests/css/css-flexbox/flexbox_rowspan-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rowspan-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_rowspan-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rowspan-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_rowspan-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rowspan.html b/tests/wpt/tests/css/css-flexbox/flexbox_rowspan.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rowspan.html rename to tests/wpt/tests/css/css-flexbox/flexbox_rowspan.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-direction-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_rtl-direction-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-direction-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_rtl-direction-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-direction.html b/tests/wpt/tests/css/css-flexbox/flexbox_rtl-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-direction.html rename to tests/wpt/tests/css/css-flexbox/flexbox_rtl-direction.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-flow-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_rtl-flow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-flow-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_rtl-flow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-flow-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_rtl-flow-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-flow-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_rtl-flow-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-flow-reverse.html b/tests/wpt/tests/css/css-flexbox/flexbox_rtl-flow-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-flow-reverse.html rename to tests/wpt/tests/css/css-flexbox/flexbox_rtl-flow-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-flow.html b/tests/wpt/tests/css/css-flexbox/flexbox_rtl-flow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-flow.html rename to tests/wpt/tests/css/css-flexbox/flexbox_rtl-flow.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-order-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_rtl-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-order-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_rtl-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-order.html b/tests/wpt/tests/css/css-flexbox/flexbox_rtl-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_rtl-order.html rename to tests/wpt/tests/css/css-flexbox/flexbox_rtl-order.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-abspos.html b/tests/wpt/tests/css/css-flexbox/flexbox_stf-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-abspos.html rename to tests/wpt/tests/css/css-flexbox/flexbox_stf-abspos.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-fixpos.html b/tests/wpt/tests/css/css-flexbox/flexbox_stf-fixpos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-fixpos.html rename to tests/wpt/tests/css/css-flexbox/flexbox_stf-fixpos.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-float.html b/tests/wpt/tests/css/css-flexbox/flexbox_stf-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-float.html rename to tests/wpt/tests/css/css-flexbox/flexbox_stf-float.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-inline-block.html b/tests/wpt/tests/css/css-flexbox/flexbox_stf-inline-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-inline-block.html rename to tests/wpt/tests/css/css-flexbox/flexbox_stf-inline-block.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table-caption.html b/tests/wpt/tests/css/css-flexbox/flexbox_stf-table-caption.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table-caption.html rename to tests/wpt/tests/css/css-flexbox/flexbox_stf-table-caption.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table-cell.html b/tests/wpt/tests/css/css-flexbox/flexbox_stf-table-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table-cell.html rename to tests/wpt/tests/css/css-flexbox/flexbox_stf-table-cell.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table-row-group.html b/tests/wpt/tests/css/css-flexbox/flexbox_stf-table-row-group.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table-row-group.html rename to tests/wpt/tests/css/css-flexbox/flexbox_stf-table-row-group.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table-row.html b/tests/wpt/tests/css/css-flexbox/flexbox_stf-table-row.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table-row.html rename to tests/wpt/tests/css/css-flexbox/flexbox_stf-table-row.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table-singleline-2.html b/tests/wpt/tests/css/css-flexbox/flexbox_stf-table-singleline-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table-singleline-2.html rename to tests/wpt/tests/css/css-flexbox/flexbox_stf-table-singleline-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table-singleline-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_stf-table-singleline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table-singleline-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_stf-table-singleline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table-singleline.html b/tests/wpt/tests/css/css-flexbox/flexbox_stf-table-singleline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table-singleline.html rename to tests/wpt/tests/css/css-flexbox/flexbox_stf-table-singleline.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table.html b/tests/wpt/tests/css/css-flexbox/flexbox_stf-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_stf-table.html rename to tests/wpt/tests/css/css-flexbox/flexbox_stf-table.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_table-fixed-layout.html b/tests/wpt/tests/css/css-flexbox/flexbox_table-fixed-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_table-fixed-layout.html rename to tests/wpt/tests/css/css-flexbox/flexbox_table-fixed-layout.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_visibility-collapse-line-wrapping-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_visibility-collapse-line-wrapping-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_visibility-collapse-line-wrapping-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_visibility-collapse-line-wrapping-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_visibility-collapse-line-wrapping.html b/tests/wpt/tests/css/css-flexbox/flexbox_visibility-collapse-line-wrapping.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_visibility-collapse-line-wrapping.html rename to tests/wpt/tests/css/css-flexbox/flexbox_visibility-collapse-line-wrapping.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_visibility-collapse-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_visibility-collapse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_visibility-collapse-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_visibility-collapse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_visibility-collapse.html b/tests/wpt/tests/css/css-flexbox/flexbox_visibility-collapse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_visibility-collapse.html rename to tests/wpt/tests/css/css-flexbox/flexbox_visibility-collapse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_width-change-and-relayout-children.html b/tests/wpt/tests/css/css-flexbox/flexbox_width-change-and-relayout-children.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_width-change-and-relayout-children.html rename to tests/wpt/tests/css/css-flexbox/flexbox_width-change-and-relayout-children.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_width-overflow.html b/tests/wpt/tests/css/css-flexbox/flexbox_width-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_width-overflow.html rename to tests/wpt/tests/css/css-flexbox/flexbox_width-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_width-wrapping-column.html b/tests/wpt/tests/css/css-flexbox/flexbox_width-wrapping-column.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_width-wrapping-column.html rename to tests/wpt/tests/css/css-flexbox/flexbox_width-wrapping-column.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_wrap-long-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_wrap-long-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_wrap-long-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_wrap-long-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_wrap-long.html b/tests/wpt/tests/css/css-flexbox/flexbox_wrap-long.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_wrap-long.html rename to tests/wpt/tests/css/css-flexbox/flexbox_wrap-long.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_wrap-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_wrap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_wrap-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_wrap-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_wrap-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/flexbox_wrap-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_wrap-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/flexbox_wrap-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_wrap-reverse.html b/tests/wpt/tests/css/css-flexbox/flexbox_wrap-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_wrap-reverse.html rename to tests/wpt/tests/css/css-flexbox/flexbox_wrap-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_wrap.html b/tests/wpt/tests/css/css-flexbox/flexbox_wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_wrap.html rename to tests/wpt/tests/css/css-flexbox/flexbox_wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_writing_mode_vertical_lays_out_contents_from_top_to_bottom.html b/tests/wpt/tests/css/css-flexbox/flexbox_writing_mode_vertical_lays_out_contents_from_top_to_bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexbox_writing_mode_vertical_lays_out_contents_from_top_to_bottom.html rename to tests/wpt/tests/css/css-flexbox/flexbox_writing_mode_vertical_lays_out_contents_from_top_to_bottom.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexible-box-float.html b/tests/wpt/tests/css/css-flexbox/flexible-box-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexible-box-float.html rename to tests/wpt/tests/css/css-flexbox/flexible-box-float.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexible-order.html b/tests/wpt/tests/css/css-flexbox/flexible-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexible-order.html rename to tests/wpt/tests/css/css-flexbox/flexible-order.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexitem-no-margin-collapsing.html b/tests/wpt/tests/css/css-flexbox/flexitem-no-margin-collapsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexitem-no-margin-collapsing.html rename to tests/wpt/tests/css/css-flexbox/flexitem-no-margin-collapsing.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexitem-stretch-image.html b/tests/wpt/tests/css/css-flexbox/flexitem-stretch-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexitem-stretch-image.html rename to tests/wpt/tests/css/css-flexbox/flexitem-stretch-image.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexitem-stretch-range.html b/tests/wpt/tests/css/css-flexbox/flexitem-stretch-range.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/flexitem-stretch-range.html rename to tests/wpt/tests/css/css-flexbox/flexitem-stretch-range.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/frame-flex-item-crash.html b/tests/wpt/tests/css/css-flexbox/frame-flex-item-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/frame-flex-item-crash.html rename to tests/wpt/tests/css/css-flexbox/frame-flex-item-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/frameset-crash.html b/tests/wpt/tests/css/css-flexbox/frameset-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/frameset-crash.html rename to tests/wpt/tests/css/css-flexbox/frameset-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-001-lr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-001-lr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-001-lr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-001-lr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-001-lr.html b/tests/wpt/tests/css/css-flexbox/gap-001-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-001-lr.html rename to tests/wpt/tests/css/css-flexbox/gap-001-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-001-ltr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-001-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-001-ltr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-001-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-001-ltr.html b/tests/wpt/tests/css/css-flexbox/gap-001-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-001-ltr.html rename to tests/wpt/tests/css/css-flexbox/gap-001-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-001-rl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-001-rl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-001-rl-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-001-rl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-001-rl.html b/tests/wpt/tests/css/css-flexbox/gap-001-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-001-rl.html rename to tests/wpt/tests/css/css-flexbox/gap-001-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-001-rtl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-001-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-001-rtl-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-001-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-001-rtl.html b/tests/wpt/tests/css/css-flexbox/gap-001-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-001-rtl.html rename to tests/wpt/tests/css/css-flexbox/gap-001-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-002-lr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-002-lr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-002-lr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-002-lr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-002-lr.html b/tests/wpt/tests/css/css-flexbox/gap-002-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-002-lr.html rename to tests/wpt/tests/css/css-flexbox/gap-002-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-002-ltr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-002-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-002-ltr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-002-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-002-ltr.html b/tests/wpt/tests/css/css-flexbox/gap-002-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-002-ltr.html rename to tests/wpt/tests/css/css-flexbox/gap-002-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-002-rl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-002-rl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-002-rl-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-002-rl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-002-rl.html b/tests/wpt/tests/css/css-flexbox/gap-002-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-002-rl.html rename to tests/wpt/tests/css/css-flexbox/gap-002-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-002-rtl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-002-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-002-rtl-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-002-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-002-rtl.html b/tests/wpt/tests/css/css-flexbox/gap-002-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-002-rtl.html rename to tests/wpt/tests/css/css-flexbox/gap-002-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-003-lr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-003-lr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-003-lr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-003-lr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-003-lr.html b/tests/wpt/tests/css/css-flexbox/gap-003-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-003-lr.html rename to tests/wpt/tests/css/css-flexbox/gap-003-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-003-ltr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-003-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-003-ltr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-003-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-003-ltr.html b/tests/wpt/tests/css/css-flexbox/gap-003-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-003-ltr.html rename to tests/wpt/tests/css/css-flexbox/gap-003-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-003-rl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-003-rl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-003-rl-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-003-rl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-003-rl.html b/tests/wpt/tests/css/css-flexbox/gap-003-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-003-rl.html rename to tests/wpt/tests/css/css-flexbox/gap-003-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-003-rtl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-003-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-003-rtl-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-003-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-003-rtl.html b/tests/wpt/tests/css/css-flexbox/gap-003-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-003-rtl.html rename to tests/wpt/tests/css/css-flexbox/gap-003-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-004-lr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-004-lr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-004-lr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-004-lr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-004-lr.html b/tests/wpt/tests/css/css-flexbox/gap-004-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-004-lr.html rename to tests/wpt/tests/css/css-flexbox/gap-004-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-004-ltr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-004-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-004-ltr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-004-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-004-ltr.html b/tests/wpt/tests/css/css-flexbox/gap-004-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-004-ltr.html rename to tests/wpt/tests/css/css-flexbox/gap-004-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-004-rl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-004-rl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-004-rl-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-004-rl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-004-rl.html b/tests/wpt/tests/css/css-flexbox/gap-004-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-004-rl.html rename to tests/wpt/tests/css/css-flexbox/gap-004-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-004-rtl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-004-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-004-rtl-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-004-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-004-rtl.html b/tests/wpt/tests/css/css-flexbox/gap-004-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-004-rtl.html rename to tests/wpt/tests/css/css-flexbox/gap-004-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-005-lr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-005-lr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-005-lr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-005-lr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-005-lr.html b/tests/wpt/tests/css/css-flexbox/gap-005-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-005-lr.html rename to tests/wpt/tests/css/css-flexbox/gap-005-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-005-ltr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-005-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-005-ltr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-005-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-005-ltr.html b/tests/wpt/tests/css/css-flexbox/gap-005-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-005-ltr.html rename to tests/wpt/tests/css/css-flexbox/gap-005-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-005-rl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-005-rl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-005-rl-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-005-rl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-005-rl.html b/tests/wpt/tests/css/css-flexbox/gap-005-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-005-rl.html rename to tests/wpt/tests/css/css-flexbox/gap-005-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-005-rtl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-005-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-005-rtl-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-005-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-005-rtl.html b/tests/wpt/tests/css/css-flexbox/gap-005-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-005-rtl.html rename to tests/wpt/tests/css/css-flexbox/gap-005-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-006-lr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-006-lr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-006-lr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-006-lr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-006-lr.html b/tests/wpt/tests/css/css-flexbox/gap-006-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-006-lr.html rename to tests/wpt/tests/css/css-flexbox/gap-006-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-006-ltr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-006-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-006-ltr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-006-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-006-ltr.html b/tests/wpt/tests/css/css-flexbox/gap-006-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-006-ltr.html rename to tests/wpt/tests/css/css-flexbox/gap-006-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-006-rl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-006-rl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-006-rl-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-006-rl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-006-rl.html b/tests/wpt/tests/css/css-flexbox/gap-006-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-006-rl.html rename to tests/wpt/tests/css/css-flexbox/gap-006-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-006-rtl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-006-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-006-rtl-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-006-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-006-rtl.html b/tests/wpt/tests/css/css-flexbox/gap-006-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-006-rtl.html rename to tests/wpt/tests/css/css-flexbox/gap-006-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-007-lr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-007-lr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-007-lr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-007-lr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-007-lr.html b/tests/wpt/tests/css/css-flexbox/gap-007-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-007-lr.html rename to tests/wpt/tests/css/css-flexbox/gap-007-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-007-ltr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-007-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-007-ltr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-007-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-007-ltr.html b/tests/wpt/tests/css/css-flexbox/gap-007-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-007-ltr.html rename to tests/wpt/tests/css/css-flexbox/gap-007-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-007-rl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-007-rl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-007-rl-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-007-rl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-007-rl.html b/tests/wpt/tests/css/css-flexbox/gap-007-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-007-rl.html rename to tests/wpt/tests/css/css-flexbox/gap-007-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-007-rtl-ref.html b/tests/wpt/tests/css/css-flexbox/gap-007-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-007-rtl-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-007-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-007-rtl.html b/tests/wpt/tests/css/css-flexbox/gap-007-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-007-rtl.html rename to tests/wpt/tests/css/css-flexbox/gap-007-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-008-ltr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-008-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-008-ltr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-008-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-008-ltr.html b/tests/wpt/tests/css/css-flexbox/gap-008-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-008-ltr.html rename to tests/wpt/tests/css/css-flexbox/gap-008-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-009-ltr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-009-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-009-ltr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-009-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-009-ltr.html b/tests/wpt/tests/css/css-flexbox/gap-009-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-009-ltr.html rename to tests/wpt/tests/css/css-flexbox/gap-009-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-010-ltr-ref.html b/tests/wpt/tests/css/css-flexbox/gap-010-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-010-ltr-ref.html rename to tests/wpt/tests/css/css-flexbox/gap-010-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-010-ltr.html b/tests/wpt/tests/css/css-flexbox/gap-010-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-010-ltr.html rename to tests/wpt/tests/css/css-flexbox/gap-010-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-011.html b/tests/wpt/tests/css/css-flexbox/gap-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-011.html rename to tests/wpt/tests/css/css-flexbox/gap-011.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-012.html b/tests/wpt/tests/css/css-flexbox/gap-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-012.html rename to tests/wpt/tests/css/css-flexbox/gap-012.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-013.html b/tests/wpt/tests/css/css-flexbox/gap-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-013.html rename to tests/wpt/tests/css/css-flexbox/gap-013.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-014.html b/tests/wpt/tests/css/css-flexbox/gap-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-014.html rename to tests/wpt/tests/css/css-flexbox/gap-014.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-015.html b/tests/wpt/tests/css/css-flexbox/gap-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-015.html rename to tests/wpt/tests/css/css-flexbox/gap-015.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-016.html b/tests/wpt/tests/css/css-flexbox/gap-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-016.html rename to tests/wpt/tests/css/css-flexbox/gap-016.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-017.html b/tests/wpt/tests/css/css-flexbox/gap-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-017.html rename to tests/wpt/tests/css/css-flexbox/gap-017.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-018.html b/tests/wpt/tests/css/css-flexbox/gap-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-018.html rename to tests/wpt/tests/css/css-flexbox/gap-018.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/gap-019.html b/tests/wpt/tests/css/css-flexbox/gap-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/gap-019.html rename to tests/wpt/tests/css/css-flexbox/gap-019.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-center.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-center.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-center.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-flex-end.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-flex-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-flex-end.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-flex-end.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-flex-start.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-flex-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-flex-start.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-flex-start.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-space-around.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-space-around.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-space-around.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-space-around.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-space-between.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-space-between.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-space-between.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-space-between.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-baseline.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-baseline.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-baseline.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-center.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-center.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-center.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-end.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-end.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-end.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-start.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-start.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-start.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-invalid.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-invalid.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-stretch.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-stretch.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-baseline.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-baseline.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-baseline.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-center.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-center.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-center.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-end.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-end.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-end.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-start.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-start.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-start.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-invalid.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-invalid.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-stretch.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-stretch.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display-inline.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display-inline.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0percent.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0percent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0percent.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0percent.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-auto.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-auto.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-percent.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-percent.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-percent.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column-reverse.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column-reverse.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-invalid.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-invalid.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row-reverse.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row-reverse.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-nowrap.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-nowrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-nowrap.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-nowrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-nowrap.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-nowrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-nowrap.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-nowrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-wrap.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-wrap.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap-reverse.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap-reverse.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-nowrap.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-nowrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-nowrap.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-nowrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-nowrap.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-nowrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-nowrap.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-nowrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-nowrap.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-nowrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-nowrap.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-nowrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap-reverse.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap-reverse.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-wrap.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-wrap.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-0.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-0.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-invalid.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-invalid.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-number.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-number.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-number.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-number.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-0-auto.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-0-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-0-auto.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-0-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-auto.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-auto.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-initial.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-initial.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-invalid.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-invalid.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-none.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-none.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-none.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-number.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-number.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-number.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-number.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-0.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-0.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-0.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-invalid.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-invalid.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-number.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-number.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-number.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-number.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-invalid.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-invalid.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-nowrap.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-nowrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-nowrap.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-nowrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap-reverse.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap-reverse.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-center.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-center.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-center.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-flex-end.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-flex-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-flex-end.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-flex-end.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-flex-start.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-flex-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-flex-start.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-flex-start.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-space-around.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-space-around.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-space-around.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-space-around.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-space-between.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-space-between.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-space-between.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_justify-content-space-between.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-auto-size.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-auto-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-auto-size.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-auto-size.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-height-auto.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-height-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-height-auto.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-height-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-width-auto.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-width-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-width-auto.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_min-width-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-inherit.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-inherit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-inherit.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-inherit.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-integer.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-integer.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-integer.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-integer.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-invalid.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-invalid.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-negative.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-negative.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-negative.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order.html b/tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order.html rename to tests/wpt/tests/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/grandchild-span-height.html b/tests/wpt/tests/css/css-flexbox/grandchild-span-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/grandchild-span-height.html rename to tests/wpt/tests/css/css-flexbox/grandchild-span-height.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-001.html b/tests/wpt/tests/css/css-flexbox/grid-flex-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-001.html rename to tests/wpt/tests/css/css-flexbox/grid-flex-item-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-002.html b/tests/wpt/tests/css/css-flexbox/grid-flex-item-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-002.html rename to tests/wpt/tests/css/css-flexbox/grid-flex-item-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-003.html b/tests/wpt/tests/css/css-flexbox/grid-flex-item-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-003.html rename to tests/wpt/tests/css/css-flexbox/grid-flex-item-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-004.html b/tests/wpt/tests/css/css-flexbox/grid-flex-item-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-004.html rename to tests/wpt/tests/css/css-flexbox/grid-flex-item-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-005.html b/tests/wpt/tests/css/css-flexbox/grid-flex-item-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-005.html rename to tests/wpt/tests/css/css-flexbox/grid-flex-item-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-006.html b/tests/wpt/tests/css/css-flexbox/grid-flex-item-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-006.html rename to tests/wpt/tests/css/css-flexbox/grid-flex-item-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-007.html b/tests/wpt/tests/css/css-flexbox/grid-flex-item-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/grid-flex-item-007.html rename to tests/wpt/tests/css/css-flexbox/grid-flex-item-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/height-percentage-with-dynamic-container-size.html b/tests/wpt/tests/css/css-flexbox/height-percentage-with-dynamic-container-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/height-percentage-with-dynamic-container-size.html rename to tests/wpt/tests/css/css-flexbox/height-percentage-with-dynamic-container-size.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/hittest-anonymous-box.html b/tests/wpt/tests/css/css-flexbox/hittest-anonymous-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/hittest-anonymous-box.html rename to tests/wpt/tests/css/css-flexbox/hittest-anonymous-box.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/hittest-before-pseudo.html b/tests/wpt/tests/css/css-flexbox/hittest-before-pseudo.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/hittest-before-pseudo.html rename to tests/wpt/tests/css/css-flexbox/hittest-before-pseudo.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/hittest-overlapping-margin.html b/tests/wpt/tests/css/css-flexbox/hittest-overlapping-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/hittest-overlapping-margin.html rename to tests/wpt/tests/css/css-flexbox/hittest-overlapping-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/hittest-overlapping-order.html b/tests/wpt/tests/css/css-flexbox/hittest-overlapping-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/hittest-overlapping-order.html rename to tests/wpt/tests/css/css-flexbox/hittest-overlapping-order.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/hittest-overlapping-relative.html b/tests/wpt/tests/css/css-flexbox/hittest-overlapping-relative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/hittest-overlapping-relative.html rename to tests/wpt/tests/css/css-flexbox/hittest-overlapping-relative.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-001.html b/tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-001.html rename to tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-001v.html b/tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-001v.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-001v.html rename to tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-001v.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-002.html b/tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-002.html rename to tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-002v.html b/tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-002v.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-002v.html rename to tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-002v.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-003.html b/tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-003.html rename to tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-003v.html b/tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-003v.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-003v.html rename to tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-003v.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-004.html b/tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-004.html rename to tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-004v.html b/tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-004v.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-004v.html rename to tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-004v.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-005.html b/tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-005.html rename to tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-005v.html b/tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-005v.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-005v.html rename to tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-005v.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-006.html b/tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-006.html rename to tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-006v.html b/tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-006v.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-006v.html rename to tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-006v.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-007.html b/tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-007.html rename to tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-007v.html b/tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-007v.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-as-flexitem-size-007v.html rename to tests/wpt/tests/css/css-flexbox/image-as-flexitem-size-007v.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-items-flake-001.html b/tests/wpt/tests/css/css-flexbox/image-items-flake-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-items-flake-001.html rename to tests/wpt/tests/css/css-flexbox/image-items-flake-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/image-nested-within-definite-column-flexbox.html b/tests/wpt/tests/css/css-flexbox/image-nested-within-definite-column-flexbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/image-nested-within-definite-column-flexbox.html rename to tests/wpt/tests/css/css-flexbox/image-nested-within-definite-column-flexbox.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/inheritance.html b/tests/wpt/tests/css/css-flexbox/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/inheritance.html rename to tests/wpt/tests/css/css-flexbox/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/inline-flex-editing-crash.html b/tests/wpt/tests/css/css-flexbox/inline-flex-editing-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/inline-flex-editing-crash.html rename to tests/wpt/tests/css/css-flexbox/inline-flex-editing-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/inline-flex-editing-with-updating-text-crash.html b/tests/wpt/tests/css/css-flexbox/inline-flex-editing-with-updating-text-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/inline-flex-editing-with-updating-text-crash.html rename to tests/wpt/tests/css/css-flexbox/inline-flex-editing-with-updating-text-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/inline-flex-frameset-main-axis-crash.html b/tests/wpt/tests/css/css-flexbox/inline-flex-frameset-main-axis-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/inline-flex-frameset-main-axis-crash.html rename to tests/wpt/tests/css/css-flexbox/inline-flex-frameset-main-axis-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/inline-flex-min-content-height.html b/tests/wpt/tests/css/css-flexbox/inline-flex-min-content-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/inline-flex-min-content-height.html rename to tests/wpt/tests/css/css-flexbox/inline-flex-min-content-height.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/inline-flex.html b/tests/wpt/tests/css/css-flexbox/inline-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/inline-flex.html rename to tests/wpt/tests/css/css-flexbox/inline-flex.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/inline-flexbox-absurd-block-size-crash.html b/tests/wpt/tests/css/css-flexbox/inline-flexbox-absurd-block-size-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/inline-flexbox-absurd-block-size-crash.html rename to tests/wpt/tests/css/css-flexbox/inline-flexbox-absurd-block-size-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/inline-flexbox-vertical-rl-image-flexitem-crash-print.html b/tests/wpt/tests/css/css-flexbox/inline-flexbox-vertical-rl-image-flexitem-crash-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/inline-flexbox-vertical-rl-image-flexitem-crash-print.html rename to tests/wpt/tests/css/css-flexbox/inline-flexbox-vertical-rl-image-flexitem-crash-print.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/inline-flexbox-wrap-vertically-width-calculation.html b/tests/wpt/tests/css/css-flexbox/inline-flexbox-wrap-vertically-width-calculation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/inline-flexbox-wrap-vertically-width-calculation.html rename to tests/wpt/tests/css/css-flexbox/inline-flexbox-wrap-vertically-width-calculation.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-after-column-item.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-after-column-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-after-column-item.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-after-column-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-after-column-lastitem.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-after-column-lastitem.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-after-column-lastitem.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-after-column-lastitem.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-after-container.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-after-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-after-container.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-after-container.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-after-item.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-after-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-after-item.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-after-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-after-line-order.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-after-line-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-after-line-order.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-after-line-order.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-after-line.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-after-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-after-line.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-after-line.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-after-multiline.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-after-multiline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-after-multiline.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-after-multiline.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-before-column-firstitem.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-before-column-firstitem.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-before-column-firstitem.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-before-column-firstitem.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-before-column-item.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-before-column-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-before-column-item.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-before-column-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-before-container.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-before-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-before-container.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-before-container.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-before-item.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-before-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-before-item.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-before-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-before-multiline.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-before-multiline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-before-multiline.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-before-multiline.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-natural.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-natural.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_break-natural.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_break-natural.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_flex-basis-transitions.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_flex-basis-transitions.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_flex-basis-transitions.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_flex-basis-transitions.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_flex-grow-transitions.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_flex-grow-transitions.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_flex-grow-transitions.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_flex-grow-transitions.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_flex-shrink-transitions-invalid.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_flex-shrink-transitions-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_flex-shrink-transitions-invalid.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_flex-shrink-transitions-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_flex-shrink-transitions.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_flex-shrink-transitions.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_flex-shrink-transitions.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_flex-shrink-transitions.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_flex-transitions.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_flex-transitions.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_flex-transitions.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_flex-transitions.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_order-transitions-2.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_order-transitions-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_order-transitions-2.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_order-transitions-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_order-transitions.html b/tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_order-transitions.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/interactive/flexbox_interactive_order-transitions.html rename to tests/wpt/tests/css/css-flexbox/interactive/flexbox_interactive_order-transitions.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-001.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-001.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-002.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-002.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-003.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-003.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-004.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-004.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-005.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-005.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-006.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-006.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-007.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-007.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-008.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-008.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-009.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-009.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-009.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-010.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-010.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-010.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-011.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-011.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-011.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-012.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-012.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-012.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-013.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-013.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-013.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-014.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-014.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-014.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-015.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-015.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-015.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-016.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-016.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-016.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-017.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-017.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-017.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-018.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-018.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-018.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-019.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-019.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/col-wrap-019.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-001.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/row-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-001.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/row-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-002.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/row-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-002.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/row-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-003.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/row-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-003.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/row-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-004.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/row-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-004.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/row-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-005.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/row-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-005.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/row-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-006.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/row-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-006.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/row-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-007.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/row-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-007.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/row-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-008.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/row-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-008.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/row-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-compat-001.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/row-compat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-compat-001.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/row-compat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-use-cases-001.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/row-use-cases-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-use-cases-001.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/row-use-cases-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-wrap-001.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/row-wrap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-wrap-001.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/row-wrap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-wrap-002.tentative.html b/tests/wpt/tests/css/css-flexbox/intrinsic-size/row-wrap-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-size/row-wrap-002.tentative.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-size/row-wrap-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-width-orthogonal-writing-mode.html b/tests/wpt/tests/css/css-flexbox/intrinsic-width-orthogonal-writing-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/intrinsic-width-orthogonal-writing-mode.html rename to tests/wpt/tests/css/css-flexbox/intrinsic-width-orthogonal-writing-mode.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/item-with-max-height-and-scrollbar.html b/tests/wpt/tests/css/css-flexbox/item-with-max-height-and-scrollbar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/item-with-max-height-and-scrollbar.html rename to tests/wpt/tests/css/css-flexbox/item-with-max-height-and-scrollbar.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/item-with-table-with-infinite-max-intrinsic-width.html b/tests/wpt/tests/css/css-flexbox/item-with-table-with-infinite-max-intrinsic-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/item-with-table-with-infinite-max-intrinsic-width.html rename to tests/wpt/tests/css/css-flexbox/item-with-table-with-infinite-max-intrinsic-width.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/justify-content-001.htm b/tests/wpt/tests/css/css-flexbox/justify-content-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/justify-content-001.htm rename to tests/wpt/tests/css/css-flexbox/justify-content-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/justify-content-002.htm b/tests/wpt/tests/css/css-flexbox/justify-content-002.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/justify-content-002.htm rename to tests/wpt/tests/css/css-flexbox/justify-content-002.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/justify-content-003.htm b/tests/wpt/tests/css/css-flexbox/justify-content-003.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/justify-content-003.htm rename to tests/wpt/tests/css/css-flexbox/justify-content-003.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/justify-content-004.htm b/tests/wpt/tests/css/css-flexbox/justify-content-004.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/justify-content-004.htm rename to tests/wpt/tests/css/css-flexbox/justify-content-004.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/justify-content-005.htm b/tests/wpt/tests/css/css-flexbox/justify-content-005.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/justify-content-005.htm rename to tests/wpt/tests/css/css-flexbox/justify-content-005.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/justify-content-006.html b/tests/wpt/tests/css/css-flexbox/justify-content-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/justify-content-006.html rename to tests/wpt/tests/css/css-flexbox/justify-content-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/justify-content-007.html b/tests/wpt/tests/css/css-flexbox/justify-content-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/justify-content-007.html rename to tests/wpt/tests/css/css-flexbox/justify-content-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/justify-content_center.html b/tests/wpt/tests/css/css-flexbox/justify-content_center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/justify-content_center.html rename to tests/wpt/tests/css/css-flexbox/justify-content_center.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/justify-content_flex-end.html b/tests/wpt/tests/css/css-flexbox/justify-content_flex-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/justify-content_flex-end.html rename to tests/wpt/tests/css/css-flexbox/justify-content_flex-end.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/justify-content_flex-start.html b/tests/wpt/tests/css/css-flexbox/justify-content_flex-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/justify-content_flex-start.html rename to tests/wpt/tests/css/css-flexbox/justify-content_flex-start.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/justify-content_space-around.html b/tests/wpt/tests/css/css-flexbox/justify-content_space-around.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/justify-content_space-around.html rename to tests/wpt/tests/css/css-flexbox/justify-content_space-around.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/justify-content_space-between-001.html b/tests/wpt/tests/css/css-flexbox/justify-content_space-between-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/justify-content_space-between-001.html rename to tests/wpt/tests/css/css-flexbox/justify-content_space-between-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/justify-content_space-between-002.html b/tests/wpt/tests/css/css-flexbox/justify-content_space-between-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/justify-content_space-between-002.html rename to tests/wpt/tests/css/css-flexbox/justify-content_space-between-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/layout-algorithm_algo-cross-line-001.html b/tests/wpt/tests/css/css-flexbox/layout-algorithm_algo-cross-line-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/layout-algorithm_algo-cross-line-001.html rename to tests/wpt/tests/css/css-flexbox/layout-algorithm_algo-cross-line-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/layout-algorithm_algo-cross-line-002.html b/tests/wpt/tests/css/css-flexbox/layout-algorithm_algo-cross-line-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/layout-algorithm_algo-cross-line-002.html rename to tests/wpt/tests/css/css-flexbox/layout-algorithm_algo-cross-line-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/layout-with-inline-svg-001.html b/tests/wpt/tests/css/css-flexbox/layout-with-inline-svg-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/layout-with-inline-svg-001.html rename to tests/wpt/tests/css/css-flexbox/layout-with-inline-svg-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/max-width-violation.html b/tests/wpt/tests/css/css-flexbox/max-width-violation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/max-width-violation.html rename to tests/wpt/tests/css/css-flexbox/max-width-violation.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/multiline-column-max-height.html b/tests/wpt/tests/css/css-flexbox/multiline-column-max-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/multiline-column-max-height.html rename to tests/wpt/tests/css/css-flexbox/multiline-column-max-height.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/multiline-min-max.html b/tests/wpt/tests/css/css-flexbox/multiline-min-max.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/multiline-min-max.html rename to tests/wpt/tests/css/css-flexbox/multiline-min-max.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/multiline-min-preferred-width.html b/tests/wpt/tests/css/css-flexbox/multiline-min-preferred-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/multiline-min-preferred-width.html rename to tests/wpt/tests/css/css-flexbox/multiline-min-preferred-width.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/multiline-reverse-wrap-baseline.html b/tests/wpt/tests/css/css-flexbox/multiline-reverse-wrap-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/multiline-reverse-wrap-baseline.html rename to tests/wpt/tests/css/css-flexbox/multiline-reverse-wrap-baseline.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/multiline-shrink-to-fit.html b/tests/wpt/tests/css/css-flexbox/multiline-shrink-to-fit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/multiline-shrink-to-fit.html rename to tests/wpt/tests/css/css-flexbox/multiline-shrink-to-fit.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/negative-available-size-crash.html b/tests/wpt/tests/css/css-flexbox/negative-available-size-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/negative-available-size-crash.html rename to tests/wpt/tests/css/css-flexbox/negative-available-size-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/negative-flex-margins-crash.html b/tests/wpt/tests/css/css-flexbox/negative-flex-margins-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/negative-flex-margins-crash.html rename to tests/wpt/tests/css/css-flexbox/negative-flex-margins-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/negative-flex-rounding-crash.html b/tests/wpt/tests/css/css-flexbox/negative-flex-rounding-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/negative-flex-rounding-crash.html rename to tests/wpt/tests/css/css-flexbox/negative-flex-rounding-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/negative-item-margins-002-crash.html b/tests/wpt/tests/css/css-flexbox/negative-item-margins-002-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/negative-item-margins-002-crash.html rename to tests/wpt/tests/css/css-flexbox/negative-item-margins-002-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/negative-item-margins-crash.html b/tests/wpt/tests/css/css-flexbox/negative-item-margins-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/negative-item-margins-crash.html rename to tests/wpt/tests/css/css-flexbox/negative-item-margins-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/negative-margins-001.html b/tests/wpt/tests/css/css-flexbox/negative-margins-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/negative-margins-001.html rename to tests/wpt/tests/css/css-flexbox/negative-margins-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/negative-overflow-002.html b/tests/wpt/tests/css/css-flexbox/negative-overflow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/negative-overflow-002.html rename to tests/wpt/tests/css/css-flexbox/negative-overflow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/negative-overflow.html b/tests/wpt/tests/css/css-flexbox/negative-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/negative-overflow.html rename to tests/wpt/tests/css/css-flexbox/negative-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/nested-orthogonal-flexbox-relayout.html b/tests/wpt/tests/css/css-flexbox/nested-orthogonal-flexbox-relayout.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/nested-orthogonal-flexbox-relayout.html rename to tests/wpt/tests/css/css-flexbox/nested-orthogonal-flexbox-relayout.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/order-001.htm b/tests/wpt/tests/css/css-flexbox/order-001.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/order-001.htm rename to tests/wpt/tests/css/css-flexbox/order-001.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/order-painting.html b/tests/wpt/tests/css/css-flexbox/order-painting.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/order-painting.html rename to tests/wpt/tests/css/css-flexbox/order-painting.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/order/order-abs-children-painting-order.html b/tests/wpt/tests/css/css-flexbox/order/order-abs-children-painting-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/order/order-abs-children-painting-order.html rename to tests/wpt/tests/css/css-flexbox/order/order-abs-children-painting-order.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/order/order-with-column-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/order/order-with-column-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/order/order-with-column-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/order/order-with-column-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/order/order-with-column-reverse.html b/tests/wpt/tests/css/css-flexbox/order/order-with-column-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/order/order-with-column-reverse.html rename to tests/wpt/tests/css/css-flexbox/order/order-with-column-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/order/order-with-row-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/order/order-with-row-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/order/order-with-row-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/order/order-with-row-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/order/order-with-row-reverse.html b/tests/wpt/tests/css/css-flexbox/order/order-with-row-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/order/order-with-row-reverse.html rename to tests/wpt/tests/css/css-flexbox/order/order-with-row-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/order_value.html b/tests/wpt/tests/css/css-flexbox/order_value.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/order_value.html rename to tests/wpt/tests/css/css-flexbox/order_value.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/ortho-table-item-001.html b/tests/wpt/tests/css/css-flexbox/ortho-table-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/ortho-table-item-001.html rename to tests/wpt/tests/css/css-flexbox/ortho-table-item-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/orthogonal-flex-item-crash.html b/tests/wpt/tests/css/css-flexbox/orthogonal-flex-item-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/orthogonal-flex-item-crash.html rename to tests/wpt/tests/css/css-flexbox/orthogonal-flex-item-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/orthogonal-writing-modes-and-intrinsic-sizing.html b/tests/wpt/tests/css/css-flexbox/orthogonal-writing-modes-and-intrinsic-sizing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/orthogonal-writing-modes-and-intrinsic-sizing.html rename to tests/wpt/tests/css/css-flexbox/orthogonal-writing-modes-and-intrinsic-sizing.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/overflow-area-001.html b/tests/wpt/tests/css/css-flexbox/overflow-area-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/overflow-area-001.html rename to tests/wpt/tests/css/css-flexbox/overflow-area-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/overflow-area-002.html b/tests/wpt/tests/css/css-flexbox/overflow-area-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/overflow-area-002.html rename to tests/wpt/tests/css/css-flexbox/overflow-area-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/overflow-area-003.html b/tests/wpt/tests/css/css-flexbox/overflow-area-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/overflow-area-003.html rename to tests/wpt/tests/css/css-flexbox/overflow-area-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-001.html b/tests/wpt/tests/css/css-flexbox/overflow-auto-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-001.html rename to tests/wpt/tests/css/css-flexbox/overflow-auto-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-002.html b/tests/wpt/tests/css/css-flexbox/overflow-auto-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-002.html rename to tests/wpt/tests/css/css-flexbox/overflow-auto-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-003.html b/tests/wpt/tests/css/css-flexbox/overflow-auto-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-003.html rename to tests/wpt/tests/css/css-flexbox/overflow-auto-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-004.html b/tests/wpt/tests/css/css-flexbox/overflow-auto-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-004.html rename to tests/wpt/tests/css/css-flexbox/overflow-auto-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-005.html b/tests/wpt/tests/css/css-flexbox/overflow-auto-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-005.html rename to tests/wpt/tests/css/css-flexbox/overflow-auto-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-006.html b/tests/wpt/tests/css/css-flexbox/overflow-auto-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-006.html rename to tests/wpt/tests/css/css-flexbox/overflow-auto-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-007.html b/tests/wpt/tests/css/css-flexbox/overflow-auto-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-007.html rename to tests/wpt/tests/css/css-flexbox/overflow-auto-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-008.html b/tests/wpt/tests/css/css-flexbox/overflow-auto-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/overflow-auto-008.html rename to tests/wpt/tests/css/css-flexbox/overflow-auto-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/overflow-top-left-ref.html b/tests/wpt/tests/css/css-flexbox/overflow-top-left-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/overflow-top-left-ref.html rename to tests/wpt/tests/css/css-flexbox/overflow-top-left-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/overflow-top-left.html b/tests/wpt/tests/css/css-flexbox/overflow-top-left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/overflow-top-left.html rename to tests/wpt/tests/css/css-flexbox/overflow-top-left.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/padding-overflow-crash.html b/tests/wpt/tests/css/css-flexbox/padding-overflow-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/padding-overflow-crash.html rename to tests/wpt/tests/css/css-flexbox/padding-overflow-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-basis-computed.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-basis-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-basis-computed.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-basis-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-basis-invalid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-basis-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-basis-invalid.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-basis-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-basis-valid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-basis-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-basis-valid.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-basis-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-computed.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-computed.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-direction-computed.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-direction-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-direction-computed.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-direction-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-direction-invalid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-direction-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-direction-invalid.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-direction-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-direction-valid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-direction-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-direction-valid.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-direction-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-flow-computed.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-flow-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-flow-computed.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-flow-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-flow-invalid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-flow-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-flow-invalid.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-flow-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-flow-shorthand.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-flow-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-flow-shorthand.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-flow-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-flow-valid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-flow-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-flow-valid.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-flow-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-grow-computed.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-grow-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-grow-computed.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-grow-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-grow-invalid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-grow-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-grow-invalid.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-grow-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-grow-valid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-grow-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-grow-valid.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-grow-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-invalid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-invalid.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-shorthand.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-shorthand.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-shrink-computed.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-shrink-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-shrink-computed.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-shrink-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-shrink-invalid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-shrink-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-shrink-invalid.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-shrink-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-shrink-valid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-shrink-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-shrink-valid.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-shrink-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-valid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-valid.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-wrap-computed.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-wrap-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-wrap-computed.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-wrap-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-wrap-invalid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-wrap-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-wrap-invalid.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-wrap-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-wrap-valid.html b/tests/wpt/tests/css/css-flexbox/parsing/flex-wrap-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/flex-wrap-valid.html rename to tests/wpt/tests/css/css-flexbox/parsing/flex-wrap-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/order-computed.html b/tests/wpt/tests/css/css-flexbox/parsing/order-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/order-computed.html rename to tests/wpt/tests/css/css-flexbox/parsing/order-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/order-invalid.html b/tests/wpt/tests/css/css-flexbox/parsing/order-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/order-invalid.html rename to tests/wpt/tests/css/css-flexbox/parsing/order-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/parsing/order-valid.html b/tests/wpt/tests/css/css-flexbox/parsing/order-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/parsing/order-valid.html rename to tests/wpt/tests/css/css-flexbox/parsing/order-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-descendant-of-anonymous-flex-item.html b/tests/wpt/tests/css/css-flexbox/percentage-descendant-of-anonymous-flex-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-descendant-of-anonymous-flex-item.html rename to tests/wpt/tests/css/css-flexbox/percentage-descendant-of-anonymous-flex-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-000.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-000.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-000.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-001.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-001.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-002-ref.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-002-ref.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-002.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-002.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-003.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-003.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-004-ref.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-004-ref.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-004.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-004.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-005.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-005.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-006.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-006.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-007.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-007.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-007.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-008.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-008.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-008.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-009.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-009.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-009.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-010.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-010.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-010.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-011.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-011.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-011.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-012.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-012.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-012.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-013.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-013.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-013.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-014.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-014.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-014.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-015-ref.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-015-ref.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-015.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-015.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-015.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-016.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-016.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-016.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-017.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-017.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-017.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-018.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-018.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-018.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-019.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-019.html rename to tests/wpt/tests/css/css-flexbox/percentage-heights-019.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-margins-001.html b/tests/wpt/tests/css/css-flexbox/percentage-margins-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-margins-001.html rename to tests/wpt/tests/css/css-flexbox/percentage-margins-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-height-001.html b/tests/wpt/tests/css/css-flexbox/percentage-max-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-height-001.html rename to tests/wpt/tests/css/css-flexbox/percentage-max-height-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-height-002.html b/tests/wpt/tests/css/css-flexbox/percentage-max-height-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-height-002.html rename to tests/wpt/tests/css/css-flexbox/percentage-max-height-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-height-003.html b/tests/wpt/tests/css/css-flexbox/percentage-max-height-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-height-003.html rename to tests/wpt/tests/css/css-flexbox/percentage-max-height-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-height-004-ref.html b/tests/wpt/tests/css/css-flexbox/percentage-max-height-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-height-004-ref.html rename to tests/wpt/tests/css/css-flexbox/percentage-max-height-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-height-004.html b/tests/wpt/tests/css/css-flexbox/percentage-max-height-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-height-004.html rename to tests/wpt/tests/css/css-flexbox/percentage-max-height-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-width-cross-axis.html b/tests/wpt/tests/css/css-flexbox/percentage-max-width-cross-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-width-cross-axis.html rename to tests/wpt/tests/css/css-flexbox/percentage-max-width-cross-axis.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-padding-001.html b/tests/wpt/tests/css/css-flexbox/percentage-padding-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-padding-001.html rename to tests/wpt/tests/css/css-flexbox/percentage-padding-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-padding-002-ref.html b/tests/wpt/tests/css/css-flexbox/percentage-padding-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-padding-002-ref.html rename to tests/wpt/tests/css/css-flexbox/percentage-padding-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-padding-002.html b/tests/wpt/tests/css/css-flexbox/percentage-padding-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-padding-002.html rename to tests/wpt/tests/css/css-flexbox/percentage-padding-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-padding-003.html b/tests/wpt/tests/css/css-flexbox/percentage-padding-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-padding-003.html rename to tests/wpt/tests/css/css-flexbox/percentage-padding-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-padding-004.html b/tests/wpt/tests/css/css-flexbox/percentage-padding-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-padding-004.html rename to tests/wpt/tests/css/css-flexbox/percentage-padding-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-size-quirks-002.html b/tests/wpt/tests/css/css-flexbox/percentage-size-quirks-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-size-quirks-002.html rename to tests/wpt/tests/css/css-flexbox/percentage-size-quirks-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-size-quirks.html b/tests/wpt/tests/css/css-flexbox/percentage-size-quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-size-quirks.html rename to tests/wpt/tests/css/css-flexbox/percentage-size-quirks.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-size-subitems-001.html b/tests/wpt/tests/css/css-flexbox/percentage-size-subitems-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-size-subitems-001.html rename to tests/wpt/tests/css/css-flexbox/percentage-size-subitems-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-size.html b/tests/wpt/tests/css/css-flexbox/percentage-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-size.html rename to tests/wpt/tests/css/css-flexbox/percentage-size.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-widths-001-ref.html b/tests/wpt/tests/css/css-flexbox/percentage-widths-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-widths-001-ref.html rename to tests/wpt/tests/css/css-flexbox/percentage-widths-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-widths-001.html b/tests/wpt/tests/css/css-flexbox/percentage-widths-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/percentage-widths-001.html rename to tests/wpt/tests/css/css-flexbox/percentage-widths-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-scrollbar-freeze-ref.html b/tests/wpt/tests/css/css-flexbox/position-absolute-scrollbar-freeze-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-scrollbar-freeze-ref.html rename to tests/wpt/tests/css/css-flexbox/position-absolute-scrollbar-freeze-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-scrollbar-freeze.html b/tests/wpt/tests/css/css-flexbox/position-absolute-scrollbar-freeze.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-scrollbar-freeze.html rename to tests/wpt/tests/css/css-flexbox/position-absolute-scrollbar-freeze.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-fixed-001.html b/tests/wpt/tests/css/css-flexbox/position-fixed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/position-fixed-001.html rename to tests/wpt/tests/css/css-flexbox/position-fixed-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-relative-percentage-top-001.html b/tests/wpt/tests/css/css-flexbox/position-relative-percentage-top-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/position-relative-percentage-top-001.html rename to tests/wpt/tests/css/css-flexbox/position-relative-percentage-top-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-relative-percentage-top-002.html b/tests/wpt/tests/css/css-flexbox/position-relative-percentage-top-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/position-relative-percentage-top-002.html rename to tests/wpt/tests/css/css-flexbox/position-relative-percentage-top-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-relative-percentage-top-003.html b/tests/wpt/tests/css/css-flexbox/position-relative-percentage-top-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/position-relative-percentage-top-003.html rename to tests/wpt/tests/css/css-flexbox/position-relative-percentage-top-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/position-relative-with-scrollable-with-abspos-crash.html b/tests/wpt/tests/css/css-flexbox/position-relative-with-scrollable-with-abspos-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/position-relative-with-scrollable-with-abspos-crash.html rename to tests/wpt/tests/css/css-flexbox/position-relative-with-scrollable-with-abspos-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/quirks-auto-block-size-with-percentage-item.html b/tests/wpt/tests/css/css-flexbox/quirks-auto-block-size-with-percentage-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/quirks-auto-block-size-with-percentage-item.html rename to tests/wpt/tests/css/css-flexbox/quirks-auto-block-size-with-percentage-item.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/radiobutton-min-size.html b/tests/wpt/tests/css/css-flexbox/radiobutton-min-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/radiobutton-min-size.html rename to tests/wpt/tests/css/css-flexbox/radiobutton-min-size.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/align-baseline-ref.html b/tests/wpt/tests/css/css-flexbox/reference/align-baseline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/align-baseline-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/align-baseline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/align-content-001-ref.html b/tests/wpt/tests/css/css-flexbox/reference/align-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/align-content-001-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/align-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/align-content_center-ref.html b/tests/wpt/tests/css/css-flexbox/reference/align-content_center-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/align-content_center-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/align-content_center-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/align-content_flex-end-ref.html b/tests/wpt/tests/css/css-flexbox/reference/align-content_flex-end-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/align-content_flex-end-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/align-content_flex-end-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/align-content_flex-start-ref.html b/tests/wpt/tests/css/css-flexbox/reference/align-content_flex-start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/align-content_flex-start-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/align-content_flex-start-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/align-content_space-around-ref.html b/tests/wpt/tests/css/css-flexbox/reference/align-content_space-around-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/align-content_space-around-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/align-content_space-around-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/align-content_space-between-ref.html b/tests/wpt/tests/css/css-flexbox/reference/align-content_space-between-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/align-content_space-between-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/align-content_space-between-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/align-content_stretch-ref.html b/tests/wpt/tests/css/css-flexbox/reference/align-content_stretch-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/align-content_stretch-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/align-content_stretch-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/align-items-baseline-overflow-non-visible-ref.html b/tests/wpt/tests/css/css-flexbox/reference/align-items-baseline-overflow-non-visible-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/align-items-baseline-overflow-non-visible-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/align-items-baseline-overflow-non-visible-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/align-self-015-ref.html b/tests/wpt/tests/css/css-flexbox/reference/align-self-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/align-self-015-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/align-self-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/anonymous-block-ref.html b/tests/wpt/tests/css/css-flexbox/reference/anonymous-block-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/anonymous-block-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/anonymous-block-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/auto-height-column-with-border-and-padding-ref.html b/tests/wpt/tests/css/css-flexbox/reference/auto-height-column-with-border-and-padding-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/auto-height-column-with-border-and-padding-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/auto-height-column-with-border-and-padding-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/auto-height-with-flex-ref.html b/tests/wpt/tests/css/css-flexbox/reference/auto-height-with-flex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/auto-height-with-flex-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/auto-height-with-flex-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/auto-margins-003-ref.html b/tests/wpt/tests/css/css-flexbox/reference/auto-margins-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/auto-margins-003-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/auto-margins-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/content-height-with-scrollbars-ref.html b/tests/wpt/tests/css/css-flexbox/reference/content-height-with-scrollbars-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/content-height-with-scrollbars-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/content-height-with-scrollbars-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/cross-axis-scrollbar-ref.html b/tests/wpt/tests/css/css-flexbox/reference/cross-axis-scrollbar-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/cross-axis-scrollbar-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/cross-axis-scrollbar-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/css-box-justify-content-ref.html b/tests/wpt/tests/css/css-flexbox/reference/css-box-justify-content-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/css-box-justify-content-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/css-box-justify-content-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/css-flexbox-img-expand-evenly-ref.html b/tests/wpt/tests/css/css-flexbox/reference/css-flexbox-img-expand-evenly-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/css-flexbox-img-expand-evenly-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/css-flexbox-img-expand-evenly-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-align-content-center-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-align-content-center-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-align-content-center-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-align-content-center-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-align-content-end-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-align-content-end-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-align-content-end-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-align-content-end-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-align-content-space-around-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-align-content-space-around-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-align-content-space-around-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-align-content-space-around-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-align-content-space-between-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-align-content-space-between-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-align-content-space-between-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-align-content-space-between-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-align-content-start-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-align-content-start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-align-content-start-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-align-content-start-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-aspect-ratio-img-row-014-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-aspect-ratio-img-row-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-aspect-ratio-img-row-014-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-aspect-ratio-img-row-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-box-float-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-box-float-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-box-float-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-box-float-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-box-wrap-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-box-wrap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-box-wrap-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-box-wrap-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-container-margin-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-container-margin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-container-margin-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-container-margin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-direction-column-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-direction-column-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-direction-column-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-direction-column-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-direction-column-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-direction-column-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-direction-column-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-direction-column-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-direction-modify.html b/tests/wpt/tests/css/css-flexbox/reference/flex-direction-modify.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-direction-modify.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-direction-modify.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-direction-row-reverse-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-direction-row-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-direction-row-reverse-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-direction-row-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-direction-with-element-insert.html b/tests/wpt/tests/css/css-flexbox/reference/flex-direction-with-element-insert.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-direction-with-element-insert.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-direction-with-element-insert.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-direction.html b/tests/wpt/tests/css/css-flexbox/reference/flex-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-direction.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-direction.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-inline-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-inline-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-item-vertical-align-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-item-vertical-align-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-item-vertical-align-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-item-vertical-align-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-item-z-ordering-001-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-item-z-ordering-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-item-z-ordering-001-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-item-z-ordering-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-margin-no-collapse-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flex-margin-no-collapse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-margin-no-collapse-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-margin-no-collapse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-vertical-align-effect.html b/tests/wpt/tests/css/css-flexbox/reference/flex-vertical-align-effect.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flex-vertical-align-effect.html rename to tests/wpt/tests/css/css-flexbox/reference/flex-vertical-align-effect.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox-flex-direction-column-percentage-ignored-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flexbox-flex-direction-column-percentage-ignored-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox-flex-direction-column-percentage-ignored-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flexbox-flex-direction-column-percentage-ignored-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox-flex-direction-ref.htm b/tests/wpt/tests/css/css-flexbox/reference/flexbox-flex-direction-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox-flex-direction-ref.htm rename to tests/wpt/tests/css/css-flexbox/reference/flexbox-flex-direction-ref.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox-flex-wrap-nowrap-ref.htm b/tests/wpt/tests/css/css-flexbox/reference/flexbox-flex-wrap-nowrap-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox-flex-wrap-nowrap-ref.htm rename to tests/wpt/tests/css/css-flexbox/reference/flexbox-flex-wrap-nowrap-ref.htm diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox-min-width-auto-005-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flexbox-min-width-auto-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox-min-width-auto-005-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flexbox-min-width-auto-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox-min-width-auto-006-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flexbox-min-width-auto-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox-min-width-auto-006-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flexbox-min-width-auto-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox-order-only-flexitems-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flexbox-order-only-flexitems-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox-order-only-flexitems-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flexbox-order-only-flexitems-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox-with-multi-column-property-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flexbox-with-multi-column-property-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox-with-multi-column-property-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flexbox-with-multi-column-property-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox_quirks_body-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flexbox_quirks_body-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox_quirks_body-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flexbox_quirks_body-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox_writing_mode_vertical_lays_out_contents_from_top_to_bottom-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flexbox_writing_mode_vertical_lays_out_contents_from_top_to_bottom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flexbox_writing_mode_vertical_lays_out_contents_from_top_to_bottom-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flexbox_writing_mode_vertical_lays_out_contents_from_top_to_bottom-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flexible-order-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flexible-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flexible-order-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flexible-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/flexitem-stretch-range-ref.html b/tests/wpt/tests/css/css-flexbox/reference/flexitem-stretch-range-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/flexitem-stretch-range-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/flexitem-stretch-range-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/item-with-max-height-and-scrollbar-ref.html b/tests/wpt/tests/css/css-flexbox/reference/item-with-max-height-and-scrollbar-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/item-with-max-height-and-scrollbar-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/item-with-max-height-and-scrollbar-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/justify-content-001-ref.html b/tests/wpt/tests/css/css-flexbox/reference/justify-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/justify-content-001-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/justify-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/layout-algorithm_algo-cross-line-001-ref.html b/tests/wpt/tests/css/css-flexbox/reference/layout-algorithm_algo-cross-line-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/layout-algorithm_algo-cross-line-001-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/layout-algorithm_algo-cross-line-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/layout-algorithm_algo-cross-line-002-ref.html b/tests/wpt/tests/css/css-flexbox/reference/layout-algorithm_algo-cross-line-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/layout-algorithm_algo-cross-line-002-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/layout-algorithm_algo-cross-line-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/multiline-column-max-height-ref.html b/tests/wpt/tests/css/css-flexbox/reference/multiline-column-max-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/multiline-column-max-height-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/multiline-column-max-height-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/multiline-reverse-wrap-baseline-ref.html b/tests/wpt/tests/css/css-flexbox/reference/multiline-reverse-wrap-baseline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/multiline-reverse-wrap-baseline-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/multiline-reverse-wrap-baseline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/multiline-shrink-to-fit-ref.html b/tests/wpt/tests/css/css-flexbox/reference/multiline-shrink-to-fit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/multiline-shrink-to-fit-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/multiline-shrink-to-fit-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/negative-margins-001-ref.html b/tests/wpt/tests/css/css-flexbox/reference/negative-margins-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/negative-margins-001-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/negative-margins-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/nested-orthogonal-flexbox-relayout-ref.html b/tests/wpt/tests/css/css-flexbox/reference/nested-orthogonal-flexbox-relayout-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/nested-orthogonal-flexbox-relayout-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/nested-orthogonal-flexbox-relayout-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/order-painting-ref.html b/tests/wpt/tests/css/css-flexbox/reference/order-painting-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/order-painting-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/order-painting-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/overflow-area-001-ref.html b/tests/wpt/tests/css/css-flexbox/reference/overflow-area-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/overflow-area-001-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/overflow-area-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/overflow-area-002-ref.html b/tests/wpt/tests/css/css-flexbox/reference/overflow-area-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/overflow-area-002-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/overflow-area-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/overflow-area-003-ref.html b/tests/wpt/tests/css/css-flexbox/reference/overflow-area-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/overflow-area-003-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/overflow-area-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/overflow-auto-005-ref.html b/tests/wpt/tests/css/css-flexbox/reference/overflow-auto-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/overflow-auto-005-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/overflow-auto-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/overflow-auto-007-ref.html b/tests/wpt/tests/css/css-flexbox/reference/overflow-auto-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/overflow-auto-007-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/overflow-auto-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/percentage-descendant-of-anonymous-flex-item-ref.html b/tests/wpt/tests/css/css-flexbox/reference/percentage-descendant-of-anonymous-flex-item-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/percentage-descendant-of-anonymous-flex-item-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/percentage-descendant-of-anonymous-flex-item-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/percentage-size-subitems-001-ref.html b/tests/wpt/tests/css/css-flexbox/reference/percentage-size-subitems-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/percentage-size-subitems-001-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/percentage-size-subitems-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/position-fixed-001-ref.html b/tests/wpt/tests/css/css-flexbox/reference/position-fixed-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/position-fixed-001-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/position-fixed-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/stretch-input-in-column-ref.html b/tests/wpt/tests/css/css-flexbox/reference/stretch-input-in-column-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/stretch-input-in-column-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/stretch-input-in-column-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/stretching-orthogonal-flows-ref.html b/tests/wpt/tests/css/css-flexbox/reference/stretching-orthogonal-flows-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/stretching-orthogonal-flows-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/stretching-orthogonal-flows-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/text-overflow-on-flexbox-001-ref.html b/tests/wpt/tests/css/css-flexbox/reference/text-overflow-on-flexbox-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/text-overflow-on-flexbox-001-ref.html rename to tests/wpt/tests/css/css-flexbox/reference/text-overflow-on-flexbox-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/relayout-align-items.html b/tests/wpt/tests/css/css-flexbox/relayout-align-items.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/relayout-align-items.html rename to tests/wpt/tests/css/css-flexbox/relayout-align-items.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/relayout-image-load.html b/tests/wpt/tests/css/css-flexbox/relayout-image-load.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/relayout-image-load.html rename to tests/wpt/tests/css/css-flexbox/relayout-image-load.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/relayout-input.html b/tests/wpt/tests/css/css-flexbox/relayout-input.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/relayout-input.html rename to tests/wpt/tests/css/css-flexbox/relayout-input.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/remove-out-of-flow-child-crash.html b/tests/wpt/tests/css/css-flexbox/remove-out-of-flow-child-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/remove-out-of-flow-child-crash.html rename to tests/wpt/tests/css/css-flexbox/remove-out-of-flow-child-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-auto-min-content-sizing.html b/tests/wpt/tests/css/css-flexbox/scrollbars-auto-min-content-sizing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-auto-min-content-sizing.html rename to tests/wpt/tests/css/css-flexbox/scrollbars-auto-min-content-sizing.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-auto-ref.html b/tests/wpt/tests/css/css-flexbox/scrollbars-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-auto-ref.html rename to tests/wpt/tests/css/css-flexbox/scrollbars-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-auto.html b/tests/wpt/tests/css/css-flexbox/scrollbars-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-auto.html rename to tests/wpt/tests/css/css-flexbox/scrollbars-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-no-margin-ref.html b/tests/wpt/tests/css/css-flexbox/scrollbars-no-margin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-no-margin-ref.html rename to tests/wpt/tests/css/css-flexbox/scrollbars-no-margin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-no-margin.html b/tests/wpt/tests/css/css-flexbox/scrollbars-no-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-no-margin.html rename to tests/wpt/tests/css/css-flexbox/scrollbars-no-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-ref.html b/tests/wpt/tests/css/css-flexbox/scrollbars-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/scrollbars-ref.html rename to tests/wpt/tests/css/css-flexbox/scrollbars-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/scrollbars.html b/tests/wpt/tests/css/css-flexbox/scrollbars.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/scrollbars.html rename to tests/wpt/tests/css/css-flexbox/scrollbars.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/select-element-zero-height-001-ref.html b/tests/wpt/tests/css/css-flexbox/select-element-zero-height-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/select-element-zero-height-001-ref.html rename to tests/wpt/tests/css/css-flexbox/select-element-zero-height-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/select-element-zero-height-001.html b/tests/wpt/tests/css/css-flexbox/select-element-zero-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/select-element-zero-height-001.html rename to tests/wpt/tests/css/css-flexbox/select-element-zero-height-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/select-element-zero-height-002-ref.html b/tests/wpt/tests/css/css-flexbox/select-element-zero-height-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/select-element-zero-height-002-ref.html rename to tests/wpt/tests/css/css-flexbox/select-element-zero-height-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/select-element-zero-height-002.html b/tests/wpt/tests/css/css-flexbox/select-element-zero-height-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/select-element-zero-height-002.html rename to tests/wpt/tests/css/css-flexbox/select-element-zero-height-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/shrinking-column-flexbox.html b/tests/wpt/tests/css/css-flexbox/shrinking-column-flexbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/shrinking-column-flexbox.html rename to tests/wpt/tests/css/css-flexbox/shrinking-column-flexbox.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/stretch-after-sibling-size-change.html b/tests/wpt/tests/css/css-flexbox/stretch-after-sibling-size-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/stretch-after-sibling-size-change.html rename to tests/wpt/tests/css/css-flexbox/stretch-after-sibling-size-change.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/stretch-flex-item-checkbox-input-ref.html b/tests/wpt/tests/css/css-flexbox/stretch-flex-item-checkbox-input-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/stretch-flex-item-checkbox-input-ref.html rename to tests/wpt/tests/css/css-flexbox/stretch-flex-item-checkbox-input-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/stretch-flex-item-checkbox-input.html b/tests/wpt/tests/css/css-flexbox/stretch-flex-item-checkbox-input.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/stretch-flex-item-checkbox-input.html rename to tests/wpt/tests/css/css-flexbox/stretch-flex-item-checkbox-input.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/stretch-flex-item-radio-input-ref.html b/tests/wpt/tests/css/css-flexbox/stretch-flex-item-radio-input-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/stretch-flex-item-radio-input-ref.html rename to tests/wpt/tests/css/css-flexbox/stretch-flex-item-radio-input-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/stretch-flex-item-radio-input.html b/tests/wpt/tests/css/css-flexbox/stretch-flex-item-radio-input.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/stretch-flex-item-radio-input.html rename to tests/wpt/tests/css/css-flexbox/stretch-flex-item-radio-input.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/stretch-input-in-column.html b/tests/wpt/tests/css/css-flexbox/stretch-input-in-column.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/stretch-input-in-column.html rename to tests/wpt/tests/css/css-flexbox/stretch-input-in-column.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/stretch-obeys-min-max-001.html b/tests/wpt/tests/css/css-flexbox/stretch-obeys-min-max-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/stretch-obeys-min-max-001.html rename to tests/wpt/tests/css/css-flexbox/stretch-obeys-min-max-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/stretch-obeys-min-max-002.html b/tests/wpt/tests/css/css-flexbox/stretch-obeys-min-max-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/stretch-obeys-min-max-002.html rename to tests/wpt/tests/css/css-flexbox/stretch-obeys-min-max-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/stretch-obeys-min-max-003.html b/tests/wpt/tests/css/css-flexbox/stretch-obeys-min-max-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/stretch-obeys-min-max-003.html rename to tests/wpt/tests/css/css-flexbox/stretch-obeys-min-max-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/stretched-child-shrink-on-relayout.html b/tests/wpt/tests/css/css-flexbox/stretched-child-shrink-on-relayout.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/stretched-child-shrink-on-relayout.html rename to tests/wpt/tests/css/css-flexbox/stretched-child-shrink-on-relayout.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/stretching-orthogonal-flows.html b/tests/wpt/tests/css/css-flexbox/stretching-orthogonal-flows.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/stretching-orthogonal-flows.html rename to tests/wpt/tests/css/css-flexbox/stretching-orthogonal-flows.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/100x100-blue.png b/tests/wpt/tests/css/css-flexbox/support/100x100-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/100x100-blue.png rename to tests/wpt/tests/css/css-flexbox/support/100x100-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/100x100-green.png b/tests/wpt/tests/css/css-flexbox/support/100x100-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/100x100-green.png rename to tests/wpt/tests/css/css-flexbox/support/100x100-green.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/10x10-green.png b/tests/wpt/tests/css/css-flexbox/support/10x10-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/10x10-green.png rename to tests/wpt/tests/css/css-flexbox/support/10x10-green.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/1x1-green.png b/tests/wpt/tests/css/css-flexbox/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/1x1-green.png rename to tests/wpt/tests/css/css-flexbox/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/1x1-lime.png b/tests/wpt/tests/css/css-flexbox/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/1x1-lime.png rename to tests/wpt/tests/css/css-flexbox/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/1x1-maroon.png b/tests/wpt/tests/css/css-flexbox/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/1x1-maroon.png rename to tests/wpt/tests/css/css-flexbox/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/1x1-navy.png b/tests/wpt/tests/css/css-flexbox/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/1x1-navy.png rename to tests/wpt/tests/css/css-flexbox/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/1x1-red.png b/tests/wpt/tests/css/css-flexbox/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/1x1-red.png rename to tests/wpt/tests/css/css-flexbox/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/1x1-white.png b/tests/wpt/tests/css/css-flexbox/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/1x1-white.png rename to tests/wpt/tests/css/css-flexbox/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/200x200-green.png b/tests/wpt/tests/css/css-flexbox/support/200x200-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/200x200-green.png rename to tests/wpt/tests/css/css-flexbox/support/200x200-green.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/20x50-green.png b/tests/wpt/tests/css/css-flexbox/support/20x50-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/20x50-green.png rename to tests/wpt/tests/css/css-flexbox/support/20x50-green.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/300x150-green.png b/tests/wpt/tests/css/css-flexbox/support/300x150-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/300x150-green.png rename to tests/wpt/tests/css/css-flexbox/support/300x150-green.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/40x20-green.png b/tests/wpt/tests/css/css-flexbox/support/40x20-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/40x20-green.png rename to tests/wpt/tests/css/css-flexbox/support/40x20-green.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/60x60-gg-rr.png b/tests/wpt/tests/css/css-flexbox/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/60x60-gg-rr.png rename to tests/wpt/tests/css/css-flexbox/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/60x60-green.png b/tests/wpt/tests/css/css-flexbox/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/60x60-green.png rename to tests/wpt/tests/css/css-flexbox/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/README b/tests/wpt/tests/css/css-flexbox/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/README rename to tests/wpt/tests/css/css-flexbox/support/README diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/a-green.css b/tests/wpt/tests/css/css-flexbox/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/a-green.css rename to tests/wpt/tests/css/css-flexbox/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/b-green.css b/tests/wpt/tests/css/css-flexbox/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/b-green.css rename to tests/wpt/tests/css/css-flexbox/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/c-red.css b/tests/wpt/tests/css/css-flexbox/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/c-red.css rename to tests/wpt/tests/css/css-flexbox/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/cat.png b/tests/wpt/tests/css/css-flexbox/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/cat.png rename to tests/wpt/tests/css/css-flexbox/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/flexbox.css b/tests/wpt/tests/css/css-flexbox/support/flexbox.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/flexbox.css rename to tests/wpt/tests/css/css-flexbox/support/flexbox.css diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/import-green.css b/tests/wpt/tests/css/css-flexbox/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/import-green.css rename to tests/wpt/tests/css/css-flexbox/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/import-red.css b/tests/wpt/tests/css/css-flexbox/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/import-red.css rename to tests/wpt/tests/css/css-flexbox/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/large-green-rectangle.svg b/tests/wpt/tests/css/css-flexbox/support/large-green-rectangle.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/large-green-rectangle.svg rename to tests/wpt/tests/css/css-flexbox/support/large-green-rectangle.svg diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/css-flexbox/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/css-flexbox/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/css-flexbox/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/css-flexbox/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/css-flexbox/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/css-flexbox/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/pattern-tr.png b/tests/wpt/tests/css/css-flexbox/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/pattern-tr.png rename to tests/wpt/tests/css/css-flexbox/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/ruler-h-50px.png b/tests/wpt/tests/css/css-flexbox/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/ruler-h-50px.png rename to tests/wpt/tests/css/css-flexbox/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/ruler-v-100px.png b/tests/wpt/tests/css/css-flexbox/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/ruler-v-100px.png rename to tests/wpt/tests/css/css-flexbox/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/ruler-v-50px.png b/tests/wpt/tests/css/css-flexbox/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/ruler-v-50px.png rename to tests/wpt/tests/css/css-flexbox/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/scrollbars.js b/tests/wpt/tests/css/css-flexbox/support/scrollbars.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/scrollbars.js rename to tests/wpt/tests/css/css-flexbox/support/scrollbars.js diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/solidblue.png b/tests/wpt/tests/css/css-flexbox/support/solidblue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/solidblue.png rename to tests/wpt/tests/css/css-flexbox/support/solidblue.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/square-purple.png b/tests/wpt/tests/css/css-flexbox/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/square-purple.png rename to tests/wpt/tests/css/css-flexbox/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/square-teal.png b/tests/wpt/tests/css/css-flexbox/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/square-teal.png rename to tests/wpt/tests/css/css-flexbox/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/square-white.png b/tests/wpt/tests/css/css-flexbox/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/square-white.png rename to tests/wpt/tests/css/css-flexbox/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/support/README b/tests/wpt/tests/css/css-flexbox/support/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/support/README rename to tests/wpt/tests/css/css-flexbox/support/support/README diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/support/swatch-green.png b/tests/wpt/tests/css/css-flexbox/support/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/support/swatch-green.png rename to tests/wpt/tests/css/css-flexbox/support/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/support/swatch-red.png b/tests/wpt/tests/css/css-flexbox/support/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/support/swatch-red.png rename to tests/wpt/tests/css/css-flexbox/support/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-blue.png b/tests/wpt/tests/css/css-flexbox/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-blue.png rename to tests/wpt/tests/css/css-flexbox/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-green.png b/tests/wpt/tests/css/css-flexbox/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-green.png rename to tests/wpt/tests/css/css-flexbox/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-lime.png b/tests/wpt/tests/css/css-flexbox/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-lime.png rename to tests/wpt/tests/css/css-flexbox/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-orange.png b/tests/wpt/tests/css/css-flexbox/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-orange.png rename to tests/wpt/tests/css/css-flexbox/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-red.png b/tests/wpt/tests/css/css-flexbox/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-red.png rename to tests/wpt/tests/css/css-flexbox/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-teal.png b/tests/wpt/tests/css/css-flexbox/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-teal.png rename to tests/wpt/tests/css/css-flexbox/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-white.png b/tests/wpt/tests/css/css-flexbox/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-white.png rename to tests/wpt/tests/css/css-flexbox/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-yellow.png b/tests/wpt/tests/css/css-flexbox/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/swatch-yellow.png rename to tests/wpt/tests/css/css-flexbox/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/test-bl.png b/tests/wpt/tests/css/css-flexbox/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/test-bl.png rename to tests/wpt/tests/css/css-flexbox/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/test-br.png b/tests/wpt/tests/css/css-flexbox/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/test-br.png rename to tests/wpt/tests/css/css-flexbox/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/test-inner-half-size.png b/tests/wpt/tests/css/css-flexbox/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/test-inner-half-size.png rename to tests/wpt/tests/css/css-flexbox/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/test-outer.png b/tests/wpt/tests/css/css-flexbox/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/test-outer.png rename to tests/wpt/tests/css/css-flexbox/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/test-style.css b/tests/wpt/tests/css/css-flexbox/support/test-style.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/test-style.css rename to tests/wpt/tests/css/css-flexbox/support/test-style.css diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/test-tl.png b/tests/wpt/tests/css/css-flexbox/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/test-tl.png rename to tests/wpt/tests/css/css-flexbox/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/support/test-tr.png b/tests/wpt/tests/css/css-flexbox/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/support/test-tr.png rename to tests/wpt/tests/css/css-flexbox/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/svg-no-natural-size-grandchild.html b/tests/wpt/tests/css/css-flexbox/svg-no-natural-size-grandchild.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/svg-no-natural-size-grandchild.html rename to tests/wpt/tests/css/css-flexbox/svg-no-natural-size-grandchild.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/svg-root-as-flex-item-001.html b/tests/wpt/tests/css/css-flexbox/svg-root-as-flex-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/svg-root-as-flex-item-001.html rename to tests/wpt/tests/css/css-flexbox/svg-root-as-flex-item-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/svg-root-as-flex-item-002.html b/tests/wpt/tests/css/css-flexbox/svg-root-as-flex-item-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/svg-root-as-flex-item-002.html rename to tests/wpt/tests/css/css-flexbox/svg-root-as-flex-item-002.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/svg-root-as-flex-item-003.html b/tests/wpt/tests/css/css-flexbox/svg-root-as-flex-item-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/svg-root-as-flex-item-003.html rename to tests/wpt/tests/css/css-flexbox/svg-root-as-flex-item-003.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/svg-root-as-flex-item-004.html b/tests/wpt/tests/css/css-flexbox/svg-root-as-flex-item-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/svg-root-as-flex-item-004.html rename to tests/wpt/tests/css/css-flexbox/svg-root-as-flex-item-004.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/svg-root-as-flex-item-005.html b/tests/wpt/tests/css/css-flexbox/svg-root-as-flex-item-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/svg-root-as-flex-item-005.html rename to tests/wpt/tests/css/css-flexbox/svg-root-as-flex-item-005.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/svg-root-as-flex-item-006.html b/tests/wpt/tests/css/css-flexbox/svg-root-as-flex-item-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/svg-root-as-flex-item-006.html rename to tests/wpt/tests/css/css-flexbox/svg-root-as-flex-item-006.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/synthesize-vrl-baseline.html b/tests/wpt/tests/css/css-flexbox/synthesize-vrl-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/synthesize-vrl-baseline.html rename to tests/wpt/tests/css/css-flexbox/synthesize-vrl-baseline.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-flex-item-max-content.html b/tests/wpt/tests/css/css-flexbox/table-as-flex-item-max-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-flex-item-max-content.html rename to tests/wpt/tests/css/css-flexbox/table-as-flex-item-max-content.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-auto-min-width.html b/tests/wpt/tests/css/css-flexbox/table-as-item-auto-min-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-auto-min-width.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-auto-min-width.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-change-cell.html b/tests/wpt/tests/css/css-flexbox/table-as-item-change-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-change-cell.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-change-cell.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-cross-size.html b/tests/wpt/tests/css/css-flexbox/table-as-item-cross-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-cross-size.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-cross-size.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-fixed-min-width-2.html b/tests/wpt/tests/css/css-flexbox/table-as-item-fixed-min-width-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-fixed-min-width-2.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-fixed-min-width-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-fixed-min-width-3.html b/tests/wpt/tests/css/css-flexbox/table-as-item-fixed-min-width-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-fixed-min-width-3.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-fixed-min-width-3.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-fixed-min-width.html b/tests/wpt/tests/css/css-flexbox/table-as-item-fixed-min-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-fixed-min-width.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-fixed-min-width.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-flex-cross-size.html b/tests/wpt/tests/css/css-flexbox/table-as-item-flex-cross-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-flex-cross-size.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-flex-cross-size.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-column-1.html b/tests/wpt/tests/css/css-flexbox/table-as-item-inflexible-in-column-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-column-1.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-inflexible-in-column-1.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-column-2.html b/tests/wpt/tests/css/css-flexbox/table-as-item-inflexible-in-column-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-column-2.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-inflexible-in-column-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-row-1.html b/tests/wpt/tests/css/css-flexbox/table-as-item-inflexible-in-row-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-row-1.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-inflexible-in-row-1.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-row-2.html b/tests/wpt/tests/css/css-flexbox/table-as-item-inflexible-in-row-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-row-2.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-inflexible-in-row-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-large-intrinsic-size.html b/tests/wpt/tests/css/css-flexbox/table-as-item-large-intrinsic-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-large-intrinsic-size.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-large-intrinsic-size.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-min-content-height-1.tentative.html b/tests/wpt/tests/css/css-flexbox/table-as-item-min-content-height-1.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-min-content-height-1.tentative.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-min-content-height-1.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-min-content-height-2.tentative.html b/tests/wpt/tests/css/css-flexbox/table-as-item-min-content-height-2.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-min-content-height-2.tentative.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-min-content-height-2.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-min-height-1.html b/tests/wpt/tests/css/css-flexbox/table-as-item-min-height-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-min-height-1.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-min-height-1.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-narrow-content-2.html b/tests/wpt/tests/css/css-flexbox/table-as-item-narrow-content-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-narrow-content-2.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-narrow-content-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-narrow-content.html b/tests/wpt/tests/css/css-flexbox/table-as-item-narrow-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-narrow-content.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-narrow-content.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-percent-width-cell-001-ref.html b/tests/wpt/tests/css/css-flexbox/table-as-item-percent-width-cell-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-percent-width-cell-001-ref.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-percent-width-cell-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-percent-width-cell-001.html b/tests/wpt/tests/css/css-flexbox/table-as-item-percent-width-cell-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-percent-width-cell-001.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-percent-width-cell-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-specified-height.html b/tests/wpt/tests/css/css-flexbox/table-as-item-specified-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-specified-height.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-specified-height.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-specified-width-vertical.html b/tests/wpt/tests/css/css-flexbox/table-as-item-specified-width-vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-specified-width-vertical.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-specified-width-vertical.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-specified-width.html b/tests/wpt/tests/css/css-flexbox/table-as-item-specified-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-specified-width.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-specified-width.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-stretch-cross-size-2.html b/tests/wpt/tests/css/css-flexbox/table-as-item-stretch-cross-size-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-stretch-cross-size-2.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-stretch-cross-size-2.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-stretch-cross-size-3.html b/tests/wpt/tests/css/css-flexbox/table-as-item-stretch-cross-size-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-stretch-cross-size-3.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-stretch-cross-size-3.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-stretch-cross-size-4.html b/tests/wpt/tests/css/css-flexbox/table-as-item-stretch-cross-size-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-stretch-cross-size-4.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-stretch-cross-size-4.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-stretch-cross-size-5.html b/tests/wpt/tests/css/css-flexbox/table-as-item-stretch-cross-size-5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-stretch-cross-size-5.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-stretch-cross-size-5.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-stretch-cross-size.html b/tests/wpt/tests/css/css-flexbox/table-as-item-stretch-cross-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-stretch-cross-size.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-stretch-cross-size.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-wide-content.html b/tests/wpt/tests/css/css-flexbox/table-as-item-wide-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-as-item-wide-content.html rename to tests/wpt/tests/css/css-flexbox/table-as-item-wide-content.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-item-flex-percentage-min-width-ref.html b/tests/wpt/tests/css/css-flexbox/table-item-flex-percentage-min-width-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-item-flex-percentage-min-width-ref.html rename to tests/wpt/tests/css/css-flexbox/table-item-flex-percentage-min-width-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-item-flex-percentage-min-width.html b/tests/wpt/tests/css/css-flexbox/table-item-flex-percentage-min-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-item-flex-percentage-min-width.html rename to tests/wpt/tests/css/css-flexbox/table-item-flex-percentage-min-width.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-item-flex-percentage-width-ref.html b/tests/wpt/tests/css/css-flexbox/table-item-flex-percentage-width-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-item-flex-percentage-width-ref.html rename to tests/wpt/tests/css/css-flexbox/table-item-flex-percentage-width-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-item-flex-percentage-width.html b/tests/wpt/tests/css/css-flexbox/table-item-flex-percentage-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-item-flex-percentage-width.html rename to tests/wpt/tests/css/css-flexbox/table-item-flex-percentage-width.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-with-float-paint.html b/tests/wpt/tests/css/css-flexbox/table-with-float-paint.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-with-float-paint.html rename to tests/wpt/tests/css/css-flexbox/table-with-float-paint.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-with-infinite-max-intrinsic-width.html b/tests/wpt/tests/css/css-flexbox/table-with-infinite-max-intrinsic-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-with-infinite-max-intrinsic-width.html rename to tests/wpt/tests/css/css-flexbox/table-with-infinite-max-intrinsic-width.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-with-percent-intrinsic-width.html b/tests/wpt/tests/css/css-flexbox/table-with-percent-intrinsic-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/table-with-percent-intrinsic-width.html rename to tests/wpt/tests/css/css-flexbox/table-with-percent-intrinsic-width.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/text-as-flexitem-size-001.html b/tests/wpt/tests/css/css-flexbox/text-as-flexitem-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/text-as-flexitem-size-001.html rename to tests/wpt/tests/css/css-flexbox/text-as-flexitem-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/text-overflow-on-flexbox-001.html b/tests/wpt/tests/css/css-flexbox/text-overflow-on-flexbox-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/text-overflow-on-flexbox-001.html rename to tests/wpt/tests/css/css-flexbox/text-overflow-on-flexbox-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/webkit-box-vertical-writing-mode-ref.html b/tests/wpt/tests/css/css-flexbox/webkit-box-vertical-writing-mode-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/webkit-box-vertical-writing-mode-ref.html rename to tests/wpt/tests/css/css-flexbox/webkit-box-vertical-writing-mode-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/webkit-box-vertical-writing-mode.html b/tests/wpt/tests/css/css-flexbox/webkit-box-vertical-writing-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/webkit-box-vertical-writing-mode.html rename to tests/wpt/tests/css/css-flexbox/webkit-box-vertical-writing-mode.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/whitespace-in-flexitem-001-ref.html b/tests/wpt/tests/css/css-flexbox/whitespace-in-flexitem-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/whitespace-in-flexitem-001-ref.html rename to tests/wpt/tests/css/css-flexbox/whitespace-in-flexitem-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/whitespace-in-flexitem-001.html b/tests/wpt/tests/css/css-flexbox/whitespace-in-flexitem-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/whitespace-in-flexitem-001.html rename to tests/wpt/tests/css/css-flexbox/whitespace-in-flexitem-001.html diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/zero-content-size-with-scrollbar-crash.html b/tests/wpt/tests/css/css-flexbox/zero-content-size-with-scrollbar-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-flexbox/zero-content-size-with-scrollbar-crash.html rename to tests/wpt/tests/css/css-flexbox/zero-content-size-with-scrollbar-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/META.yml b/tests/wpt/tests/css/css-font-loading/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/META.yml rename to tests/wpt/tests/css/css-font-loading/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/empty-family-load.html b/tests/wpt/tests/css/css-font-loading/empty-family-load.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/empty-family-load.html rename to tests/wpt/tests/css/css-font-loading/empty-family-load.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/font-face-reject.html b/tests/wpt/tests/css/css-font-loading/font-face-reject.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/font-face-reject.html rename to tests/wpt/tests/css/css-font-loading/font-face-reject.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontface-descriptor-updates-ref.html b/tests/wpt/tests/css/css-font-loading/fontface-descriptor-updates-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontface-descriptor-updates-ref.html rename to tests/wpt/tests/css/css-font-loading/fontface-descriptor-updates-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontface-descriptor-updates.html b/tests/wpt/tests/css/css-font-loading/fontface-descriptor-updates.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontface-descriptor-updates.html rename to tests/wpt/tests/css/css-font-loading/fontface-descriptor-updates.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontface-load-in-modal-dialog.html b/tests/wpt/tests/css/css-font-loading/fontface-load-in-modal-dialog.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontface-load-in-modal-dialog.html rename to tests/wpt/tests/css/css-font-loading/fontface-load-in-modal-dialog.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontface-override-descriptor-getter-setter.sub.html b/tests/wpt/tests/css/css-font-loading/fontface-override-descriptor-getter-setter.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontface-override-descriptor-getter-setter.sub.html rename to tests/wpt/tests/css/css-font-loading/fontface-override-descriptor-getter-setter.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontface-override-descriptors-ref.html b/tests/wpt/tests/css/css-font-loading/fontface-override-descriptors-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontface-override-descriptors-ref.html rename to tests/wpt/tests/css/css-font-loading/fontface-override-descriptors-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontface-override-descriptors.html b/tests/wpt/tests/css/css-font-loading/fontface-override-descriptors.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontface-override-descriptors.html rename to tests/wpt/tests/css/css-font-loading/fontface-override-descriptors.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontface-size-adjust-descriptor-ref.html b/tests/wpt/tests/css/css-font-loading/fontface-size-adjust-descriptor-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontface-size-adjust-descriptor-ref.html rename to tests/wpt/tests/css/css-font-loading/fontface-size-adjust-descriptor-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontface-size-adjust-descriptor.html b/tests/wpt/tests/css/css-font-loading/fontface-size-adjust-descriptor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontface-size-adjust-descriptor.html rename to tests/wpt/tests/css/css-font-loading/fontface-size-adjust-descriptor.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-add-css-connected.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-add-css-connected.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-add-css-connected.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-add-css-connected.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected-2-ref.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-clear-css-connected-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected-2-ref.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-clear-css-connected-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected-2.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-clear-css-connected-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected-2.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-clear-css-connected-2.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-clear-css-connected.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-clear-css-connected.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-2-ref.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-delete-css-connected-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-2-ref.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-delete-css-connected-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-2.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-delete-css-connected-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-2.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-delete-css-connected-2.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-delete-css-connected.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-delete-css-connected.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-has.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-has.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-has.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-load-css-connected.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-load-css-connected.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-load-css-connected.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-load-css-connected.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-load-css-wide-keywords.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-load-css-wide-keywords.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-load-css-wide-keywords.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-load-css-wide-keywords.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-load-var.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-load-var.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-load-var.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-load-var.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-loading-worker-crash.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-loading-worker-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-loading-worker-crash.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-loading-worker-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-no-root-element.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-no-root-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-no-root-element.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-no-root-element.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-worker-fontface-crash.html b/tests/wpt/tests/css/css-font-loading/fontfaceset-worker-fontface-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfaceset-worker-fontface-crash.html rename to tests/wpt/tests/css/css-font-loading/fontfaceset-worker-fontface-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/fontfacesetloadevent-constructor.html b/tests/wpt/tests/css/css-font-loading/fontfacesetloadevent-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/fontfacesetloadevent-constructor.html rename to tests/wpt/tests/css/css-font-loading/fontfacesetloadevent-constructor.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/idlharness.https.html b/tests/wpt/tests/css/css-font-loading/idlharness.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/idlharness.https.html rename to tests/wpt/tests/css/css-font-loading/idlharness.https.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/nonexistent-file-url.html b/tests/wpt/tests/css/css-font-loading/nonexistent-file-url.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/nonexistent-file-url.html rename to tests/wpt/tests/css/css-font-loading/nonexistent-file-url.html diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/resources/GenI102.woff2 b/tests/wpt/tests/css/css-font-loading/resources/GenI102.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/resources/GenI102.woff2 rename to tests/wpt/tests/css/css-font-loading/resources/GenI102.woff2 diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/resources/GenR102.woff2 b/tests/wpt/tests/css/css-font-loading/resources/GenR102.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/resources/GenR102.woff2 rename to tests/wpt/tests/css/css-font-loading/resources/GenR102.woff2 diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/resources/Rochester.otf b/tests/wpt/tests/css/css-font-loading/resources/Rochester.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/resources/Rochester.otf rename to tests/wpt/tests/css/css-font-loading/resources/Rochester.otf diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/support/fontfaceset-loading-worker.js b/tests/wpt/tests/css/css-font-loading/support/fontfaceset-loading-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-font-loading/support/fontfaceset-loading-worker.js rename to tests/wpt/tests/css/css-font-loading/support/fontfaceset-loading-worker.js diff --git a/tests/wpt/web-platform-tests/css/css-fonts/META.yml b/tests/wpt/tests/css/css-fonts/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/META.yml rename to tests/wpt/tests/css/css-fonts/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-fonts/README b/tests/wpt/tests/css/css-fonts/README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/README rename to tests/wpt/tests/css/css-fonts/README diff --git a/tests/wpt/web-platform-tests/css/css-fonts/alternates-order-ref.html b/tests/wpt/tests/css/css-fonts/alternates-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/alternates-order-ref.html rename to tests/wpt/tests/css/css-fonts/alternates-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/alternates-order.html b/tests/wpt/tests/css/css-fonts/alternates-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/alternates-order.html rename to tests/wpt/tests/css/css-fonts/alternates-order.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/animations/font-size-adjust-composition.html b/tests/wpt/tests/css/css-fonts/animations/font-size-adjust-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/animations/font-size-adjust-composition.html rename to tests/wpt/tests/css/css-fonts/animations/font-size-adjust-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/animations/font-size-adjust-interpolation.html b/tests/wpt/tests/css/css-fonts/animations/font-size-adjust-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/animations/font-size-adjust-interpolation.html rename to tests/wpt/tests/css/css-fonts/animations/font-size-adjust-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/animations/font-size-interpolation-001.html b/tests/wpt/tests/css/css-fonts/animations/font-size-interpolation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/animations/font-size-interpolation-001.html rename to tests/wpt/tests/css/css-fonts/animations/font-size-interpolation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/animations/font-size-interpolation-002.html b/tests/wpt/tests/css/css-fonts/animations/font-size-interpolation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/animations/font-size-interpolation-002.html rename to tests/wpt/tests/css/css-fonts/animations/font-size-interpolation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/animations/font-size-interpolation-003.html b/tests/wpt/tests/css/css-fonts/animations/font-size-interpolation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/animations/font-size-interpolation-003.html rename to tests/wpt/tests/css/css-fonts/animations/font-size-interpolation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/animations/font-stretch-interpolation.html b/tests/wpt/tests/css/css-fonts/animations/font-stretch-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/animations/font-stretch-interpolation.html rename to tests/wpt/tests/css/css-fonts/animations/font-stretch-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/animations/font-style-interpolation.html b/tests/wpt/tests/css/css-fonts/animations/font-style-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/animations/font-style-interpolation.html rename to tests/wpt/tests/css/css-fonts/animations/font-style-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/animations/font-variation-settings-composition.html b/tests/wpt/tests/css/css-fonts/animations/font-variation-settings-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/animations/font-variation-settings-composition.html rename to tests/wpt/tests/css/css-fonts/animations/font-variation-settings-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/animations/font-variation-settings-interpolation.html b/tests/wpt/tests/css/css-fonts/animations/font-variation-settings-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/animations/font-variation-settings-interpolation.html rename to tests/wpt/tests/css/css-fonts/animations/font-variation-settings-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/animations/system-fonts.html b/tests/wpt/tests/css/css-fonts/animations/system-fonts.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/animations/system-fonts.html rename to tests/wpt/tests/css/css-fonts/animations/system-fonts.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/ascent-descent-override-ref.html b/tests/wpt/tests/css/css-fonts/ascent-descent-override-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/ascent-descent-override-ref.html rename to tests/wpt/tests/css/css-fonts/ascent-descent-override-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/ascent-descent-override.html b/tests/wpt/tests/css/css-fonts/ascent-descent-override.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/ascent-descent-override.html rename to tests/wpt/tests/css/css-fonts/ascent-descent-override.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/calc-in-font-variation-settings.html b/tests/wpt/tests/css/css-fonts/calc-in-font-variation-settings.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/calc-in-font-variation-settings.html rename to tests/wpt/tests/css/css-fonts/calc-in-font-variation-settings.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/cjk-kerning.html b/tests/wpt/tests/css/css-fonts/cjk-kerning.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/cjk-kerning.html rename to tests/wpt/tests/css/css-fonts/cjk-kerning.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/crash-font-face-invalid-descriptor.html b/tests/wpt/tests/css/css-fonts/crash-font-face-invalid-descriptor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/crash-font-face-invalid-descriptor.html rename to tests/wpt/tests/css/css-fonts/crash-font-face-invalid-descriptor.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/crash-large-grapheme-cluster.html b/tests/wpt/tests/css/css-fonts/crash-large-grapheme-cluster.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/crash-large-grapheme-cluster.html rename to tests/wpt/tests/css/css-fonts/crash-large-grapheme-cluster.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/discrete-no-interpolation.html b/tests/wpt/tests/css/css-fonts/discrete-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/discrete-no-interpolation.html rename to tests/wpt/tests/css/css-fonts/discrete-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-in-iframe-print-ref.html b/tests/wpt/tests/css/css-fonts/downloadable-font-in-iframe-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-in-iframe-print-ref.html rename to tests/wpt/tests/css/css-fonts/downloadable-font-in-iframe-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-in-iframe-print.html b/tests/wpt/tests/css/css-fonts/downloadable-font-in-iframe-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-in-iframe-print.html rename to tests/wpt/tests/css/css-fonts/downloadable-font-in-iframe-print.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-print-ref.html b/tests/wpt/tests/css/css-fonts/downloadable-font-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-print-ref.html rename to tests/wpt/tests/css/css-fonts/downloadable-font-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-print.html b/tests/wpt/tests/css/css-fonts/downloadable-font-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-print.html rename to tests/wpt/tests/css/css-fonts/downloadable-font-print.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/fallback-remote-to-data-url.html b/tests/wpt/tests/css/css-fonts/fallback-remote-to-data-url.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/fallback-remote-to-data-url.html rename to tests/wpt/tests/css/css-fonts/fallback-remote-to-data-url.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/fallback-url-to-local.html b/tests/wpt/tests/css/css-fonts/fallback-url-to-local.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/fallback-url-to-local.html rename to tests/wpt/tests/css/css-fonts/fallback-url-to-local.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/first-available-font-001-ref.html b/tests/wpt/tests/css/css-fonts/first-available-font-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/first-available-font-001-ref.html rename to tests/wpt/tests/css/css-fonts/first-available-font-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/first-available-font-001.html b/tests/wpt/tests/css/css-fonts/first-available-font-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/first-available-font-001.html rename to tests/wpt/tests/css/css-fonts/first-available-font-001.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/first-available-font-002-ref.html b/tests/wpt/tests/css/css-fonts/first-available-font-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/first-available-font-002-ref.html rename to tests/wpt/tests/css/css-fonts/first-available-font-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/first-available-font-002.html b/tests/wpt/tests/css/css-fonts/first-available-font-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/first-available-font-002.html rename to tests/wpt/tests/css/css-fonts/first-available-font-002.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/first-available-font-003-ref.html b/tests/wpt/tests/css/css-fonts/first-available-font-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/first-available-font-003-ref.html rename to tests/wpt/tests/css/css-fonts/first-available-font-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/first-available-font-003.html b/tests/wpt/tests/css/css-fonts/first-available-font-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/first-available-font-003.html rename to tests/wpt/tests/css/css-fonts/first-available-font-003.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/first-available-font-004.html b/tests/wpt/tests/css/css-fonts/first-available-font-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/first-available-font-004.html rename to tests/wpt/tests/css/css-fonts/first-available-font-004.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/first-available-font-005-ref.html b/tests/wpt/tests/css/css-fonts/first-available-font-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/first-available-font-005-ref.html rename to tests/wpt/tests/css/css-fonts/first-available-font-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/first-available-font-005.html b/tests/wpt/tests/css/css-fonts/first-available-font-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/first-available-font-005.html rename to tests/wpt/tests/css/css-fonts/first-available-font-005.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/first-available-font-006.html b/tests/wpt/tests/css/css-fonts/first-available-font-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/first-available-font-006.html rename to tests/wpt/tests/css/css-fonts/first-available-font-006.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/first-available-font-007.html b/tests/wpt/tests/css/css-fonts/first-available-font-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/first-available-font-007.html rename to tests/wpt/tests/css/css-fonts/first-available-font-007.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-colorization-ref.html b/tests/wpt/tests/css/css-fonts/font-colorization-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-colorization-ref.html rename to tests/wpt/tests/css/css-fonts/font-colorization-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-colorization.html b/tests/wpt/tests/css/css-fonts/font-colorization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-colorization.html rename to tests/wpt/tests/css/css-fonts/font-colorization.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-default-01-ref.html b/tests/wpt/tests/css/css-fonts/font-default-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-default-01-ref.html rename to tests/wpt/tests/css/css-fonts/font-default-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-default-01.html b/tests/wpt/tests/css/css-fonts/font-default-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-default-01.html rename to tests/wpt/tests/css/css-fonts/font-default-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-default-02-ref.html b/tests/wpt/tests/css/css-fonts/font-default-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-default-02-ref.html rename to tests/wpt/tests/css/css-fonts/font-default-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-default-02.html b/tests/wpt/tests/css/css-fonts/font-default-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-default-02.html rename to tests/wpt/tests/css/css-fonts/font-default-02.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-default-03-ref.html b/tests/wpt/tests/css/css-fonts/font-default-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-default-03-ref.html rename to tests/wpt/tests/css/css-fonts/font-default-03-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-default-03.html b/tests/wpt/tests/css/css-fonts/font-default-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-default-03.html rename to tests/wpt/tests/css/css-fonts/font-default-03.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-default-04-a-ref.html b/tests/wpt/tests/css/css-fonts/font-default-04-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-default-04-a-ref.html rename to tests/wpt/tests/css/css-fonts/font-default-04-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-default-04-b-ref.html b/tests/wpt/tests/css/css-fonts/font-default-04-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-default-04-b-ref.html rename to tests/wpt/tests/css/css-fonts/font-default-04-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-default-04-c-ref.html b/tests/wpt/tests/css/css-fonts/font-default-04-c-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-default-04-c-ref.html rename to tests/wpt/tests/css/css-fonts/font-default-04-c-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-default-04.html b/tests/wpt/tests/css/css-fonts/font-default-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-default-04.html rename to tests/wpt/tests/css/css-fonts/font-default-04.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-change-ref.html b/tests/wpt/tests/css/css-fonts/font-display/font-display-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-change-ref.html rename to tests/wpt/tests/css/css-fonts/font-display/font-display-change-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-change.html b/tests/wpt/tests/css/css-fonts/font-display/font-display-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-change.html rename to tests/wpt/tests/css/css-fonts/font-display/font-display-change.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-failure-fallback.html b/tests/wpt/tests/css/css-fonts/font-display/font-display-failure-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-failure-fallback.html rename to tests/wpt/tests/css/css-fonts/font-display/font-display-failure-fallback.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative-ref.html b/tests/wpt/tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative-ref.html rename to tests/wpt/tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html b/tests/wpt/tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html rename to tests/wpt/tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.headers b/tests/wpt/tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.headers rename to tests/wpt/tests/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-preload-ref.html b/tests/wpt/tests/css/css-fonts/font-display/font-display-preload-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-preload-ref.html rename to tests/wpt/tests/css/css-fonts/font-display/font-display-preload-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-preload.html b/tests/wpt/tests/css/css-fonts/font-display/font-display-preload.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-preload.html rename to tests/wpt/tests/css/css-fonts/font-display/font-display-preload.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-ref.html b/tests/wpt/tests/css/css-fonts/font-display/font-display-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display-ref.html rename to tests/wpt/tests/css/css-fonts/font-display/font-display-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display.html b/tests/wpt/tests/css/css-fonts/font-display/font-display.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-display/font-display.html rename to tests/wpt/tests/css/css-fonts/font-display/font-display.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-local-css-wide-keyword-crash.html b/tests/wpt/tests/css/css-fonts/font-face-local-css-wide-keyword-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-local-css-wide-keyword-crash.html rename to tests/wpt/tests/css/css-fonts/font-face-local-css-wide-keyword-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-range-order.html b/tests/wpt/tests/css/css-fonts/font-face-range-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-range-order.html rename to tests/wpt/tests/css/css-fonts/font-face-range-order.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-stretch-auto-static-ref.html b/tests/wpt/tests/css/css-fonts/font-face-stretch-auto-static-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-stretch-auto-static-ref.html rename to tests/wpt/tests/css/css-fonts/font-face-stretch-auto-static-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-stretch-auto-static.html b/tests/wpt/tests/css/css-fonts/font-face-stretch-auto-static.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-stretch-auto-static.html rename to tests/wpt/tests/css/css-fonts/font-face-stretch-auto-static.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-stretch-auto-variable-ref.html b/tests/wpt/tests/css/css-fonts/font-face-stretch-auto-variable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-stretch-auto-variable-ref.html rename to tests/wpt/tests/css/css-fonts/font-face-stretch-auto-variable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-stretch-auto-variable.html b/tests/wpt/tests/css/css-fonts/font-face-stretch-auto-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-stretch-auto-variable.html rename to tests/wpt/tests/css/css-fonts/font-face-stretch-auto-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-stretch-default-variable-ref.html b/tests/wpt/tests/css/css-fonts/font-face-stretch-default-variable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-stretch-default-variable-ref.html rename to tests/wpt/tests/css/css-fonts/font-face-stretch-default-variable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-stretch-default-variable.html b/tests/wpt/tests/css/css-fonts/font-face-stretch-default-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-stretch-default-variable.html rename to tests/wpt/tests/css/css-fonts/font-face-stretch-default-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-style-auto-static-ref.html b/tests/wpt/tests/css/css-fonts/font-face-style-auto-static-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-style-auto-static-ref.html rename to tests/wpt/tests/css/css-fonts/font-face-style-auto-static-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-style-auto-static.html b/tests/wpt/tests/css/css-fonts/font-face-style-auto-static.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-style-auto-static.html rename to tests/wpt/tests/css/css-fonts/font-face-style-auto-static.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-style-auto-variable-ref.html b/tests/wpt/tests/css/css-fonts/font-face-style-auto-variable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-style-auto-variable-ref.html rename to tests/wpt/tests/css/css-fonts/font-face-style-auto-variable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-style-auto-variable.html b/tests/wpt/tests/css/css-fonts/font-face-style-auto-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-style-auto-variable.html rename to tests/wpt/tests/css/css-fonts/font-face-style-auto-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-style-default-variable-ref.html b/tests/wpt/tests/css/css-fonts/font-face-style-default-variable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-style-default-variable-ref.html rename to tests/wpt/tests/css/css-fonts/font-face-style-default-variable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-style-default-variable.html b/tests/wpt/tests/css/css-fonts/font-face-style-default-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-style-default-variable.html rename to tests/wpt/tests/css/css-fonts/font-face-style-default-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-2-ref.html b/tests/wpt/tests/css/css-fonts/font-face-unicode-range-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-2-ref.html rename to tests/wpt/tests/css/css-fonts/font-face-unicode-range-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-2.html b/tests/wpt/tests/css/css-fonts/font-face-unicode-range-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-2.html rename to tests/wpt/tests/css/css-fonts/font-face-unicode-range-2.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-nbsp-ref.html b/tests/wpt/tests/css/css-fonts/font-face-unicode-range-nbsp-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-nbsp-ref.html rename to tests/wpt/tests/css/css-fonts/font-face-unicode-range-nbsp-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-nbsp.html b/tests/wpt/tests/css/css-fonts/font-face-unicode-range-nbsp.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-nbsp.html rename to tests/wpt/tests/css/css-fonts/font-face-unicode-range-nbsp.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range.html b/tests/wpt/tests/css/css-fonts/font-face-unicode-range.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range.html rename to tests/wpt/tests/css/css-fonts/font-face-unicode-range.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-weight-auto-static-ref.html b/tests/wpt/tests/css/css-fonts/font-face-weight-auto-static-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-weight-auto-static-ref.html rename to tests/wpt/tests/css/css-fonts/font-face-weight-auto-static-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-weight-auto-static.html b/tests/wpt/tests/css/css-fonts/font-face-weight-auto-static.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-weight-auto-static.html rename to tests/wpt/tests/css/css-fonts/font-face-weight-auto-static.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-weight-auto-variable-ref.html b/tests/wpt/tests/css/css-fonts/font-face-weight-auto-variable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-weight-auto-variable-ref.html rename to tests/wpt/tests/css/css-fonts/font-face-weight-auto-variable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-weight-auto-variable.html b/tests/wpt/tests/css/css-fonts/font-face-weight-auto-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-weight-auto-variable.html rename to tests/wpt/tests/css/css-fonts/font-face-weight-auto-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-weight-default-variable-ref.html b/tests/wpt/tests/css/css-fonts/font-face-weight-default-variable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-weight-default-variable-ref.html rename to tests/wpt/tests/css/css-fonts/font-face-weight-default-variable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-weight-default-variable.html b/tests/wpt/tests/css/css-fonts/font-face-weight-default-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-face-weight-default-variable.html rename to tests/wpt/tests/css/css-fonts/font-face-weight-default-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-000.xht b/tests/wpt/tests/css/css-fonts/font-family-name-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-000.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-001.xht b/tests/wpt/tests/css/css-fonts/font-family-name-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-001.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-002.xht b/tests/wpt/tests/css/css-fonts/font-family-name-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-002.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-003.xht b/tests/wpt/tests/css/css-fonts/font-family-name-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-003.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-004.xht b/tests/wpt/tests/css/css-fonts/font-family-name-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-004.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-005.xht b/tests/wpt/tests/css/css-fonts/font-family-name-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-005.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-006.xht b/tests/wpt/tests/css/css-fonts/font-family-name-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-006.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-007.xht b/tests/wpt/tests/css/css-fonts/font-family-name-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-007.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-008.xht b/tests/wpt/tests/css/css-fonts/font-family-name-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-008.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-009.xht b/tests/wpt/tests/css/css-fonts/font-family-name-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-009.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-010.xht b/tests/wpt/tests/css/css-fonts/font-family-name-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-010.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-011.xht b/tests/wpt/tests/css/css-fonts/font-family-name-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-011.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-012.xht b/tests/wpt/tests/css/css-fonts/font-family-name-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-012.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-013.xht b/tests/wpt/tests/css/css-fonts/font-family-name-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-013.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-014.xht b/tests/wpt/tests/css/css-fonts/font-family-name-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-014.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-015.xht b/tests/wpt/tests/css/css-fonts/font-family-name-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-015.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-016-ref.xht b/tests/wpt/tests/css/css-fonts/font-family-name-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-016-ref.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-016.xht b/tests/wpt/tests/css/css-fonts/font-family-name-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-016.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-017.xht b/tests/wpt/tests/css/css-fonts/font-family-name-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-017.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-018.xht b/tests/wpt/tests/css/css-fonts/font-family-name-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-018.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-019.xht b/tests/wpt/tests/css/css-fonts/font-family-name-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-019.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-019.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-020.xht b/tests/wpt/tests/css/css-fonts/font-family-name-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-020.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-020.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-021.xht b/tests/wpt/tests/css/css-fonts/font-family-name-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-021.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-021.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-022-ref.xht b/tests/wpt/tests/css/css-fonts/font-family-name-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-022-ref.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-022.xht b/tests/wpt/tests/css/css-fonts/font-family-name-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-022.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-022.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-023-ref.xht b/tests/wpt/tests/css/css-fonts/font-family-name-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-023-ref.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-023.xht b/tests/wpt/tests/css/css-fonts/font-family-name-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-023.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-023.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-024-ref.xht b/tests/wpt/tests/css/css-fonts/font-family-name-024-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-024-ref.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-024-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-024.xht b/tests/wpt/tests/css/css-fonts/font-family-name-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-024.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-024.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-025-ref.html b/tests/wpt/tests/css/css-fonts/font-family-name-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-025-ref.html rename to tests/wpt/tests/css/css-fonts/font-family-name-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-025.html b/tests/wpt/tests/css/css-fonts/font-family-name-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-025.html rename to tests/wpt/tests/css/css-fonts/font-family-name-025.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-mixcase-ref.xht b/tests/wpt/tests/css/css-fonts/font-family-name-mixcase-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-mixcase-ref.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-mixcase-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-name-ref.xht b/tests/wpt/tests/css/css-fonts/font-family-name-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-name-ref.xht rename to tests/wpt/tests/css/css-fonts/font-family-name-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-family-src-quoted.html b/tests/wpt/tests/css/css-fonts/font-family-src-quoted.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-family-src-quoted.html rename to tests/wpt/tests/css/css-fonts/font-family-src-quoted.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-001-ref.html b/tests/wpt/tests/css/css-fonts/font-feature-resolution-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-001-ref.html rename to tests/wpt/tests/css/css-fonts/font-feature-resolution-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-001.html b/tests/wpt/tests/css/css-fonts/font-feature-resolution-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-001.html rename to tests/wpt/tests/css/css-fonts/font-feature-resolution-001.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-002-ref.html b/tests/wpt/tests/css/css-fonts/font-feature-resolution-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-002-ref.html rename to tests/wpt/tests/css/css-fonts/font-feature-resolution-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-002.html b/tests/wpt/tests/css/css-fonts/font-feature-resolution-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-feature-resolution-002.html rename to tests/wpt/tests/css/css-fonts/font-feature-resolution-002.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-descriptor-01-ref.html b/tests/wpt/tests/css/css-fonts/font-feature-settings-descriptor-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-descriptor-01-ref.html rename to tests/wpt/tests/css/css-fonts/font-feature-settings-descriptor-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-descriptor-01.html b/tests/wpt/tests/css/css-fonts/font-feature-settings-descriptor-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-descriptor-01.html rename to tests/wpt/tests/css/css-fonts/font-feature-settings-descriptor-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-serialization-001.html b/tests/wpt/tests/css/css-fonts/font-feature-settings-serialization-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-serialization-001.html rename to tests/wpt/tests/css/css-fonts/font-feature-settings-serialization-001.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-tibetan-ref.html b/tests/wpt/tests/css/css-fonts/font-feature-settings-tibetan-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-tibetan-ref.html rename to tests/wpt/tests/css/css-fonts/font-feature-settings-tibetan-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-tibetan.html b/tests/wpt/tests/css/css-fonts/font-feature-settings-tibetan.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-tibetan.html rename to tests/wpt/tests/css/css-fonts/font-feature-settings-tibetan.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-features-across-space-1-ref.html b/tests/wpt/tests/css/css-fonts/font-features-across-space-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-features-across-space-1-ref.html rename to tests/wpt/tests/css/css-fonts/font-features-across-space-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-features-across-space-1.html b/tests/wpt/tests/css/css-fonts/font-features-across-space-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-features-across-space-1.html rename to tests/wpt/tests/css/css-fonts/font-features-across-space-1.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-features-across-space-2.html b/tests/wpt/tests/css/css-fonts/font-features-across-space-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-features-across-space-2.html rename to tests/wpt/tests/css/css-fonts/font-features-across-space-2.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-features-across-space-3.html b/tests/wpt/tests/css/css-fonts/font-features-across-space-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-features-across-space-3.html rename to tests/wpt/tests/css/css-fonts/font-features-across-space-3.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-features-two-stylesheets-crash.html b/tests/wpt/tests/css/css-fonts/font-features-two-stylesheets-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-features-two-stylesheets-crash.html rename to tests/wpt/tests/css/css-fonts/font-features-two-stylesheets-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-kerning-01-ref.html b/tests/wpt/tests/css/css-fonts/font-kerning-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-kerning-01-ref.html rename to tests/wpt/tests/css/css-fonts/font-kerning-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-kerning-01.html b/tests/wpt/tests/css/css-fonts/font-kerning-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-kerning-01.html rename to tests/wpt/tests/css/css-fonts/font-kerning-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-kerning-02-ref.html b/tests/wpt/tests/css/css-fonts/font-kerning-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-kerning-02-ref.html rename to tests/wpt/tests/css/css-fonts/font-kerning-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-kerning-02.html b/tests/wpt/tests/css/css-fonts/font-kerning-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-kerning-02.html rename to tests/wpt/tests/css/css-fonts/font-kerning-02.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-kerning-03-ref.html b/tests/wpt/tests/css/css-fonts/font-kerning-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-kerning-03-ref.html rename to tests/wpt/tests/css/css-fonts/font-kerning-03-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-kerning-03.html b/tests/wpt/tests/css/css-fonts/font-kerning-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-kerning-03.html rename to tests/wpt/tests/css/css-fonts/font-kerning-03.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-kerning-04-ref.html b/tests/wpt/tests/css/css-fonts/font-kerning-04-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-kerning-04-ref.html rename to tests/wpt/tests/css/css-fonts/font-kerning-04-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-kerning-04.html b/tests/wpt/tests/css/css-fonts/font-kerning-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-kerning-04.html rename to tests/wpt/tests/css/css-fonts/font-kerning-04.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-kerning-05-ref.html b/tests/wpt/tests/css/css-fonts/font-kerning-05-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-kerning-05-ref.html rename to tests/wpt/tests/css/css-fonts/font-kerning-05-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-kerning-05.html b/tests/wpt/tests/css/css-fonts/font-kerning-05.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-kerning-05.html rename to tests/wpt/tests/css/css-fonts/font-kerning-05.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-language-override-01-ref.html b/tests/wpt/tests/css/css-fonts/font-language-override-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-language-override-01-ref.html rename to tests/wpt/tests/css/css-fonts/font-language-override-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-language-override-01.html b/tests/wpt/tests/css/css-fonts/font-language-override-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-language-override-01.html rename to tests/wpt/tests/css/css-fonts/font-language-override-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-language-override-02-notref.html b/tests/wpt/tests/css/css-fonts/font-language-override-02-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-language-override-02-notref.html rename to tests/wpt/tests/css/css-fonts/font-language-override-02-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-language-override-02-ref.html b/tests/wpt/tests/css/css-fonts/font-language-override-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-language-override-02-ref.html rename to tests/wpt/tests/css/css-fonts/font-language-override-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-language-override-02.html b/tests/wpt/tests/css/css-fonts/font-language-override-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-language-override-02.html rename to tests/wpt/tests/css/css-fonts/font-language-override-02.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-language-override-03.html b/tests/wpt/tests/css/css-fonts/font-language-override-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-language-override-03.html rename to tests/wpt/tests/css/css-fonts/font-language-override-03.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-10-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-10-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-10-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-10-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-10.html b/tests/wpt/tests/css/css-fonts/font-palette-10.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-10.html rename to tests/wpt/tests/css/css-fonts/font-palette-10.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-11-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-11-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-11-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-11-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-11.html b/tests/wpt/tests/css/css-fonts/font-palette-11.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-11.html rename to tests/wpt/tests/css/css-fonts/font-palette-11.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-12-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-12-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-12-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-12-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-12.html b/tests/wpt/tests/css/css-fonts/font-palette-12.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-12.html rename to tests/wpt/tests/css/css-fonts/font-palette-12.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-13-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-13-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-13-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-13-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-13.html b/tests/wpt/tests/css/css-fonts/font-palette-13.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-13.html rename to tests/wpt/tests/css/css-fonts/font-palette-13.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-14-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-14-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-14-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-14-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-14.html b/tests/wpt/tests/css/css-fonts/font-palette-14.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-14.html rename to tests/wpt/tests/css/css-fonts/font-palette-14.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-15-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-15-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-15-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-15-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-15.html b/tests/wpt/tests/css/css-fonts/font-palette-15.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-15.html rename to tests/wpt/tests/css/css-fonts/font-palette-15.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-16-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-16-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-16-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-16-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-16.html b/tests/wpt/tests/css/css-fonts/font-palette-16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-16.html rename to tests/wpt/tests/css/css-fonts/font-palette-16.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-17-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-17-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-17-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-17-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-17.html b/tests/wpt/tests/css/css-fonts/font-palette-17.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-17.html rename to tests/wpt/tests/css/css-fonts/font-palette-17.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-18-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-18-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-18-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-18-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-18.html b/tests/wpt/tests/css/css-fonts/font-palette-18.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-18.html rename to tests/wpt/tests/css/css-fonts/font-palette-18.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-19-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-19-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-19-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-19-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-19.html b/tests/wpt/tests/css/css-fonts/font-palette-19.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-19.html rename to tests/wpt/tests/css/css-fonts/font-palette-19.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-2-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-2-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-2.html b/tests/wpt/tests/css/css-fonts/font-palette-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-2.html rename to tests/wpt/tests/css/css-fonts/font-palette-2.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-20-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-20-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-20-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-20-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-20.html b/tests/wpt/tests/css/css-fonts/font-palette-20.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-20.html rename to tests/wpt/tests/css/css-fonts/font-palette-20.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-21-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-21-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-21-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-21-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-21.html b/tests/wpt/tests/css/css-fonts/font-palette-21.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-21.html rename to tests/wpt/tests/css/css-fonts/font-palette-21.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-22-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-22-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-22-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-22-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-22.html b/tests/wpt/tests/css/css-fonts/font-palette-22.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-22.html rename to tests/wpt/tests/css/css-fonts/font-palette-22.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-23-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-23-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-23-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-23-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-23.html b/tests/wpt/tests/css/css-fonts/font-palette-23.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-23.html rename to tests/wpt/tests/css/css-fonts/font-palette-23.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-24-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-24-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-24-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-24-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-24.html b/tests/wpt/tests/css/css-fonts/font-palette-24.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-24.html rename to tests/wpt/tests/css/css-fonts/font-palette-24.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-25-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-25-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-25-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-25-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-25.html b/tests/wpt/tests/css/css-fonts/font-palette-25.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-25.html rename to tests/wpt/tests/css/css-fonts/font-palette-25.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-26-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-26-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-26-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-26-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-26.html b/tests/wpt/tests/css/css-fonts/font-palette-26.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-26.html rename to tests/wpt/tests/css/css-fonts/font-palette-26.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-27-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-27-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-27-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-27-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-27.html b/tests/wpt/tests/css/css-fonts/font-palette-27.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-27.html rename to tests/wpt/tests/css/css-fonts/font-palette-27.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-28-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-28-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-28-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-28-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-28.html b/tests/wpt/tests/css/css-fonts/font-palette-28.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-28.html rename to tests/wpt/tests/css/css-fonts/font-palette-28.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-29-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-29-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-29-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-29-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-29.html b/tests/wpt/tests/css/css-fonts/font-palette-29.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-29.html rename to tests/wpt/tests/css/css-fonts/font-palette-29.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-3-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-3-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-3-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-3-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-3.html b/tests/wpt/tests/css/css-fonts/font-palette-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-3.html rename to tests/wpt/tests/css/css-fonts/font-palette-3.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-30-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-30-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-30-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-30-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-30.html b/tests/wpt/tests/css/css-fonts/font-palette-30.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-30.html rename to tests/wpt/tests/css/css-fonts/font-palette-30.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-31-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-31-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-31-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-31-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-31.html b/tests/wpt/tests/css/css-fonts/font-palette-31.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-31.html rename to tests/wpt/tests/css/css-fonts/font-palette-31.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-32-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-32-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-32-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-32-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-32.html b/tests/wpt/tests/css/css-fonts/font-palette-32.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-32.html rename to tests/wpt/tests/css/css-fonts/font-palette-32.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-33-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-33-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-33-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-33-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-33.html b/tests/wpt/tests/css/css-fonts/font-palette-33.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-33.html rename to tests/wpt/tests/css/css-fonts/font-palette-33.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-34-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-34-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-34-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-34-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-34.html b/tests/wpt/tests/css/css-fonts/font-palette-34.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-34.html rename to tests/wpt/tests/css/css-fonts/font-palette-34.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-35-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-35-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-35-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-35-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-35.html b/tests/wpt/tests/css/css-fonts/font-palette-35.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-35.html rename to tests/wpt/tests/css/css-fonts/font-palette-35.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-4-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-4-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-4-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-4-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-4.html b/tests/wpt/tests/css/css-fonts/font-palette-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-4.html rename to tests/wpt/tests/css/css-fonts/font-palette-4.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-5-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-5-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-5-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-5-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-5.html b/tests/wpt/tests/css/css-fonts/font-palette-5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-5.html rename to tests/wpt/tests/css/css-fonts/font-palette-5.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-6-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-6-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-6-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-6-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-6.html b/tests/wpt/tests/css/css-fonts/font-palette-6.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-6.html rename to tests/wpt/tests/css/css-fonts/font-palette-6.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-7-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-7-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-7-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-7-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-7.html b/tests/wpt/tests/css/css-fonts/font-palette-7.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-7.html rename to tests/wpt/tests/css/css-fonts/font-palette-7.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-8-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-8-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-8-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-8-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-8.html b/tests/wpt/tests/css/css-fonts/font-palette-8.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-8.html rename to tests/wpt/tests/css/css-fonts/font-palette-8.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-9-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-9-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-9-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-9-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-9.html b/tests/wpt/tests/css/css-fonts/font-palette-9.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-9.html rename to tests/wpt/tests/css/css-fonts/font-palette-9.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-add-2-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-add-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-add-2-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-add-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-add-2.html b/tests/wpt/tests/css/css-fonts/font-palette-add-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-add-2.html rename to tests/wpt/tests/css/css-fonts/font-palette-add-2.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-add-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-add-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-add-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-add-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-add.html b/tests/wpt/tests/css/css-fonts/font-palette-add.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-add.html rename to tests/wpt/tests/css/css-fonts/font-palette-add.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-empty-font-family-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-empty-font-family-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-empty-font-family-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-empty-font-family-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-empty-font-family.html b/tests/wpt/tests/css/css-fonts/font-palette-empty-font-family.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-empty-font-family.html rename to tests/wpt/tests/css/css-fonts/font-palette-empty-font-family.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-modify-2-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-modify-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-modify-2-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-modify-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-modify-2.html b/tests/wpt/tests/css/css-fonts/font-palette-modify-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-modify-2.html rename to tests/wpt/tests/css/css-fonts/font-palette-modify-2.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-modify-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-modify-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-modify-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-modify-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-modify.html b/tests/wpt/tests/css/css-fonts/font-palette-modify.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-modify.html rename to tests/wpt/tests/css/css-fonts/font-palette-modify.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-remove-2-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-remove-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-remove-2-ref.html rename to tests/wpt/tests/css/css-fonts/font-palette-remove-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-remove-2.html b/tests/wpt/tests/css/css-fonts/font-palette-remove-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-remove-2.html rename to tests/wpt/tests/css/css-fonts/font-palette-remove-2.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-remove-notref.html b/tests/wpt/tests/css/css-fonts/font-palette-remove-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-remove-notref.html rename to tests/wpt/tests/css/css-fonts/font-palette-remove-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-remove.html b/tests/wpt/tests/css/css-fonts/font-palette-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-remove.html rename to tests/wpt/tests/css/css-fonts/font-palette-remove.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette-vs-shorthand.html b/tests/wpt/tests/css/css-fonts/font-palette-vs-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette-vs-shorthand.html rename to tests/wpt/tests/css/css-fonts/font-palette-vs-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-palette.html b/tests/wpt/tests/css/css-fonts/font-palette.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-palette.html rename to tests/wpt/tests/css/css-fonts/font-palette.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-shorthand-serialization-001.html b/tests/wpt/tests/css/css-fonts/font-shorthand-serialization-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-shorthand-serialization-001.html rename to tests/wpt/tests/css/css-fonts/font-shorthand-serialization-001.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-shorthand-serialization-font-stretch.html b/tests/wpt/tests/css/css-fonts/font-shorthand-serialization-font-stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-shorthand-serialization-font-stretch.html rename to tests/wpt/tests/css/css-fonts/font-shorthand-serialization-font-stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-shorthand-serialization-prevention.html b/tests/wpt/tests/css/css-fonts/font-shorthand-serialization-prevention.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-shorthand-serialization-prevention.html rename to tests/wpt/tests/css/css-fonts/font-shorthand-serialization-prevention.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-shorthand-subproperties-reset.html b/tests/wpt/tests/css/css-fonts/font-shorthand-subproperties-reset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-shorthand-subproperties-reset.html rename to tests/wpt/tests/css/css-fonts/font-shorthand-subproperties-reset.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-001-ref.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-001-ref.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-001.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-001.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-001.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-002-ref.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-002-ref.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-002.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-002.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-002.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-003.xht b/tests/wpt/tests/css/css-fonts/font-size-adjust-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-003.xht rename to tests/wpt/tests/css/css-fonts/font-size-adjust-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-005.xht b/tests/wpt/tests/css/css-fonts/font-size-adjust-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-005.xht rename to tests/wpt/tests/css/css-fonts/font-size-adjust-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-006.xht b/tests/wpt/tests/css/css-fonts/font-size-adjust-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-006.xht rename to tests/wpt/tests/css/css-fonts/font-size-adjust-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-007.xht b/tests/wpt/tests/css/css-fonts/font-size-adjust-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-007.xht rename to tests/wpt/tests/css/css-fonts/font-size-adjust-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-008.xht b/tests/wpt/tests/css/css-fonts/font-size-adjust-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-008.xht rename to tests/wpt/tests/css/css-fonts/font-size-adjust-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-009-ref.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-009-ref.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-009.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-009.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-009.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-010.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-010.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-010.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-011.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-011.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-011.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-012-ref.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-012-ref.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-012.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-012.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-012.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-013-ref.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-013-ref.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-013.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-013.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-013.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-metrics-override-ref.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-metrics-override-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-metrics-override-ref.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-metrics-override-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-metrics-override.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-metrics-override.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-metrics-override.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-metrics-override.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-order-001-ref.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-order-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-order-001-ref.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-order-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-order-001.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-order-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-order-001.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-order-001.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-units-001-ref.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-units-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-units-001-ref.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-units-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-units-001.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-units-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-units-001.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-units-001.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-zero-1.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-zero-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-zero-1.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-zero-1.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-zero-2.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-zero-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-zero-2.html rename to tests/wpt/tests/css/css-fonts/font-size-adjust-zero-2.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-monospace-adjust-ref.html b/tests/wpt/tests/css/css-fonts/font-size-monospace-adjust-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-monospace-adjust-ref.html rename to tests/wpt/tests/css/css-fonts/font-size-monospace-adjust-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-monospace-adjust.html b/tests/wpt/tests/css/css-fonts/font-size-monospace-adjust.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-monospace-adjust.html rename to tests/wpt/tests/css/css-fonts/font-size-monospace-adjust.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-relative-across-calc-ff-bug-001.html b/tests/wpt/tests/css/css-fonts/font-size-relative-across-calc-ff-bug-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-relative-across-calc-ff-bug-001.html rename to tests/wpt/tests/css/css-fonts/font-size-relative-across-calc-ff-bug-001.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-xxx-large-ref.html b/tests/wpt/tests/css/css-fonts/font-size-xxx-large-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-xxx-large-ref.html rename to tests/wpt/tests/css/css-fonts/font-size-xxx-large-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-xxx-large.html b/tests/wpt/tests/css/css-fonts/font-size-xxx-large.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-xxx-large.html rename to tests/wpt/tests/css/css-fonts/font-size-xxx-large.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-zero-1-notref.html b/tests/wpt/tests/css/css-fonts/font-size-zero-1-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-zero-1-notref.html rename to tests/wpt/tests/css/css-fonts/font-size-zero-1-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-zero-1-ref.html b/tests/wpt/tests/css/css-fonts/font-size-zero-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-zero-1-ref.html rename to tests/wpt/tests/css/css-fonts/font-size-zero-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-zero-1.html b/tests/wpt/tests/css/css-fonts/font-size-zero-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-zero-1.html rename to tests/wpt/tests/css/css-fonts/font-size-zero-1.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-zero-2-ref.html b/tests/wpt/tests/css/css-fonts/font-size-zero-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-zero-2-ref.html rename to tests/wpt/tests/css/css-fonts/font-size-zero-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-zero-2.html b/tests/wpt/tests/css/css-fonts/font-size-zero-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-size-zero-2.html rename to tests/wpt/tests/css/css-fonts/font-size-zero-2.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-01.html b/tests/wpt/tests/css/css-fonts/font-stretch-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-01.html rename to tests/wpt/tests/css/css-fonts/font-stretch-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-02.html b/tests/wpt/tests/css/css-fonts/font-stretch-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-02.html rename to tests/wpt/tests/css/css-fonts/font-stretch-02.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-03.html b/tests/wpt/tests/css/css-fonts/font-stretch-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-03.html rename to tests/wpt/tests/css/css-fonts/font-stretch-03.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-04.html b/tests/wpt/tests/css/css-fonts/font-stretch-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-04.html rename to tests/wpt/tests/css/css-fonts/font-stretch-04.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-05.html b/tests/wpt/tests/css/css-fonts/font-stretch-05.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-05.html rename to tests/wpt/tests/css/css-fonts/font-stretch-05.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-06.html b/tests/wpt/tests/css/css-fonts/font-stretch-06.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-06.html rename to tests/wpt/tests/css/css-fonts/font-stretch-06.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-07.html b/tests/wpt/tests/css/css-fonts/font-stretch-07.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-07.html rename to tests/wpt/tests/css/css-fonts/font-stretch-07.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-08.html b/tests/wpt/tests/css/css-fonts/font-stretch-08.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-08.html rename to tests/wpt/tests/css/css-fonts/font-stretch-08.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-09.html b/tests/wpt/tests/css/css-fonts/font-stretch-09.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-09.html rename to tests/wpt/tests/css/css-fonts/font-stretch-09.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-10.html b/tests/wpt/tests/css/css-fonts/font-stretch-10.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-10.html rename to tests/wpt/tests/css/css-fonts/font-stretch-10.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-11.html b/tests/wpt/tests/css/css-fonts/font-stretch-11.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-11.html rename to tests/wpt/tests/css/css-fonts/font-stretch-11.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-12.html b/tests/wpt/tests/css/css-fonts/font-stretch-12.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-12.html rename to tests/wpt/tests/css/css-fonts/font-stretch-12.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-13.html b/tests/wpt/tests/css/css-fonts/font-stretch-13.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-13.html rename to tests/wpt/tests/css/css-fonts/font-stretch-13.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-14.html b/tests/wpt/tests/css/css-fonts/font-stretch-14.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-14.html rename to tests/wpt/tests/css/css-fonts/font-stretch-14.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-15.html b/tests/wpt/tests/css/css-fonts/font-stretch-15.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-15.html rename to tests/wpt/tests/css/css-fonts/font-stretch-15.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-16.html b/tests/wpt/tests/css/css-fonts/font-stretch-16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-16.html rename to tests/wpt/tests/css/css-fonts/font-stretch-16.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-17.html b/tests/wpt/tests/css/css-fonts/font-stretch-17.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-17.html rename to tests/wpt/tests/css/css-fonts/font-stretch-17.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-18.html b/tests/wpt/tests/css/css-fonts/font-stretch-18.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-18.html rename to tests/wpt/tests/css/css-fonts/font-stretch-18.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-stretch-pass-ref.html b/tests/wpt/tests/css/css-fonts/font-stretch-pass-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-stretch-pass-ref.html rename to tests/wpt/tests/css/css-fonts/font-stretch-pass-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-style-angle.html b/tests/wpt/tests/css/css-fonts/font-style-angle.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-style-angle.html rename to tests/wpt/tests/css/css-fonts/font-style-angle.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-01-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-01-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-01.html b/tests/wpt/tests/css/css-fonts/font-synthesis-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-01.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-02-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-02-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-02.html b/tests/wpt/tests/css/css-fonts/font-synthesis-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-02.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-02.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-03-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-03-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-03-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-03.html b/tests/wpt/tests/css/css-fonts/font-synthesis-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-03.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-03.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-04-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-04-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-04-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-04-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-04.html b/tests/wpt/tests/css/css-fonts/font-synthesis-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-04.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-04.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-05-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-05-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-05-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-05-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-05.html b/tests/wpt/tests/css/css-fonts/font-synthesis-05.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-05.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-05.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-06-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-06-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-06-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-06-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-06.html b/tests/wpt/tests/css/css-fonts/font-synthesis-06.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-06.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-06.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-07-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-07-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-07-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-07-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-07.html b/tests/wpt/tests/css/css-fonts/font-synthesis-07.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-07.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-07.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps-first-letter-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-small-caps-first-letter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps-first-letter-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-small-caps-first-letter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps-first-letter.html b/tests/wpt/tests/css/css-fonts/font-synthesis-small-caps-first-letter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps-first-letter.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-small-caps-first-letter.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps-first-line-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-small-caps-first-line-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps-first-line-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-small-caps-first-line-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps-first-line.html b/tests/wpt/tests/css/css-fonts/font-synthesis-small-caps-first-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps-first-line.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-small-caps-first-line.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps-not-applied-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-small-caps-not-applied-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps-not-applied-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-small-caps-not-applied-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps-not-applied.html b/tests/wpt/tests/css/css-fonts/font-synthesis-small-caps-not-applied.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps-not-applied.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-small-caps-not-applied.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-small-caps-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-small-caps-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps.html b/tests/wpt/tests/css/css-fonts/font-synthesis-small-caps.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-small-caps.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-small-caps.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style-binary-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-style-binary-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style-binary-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-style-binary-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style-binary.html b/tests/wpt/tests/css/css-fonts/font-synthesis-style-binary.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style-binary.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-style-binary.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style-first-letter-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-style-first-letter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style-first-letter-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-style-first-letter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style-first-letter.html b/tests/wpt/tests/css/css-fonts/font-synthesis-style-first-letter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style-first-letter.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-style-first-letter.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style-first-line-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-style-first-line-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style-first-line-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-style-first-line-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style-first-line.html b/tests/wpt/tests/css/css-fonts/font-synthesis-style-first-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style-first-line.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-style-first-line.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-style-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-style-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style.html b/tests/wpt/tests/css/css-fonts/font-synthesis-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-style.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-style.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight-binary-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-weight-binary-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight-binary-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-weight-binary-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight-binary.html b/tests/wpt/tests/css/css-fonts/font-synthesis-weight-binary.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight-binary.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-weight-binary.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight-first-letter-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-weight-first-letter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight-first-letter-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-weight-first-letter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight-first-letter.html b/tests/wpt/tests/css/css-fonts/font-synthesis-weight-first-letter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight-first-letter.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-weight-first-letter.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight-first-line-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-weight-first-line-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight-first-line-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-weight-first-line-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight-first-line.html b/tests/wpt/tests/css/css-fonts/font-synthesis-weight-first-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight-first-line.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-weight-first-line.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight-ref.html b/tests/wpt/tests/css/css-fonts/font-synthesis-weight-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight-ref.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-weight-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight.html b/tests/wpt/tests/css/css-fonts/font-synthesis-weight.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-synthesis-weight.html rename to tests/wpt/tests/css/css-fonts/font-synthesis-weight.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-01-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-01-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-01.html b/tests/wpt/tests/css/css-fonts/font-variant-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-01.html rename to tests/wpt/tests/css/css-fonts/font-variant-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-02-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-02-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-02.html b/tests/wpt/tests/css/css-fonts/font-variant-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-02.html rename to tests/wpt/tests/css/css-fonts/font-variant-02.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-03-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-03-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-03-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-03.html b/tests/wpt/tests/css/css-fonts/font-variant-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-03.html rename to tests/wpt/tests/css/css-fonts/font-variant-03.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-04-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-04-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-04-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-04-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-04.html b/tests/wpt/tests/css/css-fonts/font-variant-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-04.html rename to tests/wpt/tests/css/css-fonts/font-variant-04.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-01-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-01-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-01.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-01.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-02-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-02-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-02.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-02.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-02.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-03-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-03-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-03-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-03.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-03.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-03.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-04-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-04-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-04-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-04-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-04.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-04.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-04.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-05-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-05-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-05-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-05-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-05.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-05.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-05.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-05.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-06-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-06-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-06-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-06-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-06.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-06.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-06.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-06.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-07-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-07-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-07-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-07-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-07.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-07.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-07.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-07.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-08-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-08-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-08-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-08-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-08.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-08.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-08.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-08.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-09-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-09-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-09-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-09-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-09.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-09.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-09.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-09.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-10-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-10-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-10-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-10-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-10.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-10.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-10.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-10.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-11-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-11-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-11-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-11-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-11.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-11.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-11.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-11.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-12-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-12-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-12-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-12-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-12.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-12.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-12.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-12.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-13-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-13-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-13-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-13-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-13.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-13.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-13.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-13.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-14-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-14-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-14-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-14-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-14.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-14.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-14.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-14.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-15-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-15-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-15-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-15-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-15.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-15.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-15.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-15.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-16-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-16-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-16-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-16-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-16.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-16.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-16.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-17-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-17-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-17-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-17-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-17.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-17.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-17.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-17.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-18-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-18-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-18-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-18-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-18.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-18.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-18.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-18.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-19-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-19-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-19-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-19-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-19.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-19.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-19.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-19.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-layers-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-layers-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-layers-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-layers-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-layers.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-layers.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-layers.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-layers.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-parsing.html b/tests/wpt/tests/css/css-fonts/font-variant-alternates-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-alternates-parsing.html rename to tests/wpt/tests/css/css-fonts/font-variant-alternates-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-01-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-01-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-01.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-01.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-02-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-02-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-02.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-02.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-02.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-03-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-03-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-03-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-03.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-03.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-03.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-04-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-04-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-04-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-04-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-04.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-04.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-04.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-05-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-05-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-05-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-05-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-05.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-05.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-05.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-05.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-06-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-06-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-06-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-06-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-06.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-06.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-06.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-06.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-07-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-07-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-07-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-07-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-07.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-07.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-07.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-07.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-caps-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps.html b/tests/wpt/tests/css/css-fonts/font-variant-caps.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-caps.html rename to tests/wpt/tests/css/css-fonts/font-variant-caps.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-debug.html b/tests/wpt/tests/css/css-fonts/font-variant-debug.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-debug.html rename to tests/wpt/tests/css/css-fonts/font-variant-debug.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-01-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-01-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-01.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-01.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-02-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-02-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-02.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-02.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-02.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-03-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-03-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-03-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-03.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-03.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-03.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-04-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-04-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-04-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-04-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-04.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-04.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-04.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-05-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-05-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-05-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-05-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-05.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-05.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-05.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-05.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-06-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-06-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-06-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-06-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-06.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-06.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-06.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-06.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-07-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-07-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-07-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-07-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-07.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-07.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-07.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-07.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-08-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-08-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-08-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-08-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-08.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-08.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-08.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-08.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-09-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-09-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-09-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-09-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-09.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-09.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-09.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-09.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-10-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-10-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-10-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-10-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-10.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-10.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-10.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-10.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian.html b/tests/wpt/tests/css/css-fonts/font-variant-east-asian.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-east-asian.html rename to tests/wpt/tests/css/css-fonts/font-variant-east-asian.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-emoji-1-notref.html b/tests/wpt/tests/css/css-fonts/font-variant-emoji-1-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-emoji-1-notref.html rename to tests/wpt/tests/css/css-fonts/font-variant-emoji-1-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-emoji-1.html b/tests/wpt/tests/css/css-fonts/font-variant-emoji-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-emoji-1.html rename to tests/wpt/tests/css/css-fonts/font-variant-emoji-1.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-emoji-2-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-emoji-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-emoji-2-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-emoji-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-emoji-2.html b/tests/wpt/tests/css/css-fonts/font-variant-emoji-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-emoji-2.html rename to tests/wpt/tests/css/css-fonts/font-variant-emoji-2.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-01-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-01-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-01.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-01.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-02-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-02-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-02.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-02.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-02.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-03-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-03-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-03-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-03.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-03.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-03.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-04-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-04-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-04-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-04-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-04.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-04.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-04.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-05-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-05-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-05-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-05-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-05.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-05.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-05.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-05.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-06-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-06-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-06-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-06-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-06.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-06.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-06.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-06.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-07-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-07-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-07-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-07-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-07.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-07.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-07.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-07.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-08-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-08-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-08-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-08-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-08.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-08.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-08.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-08.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-09-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-09-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-09-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-09-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-09.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-09.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-09.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-09.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-10-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-10-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-10-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-10-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-10.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-10.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-10.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-10.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-11-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-11-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-11-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-11-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-11.optional.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-11.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-11.optional.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-11.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures.html b/tests/wpt/tests/css/css-fonts/font-variant-ligatures.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-ligatures.html rename to tests/wpt/tests/css/css-fonts/font-variant-ligatures.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-01-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-01-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-01.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-01.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-02-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-02-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-02.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-02.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-02.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-03-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-03-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-03-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-03.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-03.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-03.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-04-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-04-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-04-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-04-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-04.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-04.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-04.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-05-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-05-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-05-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-05-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-05.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-05.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-05.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-05.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-06-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-06-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-06-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-06-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-06.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-06.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-06.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-06.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-07-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-07-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-07-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-07-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-07.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-07.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-07.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-07.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-08-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-08-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-08-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-08-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-08.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-08.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-08.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-08.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-09-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-09-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-09-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-09-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-09.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-09.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-09.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-09.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric.html b/tests/wpt/tests/css/css-fonts/font-variant-numeric.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-numeric.html rename to tests/wpt/tests/css/css-fonts/font-variant-numeric.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-position-01-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-position-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-position-01-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-position-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-position-01.html b/tests/wpt/tests/css/css-fonts/font-variant-position-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-position-01.html rename to tests/wpt/tests/css/css-fonts/font-variant-position-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-position-02-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-position-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-position-02-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-position-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-position-02.html b/tests/wpt/tests/css/css-fonts/font-variant-position-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-position-02.html rename to tests/wpt/tests/css/css-fonts/font-variant-position-02.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-position-03-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-position-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-position-03-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-position-03-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-position-03.html b/tests/wpt/tests/css/css-fonts/font-variant-position-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-position-03.html rename to tests/wpt/tests/css/css-fonts/font-variant-position-03.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-position-ref.html b/tests/wpt/tests/css/css-fonts/font-variant-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-position-ref.html rename to tests/wpt/tests/css/css-fonts/font-variant-position-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variant-position.html b/tests/wpt/tests/css/css-fonts/font-variant-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variant-position.html rename to tests/wpt/tests/css/css-fonts/font-variant-position.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-variation-settings-serialization-001.html b/tests/wpt/tests/css/css-fonts/font-variation-settings-serialization-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-variation-settings-serialization-001.html rename to tests/wpt/tests/css/css-fonts/font-variation-settings-serialization-001.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-weight-bolder-001-ref.xht b/tests/wpt/tests/css/css-fonts/font-weight-bolder-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-weight-bolder-001-ref.xht rename to tests/wpt/tests/css/css-fonts/font-weight-bolder-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-weight-bolder-001.xht b/tests/wpt/tests/css/css-fonts/font-weight-bolder-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-weight-bolder-001.xht rename to tests/wpt/tests/css/css-fonts/font-weight-bolder-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-weight-lighter-001-ref.xht b/tests/wpt/tests/css/css-fonts/font-weight-lighter-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-weight-lighter-001-ref.xht rename to tests/wpt/tests/css/css-fonts/font-weight-lighter-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-weight-lighter-001.xht b/tests/wpt/tests/css/css-fonts/font-weight-lighter-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-weight-lighter-001.xht rename to tests/wpt/tests/css/css-fonts/font-weight-lighter-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-weight-normal-001-ref.xht b/tests/wpt/tests/css/css-fonts/font-weight-normal-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-weight-normal-001-ref.xht rename to tests/wpt/tests/css/css-fonts/font-weight-normal-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-weight-normal-001.xht b/tests/wpt/tests/css/css-fonts/font-weight-normal-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/font-weight-normal-001.xht rename to tests/wpt/tests/css/css-fonts/font-weight-normal-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/format-specifiers-variations.html b/tests/wpt/tests/css/css-fonts/format-specifiers-variations.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/format-specifiers-variations.html rename to tests/wpt/tests/css/css-fonts/format-specifiers-variations.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/generic-family-keywords-001.html b/tests/wpt/tests/css/css-fonts/generic-family-keywords-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/generic-family-keywords-001.html rename to tests/wpt/tests/css/css-fonts/generic-family-keywords-001.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/generic-family-keywords-002.html b/tests/wpt/tests/css/css-fonts/generic-family-keywords-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/generic-family-keywords-002.html rename to tests/wpt/tests/css/css-fonts/generic-family-keywords-002.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/generic-family-keywords-003.html b/tests/wpt/tests/css/css-fonts/generic-family-keywords-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/generic-family-keywords-003.html rename to tests/wpt/tests/css/css-fonts/generic-family-keywords-003.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/hiragana-katakana-kerning-notref.html b/tests/wpt/tests/css/css-fonts/hiragana-katakana-kerning-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/hiragana-katakana-kerning-notref.html rename to tests/wpt/tests/css/css-fonts/hiragana-katakana-kerning-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/hiragana-katakana-kerning.html b/tests/wpt/tests/css/css-fonts/hiragana-katakana-kerning.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/hiragana-katakana-kerning.html rename to tests/wpt/tests/css/css-fonts/hiragana-katakana-kerning.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/idlharness.html b/tests/wpt/tests/css/css-fonts/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/idlharness.html rename to tests/wpt/tests/css/css-fonts/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/infinite-size-crash.html b/tests/wpt/tests/css/css-fonts/infinite-size-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/infinite-size-crash.html rename to tests/wpt/tests/css/css-fonts/infinite-size-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/inheritance.html b/tests/wpt/tests/css/css-fonts/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/inheritance.html rename to tests/wpt/tests/css/css-fonts/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/language-specific-01.html b/tests/wpt/tests/css/css-fonts/language-specific-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/language-specific-01.html rename to tests/wpt/tests/css/css-fonts/language-specific-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/line-gap-override-ref.html b/tests/wpt/tests/css/css-fonts/line-gap-override-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/line-gap-override-ref.html rename to tests/wpt/tests/css/css-fonts/line-gap-override-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/line-gap-override.html b/tests/wpt/tests/css/css-fonts/line-gap-override.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/line-gap-override.html rename to tests/wpt/tests/css/css-fonts/line-gap-override.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/matching/META.yml b/tests/wpt/tests/css/css-fonts/matching/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/matching/META.yml rename to tests/wpt/tests/css/css-fonts/matching/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-fonts/matching/README.md b/tests/wpt/tests/css/css-fonts/matching/README.md similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/matching/README.md rename to tests/wpt/tests/css/css-fonts/matching/README.md diff --git a/tests/wpt/web-platform-tests/css/css-fonts/matching/fixed-stretch-style-over-weight-ref.html b/tests/wpt/tests/css/css-fonts/matching/fixed-stretch-style-over-weight-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/matching/fixed-stretch-style-over-weight-ref.html rename to tests/wpt/tests/css/css-fonts/matching/fixed-stretch-style-over-weight-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/matching/fixed-stretch-style-over-weight.html b/tests/wpt/tests/css/css-fonts/matching/fixed-stretch-style-over-weight.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/matching/fixed-stretch-style-over-weight.html rename to tests/wpt/tests/css/css-fonts/matching/fixed-stretch-style-over-weight.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/matching/font-matching.css b/tests/wpt/tests/css/css-fonts/matching/font-matching.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/matching/font-matching.css rename to tests/wpt/tests/css/css-fonts/matching/font-matching.css diff --git a/tests/wpt/web-platform-tests/css/css-fonts/matching/range-descriptor-reversed-ref.html b/tests/wpt/tests/css/css-fonts/matching/range-descriptor-reversed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/matching/range-descriptor-reversed-ref.html rename to tests/wpt/tests/css/css-fonts/matching/range-descriptor-reversed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/matching/range-descriptor-reversed.html b/tests/wpt/tests/css/css-fonts/matching/range-descriptor-reversed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/matching/range-descriptor-reversed.html rename to tests/wpt/tests/css/css-fonts/matching/range-descriptor-reversed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/matching/resources/variabletest_matching.ttf b/tests/wpt/tests/css/css-fonts/matching/resources/variabletest_matching.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/matching/resources/variabletest_matching.ttf rename to tests/wpt/tests/css/css-fonts/matching/resources/variabletest_matching.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/matching/stretch-distance-over-weight-distance-ref.html b/tests/wpt/tests/css/css-fonts/matching/stretch-distance-over-weight-distance-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/matching/stretch-distance-over-weight-distance-ref.html rename to tests/wpt/tests/css/css-fonts/matching/stretch-distance-over-weight-distance-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/matching/stretch-distance-over-weight-distance.html b/tests/wpt/tests/css/css-fonts/matching/stretch-distance-over-weight-distance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/matching/stretch-distance-over-weight-distance.html rename to tests/wpt/tests/css/css-fonts/matching/stretch-distance-over-weight-distance.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/matching/style-ranges-over-weight-direction-ref.html b/tests/wpt/tests/css/css-fonts/matching/style-ranges-over-weight-direction-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/matching/style-ranges-over-weight-direction-ref.html rename to tests/wpt/tests/css/css-fonts/matching/style-ranges-over-weight-direction-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/matching/style-ranges-over-weight-direction.html b/tests/wpt/tests/css/css-fonts/matching/style-ranges-over-weight-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/matching/style-ranges-over-weight-direction.html rename to tests/wpt/tests/css/css-fonts/matching/style-ranges-over-weight-direction.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-depth-001-crash.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-depth-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-depth-001-crash.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-depth-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-001.tentative.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-001.tentative.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-002.tentative.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-002.tentative.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-003.tentative-ref.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-003.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-003.tentative-ref.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-003.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-003.tentative.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-003.tentative.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-004.tentative.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-004.tentative.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-004.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-001.tentative-ref.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-001.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-001.tentative-ref.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-001.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-001.tentative.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-001.tentative.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-002.tentative-ref.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-002.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-002.tentative-ref.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-002.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-002.tentative.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-002.tentative.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-003.tentative-ref.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-003.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-003.tentative-ref.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-003.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-003.tentative.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-003.tentative.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-004.tentative-ref.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-004.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-004.tentative-ref.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-004.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-004.tentative.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-004.tentative.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-004.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-005.tentative-ref.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-005.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-005.tentative-ref.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-005.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-005.tentative.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-005.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-005.tentative.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-auto-and-math-style-005.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-font-size-clamping-001.tentative-ref.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-font-size-clamping-001.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-font-size-clamping-001.tentative-ref.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-font-size-clamping-001.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-font-size-clamping-001.tentative.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-font-size-clamping-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-font-size-clamping-001.tentative.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-script-level-font-size-clamping-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-style-001.tentative.html b/tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-style-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-style-001.tentative.html rename to tests/wpt/tests/css/css-fonts/math-script-level-and-math-style/math-style-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/metrics-override-normal-keyword-ref.html b/tests/wpt/tests/css/css-fonts/metrics-override-normal-keyword-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/metrics-override-normal-keyword-ref.html rename to tests/wpt/tests/css/css-fonts/metrics-override-normal-keyword-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/metrics-override-normal-keyword.html b/tests/wpt/tests/css/css-fonts/metrics-override-normal-keyword.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/metrics-override-normal-keyword.html rename to tests/wpt/tests/css/css-fonts/metrics-override-normal-keyword.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-add-2-ref.html b/tests/wpt/tests/css/css-fonts/palette-values-rule-add-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-add-2-ref.html rename to tests/wpt/tests/css/css-fonts/palette-values-rule-add-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-add-2.html b/tests/wpt/tests/css/css-fonts/palette-values-rule-add-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-add-2.html rename to tests/wpt/tests/css/css-fonts/palette-values-rule-add-2.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-add-notref.html b/tests/wpt/tests/css/css-fonts/palette-values-rule-add-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-add-notref.html rename to tests/wpt/tests/css/css-fonts/palette-values-rule-add-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-add.html b/tests/wpt/tests/css/css-fonts/palette-values-rule-add.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-add.html rename to tests/wpt/tests/css/css-fonts/palette-values-rule-add.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-delete-2-ref.html b/tests/wpt/tests/css/css-fonts/palette-values-rule-delete-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-delete-2-ref.html rename to tests/wpt/tests/css/css-fonts/palette-values-rule-delete-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-delete-2.html b/tests/wpt/tests/css/css-fonts/palette-values-rule-delete-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-delete-2.html rename to tests/wpt/tests/css/css-fonts/palette-values-rule-delete-2.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-delete-notref.html b/tests/wpt/tests/css/css-fonts/palette-values-rule-delete-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-delete-notref.html rename to tests/wpt/tests/css/css-fonts/palette-values-rule-delete-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-delete.html b/tests/wpt/tests/css/css-fonts/palette-values-rule-delete.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/palette-values-rule-delete.html rename to tests/wpt/tests/css/css-fonts/palette-values-rule-delete.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-face-src-format.html b/tests/wpt/tests/css/css-fonts/parsing/font-face-src-format.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-face-src-format.html rename to tests/wpt/tests/css/css-fonts/parsing/font-face-src-format.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-face-src-list.html b/tests/wpt/tests/css/css-fonts/parsing/font-face-src-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-face-src-list.html rename to tests/wpt/tests/css/css-fonts/parsing/font-face-src-list.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-face-src-local.html b/tests/wpt/tests/css/css-fonts/parsing/font-face-src-local.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-face-src-local.html rename to tests/wpt/tests/css/css-fonts/parsing/font-face-src-local.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-face-src-tech.html b/tests/wpt/tests/css/css-fonts/parsing/font-face-src-tech.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-face-src-tech.html rename to tests/wpt/tests/css/css-fonts/parsing/font-face-src-tech.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-family-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-family-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-family-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-family-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-family-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-family-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-family-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-feature-settings-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-feature-settings-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-feature-settings-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-feature-settings-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-feature-settings-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-feature-settings-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-feature-settings-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-kerning-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-kerning-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-kerning-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-kerning-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-kerning-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-kerning-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-kerning-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-language-override-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-language-override-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-language-override-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-language-override-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-language-override-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-language-override-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-language-override-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-language-override-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-language-override-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-language-override-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-language-override-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-language-override-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-optical-sizing-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-optical-sizing-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-optical-sizing-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-optical-sizing-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-optical-sizing-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-optical-sizing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-optical-sizing-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-optical-sizing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-optical-sizing-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-optical-sizing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-optical-sizing-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-optical-sizing-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-palette-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-palette-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-palette-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-palette-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-palette-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-palette-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-palette-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-palette-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-palette-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-palette-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-palette-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-palette-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-palette-values-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-palette-values-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-palette-values-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-palette-values-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-palette-values-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-palette-values-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-shorthand-variant.html b/tests/wpt/tests/css/css-fonts/parsing/font-shorthand-variant.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-shorthand-variant.html rename to tests/wpt/tests/css/css-fonts/parsing/font-shorthand-variant.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-size-adjust-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-size-adjust-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-size-adjust-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-size-adjust-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-size-adjust-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-adjust-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-size-adjust-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-size-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-size-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-size-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-size-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-size-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-size-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-size-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-stretch-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-stretch-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-stretch-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-stretch-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-stretch-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-stretch-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-stretch-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-style-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-style-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-style-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-style-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-style-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-style-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-style-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-synthesis-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-synthesis-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-small-caps-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-small-caps-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-small-caps-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-synthesis-small-caps-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-small-caps-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-small-caps-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-small-caps-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-synthesis-small-caps-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-style-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-style-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-style-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-synthesis-style-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-style-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-style-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-style-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-synthesis-style-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-synthesis-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-weight-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-weight-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-weight-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-synthesis-weight-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-weight-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-synthesis-weight-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-synthesis-weight-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-synthesis-weight-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-alternates-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-alternates-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-alternates-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-alternates-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-alternates-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-alternates-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-alternates-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-alternates-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-caps-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-caps-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-caps-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-caps-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-caps-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-caps-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-caps-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-east-asian-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-east-asian-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-east-asian-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-east-asian-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-east-asian-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-east-asian-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-east-asian-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-emoji-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-emoji-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-emoji-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-emoji-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-emoji-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-emoji-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-emoji-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-emoji-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-emoji-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-emoji-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-emoji-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-emoji-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-ligatures-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-ligatures-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-ligatures-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-ligatures-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-ligatures-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-ligatures-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-ligatures-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-numeric-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-numeric-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-numeric-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-numeric-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-numeric-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-numeric-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-numeric-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-position-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-position-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-position-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-position-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-position-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-position-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-position-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-serialization.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-serialization.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-serialization.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variant-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variant-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variant-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variation-settings-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-variation-settings-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variation-settings-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variation-settings-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variation-settings-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variation-settings-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variation-settings-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variation-settings-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variation-settings-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-variation-settings-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-variation-settings-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-variation-settings-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-computed.html b/tests/wpt/tests/css/css-fonts/parsing/font-weight-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-computed.html rename to tests/wpt/tests/css/css-fonts/parsing/font-weight-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-invalid.html b/tests/wpt/tests/css/css-fonts/parsing/font-weight-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-invalid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-weight-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-valid.html b/tests/wpt/tests/css/css-fonts/parsing/font-weight-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/parsing/font-weight-valid.html rename to tests/wpt/tests/css/css-fonts/parsing/font-weight-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/quoted-generic-ignored-ref.html b/tests/wpt/tests/css/css-fonts/quoted-generic-ignored-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/quoted-generic-ignored-ref.html rename to tests/wpt/tests/css/css-fonts/quoted-generic-ignored-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/quoted-generic-ignored.html b/tests/wpt/tests/css/css-fonts/quoted-generic-ignored.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/quoted-generic-ignored.html rename to tests/wpt/tests/css/css-fonts/quoted-generic-ignored.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/rem-in-monospace-ref.html b/tests/wpt/tests/css/css-fonts/rem-in-monospace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/rem-in-monospace-ref.html rename to tests/wpt/tests/css/css-fonts/rem-in-monospace-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/rem-in-monospace.html b/tests/wpt/tests/css/css-fonts/rem-in-monospace.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/rem-in-monospace.html rename to tests/wpt/tests/css/css-fonts/rem-in-monospace.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/resources/COLR-palettes-test-font-no-light-dark.ttf b/tests/wpt/tests/css/css-fonts/resources/COLR-palettes-test-font-no-light-dark.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/resources/COLR-palettes-test-font-no-light-dark.ttf rename to tests/wpt/tests/css/css-fonts/resources/COLR-palettes-test-font-no-light-dark.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/resources/COLR-palettes-test-font.ttf b/tests/wpt/tests/css/css-fonts/resources/COLR-palettes-test-font.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/resources/COLR-palettes-test-font.ttf rename to tests/wpt/tests/css/css-fonts/resources/COLR-palettes-test-font.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/resources/NotoSansJP-kana_test-subset.otf b/tests/wpt/tests/css/css-fonts/resources/NotoSansJP-kana_test-subset.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/resources/NotoSansJP-kana_test-subset.otf rename to tests/wpt/tests/css/css-fonts/resources/NotoSansJP-kana_test-subset.otf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/resources/ahem-ex-250.otf b/tests/wpt/tests/css/css-fonts/resources/ahem-ex-250.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/resources/ahem-ex-250.otf rename to tests/wpt/tests/css/css-fonts/resources/ahem-ex-250.otf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/resources/ahem-ex-500.otf b/tests/wpt/tests/css/css-fonts/resources/ahem-ex-500.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/resources/ahem-ex-500.otf rename to tests/wpt/tests/css/css-fonts/resources/ahem-ex-500.otf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/resources/colorization_SVG_COLR.ttf b/tests/wpt/tests/css/css-fonts/resources/colorization_SVG_COLR.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/resources/colorization_SVG_COLR.ttf rename to tests/wpt/tests/css/css-fonts/resources/colorization_SVG_COLR.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/resources/markA.ttf b/tests/wpt/tests/css/css-fonts/resources/markA.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/resources/markA.ttf rename to tests/wpt/tests/css/css-fonts/resources/markA.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/resources/markB.ttf b/tests/wpt/tests/css/css-fonts/resources/markB.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/resources/markB.ttf rename to tests/wpt/tests/css/css-fonts/resources/markB.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/resources/separator-test-font.ttf b/tests/wpt/tests/css/css-fonts/resources/separator-test-font.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/resources/separator-test-font.ttf rename to tests/wpt/tests/css/css-fonts/resources/separator-test-font.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/rlh-in-monospace-ref.html b/tests/wpt/tests/css/css-fonts/rlh-in-monospace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/rlh-in-monospace-ref.html rename to tests/wpt/tests/css/css-fonts/rlh-in-monospace-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/rlh-in-monospace.html b/tests/wpt/tests/css/css-fonts/rlh-in-monospace.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/rlh-in-monospace.html rename to tests/wpt/tests/css/css-fonts/rlh-in-monospace.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/separators-ref.html b/tests/wpt/tests/css/css-fonts/separators-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/separators-ref.html rename to tests/wpt/tests/css/css-fonts/separators-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/separators.html b/tests/wpt/tests/css/css-fonts/separators.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/separators.html rename to tests/wpt/tests/css/css-fonts/separators.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-01-ref.html b/tests/wpt/tests/css/css-fonts/size-adjust-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/size-adjust-01-ref.html rename to tests/wpt/tests/css/css-fonts/size-adjust-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-01.html b/tests/wpt/tests/css/css-fonts/size-adjust-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/size-adjust-01.html rename to tests/wpt/tests/css/css-fonts/size-adjust-01.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-02-ref.html b/tests/wpt/tests/css/css-fonts/size-adjust-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/size-adjust-02-ref.html rename to tests/wpt/tests/css/css-fonts/size-adjust-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-02.html b/tests/wpt/tests/css/css-fonts/size-adjust-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/size-adjust-02.html rename to tests/wpt/tests/css/css-fonts/size-adjust-02.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-03-ref.html b/tests/wpt/tests/css/css-fonts/size-adjust-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/size-adjust-03-ref.html rename to tests/wpt/tests/css/css-fonts/size-adjust-03-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-03.html b/tests/wpt/tests/css/css-fonts/size-adjust-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/size-adjust-03.html rename to tests/wpt/tests/css/css-fonts/size-adjust-03.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-tentative-ref.html b/tests/wpt/tests/css/css-fonts/size-adjust-tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/size-adjust-tentative-ref.html rename to tests/wpt/tests/css/css-fonts/size-adjust-tentative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-text-decoration-tentative-ref.html b/tests/wpt/tests/css/css-fonts/size-adjust-text-decoration-tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/size-adjust-text-decoration-tentative-ref.html rename to tests/wpt/tests/css/css-fonts/size-adjust-text-decoration-tentative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/size-adjust-text-decoration.tentative.html b/tests/wpt/tests/css/css-fonts/size-adjust-text-decoration.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/size-adjust-text-decoration.tentative.html rename to tests/wpt/tests/css/css-fonts/size-adjust-text-decoration.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/size-adjust.tentative.html b/tests/wpt/tests/css/css-fonts/size-adjust.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/size-adjust.tentative.html rename to tests/wpt/tests/css/css-fonts/size-adjust.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-10-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-10-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-10-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-10-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-10.html b/tests/wpt/tests/css/css-fonts/standard-font-family-10.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-10.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-10.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-11-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-11-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-11-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-11-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-11.html b/tests/wpt/tests/css/css-fonts/standard-font-family-11.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-11.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-11.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-12-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-12-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-12-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-12-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-12.html b/tests/wpt/tests/css/css-fonts/standard-font-family-12.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-12.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-12.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-13-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-13-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-13-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-13-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-13.html b/tests/wpt/tests/css/css-fonts/standard-font-family-13.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-13.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-13.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-14-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-14-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-14-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-14-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-14.html b/tests/wpt/tests/css/css-fonts/standard-font-family-14.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-14.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-14.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-15-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-15-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-15-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-15-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-15.html b/tests/wpt/tests/css/css-fonts/standard-font-family-15.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-15.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-15.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-16-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-16-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-16-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-16-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-16.html b/tests/wpt/tests/css/css-fonts/standard-font-family-16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-16.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-16.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-17-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-17-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-17-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-17-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-17.html b/tests/wpt/tests/css/css-fonts/standard-font-family-17.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-17.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-17.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-18-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-18-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-18-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-18-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-18.html b/tests/wpt/tests/css/css-fonts/standard-font-family-18.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-18.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-18.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-19-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-19-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-19-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-19-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-19.html b/tests/wpt/tests/css/css-fonts/standard-font-family-19.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-19.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-19.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-2-ref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-2-ref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-2.html b/tests/wpt/tests/css/css-fonts/standard-font-family-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-2.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-2.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-20-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-20-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-20-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-20-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-20.html b/tests/wpt/tests/css/css-fonts/standard-font-family-20.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-20.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-20.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-3-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-3-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-3-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-3-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-3.html b/tests/wpt/tests/css/css-fonts/standard-font-family-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-3.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-3.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-4-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-4-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-4-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-4-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-4.html b/tests/wpt/tests/css/css-fonts/standard-font-family-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-4.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-4.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-5-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-5-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-5-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-5-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-5.html b/tests/wpt/tests/css/css-fonts/standard-font-family-5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-5.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-5.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-6-ref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-6-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-6-ref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-6-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-6.html b/tests/wpt/tests/css/css-fonts/standard-font-family-6.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-6.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-6.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-7-ref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-7-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-7-ref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-7-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-7.html b/tests/wpt/tests/css/css-fonts/standard-font-family-7.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-7.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-7.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-8-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-8-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-8-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-8-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-8.html b/tests/wpt/tests/css/css-fonts/standard-font-family-8.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-8.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-8.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-9-notref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-9-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-9-notref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-9-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-9.html b/tests/wpt/tests/css/css-fonts/standard-font-family-9.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-9.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-9.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-ref.html b/tests/wpt/tests/css/css-fonts/standard-font-family-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-ref.html rename to tests/wpt/tests/css/css-fonts/standard-font-family-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family.html b/tests/wpt/tests/css/css-fonts/standard-font-family.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/standard-font-family.html rename to tests/wpt/tests/css/css-fonts/standard-font-family.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/100x100-lime.png b/tests/wpt/tests/css/css-fonts/support/100x100-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/100x100-lime.png rename to tests/wpt/tests/css/css-fonts/support/100x100-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/100x100-red.png b/tests/wpt/tests/css/css-fonts/support/100x100-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/100x100-red.png rename to tests/wpt/tests/css/css-fonts/support/100x100-red.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/1x1-green.png b/tests/wpt/tests/css/css-fonts/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/1x1-green.png rename to tests/wpt/tests/css/css-fonts/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/1x1-lime.png b/tests/wpt/tests/css/css-fonts/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/1x1-lime.png rename to tests/wpt/tests/css/css-fonts/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/1x1-maroon.png b/tests/wpt/tests/css/css-fonts/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/1x1-maroon.png rename to tests/wpt/tests/css/css-fonts/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/1x1-navy.png b/tests/wpt/tests/css/css-fonts/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/1x1-navy.png rename to tests/wpt/tests/css/css-fonts/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/1x1-red.png b/tests/wpt/tests/css/css-fonts/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/1x1-red.png rename to tests/wpt/tests/css/css-fonts/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/1x1-white.png b/tests/wpt/tests/css/css-fonts/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/1x1-white.png rename to tests/wpt/tests/css/css-fonts/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/60x60-gg-rr.png b/tests/wpt/tests/css/css-fonts/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/60x60-gg-rr.png rename to tests/wpt/tests/css/css-fonts/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/60x60-green.png b/tests/wpt/tests/css/css-fonts/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/60x60-green.png rename to tests/wpt/tests/css/css-fonts/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/README b/tests/wpt/tests/css/css-fonts/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/README rename to tests/wpt/tests/css/css-fonts/support/README diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/bar_with_corner_dot.png b/tests/wpt/tests/css/css-fonts/support/bar_with_corner_dot.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/bar_with_corner_dot.png rename to tests/wpt/tests/css/css-fonts/support/bar_with_corner_dot.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/black15x15.png b/tests/wpt/tests/css/css-fonts/support/black15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/black15x15.png rename to tests/wpt/tests/css/css-fonts/support/black15x15.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/black96x96.png b/tests/wpt/tests/css/css-fonts/support/black96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/black96x96.png rename to tests/wpt/tests/css/css-fonts/support/black96x96.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/blue-orange-rectangle.png b/tests/wpt/tests/css/css-fonts/support/blue-orange-rectangle.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/blue-orange-rectangle.png rename to tests/wpt/tests/css/css-fonts/support/blue-orange-rectangle.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/blue15x15.png b/tests/wpt/tests/css/css-fonts/support/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/blue15x15.png rename to tests/wpt/tests/css/css-fonts/support/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/blue96x96.png b/tests/wpt/tests/css/css-fonts/support/blue96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/blue96x96.png rename to tests/wpt/tests/css/css-fonts/support/blue96x96.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/cat.png b/tests/wpt/tests/css/css-fonts/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/cat.png rename to tests/wpt/tests/css/css-fonts/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/css/font-variant-features.css b/tests/wpt/tests/css/css-fonts/support/css/font-variant-features.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/css/font-variant-features.css rename to tests/wpt/tests/css/css-fonts/support/css/font-variant-features.css diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/diamond.png b/tests/wpt/tests/css/css-fonts/support/diamond.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/diamond.png rename to tests/wpt/tests/css/css-fonts/support/diamond.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/font-family-keywords.js b/tests/wpt/tests/css/css-fonts/support/font-family-keywords.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/font-family-keywords.js rename to tests/wpt/tests/css/css-fonts/support/font-family-keywords.js diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/font-weight-bolder-001-ref.png b/tests/wpt/tests/css/css-fonts/support/font-weight-bolder-001-ref.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/font-weight-bolder-001-ref.png rename to tests/wpt/tests/css/css-fonts/support/font-weight-bolder-001-ref.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/font-weight-lighter-001-ref.png b/tests/wpt/tests/css/css-fonts/support/font-weight-lighter-001-ref.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/font-weight-lighter-001-ref.png rename to tests/wpt/tests/css/css-fonts/support/font-weight-lighter-001-ref.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/font-weight-normal-001-ref.png b/tests/wpt/tests/css/css-fonts/support/font-weight-normal-001-ref.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/font-weight-normal-001-ref.png rename to tests/wpt/tests/css/css-fonts/support/font-weight-normal-001-ref.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Exo-DemiBold.otf b/tests/wpt/tests/css/css-fonts/support/fonts/Exo-DemiBold.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Exo-DemiBold.otf rename to tests/wpt/tests/css/css-fonts/support/fonts/Exo-DemiBold.otf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Exo2-SemiBold.otf b/tests/wpt/tests/css/css-fonts/support/fonts/Exo2-SemiBold.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Exo2-SemiBold.otf rename to tests/wpt/tests/css/css-fonts/support/fonts/Exo2-SemiBold.otf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Exo2-SemiBoldCondensed.otf b/tests/wpt/tests/css/css-fonts/support/fonts/Exo2-SemiBoldCondensed.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Exo2-SemiBoldCondensed.otf rename to tests/wpt/tests/css/css-fonts/support/fonts/Exo2-SemiBoldCondensed.otf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Exo2-SemiBoldExpanded.otf b/tests/wpt/tests/css/css-fonts/support/fonts/Exo2-SemiBoldExpanded.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Exo2-SemiBoldExpanded.otf rename to tests/wpt/tests/css/css-fonts/support/fonts/Exo2-SemiBoldExpanded.otf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/FontWithFancyFeatures.otf b/tests/wpt/tests/css/css-fonts/support/fonts/FontWithFancyFeatures.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/FontWithFancyFeatures.otf rename to tests/wpt/tests/css/css-fonts/support/fonts/FontWithFancyFeatures.otf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/FontWithFeatures2.otf b/tests/wpt/tests/css/css-fonts/support/fonts/FontWithFeatures2.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/FontWithFeatures2.otf rename to tests/wpt/tests/css/css-fonts/support/fonts/FontWithFeatures2.otf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Inter-VF.subset.ttf b/tests/wpt/tests/css/css-fonts/support/fonts/Inter-VF.subset.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Inter-VF.subset.ttf rename to tests/wpt/tests/css/css-fonts/support/fonts/Inter-VF.subset.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Lato-Medium-Liga.ttf b/tests/wpt/tests/css/css-fonts/support/fonts/Lato-Medium-Liga.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Lato-Medium-Liga.ttf rename to tests/wpt/tests/css/css-fonts/support/fonts/Lato-Medium-Liga.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Lato-Medium.ttf b/tests/wpt/tests/css/css-fonts/support/fonts/Lato-Medium.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Lato-Medium.ttf rename to tests/wpt/tests/css/css-fonts/support/fonts/Lato-Medium.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/LigatureSymbolsWithSpaces.woff b/tests/wpt/tests/css/css-fonts/support/fonts/LigatureSymbolsWithSpaces.woff similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/LigatureSymbolsWithSpaces.woff rename to tests/wpt/tests/css/css-fonts/support/fonts/LigatureSymbolsWithSpaces.woff diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/LinLibertine_Re-4.7.5.woff b/tests/wpt/tests/css/css-fonts/support/fonts/LinLibertine_Re-4.7.5.woff similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/LinLibertine_Re-4.7.5.woff rename to tests/wpt/tests/css/css-fonts/support/fonts/LinLibertine_Re-4.7.5.woff diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/RobotoExtremo-VF.subset.ttf b/tests/wpt/tests/css/css-fonts/support/fonts/RobotoExtremo-VF.subset.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/RobotoExtremo-VF.subset.ttf rename to tests/wpt/tests/css/css-fonts/support/fonts/RobotoExtremo-VF.subset.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Rochester.otf b/tests/wpt/tests/css/css-fonts/support/fonts/Rochester.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/Rochester.otf rename to tests/wpt/tests/css/css-fonts/support/fonts/Rochester.otf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/fail.woff b/tests/wpt/tests/css/css-fonts/support/fonts/fail.woff similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/fail.woff rename to tests/wpt/tests/css/css-fonts/support/fonts/fail.woff diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-features.js b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-features.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-features.js rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-features.js diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-features.txt b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-features.txt similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-features.txt rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-features.txt diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup1.otf b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup1.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup1.otf rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup1.otf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.otf b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.otf rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.otf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/features.fea b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/features.fea similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/features.fea rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/features.fea diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/fontinfo.plist b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/fontinfo.plist similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/fontinfo.plist rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/fontinfo.plist diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/F_.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/F_.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/F_.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/F_.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/M_W_L_1.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/N_U_M_2.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/P_R_I_V_.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_3S_T_.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/T_P_S_P_.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/_notdef.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/_notdef.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/_notdef.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/_notdef.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvf.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvm.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/abvs.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/afrc.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/akhn.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwf.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blwm.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/blws.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2pc.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/c2sc.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/calt.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/case.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ccmp.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cfar.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cjct.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/clig.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/contents.plist b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/contents.plist similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/contents.plist rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/contents.plist diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpct.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cpsp.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cswh.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/curs.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv00.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv01.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv02.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv03.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv04.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv05.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv06.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv07.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv08.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv09.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv10.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv11.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv12.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv13.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv14.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv15.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv16.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv17.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv18.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv19.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv20.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv21.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv22.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv23.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv24.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv25.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv26.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv27.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv28.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv29.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv30.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv31.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv32.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv33.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv34.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv35.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv36.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv37.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv38.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv39.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv40.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv41.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv42.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv43.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv44.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv45.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv46.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv47.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv48.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv49.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv50.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv51.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv52.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv53.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv54.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv55.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv56.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv57.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv58.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv59.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv60.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv61.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv62.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv63.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv64.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv65.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv66.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv67.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv68.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv69.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv70.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv71.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv72.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv73.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv74.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv75.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv76.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv77.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv78.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv79.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv80.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv81.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv82.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv83.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv84.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv85.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv86.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv87.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv88.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv89.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv90.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv91.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv92.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv93.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv94.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv95.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv96.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv97.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv98.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/cv99.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dist.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dlig.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/dnom.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/expt.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/falt.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin2.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fin3.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fina.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/frac.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/fwid.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/half.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/haln.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/halt.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hist.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hkna.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hlig.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hngl.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hojo.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/hwid.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/init.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/isol.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ital.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jalt.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp04.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp78.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp83.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/jp90.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/kern.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lfbd.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/liga.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ljmo.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/lnum.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/locl.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltra.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ltrm.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mark.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/med2.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/medi.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mgrk.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mkmk.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/mset.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nalt.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nlck.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/nukt.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/numr.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/onum.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/opbd.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ordn.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ornm.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/palt.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pcap.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pkna.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pnum.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pref.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pres.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pstf.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/psts.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/pwid.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/qwid.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rand.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rkrf.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rlig.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rphf.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtbd.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtla.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/rtlm.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ruby.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/salt.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sinf.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/size.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smcp.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/smpl.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/space.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/space.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/space.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/space.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss00.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss01.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss02.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss03.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss04.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss05.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss06.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss07.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss08.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss09.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss10.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss11.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss12.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss13.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss14.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss15.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss16.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss17.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss18.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss19.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss20.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/ss21.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/subs.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/sups.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/swsh.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/titl.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tjmo.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnam.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/tnum.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/trad.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/twid.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/unic.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/valt.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vatu.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vert.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vhal.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vjmo.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkna.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vkrn.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vpal.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/vrt2.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.alt1.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.alt1.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.alt1.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.alt1.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.alt2.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.alt2.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.alt2.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.alt2.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.alt3.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.alt3.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.alt3.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.alt3.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.default.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.default.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.default.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.default.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.fail.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.fail.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.fail.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.fail.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.pass.glif b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.pass.glif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.pass.glif rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/glyphs/zero.pass.glif diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/metainfo.plist b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/metainfo.plist similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/metainfo.plist rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-lookup3.ufo/metainfo.plist diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-shell.ttx b/tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-shell.ttx similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/gsubtest-shell.ttx rename to tests/wpt/tests/css/css-fonts/support/fonts/gsubtest-shell.ttx diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/makegsubfonts.py b/tests/wpt/tests/css/css-fonts/support/fonts/makegsubfonts.py similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/makegsubfonts.py rename to tests/wpt/tests/css/css-fonts/support/fonts/makegsubfonts.py diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/pass.woff b/tests/wpt/tests/css/css-fonts/support/fonts/pass.woff similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/pass.woff rename to tests/wpt/tests/css/css-fonts/support/fonts/pass.woff diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/roboto_var_light_range.ttf b/tests/wpt/tests/css/css-fonts/support/fonts/roboto_var_light_range.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/roboto_var_light_range.ttf rename to tests/wpt/tests/css/css-fonts/support/fonts/roboto_var_light_range.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/green15x15.png b/tests/wpt/tests/css/css-fonts/support/green15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/green15x15.png rename to tests/wpt/tests/css/css-fonts/support/green15x15.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/green_box.png b/tests/wpt/tests/css/css-fonts/support/green_box.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/green_box.png rename to tests/wpt/tests/css/css-fonts/support/green_box.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/js/font-variant-features.js b/tests/wpt/tests/css/css-fonts/support/js/font-variant-features.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/js/font-variant-features.js rename to tests/wpt/tests/css/css-fonts/support/js/font-variant-features.js diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/margin-collapse-2em-space.png b/tests/wpt/tests/css/css-fonts/support/margin-collapse-2em-space.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/margin-collapse-2em-space.png rename to tests/wpt/tests/css/css-fonts/support/margin-collapse-2em-space.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/margin-collapse-4em-space.png b/tests/wpt/tests/css/css-fonts/support/margin-collapse-4em-space.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/margin-collapse-4em-space.png rename to tests/wpt/tests/css/css-fonts/support/margin-collapse-4em-space.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/orange15x15.png b/tests/wpt/tests/css/css-fonts/support/orange15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/orange15x15.png rename to tests/wpt/tests/css/css-fonts/support/orange15x15.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/orange_box.png b/tests/wpt/tests/css/css-fonts/support/orange_box.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/orange_box.png rename to tests/wpt/tests/css/css-fonts/support/orange_box.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/css-fonts/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/css-fonts/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/css-fonts/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/css-fonts/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/css-fonts/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/css-fonts/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/pattern-tr.png b/tests/wpt/tests/css/css-fonts/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/pattern-tr.png rename to tests/wpt/tests/css/css-fonts/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/red15x15.png b/tests/wpt/tests/css/css-fonts/support/red15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/red15x15.png rename to tests/wpt/tests/css/css-fonts/support/red15x15.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/red_box.png b/tests/wpt/tests/css/css-fonts/support/red_box.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/red_box.png rename to tests/wpt/tests/css/css-fonts/support/red_box.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/ring.png b/tests/wpt/tests/css/css-fonts/support/ring.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/ring.png rename to tests/wpt/tests/css/css-fonts/support/ring.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/square-purple.png b/tests/wpt/tests/css/css-fonts/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/square-purple.png rename to tests/wpt/tests/css/css-fonts/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/square-teal.png b/tests/wpt/tests/css/css-fonts/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/square-teal.png rename to tests/wpt/tests/css/css-fonts/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/square-white.png b/tests/wpt/tests/css/css-fonts/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/square-white.png rename to tests/wpt/tests/css/css-fonts/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/swatch-aqua.png b/tests/wpt/tests/css/css-fonts/support/swatch-aqua.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/swatch-aqua.png rename to tests/wpt/tests/css/css-fonts/support/swatch-aqua.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/swatch-blue.png b/tests/wpt/tests/css/css-fonts/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/swatch-blue.png rename to tests/wpt/tests/css/css-fonts/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/swatch-green.png b/tests/wpt/tests/css/css-fonts/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/swatch-green.png rename to tests/wpt/tests/css/css-fonts/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/swatch-lime.png b/tests/wpt/tests/css/css-fonts/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/swatch-lime.png rename to tests/wpt/tests/css/css-fonts/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/swatch-orange.png b/tests/wpt/tests/css/css-fonts/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/swatch-orange.png rename to tests/wpt/tests/css/css-fonts/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/swatch-red.png b/tests/wpt/tests/css/css-fonts/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/swatch-red.png rename to tests/wpt/tests/css/css-fonts/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/swatch-teal.png b/tests/wpt/tests/css/css-fonts/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/swatch-teal.png rename to tests/wpt/tests/css/css-fonts/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/swatch-white.png b/tests/wpt/tests/css/css-fonts/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/swatch-white.png rename to tests/wpt/tests/css/css-fonts/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/swatch-yellow.png b/tests/wpt/tests/css/css-fonts/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/swatch-yellow.png rename to tests/wpt/tests/css/css-fonts/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/test-bl.png b/tests/wpt/tests/css/css-fonts/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/test-bl.png rename to tests/wpt/tests/css/css-fonts/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/test-br.png b/tests/wpt/tests/css/css-fonts/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/test-br.png rename to tests/wpt/tests/css/css-fonts/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/test-outer.png b/tests/wpt/tests/css/css-fonts/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/test-outer.png rename to tests/wpt/tests/css/css-fonts/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/test-tl.png b/tests/wpt/tests/css/css-fonts/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/test-tl.png rename to tests/wpt/tests/css/css-fonts/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/test-tr.png b/tests/wpt/tests/css/css-fonts/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/test-tr.png rename to tests/wpt/tests/css/css-fonts/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/transparent_green.png b/tests/wpt/tests/css/css-fonts/support/transparent_green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/support/transparent_green.png rename to tests/wpt/tests/css/css-fonts/support/transparent_green.png diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-fonts-serialization.tentative.html b/tests/wpt/tests/css/css-fonts/system-fonts-serialization.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-fonts-serialization.tentative.html rename to tests/wpt/tests/css/css-fonts/system-fonts-serialization.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ar-notref.html b/tests/wpt/tests/css/css-fonts/system-ui-ar-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-ui-ar-notref.html rename to tests/wpt/tests/css/css-fonts/system-ui-ar-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ar.html b/tests/wpt/tests/css/css-fonts/system-ui-ar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-ui-ar.html rename to tests/wpt/tests/css/css-fonts/system-ui-ar.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja-notref.html b/tests/wpt/tests/css/css-fonts/system-ui-ja-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja-notref.html rename to tests/wpt/tests/css/css-fonts/system-ui-ja-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja-vs-zh.html b/tests/wpt/tests/css/css-fonts/system-ui-ja-vs-zh.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja-vs-zh.html rename to tests/wpt/tests/css/css-fonts/system-ui-ja-vs-zh.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja.html b/tests/wpt/tests/css/css-fonts/system-ui-ja.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-ui-ja.html rename to tests/wpt/tests/css/css-fonts/system-ui-ja.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-mixed-ref.html b/tests/wpt/tests/css/css-fonts/system-ui-mixed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-ui-mixed-ref.html rename to tests/wpt/tests/css/css-fonts/system-ui-mixed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-mixed.html b/tests/wpt/tests/css/css-fonts/system-ui-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-ui-mixed.html rename to tests/wpt/tests/css/css-fonts/system-ui-mixed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-notref.html b/tests/wpt/tests/css/css-fonts/system-ui-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-ui-notref.html rename to tests/wpt/tests/css/css-fonts/system-ui-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur-notref.html b/tests/wpt/tests/css/css-fonts/system-ui-ur-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur-notref.html rename to tests/wpt/tests/css/css-fonts/system-ui-ur-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur-vs-ar.html b/tests/wpt/tests/css/css-fonts/system-ui-ur-vs-ar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur-vs-ar.html rename to tests/wpt/tests/css/css-fonts/system-ui-ur-vs-ar.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur.html b/tests/wpt/tests/css/css-fonts/system-ui-ur.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-ui-ur.html rename to tests/wpt/tests/css/css-fonts/system-ui-ur.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-zh-notref.html b/tests/wpt/tests/css/css-fonts/system-ui-zh-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-ui-zh-notref.html rename to tests/wpt/tests/css/css-fonts/system-ui-zh-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui-zh.html b/tests/wpt/tests/css/css-fonts/system-ui-zh.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-ui-zh.html rename to tests/wpt/tests/css/css-fonts/system-ui-zh.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/system-ui.html b/tests/wpt/tests/css/css-fonts/system-ui.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/system-ui.html rename to tests/wpt/tests/css/css-fonts/system-ui.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/test-synthetic-bold.xht b/tests/wpt/tests/css/css-fonts/test-synthetic-bold.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/test-synthetic-bold.xht rename to tests/wpt/tests/css/css-fonts/test-synthetic-bold.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/test-synthetic-italic-2-ref.html b/tests/wpt/tests/css/css-fonts/test-synthetic-italic-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/test-synthetic-italic-2-ref.html rename to tests/wpt/tests/css/css-fonts/test-synthetic-italic-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/test-synthetic-italic-2.html b/tests/wpt/tests/css/css-fonts/test-synthetic-italic-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/test-synthetic-italic-2.html rename to tests/wpt/tests/css/css-fonts/test-synthetic-italic-2.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/test-synthetic-italic-3-ref.html b/tests/wpt/tests/css/css-fonts/test-synthetic-italic-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/test-synthetic-italic-3-ref.html rename to tests/wpt/tests/css/css-fonts/test-synthetic-italic-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/test-synthetic-italic-3.html b/tests/wpt/tests/css/css-fonts/test-synthetic-italic-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/test-synthetic-italic-3.html rename to tests/wpt/tests/css/css-fonts/test-synthetic-italic-3.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/test-synthetic-italic.xht b/tests/wpt/tests/css/css-fonts/test-synthetic-italic.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/test-synthetic-italic.xht rename to tests/wpt/tests/css/css-fonts/test-synthetic-italic.xht diff --git a/tests/wpt/web-platform-tests/css/css-fonts/test_datafont_same_origin.html b/tests/wpt/tests/css/css-fonts/test_datafont_same_origin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/test_datafont_same_origin.html rename to tests/wpt/tests/css/css-fonts/test_datafont_same_origin.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/test_font_family_parsing.html b/tests/wpt/tests/css/css-fonts/test_font_family_parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/test_font_family_parsing.html rename to tests/wpt/tests/css/css-fonts/test_font_family_parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/test_font_feature_values_parsing.html b/tests/wpt/tests/css/css-fonts/test_font_feature_values_parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/test_font_feature_values_parsing.html rename to tests/wpt/tests/css/css-fonts/test_font_feature_values_parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/META.yml b/tests/wpt/tests/css/css-fonts/variations/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/META.yml rename to tests/wpt/tests/css/css-fonts/variations/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/at-font-face-descriptors.html b/tests/wpt/tests/css/css-fonts/variations/at-font-face-descriptors.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/at-font-face-descriptors.html rename to tests/wpt/tests/css/css-fonts/variations/at-font-face-descriptors.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/at-font-face-font-matching.html b/tests/wpt/tests/css/css-fonts/variations/at-font-face-font-matching.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/at-font-face-font-matching.html rename to tests/wpt/tests/css/css-fonts/variations/at-font-face-font-matching.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-descriptor-range-reversed-ref.html b/tests/wpt/tests/css/css-fonts/variations/font-descriptor-range-reversed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-descriptor-range-reversed-ref.html rename to tests/wpt/tests/css/css-fonts/variations/font-descriptor-range-reversed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-descriptor-range-reversed.html b/tests/wpt/tests/css/css-fonts/variations/font-descriptor-range-reversed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-descriptor-range-reversed.html rename to tests/wpt/tests/css/css-fonts/variations/font-descriptor-range-reversed.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-opentype-collections.html b/tests/wpt/tests/css/css-fonts/variations/font-opentype-collections.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-opentype-collections.html rename to tests/wpt/tests/css/css-fonts/variations/font-opentype-collections.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-parse-numeric-stretch-style-weight.html b/tests/wpt/tests/css/css-fonts/variations/font-parse-numeric-stretch-style-weight.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-parse-numeric-stretch-style-weight.html rename to tests/wpt/tests/css/css-fonts/variations/font-parse-numeric-stretch-style-weight.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-shorthand.html b/tests/wpt/tests/css/css-fonts/variations/font-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-shorthand.html rename to tests/wpt/tests/css/css-fonts/variations/font-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-1-ref.html b/tests/wpt/tests/css/css-fonts/variations/font-slant-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-1-ref.html rename to tests/wpt/tests/css/css-fonts/variations/font-slant-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-1.html b/tests/wpt/tests/css/css-fonts/variations/font-slant-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-1.html rename to tests/wpt/tests/css/css-fonts/variations/font-slant-1.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-2-ref.html b/tests/wpt/tests/css/css-fonts/variations/font-slant-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-2-ref.html rename to tests/wpt/tests/css/css-fonts/variations/font-slant-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-2a.html b/tests/wpt/tests/css/css-fonts/variations/font-slant-2a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-2a.html rename to tests/wpt/tests/css/css-fonts/variations/font-slant-2a.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-2b.html b/tests/wpt/tests/css/css-fonts/variations/font-slant-2b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-2b.html rename to tests/wpt/tests/css/css-fonts/variations/font-slant-2b.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-2c.html b/tests/wpt/tests/css/css-fonts/variations/font-slant-2c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-2c.html rename to tests/wpt/tests/css/css-fonts/variations/font-slant-2c.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-3-ref.html b/tests/wpt/tests/css/css-fonts/variations/font-slant-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-3-ref.html rename to tests/wpt/tests/css/css-fonts/variations/font-slant-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-3.html b/tests/wpt/tests/css/css-fonts/variations/font-slant-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-slant-3.html rename to tests/wpt/tests/css/css-fonts/variations/font-slant-3.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-stretch.html b/tests/wpt/tests/css/css-fonts/variations/font-stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-stretch.html rename to tests/wpt/tests/css/css-fonts/variations/font-stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-style-interpolation.html b/tests/wpt/tests/css/css-fonts/variations/font-style-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-style-interpolation.html rename to tests/wpt/tests/css/css-fonts/variations/font-style-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-style-parsing.html b/tests/wpt/tests/css/css-fonts/variations/font-style-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-style-parsing.html rename to tests/wpt/tests/css/css-fonts/variations/font-style-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-variation-settings-inherit.html b/tests/wpt/tests/css/css-fonts/variations/font-variation-settings-inherit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-variation-settings-inherit.html rename to tests/wpt/tests/css/css-fonts/variations/font-variation-settings-inherit.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-interpolation.html b/tests/wpt/tests/css/css-fonts/variations/font-weight-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-interpolation.html rename to tests/wpt/tests/css/css-fonts/variations/font-weight-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-lighter-bolder.html b/tests/wpt/tests/css/css-fonts/variations/font-weight-lighter-bolder.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-lighter-bolder.html rename to tests/wpt/tests/css/css-fonts/variations/font-weight-lighter-bolder.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-matching-installed-fonts.html b/tests/wpt/tests/css/css-fonts/variations/font-weight-matching-installed-fonts.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-matching-installed-fonts.html rename to tests/wpt/tests/css/css-fonts/variations/font-weight-matching-installed-fonts.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-matching.html b/tests/wpt/tests/css/css-fonts/variations/font-weight-matching.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-matching.html rename to tests/wpt/tests/css/css-fonts/variations/font-weight-matching.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-metrics-ref.html b/tests/wpt/tests/css/css-fonts/variations/font-weight-metrics-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-metrics-ref.html rename to tests/wpt/tests/css/css-fonts/variations/font-weight-metrics-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-metrics.html b/tests/wpt/tests/css/css-fonts/variations/font-weight-metrics.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-metrics.html rename to tests/wpt/tests/css/css-fonts/variations/font-weight-metrics.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-parsing.html b/tests/wpt/tests/css/css-fonts/variations/font-weight-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-parsing.html rename to tests/wpt/tests/css/css-fonts/variations/font-weight-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/FontStyleTest-slnt-VF.woff2 b/tests/wpt/tests/css/css-fonts/variations/resources/FontStyleTest-slnt-VF.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/FontStyleTest-slnt-VF.woff2 rename to tests/wpt/tests/css/css-fonts/variations/resources/FontStyleTest-slnt-VF.woff2 diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/FontStyleTest-slnt_backslant-VF.woff2 b/tests/wpt/tests/css/css-fonts/variations/resources/FontStyleTest-slnt_backslant-VF.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/FontStyleTest-slnt_backslant-VF.woff2 rename to tests/wpt/tests/css/css-fonts/variations/resources/FontStyleTest-slnt_backslant-VF.woff2 diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/Inter.no-var.subset.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/Inter.no-var.subset.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/Inter.no-var.subset.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/Inter.no-var.subset.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/Inter.var.subset.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/Inter.var.subset.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/Inter.var.subset.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/Inter.var.subset.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/ahem.ttc b/tests/wpt/tests/css/css-fonts/variations/resources/ahem.ttc similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/ahem.ttc rename to tests/wpt/tests/css/css-fonts/variations/resources/ahem.ttc diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-100-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-100-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-100-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-100-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-1479-w1-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-1479-w1-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-1479-w1-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-1479-w1-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-1479-w4-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-1479-w4-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-1479-w4-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-1479-w4-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-1479-w7-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-1479-w7-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-1479-w7-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-1479-w7-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-1479-w9-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-1479-w9-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-1479-w9-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-1479-w9-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-15-w1-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-15-w1-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-15-w1-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-15-w1-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-15-w5-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-15-w5-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-15-w5-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-15-w5-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-200-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-200-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-200-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-200-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-24-w2-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-24-w2-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-24-w2-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-24-w2-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-24-w4-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-24-w4-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-24-w4-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-24-w4-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-2569-w2-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-2569-w2-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-2569-w2-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-2569-w2-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-2569-w5-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-2569-w5-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-2569-w5-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-2569-w5-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-2569-w6-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-2569-w6-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-2569-w6-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-2569-w6-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-2569-w9-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-2569-w9-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-2569-w9-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-2569-w9-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-258-w2-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-258-w2-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-258-w2-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-258-w2-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-258-w5-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-258-w5-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-258-w5-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-258-w5-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-258-w8-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-258-w8-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-258-w8-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-258-w8-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-300-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-300-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-300-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-300-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-3589-w3-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-3589-w3-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-3589-w3-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-3589-w3-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-3589-w5-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-3589-w5-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-3589-w5-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-3589-w5-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-3589-w8-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-3589-w8-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-3589-w8-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-3589-w8-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-3589-w9-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-3589-w9-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-3589-w9-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-3589-w9-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-400-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-400-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-400-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-400-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-47-w4-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-47-w4-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-47-w4-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-47-w4-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-47-w7-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-47-w7-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-47-w7-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-47-w7-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-500-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-500-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-500-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-500-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-600-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-600-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-600-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-600-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-700-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-700-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-700-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-700-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-800-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-800-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-800-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-800-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-900-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-900-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-900-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-900-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w1-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w1-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w1-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w1-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w2-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w2-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w2-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w2-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w3-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w3-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w3-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w3-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w4-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w4-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w4-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w4-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w5-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w5-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w5-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w5-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w6-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w6-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w6-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w6-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w7-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w7-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w7-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w7-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w8-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w8-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w8-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w8-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w9-kerned.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w9-kerned.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/csstest-weights-full-w9-kerned.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/csstest-weights-full-w9-kerned.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/resources/variabletest_box.ttf b/tests/wpt/tests/css/css-fonts/variations/resources/variabletest_box.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/resources/variabletest_box.ttf rename to tests/wpt/tests/css/css-fonts/variations/resources/variabletest_box.ttf diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/slnt-backslant-variable-ref.html b/tests/wpt/tests/css/css-fonts/variations/slnt-backslant-variable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/slnt-backslant-variable-ref.html rename to tests/wpt/tests/css/css-fonts/variations/slnt-backslant-variable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/slnt-backslant-variable.html b/tests/wpt/tests/css/css-fonts/variations/slnt-backslant-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/slnt-backslant-variable.html rename to tests/wpt/tests/css/css-fonts/variations/slnt-backslant-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/slnt-variable-ref.html b/tests/wpt/tests/css/css-fonts/variations/slnt-variable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/slnt-variable-ref.html rename to tests/wpt/tests/css/css-fonts/variations/slnt-variable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/slnt-variable.html b/tests/wpt/tests/css/css-fonts/variations/slnt-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/slnt-variable.html rename to tests/wpt/tests/css/css-fonts/variations/slnt-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/variable-box-font-ref.html b/tests/wpt/tests/css/css-fonts/variations/variable-box-font-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/variable-box-font-ref.html rename to tests/wpt/tests/css/css-fonts/variations/variable-box-font-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/variable-box-font.html b/tests/wpt/tests/css/css-fonts/variations/variable-box-font.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/variable-box-font.html rename to tests/wpt/tests/css/css-fonts/variations/variable-box-font.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/variable-gpos-m2b-ref.html b/tests/wpt/tests/css/css-fonts/variations/variable-gpos-m2b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/variable-gpos-m2b-ref.html rename to tests/wpt/tests/css/css-fonts/variations/variable-gpos-m2b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/variable-gpos-m2b.html b/tests/wpt/tests/css/css-fonts/variations/variable-gpos-m2b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/variable-gpos-m2b.html rename to tests/wpt/tests/css/css-fonts/variations/variable-gpos-m2b.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/variable-gsub-ref.html b/tests/wpt/tests/css/css-fonts/variations/variable-gsub-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/variable-gsub-ref.html rename to tests/wpt/tests/css/css-fonts/variations/variable-gsub-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/variable-gsub.html b/tests/wpt/tests/css/css-fonts/variations/variable-gsub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/variable-gsub.html rename to tests/wpt/tests/css/css-fonts/variations/variable-gsub.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/variable-opsz-ref.html b/tests/wpt/tests/css/css-fonts/variations/variable-opsz-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/variable-opsz-ref.html rename to tests/wpt/tests/css/css-fonts/variations/variable-opsz-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/variable-opsz-size-adjust-ref.html b/tests/wpt/tests/css/css-fonts/variations/variable-opsz-size-adjust-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/variable-opsz-size-adjust-ref.html rename to tests/wpt/tests/css/css-fonts/variations/variable-opsz-size-adjust-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/variable-opsz-size-adjust.html b/tests/wpt/tests/css/css-fonts/variations/variable-opsz-size-adjust.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/variable-opsz-size-adjust.html rename to tests/wpt/tests/css/css-fonts/variations/variable-opsz-size-adjust.html diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/variable-opsz.html b/tests/wpt/tests/css/css-fonts/variations/variable-opsz.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-fonts/variations/variable-opsz.html rename to tests/wpt/tests/css/css-fonts/variations/variable-opsz.html diff --git a/tests/wpt/web-platform-tests/css/css-forced-color-adjust/inheritance.html b/tests/wpt/tests/css/css-forced-color-adjust/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-forced-color-adjust/inheritance.html rename to tests/wpt/tests/css/css-forced-color-adjust/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-forced-color-adjust/parsing/forced-color-adjust-computed.html b/tests/wpt/tests/css/css-forced-color-adjust/parsing/forced-color-adjust-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-forced-color-adjust/parsing/forced-color-adjust-computed.html rename to tests/wpt/tests/css/css-forced-color-adjust/parsing/forced-color-adjust-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-forced-color-adjust/parsing/forced-color-adjust-invalid.html b/tests/wpt/tests/css/css-forced-color-adjust/parsing/forced-color-adjust-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-forced-color-adjust/parsing/forced-color-adjust-invalid.html rename to tests/wpt/tests/css/css-forced-color-adjust/parsing/forced-color-adjust-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-forced-color-adjust/parsing/forced-color-adjust-valid.html b/tests/wpt/tests/css/css-forced-color-adjust/parsing/forced-color-adjust-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-forced-color-adjust/parsing/forced-color-adjust-valid.html rename to tests/wpt/tests/css/css-forced-color-adjust/parsing/forced-color-adjust-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/META.yml b/tests/wpt/tests/css/css-gcpm/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/META.yml rename to tests/wpt/tests/css/css-gcpm/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/leader-001.html b/tests/wpt/tests/css/css-gcpm/leader-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/leader-001.html rename to tests/wpt/tests/css/css-gcpm/leader-001.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/leader-002.html b/tests/wpt/tests/css/css-gcpm/leader-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/leader-002.html rename to tests/wpt/tests/css/css-gcpm/leader-002.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/leader-003.html b/tests/wpt/tests/css/css-gcpm/leader-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/leader-003.html rename to tests/wpt/tests/css/css-gcpm/leader-003.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/string-set-001.html b/tests/wpt/tests/css/css-gcpm/string-set-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/string-set-001.html rename to tests/wpt/tests/css/css-gcpm/string-set-001.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/string-set-002.html b/tests/wpt/tests/css/css-gcpm/string-set-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/string-set-002.html rename to tests/wpt/tests/css/css-gcpm/string-set-002.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/string-set-003.html b/tests/wpt/tests/css/css-gcpm/string-set-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/string-set-003.html rename to tests/wpt/tests/css/css-gcpm/string-set-003.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/string-set-004.html b/tests/wpt/tests/css/css-gcpm/string-set-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/string-set-004.html rename to tests/wpt/tests/css/css-gcpm/string-set-004.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/string-set-005.html b/tests/wpt/tests/css/css-gcpm/string-set-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/string-set-005.html rename to tests/wpt/tests/css/css-gcpm/string-set-005.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/string-set-006.html b/tests/wpt/tests/css/css-gcpm/string-set-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/string-set-006.html rename to tests/wpt/tests/css/css-gcpm/string-set-006.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/string-set-007.html b/tests/wpt/tests/css/css-gcpm/string-set-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/string-set-007.html rename to tests/wpt/tests/css/css-gcpm/string-set-007.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/string-set-008.html b/tests/wpt/tests/css/css-gcpm/string-set-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/string-set-008.html rename to tests/wpt/tests/css/css-gcpm/string-set-008.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/string-set-009.html b/tests/wpt/tests/css/css-gcpm/string-set-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/string-set-009.html rename to tests/wpt/tests/css/css-gcpm/string-set-009.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/string-set-010.html b/tests/wpt/tests/css/css-gcpm/string-set-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/string-set-010.html rename to tests/wpt/tests/css/css-gcpm/string-set-010.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/string-set-011.html b/tests/wpt/tests/css/css-gcpm/string-set-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/string-set-011.html rename to tests/wpt/tests/css/css-gcpm/string-set-011.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/string-set-012.html b/tests/wpt/tests/css/css-gcpm/string-set-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/string-set-012.html rename to tests/wpt/tests/css/css-gcpm/string-set-012.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/using-strings-001.html b/tests/wpt/tests/css/css-gcpm/using-strings-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/using-strings-001.html rename to tests/wpt/tests/css/css-gcpm/using-strings-001.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/using-strings-002.html b/tests/wpt/tests/css/css-gcpm/using-strings-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/using-strings-002.html rename to tests/wpt/tests/css/css-gcpm/using-strings-002.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/using-strings-003.html b/tests/wpt/tests/css/css-gcpm/using-strings-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/using-strings-003.html rename to tests/wpt/tests/css/css-gcpm/using-strings-003.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/using-strings-004.html b/tests/wpt/tests/css/css-gcpm/using-strings-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/using-strings-004.html rename to tests/wpt/tests/css/css-gcpm/using-strings-004.html diff --git a/tests/wpt/web-platform-tests/css/css-gcpm/using-strings-005.html b/tests/wpt/tests/css/css-gcpm/using-strings-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-gcpm/using-strings-005.html rename to tests/wpt/tests/css/css-gcpm/using-strings-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/META.yml b/tests/wpt/tests/css/css-grid/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/META.yml rename to tests/wpt/tests/css/css-grid/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-grid/README.md b/tests/wpt/tests/css/css-grid/README.md similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/README.md rename to tests/wpt/tests/css/css-grid/README.md diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-changing-containing-block-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/absolute-positioning-changing-containing-block-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-changing-containing-block-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/absolute-positioning-changing-containing-block-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-changing-containing-block-001.html b/tests/wpt/tests/css/css-grid/abspos/absolute-positioning-changing-containing-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-changing-containing-block-001.html rename to tests/wpt/tests/css/css-grid/abspos/absolute-positioning-changing-containing-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-definite-sizes-001.html b/tests/wpt/tests/css/css-grid/abspos/absolute-positioning-definite-sizes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-definite-sizes-001.html rename to tests/wpt/tests/css/css-grid/abspos/absolute-positioning-definite-sizes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html b/tests/wpt/tests/css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html rename to tests/wpt/tests/css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html b/tests/wpt/tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html rename to tests/wpt/tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-002.html b/tests/wpt/tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-002.html rename to tests/wpt/tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/descendant-static-position-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/descendant-static-position-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-001.html b/tests/wpt/tests/css/css-grid/abspos/descendant-static-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-001.html rename to tests/wpt/tests/css/css-grid/abspos/descendant-static-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/descendant-static-position-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/descendant-static-position-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-002.html b/tests/wpt/tests/css/css-grid/abspos/descendant-static-position-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-002.html rename to tests/wpt/tests/css/css-grid/abspos/descendant-static-position-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-003-ref.html b/tests/wpt/tests/css/css-grid/abspos/descendant-static-position-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-003-ref.html rename to tests/wpt/tests/css/css-grid/abspos/descendant-static-position-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-003.html b/tests/wpt/tests/css/css-grid/abspos/descendant-static-position-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-003.html rename to tests/wpt/tests/css/css-grid/abspos/descendant-static-position-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-004-ref.html b/tests/wpt/tests/css/css-grid/abspos/descendant-static-position-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-004-ref.html rename to tests/wpt/tests/css/css-grid/abspos/descendant-static-position-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-004.html b/tests/wpt/tests/css/css-grid/abspos/descendant-static-position-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/descendant-static-position-004.html rename to tests/wpt/tests/css/css-grid/abspos/descendant-static-position-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/empty-grid-001.html b/tests/wpt/tests/css/css-grid/abspos/empty-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/empty-grid-001.html rename to tests/wpt/tests/css/css-grid/abspos/empty-grid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-003-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-003-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-003.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-003.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-004-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-004-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-004.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-004.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-safe-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-003-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-003-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-003.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-003.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-004-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-004-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-004.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-004.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-003-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-003-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-003.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-003.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-004-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-004-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-004.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-004.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-003-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-003-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-003.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-003.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-004-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-004-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-004.html b/tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-004.html rename to tests/wpt/tests/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-item-absolute-positioning-dynamic-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-item-absolute-positioning-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-item-absolute-positioning-dynamic-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-item-absolute-positioning-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-paint-positioned-children-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-paint-positioned-children-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-paint-positioned-children-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-paint-positioned-children-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-paint-positioned-children-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-paint-positioned-children-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-paint-positioned-children-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-paint-positioned-children-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-003.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-003.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-004-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-004-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-004.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-004.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-005-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-005-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-005.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-005.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-006-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-006-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-006.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-006.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-007-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-007-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-007.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-007.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-item-dynamic-change-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-background-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-background-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-background-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-background-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-content-alignment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-content-alignment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-gaps-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-gaps-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-002-rtl.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-gaps-002-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-002-rtl.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-gaps-002-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-002.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-gaps-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-002.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-gaps-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-padding-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-padding-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-padding-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-padding-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-sizing-positioned-items-001.html b/tests/wpt/tests/css/css-grid/abspos/grid-sizing-positioned-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/grid-sizing-positioned-items-001.html rename to tests/wpt/tests/css/css-grid/abspos/grid-sizing-positioned-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-001.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-001.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-002.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-002.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-003.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-003.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-004.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-004.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-005.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-005.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-006.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-006.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-007.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-007.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-008.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-008.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-009.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-009.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-010.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-010.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-011.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-011.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-012.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-012.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-013.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-013.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-014.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-014.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-015.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-015.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-016.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-016.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-descendants-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-001.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-001.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-002.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-002.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-003.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-003.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-004.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-004.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-005-ref.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-005-ref.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-005.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-005.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-006-ref.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-006-ref.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-006.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-006.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-007-ref.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-007-ref.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-007.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-007.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-008-ref.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-008-ref.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-008.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-008.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-009-ref.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-009-ref.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-009.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-009.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-010.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-010.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-011-ref.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-011-ref.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-011.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-011.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-012-ref.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-012-ref.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-012.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-012.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-013-ref.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-013-ref.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-013.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-013.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-014-ref.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-014-ref.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-014.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-014.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-015-ref.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-015-ref.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-015.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-015.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-016-ref.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-016-ref.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-016.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-016.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-017-ref.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-017-ref.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-017.html b/tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/orthogonal-positioned-grid-items-017.html rename to tests/wpt/tests/css/css-grid/abspos/orthogonal-positioned-grid-items-017.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-001.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-001.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-002.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-002.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-003.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-003.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-004.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-004.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-005.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-005.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-006.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-006.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-007.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-007.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-008.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-008.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-009.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-009.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-010.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-010.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-011.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-011.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-012.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-012.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-013.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-013.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-014.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-014.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-015.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-015.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-016.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-016.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-017-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-017-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-017.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-descendants-017.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-descendants-017.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-001.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-001.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-002.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-002.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-003.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-003.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-004.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-004.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-005-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-005-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-005.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-005.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-006-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-006-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-006.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-006.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-007-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-007-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-007.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-007.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-008-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-008-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-008.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-008.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-009-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-009-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-009.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-009.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-010.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-010.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-011-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-011-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-011.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-011.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-012-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-012-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-012.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-012.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-013-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-013-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-013.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-013.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-014-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-014-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-014.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-014.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-015-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-015-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-015.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-015.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-016-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-016-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-016.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-016.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-017-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-017-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-017.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-017.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-017.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-018.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-018.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-018.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-019-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-019-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-019.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-019.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-019.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-020.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-020.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-020.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-021.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-021.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-021.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-022-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-022-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-022.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-022.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-022.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-023-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-023-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-023.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-023.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-023.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-024.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-024.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-024.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-025-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-025-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-025.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-025.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-025.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-crash.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-crash.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-negative-indices-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-negative-indices-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-001.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-negative-indices-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-001.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-negative-indices-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-002-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-negative-indices-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-002-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-negative-indices-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-002.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-negative-indices-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-002.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-negative-indices-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-003-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-negative-indices-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-003-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-negative-indices-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-003.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-negative-indices-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-negative-indices-003.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-negative-indices-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001.html b/tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-sizing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001.html rename to tests/wpt/tests/css/css-grid/abspos/positioned-grid-items-sizing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/support/colors-8x16.png b/tests/wpt/tests/css/css-grid/abspos/support/colors-8x16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/support/colors-8x16.png rename to tests/wpt/tests/css/css-grid/abspos/support/colors-8x16.png diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/support/positioned-grid-descendants.css b/tests/wpt/tests/css/css-grid/abspos/support/positioned-grid-descendants.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/support/positioned-grid-descendants.css rename to tests/wpt/tests/css/css-grid/abspos/support/positioned-grid-descendants.css diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/support/positioned-grid-descendants.js b/tests/wpt/tests/css/css-grid/abspos/support/positioned-grid-descendants.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/abspos/support/positioned-grid-descendants.js rename to tests/wpt/tests/css/css-grid/abspos/support/positioned-grid-descendants.js diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-fieldset-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-fieldset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-fieldset-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-fieldset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-fieldset-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-fieldset-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-fieldset-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-fieldset-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-fieldset-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-fieldset-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-fieldset-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-fieldset-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-flex-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-flex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-flex-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-flex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-flex-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-flex-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-flex-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-flex-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-flex-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-flex-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-flex-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-flex-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-flex-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-flex-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-flex-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-flex-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-grid-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-grid-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-grid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-grid-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-grid-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-grid-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-grid-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-grid-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-grid-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-grid-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-grid-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-line-clamp-001.tentative.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-line-clamp-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-line-clamp-001.tentative.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-line-clamp-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-line-clamp-002.tentative.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-line-clamp-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-line-clamp-002.tentative.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-line-clamp-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-line-clamp-003.tentative.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-line-clamp-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-line-clamp-003.tentative.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-line-clamp-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-multicol-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-multicol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-multicol-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-multicol-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-multicol-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-multicol-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-multicol-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-multicol-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-multicol-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-multicol-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-multicol-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-multicol-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-overflow-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-overflow-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-overflow-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-overflow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-overflow-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-overflow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-overflow-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-overflow-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-overflow-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-overflow-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-table-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-table-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-table-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-table-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-table-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-table-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-table-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-vertical.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline-vertical.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline-vertical.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-baseline.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-baseline.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-content-distribution-vertical-lr.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-content-distribution-vertical-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-content-distribution-vertical-lr.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-content-distribution-vertical-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-content-distribution-vertical-rl.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-content-distribution-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-content-distribution-vertical-rl.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-content-distribution-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-content-distribution.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-content-distribution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-content-distribution.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-content-distribution.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-lr.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-content-vertical-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-lr.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-content-vertical-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-rl.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-content-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-rl.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-content-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-content.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-content.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-content.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-justify-margin-border-padding-vertical-lr.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-justify-margin-border-padding-vertical-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-justify-margin-border-padding-vertical-lr.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-justify-margin-border-padding-vertical-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-justify-margin-border-padding-vertical-rl.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-justify-margin-border-padding-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-justify-margin-border-padding-vertical-rl.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-justify-margin-border-padding-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-justify-margin-border-padding.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-justify-margin-border-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-justify-margin-border-padding.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-justify-margin-border-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-justify-overflow.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-justify-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-justify-overflow.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-justify-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-justify-stretch-with-orthogonal-flows.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-justify-stretch-with-orthogonal-flows.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-justify-stretch-with-orthogonal-flows.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-justify-stretch-with-orthogonal-flows.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-justify-stretch.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-justify-stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-justify-stretch.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-justify-stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-stretching-replaced-items.html b/tests/wpt/tests/css/css-grid/alignment/grid-align-stretching-replaced-items.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align-stretching-replaced-items.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align-stretching-replaced-items.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align.html b/tests/wpt/tests/css/css-grid/alignment/grid-align.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-align.html rename to tests/wpt/tests/css/css-grid/alignment/grid-align.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-006.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-006.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-007.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-007.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-008.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-008.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-009.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-009.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-010.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-010.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-011.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-011.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-012.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-012.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-013.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-013.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-014.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-014.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-015.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-015.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-016.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-016.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-017.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-017.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-017.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-018.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-018.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-018.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-019.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-019.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-019.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-020.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-020.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-020.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-021.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-021.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-021.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-022.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-022.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-022.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-023.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-023.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-023.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-024.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-024.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-024.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-025.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-025.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-025.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-026.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-026.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-026.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-027.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-027.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-027.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-028.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-028.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-028.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-029.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-029.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-029.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-030.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-030.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-030.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-031.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-031.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-031.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-032.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-032.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-032.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-033.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-033.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-033.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-034.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-034.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-034.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-035.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-035.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-035.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-036.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-implies-size-change-036.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-implies-size-change-036.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-006.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-006.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-007.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-007.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-008.html b/tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-alignment-style-changes-008.html rename to tests/wpt/tests/css/css-grid/alignment/grid-alignment-style-changes-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-baseline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-baseline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-baseline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-baseline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-align-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-baseline-align-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-align-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-baseline-align-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-align-cycles-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-baseline-align-cycles-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-align-cycles-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-baseline-align-cycles-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-justify-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-baseline-justify-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-justify-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-baseline-justify-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-006.html b/tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-006.html rename to tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-007.html b/tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-007.html rename to tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-008.html b/tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-008.html rename to tests/wpt/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-006.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-006.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-007.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-007.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-008.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-008.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-009.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-009.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-010.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-010.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-011.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-011.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-012.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-012.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-013.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-013.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-014.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-014.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-015.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-015.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-016.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-016.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-017.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-017.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-positioned-items-017.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-container-auto-margins-scrollbars-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-container-auto-margins-scrollbars-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-container-auto-margins-scrollbars-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-container-auto-margins-scrollbars-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-container-baseline-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-container-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-container-baseline-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-container-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-and-self-alignment-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-auto-sized-tracks-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-auto-sized-tracks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-auto-sized-tracks-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-auto-sized-tracks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-overflow-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-overflow-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-overflow-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-overflow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-overflow-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-overflow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-second-pass-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-second-pass-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-second-pass-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-second-pass-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-second-pass-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-second-pass-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-second-pass-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-second-pass-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-abspos-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-with-abspos-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-abspos-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-with-abspos-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-with-span-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-with-span-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-lr-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-lr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-lr-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-lr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-rl-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-rl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-rl-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-alignment-with-span-vertical-rl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-006.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-006.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-007.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-007.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-008.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-008.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-009.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-009.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-010.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-010.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-011.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-011.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-012.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-012.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-013.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-013.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-014.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-014.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-015.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-015.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-016.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-016.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-017.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-017.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-017.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-018.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-018.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-018.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-019.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-019.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-019.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-020.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-020.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-020.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-021.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-021.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-021.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-022.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-022.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-022.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-023.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-023.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-023.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-024.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-024.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-024.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-025.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-025.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-025.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-026.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-026.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-026.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-027.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-027.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-027.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-028.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-028.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-028.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-006.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-006.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-007.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-007.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-008.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-008.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-009.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-009.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-010.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-010.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-011.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-011.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-012.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-012.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-013.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-013.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-014.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-014.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-015.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-015.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-016.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-016.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-017.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-017.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-017.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-018.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-018.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-018.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-019.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-019.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-019.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-020.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-020.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-020.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-021.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-021.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-021.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-022.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-022.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-022.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-023.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-023.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-023.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-024.html b/tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-024.html rename to tests/wpt/tests/css/css-grid/alignment/grid-content-distribution-with-collapsed-tracks-024.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-fit-content-tracks-dont-stretch-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-fit-content-tracks-dont-stretch-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-fit-content-tracks-dont-stretch-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-fit-content-tracks-dont-stretch-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-006.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-006.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-007.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-007.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-008.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-008.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-009.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-009.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-010.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-010.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-011.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-011.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-012.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-012.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-013.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-013.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-014-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-014-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-014.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-014.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-015-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-015-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-015.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-015.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-016-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-016-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-016.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-016.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-and-alignment.html b/tests/wpt/tests/css/css-grid/alignment/grid-gutters-and-alignment.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-and-alignment.html rename to tests/wpt/tests/css/css-grid/alignment/grid-gutters-and-alignment.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-006.html b/tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-006.html rename to tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-007.html b/tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-007.html rename to tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-008.html b/tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-008.html rename to tests/wpt/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-baseline.html b/tests/wpt/tests/css/css-grid/alignment/grid-inline-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-baseline.html rename to tests/wpt/tests/css/css-grid/alignment/grid-inline-baseline.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows-vertical-lr.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows-vertical-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows-vertical-lr.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows-vertical-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows-vertical-rl.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows-vertical-rl.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-3-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-3-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-3.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-3.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-3.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-auto-margins-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-auto-margins-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-auto-margins-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-auto-margins-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-auto-margins-alignment.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-auto-margins-alignment.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-002-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-002-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-003-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-003-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-004-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-004-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-content-baseline-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-content-baseline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-002-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-002-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-003-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-003-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-004-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-004-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-mixed-baseline-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-mixed-baseline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-1-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-1-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-1.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-1.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-1.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-2-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-2-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-2.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-2.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-2.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-3-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-3-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-3.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-3.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-3.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-4-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-4-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-4.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-4.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-4.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-5-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-5-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-5-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-5-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-5.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-5.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-5.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-6-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-6-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-6-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-6-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-6.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-6.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-6.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-no-aspect-ratio-stretch-6.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-self-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-self-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-self-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-self-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-self-baseline-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-item-self-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-item-self-baseline-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-item-self-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-justify-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-justify-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-justify-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-justify-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-justify-baseline-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-justify-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-justify-baseline-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-justify-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-justify-baseline-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-justify-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-justify-baseline-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-justify-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-justify-baseline-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-justify-baseline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-justify-baseline-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-justify-baseline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-justify-baseline-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-justify-baseline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-justify-baseline-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-justify-baseline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-justify-baseline-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-justify-baseline-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-justify-baseline-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-justify-baseline-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-place-content-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-place-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-place-content-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-place-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-006.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-006.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-007.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-007.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-008.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-008.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-009.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-009.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-010.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-010.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-011.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-011.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-012.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-012.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-013.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-013.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-014.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-014.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-015.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-015.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-016.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-016.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-017.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-017.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-positioned-items-017.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-001-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-001-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-006.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-006.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-007.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-007.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-008.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-008.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-009.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-009.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-010.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-010.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-011.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-011.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-012.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-012.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-006.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-006.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-007.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-007.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-008.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-008.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-009.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-009.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-010.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-010.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-011.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-011.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-012.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-012.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-013.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-013.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-014.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-014.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-015.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-015.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-016.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-016.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-006.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-006.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-007.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-007.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-008.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-008.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-009.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-009.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-010.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-010.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-011.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-011.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-012.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-012.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-013.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-013.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-014.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-014.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-015.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-015.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-016.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-016.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-input-range-ref.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-input-range-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-input-range-ref.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-input-range-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-input-range.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-input-range.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-input-range.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-input-range.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-006.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-006.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-007.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-007.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-008.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-008.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-009.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-009.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-010.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-010.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-011.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-011.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-012.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-012.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-013.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-013.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-014.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-014.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-015.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-015.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-016.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-016.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-lr-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-004.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-004.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-005.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-005.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-006.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-006.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-007.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-007.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-008.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-008.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-009.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-009.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-010.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-010.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-011.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-011.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-012.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-012.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-013.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-013.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-014.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-014.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-015.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-015.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-016.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-016.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment-stretch-vertical-rl-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-alignment.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-alignment.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-alignment.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-002.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-002.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-003.html b/tests/wpt/tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-003.html rename to tests/wpt/tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/alignment/references/grid-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/alignment/references/grid-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-002-ref.html b/tests/wpt/tests/css/css-grid/alignment/references/grid-baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-002-ref.html rename to tests/wpt/tests/css/css-grid/alignment/references/grid-baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-003-ref.html b/tests/wpt/tests/css/css-grid/alignment/references/grid-baseline-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-003-ref.html rename to tests/wpt/tests/css/css-grid/alignment/references/grid-baseline-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-align-001-ref.html b/tests/wpt/tests/css/css-grid/alignment/references/grid-baseline-align-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-align-001-ref.html rename to tests/wpt/tests/css/css-grid/alignment/references/grid-baseline-align-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-align-cycles-001-ref.html b/tests/wpt/tests/css/css-grid/alignment/references/grid-baseline-align-cycles-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-align-cycles-001-ref.html rename to tests/wpt/tests/css/css-grid/alignment/references/grid-baseline-align-cycles-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-justify-001-ref.html b/tests/wpt/tests/css/css-grid/alignment/references/grid-baseline-justify-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-justify-001-ref.html rename to tests/wpt/tests/css/css-grid/alignment/references/grid-baseline-justify-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.html b/tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.html rename to tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.html b/tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.html rename to tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-003.tentative.html b/tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-003.tentative.html rename to tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-004.html b/tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-004.html rename to tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-005.html b/tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-005.html rename to tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-006.html b/tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-006.html rename to tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-007.html b/tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-007.html rename to tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-008.html b/tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-008.html rename to tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-009.html b/tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-009.html rename to tests/wpt/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-001.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-001.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002-b-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002-b-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002-b.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002-b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002-b.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002-b.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-003-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-003-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-003.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-003.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-004-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-004-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-004.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-004.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-005-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-005-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-005.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-005.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-006-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-006-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-006.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-006.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-007-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-007-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-007.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-007.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-002.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-002.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-003.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-003.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-004.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-004.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-005.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-005.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-006.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-006.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-007.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-007.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-008.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-008.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-009.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-009.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-010.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-010.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-011.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-011.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-012.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-012.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-001-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-001-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-001.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-001.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-002-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-002-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-002.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-002.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-003-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-003-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-003.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-003.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-004-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-004-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-004.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-004.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-005-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-005-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-005.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-005.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-006-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-006-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-006.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-006.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-007-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-007-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-007.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-007.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-001-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-001-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-001.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-001.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-002-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-002-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-002.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-002.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-003-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-003-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-003.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-003.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-004-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-004-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-004.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-004.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-005-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-005-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-005.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-005.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-006-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-006-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-006.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-006.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-007-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-007-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-007.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-007.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-001-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-001-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-001.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-001.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-002-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-002-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-002.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-002.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-003-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-003-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-003.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-003.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-004-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-004-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-004.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-004.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-005-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-005-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-005.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-005.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-006-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-006-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-006.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-006.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-007-ref.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-007-ref.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-007.html b/tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-007.html rename to tests/wpt/tests/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/support/100x100-green.png b/tests/wpt/tests/css/css-grid/alignment/support/100x100-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/support/100x100-green.png rename to tests/wpt/tests/css/css-grid/alignment/support/100x100-green.png diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/support/25x50-green.png b/tests/wpt/tests/css/css-grid/alignment/support/25x50-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/support/25x50-green.png rename to tests/wpt/tests/css/css-grid/alignment/support/25x50-green.png diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/support/50x50-green.png b/tests/wpt/tests/css/css-grid/alignment/support/50x50-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/support/50x50-green.png rename to tests/wpt/tests/css/css-grid/alignment/support/50x50-green.png diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/support/style-change.js b/tests/wpt/tests/css/css-grid/alignment/support/style-change.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/alignment/support/style-change.js rename to tests/wpt/tests/css/css-grid/alignment/support/style-change.js diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-no-interpolation.html b/tests/wpt/tests/css/css-grid/animation/grid-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-no-interpolation.html rename to tests/wpt/tests/css/css-grid/animation/grid-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-001-ref.html b/tests/wpt/tests/css/css-grid/animation/grid-template-columns-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-001-ref.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-columns-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-001.html b/tests/wpt/tests/css/css-grid/animation/grid-template-columns-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-001.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-columns-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-composition.html b/tests/wpt/tests/css/css-grid/animation/grid-template-columns-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-composition.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-columns-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-interpolation.html b/tests/wpt/tests/css/css-grid/animation/grid-template-columns-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-interpolation.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-columns-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-001.html b/tests/wpt/tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-001.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-002.html b/tests/wpt/tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-002.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-003.html b/tests/wpt/tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-003.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-004.html b/tests/wpt/tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-004.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-columns-neutral-keyframe-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-001-ref.html b/tests/wpt/tests/css/css-grid/animation/grid-template-rows-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-001-ref.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-rows-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-001.html b/tests/wpt/tests/css/css-grid/animation/grid-template-rows-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-001.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-rows-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-composition.html b/tests/wpt/tests/css/css-grid/animation/grid-template-rows-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-composition.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-rows-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-interpolation.html b/tests/wpt/tests/css/css-grid/animation/grid-template-rows-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-interpolation.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-rows-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-001.html b/tests/wpt/tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-001.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-002.html b/tests/wpt/tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-002.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-003.html b/tests/wpt/tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-003.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-004.html b/tests/wpt/tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-004.html rename to tests/wpt/tests/css/css-grid/animation/grid-template-rows-neutral-keyframe-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/anonymous-grid-items-001.html b/tests/wpt/tests/css/css-grid/anonymous-grid-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/anonymous-grid-items-001.html rename to tests/wpt/tests/css/css-grid/anonymous-grid-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/child-border-box-and-max-content-001-ref.html b/tests/wpt/tests/css/css-grid/child-border-box-and-max-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/child-border-box-and-max-content-001-ref.html rename to tests/wpt/tests/css/css-grid/child-border-box-and-max-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/child-border-box-and-max-content-001.html b/tests/wpt/tests/css/css-grid/child-border-box-and-max-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/child-border-box-and-max-content-001.html rename to tests/wpt/tests/css/css-grid/child-border-box-and-max-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/child-border-box-and-max-content-002-ref.html b/tests/wpt/tests/css/css-grid/child-border-box-and-max-content-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/child-border-box-and-max-content-002-ref.html rename to tests/wpt/tests/css/css-grid/child-border-box-and-max-content-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/child-border-box-and-max-content-002.html b/tests/wpt/tests/css/css-grid/child-border-box-and-max-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/child-border-box-and-max-content-002.html rename to tests/wpt/tests/css/css-grid/child-border-box-and-max-content-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/chrome-bug-001.html b/tests/wpt/tests/css/css-grid/chrome-bug-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/chrome-bug-001.html rename to tests/wpt/tests/css/css-grid/chrome-bug-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/chrome-crash-001.html b/tests/wpt/tests/css/css-grid/chrome-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/chrome-crash-001.html rename to tests/wpt/tests/css/css-grid/chrome-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/dynamic-grid-with-auto-fill.html b/tests/wpt/tests/css/css-grid/dynamic-grid-with-auto-fill.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/dynamic-grid-with-auto-fill.html rename to tests/wpt/tests/css/css-grid/dynamic-grid-with-auto-fill.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/dynamic-grid-within-flexbox.html b/tests/wpt/tests/css/css-grid/dynamic-grid-within-flexbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/dynamic-grid-within-flexbox.html rename to tests/wpt/tests/css/css-grid/dynamic-grid-within-flexbox.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/empty-grid-within-flexbox.html b/tests/wpt/tests/css/css-grid/empty-grid-within-flexbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/empty-grid-within-flexbox.html rename to tests/wpt/tests/css/css-grid/empty-grid-within-flexbox.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-child-percent-basis-resize-1-ref.html b/tests/wpt/tests/css/css-grid/grid-child-percent-basis-resize-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-child-percent-basis-resize-1-ref.html rename to tests/wpt/tests/css/css-grid/grid-child-percent-basis-resize-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-child-percent-basis-resize-1.html b/tests/wpt/tests/css/css-grid/grid-child-percent-basis-resize-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-child-percent-basis-resize-1.html rename to tests/wpt/tests/css/css-grid/grid-child-percent-basis-resize-1.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/explicit-grid-size-001.html b/tests/wpt/tests/css/css-grid/grid-definition/explicit-grid-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/explicit-grid-size-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/explicit-grid-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-distribution-001.html b/tests/wpt/tests/css/css-grid/grid-definition/flex-content-distribution-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-distribution-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/flex-content-distribution-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-columns-001.html b/tests/wpt/tests/css/css-grid/grid-definition/flex-content-resolution-columns-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-columns-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/flex-content-resolution-columns-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-columns-002.html b/tests/wpt/tests/css/css-grid/grid-definition/flex-content-resolution-columns-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-columns-002.html rename to tests/wpt/tests/css/css-grid/grid-definition/flex-content-resolution-columns-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-rows-001.html b/tests/wpt/tests/css/css-grid/grid-definition/flex-content-resolution-rows-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-rows-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/flex-content-resolution-rows-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-rows-002.html b/tests/wpt/tests/css/css-grid/grid-definition/flex-content-resolution-rows-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-rows-002.html rename to tests/wpt/tests/css/css-grid/grid-definition/flex-content-resolution-rows-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-factor-sum-less-than-1-001.html b/tests/wpt/tests/css/css-grid/grid-definition/flex-factor-sum-less-than-1-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-factor-sum-less-than-1-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/flex-factor-sum-less-than-1-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-item-grid-container-percentage-rows-001.html b/tests/wpt/tests/css/css-grid/grid-definition/flex-item-grid-container-percentage-rows-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-item-grid-container-percentage-rows-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/flex-item-grid-container-percentage-rows-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/fr-unit-with-percentage.html b/tests/wpt/tests/css/css-grid/grid-definition/fr-unit-with-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/fr-unit-with-percentage.html rename to tests/wpt/tests/css/css-grid/grid-definition/fr-unit-with-percentage.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/fr-unit.html b/tests/wpt/tests/css/css-grid/grid-definition/fr-unit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/fr-unit.html rename to tests/wpt/tests/css/css-grid/grid-definition/fr-unit.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-add-item-with-positioned-items-crash.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-add-item-with-positioned-items-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-add-item-with-positioned-items-crash.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-add-item-with-positioned-items-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-add-positioned-block-item-after-inline-item-crash.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-add-positioned-block-item-after-inline-item-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-add-positioned-block-item-after-inline-item-crash.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-add-positioned-block-item-after-inline-item-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-explicit-rows-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-explicit-rows-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-explicit-rows-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-explicit-rows-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-fill-columns-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-fill-columns-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-fill-columns-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-fill-columns-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-fill-rows-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-fill-rows-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-fill-rows-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-fill-rows-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-fit-columns-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-fit-columns-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-fit-columns-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-fit-columns-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-fit-rows-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-fit-rows-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-fit-rows-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-fit-rows-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-aspect-ratio-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-aspect-ratio-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-aspect-ratio-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-aspect-ratio-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-aspect-ratio-002.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-aspect-ratio-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-aspect-ratio-002.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-aspect-ratio-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-002.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-002.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-003.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-003.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-intrinsic-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-intrinsic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-intrinsic-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-intrinsic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-003.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-003.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-004.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-004.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-minmax.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-minmax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-minmax.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-minmax.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-002-ref.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-002-ref.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-002.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-002.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-003-ref.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-003-ref.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-003.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-003.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-004-ref.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-004-ref.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-004.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-004.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-005-ref.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-005-ref.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-005.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-005.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001-ref.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-auto-repeat-tracks.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-change-auto-repeat-tracks.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-auto-repeat-tracks.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-change-auto-repeat-tracks.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-fit-content-argument-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-change-fit-content-argument-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-fit-content-argument-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-change-fit-content-argument-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-intrinsic-size-with-auto-repeat-tracks-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-change-intrinsic-size-with-auto-repeat-tracks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-intrinsic-size-with-auto-repeat-tracks-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-change-intrinsic-size-with-auto-repeat-tracks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-auto-repeat-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-inline-auto-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-auto-repeat-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-inline-auto-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-support-flexible-lengths-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-inline-support-flexible-lengths-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-support-flexible-lengths-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-inline-support-flexible-lengths-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-support-grid-template-areas-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-inline-support-grid-template-areas-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-support-grid-template-areas-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-inline-support-grid-template-areas-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-support-grid-template-columns-rows-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-inline-support-grid-template-columns-rows-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-support-grid-template-columns-rows-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-inline-support-grid-template-columns-rows-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-support-named-grid-lines-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-inline-support-named-grid-lines-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-support-named-grid-lines-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-inline-support-named-grid-lines-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-support-repeat-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-inline-support-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-support-repeat-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-inline-support-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-template-columns-rows-resolved-values-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-inline-template-columns-rows-resolved-values-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-template-columns-rows-resolved-values-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-inline-template-columns-rows-resolved-values-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-template-columns-rows-resolved-values-001.tentative.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-inline-template-columns-rows-resolved-values-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-template-columns-rows-resolved-values-001.tentative.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-inline-template-columns-rows-resolved-values-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-layout-auto-tracks.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-layout-auto-tracks.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-layout-auto-tracks.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-layout-auto-tracks.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-layout-basic.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-layout-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-layout-basic.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-layout-basic.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-layout-repeat-notation.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-layout-repeat-notation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-layout-repeat-notation.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-layout-repeat-notation.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-limits-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-limits-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-limits-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-limits-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-minimum-contribution-with-percentages.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-minimum-contribution-with-percentages.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-minimum-contribution-with-percentages.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-minimum-contribution-with-percentages.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-002.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-002.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-repeat-max-width-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-repeat-max-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-repeat-max-width-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-repeat-max-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-shorthand-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-shorthand-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-shorthand-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-shorthand-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-flexible-lengths-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-support-flexible-lengths-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-flexible-lengths-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-support-flexible-lengths-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-grid-template-areas-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-support-grid-template-areas-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-grid-template-areas-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-support-grid-template-areas-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-grid-template-columns-rows-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-support-grid-template-columns-rows-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-grid-template-columns-rows-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-support-grid-template-columns-rows-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-named-grid-lines-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-support-named-grid-lines-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-named-grid-lines-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-support-named-grid-lines-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-named-grid-lines-002-ref.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-support-named-grid-lines-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-named-grid-lines-002-ref.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-support-named-grid-lines-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-named-grid-lines-002.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-support-named-grid-lines-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-named-grid-lines-002.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-support-named-grid-lines-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-named-grid-lines-003-ref.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-support-named-grid-lines-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-named-grid-lines-003-ref.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-support-named-grid-lines-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-named-grid-lines-003.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-support-named-grid-lines-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-named-grid-lines-003.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-support-named-grid-lines-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-repeat-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-support-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-repeat-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-support-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-repeat-002.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-support-repeat-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-support-repeat-002.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-support-repeat-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001-ref.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-rows-changes-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-template-columns-rows-changes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-rows-changes-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-template-columns-rows-changes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.tentative.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.tentative.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html b/tests/wpt/tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html rename to tests/wpt/tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/support/testing-utils.js b/tests/wpt/tests/css/css-grid/grid-definition/support/testing-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/support/testing-utils.js rename to tests/wpt/tests/css/css-grid/grid-definition/support/testing-utils.js diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-item-non-auto-height-stretch-001.html b/tests/wpt/tests/css/css-grid/grid-item-non-auto-height-stretch-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-item-non-auto-height-stretch-001.html rename to tests/wpt/tests/css/css-grid/grid-item-non-auto-height-stretch-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-item-non-auto-height-stretch-002.html b/tests/wpt/tests/css/css-grid/grid-item-non-auto-height-stretch-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-item-non-auto-height-stretch-002.html rename to tests/wpt/tests/css/css-grid/grid-item-non-auto-height-stretch-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-item-non-auto-height-stretch-003.html b/tests/wpt/tests/css/css-grid/grid-item-non-auto-height-stretch-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-item-non-auto-height-stretch-003.html rename to tests/wpt/tests/css/css-grid/grid-item-non-auto-height-stretch-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-item-non-auto-height-stretch-004.html b/tests/wpt/tests/css/css-grid/grid-item-non-auto-height-stretch-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-item-non-auto-height-stretch-004.html rename to tests/wpt/tests/css/css-grid/grid-item-non-auto-height-stretch-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-item-non-auto-height-stretch-ref.html b/tests/wpt/tests/css/css-grid/grid-item-non-auto-height-stretch-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-item-non-auto-height-stretch-ref.html rename to tests/wpt/tests/css/css-grid/grid-item-non-auto-height-stretch-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-item-percentage-quirk-001.html b/tests/wpt/tests/css/css-grid/grid-item-percentage-quirk-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-item-percentage-quirk-001.html rename to tests/wpt/tests/css/css-grid/grid-item-percentage-quirk-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-item-percentage-quirk-002.html b/tests/wpt/tests/css/css-grid/grid-item-percentage-quirk-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-item-percentage-quirk-002.html rename to tests/wpt/tests/css/css-grid/grid-item-percentage-quirk-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/anonymous-grid-item-001.html b/tests/wpt/tests/css/css-grid/grid-items/anonymous-grid-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/anonymous-grid-item-001.html rename to tests/wpt/tests/css/css-grid/grid-items/anonymous-grid-item-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/aspect-ratio-001.html b/tests/wpt/tests/css/css-grid/grid-items/aspect-ratio-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/aspect-ratio-001.html rename to tests/wpt/tests/css/css-grid/grid-items/aspect-ratio-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/aspect-ratio-002.html b/tests/wpt/tests/css/css-grid/grid-items/aspect-ratio-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/aspect-ratio-002.html rename to tests/wpt/tests/css/css-grid/grid-items/aspect-ratio-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/aspect-ratio-003.html b/tests/wpt/tests/css/css-grid/grid-items/aspect-ratio-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/aspect-ratio-003.html rename to tests/wpt/tests/css/css-grid/grid-items/aspect-ratio-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/aspect-ratio-004.html b/tests/wpt/tests/css/css-grid/grid-items/aspect-ratio-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/aspect-ratio-004.html rename to tests/wpt/tests/css/css-grid/grid-items/aspect-ratio-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/aspect-ratio-005.html b/tests/wpt/tests/css/css-grid/grid-items/aspect-ratio-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/aspect-ratio-005.html rename to tests/wpt/tests/css/css-grid/grid-items/aspect-ratio-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/explicitly-sized-grid-item-as-table.html b/tests/wpt/tests/css/css-grid/grid-items/explicitly-sized-grid-item-as-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/explicitly-sized-grid-item-as-table.html rename to tests/wpt/tests/css/css-grid/grid-items/explicitly-sized-grid-item-as-table.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001-ref.html b/tests/wpt/tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-automatic-minimum-intrinsic-aspect-ratio-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-automatic-minimum-intrinsic-aspect-ratio-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-automatic-minimum-intrinsic-aspect-ratio-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-automatic-minimum-intrinsic-aspect-ratio-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-img-item-percent-max-height-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-img-item-percent-max-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-img-item-percent-max-height-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-img-item-percent-max-height-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-items-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-items-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-items-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-items-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-items-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-items-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-items-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-items-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-items-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-items-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-items-inline-blocks-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-items-inline-blocks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-items-inline-blocks-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-items-inline-blocks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-004.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-004.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-005.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-005.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-auto-placement-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-painting-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-painting-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-painting-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-painting-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-painting-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-painting-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-painting-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-painting-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-painting-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-painting-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-painting-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-painting-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-painting-004.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-painting-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-painting-004.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-painting-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-painting-005.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-painting-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-order-property-painting-005.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-order-property-painting-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-004.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-004.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-005.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-005.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-004.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-004.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-005.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-005.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-006.html b/tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-006.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-intrinsic-maximums-ref.html b/tests/wpt/tests/css/css-grid/grid-items/grid-intrinsic-maximums-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-intrinsic-maximums-ref.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-intrinsic-maximums-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-intrinsic-maximums.html b/tests/wpt/tests/css/css-grid/grid-items/grid-intrinsic-maximums.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-intrinsic-maximums.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-intrinsic-maximums.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-containing-block-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-containing-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-containing-block-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-containing-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-containing-block-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-containing-block-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-containing-block-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-containing-block-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-containing-block-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-containing-block-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-containing-block-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-containing-block-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-containing-block-004.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-containing-block-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-containing-block-004.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-containing-block-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-dynamic-min-contribution-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-dynamic-min-contribution-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-dynamic-min-contribution-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-dynamic-min-contribution-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-flex-container-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-flex-container-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-flex-container-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-flex-container-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-inline-contribution-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-inline-contribution-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-inline-contribution-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-inline-contribution-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-inline-contribution-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-inline-contribution-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001-ref.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-min-auto-size-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-min-auto-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-min-auto-size-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-min-auto-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-overflow-auto-max-height-percentage-ref.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-overflow-auto-max-height-percentage-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-overflow-auto-max-height-percentage-ref.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-overflow-auto-max-height-percentage-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-overflow-auto-max-height-percentage.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-overflow-auto-max-height-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-overflow-auto-max-height-percentage.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-overflow-auto-max-height-percentage.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-percentage-sizes-001-ref.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-percentage-sizes-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-percentage-sizes-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-percentage-sizes-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-percentage-sizes-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-percentage-sizes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-percentage-sizes-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-percentage-sizes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-percentage-sizes-002-ref.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-percentage-sizes-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-percentage-sizes-002-ref.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-percentage-sizes-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-percentage-sizes-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-percentage-sizes-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-percentage-sizes-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-percentage-sizes-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-percentage-sizes-003-ref.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-percentage-sizes-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-percentage-sizes-003-ref.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-percentage-sizes-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-percentage-sizes-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-percentage-sizes-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-percentage-sizes-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-percentage-sizes-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-rel-pos-001-ref.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-rel-pos-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-rel-pos-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-rel-pos-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-rel-pos-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-rel-pos-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-rel-pos-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-rel-pos-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-rel-pos-002-ref.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-rel-pos-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-rel-pos-002-ref.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-rel-pos-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-rel-pos-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-rel-pos-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-rel-pos-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-rel-pos-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-script-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-item-script-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-script-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-item-script-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-contribution-negative-margins.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-contribution-negative-margins.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-contribution-negative-margins.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-contribution-negative-margins.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-inline-blocks-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-inline-blocks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-inline-blocks-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-inline-blocks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-height-orthogonal-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-height-orthogonal-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-height-orthogonal-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-height-orthogonal-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-004.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-004.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-005.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-005.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-006.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-006.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-007.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-007.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-008.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-008.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-009.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-009.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-010.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-010.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-011.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-011.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-012.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-012.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-013.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-013.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-014.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-014.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-004.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-004.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-005.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-005.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-006.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-006.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-007.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-007.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-008.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-008.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-009.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-009.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-010.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-010.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-011.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-011.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-012.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-012.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-013.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-013.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-014.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-014.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-015.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-015.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-relative-offsets-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-relative-offsets-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-relative-offsets-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-relative-offsets-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-relative-offsets-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-relative-offsets-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-relative-offsets-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-relative-offsets-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-sizing-alignment-001-ref.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-sizing-alignment-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-sizing-alignment-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-sizing-alignment-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-sizing-alignment-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-items-sizing-alignment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-sizing-alignment-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-items-sizing-alignment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-layout-grid-in-grid.html b/tests/wpt/tests/css/css-grid/grid-items/grid-layout-grid-in-grid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-layout-grid-in-grid.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-layout-grid-in-grid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-layout-z-order-a.html b/tests/wpt/tests/css/css-grid/grid-items/grid-layout-z-order-a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-layout-z-order-a.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-layout-z-order-a.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-layout-z-order-b.html b/tests/wpt/tests/css/css-grid/grid-items/grid-layout-z-order-b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-layout-z-order-b.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-layout-z-order-b.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-004.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-004.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-005.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-005.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-006.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-006.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-007.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-007.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-008.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-008.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-009.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-009.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-010.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-010.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-011.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-011.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-012.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-012.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-013.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-013.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-014.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-014.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-015.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-015.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-016.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-016.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-016.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-017.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-017.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-017.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-018.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-018.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-018.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-019.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-019.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-019.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-020.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-020.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-020.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-021.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-021.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-021.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-022.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-022.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-022.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-023.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-023.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-023.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-024.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-024.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-024.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-025.html b/tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-025.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-minimum-size-grid-items-025.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-auto-placement-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-order-property-auto-placement-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-auto-placement-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-order-property-auto-placement-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-auto-placement-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-order-property-auto-placement-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-auto-placement-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-order-property-auto-placement-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-auto-placement-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-order-property-auto-placement-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-auto-placement-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-order-property-auto-placement-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-auto-placement-004.html b/tests/wpt/tests/css/css-grid/grid-items/grid-order-property-auto-placement-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-auto-placement-004.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-order-property-auto-placement-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-auto-placement-005.html b/tests/wpt/tests/css/css-grid/grid-items/grid-order-property-auto-placement-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-auto-placement-005.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-order-property-auto-placement-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-painting-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-order-property-painting-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-painting-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-order-property-painting-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-painting-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-order-property-painting-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-painting-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-order-property-painting-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-painting-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-order-property-painting-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-painting-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-order-property-painting-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-painting-004.html b/tests/wpt/tests/css/css-grid/grid-items/grid-order-property-painting-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-painting-004.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-order-property-painting-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-painting-005.html b/tests/wpt/tests/css/css-grid/grid-items/grid-order-property-painting-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-order-property-painting-005.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-order-property-painting-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-size-with-orthogonal-child-dynamic.html b/tests/wpt/tests/css/css-grid/grid-items/grid-size-with-orthogonal-child-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-size-with-orthogonal-child-dynamic.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-size-with-orthogonal-child-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-004.html b/tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-004.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-005.html b/tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-005.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-001.html b/tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-001.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-002.html b/tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-002.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-003.html b/tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-003.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-004.html b/tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-004.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-005.html b/tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-005.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-006.html b/tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-006.html rename to tests/wpt/tests/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/item-with-table-with-infinite-max-intrinsic-width.html b/tests/wpt/tests/css/css-grid/grid-items/item-with-table-with-infinite-max-intrinsic-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/item-with-table-with-infinite-max-intrinsic-width.html rename to tests/wpt/tests/css/css-grid/grid-items/item-with-table-with-infinite-max-intrinsic-width.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-margin-dynamic.html b/tests/wpt/tests/css/css-grid/grid-items/percentage-margin-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-margin-dynamic.html rename to tests/wpt/tests/css/css-grid/grid-items/percentage-margin-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-indefinite-replaced.html b/tests/wpt/tests/css/css-grid/grid-items/percentage-size-indefinite-replaced.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-indefinite-replaced.html rename to tests/wpt/tests/css/css-grid/grid-items/percentage-size-indefinite-replaced.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001-ref.html b/tests/wpt/tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001.html b/tests/wpt/tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001.html rename to tests/wpt/tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-subitems-001-ref.html b/tests/wpt/tests/css/css-grid/grid-items/percentage-size-subitems-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-subitems-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-items/percentage-size-subitems-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-subitems-001.html b/tests/wpt/tests/css/css-grid/grid-items/percentage-size-subitems-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-subitems-001.html rename to tests/wpt/tests/css/css-grid/grid-items/percentage-size-subitems-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-subitems-002.html b/tests/wpt/tests/css/css-grid/grid-items/percentage-size-subitems-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-subitems-002.html rename to tests/wpt/tests/css/css-grid/grid-items/percentage-size-subitems-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/ref-filled-green-100px-square-image.html b/tests/wpt/tests/css/css-grid/grid-items/ref-filled-green-100px-square-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/ref-filled-green-100px-square-image.html rename to tests/wpt/tests/css/css-grid/grid-items/ref-filled-green-100px-square-image.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/remove-svg-grid-item-001.html b/tests/wpt/tests/css/css-grid/grid-items/remove-svg-grid-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/remove-svg-grid-item-001.html rename to tests/wpt/tests/css/css-grid/grid-items/remove-svg-grid-item-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-001.html b/tests/wpt/tests/css/css-grid/grid-items/replaced-element-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-001.html rename to tests/wpt/tests/css/css-grid/grid-items/replaced-element-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-002.html b/tests/wpt/tests/css/css-grid/grid-items/replaced-element-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-002.html rename to tests/wpt/tests/css/css-grid/grid-items/replaced-element-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-007.html b/tests/wpt/tests/css/css-grid/grid-items/replaced-element-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-007.html rename to tests/wpt/tests/css/css-grid/grid-items/replaced-element-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-010.html b/tests/wpt/tests/css/css-grid/grid-items/replaced-element-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-010.html rename to tests/wpt/tests/css/css-grid/grid-items/replaced-element-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-011.html b/tests/wpt/tests/css/css-grid/grid-items/replaced-element-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-011.html rename to tests/wpt/tests/css/css-grid/grid-items/replaced-element-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-012.html b/tests/wpt/tests/css/css-grid/grid-items/replaced-element-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-012.html rename to tests/wpt/tests/css/css-grid/grid-items/replaced-element-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-013.html b/tests/wpt/tests/css/css-grid/grid-items/replaced-element-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-013.html rename to tests/wpt/tests/css/css-grid/grid-items/replaced-element-013.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-014.html b/tests/wpt/tests/css/css-grid/grid-items/replaced-element-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-014.html rename to tests/wpt/tests/css/css-grid/grid-items/replaced-element-014.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-015.html b/tests/wpt/tests/css/css-grid/grid-items/replaced-element-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/replaced-element-015.html rename to tests/wpt/tests/css/css-grid/grid-items/replaced-element-015.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/support/100x100-green.png b/tests/wpt/tests/css/css-grid/grid-items/support/100x100-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/support/100x100-green.png rename to tests/wpt/tests/css/css-grid/grid-items/support/100x100-green.png diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/support/200x200-green.png b/tests/wpt/tests/css/css-grid/grid-items/support/200x200-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/support/200x200-green.png rename to tests/wpt/tests/css/css-grid/grid-items/support/200x200-green.png diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/support/25x50-green.png b/tests/wpt/tests/css/css-grid/grid-items/support/25x50-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/support/25x50-green.png rename to tests/wpt/tests/css/css-grid/grid-items/support/25x50-green.png diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/support/500x500-green.png b/tests/wpt/tests/css/css-grid/grid-items/support/500x500-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/support/500x500-green.png rename to tests/wpt/tests/css/css-grid/grid-items/support/500x500-green.png diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/support/50x25-green.png b/tests/wpt/tests/css/css-grid/grid-items/support/50x25-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/support/50x25-green.png rename to tests/wpt/tests/css/css-grid/grid-items/support/50x25-green.png diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/support/50x50-green.png b/tests/wpt/tests/css/css-grid/grid-items/support/50x50-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/support/50x50-green.png rename to tests/wpt/tests/css/css-grid/grid-items/support/50x50-green.png diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/table-with-infinite-max-intrinsic-width.html b/tests/wpt/tests/css/css-grid/grid-items/table-with-infinite-max-intrinsic-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/table-with-infinite-max-intrinsic-width.html rename to tests/wpt/tests/css/css-grid/grid-items/table-with-infinite-max-intrinsic-width.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/whitespace-in-grid-item-001-ref.html b/tests/wpt/tests/css/css-grid/grid-items/whitespace-in-grid-item-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/whitespace-in-grid-item-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-items/whitespace-in-grid-item-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/whitespace-in-grid-item-001.html b/tests/wpt/tests/css/css-grid/grid-items/whitespace-in-grid-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-items/whitespace-in-grid-item-001.html rename to tests/wpt/tests/css/css-grid/grid-items/whitespace-in-grid-item-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-layout-properties.html b/tests/wpt/tests/css/css-grid/grid-layout-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-layout-properties.html rename to tests/wpt/tests/css/css-grid/grid-layout-properties.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/column-property-should-not-apply-on-grid-container-001.html b/tests/wpt/tests/css/css-grid/grid-model/column-property-should-not-apply-on-grid-container-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/column-property-should-not-apply-on-grid-container-001.html rename to tests/wpt/tests/css/css-grid/grid-model/column-property-should-not-apply-on-grid-container-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/compute-intrinsic-widths-scrollbar-001.html b/tests/wpt/tests/css/css-grid/grid-model/compute-intrinsic-widths-scrollbar-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/compute-intrinsic-widths-scrollbar-001.html rename to tests/wpt/tests/css/css-grid/grid-model/compute-intrinsic-widths-scrollbar-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/display-grid.html b/tests/wpt/tests/css/css-grid/grid-model/display-grid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/display-grid.html rename to tests/wpt/tests/css/css-grid/grid-model/display-grid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/display-inline-grid.html b/tests/wpt/tests/css/css-grid/grid-model/display-inline-grid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/display-inline-grid.html rename to tests/wpt/tests/css/css-grid/grid-model/display-inline-grid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/fixed-width-intrinsic-width-should-exclude-scrollbar-001.html b/tests/wpt/tests/css/css-grid/grid-model/fixed-width-intrinsic-width-should-exclude-scrollbar-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/fixed-width-intrinsic-width-should-exclude-scrollbar-001.html rename to tests/wpt/tests/css/css-grid/grid-model/fixed-width-intrinsic-width-should-exclude-scrollbar-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-002.html b/tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-002.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html b/tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-004.html b/tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-004.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-005.html b/tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-005.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-006.html b/tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-006.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-007.html b/tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-007.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-008.html b/tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-008.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-009.html b/tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-009.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-box-sizing-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-box-sizing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-box-sizing-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-box-sizing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-button-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-button-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-button-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-button-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-computed-value-display-floated-items-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-computed-value-display-floated-items-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-computed-value-display-floated-items-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-computed-value-display-floated-items-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-container-ignores-first-letter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-container-ignores-first-letter-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-002-ref.html b/tests/wpt/tests/css/css-grid/grid-model/grid-container-ignores-first-letter-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-002-ref.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-container-ignores-first-letter-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-002.html b/tests/wpt/tests/css/css-grid/grid-model/grid-container-ignores-first-letter-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-002.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-container-ignores-first-letter-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-line-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-container-ignores-first-line-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-line-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-container-ignores-first-line-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-margin-border-padding-scrollbar-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-container-margin-border-padding-scrollbar-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-margin-border-padding-scrollbar-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-container-margin-border-padding-scrollbar-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001-ref.html b/tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbar-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbar-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbar-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbar-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001-ref.html b/tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001-ref.html b/tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbars-sizing-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbars-sizing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbars-sizing-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbars-sizing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbars-sizing-002.html b/tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbars-sizing-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbars-sizing-002.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-container-scrollbars-sizing-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-sizing-constraints-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-container-sizing-constraints-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-sizing-constraints-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-container-sizing-constraints-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-display-grid-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-display-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-display-grid-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-display-grid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-display-inline-grid-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-display-inline-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-display-inline-grid-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-display-inline-grid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-first-letter-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-first-letter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-first-letter-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-first-letter-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-first-letter-002.html b/tests/wpt/tests/css/css-grid/grid-model/grid-first-letter-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-first-letter-002.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-first-letter-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-first-letter-003.html b/tests/wpt/tests/css/css-grid/grid-model/grid-first-letter-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-first-letter-003.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-first-letter-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-first-line-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-first-line-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-first-line-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-first-line-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-first-line-002.html b/tests/wpt/tests/css/css-grid/grid-model/grid-first-line-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-first-line-002.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-first-line-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-first-line-003.html b/tests/wpt/tests/css/css-grid/grid-model/grid-first-line-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-first-line-003.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-first-line-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-float-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-float-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-float-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-float-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-float-002.html b/tests/wpt/tests/css/css-grid/grid-model/grid-float-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-float-002.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-float-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-floats-no-intrude-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-floats-no-intrude-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-floats-no-intrude-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-floats-no-intrude-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-floats-no-intrude-002-ref.html b/tests/wpt/tests/css/css-grid/grid-model/grid-floats-no-intrude-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-floats-no-intrude-002-ref.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-floats-no-intrude-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-floats-no-intrude-002.html b/tests/wpt/tests/css/css-grid/grid-model/grid-floats-no-intrude-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-floats-no-intrude-002.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-floats-no-intrude-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-gutters-and-flex-content-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-gutters-and-flex-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-gutters-and-flex-content-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-gutters-and-flex-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-gutters-and-tracks-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-gutters-and-tracks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-gutters-and-tracks-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-gutters-and-tracks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-gutters-as-percentage-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-gutters-as-percentage-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-gutters-as-percentage-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-gutters-as-percentage-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-first-letter-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-letter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-first-letter-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-letter-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-first-letter-002.html b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-letter-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-first-letter-002.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-letter-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-first-letter-003.html b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-letter-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-first-letter-003.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-letter-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-first-line-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-line-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-first-line-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-line-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-first-line-002.html b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-line-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-first-line-002.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-line-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-first-line-003.html b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-line-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-first-line-003.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-line-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-float-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-float-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-float-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-inline-float-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-floats-no-intrude-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-floats-no-intrude-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-floats-no-intrude-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-inline-floats-no-intrude-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-margins-no-collapse-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-margins-no-collapse-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-margins-no-collapse-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-inline-margins-no-collapse-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-multicol-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-multicol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-multicol-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-inline-multicol-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-vertical-align-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-vertical-align-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-inline-vertical-align-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-inline-vertical-align-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-letter-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-item-accepts-first-letter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-letter-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-item-accepts-first-letter-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-line-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-item-accepts-first-line-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-line-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-item-accepts-first-line-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-hit-test.html b/tests/wpt/tests/css/css-grid/grid-model/grid-item-hit-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-hit-test.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-item-hit-test.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-layout-stale-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-layout-stale-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-layout-stale-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-layout-stale-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-layout-stale-002.html b/tests/wpt/tests/css/css-grid/grid-model/grid-layout-stale-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-layout-stale-002.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-layout-stale-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-margins-no-collapse-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-margins-no-collapse-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-margins-no-collapse-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-margins-no-collapse-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-margins-no-collapse-002-ref.html b/tests/wpt/tests/css/css-grid/grid-model/grid-margins-no-collapse-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-margins-no-collapse-002-ref.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-margins-no-collapse-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-margins-no-collapse-002.html b/tests/wpt/tests/css/css-grid/grid-model/grid-margins-no-collapse-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-margins-no-collapse-002.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-margins-no-collapse-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-min-max-height-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-min-max-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-min-max-height-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-min-max-height-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-multicol-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-multicol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-multicol-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-multicol-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-overflow-padding-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-overflow-padding-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-overflow-padding-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-overflow-padding-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-overflow-padding-002.html b/tests/wpt/tests/css/css-grid/grid-model/grid-overflow-padding-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-overflow-padding-002.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-overflow-padding-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-size-shrink-to-fit-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-size-shrink-to-fit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-size-shrink-to-fit-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-size-shrink-to-fit-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-support-display-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-support-display-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-support-display-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-support-display-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-vertical-align-001.html b/tests/wpt/tests/css/css-grid/grid-model/grid-vertical-align-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-vertical-align-001.html rename to tests/wpt/tests/css/css-grid/grid-model/grid-vertical-align-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/reference/100x100-grey-box-with-horizontal-scrollbar.html b/tests/wpt/tests/css/css-grid/grid-model/reference/100x100-grey-box-with-horizontal-scrollbar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/reference/100x100-grey-box-with-horizontal-scrollbar.html rename to tests/wpt/tests/css/css-grid/grid-model/reference/100x100-grey-box-with-horizontal-scrollbar.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/reference/100x100-grey-box-with-scrollbars.html b/tests/wpt/tests/css/css-grid/grid-model/reference/100x100-grey-box-with-scrollbars.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/reference/100x100-grey-box-with-scrollbars.html rename to tests/wpt/tests/css/css-grid/grid-model/reference/100x100-grey-box-with-scrollbars.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/reference/100x100-grey-box-with-vertical-scrollbar.html b/tests/wpt/tests/css/css-grid/grid-model/reference/100x100-grey-box-with-vertical-scrollbar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/reference/100x100-grey-box-with-vertical-scrollbar.html rename to tests/wpt/tests/css/css-grid/grid-model/reference/100x100-grey-box-with-vertical-scrollbar.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/reference/100x100-grey-box.html b/tests/wpt/tests/css/css-grid/grid-model/reference/100x100-grey-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/reference/100x100-grey-box.html rename to tests/wpt/tests/css/css-grid/grid-model/reference/100x100-grey-box.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/reference/column-property-should-not-apply-on-grid-container-001-ref.html b/tests/wpt/tests/css/css-grid/grid-model/reference/column-property-should-not-apply-on-grid-container-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/reference/column-property-should-not-apply-on-grid-container-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-model/reference/column-property-should-not-apply-on-grid-container-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/reference/grid-layout-stale-001-ref.html b/tests/wpt/tests/css/css-grid/grid-model/reference/grid-layout-stale-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/reference/grid-layout-stale-001-ref.html rename to tests/wpt/tests/css/css-grid/grid-model/reference/grid-layout-stale-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/reference/grid-layout-stale-002-ref.html b/tests/wpt/tests/css/css-grid/grid-model/reference/grid-layout-stale-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-model/reference/grid-layout-stale-002-ref.html rename to tests/wpt/tests/css/css-grid/grid-model/reference/grid-layout-stale-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-tracks-stretched-with-different-flex-factors-sum.html b/tests/wpt/tests/css/css-grid/grid-tracks-stretched-with-different-flex-factors-sum.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-tracks-stretched-with-different-flex-factors-sum.html rename to tests/wpt/tests/css/css-grid/grid-tracks-stretched-with-different-flex-factors-sum.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-with-content-dynamic-display-001.html b/tests/wpt/tests/css/css-grid/grid-with-content-dynamic-display-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-with-content-dynamic-display-001.html rename to tests/wpt/tests/css/css-grid/grid-with-content-dynamic-display-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-with-content-dynamic-display-002.html b/tests/wpt/tests/css/css-grid/grid-with-content-dynamic-display-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-with-content-dynamic-display-002.html rename to tests/wpt/tests/css/css-grid/grid-with-content-dynamic-display-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-with-dynamic-img.html b/tests/wpt/tests/css/css-grid/grid-with-dynamic-img.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-with-dynamic-img.html rename to tests/wpt/tests/css/css-grid/grid-with-dynamic-img.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-with-orthogonal-child-within-flexbox.html b/tests/wpt/tests/css/css-grid/grid-with-orthogonal-child-within-flexbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-with-orthogonal-child-within-flexbox.html rename to tests/wpt/tests/css/css-grid/grid-with-orthogonal-child-within-flexbox.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-within-flexbox-definite-change.html b/tests/wpt/tests/css/css-grid/grid-within-flexbox-definite-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-within-flexbox-definite-change.html rename to tests/wpt/tests/css/css-grid/grid-within-flexbox-definite-change.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-within-flexbox-indefinite.html b/tests/wpt/tests/css/css-grid/grid-within-flexbox-indefinite.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/grid-within-flexbox-indefinite.html rename to tests/wpt/tests/css/css-grid/grid-within-flexbox-indefinite.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-001.html b/tests/wpt/tests/css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-001.html rename to tests/wpt/tests/css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-002.html b/tests/wpt/tests/css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-002.html rename to tests/wpt/tests/css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-003.html b/tests/wpt/tests/css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-003.html rename to tests/wpt/tests/css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/inheritance.html b/tests/wpt/tests/css/css-grid/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/inheritance.html rename to tests/wpt/tests/css/css-grid/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/auto-margins-ignored-during-track-sizing-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/auto-margins-ignored-during-track-sizing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/auto-margins-ignored-during-track-sizing-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/auto-margins-ignored-during-track-sizing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-002.html b/tests/wpt/tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-002.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-003.html b/tests/wpt/tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-003.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-004.html b/tests/wpt/tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-004.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-005.html b/tests/wpt/tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-005.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-006.html b/tests/wpt/tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-006.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-002.html b/tests/wpt/tests/css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-002.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-sizing-columns-min-max-width-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/flex-sizing-columns-min-max-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-sizing-columns-min-max-width-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/flex-sizing-columns-min-max-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-sizing-rows-indefinite-height.html b/tests/wpt/tests/css/css-grid/layout-algorithm/flex-sizing-rows-indefinite-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-sizing-rows-indefinite-height.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/flex-sizing-rows-indefinite-height.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-sizing-rows-min-max-height-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/flex-sizing-rows-min-max-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-sizing-rows-min-max-height-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/flex-sizing-rows-min-max-height-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-tracks-with-fractional-size.html b/tests/wpt/tests/css/css-grid/layout-algorithm/flex-tracks-with-fractional-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-tracks-with-fractional-size.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/flex-tracks-with-fractional-size.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-002.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-002.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-003.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-003.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-004.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-004.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-005.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-005.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-006.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-006.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-007.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-007.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-008.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-008.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-as-flex-item-should-not-shrink-to-fit-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-automatic-minimum-for-auto-columns-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-automatic-minimum-for-auto-columns-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-automatic-minimum-for-auto-columns-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-automatic-minimum-for-auto-columns-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-automatic-minimum-for-auto-rows-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-automatic-minimum-for-auto-rows-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-automatic-minimum-for-auto-rows-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-automatic-minimum-for-auto-rows-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-container-percentage-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-container-percentage-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-container-percentage-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-container-percentage-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-container-percentage-002.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-container-percentage-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-container-percentage-002.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-container-percentage-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-002.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-002.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-003.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-003.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-004.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-004.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-find-fr-size-gutters-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-find-fr-size-gutters-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-find-fr-size-gutters-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-find-fr-size-gutters-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-find-fr-size-gutters-002.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-find-fr-size-gutters-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-find-fr-size-gutters-002.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-find-fr-size-gutters-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-find-fr-size-restart-algorithm.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-find-fr-size-restart-algorithm.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-find-fr-size-restart-algorithm.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-find-fr-size-restart-algorithm.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-fit-content-percentage.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-fit-content-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-fit-content-percentage.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-fit-content-percentage.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-002.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-002.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-003.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-003.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-intrinsic-size-dynamic-block-size.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-intrinsic-size-dynamic-block-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-intrinsic-size-dynamic-block-size.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-intrinsic-size-dynamic-block-size.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-intrinsic-size-with-orthogonal-items.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-intrinsic-size-with-orthogonal-items.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-intrinsic-size-with-orthogonal-items.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-intrinsic-size-with-orthogonal-items.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-intrinsic-track-sizes-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-intrinsic-track-sizes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-intrinsic-track-sizes-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-intrinsic-track-sizes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-vertical-lr-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-vertical-lr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-vertical-lr-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-vertical-lr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-vertical-rl-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-vertical-rl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-vertical-rl-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-vertical-rl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-layout-free-space-unit.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-layout-free-space-unit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-layout-free-space-unit.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-layout-free-space-unit.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-lr.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-lr.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-rl.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-rl.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-percent-cols-filled-shrinkwrap-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-percent-cols-filled-shrinkwrap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-percent-cols-filled-shrinkwrap-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-percent-cols-filled-shrinkwrap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-percent-cols-spanned-shrinkwrap-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-percent-cols-spanned-shrinkwrap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-percent-cols-spanned-shrinkwrap-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-percent-cols-spanned-shrinkwrap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-percent-rows-filled-shrinkwrap-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-percent-rows-filled-shrinkwrap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-percent-rows-filled-shrinkwrap-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-percent-rows-filled-shrinkwrap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-percent-rows-spanned-shrinkwrap-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-percent-rows-spanned-shrinkwrap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-percent-rows-spanned-shrinkwrap-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-percent-rows-spanned-shrinkwrap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-stretch-respects-min-size-001.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-stretch-respects-min-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-stretch-respects-min-size-001.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-stretch-respects-min-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-template-flexible-rerun-track-sizing.html b/tests/wpt/tests/css/css-grid/layout-algorithm/grid-template-flexible-rerun-track-sizing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-template-flexible-rerun-track-sizing.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/grid-template-flexible-rerun-track-sizing.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/references/auto-margins-ignored-during-track-sizing-001-ref.html b/tests/wpt/tests/css/css-grid/layout-algorithm/references/auto-margins-ignored-during-track-sizing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/references/auto-margins-ignored-during-track-sizing-001-ref.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/references/auto-margins-ignored-during-track-sizing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/references/grid-percent-cols-filled-shrinkwrap-001-ref.html b/tests/wpt/tests/css/css-grid/layout-algorithm/references/grid-percent-cols-filled-shrinkwrap-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/references/grid-percent-cols-filled-shrinkwrap-001-ref.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/references/grid-percent-cols-filled-shrinkwrap-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/references/grid-percent-cols-spanned-shrinkwrap-001-ref.html b/tests/wpt/tests/css/css-grid/layout-algorithm/references/grid-percent-cols-spanned-shrinkwrap-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/references/grid-percent-cols-spanned-shrinkwrap-001-ref.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/references/grid-percent-cols-spanned-shrinkwrap-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/references/grid-percent-rows-filled-shrinkwrap-001-ref.html b/tests/wpt/tests/css/css-grid/layout-algorithm/references/grid-percent-rows-filled-shrinkwrap-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/references/grid-percent-rows-filled-shrinkwrap-001-ref.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/references/grid-percent-rows-filled-shrinkwrap-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/references/grid-percent-rows-spanned-shrinkwrap-001-ref.html b/tests/wpt/tests/css/css-grid/layout-algorithm/references/grid-percent-rows-spanned-shrinkwrap-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/references/grid-percent-rows-spanned-shrinkwrap-001-ref.html rename to tests/wpt/tests/css/css-grid/layout-algorithm/references/grid-percent-rows-spanned-shrinkwrap-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-002-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-002-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-002.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-002.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-003-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-003-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-003.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-003.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-004-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-004-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-004.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-004.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-content/masonry-align-content-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-multi-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-multi-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-multi-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-multi-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-multi-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-multi-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-multi-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-multi-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-002-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-002-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-002.html b/tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-002.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/align-tracks/masonry-align-tracks-stretch-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-content-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-content-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-content-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-content-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-content-baseline-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-content-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-content-baseline-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-content-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002a-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002a-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002a.html b/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002a.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002a.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002b-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002b-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002b.html b/tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002b.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/baseline/masonry-grid-item-self-baseline-002b.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-002-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-002-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-002.html b/tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-002.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-003-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-003-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-003.html b/tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-003.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-004-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-004-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-004.html b/tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-004.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-005-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-005-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-005.html b/tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-005.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-006-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-006-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-006.html b/tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-006.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/fragmentation/masonry-fragmentation-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/gap/masonry-gap-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/gap/masonry-gap-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/gap/masonry-gap-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/gap/masonry-gap-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/gap/masonry-gap-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/gap/masonry-gap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/gap/masonry-gap-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/gap/masonry-gap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002.html b/tests/wpt/tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-002-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-002-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-002.html b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-002.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-003-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-003-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-003.html b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-003.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-004-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-004-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-004.html b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-004.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-005-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-005-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-005.html b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-005.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-006-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-006-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-006.html b/tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-006.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-columns-item-placement-auto-flow-next-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-columns-item-placement-auto-flow-next-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-columns-item-placement-auto-flow-next-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-columns-item-placement-auto-flow-next-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-columns-item-placement-auto-flow-next-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-columns-item-placement-auto-flow-next-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-columns-item-placement-auto-flow-next-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-columns-item-placement-auto-flow-next-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-002-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-002-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-002.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-002.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-003-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-003-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-003.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-003.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-008-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-008-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-008.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-008.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-item-placement-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-item-placement-auto-flow-next-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-with-grid-width-changed-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-with-grid-width-changed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-with-grid-width-changed-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-with-grid-width-changed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-with-grid-width-changed.html b/tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-with-grid-width-changed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-with-grid-width-changed.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/item-placement/masonry-rows-with-grid-width-changed.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-002-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-002-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-002.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-002.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-003-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-003-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-003.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-003.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-004-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-004-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-004.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-004.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-content/masonry-justify-content-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-multi-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-multi-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-multi-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-multi-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-multi-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-multi-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-multi-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-multi-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-002-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-002-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-002.html b/tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-002.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/justify-tracks/masonry-justify-tracks-stretch-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-columns-item-containing-block-is-grid-content-width.html b/tests/wpt/tests/css/css-grid/masonry/tentative/masonry-columns-item-containing-block-is-grid-content-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-columns-item-containing-block-is-grid-content-width.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/masonry-columns-item-containing-block-is-grid-content-width.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-template-columns-computed-withcontent.html b/tests/wpt/tests/css/css-grid/masonry/tentative/masonry-grid-template-columns-computed-withcontent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/masonry-grid-template-columns-computed-withcontent.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/masonry-grid-template-columns-computed-withcontent.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/order/masonry-order-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/order/masonry-order-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/order/masonry-order-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/order/masonry-order-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/order/masonry-order-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/order/masonry-order-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/order/masonry-order-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/order/masonry-order-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/order/masonry-order-002-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/order/masonry-order-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/order/masonry-order-002-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/order/masonry-order-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/order/masonry-order-002.html b/tests/wpt/tests/css/css-grid/masonry/tentative/order/masonry-order-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/order/masonry-order-002.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/order/masonry-order-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/parsing/masonry-parsing.html b/tests/wpt/tests/css/css-grid/masonry/tentative/parsing/masonry-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/parsing/masonry-parsing.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/parsing/masonry-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-001-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-001-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-001.html b/tests/wpt/tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-001.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-002-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-002-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-002.html b/tests/wpt/tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-002.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/subgrid/masonry-subgrid-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-check-grid-height-on-resize-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-check-grid-height-on-resize-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-check-grid-height-on-resize-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-check-grid-height-on-resize-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-check-grid-height-on-resize.html b/tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-check-grid-height-on-resize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-check-grid-height-on-resize.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-check-grid-height-on-resize.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-explicit-block-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-explicit-block-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-explicit-block-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-explicit-block-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-explicit-block.html b/tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-explicit-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-explicit-block.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-explicit-block.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-left-side-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-left-side-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-left-side-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-left-side-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-left-side.html b/tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-left-side.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-left-side.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-left-side.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-right-side-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-right-side-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-right-side-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-right-side-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-right-side.html b/tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-right-side.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-right-side.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-overflow-right-side.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-span-row-ref.html b/tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-span-row-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-span-row-ref.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-span-row-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-span-row.html b/tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-span-row.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-span-row.html rename to tests/wpt/tests/css/css-grid/masonry/tentative/track-sizing/masonry-track-sizing-span-row.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/nested-grid-item-block-size-001-ref.html b/tests/wpt/tests/css/css-grid/nested-grid-item-block-size-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/nested-grid-item-block-size-001-ref.html rename to tests/wpt/tests/css/css-grid/nested-grid-item-block-size-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/nested-grid-item-block-size-001.html b/tests/wpt/tests/css/css-grid/nested-grid-item-block-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/nested-grid-item-block-size-001.html rename to tests/wpt/tests/css/css-grid/nested-grid-item-block-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-area-computed.html b/tests/wpt/tests/css/css-grid/parsing/grid-area-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-area-computed.html rename to tests/wpt/tests/css/css-grid/parsing/grid-area-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-area-invalid.html b/tests/wpt/tests/css/css-grid/parsing/grid-area-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-area-invalid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-area-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-area-shorthand.html b/tests/wpt/tests/css/css-grid/parsing/grid-area-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-area-shorthand.html rename to tests/wpt/tests/css/css-grid/parsing/grid-area-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-area-valid.html b/tests/wpt/tests/css/css-grid/parsing/grid-area-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-area-valid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-area-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-columns-computed.html b/tests/wpt/tests/css/css-grid/parsing/grid-auto-columns-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-columns-computed.html rename to tests/wpt/tests/css/css-grid/parsing/grid-auto-columns-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-columns-invalid.html b/tests/wpt/tests/css/css-grid/parsing/grid-auto-columns-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-columns-invalid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-auto-columns-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-columns-valid.html b/tests/wpt/tests/css/css-grid/parsing/grid-auto-columns-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-columns-valid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-auto-columns-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-flow-computed.html b/tests/wpt/tests/css/css-grid/parsing/grid-auto-flow-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-flow-computed.html rename to tests/wpt/tests/css/css-grid/parsing/grid-auto-flow-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-flow-invalid.html b/tests/wpt/tests/css/css-grid/parsing/grid-auto-flow-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-flow-invalid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-auto-flow-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-flow-valid.html b/tests/wpt/tests/css/css-grid/parsing/grid-auto-flow-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-flow-valid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-auto-flow-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-rows-computed.html b/tests/wpt/tests/css/css-grid/parsing/grid-auto-rows-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-rows-computed.html rename to tests/wpt/tests/css/css-grid/parsing/grid-auto-rows-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-rows-invalid.html b/tests/wpt/tests/css/css-grid/parsing/grid-auto-rows-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-rows-invalid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-auto-rows-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-rows-valid.html b/tests/wpt/tests/css/css-grid/parsing/grid-auto-rows-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-auto-rows-valid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-auto-rows-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-columns-rows-get-set-multiple.html b/tests/wpt/tests/css/css-grid/parsing/grid-columns-rows-get-set-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-columns-rows-get-set-multiple.html rename to tests/wpt/tests/css/css-grid/parsing/grid-columns-rows-get-set-multiple.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-content-sized-columns-resolution.html b/tests/wpt/tests/css/css-grid/parsing/grid-content-sized-columns-resolution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-content-sized-columns-resolution.html rename to tests/wpt/tests/css/css-grid/parsing/grid-content-sized-columns-resolution.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-shorthand-invalid.html b/tests/wpt/tests/css/css-grid/parsing/grid-shorthand-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-shorthand-invalid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-shorthand-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-shorthand-serialization.html b/tests/wpt/tests/css/css-grid/parsing/grid-shorthand-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-shorthand-serialization.html rename to tests/wpt/tests/css/css-grid/parsing/grid-shorthand-serialization.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-shorthand-valid.html b/tests/wpt/tests/css/css-grid/parsing/grid-shorthand-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-shorthand-valid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-shorthand-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-shorthand.html b/tests/wpt/tests/css/css-grid/parsing/grid-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-shorthand.html rename to tests/wpt/tests/css/css-grid/parsing/grid-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-areas-computed.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-areas-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-areas-computed.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-areas-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-areas-invalid.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-areas-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-areas-invalid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-areas-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-areas-one-cell.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-areas-one-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-areas-one-cell.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-areas-one-cell.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-areas-valid.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-areas-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-areas-valid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-areas-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-computed-implicit-track.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-columns-computed-implicit-track.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-computed-implicit-track.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-columns-computed-implicit-track.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-computed-nogrid.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-columns-computed-nogrid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-computed-nogrid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-columns-computed-nogrid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-computed-withcontent.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-columns-computed-withcontent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-computed-withcontent.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-columns-computed-withcontent.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-computed.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-columns-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-computed.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-columns-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-crash.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-columns-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-crash.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-columns-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-invalid.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-columns-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-invalid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-columns-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-valid.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-columns-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-columns-valid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-columns-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-repeat-auto-computed-withcontent-001.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-repeat-auto-computed-withcontent-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-repeat-auto-computed-withcontent-001.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-repeat-auto-computed-withcontent-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-repeat-auto-computed-withcontent-002.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-repeat-auto-computed-withcontent-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-repeat-auto-computed-withcontent-002.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-repeat-auto-computed-withcontent-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-rows-computed-implicit-track.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-rows-computed-implicit-track.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-rows-computed-implicit-track.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-rows-computed-implicit-track.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-rows-computed-nogrid.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-rows-computed-nogrid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-rows-computed-nogrid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-rows-computed-nogrid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-rows-computed-withcontent.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-rows-computed-withcontent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-rows-computed-withcontent.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-rows-computed-withcontent.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-rows-computed.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-rows-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-rows-computed.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-rows-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-rows-invalid.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-rows-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-rows-invalid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-rows-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-rows-valid.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-rows-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-rows-valid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-rows-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-shorthand-areas-valid.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand-areas-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-shorthand-areas-valid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand-areas-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-shorthand-invalid.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-shorthand-invalid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-shorthand-valid.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-shorthand-valid.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-shorthand.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/parsing/grid-template-shorthand.html rename to tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-auto-flow-sparse-001.html b/tests/wpt/tests/css/css-grid/placement/grid-auto-flow-sparse-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-auto-flow-sparse-001.html rename to tests/wpt/tests/css/css-grid/placement/grid-auto-flow-sparse-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-auto-placement-implicit-tracks-001.html b/tests/wpt/tests/css/css-grid/placement/grid-auto-placement-implicit-tracks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-auto-placement-implicit-tracks-001.html rename to tests/wpt/tests/css/css-grid/placement/grid-auto-placement-implicit-tracks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-container-change-grid-tracks-recompute-child-positions-001.html b/tests/wpt/tests/css/css-grid/placement/grid-container-change-grid-tracks-recompute-child-positions-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-container-change-grid-tracks-recompute-child-positions-001.html rename to tests/wpt/tests/css/css-grid/placement/grid-container-change-grid-tracks-recompute-child-positions-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-container-change-named-grid-recompute-child-positions-001.html b/tests/wpt/tests/css/css-grid/placement/grid-container-change-named-grid-recompute-child-positions-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-container-change-named-grid-recompute-child-positions-001.html rename to tests/wpt/tests/css/css-grid/placement/grid-container-change-named-grid-recompute-child-positions-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-layout-grid-span.html b/tests/wpt/tests/css/css-grid/placement/grid-layout-grid-span.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-layout-grid-span.html rename to tests/wpt/tests/css/css-grid/placement/grid-layout-grid-span.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-layout-lines-shorthands.html b/tests/wpt/tests/css/css-grid/placement/grid-layout-lines-shorthands.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-layout-lines-shorthands.html rename to tests/wpt/tests/css/css-grid/placement/grid-layout-lines-shorthands.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-layout-lines.html b/tests/wpt/tests/css/css-grid/placement/grid-layout-lines.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-layout-lines.html rename to tests/wpt/tests/css/css-grid/placement/grid-layout-lines.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-layout-placement-shorthands.html b/tests/wpt/tests/css/css-grid/placement/grid-layout-placement-shorthands.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-layout-placement-shorthands.html rename to tests/wpt/tests/css/css-grid/placement/grid-layout-placement-shorthands.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-items-spanning-multiple-rows-001.html b/tests/wpt/tests/css/css-grid/placement/grid-placement-items-spanning-multiple-rows-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-items-spanning-multiple-rows-001.html rename to tests/wpt/tests/css/css-grid/placement/grid-placement-items-spanning-multiple-rows-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-items-spanning-multiple-rows-002.html b/tests/wpt/tests/css/css-grid/placement/grid-placement-items-spanning-multiple-rows-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-items-spanning-multiple-rows-002.html rename to tests/wpt/tests/css/css-grid/placement/grid-placement-items-spanning-multiple-rows-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-001.html b/tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-001.html rename to tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-002.html b/tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-002.html rename to tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-003.html b/tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-003.html rename to tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-004.html b/tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-004.html rename to tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-005.html b/tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-005.html rename to tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-006.html b/tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-006.html rename to tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-007.html b/tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-007.html rename to tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-008.html b/tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-008.html rename to tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-009.html b/tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-placement-using-named-grid-lines-009.html rename to tests/wpt/tests/css/css-grid/placement/grid-placement-using-named-grid-lines-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/placement/grid-template-areas-must-keep-named-columns-order-001.html b/tests/wpt/tests/css/css-grid/placement/grid-template-areas-must-keep-named-columns-order-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/placement/grid-template-areas-must-keep-named-columns-order-001.html rename to tests/wpt/tests/css/css-grid/placement/grid-template-areas-must-keep-named-columns-order-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/anonymous-grid-items-001-ref.html b/tests/wpt/tests/css/css-grid/reference/anonymous-grid-items-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/anonymous-grid-items-001-ref.html rename to tests/wpt/tests/css/css-grid/reference/anonymous-grid-items-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/display-grid-ref.html b/tests/wpt/tests/css/css-grid/reference/display-grid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/display-grid-ref.html rename to tests/wpt/tests/css/css-grid/reference/display-grid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/display-inline-grid-ref.html b/tests/wpt/tests/css/css-grid/reference/display-inline-grid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/display-inline-grid-ref.html rename to tests/wpt/tests/css/css-grid/reference/display-inline-grid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/flex-item-grid-container-percentage-rows-001-ref.html b/tests/wpt/tests/css/css-grid/reference/flex-item-grid-container-percentage-rows-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/flex-item-grid-container-percentage-rows-001-ref.html rename to tests/wpt/tests/css/css-grid/reference/flex-item-grid-container-percentage-rows-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/fr-unit-ref.html b/tests/wpt/tests/css/css-grid/reference/fr-unit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/fr-unit-ref.html rename to tests/wpt/tests/css/css-grid/reference/fr-unit-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/fr-unit-with-percentage-ref.html b/tests/wpt/tests/css/css-grid/reference/fr-unit-with-percentage-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/fr-unit-with-percentage-ref.html rename to tests/wpt/tests/css/css-grid/reference/fr-unit-with-percentage-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-2x2-blue-yellow-lime-magenta.html b/tests/wpt/tests/css/css-grid/reference/grid-2x2-blue-yellow-lime-magenta.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-2x2-blue-yellow-lime-magenta.html rename to tests/wpt/tests/css/css-grid/reference/grid-2x2-blue-yellow-lime-magenta.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-auto-repeat-multiple-values-001-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-auto-repeat-multiple-values-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-auto-repeat-multiple-values-001-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-auto-repeat-multiple-values-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-block-axis-alignment-auto-margins-008-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-block-axis-alignment-auto-margins-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-block-axis-alignment-auto-margins-008-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-block-axis-alignment-auto-margins-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-container-auto-margins-scrollbars-001-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-container-auto-margins-scrollbars-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-container-auto-margins-scrollbars-001-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-container-auto-margins-scrollbars-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-container-scrollbars-sizing-001-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-container-scrollbars-sizing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-container-scrollbars-sizing-001-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-container-scrollbars-sizing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-container-scrollbars-sizing-002-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-container-scrollbars-sizing-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-container-scrollbars-sizing-002-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-container-scrollbars-sizing-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-different-gutters-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-different-gutters-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-different-gutters-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-different-gutters-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-equal-gutters-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-equal-gutters-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-equal-gutters-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-equal-gutters-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-filled-blue-yellow-green-overlapped-100px-squares.html b/tests/wpt/tests/css/css-grid/reference/grid-filled-blue-yellow-green-overlapped-100px-squares.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-filled-blue-yellow-green-overlapped-100px-squares.html rename to tests/wpt/tests/css/css-grid/reference/grid-filled-blue-yellow-green-overlapped-100px-squares.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-first-letter-green-margin-no-collapse-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-first-letter-green-margin-no-collapse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-first-letter-green-margin-no-collapse-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-first-letter-green-margin-no-collapse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-inline-axis-alignment-auto-margins-008-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-inline-axis-alignment-auto-margins-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-inline-axis-alignment-auto-margins-008-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-inline-axis-alignment-auto-margins-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-inline-baseline-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-inline-baseline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-inline-baseline-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-inline-baseline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-item-script-001-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-item-script-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-item-script-001-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-item-script-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-layout-auto-tracks-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-layout-auto-tracks-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-layout-auto-tracks-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-layout-auto-tracks-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-layout-basic-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-layout-basic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-layout-basic-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-layout-basic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-layout-grid-in-grid-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-layout-grid-in-grid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-layout-grid-in-grid-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-layout-grid-in-grid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-layout-repeat-notation-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-layout-repeat-notation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-layout-repeat-notation-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-layout-repeat-notation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-layout-z-order-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-layout-z-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-layout-z-order-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-layout-z-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-percentage-gap-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-percentage-gap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-percentage-gap-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-percentage-gap-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-support-grid-auto-columns-rows-001-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-support-grid-auto-columns-rows-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-support-grid-auto-columns-rows-001-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-support-grid-auto-columns-rows-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-support-grid-auto-columns-rows-002-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-support-grid-auto-columns-rows-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-support-grid-auto-columns-rows-002-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-support-grid-auto-columns-rows-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-support-grid-auto-columns-rows-003-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-support-grid-auto-columns-rows-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-support-grid-auto-columns-rows-003-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-support-grid-auto-columns-rows-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-template-areas-must-keep-named-columns-order-001-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-template-areas-must-keep-named-columns-order-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-template-areas-must-keep-named-columns-order-001-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-template-areas-must-keep-named-columns-order-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-text-green-margin-no-collapse-ref.html b/tests/wpt/tests/css/css-grid/reference/grid-text-green-margin-no-collapse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/grid-text-green-margin-no-collapse-ref.html rename to tests/wpt/tests/css/css-grid/reference/grid-text-green-margin-no-collapse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/replaced-element-015-ref.html b/tests/wpt/tests/css/css-grid/reference/replaced-element-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/reference/replaced-element-015-ref.html rename to tests/wpt/tests/css/css-grid/reference/replaced-element-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/relative-grandchild.html b/tests/wpt/tests/css/css-grid/relative-grandchild.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/relative-grandchild.html rename to tests/wpt/tests/css/css-grid/relative-grandchild.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/stretch-grid-item-checkbox-input-ref.html b/tests/wpt/tests/css/css-grid/stretch-grid-item-checkbox-input-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/stretch-grid-item-checkbox-input-ref.html rename to tests/wpt/tests/css/css-grid/stretch-grid-item-checkbox-input-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/stretch-grid-item-checkbox-input.html b/tests/wpt/tests/css/css-grid/stretch-grid-item-checkbox-input.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/stretch-grid-item-checkbox-input.html rename to tests/wpt/tests/css/css-grid/stretch-grid-item-checkbox-input.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/stretch-grid-item-radio-input-ref.html b/tests/wpt/tests/css/css-grid/stretch-grid-item-radio-input-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/stretch-grid-item-radio-input-ref.html rename to tests/wpt/tests/css/css-grid/stretch-grid-item-radio-input-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/stretch-grid-item-radio-input.html b/tests/wpt/tests/css/css-grid/stretch-grid-item-radio-input.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/stretch-grid-item-radio-input.html rename to tests/wpt/tests/css/css-grid/stretch-grid-item-radio-input.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/abs-pos-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/abs-pos-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/abs-pos-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/abs-pos-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/abs-pos-001.html b/tests/wpt/tests/css/css-grid/subgrid/abs-pos-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/abs-pos-001.html rename to tests/wpt/tests/css/css-grid/subgrid/abs-pos-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/abs-pos-002-ref.html b/tests/wpt/tests/css/css-grid/subgrid/abs-pos-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/abs-pos-002-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/abs-pos-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/abs-pos-002.html b/tests/wpt/tests/css/css-grid/subgrid/abs-pos-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/abs-pos-002.html rename to tests/wpt/tests/css/css-grid/subgrid/abs-pos-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/auto-track-sizing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/auto-track-sizing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-001.html b/tests/wpt/tests/css/css-grid/subgrid/auto-track-sizing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-001.html rename to tests/wpt/tests/css/css-grid/subgrid/auto-track-sizing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-002-ref.html b/tests/wpt/tests/css/css-grid/subgrid/auto-track-sizing-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-002-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/auto-track-sizing-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-002.html b/tests/wpt/tests/css/css-grid/subgrid/auto-track-sizing-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-002.html rename to tests/wpt/tests/css/css-grid/subgrid/auto-track-sizing-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-003.html b/tests/wpt/tests/css/css-grid/subgrid/auto-track-sizing-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-003.html rename to tests/wpt/tests/css/css-grid/subgrid/auto-track-sizing-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-004.html b/tests/wpt/tests/css/css-grid/subgrid/auto-track-sizing-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-004.html rename to tests/wpt/tests/css/css-grid/subgrid/auto-track-sizing-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/baseline-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/baseline-001.html b/tests/wpt/tests/css/css-grid/subgrid/baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/baseline-001.html rename to tests/wpt/tests/css/css-grid/subgrid/baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/contribution-size-flex-tracks-001.html b/tests/wpt/tests/css/css-grid/subgrid/contribution-size-flex-tracks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/contribution-size-flex-tracks-001.html rename to tests/wpt/tests/css/css-grid/subgrid/contribution-size-flex-tracks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/crashtests/contain-strict-nested-subgrid.html b/tests/wpt/tests/css/css-grid/subgrid/crashtests/contain-strict-nested-subgrid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/crashtests/contain-strict-nested-subgrid.html rename to tests/wpt/tests/css/css-grid/subgrid/crashtests/contain-strict-nested-subgrid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/crashtests/contain-strict-subgrid.html b/tests/wpt/tests/css/css-grid/subgrid/crashtests/contain-strict-subgrid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/crashtests/contain-strict-subgrid.html rename to tests/wpt/tests/css/css-grid/subgrid/crashtests/contain-strict-subgrid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/crashtests/subgrid-reflow-root.html b/tests/wpt/tests/css/css-grid/subgrid/crashtests/subgrid-reflow-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/crashtests/subgrid-reflow-root.html rename to tests/wpt/tests/css/css-grid/subgrid/crashtests/subgrid-reflow-root.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/crashtests/subgridded-axis-auto-repeater-001.html b/tests/wpt/tests/css/css-grid/subgrid/crashtests/subgridded-axis-auto-repeater-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/crashtests/subgridded-axis-auto-repeater-001.html rename to tests/wpt/tests/css/css-grid/subgrid/crashtests/subgridded-axis-auto-repeater-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/crashtests/subgridded-axis-auto-repeater-002.html b/tests/wpt/tests/css/css-grid/subgrid/crashtests/subgridded-axis-auto-repeater-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/crashtests/subgridded-axis-auto-repeater-002.html rename to tests/wpt/tests/css/css-grid/subgrid/crashtests/subgridded-axis-auto-repeater-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/crashtests/subgridded-axis-auto-repeater-003.html b/tests/wpt/tests/css/css-grid/subgrid/crashtests/subgridded-axis-auto-repeater-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/crashtests/subgridded-axis-auto-repeater-003.html rename to tests/wpt/tests/css/css-grid/subgrid/crashtests/subgridded-axis-auto-repeater-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/dynamic-min-content-001.html b/tests/wpt/tests/css/css-grid/subgrid/dynamic-min-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/dynamic-min-content-001.html rename to tests/wpt/tests/css/css-grid/subgrid/dynamic-min-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/dynamic-min-content-002.html b/tests/wpt/tests/css/css-grid/subgrid/dynamic-min-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/dynamic-min-content-002.html rename to tests/wpt/tests/css/css-grid/subgrid/dynamic-min-content-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/dynamic-min-content-003.html b/tests/wpt/tests/css/css-grid/subgrid/dynamic-min-content-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/dynamic-min-content-003.html rename to tests/wpt/tests/css/css-grid/subgrid/dynamic-min-content-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-001.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-001.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-002-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-002-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-002.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-002.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-003-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-003-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-003.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-003.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-004-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-004-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-004.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-004.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-005-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-005-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-005.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-005.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-006-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-006-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-006.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-006.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-007-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-007-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-007.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-007.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-008-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-008-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-008.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-008.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-009-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-009-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-009.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-009.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-010-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-010-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-010.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-010.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-011-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-011-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-011.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-011.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-larger-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-larger-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-larger-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-larger-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-larger-001.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-larger-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-larger-001.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-larger-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-larger-002-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-larger-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-larger-002-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-larger-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-larger-002.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-larger-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-larger-002.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-larger-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-normal-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-normal-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-normal-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-normal-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-normal-001.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-normal-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-normal-001.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-normal-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-smaller-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-smaller-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-smaller-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-smaller-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-smaller-001.html b/tests/wpt/tests/css/css-grid/subgrid/grid-gap-smaller-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-gap-smaller-001.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-gap-smaller-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-template-computed-nogrid.html b/tests/wpt/tests/css/css-grid/subgrid/grid-template-computed-nogrid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-template-computed-nogrid.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-template-computed-nogrid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-template-invalid.html b/tests/wpt/tests/css/css-grid/subgrid/grid-template-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-template-invalid.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-template-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-template-valid.html b/tests/wpt/tests/css/css-grid/subgrid/grid-template-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/grid-template-valid.html rename to tests/wpt/tests/css/css-grid/subgrid/grid-template-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/independent-formatting-context-ref.html b/tests/wpt/tests/css/css-grid/subgrid/independent-formatting-context-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/independent-formatting-context-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/independent-formatting-context-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/independent-formatting-context.html b/tests/wpt/tests/css/css-grid/subgrid/independent-formatting-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/independent-formatting-context.html rename to tests/wpt/tests/css/css-grid/subgrid/independent-formatting-context.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/item-percentage-height-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/item-percentage-height-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/item-percentage-height-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/item-percentage-height-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/item-percentage-height-001.html b/tests/wpt/tests/css/css-grid/subgrid/item-percentage-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/item-percentage-height-001.html rename to tests/wpt/tests/css/css-grid/subgrid/item-percentage-height-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-001.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-001.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-002-ref.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-002-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-002.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-002.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-003.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-003.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-004-ref.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-004-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-004.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-004.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-005-ref.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-005-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-005.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-005.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-006-ref.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-006-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-006.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-006.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-007-ref.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-007-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-007.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-007.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-008-ref.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-008-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-008.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-008.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-009-ref.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-009-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-009.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-009.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-010-ref.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-010-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-010.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-010.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-010.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-011-ref.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-011-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-011.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-011.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-011.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-012-ref.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-012-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-012.html b/tests/wpt/tests/css/css-grid/subgrid/line-names-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/line-names-012.html rename to tests/wpt/tests/css/css-grid/subgrid/line-names-012.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-001.html b/tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-001.html rename to tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-002-ref.html b/tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-002-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-002.html b/tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-002.html rename to tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-003-ref.html b/tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-003-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-003.html b/tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-003.html rename to tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-004-ref.html b/tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-004-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-004.html b/tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-004.html rename to tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-005-ref.html b/tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-005-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-005.html b/tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-005.html rename to tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-006-ref.html b/tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-006-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-006.html b/tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/orthogonal-writing-mode-006.html rename to tests/wpt/tests/css/css-grid/subgrid/orthogonal-writing-mode-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/parent-repeat-auto-fit-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/parent-repeat-auto-fit-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/parent-repeat-auto-fit-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/parent-repeat-auto-fit-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/parent-repeat-auto-fit-001.html b/tests/wpt/tests/css/css-grid/subgrid/parent-repeat-auto-fit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/parent-repeat-auto-fit-001.html rename to tests/wpt/tests/css/css-grid/subgrid/parent-repeat-auto-fit-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/parent-repeat-auto-fit-002-ref.html b/tests/wpt/tests/css/css-grid/subgrid/parent-repeat-auto-fit-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/parent-repeat-auto-fit-002-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/parent-repeat-auto-fit-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/parent-repeat-auto-fit-002.html b/tests/wpt/tests/css/css-grid/subgrid/parent-repeat-auto-fit-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/parent-repeat-auto-fit-002.html rename to tests/wpt/tests/css/css-grid/subgrid/parent-repeat-auto-fit-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/placement-implicit-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/placement-implicit-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/placement-implicit-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/placement-implicit-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/placement-implicit-001.html b/tests/wpt/tests/css/css-grid/subgrid/placement-implicit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/placement-implicit-001.html rename to tests/wpt/tests/css/css-grid/subgrid/placement-implicit-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-001.html b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-001.html rename to tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-002.html b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-002.html rename to tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-003.html b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-003.html rename to tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-004-ref.html b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-004-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-004.html b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-004.html rename to tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-005-ref.html b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-005-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-005.html b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-005.html rename to tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-006.html b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-006.html rename to tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-007-ref.html b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-007-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-007.html b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-007.html rename to tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-008-ref.html b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-008-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-008.html b/tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-008.html rename to tests/wpt/tests/css/css-grid/subgrid/repeat-auto-fill-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-001.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-001.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-002-ref.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-002-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-002.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-002.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-003-ref.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-003-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-003.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-003.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-004-ref.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-004-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-004.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-004.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-005.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-005.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-006.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-006.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-006.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-007.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-007.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-007.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-008.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-008.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-008.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-009.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-baseline-009.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-baseline-009.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-item-block-size-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-item-block-size-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-item-block-size-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-item-block-size-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-item-block-size-001.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-item-block-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-item-block-size-001.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-item-block-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-no-items-on-edges-001.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-no-items-on-edges-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-no-items-on-edges-001.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-no-items-on-edges-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-no-items-on-edges-002.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-no-items-on-edges-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-no-items-on-edges-002.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-no-items-on-edges-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-stretch-ref.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-stretch-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-stretch-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-stretch-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-stretch.html b/tests/wpt/tests/css/css-grid/subgrid/subgrid-stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/subgrid-stretch.html rename to tests/wpt/tests/css/css-grid/subgrid/subgrid-stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/writing-directions-001-ref.html b/tests/wpt/tests/css/css-grid/subgrid/writing-directions-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/writing-directions-001-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/writing-directions-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/writing-directions-001.html b/tests/wpt/tests/css/css-grid/subgrid/writing-directions-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/writing-directions-001.html rename to tests/wpt/tests/css/css-grid/subgrid/writing-directions-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/writing-directions-002-ref.html b/tests/wpt/tests/css/css-grid/subgrid/writing-directions-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/writing-directions-002-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/writing-directions-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/writing-directions-002.html b/tests/wpt/tests/css/css-grid/subgrid/writing-directions-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/writing-directions-002.html rename to tests/wpt/tests/css/css-grid/subgrid/writing-directions-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/writing-directions-003-ref.html b/tests/wpt/tests/css/css-grid/subgrid/writing-directions-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/writing-directions-003-ref.html rename to tests/wpt/tests/css/css-grid/subgrid/writing-directions-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/subgrid/writing-directions-003.html b/tests/wpt/tests/css/css-grid/subgrid/writing-directions-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/subgrid/writing-directions-003.html rename to tests/wpt/tests/css/css-grid/subgrid/writing-directions-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/support/colors-8x16.png b/tests/wpt/tests/css/css-grid/support/colors-8x16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/support/colors-8x16.png rename to tests/wpt/tests/css/css-grid/support/colors-8x16.png diff --git a/tests/wpt/web-platform-tests/css/css-grid/support/grid-child-utils.js b/tests/wpt/tests/css/css-grid/support/grid-child-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/support/grid-child-utils.js rename to tests/wpt/tests/css/css-grid/support/grid-child-utils.js diff --git a/tests/wpt/web-platform-tests/css/css-grid/table-grid-item-005.html b/tests/wpt/tests/css/css-grid/table-grid-item-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/table-grid-item-005.html rename to tests/wpt/tests/css/css-grid/table-grid-item-005.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-001-ref.html b/tests/wpt/tests/css/css-grid/table-grid-item-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-001-ref.html rename to tests/wpt/tests/css/css-grid/table-grid-item-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-001.html b/tests/wpt/tests/css/css-grid/table-grid-item-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-001.html rename to tests/wpt/tests/css/css-grid/table-grid-item-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-002-ref.html b/tests/wpt/tests/css/css-grid/table-grid-item-dynamic-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-002-ref.html rename to tests/wpt/tests/css/css-grid/table-grid-item-dynamic-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-002.html b/tests/wpt/tests/css/css-grid/table-grid-item-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-002.html rename to tests/wpt/tests/css/css-grid/table-grid-item-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-003-ref.html b/tests/wpt/tests/css/css-grid/table-grid-item-dynamic-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-003-ref.html rename to tests/wpt/tests/css/css-grid/table-grid-item-dynamic-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-003.html b/tests/wpt/tests/css/css-grid/table-grid-item-dynamic-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-003.html rename to tests/wpt/tests/css/css-grid/table-grid-item-dynamic-003.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-004-ref.html b/tests/wpt/tests/css/css-grid/table-grid-item-dynamic-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-004-ref.html rename to tests/wpt/tests/css/css-grid/table-grid-item-dynamic-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-004.html b/tests/wpt/tests/css/css-grid/table-grid-item-dynamic-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/table-grid-item-dynamic-004.html rename to tests/wpt/tests/css/css-grid/table-grid-item-dynamic-004.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/test-plan/index.html b/tests/wpt/tests/css/css-grid/test-plan/index.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/test-plan/index.html rename to tests/wpt/tests/css/css-grid/test-plan/index.html diff --git a/tests/wpt/web-platform-tests/css/css-grid/whitespace-reattach.html b/tests/wpt/tests/css/css-grid/whitespace-reattach.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-grid/whitespace-reattach.html rename to tests/wpt/tests/css/css-grid/whitespace-reattach.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/Highlight-iteration-with-modifications.html b/tests/wpt/tests/css/css-highlight-api/Highlight-iteration-with-modifications.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/Highlight-iteration-with-modifications.html rename to tests/wpt/tests/css/css-highlight-api/Highlight-iteration-with-modifications.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/Highlight-iteration.html b/tests/wpt/tests/css/css-highlight-api/Highlight-iteration.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/Highlight-iteration.html rename to tests/wpt/tests/css/css-highlight-api/Highlight-iteration.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/Highlight-multiple-type-attribute.html b/tests/wpt/tests/css/css-highlight-api/Highlight-multiple-type-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/Highlight-multiple-type-attribute.html rename to tests/wpt/tests/css/css-highlight-api/Highlight-multiple-type-attribute.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/Highlight-setlike-tampered-Set-prototype.html b/tests/wpt/tests/css/css-highlight-api/Highlight-setlike-tampered-Set-prototype.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/Highlight-setlike-tampered-Set-prototype.html rename to tests/wpt/tests/css/css-highlight-api/Highlight-setlike-tampered-Set-prototype.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/Highlight-setlike.html b/tests/wpt/tests/css/css-highlight-api/Highlight-setlike.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/Highlight-setlike.html rename to tests/wpt/tests/css/css-highlight-api/Highlight-setlike.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/Highlight-type-attribute.tentative.html b/tests/wpt/tests/css/css-highlight-api/Highlight-type-attribute.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/Highlight-type-attribute.tentative.html rename to tests/wpt/tests/css/css-highlight-api/Highlight-type-attribute.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/HighlightRegistry-iteration-with-modifications.html b/tests/wpt/tests/css/css-highlight-api/HighlightRegistry-iteration-with-modifications.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/HighlightRegistry-iteration-with-modifications.html rename to tests/wpt/tests/css/css-highlight-api/HighlightRegistry-iteration-with-modifications.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/HighlightRegistry-iteration.html b/tests/wpt/tests/css/css-highlight-api/HighlightRegistry-iteration.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/HighlightRegistry-iteration.html rename to tests/wpt/tests/css/css-highlight-api/HighlightRegistry-iteration.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/HighlightRegistry-maplike-tampered-Map-prototype.html b/tests/wpt/tests/css/css-highlight-api/HighlightRegistry-maplike-tampered-Map-prototype.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/HighlightRegistry-maplike-tampered-Map-prototype.html rename to tests/wpt/tests/css/css-highlight-api/HighlightRegistry-maplike-tampered-Map-prototype.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/HighlightRegistry-maplike.html b/tests/wpt/tests/css/css-highlight-api/HighlightRegistry-maplike.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/HighlightRegistry-maplike.html rename to tests/wpt/tests/css/css-highlight-api/HighlightRegistry-maplike.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/highlight-pseudo-computed.html b/tests/wpt/tests/css/css-highlight-api/highlight-pseudo-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/highlight-pseudo-computed.html rename to tests/wpt/tests/css/css-highlight-api/highlight-pseudo-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/highlight-pseudo-parsing.html b/tests/wpt/tests/css/css-highlight-api/highlight-pseudo-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/highlight-pseudo-parsing.html rename to tests/wpt/tests/css/css-highlight-api/highlight-pseudo-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/idlharness.window.js b/tests/wpt/tests/css/css-highlight-api/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/idlharness.window.js rename to tests/wpt/tests/css/css-highlight-api/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/css-highlight-painting-underline-offset-001-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/css-highlight-painting-underline-offset-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/css-highlight-painting-underline-offset-001-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/css-highlight-painting-underline-offset-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/css-highlight-painting-underline-offset-001.html b/tests/wpt/tests/css/css-highlight-api/painting/css-highlight-painting-underline-offset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/css-highlight-painting-underline-offset-001.html rename to tests/wpt/tests/css/css-highlight-api/painting/css-highlight-painting-underline-offset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/css-target-text-decoration-001-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/css-target-text-decoration-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/css-target-text-decoration-001-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/css-target-text-decoration-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/css-target-text-decoration-001.html b/tests/wpt/tests/css/css-highlight-api/painting/css-target-text-decoration-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/css-target-text-decoration-001.html rename to tests/wpt/tests/css/css-highlight-api/painting/css-target-text-decoration-001.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-001-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-001-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-001.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-001.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-001.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-002-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-002-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-002.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-002.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-002.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-003-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-003-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-003.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-003.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-003.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-004-2-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-004-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-004-2-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-004-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-004-2.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-004-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-004-2.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-004-2.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-004-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-004-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-004.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-004.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-004.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-005.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-005.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-005.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-006.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-006.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-006.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-007.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-007.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-007.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-008.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-008.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-008.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-009.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-009.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-009.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-010.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-010.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-010.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-011.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-011.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-011.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-012.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-012.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-012.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-013.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-013.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-013.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-014.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-014.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-014.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-015.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-015.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-015.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-016.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-016.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-016.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-017.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-017.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-017.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-018.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-018.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-018.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-below-grammar-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-below-grammar-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-below-grammar-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-below-grammar-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-below-grammar.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-below-grammar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-below-grammar.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-below-grammar.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-below-selection-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-below-selection-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-below-selection-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-below-selection-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-below-selection.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-below-selection.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-below-selection.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-below-selection.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-below-target-text-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-below-target-text-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-below-target-text-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-below-target-text-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-below-target-text.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-below-target-text.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-below-target-text.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-below-target-text.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-001-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-001-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-001.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-001.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-001.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-002.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-002.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-002.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-003-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-003-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-003.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-003.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-003.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-004-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-004-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-004.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-004.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-004.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-005-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-005-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-005.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-005.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-005.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-006-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-006-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-006.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-006.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-iframe-006.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-001-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-001-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-001.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-001.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-001.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-002.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-002.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-002.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-003-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-003-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-003.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-003.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-inheritance-003.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-001.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-001.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-002.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-002.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-003.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-003.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-004.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-004.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-005.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-005.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-006.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-006.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-006.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-007-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-007-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-007.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-007.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-invalidation-007.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-001-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-001-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-001.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-001.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-001.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-002-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-002-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-002.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-002.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-002.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-prioritization-001.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-prioritization-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-prioritization-001.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-prioritization-001.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-prioritization-002.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-prioritization-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-prioritization-002.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-prioritization-002.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-001-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-001-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-001.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-001.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-001.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-002.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-002.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-002.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-003.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-003.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-staticrange-003.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-001-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-001-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-001.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-001.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-001.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-dynamic-001-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-dynamic-001-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-dynamic-001.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-dynamic-001.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-text-shadow.tentative.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-text-shadow.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/custom-highlight-painting-text-shadow.tentative.html rename to tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-painting-text-shadow.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/invalidation/css-highlight-invalidation-001-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/invalidation/css-highlight-invalidation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/invalidation/css-highlight-invalidation-001-ref.html rename to tests/wpt/tests/css/css-highlight-api/painting/invalidation/css-highlight-invalidation-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/invalidation/css-highlight-invalidation-001.html b/tests/wpt/tests/css/css-highlight-api/painting/invalidation/css-highlight-invalidation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/invalidation/css-highlight-invalidation-001.html rename to tests/wpt/tests/css/css-highlight-api/painting/invalidation/css-highlight-invalidation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/resources/iframe-code.html b/tests/wpt/tests/css/css-highlight-api/painting/resources/iframe-code.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/resources/iframe-code.html rename to tests/wpt/tests/css/css-highlight-api/painting/resources/iframe-code.html diff --git a/tests/wpt/web-platform-tests/css/css-highlight-api/painting/resources/run-after-layout-and-paint.js b/tests/wpt/tests/css/css-highlight-api/painting/resources/run-after-layout-and-paint.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-highlight-api/painting/resources/run-after-layout-and-paint.js rename to tests/wpt/tests/css/css-highlight-api/painting/resources/run-after-layout-and-paint.js diff --git a/tests/wpt/web-platform-tests/css/css-images/META.yml b/tests/wpt/tests/css/css-images/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/META.yml rename to tests/wpt/tests/css/css-images/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-images/animation/image-no-interpolation.html b/tests/wpt/tests/css/css-images/animation/image-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/animation/image-no-interpolation.html rename to tests/wpt/tests/css/css-images/animation/image-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-images/animation/object-position-interpolation.html b/tests/wpt/tests/css/css-images/animation/object-position-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/animation/object-position-interpolation.html rename to tests/wpt/tests/css/css-images/animation/object-position-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-images/animation/object-view-box-interpolation.html b/tests/wpt/tests/css/css-images/animation/object-view-box-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/animation/object-view-box-interpolation.html rename to tests/wpt/tests/css/css-images/animation/object-view-box-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-images/color-stop-currentcolor-ref.html b/tests/wpt/tests/css/css-images/color-stop-currentcolor-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/color-stop-currentcolor-ref.html rename to tests/wpt/tests/css/css-images/color-stop-currentcolor-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/color-stop-currentcolor.html b/tests/wpt/tests/css/css-images/color-stop-currentcolor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/color-stop-currentcolor.html rename to tests/wpt/tests/css/css-images/color-stop-currentcolor.html diff --git a/tests/wpt/web-platform-tests/css/css-images/conic-gradient-angle-negative.html b/tests/wpt/tests/css/css-images/conic-gradient-angle-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/conic-gradient-angle-negative.html rename to tests/wpt/tests/css/css-images/conic-gradient-angle-negative.html diff --git a/tests/wpt/web-platform-tests/css/css-images/conic-gradient-angle.html b/tests/wpt/tests/css/css-images/conic-gradient-angle.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/conic-gradient-angle.html rename to tests/wpt/tests/css/css-images/conic-gradient-angle.html diff --git a/tests/wpt/web-platform-tests/css/css-images/conic-gradient-center-ref.html b/tests/wpt/tests/css/css-images/conic-gradient-center-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/conic-gradient-center-ref.html rename to tests/wpt/tests/css/css-images/conic-gradient-center-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/conic-gradient-center.html b/tests/wpt/tests/css/css-images/conic-gradient-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/conic-gradient-center.html rename to tests/wpt/tests/css/css-images/conic-gradient-center.html diff --git a/tests/wpt/web-platform-tests/css/css-images/css-image-fallbacks-and-annotations-ref.html b/tests/wpt/tests/css/css-images/css-image-fallbacks-and-annotations-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/css-image-fallbacks-and-annotations-ref.html rename to tests/wpt/tests/css/css-images/css-image-fallbacks-and-annotations-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/css-image-fallbacks-and-annotations.html b/tests/wpt/tests/css/css-images/css-image-fallbacks-and-annotations.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/css-image-fallbacks-and-annotations.html rename to tests/wpt/tests/css/css-images/css-image-fallbacks-and-annotations.html diff --git a/tests/wpt/web-platform-tests/css/css-images/css-image-fallbacks-and-annotations002.html b/tests/wpt/tests/css/css-images/css-image-fallbacks-and-annotations002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/css-image-fallbacks-and-annotations002.html rename to tests/wpt/tests/css/css-images/css-image-fallbacks-and-annotations002.html diff --git a/tests/wpt/web-platform-tests/css/css-images/css-image-fallbacks-and-annotations003.html b/tests/wpt/tests/css/css-images/css-image-fallbacks-and-annotations003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/css-image-fallbacks-and-annotations003.html rename to tests/wpt/tests/css/css-images/css-image-fallbacks-and-annotations003.html diff --git a/tests/wpt/web-platform-tests/css/css-images/css-image-fallbacks-and-annotations004.html b/tests/wpt/tests/css/css-images/css-image-fallbacks-and-annotations004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/css-image-fallbacks-and-annotations004.html rename to tests/wpt/tests/css/css-images/css-image-fallbacks-and-annotations004.html diff --git a/tests/wpt/web-platform-tests/css/css-images/css-image-fallbacks-and-annotations005.html b/tests/wpt/tests/css/css-images/css-image-fallbacks-and-annotations005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/css-image-fallbacks-and-annotations005.html rename to tests/wpt/tests/css/css-images/css-image-fallbacks-and-annotations005.html diff --git a/tests/wpt/web-platform-tests/css/css-images/empty-background-image.html b/tests/wpt/tests/css/css-images/empty-background-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/empty-background-image.html rename to tests/wpt/tests/css/css-images/empty-background-image.html diff --git a/tests/wpt/web-platform-tests/css/css-images/empty-radial-gradient-crash.html b/tests/wpt/tests/css/css-images/empty-radial-gradient-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/empty-radial-gradient-crash.html rename to tests/wpt/tests/css/css-images/empty-radial-gradient-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient-border-box-ref.html b/tests/wpt/tests/css/css-images/gradient-border-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient-border-box-ref.html rename to tests/wpt/tests/css/css-images/gradient-border-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient-border-box.html b/tests/wpt/tests/css/css-images/gradient-border-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient-border-box.html rename to tests/wpt/tests/css/css-images/gradient-border-box.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient-button-ref.html b/tests/wpt/tests/css/css-images/gradient-button-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient-button-ref.html rename to tests/wpt/tests/css/css-images/gradient-button-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient-button.html b/tests/wpt/tests/css/css-images/gradient-button.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient-button.html rename to tests/wpt/tests/css/css-images/gradient-button.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient-content-box-ref.html b/tests/wpt/tests/css/css-images/gradient-content-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient-content-box-ref.html rename to tests/wpt/tests/css/css-images/gradient-content-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient-content-box.html b/tests/wpt/tests/css/css-images/gradient-content-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient-content-box.html rename to tests/wpt/tests/css/css-images/gradient-content-box.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient-move-stops-ref.html b/tests/wpt/tests/css/css-images/gradient-move-stops-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient-move-stops-ref.html rename to tests/wpt/tests/css/css-images/gradient-move-stops-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient-move-stops.html b/tests/wpt/tests/css/css-images/gradient-move-stops.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient-move-stops.html rename to tests/wpt/tests/css/css-images/gradient-move-stops.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient-nan-crash.html b/tests/wpt/tests/css/css-images/gradient-nan-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient-nan-crash.html rename to tests/wpt/tests/css/css-images/gradient-nan-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient-refcrash.html b/tests/wpt/tests/css/css-images/gradient-refcrash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient-refcrash.html rename to tests/wpt/tests/css/css-images/gradient-refcrash.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/color-stops-parsing.html b/tests/wpt/tests/css/css-images/gradient/color-stops-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/color-stops-parsing.html rename to tests/wpt/tests/css/css-images/gradient/color-stops-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/css-color-4-colors-default-to-oklab-gradient.html b/tests/wpt/tests/css/css-images/gradient/css-color-4-colors-default-to-oklab-gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/css-color-4-colors-default-to-oklab-gradient.html rename to tests/wpt/tests/css/css-images/gradient/css-color-4-colors-default-to-oklab-gradient.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-001-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-001-ref.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-001.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-001.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-001.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-002-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-002-ref.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-002.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-002.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-002.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-003-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-003-ref.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-003.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-003.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-003.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-004-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-004-ref.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-004.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-004.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-004.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-005-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-005-ref.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-005.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-005.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-005.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-006-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-006-ref.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-006.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-006.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-006.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-007-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-007-ref.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-007.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-007.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-007.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-008-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-008-ref.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-008.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-008.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-008.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-009-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-009-ref.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-009.html b/tests/wpt/tests/css/css-images/gradient/gradient-eval-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/gradient-eval-009.html rename to tests/wpt/tests/css/css-images/gradient/gradient-eval-009.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/legacy-color-gradient.html b/tests/wpt/tests/css/css-images/gradient/legacy-color-gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/legacy-color-gradient.html rename to tests/wpt/tests/css/css-images/gradient/legacy-color-gradient.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/oklab-gradient-ref.html b/tests/wpt/tests/css/css-images/gradient/oklab-gradient-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/oklab-gradient-ref.html rename to tests/wpt/tests/css/css-images/gradient/oklab-gradient-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/oklab-gradient.html b/tests/wpt/tests/css/css-images/gradient/oklab-gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/oklab-gradient.html rename to tests/wpt/tests/css/css-images/gradient/oklab-gradient.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/resources/oklab-gradient.png b/tests/wpt/tests/css/css-images/gradient/resources/oklab-gradient.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/resources/oklab-gradient.png rename to tests/wpt/tests/css/css-images/gradient/resources/oklab-gradient.png diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/resources/red-green-gradient-linear-colorspace.png b/tests/wpt/tests/css/css-images/gradient/resources/red-green-gradient-linear-colorspace.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/resources/red-green-gradient-linear-colorspace.png rename to tests/wpt/tests/css/css-images/gradient/resources/red-green-gradient-linear-colorspace.png diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/resources/srgb-gradient.png b/tests/wpt/tests/css/css-images/gradient/resources/srgb-gradient.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/resources/srgb-gradient.png rename to tests/wpt/tests/css/css-images/gradient/resources/srgb-gradient.png diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/resources/xyz-gradient.png b/tests/wpt/tests/css/css-images/gradient/resources/xyz-gradient.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/resources/xyz-gradient.png rename to tests/wpt/tests/css/css-images/gradient/resources/xyz-gradient.png diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/srgb-gradient-ref.html b/tests/wpt/tests/css/css-images/gradient/srgb-gradient-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/srgb-gradient-ref.html rename to tests/wpt/tests/css/css-images/gradient/srgb-gradient-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/srgb-gradient.html b/tests/wpt/tests/css/css-images/gradient/srgb-gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/srgb-gradient.html rename to tests/wpt/tests/css/css-images/gradient/srgb-gradient.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/srgb-linear-gradient-ref.html b/tests/wpt/tests/css/css-images/gradient/srgb-linear-gradient-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/srgb-linear-gradient-ref.html rename to tests/wpt/tests/css/css-images/gradient/srgb-linear-gradient-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/srgb-linear-gradient.html b/tests/wpt/tests/css/css-images/gradient/srgb-linear-gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/srgb-linear-gradient.html rename to tests/wpt/tests/css/css-images/gradient/srgb-linear-gradient.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/xyz-gradient-ref.html b/tests/wpt/tests/css/css-images/gradient/xyz-gradient-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/xyz-gradient-ref.html rename to tests/wpt/tests/css/css-images/gradient/xyz-gradient-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradient/xyz-gradient.html b/tests/wpt/tests/css/css-images/gradient/xyz-gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradient/xyz-gradient.html rename to tests/wpt/tests/css/css-images/gradient/xyz-gradient.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradients-with-border-ref.html b/tests/wpt/tests/css/css-images/gradients-with-border-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradients-with-border-ref.html rename to tests/wpt/tests/css/css-images/gradients-with-border-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradients-with-border.html b/tests/wpt/tests/css/css-images/gradients-with-border.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradients-with-border.html rename to tests/wpt/tests/css/css-images/gradients-with-border.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradients-with-transparent-ref.html b/tests/wpt/tests/css/css-images/gradients-with-transparent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradients-with-transparent-ref.html rename to tests/wpt/tests/css/css-images/gradients-with-transparent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/gradients-with-transparent.html b/tests/wpt/tests/css/css-images/gradients-with-transparent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/gradients-with-transparent.html rename to tests/wpt/tests/css/css-images/gradients-with-transparent.html diff --git a/tests/wpt/web-platform-tests/css/css-images/idlharness.html b/tests/wpt/tests/css/css-images/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/idlharness.html rename to tests/wpt/tests/css/css-images/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-fit-001.xht b/tests/wpt/tests/css/css-images/image-fit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-fit-001.xht rename to tests/wpt/tests/css/css-images/image-fit-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-images/image-fit-006.xht b/tests/wpt/tests/css/css-images/image-fit-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-fit-006.xht rename to tests/wpt/tests/css/css-images/image-fit-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-image.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-background-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-image.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-background-image.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-position.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-background-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-position.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-background-position.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-properties.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-background-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-properties.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-background-properties.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-border-image.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-border-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-border-image.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-border-image.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-cursor.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-cursor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-cursor.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-cursor.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-default.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-default.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-default.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-default.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-exif-png.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-exif-png.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-exif-png.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-exif-png.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-composited-dynamic1.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-composited-dynamic1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-composited-dynamic1.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-composited-dynamic1.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-composited-dynamic2.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-composited-dynamic2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-composited-dynamic2.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-composited-dynamic2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-composited.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-composited.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-composited.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-composited.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-computed-style.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-computed-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-computed-style.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-computed-style.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-content-images.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-content-images.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-content-images.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-content-images.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-dynamic1.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-dynamic1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-dynamic1.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-dynamic1.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-dynamic2.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-dynamic2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-dynamic2.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-dynamic2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-embedded-content.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-embedded-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image-embedded-content.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image-embedded-content.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-from-image.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-from-image.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-iframe.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-iframe.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-img-object-fit.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-img-object-fit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-img-object-fit.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-img-object-fit.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-list-style-image.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-list-style-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-list-style-image.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-list-style-image.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-mask-image.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-mask-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-mask-image.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-mask-image.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-none-computed-style.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-none-computed-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-none-computed-style.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-none-computed-style.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-none-content-images.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-none-content-images.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-none-content-images.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-none-content-images.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-none-cross-origin-canvas.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-none-cross-origin-canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-none-cross-origin-canvas.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-none-cross-origin-canvas.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-none-cross-origin-svg.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-none-cross-origin-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-none-cross-origin-svg.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-none-cross-origin-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-none-cross-origin.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-none-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-none-cross-origin.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-none-cross-origin.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-none-image-document.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-none-image-document.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-none-image-document.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-none-image-document.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-none.html b/tests/wpt/tests/css/css-images/image-orientation/image-orientation-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-none.html rename to tests/wpt/tests/css/css-images/image-orientation/image-orientation-none.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-image-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-background-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-image-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-background-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-position-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-background-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-position-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-background-position-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-properties-border-radius-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-background-properties-border-radius-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-properties-border-radius-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-background-properties-border-radius-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-properties-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-background-properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-properties-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-background-properties-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-border-image-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-border-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-border-image-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-border-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-default-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-default-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-default-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-default-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-exif-png-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-exif-png-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-exif-png-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-exif-png-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-from-image-content-images-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-from-image-content-images-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-from-image-content-images-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-from-image-content-images-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-from-image-embedded-content-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-from-image-embedded-content-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-from-image-embedded-content-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-from-image-embedded-content-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-from-image-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-from-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-from-image-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-from-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-iframe-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-iframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-iframe-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-iframe-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-img-object-fit-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-img-object-fit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-img-object-fit-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-img-object-fit-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-list-style-image-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-list-style-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-list-style-image-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-list-style-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-mask-image-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-mask-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-mask-image-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-mask-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-none-content-images-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-none-content-images-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-none-content-images-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-none-content-images-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-none-cross-origin-canvas-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-none-cross-origin-canvas-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-none-cross-origin-canvas-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-none-cross-origin-canvas-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-none-cross-origin-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-none-cross-origin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-none-cross-origin-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-none-cross-origin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-none-cross-origin-svg-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-none-cross-origin-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-none-cross-origin-svg-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-none-cross-origin-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-none-image-document-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-none-image-document-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-none-image-document-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-none-image-document-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-none-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-none-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/image-orientation-none-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/svg-image-orientation-aspect-ratio-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/svg-image-orientation-aspect-ratio-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/svg-image-orientation-aspect-ratio-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/svg-image-orientation-aspect-ratio-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/svg-image-orientation-none-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/svg-image-orientation-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/svg-image-orientation-none-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/svg-image-orientation-none-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/svg-image-orientation-ref.html b/tests/wpt/tests/css/css-images/image-orientation/reference/svg-image-orientation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/svg-image-orientation-ref.html rename to tests/wpt/tests/css/css-images/image-orientation/reference/svg-image-orientation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-exif-early.png b/tests/wpt/tests/css/css-images/image-orientation/support/F-exif-early.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-exif-early.png rename to tests/wpt/tests/css/css-images/image-orientation/support/F-exif-early.png diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-exif-late.png b/tests/wpt/tests/css/css-images/image-orientation/support/F-exif-late.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-exif-late.png rename to tests/wpt/tests/css/css-images/image-orientation/support/F-exif-late.png diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-rotated.png b/tests/wpt/tests/css/css-images/image-orientation/support/F-rotated.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-rotated.png rename to tests/wpt/tests/css/css-images/image-orientation/support/F-rotated.png diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-upright.png b/tests/wpt/tests/css/css-images/image-orientation/support/F-upright.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/F-upright.png rename to tests/wpt/tests/css/css-images/image-orientation/support/F-upright.png diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/cursor-8-llo.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/cursor-8-llo.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/cursor-8-llo.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/cursor-8-llo.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-1-ul-pre-rotated.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-1-ul-pre-rotated.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-1-ul-pre-rotated.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-1-ul-pre-rotated.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-1-ul.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-1-ul.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-1-ul.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-1-ul.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-2-ur-pre-rotated.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-2-ur-pre-rotated.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-2-ur-pre-rotated.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-2-ur-pre-rotated.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-2-ur.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-2-ur.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-2-ur.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-2-ur.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-3-lr-pre-rotated.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-3-lr-pre-rotated.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-3-lr-pre-rotated.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-3-lr-pre-rotated.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-3-lr.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-4-lol-pre-rotated.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-4-lol-pre-rotated.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-4-lol-pre-rotated.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-4-lol-pre-rotated.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-4-lol.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-4-lol.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-4-lol.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-4-lol.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-5-lu-pre-rotated.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-5-lu-pre-rotated.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-5-lu-pre-rotated.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-5-lu-pre-rotated.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-5-lu.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-5-lu.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-5-lu.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-5-lu.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-6-ru-pre-rotated.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-6-ru-pre-rotated.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-6-ru-pre-rotated.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-6-ru-pre-rotated.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-6-ru.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-6-ru.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-6-ru.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-6-ru.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-7-rl-pre-rotated.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-7-rl-pre-rotated.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-7-rl-pre-rotated.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-7-rl-pre-rotated.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-7-rl.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-8-llo-pre-rotated.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-8-llo-pre-rotated.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-8-llo-pre-rotated.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-8-llo-pre-rotated.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-8-llo.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-8-llo.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-8-llo.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-8-llo.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-9-u-pre-rotated.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-9-u-pre-rotated.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-9-u-pre-rotated.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-9-u-pre-rotated.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-9-u.jpg b/tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-9-u.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/exif-orientation-9-u.jpg rename to tests/wpt/tests/css/css-images/image-orientation/support/exif-orientation-9-u.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/support/svg-with-image-rotated.svg b/tests/wpt/tests/css/css-images/image-orientation/support/svg-with-image-rotated.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/support/svg-with-image-rotated.svg rename to tests/wpt/tests/css/css-images/image-orientation/support/svg-with-image-rotated.svg diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/svg-image-orientation-aspect-ratio.html b/tests/wpt/tests/css/css-images/image-orientation/svg-image-orientation-aspect-ratio.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/svg-image-orientation-aspect-ratio.html rename to tests/wpt/tests/css/css-images/image-orientation/svg-image-orientation-aspect-ratio.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/svg-image-orientation-none.html b/tests/wpt/tests/css/css-images/image-orientation/svg-image-orientation-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/svg-image-orientation-none.html rename to tests/wpt/tests/css/css-images/image-orientation/svg-image-orientation-none.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/svg-image-orientation.html b/tests/wpt/tests/css/css-images/image-orientation/svg-image-orientation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-orientation/svg-image-orientation.html rename to tests/wpt/tests/css/css-images/image-orientation/svg-image-orientation.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-rendering-border-image-notref.html b/tests/wpt/tests/css/css-images/image-rendering-border-image-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-rendering-border-image-notref.html rename to tests/wpt/tests/css/css-images/image-rendering-border-image-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-rendering-border-image.html b/tests/wpt/tests/css/css-images/image-rendering-border-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-rendering-border-image.html rename to tests/wpt/tests/css/css-images/image-rendering-border-image.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-calc-x-rendering-2.html b/tests/wpt/tests/css/css-images/image-set/image-set-calc-x-rendering-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-calc-x-rendering-2.html rename to tests/wpt/tests/css/css-images/image-set/image-set-calc-x-rendering-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-calc-x-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-calc-x-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-calc-x-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-calc-x-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-computed.sub.html b/tests/wpt/tests/css/css-images/image-set/image-set-computed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-computed.sub.html rename to tests/wpt/tests/css/css-images/image-set/image-set-computed.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-conic-gradient-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-conic-gradient-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-conic-gradient-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-conic-gradient-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-content-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-content-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-content-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-content-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-dpcm-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-dpcm-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-dpcm-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-dpcm-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-dpi-rendering-2.html b/tests/wpt/tests/css/css-images/image-set/image-set-dpi-rendering-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-dpi-rendering-2.html rename to tests/wpt/tests/css/css-images/image-set/image-set-dpi-rendering-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-dpi-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-dpi-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-dpi-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-dpi-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-dppx-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-dppx-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-dppx-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-dppx-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-empty-url-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-empty-url-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-empty-url-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-empty-url-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-first-match-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-first-match-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-first-match-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-first-match-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-linear-gradient-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-linear-gradient-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-linear-gradient-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-linear-gradient-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-negative-resolution-rendering-2.html b/tests/wpt/tests/css/css-images/image-set/image-set-negative-resolution-rendering-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-negative-resolution-rendering-2.html rename to tests/wpt/tests/css/css-images/image-set/image-set-negative-resolution-rendering-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-negative-resolution-rendering-3.html b/tests/wpt/tests/css/css-images/image-set/image-set-negative-resolution-rendering-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-negative-resolution-rendering-3.html rename to tests/wpt/tests/css/css-images/image-set/image-set-negative-resolution-rendering-3.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-negative-resolution-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-negative-resolution-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-negative-resolution-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-negative-resolution-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-no-res-rendering-2.html b/tests/wpt/tests/css/css-images/image-set/image-set-no-res-rendering-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-no-res-rendering-2.html rename to tests/wpt/tests/css/css-images/image-set/image-set-no-res-rendering-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-no-res-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-no-res-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-no-res-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-no-res-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-no-url-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-no-url-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-no-url-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-no-url-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-parsing.html b/tests/wpt/tests/css/css-images/image-set/image-set-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-parsing.html rename to tests/wpt/tests/css/css-images/image-set/image-set-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-radial-gradient-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-radial-gradient-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-radial-gradient-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-radial-gradient-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-rendering-2.html b/tests/wpt/tests/css/css-images/image-set/image-set-rendering-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-rendering-2.html rename to tests/wpt/tests/css/css-images/image-set/image-set-rendering-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-repeating-conic-gradient-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-repeating-conic-gradient-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-repeating-conic-gradient-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-repeating-conic-gradient-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-repeating-linear-gradient-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-repeating-linear-gradient-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-repeating-linear-gradient-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-repeating-linear-gradient-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-repeating-radial-gradient-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-repeating-radial-gradient-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-repeating-radial-gradient-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-repeating-radial-gradient-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-resolution-001-ref.html b/tests/wpt/tests/css/css-images/image-set/image-set-resolution-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-resolution-001-ref.html rename to tests/wpt/tests/css/css-images/image-set/image-set-resolution-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-resolution-001.html b/tests/wpt/tests/css/css-images/image-set/image-set-resolution-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-resolution-001.html rename to tests/wpt/tests/css/css-images/image-set/image-set-resolution-001.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-resolution-002.html b/tests/wpt/tests/css/css-images/image-set/image-set-resolution-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-resolution-002.html rename to tests/wpt/tests/css/css-images/image-set/image-set-resolution-002.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-resolution-003.html b/tests/wpt/tests/css/css-images/image-set/image-set-resolution-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-resolution-003.html rename to tests/wpt/tests/css/css-images/image-set/image-set-resolution-003.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-first-match-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-type-first-match-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-first-match-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-type-first-match-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-rendering-2.html b/tests/wpt/tests/css/css-images/image-set/image-set-type-rendering-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-rendering-2.html rename to tests/wpt/tests/css/css-images/image-set/image-set-type-rendering-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-rendering-3.html b/tests/wpt/tests/css/css-images/image-set/image-set-type-rendering-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-rendering-3.html rename to tests/wpt/tests/css/css-images/image-set/image-set-type-rendering-3.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-type-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-type-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-skip-unsupported-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-type-skip-unsupported-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-skip-unsupported-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-type-skip-unsupported-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-unsupported-rendering-2.html b/tests/wpt/tests/css/css-images/image-set/image-set-type-unsupported-rendering-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-unsupported-rendering-2.html rename to tests/wpt/tests/css/css-images/image-set/image-set-type-unsupported-rendering-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-unsupported-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-type-unsupported-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-unsupported-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-type-unsupported-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-unordered-res-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-unordered-res-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-unordered-res-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-unordered-res-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-zero-resolution-rendering-2.html b/tests/wpt/tests/css/css-images/image-set/image-set-zero-resolution-rendering-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-zero-resolution-rendering-2.html rename to tests/wpt/tests/css/css-images/image-set/image-set-zero-resolution-rendering-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-zero-resolution-rendering.html b/tests/wpt/tests/css/css-images/image-set/image-set-zero-resolution-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-zero-resolution-rendering.html rename to tests/wpt/tests/css/css-images/image-set/image-set-zero-resolution-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-conic-gradient-rendering-ref.html b/tests/wpt/tests/css/css-images/image-set/reference/image-set-conic-gradient-rendering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-conic-gradient-rendering-ref.html rename to tests/wpt/tests/css/css-images/image-set/reference/image-set-conic-gradient-rendering-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-linear-gradient-rendering-ref.html b/tests/wpt/tests/css/css-images/image-set/reference/image-set-linear-gradient-rendering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-linear-gradient-rendering-ref.html rename to tests/wpt/tests/css/css-images/image-set/reference/image-set-linear-gradient-rendering-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-radial-gradient-rendering-ref.html b/tests/wpt/tests/css/css-images/image-set/reference/image-set-radial-gradient-rendering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-radial-gradient-rendering-ref.html rename to tests/wpt/tests/css/css-images/image-set/reference/image-set-radial-gradient-rendering-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-rendering-ref.html b/tests/wpt/tests/css/css-images/image-set/reference/image-set-rendering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-rendering-ref.html rename to tests/wpt/tests/css/css-images/image-set/reference/image-set-rendering-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-repeating-conic-gradient-rendering-ref.html b/tests/wpt/tests/css/css-images/image-set/reference/image-set-repeating-conic-gradient-rendering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-repeating-conic-gradient-rendering-ref.html rename to tests/wpt/tests/css/css-images/image-set/reference/image-set-repeating-conic-gradient-rendering-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-repeating-linear-gradient-rendering-ref.html b/tests/wpt/tests/css/css-images/image-set/reference/image-set-repeating-linear-gradient-rendering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-repeating-linear-gradient-rendering-ref.html rename to tests/wpt/tests/css/css-images/image-set/reference/image-set-repeating-linear-gradient-rendering-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-repeating-radial-gradient-rendering-ref.html b/tests/wpt/tests/css/css-images/image-set/reference/image-set-repeating-radial-gradient-rendering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-repeating-radial-gradient-rendering-ref.html rename to tests/wpt/tests/css/css-images/image-set/reference/image-set-repeating-radial-gradient-rendering-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/infinite-radial-gradient-crash-ref.html b/tests/wpt/tests/css/css-images/infinite-radial-gradient-crash-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/infinite-radial-gradient-crash-ref.html rename to tests/wpt/tests/css/css-images/infinite-radial-gradient-crash-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/infinite-radial-gradient-refcrash.html b/tests/wpt/tests/css/css-images/infinite-radial-gradient-refcrash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/infinite-radial-gradient-refcrash.html rename to tests/wpt/tests/css/css-images/infinite-radial-gradient-refcrash.html diff --git a/tests/wpt/web-platform-tests/css/css-images/inheritance.html b/tests/wpt/tests/css/css-images/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/inheritance.html rename to tests/wpt/tests/css/css-images/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-images/linear-gradient-1.html b/tests/wpt/tests/css/css-images/linear-gradient-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/linear-gradient-1.html rename to tests/wpt/tests/css/css-images/linear-gradient-1.html diff --git a/tests/wpt/web-platform-tests/css/css-images/linear-gradient-2.html b/tests/wpt/tests/css/css-images/linear-gradient-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/linear-gradient-2.html rename to tests/wpt/tests/css/css-images/linear-gradient-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/linear-gradient-ref.html b/tests/wpt/tests/css/css-images/linear-gradient-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/linear-gradient-ref.html rename to tests/wpt/tests/css/css-images/linear-gradient-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-conic-2-ref.html b/tests/wpt/tests/css/css-images/multiple-position-color-stop-conic-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-conic-2-ref.html rename to tests/wpt/tests/css/css-images/multiple-position-color-stop-conic-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-conic-2.html b/tests/wpt/tests/css/css-images/multiple-position-color-stop-conic-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-conic-2.html rename to tests/wpt/tests/css/css-images/multiple-position-color-stop-conic-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-conic.html b/tests/wpt/tests/css/css-images/multiple-position-color-stop-conic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-conic.html rename to tests/wpt/tests/css/css-images/multiple-position-color-stop-conic.html diff --git a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-linear-2-ref.html b/tests/wpt/tests/css/css-images/multiple-position-color-stop-linear-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-linear-2-ref.html rename to tests/wpt/tests/css/css-images/multiple-position-color-stop-linear-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-linear-2.html b/tests/wpt/tests/css/css-images/multiple-position-color-stop-linear-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-linear-2.html rename to tests/wpt/tests/css/css-images/multiple-position-color-stop-linear-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-linear.html b/tests/wpt/tests/css/css-images/multiple-position-color-stop-linear.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-linear.html rename to tests/wpt/tests/css/css-images/multiple-position-color-stop-linear.html diff --git a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-radial-2-ref.html b/tests/wpt/tests/css/css-images/multiple-position-color-stop-radial-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-radial-2-ref.html rename to tests/wpt/tests/css/css-images/multiple-position-color-stop-radial-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-radial-2.html b/tests/wpt/tests/css/css-images/multiple-position-color-stop-radial-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-radial-2.html rename to tests/wpt/tests/css/css-images/multiple-position-color-stop-radial-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-radial.html b/tests/wpt/tests/css/css-images/multiple-position-color-stop-radial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/multiple-position-color-stop-radial.html rename to tests/wpt/tests/css/css-images/multiple-position-color-stop-radial.html diff --git a/tests/wpt/web-platform-tests/css/css-images/normalization-conic-2.html b/tests/wpt/tests/css/css-images/normalization-conic-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/normalization-conic-2.html rename to tests/wpt/tests/css/css-images/normalization-conic-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/normalization-conic-degenerate.html b/tests/wpt/tests/css/css-images/normalization-conic-degenerate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/normalization-conic-degenerate.html rename to tests/wpt/tests/css/css-images/normalization-conic-degenerate.html diff --git a/tests/wpt/web-platform-tests/css/css-images/normalization-conic.html b/tests/wpt/tests/css/css-images/normalization-conic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/normalization-conic.html rename to tests/wpt/tests/css/css-images/normalization-conic.html diff --git a/tests/wpt/web-platform-tests/css/css-images/normalization-linear-2.html b/tests/wpt/tests/css/css-images/normalization-linear-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/normalization-linear-2.html rename to tests/wpt/tests/css/css-images/normalization-linear-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/normalization-linear-degenerate.html b/tests/wpt/tests/css/css-images/normalization-linear-degenerate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/normalization-linear-degenerate.html rename to tests/wpt/tests/css/css-images/normalization-linear-degenerate.html diff --git a/tests/wpt/web-platform-tests/css/css-images/normalization-linear.html b/tests/wpt/tests/css/css-images/normalization-linear.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/normalization-linear.html rename to tests/wpt/tests/css/css-images/normalization-linear.html diff --git a/tests/wpt/web-platform-tests/css/css-images/normalization-radial-2.html b/tests/wpt/tests/css/css-images/normalization-radial-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/normalization-radial-2.html rename to tests/wpt/tests/css/css-images/normalization-radial-2.html diff --git a/tests/wpt/web-platform-tests/css/css-images/normalization-radial-degenerate.html b/tests/wpt/tests/css/css-images/normalization-radial-degenerate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/normalization-radial-degenerate.html rename to tests/wpt/tests/css/css-images/normalization-radial-degenerate.html diff --git a/tests/wpt/web-platform-tests/css/css-images/normalization-radial.html b/tests/wpt/tests/css/css-images/normalization-radial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/normalization-radial.html rename to tests/wpt/tests/css/css-images/normalization-radial.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001-ref.html b/tests/wpt/tests/css/css-images/object-fit-contain-png-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001-ref.html rename to tests/wpt/tests/css/css-images/object-fit-contain-png-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001c.html b/tests/wpt/tests/css/css-images/object-fit-contain-png-001c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001c.html rename to tests/wpt/tests/css/css-images/object-fit-contain-png-001c.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001e.html b/tests/wpt/tests/css/css-images/object-fit-contain-png-001e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001e.html rename to tests/wpt/tests/css/css-images/object-fit-contain-png-001e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001i.html b/tests/wpt/tests/css/css-images/object-fit-contain-png-001i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001i.html rename to tests/wpt/tests/css/css-images/object-fit-contain-png-001i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001o.html b/tests/wpt/tests/css/css-images/object-fit-contain-png-001o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001o.html rename to tests/wpt/tests/css/css-images/object-fit-contain-png-001o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001p.html b/tests/wpt/tests/css/css-images/object-fit-contain-png-001p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-001p.html rename to tests/wpt/tests/css/css-images/object-fit-contain-png-001p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002-ref.html b/tests/wpt/tests/css/css-images/object-fit-contain-png-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002-ref.html rename to tests/wpt/tests/css/css-images/object-fit-contain-png-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002c.html b/tests/wpt/tests/css/css-images/object-fit-contain-png-002c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002c.html rename to tests/wpt/tests/css/css-images/object-fit-contain-png-002c.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002e.html b/tests/wpt/tests/css/css-images/object-fit-contain-png-002e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002e.html rename to tests/wpt/tests/css/css-images/object-fit-contain-png-002e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002i.html b/tests/wpt/tests/css/css-images/object-fit-contain-png-002i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002i.html rename to tests/wpt/tests/css/css-images/object-fit-contain-png-002i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002o.html b/tests/wpt/tests/css/css-images/object-fit-contain-png-002o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002o.html rename to tests/wpt/tests/css/css-images/object-fit-contain-png-002o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002p.html b/tests/wpt/tests/css/css-images/object-fit-contain-png-002p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-png-002p.html rename to tests/wpt/tests/css/css-images/object-fit-contain-png-002p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-001-ref.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-001-ref.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-001e.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-001e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-001e.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-001e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-001i.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-001i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-001i.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-001i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-001o.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-001o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-001o.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-001o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-001p.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-001p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-001p.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-001p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-002-ref.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-002-ref.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-002e.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-002e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-002e.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-002e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-002i.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-002i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-002i.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-002i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-002o.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-002o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-002o.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-002o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-002p.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-002p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-002p.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-002p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-003-ref.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-003-ref.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-003e.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-003e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-003e.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-003e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-003i.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-003i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-003i.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-003i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-003o.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-003o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-003o.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-003o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-003p.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-003p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-003p.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-003p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-004-ref.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-004-ref.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-004e.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-004e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-004e.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-004e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-004i.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-004i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-004i.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-004i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-004o.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-004o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-004o.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-004o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-004p.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-004p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-004p.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-004p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-005-ref.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-005-ref.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-005e.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-005e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-005e.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-005e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-005i.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-005i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-005i.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-005i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-005o.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-005o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-005o.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-005o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-005p.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-005p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-005p.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-005p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-006-ref.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-006-ref.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-006e.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-006e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-006e.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-006e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-006i.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-006i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-006i.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-006i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-006o.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-006o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-006o.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-006o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-006p.html b/tests/wpt/tests/css/css-images/object-fit-contain-svg-006p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-contain-svg-006p.html rename to tests/wpt/tests/css/css-images/object-fit-contain-svg-006p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-001-ref.html b/tests/wpt/tests/css/css-images/object-fit-cover-png-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-001-ref.html rename to tests/wpt/tests/css/css-images/object-fit-cover-png-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-001c.html b/tests/wpt/tests/css/css-images/object-fit-cover-png-001c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-001c.html rename to tests/wpt/tests/css/css-images/object-fit-cover-png-001c.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-001e.html b/tests/wpt/tests/css/css-images/object-fit-cover-png-001e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-001e.html rename to tests/wpt/tests/css/css-images/object-fit-cover-png-001e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-001i.html b/tests/wpt/tests/css/css-images/object-fit-cover-png-001i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-001i.html rename to tests/wpt/tests/css/css-images/object-fit-cover-png-001i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-001o.html b/tests/wpt/tests/css/css-images/object-fit-cover-png-001o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-001o.html rename to tests/wpt/tests/css/css-images/object-fit-cover-png-001o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-001p.html b/tests/wpt/tests/css/css-images/object-fit-cover-png-001p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-001p.html rename to tests/wpt/tests/css/css-images/object-fit-cover-png-001p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-002-ref.html b/tests/wpt/tests/css/css-images/object-fit-cover-png-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-002-ref.html rename to tests/wpt/tests/css/css-images/object-fit-cover-png-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-002c.html b/tests/wpt/tests/css/css-images/object-fit-cover-png-002c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-002c.html rename to tests/wpt/tests/css/css-images/object-fit-cover-png-002c.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-002e.html b/tests/wpt/tests/css/css-images/object-fit-cover-png-002e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-002e.html rename to tests/wpt/tests/css/css-images/object-fit-cover-png-002e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-002i.html b/tests/wpt/tests/css/css-images/object-fit-cover-png-002i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-002i.html rename to tests/wpt/tests/css/css-images/object-fit-cover-png-002i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-002o.html b/tests/wpt/tests/css/css-images/object-fit-cover-png-002o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-002o.html rename to tests/wpt/tests/css/css-images/object-fit-cover-png-002o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-002p.html b/tests/wpt/tests/css/css-images/object-fit-cover-png-002p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-png-002p.html rename to tests/wpt/tests/css/css-images/object-fit-cover-png-002p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-001-ref.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-001-ref.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-001e.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-001e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-001e.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-001e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-001i.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-001i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-001i.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-001i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-001o.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-001o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-001o.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-001o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-001p.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-001p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-001p.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-001p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-002-ref.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-002-ref.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-002e.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-002e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-002e.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-002e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-002i.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-002i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-002i.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-002i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-002o.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-002o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-002o.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-002o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-002p.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-002p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-002p.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-002p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-003-ref.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-003-ref.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-003e.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-003e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-003e.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-003e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-003i.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-003i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-003i.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-003i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-003o.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-003o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-003o.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-003o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-003p.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-003p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-003p.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-003p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-004-ref.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-004-ref.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-004e.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-004e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-004e.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-004e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-004i.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-004i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-004i.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-004i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-004o.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-004o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-004o.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-004o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-004p.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-004p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-004p.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-004p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-005-ref.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-005-ref.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-005e.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-005e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-005e.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-005e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-005i.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-005i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-005i.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-005i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-005o.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-005o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-005o.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-005o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-005p.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-005p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-005p.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-005p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-006-ref.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-006-ref.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-006e.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-006e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-006e.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-006e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-006i.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-006i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-006i.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-006i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-006o.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-006o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-006o.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-006o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-006p.html b/tests/wpt/tests/css/css-images/object-fit-cover-svg-006p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-cover-svg-006p.html rename to tests/wpt/tests/css/css-images/object-fit-cover-svg-006p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-dyn-aspect-ratio-001-ref.html b/tests/wpt/tests/css/css-images/object-fit-dyn-aspect-ratio-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-dyn-aspect-ratio-001-ref.html rename to tests/wpt/tests/css/css-images/object-fit-dyn-aspect-ratio-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-dyn-aspect-ratio-001.html b/tests/wpt/tests/css/css-images/object-fit-dyn-aspect-ratio-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-dyn-aspect-ratio-001.html rename to tests/wpt/tests/css/css-images/object-fit-dyn-aspect-ratio-001.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-dyn-aspect-ratio-002-ref.html b/tests/wpt/tests/css/css-images/object-fit-dyn-aspect-ratio-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-dyn-aspect-ratio-002-ref.html rename to tests/wpt/tests/css/css-images/object-fit-dyn-aspect-ratio-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-dyn-aspect-ratio-002.html b/tests/wpt/tests/css/css-images/object-fit-dyn-aspect-ratio-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-dyn-aspect-ratio-002.html rename to tests/wpt/tests/css/css-images/object-fit-dyn-aspect-ratio-002.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001-ref.html b/tests/wpt/tests/css/css-images/object-fit-fill-png-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001-ref.html rename to tests/wpt/tests/css/css-images/object-fit-fill-png-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001c.html b/tests/wpt/tests/css/css-images/object-fit-fill-png-001c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001c.html rename to tests/wpt/tests/css/css-images/object-fit-fill-png-001c.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001e.html b/tests/wpt/tests/css/css-images/object-fit-fill-png-001e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001e.html rename to tests/wpt/tests/css/css-images/object-fit-fill-png-001e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001i.html b/tests/wpt/tests/css/css-images/object-fit-fill-png-001i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001i.html rename to tests/wpt/tests/css/css-images/object-fit-fill-png-001i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001o.html b/tests/wpt/tests/css/css-images/object-fit-fill-png-001o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001o.html rename to tests/wpt/tests/css/css-images/object-fit-fill-png-001o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001p.html b/tests/wpt/tests/css/css-images/object-fit-fill-png-001p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-001p.html rename to tests/wpt/tests/css/css-images/object-fit-fill-png-001p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002-ref.html b/tests/wpt/tests/css/css-images/object-fit-fill-png-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002-ref.html rename to tests/wpt/tests/css/css-images/object-fit-fill-png-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002c.html b/tests/wpt/tests/css/css-images/object-fit-fill-png-002c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002c.html rename to tests/wpt/tests/css/css-images/object-fit-fill-png-002c.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002e.html b/tests/wpt/tests/css/css-images/object-fit-fill-png-002e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002e.html rename to tests/wpt/tests/css/css-images/object-fit-fill-png-002e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002i.html b/tests/wpt/tests/css/css-images/object-fit-fill-png-002i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002i.html rename to tests/wpt/tests/css/css-images/object-fit-fill-png-002i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002o.html b/tests/wpt/tests/css/css-images/object-fit-fill-png-002o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002o.html rename to tests/wpt/tests/css/css-images/object-fit-fill-png-002o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002p.html b/tests/wpt/tests/css/css-images/object-fit-fill-png-002p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-png-002p.html rename to tests/wpt/tests/css/css-images/object-fit-fill-png-002p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-001-ref.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-001-ref.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-001e.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-001e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-001e.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-001e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-001i.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-001i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-001i.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-001i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-001o.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-001o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-001o.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-001o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-001p.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-001p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-001p.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-001p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-002-ref.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-002-ref.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-002e.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-002e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-002e.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-002e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-002i.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-002i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-002i.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-002i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-002o.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-002o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-002o.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-002o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-002p.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-002p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-002p.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-002p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-003-ref.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-003-ref.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-003e.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-003e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-003e.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-003e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-003i.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-003i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-003i.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-003i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-003o.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-003o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-003o.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-003o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-003p.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-003p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-003p.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-003p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-004-ref.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-004-ref.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-004e.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-004e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-004e.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-004e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-004i.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-004i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-004i.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-004i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-004o.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-004o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-004o.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-004o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-004p.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-004p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-004p.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-004p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-005-ref.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-005-ref.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-005e.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-005e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-005e.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-005e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-005i.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-005i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-005i.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-005i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-005o.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-005o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-005o.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-005o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-005p.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-005p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-005p.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-005p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-006-ref.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-006-ref.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-006e.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-006e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-006e.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-006e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-006i.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-006i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-006i.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-006i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-006o.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-006o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-006o.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-006o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-006p.html b/tests/wpt/tests/css/css-images/object-fit-fill-svg-006p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-fill-svg-006p.html rename to tests/wpt/tests/css/css-images/object-fit-fill-svg-006p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-001-ref.html b/tests/wpt/tests/css/css-images/object-fit-none-png-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-001-ref.html rename to tests/wpt/tests/css/css-images/object-fit-none-png-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-001c.html b/tests/wpt/tests/css/css-images/object-fit-none-png-001c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-001c.html rename to tests/wpt/tests/css/css-images/object-fit-none-png-001c.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-001e.html b/tests/wpt/tests/css/css-images/object-fit-none-png-001e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-001e.html rename to tests/wpt/tests/css/css-images/object-fit-none-png-001e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-001i.html b/tests/wpt/tests/css/css-images/object-fit-none-png-001i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-001i.html rename to tests/wpt/tests/css/css-images/object-fit-none-png-001i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-001o.html b/tests/wpt/tests/css/css-images/object-fit-none-png-001o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-001o.html rename to tests/wpt/tests/css/css-images/object-fit-none-png-001o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-001p.html b/tests/wpt/tests/css/css-images/object-fit-none-png-001p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-001p.html rename to tests/wpt/tests/css/css-images/object-fit-none-png-001p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-002-ref.html b/tests/wpt/tests/css/css-images/object-fit-none-png-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-002-ref.html rename to tests/wpt/tests/css/css-images/object-fit-none-png-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-002c.html b/tests/wpt/tests/css/css-images/object-fit-none-png-002c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-002c.html rename to tests/wpt/tests/css/css-images/object-fit-none-png-002c.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-002e.html b/tests/wpt/tests/css/css-images/object-fit-none-png-002e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-002e.html rename to tests/wpt/tests/css/css-images/object-fit-none-png-002e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-002i.html b/tests/wpt/tests/css/css-images/object-fit-none-png-002i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-002i.html rename to tests/wpt/tests/css/css-images/object-fit-none-png-002i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-002o.html b/tests/wpt/tests/css/css-images/object-fit-none-png-002o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-002o.html rename to tests/wpt/tests/css/css-images/object-fit-none-png-002o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-002p.html b/tests/wpt/tests/css/css-images/object-fit-none-png-002p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-png-002p.html rename to tests/wpt/tests/css/css-images/object-fit-none-png-002p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-001-ref.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-001-ref.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-001e.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-001e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-001e.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-001e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-001i.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-001i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-001i.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-001i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-001o.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-001o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-001o.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-001o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-001p.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-001p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-001p.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-001p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-002-ref.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-002-ref.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-002e.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-002e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-002e.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-002e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-002i.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-002i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-002i.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-002i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-002o.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-002o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-002o.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-002o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-002p.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-002p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-002p.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-002p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-003-ref.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-003-ref.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-003e.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-003e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-003e.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-003e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-003i.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-003i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-003i.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-003i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-003o.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-003o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-003o.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-003o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-003p.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-003p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-003p.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-003p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-004-ref.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-004-ref.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-004e.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-004e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-004e.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-004e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-004i.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-004i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-004i.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-004i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-004o.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-004o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-004o.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-004o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-004p.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-004p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-004p.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-004p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-005-ref.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-005-ref.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-005e.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-005e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-005e.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-005e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-005i.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-005i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-005i.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-005i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-005o.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-005o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-005o.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-005o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-005p.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-005p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-005p.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-005p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-006-ref.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-006-ref.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-006e.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-006e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-006e.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-006e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-006i.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-006i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-006i.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-006i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-006o.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-006o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-006o.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-006o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-006p.html b/tests/wpt/tests/css/css-images/object-fit-none-svg-006p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-none-svg-006p.html rename to tests/wpt/tests/css/css-images/object-fit-none-svg-006p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-001-ref.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-png-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-001-ref.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-png-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-001c.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-png-001c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-001c.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-png-001c.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-001e.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-png-001e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-001e.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-png-001e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-001i.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-png-001i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-001i.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-png-001i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-001o.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-png-001o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-001o.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-png-001o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-001p.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-png-001p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-001p.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-png-001p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-002-ref.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-png-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-002-ref.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-png-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-002c.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-png-002c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-002c.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-png-002c.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-002e.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-png-002e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-002e.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-png-002e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-002i.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-png-002i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-002i.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-png-002i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-002o.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-png-002o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-002o.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-png-002o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-002p.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-png-002p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-png-002p.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-png-002p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-001-ref.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-001-ref.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-001e.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-001e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-001e.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-001e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-001i.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-001i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-001i.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-001i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-001o.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-001o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-001o.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-001o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-001p.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-001p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-001p.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-001p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-002-ref.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-002-ref.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-002e.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-002e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-002e.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-002e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-002i.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-002i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-002i.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-002i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-002o.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-002o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-002o.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-002o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-002p.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-002p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-002p.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-002p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-003-ref.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-003-ref.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-003e.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-003e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-003e.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-003e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-003i.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-003i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-003i.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-003i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-003o.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-003o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-003o.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-003o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-003p.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-003p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-003p.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-003p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-004-ref.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-004-ref.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-004e.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-004e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-004e.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-004e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-004i.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-004i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-004i.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-004i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-004o.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-004o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-004o.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-004o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-004p.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-004p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-004p.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-004p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-005-ref.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-005-ref.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-005e.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-005e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-005e.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-005e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-005i.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-005i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-005i.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-005i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-005o.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-005o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-005o.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-005o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-005p.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-005p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-005p.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-005p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-006-ref.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-006-ref.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-006e.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-006e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-006e.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-006e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-006i.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-006i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-006i.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-006i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-006o.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-006o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-006o.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-006o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-006p.html b/tests/wpt/tests/css/css-images/object-fit-scale-down-svg-006p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-fit-scale-down-svg-006p.html rename to tests/wpt/tests/css/css-images/object-fit-scale-down-svg-006p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-png-001-ref.html b/tests/wpt/tests/css/css-images/object-position-png-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-png-001-ref.html rename to tests/wpt/tests/css/css-images/object-position-png-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-png-001c.html b/tests/wpt/tests/css/css-images/object-position-png-001c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-png-001c.html rename to tests/wpt/tests/css/css-images/object-position-png-001c.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-png-001e.html b/tests/wpt/tests/css/css-images/object-position-png-001e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-png-001e.html rename to tests/wpt/tests/css/css-images/object-position-png-001e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-png-001i.html b/tests/wpt/tests/css/css-images/object-position-png-001i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-png-001i.html rename to tests/wpt/tests/css/css-images/object-position-png-001i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-png-001o.html b/tests/wpt/tests/css/css-images/object-position-png-001o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-png-001o.html rename to tests/wpt/tests/css/css-images/object-position-png-001o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-png-001p.html b/tests/wpt/tests/css/css-images/object-position-png-001p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-png-001p.html rename to tests/wpt/tests/css/css-images/object-position-png-001p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-png-002-ref.html b/tests/wpt/tests/css/css-images/object-position-png-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-png-002-ref.html rename to tests/wpt/tests/css/css-images/object-position-png-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-png-002c.html b/tests/wpt/tests/css/css-images/object-position-png-002c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-png-002c.html rename to tests/wpt/tests/css/css-images/object-position-png-002c.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-png-002e.html b/tests/wpt/tests/css/css-images/object-position-png-002e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-png-002e.html rename to tests/wpt/tests/css/css-images/object-position-png-002e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-png-002i.html b/tests/wpt/tests/css/css-images/object-position-png-002i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-png-002i.html rename to tests/wpt/tests/css/css-images/object-position-png-002i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-png-002o.html b/tests/wpt/tests/css/css-images/object-position-png-002o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-png-002o.html rename to tests/wpt/tests/css/css-images/object-position-png-002o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-png-002p.html b/tests/wpt/tests/css/css-images/object-position-png-002p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-png-002p.html rename to tests/wpt/tests/css/css-images/object-position-png-002p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-svg-001-ref.html b/tests/wpt/tests/css/css-images/object-position-svg-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-svg-001-ref.html rename to tests/wpt/tests/css/css-images/object-position-svg-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-svg-001e.html b/tests/wpt/tests/css/css-images/object-position-svg-001e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-svg-001e.html rename to tests/wpt/tests/css/css-images/object-position-svg-001e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-svg-001i.html b/tests/wpt/tests/css/css-images/object-position-svg-001i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-svg-001i.html rename to tests/wpt/tests/css/css-images/object-position-svg-001i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-svg-001o.html b/tests/wpt/tests/css/css-images/object-position-svg-001o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-svg-001o.html rename to tests/wpt/tests/css/css-images/object-position-svg-001o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-svg-001p.html b/tests/wpt/tests/css/css-images/object-position-svg-001p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-svg-001p.html rename to tests/wpt/tests/css/css-images/object-position-svg-001p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-svg-002-ref.html b/tests/wpt/tests/css/css-images/object-position-svg-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-svg-002-ref.html rename to tests/wpt/tests/css/css-images/object-position-svg-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-svg-002e.html b/tests/wpt/tests/css/css-images/object-position-svg-002e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-svg-002e.html rename to tests/wpt/tests/css/css-images/object-position-svg-002e.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-svg-002i.html b/tests/wpt/tests/css/css-images/object-position-svg-002i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-svg-002i.html rename to tests/wpt/tests/css/css-images/object-position-svg-002i.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-svg-002o.html b/tests/wpt/tests/css/css-images/object-position-svg-002o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-svg-002o.html rename to tests/wpt/tests/css/css-images/object-position-svg-002o.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-position-svg-002p.html b/tests/wpt/tests/css/css-images/object-position-svg-002p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-position-svg-002p.html rename to tests/wpt/tests/css/css-images/object-position-svg-002p.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-contain-intrinsic-size-ref.html b/tests/wpt/tests/css/css-images/object-view-box-contain-intrinsic-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-contain-intrinsic-size-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-contain-intrinsic-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-contain-intrinsic-size.html b/tests/wpt/tests/css/css-images/object-view-box-contain-intrinsic-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-contain-intrinsic-size.html rename to tests/wpt/tests/css/css-images/object-view-box-contain-intrinsic-size.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-empty-bounds-ref.html b/tests/wpt/tests/css/css-images/object-view-box-empty-bounds-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-empty-bounds-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-empty-bounds-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-empty-bounds.html b/tests/wpt/tests/css/css-images/object-view-box-empty-bounds.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-empty-bounds.html rename to tests/wpt/tests/css/css-images/object-view-box-empty-bounds.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-canvas-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-contain-canvas-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-canvas-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-contain-canvas-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-canvas.html b/tests/wpt/tests/css/css-images/object-view-box-fit-contain-canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-canvas.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-contain-canvas.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-img-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-contain-img-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-img-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-contain-img-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-img.html b/tests/wpt/tests/css/css-images/object-view-box-fit-contain-img.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-img.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-contain-img.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-svg-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-contain-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-svg-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-contain-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-svg.html b/tests/wpt/tests/css/css-images/object-view-box-fit-contain-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-svg.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-contain-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-video-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-contain-video-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-video-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-contain-video-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-video.html b/tests/wpt/tests/css/css-images/object-view-box-fit-contain-video.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-contain-video.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-contain-video.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-canvas-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-cover-canvas-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-canvas-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-cover-canvas-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-canvas.html b/tests/wpt/tests/css/css-images/object-view-box-fit-cover-canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-canvas.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-cover-canvas.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-img-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-cover-img-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-img-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-cover-img-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-img.html b/tests/wpt/tests/css/css-images/object-view-box-fit-cover-img.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-img.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-cover-img.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-svg-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-cover-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-svg-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-cover-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-svg.html b/tests/wpt/tests/css/css-images/object-view-box-fit-cover-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-svg.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-cover-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-video-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-cover-video-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-video-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-cover-video-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-video.html b/tests/wpt/tests/css/css-images/object-view-box-fit-cover-video.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-cover-video.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-cover-video.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-canvas-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-fill-canvas-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-canvas-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-fill-canvas-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-canvas.html b/tests/wpt/tests/css/css-images/object-view-box-fit-fill-canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-canvas.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-fill-canvas.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-img-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-fill-img-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-img-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-fill-img-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-img.html b/tests/wpt/tests/css/css-images/object-view-box-fit-fill-img.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-img.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-fill-img.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-svg-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-fill-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-svg-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-fill-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-svg.html b/tests/wpt/tests/css/css-images/object-view-box-fit-fill-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-svg.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-fill-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-video-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-fill-video-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-video-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-fill-video-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-video.html b/tests/wpt/tests/css/css-images/object-view-box-fit-fill-video.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-fill-video.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-fill-video.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-canvas-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-none-canvas-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-canvas-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-none-canvas-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-canvas.html b/tests/wpt/tests/css/css-images/object-view-box-fit-none-canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-canvas.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-none-canvas.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-img-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-none-img-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-img-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-none-img-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-img.html b/tests/wpt/tests/css/css-images/object-view-box-fit-none-img.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-img.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-none-img.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-svg-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-none-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-svg-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-none-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-svg.html b/tests/wpt/tests/css/css-images/object-view-box-fit-none-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-svg.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-none-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-video-ref.html b/tests/wpt/tests/css/css-images/object-view-box-fit-none-video-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-video-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-none-video-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-video.html b/tests/wpt/tests/css/css-images/object-view-box-fit-none-video.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-fit-none-video.html rename to tests/wpt/tests/css/css-images/object-view-box-fit-none-video.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-iframe-ref.html b/tests/wpt/tests/css/css-images/object-view-box-iframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-iframe-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-iframe-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-iframe.html b/tests/wpt/tests/css/css-images/object-view-box-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-iframe.html rename to tests/wpt/tests/css/css-images/object-view-box-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-negative-bounds-ref.html b/tests/wpt/tests/css/css-images/object-view-box-negative-bounds-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-negative-bounds-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-negative-bounds-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-negative-bounds.html b/tests/wpt/tests/css/css-images/object-view-box-negative-bounds.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-negative-bounds.html rename to tests/wpt/tests/css/css-images/object-view-box-negative-bounds.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-parsing.html b/tests/wpt/tests/css/css-images/object-view-box-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-parsing.html rename to tests/wpt/tests/css/css-images/object-view-box-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-property-changed-ref.html b/tests/wpt/tests/css/css-images/object-view-box-property-changed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-property-changed-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-property-changed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-property-changed.html b/tests/wpt/tests/css/css-images/object-view-box-property-changed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-property-changed.html rename to tests/wpt/tests/css/css-images/object-view-box-property-changed.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-rect-auto-ref.html b/tests/wpt/tests/css/css-images/object-view-box-rect-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-rect-auto-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-rect-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-rect-auto.html b/tests/wpt/tests/css/css-images/object-view-box-rect-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-rect-auto.html rename to tests/wpt/tests/css/css-images/object-view-box-rect-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-rect-percentage-ref.html b/tests/wpt/tests/css/css-images/object-view-box-rect-percentage-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-rect-percentage-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-rect-percentage-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-rect-percentage.html b/tests/wpt/tests/css/css-images/object-view-box-rect-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-rect-percentage.html rename to tests/wpt/tests/css/css-images/object-view-box-rect-percentage.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-rect-ref.html b/tests/wpt/tests/css/css-images/object-view-box-rect-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-rect-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-rect-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-rect.html b/tests/wpt/tests/css/css-images/object-view-box-rect.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-rect.html rename to tests/wpt/tests/css/css-images/object-view-box-rect.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-same-size-ref.html b/tests/wpt/tests/css/css-images/object-view-box-same-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-same-size-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-same-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-same-size.html b/tests/wpt/tests/css/css-images/object-view-box-same-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-same-size.html rename to tests/wpt/tests/css/css-images/object-view-box-same-size.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-size-containment-ref.html b/tests/wpt/tests/css/css-images/object-view-box-size-containment-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-size-containment-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-size-containment-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-size-containment.html b/tests/wpt/tests/css/css-images/object-view-box-size-containment.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-size-containment.html rename to tests/wpt/tests/css/css-images/object-view-box-size-containment.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-svg-img-no-size-ref.html b/tests/wpt/tests/css/css-images/object-view-box-svg-img-no-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-svg-img-no-size-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-svg-img-no-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-svg-img-no-size.html b/tests/wpt/tests/css/css-images/object-view-box-svg-img-no-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-svg-img-no-size.html rename to tests/wpt/tests/css/css-images/object-view-box-svg-img-no-size.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-transition-mutation.html b/tests/wpt/tests/css/css-images/object-view-box-transition-mutation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-transition-mutation.html rename to tests/wpt/tests/css/css-images/object-view-box-transition-mutation.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-canvas-ref.html b/tests/wpt/tests/css/css-images/object-view-box-writing-mode-canvas-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-canvas-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-writing-mode-canvas-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-canvas.html b/tests/wpt/tests/css/css-images/object-view-box-writing-mode-canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-canvas.html rename to tests/wpt/tests/css/css-images/object-view-box-writing-mode-canvas.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-img-ref.html b/tests/wpt/tests/css/css-images/object-view-box-writing-mode-img-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-img-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-writing-mode-img-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-img.html b/tests/wpt/tests/css/css-images/object-view-box-writing-mode-img.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-img.html rename to tests/wpt/tests/css/css-images/object-view-box-writing-mode-img.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-svg-ref.html b/tests/wpt/tests/css/css-images/object-view-box-writing-mode-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-svg-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-writing-mode-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-svg.html b/tests/wpt/tests/css/css-images/object-view-box-writing-mode-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-svg.html rename to tests/wpt/tests/css/css-images/object-view-box-writing-mode-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-video-ref.html b/tests/wpt/tests/css/css-images/object-view-box-writing-mode-video-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-video-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-writing-mode-video-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-video.html b/tests/wpt/tests/css/css-images/object-view-box-writing-mode-video.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-writing-mode-video.html rename to tests/wpt/tests/css/css-images/object-view-box-writing-mode-video.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-xywh-percentage-ref.html b/tests/wpt/tests/css/css-images/object-view-box-xywh-percentage-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-xywh-percentage-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-xywh-percentage-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-xywh-percentage.html b/tests/wpt/tests/css/css-images/object-view-box-xywh-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-xywh-percentage.html rename to tests/wpt/tests/css/css-images/object-view-box-xywh-percentage.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-xywh-ref.html b/tests/wpt/tests/css/css-images/object-view-box-xywh-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-xywh-ref.html rename to tests/wpt/tests/css/css-images/object-view-box-xywh-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/object-view-box-xywh.html b/tests/wpt/tests/css/css-images/object-view-box-xywh.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/object-view-box-xywh.html rename to tests/wpt/tests/css/css-images/object-view-box-xywh.html diff --git a/tests/wpt/web-platform-tests/css/css-images/out-of-range-color-stop-conic.html b/tests/wpt/tests/css/css-images/out-of-range-color-stop-conic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/out-of-range-color-stop-conic.html rename to tests/wpt/tests/css/css-images/out-of-range-color-stop-conic.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/gradient-interpolation-method-computed.html b/tests/wpt/tests/css/css-images/parsing/gradient-interpolation-method-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/gradient-interpolation-method-computed.html rename to tests/wpt/tests/css/css-images/parsing/gradient-interpolation-method-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/gradient-interpolation-method-invalid.html b/tests/wpt/tests/css/css-images/parsing/gradient-interpolation-method-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/gradient-interpolation-method-invalid.html rename to tests/wpt/tests/css/css-images/parsing/gradient-interpolation-method-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/gradient-interpolation-method-valid.html b/tests/wpt/tests/css/css-images/parsing/gradient-interpolation-method-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/gradient-interpolation-method-valid.html rename to tests/wpt/tests/css/css-images/parsing/gradient-interpolation-method-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/gradient-position-invalid.html b/tests/wpt/tests/css/css-images/parsing/gradient-position-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/gradient-position-invalid.html rename to tests/wpt/tests/css/css-images/parsing/gradient-position-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/gradient-position-valid.html b/tests/wpt/tests/css/css-images/parsing/gradient-position-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/gradient-position-valid.html rename to tests/wpt/tests/css/css-images/parsing/gradient-position-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/image-orientation-computed.html b/tests/wpt/tests/css/css-images/parsing/image-orientation-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/image-orientation-computed.html rename to tests/wpt/tests/css/css-images/parsing/image-orientation-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/image-orientation-invalid.html b/tests/wpt/tests/css/css-images/parsing/image-orientation-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/image-orientation-invalid.html rename to tests/wpt/tests/css/css-images/parsing/image-orientation-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/image-orientation-valid.html b/tests/wpt/tests/css/css-images/parsing/image-orientation-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/image-orientation-valid.html rename to tests/wpt/tests/css/css-images/parsing/image-orientation-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/image-rendering-computed.html b/tests/wpt/tests/css/css-images/parsing/image-rendering-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/image-rendering-computed.html rename to tests/wpt/tests/css/css-images/parsing/image-rendering-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/image-rendering-invalid.html b/tests/wpt/tests/css/css-images/parsing/image-rendering-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/image-rendering-invalid.html rename to tests/wpt/tests/css/css-images/parsing/image-rendering-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/image-rendering-valid.html b/tests/wpt/tests/css/css-images/parsing/image-rendering-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/image-rendering-valid.html rename to tests/wpt/tests/css/css-images/parsing/image-rendering-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/image-resolution-invalid.html b/tests/wpt/tests/css/css-images/parsing/image-resolution-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/image-resolution-invalid.html rename to tests/wpt/tests/css/css-images/parsing/image-resolution-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/image-resolution-valid.html b/tests/wpt/tests/css/css-images/parsing/image-resolution-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/image-resolution-valid.html rename to tests/wpt/tests/css/css-images/parsing/image-resolution-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/object-fit-computed.html b/tests/wpt/tests/css/css-images/parsing/object-fit-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/object-fit-computed.html rename to tests/wpt/tests/css/css-images/parsing/object-fit-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/object-fit-invalid.html b/tests/wpt/tests/css/css-images/parsing/object-fit-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/object-fit-invalid.html rename to tests/wpt/tests/css/css-images/parsing/object-fit-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/object-fit-valid.html b/tests/wpt/tests/css/css-images/parsing/object-fit-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/object-fit-valid.html rename to tests/wpt/tests/css/css-images/parsing/object-fit-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/object-position-computed.html b/tests/wpt/tests/css/css-images/parsing/object-position-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/object-position-computed.html rename to tests/wpt/tests/css/css-images/parsing/object-position-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/object-position-invalid.html b/tests/wpt/tests/css/css-images/parsing/object-position-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/object-position-invalid.html rename to tests/wpt/tests/css/css-images/parsing/object-position-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/object-position-valid.html b/tests/wpt/tests/css/css-images/parsing/object-position-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/parsing/object-position-valid.html rename to tests/wpt/tests/css/css-images/parsing/object-position-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-images/radial-gradient-transition-hint-crash.html b/tests/wpt/tests/css/css-images/radial-gradient-transition-hint-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/radial-gradient-transition-hint-crash.html rename to tests/wpt/tests/css/css-images/radial-gradient-transition-hint-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-images/reference/100x100-blue-green.html b/tests/wpt/tests/css/css-images/reference/100x100-blue-green.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/reference/100x100-blue-green.html rename to tests/wpt/tests/css/css-images/reference/100x100-blue-green.html diff --git a/tests/wpt/web-platform-tests/css/css-images/reference/100x100-blue.html b/tests/wpt/tests/css/css-images/reference/100x100-blue.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/reference/100x100-blue.html rename to tests/wpt/tests/css/css-images/reference/100x100-blue.html diff --git a/tests/wpt/web-platform-tests/css/css-images/reference/200x200-blue-black-green-red.html b/tests/wpt/tests/css/css-images/reference/200x200-blue-black-green-red.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/reference/200x200-blue-black-green-red.html rename to tests/wpt/tests/css/css-images/reference/200x200-blue-black-green-red.html diff --git a/tests/wpt/web-platform-tests/css/css-images/repeating-conic-gradient-ref.html b/tests/wpt/tests/css/css-images/repeating-conic-gradient-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/repeating-conic-gradient-ref.html rename to tests/wpt/tests/css/css-images/repeating-conic-gradient-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/repeating-conic-gradient.html b/tests/wpt/tests/css/css-images/repeating-conic-gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/repeating-conic-gradient.html rename to tests/wpt/tests/css/css-images/repeating-conic-gradient.html diff --git a/tests/wpt/web-platform-tests/css/css-images/support/1x1-green.gif b/tests/wpt/tests/css/css-images/support/1x1-green.gif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/1x1-green.gif rename to tests/wpt/tests/css/css-images/support/1x1-green.gif diff --git a/tests/wpt/web-platform-tests/css/css-images/support/1x1-green.png b/tests/wpt/tests/css/css-images/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/1x1-green.png rename to tests/wpt/tests/css/css-images/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/1x1-green.svg b/tests/wpt/tests/css/css-images/support/1x1-green.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/1x1-green.svg rename to tests/wpt/tests/css/css-images/support/1x1-green.svg diff --git a/tests/wpt/web-platform-tests/css/css-images/support/1x1-lime.png b/tests/wpt/tests/css/css-images/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/1x1-lime.png rename to tests/wpt/tests/css/css-images/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/1x1-maroon.png b/tests/wpt/tests/css/css-images/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/1x1-maroon.png rename to tests/wpt/tests/css/css-images/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/1x1-navy.png b/tests/wpt/tests/css/css-images/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/1x1-navy.png rename to tests/wpt/tests/css/css-images/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/1x1-red.png b/tests/wpt/tests/css/css-images/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/1x1-red.png rename to tests/wpt/tests/css/css-images/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/1x1-white.png b/tests/wpt/tests/css/css-images/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/1x1-white.png rename to tests/wpt/tests/css/css-images/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/60x60-gg-rr.png b/tests/wpt/tests/css/css-images/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/60x60-gg-rr.png rename to tests/wpt/tests/css/css-images/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/60x60-green.png b/tests/wpt/tests/css/css-images/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/60x60-green.png rename to tests/wpt/tests/css/css-images/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/a-green.css b/tests/wpt/tests/css/css-images/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/a-green.css rename to tests/wpt/tests/css/css-images/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/css-images/support/b-green.css b/tests/wpt/tests/css/css-images/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/b-green.css rename to tests/wpt/tests/css/css-images/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/css-images/support/blue-green-red-yellow-50x100.svg b/tests/wpt/tests/css/css-images/support/blue-green-red-yellow-50x100.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/blue-green-red-yellow-50x100.svg rename to tests/wpt/tests/css/css-images/support/blue-green-red-yellow-50x100.svg diff --git a/tests/wpt/web-platform-tests/css/css-images/support/blue-green-red-yellow-no-size.svg b/tests/wpt/tests/css/css-images/support/blue-green-red-yellow-no-size.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/blue-green-red-yellow-no-size.svg rename to tests/wpt/tests/css/css-images/support/blue-green-red-yellow-no-size.svg diff --git a/tests/wpt/web-platform-tests/css/css-images/support/c-red.css b/tests/wpt/tests/css/css-images/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/c-red.css rename to tests/wpt/tests/css/css-images/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/css-images/support/cat.png b/tests/wpt/tests/css/css-images/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/cat.png rename to tests/wpt/tests/css/css-images/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/colors-16x8-noSize.svg b/tests/wpt/tests/css/css-images/support/colors-16x8-noSize.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/colors-16x8-noSize.svg rename to tests/wpt/tests/css/css-images/support/colors-16x8-noSize.svg diff --git a/tests/wpt/web-platform-tests/css/css-images/support/colors-16x8-parDefault.svg b/tests/wpt/tests/css/css-images/support/colors-16x8-parDefault.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/colors-16x8-parDefault.svg rename to tests/wpt/tests/css/css-images/support/colors-16x8-parDefault.svg diff --git a/tests/wpt/web-platform-tests/css/css-images/support/colors-16x8.png b/tests/wpt/tests/css/css-images/support/colors-16x8.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/colors-16x8.png rename to tests/wpt/tests/css/css-images/support/colors-16x8.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/colors-16x8.svg b/tests/wpt/tests/css/css-images/support/colors-16x8.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/colors-16x8.svg rename to tests/wpt/tests/css/css-images/support/colors-16x8.svg diff --git a/tests/wpt/web-platform-tests/css/css-images/support/colors-8x16-noSize.svg b/tests/wpt/tests/css/css-images/support/colors-8x16-noSize.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/colors-8x16-noSize.svg rename to tests/wpt/tests/css/css-images/support/colors-8x16-noSize.svg diff --git a/tests/wpt/web-platform-tests/css/css-images/support/colors-8x16-parDefault.svg b/tests/wpt/tests/css/css-images/support/colors-8x16-parDefault.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/colors-8x16-parDefault.svg rename to tests/wpt/tests/css/css-images/support/colors-8x16-parDefault.svg diff --git a/tests/wpt/web-platform-tests/css/css-images/support/colors-8x16.png b/tests/wpt/tests/css/css-images/support/colors-8x16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/colors-8x16.png rename to tests/wpt/tests/css/css-images/support/colors-8x16.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/colors-8x16.svg b/tests/wpt/tests/css/css-images/support/colors-8x16.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/colors-8x16.svg rename to tests/wpt/tests/css/css-images/support/colors-8x16.svg diff --git a/tests/wpt/web-platform-tests/css/css-images/support/exif-orientation-6-ru.jpg b/tests/wpt/tests/css/css-images/support/exif-orientation-6-ru.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/exif-orientation-6-ru.jpg rename to tests/wpt/tests/css/css-images/support/exif-orientation-6-ru.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/support/import-green.css b/tests/wpt/tests/css/css-images/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/import-green.css rename to tests/wpt/tests/css/css-images/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/css-images/support/import-red.css b/tests/wpt/tests/css/css-images/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/import-red.css rename to tests/wpt/tests/css/css-images/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/css-images/support/intrinsic-size.jpg b/tests/wpt/tests/css/css-images/support/intrinsic-size.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/intrinsic-size.jpg rename to tests/wpt/tests/css/css-images/support/intrinsic-size.jpg diff --git a/tests/wpt/web-platform-tests/css/css-images/support/intrinsic-size.png b/tests/wpt/tests/css/css-images/support/intrinsic-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/intrinsic-size.png rename to tests/wpt/tests/css/css-images/support/intrinsic-size.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/css-images/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/css-images/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/css-images/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/css-images/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/css-images/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/css-images/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/pattern-tr.png b/tests/wpt/tests/css/css-images/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/pattern-tr.png rename to tests/wpt/tests/css/css-images/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/ruler-h-50%.png b/tests/wpt/tests/css/css-images/support/ruler-h-50%.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/ruler-h-50%.png rename to tests/wpt/tests/css/css-images/support/ruler-h-50%.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/ruler-h-50px.png b/tests/wpt/tests/css/css-images/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/ruler-h-50px.png rename to tests/wpt/tests/css/css-images/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/ruler-v-100px.png b/tests/wpt/tests/css/css-images/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/ruler-v-100px.png rename to tests/wpt/tests/css/css-images/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/ruler-v-50px.png b/tests/wpt/tests/css/css-images/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/ruler-v-50px.png rename to tests/wpt/tests/css/css-images/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/small-border.png b/tests/wpt/tests/css/css-images/support/small-border.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/small-border.png rename to tests/wpt/tests/css/css-images/support/small-border.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/square-purple.png b/tests/wpt/tests/css/css-images/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/square-purple.png rename to tests/wpt/tests/css/css-images/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/square-teal.png b/tests/wpt/tests/css/css-images/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/square-teal.png rename to tests/wpt/tests/css/css-images/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/square-white.png b/tests/wpt/tests/css/css-images/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/square-white.png rename to tests/wpt/tests/css/css-images/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/support/swatch-green.png b/tests/wpt/tests/css/css-images/support/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/support/swatch-green.png rename to tests/wpt/tests/css/css-images/support/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/support/swatch-red.png b/tests/wpt/tests/css/css-images/support/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/support/swatch-red.png rename to tests/wpt/tests/css/css-images/support/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/swatch-blue.png b/tests/wpt/tests/css/css-images/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/swatch-blue.png rename to tests/wpt/tests/css/css-images/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/swatch-green.png b/tests/wpt/tests/css/css-images/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/swatch-green.png rename to tests/wpt/tests/css/css-images/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/swatch-lime.png b/tests/wpt/tests/css/css-images/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/swatch-lime.png rename to tests/wpt/tests/css/css-images/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/swatch-orange.png b/tests/wpt/tests/css/css-images/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/swatch-orange.png rename to tests/wpt/tests/css/css-images/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/swatch-red.png b/tests/wpt/tests/css/css-images/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/swatch-red.png rename to tests/wpt/tests/css/css-images/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/swatch-white.png b/tests/wpt/tests/css/css-images/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/swatch-white.png rename to tests/wpt/tests/css/css-images/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/swatch-yellow.png b/tests/wpt/tests/css/css-images/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/swatch-yellow.png rename to tests/wpt/tests/css/css-images/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/test-bl.png b/tests/wpt/tests/css/css-images/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/test-bl.png rename to tests/wpt/tests/css/css-images/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/test-br.png b/tests/wpt/tests/css/css-images/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/test-br.png rename to tests/wpt/tests/css/css-images/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/test-inner-half-size.png b/tests/wpt/tests/css/css-images/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/test-inner-half-size.png rename to tests/wpt/tests/css/css-images/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/test-outer.png b/tests/wpt/tests/css/css-images/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/test-outer.png rename to tests/wpt/tests/css/css-images/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/test-tl.png b/tests/wpt/tests/css/css-images/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/test-tl.png rename to tests/wpt/tests/css/css-images/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/test-tr.png b/tests/wpt/tests/css/css-images/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/test-tr.png rename to tests/wpt/tests/css/css-images/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-images/support/testHelper.js b/tests/wpt/tests/css/css-images/support/testHelper.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/support/testHelper.js rename to tests/wpt/tests/css/css-images/support/testHelper.js diff --git a/tests/wpt/web-platform-tests/css/css-images/tiled-conic-gradients-ref.html b/tests/wpt/tests/css/css-images/tiled-conic-gradients-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tiled-conic-gradients-ref.html rename to tests/wpt/tests/css/css-images/tiled-conic-gradients-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tiled-conic-gradients.html b/tests/wpt/tests/css/css-images/tiled-conic-gradients.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tiled-conic-gradients.html rename to tests/wpt/tests/css/css-images/tiled-conic-gradients.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tiled-gradients-ref.html b/tests/wpt/tests/css/css-images/tiled-gradients-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tiled-gradients-ref.html rename to tests/wpt/tests/css/css-images/tiled-gradients-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tiled-gradients.html b/tests/wpt/tests/css/css-images/tiled-gradients.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tiled-gradients.html rename to tests/wpt/tests/css/css-images/tiled-gradients.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tiled-radial-gradients-ref.html b/tests/wpt/tests/css/css-images/tiled-radial-gradients-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tiled-radial-gradients-ref.html rename to tests/wpt/tests/css/css-images/tiled-radial-gradients-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tiled-radial-gradients.html b/tests/wpt/tests/css/css-images/tiled-radial-gradients.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tiled-radial-gradients.html rename to tests/wpt/tests/css/css-images/tiled-radial-gradients.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/generate-object-fit-and-position-canvas-tests.sh b/tests/wpt/tests/css/css-images/tools/generate-object-fit-and-position-canvas-tests.sh similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/generate-object-fit-and-position-canvas-tests.sh rename to tests/wpt/tests/css/css-images/tools/generate-object-fit-and-position-canvas-tests.sh diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/generate-object-fit-png-tests.sh b/tests/wpt/tests/css/css-images/tools/generate-object-fit-png-tests.sh similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/generate-object-fit-png-tests.sh rename to tests/wpt/tests/css/css-images/tools/generate-object-fit-png-tests.sh diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/generate-object-fit-svg-tests.sh b/tests/wpt/tests/css/css-images/tools/generate-object-fit-svg-tests.sh similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/generate-object-fit-svg-tests.sh rename to tests/wpt/tests/css/css-images/tools/generate-object-fit-svg-tests.sh diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/generate-object-position-png-tests.sh b/tests/wpt/tests/css/css-images/tools/generate-object-position-png-tests.sh similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/generate-object-position-png-tests.sh rename to tests/wpt/tests/css/css-images/tools/generate-object-position-png-tests.sh diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/generate-object-position-svg-tests.sh b/tests/wpt/tests/css/css-images/tools/generate-object-position-svg-tests.sh similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/generate-object-position-svg-tests.sh rename to tests/wpt/tests/css/css-images/tools/generate-object-position-svg-tests.sh diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/generate_object_view_box_tests.py b/tests/wpt/tests/css/css-images/tools/generate_object_view_box_tests.py similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/generate_object_view_box_tests.py rename to tests/wpt/tests/css/css-images/tools/generate_object_view_box_tests.py diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-contain-ref-template.html b/tests/wpt/tests/css/css-images/tools/object-view-box-fit-contain-ref-template.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-contain-ref-template.html rename to tests/wpt/tests/css/css-images/tools/object-view-box-fit-contain-ref-template.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-contain-template.html b/tests/wpt/tests/css/css-images/tools/object-view-box-fit-contain-template.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-contain-template.html rename to tests/wpt/tests/css/css-images/tools/object-view-box-fit-contain-template.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-cover-ref-template.html b/tests/wpt/tests/css/css-images/tools/object-view-box-fit-cover-ref-template.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-cover-ref-template.html rename to tests/wpt/tests/css/css-images/tools/object-view-box-fit-cover-ref-template.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-cover-template.html b/tests/wpt/tests/css/css-images/tools/object-view-box-fit-cover-template.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-cover-template.html rename to tests/wpt/tests/css/css-images/tools/object-view-box-fit-cover-template.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-fill-ref-template.html b/tests/wpt/tests/css/css-images/tools/object-view-box-fit-fill-ref-template.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-fill-ref-template.html rename to tests/wpt/tests/css/css-images/tools/object-view-box-fit-fill-ref-template.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-fill-template.html b/tests/wpt/tests/css/css-images/tools/object-view-box-fit-fill-template.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-fill-template.html rename to tests/wpt/tests/css/css-images/tools/object-view-box-fit-fill-template.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-none-ref-template.html b/tests/wpt/tests/css/css-images/tools/object-view-box-fit-none-ref-template.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-none-ref-template.html rename to tests/wpt/tests/css/css-images/tools/object-view-box-fit-none-ref-template.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-none-template.html b/tests/wpt/tests/css/css-images/tools/object-view-box-fit-none-template.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-fit-none-template.html rename to tests/wpt/tests/css/css-images/tools/object-view-box-fit-none-template.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-writing-mode-ref-template.html b/tests/wpt/tests/css/css-images/tools/object-view-box-writing-mode-ref-template.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-writing-mode-ref-template.html rename to tests/wpt/tests/css/css-images/tools/object-view-box-writing-mode-ref-template.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-writing-mode-template.html b/tests/wpt/tests/css/css-images/tools/object-view-box-writing-mode-template.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/object-view-box-writing-mode-template.html rename to tests/wpt/tests/css/css-images/tools/object-view-box-writing-mode-template.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/template-object-fit-ref.html b/tests/wpt/tests/css/css-images/tools/template-object-fit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/template-object-fit-ref.html rename to tests/wpt/tests/css/css-images/tools/template-object-fit-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/template-object-fit-test.html b/tests/wpt/tests/css/css-images/tools/template-object-fit-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/template-object-fit-test.html rename to tests/wpt/tests/css/css-images/tools/template-object-fit-test.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/template-object-position-ref.html b/tests/wpt/tests/css/css-images/tools/template-object-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/template-object-position-ref.html rename to tests/wpt/tests/css/css-images/tools/template-object-position-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-images/tools/template-object-position-test.html b/tests/wpt/tests/css/css-images/tools/template-object-position-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-images/tools/template-object-position-test.html rename to tests/wpt/tests/css/css-images/tools/template-object-position-test.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/META.yml b/tests/wpt/tests/css/css-inline/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/META.yml rename to tests/wpt/tests/css/css-inline/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-inline/animation/alignment-baseline-no-interpolation.html b/tests/wpt/tests/css/css-inline/animation/alignment-baseline-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/animation/alignment-baseline-no-interpolation.html rename to tests/wpt/tests/css/css-inline/animation/alignment-baseline-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/animation/dominant-baseline-no-interpolation.html b/tests/wpt/tests/css/css-inline/animation/dominant-baseline-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/animation/dominant-baseline-no-interpolation.html rename to tests/wpt/tests/css/css-inline/animation/dominant-baseline-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/animation/initial-letter-no-interpolation.html b/tests/wpt/tests/css/css-inline/animation/initial-letter-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/animation/initial-letter-no-interpolation.html rename to tests/wpt/tests/css/css-inline/animation/initial-letter-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-computed.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-computed.html rename to tests/wpt/tests/css/css-inline/baseline-source/baseline-source-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-first-001.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-first-001.html rename to tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-001.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-first-002.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-first-002.html rename to tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-002.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-first-003.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-first-003.html rename to tests/wpt/tests/css/css-inline/baseline-source/baseline-source-first-003.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-invalid.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-invalid.html rename to tests/wpt/tests/css/css-inline/baseline-source/baseline-source-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-last-001.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-last-001.html rename to tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-001.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-last-002.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-last-002.html rename to tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-002.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-last-003.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-last-003.html rename to tests/wpt/tests/css/css-inline/baseline-source/baseline-source-last-003.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-no-interpolation.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-no-interpolation.html rename to tests/wpt/tests/css/css-inline/baseline-source/baseline-source-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-valid.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-valid.html rename to tests/wpt/tests/css/css-inline/baseline-source/baseline-source-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-vertical-align.html b/tests/wpt/tests/css/css-inline/baseline-source/baseline-source-vertical-align.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/baseline-source/baseline-source-vertical-align.html rename to tests/wpt/tests/css/css-inline/baseline-source/baseline-source-vertical-align.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/change-inline-change-abspos-crash.html b/tests/wpt/tests/css/css-inline/change-inline-change-abspos-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/change-inline-change-abspos-crash.html rename to tests/wpt/tests/css/css-inline/change-inline-change-abspos-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/empty-text-node-001-ref.html b/tests/wpt/tests/css/css-inline/empty-text-node-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/empty-text-node-001-ref.html rename to tests/wpt/tests/css/css-inline/empty-text-node-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/empty-text-node-001.html b/tests/wpt/tests/css/css-inline/empty-text-node-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/empty-text-node-001.html rename to tests/wpt/tests/css/css-inline/empty-text-node-001.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/float-becomes-inflow-crash.html b/tests/wpt/tests/css/css-inline/float-becomes-inflow-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/float-becomes-inflow-crash.html rename to tests/wpt/tests/css/css-inline/float-becomes-inflow-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/inheritance.html b/tests/wpt/tests/css/css-inline/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/inheritance.html rename to tests/wpt/tests/css/css-inline/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-rtl-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-rtl-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html b/tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html rename to tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vlr-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking-vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vlr-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking-vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vlr.html b/tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking-vlr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vlr.html rename to tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking-vlr.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vrl-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking-vrl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vrl-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking-vrl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vrl.html b/tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking-vrl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking-vrl.html rename to tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking-vrl.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking.html b/tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/Initial-letter-breaking.html rename to tests/wpt/tests/css/css-inline/initial-letter/Initial-letter-breaking.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-tall-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-tall-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-tall-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-tall-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-tall.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-tall.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-tall.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-tall.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins-rtl-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins-rtl-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins-rtl.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins-rtl.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vlr-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vlr-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vlr.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vlr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vlr.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vlr.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vrl-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vrl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vrl-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vrl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vrl.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vrl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vrl.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins-vrl.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-margins.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-margins.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby-tall-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby-tall-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby-tall-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby-tall-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby-tall.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby-tall.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby-tall.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby-tall.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-tall-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-tall-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-tall-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-tall-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-tall.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-tall.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-tall.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-tall.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-computed.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-computed.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial-rtl-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial-rtl-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial-rtl.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial-rtl.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial-vlr-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial-vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial-vlr-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial-vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial-vlr.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial-vlr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial-vlr.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial-vlr.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial-vrl-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial-vrl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial-vrl-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial-vrl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial-vrl.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial-vrl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial-vrl.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial-vrl.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-drop-initial.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-drop-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-rtl-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-rtl-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-rtl.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-rtl.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vlr-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001-vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vlr-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001-vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vlr.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001-vlr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vlr.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001-vlr.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vrl-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001-vrl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vrl-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001-vrl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vrl.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001-vrl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001-vrl.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001-vrl.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-001.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-001.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-002-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-002-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-002.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-002.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-002.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-003-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-003-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-003.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-003.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-003.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-004-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-004-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-004.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-004.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-004.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-005-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-005-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-005.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-float-005.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-float-005.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-indentation-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-indentation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-indentation-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-indentation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-indentation-rtl-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-indentation-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-indentation-rtl-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-indentation-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-indentation-rtl.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-indentation-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-indentation-rtl.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-indentation-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-indentation.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-indentation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-indentation.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-indentation.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-invalid.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-invalid.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-layout-text-decoration-underline-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-layout-text-decoration-underline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-layout-text-decoration-underline-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-layout-text-decoration-underline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-layout-text-decoration-underline.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-layout-text-decoration-underline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-layout-text-decoration-underline.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-layout-text-decoration-underline.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial-rtl-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial-rtl-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial-rtl.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial-rtl.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial-vlr-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial-vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial-vlr-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial-vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial-vlr.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial-vlr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial-vlr.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial-vlr.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial-vrl-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial-vrl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial-vrl-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial-vrl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial-vrl.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial-vrl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial-vrl.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial-vrl.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raise-initial.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raise-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-raise-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-raise-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-raise-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-raise-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-raise.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-raise.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-raise.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-raise.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-clears-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-clears-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-clears-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-clears-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-clears.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-clears.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-clears.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-clears.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-wraps-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-wraps-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-wraps-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-wraps-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-wraps.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-wraps.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-wraps.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-wraps.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial-rtl-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial-rtl-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial-rtl.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial-rtl.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vlr-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vlr-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vlr.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vlr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vlr.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vlr.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-sunk-initial.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-sunk-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-valid.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-valid.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-with-first-line-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-with-first-line-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-with-first-line-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-with-first-line-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-with-first-line.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-with-first-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-with-first-line.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-with-first-line.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-with-tab-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-with-tab-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-with-tab-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-with-tab-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-with-tab-rtl-ref.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-with-tab-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-with-tab-rtl-ref.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-with-tab-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-with-tab-rtl.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-with-tab-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-with-tab-rtl.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-with-tab-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-with-tab.html b/tests/wpt/tests/css/css-inline/initial-letter/initial-letter-with-tab.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/initial-letter/initial-letter-with-tab.html rename to tests/wpt/tests/css/css-inline/initial-letter/initial-letter-with-tab.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/inline-002-crash.html b/tests/wpt/tests/css/css-inline/inline-002-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/inline-002-crash.html rename to tests/wpt/tests/css/css-inline/inline-002-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/inline-crash-chrome-001.html b/tests/wpt/tests/css/css-inline/inline-crash-chrome-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/inline-crash-chrome-001.html rename to tests/wpt/tests/css/css-inline/inline-crash-chrome-001.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/inline-crash.html b/tests/wpt/tests/css/css-inline/inline-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/inline-crash.html rename to tests/wpt/tests/css/css-inline/inline-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/alignment-baseline-computed.html b/tests/wpt/tests/css/css-inline/parsing/alignment-baseline-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/alignment-baseline-computed.html rename to tests/wpt/tests/css/css-inline/parsing/alignment-baseline-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/alignment-baseline-invalid.html b/tests/wpt/tests/css/css-inline/parsing/alignment-baseline-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/alignment-baseline-invalid.html rename to tests/wpt/tests/css/css-inline/parsing/alignment-baseline-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/alignment-baseline-valid.html b/tests/wpt/tests/css/css-inline/parsing/alignment-baseline-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/alignment-baseline-valid.html rename to tests/wpt/tests/css/css-inline/parsing/alignment-baseline-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/baseline-shift-computed.html b/tests/wpt/tests/css/css-inline/parsing/baseline-shift-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/baseline-shift-computed.html rename to tests/wpt/tests/css/css-inline/parsing/baseline-shift-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/baseline-shift-invalid.html b/tests/wpt/tests/css/css-inline/parsing/baseline-shift-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/baseline-shift-invalid.html rename to tests/wpt/tests/css/css-inline/parsing/baseline-shift-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/baseline-shift-valid.html b/tests/wpt/tests/css/css-inline/parsing/baseline-shift-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/baseline-shift-valid.html rename to tests/wpt/tests/css/css-inline/parsing/baseline-shift-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/dominant-baseline-computed.html b/tests/wpt/tests/css/css-inline/parsing/dominant-baseline-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/dominant-baseline-computed.html rename to tests/wpt/tests/css/css-inline/parsing/dominant-baseline-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/dominant-baseline-invalid.html b/tests/wpt/tests/css/css-inline/parsing/dominant-baseline-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/dominant-baseline-invalid.html rename to tests/wpt/tests/css/css-inline/parsing/dominant-baseline-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/dominant-baseline-valid.html b/tests/wpt/tests/css/css-inline/parsing/dominant-baseline-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/dominant-baseline-valid.html rename to tests/wpt/tests/css/css-inline/parsing/dominant-baseline-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/line-height-computed.html b/tests/wpt/tests/css/css-inline/parsing/line-height-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/line-height-computed.html rename to tests/wpt/tests/css/css-inline/parsing/line-height-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/line-height-invalid.html b/tests/wpt/tests/css/css-inline/parsing/line-height-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/line-height-invalid.html rename to tests/wpt/tests/css/css-inline/parsing/line-height-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/line-height-valid.html b/tests/wpt/tests/css/css-inline/parsing/line-height-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/line-height-valid.html rename to tests/wpt/tests/css/css-inline/parsing/line-height-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/vertical-align-computed.html b/tests/wpt/tests/css/css-inline/parsing/vertical-align-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/vertical-align-computed.html rename to tests/wpt/tests/css/css-inline/parsing/vertical-align-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/vertical-align-invalid.html b/tests/wpt/tests/css/css-inline/parsing/vertical-align-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/vertical-align-invalid.html rename to tests/wpt/tests/css/css-inline/parsing/vertical-align-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/parsing/vertical-align-valid.html b/tests/wpt/tests/css/css-inline/parsing/vertical-align-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/parsing/vertical-align-valid.html rename to tests/wpt/tests/css/css-inline/parsing/vertical-align-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001-ref.html b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001-ref.html rename to tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001.html b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001.html rename to tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-block-box-001.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-001-ref.html b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-001-ref.html rename to tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-001.html b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-001.html rename to tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-001.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-002-ref.html b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-002-ref.html rename to tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-002.html b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-002.html rename to tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-half-leading-inline-box-002.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-valid.html b/tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/text-box-trim/text-box-trim-valid.html rename to tests/wpt/tests/css/css-inline/text-box-trim/text-box-trim-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-inline/too-big-line-height-crash.html b/tests/wpt/tests/css/css-inline/too-big-line-height-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-inline/too-big-line-height-crash.html rename to tests/wpt/tests/css/css-inline/too-big-line-height-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/META.yml b/tests/wpt/tests/css/css-layout-api/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/META.yml rename to tests/wpt/tests/css/css-layout-api/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/at-supports-rule.https.html b/tests/wpt/tests/css/css-layout-api/at-supports-rule.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/at-supports-rule.https.html rename to tests/wpt/tests/css/css-layout-api/at-supports-rule.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/absolute.https.html b/tests/wpt/tests/css/css-layout-api/auto-block-size/absolute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/absolute.https.html rename to tests/wpt/tests/css/css-layout-api/auto-block-size/absolute.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/auto-block-size-absolute-ref.html b/tests/wpt/tests/css/css-layout-api/auto-block-size/auto-block-size-absolute-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/auto-block-size-absolute-ref.html rename to tests/wpt/tests/css/css-layout-api/auto-block-size/auto-block-size-absolute-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/auto-block-size-floats-ref.html b/tests/wpt/tests/css/css-layout-api/auto-block-size/auto-block-size-floats-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/auto-block-size-floats-ref.html rename to tests/wpt/tests/css/css-layout-api/auto-block-size/auto-block-size-floats-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/auto-block-size-negative-ref.html b/tests/wpt/tests/css/css-layout-api/auto-block-size/auto-block-size-negative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/auto-block-size-negative-ref.html rename to tests/wpt/tests/css/css-layout-api/auto-block-size/auto-block-size-negative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/flex-ref.html b/tests/wpt/tests/css/css-layout-api/auto-block-size/flex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/flex-ref.html rename to tests/wpt/tests/css/css-layout-api/auto-block-size/flex-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/flex.https.html b/tests/wpt/tests/css/css-layout-api/auto-block-size/flex.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/flex.https.html rename to tests/wpt/tests/css/css-layout-api/auto-block-size/flex.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/floats.https.html b/tests/wpt/tests/css/css-layout-api/auto-block-size/floats.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/floats.https.html rename to tests/wpt/tests/css/css-layout-api/auto-block-size/floats.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/inflow-ref.html b/tests/wpt/tests/css/css-layout-api/auto-block-size/inflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/inflow-ref.html rename to tests/wpt/tests/css/css-layout-api/auto-block-size/inflow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/inflow.https.html b/tests/wpt/tests/css/css-layout-api/auto-block-size/inflow.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/inflow.https.html rename to tests/wpt/tests/css/css-layout-api/auto-block-size/inflow.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/negative.https.html b/tests/wpt/tests/css/css-layout-api/auto-block-size/negative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/auto-block-size/negative.https.html rename to tests/wpt/tests/css/css-layout-api/auto-block-size/negative.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/baseline/child-baseline.https.html b/tests/wpt/tests/css/css-layout-api/baseline/child-baseline.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/baseline/child-baseline.https.html rename to tests/wpt/tests/css/css-layout-api/baseline/child-baseline.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/baseline/flex-baseline.https.html b/tests/wpt/tests/css/css-layout-api/baseline/flex-baseline.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/baseline/flex-baseline.https.html rename to tests/wpt/tests/css/css-layout-api/baseline/flex-baseline.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/baseline/no-baseline.https.html b/tests/wpt/tests/css/css-layout-api/baseline/no-baseline.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/baseline/no-baseline.https.html rename to tests/wpt/tests/css/css-layout-api/baseline/no-baseline.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/baseline/orthogonal-baseline.https.html b/tests/wpt/tests/css/css-layout-api/baseline/orthogonal-baseline.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/baseline/orthogonal-baseline.https.html rename to tests/wpt/tests/css/css-layout-api/baseline/orthogonal-baseline.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/box-tree-registered-ref.html b/tests/wpt/tests/css/css-layout-api/box-tree-registered-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/box-tree-registered-ref.html rename to tests/wpt/tests/css/css-layout-api/box-tree-registered-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/box-tree-registered.https.html b/tests/wpt/tests/css/css-layout-api/box-tree-registered.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/box-tree-registered.https.html rename to tests/wpt/tests/css/css-layout-api/box-tree-registered.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/box-tree-unregistered-ref.html b/tests/wpt/tests/css/css-layout-api/box-tree-unregistered-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/box-tree-unregistered-ref.html rename to tests/wpt/tests/css/css-layout-api/box-tree-unregistered-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/box-tree-unregistered.https.html b/tests/wpt/tests/css/css-layout-api/box-tree-unregistered.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/box-tree-unregistered.https.html rename to tests/wpt/tests/css/css-layout-api/box-tree-unregistered.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-block-size-htb-vrl.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/available-block-size-htb-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-block-size-htb-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/available-block-size-htb-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-block-size-invalid.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/available-block-size-invalid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-block-size-invalid.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/available-block-size-invalid.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-block-size-vrl-htb.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/available-block-size-vrl-htb.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-block-size-vrl-htb.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/available-block-size-vrl-htb.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-inline-size-htb-htb.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/available-inline-size-htb-htb.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-inline-size-htb-htb.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/available-inline-size-htb-htb.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-inline-size-invalid.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/available-inline-size-invalid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-inline-size-invalid.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/available-inline-size-invalid.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-inline-size-vrl-vrl.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/available-inline-size-vrl-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-inline-size-vrl-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/available-inline-size-vrl-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-size-for-percentages-htb-htb.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/available-size-for-percentages-htb-htb.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-size-for-percentages-htb-htb.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/available-size-for-percentages-htb-htb.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-size-for-percentages-htb-vrl.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/available-size-for-percentages-htb-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-size-for-percentages-htb-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/available-size-for-percentages-htb-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-size-for-percentages-invalid.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/available-size-for-percentages-invalid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-size-for-percentages-invalid.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/available-size-for-percentages-invalid.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-size-for-percentages-vrl-htb.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/available-size-for-percentages-vrl-htb.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-size-for-percentages-vrl-htb.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/available-size-for-percentages-vrl-htb.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-size-for-percentages-vrl-vrl.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/available-size-for-percentages-vrl-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/available-size-for-percentages-vrl-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/available-size-for-percentages-vrl-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/fixed-block-size-vrl.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/fixed-block-size-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/fixed-block-size-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/fixed-block-size-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/fixed-block-size.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/fixed-block-size.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/fixed-block-size.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/fixed-block-size.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/fixed-inline-size-vrl.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/fixed-inline-size-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/fixed-inline-size-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/fixed-inline-size-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/fixed-inline-size.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/fixed-inline-size.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/fixed-inline-size.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/fixed-inline-size.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/percentage-size-htb-htb.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/percentage-size-htb-htb.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/percentage-size-htb-htb.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/percentage-size-htb-htb.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/percentage-size-htb-vrl.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/percentage-size-htb-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/percentage-size-htb-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/percentage-size-htb-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/percentage-size-invalid.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/percentage-size-invalid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/percentage-size-invalid.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/percentage-size-invalid.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/percentage-size-quirks-mode.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/percentage-size-quirks-mode.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/percentage-size-quirks-mode.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/percentage-size-quirks-mode.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/percentage-size-vrl-htb.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/percentage-size-vrl-htb.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/percentage-size-vrl-htb.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/percentage-size-vrl-htb.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/percentage-size-vrl-vrl.https.html b/tests/wpt/tests/css/css-layout-api/child-constraints/percentage-size-vrl-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/percentage-size-vrl-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/child-constraints/percentage-size-vrl-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/support/layout-child-sizes-worklet.js b/tests/wpt/tests/css/css-layout-api/child-constraints/support/layout-child-sizes-worklet.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/child-constraints/support/layout-child-sizes-worklet.js rename to tests/wpt/tests/css/css-layout-api/child-constraints/support/layout-child-sizes-worklet.js diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/chrome-bug-1287843-000-crash.https.html b/tests/wpt/tests/css/css-layout-api/chrome-bug-1287843-000-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/chrome-bug-1287843-000-crash.https.html rename to tests/wpt/tests/css/css-layout-api/chrome-bug-1287843-000-crash.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/chrome-bug-1287843-001-crash.https.html b/tests/wpt/tests/css/css-layout-api/chrome-bug-1287843-001-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/chrome-bug-1287843-001-crash.https.html rename to tests/wpt/tests/css/css-layout-api/chrome-bug-1287843-001-crash.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/chrome-bug-1291449-crash.https.html b/tests/wpt/tests/css/css-layout-api/chrome-bug-1291449-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/chrome-bug-1291449-crash.https.html rename to tests/wpt/tests/css/css-layout-api/chrome-bug-1291449-crash.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/chrome-bug-1296664-crash.https.html b/tests/wpt/tests/css/css-layout-api/chrome-bug-1296664-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/chrome-bug-1296664-crash.https.html rename to tests/wpt/tests/css/css-layout-api/chrome-bug-1296664-crash.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/computed-style-layout-function.https.html b/tests/wpt/tests/css/css-layout-api/computed-style-layout-function.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/computed-style-layout-function.https.html rename to tests/wpt/tests/css/css-layout-api/computed-style-layout-function.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints-data-function-failure.https.html b/tests/wpt/tests/css/css-layout-api/constraints-data-function-failure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints-data-function-failure.https.html rename to tests/wpt/tests/css/css-layout-api/constraints-data-function-failure.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints-data-sab-failure.https.html b/tests/wpt/tests/css/css-layout-api/constraints-data-sab-failure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints-data-sab-failure.https.html rename to tests/wpt/tests/css/css-layout-api/constraints-data-sab-failure.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints-data.https.html b/tests/wpt/tests/css/css-layout-api/constraints-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints-data.https.html rename to tests/wpt/tests/css/css-layout-api/constraints-data.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-absolute-left-right-vrl.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-absolute-left-right-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-absolute-left-right-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-absolute-left-right-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-absolute-none.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-absolute-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-absolute-none.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-absolute-none.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-absolute-top-bottom.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-absolute-top-bottom.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-absolute-top-bottom.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-absolute-top-bottom.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-block-none-vrl.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-block-none-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-block-none-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-block-none-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-block-none.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-block-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-block-none.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-block-none.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-fixed-max.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-fixed-max.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-fixed-max.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-fixed-max.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-fixed-min.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-fixed-min.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-fixed-min.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-fixed-min.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-fixed-vrl.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-fixed-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-fixed-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-fixed-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-fixed.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-fixed.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-fixed.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-fixed.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-basis-vrl.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-basis-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-basis-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-basis-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-column-basis.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-column-basis.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-column-basis.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-column-basis.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-column-grow.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-column-grow.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-column-grow.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-column-grow.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-column-none.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-column-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-column-none.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-column-none.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-column-stretch-vrl.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-column-stretch-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-column-stretch-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-column-stretch-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-grow-vrl.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-grow-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-grow-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-grow-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-none.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-none.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-none.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-percentage-indefinite.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-percentage-indefinite.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-percentage-indefinite.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-percentage-indefinite.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-stretch-max.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-stretch-max.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-stretch-max.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-stretch-max.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-stretch.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-stretch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-flex-stretch.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-flex-stretch.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-grid-none.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-grid-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-grid-none.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-grid-none.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-grid-stretch-max.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-grid-stretch-max.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-grid-stretch-max.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-grid-stretch-max.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-grid-stretch.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-grid-stretch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-grid-stretch.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-grid-stretch.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-grid-vrl.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-grid-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-grid-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-grid-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-percentage-indefinite.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-percentage-indefinite.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-percentage-indefinite.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-percentage-indefinite.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-percentage-quirks-mode.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-percentage-quirks-mode.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-percentage-quirks-mode.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-percentage-quirks-mode.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-percentage-vrl.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-percentage-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-percentage-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-percentage-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-percentage.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-percentage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-percentage.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-percentage.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-quirky-body.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-quirky-body.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-block-size-quirky-body.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-block-size-quirky-body.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-absolute-left-right.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-absolute-left-right.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-absolute-left-right.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-absolute-left-right.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-absolute-top-bottom-vrl.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-absolute-top-bottom-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-absolute-top-bottom-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-absolute-top-bottom-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-block-auto-avoid-floats-vlr.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-block-auto-avoid-floats-vlr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-block-auto-avoid-floats-vlr.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-block-auto-avoid-floats-vlr.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-block-auto-avoid-floats.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-block-auto-avoid-floats.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-block-auto-avoid-floats.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-block-auto-avoid-floats.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-block-auto-vlr.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-block-auto-vlr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-block-auto-vlr.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-block-auto-vlr.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-block-auto.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-block-auto.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-block-auto.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-block-auto.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-fixed-vrl.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-fixed-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-fixed-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-fixed-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-fixed.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-fixed.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-fixed.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-fixed.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-flex-grow-column-vrl.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-flex-grow-column-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-flex-grow-column-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-flex-grow-column-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-flex-grow.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-flex-grow.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-flex-grow.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-flex-grow.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-grid.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-grid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-grid.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-grid.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-percentage-vlr.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-percentage-vlr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-percentage-vlr.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-percentage-vlr.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-percentage.https.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-percentage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-percentage.https.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-percentage.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-ref.html b/tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/fixed-inline-size-ref.html rename to tests/wpt/tests/css/css-layout-api/constraints/fixed-inline-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/support/constraints-fixed-block-size-quirky-body-iframe.html b/tests/wpt/tests/css/css-layout-api/constraints/support/constraints-fixed-block-size-quirky-body-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/support/constraints-fixed-block-size-quirky-body-iframe.html rename to tests/wpt/tests/css/css-layout-api/constraints/support/constraints-fixed-block-size-quirky-body-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/support/constraints-fixed-block-size.js b/tests/wpt/tests/css/css-layout-api/constraints/support/constraints-fixed-block-size.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/support/constraints-fixed-block-size.js rename to tests/wpt/tests/css/css-layout-api/constraints/support/constraints-fixed-block-size.js diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/constraints/support/constraints-fixed-inline-size.js b/tests/wpt/tests/css/css-layout-api/constraints/support/constraints-fixed-inline-size.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/constraints/support/constraints-fixed-inline-size.js rename to tests/wpt/tests/css/css-layout-api/constraints/support/constraints-fixed-inline-size.js diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/crash-multicol.https.html b/tests/wpt/tests/css/css-layout-api/crash-multicol.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/crash-multicol.https.html rename to tests/wpt/tests/css/css-layout-api/crash-multicol.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/all-ref.html b/tests/wpt/tests/css/css-layout-api/edges/all-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/all-ref.html rename to tests/wpt/tests/css/css-layout-api/edges/all-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/all.https.html b/tests/wpt/tests/css/css-layout-api/edges/all.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/all.https.html rename to tests/wpt/tests/css/css-layout-api/edges/all.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/border-htb-rtl.https.html b/tests/wpt/tests/css/css-layout-api/edges/border-htb-rtl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/border-htb-rtl.https.html rename to tests/wpt/tests/css/css-layout-api/edges/border-htb-rtl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/border-htb.https.html b/tests/wpt/tests/css/css-layout-api/edges/border-htb.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/border-htb.https.html rename to tests/wpt/tests/css/css-layout-api/edges/border-htb.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/border-vlr-rtl.https.html b/tests/wpt/tests/css/css-layout-api/edges/border-vlr-rtl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/border-vlr-rtl.https.html rename to tests/wpt/tests/css/css-layout-api/edges/border-vlr-rtl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/border-vlr.https.html b/tests/wpt/tests/css/css-layout-api/edges/border-vlr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/border-vlr.https.html rename to tests/wpt/tests/css/css-layout-api/edges/border-vlr.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/border-vrl-rtl.https.html b/tests/wpt/tests/css/css-layout-api/edges/border-vrl-rtl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/border-vrl-rtl.https.html rename to tests/wpt/tests/css/css-layout-api/edges/border-vrl-rtl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/border-vrl.https.html b/tests/wpt/tests/css/css-layout-api/edges/border-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/border-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/edges/border-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/padding-htb-rtl.https.html b/tests/wpt/tests/css/css-layout-api/edges/padding-htb-rtl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/padding-htb-rtl.https.html rename to tests/wpt/tests/css/css-layout-api/edges/padding-htb-rtl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/padding-htb.https.html b/tests/wpt/tests/css/css-layout-api/edges/padding-htb.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/padding-htb.https.html rename to tests/wpt/tests/css/css-layout-api/edges/padding-htb.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/padding-vlr-rtl.https.html b/tests/wpt/tests/css/css-layout-api/edges/padding-vlr-rtl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/padding-vlr-rtl.https.html rename to tests/wpt/tests/css/css-layout-api/edges/padding-vlr-rtl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/padding-vlr.https.html b/tests/wpt/tests/css/css-layout-api/edges/padding-vlr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/padding-vlr.https.html rename to tests/wpt/tests/css/css-layout-api/edges/padding-vlr.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/padding-vrl-rtl.https.html b/tests/wpt/tests/css/css-layout-api/edges/padding-vrl-rtl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/padding-vrl-rtl.https.html rename to tests/wpt/tests/css/css-layout-api/edges/padding-vrl-rtl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/padding-vrl.https.html b/tests/wpt/tests/css/css-layout-api/edges/padding-vrl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/padding-vrl.https.html rename to tests/wpt/tests/css/css-layout-api/edges/padding-vrl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/scrollbar-ref.html b/tests/wpt/tests/css/css-layout-api/edges/scrollbar-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/scrollbar-ref.html rename to tests/wpt/tests/css/css-layout-api/edges/scrollbar-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/scrollbar.https.html b/tests/wpt/tests/css/css-layout-api/edges/scrollbar.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/scrollbar.https.html rename to tests/wpt/tests/css/css-layout-api/edges/scrollbar.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/edges/support/edges.js b/tests/wpt/tests/css/css-layout-api/edges/support/edges.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/edges/support/edges.js rename to tests/wpt/tests/css/css-layout-api/edges/support/edges.js diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-intrinsic-sizes/bad-return.https.html b/tests/wpt/tests/css/css-layout-api/fallback-intrinsic-sizes/bad-return.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-intrinsic-sizes/bad-return.https.html rename to tests/wpt/tests/css/css-layout-api/fallback-intrinsic-sizes/bad-return.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-intrinsic-sizes/constructor-error.https.html b/tests/wpt/tests/css/css-layout-api/fallback-intrinsic-sizes/constructor-error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-intrinsic-sizes/constructor-error.https.html rename to tests/wpt/tests/css/css-layout-api/fallback-intrinsic-sizes/constructor-error.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-intrinsic-sizes/error.https.html b/tests/wpt/tests/css/css-layout-api/fallback-intrinsic-sizes/error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-intrinsic-sizes/error.https.html rename to tests/wpt/tests/css/css-layout-api/fallback-intrinsic-sizes/error.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-intrinsic-sizes/fallback-ref.html b/tests/wpt/tests/css/css-layout-api/fallback-intrinsic-sizes/fallback-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-intrinsic-sizes/fallback-ref.html rename to tests/wpt/tests/css/css-layout-api/fallback-intrinsic-sizes/fallback-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-intrinsic-sizes/invalid-child.https.html b/tests/wpt/tests/css/css-layout-api/fallback-intrinsic-sizes/invalid-child.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-intrinsic-sizes/invalid-child.https.html rename to tests/wpt/tests/css/css-layout-api/fallback-intrinsic-sizes/invalid-child.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-intrinsic-sizes/no-promise.https.html b/tests/wpt/tests/css/css-layout-api/fallback-intrinsic-sizes/no-promise.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-intrinsic-sizes/no-promise.https.html rename to tests/wpt/tests/css/css-layout-api/fallback-intrinsic-sizes/no-promise.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-intrinsic-sizes/unresolved-promise.https.html b/tests/wpt/tests/css/css-layout-api/fallback-intrinsic-sizes/unresolved-promise.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-intrinsic-sizes/unresolved-promise.https.html rename to tests/wpt/tests/css/css-layout-api/fallback-intrinsic-sizes/unresolved-promise.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/bad-return.https.html b/tests/wpt/tests/css/css-layout-api/fallback-layout/bad-return.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/bad-return.https.html rename to tests/wpt/tests/css/css-layout-api/fallback-layout/bad-return.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/constructor-error.https.html b/tests/wpt/tests/css/css-layout-api/fallback-layout/constructor-error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/constructor-error.https.html rename to tests/wpt/tests/css/css-layout-api/fallback-layout/constructor-error.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/error.https.html b/tests/wpt/tests/css/css-layout-api/fallback-layout/error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/error.https.html rename to tests/wpt/tests/css/css-layout-api/fallback-layout/error.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/fallback-layout-fallback-ref.html b/tests/wpt/tests/css/css-layout-api/fallback-layout/fallback-layout-fallback-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/fallback-layout-fallback-ref.html rename to tests/wpt/tests/css/css-layout-api/fallback-layout/fallback-layout-fallback-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/invalid-child.https.html b/tests/wpt/tests/css/css-layout-api/fallback-layout/invalid-child.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/invalid-child.https.html rename to tests/wpt/tests/css/css-layout-api/fallback-layout/invalid-child.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/invalid-fragment.https.html b/tests/wpt/tests/css/css-layout-api/fallback-layout/invalid-fragment.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/invalid-fragment.https.html rename to tests/wpt/tests/css/css-layout-api/fallback-layout/invalid-fragment.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/no-promise.https.html b/tests/wpt/tests/css/css-layout-api/fallback-layout/no-promise.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/no-promise.https.html rename to tests/wpt/tests/css/css-layout-api/fallback-layout/no-promise.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/unresolved-promise.https.html b/tests/wpt/tests/css/css-layout-api/fallback-layout/unresolved-promise.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fallback-layout/unresolved-promise.https.html rename to tests/wpt/tests/css/css-layout-api/fallback-layout/unresolved-promise.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fragment-data-function-failure.https.html b/tests/wpt/tests/css/css-layout-api/fragment-data-function-failure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fragment-data-function-failure.https.html rename to tests/wpt/tests/css/css-layout-api/fragment-data-function-failure.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fragment-data-immutable.https.html b/tests/wpt/tests/css/css-layout-api/fragment-data-immutable.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fragment-data-immutable.https.html rename to tests/wpt/tests/css/css-layout-api/fragment-data-immutable.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fragment-data-sab-failure.https.html b/tests/wpt/tests/css/css-layout-api/fragment-data-sab-failure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fragment-data-sab-failure.https.html rename to tests/wpt/tests/css/css-layout-api/fragment-data-sab-failure.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/fragment-data.https.html b/tests/wpt/tests/css/css-layout-api/fragment-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/fragment-data.https.html rename to tests/wpt/tests/css/css-layout-api/fragment-data.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/green-square-ref.html b/tests/wpt/tests/css/css-layout-api/green-square-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/green-square-ref.html rename to tests/wpt/tests/css/css-layout-api/green-square-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/inline-style-layout-function.https.html b/tests/wpt/tests/css/css-layout-api/inline-style-layout-function.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/inline-style-layout-function.https.html rename to tests/wpt/tests/css/css-layout-api/inline-style-layout-function.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/input-text-crash.https.html b/tests/wpt/tests/css/css-layout-api/input-text-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/input-text-crash.https.html rename to tests/wpt/tests/css/css-layout-api/input-text-crash.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/inside-multicol-crash.https.html b/tests/wpt/tests/css/css-layout-api/inside-multicol-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/inside-multicol-crash.https.html rename to tests/wpt/tests/css/css-layout-api/inside-multicol-crash.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/absolute-ref.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/absolute-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/absolute-ref.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/absolute-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/absolute.https.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/absolute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/absolute.https.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/absolute.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-replaced-percentage-01.https.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-replaced-percentage-01.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-replaced-percentage-01.https.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-replaced-percentage-01.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-replaced-percentage-02.https.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-replaced-percentage-02.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-replaced-percentage-02.https.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-replaced-percentage-02.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-replaced-percentage-ref.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-replaced-percentage-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-replaced-percentage-ref.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-replaced-percentage-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-size-01-ref.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-size-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-size-01-ref.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-size-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-size-01.https.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-size-01.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-size-01.https.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-size-01.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-size-02-ref.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-size-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-size-02-ref.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-size-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-size-02.https.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-size-02.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-size-02.https.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-size-02.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-size-03.https.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-size-03.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-size-03.https.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-size-03.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-size-contribution.https.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-size-contribution.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/child-size-contribution.https.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/child-size-contribution.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/content-size-ref.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/content-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/content-size-ref.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/content-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/content-size.https.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/content-size.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/content-size.https.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/content-size.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/floats-ref.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/floats-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/floats-ref.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/floats-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/floats.https.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/floats.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/floats.https.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/floats.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/invalid-min-max.https.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/invalid-min-max.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/invalid-min-max.https.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/invalid-min-max.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/invalid-ref.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/invalid-ref.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/invalid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/negative-max.https.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/negative-max.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/negative-max.https.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/negative-max.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/negative-min.https.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/negative-min.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/negative-min.https.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/negative-min.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/negative-ref.html b/tests/wpt/tests/css/css-layout-api/intrinsic-sizes/negative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/intrinsic-sizes/negative-ref.html rename to tests/wpt/tests/css/css-layout-api/intrinsic-sizes/negative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/layout-child/absolute.https.html b/tests/wpt/tests/css/css-layout-api/layout-child/absolute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/layout-child/absolute.https.html rename to tests/wpt/tests/css/css-layout-api/layout-child/absolute.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/layout-child/before-after.https.html b/tests/wpt/tests/css/css-layout-api/layout-child/before-after.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/layout-child/before-after.https.html rename to tests/wpt/tests/css/css-layout-api/layout-child/before-after.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/layout-child/fixed.https.html b/tests/wpt/tests/css/css-layout-api/layout-child/fixed.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/layout-child/fixed.https.html rename to tests/wpt/tests/css/css-layout-api/layout-child/fixed.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/layout-child/float.https.html b/tests/wpt/tests/css/css-layout-api/layout-child/float.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/layout-child/float.https.html rename to tests/wpt/tests/css/css-layout-api/layout-child/float.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/layout-child/inflow.https.html b/tests/wpt/tests/css/css-layout-api/layout-child/inflow.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/layout-child/inflow.https.html rename to tests/wpt/tests/css/css-layout-api/layout-child/inflow.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/layout-child/inlines-dynamic.https.html b/tests/wpt/tests/css/css-layout-api/layout-child/inlines-dynamic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/layout-child/inlines-dynamic.https.html rename to tests/wpt/tests/css/css-layout-api/layout-child/inlines-dynamic.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/layout-child/inlines.https.html b/tests/wpt/tests/css/css-layout-api/layout-child/inlines.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/layout-child/inlines.https.html rename to tests/wpt/tests/css/css-layout-api/layout-child/inlines.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/layout-child/support/layout-child-worklet.js b/tests/wpt/tests/css/css-layout-api/layout-child/support/layout-child-worklet.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/layout-child/support/layout-child-worklet.js rename to tests/wpt/tests/css/css-layout-api/layout-child/support/layout-child-worklet.js diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/layout-child/text-01.https.html b/tests/wpt/tests/css/css-layout-api/layout-child/text-01.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/layout-child/text-01.https.html rename to tests/wpt/tests/css/css-layout-api/layout-child/text-01.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/layout-child/text-02.https.html b/tests/wpt/tests/css/css-layout-api/layout-child/text-02.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/layout-child/text-02.https.html rename to tests/wpt/tests/css/css-layout-api/layout-child/text-02.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/list-item-multicol-with-custom-layout-child-crash.https.html b/tests/wpt/tests/css/css-layout-api/list-item-multicol-with-custom-layout-child-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/list-item-multicol-with-custom-layout-child-crash.https.html rename to tests/wpt/tests/css/css-layout-api/list-item-multicol-with-custom-layout-child-crash.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/multicol-break-before-crash.https.html b/tests/wpt/tests/css/css-layout-api/multicol-break-before-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/multicol-break-before-crash.https.html rename to tests/wpt/tests/css/css-layout-api/multicol-break-before-crash.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/multicol-child-crash.https.html b/tests/wpt/tests/css/css-layout-api/multicol-child-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/multicol-child-crash.https.html rename to tests/wpt/tests/css/css-layout-api/multicol-child-crash.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/multicol-details-crash.https.html b/tests/wpt/tests/css/css-layout-api/multicol-details-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/multicol-details-crash.https.html rename to tests/wpt/tests/css/css-layout-api/multicol-details-crash.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/multicol-fieldset-crash.https.html b/tests/wpt/tests/css/css-layout-api/multicol-fieldset-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/multicol-fieldset-crash.https.html rename to tests/wpt/tests/css/css-layout-api/multicol-fieldset-crash.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/htb-ltr.https.html b/tests/wpt/tests/css/css-layout-api/position-fragment/htb-ltr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/htb-ltr.https.html rename to tests/wpt/tests/css/css-layout-api/position-fragment/htb-ltr.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/htb-rtl.https.html b/tests/wpt/tests/css/css-layout-api/position-fragment/htb-rtl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/htb-rtl.https.html rename to tests/wpt/tests/css/css-layout-api/position-fragment/htb-rtl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/ref.html b/tests/wpt/tests/css/css-layout-api/position-fragment/ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/ref.html rename to tests/wpt/tests/css/css-layout-api/position-fragment/ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/support/layout-position-child-worklet.js b/tests/wpt/tests/css/css-layout-api/position-fragment/support/layout-position-child-worklet.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/support/layout-position-child-worklet.js rename to tests/wpt/tests/css/css-layout-api/position-fragment/support/layout-position-child-worklet.js diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/vlr-ltr.https.html b/tests/wpt/tests/css/css-layout-api/position-fragment/vlr-ltr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/vlr-ltr.https.html rename to tests/wpt/tests/css/css-layout-api/position-fragment/vlr-ltr.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/vlr-rtl.https.html b/tests/wpt/tests/css/css-layout-api/position-fragment/vlr-rtl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/vlr-rtl.https.html rename to tests/wpt/tests/css/css-layout-api/position-fragment/vlr-rtl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/vrl-ltr.https.html b/tests/wpt/tests/css/css-layout-api/position-fragment/vrl-ltr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/vrl-ltr.https.html rename to tests/wpt/tests/css/css-layout-api/position-fragment/vrl-ltr.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/vrl-rtl.https.html b/tests/wpt/tests/css/css-layout-api/position-fragment/vrl-rtl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/position-fragment/vrl-rtl.https.html rename to tests/wpt/tests/css/css-layout-api/position-fragment/vrl-rtl.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/style-map-multi-ref.html b/tests/wpt/tests/css/css-layout-api/style-map-multi-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/style-map-multi-ref.html rename to tests/wpt/tests/css/css-layout-api/style-map-multi-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/style-map-multi.https.html b/tests/wpt/tests/css/css-layout-api/style-map-multi.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/style-map-multi.https.html rename to tests/wpt/tests/css/css-layout-api/style-map-multi.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/style-map-ref.html b/tests/wpt/tests/css/css-layout-api/style-map-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/style-map-ref.html rename to tests/wpt/tests/css/css-layout-api/style-map-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/style-map.https.html b/tests/wpt/tests/css/css-layout-api/style-map.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/style-map.https.html rename to tests/wpt/tests/css/css-layout-api/style-map.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/supports.https.html b/tests/wpt/tests/css/css-layout-api/supports.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/supports.https.html rename to tests/wpt/tests/css/css-layout-api/supports.https.html diff --git a/tests/wpt/web-platform-tests/css/css-layout-api/sync-layout-microtasks.https.html b/tests/wpt/tests/css/css-layout-api/sync-layout-microtasks.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-layout-api/sync-layout-microtasks.https.html rename to tests/wpt/tests/css/css-layout-api/sync-layout-microtasks.https.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/META.yml b/tests/wpt/tests/css/css-lists/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/META.yml rename to tests/wpt/tests/css/css-lists/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-lists/add-inline-child-after-marker-001-ref.html b/tests/wpt/tests/css/css-lists/add-inline-child-after-marker-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/add-inline-child-after-marker-001-ref.html rename to tests/wpt/tests/css/css-lists/add-inline-child-after-marker-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/add-inline-child-after-marker-001.html b/tests/wpt/tests/css/css-lists/add-inline-child-after-marker-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/add-inline-child-after-marker-001.html rename to tests/wpt/tests/css/css-lists/add-inline-child-after-marker-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/add-inline-child-after-marker-002-ref.html b/tests/wpt/tests/css/css-lists/add-inline-child-after-marker-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/add-inline-child-after-marker-002-ref.html rename to tests/wpt/tests/css/css-lists/add-inline-child-after-marker-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/add-inline-child-after-marker-002.html b/tests/wpt/tests/css/css-lists/add-inline-child-after-marker-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/add-inline-child-after-marker-002.html rename to tests/wpt/tests/css/css-lists/add-inline-child-after-marker-002.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/animations/list-style-image-interpolation.html b/tests/wpt/tests/css/css-lists/animations/list-style-image-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/animations/list-style-image-interpolation.html rename to tests/wpt/tests/css/css-lists/animations/list-style-image-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/before-after-selectors-on-code-element-crash.html b/tests/wpt/tests/css/css-lists/before-after-selectors-on-code-element-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/before-after-selectors-on-code-element-crash.html rename to tests/wpt/tests/css/css-lists/before-after-selectors-on-code-element-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-descendant-display-ref.html b/tests/wpt/tests/css/css-lists/change-list-descendant-display-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/change-list-descendant-display-ref.html rename to tests/wpt/tests/css/css-lists/change-list-descendant-display-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-descendant-display.html b/tests/wpt/tests/css/css-lists/change-list-descendant-display.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/change-list-descendant-display.html rename to tests/wpt/tests/css/css-lists/change-list-descendant-display.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-position-001-ref.html b/tests/wpt/tests/css/css-lists/change-list-style-position-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/change-list-style-position-001-ref.html rename to tests/wpt/tests/css/css-lists/change-list-style-position-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-position-001.html b/tests/wpt/tests/css/css-lists/change-list-style-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/change-list-style-position-001.html rename to tests/wpt/tests/css/css-lists/change-list-style-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-position-002-ref.html b/tests/wpt/tests/css/css-lists/change-list-style-position-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/change-list-style-position-002-ref.html rename to tests/wpt/tests/css/css-lists/change-list-style-position-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-position-002.html b/tests/wpt/tests/css/css-lists/change-list-style-position-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/change-list-style-position-002.html rename to tests/wpt/tests/css/css-lists/change-list-style-position-002.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-position-003-ref.html b/tests/wpt/tests/css/css-lists/change-list-style-position-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/change-list-style-position-003-ref.html rename to tests/wpt/tests/css/css-lists/change-list-style-position-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-position-003.html b/tests/wpt/tests/css/css-lists/change-list-style-position-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/change-list-style-position-003.html rename to tests/wpt/tests/css/css-lists/change-list-style-position-003.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-001-ref.html b/tests/wpt/tests/css/css-lists/change-list-style-type-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-001-ref.html rename to tests/wpt/tests/css/css-lists/change-list-style-type-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-001.html b/tests/wpt/tests/css/css-lists/change-list-style-type-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-001.html rename to tests/wpt/tests/css/css-lists/change-list-style-type-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-002-ref.html b/tests/wpt/tests/css/css-lists/change-list-style-type-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-002-ref.html rename to tests/wpt/tests/css/css-lists/change-list-style-type-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-002.html b/tests/wpt/tests/css/css-lists/change-list-style-type-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/change-list-style-type-002.html rename to tests/wpt/tests/css/css-lists/change-list-style-type-002.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-armenian-ref.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-armenian-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-armenian-ref.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-armenian-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-armenian.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-armenian.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-armenian.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-armenian.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-circle-ref.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-circle-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-circle-ref.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-circle-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-circle.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-circle.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-circle.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-circle.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero-ref.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero-ref.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-decimal-leading-zero.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-ref.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-decimal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal-ref.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-decimal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-decimal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-decimal.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-decimal.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-disc-ref.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-disc-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-disc-ref.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-disc-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-disc.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-disc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-disc.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-disc.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian-ref.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-georgian-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian-ref.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-georgian-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-georgian.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-georgian.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-georgian.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek-ref.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-lower-greek-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek-ref.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-lower-greek-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-lower-greek.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-greek.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-lower-greek.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin-ref.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-lower-latin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin-ref.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-lower-latin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-lower-latin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-latin.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-lower-latin.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-roman-ref.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-lower-roman-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-roman-ref.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-lower-roman-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-roman.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-lower-roman.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-lower-roman.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-lower-roman.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-square-ref.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-square-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-square-ref.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-square-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-square.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-square.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-square.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-square.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-latin-ref.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-upper-latin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-latin-ref.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-upper-latin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-latin.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-upper-latin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-latin.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-upper-latin.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-roman-ref.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-upper-roman-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-roman-ref.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-upper-roman-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-roman.html b/tests/wpt/tests/css/css-lists/content-property/marker-text-matches-upper-roman.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/content-property/marker-text-matches-upper-roman.html rename to tests/wpt/tests/css/css-lists/content-property/marker-text-matches-upper-roman.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-10-ref.html b/tests/wpt/tests/css/css-lists/counter-10-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-10-ref.html rename to tests/wpt/tests/css/css-lists/counter-10-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-7-ref.html b/tests/wpt/tests/css/css-lists/counter-7-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-7-ref.html rename to tests/wpt/tests/css/css-lists/counter-7-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-increment-inside-display-contents.html b/tests/wpt/tests/css/css-lists/counter-increment-inside-display-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-increment-inside-display-contents.html rename to tests/wpt/tests/css/css-lists/counter-increment-inside-display-contents.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-invalid.htm b/tests/wpt/tests/css/css-lists/counter-invalid.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-invalid.htm rename to tests/wpt/tests/css/css-lists/counter-invalid.htm diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-2-ref.html b/tests/wpt/tests/css/css-lists/counter-list-item-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-list-item-2-ref.html rename to tests/wpt/tests/css/css-lists/counter-list-item-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-2.html b/tests/wpt/tests/css/css-lists/counter-list-item-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-list-item-2.html rename to tests/wpt/tests/css/css-lists/counter-list-item-2.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-3-ref.html b/tests/wpt/tests/css/css-lists/counter-list-item-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-list-item-3-ref.html rename to tests/wpt/tests/css/css-lists/counter-list-item-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-3.html b/tests/wpt/tests/css/css-lists/counter-list-item-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-list-item-3.html rename to tests/wpt/tests/css/css-lists/counter-list-item-3.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-ref.html b/tests/wpt/tests/css/css-lists/counter-list-item-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-list-item-ref.html rename to tests/wpt/tests/css/css-lists/counter-list-item-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-slot-order-ref.html b/tests/wpt/tests/css/css-lists/counter-list-item-slot-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-list-item-slot-order-ref.html rename to tests/wpt/tests/css/css-lists/counter-list-item-slot-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-slot-order.html b/tests/wpt/tests/css/css-lists/counter-list-item-slot-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-list-item-slot-order.html rename to tests/wpt/tests/css/css-lists/counter-list-item-slot-order.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-list-item.html b/tests/wpt/tests/css/css-lists/counter-list-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-list-item.html rename to tests/wpt/tests/css/css-lists/counter-list-item.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-order-display-contents-ref.html b/tests/wpt/tests/css/css-lists/counter-order-display-contents-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-order-display-contents-ref.html rename to tests/wpt/tests/css/css-lists/counter-order-display-contents-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-order-display-contents.html b/tests/wpt/tests/css/css-lists/counter-order-display-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-order-display-contents.html rename to tests/wpt/tests/css/css-lists/counter-order-display-contents.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-set-display-contents.html b/tests/wpt/tests/css/css-lists/counter-reset-increment-set-display-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-set-display-contents.html rename to tests/wpt/tests/css/css-lists/counter-reset-increment-set-display-contents.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-set-display-none.html b/tests/wpt/tests/css/css-lists/counter-reset-increment-set-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-set-display-none.html rename to tests/wpt/tests/css/css-lists/counter-reset-increment-set-display-none.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-reset-inside-display-contents.html b/tests/wpt/tests/css/css-lists/counter-reset-inside-display-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-reset-inside-display-contents.html rename to tests/wpt/tests/css/css-lists/counter-reset-inside-display-contents.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-reset-reversed-list-item-start.html b/tests/wpt/tests/css/css-lists/counter-reset-reversed-list-item-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-reset-reversed-list-item-start.html rename to tests/wpt/tests/css/css-lists/counter-reset-reversed-list-item-start.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-reset-reversed-list-item.html b/tests/wpt/tests/css/css-lists/counter-reset-reversed-list-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-reset-reversed-list-item.html rename to tests/wpt/tests/css/css-lists/counter-reset-reversed-list-item.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-reset-reversed-not-list-item-start.html b/tests/wpt/tests/css/css-lists/counter-reset-reversed-not-list-item-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-reset-reversed-not-list-item-start.html rename to tests/wpt/tests/css/css-lists/counter-reset-reversed-not-list-item-start.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-reset-reversed-not-list-item.html b/tests/wpt/tests/css/css-lists/counter-reset-reversed-not-list-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-reset-reversed-not-list-item.html rename to tests/wpt/tests/css/css-lists/counter-reset-reversed-not-list-item.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-set-001-ref.html b/tests/wpt/tests/css/css-lists/counter-set-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-set-001-ref.html rename to tests/wpt/tests/css/css-lists/counter-set-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-set-001.html b/tests/wpt/tests/css/css-lists/counter-set-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-set-001.html rename to tests/wpt/tests/css/css-lists/counter-set-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-set-002-ref.html b/tests/wpt/tests/css/css-lists/counter-set-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-set-002-ref.html rename to tests/wpt/tests/css/css-lists/counter-set-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-set-002.html b/tests/wpt/tests/css/css-lists/counter-set-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-set-002.html rename to tests/wpt/tests/css/css-lists/counter-set-002.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-slot-order-ref.html b/tests/wpt/tests/css/css-lists/counter-slot-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-slot-order-ref.html rename to tests/wpt/tests/css/css-lists/counter-slot-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-slot-order-scoping-ref.html b/tests/wpt/tests/css/css-lists/counter-slot-order-scoping-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-slot-order-scoping-ref.html rename to tests/wpt/tests/css/css-lists/counter-slot-order-scoping-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-slot-order-scoping.html b/tests/wpt/tests/css/css-lists/counter-slot-order-scoping.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-slot-order-scoping.html rename to tests/wpt/tests/css/css-lists/counter-slot-order-scoping.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-slot-order.html b/tests/wpt/tests/css/css-lists/counter-slot-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/counter-slot-order.html rename to tests/wpt/tests/css/css-lists/counter-slot-order.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/crashtests/chrome-counter-in-multicol-details-crash.html b/tests/wpt/tests/css/css-lists/crashtests/chrome-counter-in-multicol-details-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/crashtests/chrome-counter-in-multicol-details-crash.html rename to tests/wpt/tests/css/css-lists/crashtests/chrome-counter-in-multicol-details-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/crashtests/chrome-legacy-propagation-crash.html b/tests/wpt/tests/css/css-lists/crashtests/chrome-legacy-propagation-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/crashtests/chrome-legacy-propagation-crash.html rename to tests/wpt/tests/css/css-lists/crashtests/chrome-legacy-propagation-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/crashtests/chrome-legacy-propagation-remove-body-crash.html b/tests/wpt/tests/css/css-lists/crashtests/chrome-legacy-propagation-remove-body-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/crashtests/chrome-legacy-propagation-remove-body-crash.html rename to tests/wpt/tests/css/css-lists/crashtests/chrome-legacy-propagation-remove-body-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/crashtests/firefox-bug-1715631.html b/tests/wpt/tests/css/css-lists/crashtests/firefox-bug-1715631.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/crashtests/firefox-bug-1715631.html rename to tests/wpt/tests/css/css-lists/crashtests/firefox-bug-1715631.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/css-lists-no-interpolation.html b/tests/wpt/tests/css/css-lists/css-lists-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/css-lists-no-interpolation.html rename to tests/wpt/tests/css/css-lists/css-lists-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-006a.html b/tests/wpt/tests/css/css-lists/foo-counter-reversed-006a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-006a.html rename to tests/wpt/tests/css/css-lists/foo-counter-reversed-006a.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-006b.html b/tests/wpt/tests/css/css-lists/foo-counter-reversed-006b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-006b.html rename to tests/wpt/tests/css/css-lists/foo-counter-reversed-006b.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-006c.html b/tests/wpt/tests/css/css-lists/foo-counter-reversed-006c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-006c.html rename to tests/wpt/tests/css/css-lists/foo-counter-reversed-006c.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-006d.html b/tests/wpt/tests/css/css-lists/foo-counter-reversed-006d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-006d.html rename to tests/wpt/tests/css/css-lists/foo-counter-reversed-006d.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-006e.html b/tests/wpt/tests/css/css-lists/foo-counter-reversed-006e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-006e.html rename to tests/wpt/tests/css/css-lists/foo-counter-reversed-006e.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-007a.html b/tests/wpt/tests/css/css-lists/foo-counter-reversed-007a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-007a.html rename to tests/wpt/tests/css/css-lists/foo-counter-reversed-007a.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-007b.html b/tests/wpt/tests/css/css-lists/foo-counter-reversed-007b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-007b.html rename to tests/wpt/tests/css/css-lists/foo-counter-reversed-007b.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-008a.html b/tests/wpt/tests/css/css-lists/foo-counter-reversed-008a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-008a.html rename to tests/wpt/tests/css/css-lists/foo-counter-reversed-008a.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-008b.html b/tests/wpt/tests/css/css-lists/foo-counter-reversed-008b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-008b.html rename to tests/wpt/tests/css/css-lists/foo-counter-reversed-008b.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-009a.html b/tests/wpt/tests/css/css-lists/foo-counter-reversed-009a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-009a.html rename to tests/wpt/tests/css/css-lists/foo-counter-reversed-009a.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-009b.html b/tests/wpt/tests/css/css-lists/foo-counter-reversed-009b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/foo-counter-reversed-009b.html rename to tests/wpt/tests/css/css-lists/foo-counter-reversed-009b.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/inherit-overwrites.html b/tests/wpt/tests/css/css-lists/inherit-overwrites.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/inherit-overwrites.html rename to tests/wpt/tests/css/css-lists/inherit-overwrites.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/inheritance.html b/tests/wpt/tests/css/css-lists/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/inheritance.html rename to tests/wpt/tests/css/css-lists/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/inline-block-list-marker-ref.html b/tests/wpt/tests/css/css-lists/inline-block-list-marker-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/inline-block-list-marker-ref.html rename to tests/wpt/tests/css/css-lists/inline-block-list-marker-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/inline-block-list-marker.html b/tests/wpt/tests/css/css-lists/inline-block-list-marker.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/inline-block-list-marker.html rename to tests/wpt/tests/css/css-lists/inline-block-list-marker.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/inline-block-list-ref.html b/tests/wpt/tests/css/css-lists/inline-block-list-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/inline-block-list-ref.html rename to tests/wpt/tests/css/css-lists/inline-block-list-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/inline-block-list.html b/tests/wpt/tests/css/css-lists/inline-block-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/inline-block-list.html rename to tests/wpt/tests/css/css-lists/inline-block-list.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/inline-list-marker-ref.html b/tests/wpt/tests/css/css-lists/inline-list-marker-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/inline-list-marker-ref.html rename to tests/wpt/tests/css/css-lists/inline-list-marker-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/inline-list-marker.html b/tests/wpt/tests/css/css-lists/inline-list-marker.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/inline-list-marker.html rename to tests/wpt/tests/css/css-lists/inline-list-marker.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/inline-list-ref.html b/tests/wpt/tests/css/css-lists/inline-list-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/inline-list-ref.html rename to tests/wpt/tests/css/css-lists/inline-list-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/inline-list-with-table-child-ref.html b/tests/wpt/tests/css/css-lists/inline-list-with-table-child-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/inline-list-with-table-child-ref.html rename to tests/wpt/tests/css/css-lists/inline-list-with-table-child-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/inline-list-with-table-child.html b/tests/wpt/tests/css/css-lists/inline-list-with-table-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/inline-list-with-table-child.html rename to tests/wpt/tests/css/css-lists/inline-list-with-table-child.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/inline-list.html b/tests/wpt/tests/css/css-lists/inline-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/inline-list.html rename to tests/wpt/tests/css/css-lists/inline-list.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-counter-increment-computed-style.html b/tests/wpt/tests/css/css-lists/li-counter-increment-computed-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-counter-increment-computed-style.html rename to tests/wpt/tests/css/css-lists/li-counter-increment-computed-style.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-insert-child-ref.html b/tests/wpt/tests/css/css-lists/li-insert-child-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-insert-child-ref.html rename to tests/wpt/tests/css/css-lists/li-insert-child-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-insert-child.html b/tests/wpt/tests/css/css-lists/li-insert-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-insert-child.html rename to tests/wpt/tests/css/css-lists/li-insert-child.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-list-item-counter-ref.html b/tests/wpt/tests/css/css-lists/li-list-item-counter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-list-item-counter-ref.html rename to tests/wpt/tests/css/css-lists/li-list-item-counter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-list-item-counter.html b/tests/wpt/tests/css/css-lists/li-list-item-counter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-list-item-counter.html rename to tests/wpt/tests/css/css-lists/li-list-item-counter.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-counter-reset-001-ref.html b/tests/wpt/tests/css/css-lists/li-value-counter-reset-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-counter-reset-001-ref.html rename to tests/wpt/tests/css/css-lists/li-value-counter-reset-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-counter-reset-001.html b/tests/wpt/tests/css/css-lists/li-value-counter-reset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-counter-reset-001.html rename to tests/wpt/tests/css/css-lists/li-value-counter-reset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-001-ref.html b/tests/wpt/tests/css/css-lists/li-value-reversed-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-001-ref.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-001.html b/tests/wpt/tests/css/css-lists/li-value-reversed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-001.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-002-ref.html b/tests/wpt/tests/css/css-lists/li-value-reversed-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-002-ref.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-002.html b/tests/wpt/tests/css/css-lists/li-value-reversed-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-002.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-002.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-003.html b/tests/wpt/tests/css/css-lists/li-value-reversed-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-003.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-003.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-004-ref.html b/tests/wpt/tests/css/css-lists/li-value-reversed-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-004-ref.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-004.html b/tests/wpt/tests/css/css-lists/li-value-reversed-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-004.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-004.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-005-ref.html b/tests/wpt/tests/css/css-lists/li-value-reversed-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-005-ref.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-005.html b/tests/wpt/tests/css/css-lists/li-value-reversed-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-005.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-005.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-006-ref.html b/tests/wpt/tests/css/css-lists/li-value-reversed-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-006-ref.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-006a.html b/tests/wpt/tests/css/css-lists/li-value-reversed-006a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-006a.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-006a.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-006b.html b/tests/wpt/tests/css/css-lists/li-value-reversed-006b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-006b.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-006b.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-006c.html b/tests/wpt/tests/css/css-lists/li-value-reversed-006c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-006c.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-006c.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-006d.html b/tests/wpt/tests/css/css-lists/li-value-reversed-006d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-006d.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-006d.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-006e.html b/tests/wpt/tests/css/css-lists/li-value-reversed-006e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-006e.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-006e.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-007-ref.html b/tests/wpt/tests/css/css-lists/li-value-reversed-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-007-ref.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-007a.html b/tests/wpt/tests/css/css-lists/li-value-reversed-007a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-007a.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-007a.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-007b.html b/tests/wpt/tests/css/css-lists/li-value-reversed-007b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-007b.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-007b.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-008-ref.html b/tests/wpt/tests/css/css-lists/li-value-reversed-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-008-ref.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-008a.html b/tests/wpt/tests/css/css-lists/li-value-reversed-008a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-008a.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-008a.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-008b.html b/tests/wpt/tests/css/css-lists/li-value-reversed-008b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-008b.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-008b.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-009-ref.html b/tests/wpt/tests/css/css-lists/li-value-reversed-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-009-ref.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-009a.html b/tests/wpt/tests/css/css-lists/li-value-reversed-009a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-009a.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-009a.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-009b.html b/tests/wpt/tests/css/css-lists/li-value-reversed-009b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-value-reversed-009b.html rename to tests/wpt/tests/css/css-lists/li-value-reversed-009b.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-with-height-001-ref.html b/tests/wpt/tests/css/css-lists/li-with-height-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-with-height-001-ref.html rename to tests/wpt/tests/css/css-lists/li-with-height-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-with-height-001.html b/tests/wpt/tests/css/css-lists/li-with-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-with-height-001.html rename to tests/wpt/tests/css/css-lists/li-with-height-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001-ref.html b/tests/wpt/tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001-ref.html rename to tests/wpt/tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001.html b/tests/wpt/tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001.html rename to tests/wpt/tests/css/css-lists/li-with-overflow-hidden-change-list-style-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-and-block-in-inline-ref.html b/tests/wpt/tests/css/css-lists/list-and-block-in-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-and-block-in-inline-ref.html rename to tests/wpt/tests/css/css-lists/list-and-block-in-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-and-block-in-inline.html b/tests/wpt/tests/css/css-lists/list-and-block-in-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-and-block-in-inline.html rename to tests/wpt/tests/css/css-lists/list-and-block-in-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-and-block-textarea-001.html b/tests/wpt/tests/css/css-lists/list-and-block-textarea-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-and-block-textarea-001.html rename to tests/wpt/tests/css/css-lists/list-and-block-textarea-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-and-flex-001-ref.html b/tests/wpt/tests/css/css-lists/list-and-flex-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-and-flex-001-ref.html rename to tests/wpt/tests/css/css-lists/list-and-flex-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-and-flex-001.html b/tests/wpt/tests/css/css-lists/list-and-flex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-and-flex-001.html rename to tests/wpt/tests/css/css-lists/list-and-flex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-and-grid-001-ref.html b/tests/wpt/tests/css/css-lists/list-and-grid-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-and-grid-001-ref.html rename to tests/wpt/tests/css/css-lists/list-and-grid-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-and-grid-001.html b/tests/wpt/tests/css/css-lists/list-and-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-and-grid-001.html rename to tests/wpt/tests/css/css-lists/list-and-grid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-and-margin-collapse-001.html b/tests/wpt/tests/css/css-lists/list-and-margin-collapse-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-and-margin-collapse-001.html rename to tests/wpt/tests/css/css-lists/list-and-margin-collapse-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-and-margin-collapse-002.html b/tests/wpt/tests/css/css-lists/list-and-margin-collapse-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-and-margin-collapse-002.html rename to tests/wpt/tests/css/css-lists/list-and-margin-collapse-002.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-and-writing-mode-001.html b/tests/wpt/tests/css/css-lists/list-and-writing-mode-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-and-writing-mode-001.html rename to tests/wpt/tests/css/css-lists/list-and-writing-mode-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-inside-contain.html b/tests/wpt/tests/css/css-lists/list-inside-contain.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-inside-contain.html rename to tests/wpt/tests/css/css-lists/list-inside-contain.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-item-definition-ref.html b/tests/wpt/tests/css/css-lists/list-item-definition-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-item-definition-ref.html rename to tests/wpt/tests/css/css-lists/list-item-definition-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-item-definition.html b/tests/wpt/tests/css/css-lists/list-item-definition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-item-definition.html rename to tests/wpt/tests/css/css-lists/list-item-definition.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-marker-alignment-ref.html b/tests/wpt/tests/css/css-lists/list-marker-alignment-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-marker-alignment-ref.html rename to tests/wpt/tests/css/css-lists/list-marker-alignment-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-marker-alignment.html b/tests/wpt/tests/css/css-lists/list-marker-alignment.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-marker-alignment.html rename to tests/wpt/tests/css/css-lists/list-marker-alignment.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-marker-containing-control-char-crash.html b/tests/wpt/tests/css/css-lists/list-marker-containing-control-char-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-marker-containing-control-char-crash.html rename to tests/wpt/tests/css/css-lists/list-marker-containing-control-char-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-marker-position-crash.html b/tests/wpt/tests/css/css-lists/list-marker-position-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-marker-position-crash.html rename to tests/wpt/tests/css/css-lists/list-marker-position-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-marker-symbol-bidi-ref.html b/tests/wpt/tests/css/css-lists/list-marker-symbol-bidi-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-marker-symbol-bidi-ref.html rename to tests/wpt/tests/css/css-lists/list-marker-symbol-bidi-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-marker-symbol-bidi.html b/tests/wpt/tests/css/css-lists/list-marker-symbol-bidi.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-marker-symbol-bidi.html rename to tests/wpt/tests/css/css-lists/list-marker-symbol-bidi.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001-ref.html b/tests/wpt/tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001-ref.html rename to tests/wpt/tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html b/tests/wpt/tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html rename to tests/wpt/tests/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-image-gradients-dynamic-ref.html b/tests/wpt/tests/css/css-lists/list-style-image-gradients-dynamic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-image-gradients-dynamic-ref.html rename to tests/wpt/tests/css/css-lists/list-style-image-gradients-dynamic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-image-gradients-dynamic.html b/tests/wpt/tests/css/css-lists/list-style-image-gradients-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-image-gradients-dynamic.html rename to tests/wpt/tests/css/css-lists/list-style-image-gradients-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-image-gradients-ref.html b/tests/wpt/tests/css/css-lists/list-style-image-gradients-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-image-gradients-ref.html rename to tests/wpt/tests/css/css-lists/list-style-image-gradients-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-image-gradients.html b/tests/wpt/tests/css/css-lists/list-style-image-gradients.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-image-gradients.html rename to tests/wpt/tests/css/css-lists/list-style-image-gradients.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-image-zoom-dynamic-ref.html b/tests/wpt/tests/css/css-lists/list-style-image-zoom-dynamic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-image-zoom-dynamic-ref.html rename to tests/wpt/tests/css/css-lists/list-style-image-zoom-dynamic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-image-zoom-dynamic.html b/tests/wpt/tests/css/css-lists/list-style-image-zoom-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-image-zoom-dynamic.html rename to tests/wpt/tests/css/css-lists/list-style-image-zoom-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-armenian-002.xht b/tests/wpt/tests/css/css-lists/list-style-type-armenian-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-armenian-002.xht rename to tests/wpt/tests/css/css-lists/list-style-type-armenian-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-armenian-003.xht b/tests/wpt/tests/css/css-lists/list-style-type-armenian-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-armenian-003.xht rename to tests/wpt/tests/css/css-lists/list-style-type-armenian-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-decimal-line-height-ref.html b/tests/wpt/tests/css/css-lists/list-style-type-decimal-line-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-decimal-line-height-ref.html rename to tests/wpt/tests/css/css-lists/list-style-type-decimal-line-height-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-decimal-line-height.html b/tests/wpt/tests/css/css-lists/list-style-type-decimal-line-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-decimal-line-height.html rename to tests/wpt/tests/css/css-lists/list-style-type-decimal-line-height.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-decimal-vertical-lr-ref.html b/tests/wpt/tests/css/css-lists/list-style-type-decimal-vertical-lr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-decimal-vertical-lr-ref.html rename to tests/wpt/tests/css/css-lists/list-style-type-decimal-vertical-lr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-decimal-vertical-lr.html b/tests/wpt/tests/css/css-lists/list-style-type-decimal-vertical-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-decimal-vertical-lr.html rename to tests/wpt/tests/css/css-lists/list-style-type-decimal-vertical-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-decimal-vertical-rl-ref.html b/tests/wpt/tests/css/css-lists/list-style-type-decimal-vertical-rl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-decimal-vertical-rl-ref.html rename to tests/wpt/tests/css/css-lists/list-style-type-decimal-vertical-rl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-decimal-vertical-rl.html b/tests/wpt/tests/css/css-lists/list-style-type-decimal-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-decimal-vertical-rl.html rename to tests/wpt/tests/css/css-lists/list-style-type-decimal-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-001-ref.html b/tests/wpt/tests/css/css-lists/list-style-type-string-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-001-ref.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-001a.html b/tests/wpt/tests/css/css-lists/list-style-type-string-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-001a.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-001b.html b/tests/wpt/tests/css/css-lists/list-style-type-string-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-001b.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-002-ref.html b/tests/wpt/tests/css/css-lists/list-style-type-string-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-002-ref.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-002.html b/tests/wpt/tests/css/css-lists/list-style-type-string-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-002.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-002.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-003-ref.html b/tests/wpt/tests/css/css-lists/list-style-type-string-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-003-ref.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-003.html b/tests/wpt/tests/css/css-lists/list-style-type-string-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-003.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-003.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-004-ref.html b/tests/wpt/tests/css/css-lists/list-style-type-string-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-004-ref.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-004.html b/tests/wpt/tests/css/css-lists/list-style-type-string-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-004.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-004.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-005-ref.html b/tests/wpt/tests/css/css-lists/list-style-type-string-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-005-ref.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-005a.html b/tests/wpt/tests/css/css-lists/list-style-type-string-005a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-005a.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-005a.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-005b.html b/tests/wpt/tests/css/css-lists/list-style-type-string-005b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-005b.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-005b.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-006-ref.html b/tests/wpt/tests/css/css-lists/list-style-type-string-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-006-ref.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-006.html b/tests/wpt/tests/css/css-lists/list-style-type-string-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-006.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-006.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-007-ref.html b/tests/wpt/tests/css/css-lists/list-style-type-string-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-007-ref.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-007.html b/tests/wpt/tests/css/css-lists/list-style-type-string-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-style-type-string-007.html rename to tests/wpt/tests/css/css-lists/list-style-type-string-007.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-type-none-style-image-ref.html b/tests/wpt/tests/css/css-lists/list-type-none-style-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-type-none-style-image-ref.html rename to tests/wpt/tests/css/css-lists/list-type-none-style-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-type-none-style-image.html b/tests/wpt/tests/css/css-lists/list-type-none-style-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-type-none-style-image.html rename to tests/wpt/tests/css/css-lists/list-type-none-style-image.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-with-image-display-changed-001-ref.html b/tests/wpt/tests/css/css-lists/list-with-image-display-changed-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-with-image-display-changed-001-ref.html rename to tests/wpt/tests/css/css-lists/list-with-image-display-changed-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/list-with-image-display-changed-001.html b/tests/wpt/tests/css/css-lists/list-with-image-display-changed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/list-with-image-display-changed-001.html rename to tests/wpt/tests/css/css-lists/list-with-image-display-changed-001.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/marker-dynamic-content-change-ref.html b/tests/wpt/tests/css/css-lists/marker-dynamic-content-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/marker-dynamic-content-change-ref.html rename to tests/wpt/tests/css/css-lists/marker-dynamic-content-change-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/marker-dynamic-content-change.html b/tests/wpt/tests/css/css-lists/marker-dynamic-content-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/marker-dynamic-content-change.html rename to tests/wpt/tests/css/css-lists/marker-dynamic-content-change.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/marker-webkit-text-fill-color-ref.html b/tests/wpt/tests/css/css-lists/marker-webkit-text-fill-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/marker-webkit-text-fill-color-ref.html rename to tests/wpt/tests/css/css-lists/marker-webkit-text-fill-color-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/marker-webkit-text-fill-color.html b/tests/wpt/tests/css/css-lists/marker-webkit-text-fill-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/marker-webkit-text-fill-color.html rename to tests/wpt/tests/css/css-lists/marker-webkit-text-fill-color.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/nested-list-with-list-style-type-none.html b/tests/wpt/tests/css/css-lists/nested-list-with-list-style-type-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/nested-list-with-list-style-type-none.html rename to tests/wpt/tests/css/css-lists/nested-list-with-list-style-type-none.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/nested-marker-dynamic.html b/tests/wpt/tests/css/css-lists/nested-marker-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/nested-marker-dynamic.html rename to tests/wpt/tests/css/css-lists/nested-marker-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/nested-marker-ref.html b/tests/wpt/tests/css/css-lists/nested-marker-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/nested-marker-ref.html rename to tests/wpt/tests/css/css-lists/nested-marker-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/nested-marker.html b/tests/wpt/tests/css/css-lists/nested-marker.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/nested-marker.html rename to tests/wpt/tests/css/css-lists/nested-marker.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/ol-change-display-type-ref.html b/tests/wpt/tests/css/css-lists/ol-change-display-type-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/ol-change-display-type-ref.html rename to tests/wpt/tests/css/css-lists/ol-change-display-type-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/ol-change-display-type.html b/tests/wpt/tests/css/css-lists/ol-change-display-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/ol-change-display-type.html rename to tests/wpt/tests/css/css-lists/ol-change-display-type.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/content-invalid.html b/tests/wpt/tests/css/css-lists/parsing/content-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/content-invalid.html rename to tests/wpt/tests/css/css-lists/parsing/content-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/counter-increment-invalid.html b/tests/wpt/tests/css/css-lists/parsing/counter-increment-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/counter-increment-invalid.html rename to tests/wpt/tests/css/css-lists/parsing/counter-increment-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/counter-increment-valid.html b/tests/wpt/tests/css/css-lists/parsing/counter-increment-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/counter-increment-valid.html rename to tests/wpt/tests/css/css-lists/parsing/counter-increment-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/counter-reset-invalid.html b/tests/wpt/tests/css/css-lists/parsing/counter-reset-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/counter-reset-invalid.html rename to tests/wpt/tests/css/css-lists/parsing/counter-reset-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/counter-reset-valid.html b/tests/wpt/tests/css/css-lists/parsing/counter-reset-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/counter-reset-valid.html rename to tests/wpt/tests/css/css-lists/parsing/counter-reset-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/counter-set-computed.html b/tests/wpt/tests/css/css-lists/parsing/counter-set-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/counter-set-computed.html rename to tests/wpt/tests/css/css-lists/parsing/counter-set-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/counter-set-invalid.html b/tests/wpt/tests/css/css-lists/parsing/counter-set-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/counter-set-invalid.html rename to tests/wpt/tests/css/css-lists/parsing/counter-set-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/counter-set-valid.html b/tests/wpt/tests/css/css-lists/parsing/counter-set-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/counter-set-valid.html rename to tests/wpt/tests/css/css-lists/parsing/counter-set-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-computed.sub.html b/tests/wpt/tests/css/css-lists/parsing/list-style-computed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-computed.sub.html rename to tests/wpt/tests/css/css-lists/parsing/list-style-computed.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-image-computed.sub.html b/tests/wpt/tests/css/css-lists/parsing/list-style-image-computed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-image-computed.sub.html rename to tests/wpt/tests/css/css-lists/parsing/list-style-image-computed.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-image-invalid.html b/tests/wpt/tests/css/css-lists/parsing/list-style-image-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-image-invalid.html rename to tests/wpt/tests/css/css-lists/parsing/list-style-image-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-image-valid.html b/tests/wpt/tests/css/css-lists/parsing/list-style-image-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-image-valid.html rename to tests/wpt/tests/css/css-lists/parsing/list-style-image-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-invalid.html b/tests/wpt/tests/css/css-lists/parsing/list-style-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-invalid.html rename to tests/wpt/tests/css/css-lists/parsing/list-style-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-position-computed.html b/tests/wpt/tests/css/css-lists/parsing/list-style-position-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-position-computed.html rename to tests/wpt/tests/css/css-lists/parsing/list-style-position-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-position-invalid.html b/tests/wpt/tests/css/css-lists/parsing/list-style-position-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-position-invalid.html rename to tests/wpt/tests/css/css-lists/parsing/list-style-position-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-position-valid.html b/tests/wpt/tests/css/css-lists/parsing/list-style-position-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-position-valid.html rename to tests/wpt/tests/css/css-lists/parsing/list-style-position-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-shorthand.sub.html b/tests/wpt/tests/css/css-lists/parsing/list-style-shorthand.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-shorthand.sub.html rename to tests/wpt/tests/css/css-lists/parsing/list-style-shorthand.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-type-computed.html b/tests/wpt/tests/css/css-lists/parsing/list-style-type-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-type-computed.html rename to tests/wpt/tests/css/css-lists/parsing/list-style-type-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-type-invalid.html b/tests/wpt/tests/css/css-lists/parsing/list-style-type-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-type-invalid.html rename to tests/wpt/tests/css/css-lists/parsing/list-style-type-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-type-valid.html b/tests/wpt/tests/css/css-lists/parsing/list-style-type-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-type-valid.html rename to tests/wpt/tests/css/css-lists/parsing/list-style-type-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-valid.html b/tests/wpt/tests/css/css-lists/parsing/list-style-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/parsing/list-style-valid.html rename to tests/wpt/tests/css/css-lists/parsing/list-style-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-lists/resources/blue-20.png b/tests/wpt/tests/css/css-lists/resources/blue-20.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/resources/blue-20.png rename to tests/wpt/tests/css/css-lists/resources/blue-20.png diff --git a/tests/wpt/web-platform-tests/css/css-lists/resources/green-20.png b/tests/wpt/tests/css/css-lists/resources/green-20.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/resources/green-20.png rename to tests/wpt/tests/css/css-lists/resources/green-20.png diff --git a/tests/wpt/web-platform-tests/css/css-lists/resources/stripes-20.png b/tests/wpt/tests/css/css-lists/resources/stripes-20.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/resources/stripes-20.png rename to tests/wpt/tests/css/css-lists/resources/stripes-20.png diff --git a/tests/wpt/web-platform-tests/css/css-lists/resources/white.gif b/tests/wpt/tests/css/css-lists/resources/white.gif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-lists/resources/white.gif rename to tests/wpt/tests/css/css-lists/resources/white.gif diff --git a/tests/wpt/web-platform-tests/css/css-logical/META.yml b/tests/wpt/tests/css/css-logical/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/META.yml rename to tests/wpt/tests/css/css-logical/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-logical/animation-001.html b/tests/wpt/tests/css/css-logical/animation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/animation-001.html rename to tests/wpt/tests/css/css-logical/animation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/animation-002.html b/tests/wpt/tests/css/css-logical/animation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/animation-002.html rename to tests/wpt/tests/css/css-logical/animation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/animation-003.tentative.html b/tests/wpt/tests/css/css-logical/animation-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/animation-003.tentative.html rename to tests/wpt/tests/css/css-logical/animation-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/animation-004.html b/tests/wpt/tests/css/css-logical/animation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/animation-004.html rename to tests/wpt/tests/css/css-logical/animation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/animations/caption-side-no-interpolation.html b/tests/wpt/tests/css/css-logical/animations/caption-side-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/animations/caption-side-no-interpolation.html rename to tests/wpt/tests/css/css-logical/animations/caption-side-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/animations/float-interpolation.html b/tests/wpt/tests/css/css-logical/animations/float-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/animations/float-interpolation.html rename to tests/wpt/tests/css/css-logical/animations/float-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/cascading-001-ref.html b/tests/wpt/tests/css/css-logical/cascading-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/cascading-001-ref.html rename to tests/wpt/tests/css/css-logical/cascading-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/cascading-001.html b/tests/wpt/tests/css/css-logical/cascading-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/cascading-001.html rename to tests/wpt/tests/css/css-logical/cascading-001.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/getComputedStyle-listing.html b/tests/wpt/tests/css/css-logical/getComputedStyle-listing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/getComputedStyle-listing.html rename to tests/wpt/tests/css/css-logical/getComputedStyle-listing.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/inheritance.html b/tests/wpt/tests/css/css-logical/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/inheritance.html rename to tests/wpt/tests/css/css-logical/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-box-border-color.html b/tests/wpt/tests/css/css-logical/logical-box-border-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-box-border-color.html rename to tests/wpt/tests/css/css-logical/logical-box-border-color.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-box-border-radius.html b/tests/wpt/tests/css/css-logical/logical-box-border-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-box-border-radius.html rename to tests/wpt/tests/css/css-logical/logical-box-border-radius.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-box-border-shorthands.html b/tests/wpt/tests/css/css-logical/logical-box-border-shorthands.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-box-border-shorthands.html rename to tests/wpt/tests/css/css-logical/logical-box-border-shorthands.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-box-border-style.html b/tests/wpt/tests/css/css-logical/logical-box-border-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-box-border-style.html rename to tests/wpt/tests/css/css-logical/logical-box-border-style.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-box-border-width.html b/tests/wpt/tests/css/css-logical/logical-box-border-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-box-border-width.html rename to tests/wpt/tests/css/css-logical/logical-box-border-width.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-box-inset.html b/tests/wpt/tests/css/css-logical/logical-box-inset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-box-inset.html rename to tests/wpt/tests/css/css-logical/logical-box-inset.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-box-margin.html b/tests/wpt/tests/css/css-logical/logical-box-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-box-margin.html rename to tests/wpt/tests/css/css-logical/logical-box-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-box-padding.html b/tests/wpt/tests/css/css-logical/logical-box-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-box-padding.html rename to tests/wpt/tests/css/css-logical/logical-box-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-box-size.html b/tests/wpt/tests/css/css-logical/logical-box-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-box-size.html rename to tests/wpt/tests/css/css-logical/logical-box-size.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-values-float-clear-1.html b/tests/wpt/tests/css/css-logical/logical-values-float-clear-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-values-float-clear-1.html rename to tests/wpt/tests/css/css-logical/logical-values-float-clear-1.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-values-float-clear-2.html b/tests/wpt/tests/css/css-logical/logical-values-float-clear-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-values-float-clear-2.html rename to tests/wpt/tests/css/css-logical/logical-values-float-clear-2.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-values-float-clear-3.html b/tests/wpt/tests/css/css-logical/logical-values-float-clear-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-values-float-clear-3.html rename to tests/wpt/tests/css/css-logical/logical-values-float-clear-3.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-values-float-clear-4.html b/tests/wpt/tests/css/css-logical/logical-values-float-clear-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-values-float-clear-4.html rename to tests/wpt/tests/css/css-logical/logical-values-float-clear-4.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-values-float-clear-reftest.html b/tests/wpt/tests/css/css-logical/logical-values-float-clear-reftest.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-values-float-clear-reftest.html rename to tests/wpt/tests/css/css-logical/logical-values-float-clear-reftest.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-values-float-clear.html b/tests/wpt/tests/css/css-logical/logical-values-float-clear.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-values-float-clear.html rename to tests/wpt/tests/css/css-logical/logical-values-float-clear.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logical-values-resize.html b/tests/wpt/tests/css/css-logical/logical-values-resize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logical-values-resize.html rename to tests/wpt/tests/css/css-logical/logical-values-resize.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logicalprops-block-size-vlr.html b/tests/wpt/tests/css/css-logical/logicalprops-block-size-vlr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logicalprops-block-size-vlr.html rename to tests/wpt/tests/css/css-logical/logicalprops-block-size-vlr.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logicalprops-block-size.html b/tests/wpt/tests/css/css-logical/logicalprops-block-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logicalprops-block-size.html rename to tests/wpt/tests/css/css-logical/logicalprops-block-size.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logicalprops-inline-size-vlr.html b/tests/wpt/tests/css/css-logical/logicalprops-inline-size-vlr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logicalprops-inline-size-vlr.html rename to tests/wpt/tests/css/css-logical/logicalprops-inline-size-vlr.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logicalprops-inline-size.html b/tests/wpt/tests/css/css-logical/logicalprops-inline-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logicalprops-inline-size.html rename to tests/wpt/tests/css/css-logical/logicalprops-inline-size.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logicalprops-quirklength.html b/tests/wpt/tests/css/css-logical/logicalprops-quirklength.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logicalprops-quirklength.html rename to tests/wpt/tests/css/css-logical/logicalprops-quirklength.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logicalprops-with-deferred-writing-mode.html b/tests/wpt/tests/css/css-logical/logicalprops-with-deferred-writing-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logicalprops-with-deferred-writing-mode.html rename to tests/wpt/tests/css/css-logical/logicalprops-with-deferred-writing-mode.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/logicalprops-with-variables.html b/tests/wpt/tests/css/css-logical/logicalprops-with-variables.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/logicalprops-with-variables.html rename to tests/wpt/tests/css/css-logical/logicalprops-with-variables.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/block-size-computed.html b/tests/wpt/tests/css/css-logical/parsing/block-size-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/block-size-computed.html rename to tests/wpt/tests/css/css-logical/parsing/block-size-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/block-size-invalid.html b/tests/wpt/tests/css/css-logical/parsing/block-size-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/block-size-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/block-size-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/block-size-valid.html b/tests/wpt/tests/css/css-logical/parsing/block-size-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/block-size-valid.html rename to tests/wpt/tests/css/css-logical/parsing/block-size-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-color-computed.html b/tests/wpt/tests/css/css-logical/parsing/border-block-color-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-color-computed.html rename to tests/wpt/tests/css/css-logical/parsing/border-block-color-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-color-invalid.html b/tests/wpt/tests/css/css-logical/parsing/border-block-color-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-color-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/border-block-color-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-color-valid.html b/tests/wpt/tests/css/css-logical/parsing/border-block-color-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-color-valid.html rename to tests/wpt/tests/css/css-logical/parsing/border-block-color-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-style-computed.html b/tests/wpt/tests/css/css-logical/parsing/border-block-style-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-style-computed.html rename to tests/wpt/tests/css/css-logical/parsing/border-block-style-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-style-invalid.html b/tests/wpt/tests/css/css-logical/parsing/border-block-style-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-style-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/border-block-style-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-style-valid.html b/tests/wpt/tests/css/css-logical/parsing/border-block-style-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-style-valid.html rename to tests/wpt/tests/css/css-logical/parsing/border-block-style-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-valid.html b/tests/wpt/tests/css/css-logical/parsing/border-block-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-valid.html rename to tests/wpt/tests/css/css-logical/parsing/border-block-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-width-computed.html b/tests/wpt/tests/css/css-logical/parsing/border-block-width-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-width-computed.html rename to tests/wpt/tests/css/css-logical/parsing/border-block-width-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-width-invalid.html b/tests/wpt/tests/css/css-logical/parsing/border-block-width-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-width-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/border-block-width-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-width-valid.html b/tests/wpt/tests/css/css-logical/parsing/border-block-width-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-block-width-valid.html rename to tests/wpt/tests/css/css-logical/parsing/border-block-width-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-color-computed.html b/tests/wpt/tests/css/css-logical/parsing/border-inline-color-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-color-computed.html rename to tests/wpt/tests/css/css-logical/parsing/border-inline-color-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-color-invalid.html b/tests/wpt/tests/css/css-logical/parsing/border-inline-color-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-color-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/border-inline-color-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-color-valid.html b/tests/wpt/tests/css/css-logical/parsing/border-inline-color-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-color-valid.html rename to tests/wpt/tests/css/css-logical/parsing/border-inline-color-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-style-computed.html b/tests/wpt/tests/css/css-logical/parsing/border-inline-style-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-style-computed.html rename to tests/wpt/tests/css/css-logical/parsing/border-inline-style-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-style-invalid.html b/tests/wpt/tests/css/css-logical/parsing/border-inline-style-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-style-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/border-inline-style-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-style-valid.html b/tests/wpt/tests/css/css-logical/parsing/border-inline-style-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-style-valid.html rename to tests/wpt/tests/css/css-logical/parsing/border-inline-style-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-valid.html b/tests/wpt/tests/css/css-logical/parsing/border-inline-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-valid.html rename to tests/wpt/tests/css/css-logical/parsing/border-inline-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-width-computed.html b/tests/wpt/tests/css/css-logical/parsing/border-inline-width-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-width-computed.html rename to tests/wpt/tests/css/css-logical/parsing/border-inline-width-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-width-invalid.html b/tests/wpt/tests/css/css-logical/parsing/border-inline-width-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-width-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/border-inline-width-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-width-valid.html b/tests/wpt/tests/css/css-logical/parsing/border-inline-width-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/border-inline-width-valid.html rename to tests/wpt/tests/css/css-logical/parsing/border-inline-width-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/inline-size-computed.html b/tests/wpt/tests/css/css-logical/parsing/inline-size-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/inline-size-computed.html rename to tests/wpt/tests/css/css-logical/parsing/inline-size-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/inline-size-invalid.html b/tests/wpt/tests/css/css-logical/parsing/inline-size-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/inline-size-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/inline-size-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/inline-size-valid.html b/tests/wpt/tests/css/css-logical/parsing/inline-size-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/inline-size-valid.html rename to tests/wpt/tests/css/css-logical/parsing/inline-size-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/inset-block-inline-computed.html b/tests/wpt/tests/css/css-logical/parsing/inset-block-inline-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/inset-block-inline-computed.html rename to tests/wpt/tests/css/css-logical/parsing/inset-block-inline-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/inset-block-inline-invalid.html b/tests/wpt/tests/css/css-logical/parsing/inset-block-inline-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/inset-block-inline-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/inset-block-inline-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/inset-block-inline-shorthand.html b/tests/wpt/tests/css/css-logical/parsing/inset-block-inline-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/inset-block-inline-shorthand.html rename to tests/wpt/tests/css/css-logical/parsing/inset-block-inline-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/inset-block-inline-valid.html b/tests/wpt/tests/css/css-logical/parsing/inset-block-inline-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/inset-block-inline-valid.html rename to tests/wpt/tests/css/css-logical/parsing/inset-block-inline-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/inset-computed.html b/tests/wpt/tests/css/css-logical/parsing/inset-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/inset-computed.html rename to tests/wpt/tests/css/css-logical/parsing/inset-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/inset-invalid.html b/tests/wpt/tests/css/css-logical/parsing/inset-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/inset-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/inset-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/inset-shorthand.html b/tests/wpt/tests/css/css-logical/parsing/inset-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/inset-shorthand.html rename to tests/wpt/tests/css/css-logical/parsing/inset-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/inset-valid.html b/tests/wpt/tests/css/css-logical/parsing/inset-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/inset-valid.html rename to tests/wpt/tests/css/css-logical/parsing/inset-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/margin-block-inline-computed.html b/tests/wpt/tests/css/css-logical/parsing/margin-block-inline-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/margin-block-inline-computed.html rename to tests/wpt/tests/css/css-logical/parsing/margin-block-inline-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/margin-block-inline-invalid.html b/tests/wpt/tests/css/css-logical/parsing/margin-block-inline-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/margin-block-inline-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/margin-block-inline-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/margin-block-inline-shorthand.html b/tests/wpt/tests/css/css-logical/parsing/margin-block-inline-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/margin-block-inline-shorthand.html rename to tests/wpt/tests/css/css-logical/parsing/margin-block-inline-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/margin-block-inline-valid.html b/tests/wpt/tests/css/css-logical/parsing/margin-block-inline-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/margin-block-inline-valid.html rename to tests/wpt/tests/css/css-logical/parsing/margin-block-inline-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/max-block-size-computed.html b/tests/wpt/tests/css/css-logical/parsing/max-block-size-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/max-block-size-computed.html rename to tests/wpt/tests/css/css-logical/parsing/max-block-size-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/max-block-size-invalid.html b/tests/wpt/tests/css/css-logical/parsing/max-block-size-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/max-block-size-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/max-block-size-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/max-block-size-valid.html b/tests/wpt/tests/css/css-logical/parsing/max-block-size-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/max-block-size-valid.html rename to tests/wpt/tests/css/css-logical/parsing/max-block-size-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/max-inline-size-computed.html b/tests/wpt/tests/css/css-logical/parsing/max-inline-size-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/max-inline-size-computed.html rename to tests/wpt/tests/css/css-logical/parsing/max-inline-size-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/max-inline-size-invalid.html b/tests/wpt/tests/css/css-logical/parsing/max-inline-size-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/max-inline-size-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/max-inline-size-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/max-inline-size-valid.html b/tests/wpt/tests/css/css-logical/parsing/max-inline-size-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/max-inline-size-valid.html rename to tests/wpt/tests/css/css-logical/parsing/max-inline-size-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/min-block-size-computed.html b/tests/wpt/tests/css/css-logical/parsing/min-block-size-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/min-block-size-computed.html rename to tests/wpt/tests/css/css-logical/parsing/min-block-size-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/min-block-size-invalid.html b/tests/wpt/tests/css/css-logical/parsing/min-block-size-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/min-block-size-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/min-block-size-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/min-block-size-valid.html b/tests/wpt/tests/css/css-logical/parsing/min-block-size-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/min-block-size-valid.html rename to tests/wpt/tests/css/css-logical/parsing/min-block-size-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/min-inline-size-computed.html b/tests/wpt/tests/css/css-logical/parsing/min-inline-size-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/min-inline-size-computed.html rename to tests/wpt/tests/css/css-logical/parsing/min-inline-size-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/min-inline-size-invalid.html b/tests/wpt/tests/css/css-logical/parsing/min-inline-size-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/min-inline-size-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/min-inline-size-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/min-inline-size-valid.html b/tests/wpt/tests/css/css-logical/parsing/min-inline-size-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/min-inline-size-valid.html rename to tests/wpt/tests/css/css-logical/parsing/min-inline-size-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/padding-block-inline-computed.html b/tests/wpt/tests/css/css-logical/parsing/padding-block-inline-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/padding-block-inline-computed.html rename to tests/wpt/tests/css/css-logical/parsing/padding-block-inline-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/padding-block-inline-invalid.html b/tests/wpt/tests/css/css-logical/parsing/padding-block-inline-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/padding-block-inline-invalid.html rename to tests/wpt/tests/css/css-logical/parsing/padding-block-inline-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/padding-block-inline-shorthand.html b/tests/wpt/tests/css/css-logical/parsing/padding-block-inline-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/padding-block-inline-shorthand.html rename to tests/wpt/tests/css/css-logical/parsing/padding-block-inline-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/parsing/padding-block-inline-valid.html b/tests/wpt/tests/css/css-logical/parsing/padding-block-inline-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/parsing/padding-block-inline-valid.html rename to tests/wpt/tests/css/css-logical/parsing/padding-block-inline-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/reference/logical-values-float-clear-1-ref.html b/tests/wpt/tests/css/css-logical/reference/logical-values-float-clear-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/reference/logical-values-float-clear-1-ref.html rename to tests/wpt/tests/css/css-logical/reference/logical-values-float-clear-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/reference/logical-values-float-clear-2-ref.html b/tests/wpt/tests/css/css-logical/reference/logical-values-float-clear-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/reference/logical-values-float-clear-2-ref.html rename to tests/wpt/tests/css/css-logical/reference/logical-values-float-clear-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/reference/logical-values-float-clear-3-ref.html b/tests/wpt/tests/css/css-logical/reference/logical-values-float-clear-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/reference/logical-values-float-clear-3-ref.html rename to tests/wpt/tests/css/css-logical/reference/logical-values-float-clear-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/reference/logical-values-float-clear-4-ref.html b/tests/wpt/tests/css/css-logical/reference/logical-values-float-clear-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/reference/logical-values-float-clear-4-ref.html rename to tests/wpt/tests/css/css-logical/reference/logical-values-float-clear-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/reference/logical-values-float-clear-reftest-ref.html b/tests/wpt/tests/css/css-logical/reference/logical-values-float-clear-reftest-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/reference/logical-values-float-clear-reftest-ref.html rename to tests/wpt/tests/css/css-logical/reference/logical-values-float-clear-reftest-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-logical/resources/test-box-properties.js b/tests/wpt/tests/css/css-logical/resources/test-box-properties.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/resources/test-box-properties.js rename to tests/wpt/tests/css/css-logical/resources/test-box-properties.js diff --git a/tests/wpt/web-platform-tests/css/css-logical/resources/test-logical-values.js b/tests/wpt/tests/css/css-logical/resources/test-logical-values.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/resources/test-logical-values.js rename to tests/wpt/tests/css/css-logical/resources/test-logical-values.js diff --git a/tests/wpt/web-platform-tests/css/css-logical/resources/test-shared.js b/tests/wpt/tests/css/css-logical/resources/test-shared.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-logical/resources/test-shared.js rename to tests/wpt/tests/css/css-logical/resources/test-shared.js diff --git a/tests/wpt/web-platform-tests/css/css-masking/META.yml b/tests/wpt/tests/css/css-masking/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/META.yml rename to tests/wpt/tests/css/css-masking/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-masking/animations/clip-interpolation.html b/tests/wpt/tests/css/css-masking/animations/clip-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/animations/clip-interpolation.html rename to tests/wpt/tests/css/css-masking/animations/clip-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/animations/clip-path-composition.html b/tests/wpt/tests/css/css-masking/animations/clip-path-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/animations/clip-path-composition.html rename to tests/wpt/tests/css/css-masking/animations/clip-path-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/animations/clip-path-interpolation-001.html b/tests/wpt/tests/css/css-masking/animations/clip-path-interpolation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/animations/clip-path-interpolation-001.html rename to tests/wpt/tests/css/css-masking/animations/clip-path-interpolation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/animations/clip-path-interpolation-002.html b/tests/wpt/tests/css/css-masking/animations/clip-path-interpolation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/animations/clip-path-interpolation-002.html rename to tests/wpt/tests/css/css-masking/animations/clip-path-interpolation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/animations/clip-path-interpolation-shape.html b/tests/wpt/tests/css/css-masking/animations/clip-path-interpolation-shape.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/animations/clip-path-interpolation-shape.html rename to tests/wpt/tests/css/css-masking/animations/clip-path-interpolation-shape.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/animations/mask-image-interpolation.html b/tests/wpt/tests/css/css-masking/animations/mask-image-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/animations/mask-image-interpolation.html rename to tests/wpt/tests/css/css-masking/animations/mask-image-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/animations/mask-no-interpolation.html b/tests/wpt/tests/css/css-masking/animations/mask-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/animations/mask-no-interpolation.html rename to tests/wpt/tests/css/css-masking/animations/mask-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/animations/mask-position-interpolation.html b/tests/wpt/tests/css/css-masking/animations/mask-position-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/animations/mask-position-interpolation.html rename to tests/wpt/tests/css/css-masking/animations/mask-position-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-nested-twice.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-nested-twice.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-nested-twice.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-nested-twice.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-003.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-003.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-003.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-004.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-004.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-004.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-005.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-005.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-005.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-005.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-006.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-006.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-006.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-006.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-007.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-007.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-007.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-007.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-008.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-008.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-008.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-008.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-009.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-009.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-009.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-009.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-010.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-010.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-010.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip-rule-010.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-clip.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-clip.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-003.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-003.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-003.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-004.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-004.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-clip-004.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-invisible.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-invisible.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-invisible.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-invisible.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-syling.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-syling.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-syling.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-syling.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-use-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-use-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-use-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-use-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-use-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-use-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-use-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-use-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-use-003.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-use-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-use-003.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-use-003.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-use-004.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-use-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-use-004.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-use-004.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-use-005.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-use-005.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-use-005.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-use-005.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-use-006.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-use-006.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-use-006.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-use-006.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-use-007.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-use-007.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-content-use-007.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-content-use-007.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-003.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-003.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-003.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-004.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-004.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-css-transform-004.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-dom-child-changes.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-dom-child-changes.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-dom-child-changes.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-dom-child-changes.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-dom-clippathunits.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-dom-clippathunits.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-dom-clippathunits.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-dom-clippathunits.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-dom-href.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-dom-href.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-dom-href.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-dom-href.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-dom-id.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-dom-id.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-dom-id.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-dom-id.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-invalid.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-invalid.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-invalid.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-negative-scale.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-negative-scale.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-negative-scale.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-negative-scale.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-no-content-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-no-content-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-no-content-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-no-content-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-no-content-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-no-content-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-no-content-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-no-content-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-no-content-003.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-no-content-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-no-content-003.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-no-content-003.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-no-content-004.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-no-content-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-no-content-004.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-no-content-004.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-no-content-005.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-no-content-005.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-no-content-005.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-no-content-005.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-003.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-003.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-003.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-004.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-004.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-objectboundingbox-004.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-g-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-g-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-g-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-g-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-g-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-g-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-g-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-g-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-g-003.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-g-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-g-003.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-g-003.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-g-004.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-g-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-g-004.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-g-004.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-g-005.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-g-005.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-g-005.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-g-005.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-marker-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-marker-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-marker-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-marker-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-marker-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-marker-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-marker-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-marker-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-marker-003.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-marker-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-marker-003.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-marker-003.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-svg-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-svg-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-svg-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-svg-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-svg-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-svg-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-svg-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-svg-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-use-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-use-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-use-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-use-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-use-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-use-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-on-use-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-on-use-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-precision-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-precision-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-precision-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-precision-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-recursion-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-recursion-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-recursion-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-recursion-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-recursion-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-recursion-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-recursion-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-recursion-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-003.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-003.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-003.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-004.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-004.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-004.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-005.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-005.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-005.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-005.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-ellipse-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-ellipse-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-ellipse-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-ellipse-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-ellipse-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-ellipse-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-ellipse-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-ellipse-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-inset-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-inset-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-inset-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-inset-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-inset-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-inset-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-inset-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-inset-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-polygon-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-polygon-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-polygon-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-polygon-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-polygon-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-polygon-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-polygon-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-polygon-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-polygon-003.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-polygon-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-shape-polygon-003.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-polygon-003.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-text-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-text-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-text-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-text-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-text-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-text-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-text-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-text-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-text-003.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-text-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-text-003.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-text-003.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-text-004.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-text-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-text-004.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-text-004.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-text-005.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-text-005.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-text-005.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-text-005.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-userspaceonuse-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-userspaceonuse-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-userspaceonuse-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-userspaceonuse-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-with-opacity.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-with-opacity.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-with-opacity.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-with-opacity.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-with-transform.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-with-transform.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-with-transform.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-with-transform.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-and-nested-clip-path.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-and-nested-clip-path.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-and-nested-clip-path.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-and-nested-clip-path.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-003.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-003.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-003.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-004.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-004.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-004.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-005.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-005.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-005.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-005.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-006.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-006.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-006.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-006.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-007.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-007.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-007.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-007.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-008.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-008.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-008.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-008.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-009.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-009.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-009.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-009.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-010.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-010.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-010.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-010.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-panning-001.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-panning-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-panning-001.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-panning-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-panning-002.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-panning-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-panning-002.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-nested-clip-path-panning-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-objectboundingbox-content-clip-transform.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-objectboundingbox-content-clip-transform.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-objectboundingbox-content-clip-transform.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-objectboundingbox-content-clip-transform.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-objectboundingbox-content-clip.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-objectboundingbox-content-clip.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-objectboundingbox-content-clip.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-objectboundingbox-content-clip.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-userspaceonuse-content-clip-transform.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-userspaceonuse-content-clip-transform.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-userspaceonuse-content-clip-transform.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-userspaceonuse-content-clip-transform.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-userspaceonuse-content-clip.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-userspaceonuse-content-clip.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/mask-userspaceonuse-content-clip.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/mask-userspaceonuse-content-clip.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-circle-001-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-circle-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-circle-001-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-circle-001-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-001-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-001-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-001-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-002-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-002-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-002-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-003-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-003-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-003-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-003-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-004-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-004-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-004-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-clip-rule-004-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-content-clip-004-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-content-clip-004-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-content-clip-004-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-content-clip-004-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-ellipse-001-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-ellipse-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-ellipse-001-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-ellipse-001-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-invisible-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-invisible-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-invisible-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-invisible-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-negative-scale-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-negative-scale-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-negative-scale-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-negative-scale-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-on-marker-001-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-on-marker-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-on-marker-001-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-on-marker-001-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-on-marker-002-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-on-marker-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-on-marker-002-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-on-marker-002-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-precision-001-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-precision-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-precision-001-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-precision-001-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-recursion-002-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-recursion-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-recursion-002-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-recursion-002-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-shape-inset-001-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-shape-inset-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-shape-inset-001-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-shape-inset-001-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-001-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-001-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-001-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-002-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-002-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-002-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-003-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-003-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-003-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-003-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-hole-001-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-hole-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-hole-001-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-square-hole-001-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-text-001-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-text-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-text-001-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-text-001-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-text-002-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-text-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-text-002-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-text-002-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-text-003-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-text-003-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-text-003-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/clip-path-text-003-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-and-nested-clip-path-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/mask-and-nested-clip-path-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-and-nested-clip-path-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/mask-and-nested-clip-path-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-content-clip-001-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/mask-content-clip-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-content-clip-001-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/mask-content-clip-001-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-content-clip-002-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/mask-content-clip-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-content-clip-002-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/mask-content-clip-002-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-nested-clip-path-001-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/mask-nested-clip-path-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-nested-clip-path-001-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/mask-nested-clip-path-001-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-nested-clip-path-002-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/mask-nested-clip-path-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-nested-clip-path-002-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/mask-nested-clip-path-002-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-nested-clip-path-003-ref.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/mask-nested-clip-path-003-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/mask-nested-clip-path-003-ref.svg rename to tests/wpt/tests/css/css-masking/clip-path-svg-content/reference/mask-nested-clip-path-003-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-reverse-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-reverse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-reverse-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-reverse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-reverse.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-reverse.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-reverse.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-filter-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-filter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-filter-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-filter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-filter.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-filter.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-filter.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-rounding-error-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-rounding-error-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-rounding-error-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-rounding-error-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-rounding-error.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-rounding-error.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-rounding-error.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-rounding-error.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-fixed-position.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-fragmented-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-fragmented-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-fragmented-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-fragmented-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-fragmented.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-fragmented.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-fragmented.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-fragmented.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes1-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes1-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes1.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes1.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes1.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes2-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes2-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes2.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes2.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-incompatible-shapes2.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-missing-0-percent-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-missing-0-percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-missing-0-percent-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-missing-0-percent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-missing-0-percent.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-missing-0-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-missing-0-percent.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-missing-0-percent.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-non-keyframe-timing-function-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-non-keyframe-timing-function-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-non-keyframe-timing-function-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-non-keyframe-timing-function-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-non-keyframe-timing-function.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-non-keyframe-timing-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-non-keyframe-timing-function.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-non-keyframe-timing-function.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-none-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-none-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-none-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-none.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-none.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-none.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-overflow-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-overflow-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-overflow.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-overflow.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-svg-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-svg-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-svg.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-svg.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes1-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes1-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes1.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes1.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes1.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes2-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes2-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes2.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes2.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-three-keyframes2.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-zoom-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-zoom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-zoom-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-zoom-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-zoom.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-zoom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation-zoom.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-zoom.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-animation.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-001-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-001-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-001.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-001.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-002-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-002-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-002.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-002.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-with-zoom-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-with-zoom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-with-zoom-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-with-zoom-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-with-zoom.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-with-zoom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-with-zoom.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-path-interpolation-with-zoom.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-shape-interpolation-001.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-shape-interpolation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-shape-interpolation-001.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-shape-interpolation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-shape-interpolation-002.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-shape-interpolation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-shape-interpolation-002.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-shape-interpolation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-transition-custom-timing-function.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-transition-custom-timing-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-transition-custom-timing-function.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-transition-custom-timing-function.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-transition-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-transition-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-transition-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-transition-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-transition.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/clip-path-transition.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length1-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length1-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length1.html b/tests/wpt/tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length1.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length1.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length2-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length2-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length2.html b/tests/wpt/tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length2.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length2.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length3-ref.html b/tests/wpt/tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length3-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length3.html b/tests/wpt/tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length3.html rename to tests/wpt/tests/css/css-masking/clip-path/animations/two-clip-path-animation-diff-length3.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-blending-offset-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-blending-offset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-blending-offset-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-blending-offset-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-blending-offset.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-blending-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-blending-offset.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-blending-offset.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-borderBox-1a.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-borderBox-1a.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-borderBox-1b.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-borderBox-1b.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-borderBox-1c.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-borderBox-1c.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1c.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-001.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-001.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-002.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-002.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-003.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-003.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-003.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-004.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-004.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-004.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-005.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-005.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-005.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-006.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-006.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-006.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-007.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-007.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-007.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-008.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-circle-008.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-circle-008.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-columns-shape-001.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-columns-shape-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-columns-shape-001.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-columns-shape-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-columns-shape-002.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-columns-shape-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-columns-shape-002.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-columns-shape-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-contentBox-1a.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-contentBox-1a.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-contentBox-1b.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-contentBox-1b.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-contentBox-1c.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-contentBox-1c.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1c.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-document-element-will-change.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-document-element-will-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-document-element-will-change.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-document-element-will-change.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-document-element.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-document-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-document-element.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-document-element.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-001.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-001.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-002.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-002.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-003.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-003.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-003.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-004.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-004.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-element-userSpaceOnUse-004.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-001.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-001.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-002.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-002.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-003.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-003.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-003.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-004.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-004.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-004.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-005.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-005.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-005.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-006.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-006.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-006.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-007.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-007.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-007.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-008.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-ellipse-008.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-ellipse-008.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-fillBox-1a.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-fillBox-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-fillBox-1a.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-fillBox-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-filter-order-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-filter-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-filter-order-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-filter-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-filter-order.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-filter-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-filter-order.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-filter-order.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-filter-radius-clips.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-filter-radius-clips.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-filter-radius-clips.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-filter-radius-clips.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-fixed-nested-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-fixed-nested-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-fixed-nested-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-fixed-nested-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-fixed-nested.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-fixed-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-fixed-nested.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-fixed-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-fixed-scroll-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-fixed-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-fixed-scroll-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-fixed-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-fixed-scroll.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-fixed-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-fixed-scroll.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-fixed-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-geometryBox-1-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-geometryBox-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-geometryBox-1-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-geometryBox-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-geometryBox-2-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-geometryBox-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-geometryBox-2-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-geometryBox-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-geometryBox-2.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-geometryBox-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-geometryBox-2.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-geometryBox-2.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-inline-001.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-inline-001.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-inline-002.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-inline-002.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-inline-003.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-inline-003.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-inset-round-percent-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inset-round-percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-inset-round-percent-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-inset-round-percent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-inset-round-percent.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inset-round-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-inset-round-percent.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-inset-round-percent.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-localRef-1-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-localRef-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-localRef-1-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-localRef-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-localRef-1.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-localRef-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-localRef-1.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-localRef-1.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-marginBox-1a.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-marginBox-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-marginBox-1a.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-marginBox-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-mix-blend-mode-1-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-mix-blend-mode-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-mix-blend-mode-1-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-mix-blend-mode-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-mix-blend-mode-1.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-mix-blend-mode-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-mix-blend-mode-1.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-mix-blend-mode-1.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-on-fixed-position-scroll-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-on-fixed-position-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-on-fixed-position-scroll-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-on-fixed-position-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-on-fixed-position-scroll.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-on-fixed-position-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-on-fixed-position-scroll.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-on-fixed-position-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-paddingBox-1a.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-paddingBox-1a.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-paddingBox-1b.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-paddingBox-1b.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-paddingBox-1c.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-paddingBox-1c.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1c.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-path-001.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-path-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-path-001.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-path-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-path-002.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-path-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-path-002.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-path-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-path-003.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-path-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-path-003.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-path-003.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-path-with-zoom-hittest.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-path-with-zoom-hittest.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-path-with-zoom-hittest.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-path-with-zoom-hittest.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-path-with-zoom.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-path-with-zoom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-path-with-zoom.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-path-with-zoom.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-001.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-001.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-002.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-002.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-003.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-003.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-003.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-004.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-004.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-004.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-005.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-005.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-005.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-006.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-006.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-006.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-007.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-007.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-007.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-008.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-008.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-008.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-009.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-009.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-009.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-010.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-010.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-010.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-011.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-011.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-011.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-012.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-012.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-012.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-013.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-polygon-013.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-013.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-reference-box-001.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-reference-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-reference-box-001.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-reference-box-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-reference-box-002.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-reference-box-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-reference-box-002.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-reference-box-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-reference-box-003.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-reference-box-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-reference-box-003.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-reference-box-003.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-reference-box-004.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-reference-box-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-reference-box-004.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-reference-box-004.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-reference-restore.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-reference-restore.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-reference-restore.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-reference-restore.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-round-zero-size-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-round-zero-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-round-zero-size-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-round-zero-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-round-zero-size.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-round-zero-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-round-zero-size.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-round-zero-size.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-scaled-video-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-scaled-video-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-scaled-video-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-scaled-video-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-scaled-video.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-scaled-video.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-scaled-video.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-scaled-video.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-scroll.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-scroll.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-shape-001.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-shape-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-shape-001.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-shape-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-shape-002-units.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-shape-002-units.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-shape-002-units.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-shape-002-units.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-shape-002.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-shape-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-shape-002.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-shape-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-shape-003.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-shape-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-shape-003.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-shape-003.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-shape-004.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-shape-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-shape-004.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-shape-004.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-strokeBox-1a.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-strokeBox-1a.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-strokeBox-1b.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-strokeBox-1b.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-invalidate-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-svg-invalidate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-invalidate-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-svg-invalidate-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-invalidate.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-svg-invalidate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-invalidate.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-svg-invalidate.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-text-backdrop-filter-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-svg-text-backdrop-filter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-text-backdrop-filter-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-svg-text-backdrop-filter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-text-backdrop-filter.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-svg-text-backdrop-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-text-backdrop-filter.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-svg-text-backdrop-filter.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-text-css.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-svg-text-css.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-text-css.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-svg-text-css.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-text-font-loading.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-svg-text-font-loading.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-text-font-loading.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-svg-text-font-loading.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-transform-mutated-001.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-transform-mutated-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-transform-mutated-001.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-transform-mutated-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-transform-mutated-002.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-transform-mutated-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-transform-mutated-002.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-transform-mutated-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-url-reference-change-from-empty.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-url-reference-change-from-empty.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-url-reference-change-from-empty.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-url-reference-change-from-empty.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-url-reference-change.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-url-reference-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-url-reference-change.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-url-reference-change.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-viewBox-1a.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-viewBox-1a.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-viewBox-1b.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-viewBox-1b.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-viewBox-1c.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-viewBox-1c.html rename to tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1c.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/interpolation.html b/tests/wpt/tests/css/css-masking/clip-path/interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/interpolation.html rename to tests/wpt/tests/css/css-masking/clip-path/interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference-local-url-with-base-001.html b/tests/wpt/tests/css/css-masking/clip-path/reference-local-url-with-base-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference-local-url-with-base-001.html rename to tests/wpt/tests/css/css-masking/clip-path/reference-local-url-with-base-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference-mutated.html b/tests/wpt/tests/css/css-masking/clip-path/reference-mutated.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference-mutated.html rename to tests/wpt/tests/css/css-masking/clip-path/reference-mutated.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference-nonexisting-existing-local.html b/tests/wpt/tests/css/css-masking/clip-path/reference-nonexisting-existing-local.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference-nonexisting-existing-local.html rename to tests/wpt/tests/css/css-masking/clip-path/reference-nonexisting-existing-local.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-circle-2-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-circle-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-circle-2-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-circle-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-circle-3-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-circle-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-circle-3-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-circle-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-circle-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-circle-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-circle-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-circle-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-columns-shape-001-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-columns-shape-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-columns-shape-001-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-columns-shape-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-columns-shape-002-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-columns-shape-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-columns-shape-002-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-columns-shape-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-descendant-text-mutated-001-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-descendant-text-mutated-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-descendant-text-mutated-001-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-descendant-text-mutated-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-document-element-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-document-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-document-element-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-document-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-ellipse-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-ellipse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-ellipse-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-ellipse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-filter-radius-clips-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-filter-radius-clips-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-filter-radius-clips-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-filter-radius-clips-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-path-001-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-path-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-path-001-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-path-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-path-002-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-path-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-path-002-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-path-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-path-with-zoom-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-path-with-zoom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-path-with-zoom-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-path-with-zoom-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-rectangle-border-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-rectangle-border-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-rectangle-border-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-rectangle-border-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-rectangle-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-rectangle-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-rectangle-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-rectangle-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-ref-bottom-green-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-ref-bottom-green-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-ref-bottom-green-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-ref-bottom-green-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-ref-right-green-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-ref-right-green-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-ref-right-green-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-ref-right-green-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-reference-box-001-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-reference-box-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-reference-box-001-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-reference-box-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-reference-box-002-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-reference-box-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-reference-box-002-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-reference-box-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-reference-box-003-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-reference-box-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-reference-box-003-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-reference-box-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-reference-box-004-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-reference-box-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-reference-box-004-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-reference-box-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-reference-restore-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-reference-restore-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-reference-restore-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-reference-restore-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-scroll-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-scroll-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-shape-003-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-shape-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-shape-003-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-shape-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-shape-004-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-shape-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-shape-004-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-shape-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-square-001-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-square-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-square-001-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-square-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-square-002-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-square-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-square-002-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-square-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-stripes-001-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-stripes-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-stripes-001-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-stripes-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-stripes-002-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-stripes-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-stripes-002-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-stripes-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-stripes-003-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-stripes-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-stripes-003-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-stripes-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-svg-text-css-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-svg-text-css-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-svg-text-css-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-svg-text-css-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-transform-mutated-001-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-transform-mutated-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-transform-mutated-001-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-transform-mutated-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-transform-mutated-002-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-transform-mutated-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-transform-mutated-002-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/clip-path-transform-mutated-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/green-100x100.html b/tests/wpt/tests/css/css-masking/clip-path/reference/green-100x100.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/green-100x100.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/green-100x100.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/reference-local-url-with-base-001-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/reference-local-url-with-base-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/reference-local-url-with-base-001-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/reference-local-url-with-base-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/reference-mutated-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/reference-mutated-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/reference-mutated-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/reference-mutated-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/reference-nonexisting-existing-local-ref.html b/tests/wpt/tests/css/css-masking/clip-path/reference/reference-nonexisting-existing-local-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/reference-nonexisting-existing-local-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/reference/reference-nonexisting-existing-local-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/svg-clip-path-circle-offset-ref.html b/tests/wpt/tests/css/css-masking/clip-path/svg-clip-path-circle-offset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/svg-clip-path-circle-offset-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/svg-clip-path-circle-offset-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/svg-clip-path-circle-offset.html b/tests/wpt/tests/css/css-masking/clip-path/svg-clip-path-circle-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/svg-clip-path-circle-offset.html rename to tests/wpt/tests/css/css-masking/clip-path/svg-clip-path-circle-offset.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/svg-clip-path-ellipse-offset-ref.html b/tests/wpt/tests/css/css-masking/clip-path/svg-clip-path-ellipse-offset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/svg-clip-path-ellipse-offset-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/svg-clip-path-ellipse-offset-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/svg-clip-path-ellipse-offset.html b/tests/wpt/tests/css/css-masking/clip-path/svg-clip-path-ellipse-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/svg-clip-path-ellipse-offset.html rename to tests/wpt/tests/css/css-masking/clip-path/svg-clip-path-ellipse-offset.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/svg-clip-path-fixed-values-ref.html b/tests/wpt/tests/css/css-masking/clip-path/svg-clip-path-fixed-values-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/svg-clip-path-fixed-values-ref.html rename to tests/wpt/tests/css/css-masking/clip-path/svg-clip-path-fixed-values-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/svg-clip-path-fixed-values.html b/tests/wpt/tests/css/css-masking/clip-path/svg-clip-path-fixed-values.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/svg-clip-path-fixed-values.html rename to tests/wpt/tests/css/css-masking/clip-path/svg-clip-path-fixed-values.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/svg-clipPath.svg b/tests/wpt/tests/css/css-masking/clip-path/svg-clipPath.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-path/svg-clipPath.svg rename to tests/wpt/tests/css/css-masking/clip-path/svg-clipPath.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-rule/clip-rule-001.html b/tests/wpt/tests/css/css-masking/clip-rule/clip-rule-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-rule/clip-rule-001.html rename to tests/wpt/tests/css/css-masking/clip-rule/clip-rule-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-rule/clip-rule-002.html b/tests/wpt/tests/css/css-masking/clip-rule/clip-rule-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-rule/clip-rule-002.html rename to tests/wpt/tests/css/css-masking/clip-rule/clip-rule-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-rule/clip-rule-no-interpolation.html b/tests/wpt/tests/css/css-masking/clip-rule/clip-rule-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-rule/clip-rule-no-interpolation.html rename to tests/wpt/tests/css/css-masking/clip-rule/clip-rule-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-rule/reference/clip-rule-rectangle-border-ref.html b/tests/wpt/tests/css/css-masking/clip-rule/reference/clip-rule-rectangle-border-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip-rule/reference/clip-rule-rectangle-border-ref.html rename to tests/wpt/tests/css/css-masking/clip-rule/reference/clip-rule-rectangle-border-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-absolute-positioned-001.html b/tests/wpt/tests/css/css-masking/clip/clip-absolute-positioned-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-absolute-positioned-001.html rename to tests/wpt/tests/css/css-masking/clip/clip-absolute-positioned-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-absolute-positioned-002.html b/tests/wpt/tests/css/css-masking/clip/clip-absolute-positioned-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-absolute-positioned-002.html rename to tests/wpt/tests/css/css-masking/clip/clip-absolute-positioned-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-filter-order-ref.html b/tests/wpt/tests/css/css-masking/clip/clip-filter-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-filter-order-ref.html rename to tests/wpt/tests/css/css-masking/clip/clip-filter-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-filter-order.html b/tests/wpt/tests/css/css-masking/clip/clip-filter-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-filter-order.html rename to tests/wpt/tests/css/css-masking/clip/clip-filter-order.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-fixed-pos-transform-descendant-001-ref.html b/tests/wpt/tests/css/css-masking/clip/clip-fixed-pos-transform-descendant-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-fixed-pos-transform-descendant-001-ref.html rename to tests/wpt/tests/css/css-masking/clip/clip-fixed-pos-transform-descendant-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-fixed-pos-transform-descendant-001.html b/tests/wpt/tests/css/css-masking/clip/clip-fixed-pos-transform-descendant-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-fixed-pos-transform-descendant-001.html rename to tests/wpt/tests/css/css-masking/clip/clip-fixed-pos-transform-descendant-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-negative-values-001.html b/tests/wpt/tests/css/css-masking/clip/clip-negative-values-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-negative-values-001.html rename to tests/wpt/tests/css/css-masking/clip/clip-negative-values-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-negative-values-002.html b/tests/wpt/tests/css/css-masking/clip/clip-negative-values-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-negative-values-002.html rename to tests/wpt/tests/css/css-masking/clip/clip-negative-values-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-negative-values-003.html b/tests/wpt/tests/css/css-masking/clip/clip-negative-values-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-negative-values-003.html rename to tests/wpt/tests/css/css-masking/clip/clip-negative-values-003.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-negative-values-004.html b/tests/wpt/tests/css/css-masking/clip/clip-negative-values-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-negative-values-004.html rename to tests/wpt/tests/css/css-masking/clip/clip-negative-values-004.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-clipping-001.html b/tests/wpt/tests/css/css-masking/clip/clip-no-clipping-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-clipping-001.html rename to tests/wpt/tests/css/css-masking/clip/clip-no-clipping-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-clipping-002.html b/tests/wpt/tests/css/css-masking/clip/clip-no-clipping-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-clipping-002.html rename to tests/wpt/tests/css/css-masking/clip/clip-no-clipping-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-stacking-context-ref.html b/tests/wpt/tests/css/css-masking/clip/clip-no-stacking-context-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-stacking-context-ref.html rename to tests/wpt/tests/css/css-masking/clip/clip-no-stacking-context-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-stacking-context.html b/tests/wpt/tests/css/css-masking/clip/clip-no-stacking-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-stacking-context.html rename to tests/wpt/tests/css/css-masking/clip/clip-no-stacking-context.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-not-absolute-positioned-001.html b/tests/wpt/tests/css/css-masking/clip/clip-not-absolute-positioned-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-not-absolute-positioned-001.html rename to tests/wpt/tests/css/css-masking/clip/clip-not-absolute-positioned-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-not-absolute-positioned-002.html b/tests/wpt/tests/css/css-masking/clip/clip-not-absolute-positioned-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-not-absolute-positioned-002.html rename to tests/wpt/tests/css/css-masking/clip/clip-not-absolute-positioned-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-not-absolute-positioned-003.html b/tests/wpt/tests/css/css-masking/clip/clip-not-absolute-positioned-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-not-absolute-positioned-003.html rename to tests/wpt/tests/css/css-masking/clip/clip-not-absolute-positioned-003.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-not-absolute-positioned-004.html b/tests/wpt/tests/css/css-masking/clip/clip-not-absolute-positioned-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-not-absolute-positioned-004.html rename to tests/wpt/tests/css/css-masking/clip/clip-not-absolute-positioned-004.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-auto-001.html b/tests/wpt/tests/css/css-masking/clip/clip-rect-auto-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-auto-001.html rename to tests/wpt/tests/css/css-masking/clip/clip-rect-auto-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-auto-002.html b/tests/wpt/tests/css/css-masking/clip/clip-rect-auto-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-auto-002.html rename to tests/wpt/tests/css/css-masking/clip/clip-rect-auto-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-auto-003.html b/tests/wpt/tests/css/css-masking/clip/clip-rect-auto-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-auto-003.html rename to tests/wpt/tests/css/css-masking/clip/clip-rect-auto-003.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-auto-004.html b/tests/wpt/tests/css/css-masking/clip/clip-rect-auto-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-auto-004.html rename to tests/wpt/tests/css/css-masking/clip/clip-rect-auto-004.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-auto-005.html b/tests/wpt/tests/css/css-masking/clip/clip-rect-auto-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-auto-005.html rename to tests/wpt/tests/css/css-masking/clip/clip-rect-auto-005.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-auto-006.html b/tests/wpt/tests/css/css-masking/clip/clip-rect-auto-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-auto-006.html rename to tests/wpt/tests/css/css-masking/clip/clip-rect-auto-006.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-comma-001.html b/tests/wpt/tests/css/css-masking/clip/clip-rect-comma-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-comma-001.html rename to tests/wpt/tests/css/css-masking/clip/clip-rect-comma-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-comma-002.html b/tests/wpt/tests/css/css-masking/clip/clip-rect-comma-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-comma-002.html rename to tests/wpt/tests/css/css-masking/clip/clip-rect-comma-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-comma-003.html b/tests/wpt/tests/css/css-masking/clip/clip-rect-comma-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-comma-003.html rename to tests/wpt/tests/css/css-masking/clip/clip-rect-comma-003.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-comma-004.html b/tests/wpt/tests/css/css-masking/clip/clip-rect-comma-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-comma-004.html rename to tests/wpt/tests/css/css-masking/clip/clip-rect-comma-004.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-scroll.html b/tests/wpt/tests/css/css-masking/clip/clip-rect-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-rect-scroll.html rename to tests/wpt/tests/css/css-masking/clip/clip-rect-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-transform-order-2.html b/tests/wpt/tests/css/css-masking/clip/clip-transform-order-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-transform-order-2.html rename to tests/wpt/tests/css/css-masking/clip/clip-transform-order-2.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-transform-order.html b/tests/wpt/tests/css/css-masking/clip/clip-transform-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/clip-transform-order.html rename to tests/wpt/tests/css/css-masking/clip/clip-transform-order.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-absolute-positioned-ref.html b/tests/wpt/tests/css/css-masking/clip/reference/clip-absolute-positioned-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-absolute-positioned-ref.html rename to tests/wpt/tests/css/css-masking/clip/reference/clip-absolute-positioned-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-full-ref.html b/tests/wpt/tests/css/css-masking/clip/reference/clip-full-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-full-ref.html rename to tests/wpt/tests/css/css-masking/clip/reference/clip-full-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-horizontal-stripe-ref.html b/tests/wpt/tests/css/css-masking/clip/reference/clip-horizontal-stripe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-horizontal-stripe-ref.html rename to tests/wpt/tests/css/css-masking/clip/reference/clip-horizontal-stripe-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-no-clipping-ref.html b/tests/wpt/tests/css/css-masking/clip/reference/clip-no-clipping-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-no-clipping-ref.html rename to tests/wpt/tests/css/css-masking/clip/reference/clip-no-clipping-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-overflow-hidden-ref.html b/tests/wpt/tests/css/css-masking/clip/reference/clip-overflow-hidden-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-overflow-hidden-ref.html rename to tests/wpt/tests/css/css-masking/clip/reference/clip-overflow-hidden-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-rect-bottom-ref.html b/tests/wpt/tests/css/css-masking/clip/reference/clip-rect-bottom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-rect-bottom-ref.html rename to tests/wpt/tests/css/css-masking/clip/reference/clip-rect-bottom-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-rect-left-ref.html b/tests/wpt/tests/css/css-masking/clip/reference/clip-rect-left-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-rect-left-ref.html rename to tests/wpt/tests/css/css-masking/clip/reference/clip-rect-left-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-rect-right-ref.html b/tests/wpt/tests/css/css-masking/clip/reference/clip-rect-right-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-rect-right-ref.html rename to tests/wpt/tests/css/css-masking/clip/reference/clip-rect-right-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-rect-scroll-ref.html b/tests/wpt/tests/css/css-masking/clip/reference/clip-rect-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-rect-scroll-ref.html rename to tests/wpt/tests/css/css-masking/clip/reference/clip-rect-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-rect-top-ref.html b/tests/wpt/tests/css/css-masking/clip/reference/clip-rect-top-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-rect-top-ref.html rename to tests/wpt/tests/css/css-masking/clip/reference/clip-rect-top-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-vertical-stripe-ref.html b/tests/wpt/tests/css/css-masking/clip/reference/clip-vertical-stripe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/clip/reference/clip-vertical-stripe-ref.html rename to tests/wpt/tests/css/css-masking/clip/reference/clip-vertical-stripe-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/hit-test/clip-path-element-objectboundingbox-001.html b/tests/wpt/tests/css/css-masking/hit-test/clip-path-element-objectboundingbox-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/hit-test/clip-path-element-objectboundingbox-001.html rename to tests/wpt/tests/css/css-masking/hit-test/clip-path-element-objectboundingbox-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/hit-test/clip-path-element-objectboundingbox-002.html b/tests/wpt/tests/css/css-masking/hit-test/clip-path-element-objectboundingbox-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/hit-test/clip-path-element-objectboundingbox-002.html rename to tests/wpt/tests/css/css-masking/hit-test/clip-path-element-objectboundingbox-002.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/hit-test/clip-path-element-userspaceonuse-001.html b/tests/wpt/tests/css/css-masking/hit-test/clip-path-element-userspaceonuse-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/hit-test/clip-path-element-userspaceonuse-001.html rename to tests/wpt/tests/css/css-masking/hit-test/clip-path-element-userspaceonuse-001.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/hit-test/clip-path-shape-polygon-and-box-shadow.html b/tests/wpt/tests/css/css-masking/hit-test/clip-path-shape-polygon-and-box-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/hit-test/clip-path-shape-polygon-and-box-shadow.html rename to tests/wpt/tests/css/css-masking/hit-test/clip-path-shape-polygon-and-box-shadow.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/idlharness.html b/tests/wpt/tests/css/css-masking/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/idlharness.html rename to tests/wpt/tests/css/css-masking/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/inheritance.sub.html b/tests/wpt/tests/css/css-masking/inheritance.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/inheritance.sub.html rename to tests/wpt/tests/css/css-masking/inheritance.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-clip-1-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-clip-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-clip-1-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-clip-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-clip-1.html b/tests/wpt/tests/css/css-masking/mask-image/mask-clip-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-clip-1.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-clip-1.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-clip-2-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-clip-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-clip-2-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-clip-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-clip-2.html b/tests/wpt/tests/css/css-masking/mask-image/mask-clip-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-clip-2.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-clip-2.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-1-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-composite-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-1-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-composite-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-1a.html b/tests/wpt/tests/css/css-masking/mask-image/mask-composite-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-1a.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-composite-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-1b.html b/tests/wpt/tests/css/css-masking/mask-image/mask-composite-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-1b.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-composite-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-1c.html b/tests/wpt/tests/css/css-masking/mask-image/mask-composite-1c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-1c.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-composite-1c.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-1d.html b/tests/wpt/tests/css/css-masking/mask-image/mask-composite-1d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-1d.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-composite-1d.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-2-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-composite-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-2-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-composite-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-2a.html b/tests/wpt/tests/css/css-masking/mask-image/mask-composite-2a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-2a.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-composite-2a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-2b.html b/tests/wpt/tests/css/css-masking/mask-image/mask-composite-2b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-2b.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-composite-2b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-2c.html b/tests/wpt/tests/css/css-masking/mask-image/mask-composite-2c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-composite-2c.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-composite-2c.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-1-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-1-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-1a.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-1a.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-1b.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-1b.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-1c.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-1c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-1c.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-1c.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-1d.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-1d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-1d.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-1d.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-2-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-2-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-2.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-2.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-2.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3a.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-3a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3a.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-3a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3b.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-3b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3b.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-3b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3c.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-3c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3c.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-3c.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3d.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-3d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3d.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-3d.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3e.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-3e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3e.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-3e.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3f.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-3f.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3f.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-3f.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3g.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-3g.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3g.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-3g.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3h.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-3h.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3h.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-3h.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3i.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-3i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-3i.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-3i.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-4a.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-4a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-4a.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-4a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-4b.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-4b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-4b.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-4b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-5-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-5-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-5-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-5-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-5.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-5.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-5.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-6-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-6-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-6-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-6-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-6.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-6.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-6.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-6.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-clip-exclude-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-clip-exclude-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-clip-exclude-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-clip-exclude-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-clip-exclude.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-clip-exclude.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-clip-exclude.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-clip-exclude.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-data-url-image.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-data-url-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-data-url-image.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-data-url-image.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-ib-split-2.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-ib-split-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-ib-split-2.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-ib-split-2.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-ib-split.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-ib-split.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-ib-split.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-ib-split.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-svg-child-will-change.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-svg-child-will-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-svg-child-will-change.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-svg-child-will-change.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-url-image-hash.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-url-image-hash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-url-image-hash.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-url-image-hash.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-url-image.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-url-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-url-image.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-url-image.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-url-local-mask.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-url-local-mask.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-url-local-mask.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-url-local-mask.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-url-remote-mask.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-url-remote-mask.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-image-url-remote-mask.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-image-url-remote-mask.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-mode-a.html b/tests/wpt/tests/css/css-masking/mask-image/mask-mode-a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-mode-a.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-mode-a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-mode-b.html b/tests/wpt/tests/css/css-masking/mask-image/mask-mode-b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-mode-b.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-mode-b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-mode-c.html b/tests/wpt/tests/css/css-masking/mask-image/mask-mode-c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-mode-c.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-mode-c.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-mode-d.html b/tests/wpt/tests/css/css-masking/mask-image/mask-mode-d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-mode-d.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-mode-d.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-mode-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-mode-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-mode-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-mode-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-mode-to-mask-type-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-mode-to-mask-type-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-mode-to-mask-type-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-mode-to-mask-type-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-mode-to-mask-type.html b/tests/wpt/tests/css/css-masking/mask-image/mask-mode-to-mask-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-mode-to-mask-type.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-mode-to-mask-type.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-opacity-1-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-opacity-1-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-opacity-1a.html b/tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-opacity-1a.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-opacity-1b.html b/tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-opacity-1b.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-opacity-1c.html b/tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-opacity-1c.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1c.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-opacity-1d.html b/tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-opacity-1d.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1d.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-opacity-1e.html b/tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-opacity-1e.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1e.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-origin-1-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-origin-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-origin-1-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-origin-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-origin-1.html b/tests/wpt/tests/css/css-masking/mask-image/mask-origin-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-origin-1.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-origin-1.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-origin-2-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-origin-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-origin-2-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-origin-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-origin-2.html b/tests/wpt/tests/css/css-masking/mask-image/mask-origin-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-origin-2.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-origin-2.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-origin-3-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-origin-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-origin-3-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-origin-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-origin-3.html b/tests/wpt/tests/css/css-masking/mask-image/mask-origin-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-origin-3.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-origin-3.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-1-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-1-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-1a.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-1a.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-1b.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-1b.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-1c.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-1c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-1c.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-1c.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-2-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-2-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-2a.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-2a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-2a.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-2a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-2b.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-2b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-2b.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-2b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-3-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-3-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-3a.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-3a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-3a.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-3a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-3b.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-3b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-3b.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-3b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-4-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-4-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-4a.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-4a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-4a.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-4a.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-4b.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-4b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-4b.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-4b.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-4c.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-4c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-4c.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-4c.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-4d.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-4d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-4d.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-4d.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-5-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-5-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-5-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-5-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-5.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-5.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-5.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-5.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-6-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-6-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-6-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-6-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-6.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-6.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-6.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-6.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-7-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-7-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-7-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-7-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-7.html b/tests/wpt/tests/css/css-masking/mask-image/mask-position-7.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-position-7.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-position-7.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-repeat-1-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-repeat-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-repeat-1-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-repeat-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-repeat-1.html b/tests/wpt/tests/css/css-masking/mask-image/mask-repeat-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-repeat-1.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-repeat-1.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-repeat-2-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-repeat-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-repeat-2-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-repeat-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-repeat-2.html b/tests/wpt/tests/css/css-masking/mask-image/mask-repeat-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-repeat-2.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-repeat-2.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-repeat-3-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-repeat-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-repeat-3-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-repeat-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-repeat-3.html b/tests/wpt/tests/css/css-masking/mask-image/mask-repeat-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-repeat-3.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-repeat-3.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-auto-auto.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-auto-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-auto-auto.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-auto-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-auto-length-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-auto-length-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-auto-length-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-auto-length-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-auto-length.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-auto-length.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-auto-length.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-auto-length.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-auto-percent.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-auto-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-auto-percent.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-auto-percent.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-auto-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-auto-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-auto.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-auto.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain-clip-border-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-contain-clip-border-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain-clip-border-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-contain-clip-border-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain-clip-border.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-contain-clip-border.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain-clip-border.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-contain-clip-border.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain-clip-padding-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-contain-clip-padding-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain-clip-padding-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-contain-clip-padding-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain-clip-padding.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-contain-clip-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain-clip-padding.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-contain-clip-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain-position-fifty-fifty-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-contain-position-fifty-fifty-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain-position-fifty-fifty-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-contain-position-fifty-fifty-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain-position-fifty-fifty.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-contain-position-fifty-fifty.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain-position-fifty-fifty.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-contain-position-fifty-fifty.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-contain-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-contain-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-contain.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-contain.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-contain.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-cover-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-cover-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-cover-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-cover-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-cover.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-cover.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-cover.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-cover.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-length-auto.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-length-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-length-auto.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-length-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-length-length-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-length-length-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-length-length-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-length-length-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-length-length.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-length-length.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-length-length.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-length-length.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-length-percent-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-length-percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-length-percent-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-length-percent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-length-percent.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-length-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-length-percent.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-length-percent.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-length.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-length.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-length.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-length.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-percent-auto.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-percent-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-percent-auto.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-percent-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-percent-length.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-percent-length.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-percent-length.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-percent-length.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-percent-percent-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-percent-percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-percent-percent-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-percent-percent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-percent-percent-stretch-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-percent-percent-stretch-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-percent-percent-stretch-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-percent-percent-stretch-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-percent-percent-stretch.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-percent-percent-stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-percent-percent-stretch.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-percent-percent-stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-percent-percent.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-percent-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-percent-percent.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-percent-percent.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-percent.html b/tests/wpt/tests/css/css-masking/mask-image/mask-size-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/mask-size-percent.html rename to tests/wpt/tests/css/css-masking/mask-image/mask-size-percent.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/reference/1x1-black-30-alpha.png b/tests/wpt/tests/css/css-masking/mask-image/reference/1x1-black-30-alpha.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/reference/1x1-black-30-alpha.png rename to tests/wpt/tests/css/css-masking/mask-image/reference/1x1-black-30-alpha.png diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/reference/mask-image-data-url-image-ref.html b/tests/wpt/tests/css/css-masking/mask-image/reference/mask-image-data-url-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/reference/mask-image-data-url-image-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/reference/mask-image-data-url-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/reference/mask-image-ib-split-2-ref.html b/tests/wpt/tests/css/css-masking/mask-image/reference/mask-image-ib-split-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/reference/mask-image-ib-split-2-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/reference/mask-image-ib-split-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/reference/mask-image-ib-split-ref.html b/tests/wpt/tests/css/css-masking/mask-image/reference/mask-image-ib-split-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/reference/mask-image-ib-split-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/reference/mask-image-ib-split-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/reference/mask-image-ref.html b/tests/wpt/tests/css/css-masking/mask-image/reference/mask-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/reference/mask-image-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/reference/mask-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/reference/mask-image-svg-child-will-change-ref.html b/tests/wpt/tests/css/css-masking/mask-image/reference/mask-image-svg-child-will-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/reference/mask-image-svg-child-will-change-ref.html rename to tests/wpt/tests/css/css-masking/mask-image/reference/mask-image-svg-child-will-change-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/50x100-opaque-blue.svg b/tests/wpt/tests/css/css-masking/mask-image/support/50x100-opaque-blue.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/50x100-opaque-blue.svg rename to tests/wpt/tests/css/css-masking/mask-image/support/50x100-opaque-blue.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/50x50-opaque-blue.svg b/tests/wpt/tests/css/css-masking/mask-image/support/50x50-opaque-blue.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/50x50-opaque-blue.svg rename to tests/wpt/tests/css/css-masking/mask-image/support/50x50-opaque-blue.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/blue-100x100.png b/tests/wpt/tests/css/css-masking/mask-image/support/blue-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/blue-100x100.png rename to tests/wpt/tests/css/css-masking/mask-image/support/blue-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/blue-100x100.svg b/tests/wpt/tests/css/css-masking/mask-image/support/blue-100x100.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/blue-100x100.svg rename to tests/wpt/tests/css/css-masking/mask-image/support/blue-100x100.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/blue-100x50-transparent-100x50.png b/tests/wpt/tests/css/css-masking/mask-image/support/blue-100x50-transparent-100x50.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/blue-100x50-transparent-100x50.png rename to tests/wpt/tests/css/css-masking/mask-image/support/blue-100x50-transparent-100x50.png diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/blue-100x50-transparent-100x50.svg b/tests/wpt/tests/css/css-masking/mask-image/support/blue-100x50-transparent-100x50.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/blue-100x50-transparent-100x50.svg rename to tests/wpt/tests/css/css-masking/mask-image/support/blue-100x50-transparent-100x50.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/blue-luminance-100x100.svg b/tests/wpt/tests/css/css-masking/mask-image/support/blue-luminance-100x100.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/blue-luminance-100x100.svg rename to tests/wpt/tests/css/css-masking/mask-image/support/blue-luminance-100x100.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/green-100x100.png b/tests/wpt/tests/css/css-masking/mask-image/support/green-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/green-100x100.png rename to tests/wpt/tests/css/css-masking/mask-image/support/green-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/green-100x100.svg b/tests/wpt/tests/css/css-masking/mask-image/support/green-100x100.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/green-100x100.svg rename to tests/wpt/tests/css/css-masking/mask-image/support/green-100x100.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/green-luminance-100x100.svg b/tests/wpt/tests/css/css-masking/mask-image/support/green-luminance-100x100.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/green-luminance-100x100.svg rename to tests/wpt/tests/css/css-masking/mask-image/support/green-luminance-100x100.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/image-with-ref.svg b/tests/wpt/tests/css/css-masking/mask-image/support/image-with-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/image-with-ref.svg rename to tests/wpt/tests/css/css-masking/mask-image/support/image-with-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/image.svg b/tests/wpt/tests/css/css-masking/mask-image/support/image.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/image.svg rename to tests/wpt/tests/css/css-masking/mask-image/support/image.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/mask-half-transparent-100x100.svg b/tests/wpt/tests/css/css-masking/mask-image/support/mask-half-transparent-100x100.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/mask-half-transparent-100x100.svg rename to tests/wpt/tests/css/css-masking/mask-image/support/mask-half-transparent-100x100.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/mask.svg b/tests/wpt/tests/css/css-masking/mask-image/support/mask.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/mask.svg rename to tests/wpt/tests/css/css-masking/mask-image/support/mask.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/red-100x100.png b/tests/wpt/tests/css/css-masking/mask-image/support/red-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/red-100x100.png rename to tests/wpt/tests/css/css-masking/mask-image/support/red-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/red-100x100.svg b/tests/wpt/tests/css/css-masking/mask-image/support/red-100x100.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/red-100x100.svg rename to tests/wpt/tests/css/css-masking/mask-image/support/red-100x100.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/red-luminance-100x100.svg b/tests/wpt/tests/css/css-masking/mask-image/support/red-luminance-100x100.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/red-luminance-100x100.svg rename to tests/wpt/tests/css/css-masking/mask-image/support/red-luminance-100x100.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/transparent-100x50-blue-100x50.png b/tests/wpt/tests/css/css-masking/mask-image/support/transparent-100x50-blue-100x50.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/transparent-100x50-blue-100x50.png rename to tests/wpt/tests/css/css-masking/mask-image/support/transparent-100x50-blue-100x50.png diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-image/support/transparent-100x50-blue-100x50.svg b/tests/wpt/tests/css/css-masking/mask-image/support/transparent-100x50-blue-100x50.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-image/support/transparent-100x50-blue-100x50.svg rename to tests/wpt/tests/css/css-masking/mask-image/support/transparent-100x50-blue-100x50.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/mask-empty-container-with-filter.svg b/tests/wpt/tests/css/css-masking/mask-svg-content/mask-empty-container-with-filter.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/mask-empty-container-with-filter.svg rename to tests/wpt/tests/css/css-masking/mask-svg-content/mask-empty-container-with-filter.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/mask-negative-scale.svg b/tests/wpt/tests/css/css-masking/mask-svg-content/mask-negative-scale.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/mask-negative-scale.svg rename to tests/wpt/tests/css/css-masking/mask-svg-content/mask-negative-scale.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/mask-text-001.svg b/tests/wpt/tests/css/css-masking/mask-svg-content/mask-text-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/mask-text-001.svg rename to tests/wpt/tests/css/css-masking/mask-svg-content/mask-text-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/mask-type-001.svg b/tests/wpt/tests/css/css-masking/mask-svg-content/mask-type-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/mask-type-001.svg rename to tests/wpt/tests/css/css-masking/mask-svg-content/mask-type-001.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/mask-type-002.svg b/tests/wpt/tests/css/css-masking/mask-svg-content/mask-type-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/mask-type-002.svg rename to tests/wpt/tests/css/css-masking/mask-svg-content/mask-type-002.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/mask-type-003.svg b/tests/wpt/tests/css/css-masking/mask-svg-content/mask-type-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/mask-type-003.svg rename to tests/wpt/tests/css/css-masking/mask-svg-content/mask-type-003.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/mask-with-rotation.svg b/tests/wpt/tests/css/css-masking/mask-svg-content/mask-with-rotation.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/mask-with-rotation.svg rename to tests/wpt/tests/css/css-masking/mask-svg-content/mask-with-rotation.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/reference/mask-green-square-001-ref.svg b/tests/wpt/tests/css/css-masking/mask-svg-content/reference/mask-green-square-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/reference/mask-green-square-001-ref.svg rename to tests/wpt/tests/css/css-masking/mask-svg-content/reference/mask-green-square-001-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/reference/mask-negative-scale-001-ref.svg b/tests/wpt/tests/css/css-masking/mask-svg-content/reference/mask-negative-scale-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/reference/mask-negative-scale-001-ref.svg rename to tests/wpt/tests/css/css-masking/mask-svg-content/reference/mask-negative-scale-001-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/reference/mask-text-001-ref.svg b/tests/wpt/tests/css/css-masking/mask-svg-content/reference/mask-text-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/mask-svg-content/reference/mask-text-001-ref.svg rename to tests/wpt/tests/css/css-masking/mask-svg-content/reference/mask-text-001-ref.svg diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/clip-computed.html b/tests/wpt/tests/css/css-masking/parsing/clip-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/clip-computed.html rename to tests/wpt/tests/css/css-masking/parsing/clip-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/clip-invalid.html b/tests/wpt/tests/css/css-masking/parsing/clip-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/clip-invalid.html rename to tests/wpt/tests/css/css-masking/parsing/clip-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/clip-path-computed.html b/tests/wpt/tests/css/css-masking/parsing/clip-path-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/clip-path-computed.html rename to tests/wpt/tests/css/css-masking/parsing/clip-path-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/clip-path-invalid.html b/tests/wpt/tests/css/css-masking/parsing/clip-path-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/clip-path-invalid.html rename to tests/wpt/tests/css/css-masking/parsing/clip-path-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/clip-path-shape-parsing.html b/tests/wpt/tests/css/css-masking/parsing/clip-path-shape-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/clip-path-shape-parsing.html rename to tests/wpt/tests/css/css-masking/parsing/clip-path-shape-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/clip-path-valid.html b/tests/wpt/tests/css/css-masking/parsing/clip-path-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/clip-path-valid.html rename to tests/wpt/tests/css/css-masking/parsing/clip-path-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/clip-rule-computed.html b/tests/wpt/tests/css/css-masking/parsing/clip-rule-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/clip-rule-computed.html rename to tests/wpt/tests/css/css-masking/parsing/clip-rule-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/clip-rule-invalid.html b/tests/wpt/tests/css/css-masking/parsing/clip-rule-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/clip-rule-invalid.html rename to tests/wpt/tests/css/css-masking/parsing/clip-rule-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/clip-rule-valid.html b/tests/wpt/tests/css/css-masking/parsing/clip-rule-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/clip-rule-valid.html rename to tests/wpt/tests/css/css-masking/parsing/clip-rule-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/clip-valid.html b/tests/wpt/tests/css/css-masking/parsing/clip-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/clip-valid.html rename to tests/wpt/tests/css/css-masking/parsing/clip-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/mask-invalid.html b/tests/wpt/tests/css/css-masking/parsing/mask-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/mask-invalid.html rename to tests/wpt/tests/css/css-masking/parsing/mask-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/mask-position-invalid.html b/tests/wpt/tests/css/css-masking/parsing/mask-position-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/mask-position-invalid.html rename to tests/wpt/tests/css/css-masking/parsing/mask-position-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/mask-position-valid.html b/tests/wpt/tests/css/css-masking/parsing/mask-position-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/mask-position-valid.html rename to tests/wpt/tests/css/css-masking/parsing/mask-position-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/mask-type-computed.html b/tests/wpt/tests/css/css-masking/parsing/mask-type-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/mask-type-computed.html rename to tests/wpt/tests/css/css-masking/parsing/mask-type-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/mask-type-invalid.html b/tests/wpt/tests/css/css-masking/parsing/mask-type-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/mask-type-invalid.html rename to tests/wpt/tests/css/css-masking/parsing/mask-type-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/mask-type-valid.html b/tests/wpt/tests/css/css-masking/parsing/mask-type-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/mask-type-valid.html rename to tests/wpt/tests/css/css-masking/parsing/mask-type-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/mask-valid.sub.html b/tests/wpt/tests/css/css-masking/parsing/mask-valid.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/parsing/mask-valid.sub.html rename to tests/wpt/tests/css/css-masking/parsing/mask-valid.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-masking/resources/blue-20.png b/tests/wpt/tests/css/css-masking/resources/blue-20.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/resources/blue-20.png rename to tests/wpt/tests/css/css-masking/resources/blue-20.png diff --git a/tests/wpt/web-platform-tests/css/css-masking/resources/green-20.png b/tests/wpt/tests/css/css-masking/resources/green-20.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/resources/green-20.png rename to tests/wpt/tests/css/css-masking/resources/green-20.png diff --git a/tests/wpt/web-platform-tests/css/css-masking/resources/stripes-20.png b/tests/wpt/tests/css/css-masking/resources/stripes-20.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-masking/resources/stripes-20.png rename to tests/wpt/tests/css/css-masking/resources/stripes-20.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/META.yml b/tests/wpt/tests/css/css-multicol/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/META.yml rename to tests/wpt/tests/css/css-multicol/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-multicol/abspos-after-spanner-static-pos.html b/tests/wpt/tests/css/css-multicol/abspos-after-spanner-static-pos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/abspos-after-spanner-static-pos.html rename to tests/wpt/tests/css/css-multicol/abspos-after-spanner-static-pos.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/abspos-after-spanner.html b/tests/wpt/tests/css/css-multicol/abspos-after-spanner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/abspos-after-spanner.html rename to tests/wpt/tests/css/css-multicol/abspos-after-spanner.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/abspos-autopos-contained-by-viewport-000.html b/tests/wpt/tests/css/css-multicol/abspos-autopos-contained-by-viewport-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/abspos-autopos-contained-by-viewport-000.html rename to tests/wpt/tests/css/css-multicol/abspos-autopos-contained-by-viewport-000.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/abspos-autopos-contained-by-viewport-001.html b/tests/wpt/tests/css/css-multicol/abspos-autopos-contained-by-viewport-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/abspos-autopos-contained-by-viewport-001.html rename to tests/wpt/tests/css/css-multicol/abspos-autopos-contained-by-viewport-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/abspos-containing-block-outside-spanner-ref.html b/tests/wpt/tests/css/css-multicol/abspos-containing-block-outside-spanner-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/abspos-containing-block-outside-spanner-ref.html rename to tests/wpt/tests/css/css-multicol/abspos-containing-block-outside-spanner-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/abspos-containing-block-outside-spanner.html b/tests/wpt/tests/css/css-multicol/abspos-containing-block-outside-spanner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/abspos-containing-block-outside-spanner.html rename to tests/wpt/tests/css/css-multicol/abspos-containing-block-outside-spanner.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/abspos-in-multicol-with-spanner-crash.html b/tests/wpt/tests/css/css-multicol/abspos-in-multicol-with-spanner-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/abspos-in-multicol-with-spanner-crash.html rename to tests/wpt/tests/css/css-multicol/abspos-in-multicol-with-spanner-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/abspos-multicol-in-second-outer-clipped.html b/tests/wpt/tests/css/css-multicol/abspos-multicol-in-second-outer-clipped.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/abspos-multicol-in-second-outer-clipped.html rename to tests/wpt/tests/css/css-multicol/abspos-multicol-in-second-outer-clipped.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/always-balancing-before-column-span.html b/tests/wpt/tests/css/css-multicol/always-balancing-before-column-span.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/always-balancing-before-column-span.html rename to tests/wpt/tests/css/css-multicol/always-balancing-before-column-span.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/animation/column-count-interpolation.html b/tests/wpt/tests/css/css-multicol/animation/column-count-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/animation/column-count-interpolation.html rename to tests/wpt/tests/css/css-multicol/animation/column-count-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/animation/column-rule-color-interpolation.html b/tests/wpt/tests/css/css-multicol/animation/column-rule-color-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/animation/column-rule-color-interpolation.html rename to tests/wpt/tests/css/css-multicol/animation/column-rule-color-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/animation/column-rule-width-interpolation.html b/tests/wpt/tests/css/css-multicol/animation/column-rule-width-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/animation/column-rule-width-interpolation.html rename to tests/wpt/tests/css/css-multicol/animation/column-rule-width-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/animation/column-width-interpolation.html b/tests/wpt/tests/css/css-multicol/animation/column-width-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/animation/column-width-interpolation.html rename to tests/wpt/tests/css/css-multicol/animation/column-width-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/animation/discrete-no-interpolation.html b/tests/wpt/tests/css/css-multicol/animation/discrete-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/animation/discrete-no-interpolation.html rename to tests/wpt/tests/css/css-multicol/animation/discrete-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/as-column-flex-item.html b/tests/wpt/tests/css/css-multicol/as-column-flex-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/as-column-flex-item.html rename to tests/wpt/tests/css/css-multicol/as-column-flex-item.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/auto-fill-auto-size-001-print-ref.html b/tests/wpt/tests/css/css-multicol/auto-fill-auto-size-001-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/auto-fill-auto-size-001-print-ref.html rename to tests/wpt/tests/css/css-multicol/auto-fill-auto-size-001-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/auto-fill-auto-size-001-print.html b/tests/wpt/tests/css/css-multicol/auto-fill-auto-size-001-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/auto-fill-auto-size-001-print.html rename to tests/wpt/tests/css/css-multicol/auto-fill-auto-size-001-print.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/auto-fill-auto-size-002-print-ref.html b/tests/wpt/tests/css/css-multicol/auto-fill-auto-size-002-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/auto-fill-auto-size-002-print-ref.html rename to tests/wpt/tests/css/css-multicol/auto-fill-auto-size-002-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/auto-fill-auto-size-002-print.html b/tests/wpt/tests/css/css-multicol/auto-fill-auto-size-002-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/auto-fill-auto-size-002-print.html rename to tests/wpt/tests/css/css-multicol/auto-fill-auto-size-002-print.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/balance-break-avoidance-000.html b/tests/wpt/tests/css/css-multicol/balance-break-avoidance-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/balance-break-avoidance-000.html rename to tests/wpt/tests/css/css-multicol/balance-break-avoidance-000.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/balance-break-avoidance-001.html b/tests/wpt/tests/css/css-multicol/balance-break-avoidance-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/balance-break-avoidance-001.html rename to tests/wpt/tests/css/css-multicol/balance-break-avoidance-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/balance-break-avoidance-002.html b/tests/wpt/tests/css/css-multicol/balance-break-avoidance-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/balance-break-avoidance-002.html rename to tests/wpt/tests/css/css-multicol/balance-break-avoidance-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/balance-extremely-tall-monolithic-content-crash.html b/tests/wpt/tests/css/css-multicol/balance-extremely-tall-monolithic-content-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/balance-extremely-tall-monolithic-content-crash.html rename to tests/wpt/tests/css/css-multicol/balance-extremely-tall-monolithic-content-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/balance-grid-container-ref.html b/tests/wpt/tests/css/css-multicol/balance-grid-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/balance-grid-container-ref.html rename to tests/wpt/tests/css/css-multicol/balance-grid-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/balance-grid-container.html b/tests/wpt/tests/css/css-multicol/balance-grid-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/balance-grid-container.html rename to tests/wpt/tests/css/css-multicol/balance-grid-container.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/balance-orphans-widows-000.html b/tests/wpt/tests/css/css-multicol/balance-orphans-widows-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/balance-orphans-widows-000.html rename to tests/wpt/tests/css/css-multicol/balance-orphans-widows-000.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-000-ref.html b/tests/wpt/tests/css/css-multicol/baseline-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-000-ref.html rename to tests/wpt/tests/css/css-multicol/baseline-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-000.html b/tests/wpt/tests/css/css-multicol/baseline-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-000.html rename to tests/wpt/tests/css/css-multicol/baseline-000.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-001-ref.html b/tests/wpt/tests/css/css-multicol/baseline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-001-ref.html rename to tests/wpt/tests/css/css-multicol/baseline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-001.html b/tests/wpt/tests/css/css-multicol/baseline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-001.html rename to tests/wpt/tests/css/css-multicol/baseline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-002-ref.html b/tests/wpt/tests/css/css-multicol/baseline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-002-ref.html rename to tests/wpt/tests/css/css-multicol/baseline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-002.html b/tests/wpt/tests/css/css-multicol/baseline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-002.html rename to tests/wpt/tests/css/css-multicol/baseline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-003-ref.html b/tests/wpt/tests/css/css-multicol/baseline-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-003-ref.html rename to tests/wpt/tests/css/css-multicol/baseline-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-003.html b/tests/wpt/tests/css/css-multicol/baseline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-003.html rename to tests/wpt/tests/css/css-multicol/baseline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-004-ref.html b/tests/wpt/tests/css/css-multicol/baseline-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-004-ref.html rename to tests/wpt/tests/css/css-multicol/baseline-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-004.html b/tests/wpt/tests/css/css-multicol/baseline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-004.html rename to tests/wpt/tests/css/css-multicol/baseline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-005-ref.html b/tests/wpt/tests/css/css-multicol/baseline-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-005-ref.html rename to tests/wpt/tests/css/css-multicol/baseline-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-005.html b/tests/wpt/tests/css/css-multicol/baseline-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-005.html rename to tests/wpt/tests/css/css-multicol/baseline-005.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-006-ref.html b/tests/wpt/tests/css/css-multicol/baseline-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-006-ref.html rename to tests/wpt/tests/css/css-multicol/baseline-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-006.html b/tests/wpt/tests/css/css-multicol/baseline-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-006.html rename to tests/wpt/tests/css/css-multicol/baseline-006.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-007-ref.html b/tests/wpt/tests/css/css-multicol/baseline-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-007-ref.html rename to tests/wpt/tests/css/css-multicol/baseline-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-007.html b/tests/wpt/tests/css/css-multicol/baseline-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-007.html rename to tests/wpt/tests/css/css-multicol/baseline-007.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-008-ref.html b/tests/wpt/tests/css/css-multicol/baseline-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-008-ref.html rename to tests/wpt/tests/css/css-multicol/baseline-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/baseline-008.html b/tests/wpt/tests/css/css-multicol/baseline-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/baseline-008.html rename to tests/wpt/tests/css/css-multicol/baseline-008.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/broken-column-rule-1-ref.html b/tests/wpt/tests/css/css-multicol/broken-column-rule-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/broken-column-rule-1-ref.html rename to tests/wpt/tests/css/css-multicol/broken-column-rule-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/broken-column-rule-1.html b/tests/wpt/tests/css/css-multicol/broken-column-rule-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/broken-column-rule-1.html rename to tests/wpt/tests/css/css-multicol/broken-column-rule-1.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/change-abspos-width-in-second-column-crash.html b/tests/wpt/tests/css/css-multicol/change-abspos-width-in-second-column-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/change-abspos-width-in-second-column-crash.html rename to tests/wpt/tests/css/css-multicol/change-abspos-width-in-second-column-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/change-fragmentainer-size-000.html b/tests/wpt/tests/css/css-multicol/change-fragmentainer-size-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/change-fragmentainer-size-000.html rename to tests/wpt/tests/css/css-multicol/change-fragmentainer-size-000.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/change-fragmentainer-size-001.html b/tests/wpt/tests/css/css-multicol/change-fragmentainer-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/change-fragmentainer-size-001.html rename to tests/wpt/tests/css/css-multicol/change-fragmentainer-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/change-fragmentainer-size-002.html b/tests/wpt/tests/css/css-multicol/change-fragmentainer-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/change-fragmentainer-size-002.html rename to tests/wpt/tests/css/css-multicol/change-fragmentainer-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/change-fragmentainer-size-003.html b/tests/wpt/tests/css/css-multicol/change-fragmentainer-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/change-fragmentainer-size-003.html rename to tests/wpt/tests/css/css-multicol/change-fragmentainer-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/change-intrinsic-width.html b/tests/wpt/tests/css/css-multicol/change-intrinsic-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/change-intrinsic-width.html rename to tests/wpt/tests/css/css-multicol/change-intrinsic-width.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/change-out-of-flow-type-and-remove-inner-multicol-crash.html b/tests/wpt/tests/css/css-multicol/change-out-of-flow-type-and-remove-inner-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/change-out-of-flow-type-and-remove-inner-multicol-crash.html rename to tests/wpt/tests/css/css-multicol/change-out-of-flow-type-and-remove-inner-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/change-transform-in-nested.html b/tests/wpt/tests/css/css-multicol/change-transform-in-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/change-transform-in-nested.html rename to tests/wpt/tests/css/css-multicol/change-transform-in-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/change-transform-in-second-column.html b/tests/wpt/tests/css/css-multicol/change-transform-in-second-column.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/change-transform-in-second-column.html rename to tests/wpt/tests/css/css-multicol/change-transform-in-second-column.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/change-transform-in-spanner.html b/tests/wpt/tests/css/css-multicol/change-transform-in-spanner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/change-transform-in-spanner.html rename to tests/wpt/tests/css/css-multicol/change-transform-in-spanner.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/change-transform.html b/tests/wpt/tests/css/css-multicol/change-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/change-transform.html rename to tests/wpt/tests/css/css-multicol/change-transform.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/column-balancing-paged-001-print-ref.html b/tests/wpt/tests/css/css-multicol/column-balancing-paged-001-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/column-balancing-paged-001-print-ref.html rename to tests/wpt/tests/css/css-multicol/column-balancing-paged-001-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/column-balancing-paged-001-print.html b/tests/wpt/tests/css/css-multicol/column-balancing-paged-001-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/column-balancing-paged-001-print.html rename to tests/wpt/tests/css/css-multicol/column-balancing-paged-001-print.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/column-balancing-with-overflow-auto-crash.html b/tests/wpt/tests/css/css-multicol/column-balancing-with-overflow-auto-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/column-balancing-with-overflow-auto-crash.html rename to tests/wpt/tests/css/css-multicol/column-balancing-with-overflow-auto-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/column-balancing-with-span-and-oof-001.html b/tests/wpt/tests/css/css-multicol/column-balancing-with-span-and-oof-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/column-balancing-with-span-and-oof-001.html rename to tests/wpt/tests/css/css-multicol/column-balancing-with-span-and-oof-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/column-balancing-with-span-and-oof-002.html b/tests/wpt/tests/css/css-multicol/column-balancing-with-span-and-oof-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/column-balancing-with-span-and-oof-002.html rename to tests/wpt/tests/css/css-multicol/column-balancing-with-span-and-oof-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/column-count-used-001.html b/tests/wpt/tests/css/css-multicol/column-count-used-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/column-count-used-001.html rename to tests/wpt/tests/css/css-multicol/column-count-used-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/column-fill-balance-orthog-block-001.html b/tests/wpt/tests/css/css-multicol/column-fill-balance-orthog-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/column-fill-balance-orthog-block-001.html rename to tests/wpt/tests/css/css-multicol/column-fill-balance-orthog-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/columnfill-auto-max-height-001.html b/tests/wpt/tests/css/css-multicol/columnfill-auto-max-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/columnfill-auto-max-height-001.html rename to tests/wpt/tests/css/css-multicol/columnfill-auto-max-height-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/columnfill-auto-max-height-002.html b/tests/wpt/tests/css/css-multicol/columnfill-auto-max-height-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/columnfill-auto-max-height-002.html rename to tests/wpt/tests/css/css-multicol/columnfill-auto-max-height-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/columnfill-auto-max-height-003.html b/tests/wpt/tests/css/css-multicol/columnfill-auto-max-height-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/columnfill-auto-max-height-003.html rename to tests/wpt/tests/css/css-multicol/columnfill-auto-max-height-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/composited-under-clip-under-multicol-ref.html b/tests/wpt/tests/css/css-multicol/composited-under-clip-under-multicol-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/composited-under-clip-under-multicol-ref.html rename to tests/wpt/tests/css/css-multicol/composited-under-clip-under-multicol-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/composited-under-clip-under-multicol.html b/tests/wpt/tests/css/css-multicol/composited-under-clip-under-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/composited-under-clip-under-multicol.html rename to tests/wpt/tests/css/css-multicol/composited-under-clip-under-multicol.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/as-baseline-aligned-grid-item.html b/tests/wpt/tests/css/css-multicol/crashtests/as-baseline-aligned-grid-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/as-baseline-aligned-grid-item.html rename to tests/wpt/tests/css/css-multicol/crashtests/as-baseline-aligned-grid-item.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/balance-with-forced-break.html b/tests/wpt/tests/css/css-multicol/crashtests/balance-with-forced-break.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/balance-with-forced-break.html rename to tests/wpt/tests/css/css-multicol/crashtests/balance-with-forced-break.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/balancing-flex-item-trailing-margin-freeze.html b/tests/wpt/tests/css/css-multicol/crashtests/balancing-flex-item-trailing-margin-freeze.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/balancing-flex-item-trailing-margin-freeze.html rename to tests/wpt/tests/css/css-multicol/crashtests/balancing-flex-item-trailing-margin-freeze.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/balancing-tall-borders-freeze.html b/tests/wpt/tests/css/css-multicol/crashtests/balancing-tall-borders-freeze.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/balancing-tall-borders-freeze.html rename to tests/wpt/tests/css/css-multicol/crashtests/balancing-tall-borders-freeze.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/body-becomes-spanner-html-becomes-vertical-rl.html b/tests/wpt/tests/css/css-multicol/crashtests/body-becomes-spanner-html-becomes-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/body-becomes-spanner-html-becomes-vertical-rl.html rename to tests/wpt/tests/css/css-multicol/crashtests/body-becomes-spanner-html-becomes-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/break-before-multicol-caption.html b/tests/wpt/tests/css/css-multicol/crashtests/break-before-multicol-caption.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/break-before-multicol-caption.html rename to tests/wpt/tests/css/css-multicol/crashtests/break-before-multicol-caption.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/chrome-bug-1293905.html b/tests/wpt/tests/css/css-multicol/crashtests/chrome-bug-1293905.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/chrome-bug-1293905.html rename to tests/wpt/tests/css/css-multicol/crashtests/chrome-bug-1293905.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/chrome-bug-1297118.html b/tests/wpt/tests/css/css-multicol/crashtests/chrome-bug-1297118.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/chrome-bug-1297118.html rename to tests/wpt/tests/css/css-multicol/crashtests/chrome-bug-1297118.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/chrome-bug-1301281.html b/tests/wpt/tests/css/css-multicol/crashtests/chrome-bug-1301281.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/chrome-bug-1301281.html rename to tests/wpt/tests/css/css-multicol/crashtests/chrome-bug-1301281.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/chrome-bug-1303256.html b/tests/wpt/tests/css/css-multicol/crashtests/chrome-bug-1303256.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/chrome-bug-1303256.html rename to tests/wpt/tests/css/css-multicol/crashtests/chrome-bug-1303256.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/chrome-bug-1314866.html b/tests/wpt/tests/css/css-multicol/crashtests/chrome-bug-1314866.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/chrome-bug-1314866.html rename to tests/wpt/tests/css/css-multicol/crashtests/chrome-bug-1314866.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/dynamic-simplified-layout-break-propagation.html b/tests/wpt/tests/css/css-multicol/crashtests/dynamic-simplified-layout-break-propagation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/dynamic-simplified-layout-break-propagation.html rename to tests/wpt/tests/css/css-multicol/crashtests/dynamic-simplified-layout-break-propagation.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/fit-content-with-spanner-and-auto-scrollbar-sibling.html b/tests/wpt/tests/css/css-multicol/crashtests/fit-content-with-spanner-and-auto-scrollbar-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/fit-content-with-spanner-and-auto-scrollbar-sibling.html rename to tests/wpt/tests/css/css-multicol/crashtests/fit-content-with-spanner-and-auto-scrollbar-sibling.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/float-becomes-non-float-spanner-surprises-inside.html b/tests/wpt/tests/css/css-multicol/crashtests/float-becomes-non-float-spanner-surprises-inside.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/float-becomes-non-float-spanner-surprises-inside.html rename to tests/wpt/tests/css/css-multicol/crashtests/float-becomes-non-float-spanner-surprises-inside.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/float-becomes-spanner.html b/tests/wpt/tests/css/css-multicol/crashtests/float-becomes-spanner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/float-becomes-spanner.html rename to tests/wpt/tests/css/css-multicol/crashtests/float-becomes-spanner.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/float-multicol-crash.html b/tests/wpt/tests/css/css-multicol/crashtests/float-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/float-multicol-crash.html rename to tests/wpt/tests/css/css-multicol/crashtests/float-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/forced-break-in-oof-in-column-balancing-nested.html b/tests/wpt/tests/css/css-multicol/crashtests/forced-break-in-oof-in-column-balancing-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/forced-break-in-oof-in-column-balancing-nested.html rename to tests/wpt/tests/css/css-multicol/crashtests/forced-break-in-oof-in-column-balancing-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/forced-break-in-oof-in-column-balancing.html b/tests/wpt/tests/css/css-multicol/crashtests/forced-break-in-oof-in-column-balancing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/forced-break-in-oof-in-column-balancing.html rename to tests/wpt/tests/css/css-multicol/crashtests/forced-break-in-oof-in-column-balancing.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/inline-with-spanner-in-overflowed-container-before-multicol-float.html b/tests/wpt/tests/css/css-multicol/crashtests/inline-with-spanner-in-overflowed-container-before-multicol-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/inline-with-spanner-in-overflowed-container-before-multicol-float.html rename to tests/wpt/tests/css/css-multicol/crashtests/inline-with-spanner-in-overflowed-container-before-multicol-float.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/margin-and-break-before-child-spanner.html b/tests/wpt/tests/css/css-multicol/crashtests/margin-and-break-before-child-spanner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/margin-and-break-before-child-spanner.html rename to tests/wpt/tests/css/css-multicol/crashtests/margin-and-break-before-child-spanner.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/monolithic-oof-in-clipped-container.html b/tests/wpt/tests/css/css-multicol/crashtests/monolithic-oof-in-clipped-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/monolithic-oof-in-clipped-container.html rename to tests/wpt/tests/css/css-multicol/crashtests/monolithic-oof-in-clipped-container.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/move-linebreak-to-different-column.html b/tests/wpt/tests/css/css-multicol/crashtests/move-linebreak-to-different-column.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/move-linebreak-to-different-column.html rename to tests/wpt/tests/css/css-multicol/crashtests/move-linebreak-to-different-column.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/move-newline-pre-text.html b/tests/wpt/tests/css/css-multicol/crashtests/move-newline-pre-text.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/move-newline-pre-text.html rename to tests/wpt/tests/css/css-multicol/crashtests/move-newline-pre-text.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-at-page-boundary-print.html b/tests/wpt/tests/css/css-multicol/crashtests/multicol-at-page-boundary-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-at-page-boundary-print.html rename to tests/wpt/tests/css/css-multicol/crashtests/multicol-at-page-boundary-print.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-block-in-inline-crash.html b/tests/wpt/tests/css/css-multicol/crashtests/multicol-block-in-inline-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-block-in-inline-crash.html rename to tests/wpt/tests/css/css-multicol/crashtests/multicol-block-in-inline-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-cached-consumed-bsize-crash.html b/tests/wpt/tests/css/css-multicol/crashtests/multicol-cached-consumed-bsize-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-cached-consumed-bsize-crash.html rename to tests/wpt/tests/css/css-multicol/crashtests/multicol-cached-consumed-bsize-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-column-change-crash.html b/tests/wpt/tests/css/css-multicol/crashtests/multicol-column-change-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-column-change-crash.html rename to tests/wpt/tests/css/css-multicol/crashtests/multicol-column-change-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-dynamic-contain-crash.html b/tests/wpt/tests/css/css-multicol/crashtests/multicol-dynamic-contain-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-dynamic-contain-crash.html rename to tests/wpt/tests/css/css-multicol/crashtests/multicol-dynamic-contain-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-dynamic-transform-crash.html b/tests/wpt/tests/css/css-multicol/crashtests/multicol-dynamic-transform-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-dynamic-transform-crash.html rename to tests/wpt/tests/css/css-multicol/crashtests/multicol-dynamic-transform-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-floats-after-column-span-crash.html b/tests/wpt/tests/css/css-multicol/crashtests/multicol-floats-after-column-span-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-floats-after-column-span-crash.html rename to tests/wpt/tests/css/css-multicol/crashtests/multicol-floats-after-column-span-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-floats-in-ifc.html b/tests/wpt/tests/css/css-multicol/crashtests/multicol-floats-in-ifc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-floats-in-ifc.html rename to tests/wpt/tests/css/css-multicol/crashtests/multicol-floats-in-ifc.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-parallel-flow-after-spanner-in-inline.html b/tests/wpt/tests/css/css-multicol/crashtests/multicol-parallel-flow-after-spanner-in-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-parallel-flow-after-spanner-in-inline.html rename to tests/wpt/tests/css/css-multicol/crashtests/multicol-parallel-flow-after-spanner-in-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-table-caption-parallel-flow-after-spanner-in-inline.html b/tests/wpt/tests/css/css-multicol/crashtests/multicol-table-caption-parallel-flow-after-spanner-in-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-table-caption-parallel-flow-after-spanner-in-inline.html rename to tests/wpt/tests/css/css-multicol/crashtests/multicol-table-caption-parallel-flow-after-spanner-in-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-with-monolithic-oof-with-multicol-with-oof.html b/tests/wpt/tests/css/css-multicol/crashtests/multicol-with-monolithic-oof-with-multicol-with-oof.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/multicol-with-monolithic-oof-with-multicol-with-oof.html rename to tests/wpt/tests/css/css-multicol/crashtests/multicol-with-monolithic-oof-with-multicol-with-oof.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/negative-margin-on-column-spanner.html b/tests/wpt/tests/css/css-multicol/crashtests/negative-margin-on-column-spanner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/negative-margin-on-column-spanner.html rename to tests/wpt/tests/css/css-multicol/crashtests/negative-margin-on-column-spanner.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-as-balanced-legend.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-as-balanced-legend.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-as-balanced-legend.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-as-balanced-legend.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-as-nested-balanced-legend.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-as-nested-balanced-legend.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-as-nested-balanced-legend.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-as-nested-balanced-legend.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-floated-multicol-with-tall-margin.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-floated-multicol-with-tall-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-floated-multicol-with-tall-margin.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-floated-multicol-with-tall-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-multicol-and-float-with-tall-padding-before-float.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-multicol-and-float-with-tall-padding-before-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-multicol-and-float-with-tall-padding-before-float.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-multicol-and-float-with-tall-padding-before-float.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-multicol-and-float-with-tall-padding.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-multicol-and-float-with-tall-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-multicol-and-float-with-tall-padding.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-multicol-and-float-with-tall-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-multicol-fieldset-tall-trailing-border-freeze.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-multicol-fieldset-tall-trailing-border-freeze.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-multicol-fieldset-tall-trailing-border-freeze.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-multicol-fieldset-tall-trailing-border-freeze.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-multicol-fieldset-tall-trailing-padding.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-multicol-fieldset-tall-trailing-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-multicol-fieldset-tall-trailing-padding.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-multicol-fieldset-tall-trailing-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-multicol-in-svg-foreignobject.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-multicol-in-svg-foreignobject.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-multicol-in-svg-foreignobject.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-multicol-in-svg-foreignobject.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-multicol-nested-flex.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-multicol-nested-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-multicol-nested-flex.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-multicol-nested-flex.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-multicol-with-float-between.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-multicol-with-float-between.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-multicol-with-float-between.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-multicol-with-float-between.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-oof-multicol-with-monolithic-child.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-oof-multicol-with-monolithic-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-oof-multicol-with-monolithic-child.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-oof-multicol-with-monolithic-child.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-oof-multicol-with-oof-needing-additional-columns.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-oof-multicol-with-oof-needing-additional-columns.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-oof-multicol-with-oof-needing-additional-columns.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-oof-multicol-with-oof-needing-additional-columns.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-oof-multicol-with-padding.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-oof-multicol-with-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-oof-multicol-with-padding.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-oof-multicol-with-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-spanner-with-negative-margin.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-spanner-with-negative-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-spanner-with-negative-margin.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-spanner-with-negative-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-fragmented-oof-negative-top-offset.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-with-fragmented-oof-negative-top-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-fragmented-oof-negative-top-offset.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-with-fragmented-oof-negative-top-offset.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-multicol-table-caption.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-with-multicol-table-caption.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-multicol-table-caption.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-with-multicol-table-caption.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-multicol-table-cell.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-with-multicol-table-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-multicol-table-cell.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-with-multicol-table-cell.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-oof-inside-fixed-width.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-with-oof-inside-fixed-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-oof-inside-fixed-width.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-with-oof-inside-fixed-width.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-percentage-size-and-oof.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-with-percentage-size-and-oof.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-percentage-size-and-oof.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-with-percentage-size-and-oof.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-tall-padding-and-oof.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-with-tall-padding-and-oof.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-tall-padding-and-oof.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-with-tall-padding-and-oof.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-tall-padding-and-spanner-and-content.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-with-tall-padding-and-spanner-and-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-tall-padding-and-spanner-and-content.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-with-tall-padding-and-spanner-and-content.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-tall-padding.html b/tests/wpt/tests/css/css-multicol/crashtests/nested-with-tall-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/nested-with-tall-padding.html rename to tests/wpt/tests/css/css-multicol/crashtests/nested-with-tall-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/oof-becomes-spanner.html b/tests/wpt/tests/css/css-multicol/crashtests/oof-becomes-spanner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/oof-becomes-spanner.html rename to tests/wpt/tests/css/css-multicol/crashtests/oof-becomes-spanner.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/oof-in-additional-column-before-spanner.html b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-additional-column-before-spanner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/oof-in-additional-column-before-spanner.html rename to tests/wpt/tests/css/css-multicol/crashtests/oof-in-additional-column-before-spanner.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/oof-in-nested-line-float.html b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-nested-line-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/oof-in-nested-line-float.html rename to tests/wpt/tests/css/css-multicol/crashtests/oof-in-nested-line-float.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/oof-nested-multicol-inside-oof.html b/tests/wpt/tests/css/css-multicol/crashtests/oof-nested-multicol-inside-oof.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/oof-nested-multicol-inside-oof.html rename to tests/wpt/tests/css/css-multicol/crashtests/oof-nested-multicol-inside-oof.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/outline-move-oof-with-inline.html b/tests/wpt/tests/css/css-multicol/crashtests/outline-move-oof-with-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/outline-move-oof-with-inline.html rename to tests/wpt/tests/css/css-multicol/crashtests/outline-move-oof-with-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/relayout-nested-with-oof.html b/tests/wpt/tests/css/css-multicol/crashtests/relayout-nested-with-oof.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/relayout-nested-with-oof.html rename to tests/wpt/tests/css/css-multicol/crashtests/relayout-nested-with-oof.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/relpos-inline-with-abspos-multicol-gets-block-child.html b/tests/wpt/tests/css/css-multicol/crashtests/relpos-inline-with-abspos-multicol-gets-block-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/relpos-inline-with-abspos-multicol-gets-block-child.html rename to tests/wpt/tests/css/css-multicol/crashtests/relpos-inline-with-abspos-multicol-gets-block-child.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/relpos-spanner-with-spanner-child-becomes-regular.html b/tests/wpt/tests/css/css-multicol/crashtests/relpos-spanner-with-spanner-child-becomes-regular.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/relpos-spanner-with-spanner-child-becomes-regular.html rename to tests/wpt/tests/css/css-multicol/crashtests/relpos-spanner-with-spanner-child-becomes-regular.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/remove-spanner-after-spanner-in-inline-before-inline.html b/tests/wpt/tests/css/css-multicol/crashtests/remove-spanner-after-spanner-in-inline-before-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/remove-spanner-after-spanner-in-inline-before-inline.html rename to tests/wpt/tests/css/css-multicol/crashtests/remove-spanner-after-spanner-in-inline-before-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/remove-spanner-in-table-caption-nested-multicol.html b/tests/wpt/tests/css/css-multicol/crashtests/remove-spanner-in-table-caption-nested-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/remove-spanner-in-table-caption-nested-multicol.html rename to tests/wpt/tests/css/css-multicol/crashtests/remove-spanner-in-table-caption-nested-multicol.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/repeated-section-in-nested-table-nested-multicol.html b/tests/wpt/tests/css/css-multicol/crashtests/repeated-section-in-nested-table-nested-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/repeated-section-in-nested-table-nested-multicol.html rename to tests/wpt/tests/css/css-multicol/crashtests/repeated-section-in-nested-table-nested-multicol.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/repeated-table-footer-in-caption-nested-multicol.html b/tests/wpt/tests/css/css-multicol/crashtests/repeated-table-footer-in-caption-nested-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/repeated-table-footer-in-caption-nested-multicol.html rename to tests/wpt/tests/css/css-multicol/crashtests/repeated-table-footer-in-caption-nested-multicol.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/restricted-height-bottom-border-overflow-and-spanner.html b/tests/wpt/tests/css/css-multicol/crashtests/restricted-height-bottom-border-overflow-and-spanner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/restricted-height-bottom-border-overflow-and-spanner.html rename to tests/wpt/tests/css/css-multicol/crashtests/restricted-height-bottom-border-overflow-and-spanner.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/scrollable-spanner-in-nested.html b/tests/wpt/tests/css/css-multicol/crashtests/scrollable-spanner-in-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/scrollable-spanner-in-nested.html rename to tests/wpt/tests/css/css-multicol/crashtests/scrollable-spanner-in-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/size-containment-become-multicol-add-inline-child.html b/tests/wpt/tests/css/css-multicol/crashtests/size-containment-become-multicol-add-inline-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/size-containment-become-multicol-add-inline-child.html rename to tests/wpt/tests/css/css-multicol/crashtests/size-containment-become-multicol-add-inline-child.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/spanner-after-parallel-flow.html b/tests/wpt/tests/css/css-multicol/crashtests/spanner-after-parallel-flow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/spanner-after-parallel-flow.html rename to tests/wpt/tests/css/css-multicol/crashtests/spanner-after-parallel-flow.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/spanner-in-inline-after-very-tall-content-001.html b/tests/wpt/tests/css/css-multicol/crashtests/spanner-in-inline-after-very-tall-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/spanner-in-inline-after-very-tall-content-001.html rename to tests/wpt/tests/css/css-multicol/crashtests/spanner-in-inline-after-very-tall-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/spanner-in-inline-after-very-tall-content-002.html b/tests/wpt/tests/css/css-multicol/crashtests/spanner-in-inline-after-very-tall-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/spanner-in-inline-after-very-tall-content-002.html rename to tests/wpt/tests/css/css-multicol/crashtests/spanner-in-inline-after-very-tall-content-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/spanner-in-overflowed-clipped-container.html b/tests/wpt/tests/css/css-multicol/crashtests/spanner-in-overflowed-clipped-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/spanner-in-overflowed-clipped-container.html rename to tests/wpt/tests/css/css-multicol/crashtests/spanner-in-overflowed-clipped-container.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/spanner-in-overflowed-container-before-float.html b/tests/wpt/tests/css/css-multicol/crashtests/spanner-in-overflowed-container-before-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/spanner-in-overflowed-container-before-float.html rename to tests/wpt/tests/css/css-multicol/crashtests/spanner-in-overflowed-container-before-float.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/spanner-in-overflowed-container-before-inline-content.html b/tests/wpt/tests/css/css-multicol/crashtests/spanner-in-overflowed-container-before-inline-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/spanner-in-overflowed-container-before-inline-content.html rename to tests/wpt/tests/css/css-multicol/crashtests/spanner-in-overflowed-container-before-inline-content.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/spanner-inside-inline-in-overflowed-container.html b/tests/wpt/tests/css/css-multicol/crashtests/spanner-inside-inline-in-overflowed-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/spanner-inside-inline-in-overflowed-container.html rename to tests/wpt/tests/css/css-multicol/crashtests/spanner-inside-inline-in-overflowed-container.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/specified-height-with-just-spanner-and-oof.html b/tests/wpt/tests/css/css-multicol/crashtests/specified-height-with-just-spanner-and-oof.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/specified-height-with-just-spanner-and-oof.html rename to tests/wpt/tests/css/css-multicol/crashtests/specified-height-with-just-spanner-and-oof.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/sticky-in-abs-in-sticky.html b/tests/wpt/tests/css/css-multicol/crashtests/sticky-in-abs-in-sticky.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/sticky-in-abs-in-sticky.html rename to tests/wpt/tests/css/css-multicol/crashtests/sticky-in-abs-in-sticky.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/table-caption-change-descendant-display-type.html b/tests/wpt/tests/css/css-multicol/crashtests/table-caption-change-descendant-display-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/table-caption-change-descendant-display-type.html rename to tests/wpt/tests/css/css-multicol/crashtests/table-caption-change-descendant-display-type.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/table-caption-inline-block-remove-child.html b/tests/wpt/tests/css/css-multicol/crashtests/table-caption-inline-block-remove-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/table-caption-inline-block-remove-child.html rename to tests/wpt/tests/css/css-multicol/crashtests/table-caption-inline-block-remove-child.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/table-cell-writing-mode-root.html b/tests/wpt/tests/css/css-multicol/crashtests/table-cell-writing-mode-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/table-cell-writing-mode-root.html rename to tests/wpt/tests/css/css-multicol/crashtests/table-cell-writing-mode-root.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/trailing-parent-padding-between-spanners.html b/tests/wpt/tests/css/css-multicol/crashtests/trailing-parent-padding-between-spanners.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/trailing-parent-padding-between-spanners.html rename to tests/wpt/tests/css/css-multicol/crashtests/trailing-parent-padding-between-spanners.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/crashtests/vertical-rl-column-rules-wide-columns.html b/tests/wpt/tests/css/css-multicol/crashtests/vertical-rl-column-rules-wide-columns.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/crashtests/vertical-rl-column-rules-wide-columns.html rename to tests/wpt/tests/css/css-multicol/crashtests/vertical-rl-column-rules-wide-columns.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/dynamic-become-multicol-add-oof-inside-inline-crash.html b/tests/wpt/tests/css/css-multicol/dynamic-become-multicol-add-oof-inside-inline-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/dynamic-become-multicol-add-oof-inside-inline-crash.html rename to tests/wpt/tests/css/css-multicol/dynamic-become-multicol-add-oof-inside-inline-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/equal-gap-and-rule.html b/tests/wpt/tests/css/css-multicol/equal-gap-and-rule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/equal-gap-and-rule.html rename to tests/wpt/tests/css/css-multicol/equal-gap-and-rule.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/extremely-tall-multicol-with-extremely-tall-child-crash.html b/tests/wpt/tests/css/css-multicol/extremely-tall-multicol-with-extremely-tall-child-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/extremely-tall-multicol-with-extremely-tall-child-crash.html rename to tests/wpt/tests/css/css-multicol/extremely-tall-multicol-with-extremely-tall-child-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/file-control-crash.html b/tests/wpt/tests/css/css-multicol/file-control-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/file-control-crash.html rename to tests/wpt/tests/css/css-multicol/file-control-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/filter-with-abspos.html b/tests/wpt/tests/css/css-multicol/filter-with-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/filter-with-abspos.html rename to tests/wpt/tests/css/css-multicol/filter-with-abspos.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/fixed-in-multicol-with-transform-container.html b/tests/wpt/tests/css/css-multicol/fixed-in-multicol-with-transform-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/fixed-in-multicol-with-transform-container.html rename to tests/wpt/tests/css/css-multicol/fixed-in-multicol-with-transform-container.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/fixed-in-nested-multicol-with-transform-container.html b/tests/wpt/tests/css/css-multicol/fixed-in-nested-multicol-with-transform-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/fixed-in-nested-multicol-with-transform-container.html rename to tests/wpt/tests/css/css-multicol/fixed-in-nested-multicol-with-transform-container.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/fixed-in-nested-multicol-with-viewport-container.html b/tests/wpt/tests/css/css-multicol/fixed-in-nested-multicol-with-viewport-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/fixed-in-nested-multicol-with-viewport-container.html rename to tests/wpt/tests/css/css-multicol/fixed-in-nested-multicol-with-viewport-container.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/fixed-in-nested-multicol.html b/tests/wpt/tests/css/css-multicol/fixed-in-nested-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/fixed-in-nested-multicol.html rename to tests/wpt/tests/css/css-multicol/fixed-in-nested-multicol.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/fixed-size-child-with-overflow.html b/tests/wpt/tests/css/css-multicol/fixed-size-child-with-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/fixed-size-child-with-overflow.html rename to tests/wpt/tests/css/css-multicol/fixed-size-child-with-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/fixedpos-static-pos-with-viewport-cb-001.html b/tests/wpt/tests/css/css-multicol/fixedpos-static-pos-with-viewport-cb-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/fixedpos-static-pos-with-viewport-cb-001.html rename to tests/wpt/tests/css/css-multicol/fixedpos-static-pos-with-viewport-cb-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/fixedpos-static-pos-with-viewport-cb-002.html b/tests/wpt/tests/css/css-multicol/fixedpos-static-pos-with-viewport-cb-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/fixedpos-static-pos-with-viewport-cb-002.html rename to tests/wpt/tests/css/css-multicol/fixedpos-static-pos-with-viewport-cb-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/fixedpos-static-pos-with-viewport-cb-003.html b/tests/wpt/tests/css/css-multicol/fixedpos-static-pos-with-viewport-cb-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/fixedpos-static-pos-with-viewport-cb-003.html rename to tests/wpt/tests/css/css-multicol/fixedpos-static-pos-with-viewport-cb-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/float-and-block.html b/tests/wpt/tests/css/css-multicol/float-and-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/float-and-block.html rename to tests/wpt/tests/css/css-multicol/float-and-block.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/float-with-line-after-spanner-ref.html b/tests/wpt/tests/css/css-multicol/float-with-line-after-spanner-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/float-with-line-after-spanner-ref.html rename to tests/wpt/tests/css/css-multicol/float-with-line-after-spanner-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/float-with-line-after-spanner.html b/tests/wpt/tests/css/css-multicol/float-with-line-after-spanner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/float-with-line-after-spanner.html rename to tests/wpt/tests/css/css-multicol/float-with-line-after-spanner.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/getclientrects-000.html b/tests/wpt/tests/css/css-multicol/getclientrects-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/getclientrects-000.html rename to tests/wpt/tests/css/css-multicol/getclientrects-000.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/getclientrects-001.html b/tests/wpt/tests/css/css-multicol/getclientrects-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/getclientrects-001.html rename to tests/wpt/tests/css/css-multicol/getclientrects-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/going-out-of-flow-after-spanner.html b/tests/wpt/tests/css/css-multicol/going-out-of-flow-after-spanner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/going-out-of-flow-after-spanner.html rename to tests/wpt/tests/css/css-multicol/going-out-of-flow-after-spanner.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/hit-test-child-under-perspective.html b/tests/wpt/tests/css/css-multicol/hit-test-child-under-perspective.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/hit-test-child-under-perspective.html rename to tests/wpt/tests/css/css-multicol/hit-test-child-under-perspective.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/hit-test-transformed-child.html b/tests/wpt/tests/css/css-multicol/hit-test-transformed-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/hit-test-transformed-child.html rename to tests/wpt/tests/css/css-multicol/hit-test-transformed-child.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/img-alt-as-multicol-crash.html b/tests/wpt/tests/css/css-multicol/img-alt-as-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/img-alt-as-multicol-crash.html rename to tests/wpt/tests/css/css-multicol/img-alt-as-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/increase-prev-sibling-height-ref.html b/tests/wpt/tests/css/css-multicol/increase-prev-sibling-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/increase-prev-sibling-height-ref.html rename to tests/wpt/tests/css/css-multicol/increase-prev-sibling-height-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/increase-prev-sibling-height.html b/tests/wpt/tests/css/css-multicol/increase-prev-sibling-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/increase-prev-sibling-height.html rename to tests/wpt/tests/css/css-multicol/increase-prev-sibling-height.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/inheritance.html b/tests/wpt/tests/css/css-multicol/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/inheritance.html rename to tests/wpt/tests/css/css-multicol/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/inline-block-and-column-span-all.html b/tests/wpt/tests/css/css-multicol/inline-block-and-column-span-all.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/inline-block-and-column-span-all.html rename to tests/wpt/tests/css/css-multicol/inline-block-and-column-span-all.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/intrinsic-size-001.html b/tests/wpt/tests/css/css-multicol/intrinsic-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/intrinsic-size-001.html rename to tests/wpt/tests/css/css-multicol/intrinsic-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/intrinsic-size-002.html b/tests/wpt/tests/css/css-multicol/intrinsic-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/intrinsic-size-002.html rename to tests/wpt/tests/css/css-multicol/intrinsic-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/intrinsic-size-003.html b/tests/wpt/tests/css/css-multicol/intrinsic-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/intrinsic-size-003.html rename to tests/wpt/tests/css/css-multicol/intrinsic-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/intrinsic-size-004.html b/tests/wpt/tests/css/css-multicol/intrinsic-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/intrinsic-size-004.html rename to tests/wpt/tests/css/css-multicol/intrinsic-size-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/intrinsic-size-005.html b/tests/wpt/tests/css/css-multicol/intrinsic-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/intrinsic-size-005.html rename to tests/wpt/tests/css/css-multicol/intrinsic-size-005.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/intrinsic-width-change-column-count.html b/tests/wpt/tests/css/css-multicol/intrinsic-width-change-column-count.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/intrinsic-width-change-column-count.html rename to tests/wpt/tests/css/css-multicol/intrinsic-width-change-column-count.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/large-actual-column-count.html b/tests/wpt/tests/css/css-multicol/large-actual-column-count.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/large-actual-column-count.html rename to tests/wpt/tests/css/css-multicol/large-actual-column-count.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html b/tests/wpt/tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html rename to tests/wpt/tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1.html b/tests/wpt/tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1.html rename to tests/wpt/tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-001.html b/tests/wpt/tests/css/css-multicol/multicol-basic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-001.html rename to tests/wpt/tests/css/css-multicol/multicol-basic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-002.html b/tests/wpt/tests/css/css-multicol/multicol-basic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-002.html rename to tests/wpt/tests/css/css-multicol/multicol-basic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-003.html b/tests/wpt/tests/css/css-multicol/multicol-basic-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-003.html rename to tests/wpt/tests/css/css-multicol/multicol-basic-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-004.html b/tests/wpt/tests/css/css-multicol/multicol-basic-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-004.html rename to tests/wpt/tests/css/css-multicol/multicol-basic-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-005.xht b/tests/wpt/tests/css/css-multicol/multicol-basic-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-005.xht rename to tests/wpt/tests/css/css-multicol/multicol-basic-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-006.xht b/tests/wpt/tests/css/css-multicol/multicol-basic-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-006.xht rename to tests/wpt/tests/css/css-multicol/multicol-basic-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-007.xht b/tests/wpt/tests/css/css-multicol/multicol-basic-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-007.xht rename to tests/wpt/tests/css/css-multicol/multicol-basic-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-008.xht b/tests/wpt/tests/css/css-multicol/multicol-basic-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-basic-008.xht rename to tests/wpt/tests/css/css-multicol/multicol-basic-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-block-no-clip-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-block-no-clip-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-block-no-clip-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-block-no-clip-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-block-no-clip-001.xht b/tests/wpt/tests/css/css-multicol/multicol-block-no-clip-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-block-no-clip-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-block-no-clip-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-block-no-clip-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-block-no-clip-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-block-no-clip-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-block-no-clip-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-block-no-clip-002.xht b/tests/wpt/tests/css/css-multicol/multicol-block-no-clip-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-block-no-clip-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-block-no-clip-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-br-inside-avoidcolumn-001.xht b/tests/wpt/tests/css/css-multicol/multicol-br-inside-avoidcolumn-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-br-inside-avoidcolumn-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-br-inside-avoidcolumn-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-break-000-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-break-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-break-000-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-break-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-break-000.xht b/tests/wpt/tests/css/css-multicol/multicol-break-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-break-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-break-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-break-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-break-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-break-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-break-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-break-001.xht b/tests/wpt/tests/css/css-multicol/multicol-break-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-break-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-break-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-000-ref.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-000-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-000.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-000.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-000.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-001-ref.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-001-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-001.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-001.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-002-ref.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-002-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-002.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-002.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-003-ref.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-003-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-003.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-003.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-004-ref.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-004-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-004.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-004.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-005-ref.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-005-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-005.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-005.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-005.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-006-ref.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-006-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-006.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-006.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-006.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-000-ref.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-000-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-000.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-000.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-000.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-001-ref.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-001-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-001.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-001.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-002-ref.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-002-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-002.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-002.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-003-ref.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-003-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-003.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-003.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-004-ref.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-004-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-004.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-004.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-005-ref.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-005-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-005.html b/tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-breaking-nobackground-005.html rename to tests/wpt/tests/css/css-multicol/multicol-breaking-nobackground-005.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-clip-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-clip-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-clip-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-clip-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-clip-001.xht b/tests/wpt/tests/css/css-multicol/multicol-clip-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-clip-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-clip-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-clip-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-clip-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-clip-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-clip-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-clip-002.xht b/tests/wpt/tests/css/css-multicol/multicol-clip-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-clip-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-clip-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-clip-scrolled-content-001.html b/tests/wpt/tests/css/css-multicol/multicol-clip-scrolled-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-clip-scrolled-content-001.html rename to tests/wpt/tests/css/css-multicol/multicol-clip-scrolled-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-collapsing-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-collapsing-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-collapsing-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-collapsing-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-collapsing-001.xht b/tests/wpt/tests/css/css-multicol/multicol-collapsing-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-collapsing-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-collapsing-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-columns-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-columns-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-001.xht b/tests/wpt/tests/css/css-multicol/multicol-columns-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-columns-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-002.xht b/tests/wpt/tests/css/css-multicol/multicol-columns-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-columns-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-003.xht b/tests/wpt/tests/css/css-multicol/multicol-columns-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-003.xht rename to tests/wpt/tests/css/css-multicol/multicol-columns-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-004.xht b/tests/wpt/tests/css/css-multicol/multicol-columns-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-004.xht rename to tests/wpt/tests/css/css-multicol/multicol-columns-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-005.xht b/tests/wpt/tests/css/css-multicol/multicol-columns-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-005.xht rename to tests/wpt/tests/css/css-multicol/multicol-columns-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-006.xht b/tests/wpt/tests/css/css-multicol/multicol-columns-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-006.xht rename to tests/wpt/tests/css/css-multicol/multicol-columns-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-007.xht b/tests/wpt/tests/css/css-multicol/multicol-columns-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-007.xht rename to tests/wpt/tests/css/css-multicol/multicol-columns-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-invalid-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-columns-invalid-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-invalid-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-columns-invalid-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-invalid-001.xht b/tests/wpt/tests/css/css-multicol/multicol-columns-invalid-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-invalid-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-columns-invalid-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-invalid-002.xht b/tests/wpt/tests/css/css-multicol/multicol-columns-invalid-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-invalid-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-columns-invalid-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-toolong-001.xht b/tests/wpt/tests/css/css-multicol/multicol-columns-toolong-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-columns-toolong-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-columns-toolong-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-contained-absolute-ref.html b/tests/wpt/tests/css/css-multicol/multicol-contained-absolute-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-contained-absolute-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-contained-absolute-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-contained-absolute.html b/tests/wpt/tests/css/css-multicol/multicol-contained-absolute.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-contained-absolute.html rename to tests/wpt/tests/css/css-multicol/multicol-contained-absolute.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-containing-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-containing-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-containing-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-containing-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-containing-001.xht b/tests/wpt/tests/css/css-multicol/multicol-containing-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-containing-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-containing-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-containing-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-containing-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-containing-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-containing-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-containing-002.xht b/tests/wpt/tests/css/css-multicol/multicol-containing-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-containing-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-containing-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-containing-003.html b/tests/wpt/tests/css/css-multicol/multicol-containing-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-containing-003.html rename to tests/wpt/tests/css/css-multicol/multicol-containing-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-count-001.xht b/tests/wpt/tests/css/css-multicol/multicol-count-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-count-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-count-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-count-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-count-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-count-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-count-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-count-002.xht b/tests/wpt/tests/css/css-multicol/multicol-count-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-count-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-count-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-count-computed-003-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-count-computed-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-count-computed-003-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-count-computed-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-count-computed-003.xht b/tests/wpt/tests/css/css-multicol/multicol-count-computed-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-count-computed-003.xht rename to tests/wpt/tests/css/css-multicol/multicol-count-computed-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-count-computed-004-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-count-computed-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-count-computed-004-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-count-computed-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-count-computed-004.xht b/tests/wpt/tests/css/css-multicol/multicol-count-computed-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-count-computed-004.xht rename to tests/wpt/tests/css/css-multicol/multicol-count-computed-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-count-computed-005.xht b/tests/wpt/tests/css/css-multicol/multicol-count-computed-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-count-computed-005.xht rename to tests/wpt/tests/css/css-multicol/multicol-count-computed-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-count-negative-001.xht b/tests/wpt/tests/css/css-multicol/multicol-count-negative-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-count-negative-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-count-negative-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-count-negative-002.xht b/tests/wpt/tests/css/css-multicol/multicol-count-negative-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-count-negative-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-count-negative-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-count-non-integer-001.xht b/tests/wpt/tests/css/css-multicol/multicol-count-non-integer-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-count-non-integer-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-count-non-integer-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-count-non-integer-002.xht b/tests/wpt/tests/css/css-multicol/multicol-count-non-integer-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-count-non-integer-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-count-non-integer-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-count-non-integer-003.xht b/tests/wpt/tests/css/css-multicol/multicol-count-non-integer-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-count-non-integer-003.xht rename to tests/wpt/tests/css/css-multicol/multicol-count-non-integer-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-dynamic-add-001-ref.html b/tests/wpt/tests/css/css-multicol/multicol-dynamic-add-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-dynamic-add-001-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-dynamic-add-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-dynamic-add-001.html b/tests/wpt/tests/css/css-multicol/multicol-dynamic-add-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-dynamic-add-001.html rename to tests/wpt/tests/css/css-multicol/multicol-dynamic-add-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-dynamic-change-inside-break-inside-avoid-001-ref.html b/tests/wpt/tests/css/css-multicol/multicol-dynamic-change-inside-break-inside-avoid-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-dynamic-change-inside-break-inside-avoid-001-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-dynamic-change-inside-break-inside-avoid-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-dynamic-change-inside-break-inside-avoid-001.html b/tests/wpt/tests/css/css-multicol/multicol-dynamic-change-inside-break-inside-avoid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-dynamic-change-inside-break-inside-avoid-001.html rename to tests/wpt/tests/css/css-multicol/multicol-dynamic-change-inside-break-inside-avoid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-000-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-000-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-000.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-001.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-auto-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-auto-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-001.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-auto-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-auto-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-auto-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-auto-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-002.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-auto-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-auto-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-003-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-auto-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-003-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-auto-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-003.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-auto-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-003.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-auto-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-004.html b/tests/wpt/tests/css/css-multicol/multicol-fill-auto-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-004.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-auto-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-001.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-auto-block-children-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-auto-block-children-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-auto-block-children-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-auto-block-children-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-002.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-auto-block-children-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-auto-block-children-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-003-ref.html b/tests/wpt/tests/css/css-multicol/multicol-fill-auto-block-children-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-003-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-auto-block-children-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-003.html b/tests/wpt/tests/css/css-multicol/multicol-fill-auto-block-children-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-003.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-auto-block-children-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-auto-block-children-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-auto-block-children-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-001.xht b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-002.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-002.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-003.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-003.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-004.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-004.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-005.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-005.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-005.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-006.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-006.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-006.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-007.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-007.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-007.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-008.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-008.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-008.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-009.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-009.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-009.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-010.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-010.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-010.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-011.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-011.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-011.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-012.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-012.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-012.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-013.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-013.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-013.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-014.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-014.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-014.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-015.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-015.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-015.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-016.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-016.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-016.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-018.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-018.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-018.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-019.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-019.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-019.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-020.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-020.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-020.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-021.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-021.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-021.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-022.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-022.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-022.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-023.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-023.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-023.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-024.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-024.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-024.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-025.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-025.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-025.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-026.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-026.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-026.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-nested-000.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-nested-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-nested-000.html rename to tests/wpt/tests/css/css-multicol/multicol-fill-balance-nested-000.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-000-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-gap-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-000-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-gap-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-000.xht b/tests/wpt/tests/css/css-multicol/multicol-gap-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-gap-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-gap-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-gap-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-001.xht b/tests/wpt/tests/css/css-multicol/multicol-gap-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-gap-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-gap-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-gap-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-002.xht b/tests/wpt/tests/css/css-multicol/multicol-gap-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-gap-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-003.xht b/tests/wpt/tests/css/css-multicol/multicol-gap-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-003.xht rename to tests/wpt/tests/css/css-multicol/multicol-gap-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-animation-001.html b/tests/wpt/tests/css/css-multicol/multicol-gap-animation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-animation-001.html rename to tests/wpt/tests/css/css-multicol/multicol-gap-animation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-animation-002.html b/tests/wpt/tests/css/css-multicol/multicol-gap-animation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-animation-002.html rename to tests/wpt/tests/css/css-multicol/multicol-gap-animation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-animation-003.html b/tests/wpt/tests/css/css-multicol/multicol-gap-animation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-animation-003.html rename to tests/wpt/tests/css/css-multicol/multicol-gap-animation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-fraction-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-gap-fraction-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-fraction-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-gap-fraction-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-fraction-001.xht b/tests/wpt/tests/css/css-multicol/multicol-gap-fraction-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-fraction-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-gap-fraction-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-fraction-002.html b/tests/wpt/tests/css/css-multicol/multicol-gap-fraction-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-fraction-002.html rename to tests/wpt/tests/css/css-multicol/multicol-gap-fraction-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-large-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-gap-large-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-large-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-gap-large-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-large-001.xht b/tests/wpt/tests/css/css-multicol/multicol-gap-large-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-large-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-gap-large-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-large-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-gap-large-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-large-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-gap-large-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-large-002.xht b/tests/wpt/tests/css/css-multicol/multicol-gap-large-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-large-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-gap-large-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-negative-001.xht b/tests/wpt/tests/css/css-multicol/multicol-gap-negative-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-negative-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-gap-negative-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-percentage-001.html b/tests/wpt/tests/css/css-multicol/multicol-gap-percentage-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-gap-percentage-001.html rename to tests/wpt/tests/css/css-multicol/multicol-gap-percentage-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-height-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-height-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-height-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-height-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-height-001.xht b/tests/wpt/tests/css/css-multicol/multicol-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-height-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-height-002-print-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-height-002-print-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-height-002-print-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-height-002-print-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-height-002-print.xht b/tests/wpt/tests/css/css-multicol/multicol-height-002-print.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-height-002-print.xht rename to tests/wpt/tests/css/css-multicol/multicol-height-002-print.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-height-block-child-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-height-block-child-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-height-block-child-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-height-block-child-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-height-block-child-001.xht b/tests/wpt/tests/css/css-multicol/multicol-height-block-child-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-height-block-child-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-height-block-child-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-inherit-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-inherit-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-inherit-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-inherit-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-inherit-001.xht b/tests/wpt/tests/css/css-multicol/multicol-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-inherit-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-inherit-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-inherit-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-inherit-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-inherit-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-inherit-002.xht b/tests/wpt/tests/css/css-multicol/multicol-inherit-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-inherit-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-inherit-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-inherit-003.xht b/tests/wpt/tests/css/css-multicol/multicol-inherit-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-inherit-003.xht rename to tests/wpt/tests/css/css-multicol/multicol-inherit-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-inherit-3-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-inherit-3-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-inherit-3-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-inherit-3-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-list-item-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-list-item-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-001.xht b/tests/wpt/tests/css/css-multicol/multicol-list-item-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-list-item-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-002-ref.html b/tests/wpt/tests/css/css-multicol/multicol-list-item-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-002-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-list-item-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-002.html b/tests/wpt/tests/css/css-multicol/multicol-list-item-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-002.html rename to tests/wpt/tests/css/css-multicol/multicol-list-item-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-003-ref.html b/tests/wpt/tests/css/css-multicol/multicol-list-item-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-003-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-list-item-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-003.html b/tests/wpt/tests/css/css-multicol/multicol-list-item-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-003.html rename to tests/wpt/tests/css/css-multicol/multicol-list-item-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-004-ref.html b/tests/wpt/tests/css/css-multicol/multicol-list-item-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-004-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-list-item-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-004.html b/tests/wpt/tests/css/css-multicol/multicol-list-item-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-004.html rename to tests/wpt/tests/css/css-multicol/multicol-list-item-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-005-ref.html b/tests/wpt/tests/css/css-multicol/multicol-list-item-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-005-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-list-item-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-005.html b/tests/wpt/tests/css/css-multicol/multicol-list-item-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-005.html rename to tests/wpt/tests/css/css-multicol/multicol-list-item-005.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-006-ref.html b/tests/wpt/tests/css/css-multicol/multicol-list-item-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-006-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-list-item-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-006.html b/tests/wpt/tests/css/css-multicol/multicol-list-item-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-006.html rename to tests/wpt/tests/css/css-multicol/multicol-list-item-006.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-007-ref.html b/tests/wpt/tests/css/css-multicol/multicol-list-item-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-007-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-list-item-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-007.html b/tests/wpt/tests/css/css-multicol/multicol-list-item-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-007.html rename to tests/wpt/tests/css/css-multicol/multicol-list-item-007.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-008-ref.html b/tests/wpt/tests/css/css-multicol/multicol-list-item-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-008-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-list-item-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-008.html b/tests/wpt/tests/css/css-multicol/multicol-list-item-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-list-item-008.html rename to tests/wpt/tests/css/css-multicol/multicol-list-item-008.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-margin-001.xht b/tests/wpt/tests/css/css-multicol/multicol-margin-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-margin-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-margin-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-margin-002.xht b/tests/wpt/tests/css/css-multicol/multicol-margin-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-margin-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-margin-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-margin-003.html b/tests/wpt/tests/css/css-multicol/multicol-margin-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-margin-003.html rename to tests/wpt/tests/css/css-multicol/multicol-margin-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-margin-child-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-margin-child-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-margin-child-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-margin-child-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-margin-child-001.xht b/tests/wpt/tests/css/css-multicol/multicol-margin-child-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-margin-child-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-margin-child-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-002.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-005-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-005-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-005.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-005.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-006.html b/tests/wpt/tests/css/css-multicol/multicol-nested-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-006.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-006.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-007.html b/tests/wpt/tests/css/css-multicol/multicol-nested-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-007.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-007.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-008.html b/tests/wpt/tests/css/css-multicol/multicol-nested-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-008.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-008.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-009.html b/tests/wpt/tests/css/css-multicol/multicol-nested-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-009.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-009.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-010.html b/tests/wpt/tests/css/css-multicol/multicol-nested-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-010.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-010.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-011.html b/tests/wpt/tests/css/css-multicol/multicol-nested-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-011.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-011.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-012.html b/tests/wpt/tests/css/css-multicol/multicol-nested-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-012.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-012.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-013.html b/tests/wpt/tests/css/css-multicol/multicol-nested-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-013.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-013.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-014.html b/tests/wpt/tests/css/css-multicol/multicol-nested-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-014.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-014.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-015.html b/tests/wpt/tests/css/css-multicol/multicol-nested-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-015.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-015.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-016.html b/tests/wpt/tests/css/css-multicol/multicol-nested-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-016.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-016.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-017.html b/tests/wpt/tests/css/css-multicol/multicol-nested-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-017.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-017.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-018.html b/tests/wpt/tests/css/css-multicol/multicol-nested-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-018.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-018.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-019.html b/tests/wpt/tests/css/css-multicol/multicol-nested-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-019.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-019.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-020.html b/tests/wpt/tests/css/css-multicol/multicol-nested-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-020.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-020.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-021.html b/tests/wpt/tests/css/css-multicol/multicol-nested-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-021.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-021.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-022.html b/tests/wpt/tests/css/css-multicol/multicol-nested-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-022.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-022.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-023.html b/tests/wpt/tests/css/css-multicol/multicol-nested-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-023.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-023.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-024.html b/tests/wpt/tests/css/css-multicol/multicol-nested-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-024.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-024.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-025.html b/tests/wpt/tests/css/css-multicol/multicol-nested-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-025.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-025.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-026.html b/tests/wpt/tests/css/css-multicol/multicol-nested-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-026.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-026.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-027.html b/tests/wpt/tests/css/css-multicol/multicol-nested-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-027.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-027.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-028.html b/tests/wpt/tests/css/css-multicol/multicol-nested-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-028.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-028.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-029-ref.html b/tests/wpt/tests/css/css-multicol/multicol-nested-029-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-029-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-029-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-029.html b/tests/wpt/tests/css/css-multicol/multicol-nested-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-029.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-029.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-030.html b/tests/wpt/tests/css/css-multicol/multicol-nested-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-030.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-030.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-031.html b/tests/wpt/tests/css/css-multicol/multicol-nested-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-031.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-031.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-column-rule-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-column-rule-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-column-rule-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-column-rule-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-column-rule-001.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-column-rule-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-column-rule-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-column-rule-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-column-rule-002.html b/tests/wpt/tests/css/css-multicol/multicol-nested-column-rule-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-column-rule-002.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-column-rule-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-column-rule-003.html b/tests/wpt/tests/css/css-multicol/multicol-nested-column-rule-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-column-rule-003.html rename to tests/wpt/tests/css/css-multicol/multicol-nested-column-rule-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-margin-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-margin-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-001.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-margin-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-margin-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-margin-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-margin-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-002.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-margin-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-margin-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-003-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-margin-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-003-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-margin-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-003.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-margin-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-003.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-margin-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-004-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-margin-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-004-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-margin-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-004.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-margin-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-004.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-margin-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-005.xht b/tests/wpt/tests/css/css-multicol/multicol-nested-margin-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-margin-005.xht rename to tests/wpt/tests/css/css-multicol/multicol-nested-margin-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-oof-inline-cb-001-ref.html b/tests/wpt/tests/css/css-multicol/multicol-oof-inline-cb-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-oof-inline-cb-001-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-oof-inline-cb-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-oof-inline-cb-001.html b/tests/wpt/tests/css/css-multicol/multicol-oof-inline-cb-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-oof-inline-cb-001.html rename to tests/wpt/tests/css/css-multicol/multicol-oof-inline-cb-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-oof-inline-cb-002.html b/tests/wpt/tests/css/css-multicol/multicol-oof-inline-cb-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-oof-inline-cb-002.html rename to tests/wpt/tests/css/css-multicol/multicol-oof-inline-cb-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-000-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-overflow-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-000-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-overflow-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-000.xht b/tests/wpt/tests/css/css-multicol/multicol-overflow-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-overflow-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-clip-auto-sized-ref.html b/tests/wpt/tests/css/css-multicol/multicol-overflow-clip-auto-sized-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-clip-auto-sized-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-overflow-clip-auto-sized-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-clip-auto-sized.html b/tests/wpt/tests/css/css-multicol/multicol-overflow-clip-auto-sized.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-clip-auto-sized.html rename to tests/wpt/tests/css/css-multicol/multicol-overflow-clip-auto-sized.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-clip-positioned-ref.html b/tests/wpt/tests/css/css-multicol/multicol-overflow-clip-positioned-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-clip-positioned-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-overflow-clip-positioned-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-clip-positioned.html b/tests/wpt/tests/css/css-multicol/multicol-overflow-clip-positioned.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-clip-positioned.html rename to tests/wpt/tests/css/css-multicol/multicol-overflow-clip-positioned.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-clip-ref.html b/tests/wpt/tests/css/css-multicol/multicol-overflow-clip-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-clip-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-overflow-clip-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-clip.html b/tests/wpt/tests/css/css-multicol/multicol-overflow-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-clip.html rename to tests/wpt/tests/css/css-multicol/multicol-overflow-clip.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-positioned-transform-001.html b/tests/wpt/tests/css/css-multicol/multicol-overflow-positioned-transform-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-positioned-transform-001.html rename to tests/wpt/tests/css/css-multicol/multicol-overflow-positioned-transform-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-transform-001.html b/tests/wpt/tests/css/css-multicol/multicol-overflow-transform-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-overflow-transform-001.html rename to tests/wpt/tests/css/css-multicol/multicol-overflow-transform-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-overflowing-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-overflowing-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-overflowing-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-overflowing-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-overflowing-001.xht b/tests/wpt/tests/css/css-multicol/multicol-overflowing-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-overflowing-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-overflowing-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-red.png b/tests/wpt/tests/css/css-multicol/multicol-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-red.png rename to tests/wpt/tests/css/css-multicol/multicol-red.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-reduce-000-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-reduce-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-reduce-000-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-reduce-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-reduce-000.xht b/tests/wpt/tests/css/css-multicol/multicol-reduce-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-reduce-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-reduce-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-000-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-000-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-000.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-001.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-002.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-003-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-003-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-003.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-003.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-004-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-004-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-004.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-004.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-color-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-color-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-color-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-color-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-color-001.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-color-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-color-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-color-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-color-inherit-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-color-inherit-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-color-inherit-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-color-inherit-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-color-inherit-001.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-color-inherit-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-color-inherit-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-color-inherit-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-color-inherit-002.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-color-inherit-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-color-inherit-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-color-inherit-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-dashed-000-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-dashed-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-dashed-000-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-dashed-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-dashed-000.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-dashed-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-dashed-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-dashed-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-dotted-000-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-dotted-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-dotted-000-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-dotted-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-dotted-000.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-dotted-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-dotted-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-dotted-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-double-000-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-double-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-double-000-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-double-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-double-000.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-double-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-double-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-double-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-fraction-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-fraction-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-fraction-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-fraction-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-fraction-001.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-fraction-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-fraction-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-fraction-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-fraction-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-fraction-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-fraction-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-fraction-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-fraction-002.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-fraction-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-fraction-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-fraction-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-fraction-003.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-fraction-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-fraction-003.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-fraction-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-fraction-3-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-fraction-3-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-fraction-3-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-fraction-3-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-groove-000-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-groove-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-groove-000-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-groove-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-groove-000.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-groove-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-groove-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-groove-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-hidden-000-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-hidden-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-hidden-000-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-hidden-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-hidden-000.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-hidden-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-hidden-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-hidden-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-inset-000.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-inset-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-inset-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-inset-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-large-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-large-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-large-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-large-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-large-001.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-large-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-large-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-large-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-large-002.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-large-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-large-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-large-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-001-ref.html b/tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-001-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-001.html b/tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-001.html rename to tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-002-ref.html b/tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-002-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-002.html b/tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-002.html rename to tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-003-ref.html b/tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-003-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-003.html b/tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-003.html rename to tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-004-ref.html b/tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-004-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-004.html b/tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-nested-balancing-004.html rename to tests/wpt/tests/css/css-multicol/multicol-rule-nested-balancing-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-none-000.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-none-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-none-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-none-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-outset-000.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-outset-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-outset-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-outset-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-percent-001.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-percent-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-percent-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-percent-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-px-001.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-px-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-px-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-px-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-ridge-000-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-ridge-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-ridge-000-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-ridge-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-ridge-000.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-ridge-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-ridge-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-ridge-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-samelength-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-samelength-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-samelength-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-samelength-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-samelength-001.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-samelength-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-samelength-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-samelength-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-shorthand-001.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-shorthand-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-shorthand-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-shorthand-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-shorthand-2-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-shorthand-2-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-shorthand-2.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-shorthand-2.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-solid-000-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-solid-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-solid-000-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-solid-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-solid-000.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-solid-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-solid-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-solid-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-stacking-001.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-stacking-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-stacking-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-stacking-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-stacking-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-rule-stacking-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-rule-stacking-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-rule-stacking-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-scroll-content-ref.html b/tests/wpt/tests/css/css-multicol/multicol-scroll-content-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-scroll-content-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-scroll-content-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-scroll-content.html b/tests/wpt/tests/css/css-multicol/multicol-scroll-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-scroll-content.html rename to tests/wpt/tests/css/css-multicol/multicol-scroll-content.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-shorthand-001.xht b/tests/wpt/tests/css/css-multicol/multicol-shorthand-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-shorthand-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-shorthand-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-000-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-span-000-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-000-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-000-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-000.xht b/tests/wpt/tests/css/css-multicol/multicol-span-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-000.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-001.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-002.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-003.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-003.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-004-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-004-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-004.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-004.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-005-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-005-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-005.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-005.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-005.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-006-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-006-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-006.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-006.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-006.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-007-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-007-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-007.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-007.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-007.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-008-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-008-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-008.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-008.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-008.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-009-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-009-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-009.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-009.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-009.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-010-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-010-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-010.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-010.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-010.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-011-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-011-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-011.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-011.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-011.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-012.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-012.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-012.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-013.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-013.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-013.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-014.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-014.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-014.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-015.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-015.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-015.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-016.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-016.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-016.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-017.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-017.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-017.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-018.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-018.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-018.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-019.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-019.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-019.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-block-sibling-003.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-block-sibling-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-block-sibling-003.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-block-sibling-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-block-sibling-3-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-block-sibling-3-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-block-sibling-3-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-block-sibling-3-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-001-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-button-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-001-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-button-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-001.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-button-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-001.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-button-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-002-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-button-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-002-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-button-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-002.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-button-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-002.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-button-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-003-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-button-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-003-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-button-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-003.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-button-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-003.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-button-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-001-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-001-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-001.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-001.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-002-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-002-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-002.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-002.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-003-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-003-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-003.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-003.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-004a-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-004a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-004a-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-004a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-004a.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-004a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-004a.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-004a.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-004b-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-004b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-004b-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-004b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-004b.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-004b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-004b.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-004b.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-005-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-005-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-005.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-005.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-005.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-006-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-006-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-006.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-006.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-006.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-007-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-007-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-007.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-007.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-007.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-008-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-008-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-008.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-008.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-008.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-009.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-009.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-009.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-010.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-010.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-010.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-011.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-011.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-011.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-012.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-012.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-012.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-013.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-013.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-children-height-013.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-001-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-001-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-001.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-001.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-002-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-002-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-002.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-002.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-003-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-003-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-003.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-003.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-004-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-004-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-004.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-004.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-005.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-005.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-005.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-006.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-006.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-006.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-007-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-007-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-007.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-007.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-007.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-008-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-008-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-008.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-008.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-008.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-009.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-009.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-009.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-010-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-010-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-010.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-010.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-010.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-011.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-011.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-011.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-012-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-012-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-012.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-012.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-012.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-013-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-013-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-013.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-add-013.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-add-013.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-001-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-001-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-001.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-001.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-002-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-002-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-002.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-002.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-003.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-003.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-004-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-004-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-004.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-004.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-005-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-005-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-005.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-005.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-005.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-006.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-006.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-006.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-007.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-dynamic-remove-007.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-dynamic-remove-007.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-fieldset-001-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-fieldset-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-fieldset-001-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-fieldset-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-fieldset-001.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-fieldset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-fieldset-001.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-fieldset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-fieldset-002-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-fieldset-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-fieldset-002-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-fieldset-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-fieldset-002.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-fieldset-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-fieldset-002.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-fieldset-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-fieldset-003-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-fieldset-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-fieldset-003-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-fieldset-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-fieldset-003.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-fieldset-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-fieldset-003.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-fieldset-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-list-item-001-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-list-item-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-list-item-001-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-list-item-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-list-item-001.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-list-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-list-item-001.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-list-item-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-list-item-002-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-list-item-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-list-item-002-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-list-item-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-list-item-002.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-list-item-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-list-item-002.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-list-item-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-margin-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-margin-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-001.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-margin-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-margin-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-margin-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-margin-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-002.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-margin-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-margin-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-003.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-margin-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-003.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-margin-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-bottom-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-margin-bottom-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-bottom-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-margin-bottom-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-bottom-001.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-margin-bottom-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-bottom-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-margin-bottom-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-margin-nested-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-margin-nested-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-001.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-margin-nested-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-margin-nested-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-002.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-margin-nested-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-margin-nested-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-firstchild-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-span-all-margin-nested-firstchild-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-firstchild-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-all-margin-nested-firstchild-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-001-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-001-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-001.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-001.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-002-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-002-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-002.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-002.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-003-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-003-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-003.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-003.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-004-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-004-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-004.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-restyle-004.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-restyle-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-rule-001-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-rule-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-rule-001-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-rule-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-rule-001.html b/tests/wpt/tests/css/css-multicol/multicol-span-all-rule-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-rule-001.html rename to tests/wpt/tests/css/css-multicol/multicol-span-all-rule-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-float-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-span-float-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-float-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-float-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-float-001.xht b/tests/wpt/tests/css/css-multicol/multicol-span-float-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-float-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-float-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-float-002-ref.html b/tests/wpt/tests/css/css-multicol/multicol-span-float-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-float-002-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-span-float-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-float-002.html b/tests/wpt/tests/css/css-multicol/multicol-span-float-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-float-002.html rename to tests/wpt/tests/css/css-multicol/multicol-span-float-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-float-003.html b/tests/wpt/tests/css/css-multicol/multicol-span-float-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-float-003.html rename to tests/wpt/tests/css/css-multicol/multicol-span-float-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-none-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-span-none-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-none-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-none-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-none-001.xht b/tests/wpt/tests/css/css-multicol/multicol-span-none-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-span-none-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-span-none-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-under-vertical-rl-scroll-ref.html b/tests/wpt/tests/css/css-multicol/multicol-under-vertical-rl-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-under-vertical-rl-scroll-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-under-vertical-rl-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-under-vertical-rl-scroll.html b/tests/wpt/tests/css/css-multicol/multicol-under-vertical-rl-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-under-vertical-rl-scroll.html rename to tests/wpt/tests/css/css-multicol/multicol-under-vertical-rl-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-width-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-001.xht b/tests/wpt/tests/css/css-multicol/multicol-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-002-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-width-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-002-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-002.xht b/tests/wpt/tests/css/css-multicol/multicol-width-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-003.xht b/tests/wpt/tests/css/css-multicol/multicol-width-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-003.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-004-ref.html b/tests/wpt/tests/css/css-multicol/multicol-width-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-004-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-width-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-004.html b/tests/wpt/tests/css/css-multicol/multicol-width-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-004.html rename to tests/wpt/tests/css/css-multicol/multicol-width-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-005-ref.html b/tests/wpt/tests/css/css-multicol/multicol-width-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-005-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-width-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-005.html b/tests/wpt/tests/css/css-multicol/multicol-width-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-005.html rename to tests/wpt/tests/css/css-multicol/multicol-width-005.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-ch-001.xht b/tests/wpt/tests/css/css-multicol/multicol-width-ch-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-ch-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-ch-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-ch-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-width-ch-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-ch-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-ch-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-count-001.xht b/tests/wpt/tests/css/css-multicol/multicol-width-count-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-count-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-count-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-count-002.xht b/tests/wpt/tests/css/css-multicol/multicol-width-count-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-count-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-count-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-invalid-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-width-invalid-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-invalid-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-invalid-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-invalid-001.xht b/tests/wpt/tests/css/css-multicol/multicol-width-invalid-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-invalid-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-invalid-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-large-001.xht b/tests/wpt/tests/css/css-multicol/multicol-width-large-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-large-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-large-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-large-002.xht b/tests/wpt/tests/css/css-multicol/multicol-width-large-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-large-002.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-large-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-negative-001.xht b/tests/wpt/tests/css/css-multicol/multicol-width-negative-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-negative-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-negative-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-small-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-width-small-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-small-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-small-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-width-small-001.xht b/tests/wpt/tests/css/css-multicol/multicol-width-small-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-width-small-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-width-small-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-zero-height-001-ref.xht b/tests/wpt/tests/css/css-multicol/multicol-zero-height-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-zero-height-001-ref.xht rename to tests/wpt/tests/css/css-multicol/multicol-zero-height-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-zero-height-001.xht b/tests/wpt/tests/css/css-multicol/multicol-zero-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-zero-height-001.xht rename to tests/wpt/tests/css/css-multicol/multicol-zero-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-zero-height-002-ref.html b/tests/wpt/tests/css/css-multicol/multicol-zero-height-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-zero-height-002-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-zero-height-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-zero-height-002.html b/tests/wpt/tests/css/css-multicol/multicol-zero-height-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-zero-height-002.html rename to tests/wpt/tests/css/css-multicol/multicol-zero-height-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-zero-height-003-ref.html b/tests/wpt/tests/css/css-multicol/multicol-zero-height-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-zero-height-003-ref.html rename to tests/wpt/tests/css/css-multicol/multicol-zero-height-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-zero-height-003.html b/tests/wpt/tests/css/css-multicol/multicol-zero-height-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/multicol-zero-height-003.html rename to tests/wpt/tests/css/css-multicol/multicol-zero-height-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/named-page.html b/tests/wpt/tests/css/css-multicol/named-page.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/named-page.html rename to tests/wpt/tests/css/css-multicol/named-page.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-after-float-clearance.html b/tests/wpt/tests/css/css-multicol/nested-after-float-clearance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-after-float-clearance.html rename to tests/wpt/tests/css/css-multicol/nested-after-float-clearance.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-fieldset.html b/tests/wpt/tests/css/css-multicol/nested-at-outer-boundary-as-fieldset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-fieldset.html rename to tests/wpt/tests/css/css-multicol/nested-at-outer-boundary-as-fieldset.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-float.html b/tests/wpt/tests/css/css-multicol/nested-at-outer-boundary-as-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-float.html rename to tests/wpt/tests/css/css-multicol/nested-at-outer-boundary-as-float.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-legend.html b/tests/wpt/tests/css/css-multicol/nested-at-outer-boundary-as-legend.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-at-outer-boundary-as-legend.html rename to tests/wpt/tests/css/css-multicol/nested-at-outer-boundary-as-legend.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-balanced-monolithic-multicol-crash.html b/tests/wpt/tests/css/css-multicol/nested-balanced-monolithic-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-balanced-monolithic-multicol-crash.html rename to tests/wpt/tests/css/css-multicol/nested-balanced-monolithic-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-balanced-very-tall-content-crash.html b/tests/wpt/tests/css/css-multicol/nested-balanced-very-tall-content-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-balanced-very-tall-content-crash.html rename to tests/wpt/tests/css/css-multicol/nested-balanced-very-tall-content-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-floated-multicol-with-monolithic-child.html b/tests/wpt/tests/css/css-multicol/nested-floated-multicol-with-monolithic-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-floated-multicol-with-monolithic-child.html rename to tests/wpt/tests/css/css-multicol/nested-floated-multicol-with-monolithic-child.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-floated-shape-outside-multicol-with-monolithic-child-crash.html b/tests/wpt/tests/css/css-multicol/nested-floated-shape-outside-multicol-with-monolithic-child-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-floated-shape-outside-multicol-with-monolithic-child-crash.html rename to tests/wpt/tests/css/css-multicol/nested-floated-shape-outside-multicol-with-monolithic-child-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-non-auto-inline-size-offset-top.html b/tests/wpt/tests/css/css-multicol/nested-non-auto-inline-size-offset-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-non-auto-inline-size-offset-top.html rename to tests/wpt/tests/css/css-multicol/nested-non-auto-inline-size-offset-top.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-oofs-in-relative-multicol.html b/tests/wpt/tests/css/css-multicol/nested-oofs-in-relative-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-oofs-in-relative-multicol.html rename to tests/wpt/tests/css/css-multicol/nested-oofs-in-relative-multicol.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-past-fragmentation-line.html b/tests/wpt/tests/css/css-multicol/nested-past-fragmentation-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-past-fragmentation-line.html rename to tests/wpt/tests/css/css-multicol/nested-past-fragmentation-line.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-with-overflowing-padding-crash.html b/tests/wpt/tests/css/css-multicol/nested-with-overflowing-padding-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-with-overflowing-padding-crash.html rename to tests/wpt/tests/css/css-multicol/nested-with-overflowing-padding-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-with-padding-and-spanner.html b/tests/wpt/tests/css/css-multicol/nested-with-padding-and-spanner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-with-padding-and-spanner.html rename to tests/wpt/tests/css/css-multicol/nested-with-padding-and-spanner.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-with-too-tall-line-ref.html b/tests/wpt/tests/css/css-multicol/nested-with-too-tall-line-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-with-too-tall-line-ref.html rename to tests/wpt/tests/css/css-multicol/nested-with-too-tall-line-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/nested-with-too-tall-line.html b/tests/wpt/tests/css/css-multicol/nested-with-too-tall-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/nested-with-too-tall-line.html rename to tests/wpt/tests/css/css-multicol/nested-with-too-tall-line.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/no-balancing-after-column-span.html b/tests/wpt/tests/css/css-multicol/no-balancing-after-column-span.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/no-balancing-after-column-span.html rename to tests/wpt/tests/css/css-multicol/no-balancing-after-column-span.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/non-adjacent-spanners-000.html b/tests/wpt/tests/css/css-multicol/non-adjacent-spanners-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/non-adjacent-spanners-000.html rename to tests/wpt/tests/css/css-multicol/non-adjacent-spanners-000.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/non-adjacent-spanners-001.html b/tests/wpt/tests/css/css-multicol/non-adjacent-spanners-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/non-adjacent-spanners-001.html rename to tests/wpt/tests/css/css-multicol/non-adjacent-spanners-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/oof-nested-in-single-column.html b/tests/wpt/tests/css/css-multicol/oof-nested-in-single-column.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/oof-nested-in-single-column.html rename to tests/wpt/tests/css/css-multicol/oof-nested-in-single-column.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/orthogonal-writing-mode-shrink-to-fit.html b/tests/wpt/tests/css/css-multicol/orthogonal-writing-mode-shrink-to-fit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/orthogonal-writing-mode-shrink-to-fit.html rename to tests/wpt/tests/css/css-multicol/orthogonal-writing-mode-shrink-to-fit.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/orthogonal-writing-mode-spanner.html b/tests/wpt/tests/css/css-multicol/orthogonal-writing-mode-spanner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/orthogonal-writing-mode-spanner.html rename to tests/wpt/tests/css/css-multicol/orthogonal-writing-mode-spanner.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/overflow-scroll-in-multicol-crash.html b/tests/wpt/tests/css/css-multicol/overflow-scroll-in-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/overflow-scroll-in-multicol-crash.html rename to tests/wpt/tests/css/css-multicol/overflow-scroll-in-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/overflow-unsplittable-001-ref.html b/tests/wpt/tests/css/css-multicol/overflow-unsplittable-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/overflow-unsplittable-001-ref.html rename to tests/wpt/tests/css/css-multicol/overflow-unsplittable-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/overflow-unsplittable-001.html b/tests/wpt/tests/css/css-multicol/overflow-unsplittable-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/overflow-unsplittable-001.html rename to tests/wpt/tests/css/css-multicol/overflow-unsplittable-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/overflow-unsplittable-002.html b/tests/wpt/tests/css/css-multicol/overflow-unsplittable-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/overflow-unsplittable-002.html rename to tests/wpt/tests/css/css-multicol/overflow-unsplittable-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/overflow-unsplittable-003.html b/tests/wpt/tests/css/css-multicol/overflow-unsplittable-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/overflow-unsplittable-003.html rename to tests/wpt/tests/css/css-multicol/overflow-unsplittable-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/page-property-ignored.html b/tests/wpt/tests/css/css-multicol/page-property-ignored.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/page-property-ignored.html rename to tests/wpt/tests/css/css-multicol/page-property-ignored.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parallel-flow-after-spanner-001.html b/tests/wpt/tests/css/css-multicol/parallel-flow-after-spanner-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parallel-flow-after-spanner-001.html rename to tests/wpt/tests/css/css-multicol/parallel-flow-after-spanner-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parallel-flow-after-spanner-002.html b/tests/wpt/tests/css/css-multicol/parallel-flow-after-spanner-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parallel-flow-after-spanner-002.html rename to tests/wpt/tests/css/css-multicol/parallel-flow-after-spanner-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-count-computed.html b/tests/wpt/tests/css/css-multicol/parsing/column-count-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-count-computed.html rename to tests/wpt/tests/css/css-multicol/parsing/column-count-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-count-invalid.html b/tests/wpt/tests/css/css-multicol/parsing/column-count-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-count-invalid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-count-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-count-valid.html b/tests/wpt/tests/css/css-multicol/parsing/column-count-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-count-valid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-count-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-fill-computed.html b/tests/wpt/tests/css/css-multicol/parsing/column-fill-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-fill-computed.html rename to tests/wpt/tests/css/css-multicol/parsing/column-fill-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-fill-invalid.html b/tests/wpt/tests/css/css-multicol/parsing/column-fill-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-fill-invalid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-fill-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-fill-valid.html b/tests/wpt/tests/css/css-multicol/parsing/column-fill-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-fill-valid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-fill-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-color-computed.html b/tests/wpt/tests/css/css-multicol/parsing/column-rule-color-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-color-computed.html rename to tests/wpt/tests/css/css-multicol/parsing/column-rule-color-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-color-invalid.html b/tests/wpt/tests/css/css-multicol/parsing/column-rule-color-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-color-invalid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-rule-color-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-color-valid.html b/tests/wpt/tests/css/css-multicol/parsing/column-rule-color-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-color-valid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-rule-color-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-computed.html b/tests/wpt/tests/css/css-multicol/parsing/column-rule-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-computed.html rename to tests/wpt/tests/css/css-multicol/parsing/column-rule-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-invalid.html b/tests/wpt/tests/css/css-multicol/parsing/column-rule-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-invalid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-rule-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-shorthand.html b/tests/wpt/tests/css/css-multicol/parsing/column-rule-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-shorthand.html rename to tests/wpt/tests/css/css-multicol/parsing/column-rule-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-style-computed.html b/tests/wpt/tests/css/css-multicol/parsing/column-rule-style-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-style-computed.html rename to tests/wpt/tests/css/css-multicol/parsing/column-rule-style-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-style-invalid.html b/tests/wpt/tests/css/css-multicol/parsing/column-rule-style-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-style-invalid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-rule-style-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-style-valid.html b/tests/wpt/tests/css/css-multicol/parsing/column-rule-style-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-style-valid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-rule-style-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-valid.html b/tests/wpt/tests/css/css-multicol/parsing/column-rule-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-valid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-rule-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-width-computed.html b/tests/wpt/tests/css/css-multicol/parsing/column-rule-width-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-width-computed.html rename to tests/wpt/tests/css/css-multicol/parsing/column-rule-width-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-width-invalid.html b/tests/wpt/tests/css/css-multicol/parsing/column-rule-width-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-width-invalid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-rule-width-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-width-valid.html b/tests/wpt/tests/css/css-multicol/parsing/column-rule-width-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-rule-width-valid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-rule-width-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-span-computed.html b/tests/wpt/tests/css/css-multicol/parsing/column-span-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-span-computed.html rename to tests/wpt/tests/css/css-multicol/parsing/column-span-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-span-invalid.html b/tests/wpt/tests/css/css-multicol/parsing/column-span-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-span-invalid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-span-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-span-valid.html b/tests/wpt/tests/css/css-multicol/parsing/column-span-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-span-valid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-span-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-width-computed.html b/tests/wpt/tests/css/css-multicol/parsing/column-width-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-width-computed.html rename to tests/wpt/tests/css/css-multicol/parsing/column-width-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-width-invalid.html b/tests/wpt/tests/css/css-multicol/parsing/column-width-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-width-invalid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-width-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/column-width-valid.html b/tests/wpt/tests/css/css-multicol/parsing/column-width-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/column-width-valid.html rename to tests/wpt/tests/css/css-multicol/parsing/column-width-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/columns-invalid.html b/tests/wpt/tests/css/css-multicol/parsing/columns-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/columns-invalid.html rename to tests/wpt/tests/css/css-multicol/parsing/columns-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/parsing/columns-valid.html b/tests/wpt/tests/css/css-multicol/parsing/columns-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/parsing/columns-valid.html rename to tests/wpt/tests/css/css-multicol/parsing/columns-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/reference/column-fill-balance-orthog-block-001-ref.html b/tests/wpt/tests/css/css-multicol/reference/column-fill-balance-orthog-block-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/reference/column-fill-balance-orthog-block-001-ref.html rename to tests/wpt/tests/css/css-multicol/reference/column-fill-balance-orthog-block-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/reference/multicol-basic-005-ref.xht b/tests/wpt/tests/css/css-multicol/reference/multicol-basic-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/reference/multicol-basic-005-ref.xht rename to tests/wpt/tests/css/css-multicol/reference/multicol-basic-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/reference/multicol-basic-ref.html b/tests/wpt/tests/css/css-multicol/reference/multicol-basic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/reference/multicol-basic-ref.html rename to tests/wpt/tests/css/css-multicol/reference/multicol-basic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/reference/multicol-clip-scrolled-content-001-ref.html b/tests/wpt/tests/css/css-multicol/reference/multicol-clip-scrolled-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/reference/multicol-clip-scrolled-content-001-ref.html rename to tests/wpt/tests/css/css-multicol/reference/multicol-clip-scrolled-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/reference/nested-oofs-in-relative-multicol-ref.html b/tests/wpt/tests/css/css-multicol/reference/nested-oofs-in-relative-multicol-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/reference/nested-oofs-in-relative-multicol-ref.html rename to tests/wpt/tests/css/css-multicol/reference/nested-oofs-in-relative-multicol-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/reference/subpixel-column-rule-width-ref.tentative.html b/tests/wpt/tests/css/css-multicol/reference/subpixel-column-rule-width-ref.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/reference/subpixel-column-rule-width-ref.tentative.html rename to tests/wpt/tests/css/css-multicol/reference/subpixel-column-rule-width-ref.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/relative-child-overflowing-column-gap-ref.html b/tests/wpt/tests/css/css-multicol/relative-child-overflowing-column-gap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/relative-child-overflowing-column-gap-ref.html rename to tests/wpt/tests/css/css-multicol/relative-child-overflowing-column-gap-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/relative-child-overflowing-column-gap.html b/tests/wpt/tests/css/css-multicol/relative-child-overflowing-column-gap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/relative-child-overflowing-column-gap.html rename to tests/wpt/tests/css/css-multicol/relative-child-overflowing-column-gap.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/relative-child-overflowing-container.html b/tests/wpt/tests/css/css-multicol/relative-child-overflowing-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/relative-child-overflowing-container.html rename to tests/wpt/tests/css/css-multicol/relative-child-overflowing-container.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/remove-block-beside-spanner-in-inline-crash.html b/tests/wpt/tests/css/css-multicol/remove-block-beside-spanner-in-inline-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/remove-block-beside-spanner-in-inline-crash.html rename to tests/wpt/tests/css/css-multicol/remove-block-beside-spanner-in-inline-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/remove-block-sibling-of-inline-with-block-crash.html b/tests/wpt/tests/css/css-multicol/remove-block-sibling-of-inline-with-block-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/remove-block-sibling-of-inline-with-block-crash.html rename to tests/wpt/tests/css/css-multicol/remove-block-sibling-of-inline-with-block-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/remove-child-in-strict-containment-also-spanner.html b/tests/wpt/tests/css/css-multicol/remove-child-in-strict-containment-also-spanner.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/remove-child-in-strict-containment-also-spanner.html rename to tests/wpt/tests/css/css-multicol/remove-child-in-strict-containment-also-spanner.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/remove-inline-with-block-beside-spanners-crash.html b/tests/wpt/tests/css/css-multicol/remove-inline-with-block-beside-spanners-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/remove-inline-with-block-beside-spanners-crash.html rename to tests/wpt/tests/css/css-multicol/remove-inline-with-block-beside-spanners-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/remove-inline-with-block-beside-spanners.html b/tests/wpt/tests/css/css-multicol/remove-inline-with-block-beside-spanners.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/remove-inline-with-block-beside-spanners.html rename to tests/wpt/tests/css/css-multicol/remove-inline-with-block-beside-spanners.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/remove-spanner-beside-spanner-in-inline-crash.html b/tests/wpt/tests/css/css-multicol/remove-spanner-beside-spanner-in-inline-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/remove-spanner-beside-spanner-in-inline-crash.html rename to tests/wpt/tests/css/css-multicol/remove-spanner-beside-spanner-in-inline-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/replaced-content-spanner-auto-width.html b/tests/wpt/tests/css/css-multicol/replaced-content-spanner-auto-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/replaced-content-spanner-auto-width.html rename to tests/wpt/tests/css/css-multicol/replaced-content-spanner-auto-width.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/resize-in-strict-containment-nested.html b/tests/wpt/tests/css/css-multicol/resize-in-strict-containment-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/resize-in-strict-containment-nested.html rename to tests/wpt/tests/css/css-multicol/resize-in-strict-containment-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/resize-multicol-with-fixed-size-children.html b/tests/wpt/tests/css/css-multicol/resize-multicol-with-fixed-size-children.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/resize-multicol-with-fixed-size-children.html rename to tests/wpt/tests/css/css-multicol/resize-multicol-with-fixed-size-children.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/scroll-width-height.tentative.html b/tests/wpt/tests/css/css-multicol/scroll-width-height.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/scroll-width-height.tentative.html rename to tests/wpt/tests/css/css-multicol/scroll-width-height.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-000.html b/tests/wpt/tests/css/css-multicol/spanner-fragmentation-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-000.html rename to tests/wpt/tests/css/css-multicol/spanner-fragmentation-000.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-001.html b/tests/wpt/tests/css/css-multicol/spanner-fragmentation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-001.html rename to tests/wpt/tests/css/css-multicol/spanner-fragmentation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-002.html b/tests/wpt/tests/css/css-multicol/spanner-fragmentation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-002.html rename to tests/wpt/tests/css/css-multicol/spanner-fragmentation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-003.html b/tests/wpt/tests/css/css-multicol/spanner-fragmentation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-003.html rename to tests/wpt/tests/css/css-multicol/spanner-fragmentation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-004.html b/tests/wpt/tests/css/css-multicol/spanner-fragmentation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-004.html rename to tests/wpt/tests/css/css-multicol/spanner-fragmentation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-005.html b/tests/wpt/tests/css/css-multicol/spanner-fragmentation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-005.html rename to tests/wpt/tests/css/css-multicol/spanner-fragmentation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-006.html b/tests/wpt/tests/css/css-multicol/spanner-fragmentation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-006.html rename to tests/wpt/tests/css/css-multicol/spanner-fragmentation-006.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-007.html b/tests/wpt/tests/css/css-multicol/spanner-fragmentation-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-007.html rename to tests/wpt/tests/css/css-multicol/spanner-fragmentation-007.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-008.html b/tests/wpt/tests/css/css-multicol/spanner-fragmentation-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-008.html rename to tests/wpt/tests/css/css-multicol/spanner-fragmentation-008.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-009.html b/tests/wpt/tests/css/css-multicol/spanner-fragmentation-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-009.html rename to tests/wpt/tests/css/css-multicol/spanner-fragmentation-009.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-010.html b/tests/wpt/tests/css/css-multicol/spanner-fragmentation-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-010.html rename to tests/wpt/tests/css/css-multicol/spanner-fragmentation-010.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-011.html b/tests/wpt/tests/css/css-multicol/spanner-fragmentation-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-011.html rename to tests/wpt/tests/css/css-multicol/spanner-fragmentation-011.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-012.html b/tests/wpt/tests/css/css-multicol/spanner-fragmentation-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-fragmentation-012.html rename to tests/wpt/tests/css/css-multicol/spanner-fragmentation-012.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-in-child-after-parallel-flow-001.html b/tests/wpt/tests/css/css-multicol/spanner-in-child-after-parallel-flow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-in-child-after-parallel-flow-001.html rename to tests/wpt/tests/css/css-multicol/spanner-in-child-after-parallel-flow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-in-child-after-parallel-flow-002.html b/tests/wpt/tests/css/css-multicol/spanner-in-child-after-parallel-flow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-in-child-after-parallel-flow-002.html rename to tests/wpt/tests/css/css-multicol/spanner-in-child-after-parallel-flow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-in-child-after-parallel-flow-003.html b/tests/wpt/tests/css/css-multicol/spanner-in-child-after-parallel-flow-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-in-child-after-parallel-flow-003.html rename to tests/wpt/tests/css/css-multicol/spanner-in-child-after-parallel-flow-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-in-child-after-parallel-flow-004.html b/tests/wpt/tests/css/css-multicol/spanner-in-child-after-parallel-flow-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-in-child-after-parallel-flow-004.html rename to tests/wpt/tests/css/css-multicol/spanner-in-child-after-parallel-flow-004.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-in-opacity-ref.html b/tests/wpt/tests/css/css-multicol/spanner-in-opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-in-opacity-ref.html rename to tests/wpt/tests/css/css-multicol/spanner-in-opacity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanner-in-opacity.html b/tests/wpt/tests/css/css-multicol/spanner-in-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanner-in-opacity.html rename to tests/wpt/tests/css/css-multicol/spanner-in-opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanning-legend-000-crash.html b/tests/wpt/tests/css/css-multicol/spanning-legend-000-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanning-legend-000-crash.html rename to tests/wpt/tests/css/css-multicol/spanning-legend-000-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanning-legend-001-crash.html b/tests/wpt/tests/css/css-multicol/spanning-legend-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/spanning-legend-001-crash.html rename to tests/wpt/tests/css/css-multicol/spanning-legend-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/subpixel-column-rule-width.tentative.html b/tests/wpt/tests/css/css-multicol/subpixel-column-rule-width.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/subpixel-column-rule-width.tentative.html rename to tests/wpt/tests/css/css-multicol/subpixel-column-rule-width.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/subpixel-scroll-crash.html b/tests/wpt/tests/css/css-multicol/subpixel-scroll-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/subpixel-scroll-crash.html rename to tests/wpt/tests/css/css-multicol/subpixel-scroll-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/1x1-green.png b/tests/wpt/tests/css/css-multicol/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/1x1-green.png rename to tests/wpt/tests/css/css-multicol/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/1x1-lime.png b/tests/wpt/tests/css/css-multicol/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/1x1-lime.png rename to tests/wpt/tests/css/css-multicol/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/1x1-maroon.png b/tests/wpt/tests/css/css-multicol/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/1x1-maroon.png rename to tests/wpt/tests/css/css-multicol/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/1x1-navy.png b/tests/wpt/tests/css/css-multicol/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/1x1-navy.png rename to tests/wpt/tests/css/css-multicol/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/1x1-red.png b/tests/wpt/tests/css/css-multicol/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/1x1-red.png rename to tests/wpt/tests/css/css-multicol/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/1x1-white.png b/tests/wpt/tests/css/css-multicol/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/1x1-white.png rename to tests/wpt/tests/css/css-multicol/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/60x60-gg-rr.png b/tests/wpt/tests/css/css-multicol/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/60x60-gg-rr.png rename to tests/wpt/tests/css/css-multicol/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/60x60-green.png b/tests/wpt/tests/css/css-multicol/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/60x60-green.png rename to tests/wpt/tests/css/css-multicol/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/a-green.css b/tests/wpt/tests/css/css-multicol/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/a-green.css rename to tests/wpt/tests/css/css-multicol/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/b-green.css b/tests/wpt/tests/css/css-multicol/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/b-green.css rename to tests/wpt/tests/css/css-multicol/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/black20x20.png b/tests/wpt/tests/css/css-multicol/support/black20x20.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/black20x20.png rename to tests/wpt/tests/css/css-multicol/support/black20x20.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/c-red.css b/tests/wpt/tests/css/css-multicol/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/c-red.css rename to tests/wpt/tests/css/css-multicol/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/cat.png b/tests/wpt/tests/css/css-multicol/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/cat.png rename to tests/wpt/tests/css/css-multicol/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/import-green.css b/tests/wpt/tests/css/css-multicol/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/import-green.css rename to tests/wpt/tests/css/css-multicol/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/import-red.css b/tests/wpt/tests/css/css-multicol/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/import-red.css rename to tests/wpt/tests/css/css-multicol/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/css-multicol/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/css-multicol/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/css-multicol/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/css-multicol/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/css-multicol/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/css-multicol/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/pattern-tr.png b/tests/wpt/tests/css/css-multicol/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/pattern-tr.png rename to tests/wpt/tests/css/css-multicol/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/red20x20.png b/tests/wpt/tests/css/css-multicol/support/red20x20.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/red20x20.png rename to tests/wpt/tests/css/css-multicol/support/red20x20.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/square-purple.png b/tests/wpt/tests/css/css-multicol/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/square-purple.png rename to tests/wpt/tests/css/css-multicol/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/square-teal.png b/tests/wpt/tests/css/css-multicol/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/square-teal.png rename to tests/wpt/tests/css/css-multicol/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/square-white.png b/tests/wpt/tests/css/css-multicol/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/square-white.png rename to tests/wpt/tests/css/css-multicol/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/swatch-blue.png b/tests/wpt/tests/css/css-multicol/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/swatch-blue.png rename to tests/wpt/tests/css/css-multicol/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/swatch-gray.png b/tests/wpt/tests/css/css-multicol/support/swatch-gray.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/swatch-gray.png rename to tests/wpt/tests/css/css-multicol/support/swatch-gray.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/swatch-green.png b/tests/wpt/tests/css/css-multicol/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/swatch-green.png rename to tests/wpt/tests/css/css-multicol/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/swatch-lime.png b/tests/wpt/tests/css/css-multicol/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/swatch-lime.png rename to tests/wpt/tests/css/css-multicol/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/swatch-navy.png b/tests/wpt/tests/css/css-multicol/support/swatch-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/swatch-navy.png rename to tests/wpt/tests/css/css-multicol/support/swatch-navy.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/swatch-orange.png b/tests/wpt/tests/css/css-multicol/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/swatch-orange.png rename to tests/wpt/tests/css/css-multicol/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/swatch-pink.png b/tests/wpt/tests/css/css-multicol/support/swatch-pink.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/swatch-pink.png rename to tests/wpt/tests/css/css-multicol/support/swatch-pink.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/swatch-purple.png b/tests/wpt/tests/css/css-multicol/support/swatch-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/swatch-purple.png rename to tests/wpt/tests/css/css-multicol/support/swatch-purple.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/swatch-red.png b/tests/wpt/tests/css/css-multicol/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/swatch-red.png rename to tests/wpt/tests/css/css-multicol/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/swatch-white.png b/tests/wpt/tests/css/css-multicol/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/swatch-white.png rename to tests/wpt/tests/css/css-multicol/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/swatch-yellow.png b/tests/wpt/tests/css/css-multicol/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/swatch-yellow.png rename to tests/wpt/tests/css/css-multicol/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/test-bl.png b/tests/wpt/tests/css/css-multicol/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/test-bl.png rename to tests/wpt/tests/css/css-multicol/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/test-br.png b/tests/wpt/tests/css/css-multicol/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/test-br.png rename to tests/wpt/tests/css/css-multicol/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/test-outer.png b/tests/wpt/tests/css/css-multicol/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/test-outer.png rename to tests/wpt/tests/css/css-multicol/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/test-tl.png b/tests/wpt/tests/css/css-multicol/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/test-tl.png rename to tests/wpt/tests/css/css-multicol/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/support/test-tr.png b/tests/wpt/tests/css/css-multicol/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/support/test-tr.png rename to tests/wpt/tests/css/css-multicol/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/balance-breakafter-before-table-section-crash.html b/tests/wpt/tests/css/css-multicol/table/balance-breakafter-before-table-section-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/balance-breakafter-before-table-section-crash.html rename to tests/wpt/tests/css/css-multicol/table/balance-breakafter-before-table-section-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/balance-table-with-border-spacing.html b/tests/wpt/tests/css/css-multicol/table/balance-table-with-border-spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/balance-table-with-border-spacing.html rename to tests/wpt/tests/css/css-multicol/table/balance-table-with-border-spacing.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/balance-table-with-fractional-height-row.html b/tests/wpt/tests/css/css-multicol/table/balance-table-with-fractional-height-row.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/balance-table-with-fractional-height-row.html rename to tests/wpt/tests/css/css-multicol/table/balance-table-with-fractional-height-row.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/multicol-table-cell-001-ref.xht b/tests/wpt/tests/css/css-multicol/table/multicol-table-cell-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/multicol-table-cell-001-ref.xht rename to tests/wpt/tests/css/css-multicol/table/multicol-table-cell-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/multicol-table-cell-001.xht b/tests/wpt/tests/css/css-multicol/table/multicol-table-cell-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/multicol-table-cell-001.xht rename to tests/wpt/tests/css/css-multicol/table/multicol-table-cell-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/multicol-table-cell-height-001-ref.xht b/tests/wpt/tests/css/css-multicol/table/multicol-table-cell-height-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/multicol-table-cell-height-001-ref.xht rename to tests/wpt/tests/css/css-multicol/table/multicol-table-cell-height-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/multicol-table-cell-height-001.xht b/tests/wpt/tests/css/css-multicol/table/multicol-table-cell-height-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/multicol-table-cell-height-001.xht rename to tests/wpt/tests/css/css-multicol/table/multicol-table-cell-height-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/multicol-table-cell-height-002.xht b/tests/wpt/tests/css/css-multicol/table/multicol-table-cell-height-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/multicol-table-cell-height-002.xht rename to tests/wpt/tests/css/css-multicol/table/multicol-table-cell-height-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/multicol-table-cell-vertical-align-001.xht b/tests/wpt/tests/css/css-multicol/table/multicol-table-cell-vertical-align-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/multicol-table-cell-vertical-align-001.xht rename to tests/wpt/tests/css/css-multicol/table/multicol-table-cell-vertical-align-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/multicol-table-cell-vertical-align-ref.xht b/tests/wpt/tests/css/css-multicol/table/multicol-table-cell-vertical-align-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/multicol-table-cell-vertical-align-ref.xht rename to tests/wpt/tests/css/css-multicol/table/multicol-table-cell-vertical-align-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-as-multicol-ref.html b/tests/wpt/tests/css/css-multicol/table/table-cell-as-multicol-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-as-multicol-ref.html rename to tests/wpt/tests/css/css-multicol/table/table-cell-as-multicol-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-as-multicol.html b/tests/wpt/tests/css/css-multicol/table/table-cell-as-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-as-multicol.html rename to tests/wpt/tests/css/css-multicol/table/table-cell-as-multicol.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-content-change-000-ref.html b/tests/wpt/tests/css/css-multicol/table/table-cell-content-change-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-content-change-000-ref.html rename to tests/wpt/tests/css/css-multicol/table/table-cell-content-change-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-content-change-000.html b/tests/wpt/tests/css/css-multicol/table/table-cell-content-change-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-content-change-000.html rename to tests/wpt/tests/css/css-multicol/table/table-cell-content-change-000.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-content-change-001-ref.html b/tests/wpt/tests/css/css-multicol/table/table-cell-content-change-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-content-change-001-ref.html rename to tests/wpt/tests/css/css-multicol/table/table-cell-content-change-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-content-change-001.html b/tests/wpt/tests/css/css-multicol/table/table-cell-content-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-content-change-001.html rename to tests/wpt/tests/css/css-multicol/table/table-cell-content-change-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-multicol-nested-001.html b/tests/wpt/tests/css/css-multicol/table/table-cell-multicol-nested-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-multicol-nested-001.html rename to tests/wpt/tests/css/css-multicol/table/table-cell-multicol-nested-001.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-multicol-nested-002.html b/tests/wpt/tests/css/css-multicol/table/table-cell-multicol-nested-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-multicol-nested-002.html rename to tests/wpt/tests/css/css-multicol/table/table-cell-multicol-nested-002.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-multicol-nested-003.html b/tests/wpt/tests/css/css-multicol/table/table-cell-multicol-nested-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/table/table-cell-multicol-nested-003.html rename to tests/wpt/tests/css/css-multicol/table/table-cell-multicol-nested-003.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/text-child-crash.html b/tests/wpt/tests/css/css-multicol/text-child-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/text-child-crash.html rename to tests/wpt/tests/css/css-multicol/text-child-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/toggle-spanner-float-crash.html b/tests/wpt/tests/css/css-multicol/toggle-spanner-float-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/toggle-spanner-float-crash.html rename to tests/wpt/tests/css/css-multicol/toggle-spanner-float-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/triply-nested-with-fixedpos-in-abspos-crash.html b/tests/wpt/tests/css/css-multicol/triply-nested-with-fixedpos-in-abspos-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/triply-nested-with-fixedpos-in-abspos-crash.html rename to tests/wpt/tests/css/css-multicol/triply-nested-with-fixedpos-in-abspos-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/with-custom-layout-on-same-element-crash.https.html b/tests/wpt/tests/css/css-multicol/with-custom-layout-on-same-element-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/with-custom-layout-on-same-element-crash.https.html rename to tests/wpt/tests/css/css-multicol/with-custom-layout-on-same-element-crash.https.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/with-custom-layout-on-same-element.https.html b/tests/wpt/tests/css/css-multicol/with-custom-layout-on-same-element.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/with-custom-layout-on-same-element.https.html rename to tests/wpt/tests/css/css-multicol/with-custom-layout-on-same-element.https.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/zero-column-width-computed-style.html b/tests/wpt/tests/css/css-multicol/zero-column-width-computed-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/zero-column-width-computed-style.html rename to tests/wpt/tests/css/css-multicol/zero-column-width-computed-style.html diff --git a/tests/wpt/web-platform-tests/css/css-multicol/zero-column-width-layout.html b/tests/wpt/tests/css/css-multicol/zero-column-width-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-multicol/zero-column-width-layout.html rename to tests/wpt/tests/css/css-multicol/zero-column-width-layout.html diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/META.yml b/tests/wpt/tests/css/css-namespaces/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/META.yml rename to tests/wpt/tests/css/css-namespaces/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/README b/tests/wpt/tests/css/css-namespaces/README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/README rename to tests/wpt/tests/css/css-namespaces/README diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-001.xml b/tests/wpt/tests/css/css-namespaces/prefix-001.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/prefix-001.xml rename to tests/wpt/tests/css/css-namespaces/prefix-001.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-002.xml b/tests/wpt/tests/css/css-namespaces/prefix-002.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/prefix-002.xml rename to tests/wpt/tests/css/css-namespaces/prefix-002.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-003.xml b/tests/wpt/tests/css/css-namespaces/prefix-003.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/prefix-003.xml rename to tests/wpt/tests/css/css-namespaces/prefix-003.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-004.xml b/tests/wpt/tests/css/css-namespaces/prefix-004.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/prefix-004.xml rename to tests/wpt/tests/css/css-namespaces/prefix-004.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-005.xml b/tests/wpt/tests/css/css-namespaces/prefix-005.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/prefix-005.xml rename to tests/wpt/tests/css/css-namespaces/prefix-005.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/prefix-006.xml b/tests/wpt/tests/css/css-namespaces/prefix-006.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/prefix-006.xml rename to tests/wpt/tests/css/css-namespaces/prefix-006.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-1-block.xml b/tests/wpt/tests/css/css-namespaces/reference/ref-lime-1-block.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-1-block.xml rename to tests/wpt/tests/css/css-namespaces/reference/ref-lime-1-block.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-1-generic.xml b/tests/wpt/tests/css/css-namespaces/reference/ref-lime-1-generic.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-1-generic.xml rename to tests/wpt/tests/css/css-namespaces/reference/ref-lime-1-generic.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-1.xml b/tests/wpt/tests/css/css-namespaces/reference/ref-lime-1.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-1.xml rename to tests/wpt/tests/css/css-namespaces/reference/ref-lime-1.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-2-generic.xml b/tests/wpt/tests/css/css-namespaces/reference/ref-lime-2-generic.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-2-generic.xml rename to tests/wpt/tests/css/css-namespaces/reference/ref-lime-2-generic.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-2.xml b/tests/wpt/tests/css/css-namespaces/reference/ref-lime-2.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-2.xml rename to tests/wpt/tests/css/css-namespaces/reference/ref-lime-2.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-3.xml b/tests/wpt/tests/css/css-namespaces/reference/ref-lime-3.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-3.xml rename to tests/wpt/tests/css/css-namespaces/reference/ref-lime-3.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-5.xml b/tests/wpt/tests/css/css-namespaces/reference/ref-lime-5.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-5.xml rename to tests/wpt/tests/css/css-namespaces/reference/ref-lime-5.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-6.xml b/tests/wpt/tests/css/css-namespaces/reference/ref-lime-6.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/reference/ref-lime-6.xml rename to tests/wpt/tests/css/css-namespaces/reference/ref-lime-6.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/scope-001.xml b/tests/wpt/tests/css/css-namespaces/scope-001.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/scope-001.xml rename to tests/wpt/tests/css/css-namespaces/scope-001.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/scope-002.xml b/tests/wpt/tests/css/css-namespaces/scope-002.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/scope-002.xml rename to tests/wpt/tests/css/css-namespaces/scope-002.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/support/LOCK b/tests/wpt/tests/css/css-namespaces/support/LOCK similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/support/LOCK rename to tests/wpt/tests/css/css-namespaces/support/LOCK diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/support/fail.css b/tests/wpt/tests/css/css-namespaces/support/fail.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/support/fail.css rename to tests/wpt/tests/css/css-namespaces/support/fail.css diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/support/scope-002a.css b/tests/wpt/tests/css/css-namespaces/support/scope-002a.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/support/scope-002a.css rename to tests/wpt/tests/css/css-namespaces/support/scope-002a.css diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/support/scope-002b.css b/tests/wpt/tests/css/css-namespaces/support/scope-002b.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/support/scope-002b.css rename to tests/wpt/tests/css/css-namespaces/support/scope-002b.css diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/support/syntax-007.css b/tests/wpt/tests/css/css-namespaces/support/syntax-007.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/support/syntax-007.css rename to tests/wpt/tests/css/css-namespaces/support/syntax-007.css diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-001.xml b/tests/wpt/tests/css/css-namespaces/syntax-001.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-001.xml rename to tests/wpt/tests/css/css-namespaces/syntax-001.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-002.xml b/tests/wpt/tests/css/css-namespaces/syntax-002.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-002.xml rename to tests/wpt/tests/css/css-namespaces/syntax-002.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-003.xml b/tests/wpt/tests/css/css-namespaces/syntax-003.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-003.xml rename to tests/wpt/tests/css/css-namespaces/syntax-003.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-004.xml b/tests/wpt/tests/css/css-namespaces/syntax-004.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-004.xml rename to tests/wpt/tests/css/css-namespaces/syntax-004.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-005.xml b/tests/wpt/tests/css/css-namespaces/syntax-005.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-005.xml rename to tests/wpt/tests/css/css-namespaces/syntax-005.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-006.xml b/tests/wpt/tests/css/css-namespaces/syntax-006.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-006.xml rename to tests/wpt/tests/css/css-namespaces/syntax-006.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-007.xml b/tests/wpt/tests/css/css-namespaces/syntax-007.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-007.xml rename to tests/wpt/tests/css/css-namespaces/syntax-007.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-008.xml b/tests/wpt/tests/css/css-namespaces/syntax-008.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-008.xml rename to tests/wpt/tests/css/css-namespaces/syntax-008.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-009.xml b/tests/wpt/tests/css/css-namespaces/syntax-009.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-009.xml rename to tests/wpt/tests/css/css-namespaces/syntax-009.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-010.xml b/tests/wpt/tests/css/css-namespaces/syntax-010.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-010.xml rename to tests/wpt/tests/css/css-namespaces/syntax-010.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-011.xml b/tests/wpt/tests/css/css-namespaces/syntax-011.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-011.xml rename to tests/wpt/tests/css/css-namespaces/syntax-011.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-012.xml b/tests/wpt/tests/css/css-namespaces/syntax-012.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-012.xml rename to tests/wpt/tests/css/css-namespaces/syntax-012.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-013.xml b/tests/wpt/tests/css/css-namespaces/syntax-013.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-013.xml rename to tests/wpt/tests/css/css-namespaces/syntax-013.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-014.xml b/tests/wpt/tests/css/css-namespaces/syntax-014.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-014.xml rename to tests/wpt/tests/css/css-namespaces/syntax-014.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-015.xml b/tests/wpt/tests/css/css-namespaces/syntax-015.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-015.xml rename to tests/wpt/tests/css/css-namespaces/syntax-015.xml diff --git a/tests/wpt/web-platform-tests/css/css-namespaces/syntax-016.xml b/tests/wpt/tests/css/css-namespaces/syntax-016.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-namespaces/syntax-016.xml rename to tests/wpt/tests/css/css-namespaces/syntax-016.xml diff --git a/tests/wpt/web-platform-tests/css/css-nesting/conditional-properties-ref.html b/tests/wpt/tests/css/css-nesting/conditional-properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/conditional-properties-ref.html rename to tests/wpt/tests/css/css-nesting/conditional-properties-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/conditional-properties.html b/tests/wpt/tests/css/css-nesting/conditional-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/conditional-properties.html rename to tests/wpt/tests/css/css-nesting/conditional-properties.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/conditional-rules-ref.html b/tests/wpt/tests/css/css-nesting/conditional-rules-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/conditional-rules-ref.html rename to tests/wpt/tests/css/css-nesting/conditional-rules-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/conditional-rules.html b/tests/wpt/tests/css/css-nesting/conditional-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/conditional-rules.html rename to tests/wpt/tests/css/css-nesting/conditional-rules.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/cssom.html b/tests/wpt/tests/css/css-nesting/cssom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/cssom.html rename to tests/wpt/tests/css/css-nesting/cssom.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/delete-other-rule-crash.html b/tests/wpt/tests/css/css-nesting/delete-other-rule-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/delete-other-rule-crash.html rename to tests/wpt/tests/css/css-nesting/delete-other-rule-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/implicit-nesting-ref.html b/tests/wpt/tests/css/css-nesting/implicit-nesting-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/implicit-nesting-ref.html rename to tests/wpt/tests/css/css-nesting/implicit-nesting-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/implicit-nesting.html b/tests/wpt/tests/css/css-nesting/implicit-nesting.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/implicit-nesting.html rename to tests/wpt/tests/css/css-nesting/implicit-nesting.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/implicit-parent-insertion-crash.html b/tests/wpt/tests/css/css-nesting/implicit-parent-insertion-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/implicit-parent-insertion-crash.html rename to tests/wpt/tests/css/css-nesting/implicit-parent-insertion-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/invalid-inner-rules.html b/tests/wpt/tests/css/css-nesting/invalid-inner-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/invalid-inner-rules.html rename to tests/wpt/tests/css/css-nesting/invalid-inner-rules.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/invalidation-001.html b/tests/wpt/tests/css/css-nesting/invalidation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/invalidation-001.html rename to tests/wpt/tests/css/css-nesting/invalidation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/invalidation-002.html b/tests/wpt/tests/css/css-nesting/invalidation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/invalidation-002.html rename to tests/wpt/tests/css/css-nesting/invalidation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/invalidation-003.html b/tests/wpt/tests/css/css-nesting/invalidation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/invalidation-003.html rename to tests/wpt/tests/css/css-nesting/invalidation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/invalidation-004.html b/tests/wpt/tests/css/css-nesting/invalidation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/invalidation-004.html rename to tests/wpt/tests/css/css-nesting/invalidation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/nest-containing-forgiving-ref.html b/tests/wpt/tests/css/css-nesting/nest-containing-forgiving-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/nest-containing-forgiving-ref.html rename to tests/wpt/tests/css/css-nesting/nest-containing-forgiving-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/nest-containing-forgiving.html b/tests/wpt/tests/css/css-nesting/nest-containing-forgiving.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/nest-containing-forgiving.html rename to tests/wpt/tests/css/css-nesting/nest-containing-forgiving.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/nesting-basic-ref.html b/tests/wpt/tests/css/css-nesting/nesting-basic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/nesting-basic-ref.html rename to tests/wpt/tests/css/css-nesting/nesting-basic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/nesting-basic.html b/tests/wpt/tests/css/css-nesting/nesting-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/nesting-basic.html rename to tests/wpt/tests/css/css-nesting/nesting-basic.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/nesting-layer.html b/tests/wpt/tests/css/css-nesting/nesting-layer.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/nesting-layer.html rename to tests/wpt/tests/css/css-nesting/nesting-layer.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/nesting-type-selector.html b/tests/wpt/tests/css/css-nesting/nesting-type-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/nesting-type-selector.html rename to tests/wpt/tests/css/css-nesting/nesting-type-selector.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/parsing.html b/tests/wpt/tests/css/css-nesting/parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/parsing.html rename to tests/wpt/tests/css/css-nesting/parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/pseudo-part-crash.html b/tests/wpt/tests/css/css-nesting/pseudo-part-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/pseudo-part-crash.html rename to tests/wpt/tests/css/css-nesting/pseudo-part-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/serialize-group-rules-with-decls.tentative.html b/tests/wpt/tests/css/css-nesting/serialize-group-rules-with-decls.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/serialize-group-rules-with-decls.tentative.html rename to tests/wpt/tests/css/css-nesting/serialize-group-rules-with-decls.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/supports-is-consistent-ref.html b/tests/wpt/tests/css/css-nesting/supports-is-consistent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/supports-is-consistent-ref.html rename to tests/wpt/tests/css/css-nesting/supports-is-consistent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/supports-is-consistent.html b/tests/wpt/tests/css/css-nesting/supports-is-consistent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/supports-is-consistent.html rename to tests/wpt/tests/css/css-nesting/supports-is-consistent.html diff --git a/tests/wpt/web-platform-tests/css/css-nesting/top-level-is-scope.html b/tests/wpt/tests/css/css-nesting/top-level-is-scope.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-nesting/top-level-is-scope.html rename to tests/wpt/tests/css/css-nesting/top-level-is-scope.html diff --git a/tests/wpt/web-platform-tests/css/css-outline/outline-width-rounding.tentative.html b/tests/wpt/tests/css/css-outline/outline-width-rounding.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-outline/outline-width-rounding.tentative.html rename to tests/wpt/tests/css/css-outline/outline-width-rounding.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-outline/reference/subpixel-outline-width-ref.tentative.html b/tests/wpt/tests/css/css-outline/reference/subpixel-outline-width-ref.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-outline/reference/subpixel-outline-width-ref.tentative.html rename to tests/wpt/tests/css/css-outline/reference/subpixel-outline-width-ref.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-outline/subpixel-outline-width.tentative.html b/tests/wpt/tests/css/css-outline/subpixel-outline-width.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-outline/subpixel-outline-width.tentative.html rename to tests/wpt/tests/css/css-outline/subpixel-outline-width.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/META.yml b/tests/wpt/tests/css/css-overflow/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/META.yml rename to tests/wpt/tests/css/css-overflow/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-overflow/chrome-body-overflow-propagation-crash.html b/tests/wpt/tests/css/css-overflow/chrome-body-overflow-propagation-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/chrome-body-overflow-propagation-crash.html rename to tests/wpt/tests/css/css-overflow/chrome-body-overflow-propagation-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-001-ref.html b/tests/wpt/tests/css/css-overflow/clip-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/clip-001-ref.html rename to tests/wpt/tests/css/css-overflow/clip-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-001.html b/tests/wpt/tests/css/css-overflow/clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/clip-001.html rename to tests/wpt/tests/css/css-overflow/clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-002-ref.html b/tests/wpt/tests/css/css-overflow/clip-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/clip-002-ref.html rename to tests/wpt/tests/css/css-overflow/clip-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-002.html b/tests/wpt/tests/css/css-overflow/clip-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/clip-002.html rename to tests/wpt/tests/css/css-overflow/clip-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-003-ref.html b/tests/wpt/tests/css/css-overflow/clip-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/clip-003-ref.html rename to tests/wpt/tests/css/css-overflow/clip-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-003.html b/tests/wpt/tests/css/css-overflow/clip-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/clip-003.html rename to tests/wpt/tests/css/css-overflow/clip-003.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-004-ref.html b/tests/wpt/tests/css/css-overflow/clip-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/clip-004-ref.html rename to tests/wpt/tests/css/css-overflow/clip-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-004.html b/tests/wpt/tests/css/css-overflow/clip-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/clip-004.html rename to tests/wpt/tests/css/css-overflow/clip-004.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-005-ref.html b/tests/wpt/tests/css/css-overflow/clip-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/clip-005-ref.html rename to tests/wpt/tests/css/css-overflow/clip-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-005.html b/tests/wpt/tests/css/css-overflow/clip-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/clip-005.html rename to tests/wpt/tests/css/css-overflow/clip-005.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-006.html b/tests/wpt/tests/css/css-overflow/clip-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/clip-006.html rename to tests/wpt/tests/css/css-overflow/clip-006.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-007.html b/tests/wpt/tests/css/css-overflow/clip-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/clip-007.html rename to tests/wpt/tests/css/css-overflow/clip-007.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/display-flex-svg-overflow-default-ref.html b/tests/wpt/tests/css/css-overflow/display-flex-svg-overflow-default-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/display-flex-svg-overflow-default-ref.html rename to tests/wpt/tests/css/css-overflow/display-flex-svg-overflow-default-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/display-flex-svg-overflow-default.html b/tests/wpt/tests/css/css-overflow/display-flex-svg-overflow-default.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/display-flex-svg-overflow-default.html rename to tests/wpt/tests/css/css-overflow/display-flex-svg-overflow-default.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/dynamic-visible-to-clip-001.html b/tests/wpt/tests/css/css-overflow/dynamic-visible-to-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/dynamic-visible-to-clip-001.html rename to tests/wpt/tests/css/css-overflow/dynamic-visible-to-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/float-with-relpos-and-transform.html b/tests/wpt/tests/css/css-overflow/float-with-relpos-and-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/float-with-relpos-and-transform.html rename to tests/wpt/tests/css/css-overflow/float-with-relpos-and-transform.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/incremental-scroll-ref.html b/tests/wpt/tests/css/css-overflow/incremental-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/incremental-scroll-ref.html rename to tests/wpt/tests/css/css-overflow/incremental-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/incremental-scroll.html b/tests/wpt/tests/css/css-overflow/incremental-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/incremental-scroll.html rename to tests/wpt/tests/css/css-overflow/incremental-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/inheritance.html b/tests/wpt/tests/css/css-overflow/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/inheritance.html rename to tests/wpt/tests/css/css-overflow/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/input-scrollable-region-001.html b/tests/wpt/tests/css/css-overflow/input-scrollable-region-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/input-scrollable-region-001.html rename to tests/wpt/tests/css/css-overflow/input-scrollable-region-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/logical-overflow-001.html b/tests/wpt/tests/css/css-overflow/logical-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/logical-overflow-001.html rename to tests/wpt/tests/css/css-overflow/logical-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/margin-block-end-scroll-area-001.html b/tests/wpt/tests/css/css-overflow/margin-block-end-scroll-area-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/margin-block-end-scroll-area-001.html rename to tests/wpt/tests/css/css-overflow/margin-block-end-scroll-area-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/no-scrollable-overflow-vertical-rl-2.html b/tests/wpt/tests/css/css-overflow/no-scrollable-overflow-vertical-rl-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/no-scrollable-overflow-vertical-rl-2.html rename to tests/wpt/tests/css/css-overflow/no-scrollable-overflow-vertical-rl-2.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/no-scrollable-overflow-vertical-rl.html b/tests/wpt/tests/css/css-overflow/no-scrollable-overflow-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/no-scrollable-overflow-vertical-rl.html rename to tests/wpt/tests/css/css-overflow/no-scrollable-overflow-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/orthogonal-flow-with-inline-end-margin.html b/tests/wpt/tests/css/css-overflow/orthogonal-flow-with-inline-end-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/orthogonal-flow-with-inline-end-margin.html rename to tests/wpt/tests/css/css-overflow/orthogonal-flow-with-inline-end-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/outline-with-opacity-crash.html b/tests/wpt/tests/css/css-overflow/outline-with-opacity-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/outline-with-opacity-crash.html rename to tests/wpt/tests/css/css-overflow/outline-with-opacity-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-abpos-transform.html b/tests/wpt/tests/css/css-overflow/overflow-abpos-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-abpos-transform.html rename to tests/wpt/tests/css/css-overflow/overflow-abpos-transform.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-001-ref.html b/tests/wpt/tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-001-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-001.html b/tests/wpt/tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-001.html rename to tests/wpt/tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-002-ref.html b/tests/wpt/tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-002-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-002.html b/tests/wpt/tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-002.html rename to tests/wpt/tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-003-ref.html b/tests/wpt/tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-003-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-003.html b/tests/wpt/tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-003.html rename to tests/wpt/tests/css/css-overflow/overflow-auto-scrollbar-gutter-intrinsic-003.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-001.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-001.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-002.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-002.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-003.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-003.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-004.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-004.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-005.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-005.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-006.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-006.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-006.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-007-ref.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-007-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-007.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-007.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-007.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-008-ref.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-008-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-008.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-008.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-008.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-009-ref.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-009-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-009.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-009.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-009.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-010-ref.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-010-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-010.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-010.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-010.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-011-ref.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-011-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-011.html b/tests/wpt/tests/css/css-overflow/overflow-body-propagation-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-011.html rename to tests/wpt/tests/css/css-overflow/overflow-body-propagation-011.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-canvas-ref.html b/tests/wpt/tests/css/css-overflow/overflow-canvas-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-canvas-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-canvas-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-canvas.html b/tests/wpt/tests/css/css-overflow/overflow-canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-canvas.html rename to tests/wpt/tests/css/css-overflow/overflow-canvas.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-001-crash.html b/tests/wpt/tests/css/css-overflow/overflow-clip-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-001-crash.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-002-crash.html b/tests/wpt/tests/css/css-overflow/overflow-clip-002-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-002-crash.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-002-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-cant-scroll-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-cant-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-cant-scroll-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-cant-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-cant-scroll.html b/tests/wpt/tests/css/css-overflow/overflow-clip-cant-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-cant-scroll.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-cant-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-content-visual-overflow-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-content-visual-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-content-visual-overflow-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-content-visual-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-content-visual-overflow.html b/tests/wpt/tests/css/css-overflow/overflow-clip-content-visual-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-content-visual-overflow.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-content-visual-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-hit-testing.html b/tests/wpt/tests/css/css-overflow/overflow-clip-hit-testing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-hit-testing.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-hit-testing.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-001-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-001-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-001.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-001.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-002-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-002-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-002.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-002.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-003-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-003-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-003.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-003.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-003.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-004-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-004-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-004.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-004.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-004.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-005-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-005-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-005.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-005.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-005.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-006-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-006-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-006.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-006.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-006.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-007-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-007-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-007.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-007.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-007.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-008-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-008-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-008.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-008.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-008.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-009-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-009-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-009.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-009.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-009.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-010-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-010-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-010.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-010.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-010.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-011-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-011-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-011.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-011.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-011.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-intersection-observer.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-intersection-observer.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-intersection-observer.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-intersection-observer.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-invalidation-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-invalidation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-invalidation-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-invalidation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-invalidation.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-invalidation.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-mul-column-border-box-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-mul-column-border-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-mul-column-border-box-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-mul-column-border-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-mul-column-border-box.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-mul-column-border-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-mul-column-border-box.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-mul-column-border-box.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-mul-column-content-box-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-mul-column-content-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-mul-column-content-box-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-mul-column-content-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-mul-column-content-box.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-mul-column-content-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-mul-column-content-box.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-mul-column-content-box.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-mul-column-padding-box-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-mul-column-padding-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-mul-column-padding-box-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-mul-column-padding-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-mul-column-padding-box.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-mul-column-padding-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-mul-column-padding-box.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-mul-column-padding-box.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-svg-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-svg-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-svg.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-svg.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-visual-box-and-value-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-visual-box-and-value-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-visual-box-and-value-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-visual-box-and-value-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-visual-box-and-value-with-border-radius-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-visual-box-and-value-with-border-radius-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-visual-box-and-value-with-border-radius-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-visual-box-and-value-with-border-radius-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-visual-box-and-value-with-border-radius.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-visual-box-and-value-with-border-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-visual-box-and-value-with-border-radius.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-visual-box-and-value-with-border-radius.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-visual-box-and-value.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-visual-box-and-value.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-visual-box-and-value.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-visual-box-and-value.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-visual-box-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-visual-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-visual-box-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-visual-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-visual-box.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-visual-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-margin-visual-box.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-margin-visual-box.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-rounded-table-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-rounded-table-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-rounded-table-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-rounded-table-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-rounded-table.html b/tests/wpt/tests/css/css-overflow/overflow-clip-rounded-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-rounded-table.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-rounded-table.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-scroll-size.html b/tests/wpt/tests/css/css-overflow/overflow-clip-scroll-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-scroll-size.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-scroll-size.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-x-visible-y-svg-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-x-visible-y-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-x-visible-y-svg-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-x-visible-y-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-x-visible-y-svg.html b/tests/wpt/tests/css/css-overflow/overflow-clip-x-visible-y-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-x-visible-y-svg.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-x-visible-y-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-y-visible-x-svg-ref.html b/tests/wpt/tests/css/css-overflow/overflow-clip-y-visible-x-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-y-visible-x-svg-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-y-visible-x-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-y-visible-x-svg.html b/tests/wpt/tests/css/css-overflow/overflow-clip-y-visible-x-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-clip-y-visible-x-svg.html rename to tests/wpt/tests/css/css-overflow/overflow-clip-y-visible-x-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-codependent-scrollbars.html b/tests/wpt/tests/css/css-overflow/overflow-codependent-scrollbars.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-codependent-scrollbars.html rename to tests/wpt/tests/css/css-overflow/overflow-codependent-scrollbars.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-ellipsis-dynamic-001.html b/tests/wpt/tests/css/css-overflow/overflow-ellipsis-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-ellipsis-dynamic-001.html rename to tests/wpt/tests/css/css-overflow/overflow-ellipsis-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-empty-child-box.html b/tests/wpt/tests/css/css-overflow/overflow-empty-child-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-empty-child-box.html rename to tests/wpt/tests/css/css-overflow/overflow-empty-child-box.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-hidden-resize-with-stacking-context-child.html b/tests/wpt/tests/css/css-overflow/overflow-hidden-resize-with-stacking-context-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-hidden-resize-with-stacking-context-child.html rename to tests/wpt/tests/css/css-overflow/overflow-hidden-resize-with-stacking-context-child.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-img-border-radius.html b/tests/wpt/tests/css/css-overflow/overflow-img-border-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-img-border-radius.html rename to tests/wpt/tests/css/css-overflow/overflow-img-border-radius.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-img-display-table-ref.html b/tests/wpt/tests/css/css-overflow/overflow-img-display-table-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-img-display-table-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-img-display-table-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-img-display-table.html b/tests/wpt/tests/css/css-overflow/overflow-img-display-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-img-display-table.html rename to tests/wpt/tests/css/css-overflow/overflow-img-display-table.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-img-object-position-ref.html b/tests/wpt/tests/css/css-overflow/overflow-img-object-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-img-object-position-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-img-object-position-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-img-object-position.html b/tests/wpt/tests/css/css-overflow/overflow-img-object-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-img-object-position.html rename to tests/wpt/tests/css/css-overflow/overflow-img-object-position.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-img-ref.html b/tests/wpt/tests/css/css-overflow/overflow-img-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-img-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-img-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-img-scroll-non-replaced-ref.html b/tests/wpt/tests/css/css-overflow/overflow-img-scroll-non-replaced-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-img-scroll-non-replaced-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-img-scroll-non-replaced-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-img-scroll-non-replaced.html b/tests/wpt/tests/css/css-overflow/overflow-img-scroll-non-replaced.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-img-scroll-non-replaced.html rename to tests/wpt/tests/css/css-overflow/overflow-img-scroll-non-replaced.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-img-scroll-replaced-ref.html b/tests/wpt/tests/css/css-overflow/overflow-img-scroll-replaced-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-img-scroll-replaced-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-img-scroll-replaced-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-img-scroll-replaced.html b/tests/wpt/tests/css/css-overflow/overflow-img-scroll-replaced.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-img-scroll-replaced.html rename to tests/wpt/tests/css/css-overflow/overflow-img-scroll-replaced.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-img-svg-ref.html b/tests/wpt/tests/css/css-overflow/overflow-img-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-img-svg-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-img-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-img-svg.html b/tests/wpt/tests/css/css-overflow/overflow-img-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-img-svg.html rename to tests/wpt/tests/css/css-overflow/overflow-img-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-img.html b/tests/wpt/tests/css/css-overflow/overflow-img.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-img.html rename to tests/wpt/tests/css/css-overflow/overflow-img.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-inline-block-with-opacity.html b/tests/wpt/tests/css/css-overflow/overflow-inline-block-with-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-inline-block-with-opacity.html rename to tests/wpt/tests/css/css-overflow/overflow-inline-block-with-opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-inline-transform-relative.html b/tests/wpt/tests/css/css-overflow/overflow-inline-transform-relative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-inline-transform-relative.html rename to tests/wpt/tests/css/css-overflow/overflow-inline-transform-relative.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-negative-margin-dynamic.html b/tests/wpt/tests/css/css-overflow/overflow-negative-margin-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-negative-margin-dynamic.html rename to tests/wpt/tests/css/css-overflow/overflow-negative-margin-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-negative-margin.html b/tests/wpt/tests/css/css-overflow/overflow-negative-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-negative-margin.html rename to tests/wpt/tests/css/css-overflow/overflow-negative-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-no-frameset-propagation.html b/tests/wpt/tests/css/css-overflow/overflow-no-frameset-propagation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-no-frameset-propagation.html rename to tests/wpt/tests/css/css-overflow/overflow-no-frameset-propagation.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-no-interpolation.html b/tests/wpt/tests/css/css-overflow/overflow-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-no-interpolation.html rename to tests/wpt/tests/css/css-overflow/overflow-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-overlay-ref.html b/tests/wpt/tests/css/css-overflow/overflow-overlay-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-overlay-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-overlay-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-overlay.html b/tests/wpt/tests/css/css-overflow/overflow-overlay.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-overlay.html rename to tests/wpt/tests/css/css-overflow/overflow-overlay.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-padding.html b/tests/wpt/tests/css/css-overflow/overflow-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-padding.html rename to tests/wpt/tests/css/css-overflow/overflow-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-recalc-001.html b/tests/wpt/tests/css/css-overflow/overflow-recalc-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-recalc-001.html rename to tests/wpt/tests/css/css-overflow/overflow-recalc-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-replaced-element-001.html b/tests/wpt/tests/css/css-overflow/overflow-replaced-element-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-replaced-element-001.html rename to tests/wpt/tests/css/css-overflow/overflow-replaced-element-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-scroll-big-border-small-content-ref.html b/tests/wpt/tests/css/css-overflow/overflow-scroll-big-border-small-content-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-scroll-big-border-small-content-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-scroll-big-border-small-content-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-scroll-big-border-small-content.html b/tests/wpt/tests/css/css-overflow/overflow-scroll-big-border-small-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-scroll-big-border-small-content.html rename to tests/wpt/tests/css/css-overflow/overflow-scroll-big-border-small-content.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-scroll-intrinsic-001-ref.html b/tests/wpt/tests/css/css-overflow/overflow-scroll-intrinsic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-scroll-intrinsic-001-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-scroll-intrinsic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-scroll-intrinsic-001.html b/tests/wpt/tests/css/css-overflow/overflow-scroll-intrinsic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-scroll-intrinsic-001.html rename to tests/wpt/tests/css/css-overflow/overflow-scroll-intrinsic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-scroll-resize-visibility-hidden-ref.html b/tests/wpt/tests/css/css-overflow/overflow-scroll-resize-visibility-hidden-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-scroll-resize-visibility-hidden-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-scroll-resize-visibility-hidden-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-scroll-resize-visibility-hidden.html b/tests/wpt/tests/css/css-overflow/overflow-scroll-resize-visibility-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-scroll-resize-visibility-hidden.html rename to tests/wpt/tests/css/css-overflow/overflow-scroll-resize-visibility-hidden.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-shorthand-001.html b/tests/wpt/tests/css/css-overflow/overflow-shorthand-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-shorthand-001.html rename to tests/wpt/tests/css/css-overflow/overflow-shorthand-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-video-ref.html b/tests/wpt/tests/css/css-overflow/overflow-video-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-video-ref.html rename to tests/wpt/tests/css/css-overflow/overflow-video-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-video.html b/tests/wpt/tests/css/css-overflow/overflow-video.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overflow-video.html rename to tests/wpt/tests/css/css-overflow/overflow-video.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overfow-outside-padding.html b/tests/wpt/tests/css/css-overflow/overfow-outside-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/overfow-outside-padding.html rename to tests/wpt/tests/css/css-overflow/overfow-outside-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/paint-containment-svg-ref.html b/tests/wpt/tests/css/css-overflow/paint-containment-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/paint-containment-svg-ref.html rename to tests/wpt/tests/css/css-overflow/paint-containment-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/paint-containment-svg.html b/tests/wpt/tests/css/css-overflow/paint-containment-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/paint-containment-svg.html rename to tests/wpt/tests/css/css-overflow/paint-containment-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/block-ellipsis-invalid.html b/tests/wpt/tests/css/css-overflow/parsing/block-ellipsis-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/block-ellipsis-invalid.html rename to tests/wpt/tests/css/css-overflow/parsing/block-ellipsis-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/block-ellipsis-valid.html b/tests/wpt/tests/css/css-overflow/parsing/block-ellipsis-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/block-ellipsis-valid.html rename to tests/wpt/tests/css/css-overflow/parsing/block-ellipsis-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/continue-invalid.html b/tests/wpt/tests/css/css-overflow/parsing/continue-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/continue-invalid.html rename to tests/wpt/tests/css/css-overflow/parsing/continue-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/continue-valid.html b/tests/wpt/tests/css/css-overflow/parsing/continue-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/continue-valid.html rename to tests/wpt/tests/css/css-overflow/parsing/continue-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/line-clamp-invalid.html b/tests/wpt/tests/css/css-overflow/parsing/line-clamp-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/line-clamp-invalid.html rename to tests/wpt/tests/css/css-overflow/parsing/line-clamp-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/line-clamp-valid.html b/tests/wpt/tests/css/css-overflow/parsing/line-clamp-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/line-clamp-valid.html rename to tests/wpt/tests/css/css-overflow/parsing/line-clamp-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/max-lines-invalid.html b/tests/wpt/tests/css/css-overflow/parsing/max-lines-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/max-lines-invalid.html rename to tests/wpt/tests/css/css-overflow/parsing/max-lines-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/max-lines-valid.html b/tests/wpt/tests/css/css-overflow/parsing/max-lines-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/max-lines-valid.html rename to tests/wpt/tests/css/css-overflow/parsing/max-lines-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/overflow-clip-margin-computed.html b/tests/wpt/tests/css/css-overflow/parsing/overflow-clip-margin-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/overflow-clip-margin-computed.html rename to tests/wpt/tests/css/css-overflow/parsing/overflow-clip-margin-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/overflow-clip-margin.html b/tests/wpt/tests/css/css-overflow/parsing/overflow-clip-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/overflow-clip-margin.html rename to tests/wpt/tests/css/css-overflow/parsing/overflow-clip-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/overflow-computed.html b/tests/wpt/tests/css/css-overflow/parsing/overflow-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/overflow-computed.html rename to tests/wpt/tests/css/css-overflow/parsing/overflow-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/overflow-invalid.html b/tests/wpt/tests/css/css-overflow/parsing/overflow-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/overflow-invalid.html rename to tests/wpt/tests/css/css-overflow/parsing/overflow-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/overflow-valid.html b/tests/wpt/tests/css/css-overflow/parsing/overflow-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/overflow-valid.html rename to tests/wpt/tests/css/css-overflow/parsing/overflow-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/scrollbar-gutter-invalid.html b/tests/wpt/tests/css/css-overflow/parsing/scrollbar-gutter-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/scrollbar-gutter-invalid.html rename to tests/wpt/tests/css/css-overflow/parsing/scrollbar-gutter-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/scrollbar-gutter-valid.html b/tests/wpt/tests/css/css-overflow/parsing/scrollbar-gutter-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/scrollbar-gutter-valid.html rename to tests/wpt/tests/css/css-overflow/parsing/scrollbar-gutter-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/text-overflow-computed.html b/tests/wpt/tests/css/css-overflow/parsing/text-overflow-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/text-overflow-computed.html rename to tests/wpt/tests/css/css-overflow/parsing/text-overflow-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/text-overflow-invalid.html b/tests/wpt/tests/css/css-overflow/parsing/text-overflow-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/text-overflow-invalid.html rename to tests/wpt/tests/css/css-overflow/parsing/text-overflow-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/text-overflow-valid.html b/tests/wpt/tests/css/css-overflow/parsing/text-overflow-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/text-overflow-valid.html rename to tests/wpt/tests/css/css-overflow/parsing/text-overflow-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/webkit-line-clamp-invalid.html b/tests/wpt/tests/css/css-overflow/parsing/webkit-line-clamp-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/webkit-line-clamp-invalid.html rename to tests/wpt/tests/css/css-overflow/parsing/webkit-line-clamp-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/webkit-line-clamp-valid.html b/tests/wpt/tests/css/css-overflow/parsing/webkit-line-clamp-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/parsing/webkit-line-clamp-valid.html rename to tests/wpt/tests/css/css-overflow/parsing/webkit-line-clamp-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/input-scrollable-region-001-ref.html b/tests/wpt/tests/css/css-overflow/reference/input-scrollable-region-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/input-scrollable-region-001-ref.html rename to tests/wpt/tests/css/css-overflow/reference/input-scrollable-region-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/overflow-body-no-propagation-ref.html b/tests/wpt/tests/css/css-overflow/reference/overflow-body-no-propagation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/overflow-body-no-propagation-ref.html rename to tests/wpt/tests/css/css-overflow/reference/overflow-body-no-propagation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/overflow-body-propagation-ref.html b/tests/wpt/tests/css/css-overflow/reference/overflow-body-propagation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/overflow-body-propagation-ref.html rename to tests/wpt/tests/css/css-overflow/reference/overflow-body-propagation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/overflow-ellipsis-dynamic-001-ref.html b/tests/wpt/tests/css/css-overflow/reference/overflow-ellipsis-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/overflow-ellipsis-dynamic-001-ref.html rename to tests/wpt/tests/css/css-overflow/reference/overflow-ellipsis-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/overflow-inline-block-with-opacity-ref.html b/tests/wpt/tests/css/css-overflow/reference/overflow-inline-block-with-opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/overflow-inline-block-with-opacity-ref.html rename to tests/wpt/tests/css/css-overflow/reference/overflow-inline-block-with-opacity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/overflow-recalc-001-ref.html b/tests/wpt/tests/css/css-overflow/reference/overflow-recalc-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/overflow-recalc-001-ref.html rename to tests/wpt/tests/css/css-overflow/reference/overflow-recalc-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/ref-if-there-is-no-red.xht b/tests/wpt/tests/css/css-overflow/reference/ref-if-there-is-no-red.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/ref-if-there-is-no-red.xht rename to tests/wpt/tests/css/css-overflow/reference/ref-if-there-is-no-red.xht diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-ellipsis-001-ref.html b/tests/wpt/tests/css/css-overflow/reference/text-overflow-ellipsis-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-ellipsis-001-ref.html rename to tests/wpt/tests/css/css-overflow/reference/text-overflow-ellipsis-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-ellipsis-002-ref.html b/tests/wpt/tests/css/css-overflow/reference/text-overflow-ellipsis-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-ellipsis-002-ref.html rename to tests/wpt/tests/css/css-overflow/reference/text-overflow-ellipsis-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-ellipsis-rtl-001-ref.html b/tests/wpt/tests/css/css-overflow/reference/text-overflow-ellipsis-rtl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-ellipsis-rtl-001-ref.html rename to tests/wpt/tests/css/css-overflow/reference/text-overflow-ellipsis-rtl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-ellipsis-vertical-001-ref.html b/tests/wpt/tests/css/css-overflow/reference/text-overflow-ellipsis-vertical-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-ellipsis-vertical-001-ref.html rename to tests/wpt/tests/css/css-overflow/reference/text-overflow-ellipsis-vertical-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-ellipsis-vertical-rtl-001-ref.html b/tests/wpt/tests/css/css-overflow/reference/text-overflow-ellipsis-vertical-rtl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-ellipsis-vertical-rtl-001-ref.html rename to tests/wpt/tests/css/css-overflow/reference/text-overflow-ellipsis-vertical-rtl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-scroll-001-ref.html b/tests/wpt/tests/css/css-overflow/reference/text-overflow-scroll-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-scroll-001-ref.html rename to tests/wpt/tests/css/css-overflow/reference/text-overflow-scroll-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-scroll-rtl-001-ref.html b/tests/wpt/tests/css/css-overflow/reference/text-overflow-scroll-rtl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-scroll-rtl-001-ref.html rename to tests/wpt/tests/css/css-overflow/reference/text-overflow-scroll-rtl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-scroll-vertical-lr-001-ref.html b/tests/wpt/tests/css/css-overflow/reference/text-overflow-scroll-vertical-lr-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-scroll-vertical-lr-001-ref.html rename to tests/wpt/tests/css/css-overflow/reference/text-overflow-scroll-vertical-lr-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-scroll-vertical-lr-rtl-001-ref.html b/tests/wpt/tests/css/css-overflow/reference/text-overflow-scroll-vertical-lr-rtl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/text-overflow-scroll-vertical-lr-rtl-001-ref.html rename to tests/wpt/tests/css/css-overflow/reference/text-overflow-scroll-vertical-lr-rtl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-001-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-001-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-005-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-005-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-006-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-006-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-007-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-007-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-008-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-008-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-009-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-009-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-010-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-010-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-011-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-011-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-012-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-012-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-013-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-013-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-014-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-014-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-015-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-015-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-016-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-016-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-017-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-017-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-018-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-018-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-019-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-019-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-020-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-020-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-021-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-021-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-022-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-022-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-023-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-023-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-024-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-024-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-025-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-025-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-026-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-026-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-026-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-026-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-027-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-027-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-029-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-029-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-029-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-029-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-030-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-030-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-030-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-030-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-031-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-031-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-031-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-031-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-032-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-032-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-032-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-032-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-035-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-035-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-035-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-035-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-036-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-036-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-036-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-036-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-037-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-037-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-037-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-037-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-038-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-038-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-038-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-038-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-039-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-039-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-039-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-039-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-040-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-040-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-040-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-040-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-block-in-inline-001-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-block-in-inline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-block-in-inline-001-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-block-in-inline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-dynamic-001-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-dynamic-001-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-with-line-height-ref.html b/tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-with-line-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/reference/webkit-line-clamp-with-line-height-ref.html rename to tests/wpt/tests/css/css-overflow/reference/webkit-line-clamp-with-line-height-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/resizer-no-size-change.tentative.html b/tests/wpt/tests/css/css-overflow/resizer-no-size-change.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/resizer-no-size-change.tentative.html rename to tests/wpt/tests/css/css-overflow/resizer-no-size-change.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/resizer-transform.tentative.html b/tests/wpt/tests/css/css-overflow/resizer-transform.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/resizer-transform.tentative.html rename to tests/wpt/tests/css/css-overflow/resizer-transform.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scroll-overflow-padding-block-001.html b/tests/wpt/tests/css/css-overflow/scroll-overflow-padding-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scroll-overflow-padding-block-001.html rename to tests/wpt/tests/css/css-overflow/scroll-overflow-padding-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-float.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-float.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-float.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-input-001-ref.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-input-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-input-001-ref.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-input-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-input-001.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-input-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-input-001.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-input-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-input-002-ref.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-input-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-input-002-ref.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-input-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-input-002.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-input-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-input-002.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-input-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-padding.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-padding.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-self-collapsing.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-self-collapsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-self-collapsing.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-self-collapsing.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-textarea.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-textarea.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-textarea.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-textarea.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-001.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-001.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-002.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-002.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-003.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-003.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-003.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-dynamic-001.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-dynamic-001.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-dynamic-002.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-dynamic-002.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-dynamic-003.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-dynamic-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-dynamic-003.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-dynamic-003.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-dynamic-004.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-dynamic-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-dynamic-004.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-dynamic-004.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-dynamic-005.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-dynamic-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-dynamic-005.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-dynamic-005.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-dynamic-006.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-dynamic-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-transform-dynamic-006.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-transform-dynamic-006.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-vertical-rl-dynamic.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-vertical-rl-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-vertical-rl-dynamic.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-vertical-rl-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-zero-one-axis.html b/tests/wpt/tests/css/css-overflow/scrollable-overflow-zero-one-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollable-overflow-zero-one-axis.html rename to tests/wpt/tests/css/css-overflow/scrollable-overflow-zero-one-axis.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-empty-001.html b/tests/wpt/tests/css/css-overflow/scrollbar-empty-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-empty-001.html rename to tests/wpt/tests/css/css-overflow/scrollbar-empty-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-empty-002.html b/tests/wpt/tests/css/css-overflow/scrollbar-empty-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-empty-002.html rename to tests/wpt/tests/css/css-overflow/scrollbar-empty-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-001.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-001.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-002-ref.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-002-ref.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-002.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-002.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-abspos-001-ref.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-abspos-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-abspos-001-ref.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-abspos-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-abspos-001.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-abspos-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-abspos-001.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-abspos-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-dynamic-001-ref.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-dynamic-001-ref.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-dynamic-001.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-dynamic-001.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-dynamic-002-ref.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-dynamic-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-dynamic-002-ref.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-dynamic-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-dynamic-002.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-dynamic-002.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-propagation-001.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-propagation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-propagation-001.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-propagation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-propagation-002.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-propagation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-propagation-002.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-propagation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-propagation-003.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-propagation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-propagation-003.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-propagation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-propagation-004.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-propagation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-propagation-004.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-propagation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-propagation-005.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-propagation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-propagation-005.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-propagation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-propagation-006.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-propagation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-propagation-006.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-propagation-006.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-propagation-007.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-propagation-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-propagation-007.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-propagation-007.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-rtl-001.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-rtl-001.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-rtl-002-ref.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-rtl-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-rtl-002-ref.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-rtl-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-rtl-002.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-rtl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-rtl-002.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-rtl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-lr-001.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-vertical-lr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-lr-001.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-vertical-lr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-lr-002-ref.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-vertical-lr-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-lr-002-ref.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-vertical-lr-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-lr-002.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-vertical-lr-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-lr-002.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-vertical-lr-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-rl-001.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-vertical-rl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-rl-001.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-vertical-rl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-rl-002-ref.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-vertical-rl-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-rl-002-ref.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-vertical-rl-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-rl-002.html b/tests/wpt/tests/css/css-overflow/scrollbar-gutter-vertical-rl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-vertical-rl-002.html rename to tests/wpt/tests/css/css-overflow/scrollbar-gutter-vertical-rl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/select-size-overflow-001-ref.html b/tests/wpt/tests/css/css-overflow/select-size-overflow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/select-size-overflow-001-ref.html rename to tests/wpt/tests/css/css-overflow/select-size-overflow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/select-size-overflow-001.html b/tests/wpt/tests/css/css-overflow/select-size-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/select-size-overflow-001.html rename to tests/wpt/tests/css/css-overflow/select-size-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/shrink-to-fit-auto-overflow-relayout-crash.html b/tests/wpt/tests/css/css-overflow/shrink-to-fit-auto-overflow-relayout-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/shrink-to-fit-auto-overflow-relayout-crash.html rename to tests/wpt/tests/css/css-overflow/shrink-to-fit-auto-overflow-relayout-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/table-header-group-overflow-crash.html b/tests/wpt/tests/css/css-overflow/table-header-group-overflow-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/table-header-group-overflow-crash.html rename to tests/wpt/tests/css/css-overflow/table-header-group-overflow-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-001.html b/tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-001.html rename to tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-002.html b/tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-002.html rename to tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-003-ref.html b/tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-003-ref.html rename to tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-003.html b/tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-003.html rename to tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-003.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-editing-input-ref.html b/tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-editing-input-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-editing-input-ref.html rename to tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-editing-input-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-editing-input.html b/tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-editing-input.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-editing-input.html rename to tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-editing-input.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-rtl-001.html b/tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-rtl-001.html rename to tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-vertical-001.html b/tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-vertical-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-vertical-001.html rename to tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-vertical-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-vertical-rtl-001.html b/tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-vertical-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-ellipsis-vertical-rtl-001.html rename to tests/wpt/tests/css/css-overflow/text-overflow-ellipsis-vertical-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-scroll-001.html b/tests/wpt/tests/css/css-overflow/text-overflow-scroll-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-scroll-001.html rename to tests/wpt/tests/css/css-overflow/text-overflow-scroll-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-scroll-rtl-001.html b/tests/wpt/tests/css/css-overflow/text-overflow-scroll-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-scroll-rtl-001.html rename to tests/wpt/tests/css/css-overflow/text-overflow-scroll-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-scroll-vertical-lr-001.html b/tests/wpt/tests/css/css-overflow/text-overflow-scroll-vertical-lr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-scroll-vertical-lr-001.html rename to tests/wpt/tests/css/css-overflow/text-overflow-scroll-vertical-lr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-scroll-vertical-lr-rtl-001.html b/tests/wpt/tests/css/css-overflow/text-overflow-scroll-vertical-lr-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-scroll-vertical-lr-rtl-001.html rename to tests/wpt/tests/css/css-overflow/text-overflow-scroll-vertical-lr-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-scroll-vertical-rl-001.html b/tests/wpt/tests/css/css-overflow/text-overflow-scroll-vertical-rl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-scroll-vertical-rl-001.html rename to tests/wpt/tests/css/css-overflow/text-overflow-scroll-vertical-rl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/text-overflow-scroll-vertical-rl-rtl-001.html b/tests/wpt/tests/css/css-overflow/text-overflow-scroll-vertical-rl-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/text-overflow-scroll-vertical-rl-rtl-001.html rename to tests/wpt/tests/css/css-overflow/text-overflow-scroll-vertical-rl-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-001.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-001.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-002.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-002.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-002.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-003.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-003.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-003.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-004.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-004.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-004.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-005.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-005.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-005.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-006.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-006.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-006.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-007.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-007.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-007.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-008.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-008.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-008.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-009.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-009.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-009.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-010.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-010.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-010.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-011.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-011.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-011.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-012.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-012.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-012.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-013.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-013.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-013.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-014.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-014.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-014.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-015.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-015.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-015.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-016.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-016.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-016.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-017.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-017.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-017.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-018.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-018.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-018.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-019.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-019.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-019.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-020.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-020.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-020.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-021.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-021.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-021.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-022.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-022.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-022.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-023.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-023.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-023.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-024.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-024.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-024.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-025.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-025.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-025.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-026.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-026.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-026.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-027.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-027.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-027.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-029.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-029.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-029.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-030.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-030.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-030.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-031.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-031.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-031.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-032.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-032.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-032.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-033.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-033.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-033.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-034.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-034.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-034.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-035.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-035.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-035.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-036.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-036.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-036.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-037.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-037.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-037.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-038.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-038.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-038.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-039.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-039.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-039.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-040.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-040.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-040.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-041-crash.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-041-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-041-crash.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-041-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-042-crash.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-042-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-042-crash.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-042-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-043.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-043.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-043.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-block-in-inline-001.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-block-in-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-block-in-inline-001.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-block-in-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-dynamic-001.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-dynamic-001.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-with-line-height.tentative.html b/tests/wpt/tests/css/css-overflow/webkit-line-clamp-with-line-height.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overflow/webkit-line-clamp-with-line-height.tentative.html rename to tests/wpt/tests/css/css-overflow/webkit-line-clamp-with-line-height.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-overscroll-behavior/META.yml b/tests/wpt/tests/css/css-overscroll-behavior/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overscroll-behavior/META.yml rename to tests/wpt/tests/css/css-overscroll-behavior/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-overscroll-behavior/inheritance.html b/tests/wpt/tests/css/css-overscroll-behavior/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overscroll-behavior/inheritance.html rename to tests/wpt/tests/css/css-overscroll-behavior/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-overscroll-behavior/overscroll-behavior-logical.html b/tests/wpt/tests/css/css-overscroll-behavior/overscroll-behavior-logical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overscroll-behavior/overscroll-behavior-logical.html rename to tests/wpt/tests/css/css-overscroll-behavior/overscroll-behavior-logical.html diff --git a/tests/wpt/web-platform-tests/css/css-overscroll-behavior/overscroll-behavior.html b/tests/wpt/tests/css/css-overscroll-behavior/overscroll-behavior.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overscroll-behavior/overscroll-behavior.html rename to tests/wpt/tests/css/css-overscroll-behavior/overscroll-behavior.html diff --git a/tests/wpt/web-platform-tests/css/css-overscroll-behavior/parsing/overscroll-behavior-computed.html b/tests/wpt/tests/css/css-overscroll-behavior/parsing/overscroll-behavior-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overscroll-behavior/parsing/overscroll-behavior-computed.html rename to tests/wpt/tests/css/css-overscroll-behavior/parsing/overscroll-behavior-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-overscroll-behavior/parsing/overscroll-behavior-invalid.html b/tests/wpt/tests/css/css-overscroll-behavior/parsing/overscroll-behavior-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overscroll-behavior/parsing/overscroll-behavior-invalid.html rename to tests/wpt/tests/css/css-overscroll-behavior/parsing/overscroll-behavior-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-overscroll-behavior/parsing/overscroll-behavior-valid.html b/tests/wpt/tests/css/css-overscroll-behavior/parsing/overscroll-behavior-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-overscroll-behavior/parsing/overscroll-behavior-valid.html rename to tests/wpt/tests/css/css-overscroll-behavior/parsing/overscroll-behavior-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-page/META.yml b/tests/wpt/tests/css/css-page/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/META.yml rename to tests/wpt/tests/css/css-page/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-page/forced-page-breaks-002.xht b/tests/wpt/tests/css/css-page/forced-page-breaks-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/forced-page-breaks-002.xht rename to tests/wpt/tests/css/css-page/forced-page-breaks-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/inheritance.html b/tests/wpt/tests/css/css-page/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/inheritance.html rename to tests/wpt/tests/css/css-page/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-page/page-background-000.xht b/tests/wpt/tests/css/css-page/page-background-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-background-000.xht rename to tests/wpt/tests/css/css-page/page-background-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-borders-000.xht b/tests/wpt/tests/css/css-page/page-borders-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-borders-000.xht rename to tests/wpt/tests/css/css-page/page-borders-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-counters-000.xht b/tests/wpt/tests/css/css-page/page-counters-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-counters-000.xht rename to tests/wpt/tests/css/css-page/page-counters-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-margin-003.xht b/tests/wpt/tests/css/css-page/page-margin-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-margin-003.xht rename to tests/wpt/tests/css/css-page/page-margin-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-name-000.xht b/tests/wpt/tests/css/css-page/page-name-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-name-000.xht rename to tests/wpt/tests/css/css-page/page-name-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-orientation.tentative.html b/tests/wpt/tests/css/css-page/page-orientation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-orientation.tentative.html rename to tests/wpt/tests/css/css-page/page-orientation.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-page/page-properties-000.xht b/tests/wpt/tests/css/css-page/page-properties-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-properties-000.xht rename to tests/wpt/tests/css/css-page/page-properties-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-rule-declarations-000.html b/tests/wpt/tests/css/css-page/page-rule-declarations-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-rule-declarations-000.html rename to tests/wpt/tests/css/css-page/page-rule-declarations-000.html diff --git a/tests/wpt/web-platform-tests/css/css-page/page-rule-declarations-001.html b/tests/wpt/tests/css/css-page/page-rule-declarations-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-rule-declarations-001.html rename to tests/wpt/tests/css/css-page/page-rule-declarations-001.html diff --git a/tests/wpt/web-platform-tests/css/css-page/page-rule-declarations-002.html b/tests/wpt/tests/css/css-page/page-rule-declarations-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-rule-declarations-002.html rename to tests/wpt/tests/css/css-page/page-rule-declarations-002.html diff --git a/tests/wpt/web-platform-tests/css/css-page/page-rule-declarations-003.html b/tests/wpt/tests/css/css-page/page-rule-declarations-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-rule-declarations-003.html rename to tests/wpt/tests/css/css-page/page-rule-declarations-003.html diff --git a/tests/wpt/web-platform-tests/css/css-page/page-rule-declarations-004.html b/tests/wpt/tests/css/css-page/page-rule-declarations-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-rule-declarations-004.html rename to tests/wpt/tests/css/css-page/page-rule-declarations-004.html diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-000.xht b/tests/wpt/tests/css/css-page/page-size-000.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-size-000.xht rename to tests/wpt/tests/css/css-page/page-size-000.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-001.xht b/tests/wpt/tests/css/css-page/page-size-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-size-001.xht rename to tests/wpt/tests/css/css-page/page-size-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-002.xht b/tests/wpt/tests/css/css-page/page-size-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-size-002.xht rename to tests/wpt/tests/css/css-page/page-size-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-003.xht b/tests/wpt/tests/css/css-page/page-size-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-size-003.xht rename to tests/wpt/tests/css/css-page/page-size-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-004.xht b/tests/wpt/tests/css/css-page/page-size-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-size-004.xht rename to tests/wpt/tests/css/css-page/page-size-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-005.xht b/tests/wpt/tests/css/css-page/page-size-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-size-005.xht rename to tests/wpt/tests/css/css-page/page-size-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-006.xht b/tests/wpt/tests/css/css-page/page-size-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-size-006.xht rename to tests/wpt/tests/css/css-page/page-size-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-007.xht b/tests/wpt/tests/css/css-page/page-size-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-size-007.xht rename to tests/wpt/tests/css/css-page/page-size-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-008.xht b/tests/wpt/tests/css/css-page/page-size-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-size-008.xht rename to tests/wpt/tests/css/css-page/page-size-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-009.xht b/tests/wpt/tests/css/css-page/page-size-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-size-009.xht rename to tests/wpt/tests/css/css-page/page-size-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-010.xht b/tests/wpt/tests/css/css-page/page-size-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-size-010.xht rename to tests/wpt/tests/css/css-page/page-size-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-011.xht b/tests/wpt/tests/css/css-page/page-size-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-size-011.xht rename to tests/wpt/tests/css/css-page/page-size-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-012.xht b/tests/wpt/tests/css/css-page/page-size-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/page-size-012.xht rename to tests/wpt/tests/css/css-page/page-size-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-page/parsing/page-computed.html b/tests/wpt/tests/css/css-page/parsing/page-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/parsing/page-computed.html rename to tests/wpt/tests/css/css-page/parsing/page-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-page/parsing/page-invalid.html b/tests/wpt/tests/css/css-page/parsing/page-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/parsing/page-invalid.html rename to tests/wpt/tests/css/css-page/parsing/page-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-page/parsing/page-orientation-computed.tentative.html b/tests/wpt/tests/css/css-page/parsing/page-orientation-computed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/parsing/page-orientation-computed.tentative.html rename to tests/wpt/tests/css/css-page/parsing/page-orientation-computed.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-page/parsing/page-orientation-invalid.tentative.html b/tests/wpt/tests/css/css-page/parsing/page-orientation-invalid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/parsing/page-orientation-invalid.tentative.html rename to tests/wpt/tests/css/css-page/parsing/page-orientation-invalid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-page/parsing/page-valid.html b/tests/wpt/tests/css/css-page/parsing/page-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/parsing/page-valid.html rename to tests/wpt/tests/css/css-page/parsing/page-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-page/parsing/size-001.html b/tests/wpt/tests/css/css-page/parsing/size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/parsing/size-001.html rename to tests/wpt/tests/css/css-page/parsing/size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-page/support/1x1-green.png b/tests/wpt/tests/css/css-page/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/1x1-green.png rename to tests/wpt/tests/css/css-page/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/1x1-lime.png b/tests/wpt/tests/css/css-page/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/1x1-lime.png rename to tests/wpt/tests/css/css-page/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/1x1-maroon.png b/tests/wpt/tests/css/css-page/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/1x1-maroon.png rename to tests/wpt/tests/css/css-page/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/1x1-navy.png b/tests/wpt/tests/css/css-page/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/1x1-navy.png rename to tests/wpt/tests/css/css-page/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/1x1-red.png b/tests/wpt/tests/css/css-page/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/1x1-red.png rename to tests/wpt/tests/css/css-page/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/1x1-white.png b/tests/wpt/tests/css/css-page/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/1x1-white.png rename to tests/wpt/tests/css/css-page/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/60x60-gg-rr.png b/tests/wpt/tests/css/css-page/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/60x60-gg-rr.png rename to tests/wpt/tests/css/css-page/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/60x60-green.png b/tests/wpt/tests/css/css-page/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/60x60-green.png rename to tests/wpt/tests/css/css-page/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/a-green.css b/tests/wpt/tests/css/css-page/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/a-green.css rename to tests/wpt/tests/css/css-page/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/css-page/support/b-green.css b/tests/wpt/tests/css/css-page/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/b-green.css rename to tests/wpt/tests/css/css-page/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/css-page/support/c-red.css b/tests/wpt/tests/css/css-page/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/c-red.css rename to tests/wpt/tests/css/css-page/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/css-page/support/cat.png b/tests/wpt/tests/css/css-page/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/cat.png rename to tests/wpt/tests/css/css-page/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/import-green.css b/tests/wpt/tests/css/css-page/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/import-green.css rename to tests/wpt/tests/css/css-page/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/css-page/support/import-red.css b/tests/wpt/tests/css/css-page/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/import-red.css rename to tests/wpt/tests/css/css-page/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/css-page/support/intrinsic-size.jpg b/tests/wpt/tests/css/css-page/support/intrinsic-size.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/intrinsic-size.jpg rename to tests/wpt/tests/css/css-page/support/intrinsic-size.jpg diff --git a/tests/wpt/web-platform-tests/css/css-page/support/intrinsic-size.png b/tests/wpt/tests/css/css-page/support/intrinsic-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/intrinsic-size.png rename to tests/wpt/tests/css/css-page/support/intrinsic-size.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/css-page/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/css-page/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/css-page/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/css-page/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/css-page/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/css-page/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/pattern-tr.png b/tests/wpt/tests/css/css-page/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/pattern-tr.png rename to tests/wpt/tests/css/css-page/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/square-purple.png b/tests/wpt/tests/css/css-page/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/square-purple.png rename to tests/wpt/tests/css/css-page/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/square-teal.png b/tests/wpt/tests/css/css-page/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/square-teal.png rename to tests/wpt/tests/css/css-page/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/square-white.png b/tests/wpt/tests/css/css-page/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/square-white.png rename to tests/wpt/tests/css/css-page/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/swatch-blue.png b/tests/wpt/tests/css/css-page/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/swatch-blue.png rename to tests/wpt/tests/css/css-page/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/swatch-green.png b/tests/wpt/tests/css/css-page/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/swatch-green.png rename to tests/wpt/tests/css/css-page/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/swatch-lime.png b/tests/wpt/tests/css/css-page/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/swatch-lime.png rename to tests/wpt/tests/css/css-page/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/swatch-orange.png b/tests/wpt/tests/css/css-page/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/swatch-orange.png rename to tests/wpt/tests/css/css-page/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/swatch-red.png b/tests/wpt/tests/css/css-page/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/swatch-red.png rename to tests/wpt/tests/css/css-page/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/swatch-white.png b/tests/wpt/tests/css/css-page/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/swatch-white.png rename to tests/wpt/tests/css/css-page/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/swatch-yellow.png b/tests/wpt/tests/css/css-page/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/swatch-yellow.png rename to tests/wpt/tests/css/css-page/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/test-bl.png b/tests/wpt/tests/css/css-page/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/test-bl.png rename to tests/wpt/tests/css/css-page/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/test-br.png b/tests/wpt/tests/css/css-page/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/test-br.png rename to tests/wpt/tests/css/css-page/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/test-outer.png b/tests/wpt/tests/css/css-page/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/test-outer.png rename to tests/wpt/tests/css/css-page/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/test-tl.png b/tests/wpt/tests/css/css-page/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/test-tl.png rename to tests/wpt/tests/css/css-page/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/css-page/support/test-tr.png b/tests/wpt/tests/css/css-page/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-page/support/test-tr.png rename to tests/wpt/tests/css/css-page/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/META.yml b/tests/wpt/tests/css/css-paint-api/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/META.yml rename to tests/wpt/tests/css/css-paint-api/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/background-image-alpha-ref.html b/tests/wpt/tests/css/css-paint-api/background-image-alpha-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/background-image-alpha-ref.html rename to tests/wpt/tests/css/css-paint-api/background-image-alpha-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/background-image-alpha.https.html b/tests/wpt/tests/css/css-paint-api/background-image-alpha.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/background-image-alpha.https.html rename to tests/wpt/tests/css/css-paint-api/background-image-alpha.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/background-image-multiple-ref.html b/tests/wpt/tests/css/css-paint-api/background-image-multiple-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/background-image-multiple-ref.html rename to tests/wpt/tests/css/css-paint-api/background-image-multiple-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/background-image-multiple.https.html b/tests/wpt/tests/css/css-paint-api/background-image-multiple.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/background-image-multiple.https.html rename to tests/wpt/tests/css/css-paint-api/background-image-multiple.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/background-image-tiled-ref.html b/tests/wpt/tests/css/css-paint-api/background-image-tiled-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/background-image-tiled-ref.html rename to tests/wpt/tests/css/css-paint-api/background-image-tiled-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/background-image-tiled.https.html b/tests/wpt/tests/css/css-paint-api/background-image-tiled.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/background-image-tiled.https.html rename to tests/wpt/tests/css/css-paint-api/background-image-tiled.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/background-repeat-x-ref.html b/tests/wpt/tests/css/css-paint-api/background-repeat-x-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/background-repeat-x-ref.html rename to tests/wpt/tests/css/css-paint-api/background-repeat-x-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/background-repeat-x.https.html b/tests/wpt/tests/css/css-paint-api/background-repeat-x.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/background-repeat-x.https.html rename to tests/wpt/tests/css/css-paint-api/background-repeat-x.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/color-custom-property-animation-ref.html b/tests/wpt/tests/css/css-paint-api/color-custom-property-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/color-custom-property-animation-ref.html rename to tests/wpt/tests/css/css-paint-api/color-custom-property-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/color-custom-property-animation.https.html b/tests/wpt/tests/css/css-paint-api/color-custom-property-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/color-custom-property-animation.https.html rename to tests/wpt/tests/css/css-paint-api/color-custom-property-animation.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/column-count-crash.https.html b/tests/wpt/tests/css/css-paint-api/column-count-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/column-count-crash.https.html rename to tests/wpt/tests/css/css-paint-api/column-count-crash.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/custom-property-animation-on-main-thread.https.html b/tests/wpt/tests/css/css-paint-api/custom-property-animation-on-main-thread.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/custom-property-animation-on-main-thread.https.html rename to tests/wpt/tests/css/css-paint-api/custom-property-animation-on-main-thread.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/dynamic-import-ref.html b/tests/wpt/tests/css/css-paint-api/dynamic-import-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/dynamic-import-ref.html rename to tests/wpt/tests/css/css-paint-api/dynamic-import-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/dynamic-import.https.html b/tests/wpt/tests/css/css-paint-api/dynamic-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/dynamic-import.https.html rename to tests/wpt/tests/css/css-paint-api/dynamic-import.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-001-ref.html b/tests/wpt/tests/css/css-paint-api/geometry-background-image-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-001-ref.html rename to tests/wpt/tests/css/css-paint-api/geometry-background-image-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-001.https.html b/tests/wpt/tests/css/css-paint-api/geometry-background-image-001.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-001.https.html rename to tests/wpt/tests/css/css-paint-api/geometry-background-image-001.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-002-ref.html b/tests/wpt/tests/css/css-paint-api/geometry-background-image-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-002-ref.html rename to tests/wpt/tests/css/css-paint-api/geometry-background-image-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-002.https.html b/tests/wpt/tests/css/css-paint-api/geometry-background-image-002.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-002.https.html rename to tests/wpt/tests/css/css-paint-api/geometry-background-image-002.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-tiled-001-ref.html b/tests/wpt/tests/css/css-paint-api/geometry-background-image-tiled-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-tiled-001-ref.html rename to tests/wpt/tests/css/css-paint-api/geometry-background-image-tiled-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-tiled-001.https.html b/tests/wpt/tests/css/css-paint-api/geometry-background-image-tiled-001.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-tiled-001.https.html rename to tests/wpt/tests/css/css-paint-api/geometry-background-image-tiled-001.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-tiled-002-ref.html b/tests/wpt/tests/css/css-paint-api/geometry-background-image-tiled-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-tiled-002-ref.html rename to tests/wpt/tests/css/css-paint-api/geometry-background-image-tiled-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-tiled-002.https.html b/tests/wpt/tests/css/css-paint-api/geometry-background-image-tiled-002.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-tiled-002.https.html rename to tests/wpt/tests/css/css-paint-api/geometry-background-image-tiled-002.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-tiled-003-ref.html b/tests/wpt/tests/css/css-paint-api/geometry-background-image-tiled-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-tiled-003-ref.html rename to tests/wpt/tests/css/css-paint-api/geometry-background-image-tiled-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-tiled-003.https.html b/tests/wpt/tests/css/css-paint-api/geometry-background-image-tiled-003.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-background-image-tiled-003.https.html rename to tests/wpt/tests/css/css-paint-api/geometry-background-image-tiled-003.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-001-ref.html b/tests/wpt/tests/css/css-paint-api/geometry-border-image-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-001-ref.html rename to tests/wpt/tests/css/css-paint-api/geometry-border-image-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-001.https.html b/tests/wpt/tests/css/css-paint-api/geometry-border-image-001.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-001.https.html rename to tests/wpt/tests/css/css-paint-api/geometry-border-image-001.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-002-ref.html b/tests/wpt/tests/css/css-paint-api/geometry-border-image-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-002-ref.html rename to tests/wpt/tests/css/css-paint-api/geometry-border-image-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-002.https.html b/tests/wpt/tests/css/css-paint-api/geometry-border-image-002.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-002.https.html rename to tests/wpt/tests/css/css-paint-api/geometry-border-image-002.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-003-ref.html b/tests/wpt/tests/css/css-paint-api/geometry-border-image-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-003-ref.html rename to tests/wpt/tests/css/css-paint-api/geometry-border-image-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-003.https.html b/tests/wpt/tests/css/css-paint-api/geometry-border-image-003.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-003.https.html rename to tests/wpt/tests/css/css-paint-api/geometry-border-image-003.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-004-ref.html b/tests/wpt/tests/css/css-paint-api/geometry-border-image-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-004-ref.html rename to tests/wpt/tests/css/css-paint-api/geometry-border-image-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-004.https.html b/tests/wpt/tests/css/css-paint-api/geometry-border-image-004.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-004.https.html rename to tests/wpt/tests/css/css-paint-api/geometry-border-image-004.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-005-ref.html b/tests/wpt/tests/css/css-paint-api/geometry-border-image-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-005-ref.html rename to tests/wpt/tests/css/css-paint-api/geometry-border-image-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-005.https.html b/tests/wpt/tests/css/css-paint-api/geometry-border-image-005.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-border-image-005.https.html rename to tests/wpt/tests/css/css-paint-api/geometry-border-image-005.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-with-float-size-ref.html b/tests/wpt/tests/css/css-paint-api/geometry-with-float-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-with-float-size-ref.html rename to tests/wpt/tests/css/css-paint-api/geometry-with-float-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/geometry-with-float-size.https.html b/tests/wpt/tests/css/css-paint-api/geometry-with-float-size.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/geometry-with-float-size.https.html rename to tests/wpt/tests/css/css-paint-api/geometry-with-float-size.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/hidpi/canvas-transform-ref.html b/tests/wpt/tests/css/css-paint-api/hidpi/canvas-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/hidpi/canvas-transform-ref.html rename to tests/wpt/tests/css/css-paint-api/hidpi/canvas-transform-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/hidpi/canvas-transform.https.html b/tests/wpt/tests/css/css-paint-api/hidpi/canvas-transform.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/hidpi/canvas-transform.https.html rename to tests/wpt/tests/css/css-paint-api/hidpi/canvas-transform.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/hidpi/device-pixel-ratio-ref.html b/tests/wpt/tests/css/css-paint-api/hidpi/device-pixel-ratio-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/hidpi/device-pixel-ratio-ref.html rename to tests/wpt/tests/css/css-paint-api/hidpi/device-pixel-ratio-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/hidpi/device-pixel-ratio.https.html b/tests/wpt/tests/css/css-paint-api/hidpi/device-pixel-ratio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/hidpi/device-pixel-ratio.https.html rename to tests/wpt/tests/css/css-paint-api/hidpi/device-pixel-ratio.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/idlharness.html b/tests/wpt/tests/css/css-paint-api/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/idlharness.html rename to tests/wpt/tests/css/css-paint-api/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/invalid-image-constructor-error-ref.html b/tests/wpt/tests/css/css-paint-api/invalid-image-constructor-error-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/invalid-image-constructor-error-ref.html rename to tests/wpt/tests/css/css-paint-api/invalid-image-constructor-error-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/invalid-image-constructor-error.https.html b/tests/wpt/tests/css/css-paint-api/invalid-image-constructor-error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/invalid-image-constructor-error.https.html rename to tests/wpt/tests/css/css-paint-api/invalid-image-constructor-error.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/invalid-image-paint-error-ref.html b/tests/wpt/tests/css/css-paint-api/invalid-image-paint-error-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/invalid-image-paint-error-ref.html rename to tests/wpt/tests/css/css-paint-api/invalid-image-paint-error-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/invalid-image-paint-error.https.html b/tests/wpt/tests/css/css-paint-api/invalid-image-paint-error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/invalid-image-paint-error.https.html rename to tests/wpt/tests/css/css-paint-api/invalid-image-paint-error.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/invalid-image-pending-script-ref.html b/tests/wpt/tests/css/css-paint-api/invalid-image-pending-script-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/invalid-image-pending-script-ref.html rename to tests/wpt/tests/css/css-paint-api/invalid-image-pending-script-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/invalid-image-pending-script.https.html b/tests/wpt/tests/css/css-paint-api/invalid-image-pending-script.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/invalid-image-pending-script.https.html rename to tests/wpt/tests/css/css-paint-api/invalid-image-pending-script.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/no-op-animation-ref.html b/tests/wpt/tests/css/css-paint-api/no-op-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/no-op-animation-ref.html rename to tests/wpt/tests/css/css-paint-api/no-op-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/no-op-animation.https.html b/tests/wpt/tests/css/css-paint-api/no-op-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/no-op-animation.https.html rename to tests/wpt/tests/css/css-paint-api/no-op-animation.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/non-registered-property-value.https.html b/tests/wpt/tests/css/css-paint-api/non-registered-property-value.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/non-registered-property-value.https.html rename to tests/wpt/tests/css/css-paint-api/non-registered-property-value.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/one-custom-property-animation-half-opaque-ref.html b/tests/wpt/tests/css/css-paint-api/one-custom-property-animation-half-opaque-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/one-custom-property-animation-half-opaque-ref.html rename to tests/wpt/tests/css/css-paint-api/one-custom-property-animation-half-opaque-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/one-custom-property-animation-half-opaque.https.html b/tests/wpt/tests/css/css-paint-api/one-custom-property-animation-half-opaque.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/one-custom-property-animation-half-opaque.https.html rename to tests/wpt/tests/css/css-paint-api/one-custom-property-animation-half-opaque.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/one-custom-property-animation-ref.html b/tests/wpt/tests/css/css-paint-api/one-custom-property-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/one-custom-property-animation-ref.html rename to tests/wpt/tests/css/css-paint-api/one-custom-property-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/one-custom-property-animation.https.html b/tests/wpt/tests/css/css-paint-api/one-custom-property-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/one-custom-property-animation.https.html rename to tests/wpt/tests/css/css-paint-api/one-custom-property-animation.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/overdraw-ref.html b/tests/wpt/tests/css/css-paint-api/overdraw-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/overdraw-ref.html rename to tests/wpt/tests/css/css-paint-api/overdraw-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/overdraw.https.html b/tests/wpt/tests/css/css-paint-api/overdraw.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/overdraw.https.html rename to tests/wpt/tests/css/css-paint-api/overdraw.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint-arguments-ref.html b/tests/wpt/tests/css/css-paint-api/paint-arguments-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint-arguments-ref.html rename to tests/wpt/tests/css/css-paint-api/paint-arguments-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint-arguments.https.html b/tests/wpt/tests/css/css-paint-api/paint-arguments.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint-arguments.https.html rename to tests/wpt/tests/css/css-paint-api/paint-arguments.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint-function-arguments-ref.html b/tests/wpt/tests/css/css-paint-api/paint-function-arguments-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint-function-arguments-ref.html rename to tests/wpt/tests/css/css-paint-api/paint-function-arguments-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint-function-arguments-var.https.html b/tests/wpt/tests/css/css-paint-api/paint-function-arguments-var.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint-function-arguments-var.https.html rename to tests/wpt/tests/css/css-paint-api/paint-function-arguments-var.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint-function-arguments.https.html b/tests/wpt/tests/css/css-paint-api/paint-function-arguments.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint-function-arguments.https.html rename to tests/wpt/tests/css/css-paint-api/paint-function-arguments.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint-function-this-value.https.html b/tests/wpt/tests/css/css-paint-api/paint-function-this-value.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint-function-this-value.https.html rename to tests/wpt/tests/css/css-paint-api/paint-function-this-value.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-canvasFilter-ref.html b/tests/wpt/tests/css/css-paint-api/paint2d-canvasFilter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-canvasFilter-ref.html rename to tests/wpt/tests/css/css-paint-api/paint2d-canvasFilter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-canvasFilter.tentative.https.html b/tests/wpt/tests/css/css-paint-api/paint2d-canvasFilter.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-canvasFilter.tentative.https.html rename to tests/wpt/tests/css/css-paint-api/paint2d-canvasFilter.tentative.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-composite-ref.html b/tests/wpt/tests/css/css-paint-api/paint2d-composite-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-composite-ref.html rename to tests/wpt/tests/css/css-paint-api/paint2d-composite-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-composite.https.html b/tests/wpt/tests/css/css-paint-api/paint2d-composite.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-composite.https.html rename to tests/wpt/tests/css/css-paint-api/paint2d-composite.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-conicGradient-ref.html b/tests/wpt/tests/css/css-paint-api/paint2d-conicGradient-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-conicGradient-ref.html rename to tests/wpt/tests/css/css-paint-api/paint2d-conicGradient-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-conicGradient.https.html b/tests/wpt/tests/css/css-paint-api/paint2d-conicGradient.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-conicGradient.https.html rename to tests/wpt/tests/css/css-paint-api/paint2d-conicGradient.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-filter-ref.html b/tests/wpt/tests/css/css-paint-api/paint2d-filter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-filter-ref.html rename to tests/wpt/tests/css/css-paint-api/paint2d-filter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-filter.https.html b/tests/wpt/tests/css/css-paint-api/paint2d-filter.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-filter.https.html rename to tests/wpt/tests/css/css-paint-api/paint2d-filter.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-gradient-ref.html b/tests/wpt/tests/css/css-paint-api/paint2d-gradient-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-gradient-ref.html rename to tests/wpt/tests/css/css-paint-api/paint2d-gradient-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-gradient.https.html b/tests/wpt/tests/css/css-paint-api/paint2d-gradient.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-gradient.https.html rename to tests/wpt/tests/css/css-paint-api/paint2d-gradient.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-image-ref.html b/tests/wpt/tests/css/css-paint-api/paint2d-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-image-ref.html rename to tests/wpt/tests/css/css-paint-api/paint2d-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-image.https.html b/tests/wpt/tests/css/css-paint-api/paint2d-image.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-image.https.html rename to tests/wpt/tests/css/css-paint-api/paint2d-image.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-paths-ref.html b/tests/wpt/tests/css/css-paint-api/paint2d-paths-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-paths-ref.html rename to tests/wpt/tests/css/css-paint-api/paint2d-paths-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-paths.https.html b/tests/wpt/tests/css/css-paint-api/paint2d-paths.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-paths.https.html rename to tests/wpt/tests/css/css-paint-api/paint2d-paths.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-rects-ref.html b/tests/wpt/tests/css/css-paint-api/paint2d-rects-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-rects-ref.html rename to tests/wpt/tests/css/css-paint-api/paint2d-rects-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-rects.https.html b/tests/wpt/tests/css/css-paint-api/paint2d-rects.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-rects.https.html rename to tests/wpt/tests/css/css-paint-api/paint2d-rects.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-reset-ref.html b/tests/wpt/tests/css/css-paint-api/paint2d-reset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-reset-ref.html rename to tests/wpt/tests/css/css-paint-api/paint2d-reset-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-reset.https.html b/tests/wpt/tests/css/css-paint-api/paint2d-reset.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-reset.https.html rename to tests/wpt/tests/css/css-paint-api/paint2d-reset.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-roundRect-ref.html b/tests/wpt/tests/css/css-paint-api/paint2d-roundRect-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-roundRect-ref.html rename to tests/wpt/tests/css/css-paint-api/paint2d-roundRect-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-roundRect.https.html b/tests/wpt/tests/css/css-paint-api/paint2d-roundRect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-roundRect.https.html rename to tests/wpt/tests/css/css-paint-api/paint2d-roundRect.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-shadows-ref.html b/tests/wpt/tests/css/css-paint-api/paint2d-shadows-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-shadows-ref.html rename to tests/wpt/tests/css/css-paint-api/paint2d-shadows-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-shadows.https.html b/tests/wpt/tests/css/css-paint-api/paint2d-shadows.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-shadows.https.html rename to tests/wpt/tests/css/css-paint-api/paint2d-shadows.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-transform-ref.html b/tests/wpt/tests/css/css-paint-api/paint2d-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-transform-ref.html rename to tests/wpt/tests/css/css-paint-api/paint2d-transform-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/paint2d-transform.https.html b/tests/wpt/tests/css/css-paint-api/paint2d-transform.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/paint2d-transform.https.html rename to tests/wpt/tests/css/css-paint-api/paint2d-transform.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-001.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-001.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-001.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-001.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-002.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-002.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-002.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-002.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-003.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-003.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-003.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-003.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-004.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-004.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-004.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-004.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-005.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-005.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-005.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-005.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-006.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-006.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-006.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-006.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-007.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-007.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-007.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-007.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-008.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-008.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-008.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-008.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-009.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-009.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-009.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-009.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-010.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-010.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-010.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-010.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-011.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-011.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-011.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-011.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-012.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-012.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-012.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-012.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-013.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-013.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-013.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-013.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-014.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-014.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-014.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-014.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-015.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-015.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-015.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-015.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-016.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-016.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-016.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-016.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-017.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-017.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-017.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-017.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-018-ref.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-018-ref.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-018.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-018.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-018.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-018.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-019.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-019.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-019.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-019.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-020.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-020.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-020.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-020.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-021.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-021.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-021.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-021.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-022.https.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-022.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-022.https.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-022.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-ref.html b/tests/wpt/tests/css/css-paint-api/parse-input-arguments-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parse-input-arguments-ref.html rename to tests/wpt/tests/css/css-paint-api/parse-input-arguments-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/parsing/paint-function-valid.https.html b/tests/wpt/tests/css/css-paint-api/parsing/paint-function-valid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/parsing/paint-function-valid.https.html rename to tests/wpt/tests/css/css-paint-api/parsing/paint-function-valid.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-001.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-interpolation-001.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-001.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-interpolation-001.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-002.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-interpolation-002.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-002.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-interpolation-002.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-003.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-interpolation-003.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-003.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-interpolation-003.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-004.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-interpolation-004.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-004.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-interpolation-004.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-005.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-interpolation-005.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-005.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-interpolation-005.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-006.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-interpolation-006.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-006.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-interpolation-006.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-007.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-interpolation-007.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-007.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-interpolation-007.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-008.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-interpolation-008.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-008.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-interpolation-008.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-009.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-interpolation-009.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-009.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-interpolation-009.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-010.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-interpolation-010.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-interpolation-010.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-interpolation-010.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-invalidation-001.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-invalidation-001.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-invalidation-001.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-invalidation-001.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-invalidation-002.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-invalidation-002.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-invalidation-002.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-invalidation-002.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-stylemap.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-stylemap.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-stylemap.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-stylemap.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-001.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-001.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-001.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-001.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-002.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-002.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-002.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-002.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-003.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-003.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-003.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-003.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-004.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-004.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-004.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-004.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-005.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-005.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-005.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-005.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-006.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-006.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-006.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-006.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-007.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-007.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-007.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-007.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-008.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-008.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-008.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-008.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-009.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-009.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-009.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-009.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-010.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-010.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-010.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-010.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-011.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-011.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-011.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-011.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-012.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-012.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-012.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-012.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-013.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-013.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-013.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-013.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-014.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-014.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-014.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-014.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-015.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-015.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-015.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-015.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-016.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-016.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-016.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-016.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-017.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-017.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-017.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-017.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-018.https.html b/tests/wpt/tests/css/css-paint-api/registered-property-value-018.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/registered-property-value-018.https.html rename to tests/wpt/tests/css/css-paint-api/registered-property-value-018.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/resources/html5.png b/tests/wpt/tests/css/css-paint-api/resources/html5.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/resources/html5.png rename to tests/wpt/tests/css/css-paint-api/resources/html5.png diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/resources/imported-module.mjs b/tests/wpt/tests/css/css-paint-api/resources/imported-module.mjs similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/resources/imported-module.mjs rename to tests/wpt/tests/css/css-paint-api/resources/imported-module.mjs diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/resources/utils.js b/tests/wpt/tests/css/css-paint-api/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/resources/utils.js rename to tests/wpt/tests/css/css-paint-api/resources/utils.js diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/roundrect-ref.html b/tests/wpt/tests/css/css-paint-api/roundrect-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/roundrect-ref.html rename to tests/wpt/tests/css/css-paint-api/roundrect-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/roundrect.https.html b/tests/wpt/tests/css/css-paint-api/roundrect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/roundrect.https.html rename to tests/wpt/tests/css/css-paint-api/roundrect.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/setTransform-001.https.html b/tests/wpt/tests/css/css-paint-api/setTransform-001.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/setTransform-001.https.html rename to tests/wpt/tests/css/css-paint-api/setTransform-001.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/setTransform-002.https.html b/tests/wpt/tests/css/css-paint-api/setTransform-002.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/setTransform-002.https.html rename to tests/wpt/tests/css/css-paint-api/setTransform-002.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/setTransform-003.https.html b/tests/wpt/tests/css/css-paint-api/setTransform-003.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/setTransform-003.https.html rename to tests/wpt/tests/css/css-paint-api/setTransform-003.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/setTransform-004.https.html b/tests/wpt/tests/css/css-paint-api/setTransform-004.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/setTransform-004.https.html rename to tests/wpt/tests/css/css-paint-api/setTransform-004.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/setTransform-ref.html b/tests/wpt/tests/css/css-paint-api/setTransform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/setTransform-ref.html rename to tests/wpt/tests/css/css-paint-api/setTransform-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/style-background-image-ref.html b/tests/wpt/tests/css/css-paint-api/style-background-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/style-background-image-ref.html rename to tests/wpt/tests/css/css-paint-api/style-background-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/style-background-image.https.html b/tests/wpt/tests/css/css-paint-api/style-background-image.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/style-background-image.https.html rename to tests/wpt/tests/css/css-paint-api/style-background-image.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/style-before-pseudo-ref.html b/tests/wpt/tests/css/css-paint-api/style-before-pseudo-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/style-before-pseudo-ref.html rename to tests/wpt/tests/css/css-paint-api/style-before-pseudo-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/style-before-pseudo.https.html b/tests/wpt/tests/css/css-paint-api/style-before-pseudo.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/style-before-pseudo.https.html rename to tests/wpt/tests/css/css-paint-api/style-before-pseudo.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/style-first-letter-pseudo-ref.html b/tests/wpt/tests/css/css-paint-api/style-first-letter-pseudo-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/style-first-letter-pseudo-ref.html rename to tests/wpt/tests/css/css-paint-api/style-first-letter-pseudo-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/style-first-letter-pseudo.https.html b/tests/wpt/tests/css/css-paint-api/style-first-letter-pseudo.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/style-first-letter-pseudo.https.html rename to tests/wpt/tests/css/css-paint-api/style-first-letter-pseudo.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/top-level-await-ref.html b/tests/wpt/tests/css/css-paint-api/top-level-await-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/top-level-await-ref.html rename to tests/wpt/tests/css/css-paint-api/top-level-await-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/top-level-await.https.html b/tests/wpt/tests/css/css-paint-api/top-level-await.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/top-level-await.https.html rename to tests/wpt/tests/css/css-paint-api/top-level-await.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/two-custom-property-animation-ref.html b/tests/wpt/tests/css/css-paint-api/two-custom-property-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/two-custom-property-animation-ref.html rename to tests/wpt/tests/css/css-paint-api/two-custom-property-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/two-custom-property-animation.https.html b/tests/wpt/tests/css/css-paint-api/two-custom-property-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/two-custom-property-animation.https.html rename to tests/wpt/tests/css/css-paint-api/two-custom-property-animation.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/two-element-custom-property-animation-ref.html b/tests/wpt/tests/css/css-paint-api/two-element-custom-property-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/two-element-custom-property-animation-ref.html rename to tests/wpt/tests/css/css-paint-api/two-element-custom-property-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/two-element-custom-property-animation.https.html b/tests/wpt/tests/css/css-paint-api/two-element-custom-property-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/two-element-custom-property-animation.https.html rename to tests/wpt/tests/css/css-paint-api/two-element-custom-property-animation.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/two-element-one-custom-property-animation-ref.html b/tests/wpt/tests/css/css-paint-api/two-element-one-custom-property-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/two-element-one-custom-property-animation-ref.html rename to tests/wpt/tests/css/css-paint-api/two-element-one-custom-property-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/two-element-one-custom-property-animation.https.html b/tests/wpt/tests/css/css-paint-api/two-element-one-custom-property-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/two-element-one-custom-property-animation.https.html rename to tests/wpt/tests/css/css-paint-api/two-element-one-custom-property-animation.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/valid-image-after-load-ref.html b/tests/wpt/tests/css/css-paint-api/valid-image-after-load-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/valid-image-after-load-ref.html rename to tests/wpt/tests/css/css-paint-api/valid-image-after-load-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/valid-image-after-load.https.html b/tests/wpt/tests/css/css-paint-api/valid-image-after-load.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/valid-image-after-load.https.html rename to tests/wpt/tests/css/css-paint-api/valid-image-after-load.https.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/valid-image-before-load-ref.html b/tests/wpt/tests/css/css-paint-api/valid-image-before-load-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/valid-image-before-load-ref.html rename to tests/wpt/tests/css/css-paint-api/valid-image-before-load-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/valid-image-before-load.https.html b/tests/wpt/tests/css/css-paint-api/valid-image-before-load.https.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-paint-api/valid-image-before-load.https.html rename to tests/wpt/tests/css/css-paint-api/valid-image-before-load.https.html diff --git a/tests/wpt/web-platform-tests/css/css-parser-api/META.yml b/tests/wpt/tests/css/css-parser-api/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-parser-api/META.yml rename to tests/wpt/tests/css/css-parser-api/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-parser-api/idlharness.html b/tests/wpt/tests/css/css-parser-api/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-parser-api/idlharness.html rename to tests/wpt/tests/css/css-parser-api/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-position/META.yml b/tests/wpt/tests/css/css-position/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/META.yml rename to tests/wpt/tests/css/css-position/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-position/animations/bottom-composition.html b/tests/wpt/tests/css/css-position/animations/bottom-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/animations/bottom-composition.html rename to tests/wpt/tests/css/css-position/animations/bottom-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-position/animations/bottom-interpolation.html b/tests/wpt/tests/css/css-position/animations/bottom-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/animations/bottom-interpolation.html rename to tests/wpt/tests/css/css-position/animations/bottom-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-position/animations/left-composition.html b/tests/wpt/tests/css/css-position/animations/left-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/animations/left-composition.html rename to tests/wpt/tests/css/css-position/animations/left-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-position/animations/left-interpolation.html b/tests/wpt/tests/css/css-position/animations/left-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/animations/left-interpolation.html rename to tests/wpt/tests/css/css-position/animations/left-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-position/animations/position-interpolation.html b/tests/wpt/tests/css/css-position/animations/position-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/animations/position-interpolation.html rename to tests/wpt/tests/css/css-position/animations/position-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-position/animations/right-composition.html b/tests/wpt/tests/css/css-position/animations/right-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/animations/right-composition.html rename to tests/wpt/tests/css/css-position/animations/right-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-position/animations/right-interpolation.html b/tests/wpt/tests/css/css-position/animations/right-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/animations/right-interpolation.html rename to tests/wpt/tests/css/css-position/animations/right-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-position/animations/top-composition.html b/tests/wpt/tests/css/css-position/animations/top-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/animations/top-composition.html rename to tests/wpt/tests/css/css-position/animations/top-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-position/animations/top-interpolation.html b/tests/wpt/tests/css/css-position/animations/top-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/animations/top-interpolation.html rename to tests/wpt/tests/css/css-position/animations/top-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-position/change-insets-inside-strict-containment-nested.html b/tests/wpt/tests/css/css-position/change-insets-inside-strict-containment-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/change-insets-inside-strict-containment-nested.html rename to tests/wpt/tests/css/css-position/change-insets-inside-strict-containment-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-position/containing-block-change-button-ref.html b/tests/wpt/tests/css/css-position/containing-block-change-button-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/containing-block-change-button-ref.html rename to tests/wpt/tests/css/css-position/containing-block-change-button-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/containing-block-change-button.html b/tests/wpt/tests/css/css-position/containing-block-change-button.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/containing-block-change-button.html rename to tests/wpt/tests/css/css-position/containing-block-change-button.html diff --git a/tests/wpt/web-platform-tests/css/css-position/containing-block-change-scrollframe-ref.html b/tests/wpt/tests/css/css-position/containing-block-change-scrollframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/containing-block-change-scrollframe-ref.html rename to tests/wpt/tests/css/css-position/containing-block-change-scrollframe-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/containing-block-change-scrollframe.html b/tests/wpt/tests/css/css-position/containing-block-change-scrollframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/containing-block-change-scrollframe.html rename to tests/wpt/tests/css/css-position/containing-block-change-scrollframe.html diff --git a/tests/wpt/web-platform-tests/css/css-position/crashtests/inline-containing-block-crash.html b/tests/wpt/tests/css/css-position/crashtests/inline-containing-block-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/crashtests/inline-containing-block-crash.html rename to tests/wpt/tests/css/css-position/crashtests/inline-containing-block-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-position/crashtests/position-absolute-crash-014.html b/tests/wpt/tests/css/css-position/crashtests/position-absolute-crash-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/crashtests/position-absolute-crash-014.html rename to tests/wpt/tests/css/css-position/crashtests/position-absolute-crash-014.html diff --git a/tests/wpt/web-platform-tests/css/css-position/crashtests/scroll-tree-parent-construction.html b/tests/wpt/tests/css/css-position/crashtests/scroll-tree-parent-construction.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/crashtests/scroll-tree-parent-construction.html rename to tests/wpt/tests/css/css-position/crashtests/scroll-tree-parent-construction.html diff --git a/tests/wpt/web-platform-tests/css/css-position/fixed-z-index-blend-ref.html b/tests/wpt/tests/css/css-position/fixed-z-index-blend-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/fixed-z-index-blend-ref.html rename to tests/wpt/tests/css/css-position/fixed-z-index-blend-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/fixed-z-index-blend.html b/tests/wpt/tests/css/css-position/fixed-z-index-blend.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/fixed-z-index-blend.html rename to tests/wpt/tests/css/css-position/fixed-z-index-blend.html diff --git a/tests/wpt/web-platform-tests/css/css-position/hypothetical-box-scroll-parent-ref.html b/tests/wpt/tests/css/css-position/hypothetical-box-scroll-parent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/hypothetical-box-scroll-parent-ref.html rename to tests/wpt/tests/css/css-position/hypothetical-box-scroll-parent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/hypothetical-box-scroll-parent.html b/tests/wpt/tests/css/css-position/hypothetical-box-scroll-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/hypothetical-box-scroll-parent.html rename to tests/wpt/tests/css/css-position/hypothetical-box-scroll-parent.html diff --git a/tests/wpt/web-platform-tests/css/css-position/hypothetical-box-scroll-viewport-ref.html b/tests/wpt/tests/css/css-position/hypothetical-box-scroll-viewport-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/hypothetical-box-scroll-viewport-ref.html rename to tests/wpt/tests/css/css-position/hypothetical-box-scroll-viewport-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/hypothetical-box-scroll-viewport.html b/tests/wpt/tests/css/css-position/hypothetical-box-scroll-viewport.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/hypothetical-box-scroll-viewport.html rename to tests/wpt/tests/css/css-position/hypothetical-box-scroll-viewport.html diff --git a/tests/wpt/web-platform-tests/css/css-position/hypothetical-dynamic-change-001-ref.html b/tests/wpt/tests/css/css-position/hypothetical-dynamic-change-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/hypothetical-dynamic-change-001-ref.html rename to tests/wpt/tests/css/css-position/hypothetical-dynamic-change-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/hypothetical-dynamic-change-001.html b/tests/wpt/tests/css/css-position/hypothetical-dynamic-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/hypothetical-dynamic-change-001.html rename to tests/wpt/tests/css/css-position/hypothetical-dynamic-change-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/hypothetical-dynamic-change-002.html b/tests/wpt/tests/css/css-position/hypothetical-dynamic-change-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/hypothetical-dynamic-change-002.html rename to tests/wpt/tests/css/css-position/hypothetical-dynamic-change-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/hypothetical-dynamic-change-003.html b/tests/wpt/tests/css/css-position/hypothetical-dynamic-change-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/hypothetical-dynamic-change-003.html rename to tests/wpt/tests/css/css-position/hypothetical-dynamic-change-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/inheritance.html b/tests/wpt/tests/css/css-position/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/inheritance.html rename to tests/wpt/tests/css/css-position/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-position/invalidate-opacity-negative-z-index-ref.html b/tests/wpt/tests/css/css-position/invalidate-opacity-negative-z-index-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/invalidate-opacity-negative-z-index-ref.html rename to tests/wpt/tests/css/css-position/invalidate-opacity-negative-z-index-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/invalidate-opacity-negative-z-index.html b/tests/wpt/tests/css/css-position/invalidate-opacity-negative-z-index.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/invalidate-opacity-negative-z-index.html rename to tests/wpt/tests/css/css-position/invalidate-opacity-negative-z-index.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vlr-in-multicol-ref.html b/tests/wpt/tests/css/css-position/multicol/static-position/vlr-in-multicol-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vlr-in-multicol-ref.html rename to tests/wpt/tests/css/css-position/multicol/static-position/vlr-in-multicol-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vlr-ltr-ltr-in-multicol.html b/tests/wpt/tests/css/css-position/multicol/static-position/vlr-ltr-ltr-in-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vlr-ltr-ltr-in-multicol.html rename to tests/wpt/tests/css/css-position/multicol/static-position/vlr-ltr-ltr-in-multicol.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vlr-ltr-rtl-in-multicol.tentative.html b/tests/wpt/tests/css/css-position/multicol/static-position/vlr-ltr-rtl-in-multicol.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vlr-ltr-rtl-in-multicol.tentative.html rename to tests/wpt/tests/css/css-position/multicol/static-position/vlr-ltr-rtl-in-multicol.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vlr-rtl-ltr-in-multicol.tentative.html b/tests/wpt/tests/css/css-position/multicol/static-position/vlr-rtl-ltr-in-multicol.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vlr-rtl-ltr-in-multicol.tentative.html rename to tests/wpt/tests/css/css-position/multicol/static-position/vlr-rtl-ltr-in-multicol.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vlr-rtl-rtl-in-multicol.html b/tests/wpt/tests/css/css-position/multicol/static-position/vlr-rtl-rtl-in-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vlr-rtl-rtl-in-multicol.html rename to tests/wpt/tests/css/css-position/multicol/static-position/vlr-rtl-rtl-in-multicol.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vrl-in-multicol-ref.html b/tests/wpt/tests/css/css-position/multicol/static-position/vrl-in-multicol-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vrl-in-multicol-ref.html rename to tests/wpt/tests/css/css-position/multicol/static-position/vrl-in-multicol-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vrl-ltr-ltr-in-multicol.html b/tests/wpt/tests/css/css-position/multicol/static-position/vrl-ltr-ltr-in-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vrl-ltr-ltr-in-multicol.html rename to tests/wpt/tests/css/css-position/multicol/static-position/vrl-ltr-ltr-in-multicol.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vrl-ltr-rtl-in-multicol.tentative.html b/tests/wpt/tests/css/css-position/multicol/static-position/vrl-ltr-rtl-in-multicol.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vrl-ltr-rtl-in-multicol.tentative.html rename to tests/wpt/tests/css/css-position/multicol/static-position/vrl-ltr-rtl-in-multicol.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vrl-rtl-ltr-in-multicol.tentative.html b/tests/wpt/tests/css/css-position/multicol/static-position/vrl-rtl-ltr-in-multicol.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vrl-rtl-ltr-in-multicol.tentative.html rename to tests/wpt/tests/css/css-position/multicol/static-position/vrl-rtl-ltr-in-multicol.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vrl-rtl-rtl-in-multicol.html b/tests/wpt/tests/css/css-position/multicol/static-position/vrl-rtl-rtl-in-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/static-position/vrl-rtl-rtl-in-multicol.html rename to tests/wpt/tests/css/css-position/multicol/static-position/vrl-rtl-rtl-in-multicol.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/vlr-in-multicols-ref.html b/tests/wpt/tests/css/css-position/multicol/vlr-in-multicols-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/vlr-in-multicols-ref.html rename to tests/wpt/tests/css/css-position/multicol/vlr-in-multicols-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/vlr-ltr-ltr-in-multicols.html b/tests/wpt/tests/css/css-position/multicol/vlr-ltr-ltr-in-multicols.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/vlr-ltr-ltr-in-multicols.html rename to tests/wpt/tests/css/css-position/multicol/vlr-ltr-ltr-in-multicols.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/vlr-ltr-rtl-in-multicols.tentative.html b/tests/wpt/tests/css/css-position/multicol/vlr-ltr-rtl-in-multicols.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/vlr-ltr-rtl-in-multicols.tentative.html rename to tests/wpt/tests/css/css-position/multicol/vlr-ltr-rtl-in-multicols.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/vlr-rtl-ltr-in-multicols.tentative.html b/tests/wpt/tests/css/css-position/multicol/vlr-rtl-ltr-in-multicols.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/vlr-rtl-ltr-in-multicols.tentative.html rename to tests/wpt/tests/css/css-position/multicol/vlr-rtl-ltr-in-multicols.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/vlr-rtl-rtl-in-multicols.html b/tests/wpt/tests/css/css-position/multicol/vlr-rtl-rtl-in-multicols.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/vlr-rtl-rtl-in-multicols.html rename to tests/wpt/tests/css/css-position/multicol/vlr-rtl-rtl-in-multicols.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/vrl-in-multicols-ref.html b/tests/wpt/tests/css/css-position/multicol/vrl-in-multicols-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/vrl-in-multicols-ref.html rename to tests/wpt/tests/css/css-position/multicol/vrl-in-multicols-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/vrl-ltr-ltr-in-multicols.html b/tests/wpt/tests/css/css-position/multicol/vrl-ltr-ltr-in-multicols.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/vrl-ltr-ltr-in-multicols.html rename to tests/wpt/tests/css/css-position/multicol/vrl-ltr-ltr-in-multicols.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/vrl-ltr-rtl-in-multicols.tentative.html b/tests/wpt/tests/css/css-position/multicol/vrl-ltr-rtl-in-multicols.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/vrl-ltr-rtl-in-multicols.tentative.html rename to tests/wpt/tests/css/css-position/multicol/vrl-ltr-rtl-in-multicols.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/vrl-rtl-ltr-in-multicols.tentative.html b/tests/wpt/tests/css/css-position/multicol/vrl-rtl-ltr-in-multicols.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/vrl-rtl-ltr-in-multicols.tentative.html rename to tests/wpt/tests/css/css-position/multicol/vrl-rtl-ltr-in-multicols.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/multicol/vrl-rtl-rtl-in-multicols.html b/tests/wpt/tests/css/css-position/multicol/vrl-rtl-rtl-in-multicols.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/multicol/vrl-rtl-rtl-in-multicols.html rename to tests/wpt/tests/css/css-position/multicol/vrl-rtl-rtl-in-multicols.html diff --git a/tests/wpt/web-platform-tests/css/css-position/nested-positions-crash.html b/tests/wpt/tests/css/css-position/nested-positions-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/nested-positions-crash.html rename to tests/wpt/tests/css/css-position/nested-positions-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-position/overlay/animation/overlay-interpolation.html b/tests/wpt/tests/css/css-position/overlay/animation/overlay-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/overlay/animation/overlay-interpolation.html rename to tests/wpt/tests/css/css-position/overlay/animation/overlay-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-position/overlay/green-ref.html b/tests/wpt/tests/css/css-position/overlay/green-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/overlay/green-ref.html rename to tests/wpt/tests/css/css-position/overlay/green-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/overlay/overlay-computed.html b/tests/wpt/tests/css/css-position/overlay/overlay-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/overlay/overlay-computed.html rename to tests/wpt/tests/css/css-position/overlay/overlay-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-position/overlay/overlay-invalid.html b/tests/wpt/tests/css/css-position/overlay/overlay-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/overlay/overlay-invalid.html rename to tests/wpt/tests/css/css-position/overlay/overlay-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/overlay/overlay-popover-backdrop-crash.html b/tests/wpt/tests/css/css-position/overlay/overlay-popover-backdrop-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/overlay/overlay-popover-backdrop-crash.html rename to tests/wpt/tests/css/css-position/overlay/overlay-popover-backdrop-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-position/overlay/overlay-transition-backdrop-entry.html b/tests/wpt/tests/css/css-position/overlay/overlay-transition-backdrop-entry.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/overlay/overlay-transition-backdrop-entry.html rename to tests/wpt/tests/css/css-position/overlay/overlay-transition-backdrop-entry.html diff --git a/tests/wpt/web-platform-tests/css/css-position/overlay/overlay-transition-backdrop.html b/tests/wpt/tests/css/css-position/overlay/overlay-transition-backdrop.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/overlay/overlay-transition-backdrop.html rename to tests/wpt/tests/css/css-position/overlay/overlay-transition-backdrop.html diff --git a/tests/wpt/web-platform-tests/css/css-position/overlay/overlay-transition-finished.html b/tests/wpt/tests/css/css-position/overlay/overlay-transition-finished.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/overlay/overlay-transition-finished.html rename to tests/wpt/tests/css/css-position/overlay/overlay-transition-finished.html diff --git a/tests/wpt/web-platform-tests/css/css-position/overlay/overlay-transition-in-rendering.html b/tests/wpt/tests/css/css-position/overlay/overlay-transition-in-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/overlay/overlay-transition-in-rendering.html rename to tests/wpt/tests/css/css-position/overlay/overlay-transition-in-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-position/overlay/overlay-transition-out-rendering.html b/tests/wpt/tests/css/css-position/overlay/overlay-transition-out-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/overlay/overlay-transition-out-rendering.html rename to tests/wpt/tests/css/css-position/overlay/overlay-transition-out-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-position/overlay/overlay-transition-property.html b/tests/wpt/tests/css/css-position/overlay/overlay-transition-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/overlay/overlay-transition-property.html rename to tests/wpt/tests/css/css-position/overlay/overlay-transition-property.html diff --git a/tests/wpt/web-platform-tests/css/css-position/overlay/overlay-transition.html b/tests/wpt/tests/css/css-position/overlay/overlay-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/overlay/overlay-transition.html rename to tests/wpt/tests/css/css-position/overlay/overlay-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-position/overlay/overlay-user-agent-rules.html b/tests/wpt/tests/css/css-position/overlay/overlay-user-agent-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/overlay/overlay-user-agent-rules.html rename to tests/wpt/tests/css/css-position/overlay/overlay-user-agent-rules.html diff --git a/tests/wpt/web-platform-tests/css/css-position/overlay/overlay-valid.html b/tests/wpt/tests/css/css-position/overlay/overlay-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/overlay/overlay-valid.html rename to tests/wpt/tests/css/css-position/overlay/overlay-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/bottom-computed.html b/tests/wpt/tests/css/css-position/parsing/bottom-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/bottom-computed.html rename to tests/wpt/tests/css/css-position/parsing/bottom-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/bottom-invalid.html b/tests/wpt/tests/css/css-position/parsing/bottom-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/bottom-invalid.html rename to tests/wpt/tests/css/css-position/parsing/bottom-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/bottom-valid.html b/tests/wpt/tests/css/css-position/parsing/bottom-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/bottom-valid.html rename to tests/wpt/tests/css/css-position/parsing/bottom-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/inset-computed.html b/tests/wpt/tests/css/css-position/parsing/inset-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/inset-computed.html rename to tests/wpt/tests/css/css-position/parsing/inset-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/inset-invalid.html b/tests/wpt/tests/css/css-position/parsing/inset-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/inset-invalid.html rename to tests/wpt/tests/css/css-position/parsing/inset-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/inset-valid.html b/tests/wpt/tests/css/css-position/parsing/inset-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/inset-valid.html rename to tests/wpt/tests/css/css-position/parsing/inset-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/left-computed.html b/tests/wpt/tests/css/css-position/parsing/left-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/left-computed.html rename to tests/wpt/tests/css/css-position/parsing/left-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/left-invalid.html b/tests/wpt/tests/css/css-position/parsing/left-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/left-invalid.html rename to tests/wpt/tests/css/css-position/parsing/left-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/left-valid.html b/tests/wpt/tests/css/css-position/parsing/left-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/left-valid.html rename to tests/wpt/tests/css/css-position/parsing/left-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/position-computed.html b/tests/wpt/tests/css/css-position/parsing/position-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/position-computed.html rename to tests/wpt/tests/css/css-position/parsing/position-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/position-invalid.html b/tests/wpt/tests/css/css-position/parsing/position-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/position-invalid.html rename to tests/wpt/tests/css/css-position/parsing/position-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/position-valid.html b/tests/wpt/tests/css/css-position/parsing/position-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/position-valid.html rename to tests/wpt/tests/css/css-position/parsing/position-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/right-computed.html b/tests/wpt/tests/css/css-position/parsing/right-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/right-computed.html rename to tests/wpt/tests/css/css-position/parsing/right-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/right-invalid.html b/tests/wpt/tests/css/css-position/parsing/right-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/right-invalid.html rename to tests/wpt/tests/css/css-position/parsing/right-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/right-valid.html b/tests/wpt/tests/css/css-position/parsing/right-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/right-valid.html rename to tests/wpt/tests/css/css-position/parsing/right-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/top-computed.html b/tests/wpt/tests/css/css-position/parsing/top-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/top-computed.html rename to tests/wpt/tests/css/css-position/parsing/top-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/top-invalid.html b/tests/wpt/tests/css/css-position/parsing/top-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/top-invalid.html rename to tests/wpt/tests/css/css-position/parsing/top-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/top-valid.html b/tests/wpt/tests/css/css-position/parsing/top-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/top-valid.html rename to tests/wpt/tests/css/css-position/parsing/top-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/z-index-computed.html b/tests/wpt/tests/css/css-position/parsing/z-index-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/z-index-computed.html rename to tests/wpt/tests/css/css-position/parsing/z-index-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/z-index-invalid.html b/tests/wpt/tests/css/css-position/parsing/z-index-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/z-index-invalid.html rename to tests/wpt/tests/css/css-position/parsing/z-index-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/z-index-positioned-computed.html b/tests/wpt/tests/css/css-position/parsing/z-index-positioned-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/z-index-positioned-computed.html rename to tests/wpt/tests/css/css-position/parsing/z-index-positioned-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/z-index-valid.html b/tests/wpt/tests/css/css-position/parsing/z-index-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/parsing/z-index-valid.html rename to tests/wpt/tests/css/css-position/parsing/z-index-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-abspos-table-dynamic.html b/tests/wpt/tests/css/css-position/position-absolute-abspos-table-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-abspos-table-dynamic.html rename to tests/wpt/tests/css/css-position/position-absolute-abspos-table-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-center-001.html b/tests/wpt/tests/css/css-position/position-absolute-center-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-center-001.html rename to tests/wpt/tests/css/css-position/position-absolute-center-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-center-002.html b/tests/wpt/tests/css/css-position/position-absolute-center-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-center-002.html rename to tests/wpt/tests/css/css-position/position-absolute-center-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-center-003.html b/tests/wpt/tests/css/css-position/position-absolute-center-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-center-003.html rename to tests/wpt/tests/css/css-position/position-absolute-center-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-center-004.html b/tests/wpt/tests/css/css-position/position-absolute-center-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-center-004.html rename to tests/wpt/tests/css/css-position/position-absolute-center-004.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-center-006.html b/tests/wpt/tests/css/css-position/position-absolute-center-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-center-006.html rename to tests/wpt/tests/css/css-position/position-absolute-center-006.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-center-007.html b/tests/wpt/tests/css/css-position/position-absolute-center-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-center-007.html rename to tests/wpt/tests/css/css-position/position-absolute-center-007.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-chrome-bug-001.html b/tests/wpt/tests/css/css-position/position-absolute-chrome-bug-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-chrome-bug-001.html rename to tests/wpt/tests/css/css-position/position-absolute-chrome-bug-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-chrome-bug-002.html b/tests/wpt/tests/css/css-position/position-absolute-chrome-bug-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-chrome-bug-002.html rename to tests/wpt/tests/css/css-position/position-absolute-chrome-bug-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-container-dynamic-002.html b/tests/wpt/tests/css/css-position/position-absolute-container-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-container-dynamic-002.html rename to tests/wpt/tests/css/css-position/position-absolute-container-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-container-dynamic.html b/tests/wpt/tests/css/css-position/position-absolute-container-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-container-dynamic.html rename to tests/wpt/tests/css/css-position/position-absolute-container-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-001.html b/tests/wpt/tests/css/css-position/position-absolute-crash-chrome-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-001.html rename to tests/wpt/tests/css/css-position/position-absolute-crash-chrome-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-002.html b/tests/wpt/tests/css/css-position/position-absolute-crash-chrome-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-002.html rename to tests/wpt/tests/css/css-position/position-absolute-crash-chrome-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-003.html b/tests/wpt/tests/css/css-position/position-absolute-crash-chrome-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-003.html rename to tests/wpt/tests/css/css-position/position-absolute-crash-chrome-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-004.html b/tests/wpt/tests/css/css-position/position-absolute-crash-chrome-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-004.html rename to tests/wpt/tests/css/css-position/position-absolute-crash-chrome-004.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-005.html b/tests/wpt/tests/css/css-position/position-absolute-crash-chrome-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-005.html rename to tests/wpt/tests/css/css-position/position-absolute-crash-chrome-005.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-006.html b/tests/wpt/tests/css/css-position/position-absolute-crash-chrome-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-006.html rename to tests/wpt/tests/css/css-position/position-absolute-crash-chrome-006.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-007.html b/tests/wpt/tests/css/css-position/position-absolute-crash-chrome-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-007.html rename to tests/wpt/tests/css/css-position/position-absolute-crash-chrome-007.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-008.html b/tests/wpt/tests/css/css-position/position-absolute-crash-chrome-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-008.html rename to tests/wpt/tests/css/css-position/position-absolute-crash-chrome-008.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-009.html b/tests/wpt/tests/css/css-position/position-absolute-crash-chrome-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-009.html rename to tests/wpt/tests/css/css-position/position-absolute-crash-chrome-009.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-010.html b/tests/wpt/tests/css/css-position/position-absolute-crash-chrome-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-010.html rename to tests/wpt/tests/css/css-position/position-absolute-crash-chrome-010.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-011.html b/tests/wpt/tests/css/css-position/position-absolute-crash-chrome-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-011.html rename to tests/wpt/tests/css/css-position/position-absolute-crash-chrome-011.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-012.html b/tests/wpt/tests/css/css-position/position-absolute-crash-chrome-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-012.html rename to tests/wpt/tests/css/css-position/position-absolute-crash-chrome-012.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-013.html b/tests/wpt/tests/css/css-position/position-absolute-crash-chrome-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-crash-chrome-013.html rename to tests/wpt/tests/css/css-position/position-absolute-crash-chrome-013.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-auto-overflow.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-auto-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-auto-overflow.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-auto-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-containing-block.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-containing-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-containing-block.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-containing-block.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-list-marker.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-list-marker.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-list-marker.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-list-marker.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-overflow-001.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-overflow-001.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-overflow-002.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-overflow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-overflow-002.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-overflow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-relayout-001.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-relayout-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-relayout-001.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-relayout-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-relayout-002.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-relayout-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-relayout-002.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-relayout-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-relayout-003.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-relayout-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-relayout-003.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-relayout-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-flex.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-flex.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-flex.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-floats-001.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-floats-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-floats-001.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-floats-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-floats-002.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-floats-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-floats-002.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-floats-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-floats-003.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-floats-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-floats-003.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-floats-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-floats-004.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-floats-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-floats-004.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-floats-004.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-inline.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-inline.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-margin-001.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-margin-001.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-margin-002.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-margin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-margin-002.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-margin-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-table-cell.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-table-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-table-cell.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position-table-cell.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position.html b/tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position.html rename to tests/wpt/tests/css/css-position/position-absolute-dynamic-static-position.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-fieldset.html b/tests/wpt/tests/css/css-position/position-absolute-fieldset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-fieldset.html rename to tests/wpt/tests/css/css-position/position-absolute-fieldset.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-fit-content.html b/tests/wpt/tests/css/css-position/position-absolute-fit-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-fit-content.html rename to tests/wpt/tests/css/css-position/position-absolute-fit-content.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-iframe-print-001.sub.html b/tests/wpt/tests/css/css-position/position-absolute-iframe-print-001.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-iframe-print-001.sub.html rename to tests/wpt/tests/css/css-position/position-absolute-iframe-print-001.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-iframe-print-002.sub.html b/tests/wpt/tests/css/css-position/position-absolute-iframe-print-002.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-iframe-print-002.sub.html rename to tests/wpt/tests/css/css-position/position-absolute-iframe-print-002.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-iframe-print-ref.html b/tests/wpt/tests/css/css-position/position-absolute-iframe-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-iframe-print-ref.html rename to tests/wpt/tests/css/css-position/position-absolute-iframe-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-in-inline-001.html b/tests/wpt/tests/css/css-position/position-absolute-in-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-in-inline-001.html rename to tests/wpt/tests/css/css-position/position-absolute-in-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-in-inline-002.html b/tests/wpt/tests/css/css-position/position-absolute-in-inline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-in-inline-002.html rename to tests/wpt/tests/css/css-position/position-absolute-in-inline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-in-inline-003.html b/tests/wpt/tests/css/css-position/position-absolute-in-inline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-in-inline-003.html rename to tests/wpt/tests/css/css-position/position-absolute-in-inline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-in-inline-004.html b/tests/wpt/tests/css/css-position/position-absolute-in-inline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-in-inline-004.html rename to tests/wpt/tests/css/css-position/position-absolute-in-inline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-in-inline-crash.html b/tests/wpt/tests/css/css-position/position-absolute-in-inline-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-in-inline-crash.html rename to tests/wpt/tests/css/css-position/position-absolute-in-inline-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-large-negative-inset-ref.html b/tests/wpt/tests/css/css-position/position-absolute-large-negative-inset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-large-negative-inset-ref.html rename to tests/wpt/tests/css/css-position/position-absolute-large-negative-inset-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-large-negative-inset.html b/tests/wpt/tests/css/css-position/position-absolute-large-negative-inset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-large-negative-inset.html rename to tests/wpt/tests/css/css-position/position-absolute-large-negative-inset.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-multicol-001.html b/tests/wpt/tests/css/css-position/position-absolute-multicol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-multicol-001.html rename to tests/wpt/tests/css/css-position/position-absolute-multicol-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-padding-percentage.html b/tests/wpt/tests/css/css-position/position-absolute-padding-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-padding-percentage.html rename to tests/wpt/tests/css/css-position/position-absolute-padding-percentage.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-percentage-height.html b/tests/wpt/tests/css/css-position/position-absolute-percentage-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-percentage-height.html rename to tests/wpt/tests/css/css-position/position-absolute-percentage-height.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-replaced-intrinsic-size.tentative.html b/tests/wpt/tests/css/css-position/position-absolute-replaced-intrinsic-size.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-replaced-intrinsic-size.tentative.html rename to tests/wpt/tests/css/css-position/position-absolute-replaced-intrinsic-size.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-replaced-minmax.html b/tests/wpt/tests/css/css-position/position-absolute-replaced-minmax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-replaced-minmax.html rename to tests/wpt/tests/css/css-position/position-absolute-replaced-minmax.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-replaced-no-intrinsic-size.tentative.html b/tests/wpt/tests/css/css-position/position-absolute-replaced-no-intrinsic-size.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-replaced-no-intrinsic-size.tentative.html rename to tests/wpt/tests/css/css-position/position-absolute-replaced-no-intrinsic-size.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-replaced-with-display-table.html b/tests/wpt/tests/css/css-position/position-absolute-replaced-with-display-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-replaced-with-display-table.html rename to tests/wpt/tests/css/css-position/position-absolute-replaced-with-display-table.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-root-element-flex.html b/tests/wpt/tests/css/css-position/position-absolute-root-element-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-root-element-flex.html rename to tests/wpt/tests/css/css-position/position-absolute-root-element-flex.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-root-element-grid.html b/tests/wpt/tests/css/css-position/position-absolute-root-element-grid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-root-element-grid.html rename to tests/wpt/tests/css/css-position/position-absolute-root-element-grid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-root-element-ref.html b/tests/wpt/tests/css/css-position/position-absolute-root-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-root-element-ref.html rename to tests/wpt/tests/css/css-position/position-absolute-root-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-semi-replaced-stretch-button-ref.html b/tests/wpt/tests/css/css-position/position-absolute-semi-replaced-stretch-button-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-semi-replaced-stretch-button-ref.html rename to tests/wpt/tests/css/css-position/position-absolute-semi-replaced-stretch-button-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-semi-replaced-stretch-button.html b/tests/wpt/tests/css/css-position/position-absolute-semi-replaced-stretch-button.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-semi-replaced-stretch-button.html rename to tests/wpt/tests/css/css-position/position-absolute-semi-replaced-stretch-button.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-semi-replaced-stretch-input-ref.html b/tests/wpt/tests/css/css-position/position-absolute-semi-replaced-stretch-input-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-semi-replaced-stretch-input-ref.html rename to tests/wpt/tests/css/css-position/position-absolute-semi-replaced-stretch-input-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-semi-replaced-stretch-input.html b/tests/wpt/tests/css/css-position/position-absolute-semi-replaced-stretch-input.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-semi-replaced-stretch-input.html rename to tests/wpt/tests/css/css-position/position-absolute-semi-replaced-stretch-input.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-semi-replaced-stretch-other-ref.html b/tests/wpt/tests/css/css-position/position-absolute-semi-replaced-stretch-other-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-semi-replaced-stretch-other-ref.html rename to tests/wpt/tests/css/css-position/position-absolute-semi-replaced-stretch-other-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-semi-replaced-stretch-other.html b/tests/wpt/tests/css/css-position/position-absolute-semi-replaced-stretch-other.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-semi-replaced-stretch-other.html rename to tests/wpt/tests/css/css-position/position-absolute-semi-replaced-stretch-other.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-table-001.html b/tests/wpt/tests/css/css-position/position-absolute-table-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-table-001.html rename to tests/wpt/tests/css/css-position/position-absolute-table-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-under-non-containing-stacking-context-ref.html b/tests/wpt/tests/css/css-position/position-absolute-under-non-containing-stacking-context-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-under-non-containing-stacking-context-ref.html rename to tests/wpt/tests/css/css-position/position-absolute-under-non-containing-stacking-context-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-under-non-containing-stacking-context.html b/tests/wpt/tests/css/css-position/position-absolute-under-non-containing-stacking-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-absolute-under-non-containing-stacking-context.html rename to tests/wpt/tests/css/css-position/position-absolute-under-non-containing-stacking-context.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-change-ref.html b/tests/wpt/tests/css/css-position/position-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-change-ref.html rename to tests/wpt/tests/css/css-position/position-change-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-change.html b/tests/wpt/tests/css/css-position/position-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-change.html rename to tests/wpt/tests/css/css-position/position-change.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-at-bottom-right-on-viewport.html b/tests/wpt/tests/css/css-position/position-fixed-at-bottom-right-on-viewport.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-fixed-at-bottom-right-on-viewport.html rename to tests/wpt/tests/css/css-position/position-fixed-at-bottom-right-on-viewport.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-dynamic-transformed-sibling-ref.html b/tests/wpt/tests/css/css-position/position-fixed-dynamic-transformed-sibling-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-fixed-dynamic-transformed-sibling-ref.html rename to tests/wpt/tests/css/css-position/position-fixed-dynamic-transformed-sibling-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-dynamic-transformed-sibling.html b/tests/wpt/tests/css/css-position/position-fixed-dynamic-transformed-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-fixed-dynamic-transformed-sibling.html rename to tests/wpt/tests/css/css-position/position-fixed-dynamic-transformed-sibling.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-overflow-print-ref.html b/tests/wpt/tests/css/css-position/position-fixed-overflow-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-fixed-overflow-print-ref.html rename to tests/wpt/tests/css/css-position/position-fixed-overflow-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-overflow-print.html b/tests/wpt/tests/css/css-position/position-fixed-overflow-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-fixed-overflow-print.html rename to tests/wpt/tests/css/css-position/position-fixed-overflow-print.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-root-element-flex.html b/tests/wpt/tests/css/css-position/position-fixed-root-element-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-fixed-root-element-flex.html rename to tests/wpt/tests/css/css-position/position-fixed-root-element-flex.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-root-element-grid.html b/tests/wpt/tests/css/css-position/position-fixed-root-element-grid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-fixed-root-element-grid.html rename to tests/wpt/tests/css/css-position/position-fixed-root-element-grid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-root-element-ref.html b/tests/wpt/tests/css/css-position/position-fixed-root-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-fixed-root-element-ref.html rename to tests/wpt/tests/css/css-position/position-fixed-root-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-nested-fixed-ref.html b/tests/wpt/tests/css/css-position/position-fixed-scroll-nested-fixed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-nested-fixed-ref.html rename to tests/wpt/tests/css/css-position/position-fixed-scroll-nested-fixed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-nested-fixed.html b/tests/wpt/tests/css/css-position/position-fixed-scroll-nested-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-nested-fixed.html rename to tests/wpt/tests/css/css-position/position-fixed-scroll-nested-fixed.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-overlap-ref.html b/tests/wpt/tests/css/css-position/position-fixed-scroll-overlap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-overlap-ref.html rename to tests/wpt/tests/css/css-position/position-fixed-scroll-overlap-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-overlap.html b/tests/wpt/tests/css/css-position/position-fixed-scroll-overlap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-overlap.html rename to tests/wpt/tests/css/css-position/position-fixed-scroll-overlap.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-video-controls-print.html b/tests/wpt/tests/css/css-position/position-fixed-video-controls-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-fixed-video-controls-print.html rename to tests/wpt/tests/css/css-position/position-fixed-video-controls-print.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-001.html b/tests/wpt/tests/css/css-position/position-relative-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-001.html rename to tests/wpt/tests/css/css-position/position-relative-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-002.html b/tests/wpt/tests/css/css-position/position-relative-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-002.html rename to tests/wpt/tests/css/css-position/position-relative-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-003.html b/tests/wpt/tests/css/css-position/position-relative-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-003.html rename to tests/wpt/tests/css/css-position/position-relative-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-004.html b/tests/wpt/tests/css/css-position/position-relative-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-004.html rename to tests/wpt/tests/css/css-position/position-relative-004.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-005.html b/tests/wpt/tests/css/css-position/position-relative-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-005.html rename to tests/wpt/tests/css/css-position/position-relative-005.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-006.html b/tests/wpt/tests/css/css-position/position-relative-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-006.html rename to tests/wpt/tests/css/css-position/position-relative-006.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-007.html b/tests/wpt/tests/css/css-position/position-relative-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-007.html rename to tests/wpt/tests/css/css-position/position-relative-007.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-008.html b/tests/wpt/tests/css/css-position/position-relative-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-008.html rename to tests/wpt/tests/css/css-position/position-relative-008.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-009.html b/tests/wpt/tests/css/css-position/position-relative-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-009.html rename to tests/wpt/tests/css/css-position/position-relative-009.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-010.html b/tests/wpt/tests/css/css-position/position-relative-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-010.html rename to tests/wpt/tests/css/css-position/position-relative-010.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-011.html b/tests/wpt/tests/css/css-position/position-relative-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-011.html rename to tests/wpt/tests/css/css-position/position-relative-011.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-012.html b/tests/wpt/tests/css/css-position/position-relative-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-012.html rename to tests/wpt/tests/css/css-position/position-relative-012.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-013.html b/tests/wpt/tests/css/css-position/position-relative-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-013.html rename to tests/wpt/tests/css/css-position/position-relative-013.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-caption.html b/tests/wpt/tests/css/css-position/position-relative-table-caption.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-caption.html rename to tests/wpt/tests/css/css-position/position-relative-table-caption.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-left-ref.html b/tests/wpt/tests/css/css-position/position-relative-table-left-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-left-ref.html rename to tests/wpt/tests/css/css-position/position-relative-table-left-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tbody-left-absolute-child.html b/tests/wpt/tests/css/css-position/position-relative-table-tbody-left-absolute-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-tbody-left-absolute-child.html rename to tests/wpt/tests/css/css-position/position-relative-table-tbody-left-absolute-child.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tbody-left.html b/tests/wpt/tests/css/css-position/position-relative-table-tbody-left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-tbody-left.html rename to tests/wpt/tests/css/css-position/position-relative-table-tbody-left.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tbody-top-absolute-child.html b/tests/wpt/tests/css/css-position/position-relative-table-tbody-top-absolute-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-tbody-top-absolute-child.html rename to tests/wpt/tests/css/css-position/position-relative-table-tbody-top-absolute-child.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tbody-top.html b/tests/wpt/tests/css/css-position/position-relative-table-tbody-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-tbody-top.html rename to tests/wpt/tests/css/css-position/position-relative-table-tbody-top.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-td-left.html b/tests/wpt/tests/css/css-position/position-relative-table-td-left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-td-left.html rename to tests/wpt/tests/css/css-position/position-relative-table-td-left.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-td-top.html b/tests/wpt/tests/css/css-position/position-relative-table-td-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-td-top.html rename to tests/wpt/tests/css/css-position/position-relative-table-td-top.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tfoot-left-absolute-child.html b/tests/wpt/tests/css/css-position/position-relative-table-tfoot-left-absolute-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-tfoot-left-absolute-child.html rename to tests/wpt/tests/css/css-position/position-relative-table-tfoot-left-absolute-child.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tfoot-left.html b/tests/wpt/tests/css/css-position/position-relative-table-tfoot-left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-tfoot-left.html rename to tests/wpt/tests/css/css-position/position-relative-table-tfoot-left.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tfoot-top-absolute-child.html b/tests/wpt/tests/css/css-position/position-relative-table-tfoot-top-absolute-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-tfoot-top-absolute-child.html rename to tests/wpt/tests/css/css-position/position-relative-table-tfoot-top-absolute-child.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tfoot-top-ref.html b/tests/wpt/tests/css/css-position/position-relative-table-tfoot-top-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-tfoot-top-ref.html rename to tests/wpt/tests/css/css-position/position-relative-table-tfoot-top-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tfoot-top.html b/tests/wpt/tests/css/css-position/position-relative-table-tfoot-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-tfoot-top.html rename to tests/wpt/tests/css/css-position/position-relative-table-tfoot-top.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-thead-left-absolute-child.html b/tests/wpt/tests/css/css-position/position-relative-table-thead-left-absolute-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-thead-left-absolute-child.html rename to tests/wpt/tests/css/css-position/position-relative-table-thead-left-absolute-child.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-thead-left.html b/tests/wpt/tests/css/css-position/position-relative-table-thead-left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-thead-left.html rename to tests/wpt/tests/css/css-position/position-relative-table-thead-left.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-thead-top-absolute-child.html b/tests/wpt/tests/css/css-position/position-relative-table-thead-top-absolute-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-thead-top-absolute-child.html rename to tests/wpt/tests/css/css-position/position-relative-table-thead-top-absolute-child.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-thead-top.html b/tests/wpt/tests/css/css-position/position-relative-table-thead-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-thead-top.html rename to tests/wpt/tests/css/css-position/position-relative-table-thead-top.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-top-ref.html b/tests/wpt/tests/css/css-position/position-relative-table-top-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-top-ref.html rename to tests/wpt/tests/css/css-position/position-relative-table-top-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tr-left-absolute-child.html b/tests/wpt/tests/css/css-position/position-relative-table-tr-left-absolute-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-tr-left-absolute-child.html rename to tests/wpt/tests/css/css-position/position-relative-table-tr-left-absolute-child.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tr-left.html b/tests/wpt/tests/css/css-position/position-relative-table-tr-left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-tr-left.html rename to tests/wpt/tests/css/css-position/position-relative-table-tr-left.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tr-top-absolute-child.html b/tests/wpt/tests/css/css-position/position-relative-table-tr-top-absolute-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-tr-top-absolute-child.html rename to tests/wpt/tests/css/css-position/position-relative-table-tr-top-absolute-child.html diff --git a/tests/wpt/web-platform-tests/css/css-position/position-relative-table-tr-top.html b/tests/wpt/tests/css/css-position/position-relative-table-tr-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/position-relative-table-tr-top.html rename to tests/wpt/tests/css/css-position/position-relative-table-tr-top.html diff --git a/tests/wpt/web-platform-tests/css/css-position/positon-absolute-scrollable-overflow-001.html b/tests/wpt/tests/css/css-position/positon-absolute-scrollable-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/positon-absolute-scrollable-overflow-001.html rename to tests/wpt/tests/css/css-position/positon-absolute-scrollable-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/resources/position-absolute-iframe-child-002.sub.html b/tests/wpt/tests/css/css-position/resources/position-absolute-iframe-child-002.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/resources/position-absolute-iframe-child-002.sub.html rename to tests/wpt/tests/css/css-position/resources/position-absolute-iframe-child-002.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-position/resources/position-absolute-iframe-child.html b/tests/wpt/tests/css/css-position/resources/position-absolute-iframe-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/resources/position-absolute-iframe-child.html rename to tests/wpt/tests/css/css-position/resources/position-absolute-iframe-child.html diff --git a/tests/wpt/web-platform-tests/css/css-position/resources/position-sticky-fixed-ancestor-iframe-child.html b/tests/wpt/tests/css/css-position/resources/position-sticky-fixed-ancestor-iframe-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/resources/position-sticky-fixed-ancestor-iframe-child.html rename to tests/wpt/tests/css/css-position/resources/position-sticky-fixed-ancestor-iframe-child.html diff --git a/tests/wpt/web-platform-tests/css/css-position/resources/ref-rectangle.js b/tests/wpt/tests/css/css-position/resources/ref-rectangle.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/resources/ref-rectangle.js rename to tests/wpt/tests/css/css-position/resources/ref-rectangle.js diff --git a/tests/wpt/web-platform-tests/css/css-position/resources/sticky-util.js b/tests/wpt/tests/css/css-position/resources/sticky-util.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/resources/sticky-util.js rename to tests/wpt/tests/css/css-position/resources/sticky-util.js diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/htb-ltr-ltr.html b/tests/wpt/tests/css/css-position/static-position/htb-ltr-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/htb-ltr-ltr.html rename to tests/wpt/tests/css/css-position/static-position/htb-ltr-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/htb-ltr-rtl.tentative.html b/tests/wpt/tests/css/css-position/static-position/htb-ltr-rtl.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/htb-ltr-rtl.tentative.html rename to tests/wpt/tests/css/css-position/static-position/htb-ltr-rtl.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/htb-ref.html b/tests/wpt/tests/css/css-position/static-position/htb-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/htb-ref.html rename to tests/wpt/tests/css/css-position/static-position/htb-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/htb-rtl-ltr.tentative.html b/tests/wpt/tests/css/css-position/static-position/htb-rtl-ltr.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/htb-rtl-ltr.tentative.html rename to tests/wpt/tests/css/css-position/static-position/htb-rtl-ltr.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/htb-rtl-rtl.html b/tests/wpt/tests/css/css-position/static-position/htb-rtl-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/htb-rtl-rtl.html rename to tests/wpt/tests/css/css-position/static-position/htb-rtl-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-001.html b/tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-001.html rename to tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-002.html b/tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-002.html rename to tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-003.html b/tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-003.html rename to tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-004.html b/tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-004.html rename to tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-004.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-005.html b/tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-005.html rename to tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-005.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-006.html b/tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-006.html rename to tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-006.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-007.html b/tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-007.html rename to tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-007.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-008.html b/tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-008.html rename to tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-008.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-009.html b/tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-009.html rename to tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-009.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-010.html b/tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-010.html rename to tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-010.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-011.html b/tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-011.html rename to tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-011.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-012.html b/tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-012.html rename to tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-012.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-013.html b/tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-013.html rename to tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-013.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-014.html b/tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-014.html rename to tests/wpt/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-014.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/vlr-ltr-ltr.html b/tests/wpt/tests/css/css-position/static-position/vlr-ltr-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/vlr-ltr-ltr.html rename to tests/wpt/tests/css/css-position/static-position/vlr-ltr-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/vlr-ltr-rtl.tentative.html b/tests/wpt/tests/css/css-position/static-position/vlr-ltr-rtl.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/vlr-ltr-rtl.tentative.html rename to tests/wpt/tests/css/css-position/static-position/vlr-ltr-rtl.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/vlr-ref.html b/tests/wpt/tests/css/css-position/static-position/vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/vlr-ref.html rename to tests/wpt/tests/css/css-position/static-position/vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/vlr-rtl-ltr.tentative.html b/tests/wpt/tests/css/css-position/static-position/vlr-rtl-ltr.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/vlr-rtl-ltr.tentative.html rename to tests/wpt/tests/css/css-position/static-position/vlr-rtl-ltr.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/vlr-rtl-rtl.html b/tests/wpt/tests/css/css-position/static-position/vlr-rtl-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/vlr-rtl-rtl.html rename to tests/wpt/tests/css/css-position/static-position/vlr-rtl-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/vrl-ltr-ltr.html b/tests/wpt/tests/css/css-position/static-position/vrl-ltr-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/vrl-ltr-ltr.html rename to tests/wpt/tests/css/css-position/static-position/vrl-ltr-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/vrl-ltr-rtl.tentative.html b/tests/wpt/tests/css/css-position/static-position/vrl-ltr-rtl.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/vrl-ltr-rtl.tentative.html rename to tests/wpt/tests/css/css-position/static-position/vrl-ltr-rtl.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/vrl-ref.html b/tests/wpt/tests/css/css-position/static-position/vrl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/vrl-ref.html rename to tests/wpt/tests/css/css-position/static-position/vrl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/vrl-rtl-ltr.tentative.html b/tests/wpt/tests/css/css-position/static-position/vrl-rtl-ltr.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/vrl-rtl-ltr.tentative.html rename to tests/wpt/tests/css/css-position/static-position/vrl-rtl-ltr.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/static-position/vrl-rtl-rtl.html b/tests/wpt/tests/css/css-position/static-position/vrl-rtl-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/static-position/vrl-rtl-rtl.html rename to tests/wpt/tests/css/css-position/static-position/vrl-rtl-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-bottom-002.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-bottom-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-bottom-002.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-bottom-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-bottom-003.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-bottom-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-bottom-003.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-bottom-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-bottom.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-bottom.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-bottom.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-change-top-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-change-top-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-change-top-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-change-top-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-change-top.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-change-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-change-top.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-change-top.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-child-multicolumn-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-child-multicolumn-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-child-multicolumn-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-child-multicolumn-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-child-multicolumn.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-child-multicolumn.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-child-multicolumn.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-child-multicolumn.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-contained-by-display-table-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-contained-by-display-table-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-contained-by-display-table-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-contained-by-display-table-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-contained-by-display-table.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-contained-by-display-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-contained-by-display-table.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-contained-by-display-table.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-escape-scroller-001-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-escape-scroller-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-escape-scroller-001-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-escape-scroller-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-escape-scroller-001.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-escape-scroller-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-escape-scroller-001.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-escape-scroller-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-escape-scroller-002-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-escape-scroller-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-escape-scroller-002-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-escape-scroller-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-escape-scroller-002.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-escape-scroller-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-escape-scroller-002.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-escape-scroller-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-escape-scroller-003.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-escape-scroller-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-escape-scroller-003.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-escape-scroller-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-escape-scroller-004-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-escape-scroller-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-escape-scroller-004-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-escape-scroller-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-escape-scroller-004.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-escape-scroller-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-escape-scroller-004.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-escape-scroller-004.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-002.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-fixed-ancestor-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-002.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-fixed-ancestor-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-003.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-fixed-ancestor-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-003.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-fixed-ancestor-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-iframe-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-fixed-ancestor-iframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-iframe-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-fixed-ancestor-iframe-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-iframe.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-fixed-ancestor-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-iframe.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-fixed-ancestor-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-fixed-ancestor-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-fixed-ancestor-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-fixed-ancestor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-fixed-ancestor.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flex-item-001.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-flex-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flex-item-001.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-flex-item-001.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flex-item-002.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-flex-item-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flex-item-002.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-flex-item-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flex-item-003.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-flex-item-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flex-item-003.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-flex-item-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flex-item-004.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-flex-item-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flex-item-004.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-flex-item-004.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flexbox-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-flexbox-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flexbox-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-flexbox-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flexbox.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-flexbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flexbox.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-flexbox.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fractional-offset-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-fractional-offset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fractional-offset-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-fractional-offset-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fractional-offset.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-fractional-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fractional-offset.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-fractional-offset.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-get-bounding-client-rect.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-get-bounding-client-rect.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-get-bounding-client-rect.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-get-bounding-client-rect.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-grid-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-grid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-grid-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-grid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-grid.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-grid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-grid.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-grid.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-hyperlink-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-hyperlink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-hyperlink-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-hyperlink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-hyperlink.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-hyperlink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-hyperlink.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-hyperlink.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-inflow-position.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-inflow-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-inflow-position.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-inflow-position.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-inline-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-inline-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-inline.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-inline.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-input-box-gets-focused-after-scroll.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-input-box-gets-focused-after-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-input-box-gets-focused-after-scroll.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-input-box-gets-focused-after-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top-2-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-large-top-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top-2-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-large-top-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top-2.tentative.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-large-top-2.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top-2.tentative.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-large-top-2.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-large-top-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-large-top-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top.tentative.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-large-top.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top.tentative.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-large-top.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-left-002.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-left-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-left-002.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-left-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-left-003.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-left-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-left-003.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-left-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-left.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-left.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-left.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-margins.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-margins.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-margins.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-margins.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-bottom.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-nested-bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-bottom.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-nested-bottom.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-inline-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-nested-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-inline-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-nested-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-inline.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-nested-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-inline.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-nested-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-left.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-nested-left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-left.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-nested-left.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-right.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-nested-right.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-right.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-nested-right.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-table-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-nested-table-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-table-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-nested-table-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-table.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-nested-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-table.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-nested-table.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-thead-th.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-nested-thead-th.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-thead-th.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-nested-thead-th.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-top.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-nested-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-top.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-nested-top.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-offset-overflow.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-offset-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-offset-overflow.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-offset-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-offset-top-left.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-offset-top-left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-offset-top-left.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-offset-top-left.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-overflow-clip-container-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-overflow-clip-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-overflow-clip-container-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-overflow-clip-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-overflow-clip-container.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-overflow-clip-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-overflow-clip-container.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-overflow-clip-container.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-overflow-hidden.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-overflow-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-overflow-hidden.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-overflow-hidden.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-overflow-padding.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-overflow-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-overflow-padding.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-overflow-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-parsing.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-parsing.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-rendering-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-rendering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-rendering-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-rendering-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-rendering.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-rendering.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-right-002.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-right-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-right-002.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-right-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-right-003.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-right-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-right-003.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-right-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-right.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-right.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-right.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-right.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-root-scroller.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-root-scroller.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-root-scroller.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-root-scroller.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-reposition-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-scroll-reposition-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-reposition-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-scroll-reposition-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-reposition.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-scroll-reposition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-reposition.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-scroll-reposition.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-with-clip-and-abspos-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-scroll-with-clip-and-abspos-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-with-clip-and-abspos-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-scroll-with-clip-and-abspos-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-with-clip-and-abspos.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-scroll-with-clip-and-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-with-clip-and-abspos.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-scroll-with-clip-and-abspos.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-scrollIntoView.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scrollIntoView.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-scrollIntoView.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scrolled-remove-sibling.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-scrolled-remove-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scrolled-remove-sibling.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-scrolled-remove-sibling.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-stacking-context-002.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-stacking-context-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-stacking-context-002.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-stacking-context-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-stacking-context-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-stacking-context-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-stacking-context-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-stacking-context-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-stacking-context.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-stacking-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-stacking-context.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-stacking-context.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-parts-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-parts-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-parts-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-parts-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-parts.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-parts.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-parts.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-parts.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-bottom-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-bottom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-bottom-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-bottom-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-bottom.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-bottom.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-bottom.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-left-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-left-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-left-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-left-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-left.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-left.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-left.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-right-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-right-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-right-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-right-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-right.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-right.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-right.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-right.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-top-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-top-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-top-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-top-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-top.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-td-top.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-td-top.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tfoot-bottom-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-tfoot-bottom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tfoot-bottom-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-tfoot-bottom-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tfoot-bottom.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-tfoot-bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tfoot-bottom.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-tfoot-bottom.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-bottom-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-bottom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-bottom-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-bottom-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-bottom.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-bottom.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-bottom.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-left-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-left-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-left-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-left-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-left.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-left.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-left.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-right-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-right-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-right-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-right-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-right.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-right.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-right.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-right.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-top-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-top-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-top-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-top-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-top.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-top.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-th-top.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-thead-top-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-thead-top-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-thead-top-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-thead-top-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-thead-top.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-thead-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-thead-top.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-thead-top.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-bottom-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-tr-bottom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-bottom-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-tr-bottom-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-bottom.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-tr-bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-bottom.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-tr-bottom.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-top-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-tr-top-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-top-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-tr-top-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-top.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-table-tr-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-top.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-table-tr-top.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-top-002.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-top-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-top-002.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-top-002.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-top-003.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-top-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-top-003.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-top-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-top-and-bottom-003.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-top-and-bottom-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-top-and-bottom-003.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-top-and-bottom-003.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-top-and-bottom.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-top-and-bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-top-and-bottom.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-top-and-bottom.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-top.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-top.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-top.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-transforms-translate.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-transforms-translate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-transforms-translate.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-transforms-translate.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-transforms.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-transforms.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-transforms.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-transforms.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-writing-modes-ref.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-writing-modes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-writing-modes-ref.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-writing-modes-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-writing-modes.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-writing-modes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-writing-modes.html rename to tests/wpt/tests/css/css-position/sticky/position-sticky-writing-modes.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/reference/position-sticky-bottom-002-ref.html b/tests/wpt/tests/css/css-position/sticky/reference/position-sticky-bottom-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/reference/position-sticky-bottom-002-ref.html rename to tests/wpt/tests/css/css-position/sticky/reference/position-sticky-bottom-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/reference/position-sticky-fixed-ancestor-002-ref.html b/tests/wpt/tests/css/css-position/sticky/reference/position-sticky-fixed-ancestor-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/reference/position-sticky-fixed-ancestor-002-ref.html rename to tests/wpt/tests/css/css-position/sticky/reference/position-sticky-fixed-ancestor-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/reference/position-sticky-left-002-ref.html b/tests/wpt/tests/css/css-position/sticky/reference/position-sticky-left-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/reference/position-sticky-left-002-ref.html rename to tests/wpt/tests/css/css-position/sticky/reference/position-sticky-left-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/reference/position-sticky-right-002-ref.html b/tests/wpt/tests/css/css-position/sticky/reference/position-sticky-right-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/reference/position-sticky-right-002-ref.html rename to tests/wpt/tests/css/css-position/sticky/reference/position-sticky-right-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/reference/position-sticky-top-002-ref.html b/tests/wpt/tests/css/css-position/sticky/reference/position-sticky-top-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/reference/position-sticky-top-002-ref.html rename to tests/wpt/tests/css/css-position/sticky/reference/position-sticky-top-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/reference/position-sticky-top-and-bottom-003-ref.html b/tests/wpt/tests/css/css-position/sticky/reference/position-sticky-top-and-bottom-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/reference/position-sticky-top-and-bottom-003-ref.html rename to tests/wpt/tests/css/css-position/sticky/reference/position-sticky-top-and-bottom-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/sticky-after-input.html b/tests/wpt/tests/css/css-position/sticky/sticky-after-input.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/sticky-after-input.html rename to tests/wpt/tests/css/css-position/sticky/sticky-after-input.html diff --git a/tests/wpt/web-platform-tests/css/css-position/sticky/support/100x100-red.png b/tests/wpt/tests/css/css-position/sticky/support/100x100-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/sticky/support/100x100-red.png rename to tests/wpt/tests/css/css-position/sticky/support/100x100-red.png diff --git a/tests/wpt/web-platform-tests/css/css-position/z-index-blend-will-change-overlapping-layers-ref.html b/tests/wpt/tests/css/css-position/z-index-blend-will-change-overlapping-layers-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/z-index-blend-will-change-overlapping-layers-ref.html rename to tests/wpt/tests/css/css-position/z-index-blend-will-change-overlapping-layers-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-position/z-index-blend-will-change-overlapping-layers.html b/tests/wpt/tests/css/css-position/z-index-blend-will-change-overlapping-layers.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-position/z-index-blend-will-change-overlapping-layers.html rename to tests/wpt/tests/css/css-position/z-index-blend-will-change-overlapping-layers.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/META.yml b/tests/wpt/tests/css/css-properties-values-api/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/META.yml rename to tests/wpt/tests/css/css-properties-values-api/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animate-invalid.html b/tests/wpt/tests/css/css-properties-values-api/animate-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animate-invalid.html rename to tests/wpt/tests/css/css-properties-values-api/animate-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-angle-comma-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-angle-comma-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-angle-comma-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-angle-comma-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-angle-space-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-angle-space-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-angle-space-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-angle-space-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-angle.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-angle.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-angle.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-angle.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-color-comma-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-color-comma-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-color-comma-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-color-comma-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-color-space-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-color-space-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-color-space-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-color-space-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-color.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-color.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-color.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-custom-ident.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-custom-ident.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-custom-ident.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-custom-ident.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-image.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-image.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-image.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-inherited-used-by-standard-property.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-inherited-used-by-standard-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-inherited-used-by-standard-property.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-inherited-used-by-standard-property.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-integer-comma-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-integer-comma-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-integer-comma-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-integer-comma-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-integer-space-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-integer-space-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-integer-space-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-integer-space-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-integer.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-integer.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-integer.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-integer.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-comma-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-length-comma-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-comma-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-length-comma-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage-comma-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage-comma-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage-comma-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage-comma-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage-space-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage-space-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage-space-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage-space-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-length-percentage.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-space-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-length-space-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length-space-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-length-space-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-length.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-length.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-length.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-list-type-mismatch.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-list-type-mismatch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-list-type-mismatch.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-list-type-mismatch.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-non-inherited-used-by-standard-property.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-non-inherited-used-by-standard-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-non-inherited-used-by-standard-property.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-non-inherited-used-by-standard-property.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-number-comma-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-number-comma-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-number-comma-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-number-comma-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-number-space-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-number-space-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-number-space-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-number-space-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-number.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-number.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-number.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-number.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-percentage-comma-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-percentage-comma-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-percentage-comma-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-percentage-comma-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-percentage-space-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-percentage-space-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-percentage-space-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-percentage-space-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-percentage.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-percentage.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-percentage.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-resolution-comma-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-resolution-comma-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-resolution-comma-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-resolution-comma-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-resolution-space-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-resolution-space-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-resolution-space-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-resolution-space-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-resolution.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-resolution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-resolution.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-resolution.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-time-comma-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-time-comma-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-time-comma-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-time-comma-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-time-space-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-time-space-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-time-space-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-time-space-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-time.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-time.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-time.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-time.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-transform-function.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-transform-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-transform-function.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-transform-function.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-transform-list-multiple-values.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-transform-list-multiple-values.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-transform-list-multiple-values.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-transform-list-multiple-values.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-transform-list-single-values.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-transform-list-single-values.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-transform-list-single-values.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-transform-list-single-values.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-url.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-url.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-url.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-url.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-used-in-shorthand.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-used-in-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-animation-used-in-shorthand.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-animation-used-in-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-angle.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-angle.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-angle.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-angle.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-color.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-color.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-color.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-custom-ident.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-custom-ident.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-custom-ident.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-custom-ident.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-image.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-image.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-image.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-inherited-used-by-standard-property.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-inherited-used-by-standard-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-inherited-used-by-standard-property.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-inherited-used-by-standard-property.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-integer.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-integer.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-integer.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-integer.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-length-percentage.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-length-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-length-percentage.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-length-percentage.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-length.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-length.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-length.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-length.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-mismatched-inherited-property-numbers.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-mismatched-inherited-property-numbers.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-mismatched-inherited-property-numbers.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-mismatched-inherited-property-numbers.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-mismatched-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-mismatched-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-mismatched-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-mismatched-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-mismatched-property-numbers.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-mismatched-property-numbers.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-mismatched-property-numbers.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-mismatched-property-numbers.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-non-inherited-used-by-standard-property.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-non-inherited-used-by-standard-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-non-inherited-used-by-standard-property.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-non-inherited-used-by-standard-property.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-number.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-number.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-number.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-number.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-percentage.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-percentage.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-percentage.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-property-all.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-property-all.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-property-all.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-property-all.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-resolution.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-resolution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-resolution.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-resolution.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-time.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-time.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-time.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-time.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-transform-function.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-transform-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-transform-function.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-transform-function.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-transform-list.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-transform-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-transform-list.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-transform-list.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-url.html b/tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-url.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/animation/custom-property-transition-url.html rename to tests/wpt/tests/css/css-properties-values-api/animation/custom-property-transition-url.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-animation.html b/tests/wpt/tests/css/css-properties-values-api/at-property-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-animation.html rename to tests/wpt/tests/css/css-properties-values-api/at-property-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-cssom.html b/tests/wpt/tests/css/css-properties-values-api/at-property-cssom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-cssom.html rename to tests/wpt/tests/css/css-properties-values-api/at-property-cssom.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-non-matching-media-crash.html b/tests/wpt/tests/css/css-properties-values-api/at-property-non-matching-media-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-non-matching-media-crash.html rename to tests/wpt/tests/css/css-properties-values-api/at-property-non-matching-media-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-shadow.html b/tests/wpt/tests/css/css-properties-values-api/at-property-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-shadow.html rename to tests/wpt/tests/css/css-properties-values-api/at-property-shadow.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-stylesheets.html b/tests/wpt/tests/css/css-properties-values-api/at-property-stylesheets.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-stylesheets.html rename to tests/wpt/tests/css/css-properties-values-api/at-property-stylesheets.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-typedom.html b/tests/wpt/tests/css/css-properties-values-api/at-property-typedom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-typedom.html rename to tests/wpt/tests/css/css-properties-values-api/at-property-typedom.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-viewport-units-dynamic.html b/tests/wpt/tests/css/css-properties-values-api/at-property-viewport-units-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-viewport-units-dynamic.html rename to tests/wpt/tests/css/css-properties-values-api/at-property-viewport-units-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-viewport-units.html b/tests/wpt/tests/css/css-properties-values-api/at-property-viewport-units.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/at-property-viewport-units.html rename to tests/wpt/tests/css/css-properties-values-api/at-property-viewport-units.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/at-property.html b/tests/wpt/tests/css/css-properties-values-api/at-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/at-property.html rename to tests/wpt/tests/css/css-properties-values-api/at-property.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/conditional-rules.html b/tests/wpt/tests/css/css-properties-values-api/conditional-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/conditional-rules.html rename to tests/wpt/tests/css/css-properties-values-api/conditional-rules.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/crashtests/initial-in-audio-crash.html b/tests/wpt/tests/css/css-properties-values-api/crashtests/initial-in-audio-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/crashtests/initial-in-audio-crash.html rename to tests/wpt/tests/css/css-properties-values-api/crashtests/initial-in-audio-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/determine-registration.html b/tests/wpt/tests/css/css-properties-values-api/determine-registration.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/determine-registration.html rename to tests/wpt/tests/css/css-properties-values-api/determine-registration.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/font-size-animation.html b/tests/wpt/tests/css/css-properties-values-api/font-size-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/font-size-animation.html rename to tests/wpt/tests/css/css-properties-values-api/font-size-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/idlharness.html b/tests/wpt/tests/css/css-properties-values-api/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/idlharness.html rename to tests/wpt/tests/css/css-properties-values-api/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/property-cascade.html b/tests/wpt/tests/css/css-properties-values-api/property-cascade.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/property-cascade.html rename to tests/wpt/tests/css/css-properties-values-api/property-cascade.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/register-property-syntax-parsing.html b/tests/wpt/tests/css/css-properties-values-api/register-property-syntax-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/register-property-syntax-parsing.html rename to tests/wpt/tests/css/css-properties-values-api/register-property-syntax-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/register-property.html b/tests/wpt/tests/css/css-properties-values-api/register-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/register-property.html rename to tests/wpt/tests/css/css-properties-values-api/register-property.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/registered-properties-inheritance.html b/tests/wpt/tests/css/css-properties-values-api/registered-properties-inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/registered-properties-inheritance.html rename to tests/wpt/tests/css/css-properties-values-api/registered-properties-inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-change-style-001.html b/tests/wpt/tests/css/css-properties-values-api/registered-property-change-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-change-style-001.html rename to tests/wpt/tests/css/css-properties-values-api/registered-property-change-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-computation.html b/tests/wpt/tests/css/css-properties-values-api/registered-property-computation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-computation.html rename to tests/wpt/tests/css/css-properties-values-api/registered-property-computation.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-crosstalk.html b/tests/wpt/tests/css/css-properties-values-api/registered-property-crosstalk.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-crosstalk.html rename to tests/wpt/tests/css/css-properties-values-api/registered-property-crosstalk.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-cssom.html b/tests/wpt/tests/css/css-properties-values-api/registered-property-cssom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-cssom.html rename to tests/wpt/tests/css/css-properties-values-api/registered-property-cssom.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-initial.html b/tests/wpt/tests/css/css-properties-values-api/registered-property-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-initial.html rename to tests/wpt/tests/css/css-properties-values-api/registered-property-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-revert.html b/tests/wpt/tests/css/css-properties-values-api/registered-property-revert.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/registered-property-revert.html rename to tests/wpt/tests/css/css-properties-values-api/registered-property-revert.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/resources/utils.js b/tests/wpt/tests/css/css-properties-values-api/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/resources/utils.js rename to tests/wpt/tests/css/css-properties-values-api/resources/utils.js diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/self-utils.html b/tests/wpt/tests/css/css-properties-values-api/self-utils.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/self-utils.html rename to tests/wpt/tests/css/css-properties-values-api/self-utils.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/support/alt/alt.css b/tests/wpt/tests/css/css-properties-values-api/support/alt/alt.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/support/alt/alt.css rename to tests/wpt/tests/css/css-properties-values-api/support/alt/alt.css diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/support/alt/alt.js b/tests/wpt/tests/css/css-properties-values-api/support/alt/alt.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/support/alt/alt.js rename to tests/wpt/tests/css/css-properties-values-api/support/alt/alt.js diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/support/main/main.css b/tests/wpt/tests/css/css-properties-values-api/support/main/main.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/support/main/main.css rename to tests/wpt/tests/css/css-properties-values-api/support/main/main.css diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/support/main/main.js b/tests/wpt/tests/css/css-properties-values-api/support/main/main.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/support/main/main.js rename to tests/wpt/tests/css/css-properties-values-api/support/main/main.js diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/support/main/main.utf16be.css b/tests/wpt/tests/css/css-properties-values-api/support/main/main.utf16be.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/support/main/main.utf16be.css rename to tests/wpt/tests/css/css-properties-values-api/support/main/main.utf16be.css diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/typedom.html b/tests/wpt/tests/css/css-properties-values-api/typedom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/typedom.html rename to tests/wpt/tests/css/css-properties-values-api/typedom.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/unit-cycles.html b/tests/wpt/tests/css/css-properties-values-api/unit-cycles.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/unit-cycles.html rename to tests/wpt/tests/css/css-properties-values-api/unit-cycles.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/url-resolution.html b/tests/wpt/tests/css/css-properties-values-api/url-resolution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/url-resolution.html rename to tests/wpt/tests/css/css-properties-values-api/url-resolution.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/var-reference-registered-properties-cycles.html b/tests/wpt/tests/css/css-properties-values-api/var-reference-registered-properties-cycles.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/var-reference-registered-properties-cycles.html rename to tests/wpt/tests/css/css-properties-values-api/var-reference-registered-properties-cycles.html diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/var-reference-registered-properties.html b/tests/wpt/tests/css/css-properties-values-api/var-reference-registered-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-properties-values-api/var-reference-registered-properties.html rename to tests/wpt/tests/css/css-properties-values-api/var-reference-registered-properties.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/META.yml b/tests/wpt/tests/css/css-pseudo/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/META.yml rename to tests/wpt/tests/css/css-pseudo/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/README.md b/tests/wpt/tests/css/css-pseudo/README.md similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/README.md rename to tests/wpt/tests/css/css-pseudo/README.md diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-001-manual.html b/tests/wpt/tests/css/css-pseudo/active-selection-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-001-manual.html rename to tests/wpt/tests/css/css-pseudo/active-selection-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-002-manual.html b/tests/wpt/tests/css/css-pseudo/active-selection-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-002-manual.html rename to tests/wpt/tests/css/css-pseudo/active-selection-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-004-manual.html b/tests/wpt/tests/css/css-pseudo/active-selection-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-004-manual.html rename to tests/wpt/tests/css/css-pseudo/active-selection-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-011.html b/tests/wpt/tests/css/css-pseudo/active-selection-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-011.html rename to tests/wpt/tests/css/css-pseudo/active-selection-011.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-012.html b/tests/wpt/tests/css/css-pseudo/active-selection-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-012.html rename to tests/wpt/tests/css/css-pseudo/active-selection-012.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-014.html b/tests/wpt/tests/css/css-pseudo/active-selection-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-014.html rename to tests/wpt/tests/css/css-pseudo/active-selection-014.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-016.html b/tests/wpt/tests/css/css-pseudo/active-selection-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-016.html rename to tests/wpt/tests/css/css-pseudo/active-selection-016.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-018.html b/tests/wpt/tests/css/css-pseudo/active-selection-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-018.html rename to tests/wpt/tests/css/css-pseudo/active-selection-018.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-021.html b/tests/wpt/tests/css/css-pseudo/active-selection-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-021.html rename to tests/wpt/tests/css/css-pseudo/active-selection-021.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-025.html b/tests/wpt/tests/css/css-pseudo/active-selection-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-025.html rename to tests/wpt/tests/css/css-pseudo/active-selection-025.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-027.html b/tests/wpt/tests/css/css-pseudo/active-selection-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-027.html rename to tests/wpt/tests/css/css-pseudo/active-selection-027.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-031.html b/tests/wpt/tests/css/css-pseudo/active-selection-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-031.html rename to tests/wpt/tests/css/css-pseudo/active-selection-031.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-041.html b/tests/wpt/tests/css/css-pseudo/active-selection-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-041.html rename to tests/wpt/tests/css/css-pseudo/active-selection-041.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-043.html b/tests/wpt/tests/css/css-pseudo/active-selection-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-043.html rename to tests/wpt/tests/css/css-pseudo/active-selection-043.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-045.html b/tests/wpt/tests/css/css-pseudo/active-selection-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-045.html rename to tests/wpt/tests/css/css-pseudo/active-selection-045.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-051-ref.html b/tests/wpt/tests/css/css-pseudo/active-selection-051-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-051-ref.html rename to tests/wpt/tests/css/css-pseudo/active-selection-051-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-051.html b/tests/wpt/tests/css/css-pseudo/active-selection-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-051.html rename to tests/wpt/tests/css/css-pseudo/active-selection-051.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-052.html b/tests/wpt/tests/css/css-pseudo/active-selection-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-052.html rename to tests/wpt/tests/css/css-pseudo/active-selection-052.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-053.html b/tests/wpt/tests/css/css-pseudo/active-selection-053.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-053.html rename to tests/wpt/tests/css/css-pseudo/active-selection-053.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-054.html b/tests/wpt/tests/css/css-pseudo/active-selection-054.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-054.html rename to tests/wpt/tests/css/css-pseudo/active-selection-054.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-056.html b/tests/wpt/tests/css/css-pseudo/active-selection-056.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-056.html rename to tests/wpt/tests/css/css-pseudo/active-selection-056.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-057.html b/tests/wpt/tests/css/css-pseudo/active-selection-057.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-057.html rename to tests/wpt/tests/css/css-pseudo/active-selection-057.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-063.html b/tests/wpt/tests/css/css-pseudo/active-selection-063.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/active-selection-063.html rename to tests/wpt/tests/css/css-pseudo/active-selection-063.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/backdrop-animate-002-ref.html b/tests/wpt/tests/css/css-pseudo/backdrop-animate-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/backdrop-animate-002-ref.html rename to tests/wpt/tests/css/css-pseudo/backdrop-animate-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/backdrop-animate-002.html b/tests/wpt/tests/css/css-pseudo/backdrop-animate-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/backdrop-animate-002.html rename to tests/wpt/tests/css/css-pseudo/backdrop-animate-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/backdrop-animate.html b/tests/wpt/tests/css/css-pseudo/backdrop-animate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/backdrop-animate.html rename to tests/wpt/tests/css/css-pseudo/backdrop-animate.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/before-after-dynamic-custom-property-001-ref.html b/tests/wpt/tests/css/css-pseudo/before-after-dynamic-custom-property-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/before-after-dynamic-custom-property-001-ref.html rename to tests/wpt/tests/css/css-pseudo/before-after-dynamic-custom-property-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/before-after-dynamic-custom-property-001.html b/tests/wpt/tests/css/css-pseudo/before-after-dynamic-custom-property-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/before-after-dynamic-custom-property-001.html rename to tests/wpt/tests/css/css-pseudo/before-after-dynamic-custom-property-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/before-dynamic-display-none.html b/tests/wpt/tests/css/css-pseudo/before-dynamic-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/before-dynamic-display-none.html rename to tests/wpt/tests/css/css-pseudo/before-dynamic-display-none.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/before-in-display-none-thcrash.html b/tests/wpt/tests/css/css-pseudo/before-in-display-none-thcrash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/before-in-display-none-thcrash.html rename to tests/wpt/tests/css/css-pseudo/before-in-display-none-thcrash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/cascade-highlight-001-ref.html b/tests/wpt/tests/css/css-pseudo/cascade-highlight-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/cascade-highlight-001-ref.html rename to tests/wpt/tests/css/css-pseudo/cascade-highlight-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/cascade-highlight-001.html b/tests/wpt/tests/css/css-pseudo/cascade-highlight-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/cascade-highlight-001.html rename to tests/wpt/tests/css/css-pseudo/cascade-highlight-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/cascade-highlight-002.html b/tests/wpt/tests/css/css-pseudo/cascade-highlight-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/cascade-highlight-002.html rename to tests/wpt/tests/css/css-pseudo/cascade-highlight-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/cascade-highlight-004-ref.html b/tests/wpt/tests/css/css-pseudo/cascade-highlight-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/cascade-highlight-004-ref.html rename to tests/wpt/tests/css/css-pseudo/cascade-highlight-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/cascade-highlight-004.html b/tests/wpt/tests/css/css-pseudo/cascade-highlight-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/cascade-highlight-004.html rename to tests/wpt/tests/css/css-pseudo/cascade-highlight-004.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/cascade-highlight-005.html b/tests/wpt/tests/css/css-pseudo/cascade-highlight-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/cascade-highlight-005.html rename to tests/wpt/tests/css/css-pseudo/cascade-highlight-005.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/chrome-bug-1299142-crash.html b/tests/wpt/tests/css/css-pseudo/chrome-bug-1299142-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/chrome-bug-1299142-crash.html rename to tests/wpt/tests/css/css-pseudo/chrome-bug-1299142-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/chrome-first-letter-inside-replaced-crash.html b/tests/wpt/tests/css/css-pseudo/chrome-first-letter-inside-replaced-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/chrome-first-letter-inside-replaced-crash.html rename to tests/wpt/tests/css/css-pseudo/chrome-first-letter-inside-replaced-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-001-notref.html b/tests/wpt/tests/css/css-pseudo/file-selector-button-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-001-notref.html rename to tests/wpt/tests/css/css-pseudo/file-selector-button-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-001.html b/tests/wpt/tests/css/css-pseudo/file-selector-button-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-001.html rename to tests/wpt/tests/css/css-pseudo/file-selector-button-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-after-part.html b/tests/wpt/tests/css/css-pseudo/file-selector-button-after-part.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-after-part.html rename to tests/wpt/tests/css/css-pseudo/file-selector-button-after-part.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-display-none-overflow-crash.html b/tests/wpt/tests/css/css-pseudo/file-selector-button-display-none-overflow-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-display-none-overflow-crash.html rename to tests/wpt/tests/css/css-pseudo/file-selector-button-display-none-overflow-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-display-toggle-crash.html b/tests/wpt/tests/css/css-pseudo/file-selector-button-display-toggle-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-display-toggle-crash.html rename to tests/wpt/tests/css/css-pseudo/file-selector-button-display-toggle-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-float.html b/tests/wpt/tests/css/css-pseudo/file-selector-button-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-float.html rename to tests/wpt/tests/css/css-pseudo/file-selector-button-float.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-inherit.html b/tests/wpt/tests/css/css-pseudo/file-selector-button-inherit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-inherit.html rename to tests/wpt/tests/css/css-pseudo/file-selector-button-inherit.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-001-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-001-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-001.html b/tests/wpt/tests/css/css-pseudo/first-letter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-001.html rename to tests/wpt/tests/css/css-pseudo/first-letter-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-002.html b/tests/wpt/tests/css/css-pseudo/first-letter-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-002.html rename to tests/wpt/tests/css/css-pseudo/first-letter-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-003.html b/tests/wpt/tests/css/css-pseudo/first-letter-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-003.html rename to tests/wpt/tests/css/css-pseudo/first-letter-003.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-004-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-004-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-004.html b/tests/wpt/tests/css/css-pseudo/first-letter-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-004.html rename to tests/wpt/tests/css/css-pseudo/first-letter-004.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-005-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-005-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-005.html b/tests/wpt/tests/css/css-pseudo/first-letter-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-005.html rename to tests/wpt/tests/css/css-pseudo/first-letter-005.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-allowed-properties.html b/tests/wpt/tests/css/css-pseudo/first-letter-allowed-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-allowed-properties.html rename to tests/wpt/tests/css/css-pseudo/first-letter-allowed-properties.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-and-sibling-display-change.html b/tests/wpt/tests/css/css-pseudo/first-letter-and-sibling-display-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-and-sibling-display-change.html rename to tests/wpt/tests/css/css-pseudo/first-letter-and-sibling-display-change.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-and-whitespace-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-and-whitespace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-and-whitespace-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-and-whitespace-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-and-whitespace.html b/tests/wpt/tests/css/css-pseudo/first-letter-and-whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-and-whitespace.html rename to tests/wpt/tests/css/css-pseudo/first-letter-and-whitespace.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-background-image-dynamic.html b/tests/wpt/tests/css/css-pseudo/first-letter-background-image-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-background-image-dynamic.html rename to tests/wpt/tests/css/css-pseudo/first-letter-background-image-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-background-image-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-background-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-background-image-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-background-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-background-image.html b/tests/wpt/tests/css/css-pseudo/first-letter-background-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-background-image.html rename to tests/wpt/tests/css/css-pseudo/first-letter-background-image.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-block-to-inline-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-block-to-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-block-to-inline-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-block-to-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-block-to-inline.html b/tests/wpt/tests/css/css-pseudo/first-letter-block-to-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-block-to-inline.html rename to tests/wpt/tests/css/css-pseudo/first-letter-block-to-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-crash.html b/tests/wpt/tests/css/css-pseudo/first-letter-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-crash.html rename to tests/wpt/tests/css/css-pseudo/first-letter-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-digraph.html b/tests/wpt/tests/css/css-pseudo/first-letter-digraph.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-digraph.html rename to tests/wpt/tests/css/css-pseudo/first-letter-digraph.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-exclude-block-child-marker-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-exclude-block-child-marker-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-exclude-block-child-marker-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-exclude-block-child-marker-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-exclude-block-child-marker.html b/tests/wpt/tests/css/css-pseudo/first-letter-exclude-block-child-marker.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-exclude-block-child-marker.html rename to tests/wpt/tests/css/css-pseudo/first-letter-exclude-block-child-marker.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-exclude-inline-child-marker-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-exclude-inline-child-marker-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-exclude-inline-child-marker-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-exclude-inline-child-marker-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-exclude-inline-child-marker.html b/tests/wpt/tests/css/css-pseudo/first-letter-exclude-inline-child-marker.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-exclude-inline-child-marker.html rename to tests/wpt/tests/css/css-pseudo/first-letter-exclude-inline-child-marker.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-exclude-inline-marker-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-exclude-inline-marker-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-exclude-inline-marker-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-exclude-inline-marker-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-exclude-inline-marker.html b/tests/wpt/tests/css/css-pseudo/first-letter-exclude-inline-marker.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-exclude-inline-marker.html rename to tests/wpt/tests/css/css-pseudo/first-letter-exclude-inline-marker.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-hi-001-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-hi-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-hi-001-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-hi-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-hi-001.html b/tests/wpt/tests/css/css-pseudo/first-letter-hi-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-hi-001.html rename to tests/wpt/tests/css/css-pseudo/first-letter-hi-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-hi-002-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-hi-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-hi-002-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-hi-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-hi-002.html b/tests/wpt/tests/css/css-pseudo/first-letter-hi-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-hi-002.html rename to tests/wpt/tests/css/css-pseudo/first-letter-hi-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-list-item-dynamic-001-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-list-item-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-list-item-dynamic-001-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-list-item-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-list-item-dynamic-001.html b/tests/wpt/tests/css/css-pseudo/first-letter-list-item-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-list-item-dynamic-001.html rename to tests/wpt/tests/css/css-pseudo/first-letter-list-item-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-of-html-root-crash-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-of-html-root-crash-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-of-html-root-crash-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-of-html-root-crash-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-of-html-root-refcrash.html b/tests/wpt/tests/css/css-pseudo/first-letter-of-html-root-refcrash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-of-html-root-refcrash.html rename to tests/wpt/tests/css/css-pseudo/first-letter-of-html-root-refcrash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-opacity-001-not-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-opacity-001-not-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-opacity-001-not-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-opacity-001-not-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-opacity-001-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-opacity-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-opacity-001-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-opacity-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-opacity-001.html b/tests/wpt/tests/css/css-pseudo/first-letter-opacity-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-opacity-001.html rename to tests/wpt/tests/css/css-pseudo/first-letter-opacity-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-opacity-float-001-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-opacity-float-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-opacity-float-001-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-opacity-float-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-opacity-float-001.html b/tests/wpt/tests/css/css-pseudo/first-letter-opacity-float-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-opacity-float-001.html rename to tests/wpt/tests/css/css-pseudo/first-letter-opacity-float-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-punctuation-and-space-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-punctuation-and-space-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-punctuation-and-space-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-punctuation-and-space-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-punctuation-and-space.html b/tests/wpt/tests/css/css-pseudo/first-letter-punctuation-and-space.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-punctuation-and-space.html rename to tests/wpt/tests/css/css-pseudo/first-letter-punctuation-and-space.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-punctuation-dynamic-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-punctuation-dynamic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-punctuation-dynamic-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-punctuation-dynamic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-punctuation-dynamic.html b/tests/wpt/tests/css/css-pseudo/first-letter-punctuation-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-punctuation-dynamic.html rename to tests/wpt/tests/css/css-pseudo/first-letter-punctuation-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-skip-empty-span-nested-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-skip-empty-span-nested-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-skip-empty-span-nested-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-skip-empty-span-nested-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-skip-empty-span-nested.html b/tests/wpt/tests/css/css-pseudo/first-letter-skip-empty-span-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-skip-empty-span-nested.html rename to tests/wpt/tests/css/css-pseudo/first-letter-skip-empty-span-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-skip-empty-span-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-skip-empty-span-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-skip-empty-span-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-skip-empty-span-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-skip-empty-span.html b/tests/wpt/tests/css/css-pseudo/first-letter-skip-empty-span.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-skip-empty-span.html rename to tests/wpt/tests/css/css-pseudo/first-letter-skip-empty-span.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-skip-marker-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-skip-marker-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-skip-marker-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-skip-marker-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-skip-marker.html b/tests/wpt/tests/css/css-pseudo/first-letter-skip-marker.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-skip-marker.html rename to tests/wpt/tests/css/css-pseudo/first-letter-skip-marker.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-text-and-display-change.html b/tests/wpt/tests/css/css-pseudo/first-letter-text-and-display-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-text-and-display-change.html rename to tests/wpt/tests/css/css-pseudo/first-letter-text-and-display-change.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-width-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-width-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-width-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-width-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-width.html b/tests/wpt/tests/css/css-pseudo/first-letter-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-width.html rename to tests/wpt/tests/css/css-pseudo/first-letter-width.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-with-quote-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-with-quote-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-with-quote-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-with-quote-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-with-quote.html b/tests/wpt/tests/css/css-pseudo/first-letter-with-quote.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-with-quote.html rename to tests/wpt/tests/css/css-pseudo/first-letter-with-quote.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-with-span-ref.html b/tests/wpt/tests/css/css-pseudo/first-letter-with-span-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-with-span-ref.html rename to tests/wpt/tests/css/css-pseudo/first-letter-with-span-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-with-span.html b/tests/wpt/tests/css/css-pseudo/first-letter-with-span.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-letter-with-span.html rename to tests/wpt/tests/css/css-pseudo/first-letter-with-span.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-allowed-properties.html b/tests/wpt/tests/css/css-pseudo/first-line-allowed-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-allowed-properties.html rename to tests/wpt/tests/css/css-pseudo/first-line-allowed-properties.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-and-marker-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-and-marker-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-and-marker-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-and-marker-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-and-marker.html b/tests/wpt/tests/css/css-pseudo/first-line-and-marker.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-and-marker.html rename to tests/wpt/tests/css/css-pseudo/first-line-and-marker.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-and-placeholder-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-and-placeholder-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-and-placeholder-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-and-placeholder-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-and-placeholder.html b/tests/wpt/tests/css/css-pseudo/first-line-and-placeholder.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-and-placeholder.html rename to tests/wpt/tests/css/css-pseudo/first-line-and-placeholder.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-change-inline-color-nested-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-change-inline-color-nested-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-change-inline-color-nested-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-change-inline-color-nested-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-change-inline-color-nested.html b/tests/wpt/tests/css/css-pseudo/first-line-change-inline-color-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-change-inline-color-nested.html rename to tests/wpt/tests/css/css-pseudo/first-line-change-inline-color-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-change-inline-color-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-change-inline-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-change-inline-color-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-change-inline-color-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-change-inline-color.html b/tests/wpt/tests/css/css-pseudo/first-line-change-inline-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-change-inline-color.html rename to tests/wpt/tests/css/css-pseudo/first-line-change-inline-color.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-first-letter-insert-crash.html b/tests/wpt/tests/css/css-pseudo/first-line-first-letter-insert-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-first-letter-insert-crash.html rename to tests/wpt/tests/css/css-pseudo/first-line-first-letter-insert-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-green-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-green-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-green-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-green-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-inherited-no-transition-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-inherited-no-transition-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-inherited-no-transition-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-inherited-no-transition-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-inherited-no-transition.html b/tests/wpt/tests/css/css-pseudo/first-line-inherited-no-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-inherited-no-transition.html rename to tests/wpt/tests/css/css-pseudo/first-line-inherited-no-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-inherited-transition-crash.html b/tests/wpt/tests/css/css-pseudo/first-line-inherited-transition-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-inherited-transition-crash.html rename to tests/wpt/tests/css/css-pseudo/first-line-inherited-transition-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-inherited-with-transition-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-inherited-with-transition-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-inherited-with-transition-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-inherited-with-transition-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-inherited-with-transition.html b/tests/wpt/tests/css/css-pseudo/first-line-inherited-with-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-inherited-with-transition.html rename to tests/wpt/tests/css/css-pseudo/first-line-inherited-with-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-line-height-001-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-line-height-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-line-height-001-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-line-height-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-line-height-001.html b/tests/wpt/tests/css/css-pseudo/first-line-line-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-line-height-001.html rename to tests/wpt/tests/css/css-pseudo/first-line-line-height-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-line-height-002-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-line-height-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-line-height-002-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-line-height-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-line-height-002.html b/tests/wpt/tests/css/css-pseudo/first-line-line-height-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-line-height-002.html rename to tests/wpt/tests/css/css-pseudo/first-line-line-height-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-nested-gcs.html b/tests/wpt/tests/css/css-pseudo/first-line-nested-gcs.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-nested-gcs.html rename to tests/wpt/tests/css/css-pseudo/first-line-nested-gcs.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-on-ancestor-block-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-on-ancestor-block-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-on-ancestor-block-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-on-ancestor-block-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-on-ancestor-block.html b/tests/wpt/tests/css/css-pseudo/first-line-on-ancestor-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-on-ancestor-block.html rename to tests/wpt/tests/css/css-pseudo/first-line-on-ancestor-block.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-opacity-001-not-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-opacity-001-not-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-opacity-001-not-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-opacity-001-not-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-opacity-001-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-opacity-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-opacity-001-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-opacity-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-opacity-001.html b/tests/wpt/tests/css/css-pseudo/first-line-opacity-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-opacity-001.html rename to tests/wpt/tests/css/css-pseudo/first-line-opacity-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-replaced-001-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-replaced-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-replaced-001-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-replaced-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-replaced-001.html b/tests/wpt/tests/css/css-pseudo/first-line-replaced-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-replaced-001.html rename to tests/wpt/tests/css/css-pseudo/first-line-replaced-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-before-after-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-with-before-after-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-before-after-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-with-before-after-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-before-after.html b/tests/wpt/tests/css/css-pseudo/first-line-with-before-after.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-before-after.html rename to tests/wpt/tests/css/css-pseudo/first-line-with-before-after.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-inline-block-before-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-with-inline-block-before-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-inline-block-before-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-with-inline-block-before-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-inline-block-before.html b/tests/wpt/tests/css/css-pseudo/first-line-with-inline-block-before.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-inline-block-before.html rename to tests/wpt/tests/css/css-pseudo/first-line-with-inline-block-before.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-inline-block.html b/tests/wpt/tests/css/css-pseudo/first-line-with-inline-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-inline-block.html rename to tests/wpt/tests/css/css-pseudo/first-line-with-inline-block.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-out-of-flow-and-nested-div.html b/tests/wpt/tests/css/css-pseudo/first-line-with-out-of-flow-and-nested-div.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-out-of-flow-and-nested-div.html rename to tests/wpt/tests/css/css-pseudo/first-line-with-out-of-flow-and-nested-div.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-out-of-flow-and-nested-span.html b/tests/wpt/tests/css/css-pseudo/first-line-with-out-of-flow-and-nested-span.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-out-of-flow-and-nested-span.html rename to tests/wpt/tests/css/css-pseudo/first-line-with-out-of-flow-and-nested-span.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-out-of-flow-ref.html b/tests/wpt/tests/css/css-pseudo/first-line-with-out-of-flow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-out-of-flow-ref.html rename to tests/wpt/tests/css/css-pseudo/first-line-with-out-of-flow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-out-of-flow.html b/tests/wpt/tests/css/css-pseudo/first-line-with-out-of-flow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/first-line-with-out-of-flow.html rename to tests/wpt/tests/css/css-pseudo/first-line-with-out-of-flow.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/grammar-error-001-ref.html b/tests/wpt/tests/css/css-pseudo/grammar-error-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/grammar-error-001-ref.html rename to tests/wpt/tests/css/css-pseudo/grammar-error-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/grammar-error-001.html b/tests/wpt/tests/css/css-pseudo/grammar-error-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/grammar-error-001.html rename to tests/wpt/tests/css/css-pseudo/grammar-error-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/grammar-error-002-manual.html b/tests/wpt/tests/css/css-pseudo/grammar-error-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/grammar-error-002-manual.html rename to tests/wpt/tests/css/css-pseudo/grammar-error-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/grammar-error-003-manual.html b/tests/wpt/tests/css/css-pseudo/grammar-error-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/grammar-error-003-manual.html rename to tests/wpt/tests/css/css-pseudo/grammar-error-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/grammar-spelling-errors-001.html b/tests/wpt/tests/css/css-pseudo/grammar-spelling-errors-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/grammar-spelling-errors-001.html rename to tests/wpt/tests/css/css-pseudo/grammar-spelling-errors-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/grammar-spelling-errors-002.html b/tests/wpt/tests/css/css-pseudo/grammar-spelling-errors-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/grammar-spelling-errors-002.html rename to tests/wpt/tests/css/css-pseudo/grammar-spelling-errors-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-001-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-001-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-cascade-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-001.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-001.html rename to tests/wpt/tests/css/css-pseudo/highlight-cascade-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-002-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-002-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-cascade-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-002.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-002.html rename to tests/wpt/tests/css/css-pseudo/highlight-cascade-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-003-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-003-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-cascade-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-003.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-003.html rename to tests/wpt/tests/css/css-pseudo/highlight-cascade-003.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-004-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-004-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-cascade-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-004.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-004.html rename to tests/wpt/tests/css/css-pseudo/highlight-cascade-004.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-005-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-005-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-cascade-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-005.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-005.html rename to tests/wpt/tests/css/css-pseudo/highlight-cascade-005.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-006-ref.xhtml b/tests/wpt/tests/css/css-pseudo/highlight-cascade-006-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-006-ref.xhtml rename to tests/wpt/tests/css/css-pseudo/highlight-cascade-006-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-006.xhtml b/tests/wpt/tests/css/css-pseudo/highlight-cascade-006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-006.xhtml rename to tests/wpt/tests/css/css-pseudo/highlight-cascade-006.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-007.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-cascade-007.html rename to tests/wpt/tests/css/css-pseudo/highlight-cascade-007.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-computed-inheritance.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-computed-inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-computed-inheritance.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-computed-inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-computed-visited.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-computed-visited.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-computed-visited.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-computed-visited.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-computed.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-computed.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-properties-001-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-properties-001-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-properties-001.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-properties-001.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-properties-002-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-properties-002-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-properties-002.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-properties-002.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-001-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-001-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-001.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-001.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-002-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-002-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-002.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-002.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-text-shadow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-001-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-001-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-001.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-001.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-002-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-002-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-002.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-002.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-root-explicit-default-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-root-implicit-default-001.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-root-implicit-default-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-root-implicit-default-001.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-root-implicit-default-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-root-implicit-default-002.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-root-implicit-default-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-root-implicit-default-002.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-root-implicit-default-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-root-implicit-default-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-root-implicit-default-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-currentcolor-root-implicit-default-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-currentcolor-root-implicit-default-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-001-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-001-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-001.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-001.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-002-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-002-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-002.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-002.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-003-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-003-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-003.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-003.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-003.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-004-ref1.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-004-ref1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-004-ref1.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-004-ref1.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-004-ref2.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-004-ref2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-004-ref2.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-004-ref2.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-004-ref3.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-004-ref3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-004-ref3.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-004-ref3.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-004.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-004.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-004.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-005-crash.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-005-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-005-crash.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-005-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-currentcolor-005-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-currentcolor-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-currentcolor-005-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-currentcolor-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-currentcolor-005.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-currentcolor-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-currentcolor-005.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-currentcolor-005.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-soft-hyphens-001-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-soft-hyphens-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-soft-hyphens-001-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-soft-hyphens-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-soft-hyphens-001.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-soft-hyphens-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-soft-hyphens-001.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-soft-hyphens-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-soft-hyphens-002-crash.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-soft-hyphens-002-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-painting-soft-hyphens-002-crash.html rename to tests/wpt/tests/css/css-pseudo/highlight-painting-soft-hyphens-002-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-001-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-001-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-001.html b/tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-001.html rename to tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-002-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-002-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-002.html b/tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-002.html rename to tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-003-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-003-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-003.html b/tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-003.html rename to tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-003.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-004-notref.html b/tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-004-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-004-notref.html rename to tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-004-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-004.html b/tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-004.html rename to tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-004.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-005-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-005-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-005.html b/tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-005.html rename to tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-005.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-006-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-006-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-006.html b/tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-paired-cascade-006.html rename to tests/wpt/tests/css/css-pseudo/highlight-paired-cascade-006.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-pseudos-computed.html b/tests/wpt/tests/css/css-pseudo/highlight-pseudos-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-pseudos-computed.html rename to tests/wpt/tests/css/css-pseudo/highlight-pseudos-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-pseudos-inheritance-computed-001.html b/tests/wpt/tests/css/css-pseudo/highlight-pseudos-inheritance-computed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-pseudos-inheritance-computed-001.html rename to tests/wpt/tests/css/css-pseudo/highlight-pseudos-inheritance-computed-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-pseudos-visited-computed-001.html b/tests/wpt/tests/css/css-pseudo/highlight-pseudos-visited-computed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-pseudos-visited-computed-001.html rename to tests/wpt/tests/css/css-pseudo/highlight-pseudos-visited-computed-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-styling-001-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-styling-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-styling-001-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-styling-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-styling-001.html b/tests/wpt/tests/css/css-pseudo/highlight-styling-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-styling-001.html rename to tests/wpt/tests/css/css-pseudo/highlight-styling-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-styling-002-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-styling-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-styling-002-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-styling-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-styling-002.html b/tests/wpt/tests/css/css-pseudo/highlight-styling-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-styling-002.html rename to tests/wpt/tests/css/css-pseudo/highlight-styling-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-styling-003-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-styling-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-styling-003-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-styling-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-styling-003.tentative.html b/tests/wpt/tests/css/css-pseudo/highlight-styling-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-styling-003.tentative.html rename to tests/wpt/tests/css/css-pseudo/highlight-styling-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-z-index-001-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-z-index-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-z-index-001-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-z-index-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-z-index-001.html b/tests/wpt/tests/css/css-pseudo/highlight-z-index-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-z-index-001.html rename to tests/wpt/tests/css/css-pseudo/highlight-z-index-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-z-index-002-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-z-index-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-z-index-002-ref.html rename to tests/wpt/tests/css/css-pseudo/highlight-z-index-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/highlight-z-index-002.html b/tests/wpt/tests/css/css-pseudo/highlight-z-index-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/highlight-z-index-002.html rename to tests/wpt/tests/css/css-pseudo/highlight-z-index-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/idlharness.html b/tests/wpt/tests/css/css-pseudo/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/idlharness.html rename to tests/wpt/tests/css/css-pseudo/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-and-other-pseudo-elements-ref.html b/tests/wpt/tests/css/css-pseudo/marker-and-other-pseudo-elements-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-and-other-pseudo-elements-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-and-other-pseudo-elements-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-and-other-pseudo-elements.html b/tests/wpt/tests/css/css-pseudo/marker-and-other-pseudo-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-and-other-pseudo-elements.html rename to tests/wpt/tests/css/css-pseudo/marker-and-other-pseudo-elements.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-animate-002-ref.html b/tests/wpt/tests/css/css-pseudo/marker-animate-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-animate-002-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-animate-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-animate-002.html b/tests/wpt/tests/css/css-pseudo/marker-animate-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-animate-002.html rename to tests/wpt/tests/css/css-pseudo/marker-animate-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-animate.html b/tests/wpt/tests/css/css-pseudo/marker-animate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-animate.html rename to tests/wpt/tests/css/css-pseudo/marker-animate.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-color-ref.html b/tests/wpt/tests/css/css-pseudo/marker-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-color-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-color-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-color.html b/tests/wpt/tests/css/css-pseudo/marker-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-color.html rename to tests/wpt/tests/css/css-pseudo/marker-color.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-computed-content.html b/tests/wpt/tests/css/css-pseudo/marker-computed-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-computed-content.html rename to tests/wpt/tests/css/css-pseudo/marker-computed-content.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-computed-size.html b/tests/wpt/tests/css/css-pseudo/marker-computed-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-computed-size.html rename to tests/wpt/tests/css/css-pseudo/marker-computed-size.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-001-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-001-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-001.html b/tests/wpt/tests/css/css-pseudo/marker-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-001.html rename to tests/wpt/tests/css/css-pseudo/marker-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-001b.html b/tests/wpt/tests/css/css-pseudo/marker-content-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-001b.html rename to tests/wpt/tests/css/css-pseudo/marker-content-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-001c.html b/tests/wpt/tests/css/css-pseudo/marker-content-001c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-001c.html rename to tests/wpt/tests/css/css-pseudo/marker-content-001c.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-002-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-002-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-002.html b/tests/wpt/tests/css/css-pseudo/marker-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-002.html rename to tests/wpt/tests/css/css-pseudo/marker-content-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-003-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-003-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-003.html b/tests/wpt/tests/css/css-pseudo/marker-content-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-003.html rename to tests/wpt/tests/css/css-pseudo/marker-content-003.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-003b.html b/tests/wpt/tests/css/css-pseudo/marker-content-003b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-003b.html rename to tests/wpt/tests/css/css-pseudo/marker-content-003b.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-004-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-004-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-004.html b/tests/wpt/tests/css/css-pseudo/marker-content-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-004.html rename to tests/wpt/tests/css/css-pseudo/marker-content-004.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-005-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-005-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-005.html b/tests/wpt/tests/css/css-pseudo/marker-content-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-005.html rename to tests/wpt/tests/css/css-pseudo/marker-content-005.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-006-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-006-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-006.html b/tests/wpt/tests/css/css-pseudo/marker-content-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-006.html rename to tests/wpt/tests/css/css-pseudo/marker-content-006.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-007-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-007-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-007.tentative.html b/tests/wpt/tests/css/css-pseudo/marker-content-007.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-007.tentative.html rename to tests/wpt/tests/css/css-pseudo/marker-content-007.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-008-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-008-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-008.tentative.html b/tests/wpt/tests/css/css-pseudo/marker-content-008.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-008.tentative.html rename to tests/wpt/tests/css/css-pseudo/marker-content-008.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-009-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-009-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-009.tentative.html b/tests/wpt/tests/css/css-pseudo/marker-content-009.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-009.tentative.html rename to tests/wpt/tests/css/css-pseudo/marker-content-009.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-010-ref-001.html b/tests/wpt/tests/css/css-pseudo/marker-content-010-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-010-ref-001.html rename to tests/wpt/tests/css/css-pseudo/marker-content-010-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-010-ref-002.html b/tests/wpt/tests/css/css-pseudo/marker-content-010-ref-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-010-ref-002.html rename to tests/wpt/tests/css/css-pseudo/marker-content-010-ref-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-010.html b/tests/wpt/tests/css/css-pseudo/marker-content-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-010.html rename to tests/wpt/tests/css/css-pseudo/marker-content-010.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-011-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-011-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-011.tentative.html b/tests/wpt/tests/css/css-pseudo/marker-content-011.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-011.tentative.html rename to tests/wpt/tests/css/css-pseudo/marker-content-011.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-012-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-012-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-012.html b/tests/wpt/tests/css/css-pseudo/marker-content-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-012.html rename to tests/wpt/tests/css/css-pseudo/marker-content-012.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-013-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-013-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-013.html b/tests/wpt/tests/css/css-pseudo/marker-content-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-013.html rename to tests/wpt/tests/css/css-pseudo/marker-content-013.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-014-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-014-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-014.html b/tests/wpt/tests/css/css-pseudo/marker-content-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-014.html rename to tests/wpt/tests/css/css-pseudo/marker-content-014.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-015-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-015-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-015.html b/tests/wpt/tests/css/css-pseudo/marker-content-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-015.html rename to tests/wpt/tests/css/css-pseudo/marker-content-015.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-016-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-016-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-016.html b/tests/wpt/tests/css/css-pseudo/marker-content-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-016.html rename to tests/wpt/tests/css/css-pseudo/marker-content-016.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-017-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-017-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-017.html b/tests/wpt/tests/css/css-pseudo/marker-content-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-017.html rename to tests/wpt/tests/css/css-pseudo/marker-content-017.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-018-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-018-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-018.html b/tests/wpt/tests/css/css-pseudo/marker-content-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-018.html rename to tests/wpt/tests/css/css-pseudo/marker-content-018.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-019-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-019-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-019.html b/tests/wpt/tests/css/css-pseudo/marker-content-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-019.html rename to tests/wpt/tests/css/css-pseudo/marker-content-019.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-020-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-020-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-020.html b/tests/wpt/tests/css/css-pseudo/marker-content-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-020.html rename to tests/wpt/tests/css/css-pseudo/marker-content-020.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-021-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-021-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-021.html b/tests/wpt/tests/css/css-pseudo/marker-content-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-021.html rename to tests/wpt/tests/css/css-pseudo/marker-content-021.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-022-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-022-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-022.html b/tests/wpt/tests/css/css-pseudo/marker-content-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-022.html rename to tests/wpt/tests/css/css-pseudo/marker-content-022.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-023-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-023-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-023.html b/tests/wpt/tests/css/css-pseudo/marker-content-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-023.html rename to tests/wpt/tests/css/css-pseudo/marker-content-023.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-024-ref.html b/tests/wpt/tests/css/css-pseudo/marker-content-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-024-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-content-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-024.html b/tests/wpt/tests/css/css-pseudo/marker-content-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-content-024.html rename to tests/wpt/tests/css/css-pseudo/marker-content-024.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-default-styles.html b/tests/wpt/tests/css/css-pseudo/marker-default-styles.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-default-styles.html rename to tests/wpt/tests/css/css-pseudo/marker-default-styles.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-display-computed.html b/tests/wpt/tests/css/css-pseudo/marker-display-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-display-computed.html rename to tests/wpt/tests/css/css-pseudo/marker-display-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-display-dynamic-001.html b/tests/wpt/tests/css/css-pseudo/marker-display-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-display-dynamic-001.html rename to tests/wpt/tests/css/css-pseudo/marker-display-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-properties-ref.html b/tests/wpt/tests/css/css-pseudo/marker-font-properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-font-properties-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-font-properties-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-properties.html b/tests/wpt/tests/css/css-pseudo/marker-font-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-font-properties.html rename to tests/wpt/tests/css/css-pseudo/marker-font-properties.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-default-ref.html b/tests/wpt/tests/css/css-pseudo/marker-font-variant-numeric-default-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-default-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-font-variant-numeric-default-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-default.html b/tests/wpt/tests/css/css-pseudo/marker-font-variant-numeric-default.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-default.html rename to tests/wpt/tests/css/css-pseudo/marker-font-variant-numeric-default.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-normal-ref.html b/tests/wpt/tests/css/css-pseudo/marker-font-variant-numeric-normal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-normal-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-font-variant-numeric-normal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-normal.html b/tests/wpt/tests/css/css-pseudo/marker-font-variant-numeric-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-font-variant-numeric-normal.html rename to tests/wpt/tests/css/css-pseudo/marker-font-variant-numeric-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-hit-testing.html b/tests/wpt/tests/css/css-pseudo/marker-hit-testing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-hit-testing.html rename to tests/wpt/tests/css/css-pseudo/marker-hit-testing.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-hyphens-ref.html b/tests/wpt/tests/css/css-pseudo/marker-hyphens-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-hyphens-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-hyphens-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-hyphens.html b/tests/wpt/tests/css/css-pseudo/marker-hyphens.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-hyphens.html rename to tests/wpt/tests/css/css-pseudo/marker-hyphens.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-inherit-line-height-ref.html b/tests/wpt/tests/css/css-pseudo/marker-inherit-line-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-inherit-line-height-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-inherit-line-height-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-inherit-line-height.html b/tests/wpt/tests/css/css-pseudo/marker-inherit-line-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-inherit-line-height.html rename to tests/wpt/tests/css/css-pseudo/marker-inherit-line-height.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-inherit-values-ref.html b/tests/wpt/tests/css/css-pseudo/marker-inherit-values-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-inherit-values-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-inherit-values-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-inherit-values.html b/tests/wpt/tests/css/css-pseudo/marker-inherit-values.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-inherit-values.html rename to tests/wpt/tests/css/css-pseudo/marker-inherit-values.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-intrinsic-contribution-001.html b/tests/wpt/tests/css/css-pseudo/marker-intrinsic-contribution-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-intrinsic-contribution-001.html rename to tests/wpt/tests/css/css-pseudo/marker-intrinsic-contribution-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-intrinsic-contribution-002-ref.html b/tests/wpt/tests/css/css-pseudo/marker-intrinsic-contribution-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-intrinsic-contribution-002-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-intrinsic-contribution-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-intrinsic-contribution-002.html b/tests/wpt/tests/css/css-pseudo/marker-intrinsic-contribution-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-intrinsic-contribution-002.html rename to tests/wpt/tests/css/css-pseudo/marker-intrinsic-contribution-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing-ref-001.html b/tests/wpt/tests/css/css-pseudo/marker-letter-spacing-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing-ref-001.html rename to tests/wpt/tests/css/css-pseudo/marker-letter-spacing-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing-ref-002.html b/tests/wpt/tests/css/css-pseudo/marker-letter-spacing-ref-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing-ref-002.html rename to tests/wpt/tests/css/css-pseudo/marker-letter-spacing-ref-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing.html b/tests/wpt/tests/css/css-pseudo/marker-letter-spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing.html rename to tests/wpt/tests/css/css-pseudo/marker-letter-spacing.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-line-break-ref.html b/tests/wpt/tests/css/css-pseudo/marker-line-break-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-line-break-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-line-break-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-line-break.html b/tests/wpt/tests/css/css-pseudo/marker-line-break.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-line-break.html rename to tests/wpt/tests/css/css-pseudo/marker-line-break.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-line-height-ref.html b/tests/wpt/tests/css/css-pseudo/marker-line-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-line-height-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-line-height-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-line-height.html b/tests/wpt/tests/css/css-pseudo/marker-line-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-line-height.html rename to tests/wpt/tests/css/css-pseudo/marker-line-height.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-list-style-position-ref-001.html b/tests/wpt/tests/css/css-pseudo/marker-list-style-position-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-list-style-position-ref-001.html rename to tests/wpt/tests/css/css-pseudo/marker-list-style-position-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-list-style-position-ref-002.html b/tests/wpt/tests/css/css-pseudo/marker-list-style-position-ref-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-list-style-position-ref-002.html rename to tests/wpt/tests/css/css-pseudo/marker-list-style-position-ref-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-list-style-position.html b/tests/wpt/tests/css/css-pseudo/marker-list-style-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-list-style-position.html rename to tests/wpt/tests/css/css-pseudo/marker-list-style-position.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-overflow-wrap.html b/tests/wpt/tests/css/css-pseudo/marker-overflow-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-overflow-wrap.html rename to tests/wpt/tests/css/css-pseudo/marker-overflow-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-reverted-styles.html b/tests/wpt/tests/css/css-pseudo/marker-reverted-styles.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-reverted-styles.html rename to tests/wpt/tests/css/css-pseudo/marker-reverted-styles.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-tab-size-ref.html b/tests/wpt/tests/css/css-pseudo/marker-tab-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-tab-size-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-tab-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-tab-size.html b/tests/wpt/tests/css/css-pseudo/marker-tab-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-tab-size.html rename to tests/wpt/tests/css/css-pseudo/marker-tab-size.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-001-ref.html b/tests/wpt/tests/css/css-pseudo/marker-text-align-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-001-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-text-align-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-001.html b/tests/wpt/tests/css/css-pseudo/marker-text-align-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-001.html rename to tests/wpt/tests/css/css-pseudo/marker-text-align-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-002-ref.html b/tests/wpt/tests/css/css-pseudo/marker-text-align-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-002-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-text-align-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-002.html b/tests/wpt/tests/css/css-pseudo/marker-text-align-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-002.html rename to tests/wpt/tests/css/css-pseudo/marker-text-align-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-003-ref.html b/tests/wpt/tests/css/css-pseudo/marker-text-align-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-003-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-text-align-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-003.html b/tests/wpt/tests/css/css-pseudo/marker-text-align-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-003.html rename to tests/wpt/tests/css/css-pseudo/marker-text-align-003.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-combine-upright-ref.html b/tests/wpt/tests/css/css-pseudo/marker-text-combine-upright-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-combine-upright-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-text-combine-upright-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-combine-upright.html b/tests/wpt/tests/css/css-pseudo/marker-text-combine-upright.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-combine-upright.html rename to tests/wpt/tests/css/css-pseudo/marker-text-combine-upright.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-decoration-skip-ink-ref.html b/tests/wpt/tests/css/css-pseudo/marker-text-decoration-skip-ink-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-decoration-skip-ink-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-text-decoration-skip-ink-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-decoration-skip-ink.html b/tests/wpt/tests/css/css-pseudo/marker-text-decoration-skip-ink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-decoration-skip-ink.html rename to tests/wpt/tests/css/css-pseudo/marker-text-decoration-skip-ink.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-emphasis-ref.html b/tests/wpt/tests/css/css-pseudo/marker-text-emphasis-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-emphasis-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-text-emphasis-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-emphasis.html b/tests/wpt/tests/css/css-pseudo/marker-text-emphasis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-emphasis.html rename to tests/wpt/tests/css/css-pseudo/marker-text-emphasis.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-shadow-ref.html b/tests/wpt/tests/css/css-pseudo/marker-text-shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-shadow-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-text-shadow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-shadow.html b/tests/wpt/tests/css/css-pseudo/marker-text-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-shadow.html rename to tests/wpt/tests/css/css-pseudo/marker-text-shadow.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-default-ref.html b/tests/wpt/tests/css/css-pseudo/marker-text-transform-default-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-default-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-text-transform-default-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-default.html b/tests/wpt/tests/css/css-pseudo/marker-text-transform-default.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-default.html rename to tests/wpt/tests/css/css-pseudo/marker-text-transform-default.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-dynamic-ref.html b/tests/wpt/tests/css/css-pseudo/marker-text-transform-dynamic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-dynamic-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-text-transform-dynamic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-dynamic.html b/tests/wpt/tests/css/css-pseudo/marker-text-transform-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-dynamic.html rename to tests/wpt/tests/css/css-pseudo/marker-text-transform-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-uppercase-ref.html b/tests/wpt/tests/css/css-pseudo/marker-text-transform-uppercase-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-uppercase-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-text-transform-uppercase-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-uppercase.html b/tests/wpt/tests/css/css-pseudo/marker-text-transform-uppercase.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-text-transform-uppercase.html rename to tests/wpt/tests/css/css-pseudo/marker-text-transform-uppercase.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-default-ref.html b/tests/wpt/tests/css/css-pseudo/marker-unicode-bidi-default-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-default-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-unicode-bidi-default-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-default.html b/tests/wpt/tests/css/css-pseudo/marker-unicode-bidi-default.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-default.html rename to tests/wpt/tests/css/css-pseudo/marker-unicode-bidi-default.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-normal-ref.html b/tests/wpt/tests/css/css-pseudo/marker-unicode-bidi-normal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-normal-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-unicode-bidi-normal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-normal.html b/tests/wpt/tests/css/css-pseudo/marker-unicode-bidi-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-unicode-bidi-normal.html rename to tests/wpt/tests/css/css-pseudo/marker-unicode-bidi-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-variable-computed-style.html b/tests/wpt/tests/css/css-pseudo/marker-variable-computed-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-variable-computed-style.html rename to tests/wpt/tests/css/css-pseudo/marker-variable-computed-style.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-variable-ref.html b/tests/wpt/tests/css/css-pseudo/marker-variable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-variable-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-variable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-variable.html b/tests/wpt/tests/css/css-pseudo/marker-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-variable.html rename to tests/wpt/tests/css/css-pseudo/marker-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-break-ref.html b/tests/wpt/tests/css/css-pseudo/marker-word-break-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-word-break-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-word-break-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-break.html b/tests/wpt/tests/css/css-pseudo/marker-word-break.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-word-break.html rename to tests/wpt/tests/css/css-pseudo/marker-word-break.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-spacing-ref.html b/tests/wpt/tests/css/css-pseudo/marker-word-spacing-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-word-spacing-ref.html rename to tests/wpt/tests/css/css-pseudo/marker-word-spacing-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-spacing.html b/tests/wpt/tests/css/css-pseudo/marker-word-spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/marker-word-spacing.html rename to tests/wpt/tests/css/css-pseudo/marker-word-spacing.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/outside-marker-paint-order-ref.html b/tests/wpt/tests/css/css-pseudo/outside-marker-paint-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/outside-marker-paint-order-ref.html rename to tests/wpt/tests/css/css-pseudo/outside-marker-paint-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/outside-marker-paint-order.html b/tests/wpt/tests/css/css-pseudo/outside-marker-paint-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/outside-marker-paint-order.html rename to tests/wpt/tests/css/css-pseudo/outside-marker-paint-order.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/parsing/highlight-pseudos.html b/tests/wpt/tests/css/css-pseudo/parsing/highlight-pseudos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/parsing/highlight-pseudos.html rename to tests/wpt/tests/css/css-pseudo/parsing/highlight-pseudos.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation.html b/tests/wpt/tests/css/css-pseudo/parsing/marker-supported-properties-in-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation.html rename to tests/wpt/tests/css/css-pseudo/parsing/marker-supported-properties-in-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties.html b/tests/wpt/tests/css/css-pseudo/parsing/marker-supported-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties.html rename to tests/wpt/tests/css/css-pseudo/parsing/marker-supported-properties.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/parsing/tree-abiding-pseudo-elements.html b/tests/wpt/tests/css/css-pseudo/parsing/tree-abiding-pseudo-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/parsing/tree-abiding-pseudo-elements.html rename to tests/wpt/tests/css/css-pseudo/parsing/tree-abiding-pseudo-elements.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/placeholder-as-multicol-crash.html b/tests/wpt/tests/css/css-pseudo/placeholder-as-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/placeholder-as-multicol-crash.html rename to tests/wpt/tests/css/css-pseudo/placeholder-as-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/placeholder-excluded-properties.html b/tests/wpt/tests/css/css-pseudo/placeholder-excluded-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/placeholder-excluded-properties.html rename to tests/wpt/tests/css/css-pseudo/placeholder-excluded-properties.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/placeholder-inherit.html b/tests/wpt/tests/css/css-pseudo/placeholder-inherit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/placeholder-inherit.html rename to tests/wpt/tests/css/css-pseudo/placeholder-inherit.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/placeholder-input-dynamic-crash.html b/tests/wpt/tests/css/css-pseudo/placeholder-input-dynamic-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/placeholder-input-dynamic-crash.html rename to tests/wpt/tests/css/css-pseudo/placeholder-input-dynamic-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/placeholder-input-number-notref.html b/tests/wpt/tests/css/css-pseudo/placeholder-input-number-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/placeholder-input-number-notref.html rename to tests/wpt/tests/css/css-pseudo/placeholder-input-number-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/placeholder-input-number.html b/tests/wpt/tests/css/css-pseudo/placeholder-input-number.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/placeholder-input-number.html rename to tests/wpt/tests/css/css-pseudo/placeholder-input-number.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-011-ref.html b/tests/wpt/tests/css/css-pseudo/reference/active-selection-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-011-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/active-selection-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-012-ref.html b/tests/wpt/tests/css/css-pseudo/reference/active-selection-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-012-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/active-selection-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-014-ref.html b/tests/wpt/tests/css/css-pseudo/reference/active-selection-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-014-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/active-selection-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-016-ref.html b/tests/wpt/tests/css/css-pseudo/reference/active-selection-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-016-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/active-selection-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-018-ref.html b/tests/wpt/tests/css/css-pseudo/reference/active-selection-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-018-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/active-selection-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-021-ref.html b/tests/wpt/tests/css/css-pseudo/reference/active-selection-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-021-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/active-selection-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-025-ref.html b/tests/wpt/tests/css/css-pseudo/reference/active-selection-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-025-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/active-selection-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-027-ref.html b/tests/wpt/tests/css/css-pseudo/reference/active-selection-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-027-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/active-selection-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-031-ref.html b/tests/wpt/tests/css/css-pseudo/reference/active-selection-031-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-031-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/active-selection-031-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-041-notref.html b/tests/wpt/tests/css/css-pseudo/reference/active-selection-041-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-041-notref.html rename to tests/wpt/tests/css/css-pseudo/reference/active-selection-041-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/cascade-highlight-005-ref.html b/tests/wpt/tests/css/css-pseudo/reference/cascade-highlight-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/cascade-highlight-005-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/cascade-highlight-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/first-letter-digraph-ref.html b/tests/wpt/tests/css/css-pseudo/reference/first-letter-digraph-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/first-letter-digraph-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/first-letter-digraph-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/first-line-with-inline-block-ref.html b/tests/wpt/tests/css/css-pseudo/reference/first-line-with-inline-block-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/first-line-with-inline-block-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/first-line-with-inline-block-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/grammar-spelling-errors-001-ref.html b/tests/wpt/tests/css/css-pseudo/reference/grammar-spelling-errors-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/grammar-spelling-errors-001-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/grammar-spelling-errors-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/grammar-spelling-errors-002-ref.html b/tests/wpt/tests/css/css-pseudo/reference/grammar-spelling-errors-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/grammar-spelling-errors-002-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/grammar-spelling-errors-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/placeholder-excluded-properties-ref.html b/tests/wpt/tests/css/css-pseudo/reference/placeholder-excluded-properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/placeholder-excluded-properties-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/placeholder-excluded-properties-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-contenteditable-011-ref.html b/tests/wpt/tests/css/css-pseudo/reference/selection-contenteditable-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-contenteditable-011-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/selection-contenteditable-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-input-011-ref.html b/tests/wpt/tests/css/css-pseudo/reference/selection-input-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-input-011-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/selection-input-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-intercharacter-011-ref.html b/tests/wpt/tests/css/css-pseudo/reference/selection-intercharacter-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-intercharacter-011-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/selection-intercharacter-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-intercharacter-012-ref.html b/tests/wpt/tests/css/css-pseudo/reference/selection-intercharacter-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-intercharacter-012-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/selection-intercharacter-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-overlay-and-grammar-001-ref.html b/tests/wpt/tests/css/css-pseudo/reference/selection-overlay-and-grammar-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-overlay-and-grammar-001-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/selection-overlay-and-grammar-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-overlay-and-spelling-001-ref.html b/tests/wpt/tests/css/css-pseudo/reference/selection-overlay-and-spelling-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-overlay-and-spelling-001-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/selection-overlay-and-spelling-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-textarea-011-ref.html b/tests/wpt/tests/css/css-pseudo/reference/selection-textarea-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-textarea-011-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/selection-textarea-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/svg-text-selection-002-ref.html b/tests/wpt/tests/css/css-pseudo/reference/svg-text-selection-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/reference/svg-text-selection-002-ref.html rename to tests/wpt/tests/css/css-pseudo/reference/svg-text-selection-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-background-painting-order-ref1.html b/tests/wpt/tests/css/css-pseudo/selection-background-painting-order-ref1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-background-painting-order-ref1.html rename to tests/wpt/tests/css/css-pseudo/selection-background-painting-order-ref1.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-background-painting-order-ref2.html b/tests/wpt/tests/css/css-pseudo/selection-background-painting-order-ref2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-background-painting-order-ref2.html rename to tests/wpt/tests/css/css-pseudo/selection-background-painting-order-ref2.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-background-painting-order.html b/tests/wpt/tests/css/css-pseudo/selection-background-painting-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-background-painting-order.html rename to tests/wpt/tests/css/css-pseudo/selection-background-painting-order.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-contenteditable-011.html b/tests/wpt/tests/css/css-pseudo/selection-contenteditable-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-contenteditable-011.html rename to tests/wpt/tests/css/css-pseudo/selection-contenteditable-011.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-input-011.html b/tests/wpt/tests/css/css-pseudo/selection-input-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-input-011.html rename to tests/wpt/tests/css/css-pseudo/selection-input-011.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-intercharacter-011.html b/tests/wpt/tests/css/css-pseudo/selection-intercharacter-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-intercharacter-011.html rename to tests/wpt/tests/css/css-pseudo/selection-intercharacter-011.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-intercharacter-012.html b/tests/wpt/tests/css/css-pseudo/selection-intercharacter-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-intercharacter-012.html rename to tests/wpt/tests/css/css-pseudo/selection-intercharacter-012.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-link-001-ref.html b/tests/wpt/tests/css/css-pseudo/selection-link-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-link-001-ref.html rename to tests/wpt/tests/css/css-pseudo/selection-link-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-link-001.html b/tests/wpt/tests/css/css-pseudo/selection-link-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-link-001.html rename to tests/wpt/tests/css/css-pseudo/selection-link-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-link-002-ref.html b/tests/wpt/tests/css/css-pseudo/selection-link-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-link-002-ref.html rename to tests/wpt/tests/css/css-pseudo/selection-link-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-link-002.html b/tests/wpt/tests/css/css-pseudo/selection-link-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-link-002.html rename to tests/wpt/tests/css/css-pseudo/selection-link-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-link-003-ref.html b/tests/wpt/tests/css/css-pseudo/selection-link-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-link-003-ref.html rename to tests/wpt/tests/css/css-pseudo/selection-link-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-link-003.html b/tests/wpt/tests/css/css-pseudo/selection-link-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-link-003.html rename to tests/wpt/tests/css/css-pseudo/selection-link-003.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-originating-decoration-color-ref.html b/tests/wpt/tests/css/css-pseudo/selection-originating-decoration-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-originating-decoration-color-ref.html rename to tests/wpt/tests/css/css-pseudo/selection-originating-decoration-color-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-originating-decoration-color.html b/tests/wpt/tests/css/css-pseudo/selection-originating-decoration-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-originating-decoration-color.html rename to tests/wpt/tests/css/css-pseudo/selection-originating-decoration-color.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-originating-strikethrough-order-ref.html b/tests/wpt/tests/css/css-pseudo/selection-originating-strikethrough-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-originating-strikethrough-order-ref.html rename to tests/wpt/tests/css/css-pseudo/selection-originating-strikethrough-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-originating-strikethrough-order.html b/tests/wpt/tests/css/css-pseudo/selection-originating-strikethrough-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-originating-strikethrough-order.html rename to tests/wpt/tests/css/css-pseudo/selection-originating-strikethrough-order.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-originating-underline-order-ref.html b/tests/wpt/tests/css/css-pseudo/selection-originating-underline-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-originating-underline-order-ref.html rename to tests/wpt/tests/css/css-pseudo/selection-originating-underline-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-originating-underline-order.html b/tests/wpt/tests/css/css-pseudo/selection-originating-underline-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-originating-underline-order.html rename to tests/wpt/tests/css/css-pseudo/selection-originating-underline-order.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-grammar-001.html b/tests/wpt/tests/css/css-pseudo/selection-overlay-and-grammar-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-grammar-001.html rename to tests/wpt/tests/css/css-pseudo/selection-overlay-and-grammar-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-spelling-001.html b/tests/wpt/tests/css/css-pseudo/selection-overlay-and-spelling-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-spelling-001.html rename to tests/wpt/tests/css/css-pseudo/selection-overlay-and-spelling-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-paint-image-notref.html b/tests/wpt/tests/css/css-pseudo/selection-paint-image-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-paint-image-notref.html rename to tests/wpt/tests/css/css-pseudo/selection-paint-image-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-paint-image.html b/tests/wpt/tests/css/css-pseudo/selection-paint-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-paint-image.html rename to tests/wpt/tests/css/css-pseudo/selection-paint-image.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-textarea-011.html b/tests/wpt/tests/css/css-pseudo/selection-textarea-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-textarea-011.html rename to tests/wpt/tests/css/css-pseudo/selection-textarea-011.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-universal-shadow-dom.html b/tests/wpt/tests/css/css-pseudo/selection-universal-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/selection-universal-shadow-dom.html rename to tests/wpt/tests/css/css-pseudo/selection-universal-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-001-ref.html b/tests/wpt/tests/css/css-pseudo/spelling-error-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-001-ref.html rename to tests/wpt/tests/css/css-pseudo/spelling-error-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-001.html b/tests/wpt/tests/css/css-pseudo/spelling-error-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-001.html rename to tests/wpt/tests/css/css-pseudo/spelling-error-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-002-manual.html b/tests/wpt/tests/css/css-pseudo/spelling-error-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-002-manual.html rename to tests/wpt/tests/css/css-pseudo/spelling-error-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-003-manual.html b/tests/wpt/tests/css/css-pseudo/spelling-error-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-003-manual.html rename to tests/wpt/tests/css/css-pseudo/spelling-error-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-004-crash.html b/tests/wpt/tests/css/css-pseudo/spelling-error-004-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-004-crash.html rename to tests/wpt/tests/css/css-pseudo/spelling-error-004-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-005-crash.html b/tests/wpt/tests/css/css-pseudo/spelling-error-005-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-005-crash.html rename to tests/wpt/tests/css/css-pseudo/spelling-error-005-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-006-notref.html b/tests/wpt/tests/css/css-pseudo/spelling-error-006-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-006-notref.html rename to tests/wpt/tests/css/css-pseudo/spelling-error-006-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-006.html b/tests/wpt/tests/css/css-pseudo/spelling-error-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/spelling-error-006.html rename to tests/wpt/tests/css/css-pseudo/spelling-error-006.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/support/100x100-red.png b/tests/wpt/tests/css/css-pseudo/support/100x100-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/support/100x100-red.png rename to tests/wpt/tests/css/css-pseudo/support/100x100-red.png diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/support/60x60-red.png b/tests/wpt/tests/css/css-pseudo/support/60x60-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/support/60x60-red.png rename to tests/wpt/tests/css/css-pseudo/support/60x60-red.png diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/support/highlights.css b/tests/wpt/tests/css/css-pseudo/support/highlights.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/support/highlights.css rename to tests/wpt/tests/css/css-pseudo/support/highlights.css diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/support/selections.js b/tests/wpt/tests/css/css-pseudo/support/selections.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/support/selections.js rename to tests/wpt/tests/css/css-pseudo/support/selections.js diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/svg-text-selection-002.html b/tests/wpt/tests/css/css-pseudo/svg-text-selection-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/svg-text-selection-002.html rename to tests/wpt/tests/css/css-pseudo/svg-text-selection-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-001.html b/tests/wpt/tests/css/css-pseudo/target-text-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-001.html rename to tests/wpt/tests/css/css-pseudo/target-text-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-002.html b/tests/wpt/tests/css/css-pseudo/target-text-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-002.html rename to tests/wpt/tests/css/css-pseudo/target-text-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-003.html b/tests/wpt/tests/css/css-pseudo/target-text-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-003.html rename to tests/wpt/tests/css/css-pseudo/target-text-003.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-004.html b/tests/wpt/tests/css/css-pseudo/target-text-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-004.html rename to tests/wpt/tests/css/css-pseudo/target-text-004.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-005.html b/tests/wpt/tests/css/css-pseudo/target-text-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-005.html rename to tests/wpt/tests/css/css-pseudo/target-text-005.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-006.html b/tests/wpt/tests/css/css-pseudo/target-text-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-006.html rename to tests/wpt/tests/css/css-pseudo/target-text-006.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-007.html b/tests/wpt/tests/css/css-pseudo/target-text-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-007.html rename to tests/wpt/tests/css/css-pseudo/target-text-007.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-008-ref.html b/tests/wpt/tests/css/css-pseudo/target-text-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-008-ref.html rename to tests/wpt/tests/css/css-pseudo/target-text-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-008.html b/tests/wpt/tests/css/css-pseudo/target-text-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-008.html rename to tests/wpt/tests/css/css-pseudo/target-text-008.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-dynamic-001-ref.html b/tests/wpt/tests/css/css-pseudo/target-text-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-dynamic-001-ref.html rename to tests/wpt/tests/css/css-pseudo/target-text-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-dynamic-001.html b/tests/wpt/tests/css/css-pseudo/target-text-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-dynamic-001.html rename to tests/wpt/tests/css/css-pseudo/target-text-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-dynamic-002.html b/tests/wpt/tests/css/css-pseudo/target-text-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-dynamic-002.html rename to tests/wpt/tests/css/css-pseudo/target-text-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-dynamic-003.html b/tests/wpt/tests/css/css-pseudo/target-text-dynamic-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-dynamic-003.html rename to tests/wpt/tests/css/css-pseudo/target-text-dynamic-003.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-dynamic-004.html b/tests/wpt/tests/css/css-pseudo/target-text-dynamic-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-dynamic-004.html rename to tests/wpt/tests/css/css-pseudo/target-text-dynamic-004.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-lime-green-ref.html b/tests/wpt/tests/css/css-pseudo/target-text-lime-green-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-lime-green-ref.html rename to tests/wpt/tests/css/css-pseudo/target-text-lime-green-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-lime-ref.html b/tests/wpt/tests/css/css-pseudo/target-text-lime-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-lime-ref.html rename to tests/wpt/tests/css/css-pseudo/target-text-lime-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-text-decoration-001-ref.html b/tests/wpt/tests/css/css-pseudo/target-text-text-decoration-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-text-decoration-001-ref.html rename to tests/wpt/tests/css/css-pseudo/target-text-text-decoration-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-text-decoration-001.html b/tests/wpt/tests/css/css-pseudo/target-text-text-decoration-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-text-decoration-001.html rename to tests/wpt/tests/css/css-pseudo/target-text-text-decoration-001.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/target-text-two-words-ref.html b/tests/wpt/tests/css/css-pseudo/target-text-two-words-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/target-text-two-words-ref.html rename to tests/wpt/tests/css/css-pseudo/target-text-two-words-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/text-selection.html b/tests/wpt/tests/css/css-pseudo/text-selection.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/text-selection.html rename to tests/wpt/tests/css/css-pseudo/text-selection.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/textpath-selection-011-ref.html b/tests/wpt/tests/css/css-pseudo/textpath-selection-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/textpath-selection-011-ref.html rename to tests/wpt/tests/css/css-pseudo/textpath-selection-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/textpath-selection-011.html b/tests/wpt/tests/css/css-pseudo/textpath-selection-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-pseudo/textpath-selection-011.html rename to tests/wpt/tests/css/css-pseudo/textpath-selection-011.html diff --git a/tests/wpt/web-platform-tests/css/css-rhythm/block-step-size-establishes-independent-formatting-context-list-item.html b/tests/wpt/tests/css/css-rhythm/block-step-size-establishes-independent-formatting-context-list-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-rhythm/block-step-size-establishes-independent-formatting-context-list-item.html rename to tests/wpt/tests/css/css-rhythm/block-step-size-establishes-independent-formatting-context-list-item.html diff --git a/tests/wpt/web-platform-tests/css/css-rhythm/block-step-size-establishes-independent-formatting-context.html b/tests/wpt/tests/css/css-rhythm/block-step-size-establishes-independent-formatting-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-rhythm/block-step-size-establishes-independent-formatting-context.html rename to tests/wpt/tests/css/css-rhythm/block-step-size-establishes-independent-formatting-context.html diff --git a/tests/wpt/web-platform-tests/css/css-rhythm/block-step-size-none-does-not-establish-indepdendent-formatting-context.html b/tests/wpt/tests/css/css-rhythm/block-step-size-none-does-not-establish-indepdendent-formatting-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-rhythm/block-step-size-none-does-not-establish-indepdendent-formatting-context.html rename to tests/wpt/tests/css/css-rhythm/block-step-size-none-does-not-establish-indepdendent-formatting-context.html diff --git a/tests/wpt/web-platform-tests/css/css-rhythm/parsing/block-step-insert-computed.html b/tests/wpt/tests/css/css-rhythm/parsing/block-step-insert-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-rhythm/parsing/block-step-insert-computed.html rename to tests/wpt/tests/css/css-rhythm/parsing/block-step-insert-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-rhythm/parsing/block-step-insert-invalid.html b/tests/wpt/tests/css/css-rhythm/parsing/block-step-insert-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-rhythm/parsing/block-step-insert-invalid.html rename to tests/wpt/tests/css/css-rhythm/parsing/block-step-insert-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-rhythm/parsing/block-step-insert-valid.html b/tests/wpt/tests/css/css-rhythm/parsing/block-step-insert-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-rhythm/parsing/block-step-insert-valid.html rename to tests/wpt/tests/css/css-rhythm/parsing/block-step-insert-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-rhythm/parsing/block-step-size-computed.html b/tests/wpt/tests/css/css-rhythm/parsing/block-step-size-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-rhythm/parsing/block-step-size-computed.html rename to tests/wpt/tests/css/css-rhythm/parsing/block-step-size-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-rhythm/parsing/block-step-size-invalid.html b/tests/wpt/tests/css/css-rhythm/parsing/block-step-size-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-rhythm/parsing/block-step-size-invalid.html rename to tests/wpt/tests/css/css-rhythm/parsing/block-step-size-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-rhythm/parsing/block-step-size-valid.html b/tests/wpt/tests/css/css-rhythm/parsing/block-step-size-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-rhythm/parsing/block-step-size-valid.html rename to tests/wpt/tests/css/css-rhythm/parsing/block-step-size-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/META.yml b/tests/wpt/tests/css/css-round-display/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/META.yml rename to tests/wpt/tests/css/css-round-display/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-anchor-center-001.html b/tests/wpt/tests/css/css-round-display/polar-anchor-center-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-anchor-center-001.html rename to tests/wpt/tests/css/css-round-display/polar-anchor-center-001.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-anchor-center-002.html b/tests/wpt/tests/css/css-round-display/polar-anchor-center-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-anchor-center-002.html rename to tests/wpt/tests/css/css-round-display/polar-anchor-center-002.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-anchor-center-003.html b/tests/wpt/tests/css/css-round-display/polar-anchor-center-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-anchor-center-003.html rename to tests/wpt/tests/css/css-round-display/polar-anchor-center-003.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-anchor-left-top-001.html b/tests/wpt/tests/css/css-round-display/polar-anchor-left-top-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-anchor-left-top-001.html rename to tests/wpt/tests/css/css-round-display/polar-anchor-left-top-001.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-anchor-top-001.html b/tests/wpt/tests/css/css-round-display/polar-anchor-top-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-anchor-top-001.html rename to tests/wpt/tests/css/css-round-display/polar-anchor-top-001.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-origin-and-anchor-001.html b/tests/wpt/tests/css/css-round-display/polar-origin-and-anchor-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-origin-and-anchor-001.html rename to tests/wpt/tests/css/css-round-display/polar-origin-and-anchor-001.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-origin-and-anchor-002.html b/tests/wpt/tests/css/css-round-display/polar-origin-and-anchor-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-origin-and-anchor-002.html rename to tests/wpt/tests/css/css-round-display/polar-origin-and-anchor-002.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-origin-and-anchor-003.html b/tests/wpt/tests/css/css-round-display/polar-origin-and-anchor-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-origin-and-anchor-003.html rename to tests/wpt/tests/css/css-round-display/polar-origin-and-anchor-003.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-origin-and-anchor-004.html b/tests/wpt/tests/css/css-round-display/polar-origin-and-anchor-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-origin-and-anchor-004.html rename to tests/wpt/tests/css/css-round-display/polar-origin-and-anchor-004.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-origin-and-anchor-005.html b/tests/wpt/tests/css/css-round-display/polar-origin-and-anchor-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-origin-and-anchor-005.html rename to tests/wpt/tests/css/css-round-display/polar-origin-and-anchor-005.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-origin-auto-001.html b/tests/wpt/tests/css/css-round-display/polar-origin-auto-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-origin-auto-001.html rename to tests/wpt/tests/css/css-round-display/polar-origin-auto-001.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-origin-auto-002.html b/tests/wpt/tests/css/css-round-display/polar-origin-auto-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-origin-auto-002.html rename to tests/wpt/tests/css/css-round-display/polar-origin-auto-002.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-origin-center-001.html b/tests/wpt/tests/css/css-round-display/polar-origin-center-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-origin-center-001.html rename to tests/wpt/tests/css/css-round-display/polar-origin-center-001.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-origin-left-001.html b/tests/wpt/tests/css/css-round-display/polar-origin-left-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-origin-left-001.html rename to tests/wpt/tests/css/css-round-display/polar-origin-left-001.html diff --git a/tests/wpt/web-platform-tests/css/css-round-display/polar-origin-left-bottom-001.html b/tests/wpt/tests/css/css-round-display/polar-origin-left-bottom-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-round-display/polar-origin-left-bottom-001.html rename to tests/wpt/tests/css/css-round-display/polar-origin-left-bottom-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/META.yml b/tests/wpt/tests/css/css-ruby/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/META.yml rename to tests/wpt/tests/css/css-ruby/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-ruby/abs-in-ruby-base-container.html b/tests/wpt/tests/css/css-ruby/abs-in-ruby-base-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/abs-in-ruby-base-container.html rename to tests/wpt/tests/css/css-ruby/abs-in-ruby-base-container.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/abs-in-ruby-base-ref.html b/tests/wpt/tests/css/css-ruby/abs-in-ruby-base-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/abs-in-ruby-base-ref.html rename to tests/wpt/tests/css/css-ruby/abs-in-ruby-base-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/abs-in-ruby-base.html b/tests/wpt/tests/css/css-ruby/abs-in-ruby-base.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/abs-in-ruby-base.html rename to tests/wpt/tests/css/css-ruby/abs-in-ruby-base.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/abs-in-ruby-container.html b/tests/wpt/tests/css/css-ruby/abs-in-ruby-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/abs-in-ruby-container.html rename to tests/wpt/tests/css/css-ruby/abs-in-ruby-container.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/block-ruby-001-ref.html b/tests/wpt/tests/css/css-ruby/block-ruby-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/block-ruby-001-ref.html rename to tests/wpt/tests/css/css-ruby/block-ruby-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/block-ruby-001.html b/tests/wpt/tests/css/css-ruby/block-ruby-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/block-ruby-001.html rename to tests/wpt/tests/css/css-ruby/block-ruby-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/block-ruby-002-ref.html b/tests/wpt/tests/css/css-ruby/block-ruby-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/block-ruby-002-ref.html rename to tests/wpt/tests/css/css-ruby/block-ruby-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/block-ruby-002.html b/tests/wpt/tests/css/css-ruby/block-ruby-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/block-ruby-002.html rename to tests/wpt/tests/css/css-ruby/block-ruby-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/block-ruby-003-ref.html b/tests/wpt/tests/css/css-ruby/block-ruby-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/block-ruby-003-ref.html rename to tests/wpt/tests/css/css-ruby/block-ruby-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/block-ruby-003.html b/tests/wpt/tests/css/css-ruby/block-ruby-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/block-ruby-003.html rename to tests/wpt/tests/css/css-ruby/block-ruby-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/block-ruby-004-ref.html b/tests/wpt/tests/css/css-ruby/block-ruby-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/block-ruby-004-ref.html rename to tests/wpt/tests/css/css-ruby/block-ruby-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/block-ruby-004.html b/tests/wpt/tests/css/css-ruby/block-ruby-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/block-ruby-004.html rename to tests/wpt/tests/css/css-ruby/block-ruby-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/block-ruby-005-ref.html b/tests/wpt/tests/css/css-ruby/block-ruby-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/block-ruby-005-ref.html rename to tests/wpt/tests/css/css-ruby/block-ruby-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/block-ruby-005.html b/tests/wpt/tests/css/css-ruby/block-ruby-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/block-ruby-005.html rename to tests/wpt/tests/css/css-ruby/block-ruby-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/br-clear-all-000.html b/tests/wpt/tests/css/css-ruby/br-clear-all-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/br-clear-all-000.html rename to tests/wpt/tests/css/css-ruby/br-clear-all-000.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/br-clear-all-001.html b/tests/wpt/tests/css/css-ruby/br-clear-all-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/br-clear-all-001.html rename to tests/wpt/tests/css/css-ruby/br-clear-all-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/br-clear-all-002.html b/tests/wpt/tests/css/css-ruby/br-clear-all-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/br-clear-all-002.html rename to tests/wpt/tests/css/css-ruby/br-clear-all-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/empty-ruby-base-container-ref.html b/tests/wpt/tests/css/css-ruby/empty-ruby-base-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/empty-ruby-base-container-ref.html rename to tests/wpt/tests/css/css-ruby/empty-ruby-base-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/empty-ruby-base-container.html b/tests/wpt/tests/css/css-ruby/empty-ruby-base-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/empty-ruby-base-container.html rename to tests/wpt/tests/css/css-ruby/empty-ruby-base-container.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/empty-ruby-text-container-abs.html b/tests/wpt/tests/css/css-ruby/empty-ruby-text-container-abs.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/empty-ruby-text-container-abs.html rename to tests/wpt/tests/css/css-ruby/empty-ruby-text-container-abs.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/empty-ruby-text-container-float.html b/tests/wpt/tests/css/css-ruby/empty-ruby-text-container-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/empty-ruby-text-container-float.html rename to tests/wpt/tests/css/css-ruby/empty-ruby-text-container-float.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/empty-ruby-text-container-ref.html b/tests/wpt/tests/css/css-ruby/empty-ruby-text-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/empty-ruby-text-container-ref.html rename to tests/wpt/tests/css/css-ruby/empty-ruby-text-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/empty-ruby-text-container.html b/tests/wpt/tests/css/css-ruby/empty-ruby-text-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/empty-ruby-text-container.html rename to tests/wpt/tests/css/css-ruby/empty-ruby-text-container.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/improperly-contained-annotation-001.html b/tests/wpt/tests/css/css-ruby/improperly-contained-annotation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/improperly-contained-annotation-001.html rename to tests/wpt/tests/css/css-ruby/improperly-contained-annotation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/inheritance.html b/tests/wpt/tests/css/css-ruby/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/inheritance.html rename to tests/wpt/tests/css/css-ruby/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/intra-base-white-space-001.html b/tests/wpt/tests/css/css-ruby/intra-base-white-space-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/intra-base-white-space-001.html rename to tests/wpt/tests/css/css-ruby/intra-base-white-space-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/line-break-around-ruby-001.html b/tests/wpt/tests/css/css-ruby/line-break-around-ruby-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/line-break-around-ruby-001.html rename to tests/wpt/tests/css/css-ruby/line-break-around-ruby-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/line-spacing.html b/tests/wpt/tests/css/css-ruby/line-spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/line-spacing.html rename to tests/wpt/tests/css/css-ruby/line-spacing.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/nested-ruby-pairing-001-ref.html b/tests/wpt/tests/css/css-ruby/nested-ruby-pairing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/nested-ruby-pairing-001-ref.html rename to tests/wpt/tests/css/css-ruby/nested-ruby-pairing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/nested-ruby-pairing-001.html b/tests/wpt/tests/css/css-ruby/nested-ruby-pairing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/nested-ruby-pairing-001.html rename to tests/wpt/tests/css/css-ruby/nested-ruby-pairing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/parsing/ruby-align-invalid.html b/tests/wpt/tests/css/css-ruby/parsing/ruby-align-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/parsing/ruby-align-invalid.html rename to tests/wpt/tests/css/css-ruby/parsing/ruby-align-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/parsing/ruby-align-valid.html b/tests/wpt/tests/css/css-ruby/parsing/ruby-align-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/parsing/ruby-align-valid.html rename to tests/wpt/tests/css/css-ruby/parsing/ruby-align-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/parsing/ruby-merge-invalid.html b/tests/wpt/tests/css/css-ruby/parsing/ruby-merge-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/parsing/ruby-merge-invalid.html rename to tests/wpt/tests/css/css-ruby/parsing/ruby-merge-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/parsing/ruby-merge-valid.html b/tests/wpt/tests/css/css-ruby/parsing/ruby-merge-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/parsing/ruby-merge-valid.html rename to tests/wpt/tests/css/css-ruby/parsing/ruby-merge-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/parsing/ruby-position-invalid.html b/tests/wpt/tests/css/css-ruby/parsing/ruby-position-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/parsing/ruby-position-invalid.html rename to tests/wpt/tests/css/css-ruby/parsing/ruby-position-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/parsing/ruby-position-valid.html b/tests/wpt/tests/css/css-ruby/parsing/ruby-position-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/parsing/ruby-position-valid.html rename to tests/wpt/tests/css/css-ruby/parsing/ruby-position-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/rb-display-001.html b/tests/wpt/tests/css/css-ruby/rb-display-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/rb-display-001.html rename to tests/wpt/tests/css/css-ruby/rb-display-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/rbc-rtc-basic-001.html b/tests/wpt/tests/css/css-ruby/rbc-rtc-basic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/rbc-rtc-basic-001.html rename to tests/wpt/tests/css/css-ruby/rbc-rtc-basic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/reference/improperly-contained-annotation-001-ref.html b/tests/wpt/tests/css/css-ruby/reference/improperly-contained-annotation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/reference/improperly-contained-annotation-001-ref.html rename to tests/wpt/tests/css/css-ruby/reference/improperly-contained-annotation-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/reference/intra-base-white-space-001-ref.html b/tests/wpt/tests/css/css-ruby/reference/intra-base-white-space-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/reference/intra-base-white-space-001-ref.html rename to tests/wpt/tests/css/css-ruby/reference/intra-base-white-space-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/reference/rb-display-001-ref.html b/tests/wpt/tests/css/css-ruby/reference/rb-display-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/reference/rb-display-001-ref.html rename to tests/wpt/tests/css/css-ruby/reference/rb-display-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/reference/rbc-rtc-basic-001-ref.html b/tests/wpt/tests/css/css-ruby/reference/rbc-rtc-basic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/reference/rbc-rtc-basic-001-ref.html rename to tests/wpt/tests/css/css-ruby/reference/rbc-rtc-basic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/reference/ruby-annotation-pairing-001-ref.html b/tests/wpt/tests/css/css-ruby/reference/ruby-annotation-pairing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/reference/ruby-annotation-pairing-001-ref.html rename to tests/wpt/tests/css/css-ruby/reference/ruby-annotation-pairing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/root-block-ruby.xhtml b/tests/wpt/tests/css/css-ruby/root-block-ruby.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/root-block-ruby.xhtml rename to tests/wpt/tests/css/css-ruby/root-block-ruby.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-ruby/root-ruby-ref.xhtml b/tests/wpt/tests/css/css-ruby/root-ruby-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/root-ruby-ref.xhtml rename to tests/wpt/tests/css/css-ruby/root-ruby-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-ruby/root-ruby.xhtml b/tests/wpt/tests/css/css-ruby/root-ruby.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/root-ruby.xhtml rename to tests/wpt/tests/css/css-ruby/root-ruby.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-ruby/rt-display-001.html b/tests/wpt/tests/css/css-ruby/rt-display-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/rt-display-001.html rename to tests/wpt/tests/css/css-ruby/rt-display-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-001.xht b/tests/wpt/tests/css/css-ruby/ruby-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-001.xht rename to tests/wpt/tests/css/css-ruby/ruby-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-align-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-align-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-align-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-align-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-align-001.html b/tests/wpt/tests/css/css-ruby/ruby-align-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-align-001.html rename to tests/wpt/tests/css/css-ruby/ruby-align-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-align-001a.html b/tests/wpt/tests/css/css-ruby/ruby-align-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-align-001a.html rename to tests/wpt/tests/css/css-ruby/ruby-align-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-align-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-align-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-align-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-align-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-align-002.html b/tests/wpt/tests/css/css-ruby/ruby-align-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-align-002.html rename to tests/wpt/tests/css/css-ruby/ruby-align-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-align-002a.html b/tests/wpt/tests/css/css-ruby/ruby-align-002a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-align-002a.html rename to tests/wpt/tests/css/css-ruby/ruby-align-002a.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-annotation-pairing-001.html b/tests/wpt/tests/css/css-ruby/ruby-annotation-pairing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-annotation-pairing-001.html rename to tests/wpt/tests/css/css-ruby/ruby-annotation-pairing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-autohide-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-autohide-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-autohide-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-autohide-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-autohide-001.html b/tests/wpt/tests/css/css-ruby/ruby-autohide-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-autohide-001.html rename to tests/wpt/tests/css/css-ruby/ruby-autohide-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-autohide-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-autohide-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-autohide-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-autohide-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-autohide-002.html b/tests/wpt/tests/css/css-ruby/ruby-autohide-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-autohide-002.html rename to tests/wpt/tests/css/css-ruby/ruby-autohide-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-autohide-003-ref.html b/tests/wpt/tests/css/css-ruby/ruby-autohide-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-autohide-003-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-autohide-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-autohide-003.html b/tests/wpt/tests/css/css-ruby/ruby-autohide-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-autohide-003.html rename to tests/wpt/tests/css/css-ruby/ruby-autohide-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-autohide-004.html b/tests/wpt/tests/css/css-ruby/ruby-autohide-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-autohide-004.html rename to tests/wpt/tests/css/css-ruby/ruby-autohide-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-base-container-abs.html b/tests/wpt/tests/css/css-ruby/ruby-base-container-abs.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-base-container-abs.html rename to tests/wpt/tests/css/css-ruby/ruby-base-container-abs.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-base-container-float.html b/tests/wpt/tests/css/css-ruby/ruby-base-container-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-base-container-float.html rename to tests/wpt/tests/css/css-ruby/ruby-base-container-float.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-base-different-size-ref.html b/tests/wpt/tests/css/css-ruby/ruby-base-different-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-base-different-size-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-base-different-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-base-different-size.html b/tests/wpt/tests/css/css-ruby/ruby-base-different-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-base-different-size.html rename to tests/wpt/tests/css/css-ruby/ruby-base-different-size.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-bidi-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-bidi-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-001.html b/tests/wpt/tests/css/css-ruby/ruby-bidi-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-001.html rename to tests/wpt/tests/css/css-ruby/ruby-bidi-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-bidi-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-bidi-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-002.html b/tests/wpt/tests/css/css-ruby/ruby-bidi-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-002.html rename to tests/wpt/tests/css/css-ruby/ruby-bidi-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-003-ref.html b/tests/wpt/tests/css/css-ruby/ruby-bidi-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-003-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-bidi-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-003.html b/tests/wpt/tests/css/css-ruby/ruby-bidi-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-003.html rename to tests/wpt/tests/css/css-ruby/ruby-bidi-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-004-ref.html b/tests/wpt/tests/css/css-ruby/ruby-bidi-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-004-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-bidi-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-004.html b/tests/wpt/tests/css/css-ruby/ruby-bidi-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-bidi-004.html rename to tests/wpt/tests/css/css-ruby/ruby-bidi-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-box-generation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-box-generation-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-001.html b/tests/wpt/tests/css/css-ruby/ruby-box-generation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-001.html rename to tests/wpt/tests/css/css-ruby/ruby-box-generation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-box-generation-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-box-generation-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-002.html b/tests/wpt/tests/css/css-ruby/ruby-box-generation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-002.html rename to tests/wpt/tests/css/css-ruby/ruby-box-generation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-003-ref.html b/tests/wpt/tests/css/css-ruby/ruby-box-generation-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-003-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-box-generation-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-003.html b/tests/wpt/tests/css/css-ruby/ruby-box-generation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-003.html rename to tests/wpt/tests/css/css-ruby/ruby-box-generation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-004-ref.html b/tests/wpt/tests/css/css-ruby/ruby-box-generation-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-004-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-box-generation-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-004.html b/tests/wpt/tests/css/css-ruby/ruby-box-generation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-004.html rename to tests/wpt/tests/css/css-ruby/ruby-box-generation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-005-ref.html b/tests/wpt/tests/css/css-ruby/ruby-box-generation-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-005-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-box-generation-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-005.html b/tests/wpt/tests/css/css-ruby/ruby-box-generation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-box-generation-005.html rename to tests/wpt/tests/css/css-ruby/ruby-box-generation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-box-model-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-box-model-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-box-model-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-box-model-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-box-model-001.html b/tests/wpt/tests/css/css-ruby/ruby-box-model-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-box-model-001.html rename to tests/wpt/tests/css/css-ruby/ruby-box-model-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-001.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-001.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-002.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-002.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-003-ref.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-003-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-003.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-003.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-004-ref.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-004-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-004.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-004.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-005-ref.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-005-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-005.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-insertion-005.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-insertion-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-removal-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-removal-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-removal-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-removal-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-removal-001.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-removal-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-removal-001.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-removal-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-removal-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-removal-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-removal-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-removal-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-removal-002.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-removal-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-removal-002.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-removal-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-removal-003-ref.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-removal-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-removal-003-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-removal-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-removal-003.html b/tests/wpt/tests/css/css-ruby/ruby-dynamic-removal-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-dynamic-removal-003.html rename to tests/wpt/tests/css/css-ruby/ruby-dynamic-removal-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-float-handling-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-float-handling-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-float-handling-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-float-handling-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-float-handling-001.html b/tests/wpt/tests/css/css-ruby/ruby-float-handling-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-float-handling-001.html rename to tests/wpt/tests/css/css-ruby/ruby-float-handling-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-001.html b/tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-001.html rename to tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-002.html b/tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-002.html rename to tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-003-ref.html b/tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-003-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-003.html b/tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-003.html rename to tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-004-ref.html b/tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-004-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-004.html b/tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-004.html rename to tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-005-ref.html b/tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-005-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-005.html b/tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-inlinize-blocks-005.html rename to tests/wpt/tests/css/css-ruby/ruby-inlinize-blocks-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-intra-level-whitespace-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-intra-level-whitespace-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-intra-level-whitespace-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-intra-level-whitespace-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-intra-level-whitespace-001.html b/tests/wpt/tests/css/css-ruby/ruby-intra-level-whitespace-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-intra-level-whitespace-001.html rename to tests/wpt/tests/css/css-ruby/ruby-intra-level-whitespace-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-intra-level-whitespace-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-intra-level-whitespace-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-intra-level-whitespace-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-intra-level-whitespace-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-intra-level-whitespace-002.html b/tests/wpt/tests/css/css-ruby/ruby-intra-level-whitespace-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-intra-level-whitespace-002.html rename to tests/wpt/tests/css/css-ruby/ruby-intra-level-whitespace-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-intra-level-whitespace-003-ref.html b/tests/wpt/tests/css/css-ruby/ruby-intra-level-whitespace-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-intra-level-whitespace-003-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-intra-level-whitespace-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-intra-level-whitespace-003.html b/tests/wpt/tests/css/css-ruby/ruby-intra-level-whitespace-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-intra-level-whitespace-003.html rename to tests/wpt/tests/css/css-ruby/ruby-intra-level-whitespace-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-intrinsic-isize-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-intrinsic-isize-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-intrinsic-isize-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-intrinsic-isize-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-intrinsic-isize-001.html b/tests/wpt/tests/css/css-ruby/ruby-intrinsic-isize-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-intrinsic-isize-001.html rename to tests/wpt/tests/css/css-ruby/ruby-intrinsic-isize-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-intrinsic-isize-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-intrinsic-isize-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-intrinsic-isize-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-intrinsic-isize-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-intrinsic-isize-002.html b/tests/wpt/tests/css/css-ruby/ruby-intrinsic-isize-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-intrinsic-isize-002.html rename to tests/wpt/tests/css/css-ruby/ruby-intrinsic-isize-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-intrinsic-isize-003-ref.html b/tests/wpt/tests/css/css-ruby/ruby-intrinsic-isize-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-intrinsic-isize-003-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-intrinsic-isize-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-intrinsic-isize-003.html b/tests/wpt/tests/css/css-ruby/ruby-intrinsic-isize-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-intrinsic-isize-003.html rename to tests/wpt/tests/css/css-ruby/ruby-intrinsic-isize-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-justification-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-justification-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-justification-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-justification-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-justification-001.html b/tests/wpt/tests/css/css-ruby/ruby-justification-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-justification-001.html rename to tests/wpt/tests/css/css-ruby/ruby-justification-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-justification-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-justification-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-justification-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-justification-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-justification-002.html b/tests/wpt/tests/css/css-ruby/ruby-justification-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-justification-002.html rename to tests/wpt/tests/css/css-ruby/ruby-justification-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-lang-specific-style-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-lang-specific-style-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-lang-specific-style-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-lang-specific-style-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-lang-specific-style-001.html b/tests/wpt/tests/css/css-ruby/ruby-lang-specific-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-lang-specific-style-001.html rename to tests/wpt/tests/css/css-ruby/ruby-lang-specific-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-layout-internal-boxes-ref.html b/tests/wpt/tests/css/css-ruby/ruby-layout-internal-boxes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-layout-internal-boxes-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-layout-internal-boxes-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-layout-internal-boxes.html b/tests/wpt/tests/css/css-ruby/ruby-layout-internal-boxes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-layout-internal-boxes.html rename to tests/wpt/tests/css/css-ruby/ruby-layout-internal-boxes.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-001.html b/tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-001.html rename to tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-002.html b/tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-002.html rename to tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-003-ref.html b/tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-003-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-003.html b/tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-003.html rename to tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-004-ref.html b/tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-004-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-004.html b/tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-004.html rename to tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-005-ref.html b/tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-005-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-005.html b/tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-break-suppression-005.html rename to tests/wpt/tests/css/css-ruby/ruby-line-break-suppression-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-breaking-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-line-breaking-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-breaking-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-line-breaking-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-breaking-001.html b/tests/wpt/tests/css/css-ruby/ruby-line-breaking-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-breaking-001.html rename to tests/wpt/tests/css/css-ruby/ruby-line-breaking-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-breaking-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-line-breaking-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-breaking-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-line-breaking-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-breaking-002.html b/tests/wpt/tests/css/css-ruby/ruby-line-breaking-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-breaking-002.html rename to tests/wpt/tests/css/css-ruby/ruby-line-breaking-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-breaking-003-ref.html b/tests/wpt/tests/css/css-ruby/ruby-line-breaking-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-breaking-003-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-line-breaking-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-line-breaking-003.html b/tests/wpt/tests/css/css-ruby/ruby-line-breaking-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-line-breaking-003.html rename to tests/wpt/tests/css/css-ruby/ruby-line-breaking-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-no-transform-ref.html b/tests/wpt/tests/css/css-ruby/ruby-no-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-no-transform-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-no-transform-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-no-transform.html b/tests/wpt/tests/css/css-ruby/ruby-no-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-no-transform.html rename to tests/wpt/tests/css/css-ruby/ruby-no-transform.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-position-alternate.html b/tests/wpt/tests/css/css-ruby/ruby-position-alternate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-position-alternate.html rename to tests/wpt/tests/css/css-ruby/ruby-position-alternate.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-position.html b/tests/wpt/tests/css/css-ruby/ruby-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-position.html rename to tests/wpt/tests/css/css-ruby/ruby-position.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-reflow-001-noruby.html b/tests/wpt/tests/css/css-ruby/ruby-reflow-001-noruby.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-reflow-001-noruby.html rename to tests/wpt/tests/css/css-ruby/ruby-reflow-001-noruby.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-reflow-001-opaqueruby.html b/tests/wpt/tests/css/css-ruby/ruby-reflow-001-opaqueruby.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-reflow-001-opaqueruby.html rename to tests/wpt/tests/css/css-ruby/ruby-reflow-001-opaqueruby.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-reflow-001-transparentruby.html b/tests/wpt/tests/css/css-ruby/ruby-reflow-001-transparentruby.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-reflow-001-transparentruby.html rename to tests/wpt/tests/css/css-ruby/ruby-reflow-001-transparentruby.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-span-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-span-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-span-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-span-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-span-001.html b/tests/wpt/tests/css/css-ruby/ruby-span-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-span-001.html rename to tests/wpt/tests/css/css-ruby/ruby-span-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-text-collapse-ref.html b/tests/wpt/tests/css/css-ruby/ruby-text-collapse-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-text-collapse-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-text-collapse-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-text-collapse.html b/tests/wpt/tests/css/css-ruby/ruby-text-collapse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-text-collapse.html rename to tests/wpt/tests/css/css-ruby/ruby-text-collapse.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-text-combine-upright-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-text-combine-upright-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-text-combine-upright-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-text-combine-upright-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-text-combine-upright-001a.html b/tests/wpt/tests/css/css-ruby/ruby-text-combine-upright-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-text-combine-upright-001a.html rename to tests/wpt/tests/css/css-ruby/ruby-text-combine-upright-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-text-combine-upright-001b.html b/tests/wpt/tests/css/css-ruby/ruby-text-combine-upright-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-text-combine-upright-001b.html rename to tests/wpt/tests/css/css-ruby/ruby-text-combine-upright-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-text-combine-upright-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-text-combine-upright-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-text-combine-upright-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-text-combine-upright-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-text-combine-upright-002a.html b/tests/wpt/tests/css/css-ruby/ruby-text-combine-upright-002a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-text-combine-upright-002a.html rename to tests/wpt/tests/css/css-ruby/ruby-text-combine-upright-002a.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-text-combine-upright-002b.html b/tests/wpt/tests/css/css-ruby/ruby-text-combine-upright-002b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-text-combine-upright-002b.html rename to tests/wpt/tests/css/css-ruby/ruby-text-combine-upright-002b.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-whitespace-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-whitespace-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-whitespace-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-whitespace-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-whitespace-001.html b/tests/wpt/tests/css/css-ruby/ruby-whitespace-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-whitespace-001.html rename to tests/wpt/tests/css/css-ruby/ruby-whitespace-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-whitespace-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-whitespace-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-whitespace-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-whitespace-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-whitespace-002.html b/tests/wpt/tests/css/css-ruby/ruby-whitespace-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-whitespace-002.html rename to tests/wpt/tests/css/css-ruby/ruby-whitespace-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-with-floats-001-ref.html b/tests/wpt/tests/css/css-ruby/ruby-with-floats-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-with-floats-001-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-with-floats-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-with-floats-001.html b/tests/wpt/tests/css/css-ruby/ruby-with-floats-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-with-floats-001.html rename to tests/wpt/tests/css/css-ruby/ruby-with-floats-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-with-floats-002-ref.html b/tests/wpt/tests/css/css-ruby/ruby-with-floats-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-with-floats-002-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-with-floats-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-with-floats-002.html b/tests/wpt/tests/css/css-ruby/ruby-with-floats-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-with-floats-002.html rename to tests/wpt/tests/css/css-ruby/ruby-with-floats-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-with-floats-003-ref.html b/tests/wpt/tests/css/css-ruby/ruby-with-floats-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-with-floats-003-ref.html rename to tests/wpt/tests/css/css-ruby/ruby-with-floats-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/ruby-with-floats-003.html b/tests/wpt/tests/css/css-ruby/ruby-with-floats-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/ruby-with-floats-003.html rename to tests/wpt/tests/css/css-ruby/ruby-with-floats-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ruby/support/ruby-common.css b/tests/wpt/tests/css/css-ruby/support/ruby-common.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/support/ruby-common.css rename to tests/wpt/tests/css/css-ruby/support/ruby-common.css diff --git a/tests/wpt/web-platform-tests/css/css-ruby/support/ruby-dynamic-insertion.js b/tests/wpt/tests/css/css-ruby/support/ruby-dynamic-insertion.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/support/ruby-dynamic-insertion.js rename to tests/wpt/tests/css/css-ruby/support/ruby-dynamic-insertion.js diff --git a/tests/wpt/web-platform-tests/css/css-ruby/support/ruby-dynamic-removal.js b/tests/wpt/tests/css/css-ruby/support/ruby-dynamic-removal.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ruby/support/ruby-dynamic-removal.js rename to tests/wpt/tests/css/css-ruby/support/ruby-dynamic-removal.js diff --git a/tests/wpt/web-platform-tests/css/css-scoping/META.yml b/tests/wpt/tests/css/css-scoping/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/META.yml rename to tests/wpt/tests/css/css-scoping/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-assigned-node-with-before-after.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-assigned-node-with-before-after.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-assigned-node-with-before-after.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-assigned-node-with-before-after.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-assigned-node-with-rules.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-assigned-node-with-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-assigned-node-with-rules.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-assigned-node-with-rules.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-dynamic-remove-style-detached.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-dynamic-remove-style-detached.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-dynamic-remove-style-detached.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-dynamic-remove-style-detached.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-host-functional-rule.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-host-functional-rule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-host-functional-rule.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-host-functional-rule.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-host-namespace.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-host-namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-host-namespace.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-host-namespace.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-host-rule.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-host-rule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-host-rule.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-host-rule.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-host-with-before-after.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-host-with-before-after.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-host-with-before-after.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-host-with-before-after.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-invisible-slot.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-invisible-slot.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-invisible-slot.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-invisible-slot.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-nested-slot-display-override.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-nested-slot-display-override.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-nested-slot-display-override.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-nested-slot-display-override.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-root-hides-children.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-root-hides-children.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-root-hides-children.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-root-hides-children.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-slot-display-override.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-slot-display-override.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-slot-display-override.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-slot-display-override.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-slot-fallback.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-slot-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-slot-fallback.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-slot-fallback.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-slot-style.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-slot-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-slot-style.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-slot-style.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-slot.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-slot.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-slot.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-slot.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-slotted-nested.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-slotted-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-slotted-nested.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-slotted-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-slotted-rule.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-slotted-rule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-slotted-rule.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-slotted-rule.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-with-outside-rules.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-with-outside-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-with-outside-rules.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-with-outside-rules.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-with-rules-no-style-leak.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-with-rules-no-style-leak.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-with-rules-no-style-leak.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-with-rules-no-style-leak.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-with-rules.html b/tests/wpt/tests/css/css-scoping/css-scoping-shadow-with-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/css-scoping-shadow-with-rules.html rename to tests/wpt/tests/css/css-scoping/css-scoping-shadow-with-rules.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-context-parsing.html b/tests/wpt/tests/css/css-scoping/host-context-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-context-parsing.html rename to tests/wpt/tests/css/css-scoping/host-context-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-context-specificity-001.html b/tests/wpt/tests/css/css-scoping/host-context-specificity-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-context-specificity-001.html rename to tests/wpt/tests/css/css-scoping/host-context-specificity-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-context-specificity-002.html b/tests/wpt/tests/css/css-scoping/host-context-specificity-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-context-specificity-002.html rename to tests/wpt/tests/css/css-scoping/host-context-specificity-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-context-specificity-003.html b/tests/wpt/tests/css/css-scoping/host-context-specificity-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-context-specificity-003.html rename to tests/wpt/tests/css/css-scoping/host-context-specificity-003.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-descendant-001.html b/tests/wpt/tests/css/css-scoping/host-descendant-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-descendant-001.html rename to tests/wpt/tests/css/css-scoping/host-descendant-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-descendant-002.html b/tests/wpt/tests/css/css-scoping/host-descendant-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-descendant-002.html rename to tests/wpt/tests/css/css-scoping/host-descendant-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-descendant-invalidation.html b/tests/wpt/tests/css/css-scoping/host-descendant-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-descendant-invalidation.html rename to tests/wpt/tests/css/css-scoping/host-descendant-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-dom-001.html b/tests/wpt/tests/css/css-scoping/host-dom-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-dom-001.html rename to tests/wpt/tests/css/css-scoping/host-dom-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-functional-descendant-invalidation.html b/tests/wpt/tests/css/css-scoping/host-functional-descendant-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-functional-descendant-invalidation.html rename to tests/wpt/tests/css/css-scoping/host-functional-descendant-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-multiple-001.html b/tests/wpt/tests/css/css-scoping/host-multiple-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-multiple-001.html rename to tests/wpt/tests/css/css-scoping/host-multiple-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-nested-001.html b/tests/wpt/tests/css/css-scoping/host-nested-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-nested-001.html rename to tests/wpt/tests/css/css-scoping/host-nested-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-parsing.html b/tests/wpt/tests/css/css-scoping/host-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-parsing.html rename to tests/wpt/tests/css/css-scoping/host-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-slotted-001.html b/tests/wpt/tests/css/css-scoping/host-slotted-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-slotted-001.html rename to tests/wpt/tests/css/css-scoping/host-slotted-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-specificity-002.html b/tests/wpt/tests/css/css-scoping/host-specificity-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-specificity-002.html rename to tests/wpt/tests/css/css-scoping/host-specificity-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-specificity-003.html b/tests/wpt/tests/css/css-scoping/host-specificity-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-specificity-003.html rename to tests/wpt/tests/css/css-scoping/host-specificity-003.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-specificity.html b/tests/wpt/tests/css/css-scoping/host-specificity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-specificity.html rename to tests/wpt/tests/css/css-scoping/host-specificity.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/host-with-default-namespace-001.html b/tests/wpt/tests/css/css-scoping/host-with-default-namespace-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/host-with-default-namespace-001.html rename to tests/wpt/tests/css/css-scoping/host-with-default-namespace-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/keyframes-001.html b/tests/wpt/tests/css/css-scoping/keyframes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/keyframes-001.html rename to tests/wpt/tests/css/css-scoping/keyframes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/keyframes-002.html b/tests/wpt/tests/css/css-scoping/keyframes-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/keyframes-002.html rename to tests/wpt/tests/css/css-scoping/keyframes-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/keyframes-003.html b/tests/wpt/tests/css/css-scoping/keyframes-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/keyframes-003.html rename to tests/wpt/tests/css/css-scoping/keyframes-003.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/keyframes-004.html b/tests/wpt/tests/css/css-scoping/keyframes-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/keyframes-004.html rename to tests/wpt/tests/css/css-scoping/keyframes-004.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/keyframes-005.html b/tests/wpt/tests/css/css-scoping/keyframes-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/keyframes-005.html rename to tests/wpt/tests/css/css-scoping/keyframes-005.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/keyframes-006.html b/tests/wpt/tests/css/css-scoping/keyframes-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/keyframes-006.html rename to tests/wpt/tests/css/css-scoping/keyframes-006.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/reference/green-box.html b/tests/wpt/tests/css/css-scoping/reference/green-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/reference/green-box.html rename to tests/wpt/tests/css/css-scoping/reference/green-box.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/reference/green-text.html b/tests/wpt/tests/css/css-scoping/reference/green-text.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/reference/green-text.html rename to tests/wpt/tests/css/css-scoping/reference/green-text.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/reslot-text-inheritance.html b/tests/wpt/tests/css/css-scoping/reslot-text-inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/reslot-text-inheritance.html rename to tests/wpt/tests/css/css-scoping/reslot-text-inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/resources/host-green-box.css b/tests/wpt/tests/css/css-scoping/resources/host-green-box.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/resources/host-green-box.css rename to tests/wpt/tests/css/css-scoping/resources/host-green-box.css diff --git a/tests/wpt/web-platform-tests/css/css-scoping/scoped-reference-animation-001.html b/tests/wpt/tests/css/css-scoping/scoped-reference-animation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/scoped-reference-animation-001.html rename to tests/wpt/tests/css/css-scoping/scoped-reference-animation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/scoped-reference-animation-002.html b/tests/wpt/tests/css/css-scoping/scoped-reference-animation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/scoped-reference-animation-002.html rename to tests/wpt/tests/css/css-scoping/scoped-reference-animation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/scoped-reference-animation-ref.html b/tests/wpt/tests/css/css-scoping/scoped-reference-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/scoped-reference-animation-ref.html rename to tests/wpt/tests/css/css-scoping/scoped-reference-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-assign-dynamic-001.html b/tests/wpt/tests/css/css-scoping/shadow-assign-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-assign-dynamic-001.html rename to tests/wpt/tests/css/css-scoping/shadow-assign-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-at-import.html b/tests/wpt/tests/css/css-scoping/shadow-at-import.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-at-import.html rename to tests/wpt/tests/css/css-scoping/shadow-at-import.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-cascade-order-001.html b/tests/wpt/tests/css/css-scoping/shadow-cascade-order-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-cascade-order-001.html rename to tests/wpt/tests/css/css-scoping/shadow-cascade-order-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-directionality-001.tentative.html b/tests/wpt/tests/css/css-scoping/shadow-directionality-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-directionality-001.tentative.html rename to tests/wpt/tests/css/css-scoping/shadow-directionality-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-directionality-002.tentative.html b/tests/wpt/tests/css/css-scoping/shadow-directionality-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-directionality-002.tentative.html rename to tests/wpt/tests/css/css-scoping/shadow-directionality-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-disabled-sheet-001.html b/tests/wpt/tests/css/css-scoping/shadow-disabled-sheet-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-disabled-sheet-001.html rename to tests/wpt/tests/css/css-scoping/shadow-disabled-sheet-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-001.html b/tests/wpt/tests/css/css-scoping/shadow-fallback-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-001.html rename to tests/wpt/tests/css/css-scoping/shadow-fallback-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-002.html b/tests/wpt/tests/css/css-scoping/shadow-fallback-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-002.html rename to tests/wpt/tests/css/css-scoping/shadow-fallback-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-003.html b/tests/wpt/tests/css/css-scoping/shadow-fallback-dynamic-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-003.html rename to tests/wpt/tests/css/css-scoping/shadow-fallback-dynamic-003.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-004.html b/tests/wpt/tests/css/css-scoping/shadow-fallback-dynamic-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-004.html rename to tests/wpt/tests/css/css-scoping/shadow-fallback-dynamic-004.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-005.html b/tests/wpt/tests/css/css-scoping/shadow-fallback-dynamic-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-fallback-dynamic-005.html rename to tests/wpt/tests/css/css-scoping/shadow-fallback-dynamic-005.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-host-removal-invalidation.html b/tests/wpt/tests/css/css-scoping/shadow-host-removal-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-host-removal-invalidation.html rename to tests/wpt/tests/css/css-scoping/shadow-host-removal-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-host-with-before-after.html b/tests/wpt/tests/css/css-scoping/shadow-host-with-before-after.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-host-with-before-after.html rename to tests/wpt/tests/css/css-scoping/shadow-host-with-before-after.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-link-rel-stylesheet-no-style-leak.html b/tests/wpt/tests/css/css-scoping/shadow-link-rel-stylesheet-no-style-leak.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-link-rel-stylesheet-no-style-leak.html rename to tests/wpt/tests/css/css-scoping/shadow-link-rel-stylesheet-no-style-leak.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-link-rel-stylesheet.html b/tests/wpt/tests/css/css-scoping/shadow-link-rel-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-link-rel-stylesheet.html rename to tests/wpt/tests/css/css-scoping/shadow-link-rel-stylesheet.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-multiple-links.html b/tests/wpt/tests/css/css-scoping/shadow-multiple-links.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-multiple-links.html rename to tests/wpt/tests/css/css-scoping/shadow-multiple-links.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-reassign-dynamic-001.html b/tests/wpt/tests/css/css-scoping/shadow-reassign-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-reassign-dynamic-001.html rename to tests/wpt/tests/css/css-scoping/shadow-reassign-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-reassign-dynamic-002.html b/tests/wpt/tests/css/css-scoping/shadow-reassign-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-reassign-dynamic-002.html rename to tests/wpt/tests/css/css-scoping/shadow-reassign-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-reassign-dynamic-003.html b/tests/wpt/tests/css/css-scoping/shadow-reassign-dynamic-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-reassign-dynamic-003.html rename to tests/wpt/tests/css/css-scoping/shadow-reassign-dynamic-003.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-reassign-dynamic-004.html b/tests/wpt/tests/css/css-scoping/shadow-reassign-dynamic-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-reassign-dynamic-004.html rename to tests/wpt/tests/css/css-scoping/shadow-reassign-dynamic-004.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-root-insert-into-document.html b/tests/wpt/tests/css/css-scoping/shadow-root-insert-into-document.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-root-insert-into-document.html rename to tests/wpt/tests/css/css-scoping/shadow-root-insert-into-document.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/shadow-shared-style-cache-001.html b/tests/wpt/tests/css/css-scoping/shadow-shared-style-cache-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/shadow-shared-style-cache-001.html rename to tests/wpt/tests/css/css-scoping/shadow-shared-style-cache-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/slot-non-html-display-value.html b/tests/wpt/tests/css/css-scoping/slot-non-html-display-value.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/slot-non-html-display-value.html rename to tests/wpt/tests/css/css-scoping/slot-non-html-display-value.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/slotted-invalidation.html b/tests/wpt/tests/css/css-scoping/slotted-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/slotted-invalidation.html rename to tests/wpt/tests/css/css-scoping/slotted-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/slotted-link.html b/tests/wpt/tests/css/css-scoping/slotted-link.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/slotted-link.html rename to tests/wpt/tests/css/css-scoping/slotted-link.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/slotted-matches.html b/tests/wpt/tests/css/css-scoping/slotted-matches.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/slotted-matches.html rename to tests/wpt/tests/css/css-scoping/slotted-matches.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/slotted-nested.html b/tests/wpt/tests/css/css-scoping/slotted-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/slotted-nested.html rename to tests/wpt/tests/css/css-scoping/slotted-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/slotted-parsing.html b/tests/wpt/tests/css/css-scoping/slotted-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/slotted-parsing.html rename to tests/wpt/tests/css/css-scoping/slotted-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/slotted-placeholder-ref.html b/tests/wpt/tests/css/css-scoping/slotted-placeholder-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/slotted-placeholder-ref.html rename to tests/wpt/tests/css/css-scoping/slotted-placeholder-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/slotted-placeholder.html b/tests/wpt/tests/css/css-scoping/slotted-placeholder.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/slotted-placeholder.html rename to tests/wpt/tests/css/css-scoping/slotted-placeholder.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/slotted-slot.html b/tests/wpt/tests/css/css-scoping/slotted-slot.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/slotted-slot.html rename to tests/wpt/tests/css/css-scoping/slotted-slot.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/slotted-specificity-002.html b/tests/wpt/tests/css/css-scoping/slotted-specificity-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/slotted-specificity-002.html rename to tests/wpt/tests/css/css-scoping/slotted-specificity-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/slotted-specificity.html b/tests/wpt/tests/css/css-scoping/slotted-specificity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/slotted-specificity.html rename to tests/wpt/tests/css/css-scoping/slotted-specificity.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/slotted-with-pseudo-element-ref.html b/tests/wpt/tests/css/css-scoping/slotted-with-pseudo-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/slotted-with-pseudo-element-ref.html rename to tests/wpt/tests/css/css-scoping/slotted-with-pseudo-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/slotted-with-pseudo-element.html b/tests/wpt/tests/css/css-scoping/slotted-with-pseudo-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/slotted-with-pseudo-element.html rename to tests/wpt/tests/css/css-scoping/slotted-with-pseudo-element.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/stylesheet-title-001.html b/tests/wpt/tests/css/css-scoping/stylesheet-title-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/stylesheet-title-001.html rename to tests/wpt/tests/css/css-scoping/stylesheet-title-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/stylesheet-title-002.html b/tests/wpt/tests/css/css-scoping/stylesheet-title-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/stylesheet-title-002.html rename to tests/wpt/tests/css/css-scoping/stylesheet-title-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scoping/whitespace-crash-001.html b/tests/wpt/tests/css/css-scoping/whitespace-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scoping/whitespace-crash-001.html rename to tests/wpt/tests/css/css-scoping/whitespace-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/META.yml b/tests/wpt/tests/css/css-scroll-anchoring/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/META.yml rename to tests/wpt/tests/css/css-scroll-anchoring/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/README.md b/tests/wpt/tests/css/css-scroll-anchoring/README.md similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/README.md rename to tests/wpt/tests/css/css-scroll-anchoring/README.md diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/abspos-containing-block-outside-scroller.html b/tests/wpt/tests/css/css-scroll-anchoring/abspos-containing-block-outside-scroller.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/abspos-containing-block-outside-scroller.html rename to tests/wpt/tests/css/css-scroll-anchoring/abspos-containing-block-outside-scroller.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/abspos-contributes-to-static-parent-bounds.html b/tests/wpt/tests/css/css-scroll-anchoring/abspos-contributes-to-static-parent-bounds.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/abspos-contributes-to-static-parent-bounds.html rename to tests/wpt/tests/css/css-scroll-anchoring/abspos-contributes-to-static-parent-bounds.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/abspos-in-multicol-001.html b/tests/wpt/tests/css/css-scroll-anchoring/abspos-in-multicol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/abspos-in-multicol-001.html rename to tests/wpt/tests/css/css-scroll-anchoring/abspos-in-multicol-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/abspos-in-multicol-002.html b/tests/wpt/tests/css/css-scroll-anchoring/abspos-in-multicol-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/abspos-in-multicol-002.html rename to tests/wpt/tests/css/css-scroll-anchoring/abspos-in-multicol-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/abspos-in-multicol-003.html b/tests/wpt/tests/css/css-scroll-anchoring/abspos-in-multicol-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/abspos-in-multicol-003.html rename to tests/wpt/tests/css/css-scroll-anchoring/abspos-in-multicol-003.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/adjustments-in-scroll-event-handler.tentative.html b/tests/wpt/tests/css/css-scroll-anchoring/adjustments-in-scroll-event-handler.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/adjustments-in-scroll-event-handler.tentative.html rename to tests/wpt/tests/css/css-scroll-anchoring/adjustments-in-scroll-event-handler.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/ancestor-change-heuristic.html b/tests/wpt/tests/css/css-scroll-anchoring/ancestor-change-heuristic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/ancestor-change-heuristic.html rename to tests/wpt/tests/css/css-scroll-anchoring/ancestor-change-heuristic.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/anchor-inside-iframe.html b/tests/wpt/tests/css/css-scroll-anchoring/anchor-inside-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/anchor-inside-iframe.html rename to tests/wpt/tests/css/css-scroll-anchoring/anchor-inside-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/anchor-updates-after-explicit-scroll.html b/tests/wpt/tests/css/css-scroll-anchoring/anchor-updates-after-explicit-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/anchor-updates-after-explicit-scroll.html rename to tests/wpt/tests/css/css-scroll-anchoring/anchor-updates-after-explicit-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/anchoring-with-bounds-clamping-div.html b/tests/wpt/tests/css/css-scroll-anchoring/anchoring-with-bounds-clamping-div.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/anchoring-with-bounds-clamping-div.html rename to tests/wpt/tests/css/css-scroll-anchoring/anchoring-with-bounds-clamping-div.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/anchoring-with-bounds-clamping.html b/tests/wpt/tests/css/css-scroll-anchoring/anchoring-with-bounds-clamping.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/anchoring-with-bounds-clamping.html rename to tests/wpt/tests/css/css-scroll-anchoring/anchoring-with-bounds-clamping.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/anonymous-block-box.html b/tests/wpt/tests/css/css-scroll-anchoring/anonymous-block-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/anonymous-block-box.html rename to tests/wpt/tests/css/css-scroll-anchoring/anonymous-block-box.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/basic.html b/tests/wpt/tests/css/css-scroll-anchoring/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/basic.html rename to tests/wpt/tests/css/css-scroll-anchoring/basic.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/clamp-negative-overflow.html b/tests/wpt/tests/css/css-scroll-anchoring/clamp-negative-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/clamp-negative-overflow.html rename to tests/wpt/tests/css/css-scroll-anchoring/clamp-negative-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/clipped-scrollers-skipped.html b/tests/wpt/tests/css/css-scroll-anchoring/clipped-scrollers-skipped.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/clipped-scrollers-skipped.html rename to tests/wpt/tests/css/css-scroll-anchoring/clipped-scrollers-skipped.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/contain-paint-offscreen-container.html b/tests/wpt/tests/css/css-scroll-anchoring/contain-paint-offscreen-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/contain-paint-offscreen-container.html rename to tests/wpt/tests/css/css-scroll-anchoring/contain-paint-offscreen-container.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/descend-into-container-with-float.html b/tests/wpt/tests/css/css-scroll-anchoring/descend-into-container-with-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/descend-into-container-with-float.html rename to tests/wpt/tests/css/css-scroll-anchoring/descend-into-container-with-float.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/descend-into-container-with-overflow.html b/tests/wpt/tests/css/css-scroll-anchoring/descend-into-container-with-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/descend-into-container-with-overflow.html rename to tests/wpt/tests/css/css-scroll-anchoring/descend-into-container-with-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/device-pixel-adjustment.html b/tests/wpt/tests/css/css-scroll-anchoring/device-pixel-adjustment.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/device-pixel-adjustment.html rename to tests/wpt/tests/css/css-scroll-anchoring/device-pixel-adjustment.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/dirty-contents-reselect-anchor.tentative.html b/tests/wpt/tests/css/css-scroll-anchoring/dirty-contents-reselect-anchor.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/dirty-contents-reselect-anchor.tentative.html rename to tests/wpt/tests/css/css-scroll-anchoring/dirty-contents-reselect-anchor.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/exclude-fixed-position.html b/tests/wpt/tests/css/css-scroll-anchoring/exclude-fixed-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/exclude-fixed-position.html rename to tests/wpt/tests/css/css-scroll-anchoring/exclude-fixed-position.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/exclude-inline.html b/tests/wpt/tests/css/css-scroll-anchoring/exclude-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/exclude-inline.html rename to tests/wpt/tests/css/css-scroll-anchoring/exclude-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/exclude-sticky.html b/tests/wpt/tests/css/css-scroll-anchoring/exclude-sticky.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/exclude-sticky.html rename to tests/wpt/tests/css/css-scroll-anchoring/exclude-sticky.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/focus-prioritized.html b/tests/wpt/tests/css/css-scroll-anchoring/focus-prioritized.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/focus-prioritized.html rename to tests/wpt/tests/css/css-scroll-anchoring/focus-prioritized.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/fragment-scrolling-anchors.html b/tests/wpt/tests/css/css-scroll-anchoring/fragment-scrolling-anchors.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/fragment-scrolling-anchors.html rename to tests/wpt/tests/css/css-scroll-anchoring/fragment-scrolling-anchors.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/fullscreen-crash.html b/tests/wpt/tests/css/css-scroll-anchoring/fullscreen-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/fullscreen-crash.html rename to tests/wpt/tests/css/css-scroll-anchoring/fullscreen-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/heuristic-with-offset-update-from-scroll-event-listener.html b/tests/wpt/tests/css/css-scroll-anchoring/heuristic-with-offset-update-from-scroll-event-listener.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/heuristic-with-offset-update-from-scroll-event-listener.html rename to tests/wpt/tests/css/css-scroll-anchoring/heuristic-with-offset-update-from-scroll-event-listener.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/heuristic-with-offset-update.html b/tests/wpt/tests/css/css-scroll-anchoring/heuristic-with-offset-update.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/heuristic-with-offset-update.html rename to tests/wpt/tests/css/css-scroll-anchoring/heuristic-with-offset-update.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/history-restore-anchors.html b/tests/wpt/tests/css/css-scroll-anchoring/history-restore-anchors.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/history-restore-anchors.html rename to tests/wpt/tests/css/css-scroll-anchoring/history-restore-anchors.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/image-001.html b/tests/wpt/tests/css/css-scroll-anchoring/image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/image-001.html rename to tests/wpt/tests/css/css-scroll-anchoring/image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/infinite-scroll-event.tentative.html b/tests/wpt/tests/css/css-scroll-anchoring/infinite-scroll-event.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/infinite-scroll-event.tentative.html rename to tests/wpt/tests/css/css-scroll-anchoring/infinite-scroll-event.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/inheritance.html b/tests/wpt/tests/css/css-scroll-anchoring/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/inheritance.html rename to tests/wpt/tests/css/css-scroll-anchoring/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/inline-block-002.html b/tests/wpt/tests/css/css-scroll-anchoring/inline-block-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/inline-block-002.html rename to tests/wpt/tests/css/css-scroll-anchoring/inline-block-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/inline-block.html b/tests/wpt/tests/css/css-scroll-anchoring/inline-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/inline-block.html rename to tests/wpt/tests/css/css-scroll-anchoring/inline-block.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/multicol-fragmented-anchor.html b/tests/wpt/tests/css/css-scroll-anchoring/multicol-fragmented-anchor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/multicol-fragmented-anchor.html rename to tests/wpt/tests/css/css-scroll-anchoring/multicol-fragmented-anchor.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/negative-layout-overflow.html b/tests/wpt/tests/css/css-scroll-anchoring/negative-layout-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/negative-layout-overflow.html rename to tests/wpt/tests/css/css-scroll-anchoring/negative-layout-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/nested-overflow-subtree-layout-ref.html b/tests/wpt/tests/css/css-scroll-anchoring/nested-overflow-subtree-layout-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/nested-overflow-subtree-layout-ref.html rename to tests/wpt/tests/css/css-scroll-anchoring/nested-overflow-subtree-layout-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/nested-overflow-subtree-layout-vertical-ref.html b/tests/wpt/tests/css/css-scroll-anchoring/nested-overflow-subtree-layout-vertical-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/nested-overflow-subtree-layout-vertical-ref.html rename to tests/wpt/tests/css/css-scroll-anchoring/nested-overflow-subtree-layout-vertical-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/nested-overflow-subtree-layout-vertical.html b/tests/wpt/tests/css/css-scroll-anchoring/nested-overflow-subtree-layout-vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/nested-overflow-subtree-layout-vertical.html rename to tests/wpt/tests/css/css-scroll-anchoring/nested-overflow-subtree-layout-vertical.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/nested-overflow-subtree-layout.html b/tests/wpt/tests/css/css-scroll-anchoring/nested-overflow-subtree-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/nested-overflow-subtree-layout.html rename to tests/wpt/tests/css/css-scroll-anchoring/nested-overflow-subtree-layout.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/opt-out-dynamic-scroller.html b/tests/wpt/tests/css/css-scroll-anchoring/opt-out-dynamic-scroller.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/opt-out-dynamic-scroller.html rename to tests/wpt/tests/css/css-scroll-anchoring/opt-out-dynamic-scroller.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/opt-out-dynamic.html b/tests/wpt/tests/css/css-scroll-anchoring/opt-out-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/opt-out-dynamic.html rename to tests/wpt/tests/css/css-scroll-anchoring/opt-out-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/opt-out-inner-table.html b/tests/wpt/tests/css/css-scroll-anchoring/opt-out-inner-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/opt-out-inner-table.html rename to tests/wpt/tests/css/css-scroll-anchoring/opt-out-inner-table.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/opt-out-table.html b/tests/wpt/tests/css/css-scroll-anchoring/opt-out-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/opt-out-table.html rename to tests/wpt/tests/css/css-scroll-anchoring/opt-out-table.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/opt-out.html b/tests/wpt/tests/css/css-scroll-anchoring/opt-out.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/opt-out.html rename to tests/wpt/tests/css/css-scroll-anchoring/opt-out.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/parsing/overflow-anchor-computed.html b/tests/wpt/tests/css/css-scroll-anchoring/parsing/overflow-anchor-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/parsing/overflow-anchor-computed.html rename to tests/wpt/tests/css/css-scroll-anchoring/parsing/overflow-anchor-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/parsing/overflow-anchor-invalid.html b/tests/wpt/tests/css/css-scroll-anchoring/parsing/overflow-anchor-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/parsing/overflow-anchor-invalid.html rename to tests/wpt/tests/css/css-scroll-anchoring/parsing/overflow-anchor-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/parsing/overflow-anchor-valid.html b/tests/wpt/tests/css/css-scroll-anchoring/parsing/overflow-anchor-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/parsing/overflow-anchor-valid.html rename to tests/wpt/tests/css/css-scroll-anchoring/parsing/overflow-anchor-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/position-change-heuristic-display-none-change.html b/tests/wpt/tests/css/css-scroll-anchoring/position-change-heuristic-display-none-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/position-change-heuristic-display-none-change.html rename to tests/wpt/tests/css/css-scroll-anchoring/position-change-heuristic-display-none-change.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/position-change-heuristic-display-none-to-abspos-change.html b/tests/wpt/tests/css/css-scroll-anchoring/position-change-heuristic-display-none-to-abspos-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/position-change-heuristic-display-none-to-abspos-change.html rename to tests/wpt/tests/css/css-scroll-anchoring/position-change-heuristic-display-none-to-abspos-change.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/position-change-heuristic-ib-split.html b/tests/wpt/tests/css/css-scroll-anchoring/position-change-heuristic-ib-split.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/position-change-heuristic-ib-split.html rename to tests/wpt/tests/css/css-scroll-anchoring/position-change-heuristic-ib-split.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/position-change-heuristic-in-nested-scroll-box.html b/tests/wpt/tests/css/css-scroll-anchoring/position-change-heuristic-in-nested-scroll-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/position-change-heuristic-in-nested-scroll-box.html rename to tests/wpt/tests/css/css-scroll-anchoring/position-change-heuristic-in-nested-scroll-box.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/position-change-heuristic.html b/tests/wpt/tests/css/css-scroll-anchoring/position-change-heuristic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/position-change-heuristic.html rename to tests/wpt/tests/css/css-scroll-anchoring/position-change-heuristic.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/reading-scroll-forces-anchoring.html b/tests/wpt/tests/css/css-scroll-anchoring/reading-scroll-forces-anchoring.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/reading-scroll-forces-anchoring.html rename to tests/wpt/tests/css/css-scroll-anchoring/reading-scroll-forces-anchoring.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/scroll-padding-affects-anchoring.html b/tests/wpt/tests/css/css-scroll-anchoring/scroll-padding-affects-anchoring.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/scroll-padding-affects-anchoring.html rename to tests/wpt/tests/css/css-scroll-anchoring/scroll-padding-affects-anchoring.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/start-edge-in-block-layout-direction.html b/tests/wpt/tests/css/css-scroll-anchoring/start-edge-in-block-layout-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/start-edge-in-block-layout-direction.html rename to tests/wpt/tests/css/css-scroll-anchoring/start-edge-in-block-layout-direction.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/subtree-exclusion.html b/tests/wpt/tests/css/css-scroll-anchoring/subtree-exclusion.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/subtree-exclusion.html rename to tests/wpt/tests/css/css-scroll-anchoring/subtree-exclusion.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/flexbox-scrolling-vertical-rl.html b/tests/wpt/tests/css/css-scroll-anchoring/support/flexbox-scrolling-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/flexbox-scrolling-vertical-rl.html rename to tests/wpt/tests/css/css-scroll-anchoring/support/flexbox-scrolling-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/history-restore-anchors-new-window.html b/tests/wpt/tests/css/css-scroll-anchoring/support/history-restore-anchors-new-window.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/history-restore-anchors-new-window.html rename to tests/wpt/tests/css/css-scroll-anchoring/support/history-restore-anchors-new-window.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/scrolling-vertical-rl.html b/tests/wpt/tests/css/css-scroll-anchoring/support/scrolling-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/scrolling-vertical-rl.html rename to tests/wpt/tests/css/css-scroll-anchoring/support/scrolling-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/table-collapsed-borders-crash.html b/tests/wpt/tests/css/css-scroll-anchoring/table-collapsed-borders-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/table-collapsed-borders-crash.html rename to tests/wpt/tests/css/css-scroll-anchoring/table-collapsed-borders-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/text-anchor-in-vertical-rl.html b/tests/wpt/tests/css/css-scroll-anchoring/text-anchor-in-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/text-anchor-in-vertical-rl.html rename to tests/wpt/tests/css/css-scroll-anchoring/text-anchor-in-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-000.html b/tests/wpt/tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-000.html rename to tests/wpt/tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-000.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-001.html b/tests/wpt/tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-001.html rename to tests/wpt/tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/wrapped-text.html b/tests/wpt/tests/css/css-scroll-anchoring/wrapped-text.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/wrapped-text.html rename to tests/wpt/tests/css/css-scroll-anchoring/wrapped-text.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/zero-scroll-offset.html b/tests/wpt/tests/css/css-scroll-anchoring/zero-scroll-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-anchoring/zero-scroll-offset.html rename to tests/wpt/tests/css/css-scroll-anchoring/zero-scroll-offset.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-computed.html b/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-computed.html rename to tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-invalid.html b/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-invalid.html rename to tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-shorthand.html b/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-shorthand.html rename to tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-target-computed.html b/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-target-computed.html rename to tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-target-invalid.html b/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-target-invalid.html rename to tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-target-shorthand.html b/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-target-shorthand.html rename to tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-target-valid.html b/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-target-valid.html rename to tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-valid.html b/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/parsing/scroll-start-valid.html rename to tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-display-toggled.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-display-toggled.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-display-toggled.tentative.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-display-toggled.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-fieldset.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-fieldset.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-fieldset.tentative.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-fieldset.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-overflow-toggled.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-overflow-toggled.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-overflow-toggled.tentative.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-overflow-toggled.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-root.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-root.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-root.tentative.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-root.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-vertical-lr.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-vertical-lr.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-vertical-lr.tentative.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-vertical-lr.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-anchor-navigation-inner-frame.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-anchor-navigation-inner-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-anchor-navigation-inner-frame.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-anchor-navigation-inner-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-anchor-navigation.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-anchor-navigation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-anchor-navigation.tentative.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-anchor-navigation.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-fragment-navigation-inner-frame.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-fragment-navigation-inner-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-fragment-navigation-inner-frame.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-fragment-navigation-inner-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-fragment-navigation.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-fragment-navigation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-fragment-navigation.tentative.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-fragment-navigation.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-programmatic-scroll.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-programmatic-scroll.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-programmatic-scroll.tentative.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-programmatic-scroll.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-scroll-snap.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-scroll-snap.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-scroll-snap.tentative.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-scroll-snap.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-text-fragment-navigation-target.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-text-fragment-navigation-target.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-text-fragment-navigation-target.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-text-fragment-navigation-target.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-text-fragment-navigation.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-text-fragment-navigation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-text-fragment-navigation.tentative.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-text-fragment-navigation.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-user-scroll.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-user-scroll.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-user-scroll.tentative.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-user-scroll.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/scroll-start.tentative.html rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/stash.py b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/stash.py similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap-2/scroll-start/stash.py rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-start/stash.py diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/META.yml b/tests/wpt/tests/css/css-scroll-snap/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/META.yml rename to tests/wpt/tests/css/css-scroll-snap/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/capturing-snap-positions.html b/tests/wpt/tests/css/css-scroll-snap/capturing-snap-positions.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/capturing-snap-positions.html rename to tests/wpt/tests/css/css-scroll-snap/capturing-snap-positions.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/ignore-snap-points-orthogonal-to-snap-axis.html b/tests/wpt/tests/css/css-scroll-snap/ignore-snap-points-orthogonal-to-snap-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/ignore-snap-points-orthogonal-to-snap-axis.html rename to tests/wpt/tests/css/css-scroll-snap/ignore-snap-points-orthogonal-to-snap-axis.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/inheritance.html b/tests/wpt/tests/css/css-scroll-snap/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/inheritance.html rename to tests/wpt/tests/css/css-scroll-snap/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/input/keyboard.html b/tests/wpt/tests/css/css-scroll-snap/input/keyboard.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/input/keyboard.html rename to tests/wpt/tests/css/css-scroll-snap/input/keyboard.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/input/mouse-wheel.html b/tests/wpt/tests/css/css-scroll-snap/input/mouse-wheel.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/input/mouse-wheel.html rename to tests/wpt/tests/css/css-scroll-snap/input/mouse-wheel.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/input/snap-area-overflow-boundary.html b/tests/wpt/tests/css/css-scroll-snap/input/snap-area-overflow-boundary.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/input/snap-area-overflow-boundary.html rename to tests/wpt/tests/css/css-scroll-snap/input/snap-area-overflow-boundary.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/nested-scrollIntoView-snaps.html b/tests/wpt/tests/css/css-scroll-snap/nested-scrollIntoView-snaps.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/nested-scrollIntoView-snaps.html rename to tests/wpt/tests/css/css-scroll-snap/nested-scrollIntoView-snaps.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/no-red-ref.html b/tests/wpt/tests/css/css-scroll-snap/no-red-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/no-red-ref.html rename to tests/wpt/tests/css/css-scroll-snap/no-red-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/no-snap-position.html b/tests/wpt/tests/css/css-scroll-snap/no-snap-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/no-snap-position.html rename to tests/wpt/tests/css/css-scroll-snap/no-snap-position.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/overflowing-snap-areas.html b/tests/wpt/tests/css/css-scroll-snap/overflowing-snap-areas.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/overflowing-snap-areas.html rename to tests/wpt/tests/css/css-scroll-snap/overflowing-snap-areas.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-computed.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-computed.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-invalid.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-invalid.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-shorthand.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-shorthand.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-valid.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-valid.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-block-inline-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-computed.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-computed.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-invalid.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-invalid.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-shorthand.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-shorthand.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-valid.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-margin-valid.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-margin-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-computed.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-computed.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-invalid.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-invalid.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-shorthand.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-shorthand.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-valid.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-valid.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-block-inline-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-computed.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-computed.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-invalid.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-invalid.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-shorthand.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-shorthand.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-valid.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-valid.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-padding-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-align-computed.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-align-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-align-computed.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-align-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-align-invalid.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-align-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-align-invalid.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-align-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-align-valid.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-align-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-align-valid.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-align-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-stop-computed.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-stop-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-stop-computed.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-stop-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-stop-invalid.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-stop-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-stop-invalid.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-stop-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-stop-valid.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-stop-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-stop-valid.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-stop-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-type-computed.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-type-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-type-computed.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-type-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-type-invalid.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-type-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-type-invalid.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-type-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-type-valid.html b/tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-type-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-snap-type-valid.html rename to tests/wpt/tests/css/css-scroll-snap/parsing/scroll-snap-type-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/resnap-on-snap-alignment-change.html b/tests/wpt/tests/css/css-scroll-snap/resnap-on-snap-alignment-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/resnap-on-snap-alignment-change.html rename to tests/wpt/tests/css/css-scroll-snap/resnap-on-snap-alignment-change.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-margin-visibility-check.html b/tests/wpt/tests/css/css-scroll-snap/scroll-margin-visibility-check.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-margin-visibility-check.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-margin-visibility-check.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-margin.html b/tests/wpt/tests/css/css-scroll-snap/scroll-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-margin.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-on-large-element-not-covering-snapport.tentative.html b/tests/wpt/tests/css/css-scroll-snap/scroll-on-large-element-not-covering-snapport.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-on-large-element-not-covering-snapport.tentative.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-on-large-element-not-covering-snapport.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-padding-and-margin.html b/tests/wpt/tests/css/css-scroll-snap/scroll-padding-and-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-padding-and-margin.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-padding-and-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-padding.html b/tests/wpt/tests/css/css-scroll-snap/scroll-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-padding.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-root-001-ref.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-root-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-root-001-ref.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-snap-root-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-root-001.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-root-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-root-001.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-snap-root-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-root-002-ref.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-root-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-root-002-ref.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-snap-root-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-root-002.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-root-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-root-002.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-snap-root-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-root-003.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-root-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-root-003.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-snap-root-003.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-stop-001.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-stop-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-stop-001.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-snap-stop-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-stop-002.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-stop-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-stop-002.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-snap-stop-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-stop-change.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-stop-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-stop-change.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-snap-stop-change.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-type-change.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-type-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-type-change.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-snap-type-change.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-type-on-root-element.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-type-on-root-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-type-on-root-element.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-snap-type-on-root-element.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-type.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-snap-type.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-snap-type.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-001-ref.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-001-ref.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-align-001.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-align-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-align-001.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-align-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-align-002.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-align-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-align-002.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-align-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-align-003.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-align-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-align-003.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-align-003.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-margin-001.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-margin-001.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-margin-002.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-margin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-margin-002.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-margin-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-margin-003.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-margin-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-margin-003.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-margin-003.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-margin-004.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-margin-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-margin-004.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-margin-004.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-margin-005.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-margin-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-margin-005.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-margin-005.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-margin-006.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-margin-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-margin-006.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-margin-006.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-padding-001.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-padding-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-padding-001.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-padding-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-padding-002.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-padding-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-padding-002.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-padding-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-padding-003.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-padding-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-padding-003.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-padding-003.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-snap-001.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-snap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-snap-001.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-snap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-snap-002.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-snap-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-snap-002.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-snap-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-snap-003.html b/tests/wpt/tests/css/css-scroll-snap/scroll-target-snap-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scroll-target-snap-003.html rename to tests/wpt/tests/css/css-scroll-snap/scroll-target-snap-003.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/scrollTo-scrollBy-snaps.html b/tests/wpt/tests/css/css-scroll-snap/scrollTo-scrollBy-snaps.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/scrollTo-scrollBy-snaps.html rename to tests/wpt/tests/css/css-scroll-snap/scrollTo-scrollBy-snaps.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/selection-target.html b/tests/wpt/tests/css/css-scroll-snap/selection-target.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/selection-target.html rename to tests/wpt/tests/css/css-scroll-snap/selection-target.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/direction-rtl.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/direction-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/direction-rtl.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/direction-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000-ref.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000-ref.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-initial-layout-000.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000-ref.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000-ref.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/snap-after-initial-layout-ref.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/snap-after-initial-layout-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/snap-after-initial-layout-ref.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/snap-after-initial-layout-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-horizontal-tb.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-horizontal-tb.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-horizontal-tb.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-horizontal-tb.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-lr.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-lr.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-rl.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-rl.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/writing-mode-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/adding-only-snap-area.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/adding-only-snap-area.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/adding-only-snap-area.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/adding-only-snap-area.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/adding-snap-area-while-snapped.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/adding-snap-area-while-snapped.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/adding-snap-area-while-snapped.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/adding-snap-area-while-snapped.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-type-on-root-element.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-type-on-root-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-type-on-root-element.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-type-on-root-element.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-type.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-type.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-type.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/focus-element-no-snap.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/focus-element-no-snap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/focus-element-no-snap.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/focus-element-no-snap.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/move-current-target.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/move-current-target.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/move-current-target.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/move-current-target.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/not-resnap-outside-proximity-threshold.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/not-resnap-outside-proximity-threshold.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/not-resnap-outside-proximity-threshold.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/not-resnap-outside-proximity-threshold.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/remove-current-target.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/remove-current-target.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/remove-current-target.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/remove-current-target.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/resnap-to-focused.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/resnap-to-focused.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/resnap-to-focused.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/resnap-to-focused.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/snap-to-different-targets.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/snap-to-different-targets.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-after-relayout/snap-to-different-targets.html rename to tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/snap-to-different-targets.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-area-capturing-add-scroll-container.html b/tests/wpt/tests/css/css-scroll-snap/snap-area-capturing-add-scroll-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-area-capturing-add-scroll-container.html rename to tests/wpt/tests/css/css-scroll-snap/snap-area-capturing-add-scroll-container.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-area-capturing-remove-scroll-container.html b/tests/wpt/tests/css/css-scroll-snap/snap-area-capturing-remove-scroll-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-area-capturing-remove-scroll-container.html rename to tests/wpt/tests/css/css-scroll-snap/snap-area-capturing-remove-scroll-container.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-at-user-scroll-end.html b/tests/wpt/tests/css/css-scroll-snap/snap-at-user-scroll-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-at-user-scroll-end.html rename to tests/wpt/tests/css/css-scroll-snap/snap-at-user-scroll-end.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-inline-block.html b/tests/wpt/tests/css/css-scroll-snap/snap-inline-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-inline-block.html rename to tests/wpt/tests/css/css-scroll-snap/snap-inline-block.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-intended-direction.html b/tests/wpt/tests/css/css-scroll-snap/snap-intended-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-intended-direction.html rename to tests/wpt/tests/css/css-scroll-snap/snap-intended-direction.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-on-focus.html b/tests/wpt/tests/css/css-scroll-snap/snap-on-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-on-focus.html rename to tests/wpt/tests/css/css-scroll-snap/snap-on-focus.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-transformed-target.html b/tests/wpt/tests/css/css-scroll-snap/snap-to-transformed-target.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-transformed-target.html rename to tests/wpt/tests/css/css-scroll-snap/snap-to-transformed-target.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas-both.html b/tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-both.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas-both.html rename to tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-both.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas-margin-both.html b/tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-margin-both.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas-margin-both.html rename to tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-margin-both.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas-margin-x-axis.html b/tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-margin-x-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas-margin-x-axis.html rename to tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-margin-x-axis.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas-margin-y-axis.html b/tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-margin-y-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas-margin-y-axis.html rename to tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-margin-y-axis.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas-x-axis.html b/tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-x-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas-x-axis.html rename to tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-x-axis.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas-y-axis.html b/tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-y-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/snap-to-visible-areas-y-axis.html rename to tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-y-axis.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/support/common.css b/tests/wpt/tests/css/css-scroll-snap/support/common.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/support/common.css rename to tests/wpt/tests/css/css-scroll-snap/support/common.css diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/support/common.js b/tests/wpt/tests/css/css-scroll-snap/support/common.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/support/common.js rename to tests/wpt/tests/css/css-scroll-snap/support/common.js diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/support/scroll-target-align-001-iframe.html b/tests/wpt/tests/css/css-scroll-snap/support/scroll-target-align-001-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/support/scroll-target-align-001-iframe.html rename to tests/wpt/tests/css/css-scroll-snap/support/scroll-target-align-001-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/support/scroll-target-margin-001-iframe.html b/tests/wpt/tests/css/css-scroll-snap/support/scroll-target-margin-001-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/support/scroll-target-margin-001-iframe.html rename to tests/wpt/tests/css/css-scroll-snap/support/scroll-target-margin-001-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/support/scroll-target-padding-001-iframe.html b/tests/wpt/tests/css/css-scroll-snap/support/scroll-target-padding-001-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/support/scroll-target-padding-001-iframe.html rename to tests/wpt/tests/css/css-scroll-snap/support/scroll-target-padding-001-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/support/scroll-target-snap-001-iframe.html b/tests/wpt/tests/css/css-scroll-snap/support/scroll-target-snap-001-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/support/scroll-target-snap-001-iframe.html rename to tests/wpt/tests/css/css-scroll-snap/support/scroll-target-snap-001-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/unreachable-snap-positions-001.html b/tests/wpt/tests/css/css-scroll-snap/unreachable-snap-positions-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/unreachable-snap-positions-001.html rename to tests/wpt/tests/css/css-scroll-snap/unreachable-snap-positions-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/unreachable-snap-positions-002.html b/tests/wpt/tests/css/css-scroll-snap/unreachable-snap-positions-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scroll-snap/unreachable-snap-positions-002.html rename to tests/wpt/tests/css/css-scroll-snap/unreachable-snap-positions-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/META.yml b/tests/wpt/tests/css/css-scrollbars/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/META.yml rename to tests/wpt/tests/css/css-scrollbars/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/auto-scrollbar-inline-children.html b/tests/wpt/tests/css/css-scrollbars/auto-scrollbar-inline-children.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/auto-scrollbar-inline-children.html rename to tests/wpt/tests/css/css-scrollbars/auto-scrollbar-inline-children.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/inheritance.html b/tests/wpt/tests/css/css-scrollbars/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/inheritance.html rename to tests/wpt/tests/css/css-scrollbars/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/input-scrollbar-color-ref.html b/tests/wpt/tests/css/css-scrollbars/input-scrollbar-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/input-scrollbar-color-ref.html rename to tests/wpt/tests/css/css-scrollbars/input-scrollbar-color-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/input-scrollbar-color.html b/tests/wpt/tests/css/css-scrollbars/input-scrollbar-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/input-scrollbar-color.html rename to tests/wpt/tests/css/css-scrollbars/input-scrollbar-color.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/multicol-in-orthogonal-writing-mode-crash.html b/tests/wpt/tests/css/css-scrollbars/multicol-in-orthogonal-writing-mode-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/multicol-in-orthogonal-writing-mode-crash.html rename to tests/wpt/tests/css/css-scrollbars/multicol-in-orthogonal-writing-mode-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-color-001.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-color-001.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-color-002.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-color-002.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-color-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-color-003.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-color-003.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-color-003.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-color-004.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-color-004.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-color-004.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-color-005.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-color-005.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-color-005.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-color-parsing.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-color-parsing.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-color-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-001.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-001.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-002.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-002.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-003.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-003.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-003.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-004.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-004.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-004.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-005.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-005.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-005.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-006.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-006.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-006.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-007.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-007.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-007.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-008.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-008.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-008.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-009.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-009.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-009.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-010.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-010.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-010.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-011.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-011.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-011.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-012.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-012.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-012.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-013.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-013.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-013.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-014.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-014.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-014.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-015.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-015.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-015.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-016.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-016.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-016.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-keywords.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-keywords.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-keywords.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-keywords.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-001-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-001-ref.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-001.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-001.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-002-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-002-ref.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-002.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-002.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-002.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-003-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-003-ref.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-003.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-003.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-003.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-004-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-004-ref.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-004.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-004.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-004.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-005-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-005-ref.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-005.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-005.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-005.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-006-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-006-ref.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-006.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-paint-006.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-paint-006.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-parsing.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-width-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbar-width-parsing.html rename to tests/wpt/tests/css/css-scrollbars/scrollbar-width-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbars-chrome-bug-001-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbars-chrome-bug-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbars-chrome-bug-001-ref.html rename to tests/wpt/tests/css/css-scrollbars/scrollbars-chrome-bug-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/scrollbars-chrome-bug-001.html b/tests/wpt/tests/css/css-scrollbars/scrollbars-chrome-bug-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/scrollbars-chrome-bug-001.html rename to tests/wpt/tests/css/css-scrollbars/scrollbars-chrome-bug-001.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/support/viewport-scrollbar-body-frame.html b/tests/wpt/tests/css/css-scrollbars/support/viewport-scrollbar-body-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/support/viewport-scrollbar-body-frame.html rename to tests/wpt/tests/css/css-scrollbars/support/viewport-scrollbar-body-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/support/viewport-scrollbar-frame.html b/tests/wpt/tests/css/css-scrollbars/support/viewport-scrollbar-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/support/viewport-scrollbar-frame.html rename to tests/wpt/tests/css/css-scrollbars/support/viewport-scrollbar-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/textarea-scrollbar-width-none-ref.html b/tests/wpt/tests/css/css-scrollbars/textarea-scrollbar-width-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/textarea-scrollbar-width-none-ref.html rename to tests/wpt/tests/css/css-scrollbars/textarea-scrollbar-width-none-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/textarea-scrollbar-width-none.html b/tests/wpt/tests/css/css-scrollbars/textarea-scrollbar-width-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/textarea-scrollbar-width-none.html rename to tests/wpt/tests/css/css-scrollbars/textarea-scrollbar-width-none.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/transparent-on-root-ref.html b/tests/wpt/tests/css/css-scrollbars/transparent-on-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/transparent-on-root-ref.html rename to tests/wpt/tests/css/css-scrollbars/transparent-on-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/transparent-on-root.html b/tests/wpt/tests/css/css-scrollbars/transparent-on-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/transparent-on-root.html rename to tests/wpt/tests/css/css-scrollbars/transparent-on-root.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/viewport-scrollbar-body-ref.html b/tests/wpt/tests/css/css-scrollbars/viewport-scrollbar-body-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/viewport-scrollbar-body-ref.html rename to tests/wpt/tests/css/css-scrollbars/viewport-scrollbar-body-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/viewport-scrollbar-body.html b/tests/wpt/tests/css/css-scrollbars/viewport-scrollbar-body.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/viewport-scrollbar-body.html rename to tests/wpt/tests/css/css-scrollbars/viewport-scrollbar-body.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/viewport-scrollbar-ref.html b/tests/wpt/tests/css/css-scrollbars/viewport-scrollbar-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/viewport-scrollbar-ref.html rename to tests/wpt/tests/css/css-scrollbars/viewport-scrollbar-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-scrollbars/viewport-scrollbar.html b/tests/wpt/tests/css/css-scrollbars/viewport-scrollbar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-scrollbars/viewport-scrollbar.html rename to tests/wpt/tests/css/css-scrollbars/viewport-scrollbar.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/META.yml b/tests/wpt/tests/css/css-shadow-parts/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/META.yml rename to tests/wpt/tests/css/css-shadow-parts/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/all-hosts.html b/tests/wpt/tests/css/css-shadow-parts/all-hosts.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/all-hosts.html rename to tests/wpt/tests/css/css-shadow-parts/all-hosts.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/both-part-and-exportparts.html b/tests/wpt/tests/css/css-shadow-parts/both-part-and-exportparts.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/both-part-and-exportparts.html rename to tests/wpt/tests/css/css-shadow-parts/both-part-and-exportparts.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/chaining-invalid-selector.html b/tests/wpt/tests/css/css-shadow-parts/chaining-invalid-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/chaining-invalid-selector.html rename to tests/wpt/tests/css/css-shadow-parts/chaining-invalid-selector.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/complex-matching.html b/tests/wpt/tests/css/css-shadow-parts/complex-matching.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/complex-matching.html rename to tests/wpt/tests/css/css-shadow-parts/complex-matching.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/complex-non-matching.html b/tests/wpt/tests/css/css-shadow-parts/complex-non-matching.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/complex-non-matching.html rename to tests/wpt/tests/css/css-shadow-parts/complex-non-matching.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/different-host.html b/tests/wpt/tests/css/css-shadow-parts/different-host.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/different-host.html rename to tests/wpt/tests/css/css-shadow-parts/different-host.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/double-forward.html b/tests/wpt/tests/css/css-shadow-parts/double-forward.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/double-forward.html rename to tests/wpt/tests/css/css-shadow-parts/double-forward.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/exportparts-multiple.html b/tests/wpt/tests/css/css-shadow-parts/exportparts-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/exportparts-multiple.html rename to tests/wpt/tests/css/css-shadow-parts/exportparts-multiple.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/host-part-001.html b/tests/wpt/tests/css/css-shadow-parts/host-part-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/host-part-001.html rename to tests/wpt/tests/css/css-shadow-parts/host-part-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/host-stylesheet.html b/tests/wpt/tests/css/css-shadow-parts/host-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/host-stylesheet.html rename to tests/wpt/tests/css/css-shadow-parts/host-stylesheet.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/idlharness.html b/tests/wpt/tests/css/css-shadow-parts/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/idlharness.html rename to tests/wpt/tests/css/css-shadow-parts/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/inner-host.html b/tests/wpt/tests/css/css-shadow-parts/inner-host.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/inner-host.html rename to tests/wpt/tests/css/css-shadow-parts/inner-host.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/interaction-with-nested-pseudo-class-ref.html b/tests/wpt/tests/css/css-shadow-parts/interaction-with-nested-pseudo-class-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/interaction-with-nested-pseudo-class-ref.html rename to tests/wpt/tests/css/css-shadow-parts/interaction-with-nested-pseudo-class-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/interaction-with-nested-pseudo-class.html b/tests/wpt/tests/css/css-shadow-parts/interaction-with-nested-pseudo-class.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/interaction-with-nested-pseudo-class.html rename to tests/wpt/tests/css/css-shadow-parts/interaction-with-nested-pseudo-class.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/interaction-with-placeholder-ref.html b/tests/wpt/tests/css/css-shadow-parts/interaction-with-placeholder-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/interaction-with-placeholder-ref.html rename to tests/wpt/tests/css/css-shadow-parts/interaction-with-placeholder-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/interaction-with-placeholder.html b/tests/wpt/tests/css/css-shadow-parts/interaction-with-placeholder.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/interaction-with-placeholder.html rename to tests/wpt/tests/css/css-shadow-parts/interaction-with-placeholder.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/interaction-with-pseudo-elements.html b/tests/wpt/tests/css/css-shadow-parts/interaction-with-pseudo-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/interaction-with-pseudo-elements.html rename to tests/wpt/tests/css/css-shadow-parts/interaction-with-pseudo-elements.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-change-exportparts-forward.html b/tests/wpt/tests/css/css-shadow-parts/invalidation-change-exportparts-forward.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-change-exportparts-forward.html rename to tests/wpt/tests/css/css-shadow-parts/invalidation-change-exportparts-forward.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-change-part-name-forward.html b/tests/wpt/tests/css/css-shadow-parts/invalidation-change-part-name-forward.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-change-part-name-forward.html rename to tests/wpt/tests/css/css-shadow-parts/invalidation-change-part-name-forward.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-change-part-name-idl-domtokenlist.html b/tests/wpt/tests/css/css-shadow-parts/invalidation-change-part-name-idl-domtokenlist.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-change-part-name-idl-domtokenlist.html rename to tests/wpt/tests/css/css-shadow-parts/invalidation-change-part-name-idl-domtokenlist.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-change-part-name-idl-setter.html b/tests/wpt/tests/css/css-shadow-parts/invalidation-change-part-name-idl-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-change-part-name-idl-setter.html rename to tests/wpt/tests/css/css-shadow-parts/invalidation-change-part-name-idl-setter.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-change-part-name.html b/tests/wpt/tests/css/css-shadow-parts/invalidation-change-part-name.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-change-part-name.html rename to tests/wpt/tests/css/css-shadow-parts/invalidation-change-part-name.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-complex-selector-forward.html b/tests/wpt/tests/css/css-shadow-parts/invalidation-complex-selector-forward.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-complex-selector-forward.html rename to tests/wpt/tests/css/css-shadow-parts/invalidation-complex-selector-forward.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-complex-selector.html b/tests/wpt/tests/css/css-shadow-parts/invalidation-complex-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-complex-selector.html rename to tests/wpt/tests/css/css-shadow-parts/invalidation-complex-selector.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-part-pseudo.html b/tests/wpt/tests/css/css-shadow-parts/invalidation-part-pseudo.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/invalidation-part-pseudo.html rename to tests/wpt/tests/css/css-shadow-parts/invalidation-part-pseudo.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/multiple-parts.html b/tests/wpt/tests/css/css-shadow-parts/multiple-parts.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/multiple-parts.html rename to tests/wpt/tests/css/css-shadow-parts/multiple-parts.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/part-mutation-pseudo.html b/tests/wpt/tests/css/css-shadow-parts/part-mutation-pseudo.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/part-mutation-pseudo.html rename to tests/wpt/tests/css/css-shadow-parts/part-mutation-pseudo.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/part-name-idl.html b/tests/wpt/tests/css/css-shadow-parts/part-name-idl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/part-name-idl.html rename to tests/wpt/tests/css/css-shadow-parts/part-name-idl.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/part-nested-pseudo-ref.html b/tests/wpt/tests/css/css-shadow-parts/part-nested-pseudo-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/part-nested-pseudo-ref.html rename to tests/wpt/tests/css/css-shadow-parts/part-nested-pseudo-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/part-nested-pseudo.html b/tests/wpt/tests/css/css-shadow-parts/part-nested-pseudo.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/part-nested-pseudo.html rename to tests/wpt/tests/css/css-shadow-parts/part-nested-pseudo.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/precedence-part-vs-part.html b/tests/wpt/tests/css/css-shadow-parts/precedence-part-vs-part.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/precedence-part-vs-part.html rename to tests/wpt/tests/css/css-shadow-parts/precedence-part-vs-part.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/serialization.html b/tests/wpt/tests/css/css-shadow-parts/serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/serialization.html rename to tests/wpt/tests/css/css-shadow-parts/serialization.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/simple-forward-shorthand.html b/tests/wpt/tests/css/css-shadow-parts/simple-forward-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/simple-forward-shorthand.html rename to tests/wpt/tests/css/css-shadow-parts/simple-forward-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/simple-forward.html b/tests/wpt/tests/css/css-shadow-parts/simple-forward.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/simple-forward.html rename to tests/wpt/tests/css/css-shadow-parts/simple-forward.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/simple-important-important.html b/tests/wpt/tests/css/css-shadow-parts/simple-important-important.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/simple-important-important.html rename to tests/wpt/tests/css/css-shadow-parts/simple-important-important.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/simple-important-inline.html b/tests/wpt/tests/css/css-shadow-parts/simple-important-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/simple-important-inline.html rename to tests/wpt/tests/css/css-shadow-parts/simple-important-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/simple-important.html b/tests/wpt/tests/css/css-shadow-parts/simple-important.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/simple-important.html rename to tests/wpt/tests/css/css-shadow-parts/simple-important.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/simple-inline.html b/tests/wpt/tests/css/css-shadow-parts/simple-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/simple-inline.html rename to tests/wpt/tests/css/css-shadow-parts/simple-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/simple.html b/tests/wpt/tests/css/css-shadow-parts/simple.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/simple.html rename to tests/wpt/tests/css/css-shadow-parts/simple.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/style-sharing.html b/tests/wpt/tests/css/css-shadow-parts/style-sharing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/style-sharing.html rename to tests/wpt/tests/css/css-shadow-parts/style-sharing.html diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/support/shadow-helper.js b/tests/wpt/tests/css/css-shadow-parts/support/shadow-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shadow-parts/support/shadow-helper.js rename to tests/wpt/tests/css/css-shadow-parts/support/shadow-helper.js diff --git a/tests/wpt/web-platform-tests/css/css-shapes/META.yml b/tests/wpt/tests/css/css-shapes/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/META.yml rename to tests/wpt/tests/css/css-shapes/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-shapes/animation/shape-image-threshold-interpolation.html b/tests/wpt/tests/css/css-shapes/animation/shape-image-threshold-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/animation/shape-image-threshold-interpolation.html rename to tests/wpt/tests/css/css-shapes/animation/shape-image-threshold-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/animation/shape-margin-composition.html b/tests/wpt/tests/css/css-shapes/animation/shape-margin-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/animation/shape-margin-composition.html rename to tests/wpt/tests/css/css-shapes/animation/shape-margin-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/animation/shape-margin-interpolation.html b/tests/wpt/tests/css/css-shapes/animation/shape-margin-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/animation/shape-margin-interpolation.html rename to tests/wpt/tests/css/css-shapes/animation/shape-margin-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/animation/shape-outside-composition.html b/tests/wpt/tests/css/css-shapes/animation/shape-outside-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/animation/shape-outside-composition.html rename to tests/wpt/tests/css/css-shapes/animation/shape-outside-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/animation/shape-outside-interpolation.html b/tests/wpt/tests/css/css-shapes/animation/shape-outside-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/animation/shape-outside-interpolation.html rename to tests/wpt/tests/css/css-shapes/animation/shape-outside-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/basic-shape-circle-ellipse-serialization.html b/tests/wpt/tests/css/css-shapes/basic-shape-circle-ellipse-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/basic-shape-circle-ellipse-serialization.html rename to tests/wpt/tests/css/css-shapes/basic-shape-circle-ellipse-serialization.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/basic-shape-interpolation.html b/tests/wpt/tests/css/css-shapes/basic-shape-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/basic-shape-interpolation.html rename to tests/wpt/tests/css/css-shapes/basic-shape-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/inheritance.html b/tests/wpt/tests/css/css-shapes/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/inheritance.html rename to tests/wpt/tests/css/css-shapes/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-image-threshold-computed.html b/tests/wpt/tests/css/css-shapes/parsing/shape-image-threshold-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-image-threshold-computed.html rename to tests/wpt/tests/css/css-shapes/parsing/shape-image-threshold-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-image-threshold-invalid.html b/tests/wpt/tests/css/css-shapes/parsing/shape-image-threshold-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-image-threshold-invalid.html rename to tests/wpt/tests/css/css-shapes/parsing/shape-image-threshold-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-image-threshold-valid.html b/tests/wpt/tests/css/css-shapes/parsing/shape-image-threshold-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-image-threshold-valid.html rename to tests/wpt/tests/css/css-shapes/parsing/shape-image-threshold-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-margin-computed.html b/tests/wpt/tests/css/css-shapes/parsing/shape-margin-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-margin-computed.html rename to tests/wpt/tests/css/css-shapes/parsing/shape-margin-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-margin-invalid.html b/tests/wpt/tests/css/css-shapes/parsing/shape-margin-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-margin-invalid.html rename to tests/wpt/tests/css/css-shapes/parsing/shape-margin-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-margin-valid.html b/tests/wpt/tests/css/css-shapes/parsing/shape-margin-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-margin-valid.html rename to tests/wpt/tests/css/css-shapes/parsing/shape-margin-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-outside-computed.html b/tests/wpt/tests/css/css-shapes/parsing/shape-outside-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-outside-computed.html rename to tests/wpt/tests/css/css-shapes/parsing/shape-outside-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-outside-invalid-position.html b/tests/wpt/tests/css/css-shapes/parsing/shape-outside-invalid-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-outside-invalid-position.html rename to tests/wpt/tests/css/css-shapes/parsing/shape-outside-invalid-position.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-outside-invalid.html b/tests/wpt/tests/css/css-shapes/parsing/shape-outside-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-outside-invalid.html rename to tests/wpt/tests/css/css-shapes/parsing/shape-outside-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-outside-valid-position.html b/tests/wpt/tests/css/css-shapes/parsing/shape-outside-valid-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-outside-valid-position.html rename to tests/wpt/tests/css/css-shapes/parsing/shape-outside-valid-position.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-outside-valid.html b/tests/wpt/tests/css/css-shapes/parsing/shape-outside-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/parsing/shape-outside-valid.html rename to tests/wpt/tests/css/css-shapes/parsing/shape-outside-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-001.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-circle-000.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-circle-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-circle-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-circle-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-circle-001.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-circle-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-circle-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-circle-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-circle-002.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-circle-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-circle-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-circle-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-circle-003.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-circle-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-circle-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-circle-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-ellipse-001.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-ellipse-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-ellipse-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-ellipse-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-ellipse-002.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-ellipse-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-ellipse-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-ellipse-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-ellipse-003.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-ellipse-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-ellipse-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-ellipse-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-ellipse-004.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-ellipse-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-ellipse-004.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-ellipse-004.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-ellipse-005.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-ellipse-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-ellipse-005.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-ellipse-005.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-ellipse-006.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-ellipse-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-ellipse-006.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-ellipse-006.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-inset-001.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-inset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-inset-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-inset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-inset-002.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-inset-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-inset-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-inset-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-inset-003.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-inset-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-inset-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-inset-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-inset-004.html b/tests/wpt/tests/css/css-shapes/shape-outside-invalid-inset-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside-invalid-inset-004.html rename to tests/wpt/tests/css/css-shapes/shape-outside-invalid-inset-004.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-circle.html b/tests/wpt/tests/css/css-shapes/shape-outside/assorted/float-retry-push-circle.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-circle.html rename to tests/wpt/tests/css/css-shapes/shape-outside/assorted/float-retry-push-circle.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-image.html b/tests/wpt/tests/css/css-shapes/shape-outside/assorted/float-retry-push-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-image.html rename to tests/wpt/tests/css/css-shapes/shape-outside/assorted/float-retry-push-image.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-inset.html b/tests/wpt/tests/css/css-shapes/shape-outside/assorted/float-retry-push-inset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-inset.html rename to tests/wpt/tests/css/css-shapes/shape-outside/assorted/float-retry-push-inset.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-polygon.html b/tests/wpt/tests/css/css-shapes/shape-outside/assorted/float-retry-push-polygon.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-polygon.html rename to tests/wpt/tests/css/css-shapes/shape-outside/assorted/float-retry-push-polygon.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-should-push.html b/tests/wpt/tests/css/css-shapes/shape-outside/assorted/float-should-push.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-should-push.html rename to tests/wpt/tests/css/css-shapes/shape-outside/assorted/float-should-push.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/reference/float-retry-push-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/assorted/reference/float-retry-push-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/reference/float-retry-push-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/assorted/reference/float-retry-push-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/reference/float-should-push-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/assorted/reference/float-should-push-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/reference/float-should-push-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/assorted/reference/float-should-push-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/formatting-context/reference/shape-outside-formatting-context-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/formatting-context/reference/shape-outside-formatting-context-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/formatting-context/reference/shape-outside-formatting-context-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/formatting-context/reference/shape-outside-formatting-context-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/formatting-context/shape-outside-formatting-context.tentative.html b/tests/wpt/tests/css/css-shapes/shape-outside/formatting-context/shape-outside-formatting-context.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/formatting-context/shape-outside-formatting-context.tentative.html rename to tests/wpt/tests/css/css-shapes/shape-outside/formatting-context/shape-outside-formatting-context.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-001-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-001-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-002-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-002-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-001-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-001-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-002-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-002-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-003-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-003-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-004-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-004-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-005-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-005-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-006-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-006-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-007-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-007-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-008-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-008-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-009-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-009-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-010-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-010-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-011-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-011-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-012-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-012-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-box-001-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-box-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-box-001-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-box-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-box-005-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-box-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-box-005-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-box-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-001-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-001-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-002-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-002-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-border-radius-001-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-border-radius-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-border-radius-001-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-border-radius-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-border-radius-002-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-border-radius-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-border-radius-002-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-border-radius-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-001-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-001-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-002-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-002-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-001-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-001-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-002-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-002-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-003-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-003-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-004-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-004-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-005-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-005-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-006-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-006-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-007-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-007-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-008-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-008-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-001-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-001-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-002-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-002-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-003-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-003-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-border-radius-001-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-border-radius-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-border-radius-001-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-border-radius-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-border-radius-002-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-border-radius-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-border-radius-002-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-border-radius-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-004.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-004.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-004.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-005.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-005.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-005.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-006.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-006.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-006.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-007.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-007.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-007.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-008.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-008.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-008.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-009.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-009.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-009.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-010.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-010.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-010.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-011.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-011.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-011.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-012.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-012.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-012.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-004.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-004.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-004.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-006.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-006.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-006.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-007.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-007.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-007.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-008.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-008.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-008.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-009.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-009.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-box-009.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-004.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-004.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-004.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-005.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-005.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-005.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-006.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-006.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-006.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-007.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-007.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-007.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-008.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-008.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-008.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-001-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-001-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-002-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-002-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-004-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-004-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-004.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-004.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-004.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-005.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-005.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-005.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-006.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-006.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-006.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-007.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-007.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-007.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-008.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-008.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-008.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-009.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-009.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-009.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-010.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-010.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-010.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-011.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-011.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-011.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-012.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-012.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-012.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-015.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-015.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-015.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-016.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-016.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-016.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-000-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-000-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-001-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-001-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-002-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-002-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-006-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-006-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-007-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-007-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-008-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-008-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-012-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-012-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-013-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-013-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-018-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-018-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-019-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-019-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-020-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-020-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-021-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-021-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-022-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-022-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-023-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-023-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-024-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-024-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-025-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-025-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/reference/shape-image-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-004.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-004.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-004.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-005.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-005.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-005.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-006.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-006.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-006.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-007.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-007.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-007.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-008.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-008.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-008.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-009.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-009.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-009.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-010.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-010.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-010.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-011.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-011.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-011.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-012.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-012.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-012.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-013.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-013.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-013.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-014.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-014.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-014.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-015.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-015.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-015.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-016.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-016.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-016.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-017.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-017.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-017.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-018.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-018.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-018.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-019.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-019.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-019.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-020.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-020.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-020.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-021.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-021.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-021.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-022.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-022.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-022.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-023.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-023.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-023.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-024.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-024.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-024.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-025.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-025.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-025.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-026.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-026.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-026.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-027.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-027.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-027.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-028.html b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-028.html rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/shape-image-028.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/animated.gif b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/animated.gif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/animated.gif rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/animated.gif diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-20.png b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-20.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-20.png rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-20.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-20.svg b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-20.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-20.svg rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-20.svg diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-50.png b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-50.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-50.png rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-50.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-50.svg b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-50.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-50.svg rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-50.svg diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-70.png b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-70.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-70.png rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-70.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-70.svg b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-70.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-70.svg rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-70.svg diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle.jpg b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle.jpg rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle.jpg diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle.png b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle.png rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle.svg b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle.svg rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle.svg diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-20.png b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-20.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-20.png rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-20.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-50.png b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-50.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-50.png rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-50.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-70.png b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-70.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-70.png rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-70.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-70.svg b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-70.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-70.svg rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle-70.svg diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.gif b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.gif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.gif rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.gif diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.jpg b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.jpg rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.jpg diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.png b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.png rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.svg b/tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.svg rename to tests/wpt/tests/css/css-shapes/shape-outside/shape-image/support/right-half-rectangle.svg diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-013-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-013-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-023-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-023-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-030-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-030-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-030-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-030-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-032-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-032-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-032-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-032-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-033-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-033-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-033-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-033-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-034-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-034-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-034-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-034-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-035-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-035-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-035-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-035-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-036-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-036-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-036-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-036-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-041-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-041-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-041-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-041-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-042-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-042-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-042-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-042-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-047-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-047-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-047-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-047-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-048-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-048-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-048-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-048-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-049-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-049-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-049-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-049-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-050-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-050-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-050-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-050-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-051-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-051-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-051-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-051-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-052-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-052-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-052-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-052-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-053-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-053-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-053-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-053-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-054-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-054-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-054-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-054-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-055-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-055-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-055-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-055-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-056-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-056-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-056-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-056-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-013.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-013.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-013.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-014.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-014.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-014.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-015.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-015.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-015.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-016.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-016.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-016.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-017.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-017.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-017.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-018.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-018.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-018.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-019.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-019.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-019.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-020.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-020.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-020.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-021.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-021.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-021.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-022.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-022.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-022.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-024.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-024.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-024.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-025.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-025.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-025.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-026.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-026.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-026.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-027.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-027.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-027.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-028.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-028.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-028.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-029.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-029.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-029.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-030.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-030.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-030.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-031.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-031.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-031.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-032.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-032.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-032.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-033.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-033.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-033.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-034.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-034.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-034.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-035.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-035.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-035.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-036.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-036.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-036.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-037.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-037.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-037.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-038.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-038.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-038.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-041.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-041.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-041.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-042.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-042.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-042.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-043.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-043.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-043.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-044.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-044.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-044.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-047.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-047.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-047.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-048.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-048.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-048.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-049.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-049.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-049.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-050.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-050.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-050.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-051.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-051.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-051.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-052.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-052.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-052.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-053.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-053.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-053.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-053.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-054.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-054.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-054.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-054.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-055.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-055.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-055.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-055.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-056.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-056.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-056.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-056.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-integer-overflow-crash.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-integer-overflow-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-integer-overflow-crash.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-integer-overflow-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-013-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-013-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-021-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-021-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-030-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-030-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-030-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-030-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-032-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-032-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-032-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-032-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-033-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-033-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-033-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-033-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-034-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-034-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-034-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-034-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-035-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-035-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-035-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-035-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-036-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-036-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-036-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-036-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-037-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-037-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-037-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-037-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-038-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-038-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-038-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-038-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-039-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-039-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-039-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-039-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-040-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-040-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-040-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-040-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-042-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-042-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-042-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-042-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-044-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-044-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-044-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-044-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-045-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-045-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-045-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-045-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-046-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-046-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-046-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-046-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-047-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-047-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-047-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-047-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-048-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-048-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-048-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-048-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-049-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-049-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-049-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-049-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-050-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-050-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-050-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-050-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-051-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-051-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-051-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-051-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-052-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-052-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-052-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-052-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-013.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-013.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-013.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-014.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-014.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-014.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-015.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-015.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-015.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-016.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-016.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-016.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-017.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-017.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-017.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-018.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-018.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-018.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-019.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-019.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-019.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-020.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-020.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-020.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-021.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-021.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-021.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-022.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-022.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-022.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-023.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-023.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-023.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-024.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-024.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-024.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-025.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-025.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-025.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-030.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-030.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-030.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-031.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-031.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-031.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-032.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-032.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-032.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-033.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-033.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-033.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-034.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-034.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-034.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-035.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-035.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-035.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-036.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-036.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-036.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-037.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-037.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-037.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-040.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-040.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-040.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-041.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-041.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-041.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-042.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-042.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-042.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-043.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-043.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-043.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-044.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-044.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-044.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-045.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-045.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-045.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-046.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-046.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-046.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-047.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-047.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-047.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-048.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-048.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-048.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-049.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-049.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-049.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-050.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-050.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-050.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-051.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-051.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-051.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-052.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-052.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-052.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-integer-overflow-crash.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-integer-overflow-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-integer-overflow-crash.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-integer-overflow-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-010-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-010-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-016-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-016-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-017-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-017-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-020-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-020-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-021-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-021-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-022-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-022-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-023-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-023-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-024-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-024-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-025-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-025-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-026-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-026-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-026-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-026-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-027-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-027-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-010.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-010.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-010.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-011.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-011.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-011.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-012.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-012.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-012.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-013.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-013.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-013.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-014.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-014.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-014.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-015.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-015.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-015.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-016.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-016.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-016.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-017.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-017.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-017.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-020.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-020.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-020.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-021.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-021.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-021.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-022.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-022.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-022.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-023.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-023.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-023.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-024.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-024.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-024.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-025.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-025.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-025.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-026.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-026.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-026.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-027.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-027.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-027.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-031.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-031.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-031.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-refcrash.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-refcrash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-refcrash.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-refcrash.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-007-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-007-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-010-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-010-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-017-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-017-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-018-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-018-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-019-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-019-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-020-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-020-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-021-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-021-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-022-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-022-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-023-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-023-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-024-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-024-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-025-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-025-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-032-ref.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-032-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-032-ref.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-032-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-008.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-008.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-008.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-009.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-009.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-009.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-010.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-010.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-010.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-011.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-011.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-011.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-013.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-013.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-013.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-014.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-014.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-014.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-016.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-016.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-016.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-018.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-018.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-018.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-019.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-019.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-019.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-020.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-020.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-020.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-021.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-021.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-021.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-022.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-022.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-022.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-023.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-023.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-023.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-024.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-024.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-024.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-025.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-025.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-025.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-032.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-032.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-032.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-crash.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-crash.html rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/support/rounded-rectangle.js b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/support/rounded-rectangle.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/support/rounded-rectangle.js rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/support/rounded-rectangle.js diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/support/subpixel-utils.js b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/support/subpixel-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/support/subpixel-utils.js rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/support/subpixel-utils.js diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/support/test-utils.js b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/support/test-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/support/test-utils.js rename to tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/support/test-utils.js diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-image-threshold-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-image-threshold-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-image-threshold-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-image-threshold-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-image-threshold-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-image-threshold-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-image-threshold-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-image-threshold-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-image-threshold-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-image-threshold-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-image-threshold-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-image-threshold-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-image-threshold-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-image-threshold-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-image-threshold-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-image-threshold-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-margin-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-margin-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-margin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-margin-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-margin-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-margin-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-004.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-margin-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-004.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-margin-004.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-005.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-margin-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-005.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-margin-005.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-box-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-box-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-box-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-box-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-004.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-004.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-004.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-005.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-005.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-005.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-006.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-006.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-006.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-007.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-007.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-007.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-008.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-008.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-008.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-009.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-009.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-009.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-010.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-010.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-010.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-011.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-circle-011.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-circle-011.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-computed-shape-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-computed-shape-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-computed-shape-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-computed-shape-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-computed-shape-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-computed-shape-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-computed-shape-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-computed-shape-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-004.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-004.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-004.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-005.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-005.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-005.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-006.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-006.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-006.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-007.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-007.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-007.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-008.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-008.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-008.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-009.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-009.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-009.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-010.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-010.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-010.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-011.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-011.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-ellipse-011.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-0010.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-0010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-0010.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-0010.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-004.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-004.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-004.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-005.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-005.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-005.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-006.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-006.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-006.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-007.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-007.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-007.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-008.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-008.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-008.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-009.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-inset-009.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-inset-009.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-polygon-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-polygon-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-polygon-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-polygon-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-polygon-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-polygon-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-polygon-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-polygon-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-polygon-002.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-polygon-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-polygon-002.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-polygon-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-polygon-003.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-polygon-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-polygon-003.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-polygon-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-polygon-004.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-polygon-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-polygon-004.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-polygon-004.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-polygon-005.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-polygon-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-polygon-005.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-polygon-005.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-polygon-006.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-polygon-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-polygon-006.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-polygon-006.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-shape-arguments-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-shape-arguments-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-shape-arguments-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-shape-arguments-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-shape-arguments-001.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-shape-arguments-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-shape-arguments-001.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-shape-arguments-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-shape-box-pair-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-shape-box-pair-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-shape-box-pair-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-shape-box-pair-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-shape-inherit-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-shape-inherit-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-shape-inherit-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-shape-inherit-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-shape-initial-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-shape-initial-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-shape-initial-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-shape-initial-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-shape-none-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-shape-none-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-shape-none-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-shape-none-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-shape-notation-000.html b/tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-shape-notation-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-outside-shape-notation-000.html rename to tests/wpt/tests/css/css-shapes/shape-outside/values/shape-outside-shape-notation-000.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/support/parsing-utils.js b/tests/wpt/tests/css/css-shapes/shape-outside/values/support/parsing-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/support/parsing-utils.js rename to tests/wpt/tests/css/css-shapes/shape-outside/values/support/parsing-utils.js diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/reference/shape-outside-001-ref.html b/tests/wpt/tests/css/css-shapes/spec-examples/reference/shape-outside-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/reference/shape-outside-001-ref.html rename to tests/wpt/tests/css/css-shapes/spec-examples/reference/shape-outside-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/reference/shape-outside-004-ref.html b/tests/wpt/tests/css/css-shapes/spec-examples/reference/shape-outside-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/reference/shape-outside-004-ref.html rename to tests/wpt/tests/css/css-shapes/spec-examples/reference/shape-outside-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/reference/shape-outside-006-ref.html b/tests/wpt/tests/css/css-shapes/spec-examples/reference/shape-outside-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/reference/shape-outside-006-ref.html rename to tests/wpt/tests/css/css-shapes/spec-examples/reference/shape-outside-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/reference/shape-outside-007-ref.html b/tests/wpt/tests/css/css-shapes/spec-examples/reference/shape-outside-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/reference/shape-outside-007-ref.html rename to tests/wpt/tests/css/css-shapes/spec-examples/reference/shape-outside-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/reference/shape-outside-008-ref.html b/tests/wpt/tests/css/css-shapes/spec-examples/reference/shape-outside-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/reference/shape-outside-008-ref.html rename to tests/wpt/tests/css/css-shapes/spec-examples/reference/shape-outside-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-001.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-001.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-001.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-002.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-002.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-002.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-003.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-003.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-003.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-004.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-004.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-004.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-005.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-005.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-005.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-006.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-006.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-006.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-007.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-007.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-007.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-008.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-008.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-008.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-010.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-010.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-010.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-011.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-011.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-011.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-012.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-012.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-012.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-013.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-013.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-013.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-014.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-014.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-014.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-015.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-015.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-015.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-016.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-016.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-016.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-017.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-017.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-017.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-018.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-018.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-018.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-019.html b/tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-019.html rename to tests/wpt/tests/css/css-shapes/spec-examples/shape-outside-019.html diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/support/circle-no-shadow.png b/tests/wpt/tests/css/css-shapes/spec-examples/support/circle-no-shadow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/support/circle-no-shadow.png rename to tests/wpt/tests/css/css-shapes/spec-examples/support/circle-no-shadow.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/support/circle-shadow.png b/tests/wpt/tests/css/css-shapes/spec-examples/support/circle-shadow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/support/circle-shadow.png rename to tests/wpt/tests/css/css-shapes/spec-examples/support/circle-shadow.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/support/rounded-triangle.svg b/tests/wpt/tests/css/css-shapes/spec-examples/support/rounded-triangle.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/support/rounded-triangle.svg rename to tests/wpt/tests/css/css-shapes/spec-examples/support/rounded-triangle.svg diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/support/spec-example-utils.js b/tests/wpt/tests/css/css-shapes/spec-examples/support/spec-example-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/spec-examples/support/spec-example-utils.js rename to tests/wpt/tests/css/css-shapes/spec-examples/support/spec-example-utils.js diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/1x1-green.png b/tests/wpt/tests/css/css-shapes/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/1x1-green.png rename to tests/wpt/tests/css/css-shapes/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/1x1-lime.png b/tests/wpt/tests/css/css-shapes/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/1x1-lime.png rename to tests/wpt/tests/css/css-shapes/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/1x1-maroon.png b/tests/wpt/tests/css/css-shapes/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/1x1-maroon.png rename to tests/wpt/tests/css/css-shapes/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/1x1-navy.png b/tests/wpt/tests/css/css-shapes/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/1x1-navy.png rename to tests/wpt/tests/css/css-shapes/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/1x1-red.png b/tests/wpt/tests/css/css-shapes/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/1x1-red.png rename to tests/wpt/tests/css/css-shapes/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/1x1-white.png b/tests/wpt/tests/css/css-shapes/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/1x1-white.png rename to tests/wpt/tests/css/css-shapes/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/60x60-gg-rr.png b/tests/wpt/tests/css/css-shapes/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/60x60-gg-rr.png rename to tests/wpt/tests/css/css-shapes/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/60x60-green.png b/tests/wpt/tests/css/css-shapes/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/60x60-green.png rename to tests/wpt/tests/css/css-shapes/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/README b/tests/wpt/tests/css/css-shapes/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/README rename to tests/wpt/tests/css/css-shapes/support/README diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/a-green.css b/tests/wpt/tests/css/css-shapes/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/a-green.css rename to tests/wpt/tests/css/css-shapes/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/b-green.css b/tests/wpt/tests/css/css-shapes/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/b-green.css rename to tests/wpt/tests/css/css-shapes/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/c-red.css b/tests/wpt/tests/css/css-shapes/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/c-red.css rename to tests/wpt/tests/css/css-shapes/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/cat.png b/tests/wpt/tests/css/css-shapes/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/cat.png rename to tests/wpt/tests/css/css-shapes/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/css-shapes/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/css-shapes/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/css-shapes/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/css-shapes/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/css-shapes/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/css-shapes/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/pattern-tr.png b/tests/wpt/tests/css/css-shapes/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/pattern-tr.png rename to tests/wpt/tests/css/css-shapes/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/square-purple.png b/tests/wpt/tests/css/css-shapes/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/square-purple.png rename to tests/wpt/tests/css/css-shapes/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/square-teal.png b/tests/wpt/tests/css/css-shapes/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/square-teal.png rename to tests/wpt/tests/css/css-shapes/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/square-white.png b/tests/wpt/tests/css/css-shapes/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/square-white.png rename to tests/wpt/tests/css/css-shapes/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/swatch-blue.png b/tests/wpt/tests/css/css-shapes/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/swatch-blue.png rename to tests/wpt/tests/css/css-shapes/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/swatch-green.png b/tests/wpt/tests/css/css-shapes/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/swatch-green.png rename to tests/wpt/tests/css/css-shapes/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/swatch-lime.png b/tests/wpt/tests/css/css-shapes/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/swatch-lime.png rename to tests/wpt/tests/css/css-shapes/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/swatch-orange.png b/tests/wpt/tests/css/css-shapes/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/swatch-orange.png rename to tests/wpt/tests/css/css-shapes/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/swatch-red.png b/tests/wpt/tests/css/css-shapes/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/swatch-red.png rename to tests/wpt/tests/css/css-shapes/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/swatch-white.png b/tests/wpt/tests/css/css-shapes/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/swatch-white.png rename to tests/wpt/tests/css/css-shapes/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/swatch-yellow.png b/tests/wpt/tests/css/css-shapes/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/swatch-yellow.png rename to tests/wpt/tests/css/css-shapes/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/test-bl.png b/tests/wpt/tests/css/css-shapes/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/test-bl.png rename to tests/wpt/tests/css/css-shapes/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/test-br.png b/tests/wpt/tests/css/css-shapes/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/test-br.png rename to tests/wpt/tests/css/css-shapes/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/test-outer.png b/tests/wpt/tests/css/css-shapes/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/test-outer.png rename to tests/wpt/tests/css/css-shapes/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/test-tl.png b/tests/wpt/tests/css/css-shapes/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/test-tl.png rename to tests/wpt/tests/css/css-shapes/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/support/test-tr.png b/tests/wpt/tests/css/css-shapes/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/support/test-tr.png rename to tests/wpt/tests/css/css-shapes/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-shapes/test-plan/index.html b/tests/wpt/tests/css/css-shapes/test-plan/index.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-shapes/test-plan/index.html rename to tests/wpt/tests/css/css-shapes/test-plan/index.html diff --git a/tests/wpt/web-platform-tests/css/css-size-adjust/META.yml b/tests/wpt/tests/css/css-size-adjust/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-size-adjust/META.yml rename to tests/wpt/tests/css/css-size-adjust/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-size-adjust/animations/text-size-adjust-interpolation.html b/tests/wpt/tests/css/css-size-adjust/animations/text-size-adjust-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-size-adjust/animations/text-size-adjust-interpolation.html rename to tests/wpt/tests/css/css-size-adjust/animations/text-size-adjust-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-size-adjust/inheritance.html b/tests/wpt/tests/css/css-size-adjust/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-size-adjust/inheritance.html rename to tests/wpt/tests/css/css-size-adjust/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-size-adjust/parsing/text-size-adjust-computed.html b/tests/wpt/tests/css/css-size-adjust/parsing/text-size-adjust-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-size-adjust/parsing/text-size-adjust-computed.html rename to tests/wpt/tests/css/css-size-adjust/parsing/text-size-adjust-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-size-adjust/parsing/text-size-adjust-invalid.html b/tests/wpt/tests/css/css-size-adjust/parsing/text-size-adjust-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-size-adjust/parsing/text-size-adjust-invalid.html rename to tests/wpt/tests/css/css-size-adjust/parsing/text-size-adjust-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-size-adjust/parsing/text-size-adjust-valid.html b/tests/wpt/tests/css/css-size-adjust/parsing/text-size-adjust-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-size-adjust/parsing/text-size-adjust-valid.html rename to tests/wpt/tests/css/css-size-adjust/parsing/text-size-adjust-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/META.yml b/tests/wpt/tests/css/css-sizing/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/META.yml rename to tests/wpt/tests/css/css-sizing/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation.html b/tests/wpt/tests/css/css-sizing/animation/aspect-ratio-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation.html rename to tests/wpt/tests/css/css-sizing/animation/aspect-ratio-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/box-sizing-no-interpolation.html b/tests/wpt/tests/css/css-sizing/animation/box-sizing-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/box-sizing-no-interpolation.html rename to tests/wpt/tests/css/css-sizing/animation/box-sizing-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/height-composition.html b/tests/wpt/tests/css/css-sizing/animation/height-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/height-composition.html rename to tests/wpt/tests/css/css-sizing/animation/height-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/height-interpolation.html b/tests/wpt/tests/css/css-sizing/animation/height-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/height-interpolation.html rename to tests/wpt/tests/css/css-sizing/animation/height-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/height-no-interpolation.html b/tests/wpt/tests/css/css-sizing/animation/height-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/height-no-interpolation.html rename to tests/wpt/tests/css/css-sizing/animation/height-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/max-height-composition.html b/tests/wpt/tests/css/css-sizing/animation/max-height-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/max-height-composition.html rename to tests/wpt/tests/css/css-sizing/animation/max-height-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/max-height-interpolation.html b/tests/wpt/tests/css/css-sizing/animation/max-height-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/max-height-interpolation.html rename to tests/wpt/tests/css/css-sizing/animation/max-height-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/max-width-composition.html b/tests/wpt/tests/css/css-sizing/animation/max-width-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/max-width-composition.html rename to tests/wpt/tests/css/css-sizing/animation/max-width-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/max-width-interpolation.html b/tests/wpt/tests/css/css-sizing/animation/max-width-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/max-width-interpolation.html rename to tests/wpt/tests/css/css-sizing/animation/max-width-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/min-height-composition.html b/tests/wpt/tests/css/css-sizing/animation/min-height-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/min-height-composition.html rename to tests/wpt/tests/css/css-sizing/animation/min-height-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/min-height-interpolation.html b/tests/wpt/tests/css/css-sizing/animation/min-height-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/min-height-interpolation.html rename to tests/wpt/tests/css/css-sizing/animation/min-height-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/min-width-composition.html b/tests/wpt/tests/css/css-sizing/animation/min-width-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/min-width-composition.html rename to tests/wpt/tests/css/css-sizing/animation/min-width-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/min-width-interpolation.html b/tests/wpt/tests/css/css-sizing/animation/min-width-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/min-width-interpolation.html rename to tests/wpt/tests/css/css-sizing/animation/min-width-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/width-composition.html b/tests/wpt/tests/css/css-sizing/animation/width-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/width-composition.html rename to tests/wpt/tests/css/css-sizing/animation/width-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/width-interpolation.html b/tests/wpt/tests/css/css-sizing/animation/width-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/animation/width-interpolation.html rename to tests/wpt/tests/css/css-sizing/animation/width-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio-affects-container-width-when-height-changes.html b/tests/wpt/tests/css/css-sizing/aspect-ratio-affects-container-width-when-height-changes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio-affects-container-width-when-height-changes.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio-affects-container-width-when-height-changes.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-002.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-002.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-003.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-003.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-004.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-004.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-005.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-005.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-006.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-006.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-006.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-007.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-007.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-007.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-008.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-008.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-008.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-009.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-009.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-009.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-010.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-010.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-010.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-011.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-011.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-011.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-012.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-012.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-012.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-013.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-013.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-013.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-014.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-014.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-014.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-015.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-015.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-015.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-016.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-016.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-016.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-017.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-017.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-017.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-018.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-018.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-018.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-019.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-019.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-019.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-020.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-020.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-020.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-021.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/abspos-021.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/abspos-021.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/auto-margins-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/auto-margins-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/auto-margins-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/auto-margins-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-002.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-002.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-003.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-003.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-004.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-004.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-005.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-005.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-006.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-006.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-006.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-007.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-007.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-007.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-008.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-008.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-008.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-009.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-009.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-009.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-010.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-010.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-010.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-011.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-011.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-011.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-012.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-012.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-012.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-013.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-013.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-013.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-014.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-014.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-014.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-015.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-015.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-015.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-016.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-016.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-016.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-017.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-017.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-017.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-018.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-018.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-018.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-019.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-019.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-019.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-020.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-020.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-020.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-021.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-021.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-021.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-022.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-022.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-022.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-023.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-023.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-023.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-024.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-024.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-024.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-025.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-025.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-025.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-026.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-026.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-026.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-027.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-027.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-027.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-028.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-028.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-028.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-029-crash.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-029-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-029-crash.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-029-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-030.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-030.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-030.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-031.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-031.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-031.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-032.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-032.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-032.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-033.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-033.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-033.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-034.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-034.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-034.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-035.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-035.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-035.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-036.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-036.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-036.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-037.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-037.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-037.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-038.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-038.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-038.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-039.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-039.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-039.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-040.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-040.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-040.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-041.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-041.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-041.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-042.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-042.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-042.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-043.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-043.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-043.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-044.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-044.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-044.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-045.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-045.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-045.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-046.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-046.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-046.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-047.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-047.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-047.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-048.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-048.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-048.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-049.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-049.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-049.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-050.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-050.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-050.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-051-crash.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-051-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-051-crash.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-051-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-052.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-052.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-052.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-053.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-053.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-053.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-053.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-054.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-054.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-054.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-054.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-055.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-055.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-055.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-055.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-002.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-002.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/fieldset-element-001-ref.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/fieldset-element-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/fieldset-element-001-ref.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/fieldset-element-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/fieldset-element-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/fieldset-element-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/fieldset-element-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/fieldset-element-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-002.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-002.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-003.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-003.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-004.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-004.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-005.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-005.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-006.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-006.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-006.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-007.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-007.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-007.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-008.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-008.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-008.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-009.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-009.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-009.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-010.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-010.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-010.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-011.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-011.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-011.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-012.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-012.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-012.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-013.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-013.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-013.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-014.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-014.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-014.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-015.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-015.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-015.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-016.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-016.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-016.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-017.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-017.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-017.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-018.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-018.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-018.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-019.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-019.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-019.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-020.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-020.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-020.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-021.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-021.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-021.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-022.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-022.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-022.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-023.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-023.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-023.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-024.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-024.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-024.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-025.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-025.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-025.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-026.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-026.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-026.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-027.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-027.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-027.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-028.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-028.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-028.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-029.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-029.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-029.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-030.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-030.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-030.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-031.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-031.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-031.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-032.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-032.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-032.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-033.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-033.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-033.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-034.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-034.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-034.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-035.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-035.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-035.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-036.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-036.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-036.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-037.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-037.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-037.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-038.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-038.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-038.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-039.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-039.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-039.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-040.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-040.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-040.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-041.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-041.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-041.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-042.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-042.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-042.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/floats-aspect-ratio-001-ref.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/floats-aspect-ratio-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/floats-aspect-ratio-001-ref.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/floats-aspect-ratio-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/floats-aspect-ratio-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/floats-aspect-ratio-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/floats-aspect-ratio-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/floats-aspect-ratio-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/fractional-aspect-ratio.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/fractional-aspect-ratio.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/fractional-aspect-ratio.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/fractional-aspect-ratio.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-002.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-002.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-003.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-003.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-004.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-004.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-005.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-005.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-006.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-006.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-006.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-007.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-007.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-007.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-008.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-008.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-008.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-009.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-009.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-009.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-010.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-010.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-010.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-011.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-011.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-011.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-012.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-012.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-012.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-014.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-014.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-014.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-015.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-015.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-015.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-016.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-016.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-016.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-017.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-017.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-017.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-018.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-018.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-018.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-019.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-019.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-019.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-020.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-020.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-020.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-021.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-021.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-021.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-022.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-022.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-022.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-023.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-023.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-023.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-024.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-024.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-024.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-025.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-025.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-025.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-026.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-026.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-026.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-027.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-027.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-027.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-028.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-028.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-028.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-029.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-029.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-029.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-030.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-030.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-030.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-031.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-031.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-031.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-032.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-032.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-032.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-033.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-033.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-033.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-034.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-034.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-034.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-035.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-035.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-035.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-036.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-036.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-036.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-037.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-037.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-037.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-038.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-038.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-038.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-039.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-039.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-039.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-040.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-040.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/grid-aspect-ratio-040.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-002.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-002.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-003.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-003.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-004.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-004.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-005.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-005.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-006.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-006.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-006.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-007.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-007.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-007.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-008.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-008.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-008.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-009.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-009.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-009.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-010.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-010.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-010.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-011.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-011.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-011.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-012.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-012.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-012.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-013.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-013.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-013.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-014.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-014.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-014.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-015.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-015.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-015.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-016.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/intrinsic-size-016.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/intrinsic-size-016.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/large-aspect-ratio-crash.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/large-aspect-ratio-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/large-aspect-ratio-crash.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/large-aspect-ratio-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-computed.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-computed.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-invalid.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-invalid.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-valid.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-valid.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/parsing/aspect-ratio-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/percentage-resolution-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/percentage-resolution-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-002.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/percentage-resolution-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-002.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/percentage-resolution-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-003.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/percentage-resolution-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-003.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/percentage-resolution-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-004.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/percentage-resolution-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-004.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/percentage-resolution-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-005.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/percentage-resolution-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/percentage-resolution-005.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/percentage-resolution-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/quirks-mode-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/quirks-mode-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/quirks-mode-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/quirks-mode-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/quirks-mode-002.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/quirks-mode-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/quirks-mode-002.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/quirks-mode-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/quirks-mode-003.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/quirks-mode-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/quirks-mode-003.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/quirks-mode-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/reference/ref-filled-green-100x20-rect.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/reference/ref-filled-green-100x20-rect.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/reference/ref-filled-green-100x20-rect.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/reference/ref-filled-green-100x20-rect.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/reference/ref-square-with-scrollbar.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/reference/ref-square-with-scrollbar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/reference/ref-square-with-scrollbar.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/reference/ref-square-with-scrollbar.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/reference/ref-square-with-vertical-scrollbar.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/reference/ref-square-with-vertical-scrollbar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/reference/ref-square-with-vertical-scrollbar.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/reference/ref-square-with-vertical-scrollbar.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-002.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-002.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-003.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-003.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-004.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-004.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-005.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-005.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-006.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-006.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-006.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-007.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-007.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-007.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-008.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-008.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-008.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-009.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-009.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-009.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-010.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-010.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-010.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-011.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-011.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-011.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-012.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-012.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-012.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-013.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-013.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-013.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-014.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-014.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-014.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-015.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-015.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-015.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-016.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-016.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-016.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-017.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-017.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-017.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-018.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-018.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-018.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-019.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-019.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-019.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-020.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-020.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-020.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-021.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-021.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-021.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-022.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-022.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-022.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-023.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-023.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-023.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-024.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-024.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-024.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-025.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-025.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-025.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-026.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-026.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-026.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-027.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-027.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-027.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-028.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-028.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-028.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-029.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-029.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-029.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-030.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-030.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-030.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-031.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-031.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-031.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-032.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-032.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-032.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-033.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-033.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-033.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-034.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-034.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-034.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-035-ref.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-035-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-035-ref.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-035-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-035.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-035.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-035.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-036.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-036.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-036.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-037-ref.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-037-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-037-ref.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-037-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-037.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-037.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-037.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-039.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-039.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-039.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-040.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-040.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-040.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-041.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-041.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-041.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-dynamic-aspect-ratio.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-dynamic-aspect-ratio.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-dynamic-aspect-ratio.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/replaced-element-dynamic-aspect-ratio.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/select-element-001-ref.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/select-element-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/select-element-001-ref.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/select-element-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/select-element-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/select-element-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/select-element-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/select-element-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/small-aspect-ratio-crash.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/small-aspect-ratio-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/small-aspect-ratio-crash.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/small-aspect-ratio-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/100x100-green.png b/tests/wpt/tests/css/css-sizing/aspect-ratio/support/100x100-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/100x100-green.png rename to tests/wpt/tests/css/css-sizing/aspect-ratio/support/100x100-green.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/1x1-green.png b/tests/wpt/tests/css/css-sizing/aspect-ratio/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/1x1-green.png rename to tests/wpt/tests/css/css-sizing/aspect-ratio/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/200x200-green.png b/tests/wpt/tests/css/css-sizing/aspect-ratio/support/200x200-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/200x200-green.png rename to tests/wpt/tests/css/css-sizing/aspect-ratio/support/200x200-green.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/20x50-green.png b/tests/wpt/tests/css/css-sizing/aspect-ratio/support/20x50-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/20x50-green.png rename to tests/wpt/tests/css/css-sizing/aspect-ratio/support/20x50-green.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/2x2-green.ogv b/tests/wpt/tests/css/css-sizing/aspect-ratio/support/2x2-green.ogv similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/support/2x2-green.ogv rename to tests/wpt/tests/css/css-sizing/aspect-ratio/support/2x2-green.ogv diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/table-element-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/table-element-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/table-element-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/table-element-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-001.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-001.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-002.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-002.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-003.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-003.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-004.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-004.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-005.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-005.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-006.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-006.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-006.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-007.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-007.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-007.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-008.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-008.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-008.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-009.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-009.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-009.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-010.html b/tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-010.html rename to tests/wpt/tests/css/css-sizing/aspect-ratio/zero-or-infinity-010.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/auto-scrollbar-inside-stf-abspos-ref.html b/tests/wpt/tests/css/css-sizing/auto-scrollbar-inside-stf-abspos-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/auto-scrollbar-inside-stf-abspos-ref.html rename to tests/wpt/tests/css/css-sizing/auto-scrollbar-inside-stf-abspos-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/auto-scrollbar-inside-stf-abspos.html b/tests/wpt/tests/css/css-sizing/auto-scrollbar-inside-stf-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/auto-scrollbar-inside-stf-abspos.html rename to tests/wpt/tests/css/css-sizing/auto-scrollbar-inside-stf-abspos.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/available-height-for-replaced-content-001.html b/tests/wpt/tests/css/css-sizing/available-height-for-replaced-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/available-height-for-replaced-content-001.html rename to tests/wpt/tests/css/css-sizing/available-height-for-replaced-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/block-fit-content-as-initial-ref.html b/tests/wpt/tests/css/css-sizing/block-fit-content-as-initial-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/block-fit-content-as-initial-ref.html rename to tests/wpt/tests/css/css-sizing/block-fit-content-as-initial-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/block-fit-content-as-initial.html b/tests/wpt/tests/css/css-sizing/block-fit-content-as-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/block-fit-content-as-initial.html rename to tests/wpt/tests/css/css-sizing/block-fit-content-as-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/block-image-percentage-max-height-inside-inline.html b/tests/wpt/tests/css/css-sizing/block-image-percentage-max-height-inside-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/block-image-percentage-max-height-inside-inline.html rename to tests/wpt/tests/css/css-sizing/block-image-percentage-max-height-inside-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/block-size-with-min-or-max-content-1-ref.html b/tests/wpt/tests/css/css-sizing/block-size-with-min-or-max-content-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/block-size-with-min-or-max-content-1-ref.html rename to tests/wpt/tests/css/css-sizing/block-size-with-min-or-max-content-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/block-size-with-min-or-max-content-1a.html b/tests/wpt/tests/css/css-sizing/block-size-with-min-or-max-content-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/block-size-with-min-or-max-content-1a.html rename to tests/wpt/tests/css/css-sizing/block-size-with-min-or-max-content-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/block-size-with-min-or-max-content-1b.html b/tests/wpt/tests/css/css-sizing/block-size-with-min-or-max-content-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/block-size-with-min-or-max-content-1b.html rename to tests/wpt/tests/css/css-sizing/block-size-with-min-or-max-content-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/block-size-with-min-or-max-content-table-1-ref.html b/tests/wpt/tests/css/css-sizing/block-size-with-min-or-max-content-table-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/block-size-with-min-or-max-content-table-1-ref.html rename to tests/wpt/tests/css/css-sizing/block-size-with-min-or-max-content-table-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/block-size-with-min-or-max-content-table-1a.html b/tests/wpt/tests/css/css-sizing/block-size-with-min-or-max-content-table-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/block-size-with-min-or-max-content-table-1a.html rename to tests/wpt/tests/css/css-sizing/block-size-with-min-or-max-content-table-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/block-size-with-min-or-max-content-table-1b.html b/tests/wpt/tests/css/css-sizing/block-size-with-min-or-max-content-table-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/block-size-with-min-or-max-content-table-1b.html rename to tests/wpt/tests/css/css-sizing/block-size-with-min-or-max-content-table-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/border-box-and-max-content-001-ref.html b/tests/wpt/tests/css/css-sizing/border-box-and-max-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/border-box-and-max-content-001-ref.html rename to tests/wpt/tests/css/css-sizing/border-box-and-max-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/border-box-and-max-content-001.html b/tests/wpt/tests/css/css-sizing/border-box-and-max-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/border-box-and-max-content-001.html rename to tests/wpt/tests/css/css-sizing/border-box-and-max-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/border-box-and-max-content-002-ref.html b/tests/wpt/tests/css/css-sizing/border-box-and-max-content-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/border-box-and-max-content-002-ref.html rename to tests/wpt/tests/css/css-sizing/border-box-and-max-content-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/border-box-and-max-content-002.html b/tests/wpt/tests/css/css-sizing/border-box-and-max-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/border-box-and-max-content-002.html rename to tests/wpt/tests/css/css-sizing/border-box-and-max-content-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/border-box-and-max-content-003-ref.html b/tests/wpt/tests/css/css-sizing/border-box-and-max-content-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/border-box-and-max-content-003-ref.html rename to tests/wpt/tests/css/css-sizing/border-box-and-max-content-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/border-box-and-max-content-003.html b/tests/wpt/tests/css/css-sizing/border-box-and-max-content-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/border-box-and-max-content-003.html rename to tests/wpt/tests/css/css-sizing/border-box-and-max-content-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-001-ref.xht b/tests/wpt/tests/css/css-sizing/box-sizing-border-box-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-001-ref.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-border-box-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-001.xht b/tests/wpt/tests/css/css-sizing/box-sizing-border-box-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-001.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-border-box-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-002-ref.xht b/tests/wpt/tests/css/css-sizing/box-sizing-border-box-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-002-ref.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-border-box-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-002.xht b/tests/wpt/tests/css/css-sizing/box-sizing-border-box-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-002.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-border-box-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-003-ref.xht b/tests/wpt/tests/css/css-sizing/box-sizing-border-box-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-003-ref.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-border-box-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-003.xht b/tests/wpt/tests/css/css-sizing/box-sizing-border-box-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-003.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-border-box-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-004-ref.xht b/tests/wpt/tests/css/css-sizing/box-sizing-border-box-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-004-ref.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-border-box-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-004.xht b/tests/wpt/tests/css/css-sizing/box-sizing-border-box-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-border-box-004.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-border-box-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-001-ref.xht b/tests/wpt/tests/css/css-sizing/box-sizing-content-box-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-001-ref.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-content-box-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-001.xht b/tests/wpt/tests/css/css-sizing/box-sizing-content-box-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-001.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-content-box-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-002-ref.xht b/tests/wpt/tests/css/css-sizing/box-sizing-content-box-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-002-ref.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-content-box-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-002.xht b/tests/wpt/tests/css/css-sizing/box-sizing-content-box-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-002.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-content-box-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-003-ref.xht b/tests/wpt/tests/css/css-sizing/box-sizing-content-box-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-003-ref.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-content-box-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-003.xht b/tests/wpt/tests/css/css-sizing/box-sizing-content-box-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-content-box-003.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-content-box-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-001-ref.xht b/tests/wpt/tests/css/css-sizing/box-sizing-replaced-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-001-ref.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-replaced-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-001.xht b/tests/wpt/tests/css/css-sizing/box-sizing-replaced-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-001.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-replaced-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-002-ref.xht b/tests/wpt/tests/css/css-sizing/box-sizing-replaced-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-002-ref.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-replaced-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-002.xht b/tests/wpt/tests/css/css-sizing/box-sizing-replaced-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-002.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-replaced-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-003-ref.xht b/tests/wpt/tests/css/css-sizing/box-sizing-replaced-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-003-ref.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-replaced-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-003.xht b/tests/wpt/tests/css/css-sizing/box-sizing-replaced-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/box-sizing-replaced-003.xht rename to tests/wpt/tests/css/css-sizing/box-sizing-replaced-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-sizing/button-min-width.html b/tests/wpt/tests/css/css-sizing/button-min-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/button-min-width.html rename to tests/wpt/tests/css/css-sizing/button-min-width.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/calc-margins-block.html b/tests/wpt/tests/css/css-sizing/calc-margins-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/calc-margins-block.html rename to tests/wpt/tests/css/css-sizing/calc-margins-block.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/calc-margins-fieldset-content.html b/tests/wpt/tests/css/css-sizing/calc-margins-fieldset-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/calc-margins-fieldset-content.html rename to tests/wpt/tests/css/css-sizing/calc-margins-fieldset-content.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/calc-margins-fieldset-legend.html b/tests/wpt/tests/css/css-sizing/calc-margins-fieldset-legend.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/calc-margins-fieldset-legend.html rename to tests/wpt/tests/css/css-sizing/calc-margins-fieldset-legend.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/calc-margins-flex.html b/tests/wpt/tests/css/css-sizing/calc-margins-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/calc-margins-flex.html rename to tests/wpt/tests/css/css-sizing/calc-margins-flex.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/calc-margins-table-caption.html b/tests/wpt/tests/css/css-sizing/calc-margins-table-caption.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/calc-margins-table-caption.html rename to tests/wpt/tests/css/css-sizing/calc-margins-table-caption.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/canvas-intrinsic-dynamic.html b/tests/wpt/tests/css/css-sizing/canvas-intrinsic-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/canvas-intrinsic-dynamic.html rename to tests/wpt/tests/css/css-sizing/canvas-intrinsic-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/clone-intrinsic-size-ref.html b/tests/wpt/tests/css/css-sizing/clone-intrinsic-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/clone-intrinsic-size-ref.html rename to tests/wpt/tests/css/css-sizing/clone-intrinsic-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/clone-intrinsic-size.html b/tests/wpt/tests/css/css-sizing/clone-intrinsic-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/clone-intrinsic-size.html rename to tests/wpt/tests/css/css-sizing/clone-intrinsic-size.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/clone-nowrap-intrinsic-size-bidi-ref.html b/tests/wpt/tests/css/css-sizing/clone-nowrap-intrinsic-size-bidi-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/clone-nowrap-intrinsic-size-bidi-ref.html rename to tests/wpt/tests/css/css-sizing/clone-nowrap-intrinsic-size-bidi-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/clone-nowrap-intrinsic-size-bidi.html b/tests/wpt/tests/css/css-sizing/clone-nowrap-intrinsic-size-bidi.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/clone-nowrap-intrinsic-size-bidi.html rename to tests/wpt/tests/css/css-sizing/clone-nowrap-intrinsic-size-bidi.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/clone-nowrap-intrinsic-size-ref.html b/tests/wpt/tests/css/css-sizing/clone-nowrap-intrinsic-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/clone-nowrap-intrinsic-size-ref.html rename to tests/wpt/tests/css/css-sizing/clone-nowrap-intrinsic-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/clone-nowrap-intrinsic-size.html b/tests/wpt/tests/css/css-sizing/clone-nowrap-intrinsic-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/clone-nowrap-intrinsic-size.html rename to tests/wpt/tests/css/css-sizing/clone-nowrap-intrinsic-size.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/animation/contain-intrinsic-size-interpolation.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/animation/contain-intrinsic-size-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/animation/contain-intrinsic-size-interpolation.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/animation/contain-intrinsic-size-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-001.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-001.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-002.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-002.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-003.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-003.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-004.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-004.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-005.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-005.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-006.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-006.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-006.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-007.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-007.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-007.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-008.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-008.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-008.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-009.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-009.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-009.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-010.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-010.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-010.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-011.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-011.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-011.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-012.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-012.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-012.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-013.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-013.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-013.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-014.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/auto-014.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/auto-014.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-001-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-001-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-001.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-001.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-002-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-002-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-002.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-002.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-003-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-003-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-003.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-003.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-004-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-004-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-004.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-004.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-005-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-005-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-005.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-005.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-006-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-006-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-006.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-006.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-006.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-007-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-007-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-007.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-007.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-007.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-008-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-008-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-008.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-008.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-008.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-009.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-009.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-009.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-010-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-010-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-010.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-010.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-010.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-011-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-011-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-011.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-011.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-011.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-012-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-012-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-012.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-012.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-012.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-013-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-013-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-013.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-013.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-013.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-014-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-014-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-014.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-014.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-014.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-015-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-015-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-015.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-015.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-015.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-016-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-016-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-016.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-016.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-016.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-017-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-017-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-017.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-017.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-017.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-018-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-018-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-018.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-018.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-018.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-019-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-019-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-019.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-019.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-019.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-020-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-020-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-020.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-020.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-020.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-021-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-021-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-021.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-021.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-021.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-022-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-022-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-022.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-022.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-022.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-023-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-023-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-023.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-023.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-023.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-024-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-024-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-024.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-024.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-024.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-025-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-025-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-025.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-025.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-025.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-026-ref.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-026-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-026-ref.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-026-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-026.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-026.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-026.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-027.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-027.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-027.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-028.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-028.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-028.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-029.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-029.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-029.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-030.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-030.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-030.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-031.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-031.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-031.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-032.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-032.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-032.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-033.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-033.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-033.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-001.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-001.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-002.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-002.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-003.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-003.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-logical-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-computed.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-computed.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-invalid.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-invalid.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-valid.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-valid.html rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/resources/dice.png b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/resources/dice.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/contain-intrinsic-size/resources/dice.png rename to tests/wpt/tests/css/css-sizing/contain-intrinsic-size/resources/dice.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-auto-margin-bottom-ref.html b/tests/wpt/tests/css/css-sizing/div-auto-margin-bottom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-auto-margin-bottom-ref.html rename to tests/wpt/tests/css/css-sizing/div-auto-margin-bottom-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-auto-margin-ref.html b/tests/wpt/tests/css/css-sizing/div-auto-margin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-auto-margin-ref.html rename to tests/wpt/tests/css/css-sizing/div-auto-margin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-auto-margin-top-ref.html b/tests/wpt/tests/css/css-sizing/div-auto-margin-top-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-auto-margin-top-ref.html rename to tests/wpt/tests/css/css-sizing/div-auto-margin-top-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-block-size-ref.html b/tests/wpt/tests/css/css-sizing/div-block-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-block-size-ref.html rename to tests/wpt/tests/css/css-sizing/div-block-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-auto-margin-bottom.tentative.html b/tests/wpt/tests/css/css-sizing/div-fit-content-auto-margin-bottom.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-auto-margin-bottom.tentative.html rename to tests/wpt/tests/css/css-sizing/div-fit-content-auto-margin-bottom.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-auto-margin-top.tentative.html b/tests/wpt/tests/css/css-sizing/div-fit-content-auto-margin-top.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-auto-margin-top.tentative.html rename to tests/wpt/tests/css/css-sizing/div-fit-content-auto-margin-top.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-auto-margin.tentative.html b/tests/wpt/tests/css/css-sizing/div-fit-content-auto-margin.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-auto-margin.tentative.html rename to tests/wpt/tests/css/css-sizing/div-fit-content-auto-margin.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-block-size.tentative.html b/tests/wpt/tests/css/css-sizing/div-fit-content-block-size.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-block-size.tentative.html rename to tests/wpt/tests/css/css-sizing/div-fit-content-block-size.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-orthogonal-auto-margin-left.tentative.html b/tests/wpt/tests/css/css-sizing/div-fit-content-orthogonal-auto-margin-left.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-orthogonal-auto-margin-left.tentative.html rename to tests/wpt/tests/css/css-sizing/div-fit-content-orthogonal-auto-margin-left.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-orthogonal-auto-margin-right.tentative.html b/tests/wpt/tests/css/css-sizing/div-fit-content-orthogonal-auto-margin-right.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-orthogonal-auto-margin-right.tentative.html rename to tests/wpt/tests/css/css-sizing/div-fit-content-orthogonal-auto-margin-right.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-orthogonal-auto-margin.tentative.html b/tests/wpt/tests/css/css-sizing/div-fit-content-orthogonal-auto-margin.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-orthogonal-auto-margin.tentative.html rename to tests/wpt/tests/css/css-sizing/div-fit-content-orthogonal-auto-margin.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-orthogonal-block-size.tentative.html b/tests/wpt/tests/css/css-sizing/div-fit-content-orthogonal-block-size.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-fit-content-orthogonal-block-size.tentative.html rename to tests/wpt/tests/css/css-sizing/div-fit-content-orthogonal-block-size.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-max-content-auto-margin-bottom.tentative.html b/tests/wpt/tests/css/css-sizing/div-max-content-auto-margin-bottom.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-max-content-auto-margin-bottom.tentative.html rename to tests/wpt/tests/css/css-sizing/div-max-content-auto-margin-bottom.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-max-content-auto-margin-top.tentative.html b/tests/wpt/tests/css/css-sizing/div-max-content-auto-margin-top.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-max-content-auto-margin-top.tentative.html rename to tests/wpt/tests/css/css-sizing/div-max-content-auto-margin-top.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-max-content-auto-margin.tentative.html b/tests/wpt/tests/css/css-sizing/div-max-content-auto-margin.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-max-content-auto-margin.tentative.html rename to tests/wpt/tests/css/css-sizing/div-max-content-auto-margin.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-max-content-block-size.tentative.html b/tests/wpt/tests/css/css-sizing/div-max-content-block-size.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-max-content-block-size.tentative.html rename to tests/wpt/tests/css/css-sizing/div-max-content-block-size.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-max-content-orthogonal-auto-margin-left.tentative.html b/tests/wpt/tests/css/css-sizing/div-max-content-orthogonal-auto-margin-left.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-max-content-orthogonal-auto-margin-left.tentative.html rename to tests/wpt/tests/css/css-sizing/div-max-content-orthogonal-auto-margin-left.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-max-content-orthogonal-auto-margin-right.tentative.html b/tests/wpt/tests/css/css-sizing/div-max-content-orthogonal-auto-margin-right.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-max-content-orthogonal-auto-margin-right.tentative.html rename to tests/wpt/tests/css/css-sizing/div-max-content-orthogonal-auto-margin-right.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-max-content-orthogonal-auto-margin.tentative.html b/tests/wpt/tests/css/css-sizing/div-max-content-orthogonal-auto-margin.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-max-content-orthogonal-auto-margin.tentative.html rename to tests/wpt/tests/css/css-sizing/div-max-content-orthogonal-auto-margin.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-max-content-orthogonal-block-size.tentative.html b/tests/wpt/tests/css/css-sizing/div-max-content-orthogonal-block-size.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-max-content-orthogonal-block-size.tentative.html rename to tests/wpt/tests/css/css-sizing/div-max-content-orthogonal-block-size.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-min-content-auto-margin-bottom.tentative.html b/tests/wpt/tests/css/css-sizing/div-min-content-auto-margin-bottom.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-min-content-auto-margin-bottom.tentative.html rename to tests/wpt/tests/css/css-sizing/div-min-content-auto-margin-bottom.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-min-content-auto-margin-top.tentative.html b/tests/wpt/tests/css/css-sizing/div-min-content-auto-margin-top.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-min-content-auto-margin-top.tentative.html rename to tests/wpt/tests/css/css-sizing/div-min-content-auto-margin-top.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-min-content-auto-margin.tentative.html b/tests/wpt/tests/css/css-sizing/div-min-content-auto-margin.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-min-content-auto-margin.tentative.html rename to tests/wpt/tests/css/css-sizing/div-min-content-auto-margin.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-min-content-block-size.tentative.html b/tests/wpt/tests/css/css-sizing/div-min-content-block-size.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-min-content-block-size.tentative.html rename to tests/wpt/tests/css/css-sizing/div-min-content-block-size.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-min-content-orthogonal-auto-margin-left.tentative.html b/tests/wpt/tests/css/css-sizing/div-min-content-orthogonal-auto-margin-left.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-min-content-orthogonal-auto-margin-left.tentative.html rename to tests/wpt/tests/css/css-sizing/div-min-content-orthogonal-auto-margin-left.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-min-content-orthogonal-auto-margin-right.tentative.html b/tests/wpt/tests/css/css-sizing/div-min-content-orthogonal-auto-margin-right.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-min-content-orthogonal-auto-margin-right.tentative.html rename to tests/wpt/tests/css/css-sizing/div-min-content-orthogonal-auto-margin-right.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-min-content-orthogonal-auto-margin.tentative.html b/tests/wpt/tests/css/css-sizing/div-min-content-orthogonal-auto-margin.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-min-content-orthogonal-auto-margin.tentative.html rename to tests/wpt/tests/css/css-sizing/div-min-content-orthogonal-auto-margin.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-min-content-orthogonal-block-size.tentative.html b/tests/wpt/tests/css/css-sizing/div-min-content-orthogonal-block-size.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-min-content-orthogonal-block-size.tentative.html rename to tests/wpt/tests/css/css-sizing/div-min-content-orthogonal-block-size.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-orthogonal-auto-margin-left-ref.html b/tests/wpt/tests/css/css-sizing/div-orthogonal-auto-margin-left-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-orthogonal-auto-margin-left-ref.html rename to tests/wpt/tests/css/css-sizing/div-orthogonal-auto-margin-left-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-orthogonal-auto-margin-ref.html b/tests/wpt/tests/css/css-sizing/div-orthogonal-auto-margin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-orthogonal-auto-margin-ref.html rename to tests/wpt/tests/css/css-sizing/div-orthogonal-auto-margin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-orthogonal-auto-margin-right-ref.html b/tests/wpt/tests/css/css-sizing/div-orthogonal-auto-margin-right-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-orthogonal-auto-margin-right-ref.html rename to tests/wpt/tests/css/css-sizing/div-orthogonal-auto-margin-right-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-orthogonal-block-size-ref.html b/tests/wpt/tests/css/css-sizing/div-orthogonal-block-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-orthogonal-block-size-ref.html rename to tests/wpt/tests/css/css-sizing/div-orthogonal-block-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-orthogonal-left-and-non-auto-margin-ref.html b/tests/wpt/tests/css/css-sizing/div-orthogonal-left-and-non-auto-margin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-orthogonal-left-and-non-auto-margin-ref.html rename to tests/wpt/tests/css/css-sizing/div-orthogonal-left-and-non-auto-margin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-orthogonal-left-and-non-auto-margin.tentative.html b/tests/wpt/tests/css/css-sizing/div-orthogonal-left-and-non-auto-margin.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-orthogonal-left-and-non-auto-margin.tentative.html rename to tests/wpt/tests/css/css-sizing/div-orthogonal-left-and-non-auto-margin.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-top-and-non-auto-margin-ref.html b/tests/wpt/tests/css/css-sizing/div-top-and-non-auto-margin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-top-and-non-auto-margin-ref.html rename to tests/wpt/tests/css/css-sizing/div-top-and-non-auto-margin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/div-top-and-non-auto-margin.tentative.html b/tests/wpt/tests/css/css-sizing/div-top-and-non-auto-margin.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/div-top-and-non-auto-margin.tentative.html rename to tests/wpt/tests/css/css-sizing/div-top-and-non-auto-margin.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/dynamic-available-size-iframe.html b/tests/wpt/tests/css/css-sizing/dynamic-available-size-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/dynamic-available-size-iframe.html rename to tests/wpt/tests/css/css-sizing/dynamic-available-size-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/dynamic-change-inline-size-001.html b/tests/wpt/tests/css/css-sizing/dynamic-change-inline-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/dynamic-change-inline-size-001.html rename to tests/wpt/tests/css/css-sizing/dynamic-change-inline-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/dynamic-change-inline-size-002.html b/tests/wpt/tests/css/css-sizing/dynamic-change-inline-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/dynamic-change-inline-size-002.html rename to tests/wpt/tests/css/css-sizing/dynamic-change-inline-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/dynamic-change-inline-size-003-ref.html b/tests/wpt/tests/css/css-sizing/dynamic-change-inline-size-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/dynamic-change-inline-size-003-ref.html rename to tests/wpt/tests/css/css-sizing/dynamic-change-inline-size-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/dynamic-change-inline-size-003.html b/tests/wpt/tests/css/css-sizing/dynamic-change-inline-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/dynamic-change-inline-size-003.html rename to tests/wpt/tests/css/css-sizing/dynamic-change-inline-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-block-size-abspos.html b/tests/wpt/tests/css/css-sizing/fit-content-block-size-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-block-size-abspos.html rename to tests/wpt/tests/css/css-sizing/fit-content-block-size-abspos.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-block-size-fixedpos-ref.html b/tests/wpt/tests/css/css-sizing/fit-content-block-size-fixedpos-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-block-size-fixedpos-ref.html rename to tests/wpt/tests/css/css-sizing/fit-content-block-size-fixedpos-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-block-size-fixedpos.html b/tests/wpt/tests/css/css-sizing/fit-content-block-size-fixedpos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-block-size-fixedpos.html rename to tests/wpt/tests/css/css-sizing/fit-content-block-size-fixedpos.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-contribution-001.html b/tests/wpt/tests/css/css-sizing/fit-content-contribution-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-contribution-001.html rename to tests/wpt/tests/css/css-sizing/fit-content-contribution-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-001.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-001.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-002.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-002.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-003.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-003.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-004.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-004.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-005.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-005.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-006.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-006.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-006.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-007.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-007.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-007.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-008.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-008.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-008.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-009.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-009.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-009.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-010.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-010.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-010.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-011.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-011.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-011.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-012.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-012.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-012.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-013.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-013.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-013.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-014.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-014.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-014.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-015.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-015.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-015.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-016.html b/tests/wpt/tests/css/css-sizing/fit-content-length-percentage-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-length-percentage-016.html rename to tests/wpt/tests/css/css-sizing/fit-content-length-percentage-016.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/fit-content-percentage-padding.html b/tests/wpt/tests/css/css-sizing/fit-content-percentage-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/fit-content-percentage-padding.html rename to tests/wpt/tests/css/css-sizing/fit-content-percentage-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/frameset-intrinsic-crash.html b/tests/wpt/tests/css/css-sizing/frameset-intrinsic-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/frameset-intrinsic-crash.html rename to tests/wpt/tests/css/css-sizing/frameset-intrinsic-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/grid-item-image-percentage-min-height-computes-as-0-ref.html b/tests/wpt/tests/css/css-sizing/grid-item-image-percentage-min-height-computes-as-0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/grid-item-image-percentage-min-height-computes-as-0-ref.html rename to tests/wpt/tests/css/css-sizing/grid-item-image-percentage-min-height-computes-as-0-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/grid-item-image-percentage-min-height-computes-as-0.html b/tests/wpt/tests/css/css-sizing/grid-item-image-percentage-min-height-computes-as-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/grid-item-image-percentage-min-height-computes-as-0.html rename to tests/wpt/tests/css/css-sizing/grid-item-image-percentage-min-height-computes-as-0.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html b/tests/wpt/tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html rename to tests/wpt/tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1.html b/tests/wpt/tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1.html rename to tests/wpt/tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html b/tests/wpt/tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html rename to tests/wpt/tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html b/tests/wpt/tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html rename to tests/wpt/tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html b/tests/wpt/tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html rename to tests/wpt/tests/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/image-fractional-height-with-wide-aspect-ratio.html b/tests/wpt/tests/css/css-sizing/image-fractional-height-with-wide-aspect-ratio.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/image-fractional-height-with-wide-aspect-ratio.html rename to tests/wpt/tests/css/css-sizing/image-fractional-height-with-wide-aspect-ratio.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-001-ref.html b/tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-001-ref.html rename to tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-001.html b/tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-001.html rename to tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-002.html b/tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-002.html rename to tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-003-ref.html b/tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-003-ref.html rename to tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-003.html b/tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-003.html rename to tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-004.html b/tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-004.html rename to tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-005.html b/tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-005.html rename to tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-006.html b/tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-006.html rename to tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-006.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-007.html b/tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-007.html rename to tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-007.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-008.html b/tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/image-min-max-content-intrinsic-size-change-008.html rename to tests/wpt/tests/css/css-sizing/image-min-max-content-intrinsic-size-change-008.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/image-percentage-max-height-in-anonymous-block.html b/tests/wpt/tests/css/css-sizing/image-percentage-max-height-in-anonymous-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/image-percentage-max-height-in-anonymous-block.html rename to tests/wpt/tests/css/css-sizing/image-percentage-max-height-in-anonymous-block.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/inheritance-001.html b/tests/wpt/tests/css/css-sizing/inheritance-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/inheritance-001.html rename to tests/wpt/tests/css/css-sizing/inheritance-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/inheritance-002.html b/tests/wpt/tests/css/css-sizing/inheritance-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/inheritance-002.html rename to tests/wpt/tests/css/css-sizing/inheritance-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/inline-intrinsic-size-calc-ref.html b/tests/wpt/tests/css/css-sizing/inline-intrinsic-size-calc-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/inline-intrinsic-size-calc-ref.html rename to tests/wpt/tests/css/css-sizing/inline-intrinsic-size-calc-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/inline-intrinsic-size-calc.html b/tests/wpt/tests/css/css-sizing/inline-intrinsic-size-calc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/inline-intrinsic-size-calc.html rename to tests/wpt/tests/css/css-sizing/inline-intrinsic-size-calc.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-001-ref.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-001-ref.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-001.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-001.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-002-ref.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-002-ref.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-002.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-002.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-003.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-003.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-004-ref.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-004-ref.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-004.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-004.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-005-ref.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-005-ref.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-005.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-005.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-non-replaced-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-001.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-001.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-002.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-002.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-003.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-003.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-004.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-004.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-005.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-005.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-006.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-006.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-006.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-007.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-007.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-007.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-008.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-008.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-008.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-009-ref.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-009-ref.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-009.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-009.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-009.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-010-ref.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-010-ref.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-010.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-010.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-010.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-011-ref.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-011-ref.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-011.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-011.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-011.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-001.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-001.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-002.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-002.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-003.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-003.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-004.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-004.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-005.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-005.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-006.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-006.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-006.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-007.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-007.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-007.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-008.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-008.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-008.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-009.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-009.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-009.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-010.html b/tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-010.html rename to tests/wpt/tests/css/css-sizing/intrinsic-percent-replaced-dynamic-010.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-size-fallback-replaced.html b/tests/wpt/tests/css/css-sizing/intrinsic-size-fallback-replaced.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/intrinsic-size-fallback-replaced.html rename to tests/wpt/tests/css/css-sizing/intrinsic-size-fallback-replaced.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/max-content-input-001-ref.html b/tests/wpt/tests/css/css-sizing/max-content-input-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/max-content-input-001-ref.html rename to tests/wpt/tests/css/css-sizing/max-content-input-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/max-content-input-001.html b/tests/wpt/tests/css/css-sizing/max-content-input-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/max-content-input-001.html rename to tests/wpt/tests/css/css-sizing/max-content-input-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/min-content-min-width-000.html b/tests/wpt/tests/css/css-sizing/min-content-min-width-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/min-content-min-width-000.html rename to tests/wpt/tests/css/css-sizing/min-content-min-width-000.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/min-content-negative-margin-crash.html b/tests/wpt/tests/css/css-sizing/min-content-negative-margin-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/min-content-negative-margin-crash.html rename to tests/wpt/tests/css/css-sizing/min-content-negative-margin-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/min-max-content-orthogonal-flow-crash-001.html b/tests/wpt/tests/css/css-sizing/min-max-content-orthogonal-flow-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/min-max-content-orthogonal-flow-crash-001.html rename to tests/wpt/tests/css/css-sizing/min-max-content-orthogonal-flow-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/min-width-max-width-precedence.html b/tests/wpt/tests/css/css-sizing/min-width-max-width-precedence.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/min-width-max-width-precedence.html rename to tests/wpt/tests/css/css-sizing/min-width-max-width-precedence.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/nested-flexbox-image-percentage-max-height-computes-as-none-ref.html b/tests/wpt/tests/css/css-sizing/nested-flexbox-image-percentage-max-height-computes-as-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/nested-flexbox-image-percentage-max-height-computes-as-none-ref.html rename to tests/wpt/tests/css/css-sizing/nested-flexbox-image-percentage-max-height-computes-as-none-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/nested-flexbox-image-percentage-max-height-computes-as-none.html b/tests/wpt/tests/css/css-sizing/nested-flexbox-image-percentage-max-height-computes-as-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/nested-flexbox-image-percentage-max-height-computes-as-none.html rename to tests/wpt/tests/css/css-sizing/nested-flexbox-image-percentage-max-height-computes-as-none.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/ortho-writing-mode-001.html b/tests/wpt/tests/css/css-sizing/ortho-writing-mode-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/ortho-writing-mode-001.html rename to tests/wpt/tests/css/css-sizing/ortho-writing-mode-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/orthogonal-writing-mode-float-in-inline.html b/tests/wpt/tests/css/css-sizing/orthogonal-writing-mode-float-in-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/orthogonal-writing-mode-float-in-inline.html rename to tests/wpt/tests/css/css-sizing/orthogonal-writing-mode-float-in-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/box-sizing-computed.html b/tests/wpt/tests/css/css-sizing/parsing/box-sizing-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/box-sizing-computed.html rename to tests/wpt/tests/css/css-sizing/parsing/box-sizing-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/box-sizing-invalid.html b/tests/wpt/tests/css/css-sizing/parsing/box-sizing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/box-sizing-invalid.html rename to tests/wpt/tests/css/css-sizing/parsing/box-sizing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/box-sizing-valid.html b/tests/wpt/tests/css/css-sizing/parsing/box-sizing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/box-sizing-valid.html rename to tests/wpt/tests/css/css-sizing/parsing/box-sizing-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/height-invalid.html b/tests/wpt/tests/css/css-sizing/parsing/height-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/height-invalid.html rename to tests/wpt/tests/css/css-sizing/parsing/height-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/height-valid.html b/tests/wpt/tests/css/css-sizing/parsing/height-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/height-valid.html rename to tests/wpt/tests/css/css-sizing/parsing/height-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/max-height-computed.html b/tests/wpt/tests/css/css-sizing/parsing/max-height-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/max-height-computed.html rename to tests/wpt/tests/css/css-sizing/parsing/max-height-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/max-height-invalid.html b/tests/wpt/tests/css/css-sizing/parsing/max-height-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/max-height-invalid.html rename to tests/wpt/tests/css/css-sizing/parsing/max-height-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/max-height-valid.html b/tests/wpt/tests/css/css-sizing/parsing/max-height-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/max-height-valid.html rename to tests/wpt/tests/css/css-sizing/parsing/max-height-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/max-width-computed.html b/tests/wpt/tests/css/css-sizing/parsing/max-width-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/max-width-computed.html rename to tests/wpt/tests/css/css-sizing/parsing/max-width-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/max-width-invalid.html b/tests/wpt/tests/css/css-sizing/parsing/max-width-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/max-width-invalid.html rename to tests/wpt/tests/css/css-sizing/parsing/max-width-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/max-width-valid.html b/tests/wpt/tests/css/css-sizing/parsing/max-width-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/max-width-valid.html rename to tests/wpt/tests/css/css-sizing/parsing/max-width-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/min-height-computed.html b/tests/wpt/tests/css/css-sizing/parsing/min-height-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/min-height-computed.html rename to tests/wpt/tests/css/css-sizing/parsing/min-height-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/min-height-invalid.html b/tests/wpt/tests/css/css-sizing/parsing/min-height-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/min-height-invalid.html rename to tests/wpt/tests/css/css-sizing/parsing/min-height-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/min-height-valid.html b/tests/wpt/tests/css/css-sizing/parsing/min-height-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/min-height-valid.html rename to tests/wpt/tests/css/css-sizing/parsing/min-height-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/min-width-computed.html b/tests/wpt/tests/css/css-sizing/parsing/min-width-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/min-width-computed.html rename to tests/wpt/tests/css/css-sizing/parsing/min-width-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/min-width-invalid.html b/tests/wpt/tests/css/css-sizing/parsing/min-width-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/min-width-invalid.html rename to tests/wpt/tests/css/css-sizing/parsing/min-width-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/min-width-valid.html b/tests/wpt/tests/css/css-sizing/parsing/min-width-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/min-width-valid.html rename to tests/wpt/tests/css/css-sizing/parsing/min-width-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/width-invalid.html b/tests/wpt/tests/css/css-sizing/parsing/width-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/width-invalid.html rename to tests/wpt/tests/css/css-sizing/parsing/width-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/parsing/width-valid.html b/tests/wpt/tests/css/css-sizing/parsing/width-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/parsing/width-valid.html rename to tests/wpt/tests/css/css-sizing/parsing/width-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/percentage-height-in-flexbox.html b/tests/wpt/tests/css/css-sizing/percentage-height-in-flexbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/percentage-height-in-flexbox.html rename to tests/wpt/tests/css/css-sizing/percentage-height-in-flexbox.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/percentage-height-replaced-content-in-auto-cb.html b/tests/wpt/tests/css/css-sizing/percentage-height-replaced-content-in-auto-cb.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/percentage-height-replaced-content-in-auto-cb.html rename to tests/wpt/tests/css/css-sizing/percentage-height-replaced-content-in-auto-cb.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/percentage-min-width.html b/tests/wpt/tests/css/css-sizing/percentage-min-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/percentage-min-width.html rename to tests/wpt/tests/css/css-sizing/percentage-min-width.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/range-percent-intrinsic-size-1-ref.html b/tests/wpt/tests/css/css-sizing/range-percent-intrinsic-size-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/range-percent-intrinsic-size-1-ref.html rename to tests/wpt/tests/css/css-sizing/range-percent-intrinsic-size-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/range-percent-intrinsic-size-1.html b/tests/wpt/tests/css/css-sizing/range-percent-intrinsic-size-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/range-percent-intrinsic-size-1.html rename to tests/wpt/tests/css/css-sizing/range-percent-intrinsic-size-1.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/range-percent-intrinsic-size-2-ref.html b/tests/wpt/tests/css/css-sizing/range-percent-intrinsic-size-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/range-percent-intrinsic-size-2-ref.html rename to tests/wpt/tests/css/css-sizing/range-percent-intrinsic-size-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/range-percent-intrinsic-size-2.html b/tests/wpt/tests/css/css-sizing/range-percent-intrinsic-size-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/range-percent-intrinsic-size-2.html rename to tests/wpt/tests/css/css-sizing/range-percent-intrinsic-size-2.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/range-percent-intrinsic-size-2a-ref.html b/tests/wpt/tests/css/css-sizing/range-percent-intrinsic-size-2a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/range-percent-intrinsic-size-2a-ref.html rename to tests/wpt/tests/css/css-sizing/range-percent-intrinsic-size-2a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/range-percent-intrinsic-size-2a.html b/tests/wpt/tests/css/css-sizing/range-percent-intrinsic-size-2a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/range-percent-intrinsic-size-2a.html rename to tests/wpt/tests/css/css-sizing/range-percent-intrinsic-size-2a.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/replaced-aspect-ratio-intrinsic-size-001.html b/tests/wpt/tests/css/css-sizing/replaced-aspect-ratio-intrinsic-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/replaced-aspect-ratio-intrinsic-size-001.html rename to tests/wpt/tests/css/css-sizing/replaced-aspect-ratio-intrinsic-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/replaced-aspect-ratio-intrinsic-size-002.html b/tests/wpt/tests/css/css-sizing/replaced-aspect-ratio-intrinsic-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/replaced-aspect-ratio-intrinsic-size-002.html rename to tests/wpt/tests/css/css-sizing/replaced-aspect-ratio-intrinsic-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/replaced-aspect-ratio-stretch-fit-001.html b/tests/wpt/tests/css/css-sizing/replaced-aspect-ratio-stretch-fit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/replaced-aspect-ratio-stretch-fit-001.html rename to tests/wpt/tests/css/css-sizing/replaced-aspect-ratio-stretch-fit-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/replaced-aspect-ratio-stretch-fit-002.html b/tests/wpt/tests/css/css-sizing/replaced-aspect-ratio-stretch-fit-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/replaced-aspect-ratio-stretch-fit-002.html rename to tests/wpt/tests/css/css-sizing/replaced-aspect-ratio-stretch-fit-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/replaced-aspect-ratio-stretch-fit-003.html b/tests/wpt/tests/css/css-sizing/replaced-aspect-ratio-stretch-fit-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/replaced-aspect-ratio-stretch-fit-003.html rename to tests/wpt/tests/css/css-sizing/replaced-aspect-ratio-stretch-fit-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/replaced-fractional-height-from-aspect-ratio-2.html b/tests/wpt/tests/css/css-sizing/replaced-fractional-height-from-aspect-ratio-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/replaced-fractional-height-from-aspect-ratio-2.html rename to tests/wpt/tests/css/css-sizing/replaced-fractional-height-from-aspect-ratio-2.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/replaced-fractional-height-from-aspect-ratio.html b/tests/wpt/tests/css/css-sizing/replaced-fractional-height-from-aspect-ratio.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/replaced-fractional-height-from-aspect-ratio.html rename to tests/wpt/tests/css/css-sizing/replaced-fractional-height-from-aspect-ratio.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/replaced-max-size-saturation.html b/tests/wpt/tests/css/css-sizing/replaced-max-size-saturation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/replaced-max-size-saturation.html rename to tests/wpt/tests/css/css-sizing/replaced-max-size-saturation.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/slice-intrinsic-size-ref.html b/tests/wpt/tests/css/css-sizing/slice-intrinsic-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/slice-intrinsic-size-ref.html rename to tests/wpt/tests/css/css-sizing/slice-intrinsic-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/slice-intrinsic-size.html b/tests/wpt/tests/css/css-sizing/slice-intrinsic-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/slice-intrinsic-size.html rename to tests/wpt/tests/css/css-sizing/slice-intrinsic-size.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/slice-nowrap-intrinsic-size-bidi-ref.html b/tests/wpt/tests/css/css-sizing/slice-nowrap-intrinsic-size-bidi-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/slice-nowrap-intrinsic-size-bidi-ref.html rename to tests/wpt/tests/css/css-sizing/slice-nowrap-intrinsic-size-bidi-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/slice-nowrap-intrinsic-size-bidi.html b/tests/wpt/tests/css/css-sizing/slice-nowrap-intrinsic-size-bidi.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/slice-nowrap-intrinsic-size-bidi.html rename to tests/wpt/tests/css/css-sizing/slice-nowrap-intrinsic-size-bidi.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/slice-nowrap-intrinsic-size-ref.html b/tests/wpt/tests/css/css-sizing/slice-nowrap-intrinsic-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/slice-nowrap-intrinsic-size-ref.html rename to tests/wpt/tests/css/css-sizing/slice-nowrap-intrinsic-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/slice-nowrap-intrinsic-size.html b/tests/wpt/tests/css/css-sizing/slice-nowrap-intrinsic-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/slice-nowrap-intrinsic-size.html rename to tests/wpt/tests/css/css-sizing/slice-nowrap-intrinsic-size.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/dynamic-available-size-iframe.html b/tests/wpt/tests/css/css-sizing/support/dynamic-available-size-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/dynamic-available-size-iframe.html rename to tests/wpt/tests/css/css-sizing/support/dynamic-available-size-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/min-content-max-content.css b/tests/wpt/tests/css/css-sizing/support/min-content-max-content.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/min-content-max-content.css rename to tests/wpt/tests/css/css-sizing/support/min-content-max-content.css diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-1.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-1.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-1.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-1.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-10.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-10.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-10.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-10.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-11.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-11.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-11.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-11.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-12.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-12.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-12.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-12.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-13.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-13.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-13.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-13.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-14.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-14.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-14.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-14.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-15.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-15.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-15.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-16.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-16.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-16.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-17.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-17.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-17.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-17.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-18.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-18.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-18.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-18.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-19.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-19.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-19.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-19.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-2.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-2.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-2.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-2.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-3.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-3.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-3.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-3.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-4.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-4.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-4.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-4.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-5.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-5.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-5.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-5.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-6.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-6.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-6.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-6.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-7.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-7.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-7.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-7.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-8.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-8.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-8.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-8.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-9.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max-9.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max-9.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max-9.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max.png b/tests/wpt/tests/css/css-sizing/support/replaced-min-max.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/support/replaced-min-max.png rename to tests/wpt/tests/css/css-sizing/support/replaced-min-max.png diff --git a/tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-001.html b/tests/wpt/tests/css/css-sizing/svg-intrinsic-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-001.html rename to tests/wpt/tests/css/css-sizing/svg-intrinsic-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-002.html b/tests/wpt/tests/css/css-sizing/svg-intrinsic-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-002.html rename to tests/wpt/tests/css/css-sizing/svg-intrinsic-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-003.html b/tests/wpt/tests/css/css-sizing/svg-intrinsic-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-003.html rename to tests/wpt/tests/css/css-sizing/svg-intrinsic-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-004.html b/tests/wpt/tests/css/css-sizing/svg-intrinsic-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-004.html rename to tests/wpt/tests/css/css-sizing/svg-intrinsic-size-004.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-005-ref.html b/tests/wpt/tests/css/css-sizing/svg-intrinsic-size-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-005-ref.html rename to tests/wpt/tests/css/css-sizing/svg-intrinsic-size-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-005.html b/tests/wpt/tests/css/css-sizing/svg-intrinsic-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-005.html rename to tests/wpt/tests/css/css-sizing/svg-intrinsic-size-005.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-006-ref.html b/tests/wpt/tests/css/css-sizing/svg-intrinsic-size-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-006-ref.html rename to tests/wpt/tests/css/css-sizing/svg-intrinsic-size-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-006.html b/tests/wpt/tests/css/css-sizing/svg-intrinsic-size-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/svg-intrinsic-size-006.html rename to tests/wpt/tests/css/css-sizing/svg-intrinsic-size-006.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/table-child-percentage-height-with-border-box-ref.html b/tests/wpt/tests/css/css-sizing/table-child-percentage-height-with-border-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/table-child-percentage-height-with-border-box-ref.html rename to tests/wpt/tests/css/css-sizing/table-child-percentage-height-with-border-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/table-child-percentage-height-with-border-box.html b/tests/wpt/tests/css/css-sizing/table-child-percentage-height-with-border-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/table-child-percentage-height-with-border-box.html rename to tests/wpt/tests/css/css-sizing/table-child-percentage-height-with-border-box.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/table-percentage-max-width-beside-float.html b/tests/wpt/tests/css/css-sizing/table-percentage-max-width-beside-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/table-percentage-max-width-beside-float.html rename to tests/wpt/tests/css/css-sizing/table-percentage-max-width-beside-float.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/table-percentage-min-width-below-float.html b/tests/wpt/tests/css/css-sizing/table-percentage-min-width-below-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/table-percentage-min-width-below-float.html rename to tests/wpt/tests/css/css-sizing/table-percentage-min-width-below-float.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/table-percentage-min-width-beside-float.html b/tests/wpt/tests/css/css-sizing/table-percentage-min-width-beside-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/table-percentage-min-width-beside-float.html rename to tests/wpt/tests/css/css-sizing/table-percentage-min-width-beside-float.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/textarea-large-padding-crash.html b/tests/wpt/tests/css/css-sizing/textarea-large-padding-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/textarea-large-padding-crash.html rename to tests/wpt/tests/css/css-sizing/textarea-large-padding-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/thin-element-render-ref.html b/tests/wpt/tests/css/css-sizing/thin-element-render-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/thin-element-render-ref.html rename to tests/wpt/tests/css/css-sizing/thin-element-render-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/thin-element-render.html b/tests/wpt/tests/css/css-sizing/thin-element-render.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/thin-element-render.html rename to tests/wpt/tests/css/css-sizing/thin-element-render.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html b/tests/wpt/tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html rename to tests/wpt/tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1.html b/tests/wpt/tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1.html rename to tests/wpt/tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html b/tests/wpt/tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html rename to tests/wpt/tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html b/tests/wpt/tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html rename to tests/wpt/tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html b/tests/wpt/tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html rename to tests/wpt/tests/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html diff --git a/tests/wpt/web-platform-tests/css/css-sizing/whitespace-and-break.html b/tests/wpt/tests/css/css-sizing/whitespace-and-break.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-sizing/whitespace-and-break.html rename to tests/wpt/tests/css/css-sizing/whitespace-and-break.html diff --git a/tests/wpt/web-platform-tests/css/css-speech/META.yml b/tests/wpt/tests/css/css-speech/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-speech/META.yml rename to tests/wpt/tests/css/css-speech/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-speech/age-declarations-001.html b/tests/wpt/tests/css/css-speech/age-declarations-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-speech/age-declarations-001.html rename to tests/wpt/tests/css/css-speech/age-declarations-001.html diff --git a/tests/wpt/web-platform-tests/css/css-speech/age-declarations-female-001.html b/tests/wpt/tests/css/css-speech/age-declarations-female-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-speech/age-declarations-female-001.html rename to tests/wpt/tests/css/css-speech/age-declarations-female-001.html diff --git a/tests/wpt/web-platform-tests/css/css-speech/age-declarations-male-001.html b/tests/wpt/tests/css/css-speech/age-declarations-male-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-speech/age-declarations-male-001.html rename to tests/wpt/tests/css/css-speech/age-declarations-male-001.html diff --git a/tests/wpt/web-platform-tests/css/css-speech/age-declarations-neutral-001.html b/tests/wpt/tests/css/css-speech/age-declarations-neutral-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-speech/age-declarations-neutral-001.html rename to tests/wpt/tests/css/css-speech/age-declarations-neutral-001.html diff --git a/tests/wpt/web-platform-tests/css/css-speech/generic-gender-declarations-001.html b/tests/wpt/tests/css/css-speech/generic-gender-declarations-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-speech/generic-gender-declarations-001.html rename to tests/wpt/tests/css/css-speech/generic-gender-declarations-001.html diff --git a/tests/wpt/web-platform-tests/css/css-speech/no-voice-family-specified-001.html b/tests/wpt/tests/css/css-speech/no-voice-family-specified-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-speech/no-voice-family-specified-001.html rename to tests/wpt/tests/css/css-speech/no-voice-family-specified-001.html diff --git a/tests/wpt/web-platform-tests/css/css-speech/speak-as/speak-as-digits-001-manual.html b/tests/wpt/tests/css/css-speech/speak-as/speak-as-digits-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-speech/speak-as/speak-as-digits-001-manual.html rename to tests/wpt/tests/css/css-speech/speak-as/speak-as-digits-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-speech/speak-as/speak-as-digits-002-manual.html b/tests/wpt/tests/css/css-speech/speak-as/speak-as-digits-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-speech/speak-as/speak-as-digits-002-manual.html rename to tests/wpt/tests/css/css-speech/speak-as/speak-as-digits-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-speech/speak-as/speak-as-literal-punctuation-001-manual.html b/tests/wpt/tests/css/css-speech/speak-as/speak-as-literal-punctuation-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-speech/speak-as/speak-as-literal-punctuation-001-manual.html rename to tests/wpt/tests/css/css-speech/speak-as/speak-as-literal-punctuation-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-speech/speak-as/speak-as-spell-out-001-manual.html b/tests/wpt/tests/css/css-speech/speak-as/speak-as-spell-out-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-speech/speak-as/speak-as-spell-out-001-manual.html rename to tests/wpt/tests/css/css-speech/speak-as/speak-as-spell-out-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-speech/voice-family-integer.html b/tests/wpt/tests/css/css-speech/voice-family-integer.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-speech/voice-family-integer.html rename to tests/wpt/tests/css/css-speech/voice-family-integer.html diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/META.yml b/tests/wpt/tests/css/css-style-attr/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/META.yml rename to tests/wpt/tests/css/css-style-attr/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/reference/ref-green-on-green.xht b/tests/wpt/tests/css/css-style-attr/reference/ref-green-on-green.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/reference/ref-green-on-green.xht rename to tests/wpt/tests/css/css-style-attr/reference/ref-green-on-green.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/reference/ref-green.html b/tests/wpt/tests/css/css-style-attr/reference/ref-green.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/reference/ref-green.html rename to tests/wpt/tests/css/css-style-attr/reference/ref-green.html diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/reference/ref-white-on-green-background.html b/tests/wpt/tests/css/css-style-attr/reference/ref-white-on-green-background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/reference/ref-white-on-green-background.html rename to tests/wpt/tests/css/css-style-attr/reference/ref-white-on-green-background.html diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/reference/style-attr-cascade-007.xht b/tests/wpt/tests/css/css-style-attr/reference/style-attr-cascade-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/reference/style-attr-cascade-007.xht rename to tests/wpt/tests/css/css-style-attr/reference/style-attr-cascade-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-braces-001.xht b/tests/wpt/tests/css/css-style-attr/style-attr-braces-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-braces-001.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-braces-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-braces-002-quirks.htm b/tests/wpt/tests/css/css-style-attr/style-attr-braces-002-quirks.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-braces-002-quirks.htm rename to tests/wpt/tests/css/css-style-attr/style-attr-braces-002-quirks.htm diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-braces-002.xht b/tests/wpt/tests/css/css-style-attr/style-attr-braces-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-braces-002.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-braces-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-braces-003.xht b/tests/wpt/tests/css/css-style-attr/style-attr-braces-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-braces-003.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-braces-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-cascade-001.xht b/tests/wpt/tests/css/css-style-attr/style-attr-cascade-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-cascade-001.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-cascade-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-cascade-002.xht b/tests/wpt/tests/css/css-style-attr/style-attr-cascade-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-cascade-002.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-cascade-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-cascade-003.xht b/tests/wpt/tests/css/css-style-attr/style-attr-cascade-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-cascade-003.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-cascade-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-cascade-004.xht b/tests/wpt/tests/css/css-style-attr/style-attr-cascade-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-cascade-004.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-cascade-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-cascade-005.xht b/tests/wpt/tests/css/css-style-attr/style-attr-cascade-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-cascade-005.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-cascade-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-cascade-006.xht b/tests/wpt/tests/css/css-style-attr/style-attr-cascade-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-cascade-006.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-cascade-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-cascade-007.xht b/tests/wpt/tests/css/css-style-attr/style-attr-cascade-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-cascade-007.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-cascade-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-specificity-001.xht b/tests/wpt/tests/css/css-style-attr/style-attr-specificity-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-specificity-001.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-specificity-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-specificity-002.xht b/tests/wpt/tests/css/css-style-attr/style-attr-specificity-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-specificity-002.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-specificity-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-urls-001.xht b/tests/wpt/tests/css/css-style-attr/style-attr-urls-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-urls-001.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-urls-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-urls-002.xht b/tests/wpt/tests/css/css-style-attr/style-attr-urls-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-urls-002.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-urls-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/style-attr-urls-003.xht b/tests/wpt/tests/css/css-style-attr/style-attr-urls-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/style-attr-urls-003.xht rename to tests/wpt/tests/css/css-style-attr/style-attr-urls-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/1x1-green.png b/tests/wpt/tests/css/css-style-attr/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/1x1-green.png rename to tests/wpt/tests/css/css-style-attr/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/1x1-lime.png b/tests/wpt/tests/css/css-style-attr/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/1x1-lime.png rename to tests/wpt/tests/css/css-style-attr/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/1x1-maroon.png b/tests/wpt/tests/css/css-style-attr/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/1x1-maroon.png rename to tests/wpt/tests/css/css-style-attr/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/1x1-navy.png b/tests/wpt/tests/css/css-style-attr/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/1x1-navy.png rename to tests/wpt/tests/css/css-style-attr/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/1x1-red.png b/tests/wpt/tests/css/css-style-attr/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/1x1-red.png rename to tests/wpt/tests/css/css-style-attr/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/1x1-white.png b/tests/wpt/tests/css/css-style-attr/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/1x1-white.png rename to tests/wpt/tests/css/css-style-attr/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/60x60-gg-rr.png b/tests/wpt/tests/css/css-style-attr/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/60x60-gg-rr.png rename to tests/wpt/tests/css/css-style-attr/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/60x60-green.png b/tests/wpt/tests/css/css-style-attr/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/60x60-green.png rename to tests/wpt/tests/css/css-style-attr/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/a-green.css b/tests/wpt/tests/css/css-style-attr/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/a-green.css rename to tests/wpt/tests/css/css-style-attr/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/b-green.css b/tests/wpt/tests/css/css-style-attr/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/b-green.css rename to tests/wpt/tests/css/css-style-attr/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/c-red.css b/tests/wpt/tests/css/css-style-attr/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/c-red.css rename to tests/wpt/tests/css/css-style-attr/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/cat.png b/tests/wpt/tests/css/css-style-attr/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/cat.png rename to tests/wpt/tests/css/css-style-attr/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/css-style-attr/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/css-style-attr/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/css-style-attr/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/css-style-attr/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/css-style-attr/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/css-style-attr/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/pattern-tr.png b/tests/wpt/tests/css/css-style-attr/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/pattern-tr.png rename to tests/wpt/tests/css/css-style-attr/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/ruler-h-50%.png b/tests/wpt/tests/css/css-style-attr/support/ruler-h-50%.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/ruler-h-50%.png rename to tests/wpt/tests/css/css-style-attr/support/ruler-h-50%.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/ruler-h-50px.png b/tests/wpt/tests/css/css-style-attr/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/ruler-h-50px.png rename to tests/wpt/tests/css/css-style-attr/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/ruler-v-100px.png b/tests/wpt/tests/css/css-style-attr/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/ruler-v-100px.png rename to tests/wpt/tests/css/css-style-attr/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/ruler-v-50px.png b/tests/wpt/tests/css/css-style-attr/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/ruler-v-50px.png rename to tests/wpt/tests/css/css-style-attr/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/square-purple.png b/tests/wpt/tests/css/css-style-attr/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/square-purple.png rename to tests/wpt/tests/css/css-style-attr/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/square-teal.png b/tests/wpt/tests/css/css-style-attr/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/square-teal.png rename to tests/wpt/tests/css/css-style-attr/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/square-white.png b/tests/wpt/tests/css/css-style-attr/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/square-white.png rename to tests/wpt/tests/css/css-style-attr/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/support/README b/tests/wpt/tests/css/css-style-attr/support/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/support/README rename to tests/wpt/tests/css/css-style-attr/support/support/README diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/support/swatch-green.png b/tests/wpt/tests/css/css-style-attr/support/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/support/swatch-green.png rename to tests/wpt/tests/css/css-style-attr/support/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/support/swatch-red.png b/tests/wpt/tests/css/css-style-attr/support/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/support/swatch-red.png rename to tests/wpt/tests/css/css-style-attr/support/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/swatch-blue.png b/tests/wpt/tests/css/css-style-attr/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/swatch-blue.png rename to tests/wpt/tests/css/css-style-attr/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/swatch-green.png b/tests/wpt/tests/css/css-style-attr/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/swatch-green.png rename to tests/wpt/tests/css/css-style-attr/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/swatch-lime.png b/tests/wpt/tests/css/css-style-attr/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/swatch-lime.png rename to tests/wpt/tests/css/css-style-attr/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/swatch-orange.png b/tests/wpt/tests/css/css-style-attr/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/swatch-orange.png rename to tests/wpt/tests/css/css-style-attr/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/swatch-red.png b/tests/wpt/tests/css/css-style-attr/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/swatch-red.png rename to tests/wpt/tests/css/css-style-attr/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/swatch-white.png b/tests/wpt/tests/css/css-style-attr/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/swatch-white.png rename to tests/wpt/tests/css/css-style-attr/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/swatch-yellow.png b/tests/wpt/tests/css/css-style-attr/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/swatch-yellow.png rename to tests/wpt/tests/css/css-style-attr/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/test-bl.png b/tests/wpt/tests/css/css-style-attr/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/test-bl.png rename to tests/wpt/tests/css/css-style-attr/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/test-br.png b/tests/wpt/tests/css/css-style-attr/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/test-br.png rename to tests/wpt/tests/css/css-style-attr/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/test-inner-half-size.png b/tests/wpt/tests/css/css-style-attr/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/test-inner-half-size.png rename to tests/wpt/tests/css/css-style-attr/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/test-outer.png b/tests/wpt/tests/css/css-style-attr/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/test-outer.png rename to tests/wpt/tests/css/css-style-attr/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/test-tl.png b/tests/wpt/tests/css/css-style-attr/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/test-tl.png rename to tests/wpt/tests/css/css-style-attr/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/css-style-attr/support/test-tr.png b/tests/wpt/tests/css/css-style-attr/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-style-attr/support/test-tr.png rename to tests/wpt/tests/css/css-style-attr/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-syntax/META.yml b/tests/wpt/tests/css/css-syntax/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/META.yml rename to tests/wpt/tests/css/css-syntax/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-syntax/anb-parsing.html b/tests/wpt/tests/css/css-syntax/anb-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/anb-parsing.html rename to tests/wpt/tests/css/css-syntax/anb-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/anb-serialization.html b/tests/wpt/tests/css/css-syntax/anb-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/anb-serialization.html rename to tests/wpt/tests/css/css-syntax/anb-serialization.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/at-rule-in-declaration-list.html b/tests/wpt/tests/css/css-syntax/at-rule-in-declaration-list.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/at-rule-in-declaration-list.html rename to tests/wpt/tests/css/css-syntax/at-rule-in-declaration-list.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/cdc-vs-ident-tokens.html b/tests/wpt/tests/css/css-syntax/cdc-vs-ident-tokens.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/cdc-vs-ident-tokens.html rename to tests/wpt/tests/css/css-syntax/cdc-vs-ident-tokens.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset-is-not-a-rule.html b/tests/wpt/tests/css/css-syntax/charset-is-not-a-rule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset-is-not-a-rule.html rename to tests/wpt/tests/css/css-syntax/charset-is-not-a-rule.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/.htaccess b/tests/wpt/tests/css/css-syntax/charset/.htaccess similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/.htaccess rename to tests/wpt/tests/css/css-syntax/charset/.htaccess diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/MANIFEST b/tests/wpt/tests/css/css-syntax/charset/MANIFEST similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/MANIFEST rename to tests/wpt/tests/css/css-syntax/charset/MANIFEST diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-utf16-css-bomless-utf16.html b/tests/wpt/tests/css/css-syntax/charset/page-utf16-css-bomless-utf16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-utf16-css-bomless-utf16.html rename to tests/wpt/tests/css/css-syntax/charset/page-utf16-css-bomless-utf16.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-utf16-css-bomless-utf16be.html b/tests/wpt/tests/css/css-syntax/charset/page-utf16-css-bomless-utf16be.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-utf16-css-bomless-utf16be.html rename to tests/wpt/tests/css/css-syntax/charset/page-utf16-css-bomless-utf16be.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-utf16-css-no-decl-ascii-only.html b/tests/wpt/tests/css/css-syntax/charset/page-utf16-css-no-decl-ascii-only.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-utf16-css-no-decl-ascii-only.html rename to tests/wpt/tests/css/css-syntax/charset/page-utf16-css-no-decl-ascii-only.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-utf16-css-no-decl.html b/tests/wpt/tests/css/css-syntax/charset/page-utf16-css-no-decl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-utf16-css-no-decl.html rename to tests/wpt/tests/css/css-syntax/charset/page-utf16-css-no-decl.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-charset-attribute-bogus.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1251-charset-attribute-bogus.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-charset-attribute-bogus.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1251-charset-attribute-bogus.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-1250-charset-attribute-windows-1253.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-1250-charset-attribute-windows-1253.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-1250-charset-attribute-windows-1253.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-1250-charset-attribute-windows-1253.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-bogus-charset-attribute-windows-1250.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-bogus-charset-attribute-windows-1250.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-bogus-charset-attribute-windows-1250.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-bogus-charset-attribute-windows-1250.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-bogus.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-bogus.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-bogus.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-bogus.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-utf16-ascii-only.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-utf16-ascii-only.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-utf16-ascii-only.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-utf16-ascii-only.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-utf16.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-utf16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-utf16.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-utf16.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-utf16be.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-utf16be.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-utf16be.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-utf16be.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-windows-1250-in-utf16.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-windows-1250-in-utf16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-windows-1250-in-utf16.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-windows-1250-in-utf16.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-windows-1250-in-utf16be.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-windows-1250-in-utf16be.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-at-charset-windows-1250-in-utf16be.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-at-charset-windows-1250-in-utf16be.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-http-bogus-at-charset-windows-1250.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-http-bogus-at-charset-windows-1250.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-http-bogus-at-charset-windows-1250.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-http-bogus-at-charset-windows-1250.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-http-bogus.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-http-bogus.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-http-bogus.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-http-bogus.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-http-windows-1250-at-charset-windows-1253.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-http-windows-1250-at-charset-windows-1253.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-http-windows-1250-at-charset-windows-1253.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-http-windows-1250-at-charset-windows-1253.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-no-decl.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-no-decl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-no-decl.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-no-decl.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-utf8-bom.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-utf8-bom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1251-css-utf8-bom.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1251-css-utf8-bom.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1252-http-windows-1251-css-utf8-bom.html b/tests/wpt/tests/css/css-syntax/charset/page-windows-1252-http-windows-1251-css-utf8-bom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1252-http-windows-1251-css-utf8-bom.html rename to tests/wpt/tests/css/css-syntax/charset/page-windows-1252-http-windows-1251-css-utf8-bom.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/MANIFEST b/tests/wpt/tests/css/css-syntax/charset/support/MANIFEST similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/MANIFEST rename to tests/wpt/tests/css/css-syntax/charset/support/MANIFEST diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/at-charset-bogus.css b/tests/wpt/tests/css/css-syntax/charset/support/at-charset-bogus.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/at-charset-bogus.css rename to tests/wpt/tests/css/css-syntax/charset/support/at-charset-bogus.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/at-charset-utf16-ascii-only.css b/tests/wpt/tests/css/css-syntax/charset/support/at-charset-utf16-ascii-only.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/at-charset-utf16-ascii-only.css rename to tests/wpt/tests/css/css-syntax/charset/support/at-charset-utf16-ascii-only.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/at-charset-utf16.css b/tests/wpt/tests/css/css-syntax/charset/support/at-charset-utf16.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/at-charset-utf16.css rename to tests/wpt/tests/css/css-syntax/charset/support/at-charset-utf16.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/at-charset-utf16be.css b/tests/wpt/tests/css/css-syntax/charset/support/at-charset-utf16be.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/at-charset-utf16be.css rename to tests/wpt/tests/css/css-syntax/charset/support/at-charset-utf16be.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/at-charset-windows-1250-in-utf16.css b/tests/wpt/tests/css/css-syntax/charset/support/at-charset-windows-1250-in-utf16.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/at-charset-windows-1250-in-utf16.css rename to tests/wpt/tests/css/css-syntax/charset/support/at-charset-windows-1250-in-utf16.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/at-charset-windows-1250-in-utf16be.css b/tests/wpt/tests/css/css-syntax/charset/support/at-charset-windows-1250-in-utf16be.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/at-charset-windows-1250-in-utf16be.css rename to tests/wpt/tests/css/css-syntax/charset/support/at-charset-windows-1250-in-utf16be.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/at-charset-windows-1250.css b/tests/wpt/tests/css/css-syntax/charset/support/at-charset-windows-1250.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/at-charset-windows-1250.css rename to tests/wpt/tests/css/css-syntax/charset/support/at-charset-windows-1250.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/bomless-utf16.css b/tests/wpt/tests/css/css-syntax/charset/support/bomless-utf16.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/bomless-utf16.css rename to tests/wpt/tests/css/css-syntax/charset/support/bomless-utf16.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/bomless-utf16be.css b/tests/wpt/tests/css/css-syntax/charset/support/bomless-utf16be.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/bomless-utf16be.css rename to tests/wpt/tests/css/css-syntax/charset/support/bomless-utf16be.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/http-bogus-at-charset-windows-1250.bogus.css b/tests/wpt/tests/css/css-syntax/charset/support/http-bogus-at-charset-windows-1250.bogus.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/http-bogus-at-charset-windows-1250.bogus.css rename to tests/wpt/tests/css/css-syntax/charset/support/http-bogus-at-charset-windows-1250.bogus.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/http-bogus-at-charset-windows-1250.bogus.css.headers b/tests/wpt/tests/css/css-syntax/charset/support/http-bogus-at-charset-windows-1250.bogus.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/http-bogus-at-charset-windows-1250.bogus.css.headers rename to tests/wpt/tests/css/css-syntax/charset/support/http-bogus-at-charset-windows-1250.bogus.css.headers diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/http-bogus.bogus.css b/tests/wpt/tests/css/css-syntax/charset/support/http-bogus.bogus.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/http-bogus.bogus.css rename to tests/wpt/tests/css/css-syntax/charset/support/http-bogus.bogus.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/http-bogus.bogus.css.headers b/tests/wpt/tests/css/css-syntax/charset/support/http-bogus.bogus.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/http-bogus.bogus.css.headers rename to tests/wpt/tests/css/css-syntax/charset/support/http-bogus.bogus.css.headers diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/http-windows-1250-at-charset-windows-1253.windows1250.css b/tests/wpt/tests/css/css-syntax/charset/support/http-windows-1250-at-charset-windows-1253.windows1250.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/http-windows-1250-at-charset-windows-1253.windows1250.css rename to tests/wpt/tests/css/css-syntax/charset/support/http-windows-1250-at-charset-windows-1253.windows1250.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/http-windows-1250-at-charset-windows-1253.windows1250.css.headers b/tests/wpt/tests/css/css-syntax/charset/support/http-windows-1250-at-charset-windows-1253.windows1250.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/http-windows-1250-at-charset-windows-1253.windows1250.css.headers rename to tests/wpt/tests/css/css-syntax/charset/support/http-windows-1250-at-charset-windows-1253.windows1250.css.headers diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/no-decl-ascii-only.css b/tests/wpt/tests/css/css-syntax/charset/support/no-decl-ascii-only.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/no-decl-ascii-only.css rename to tests/wpt/tests/css/css-syntax/charset/support/no-decl-ascii-only.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/no-decl.css b/tests/wpt/tests/css/css-syntax/charset/support/no-decl.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/no-decl.css rename to tests/wpt/tests/css/css-syntax/charset/support/no-decl.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css b/tests/wpt/tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css rename to tests/wpt/tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css.headers b/tests/wpt/tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css.headers rename to tests/wpt/tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css.headers diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/utf8-bom.css b/tests/wpt/tests/css/css-syntax/charset/support/utf8-bom.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/support/utf8-bom.css rename to tests/wpt/tests/css/css-syntax/charset/support/utf8-bom.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/xml-stylesheet-page-windows-1251-charset-attribute-windows-1250.xhtml b/tests/wpt/tests/css/css-syntax/charset/xml-stylesheet-page-windows-1251-charset-attribute-windows-1250.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/charset/xml-stylesheet-page-windows-1251-charset-attribute-windows-1250.xhtml rename to tests/wpt/tests/css/css-syntax/charset/xml-stylesheet-page-windows-1251-charset-attribute-windows-1250.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-syntax/decimal-points-in-numbers.html b/tests/wpt/tests/css/css-syntax/decimal-points-in-numbers.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/decimal-points-in-numbers.html rename to tests/wpt/tests/css/css-syntax/decimal-points-in-numbers.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/declarations-trim-whitespace.html b/tests/wpt/tests/css/css-syntax/declarations-trim-whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/declarations-trim-whitespace.html rename to tests/wpt/tests/css/css-syntax/declarations-trim-whitespace.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/escaped-eof.html b/tests/wpt/tests/css/css-syntax/escaped-eof.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/escaped-eof.html rename to tests/wpt/tests/css/css-syntax/escaped-eof.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/ident-three-code-points.html b/tests/wpt/tests/css/css-syntax/ident-three-code-points.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/ident-three-code-points.html rename to tests/wpt/tests/css/css-syntax/ident-three-code-points.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/inclusive-ranges.html b/tests/wpt/tests/css/css-syntax/inclusive-ranges.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/inclusive-ranges.html rename to tests/wpt/tests/css/css-syntax/inclusive-ranges.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/input-preprocessing.html b/tests/wpt/tests/css/css-syntax/input-preprocessing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/input-preprocessing.html rename to tests/wpt/tests/css/css-syntax/input-preprocessing.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/missing-semicolon-ref.html b/tests/wpt/tests/css/css-syntax/missing-semicolon-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/missing-semicolon-ref.html rename to tests/wpt/tests/css/css-syntax/missing-semicolon-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/missing-semicolon.html b/tests/wpt/tests/css/css-syntax/missing-semicolon.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/missing-semicolon.html rename to tests/wpt/tests/css/css-syntax/missing-semicolon.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/non-ascii-codepoints.html b/tests/wpt/tests/css/css-syntax/non-ascii-codepoints.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/non-ascii-codepoints.html rename to tests/wpt/tests/css/css-syntax/non-ascii-codepoints.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/serialize-consecutive-tokens.html b/tests/wpt/tests/css/css-syntax/serialize-consecutive-tokens.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/serialize-consecutive-tokens.html rename to tests/wpt/tests/css/css-syntax/serialize-consecutive-tokens.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/support/missing-semicolon.css b/tests/wpt/tests/css/css-syntax/support/missing-semicolon.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/support/missing-semicolon.css rename to tests/wpt/tests/css/css-syntax/support/missing-semicolon.css diff --git a/tests/wpt/web-platform-tests/css/css-syntax/unclosed-constructs.html b/tests/wpt/tests/css/css-syntax/unclosed-constructs.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/unclosed-constructs.html rename to tests/wpt/tests/css/css-syntax/unclosed-constructs.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/unclosed-url-at-eof.html b/tests/wpt/tests/css/css-syntax/unclosed-url-at-eof.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/unclosed-url-at-eof.html rename to tests/wpt/tests/css/css-syntax/unclosed-url-at-eof.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/unicode-range-selector.html b/tests/wpt/tests/css/css-syntax/unicode-range-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/unicode-range-selector.html rename to tests/wpt/tests/css/css-syntax/unicode-range-selector.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/urange-parsing.html b/tests/wpt/tests/css/css-syntax/urange-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/urange-parsing.html rename to tests/wpt/tests/css/css-syntax/urange-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/url-whitespace-consumption.html b/tests/wpt/tests/css/css-syntax/url-whitespace-consumption.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/url-whitespace-consumption.html rename to tests/wpt/tests/css/css-syntax/url-whitespace-consumption.html diff --git a/tests/wpt/web-platform-tests/css/css-syntax/whitespace.html b/tests/wpt/tests/css/css-syntax/whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-syntax/whitespace.html rename to tests/wpt/tests/css/css-syntax/whitespace.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/META.yml b/tests/wpt/tests/css/css-tables/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/META.yml rename to tests/wpt/tests/css/css-tables/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-crash.html b/tests/wpt/tests/css/css-tables/absolute-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-crash.html rename to tests/wpt/tests/css/css-tables/absolute-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-001.html b/tests/wpt/tests/css/css-tables/absolute-tables-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-001.html rename to tests/wpt/tests/css/css-tables/absolute-tables-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-002.html b/tests/wpt/tests/css/css-tables/absolute-tables-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-002.html rename to tests/wpt/tests/css/css-tables/absolute-tables-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-003.html b/tests/wpt/tests/css/css-tables/absolute-tables-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-003.html rename to tests/wpt/tests/css/css-tables/absolute-tables-003.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-004.html b/tests/wpt/tests/css/css-tables/absolute-tables-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-004.html rename to tests/wpt/tests/css/css-tables/absolute-tables-004.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-005.html b/tests/wpt/tests/css/css-tables/absolute-tables-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-005.html rename to tests/wpt/tests/css/css-tables/absolute-tables-005.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-006.html b/tests/wpt/tests/css/css-tables/absolute-tables-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-006.html rename to tests/wpt/tests/css/css-tables/absolute-tables-006.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-007.html b/tests/wpt/tests/css/css-tables/absolute-tables-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-007.html rename to tests/wpt/tests/css/css-tables/absolute-tables-007.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-008.tentative.html b/tests/wpt/tests/css/css-tables/absolute-tables-008.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-008.tentative.html rename to tests/wpt/tests/css/css-tables/absolute-tables-008.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-009.tentative.html b/tests/wpt/tests/css/css-tables/absolute-tables-009.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-009.tentative.html rename to tests/wpt/tests/css/css-tables/absolute-tables-009.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-010.tentative.html b/tests/wpt/tests/css/css-tables/absolute-tables-010.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-010.tentative.html rename to tests/wpt/tests/css/css-tables/absolute-tables-010.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-011.tentative.html b/tests/wpt/tests/css/css-tables/absolute-tables-011.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-011.tentative.html rename to tests/wpt/tests/css/css-tables/absolute-tables-011.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-012.html b/tests/wpt/tests/css/css-tables/absolute-tables-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-012.html rename to tests/wpt/tests/css/css-tables/absolute-tables-012.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-013.html b/tests/wpt/tests/css/css-tables/absolute-tables-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-013.html rename to tests/wpt/tests/css/css-tables/absolute-tables-013.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-014.html b/tests/wpt/tests/css/css-tables/absolute-tables-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-014.html rename to tests/wpt/tests/css/css-tables/absolute-tables-014.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-015.html b/tests/wpt/tests/css/css-tables/absolute-tables-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-015.html rename to tests/wpt/tests/css/css-tables/absolute-tables-015.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-016.html b/tests/wpt/tests/css/css-tables/absolute-tables-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/absolute-tables-016.html rename to tests/wpt/tests/css/css-tables/absolute-tables-016.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/abspos-container-change-dynamic-001-ref.html b/tests/wpt/tests/css/css-tables/abspos-container-change-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/abspos-container-change-dynamic-001-ref.html rename to tests/wpt/tests/css/css-tables/abspos-container-change-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/abspos-container-change-dynamic-001.html b/tests/wpt/tests/css/css-tables/abspos-container-change-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/abspos-container-change-dynamic-001.html rename to tests/wpt/tests/css/css-tables/abspos-container-change-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/animations/border-spacing-interpolation.html b/tests/wpt/tests/css/css-tables/animations/border-spacing-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/animations/border-spacing-interpolation.html rename to tests/wpt/tests/css/css-tables/animations/border-spacing-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/anonymous-table-cell-margin-collapsing.html b/tests/wpt/tests/css/css-tables/anonymous-table-cell-margin-collapsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/anonymous-table-cell-margin-collapsing.html rename to tests/wpt/tests/css/css-tables/anonymous-table-cell-margin-collapsing.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/anonymous-table-ws-001-ref.html b/tests/wpt/tests/css/css-tables/anonymous-table-ws-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/anonymous-table-ws-001-ref.html rename to tests/wpt/tests/css/css-tables/anonymous-table-ws-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/anonymous-table-ws-001.html b/tests/wpt/tests/css/css-tables/anonymous-table-ws-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/anonymous-table-ws-001.html rename to tests/wpt/tests/css/css-tables/anonymous-table-ws-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/auto-layout-calc-width-001.html b/tests/wpt/tests/css/css-tables/auto-layout-calc-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/auto-layout-calc-width-001.html rename to tests/wpt/tests/css/css-tables/auto-layout-calc-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/background-clip-001.html b/tests/wpt/tests/css/css-tables/background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/background-clip-001.html rename to tests/wpt/tests/css/css-tables/background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/baseline-vertical-ref.html b/tests/wpt/tests/css/css-tables/baseline-vertical-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/baseline-vertical-ref.html rename to tests/wpt/tests/css/css-tables/baseline-vertical-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/baseline-vertical.html b/tests/wpt/tests/css/css-tables/baseline-vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/baseline-vertical.html rename to tests/wpt/tests/css/css-tables/baseline-vertical.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/border-collapse-double-border-notref.html b/tests/wpt/tests/css/css-tables/border-collapse-double-border-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/border-collapse-double-border-notref.html rename to tests/wpt/tests/css/css-tables/border-collapse-double-border-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/border-collapse-double-border.html b/tests/wpt/tests/css/css-tables/border-collapse-double-border.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/border-collapse-double-border.html rename to tests/wpt/tests/css/css-tables/border-collapse-double-border.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/border-collapse-dynamic-col-001-ref.html b/tests/wpt/tests/css/css-tables/border-collapse-dynamic-col-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/border-collapse-dynamic-col-001-ref.html rename to tests/wpt/tests/css/css-tables/border-collapse-dynamic-col-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/border-collapse-dynamic-col-001.html b/tests/wpt/tests/css/css-tables/border-collapse-dynamic-col-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/border-collapse-dynamic-col-001.html rename to tests/wpt/tests/css/css-tables/border-collapse-dynamic-col-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/border-collapse-dynamic-oof.html b/tests/wpt/tests/css/css-tables/border-collapse-dynamic-oof.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/border-collapse-dynamic-oof.html rename to tests/wpt/tests/css/css-tables/border-collapse-dynamic-oof.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/border-collapse-dynamic-section.html b/tests/wpt/tests/css/css-tables/border-collapse-dynamic-section.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/border-collapse-dynamic-section.html rename to tests/wpt/tests/css/css-tables/border-collapse-dynamic-section.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/border-collapse-empty-cell-ref.html b/tests/wpt/tests/css/css-tables/border-collapse-empty-cell-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/border-collapse-empty-cell-ref.html rename to tests/wpt/tests/css/css-tables/border-collapse-empty-cell-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/border-collapse-empty-cell.html b/tests/wpt/tests/css/css-tables/border-collapse-empty-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/border-collapse-empty-cell.html rename to tests/wpt/tests/css/css-tables/border-collapse-empty-cell.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/border-collapse-rowspan-cell-ref.html b/tests/wpt/tests/css/css-tables/border-collapse-rowspan-cell-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/border-collapse-rowspan-cell-ref.html rename to tests/wpt/tests/css/css-tables/border-collapse-rowspan-cell-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/border-collapse-rowspan-cell.html b/tests/wpt/tests/css/css-tables/border-collapse-rowspan-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/border-collapse-rowspan-cell.html rename to tests/wpt/tests/css/css-tables/border-collapse-rowspan-cell.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/border-conflict-resolution-ref.html b/tests/wpt/tests/css/css-tables/border-conflict-resolution-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/border-conflict-resolution-ref.html rename to tests/wpt/tests/css/css-tables/border-conflict-resolution-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/border-conflict-resolution.html b/tests/wpt/tests/css/css-tables/border-conflict-resolution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/border-conflict-resolution.html rename to tests/wpt/tests/css/css-tables/border-conflict-resolution.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/border-spacing-included-in-sizes-001.html b/tests/wpt/tests/css/css-tables/border-spacing-included-in-sizes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/border-spacing-included-in-sizes-001.html rename to tests/wpt/tests/css/css-tables/border-spacing-included-in-sizes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/border-writing-mode-dynamic-001.html b/tests/wpt/tests/css/css-tables/border-writing-mode-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/border-writing-mode-dynamic-001.html rename to tests/wpt/tests/css/css-tables/border-writing-mode-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/bounding-box-computation-1.html b/tests/wpt/tests/css/css-tables/bounding-box-computation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/bounding-box-computation-1.html rename to tests/wpt/tests/css/css-tables/bounding-box-computation-1.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/bounding-box-computation-2.html b/tests/wpt/tests/css/css-tables/bounding-box-computation-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/bounding-box-computation-2.html rename to tests/wpt/tests/css/css-tables/bounding-box-computation-2.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/bounding-box-computation-3.html b/tests/wpt/tests/css/css-tables/bounding-box-computation-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/bounding-box-computation-3.html rename to tests/wpt/tests/css/css-tables/bounding-box-computation-3.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/box-shadow-001.html b/tests/wpt/tests/css/css-tables/box-shadow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/box-shadow-001.html rename to tests/wpt/tests/css/css-tables/box-shadow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/calc-percent-plus-0px-auto.html b/tests/wpt/tests/css/css-tables/calc-percent-plus-0px-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/calc-percent-plus-0px-auto.html rename to tests/wpt/tests/css/css-tables/calc-percent-plus-0px-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/calc-percent-plus-0px-fixed-ref.html b/tests/wpt/tests/css/css-tables/calc-percent-plus-0px-fixed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/calc-percent-plus-0px-fixed-ref.html rename to tests/wpt/tests/css/css-tables/calc-percent-plus-0px-fixed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/calc-percent-plus-0px-fixed.html b/tests/wpt/tests/css/css-tables/calc-percent-plus-0px-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/calc-percent-plus-0px-fixed.html rename to tests/wpt/tests/css/css-tables/calc-percent-plus-0px-fixed.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/calc-percent-plus-0px-ref.html b/tests/wpt/tests/css/css-tables/calc-percent-plus-0px-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/calc-percent-plus-0px-ref.html rename to tests/wpt/tests/css/css-tables/calc-percent-plus-0px-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/caption-side-1.html b/tests/wpt/tests/css/css-tables/caption-side-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/caption-side-1.html rename to tests/wpt/tests/css/css-tables/caption-side-1.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/caption-writing-mode-001.html b/tests/wpt/tests/css/css-tables/caption-writing-mode-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/caption-writing-mode-001.html rename to tests/wpt/tests/css/css-tables/caption-writing-mode-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/caption-writing-mode-002.html b/tests/wpt/tests/css/css-tables/caption-writing-mode-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/caption-writing-mode-002.html rename to tests/wpt/tests/css/css-tables/caption-writing-mode-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/chrome-rowspan-bug.html b/tests/wpt/tests/css/css-tables/chrome-rowspan-bug.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/chrome-rowspan-bug.html rename to tests/wpt/tests/css/css-tables/chrome-rowspan-bug.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/col-definite-max-size-001-ref.html b/tests/wpt/tests/css/css-tables/col-definite-max-size-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/col-definite-max-size-001-ref.html rename to tests/wpt/tests/css/css-tables/col-definite-max-size-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/col-definite-max-size-001.html b/tests/wpt/tests/css/css-tables/col-definite-max-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/col-definite-max-size-001.html rename to tests/wpt/tests/css/css-tables/col-definite-max-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/col-definite-min-size-001.html b/tests/wpt/tests/css/css-tables/col-definite-min-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/col-definite-min-size-001.html rename to tests/wpt/tests/css/css-tables/col-definite-min-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/col-definite-size-001-ref.html b/tests/wpt/tests/css/css-tables/col-definite-size-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/col-definite-size-001-ref.html rename to tests/wpt/tests/css/css-tables/col-definite-size-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/col-definite-size-001.html b/tests/wpt/tests/css/css-tables/col-definite-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/col-definite-size-001.html rename to tests/wpt/tests/css/css-tables/col-definite-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/col_removal.html b/tests/wpt/tests/css/css-tables/col_removal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/col_removal.html rename to tests/wpt/tests/css/css-tables/col_removal.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-color-change-with-compositing-ref.html b/tests/wpt/tests/css/css-tables/collapsed-border-color-change-with-compositing-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/collapsed-border-color-change-with-compositing-ref.html rename to tests/wpt/tests/css/css-tables/collapsed-border-color-change-with-compositing-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-color-change-with-compositing.html b/tests/wpt/tests/css/css-tables/collapsed-border-color-change-with-compositing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/collapsed-border-color-change-with-compositing.html rename to tests/wpt/tests/css/css-tables/collapsed-border-color-change-with-compositing.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-paint-phase-001.html b/tests/wpt/tests/css/css-tables/collapsed-border-paint-phase-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/collapsed-border-paint-phase-001.html rename to tests/wpt/tests/css/css-tables/collapsed-border-paint-phase-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-paint-phase-002.html b/tests/wpt/tests/css/css-tables/collapsed-border-paint-phase-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/collapsed-border-paint-phase-002.html rename to tests/wpt/tests/css/css-tables/collapsed-border-paint-phase-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-positioned-tr-td-ref.html b/tests/wpt/tests/css/css-tables/collapsed-border-positioned-tr-td-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/collapsed-border-positioned-tr-td-ref.html rename to tests/wpt/tests/css/css-tables/collapsed-border-positioned-tr-td-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-positioned-tr-td.html b/tests/wpt/tests/css/css-tables/collapsed-border-positioned-tr-td.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/collapsed-border-positioned-tr-td.html rename to tests/wpt/tests/css/css-tables/collapsed-border-positioned-tr-td.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-remove-cell-ref.html b/tests/wpt/tests/css/css-tables/collapsed-border-remove-cell-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/collapsed-border-remove-cell-ref.html rename to tests/wpt/tests/css/css-tables/collapsed-border-remove-cell-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-remove-cell.html b/tests/wpt/tests/css/css-tables/collapsed-border-remove-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/collapsed-border-remove-cell.html rename to tests/wpt/tests/css/css-tables/collapsed-border-remove-cell.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/collapsed-scroll-overflow.html b/tests/wpt/tests/css/css-tables/collapsed-scroll-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/collapsed-scroll-overflow.html rename to tests/wpt/tests/css/css-tables/collapsed-scroll-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/colspan-001.html b/tests/wpt/tests/css/css-tables/colspan-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/colspan-001.html rename to tests/wpt/tests/css/css-tables/colspan-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/colspan-002.html b/tests/wpt/tests/css/css-tables/colspan-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/colspan-002.html rename to tests/wpt/tests/css/css-tables/colspan-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/colspan-003.html b/tests/wpt/tests/css/css-tables/colspan-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/colspan-003.html rename to tests/wpt/tests/css/css-tables/colspan-003.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/colspan-004.html b/tests/wpt/tests/css/css-tables/colspan-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/colspan-004.html rename to tests/wpt/tests/css/css-tables/colspan-004.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/column-track-merging.html b/tests/wpt/tests/css/css-tables/column-track-merging.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/column-track-merging.html rename to tests/wpt/tests/css/css-tables/column-track-merging.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/caption-with-multicol-table-cell.html b/tests/wpt/tests/css/css-tables/crashtests/caption-with-multicol-table-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/caption-with-multicol-table-cell.html rename to tests/wpt/tests/css/css-tables/crashtests/caption-with-multicol-table-cell.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/col_span_dynamic_crash.html b/tests/wpt/tests/css/css-tables/crashtests/col_span_dynamic_crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/col_span_dynamic_crash.html rename to tests/wpt/tests/css/css-tables/crashtests/col_span_dynamic_crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/dialog-table-crash.html b/tests/wpt/tests/css/css-tables/crashtests/dialog-table-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/dialog-table-crash.html rename to tests/wpt/tests/css/css-tables/crashtests/dialog-table-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/dynamic-recompute-baseline.html b/tests/wpt/tests/css/css-tables/crashtests/dynamic-recompute-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/dynamic-recompute-baseline.html rename to tests/wpt/tests/css/css-tables/crashtests/dynamic-recompute-baseline.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/dynamic_col_width_crash.html b/tests/wpt/tests/css/css-tables/crashtests/dynamic_col_width_crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/dynamic_col_width_crash.html rename to tests/wpt/tests/css/css-tables/crashtests/dynamic_col_width_crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/dynamic_table_layout_crash.html b/tests/wpt/tests/css/css-tables/crashtests/dynamic_table_layout_crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/dynamic_table_layout_crash.html rename to tests/wpt/tests/css/css-tables/crashtests/dynamic_table_layout_crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/empty-tbody-after-tall-section-crash.html b/tests/wpt/tests/css/css-tables/crashtests/empty-tbody-after-tall-section-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/empty-tbody-after-tall-section-crash.html rename to tests/wpt/tests/css/css-tables/crashtests/empty-tbody-after-tall-section-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/empty_cells_crash.html b/tests/wpt/tests/css/css-tables/crashtests/empty_cells_crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/empty_cells_crash.html rename to tests/wpt/tests/css/css-tables/crashtests/empty_cells_crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/empty_table_with_cols.html b/tests/wpt/tests/css/css-tables/crashtests/empty_table_with_cols.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/empty_table_with_cols.html rename to tests/wpt/tests/css/css-tables/crashtests/empty_table_with_cols.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/expression_width_crash.html b/tests/wpt/tests/css/css-tables/crashtests/expression_width_crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/expression_width_crash.html rename to tests/wpt/tests/css/css-tables/crashtests/expression_width_crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/inline-splitting-crash.html b/tests/wpt/tests/css/css-tables/crashtests/inline-splitting-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/inline-splitting-crash.html rename to tests/wpt/tests/css/css-tables/crashtests/inline-splitting-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/large-border-crash.html b/tests/wpt/tests/css/css-tables/crashtests/large-border-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/large-border-crash.html rename to tests/wpt/tests/css/css-tables/crashtests/large-border-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/large-col-widths.html b/tests/wpt/tests/css/css-tables/crashtests/large-col-widths.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/large-col-widths.html rename to tests/wpt/tests/css/css-tables/crashtests/large-col-widths.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/legacy_ng_mix_crash.html b/tests/wpt/tests/css/css-tables/crashtests/legacy_ng_mix_crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/legacy_ng_mix_crash.html rename to tests/wpt/tests/css/css-tables/crashtests/legacy_ng_mix_crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/move-oof-inside-section-row-with-borders.html b/tests/wpt/tests/css/css-tables/crashtests/move-oof-inside-section-row-with-borders.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/move-oof-inside-section-row-with-borders.html rename to tests/wpt/tests/css/css-tables/crashtests/move-oof-inside-section-row-with-borders.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/negative-section-distribution.html b/tests/wpt/tests/css/css-tables/crashtests/negative-section-distribution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/negative-section-distribution.html rename to tests/wpt/tests/css/css-tables/crashtests/negative-section-distribution.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/negative_caption_margin.html b/tests/wpt/tests/css/css-tables/crashtests/negative_caption_margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/negative_caption_margin.html rename to tests/wpt/tests/css/css-tables/crashtests/negative_caption_margin.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/orthogonal-cell-borders.html b/tests/wpt/tests/css/css-tables/crashtests/orthogonal-cell-borders.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/orthogonal-cell-borders.html rename to tests/wpt/tests/css/css-tables/crashtests/orthogonal-cell-borders.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/orthogonal-cell-crash.html b/tests/wpt/tests/css/css-tables/crashtests/orthogonal-cell-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/orthogonal-cell-crash.html rename to tests/wpt/tests/css/css-tables/crashtests/orthogonal-cell-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/table-column-display-change-chrome-crash.html b/tests/wpt/tests/css/css-tables/crashtests/table-column-display-change-chrome-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/table-column-display-change-chrome-crash.html rename to tests/wpt/tests/css/css-tables/crashtests/table-column-display-change-chrome-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/textarea-intrinsic-size-crash.html b/tests/wpt/tests/css/css-tables/crashtests/textarea-intrinsic-size-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/textarea-intrinsic-size-crash.html rename to tests/wpt/tests/css/css-tables/crashtests/textarea-intrinsic-size-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/uninitialized_read_crash.html b/tests/wpt/tests/css/css-tables/crashtests/uninitialized_read_crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/uninitialized_read_crash.html rename to tests/wpt/tests/css/css-tables/crashtests/uninitialized_read_crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/crashtests/vertical_percentage_crash.html b/tests/wpt/tests/css/css-tables/crashtests/vertical_percentage_crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/crashtests/vertical_percentage_crash.html rename to tests/wpt/tests/css/css-tables/crashtests/vertical_percentage_crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/dynamic-rowspan-change.html b/tests/wpt/tests/css/css-tables/dynamic-rowspan-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/dynamic-rowspan-change.html rename to tests/wpt/tests/css/css-tables/dynamic-rowspan-change.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/dynamic-table-cell-height.html b/tests/wpt/tests/css/css-tables/dynamic-table-cell-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/dynamic-table-cell-height.html rename to tests/wpt/tests/css/css-tables/dynamic-table-cell-height.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/empty-table-height.html b/tests/wpt/tests/css/css-tables/empty-table-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/empty-table-height.html rename to tests/wpt/tests/css/css-tables/empty-table-height.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/fixed-layout-1.html b/tests/wpt/tests/css/css-tables/fixed-layout-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/fixed-layout-1.html rename to tests/wpt/tests/css/css-tables/fixed-layout-1.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/fixed-layout-2.html b/tests/wpt/tests/css/css-tables/fixed-layout-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/fixed-layout-2.html rename to tests/wpt/tests/css/css-tables/fixed-layout-2.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/fixed-layout-calc-width-001.html b/tests/wpt/tests/css/css-tables/fixed-layout-calc-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/fixed-layout-calc-width-001.html rename to tests/wpt/tests/css/css-tables/fixed-layout-calc-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/fixed-layout-excess-width-distribution-001.html b/tests/wpt/tests/css/css-tables/fixed-layout-excess-width-distribution-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/fixed-layout-excess-width-distribution-001.html rename to tests/wpt/tests/css/css-tables/fixed-layout-excess-width-distribution-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/fixup-dynamic-anonymous-inline-table-001.html b/tests/wpt/tests/css/css-tables/fixup-dynamic-anonymous-inline-table-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/fixup-dynamic-anonymous-inline-table-001.html rename to tests/wpt/tests/css/css-tables/fixup-dynamic-anonymous-inline-table-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/fixup-dynamic-anonymous-inline-table-002.html b/tests/wpt/tests/css/css-tables/fixup-dynamic-anonymous-inline-table-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/fixup-dynamic-anonymous-inline-table-002.html rename to tests/wpt/tests/css/css-tables/fixup-dynamic-anonymous-inline-table-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/fixup-dynamic-anonymous-inline-table-003.html b/tests/wpt/tests/css/css-tables/fixup-dynamic-anonymous-inline-table-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/fixup-dynamic-anonymous-inline-table-003.html rename to tests/wpt/tests/css/css-tables/fixup-dynamic-anonymous-inline-table-003.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/fixup-dynamic-anonymous-table-001.html b/tests/wpt/tests/css/css-tables/fixup-dynamic-anonymous-table-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/fixup-dynamic-anonymous-table-001.html rename to tests/wpt/tests/css/css-tables/fixup-dynamic-anonymous-table-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/floats/floats-wrap-bfc-006b-ref.xht b/tests/wpt/tests/css/css-tables/floats/floats-wrap-bfc-006b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/floats/floats-wrap-bfc-006b-ref.xht rename to tests/wpt/tests/css/css-tables/floats/floats-wrap-bfc-006b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-tables/floats/floats-wrap-bfc-006c-ref.xht b/tests/wpt/tests/css/css-tables/floats/floats-wrap-bfc-006c-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/floats/floats-wrap-bfc-006c-ref.xht rename to tests/wpt/tests/css/css-tables/floats/floats-wrap-bfc-006c-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-tables/fractional-percent-width.html b/tests/wpt/tests/css/css-tables/fractional-percent-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/fractional-percent-width.html rename to tests/wpt/tests/css/css-tables/fractional-percent-width.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/computing-row-measure-0.html b/tests/wpt/tests/css/css-tables/height-distribution/computing-row-measure-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/computing-row-measure-0.html rename to tests/wpt/tests/css/css-tables/height-distribution/computing-row-measure-0.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/computing-row-measure-1.html b/tests/wpt/tests/css/css-tables/height-distribution/computing-row-measure-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/computing-row-measure-1.html rename to tests/wpt/tests/css/css-tables/height-distribution/computing-row-measure-1.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-001.html b/tests/wpt/tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-001.html rename to tests/wpt/tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-002.html b/tests/wpt/tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-002.html rename to tests/wpt/tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-003.html b/tests/wpt/tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-003.html rename to tests/wpt/tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-003.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-004.html b/tests/wpt/tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-004.html rename to tests/wpt/tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-004.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-005.html b/tests/wpt/tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-005.html rename to tests/wpt/tests/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-005.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-007-ref.html b/tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-007-ref.html rename to tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-007.html b/tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-007.html rename to tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-007.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-002-ref.html b/tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-002-ref.html rename to tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-002.html b/tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-002.html rename to tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-003.html b/tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-003.html rename to tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-003.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-004.html b/tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-004.html rename to tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-004.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-005.html b/tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-005.html rename to tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-005.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-006.html b/tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-006.html rename to tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-006.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children.html b/tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children.html rename to tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-replaced-children-001-ref.html b/tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-replaced-children-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-replaced-children-001-ref.html rename to tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-replaced-children-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-replaced-children-001.html b/tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-replaced-children-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-replaced-children-001.html rename to tests/wpt/tests/css/css-tables/height-distribution/percentage-sizing-of-table-cell-replaced-children-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/support/scrollbars.css b/tests/wpt/tests/css/css-tables/height-distribution/support/scrollbars.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/support/scrollbars.css rename to tests/wpt/tests/css/css-tables/height-distribution/support/scrollbars.css diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row-ref.html b/tests/wpt/tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row-ref.html rename to tests/wpt/tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row-vertical-rl-ref.html b/tests/wpt/tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row-vertical-rl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row-vertical-rl-ref.html rename to tests/wpt/tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row-vertical-rl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row-vertical-rl.html b/tests/wpt/tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row-vertical-rl.html rename to tests/wpt/tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row.html b/tests/wpt/tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row.html rename to tests/wpt/tests/css/css-tables/height-distribution/td-different-subpixel-padding-in-same-row.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/html-display-table-ref.html b/tests/wpt/tests/css/css-tables/html-display-table-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/html-display-table-ref.html rename to tests/wpt/tests/css/css-tables/html-display-table-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/html-display-table.html b/tests/wpt/tests/css/css-tables/html-display-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/html-display-table.html rename to tests/wpt/tests/css/css-tables/html-display-table.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/html-to-css-mapping-1.html b/tests/wpt/tests/css/css-tables/html-to-css-mapping-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/html-to-css-mapping-1.html rename to tests/wpt/tests/css/css-tables/html-to-css-mapping-1.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/html-to-css-mapping-2.html b/tests/wpt/tests/css/css-tables/html-to-css-mapping-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/html-to-css-mapping-2.html rename to tests/wpt/tests/css/css-tables/html-to-css-mapping-2.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/html5-table-formatting-1.html b/tests/wpt/tests/css/css-tables/html5-table-formatting-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/html5-table-formatting-1.html rename to tests/wpt/tests/css/css-tables/html5-table-formatting-1.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/html5-table-formatting-2.html b/tests/wpt/tests/css/css-tables/html5-table-formatting-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/html5-table-formatting-2.html rename to tests/wpt/tests/css/css-tables/html5-table-formatting-2.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/html5-table-formatting-3.html b/tests/wpt/tests/css/css-tables/html5-table-formatting-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/html5-table-formatting-3.html rename to tests/wpt/tests/css/css-tables/html5-table-formatting-3.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/html5-table-formatting-fixed-layout-1.html b/tests/wpt/tests/css/css-tables/html5-table-formatting-fixed-layout-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/html5-table-formatting-fixed-layout-1.html rename to tests/wpt/tests/css/css-tables/html5-table-formatting-fixed-layout-1.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/inheritance.html b/tests/wpt/tests/css/css-tables/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/inheritance.html rename to tests/wpt/tests/css/css-tables/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/internal-containing-block-001.html b/tests/wpt/tests/css/css-tables/internal-containing-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/internal-containing-block-001.html rename to tests/wpt/tests/css/css-tables/internal-containing-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/max-height-table-ref.html b/tests/wpt/tests/css/css-tables/max-height-table-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/max-height-table-ref.html rename to tests/wpt/tests/css/css-tables/max-height-table-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/max-height-table.html b/tests/wpt/tests/css/css-tables/max-height-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/max-height-table.html rename to tests/wpt/tests/css/css-tables/max-height-table.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/min-height-table-2.html b/tests/wpt/tests/css/css-tables/min-height-table-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/min-height-table-2.html rename to tests/wpt/tests/css/css-tables/min-height-table-2.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/min-height-table-ref.html b/tests/wpt/tests/css/css-tables/min-height-table-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/min-height-table-ref.html rename to tests/wpt/tests/css/css-tables/min-height-table-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/min-height-table.html b/tests/wpt/tests/css/css-tables/min-height-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/min-height-table.html rename to tests/wpt/tests/css/css-tables/min-height-table.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/min-max-size-table-content-box-ref.html b/tests/wpt/tests/css/css-tables/min-max-size-table-content-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/min-max-size-table-content-box-ref.html rename to tests/wpt/tests/css/css-tables/min-max-size-table-content-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/min-max-size-table-content-box.html b/tests/wpt/tests/css/css-tables/min-max-size-table-content-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/min-max-size-table-content-box.html rename to tests/wpt/tests/css/css-tables/min-max-size-table-content-box.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/multicol-table-collapsed-border-crash.html b/tests/wpt/tests/css/css-tables/multicol-table-collapsed-border-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/multicol-table-collapsed-border-crash.html rename to tests/wpt/tests/css/css-tables/multicol-table-collapsed-border-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/multicol-table-crash.html b/tests/wpt/tests/css/css-tables/multicol-table-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/multicol-table-crash.html rename to tests/wpt/tests/css/css-tables/multicol-table-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/no-overflow-with-table-cell-margins.html b/tests/wpt/tests/css/css-tables/no-overflow-with-table-cell-margins.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/no-overflow-with-table-cell-margins.html rename to tests/wpt/tests/css/css-tables/no-overflow-with-table-cell-margins.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/paint/col-paint-htb-rtl-ref.html b/tests/wpt/tests/css/css-tables/paint/col-paint-htb-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/paint/col-paint-htb-rtl-ref.html rename to tests/wpt/tests/css/css-tables/paint/col-paint-htb-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/paint/col-paint-htb-rtl.html b/tests/wpt/tests/css/css-tables/paint/col-paint-htb-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/paint/col-paint-htb-rtl.html rename to tests/wpt/tests/css/css-tables/paint/col-paint-htb-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/paint/col-paint-vrl-rtl-ref.html b/tests/wpt/tests/css/css-tables/paint/col-paint-vrl-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/paint/col-paint-vrl-rtl-ref.html rename to tests/wpt/tests/css/css-tables/paint/col-paint-vrl-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/paint/col-paint-vrl-rtl.html b/tests/wpt/tests/css/css-tables/paint/col-paint-vrl-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/paint/col-paint-vrl-rtl.html rename to tests/wpt/tests/css/css-tables/paint/col-paint-vrl-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/border-collapse-computed.html b/tests/wpt/tests/css/css-tables/parsing/border-collapse-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/border-collapse-computed.html rename to tests/wpt/tests/css/css-tables/parsing/border-collapse-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/border-collapse-invalid.html b/tests/wpt/tests/css/css-tables/parsing/border-collapse-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/border-collapse-invalid.html rename to tests/wpt/tests/css/css-tables/parsing/border-collapse-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/border-collapse-valid.html b/tests/wpt/tests/css/css-tables/parsing/border-collapse-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/border-collapse-valid.html rename to tests/wpt/tests/css/css-tables/parsing/border-collapse-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/border-spacing-computed.html b/tests/wpt/tests/css/css-tables/parsing/border-spacing-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/border-spacing-computed.html rename to tests/wpt/tests/css/css-tables/parsing/border-spacing-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/border-spacing-invalid.html b/tests/wpt/tests/css/css-tables/parsing/border-spacing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/border-spacing-invalid.html rename to tests/wpt/tests/css/css-tables/parsing/border-spacing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/border-spacing-valid.html b/tests/wpt/tests/css/css-tables/parsing/border-spacing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/border-spacing-valid.html rename to tests/wpt/tests/css/css-tables/parsing/border-spacing-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/caption-side-computed.html b/tests/wpt/tests/css/css-tables/parsing/caption-side-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/caption-side-computed.html rename to tests/wpt/tests/css/css-tables/parsing/caption-side-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/caption-side-invalid.html b/tests/wpt/tests/css/css-tables/parsing/caption-side-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/caption-side-invalid.html rename to tests/wpt/tests/css/css-tables/parsing/caption-side-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/caption-side-valid.html b/tests/wpt/tests/css/css-tables/parsing/caption-side-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/caption-side-valid.html rename to tests/wpt/tests/css/css-tables/parsing/caption-side-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/empty-cells-computed.html b/tests/wpt/tests/css/css-tables/parsing/empty-cells-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/empty-cells-computed.html rename to tests/wpt/tests/css/css-tables/parsing/empty-cells-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/empty-cells-invalid.html b/tests/wpt/tests/css/css-tables/parsing/empty-cells-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/empty-cells-invalid.html rename to tests/wpt/tests/css/css-tables/parsing/empty-cells-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/empty-cells-valid.html b/tests/wpt/tests/css/css-tables/parsing/empty-cells-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/empty-cells-valid.html rename to tests/wpt/tests/css/css-tables/parsing/empty-cells-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/table-layout-computed.html b/tests/wpt/tests/css/css-tables/parsing/table-layout-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/table-layout-computed.html rename to tests/wpt/tests/css/css-tables/parsing/table-layout-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/table-layout-invalid.html b/tests/wpt/tests/css/css-tables/parsing/table-layout-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/table-layout-invalid.html rename to tests/wpt/tests/css/css-tables/parsing/table-layout-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/parsing/table-layout-valid.html b/tests/wpt/tests/css/css-tables/parsing/table-layout-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/parsing/table-layout-valid.html rename to tests/wpt/tests/css/css-tables/parsing/table-layout-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/percent-height-overflow-auto-in-restricted-block-size-cell.html b/tests/wpt/tests/css/css-tables/percent-height-overflow-auto-in-restricted-block-size-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/percent-height-overflow-auto-in-restricted-block-size-cell.html rename to tests/wpt/tests/css/css-tables/percent-height-overflow-auto-in-restricted-block-size-cell.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/percent-height-overflow-auto-in-unrestricted-block-size-cell.tentative.html b/tests/wpt/tests/css/css-tables/percent-height-overflow-auto-in-unrestricted-block-size-cell.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/percent-height-overflow-auto-in-unrestricted-block-size-cell.tentative.html rename to tests/wpt/tests/css/css-tables/percent-height-overflow-auto-in-unrestricted-block-size-cell.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/percent-height-replaced-in-percent-cell-002.html b/tests/wpt/tests/css/css-tables/percent-height-replaced-in-percent-cell-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/percent-height-replaced-in-percent-cell-002.html rename to tests/wpt/tests/css/css-tables/percent-height-replaced-in-percent-cell-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/percent-height-replaced-in-percent-cell.tentative.html b/tests/wpt/tests/css/css-tables/percent-height-replaced-in-percent-cell.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/percent-height-replaced-in-percent-cell.tentative.html rename to tests/wpt/tests/css/css-tables/percent-height-replaced-in-percent-cell.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/percent-height-table-cell-child.html b/tests/wpt/tests/css/css-tables/percent-height-table-cell-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/percent-height-table-cell-child.html rename to tests/wpt/tests/css/css-tables/percent-height-table-cell-child.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/percent-width-cell-dynamic.html b/tests/wpt/tests/css/css-tables/percent-width-cell-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/percent-width-cell-dynamic.html rename to tests/wpt/tests/css/css-tables/percent-width-cell-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/percent-width-ignored-001.tentative.html b/tests/wpt/tests/css/css-tables/percent-width-ignored-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/percent-width-ignored-001.tentative.html rename to tests/wpt/tests/css/css-tables/percent-width-ignored-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/percent-width-ignored-002.tentative.html b/tests/wpt/tests/css/css-tables/percent-width-ignored-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/percent-width-ignored-002.tentative.html rename to tests/wpt/tests/css/css-tables/percent-width-ignored-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/percent-width-ignored-003.tentative.html b/tests/wpt/tests/css/css-tables/percent-width-ignored-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/percent-width-ignored-003.tentative.html rename to tests/wpt/tests/css/css-tables/percent-width-ignored-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/percentages-grandchildren-quirks-mode-001.html b/tests/wpt/tests/css/css-tables/percentages-grandchildren-quirks-mode-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/percentages-grandchildren-quirks-mode-001.html rename to tests/wpt/tests/css/css-tables/percentages-grandchildren-quirks-mode-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/percentages-grandchildren-quirks-mode-002.html b/tests/wpt/tests/css/css-tables/percentages-grandchildren-quirks-mode-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/percentages-grandchildren-quirks-mode-002.html rename to tests/wpt/tests/css/css-tables/percentages-grandchildren-quirks-mode-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/reference/subpixel-collapsed-borders-003-ref.html b/tests/wpt/tests/css/css-tables/reference/subpixel-collapsed-borders-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/reference/subpixel-collapsed-borders-003-ref.html rename to tests/wpt/tests/css/css-tables/reference/subpixel-collapsed-borders-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/row-group-margin-border-padding-ref.html b/tests/wpt/tests/css/css-tables/row-group-margin-border-padding-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/row-group-margin-border-padding-ref.html rename to tests/wpt/tests/css/css-tables/row-group-margin-border-padding-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/row-group-margin-border-padding.html b/tests/wpt/tests/css/css-tables/row-group-margin-border-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/row-group-margin-border-padding.html rename to tests/wpt/tests/css/css-tables/row-group-margin-border-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/row-group-order-ref.html b/tests/wpt/tests/css/css-tables/row-group-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/row-group-order-ref.html rename to tests/wpt/tests/css/css-tables/row-group-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/row-group-order.html b/tests/wpt/tests/css/css-tables/row-group-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/row-group-order.html rename to tests/wpt/tests/css/css-tables/row-group-order.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/row-margin-border-padding-ref.html b/tests/wpt/tests/css/css-tables/row-margin-border-padding-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/row-margin-border-padding-ref.html rename to tests/wpt/tests/css/css-tables/row-margin-border-padding-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/row-margin-border-padding.html b/tests/wpt/tests/css/css-tables/row-margin-border-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/row-margin-border-padding.html rename to tests/wpt/tests/css/css-tables/row-margin-border-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/rules-groups-ref.html b/tests/wpt/tests/css/css-tables/rules-groups-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/rules-groups-ref.html rename to tests/wpt/tests/css/css-tables/rules-groups-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/rules-groups.html b/tests/wpt/tests/css/css-tables/rules-groups.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/rules-groups.html rename to tests/wpt/tests/css/css-tables/rules-groups.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/subpixel-collapsed-borders-001.html b/tests/wpt/tests/css/css-tables/subpixel-collapsed-borders-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/subpixel-collapsed-borders-001.html rename to tests/wpt/tests/css/css-tables/subpixel-collapsed-borders-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/subpixel-collapsed-borders-002.html b/tests/wpt/tests/css/css-tables/subpixel-collapsed-borders-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/subpixel-collapsed-borders-002.html rename to tests/wpt/tests/css/css-tables/subpixel-collapsed-borders-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/subpixel-collapsed-borders-003.html b/tests/wpt/tests/css/css-tables/subpixel-collapsed-borders-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/subpixel-collapsed-borders-003.html rename to tests/wpt/tests/css/css-tables/subpixel-collapsed-borders-003.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/subpixel-collapsed-borders-ref.html b/tests/wpt/tests/css/css-tables/subpixel-collapsed-borders-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/subpixel-collapsed-borders-ref.html rename to tests/wpt/tests/css/css-tables/subpixel-collapsed-borders-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/subpixel-table-cell-height-001-ref.html b/tests/wpt/tests/css/css-tables/subpixel-table-cell-height-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/subpixel-table-cell-height-001-ref.html rename to tests/wpt/tests/css/css-tables/subpixel-table-cell-height-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/subpixel-table-cell-height-001.html b/tests/wpt/tests/css/css-tables/subpixel-table-cell-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/subpixel-table-cell-height-001.html rename to tests/wpt/tests/css/css-tables/subpixel-table-cell-height-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/subpixel-table-cell-width-001-ref.html b/tests/wpt/tests/css/css-tables/subpixel-table-cell-width-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/subpixel-table-cell-width-001-ref.html rename to tests/wpt/tests/css/css-tables/subpixel-table-cell-width-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/subpixel-table-cell-width-001.html b/tests/wpt/tests/css/css-tables/subpixel-table-cell-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/subpixel-table-cell-width-001.html rename to tests/wpt/tests/css/css-tables/subpixel-table-cell-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/subpixel-table-cell-width-002.html b/tests/wpt/tests/css/css-tables/subpixel-table-cell-width-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/subpixel-table-cell-width-002.html rename to tests/wpt/tests/css/css-tables/subpixel-table-cell-width-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/subpixel-table-width-001-ref.html b/tests/wpt/tests/css/css-tables/subpixel-table-width-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/subpixel-table-width-001-ref.html rename to tests/wpt/tests/css/css-tables/subpixel-table-width-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/subpixel-table-width-001.html b/tests/wpt/tests/css/css-tables/subpixel-table-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/subpixel-table-width-001.html rename to tests/wpt/tests/css/css-tables/subpixel-table-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/support/base.css b/tests/wpt/tests/css/css-tables/support/base.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/support/base.css rename to tests/wpt/tests/css/css-tables/support/base.css diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-cell-baseline-static-position.html b/tests/wpt/tests/css/css-tables/table-cell-baseline-static-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table-cell-baseline-static-position.html rename to tests/wpt/tests/css/css-tables/table-cell-baseline-static-position.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-cell-child-overflow-measure-ref.html b/tests/wpt/tests/css/css-tables/table-cell-child-overflow-measure-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table-cell-child-overflow-measure-ref.html rename to tests/wpt/tests/css/css-tables/table-cell-child-overflow-measure-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-cell-child-overflow-measure.html b/tests/wpt/tests/css/css-tables/table-cell-child-overflow-measure.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table-cell-child-overflow-measure.html rename to tests/wpt/tests/css/css-tables/table-cell-child-overflow-measure.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-cell-overflow-auto-ref.html b/tests/wpt/tests/css/css-tables/table-cell-overflow-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table-cell-overflow-auto-ref.html rename to tests/wpt/tests/css/css-tables/table-cell-overflow-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-cell-overflow-auto-scrolled-ref.html b/tests/wpt/tests/css/css-tables/table-cell-overflow-auto-scrolled-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table-cell-overflow-auto-scrolled-ref.html rename to tests/wpt/tests/css/css-tables/table-cell-overflow-auto-scrolled-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-cell-overflow-auto-scrolled.html b/tests/wpt/tests/css/css-tables/table-cell-overflow-auto-scrolled.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table-cell-overflow-auto-scrolled.html rename to tests/wpt/tests/css/css-tables/table-cell-overflow-auto-scrolled.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-cell-overflow-auto.html b/tests/wpt/tests/css/css-tables/table-cell-overflow-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table-cell-overflow-auto.html rename to tests/wpt/tests/css/css-tables/table-cell-overflow-auto.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-cell-writing-mode-computed.html b/tests/wpt/tests/css/css-tables/table-cell-writing-mode-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table-cell-writing-mode-computed.html rename to tests/wpt/tests/css/css-tables/table-cell-writing-mode-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-has-box-sizing-border-box-001.html b/tests/wpt/tests/css/css-tables/table-has-box-sizing-border-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table-has-box-sizing-border-box-001.html rename to tests/wpt/tests/css/css-tables/table-has-box-sizing-border-box-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-has-box-sizing-border-box-002.html b/tests/wpt/tests/css/css-tables/table-has-box-sizing-border-box-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table-has-box-sizing-border-box-002.html rename to tests/wpt/tests/css/css-tables/table-has-box-sizing-border-box-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-model-fixup-2.html b/tests/wpt/tests/css/css-tables/table-model-fixup-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table-model-fixup-2.html rename to tests/wpt/tests/css/css-tables/table-model-fixup-2.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-model-fixup.html b/tests/wpt/tests/css/css-tables/table-model-fixup.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table-model-fixup.html rename to tests/wpt/tests/css/css-tables/table-model-fixup.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-position-sticky-computed.html b/tests/wpt/tests/css/css-tables/table-position-sticky-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table-position-sticky-computed.html rename to tests/wpt/tests/css/css-tables/table-position-sticky-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/table_grid_size_col_colspan-ref.html b/tests/wpt/tests/css/css-tables/table_grid_size_col_colspan-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table_grid_size_col_colspan-ref.html rename to tests/wpt/tests/css/css-tables/table_grid_size_col_colspan-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/table_grid_size_col_colspan.html b/tests/wpt/tests/css/css-tables/table_grid_size_col_colspan.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/table_grid_size_col_colspan.html rename to tests/wpt/tests/css/css-tables/table_grid_size_col_colspan.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/baseline-table.html b/tests/wpt/tests/css/css-tables/tentative/baseline-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/baseline-table.html rename to tests/wpt/tests/css/css-tables/tentative/baseline-table.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/baseline-td.html b/tests/wpt/tests/css/css-tables/tentative/baseline-td.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/baseline-td.html rename to tests/wpt/tests/css/css-tables/tentative/baseline-td.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/caption.html b/tests/wpt/tests/css/css-tables/tentative/caption.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/caption.html rename to tests/wpt/tests/css/css-tables/tentative/caption.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/col-collapse-table-size.html b/tests/wpt/tests/css/css-tables/tentative/col-collapse-table-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/col-collapse-table-size.html rename to tests/wpt/tests/css/css-tables/tentative/col-collapse-table-size.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/colgroup-col.html b/tests/wpt/tests/css/css-tables/tentative/colgroup-col.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/colgroup-col.html rename to tests/wpt/tests/css/css-tables/tentative/colgroup-col.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/colspan-redistribution.html b/tests/wpt/tests/css/css-tables/tentative/colspan-redistribution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/colspan-redistribution.html rename to tests/wpt/tests/css/css-tables/tentative/colspan-redistribution.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/column-widths.html b/tests/wpt/tests/css/css-tables/tentative/column-widths.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/column-widths.html rename to tests/wpt/tests/css/css-tables/tentative/column-widths.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/element-sizing.html b/tests/wpt/tests/css/css-tables/tentative/element-sizing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/element-sizing.html rename to tests/wpt/tests/css/css-tables/tentative/element-sizing.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-column-collapsed-ref.html b/tests/wpt/tests/css/css-tables/tentative/paint/background-image-column-collapsed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-column-collapsed-ref.html rename to tests/wpt/tests/css/css-tables/tentative/paint/background-image-column-collapsed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-column-collapsed.html b/tests/wpt/tests/css/css-tables/tentative/paint/background-image-column-collapsed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-column-collapsed.html rename to tests/wpt/tests/css/css-tables/tentative/paint/background-image-column-collapsed.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-column-ref.html b/tests/wpt/tests/css/css-tables/tentative/paint/background-image-column-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-column-ref.html rename to tests/wpt/tests/css/css-tables/tentative/paint/background-image-column-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-column.html b/tests/wpt/tests/css/css-tables/tentative/paint/background-image-column.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-column.html rename to tests/wpt/tests/css/css-tables/tentative/paint/background-image-column.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-row-collapsed-ref.html b/tests/wpt/tests/css/css-tables/tentative/paint/background-image-row-collapsed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-row-collapsed-ref.html rename to tests/wpt/tests/css/css-tables/tentative/paint/background-image-row-collapsed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-row-collapsed.html b/tests/wpt/tests/css/css-tables/tentative/paint/background-image-row-collapsed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-row-collapsed.html rename to tests/wpt/tests/css/css-tables/tentative/paint/background-image-row-collapsed.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-row-ref.html b/tests/wpt/tests/css/css-tables/tentative/paint/background-image-row-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-row-ref.html rename to tests/wpt/tests/css/css-tables/tentative/paint/background-image-row-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-row.html b/tests/wpt/tests/css/css-tables/tentative/paint/background-image-row.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/paint/background-image-row.html rename to tests/wpt/tests/css/css-tables/tentative/paint/background-image-row.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/paint/collapsed-border-large-cell-ref.html b/tests/wpt/tests/css/css-tables/tentative/paint/collapsed-border-large-cell-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/paint/collapsed-border-large-cell-ref.html rename to tests/wpt/tests/css/css-tables/tentative/paint/collapsed-border-large-cell-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/paint/collapsed-border-large-cell.html b/tests/wpt/tests/css/css-tables/tentative/paint/collapsed-border-large-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/paint/collapsed-border-large-cell.html rename to tests/wpt/tests/css/css-tables/tentative/paint/collapsed-border-large-cell.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/paint/overflow-hidden-table-ref.html b/tests/wpt/tests/css/css-tables/tentative/paint/overflow-hidden-table-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/paint/overflow-hidden-table-ref.html rename to tests/wpt/tests/css/css-tables/tentative/paint/overflow-hidden-table-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/paint/overflow-hidden-table.html b/tests/wpt/tests/css/css-tables/tentative/paint/overflow-hidden-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/paint/overflow-hidden-table.html rename to tests/wpt/tests/css/css-tables/tentative/paint/overflow-hidden-table.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/position-sticky-container.html b/tests/wpt/tests/css/css-tables/tentative/position-sticky-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/position-sticky-container.html rename to tests/wpt/tests/css/css-tables/tentative/position-sticky-container.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/rowspan-height-redistribution.html b/tests/wpt/tests/css/css-tables/tentative/rowspan-height-redistribution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/rowspan-height-redistribution.html rename to tests/wpt/tests/css/css-tables/tentative/rowspan-height-redistribution.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/section-no-tbody-fixed-distribution.html b/tests/wpt/tests/css/css-tables/tentative/section-no-tbody-fixed-distribution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/section-no-tbody-fixed-distribution.html rename to tests/wpt/tests/css/css-tables/tentative/section-no-tbody-fixed-distribution.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/section-no-tbody-percent-distribution.html b/tests/wpt/tests/css/css-tables/tentative/section-no-tbody-percent-distribution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/section-no-tbody-percent-distribution.html rename to tests/wpt/tests/css/css-tables/tentative/section-no-tbody-percent-distribution.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/support/README b/tests/wpt/tests/css/css-tables/tentative/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/support/README rename to tests/wpt/tests/css/css-tables/tentative/support/README diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/support/table-tentative.css b/tests/wpt/tests/css/css-tables/tentative/support/table-tentative.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/support/table-tentative.css rename to tests/wpt/tests/css/css-tables/tentative/support/table-tentative.css diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/table-fixed-minmax.html b/tests/wpt/tests/css/css-tables/tentative/table-fixed-minmax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/table-fixed-minmax.html rename to tests/wpt/tests/css/css-tables/tentative/table-fixed-minmax.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/table-height-redistribution.html b/tests/wpt/tests/css/css-tables/tentative/table-height-redistribution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/table-height-redistribution.html rename to tests/wpt/tests/css/css-tables/tentative/table-height-redistribution.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/table-minmax.html b/tests/wpt/tests/css/css-tables/tentative/table-minmax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/table-minmax.html rename to tests/wpt/tests/css/css-tables/tentative/table-minmax.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/table-quirks.html b/tests/wpt/tests/css/css-tables/tentative/table-quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/table-quirks.html rename to tests/wpt/tests/css/css-tables/tentative/table-quirks.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/table-width-redistribution-fixed-padding.html b/tests/wpt/tests/css/css-tables/tentative/table-width-redistribution-fixed-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/table-width-redistribution-fixed-padding.html rename to tests/wpt/tests/css/css-tables/tentative/table-width-redistribution-fixed-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/table-width-redistribution-fixed.html b/tests/wpt/tests/css/css-tables/tentative/table-width-redistribution-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/table-width-redistribution-fixed.html rename to tests/wpt/tests/css/css-tables/tentative/table-width-redistribution-fixed.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/table-width-redistribution.html b/tests/wpt/tests/css/css-tables/tentative/table-width-redistribution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/table-width-redistribution.html rename to tests/wpt/tests/css/css-tables/tentative/table-width-redistribution.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/tbody-height-redistribution.html b/tests/wpt/tests/css/css-tables/tentative/tbody-height-redistribution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/tbody-height-redistribution.html rename to tests/wpt/tests/css/css-tables/tentative/tbody-height-redistribution.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/td-box-sizing-001.html b/tests/wpt/tests/css/css-tables/tentative/td-box-sizing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/td-box-sizing-001.html rename to tests/wpt/tests/css/css-tables/tentative/td-box-sizing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/td-box-sizing-002.html b/tests/wpt/tests/css/css-tables/tentative/td-box-sizing-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/td-box-sizing-002.html rename to tests/wpt/tests/css/css-tables/tentative/td-box-sizing-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/td-box-sizing-003.html b/tests/wpt/tests/css/css-tables/tentative/td-box-sizing-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tentative/td-box-sizing-003.html rename to tests/wpt/tests/css/css-tables/tentative/td-box-sizing-003.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tfoot-crash-print.html b/tests/wpt/tests/css/css-tables/tfoot-crash-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tfoot-crash-print.html rename to tests/wpt/tests/css/css-tables/tfoot-crash-print.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/th-text-align-ref.html b/tests/wpt/tests/css/css-tables/th-text-align-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/th-text-align-ref.html rename to tests/wpt/tests/css/css-tables/th-text-align-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/th-text-align.html b/tests/wpt/tests/css/css-tables/th-text-align.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/th-text-align.html rename to tests/wpt/tests/css/css-tables/th-text-align.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/toggle-row-display-property-001-ref.html b/tests/wpt/tests/css/css-tables/toggle-row-display-property-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/toggle-row-display-property-001-ref.html rename to tests/wpt/tests/css/css-tables/toggle-row-display-property-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/toggle-row-display-property-001.html b/tests/wpt/tests/css/css-tables/toggle-row-display-property-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/toggle-row-display-property-001.html rename to tests/wpt/tests/css/css-tables/toggle-row-display-property-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/tools/markup-generator.html b/tests/wpt/tests/css/css-tables/tools/markup-generator.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/tools/markup-generator.html rename to tests/wpt/tests/css/css-tables/tools/markup-generator.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-border-spacing.html b/tests/wpt/tests/css/css-tables/visibility-collapse-border-spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-border-spacing.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-border-spacing.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-col-001.html b/tests/wpt/tests/css/css-tables/visibility-collapse-col-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-col-001.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-col-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-col-002.html b/tests/wpt/tests/css/css-tables/visibility-collapse-col-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-col-002.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-col-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-col-003.html b/tests/wpt/tests/css/css-tables/visibility-collapse-col-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-col-003.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-col-003.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-col-004-dynamic.html b/tests/wpt/tests/css/css-tables/visibility-collapse-col-004-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-col-004-dynamic.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-col-004-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-col-005.html b/tests/wpt/tests/css/css-tables/visibility-collapse-col-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-col-005.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-col-005.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-colspan-001.html b/tests/wpt/tests/css/css-tables/visibility-collapse-colspan-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-colspan-001.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-colspan-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-colspan-002.html b/tests/wpt/tests/css/css-tables/visibility-collapse-colspan-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-colspan-002.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-colspan-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-colspan-003-ref.html b/tests/wpt/tests/css/css-tables/visibility-collapse-colspan-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-colspan-003-ref.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-colspan-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-colspan-003.html b/tests/wpt/tests/css/css-tables/visibility-collapse-colspan-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-colspan-003.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-colspan-003.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-colspan-crash.html b/tests/wpt/tests/css/css-tables/visibility-collapse-colspan-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-colspan-crash.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-colspan-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-non-rowcol-001.html b/tests/wpt/tests/css/css-tables/visibility-collapse-non-rowcol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-non-rowcol-001.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-non-rowcol-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-001.html b/tests/wpt/tests/css/css-tables/visibility-collapse-row-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-001.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-row-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-002-dynamic.html b/tests/wpt/tests/css/css-tables/visibility-collapse-row-002-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-002-dynamic.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-row-002-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-003-dynamic.html b/tests/wpt/tests/css/css-tables/visibility-collapse-row-003-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-003-dynamic.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-row-003-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-004.html b/tests/wpt/tests/css/css-tables/visibility-collapse-row-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-004.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-row-004.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-005.html b/tests/wpt/tests/css/css-tables/visibility-collapse-row-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-005.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-row-005.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-group-001.html b/tests/wpt/tests/css/css-tables/visibility-collapse-row-group-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-group-001.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-row-group-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-group-002.html b/tests/wpt/tests/css/css-tables/visibility-collapse-row-group-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-row-group-002.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-row-group-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowcol-001.html b/tests/wpt/tests/css/css-tables/visibility-collapse-rowcol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowcol-001.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-rowcol-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowcol-002.html b/tests/wpt/tests/css/css-tables/visibility-collapse-rowcol-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowcol-002.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-rowcol-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-001.html b/tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-001.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-002-border-separate.html b/tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-002-border-separate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-002-border-separate.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-002-border-separate.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-002.html b/tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-002.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-003-border-separate.html b/tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-003-border-separate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-003-border-separate.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-003-border-separate.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-003.html b/tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-003.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-003.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-004-dynamic.html b/tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-004-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-004-dynamic.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-004-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-005-ref.html b/tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-005-ref.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-005.html b/tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-005.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-005.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-crash.html b/tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-collapse-rowspan-crash.html rename to tests/wpt/tests/css/css-tables/visibility-collapse-rowspan-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-hidden-col-001.html b/tests/wpt/tests/css/css-tables/visibility-hidden-col-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-hidden-col-001.html rename to tests/wpt/tests/css/css-tables/visibility-hidden-col-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-hidden-collapsed-borders.html b/tests/wpt/tests/css/css-tables/visibility-hidden-collapsed-borders.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-hidden-collapsed-borders.html rename to tests/wpt/tests/css/css-tables/visibility-hidden-collapsed-borders.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-hidden-nested-001.html b/tests/wpt/tests/css/css-tables/visibility-hidden-nested-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-hidden-nested-001.html rename to tests/wpt/tests/css/css-tables/visibility-hidden-nested-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-hidden-nested-002.html b/tests/wpt/tests/css/css-tables/visibility-hidden-nested-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-hidden-nested-002.html rename to tests/wpt/tests/css/css-tables/visibility-hidden-nested-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-hidden-row-001.html b/tests/wpt/tests/css/css-tables/visibility-hidden-row-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-hidden-row-001.html rename to tests/wpt/tests/css/css-tables/visibility-hidden-row-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/visibility-hidden-row-002.html b/tests/wpt/tests/css/css-tables/visibility-hidden-row-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/visibility-hidden-row-002.html rename to tests/wpt/tests/css/css-tables/visibility-hidden-row-002.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/whitespace-001-ref.html b/tests/wpt/tests/css/css-tables/whitespace-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/whitespace-001-ref.html rename to tests/wpt/tests/css/css-tables/whitespace-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/whitespace-001.html b/tests/wpt/tests/css/css-tables/whitespace-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/whitespace-001.html rename to tests/wpt/tests/css/css-tables/whitespace-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/computing-column-measure-0.html b/tests/wpt/tests/css/css-tables/width-distribution/computing-column-measure-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/width-distribution/computing-column-measure-0.html rename to tests/wpt/tests/css/css-tables/width-distribution/computing-column-measure-0.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/computing-column-measure-1.html b/tests/wpt/tests/css/css-tables/width-distribution/computing-column-measure-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/width-distribution/computing-column-measure-1.html rename to tests/wpt/tests/css/css-tables/width-distribution/computing-column-measure-1.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/computing-column-measure-2.html b/tests/wpt/tests/css/css-tables/width-distribution/computing-column-measure-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/width-distribution/computing-column-measure-2.html rename to tests/wpt/tests/css/css-tables/width-distribution/computing-column-measure-2.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/computing-table-width-0.html b/tests/wpt/tests/css/css-tables/width-distribution/computing-table-width-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/width-distribution/computing-table-width-0.html rename to tests/wpt/tests/css/css-tables/width-distribution/computing-table-width-0.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/computing-table-width-1.html b/tests/wpt/tests/css/css-tables/width-distribution/computing-table-width-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/width-distribution/computing-table-width-1.html rename to tests/wpt/tests/css/css-tables/width-distribution/computing-table-width-1.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/distribution-algo-1.html b/tests/wpt/tests/css/css-tables/width-distribution/distribution-algo-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/width-distribution/distribution-algo-1.html rename to tests/wpt/tests/css/css-tables/width-distribution/distribution-algo-1.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/distribution-algo-2.html b/tests/wpt/tests/css/css-tables/width-distribution/distribution-algo-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/width-distribution/distribution-algo-2.html rename to tests/wpt/tests/css/css-tables/width-distribution/distribution-algo-2.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/distribution-algo-min-content-guess.html b/tests/wpt/tests/css/css-tables/width-distribution/distribution-algo-min-content-guess.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/width-distribution/distribution-algo-min-content-guess.html rename to tests/wpt/tests/css/css-tables/width-distribution/distribution-algo-min-content-guess.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/distribution-algo-min-content-percent-guess.html b/tests/wpt/tests/css/css-tables/width-distribution/distribution-algo-min-content-percent-guess.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/width-distribution/distribution-algo-min-content-percent-guess.html rename to tests/wpt/tests/css/css-tables/width-distribution/distribution-algo-min-content-percent-guess.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/distribution-algo-min-content-specified-guess.1.html b/tests/wpt/tests/css/css-tables/width-distribution/distribution-algo-min-content-specified-guess.1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/width-distribution/distribution-algo-min-content-specified-guess.1.html rename to tests/wpt/tests/css/css-tables/width-distribution/distribution-algo-min-content-specified-guess.1.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/distribution-algo-min-content-specified-guess.html b/tests/wpt/tests/css/css-tables/width-distribution/distribution-algo-min-content-specified-guess.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/width-distribution/distribution-algo-min-content-specified-guess.html rename to tests/wpt/tests/css/css-tables/width-distribution/distribution-algo-min-content-specified-guess.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/td-with-subpixel-padding-vertical-rl.html b/tests/wpt/tests/css/css-tables/width-distribution/td-with-subpixel-padding-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/width-distribution/td-with-subpixel-padding-vertical-rl.html rename to tests/wpt/tests/css/css-tables/width-distribution/td-with-subpixel-padding-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/td-with-subpixel-padding.html b/tests/wpt/tests/css/css-tables/width-distribution/td-with-subpixel-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/width-distribution/td-with-subpixel-padding.html rename to tests/wpt/tests/css/css-tables/width-distribution/td-with-subpixel-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/zero-rowspan-001-ref.html b/tests/wpt/tests/css/css-tables/zero-rowspan-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/zero-rowspan-001-ref.html rename to tests/wpt/tests/css/css-tables/zero-rowspan-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/zero-rowspan-001.html b/tests/wpt/tests/css/css-tables/zero-rowspan-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/zero-rowspan-001.html rename to tests/wpt/tests/css/css-tables/zero-rowspan-001.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/zero-rowspan-002-ref.html b/tests/wpt/tests/css/css-tables/zero-rowspan-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/zero-rowspan-002-ref.html rename to tests/wpt/tests/css/css-tables/zero-rowspan-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-tables/zero-rowspan-002.html b/tests/wpt/tests/css/css-tables/zero-rowspan-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-tables/zero-rowspan-002.html rename to tests/wpt/tests/css/css-tables/zero-rowspan-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/META.yml b/tests/wpt/tests/css/css-text-decor/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/META.yml rename to tests/wpt/tests/css/css-text-decor/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/animations/discrete-no-interpolation.html b/tests/wpt/tests/css/css-text-decor/animations/discrete-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/animations/discrete-no-interpolation.html rename to tests/wpt/tests/css/css-text-decor/animations/discrete-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/animations/text-underline-offset-interpolation.html b/tests/wpt/tests/css/css-text-decor/animations/text-underline-offset-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/animations/text-underline-offset-interpolation.html rename to tests/wpt/tests/css/css-text-decor/animations/text-underline-offset-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/crashtests/text-decoration-on-empty-first-line-crash.html b/tests/wpt/tests/css/css-text-decor/crashtests/text-decoration-on-empty-first-line-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/crashtests/text-decoration-on-empty-first-line-crash.html rename to tests/wpt/tests/css/css-text-decor/crashtests/text-decoration-on-empty-first-line-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/crashtests/text-decoration-on-pseudo-first-line-crash.html b/tests/wpt/tests/css/css-text-decor/crashtests/text-decoration-on-pseudo-first-line-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/crashtests/text-decoration-on-pseudo-first-line-crash.html rename to tests/wpt/tests/css/css-text-decor/crashtests/text-decoration-on-pseudo-first-line-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/inheritance.html b/tests/wpt/tests/css/css-text-decor/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/inheritance.html rename to tests/wpt/tests/css/css-text-decor/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-dashed-ref.html b/tests/wpt/tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-dashed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-dashed-ref.html rename to tests/wpt/tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-dashed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-double-ref.html b/tests/wpt/tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-double-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-double-ref.html rename to tests/wpt/tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-double-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-solid-ref.html b/tests/wpt/tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-solid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-solid-ref.html rename to tests/wpt/tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-solid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-wavy-ref.html b/tests/wpt/tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-wavy-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-wavy-ref.html rename to tests/wpt/tests/css/css-text-decor/invalidation/reference/text-decoration-invalidation-wavy-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/invalidation/text-decoration-invalidation-dashed.html b/tests/wpt/tests/css/css-text-decor/invalidation/text-decoration-invalidation-dashed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/invalidation/text-decoration-invalidation-dashed.html rename to tests/wpt/tests/css/css-text-decor/invalidation/text-decoration-invalidation-dashed.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/invalidation/text-decoration-invalidation-double.html b/tests/wpt/tests/css/css-text-decor/invalidation/text-decoration-invalidation-double.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/invalidation/text-decoration-invalidation-double.html rename to tests/wpt/tests/css/css-text-decor/invalidation/text-decoration-invalidation-double.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/invalidation/text-decoration-invalidation-solid.html b/tests/wpt/tests/css/css-text-decor/invalidation/text-decoration-invalidation-solid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/invalidation/text-decoration-invalidation-solid.html rename to tests/wpt/tests/css/css-text-decor/invalidation/text-decoration-invalidation-solid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/invalidation/text-decoration-invalidation-wavy.html b/tests/wpt/tests/css/css-text-decor/invalidation/text-decoration-invalidation-wavy.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/invalidation/text-decoration-invalidation-wavy.html rename to tests/wpt/tests/css/css-text-decor/invalidation/text-decoration-invalidation-wavy.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/invalidation/text-decoration-thickness-ref.html b/tests/wpt/tests/css/css-text-decor/invalidation/text-decoration-thickness-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/invalidation/text-decoration-thickness-ref.html rename to tests/wpt/tests/css/css-text-decor/invalidation/text-decoration-thickness-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/invalidation/text-decoration-thickness.html b/tests/wpt/tests/css/css-text-decor/invalidation/text-decoration-thickness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/invalidation/text-decoration-thickness.html rename to tests/wpt/tests/css/css-text-decor/invalidation/text-decoration-thickness.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/line-through-vertical.html b/tests/wpt/tests/css/css-text-decor/line-through-vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/line-through-vertical.html rename to tests/wpt/tests/css/css-text-decor/line-through-vertical.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-color-computed.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-color-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-color-computed.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-color-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-color-invalid.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-color-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-color-invalid.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-color-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-color-valid.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-color-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-color-valid.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-color-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-computed.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-computed.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-invalid.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-invalid.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-line-computed.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-line-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-line-computed.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-line-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-line-invalid.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-line-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-line-invalid.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-line-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-line-valid.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-line-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-line-valid.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-line-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-shorthand.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-shorthand.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-skip-ink-computed.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-skip-ink-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-skip-ink-computed.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-skip-ink-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-skip-ink-invalid.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-skip-ink-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-skip-ink-invalid.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-skip-ink-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-skip-ink-valid.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-skip-ink-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-skip-ink-valid.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-skip-ink-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-style-computed.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-style-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-style-computed.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-style-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-style-invalid.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-style-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-style-invalid.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-style-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-style-valid.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-style-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-style-valid.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-style-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-valid.html b/tests/wpt/tests/css/css-text-decor/parsing/text-decoration-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-valid.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-decoration-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-emphasis-computed.html b/tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-emphasis-computed.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-emphasis-position-computed.html b/tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-position-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-emphasis-position-computed.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-position-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-emphasis-style-computed.html b/tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-style-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-emphasis-style-computed.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-emphasis-style-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-underline-position-computed.html b/tests/wpt/tests/css/css-text-decor/parsing/text-underline-position-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-underline-position-computed.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-underline-position-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-underline-position-invalid.html b/tests/wpt/tests/css/css-text-decor/parsing/text-underline-position-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-underline-position-invalid.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-underline-position-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-underline-position-valid.html b/tests/wpt/tests/css/css-text-decor/parsing/text-underline-position-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-underline-position-valid.html rename to tests/wpt/tests/css/css-text-decor/parsing/text-underline-position-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/line-through-vertical-ref.html b/tests/wpt/tests/css/css-text-decor/reference/line-through-vertical-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/line-through-vertical-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/line-through-vertical-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/ruby-text-decoration-01-ref.html b/tests/wpt/tests/css/css-text-decor/reference/ruby-text-decoration-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/ruby-text-decoration-01-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/ruby-text-decoration-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-combine-emphasis-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-combine-emphasis-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-combine-emphasis-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-combine-emphasis-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-color-recalc-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-color-recalc-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-color-recalc-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-color-recalc-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-color-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-color-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-color-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-color-selection-pseudo-01-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-color-selection-pseudo-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-color-selection-pseudo-01-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-color-selection-pseudo-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-decorating-box-001-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-decorating-box-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-decorating-box-001-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-decorating-box-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-dotted-001-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-dotted-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-dotted-001-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-dotted-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-dotted-002-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-dotted-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-dotted-002-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-dotted-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-line-010-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-line-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-line-010-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-line-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-line-011-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-line-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-line-011-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-line-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-line-012-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-line-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-line-012-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-line-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-line-013-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-line-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-line-013-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-line-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-line-recalc-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-line-recalc-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-line-recalc-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-line-recalc-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-line-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-line-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-line-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-line-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-lines-001-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-lines-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-lines-001-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-lines-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-propagation-01-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-propagation-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-propagation-01-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-propagation-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-propagation-02-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-propagation-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-propagation-02-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-propagation-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-propagation-03-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-propagation-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-propagation-03-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-propagation-03-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-propagation-04-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-propagation-04-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-propagation-04-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-propagation-04-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-propagation-05-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-propagation-05-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-propagation-05-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-propagation-05-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-propagation-display-contents-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-propagation-display-contents-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-propagation-display-contents-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-propagation-display-contents-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-propagation-dynamic-001-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-propagation-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-propagation-dynamic-001-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-propagation-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-shorthands-001-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-shorthands-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-shorthands-001-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-shorthands-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-shorthands-002-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-shorthands-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-shorthands-002-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-shorthands-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-001-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-001-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-002-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-002-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-003-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-003-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-003-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-003-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-003-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-003-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-004-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-004-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-004-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-004-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-005-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-005-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-005-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-005-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-sidewayslr-001-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-sidewayslr-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-sidewayslr-001-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-sidewayslr-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-sidewaysrl-001-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-sidewaysrl-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-sidewaysrl-001-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-sidewaysrl-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-upright-001-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-upright-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-upright-001-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-upright-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-upright-001-offset-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-upright-001-offset-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-upright-001-offset-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-upright-001-offset-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-upright-002-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-upright-002-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-upright-002-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-upright-002-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-vertical-001-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-vertical-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-vertical-001-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-vertical-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-vertical-001-offset-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-vertical-001-offset-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-vertical-001-offset-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-vertical-001-offset-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-vertical-002-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-vertical-002-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-vertical-002-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-ink-vertical-002-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-spaces-001-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-spaces-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-spaces-001-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-spaces-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-spaces-002-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-spaces-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-spaces-002-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-skip-spaces-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-style-multiple-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-style-multiple-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-style-multiple-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-style-multiple-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-style-recalc-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-style-recalc-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-style-recalc-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-style-recalc-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-subelements-001-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-subelements-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-subelements-001-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-subelements-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-subelements-002-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-subelements-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-subelements-002-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-subelements-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-subelements-003-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-subelements-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-subelements-003-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-subelements-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-subelements-004-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-subelements-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-subelements-004-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-subelements-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-subelements-005-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-subelements-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-subelements-005-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-subelements-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-001-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-001-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-fixed-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-fixed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-fixed-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-fixed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-from-font-variable-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-from-font-variable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-from-font-variable-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-from-font-variable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-green-rect-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-green-rect-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-green-rect-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-green-rect-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-ink-skip-dilation-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-ink-skip-dilation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-ink-skip-dilation-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-ink-skip-dilation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-length-rounding-min-val-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-length-rounding-min-val-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-length-rounding-min-val-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-length-rounding-min-val-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-length-rounding-ref.tentative.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-length-rounding-ref.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-length-rounding-ref.tentative.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-length-rounding-ref.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-percent-001-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-percent-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-percent-001-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-percent-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-scroll-001-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-scroll-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-scroll-001-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-scroll-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-single-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-single-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-single-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-single-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-vertical-green-rect-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-vertical-green-rect-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-thickness-vertical-green-rect-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-vertical-green-rect-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-underline-position-horizontal-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-underline-position-horizontal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-underline-position-horizontal-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-underline-position-horizontal-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-underline-position-vertical-ja-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-underline-position-vertical-ja-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-underline-position-vertical-ja-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-underline-position-vertical-ja-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-underline-position-vertical-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-underline-position-vertical-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-underline-position-vertical-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-underline-position-vertical-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-underline-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-underline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-underline-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-underline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-wavy-covers-whole-line-length-001-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-wavy-covers-whole-line-length-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-wavy-covers-whole-line-length-001-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-decoration-wavy-covers-whole-line-length-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-color-001-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-color-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-color-001-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-color-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-over-left-001-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-over-left-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-over-left-001-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-over-left-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-over-left-002-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-over-left-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-over-left-002-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-over-left-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-over-right-001-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-over-right-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-over-right-001-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-over-right-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-over-right-002-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-over-right-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-over-right-002-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-over-right-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-under-left-001-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-under-left-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-under-left-001-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-under-left-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-under-left-002-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-under-left-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-under-left-002-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-under-left-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-under-right-001-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-under-right-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-under-right-001-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-under-right-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-under-right-002-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-under-right-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-position-under-right-002-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-position-under-right-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-001-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-001-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-002-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-002-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-007.html b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-007.html rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-008-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-008-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-010-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-010-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-012-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-012-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-021-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-021-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-filled-001-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-filled-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-filled-001-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-filled-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-none-001-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-none-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-none-001-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-none-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-open-001-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-open-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-open-001-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-open-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-shape-001-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-shape-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-shape-001-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-shape-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-string-001-ref.xht b/tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-string-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-emphasis-style-string-001-ref.xht rename to tests/wpt/tests/css/css-text-decor/reference/text-emphasis-style-string-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-001-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-001-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-002-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-002-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-negative-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-negative-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-negative-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-negative-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-overline-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-overline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-overline-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-overline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-overline-vertical-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-overline-vertical-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-overline-vertical-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-overline-vertical-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-scroll-001-notref.html b/tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-scroll-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-scroll-001-notref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-scroll-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-scroll-001-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-scroll-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-scroll-001-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-scroll-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-variable-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-variable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-variable-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-variable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-vertical-001-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-vertical-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-vertical-001-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-vertical-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-vertical-002-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-vertical-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-vertical-002-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-vertical-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-vertical-003-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-vertical-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-vertical-003-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-vertical-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-zero-position-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-zero-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-offset-zero-position-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-underline-offset-zero-position-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-position-001-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-underline-position-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-position-001-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-underline-position-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-position-from-font-variable-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-underline-position-from-font-variable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-position-from-font-variable-ref.html rename to tests/wpt/tests/css/css-text-decor/reference/text-underline-position-from-font-variable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/resources/UnderlineTest-Close.ttf b/tests/wpt/tests/css/css-text-decor/resources/UnderlineTest-Close.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/resources/UnderlineTest-Close.ttf rename to tests/wpt/tests/css/css-text-decor/resources/UnderlineTest-Close.ttf diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/resources/UnderlineTest-Far.ttf b/tests/wpt/tests/css/css-text-decor/resources/UnderlineTest-Far.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/resources/UnderlineTest-Far.ttf rename to tests/wpt/tests/css/css-text-decor/resources/UnderlineTest-Far.ttf diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/resources/UnderlineTest-Thick.ttf b/tests/wpt/tests/css/css-text-decor/resources/UnderlineTest-Thick.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/resources/UnderlineTest-Thick.ttf rename to tests/wpt/tests/css/css-text-decor/resources/UnderlineTest-Thick.ttf diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/resources/UnderlineTest-Thin.ttf b/tests/wpt/tests/css/css-text-decor/resources/UnderlineTest-Thin.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/resources/UnderlineTest-Thin.ttf rename to tests/wpt/tests/css/css-text-decor/resources/UnderlineTest-Thin.ttf diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/resources/UnderlineTest-VF.ttf b/tests/wpt/tests/css/css-text-decor/resources/UnderlineTest-VF.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/resources/UnderlineTest-VF.ttf rename to tests/wpt/tests/css/css-text-decor/resources/UnderlineTest-VF.ttf diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/ruby-text-decoration-01.html b/tests/wpt/tests/css/css-text-decor/ruby-text-decoration-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/ruby-text-decoration-01.html rename to tests/wpt/tests/css/css-text-decor/ruby-text-decoration-01.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-combine-emphasis.html b/tests/wpt/tests/css/css-text-decor/text-combine-emphasis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-combine-emphasis.html rename to tests/wpt/tests/css/css-text-decor/text-combine-emphasis.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-001-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-001-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-002-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-002-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-003-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-003-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-004-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-004-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-040-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-040-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-040-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-040-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-040a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-040a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-040a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-040a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-041-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-041-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-041-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-041-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-044-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-044-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-044-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-044-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-045-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-045-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-045-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-045-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-046a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-046a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-046a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-046a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-048-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-048-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-048-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-048-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-048a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-048a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-048a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-048a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-049-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-049-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-049-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-049-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-082-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-082-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-082-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-082-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-085-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-085-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-085-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-085-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-090-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-090-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-090-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-090-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-090a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-090a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-090a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-090a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-091-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-091-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-091-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-091-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-091a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-091a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-091a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-091a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-092-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-092-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-092-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-092-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-092a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-092a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-092a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-092a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-095a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-095a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-095a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-095a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-096-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-096-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-096-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-096-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-096a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-096a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-096a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-096a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-097-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-097-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-097-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-097-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-097a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-097a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-097a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-097a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-color-recalc-002-ref.html b/tests/wpt/tests/css/css-text-decor/text-decoration-color-recalc-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-color-recalc-002-ref.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-color-recalc-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-color-recalc-002.html b/tests/wpt/tests/css/css-text-decor/text-decoration-color-recalc-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-color-recalc-002.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-color-recalc-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-color-recalc.html b/tests/wpt/tests/css/css-text-decor/text-decoration-color-recalc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-color-recalc.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-color-recalc.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-color-selection-002.html b/tests/wpt/tests/css/css-text-decor/text-decoration-color-selection-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-color-selection-002.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-color-selection-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-color-selection-pseudo-01.html b/tests/wpt/tests/css/css-text-decor/text-decoration-color-selection-pseudo-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-color-selection-pseudo-01.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-color-selection-pseudo-01.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-color.html b/tests/wpt/tests/css/css-text-decor/text-decoration-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-color.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-color.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-decorating-box-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-decorating-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-decorating-box-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-decorating-box-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-dotted-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-dotted-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-dotted-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-dotted-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-dotted-002.html b/tests/wpt/tests/css/css-text-decor/text-decoration-dotted-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-dotted-002.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-dotted-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-001-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-001-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-002-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-002-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-003-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-003-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-004-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-004-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-010.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-line-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-010.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-011.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-line-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-011.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-012.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-line-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-012.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-013.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-line-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-013.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-014.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-line-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-014.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-040-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-040-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-040-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-040-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-040a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-040a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-040a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-040a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-041-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-041-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-041-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-041-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-044-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-044-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-044-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-044-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-045-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-045-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-045-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-045-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-046a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-046a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-046a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-046a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-048-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-048-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-048-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-048-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-048a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-048a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-048a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-048a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-049-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-049-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-049-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-049-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-082-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-082-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-082-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-082-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-085-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-085-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-085-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-085-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-090-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-090-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-090-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-090-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-090a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-090a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-090a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-090a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-091-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-091-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-091-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-091-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-091a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-091a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-091a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-091a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-092-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-092-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-092-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-092-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-092a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-092a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-092a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-092a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-095-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-095-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-095-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-095-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-095a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-095a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-095a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-095a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-096-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-096-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-096-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-096-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-096a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-096a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-096a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-096a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-097-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-097-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-097-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-097-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-097a-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-097a-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-097a-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-097a-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-grammar-error-color-001-ref.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-grammar-error-color-001-ref.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-grammar-error-color-001.optional.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-001.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-grammar-error-color-001.optional.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-001.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-grammar-error-color-002-ref.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-grammar-error-color-002-ref.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-grammar-error-color-002.optional.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-002.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-grammar-error-color-002.optional.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-002.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001-ref.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001-ref.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001.optional.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001.optional.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-grammar-error-color-dynamic-001.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-recalc.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-recalc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-recalc.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-recalc.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-spelling-error-001-crash.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-spelling-error-001-crash.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-spelling-error-color-001-ref.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-spelling-error-color-001-ref.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-spelling-error-color-001.optional.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-001.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-spelling-error-color-001.optional.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-001.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-spelling-error-color-002-ref.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-spelling-error-color-002-ref.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-spelling-error-color-002.optional.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-002.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-spelling-error-color-002.optional.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-002.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001-ref.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001-ref.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001.optional.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001.optional.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-spelling-error-color-dynamic-001.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-through-wavy-covers-whole-line-length-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line-through-wavy-covers-whole-line-length-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line-through-wavy-covers-whole-line-length-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line-through-wavy-covers-whole-line-length-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line.html b/tests/wpt/tests/css/css-text-decor/text-decoration-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-line.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-line.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-lines-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-lines-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-lines-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-lines-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-overline-wavy-covers-whole-line-length-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-overline-wavy-covers-whole-line-length-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-overline-wavy-covers-whole-line-length-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-overline-wavy-covers-whole-line-length-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-01.html b/tests/wpt/tests/css/css-text-decor/text-decoration-propagation-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-01.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-propagation-01.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-02.html b/tests/wpt/tests/css/css-text-decor/text-decoration-propagation-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-02.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-propagation-02.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-03.html b/tests/wpt/tests/css/css-text-decor/text-decoration-propagation-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-03.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-propagation-03.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-04.html b/tests/wpt/tests/css/css-text-decor/text-decoration-propagation-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-04.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-propagation-04.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-05.html b/tests/wpt/tests/css/css-text-decor/text-decoration-propagation-05.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-05.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-propagation-05.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-display-contents.html b/tests/wpt/tests/css/css-text-decor/text-decoration-propagation-display-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-display-contents.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-propagation-display-contents.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-dynamic-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-propagation-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-dynamic-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-propagation-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-shadow.html b/tests/wpt/tests/css/css-text-decor/text-decoration-propagation-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-propagation-shadow.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-propagation-shadow.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-serialization.tentative.html b/tests/wpt/tests/css/css-text-decor/text-decoration-serialization.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-serialization.tentative.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-serialization.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-shorthands-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-shorthands-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-shorthands-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-shorthands-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-shorthands-002.html b/tests/wpt/tests/css/css-text-decor/text-decoration-shorthands-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-shorthands-002.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-shorthands-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-002.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-002.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-003.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-003.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-004.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-004.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-005.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-005.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-sidewayslr-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-sidewayslr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-sidewayslr-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-sidewayslr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-sidewayslr-002.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-sidewayslr-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-sidewayslr-002.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-sidewayslr-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-sidewaysrl-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-sidewaysrl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-sidewaysrl-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-sidewaysrl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-sidewaysrl-002.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-sidewaysrl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-sidewaysrl-002.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-sidewaysrl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-upright-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-upright-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-upright-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-upright-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-upright-002.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-upright-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-upright-002.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-upright-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-vertical-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-vertical-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-vertical-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-vertical-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-vertical-002.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-vertical-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-vertical-002.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink-vertical-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-ink.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-spaces-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-spaces-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-spaces-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-spaces-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-spaces-002.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-spaces-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-spaces-002.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-spaces-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-spaces-003.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-spaces-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-spaces-003.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-spaces-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-spaces-004.html b/tests/wpt/tests/css/css-text-decor/text-decoration-skip-spaces-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-spaces-004.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-skip-spaces-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-style-multiple.html b/tests/wpt/tests/css/css-text-decor/text-decoration-style-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-style-multiple.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-style-multiple.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-style-recalc.html b/tests/wpt/tests/css/css-text-decor/text-decoration-style-recalc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-style-recalc.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-style-recalc.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-subelements-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-subelements-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-subelements-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-subelements-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-subelements-002.html b/tests/wpt/tests/css/css-text-decor/text-decoration-subelements-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-subelements-002.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-subelements-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-subelements-003.html b/tests/wpt/tests/css/css-text-decor/text-decoration-subelements-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-subelements-003.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-subelements-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-subelements-004.html b/tests/wpt/tests/css/css-text-decor/text-decoration-subelements-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-subelements-004.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-subelements-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-subelements-005.html b/tests/wpt/tests/css/css-text-decor/text-decoration-subelements-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-subelements-005.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-subelements-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-computed.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-computed.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-fixed.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-fixed.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-fixed.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-from-font-variable.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-from-font-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-from-font-variable.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-from-font-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-from-zero-sized-font.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-from-zero-sized-font.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-from-zero-sized-font.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-from-zero-sized-font.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-initial.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-initial.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-ink-skip-dilation.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-ink-skip-dilation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-ink-skip-dilation.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-ink-skip-dilation.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-invalid.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-invalid.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-length-rounding-down.tentative.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-length-rounding-down.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-length-rounding-down.tentative.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-length-rounding-down.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-length-rounding-min-val.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-length-rounding-min-val.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-length-rounding-min-val.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-length-rounding-min-val.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-length-rounding-up.tentative.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-length-rounding-up.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-length-rounding-up.tentative.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-length-rounding-up.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-linethrough-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-linethrough-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-linethrough-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-linethrough-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-nesting-manual.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-nesting-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-nesting-manual.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-nesting-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-overline-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-overline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-overline-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-overline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-percent-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-percent-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-percent-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-percent-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-scroll-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-scroll-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-scroll-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-scroll-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-single.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-single.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-single.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-single.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-underline-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-underline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-underline-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-underline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-valid.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-valid.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-vertical-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-vertical-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-vertical-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-vertical-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-vertical-002.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-vertical-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-thickness-vertical-002.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-thickness-vertical-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-underline-position-horizontal.html b/tests/wpt/tests/css/css-text-decor/text-decoration-underline-position-horizontal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-underline-position-horizontal.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-underline-position-horizontal.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-underline-position-vertical-ja.html b/tests/wpt/tests/css/css-text-decor/text-decoration-underline-position-vertical-ja.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-underline-position-vertical-ja.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-underline-position-vertical-ja.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-underline-position-vertical.html b/tests/wpt/tests/css/css-text-decor/text-decoration-underline-position-vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-underline-position-vertical.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-underline-position-vertical.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-underline-wavy-covers-whole-line-length-001.html b/tests/wpt/tests/css/css-text-decor/text-decoration-underline-wavy-covers-whole-line-length-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-underline-wavy-covers-whole-line-length-001.html rename to tests/wpt/tests/css/css-text-decor/text-decoration-underline-wavy-covers-whole-line-length-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-001.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-visibility-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-001.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-visibility-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-002.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-visibility-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-002.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-visibility-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-003.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-visibility-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-003.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-visibility-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-004.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-visibility-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-004.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-visibility-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-005.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-visibility-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-005.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-visibility-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-006.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-visibility-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-006.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-visibility-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-007.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-visibility-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-007.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-visibility-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-008.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-visibility-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-008.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-visibility-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-009.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-visibility-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-009.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-visibility-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-010.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-visibility-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-010.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-visibility-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-011.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-visibility-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-011.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-visibility-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-012.xht b/tests/wpt/tests/css/css-text-decor/text-decoration-visibility-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-visibility-012.xht rename to tests/wpt/tests/css/css-text-decor/text-decoration-visibility-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-color-001.xht b/tests/wpt/tests/css/css-text-decor/text-emphasis-color-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-color-001.xht rename to tests/wpt/tests/css/css-text-decor/text-emphasis-color-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-color-property-001-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-color-property-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-color-property-001-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-color-property-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-color-property-001.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-color-property-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-color-property-001.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-color-property-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-color-property-001a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-color-property-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-color-property-001a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-color-property-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-color-property-001b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-color-property-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-color-property-001b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-color-property-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-color-property-002-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-color-property-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-color-property-002-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-color-property-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-color-property-002.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-color-property-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-color-property-002.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-color-property-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-001-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-001-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-001a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-001a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-001b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-001b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-001z.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-001z.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-001z.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-001z.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-002-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-002-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-002a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-002a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-002a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-002a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-002b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-002b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-002b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-002b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-003-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-003-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-003a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-003a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-003a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-003a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-003b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-003b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-003b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-003b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-003c.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-003c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-003c.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-003c.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-003d.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-003d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-003d.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-003d.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-004-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-004-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-004a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-004a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-004a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-004a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-004b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-004b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-004b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-004b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-004c.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-004c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-004c.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-004c.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-004d.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-004d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-line-height-004d.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-line-height-004d.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-over-left-001.xht b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-over-left-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-over-left-001.xht rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-over-left-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-over-left-002.xht b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-over-left-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-over-left-002.xht rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-over-left-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-over-right-001.xht b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-over-right-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-over-right-001.xht rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-over-right-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-over-right-002.xht b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-over-right-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-over-right-002.xht rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-over-right-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-001-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-001-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-001.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-001.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-001a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-001a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-001b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-001b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-001c.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-001c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-001c.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-001c.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-002-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-002-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-002.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-002.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-002a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-002a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-002a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-002a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-002b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-002b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-002b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-002b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-002c.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-002c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-002c.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-002c.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003c.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003c.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003c.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003d.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003d.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003d.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003e.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003e.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003e.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003f.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003f.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003f.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003f.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003g.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003g.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-003g.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-003g.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004c.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004c.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004c.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004d.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004d.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004d.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004e.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004e.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004e.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004f.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004f.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004f.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004f.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004g.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004g.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-004g.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-004g.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005c.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005c.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005c.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005d.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005d.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005d.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005e.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005e.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005e.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005f.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005f.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005f.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005f.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005g.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005g.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-005g.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-005g.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006c.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006c.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006c.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006d.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006d.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006d.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006e.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006e.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006e.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006f.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006f.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006f.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006f.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006g.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006g.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-property-006g.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-property-006g.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-under-left-001.xht b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-under-left-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-under-left-001.xht rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-under-left-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-under-left-002.xht b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-under-left-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-under-left-002.xht rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-under-left-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-under-right-001.xht b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-under-right-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-under-right-001.xht rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-under-right-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-under-right-002.xht b/tests/wpt/tests/css/css-text-decor/text-emphasis-position-under-right-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-under-right-002.xht rename to tests/wpt/tests/css/css-text-decor/text-emphasis-position-under-right-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-property-001.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-property-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-property-001.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-property-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-property-002.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-property-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-property-002.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-property-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-property-003.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-property-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-property-003.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-property-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-property-003a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-property-003a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-property-003a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-property-003a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-property-003b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-property-003b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-property-003b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-property-003b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-property-004.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-property-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-property-004.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-property-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-property-004a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-property-004a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-property-004a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-property-004a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-001-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-001-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-001.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-001.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-002-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-002-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-002.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-002.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-003-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-003-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-003.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-003.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-003a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-003a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-003a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-003a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-004-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-004-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-004.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-004.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-004a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-004a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-ruby-004a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-ruby-004a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-001.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-001.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-002.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-002.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-007.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-007.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-008.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-008.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-010.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-010.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-012.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-012.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-016.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-016.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-021.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-021.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-021.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-filled-001.xht b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-filled-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-filled-001.xht rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-filled-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-none-001.xht b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-none-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-none-001.xht rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-none-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-open-001.xht b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-open-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-open-001.xht rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-open-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-001-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-001-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-001.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-001.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-002-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-002-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-002.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-002.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-003-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-003-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-003.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-003.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-004-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-004-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-004.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-004.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-005-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-005-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-005.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-005.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-005a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-005a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-005a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-005a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-010-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-010-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-010Cc.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-010Cc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-010Cc.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-010Cc.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-010Cf.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-010Cf.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-010Cf.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-010Cf.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-010Cn.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-010Cn.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-010Cn.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-010Cn.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-010Zl.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-010Zl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-010Zl.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-010Zl.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-010Zp.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-010Zp.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-010Zp.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-010Zp.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-010Zs.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-010Zs.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-010Zs.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-010Zs.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-011-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-011-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-011.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-011.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-011a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-011a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-011a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-011a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-011b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-011b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-011b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-011b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-012-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-012-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-012.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-012.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-012a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-012a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-012a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-012a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-012b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-012b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-012b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-012b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-012c.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-012c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-012c.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-012c.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-013-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-013-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-013.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-013.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-013a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-013a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-013a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-013a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-013b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-013b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-013b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-013b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-014-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-014-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-014.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-014.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-014a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-014a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-014a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-014a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-014b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-014b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-014b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-014b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-015-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-015-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-015.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-015.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-015a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-015a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-015a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-015a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-015b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-015b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-015b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-015b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-016-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-016-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-016.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-016.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-016a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-016a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-016a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-016a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-017-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-017-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-017.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-017.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-017a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-017a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-017a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-017a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-017b.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-017b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-017b.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-017b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-018-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-018-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-018.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-018.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-018a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-018a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-018a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-018a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-019-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-019-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-019.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-019.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-019.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-019a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-019a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-019a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-019a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-020-ref.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-020-ref.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-020.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-020.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-020.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-020a.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-020a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-property-020a.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-property-020a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-shape-001.xht b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-shape-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-shape-001.xht rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-shape-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-string-001.xht b/tests/wpt/tests/css/css-text-decor/text-emphasis-style-string-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-style-string-001.xht rename to tests/wpt/tests/css/css-text-decor/text-emphasis-style-string-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-unrepresentable-characters.html b/tests/wpt/tests/css/css-text-decor/text-emphasis-unrepresentable-characters.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-unrepresentable-characters.html rename to tests/wpt/tests/css/css-text-decor/text-emphasis-unrepresentable-characters.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/basic-negcoord-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/basic-negcoord-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/basic-negcoord-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/basic-negcoord-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/basic-negcoord.html b/tests/wpt/tests/css/css-text-decor/text-shadow/basic-negcoord.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/basic-negcoord.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/basic-negcoord.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/basic-opacity-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/basic-opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/basic-opacity-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/basic-opacity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/basic-opacity.html b/tests/wpt/tests/css/css-text-decor/text-shadow/basic-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/basic-opacity.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/basic-opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/basic-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/basic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/basic-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/basic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/basic.html b/tests/wpt/tests/css/css-text-decor/text-shadow/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/basic.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/basic.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/blur-notref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/blur-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/blur-notref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/blur-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/blur.html b/tests/wpt/tests/css/css-text-decor/text-shadow/blur.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/blur.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/blur.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/color-inherit-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/color-inherit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/color-inherit-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/color-inherit-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/color-inherit.html b/tests/wpt/tests/css/css-text-decor/text-shadow/color-inherit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/color-inherit.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/color-inherit.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/color-parserorder-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/color-parserorder-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/color-parserorder-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/color-parserorder-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/color-parserorder.html b/tests/wpt/tests/css/css-text-decor/text-shadow/color-parserorder.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/color-parserorder.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/color-parserorder.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/currentcolor-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/currentcolor-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/currentcolor-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/currentcolor-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/currentcolor.html b/tests/wpt/tests/css/css-text-decor/text-shadow/currentcolor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/currentcolor.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/currentcolor.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/decorations-multiple-zorder-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/decorations-multiple-zorder-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/decorations-multiple-zorder-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/decorations-multiple-zorder-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/decorations-multiple-zorder.html b/tests/wpt/tests/css/css-text-decor/text-shadow/decorations-multiple-zorder.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/decorations-multiple-zorder.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/decorations-multiple-zorder.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/dynamic-blur-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/dynamic-blur-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/dynamic-blur-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/dynamic-blur-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/dynamic-blur.html b/tests/wpt/tests/css/css-text-decor/text-shadow/dynamic-blur.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/dynamic-blur.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/dynamic-blur.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/lineoverflow-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/lineoverflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/lineoverflow-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/lineoverflow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/lineoverflow.html b/tests/wpt/tests/css/css-text-decor/text-shadow/lineoverflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/lineoverflow.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/lineoverflow.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/multiple-noblur-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/multiple-noblur-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/multiple-noblur-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/multiple-noblur-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/multiple-noblur.html b/tests/wpt/tests/css/css-text-decor/text-shadow/multiple-noblur.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/multiple-noblur.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/multiple-noblur.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/overflow-not-scrollable-1-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/overflow-not-scrollable-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/overflow-not-scrollable-1-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/overflow-not-scrollable-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/overflow-not-scrollable-1-ref2.html b/tests/wpt/tests/css/css-text-decor/text-shadow/overflow-not-scrollable-1-ref2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/overflow-not-scrollable-1-ref2.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/overflow-not-scrollable-1-ref2.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/overflow-not-scrollable-1.html b/tests/wpt/tests/css/css-text-decor/text-shadow/overflow-not-scrollable-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/overflow-not-scrollable-1.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/overflow-not-scrollable-1.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/overflow-not-scrollable-2-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/overflow-not-scrollable-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/overflow-not-scrollable-2-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/overflow-not-scrollable-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/overflow-not-scrollable-2.html b/tests/wpt/tests/css/css-text-decor/text-shadow/overflow-not-scrollable-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/overflow-not-scrollable-2.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/overflow-not-scrollable-2.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/padding-decoration-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/padding-decoration-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/padding-decoration-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/padding-decoration-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/padding-decoration.html b/tests/wpt/tests/css/css-text-decor/text-shadow/padding-decoration.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/padding-decoration.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/padding-decoration.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/parsing/text-shadow-computed.html b/tests/wpt/tests/css/css-text-decor/text-shadow/parsing/text-shadow-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/parsing/text-shadow-computed.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/parsing/text-shadow-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/parsing/text-shadow-invalid.html b/tests/wpt/tests/css/css-text-decor/text-shadow/parsing/text-shadow-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/parsing/text-shadow-invalid.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/parsing/text-shadow-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/parsing/text-shadow-valid.html b/tests/wpt/tests/css/css-text-decor/text-shadow/parsing/text-shadow-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/parsing/text-shadow-valid.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/parsing/text-shadow-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/quirks-decor-noblur-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/quirks-decor-noblur-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/quirks-decor-noblur-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/quirks-decor-noblur-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/quirks-decor-noblur.html b/tests/wpt/tests/css/css-text-decor/text-shadow/quirks-decor-noblur.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/quirks-decor-noblur.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/quirks-decor-noblur.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/standards-decor-noblur-2-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/standards-decor-noblur-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/standards-decor-noblur-2-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/standards-decor-noblur-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/standards-decor-noblur-2.html b/tests/wpt/tests/css/css-text-decor/text-shadow/standards-decor-noblur-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/standards-decor-noblur-2.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/standards-decor-noblur-2.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/standards-decor-noblur-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/standards-decor-noblur-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/standards-decor-noblur-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/standards-decor-noblur-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/standards-decor-noblur.html b/tests/wpt/tests/css/css-text-decor/text-shadow/standards-decor-noblur.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/standards-decor-noblur.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/standards-decor-noblur.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/textindent-ref.html b/tests/wpt/tests/css/css-text-decor/text-shadow/textindent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/textindent-ref.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/textindent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/textindent.html b/tests/wpt/tests/css/css-text-decor/text-shadow/textindent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-shadow/textindent.html rename to tests/wpt/tests/css/css-text-decor/text-shadow/textindent.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-001.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-001.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-002.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-002.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-computed.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-computed.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-initial.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-initial.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-invalid.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-invalid.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-negative.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-negative.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-negative.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-nesting-manual.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-nesting-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-nesting-manual.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-nesting-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-overline-vertical.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-overline-vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-overline-vertical.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-overline-vertical.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-overline.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-overline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-overline.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-overline.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-scroll-001.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-scroll-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-scroll-001.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-scroll-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-valid.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-valid.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-variable.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-variable.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-vertical-001.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-vertical-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-vertical-001.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-vertical-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-vertical-002.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-vertical-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-vertical-002.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-vertical-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-vertical-003.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-vertical-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-vertical-003.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-vertical-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-zero-position.html b/tests/wpt/tests/css/css-text-decor/text-underline-offset-zero-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-offset-zero-position.html rename to tests/wpt/tests/css/css-text-decor/text-underline-offset-zero-position.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-001a.html b/tests/wpt/tests/css/css-text-decor/text-underline-position-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-001a.html rename to tests/wpt/tests/css/css-text-decor/text-underline-position-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-001b.html b/tests/wpt/tests/css/css-text-decor/text-underline-position-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-001b.html rename to tests/wpt/tests/css/css-text-decor/text-underline-position-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-019-manual.html b/tests/wpt/tests/css/css-text-decor/text-underline-position-019-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-019-manual.html rename to tests/wpt/tests/css/css-text-decor/text-underline-position-019-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-020-manual.html b/tests/wpt/tests/css/css-text-decor/text-underline-position-020-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-020-manual.html rename to tests/wpt/tests/css/css-text-decor/text-underline-position-020-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-021-manual.html b/tests/wpt/tests/css/css-text-decor/text-underline-position-021-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-021-manual.html rename to tests/wpt/tests/css/css-text-decor/text-underline-position-021-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-022-manual.html b/tests/wpt/tests/css/css-text-decor/text-underline-position-022-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-022-manual.html rename to tests/wpt/tests/css/css-text-decor/text-underline-position-022-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-071-manual.html b/tests/wpt/tests/css/css-text-decor/text-underline-position-071-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-071-manual.html rename to tests/wpt/tests/css/css-text-decor/text-underline-position-071-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-072-manual.html b/tests/wpt/tests/css/css-text-decor/text-underline-position-072-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-072-manual.html rename to tests/wpt/tests/css/css-text-decor/text-underline-position-072-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-073-manual.html b/tests/wpt/tests/css/css-text-decor/text-underline-position-073-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-073-manual.html rename to tests/wpt/tests/css/css-text-decor/text-underline-position-073-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-074-manual.html b/tests/wpt/tests/css/css-text-decor/text-underline-position-074-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-074-manual.html rename to tests/wpt/tests/css/css-text-decor/text-underline-position-074-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-075-manual.html b/tests/wpt/tests/css/css-text-decor/text-underline-position-075-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-075-manual.html rename to tests/wpt/tests/css/css-text-decor/text-underline-position-075-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-076-manual.html b/tests/wpt/tests/css/css-text-decor/text-underline-position-076-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-076-manual.html rename to tests/wpt/tests/css/css-text-decor/text-underline-position-076-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-from-font-variable.html b/tests/wpt/tests/css/css-text-decor/text-underline-position-from-font-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-from-font-variable.html rename to tests/wpt/tests/css/css-text-decor/text-underline-position-from-font-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/tools/generate-text-emphasis-line-height-tests.py b/tests/wpt/tests/css/css-text-decor/tools/generate-text-emphasis-line-height-tests.py similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/tools/generate-text-emphasis-line-height-tests.py rename to tests/wpt/tests/css/css-text-decor/tools/generate-text-emphasis-line-height-tests.py diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/tools/generate-text-emphasis-position-property-tests.py b/tests/wpt/tests/css/css-text-decor/tools/generate-text-emphasis-position-property-tests.py similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/tools/generate-text-emphasis-position-property-tests.py rename to tests/wpt/tests/css/css-text-decor/tools/generate-text-emphasis-position-property-tests.py diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/tools/generate-text-emphasis-ruby-tests.py b/tests/wpt/tests/css/css-text-decor/tools/generate-text-emphasis-ruby-tests.py similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/tools/generate-text-emphasis-ruby-tests.py rename to tests/wpt/tests/css/css-text-decor/tools/generate-text-emphasis-ruby-tests.py diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/tools/generate-text-emphasis-style-property-010-tests.sh b/tests/wpt/tests/css/css-text-decor/tools/generate-text-emphasis-style-property-010-tests.sh similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/tools/generate-text-emphasis-style-property-010-tests.sh rename to tests/wpt/tests/css/css-text-decor/tools/generate-text-emphasis-style-property-010-tests.sh diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/tools/generate-text-emphasis-style-property-tests.py b/tests/wpt/tests/css/css-text-decor/tools/generate-text-emphasis-style-property-tests.py similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text-decor/tools/generate-text-emphasis-style-property-tests.py rename to tests/wpt/tests/css/css-text-decor/tools/generate-text-emphasis-style-property-tests.py diff --git a/tests/wpt/web-platform-tests/css/css-text/META.yml b/tests/wpt/tests/css/css-text/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/META.yml rename to tests/wpt/tests/css/css-text/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-text/altering-dom-crash.html b/tests/wpt/tests/css/css-text/altering-dom-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/altering-dom-crash.html rename to tests/wpt/tests/css/css-text/altering-dom-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/animations/hyphen-no-interpolation.html b/tests/wpt/tests/css/css-text/animations/hyphen-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/animations/hyphen-no-interpolation.html rename to tests/wpt/tests/css/css-text/animations/hyphen-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-text/animations/letter-spacing-composition.html b/tests/wpt/tests/css/css-text/animations/letter-spacing-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/animations/letter-spacing-composition.html rename to tests/wpt/tests/css/css-text/animations/letter-spacing-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-text/animations/letter-spacing-interpolation.html b/tests/wpt/tests/css/css-text/animations/letter-spacing-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/animations/letter-spacing-interpolation.html rename to tests/wpt/tests/css/css-text/animations/letter-spacing-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-text/animations/line-break-no-interpolation.html b/tests/wpt/tests/css/css-text/animations/line-break-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/animations/line-break-no-interpolation.html rename to tests/wpt/tests/css/css-text/animations/line-break-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-text/animations/tab-size-interpolation.html b/tests/wpt/tests/css/css-text/animations/tab-size-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/animations/tab-size-interpolation.html rename to tests/wpt/tests/css/css-text/animations/tab-size-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-text/animations/text-indent-composition.html b/tests/wpt/tests/css/css-text/animations/text-indent-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/animations/text-indent-composition.html rename to tests/wpt/tests/css/css-text/animations/text-indent-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-text/animations/text-indent-interpolation.html b/tests/wpt/tests/css/css-text/animations/text-indent-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/animations/text-indent-interpolation.html rename to tests/wpt/tests/css/css-text/animations/text-indent-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-text/animations/word-spacing-composition.html b/tests/wpt/tests/css/css-text/animations/word-spacing-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/animations/word-spacing-composition.html rename to tests/wpt/tests/css/css-text/animations/word-spacing-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-text/animations/word-spacing-interpolation.html b/tests/wpt/tests/css/css-text/animations/word-spacing-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/animations/word-spacing-interpolation.html rename to tests/wpt/tests/css/css-text/animations/word-spacing-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-text/bidi/bidi-lines-001.html b/tests/wpt/tests/css/css-text/bidi/bidi-lines-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/bidi/bidi-lines-001.html rename to tests/wpt/tests/css/css-text/bidi/bidi-lines-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/bidi/bidi-lines-002.html b/tests/wpt/tests/css/css-text/bidi/bidi-lines-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/bidi/bidi-lines-002.html rename to tests/wpt/tests/css/css-text/bidi/bidi-lines-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/bidi/bidi-tab-001.html b/tests/wpt/tests/css/css-text/bidi/bidi-tab-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/bidi/bidi-tab-001.html rename to tests/wpt/tests/css/css-text/bidi/bidi-tab-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/bidi/reference/bidi-lines-001-ref.html b/tests/wpt/tests/css/css-text/bidi/reference/bidi-lines-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/bidi/reference/bidi-lines-001-ref.html rename to tests/wpt/tests/css/css-text/bidi/reference/bidi-lines-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/bidi/reference/bidi-lines-002-ref.html b/tests/wpt/tests/css/css-text/bidi/reference/bidi-lines-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/bidi/reference/bidi-lines-002-ref.html rename to tests/wpt/tests/css/css-text/bidi/reference/bidi-lines-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/bidi/reference/bidi-tab-001-ref.html b/tests/wpt/tests/css/css-text/bidi/reference/bidi-tab-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/bidi/reference/bidi-tab-001-ref.html rename to tests/wpt/tests/css/css-text/bidi/reference/bidi-tab-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-001.html b/tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-001.html rename to tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-002.html b/tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-002.html rename to tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-003.html b/tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-003.html rename to tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-004.html b/tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-004.html rename to tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-005.html b/tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-005.html rename to tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-006.html b/tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-006.html rename to tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-007.html b/tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-007.html rename to tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-008.html b/tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-008.html rename to tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-009.html b/tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-009.html rename to tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-010.html b/tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/boundary-shaping-010.html rename to tests/wpt/tests/css/css-text/boundary-shaping/boundary-shaping-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-001.ref.html b/tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-001.ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-001.ref.html rename to tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-001.ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-002.ref.html b/tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-002.ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-002.ref.html rename to tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-002.ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-003.ref.html b/tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-003.ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-003.ref.html rename to tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-003.ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-004.ref.html b/tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-004.ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-004.ref.html rename to tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-004.ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-005.ref.html b/tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-005.ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-005.ref.html rename to tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-005.ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-006.ref.html b/tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-006.ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-006.ref.html rename to tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-006.ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-007.ref.html b/tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-007.ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-007.ref.html rename to tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-007.ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-008.ref.html b/tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-008.ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-008.ref.html rename to tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-008.ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-009.ref.html b/tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-009.ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-009.ref.html rename to tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-009.ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-010.ref.html b/tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-010.ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/reference/boundary-shaping-010.ref.html rename to tests/wpt/tests/css/css-text/boundary-shaping/reference/boundary-shaping-010.ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/boundary-shaping/resources/LinLibertine_Re-4.7.5.woff b/tests/wpt/tests/css/css-text/boundary-shaping/resources/LinLibertine_Re-4.7.5.woff similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/boundary-shaping/resources/LinLibertine_Re-4.7.5.woff rename to tests/wpt/tests/css/css-text/boundary-shaping/resources/LinLibertine_Re-4.7.5.woff diff --git a/tests/wpt/web-platform-tests/css/css-text/crashtests/line-break-float-crash.html b/tests/wpt/tests/css/css-text/crashtests/line-break-float-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/crashtests/line-break-float-crash.html rename to tests/wpt/tests/css/css-text/crashtests/line-break-float-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/crashtests/rendering-rtl-bidi-override-crash.html b/tests/wpt/tests/css/css-text/crashtests/rendering-rtl-bidi-override-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/crashtests/rendering-rtl-bidi-override-crash.html rename to tests/wpt/tests/css/css-text/crashtests/rendering-rtl-bidi-override-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/crashtests/rendering-table-caption-with-list-item-and-svg-crash.html b/tests/wpt/tests/css/css-text/crashtests/rendering-table-caption-with-list-item-and-svg-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/crashtests/rendering-table-caption-with-list-item-and-svg-crash.html rename to tests/wpt/tests/css/css-text/crashtests/rendering-table-caption-with-list-item-and-svg-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/crashtests/rendering-table-caption-with-negative-margins-crash.html b/tests/wpt/tests/css/css-text/crashtests/rendering-table-caption-with-negative-margins-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/crashtests/rendering-table-caption-with-negative-margins-crash.html rename to tests/wpt/tests/css/css-text/crashtests/rendering-table-caption-with-negative-margins-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/crashtests/text-wrap-balance-float-crash.html b/tests/wpt/tests/css/css-text/crashtests/text-wrap-balance-float-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/crashtests/text-wrap-balance-float-crash.html rename to tests/wpt/tests/css/css-text/crashtests/text-wrap-balance-float-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/crashtests/trailing-space-with-cr-crash.html b/tests/wpt/tests/css/css-text/crashtests/trailing-space-with-cr-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/crashtests/trailing-space-with-cr-crash.html rename to tests/wpt/tests/css/css-text/crashtests/trailing-space-with-cr-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/crashtests/white-space-pre-wrap-chash.html b/tests/wpt/tests/css/css-text/crashtests/white-space-pre-wrap-chash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/crashtests/white-space-pre-wrap-chash.html rename to tests/wpt/tests/css/css-text/crashtests/white-space-pre-wrap-chash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/crashtests/word-spacing-large-value.html b/tests/wpt/tests/css/css-text/crashtests/word-spacing-large-value.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/crashtests/word-spacing-large-value.html rename to tests/wpt/tests/css/css-text/crashtests/word-spacing-large-value.html diff --git a/tests/wpt/web-platform-tests/css/css-text/ellisize-rtl-text-crash.html b/tests/wpt/tests/css/css-text/ellisize-rtl-text-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/ellisize-rtl-text-crash.html rename to tests/wpt/tests/css/css-text/ellisize-rtl-text-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-punctuation-allow-end-001.xht b/tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-allow-end-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-punctuation-allow-end-001.xht rename to tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-allow-end-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-punctuation-block-bound-001.html b/tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-block-bound-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-punctuation-block-bound-001.html rename to tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-block-bound-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-punctuation-first-001.xht b/tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-first-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-punctuation-first-001.xht rename to tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-first-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-punctuation-force-end-001.xht b/tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-force-end-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-punctuation-force-end-001.xht rename to tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-force-end-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-punctuation-inline-001.html b/tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-punctuation-inline-001.html rename to tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-punctuation-inline-bound-001.html b/tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-inline-bound-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-punctuation-inline-bound-001.html rename to tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-inline-bound-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-punctuation-last-001.xht b/tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-last-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-punctuation-last-001.xht rename to tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-last-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-scrollable-001.html b/tests/wpt/tests/css/css-text/hanging-punctuation/hanging-scrollable-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/hanging-scrollable-001.html rename to tests/wpt/tests/css/css-text/hanging-punctuation/hanging-scrollable-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-allow-end-001-ref.xht b/tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-allow-end-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-allow-end-001-ref.xht rename to tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-allow-end-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-block-bound-001-ref.html b/tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-block-bound-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-block-bound-001-ref.html rename to tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-block-bound-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-first-001-ref.xht b/tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-first-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-first-001-ref.xht rename to tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-first-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-force-end-001-ref.xht b/tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-force-end-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-force-end-001-ref.xht rename to tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-force-end-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-inline-001-ref.html b/tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-inline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-inline-001-ref.html rename to tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-inline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-inline-bound-001-ref.html b/tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-inline-bound-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-inline-bound-001-ref.html rename to tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-inline-bound-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-last-001-ref.xht b/tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-last-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-last-001-ref.xht rename to tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-last-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-scrollable-001-ref.html b/tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-scrollable-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hanging-punctuation/reference/hanging-scrollable-001-ref.html rename to tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-scrollable-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphenate-character-001.html b/tests/wpt/tests/css/css-text/hyphens/hyphenate-character-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphenate-character-001.html rename to tests/wpt/tests/css/css-text/hyphens/hyphenate-character-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphenate-character-002.html b/tests/wpt/tests/css/css-text/hyphens/hyphenate-character-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphenate-character-002.html rename to tests/wpt/tests/css/css-text/hyphens/hyphenate-character-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphenate-character-003.html b/tests/wpt/tests/css/css-text/hyphens/hyphenate-character-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphenate-character-003.html rename to tests/wpt/tests/css/css-text/hyphens/hyphenate-character-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphenate-character-004.html b/tests/wpt/tests/css/css-text/hyphens/hyphenate-character-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphenate-character-004.html rename to tests/wpt/tests/css/css-text/hyphens/hyphenate-character-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphenate-character-005.html b/tests/wpt/tests/css/css-text/hyphens/hyphenate-character-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphenate-character-005.html rename to tests/wpt/tests/css/css-text/hyphens/hyphenate-character-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphenate-limit-chars-001.html b/tests/wpt/tests/css/css-text/hyphens/hyphenate-limit-chars-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphenate-limit-chars-001.html rename to tests/wpt/tests/css/css-text/hyphens/hyphenate-limit-chars-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-001.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-auto-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-001.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-auto-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-002.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-auto-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-002.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-auto-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-003.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-auto-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-003.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-auto-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-004.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-auto-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-004.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-auto-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-005.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-auto-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-005.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-auto-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-010.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-auto-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-010.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-auto-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-and-contenteditable-crash.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-auto-and-contenteditable-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-and-contenteditable-crash.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-auto-and-contenteditable-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-control-ref.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-auto-control-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-control-ref.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-auto-control-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-control.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-auto-control.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-control.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-auto-control.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-inline-010.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-auto-inline-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-inline-010.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-auto-inline-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-last-word-001.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-auto-last-word-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-last-word-001.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-auto-last-word-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-min-content-ref-1.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-auto-min-content-ref-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-min-content-ref-1.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-auto-min-content-ref-1.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-min-content-ref-2.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-auto-min-content-ref-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-min-content-ref-2.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-auto-min-content-ref-2.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-min-content.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-auto-min-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-min-content.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-auto-min-content.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-character.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-character.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-character.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-character.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-manual-010.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-manual-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-manual-010.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-manual-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-manual-011.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-manual-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-manual-011.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-manual-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-manual-012.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-manual-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-manual-012.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-manual-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-manual-013.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-manual-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-manual-013.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-manual-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-manual-inline-010.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-manual-inline-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-manual-inline-010.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-manual-inline-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-manual-inline-011.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-manual-inline-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-manual-inline-011.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-manual-inline-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-manual-inline-012.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-manual-inline-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-manual-inline-012.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-manual-inline-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-011.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-none-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-011.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-none-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-012.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-none-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-012.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-none-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-013.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-none-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-013.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-none-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-014.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-none-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-014.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-none-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-015.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-none-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-none-015.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-none-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-out-of-flow-001.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-out-of-flow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-out-of-flow-001.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-out-of-flow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-out-of-flow-002.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-out-of-flow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-out-of-flow-002.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-out-of-flow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-overflow-001.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-overflow-001.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-punctuation-001.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-punctuation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-punctuation-001.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-punctuation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-shaping-001.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-shaping-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-shaping-001.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-shaping-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-shaping-002.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-shaping-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-shaping-002.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-shaping-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-span-001.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-span-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-span-001.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-span-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-span-002.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-span-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-span-002.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-span-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-vertical-001.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-vertical-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-vertical-001.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-vertical-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-vertical-002.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-vertical-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-vertical-002.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-vertical-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-vertical-003.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-vertical-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-vertical-003.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-vertical-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-vertical-004.html b/tests/wpt/tests/css/css-text/hyphens/hyphens-vertical-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-vertical-004.html rename to tests/wpt/tests/css/css-text/hyphens/hyphens-vertical-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-001.html b/tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-001.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-002.html b/tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-002.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-003.html b/tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-003.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-004.html b/tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-004.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-005.html b/tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-005.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-auto-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-001.html b/tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-001.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-002.html b/tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-002.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-003.html b/tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-003.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-004.html b/tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-004.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-005.html b/tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-005.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/hyphens-i18n-manual-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-001-alt-ref.html b/tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-001-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-001-alt-ref.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-001-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-001-ref.html b/tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-001-ref.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-002-alt-ref.html b/tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-002-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-002-alt-ref.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-002-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-002-ref.html b/tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-002-ref.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-003-alt-ref.html b/tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-003-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-003-alt-ref.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-003-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-003-ref.html b/tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-003-ref.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-alt-2-ref.html b/tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-alt-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-alt-2-ref.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-alt-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-alt-3-ref.html b/tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-alt-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-alt-3-ref.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-alt-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-alt-ref.html b/tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-alt-ref.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-ref.html b/tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-ref.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-005-ref.html b/tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-005-ref.html rename to tests/wpt/tests/css/css-text/hyphens/i18n/reference/hyphens-i18n-auto-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphenate-character-001-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphenate-character-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphenate-character-001-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphenate-character-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphenate-character-003-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphenate-character-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphenate-character-003-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphenate-character-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphenate-character-004-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphenate-character-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphenate-character-004-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphenate-character-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphenate-character-005-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphenate-character-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphenate-character-005-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphenate-character-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphenate-limit-chars-001-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphenate-limit-chars-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphenate-limit-chars-001-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphenate-limit-chars-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-001-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-001-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-002-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-002-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-004H-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-004H-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-004H-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-004H-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-004M-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-004M-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-004M-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-004M-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-005H-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-005H-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-005H-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-005H-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-005M-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-005M-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-005M-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-005M-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-010H-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-010H-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-010H-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-010H-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-010M-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-010M-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-010M-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-010M-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-inline-010H-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-inline-010H-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-inline-010H-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-inline-010H-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-inline-010M-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-inline-010M-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-inline-010M-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-inline-010M-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref2.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref2.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-auto-last-word-001-ref2.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-character-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-character-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-character-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-character-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-010-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-010-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-011H-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-011H-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-011H-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-011H-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-011M-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-011M-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-011M-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-011M-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-013H-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-013H-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-013H-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-013H-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-013M-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-013M-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-013M-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-013M-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-inline-010-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-inline-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-inline-010-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-inline-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-inline-011H-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-inline-011H-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-inline-011H-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-inline-011H-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-inline-011M-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-inline-011M-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-inline-011M-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-inline-011M-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-inline-012H-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-inline-012H-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-inline-012H-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-inline-012H-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-inline-012M-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-inline-012M-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-manual-inline-012M-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-manual-inline-012M-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-out-of-flow-001-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-out-of-flow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-out-of-flow-001-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-out-of-flow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-overflow-001-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-overflow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-overflow-001-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-overflow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-punctuation-001-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-punctuation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-punctuation-001-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-punctuation-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-shaping-001-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-shaping-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-shaping-001-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-shaping-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-shaping-002-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-shaping-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-shaping-002-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-shaping-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-span-001-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-span-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-span-001-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-span-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-span-002-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-span-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-span-002-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-span-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-vertical-001-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-vertical-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-vertical-001-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-vertical-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-vertical-002-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-vertical-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-vertical-002-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-vertical-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-vertical-003-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-vertical-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-vertical-003-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-vertical-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-vertical-004-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/hyphens-vertical-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/hyphens-vertical-004-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/hyphens-vertical-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/shy-styling-001-alt-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/shy-styling-001-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/shy-styling-001-alt-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/shy-styling-001-alt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/reference/shy-styling-001-ref.html b/tests/wpt/tests/css/css-text/hyphens/reference/shy-styling-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/reference/shy-styling-001-ref.html rename to tests/wpt/tests/css/css-text/hyphens/reference/shy-styling-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/resources/roboto_hyphenation_subset.ttf b/tests/wpt/tests/css/css-text/hyphens/resources/roboto_hyphenation_subset.ttf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/resources/roboto_hyphenation_subset.ttf rename to tests/wpt/tests/css/css-text/hyphens/resources/roboto_hyphenation_subset.ttf diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/shy-styling-001.html b/tests/wpt/tests/css/css-text/hyphens/shy-styling-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/hyphens/shy-styling-001.html rename to tests/wpt/tests/css/css-text/hyphens/shy-styling-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/META.yml b/tests/wpt/tests/css/css-text/i18n/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/META.yml rename to tests/wpt/tests/css/css-text/i18n/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-001.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-001.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-002.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-002.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-003.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-003.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-004.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-004.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-005.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-005.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-006.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-006.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-007.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-007.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-008.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-008.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-009.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-009.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-010.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-010.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-011.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-011.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-012.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-012.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-014.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-014.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-015.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-015.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-016.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-016.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-017.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-017.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-018.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-018.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-019.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-019.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-019.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-020.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-020.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-020.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-021.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-021.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-021.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-022.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-022.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-022.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-023.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-023.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-023.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-024.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-024.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-024.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-025.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-025.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-025.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-026.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-026.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-026.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-030.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-030.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-030.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-031.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-031.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-031.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-032.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-032.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-032.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-033.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-033.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-033.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-034.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-034.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-034.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-035.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-035.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-035.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-036.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-036.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-036.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-037.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-037.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-037.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-038.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-038.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-038.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-039.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-039.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-039.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-040.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-040.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-040.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-041.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-041.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-041.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-042.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-042.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-042.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-043.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-043.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-043.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-044.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-044.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-044.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-045.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-045.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-045.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-046.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-046.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-046.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-047.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-047.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-047.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-048.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-048.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-048.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-049.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-049.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-049.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-050.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-050.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-050.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-051.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-051.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-051.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-052.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-052.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-052.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-060.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-060.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-060.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-060.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-061.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-061.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-061.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-061.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-062.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-062.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-062.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-062.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-063.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-063.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-063.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-063.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-064.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-064.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-064.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-064.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-065.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-065.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-065.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-065.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-066.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-066.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-066.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-066.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-067.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-067.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-067.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-067.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-068.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-068.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-068.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-068.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-069.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-069.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-069.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-069.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-070.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-070.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-070.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-070.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-071.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-071.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-071.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-071.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-072.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-072.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-072.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-072.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-073.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-073.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-073.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-073.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-074.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-074.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-074.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-074.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-075.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-075.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-075.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-075.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-076.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-076.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-076.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-076.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-077.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-077.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-077.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-077.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-078.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-078.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-078.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-078.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-080.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-080.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-080.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-080.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-081.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-081.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-081.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-081.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-082.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-082.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-082.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-082.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-083.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-083.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-083.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-083.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-084.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-084.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-084.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-084.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-085.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-085.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-085.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-085.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-086.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-086.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-086.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-086.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-090.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-090.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-090.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-090.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-091.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-091.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-091.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-091.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-092.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-092.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-092.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-092.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-093.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-093.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-093.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-093.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-095.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-095.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-095.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-095.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-096.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-096.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-096.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-096.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-097.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-097.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-097.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-097.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-098.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-098.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-098.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-098.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-099.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-099.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-099.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-099.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-100.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-100.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-100.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-100.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-101.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-101.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-101.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-101.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-102.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-102.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-102.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-102.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-103.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-103.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-103.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-103.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-104.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-104.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-104.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-104.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-105.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-105.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-105.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-105.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-106.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-106.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-106.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-106.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-107.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-107.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-107.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-107.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-108.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-108.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-108.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-108.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-109.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-109.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-109.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-109.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-110.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-110.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-110.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-110.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-111.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-111.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-111.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-111.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-112.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-112.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-112.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-112.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-113.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-113.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-113.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-113.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-114.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-114.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-114.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-114.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-115.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-115.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-115.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-115.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-116.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-116.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-116.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-116.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-117.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-117.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-117.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-117.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-118.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-118.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-118.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-118.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-120.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-120.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-120.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-120.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-121.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-121.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-121.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-121.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-122.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-122.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-122.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-122.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-123.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-123.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-123.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-123.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-124.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-124.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-124.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-124.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-125.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-125.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-125.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-125.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-126.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-126.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-126.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-126.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-127.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-127.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-127.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-127.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-128.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-128.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-128.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-128.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-130.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-130.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-130.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-130.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-131.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-131.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-baspglwj-131.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-baspglwj-131.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-001.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-001.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-002.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-002.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-003.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-003.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-004.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-004.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-005.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-005.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-006.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-006.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-007.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-007.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-008.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-008.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-009.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-009.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-010.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-010.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-011.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-011.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-012.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-012.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-014.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-014.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-015.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-015.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-016.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-016.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-017.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-017.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-018.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-018.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-019.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-019.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-019.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-020.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-020.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-020.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-021.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-021.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-021.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-022.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-022.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-022.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-023.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-023.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-023.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-024.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-024.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-024.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-025.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-025.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-025.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-026.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-026.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-026.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-027.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-027.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-027.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-028.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-028.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-028.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-029.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-029.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-029.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-030.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-030.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-030.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-031.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-031.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-031.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-032.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-032.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-032.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-033.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-033.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-033.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-034.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-034.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-034.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-035.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-035.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-035.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-036.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-036.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-036.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-037.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-037.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-037.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-038.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-038.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-038.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-039.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-039.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-039.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-040.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-040.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-040.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-041.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-041.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-041.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-042.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-042.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-042.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-043.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-043.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-043.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-044.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-044.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-044.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-045.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-045.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-045.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-046.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-046.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-046.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-047.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-047.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-047.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-049.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-049.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-049.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-050.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-050.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-050.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-051.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-051.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-051.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-052.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-052.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-052.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-053.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-053.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-053.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-053.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-054.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-054.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-054.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-054.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-055.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-055.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-055.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-055.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-056.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-056.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-056.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-056.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-057.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-057.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-057.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-057.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-058.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-058.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-058.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-058.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-059.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-059.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-059.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-059.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-060.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-060.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-060.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-060.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-061.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-061.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-061.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-061.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-062.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-062.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-062.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-062.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-063.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-063.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-063.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-063.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-064.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-064.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-064.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-064.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-065.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-065.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-065.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-065.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-100.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-100.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-100.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-100.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-101.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-101.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-101.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-101.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-102.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-102.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-102.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-102.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-103.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-103.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-103.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-103.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-104.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-104.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-104.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-104.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-105.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-105.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-105.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-105.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-106.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-106.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-106.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-106.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-107.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-107.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-107.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-107.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-108.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-108.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-108.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-108.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-109.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-109.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-109.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-109.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-110.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-110.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-110.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-110.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-111.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-111.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-111.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-111.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-112.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-112.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-112.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-112.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-113.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-113.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-113.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-113.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-114.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-114.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-114.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-114.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-115.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-115.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-115.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-115.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-116.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-116.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-116.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-116.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-117.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-117.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-117.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-117.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-119.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-119.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-119.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-119.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-120.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-120.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-120.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-120.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-121.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-121.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-121.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-121.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-122.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-122.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-122.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-122.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-123.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-123.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-123.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-123.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-124.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-124.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-124.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-124.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-125.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-125.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-125.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-125.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-126.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-126.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-126.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-126.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-127.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-127.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-127.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-127.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-128.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-128.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-128.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-128.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-129.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-129.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-129.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-129.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-130.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-130.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-130.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-130.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-131.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-131.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-131.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-131.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-132.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-132.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-132.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-132.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-133.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-133.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-133.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-133.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-134.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-134.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-134.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-134.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-135.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-135.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-135.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-135.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-136.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-136.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-136.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-136.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-137.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-137.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-137.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-137.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-138.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-138.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-138.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-138.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-139.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-139.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-139.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-139.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-140.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-140.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-140.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-140.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-141.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-141.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-141.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-141.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-142.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-142.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-142.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-142.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-143.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-143.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-143.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-143.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-144.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-144.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-144.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-144.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-145.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-145.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-145.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-145.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-146.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-146.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-146.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-146.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-147.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-147.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-147.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-147.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-148.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-148.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-148.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-148.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-149.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-149.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-149.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-149.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-150.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-150.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-150.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-150.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-151.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-151.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-151.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-151.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-152.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-152.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-152.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-152.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-153.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-153.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-153.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-153.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-155.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-155.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-155.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-155.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-156.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-156.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-156.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-156.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-157.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-157.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-157.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-157.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-158.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-158.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-158.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-158.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-159.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-159.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-159.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-159.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-160.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-160.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-160.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-160.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-161.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-161.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-161.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-161.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-162.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-162.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-162.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-162.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-163.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-163.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-163.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-163.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-164.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-164.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-164.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-164.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-165.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-165.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-165.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-165.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-166.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-166.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-166.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-166.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-167.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-167.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-167.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-167.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-168.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-168.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-168.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-168.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-169.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-169.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-169.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-169.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-170.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-170.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-170.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-170.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-171.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-171.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-171.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-171.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-200.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-200.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-200.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-200.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-201.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-201.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-201.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-201.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-202.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-202.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-202.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-202.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-203.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-203.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-203.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-203.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-204.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-204.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-204.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-204.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-205.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-205.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-205.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-205.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-206.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-206.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-206.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-206.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-207.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-207.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-207.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-207.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-208.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-208.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-208.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-208.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-209.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-209.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-209.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-209.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-210.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-210.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-210.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-210.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-211.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-211.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-211.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-211.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-212.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-212.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-212.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-212.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-213.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-213.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-213.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-213.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-214.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-214.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-214.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-214.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-215.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-215.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-215.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-215.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-217.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-217.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-217.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-217.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-218.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-218.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-218.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-218.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-219.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-219.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-219.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-219.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-220.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-220.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-220.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-220.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-221.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-221.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-221.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-221.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-222.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-222.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-222.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-222.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-223.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-223.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-223.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-223.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-225.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-225.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-225.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-225.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-226.html b/tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-226.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-226.html rename to tests/wpt/tests/css/css-text/i18n/css3-text-line-break-opclns-226.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-cj-loose.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-cj-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-cj-loose.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-cj-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-cj-normal.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-cj-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-cj-normal.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-cj-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-cj-strict.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-cj-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-cj-strict.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-cj-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-cpm-loose.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-cpm-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-cpm-loose.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-cpm-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-cpm-normal.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-cpm-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-cpm-normal.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-cpm-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-cpm-strict.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-cpm-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-cpm-strict.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-cpm-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-loose.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-loose.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-normal.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-normal.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-strict.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-strict.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-hyphens-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-in-loose.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-in-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-in-loose.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-in-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-in-normal.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-in-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-in-normal.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-in-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-in-strict.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-in-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-in-strict.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-in-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-iteration-loose.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-iteration-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-iteration-loose.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-iteration-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-iteration-normal.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-iteration-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-iteration-normal.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-iteration-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-iteration-strict.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-iteration-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-iteration-strict.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-iteration-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-po-loose.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-po-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-po-loose.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-po-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-po-normal.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-po-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-po-normal.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-po-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-po-strict.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-po-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-po-strict.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-po-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-pr-loose.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-pr-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-pr-loose.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-pr-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-pr-normal.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-pr-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-pr-normal.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-pr-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-pr-strict.html b/tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-pr-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/ja/css-text-line-break-ja-pr-strict.html rename to tests/wpt/tests/css/css-text/i18n/ja/css-text-line-break-ja-pr-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-cj-loose.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-cj-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-cj-loose.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-cj-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-cj-normal.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-cj-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-cj-normal.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-cj-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-cj-strict.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-cj-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-cj-strict.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-cj-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-cpm-loose.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-cpm-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-cpm-loose.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-cpm-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-cpm-normal.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-cpm-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-cpm-normal.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-cpm-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-cpm-strict.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-cpm-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-cpm-strict.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-cpm-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-hyphens-loose.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-hyphens-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-hyphens-loose.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-hyphens-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-hyphens-normal.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-hyphens-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-hyphens-normal.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-hyphens-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-hyphens-strict.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-hyphens-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-hyphens-strict.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-hyphens-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-in-loose.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-in-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-in-loose.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-in-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-in-normal.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-in-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-in-normal.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-in-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-in-strict.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-in-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-in-strict.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-in-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-loose.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-loose.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-normal.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-normal.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-strict.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-strict.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-iteration-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-po-loose.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-po-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-po-loose.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-po-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-po-normal.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-po-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-po-normal.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-po-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-po-strict.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-po-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-po-strict.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-po-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-pr-loose.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-pr-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-pr-loose.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-pr-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-pr-normal.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-pr-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-pr-normal.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-pr-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-pr-strict.html b/tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-pr-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/other-lang/css-text-line-break-de-pr-strict.html rename to tests/wpt/tests/css/css-text/i18n/other-lang/css-text-line-break-de-pr-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-001-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-001-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-002-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-002-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-003-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-003-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-004-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-004-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-005-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-005-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-006-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-006-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-007-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-007-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-008-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-008-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-009-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-009-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-010-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-010-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-011-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-011-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-012-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-012-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-014-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-014-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-015-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-015-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-016-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-016-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-017-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-017-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-018-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-018-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-019-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-019-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-020-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-020-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-021-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-021-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-022-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-022-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-023-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-023-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-024-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-024-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-025-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-025-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-026-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-026-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-026-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-026-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-027-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-027-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-028-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-028-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-028-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-028-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-029-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-029-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-029-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-029-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-030-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-030-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-030-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-030-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-031-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-031-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-031-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-031-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-032-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-032-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-032-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-032-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-033-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-033-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-033-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-033-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-034-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-034-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-034-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-034-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-035-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-035-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-035-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-035-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-036-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-036-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-036-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-036-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-037-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-037-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-037-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-037-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-038-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-038-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-038-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-038-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-039-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-039-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-039-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-039-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-040-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-040-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-040-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-040-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-041-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-041-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-041-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-041-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-042-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-042-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-042-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-042-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-043-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-043-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-043-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-043-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-044-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-044-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-044-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-044-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-045-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-045-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-045-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-045-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-046-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-046-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-046-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-046-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-047-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-047-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-047-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-047-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-049-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-049-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-049-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-049-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-050-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-050-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-050-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-050-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-051-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-051-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-051-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-051-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-052-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-052-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-052-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-052-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-053-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-053-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-053-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-053-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-054-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-054-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-054-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-054-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-055-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-055-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-055-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-055-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-056-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-056-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-056-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-056-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-057-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-057-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-057-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-057-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-058-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-058-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-058-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-058-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-059-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-059-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-059-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-059-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-060-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-060-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-060-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-060-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-061-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-061-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-061-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-061-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-062-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-062-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-062-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-062-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-063-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-063-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-063-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-063-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-064-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-064-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-064-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-064-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-065-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-065-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-065-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-065-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-100-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-100-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-100-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-100-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-101-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-101-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-101-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-101-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-102-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-102-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-102-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-102-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-103-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-103-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-103-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-103-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-104-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-104-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-104-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-104-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-105-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-105-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-105-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-105-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-106-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-106-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-106-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-106-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-107-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-107-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-107-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-107-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-108-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-108-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-108-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-108-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-109-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-109-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-109-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-109-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-110-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-110-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-110-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-110-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-111-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-111-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-111-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-111-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-112-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-112-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-112-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-112-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-113-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-113-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-113-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-113-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-114-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-114-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-114-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-114-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-115-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-115-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-115-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-115-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-116-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-116-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-116-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-116-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-117-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-117-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-117-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-117-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-119-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-119-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-119-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-119-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-120-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-120-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-120-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-120-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-121-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-121-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-121-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-121-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-122-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-122-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-122-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-122-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-123-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-123-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-123-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-123-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-124-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-124-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-124-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-124-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-125-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-125-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-125-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-125-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-126-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-126-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-126-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-126-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-127-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-127-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-127-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-127-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-128-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-128-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-128-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-128-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-129-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-129-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-129-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-129-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-130-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-130-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-130-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-130-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-131-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-131-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-131-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-131-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-132-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-132-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-132-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-132-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-133-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-133-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-133-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-133-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-134-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-134-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-134-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-134-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-135-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-135-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-135-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-135-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-136-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-136-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-136-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-136-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-137-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-137-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-137-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-137-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-138-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-138-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-138-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-138-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-139-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-139-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-139-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-139-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-140-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-140-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-140-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-140-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-141-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-141-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-141-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-141-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-142-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-142-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-142-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-142-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-143-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-143-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-143-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-143-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-144-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-144-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-144-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-144-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-145-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-145-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-145-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-145-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-146-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-146-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-146-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-146-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-147-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-147-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-147-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-147-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-148-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-148-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-148-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-148-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-149-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-149-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-149-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-149-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-150-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-150-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-150-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-150-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-151-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-151-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-151-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-151-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-152-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-152-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-152-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-152-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-153-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-153-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-153-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-153-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-155-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-155-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-155-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-155-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-156-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-156-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-156-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-156-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-157-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-157-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-157-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-157-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-158-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-158-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-158-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-158-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-159-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-159-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-159-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-159-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-160-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-160-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-160-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-160-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-161-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-161-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-161-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-161-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-162-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-162-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-162-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-162-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-163-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-163-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-163-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-163-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-164-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-164-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-164-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-164-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-165-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-165-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-165-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-165-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-166-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-166-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-166-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-166-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-167-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-167-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-167-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-167-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-168-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-168-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-168-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-168-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-169-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-169-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-169-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-169-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-170-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-170-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-170-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-170-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-171-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-171-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-171-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-171-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-200-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-200-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-200-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-200-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-201-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-201-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-201-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-201-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-202-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-202-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-202-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-202-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-203-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-203-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-203-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-203-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-204-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-204-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-204-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-204-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-205-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-205-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-205-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-205-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-206-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-206-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-206-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-206-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-207-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-207-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-207-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-207-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-208-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-208-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-208-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-208-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-209-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-209-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-209-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-209-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-210-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-210-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-210-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-210-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-211-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-211-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-211-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-211-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-212-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-212-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-212-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-212-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-213-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-213-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-213-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-213-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-214-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-214-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-214-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-214-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-215-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-215-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-215-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-215-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-217-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-217-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-217-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-217-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-218-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-218-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-218-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-218-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-219-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-219-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-219-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-219-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-220-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-220-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-220-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-220-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-221-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-221-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-221-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-221-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-222-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-222-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-222-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-222-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-223-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-223-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-223-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-223-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-225-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-225-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-225-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-225-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-226-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-226-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-226-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-226-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-250-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-250-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-250-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-250-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-251-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-251-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-251-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-251-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-252-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-252-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-252-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-252-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-253-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-253-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-253-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-253-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-254-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-254-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-254-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-254-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-255-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-255-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-255-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-255-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-256-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-256-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-256-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-256-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-257-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-257-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-257-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-257-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-258-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-258-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-258-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-258-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-259-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-259-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-259-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-259-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-260-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-260-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-260-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-260-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-261-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-261-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-261-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-261-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-262-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-262-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-262-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-262-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-263-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-263-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-263-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-263-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-264-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-264-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-264-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-264-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-265-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-265-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-265-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-265-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-266-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-266-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-266-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-266-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-267-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-267-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-267-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-267-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-268-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-268-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-268-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-268-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-269-ref.html b/tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-269-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/reference/css3-text-line-break-opclns-269-ref.html rename to tests/wpt/tests/css/css-text/i18n/reference/css3-text-line-break-opclns-269-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/support/BPG-Ucnobi-U.woff b/tests/wpt/tests/css/css-text/i18n/support/BPG-Ucnobi-U.woff similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/support/BPG-Ucnobi-U.woff rename to tests/wpt/tests/css/css-text/i18n/support/BPG-Ucnobi-U.woff diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-cj-loose.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-cj-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-cj-loose.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-cj-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-cj-normal.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-cj-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-cj-normal.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-cj-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-cj-strict.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-cj-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-cj-strict.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-cj-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-cpm-loose.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-cpm-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-cpm-loose.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-cpm-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-cpm-normal.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-cpm-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-cpm-normal.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-cpm-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-cpm-strict.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-cpm-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-cpm-strict.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-cpm-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-hyphens-loose.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-hyphens-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-hyphens-loose.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-hyphens-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-hyphens-normal.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-hyphens-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-hyphens-normal.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-hyphens-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-hyphens-strict.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-hyphens-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-hyphens-strict.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-hyphens-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-in-loose.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-in-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-in-loose.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-in-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-in-normal.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-in-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-in-normal.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-in-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-in-strict.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-in-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-in-strict.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-in-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-loose.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-loose.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-normal.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-normal.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-strict.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-strict.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-iteration-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-po-loose.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-po-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-po-loose.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-po-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-po-normal.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-po-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-po-normal.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-po-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-po-strict.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-po-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-po-strict.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-po-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-pr-loose.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-pr-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-pr-loose.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-pr-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-pr-normal.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-pr-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-pr-normal.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-pr-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-pr-strict.html b/tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-pr-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/unknown-lang/css-text-line-break-pr-strict.html rename to tests/wpt/tests/css/css-text/i18n/unknown-lang/css-text-line-break-pr-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-cj-loose.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-cj-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-cj-loose.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-cj-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-cj-normal.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-cj-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-cj-normal.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-cj-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-cj-strict.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-cj-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-cj-strict.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-cj-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-cpm-loose.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-cpm-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-cpm-loose.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-cpm-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-cpm-normal.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-cpm-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-cpm-normal.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-cpm-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-cpm-strict.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-cpm-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-cpm-strict.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-cpm-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-loose.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-loose.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-normal.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-normal.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-strict.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-strict.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-hyphens-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-in-loose.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-in-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-in-loose.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-in-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-in-normal.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-in-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-in-normal.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-in-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-in-strict.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-in-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-in-strict.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-in-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-iteration-loose.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-iteration-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-iteration-loose.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-iteration-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-iteration-normal.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-iteration-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-iteration-normal.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-iteration-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-iteration-strict.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-iteration-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-iteration-strict.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-iteration-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-po-loose.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-po-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-po-loose.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-po-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-po-normal.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-po-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-po-normal.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-po-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-po-strict.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-po-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-po-strict.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-po-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-pr-loose.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-pr-loose.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-pr-loose.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-pr-loose.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-pr-normal.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-pr-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-pr-normal.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-pr-normal.html diff --git a/tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-pr-strict.html b/tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-pr-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/i18n/zh/css-text-line-break-zh-pr-strict.html rename to tests/wpt/tests/css/css-text/i18n/zh/css-text-line-break-zh-pr-strict.html diff --git a/tests/wpt/web-platform-tests/css/css-text/inheritance.html b/tests/wpt/tests/css/css-text/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/inheritance.html rename to tests/wpt/tests/css/css-text/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-200.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-200.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-200.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-200.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-201.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-201.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-201.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-201.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-202.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-202.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-202.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-202.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-203.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-203.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-203.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-203.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-204.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-204.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-204.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-204.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-205.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-205.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-205.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-205.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-206.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-206.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-206.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-206.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-211.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-211.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-211.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-211.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-212.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-212.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-212.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-212.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-bengali-yaphala-001.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-bengali-yaphala-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-bengali-yaphala-001.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-bengali-yaphala-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-bidi-001.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-bidi-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-bidi-001.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-bidi-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-bidi-002.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-bidi-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-bidi-002.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-bidi-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-bidi-003.xht b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-bidi-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-bidi-003.xht rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-bidi-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-bidi-004.xht b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-bidi-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-bidi-004.xht rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-bidi-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-bidi-005.xht b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-bidi-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-bidi-005.xht rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-bidi-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-control-chars-001.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-control-chars-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-control-chars-001.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-control-chars-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-end-of-line-001.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-end-of-line-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-end-of-line-001.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-end-of-line-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-ligatures-001.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-ligatures-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-ligatures-001.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-ligatures-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-ligatures-002.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-ligatures-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-ligatures-002.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-ligatures-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-ligatures-003.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-ligatures-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-ligatures-003.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-ligatures-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-ligatures-004.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-ligatures-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-ligatures-004.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-ligatures-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-nesting-001.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-nesting-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-nesting-001.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-nesting-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-nesting-002.html b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-nesting-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-nesting-002.html rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-nesting-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-nesting-003.xht b/tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-nesting-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/letter-spacing-nesting-003.xht rename to tests/wpt/tests/css/css-text/letter-spacing/letter-spacing-nesting-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-200-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-200-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-200-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-200-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-201-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-201-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-201-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-201-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-202-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-202-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-202-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-202-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-203-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-203-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-203-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-203-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-204-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-204-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-204-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-204-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-205-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-205-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-205-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-205-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-206-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-206-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-206-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-206-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-211-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-211-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-211-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-211-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-212-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-212-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-212-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-212-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-bengali-yaphala-001-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-bengali-yaphala-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-bengali-yaphala-001-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-bengali-yaphala-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-001-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-001-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-002-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-002-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-003-ref.xht b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-003-ref.xht rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-004-ref.xht b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-004-ref.xht rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-005-ref.xht b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-005-ref.xht rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-bidi-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-control-chars-001.ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-control-chars-001.ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-control-chars-001.ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-control-chars-001.ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-end-of-line-001-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-end-of-line-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-end-of-line-001-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-end-of-line-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-001-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-001-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-002-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-002-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-003-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-003-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-004-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-004-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-ligatures-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-nesting-001-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-nesting-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-nesting-001-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-nesting-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-nesting-002-ref.html b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-nesting-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-nesting-002-ref.html rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-nesting-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-nesting-003-ref.xht b/tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-nesting-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/reference/letter-spacing-nesting-003-ref.xht rename to tests/wpt/tests/css/css-text/letter-spacing/reference/letter-spacing-nesting-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/letter-spacing/support/swatch-orange.png b/tests/wpt/tests/css/css-text/letter-spacing/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/letter-spacing/support/swatch-orange.png rename to tests/wpt/tests/css/css-text/letter-spacing/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-001.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-001.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-002.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-002.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-003.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-003.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-004.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-004.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-005.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-005.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-006.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-006.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-007.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-007.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-008.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-008.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-009.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-009.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-010.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-010.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-011.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-011.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-012.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-012.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-013.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-013.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-014.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-014.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-015.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-015.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-016.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-016.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-017.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-017.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-001.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-001.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-002.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-002.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-003.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-003.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-004.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-004.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-005.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-005.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-006.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-006.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-007.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-007.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-008.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-008.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-009.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-and-white-space-009.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-and-white-space-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-001.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-001.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-002.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-002.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-003.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-003.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-004.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-004.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-005.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-005.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-006.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-006.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-007.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-007.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-008.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-008.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-009.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-009.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-010.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-010.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-011.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-011.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-012.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-012.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-013.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-013.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-014.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-014.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-015.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-015.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-016.html b/tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-016.html rename to tests/wpt/tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-011.xht b/tests/wpt/tests/css/css-text/line-break/line-break-loose-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-011.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-loose-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-012.xht b/tests/wpt/tests/css/css-text/line-break/line-break-loose-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-012.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-loose-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-013.xht b/tests/wpt/tests/css/css-text/line-break/line-break-loose-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-013.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-loose-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-014.xht b/tests/wpt/tests/css/css-text/line-break/line-break-loose-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-014.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-loose-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-015.xht b/tests/wpt/tests/css/css-text/line-break/line-break-loose-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-015.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-loose-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-016a.xht b/tests/wpt/tests/css/css-text/line-break/line-break-loose-016a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-016a.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-loose-016a.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-016b.xht b/tests/wpt/tests/css/css-text/line-break/line-break-loose-016b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-016b.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-loose-016b.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-017a.xht b/tests/wpt/tests/css/css-text/line-break/line-break-loose-017a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-017a.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-loose-017a.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-017b.xht b/tests/wpt/tests/css/css-text/line-break/line-break-loose-017b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-017b.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-loose-017b.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-018.xht b/tests/wpt/tests/css/css-text/line-break/line-break-loose-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-018.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-loose-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-hyphens-001.html b/tests/wpt/tests/css/css-text/line-break/line-break-loose-hyphens-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-hyphens-001.html rename to tests/wpt/tests/css/css-text/line-break/line-break-loose-hyphens-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-hyphens-002.html b/tests/wpt/tests/css/css-text/line-break/line-break-loose-hyphens-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-hyphens-002.html rename to tests/wpt/tests/css/css-text/line-break/line-break-loose-hyphens-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-hyphens-003.html b/tests/wpt/tests/css/css-text/line-break/line-break-loose-hyphens-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-loose-hyphens-003.html rename to tests/wpt/tests/css/css-text/line-break/line-break-loose-hyphens-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-011.xht b/tests/wpt/tests/css/css-text/line-break/line-break-normal-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-011.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-normal-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-012.xht b/tests/wpt/tests/css/css-text/line-break/line-break-normal-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-012.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-normal-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-013.xht b/tests/wpt/tests/css/css-text/line-break/line-break-normal-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-013.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-normal-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-014.xht b/tests/wpt/tests/css/css-text/line-break/line-break-normal-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-014.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-normal-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-015a.xht b/tests/wpt/tests/css/css-text/line-break/line-break-normal-015a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-015a.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-normal-015a.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-015b.xht b/tests/wpt/tests/css/css-text/line-break/line-break-normal-015b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-015b.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-normal-015b.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-016a.xht b/tests/wpt/tests/css/css-text/line-break/line-break-normal-016a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-016a.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-normal-016a.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-016b.xht b/tests/wpt/tests/css/css-text/line-break/line-break-normal-016b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-016b.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-normal-016b.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-017a.xht b/tests/wpt/tests/css/css-text/line-break/line-break-normal-017a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-017a.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-normal-017a.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-017b.xht b/tests/wpt/tests/css/css-text/line-break/line-break-normal-017b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-017b.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-normal-017b.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-018.xht b/tests/wpt/tests/css/css-text/line-break/line-break-normal-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-018.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-normal-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-hyphens-001.html b/tests/wpt/tests/css/css-text/line-break/line-break-normal-hyphens-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-hyphens-001.html rename to tests/wpt/tests/css/css-text/line-break/line-break-normal-hyphens-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-hyphens-002.html b/tests/wpt/tests/css/css-text/line-break/line-break-normal-hyphens-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-hyphens-002.html rename to tests/wpt/tests/css/css-text/line-break/line-break-normal-hyphens-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-hyphens-003.html b/tests/wpt/tests/css/css-text/line-break/line-break-normal-hyphens-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-normal-hyphens-003.html rename to tests/wpt/tests/css/css-text/line-break/line-break-normal-hyphens-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-shaping-001.html b/tests/wpt/tests/css/css-text/line-break/line-break-shaping-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-shaping-001.html rename to tests/wpt/tests/css/css-text/line-break/line-break-shaping-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-011.xht b/tests/wpt/tests/css/css-text/line-break/line-break-strict-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-011.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-strict-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-012.xht b/tests/wpt/tests/css/css-text/line-break/line-break-strict-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-012.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-strict-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-013.xht b/tests/wpt/tests/css/css-text/line-break/line-break-strict-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-013.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-strict-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-014.xht b/tests/wpt/tests/css/css-text/line-break/line-break-strict-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-014.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-strict-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-015a.xht b/tests/wpt/tests/css/css-text/line-break/line-break-strict-015a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-015a.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-strict-015a.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-015b.xht b/tests/wpt/tests/css/css-text/line-break/line-break-strict-015b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-015b.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-strict-015b.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-016a.xht b/tests/wpt/tests/css/css-text/line-break/line-break-strict-016a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-016a.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-strict-016a.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-016b.xht b/tests/wpt/tests/css/css-text/line-break/line-break-strict-016b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-016b.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-strict-016b.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-017a.xht b/tests/wpt/tests/css/css-text/line-break/line-break-strict-017a.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-017a.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-strict-017a.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-017b.xht b/tests/wpt/tests/css/css-text/line-break/line-break-strict-017b.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-017b.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-strict-017b.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-018.xht b/tests/wpt/tests/css/css-text/line-break/line-break-strict-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-018.xht rename to tests/wpt/tests/css/css-text/line-break/line-break-strict-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-hyphens-001.html b/tests/wpt/tests/css/css-text/line-break/line-break-strict-hyphens-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-hyphens-001.html rename to tests/wpt/tests/css/css-text/line-break/line-break-strict-hyphens-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-hyphens-002.html b/tests/wpt/tests/css/css-text/line-break/line-break-strict-hyphens-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-hyphens-002.html rename to tests/wpt/tests/css/css-text/line-break/line-break-strict-hyphens-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-hyphens-003.html b/tests/wpt/tests/css/css-text/line-break/line-break-strict-hyphens-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/line-break-strict-hyphens-003.html rename to tests/wpt/tests/css/css-text/line-break/line-break-strict-hyphens-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-anywhere-001-ref.html b/tests/wpt/tests/css/css-text/line-break/reference/line-break-anywhere-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-anywhere-001-ref.html rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-anywhere-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-anywhere-003-ref.html b/tests/wpt/tests/css/css-text/line-break/reference/line-break-anywhere-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-anywhere-003-ref.html rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-anywhere-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-anywhere-004-ref.html b/tests/wpt/tests/css/css-text/line-break/reference/line-break-anywhere-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-anywhere-004-ref.html rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-anywhere-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-011-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-011-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-012-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-012-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-013-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-013-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-014-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-014-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-015-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-015-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-016a-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-016a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-016a-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-016a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-016b-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-016b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-016b-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-016b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-017a-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-017a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-017a-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-017a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-017b-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-017b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-017b-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-017b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-018-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-018-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-hyphens-001-ref.html b/tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-hyphens-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-hyphens-001-ref.html rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-hyphens-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-hyphens-002-ref.html b/tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-hyphens-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-hyphens-002-ref.html rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-hyphens-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-hyphens-003-ref.html b/tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-hyphens-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-loose-hyphens-003-ref.html rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-loose-hyphens-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-011-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-011-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-012-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-012-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-013-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-013-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-014-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-014-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-015a-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-015a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-015a-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-015a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-015b-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-015b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-015b-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-015b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-016a-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-016a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-016a-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-016a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-016b-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-016b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-016b-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-016b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-017a-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-017a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-017a-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-017a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-017b-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-017b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-017b-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-017b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-018-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-018-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-hyphens-001-ref.html b/tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-hyphens-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-hyphens-001-ref.html rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-hyphens-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-hyphens-002-ref.html b/tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-hyphens-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-normal-hyphens-002-ref.html rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-normal-hyphens-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-shaping-001-ref.html b/tests/wpt/tests/css/css-text/line-break/reference/line-break-shaping-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-shaping-001-ref.html rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-shaping-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-011-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-011-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-012-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-012-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-013-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-013-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-014-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-014-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-015a-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-015a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-015a-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-015a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-015b-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-015b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-015b-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-015b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-016a-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-016a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-016a-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-016a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-016b-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-016b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-016b-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-016b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-017a-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-017a-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-017a-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-017a-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-017b-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-017b-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-017b-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-017b-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-018-ref.xht b/tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-break/reference/line-break-strict-018-ref.xht rename to tests/wpt/tests/css/css-text/line-break/reference/line-break-strict-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-001.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-001.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-002.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-002.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-003.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-003.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-004.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-004.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-005.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-005.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-006.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-006.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-007.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-007.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-008.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-008.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-009.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-009.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-010.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-010.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-011.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-011.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-012.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-012.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-013.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-013.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-014.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-014.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-015.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-015.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-016.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-016.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-017.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-017.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-018.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-018.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-019.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-019.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-019.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-020.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-020.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-020.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-021.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-021.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-021.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-022.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-022.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-022.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-023.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-023.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-023.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-024.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-024.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-024.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-025.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-025.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-025.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-026.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-026.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-026.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-027.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-027.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-027.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-001.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-001.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-002.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-002.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-003.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-003.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-004.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-004.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-005.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-005.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-006.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-006.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-007.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-007.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-008.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-008.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-009.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-009.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-nowrap-001.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-nowrap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-atomic-nowrap-001.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-atomic-nowrap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-ic-001.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-ic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-ic-001.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-ic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-ic-002.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-ic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-ic-002.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-ic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-ic-003.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-ic-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-ic-003.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-ic-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-replaced-001.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-replaced-001.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-replaced-002.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-replaced-002.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-replaced-003.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-replaced-003.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-replaced-004.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-replaced-004.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-replaced-005.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-replaced-005.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-replaced-006.html b/tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-replaced-006.html rename to tests/wpt/tests/css/css-text/line-breaking/line-breaking-replaced-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-001-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-001-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-012-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-012-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-013-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-013-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-015-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-015-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-016-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-016-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-017-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-017-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-018-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-018-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-019-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-019-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-021-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-021-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-023-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-023-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-024-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-024-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-025-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-025-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-026-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-026-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-026-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-026-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-027-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-027-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-atomic-004-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-atomic-004-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-atomic-005-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-atomic-005-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-atomic-007-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-atomic-007-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-atomic-008-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-atomic-008-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-atomic-009-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-atomic-009-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-atomic-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-ic-001-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-ic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-ic-001-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-ic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-replaced-001-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-replaced-001-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-replaced-002-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-replaced-002-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-replaced-003-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-replaced-003-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-replaced-004-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-replaced-004-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-replaced-006-ref.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-replaced-006-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-breaking-replaced-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-reabking-022.html b/tests/wpt/tests/css/css-text/line-breaking/reference/line-reabking-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-reabking-022.html rename to tests/wpt/tests/css/css-text/line-breaking/reference/line-reabking-022.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-removable-1.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-removable-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-removable-1.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-removable-1.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-removable-2.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-removable-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-removable-2.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-removable-2.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-removable-3.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-removable-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-removable-3.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-removable-3.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-removable-4.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-removable-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-removable-4.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-removable-4.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-removable-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-removable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-removable-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-removable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-001-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-001-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-001.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-001.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-002-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-002-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-002.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-002.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-003-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-003-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-003.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-003.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-004-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-004-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-004.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-004.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-005-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-005-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-005.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-005.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-006-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-006-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-006.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-006.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-007-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-007-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-007.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-007.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-008-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-008-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-008.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-008.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-009-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-009-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-009.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-009.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-010-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-010-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-010.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-010.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-011-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-011-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-011.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-011.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-012-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-012-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-012.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-012.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-013-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-013-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-013.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-013.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-014-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-014-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-014.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-014.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-015-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-015-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-015.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-015.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-016-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-016-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-016.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-016.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-017-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-017-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-017.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-017.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-018-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-018-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-018.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-018.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-019-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-019-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-019.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-019.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-019.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-020-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-020-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-020.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-020.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-020.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-021-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-021-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-021.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-021.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-021.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-022-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-022-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-022.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-022.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-022.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-023-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-023-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-023.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-023.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-023.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-024-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-024-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-024.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-024.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-024.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-025-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-025-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-025.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-025.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-025.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-026-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-026-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-026-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-026-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-026.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-026.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-026.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-027-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-027-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-027.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-027.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-027.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-028-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-028-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-028-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-028-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-028.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-028.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-028.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-029-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-029-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-029-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-029-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-029.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-029.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-029.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-030-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-030-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-030-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-030-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-030.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-030.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-030.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-031-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-031-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-031-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-031-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-031.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-031.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-031.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-032-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-032-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-032-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-032-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-032.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-032.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-032.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-033-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-033-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-033-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-033-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-033.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-033.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-033.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-034-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-034-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-034-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-034-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-034.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-034.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-034.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-035-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-035-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-035-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-035-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-035.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-035.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-035.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-036-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-036-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-036-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-036-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-036.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-036.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-036.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-037-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-037-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-037-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-037-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-037.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-037.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-037.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-038-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-038-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-038-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-038-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-038.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-038.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-038.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-039-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-039-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-039-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-039-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-039.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-039.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-039.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-040-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-040-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-040-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-040-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-040.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-040.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-040.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-041-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-041-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-041-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-041-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-041.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-041.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-041.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-042-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-042-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-042-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-042-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-042.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-042.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-042.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-043-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-043-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-043-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-043-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-043.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-043.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-043.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-044-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-044-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-044-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-044-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-044.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-044.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-044.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-045-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-045-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-045-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-045-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-045.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-045.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-045.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-046-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-046-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-046-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-046-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-046.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-046.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-046.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-047-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-047-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-047-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-047-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-047.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-047.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-047.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-048-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-048-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-048-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-048-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-048.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-048.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-048.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-049-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-049-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-049-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-049-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-049.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-rules-049.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-rules-049.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-unremovable-1.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-unremovable-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-unremovable-1.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-unremovable-1.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-unremovable-2.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-unremovable-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-unremovable-2.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-unremovable-2.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-unremovable-3.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-unremovable-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-unremovable-3.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-unremovable-3.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-unremovable-4.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-unremovable-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-unremovable-4.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-unremovable-4.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-unremovable-ref.html b/tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-unremovable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/segment-break-transformation-unremovable-ref.html rename to tests/wpt/tests/css/css-text/line-breaking/segment-break-transformation-unremovable-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/tools/generate-segment-break-transformation-rules-tests.py b/tests/wpt/tests/css/css-text/line-breaking/tools/generate-segment-break-transformation-rules-tests.py similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/line-breaking/tools/generate-segment-break-transformation-rules-tests.py rename to tests/wpt/tests/css/css-text/line-breaking/tools/generate-segment-break-transformation-rules-tests.py diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-001-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-001-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-002-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-002-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-002.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-002.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-004-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-004-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-004.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-004.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-002.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-002.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-003.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-003.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-004.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-004.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-005.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-005.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-006.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-006.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-007.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-007.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-008.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-008.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-009.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-009.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-010.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-010.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-011-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-011-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-011.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-011.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-fit-content-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-fit-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-fit-content-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-fit-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-002.tentative.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-002.tentative.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-003.tentative.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-003.tentative.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-004.tentative.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-004.tentative.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-004.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-span-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-span-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-span-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-span-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-span-002.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-span-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-span-002.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-anywhere-span-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-002.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-002.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-003.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-003.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-004.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-004.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-005.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-005.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-006.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-006.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-007.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-007.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-008.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-008.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-009.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-009.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-010.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-010.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-fit-content-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-fit-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-fit-content-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-fit-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-keep-all-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-keep-all-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-keep-all-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-keep-all-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-long-crash.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-long-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-long-crash.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-long-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-span-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-span-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-span-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-span-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-span-002.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-span-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-span-002.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-span-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash-002.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash-002.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-cluster-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-cluster-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-cluster-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-cluster-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-cluster-002.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-cluster-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-cluster-002.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-cluster-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-004.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-004.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-005.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-005.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-006.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-006.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-007.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-007.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-008.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-008.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-009.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-009.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-normal-keep-all-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-normal-keep-all-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-normal-keep-all-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-normal-keep-all-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-shaping-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-shaping-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-shaping-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-shaping-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-shaping-002.html b/tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-shaping-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-shaping-002.html rename to tests/wpt/tests/css/css-text/overflow-wrap/overflow-wrap-shaping-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-001-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-001-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-002-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-002-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-003-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-003-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-fit-content-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-fit-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-fit-content-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-fit-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-span-001-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-span-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-span-001-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-break-word-span-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-cluster-001-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-cluster-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-cluster-001-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-cluster-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-001-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-001-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-002-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-002-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-003-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-003-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-004-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-004-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-009-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-009-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-min-content-size-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-normal-keep-all-001-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-normal-keep-all-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-normal-keep-all-001-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-normal-keep-all-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-shaping-001-ref.html b/tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-shaping-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/reference/overflow-wrap-shaping-001-ref.html rename to tests/wpt/tests/css/css-text/overflow-wrap/reference/overflow-wrap-shaping-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/word-wrap-001.html b/tests/wpt/tests/css/css-text/overflow-wrap/word-wrap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/word-wrap-001.html rename to tests/wpt/tests/css/css-text/overflow-wrap/word-wrap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/word-wrap-002.html b/tests/wpt/tests/css/css-text/overflow-wrap/word-wrap-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/word-wrap-002.html rename to tests/wpt/tests/css/css-text/overflow-wrap/word-wrap-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/word-wrap-004.html b/tests/wpt/tests/css/css-text/overflow-wrap/word-wrap-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/word-wrap-004.html rename to tests/wpt/tests/css/css-text/overflow-wrap/word-wrap-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/word-wrap-alias.html b/tests/wpt/tests/css/css-text/overflow-wrap/word-wrap-alias.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/overflow-wrap/word-wrap-alias.html rename to tests/wpt/tests/css/css-text/overflow-wrap/word-wrap-alias.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/hanging-punctuation-invalid.html b/tests/wpt/tests/css/css-text/parsing/hanging-punctuation-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/hanging-punctuation-invalid.html rename to tests/wpt/tests/css/css-text/parsing/hanging-punctuation-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/hanging-punctuation-valid.html b/tests/wpt/tests/css/css-text/parsing/hanging-punctuation-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/hanging-punctuation-valid.html rename to tests/wpt/tests/css/css-text/parsing/hanging-punctuation-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/hyphenate-character-computed.html b/tests/wpt/tests/css/css-text/parsing/hyphenate-character-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/hyphenate-character-computed.html rename to tests/wpt/tests/css/css-text/parsing/hyphenate-character-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/hyphenate-character-invalid.html b/tests/wpt/tests/css/css-text/parsing/hyphenate-character-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/hyphenate-character-invalid.html rename to tests/wpt/tests/css/css-text/parsing/hyphenate-character-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/hyphenate-character-valid.html b/tests/wpt/tests/css/css-text/parsing/hyphenate-character-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/hyphenate-character-valid.html rename to tests/wpt/tests/css/css-text/parsing/hyphenate-character-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/hyphenate-limit-chars-computed.html b/tests/wpt/tests/css/css-text/parsing/hyphenate-limit-chars-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/hyphenate-limit-chars-computed.html rename to tests/wpt/tests/css/css-text/parsing/hyphenate-limit-chars-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/hyphenate-limit-chars-invalid.html b/tests/wpt/tests/css/css-text/parsing/hyphenate-limit-chars-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/hyphenate-limit-chars-invalid.html rename to tests/wpt/tests/css/css-text/parsing/hyphenate-limit-chars-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/hyphenate-limit-chars-valid.html b/tests/wpt/tests/css/css-text/parsing/hyphenate-limit-chars-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/hyphenate-limit-chars-valid.html rename to tests/wpt/tests/css/css-text/parsing/hyphenate-limit-chars-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/hyphens-computed.html b/tests/wpt/tests/css/css-text/parsing/hyphens-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/hyphens-computed.html rename to tests/wpt/tests/css/css-text/parsing/hyphens-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/hyphens-invalid.html b/tests/wpt/tests/css/css-text/parsing/hyphens-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/hyphens-invalid.html rename to tests/wpt/tests/css/css-text/parsing/hyphens-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/hyphens-valid.html b/tests/wpt/tests/css/css-text/parsing/hyphens-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/hyphens-valid.html rename to tests/wpt/tests/css/css-text/parsing/hyphens-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/letter-spacing-computed.html b/tests/wpt/tests/css/css-text/parsing/letter-spacing-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/letter-spacing-computed.html rename to tests/wpt/tests/css/css-text/parsing/letter-spacing-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/letter-spacing-invalid.html b/tests/wpt/tests/css/css-text/parsing/letter-spacing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/letter-spacing-invalid.html rename to tests/wpt/tests/css/css-text/parsing/letter-spacing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/letter-spacing-valid.html b/tests/wpt/tests/css/css-text/parsing/letter-spacing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/letter-spacing-valid.html rename to tests/wpt/tests/css/css-text/parsing/letter-spacing-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/line-break-computed.html b/tests/wpt/tests/css/css-text/parsing/line-break-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/line-break-computed.html rename to tests/wpt/tests/css/css-text/parsing/line-break-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/line-break-invalid.html b/tests/wpt/tests/css/css-text/parsing/line-break-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/line-break-invalid.html rename to tests/wpt/tests/css/css-text/parsing/line-break-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/line-break-valid.html b/tests/wpt/tests/css/css-text/parsing/line-break-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/line-break-valid.html rename to tests/wpt/tests/css/css-text/parsing/line-break-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/overflow-wrap-computed.html b/tests/wpt/tests/css/css-text/parsing/overflow-wrap-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/overflow-wrap-computed.html rename to tests/wpt/tests/css/css-text/parsing/overflow-wrap-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/overflow-wrap-invalid.html b/tests/wpt/tests/css/css-text/parsing/overflow-wrap-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/overflow-wrap-invalid.html rename to tests/wpt/tests/css/css-text/parsing/overflow-wrap-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/overflow-wrap-valid.html b/tests/wpt/tests/css/css-text/parsing/overflow-wrap-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/overflow-wrap-valid.html rename to tests/wpt/tests/css/css-text/parsing/overflow-wrap-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/tab-size-computed.html b/tests/wpt/tests/css/css-text/parsing/tab-size-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/tab-size-computed.html rename to tests/wpt/tests/css/css-text/parsing/tab-size-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/tab-size-invalid.html b/tests/wpt/tests/css/css-text/parsing/tab-size-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/tab-size-invalid.html rename to tests/wpt/tests/css/css-text/parsing/tab-size-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/tab-size-valid.html b/tests/wpt/tests/css/css-text/parsing/tab-size-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/tab-size-valid.html rename to tests/wpt/tests/css/css-text/parsing/tab-size-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-align-all-invalid.html b/tests/wpt/tests/css/css-text/parsing/text-align-all-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-align-all-invalid.html rename to tests/wpt/tests/css/css-text/parsing/text-align-all-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-align-all-valid.html b/tests/wpt/tests/css/css-text/parsing/text-align-all-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-align-all-valid.html rename to tests/wpt/tests/css/css-text/parsing/text-align-all-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-align-computed.html b/tests/wpt/tests/css/css-text/parsing/text-align-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-align-computed.html rename to tests/wpt/tests/css/css-text/parsing/text-align-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-align-invalid.html b/tests/wpt/tests/css/css-text/parsing/text-align-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-align-invalid.html rename to tests/wpt/tests/css/css-text/parsing/text-align-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-align-last-computed.html b/tests/wpt/tests/css/css-text/parsing/text-align-last-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-align-last-computed.html rename to tests/wpt/tests/css/css-text/parsing/text-align-last-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-align-last-invalid.html b/tests/wpt/tests/css/css-text/parsing/text-align-last-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-align-last-invalid.html rename to tests/wpt/tests/css/css-text/parsing/text-align-last-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-align-last-valid.html b/tests/wpt/tests/css/css-text/parsing/text-align-last-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-align-last-valid.html rename to tests/wpt/tests/css/css-text/parsing/text-align-last-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-align-valid.html b/tests/wpt/tests/css/css-text/parsing/text-align-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-align-valid.html rename to tests/wpt/tests/css/css-text/parsing/text-align-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-group-align-invalid.html b/tests/wpt/tests/css/css-text/parsing/text-group-align-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-group-align-invalid.html rename to tests/wpt/tests/css/css-text/parsing/text-group-align-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-group-align-valid.html b/tests/wpt/tests/css/css-text/parsing/text-group-align-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-group-align-valid.html rename to tests/wpt/tests/css/css-text/parsing/text-group-align-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-indent-computed.html b/tests/wpt/tests/css/css-text/parsing/text-indent-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-indent-computed.html rename to tests/wpt/tests/css/css-text/parsing/text-indent-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-indent-invalid.html b/tests/wpt/tests/css/css-text/parsing/text-indent-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-indent-invalid.html rename to tests/wpt/tests/css/css-text/parsing/text-indent-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-indent-valid.html b/tests/wpt/tests/css/css-text/parsing/text-indent-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-indent-valid.html rename to tests/wpt/tests/css/css-text/parsing/text-indent-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-justify-computed-legacy.html b/tests/wpt/tests/css/css-text/parsing/text-justify-computed-legacy.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-justify-computed-legacy.html rename to tests/wpt/tests/css/css-text/parsing/text-justify-computed-legacy.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-justify-computed.html b/tests/wpt/tests/css/css-text/parsing/text-justify-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-justify-computed.html rename to tests/wpt/tests/css/css-text/parsing/text-justify-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-justify-invalid.html b/tests/wpt/tests/css/css-text/parsing/text-justify-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-justify-invalid.html rename to tests/wpt/tests/css/css-text/parsing/text-justify-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-justify-valid.html b/tests/wpt/tests/css/css-text/parsing/text-justify-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-justify-valid.html rename to tests/wpt/tests/css/css-text/parsing/text-justify-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-transform-computed.html b/tests/wpt/tests/css/css-text/parsing/text-transform-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-transform-computed.html rename to tests/wpt/tests/css/css-text/parsing/text-transform-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-transform-invalid.html b/tests/wpt/tests/css/css-text/parsing/text-transform-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-transform-invalid.html rename to tests/wpt/tests/css/css-text/parsing/text-transform-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-transform-valid.html b/tests/wpt/tests/css/css-text/parsing/text-transform-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-transform-valid.html rename to tests/wpt/tests/css/css-text/parsing/text-transform-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-wrap-invalid.html b/tests/wpt/tests/css/css-text/parsing/text-wrap-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-wrap-invalid.html rename to tests/wpt/tests/css/css-text/parsing/text-wrap-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/text-wrap-valid.html b/tests/wpt/tests/css/css-text/parsing/text-wrap-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/text-wrap-valid.html rename to tests/wpt/tests/css/css-text/parsing/text-wrap-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/white-space-collapse-computed.html b/tests/wpt/tests/css/css-text/parsing/white-space-collapse-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/white-space-collapse-computed.html rename to tests/wpt/tests/css/css-text/parsing/white-space-collapse-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/white-space-collapse-invalid.html b/tests/wpt/tests/css/css-text/parsing/white-space-collapse-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/white-space-collapse-invalid.html rename to tests/wpt/tests/css/css-text/parsing/white-space-collapse-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/white-space-collapse-valid.html b/tests/wpt/tests/css/css-text/parsing/white-space-collapse-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/white-space-collapse-valid.html rename to tests/wpt/tests/css/css-text/parsing/white-space-collapse-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/white-space-computed.html b/tests/wpt/tests/css/css-text/parsing/white-space-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/white-space-computed.html rename to tests/wpt/tests/css/css-text/parsing/white-space-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/white-space-invalid.html b/tests/wpt/tests/css/css-text/parsing/white-space-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/white-space-invalid.html rename to tests/wpt/tests/css/css-text/parsing/white-space-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/white-space-shorthand-text-wrap.html b/tests/wpt/tests/css/css-text/parsing/white-space-shorthand-text-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/white-space-shorthand-text-wrap.html rename to tests/wpt/tests/css/css-text/parsing/white-space-shorthand-text-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/white-space-shorthand.html b/tests/wpt/tests/css/css-text/parsing/white-space-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/white-space-shorthand.html rename to tests/wpt/tests/css/css-text/parsing/white-space-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/white-space-valid.html b/tests/wpt/tests/css/css-text/parsing/white-space-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/white-space-valid.html rename to tests/wpt/tests/css/css-text/parsing/white-space-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-boundary-detection-computed.html b/tests/wpt/tests/css/css-text/parsing/word-boundary-detection-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-boundary-detection-computed.html rename to tests/wpt/tests/css/css-text/parsing/word-boundary-detection-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-boundary-detection-invalid.html b/tests/wpt/tests/css/css-text/parsing/word-boundary-detection-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-boundary-detection-invalid.html rename to tests/wpt/tests/css/css-text/parsing/word-boundary-detection-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-boundary-detection-valid.html b/tests/wpt/tests/css/css-text/parsing/word-boundary-detection-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-boundary-detection-valid.html rename to tests/wpt/tests/css/css-text/parsing/word-boundary-detection-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-boundary-expansion-computed.html b/tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-boundary-expansion-computed.html rename to tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-boundary-expansion-invalid.html b/tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-boundary-expansion-invalid.html rename to tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-boundary-expansion-valid.html b/tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-boundary-expansion-valid.html rename to tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-break-computed.html b/tests/wpt/tests/css/css-text/parsing/word-break-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-break-computed.html rename to tests/wpt/tests/css/css-text/parsing/word-break-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-break-invalid.html b/tests/wpt/tests/css/css-text/parsing/word-break-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-break-invalid.html rename to tests/wpt/tests/css/css-text/parsing/word-break-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-break-valid.html b/tests/wpt/tests/css/css-text/parsing/word-break-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-break-valid.html rename to tests/wpt/tests/css/css-text/parsing/word-break-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-spacing-computed.html b/tests/wpt/tests/css/css-text/parsing/word-spacing-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-spacing-computed.html rename to tests/wpt/tests/css/css-text/parsing/word-spacing-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-spacing-invalid.html b/tests/wpt/tests/css/css-text/parsing/word-spacing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-spacing-invalid.html rename to tests/wpt/tests/css/css-text/parsing/word-spacing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-spacing-valid.html b/tests/wpt/tests/css/css-text/parsing/word-spacing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-spacing-valid.html rename to tests/wpt/tests/css/css-text/parsing/word-spacing-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-wrap-computed.html b/tests/wpt/tests/css/css-text/parsing/word-wrap-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-wrap-computed.html rename to tests/wpt/tests/css/css-text/parsing/word-wrap-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-wrap-invalid.html b/tests/wpt/tests/css/css-text/parsing/word-wrap-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-wrap-invalid.html rename to tests/wpt/tests/css/css-text/parsing/word-wrap-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/parsing/word-wrap-valid.html b/tests/wpt/tests/css/css-text/parsing/word-wrap-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/parsing/word-wrap-valid.html rename to tests/wpt/tests/css/css-text/parsing/word-wrap-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-text/removing-collapsible-crash.html b/tests/wpt/tests/css/css-text/removing-collapsible-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/removing-collapsible-crash.html rename to tests/wpt/tests/css/css-text/removing-collapsible-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/removing-collapsible-spaces-before-float-crash.html b/tests/wpt/tests/css/css-text/removing-collapsible-spaces-before-float-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/removing-collapsible-spaces-before-float-crash.html rename to tests/wpt/tests/css/css-text/removing-collapsible-spaces-before-float-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-000-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-000-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-000-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-000-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-000-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-000-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-001-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-001-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-001-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-001-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-001-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-001-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-002-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-002-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-002-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-002-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-002-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-002-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-003-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-003-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-003-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-003-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-003-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-003-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-008-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-008-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-008-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-008-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-008-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-008-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-009-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-009-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-009-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-009-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-009-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-009-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-010-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-010-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-010-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-010-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-010-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-010-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-011-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-011-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-011-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-011-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-011-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-011-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-012-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-012-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-012-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-012-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-012-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-012-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-014-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-014-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-014-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-014-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-014-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-014-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-016-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-016-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-016-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-016-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-016-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-016-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-020-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-020-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-020-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-020-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-020-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-020-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-021-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-021-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-021-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-021-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-021-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-021-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-022-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-022-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-022-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-022-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-022-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-022-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-023-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-023-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-023-sanity-2-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-023-sanity-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-023-sanity-2-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-023-sanity-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-023-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-023-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-023-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-023-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-024-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-024-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-024-sanity-2-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-024-sanity-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-024-sanity-2-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-024-sanity-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-024-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-024-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-024-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-024-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-025-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-025-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-025-sanity-2-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-025-sanity-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-025-sanity-2-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-025-sanity-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-025-sanity-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-025-sanity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-025-sanity-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-025-sanity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-arabic-diacritics-001-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-arabic-diacritics-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-arabic-diacritics-001-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-arabic-diacritics-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-arabic-diacritics-002-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping-arabic-diacritics-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping-arabic-diacritics-002-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping-arabic-diacritics-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping_lig-000-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping_lig-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping_lig-000-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping_lig-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping_lig-001-ref.html b/tests/wpt/tests/css/css-text/shaping/reference/shaping_lig-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/reference/shaping_lig-001-ref.html rename to tests/wpt/tests/css/css-text/shaping/reference/shaping_lig-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-000.html b/tests/wpt/tests/css/css-text/shaping/shaping-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-000.html rename to tests/wpt/tests/css/css-text/shaping/shaping-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-001.html b/tests/wpt/tests/css/css-text/shaping/shaping-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-001.html rename to tests/wpt/tests/css/css-text/shaping/shaping-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-002.html b/tests/wpt/tests/css/css-text/shaping/shaping-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-002.html rename to tests/wpt/tests/css/css-text/shaping/shaping-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-003.html b/tests/wpt/tests/css/css-text/shaping/shaping-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-003.html rename to tests/wpt/tests/css/css-text/shaping/shaping-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-004.html b/tests/wpt/tests/css/css-text/shaping/shaping-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-004.html rename to tests/wpt/tests/css/css-text/shaping/shaping-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-005.html b/tests/wpt/tests/css/css-text/shaping/shaping-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-005.html rename to tests/wpt/tests/css/css-text/shaping/shaping-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-006.html b/tests/wpt/tests/css/css-text/shaping/shaping-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-006.html rename to tests/wpt/tests/css/css-text/shaping/shaping-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-007.html b/tests/wpt/tests/css/css-text/shaping/shaping-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-007.html rename to tests/wpt/tests/css/css-text/shaping/shaping-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-008.html b/tests/wpt/tests/css/css-text/shaping/shaping-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-008.html rename to tests/wpt/tests/css/css-text/shaping/shaping-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-009.html b/tests/wpt/tests/css/css-text/shaping/shaping-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-009.html rename to tests/wpt/tests/css/css-text/shaping/shaping-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-010.html b/tests/wpt/tests/css/css-text/shaping/shaping-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-010.html rename to tests/wpt/tests/css/css-text/shaping/shaping-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-011.html b/tests/wpt/tests/css/css-text/shaping/shaping-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-011.html rename to tests/wpt/tests/css/css-text/shaping/shaping-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-012.html b/tests/wpt/tests/css/css-text/shaping/shaping-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-012.html rename to tests/wpt/tests/css/css-text/shaping/shaping-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-013.html b/tests/wpt/tests/css/css-text/shaping/shaping-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-013.html rename to tests/wpt/tests/css/css-text/shaping/shaping-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-014.html b/tests/wpt/tests/css/css-text/shaping/shaping-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-014.html rename to tests/wpt/tests/css/css-text/shaping/shaping-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-016.html b/tests/wpt/tests/css/css-text/shaping/shaping-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-016.html rename to tests/wpt/tests/css/css-text/shaping/shaping-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-017.html b/tests/wpt/tests/css/css-text/shaping/shaping-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-017.html rename to tests/wpt/tests/css/css-text/shaping/shaping-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-018.html b/tests/wpt/tests/css/css-text/shaping/shaping-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-018.html rename to tests/wpt/tests/css/css-text/shaping/shaping-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-020.html b/tests/wpt/tests/css/css-text/shaping/shaping-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-020.html rename to tests/wpt/tests/css/css-text/shaping/shaping-020.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-021.html b/tests/wpt/tests/css/css-text/shaping/shaping-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-021.html rename to tests/wpt/tests/css/css-text/shaping/shaping-021.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-022.html b/tests/wpt/tests/css/css-text/shaping/shaping-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-022.html rename to tests/wpt/tests/css/css-text/shaping/shaping-022.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-023.html b/tests/wpt/tests/css/css-text/shaping/shaping-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-023.html rename to tests/wpt/tests/css/css-text/shaping/shaping-023.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-024.html b/tests/wpt/tests/css/css-text/shaping/shaping-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-024.html rename to tests/wpt/tests/css/css-text/shaping/shaping-024.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-025.html b/tests/wpt/tests/css/css-text/shaping/shaping-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-025.html rename to tests/wpt/tests/css/css-text/shaping/shaping-025.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-arabic-diacritics-001.html b/tests/wpt/tests/css/css-text/shaping/shaping-arabic-diacritics-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-arabic-diacritics-001.html rename to tests/wpt/tests/css/css-text/shaping/shaping-arabic-diacritics-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping-arabic-diacritics-002.html b/tests/wpt/tests/css/css-text/shaping/shaping-arabic-diacritics-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping-arabic-diacritics-002.html rename to tests/wpt/tests/css/css-text/shaping/shaping-arabic-diacritics-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping_lig-000.html b/tests/wpt/tests/css/css-text/shaping/shaping_lig-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping_lig-000.html rename to tests/wpt/tests/css/css-text/shaping/shaping_lig-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/shaping/shaping_lig-001.html b/tests/wpt/tests/css/css-text/shaping/shaping_lig-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/shaping/shaping_lig-001.html rename to tests/wpt/tests/css/css-text/shaping/shaping_lig-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/support/1x1-green.png b/tests/wpt/tests/css/css-text/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/1x1-green.png rename to tests/wpt/tests/css/css-text/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/1x1-lime.png b/tests/wpt/tests/css/css-text/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/1x1-lime.png rename to tests/wpt/tests/css/css-text/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/1x1-maroon.png b/tests/wpt/tests/css/css-text/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/1x1-maroon.png rename to tests/wpt/tests/css/css-text/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/1x1-navy.png b/tests/wpt/tests/css/css-text/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/1x1-navy.png rename to tests/wpt/tests/css/css-text/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/1x1-red.png b/tests/wpt/tests/css/css-text/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/1x1-red.png rename to tests/wpt/tests/css/css-text/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/1x1-white.png b/tests/wpt/tests/css/css-text/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/1x1-white.png rename to tests/wpt/tests/css/css-text/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/60x60-gg-rr.png b/tests/wpt/tests/css/css-text/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/60x60-gg-rr.png rename to tests/wpt/tests/css/css-text/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/60x60-green.png b/tests/wpt/tests/css/css-text/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/60x60-green.png rename to tests/wpt/tests/css/css-text/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/a-green.css b/tests/wpt/tests/css/css-text/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/a-green.css rename to tests/wpt/tests/css/css-text/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/css-text/support/b-green.css b/tests/wpt/tests/css/css-text/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/b-green.css rename to tests/wpt/tests/css/css-text/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/css-text/support/c-red.css b/tests/wpt/tests/css/css-text/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/c-red.css rename to tests/wpt/tests/css/css-text/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/css-text/support/cat.png b/tests/wpt/tests/css/css-text/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/cat.png rename to tests/wpt/tests/css/css-text/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/emphasis-black.png b/tests/wpt/tests/css/css-text/support/emphasis-black.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/emphasis-black.png rename to tests/wpt/tests/css/css-text/support/emphasis-black.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/emphasis-blue.png b/tests/wpt/tests/css/css-text/support/emphasis-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/emphasis-blue.png rename to tests/wpt/tests/css/css-text/support/emphasis-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/css-text/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/css-text/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/css-text/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/css-text/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/css-text/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/css-text/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/pattern-tr.png b/tests/wpt/tests/css/css-text/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/pattern-tr.png rename to tests/wpt/tests/css/css-text/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/ruler-h-50%.png b/tests/wpt/tests/css/css-text/support/ruler-h-50%.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/ruler-h-50%.png rename to tests/wpt/tests/css/css-text/support/ruler-h-50%.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/ruler-h-50px.png b/tests/wpt/tests/css/css-text/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/ruler-h-50px.png rename to tests/wpt/tests/css/css-text/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/ruler-v-100px.png b/tests/wpt/tests/css/css-text/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/ruler-v-100px.png rename to tests/wpt/tests/css/css-text/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/ruler-v-50px.png b/tests/wpt/tests/css/css-text/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/ruler-v-50px.png rename to tests/wpt/tests/css/css-text/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/square-purple.png b/tests/wpt/tests/css/css-text/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/square-purple.png rename to tests/wpt/tests/css/css-text/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/square-teal.png b/tests/wpt/tests/css/css-text/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/square-teal.png rename to tests/wpt/tests/css/css-text/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/square-white.png b/tests/wpt/tests/css/css-text/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/square-white.png rename to tests/wpt/tests/css/css-text/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/support/README b/tests/wpt/tests/css/css-text/support/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/support/README rename to tests/wpt/tests/css/css-text/support/support/README diff --git a/tests/wpt/web-platform-tests/css/css-text/support/support/swatch-green.png b/tests/wpt/tests/css/css-text/support/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/support/swatch-green.png rename to tests/wpt/tests/css/css-text/support/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/support/swatch-red.png b/tests/wpt/tests/css/css-text/support/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/support/swatch-red.png rename to tests/wpt/tests/css/css-text/support/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/swatch-blue.png b/tests/wpt/tests/css/css-text/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/swatch-blue.png rename to tests/wpt/tests/css/css-text/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/swatch-green.png b/tests/wpt/tests/css/css-text/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/swatch-green.png rename to tests/wpt/tests/css/css-text/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/swatch-lime.png b/tests/wpt/tests/css/css-text/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/swatch-lime.png rename to tests/wpt/tests/css/css-text/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/swatch-orange.png b/tests/wpt/tests/css/css-text/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/swatch-orange.png rename to tests/wpt/tests/css/css-text/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/swatch-red.png b/tests/wpt/tests/css/css-text/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/swatch-red.png rename to tests/wpt/tests/css/css-text/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/swatch-white.png b/tests/wpt/tests/css/css-text/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/swatch-white.png rename to tests/wpt/tests/css/css-text/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/swatch-yellow.png b/tests/wpt/tests/css/css-text/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/swatch-yellow.png rename to tests/wpt/tests/css/css-text/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/test-bl.png b/tests/wpt/tests/css/css-text/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/test-bl.png rename to tests/wpt/tests/css/css-text/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/test-br.png b/tests/wpt/tests/css/css-text/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/test-br.png rename to tests/wpt/tests/css/css-text/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/test-inner-half-size.png b/tests/wpt/tests/css/css-text/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/test-inner-half-size.png rename to tests/wpt/tests/css/css-text/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/test-outer.png b/tests/wpt/tests/css/css-text/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/test-outer.png rename to tests/wpt/tests/css/css-text/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/test-tl.png b/tests/wpt/tests/css/css-text/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/test-tl.png rename to tests/wpt/tests/css/css-text/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/css-text/support/test-tr.png b/tests/wpt/tests/css/css-text/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/support/test-tr.png rename to tests/wpt/tests/css/css-text/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-min-rendered-width-1-ref.html b/tests/wpt/tests/css/css-text/tab-size/tab-min-rendered-width-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-min-rendered-width-1-ref.html rename to tests/wpt/tests/css/css-text/tab-size/tab-min-rendered-width-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-min-rendered-width-1.html b/tests/wpt/tests/css/css-text/tab-size/tab-min-rendered-width-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-min-rendered-width-1.html rename to tests/wpt/tests/css/css-text/tab-size/tab-min-rendered-width-1.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-block-ancestor-ref.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-block-ancestor-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-block-ancestor-ref.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-block-ancestor-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-block-ancestor.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-block-ancestor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-block-ancestor.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-block-ancestor.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-computed-value-001.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-computed-value-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-computed-value-001.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-computed-value-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inheritance-001-ref.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-inheritance-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inheritance-001-ref.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-inheritance-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inheritance-001.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-inheritance-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inheritance-001.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-inheritance-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-001-ref.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-inline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-001-ref.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-inline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-001.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-001.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-002-ref.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-inline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-002-ref.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-inline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-002.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-inline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-002.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-inline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-001-ref.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-integer-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-001-ref.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-integer-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-001.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-integer-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-001.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-integer-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-002.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-integer-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-002.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-integer-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-003.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-integer-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-003.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-integer-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-004-ref.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-integer-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-004-ref.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-integer-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-004.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-integer-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-004.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-integer-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-length-001-ref.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-length-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-length-001-ref.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-length-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-length-001.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-length-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-length-001.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-length-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-length-002.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-length-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-length-002.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-length-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-percent-001.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-percent-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-percent-001.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-percent-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-spacing-001-ref.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-spacing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-spacing-001-ref.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-spacing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-spacing-001.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-spacing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-spacing-001.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-spacing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-spacing-002-ref.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-spacing-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-spacing-002-ref.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-spacing-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-spacing-002.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-spacing-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-spacing-002.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-spacing-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-spacing-003-ref.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-spacing-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-spacing-003-ref.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-spacing-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-spacing-003.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-spacing-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-spacing-003.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size-spacing-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size.html b/tests/wpt/tests/css/css-text/tab-size/tab-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size.html rename to tests/wpt/tests/css/css-text/tab-size/tab-size.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-001.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-001.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-002.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-002.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-003.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-003.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-004.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-004.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-005.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-005.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-006.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-006.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-007.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-007.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-008.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-008.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-009.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-009.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-010.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-010.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-014.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-014.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-015.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-015.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-016.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-end-ref-016.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-end-ref-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justify-ref-001.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-justify-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justify-ref-001.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-justify-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justify-ref-002.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-justify-ref-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justify-ref-002.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-justify-ref-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justify-ref-003.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-justify-ref-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justify-ref-003.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-justify-ref-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justify-ref-004.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-justify-ref-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justify-ref-004.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-justify-ref-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justify-ref-005.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-justify-ref-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justify-ref-005.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-justify-ref-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justify-ref-006.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-justify-ref-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justify-ref-006.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-justify-ref-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justify-shy-ref-001.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-justify-shy-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justify-shy-ref-001.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-justify-shy-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justifyall-ref-001.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-justifyall-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justifyall-ref-001.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-justifyall-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justifyall-ref-002.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-justifyall-ref-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-justifyall-ref-002.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-justifyall-ref-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-last-wins-001-ref.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-last-wins-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-last-wins-001-ref.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-last-wins-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-001.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-001.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-002.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-002.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-003.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-003.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-004.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-004.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-005.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-005.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-006.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-006.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-007.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-007.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-008.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-008.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-009.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-009.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-010.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-010.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-014.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-014.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-015.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-015.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-016.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-016.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-017.html b/tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/reference/text-align-start-ref-017.html rename to tests/wpt/tests/css/css-text/text-align/reference/text-align-start-ref-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-006-ref.html b/tests/wpt/tests/css/css-text/text-align/text-align-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-006-ref.html rename to tests/wpt/tests/css/css-text/text-align/text-align-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-006.html b/tests/wpt/tests/css/css-text/text-align/text-align-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-006.html rename to tests/wpt/tests/css/css-text/text-align/text-align-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-007-ref.html b/tests/wpt/tests/css/css-text/text-align/text-align-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-007-ref.html rename to tests/wpt/tests/css/css-text/text-align/text-align-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-007.html b/tests/wpt/tests/css/css-text/text-align/text-align-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-007.html rename to tests/wpt/tests/css/css-text/text-align/text-align-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-center-last-center.html b/tests/wpt/tests/css/css-text/text-align/text-align-center-last-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-center-last-center.html rename to tests/wpt/tests/css/css-text/text-align/text-align-center-last-center.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-center-last-default.html b/tests/wpt/tests/css/css-text/text-align/text-align-center-last-default.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-center-last-default.html rename to tests/wpt/tests/css/css-text/text-align/text-align-center-last-default.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-center-last-end.html b/tests/wpt/tests/css/css-text/text-align/text-align-center-last-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-center-last-end.html rename to tests/wpt/tests/css/css-text/text-align/text-align-center-last-end.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-center-last-justify.html b/tests/wpt/tests/css/css-text/text-align/text-align-center-last-justify.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-center-last-justify.html rename to tests/wpt/tests/css/css-text/text-align/text-align-center-last-justify.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-center-last-start.html b/tests/wpt/tests/css/css-text/text-align/text-align-center-last-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-center-last-start.html rename to tests/wpt/tests/css/css-text/text-align/text-align-center-last-start.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-default-last-default.html b/tests/wpt/tests/css/css-text/text-align/text-align-default-last-default.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-default-last-default.html rename to tests/wpt/tests/css/css-text/text-align/text-align-default-last-default.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-001.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-001.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-002.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-002.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-003.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-003.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-004.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-004.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-005.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-005.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-006.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-006.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-007.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-007.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-008.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-008.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-009.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-009.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-010.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-010.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-014.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-014.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-015.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-015.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-016.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-016.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-017.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-017.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-018.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-018.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-019.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-019.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-019.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-020.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-020.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-020.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-021.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-021.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-021.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-last-center.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-last-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-last-center.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-last-center.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-last-default.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-last-default.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-last-default.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-last-default.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-last-end.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-last-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-last-end.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-last-end.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-last-justify.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-last-justify.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-last-justify.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-last-justify.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-last-start.html b/tests/wpt/tests/css/css-text/text-align/text-align-end-last-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-end-last-start.html rename to tests/wpt/tests/css/css-text/text-align/text-align-end-last-start.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-inline-end-crash.html b/tests/wpt/tests/css/css-text/text-align/text-align-inline-end-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-inline-end-crash.html rename to tests/wpt/tests/css/css-text/text-align/text-align-inline-end-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-001.html b/tests/wpt/tests/css/css-text/text-align/text-align-justify-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-001.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justify-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-002.html b/tests/wpt/tests/css/css-text/text-align/text-align-justify-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-002.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justify-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-003.html b/tests/wpt/tests/css/css-text/text-align/text-align-justify-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-003.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justify-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-004.html b/tests/wpt/tests/css/css-text/text-align/text-align-justify-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-004.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justify-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-005.html b/tests/wpt/tests/css/css-text/text-align/text-align-justify-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-005.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justify-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-006.html b/tests/wpt/tests/css/css-text/text-align/text-align-justify-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-006.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justify-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-last-center.html b/tests/wpt/tests/css/css-text/text-align/text-align-justify-last-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-last-center.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justify-last-center.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-last-default.html b/tests/wpt/tests/css/css-text/text-align/text-align-justify-last-default.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-last-default.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justify-last-default.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-last-end.html b/tests/wpt/tests/css/css-text/text-align/text-align-justify-last-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-last-end.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justify-last-end.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-last-justify.html b/tests/wpt/tests/css/css-text/text-align/text-align-justify-last-justify.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-last-justify.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justify-last-justify.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-last-start.html b/tests/wpt/tests/css/css-text/text-align/text-align-justify-last-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-last-start.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justify-last-start.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-shy-001.html b/tests/wpt/tests/css/css-text/text-align/text-align-justify-shy-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justify-shy-001.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justify-shy-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justifyall-001.html b/tests/wpt/tests/css/css-text/text-align/text-align-justifyall-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justifyall-001.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justifyall-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justifyall-002.html b/tests/wpt/tests/css/css-text/text-align/text-align-justifyall-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justifyall-002.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justifyall-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justifyall-003.html b/tests/wpt/tests/css/css-text/text-align/text-align-justifyall-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justifyall-003.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justifyall-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justifyall-004.html b/tests/wpt/tests/css/css-text/text-align/text-align-justifyall-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justifyall-004.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justifyall-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justifyall-005.html b/tests/wpt/tests/css/css-text/text-align/text-align-justifyall-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justifyall-005.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justifyall-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justifyall-006.html b/tests/wpt/tests/css/css-text/text-align/text-align-justifyall-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-justifyall-006.html rename to tests/wpt/tests/css/css-text/text-align/text-align-justifyall-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-001.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-001.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-002.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-002.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-003.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-003.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-004.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-004.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-005.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-005.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-006.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-006.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-007.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-007.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-008.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-008.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-009.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-009.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-010-ref.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-010-ref.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-010.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-010.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-011.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-011.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-012.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-012.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-013.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-013.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-014.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-014.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-015-ref.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-015-ref.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-015.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-015.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-center-ref.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-center-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-center-ref.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-center-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-center.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-center.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-center.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-empty-inline.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-empty-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-empty-inline.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-empty-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-end-ref.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-end-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-end-ref.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-end-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-end.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-end.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-end.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-interpolation.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-interpolation.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-justify-ref.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-justify-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-justify-ref.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-justify-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-justify-rtl-ref.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-justify-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-justify-rtl-ref.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-justify-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-justify-rtl.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-justify-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-justify-rtl.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-justify-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-justify.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-justify.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-justify.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-justify.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-simple-ref.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-simple-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-simple-ref.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-simple-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-simple.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-simple.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-simple.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-simple.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-start-ref.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-start-ref.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-start-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-start.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-start.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-start.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-wins-001.html b/tests/wpt/tests/css/css-text/text-align/text-align-last-wins-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-last-wins-001.html rename to tests/wpt/tests/css/css-text/text-align/text-align-last-wins-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-001.html b/tests/wpt/tests/css/css-text/text-align/text-align-match-parent-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-001.html rename to tests/wpt/tests/css/css-text/text-align/text-align-match-parent-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-002.html b/tests/wpt/tests/css/css-text/text-align/text-align-match-parent-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-002.html rename to tests/wpt/tests/css/css-text/text-align/text-align-match-parent-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-01.html b/tests/wpt/tests/css/css-text/text-align/text-align-match-parent-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-01.html rename to tests/wpt/tests/css/css-text/text-align/text-align-match-parent-01.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-02.html b/tests/wpt/tests/css/css-text/text-align/text-align-match-parent-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-02.html rename to tests/wpt/tests/css/css-text/text-align/text-align-match-parent-02.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-03.html b/tests/wpt/tests/css/css-text/text-align/text-align-match-parent-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-03.html rename to tests/wpt/tests/css/css-text/text-align/text-align-match-parent-03.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-04.html b/tests/wpt/tests/css/css-text/text-align/text-align-match-parent-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-04.html rename to tests/wpt/tests/css/css-text/text-align/text-align-match-parent-04.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-05-ref.html b/tests/wpt/tests/css/css-text/text-align/text-align-match-parent-05-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-05-ref.html rename to tests/wpt/tests/css/css-text/text-align/text-align-match-parent-05-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-05.html b/tests/wpt/tests/css/css-text/text-align/text-align-match-parent-05.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-05.html rename to tests/wpt/tests/css/css-text/text-align/text-align-match-parent-05.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-ref.html b/tests/wpt/tests/css/css-text/text-align/text-align-match-parent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-ref.html rename to tests/wpt/tests/css/css-text/text-align/text-align-match-parent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-root-logical.html b/tests/wpt/tests/css/css-text/text-align/text-align-match-parent-root-logical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-root-logical.html rename to tests/wpt/tests/css/css-text/text-align/text-align-match-parent-root-logical.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-root-ltr-ref.html b/tests/wpt/tests/css/css-text/text-align/text-align-match-parent-root-ltr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-root-ltr-ref.html rename to tests/wpt/tests/css/css-text/text-align/text-align-match-parent-root-ltr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-root-ltr.html b/tests/wpt/tests/css/css-text/text-align/text-align-match-parent-root-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-root-ltr.html rename to tests/wpt/tests/css/css-text/text-align/text-align-match-parent-root-ltr.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-root-rtl-ref.html b/tests/wpt/tests/css/css-text/text-align/text-align-match-parent-root-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-root-rtl-ref.html rename to tests/wpt/tests/css/css-text/text-align/text-align-match-parent-root-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-root-rtl.html b/tests/wpt/tests/css/css-text/text-align/text-align-match-parent-root-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-match-parent-root-rtl.html rename to tests/wpt/tests/css/css-text/text-align/text-align-match-parent-root-rtl.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-001.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-001.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-002.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-002.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-003.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-003.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-004.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-004.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-005.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-005.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-006.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-006.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-007.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-007.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-008.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-008.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-009.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-009.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-010.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-010.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-014.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-014.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-015.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-015.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-016.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-016.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-017.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-017.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-018.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-018.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-019.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-019.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-019.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-020.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-020.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-020.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-021.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-021.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-021.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-last-center.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-last-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-last-center.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-last-center.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-last-default.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-last-default.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-last-default.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-last-default.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-last-end.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-last-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-last-end.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-last-end.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-last-justify.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-last-justify.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-last-justify.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-last-justify.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-last-start.html b/tests/wpt/tests/css/css-text/text-align/text-align-start-last-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-start-last-start.html rename to tests/wpt/tests/css/css-text/text-align/text-align-start-last-start.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-align/text-align-webkit-match-parent.html b/tests/wpt/tests/css/css-text/text-align/text-align-webkit-match-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-align/text-align-webkit-match-parent.html rename to tests/wpt/tests/css/css-text/text-align/text-align-webkit-match-parent.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-encoding/reference/shaping-join-001-ref.html b/tests/wpt/tests/css/css-text/text-encoding/reference/shaping-join-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-encoding/reference/shaping-join-001-ref.html rename to tests/wpt/tests/css/css-text/text-encoding/reference/shaping-join-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-encoding/reference/shaping-no-join-001-ref.html b/tests/wpt/tests/css/css-text/text-encoding/reference/shaping-no-join-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-encoding/reference/shaping-no-join-001-ref.html rename to tests/wpt/tests/css/css-text/text-encoding/reference/shaping-no-join-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-encoding/reference/shaping-tatweel-001-ref.html b/tests/wpt/tests/css/css-text/text-encoding/reference/shaping-tatweel-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-encoding/reference/shaping-tatweel-001-ref.html rename to tests/wpt/tests/css/css-text/text-encoding/reference/shaping-tatweel-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-encoding/reference/shaping-tatweel-002-ref.html b/tests/wpt/tests/css/css-text/text-encoding/reference/shaping-tatweel-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-encoding/reference/shaping-tatweel-002-ref.html rename to tests/wpt/tests/css/css-text/text-encoding/reference/shaping-tatweel-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-join-001.html b/tests/wpt/tests/css/css-text/text-encoding/shaping-join-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-join-001.html rename to tests/wpt/tests/css/css-text/text-encoding/shaping-join-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-join-002.html b/tests/wpt/tests/css/css-text/text-encoding/shaping-join-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-join-002.html rename to tests/wpt/tests/css/css-text/text-encoding/shaping-join-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-join-003.html b/tests/wpt/tests/css/css-text/text-encoding/shaping-join-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-join-003.html rename to tests/wpt/tests/css/css-text/text-encoding/shaping-join-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-no-join-001.html b/tests/wpt/tests/css/css-text/text-encoding/shaping-no-join-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-no-join-001.html rename to tests/wpt/tests/css/css-text/text-encoding/shaping-no-join-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-no-join-002.html b/tests/wpt/tests/css/css-text/text-encoding/shaping-no-join-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-no-join-002.html rename to tests/wpt/tests/css/css-text/text-encoding/shaping-no-join-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-no-join-003.html b/tests/wpt/tests/css/css-text/text-encoding/shaping-no-join-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-no-join-003.html rename to tests/wpt/tests/css/css-text/text-encoding/shaping-no-join-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-tatweel-001.html b/tests/wpt/tests/css/css-text/text-encoding/shaping-tatweel-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-tatweel-001.html rename to tests/wpt/tests/css/css-text/text-encoding/shaping-tatweel-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-tatweel-002.html b/tests/wpt/tests/css/css-text/text-encoding/shaping-tatweel-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-tatweel-002.html rename to tests/wpt/tests/css/css-text/text-encoding/shaping-tatweel-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-tatweel-003.html b/tests/wpt/tests/css/css-text/text-encoding/shaping-tatweel-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-encoding/shaping-tatweel-003.html rename to tests/wpt/tests/css/css-text/text-encoding/shaping-tatweel-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/support/fake-group-align.css b/tests/wpt/tests/css/css-text/text-group-align/support/fake-group-align.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/support/fake-group-align.css rename to tests/wpt/tests/css/css-text/text-group-align/support/fake-group-align.css diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/support/test-helpers.css b/tests/wpt/tests/css/css-text/text-group-align/support/test-helpers.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/support/test-helpers.css rename to tests/wpt/tests/css/css-text/text-group-align/support/test-helpers.css diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/support/test-helpers.js b/tests/wpt/tests/css/css-text/text-group-align/support/test-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/support/test-helpers.js rename to tests/wpt/tests/css/css-text/text-group-align/support/test-helpers.js diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-center-ref.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-center-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-center-ref.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-center-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-center-vlr-ref.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-center-vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-center-vlr-ref.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-center-vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-center-vlr.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-center-vlr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-center-vlr.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-center-vlr.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-center.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-center.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-center.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-center.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-end-ref.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-end-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-end-ref.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-end-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-end-vlr-ref.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-end-vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-end-vlr-ref.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-end-vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-end-vlr.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-end-vlr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-end-vlr.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-end-vlr.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-end.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-end.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-end.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-left-ref.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-left-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-left-ref.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-left-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-left-vlr-ref.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-left-vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-left-vlr-ref.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-left-vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-left-vlr.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-left-vlr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-left-vlr.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-left-vlr.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-left.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-left.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-left.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-right-ref.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-right-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-right-ref.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-right-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-right-vlr-ref.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-right-vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-right-vlr-ref.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-right-vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-right-vlr.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-right-vlr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-right-vlr.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-right-vlr.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-right.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-right.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-right.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-right.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-start-ref.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-start-ref.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-start-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-start-vlr-ref.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-start-vlr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-start-vlr-ref.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-start-vlr-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-start-vlr.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-start-vlr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-start-vlr.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-start-vlr.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-start.html b/tests/wpt/tests/css/css-text/text-group-align/text-group-align-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-group-align/text-group-align-start.html rename to tests/wpt/tests/css/css-text/text-group-align/text-group-align-start.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/anonymous-flex-item-001.html b/tests/wpt/tests/css/css-text/text-indent/anonymous-flex-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/anonymous-flex-item-001.html rename to tests/wpt/tests/css/css-text/text-indent/anonymous-flex-item-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/anonymous-grid-item-001.html b/tests/wpt/tests/css/css-text/text-indent/anonymous-grid-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/anonymous-grid-item-001.html rename to tests/wpt/tests/css/css-text/text-indent/anonymous-grid-item-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/percentage-value-intrinsic-size.html b/tests/wpt/tests/css/css-text/text-indent/percentage-value-intrinsic-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/percentage-value-intrinsic-size.html rename to tests/wpt/tests/css/css-text/text-indent/percentage-value-intrinsic-size.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/reference/anonymous-flex-grid-item-001-ref.html b/tests/wpt/tests/css/css-text/text-indent/reference/anonymous-flex-grid-item-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/reference/anonymous-flex-grid-item-001-ref.html rename to tests/wpt/tests/css/css-text/text-indent/reference/anonymous-flex-grid-item-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-each-line-hanging-ref.html b/tests/wpt/tests/css/css-text/text-indent/reference/text-indent-each-line-hanging-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-each-line-hanging-ref.html rename to tests/wpt/tests/css/css-text/text-indent/reference/text-indent-each-line-hanging-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-length-001-ref.html b/tests/wpt/tests/css/css-text/text-indent/reference/text-indent-length-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-length-001-ref.html rename to tests/wpt/tests/css/css-text/text-indent/reference/text-indent-length-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-length-002-ref.html b/tests/wpt/tests/css/css-text/text-indent/reference/text-indent-length-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-length-002-ref.html rename to tests/wpt/tests/css/css-text/text-indent/reference/text-indent-length-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-min-max-content-001-ref.html b/tests/wpt/tests/css/css-text/text-indent/reference/text-indent-min-max-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-min-max-content-001-ref.html rename to tests/wpt/tests/css/css-text/text-indent/reference/text-indent-min-max-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-percentage-001-ref.xht b/tests/wpt/tests/css/css-text/text-indent/reference/text-indent-percentage-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-percentage-001-ref.xht rename to tests/wpt/tests/css/css-text/text-indent/reference/text-indent-percentage-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-percentage-002-ref.html b/tests/wpt/tests/css/css-text/text-indent/reference/text-indent-percentage-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-percentage-002-ref.html rename to tests/wpt/tests/css/css-text/text-indent/reference/text-indent-percentage-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-tab-positions-001-ref.html b/tests/wpt/tests/css/css-text/text-indent/reference/text-indent-tab-positions-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-tab-positions-001-ref.html rename to tests/wpt/tests/css/css-text/text-indent/reference/text-indent-tab-positions-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-with-absolute-pos-child-ref.html b/tests/wpt/tests/css/css-text/text-indent/reference/text-indent-with-absolute-pos-child-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/reference/text-indent-with-absolute-pos-child-ref.html rename to tests/wpt/tests/css/css-text/text-indent/reference/text-indent-with-absolute-pos-child-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-each-line-hanging.html b/tests/wpt/tests/css/css-text/text-indent/text-indent-each-line-hanging.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-each-line-hanging.html rename to tests/wpt/tests/css/css-text/text-indent/text-indent-each-line-hanging.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-length-001.html b/tests/wpt/tests/css/css-text/text-indent/text-indent-length-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-length-001.html rename to tests/wpt/tests/css/css-text/text-indent/text-indent-length-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-length-002.html b/tests/wpt/tests/css/css-text/text-indent/text-indent-length-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-length-002.html rename to tests/wpt/tests/css/css-text/text-indent/text-indent-length-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-long-line-crash.html b/tests/wpt/tests/css/css-text/text-indent/text-indent-long-line-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-long-line-crash.html rename to tests/wpt/tests/css/css-text/text-indent/text-indent-long-line-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-min-max-content-001.html b/tests/wpt/tests/css/css-text/text-indent/text-indent-min-max-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-min-max-content-001.html rename to tests/wpt/tests/css/css-text/text-indent/text-indent-min-max-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-001.xht b/tests/wpt/tests/css/css-text/text-indent/text-indent-percentage-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-001.xht rename to tests/wpt/tests/css/css-text/text-indent/text-indent-percentage-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-002.html b/tests/wpt/tests/css/css-text/text-indent/text-indent-percentage-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-002.html rename to tests/wpt/tests/css/css-text/text-indent/text-indent-percentage-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-003.html b/tests/wpt/tests/css/css-text/text-indent/text-indent-percentage-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-003.html rename to tests/wpt/tests/css/css-text/text-indent/text-indent-percentage-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-004.html b/tests/wpt/tests/css/css-text/text-indent/text-indent-percentage-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-percentage-004.html rename to tests/wpt/tests/css/css-text/text-indent/text-indent-percentage-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-tab-positions-001.html b/tests/wpt/tests/css/css-text/text-indent/text-indent-tab-positions-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-tab-positions-001.html rename to tests/wpt/tests/css/css-text/text-indent/text-indent-tab-positions-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-with-absolute-pos-child.html b/tests/wpt/tests/css/css-text/text-indent/text-indent-with-absolute-pos-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-indent/text-indent-with-absolute-pos-child.html rename to tests/wpt/tests/css/css-text/text-indent/text-indent-with-absolute-pos-child.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/distribute-alias.tentative.html b/tests/wpt/tests/css/css-text/text-justify/distribute-alias.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/distribute-alias.tentative.html rename to tests/wpt/tests/css/css-text/text-justify/distribute-alias.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-006-ref.html b/tests/wpt/tests/css/css-text/text-justify/reference/text-justify-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-006-ref.html rename to tests/wpt/tests/css/css-text/text-justify/reference/text-justify-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-001-ref.html b/tests/wpt/tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-001-ref.html rename to tests/wpt/tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-003-ref.html b/tests/wpt/tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-003-ref.html rename to tests/wpt/tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-005-ref.html b/tests/wpt/tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-005-ref.html rename to tests/wpt/tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-alt-001-ref.html b/tests/wpt/tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-alt-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-alt-001-ref.html rename to tests/wpt/tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-alt-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-alt-003-ref.html b/tests/wpt/tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-alt-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-alt-003-ref.html rename to tests/wpt/tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-alt-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-alt-005-ref.html b/tests/wpt/tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-alt-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-alt-005-ref.html rename to tests/wpt/tests/css/css-text/text-justify/reference/text-justify-and-trailing-spaces-alt-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-ref-001.html b/tests/wpt/tests/css/css-text/text-justify/reference/text-justify-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/reference/text-justify-ref-001.html rename to tests/wpt/tests/css/css-text/text-justify/reference/text-justify-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-001.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-001.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-002.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-002.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-003.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-003.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-004.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-004.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-005.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-005.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-006.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-006.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-and-trailing-spaces-001.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-and-trailing-spaces-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-and-trailing-spaces-001.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-and-trailing-spaces-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-and-trailing-spaces-002.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-and-trailing-spaces-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-and-trailing-spaces-002.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-and-trailing-spaces-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-and-trailing-spaces-003.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-and-trailing-spaces-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-and-trailing-spaces-003.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-and-trailing-spaces-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-and-trailing-spaces-004.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-and-trailing-spaces-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-and-trailing-spaces-004.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-and-trailing-spaces-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-and-trailing-spaces-005.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-and-trailing-spaces-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-and-trailing-spaces-005.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-and-trailing-spaces-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-and-trailing-spaces-006.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-and-trailing-spaces-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-and-trailing-spaces-006.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-and-trailing-spaces-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-distribute-001.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-distribute-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-distribute-001.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-distribute-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-inter-character-001-ref.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-inter-character-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-inter-character-001-ref.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-inter-character-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-inter-character-001.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-inter-character-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-inter-character-001.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-inter-character-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-inter-word-001-ref.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-inter-word-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-inter-word-001-ref.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-inter-word-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-inter-word-001.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-inter-word-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-inter-word-001.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-inter-word-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-interpolation.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-interpolation.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-none-001-ref.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-none-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-none-001-ref.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-none-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-none-001.html b/tests/wpt/tests/css/css-text/text-justify/text-justify-none-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-justify/text-justify-none-001.html rename to tests/wpt/tests/css/css-text/text-justify/text-justify-none-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-stroke-width-subpixel-notref.html b/tests/wpt/tests/css/css-text/text-stroke-width-subpixel-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-stroke-width-subpixel-notref.html rename to tests/wpt/tests/css/css-text/text-stroke-width-subpixel-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-stroke-width-subpixel.html b/tests/wpt/tests/css/css-text/text-stroke-width-subpixel.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-stroke-width-subpixel.html rename to tests/wpt/tests/css/css-text/text-stroke-width-subpixel.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/math/text-transform-math-auto-001-ref.html b/tests/wpt/tests/css/css-text/text-transform/math/text-transform-math-auto-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/math/text-transform-math-auto-001-ref.html rename to tests/wpt/tests/css/css-text/text-transform/math/text-transform-math-auto-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/math/text-transform-math-auto-001.html b/tests/wpt/tests/css/css-text/text-transform/math/text-transform-math-auto-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/math/text-transform-math-auto-001.html rename to tests/wpt/tests/css/css-text/text-transform/math/text-transform-math-auto-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/math/text-transform-math-auto-002-ref.html b/tests/wpt/tests/css/css-text/text-transform/math/text-transform-math-auto-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/math/text-transform-math-auto-002-ref.html rename to tests/wpt/tests/css/css-text/text-transform/math/text-transform-math-auto-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/math/text-transform-math-auto-002.html b/tests/wpt/tests/css/css-text/text-transform/math/text-transform-math-auto-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/math/text-transform-math-auto-002.html rename to tests/wpt/tests/css/css-text/text-transform/math/text-transform-math-auto-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-001-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-001-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-003-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-003-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-005-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-005-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-007-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-007-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-009-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-009-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-010-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-010-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-011-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-011-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-014-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-014-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-016-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-016-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-018-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-018-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-020-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-020-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-022-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-022-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-024-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-024-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-026-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-026-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-026-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-026-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-028-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-028-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-028-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-028-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-030-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-030-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-030-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-030-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-031-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-031-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-031-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-031-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-032-ref.xht b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-032-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-capitalize-032-ref.xht rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-capitalize-032-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-full-size-kana-001-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-full-size-kana-001-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-full-size-kana-002-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-full-size-kana-002-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-full-size-kana-003-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-full-size-kana-003-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-full-size-kana-004-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-full-size-kana-004-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-full-size-kana-005-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-full-size-kana-005-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-full-size-kana-006-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-full-size-kana-006-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-full-size-kana-007-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-full-size-kana-007-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-fullwidth-001-ref.xht b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-fullwidth-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-fullwidth-001-ref.xht rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-fullwidth-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-fullwidth-006-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-fullwidth-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-fullwidth-006-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-fullwidth-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-fullwidth-007-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-fullwidth-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-fullwidth-007-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-fullwidth-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-fullwidth-008-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-fullwidth-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-fullwidth-008-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-fullwidth-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-fullwidth-009-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-fullwidth-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-fullwidth-009-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-fullwidth-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-lowercase-101-ref.xht b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-lowercase-101-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-lowercase-101-ref.xht rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-lowercase-101-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-multiple-001-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-multiple-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-multiple-001-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-multiple-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-none-001-ref.xht b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-none-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-none-001-ref.xht rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-none-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-shaping-001-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-shaping-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-shaping-001-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-shaping-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-tailoring-001-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-tailoring-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-tailoring-001-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-tailoring-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-tailoring-002-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-tailoring-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-tailoring-002-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-tailoring-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-tailoring-002a-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-tailoring-002a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-tailoring-002a-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-tailoring-002a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-tailoring-003-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-tailoring-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-tailoring-003-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-tailoring-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-tailoring-004-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-tailoring-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-tailoring-004-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-tailoring-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-tailoring-005-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-tailoring-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-tailoring-005-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-tailoring-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-uppercase-101-ref.xht b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-uppercase-101-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-uppercase-101-ref.xht rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-uppercase-101-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-001-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-001-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-002-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-002-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-003-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-003-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-004-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-004-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-005-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-005-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-006-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-006-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-007-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-007-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-008-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-008-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-009-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-009-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-010-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-010-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-011-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-011-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-012-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-012-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-014-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-014-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-015-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-015-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-016-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-016-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-017-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-017-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-018-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-018-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-019-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-019-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-020-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-020-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-021-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-021-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-022-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-022-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-023-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-023-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-024-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-024-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-025-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-025-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-026-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-026-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-026-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-026-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-027-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-027-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-028-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-028-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-028-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-028-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-029-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-029-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-029-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-029-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-030-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-030-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-030-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-030-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-031-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-031-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-031-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-031-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-032-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-032-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-032-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-032-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-033-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-033-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-033-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-033-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-034-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-034-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-034-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-034-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-035-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-035-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-035-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-035-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-038-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-038-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-038-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-038-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-039-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-039-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-039-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-039-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-040-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-040-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-040-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-040-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-041-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-041-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-041-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-041-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-042-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-042-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-042-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-042-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-043-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-043-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-043-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-043-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-044-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-044-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-044-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-044-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-101-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-101-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-101-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-101-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-102-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-102-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-102-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-102-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-103-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-103-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-103-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-103-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-104-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-104-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-104-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-104-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-105-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-105-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-105-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-105-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-106-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-106-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-upperlower-106-ref.html rename to tests/wpt/tests/css/css-text/text-transform/reference/text-transform-upperlower-106-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-001.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-001.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-003.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-003.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-005.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-005.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-007.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-007.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-009.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-009.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-010.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-010.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-011.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-011.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-014.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-014.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-016.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-016.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-018.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-018.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-020.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-020.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-020.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-022.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-022.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-022.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-024.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-024.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-024.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-026.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-026.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-026.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-028.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-028.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-028.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-030.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-030.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-030.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-031.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-031.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-031.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-032.xht b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-032.xht rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-032.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-033-ref.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-033-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-033-ref.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-033-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-033.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-033.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-033.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-copy-paste-001-manual.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-copy-paste-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-copy-paste-001-manual.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-copy-paste-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-full-size-kana-001.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-full-size-kana-001.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-full-size-kana-002.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-full-size-kana-002.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-full-size-kana-003.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-full-size-kana-003.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-full-size-kana-004.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-full-size-kana-004.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-full-size-kana-005.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-full-size-kana-005.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-full-size-kana-006.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-full-size-kana-006.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-full-size-kana-007.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-full-size-kana-007.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-001.xht b/tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-001.xht rename to tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-002-ref.xht b/tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-002-ref.xht rename to tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-002.xht b/tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-002.xht rename to tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-004-ref.xht b/tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-004-ref.xht rename to tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-004.xht b/tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-004.xht rename to tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-005-ref.xht b/tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-005-ref.xht rename to tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-005.xht b/tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-005.xht rename to tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-006.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-006.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-007.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-007.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-008.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-008.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-009.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-fullwidth-009.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-fullwidth-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-101.xht b/tests/wpt/tests/css/css-text/text-transform/text-transform-lowercase-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-101.xht rename to tests/wpt/tests/css/css-text/text-transform/text-transform-lowercase-101.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-102-ref.xht b/tests/wpt/tests/css/css-text/text-transform/text-transform-lowercase-102-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-102-ref.xht rename to tests/wpt/tests/css/css-text/text-transform/text-transform-lowercase-102-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-102.xht b/tests/wpt/tests/css/css-text/text-transform/text-transform-lowercase-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-102.xht rename to tests/wpt/tests/css/css-text/text-transform/text-transform-lowercase-102.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-multiple-001.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-multiple-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-multiple-001.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-multiple-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-none-001.xht b/tests/wpt/tests/css/css-text/text-transform/text-transform-none-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-none-001.xht rename to tests/wpt/tests/css/css-text/text-transform/text-transform-none-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-shaping-001.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-shaping-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-shaping-001.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-shaping-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-shaping-002.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-shaping-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-shaping-002.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-shaping-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-shaping-003.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-shaping-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-shaping-003.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-shaping-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-tailoring-001.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-tailoring-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-tailoring-001.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-tailoring-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-tailoring-002.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-tailoring-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-tailoring-002.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-tailoring-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-tailoring-002a.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-tailoring-002a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-tailoring-002a.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-tailoring-002a.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-tailoring-003.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-tailoring-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-tailoring-003.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-tailoring-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-tailoring-004.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-tailoring-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-tailoring-004.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-tailoring-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-tailoring-005.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-tailoring-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-tailoring-005.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-tailoring-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-uppercase-101.xht b/tests/wpt/tests/css/css-text/text-transform/text-transform-uppercase-101.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-uppercase-101.xht rename to tests/wpt/tests/css/css-text/text-transform/text-transform-uppercase-101.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-001.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-001.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-002.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-002.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-003.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-003.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-004.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-004.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-005.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-005.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-006.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-006.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-007.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-007.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-008.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-008.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-009.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-009.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-010.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-010.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-011.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-011.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-012.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-012.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-014.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-014.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-015.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-015.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-016.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-016.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-017.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-017.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-018.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-018.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-019.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-019.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-019.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-020.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-020.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-020.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-021.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-021.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-021.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-022.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-022.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-022.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-023.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-023.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-023.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-024.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-024.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-024.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-025.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-025.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-025.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-026.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-026.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-026.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-027.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-027.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-027.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-028.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-028.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-028.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-029.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-029.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-029.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-030.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-030.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-030.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-031.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-031.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-031.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-032.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-032.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-032.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-033.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-033.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-033.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-034.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-034.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-034.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-035.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-035.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-035.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-038.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-038.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-038.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-039.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-039.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-039.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-040.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-040.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-040.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-041.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-041.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-041.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-042.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-042.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-042.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-043.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-043.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-043.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-044.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-044.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-044.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-101.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-101.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-101.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-101.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-102.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-102.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-102.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-102.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-103.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-103.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-103.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-103.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-104.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-104.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-104.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-104.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-105.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-105.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-105.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-105.html diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-106.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-106.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-upperlower-106.html rename to tests/wpt/tests/css/css-text/text-transform/text-transform-upperlower-106.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/append-whitespace-only-node-crash-001.html b/tests/wpt/tests/css/css-text/white-space/append-whitespace-only-node-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/append-whitespace-only-node-crash-001.html rename to tests/wpt/tests/css/css-text/white-space/append-whitespace-only-node-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-001.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-001.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-002.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-002.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-003.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-003.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-004.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-004.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-005.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-005.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-006.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-006.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-007.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-007.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-008.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-008.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-009.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-009.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-010.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-010.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-011.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-011.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-051.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-051.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-051.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-052.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-052.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-052.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-001.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-001.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-002.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-002.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-003.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-003.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-004.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-004.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-005.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-005.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-006.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-006.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-007.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-007.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-008.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-008.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-009.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-009.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-010.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-010.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-011.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-011.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-012.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-012.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-013.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-013.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-014.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-014.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-015.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-015.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-016.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-016.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-017.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-017.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-018.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-char-018.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-char-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-before-first-ideographic-char-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-newline-011.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-newline-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-newline-011.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-newline-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-newline-012.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-newline-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-newline-012.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-newline-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-newline-013.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-newline-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-newline-013.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-newline-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-newline-014.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-newline-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-newline-014.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-newline-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-newline-015.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-newline-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-newline-015.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-newline-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-newline-016.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-newline-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-newline-016.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-newline-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-tab-001.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-tab-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-tab-001.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-tab-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-tab-002.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-tab-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-tab-002.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-tab-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-tab-003.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-tab-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-tab-003.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-tab-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-tab-004.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-tab-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-tab-004.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-tab-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-tab-005.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-tab-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-tab-005.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-tab-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-tab-006.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-tab-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-tab-006.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-tab-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-001.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-001.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-002.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-002.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-003.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-003.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-004.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-004.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-005.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-005.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-006.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-006.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-007.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-007.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-008.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-008.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-009.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-009.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-010.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-ideographic-space-010.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-ideographic-space-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-001.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-001.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-002.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-002.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-003.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-003.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-004.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-004.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-005.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-005.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-006.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-006.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-007.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-007.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-008.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-008.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-009.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-009.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-010.html b/tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/break-spaces-with-overflow-wrap-010.html rename to tests/wpt/tests/css/css-text/white-space/break-spaces-with-overflow-wrap-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-000.html b/tests/wpt/tests/css/css-text/white-space/control-chars-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-000.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-001.html b/tests/wpt/tests/css/css-text/white-space/control-chars-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-001.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-002.html b/tests/wpt/tests/css/css-text/white-space/control-chars-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-002.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-003.html b/tests/wpt/tests/css/css-text/white-space/control-chars-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-003.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-004.html b/tests/wpt/tests/css/css-text/white-space/control-chars-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-004.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-005.html b/tests/wpt/tests/css/css-text/white-space/control-chars-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-005.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-006.html b/tests/wpt/tests/css/css-text/white-space/control-chars-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-006.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-007.html b/tests/wpt/tests/css/css-text/white-space/control-chars-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-007.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-008.html b/tests/wpt/tests/css/css-text/white-space/control-chars-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-008.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-00B.html b/tests/wpt/tests/css/css-text/white-space/control-chars-00B.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-00B.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-00B.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-00C.html b/tests/wpt/tests/css/css-text/white-space/control-chars-00C.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-00C.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-00C.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-00D.html b/tests/wpt/tests/css/css-text/white-space/control-chars-00D.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-00D.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-00D.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-00E.html b/tests/wpt/tests/css/css-text/white-space/control-chars-00E.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-00E.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-00E.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-00F.html b/tests/wpt/tests/css/css-text/white-space/control-chars-00F.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-00F.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-00F.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-010.html b/tests/wpt/tests/css/css-text/white-space/control-chars-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-010.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-011.html b/tests/wpt/tests/css/css-text/white-space/control-chars-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-011.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-012.html b/tests/wpt/tests/css/css-text/white-space/control-chars-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-012.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-013.html b/tests/wpt/tests/css/css-text/white-space/control-chars-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-013.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-014.html b/tests/wpt/tests/css/css-text/white-space/control-chars-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-014.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-015.html b/tests/wpt/tests/css/css-text/white-space/control-chars-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-015.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-016.html b/tests/wpt/tests/css/css-text/white-space/control-chars-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-016.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-017.html b/tests/wpt/tests/css/css-text/white-space/control-chars-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-017.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-018.html b/tests/wpt/tests/css/css-text/white-space/control-chars-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-018.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-019.html b/tests/wpt/tests/css/css-text/white-space/control-chars-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-019.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-019.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-01A.html b/tests/wpt/tests/css/css-text/white-space/control-chars-01A.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-01A.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-01A.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-01B.html b/tests/wpt/tests/css/css-text/white-space/control-chars-01B.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-01B.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-01B.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-01C.html b/tests/wpt/tests/css/css-text/white-space/control-chars-01C.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-01C.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-01C.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-01D.html b/tests/wpt/tests/css/css-text/white-space/control-chars-01D.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-01D.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-01D.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-01E.html b/tests/wpt/tests/css/css-text/white-space/control-chars-01E.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-01E.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-01E.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-01F.html b/tests/wpt/tests/css/css-text/white-space/control-chars-01F.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-01F.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-01F.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-07F.html b/tests/wpt/tests/css/css-text/white-space/control-chars-07F.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-07F.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-07F.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-080.html b/tests/wpt/tests/css/css-text/white-space/control-chars-080.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-080.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-080.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-081.html b/tests/wpt/tests/css/css-text/white-space/control-chars-081.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-081.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-081.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-082.html b/tests/wpt/tests/css/css-text/white-space/control-chars-082.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-082.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-082.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-083.html b/tests/wpt/tests/css/css-text/white-space/control-chars-083.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-083.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-083.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-084.html b/tests/wpt/tests/css/css-text/white-space/control-chars-084.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-084.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-084.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-085.html b/tests/wpt/tests/css/css-text/white-space/control-chars-085.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-085.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-085.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-086.html b/tests/wpt/tests/css/css-text/white-space/control-chars-086.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-086.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-086.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-087.html b/tests/wpt/tests/css/css-text/white-space/control-chars-087.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-087.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-087.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-088.html b/tests/wpt/tests/css/css-text/white-space/control-chars-088.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-088.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-088.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-089.html b/tests/wpt/tests/css/css-text/white-space/control-chars-089.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-089.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-089.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-08A.html b/tests/wpt/tests/css/css-text/white-space/control-chars-08A.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-08A.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-08A.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-08B.html b/tests/wpt/tests/css/css-text/white-space/control-chars-08B.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-08B.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-08B.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-08C.html b/tests/wpt/tests/css/css-text/white-space/control-chars-08C.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-08C.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-08C.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-08D.html b/tests/wpt/tests/css/css-text/white-space/control-chars-08D.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-08D.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-08D.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-08E.html b/tests/wpt/tests/css/css-text/white-space/control-chars-08E.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-08E.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-08E.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-08F.html b/tests/wpt/tests/css/css-text/white-space/control-chars-08F.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-08F.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-08F.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-090.html b/tests/wpt/tests/css/css-text/white-space/control-chars-090.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-090.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-090.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-091.html b/tests/wpt/tests/css/css-text/white-space/control-chars-091.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-091.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-091.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-092.html b/tests/wpt/tests/css/css-text/white-space/control-chars-092.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-092.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-092.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-093.html b/tests/wpt/tests/css/css-text/white-space/control-chars-093.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-093.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-093.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-094.html b/tests/wpt/tests/css/css-text/white-space/control-chars-094.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-094.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-094.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-095.html b/tests/wpt/tests/css/css-text/white-space/control-chars-095.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-095.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-095.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-096.html b/tests/wpt/tests/css/css-text/white-space/control-chars-096.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-096.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-096.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-097.html b/tests/wpt/tests/css/css-text/white-space/control-chars-097.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-097.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-097.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-098.html b/tests/wpt/tests/css/css-text/white-space/control-chars-098.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-098.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-098.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-099.html b/tests/wpt/tests/css/css-text/white-space/control-chars-099.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-099.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-099.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-09A.html b/tests/wpt/tests/css/css-text/white-space/control-chars-09A.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-09A.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-09A.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-09B.html b/tests/wpt/tests/css/css-text/white-space/control-chars-09B.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-09B.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-09B.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-09C.html b/tests/wpt/tests/css/css-text/white-space/control-chars-09C.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-09C.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-09C.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-09D.html b/tests/wpt/tests/css/css-text/white-space/control-chars-09D.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-09D.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-09D.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-09E.html b/tests/wpt/tests/css/css-text/white-space/control-chars-09E.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-09E.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-09E.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-09F.html b/tests/wpt/tests/css/css-text/white-space/control-chars-09F.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/control-chars-09F.html rename to tests/wpt/tests/css/css-text/white-space/control-chars-09F.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/display-contents-remove-whitespace-change.html b/tests/wpt/tests/css/css-text/white-space/display-contents-remove-whitespace-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/display-contents-remove-whitespace-change.html rename to tests/wpt/tests/css/css-text/white-space/display-contents-remove-whitespace-change.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-001.html b/tests/wpt/tests/css/css-text/white-space/eol-spaces-bidi-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-001.html rename to tests/wpt/tests/css/css-text/white-space/eol-spaces-bidi-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-002.html b/tests/wpt/tests/css/css-text/white-space/eol-spaces-bidi-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-002.html rename to tests/wpt/tests/css/css-text/white-space/eol-spaces-bidi-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-003.html b/tests/wpt/tests/css/css-text/white-space/eol-spaces-bidi-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-003.html rename to tests/wpt/tests/css/css-text/white-space/eol-spaces-bidi-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/full-width-leading-spaces-001.html b/tests/wpt/tests/css/css-text/white-space/full-width-leading-spaces-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/full-width-leading-spaces-001.html rename to tests/wpt/tests/css/css-text/white-space/full-width-leading-spaces-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/full-width-leading-spaces-002.html b/tests/wpt/tests/css/css-text/white-space/full-width-leading-spaces-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/full-width-leading-spaces-002.html rename to tests/wpt/tests/css/css-text/white-space/full-width-leading-spaces-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/full-width-leading-spaces-003.html b/tests/wpt/tests/css/css-text/white-space/full-width-leading-spaces-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/full-width-leading-spaces-003.html rename to tests/wpt/tests/css/css-text/white-space/full-width-leading-spaces-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/full-width-leading-spaces-004.html b/tests/wpt/tests/css/css-text/white-space/full-width-leading-spaces-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/full-width-leading-spaces-004.html rename to tests/wpt/tests/css/css-text/white-space/full-width-leading-spaces-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/full-width-leading-spaces-005.html b/tests/wpt/tests/css/css-text/white-space/full-width-leading-spaces-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/full-width-leading-spaces-005.html rename to tests/wpt/tests/css/css-text/white-space/full-width-leading-spaces-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/line-edge-white-space-collapse-001.html b/tests/wpt/tests/css/css-text/white-space/line-edge-white-space-collapse-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/line-edge-white-space-collapse-001.html rename to tests/wpt/tests/css/css-text/white-space/line-edge-white-space-collapse-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/line-edge-white-space-collapse-002.html b/tests/wpt/tests/css/css-text/white-space/line-edge-white-space-collapse-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/line-edge-white-space-collapse-002.html rename to tests/wpt/tests/css/css-text/white-space/line-edge-white-space-collapse-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/lone-cr-001-ref.html b/tests/wpt/tests/css/css-text/white-space/lone-cr-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/lone-cr-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/lone-cr-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/lone-cr-001.tentative.html b/tests/wpt/tests/css/css-text/white-space/lone-cr-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/lone-cr-001.tentative.html rename to tests/wpt/tests/css/css-text/white-space/lone-cr-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/nowrap-wbr-and-space-crash.html b/tests/wpt/tests/css/css-text/white-space/nowrap-wbr-and-space-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/nowrap-wbr-and-space-crash.html rename to tests/wpt/tests/css/css-text/white-space/nowrap-wbr-and-space-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/object-replacement-1.html b/tests/wpt/tests/css/css-text/white-space/object-replacement-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/object-replacement-1.html rename to tests/wpt/tests/css/css-text/white-space/object-replacement-1.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/object-replacement-2.html b/tests/wpt/tests/css/css-text/white-space/object-replacement-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/object-replacement-2.html rename to tests/wpt/tests/css/css-text/white-space/object-replacement-2.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-float-001.html b/tests/wpt/tests/css/css-text/white-space/pre-float-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-float-001.html rename to tests/wpt/tests/css/css-text/white-space/pre-float-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-line-051.html b/tests/wpt/tests/css/css-text/white-space/pre-line-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-line-051.html rename to tests/wpt/tests/css/css-text/white-space/pre-line-051.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-line-052.html b/tests/wpt/tests/css/css-text/white-space/pre-line-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-line-052.html rename to tests/wpt/tests/css/css-text/white-space/pre-line-052.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-line-br-with-whitespace-child-crash.html b/tests/wpt/tests/css/css-text/white-space/pre-line-br-with-whitespace-child-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-line-br-with-whitespace-child-crash.html rename to tests/wpt/tests/css/css-text/white-space/pre-line-br-with-whitespace-child-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-line-with-space-and-newline.html b/tests/wpt/tests/css/css-text/white-space/pre-line-with-space-and-newline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-line-with-space-and-newline.html rename to tests/wpt/tests/css/css-text/white-space/pre-line-with-space-and-newline.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-with-whitespace-crash.html b/tests/wpt/tests/css/css-text/white-space/pre-with-whitespace-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-with-whitespace-crash.html rename to tests/wpt/tests/css/css-text/white-space/pre-with-whitespace-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-001.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-001.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-002.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-002.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-003.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-003.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-004.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-004.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-005.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-005.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-006.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-006.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-007.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-007.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-008.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-008.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-009.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-009.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-010.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-010.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-011.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-011.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-012.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-012.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-013.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-013.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-014.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-014.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-015.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-015.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-016.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-016.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-017.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-017.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-018.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-018.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-019.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-019.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-019.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-020.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-020.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-020.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-051.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-051.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-051.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-052.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-052.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-052.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-center-001.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-center-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-center-001.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-center-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-center-002.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-center-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-center-002.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-center-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-center-003.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-center-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-center-003.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-center-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-end-001.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-end-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-end-001.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-end-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-end-002.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-end-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-end-002.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-end-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-end-003.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-end-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-end-003.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-end-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-left-001.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-left-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-left-001.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-left-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-left-002.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-left-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-left-002.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-left-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-left-003.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-left-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-left-003.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-left-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-right-001.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-right-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-right-001.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-right-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-right-002.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-right-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-right-002.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-right-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-right-003.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-right-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-right-003.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-right-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-start-001.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-start-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-start-001.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-start-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-start-002.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-start-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-start-002.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-start-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-start-003.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-align-start-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-align-start-003.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-align-start-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-float-001.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-float-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-float-001.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-float-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-001.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-001.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-002.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-002.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-003.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-003.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-004.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-004.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-005.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-005.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-006.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-006.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-007.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-007.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-008.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-008.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-009.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-009.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-010.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-010.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-011.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-011.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-012.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-012.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-013.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-013.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-014.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-014.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-015.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-015.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-016.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-016.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-017.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-leading-spaces-017.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-leading-spaces-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-tab-001.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-tab-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-tab-001.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-tab-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-tab-002.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-tab-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-tab-002.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-tab-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-tab-003.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-tab-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-tab-003.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-tab-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-tab-004.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-tab-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-tab-004.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-tab-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-tab-005.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-tab-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-tab-005.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-tab-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-tab-006.html b/tests/wpt/tests/css/css-text/white-space/pre-wrap-tab-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/pre-wrap-tab-006.html rename to tests/wpt/tests/css/css-text/white-space/pre-wrap-tab-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/break-spaces-tab-003-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/break-spaces-tab-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/break-spaces-tab-003-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/break-spaces-tab-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/break-spaces-tab-005-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/break-spaces-tab-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/break-spaces-tab-005-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/break-spaces-tab-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/control-chars-000-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/control-chars-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/control-chars-000-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/control-chars-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/control-chars-00D-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/control-chars-00D-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/control-chars-00D-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/control-chars-00D-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/eol-spaces-bidi-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/eol-spaces-bidi-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/eol-spaces-bidi-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/eol-spaces-bidi-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-003-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/eol-spaces-bidi-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-003-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/eol-spaces-bidi-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-alt-003-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/eol-spaces-bidi-alt-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-alt-003-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/eol-spaces-bidi-alt-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/full-width-leading-spaces-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/full-width-leading-spaces-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/full-width-leading-spaces-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/full-width-leading-spaces-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/line-edge-white-space-collapse-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/line-edge-white-space-collapse-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/line-edge-white-space-collapse-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/line-edge-white-space-collapse-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/line-edge-white-space-collapse-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/line-edge-white-space-collapse-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/line-edge-white-space-collapse-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/line-edge-white-space-collapse-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/object-replacement-1-notref.html b/tests/wpt/tests/css/css-text/white-space/reference/object-replacement-1-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/object-replacement-1-notref.html rename to tests/wpt/tests/css/css-text/white-space/reference/object-replacement-1-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/object-replacement-2-notref.html b/tests/wpt/tests/css/css-text/white-space/reference/object-replacement-2-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/object-replacement-2-notref.html rename to tests/wpt/tests/css/css-text/white-space/reference/object-replacement-2-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-float-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-float-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-float-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-float-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-012-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-012-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-013-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-013-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-014-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-014-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-018-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-018-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-019-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-019-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-020-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-020-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-center-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-center-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-center-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-center-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-center-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-center-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-center-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-center-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-center-003-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-center-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-center-003-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-center-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-left-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-left-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-left-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-left-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-left-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-left-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-left-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-left-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-left-003-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-left-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-left-003-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-left-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-right-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-right-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-right-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-right-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-right-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-right-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-right-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-right-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-right-003-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-right-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-align-right-003-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-align-right-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-float-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-float-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/pre-wrap-float-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/pre-wrap-float-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/tab-bidi-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/tab-bidi-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/tab-bidi-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/tab-bidi-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/tab-stop-threshold-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/tab-stop-threshold-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/tab-stop-threshold-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/tab-stop-threshold-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/tab-stop-threshold-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/tab-stop-threshold-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/tab-stop-threshold-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/tab-stop-threshold-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-space-collapse-discard-001-ref.xht b/tests/wpt/tests/css/css-text/white-space/reference/text-space-collapse-discard-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-space-collapse-discard-001-ref.xht rename to tests/wpt/tests/css/css-text/white-space/reference/text-space-collapse-discard-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-space-collapse-preserve-breaks-001-ref.xht b/tests/wpt/tests/css/css-text/white-space/reference/text-space-collapse-preserve-breaks-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-space-collapse-preserve-breaks-001-ref.xht rename to tests/wpt/tests/css/css-text/white-space/reference/text-space-collapse-preserve-breaks-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-space-trim-trim-inner-001-ref.xht b/tests/wpt/tests/css/css-text/white-space/reference/text-space-trim-trim-inner-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-space-trim-trim-inner-001-ref.xht rename to tests/wpt/tests/css/css-text/white-space/reference/text-space-trim-trim-inner-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-wrap-balance-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-wrap-balance-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-wrap-balance-align-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-align-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-wrap-balance-align-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-align-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-wrap-balance-dynamic-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-wrap-balance-dynamic-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-wrap-balance-line-clamp-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-line-clamp-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-wrap-balance-line-clamp-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-line-clamp-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-wrap-balance-text-indent-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-text-indent-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-wrap-balance-text-indent-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-text-indent-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/textarea-pre-wrap-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/textarea-pre-wrap-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/textarea-pre-wrap-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/textarea-pre-wrap-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/textarea-pre-wrap-014-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/textarea-pre-wrap-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/textarea-pre-wrap-014-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/textarea-pre-wrap-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-003-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-003-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-004-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-004-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-011-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-011-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-alt-003-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-alt-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-alt-003-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-alt-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-alt-011-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-alt-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-alt-011-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-alt-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-break-spaces-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-break-spaces-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ideographic-space-break-spaces-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-ideographic-space-break-spaces-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ogham-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-ogham-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ogham-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-ogham-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-other-space-separators-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-other-space-separators-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-other-space-separators-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-other-space-separators-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-other-space-separators-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-other-space-separators-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-other-space-separators-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-other-space-separators-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-009-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-009-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-013-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-013-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-other-space-separators-break-spaces-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-space-align-start-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-space-align-start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-space-align-start-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-space-align-start-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-rtl-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-rtl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-rtl-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-rtl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-rtl-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-rtl-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-rtl-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-rtl-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-rtl-005-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-rtl-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-rtl-005-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-space-and-text-alignment-rtl-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-space-rtl-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/trailing-space-rtl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-space-rtl-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/trailing-space-rtl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-applies-to-text-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-applies-to-text-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-applies-to-text-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-applies-to-text-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-break-spaces-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-intrinsic-size-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-intrinsic-size-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-intrinsic-size-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-intrinsic-size-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-intrinsic-size-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-intrinsic-size-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-intrinsic-size-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-intrinsic-size-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-intrinsic-size-003-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-intrinsic-size-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-intrinsic-size-003-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-intrinsic-size-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-intrinsic-size-004-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-intrinsic-size-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-intrinsic-size-004-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-intrinsic-size-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-letter-spacing-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-letter-spacing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-letter-spacing-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-letter-spacing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-normal-011-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-normal-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-normal-011-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-normal-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-nowrap-011-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-nowrap-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-nowrap-011-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-nowrap-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-011-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-011-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-031-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-031-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-031-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-031-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-034-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-034-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-034-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-034-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-003-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-003-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-004-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-004-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-justify-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-003-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-003-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-004-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-004-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-012-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-012-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-013-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-013-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-014-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-014-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-015-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-015-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-021-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-021-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-004-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-004-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-012-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-012-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-013-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-013-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-014-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-014-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-015-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-015-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-alt-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-vs-joiners-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-vs-joiners-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-vs-joiners-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-vs-joiners-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-vs-joiners-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-vs-joiners-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-vs-joiners-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-vs-joiners-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-wrap-after-nowrap-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-wrap-after-nowrap-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-wrap-after-nowrap-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-wrap-after-nowrap-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-zero-fontsize-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-zero-fontsize-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-zero-fontsize-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-zero-fontsize-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-zero-fontsize-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/white-space-zero-fontsize-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/white-space-zero-fontsize-002-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-zero-fontsize-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-001-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-003-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-003-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-006-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-006-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-012-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-012-ref.html rename to tests/wpt/tests/css/css-text/white-space/reference/ws-break-spaces-applies-to-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/remove-slotted-with-whitespace-sibling.html b/tests/wpt/tests/css/css-text/white-space/remove-slotted-with-whitespace-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/remove-slotted-with-whitespace-sibling.html rename to tests/wpt/tests/css/css-text/white-space/remove-slotted-with-whitespace-sibling.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-000.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-000.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-000.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-000.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-001.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-001.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-002.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-002.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-003.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-003.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-004.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-004.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-004.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-005.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-005.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-005.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-005.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-006.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-006.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-006.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-006.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-007.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-007.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-007.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-007.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-008.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-008.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-008.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-008.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-009.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-009.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-009.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-009.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-010.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-010.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-010.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-010.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-011.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-011.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-011.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-011.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-012.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-012.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-012.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-012.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-014.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-014.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-014.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-014.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-015.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-015.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-015.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-015.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-016.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-016.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-016.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-016.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-017.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-017.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-017.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-017.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-018.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-018.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-018.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-018.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-019.tentative.html b/tests/wpt/tests/css/css-text/white-space/seg-break-transformation-019.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/seg-break-transformation-019.tentative.html rename to tests/wpt/tests/css/css-text/white-space/seg-break-transformation-019.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/support/trailing-space-and-text-alignment.css b/tests/wpt/tests/css/css-text/white-space/support/trailing-space-and-text-alignment.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/support/trailing-space-and-text-alignment.css rename to tests/wpt/tests/css/css-text/white-space/support/trailing-space-and-text-alignment.css diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/tab-bidi-001.html b/tests/wpt/tests/css/css-text/white-space/tab-bidi-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/tab-bidi-001.html rename to tests/wpt/tests/css/css-text/white-space/tab-bidi-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/tab-stop-threshold-001.html b/tests/wpt/tests/css/css-text/white-space/tab-stop-threshold-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/tab-stop-threshold-001.html rename to tests/wpt/tests/css/css-text/white-space/tab-stop-threshold-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/tab-stop-threshold-002.html b/tests/wpt/tests/css/css-text/white-space/tab-stop-threshold-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/tab-stop-threshold-002.html rename to tests/wpt/tests/css/css-text/white-space/tab-stop-threshold-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/tab-stop-threshold-003.html b/tests/wpt/tests/css/css-text/white-space/tab-stop-threshold-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/tab-stop-threshold-003.html rename to tests/wpt/tests/css/css-text/white-space/tab-stop-threshold-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/tab-stop-threshold-004.html b/tests/wpt/tests/css/css-text/white-space/tab-stop-threshold-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/tab-stop-threshold-004.html rename to tests/wpt/tests/css/css-text/white-space/tab-stop-threshold-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/tab-stop-threshold-005.html b/tests/wpt/tests/css/css-text/white-space/tab-stop-threshold-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/tab-stop-threshold-005.html rename to tests/wpt/tests/css/css-text/white-space/tab-stop-threshold-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/tab-stop-threshold-006.html b/tests/wpt/tests/css/css-text/white-space/tab-stop-threshold-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/tab-stop-threshold-006.html rename to tests/wpt/tests/css/css-text/white-space/tab-stop-threshold-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/text-space-collapse-discard-001.xht b/tests/wpt/tests/css/css-text/white-space/text-space-collapse-discard-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/text-space-collapse-discard-001.xht rename to tests/wpt/tests/css/css-text/white-space/text-space-collapse-discard-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht b/tests/wpt/tests/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht rename to tests/wpt/tests/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/text-space-trim-trim-inner-001.xht b/tests/wpt/tests/css/css-text/white-space/text-space-trim-trim-inner-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/text-space-trim-trim-inner-001.xht rename to tests/wpt/tests/css/css-text/white-space/text-space-trim-trim-inner-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-001.html b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-001.html rename to tests/wpt/tests/css/css-text/white-space/text-wrap-balance-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-002.html b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-002.html rename to tests/wpt/tests/css/css-text/white-space/text-wrap-balance-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-align-001.html b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-align-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-align-001.html rename to tests/wpt/tests/css/css-text/white-space/text-wrap-balance-align-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-dynamic-001.html b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-dynamic-001.html rename to tests/wpt/tests/css/css-text/white-space/text-wrap-balance-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-line-clamp-001.html b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-line-clamp-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-line-clamp-001.html rename to tests/wpt/tests/css/css-text/white-space/text-wrap-balance-line-clamp-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-narrow-crash.html b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-narrow-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-narrow-crash.html rename to tests/wpt/tests/css/css-text/white-space/text-wrap-balance-narrow-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-text-indent-001.html b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-text-indent-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-text-indent-001.html rename to tests/wpt/tests/css/css-text/white-space/text-wrap-balance-text-indent-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/textarea-break-spaces-001.html b/tests/wpt/tests/css/css-text/white-space/textarea-break-spaces-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/textarea-break-spaces-001.html rename to tests/wpt/tests/css/css-text/white-space/textarea-break-spaces-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/textarea-break-spaces-002.html b/tests/wpt/tests/css/css-text/white-space/textarea-break-spaces-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/textarea-break-spaces-002.html rename to tests/wpt/tests/css/css-text/white-space/textarea-break-spaces-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-001.html b/tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-001.html rename to tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-002.html b/tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-002.html rename to tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-003.html b/tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-003.html rename to tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-004.html b/tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-004.html rename to tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-005.html b/tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-005.html rename to tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-006.html b/tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-006.html rename to tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-007.html b/tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-007.html rename to tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-011.html b/tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-011.html rename to tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-012.html b/tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-012.html rename to tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-013.html b/tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-013.html rename to tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-014.html b/tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/textarea-pre-wrap-014.html rename to tests/wpt/tests/css/css-text/white-space/textarea-pre-wrap-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-001.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-001.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-002.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-002.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-003.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-003.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-004.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-004.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-005.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-005.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-006.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-006.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-007.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-007.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-008.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-008.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-009.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-009.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-010.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-010.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-011.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-011.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-012.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-012.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-013.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-013.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-014.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-014.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-015.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-015.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-016.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-016.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-017.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-017.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-018.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-018.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-019.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-019.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-019.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-020.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-020.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-020.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-021.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-021.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-021.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-022.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-022.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-022.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-023.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-023.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-023.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-024.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-024.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-024.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-025.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-025.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-025.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-008.html b/tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-008.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ideographic-space-break-spaces-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-001.html b/tests/wpt/tests/css/css-text/white-space/trailing-ogham-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-001.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ogham-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-002.html b/tests/wpt/tests/css/css-text/white-space/trailing-ogham-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-002.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ogham-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-003.html b/tests/wpt/tests/css/css-text/white-space/trailing-ogham-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-003.html rename to tests/wpt/tests/css/css-text/white-space/trailing-ogham-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-001.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-001.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-002.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-002.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-003.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-003.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-004.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-004.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-001.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-001.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-002.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-002.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-003.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-003.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-004.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-004.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-005.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-005.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-006.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-006.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-007.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-007.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-008.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-008.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-009.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-009.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-010.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-010.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-011.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-011.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-012.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-012.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-013.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-013.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-014.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-014.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-015.html b/tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-015.html rename to tests/wpt/tests/css/css-text/white-space/trailing-other-space-separators-break-spaces-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-align-start.tentative.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-align-start.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-align-start.tentative.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-align-start.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-001.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-001.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-002.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-002.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-003.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-003.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-004.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-004.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-005.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-005.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-001.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-001.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-002.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-002.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-003.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-003.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-004.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-004.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-005.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-005.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-and-text-alignment-rtl-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-before-br-001.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-before-br-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-before-br-001.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-before-br-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-in-inline-box.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-in-inline-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-in-inline-box.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-in-inline-box.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-position-001.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-position-001.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-rtl-001.html b/tests/wpt/tests/css/css-text/white-space/trailing-space-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/trailing-space-rtl-001.html rename to tests/wpt/tests/css/css-text/white-space/trailing-space-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-applies-to-text-001.html b/tests/wpt/tests/css/css-text/white-space/white-space-applies-to-text-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-applies-to-text-001.html rename to tests/wpt/tests/css/css-text/white-space/white-space-applies-to-text-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-collapse-000.html b/tests/wpt/tests/css/css-text/white-space/white-space-collapse-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-collapse-000.html rename to tests/wpt/tests/css/css-text/white-space/white-space-collapse-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-collapse-001.html b/tests/wpt/tests/css/css-text/white-space/white-space-collapse-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-collapse-001.html rename to tests/wpt/tests/css/css-text/white-space/white-space-collapse-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-collapse-002.html b/tests/wpt/tests/css/css-text/white-space/white-space-collapse-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-collapse-002.html rename to tests/wpt/tests/css/css-text/white-space/white-space-collapse-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-empty-text-sibling.html b/tests/wpt/tests/css/css-text/white-space/white-space-empty-text-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-empty-text-sibling.html rename to tests/wpt/tests/css/css-text/white-space/white-space-empty-text-sibling.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-001.html b/tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-001.html rename to tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-002.html b/tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-002.html rename to tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-003.html b/tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-003.html rename to tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-004.html b/tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-004.html rename to tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-005.html b/tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-005.html rename to tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-006.html b/tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-006.html rename to tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-013.html b/tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-013.html rename to tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-014.html b/tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-014.html rename to tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-015.html b/tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-015.html rename to tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-016.html b/tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-016.html rename to tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-017.html b/tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-017.html rename to tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-018.html b/tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-018.html rename to tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-019.html b/tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-019.html rename to tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-019.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-020.html b/tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-020.html rename to tests/wpt/tests/css/css-text/white-space/white-space-intrinsic-size-020.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-letter-spacing-001.html b/tests/wpt/tests/css/css-text/white-space/white-space-letter-spacing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-letter-spacing-001.html rename to tests/wpt/tests/css/css-text/white-space/white-space-letter-spacing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-normal-011.html b/tests/wpt/tests/css/css-text/white-space/white-space-normal-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-normal-011.html rename to tests/wpt/tests/css/css-text/white-space/white-space-normal-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-nowrap-011.html b/tests/wpt/tests/css/css-text/white-space/white-space-nowrap-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-nowrap-011.html rename to tests/wpt/tests/css/css-text/white-space/white-space-nowrap-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-011.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-011.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-031.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-031.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-031.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-032.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-032.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-032.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-034.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-034.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-034.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-035.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-035.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-035.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-051.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-051.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-051.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-052.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-052.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-052.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-justify-001.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-justify-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-justify-001.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-justify-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-justify-002.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-justify-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-justify-002.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-justify-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-justify-003.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-justify-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-justify-003.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-justify-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-justify-004.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-justify-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-justify-004.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-justify-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-001.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-001.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-002.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-002.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-003.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-003.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-004.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-004.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-005.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-005.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-006.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-006.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-007.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-007.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-008.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-008.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-010.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-010.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-011.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-011.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-012.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-012.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-013.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-013.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-014.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-014.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-015.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-015.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-021.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-021.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-021.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-022.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-022.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-022.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-023.html b/tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-023.html rename to tests/wpt/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-023.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-vs-joiners-001.html b/tests/wpt/tests/css/css-text/white-space/white-space-vs-joiners-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-vs-joiners-001.html rename to tests/wpt/tests/css/css-text/white-space/white-space-vs-joiners-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-vs-joiners-002.html b/tests/wpt/tests/css/css-text/white-space/white-space-vs-joiners-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-vs-joiners-002.html rename to tests/wpt/tests/css/css-text/white-space/white-space-vs-joiners-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-wrap-after-nowrap-001.html b/tests/wpt/tests/css/css-text/white-space/white-space-wrap-after-nowrap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-wrap-after-nowrap-001.html rename to tests/wpt/tests/css/css-text/white-space/white-space-wrap-after-nowrap-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-zero-fontsize-001.html b/tests/wpt/tests/css/css-text/white-space/white-space-zero-fontsize-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-zero-fontsize-001.html rename to tests/wpt/tests/css/css-text/white-space/white-space-zero-fontsize-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/white-space-zero-fontsize-002.html b/tests/wpt/tests/css/css-text/white-space/white-space-zero-fontsize-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/white-space-zero-fontsize-002.html rename to tests/wpt/tests/css/css-text/white-space/white-space-zero-fontsize-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-001.html b/tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-001.html rename to tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-002.html b/tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-002.html rename to tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-003.html b/tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-003.html rename to tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-005.html b/tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-005.html rename to tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-006.html b/tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-006.html rename to tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-007.html b/tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-007.html rename to tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-008.html b/tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-008.html rename to tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-009.html b/tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-009.html rename to tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-010.html b/tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-010.html rename to tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-011.html b/tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-011.html rename to tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-012.html b/tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-012.html rename to tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-013.html b/tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-013.html rename to tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-014.html b/tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-014.html rename to tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-015.html b/tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/white-space/ws-break-spaces-applies-to-015.html rename to tests/wpt/tests/css/css-text/white-space/ws-break-spaces-applies-to-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/whitespace-followed-by-cham-symbol-crash.html b/tests/wpt/tests/css/css-text/whitespace-followed-by-cham-symbol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/whitespace-followed-by-cham-symbol-crash.html rename to tests/wpt/tests/css/css-text/whitespace-followed-by-cham-symbol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-001-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-001-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-002-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-002-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-004-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-004-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-007-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-007-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-008-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-008-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-009-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-009-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-010-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-010-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-011-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-011-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-012-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-012-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-013-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-013-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-014-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-014-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-101-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-101-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-101-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-101-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-102-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-102-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-102-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-102-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-103-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-103-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-103-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-103-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-104-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-104-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-104-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-104-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-105-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-105-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-105-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-105-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-106-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-106-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-106-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-106-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-107-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-107-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-107-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-107-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-108-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-108-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-108-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-108-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-109-a-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-109-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-109-a-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-109-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-109-b-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-109-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-109-b-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-109-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-110-a-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-110-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-110-a-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-110-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-110-b-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-110-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-110-b-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-110-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-111-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-111-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-111-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-111-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-112-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-112-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-112-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-112-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-113-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-113-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-113-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-113-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-114-a-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-114-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-114-a-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-114-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-114-b-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-114-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-114-b-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-114-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-115-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-115-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-115-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-115-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-116-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-116-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-116-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-116-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-117-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-117-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-117-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-117-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-119-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-119-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-119-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-119-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-120-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-120-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-120-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-120-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-121-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-121-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-121-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-121-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-122-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-122-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-122-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-122-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-123-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-123-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-123-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-123-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-124-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-124-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-124-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-124-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-125-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-125-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-125-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-125-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-126-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-126-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-126-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-126-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-127-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-127-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-127-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-127-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-128-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-128-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-128-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-128-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-129-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-129-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/reference/word-boundary-129-ref.html rename to tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-129-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-001.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-001.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-002.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-002.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-003.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-003.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-004.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-004.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-005.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-005.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-006.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-006.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-007.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-007.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-008.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-008.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-009.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-009.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-010.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-010.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-011.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-011.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-012.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-012.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-013.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-013.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-014.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-014.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-015-manual.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-015-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-015-manual.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-015-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-101.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-101.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-101.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-101.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-102.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-102.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-102.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-102.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-103.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-103.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-103.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-103.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-104.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-104.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-104.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-104.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-105.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-105.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-105.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-105.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-106.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-106.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-106.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-106.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-107.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-107.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-107.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-107.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-108.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-108.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-108.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-108.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-109.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-109.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-109.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-109.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-110.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-110.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-110.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-110.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-111.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-111.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-111.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-111.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-112.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-112.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-112.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-112.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-113.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-113.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-113.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-113.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-114.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-114.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-114.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-114.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-115.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-115.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-115.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-115.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-116.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-116.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-116.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-116.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-117.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-117.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-117.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-117.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-118.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-118.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-118.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-118.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-119.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-119.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-119.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-119.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-120.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-120.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-120.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-120.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-121.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-121.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-121.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-121.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-122.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-122.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-122.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-122.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-123.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-123.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-123.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-123.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-124.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-124.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-124.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-124.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-125.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-125.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-125.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-125.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-126.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-126.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-126.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-126.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-127.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-127.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-127.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-127.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-128.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-128.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-128.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-128.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-129.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-129.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-boundary/word-boundary-129.html rename to tests/wpt/tests/css/css-text/word-boundary/word-boundary-129.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/break-boundary-2-chars-001.html b/tests/wpt/tests/css/css-text/word-break/break-boundary-2-chars-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/break-boundary-2-chars-001.html rename to tests/wpt/tests/css/css-text/word-break/break-boundary-2-chars-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/break-boundary-2-chars-002.html b/tests/wpt/tests/css/css-text/word-break/break-boundary-2-chars-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/break-boundary-2-chars-002.html rename to tests/wpt/tests/css/css-text/word-break/break-boundary-2-chars-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/break-boundary-2-chars-001-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/break-boundary-2-chars-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/break-boundary-2-chars-001-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/break-boundary-2-chars-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/break-boundary-2-chars-002-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/break-boundary-2-chars-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/break-boundary-2-chars-002-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/break-boundary-2-chars-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-010-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-010-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-014-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-014-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-020-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-020-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-062-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-062-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-062-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-062-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ethiopic-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ethiopic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ethiopic-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ethiopic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-001-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-001-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-002-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-002-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-003-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-003-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-004-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-004-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-005-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-005-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-a-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-006-a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-a-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-006-a-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-b-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-006-b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-006-b-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-006-b-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-007-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-inline-007-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-inline-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-000.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-000.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-001.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-001.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-002.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-002.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-003.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-003.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-004.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-004.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-005.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-005.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-006.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-006.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-007.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-007.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-008.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-008.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-031.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-031.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-031.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-032.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-032.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-break-all-ref-032.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-005-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-005-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-063-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-063-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-063-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-063-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-000.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-ref-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-000.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-ref-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-001.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-001.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-002.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-ref-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-002.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-ref-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-003.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-ref-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-003.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-ref-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-009.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-ref-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-009.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-ref-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-010.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-ref-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-010.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-keep-all-ref-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ar-ref-000.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ar-ref-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ar-ref-000.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ar-ref-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-bo-ref-000.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-bo-ref-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-bo-ref-000.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-bo-ref-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-en-ref-000.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-en-ref-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-en-ref-000.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-en-ref-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ethiopic-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ethiopic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ethiopic-ref.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ethiopic-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-hi-ref-000.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-hi-ref-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-hi-ref-000.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-hi-ref-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ja-ref-000.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ja-ref-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ja-ref-000.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ja-ref-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ja-ref-001.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ja-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ja-ref-001.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ja-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ja-ref-002.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ja-ref-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ja-ref-002.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ja-ref-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ja-ref-004.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ja-ref-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ja-ref-004.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ja-ref-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-km-ref-000.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-km-ref-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-km-ref-000.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-km-ref-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ko-ref-000.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ko-ref-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ko-ref-000.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ko-ref-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-lo-ref-000.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-lo-ref-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-lo-ref-000.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-lo-ref-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-my-ref-000.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-my-ref-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-my-ref-000.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-my-ref-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ref-001.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-ref-001.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-tdd-ref-000.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-tdd-ref-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-tdd-ref-000.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-tdd-ref-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-th-ref-000.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-th-ref-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-th-ref-000.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-th-ref-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-zh-ref-000.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-zh-ref-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-normal-zh-ref-000.html rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-zh-ref-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-000.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-000.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-001.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-001.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-002.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-002.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-003.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-003.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-004.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-004.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-005.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-005.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-006.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-006.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-007.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-007.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-008.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-008.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-010.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-010.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-011.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-011.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-011.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-012.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-012.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-012.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-013.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-013.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-013.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-014.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-014.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-014.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-015.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-015.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-015.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-016.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-016.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-016.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-017.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-017.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-017.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-018.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-018.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-018.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-019.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-019.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-019.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-020.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-020.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-020.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-021.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-021.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-021.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-022.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-022.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-022.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-023.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-023.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-023.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-024.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-024.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-024.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-025.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-025.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-025.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-026.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-026.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-026.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-027.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-027.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-027.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-028.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-028.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-028.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-029.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-029.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-029.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-030.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-030.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-030.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-031.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-031.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-031.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-032.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-032.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-032.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-062.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-062.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-062.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-062.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-ethiopic.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-ethiopic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-ethiopic.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-ethiopic.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-001.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-001.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-002.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-002.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-003.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-003.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-004.tentative.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-004.tentative.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-004.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-005.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-005.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-006.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-006.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-007.tentative.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-007.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-007.tentative.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-007.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-008.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-008.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-009.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-009.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-010.tentative.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-010.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-inline-010.tentative.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-all-inline-010.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-word-crash-001.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-word-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-word-crash-001.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-word-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-word-overflow-wrap-interactions-ref.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-word-overflow-wrap-interactions-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-word-overflow-wrap-interactions-ref.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-word-overflow-wrap-interactions-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-word-overflow-wrap-interactions.html b/tests/wpt/tests/css/css-text/word-break/word-break-break-word-overflow-wrap-interactions.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-word-overflow-wrap-interactions.html rename to tests/wpt/tests/css/css-text/word-break/word-break-break-word-overflow-wrap-interactions.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-000.html b/tests/wpt/tests/css/css-text/word-break/word-break-keep-all-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-000.html rename to tests/wpt/tests/css/css-text/word-break/word-break-keep-all-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-001.html b/tests/wpt/tests/css/css-text/word-break/word-break-keep-all-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-001.html rename to tests/wpt/tests/css/css-text/word-break/word-break-keep-all-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-002.html b/tests/wpt/tests/css/css-text/word-break/word-break-keep-all-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-002.html rename to tests/wpt/tests/css/css-text/word-break/word-break-keep-all-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-003.html b/tests/wpt/tests/css/css-text/word-break/word-break-keep-all-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-003.html rename to tests/wpt/tests/css/css-text/word-break/word-break-keep-all-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-005.html b/tests/wpt/tests/css/css-text/word-break/word-break-keep-all-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-005.html rename to tests/wpt/tests/css/css-text/word-break/word-break-keep-all-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-006.html b/tests/wpt/tests/css/css-text/word-break/word-break-keep-all-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-006.html rename to tests/wpt/tests/css/css-text/word-break/word-break-keep-all-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-007.html b/tests/wpt/tests/css/css-text/word-break/word-break-keep-all-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-007.html rename to tests/wpt/tests/css/css-text/word-break/word-break-keep-all-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-008.html b/tests/wpt/tests/css/css-text/word-break/word-break-keep-all-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-008.html rename to tests/wpt/tests/css/css-text/word-break/word-break-keep-all-008.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-009.html b/tests/wpt/tests/css/css-text/word-break/word-break-keep-all-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-009.html rename to tests/wpt/tests/css/css-text/word-break/word-break-keep-all-009.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-010.html b/tests/wpt/tests/css/css-text/word-break/word-break-keep-all-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-010.html rename to tests/wpt/tests/css/css-text/word-break/word-break-keep-all-010.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-063.html b/tests/wpt/tests/css/css-text/word-break/word-break-keep-all-063.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-063.html rename to tests/wpt/tests/css/css-text/word-break/word-break-keep-all-063.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-min-content-001.html b/tests/wpt/tests/css/css-text/word-break/word-break-min-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-min-content-001.html rename to tests/wpt/tests/css/css-text/word-break/word-break-min-content-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-min-content-002.html b/tests/wpt/tests/css/css-text/word-break/word-break-min-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-min-content-002.html rename to tests/wpt/tests/css/css-text/word-break/word-break-min-content-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-min-content-003.html b/tests/wpt/tests/css/css-text/word-break/word-break-min-content-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-min-content-003.html rename to tests/wpt/tests/css/css-text/word-break/word-break-min-content-003.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-min-content-004.html b/tests/wpt/tests/css/css-text/word-break/word-break-min-content-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-min-content-004.html rename to tests/wpt/tests/css/css-text/word-break/word-break-min-content-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-min-content-005.html b/tests/wpt/tests/css/css-text/word-break/word-break-min-content-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-min-content-005.html rename to tests/wpt/tests/css/css-text/word-break/word-break-min-content-005.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-min-content-006.html b/tests/wpt/tests/css/css-text/word-break/word-break-min-content-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-min-content-006.html rename to tests/wpt/tests/css/css-text/word-break/word-break-min-content-006.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-min-content-007.html b/tests/wpt/tests/css/css-text/word-break/word-break-min-content-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-min-content-007.html rename to tests/wpt/tests/css/css-text/word-break/word-break-min-content-007.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-001.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-001.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-ar-000.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-ar-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-ar-000.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-ar-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-bo-000.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-bo-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-bo-000.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-bo-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-en-000.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-en-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-en-000.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-en-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-ethiopic.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-ethiopic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-ethiopic.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-ethiopic.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-hi-000.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-hi-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-hi-000.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-hi-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-ja-000.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-ja-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-ja-000.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-ja-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-ja-001.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-ja-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-ja-001.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-ja-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-ja-002.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-ja-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-ja-002.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-ja-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-ja-004.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-ja-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-ja-004.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-ja-004.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-km-000.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-km-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-km-000.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-km-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-ko-000.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-ko-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-ko-000.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-ko-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-lo-000.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-lo-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-lo-000.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-lo-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-my-000.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-my-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-my-000.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-my-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-tdd-000.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-tdd-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-tdd-000.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-tdd-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-th-000.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-th-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-th-000.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-th-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-zh-000.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-zh-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-break/word-break-normal-zh-000.html rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-zh-000.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-spacing/reference/ref-filled-green-100px-square.xht b/tests/wpt/tests/css/css-text/word-spacing/reference/ref-filled-green-100px-square.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-spacing/reference/ref-filled-green-100px-square.xht rename to tests/wpt/tests/css/css-text/word-spacing/reference/ref-filled-green-100px-square.xht diff --git a/tests/wpt/web-platform-tests/css/css-text/word-spacing/support/swatch-blue.png b/tests/wpt/tests/css/css-text/word-spacing/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-spacing/support/swatch-blue.png rename to tests/wpt/tests/css/css-text/word-spacing/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-text/word-spacing/support/swatch-orange.png b/tests/wpt/tests/css/css-text/word-spacing/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-spacing/support/swatch-orange.png rename to tests/wpt/tests/css/css-text/word-spacing/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-text/word-spacing/word-spacing-001-ref.html b/tests/wpt/tests/css/css-text/word-spacing/word-spacing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-spacing/word-spacing-001-ref.html rename to tests/wpt/tests/css/css-text/word-spacing/word-spacing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-spacing/word-spacing-001.html b/tests/wpt/tests/css/css-text/word-spacing/word-spacing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-spacing/word-spacing-001.html rename to tests/wpt/tests/css/css-text/word-spacing/word-spacing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-spacing/word-spacing-computed-001.html b/tests/wpt/tests/css/css-text/word-spacing/word-spacing-computed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-spacing/word-spacing-computed-001.html rename to tests/wpt/tests/css/css-text/word-spacing/word-spacing-computed-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/word-spacing/word-spacing-negative-value-001.html b/tests/wpt/tests/css/css-text/word-spacing/word-spacing-negative-value-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/word-spacing/word-spacing-negative-value-001.html rename to tests/wpt/tests/css/css-text/word-spacing/word-spacing-negative-value-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/writing-system/reference/writing-system-font-001-ref.html b/tests/wpt/tests/css/css-text/writing-system/reference/writing-system-font-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/writing-system/reference/writing-system-font-001-ref.html rename to tests/wpt/tests/css/css-text/writing-system/reference/writing-system-font-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/writing-system/reference/writing-system-line-break-001-ref.html b/tests/wpt/tests/css/css-text/writing-system/reference/writing-system-line-break-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/writing-system/reference/writing-system-line-break-001-ref.html rename to tests/wpt/tests/css/css-text/writing-system/reference/writing-system-line-break-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/writing-system/reference/writing-system-line-break-002-ref.html b/tests/wpt/tests/css/css-text/writing-system/reference/writing-system-line-break-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/writing-system/reference/writing-system-line-break-002-ref.html rename to tests/wpt/tests/css/css-text/writing-system/reference/writing-system-line-break-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/writing-system/reference/writing-system-segment-break-001-ref.html b/tests/wpt/tests/css/css-text/writing-system/reference/writing-system-segment-break-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/writing-system/reference/writing-system-segment-break-001-ref.html rename to tests/wpt/tests/css/css-text/writing-system/reference/writing-system-segment-break-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/writing-system/reference/writing-system-text-transform-001-ref.html b/tests/wpt/tests/css/css-text/writing-system/reference/writing-system-text-transform-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/writing-system/reference/writing-system-text-transform-001-ref.html rename to tests/wpt/tests/css/css-text/writing-system/reference/writing-system-text-transform-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-text/writing-system/writing-system-font-001.html b/tests/wpt/tests/css/css-text/writing-system/writing-system-font-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/writing-system/writing-system-font-001.html rename to tests/wpt/tests/css/css-text/writing-system/writing-system-font-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/writing-system/writing-system-line-break-001.html b/tests/wpt/tests/css/css-text/writing-system/writing-system-line-break-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/writing-system/writing-system-line-break-001.html rename to tests/wpt/tests/css/css-text/writing-system/writing-system-line-break-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/writing-system/writing-system-line-break-002.html b/tests/wpt/tests/css/css-text/writing-system/writing-system-line-break-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/writing-system/writing-system-line-break-002.html rename to tests/wpt/tests/css/css-text/writing-system/writing-system-line-break-002.html diff --git a/tests/wpt/web-platform-tests/css/css-text/writing-system/writing-system-segment-break-001.html b/tests/wpt/tests/css/css-text/writing-system/writing-system-segment-break-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/writing-system/writing-system-segment-break-001.html rename to tests/wpt/tests/css/css-text/writing-system/writing-system-segment-break-001.html diff --git a/tests/wpt/web-platform-tests/css/css-text/writing-system/writing-system-text-transform-001.html b/tests/wpt/tests/css/css-text/writing-system/writing-system-text-transform-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-text/writing-system/writing-system-text-transform-001.html rename to tests/wpt/tests/css/css-text/writing-system/writing-system-text-transform-001.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/animations/toggle-group-interpolation.tentative.html b/tests/wpt/tests/css/css-toggle/animations/toggle-group-interpolation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/animations/toggle-group-interpolation.tentative.html rename to tests/wpt/tests/css/css-toggle/animations/toggle-group-interpolation.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/animations/toggle-root-interpolation.tentative.html b/tests/wpt/tests/css/css-toggle/animations/toggle-root-interpolation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/animations/toggle-root-interpolation.tentative.html rename to tests/wpt/tests/css/css-toggle/animations/toggle-root-interpolation.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/animations/toggle-trigger-interpolation.tentative.html b/tests/wpt/tests/css/css-toggle/animations/toggle-trigger-interpolation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/animations/toggle-trigger-interpolation.tentative.html rename to tests/wpt/tests/css/css-toggle/animations/toggle-trigger-interpolation.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/idlharness.tentative.html b/tests/wpt/tests/css/css-toggle/idlharness.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/idlharness.tentative.html rename to tests/wpt/tests/css/css-toggle/idlharness.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/support/toggle-root-values.js b/tests/wpt/tests/css/css-toggle/parsing/support/toggle-root-values.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/support/toggle-root-values.js rename to tests/wpt/tests/css/css-toggle/parsing/support/toggle-root-values.js diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-computed.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-computed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-computed.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-computed.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-group-computed.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-group-computed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-group-computed.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-group-computed.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-group-invalid.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-group-invalid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-group-invalid.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-group-invalid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-group-valid.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-group-valid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-group-valid.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-group-valid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-invalid.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-invalid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-invalid.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-invalid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-root-computed.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-root-computed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-root-computed.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-root-computed.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-root-invalid.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-root-invalid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-root-invalid.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-root-invalid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-root-valid.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-root-valid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-root-valid.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-root-valid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-trigger-computed.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-trigger-computed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-trigger-computed.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-trigger-computed.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-trigger-invalid.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-trigger-invalid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-trigger-invalid.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-trigger-invalid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-trigger-valid.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-trigger-valid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-trigger-valid.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-trigger-valid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-valid.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-valid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-valid.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-valid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-visibility-computed.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-visibility-computed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-visibility-computed.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-visibility-computed.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-visibility-invalid.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-visibility-invalid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-visibility-invalid.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-visibility-invalid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-visibility-valid.tentative.html b/tests/wpt/tests/css/css-toggle/parsing/toggle-visibility-valid.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/parsing/toggle-visibility-valid.tentative.html rename to tests/wpt/tests/css/css-toggle/parsing/toggle-visibility-valid.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/support/toggle-helpers.js b/tests/wpt/tests/css/css-toggle/support/toggle-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/support/toggle-helpers.js rename to tests/wpt/tests/css/css-toggle/support/toggle-helpers.js diff --git a/tests/wpt/web-platform-tests/css/css-toggle/toggle-activation-with-groups.tentative.html b/tests/wpt/tests/css/css-toggle/toggle-activation-with-groups.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/toggle-activation-with-groups.tentative.html rename to tests/wpt/tests/css/css-toggle/toggle-activation-with-groups.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/toggle-activation.tentative.html b/tests/wpt/tests/css/css-toggle/toggle-activation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/toggle-activation.tentative.html rename to tests/wpt/tests/css/css-toggle/toggle-activation.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/toggle-api.tentative.html b/tests/wpt/tests/css/css-toggle/toggle-api.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/toggle-api.tentative.html rename to tests/wpt/tests/css/css-toggle/toggle-api.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/toggle-aria-roles.tentative.html b/tests/wpt/tests/css/css-toggle/toggle-aria-roles.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/toggle-aria-roles.tentative.html rename to tests/wpt/tests/css/css-toggle/toggle-aria-roles.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/toggle-creation.tentative.html b/tests/wpt/tests/css/css-toggle/toggle-creation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/toggle-creation.tentative.html rename to tests/wpt/tests/css/css-toggle/toggle-creation.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/toggle-events.tentative.html b/tests/wpt/tests/css/css-toggle/toggle-events.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/toggle-events.tentative.html rename to tests/wpt/tests/css/css-toggle/toggle-events.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/toggle-pseudo-class.tentative.html b/tests/wpt/tests/css/css-toggle/toggle-pseudo-class.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/toggle-pseudo-class.tentative.html rename to tests/wpt/tests/css/css-toggle/toggle-pseudo-class.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/toggle-shorthand-serialization.tentative.html b/tests/wpt/tests/css/css-toggle/toggle-shorthand-serialization.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/toggle-shorthand-serialization.tentative.html rename to tests/wpt/tests/css/css-toggle/toggle-shorthand-serialization.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/toggle-trigger-focus.tentative.html b/tests/wpt/tests/css/css-toggle/toggle-trigger-focus.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/toggle-trigger-focus.tentative.html rename to tests/wpt/tests/css/css-toggle/toggle-trigger-focus.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/toggle-trigger-multiple.tentative.html b/tests/wpt/tests/css/css-toggle/toggle-trigger-multiple.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/toggle-trigger-multiple.tentative.html rename to tests/wpt/tests/css/css-toggle/toggle-trigger-multiple.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/toggle-visibility-z-ordering-001.tentative.html b/tests/wpt/tests/css/css-toggle/toggle-visibility-z-ordering-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/toggle-visibility-z-ordering-001.tentative.html rename to tests/wpt/tests/css/css-toggle/toggle-visibility-z-ordering-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/toggle-visibility-z-ordering-002.tentative.html b/tests/wpt/tests/css/css-toggle/toggle-visibility-z-ordering-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/toggle-visibility-z-ordering-002.tentative.html rename to tests/wpt/tests/css/css-toggle/toggle-visibility-z-ordering-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-toggle/toggle-visibility.tentative.html b/tests/wpt/tests/css/css-toggle/toggle-visibility.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-toggle/toggle-visibility.tentative.html rename to tests/wpt/tests/css/css-toggle/toggle-visibility.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/2d-rotate-001.html b/tests/wpt/tests/css/css-transforms/2d-rotate-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/2d-rotate-001.html rename to tests/wpt/tests/css/css-transforms/2d-rotate-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/2d-rotate-js.html b/tests/wpt/tests/css/css-transforms/2d-rotate-js.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/2d-rotate-js.html rename to tests/wpt/tests/css/css-transforms/2d-rotate-js.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/2d-rotate-notref.html b/tests/wpt/tests/css/css-transforms/2d-rotate-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/2d-rotate-notref.html rename to tests/wpt/tests/css/css-transforms/2d-rotate-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/2d-rotate-ref.html b/tests/wpt/tests/css/css-transforms/2d-rotate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/2d-rotate-ref.html rename to tests/wpt/tests/css/css-transforms/2d-rotate-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/3d-rendering-context-and-abspos.html b/tests/wpt/tests/css/css-transforms/3d-rendering-context-and-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/3d-rendering-context-and-abspos.html rename to tests/wpt/tests/css/css-transforms/3d-rendering-context-and-abspos.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/3d-rendering-context-and-fixpos.html b/tests/wpt/tests/css/css-transforms/3d-rendering-context-and-fixpos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/3d-rendering-context-and-fixpos.html rename to tests/wpt/tests/css/css-transforms/3d-rendering-context-and-fixpos.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/3d-rendering-context-and-inline.html b/tests/wpt/tests/css/css-transforms/3d-rendering-context-and-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/3d-rendering-context-and-inline.html rename to tests/wpt/tests/css/css-transforms/3d-rendering-context-and-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/3d-rendering-context-and-z-ordering-001.html b/tests/wpt/tests/css/css-transforms/3d-rendering-context-and-z-ordering-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/3d-rendering-context-and-z-ordering-001.html rename to tests/wpt/tests/css/css-transforms/3d-rendering-context-and-z-ordering-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/3d-rendering-context-and-z-ordering-002.html b/tests/wpt/tests/css/css-transforms/3d-rendering-context-and-z-ordering-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/3d-rendering-context-and-z-ordering-002.html rename to tests/wpt/tests/css/css-transforms/3d-rendering-context-and-z-ordering-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/3d-rendering-context-and-z-ordering-003.html b/tests/wpt/tests/css/css-transforms/3d-rendering-context-and-z-ordering-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/3d-rendering-context-and-z-ordering-003.html rename to tests/wpt/tests/css/css-transforms/3d-rendering-context-and-z-ordering-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/3d-rendering-context-behavior.html b/tests/wpt/tests/css/css-transforms/3d-rendering-context-behavior.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/3d-rendering-context-behavior.html rename to tests/wpt/tests/css/css-transforms/3d-rendering-context-behavior.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/3d-scene-with-iframe-001-ref.html b/tests/wpt/tests/css/css-transforms/3d-scene-with-iframe-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/3d-scene-with-iframe-001-ref.html rename to tests/wpt/tests/css/css-transforms/3d-scene-with-iframe-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/3d-scene-with-iframe-001.html b/tests/wpt/tests/css/css-transforms/3d-scene-with-iframe-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/3d-scene-with-iframe-001.html rename to tests/wpt/tests/css/css-transforms/3d-scene-with-iframe-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/3dtransform-and-filter-no-perspective-001-ref.html b/tests/wpt/tests/css/css-transforms/3dtransform-and-filter-no-perspective-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/3dtransform-and-filter-no-perspective-001-ref.html rename to tests/wpt/tests/css/css-transforms/3dtransform-and-filter-no-perspective-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/3dtransform-and-filter-no-perspective-001.html b/tests/wpt/tests/css/css-transforms/3dtransform-and-filter-no-perspective-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/3dtransform-and-filter-no-perspective-001.html rename to tests/wpt/tests/css/css-transforms/3dtransform-and-filter-no-perspective-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/3dtransform-and-position-sticky-001.html b/tests/wpt/tests/css/css-transforms/3dtransform-and-position-sticky-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/3dtransform-and-position-sticky-001.html rename to tests/wpt/tests/css/css-transforms/3dtransform-and-position-sticky-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/3dtransform-and-position-sticky-002.html b/tests/wpt/tests/css/css-transforms/3dtransform-and-position-sticky-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/3dtransform-and-position-sticky-002.html rename to tests/wpt/tests/css/css-transforms/3dtransform-and-position-sticky-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/3dtransform-and-position-sticky-ref.html b/tests/wpt/tests/css/css-transforms/3dtransform-and-position-sticky-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/3dtransform-and-position-sticky-ref.html rename to tests/wpt/tests/css/css-transforms/3dtransform-and-position-sticky-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/META.yml b/tests/wpt/tests/css/css-transforms/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/META.yml rename to tests/wpt/tests/css/css-transforms/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-transforms/add-child-in-empty-layer-ref.html b/tests/wpt/tests/css/css-transforms/add-child-in-empty-layer-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/add-child-in-empty-layer-ref.html rename to tests/wpt/tests/css/css-transforms/add-child-in-empty-layer-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/add-child-in-empty-layer.html b/tests/wpt/tests/css/css-transforms/add-child-in-empty-layer.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/add-child-in-empty-layer.html rename to tests/wpt/tests/css/css-transforms/add-child-in-empty-layer.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/backface-visibility-no-interpolation.html b/tests/wpt/tests/css/css-transforms/animation/backface-visibility-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/backface-visibility-no-interpolation.html rename to tests/wpt/tests/css/css-transforms/animation/backface-visibility-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/canvas-webgl-translate-in-animation-ref.html b/tests/wpt/tests/css/css-transforms/animation/canvas-webgl-translate-in-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/canvas-webgl-translate-in-animation-ref.html rename to tests/wpt/tests/css/css-transforms/animation/canvas-webgl-translate-in-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/canvas-webgl-translate-in-animation.html b/tests/wpt/tests/css/css-transforms/animation/canvas-webgl-translate-in-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/canvas-webgl-translate-in-animation.html rename to tests/wpt/tests/css/css-transforms/animation/canvas-webgl-translate-in-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/composited-transform.html b/tests/wpt/tests/css/css-transforms/animation/composited-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/composited-transform.html rename to tests/wpt/tests/css/css-transforms/animation/composited-transform.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/list-interpolation.html b/tests/wpt/tests/css/css-transforms/animation/list-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/list-interpolation.html rename to tests/wpt/tests/css/css-transforms/animation/list-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/matrix-interpolation.html b/tests/wpt/tests/css/css-transforms/animation/matrix-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/matrix-interpolation.html rename to tests/wpt/tests/css/css-transforms/animation/matrix-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/perspective-composition.html b/tests/wpt/tests/css/css-transforms/animation/perspective-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/perspective-composition.html rename to tests/wpt/tests/css/css-transforms/animation/perspective-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/perspective-interpolation.html b/tests/wpt/tests/css/css-transforms/animation/perspective-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/perspective-interpolation.html rename to tests/wpt/tests/css/css-transforms/animation/perspective-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/perspective-origin-interpolation.html b/tests/wpt/tests/css/css-transforms/animation/perspective-origin-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/perspective-origin-interpolation.html rename to tests/wpt/tests/css/css-transforms/animation/perspective-origin-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-animation-on-svg-ref.html b/tests/wpt/tests/css/css-transforms/animation/rotate-animation-on-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-animation-on-svg-ref.html rename to tests/wpt/tests/css/css-transforms/animation/rotate-animation-on-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-animation-on-svg.html b/tests/wpt/tests/css/css-transforms/animation/rotate-animation-on-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-animation-on-svg.html rename to tests/wpt/tests/css/css-transforms/animation/rotate-animation-on-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-animation-with-will-change-transform-001-ref.html b/tests/wpt/tests/css/css-transforms/animation/rotate-animation-with-will-change-transform-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-animation-with-will-change-transform-001-ref.html rename to tests/wpt/tests/css/css-transforms/animation/rotate-animation-with-will-change-transform-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-animation-with-will-change-transform-001.html b/tests/wpt/tests/css/css-transforms/animation/rotate-animation-with-will-change-transform-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-animation-with-will-change-transform-001.html rename to tests/wpt/tests/css/css-transforms/animation/rotate-animation-with-will-change-transform-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-composition.html b/tests/wpt/tests/css/css-transforms/animation/rotate-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-composition.html rename to tests/wpt/tests/css/css-transforms/animation/rotate-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-interpolation.html b/tests/wpt/tests/css/css-transforms/animation/rotate-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-interpolation.html rename to tests/wpt/tests/css/css-transforms/animation/rotate-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-transform-equivalent-ref.html b/tests/wpt/tests/css/css-transforms/animation/rotate-transform-equivalent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-transform-equivalent-ref.html rename to tests/wpt/tests/css/css-transforms/animation/rotate-transform-equivalent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-transform-equivalent.html b/tests/wpt/tests/css/css-transforms/animation/rotate-transform-equivalent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-transform-equivalent.html rename to tests/wpt/tests/css/css-transforms/animation/rotate-transform-equivalent.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/scale-animation-on-svg-ref.html b/tests/wpt/tests/css/css-transforms/animation/scale-animation-on-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/scale-animation-on-svg-ref.html rename to tests/wpt/tests/css/css-transforms/animation/scale-animation-on-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/scale-animation-on-svg.html b/tests/wpt/tests/css/css-transforms/animation/scale-animation-on-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/scale-animation-on-svg.html rename to tests/wpt/tests/css/css-transforms/animation/scale-animation-on-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/scale-composition.html b/tests/wpt/tests/css/css-transforms/animation/scale-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/scale-composition.html rename to tests/wpt/tests/css/css-transforms/animation/scale-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/scale-interpolation.html b/tests/wpt/tests/css/css-transforms/animation/scale-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/scale-interpolation.html rename to tests/wpt/tests/css/css-transforms/animation/scale-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/support/transform-interpolation-reftests.js b/tests/wpt/tests/css/css-transforms/animation/support/transform-interpolation-reftests.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/support/transform-interpolation-reftests.js rename to tests/wpt/tests/css/css-transforms/animation/support/transform-interpolation-reftests.js diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-composition.html b/tests/wpt/tests/css/css-transforms/animation/transform-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-composition.html rename to tests/wpt/tests/css/css-transforms/animation/transform-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-001.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-001.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-002.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-002.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-003.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-003.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-004.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-004.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-005.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-005.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-006.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-006.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-animated-ref.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-animated-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-animated-ref.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-animated-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-computed-value.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-computed-value.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-computed-value.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-computed-value.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-inline-value.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-inline-value.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-inline-value.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-inline-value.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-matrix.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-matrix.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-matrix.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-matrix.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-perspective.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-perspective.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-perspective.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-perspective.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-ref.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-ref.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-rotate-slerp.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-rotate-slerp.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-rotate-slerp.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-rotate-slerp.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-rotate.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-rotate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-rotate.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-rotate.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-scale.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-scale.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-scale.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-scale.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-skew.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-skew.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-skew.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-skew.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-translate-em.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-translate-em.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-translate-em.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-translate-em.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-translate.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-translate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-translate.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-translate.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-verify-reftests.html b/tests/wpt/tests/css/css-transforms/animation/transform-interpolation-verify-reftests.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-verify-reftests.html rename to tests/wpt/tests/css/css-transforms/animation/transform-interpolation-verify-reftests.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-matrix-composition.html b/tests/wpt/tests/css/css-transforms/animation/transform-matrix-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-matrix-composition.html rename to tests/wpt/tests/css/css-transforms/animation/transform-matrix-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-origin-interpolation.html b/tests/wpt/tests/css/css-transforms/animation/transform-origin-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-origin-interpolation.html rename to tests/wpt/tests/css/css-transforms/animation/transform-origin-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-perspective-composition.html b/tests/wpt/tests/css/css-transforms/animation/transform-perspective-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-perspective-composition.html rename to tests/wpt/tests/css/css-transforms/animation/transform-perspective-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-rotate-composition.html b/tests/wpt/tests/css/css-transforms/animation/transform-rotate-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-rotate-composition.html rename to tests/wpt/tests/css/css-transforms/animation/transform-rotate-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-scale-composition.html b/tests/wpt/tests/css/css-transforms/animation/transform-scale-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-scale-composition.html rename to tests/wpt/tests/css/css-transforms/animation/transform-scale-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-skew-composition.html b/tests/wpt/tests/css/css-transforms/animation/transform-skew-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-skew-composition.html rename to tests/wpt/tests/css/css-transforms/animation/transform-skew-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-translate-composition.html b/tests/wpt/tests/css/css-transforms/animation/transform-translate-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/transform-translate-composition.html rename to tests/wpt/tests/css/css-transforms/animation/transform-translate-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/translate-animation-on-svg-ref.html b/tests/wpt/tests/css/css-transforms/animation/translate-animation-on-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/translate-animation-on-svg-ref.html rename to tests/wpt/tests/css/css-transforms/animation/translate-animation-on-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/translate-animation-on-svg.html b/tests/wpt/tests/css/css-transforms/animation/translate-animation-on-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/translate-animation-on-svg.html rename to tests/wpt/tests/css/css-transforms/animation/translate-animation-on-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/translate-composition.html b/tests/wpt/tests/css/css-transforms/animation/translate-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/translate-composition.html rename to tests/wpt/tests/css/css-transforms/animation/translate-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/translate-interpolation.html b/tests/wpt/tests/css/css-transforms/animation/translate-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/animation/translate-interpolation.html rename to tests/wpt/tests/css/css-transforms/animation/translate-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-001.html b/tests/wpt/tests/css/css-transforms/backface-visibility-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-001.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-001.ref.html b/tests/wpt/tests/css/css-transforms/backface-visibility-001.ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-001.ref.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-001.ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-001.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-001.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-002-ref.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-002-ref.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-002.tentative.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-002.tentative.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-003-ref.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-003-ref.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-003.tentative.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-003.tentative.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-004-ref.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-004-ref.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-004.tentative.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-004.tentative.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-004.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-005-ref.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-005-ref.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-005.tentative.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-005.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-005.tentative.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-005.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-006-ref.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-006-ref.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-006.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-006.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-animated-001.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-animated-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-animated-001.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-animated-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-animated-002.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-animated-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-animated-002.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-animated-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-animated-ref.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-animated-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-animated-ref.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-animated-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-child-translate.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-child-translate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-child-translate.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-child-translate.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-child-will-change-transform.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-child-will-change-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-hidden-child-will-change-transform.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-child-will-change-transform.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-with-sibling-001.html b/tests/wpt/tests/css/css-transforms/backface-visibility-with-sibling-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/backface-visibility-with-sibling-001.html rename to tests/wpt/tests/css/css-transforms/backface-visibility-with-sibling-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/change-perspective-property.html b/tests/wpt/tests/css/css-transforms/change-perspective-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/change-perspective-property.html rename to tests/wpt/tests/css/css-transforms/change-perspective-property.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/change-scale-wide-range-ref.html b/tests/wpt/tests/css/css-transforms/change-scale-wide-range-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/change-scale-wide-range-ref.html rename to tests/wpt/tests/css/css-transforms/change-scale-wide-range-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/change-scale-wide-range.html b/tests/wpt/tests/css/css-transforms/change-scale-wide-range.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/change-scale-wide-range.html rename to tests/wpt/tests/css/css-transforms/change-scale-wide-range.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/change-transform-origin-property.html b/tests/wpt/tests/css/css-transforms/change-transform-origin-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/change-transform-origin-property.html rename to tests/wpt/tests/css/css-transforms/change-transform-origin-property.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/composited-under-rotateY-180deg-clip-perspective-ref.html b/tests/wpt/tests/css/css-transforms/composited-under-rotateY-180deg-clip-perspective-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/composited-under-rotateY-180deg-clip-perspective-ref.html rename to tests/wpt/tests/css/css-transforms/composited-under-rotateY-180deg-clip-perspective-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/composited-under-rotateY-180deg-clip-perspective.html b/tests/wpt/tests/css/css-transforms/composited-under-rotateY-180deg-clip-perspective.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/composited-under-rotateY-180deg-clip-perspective.html rename to tests/wpt/tests/css/css-transforms/composited-under-rotateY-180deg-clip-perspective.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/composited-under-rotateY-180deg-clip-ref.html b/tests/wpt/tests/css/css-transforms/composited-under-rotateY-180deg-clip-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/composited-under-rotateY-180deg-clip-ref.html rename to tests/wpt/tests/css/css-transforms/composited-under-rotateY-180deg-clip-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/composited-under-rotateY-180deg-clip.html b/tests/wpt/tests/css/css-transforms/composited-under-rotateY-180deg-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/composited-under-rotateY-180deg-clip.html rename to tests/wpt/tests/css/css-transforms/composited-under-rotateY-180deg-clip.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/composited-under-rotateY-180deg-ref.html b/tests/wpt/tests/css/css-transforms/composited-under-rotateY-180deg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/composited-under-rotateY-180deg-ref.html rename to tests/wpt/tests/css/css-transforms/composited-under-rotateY-180deg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/composited-under-rotateY-180deg.html b/tests/wpt/tests/css/css-transforms/composited-under-rotateY-180deg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/composited-under-rotateY-180deg.html rename to tests/wpt/tests/css/css-transforms/composited-under-rotateY-180deg.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/containing-block-dynamic-1-ref.html b/tests/wpt/tests/css/css-transforms/containing-block-dynamic-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/containing-block-dynamic-1-ref.html rename to tests/wpt/tests/css/css-transforms/containing-block-dynamic-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/large-scale3d-001.html b/tests/wpt/tests/css/css-transforms/crashtests/large-scale3d-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/large-scale3d-001.html rename to tests/wpt/tests/css/css-transforms/crashtests/large-scale3d-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/large-scaley-001.html b/tests/wpt/tests/css/css-transforms/crashtests/large-scaley-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/large-scaley-001.html rename to tests/wpt/tests/css/css-transforms/crashtests/large-scaley-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/locked-display-transform-crash.html b/tests/wpt/tests/css/css-transforms/crashtests/locked-display-transform-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/locked-display-transform-crash.html rename to tests/wpt/tests/css/css-transforms/crashtests/locked-display-transform-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-containing-block-inline-001.html b/tests/wpt/tests/css/css-transforms/crashtests/preserve3d-containing-block-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-containing-block-inline-001.html rename to tests/wpt/tests/css/css-transforms/crashtests/preserve3d-containing-block-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-containing-block-inline-002.html b/tests/wpt/tests/css/css-transforms/crashtests/preserve3d-containing-block-inline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-containing-block-inline-002.html rename to tests/wpt/tests/css/css-transforms/crashtests/preserve3d-containing-block-inline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-containing-br-001.html b/tests/wpt/tests/css/css-transforms/crashtests/preserve3d-containing-br-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-containing-br-001.html rename to tests/wpt/tests/css/css-transforms/crashtests/preserve3d-containing-br-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-containing-br-002.html b/tests/wpt/tests/css/css-transforms/crashtests/preserve3d-containing-br-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-containing-br-002.html rename to tests/wpt/tests/css/css-transforms/crashtests/preserve3d-containing-br-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-inline-hit-test.html b/tests/wpt/tests/css/css-transforms/crashtests/preserve3d-inline-hit-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-inline-hit-test.html rename to tests/wpt/tests/css/css-transforms/crashtests/preserve3d-inline-hit-test.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-scene-001.html b/tests/wpt/tests/css/css-transforms/crashtests/preserve3d-scene-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-scene-001.html rename to tests/wpt/tests/css/css-transforms/crashtests/preserve3d-scene-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-scene-002.html b/tests/wpt/tests/css/css-transforms/crashtests/preserve3d-scene-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-scene-002.html rename to tests/wpt/tests/css/css-transforms/crashtests/preserve3d-scene-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-svg-foreign-object-hit-test.svg b/tests/wpt/tests/css/css-transforms/crashtests/preserve3d-svg-foreign-object-hit-test.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/preserve3d-svg-foreign-object-hit-test.svg rename to tests/wpt/tests/css/css-transforms/crashtests/preserve3d-svg-foreign-object-hit-test.svg diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/transform-marquee-resize-div-image-001.html b/tests/wpt/tests/css/css-transforms/crashtests/transform-marquee-resize-div-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/transform-marquee-resize-div-image-001.html rename to tests/wpt/tests/css/css-transforms/crashtests/transform-marquee-resize-div-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/w-crossing-zero-001.html b/tests/wpt/tests/css/css-transforms/crashtests/w-crossing-zero-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/w-crossing-zero-001.html rename to tests/wpt/tests/css/css-transforms/crashtests/w-crossing-zero-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/w-negative-001.html b/tests/wpt/tests/css/css-transforms/crashtests/w-negative-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/w-negative-001.html rename to tests/wpt/tests/css/css-transforms/crashtests/w-negative-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/w-negative-002.html b/tests/wpt/tests/css/css-transforms/crashtests/w-negative-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/w-negative-002.html rename to tests/wpt/tests/css/css-transforms/crashtests/w-negative-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/w-negative-003.html b/tests/wpt/tests/css/css-transforms/crashtests/w-negative-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/w-negative-003.html rename to tests/wpt/tests/css/css-transforms/crashtests/w-negative-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/crashtests/zero-perspective-001.html b/tests/wpt/tests/css/css-transforms/crashtests/zero-perspective-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/crashtests/zero-perspective-001.html rename to tests/wpt/tests/css/css-transforms/crashtests/zero-perspective-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-rotate-2d-3d-001-ref.html b/tests/wpt/tests/css/css-transforms/css-rotate-2d-3d-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-rotate-2d-3d-001-ref.html rename to tests/wpt/tests/css/css-transforms/css-rotate-2d-3d-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-rotate-2d-3d-001.html b/tests/wpt/tests/css/css-transforms/css-rotate-2d-3d-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-rotate-2d-3d-001.html rename to tests/wpt/tests/css/css-transforms/css-rotate-2d-3d-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-scale-nested-001.html b/tests/wpt/tests/css/css-transforms/css-scale-nested-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-scale-nested-001.html rename to tests/wpt/tests/css/css-transforms/css-scale-nested-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-skew-001-ref.html b/tests/wpt/tests/css/css-transforms/css-skew-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-skew-001-ref.html rename to tests/wpt/tests/css/css-transforms/css-skew-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-skew-001.html b/tests/wpt/tests/css/css-transforms/css-skew-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-skew-001.html rename to tests/wpt/tests/css/css-transforms/css-skew-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-skew-002-ref.html b/tests/wpt/tests/css/css-transforms/css-skew-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-skew-002-ref.html rename to tests/wpt/tests/css/css-transforms/css-skew-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-skew-002.html b/tests/wpt/tests/css/css-transforms/css-skew-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-skew-002.html rename to tests/wpt/tests/css/css-transforms/css-skew-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotate3d-X-negative.html b/tests/wpt/tests/css/css-transforms/css-transform-3d-rotate3d-X-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotate3d-X-negative.html rename to tests/wpt/tests/css/css-transforms/css-transform-3d-rotate3d-X-negative.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotate3d-X-positive.html b/tests/wpt/tests/css/css-transforms/css-transform-3d-rotate3d-X-positive.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotate3d-X-positive.html rename to tests/wpt/tests/css/css-transforms/css-transform-3d-rotate3d-X-positive.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotate3d-Y-negative.html b/tests/wpt/tests/css/css-transforms/css-transform-3d-rotate3d-Y-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotate3d-Y-negative.html rename to tests/wpt/tests/css/css-transforms/css-transform-3d-rotate3d-Y-negative.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotate3d-Y-positive.html b/tests/wpt/tests/css/css-transforms/css-transform-3d-rotate3d-Y-positive.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotate3d-Y-positive.html rename to tests/wpt/tests/css/css-transforms/css-transform-3d-rotate3d-Y-positive.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotate3d-Z-negative.html b/tests/wpt/tests/css/css-transforms/css-transform-3d-rotate3d-Z-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotate3d-Z-negative.html rename to tests/wpt/tests/css/css-transforms/css-transform-3d-rotate3d-Z-negative.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotate3d-Z-positive.html b/tests/wpt/tests/css/css-transforms/css-transform-3d-rotate3d-Z-positive.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotate3d-Z-positive.html rename to tests/wpt/tests/css/css-transforms/css-transform-3d-rotate3d-Z-positive.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotateX-negative.html b/tests/wpt/tests/css/css-transforms/css-transform-3d-rotateX-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotateX-negative.html rename to tests/wpt/tests/css/css-transforms/css-transform-3d-rotateX-negative.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotateX-positive.html b/tests/wpt/tests/css/css-transforms/css-transform-3d-rotateX-positive.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotateX-positive.html rename to tests/wpt/tests/css/css-transforms/css-transform-3d-rotateX-positive.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotateY-negative.html b/tests/wpt/tests/css/css-transforms/css-transform-3d-rotateY-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotateY-negative.html rename to tests/wpt/tests/css/css-transforms/css-transform-3d-rotateY-negative.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotateY-positive.html b/tests/wpt/tests/css/css-transforms/css-transform-3d-rotateY-positive.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotateY-positive.html rename to tests/wpt/tests/css/css-transforms/css-transform-3d-rotateY-positive.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotateZ-negative.html b/tests/wpt/tests/css/css-transforms/css-transform-3d-rotateZ-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotateZ-negative.html rename to tests/wpt/tests/css/css-transforms/css-transform-3d-rotateZ-negative.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotateZ-positive.html b/tests/wpt/tests/css/css-transforms/css-transform-3d-rotateZ-positive.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-rotateZ-positive.html rename to tests/wpt/tests/css/css-transforms/css-transform-3d-rotateZ-positive.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-transform-style.html b/tests/wpt/tests/css/css-transforms/css-transform-3d-transform-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-3d-transform-style.html rename to tests/wpt/tests/css/css-transforms/css-transform-3d-transform-style.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-animate-translate-implied-y-ref.html b/tests/wpt/tests/css/css-transforms/css-transform-animate-translate-implied-y-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-animate-translate-implied-y-ref.html rename to tests/wpt/tests/css/css-transforms/css-transform-animate-translate-implied-y-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-animate-translate-implied-y.html b/tests/wpt/tests/css/css-transforms/css-transform-animate-translate-implied-y.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-animate-translate-implied-y.html rename to tests/wpt/tests/css/css-transforms/css-transform-animate-translate-implied-y.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-inherit-rotate.html b/tests/wpt/tests/css/css-transforms/css-transform-inherit-rotate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-inherit-rotate.html rename to tests/wpt/tests/css/css-transforms/css-transform-inherit-rotate.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-inherit-scale.html b/tests/wpt/tests/css/css-transforms/css-transform-inherit-scale.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-inherit-scale.html rename to tests/wpt/tests/css/css-transforms/css-transform-inherit-scale.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-property-existence.html b/tests/wpt/tests/css/css-transforms/css-transform-property-existence.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-property-existence.html rename to tests/wpt/tests/css/css-transforms/css-transform-property-existence.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-scale-001-manual.html b/tests/wpt/tests/css/css-transforms/css-transform-scale-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-scale-001-manual.html rename to tests/wpt/tests/css/css-transforms/css-transform-scale-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-scale-002.html b/tests/wpt/tests/css/css-transforms/css-transform-scale-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-scale-002.html rename to tests/wpt/tests/css/css-transforms/css-transform-scale-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transform-style-evaluation-validation.html b/tests/wpt/tests/css/css-transforms/css-transform-style-evaluation-validation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transform-style-evaluation-validation.html rename to tests/wpt/tests/css/css-transforms/css-transform-style-evaluation-validation.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transforms-3d-on-anonymous-block-001.html b/tests/wpt/tests/css/css-transforms/css-transforms-3d-on-anonymous-block-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transforms-3d-on-anonymous-block-001.html rename to tests/wpt/tests/css/css-transforms/css-transforms-3d-on-anonymous-block-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css-transforms-transformlist.html b/tests/wpt/tests/css/css-transforms/css-transforms-transformlist.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css-transforms-transformlist.html rename to tests/wpt/tests/css/css-transforms/css-transforms-transformlist.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css3-transform-perspective.html b/tests/wpt/tests/css/css-transforms/css3-transform-perspective.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css3-transform-perspective.html rename to tests/wpt/tests/css/css-transforms/css3-transform-perspective.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css3-transform-rotateY-ref.html b/tests/wpt/tests/css/css-transforms/css3-transform-rotateY-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css3-transform-rotateY-ref.html rename to tests/wpt/tests/css/css-transforms/css3-transform-rotateY-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css3-transform-rotateY.html b/tests/wpt/tests/css/css-transforms/css3-transform-rotateY.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css3-transform-rotateY.html rename to tests/wpt/tests/css/css-transforms/css3-transform-rotateY.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css3-transform-scale-002.html b/tests/wpt/tests/css/css-transforms/css3-transform-scale-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css3-transform-scale-002.html rename to tests/wpt/tests/css/css-transforms/css3-transform-scale-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css3-transform-scale-ref-002.html b/tests/wpt/tests/css/css-transforms/css3-transform-scale-ref-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css3-transform-scale-ref-002.html rename to tests/wpt/tests/css/css-transforms/css3-transform-scale-ref-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/css3-transform-scale.html b/tests/wpt/tests/css/css-transforms/css3-transform-scale.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/css3-transform-scale.html rename to tests/wpt/tests/css/css-transforms/css3-transform-scale.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/reference/svg-document-styles-ref.html b/tests/wpt/tests/css/css-transforms/document-styles/reference/svg-document-styles-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/reference/svg-document-styles-ref.html rename to tests/wpt/tests/css/css-transforms/document-styles/reference/svg-document-styles-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-001.html b/tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-001.html rename to tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-002.html b/tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-002.html rename to tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-003.html b/tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-003.html rename to tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-004.html b/tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-004.html rename to tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-005.html b/tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-005.html rename to tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-006.html b/tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-006.html rename to tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-007.html b/tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-007.html rename to tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-008.html b/tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-008.html rename to tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-009.html b/tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-009.html rename to tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-010.html b/tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-010.html rename to tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-011.html b/tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-011.html rename to tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-012.html b/tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-012.html rename to tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-012.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-013.html b/tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-013.html rename to tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-013.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-014.html b/tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/document-styles/svg-document-styles-014.html rename to tests/wpt/tests/css/css-transforms/document-styles/svg-document-styles-014.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/dynamic-fixed-pos-cb-change-ref.html b/tests/wpt/tests/css/css-transforms/dynamic-fixed-pos-cb-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/dynamic-fixed-pos-cb-change-ref.html rename to tests/wpt/tests/css/css-transforms/dynamic-fixed-pos-cb-change-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/dynamic-fixed-pos-cb-change.html b/tests/wpt/tests/css/css-transforms/dynamic-fixed-pos-cb-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/dynamic-fixed-pos-cb-change.html rename to tests/wpt/tests/css/css-transforms/dynamic-fixed-pos-cb-change.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/reference/svg-external-styles-ref.html b/tests/wpt/tests/css/css-transforms/external-styles/reference/svg-external-styles-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/reference/svg-external-styles-ref.html rename to tests/wpt/tests/css/css-transforms/external-styles/reference/svg-external-styles-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/support/svg-external-styles.css b/tests/wpt/tests/css/css-transforms/external-styles/support/svg-external-styles.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/support/svg-external-styles.css rename to tests/wpt/tests/css/css-transforms/external-styles/support/svg-external-styles.css diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-001.html b/tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-001.html rename to tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-002.html b/tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-002.html rename to tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-003.html b/tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-003.html rename to tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-004.html b/tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-004.html rename to tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-005.html b/tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-005.html rename to tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-006.html b/tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-006.html rename to tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-007.html b/tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-007.html rename to tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-008.html b/tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-008.html rename to tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-009.html b/tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-009.html rename to tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-010.html b/tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-010.html rename to tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-011.html b/tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-011.html rename to tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-013.html b/tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-013.html rename to tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-013.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-014.html b/tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/external-styles/svg-external-styles-014.html rename to tests/wpt/tests/css/css-transforms/external-styles/svg-external-styles-014.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/fractional-scale-gradient-bg-obscure-red-bg-ref.html b/tests/wpt/tests/css/css-transforms/fractional-scale-gradient-bg-obscure-red-bg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/fractional-scale-gradient-bg-obscure-red-bg-ref.html rename to tests/wpt/tests/css/css-transforms/fractional-scale-gradient-bg-obscure-red-bg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/fractional-scale-gradient-bg-obscure-red-bg.html b/tests/wpt/tests/css/css-transforms/fractional-scale-gradient-bg-obscure-red-bg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/fractional-scale-gradient-bg-obscure-red-bg.html rename to tests/wpt/tests/css/css-transforms/fractional-scale-gradient-bg-obscure-red-bg.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-combination-ref.html b/tests/wpt/tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-combination-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-combination-ref.html rename to tests/wpt/tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-combination-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-ex-unit-ref.html b/tests/wpt/tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-ex-unit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-ex-unit-ref.html rename to tests/wpt/tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-ex-unit-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-ref.html b/tests/wpt/tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-ref.html rename to tests/wpt/tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-relative-ref.html b/tests/wpt/tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-relative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-relative-ref.html rename to tests/wpt/tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-relative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-transform-ref.html b/tests/wpt/tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-transform-ref.html rename to tests/wpt/tests/css/css-transforms/gradientTransform/reference/svg-gradientTransform-transform-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/svg-gradientTransform-001.html b/tests/wpt/tests/css/css-transforms/gradientTransform/svg-gradientTransform-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/svg-gradientTransform-001.html rename to tests/wpt/tests/css/css-transforms/gradientTransform/svg-gradientTransform-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/svg-gradientTransform-combination-001.html b/tests/wpt/tests/css/css-transforms/gradientTransform/svg-gradientTransform-combination-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/svg-gradientTransform-combination-001.html rename to tests/wpt/tests/css/css-transforms/gradientTransform/svg-gradientTransform-combination-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/svg-gradientTransform-combination-003.html b/tests/wpt/tests/css/css-transforms/gradientTransform/svg-gradientTransform-combination-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/gradientTransform/svg-gradientTransform-combination-003.html rename to tests/wpt/tests/css/css-transforms/gradientTransform/svg-gradientTransform-combination-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/reference/svg-green-square-250x250-ref.html b/tests/wpt/tests/css/css-transforms/group/reference/svg-green-square-250x250-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/reference/svg-green-square-250x250-ref.html rename to tests/wpt/tests/css/css-transforms/group/reference/svg-green-square-250x250-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/reference/svg-green-square-ref.html b/tests/wpt/tests/css/css-transforms/group/reference/svg-green-square-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/reference/svg-green-square-ref.html rename to tests/wpt/tests/css/css-transforms/group/reference/svg-green-square-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-001.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-group-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-001.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-group-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-002.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-group-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-002.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-group-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-003.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-group-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-003.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-group-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-004.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-group-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-004.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-group-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-005.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-group-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-005.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-group-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-006.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-group-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-006.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-group-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-007.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-group-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-007.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-group-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-008.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-group-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-008.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-group-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-009.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-group-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-009.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-group-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-010.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-group-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-010.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-group-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-011.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-group-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-group-011.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-group-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-001.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-001.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-002.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-002.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-003.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-003.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-004.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-004.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-005.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-005.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-006.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-006.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-007.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-007.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-008.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-008.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-009.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-009.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-010.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-010.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-011.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-011.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-012.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-012.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-012.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-013.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-013.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-013.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-014.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-014.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-014.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-015.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-015.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-015.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-016.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-016.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-016.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-017.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-017.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-017.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-018.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-018.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-018.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-019.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-019.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-019.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-020.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-020.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-020.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-021.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-021.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-021.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-022.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-022.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-022.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-023.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-023.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-023.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-024.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-024.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-024.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-025.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-025.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-025.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-026.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-026.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-026.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-027.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-027.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-027.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-028.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-028.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-028.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-029.html b/tests/wpt/tests/css/css-transforms/group/svg-transform-nested-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/group/svg-transform-nested-029.html rename to tests/wpt/tests/css/css-transforms/group/svg-transform-nested-029.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/huge-length-tiny-scale-ref.html b/tests/wpt/tests/css/css-transforms/huge-length-tiny-scale-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/huge-length-tiny-scale-ref.html rename to tests/wpt/tests/css/css-transforms/huge-length-tiny-scale-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/huge-length-tiny-scale.html b/tests/wpt/tests/css/css-transforms/huge-length-tiny-scale.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/huge-length-tiny-scale.html rename to tests/wpt/tests/css/css-transforms/huge-length-tiny-scale.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/animation/individual-transform-combine-ref.html b/tests/wpt/tests/css/css-transforms/individual-transform/animation/individual-transform-combine-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/animation/individual-transform-combine-ref.html rename to tests/wpt/tests/css/css-transforms/individual-transform/animation/individual-transform-combine-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/animation/individual-transform-combine.html b/tests/wpt/tests/css/css-transforms/individual-transform/animation/individual-transform-combine.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/animation/individual-transform-combine.html rename to tests/wpt/tests/css/css-transforms/individual-transform/animation/individual-transform-combine.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/animation/individual-transform-ordering-ref.html b/tests/wpt/tests/css/css-transforms/individual-transform/animation/individual-transform-ordering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/animation/individual-transform-ordering-ref.html rename to tests/wpt/tests/css/css-transforms/individual-transform/animation/individual-transform-ordering-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/animation/individual-transform-ordering.html b/tests/wpt/tests/css/css-transforms/individual-transform/animation/individual-transform-ordering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/animation/individual-transform-ordering.html rename to tests/wpt/tests/css/css-transforms/individual-transform/animation/individual-transform-ordering.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/change-rotate-property.html b/tests/wpt/tests/css/css-transforms/individual-transform/change-rotate-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/change-rotate-property.html rename to tests/wpt/tests/css/css-transforms/individual-transform/change-rotate-property.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/change-scale-property.html b/tests/wpt/tests/css/css-transforms/individual-transform/change-scale-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/change-scale-property.html rename to tests/wpt/tests/css/css-transforms/individual-transform/change-scale-property.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/change-translate-property.html b/tests/wpt/tests/css/css-transforms/individual-transform/change-translate-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/change-translate-property.html rename to tests/wpt/tests/css/css-transforms/individual-transform/change-translate-property.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-1-ref.html b/tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-1-ref.html rename to tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-1.html b/tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-1.html rename to tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-1.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-2-ref.html b/tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-2-ref.html rename to tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-2a.html b/tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-2a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-2a.html rename to tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-2a.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-2b.html b/tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-2b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-2b.html rename to tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-2b.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-2c.html b/tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-2c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-2c.html rename to tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-2c.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-2d.html b/tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-2d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-2d.html rename to tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-2d.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-2e.html b/tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-2e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/individual-transform-2e.html rename to tests/wpt/tests/css/css-transforms/individual-transform/individual-transform-2e.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/stacking-context-001.html b/tests/wpt/tests/css/css-transforms/individual-transform/stacking-context-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/stacking-context-001.html rename to tests/wpt/tests/css/css-transforms/individual-transform/stacking-context-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/stacking-context-ref.html b/tests/wpt/tests/css/css-transforms/individual-transform/stacking-context-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/stacking-context-ref.html rename to tests/wpt/tests/css/css-transforms/individual-transform/stacking-context-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/translate-fill-box.html b/tests/wpt/tests/css/css-transforms/individual-transform/translate-fill-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/translate-fill-box.html rename to tests/wpt/tests/css/css-transforms/individual-transform/translate-fill-box.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/individual-transform/translate-view-box.html b/tests/wpt/tests/css/css-transforms/individual-transform/translate-view-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/individual-transform/translate-view-box.html rename to tests/wpt/tests/css/css-transforms/individual-transform/translate-view-box.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inheritance.html b/tests/wpt/tests/css/css-transforms/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inheritance.html rename to tests/wpt/tests/css/css-transforms/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/reference/svg-inline-styles-ref.html b/tests/wpt/tests/css/css-transforms/inline-styles/reference/svg-inline-styles-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/reference/svg-inline-styles-ref.html rename to tests/wpt/tests/css/css-transforms/inline-styles/reference/svg-inline-styles-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-001.html b/tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-001.html rename to tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-002.html b/tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-002.html rename to tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-003.html b/tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-003.html rename to tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-004.html b/tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-004.html rename to tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-005.html b/tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-005.html rename to tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-006.html b/tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-006.html rename to tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-007.html b/tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-007.html rename to tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-008.html b/tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-008.html rename to tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-009.html b/tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-009.html rename to tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-010.html b/tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-010.html rename to tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-011.html b/tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-011.html rename to tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-012.html b/tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-012.html rename to tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-012.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-013.html b/tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-013.html rename to tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-013.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-014.html b/tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-styles/svg-inline-styles-014.html rename to tests/wpt/tests/css/css-transforms/inline-styles/svg-inline-styles-014.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/inline-with-filter-and-hidden-backface.html b/tests/wpt/tests/css/css-transforms/inline-with-filter-and-hidden-backface.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/inline-with-filter-and-hidden-backface.html rename to tests/wpt/tests/css/css-transforms/inline-with-filter-and-hidden-backface.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/large-matrix-crash.html b/tests/wpt/tests/css/css-transforms/large-matrix-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/large-matrix-crash.html rename to tests/wpt/tests/css/css-transforms/large-matrix-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/reference/svg-matrix-clipped-rect-ref.html b/tests/wpt/tests/css/css-transforms/matrix/reference/svg-matrix-clipped-rect-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/reference/svg-matrix-clipped-rect-ref.html rename to tests/wpt/tests/css/css-transforms/matrix/reference/svg-matrix-clipped-rect-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/reference/svg-matrix-four-color-ref.html b/tests/wpt/tests/css/css-transforms/matrix/reference/svg-matrix-four-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/reference/svg-matrix-four-color-ref.html rename to tests/wpt/tests/css/css-transforms/matrix/reference/svg-matrix-four-color-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-001.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-001.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-002.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-002.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-003.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-003.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-004.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-004.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-005.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-005.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-006.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-006.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-007.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-007.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-008.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-008.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-009.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-009.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-010.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-010.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-011.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-011.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-012.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-012.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-012.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-013.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-013.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-013.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-014.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-014.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-014.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-015.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-015.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-015.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-016.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-016.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-016.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-017.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-017.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-017.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-018.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-018.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-018.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-019.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-019.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-019.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-020.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-020.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-020.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-021.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-021.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-021.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-022.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-022.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-022.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-023.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-023.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-023.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-024.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-024.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-024.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-025.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-025.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-025.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-026.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-026.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-026.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-027.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-027.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-027.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-028.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-028.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-028.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-029.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-029.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-029.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-030.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-030.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-030.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-031.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-031.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-031.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-032.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-032.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-032.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-033.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-033.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-033.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-034.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-034.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-034.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-035.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-035.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-035.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-036.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-036.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-036.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-037.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-037.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-037.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-038.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-038.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-038.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-039.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-039.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-039.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-040.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-040.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-040.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-041.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-041.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-041.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-042.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-042.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-042.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-043.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-043.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-043.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-044.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-044.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-044.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-045.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-045.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-045.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-046.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-046.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-046.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-047.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-047.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-047.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-048.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-048.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-048.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-049.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-049.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-049.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-050.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-050.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-050.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-051.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-051.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-051.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-052.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-052.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-052.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-053.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-053.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-053.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-053.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-054.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-054.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-054.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-054.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-055.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-055.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-055.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-055.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-056.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-056.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-056.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-056.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-057.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-057.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-057.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-057.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-058.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-058.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-058.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-058.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-059.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-059.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-059.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-059.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-060.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-060.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-060.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-060.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-061.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-061.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-061.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-061.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-062.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-062.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-062.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-062.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-063.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-063.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-063.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-063.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-064.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-064.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-064.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-064.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-065.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-065.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-065.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-065.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-066.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-066.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-066.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-066.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-067.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-067.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-067.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-067.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-068.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-068.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-068.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-068.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-069.html b/tests/wpt/tests/css/css-transforms/matrix/svg-matrix-069.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/matrix/svg-matrix-069.html rename to tests/wpt/tests/css/css-transforms/matrix/svg-matrix-069.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/paint-order-with-transform-change-ref.html b/tests/wpt/tests/css/css-transforms/paint-order-with-transform-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/paint-order-with-transform-change-ref.html rename to tests/wpt/tests/css/css-transforms/paint-order-with-transform-change-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/paint-order-with-transform-change.html b/tests/wpt/tests/css/css-transforms/paint-order-with-transform-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/paint-order-with-transform-change.html rename to tests/wpt/tests/css/css-transforms/paint-order-with-transform-change.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/backface-visibility-computed.html b/tests/wpt/tests/css/css-transforms/parsing/backface-visibility-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/backface-visibility-computed.html rename to tests/wpt/tests/css/css-transforms/parsing/backface-visibility-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/backface-visibility-invalid.html b/tests/wpt/tests/css/css-transforms/parsing/backface-visibility-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/backface-visibility-invalid.html rename to tests/wpt/tests/css/css-transforms/parsing/backface-visibility-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/backface-visibility-valid.html b/tests/wpt/tests/css/css-transforms/parsing/backface-visibility-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/backface-visibility-valid.html rename to tests/wpt/tests/css/css-transforms/parsing/backface-visibility-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/perspective-origin-computed.html b/tests/wpt/tests/css/css-transforms/parsing/perspective-origin-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/perspective-origin-computed.html rename to tests/wpt/tests/css/css-transforms/parsing/perspective-origin-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/perspective-origin-invalid.html b/tests/wpt/tests/css/css-transforms/parsing/perspective-origin-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/perspective-origin-invalid.html rename to tests/wpt/tests/css/css-transforms/parsing/perspective-origin-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/perspective-origin-valid.html b/tests/wpt/tests/css/css-transforms/parsing/perspective-origin-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/perspective-origin-valid.html rename to tests/wpt/tests/css/css-transforms/parsing/perspective-origin-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/rotate-parsing-invalid.html b/tests/wpt/tests/css/css-transforms/parsing/rotate-parsing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/rotate-parsing-invalid.html rename to tests/wpt/tests/css/css-transforms/parsing/rotate-parsing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/rotate-parsing-valid.html b/tests/wpt/tests/css/css-transforms/parsing/rotate-parsing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/rotate-parsing-valid.html rename to tests/wpt/tests/css/css-transforms/parsing/rotate-parsing-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/scale-parsing-invalid.html b/tests/wpt/tests/css/css-transforms/parsing/scale-parsing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/scale-parsing-invalid.html rename to tests/wpt/tests/css/css-transforms/parsing/scale-parsing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/scale-parsing-valid.html b/tests/wpt/tests/css/css-transforms/parsing/scale-parsing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/scale-parsing-valid.html rename to tests/wpt/tests/css/css-transforms/parsing/scale-parsing-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-box-computed.html b/tests/wpt/tests/css/css-transforms/parsing/transform-box-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-box-computed.html rename to tests/wpt/tests/css/css-transforms/parsing/transform-box-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-box-invalid.html b/tests/wpt/tests/css/css-transforms/parsing/transform-box-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-box-invalid.html rename to tests/wpt/tests/css/css-transforms/parsing/transform-box-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-box-valid.html b/tests/wpt/tests/css/css-transforms/parsing/transform-box-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-box-valid.html rename to tests/wpt/tests/css/css-transforms/parsing/transform-box-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-computed.html b/tests/wpt/tests/css/css-transforms/parsing/transform-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-computed.html rename to tests/wpt/tests/css/css-transforms/parsing/transform-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-invalid.html b/tests/wpt/tests/css/css-transforms/parsing/transform-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-invalid.html rename to tests/wpt/tests/css/css-transforms/parsing/transform-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-origin-computed.html b/tests/wpt/tests/css/css-transforms/parsing/transform-origin-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-origin-computed.html rename to tests/wpt/tests/css/css-transforms/parsing/transform-origin-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-origin-invalid.html b/tests/wpt/tests/css/css-transforms/parsing/transform-origin-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-origin-invalid.html rename to tests/wpt/tests/css/css-transforms/parsing/transform-origin-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-origin-valid.html b/tests/wpt/tests/css/css-transforms/parsing/transform-origin-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-origin-valid.html rename to tests/wpt/tests/css/css-transforms/parsing/transform-origin-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-valid.html b/tests/wpt/tests/css/css-transforms/parsing/transform-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/transform-valid.html rename to tests/wpt/tests/css/css-transforms/parsing/transform-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/translate-parsing-invalid.html b/tests/wpt/tests/css/css-transforms/parsing/translate-parsing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/translate-parsing-invalid.html rename to tests/wpt/tests/css/css-transforms/parsing/translate-parsing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/translate-parsing-valid.html b/tests/wpt/tests/css/css-transforms/parsing/translate-parsing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/parsing/translate-parsing-valid.html rename to tests/wpt/tests/css/css-transforms/parsing/translate-parsing-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/patternTransform/reference/svg-patternTransform-combination-ref.html b/tests/wpt/tests/css/css-transforms/patternTransform/reference/svg-patternTransform-combination-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/patternTransform/reference/svg-patternTransform-combination-ref.html rename to tests/wpt/tests/css/css-transforms/patternTransform/reference/svg-patternTransform-combination-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/patternTransform/reference/svg-patternTransform-ex-unit-ref.html b/tests/wpt/tests/css/css-transforms/patternTransform/reference/svg-patternTransform-ex-unit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/patternTransform/reference/svg-patternTransform-ex-unit-ref.html rename to tests/wpt/tests/css/css-transforms/patternTransform/reference/svg-patternTransform-ex-unit-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/patternTransform/reference/svg-patternTransform-ref.html b/tests/wpt/tests/css/css-transforms/patternTransform/reference/svg-patternTransform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/patternTransform/reference/svg-patternTransform-ref.html rename to tests/wpt/tests/css/css-transforms/patternTransform/reference/svg-patternTransform-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/patternTransform/reference/svg-patternTransform-relative-ref.html b/tests/wpt/tests/css/css-transforms/patternTransform/reference/svg-patternTransform-relative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/patternTransform/reference/svg-patternTransform-relative-ref.html rename to tests/wpt/tests/css/css-transforms/patternTransform/reference/svg-patternTransform-relative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/patternTransform/svg-patternTransform-001.html b/tests/wpt/tests/css/css-transforms/patternTransform/svg-patternTransform-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/patternTransform/svg-patternTransform-001.html rename to tests/wpt/tests/css/css-transforms/patternTransform/svg-patternTransform-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/patternTransform/svg-patternTransform-combination-001.html b/tests/wpt/tests/css/css-transforms/patternTransform/svg-patternTransform-combination-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/patternTransform/svg-patternTransform-combination-001.html rename to tests/wpt/tests/css/css-transforms/patternTransform/svg-patternTransform-combination-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-children-only-abspos.html b/tests/wpt/tests/css/css-transforms/perspective-children-only-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-children-only-abspos.html rename to tests/wpt/tests/css/css-transforms/perspective-children-only-abspos.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-children-only-fixpos.html b/tests/wpt/tests/css/css-transforms/perspective-children-only-fixpos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-children-only-fixpos.html rename to tests/wpt/tests/css/css-transforms/perspective-children-only-fixpos.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-children-only-inline.html b/tests/wpt/tests/css/css-transforms/perspective-children-only-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-children-only-inline.html rename to tests/wpt/tests/css/css-transforms/perspective-children-only-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-containing-block-dynamic-1a.html b/tests/wpt/tests/css/css-transforms/perspective-containing-block-dynamic-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-containing-block-dynamic-1a.html rename to tests/wpt/tests/css/css-transforms/perspective-containing-block-dynamic-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-containing-block-dynamic-1b.html b/tests/wpt/tests/css/css-transforms/perspective-containing-block-dynamic-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-containing-block-dynamic-1b.html rename to tests/wpt/tests/css/css-transforms/perspective-containing-block-dynamic-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-001.html b/tests/wpt/tests/css/css-transforms/perspective-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-001.html rename to tests/wpt/tests/css/css-transforms/perspective-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-002.html b/tests/wpt/tests/css/css-transforms/perspective-origin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-002.html rename to tests/wpt/tests/css/css-transforms/perspective-origin-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-003.html b/tests/wpt/tests/css/css-transforms/perspective-origin-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-003.html rename to tests/wpt/tests/css/css-transforms/perspective-origin-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-004.html b/tests/wpt/tests/css/css-transforms/perspective-origin-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-004.html rename to tests/wpt/tests/css/css-transforms/perspective-origin-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-005.html b/tests/wpt/tests/css/css-transforms/perspective-origin-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-005.html rename to tests/wpt/tests/css/css-transforms/perspective-origin-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-006.html b/tests/wpt/tests/css/css-transforms/perspective-origin-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-006.html rename to tests/wpt/tests/css/css-transforms/perspective-origin-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-x.html b/tests/wpt/tests/css/css-transforms/perspective-origin-x.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-x.html rename to tests/wpt/tests/css/css-transforms/perspective-origin-x.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-xy.html b/tests/wpt/tests/css/css-transforms/perspective-origin-xy.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-origin-xy.html rename to tests/wpt/tests/css/css-transforms/perspective-origin-xy.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-split-by-zero-w-ref.html b/tests/wpt/tests/css/css-transforms/perspective-split-by-zero-w-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-split-by-zero-w-ref.html rename to tests/wpt/tests/css/css-transforms/perspective-split-by-zero-w-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-split-by-zero-w.html b/tests/wpt/tests/css/css-transforms/perspective-split-by-zero-w.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-split-by-zero-w.html rename to tests/wpt/tests/css/css-transforms/perspective-split-by-zero-w.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-svg-001-ref.html b/tests/wpt/tests/css/css-transforms/perspective-svg-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-svg-001-ref.html rename to tests/wpt/tests/css/css-transforms/perspective-svg-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-svg-001.html b/tests/wpt/tests/css/css-transforms/perspective-svg-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-svg-001.html rename to tests/wpt/tests/css/css-transforms/perspective-svg-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-transforms-equivalence-ref.html b/tests/wpt/tests/css/css-transforms/perspective-transforms-equivalence-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-transforms-equivalence-ref.html rename to tests/wpt/tests/css/css-transforms/perspective-transforms-equivalence-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-transforms-equivalence.html b/tests/wpt/tests/css/css-transforms/perspective-transforms-equivalence.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-transforms-equivalence.html rename to tests/wpt/tests/css/css-transforms/perspective-transforms-equivalence.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-translateZ-0.html b/tests/wpt/tests/css/css-transforms/perspective-translateZ-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-translateZ-0.html rename to tests/wpt/tests/css/css-transforms/perspective-translateZ-0.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-translateZ-negative.html b/tests/wpt/tests/css/css-transforms/perspective-translateZ-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-translateZ-negative.html rename to tests/wpt/tests/css/css-transforms/perspective-translateZ-negative.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-translateZ-positive.html b/tests/wpt/tests/css/css-transforms/perspective-translateZ-positive.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-translateZ-positive.html rename to tests/wpt/tests/css/css-transforms/perspective-translateZ-positive.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-untransformable-no-stacking-context-ref.html b/tests/wpt/tests/css/css-transforms/perspective-untransformable-no-stacking-context-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-untransformable-no-stacking-context-ref.html rename to tests/wpt/tests/css/css-transforms/perspective-untransformable-no-stacking-context-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-untransformable-no-stacking-context.html b/tests/wpt/tests/css/css-transforms/perspective-untransformable-no-stacking-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-untransformable-no-stacking-context.html rename to tests/wpt/tests/css/css-transforms/perspective-untransformable-no-stacking-context.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-zero-2-ref.html b/tests/wpt/tests/css/css-transforms/perspective-zero-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-zero-2-ref.html rename to tests/wpt/tests/css/css-transforms/perspective-zero-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-zero-2.html b/tests/wpt/tests/css/css-transforms/perspective-zero-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-zero-2.html rename to tests/wpt/tests/css/css-transforms/perspective-zero-2.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-zero-3.html b/tests/wpt/tests/css/css-transforms/perspective-zero-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-zero-3.html rename to tests/wpt/tests/css/css-transforms/perspective-zero-3.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/perspective-zero.html b/tests/wpt/tests/css/css-transforms/perspective-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/perspective-zero.html rename to tests/wpt/tests/css/css-transforms/perspective-zero.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve-3d-flat-grouping-properties-containing-block-inline-ref.html b/tests/wpt/tests/css/css-transforms/preserve-3d-flat-grouping-properties-containing-block-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve-3d-flat-grouping-properties-containing-block-inline-ref.html rename to tests/wpt/tests/css/css-transforms/preserve-3d-flat-grouping-properties-containing-block-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve-3d-flat-grouping-properties-containing-block-inline.tentative.html b/tests/wpt/tests/css/css-transforms/preserve-3d-flat-grouping-properties-containing-block-inline.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve-3d-flat-grouping-properties-containing-block-inline.tentative.html rename to tests/wpt/tests/css/css-transforms/preserve-3d-flat-grouping-properties-containing-block-inline.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve-3d-flat-grouping-properties-containing-block.html b/tests/wpt/tests/css/css-transforms/preserve-3d-flat-grouping-properties-containing-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve-3d-flat-grouping-properties-containing-block.html rename to tests/wpt/tests/css/css-transforms/preserve-3d-flat-grouping-properties-containing-block.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve-3d-flat-grouping-properties.html b/tests/wpt/tests/css/css-transforms/preserve-3d-flat-grouping-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve-3d-flat-grouping-properties.html rename to tests/wpt/tests/css/css-transforms/preserve-3d-flat-grouping-properties.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-filter-no-perspective-ref.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-filter-no-perspective-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-filter-no-perspective-ref.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-filter-no-perspective-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-filter-no-perspective.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-filter-no-perspective.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-filter-no-perspective.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-filter-no-perspective.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-filter-with-perspective-ref.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-filter-with-perspective-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-filter-with-perspective-ref.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-filter-with-perspective-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-filter-with-perspective.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-filter-with-perspective.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-filter-with-perspective.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-filter-with-perspective.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-001-ref.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-001-ref.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-001.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-001.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-002-ref.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-002-ref.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-002.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-002.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-003.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-003.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-001.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-001.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-002.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-002.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-003.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-003.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-004.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-004.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-005.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-005.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-006.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-006.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-007.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-007.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-008.html b/tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-and-flattening-z-order-008.html rename to tests/wpt/tests/css/css-transforms/preserve3d-and-flattening-z-order-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-button-ref.html b/tests/wpt/tests/css/css-transforms/preserve3d-button-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-button-ref.html rename to tests/wpt/tests/css/css-transforms/preserve3d-button-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-button.html b/tests/wpt/tests/css/css-transforms/preserve3d-button.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-button.html rename to tests/wpt/tests/css/css-transforms/preserve3d-button.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-nested-perspective-ref.html b/tests/wpt/tests/css/css-transforms/preserve3d-nested-perspective-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-nested-perspective-ref.html rename to tests/wpt/tests/css/css-transforms/preserve3d-nested-perspective-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-nested-perspective.html b/tests/wpt/tests/css/css-transforms/preserve3d-nested-perspective.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-nested-perspective.html rename to tests/wpt/tests/css/css-transforms/preserve3d-nested-perspective.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-overflow-percent.html b/tests/wpt/tests/css/css-transforms/preserve3d-overflow-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-overflow-percent.html rename to tests/wpt/tests/css/css-transforms/preserve3d-overflow-percent.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-pseudo-element-ref.html b/tests/wpt/tests/css/css-transforms/preserve3d-pseudo-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-pseudo-element-ref.html rename to tests/wpt/tests/css/css-transforms/preserve3d-pseudo-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/preserve3d-pseudo-element.html b/tests/wpt/tests/css/css-transforms/preserve3d-pseudo-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/preserve3d-pseudo-element.html rename to tests/wpt/tests/css/css-transforms/preserve3d-pseudo-element.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/backface-visibility-hidden-ref.html b/tests/wpt/tests/css/css-transforms/reference/backface-visibility-hidden-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/backface-visibility-hidden-ref.html rename to tests/wpt/tests/css/css-transforms/reference/backface-visibility-hidden-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/css-scale-nested-ref.html b/tests/wpt/tests/css/css-transforms/reference/css-scale-nested-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/css-scale-nested-ref.html rename to tests/wpt/tests/css/css-transforms/reference/css-scale-nested-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/css-transform-3d-rotateX-ref.html b/tests/wpt/tests/css/css-transforms/reference/css-transform-3d-rotateX-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/css-transform-3d-rotateX-ref.html rename to tests/wpt/tests/css/css-transforms/reference/css-transform-3d-rotateX-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/css-transform-3d-rotateZ-ref.html b/tests/wpt/tests/css/css-transforms/reference/css-transform-3d-rotateZ-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/css-transform-3d-rotateZ-ref.html rename to tests/wpt/tests/css/css-transforms/reference/css-transform-3d-rotateZ-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/css-transform-3d-transform-style-ref.html b/tests/wpt/tests/css/css-transforms/reference/css-transform-3d-transform-style-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/css-transform-3d-transform-style-ref.html rename to tests/wpt/tests/css/css-transforms/reference/css-transform-3d-transform-style-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/css-transform-scale-ref-001.html b/tests/wpt/tests/css/css-transforms/reference/css-transform-scale-ref-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/css-transform-scale-ref-001.html rename to tests/wpt/tests/css/css-transforms/reference/css-transform-scale-ref-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/css-transform-scale-ref-002.html b/tests/wpt/tests/css/css-transforms/reference/css-transform-scale-ref-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/css-transform-scale-ref-002.html rename to tests/wpt/tests/css/css-transforms/reference/css-transform-scale-ref-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/css-transforms-3d-anonymous-block-ref.html b/tests/wpt/tests/css/css-transforms/reference/css-transforms-3d-anonymous-block-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/css-transforms-3d-anonymous-block-ref.html rename to tests/wpt/tests/css/css-transforms/reference/css-transforms-3d-anonymous-block-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/css-transforms-transformlist-ref.html b/tests/wpt/tests/css/css-transforms/reference/css-transforms-transformlist-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/css-transforms-transformlist-ref.html rename to tests/wpt/tests/css/css-transforms/reference/css-transforms-transformlist-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/css3-transform-perspective-ref.html b/tests/wpt/tests/css/css-transforms/reference/css3-transform-perspective-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/css3-transform-perspective-ref.html rename to tests/wpt/tests/css/css-transforms/reference/css3-transform-perspective-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/css3-transform-scale-ref.html b/tests/wpt/tests/css/css-transforms/reference/css3-transform-scale-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/css3-transform-scale-ref.html rename to tests/wpt/tests/css/css-transforms/reference/css3-transform-scale-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/green.html b/tests/wpt/tests/css/css-transforms/reference/green.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/green.html rename to tests/wpt/tests/css/css-transforms/reference/green.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/perspective-origin-reftest.html b/tests/wpt/tests/css/css-transforms/reference/perspective-origin-reftest.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/perspective-origin-reftest.html rename to tests/wpt/tests/css/css-transforms/reference/perspective-origin-reftest.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/perspective-reftest.html b/tests/wpt/tests/css/css-transforms/reference/perspective-reftest.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/perspective-reftest.html rename to tests/wpt/tests/css/css-transforms/reference/perspective-reftest.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/rotate-180-degrees-001.html b/tests/wpt/tests/css/css-transforms/reference/rotate-180-degrees-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/rotate-180-degrees-001.html rename to tests/wpt/tests/css/css-transforms/reference/rotate-180-degrees-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/rotate-270-degrees-001.html b/tests/wpt/tests/css/css-transforms/reference/rotate-270-degrees-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/rotate-270-degrees-001.html rename to tests/wpt/tests/css/css-transforms/reference/rotate-270-degrees-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/rotate-90-degrees-001.html b/tests/wpt/tests/css/css-transforms/reference/rotate-90-degrees-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/rotate-90-degrees-001.html rename to tests/wpt/tests/css/css-transforms/reference/rotate-90-degrees-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/rotateY-ref.html b/tests/wpt/tests/css/css-transforms/reference/rotateY-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/rotateY-ref.html rename to tests/wpt/tests/css/css-transforms/reference/rotateY-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/scale-optional-second-ref.html b/tests/wpt/tests/css/css-transforms/reference/scale-optional-second-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/scale-optional-second-ref.html rename to tests/wpt/tests/css/css-transforms/reference/scale-optional-second-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/scale-zero-ref.html b/tests/wpt/tests/css/css-transforms/reference/scale-zero-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/scale-zero-ref.html rename to tests/wpt/tests/css/css-transforms/reference/scale-zero-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/skew-test1-ref.html b/tests/wpt/tests/css/css-transforms/reference/skew-test1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/skew-test1-ref.html rename to tests/wpt/tests/css/css-transforms/reference/skew-test1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/subpixel-transform-changes-001-ref.html b/tests/wpt/tests/css/css-transforms/reference/subpixel-transform-changes-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/subpixel-transform-changes-001-ref.html rename to tests/wpt/tests/css/css-transforms/reference/subpixel-transform-changes-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/subpixel-transform-changes-002-ref.html b/tests/wpt/tests/css/css-transforms/reference/subpixel-transform-changes-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/subpixel-transform-changes-002-ref.html rename to tests/wpt/tests/css/css-transforms/reference/subpixel-transform-changes-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/subpixel-transform-changes-003-ref.html b/tests/wpt/tests/css/css-transforms/reference/subpixel-transform-changes-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/subpixel-transform-changes-003-ref.html rename to tests/wpt/tests/css/css-transforms/reference/subpixel-transform-changes-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/subpixel-transform-changes-004-ref.html b/tests/wpt/tests/css/css-transforms/reference/subpixel-transform-changes-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/subpixel-transform-changes-004-ref.html rename to tests/wpt/tests/css/css-transforms/reference/subpixel-transform-changes-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transform-3d-rotateY-stair-above-ref-001.xht b/tests/wpt/tests/css/css-transforms/reference/transform-3d-rotateY-stair-above-ref-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transform-3d-rotateY-stair-above-ref-001.xht rename to tests/wpt/tests/css/css-transforms/reference/transform-3d-rotateY-stair-above-ref-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transform-applies-to-001-ref.xht b/tests/wpt/tests/css/css-transforms/reference/transform-applies-to-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transform-applies-to-001-ref.xht rename to tests/wpt/tests/css/css-transforms/reference/transform-applies-to-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transform-applies-to-002-ref.xht b/tests/wpt/tests/css/css-transforms/reference/transform-applies-to-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transform-applies-to-002-ref.xht rename to tests/wpt/tests/css/css-transforms/reference/transform-applies-to-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transform-origin-01-ref.html b/tests/wpt/tests/css/css-transforms/reference/transform-origin-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transform-origin-01-ref.html rename to tests/wpt/tests/css/css-transforms/reference/transform-origin-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transform-origin-ref.html b/tests/wpt/tests/css/css-transforms/reference/transform-origin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transform-origin-ref.html rename to tests/wpt/tests/css/css-transforms/reference/transform-origin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transform-scale-test-ref.html b/tests/wpt/tests/css/css-transforms/reference/transform-scale-test-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transform-scale-test-ref.html rename to tests/wpt/tests/css/css-transforms/reference/transform-scale-test-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transform-translatex-006-ref.html b/tests/wpt/tests/css/css-transforms/reference/transform-translatex-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transform-translatex-006-ref.html rename to tests/wpt/tests/css/css-transforms/reference/transform-translatex-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transformed-preserve-3d-1-ref.html b/tests/wpt/tests/css/css-transforms/reference/transformed-preserve-3d-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transformed-preserve-3d-1-ref.html rename to tests/wpt/tests/css/css-transforms/reference/transformed-preserve-3d-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transformed-rotateX-3-ref.html b/tests/wpt/tests/css/css-transforms/reference/transformed-rotateX-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transformed-rotateX-3-ref.html rename to tests/wpt/tests/css/css-transforms/reference/transformed-rotateX-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transformed-rotateY-1-ref.html b/tests/wpt/tests/css/css-transforms/reference/transformed-rotateY-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transformed-rotateY-1-ref.html rename to tests/wpt/tests/css/css-transforms/reference/transformed-rotateY-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transforms-rotate-degree-45-ref.html b/tests/wpt/tests/css/css-transforms/reference/transforms-rotate-degree-45-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transforms-rotate-degree-45-ref.html rename to tests/wpt/tests/css/css-transforms/reference/transforms-rotate-degree-45-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transforms-rotate-degree-90-ref.html b/tests/wpt/tests/css/css-transforms/reference/transforms-rotate-degree-90-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transforms-rotate-degree-90-ref.html rename to tests/wpt/tests/css/css-transforms/reference/transforms-rotate-degree-90-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transforms-rotate-translate-scale-ref.html b/tests/wpt/tests/css/css-transforms/reference/transforms-rotate-translate-scale-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transforms-rotate-translate-scale-ref.html rename to tests/wpt/tests/css/css-transforms/reference/transforms-rotate-translate-scale-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transforms-rotateY-degree-60-ref.html b/tests/wpt/tests/css/css-transforms/reference/transforms-rotateY-degree-60-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transforms-rotateY-degree-60-ref.html rename to tests/wpt/tests/css/css-transforms/reference/transforms-rotateY-degree-60-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transforms-skewX-ref.html b/tests/wpt/tests/css/css-transforms/reference/transforms-skewX-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transforms-skewX-ref.html rename to tests/wpt/tests/css/css-transforms/reference/transforms-skewX-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/transforms-skewY-ref.html b/tests/wpt/tests/css/css-transforms/reference/transforms-skewY-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/transforms-skewY-ref.html rename to tests/wpt/tests/css/css-transforms/reference/transforms-skewY-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/translate-optional-second-ref.html b/tests/wpt/tests/css/css-transforms/reference/translate-optional-second-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/translate-optional-second-ref.html rename to tests/wpt/tests/css/css-transforms/reference/translate-optional-second-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/ttwf-css-3d-polygon-cycle-ref.html b/tests/wpt/tests/css/css-transforms/reference/ttwf-css-3d-polygon-cycle-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/ttwf-css-3d-polygon-cycle-ref.html rename to tests/wpt/tests/css/css-transforms/reference/ttwf-css-3d-polygon-cycle-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/ttwf-reftest-rotate-ref.html b/tests/wpt/tests/css/css-transforms/reference/ttwf-reftest-rotate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/ttwf-reftest-rotate-ref.html rename to tests/wpt/tests/css/css-transforms/reference/ttwf-reftest-rotate-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/ttwf-reftest-transform-skewx-001.html b/tests/wpt/tests/css/css-transforms/reference/ttwf-reftest-transform-skewx-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/ttwf-reftest-transform-skewx-001.html rename to tests/wpt/tests/css/css-transforms/reference/ttwf-reftest-transform-skewx-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/ttwf-reftest-transform-skewy-001.html b/tests/wpt/tests/css/css-transforms/reference/ttwf-reftest-transform-skewy-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/ttwf-reftest-transform-skewy-001.html rename to tests/wpt/tests/css/css-transforms/reference/ttwf-reftest-transform-skewy-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/ttwf-reftest-transform-translatex-001.html b/tests/wpt/tests/css/css-transforms/reference/ttwf-reftest-transform-translatex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/ttwf-reftest-transform-translatex-001.html rename to tests/wpt/tests/css/css-transforms/reference/ttwf-reftest-transform-translatex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/reference/ttwf-reftest-transform-translatey-001.html b/tests/wpt/tests/css/css-transforms/reference/ttwf-reftest-transform-translatey-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/reference/ttwf-reftest-transform-translatey-001.html rename to tests/wpt/tests/css/css-transforms/reference/ttwf-reftest-transform-translatey-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate-180-degrees-001.html b/tests/wpt/tests/css/css-transforms/rotate-180-degrees-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate-180-degrees-001.html rename to tests/wpt/tests/css/css-transforms/rotate-180-degrees-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate-270-degrees-001.html b/tests/wpt/tests/css/css-transforms/rotate-270-degrees-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate-270-degrees-001.html rename to tests/wpt/tests/css/css-transforms/rotate-270-degrees-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate-90-degrees-001.html b/tests/wpt/tests/css/css-transforms/rotate-90-degrees-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate-90-degrees-001.html rename to tests/wpt/tests/css/css-transforms/rotate-90-degrees-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/reference/svg-rotate-3args-ref.html b/tests/wpt/tests/css/css-transforms/rotate/reference/svg-rotate-3args-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/reference/svg-rotate-3args-ref.html rename to tests/wpt/tests/css/css-transforms/rotate/reference/svg-rotate-3args-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/reference/svg-rotate-angle-45-ref.html b/tests/wpt/tests/css/css-transforms/rotate/reference/svg-rotate-angle-45-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/reference/svg-rotate-angle-45-ref.html rename to tests/wpt/tests/css/css-transforms/rotate/reference/svg-rotate-angle-45-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/reference/svg-rotate-angle-90-ref.html b/tests/wpt/tests/css/css-transforms/rotate/reference/svg-rotate-angle-90-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/reference/svg-rotate-angle-90-ref.html rename to tests/wpt/tests/css/css-transforms/rotate/reference/svg-rotate-angle-90-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-3args-002.html b/tests/wpt/tests/css/css-transforms/rotate/svg-rotate-3args-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-3args-002.html rename to tests/wpt/tests/css/css-transforms/rotate/svg-rotate-3args-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-3args-invalid-001.html b/tests/wpt/tests/css/css-transforms/rotate/svg-rotate-3args-invalid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-3args-invalid-001.html rename to tests/wpt/tests/css/css-transforms/rotate/svg-rotate-3args-invalid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-3args-invalid-002.html b/tests/wpt/tests/css/css-transforms/rotate/svg-rotate-3args-invalid-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-3args-invalid-002.html rename to tests/wpt/tests/css/css-transforms/rotate/svg-rotate-3args-invalid-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-3args-invalid-003.html b/tests/wpt/tests/css/css-transforms/rotate/svg-rotate-3args-invalid-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-3args-invalid-003.html rename to tests/wpt/tests/css/css-transforms/rotate/svg-rotate-3args-invalid-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-3args-invalid-004.html b/tests/wpt/tests/css/css-transforms/rotate/svg-rotate-3args-invalid-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-3args-invalid-004.html rename to tests/wpt/tests/css/css-transforms/rotate/svg-rotate-3args-invalid-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-3args-invalid-005.html b/tests/wpt/tests/css/css-transforms/rotate/svg-rotate-3args-invalid-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-3args-invalid-005.html rename to tests/wpt/tests/css/css-transforms/rotate/svg-rotate-3args-invalid-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-45-001.html b/tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-45-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-45-001.html rename to tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-45-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-45-011.html b/tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-45-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-45-011.html rename to tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-45-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-45-022.html b/tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-45-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-45-022.html rename to tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-45-022.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-90-001.html b/tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-90-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-90-001.html rename to tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-90-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-90-006.html b/tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-90-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-90-006.html rename to tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-90-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-90-011.html b/tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-90-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-90-011.html rename to tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-90-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-90-016.html b/tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-90-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-90-016.html rename to tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-90-016.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-90-021.html b/tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-90-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate/svg-rotate-angle-90-021.html rename to tests/wpt/tests/css/css-transforms/rotate/svg-rotate-angle-90-021.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotateY-180deg-with-overflow-scroll-ref.html b/tests/wpt/tests/css/css-transforms/rotateY-180deg-with-overflow-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotateY-180deg-with-overflow-scroll-ref.html rename to tests/wpt/tests/css/css-transforms/rotateY-180deg-with-overflow-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotateY-180deg-with-overflow-scroll.html b/tests/wpt/tests/css/css-transforms/rotateY-180deg-with-overflow-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotateY-180deg-with-overflow-scroll.html rename to tests/wpt/tests/css/css-transforms/rotateY-180deg-with-overflow-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotateY.html b/tests/wpt/tests/css/css-transforms/rotateY.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotateY.html rename to tests/wpt/tests/css/css-transforms/rotateY.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate_45deg-ref.html b/tests/wpt/tests/css/css-transforms/rotate_45deg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate_45deg-ref.html rename to tests/wpt/tests/css/css-transforms/rotate_45deg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate_45deg.html b/tests/wpt/tests/css/css-transforms/rotate_45deg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate_45deg.html rename to tests/wpt/tests/css/css-transforms/rotate_45deg.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate_x_45deg-ref.html b/tests/wpt/tests/css/css-transforms/rotate_x_45deg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate_x_45deg-ref.html rename to tests/wpt/tests/css/css-transforms/rotate_x_45deg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate_x_45deg.html b/tests/wpt/tests/css/css-transforms/rotate_x_45deg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate_x_45deg.html rename to tests/wpt/tests/css/css-transforms/rotate_x_45deg.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate_y_45deg-ref.html b/tests/wpt/tests/css/css-transforms/rotate_y_45deg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate_y_45deg-ref.html rename to tests/wpt/tests/css/css-transforms/rotate_y_45deg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotate_y_45deg.html b/tests/wpt/tests/css/css-transforms/rotate_y_45deg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotate_y_45deg.html rename to tests/wpt/tests/css/css-transforms/rotate_y_45deg.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/rotated-clip-under-opacity.html b/tests/wpt/tests/css/css-transforms/rotated-clip-under-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/rotated-clip-under-opacity.html rename to tests/wpt/tests/css/css-transforms/rotated-clip-under-opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale-optional-second-001.html b/tests/wpt/tests/css/css-transforms/scale-optional-second-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale-optional-second-001.html rename to tests/wpt/tests/css/css-transforms/scale-optional-second-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale-transform-overlap-ref.html b/tests/wpt/tests/css/css-transforms/scale-transform-overlap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale-transform-overlap-ref.html rename to tests/wpt/tests/css/css-transforms/scale-transform-overlap-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale-transform-overlap.html b/tests/wpt/tests/css/css-transforms/scale-transform-overlap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale-transform-overlap.html rename to tests/wpt/tests/css/css-transforms/scale-transform-overlap.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale-zero-001.html b/tests/wpt/tests/css/css-transforms/scale-zero-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale-zero-001.html rename to tests/wpt/tests/css/css-transforms/scale-zero-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/reference/svg-scale-ref.html b/tests/wpt/tests/css/css-transforms/scale/reference/svg-scale-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/reference/svg-scale-ref.html rename to tests/wpt/tests/css/css-transforms/scale/reference/svg-scale-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-001.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-001.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-002.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-002.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-003.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-003.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-004.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-004.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-006.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-006.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-007.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-007.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-008.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-008.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-009.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-009.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-010.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-010.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-011.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-011.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-012.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-012.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-012.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-013.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-013.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-013.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-014.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-014.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-014.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-015.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-015.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-015.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-016.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-016.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-016.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-017.html b/tests/wpt/tests/css/css-transforms/scale/svg-scale-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scale/svg-scale-017.html rename to tests/wpt/tests/css/css-transforms/scale/svg-scale-017.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scalex-ref.html b/tests/wpt/tests/css/css-transforms/scalex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scalex-ref.html rename to tests/wpt/tests/css/css-transforms/scalex-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scalex.html b/tests/wpt/tests/css/css-transforms/scalex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scalex.html rename to tests/wpt/tests/css/css-transforms/scalex.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scaley-ref.html b/tests/wpt/tests/css/css-transforms/scaley-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scaley-ref.html rename to tests/wpt/tests/css/css-transforms/scaley-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scaley.html b/tests/wpt/tests/css/css-transforms/scaley.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scaley.html rename to tests/wpt/tests/css/css-transforms/scaley.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scroll-preserve-3d.html b/tests/wpt/tests/css/css-transforms/scroll-preserve-3d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scroll-preserve-3d.html rename to tests/wpt/tests/css/css-transforms/scroll-preserve-3d.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scrollable-hidden-3d-transform-z-ref.html b/tests/wpt/tests/css/css-transforms/scrollable-hidden-3d-transform-z-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scrollable-hidden-3d-transform-z-ref.html rename to tests/wpt/tests/css/css-transforms/scrollable-hidden-3d-transform-z-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scrollable-hidden-3d-transform-z.html b/tests/wpt/tests/css/css-transforms/scrollable-hidden-3d-transform-z.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scrollable-hidden-3d-transform-z.html rename to tests/wpt/tests/css/css-transforms/scrollable-hidden-3d-transform-z.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scrollable-scroll-3d-transform-z-ref.html b/tests/wpt/tests/css/css-transforms/scrollable-scroll-3d-transform-z-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scrollable-scroll-3d-transform-z-ref.html rename to tests/wpt/tests/css/css-transforms/scrollable-scroll-3d-transform-z-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/scrollable-scroll-3d-transform-z.html b/tests/wpt/tests/css/css-transforms/scrollable-scroll-3d-transform-z.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/scrollable-scroll-3d-transform-z.html rename to tests/wpt/tests/css/css-transforms/scrollable-scroll-3d-transform-z.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/size-change-under-backface-visibility-hidden-ref.html b/tests/wpt/tests/css/css-transforms/size-change-under-backface-visibility-hidden-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/size-change-under-backface-visibility-hidden-ref.html rename to tests/wpt/tests/css/css-transforms/size-change-under-backface-visibility-hidden-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/size-change-under-backface-visibility-hidden.html b/tests/wpt/tests/css/css-transforms/size-change-under-backface-visibility-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/size-change-under-backface-visibility-hidden.html rename to tests/wpt/tests/css/css-transforms/size-change-under-backface-visibility-hidden.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skew-test1.html b/tests/wpt/tests/css/css-transforms/skew-test1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skew-test1.html rename to tests/wpt/tests/css/css-transforms/skew-test1.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewX/reference/svg-skewx-ref.html b/tests/wpt/tests/css/css-transforms/skewX/reference/svg-skewx-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewX/reference/svg-skewx-ref.html rename to tests/wpt/tests/css/css-transforms/skewX/reference/svg-skewx-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewX/reference/svg-skewxy-ref.html b/tests/wpt/tests/css/css-transforms/skewX/reference/svg-skewxy-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewX/reference/svg-skewxy-ref.html rename to tests/wpt/tests/css/css-transforms/skewX/reference/svg-skewxy-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewX/svg-skewx-001.html b/tests/wpt/tests/css/css-transforms/skewX/svg-skewx-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewX/svg-skewx-001.html rename to tests/wpt/tests/css/css-transforms/skewX/svg-skewx-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewX/svg-skewx-006.html b/tests/wpt/tests/css/css-transforms/skewX/svg-skewx-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewX/svg-skewx-006.html rename to tests/wpt/tests/css/css-transforms/skewX/svg-skewx-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewX/svg-skewx-011.html b/tests/wpt/tests/css/css-transforms/skewX/svg-skewx-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewX/svg-skewx-011.html rename to tests/wpt/tests/css/css-transforms/skewX/svg-skewx-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewX/svg-skewx-016.html b/tests/wpt/tests/css/css-transforms/skewX/svg-skewx-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewX/svg-skewx-016.html rename to tests/wpt/tests/css/css-transforms/skewX/svg-skewx-016.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewX/svg-skewx-021.html b/tests/wpt/tests/css/css-transforms/skewX/svg-skewx-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewX/svg-skewx-021.html rename to tests/wpt/tests/css/css-transforms/skewX/svg-skewx-021.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewX/svg-skewx-with-units.html b/tests/wpt/tests/css/css-transforms/skewX/svg-skewx-with-units.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewX/svg-skewx-with-units.html rename to tests/wpt/tests/css/css-transforms/skewX/svg-skewx-with-units.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewX/svg-skewxy-001.html b/tests/wpt/tests/css/css-transforms/skewX/svg-skewxy-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewX/svg-skewxy-001.html rename to tests/wpt/tests/css/css-transforms/skewX/svg-skewxy-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewY/reference/svg-skewy-ref.html b/tests/wpt/tests/css/css-transforms/skewY/reference/svg-skewy-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewY/reference/svg-skewy-ref.html rename to tests/wpt/tests/css/css-transforms/skewY/reference/svg-skewy-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewY/svg-skewy-001.html b/tests/wpt/tests/css/css-transforms/skewY/svg-skewy-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewY/svg-skewy-001.html rename to tests/wpt/tests/css/css-transforms/skewY/svg-skewy-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewY/svg-skewy-006.html b/tests/wpt/tests/css/css-transforms/skewY/svg-skewy-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewY/svg-skewy-006.html rename to tests/wpt/tests/css/css-transforms/skewY/svg-skewy-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewY/svg-skewy-011.html b/tests/wpt/tests/css/css-transforms/skewY/svg-skewy-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewY/svg-skewy-011.html rename to tests/wpt/tests/css/css-transforms/skewY/svg-skewy-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewY/svg-skewy-016.html b/tests/wpt/tests/css/css-transforms/skewY/svg-skewy-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewY/svg-skewy-016.html rename to tests/wpt/tests/css/css-transforms/skewY/svg-skewy-016.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewY/svg-skewy-021.html b/tests/wpt/tests/css/css-transforms/skewY/svg-skewy-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewY/svg-skewy-021.html rename to tests/wpt/tests/css/css-transforms/skewY/svg-skewy-021.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/skewY/svg-skewy-with-units.html b/tests/wpt/tests/css/css-transforms/skewY/svg-skewy-with-units.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/skewY/svg-skewy-with-units.html rename to tests/wpt/tests/css/css-transforms/skewY/svg-skewy-with-units.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/subpixel-perspective-backface-hidden-ref.html b/tests/wpt/tests/css/css-transforms/subpixel-perspective-backface-hidden-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/subpixel-perspective-backface-hidden-ref.html rename to tests/wpt/tests/css/css-transforms/subpixel-perspective-backface-hidden-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/subpixel-perspective-backface-hidden.html b/tests/wpt/tests/css/css-transforms/subpixel-perspective-backface-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/subpixel-perspective-backface-hidden.html rename to tests/wpt/tests/css/css-transforms/subpixel-perspective-backface-hidden.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/subpixel-perspective-translate-z-0-ref.html b/tests/wpt/tests/css/css-transforms/subpixel-perspective-translate-z-0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/subpixel-perspective-translate-z-0-ref.html rename to tests/wpt/tests/css/css-transforms/subpixel-perspective-translate-z-0-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/subpixel-perspective-translate-z-0.html b/tests/wpt/tests/css/css-transforms/subpixel-perspective-translate-z-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/subpixel-perspective-translate-z-0.html rename to tests/wpt/tests/css/css-transforms/subpixel-perspective-translate-z-0.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/subpixel-transform-changes-001.html b/tests/wpt/tests/css/css-transforms/subpixel-transform-changes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/subpixel-transform-changes-001.html rename to tests/wpt/tests/css/css-transforms/subpixel-transform-changes-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/subpixel-transform-changes-002.html b/tests/wpt/tests/css/css-transforms/subpixel-transform-changes-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/subpixel-transform-changes-002.html rename to tests/wpt/tests/css/css-transforms/subpixel-transform-changes-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/subpixel-transform-changes-003.html b/tests/wpt/tests/css/css-transforms/subpixel-transform-changes-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/subpixel-transform-changes-003.html rename to tests/wpt/tests/css/css-transforms/subpixel-transform-changes-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/subpixel-transform-changes-004.html b/tests/wpt/tests/css/css-transforms/subpixel-transform-changes-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/subpixel-transform-changes-004.html rename to tests/wpt/tests/css/css-transforms/subpixel-transform-changes-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/1x1-green.png b/tests/wpt/tests/css/css-transforms/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/1x1-green.png rename to tests/wpt/tests/css/css-transforms/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/1x1-lime.png b/tests/wpt/tests/css/css-transforms/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/1x1-lime.png rename to tests/wpt/tests/css/css-transforms/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/1x1-maroon.png b/tests/wpt/tests/css/css-transforms/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/1x1-maroon.png rename to tests/wpt/tests/css/css-transforms/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/1x1-navy.png b/tests/wpt/tests/css/css-transforms/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/1x1-navy.png rename to tests/wpt/tests/css/css-transforms/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/1x1-red.png b/tests/wpt/tests/css/css-transforms/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/1x1-red.png rename to tests/wpt/tests/css/css-transforms/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/1x1-white.png b/tests/wpt/tests/css/css-transforms/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/1x1-white.png rename to tests/wpt/tests/css/css-transforms/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/60x60-gg-rr.png b/tests/wpt/tests/css/css-transforms/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/60x60-gg-rr.png rename to tests/wpt/tests/css/css-transforms/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/60x60-green.png b/tests/wpt/tests/css/css-transforms/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/60x60-green.png rename to tests/wpt/tests/css/css-transforms/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/a-green.css b/tests/wpt/tests/css/css-transforms/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/a-green.css rename to tests/wpt/tests/css/css-transforms/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/b-green.css b/tests/wpt/tests/css/css-transforms/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/b-green.css rename to tests/wpt/tests/css/css-transforms/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/c-red.css b/tests/wpt/tests/css/css-transforms/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/c-red.css rename to tests/wpt/tests/css/css-transforms/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/cat.png b/tests/wpt/tests/css/css-transforms/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/cat.png rename to tests/wpt/tests/css/css-transforms/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/import-green.css b/tests/wpt/tests/css/css-transforms/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/import-green.css rename to tests/wpt/tests/css/css-transforms/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/import-red.css b/tests/wpt/tests/css/css-transforms/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/import-red.css rename to tests/wpt/tests/css/css-transforms/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/css-transforms/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/css-transforms/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/css-transforms/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/css-transforms/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/css-transforms/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/css-transforms/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/pattern-tr.png b/tests/wpt/tests/css/css-transforms/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/pattern-tr.png rename to tests/wpt/tests/css/css-transforms/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/ruler-h-50%.png b/tests/wpt/tests/css/css-transforms/support/ruler-h-50%.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/ruler-h-50%.png rename to tests/wpt/tests/css/css-transforms/support/ruler-h-50%.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/ruler-h-50px.png b/tests/wpt/tests/css/css-transforms/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/ruler-h-50px.png rename to tests/wpt/tests/css/css-transforms/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/ruler-v-100px.png b/tests/wpt/tests/css/css-transforms/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/ruler-v-100px.png rename to tests/wpt/tests/css/css-transforms/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/ruler-v-50px.png b/tests/wpt/tests/css/css-transforms/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/ruler-v-50px.png rename to tests/wpt/tests/css/css-transforms/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/square-purple.png b/tests/wpt/tests/css/css-transforms/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/square-purple.png rename to tests/wpt/tests/css/css-transforms/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/square-teal.png b/tests/wpt/tests/css/css-transforms/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/square-teal.png rename to tests/wpt/tests/css/css-transforms/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/square-white.png b/tests/wpt/tests/css/css-transforms/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/square-white.png rename to tests/wpt/tests/css/css-transforms/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/swatch-blue.png b/tests/wpt/tests/css/css-transforms/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/swatch-blue.png rename to tests/wpt/tests/css/css-transforms/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/swatch-green.png b/tests/wpt/tests/css/css-transforms/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/swatch-green.png rename to tests/wpt/tests/css/css-transforms/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/swatch-lime.png b/tests/wpt/tests/css/css-transforms/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/swatch-lime.png rename to tests/wpt/tests/css/css-transforms/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/swatch-orange.png b/tests/wpt/tests/css/css-transforms/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/swatch-orange.png rename to tests/wpt/tests/css/css-transforms/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/swatch-red.png b/tests/wpt/tests/css/css-transforms/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/swatch-red.png rename to tests/wpt/tests/css/css-transforms/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/swatch-white.png b/tests/wpt/tests/css/css-transforms/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/swatch-white.png rename to tests/wpt/tests/css/css-transforms/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/swatch-yellow.png b/tests/wpt/tests/css/css-transforms/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/swatch-yellow.png rename to tests/wpt/tests/css/css-transforms/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/test-bl.png b/tests/wpt/tests/css/css-transforms/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/test-bl.png rename to tests/wpt/tests/css/css-transforms/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/test-br.png b/tests/wpt/tests/css/css-transforms/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/test-br.png rename to tests/wpt/tests/css/css-transforms/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/test-inner-half-size.png b/tests/wpt/tests/css/css-transforms/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/test-inner-half-size.png rename to tests/wpt/tests/css/css-transforms/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/test-outer.png b/tests/wpt/tests/css/css-transforms/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/test-outer.png rename to tests/wpt/tests/css/css-transforms/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/test-tl.png b/tests/wpt/tests/css/css-transforms/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/test-tl.png rename to tests/wpt/tests/css/css-transforms/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/test-tr.png b/tests/wpt/tests/css/css-transforms/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/test-tr.png rename to tests/wpt/tests/css/css-transforms/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/tile-bg.png b/tests/wpt/tests/css/css-transforms/support/tile-bg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/tile-bg.png rename to tests/wpt/tests/css/css-transforms/support/tile-bg.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/transform-iframe-001-contents.html b/tests/wpt/tests/css/css-transforms/support/transform-iframe-001-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/transform-iframe-001-contents.html rename to tests/wpt/tests/css/css-transforms/support/transform-iframe-001-contents.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/transform-lime-square.png b/tests/wpt/tests/css/css-transforms/support/transform-lime-square.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/transform-lime-square.png rename to tests/wpt/tests/css/css-transforms/support/transform-lime-square.png diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/transform-lime-square.svg b/tests/wpt/tests/css/css-transforms/support/transform-lime-square.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/transform-lime-square.svg rename to tests/wpt/tests/css/css-transforms/support/transform-lime-square.svg diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/transform-triangle-down.svg b/tests/wpt/tests/css/css-transforms/support/transform-triangle-down.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/transform-triangle-down.svg rename to tests/wpt/tests/css/css-transforms/support/transform-triangle-down.svg diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/transform-triangle-left.svg b/tests/wpt/tests/css/css-transforms/support/transform-triangle-left.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/transform-triangle-left.svg rename to tests/wpt/tests/css/css-transforms/support/transform-triangle-left.svg diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/transform-triangle-right.svg b/tests/wpt/tests/css/css-transforms/support/transform-triangle-right.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/transform-triangle-right.svg rename to tests/wpt/tests/css/css-transforms/support/transform-triangle-right.svg diff --git a/tests/wpt/web-platform-tests/css/css-transforms/support/transform-triangle-up.svg b/tests/wpt/tests/css/css-transforms/support/transform-triangle-up.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/support/transform-triangle-up.svg rename to tests/wpt/tests/css/css-transforms/support/transform-triangle-up.svg diff --git a/tests/wpt/web-platform-tests/css/css-transforms/text-perspective-001.html b/tests/wpt/tests/css/css-transforms/text-perspective-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/text-perspective-001.html rename to tests/wpt/tests/css/css-transforms/text-perspective-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-2d-getComputedStyle-001.html b/tests/wpt/tests/css/css-transforms/transform-2d-getComputedStyle-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-2d-getComputedStyle-001.html rename to tests/wpt/tests/css/css-transforms/transform-2d-getComputedStyle-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-fixed-under-fixed-opacity-crash.html b/tests/wpt/tests/css/css-transforms/transform-3d-fixed-under-fixed-opacity-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-3d-fixed-under-fixed-opacity-crash.html rename to tests/wpt/tests/css/css-transforms/transform-3d-fixed-under-fixed-opacity-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-rotateY-stair-above-001.xht b/tests/wpt/tests/css/css-transforms/transform-3d-rotateY-stair-above-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-3d-rotateY-stair-above-001.xht rename to tests/wpt/tests/css/css-transforms/transform-3d-rotateY-stair-above-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-rotateY-stair-below-001.xht b/tests/wpt/tests/css/css-transforms/transform-3d-rotateY-stair-below-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-3d-rotateY-stair-below-001.xht rename to tests/wpt/tests/css/css-transforms/transform-3d-rotateY-stair-below-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-001-ref.html b/tests/wpt/tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-001-ref.html rename to tests/wpt/tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-001.html b/tests/wpt/tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-001.html rename to tests/wpt/tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-002-ref.html b/tests/wpt/tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-002-ref.html rename to tests/wpt/tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-002.html b/tests/wpt/tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-002.html rename to tests/wpt/tests/css/css-transforms/transform-3d-scales-different-x-y-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-001.html b/tests/wpt/tests/css/css-transforms/transform-abspos-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-001.html rename to tests/wpt/tests/css/css-transforms/transform-abspos-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-002.html b/tests/wpt/tests/css/css-transforms/transform-abspos-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-002.html rename to tests/wpt/tests/css/css-transforms/transform-abspos-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-003.html b/tests/wpt/tests/css/css-transforms/transform-abspos-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-003.html rename to tests/wpt/tests/css/css-transforms/transform-abspos-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-004.html b/tests/wpt/tests/css/css-transforms/transform-abspos-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-004.html rename to tests/wpt/tests/css/css-transforms/transform-abspos-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-005.html b/tests/wpt/tests/css/css-transforms/transform-abspos-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-005.html rename to tests/wpt/tests/css/css-transforms/transform-abspos-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-006.html b/tests/wpt/tests/css/css-transforms/transform-abspos-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-006.html rename to tests/wpt/tests/css/css-transforms/transform-abspos-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-007.html b/tests/wpt/tests/css/css-transforms/transform-abspos-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-007.html rename to tests/wpt/tests/css/css-transforms/transform-abspos-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-ref.html b/tests/wpt/tests/css/css-transforms/transform-abspos-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-abspos-ref.html rename to tests/wpt/tests/css/css-transforms/transform-abspos-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-and-individual-transform-properties-computed-style.html b/tests/wpt/tests/css/css-transforms/transform-and-individual-transform-properties-computed-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-and-individual-transform-properties-computed-style.html rename to tests/wpt/tests/css/css-transforms/transform-and-individual-transform-properties-computed-style.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-applies-to-001.xht b/tests/wpt/tests/css/css-transforms/transform-applies-to-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-applies-to-001.xht rename to tests/wpt/tests/css/css-transforms/transform-applies-to-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-applies-to-002.xht b/tests/wpt/tests/css/css-transforms/transform-applies-to-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-applies-to-002.xht rename to tests/wpt/tests/css/css-transforms/transform-applies-to-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-background-001.html b/tests/wpt/tests/css/css-transforms/transform-background-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-background-001.html rename to tests/wpt/tests/css/css-transforms/transform-background-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-background-002.html b/tests/wpt/tests/css/css-transforms/transform-background-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-background-002.html rename to tests/wpt/tests/css/css-transforms/transform-background-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-background-003.html b/tests/wpt/tests/css/css-transforms/transform-background-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-background-003.html rename to tests/wpt/tests/css/css-transforms/transform-background-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-background-004.html b/tests/wpt/tests/css/css-transforms/transform-background-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-background-004.html rename to tests/wpt/tests/css/css-transforms/transform-background-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-background-005.html b/tests/wpt/tests/css/css-transforms/transform-background-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-background-005.html rename to tests/wpt/tests/css/css-transforms/transform-background-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-background-006-notref.html b/tests/wpt/tests/css/css-transforms/transform-background-006-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-background-006-notref.html rename to tests/wpt/tests/css/css-transforms/transform-background-006-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-background-006.html b/tests/wpt/tests/css/css-transforms/transform-background-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-background-006.html rename to tests/wpt/tests/css/css-transforms/transform-background-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-background-007.html b/tests/wpt/tests/css/css-transforms/transform-background-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-background-007.html rename to tests/wpt/tests/css/css-transforms/transform-background-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-background-008.html b/tests/wpt/tests/css/css-transforms/transform-background-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-background-008.html rename to tests/wpt/tests/css/css-transforms/transform-background-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-background-ref-1.html b/tests/wpt/tests/css/css-transforms/transform-background-ref-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-background-ref-1.html rename to tests/wpt/tests/css/css-transforms/transform-background-ref-1.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-background-ref-2.html b/tests/wpt/tests/css/css-transforms/transform-background-ref-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-background-ref-2.html rename to tests/wpt/tests/css/css-transforms/transform-background-ref-2.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-blank-ref.html b/tests/wpt/tests/css/css-transforms/transform-blank-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-blank-ref.html rename to tests/wpt/tests/css/css-transforms/transform-blank-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/cssbox-border-box.html b/tests/wpt/tests/css/css-transforms/transform-box/cssbox-border-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/cssbox-border-box.html rename to tests/wpt/tests/css/css-transforms/transform-box/cssbox-border-box.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/cssbox-content-box.html b/tests/wpt/tests/css/css-transforms/transform-box/cssbox-content-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/cssbox-content-box.html rename to tests/wpt/tests/css/css-transforms/transform-box/cssbox-content-box.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/cssbox-fill-box.html b/tests/wpt/tests/css/css-transforms/transform-box/cssbox-fill-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/cssbox-fill-box.html rename to tests/wpt/tests/css/css-transforms/transform-box/cssbox-fill-box.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/cssbox-initial.html b/tests/wpt/tests/css/css-transforms/transform-box/cssbox-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/cssbox-initial.html rename to tests/wpt/tests/css/css-transforms/transform-box/cssbox-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/cssbox-stroke-box.html b/tests/wpt/tests/css/css-transforms/transform-box/cssbox-stroke-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/cssbox-stroke-box.html rename to tests/wpt/tests/css/css-transforms/transform-box/cssbox-stroke-box.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/cssbox-view-box.html b/tests/wpt/tests/css/css-transforms/transform-box/cssbox-view-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/cssbox-view-box.html rename to tests/wpt/tests/css/css-transforms/transform-box/cssbox-view-box.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box-001.html b/tests/wpt/tests/css/css-transforms/transform-box/fill-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box-001.html rename to tests/wpt/tests/css/css-transforms/transform-box/fill-box-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box-002.html b/tests/wpt/tests/css/css-transforms/transform-box/fill-box-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box-002.html rename to tests/wpt/tests/css/css-transforms/transform-box/fill-box-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box-mutation-001.html b/tests/wpt/tests/css/css-transforms/transform-box/fill-box-mutation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box-mutation-001.html rename to tests/wpt/tests/css/css-transforms/transform-box/fill-box-mutation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box-mutation-002.html b/tests/wpt/tests/css/css-transforms/transform-box/fill-box-mutation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/fill-box-mutation-002.html rename to tests/wpt/tests/css/css-transforms/transform-box/fill-box-mutation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/reference/cssbox-ref.html b/tests/wpt/tests/css/css-transforms/transform-box/reference/cssbox-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/reference/cssbox-ref.html rename to tests/wpt/tests/css/css-transforms/transform-box/reference/cssbox-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/reference/greensquare200x200.html b/tests/wpt/tests/css/css-transforms/transform-box/reference/greensquare200x200.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/reference/greensquare200x200.html rename to tests/wpt/tests/css/css-transforms/transform-box/reference/greensquare200x200.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/reference/svgbox-ref.html b/tests/wpt/tests/css/css-transforms/transform-box/reference/svgbox-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/reference/svgbox-ref.html rename to tests/wpt/tests/css/css-transforms/transform-box/reference/svgbox-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/svgbox-border-box.html b/tests/wpt/tests/css/css-transforms/transform-box/svgbox-border-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/svgbox-border-box.html rename to tests/wpt/tests/css/css-transforms/transform-box/svgbox-border-box.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/svgbox-content-box.html b/tests/wpt/tests/css/css-transforms/transform-box/svgbox-content-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/svgbox-content-box.html rename to tests/wpt/tests/css/css-transforms/transform-box/svgbox-content-box.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/svgbox-fill-box.html b/tests/wpt/tests/css/css-transforms/transform-box/svgbox-fill-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/svgbox-fill-box.html rename to tests/wpt/tests/css/css-transforms/transform-box/svgbox-fill-box.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/svgbox-initial.html b/tests/wpt/tests/css/css-transforms/transform-box/svgbox-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/svgbox-initial.html rename to tests/wpt/tests/css/css-transforms/transform-box/svgbox-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/svgbox-stroke-box.html b/tests/wpt/tests/css/css-transforms/transform-box/svgbox-stroke-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/svgbox-stroke-box.html rename to tests/wpt/tests/css/css-transforms/transform-box/svgbox-stroke-box.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/svgbox-view-box.html b/tests/wpt/tests/css/css-transforms/transform-box/svgbox-view-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/svgbox-view-box.html rename to tests/wpt/tests/css/css-transforms/transform-box/svgbox-view-box.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/value-changed.html b/tests/wpt/tests/css/css-transforms/transform-box/value-changed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/value-changed.html rename to tests/wpt/tests/css/css-transforms/transform-box/value-changed.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-mutation-001.html b/tests/wpt/tests/css/css-transforms/transform-box/view-box-mutation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-mutation-001.html rename to tests/wpt/tests/css/css-transforms/transform-box/view-box-mutation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-mutation-002.html b/tests/wpt/tests/css/css-transforms/transform-box/view-box-mutation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-mutation-002.html rename to tests/wpt/tests/css/css-transforms/transform-box/view-box-mutation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-mutation-003.html b/tests/wpt/tests/css/css-transforms/transform-box/view-box-mutation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-mutation-003.html rename to tests/wpt/tests/css/css-transforms/transform-box/view-box-mutation-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-nested.html b/tests/wpt/tests/css/css-transforms/transform-box/view-box-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-nested.html rename to tests/wpt/tests/css/css-transforms/transform-box/view-box-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-viewbox-nested.html b/tests/wpt/tests/css/css-transforms/transform-box/view-box-viewbox-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-viewbox-nested.html rename to tests/wpt/tests/css/css-transforms/transform-box/view-box-viewbox-nested.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-viewbox.html b/tests/wpt/tests/css/css-transforms/transform-box/view-box-viewbox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box-viewbox.html rename to tests/wpt/tests/css/css-transforms/transform-box/view-box-viewbox.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box.html b/tests/wpt/tests/css/css-transforms/transform-box/view-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-box/view-box.html rename to tests/wpt/tests/css/css-transforms/transform-box/view-box.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-clip-001-ref.html b/tests/wpt/tests/css/css-transforms/transform-clip-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-clip-001-ref.html rename to tests/wpt/tests/css/css-transforms/transform-clip-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-clip-001.html b/tests/wpt/tests/css/css-transforms/transform-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-clip-001.html rename to tests/wpt/tests/css/css-transforms/transform-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-compound-001.html b/tests/wpt/tests/css/css-transforms/transform-compound-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-compound-001.html rename to tests/wpt/tests/css/css-transforms/transform-compound-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-compound-notref-1.html b/tests/wpt/tests/css/css-transforms/transform-compound-notref-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-compound-notref-1.html rename to tests/wpt/tests/css/css-transforms/transform-compound-notref-1.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-compound-notref-2.html b/tests/wpt/tests/css/css-transforms/transform-compound-notref-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-compound-notref-2.html rename to tests/wpt/tests/css/css-transforms/transform-compound-notref-2.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-compound-ref.html b/tests/wpt/tests/css/css-transforms/transform-compound-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-compound-ref.html rename to tests/wpt/tests/css/css-transforms/transform-compound-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-containing-block-and-scrolling-area-for-fixed-ref.html b/tests/wpt/tests/css/css-transforms/transform-containing-block-and-scrolling-area-for-fixed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-containing-block-and-scrolling-area-for-fixed-ref.html rename to tests/wpt/tests/css/css-transforms/transform-containing-block-and-scrolling-area-for-fixed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-containing-block-and-scrolling-area-for-fixed.html b/tests/wpt/tests/css/css-transforms/transform-containing-block-and-scrolling-area-for-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-containing-block-and-scrolling-area-for-fixed.html rename to tests/wpt/tests/css/css-transforms/transform-containing-block-and-scrolling-area-for-fixed.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-containing-block-dynamic-1a.html b/tests/wpt/tests/css/css-transforms/transform-containing-block-dynamic-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-containing-block-dynamic-1a.html rename to tests/wpt/tests/css/css-transforms/transform-containing-block-dynamic-1a.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-containing-block-dynamic-1b.html b/tests/wpt/tests/css/css-transforms/transform-containing-block-dynamic-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-containing-block-dynamic-1b.html rename to tests/wpt/tests/css/css-transforms/transform-containing-block-dynamic-1b.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-descendant-001.html b/tests/wpt/tests/css/css-transforms/transform-descendant-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-descendant-001.html rename to tests/wpt/tests/css/css-transforms/transform-descendant-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-descendant-ref.html b/tests/wpt/tests/css/css-transforms/transform-descendant-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-descendant-ref.html rename to tests/wpt/tests/css/css-transforms/transform-descendant-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-display-001.html b/tests/wpt/tests/css/css-transforms/transform-display-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-display-001.html rename to tests/wpt/tests/css/css-transforms/transform-display-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-display-002.html b/tests/wpt/tests/css/css-transforms/transform-display-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-display-002.html rename to tests/wpt/tests/css/css-transforms/transform-display-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-display-003.html b/tests/wpt/tests/css/css-transforms/transform-display-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-display-003.html rename to tests/wpt/tests/css/css-transforms/transform-display-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-display-004.html b/tests/wpt/tests/css/css-transforms/transform-display-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-display-004.html rename to tests/wpt/tests/css/css-transforms/transform-display-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-display-notref.html b/tests/wpt/tests/css/css-transforms/transform-display-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-display-notref.html rename to tests/wpt/tests/css/css-transforms/transform-display-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-display-ref.html b/tests/wpt/tests/css/css-transforms/transform-display-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-display-ref.html rename to tests/wpt/tests/css/css-transforms/transform-display-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-001.html b/tests/wpt/tests/css/css-transforms/transform-fixed-bg-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-001.html rename to tests/wpt/tests/css/css-transforms/transform-fixed-bg-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-002.html b/tests/wpt/tests/css/css-transforms/transform-fixed-bg-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-002.html rename to tests/wpt/tests/css/css-transforms/transform-fixed-bg-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-003.html b/tests/wpt/tests/css/css-transforms/transform-fixed-bg-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-003.html rename to tests/wpt/tests/css/css-transforms/transform-fixed-bg-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-004.html b/tests/wpt/tests/css/css-transforms/transform-fixed-bg-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-004.html rename to tests/wpt/tests/css/css-transforms/transform-fixed-bg-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-005.html b/tests/wpt/tests/css/css-transforms/transform-fixed-bg-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-005.html rename to tests/wpt/tests/css/css-transforms/transform-fixed-bg-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-006.html b/tests/wpt/tests/css/css-transforms/transform-fixed-bg-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-006.html rename to tests/wpt/tests/css/css-transforms/transform-fixed-bg-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-007.html b/tests/wpt/tests/css/css-transforms/transform-fixed-bg-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-007.html rename to tests/wpt/tests/css/css-transforms/transform-fixed-bg-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-008.tentative.html b/tests/wpt/tests/css/css-transforms/transform-fixed-bg-008.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-008.tentative.html rename to tests/wpt/tests/css/css-transforms/transform-fixed-bg-008.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-ref.html b/tests/wpt/tests/css/css-transforms/transform-fixed-bg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-fixed-bg-ref.html rename to tests/wpt/tests/css/css-transforms/transform-fixed-bg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-flattening-001.html b/tests/wpt/tests/css/css-transforms/transform-flattening-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-flattening-001.html rename to tests/wpt/tests/css/css-transforms/transform-flattening-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-generated-001-notref.html b/tests/wpt/tests/css/css-transforms/transform-generated-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-generated-001-notref.html rename to tests/wpt/tests/css/css-transforms/transform-generated-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-generated-001-ref.html b/tests/wpt/tests/css/css-transforms/transform-generated-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-generated-001-ref.html rename to tests/wpt/tests/css/css-transforms/transform-generated-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-generated-001.html b/tests/wpt/tests/css/css-transforms/transform-generated-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-generated-001.html rename to tests/wpt/tests/css/css-transforms/transform-generated-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-generated-002-notref.html b/tests/wpt/tests/css/css-transforms/transform-generated-002-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-generated-002-notref.html rename to tests/wpt/tests/css/css-transforms/transform-generated-002-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-generated-002-ref.html b/tests/wpt/tests/css/css-transforms/transform-generated-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-generated-002-ref.html rename to tests/wpt/tests/css/css-transforms/transform-generated-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-generated-002.html b/tests/wpt/tests/css/css-transforms/transform-generated-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-generated-002.html rename to tests/wpt/tests/css/css-transforms/transform-generated-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-getBoundingClientRect-001.html b/tests/wpt/tests/css/css-transforms/transform-getBoundingClientRect-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-getBoundingClientRect-001.html rename to tests/wpt/tests/css/css-transforms/transform-getBoundingClientRect-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-hit-testing.html b/tests/wpt/tests/css/css-transforms/transform-hit-testing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-hit-testing.html rename to tests/wpt/tests/css/css-transforms/transform-hit-testing.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-iframe-001.html b/tests/wpt/tests/css/css-transforms/transform-iframe-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-iframe-001.html rename to tests/wpt/tests/css/css-transforms/transform-iframe-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-iframe-ref.html b/tests/wpt/tests/css/css-transforms/transform-iframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-iframe-ref.html rename to tests/wpt/tests/css/css-transforms/transform-iframe-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-image-001.html b/tests/wpt/tests/css/css-transforms/transform-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-image-001.html rename to tests/wpt/tests/css/css-transforms/transform-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-image-ref.html b/tests/wpt/tests/css/css-transforms/transform-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-image-ref.html rename to tests/wpt/tests/css/css-transforms/transform-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-inherit-001.html b/tests/wpt/tests/css/css-transforms/transform-inherit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-inherit-001.html rename to tests/wpt/tests/css/css-transforms/transform-inherit-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-inherit-002.html b/tests/wpt/tests/css/css-transforms/transform-inherit-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-inherit-002.html rename to tests/wpt/tests/css/css-transforms/transform-inherit-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-inherit-origin-001.html b/tests/wpt/tests/css/css-transforms/transform-inherit-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-inherit-origin-001.html rename to tests/wpt/tests/css/css-transforms/transform-inherit-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-inherit-origin-002.html b/tests/wpt/tests/css/css-transforms/transform-inherit-origin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-inherit-origin-002.html rename to tests/wpt/tests/css/css-transforms/transform-inherit-origin-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-inherit-origin-ref.html b/tests/wpt/tests/css/css-transforms/transform-inherit-origin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-inherit-origin-ref.html rename to tests/wpt/tests/css/css-transforms/transform-inherit-origin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-inherit-ref.html b/tests/wpt/tests/css/css-transforms/transform-inherit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-inherit-ref.html rename to tests/wpt/tests/css/css-transforms/transform-inherit-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-inline-001.html b/tests/wpt/tests/css/css-transforms/transform-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-inline-001.html rename to tests/wpt/tests/css/css-transforms/transform-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-inline-notref.html b/tests/wpt/tests/css/css-transforms/transform-inline-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-inline-notref.html rename to tests/wpt/tests/css/css-transforms/transform-inline-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-inline-ref.html b/tests/wpt/tests/css/css-transforms/transform-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-inline-ref.html rename to tests/wpt/tests/css/css-transforms/transform-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-001-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-001-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-001.html b/tests/wpt/tests/css/css-transforms/transform-input-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-001.html rename to tests/wpt/tests/css/css-transforms/transform-input-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-002-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-002-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-002.html b/tests/wpt/tests/css/css-transforms/transform-input-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-002.html rename to tests/wpt/tests/css/css-transforms/transform-input-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-003-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-003-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-003.html b/tests/wpt/tests/css/css-transforms/transform-input-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-003.html rename to tests/wpt/tests/css/css-transforms/transform-input-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-004-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-004-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-004.html b/tests/wpt/tests/css/css-transforms/transform-input-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-004.html rename to tests/wpt/tests/css/css-transforms/transform-input-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-005-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-005-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-005.html b/tests/wpt/tests/css/css-transforms/transform-input-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-005.html rename to tests/wpt/tests/css/css-transforms/transform-input-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-006-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-006-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-006.html b/tests/wpt/tests/css/css-transforms/transform-input-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-006.html rename to tests/wpt/tests/css/css-transforms/transform-input-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-007-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-007-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-007.html b/tests/wpt/tests/css/css-transforms/transform-input-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-007.html rename to tests/wpt/tests/css/css-transforms/transform-input-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-008-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-008-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-008.html b/tests/wpt/tests/css/css-transforms/transform-input-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-008.html rename to tests/wpt/tests/css/css-transforms/transform-input-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-009-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-009-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-009.html b/tests/wpt/tests/css/css-transforms/transform-input-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-009.html rename to tests/wpt/tests/css/css-transforms/transform-input-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-010-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-010-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-010.html b/tests/wpt/tests/css/css-transforms/transform-input-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-010.html rename to tests/wpt/tests/css/css-transforms/transform-input-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-011-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-011-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-011.html b/tests/wpt/tests/css/css-transforms/transform-input-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-011.html rename to tests/wpt/tests/css/css-transforms/transform-input-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-012-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-012-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-012.html b/tests/wpt/tests/css/css-transforms/transform-input-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-012.html rename to tests/wpt/tests/css/css-transforms/transform-input-012.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-013-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-013-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-013.html b/tests/wpt/tests/css/css-transforms/transform-input-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-013.html rename to tests/wpt/tests/css/css-transforms/transform-input-013.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-014-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-014-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-014.html b/tests/wpt/tests/css/css-transforms/transform-input-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-014.html rename to tests/wpt/tests/css/css-transforms/transform-input-014.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-015-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-015-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-015.html b/tests/wpt/tests/css/css-transforms/transform-input-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-015.html rename to tests/wpt/tests/css/css-transforms/transform-input-015.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-016-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-016-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-016.html b/tests/wpt/tests/css/css-transforms/transform-input-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-016.html rename to tests/wpt/tests/css/css-transforms/transform-input-016.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-017-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-017-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-017.html b/tests/wpt/tests/css/css-transforms/transform-input-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-017.html rename to tests/wpt/tests/css/css-transforms/transform-input-017.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-018-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-018-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-018.html b/tests/wpt/tests/css/css-transforms/transform-input-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-018.html rename to tests/wpt/tests/css/css-transforms/transform-input-018.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-019-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-019-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-019-ref.html rename to tests/wpt/tests/css/css-transforms/transform-input-019-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-input-019.html b/tests/wpt/tests/css/css-transforms/transform-input-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-input-019.html rename to tests/wpt/tests/css/css-transforms/transform-input-019.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-lime-square-ref.html b/tests/wpt/tests/css/css-transforms/transform-lime-square-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-lime-square-ref.html rename to tests/wpt/tests/css/css-transforms/transform-lime-square-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/reference/svg-transform-list-separations-ref.html b/tests/wpt/tests/css/css-transforms/transform-list-separation/reference/svg-transform-list-separations-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/reference/svg-transform-list-separations-ref.html rename to tests/wpt/tests/css/css-transforms/transform-list-separation/reference/svg-transform-list-separations-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-001.html b/tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-001.html rename to tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-002.html b/tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-002.html rename to tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-003.html b/tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-003.html rename to tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-004.html b/tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-004.html rename to tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-005.html b/tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-005.html rename to tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-006.html b/tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-006.html rename to tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-007.html b/tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-007.html rename to tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-008.html b/tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-008.html rename to tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-009.html b/tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-009.html rename to tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-010.html b/tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-010.html rename to tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-011.html b/tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-011.html rename to tests/wpt/tests/css/css-transforms/transform-list-separation/svg-transform-list-separations-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-001-ref.html b/tests/wpt/tests/css/css-transforms/transform-matrix-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-001-ref.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-001.html b/tests/wpt/tests/css/css-transforms/transform-matrix-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-001.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-002-ref.html b/tests/wpt/tests/css/css-transforms/transform-matrix-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-002-ref.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-002.html b/tests/wpt/tests/css/css-transforms/transform-matrix-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-002.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-003-ref.html b/tests/wpt/tests/css/css-transforms/transform-matrix-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-003-ref.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-003.html b/tests/wpt/tests/css/css-transforms/transform-matrix-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-003.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-004-ref.html b/tests/wpt/tests/css/css-transforms/transform-matrix-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-004-ref.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-004.html b/tests/wpt/tests/css/css-transforms/transform-matrix-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-004.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-005-notref.html b/tests/wpt/tests/css/css-transforms/transform-matrix-005-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-005-notref.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-005-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-005-ref.html b/tests/wpt/tests/css/css-transforms/transform-matrix-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-005-ref.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-005.html b/tests/wpt/tests/css/css-transforms/transform-matrix-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-005.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-006-ref.html b/tests/wpt/tests/css/css-transforms/transform-matrix-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-006-ref.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-006.html b/tests/wpt/tests/css/css-transforms/transform-matrix-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-006.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-007-ref.html b/tests/wpt/tests/css/css-transforms/transform-matrix-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-007-ref.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-007.html b/tests/wpt/tests/css/css-transforms/transform-matrix-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-007.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-008-notref.html b/tests/wpt/tests/css/css-transforms/transform-matrix-008-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-008-notref.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-008-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-008-ref.html b/tests/wpt/tests/css/css-transforms/transform-matrix-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-008-ref.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-008.html b/tests/wpt/tests/css/css-transforms/transform-matrix-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-matrix-008.html rename to tests/wpt/tests/css/css-transforms/transform-matrix-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-001.html b/tests/wpt/tests/css/css-transforms/transform-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-001.html rename to tests/wpt/tests/css/css-transforms/transform-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-002.html b/tests/wpt/tests/css/css-transforms/transform-origin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-002.html rename to tests/wpt/tests/css/css-transforms/transform-origin-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-003.html b/tests/wpt/tests/css/css-transforms/transform-origin-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-003.html rename to tests/wpt/tests/css/css-transforms/transform-origin-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-004.html b/tests/wpt/tests/css/css-transforms/transform-origin-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-004.html rename to tests/wpt/tests/css/css-transforms/transform-origin-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-005.html b/tests/wpt/tests/css/css-transforms/transform-origin-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-005.html rename to tests/wpt/tests/css/css-transforms/transform-origin-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-006.html b/tests/wpt/tests/css/css-transforms/transform-origin-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-006.html rename to tests/wpt/tests/css/css-transforms/transform-origin-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-007-ref.html b/tests/wpt/tests/css/css-transforms/transform-origin-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-007-ref.html rename to tests/wpt/tests/css/css-transforms/transform-origin-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-007.html b/tests/wpt/tests/css/css-transforms/transform-origin-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-007.html rename to tests/wpt/tests/css/css-transforms/transform-origin-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-008.html b/tests/wpt/tests/css/css-transforms/transform-origin-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-008.html rename to tests/wpt/tests/css/css-transforms/transform-origin-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-009.html b/tests/wpt/tests/css/css-transforms/transform-origin-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-009.html rename to tests/wpt/tests/css/css-transforms/transform-origin-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-01.html b/tests/wpt/tests/css/css-transforms/transform-origin-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-01.html rename to tests/wpt/tests/css/css-transforms/transform-origin-01.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-010.html b/tests/wpt/tests/css/css-transforms/transform-origin-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-010.html rename to tests/wpt/tests/css/css-transforms/transform-origin-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-011.html b/tests/wpt/tests/css/css-transforms/transform-origin-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-011.html rename to tests/wpt/tests/css/css-transforms/transform-origin-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-012.html b/tests/wpt/tests/css/css-transforms/transform-origin-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-012.html rename to tests/wpt/tests/css/css-transforms/transform-origin-012.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-013-ref.html b/tests/wpt/tests/css/css-transforms/transform-origin-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-013-ref.html rename to tests/wpt/tests/css/css-transforms/transform-origin-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-013.html b/tests/wpt/tests/css/css-transforms/transform-origin-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-013.html rename to tests/wpt/tests/css/css-transforms/transform-origin-013.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-014.html b/tests/wpt/tests/css/css-transforms/transform-origin-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-014.html rename to tests/wpt/tests/css/css-transforms/transform-origin-014.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-in-shadow.html b/tests/wpt/tests/css/css-transforms/transform-origin-in-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-in-shadow.html rename to tests/wpt/tests/css/css-transforms/transform-origin-in-shadow.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-001.html b/tests/wpt/tests/css/css-transforms/transform-origin-name-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-001.html rename to tests/wpt/tests/css/css-transforms/transform-origin-name-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-002.html b/tests/wpt/tests/css/css-transforms/transform-origin-name-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-002.html rename to tests/wpt/tests/css/css-transforms/transform-origin-name-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-003.html b/tests/wpt/tests/css/css-transforms/transform-origin-name-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-003.html rename to tests/wpt/tests/css/css-transforms/transform-origin-name-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-004.html b/tests/wpt/tests/css/css-transforms/transform-origin-name-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-004.html rename to tests/wpt/tests/css/css-transforms/transform-origin-name-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-005.html b/tests/wpt/tests/css/css-transforms/transform-origin-name-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-005.html rename to tests/wpt/tests/css/css-transforms/transform-origin-name-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-006.html b/tests/wpt/tests/css/css-transforms/transform-origin-name-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-006.html rename to tests/wpt/tests/css/css-transforms/transform-origin-name-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-007.html b/tests/wpt/tests/css/css-transforms/transform-origin-name-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-007.html rename to tests/wpt/tests/css/css-transforms/transform-origin-name-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-notref.html b/tests/wpt/tests/css/css-transforms/transform-origin-name-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-notref.html rename to tests/wpt/tests/css/css-transforms/transform-origin-name-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-ref-1.html b/tests/wpt/tests/css/css-transforms/transform-origin-name-ref-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-ref-1.html rename to tests/wpt/tests/css/css-transforms/transform-origin-name-ref-1.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-ref-2.html b/tests/wpt/tests/css/css-transforms/transform-origin-name-ref-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-ref-2.html rename to tests/wpt/tests/css/css-transforms/transform-origin-name-ref-2.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-ref-3.html b/tests/wpt/tests/css/css-transforms/transform-origin-name-ref-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-name-ref-3.html rename to tests/wpt/tests/css/css-transforms/transform-origin-name-ref-3.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-ref-1.html b/tests/wpt/tests/css/css-transforms/transform-origin-ref-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-ref-1.html rename to tests/wpt/tests/css/css-transforms/transform-origin-ref-1.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin-ref-2.html b/tests/wpt/tests/css/css-transforms/transform-origin-ref-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin-ref-2.html rename to tests/wpt/tests/css/css-transforms/transform-origin-ref-2.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin.html b/tests/wpt/tests/css/css-transforms/transform-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin.html rename to tests/wpt/tests/css/css-transforms/transform-origin.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/reference/svg-origin-length-cm-ref.html b/tests/wpt/tests/css/css-transforms/transform-origin/reference/svg-origin-length-cm-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/reference/svg-origin-length-cm-ref.html rename to tests/wpt/tests/css/css-transforms/transform-origin/reference/svg-origin-length-cm-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/reference/svg-origin-length-in-ref.html b/tests/wpt/tests/css/css-transforms/transform-origin/reference/svg-origin-length-in-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/reference/svg-origin-length-in-ref.html rename to tests/wpt/tests/css/css-transforms/transform-origin/reference/svg-origin-length-in-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/reference/svg-origin-length-pt-ref.html b/tests/wpt/tests/css/css-transforms/transform-origin/reference/svg-origin-length-pt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/reference/svg-origin-length-pt-ref.html rename to tests/wpt/tests/css/css-transforms/transform-origin/reference/svg-origin-length-pt-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/reference/svg-origin-length-ref.html b/tests/wpt/tests/css/css-transforms/transform-origin/reference/svg-origin-length-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/reference/svg-origin-length-ref.html rename to tests/wpt/tests/css/css-transforms/transform-origin/reference/svg-origin-length-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/reference/svg-origin-relative-length-invalid-ref.html b/tests/wpt/tests/css/css-transforms/transform-origin/reference/svg-origin-relative-length-invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/reference/svg-origin-relative-length-invalid-ref.html rename to tests/wpt/tests/css/css-transforms/transform-origin/reference/svg-origin-relative-length-invalid-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/reference/svg-origin-relative-length-ref.html b/tests/wpt/tests/css/css-transforms/transform-origin/reference/svg-origin-relative-length-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/reference/svg-origin-relative-length-ref.html rename to tests/wpt/tests/css/css-transforms/transform-origin/reference/svg-origin-relative-length-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-001.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-001.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-002.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-002.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-003.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-003.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-004.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-004.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-005.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-005.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-006.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-006.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-007.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-007.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-008.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-008.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-cm-001.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-cm-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-cm-001.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-cm-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-cm-002.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-cm-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-cm-002.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-cm-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-cm-003.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-cm-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-cm-003.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-cm-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-cm-004.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-cm-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-cm-004.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-cm-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-cm-005.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-cm-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-cm-005.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-cm-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-in-001.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-in-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-in-001.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-in-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-in-002.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-in-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-in-002.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-in-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-in-003.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-in-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-in-003.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-in-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-in-004.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-in-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-in-004.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-in-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-in-005.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-in-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-in-005.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-in-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-pt-001.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-pt-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-pt-001.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-pt-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-pt-002.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-pt-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-pt-002.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-pt-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-pt-003.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-pt-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-pt-003.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-pt-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-pt-004.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-pt-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-pt-004.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-pt-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-pt-005.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-pt-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-length-pt-005.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-length-pt-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-001.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-001.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-002.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-002.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-003.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-003.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-004.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-004.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-005.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-005.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-006.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-006.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-007.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-007.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-008.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-008.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-009.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-009.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-010.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-010.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-011.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-011.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-012.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-012.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-012.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-013.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-013.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-013.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-014.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-014.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-014.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-015.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-015.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-015.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-016.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-016.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-016.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-017.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-017.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-017.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-018.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-018.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-018.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-019.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-019.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-019.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-020.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-020.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-020.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-021.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-021.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-021.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-022.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-022.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-022.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-023.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-023.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-023.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-024.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-024.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-024.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-025.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-025.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-025.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-026.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-026.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-026.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-027.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-027.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-027.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-028.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-028.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-028.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-029.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-029.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-029.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-030.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-030.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-030.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-031.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-031.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-031.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-032.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-032.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-032.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-033.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-033.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-033.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-034.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-034.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-034.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-035.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-035.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-035.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-036.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-036.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-036.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-037.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-037.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-037.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-038.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-038.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-038.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-039.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-039.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-039.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-040.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-040.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-040.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-041.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-041.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-041.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-042.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-042.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-042.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-043.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-043.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-043.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-044.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-044.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-044.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-045.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-045.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-045.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-046.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-046.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-046.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-001.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-001.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-002.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-002.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-003.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-003.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-004.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-004.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-005.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-005.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-006.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-006.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-007.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-007.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-008.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-008.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-009.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-009.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-010.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-010.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-011.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-011.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-012.html b/tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-012.html rename to tests/wpt/tests/css/css-transforms/transform-origin/svg-origin-relative-length-invalid-012.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-overflow-001-ref.html b/tests/wpt/tests/css/css-transforms/transform-overflow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-overflow-001-ref.html rename to tests/wpt/tests/css/css-transforms/transform-overflow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-overflow-001.html b/tests/wpt/tests/css/css-transforms/transform-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-overflow-001.html rename to tests/wpt/tests/css/css-transforms/transform-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-overflow-002-ref.html b/tests/wpt/tests/css/css-transforms/transform-overflow-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-overflow-002-ref.html rename to tests/wpt/tests/css/css-transforms/transform-overflow-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-overflow-002.html b/tests/wpt/tests/css/css-transforms/transform-overflow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-overflow-002.html rename to tests/wpt/tests/css/css-transforms/transform-overflow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-percent-001.html b/tests/wpt/tests/css/css-transforms/transform-percent-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-percent-001.html rename to tests/wpt/tests/css/css-transforms/transform-percent-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-percent-002.html b/tests/wpt/tests/css/css-transforms/transform-percent-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-percent-002.html rename to tests/wpt/tests/css/css-transforms/transform-percent-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-percent-003.html b/tests/wpt/tests/css/css-transforms/transform-percent-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-percent-003.html rename to tests/wpt/tests/css/css-transforms/transform-percent-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-percent-004.html b/tests/wpt/tests/css/css-transforms/transform-percent-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-percent-004.html rename to tests/wpt/tests/css/css-transforms/transform-percent-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-percent-005.html b/tests/wpt/tests/css/css-transforms/transform-percent-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-percent-005.html rename to tests/wpt/tests/css/css-transforms/transform-percent-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-percent-006.html b/tests/wpt/tests/css/css-transforms/transform-percent-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-percent-006.html rename to tests/wpt/tests/css/css-transforms/transform-percent-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-percent-007.html b/tests/wpt/tests/css/css-transforms/transform-percent-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-percent-007.html rename to tests/wpt/tests/css/css-transforms/transform-percent-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-percent-008.html b/tests/wpt/tests/css/css-transforms/transform-percent-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-percent-008.html rename to tests/wpt/tests/css/css-transforms/transform-percent-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-percent-009.html b/tests/wpt/tests/css/css-transforms/transform-percent-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-percent-009.html rename to tests/wpt/tests/css/css-transforms/transform-percent-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-percent-010.html b/tests/wpt/tests/css/css-transforms/transform-percent-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-percent-010.html rename to tests/wpt/tests/css/css-transforms/transform-percent-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-percent-notref.html b/tests/wpt/tests/css/css-transforms/transform-percent-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-percent-notref.html rename to tests/wpt/tests/css/css-transforms/transform-percent-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-percent-ref.html b/tests/wpt/tests/css/css-transforms/transform-percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-percent-ref.html rename to tests/wpt/tests/css/css-transforms/transform-percent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-propagate-inherit-boolean-001.html b/tests/wpt/tests/css/css-transforms/transform-propagate-inherit-boolean-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-propagate-inherit-boolean-001.html rename to tests/wpt/tests/css/css-transforms/transform-propagate-inherit-boolean-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-propagate-inherit-boolean-ref.html b/tests/wpt/tests/css/css-transforms/transform-propagate-inherit-boolean-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-propagate-inherit-boolean-ref.html rename to tests/wpt/tests/css/css-transforms/transform-propagate-inherit-boolean-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-root-bg-001-ref.html b/tests/wpt/tests/css/css-transforms/transform-root-bg-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-root-bg-001-ref.html rename to tests/wpt/tests/css/css-transforms/transform-root-bg-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-root-bg-001.html b/tests/wpt/tests/css/css-transforms/transform-root-bg-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-root-bg-001.html rename to tests/wpt/tests/css/css-transforms/transform-root-bg-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-root-bg-002.html b/tests/wpt/tests/css/css-transforms/transform-root-bg-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-root-bg-002.html rename to tests/wpt/tests/css/css-transforms/transform-root-bg-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-root-bg-003.html b/tests/wpt/tests/css/css-transforms/transform-root-bg-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-root-bg-003.html rename to tests/wpt/tests/css/css-transforms/transform-root-bg-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-root-bg-004-ref.html b/tests/wpt/tests/css/css-transforms/transform-root-bg-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-root-bg-004-ref.html rename to tests/wpt/tests/css/css-transforms/transform-root-bg-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-root-bg-004.html b/tests/wpt/tests/css/css-transforms/transform-root-bg-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-root-bg-004.html rename to tests/wpt/tests/css/css-transforms/transform-root-bg-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-001-notref.html b/tests/wpt/tests/css/css-transforms/transform-rotate-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-001-notref.html rename to tests/wpt/tests/css/css-transforms/transform-rotate-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-001-ref.html b/tests/wpt/tests/css/css-transforms/transform-rotate-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-001-ref.html rename to tests/wpt/tests/css/css-transforms/transform-rotate-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-001.html b/tests/wpt/tests/css/css-transforms/transform-rotate-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-001.html rename to tests/wpt/tests/css/css-transforms/transform-rotate-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-002.html b/tests/wpt/tests/css/css-transforms/transform-rotate-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-002.html rename to tests/wpt/tests/css/css-transforms/transform-rotate-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-003.html b/tests/wpt/tests/css/css-transforms/transform-rotate-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-003.html rename to tests/wpt/tests/css/css-transforms/transform-rotate-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-004.html b/tests/wpt/tests/css/css-transforms/transform-rotate-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-004.html rename to tests/wpt/tests/css/css-transforms/transform-rotate-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-005.html b/tests/wpt/tests/css/css-transforms/transform-rotate-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-005.html rename to tests/wpt/tests/css/css-transforms/transform-rotate-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-006.html b/tests/wpt/tests/css/css-transforms/transform-rotate-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-006.html rename to tests/wpt/tests/css/css-transforms/transform-rotate-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-007-notref.html b/tests/wpt/tests/css/css-transforms/transform-rotate-007-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-007-notref.html rename to tests/wpt/tests/css/css-transforms/transform-rotate-007-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-007-ref.html b/tests/wpt/tests/css/css-transforms/transform-rotate-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-007-ref.html rename to tests/wpt/tests/css/css-transforms/transform-rotate-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-007.html b/tests/wpt/tests/css/css-transforms/transform-rotate-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-rotate-007.html rename to tests/wpt/tests/css/css-transforms/transform-rotate-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-rounding-001.html b/tests/wpt/tests/css/css-transforms/transform-rounding-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-rounding-001.html rename to tests/wpt/tests/css/css-transforms/transform-rounding-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-rounding-ref.html b/tests/wpt/tests/css/css-transforms/transform-rounding-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-rounding-ref.html rename to tests/wpt/tests/css/css-transforms/transform-rounding-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-scale-001.html b/tests/wpt/tests/css/css-transforms/transform-scale-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-scale-001.html rename to tests/wpt/tests/css/css-transforms/transform-scale-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-scale-002.html b/tests/wpt/tests/css/css-transforms/transform-scale-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-scale-002.html rename to tests/wpt/tests/css/css-transforms/transform-scale-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-scale-hittest.html b/tests/wpt/tests/css/css-transforms/transform-scale-hittest.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-scale-hittest.html rename to tests/wpt/tests/css/css-transforms/transform-scale-hittest.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-scale-percent-001.html b/tests/wpt/tests/css/css-transforms/transform-scale-percent-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-scale-percent-001.html rename to tests/wpt/tests/css/css-transforms/transform-scale-percent-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-scale-percent-ref.html b/tests/wpt/tests/css/css-transforms/transform-scale-percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-scale-percent-ref.html rename to tests/wpt/tests/css/css-transforms/transform-scale-percent-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-scale-ref.html b/tests/wpt/tests/css/css-transforms/transform-scale-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-scale-ref.html rename to tests/wpt/tests/css/css-transforms/transform-scale-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-scale-test.html b/tests/wpt/tests/css/css-transforms/transform-scale-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-scale-test.html rename to tests/wpt/tests/css/css-transforms/transform-scale-test.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-scalex-001.html b/tests/wpt/tests/css/css-transforms/transform-scalex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-scalex-001.html rename to tests/wpt/tests/css/css-transforms/transform-scalex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-scalex-ref.html b/tests/wpt/tests/css/css-transforms/transform-scalex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-scalex-ref.html rename to tests/wpt/tests/css/css-transforms/transform-scalex-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-scaley-001.html b/tests/wpt/tests/css/css-transforms/transform-scaley-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-scaley-001.html rename to tests/wpt/tests/css/css-transforms/transform-scaley-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-scaley-ref.html b/tests/wpt/tests/css/css-transforms/transform-scaley-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-scaley-ref.html rename to tests/wpt/tests/css/css-transforms/transform-scaley-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-singular-001.html b/tests/wpt/tests/css/css-transforms/transform-singular-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-singular-001.html rename to tests/wpt/tests/css/css-transforms/transform-singular-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-singular-ref.html b/tests/wpt/tests/css/css-transforms/transform-singular-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-singular-ref.html rename to tests/wpt/tests/css/css-transforms/transform-singular-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-stacking-001.html b/tests/wpt/tests/css/css-transforms/transform-stacking-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-stacking-001.html rename to tests/wpt/tests/css/css-transforms/transform-stacking-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-stacking-002.html b/tests/wpt/tests/css/css-transforms/transform-stacking-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-stacking-002.html rename to tests/wpt/tests/css/css-transforms/transform-stacking-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-stacking-003.html b/tests/wpt/tests/css/css-transforms/transform-stacking-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-stacking-003.html rename to tests/wpt/tests/css/css-transforms/transform-stacking-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-stacking-004.html b/tests/wpt/tests/css/css-transforms/transform-stacking-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-stacking-004.html rename to tests/wpt/tests/css/css-transforms/transform-stacking-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-stresstest-001.html b/tests/wpt/tests/css/css-transforms/transform-stresstest-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-stresstest-001.html rename to tests/wpt/tests/css/css-transforms/transform-stresstest-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-stresstest-ref.html b/tests/wpt/tests/css/css-transforms/transform-stresstest-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-stresstest-ref.html rename to tests/wpt/tests/css/css-transforms/transform-stresstest-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-001-notref.html b/tests/wpt/tests/css/css-transforms/transform-table-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-001-notref.html rename to tests/wpt/tests/css/css-transforms/transform-table-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-001-ref.html b/tests/wpt/tests/css/css-transforms/transform-table-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-001-ref.html rename to tests/wpt/tests/css/css-transforms/transform-table-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-001.html b/tests/wpt/tests/css/css-transforms/transform-table-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-001.html rename to tests/wpt/tests/css/css-transforms/transform-table-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-002-notref.html b/tests/wpt/tests/css/css-transforms/transform-table-002-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-002-notref.html rename to tests/wpt/tests/css/css-transforms/transform-table-002-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-002.html b/tests/wpt/tests/css/css-transforms/transform-table-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-002.html rename to tests/wpt/tests/css/css-transforms/transform-table-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-003.html b/tests/wpt/tests/css/css-transforms/transform-table-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-003.html rename to tests/wpt/tests/css/css-transforms/transform-table-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-004-notref.html b/tests/wpt/tests/css/css-transforms/transform-table-004-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-004-notref.html rename to tests/wpt/tests/css/css-transforms/transform-table-004-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-004-ref.html b/tests/wpt/tests/css/css-transforms/transform-table-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-004-ref.html rename to tests/wpt/tests/css/css-transforms/transform-table-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-004.html b/tests/wpt/tests/css/css-transforms/transform-table-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-004.html rename to tests/wpt/tests/css/css-transforms/transform-table-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-005-notref.html b/tests/wpt/tests/css/css-transforms/transform-table-005-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-005-notref.html rename to tests/wpt/tests/css/css-transforms/transform-table-005-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-005.html b/tests/wpt/tests/css/css-transforms/transform-table-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-005.html rename to tests/wpt/tests/css/css-transforms/transform-table-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-006.html b/tests/wpt/tests/css/css-transforms/transform-table-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-006.html rename to tests/wpt/tests/css/css-transforms/transform-table-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-007.html b/tests/wpt/tests/css/css-transforms/transform-table-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-007.html rename to tests/wpt/tests/css/css-transforms/transform-table-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-008.html b/tests/wpt/tests/css/css-transforms/transform-table-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-008.html rename to tests/wpt/tests/css/css-transforms/transform-table-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-009-notref.html b/tests/wpt/tests/css/css-transforms/transform-table-009-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-009-notref.html rename to tests/wpt/tests/css/css-transforms/transform-table-009-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-009-ref.html b/tests/wpt/tests/css/css-transforms/transform-table-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-009-ref.html rename to tests/wpt/tests/css/css-transforms/transform-table-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-009.html b/tests/wpt/tests/css/css-transforms/transform-table-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-009.html rename to tests/wpt/tests/css/css-transforms/transform-table-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-010-notref.html b/tests/wpt/tests/css/css-transforms/transform-table-010-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-010-notref.html rename to tests/wpt/tests/css/css-transforms/transform-table-010-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-010.html b/tests/wpt/tests/css/css-transforms/transform-table-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-010.html rename to tests/wpt/tests/css/css-transforms/transform-table-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-011-notref.html b/tests/wpt/tests/css/css-transforms/transform-table-011-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-011-notref.html rename to tests/wpt/tests/css/css-transforms/transform-table-011-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-table-011.html b/tests/wpt/tests/css/css-transforms/transform-table-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-table-011.html rename to tests/wpt/tests/css/css-transforms/transform-table-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-inline-block-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformable-inline-block-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-inline-block-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-inline-block-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-inline-block.html b/tests/wpt/tests/css/css-transforms/transform-transformable-inline-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-inline-block.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-inline-block.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-inline-table-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformable-inline-table-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-inline-table-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-inline-table-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-inline-table.html b/tests/wpt/tests/css/css-transforms/transform-transformable-inline-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-inline-table.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-inline-table.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-list-item-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformable-list-item-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-list-item-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-list-item-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-list-item.html b/tests/wpt/tests/css/css-transforms/transform-transformable-list-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-list-item.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-list-item.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-caption-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformable-table-caption-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-caption-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-table-caption-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-caption.html b/tests/wpt/tests/css/css-transforms/transform-transformable-table-caption.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-caption.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-table-caption.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-cell-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformable-table-cell-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-cell-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-table-cell-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-cell.html b/tests/wpt/tests/css/css-transforms/transform-transformable-table-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-cell.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-table-cell.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-footer-group-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformable-table-footer-group-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-footer-group-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-table-footer-group-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-footer-group.html b/tests/wpt/tests/css/css-transforms/transform-transformable-table-footer-group.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-footer-group.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-table-footer-group.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-header-group-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformable-table-header-group-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-header-group-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-table-header-group-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-header-group.html b/tests/wpt/tests/css/css-transforms/transform-transformable-table-header-group.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-header-group.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-table-header-group.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformable-table-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-table-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-row-group-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformable-table-row-group-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-row-group-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-table-row-group-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-row-group.html b/tests/wpt/tests/css/css-transforms/transform-transformable-table-row-group.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-row-group.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-table-row-group.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-row-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformable-table-row-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-row-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-table-row-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-row.html b/tests/wpt/tests/css/css-transforms/transform-transformable-table-row.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table-row.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-table-row.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table.html b/tests/wpt/tests/css/css-transforms/transform-transformable-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformable-table.html rename to tests/wpt/tests/css/css-transforms/transform-transformable-table.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-caption-contains-fixed-position-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformed-caption-contains-fixed-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-caption-contains-fixed-position-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-caption-contains-fixed-position-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-caption-contains-fixed-position.html b/tests/wpt/tests/css/css-transforms/transform-transformed-caption-contains-fixed-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-caption-contains-fixed-position.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-caption-contains-fixed-position.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tbody-contains-fixed-position-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformed-tbody-contains-fixed-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tbody-contains-fixed-position-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-tbody-contains-fixed-position-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tbody-contains-fixed-position.html b/tests/wpt/tests/css/css-transforms/transform-transformed-tbody-contains-fixed-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tbody-contains-fixed-position.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-tbody-contains-fixed-position.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-td-contains-fixed-position-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformed-td-contains-fixed-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-td-contains-fixed-position-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-td-contains-fixed-position-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-td-contains-fixed-position.html b/tests/wpt/tests/css/css-transforms/transform-transformed-td-contains-fixed-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-td-contains-fixed-position.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-td-contains-fixed-position.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tfoot-contains-fixed-position-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformed-tfoot-contains-fixed-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tfoot-contains-fixed-position-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-tfoot-contains-fixed-position-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tfoot-contains-fixed-position.html b/tests/wpt/tests/css/css-transforms/transform-transformed-tfoot-contains-fixed-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tfoot-contains-fixed-position.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-tfoot-contains-fixed-position.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-th-contains-fixed-position-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformed-th-contains-fixed-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-th-contains-fixed-position-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-th-contains-fixed-position-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-th-contains-fixed-position.html b/tests/wpt/tests/css/css-transforms/transform-transformed-th-contains-fixed-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-th-contains-fixed-position.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-th-contains-fixed-position.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-thead-contains-fixed-position-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformed-thead-contains-fixed-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-thead-contains-fixed-position-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-thead-contains-fixed-position-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-thead-contains-fixed-position.html b/tests/wpt/tests/css/css-transforms/transform-transformed-thead-contains-fixed-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-thead-contains-fixed-position.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-thead-contains-fixed-position.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tr-contains-fixed-position-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformed-tr-contains-fixed-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tr-contains-fixed-position-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-tr-contains-fixed-position-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tr-contains-fixed-position.html b/tests/wpt/tests/css/css-transforms/transform-transformed-tr-contains-fixed-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tr-contains-fixed-position.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-tr-contains-fixed-position.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tr-percent-height-child-ref.html b/tests/wpt/tests/css/css-transforms/transform-transformed-tr-percent-height-child-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tr-percent-height-child-ref.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-tr-percent-height-child-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tr-percent-height-child.html b/tests/wpt/tests/css/css-transforms/transform-transformed-tr-percent-height-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-transformed-tr-percent-height-child.html rename to tests/wpt/tests/css/css-transforms/transform-transformed-tr-percent-height-child.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translate-001.html b/tests/wpt/tests/css/css-transforms/transform-translate-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translate-001.html rename to tests/wpt/tests/css/css-transforms/transform-translate-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translate-002.html b/tests/wpt/tests/css/css-transforms/transform-translate-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translate-002.html rename to tests/wpt/tests/css/css-transforms/transform-translate-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translate-003.html b/tests/wpt/tests/css/css-transforms/transform-translate-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translate-003.html rename to tests/wpt/tests/css/css-transforms/transform-translate-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translate-004.html b/tests/wpt/tests/css/css-transforms/transform-translate-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translate-004.html rename to tests/wpt/tests/css/css-transforms/transform-translate-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translate-005.html b/tests/wpt/tests/css/css-transforms/transform-translate-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translate-005.html rename to tests/wpt/tests/css/css-transforms/transform-translate-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translate-background-001-ref.html b/tests/wpt/tests/css/css-transforms/transform-translate-background-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translate-background-001-ref.html rename to tests/wpt/tests/css/css-transforms/transform-translate-background-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translate-background-001.html b/tests/wpt/tests/css/css-transforms/transform-translate-background-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translate-background-001.html rename to tests/wpt/tests/css/css-transforms/transform-translate-background-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translate-background-002.html b/tests/wpt/tests/css/css-transforms/transform-translate-background-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translate-background-002.html rename to tests/wpt/tests/css/css-transforms/transform-translate-background-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translate-ref.html b/tests/wpt/tests/css/css-transforms/transform-translate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translate-ref.html rename to tests/wpt/tests/css/css-transforms/transform-translate-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translatex-001.html b/tests/wpt/tests/css/css-transforms/transform-translatex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translatex-001.html rename to tests/wpt/tests/css/css-transforms/transform-translatex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translatex-002.html b/tests/wpt/tests/css/css-transforms/transform-translatex-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translatex-002.html rename to tests/wpt/tests/css/css-transforms/transform-translatex-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translatex-003.html b/tests/wpt/tests/css/css-transforms/transform-translatex-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translatex-003.html rename to tests/wpt/tests/css/css-transforms/transform-translatex-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translatex-004.html b/tests/wpt/tests/css/css-transforms/transform-translatex-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translatex-004.html rename to tests/wpt/tests/css/css-transforms/transform-translatex-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translatex-005.html b/tests/wpt/tests/css/css-transforms/transform-translatex-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translatex-005.html rename to tests/wpt/tests/css/css-transforms/transform-translatex-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translatex-006.html b/tests/wpt/tests/css/css-transforms/transform-translatex-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translatex-006.html rename to tests/wpt/tests/css/css-transforms/transform-translatex-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translatex-ref.html b/tests/wpt/tests/css/css-transforms/transform-translatex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translatex-ref.html rename to tests/wpt/tests/css/css-transforms/transform-translatex-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translatey-001.html b/tests/wpt/tests/css/css-transforms/transform-translatey-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translatey-001.html rename to tests/wpt/tests/css/css-transforms/transform-translatey-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translatey-002.html b/tests/wpt/tests/css/css-transforms/transform-translatey-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translatey-002.html rename to tests/wpt/tests/css/css-transforms/transform-translatey-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translatey-003.html b/tests/wpt/tests/css/css-transforms/transform-translatey-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translatey-003.html rename to tests/wpt/tests/css/css-transforms/transform-translatey-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translatey-004.html b/tests/wpt/tests/css/css-transforms/transform-translatey-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translatey-004.html rename to tests/wpt/tests/css/css-transforms/transform-translatey-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translatey-005.html b/tests/wpt/tests/css/css-transforms/transform-translatey-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translatey-005.html rename to tests/wpt/tests/css/css-transforms/transform-translatey-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform-translatey-ref.html b/tests/wpt/tests/css/css-transforms/transform-translatey-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform-translatey-ref.html rename to tests/wpt/tests/css/css-transforms/transform-translatey-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-001.html b/tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-002.html b/tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-002.html rename to tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-003.html b/tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-003.html rename to tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-004.html b/tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-004.html rename to tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-005.html b/tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-005.html rename to tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-006.html b/tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-006.html rename to tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-007.html b/tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-007.html rename to tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-008.html b/tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-backface-visibility-008.html rename to tests/wpt/tests/css/css-transforms/transform3d-backface-visibility-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-image-scale-001.html b/tests/wpt/tests/css/css-transforms/transform3d-image-scale-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-image-scale-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-image-scale-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-image-scale-002.html b/tests/wpt/tests/css/css-transforms/transform3d-image-scale-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-image-scale-002.html rename to tests/wpt/tests/css/css-transforms/transform3d-image-scale-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-001-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-matrix3d-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-001-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-matrix3d-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-001.html b/tests/wpt/tests/css/css-transforms/transform3d-matrix3d-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-matrix3d-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-002-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-matrix3d-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-002-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-matrix3d-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-002.html b/tests/wpt/tests/css/css-transforms/transform3d-matrix3d-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-002.html rename to tests/wpt/tests/css/css-transforms/transform3d-matrix3d-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-003-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-matrix3d-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-003-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-matrix3d-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-003.html b/tests/wpt/tests/css/css-transforms/transform3d-matrix3d-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-003.html rename to tests/wpt/tests/css/css-transforms/transform3d-matrix3d-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-004-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-matrix3d-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-004-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-matrix3d-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-004.html b/tests/wpt/tests/css/css-transforms/transform3d-matrix3d-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-004.html rename to tests/wpt/tests/css/css-transforms/transform3d-matrix3d-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-005-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-matrix3d-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-005-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-matrix3d-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-005.html b/tests/wpt/tests/css/css-transforms/transform3d-matrix3d-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-matrix3d-005.html rename to tests/wpt/tests/css/css-transforms/transform3d-matrix3d-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-001-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-perspective-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-001-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-perspective-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-001.html b/tests/wpt/tests/css/css-transforms/transform3d-perspective-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-perspective-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-002.html b/tests/wpt/tests/css/css-transforms/transform3d-perspective-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-002.html rename to tests/wpt/tests/css/css-transforms/transform3d-perspective-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-003.html b/tests/wpt/tests/css/css-transforms/transform3d-perspective-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-003.html rename to tests/wpt/tests/css/css-transforms/transform3d-perspective-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-004.html b/tests/wpt/tests/css/css-transforms/transform3d-perspective-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-004.html rename to tests/wpt/tests/css/css-transforms/transform3d-perspective-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-005.html b/tests/wpt/tests/css/css-transforms/transform3d-perspective-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-005.html rename to tests/wpt/tests/css/css-transforms/transform3d-perspective-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-006.html b/tests/wpt/tests/css/css-transforms/transform3d-perspective-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-006.html rename to tests/wpt/tests/css/css-transforms/transform3d-perspective-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-007.html b/tests/wpt/tests/css/css-transforms/transform3d-perspective-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-007.html rename to tests/wpt/tests/css/css-transforms/transform3d-perspective-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-008.html b/tests/wpt/tests/css/css-transforms/transform3d-perspective-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-008.html rename to tests/wpt/tests/css/css-transforms/transform3d-perspective-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-009-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-perspective-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-009-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-perspective-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-009.html b/tests/wpt/tests/css/css-transforms/transform3d-perspective-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-009.html rename to tests/wpt/tests/css/css-transforms/transform3d-perspective-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-origin-001.html b/tests/wpt/tests/css/css-transforms/transform3d-perspective-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-origin-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-perspective-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-origin-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-perspective-origin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-perspective-origin-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-perspective-origin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-001-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-001-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-001.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-002.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-002.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-003.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-003.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-004.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-004.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-005.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-005.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-006.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-006.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-007.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-007.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-008.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-008.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-008.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-009.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-009.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-010.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-010.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-010.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-011.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-011.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-011.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-012.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-012.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-012.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-013-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-013-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-013.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-preserve3d-013.html rename to tests/wpt/tests/css/css-transforms/transform3d-preserve3d-013.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotate3d-001.html b/tests/wpt/tests/css/css-transforms/transform3d-rotate3d-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotate3d-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-rotate3d-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotate3d-002.html b/tests/wpt/tests/css/css-transforms/transform3d-rotate3d-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotate3d-002.html rename to tests/wpt/tests/css/css-transforms/transform3d-rotate3d-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-001.html b/tests/wpt/tests/css/css-transforms/transform3d-rotatex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-rotatex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-001.html b/tests/wpt/tests/css/css-transforms/transform3d-rotatex-perspective-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-rotatex-perspective-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-002.html b/tests/wpt/tests/css/css-transforms/transform3d-rotatex-perspective-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-002.html rename to tests/wpt/tests/css/css-transforms/transform3d-rotatex-perspective-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-003.html b/tests/wpt/tests/css/css-transforms/transform3d-rotatex-perspective-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-003.html rename to tests/wpt/tests/css/css-transforms/transform3d-rotatex-perspective-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-notref.html b/tests/wpt/tests/css/css-transforms/transform3d-rotatex-perspective-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-notref.html rename to tests/wpt/tests/css/css-transforms/transform3d-rotatex-perspective-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-rotatex-perspective-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-perspective-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-rotatex-perspective-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-rotatex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-rotatex-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-transformorigin-001.html b/tests/wpt/tests/css/css-transforms/transform3d-rotatex-transformorigin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-transformorigin-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-rotatex-transformorigin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-transformorigin-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-rotatex-transformorigin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatex-transformorigin-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-rotatex-transformorigin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatey-001.html b/tests/wpt/tests/css/css-transforms/transform3d-rotatey-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatey-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-rotatey-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatey-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-rotatey-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-rotatey-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-rotatey-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-001-notref.html b/tests/wpt/tests/css/css-transforms/transform3d-scale-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-001-notref.html rename to tests/wpt/tests/css/css-transforms/transform3d-scale-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-001-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-scale-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-001-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-scale-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-001.html b/tests/wpt/tests/css/css-transforms/transform3d-scale-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-scale-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-002.html b/tests/wpt/tests/css/css-transforms/transform3d-scale-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-002.html rename to tests/wpt/tests/css/css-transforms/transform3d-scale-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-003.html b/tests/wpt/tests/css/css-transforms/transform3d-scale-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-003.html rename to tests/wpt/tests/css/css-transforms/transform3d-scale-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-004.html b/tests/wpt/tests/css/css-transforms/transform3d-scale-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-004.html rename to tests/wpt/tests/css/css-transforms/transform3d-scale-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-005-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-scale-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-005-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-scale-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-005.html b/tests/wpt/tests/css/css-transforms/transform3d-scale-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-005.html rename to tests/wpt/tests/css/css-transforms/transform3d-scale-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-006.html b/tests/wpt/tests/css/css-transforms/transform3d-scale-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-006.html rename to tests/wpt/tests/css/css-transforms/transform3d-scale-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-007-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-scale-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-007-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-scale-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-007.html b/tests/wpt/tests/css/css-transforms/transform3d-scale-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-scale-007.html rename to tests/wpt/tests/css/css-transforms/transform3d-scale-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-sorting-001.html b/tests/wpt/tests/css/css-transforms/transform3d-sorting-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-sorting-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-sorting-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-sorting-002.html b/tests/wpt/tests/css/css-transforms/transform3d-sorting-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-sorting-002.html rename to tests/wpt/tests/css/css-transforms/transform3d-sorting-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-sorting-003.html b/tests/wpt/tests/css/css-transforms/transform3d-sorting-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-sorting-003.html rename to tests/wpt/tests/css/css-transforms/transform3d-sorting-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-sorting-004.html b/tests/wpt/tests/css/css-transforms/transform3d-sorting-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-sorting-004.html rename to tests/wpt/tests/css/css-transforms/transform3d-sorting-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-sorting-005.html b/tests/wpt/tests/css/css-transforms/transform3d-sorting-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-sorting-005.html rename to tests/wpt/tests/css/css-transforms/transform3d-sorting-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-sorting-006-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-sorting-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-sorting-006-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-sorting-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-sorting-006.html b/tests/wpt/tests/css/css-transforms/transform3d-sorting-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-sorting-006.html rename to tests/wpt/tests/css/css-transforms/transform3d-sorting-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-translate3d-001.html b/tests/wpt/tests/css/css-transforms/transform3d-translate3d-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-translate3d-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-translate3d-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-translate3d-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-translate3d-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-translate3d-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-translate3d-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-translatez-001.html b/tests/wpt/tests/css/css-transforms/transform3d-translatez-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-translatez-001.html rename to tests/wpt/tests/css/css-transforms/transform3d-translatez-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-translatez-notref.html b/tests/wpt/tests/css/css-transforms/transform3d-translatez-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-translatez-notref.html rename to tests/wpt/tests/css/css-transforms/transform3d-translatez-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform3d-translatez-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-translatez-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform3d-translatez-ref.html rename to tests/wpt/tests/css/css-transforms/transform3d-translatez-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform_translate.html b/tests/wpt/tests/css/css-transforms/transform_translate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform_translate.html rename to tests/wpt/tests/css/css-transforms/transform_translate.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform_translate_invalid.html b/tests/wpt/tests/css/css-transforms/transform_translate_invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform_translate_invalid.html rename to tests/wpt/tests/css/css-transforms/transform_translate_invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform_translate_max.html b/tests/wpt/tests/css/css-transforms/transform_translate_max.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform_translate_max.html rename to tests/wpt/tests/css/css-transforms/transform_translate_max.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform_translate_min.html b/tests/wpt/tests/css/css-transforms/transform_translate_min.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform_translate_min.html rename to tests/wpt/tests/css/css-transforms/transform_translate_min.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform_translate_neg.html b/tests/wpt/tests/css/css-transforms/transform_translate_neg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform_translate_neg.html rename to tests/wpt/tests/css/css-transforms/transform_translate_neg.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform_translate_second_omited.html b/tests/wpt/tests/css/css-transforms/transform_translate_second_omited.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform_translate_second_omited.html rename to tests/wpt/tests/css/css-transforms/transform_translate_second_omited.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transform_translate_zero.html b/tests/wpt/tests/css/css-transforms/transform_translate_zero.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transform_translate_zero.html rename to tests/wpt/tests/css/css-transforms/transform_translate_zero.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transformed-preserve-3d-1.html b/tests/wpt/tests/css/css-transforms/transformed-preserve-3d-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transformed-preserve-3d-1.html rename to tests/wpt/tests/css/css-transforms/transformed-preserve-3d-1.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transformed-rotateX-3.html b/tests/wpt/tests/css/css-transforms/transformed-rotateX-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transformed-rotateX-3.html rename to tests/wpt/tests/css/css-transforms/transformed-rotateX-3.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transformed-rotateY-1.html b/tests/wpt/tests/css/css-transforms/transformed-rotateY-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transformed-rotateY-1.html rename to tests/wpt/tests/css/css-transforms/transformed-rotateY-1.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transforms-rotate-degree-45.html b/tests/wpt/tests/css/css-transforms/transforms-rotate-degree-45.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transforms-rotate-degree-45.html rename to tests/wpt/tests/css/css-transforms/transforms-rotate-degree-45.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transforms-rotate-degree-90.html b/tests/wpt/tests/css/css-transforms/transforms-rotate-degree-90.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transforms-rotate-degree-90.html rename to tests/wpt/tests/css/css-transforms/transforms-rotate-degree-90.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transforms-rotate-translate-scale.html b/tests/wpt/tests/css/css-transforms/transforms-rotate-translate-scale.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transforms-rotate-translate-scale.html rename to tests/wpt/tests/css/css-transforms/transforms-rotate-translate-scale.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transforms-rotateY-degree-60.html b/tests/wpt/tests/css/css-transforms/transforms-rotateY-degree-60.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transforms-rotateY-degree-60.html rename to tests/wpt/tests/css/css-transforms/transforms-rotateY-degree-60.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transforms-skewX.html b/tests/wpt/tests/css/css-transforms/transforms-skewX.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transforms-skewX.html rename to tests/wpt/tests/css/css-transforms/transforms-skewX.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transforms-skewY.html b/tests/wpt/tests/css/css-transforms/transforms-skewY.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transforms-skewY.html rename to tests/wpt/tests/css/css-transforms/transforms-skewY.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transforms-support-calc.html b/tests/wpt/tests/css/css-transforms/transforms-support-calc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/transforms-support-calc.html rename to tests/wpt/tests/css/css-transforms/transforms-support-calc.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate-getComputedStyle.html b/tests/wpt/tests/css/css-transforms/translate-getComputedStyle.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate-getComputedStyle.html rename to tests/wpt/tests/css/css-transforms/translate-getComputedStyle.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate-optional-second-001.html b/tests/wpt/tests/css/css-transforms/translate-optional-second-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate-optional-second-001.html rename to tests/wpt/tests/css/css-transforms/translate-optional-second-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate-ref.html b/tests/wpt/tests/css/css-transforms/translate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate-ref.html rename to tests/wpt/tests/css/css-transforms/translate-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate.html b/tests/wpt/tests/css/css-transforms/translate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate.html rename to tests/wpt/tests/css/css-transforms/translate.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/svg-translate-abs-unit-combinations-ref.html b/tests/wpt/tests/css/css-transforms/translate/reference/svg-translate-abs-unit-combinations-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/reference/svg-translate-abs-unit-combinations-ref.html rename to tests/wpt/tests/css/css-transforms/translate/reference/svg-translate-abs-unit-combinations-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/svg-translate-ex-unit-ref.html b/tests/wpt/tests/css/css-transforms/translate/reference/svg-translate-ex-unit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/reference/svg-translate-ex-unit-ref.html rename to tests/wpt/tests/css/css-transforms/translate/reference/svg-translate-ex-unit-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/svg-translate-multiple-ref.html b/tests/wpt/tests/css/css-transforms/translate/reference/svg-translate-multiple-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/reference/svg-translate-multiple-ref.html rename to tests/wpt/tests/css/css-transforms/translate/reference/svg-translate-multiple-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/svg-translate-multiple-relative-ref.html b/tests/wpt/tests/css/css-transforms/translate/reference/svg-translate-multiple-relative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/reference/svg-translate-multiple-relative-ref.html rename to tests/wpt/tests/css/css-transforms/translate/reference/svg-translate-multiple-relative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/svg-translate-ref.html b/tests/wpt/tests/css/css-transforms/translate/reference/svg-translate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/reference/svg-translate-ref.html rename to tests/wpt/tests/css/css-transforms/translate/reference/svg-translate-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/svg-translate-relative-ref.html b/tests/wpt/tests/css/css-transforms/translate/reference/svg-translate-relative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/reference/svg-translate-relative-ref.html rename to tests/wpt/tests/css/css-transforms/translate/reference/svg-translate-relative-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-and-transform-attribute-in-svg-ref.html b/tests/wpt/tests/css/css-transforms/translate/reference/translate-and-transform-attribute-in-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-and-transform-attribute-in-svg-ref.html rename to tests/wpt/tests/css/css-transforms/translate/reference/translate-and-transform-attribute-in-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-and-transform-css-property-in-svg-ref.html b/tests/wpt/tests/css/css-transforms/translate/reference/translate-and-transform-css-property-in-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-and-transform-css-property-in-svg-ref.html rename to tests/wpt/tests/css/css-transforms/translate/reference/translate-and-transform-css-property-in-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-in-svg-ref.html b/tests/wpt/tests/css/css-transforms/translate/reference/translate-in-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/reference/translate-in-svg-ref.html rename to tests/wpt/tests/css/css-transforms/translate/reference/translate-in-svg-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-001.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-001.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-009.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-009.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-009.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-017.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-017.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-017.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-025.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-025.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-025.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-033.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-033.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-033.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-041.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-041.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-041.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-049.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-049.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-049.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-050.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-050.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-050.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-051.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-051.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-051.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-052.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-052.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-052.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-053.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-053.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-053.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-053.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-054.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-054.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-054.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-054.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-055.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-055.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-055.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-055.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-multiple-001.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-multiple-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-multiple-001.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-multiple-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-multiple-002.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-multiple-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-multiple-002.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-multiple-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-with-units.html b/tests/wpt/tests/css/css-transforms/translate/svg-translate-with-units.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/svg-translate-with-units.html rename to tests/wpt/tests/css/css-transforms/translate/svg-translate-with-units.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/translate-and-transform-attribute-in-svg.html b/tests/wpt/tests/css/css-transforms/translate/translate-and-transform-attribute-in-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/translate-and-transform-attribute-in-svg.html rename to tests/wpt/tests/css/css-transforms/translate/translate-and-transform-attribute-in-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/translate-and-transform-css-property-in-svg.html b/tests/wpt/tests/css/css-transforms/translate/translate-and-transform-css-property-in-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/translate-and-transform-css-property-in-svg.html rename to tests/wpt/tests/css/css-transforms/translate/translate-and-transform-css-property-in-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/translate/translate-in-svg.html b/tests/wpt/tests/css/css-transforms/translate/translate-in-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/translate/translate-in-svg.html rename to tests/wpt/tests/css/css-transforms/translate/translate-in-svg.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/ttwf-css-3d-polygon-cycle-mismatch.html b/tests/wpt/tests/css/css-transforms/ttwf-css-3d-polygon-cycle-mismatch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/ttwf-css-3d-polygon-cycle-mismatch.html rename to tests/wpt/tests/css/css-transforms/ttwf-css-3d-polygon-cycle-mismatch.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/ttwf-css-3d-polygon-cycle.html b/tests/wpt/tests/css/css-transforms/ttwf-css-3d-polygon-cycle.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/ttwf-css-3d-polygon-cycle.html rename to tests/wpt/tests/css/css-transforms/ttwf-css-3d-polygon-cycle.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/ttwf-reftest-rotate.html b/tests/wpt/tests/css/css-transforms/ttwf-reftest-rotate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/ttwf-reftest-rotate.html rename to tests/wpt/tests/css/css-transforms/ttwf-reftest-rotate.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/ttwf-transform-skewx-001.html b/tests/wpt/tests/css/css-transforms/ttwf-transform-skewx-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/ttwf-transform-skewx-001.html rename to tests/wpt/tests/css/css-transforms/ttwf-transform-skewx-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/ttwf-transform-skewy-001.html b/tests/wpt/tests/css/css-transforms/ttwf-transform-skewy-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/ttwf-transform-skewy-001.html rename to tests/wpt/tests/css/css-transforms/ttwf-transform-skewy-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/ttwf-transform-translatex-001.html b/tests/wpt/tests/css/css-transforms/ttwf-transform-translatex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/ttwf-transform-translatex-001.html rename to tests/wpt/tests/css/css-transforms/ttwf-transform-translatex-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/ttwf-transform-translatey-001.html b/tests/wpt/tests/css/css-transforms/ttwf-transform-translatey-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/ttwf-transform-translatey-001.html rename to tests/wpt/tests/css/css-transforms/ttwf-transform-translatey-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/z-index-does-not-apply-ref.html b/tests/wpt/tests/css/css-transforms/z-index-does-not-apply-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/z-index-does-not-apply-ref.html rename to tests/wpt/tests/css/css-transforms/z-index-does-not-apply-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transforms/z-index-does-not-apply.html b/tests/wpt/tests/css/css-transforms/z-index-does-not-apply.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transforms/z-index-does-not-apply.html rename to tests/wpt/tests/css/css-transforms/z-index-does-not-apply.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/AnimationEffect-getComputedTiming.tentative.html b/tests/wpt/tests/css/css-transitions/AnimationEffect-getComputedTiming.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/AnimationEffect-getComputedTiming.tentative.html rename to tests/wpt/tests/css/css-transitions/AnimationEffect-getComputedTiming.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-canceling.tentative.html b/tests/wpt/tests/css/css-transitions/CSSTransition-canceling.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-canceling.tentative.html rename to tests/wpt/tests/css/css-transitions/CSSTransition-canceling.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-currentTime.tentative.html b/tests/wpt/tests/css/css-transitions/CSSTransition-currentTime.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-currentTime.tentative.html rename to tests/wpt/tests/css/css-transitions/CSSTransition-currentTime.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-effect.tentative.html b/tests/wpt/tests/css/css-transitions/CSSTransition-effect.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-effect.tentative.html rename to tests/wpt/tests/css/css-transitions/CSSTransition-effect.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-finished.tentative.html b/tests/wpt/tests/css/css-transitions/CSSTransition-finished.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-finished.tentative.html rename to tests/wpt/tests/css/css-transitions/CSSTransition-finished.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-ready.tentative.html b/tests/wpt/tests/css/css-transitions/CSSTransition-ready.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-ready.tentative.html rename to tests/wpt/tests/css/css-transitions/CSSTransition-ready.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-startTime.tentative.html b/tests/wpt/tests/css/css-transitions/CSSTransition-startTime.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-startTime.tentative.html rename to tests/wpt/tests/css/css-transitions/CSSTransition-startTime.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-transitionProperty.tentative.html b/tests/wpt/tests/css/css-transitions/CSSTransition-transitionProperty.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-transitionProperty.tentative.html rename to tests/wpt/tests/css/css-transitions/CSSTransition-transitionProperty.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/Document-getAnimations.tentative.html b/tests/wpt/tests/css/css-transitions/Document-getAnimations.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/Document-getAnimations.tentative.html rename to tests/wpt/tests/css/css-transitions/Document-getAnimations.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/Element-getAnimations.tentative.html b/tests/wpt/tests/css/css-transitions/Element-getAnimations.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/Element-getAnimations.tentative.html rename to tests/wpt/tests/css/css-transitions/Element-getAnimations.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/KeyframeEffect-getKeyframes-width-and-height-transition.tentative.html b/tests/wpt/tests/css/css-transitions/KeyframeEffect-getKeyframes-width-and-height-transition.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/KeyframeEffect-getKeyframes-width-and-height-transition.tentative.html rename to tests/wpt/tests/css/css-transitions/KeyframeEffect-getKeyframes-width-and-height-transition.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/KeyframeEffect-getKeyframes.tentative.html b/tests/wpt/tests/css/css-transitions/KeyframeEffect-getKeyframes.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/KeyframeEffect-getKeyframes.tentative.html rename to tests/wpt/tests/css/css-transitions/KeyframeEffect-getKeyframes.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/KeyframeEffect-setKeyframes.tentative.html b/tests/wpt/tests/css/css-transitions/KeyframeEffect-setKeyframes.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/KeyframeEffect-setKeyframes.tentative.html rename to tests/wpt/tests/css/css-transitions/KeyframeEffect-setKeyframes.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/KeyframeEffect-target.tentative.html b/tests/wpt/tests/css/css-transitions/KeyframeEffect-target.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/KeyframeEffect-target.tentative.html rename to tests/wpt/tests/css/css-transitions/KeyframeEffect-target.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/META.yml b/tests/wpt/tests/css/css-transitions/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/META.yml rename to tests/wpt/tests/css/css-transitions/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-transitions/README.md b/tests/wpt/tests/css/css-transitions/README.md similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/README.md rename to tests/wpt/tests/css/css-transitions/README.md diff --git a/tests/wpt/web-platform-tests/css/css-transitions/all-with-discrete.tentative.html b/tests/wpt/tests/css/css-transitions/all-with-discrete.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/all-with-discrete.tentative.html rename to tests/wpt/tests/css/css-transitions/all-with-discrete.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/animations/change-duration-during-transition.html b/tests/wpt/tests/css/css-transitions/animations/change-duration-during-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/animations/change-duration-during-transition.html rename to tests/wpt/tests/css/css-transitions/animations/change-duration-during-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/animations/color-transition-premultiplied.html b/tests/wpt/tests/css/css-transitions/animations/color-transition-premultiplied.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/animations/color-transition-premultiplied.html rename to tests/wpt/tests/css/css-transitions/animations/color-transition-premultiplied.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/animations/move-after-transition.html b/tests/wpt/tests/css/css-transitions/animations/move-after-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/animations/move-after-transition.html rename to tests/wpt/tests/css/css-transitions/animations/move-after-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/animations/text-shadow-composition.html b/tests/wpt/tests/css/css-transitions/animations/text-shadow-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/animations/text-shadow-composition.html rename to tests/wpt/tests/css/css-transitions/animations/text-shadow-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/animations/text-shadow-interpolation.html b/tests/wpt/tests/css/css-transitions/animations/text-shadow-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/animations/text-shadow-interpolation.html rename to tests/wpt/tests/css/css-transitions/animations/text-shadow-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/animations/transition-end-event-shorthands.html b/tests/wpt/tests/css/css-transitions/animations/transition-end-event-shorthands.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/animations/transition-end-event-shorthands.html rename to tests/wpt/tests/css/css-transitions/animations/transition-end-event-shorthands.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/animations/transition-timing-function.html b/tests/wpt/tests/css/css-transitions/animations/transition-timing-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/animations/transition-timing-function.html rename to tests/wpt/tests/css/css-transitions/animations/transition-timing-function.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/animations/vertical-align-composition.html b/tests/wpt/tests/css/css-transitions/animations/vertical-align-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/animations/vertical-align-composition.html rename to tests/wpt/tests/css/css-transitions/animations/vertical-align-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/animations/vertical-align-interpolation.html b/tests/wpt/tests/css/css-transitions/animations/vertical-align-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/animations/vertical-align-interpolation.html rename to tests/wpt/tests/css/css-transitions/animations/vertical-align-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/animations/z-index-interpolation.html b/tests/wpt/tests/css/css-transitions/animations/z-index-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/animations/z-index-interpolation.html rename to tests/wpt/tests/css/css-transitions/animations/z-index-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/before-load-001.html b/tests/wpt/tests/css/css-transitions/before-load-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/before-load-001.html rename to tests/wpt/tests/css/css-transitions/before-load-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/changing-while-transition-001.html b/tests/wpt/tests/css/css-transitions/changing-while-transition-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/changing-while-transition-001.html rename to tests/wpt/tests/css/css-transitions/changing-while-transition-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/changing-while-transition-002.html b/tests/wpt/tests/css/css-transitions/changing-while-transition-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/changing-while-transition-002.html rename to tests/wpt/tests/css/css-transitions/changing-while-transition-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/changing-while-transition-003.html b/tests/wpt/tests/css/css-transitions/changing-while-transition-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/changing-while-transition-003.html rename to tests/wpt/tests/css/css-transitions/changing-while-transition-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/changing-while-transition-004.html b/tests/wpt/tests/css/css-transitions/changing-while-transition-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/changing-while-transition-004.html rename to tests/wpt/tests/css/css-transitions/changing-while-transition-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/crashtests/transition-during-style-attr-mutation.html b/tests/wpt/tests/css/css-transitions/crashtests/transition-during-style-attr-mutation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/crashtests/transition-during-style-attr-mutation.html rename to tests/wpt/tests/css/css-transitions/crashtests/transition-during-style-attr-mutation.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/crashtests/transition-large-word-spacing-001.html b/tests/wpt/tests/css/css-transitions/crashtests/transition-large-word-spacing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/crashtests/transition-large-word-spacing-001.html rename to tests/wpt/tests/css/css-transitions/crashtests/transition-large-word-spacing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/currentcolor-animation-001.html b/tests/wpt/tests/css/css-transitions/currentcolor-animation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/currentcolor-animation-001.html rename to tests/wpt/tests/css/css-transitions/currentcolor-animation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/disconnected-element-001.html b/tests/wpt/tests/css/css-transitions/disconnected-element-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/disconnected-element-001.html rename to tests/wpt/tests/css/css-transitions/disconnected-element-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/display-none-no-animations.html b/tests/wpt/tests/css/css-transitions/display-none-no-animations.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/display-none-no-animations.html rename to tests/wpt/tests/css/css-transitions/display-none-no-animations.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/dynamic-root-element.html b/tests/wpt/tests/css/css-transitions/dynamic-root-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/dynamic-root-element.html rename to tests/wpt/tests/css/css-transitions/dynamic-root-element.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/event-dispatch.tentative.html b/tests/wpt/tests/css/css-transitions/event-dispatch.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/event-dispatch.tentative.html rename to tests/wpt/tests/css/css-transitions/event-dispatch.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/events-001.html b/tests/wpt/tests/css/css-transitions/events-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/events-001.html rename to tests/wpt/tests/css/css-transitions/events-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/events-002.html b/tests/wpt/tests/css/css-transitions/events-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/events-002.html rename to tests/wpt/tests/css/css-transitions/events-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/events-003.html b/tests/wpt/tests/css/css-transitions/events-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/events-003.html rename to tests/wpt/tests/css/css-transitions/events-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/events-004.html b/tests/wpt/tests/css/css-transitions/events-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/events-004.html rename to tests/wpt/tests/css/css-transitions/events-004.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/events-005.html b/tests/wpt/tests/css/css-transitions/events-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/events-005.html rename to tests/wpt/tests/css/css-transitions/events-005.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/events-006.html b/tests/wpt/tests/css/css-transitions/events-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/events-006.html rename to tests/wpt/tests/css/css-transitions/events-006.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/events-007.html b/tests/wpt/tests/css/css-transitions/events-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/events-007.html rename to tests/wpt/tests/css/css-transitions/events-007.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/historical.html b/tests/wpt/tests/css/css-transitions/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/historical.html rename to tests/wpt/tests/css/css-transitions/historical.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/idlharness.html b/tests/wpt/tests/css/css-transitions/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/idlharness.html rename to tests/wpt/tests/css/css-transitions/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/inert-while-transitioning-to-display-none.html b/tests/wpt/tests/css/css-transitions/inert-while-transitioning-to-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/inert-while-transitioning-to-display-none.html rename to tests/wpt/tests/css/css-transitions/inert-while-transitioning-to-display-none.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/infinite-duration-crash.html b/tests/wpt/tests/css/css-transitions/infinite-duration-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/infinite-duration-crash.html rename to tests/wpt/tests/css/css-transitions/infinite-duration-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/inherit-background-color-transition-ref.html b/tests/wpt/tests/css/css-transitions/inherit-background-color-transition-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/inherit-background-color-transition-ref.html rename to tests/wpt/tests/css/css-transitions/inherit-background-color-transition-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/inherit-background-color-transition.html b/tests/wpt/tests/css/css-transitions/inherit-background-color-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/inherit-background-color-transition.html rename to tests/wpt/tests/css/css-transitions/inherit-background-color-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/inherit-height-transition.html b/tests/wpt/tests/css/css-transitions/inherit-height-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/inherit-height-transition.html rename to tests/wpt/tests/css/css-transitions/inherit-height-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/inheritance.html b/tests/wpt/tests/css/css-transitions/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/inheritance.html rename to tests/wpt/tests/css/css-transitions/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/non-rendered-element-001.html b/tests/wpt/tests/css/css-transitions/non-rendered-element-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/non-rendered-element-001.html rename to tests/wpt/tests/css/css-transitions/non-rendered-element-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/non-rendered-element-002.html b/tests/wpt/tests/css/css-transitions/non-rendered-element-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/non-rendered-element-002.html rename to tests/wpt/tests/css/css-transitions/non-rendered-element-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/non-rendered-element-004.tentative.html b/tests/wpt/tests/css/css-transitions/non-rendered-element-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/non-rendered-element-004.tentative.html rename to tests/wpt/tests/css/css-transitions/non-rendered-element-004.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-computed.html b/tests/wpt/tests/css/css-transitions/parsing/transition-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-computed.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-delay-computed.html b/tests/wpt/tests/css/css-transitions/parsing/transition-delay-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-delay-computed.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-delay-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-delay-invalid.html b/tests/wpt/tests/css/css-transitions/parsing/transition-delay-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-delay-invalid.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-delay-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-delay-valid.html b/tests/wpt/tests/css/css-transitions/parsing/transition-delay-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-delay-valid.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-delay-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-duration-computed.html b/tests/wpt/tests/css/css-transitions/parsing/transition-duration-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-duration-computed.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-duration-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-duration-invalid.html b/tests/wpt/tests/css/css-transitions/parsing/transition-duration-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-duration-invalid.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-duration-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-duration-valid.html b/tests/wpt/tests/css/css-transitions/parsing/transition-duration-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-duration-valid.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-duration-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-invalid.html b/tests/wpt/tests/css/css-transitions/parsing/transition-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-invalid.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-property-computed.html b/tests/wpt/tests/css/css-transitions/parsing/transition-property-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-property-computed.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-property-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-property-invalid.html b/tests/wpt/tests/css/css-transitions/parsing/transition-property-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-property-invalid.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-property-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-property-valid.html b/tests/wpt/tests/css/css-transitions/parsing/transition-property-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-property-valid.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-property-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-shorthand.html b/tests/wpt/tests/css/css-transitions/parsing/transition-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-shorthand.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-timing-function-computed.html b/tests/wpt/tests/css/css-transitions/parsing/transition-timing-function-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-timing-function-computed.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-timing-function-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-timing-function-invalid.html b/tests/wpt/tests/css/css-transitions/parsing/transition-timing-function-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-timing-function-invalid.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-timing-function-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-timing-function-valid.html b/tests/wpt/tests/css/css-transitions/parsing/transition-timing-function-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-timing-function-valid.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-timing-function-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-valid.html b/tests/wpt/tests/css/css-transitions/parsing/transition-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/parsing/transition-valid.html rename to tests/wpt/tests/css/css-transitions/parsing/transition-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/properties-value-001.html b/tests/wpt/tests/css/css-transitions/properties-value-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/properties-value-001.html rename to tests/wpt/tests/css/css-transitions/properties-value-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/properties-value-002.html b/tests/wpt/tests/css/css-transitions/properties-value-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/properties-value-002.html rename to tests/wpt/tests/css/css-transitions/properties-value-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/properties-value-003.html b/tests/wpt/tests/css/css-transitions/properties-value-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/properties-value-003.html rename to tests/wpt/tests/css/css-transitions/properties-value-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/properties-value-implicit-001.html b/tests/wpt/tests/css/css-transitions/properties-value-implicit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/properties-value-implicit-001.html rename to tests/wpt/tests/css/css-transitions/properties-value-implicit-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/properties-value-inherit-001.html b/tests/wpt/tests/css/css-transitions/properties-value-inherit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/properties-value-inherit-001.html rename to tests/wpt/tests/css/css-transitions/properties-value-inherit-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/properties-value-inherit-002.html b/tests/wpt/tests/css/css-transitions/properties-value-inherit-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/properties-value-inherit-002.html rename to tests/wpt/tests/css/css-transitions/properties-value-inherit-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/properties-value-inherit-003.html b/tests/wpt/tests/css/css-transitions/properties-value-inherit-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/properties-value-inherit-003.html rename to tests/wpt/tests/css/css-transitions/properties-value-inherit-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/pseudo-elements-001.html b/tests/wpt/tests/css/css-transitions/pseudo-elements-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/pseudo-elements-001.html rename to tests/wpt/tests/css/css-transitions/pseudo-elements-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/pseudo-elements-002.html b/tests/wpt/tests/css/css-transitions/pseudo-elements-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/pseudo-elements-002.html rename to tests/wpt/tests/css/css-transitions/pseudo-elements-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/reference/transition-test-ref.html b/tests/wpt/tests/css/css-transitions/reference/transition-test-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/reference/transition-test-ref.html rename to tests/wpt/tests/css/css-transitions/reference/transition-test-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/render-blocking/no-transition-from-ua-to-blocking-stylesheet-ref.html b/tests/wpt/tests/css/css-transitions/render-blocking/no-transition-from-ua-to-blocking-stylesheet-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/render-blocking/no-transition-from-ua-to-blocking-stylesheet-ref.html rename to tests/wpt/tests/css/css-transitions/render-blocking/no-transition-from-ua-to-blocking-stylesheet-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/render-blocking/no-transition-from-ua-to-blocking-stylesheet.html b/tests/wpt/tests/css/css-transitions/render-blocking/no-transition-from-ua-to-blocking-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/render-blocking/no-transition-from-ua-to-blocking-stylesheet.html rename to tests/wpt/tests/css/css-transitions/render-blocking/no-transition-from-ua-to-blocking-stylesheet.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/retargetted-transition-with-box-sizing.html b/tests/wpt/tests/css/css-transitions/retargetted-transition-with-box-sizing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/retargetted-transition-with-box-sizing.html rename to tests/wpt/tests/css/css-transitions/retargetted-transition-with-box-sizing.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/root-color-transition-ref.html b/tests/wpt/tests/css/css-transitions/root-color-transition-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/root-color-transition-ref.html rename to tests/wpt/tests/css/css-transitions/root-color-transition-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/root-color-transition.html b/tests/wpt/tests/css/css-transitions/root-color-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/root-color-transition.html rename to tests/wpt/tests/css/css-transitions/root-color-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/starting-of-transitions-001.html b/tests/wpt/tests/css/css-transitions/starting-of-transitions-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/starting-of-transitions-001.html rename to tests/wpt/tests/css/css-transitions/starting-of-transitions-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/starting-style-cascade.html b/tests/wpt/tests/css/css-transitions/starting-style-cascade.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/starting-style-cascade.html rename to tests/wpt/tests/css/css-transitions/starting-style-cascade.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/starting-style-name-defining-rules.html b/tests/wpt/tests/css/css-transitions/starting-style-name-defining-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/starting-style-name-defining-rules.html rename to tests/wpt/tests/css/css-transitions/starting-style-name-defining-rules.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/starting-style-rule-basic.html b/tests/wpt/tests/css/css-transitions/starting-style-rule-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/starting-style-rule-basic.html rename to tests/wpt/tests/css/css-transitions/starting-style-rule-basic.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/starting-style-rule-none.html b/tests/wpt/tests/css/css-transitions/starting-style-rule-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/starting-style-rule-none.html rename to tests/wpt/tests/css/css-transitions/starting-style-rule-none.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/starting-style-rule-pseudo-elements.html b/tests/wpt/tests/css/css-transitions/starting-style-rule-pseudo-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/starting-style-rule-pseudo-elements.html rename to tests/wpt/tests/css/css-transitions/starting-style-rule-pseudo-elements.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/starting-style-size-container.html b/tests/wpt/tests/css/css-transitions/starting-style-size-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/starting-style-size-container.html rename to tests/wpt/tests/css/css-transitions/starting-style-size-container.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/1x1-green.png b/tests/wpt/tests/css/css-transitions/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/1x1-green.png rename to tests/wpt/tests/css/css-transitions/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/1x1-lime.png b/tests/wpt/tests/css/css-transitions/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/1x1-lime.png rename to tests/wpt/tests/css/css-transitions/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/1x1-maroon.png b/tests/wpt/tests/css/css-transitions/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/1x1-maroon.png rename to tests/wpt/tests/css/css-transitions/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/1x1-navy.png b/tests/wpt/tests/css/css-transitions/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/1x1-navy.png rename to tests/wpt/tests/css/css-transitions/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/1x1-red.png b/tests/wpt/tests/css/css-transitions/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/1x1-red.png rename to tests/wpt/tests/css/css-transitions/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/1x1-white.png b/tests/wpt/tests/css/css-transitions/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/1x1-white.png rename to tests/wpt/tests/css/css-transitions/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/60x60-gg-rr.png b/tests/wpt/tests/css/css-transitions/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/60x60-gg-rr.png rename to tests/wpt/tests/css/css-transitions/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/60x60-green.png b/tests/wpt/tests/css/css-transitions/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/60x60-green.png rename to tests/wpt/tests/css/css-transitions/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/README b/tests/wpt/tests/css/css-transitions/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/README rename to tests/wpt/tests/css/css-transitions/support/README diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/a-green-transition.css b/tests/wpt/tests/css/css-transitions/support/a-green-transition.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/a-green-transition.css rename to tests/wpt/tests/css/css-transitions/support/a-green-transition.css diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/a-green.css b/tests/wpt/tests/css/css-transitions/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/a-green.css rename to tests/wpt/tests/css/css-transitions/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/b-green.css b/tests/wpt/tests/css/css-transitions/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/b-green.css rename to tests/wpt/tests/css/css-transitions/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/c-red.css b/tests/wpt/tests/css/css-transitions/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/c-red.css rename to tests/wpt/tests/css/css-transitions/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/cat.png b/tests/wpt/tests/css/css-transitions/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/cat.png rename to tests/wpt/tests/css/css-transitions/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/generalParallelTest.js b/tests/wpt/tests/css/css-transitions/support/generalParallelTest.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/generalParallelTest.js rename to tests/wpt/tests/css/css-transitions/support/generalParallelTest.js diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/helper.js b/tests/wpt/tests/css/css-transitions/support/helper.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/helper.js rename to tests/wpt/tests/css/css-transitions/support/helper.js diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/import-green.css b/tests/wpt/tests/css/css-transitions/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/import-green.css rename to tests/wpt/tests/css/css-transitions/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/import-red.css b/tests/wpt/tests/css/css-transitions/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/import-red.css rename to tests/wpt/tests/css/css-transitions/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/one.gif b/tests/wpt/tests/css/css-transitions/support/one.gif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/one.gif rename to tests/wpt/tests/css/css-transitions/support/one.gif diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/css-transitions/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/css-transitions/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/css-transitions/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/css-transitions/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/css-transitions/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/css-transitions/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/pattern-tr.png b/tests/wpt/tests/css/css-transitions/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/pattern-tr.png rename to tests/wpt/tests/css/css-transitions/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/properties.js b/tests/wpt/tests/css/css-transitions/support/properties.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/properties.js rename to tests/wpt/tests/css/css-transitions/support/properties.js diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/ruler-h-50%.png b/tests/wpt/tests/css/css-transitions/support/ruler-h-50%.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/ruler-h-50%.png rename to tests/wpt/tests/css/css-transitions/support/ruler-h-50%.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/ruler-h-50px.png b/tests/wpt/tests/css/css-transitions/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/ruler-h-50px.png rename to tests/wpt/tests/css/css-transitions/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/ruler-v-100px.png b/tests/wpt/tests/css/css-transitions/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/ruler-v-100px.png rename to tests/wpt/tests/css/css-transitions/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/ruler-v-50px.png b/tests/wpt/tests/css/css-transitions/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/ruler-v-50px.png rename to tests/wpt/tests/css/css-transitions/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/runParallelAsyncHarness.js b/tests/wpt/tests/css/css-transitions/support/runParallelAsyncHarness.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/runParallelAsyncHarness.js rename to tests/wpt/tests/css/css-transitions/support/runParallelAsyncHarness.js diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/square-purple.png b/tests/wpt/tests/css/css-transitions/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/square-purple.png rename to tests/wpt/tests/css/css-transitions/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/square-teal.png b/tests/wpt/tests/css/css-transitions/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/square-teal.png rename to tests/wpt/tests/css/css-transitions/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/square-white.png b/tests/wpt/tests/css/css-transitions/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/square-white.png rename to tests/wpt/tests/css/css-transitions/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/support/README b/tests/wpt/tests/css/css-transitions/support/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/support/README rename to tests/wpt/tests/css/css-transitions/support/support/README diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/support/swatch-green.png b/tests/wpt/tests/css/css-transitions/support/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/support/swatch-green.png rename to tests/wpt/tests/css/css-transitions/support/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/support/swatch-red.png b/tests/wpt/tests/css/css-transitions/support/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/support/swatch-red.png rename to tests/wpt/tests/css/css-transitions/support/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/swatch-blue.png b/tests/wpt/tests/css/css-transitions/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/swatch-blue.png rename to tests/wpt/tests/css/css-transitions/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/swatch-green.png b/tests/wpt/tests/css/css-transitions/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/swatch-green.png rename to tests/wpt/tests/css/css-transitions/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/swatch-lime.png b/tests/wpt/tests/css/css-transitions/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/swatch-lime.png rename to tests/wpt/tests/css/css-transitions/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/swatch-orange.png b/tests/wpt/tests/css/css-transitions/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/swatch-orange.png rename to tests/wpt/tests/css/css-transitions/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/swatch-red.png b/tests/wpt/tests/css/css-transitions/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/swatch-red.png rename to tests/wpt/tests/css/css-transitions/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/swatch-teal.png b/tests/wpt/tests/css/css-transitions/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/swatch-teal.png rename to tests/wpt/tests/css/css-transitions/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/swatch-white.png b/tests/wpt/tests/css/css-transitions/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/swatch-white.png rename to tests/wpt/tests/css/css-transitions/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/swatch-yellow.png b/tests/wpt/tests/css/css-transitions/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/swatch-yellow.png rename to tests/wpt/tests/css/css-transitions/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/test-bl.png b/tests/wpt/tests/css/css-transitions/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/test-bl.png rename to tests/wpt/tests/css/css-transitions/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/test-br.png b/tests/wpt/tests/css/css-transitions/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/test-br.png rename to tests/wpt/tests/css/css-transitions/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/test-inner-half-size.png b/tests/wpt/tests/css/css-transitions/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/test-inner-half-size.png rename to tests/wpt/tests/css/css-transitions/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/test-outer.png b/tests/wpt/tests/css/css-transitions/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/test-outer.png rename to tests/wpt/tests/css/css-transitions/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/test-tl.png b/tests/wpt/tests/css/css-transitions/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/test-tl.png rename to tests/wpt/tests/css/css-transitions/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/test-tr.png b/tests/wpt/tests/css/css-transitions/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/test-tr.png rename to tests/wpt/tests/css/css-transitions/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/two.gif b/tests/wpt/tests/css/css-transitions/support/two.gif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/two.gif rename to tests/wpt/tests/css/css-transitions/support/two.gif diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/vendorPrefix.js b/tests/wpt/tests/css/css-transitions/support/vendorPrefix.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/support/vendorPrefix.js rename to tests/wpt/tests/css/css-transitions/support/vendorPrefix.js diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-001.html b/tests/wpt/tests/css/css-transitions/transition-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-001.html rename to tests/wpt/tests/css/css-transitions/transition-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-after-animation-001.html b/tests/wpt/tests/css/css-transitions/transition-after-animation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-after-animation-001.html rename to tests/wpt/tests/css/css-transitions/transition-after-animation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-background-position-with-edge-offset.html b/tests/wpt/tests/css/css-transitions/transition-background-position-with-edge-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-background-position-with-edge-offset.html rename to tests/wpt/tests/css/css-transitions/transition-background-position-with-edge-offset.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-base-response-001.html b/tests/wpt/tests/css/css-transitions/transition-base-response-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-base-response-001.html rename to tests/wpt/tests/css/css-transitions/transition-base-response-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-base-response-002.html b/tests/wpt/tests/css/css-transitions/transition-base-response-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-base-response-002.html rename to tests/wpt/tests/css/css-transitions/transition-base-response-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-base-response-003.html b/tests/wpt/tests/css/css-transitions/transition-base-response-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-base-response-003.html rename to tests/wpt/tests/css/css-transitions/transition-base-response-003.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-delay-000-manual.html b/tests/wpt/tests/css/css-transitions/transition-delay-000-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-delay-000-manual.html rename to tests/wpt/tests/css/css-transitions/transition-delay-000-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-delay-001.html b/tests/wpt/tests/css/css-transitions/transition-delay-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-delay-001.html rename to tests/wpt/tests/css/css-transitions/transition-delay-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-delay-002-manual.html b/tests/wpt/tests/css/css-transitions/transition-delay-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-delay-002-manual.html rename to tests/wpt/tests/css/css-transitions/transition-delay-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-delay-003-manual.html b/tests/wpt/tests/css/css-transitions/transition-delay-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-delay-003-manual.html rename to tests/wpt/tests/css/css-transitions/transition-delay-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-duration-001.html b/tests/wpt/tests/css/css-transitions/transition-duration-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-duration-001.html rename to tests/wpt/tests/css/css-transitions/transition-duration-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-duration-002-manual.html b/tests/wpt/tests/css/css-transitions/transition-duration-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-duration-002-manual.html rename to tests/wpt/tests/css/css-transitions/transition-duration-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-duration-003-manual.html b/tests/wpt/tests/css/css-transitions/transition-duration-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-duration-003-manual.html rename to tests/wpt/tests/css/css-transitions/transition-duration-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-duration-004-manual.html b/tests/wpt/tests/css/css-transitions/transition-duration-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-duration-004-manual.html rename to tests/wpt/tests/css/css-transitions/transition-duration-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-duration-shorthand.html b/tests/wpt/tests/css/css-transitions/transition-duration-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-duration-shorthand.html rename to tests/wpt/tests/css/css-transitions/transition-duration-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-events-with-document-change.html b/tests/wpt/tests/css/css-transitions/transition-events-with-document-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-events-with-document-change.html rename to tests/wpt/tests/css/css-transitions/transition-events-with-document-change.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-important.html b/tests/wpt/tests/css/css-transitions/transition-important.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-important.html rename to tests/wpt/tests/css/css-transitions/transition-important.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-001.html b/tests/wpt/tests/css/css-transitions/transition-property-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-001.html rename to tests/wpt/tests/css/css-transitions/transition-property-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-002.html b/tests/wpt/tests/css/css-transitions/transition-property-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-002.html rename to tests/wpt/tests/css/css-transitions/transition-property-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-003-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-003-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-004-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-004-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-005-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-005-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-005-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-006-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-006-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-006-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-007-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-007-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-007-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-007-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-008-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-008-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-008-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-008-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-009-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-009-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-009-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-009-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-010-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-010-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-010-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-010-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-011-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-011-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-011-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-011-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-012-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-012-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-012-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-012-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-013-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-013-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-013-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-013-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-014-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-014-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-014-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-014-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-015-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-015-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-015-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-015-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-016-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-016-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-016-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-016-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-017-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-017-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-017-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-017-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-018-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-018-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-018-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-018-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-019-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-019-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-019-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-019-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-020-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-020-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-020-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-020-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-021-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-021-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-021-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-021-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-022-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-022-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-022-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-022-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-023-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-023-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-023-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-023-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-024-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-024-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-024-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-024-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-025-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-025-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-025-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-025-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-026-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-026-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-026-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-026-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-027-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-027-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-027-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-027-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-028-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-028-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-028-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-028-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-029-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-029-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-029-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-029-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-030-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-030-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-030-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-030-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-031-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-031-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-031-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-031-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-032-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-032-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-032-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-032-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-033-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-033-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-033-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-033-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-034-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-034-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-034-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-034-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-035-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-035-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-035-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-035-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-036-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-036-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-036-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-036-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-037-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-037-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-037-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-037-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-038-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-038-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-038-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-038-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-039-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-039-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-039-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-039-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-040-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-040-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-040-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-040-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-041-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-041-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-041-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-041-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-042-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-042-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-042-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-042-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-043-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-043-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-043-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-043-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-044-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-044-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-044-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-044-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-property-045-manual.html b/tests/wpt/tests/css/css-transitions/transition-property-045-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-property-045-manual.html rename to tests/wpt/tests/css/css-transitions/transition-property-045-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-reparented.html b/tests/wpt/tests/css/css-transitions/transition-reparented.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-reparented.html rename to tests/wpt/tests/css/css-transitions/transition-reparented.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-test.html b/tests/wpt/tests/css/css-transitions/transition-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-test.html rename to tests/wpt/tests/css/css-transitions/transition-test.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-timing-function-002-manual.html b/tests/wpt/tests/css/css-transitions/transition-timing-function-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-timing-function-002-manual.html rename to tests/wpt/tests/css/css-transitions/transition-timing-function-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-timing-function-003-manual.html b/tests/wpt/tests/css/css-transitions/transition-timing-function-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-timing-function-003-manual.html rename to tests/wpt/tests/css/css-transitions/transition-timing-function-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-timing-function-004-manual.html b/tests/wpt/tests/css/css-transitions/transition-timing-function-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-timing-function-004-manual.html rename to tests/wpt/tests/css/css-transitions/transition-timing-function-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-timing-function-005-manual.html b/tests/wpt/tests/css/css-transitions/transition-timing-function-005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-timing-function-005-manual.html rename to tests/wpt/tests/css/css-transitions/transition-timing-function-005-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-timing-function-006-manual.html b/tests/wpt/tests/css/css-transitions/transition-timing-function-006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-timing-function-006-manual.html rename to tests/wpt/tests/css/css-transitions/transition-timing-function-006-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-timing-function-010-manual.html b/tests/wpt/tests/css/css-transitions/transition-timing-function-010-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transition-timing-function-010-manual.html rename to tests/wpt/tests/css/css-transitions/transition-timing-function-010-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transitioncancel-001.html b/tests/wpt/tests/css/css-transitions/transitioncancel-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transitioncancel-001.html rename to tests/wpt/tests/css/css-transitions/transitioncancel-001.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transitioncancel-002.html b/tests/wpt/tests/css/css-transitions/transitioncancel-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transitioncancel-002.html rename to tests/wpt/tests/css/css-transitions/transitioncancel-002.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transitionevent-interface.html b/tests/wpt/tests/css/css-transitions/transitionevent-interface.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/transitionevent-interface.html rename to tests/wpt/tests/css/css-transitions/transitionevent-interface.html diff --git a/tests/wpt/web-platform-tests/css/css-transitions/zero-duration-multiple-transition.html b/tests/wpt/tests/css/css-transitions/zero-duration-multiple-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-transitions/zero-duration-multiple-transition.html rename to tests/wpt/tests/css/css-transitions/zero-duration-multiple-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable.html b/tests/wpt/tests/css/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable.html rename to tests/wpt/tests/css/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/META.yml b/tests/wpt/tests/css/css-typed-om/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/META.yml rename to tests/wpt/tests/css/css-typed-om/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/declared-styleMap-accepts-inherit.html b/tests/wpt/tests/css/css-typed-om/declared-styleMap-accepts-inherit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/declared-styleMap-accepts-inherit.html rename to tests/wpt/tests/css/css-typed-om/declared-styleMap-accepts-inherit.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/factory-absolute-length.html b/tests/wpt/tests/css/css-typed-om/factory-absolute-length.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/factory-absolute-length.html rename to tests/wpt/tests/css/css-typed-om/factory-absolute-length.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/factory-duration.html b/tests/wpt/tests/css/css-typed-om/factory-duration.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/factory-duration.html rename to tests/wpt/tests/css/css-typed-om/factory-duration.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/factory-frequency.html b/tests/wpt/tests/css/css-typed-om/factory-frequency.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/factory-frequency.html rename to tests/wpt/tests/css/css-typed-om/factory-frequency.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/historical.html b/tests/wpt/tests/css/css-typed-om/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/historical.html rename to tests/wpt/tests/css/css-typed-om/historical.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/idlharness.html b/tests/wpt/tests/css/css-typed-om/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/idlharness.html rename to tests/wpt/tests/css/css-typed-om/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/perspective-typed-arithmetic-crash.html b/tests/wpt/tests/css/css-typed-om/perspective-typed-arithmetic-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/perspective-typed-arithmetic-crash.html rename to tests/wpt/tests/css/css-typed-om/perspective-typed-arithmetic-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/resources/testhelper.js b/tests/wpt/tests/css/css-typed-om/resources/testhelper.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/resources/testhelper.js rename to tests/wpt/tests/css/css-typed-om/resources/testhelper.js diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/rotate-by-added-angle-ref.html b/tests/wpt/tests/css/css-typed-om/rotate-by-added-angle-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/rotate-by-added-angle-ref.html rename to tests/wpt/tests/css/css-typed-om/rotate-by-added-angle-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/rotate-by-added-angle.html b/tests/wpt/tests/css/css-typed-om/rotate-by-added-angle.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/rotate-by-added-angle.html rename to tests/wpt/tests/css/css-typed-om/rotate-by-added-angle.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/set-css-wide-in-custom-property-crash.html b/tests/wpt/tests/css/css-typed-om/set-css-wide-in-custom-property-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/set-css-wide-in-custom-property-crash.html rename to tests/wpt/tests/css/css-typed-om/set-css-wide-in-custom-property-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/set-var-reference-thcrash.html b/tests/wpt/tests/css/css-typed-om/set-var-reference-thcrash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/set-var-reference-thcrash.html rename to tests/wpt/tests/css/css-typed-om/set-var-reference-thcrash.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-normalization/normalize-ident.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-normalization/normalize-ident.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-normalization/normalize-ident.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-normalization/normalize-ident.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-normalization/normalize-image.html b/tests/wpt/tests/css/css-typed-om/stylevalue-normalization/normalize-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-normalization/normalize-image.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-normalization/normalize-image.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-normalization/normalize-numeric.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-normalization/normalize-numeric.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-normalization/normalize-numeric.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-normalization/normalize-numeric.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-normalization/normalize-tokens.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-normalization/normalize-tokens.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-normalization/normalize-tokens.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-normalization/normalize-tokens.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-normalization/transformvalue-normalization.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-normalization/transformvalue-normalization.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-normalization/transformvalue-normalization.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-normalization/transformvalue-normalization.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-objects/parse-invalid.html b/tests/wpt/tests/css/css-typed-om/stylevalue-objects/parse-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-objects/parse-invalid.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-objects/parse-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-objects/parse.html b/tests/wpt/tests/css/css-typed-om/stylevalue-objects/parse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-objects/parse.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-objects/parse.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-objects/parseAll-invalid.html b/tests/wpt/tests/css/css-typed-om/stylevalue-objects/parseAll-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-objects/parseAll-invalid.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-objects/parseAll-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-objects/parseAll.html b/tests/wpt/tests/css/css-typed-om/stylevalue-objects/parseAll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-objects/parseAll.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-objects/parseAll.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/crashtests/cssInvertValue-convert-crash.html b/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/crashtests/cssInvertValue-convert-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/crashtests/cssInvertValue-convert-crash.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-serialization/crashtests/cssInvertValue-convert-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/crashtests/cssInvertValue-zero.html b/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/crashtests/cssInvertValue-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/crashtests/cssInvertValue-zero.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-serialization/crashtests/cssInvertValue-zero.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/crashtests/cssTransform-Internal-value.html b/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/crashtests/cssTransform-Internal-value.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/crashtests/cssTransform-Internal-value.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-serialization/crashtests/cssTransform-Internal-value.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssImageValue.html b/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssImageValue.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssImageValue.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssImageValue.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssKeywordValue.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssKeywordValue.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssKeywordValue.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssKeywordValue.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssMathValue.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssMathValue.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssMathValue.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssMathValue.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssStyleValue-cssom.html b/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssStyleValue-cssom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssStyleValue-cssom.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssStyleValue-cssom.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssStyleValue-string.html b/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssStyleValue-string.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssStyleValue-string.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssStyleValue-string.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssTransformValue.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssTransformValue.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssTransformValue.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssTransformValue.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssUnitValue.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssUnitValue.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssUnitValue.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssUnitValue.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssUnparsedValue.html b/tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssUnparsedValue.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-serialization/cssUnparsedValue.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-serialization/cssUnparsedValue.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssColorValue.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssColorValue.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssColorValue.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssColorValue.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssHSL.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssHSL.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssHSL.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssHSL.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssHWB.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssHWB.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssHWB.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssHWB.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-invalid.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-invalid.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-value.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-value.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-value.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue-value.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssKeywordValue.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssLCH.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssLCH.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssLCH.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssLCH.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssLab.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssLab.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssLab.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssLab.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssMatrixComponent.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssMatrixComponent.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssMatrixComponent.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssMatrixComponent.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssOKLCH.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssOKLCH.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssOKLCH.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssOKLCH.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssOKLab.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssOKLab.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssOKLab.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssOKLab.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssPerspective.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssPerspective.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssPerspective.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssPerspective.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssRGB.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssRGB.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssRGB.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssRGB.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssRotate.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssRotate.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssRotate.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssRotate.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssScale.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssScale.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssScale.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssScale.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssSkew.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssSkew.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssSkew.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssSkew.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssSkewX.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssSkewX.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssSkewX.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssSkewX.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssSkewY.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssSkewY.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssSkewY.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssSkewY.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssTransformComponent-2d-flattening.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssTransformComponent-2d-flattening.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssTransformComponent-2d-flattening.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssTransformComponent-2d-flattening.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssTransformComponent-toMatrix-relative-units.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssTransformComponent-toMatrix-relative-units.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssTransformComponent-toMatrix-relative-units.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssTransformComponent-toMatrix-relative-units.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssTransformComponent-toMatrix.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssTransformComponent-toMatrix.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssTransformComponent-toMatrix.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssTransformComponent-toMatrix.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssTransformValue-toMatrix.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssTransformValue-toMatrix.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssTransformValue-toMatrix.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssTransformValue-toMatrix.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssTransformValue.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssTransformValue.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssTransformValue.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssTransformValue.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssTranslate.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssTranslate.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssTranslate.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssTranslate.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-empty.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-empty.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-empty.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-empty.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-indexed-getter-setter.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-indexed-getter-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-indexed-getter-setter.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-indexed-getter-setter.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-iterable.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-iterable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-iterable.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-iterable.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-length.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-length.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-length.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-length.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-invalid.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-invalid.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-variable.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-variable.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/add-two-types.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/add-two-types.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/add-two-types.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/add-two-types.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/arithmetic.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/arithmetic.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/arithmetic.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/arithmetic.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/create-a-type.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/create-a-type.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/create-a-type.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/create-a-type.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssMathInvert-type.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssMathInvert-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssMathInvert-type.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssMathInvert-type.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssMathNegate-type.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssMathNegate-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssMathNegate-type.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssMathNegate-type.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssMathValue.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssMathValue.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssMathValue.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssMathValue.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssUnitValue-value.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssUnitValue-value.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssUnitValue-value.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssUnitValue-value.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssUnitValue.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssUnitValue.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssUnitValue.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssUnitValue.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssnumericvalue-multiply-two-types.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssnumericvalue-multiply-two-types.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssnumericvalue-multiply-two-types.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/cssnumericvalue-multiply-two-types.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/equals.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/equals.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/equals.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/equals.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/numeric-factory.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/numeric-factory.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/numeric-factory.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/numeric-factory.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/parse.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/parse.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/parse.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/parse.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/resources/testhelper.js b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/resources/testhelper.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/resources/testhelper.js rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/resources/testhelper.js diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/to.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/to.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/to.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/to.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/toSum.tentative.html b/tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/toSum.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/toSum.tentative.html rename to tests/wpt/tests/css/css-typed-om/stylevalue-subclasses/numeric-objects/toSum.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/computed.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/computed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/computed.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/computed.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/get-auto-min-size.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/get-auto-min-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/get-auto-min-size.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/get-auto-min-size.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/get-invalid.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/get-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/get-invalid.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/get-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/get-position.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/get-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/get-position.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/get-position.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/get-shorthand.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/get-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/get-shorthand.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/get-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/get.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/get.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/get.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/get.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/getAll-disconnected-element-crash.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/getAll-disconnected-element-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/getAll-disconnected-element-crash.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/getAll-disconnected-element-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/getAll-shorthand.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/getAll-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/getAll-shorthand.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/getAll-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/getAll.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/getAll.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/getAll.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/getAll.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/has.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/has.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/has.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/has.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/iterable.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/iterable.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/computed/iterable.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/computed/iterable.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/append.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/append.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/append.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/append.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/clear.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/clear.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/clear.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/clear.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/declared.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/declared.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/declared.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/declared.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/delete-invalid.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/delete-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/delete-invalid.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/delete-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/delete-shorthand.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/delete-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/delete-shorthand.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/delete-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/delete.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/delete.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/delete.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/delete.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/get-invalid.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/get-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/get-invalid.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/get-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/get-shorthand.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/get-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/get-shorthand.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/get-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/get.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/get.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/get.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/get.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/getAll-shorthand.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/getAll-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/getAll-shorthand.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/getAll-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/getAll.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/getAll.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/getAll.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/getAll.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/has.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/has.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/has.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/has.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/iterable.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/iterable.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/iterable.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/iterable.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/set-shorthand.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/set-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/set-shorthand.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/set-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/set.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/set.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/declared/set.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/declared/set.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/append.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/append.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/append.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/append.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/clear.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/clear.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/clear.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/clear.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/delete-invalid.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/delete-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/delete-invalid.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/delete-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/delete-shorthand.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/delete-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/delete-shorthand.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/delete-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/delete.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/delete.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/delete.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/delete.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/get-invalid.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/get-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/get-invalid.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/get-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/get-shorthand.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/get-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/get-shorthand.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/get-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/get.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/get.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/get.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/get.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/getAll-shorthand.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/getAll-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/getAll-shorthand.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/getAll-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/getAll.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/getAll.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/getAll.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/getAll.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/has.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/has.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/has.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/has.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/iterable.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/iterable.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/iterable.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/iterable.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/set-shorthand.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/set-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/set-shorthand.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/set-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/set.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/set.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/inline/set.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/inline/set.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/accent-color.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/accent-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/accent-color.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/accent-color.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/alignment-baseline.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/alignment-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/alignment-baseline.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/alignment-baseline.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/all.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/all.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/all.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/all.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-delay-end.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-delay-end.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-delay-end.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-delay-end.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-delay-start.tentative.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-delay-start.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-delay-start.tentative.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-delay-start.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-delay.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-delay.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-delay.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-delay.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-direction.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-direction.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-direction.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-duration.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-duration.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-duration.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-duration.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-fill-mode.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-fill-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-fill-mode.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-fill-mode.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-iteration-count.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-iteration-count.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-iteration-count.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-iteration-count.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-name.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-name.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-name.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-name.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-play-state.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-play-state.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-play-state.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-play-state.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-timing-function.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-timing-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation-timing-function.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation-timing-function.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/animation.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/animation.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/backdrop-filter.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/backdrop-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/backdrop-filter.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/backdrop-filter.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/backface-visibility.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/backface-visibility.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/backface-visibility.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/backface-visibility.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-attachment.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-attachment.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-attachment.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-attachment.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-blend-mode.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-blend-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-blend-mode.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-blend-mode.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-clip.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-clip.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-clip.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-color.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-color.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-color.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-image.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-image.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-image.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-origin.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-origin.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-origin.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-position.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-position.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-position.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-repeat.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-repeat.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-repeat.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-repeat.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-size.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-size.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background-size.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/background.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/baseline-shift.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/baseline-shift.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/baseline-shift.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/baseline-shift.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/block-size.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/block-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/block-size.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/block-size.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-collapse.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-collapse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-collapse.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-collapse.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-color.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-color.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-color.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-image-outset.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-image-outset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-image-outset.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-image-outset.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-image-repeat.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-image-repeat.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-image-repeat.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-image-repeat.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-image-slice.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-image-slice.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-image-slice.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-image-slice.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-image-source.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-image-source.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-image-source.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-image-source.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-image-width.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-image-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-image-width.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-image-width.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-radius.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-radius.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-radius.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-style.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-style.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-style.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-width.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-width.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/border-width.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/bottom.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/bottom.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/bottom.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/box-shadow.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/box-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/box-shadow.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/box-shadow.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/box-sizing.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/box-sizing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/box-sizing.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/box-sizing.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/break.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/break.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/break.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/break.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/caption-side.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/caption-side.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/caption-side.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/caption-side.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/caret-color.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/caret-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/caret-color.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/caret-color.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/center-coordinate.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/center-coordinate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/center-coordinate.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/center-coordinate.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/clear.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/clear.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/clear.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/clear.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/clip-path.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/clip-path.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/clip-path.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/clip-path.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/clip-rule.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/clip-rule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/clip-rule.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/clip-rule.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/clip.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/clip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/clip.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/clip.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/color-interpolation.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/color-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/color-interpolation.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/color-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/color.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/color.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/color.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/column-count.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-count.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/column-count.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-count.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/column-rule-color.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-rule-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/column-rule-color.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-rule-color.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/column-rule-style.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-rule-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/column-rule-style.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-rule-style.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/column-rule-width.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-rule-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/column-rule-width.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-rule-width.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/column-span.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-span.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/column-span.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-span.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/column-width.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/column-width.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/column-width.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/contain.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/contain.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/contain.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/contain.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/container-name.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/container-name.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/container-name.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/container-name.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/container-type.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/container-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/container-type.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/container-type.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/coordinate.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/coordinate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/coordinate.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/coordinate.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/counter-increment.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/counter-increment.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/counter-increment.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/counter-increment.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/counter-reset.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/counter-reset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/counter-reset.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/counter-reset.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/counter-set.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/counter-set.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/counter-set.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/counter-set.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/cursor.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/cursor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/cursor.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/cursor.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/d.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/d.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/d.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/direction.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/direction.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/direction.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/direction.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/display.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/display.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/display.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/display.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/dominant-baseline.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/dominant-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/dominant-baseline.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/dominant-baseline.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/empty-cells.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/empty-cells.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/empty-cells.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/empty-cells.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/fill-color.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/fill-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/fill-color.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/fill-color.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/fill-opacity.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/fill-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/fill-opacity.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/fill-opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/fill-rule.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/fill-rule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/fill-rule.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/fill-rule.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/fill.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/fill.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/fill.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/fill.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/filter.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/filter.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/filter.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-basis.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flex-basis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-basis.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flex-basis.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-direction.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flex-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-direction.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flex-direction.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-flow.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flex-flow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-flow.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flex-flow.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-grow.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flex-grow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-grow.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flex-grow.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-shrink.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flex-shrink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-shrink.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flex-shrink.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-wrap.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flex-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-wrap.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flex-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flex.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/float.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/float.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/float.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flood-color.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flood-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flood-color.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flood-color.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flood-opacity.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flood-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flood-opacity.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/flood-opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-family.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-family.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-family.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-family.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-feature-settings.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-feature-settings.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-feature-settings.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-feature-settings.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-kerning.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-kerning.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-kerning.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-kerning.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-language-override.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-language-override.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-language-override.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-language-override.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-optical-sizing.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-optical-sizing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-optical-sizing.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-optical-sizing.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-palette.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-palette.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-palette.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-palette.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-presentation.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-presentation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-presentation.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-presentation.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-size-adjust.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-size-adjust.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-size-adjust.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-size-adjust.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-size.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-size.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-size.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-stretch.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-stretch.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-stretch.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-stretch.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-style.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-style.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-style.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-synthesis.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-synthesis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-synthesis.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-synthesis.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-alternates.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-alternates.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-alternates.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-alternates.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-caps.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-caps.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-caps.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-caps.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-east-asian.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-east-asian.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-east-asian.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-east-asian.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-emoji.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-emoji.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-emoji.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-emoji.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-ligatures.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-ligatures.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-ligatures.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-ligatures.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-numeric.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-numeric.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-numeric.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-numeric.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variation-settings.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variation-settings.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variation-settings.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variation-settings.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-weight.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-weight.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-weight.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-weight.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/gap.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/gap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/gap.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/gap.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-area.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-area.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-area.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-area.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-auto-columns-rows.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-auto-columns-rows.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-auto-columns-rows.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-auto-columns-rows.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-auto-flow.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-auto-flow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-auto-flow.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-auto-flow.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-gap.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-gap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-gap.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-gap.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-start-end.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-start-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-start-end.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-start-end.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-template-areas.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-template-areas.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-template-areas.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-template-areas.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-template-columns-rows.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-template-columns-rows.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-template-columns-rows.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-template-columns-rows.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-template.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-template.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-template.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid-template.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/grid.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/height.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/height.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/height.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/hyphens.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/hyphens.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/hyphens.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/hyphens.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/image-rendering.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/image-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/image-rendering.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/image-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/inline-size.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/inline-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/inline-size.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/inline-size.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/isolation.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/isolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/isolation.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/isolation.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/left.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/left.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/left.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/left.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/letter-spacing.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/letter-spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/letter-spacing.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/letter-spacing.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/lighting-color.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/lighting-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/lighting-color.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/lighting-color.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/line-break.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/line-break.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/line-break.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/line-break.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/line-height.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/line-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/line-height.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/line-height.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/list-style-image.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/list-style-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/list-style-image.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/list-style-image.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/list-style-position.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/list-style-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/list-style-position.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/list-style-position.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/list-style-type.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/list-style-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/list-style-type.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/list-style-type.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/logical.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/logical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/logical.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/logical.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/margin.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/margin.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/margin.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/marker.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/marker.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/marker.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/marker.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/mask-image.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/mask-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/mask-image.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/mask-image.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/mask-type.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/mask-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/mask-type.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/mask-type.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/mask.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/mask.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/mask.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/mask.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/mix-blend-mode.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/mix-blend-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/mix-blend-mode.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/mix-blend-mode.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/object-fit.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/object-fit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/object-fit.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/object-fit.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/object-position.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/object-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/object-position.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/object-position.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/offset-anchor.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/offset-anchor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/offset-anchor.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/offset-anchor.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/offset-distance.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/offset-distance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/offset-distance.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/offset-distance.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/offset-path.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/offset-path.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/offset-path.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/offset-path.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/offset-position.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/offset-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/offset-position.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/offset-position.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/offset-rotate.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/offset-rotate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/offset-rotate.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/offset-rotate.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/offset.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/offset.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/offset.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/opacity.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/opacity.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/order.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/order.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/order.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/orphans.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/orphans.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/orphans.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/orphans.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/outline-color.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/outline-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/outline-color.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/outline-color.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/outline-offset.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/outline-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/outline-offset.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/outline-offset.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/outline-style.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/outline-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/outline-style.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/outline-style.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/outline-width.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/outline-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/outline-width.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/outline-width.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/overflow-anchor.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/overflow-anchor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/overflow-anchor.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/overflow-anchor.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/overflow-clip-margin.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/overflow-clip-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/overflow-clip-margin.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/overflow-clip-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/overflow-wrap.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/overflow-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/overflow-wrap.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/overflow-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/overflow.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/overflow.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/overscroll-behavior.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/overscroll-behavior.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/overscroll-behavior.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/overscroll-behavior.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/padding.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/padding.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/padding.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/page.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/page.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/page.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/page.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/paint-order.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/paint-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/paint-order.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/paint-order.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/perspective-origin.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/perspective-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/perspective-origin.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/perspective-origin.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/perspective.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/perspective.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/perspective.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/perspective.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/pointer-events.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/pointer-events.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/pointer-events.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/pointer-events.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/position.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/position.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/position.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/quotes.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/quotes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/quotes.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/quotes.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/radius.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/radius.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/radius.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/radius.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/resize.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/resize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/resize.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/resize.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/resources/testsuite.js b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/resources/testsuite.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/resources/testsuite.js rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/resources/testsuite.js diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/right.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/right.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/right.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/right.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-behavior.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scroll-behavior.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-behavior.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scroll-behavior.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-margin.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scroll-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-margin.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scroll-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-padding.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scroll-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-padding.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scroll-padding.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-snap-align.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scroll-snap-align.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-snap-align.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scroll-snap-align.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-snap-stop.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scroll-snap-stop.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-snap-stop.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scroll-snap-stop.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-snap-type.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scroll-snap-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scroll-snap-type.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scroll-snap-type.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scrollbar-gutter.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scrollbar-gutter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scrollbar-gutter.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scrollbar-gutter.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scrollbar-width.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scrollbar-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/scrollbar-width.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/scrollbar-width.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/shape-image-threshold.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/shape-image-threshold.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/shape-image-threshold.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/shape-image-threshold.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/shape-margin.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/shape-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/shape-margin.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/shape-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/shape-outside.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/shape-outside.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/shape-outside.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/shape-outside.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/shape-rendering.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/shape-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/shape-rendering.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/shape-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/speak.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/speak.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/speak.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/speak.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stop-color.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stop-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stop-color.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stop-color.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stop-opacity.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stop-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stop-opacity.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stop-opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke-dasharray.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke-dasharray.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke-dasharray.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke-dasharray.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke-dashoffset.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke-dashoffset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke-dashoffset.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke-dashoffset.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke-linecap.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke-linecap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke-linecap.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke-linecap.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke-linejoin.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke-linejoin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke-linejoin.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke-linejoin.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke-miterlimit.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke-miterlimit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke-miterlimit.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke-miterlimit.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke-opacity.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke-opacity.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke-opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke-width.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke-width.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke-width.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/stroke.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/stroke.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/tab-size.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/tab-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/tab-size.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/tab-size.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/table-layout.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/table-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/table-layout.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/table-layout.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-align-last.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-align-last.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-align-last.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-align-last.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-align.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-align.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-align.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-align.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-anchor.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-anchor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-anchor.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-anchor.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-combine-upright.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-combine-upright.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-combine-upright.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-combine-upright.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-color.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-color.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-color.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-line.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-line.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-line.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-skip-ink.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-skip-ink.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-skip-ink.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-skip-ink.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-skip.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-skip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-skip.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-skip.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-style.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-style.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-style.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-thickness.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-thickness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-thickness.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-thickness.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-emphasis-color.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-emphasis-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-emphasis-color.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-emphasis-color.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-indent.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-indent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-indent.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-indent.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-justify.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-justify.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-justify.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-justify.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-orientation.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-orientation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-orientation.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-orientation.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-overflow.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-overflow.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-rendering.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-rendering.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-rendering.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-shadow.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-shadow.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-shadow.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-size-adjust.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-size-adjust.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-size-adjust.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-size-adjust.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-transform.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-transform.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-transform.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-underline-offset.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-underline-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-underline-offset.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-underline-offset.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-underline-position.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-underline-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-underline-position.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/text-underline-position.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/top.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/top.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/top.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/top.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/touch-action.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/touch-action.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/touch-action.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/touch-action.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transform-box.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transform-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transform-box.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transform-box.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transform-interpolated.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transform-interpolated.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transform-interpolated.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transform-interpolated.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transform-style.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transform-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transform-style.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transform-style.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transform.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transform.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transform.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transition-delay.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transition-delay.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transition-delay.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transition-delay.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transition-duration.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transition-duration.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transition-duration.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transition-duration.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transition-property.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transition-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transition-property.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transition-property.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transition-timing-function.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transition-timing-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transition-timing-function.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transition-timing-function.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transition.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transition.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/transition.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/unicode-bidi.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/unicode-bidi.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/unicode-bidi.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/unicode-bidi.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/user-select.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/user-select.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/user-select.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/user-select.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/vector-effect.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/vector-effect.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/vector-effect.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/vector-effect.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/vertical-align.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/vertical-align.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/vertical-align.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/vertical-align.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/visibility.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/visibility.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/visibility.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/visibility.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/white-space.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/white-space.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/white-space.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/white-space.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/widows.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/widows.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/widows.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/widows.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/width.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/width.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/width.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/will-change.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/will-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/will-change.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/will-change.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/word-break.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/word-break.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/word-break.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/word-break.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/word-spacing.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/word-spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/word-spacing.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/word-spacing.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/word-wrap.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/word-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/word-wrap.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/word-wrap.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/writing-mode.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/writing-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/writing-mode.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/writing-mode.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/z-index.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/z-index.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/z-index.html rename to tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/z-index.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/width-by-clamp-px-em.html b/tests/wpt/tests/css/css-typed-om/width-by-clamp-px-em.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/width-by-clamp-px-em.html rename to tests/wpt/tests/css/css-typed-om/width-by-clamp-px-em.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/width-by-max-px-em.html b/tests/wpt/tests/css/css-typed-om/width-by-max-px-em.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/width-by-max-px-em.html rename to tests/wpt/tests/css/css-typed-om/width-by-max-px-em.html diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/width-by-min-px-em.html b/tests/wpt/tests/css/css-typed-om/width-by-min-px-em.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-typed-om/width-by-min-px-em.html rename to tests/wpt/tests/css/css-typed-om/width-by-min-px-em.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/META.yml b/tests/wpt/tests/css/css-ui/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/META.yml rename to tests/wpt/tests/css/css-ui/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-ui/README.md b/tests/wpt/tests/css/css-ui/README.md similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/README.md rename to tests/wpt/tests/css/css-ui/README.md diff --git a/tests/wpt/web-platform-tests/css/css-ui/accent-color-checkbox-checked-001-notref.html b/tests/wpt/tests/css/css-ui/accent-color-checkbox-checked-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/accent-color-checkbox-checked-001-notref.html rename to tests/wpt/tests/css/css-ui/accent-color-checkbox-checked-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/accent-color-checkbox-checked-001.html b/tests/wpt/tests/css/css-ui/accent-color-checkbox-checked-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/accent-color-checkbox-checked-001.html rename to tests/wpt/tests/css/css-ui/accent-color-checkbox-checked-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/accent-color-computed.html b/tests/wpt/tests/css/css-ui/accent-color-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/accent-color-computed.html rename to tests/wpt/tests/css/css-ui/accent-color-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/accent-color-invalidation-currentcolor-ref.html b/tests/wpt/tests/css/css-ui/accent-color-invalidation-currentcolor-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/accent-color-invalidation-currentcolor-ref.html rename to tests/wpt/tests/css/css-ui/accent-color-invalidation-currentcolor-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/accent-color-invalidation-currentcolor.html b/tests/wpt/tests/css/css-ui/accent-color-invalidation-currentcolor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/accent-color-invalidation-currentcolor.html rename to tests/wpt/tests/css/css-ui/accent-color-invalidation-currentcolor.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/accent-color-parent-currentcolor-ref.html b/tests/wpt/tests/css/css-ui/accent-color-parent-currentcolor-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/accent-color-parent-currentcolor-ref.html rename to tests/wpt/tests/css/css-ui/accent-color-parent-currentcolor-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/accent-color-parent-currentcolor.html b/tests/wpt/tests/css/css-ui/accent-color-parent-currentcolor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/accent-color-parent-currentcolor.html rename to tests/wpt/tests/css/css-ui/accent-color-parent-currentcolor.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/accent-color-parsing.html b/tests/wpt/tests/css/css-ui/accent-color-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/accent-color-parsing.html rename to tests/wpt/tests/css/css-ui/accent-color-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/accent-color-radio-checked-001-notref.html b/tests/wpt/tests/css/css-ui/accent-color-radio-checked-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/accent-color-radio-checked-001-notref.html rename to tests/wpt/tests/css/css-ui/accent-color-radio-checked-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/accent-color-radio-checked-001.html b/tests/wpt/tests/css/css-ui/accent-color-radio-checked-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/accent-color-radio-checked-001.html rename to tests/wpt/tests/css/css-ui/accent-color-radio-checked-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/accent-color-visited-ref.html b/tests/wpt/tests/css/css-ui/accent-color-visited-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/accent-color-visited-ref.html rename to tests/wpt/tests/css/css-ui/accent-color-visited-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/accent-color-visited.html b/tests/wpt/tests/css/css-ui/accent-color-visited.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/accent-color-visited.html rename to tests/wpt/tests/css/css-ui/accent-color-visited.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/animation/accent-color-interpolation.html b/tests/wpt/tests/css/css-ui/animation/accent-color-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/animation/accent-color-interpolation.html rename to tests/wpt/tests/css/css-ui/animation/accent-color-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/animation/appearance-no-interpolation.html b/tests/wpt/tests/css/css-ui/animation/appearance-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/animation/appearance-no-interpolation.html rename to tests/wpt/tests/css/css-ui/animation/appearance-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/animation/caret-color-composition.html b/tests/wpt/tests/css/css-ui/animation/caret-color-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/animation/caret-color-composition.html rename to tests/wpt/tests/css/css-ui/animation/caret-color-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/animation/caret-color-interpolation.html b/tests/wpt/tests/css/css-ui/animation/caret-color-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/animation/caret-color-interpolation.html rename to tests/wpt/tests/css/css-ui/animation/caret-color-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/animation/cursor-no-interpolation.html b/tests/wpt/tests/css/css-ui/animation/cursor-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/animation/cursor-no-interpolation.html rename to tests/wpt/tests/css/css-ui/animation/cursor-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/animation/outline-color-interpolation.html b/tests/wpt/tests/css/css-ui/animation/outline-color-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/animation/outline-color-interpolation.html rename to tests/wpt/tests/css/css-ui/animation/outline-color-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/animation/outline-offset-composition.html b/tests/wpt/tests/css/css-ui/animation/outline-offset-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/animation/outline-offset-composition.html rename to tests/wpt/tests/css/css-ui/animation/outline-offset-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/animation/outline-offset-interpolation.html b/tests/wpt/tests/css/css-ui/animation/outline-offset-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/animation/outline-offset-interpolation.html rename to tests/wpt/tests/css/css-ui/animation/outline-offset-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/animation/outline-width-composition.html b/tests/wpt/tests/css/css-ui/animation/outline-width-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/animation/outline-width-composition.html rename to tests/wpt/tests/css/css-ui/animation/outline-width-composition.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/animation/outline-width-interpolation.html b/tests/wpt/tests/css/css-ui/animation/outline-width-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/animation/outline-width-interpolation.html rename to tests/wpt/tests/css/css-ui/animation/outline-width-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-auto-001.html b/tests/wpt/tests/css/css-ui/appearance-auto-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-auto-001.html rename to tests/wpt/tests/css/css-ui/appearance-auto-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-auto-input-non-widget-001-ref.html b/tests/wpt/tests/css/css-ui/appearance-auto-input-non-widget-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-auto-input-non-widget-001-ref.html rename to tests/wpt/tests/css/css-ui/appearance-auto-input-non-widget-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-auto-input-non-widget-001.html b/tests/wpt/tests/css/css-ui/appearance-auto-input-non-widget-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-auto-input-non-widget-001.html rename to tests/wpt/tests/css/css-ui/appearance-auto-input-non-widget-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-auto-non-html-namespace-001.html b/tests/wpt/tests/css/css-ui/appearance-auto-non-html-namespace-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-auto-non-html-namespace-001.html rename to tests/wpt/tests/css/css-ui/appearance-auto-non-html-namespace-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-auto-ref.html b/tests/wpt/tests/css/css-ui/appearance-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-auto-ref.html rename to tests/wpt/tests/css/css-ui/appearance-auto-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-button-001.html b/tests/wpt/tests/css/css-ui/appearance-button-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-button-001.html rename to tests/wpt/tests/css/css-ui/appearance-button-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-checkbox-001.html b/tests/wpt/tests/css/css-ui/appearance-checkbox-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-checkbox-001.html rename to tests/wpt/tests/css/css-ui/appearance-checkbox-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-cssom-001.html b/tests/wpt/tests/css/css-ui/appearance-cssom-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-cssom-001.html rename to tests/wpt/tests/css/css-ui/appearance-cssom-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-initial-value-001.html b/tests/wpt/tests/css/css-ui/appearance-initial-value-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-initial-value-001.html rename to tests/wpt/tests/css/css-ui/appearance-initial-value-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-listbox-001.html b/tests/wpt/tests/css/css-ui/appearance-listbox-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-listbox-001.html rename to tests/wpt/tests/css/css-ui/appearance-listbox-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-menulist-001.html b/tests/wpt/tests/css/css-ui/appearance-menulist-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-menulist-001.html rename to tests/wpt/tests/css/css-ui/appearance-menulist-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-menulist-button-001.html b/tests/wpt/tests/css/css-ui/appearance-menulist-button-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-menulist-button-001.html rename to tests/wpt/tests/css/css-ui/appearance-menulist-button-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-menulist-button-002.tentative.html b/tests/wpt/tests/css/css-ui/appearance-menulist-button-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-menulist-button-002.tentative.html rename to tests/wpt/tests/css/css-ui/appearance-menulist-button-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-meter-001.html b/tests/wpt/tests/css/css-ui/appearance-meter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-meter-001.html rename to tests/wpt/tests/css/css-ui/appearance-meter-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-parsing.html b/tests/wpt/tests/css/css-ui/appearance-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-parsing.html rename to tests/wpt/tests/css/css-ui/appearance-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-progress-bar-001.html b/tests/wpt/tests/css/css-ui/appearance-progress-bar-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-progress-bar-001.html rename to tests/wpt/tests/css/css-ui/appearance-progress-bar-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-progress-bar-002-ref.html b/tests/wpt/tests/css/css-ui/appearance-progress-bar-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-progress-bar-002-ref.html rename to tests/wpt/tests/css/css-ui/appearance-progress-bar-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-progress-bar-002.html b/tests/wpt/tests/css/css-ui/appearance-progress-bar-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-progress-bar-002.html rename to tests/wpt/tests/css/css-ui/appearance-progress-bar-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-property.html b/tests/wpt/tests/css/css-ui/appearance-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-property.html rename to tests/wpt/tests/css/css-ui/appearance-property.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-radio-001.html b/tests/wpt/tests/css/css-ui/appearance-radio-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-radio-001.html rename to tests/wpt/tests/css/css-ui/appearance-radio-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-revert-001.tentative.html b/tests/wpt/tests/css/css-ui/appearance-revert-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-revert-001.tentative.html rename to tests/wpt/tests/css/css-ui/appearance-revert-001.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-revert-ref.html b/tests/wpt/tests/css/css-ui/appearance-revert-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-revert-ref.html rename to tests/wpt/tests/css/css-ui/appearance-revert-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-searchfield-001.html b/tests/wpt/tests/css/css-ui/appearance-searchfield-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-searchfield-001.html rename to tests/wpt/tests/css/css-ui/appearance-searchfield-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-serialization.html b/tests/wpt/tests/css/css-ui/appearance-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-serialization.html rename to tests/wpt/tests/css/css-ui/appearance-serialization.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-textarea-001.html b/tests/wpt/tests/css/css-ui/appearance-textarea-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-textarea-001.html rename to tests/wpt/tests/css/css-ui/appearance-textarea-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-textfield-001-ref.html b/tests/wpt/tests/css/css-ui/appearance-textfield-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-textfield-001-ref.html rename to tests/wpt/tests/css/css-ui/appearance-textfield-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-textfield-001.html b/tests/wpt/tests/css/css-ui/appearance-textfield-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/appearance-textfield-001.html rename to tests/wpt/tests/css/css-ui/appearance-textfield-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-001.html b/tests/wpt/tests/css/css-ui/box-sizing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-001.html rename to tests/wpt/tests/css/css-ui/box-sizing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-003.html b/tests/wpt/tests/css/css-ui/box-sizing-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-003.html rename to tests/wpt/tests/css/css-ui/box-sizing-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-005.html b/tests/wpt/tests/css/css-ui/box-sizing-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-005.html rename to tests/wpt/tests/css/css-ui/box-sizing-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-007.html b/tests/wpt/tests/css/css-ui/box-sizing-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-007.html rename to tests/wpt/tests/css/css-ui/box-sizing-007.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-008.html b/tests/wpt/tests/css/css-ui/box-sizing-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-008.html rename to tests/wpt/tests/css/css-ui/box-sizing-008.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-009.html b/tests/wpt/tests/css/css-ui/box-sizing-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-009.html rename to tests/wpt/tests/css/css-ui/box-sizing-009.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-010.html b/tests/wpt/tests/css/css-ui/box-sizing-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-010.html rename to tests/wpt/tests/css/css-ui/box-sizing-010.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-011.html b/tests/wpt/tests/css/css-ui/box-sizing-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-011.html rename to tests/wpt/tests/css/css-ui/box-sizing-011.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-012.html b/tests/wpt/tests/css/css-ui/box-sizing-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-012.html rename to tests/wpt/tests/css/css-ui/box-sizing-012.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-013.html b/tests/wpt/tests/css/css-ui/box-sizing-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-013.html rename to tests/wpt/tests/css/css-ui/box-sizing-013.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-014.html b/tests/wpt/tests/css/css-ui/box-sizing-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-014.html rename to tests/wpt/tests/css/css-ui/box-sizing-014.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-015.html b/tests/wpt/tests/css/css-ui/box-sizing-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-015.html rename to tests/wpt/tests/css/css-ui/box-sizing-015.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-016.html b/tests/wpt/tests/css/css-ui/box-sizing-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-016.html rename to tests/wpt/tests/css/css-ui/box-sizing-016.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-017.html b/tests/wpt/tests/css/css-ui/box-sizing-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-017.html rename to tests/wpt/tests/css/css-ui/box-sizing-017.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-018.html b/tests/wpt/tests/css/css-ui/box-sizing-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-018.html rename to tests/wpt/tests/css/css-ui/box-sizing-018.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-019.html b/tests/wpt/tests/css/css-ui/box-sizing-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-019.html rename to tests/wpt/tests/css/css-ui/box-sizing-019.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-020.html b/tests/wpt/tests/css/css-ui/box-sizing-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-020.html rename to tests/wpt/tests/css/css-ui/box-sizing-020.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-021.html b/tests/wpt/tests/css/css-ui/box-sizing-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-021.html rename to tests/wpt/tests/css/css-ui/box-sizing-021.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-022.html b/tests/wpt/tests/css/css-ui/box-sizing-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-022.html rename to tests/wpt/tests/css/css-ui/box-sizing-022.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-023.html b/tests/wpt/tests/css/css-ui/box-sizing-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-023.html rename to tests/wpt/tests/css/css-ui/box-sizing-023.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-024.html b/tests/wpt/tests/css/css-ui/box-sizing-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-024.html rename to tests/wpt/tests/css/css-ui/box-sizing-024.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-025.html b/tests/wpt/tests/css/css-ui/box-sizing-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-025.html rename to tests/wpt/tests/css/css-ui/box-sizing-025.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-026.html b/tests/wpt/tests/css/css-ui/box-sizing-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-026.html rename to tests/wpt/tests/css/css-ui/box-sizing-026.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/box-sizing-027.html b/tests/wpt/tests/css/css-ui/box-sizing-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/box-sizing-027.html rename to tests/wpt/tests/css/css-ui/box-sizing-027.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/canvas-cursor-001.html b/tests/wpt/tests/css/css-ui/canvas-cursor-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/canvas-cursor-001.html rename to tests/wpt/tests/css/css-ui/canvas-cursor-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/canvas-cursor-002.html b/tests/wpt/tests/css/css-ui/canvas-cursor-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/canvas-cursor-002.html rename to tests/wpt/tests/css/css-ui/canvas-cursor-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-001.html b/tests/wpt/tests/css/css-ui/caret-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-001.html rename to tests/wpt/tests/css/css-ui/caret-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-002.html b/tests/wpt/tests/css/css-ui/caret-color-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-002.html rename to tests/wpt/tests/css/css-ui/caret-color-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-003.html b/tests/wpt/tests/css/css-ui/caret-color-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-003.html rename to tests/wpt/tests/css/css-ui/caret-color-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-004.html b/tests/wpt/tests/css/css-ui/caret-color-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-004.html rename to tests/wpt/tests/css/css-ui/caret-color-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-005.html b/tests/wpt/tests/css/css-ui/caret-color-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-005.html rename to tests/wpt/tests/css/css-ui/caret-color-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-006.html b/tests/wpt/tests/css/css-ui/caret-color-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-006.html rename to tests/wpt/tests/css/css-ui/caret-color-006.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-007.html b/tests/wpt/tests/css/css-ui/caret-color-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-007.html rename to tests/wpt/tests/css/css-ui/caret-color-007.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-008.html b/tests/wpt/tests/css/css-ui/caret-color-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-008.html rename to tests/wpt/tests/css/css-ui/caret-color-008.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-009.html b/tests/wpt/tests/css/css-ui/caret-color-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-009.html rename to tests/wpt/tests/css/css-ui/caret-color-009.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-010.html b/tests/wpt/tests/css/css-ui/caret-color-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-010.html rename to tests/wpt/tests/css/css-ui/caret-color-010.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-011.html b/tests/wpt/tests/css/css-ui/caret-color-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-011.html rename to tests/wpt/tests/css/css-ui/caret-color-011.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-012.html b/tests/wpt/tests/css/css-ui/caret-color-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-012.html rename to tests/wpt/tests/css/css-ui/caret-color-012.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-013.html b/tests/wpt/tests/css/css-ui/caret-color-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-013.html rename to tests/wpt/tests/css/css-ui/caret-color-013.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-014.html b/tests/wpt/tests/css/css-ui/caret-color-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-014.html rename to tests/wpt/tests/css/css-ui/caret-color-014.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-015.html b/tests/wpt/tests/css/css-ui/caret-color-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-015.html rename to tests/wpt/tests/css/css-ui/caret-color-015.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-016.html b/tests/wpt/tests/css/css-ui/caret-color-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-016.html rename to tests/wpt/tests/css/css-ui/caret-color-016.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-017.html b/tests/wpt/tests/css/css-ui/caret-color-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-017.html rename to tests/wpt/tests/css/css-ui/caret-color-017.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-018.html b/tests/wpt/tests/css/css-ui/caret-color-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-018.html rename to tests/wpt/tests/css/css-ui/caret-color-018.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-019.html b/tests/wpt/tests/css/css-ui/caret-color-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-019.html rename to tests/wpt/tests/css/css-ui/caret-color-019.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-020.html b/tests/wpt/tests/css/css-ui/caret-color-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-020.html rename to tests/wpt/tests/css/css-ui/caret-color-020.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/caret-color-021.html b/tests/wpt/tests/css/css-ui/caret-color-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/caret-color-021.html rename to tests/wpt/tests/css/css-ui/caret-color-021.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-button-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-button-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-button-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-button-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-checkbox-input-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-checkbox-input-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-checkbox-input-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-checkbox-input-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-color-input-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-color-input-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-color-input-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-color-input-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-input-button-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-input-button-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-input-button-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-input-button-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-input-reset-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-input-reset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-input-reset-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-input-reset-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-input-search-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-input-search-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-input-search-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-input-search-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-input-search-text-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-input-search-text-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-input-search-text-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-input-search-text-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-input-submit-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-input-submit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-input-submit-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-input-submit-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-input-text-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-input-text-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-input-text-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-input-text-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-link-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-link-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-link-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-link-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-meter-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-meter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-meter-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-meter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-progress-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-progress-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-progress-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-progress-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-props-revert-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-props-revert-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-props-revert-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-props-revert-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-radio-input-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-radio-input-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-radio-input-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-radio-input-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-range-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-range-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-range-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-range-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-select-dropdown-box-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-select-dropdown-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-select-dropdown-box-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-select-dropdown-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-select-listbox-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-select-listbox-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-select-listbox-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-select-listbox-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-select-menulist-button-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-select-menulist-button-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-select-menulist-button-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-select-menulist-button-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-textarea-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-textarea-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-fallback-textarea-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-fallback-textarea-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-button-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-checkbox-input-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-color-input-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-button-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-search-text-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-text-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-link-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-meter-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-progress-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-radio-input-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-range-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-dropdown-box-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-listbox-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-select-menulist-button-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-attachment-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-attachment-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-attachment-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-attachment-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-clip-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-clip-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-image-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-image-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-origin-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-origin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-origin-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-origin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-position-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-position-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-position-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-position-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-size-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-size-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-background-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-block-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-bottom-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-end-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-end-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-end-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-end-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-end-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-end-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-end-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-end-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-outset-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-outset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-outset-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-outset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-repeat-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-repeat-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-repeat-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-repeat-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-slice-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-slice-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-slice-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-slice-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-source-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-source-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-source-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-source-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-image-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-end-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-end-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-end-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-end-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-end-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-end-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-end-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-end-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-end-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-end-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-end-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-end-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-start-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-start-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-start-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-start-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-start-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-start-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-start-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-start-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-start-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-start-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-start-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-inline-start-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-left-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-left-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-left-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-left-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-left-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-left-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-left-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-left-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-left-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-left-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-left-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-left-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-right-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-right-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-right-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-right-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-right-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-right-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-right-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-right-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-right-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-right-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-right-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-right-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-start-end-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-start-end-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-start-end-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-start-end-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-start-start-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-start-start-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-start-start-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-start-start-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-color-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-color-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-left-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-left-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-left-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-left-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-right-radius-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-right-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-right-radius-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-right-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-style-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-style-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-width-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-width-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-textarea-border-top-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-no-fallback-props-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-no-fallback-props-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-no-fallback-props-001.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-no-fallback-props-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-no-fallback-ref.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-no-fallback-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/compute-kind-widget-no-fallback-ref.html rename to tests/wpt/tests/css/css-ui/compute-kind-widget-no-fallback-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/crashtests/outline-scrollIntoView-crash.html b/tests/wpt/tests/css/css-ui/crashtests/outline-scrollIntoView-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/crashtests/outline-scrollIntoView-crash.html rename to tests/wpt/tests/css/css-ui/crashtests/outline-scrollIntoView-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-001.html b/tests/wpt/tests/css/css-ui/cursor-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-001.html rename to tests/wpt/tests/css/css-ui/cursor-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-002.html b/tests/wpt/tests/css/css-ui/cursor-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-002.html rename to tests/wpt/tests/css/css-ui/cursor-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-003.html b/tests/wpt/tests/css/css-ui/cursor-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-003.html rename to tests/wpt/tests/css/css-ui/cursor-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-004.html b/tests/wpt/tests/css/css-ui/cursor-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-004.html rename to tests/wpt/tests/css/css-ui/cursor-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-005.html b/tests/wpt/tests/css/css-ui/cursor-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-005.html rename to tests/wpt/tests/css/css-ui/cursor-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-006.html b/tests/wpt/tests/css/css-ui/cursor-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-006.html rename to tests/wpt/tests/css/css-ui/cursor-006.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-007.html b/tests/wpt/tests/css/css-ui/cursor-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-007.html rename to tests/wpt/tests/css/css-ui/cursor-007.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-008.html b/tests/wpt/tests/css/css-ui/cursor-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-008.html rename to tests/wpt/tests/css/css-ui/cursor-008.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-009.html b/tests/wpt/tests/css/css-ui/cursor-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-009.html rename to tests/wpt/tests/css/css-ui/cursor-009.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-010.html b/tests/wpt/tests/css/css-ui/cursor-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-010.html rename to tests/wpt/tests/css/css-ui/cursor-010.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-011.html b/tests/wpt/tests/css/css-ui/cursor-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-011.html rename to tests/wpt/tests/css/css-ui/cursor-011.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-012.html b/tests/wpt/tests/css/css-ui/cursor-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-012.html rename to tests/wpt/tests/css/css-ui/cursor-012.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-013.html b/tests/wpt/tests/css/css-ui/cursor-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-013.html rename to tests/wpt/tests/css/css-ui/cursor-013.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-014.html b/tests/wpt/tests/css/css-ui/cursor-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-014.html rename to tests/wpt/tests/css/css-ui/cursor-014.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-015.html b/tests/wpt/tests/css/css-ui/cursor-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-015.html rename to tests/wpt/tests/css/css-ui/cursor-015.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-016.html b/tests/wpt/tests/css/css-ui/cursor-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-016.html rename to tests/wpt/tests/css/css-ui/cursor-016.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-017.html b/tests/wpt/tests/css/css-ui/cursor-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-017.html rename to tests/wpt/tests/css/css-ui/cursor-017.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-018.html b/tests/wpt/tests/css/css-ui/cursor-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-018.html rename to tests/wpt/tests/css/css-ui/cursor-018.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-019.html b/tests/wpt/tests/css/css-ui/cursor-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-019.html rename to tests/wpt/tests/css/css-ui/cursor-019.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-020.html b/tests/wpt/tests/css/css-ui/cursor-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-020.html rename to tests/wpt/tests/css/css-ui/cursor-020.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-auto-001.html b/tests/wpt/tests/css/css-ui/cursor-auto-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-auto-001.html rename to tests/wpt/tests/css/css-ui/cursor-auto-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-auto-002.html b/tests/wpt/tests/css/css-ui/cursor-auto-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-auto-002.html rename to tests/wpt/tests/css/css-ui/cursor-auto-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-auto-003.html b/tests/wpt/tests/css/css-ui/cursor-auto-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-auto-003.html rename to tests/wpt/tests/css/css-ui/cursor-auto-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-auto-004.html b/tests/wpt/tests/css/css-ui/cursor-auto-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-auto-004.html rename to tests/wpt/tests/css/css-ui/cursor-auto-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-auto-005.html b/tests/wpt/tests/css/css-ui/cursor-auto-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-auto-005.html rename to tests/wpt/tests/css/css-ui/cursor-auto-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-auto-006.html b/tests/wpt/tests/css/css-ui/cursor-auto-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-auto-006.html rename to tests/wpt/tests/css/css-ui/cursor-auto-006.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-auto-007.html b/tests/wpt/tests/css/css-ui/cursor-auto-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-auto-007.html rename to tests/wpt/tests/css/css-ui/cursor-auto-007.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-border-area.html b/tests/wpt/tests/css/css-ui/cursor-border-area.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-border-area.html rename to tests/wpt/tests/css/css-ui/cursor-border-area.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-box-004.html b/tests/wpt/tests/css/css-ui/cursor-box-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-box-004.html rename to tests/wpt/tests/css/css-ui/cursor-box-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-box-005.html b/tests/wpt/tests/css/css-ui/cursor-box-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-box-005.html rename to tests/wpt/tests/css/css-ui/cursor-box-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-box-006.html b/tests/wpt/tests/css/css-ui/cursor-box-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-box-006.html rename to tests/wpt/tests/css/css-ui/cursor-box-006.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-box-007.html b/tests/wpt/tests/css/css-ui/cursor-box-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-box-007.html rename to tests/wpt/tests/css/css-ui/cursor-box-007.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-content-area.html b/tests/wpt/tests/css/css-ui/cursor-content-area.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-content-area.html rename to tests/wpt/tests/css/css-ui/cursor-content-area.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-hover-001.html b/tests/wpt/tests/css/css-ui/cursor-hover-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-hover-001.html rename to tests/wpt/tests/css/css-ui/cursor-hover-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-hover-002.html b/tests/wpt/tests/css/css-ui/cursor-hover-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-hover-002.html rename to tests/wpt/tests/css/css-ui/cursor-hover-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-hover-003.html b/tests/wpt/tests/css/css-ui/cursor-hover-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-hover-003.html rename to tests/wpt/tests/css/css-ui/cursor-hover-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-001.html b/tests/wpt/tests/css/css-ui/cursor-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-001.html rename to tests/wpt/tests/css/css-ui/cursor-image-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-002.html b/tests/wpt/tests/css/css-ui/cursor-image-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-002.html rename to tests/wpt/tests/css/css-ui/cursor-image-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-003.html b/tests/wpt/tests/css/css-ui/cursor-image-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-003.html rename to tests/wpt/tests/css/css-ui/cursor-image-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-004.html b/tests/wpt/tests/css/css-ui/cursor-image-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-004.html rename to tests/wpt/tests/css/css-ui/cursor-image-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-005-nfs.html b/tests/wpt/tests/css/css-ui/cursor-image-005-nfs.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-005-nfs.html rename to tests/wpt/tests/css/css-ui/cursor-image-005-nfs.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-005.html b/tests/wpt/tests/css/css-ui/cursor-image-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-005.html rename to tests/wpt/tests/css/css-ui/cursor-image-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-006.html b/tests/wpt/tests/css/css-ui/cursor-image-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-006.html rename to tests/wpt/tests/css/css-ui/cursor-image-006.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-007.html b/tests/wpt/tests/css/css-ui/cursor-image-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-007.html rename to tests/wpt/tests/css/css-ui/cursor-image-007.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-008.html b/tests/wpt/tests/css/css-ui/cursor-image-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-008.html rename to tests/wpt/tests/css/css-ui/cursor-image-008.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-009.html b/tests/wpt/tests/css/css-ui/cursor-image-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-009.html rename to tests/wpt/tests/css/css-ui/cursor-image-009.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-010.html b/tests/wpt/tests/css/css-ui/cursor-image-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-010.html rename to tests/wpt/tests/css/css-ui/cursor-image-010.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-011.html b/tests/wpt/tests/css/css-ui/cursor-image-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-011.html rename to tests/wpt/tests/css/css-ui/cursor-image-011.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-012.html b/tests/wpt/tests/css/css-ui/cursor-image-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-012.html rename to tests/wpt/tests/css/css-ui/cursor-image-012.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-013.html b/tests/wpt/tests/css/css-ui/cursor-image-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-013.html rename to tests/wpt/tests/css/css-ui/cursor-image-013.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-014.html b/tests/wpt/tests/css/css-ui/cursor-image-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-014.html rename to tests/wpt/tests/css/css-ui/cursor-image-014.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-015.html b/tests/wpt/tests/css/css-ui/cursor-image-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-015.html rename to tests/wpt/tests/css/css-ui/cursor-image-015.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-016.html b/tests/wpt/tests/css/css-ui/cursor-image-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-016.html rename to tests/wpt/tests/css/css-ui/cursor-image-016.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-017.html b/tests/wpt/tests/css/css-ui/cursor-image-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-017.html rename to tests/wpt/tests/css/css-ui/cursor-image-017.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-018.html b/tests/wpt/tests/css/css-ui/cursor-image-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-018.html rename to tests/wpt/tests/css/css-ui/cursor-image-018.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-001.html b/tests/wpt/tests/css/css-ui/cursor-image-png-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-001.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-002.html b/tests/wpt/tests/css/css-ui/cursor-image-png-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-002.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-003.html b/tests/wpt/tests/css/css-ui/cursor-image-png-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-003.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-004.html b/tests/wpt/tests/css/css-ui/cursor-image-png-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-004.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-005.html b/tests/wpt/tests/css/css-ui/cursor-image-png-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-005.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-006.html b/tests/wpt/tests/css/css-ui/cursor-image-png-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-006.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-006.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-007.html b/tests/wpt/tests/css/css-ui/cursor-image-png-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-007.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-007.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-008.html b/tests/wpt/tests/css/css-ui/cursor-image-png-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-008.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-008.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-009.html b/tests/wpt/tests/css/css-ui/cursor-image-png-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-009.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-009.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-010.html b/tests/wpt/tests/css/css-ui/cursor-image-png-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-010.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-010.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-011.html b/tests/wpt/tests/css/css-ui/cursor-image-png-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-011.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-011.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-012.html b/tests/wpt/tests/css/css-ui/cursor-image-png-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-012.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-012.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-013.html b/tests/wpt/tests/css/css-ui/cursor-image-png-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-013.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-013.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-014.html b/tests/wpt/tests/css/css-ui/cursor-image-png-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-014.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-014.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-015.html b/tests/wpt/tests/css/css-ui/cursor-image-png-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-015.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-015.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-016.html b/tests/wpt/tests/css/css-ui/cursor-image-png-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-016.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-016.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-017.html b/tests/wpt/tests/css/css-ui/cursor-image-png-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-017.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-017.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-018.html b/tests/wpt/tests/css/css-ui/cursor-image-png-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-018.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-018.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-019.html b/tests/wpt/tests/css/css-ui/cursor-image-png-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-019.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-019.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-020.html b/tests/wpt/tests/css/css-ui/cursor-image-png-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-020.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-020.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-021.html b/tests/wpt/tests/css/css-ui/cursor-image-png-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-021.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-021.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-022.html b/tests/wpt/tests/css/css-ui/cursor-image-png-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-022.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-022.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-023.html b/tests/wpt/tests/css/css-ui/cursor-image-png-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-023.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-023.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-024.html b/tests/wpt/tests/css/css-ui/cursor-image-png-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-024.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-024.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-025.html b/tests/wpt/tests/css/css-ui/cursor-image-png-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-025.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-025.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-026.html b/tests/wpt/tests/css/css-ui/cursor-image-png-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-026.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-026.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-027.html b/tests/wpt/tests/css/css-ui/cursor-image-png-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-027.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-027.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-028.html b/tests/wpt/tests/css/css-ui/cursor-image-png-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-028.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-028.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-029.html b/tests/wpt/tests/css/css-ui/cursor-image-png-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-029.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-029.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-030.html b/tests/wpt/tests/css/css-ui/cursor-image-png-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-030.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-030.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-031.html b/tests/wpt/tests/css/css-ui/cursor-image-png-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-031.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-031.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-032.html b/tests/wpt/tests/css/css-ui/cursor-image-png-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-032.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-032.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-033.html b/tests/wpt/tests/css/css-ui/cursor-image-png-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-033.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-033.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-034.html b/tests/wpt/tests/css/css-ui/cursor-image-png-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-034.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-034.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-035.html b/tests/wpt/tests/css/css-ui/cursor-image-png-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-035.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-035.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-036.html b/tests/wpt/tests/css/css-ui/cursor-image-png-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-036.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-036.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-037.html b/tests/wpt/tests/css/css-ui/cursor-image-png-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-037.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-037.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-038.html b/tests/wpt/tests/css/css-ui/cursor-image-png-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-038.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-038.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-039.html b/tests/wpt/tests/css/css-ui/cursor-image-png-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-039.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-039.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-040.html b/tests/wpt/tests/css/css-ui/cursor-image-png-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-040.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-040.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-041.html b/tests/wpt/tests/css/css-ui/cursor-image-png-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-041.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-041.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-042.html b/tests/wpt/tests/css/css-ui/cursor-image-png-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-042.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-042.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-043.html b/tests/wpt/tests/css/css-ui/cursor-image-png-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-image-png-043.html rename to tests/wpt/tests/css/css-ui/cursor-image-png-043.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-outline-area.html b/tests/wpt/tests/css/css-ui/cursor-outline-area.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-outline-area.html rename to tests/wpt/tests/css/css-ui/cursor-outline-area.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-padding-area.html b/tests/wpt/tests/css/css-ui/cursor-padding-area.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-padding-area.html rename to tests/wpt/tests/css/css-ui/cursor-padding-area.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-pointer-links-001-manual.html b/tests/wpt/tests/css/css-ui/cursor-pointer-links-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-pointer-links-001-manual.html rename to tests/wpt/tests/css/css-ui/cursor-pointer-links-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-pointer-links-002-manual.html b/tests/wpt/tests/css/css-ui/cursor-pointer-links-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-pointer-links-002-manual.html rename to tests/wpt/tests/css/css-ui/cursor-pointer-links-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-pointer-links-003-manual.html b/tests/wpt/tests/css/css-ui/cursor-pointer-links-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-pointer-links-003-manual.html rename to tests/wpt/tests/css/css-ui/cursor-pointer-links-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-text-001.html b/tests/wpt/tests/css/css-ui/cursor-text-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-text-001.html rename to tests/wpt/tests/css/css-ui/cursor-text-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-text-002.html b/tests/wpt/tests/css/css-ui/cursor-text-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-text-002.html rename to tests/wpt/tests/css/css-ui/cursor-text-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-x-y-001.html b/tests/wpt/tests/css/css-ui/cursor-x-y-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-x-y-001.html rename to tests/wpt/tests/css/css-ui/cursor-x-y-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-x-y-002.html b/tests/wpt/tests/css/css-ui/cursor-x-y-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-x-y-002.html rename to tests/wpt/tests/css/css-ui/cursor-x-y-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/cursor-x-y-003.html b/tests/wpt/tests/css/css-ui/cursor-x-y-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/cursor-x-y-003.html rename to tests/wpt/tests/css/css-ui/cursor-x-y-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/historical/moz-user-modify-01.html b/tests/wpt/tests/css/css-ui/historical/moz-user-modify-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/historical/moz-user-modify-01.html rename to tests/wpt/tests/css/css-ui/historical/moz-user-modify-01.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/historical/moz-user-modify-02.html b/tests/wpt/tests/css/css-ui/historical/moz-user-modify-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/historical/moz-user-modify-02.html rename to tests/wpt/tests/css/css-ui/historical/moz-user-modify-02.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/historical/moz-user-modify-03.html b/tests/wpt/tests/css/css-ui/historical/moz-user-modify-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/historical/moz-user-modify-03.html rename to tests/wpt/tests/css/css-ui/historical/moz-user-modify-03.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/historical/user-modify-01.html b/tests/wpt/tests/css/css-ui/historical/user-modify-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/historical/user-modify-01.html rename to tests/wpt/tests/css/css-ui/historical/user-modify-01.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/historical/user-modify-02.html b/tests/wpt/tests/css/css-ui/historical/user-modify-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/historical/user-modify-02.html rename to tests/wpt/tests/css/css-ui/historical/user-modify-02.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/historical/user-modify-03.html b/tests/wpt/tests/css/css-ui/historical/user-modify-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/historical/user-modify-03.html rename to tests/wpt/tests/css/css-ui/historical/user-modify-03.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/historical/webkit-user-modify-01.html b/tests/wpt/tests/css/css-ui/historical/webkit-user-modify-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/historical/webkit-user-modify-01.html rename to tests/wpt/tests/css/css-ui/historical/webkit-user-modify-01.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/historical/webkit-user-modify-02.html b/tests/wpt/tests/css/css-ui/historical/webkit-user-modify-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/historical/webkit-user-modify-02.html rename to tests/wpt/tests/css/css-ui/historical/webkit-user-modify-02.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/historical/webkit-user-modify-03.html b/tests/wpt/tests/css/css-ui/historical/webkit-user-modify-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/historical/webkit-user-modify-03.html rename to tests/wpt/tests/css/css-ui/historical/webkit-user-modify-03.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/inheritance.html b/tests/wpt/tests/css/css-ui/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/inheritance.html rename to tests/wpt/tests/css/css-ui/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/input-security-auto-sensitive-text-input-ref.html b/tests/wpt/tests/css/css-ui/input-security-auto-sensitive-text-input-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/input-security-auto-sensitive-text-input-ref.html rename to tests/wpt/tests/css/css-ui/input-security-auto-sensitive-text-input-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/input-security-auto-sensitive-text-input.html b/tests/wpt/tests/css/css-ui/input-security-auto-sensitive-text-input.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/input-security-auto-sensitive-text-input.html rename to tests/wpt/tests/css/css-ui/input-security-auto-sensitive-text-input.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/input-security-computed.html b/tests/wpt/tests/css/css-ui/input-security-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/input-security-computed.html rename to tests/wpt/tests/css/css-ui/input-security-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/input-security-non-sensitive-elements-ref.html b/tests/wpt/tests/css/css-ui/input-security-non-sensitive-elements-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/input-security-non-sensitive-elements-ref.html rename to tests/wpt/tests/css/css-ui/input-security-non-sensitive-elements-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/input-security-non-sensitive-elements.html b/tests/wpt/tests/css/css-ui/input-security-non-sensitive-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/input-security-non-sensitive-elements.html rename to tests/wpt/tests/css/css-ui/input-security-non-sensitive-elements.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/input-security-none-sensitive-text-input-ref.html b/tests/wpt/tests/css/css-ui/input-security-none-sensitive-text-input-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/input-security-none-sensitive-text-input-ref.html rename to tests/wpt/tests/css/css-ui/input-security-none-sensitive-text-input-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/input-security-none-sensitive-text-input.html b/tests/wpt/tests/css/css-ui/input-security-none-sensitive-text-input.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/input-security-none-sensitive-text-input.html rename to tests/wpt/tests/css/css-ui/input-security-none-sensitive-text-input.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/input-security-parsing.html b/tests/wpt/tests/css/css-ui/input-security-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/input-security-parsing.html rename to tests/wpt/tests/css/css-ui/input-security-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-001.html b/tests/wpt/tests/css/css-ui/nav-dir-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-001.html rename to tests/wpt/tests/css/css-ui/nav-dir-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-002.html b/tests/wpt/tests/css/css-ui/nav-dir-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-002.html rename to tests/wpt/tests/css/css-ui/nav-dir-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-003.html b/tests/wpt/tests/css/css-ui/nav-dir-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-003.html rename to tests/wpt/tests/css/css-ui/nav-dir-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-004.html b/tests/wpt/tests/css/css-ui/nav-dir-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-004.html rename to tests/wpt/tests/css/css-ui/nav-dir-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-005.html b/tests/wpt/tests/css/css-ui/nav-dir-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-005.html rename to tests/wpt/tests/css/css-ui/nav-dir-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-missing-1.html b/tests/wpt/tests/css/css-ui/nav-dir-missing-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-missing-1.html rename to tests/wpt/tests/css/css-ui/nav-dir-missing-1.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-missing-2.html b/tests/wpt/tests/css/css-ui/nav-dir-missing-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-missing-2.html rename to tests/wpt/tests/css/css-ui/nav-dir-missing-2.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-missing-3.html b/tests/wpt/tests/css/css-ui/nav-dir-missing-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-missing-3.html rename to tests/wpt/tests/css/css-ui/nav-dir-missing-3.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-missing-4.html b/tests/wpt/tests/css/css-ui/nav-dir-missing-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-missing-4.html rename to tests/wpt/tests/css/css-ui/nav-dir-missing-4.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-target-001.html b/tests/wpt/tests/css/css-ui/nav-dir-target-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-target-001.html rename to tests/wpt/tests/css/css-ui/nav-dir-target-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-target-002.html b/tests/wpt/tests/css/css-ui/nav-dir-target-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-target-002.html rename to tests/wpt/tests/css/css-ui/nav-dir-target-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-target-003.html b/tests/wpt/tests/css/css-ui/nav-dir-target-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-target-003.html rename to tests/wpt/tests/css/css-ui/nav-dir-target-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-target-004.html b/tests/wpt/tests/css/css-ui/nav-dir-target-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-target-004.html rename to tests/wpt/tests/css/css-ui/nav-dir-target-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-target-005.html b/tests/wpt/tests/css/css-ui/nav-dir-target-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-target-005.html rename to tests/wpt/tests/css/css-ui/nav-dir-target-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-dir-target-006.html b/tests/wpt/tests/css/css-ui/nav-dir-target-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-dir-target-006.html rename to tests/wpt/tests/css/css-ui/nav-dir-target-006.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-000.html b/tests/wpt/tests/css/css-ui/nav-down-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-000.html rename to tests/wpt/tests/css/css-ui/nav-down-000.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-001.html b/tests/wpt/tests/css/css-ui/nav-down-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-001.html rename to tests/wpt/tests/css/css-ui/nav-down-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-002.html b/tests/wpt/tests/css/css-ui/nav-down-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-002.html rename to tests/wpt/tests/css/css-ui/nav-down-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-003.html b/tests/wpt/tests/css/css-ui/nav-down-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-003.html rename to tests/wpt/tests/css/css-ui/nav-down-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-004.html b/tests/wpt/tests/css/css-ui/nav-down-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-004.html rename to tests/wpt/tests/css/css-ui/nav-down-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-005.html b/tests/wpt/tests/css/css-ui/nav-down-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-005.html rename to tests/wpt/tests/css/css-ui/nav-down-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-006.html b/tests/wpt/tests/css/css-ui/nav-down-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-006.html rename to tests/wpt/tests/css/css-ui/nav-down-006.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-007.html b/tests/wpt/tests/css/css-ui/nav-down-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-007.html rename to tests/wpt/tests/css/css-ui/nav-down-007.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-008.html b/tests/wpt/tests/css/css-ui/nav-down-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-008.html rename to tests/wpt/tests/css/css-ui/nav-down-008.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-009.html b/tests/wpt/tests/css/css-ui/nav-down-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-009.html rename to tests/wpt/tests/css/css-ui/nav-down-009.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-010.html b/tests/wpt/tests/css/css-ui/nav-down-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-010.html rename to tests/wpt/tests/css/css-ui/nav-down-010.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-011.html b/tests/wpt/tests/css/css-ui/nav-down-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-011.html rename to tests/wpt/tests/css/css-ui/nav-down-011.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-012.html b/tests/wpt/tests/css/css-ui/nav-down-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-012.html rename to tests/wpt/tests/css/css-ui/nav-down-012.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-013.html b/tests/wpt/tests/css/css-ui/nav-down-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-013.html rename to tests/wpt/tests/css/css-ui/nav-down-013.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-014.html b/tests/wpt/tests/css/css-ui/nav-down-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-014.html rename to tests/wpt/tests/css/css-ui/nav-down-014.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-015.html b/tests/wpt/tests/css/css-ui/nav-down-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-015.html rename to tests/wpt/tests/css/css-ui/nav-down-015.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-down-016.html b/tests/wpt/tests/css/css-ui/nav-down-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-down-016.html rename to tests/wpt/tests/css/css-ui/nav-down-016.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-000.html b/tests/wpt/tests/css/css-ui/nav-left-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-000.html rename to tests/wpt/tests/css/css-ui/nav-left-000.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-001.html b/tests/wpt/tests/css/css-ui/nav-left-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-001.html rename to tests/wpt/tests/css/css-ui/nav-left-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-002.html b/tests/wpt/tests/css/css-ui/nav-left-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-002.html rename to tests/wpt/tests/css/css-ui/nav-left-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-003.html b/tests/wpt/tests/css/css-ui/nav-left-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-003.html rename to tests/wpt/tests/css/css-ui/nav-left-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-004.html b/tests/wpt/tests/css/css-ui/nav-left-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-004.html rename to tests/wpt/tests/css/css-ui/nav-left-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-005.html b/tests/wpt/tests/css/css-ui/nav-left-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-005.html rename to tests/wpt/tests/css/css-ui/nav-left-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-006.html b/tests/wpt/tests/css/css-ui/nav-left-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-006.html rename to tests/wpt/tests/css/css-ui/nav-left-006.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-007.html b/tests/wpt/tests/css/css-ui/nav-left-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-007.html rename to tests/wpt/tests/css/css-ui/nav-left-007.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-008.html b/tests/wpt/tests/css/css-ui/nav-left-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-008.html rename to tests/wpt/tests/css/css-ui/nav-left-008.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-009.html b/tests/wpt/tests/css/css-ui/nav-left-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-009.html rename to tests/wpt/tests/css/css-ui/nav-left-009.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-010.html b/tests/wpt/tests/css/css-ui/nav-left-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-010.html rename to tests/wpt/tests/css/css-ui/nav-left-010.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-011.html b/tests/wpt/tests/css/css-ui/nav-left-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-011.html rename to tests/wpt/tests/css/css-ui/nav-left-011.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-012.html b/tests/wpt/tests/css/css-ui/nav-left-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-012.html rename to tests/wpt/tests/css/css-ui/nav-left-012.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-013.html b/tests/wpt/tests/css/css-ui/nav-left-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-013.html rename to tests/wpt/tests/css/css-ui/nav-left-013.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-014.html b/tests/wpt/tests/css/css-ui/nav-left-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-014.html rename to tests/wpt/tests/css/css-ui/nav-left-014.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-015.html b/tests/wpt/tests/css/css-ui/nav-left-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-015.html rename to tests/wpt/tests/css/css-ui/nav-left-015.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-left-016.html b/tests/wpt/tests/css/css-ui/nav-left-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-left-016.html rename to tests/wpt/tests/css/css-ui/nav-left-016.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-000.html b/tests/wpt/tests/css/css-ui/nav-right-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-000.html rename to tests/wpt/tests/css/css-ui/nav-right-000.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-001.html b/tests/wpt/tests/css/css-ui/nav-right-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-001.html rename to tests/wpt/tests/css/css-ui/nav-right-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-002.html b/tests/wpt/tests/css/css-ui/nav-right-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-002.html rename to tests/wpt/tests/css/css-ui/nav-right-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-003.html b/tests/wpt/tests/css/css-ui/nav-right-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-003.html rename to tests/wpt/tests/css/css-ui/nav-right-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-004.html b/tests/wpt/tests/css/css-ui/nav-right-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-004.html rename to tests/wpt/tests/css/css-ui/nav-right-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-005.html b/tests/wpt/tests/css/css-ui/nav-right-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-005.html rename to tests/wpt/tests/css/css-ui/nav-right-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-006.html b/tests/wpt/tests/css/css-ui/nav-right-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-006.html rename to tests/wpt/tests/css/css-ui/nav-right-006.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-007.html b/tests/wpt/tests/css/css-ui/nav-right-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-007.html rename to tests/wpt/tests/css/css-ui/nav-right-007.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-008.html b/tests/wpt/tests/css/css-ui/nav-right-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-008.html rename to tests/wpt/tests/css/css-ui/nav-right-008.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-009.html b/tests/wpt/tests/css/css-ui/nav-right-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-009.html rename to tests/wpt/tests/css/css-ui/nav-right-009.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-010.html b/tests/wpt/tests/css/css-ui/nav-right-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-010.html rename to tests/wpt/tests/css/css-ui/nav-right-010.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-011.html b/tests/wpt/tests/css/css-ui/nav-right-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-011.html rename to tests/wpt/tests/css/css-ui/nav-right-011.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-012.html b/tests/wpt/tests/css/css-ui/nav-right-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-012.html rename to tests/wpt/tests/css/css-ui/nav-right-012.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-013.html b/tests/wpt/tests/css/css-ui/nav-right-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-013.html rename to tests/wpt/tests/css/css-ui/nav-right-013.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-014.html b/tests/wpt/tests/css/css-ui/nav-right-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-014.html rename to tests/wpt/tests/css/css-ui/nav-right-014.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-015.html b/tests/wpt/tests/css/css-ui/nav-right-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-015.html rename to tests/wpt/tests/css/css-ui/nav-right-015.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-right-016.html b/tests/wpt/tests/css/css-ui/nav-right-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-right-016.html rename to tests/wpt/tests/css/css-ui/nav-right-016.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-000.html b/tests/wpt/tests/css/css-ui/nav-up-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-000.html rename to tests/wpt/tests/css/css-ui/nav-up-000.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-001.html b/tests/wpt/tests/css/css-ui/nav-up-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-001.html rename to tests/wpt/tests/css/css-ui/nav-up-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-002.html b/tests/wpt/tests/css/css-ui/nav-up-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-002.html rename to tests/wpt/tests/css/css-ui/nav-up-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-003.html b/tests/wpt/tests/css/css-ui/nav-up-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-003.html rename to tests/wpt/tests/css/css-ui/nav-up-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-004.html b/tests/wpt/tests/css/css-ui/nav-up-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-004.html rename to tests/wpt/tests/css/css-ui/nav-up-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-005.html b/tests/wpt/tests/css/css-ui/nav-up-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-005.html rename to tests/wpt/tests/css/css-ui/nav-up-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-006.html b/tests/wpt/tests/css/css-ui/nav-up-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-006.html rename to tests/wpt/tests/css/css-ui/nav-up-006.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-007.html b/tests/wpt/tests/css/css-ui/nav-up-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-007.html rename to tests/wpt/tests/css/css-ui/nav-up-007.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-008.html b/tests/wpt/tests/css/css-ui/nav-up-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-008.html rename to tests/wpt/tests/css/css-ui/nav-up-008.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-009.html b/tests/wpt/tests/css/css-ui/nav-up-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-009.html rename to tests/wpt/tests/css/css-ui/nav-up-009.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-010.html b/tests/wpt/tests/css/css-ui/nav-up-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-010.html rename to tests/wpt/tests/css/css-ui/nav-up-010.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-011.html b/tests/wpt/tests/css/css-ui/nav-up-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-011.html rename to tests/wpt/tests/css/css-ui/nav-up-011.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-012.html b/tests/wpt/tests/css/css-ui/nav-up-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-012.html rename to tests/wpt/tests/css/css-ui/nav-up-012.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-013.html b/tests/wpt/tests/css/css-ui/nav-up-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-013.html rename to tests/wpt/tests/css/css-ui/nav-up-013.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-014.html b/tests/wpt/tests/css/css-ui/nav-up-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-014.html rename to tests/wpt/tests/css/css-ui/nav-up-014.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-015.html b/tests/wpt/tests/css/css-ui/nav-up-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-015.html rename to tests/wpt/tests/css/css-ui/nav-up-015.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nav-up-016.html b/tests/wpt/tests/css/css-ui/nav-up-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nav-up-016.html rename to tests/wpt/tests/css/css-ui/nav-up-016.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/neg-outline-offset-border-radius-crash.html b/tests/wpt/tests/css/css-ui/neg-outline-offset-border-radius-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/neg-outline-offset-border-radius-crash.html rename to tests/wpt/tests/css/css-ui/neg-outline-offset-border-radius-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/nothing-below-ref.html b/tests/wpt/tests/css/css-ui/nothing-below-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/nothing-below-ref.html rename to tests/wpt/tests/css/css-ui/nothing-below-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-001.html b/tests/wpt/tests/css/css-ui/outline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-001.html rename to tests/wpt/tests/css/css-ui/outline-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-002.html b/tests/wpt/tests/css/css-ui/outline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-002.html rename to tests/wpt/tests/css/css-ui/outline-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-003.html b/tests/wpt/tests/css/css-ui/outline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-003.html rename to tests/wpt/tests/css/css-ui/outline-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-004.html b/tests/wpt/tests/css/css-ui/outline-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-004.html rename to tests/wpt/tests/css/css-ui/outline-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-005.html b/tests/wpt/tests/css/css-ui/outline-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-005.html rename to tests/wpt/tests/css/css-ui/outline-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-006.html b/tests/wpt/tests/css/css-ui/outline-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-006.html rename to tests/wpt/tests/css/css-ui/outline-006.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-007.html b/tests/wpt/tests/css/css-ui/outline-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-007.html rename to tests/wpt/tests/css/css-ui/outline-007.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-008.html b/tests/wpt/tests/css/css-ui/outline-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-008.html rename to tests/wpt/tests/css/css-ui/outline-008.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-009.html b/tests/wpt/tests/css/css-ui/outline-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-009.html rename to tests/wpt/tests/css/css-ui/outline-009.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-010.html b/tests/wpt/tests/css/css-ui/outline-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-010.html rename to tests/wpt/tests/css/css-ui/outline-010.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-011.html b/tests/wpt/tests/css/css-ui/outline-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-011.html rename to tests/wpt/tests/css/css-ui/outline-011.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-012.html b/tests/wpt/tests/css/css-ui/outline-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-012.html rename to tests/wpt/tests/css/css-ui/outline-012.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-013.html b/tests/wpt/tests/css/css-ui/outline-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-013.html rename to tests/wpt/tests/css/css-ui/outline-013.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-014.html b/tests/wpt/tests/css/css-ui/outline-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-014.html rename to tests/wpt/tests/css/css-ui/outline-014.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-015.html b/tests/wpt/tests/css/css-ui/outline-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-015.html rename to tests/wpt/tests/css/css-ui/outline-015.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-016.html b/tests/wpt/tests/css/css-ui/outline-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-016.html rename to tests/wpt/tests/css/css-ui/outline-016.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-017.html b/tests/wpt/tests/css/css-ui/outline-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-017.html rename to tests/wpt/tests/css/css-ui/outline-017.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-018.html b/tests/wpt/tests/css/css-ui/outline-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-018.html rename to tests/wpt/tests/css/css-ui/outline-018.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-019.html b/tests/wpt/tests/css/css-ui/outline-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-019.html rename to tests/wpt/tests/css/css-ui/outline-019.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-020.html b/tests/wpt/tests/css/css-ui/outline-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-020.html rename to tests/wpt/tests/css/css-ui/outline-020.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-021.html b/tests/wpt/tests/css/css-ui/outline-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-021.html rename to tests/wpt/tests/css/css-ui/outline-021.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-022.html b/tests/wpt/tests/css/css-ui/outline-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-022.html rename to tests/wpt/tests/css/css-ui/outline-022.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-023.html b/tests/wpt/tests/css/css-ui/outline-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-023.html rename to tests/wpt/tests/css/css-ui/outline-023.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-024.html b/tests/wpt/tests/css/css-ui/outline-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-024.html rename to tests/wpt/tests/css/css-ui/outline-024.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-025.html b/tests/wpt/tests/css/css-ui/outline-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-025.html rename to tests/wpt/tests/css/css-ui/outline-025.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-026.html b/tests/wpt/tests/css/css-ui/outline-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-026.html rename to tests/wpt/tests/css/css-ui/outline-026.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-027.html b/tests/wpt/tests/css/css-ui/outline-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-027.html rename to tests/wpt/tests/css/css-ui/outline-027.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-028.html b/tests/wpt/tests/css/css-ui/outline-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-028.html rename to tests/wpt/tests/css/css-ui/outline-028.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-auto-dynamic-change-ref.html b/tests/wpt/tests/css/css-ui/outline-auto-dynamic-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-auto-dynamic-change-ref.html rename to tests/wpt/tests/css/css-ui/outline-auto-dynamic-change-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-auto-dynamic-change.html b/tests/wpt/tests/css/css-ui/outline-auto-dynamic-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-auto-dynamic-change.html rename to tests/wpt/tests/css/css-ui/outline-auto-dynamic-change.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-color-001.html b/tests/wpt/tests/css/css-ui/outline-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-color-001.html rename to tests/wpt/tests/css/css-ui/outline-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-negative-offset-composited-scroll.html b/tests/wpt/tests/css/css-ui/outline-negative-offset-composited-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-negative-offset-composited-scroll.html rename to tests/wpt/tests/css/css-ui/outline-negative-offset-composited-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-offset-001.html b/tests/wpt/tests/css/css-ui/outline-offset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-offset-001.html rename to tests/wpt/tests/css/css-ui/outline-offset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-offset-table-001-notref.html b/tests/wpt/tests/css/css-ui/outline-offset-table-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-offset-table-001-notref.html rename to tests/wpt/tests/css/css-ui/outline-offset-table-001-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-offset-table-001.html b/tests/wpt/tests/css/css-ui/outline-offset-table-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-offset-table-001.html rename to tests/wpt/tests/css/css-ui/outline-offset-table-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-offset.html b/tests/wpt/tests/css/css-ui/outline-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-offset.html rename to tests/wpt/tests/css/css-ui/outline-offset.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-style-011.html b/tests/wpt/tests/css/css-ui/outline-style-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-style-011.html rename to tests/wpt/tests/css/css-ui/outline-style-011.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-style-012.html b/tests/wpt/tests/css/css-ui/outline-style-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-style-012.html rename to tests/wpt/tests/css/css-ui/outline-style-012.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-style-013.html b/tests/wpt/tests/css/css-ui/outline-style-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-style-013.html rename to tests/wpt/tests/css/css-ui/outline-style-013.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-style-014.html b/tests/wpt/tests/css/css-ui/outline-style-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-style-014.html rename to tests/wpt/tests/css/css-ui/outline-style-014.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-style-inherit-ref.html b/tests/wpt/tests/css/css-ui/outline-style-inherit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-style-inherit-ref.html rename to tests/wpt/tests/css/css-ui/outline-style-inherit-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-style-inherit.html b/tests/wpt/tests/css/css-ui/outline-style-inherit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-style-inherit.html rename to tests/wpt/tests/css/css-ui/outline-style-inherit.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-with-001-crash.html b/tests/wpt/tests/css/css-ui/outline-with-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-with-001-crash.html rename to tests/wpt/tests/css/css-ui/outline-with-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/outline-with-padding-001.html b/tests/wpt/tests/css/css-ui/outline-with-padding-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/outline-with-padding-001.html rename to tests/wpt/tests/css/css-ui/outline-with-padding-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/box-sizing-computed.html b/tests/wpt/tests/css/css-ui/parsing/box-sizing-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/box-sizing-computed.html rename to tests/wpt/tests/css/css-ui/parsing/box-sizing-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/box-sizing-invalid.html b/tests/wpt/tests/css/css-ui/parsing/box-sizing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/box-sizing-invalid.html rename to tests/wpt/tests/css/css-ui/parsing/box-sizing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/box-sizing-valid.html b/tests/wpt/tests/css/css-ui/parsing/box-sizing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/box-sizing-valid.html rename to tests/wpt/tests/css/css-ui/parsing/box-sizing-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-computed.html b/tests/wpt/tests/css/css-ui/parsing/caret-color-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-computed.html rename to tests/wpt/tests/css/css-ui/parsing/caret-color-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-invalid.html b/tests/wpt/tests/css/css-ui/parsing/caret-color-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-invalid.html rename to tests/wpt/tests/css/css-ui/parsing/caret-color-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-valid.html b/tests/wpt/tests/css/css-ui/parsing/caret-color-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-valid.html rename to tests/wpt/tests/css/css-ui/parsing/caret-color-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/cursor-computed.html b/tests/wpt/tests/css/css-ui/parsing/cursor-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/cursor-computed.html rename to tests/wpt/tests/css/css-ui/parsing/cursor-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/cursor-invalid.html b/tests/wpt/tests/css/css-ui/parsing/cursor-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/cursor-invalid.html rename to tests/wpt/tests/css/css-ui/parsing/cursor-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/cursor-valid.html b/tests/wpt/tests/css/css-ui/parsing/cursor-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/cursor-valid.html rename to tests/wpt/tests/css/css-ui/parsing/cursor-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-computed.html b/tests/wpt/tests/css/css-ui/parsing/outline-color-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-computed.html rename to tests/wpt/tests/css/css-ui/parsing/outline-color-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-invalid.html b/tests/wpt/tests/css/css-ui/parsing/outline-color-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-invalid.html rename to tests/wpt/tests/css/css-ui/parsing/outline-color-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-valid-mandatory.html b/tests/wpt/tests/css/css-ui/parsing/outline-color-valid-mandatory.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-valid-mandatory.html rename to tests/wpt/tests/css/css-ui/parsing/outline-color-valid-mandatory.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-valid-optional.html b/tests/wpt/tests/css/css-ui/parsing/outline-color-valid-optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-valid-optional.html rename to tests/wpt/tests/css/css-ui/parsing/outline-color-valid-optional.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-invalid.html b/tests/wpt/tests/css/css-ui/parsing/outline-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-invalid.html rename to tests/wpt/tests/css/css-ui/parsing/outline-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-offset-computed.html b/tests/wpt/tests/css/css-ui/parsing/outline-offset-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-offset-computed.html rename to tests/wpt/tests/css/css-ui/parsing/outline-offset-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-offset-invalid.html b/tests/wpt/tests/css/css-ui/parsing/outline-offset-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-offset-invalid.html rename to tests/wpt/tests/css/css-ui/parsing/outline-offset-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-offset-valid.html b/tests/wpt/tests/css/css-ui/parsing/outline-offset-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-offset-valid.html rename to tests/wpt/tests/css/css-ui/parsing/outline-offset-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-shorthand.html b/tests/wpt/tests/css/css-ui/parsing/outline-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-shorthand.html rename to tests/wpt/tests/css/css-ui/parsing/outline-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-style-computed.html b/tests/wpt/tests/css/css-ui/parsing/outline-style-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-style-computed.html rename to tests/wpt/tests/css/css-ui/parsing/outline-style-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-style-invalid.html b/tests/wpt/tests/css/css-ui/parsing/outline-style-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-style-invalid.html rename to tests/wpt/tests/css/css-ui/parsing/outline-style-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-style-valid.html b/tests/wpt/tests/css/css-ui/parsing/outline-style-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-style-valid.html rename to tests/wpt/tests/css/css-ui/parsing/outline-style-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-valid-mandatory.html b/tests/wpt/tests/css/css-ui/parsing/outline-valid-mandatory.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-valid-mandatory.html rename to tests/wpt/tests/css/css-ui/parsing/outline-valid-mandatory.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-valid-optional.html b/tests/wpt/tests/css/css-ui/parsing/outline-valid-optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-valid-optional.html rename to tests/wpt/tests/css/css-ui/parsing/outline-valid-optional.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-width-computed.html b/tests/wpt/tests/css/css-ui/parsing/outline-width-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-width-computed.html rename to tests/wpt/tests/css/css-ui/parsing/outline-width-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-width-invalid.html b/tests/wpt/tests/css/css-ui/parsing/outline-width-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-width-invalid.html rename to tests/wpt/tests/css/css-ui/parsing/outline-width-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-width-valid.html b/tests/wpt/tests/css/css-ui/parsing/outline-width-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/outline-width-valid.html rename to tests/wpt/tests/css/css-ui/parsing/outline-width-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/resize-computed.html b/tests/wpt/tests/css/css-ui/parsing/resize-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/resize-computed.html rename to tests/wpt/tests/css/css-ui/parsing/resize-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/resize-invalid.html b/tests/wpt/tests/css/css-ui/parsing/resize-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/resize-invalid.html rename to tests/wpt/tests/css/css-ui/parsing/resize-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/resize-valid.html b/tests/wpt/tests/css/css-ui/parsing/resize-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/resize-valid.html rename to tests/wpt/tests/css/css-ui/parsing/resize-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/text-overflow-computed.html b/tests/wpt/tests/css/css-ui/parsing/text-overflow-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/text-overflow-computed.html rename to tests/wpt/tests/css/css-ui/parsing/text-overflow-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/text-overflow-invalid.html b/tests/wpt/tests/css/css-ui/parsing/text-overflow-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/text-overflow-invalid.html rename to tests/wpt/tests/css/css-ui/parsing/text-overflow-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/text-overflow-valid.html b/tests/wpt/tests/css/css-ui/parsing/text-overflow-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/text-overflow-valid.html rename to tests/wpt/tests/css/css-ui/parsing/text-overflow-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/user-select-computed.html b/tests/wpt/tests/css/css-ui/parsing/user-select-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/user-select-computed.html rename to tests/wpt/tests/css/css-ui/parsing/user-select-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/user-select-invalid.html b/tests/wpt/tests/css/css-ui/parsing/user-select-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/user-select-invalid.html rename to tests/wpt/tests/css/css-ui/parsing/user-select-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/user-select-valid.html b/tests/wpt/tests/css/css-ui/parsing/user-select-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/parsing/user-select-valid.html rename to tests/wpt/tests/css/css-ui/parsing/user-select-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/pointer-events-no-scrollbars-001-ref.html b/tests/wpt/tests/css/css-ui/pointer-events-no-scrollbars-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/pointer-events-no-scrollbars-001-ref.html rename to tests/wpt/tests/css/css-ui/pointer-events-no-scrollbars-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/pointer-events-no-scrollbars-001.html b/tests/wpt/tests/css/css-ui/pointer-events-no-scrollbars-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/pointer-events-no-scrollbars-001.html rename to tests/wpt/tests/css/css-ui/pointer-events-no-scrollbars-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/pointer-events-no-scrollbars-002.html b/tests/wpt/tests/css/css-ui/pointer-events-no-scrollbars-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/pointer-events-no-scrollbars-002.html rename to tests/wpt/tests/css/css-ui/pointer-events-no-scrollbars-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-001-ref.html b/tests/wpt/tests/css/css-ui/reference/box-sizing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-001-ref.html rename to tests/wpt/tests/css/css-ui/reference/box-sizing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-007-ref.html b/tests/wpt/tests/css/css-ui/reference/box-sizing-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-007-ref.html rename to tests/wpt/tests/css/css-ui/reference/box-sizing-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-008-ref.html b/tests/wpt/tests/css/css-ui/reference/box-sizing-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-008-ref.html rename to tests/wpt/tests/css/css-ui/reference/box-sizing-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-009-ref.html b/tests/wpt/tests/css/css-ui/reference/box-sizing-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-009-ref.html rename to tests/wpt/tests/css/css-ui/reference/box-sizing-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-010-ref.html b/tests/wpt/tests/css/css-ui/reference/box-sizing-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-010-ref.html rename to tests/wpt/tests/css/css-ui/reference/box-sizing-010-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-012-ref.html b/tests/wpt/tests/css/css-ui/reference/box-sizing-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-012-ref.html rename to tests/wpt/tests/css/css-ui/reference/box-sizing-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-013-ref.html b/tests/wpt/tests/css/css-ui/reference/box-sizing-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-013-ref.html rename to tests/wpt/tests/css/css-ui/reference/box-sizing-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-020-ref.html b/tests/wpt/tests/css/css-ui/reference/box-sizing-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-020-ref.html rename to tests/wpt/tests/css/css-ui/reference/box-sizing-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-022-ref.html b/tests/wpt/tests/css/css-ui/reference/box-sizing-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-022-ref.html rename to tests/wpt/tests/css/css-ui/reference/box-sizing-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-023-ref.html b/tests/wpt/tests/css/css-ui/reference/box-sizing-023-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/box-sizing-023-ref.html rename to tests/wpt/tests/css/css-ui/reference/box-sizing-023-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/outline-006-ref.html b/tests/wpt/tests/css/css-ui/reference/outline-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/outline-006-ref.html rename to tests/wpt/tests/css/css-ui/reference/outline-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/outline-007-ref.html b/tests/wpt/tests/css/css-ui/reference/outline-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/outline-007-ref.html rename to tests/wpt/tests/css/css-ui/reference/outline-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/outline-020-ref.html b/tests/wpt/tests/css/css-ui/reference/outline-020-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/outline-020-ref.html rename to tests/wpt/tests/css/css-ui/reference/outline-020-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/outline-021-notref.html b/tests/wpt/tests/css/css-ui/reference/outline-021-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/outline-021-notref.html rename to tests/wpt/tests/css/css-ui/reference/outline-021-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/outline-024-ref.html b/tests/wpt/tests/css/css-ui/reference/outline-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/outline-024-ref.html rename to tests/wpt/tests/css/css-ui/reference/outline-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/outline-027-ref.html b/tests/wpt/tests/css/css-ui/reference/outline-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/outline-027-ref.html rename to tests/wpt/tests/css/css-ui/reference/outline-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/outline-028-ref.html b/tests/wpt/tests/css/css-ui/reference/outline-028-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/outline-028-ref.html rename to tests/wpt/tests/css/css-ui/reference/outline-028-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/outline-offset.html b/tests/wpt/tests/css/css-ui/reference/outline-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/outline-offset.html rename to tests/wpt/tests/css/css-ui/reference/outline-offset.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/outline-style-011-ref.html b/tests/wpt/tests/css/css-ui/reference/outline-style-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/outline-style-011-ref.html rename to tests/wpt/tests/css/css-ui/reference/outline-style-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/outline-style-012-ref.html b/tests/wpt/tests/css/css-ui/reference/outline-style-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/outline-style-012-ref.html rename to tests/wpt/tests/css/css-ui/reference/outline-style-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/outline-style-013-ref.html b/tests/wpt/tests/css/css-ui/reference/outline-style-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/outline-style-013-ref.html rename to tests/wpt/tests/css/css-ui/reference/outline-style-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/outline-style-014-ref.html b/tests/wpt/tests/css/css-ui/reference/outline-style-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/outline-style-014-ref.html rename to tests/wpt/tests/css/css-ui/reference/outline-style-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/outline-with-padding-001-ref.html b/tests/wpt/tests/css/css-ui/reference/outline-with-padding-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/outline-with-padding-001-ref.html rename to tests/wpt/tests/css/css-ui/reference/outline-with-padding-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-001-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-001-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-002-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-002-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-005-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-005-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-006-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-006-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-008-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-008-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-012-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-012-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-013-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-013-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-016-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-016-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-021-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-021-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-021-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-021-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-022-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-022-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-022-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-022-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-027-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-027-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-027-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-027-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-028-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-028-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-028-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-028-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-029-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-029-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-029-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-029-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-030-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-030-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-030-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-030-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-change-color-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-change-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-change-color-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-change-color-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-ellipsis-indent-001-ref.html b/tests/wpt/tests/css/css-ui/reference/text-overflow-ellipsis-indent-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/reference/text-overflow-ellipsis-indent-001-ref.html rename to tests/wpt/tests/css/css-ui/reference/text-overflow-ellipsis-indent-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-001.html b/tests/wpt/tests/css/css-ui/resize-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-001.html rename to tests/wpt/tests/css/css-ui/resize-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-002.html b/tests/wpt/tests/css/css-ui/resize-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-002.html rename to tests/wpt/tests/css/css-ui/resize-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-003.html b/tests/wpt/tests/css/css-ui/resize-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-003.html rename to tests/wpt/tests/css/css-ui/resize-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-004.html b/tests/wpt/tests/css/css-ui/resize-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-004.html rename to tests/wpt/tests/css/css-ui/resize-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-005.html b/tests/wpt/tests/css/css-ui/resize-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-005.html rename to tests/wpt/tests/css/css-ui/resize-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-006.html b/tests/wpt/tests/css/css-ui/resize-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-006.html rename to tests/wpt/tests/css/css-ui/resize-006.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-007.html b/tests/wpt/tests/css/css-ui/resize-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-007.html rename to tests/wpt/tests/css/css-ui/resize-007.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-008.html b/tests/wpt/tests/css/css-ui/resize-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-008.html rename to tests/wpt/tests/css/css-ui/resize-008.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-009.html b/tests/wpt/tests/css/css-ui/resize-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-009.html rename to tests/wpt/tests/css/css-ui/resize-009.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-010.html b/tests/wpt/tests/css/css-ui/resize-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-010.html rename to tests/wpt/tests/css/css-ui/resize-010.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-011.html b/tests/wpt/tests/css/css-ui/resize-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-011.html rename to tests/wpt/tests/css/css-ui/resize-011.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-012.html b/tests/wpt/tests/css/css-ui/resize-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-012.html rename to tests/wpt/tests/css/css-ui/resize-012.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-013.html b/tests/wpt/tests/css/css-ui/resize-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-013.html rename to tests/wpt/tests/css/css-ui/resize-013.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-014.html b/tests/wpt/tests/css/css-ui/resize-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-014.html rename to tests/wpt/tests/css/css-ui/resize-014.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-015.html b/tests/wpt/tests/css/css-ui/resize-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-015.html rename to tests/wpt/tests/css/css-ui/resize-015.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-016.html b/tests/wpt/tests/css/css-ui/resize-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-016.html rename to tests/wpt/tests/css/css-ui/resize-016.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-017.html b/tests/wpt/tests/css/css-ui/resize-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-017.html rename to tests/wpt/tests/css/css-ui/resize-017.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-018.html b/tests/wpt/tests/css/css-ui/resize-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-018.html rename to tests/wpt/tests/css/css-ui/resize-018.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-019.html b/tests/wpt/tests/css/css-ui/resize-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-019.html rename to tests/wpt/tests/css/css-ui/resize-019.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-020.html b/tests/wpt/tests/css/css-ui/resize-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-020.html rename to tests/wpt/tests/css/css-ui/resize-020.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-021.html b/tests/wpt/tests/css/css-ui/resize-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-021.html rename to tests/wpt/tests/css/css-ui/resize-021.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-change-margin-ref.html b/tests/wpt/tests/css/css-ui/resize-change-margin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-change-margin-ref.html rename to tests/wpt/tests/css/css-ui/resize-change-margin-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-change-margin.html b/tests/wpt/tests/css/css-ui/resize-change-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-change-margin.html rename to tests/wpt/tests/css/css-ui/resize-change-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-child-will-change-transform-ref.html b/tests/wpt/tests/css/css-ui/resize-child-will-change-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-child-will-change-transform-ref.html rename to tests/wpt/tests/css/css-ui/resize-child-will-change-transform-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-child-will-change-transform.html b/tests/wpt/tests/css/css-ui/resize-child-will-change-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-child-will-change-transform.html rename to tests/wpt/tests/css/css-ui/resize-child-will-change-transform.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-generated-content.html b/tests/wpt/tests/css/css-ui/resize-generated-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/resize-generated-content.html rename to tests/wpt/tests/css/css-ui/resize-generated-content.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/select-cursor-001-manual.html b/tests/wpt/tests/css/css-ui/select-cursor-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/select-cursor-001-manual.html rename to tests/wpt/tests/css/css-ui/select-cursor-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/1x1-red.png b/tests/wpt/tests/css/css-ui/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/1x1-red.png rename to tests/wpt/tests/css/css-ui/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/PngSuite.LICENSE b/tests/wpt/tests/css/css-ui/support/PTS/PngSuite.LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/PngSuite.LICENSE rename to tests/wpt/tests/css/css-ui/support/PTS/PngSuite.LICENSE diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/PngSuite.README b/tests/wpt/tests/css/css-ui/support/PTS/PngSuite.README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/PngSuite.README rename to tests/wpt/tests/css/css-ui/support/PTS/PngSuite.README diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/PngSuite.png b/tests/wpt/tests/css/css-ui/support/PTS/PngSuite.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/PngSuite.png rename to tests/wpt/tests/css/css-ui/support/PTS/PngSuite.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi0g01.png b/tests/wpt/tests/css/css-ui/support/PTS/basi0g01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi0g01.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi0g01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi0g02.png b/tests/wpt/tests/css/css-ui/support/PTS/basi0g02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi0g02.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi0g02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/basi0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi0g08.png b/tests/wpt/tests/css/css-ui/support/PTS/basi0g08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi0g08.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi0g08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi0g16.png b/tests/wpt/tests/css/css-ui/support/PTS/basi0g16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi0g16.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi0g16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/basi2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi2c16.png b/tests/wpt/tests/css/css-ui/support/PTS/basi2c16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi2c16.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi2c16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi3p01.png b/tests/wpt/tests/css/css-ui/support/PTS/basi3p01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi3p01.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi3p01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi3p02.png b/tests/wpt/tests/css/css-ui/support/PTS/basi3p02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi3p02.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi3p02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/basi3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi3p08.png b/tests/wpt/tests/css/css-ui/support/PTS/basi3p08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi3p08.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi3p08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi4a08.png b/tests/wpt/tests/css/css-ui/support/PTS/basi4a08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi4a08.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi4a08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi4a16.png b/tests/wpt/tests/css/css-ui/support/PTS/basi4a16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi4a16.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi4a16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi6a08.png b/tests/wpt/tests/css/css-ui/support/PTS/basi6a08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi6a08.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi6a08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi6a16.png b/tests/wpt/tests/css/css-ui/support/PTS/basi6a16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basi6a16.png rename to tests/wpt/tests/css/css-ui/support/PTS/basi6a16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn0g01.png b/tests/wpt/tests/css/css-ui/support/PTS/basn0g01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn0g01.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn0g01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn0g02.png b/tests/wpt/tests/css/css-ui/support/PTS/basn0g02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn0g02.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn0g02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/basn0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn0g08.png b/tests/wpt/tests/css/css-ui/support/PTS/basn0g08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn0g08.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn0g08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn0g16.png b/tests/wpt/tests/css/css-ui/support/PTS/basn0g16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn0g16.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn0g16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/basn2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn2c16.png b/tests/wpt/tests/css/css-ui/support/PTS/basn2c16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn2c16.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn2c16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn3p01.png b/tests/wpt/tests/css/css-ui/support/PTS/basn3p01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn3p01.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn3p01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn3p02.png b/tests/wpt/tests/css/css-ui/support/PTS/basn3p02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn3p02.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn3p02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/basn3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn3p08.png b/tests/wpt/tests/css/css-ui/support/PTS/basn3p08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn3p08.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn3p08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn4a08.png b/tests/wpt/tests/css/css-ui/support/PTS/basn4a08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn4a08.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn4a08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn4a16.png b/tests/wpt/tests/css/css-ui/support/PTS/basn4a16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn4a16.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn4a16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn6a08.png b/tests/wpt/tests/css/css-ui/support/PTS/basn6a08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn6a08.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn6a08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn6a16.png b/tests/wpt/tests/css/css-ui/support/PTS/basn6a16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/basn6a16.png rename to tests/wpt/tests/css/css-ui/support/PTS/basn6a16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/bgai4a08.png b/tests/wpt/tests/css/css-ui/support/PTS/bgai4a08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/bgai4a08.png rename to tests/wpt/tests/css/css-ui/support/PTS/bgai4a08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/bgai4a16.png b/tests/wpt/tests/css/css-ui/support/PTS/bgai4a16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/bgai4a16.png rename to tests/wpt/tests/css/css-ui/support/PTS/bgai4a16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/bgan6a08.png b/tests/wpt/tests/css/css-ui/support/PTS/bgan6a08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/bgan6a08.png rename to tests/wpt/tests/css/css-ui/support/PTS/bgan6a08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/bgan6a16.png b/tests/wpt/tests/css/css-ui/support/PTS/bgan6a16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/bgan6a16.png rename to tests/wpt/tests/css/css-ui/support/PTS/bgan6a16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/bgbn4a08.png b/tests/wpt/tests/css/css-ui/support/PTS/bgbn4a08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/bgbn4a08.png rename to tests/wpt/tests/css/css-ui/support/PTS/bgbn4a08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/bggn4a16.png b/tests/wpt/tests/css/css-ui/support/PTS/bggn4a16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/bggn4a16.png rename to tests/wpt/tests/css/css-ui/support/PTS/bggn4a16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/bgwn6a08.png b/tests/wpt/tests/css/css-ui/support/PTS/bgwn6a08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/bgwn6a08.png rename to tests/wpt/tests/css/css-ui/support/PTS/bgwn6a08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/bgyn6a16.png b/tests/wpt/tests/css/css-ui/support/PTS/bgyn6a16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/bgyn6a16.png rename to tests/wpt/tests/css/css-ui/support/PTS/bgyn6a16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/ccwn2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/ccwn2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/ccwn2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/ccwn2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/ccwn3p08.png b/tests/wpt/tests/css/css-ui/support/PTS/ccwn3p08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/ccwn3p08.png rename to tests/wpt/tests/css/css-ui/support/PTS/ccwn3p08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cdfn2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/cdfn2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cdfn2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/cdfn2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cdhn2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/cdhn2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cdhn2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/cdhn2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cdsn2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/cdsn2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cdsn2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/cdsn2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cdun2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/cdun2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cdun2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/cdun2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/ch1n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/ch1n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/ch1n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/ch1n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/ch2n3p08.png b/tests/wpt/tests/css/css-ui/support/PTS/ch2n3p08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/ch2n3p08.png rename to tests/wpt/tests/css/css-ui/support/PTS/ch2n3p08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cm0n0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/cm0n0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cm0n0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/cm0n0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cm7n0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/cm7n0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cm7n0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/cm7n0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cm9n0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/cm9n0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cm9n0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/cm9n0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cs3n2c16.png b/tests/wpt/tests/css/css-ui/support/PTS/cs3n2c16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cs3n2c16.png rename to tests/wpt/tests/css/css-ui/support/PTS/cs3n2c16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cs3n3p08.png b/tests/wpt/tests/css/css-ui/support/PTS/cs3n3p08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cs3n3p08.png rename to tests/wpt/tests/css/css-ui/support/PTS/cs3n3p08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cs5n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/cs5n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cs5n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/cs5n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cs5n3p08.png b/tests/wpt/tests/css/css-ui/support/PTS/cs5n3p08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cs5n3p08.png rename to tests/wpt/tests/css/css-ui/support/PTS/cs5n3p08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cs8n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/cs8n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cs8n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/cs8n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cs8n3p08.png b/tests/wpt/tests/css/css-ui/support/PTS/cs8n3p08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cs8n3p08.png rename to tests/wpt/tests/css/css-ui/support/PTS/cs8n3p08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/ct0n0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/ct0n0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/ct0n0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/ct0n0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/ct1n0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/ct1n0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/ct1n0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/ct1n0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cten0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/cten0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cten0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/cten0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/ctfn0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/ctfn0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/ctfn0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/ctfn0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/ctgn0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/ctgn0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/ctgn0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/ctgn0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/cthn0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/cthn0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/cthn0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/cthn0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/ctjn0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/ctjn0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/ctjn0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/ctjn0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/ctzn0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/ctzn0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/ctzn0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/ctzn0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/f00n0g08.png b/tests/wpt/tests/css/css-ui/support/PTS/f00n0g08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/f00n0g08.png rename to tests/wpt/tests/css/css-ui/support/PTS/f00n0g08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/f00n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/f00n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/f00n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/f00n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/f01n0g08.png b/tests/wpt/tests/css/css-ui/support/PTS/f01n0g08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/f01n0g08.png rename to tests/wpt/tests/css/css-ui/support/PTS/f01n0g08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/f01n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/f01n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/f01n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/f01n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/f02n0g08.png b/tests/wpt/tests/css/css-ui/support/PTS/f02n0g08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/f02n0g08.png rename to tests/wpt/tests/css/css-ui/support/PTS/f02n0g08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/f02n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/f02n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/f02n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/f02n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/f03n0g08.png b/tests/wpt/tests/css/css-ui/support/PTS/f03n0g08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/f03n0g08.png rename to tests/wpt/tests/css/css-ui/support/PTS/f03n0g08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/f03n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/f03n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/f03n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/f03n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/f04n0g08.png b/tests/wpt/tests/css/css-ui/support/PTS/f04n0g08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/f04n0g08.png rename to tests/wpt/tests/css/css-ui/support/PTS/f04n0g08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/f04n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/f04n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/f04n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/f04n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/f99n0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/f99n0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/f99n0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/f99n0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g03n0g16.png b/tests/wpt/tests/css/css-ui/support/PTS/g03n0g16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g03n0g16.png rename to tests/wpt/tests/css/css-ui/support/PTS/g03n0g16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g03n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/g03n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g03n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/g03n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g03n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/g03n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g03n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/g03n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g04n0g16.png b/tests/wpt/tests/css/css-ui/support/PTS/g04n0g16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g04n0g16.png rename to tests/wpt/tests/css/css-ui/support/PTS/g04n0g16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g04n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/g04n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g04n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/g04n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g04n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/g04n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g04n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/g04n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g05n0g16.png b/tests/wpt/tests/css/css-ui/support/PTS/g05n0g16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g05n0g16.png rename to tests/wpt/tests/css/css-ui/support/PTS/g05n0g16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g05n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/g05n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g05n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/g05n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g05n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/g05n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g05n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/g05n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g07n0g16.png b/tests/wpt/tests/css/css-ui/support/PTS/g07n0g16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g07n0g16.png rename to tests/wpt/tests/css/css-ui/support/PTS/g07n0g16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g07n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/g07n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g07n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/g07n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g07n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/g07n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g07n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/g07n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g10n0g16.png b/tests/wpt/tests/css/css-ui/support/PTS/g10n0g16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g10n0g16.png rename to tests/wpt/tests/css/css-ui/support/PTS/g10n0g16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g10n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/g10n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g10n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/g10n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g10n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/g10n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g10n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/g10n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g25n0g16.png b/tests/wpt/tests/css/css-ui/support/PTS/g25n0g16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g25n0g16.png rename to tests/wpt/tests/css/css-ui/support/PTS/g25n0g16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g25n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/g25n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g25n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/g25n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/g25n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/g25n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/g25n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/g25n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi1n0g16.png b/tests/wpt/tests/css/css-ui/support/PTS/oi1n0g16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi1n0g16.png rename to tests/wpt/tests/css/css-ui/support/PTS/oi1n0g16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi1n2c16.png b/tests/wpt/tests/css/css-ui/support/PTS/oi1n2c16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi1n2c16.png rename to tests/wpt/tests/css/css-ui/support/PTS/oi1n2c16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi2n0g16.png b/tests/wpt/tests/css/css-ui/support/PTS/oi2n0g16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi2n0g16.png rename to tests/wpt/tests/css/css-ui/support/PTS/oi2n0g16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi2n2c16.png b/tests/wpt/tests/css/css-ui/support/PTS/oi2n2c16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi2n2c16.png rename to tests/wpt/tests/css/css-ui/support/PTS/oi2n2c16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi4n0g16.png b/tests/wpt/tests/css/css-ui/support/PTS/oi4n0g16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi4n0g16.png rename to tests/wpt/tests/css/css-ui/support/PTS/oi4n0g16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi4n2c16.png b/tests/wpt/tests/css/css-ui/support/PTS/oi4n2c16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi4n2c16.png rename to tests/wpt/tests/css/css-ui/support/PTS/oi4n2c16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi9n0g16.png b/tests/wpt/tests/css/css-ui/support/PTS/oi9n0g16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi9n0g16.png rename to tests/wpt/tests/css/css-ui/support/PTS/oi9n0g16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi9n2c16.png b/tests/wpt/tests/css/css-ui/support/PTS/oi9n2c16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/oi9n2c16.png rename to tests/wpt/tests/css/css-ui/support/PTS/oi9n2c16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/pp0n2c16.png b/tests/wpt/tests/css/css-ui/support/PTS/pp0n2c16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/pp0n2c16.png rename to tests/wpt/tests/css/css-ui/support/PTS/pp0n2c16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/pp0n6a08.png b/tests/wpt/tests/css/css-ui/support/PTS/pp0n6a08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/pp0n6a08.png rename to tests/wpt/tests/css/css-ui/support/PTS/pp0n6a08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/ps1n0g08.png b/tests/wpt/tests/css/css-ui/support/PTS/ps1n0g08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/ps1n0g08.png rename to tests/wpt/tests/css/css-ui/support/PTS/ps1n0g08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/ps1n2c16.png b/tests/wpt/tests/css/css-ui/support/PTS/ps1n2c16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/ps1n2c16.png rename to tests/wpt/tests/css/css-ui/support/PTS/ps1n2c16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/ps2n0g08.png b/tests/wpt/tests/css/css-ui/support/PTS/ps2n0g08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/ps2n0g08.png rename to tests/wpt/tests/css/css-ui/support/PTS/ps2n0g08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/ps2n2c16.png b/tests/wpt/tests/css/css-ui/support/PTS/ps2n2c16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/ps2n2c16.png rename to tests/wpt/tests/css/css-ui/support/PTS/ps2n2c16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s01i3p01.png b/tests/wpt/tests/css/css-ui/support/PTS/s01i3p01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s01i3p01.png rename to tests/wpt/tests/css/css-ui/support/PTS/s01i3p01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s01n3p01.png b/tests/wpt/tests/css/css-ui/support/PTS/s01n3p01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s01n3p01.png rename to tests/wpt/tests/css/css-ui/support/PTS/s01n3p01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s02i3p01.png b/tests/wpt/tests/css/css-ui/support/PTS/s02i3p01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s02i3p01.png rename to tests/wpt/tests/css/css-ui/support/PTS/s02i3p01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s02n3p01.png b/tests/wpt/tests/css/css-ui/support/PTS/s02n3p01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s02n3p01.png rename to tests/wpt/tests/css/css-ui/support/PTS/s02n3p01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s03i3p01.png b/tests/wpt/tests/css/css-ui/support/PTS/s03i3p01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s03i3p01.png rename to tests/wpt/tests/css/css-ui/support/PTS/s03i3p01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s03n3p01.png b/tests/wpt/tests/css/css-ui/support/PTS/s03n3p01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s03n3p01.png rename to tests/wpt/tests/css/css-ui/support/PTS/s03n3p01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s04i3p01.png b/tests/wpt/tests/css/css-ui/support/PTS/s04i3p01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s04i3p01.png rename to tests/wpt/tests/css/css-ui/support/PTS/s04i3p01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s04n3p01.png b/tests/wpt/tests/css/css-ui/support/PTS/s04n3p01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s04n3p01.png rename to tests/wpt/tests/css/css-ui/support/PTS/s04n3p01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s05i3p02.png b/tests/wpt/tests/css/css-ui/support/PTS/s05i3p02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s05i3p02.png rename to tests/wpt/tests/css/css-ui/support/PTS/s05i3p02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s05n3p02.png b/tests/wpt/tests/css/css-ui/support/PTS/s05n3p02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s05n3p02.png rename to tests/wpt/tests/css/css-ui/support/PTS/s05n3p02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s06i3p02.png b/tests/wpt/tests/css/css-ui/support/PTS/s06i3p02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s06i3p02.png rename to tests/wpt/tests/css/css-ui/support/PTS/s06i3p02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s06n3p02.png b/tests/wpt/tests/css/css-ui/support/PTS/s06n3p02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s06n3p02.png rename to tests/wpt/tests/css/css-ui/support/PTS/s06n3p02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s07i3p02.png b/tests/wpt/tests/css/css-ui/support/PTS/s07i3p02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s07i3p02.png rename to tests/wpt/tests/css/css-ui/support/PTS/s07i3p02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s07n3p02.png b/tests/wpt/tests/css/css-ui/support/PTS/s07n3p02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s07n3p02.png rename to tests/wpt/tests/css/css-ui/support/PTS/s07n3p02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s08i3p02.png b/tests/wpt/tests/css/css-ui/support/PTS/s08i3p02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s08i3p02.png rename to tests/wpt/tests/css/css-ui/support/PTS/s08i3p02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s08n3p02.png b/tests/wpt/tests/css/css-ui/support/PTS/s08n3p02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s08n3p02.png rename to tests/wpt/tests/css/css-ui/support/PTS/s08n3p02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s09i3p02.png b/tests/wpt/tests/css/css-ui/support/PTS/s09i3p02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s09i3p02.png rename to tests/wpt/tests/css/css-ui/support/PTS/s09i3p02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s09n3p02.png b/tests/wpt/tests/css/css-ui/support/PTS/s09n3p02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s09n3p02.png rename to tests/wpt/tests/css/css-ui/support/PTS/s09n3p02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s32i3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s32i3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s32i3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s32i3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s32n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s32n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s32n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s32n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s33i3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s33i3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s33i3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s33i3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s33n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s33n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s33n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s33n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s34i3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s34i3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s34i3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s34i3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s34n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s34n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s34n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s34n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s35i3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s35i3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s35i3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s35i3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s35n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s35n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s35n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s35n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s36i3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s36i3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s36i3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s36i3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s36n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s36n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s36n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s36n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s37i3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s37i3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s37i3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s37i3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s37n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s37n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s37n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s37n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s38i3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s38i3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s38i3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s38i3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s38n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s38n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s38n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s38n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s39i3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s39i3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s39i3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s39i3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s39n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s39n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s39n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s39n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s40i3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s40i3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s40i3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s40i3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/s40n3p04.png b/tests/wpt/tests/css/css-ui/support/PTS/s40n3p04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/s40n3p04.png rename to tests/wpt/tests/css/css-ui/support/PTS/s40n3p04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbbn0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/tbbn0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbbn0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/tbbn0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbbn2c16.png b/tests/wpt/tests/css/css-ui/support/PTS/tbbn2c16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbbn2c16.png rename to tests/wpt/tests/css/css-ui/support/PTS/tbbn2c16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbbn3p08.png b/tests/wpt/tests/css/css-ui/support/PTS/tbbn3p08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbbn3p08.png rename to tests/wpt/tests/css/css-ui/support/PTS/tbbn3p08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbgn2c16.png b/tests/wpt/tests/css/css-ui/support/PTS/tbgn2c16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbgn2c16.png rename to tests/wpt/tests/css/css-ui/support/PTS/tbgn2c16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbgn3p08.png b/tests/wpt/tests/css/css-ui/support/PTS/tbgn3p08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbgn3p08.png rename to tests/wpt/tests/css/css-ui/support/PTS/tbgn3p08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbrn2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/tbrn2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbrn2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/tbrn2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbwn0g16.png b/tests/wpt/tests/css/css-ui/support/PTS/tbwn0g16.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbwn0g16.png rename to tests/wpt/tests/css/css-ui/support/PTS/tbwn0g16.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbwn3p08.png b/tests/wpt/tests/css/css-ui/support/PTS/tbwn3p08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbwn3p08.png rename to tests/wpt/tests/css/css-ui/support/PTS/tbwn3p08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbyn3p08.png b/tests/wpt/tests/css/css-ui/support/PTS/tbyn3p08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/tbyn3p08.png rename to tests/wpt/tests/css/css-ui/support/PTS/tbyn3p08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/tm3n3p02.png b/tests/wpt/tests/css/css-ui/support/PTS/tm3n3p02.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/tm3n3p02.png rename to tests/wpt/tests/css/css-ui/support/PTS/tm3n3p02.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/tp0n0g08.png b/tests/wpt/tests/css/css-ui/support/PTS/tp0n0g08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/tp0n0g08.png rename to tests/wpt/tests/css/css-ui/support/PTS/tp0n0g08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/tp0n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/tp0n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/tp0n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/tp0n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/tp0n3p08.png b/tests/wpt/tests/css/css-ui/support/PTS/tp0n3p08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/tp0n3p08.png rename to tests/wpt/tests/css/css-ui/support/PTS/tp0n3p08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/tp1n3p08.png b/tests/wpt/tests/css/css-ui/support/PTS/tp1n3p08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/tp1n3p08.png rename to tests/wpt/tests/css/css-ui/support/PTS/tp1n3p08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/xc1n0g08.png b/tests/wpt/tests/css/css-ui/support/PTS/xc1n0g08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/xc1n0g08.png rename to tests/wpt/tests/css/css-ui/support/PTS/xc1n0g08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/xc9n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/xc9n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/xc9n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/xc9n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/xcrn0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/xcrn0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/xcrn0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/xcrn0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/xcsn0g01.png b/tests/wpt/tests/css/css-ui/support/PTS/xcsn0g01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/xcsn0g01.png rename to tests/wpt/tests/css/css-ui/support/PTS/xcsn0g01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/xd0n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/xd0n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/xd0n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/xd0n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/xd3n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/xd3n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/xd3n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/xd3n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/xd9n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/xd9n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/xd9n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/xd9n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/xdtn0g01.png b/tests/wpt/tests/css/css-ui/support/PTS/xdtn0g01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/xdtn0g01.png rename to tests/wpt/tests/css/css-ui/support/PTS/xdtn0g01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/xhdn0g08.png b/tests/wpt/tests/css/css-ui/support/PTS/xhdn0g08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/xhdn0g08.png rename to tests/wpt/tests/css/css-ui/support/PTS/xhdn0g08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/xlfn0g04.png b/tests/wpt/tests/css/css-ui/support/PTS/xlfn0g04.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/xlfn0g04.png rename to tests/wpt/tests/css/css-ui/support/PTS/xlfn0g04.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/xs1n0g01.png b/tests/wpt/tests/css/css-ui/support/PTS/xs1n0g01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/xs1n0g01.png rename to tests/wpt/tests/css/css-ui/support/PTS/xs1n0g01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/xs2n0g01.png b/tests/wpt/tests/css/css-ui/support/PTS/xs2n0g01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/xs2n0g01.png rename to tests/wpt/tests/css/css-ui/support/PTS/xs2n0g01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/xs4n0g01.png b/tests/wpt/tests/css/css-ui/support/PTS/xs4n0g01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/xs4n0g01.png rename to tests/wpt/tests/css/css-ui/support/PTS/xs4n0g01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/xs7n0g01.png b/tests/wpt/tests/css/css-ui/support/PTS/xs7n0g01.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/xs7n0g01.png rename to tests/wpt/tests/css/css-ui/support/PTS/xs7n0g01.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/z00n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/z00n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/z00n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/z00n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/z03n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/z03n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/z03n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/z03n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/z06n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/z06n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/z06n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/z06n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/PTS/z09n2c08.png b/tests/wpt/tests/css/css-ui/support/PTS/z09n2c08.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/PTS/z09n2c08.png rename to tests/wpt/tests/css/css-ui/support/PTS/z09n2c08.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/.htaccess b/tests/wpt/tests/css/css-ui/support/cursors/.htaccess similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/.htaccess rename to tests/wpt/tests/css/css-ui/support/cursors/.htaccess diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/BlueButterfly.ani b/tests/wpt/tests/css/css-ui/support/cursors/BlueButterfly.ani similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/BlueButterfly.ani rename to tests/wpt/tests/css/css-ui/support/cursors/BlueButterfly.ani diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/arrows.ico b/tests/wpt/tests/css/css-ui/support/cursors/arrows.ico similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/arrows.ico rename to tests/wpt/tests/css/css-ui/support/cursors/arrows.ico diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/arrows.png b/tests/wpt/tests/css/css-ui/support/cursors/arrows.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/arrows.png rename to tests/wpt/tests/css/css-ui/support/cursors/arrows.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/basn0g08.gif b/tests/wpt/tests/css/css-ui/support/cursors/basn0g08.gif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/basn0g08.gif rename to tests/wpt/tests/css/css-ui/support/cursors/basn0g08.gif diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/fail.cur b/tests/wpt/tests/css/css-ui/support/cursors/fail.cur similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/fail.cur rename to tests/wpt/tests/css/css-ui/support/cursors/fail.cur diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/fail.png b/tests/wpt/tests/css/css-ui/support/cursors/fail.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/fail.png rename to tests/wpt/tests/css/css-ui/support/cursors/fail.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/not-an-image.foo b/tests/wpt/tests/css/css-ui/support/cursors/not-an-image.foo similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/not-an-image.foo rename to tests/wpt/tests/css/css-ui/support/cursors/not-an-image.foo diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/rainbow.jpg b/tests/wpt/tests/css/css-ui/support/cursors/rainbow.jpg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/rainbow.jpg rename to tests/wpt/tests/css/css-ui/support/cursors/rainbow.jpg diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/tp1n3p08.gif b/tests/wpt/tests/css/css-ui/support/cursors/tp1n3p08.gif similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/tp1n3p08.gif rename to tests/wpt/tests/css/css-ui/support/cursors/tp1n3p08.gif diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/woolly-64.cur b/tests/wpt/tests/css/css-ui/support/cursors/woolly-64.cur similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/woolly-64.cur rename to tests/wpt/tests/css/css-ui/support/cursors/woolly-64.cur diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/woolly-64.ico b/tests/wpt/tests/css/css-ui/support/cursors/woolly-64.ico similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/woolly-64.ico rename to tests/wpt/tests/css/css-ui/support/cursors/woolly-64.ico diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/woolly-64.png b/tests/wpt/tests/css/css-ui/support/cursors/woolly-64.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/woolly-64.png rename to tests/wpt/tests/css/css-ui/support/cursors/woolly-64.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/woolly-64.svg b/tests/wpt/tests/css/css-ui/support/cursors/woolly-64.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/woolly-64.svg rename to tests/wpt/tests/css/css-ui/support/cursors/woolly-64.svg diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/woolly-64.svgz b/tests/wpt/tests/css/css-ui/support/cursors/woolly-64.svgz similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/woolly-64.svgz rename to tests/wpt/tests/css/css-ui/support/cursors/woolly-64.svgz diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/woolly-64.svgz.headers b/tests/wpt/tests/css/css-ui/support/cursors/woolly-64.svgz.headers similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/woolly-64.svgz.headers rename to tests/wpt/tests/css/css-ui/support/cursors/woolly-64.svgz.headers diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/cursors/woolly.svg b/tests/wpt/tests/css/css-ui/support/cursors/woolly.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/cursors/woolly.svg rename to tests/wpt/tests/css/css-ui/support/cursors/woolly.svg diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/green.ico b/tests/wpt/tests/css/css-ui/support/green.ico similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/green.ico rename to tests/wpt/tests/css/css-ui/support/green.ico diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/h100.svg b/tests/wpt/tests/css/css-ui/support/h100.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/h100.svg rename to tests/wpt/tests/css/css-ui/support/h100.svg diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/h100_r1-1.svg b/tests/wpt/tests/css/css-ui/support/h100_r1-1.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/h100_r1-1.svg rename to tests/wpt/tests/css/css-ui/support/h100_r1-1.svg diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-dir-target-001-frame.html b/tests/wpt/tests/css/css-ui/support/nav-dir-target-001-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-dir-target-001-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-dir-target-001-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-dir-target-002-frame.html b/tests/wpt/tests/css/css-ui/support/nav-dir-target-002-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-dir-target-002-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-dir-target-002-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-dir-target-003-frame.html b/tests/wpt/tests/css/css-ui/support/nav-dir-target-003-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-dir-target-003-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-dir-target-003-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-dir-target-004-frame.html b/tests/wpt/tests/css/css-ui/support/nav-dir-target-004-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-dir-target-004-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-dir-target-004-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-dir-target-005-frame.html b/tests/wpt/tests/css/css-ui/support/nav-dir-target-005-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-dir-target-005-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-dir-target-005-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-down-009-frame.html b/tests/wpt/tests/css/css-ui/support/nav-down-009-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-down-009-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-down-009-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-down-010-frame.html b/tests/wpt/tests/css/css-ui/support/nav-down-010-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-down-010-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-down-010-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-down-011-frame.html b/tests/wpt/tests/css/css-ui/support/nav-down-011-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-down-011-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-down-011-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-down-012-frame.html b/tests/wpt/tests/css/css-ui/support/nav-down-012-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-down-012-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-down-012-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-down-013-frame.html b/tests/wpt/tests/css/css-ui/support/nav-down-013-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-down-013-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-down-013-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-left-009-frame.html b/tests/wpt/tests/css/css-ui/support/nav-left-009-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-left-009-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-left-009-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-left-010-frame.html b/tests/wpt/tests/css/css-ui/support/nav-left-010-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-left-010-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-left-010-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-left-011-frame.html b/tests/wpt/tests/css/css-ui/support/nav-left-011-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-left-011-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-left-011-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-left-012-frame.html b/tests/wpt/tests/css/css-ui/support/nav-left-012-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-left-012-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-left-012-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-left-013-frame.html b/tests/wpt/tests/css/css-ui/support/nav-left-013-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-left-013-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-left-013-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-right-009-frame.html b/tests/wpt/tests/css/css-ui/support/nav-right-009-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-right-009-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-right-009-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-right-010-frame.html b/tests/wpt/tests/css/css-ui/support/nav-right-010-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-right-010-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-right-010-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-right-011-frame.html b/tests/wpt/tests/css/css-ui/support/nav-right-011-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-right-011-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-right-011-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-right-012-frame.html b/tests/wpt/tests/css/css-ui/support/nav-right-012-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-right-012-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-right-012-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-right-013-frame.html b/tests/wpt/tests/css/css-ui/support/nav-right-013-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-right-013-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-right-013-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-up-009-frame.html b/tests/wpt/tests/css/css-ui/support/nav-up-009-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-up-009-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-up-009-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-up-010-frame.html b/tests/wpt/tests/css/css-ui/support/nav-up-010-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-up-010-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-up-010-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-up-011-frame.html b/tests/wpt/tests/css/css-ui/support/nav-up-011-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-up-011-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-up-011-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-up-012-frame.html b/tests/wpt/tests/css/css-ui/support/nav-up-012-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-up-012-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-up-012-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/nav-up-013-frame.html b/tests/wpt/tests/css/css-ui/support/nav-up-013-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/nav-up-013-frame.html rename to tests/wpt/tests/css/css-ui/support/nav-up-013-frame.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/orange.png b/tests/wpt/tests/css/css-ui/support/orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/orange.png rename to tests/wpt/tests/css/css-ui/support/orange.png diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/orange.svg b/tests/wpt/tests/css/css-ui/support/orange.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/orange.svg rename to tests/wpt/tests/css/css-ui/support/orange.svg diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/r1-1.svg b/tests/wpt/tests/css/css-ui/support/r1-1.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/r1-1.svg rename to tests/wpt/tests/css/css-ui/support/r1-1.svg diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/red.ico b/tests/wpt/tests/css/css-ui/support/red.ico similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/red.ico rename to tests/wpt/tests/css/css-ui/support/red.ico diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/test.mp4 b/tests/wpt/tests/css/css-ui/support/test.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/test.mp4 rename to tests/wpt/tests/css/css-ui/support/test.mp4 diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/test.ogv b/tests/wpt/tests/css/css-ui/support/test.ogv similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/test.ogv rename to tests/wpt/tests/css/css-ui/support/test.ogv diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/test.webm b/tests/wpt/tests/css/css-ui/support/test.webm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/test.webm rename to tests/wpt/tests/css/css-ui/support/test.webm diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/w100.svg b/tests/wpt/tests/css/css-ui/support/w100.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/w100.svg rename to tests/wpt/tests/css/css-ui/support/w100.svg diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/w100_h100.svg b/tests/wpt/tests/css/css-ui/support/w100_h100.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/w100_h100.svg rename to tests/wpt/tests/css/css-ui/support/w100_h100.svg diff --git a/tests/wpt/web-platform-tests/css/css-ui/support/w100_r1-1.svg b/tests/wpt/tests/css/css-ui/support/w100_r1-1.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/support/w100_r1-1.svg rename to tests/wpt/tests/css/css-ui/support/w100_r1-1.svg diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-001.html b/tests/wpt/tests/css/css-ui/text-overflow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-001.html rename to tests/wpt/tests/css/css-ui/text-overflow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-002.html b/tests/wpt/tests/css/css-ui/text-overflow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-002.html rename to tests/wpt/tests/css/css-ui/text-overflow-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-003.html b/tests/wpt/tests/css/css-ui/text-overflow-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-003.html rename to tests/wpt/tests/css/css-ui/text-overflow-003.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-004.html b/tests/wpt/tests/css/css-ui/text-overflow-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-004.html rename to tests/wpt/tests/css/css-ui/text-overflow-004.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-005.html b/tests/wpt/tests/css/css-ui/text-overflow-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-005.html rename to tests/wpt/tests/css/css-ui/text-overflow-005.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-006.html b/tests/wpt/tests/css/css-ui/text-overflow-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-006.html rename to tests/wpt/tests/css/css-ui/text-overflow-006.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-007.html b/tests/wpt/tests/css/css-ui/text-overflow-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-007.html rename to tests/wpt/tests/css/css-ui/text-overflow-007.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-008.html b/tests/wpt/tests/css/css-ui/text-overflow-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-008.html rename to tests/wpt/tests/css/css-ui/text-overflow-008.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-009.html b/tests/wpt/tests/css/css-ui/text-overflow-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-009.html rename to tests/wpt/tests/css/css-ui/text-overflow-009.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-010.html b/tests/wpt/tests/css/css-ui/text-overflow-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-010.html rename to tests/wpt/tests/css/css-ui/text-overflow-010.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-011.html b/tests/wpt/tests/css/css-ui/text-overflow-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-011.html rename to tests/wpt/tests/css/css-ui/text-overflow-011.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-012.html b/tests/wpt/tests/css/css-ui/text-overflow-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-012.html rename to tests/wpt/tests/css/css-ui/text-overflow-012.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-013.html b/tests/wpt/tests/css/css-ui/text-overflow-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-013.html rename to tests/wpt/tests/css/css-ui/text-overflow-013.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-014.html b/tests/wpt/tests/css/css-ui/text-overflow-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-014.html rename to tests/wpt/tests/css/css-ui/text-overflow-014.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-015.html b/tests/wpt/tests/css/css-ui/text-overflow-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-015.html rename to tests/wpt/tests/css/css-ui/text-overflow-015.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-016.html b/tests/wpt/tests/css/css-ui/text-overflow-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-016.html rename to tests/wpt/tests/css/css-ui/text-overflow-016.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-017.html b/tests/wpt/tests/css/css-ui/text-overflow-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-017.html rename to tests/wpt/tests/css/css-ui/text-overflow-017.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-018.html b/tests/wpt/tests/css/css-ui/text-overflow-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-018.html rename to tests/wpt/tests/css/css-ui/text-overflow-018.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-019.html b/tests/wpt/tests/css/css-ui/text-overflow-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-019.html rename to tests/wpt/tests/css/css-ui/text-overflow-019.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-020.html b/tests/wpt/tests/css/css-ui/text-overflow-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-020.html rename to tests/wpt/tests/css/css-ui/text-overflow-020.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-021.html b/tests/wpt/tests/css/css-ui/text-overflow-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-021.html rename to tests/wpt/tests/css/css-ui/text-overflow-021.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-022.html b/tests/wpt/tests/css/css-ui/text-overflow-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-022.html rename to tests/wpt/tests/css/css-ui/text-overflow-022.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-023.html b/tests/wpt/tests/css/css-ui/text-overflow-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-023.html rename to tests/wpt/tests/css/css-ui/text-overflow-023.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-024-ref.html b/tests/wpt/tests/css/css-ui/text-overflow-024-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-024-ref.html rename to tests/wpt/tests/css/css-ui/text-overflow-024-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-024.html b/tests/wpt/tests/css/css-ui/text-overflow-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-024.html rename to tests/wpt/tests/css/css-ui/text-overflow-024.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-025-ref.html b/tests/wpt/tests/css/css-ui/text-overflow-025-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-025-ref.html rename to tests/wpt/tests/css/css-ui/text-overflow-025-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-025.html b/tests/wpt/tests/css/css-ui/text-overflow-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-025.html rename to tests/wpt/tests/css/css-ui/text-overflow-025.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-026-ref.html b/tests/wpt/tests/css/css-ui/text-overflow-026-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-026-ref.html rename to tests/wpt/tests/css/css-ui/text-overflow-026-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-026.html b/tests/wpt/tests/css/css-ui/text-overflow-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-026.html rename to tests/wpt/tests/css/css-ui/text-overflow-026.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-027.html b/tests/wpt/tests/css/css-ui/text-overflow-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-027.html rename to tests/wpt/tests/css/css-ui/text-overflow-027.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-028.html b/tests/wpt/tests/css/css-ui/text-overflow-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-028.html rename to tests/wpt/tests/css/css-ui/text-overflow-028.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-029.html b/tests/wpt/tests/css/css-ui/text-overflow-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-029.html rename to tests/wpt/tests/css/css-ui/text-overflow-029.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-030.html b/tests/wpt/tests/css/css-ui/text-overflow-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-030.html rename to tests/wpt/tests/css/css-ui/text-overflow-030.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-change-color.html b/tests/wpt/tests/css/css-ui/text-overflow-change-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-change-color.html rename to tests/wpt/tests/css/css-ui/text-overflow-change-color.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-ellipsis-abspos-in-inline-block-crash-001.html b/tests/wpt/tests/css/css-ui/text-overflow-ellipsis-abspos-in-inline-block-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-ellipsis-abspos-in-inline-block-crash-001.html rename to tests/wpt/tests/css/css-ui/text-overflow-ellipsis-abspos-in-inline-block-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-ellipsis-hyphen.html b/tests/wpt/tests/css/css-ui/text-overflow-ellipsis-hyphen.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-ellipsis-hyphen.html rename to tests/wpt/tests/css/css-ui/text-overflow-ellipsis-hyphen.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-ellipsis-indent-001.html b/tests/wpt/tests/css/css-ui/text-overflow-ellipsis-indent-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-ellipsis-indent-001.html rename to tests/wpt/tests/css/css-ui/text-overflow-ellipsis-indent-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-ellipsis-self-painting.html b/tests/wpt/tests/css/css-ui/text-overflow-ellipsis-self-painting.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-ellipsis-self-painting.html rename to tests/wpt/tests/css/css-ui/text-overflow-ellipsis-self-painting.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-ellipsis-width-001.html b/tests/wpt/tests/css/css-ui/text-overflow-ellipsis-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-ellipsis-width-001.html rename to tests/wpt/tests/css/css-ui/text-overflow-ellipsis-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-ref.html b/tests/wpt/tests/css/css-ui/text-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-ref.html rename to tests/wpt/tests/css/css-ui/text-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-ruby-ref.html b/tests/wpt/tests/css/css-ui/text-overflow-ruby-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-ruby-ref.html rename to tests/wpt/tests/css/css-ui/text-overflow-ruby-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow-ruby.html b/tests/wpt/tests/css/css-ui/text-overflow-ruby.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow-ruby.html rename to tests/wpt/tests/css/css-ui/text-overflow-ruby.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/text-overflow.html b/tests/wpt/tests/css/css-ui/text-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/text-overflow.html rename to tests/wpt/tests/css/css-ui/text-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/tools/appearance-build-webkit-reftests.py b/tests/wpt/tests/css/css-ui/tools/appearance-build-webkit-reftests.py similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/tools/appearance-build-webkit-reftests.py rename to tests/wpt/tests/css/css-ui/tools/appearance-build-webkit-reftests.py diff --git a/tests/wpt/web-platform-tests/css/css-ui/tools/build-compute-kind-widget-fallback-props.py b/tests/wpt/tests/css/css-ui/tools/build-compute-kind-widget-fallback-props.py similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/tools/build-compute-kind-widget-fallback-props.py rename to tests/wpt/tests/css/css-ui/tools/build-compute-kind-widget-fallback-props.py diff --git a/tests/wpt/web-platform-tests/css/css-ui/translucent-outline-ref.html b/tests/wpt/tests/css/css-ui/translucent-outline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/translucent-outline-ref.html rename to tests/wpt/tests/css/css-ui/translucent-outline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/translucent-outline.html b/tests/wpt/tests/css/css-ui/translucent-outline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/translucent-outline.html rename to tests/wpt/tests/css/css-ui/translucent-outline.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/user-select-001.html b/tests/wpt/tests/css/css-ui/user-select-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/user-select-001.html rename to tests/wpt/tests/css/css-ui/user-select-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/user-select-inheritance.html b/tests/wpt/tests/css/css-ui/user-select-inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/user-select-inheritance.html rename to tests/wpt/tests/css/css-ui/user-select-inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/user-select-none-in-editable.html b/tests/wpt/tests/css/css-ui/user-select-none-in-editable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/user-select-none-in-editable.html rename to tests/wpt/tests/css/css-ui/user-select-none-in-editable.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/user-select-none-on-input.html b/tests/wpt/tests/css/css-ui/user-select-none-on-input.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/user-select-none-on-input.html rename to tests/wpt/tests/css/css-ui/user-select-none-on-input.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-auto-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-auto-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-auto-001.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-auto-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-auto-input-non-widget-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-auto-input-non-widget-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-auto-input-non-widget-001.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-auto-input-non-widget-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-button-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-button-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-button-001.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-button-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-checkbox-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-checkbox-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-checkbox-001.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-checkbox-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-listbox-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-listbox-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-listbox-001.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-listbox-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-menulist-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-menulist-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-menulist-001.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-menulist-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-menulist-button-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-menulist-button-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-menulist-button-001.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-menulist-button-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-menulist-button-002.tentative.html b/tests/wpt/tests/css/css-ui/webkit-appearance-menulist-button-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-menulist-button-002.tentative.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-menulist-button-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-meter-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-meter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-meter-001.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-meter-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-parsing.html b/tests/wpt/tests/css/css-ui/webkit-appearance-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-parsing.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-progress-bar-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-progress-bar-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-progress-bar-001.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-progress-bar-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-progress-bar-002.html b/tests/wpt/tests/css/css-ui/webkit-appearance-progress-bar-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-progress-bar-002.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-progress-bar-002.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-property.html b/tests/wpt/tests/css/css-ui/webkit-appearance-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-property.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-property.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-radio-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-radio-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-radio-001.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-radio-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-searchfield-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-searchfield-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-searchfield-001.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-searchfield-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-serialization.html b/tests/wpt/tests/css/css-ui/webkit-appearance-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-serialization.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-serialization.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-textarea-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-textarea-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-textarea-001.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-textarea-001.html diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-textfield-001.html b/tests/wpt/tests/css/css-ui/webkit-appearance-textfield-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-textfield-001.html rename to tests/wpt/tests/css/css-ui/webkit-appearance-textfield-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/META.yml b/tests/wpt/tests/css/css-values/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/META.yml rename to tests/wpt/tests/css/css-values/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-values/absolute-length-units-001.html b/tests/wpt/tests/css/css-values/absolute-length-units-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/absolute-length-units-001.html rename to tests/wpt/tests/css/css-values/absolute-length-units-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/absolute_length_units.html b/tests/wpt/tests/css/css-values/absolute_length_units.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/absolute_length_units.html rename to tests/wpt/tests/css/css-values/absolute_length_units.html diff --git a/tests/wpt/web-platform-tests/css/css-values/acos-asin-atan-atan2-computed.html b/tests/wpt/tests/css/css-values/acos-asin-atan-atan2-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/acos-asin-atan-atan2-computed.html rename to tests/wpt/tests/css/css-values/acos-asin-atan-atan2-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-values/acos-asin-atan-atan2-invalid.html b/tests/wpt/tests/css/css-values/acos-asin-atan-atan2-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/acos-asin-atan-atan2-invalid.html rename to tests/wpt/tests/css/css-values/acos-asin-atan-atan2-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/acos-asin-atan-atan2-serialize.html b/tests/wpt/tests/css/css-values/acos-asin-atan-atan2-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/acos-asin-atan-atan2-serialize.html rename to tests/wpt/tests/css/css-values/acos-asin-atan-atan2-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-values/angle-units-001.html b/tests/wpt/tests/css/css-values/angle-units-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/angle-units-001.html rename to tests/wpt/tests/css/css-values/angle-units-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/angle-units-002.html b/tests/wpt/tests/css/css-values/angle-units-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/angle-units-002.html rename to tests/wpt/tests/css/css-values/angle-units-002.html diff --git a/tests/wpt/web-platform-tests/css/css-values/angle-units-003.html b/tests/wpt/tests/css/css-values/angle-units-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/angle-units-003.html rename to tests/wpt/tests/css/css-values/angle-units-003.html diff --git a/tests/wpt/web-platform-tests/css/css-values/angle-units-004.html b/tests/wpt/tests/css/css-values/angle-units-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/angle-units-004.html rename to tests/wpt/tests/css/css-values/angle-units-004.html diff --git a/tests/wpt/web-platform-tests/css/css-values/angle-units-005.html b/tests/wpt/tests/css/css-values/angle-units-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/angle-units-005.html rename to tests/wpt/tests/css/css-values/angle-units-005.html diff --git a/tests/wpt/web-platform-tests/css/css-values/animations/calc-interpolation.html b/tests/wpt/tests/css/css-values/animations/calc-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/animations/calc-interpolation.html rename to tests/wpt/tests/css/css-values/animations/calc-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-values/animations/line-height-lh-transition.html b/tests/wpt/tests/css/css-values/animations/line-height-lh-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/animations/line-height-lh-transition.html rename to tests/wpt/tests/css/css-values/animations/line-height-lh-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-color-invalid-cast.html b/tests/wpt/tests/css/css-values/attr-color-invalid-cast.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-color-invalid-cast.html rename to tests/wpt/tests/css/css-values/attr-color-invalid-cast.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-color-invalid-fallback.html b/tests/wpt/tests/css/css-values/attr-color-invalid-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-color-invalid-fallback.html rename to tests/wpt/tests/css/css-values/attr-color-invalid-fallback.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-color-valid.html b/tests/wpt/tests/css/css-values/attr-color-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-color-valid.html rename to tests/wpt/tests/css/css-values/attr-color-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-in-max.html b/tests/wpt/tests/css/css-values/attr-in-max.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-in-max.html rename to tests/wpt/tests/css/css-values/attr-in-max.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-invalid-type-001.html b/tests/wpt/tests/css/css-values/attr-invalid-type-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-invalid-type-001.html rename to tests/wpt/tests/css/css-values/attr-invalid-type-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-invalid-type-002.html b/tests/wpt/tests/css/css-values/attr-invalid-type-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-invalid-type-002.html rename to tests/wpt/tests/css/css-values/attr-invalid-type-002.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-invalid-type-008.html b/tests/wpt/tests/css/css-values/attr-invalid-type-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-invalid-type-008.html rename to tests/wpt/tests/css/css-values/attr-invalid-type-008.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-length-invalid-cast.html b/tests/wpt/tests/css/css-values/attr-length-invalid-cast.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-length-invalid-cast.html rename to tests/wpt/tests/css/css-values/attr-length-invalid-cast.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-length-invalid-fallback.html b/tests/wpt/tests/css/css-values/attr-length-invalid-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-length-invalid-fallback.html rename to tests/wpt/tests/css/css-values/attr-length-invalid-fallback.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-length-valid-zero-nofallback.html b/tests/wpt/tests/css/css-values/attr-length-valid-zero-nofallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-length-valid-zero-nofallback.html rename to tests/wpt/tests/css/css-values/attr-length-valid-zero-nofallback.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-length-valid-zero.html b/tests/wpt/tests/css/css-values/attr-length-valid-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-length-valid-zero.html rename to tests/wpt/tests/css/css-values/attr-length-valid-zero.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-length-valid.html b/tests/wpt/tests/css/css-values/attr-length-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-length-valid.html rename to tests/wpt/tests/css/css-values/attr-length-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-px-invalid-cast.html b/tests/wpt/tests/css/css-values/attr-px-invalid-cast.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-px-invalid-cast.html rename to tests/wpt/tests/css/css-values/attr-px-invalid-cast.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-px-invalid-fallback.html b/tests/wpt/tests/css/css-values/attr-px-invalid-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-px-invalid-fallback.html rename to tests/wpt/tests/css/css-values/attr-px-invalid-fallback.html diff --git a/tests/wpt/web-platform-tests/css/css-values/attr-px-valid.html b/tests/wpt/tests/css/css-values/attr-px-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/attr-px-valid.html rename to tests/wpt/tests/css/css-values/attr-px-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-angle-values.html b/tests/wpt/tests/css/css-values/calc-angle-values.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-angle-values.html rename to tests/wpt/tests/css/css-values/calc-angle-values.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-background-image-gradient-1-ref.html b/tests/wpt/tests/css/css-values/calc-background-image-gradient-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-background-image-gradient-1-ref.html rename to tests/wpt/tests/css/css-values/calc-background-image-gradient-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-background-image-gradient-1.html b/tests/wpt/tests/css/css-values/calc-background-image-gradient-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-background-image-gradient-1.html rename to tests/wpt/tests/css/css-values/calc-background-image-gradient-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-background-linear-gradient-1-ref.html b/tests/wpt/tests/css/css-values/calc-background-linear-gradient-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-background-linear-gradient-1-ref.html rename to tests/wpt/tests/css/css-values/calc-background-linear-gradient-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-background-linear-gradient-1.html b/tests/wpt/tests/css/css-values/calc-background-linear-gradient-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-background-linear-gradient-1.html rename to tests/wpt/tests/css/css-values/calc-background-linear-gradient-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-background-position-002.html b/tests/wpt/tests/css/css-values/calc-background-position-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-background-position-002.html rename to tests/wpt/tests/css/css-values/calc-background-position-002.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-background-position-003.html b/tests/wpt/tests/css/css-values/calc-background-position-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-background-position-003.html rename to tests/wpt/tests/css/css-values/calc-background-position-003.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-background-position-1-ref.html b/tests/wpt/tests/css/css-values/calc-background-position-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-background-position-1-ref.html rename to tests/wpt/tests/css/css-values/calc-background-position-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-background-position-1.html b/tests/wpt/tests/css/css-values/calc-background-position-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-background-position-1.html rename to tests/wpt/tests/css/css-values/calc-background-position-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-background-size-1-ref.html b/tests/wpt/tests/css/css-values/calc-background-size-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-background-size-1-ref.html rename to tests/wpt/tests/css/css-values/calc-background-size-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-background-size-1.html b/tests/wpt/tests/css/css-values/calc-background-size-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-background-size-1.html rename to tests/wpt/tests/css/css-values/calc-background-size-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-border-radius-1-ref.html b/tests/wpt/tests/css/css-values/calc-border-radius-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-border-radius-1-ref.html rename to tests/wpt/tests/css/css-values/calc-border-radius-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-border-radius-1.html b/tests/wpt/tests/css/css-values/calc-border-radius-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-border-radius-1.html rename to tests/wpt/tests/css/css-values/calc-border-radius-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-catch-divide-by-0.html b/tests/wpt/tests/css/css-values/calc-catch-divide-by-0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-catch-divide-by-0.html rename to tests/wpt/tests/css/css-values/calc-catch-divide-by-0.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-ch-ex-lang-ref.html b/tests/wpt/tests/css/css-values/calc-ch-ex-lang-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-ch-ex-lang-ref.html rename to tests/wpt/tests/css/css-values/calc-ch-ex-lang-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-ch-ex-lang.html b/tests/wpt/tests/css/css-values/calc-ch-ex-lang.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-ch-ex-lang.html rename to tests/wpt/tests/css/css-values/calc-ch-ex-lang.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-height-block-1-ref.html b/tests/wpt/tests/css/css-values/calc-height-block-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-height-block-1-ref.html rename to tests/wpt/tests/css/css-values/calc-height-block-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-height-block-1.html b/tests/wpt/tests/css/css-values/calc-height-block-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-height-block-1.html rename to tests/wpt/tests/css/css-values/calc-height-block-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-height-table-1-ref.html b/tests/wpt/tests/css/css-values/calc-height-table-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-height-table-1-ref.html rename to tests/wpt/tests/css/css-values/calc-height-table-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-height-table-1.html b/tests/wpt/tests/css/css-values/calc-height-table-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-height-table-1.html rename to tests/wpt/tests/css/css-values/calc-height-table-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-in-calc.html b/tests/wpt/tests/css/css-values/calc-in-calc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-in-calc.html rename to tests/wpt/tests/css/css-values/calc-in-calc.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-in-color-001.html b/tests/wpt/tests/css/css-values/calc-in-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-in-color-001.html rename to tests/wpt/tests/css/css-values/calc-in-color-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-in-counter-001-ref.xhtml b/tests/wpt/tests/css/css-values/calc-in-counter-001-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-in-counter-001-ref.xhtml rename to tests/wpt/tests/css/css-values/calc-in-counter-001-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-in-counter-001.xhtml b/tests/wpt/tests/css/css-values/calc-in-counter-001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-in-counter-001.xhtml rename to tests/wpt/tests/css/css-values/calc-in-counter-001.xhtml diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-in-font-feature-settings.html b/tests/wpt/tests/css/css-values/calc-in-font-feature-settings.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-in-font-feature-settings.html rename to tests/wpt/tests/css/css-values/calc-in-font-feature-settings.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-in-max.html b/tests/wpt/tests/css/css-values/calc-in-max.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-in-max.html rename to tests/wpt/tests/css/css-values/calc-in-max.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-in-media-queries-001.html b/tests/wpt/tests/css/css-values/calc-in-media-queries-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-in-media-queries-001.html rename to tests/wpt/tests/css/css-values/calc-in-media-queries-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-in-media-queries-002.html b/tests/wpt/tests/css/css-values/calc-in-media-queries-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-in-media-queries-002.html rename to tests/wpt/tests/css/css-values/calc-in-media-queries-002.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-in-media-queries-with-mixed-units.html b/tests/wpt/tests/css/css-values/calc-in-media-queries-with-mixed-units.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-in-media-queries-with-mixed-units.html rename to tests/wpt/tests/css/css-values/calc-in-media-queries-with-mixed-units.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-computed.html b/tests/wpt/tests/css/css-values/calc-infinity-nan-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-computed.html rename to tests/wpt/tests/css/css-values/calc-infinity-nan-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-serialize-angle.html b/tests/wpt/tests/css/css-values/calc-infinity-nan-serialize-angle.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-serialize-angle.html rename to tests/wpt/tests/css/css-values/calc-infinity-nan-serialize-angle.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-serialize-length.html b/tests/wpt/tests/css/css-values/calc-infinity-nan-serialize-length.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-serialize-length.html rename to tests/wpt/tests/css/css-values/calc-infinity-nan-serialize-length.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-serialize-number.html b/tests/wpt/tests/css/css-values/calc-infinity-nan-serialize-number.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-serialize-number.html rename to tests/wpt/tests/css/css-values/calc-infinity-nan-serialize-number.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-serialize-resolution.html b/tests/wpt/tests/css/css-values/calc-infinity-nan-serialize-resolution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-serialize-resolution.html rename to tests/wpt/tests/css/css-values/calc-infinity-nan-serialize-resolution.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-serialize-time.html b/tests/wpt/tests/css/css-values/calc-infinity-nan-serialize-time.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-serialize-time.html rename to tests/wpt/tests/css/css-values/calc-infinity-nan-serialize-time.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-integer.html b/tests/wpt/tests/css/css-values/calc-integer.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-integer.html rename to tests/wpt/tests/css/css-values/calc-integer.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-invalid-parsing.html b/tests/wpt/tests/css/css-values/calc-invalid-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-invalid-parsing.html rename to tests/wpt/tests/css/css-values/calc-invalid-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-invalid-range-clamping.html b/tests/wpt/tests/css/css-values/calc-invalid-range-clamping.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-invalid-range-clamping.html rename to tests/wpt/tests/css/css-values/calc-invalid-range-clamping.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-letter-spacing.html b/tests/wpt/tests/css/css-values/calc-letter-spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-letter-spacing.html rename to tests/wpt/tests/css/css-values/calc-letter-spacing.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-linear-radial-conic-gradient-001.html b/tests/wpt/tests/css/css-values/calc-linear-radial-conic-gradient-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-linear-radial-conic-gradient-001.html rename to tests/wpt/tests/css/css-values/calc-linear-radial-conic-gradient-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-margin-block-1-ref.html b/tests/wpt/tests/css/css-values/calc-margin-block-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-margin-block-1-ref.html rename to tests/wpt/tests/css/css-values/calc-margin-block-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-margin-block-1.html b/tests/wpt/tests/css/css-values/calc-margin-block-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-margin-block-1.html rename to tests/wpt/tests/css/css-values/calc-margin-block-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-max-height-block-1-ref.html b/tests/wpt/tests/css/css-values/calc-max-height-block-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-max-height-block-1-ref.html rename to tests/wpt/tests/css/css-values/calc-max-height-block-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-max-height-block-1.html b/tests/wpt/tests/css/css-values/calc-max-height-block-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-max-height-block-1.html rename to tests/wpt/tests/css/css-values/calc-max-height-block-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-max-width-block-1.html b/tests/wpt/tests/css/css-values/calc-max-width-block-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-max-width-block-1.html rename to tests/wpt/tests/css/css-values/calc-max-width-block-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-max-width-block-intrinsic-1-ref.html b/tests/wpt/tests/css/css-values/calc-max-width-block-intrinsic-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-max-width-block-intrinsic-1-ref.html rename to tests/wpt/tests/css/css-values/calc-max-width-block-intrinsic-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-max-width-block-intrinsic-1.html b/tests/wpt/tests/css/css-values/calc-max-width-block-intrinsic-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-max-width-block-intrinsic-1.html rename to tests/wpt/tests/css/css-values/calc-max-width-block-intrinsic-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-min-height-block-1.html b/tests/wpt/tests/css/css-values/calc-min-height-block-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-min-height-block-1.html rename to tests/wpt/tests/css/css-values/calc-min-height-block-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-min-height.html b/tests/wpt/tests/css/css-values/calc-min-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-min-height.html rename to tests/wpt/tests/css/css-values/calc-min-height.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-min-width-block-1.html b/tests/wpt/tests/css/css-values/calc-min-width-block-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-min-width-block-1.html rename to tests/wpt/tests/css/css-values/calc-min-width-block-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-min-width-block-intrinsic-1-ref.html b/tests/wpt/tests/css/css-values/calc-min-width-block-intrinsic-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-min-width-block-intrinsic-1-ref.html rename to tests/wpt/tests/css/css-values/calc-min-width-block-intrinsic-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-min-width-block-intrinsic-1.html b/tests/wpt/tests/css/css-values/calc-min-width-block-intrinsic-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-min-width-block-intrinsic-1.html rename to tests/wpt/tests/css/css-values/calc-min-width-block-intrinsic-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-nesting-002.html b/tests/wpt/tests/css/css-values/calc-nesting-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-nesting-002.html rename to tests/wpt/tests/css/css-values/calc-nesting-002.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-nesting.html b/tests/wpt/tests/css/css-values/calc-nesting.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-nesting.html rename to tests/wpt/tests/css/css-values/calc-nesting.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-numbers.html b/tests/wpt/tests/css/css-values/calc-numbers.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-numbers.html rename to tests/wpt/tests/css/css-values/calc-numbers.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-offsets-absolute-bottom-1.html b/tests/wpt/tests/css/css-values/calc-offsets-absolute-bottom-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-offsets-absolute-bottom-1.html rename to tests/wpt/tests/css/css-values/calc-offsets-absolute-bottom-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-offsets-absolute-left-1.html b/tests/wpt/tests/css/css-values/calc-offsets-absolute-left-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-offsets-absolute-left-1.html rename to tests/wpt/tests/css/css-values/calc-offsets-absolute-left-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-offsets-absolute-right-1.html b/tests/wpt/tests/css/css-values/calc-offsets-absolute-right-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-offsets-absolute-right-1.html rename to tests/wpt/tests/css/css-values/calc-offsets-absolute-right-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-offsets-absolute-top-1-ref.html b/tests/wpt/tests/css/css-values/calc-offsets-absolute-top-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-offsets-absolute-top-1-ref.html rename to tests/wpt/tests/css/css-values/calc-offsets-absolute-top-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-offsets-absolute-top-1.html b/tests/wpt/tests/css/css-values/calc-offsets-absolute-top-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-offsets-absolute-top-1.html rename to tests/wpt/tests/css/css-values/calc-offsets-absolute-top-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-offsets-relative-bottom-1.html b/tests/wpt/tests/css/css-values/calc-offsets-relative-bottom-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-offsets-relative-bottom-1.html rename to tests/wpt/tests/css/css-values/calc-offsets-relative-bottom-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-offsets-relative-left-1-ref.html b/tests/wpt/tests/css/css-values/calc-offsets-relative-left-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-offsets-relative-left-1-ref.html rename to tests/wpt/tests/css/css-values/calc-offsets-relative-left-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-offsets-relative-left-1.html b/tests/wpt/tests/css/css-values/calc-offsets-relative-left-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-offsets-relative-left-1.html rename to tests/wpt/tests/css/css-values/calc-offsets-relative-left-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-offsets-relative-right-1.html b/tests/wpt/tests/css/css-values/calc-offsets-relative-right-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-offsets-relative-right-1.html rename to tests/wpt/tests/css/css-values/calc-offsets-relative-right-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-offsets-relative-top-1-ref.html b/tests/wpt/tests/css/css-values/calc-offsets-relative-top-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-offsets-relative-top-1-ref.html rename to tests/wpt/tests/css/css-values/calc-offsets-relative-top-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-offsets-relative-top-1.html b/tests/wpt/tests/css/css-values/calc-offsets-relative-top-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-offsets-relative-top-1.html rename to tests/wpt/tests/css/css-values/calc-offsets-relative-top-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-padding-block-1-ref.html b/tests/wpt/tests/css/css-values/calc-padding-block-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-padding-block-1-ref.html rename to tests/wpt/tests/css/css-values/calc-padding-block-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-padding-block-1.html b/tests/wpt/tests/css/css-values/calc-padding-block-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-padding-block-1.html rename to tests/wpt/tests/css/css-values/calc-padding-block-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-parenthesis-stack.html b/tests/wpt/tests/css/css-values/calc-parenthesis-stack.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-parenthesis-stack.html rename to tests/wpt/tests/css/css-values/calc-parenthesis-stack.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-positive-fraction-001.html b/tests/wpt/tests/css/css-values/calc-positive-fraction-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-positive-fraction-001.html rename to tests/wpt/tests/css/css-values/calc-positive-fraction-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-rem-lang-ref.html b/tests/wpt/tests/css/css-values/calc-rem-lang-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-rem-lang-ref.html rename to tests/wpt/tests/css/css-values/calc-rem-lang-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-rem-lang.html b/tests/wpt/tests/css/css-values/calc-rem-lang.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-rem-lang.html rename to tests/wpt/tests/css/css-values/calc-rem-lang.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-rgb-percent-001.html b/tests/wpt/tests/css/css-values/calc-rgb-percent-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-rgb-percent-001.html rename to tests/wpt/tests/css/css-values/calc-rgb-percent-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-rounding-001.html b/tests/wpt/tests/css/css-values/calc-rounding-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-rounding-001.html rename to tests/wpt/tests/css/css-values/calc-rounding-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-rounds-to-integer.html b/tests/wpt/tests/css/css-values/calc-rounds-to-integer.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-rounds-to-integer.html rename to tests/wpt/tests/css/css-values/calc-rounds-to-integer.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-serialization-002.html b/tests/wpt/tests/css/css-values/calc-serialization-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-serialization-002.html rename to tests/wpt/tests/css/css-values/calc-serialization-002.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-serialization.html b/tests/wpt/tests/css/css-values/calc-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-serialization.html rename to tests/wpt/tests/css/css-values/calc-serialization.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-text-indent-1-ref.html b/tests/wpt/tests/css/css-values/calc-text-indent-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-text-indent-1-ref.html rename to tests/wpt/tests/css/css-values/calc-text-indent-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-text-indent-1.html b/tests/wpt/tests/css/css-values/calc-text-indent-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-text-indent-1.html rename to tests/wpt/tests/css/css-values/calc-text-indent-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-text-indent-intrinsic-1-ref.html b/tests/wpt/tests/css/css-values/calc-text-indent-intrinsic-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-text-indent-intrinsic-1-ref.html rename to tests/wpt/tests/css/css-values/calc-text-indent-intrinsic-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-text-indent-intrinsic-1.html b/tests/wpt/tests/css/css-values/calc-text-indent-intrinsic-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-text-indent-intrinsic-1.html rename to tests/wpt/tests/css/css-values/calc-text-indent-intrinsic-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-time-values.html b/tests/wpt/tests/css/css-values/calc-time-values.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-time-values.html rename to tests/wpt/tests/css/css-values/calc-time-values.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-transform-origin-1-ref.html b/tests/wpt/tests/css/css-values/calc-transform-origin-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-transform-origin-1-ref.html rename to tests/wpt/tests/css/css-values/calc-transform-origin-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-transform-origin-1.html b/tests/wpt/tests/css/css-values/calc-transform-origin-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-transform-origin-1.html rename to tests/wpt/tests/css/css-values/calc-transform-origin-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-unit-analysis.html b/tests/wpt/tests/css/css-values/calc-unit-analysis.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-unit-analysis.html rename to tests/wpt/tests/css/css-values/calc-unit-analysis.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-vertical-align-1-ref.html b/tests/wpt/tests/css/css-values/calc-vertical-align-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-vertical-align-1-ref.html rename to tests/wpt/tests/css/css-values/calc-vertical-align-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-vertical-align-1.html b/tests/wpt/tests/css/css-values/calc-vertical-align-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-vertical-align-1.html rename to tests/wpt/tests/css/css-values/calc-vertical-align-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-width-block-1-ref.html b/tests/wpt/tests/css/css-values/calc-width-block-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-width-block-1-ref.html rename to tests/wpt/tests/css/css-values/calc-width-block-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-width-block-1.html b/tests/wpt/tests/css/css-values/calc-width-block-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-width-block-1.html rename to tests/wpt/tests/css/css-values/calc-width-block-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-width-block-intrinsic-1-ref.html b/tests/wpt/tests/css/css-values/calc-width-block-intrinsic-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-width-block-intrinsic-1-ref.html rename to tests/wpt/tests/css/css-values/calc-width-block-intrinsic-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-width-block-intrinsic-1.html b/tests/wpt/tests/css/css-values/calc-width-block-intrinsic-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-width-block-intrinsic-1.html rename to tests/wpt/tests/css/css-values/calc-width-block-intrinsic-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-width-table-auto-1-ref.html b/tests/wpt/tests/css/css-values/calc-width-table-auto-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-width-table-auto-1-ref.html rename to tests/wpt/tests/css/css-values/calc-width-table-auto-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-width-table-auto-1.html b/tests/wpt/tests/css/css-values/calc-width-table-auto-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-width-table-auto-1.html rename to tests/wpt/tests/css/css-values/calc-width-table-auto-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-width-table-fixed-1-ref.html b/tests/wpt/tests/css/css-values/calc-width-table-fixed-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-width-table-fixed-1-ref.html rename to tests/wpt/tests/css/css-values/calc-width-table-fixed-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-width-table-fixed-1.html b/tests/wpt/tests/css/css-values/calc-width-table-fixed-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-width-table-fixed-1.html rename to tests/wpt/tests/css/css-values/calc-width-table-fixed-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-z-index-fractions-001.html b/tests/wpt/tests/css/css-values/calc-z-index-fractions-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-z-index-fractions-001.html rename to tests/wpt/tests/css/css-values/calc-z-index-fractions-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-zero-percent-height.html b/tests/wpt/tests/css/css-values/calc-zero-percent-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/calc-zero-percent-height.html rename to tests/wpt/tests/css/css-values/calc-zero-percent-height.html diff --git a/tests/wpt/web-platform-tests/css/css-values/cap-unit-001.html b/tests/wpt/tests/css/css-values/cap-unit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/cap-unit-001.html rename to tests/wpt/tests/css/css-values/cap-unit-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-empty-pseudo-recalc-on-font-load.html b/tests/wpt/tests/css/css-values/ch-empty-pseudo-recalc-on-font-load.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-empty-pseudo-recalc-on-font-load.html rename to tests/wpt/tests/css/css-values/ch-empty-pseudo-recalc-on-font-load.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-pseudo-recalc-on-font-load.html b/tests/wpt/tests/css/css-values/ch-pseudo-recalc-on-font-load.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-pseudo-recalc-on-font-load.html rename to tests/wpt/tests/css/css-values/ch-pseudo-recalc-on-font-load.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-recalc-on-font-load.html b/tests/wpt/tests/css/css-values/ch-recalc-on-font-load.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-recalc-on-font-load.html rename to tests/wpt/tests/css/css-values/ch-recalc-on-font-load.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-unit-001.html b/tests/wpt/tests/css/css-values/ch-unit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-unit-001.html rename to tests/wpt/tests/css/css-values/ch-unit-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-unit-002.html b/tests/wpt/tests/css/css-values/ch-unit-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-unit-002.html rename to tests/wpt/tests/css/css-values/ch-unit-002.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-unit-003.html b/tests/wpt/tests/css/css-values/ch-unit-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-unit-003.html rename to tests/wpt/tests/css/css-values/ch-unit-003.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-unit-004.html b/tests/wpt/tests/css/css-values/ch-unit-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-unit-004.html rename to tests/wpt/tests/css/css-values/ch-unit-004.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-unit-008.html b/tests/wpt/tests/css/css-values/ch-unit-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-unit-008.html rename to tests/wpt/tests/css/css-values/ch-unit-008.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-unit-009.html b/tests/wpt/tests/css/css-values/ch-unit-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-unit-009.html rename to tests/wpt/tests/css/css-values/ch-unit-009.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-unit-010.html b/tests/wpt/tests/css/css-values/ch-unit-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-unit-010.html rename to tests/wpt/tests/css/css-values/ch-unit-010.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-unit-011.html b/tests/wpt/tests/css/css-values/ch-unit-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-unit-011.html rename to tests/wpt/tests/css/css-values/ch-unit-011.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-unit-012.html b/tests/wpt/tests/css/css-values/ch-unit-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-unit-012.html rename to tests/wpt/tests/css/css-values/ch-unit-012.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-unit-016.html b/tests/wpt/tests/css/css-values/ch-unit-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-unit-016.html rename to tests/wpt/tests/css/css-values/ch-unit-016.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-unit-017.html b/tests/wpt/tests/css/css-values/ch-unit-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-unit-017.html rename to tests/wpt/tests/css/css-values/ch-unit-017.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ch-unit-018.html b/tests/wpt/tests/css/css-values/ch-unit-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ch-unit-018.html rename to tests/wpt/tests/css/css-values/ch-unit-018.html diff --git a/tests/wpt/web-platform-tests/css/css-values/clamp-length-computed.html b/tests/wpt/tests/css/css-values/clamp-length-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/clamp-length-computed.html rename to tests/wpt/tests/css/css-values/clamp-length-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-values/clamp-length-invalid.html b/tests/wpt/tests/css/css-values/clamp-length-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/clamp-length-invalid.html rename to tests/wpt/tests/css/css-values/clamp-length-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/clamp-length-serialize.html b/tests/wpt/tests/css/css-values/clamp-length-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/clamp-length-serialize.html rename to tests/wpt/tests/css/css-values/clamp-length-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-values/crashtests/viewport-unit-inline-style-crash.html b/tests/wpt/tests/css/css-values/crashtests/viewport-unit-inline-style-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/crashtests/viewport-unit-inline-style-crash.html rename to tests/wpt/tests/css/css-values/crashtests/viewport-unit-inline-style-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-values/dynamic-viewport-units-rule-cache.html b/tests/wpt/tests/css/css-values/dynamic-viewport-units-rule-cache.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/dynamic-viewport-units-rule-cache.html rename to tests/wpt/tests/css/css-values/dynamic-viewport-units-rule-cache.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ex-calc-expression-001-ref.html b/tests/wpt/tests/css/css-values/ex-calc-expression-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ex-calc-expression-001-ref.html rename to tests/wpt/tests/css/css-values/ex-calc-expression-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ex-calc-expression-001.html b/tests/wpt/tests/css/css-values/ex-calc-expression-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ex-calc-expression-001.html rename to tests/wpt/tests/css/css-values/ex-calc-expression-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ex-unit-001.html b/tests/wpt/tests/css/css-values/ex-unit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ex-unit-001.html rename to tests/wpt/tests/css/css-values/ex-unit-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ex-unit-002.html b/tests/wpt/tests/css/css-values/ex-unit-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ex-unit-002.html rename to tests/wpt/tests/css/css-values/ex-unit-002.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ex-unit-003.html b/tests/wpt/tests/css/css-values/ex-unit-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ex-unit-003.html rename to tests/wpt/tests/css/css-values/ex-unit-003.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ex-unit-004.html b/tests/wpt/tests/css/css-values/ex-unit-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ex-unit-004.html rename to tests/wpt/tests/css/css-values/ex-unit-004.html diff --git a/tests/wpt/web-platform-tests/css/css-values/exp-log-compute.html b/tests/wpt/tests/css/css-values/exp-log-compute.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/exp-log-compute.html rename to tests/wpt/tests/css/css-values/exp-log-compute.html diff --git a/tests/wpt/web-platform-tests/css/css-values/exp-log-invalid.html b/tests/wpt/tests/css/css-values/exp-log-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/exp-log-invalid.html rename to tests/wpt/tests/css/css-values/exp-log-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/exp-log-serialize.html b/tests/wpt/tests/css/css-values/exp-log-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/exp-log-serialize.html rename to tests/wpt/tests/css/css-values/exp-log-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-values/getComputedStyle-border-radius-001.html b/tests/wpt/tests/css/css-values/getComputedStyle-border-radius-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/getComputedStyle-border-radius-001.html rename to tests/wpt/tests/css/css-values/getComputedStyle-border-radius-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/getComputedStyle-border-radius-002.html b/tests/wpt/tests/css/css-values/getComputedStyle-border-radius-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/getComputedStyle-border-radius-002.html rename to tests/wpt/tests/css/css-values/getComputedStyle-border-radius-002.html diff --git a/tests/wpt/web-platform-tests/css/css-values/getComputedStyle-border-radius-003.html b/tests/wpt/tests/css/css-values/getComputedStyle-border-radius-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/getComputedStyle-border-radius-003.html rename to tests/wpt/tests/css/css-values/getComputedStyle-border-radius-003.html diff --git a/tests/wpt/web-platform-tests/css/css-values/getComputedStyle-calc-mixed-units-001.html b/tests/wpt/tests/css/css-values/getComputedStyle-calc-mixed-units-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/getComputedStyle-calc-mixed-units-001.html rename to tests/wpt/tests/css/css-values/getComputedStyle-calc-mixed-units-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/getComputedStyle-calc-mixed-units-002.html b/tests/wpt/tests/css/css-values/getComputedStyle-calc-mixed-units-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/getComputedStyle-calc-mixed-units-002.html rename to tests/wpt/tests/css/css-values/getComputedStyle-calc-mixed-units-002.html diff --git a/tests/wpt/web-platform-tests/css/css-values/hypot-pow-sqrt-computed.html b/tests/wpt/tests/css/css-values/hypot-pow-sqrt-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/hypot-pow-sqrt-computed.html rename to tests/wpt/tests/css/css-values/hypot-pow-sqrt-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-values/hypot-pow-sqrt-invalid.html b/tests/wpt/tests/css/css-values/hypot-pow-sqrt-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/hypot-pow-sqrt-invalid.html rename to tests/wpt/tests/css/css-values/hypot-pow-sqrt-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/hypot-pow-sqrt-serialize.html b/tests/wpt/tests/css/css-values/hypot-pow-sqrt-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/hypot-pow-sqrt-serialize.html rename to tests/wpt/tests/css/css-values/hypot-pow-sqrt-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ic-unit-001.html b/tests/wpt/tests/css/css-values/ic-unit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ic-unit-001.html rename to tests/wpt/tests/css/css-values/ic-unit-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ic-unit-002.html b/tests/wpt/tests/css/css-values/ic-unit-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ic-unit-002.html rename to tests/wpt/tests/css/css-values/ic-unit-002.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ic-unit-003.html b/tests/wpt/tests/css/css-values/ic-unit-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ic-unit-003.html rename to tests/wpt/tests/css/css-values/ic-unit-003.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ic-unit-004.html b/tests/wpt/tests/css/css-values/ic-unit-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ic-unit-004.html rename to tests/wpt/tests/css/css-values/ic-unit-004.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ic-unit-008.html b/tests/wpt/tests/css/css-values/ic-unit-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ic-unit-008.html rename to tests/wpt/tests/css/css-values/ic-unit-008.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ic-unit-009.html b/tests/wpt/tests/css/css-values/ic-unit-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ic-unit-009.html rename to tests/wpt/tests/css/css-values/ic-unit-009.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ic-unit-010.html b/tests/wpt/tests/css/css-values/ic-unit-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ic-unit-010.html rename to tests/wpt/tests/css/css-values/ic-unit-010.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ic-unit-011.html b/tests/wpt/tests/css/css-values/ic-unit-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ic-unit-011.html rename to tests/wpt/tests/css/css-values/ic-unit-011.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ic-unit-012.html b/tests/wpt/tests/css/css-values/ic-unit-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ic-unit-012.html rename to tests/wpt/tests/css/css-values/ic-unit-012.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ic-unit-013.html b/tests/wpt/tests/css/css-values/ic-unit-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ic-unit-013.html rename to tests/wpt/tests/css/css-values/ic-unit-013.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ic-unit-014.html b/tests/wpt/tests/css/css-values/ic-unit-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ic-unit-014.html rename to tests/wpt/tests/css/css-values/ic-unit-014.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ic-unit-015.html b/tests/wpt/tests/css/css-values/ic-unit-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ic-unit-015.html rename to tests/wpt/tests/css/css-values/ic-unit-015.html diff --git a/tests/wpt/web-platform-tests/css/css-values/integer_interpolation_round_half_towards_positive_infinity_order.html b/tests/wpt/tests/css/css-values/integer_interpolation_round_half_towards_positive_infinity_order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/integer_interpolation_round_half_towards_positive_infinity_order.html rename to tests/wpt/tests/css/css-values/integer_interpolation_round_half_towards_positive_infinity_order.html diff --git a/tests/wpt/web-platform-tests/css/css-values/integer_interpolation_round_half_towards_positive_infinity_z_index.html b/tests/wpt/tests/css/css-values/integer_interpolation_round_half_towards_positive_infinity_z_index.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/integer_interpolation_round_half_towards_positive_infinity_z_index.html rename to tests/wpt/tests/css/css-values/integer_interpolation_round_half_towards_positive_infinity_z_index.html diff --git a/tests/wpt/web-platform-tests/css/css-values/lh-rlh-on-root-001.html b/tests/wpt/tests/css/css-values/lh-rlh-on-root-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/lh-rlh-on-root-001.html rename to tests/wpt/tests/css/css-values/lh-rlh-on-root-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/lh-unit-001.html b/tests/wpt/tests/css/css-values/lh-unit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/lh-unit-001.html rename to tests/wpt/tests/css/css-values/lh-unit-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/lh-unit-002.html b/tests/wpt/tests/css/css-values/lh-unit-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/lh-unit-002.html rename to tests/wpt/tests/css/css-values/lh-unit-002.html diff --git a/tests/wpt/web-platform-tests/css/css-values/lh-unit-003.html b/tests/wpt/tests/css/css-values/lh-unit-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/lh-unit-003.html rename to tests/wpt/tests/css/css-values/lh-unit-003.html diff --git a/tests/wpt/web-platform-tests/css/css-values/lh-unit-004.html b/tests/wpt/tests/css/css-values/lh-unit-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/lh-unit-004.html rename to tests/wpt/tests/css/css-values/lh-unit-004.html diff --git a/tests/wpt/web-platform-tests/css/css-values/line-break-ch-unit.html b/tests/wpt/tests/css/css-values/line-break-ch-unit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/line-break-ch-unit.html rename to tests/wpt/tests/css/css-values/line-break-ch-unit.html diff --git a/tests/wpt/web-platform-tests/css/css-values/max-20-arguments.html b/tests/wpt/tests/css/css-values/max-20-arguments.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/max-20-arguments.html rename to tests/wpt/tests/css/css-values/max-20-arguments.html diff --git a/tests/wpt/web-platform-tests/css/css-values/max-length-percent-001.html b/tests/wpt/tests/css/css-values/max-length-percent-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/max-length-percent-001.html rename to tests/wpt/tests/css/css-values/max-length-percent-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/max-unitless-zero-invalid.html b/tests/wpt/tests/css/css-values/max-unitless-zero-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/max-unitless-zero-invalid.html rename to tests/wpt/tests/css/css-values/max-unitless-zero-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/min-length-percent-001.html b/tests/wpt/tests/css/css-values/min-length-percent-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/min-length-percent-001.html rename to tests/wpt/tests/css/css-values/min-length-percent-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/min-max-percentage-length-interpolation.html b/tests/wpt/tests/css/css-values/min-max-percentage-length-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/min-max-percentage-length-interpolation.html rename to tests/wpt/tests/css/css-values/min-max-percentage-length-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-angle-computed.html b/tests/wpt/tests/css/css-values/minmax-angle-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-angle-computed.html rename to tests/wpt/tests/css/css-values/minmax-angle-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-angle-invalid.html b/tests/wpt/tests/css/css-values/minmax-angle-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-angle-invalid.html rename to tests/wpt/tests/css/css-values/minmax-angle-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-angle-serialize.html b/tests/wpt/tests/css/css-values/minmax-angle-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-angle-serialize.html rename to tests/wpt/tests/css/css-values/minmax-angle-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-integer-computed.html b/tests/wpt/tests/css/css-values/minmax-integer-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-integer-computed.html rename to tests/wpt/tests/css/css-values/minmax-integer-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-length-computed.html b/tests/wpt/tests/css/css-values/minmax-length-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-length-computed.html rename to tests/wpt/tests/css/css-values/minmax-length-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-length-invalid.html b/tests/wpt/tests/css/css-values/minmax-length-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-length-invalid.html rename to tests/wpt/tests/css/css-values/minmax-length-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-length-percent-computed.html b/tests/wpt/tests/css/css-values/minmax-length-percent-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-length-percent-computed.html rename to tests/wpt/tests/css/css-values/minmax-length-percent-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-length-percent-invalid.html b/tests/wpt/tests/css/css-values/minmax-length-percent-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-length-percent-invalid.html rename to tests/wpt/tests/css/css-values/minmax-length-percent-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-length-percent-serialize.html b/tests/wpt/tests/css/css-values/minmax-length-percent-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-length-percent-serialize.html rename to tests/wpt/tests/css/css-values/minmax-length-percent-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-length-serialize.html b/tests/wpt/tests/css/css-values/minmax-length-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-length-serialize.html rename to tests/wpt/tests/css/css-values/minmax-length-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-number-computed.html b/tests/wpt/tests/css/css-values/minmax-number-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-number-computed.html rename to tests/wpt/tests/css/css-values/minmax-number-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-number-invalid.html b/tests/wpt/tests/css/css-values/minmax-number-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-number-invalid.html rename to tests/wpt/tests/css/css-values/minmax-number-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-number-serialize.html b/tests/wpt/tests/css/css-values/minmax-number-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-number-serialize.html rename to tests/wpt/tests/css/css-values/minmax-number-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-percentage-computed.html b/tests/wpt/tests/css/css-values/minmax-percentage-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-percentage-computed.html rename to tests/wpt/tests/css/css-values/minmax-percentage-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-percentage-invalid.html b/tests/wpt/tests/css/css-values/minmax-percentage-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-percentage-invalid.html rename to tests/wpt/tests/css/css-values/minmax-percentage-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-percentage-serialize.html b/tests/wpt/tests/css/css-values/minmax-percentage-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-percentage-serialize.html rename to tests/wpt/tests/css/css-values/minmax-percentage-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-time-computed.html b/tests/wpt/tests/css/css-values/minmax-time-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-time-computed.html rename to tests/wpt/tests/css/css-values/minmax-time-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-time-invalid.html b/tests/wpt/tests/css/css-values/minmax-time-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-time-invalid.html rename to tests/wpt/tests/css/css-values/minmax-time-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-time-serialize.html b/tests/wpt/tests/css/css-values/minmax-time-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/minmax-time-serialize.html rename to tests/wpt/tests/css/css-values/minmax-time-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-values/negative-calc-to-non-negative-integer-ref.html b/tests/wpt/tests/css/css-values/negative-calc-to-non-negative-integer-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/negative-calc-to-non-negative-integer-ref.html rename to tests/wpt/tests/css/css-values/negative-calc-to-non-negative-integer-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/negative-calc-to-non-negative-integer.html b/tests/wpt/tests/css/css-values/negative-calc-to-non-negative-integer.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/negative-calc-to-non-negative-integer.html rename to tests/wpt/tests/css/css-values/negative-calc-to-non-negative-integer.html diff --git a/tests/wpt/web-platform-tests/css/css-values/percentage-rem-low.html b/tests/wpt/tests/css/css-values/percentage-rem-low.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/percentage-rem-low.html rename to tests/wpt/tests/css/css-values/percentage-rem-low.html diff --git a/tests/wpt/web-platform-tests/css/css-values/q-unit-case-insensitivity-001.html b/tests/wpt/tests/css/css-values/q-unit-case-insensitivity-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/q-unit-case-insensitivity-001.html rename to tests/wpt/tests/css/css-values/q-unit-case-insensitivity-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/q-unit-case-insensitivity-002.html b/tests/wpt/tests/css/css-values/q-unit-case-insensitivity-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/q-unit-case-insensitivity-002.html rename to tests/wpt/tests/css/css-values/q-unit-case-insensitivity-002.html diff --git a/tests/wpt/web-platform-tests/css/css-values/rch-invalidation.html b/tests/wpt/tests/css/css-values/rch-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/rch-invalidation.html rename to tests/wpt/tests/css/css-values/rch-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/200-200-green.html b/tests/wpt/tests/css/css-values/reference/200-200-green.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/200-200-green.html rename to tests/wpt/tests/css/css-values/reference/200-200-green.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/all-green.html b/tests/wpt/tests/css/css-values/reference/all-green.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/all-green.html rename to tests/wpt/tests/css/css-values/reference/all-green.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/cap-unit-001-ref.html b/tests/wpt/tests/css/css-values/reference/cap-unit-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/cap-unit-001-ref.html rename to tests/wpt/tests/css/css-values/reference/cap-unit-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ch-unit-001-ref.html b/tests/wpt/tests/css/css-values/reference/ch-unit-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ch-unit-001-ref.html rename to tests/wpt/tests/css/css-values/reference/ch-unit-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ch-unit-002-ref.html b/tests/wpt/tests/css/css-values/reference/ch-unit-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ch-unit-002-ref.html rename to tests/wpt/tests/css/css-values/reference/ch-unit-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ch-unit-008-ref.html b/tests/wpt/tests/css/css-values/reference/ch-unit-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ch-unit-008-ref.html rename to tests/wpt/tests/css/css-values/reference/ch-unit-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ch-unit-009-ref.html b/tests/wpt/tests/css/css-values/reference/ch-unit-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ch-unit-009-ref.html rename to tests/wpt/tests/css/css-values/reference/ch-unit-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ch-unit-011-ref.html b/tests/wpt/tests/css/css-values/reference/ch-unit-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ch-unit-011-ref.html rename to tests/wpt/tests/css/css-values/reference/ch-unit-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ch-unit-016-ref.html b/tests/wpt/tests/css/css-values/reference/ch-unit-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ch-unit-016-ref.html rename to tests/wpt/tests/css/css-values/reference/ch-unit-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ex-unit-001-ref.html b/tests/wpt/tests/css/css-values/reference/ex-unit-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ex-unit-001-ref.html rename to tests/wpt/tests/css/css-values/reference/ex-unit-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ex-unit-002-ref.html b/tests/wpt/tests/css/css-values/reference/ex-unit-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ex-unit-002-ref.html rename to tests/wpt/tests/css/css-values/reference/ex-unit-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ex-unit-004-ref.html b/tests/wpt/tests/css/css-values/reference/ex-unit-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ex-unit-004-ref.html rename to tests/wpt/tests/css/css-values/reference/ex-unit-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ic-unit-001-ref.html b/tests/wpt/tests/css/css-values/reference/ic-unit-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ic-unit-001-ref.html rename to tests/wpt/tests/css/css-values/reference/ic-unit-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ic-unit-002-ref.html b/tests/wpt/tests/css/css-values/reference/ic-unit-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ic-unit-002-ref.html rename to tests/wpt/tests/css/css-values/reference/ic-unit-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ic-unit-008-ref.html b/tests/wpt/tests/css/css-values/reference/ic-unit-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ic-unit-008-ref.html rename to tests/wpt/tests/css/css-values/reference/ic-unit-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ic-unit-009-ref.html b/tests/wpt/tests/css/css-values/reference/ic-unit-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ic-unit-009-ref.html rename to tests/wpt/tests/css/css-values/reference/ic-unit-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ic-unit-012-ref.html b/tests/wpt/tests/css/css-values/reference/ic-unit-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ic-unit-012-ref.html rename to tests/wpt/tests/css/css-values/reference/ic-unit-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ic-unit-013-ref.html b/tests/wpt/tests/css/css-values/reference/ic-unit-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ic-unit-013-ref.html rename to tests/wpt/tests/css/css-values/reference/ic-unit-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/ic-unit-014-ref.html b/tests/wpt/tests/css/css-values/reference/ic-unit-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/ic-unit-014-ref.html rename to tests/wpt/tests/css/css-values/reference/ic-unit-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/vh-support-atviewport-ref.htm b/tests/wpt/tests/css/css-values/reference/vh-support-atviewport-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/vh-support-atviewport-ref.htm rename to tests/wpt/tests/css/css-values/reference/vh-support-atviewport-ref.htm diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/vh_not_refreshing_on_chrome-ref.html b/tests/wpt/tests/css/css-values/reference/vh_not_refreshing_on_chrome-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/vh_not_refreshing_on_chrome-ref.html rename to tests/wpt/tests/css/css-values/reference/vh_not_refreshing_on_chrome-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/vh_not_refreshing_on_chrome_iframe-ref.html b/tests/wpt/tests/css/css-values/reference/vh_not_refreshing_on_chrome_iframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/vh_not_refreshing_on_chrome_iframe-ref.html rename to tests/wpt/tests/css/css-values/reference/vh_not_refreshing_on_chrome_iframe-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/reference/viewport-unit-011-ref.html b/tests/wpt/tests/css/css-values/reference/viewport-unit-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/reference/viewport-unit-011-ref.html rename to tests/wpt/tests/css/css-values/reference/viewport-unit-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/rem-root-font-size-restyle-1-ref.html b/tests/wpt/tests/css/css-values/rem-root-font-size-restyle-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/rem-root-font-size-restyle-1-ref.html rename to tests/wpt/tests/css/css-values/rem-root-font-size-restyle-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/rem-root-font-size-restyle-1.html b/tests/wpt/tests/css/css-values/rem-root-font-size-restyle-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/rem-root-font-size-restyle-1.html rename to tests/wpt/tests/css/css-values/rem-root-font-size-restyle-1.html diff --git a/tests/wpt/web-platform-tests/css/css-values/rem-unit-root-element.html b/tests/wpt/tests/css/css-values/rem-unit-root-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/rem-unit-root-element.html rename to tests/wpt/tests/css/css-values/rem-unit-root-element.html diff --git a/tests/wpt/web-platform-tests/css/css-values/resources/ChTestShortZero.woff b/tests/wpt/tests/css/css-values/resources/ChTestShortZero.woff similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/resources/ChTestShortZero.woff rename to tests/wpt/tests/css/css-values/resources/ChTestShortZero.woff diff --git a/tests/wpt/web-platform-tests/css/css-values/resources/ChTestZeroWidthZero.woff b/tests/wpt/tests/css/css-values/resources/ChTestZeroWidthZero.woff similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/resources/ChTestZeroWidthZero.woff rename to tests/wpt/tests/css/css-values/resources/ChTestZeroWidthZero.woff diff --git a/tests/wpt/web-platform-tests/css/css-values/resources/ExTest-NoSpace.woff b/tests/wpt/tests/css/css-values/resources/ExTest-NoSpace.woff similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/resources/ExTest-NoSpace.woff rename to tests/wpt/tests/css/css-values/resources/ExTest-NoSpace.woff diff --git a/tests/wpt/web-platform-tests/css/css-values/resources/ExTest.woff b/tests/wpt/tests/css/css-values/resources/ExTest.woff similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/resources/ExTest.woff rename to tests/wpt/tests/css/css-values/resources/ExTest.woff diff --git a/tests/wpt/web-platform-tests/css/css-values/resources/IcTestFullWidth.woff2 b/tests/wpt/tests/css/css-values/resources/IcTestFullWidth.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/resources/IcTestFullWidth.woff2 rename to tests/wpt/tests/css/css-values/resources/IcTestFullWidth.woff2 diff --git a/tests/wpt/web-platform-tests/css/css-values/resources/IcTestHalfWidth.woff2 b/tests/wpt/tests/css/css-values/resources/IcTestHalfWidth.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/resources/IcTestHalfWidth.woff2 rename to tests/wpt/tests/css/css-values/resources/IcTestHalfWidth.woff2 diff --git a/tests/wpt/web-platform-tests/css/css-values/resources/IcTestZeroWidth.woff2 b/tests/wpt/tests/css/css-values/resources/IcTestZeroWidth.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/resources/IcTestZeroWidth.woff2 rename to tests/wpt/tests/css/css-values/resources/IcTestZeroWidth.woff2 diff --git a/tests/wpt/web-platform-tests/css/css-values/rex-invalidation.html b/tests/wpt/tests/css/css-values/rex-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/rex-invalidation.html rename to tests/wpt/tests/css/css-values/rex-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-values/rgba-011.html b/tests/wpt/tests/css/css-values/rgba-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/rgba-011.html rename to tests/wpt/tests/css/css-values/rgba-011.html diff --git a/tests/wpt/web-platform-tests/css/css-values/ric-invalidation.html b/tests/wpt/tests/css/css-values/ric-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/ric-invalidation.html rename to tests/wpt/tests/css/css-values/ric-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-values/rlh-invalidation.html b/tests/wpt/tests/css/css-values/rlh-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/rlh-invalidation.html rename to tests/wpt/tests/css/css-values/rlh-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-values/round-function.html b/tests/wpt/tests/css/css-values/round-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/round-function.html rename to tests/wpt/tests/css/css-values/round-function.html diff --git a/tests/wpt/web-platform-tests/css/css-values/round-mod-rem-computed.html b/tests/wpt/tests/css/css-values/round-mod-rem-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/round-mod-rem-computed.html rename to tests/wpt/tests/css/css-values/round-mod-rem-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-values/round-mod-rem-invalid.html b/tests/wpt/tests/css/css-values/round-mod-rem-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/round-mod-rem-invalid.html rename to tests/wpt/tests/css/css-values/round-mod-rem-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/round-mod-rem-serialize.html b/tests/wpt/tests/css/css-values/round-mod-rem-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/round-mod-rem-serialize.html rename to tests/wpt/tests/css/css-values/round-mod-rem-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-values/signs-abs-computed.html b/tests/wpt/tests/css/css-values/signs-abs-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/signs-abs-computed.html rename to tests/wpt/tests/css/css-values/signs-abs-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-values/signs-abs-invalid.html b/tests/wpt/tests/css/css-values/signs-abs-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/signs-abs-invalid.html rename to tests/wpt/tests/css/css-values/signs-abs-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/signs-abs-serialize.html b/tests/wpt/tests/css/css-values/signs-abs-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/signs-abs-serialize.html rename to tests/wpt/tests/css/css-values/signs-abs-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-values/sin-cos-tan-computed.html b/tests/wpt/tests/css/css-values/sin-cos-tan-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/sin-cos-tan-computed.html rename to tests/wpt/tests/css/css-values/sin-cos-tan-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-values/sin-cos-tan-invalid.html b/tests/wpt/tests/css/css-values/sin-cos-tan-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/sin-cos-tan-invalid.html rename to tests/wpt/tests/css/css-values/sin-cos-tan-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-values/sin-cos-tan-serialize.html b/tests/wpt/tests/css/css-values/sin-cos-tan-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/sin-cos-tan-serialize.html rename to tests/wpt/tests/css/css-values/sin-cos-tan-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-values/support/1x1-green.png b/tests/wpt/tests/css/css-values/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/1x1-green.png rename to tests/wpt/tests/css/css-values/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/1x1-lime.png b/tests/wpt/tests/css/css-values/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/1x1-lime.png rename to tests/wpt/tests/css/css-values/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/1x1-maroon.png b/tests/wpt/tests/css/css-values/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/1x1-maroon.png rename to tests/wpt/tests/css/css-values/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/1x1-navy.png b/tests/wpt/tests/css/css-values/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/1x1-navy.png rename to tests/wpt/tests/css/css-values/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/1x1-red.png b/tests/wpt/tests/css/css-values/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/1x1-red.png rename to tests/wpt/tests/css/css-values/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/1x1-white.png b/tests/wpt/tests/css/css-values/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/1x1-white.png rename to tests/wpt/tests/css/css-values/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/60x60-gg-rr.png b/tests/wpt/tests/css/css-values/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/60x60-gg-rr.png rename to tests/wpt/tests/css/css-values/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/60x60-green.png b/tests/wpt/tests/css/css-values/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/60x60-green.png rename to tests/wpt/tests/css/css-values/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/README b/tests/wpt/tests/css/css-values/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/README rename to tests/wpt/tests/css/css-values/support/README diff --git a/tests/wpt/web-platform-tests/css/css-values/support/a-green.css b/tests/wpt/tests/css/css-values/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/a-green.css rename to tests/wpt/tests/css/css-values/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/css-values/support/b-green.css b/tests/wpt/tests/css/css-values/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/b-green.css rename to tests/wpt/tests/css/css-values/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/css-values/support/blue-32x32.png b/tests/wpt/tests/css/css-values/support/blue-32x32.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/blue-32x32.png rename to tests/wpt/tests/css/css-values/support/blue-32x32.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/c-red.css b/tests/wpt/tests/css/css-values/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/c-red.css rename to tests/wpt/tests/css/css-values/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/css-values/support/cat.png b/tests/wpt/tests/css/css-values/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/cat.png rename to tests/wpt/tests/css/css-values/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/import-green.css b/tests/wpt/tests/css/css-values/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/import-green.css rename to tests/wpt/tests/css/css-values/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/css-values/support/import-red.css b/tests/wpt/tests/css/css-values/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/import-red.css rename to tests/wpt/tests/css/css-values/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/css-values/support/mixed-units-01.html b/tests/wpt/tests/css/css-values/support/mixed-units-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/mixed-units-01.html rename to tests/wpt/tests/css/css-values/support/mixed-units-01.html diff --git a/tests/wpt/web-platform-tests/css/css-values/support/mixed-units-02.html b/tests/wpt/tests/css/css-values/support/mixed-units-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/mixed-units-02.html rename to tests/wpt/tests/css/css-values/support/mixed-units-02.html diff --git a/tests/wpt/web-platform-tests/css/css-values/support/mixed-units-03.html b/tests/wpt/tests/css/css-values/support/mixed-units-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/mixed-units-03.html rename to tests/wpt/tests/css/css-values/support/mixed-units-03.html diff --git a/tests/wpt/web-platform-tests/css/css-values/support/mixed-units-04.html b/tests/wpt/tests/css/css-values/support/mixed-units-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/mixed-units-04.html rename to tests/wpt/tests/css/css-values/support/mixed-units-04.html diff --git a/tests/wpt/web-platform-tests/css/css-values/support/mixed-units-05.html b/tests/wpt/tests/css/css-values/support/mixed-units-05.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/mixed-units-05.html rename to tests/wpt/tests/css/css-values/support/mixed-units-05.html diff --git a/tests/wpt/web-platform-tests/css/css-values/support/mixed-units-06.html b/tests/wpt/tests/css/css-values/support/mixed-units-06.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/mixed-units-06.html rename to tests/wpt/tests/css/css-values/support/mixed-units-06.html diff --git a/tests/wpt/web-platform-tests/css/css-values/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/css-values/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/css-values/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/css-values/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/css-values/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/css-values/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/css-values/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/pattern-tr.png b/tests/wpt/tests/css/css-values/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/pattern-tr.png rename to tests/wpt/tests/css/css-values/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/ruler-h-50%.png b/tests/wpt/tests/css/css-values/support/ruler-h-50%.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/ruler-h-50%.png rename to tests/wpt/tests/css/css-values/support/ruler-h-50%.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/ruler-h-50px.png b/tests/wpt/tests/css/css-values/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/ruler-h-50px.png rename to tests/wpt/tests/css/css-values/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/ruler-v-100px.png b/tests/wpt/tests/css/css-values/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/ruler-v-100px.png rename to tests/wpt/tests/css/css-values/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/ruler-v-50px.png b/tests/wpt/tests/css/css-values/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/ruler-v-50px.png rename to tests/wpt/tests/css/css-values/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/square-purple.png b/tests/wpt/tests/css/css-values/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/square-purple.png rename to tests/wpt/tests/css/css-values/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/square-teal.png b/tests/wpt/tests/css/css-values/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/square-teal.png rename to tests/wpt/tests/css/css-values/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/square-white.png b/tests/wpt/tests/css/css-values/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/square-white.png rename to tests/wpt/tests/css/css-values/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/support/README b/tests/wpt/tests/css/css-values/support/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/support/README rename to tests/wpt/tests/css/css-values/support/support/README diff --git a/tests/wpt/web-platform-tests/css/css-values/support/support/swatch-green.png b/tests/wpt/tests/css/css-values/support/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/support/swatch-green.png rename to tests/wpt/tests/css/css-values/support/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/support/swatch-red.png b/tests/wpt/tests/css/css-values/support/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/support/swatch-red.png rename to tests/wpt/tests/css/css-values/support/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/swatch-blue.png b/tests/wpt/tests/css/css-values/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/swatch-blue.png rename to tests/wpt/tests/css/css-values/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/swatch-green.png b/tests/wpt/tests/css/css-values/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/swatch-green.png rename to tests/wpt/tests/css/css-values/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/swatch-lime.png b/tests/wpt/tests/css/css-values/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/swatch-lime.png rename to tests/wpt/tests/css/css-values/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/swatch-orange.png b/tests/wpt/tests/css/css-values/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/swatch-orange.png rename to tests/wpt/tests/css/css-values/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/swatch-red.png b/tests/wpt/tests/css/css-values/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/swatch-red.png rename to tests/wpt/tests/css/css-values/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/swatch-teal.png b/tests/wpt/tests/css/css-values/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/swatch-teal.png rename to tests/wpt/tests/css/css-values/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/swatch-white.png b/tests/wpt/tests/css/css-values/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/swatch-white.png rename to tests/wpt/tests/css/css-values/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/swatch-yellow.png b/tests/wpt/tests/css/css-values/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/swatch-yellow.png rename to tests/wpt/tests/css/css-values/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/test-bl.png b/tests/wpt/tests/css/css-values/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/test-bl.png rename to tests/wpt/tests/css/css-values/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/test-br.png b/tests/wpt/tests/css/css-values/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/test-br.png rename to tests/wpt/tests/css/css-values/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/test-inner-half-size.png b/tests/wpt/tests/css/css-values/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/test-inner-half-size.png rename to tests/wpt/tests/css/css-values/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/test-outer.png b/tests/wpt/tests/css/css-values/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/test-outer.png rename to tests/wpt/tests/css/css-values/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/test-tl.png b/tests/wpt/tests/css/css-values/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/test-tl.png rename to tests/wpt/tests/css/css-values/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/test-tr.png b/tests/wpt/tests/css/css-values/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/test-tr.png rename to tests/wpt/tests/css/css-values/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-values/support/vh-support-transform-origin-iframe.html b/tests/wpt/tests/css/css-values/support/vh-support-transform-origin-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/vh-support-transform-origin-iframe.html rename to tests/wpt/tests/css/css-values/support/vh-support-transform-origin-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-values/support/vh-support-transform-translate-iframe.html b/tests/wpt/tests/css/css-values/support/vh-support-transform-translate-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/vh-support-transform-translate-iframe.html rename to tests/wpt/tests/css/css-values/support/vh-support-transform-translate-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-values/support/vh_not_refreshing_on_chrome_iframe.html b/tests/wpt/tests/css/css-values/support/vh_not_refreshing_on_chrome_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/support/vh_not_refreshing_on_chrome_iframe.html rename to tests/wpt/tests/css/css-values/support/vh_not_refreshing_on_chrome_iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-values/update-subpixel-rem-unit.html b/tests/wpt/tests/css/css-values/update-subpixel-rem-unit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/update-subpixel-rem-unit.html rename to tests/wpt/tests/css/css-values/update-subpixel-rem-unit.html diff --git a/tests/wpt/web-platform-tests/css/css-values/urls/empty.html b/tests/wpt/tests/css/css-values/urls/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/urls/empty.html rename to tests/wpt/tests/css/css-values/urls/empty.html diff --git a/tests/wpt/web-platform-tests/css/css-values/urls/fragment-only.html b/tests/wpt/tests/css/css-values/urls/fragment-only.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/urls/fragment-only.html rename to tests/wpt/tests/css/css-values/urls/fragment-only.html diff --git a/tests/wpt/web-platform-tests/css/css-values/urls/resolve-relative-to-base.sub.html b/tests/wpt/tests/css/css-values/urls/resolve-relative-to-base.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/urls/resolve-relative-to-base.sub.html rename to tests/wpt/tests/css/css-values/urls/resolve-relative-to-base.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-values/urls/resolve-relative-to-stylesheet.html b/tests/wpt/tests/css/css-values/urls/resolve-relative-to-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/urls/resolve-relative-to-stylesheet.html rename to tests/wpt/tests/css/css-values/urls/resolve-relative-to-stylesheet.html diff --git a/tests/wpt/web-platform-tests/css/css-values/urls/support/empty-urls.css b/tests/wpt/tests/css/css-values/urls/support/empty-urls.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/urls/support/empty-urls.css rename to tests/wpt/tests/css/css-values/urls/support/empty-urls.css diff --git a/tests/wpt/web-platform-tests/css/css-values/urls/support/fragment-only-urls.css b/tests/wpt/tests/css/css-values/urls/support/fragment-only-urls.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/urls/support/fragment-only-urls.css rename to tests/wpt/tests/css/css-values/urls/support/fragment-only-urls.css diff --git a/tests/wpt/web-platform-tests/css/css-values/urls/support/relative-urls.css b/tests/wpt/tests/css/css-values/urls/support/relative-urls.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/urls/support/relative-urls.css rename to tests/wpt/tests/css/css-values/urls/support/relative-urls.css diff --git a/tests/wpt/web-platform-tests/css/css-values/vh-calc-support-pct.html b/tests/wpt/tests/css/css-values/vh-calc-support-pct.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/vh-calc-support-pct.html rename to tests/wpt/tests/css/css-values/vh-calc-support-pct.html diff --git a/tests/wpt/web-platform-tests/css/css-values/vh-calc-support.html b/tests/wpt/tests/css/css-values/vh-calc-support.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/vh-calc-support.html rename to tests/wpt/tests/css/css-values/vh-calc-support.html diff --git a/tests/wpt/web-platform-tests/css/css-values/vh-em-inherit.html b/tests/wpt/tests/css/css-values/vh-em-inherit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/vh-em-inherit.html rename to tests/wpt/tests/css/css-values/vh-em-inherit.html diff --git a/tests/wpt/web-platform-tests/css/css-values/vh-inherit.html b/tests/wpt/tests/css/css-values/vh-inherit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/vh-inherit.html rename to tests/wpt/tests/css/css-values/vh-inherit.html diff --git a/tests/wpt/web-platform-tests/css/css-values/vh-interpolate-pct.html b/tests/wpt/tests/css/css-values/vh-interpolate-pct.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/vh-interpolate-pct.html rename to tests/wpt/tests/css/css-values/vh-interpolate-pct.html diff --git a/tests/wpt/web-platform-tests/css/css-values/vh-interpolate-px.html b/tests/wpt/tests/css/css-values/vh-interpolate-px.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/vh-interpolate-px.html rename to tests/wpt/tests/css/css-values/vh-interpolate-px.html diff --git a/tests/wpt/web-platform-tests/css/css-values/vh-interpolate-vh.html b/tests/wpt/tests/css/css-values/vh-interpolate-vh.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/vh-interpolate-vh.html rename to tests/wpt/tests/css/css-values/vh-interpolate-vh.html diff --git a/tests/wpt/web-platform-tests/css/css-values/vh-support-margin.html b/tests/wpt/tests/css/css-values/vh-support-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/vh-support-margin.html rename to tests/wpt/tests/css/css-values/vh-support-margin.html diff --git a/tests/wpt/web-platform-tests/css/css-values/vh-support-transform-origin.html b/tests/wpt/tests/css/css-values/vh-support-transform-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/vh-support-transform-origin.html rename to tests/wpt/tests/css/css-values/vh-support-transform-origin.html diff --git a/tests/wpt/web-platform-tests/css/css-values/vh-support-transform-translate.html b/tests/wpt/tests/css/css-values/vh-support-transform-translate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/vh-support-transform-translate.html rename to tests/wpt/tests/css/css-values/vh-support-transform-translate.html diff --git a/tests/wpt/web-platform-tests/css/css-values/vh-support.html b/tests/wpt/tests/css/css-values/vh-support.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/vh-support.html rename to tests/wpt/tests/css/css-values/vh-support.html diff --git a/tests/wpt/web-platform-tests/css/css-values/vh-zero-support.html b/tests/wpt/tests/css/css-values/vh-zero-support.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/vh-zero-support.html rename to tests/wpt/tests/css/css-values/vh-zero-support.html diff --git a/tests/wpt/web-platform-tests/css/css-values/vh_not_refreshing_on_chrome.html b/tests/wpt/tests/css/css-values/vh_not_refreshing_on_chrome.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/vh_not_refreshing_on_chrome.html rename to tests/wpt/tests/css/css-values/vh_not_refreshing_on_chrome.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-relative-lengths-scaled-viewport.html b/tests/wpt/tests/css/css-values/viewport-relative-lengths-scaled-viewport.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-relative-lengths-scaled-viewport.html rename to tests/wpt/tests/css/css-values/viewport-relative-lengths-scaled-viewport.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-unit-011.html b/tests/wpt/tests/css/css-values/viewport-unit-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-unit-011.html rename to tests/wpt/tests/css/css-values/viewport-unit-011.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-001-print-ref.html b/tests/wpt/tests/css/css-values/viewport-units-001-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-units-001-print-ref.html rename to tests/wpt/tests/css/css-values/viewport-units-001-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-001-print.html b/tests/wpt/tests/css/css-values/viewport-units-001-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-units-001-print.html rename to tests/wpt/tests/css/css-values/viewport-units-001-print.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-after-font-load.html b/tests/wpt/tests/css/css-values/viewport-units-after-font-load.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-units-after-font-load.html rename to tests/wpt/tests/css/css-values/viewport-units-after-font-load.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-compute.html b/tests/wpt/tests/css/css-values/viewport-units-compute.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-units-compute.html rename to tests/wpt/tests/css/css-values/viewport-units-compute.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-css2-001.html b/tests/wpt/tests/css/css-values/viewport-units-css2-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-units-css2-001.html rename to tests/wpt/tests/css/css-values/viewport-units-css2-001.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-invalidation.html b/tests/wpt/tests/css/css-values/viewport-units-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-units-invalidation.html rename to tests/wpt/tests/css/css-values/viewport-units-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-keyframes.html b/tests/wpt/tests/css/css-values/viewport-units-keyframes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-units-keyframes.html rename to tests/wpt/tests/css/css-values/viewport-units-keyframes.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-media-queries.html b/tests/wpt/tests/css/css-values/viewport-units-media-queries.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-units-media-queries.html rename to tests/wpt/tests/css/css-values/viewport-units-media-queries.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-modify.html b/tests/wpt/tests/css/css-values/viewport-units-modify.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-units-modify.html rename to tests/wpt/tests/css/css-values/viewport-units-modify.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-parsing.html b/tests/wpt/tests/css/css-values/viewport-units-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-units-parsing.html rename to tests/wpt/tests/css/css-values/viewport-units-parsing.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-writing-mode-font-size-ref.html b/tests/wpt/tests/css/css-values/viewport-units-writing-mode-font-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-units-writing-mode-font-size-ref.html rename to tests/wpt/tests/css/css-values/viewport-units-writing-mode-font-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-writing-mode-font-size.html b/tests/wpt/tests/css/css-values/viewport-units-writing-mode-font-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-units-writing-mode-font-size.html rename to tests/wpt/tests/css/css-values/viewport-units-writing-mode-font-size.html diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-writing-mode.html b/tests/wpt/tests/css/css-values/viewport-units-writing-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-values/viewport-units-writing-mode.html rename to tests/wpt/tests/css/css-values/viewport-units-writing-mode.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/META.yml b/tests/wpt/tests/css/css-variables/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/META.yml rename to tests/wpt/tests/css/css-variables/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-variables/css-variable-change-style-001.html b/tests/wpt/tests/css/css-variables/css-variable-change-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/css-variable-change-style-001.html rename to tests/wpt/tests/css/css-variables/css-variable-change-style-001.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/css-variable-change-style-002.html b/tests/wpt/tests/css/css-variables/css-variable-change-style-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/css-variable-change-style-002.html rename to tests/wpt/tests/css/css-variables/css-variable-change-style-002.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/css-vars-custom-property-case-sensitive-001.html b/tests/wpt/tests/css/css-variables/css-vars-custom-property-case-sensitive-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/css-vars-custom-property-case-sensitive-001.html rename to tests/wpt/tests/css/css-variables/css-vars-custom-property-case-sensitive-001.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/css-vars-custom-property-inheritance.html b/tests/wpt/tests/css/css-variables/css-vars-custom-property-inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/css-vars-custom-property-inheritance.html rename to tests/wpt/tests/css/css-variables/css-vars-custom-property-inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/long-variable-reference-crash.html b/tests/wpt/tests/css/css-variables/long-variable-reference-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/long-variable-reference-crash.html rename to tests/wpt/tests/css/css-variables/long-variable-reference-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/reference/variable-reference-without-whitespace-ref.html b/tests/wpt/tests/css/css-variables/reference/variable-reference-without-whitespace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/reference/variable-reference-without-whitespace-ref.html rename to tests/wpt/tests/css/css-variables/reference/variable-reference-without-whitespace-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/reference/vars-background-shorthand-001-ref.html b/tests/wpt/tests/css/css-variables/reference/vars-background-shorthand-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/reference/vars-background-shorthand-001-ref.html rename to tests/wpt/tests/css/css-variables/reference/vars-background-shorthand-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/reference/vars-font-shorthand-001-ref.html b/tests/wpt/tests/css/css-variables/reference/vars-font-shorthand-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/reference/vars-font-shorthand-001-ref.html rename to tests/wpt/tests/css/css-variables/reference/vars-font-shorthand-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/resources/variable-reference-refresh-iframe.css b/tests/wpt/tests/css/css-variables/resources/variable-reference-refresh-iframe.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/resources/variable-reference-refresh-iframe.css rename to tests/wpt/tests/css/css-variables/resources/variable-reference-refresh-iframe.css diff --git a/tests/wpt/web-platform-tests/css/css-variables/resources/variable-reference-refresh-iframe.html b/tests/wpt/tests/css/css-variables/resources/variable-reference-refresh-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/resources/variable-reference-refresh-iframe.html rename to tests/wpt/tests/css/css-variables/resources/variable-reference-refresh-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/revert-in-fallback.html b/tests/wpt/tests/css/css-variables/revert-in-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/revert-in-fallback.html rename to tests/wpt/tests/css/css-variables/revert-in-fallback.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/revert-layer-in-fallback.html b/tests/wpt/tests/css/css-variables/revert-layer-in-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/revert-layer-in-fallback.html rename to tests/wpt/tests/css/css-variables/revert-layer-in-fallback.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/support/color-green-ref.html b/tests/wpt/tests/css/css-variables/support/color-green-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/support/color-green-ref.html rename to tests/wpt/tests/css/css-variables/support/color-green-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/support/external-variable-declaration.css b/tests/wpt/tests/css/css-variables/support/external-variable-declaration.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/support/external-variable-declaration.css rename to tests/wpt/tests/css/css-variables/support/external-variable-declaration.css diff --git a/tests/wpt/web-platform-tests/css/css-variables/support/external-variable-font-face.css b/tests/wpt/tests/css/css-variables/support/external-variable-font-face.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/support/external-variable-font-face.css rename to tests/wpt/tests/css/css-variables/support/external-variable-font-face.css diff --git a/tests/wpt/web-platform-tests/css/css-variables/support/external-variable-reference.css b/tests/wpt/tests/css/css-variables/support/external-variable-reference.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/support/external-variable-reference.css rename to tests/wpt/tests/css/css-variables/support/external-variable-reference.css diff --git a/tests/wpt/web-platform-tests/css/css-variables/support/external-variable-supports.css b/tests/wpt/tests/css/css-variables/support/external-variable-supports.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/support/external-variable-supports.css rename to tests/wpt/tests/css/css-variables/support/external-variable-supports.css diff --git a/tests/wpt/web-platform-tests/css/css-variables/test_variable_legal_values.html b/tests/wpt/tests/css/css-variables/test_variable_legal_values.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/test_variable_legal_values.html rename to tests/wpt/tests/css/css-variables/test_variable_legal_values.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-animation-from-to.html b/tests/wpt/tests/css/css-variables/variable-animation-from-to.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-animation-from-to.html rename to tests/wpt/tests/css/css-variables/variable-animation-from-to.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-animation-over-transition.html b/tests/wpt/tests/css/css-variables/variable-animation-over-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-animation-over-transition.html rename to tests/wpt/tests/css/css-variables/variable-animation-over-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-animation-substitute-into-keyframe-shorthand.html b/tests/wpt/tests/css/css-variables/variable-animation-substitute-into-keyframe-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-animation-substitute-into-keyframe-shorthand.html rename to tests/wpt/tests/css/css-variables/variable-animation-substitute-into-keyframe-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-animation-substitute-into-keyframe-transform.html b/tests/wpt/tests/css/css-variables/variable-animation-substitute-into-keyframe-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-animation-substitute-into-keyframe-transform.html rename to tests/wpt/tests/css/css-variables/variable-animation-substitute-into-keyframe-transform.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-animation-substitute-into-keyframe.html b/tests/wpt/tests/css/css-variables/variable-animation-substitute-into-keyframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-animation-substitute-into-keyframe.html rename to tests/wpt/tests/css/css-variables/variable-animation-substitute-into-keyframe.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-animation-substitute-within-keyframe-fallback.html b/tests/wpt/tests/css/css-variables/variable-animation-substitute-within-keyframe-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-animation-substitute-within-keyframe-fallback.html rename to tests/wpt/tests/css/css-variables/variable-animation-substitute-within-keyframe-fallback.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-animation-substitute-within-keyframe-multiple.html b/tests/wpt/tests/css/css-variables/variable-animation-substitute-within-keyframe-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-animation-substitute-within-keyframe-multiple.html rename to tests/wpt/tests/css/css-variables/variable-animation-substitute-within-keyframe-multiple.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-animation-substitute-within-keyframe.html b/tests/wpt/tests/css/css-variables/variable-animation-substitute-within-keyframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-animation-substitute-within-keyframe.html rename to tests/wpt/tests/css/css-variables/variable-animation-substitute-within-keyframe.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-animation-to-only.html b/tests/wpt/tests/css/css-variables/variable-animation-to-only.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-animation-to-only.html rename to tests/wpt/tests/css/css-variables/variable-animation-to-only.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-created-document.html b/tests/wpt/tests/css/css-variables/variable-created-document.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-created-document.html rename to tests/wpt/tests/css/css-variables/variable-created-document.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-created-element.html b/tests/wpt/tests/css/css-variables/variable-created-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-created-element.html rename to tests/wpt/tests/css/css-variables/variable-created-element.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-cssText.html b/tests/wpt/tests/css/css-variables/variable-cssText.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-cssText.html rename to tests/wpt/tests/css/css-variables/variable-cssText.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-cycles.html b/tests/wpt/tests/css/css-variables/variable-cycles.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-cycles.html rename to tests/wpt/tests/css/css-variables/variable-cycles.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-01.html b/tests/wpt/tests/css/css-variables/variable-declaration-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-01.html rename to tests/wpt/tests/css/css-variables/variable-declaration-01.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-02.html b/tests/wpt/tests/css/css-variables/variable-declaration-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-02.html rename to tests/wpt/tests/css/css-variables/variable-declaration-02.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-03.html b/tests/wpt/tests/css/css-variables/variable-declaration-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-03.html rename to tests/wpt/tests/css/css-variables/variable-declaration-03.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-04.html b/tests/wpt/tests/css/css-variables/variable-declaration-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-04.html rename to tests/wpt/tests/css/css-variables/variable-declaration-04.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-05.html b/tests/wpt/tests/css/css-variables/variable-declaration-05.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-05.html rename to tests/wpt/tests/css/css-variables/variable-declaration-05.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-06.html b/tests/wpt/tests/css/css-variables/variable-declaration-06.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-06.html rename to tests/wpt/tests/css/css-variables/variable-declaration-06.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-07.html b/tests/wpt/tests/css/css-variables/variable-declaration-07.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-07.html rename to tests/wpt/tests/css/css-variables/variable-declaration-07.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-08.html b/tests/wpt/tests/css/css-variables/variable-declaration-08.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-08.html rename to tests/wpt/tests/css/css-variables/variable-declaration-08.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-09.html b/tests/wpt/tests/css/css-variables/variable-declaration-09.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-09.html rename to tests/wpt/tests/css/css-variables/variable-declaration-09.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-10.html b/tests/wpt/tests/css/css-variables/variable-declaration-10.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-10.html rename to tests/wpt/tests/css/css-variables/variable-declaration-10.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-11.html b/tests/wpt/tests/css/css-variables/variable-declaration-11.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-11.html rename to tests/wpt/tests/css/css-variables/variable-declaration-11.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-12.html b/tests/wpt/tests/css/css-variables/variable-declaration-12.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-12.html rename to tests/wpt/tests/css/css-variables/variable-declaration-12.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-13.html b/tests/wpt/tests/css/css-variables/variable-declaration-13.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-13.html rename to tests/wpt/tests/css/css-variables/variable-declaration-13.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-14.html b/tests/wpt/tests/css/css-variables/variable-declaration-14.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-14.html rename to tests/wpt/tests/css/css-variables/variable-declaration-14.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-15-ref.html b/tests/wpt/tests/css/css-variables/variable-declaration-15-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-15-ref.html rename to tests/wpt/tests/css/css-variables/variable-declaration-15-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-15.html b/tests/wpt/tests/css/css-variables/variable-declaration-15.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-15.html rename to tests/wpt/tests/css/css-variables/variable-declaration-15.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-16-ref.html b/tests/wpt/tests/css/css-variables/variable-declaration-16-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-16-ref.html rename to tests/wpt/tests/css/css-variables/variable-declaration-16-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-16.html b/tests/wpt/tests/css/css-variables/variable-declaration-16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-16.html rename to tests/wpt/tests/css/css-variables/variable-declaration-16.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-17-ref.html b/tests/wpt/tests/css/css-variables/variable-declaration-17-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-17-ref.html rename to tests/wpt/tests/css/css-variables/variable-declaration-17-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-17.html b/tests/wpt/tests/css/css-variables/variable-declaration-17.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-17.html rename to tests/wpt/tests/css/css-variables/variable-declaration-17.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-18-ref.html b/tests/wpt/tests/css/css-variables/variable-declaration-18-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-18-ref.html rename to tests/wpt/tests/css/css-variables/variable-declaration-18-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-18.html b/tests/wpt/tests/css/css-variables/variable-declaration-18.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-18.html rename to tests/wpt/tests/css/css-variables/variable-declaration-18.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-19.html b/tests/wpt/tests/css/css-variables/variable-declaration-19.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-19.html rename to tests/wpt/tests/css/css-variables/variable-declaration-19.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-20.html b/tests/wpt/tests/css/css-variables/variable-declaration-20.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-20.html rename to tests/wpt/tests/css/css-variables/variable-declaration-20.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-21.html b/tests/wpt/tests/css/css-variables/variable-declaration-21.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-21.html rename to tests/wpt/tests/css/css-variables/variable-declaration-21.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-22.html b/tests/wpt/tests/css/css-variables/variable-declaration-22.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-22.html rename to tests/wpt/tests/css/css-variables/variable-declaration-22.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-23.html b/tests/wpt/tests/css/css-variables/variable-declaration-23.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-23.html rename to tests/wpt/tests/css/css-variables/variable-declaration-23.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-24.html b/tests/wpt/tests/css/css-variables/variable-declaration-24.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-24.html rename to tests/wpt/tests/css/css-variables/variable-declaration-24.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-25.html b/tests/wpt/tests/css/css-variables/variable-declaration-25.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-25.html rename to tests/wpt/tests/css/css-variables/variable-declaration-25.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-26.html b/tests/wpt/tests/css/css-variables/variable-declaration-26.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-26.html rename to tests/wpt/tests/css/css-variables/variable-declaration-26.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-29.html b/tests/wpt/tests/css/css-variables/variable-declaration-29.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-29.html rename to tests/wpt/tests/css/css-variables/variable-declaration-29.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-30.html b/tests/wpt/tests/css/css-variables/variable-declaration-30.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-30.html rename to tests/wpt/tests/css/css-variables/variable-declaration-30.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-31.html b/tests/wpt/tests/css/css-variables/variable-declaration-31.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-31.html rename to tests/wpt/tests/css/css-variables/variable-declaration-31.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-32.html b/tests/wpt/tests/css/css-variables/variable-declaration-32.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-32.html rename to tests/wpt/tests/css/css-variables/variable-declaration-32.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-33.html b/tests/wpt/tests/css/css-variables/variable-declaration-33.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-33.html rename to tests/wpt/tests/css/css-variables/variable-declaration-33.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-34.html b/tests/wpt/tests/css/css-variables/variable-declaration-34.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-34.html rename to tests/wpt/tests/css/css-variables/variable-declaration-34.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-35.html b/tests/wpt/tests/css/css-variables/variable-declaration-35.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-35.html rename to tests/wpt/tests/css/css-variables/variable-declaration-35.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-36.html b/tests/wpt/tests/css/css-variables/variable-declaration-36.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-36.html rename to tests/wpt/tests/css/css-variables/variable-declaration-36.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-37.html b/tests/wpt/tests/css/css-variables/variable-declaration-37.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-37.html rename to tests/wpt/tests/css/css-variables/variable-declaration-37.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-38.html b/tests/wpt/tests/css/css-variables/variable-declaration-38.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-38.html rename to tests/wpt/tests/css/css-variables/variable-declaration-38.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-39.html b/tests/wpt/tests/css/css-variables/variable-declaration-39.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-39.html rename to tests/wpt/tests/css/css-variables/variable-declaration-39.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-40.html b/tests/wpt/tests/css/css-variables/variable-declaration-40.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-40.html rename to tests/wpt/tests/css/css-variables/variable-declaration-40.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-41.html b/tests/wpt/tests/css/css-variables/variable-declaration-41.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-41.html rename to tests/wpt/tests/css/css-variables/variable-declaration-41.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-42.html b/tests/wpt/tests/css/css-variables/variable-declaration-42.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-42.html rename to tests/wpt/tests/css/css-variables/variable-declaration-42.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-43.html b/tests/wpt/tests/css/css-variables/variable-declaration-43.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-43.html rename to tests/wpt/tests/css/css-variables/variable-declaration-43.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-44.html b/tests/wpt/tests/css/css-variables/variable-declaration-44.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-44.html rename to tests/wpt/tests/css/css-variables/variable-declaration-44.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-45.html b/tests/wpt/tests/css/css-variables/variable-declaration-45.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-45.html rename to tests/wpt/tests/css/css-variables/variable-declaration-45.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-46.html b/tests/wpt/tests/css/css-variables/variable-declaration-46.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-46.html rename to tests/wpt/tests/css/css-variables/variable-declaration-46.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-47.html b/tests/wpt/tests/css/css-variables/variable-declaration-47.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-47.html rename to tests/wpt/tests/css/css-variables/variable-declaration-47.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-48.html b/tests/wpt/tests/css/css-variables/variable-declaration-48.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-48.html rename to tests/wpt/tests/css/css-variables/variable-declaration-48.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-49.html b/tests/wpt/tests/css/css-variables/variable-declaration-49.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-49.html rename to tests/wpt/tests/css/css-variables/variable-declaration-49.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-50.html b/tests/wpt/tests/css/css-variables/variable-declaration-50.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-50.html rename to tests/wpt/tests/css/css-variables/variable-declaration-50.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-51.html b/tests/wpt/tests/css/css-variables/variable-declaration-51.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-51.html rename to tests/wpt/tests/css/css-variables/variable-declaration-51.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-52.html b/tests/wpt/tests/css/css-variables/variable-declaration-52.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-52.html rename to tests/wpt/tests/css/css-variables/variable-declaration-52.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-53.html b/tests/wpt/tests/css/css-variables/variable-declaration-53.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-53.html rename to tests/wpt/tests/css/css-variables/variable-declaration-53.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-54.html b/tests/wpt/tests/css/css-variables/variable-declaration-54.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-54.html rename to tests/wpt/tests/css/css-variables/variable-declaration-54.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-55.html b/tests/wpt/tests/css/css-variables/variable-declaration-55.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-55.html rename to tests/wpt/tests/css/css-variables/variable-declaration-55.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-56.html b/tests/wpt/tests/css/css-variables/variable-declaration-56.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-56.html rename to tests/wpt/tests/css/css-variables/variable-declaration-56.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-57.html b/tests/wpt/tests/css/css-variables/variable-declaration-57.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-57.html rename to tests/wpt/tests/css/css-variables/variable-declaration-57.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-58.html b/tests/wpt/tests/css/css-variables/variable-declaration-58.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-58.html rename to tests/wpt/tests/css/css-variables/variable-declaration-58.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-59.html b/tests/wpt/tests/css/css-variables/variable-declaration-59.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-59.html rename to tests/wpt/tests/css/css-variables/variable-declaration-59.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-declaration-60.html b/tests/wpt/tests/css/css-variables/variable-declaration-60.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-declaration-60.html rename to tests/wpt/tests/css/css-variables/variable-declaration-60.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-definition-border-shorthand-serialize.html b/tests/wpt/tests/css/css-variables/variable-definition-border-shorthand-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-definition-border-shorthand-serialize.html rename to tests/wpt/tests/css/css-variables/variable-definition-border-shorthand-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-definition-cascading.html b/tests/wpt/tests/css/css-variables/variable-definition-cascading.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-definition-cascading.html rename to tests/wpt/tests/css/css-variables/variable-definition-cascading.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-definition-keywords.html b/tests/wpt/tests/css/css-variables/variable-definition-keywords.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-definition-keywords.html rename to tests/wpt/tests/css/css-variables/variable-definition-keywords.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-definition.html b/tests/wpt/tests/css/css-variables/variable-definition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-definition.html rename to tests/wpt/tests/css/css-variables/variable-definition.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-empty-name-reserved.html b/tests/wpt/tests/css/css-variables/variable-empty-name-reserved.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-empty-name-reserved.html rename to tests/wpt/tests/css/css-variables/variable-empty-name-reserved.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-exponential-blowup.html b/tests/wpt/tests/css/css-variables/variable-exponential-blowup.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-exponential-blowup.html rename to tests/wpt/tests/css/css-variables/variable-exponential-blowup.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-external-declaration-01.html b/tests/wpt/tests/css/css-variables/variable-external-declaration-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-external-declaration-01.html rename to tests/wpt/tests/css/css-variables/variable-external-declaration-01.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-external-font-face-01-ref.html b/tests/wpt/tests/css/css-variables/variable-external-font-face-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-external-font-face-01-ref.html rename to tests/wpt/tests/css/css-variables/variable-external-font-face-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-external-font-face-01.html b/tests/wpt/tests/css/css-variables/variable-external-font-face-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-external-font-face-01.html rename to tests/wpt/tests/css/css-variables/variable-external-font-face-01.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-external-reference-01.html b/tests/wpt/tests/css/css-variables/variable-external-reference-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-external-reference-01.html rename to tests/wpt/tests/css/css-variables/variable-external-reference-01.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-external-supports-01.html b/tests/wpt/tests/css/css-variables/variable-external-supports-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-external-supports-01.html rename to tests/wpt/tests/css/css-variables/variable-external-supports-01.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-first-letter.html b/tests/wpt/tests/css/css-variables/variable-first-letter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-first-letter.html rename to tests/wpt/tests/css/css-variables/variable-first-letter.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-first-line.html b/tests/wpt/tests/css/css-variables/variable-first-line.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-first-line.html rename to tests/wpt/tests/css/css-variables/variable-first-line.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-font-face-01-ref.html b/tests/wpt/tests/css/css-variables/variable-font-face-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-font-face-01-ref.html rename to tests/wpt/tests/css/css-variables/variable-font-face-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-font-face-01.html b/tests/wpt/tests/css/css-variables/variable-font-face-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-font-face-01.html rename to tests/wpt/tests/css/css-variables/variable-font-face-01.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-font-face-02-ref.html b/tests/wpt/tests/css/css-variables/variable-font-face-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-font-face-02-ref.html rename to tests/wpt/tests/css/css-variables/variable-font-face-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-font-face-02.html b/tests/wpt/tests/css/css-variables/variable-font-face-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-font-face-02.html rename to tests/wpt/tests/css/css-variables/variable-font-face-02.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-generated-content-dynamic-001-ref.html b/tests/wpt/tests/css/css-variables/variable-generated-content-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-generated-content-dynamic-001-ref.html rename to tests/wpt/tests/css/css-variables/variable-generated-content-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-generated-content-dynamic-001.html b/tests/wpt/tests/css/css-variables/variable-generated-content-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-generated-content-dynamic-001.html rename to tests/wpt/tests/css/css-variables/variable-generated-content-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-invalidation.html b/tests/wpt/tests/css/css-variables/variable-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-invalidation.html rename to tests/wpt/tests/css/css-variables/variable-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-presentation-attribute.html b/tests/wpt/tests/css/css-variables/variable-presentation-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-presentation-attribute.html rename to tests/wpt/tests/css/css-variables/variable-presentation-attribute.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-pseudo-element.html b/tests/wpt/tests/css/css-variables/variable-pseudo-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-pseudo-element.html rename to tests/wpt/tests/css/css-variables/variable-pseudo-element.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-01.html b/tests/wpt/tests/css/css-variables/variable-reference-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-01.html rename to tests/wpt/tests/css/css-variables/variable-reference-01.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-02.html b/tests/wpt/tests/css/css-variables/variable-reference-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-02.html rename to tests/wpt/tests/css/css-variables/variable-reference-02.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-03.html b/tests/wpt/tests/css/css-variables/variable-reference-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-03.html rename to tests/wpt/tests/css/css-variables/variable-reference-03.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-04.html b/tests/wpt/tests/css/css-variables/variable-reference-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-04.html rename to tests/wpt/tests/css/css-variables/variable-reference-04.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-05.html b/tests/wpt/tests/css/css-variables/variable-reference-05.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-05.html rename to tests/wpt/tests/css/css-variables/variable-reference-05.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-06.html b/tests/wpt/tests/css/css-variables/variable-reference-06.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-06.html rename to tests/wpt/tests/css/css-variables/variable-reference-06.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-07.html b/tests/wpt/tests/css/css-variables/variable-reference-07.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-07.html rename to tests/wpt/tests/css/css-variables/variable-reference-07.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-08.html b/tests/wpt/tests/css/css-variables/variable-reference-08.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-08.html rename to tests/wpt/tests/css/css-variables/variable-reference-08.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-09.html b/tests/wpt/tests/css/css-variables/variable-reference-09.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-09.html rename to tests/wpt/tests/css/css-variables/variable-reference-09.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-10.html b/tests/wpt/tests/css/css-variables/variable-reference-10.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-10.html rename to tests/wpt/tests/css/css-variables/variable-reference-10.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-11.html b/tests/wpt/tests/css/css-variables/variable-reference-11.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-11.html rename to tests/wpt/tests/css/css-variables/variable-reference-11.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-12-ref.html b/tests/wpt/tests/css/css-variables/variable-reference-12-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-12-ref.html rename to tests/wpt/tests/css/css-variables/variable-reference-12-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-12.html b/tests/wpt/tests/css/css-variables/variable-reference-12.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-12.html rename to tests/wpt/tests/css/css-variables/variable-reference-12.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-13.html b/tests/wpt/tests/css/css-variables/variable-reference-13.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-13.html rename to tests/wpt/tests/css/css-variables/variable-reference-13.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-14.html b/tests/wpt/tests/css/css-variables/variable-reference-14.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-14.html rename to tests/wpt/tests/css/css-variables/variable-reference-14.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-15.html b/tests/wpt/tests/css/css-variables/variable-reference-15.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-15.html rename to tests/wpt/tests/css/css-variables/variable-reference-15.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-16.html b/tests/wpt/tests/css/css-variables/variable-reference-16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-16.html rename to tests/wpt/tests/css/css-variables/variable-reference-16.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-17.html b/tests/wpt/tests/css/css-variables/variable-reference-17.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-17.html rename to tests/wpt/tests/css/css-variables/variable-reference-17.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-18.html b/tests/wpt/tests/css/css-variables/variable-reference-18.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-18.html rename to tests/wpt/tests/css/css-variables/variable-reference-18.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-19.html b/tests/wpt/tests/css/css-variables/variable-reference-19.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-19.html rename to tests/wpt/tests/css/css-variables/variable-reference-19.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-20.html b/tests/wpt/tests/css/css-variables/variable-reference-20.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-20.html rename to tests/wpt/tests/css/css-variables/variable-reference-20.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-21.html b/tests/wpt/tests/css/css-variables/variable-reference-21.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-21.html rename to tests/wpt/tests/css/css-variables/variable-reference-21.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-22.html b/tests/wpt/tests/css/css-variables/variable-reference-22.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-22.html rename to tests/wpt/tests/css/css-variables/variable-reference-22.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-23.html b/tests/wpt/tests/css/css-variables/variable-reference-23.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-23.html rename to tests/wpt/tests/css/css-variables/variable-reference-23.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-24.html b/tests/wpt/tests/css/css-variables/variable-reference-24.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-24.html rename to tests/wpt/tests/css/css-variables/variable-reference-24.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-25.html b/tests/wpt/tests/css/css-variables/variable-reference-25.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-25.html rename to tests/wpt/tests/css/css-variables/variable-reference-25.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-26.html b/tests/wpt/tests/css/css-variables/variable-reference-26.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-26.html rename to tests/wpt/tests/css/css-variables/variable-reference-26.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-27.html b/tests/wpt/tests/css/css-variables/variable-reference-27.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-27.html rename to tests/wpt/tests/css/css-variables/variable-reference-27.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-28.html b/tests/wpt/tests/css/css-variables/variable-reference-28.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-28.html rename to tests/wpt/tests/css/css-variables/variable-reference-28.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-29.html b/tests/wpt/tests/css/css-variables/variable-reference-29.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-29.html rename to tests/wpt/tests/css/css-variables/variable-reference-29.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-30.html b/tests/wpt/tests/css/css-variables/variable-reference-30.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-30.html rename to tests/wpt/tests/css/css-variables/variable-reference-30.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-31.html b/tests/wpt/tests/css/css-variables/variable-reference-31.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-31.html rename to tests/wpt/tests/css/css-variables/variable-reference-31.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-32.html b/tests/wpt/tests/css/css-variables/variable-reference-32.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-32.html rename to tests/wpt/tests/css/css-variables/variable-reference-32.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-33.html b/tests/wpt/tests/css/css-variables/variable-reference-33.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-33.html rename to tests/wpt/tests/css/css-variables/variable-reference-33.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-34.html b/tests/wpt/tests/css/css-variables/variable-reference-34.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-34.html rename to tests/wpt/tests/css/css-variables/variable-reference-34.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-35.html b/tests/wpt/tests/css/css-variables/variable-reference-35.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-35.html rename to tests/wpt/tests/css/css-variables/variable-reference-35.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-36-ref.html b/tests/wpt/tests/css/css-variables/variable-reference-36-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-36-ref.html rename to tests/wpt/tests/css/css-variables/variable-reference-36-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-36.html b/tests/wpt/tests/css/css-variables/variable-reference-36.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-36.html rename to tests/wpt/tests/css/css-variables/variable-reference-36.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-37-ref.html b/tests/wpt/tests/css/css-variables/variable-reference-37-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-37-ref.html rename to tests/wpt/tests/css/css-variables/variable-reference-37-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-37.html b/tests/wpt/tests/css/css-variables/variable-reference-37.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-37.html rename to tests/wpt/tests/css/css-variables/variable-reference-37.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-38-ref.html b/tests/wpt/tests/css/css-variables/variable-reference-38-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-38-ref.html rename to tests/wpt/tests/css/css-variables/variable-reference-38-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-38.html b/tests/wpt/tests/css/css-variables/variable-reference-38.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-38.html rename to tests/wpt/tests/css/css-variables/variable-reference-38.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-39.html b/tests/wpt/tests/css/css-variables/variable-reference-39.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-39.html rename to tests/wpt/tests/css/css-variables/variable-reference-39.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-40-ref.html b/tests/wpt/tests/css/css-variables/variable-reference-40-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-40-ref.html rename to tests/wpt/tests/css/css-variables/variable-reference-40-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-40.html b/tests/wpt/tests/css/css-variables/variable-reference-40.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-40.html rename to tests/wpt/tests/css/css-variables/variable-reference-40.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-cssom.html b/tests/wpt/tests/css/css-variables/variable-reference-cssom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-cssom.html rename to tests/wpt/tests/css/css-variables/variable-reference-cssom.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-refresh.html b/tests/wpt/tests/css/css-variables/variable-reference-refresh.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-refresh.html rename to tests/wpt/tests/css/css-variables/variable-reference-refresh.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-shorthands-cssom.html b/tests/wpt/tests/css/css-variables/variable-reference-shorthands-cssom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-shorthands-cssom.html rename to tests/wpt/tests/css/css-variables/variable-reference-shorthands-cssom.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-shorthands.html b/tests/wpt/tests/css/css-variables/variable-reference-shorthands.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-shorthands.html rename to tests/wpt/tests/css/css-variables/variable-reference-shorthands.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-variable.html b/tests/wpt/tests/css/css-variables/variable-reference-variable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-variable.html rename to tests/wpt/tests/css/css-variables/variable-reference-variable.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-visited-ref.html b/tests/wpt/tests/css/css-variables/variable-reference-visited-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-visited-ref.html rename to tests/wpt/tests/css/css-variables/variable-reference-visited-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-visited.html b/tests/wpt/tests/css/css-variables/variable-reference-visited.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-visited.html rename to tests/wpt/tests/css/css-variables/variable-reference-visited.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference-without-whitespace.html b/tests/wpt/tests/css/css-variables/variable-reference-without-whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference-without-whitespace.html rename to tests/wpt/tests/css/css-variables/variable-reference-without-whitespace.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-reference.html b/tests/wpt/tests/css/css-variables/variable-reference.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-reference.html rename to tests/wpt/tests/css/css-variables/variable-reference.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-substitution-background-properties.html b/tests/wpt/tests/css/css-variables/variable-substitution-background-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-substitution-background-properties.html rename to tests/wpt/tests/css/css-variables/variable-substitution-background-properties.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-substitution-basic.html b/tests/wpt/tests/css/css-variables/variable-substitution-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-substitution-basic.html rename to tests/wpt/tests/css/css-variables/variable-substitution-basic.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-substitution-filters.html b/tests/wpt/tests/css/css-variables/variable-substitution-filters.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-substitution-filters.html rename to tests/wpt/tests/css/css-variables/variable-substitution-filters.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-substitution-replaced-size.html b/tests/wpt/tests/css/css-variables/variable-substitution-replaced-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-substitution-replaced-size.html rename to tests/wpt/tests/css/css-variables/variable-substitution-replaced-size.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-substitution-shadow-properties.html b/tests/wpt/tests/css/css-variables/variable-substitution-shadow-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-substitution-shadow-properties.html rename to tests/wpt/tests/css/css-variables/variable-substitution-shadow-properties.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-substitution-shorthands.html b/tests/wpt/tests/css/css-variables/variable-substitution-shorthands.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-substitution-shorthands.html rename to tests/wpt/tests/css/css-variables/variable-substitution-shorthands.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-substitution-variable-declaration.html b/tests/wpt/tests/css/css-variables/variable-substitution-variable-declaration.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-substitution-variable-declaration.html rename to tests/wpt/tests/css/css-variables/variable-substitution-variable-declaration.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-01.html b/tests/wpt/tests/css/css-variables/variable-supports-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-01.html rename to tests/wpt/tests/css/css-variables/variable-supports-01.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-02.html b/tests/wpt/tests/css/css-variables/variable-supports-02.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-02.html rename to tests/wpt/tests/css/css-variables/variable-supports-02.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-03.html b/tests/wpt/tests/css/css-variables/variable-supports-03.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-03.html rename to tests/wpt/tests/css/css-variables/variable-supports-03.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-04.html b/tests/wpt/tests/css/css-variables/variable-supports-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-04.html rename to tests/wpt/tests/css/css-variables/variable-supports-04.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-05.html b/tests/wpt/tests/css/css-variables/variable-supports-05.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-05.html rename to tests/wpt/tests/css/css-variables/variable-supports-05.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-06.html b/tests/wpt/tests/css/css-variables/variable-supports-06.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-06.html rename to tests/wpt/tests/css/css-variables/variable-supports-06.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-07.html b/tests/wpt/tests/css/css-variables/variable-supports-07.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-07.html rename to tests/wpt/tests/css/css-variables/variable-supports-07.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-08.html b/tests/wpt/tests/css/css-variables/variable-supports-08.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-08.html rename to tests/wpt/tests/css/css-variables/variable-supports-08.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-09.html b/tests/wpt/tests/css/css-variables/variable-supports-09.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-09.html rename to tests/wpt/tests/css/css-variables/variable-supports-09.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-10.html b/tests/wpt/tests/css/css-variables/variable-supports-10.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-10.html rename to tests/wpt/tests/css/css-variables/variable-supports-10.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-11.html b/tests/wpt/tests/css/css-variables/variable-supports-11.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-11.html rename to tests/wpt/tests/css/css-variables/variable-supports-11.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-12.html b/tests/wpt/tests/css/css-variables/variable-supports-12.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-12.html rename to tests/wpt/tests/css/css-variables/variable-supports-12.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-13.html b/tests/wpt/tests/css/css-variables/variable-supports-13.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-13.html rename to tests/wpt/tests/css/css-variables/variable-supports-13.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-14.html b/tests/wpt/tests/css/css-variables/variable-supports-14.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-14.html rename to tests/wpt/tests/css/css-variables/variable-supports-14.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-15.html b/tests/wpt/tests/css/css-variables/variable-supports-15.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-15.html rename to tests/wpt/tests/css/css-variables/variable-supports-15.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-16.html b/tests/wpt/tests/css/css-variables/variable-supports-16.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-16.html rename to tests/wpt/tests/css/css-variables/variable-supports-16.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-17.html b/tests/wpt/tests/css/css-variables/variable-supports-17.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-17.html rename to tests/wpt/tests/css/css-variables/variable-supports-17.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-18.html b/tests/wpt/tests/css/css-variables/variable-supports-18.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-18.html rename to tests/wpt/tests/css/css-variables/variable-supports-18.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-19.html b/tests/wpt/tests/css/css-variables/variable-supports-19.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-19.html rename to tests/wpt/tests/css/css-variables/variable-supports-19.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-20.html b/tests/wpt/tests/css/css-variables/variable-supports-20.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-20.html rename to tests/wpt/tests/css/css-variables/variable-supports-20.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-21.html b/tests/wpt/tests/css/css-variables/variable-supports-21.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-21.html rename to tests/wpt/tests/css/css-variables/variable-supports-21.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-22.html b/tests/wpt/tests/css/css-variables/variable-supports-22.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-22.html rename to tests/wpt/tests/css/css-variables/variable-supports-22.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-23.html b/tests/wpt/tests/css/css-variables/variable-supports-23.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-23.html rename to tests/wpt/tests/css/css-variables/variable-supports-23.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-24.html b/tests/wpt/tests/css/css-variables/variable-supports-24.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-24.html rename to tests/wpt/tests/css/css-variables/variable-supports-24.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-25.html b/tests/wpt/tests/css/css-variables/variable-supports-25.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-25.html rename to tests/wpt/tests/css/css-variables/variable-supports-25.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-26.html b/tests/wpt/tests/css/css-variables/variable-supports-26.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-26.html rename to tests/wpt/tests/css/css-variables/variable-supports-26.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-27.html b/tests/wpt/tests/css/css-variables/variable-supports-27.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-27.html rename to tests/wpt/tests/css/css-variables/variable-supports-27.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-28.html b/tests/wpt/tests/css/css-variables/variable-supports-28.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-28.html rename to tests/wpt/tests/css/css-variables/variable-supports-28.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-29.html b/tests/wpt/tests/css/css-variables/variable-supports-29.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-29.html rename to tests/wpt/tests/css/css-variables/variable-supports-29.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-30.html b/tests/wpt/tests/css/css-variables/variable-supports-30.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-30.html rename to tests/wpt/tests/css/css-variables/variable-supports-30.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-31.html b/tests/wpt/tests/css/css-variables/variable-supports-31.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-31.html rename to tests/wpt/tests/css/css-variables/variable-supports-31.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-32.html b/tests/wpt/tests/css/css-variables/variable-supports-32.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-32.html rename to tests/wpt/tests/css/css-variables/variable-supports-32.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-33.html b/tests/wpt/tests/css/css-variables/variable-supports-33.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-33.html rename to tests/wpt/tests/css/css-variables/variable-supports-33.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-34.html b/tests/wpt/tests/css/css-variables/variable-supports-34.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-34.html rename to tests/wpt/tests/css/css-variables/variable-supports-34.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-35.html b/tests/wpt/tests/css/css-variables/variable-supports-35.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-35.html rename to tests/wpt/tests/css/css-variables/variable-supports-35.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-36.html b/tests/wpt/tests/css/css-variables/variable-supports-36.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-36.html rename to tests/wpt/tests/css/css-variables/variable-supports-36.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-37.html b/tests/wpt/tests/css/css-variables/variable-supports-37.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-37.html rename to tests/wpt/tests/css/css-variables/variable-supports-37.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-38.html b/tests/wpt/tests/css/css-variables/variable-supports-38.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-38.html rename to tests/wpt/tests/css/css-variables/variable-supports-38.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-39.html b/tests/wpt/tests/css/css-variables/variable-supports-39.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-39.html rename to tests/wpt/tests/css/css-variables/variable-supports-39.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-40.html b/tests/wpt/tests/css/css-variables/variable-supports-40.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-40.html rename to tests/wpt/tests/css/css-variables/variable-supports-40.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-41.html b/tests/wpt/tests/css/css-variables/variable-supports-41.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-41.html rename to tests/wpt/tests/css/css-variables/variable-supports-41.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-42.html b/tests/wpt/tests/css/css-variables/variable-supports-42.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-42.html rename to tests/wpt/tests/css/css-variables/variable-supports-42.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-43.html b/tests/wpt/tests/css/css-variables/variable-supports-43.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-43.html rename to tests/wpt/tests/css/css-variables/variable-supports-43.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-44.html b/tests/wpt/tests/css/css-variables/variable-supports-44.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-44.html rename to tests/wpt/tests/css/css-variables/variable-supports-44.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-45.html b/tests/wpt/tests/css/css-variables/variable-supports-45.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-45.html rename to tests/wpt/tests/css/css-variables/variable-supports-45.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-46.html b/tests/wpt/tests/css/css-variables/variable-supports-46.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-46.html rename to tests/wpt/tests/css/css-variables/variable-supports-46.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-47.html b/tests/wpt/tests/css/css-variables/variable-supports-47.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-47.html rename to tests/wpt/tests/css/css-variables/variable-supports-47.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-48.html b/tests/wpt/tests/css/css-variables/variable-supports-48.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-48.html rename to tests/wpt/tests/css/css-variables/variable-supports-48.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-49.html b/tests/wpt/tests/css/css-variables/variable-supports-49.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-49.html rename to tests/wpt/tests/css/css-variables/variable-supports-49.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-50.html b/tests/wpt/tests/css/css-variables/variable-supports-50.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-50.html rename to tests/wpt/tests/css/css-variables/variable-supports-50.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-51.html b/tests/wpt/tests/css/css-variables/variable-supports-51.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-51.html rename to tests/wpt/tests/css/css-variables/variable-supports-51.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-52.html b/tests/wpt/tests/css/css-variables/variable-supports-52.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-52.html rename to tests/wpt/tests/css/css-variables/variable-supports-52.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-53.html b/tests/wpt/tests/css/css-variables/variable-supports-53.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-53.html rename to tests/wpt/tests/css/css-variables/variable-supports-53.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-54.html b/tests/wpt/tests/css/css-variables/variable-supports-54.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-54.html rename to tests/wpt/tests/css/css-variables/variable-supports-54.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-55.html b/tests/wpt/tests/css/css-variables/variable-supports-55.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-55.html rename to tests/wpt/tests/css/css-variables/variable-supports-55.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-56.html b/tests/wpt/tests/css/css-variables/variable-supports-56.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-56.html rename to tests/wpt/tests/css/css-variables/variable-supports-56.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-57.html b/tests/wpt/tests/css/css-variables/variable-supports-57.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-57.html rename to tests/wpt/tests/css/css-variables/variable-supports-57.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-58.html b/tests/wpt/tests/css/css-variables/variable-supports-58.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-58.html rename to tests/wpt/tests/css/css-variables/variable-supports-58.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-59.html b/tests/wpt/tests/css/css-variables/variable-supports-59.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-59.html rename to tests/wpt/tests/css/css-variables/variable-supports-59.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-60.html b/tests/wpt/tests/css/css-variables/variable-supports-60.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-60.html rename to tests/wpt/tests/css/css-variables/variable-supports-60.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-61.html b/tests/wpt/tests/css/css-variables/variable-supports-61.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-61.html rename to tests/wpt/tests/css/css-variables/variable-supports-61.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-62.html b/tests/wpt/tests/css/css-variables/variable-supports-62.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-62.html rename to tests/wpt/tests/css/css-variables/variable-supports-62.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-63.html b/tests/wpt/tests/css/css-variables/variable-supports-63.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-63.html rename to tests/wpt/tests/css/css-variables/variable-supports-63.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-64.html b/tests/wpt/tests/css/css-variables/variable-supports-64.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-64.html rename to tests/wpt/tests/css/css-variables/variable-supports-64.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-65.html b/tests/wpt/tests/css/css-variables/variable-supports-65.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-65.html rename to tests/wpt/tests/css/css-variables/variable-supports-65.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-66.html b/tests/wpt/tests/css/css-variables/variable-supports-66.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-66.html rename to tests/wpt/tests/css/css-variables/variable-supports-66.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-supports-67.html b/tests/wpt/tests/css/css-variables/variable-supports-67.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-supports-67.html rename to tests/wpt/tests/css/css-variables/variable-supports-67.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-transitions-transition-property-all-before-value.html b/tests/wpt/tests/css/css-variables/variable-transitions-transition-property-all-before-value.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-transitions-transition-property-all-before-value.html rename to tests/wpt/tests/css/css-variables/variable-transitions-transition-property-all-before-value.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-transitions-value-before-transition-property-all.html b/tests/wpt/tests/css/css-variables/variable-transitions-value-before-transition-property-all.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variable-transitions-value-before-transition-property-all.html rename to tests/wpt/tests/css/css-variables/variable-transitions-value-before-transition-property-all.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/variables-substitute-guaranteed-invalid.html b/tests/wpt/tests/css/css-variables/variables-substitute-guaranteed-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/variables-substitute-guaranteed-invalid.html rename to tests/wpt/tests/css/css-variables/variables-substitute-guaranteed-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/vars-background-shorthand-001.html b/tests/wpt/tests/css/css-variables/vars-background-shorthand-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/vars-background-shorthand-001.html rename to tests/wpt/tests/css/css-variables/vars-background-shorthand-001.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/vars-border-shorthand-serialize.html b/tests/wpt/tests/css/css-variables/vars-border-shorthand-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/vars-border-shorthand-serialize.html rename to tests/wpt/tests/css/css-variables/vars-border-shorthand-serialize.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/vars-font-shorthand-001.html b/tests/wpt/tests/css/css-variables/vars-font-shorthand-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/vars-font-shorthand-001.html rename to tests/wpt/tests/css/css-variables/vars-font-shorthand-001.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/wide-keyword-fallback-ref.html b/tests/wpt/tests/css/css-variables/wide-keyword-fallback-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/wide-keyword-fallback-ref.html rename to tests/wpt/tests/css/css-variables/wide-keyword-fallback-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-variables/wide-keyword-fallback.html b/tests/wpt/tests/css/css-variables/wide-keyword-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-variables/wide-keyword-fallback.html rename to tests/wpt/tests/css/css-variables/wide-keyword-fallback.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/3d-transform-incoming-ref.html b/tests/wpt/tests/css/css-view-transitions/3d-transform-incoming-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/3d-transform-incoming-ref.html rename to tests/wpt/tests/css/css-view-transitions/3d-transform-incoming-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/3d-transform-incoming.html b/tests/wpt/tests/css/css-view-transitions/3d-transform-incoming.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/3d-transform-incoming.html rename to tests/wpt/tests/css/css-view-transitions/3d-transform-incoming.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/3d-transform-outgoing-ref.html b/tests/wpt/tests/css/css-view-transitions/3d-transform-outgoing-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/3d-transform-outgoing-ref.html rename to tests/wpt/tests/css/css-view-transitions/3d-transform-outgoing-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/3d-transform-outgoing.html b/tests/wpt/tests/css/css-view-transitions/3d-transform-outgoing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/3d-transform-outgoing.html rename to tests/wpt/tests/css/css-view-transitions/3d-transform-outgoing.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/animating-new-content-ref.html b/tests/wpt/tests/css/css-view-transitions/animating-new-content-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/animating-new-content-ref.html rename to tests/wpt/tests/css/css-view-transitions/animating-new-content-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/animating-new-content-subset-ref.html b/tests/wpt/tests/css/css-view-transitions/animating-new-content-subset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/animating-new-content-subset-ref.html rename to tests/wpt/tests/css/css-view-transitions/animating-new-content-subset-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/animating-new-content-subset.html b/tests/wpt/tests/css/css-view-transitions/animating-new-content-subset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/animating-new-content-subset.html rename to tests/wpt/tests/css/css-view-transitions/animating-new-content-subset.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/animating-new-content.html b/tests/wpt/tests/css/css-view-transitions/animating-new-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/animating-new-content.html rename to tests/wpt/tests/css/css-view-transitions/animating-new-content.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/break-inside-avoid-child-ref.html b/tests/wpt/tests/css/css-view-transitions/break-inside-avoid-child-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/break-inside-avoid-child-ref.html rename to tests/wpt/tests/css/css-view-transitions/break-inside-avoid-child-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/break-inside-avoid-child.html b/tests/wpt/tests/css/css-view-transitions/break-inside-avoid-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/break-inside-avoid-child.html rename to tests/wpt/tests/css/css-view-transitions/break-inside-avoid-child.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-object-fit-fill-ref.html b/tests/wpt/tests/css/css-view-transitions/content-object-fit-fill-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-object-fit-fill-ref.html rename to tests/wpt/tests/css/css-view-transitions/content-object-fit-fill-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-object-fit-none-ref.html b/tests/wpt/tests/css/css-view-transitions/content-object-fit-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-object-fit-none-ref.html rename to tests/wpt/tests/css/css-view-transitions/content-object-fit-none-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-smaller-than-box-size-ref.html b/tests/wpt/tests/css/css-view-transitions/content-smaller-than-box-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-smaller-than-box-size-ref.html rename to tests/wpt/tests/css/css-view-transitions/content-smaller-than-box-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-smaller-than-box-size.html b/tests/wpt/tests/css/css-view-transitions/content-smaller-than-box-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-smaller-than-box-size.html rename to tests/wpt/tests/css/css-view-transitions/content-smaller-than-box-size.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-visibility-auto-shared-element-ref.html b/tests/wpt/tests/css/css-view-transitions/content-visibility-auto-shared-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-visibility-auto-shared-element-ref.html rename to tests/wpt/tests/css/css-view-transitions/content-visibility-auto-shared-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-visibility-auto-shared-element.html b/tests/wpt/tests/css/css-view-transitions/content-visibility-auto-shared-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-visibility-auto-shared-element.html rename to tests/wpt/tests/css/css-view-transitions/content-visibility-auto-shared-element.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-child-with-transparent-background-ref.html b/tests/wpt/tests/css/css-view-transitions/content-with-child-with-transparent-background-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-child-with-transparent-background-ref.html rename to tests/wpt/tests/css/css-view-transitions/content-with-child-with-transparent-background-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-child-with-transparent-background.html b/tests/wpt/tests/css/css-view-transitions/content-with-child-with-transparent-background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-child-with-transparent-background.html rename to tests/wpt/tests/css/css-view-transitions/content-with-child-with-transparent-background.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-clip-ref.html b/tests/wpt/tests/css/css-view-transitions/content-with-clip-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-clip-ref.html rename to tests/wpt/tests/css/css-view-transitions/content-with-clip-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-clip-root-ref.html b/tests/wpt/tests/css/css-view-transitions/content-with-clip-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-clip-root-ref.html rename to tests/wpt/tests/css/css-view-transitions/content-with-clip-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-clip-root.html b/tests/wpt/tests/css/css-view-transitions/content-with-clip-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-clip-root.html rename to tests/wpt/tests/css/css-view-transitions/content-with-clip-root.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-clip.html b/tests/wpt/tests/css/css-view-transitions/content-with-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-clip.html rename to tests/wpt/tests/css/css-view-transitions/content-with-clip.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-inline-child-ref.html b/tests/wpt/tests/css/css-view-transitions/content-with-inline-child-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-inline-child-ref.html rename to tests/wpt/tests/css/css-view-transitions/content-with-inline-child-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-inline-child.html b/tests/wpt/tests/css/css-view-transitions/content-with-inline-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-inline-child.html rename to tests/wpt/tests/css/css-view-transitions/content-with-inline-child.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-object-view-box-ref.html b/tests/wpt/tests/css/css-view-transitions/content-with-object-view-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-object-view-box-ref.html rename to tests/wpt/tests/css/css-view-transitions/content-with-object-view-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-overflow-ref.html b/tests/wpt/tests/css/css-view-transitions/content-with-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-overflow-ref.html rename to tests/wpt/tests/css/css-view-transitions/content-with-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-overflow-zoomed-ref.html b/tests/wpt/tests/css/css-view-transitions/content-with-overflow-zoomed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-overflow-zoomed-ref.html rename to tests/wpt/tests/css/css-view-transitions/content-with-overflow-zoomed-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-transform-new-image.html b/tests/wpt/tests/css/css-view-transitions/content-with-transform-new-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-transform-new-image.html rename to tests/wpt/tests/css/css-view-transitions/content-with-transform-new-image.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-transform-old-image.html b/tests/wpt/tests/css/css-view-transitions/content-with-transform-old-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-transform-old-image.html rename to tests/wpt/tests/css/css-view-transitions/content-with-transform-old-image.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-transform-ref.html b/tests/wpt/tests/css/css-view-transitions/content-with-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-transform-ref.html rename to tests/wpt/tests/css/css-view-transitions/content-with-transform-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-transparent-background-ref.html b/tests/wpt/tests/css/css-view-transitions/content-with-transparent-background-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-transparent-background-ref.html rename to tests/wpt/tests/css/css-view-transitions/content-with-transparent-background-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/content-with-transparent-background.html b/tests/wpt/tests/css/css-view-transitions/content-with-transparent-background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/content-with-transparent-background.html rename to tests/wpt/tests/css/css-view-transitions/content-with-transparent-background.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/css-tags-paint-order-ref.html b/tests/wpt/tests/css/css-view-transitions/css-tags-paint-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/css-tags-paint-order-ref.html rename to tests/wpt/tests/css/css-view-transitions/css-tags-paint-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/css-tags-paint-order-with-entry-ref.html b/tests/wpt/tests/css/css-view-transitions/css-tags-paint-order-with-entry-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/css-tags-paint-order-with-entry-ref.html rename to tests/wpt/tests/css/css-view-transitions/css-tags-paint-order-with-entry-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/css-tags-paint-order-with-entry.html b/tests/wpt/tests/css/css-view-transitions/css-tags-paint-order-with-entry.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/css-tags-paint-order-with-entry.html rename to tests/wpt/tests/css/css-view-transitions/css-tags-paint-order-with-entry.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/css-tags-paint-order.html b/tests/wpt/tests/css/css-view-transitions/css-tags-paint-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/css-tags-paint-order.html rename to tests/wpt/tests/css/css-view-transitions/css-tags-paint-order.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/css-tags-shared-element-ref.html b/tests/wpt/tests/css/css-view-transitions/css-tags-shared-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/css-tags-shared-element-ref.html rename to tests/wpt/tests/css/css-view-transitions/css-tags-shared-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/css-tags-shared-element.html b/tests/wpt/tests/css/css-view-transitions/css-tags-shared-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/css-tags-shared-element.html rename to tests/wpt/tests/css/css-view-transitions/css-tags-shared-element.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/dialog-in-rtl-iframe-ref.html b/tests/wpt/tests/css/css-view-transitions/dialog-in-rtl-iframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/dialog-in-rtl-iframe-ref.html rename to tests/wpt/tests/css/css-view-transitions/dialog-in-rtl-iframe-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/dialog-in-rtl-iframe.html b/tests/wpt/tests/css/css-view-transitions/dialog-in-rtl-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/dialog-in-rtl-iframe.html rename to tests/wpt/tests/css/css-view-transitions/dialog-in-rtl-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/dialog-in-top-layer-during-transition-new.html b/tests/wpt/tests/css/css-view-transitions/dialog-in-top-layer-during-transition-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/dialog-in-top-layer-during-transition-new.html rename to tests/wpt/tests/css/css-view-transitions/dialog-in-top-layer-during-transition-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/dialog-in-top-layer-during-transition-old.html b/tests/wpt/tests/css/css-view-transitions/dialog-in-top-layer-during-transition-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/dialog-in-top-layer-during-transition-old.html rename to tests/wpt/tests/css/css-view-transitions/dialog-in-top-layer-during-transition-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/dialog-in-top-layer-during-transition-ref.html b/tests/wpt/tests/css/css-view-transitions/dialog-in-top-layer-during-transition-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/dialog-in-top-layer-during-transition-ref.html rename to tests/wpt/tests/css/css-view-transitions/dialog-in-top-layer-during-transition-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/document-element-detatched-crash.html b/tests/wpt/tests/css/css-view-transitions/document-element-detatched-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/document-element-detatched-crash.html rename to tests/wpt/tests/css/css-view-transitions/document-element-detatched-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/duplicate-tag-rejects-capture.html b/tests/wpt/tests/css/css-view-transitions/duplicate-tag-rejects-capture.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/duplicate-tag-rejects-capture.html rename to tests/wpt/tests/css/css-view-transitions/duplicate-tag-rejects-capture.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/duplicate-tag-rejects-start.html b/tests/wpt/tests/css/css-view-transitions/duplicate-tag-rejects-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/duplicate-tag-rejects-start.html rename to tests/wpt/tests/css/css-view-transitions/duplicate-tag-rejects-start.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/element-is-grouping-during-animation-ref.html b/tests/wpt/tests/css/css-view-transitions/element-is-grouping-during-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/element-is-grouping-during-animation-ref.html rename to tests/wpt/tests/css/css-view-transitions/element-is-grouping-during-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/element-is-grouping-during-animation.html b/tests/wpt/tests/css/css-view-transitions/element-is-grouping-during-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/element-is-grouping-during-animation.html rename to tests/wpt/tests/css/css-view-transitions/element-is-grouping-during-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/element-stops-grouping-after-animation-ref.html b/tests/wpt/tests/css/css-view-transitions/element-stops-grouping-after-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/element-stops-grouping-after-animation-ref.html rename to tests/wpt/tests/css/css-view-transitions/element-stops-grouping-after-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/element-stops-grouping-after-animation.html b/tests/wpt/tests/css/css-view-transitions/element-stops-grouping-after-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/element-stops-grouping-after-animation.html rename to tests/wpt/tests/css/css-view-transitions/element-stops-grouping-after-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/element-with-overflow-ref.html b/tests/wpt/tests/css/css-view-transitions/element-with-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/element-with-overflow-ref.html rename to tests/wpt/tests/css/css-view-transitions/element-with-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/element-with-overflow.html b/tests/wpt/tests/css/css-view-transitions/element-with-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/element-with-overflow.html rename to tests/wpt/tests/css/css-view-transitions/element-with-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/event-pseudo-name.html b/tests/wpt/tests/css/css-view-transitions/event-pseudo-name.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/event-pseudo-name.html rename to tests/wpt/tests/css/css-view-transitions/event-pseudo-name.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/exit-transition-with-anonymous-layout-object-ref.html b/tests/wpt/tests/css/css-view-transitions/exit-transition-with-anonymous-layout-object-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/exit-transition-with-anonymous-layout-object-ref.html rename to tests/wpt/tests/css/css-view-transitions/exit-transition-with-anonymous-layout-object-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/exit-transition-with-anonymous-layout-object.html b/tests/wpt/tests/css/css-view-transitions/exit-transition-with-anonymous-layout-object.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/exit-transition-with-anonymous-layout-object.html rename to tests/wpt/tests/css/css-view-transitions/exit-transition-with-anonymous-layout-object.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/far-away-capture-ref.html b/tests/wpt/tests/css/css-view-transitions/far-away-capture-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/far-away-capture-ref.html rename to tests/wpt/tests/css/css-view-transitions/far-away-capture-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/far-away-capture.html b/tests/wpt/tests/css/css-view-transitions/far-away-capture.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/far-away-capture.html rename to tests/wpt/tests/css/css-view-transitions/far-away-capture.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-new.html b/tests/wpt/tests/css/css-view-transitions/fractional-box-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-new.html rename to tests/wpt/tests/css/css-view-transitions/fractional-box-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-old.html b/tests/wpt/tests/css/css-view-transitions/fractional-box-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-old.html rename to tests/wpt/tests/css/css-view-transitions/fractional-box-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-ref.html b/tests/wpt/tests/css/css-view-transitions/fractional-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-ref.html rename to tests/wpt/tests/css/css-view-transitions/fractional-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-with-overflow-children-new.html b/tests/wpt/tests/css/css-view-transitions/fractional-box-with-overflow-children-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-with-overflow-children-new.html rename to tests/wpt/tests/css/css-view-transitions/fractional-box-with-overflow-children-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-with-overflow-children-old.html b/tests/wpt/tests/css/css-view-transitions/fractional-box-with-overflow-children-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-with-overflow-children-old.html rename to tests/wpt/tests/css/css-view-transitions/fractional-box-with-overflow-children-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-with-overflow-children-ref.html b/tests/wpt/tests/css/css-view-transitions/fractional-box-with-overflow-children-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-with-overflow-children-ref.html rename to tests/wpt/tests/css/css-view-transitions/fractional-box-with-overflow-children-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-with-shadow-new.html b/tests/wpt/tests/css/css-view-transitions/fractional-box-with-shadow-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-with-shadow-new.html rename to tests/wpt/tests/css/css-view-transitions/fractional-box-with-shadow-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-with-shadow-old.html b/tests/wpt/tests/css/css-view-transitions/fractional-box-with-shadow-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-with-shadow-old.html rename to tests/wpt/tests/css/css-view-transitions/fractional-box-with-shadow-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-with-shadow-ref.html b/tests/wpt/tests/css/css-view-transitions/fractional-box-with-shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fractional-box-with-shadow-ref.html rename to tests/wpt/tests/css/css-view-transitions/fractional-box-with-shadow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fractional-translation-from-position-ref.html b/tests/wpt/tests/css/css-view-transitions/fractional-translation-from-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fractional-translation-from-position-ref.html rename to tests/wpt/tests/css/css-view-transitions/fractional-translation-from-position-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fractional-translation-from-position.html b/tests/wpt/tests/css/css-view-transitions/fractional-translation-from-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fractional-translation-from-position.html rename to tests/wpt/tests/css/css-view-transitions/fractional-translation-from-position.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fractional-translation-from-transform-ref.html b/tests/wpt/tests/css/css-view-transitions/fractional-translation-from-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fractional-translation-from-transform-ref.html rename to tests/wpt/tests/css/css-view-transitions/fractional-translation-from-transform-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fractional-translation-from-transform.html b/tests/wpt/tests/css/css-view-transitions/fractional-translation-from-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fractional-translation-from-transform.html rename to tests/wpt/tests/css/css-view-transitions/fractional-translation-from-transform.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fragmented-at-start-ignored-ref.html b/tests/wpt/tests/css/css-view-transitions/fragmented-at-start-ignored-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fragmented-at-start-ignored-ref.html rename to tests/wpt/tests/css/css-view-transitions/fragmented-at-start-ignored-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fragmented-at-start-ignored.html b/tests/wpt/tests/css/css-view-transitions/fragmented-at-start-ignored.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fragmented-at-start-ignored.html rename to tests/wpt/tests/css/css-view-transitions/fragmented-at-start-ignored.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fragmented-during-transition-skips-ref.html b/tests/wpt/tests/css/css-view-transitions/fragmented-during-transition-skips-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fragmented-during-transition-skips-ref.html rename to tests/wpt/tests/css/css-view-transitions/fragmented-during-transition-skips-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/fragmented-during-transition-skips.html b/tests/wpt/tests/css/css-view-transitions/fragmented-during-transition-skips.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/fragmented-during-transition-skips.html rename to tests/wpt/tests/css/css-view-transitions/fragmented-during-transition-skips.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/get-computed-style-crash.html b/tests/wpt/tests/css/css-view-transitions/get-computed-style-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/get-computed-style-crash.html rename to tests/wpt/tests/css/css-view-transitions/get-computed-style-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/hit-test-unpainted-element-from-point.html b/tests/wpt/tests/css/css-view-transitions/hit-test-unpainted-element-from-point.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/hit-test-unpainted-element-from-point.html rename to tests/wpt/tests/css/css-view-transitions/hit-test-unpainted-element-from-point.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/hit-test-unpainted-element-ref.html b/tests/wpt/tests/css/css-view-transitions/hit-test-unpainted-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/hit-test-unpainted-element-ref.html rename to tests/wpt/tests/css/css-view-transitions/hit-test-unpainted-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/hit-test-unpainted-element.html b/tests/wpt/tests/css/css-view-transitions/hit-test-unpainted-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/hit-test-unpainted-element.html rename to tests/wpt/tests/css/css-view-transitions/hit-test-unpainted-element.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/hit-test-unrelated-element-ref.html b/tests/wpt/tests/css/css-view-transitions/hit-test-unrelated-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/hit-test-unrelated-element-ref.html rename to tests/wpt/tests/css/css-view-transitions/hit-test-unrelated-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/hit-test-unrelated-element.html b/tests/wpt/tests/css/css-view-transitions/hit-test-unrelated-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/hit-test-unrelated-element.html rename to tests/wpt/tests/css/css-view-transitions/hit-test-unrelated-element.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/iframe-new-has-scrollbar-ref.html b/tests/wpt/tests/css/css-view-transitions/iframe-new-has-scrollbar-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/iframe-new-has-scrollbar-ref.html rename to tests/wpt/tests/css/css-view-transitions/iframe-new-has-scrollbar-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/iframe-new-has-scrollbar.html b/tests/wpt/tests/css/css-view-transitions/iframe-new-has-scrollbar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/iframe-new-has-scrollbar.html rename to tests/wpt/tests/css/css-view-transitions/iframe-new-has-scrollbar.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/iframe-old-has-scrollbar-ref.html b/tests/wpt/tests/css/css-view-transitions/iframe-old-has-scrollbar-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/iframe-old-has-scrollbar-ref.html rename to tests/wpt/tests/css/css-view-transitions/iframe-old-has-scrollbar-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/iframe-old-has-scrollbar.html b/tests/wpt/tests/css/css-view-transitions/iframe-old-has-scrollbar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/iframe-old-has-scrollbar.html rename to tests/wpt/tests/css/css-view-transitions/iframe-old-has-scrollbar.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/iframe-transition-ref.html b/tests/wpt/tests/css/css-view-transitions/iframe-transition-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/iframe-transition-ref.html rename to tests/wpt/tests/css/css-view-transitions/iframe-transition-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/iframe-transition.sub.html b/tests/wpt/tests/css/css-view-transitions/iframe-transition.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/iframe-transition.sub.html rename to tests/wpt/tests/css/css-view-transitions/iframe-transition.sub.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/inline-child-with-filter-ref.html b/tests/wpt/tests/css/css-view-transitions/inline-child-with-filter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/inline-child-with-filter-ref.html rename to tests/wpt/tests/css/css-view-transitions/inline-child-with-filter-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/inline-child-with-filter.html b/tests/wpt/tests/css/css-view-transitions/inline-child-with-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/inline-child-with-filter.html rename to tests/wpt/tests/css/css-view-transitions/inline-child-with-filter.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/input-targets-root-while-render-blocked.html b/tests/wpt/tests/css/css-view-transitions/input-targets-root-while-render-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/input-targets-root-while-render-blocked.html rename to tests/wpt/tests/css/css-view-transitions/input-targets-root-while-render-blocked.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/intrinsic-aspect-ratio-ref.html b/tests/wpt/tests/css/css-view-transitions/intrinsic-aspect-ratio-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/intrinsic-aspect-ratio-ref.html rename to tests/wpt/tests/css/css-view-transitions/intrinsic-aspect-ratio-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/japanese-tag-ref.html b/tests/wpt/tests/css/css-view-transitions/japanese-tag-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/japanese-tag-ref.html rename to tests/wpt/tests/css/css-view-transitions/japanese-tag-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/japanese-tag.html b/tests/wpt/tests/css/css-view-transitions/japanese-tag.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/japanese-tag.html rename to tests/wpt/tests/css/css-view-transitions/japanese-tag.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-and-on-top-of-viewport-partially-onscreen-new.html b/tests/wpt/tests/css/css-view-transitions/massive-element-below-and-on-top-of-viewport-partially-onscreen-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-and-on-top-of-viewport-partially-onscreen-new.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-below-and-on-top-of-viewport-partially-onscreen-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-and-on-top-of-viewport-partially-onscreen-old.html b/tests/wpt/tests/css/css-view-transitions/massive-element-below-and-on-top-of-viewport-partially-onscreen-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-and-on-top-of-viewport-partially-onscreen-old.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-below-and-on-top-of-viewport-partially-onscreen-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-and-on-top-of-viewport-partially-onscreen-ref.html b/tests/wpt/tests/css/css-view-transitions/massive-element-below-and-on-top-of-viewport-partially-onscreen-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-and-on-top-of-viewport-partially-onscreen-ref.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-below-and-on-top-of-viewport-partially-onscreen-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-viewport-offscreen-new.html b/tests/wpt/tests/css/css-view-transitions/massive-element-below-viewport-offscreen-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-viewport-offscreen-new.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-below-viewport-offscreen-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-viewport-offscreen-old.html b/tests/wpt/tests/css/css-view-transitions/massive-element-below-viewport-offscreen-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-viewport-offscreen-old.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-below-viewport-offscreen-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-viewport-offscreen-ref.html b/tests/wpt/tests/css/css-view-transitions/massive-element-below-viewport-offscreen-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-viewport-offscreen-ref.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-below-viewport-offscreen-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-viewport-partially-onscreen-new.html b/tests/wpt/tests/css/css-view-transitions/massive-element-below-viewport-partially-onscreen-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-viewport-partially-onscreen-new.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-below-viewport-partially-onscreen-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-viewport-partially-onscreen-old.html b/tests/wpt/tests/css/css-view-transitions/massive-element-below-viewport-partially-onscreen-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-viewport-partially-onscreen-old.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-below-viewport-partially-onscreen-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-viewport-partially-onscreen-ref.html b/tests/wpt/tests/css/css-view-transitions/massive-element-below-viewport-partially-onscreen-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-below-viewport-partially-onscreen-ref.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-below-viewport-partially-onscreen-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-left-of-viewport-offscreen-new.html b/tests/wpt/tests/css/css-view-transitions/massive-element-left-of-viewport-offscreen-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-left-of-viewport-offscreen-new.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-left-of-viewport-offscreen-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-left-of-viewport-offscreen-old.html b/tests/wpt/tests/css/css-view-transitions/massive-element-left-of-viewport-offscreen-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-left-of-viewport-offscreen-old.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-left-of-viewport-offscreen-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-left-of-viewport-offscreen-ref.html b/tests/wpt/tests/css/css-view-transitions/massive-element-left-of-viewport-offscreen-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-left-of-viewport-offscreen-ref.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-left-of-viewport-offscreen-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-new.html b/tests/wpt/tests/css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-new.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-old.html b/tests/wpt/tests/css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-old.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-ref.html b/tests/wpt/tests/css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-ref.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-left-of-viewport-partially-onscreen-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-on-top-of-viewport-offscreen-new.html b/tests/wpt/tests/css/css-view-transitions/massive-element-on-top-of-viewport-offscreen-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-on-top-of-viewport-offscreen-new.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-on-top-of-viewport-offscreen-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-on-top-of-viewport-offscreen-old.html b/tests/wpt/tests/css/css-view-transitions/massive-element-on-top-of-viewport-offscreen-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-on-top-of-viewport-offscreen-old.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-on-top-of-viewport-offscreen-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-on-top-of-viewport-offscreen-ref.html b/tests/wpt/tests/css/css-view-transitions/massive-element-on-top-of-viewport-offscreen-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-on-top-of-viewport-offscreen-ref.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-on-top-of-viewport-offscreen-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-on-top-of-viewport-partially-onscreen-new.html b/tests/wpt/tests/css/css-view-transitions/massive-element-on-top-of-viewport-partially-onscreen-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-on-top-of-viewport-partially-onscreen-new.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-on-top-of-viewport-partially-onscreen-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-on-top-of-viewport-partially-onscreen-old.html b/tests/wpt/tests/css/css-view-transitions/massive-element-on-top-of-viewport-partially-onscreen-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-on-top-of-viewport-partially-onscreen-old.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-on-top-of-viewport-partially-onscreen-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-on-top-of-viewport-partially-onscreen-ref.html b/tests/wpt/tests/css/css-view-transitions/massive-element-on-top-of-viewport-partially-onscreen-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-on-top-of-viewport-partially-onscreen-ref.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-on-top-of-viewport-partially-onscreen-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-and-left-of-viewport-partially-onscreen-new.html b/tests/wpt/tests/css/css-view-transitions/massive-element-right-and-left-of-viewport-partially-onscreen-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-and-left-of-viewport-partially-onscreen-new.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-right-and-left-of-viewport-partially-onscreen-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-and-left-of-viewport-partially-onscreen-old.html b/tests/wpt/tests/css/css-view-transitions/massive-element-right-and-left-of-viewport-partially-onscreen-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-and-left-of-viewport-partially-onscreen-old.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-right-and-left-of-viewport-partially-onscreen-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-and-left-of-viewport-partially-onscreen-ref.html b/tests/wpt/tests/css/css-view-transitions/massive-element-right-and-left-of-viewport-partially-onscreen-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-and-left-of-viewport-partially-onscreen-ref.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-right-and-left-of-viewport-partially-onscreen-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-of-viewport-offscreen-new.html b/tests/wpt/tests/css/css-view-transitions/massive-element-right-of-viewport-offscreen-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-of-viewport-offscreen-new.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-right-of-viewport-offscreen-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-of-viewport-offscreen-old.html b/tests/wpt/tests/css/css-view-transitions/massive-element-right-of-viewport-offscreen-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-of-viewport-offscreen-old.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-right-of-viewport-offscreen-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-of-viewport-offscreen-ref.html b/tests/wpt/tests/css/css-view-transitions/massive-element-right-of-viewport-offscreen-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-of-viewport-offscreen-ref.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-right-of-viewport-offscreen-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-of-viewport-partially-onscreen-new.html b/tests/wpt/tests/css/css-view-transitions/massive-element-right-of-viewport-partially-onscreen-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-of-viewport-partially-onscreen-new.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-right-of-viewport-partially-onscreen-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-of-viewport-partially-onscreen-old.html b/tests/wpt/tests/css/css-view-transitions/massive-element-right-of-viewport-partially-onscreen-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-of-viewport-partially-onscreen-old.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-right-of-viewport-partially-onscreen-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-of-viewport-partially-onscreen-ref.html b/tests/wpt/tests/css/css-view-transitions/massive-element-right-of-viewport-partially-onscreen-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/massive-element-right-of-viewport-partially-onscreen-ref.html rename to tests/wpt/tests/css/css-view-transitions/massive-element-right-of-viewport-partially-onscreen-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/mix-blend-mode-only-on-transition.html b/tests/wpt/tests/css/css-view-transitions/mix-blend-mode-only-on-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/mix-blend-mode-only-on-transition.html rename to tests/wpt/tests/css/css-view-transitions/mix-blend-mode-only-on-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/named-element-with-fix-pos-child-new.html b/tests/wpt/tests/css/css-view-transitions/named-element-with-fix-pos-child-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/named-element-with-fix-pos-child-new.html rename to tests/wpt/tests/css/css-view-transitions/named-element-with-fix-pos-child-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/named-element-with-fix-pos-child-old.html b/tests/wpt/tests/css/css-view-transitions/named-element-with-fix-pos-child-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/named-element-with-fix-pos-child-old.html rename to tests/wpt/tests/css/css-view-transitions/named-element-with-fix-pos-child-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/named-element-with-fix-pos-child-ref.html b/tests/wpt/tests/css/css-view-transitions/named-element-with-fix-pos-child-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/named-element-with-fix-pos-child-ref.html rename to tests/wpt/tests/css/css-view-transitions/named-element-with-fix-pos-child-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-and-old-sizes-match-ref.html b/tests/wpt/tests/css/css-view-transitions/new-and-old-sizes-match-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-and-old-sizes-match-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-and-old-sizes-match-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-and-old-sizes-match.html b/tests/wpt/tests/css/css-view-transitions/new-and-old-sizes-match.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-and-old-sizes-match.html rename to tests/wpt/tests/css/css-view-transitions/new-and-old-sizes-match.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-clip-path-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-captures-clip-path-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-clip-path-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-captures-clip-path-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-clip-path.html b/tests/wpt/tests/css/css-view-transitions/new-content-captures-clip-path.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-clip-path.html rename to tests/wpt/tests/css/css-view-transitions/new-content-captures-clip-path.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-different-size-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-captures-different-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-different-size-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-captures-different-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-different-size.html b/tests/wpt/tests/css/css-view-transitions/new-content-captures-different-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-different-size.html rename to tests/wpt/tests/css/css-view-transitions/new-content-captures-different-size.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-opacity-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-captures-opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-opacity-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-captures-opacity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-opacity.html b/tests/wpt/tests/css/css-view-transitions/new-content-captures-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-opacity.html rename to tests/wpt/tests/css/css-view-transitions/new-content-captures-opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-positioned-spans-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-captures-positioned-spans-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-positioned-spans-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-captures-positioned-spans-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-positioned-spans.html b/tests/wpt/tests/css/css-view-transitions/new-content-captures-positioned-spans.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-positioned-spans.html rename to tests/wpt/tests/css/css-view-transitions/new-content-captures-positioned-spans.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-root-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-captures-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-root-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-captures-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-root.html b/tests/wpt/tests/css/css-view-transitions/new-content-captures-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-root.html rename to tests/wpt/tests/css/css-view-transitions/new-content-captures-root.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-spans-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-captures-spans-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-spans-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-captures-spans-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-spans.html b/tests/wpt/tests/css/css-view-transitions/new-content-captures-spans.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-captures-spans.html rename to tests/wpt/tests/css/css-view-transitions/new-content-captures-spans.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-changes-overflow-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-changes-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-changes-overflow-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-changes-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-changes-overflow.html b/tests/wpt/tests/css/css-view-transitions/new-content-changes-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-changes-overflow.html rename to tests/wpt/tests/css/css-view-transitions/new-content-changes-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-container-writing-modes-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-container-writing-modes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-container-writing-modes-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-container-writing-modes-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-container-writing-modes.html b/tests/wpt/tests/css/css-view-transitions/new-content-container-writing-modes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-container-writing-modes.html rename to tests/wpt/tests/css/css-view-transitions/new-content-container-writing-modes.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-element-writing-modes-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-element-writing-modes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-element-writing-modes-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-element-writing-modes-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-element-writing-modes.html b/tests/wpt/tests/css/css-view-transitions/new-content-element-writing-modes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-element-writing-modes.html rename to tests/wpt/tests/css/css-view-transitions/new-content-element-writing-modes.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-from-root-display-none-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-from-root-display-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-from-root-display-none-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-from-root-display-none-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-from-root-display-none.html b/tests/wpt/tests/css/css-view-transitions/new-content-from-root-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-from-root-display-none.html rename to tests/wpt/tests/css/css-view-transitions/new-content-from-root-display-none.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-has-scrollbars-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-has-scrollbars-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-has-scrollbars-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-has-scrollbars-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-has-scrollbars.html b/tests/wpt/tests/css/css-view-transitions/new-content-has-scrollbars.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-has-scrollbars.html rename to tests/wpt/tests/css/css-view-transitions/new-content-has-scrollbars.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-intrinsic-aspect-ratio.html b/tests/wpt/tests/css/css-view-transitions/new-content-intrinsic-aspect-ratio.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-intrinsic-aspect-ratio.html rename to tests/wpt/tests/css/css-view-transitions/new-content-intrinsic-aspect-ratio.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-is-empty-div-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-is-empty-div-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-is-empty-div-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-is-empty-div-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-is-empty-div.html b/tests/wpt/tests/css/css-view-transitions/new-content-is-empty-div.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-is-empty-div.html rename to tests/wpt/tests/css/css-view-transitions/new-content-is-empty-div.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-is-inline-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-is-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-is-inline-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-is-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-is-inline.html b/tests/wpt/tests/css/css-view-transitions/new-content-is-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-is-inline.html rename to tests/wpt/tests/css/css-view-transitions/new-content-is-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-fit-fill.html b/tests/wpt/tests/css/css-view-transitions/new-content-object-fit-fill.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-fit-fill.html rename to tests/wpt/tests/css/css-view-transitions/new-content-object-fit-fill.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-fit-none.html b/tests/wpt/tests/css/css-view-transitions/new-content-object-fit-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-fit-none.html rename to tests/wpt/tests/css/css-view-transitions/new-content-object-fit-none.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-clip-path-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-clip-path-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-clip-path-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-clip-path-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-clip-path-reference-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-clip-path-reference-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-clip-path-reference-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-clip-path-reference-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-clip-path-reference.html b/tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-clip-path-reference.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-clip-path-reference.html rename to tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-clip-path-reference.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-clip-path.html b/tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-clip-path.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-clip-path.html rename to tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-clip-path.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-overflow-clipped-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-overflow-clipped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-overflow-clipped-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-overflow-clipped-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-overflow-clipped.html b/tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-overflow-clipped.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-overflow-clipped.html rename to tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-overflow-clipped.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-overflow-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-overflow-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-overflow.html b/tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-object-view-box-overflow.html rename to tests/wpt/tests/css/css-view-transitions/new-content-object-view-box-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-scaling-ref.html b/tests/wpt/tests/css/css-view-transitions/new-content-scaling-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-scaling-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-content-scaling-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-scaling.html b/tests/wpt/tests/css/css-view-transitions/new-content-scaling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-scaling.html rename to tests/wpt/tests/css/css-view-transitions/new-content-scaling.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-with-object-view-box.html b/tests/wpt/tests/css/css-view-transitions/new-content-with-object-view-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-with-object-view-box.html rename to tests/wpt/tests/css/css-view-transitions/new-content-with-object-view-box.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-with-overflow-zoomed.html b/tests/wpt/tests/css/css-view-transitions/new-content-with-overflow-zoomed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-with-overflow-zoomed.html rename to tests/wpt/tests/css/css-view-transitions/new-content-with-overflow-zoomed.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-content-with-overflow.html b/tests/wpt/tests/css/css-view-transitions/new-content-with-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-content-with-overflow.html rename to tests/wpt/tests/css/css-view-transitions/new-content-with-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-element-on-start-ref.html b/tests/wpt/tests/css/css-view-transitions/new-element-on-start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-element-on-start-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-element-on-start-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-element-on-start.html b/tests/wpt/tests/css/css-view-transitions/new-element-on-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-element-on-start.html rename to tests/wpt/tests/css/css-view-transitions/new-element-on-start.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-root-vertical-writing-mode-ref.html b/tests/wpt/tests/css/css-view-transitions/new-root-vertical-writing-mode-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-root-vertical-writing-mode-ref.html rename to tests/wpt/tests/css/css-view-transitions/new-root-vertical-writing-mode-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/new-root-vertical-writing-mode.html b/tests/wpt/tests/css/css-view-transitions/new-root-vertical-writing-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/new-root-vertical-writing-mode.html rename to tests/wpt/tests/css/css-view-transitions/new-root-vertical-writing-mode.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/no-crash-set-exception.html b/tests/wpt/tests/css/css-view-transitions/no-crash-set-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/no-crash-set-exception.html rename to tests/wpt/tests/css/css-view-transitions/no-crash-set-exception.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/no-css-animation-while-render-blocked.html b/tests/wpt/tests/css/css-view-transitions/no-css-animation-while-render-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/no-css-animation-while-render-blocked.html rename to tests/wpt/tests/css/css-view-transitions/no-css-animation-while-render-blocked.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/no-raf-while-render-blocked.html b/tests/wpt/tests/css/css-view-transitions/no-raf-while-render-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/no-raf-while-render-blocked.html rename to tests/wpt/tests/css/css-view-transitions/no-raf-while-render-blocked.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/no-root-capture-ref.html b/tests/wpt/tests/css/css-view-transitions/no-root-capture-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/no-root-capture-ref.html rename to tests/wpt/tests/css/css-view-transitions/no-root-capture-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/no-root-capture.html b/tests/wpt/tests/css/css-view-transitions/no-root-capture.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/no-root-capture.html rename to tests/wpt/tests/css/css-view-transitions/no-root-capture.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/nothing-captured-ref.html b/tests/wpt/tests/css/css-view-transitions/nothing-captured-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/nothing-captured-ref.html rename to tests/wpt/tests/css/css-view-transitions/nothing-captured-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/nothing-captured.html b/tests/wpt/tests/css/css-view-transitions/nothing-captured.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/nothing-captured.html rename to tests/wpt/tests/css/css-view-transitions/nothing-captured.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/object-view-box-new-image.html b/tests/wpt/tests/css/css-view-transitions/object-view-box-new-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/object-view-box-new-image.html rename to tests/wpt/tests/css/css-view-transitions/object-view-box-new-image.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/object-view-box-old-image.html b/tests/wpt/tests/css/css-view-transitions/object-view-box-old-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/object-view-box-old-image.html rename to tests/wpt/tests/css/css-view-transitions/object-view-box-old-image.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/object-view-box-ref.html b/tests/wpt/tests/css/css-view-transitions/object-view-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/object-view-box-ref.html rename to tests/wpt/tests/css/css-view-transitions/object-view-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/offscreen-element-modified-before-coming-onscreen-ref.html b/tests/wpt/tests/css/css-view-transitions/offscreen-element-modified-before-coming-onscreen-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/offscreen-element-modified-before-coming-onscreen-ref.html rename to tests/wpt/tests/css/css-view-transitions/offscreen-element-modified-before-coming-onscreen-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/offscreen-element-modified-before-coming-onscreen.html b/tests/wpt/tests/css/css-view-transitions/offscreen-element-modified-before-coming-onscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/offscreen-element-modified-before-coming-onscreen.html rename to tests/wpt/tests/css/css-view-transitions/offscreen-element-modified-before-coming-onscreen.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-clip-path-ref.html b/tests/wpt/tests/css/css-view-transitions/old-content-captures-clip-path-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-clip-path-ref.html rename to tests/wpt/tests/css/css-view-transitions/old-content-captures-clip-path-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-clip-path.html b/tests/wpt/tests/css/css-view-transitions/old-content-captures-clip-path.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-clip-path.html rename to tests/wpt/tests/css/css-view-transitions/old-content-captures-clip-path.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-different-size-ref.html b/tests/wpt/tests/css/css-view-transitions/old-content-captures-different-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-different-size-ref.html rename to tests/wpt/tests/css/css-view-transitions/old-content-captures-different-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-different-size.html b/tests/wpt/tests/css/css-view-transitions/old-content-captures-different-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-different-size.html rename to tests/wpt/tests/css/css-view-transitions/old-content-captures-different-size.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-opacity-ref.html b/tests/wpt/tests/css/css-view-transitions/old-content-captures-opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-opacity-ref.html rename to tests/wpt/tests/css/css-view-transitions/old-content-captures-opacity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-opacity.html b/tests/wpt/tests/css/css-view-transitions/old-content-captures-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-opacity.html rename to tests/wpt/tests/css/css-view-transitions/old-content-captures-opacity.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-root-ref.html b/tests/wpt/tests/css/css-view-transitions/old-content-captures-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-root-ref.html rename to tests/wpt/tests/css/css-view-transitions/old-content-captures-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-root.html b/tests/wpt/tests/css/css-view-transitions/old-content-captures-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-captures-root.html rename to tests/wpt/tests/css/css-view-transitions/old-content-captures-root.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-container-writing-modes-ref.html b/tests/wpt/tests/css/css-view-transitions/old-content-container-writing-modes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-container-writing-modes-ref.html rename to tests/wpt/tests/css/css-view-transitions/old-content-container-writing-modes-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-container-writing-modes.html b/tests/wpt/tests/css/css-view-transitions/old-content-container-writing-modes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-container-writing-modes.html rename to tests/wpt/tests/css/css-view-transitions/old-content-container-writing-modes.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-element-writing-modes-ref.html b/tests/wpt/tests/css/css-view-transitions/old-content-element-writing-modes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-element-writing-modes-ref.html rename to tests/wpt/tests/css/css-view-transitions/old-content-element-writing-modes-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-element-writing-modes.html b/tests/wpt/tests/css/css-view-transitions/old-content-element-writing-modes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-element-writing-modes.html rename to tests/wpt/tests/css/css-view-transitions/old-content-element-writing-modes.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-has-scrollbars-ref.html b/tests/wpt/tests/css/css-view-transitions/old-content-has-scrollbars-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-has-scrollbars-ref.html rename to tests/wpt/tests/css/css-view-transitions/old-content-has-scrollbars-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-has-scrollbars.html b/tests/wpt/tests/css/css-view-transitions/old-content-has-scrollbars.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-has-scrollbars.html rename to tests/wpt/tests/css/css-view-transitions/old-content-has-scrollbars.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-intrinsic-aspect-ratio.html b/tests/wpt/tests/css/css-view-transitions/old-content-intrinsic-aspect-ratio.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-intrinsic-aspect-ratio.html rename to tests/wpt/tests/css/css-view-transitions/old-content-intrinsic-aspect-ratio.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-is-empty-div-ref.html b/tests/wpt/tests/css/css-view-transitions/old-content-is-empty-div-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-is-empty-div-ref.html rename to tests/wpt/tests/css/css-view-transitions/old-content-is-empty-div-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-is-empty-div.html b/tests/wpt/tests/css/css-view-transitions/old-content-is-empty-div.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-is-empty-div.html rename to tests/wpt/tests/css/css-view-transitions/old-content-is-empty-div.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-is-inline-ref.html b/tests/wpt/tests/css/css-view-transitions/old-content-is-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-is-inline-ref.html rename to tests/wpt/tests/css/css-view-transitions/old-content-is-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-is-inline.html b/tests/wpt/tests/css/css-view-transitions/old-content-is-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-is-inline.html rename to tests/wpt/tests/css/css-view-transitions/old-content-is-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-fit-fill.html b/tests/wpt/tests/css/css-view-transitions/old-content-object-fit-fill.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-fit-fill.html rename to tests/wpt/tests/css/css-view-transitions/old-content-object-fit-fill.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-fit-none.html b/tests/wpt/tests/css/css-view-transitions/old-content-object-fit-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-fit-none.html rename to tests/wpt/tests/css/css-view-transitions/old-content-object-fit-none.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-view-box-clip-path-ref.html b/tests/wpt/tests/css/css-view-transitions/old-content-object-view-box-clip-path-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-view-box-clip-path-ref.html rename to tests/wpt/tests/css/css-view-transitions/old-content-object-view-box-clip-path-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-view-box-clip-path-reference-ref.html b/tests/wpt/tests/css/css-view-transitions/old-content-object-view-box-clip-path-reference-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-view-box-clip-path-reference-ref.html rename to tests/wpt/tests/css/css-view-transitions/old-content-object-view-box-clip-path-reference-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-view-box-clip-path-reference.html b/tests/wpt/tests/css/css-view-transitions/old-content-object-view-box-clip-path-reference.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-view-box-clip-path-reference.html rename to tests/wpt/tests/css/css-view-transitions/old-content-object-view-box-clip-path-reference.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-view-box-clip-path.html b/tests/wpt/tests/css/css-view-transitions/old-content-object-view-box-clip-path.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-view-box-clip-path.html rename to tests/wpt/tests/css/css-view-transitions/old-content-object-view-box-clip-path.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-view-box-overflow-ref.html b/tests/wpt/tests/css/css-view-transitions/old-content-object-view-box-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-view-box-overflow-ref.html rename to tests/wpt/tests/css/css-view-transitions/old-content-object-view-box-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-view-box-overflow.html b/tests/wpt/tests/css/css-view-transitions/old-content-object-view-box-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-object-view-box-overflow.html rename to tests/wpt/tests/css/css-view-transitions/old-content-object-view-box-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-with-object-view-box.html b/tests/wpt/tests/css/css-view-transitions/old-content-with-object-view-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-with-object-view-box.html rename to tests/wpt/tests/css/css-view-transitions/old-content-with-object-view-box.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-with-overflow-zoomed.html b/tests/wpt/tests/css/css-view-transitions/old-content-with-overflow-zoomed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-with-overflow-zoomed.html rename to tests/wpt/tests/css/css-view-transitions/old-content-with-overflow-zoomed.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-content-with-overflow.html b/tests/wpt/tests/css/css-view-transitions/old-content-with-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-content-with-overflow.html rename to tests/wpt/tests/css/css-view-transitions/old-content-with-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-root-vertical-writing-mode-ref.html b/tests/wpt/tests/css/css-view-transitions/old-root-vertical-writing-mode-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-root-vertical-writing-mode-ref.html rename to tests/wpt/tests/css/css-view-transitions/old-root-vertical-writing-mode-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/old-root-vertical-writing-mode.html b/tests/wpt/tests/css/css-view-transitions/old-root-vertical-writing-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/old-root-vertical-writing-mode.html rename to tests/wpt/tests/css/css-view-transitions/old-root-vertical-writing-mode.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/only-child-group.html b/tests/wpt/tests/css/css-view-transitions/only-child-group.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/only-child-group.html rename to tests/wpt/tests/css/css-view-transitions/only-child-group.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/only-child-image-pair.html b/tests/wpt/tests/css/css-view-transitions/only-child-image-pair.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/only-child-image-pair.html rename to tests/wpt/tests/css/css-view-transitions/only-child-image-pair.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/only-child-new.html b/tests/wpt/tests/css/css-view-transitions/only-child-new.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/only-child-new.html rename to tests/wpt/tests/css/css-view-transitions/only-child-new.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/only-child-no-transition.html b/tests/wpt/tests/css/css-view-transitions/only-child-no-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/only-child-no-transition.html rename to tests/wpt/tests/css/css-view-transitions/only-child-no-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/only-child-old.html b/tests/wpt/tests/css/css-view-transitions/only-child-old.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/only-child-old.html rename to tests/wpt/tests/css/css-view-transitions/only-child-old.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/only-child-on-root-element-with-view-transition.html b/tests/wpt/tests/css/css-view-transitions/only-child-on-root-element-with-view-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/only-child-on-root-element-with-view-transition.html rename to tests/wpt/tests/css/css-view-transitions/only-child-on-root-element-with-view-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/only-child-view-transition.html b/tests/wpt/tests/css/css-view-transitions/only-child-view-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/only-child-view-transition.html rename to tests/wpt/tests/css/css-view-transitions/only-child-view-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/parsing/view-transition-name-computed.html b/tests/wpt/tests/css/css-view-transitions/parsing/view-transition-name-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/parsing/view-transition-name-computed.html rename to tests/wpt/tests/css/css-view-transitions/parsing/view-transition-name-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/parsing/view-transition-name-valid.html b/tests/wpt/tests/css/css-view-transitions/parsing/view-transition-name-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/parsing/view-transition-name-valid.html rename to tests/wpt/tests/css/css-view-transitions/parsing/view-transition-name-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/paused-animation-at-end.html b/tests/wpt/tests/css/css-view-transitions/paused-animation-at-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/paused-animation-at-end.html rename to tests/wpt/tests/css/css-view-transitions/paused-animation-at-end.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/pseudo-computed-style-stays-in-sync-with-new-element.html b/tests/wpt/tests/css/css-view-transitions/pseudo-computed-style-stays-in-sync-with-new-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/pseudo-computed-style-stays-in-sync-with-new-element.html rename to tests/wpt/tests/css/css-view-transitions/pseudo-computed-style-stays-in-sync-with-new-element.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/pseudo-get-computed-style.html b/tests/wpt/tests/css/css-view-transitions/pseudo-get-computed-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/pseudo-get-computed-style.html rename to tests/wpt/tests/css/css-view-transitions/pseudo-get-computed-style.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/pseudo-rendering-invalidation-ref.html b/tests/wpt/tests/css/css-view-transitions/pseudo-rendering-invalidation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/pseudo-rendering-invalidation-ref.html rename to tests/wpt/tests/css/css-view-transitions/pseudo-rendering-invalidation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/pseudo-rendering-invalidation.html b/tests/wpt/tests/css/css-view-transitions/pseudo-rendering-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/pseudo-rendering-invalidation.html rename to tests/wpt/tests/css/css-view-transitions/pseudo-rendering-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/ready_resolves_after_dom_before_raf.html b/tests/wpt/tests/css/css-view-transitions/ready_resolves_after_dom_before_raf.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/ready_resolves_after_dom_before_raf.html rename to tests/wpt/tests/css/css-view-transitions/ready_resolves_after_dom_before_raf.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-captured-as-different-tag-ref.html b/tests/wpt/tests/css/css-view-transitions/root-captured-as-different-tag-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-captured-as-different-tag-ref.html rename to tests/wpt/tests/css/css-view-transitions/root-captured-as-different-tag-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-captured-as-different-tag.html b/tests/wpt/tests/css/css-view-transitions/root-captured-as-different-tag.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-captured-as-different-tag.html rename to tests/wpt/tests/css/css-view-transitions/root-captured-as-different-tag.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-element-cv-hidden-crash.html b/tests/wpt/tests/css/css-view-transitions/root-element-cv-hidden-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-element-cv-hidden-crash.html rename to tests/wpt/tests/css/css-view-transitions/root-element-cv-hidden-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-element-display-none-crash.html b/tests/wpt/tests/css/css-view-transitions/root-element-display-none-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-element-display-none-crash.html rename to tests/wpt/tests/css/css-view-transitions/root-element-display-none-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-element-display-none-during-transition-crash.html b/tests/wpt/tests/css/css-view-transitions/root-element-display-none-during-transition-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-element-display-none-during-transition-crash.html rename to tests/wpt/tests/css/css-view-transitions/root-element-display-none-during-transition-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-scrollbar-with-fixed-background-ref.html b/tests/wpt/tests/css/css-view-transitions/root-scrollbar-with-fixed-background-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-scrollbar-with-fixed-background-ref.html rename to tests/wpt/tests/css/css-view-transitions/root-scrollbar-with-fixed-background-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-scrollbar-with-fixed-background.html b/tests/wpt/tests/css/css-view-transitions/root-scrollbar-with-fixed-background.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-scrollbar-with-fixed-background.html rename to tests/wpt/tests/css/css-view-transitions/root-scrollbar-with-fixed-background.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-style-change-during-animation-ref.html b/tests/wpt/tests/css/css-view-transitions/root-style-change-during-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-style-change-during-animation-ref.html rename to tests/wpt/tests/css/css-view-transitions/root-style-change-during-animation-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-style-change-during-animation.html b/tests/wpt/tests/css/css-view-transitions/root-style-change-during-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-style-change-during-animation.html rename to tests/wpt/tests/css/css-view-transitions/root-style-change-during-animation.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-to-shared-animation-end-ref.html b/tests/wpt/tests/css/css-view-transitions/root-to-shared-animation-end-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-to-shared-animation-end-ref.html rename to tests/wpt/tests/css/css-view-transitions/root-to-shared-animation-end-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-to-shared-animation-end.html b/tests/wpt/tests/css/css-view-transitions/root-to-shared-animation-end.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-to-shared-animation-end.html rename to tests/wpt/tests/css/css-view-transitions/root-to-shared-animation-end.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-to-shared-animation-incoming-ref.html b/tests/wpt/tests/css/css-view-transitions/root-to-shared-animation-incoming-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-to-shared-animation-incoming-ref.html rename to tests/wpt/tests/css/css-view-transitions/root-to-shared-animation-incoming-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-to-shared-animation-incoming.html b/tests/wpt/tests/css/css-view-transitions/root-to-shared-animation-incoming.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-to-shared-animation-incoming.html rename to tests/wpt/tests/css/css-view-transitions/root-to-shared-animation-incoming.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-to-shared-animation-start-ref.html b/tests/wpt/tests/css/css-view-transitions/root-to-shared-animation-start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-to-shared-animation-start-ref.html rename to tests/wpt/tests/css/css-view-transitions/root-to-shared-animation-start-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/root-to-shared-animation-start.html b/tests/wpt/tests/css/css-view-transitions/root-to-shared-animation-start.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/root-to-shared-animation-start.html rename to tests/wpt/tests/css/css-view-transitions/root-to-shared-animation-start.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/rotated-cat-off-top-edge-ref.html b/tests/wpt/tests/css/css-view-transitions/rotated-cat-off-top-edge-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/rotated-cat-off-top-edge-ref.html rename to tests/wpt/tests/css/css-view-transitions/rotated-cat-off-top-edge-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/rotated-cat-off-top-edge.html b/tests/wpt/tests/css/css-view-transitions/rotated-cat-off-top-edge.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/rotated-cat-off-top-edge.html rename to tests/wpt/tests/css/css-view-transitions/rotated-cat-off-top-edge.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/rtl-with-scrollbar-ref.html b/tests/wpt/tests/css/css-view-transitions/rtl-with-scrollbar-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/rtl-with-scrollbar-ref.html rename to tests/wpt/tests/css/css-view-transitions/rtl-with-scrollbar-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/rtl-with-scrollbar.html b/tests/wpt/tests/css/css-view-transitions/rtl-with-scrollbar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/rtl-with-scrollbar.html rename to tests/wpt/tests/css/css-view-transitions/rtl-with-scrollbar.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/scroller-child-abspos-ref.html b/tests/wpt/tests/css/css-view-transitions/scroller-child-abspos-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/scroller-child-abspos-ref.html rename to tests/wpt/tests/css/css-view-transitions/scroller-child-abspos-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/scroller-child-abspos.html b/tests/wpt/tests/css/css-view-transitions/scroller-child-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/scroller-child-abspos.html rename to tests/wpt/tests/css/css-view-transitions/scroller-child-abspos.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/scroller-child-ref.html b/tests/wpt/tests/css/css-view-transitions/scroller-child-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/scroller-child-ref.html rename to tests/wpt/tests/css/css-view-transitions/scroller-child-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/scroller-child.html b/tests/wpt/tests/css/css-view-transitions/scroller-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/scroller-child.html rename to tests/wpt/tests/css/css-view-transitions/scroller-child.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/scroller-ref.html b/tests/wpt/tests/css/css-view-transitions/scroller-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/scroller-ref.html rename to tests/wpt/tests/css/css-view-transitions/scroller-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/scroller.html b/tests/wpt/tests/css/css-view-transitions/scroller.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/scroller.html rename to tests/wpt/tests/css/css-view-transitions/scroller.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/set-current-time-ref.html b/tests/wpt/tests/css/css-view-transitions/set-current-time-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/set-current-time-ref.html rename to tests/wpt/tests/css/css-view-transitions/set-current-time-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/set-current-time-transform-ref.html b/tests/wpt/tests/css/css-view-transitions/set-current-time-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/set-current-time-transform-ref.html rename to tests/wpt/tests/css/css-view-transitions/set-current-time-transform-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/set-current-time-transform.html b/tests/wpt/tests/css/css-view-transitions/set-current-time-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/set-current-time-transform.html rename to tests/wpt/tests/css/css-view-transitions/set-current-time-transform.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/set-current-time.html b/tests/wpt/tests/css/css-view-transitions/set-current-time.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/set-current-time.html rename to tests/wpt/tests/css/css-view-transitions/set-current-time.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/set-universal-specificity-ref.html b/tests/wpt/tests/css/css-view-transitions/set-universal-specificity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/set-universal-specificity-ref.html rename to tests/wpt/tests/css/css-view-transitions/set-universal-specificity-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/set-universal-specificity.html b/tests/wpt/tests/css/css-view-transitions/set-universal-specificity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/set-universal-specificity.html rename to tests/wpt/tests/css/css-view-transitions/set-universal-specificity.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/shared-transition-author-style.manual.html b/tests/wpt/tests/css/css-view-transitions/shared-transition-author-style.manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/shared-transition-author-style.manual.html rename to tests/wpt/tests/css/css-view-transitions/shared-transition-author-style.manual.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/shared-transition-half.manual.html b/tests/wpt/tests/css/css-view-transitions/shared-transition-half.manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/shared-transition-half.manual.html rename to tests/wpt/tests/css/css-view-transitions/shared-transition-half.manual.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/shared-transition-shapes.manual.html b/tests/wpt/tests/css/css-view-transitions/shared-transition-shapes.manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/shared-transition-shapes.manual.html rename to tests/wpt/tests/css/css-view-transitions/shared-transition-shapes.manual.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/snapshot-containing-block-absolute-ref.html b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-absolute-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/snapshot-containing-block-absolute-ref.html rename to tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-absolute-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/snapshot-containing-block-absolute.html b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-absolute.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/snapshot-containing-block-absolute.html rename to tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-absolute.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/snapshot-containing-block-static-ref.html b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-static-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/snapshot-containing-block-static-ref.html rename to tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-static-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/snapshot-containing-block-static.html b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-static.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/snapshot-containing-block-static.html rename to tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-static.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/style-inheritance.html b/tests/wpt/tests/css/css-view-transitions/style-inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/style-inheritance.html rename to tests/wpt/tests/css/css-view-transitions/style-inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/support/cat.png b/tests/wpt/tests/css/css-view-transitions/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/support/cat.png rename to tests/wpt/tests/css/css-view-transitions/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/support/dialog-in-rtl-iframe-child.html b/tests/wpt/tests/css/css-view-transitions/support/dialog-in-rtl-iframe-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/support/dialog-in-rtl-iframe-child.html rename to tests/wpt/tests/css/css-view-transitions/support/dialog-in-rtl-iframe-child.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/support/frame-helper.html b/tests/wpt/tests/css/css-view-transitions/support/frame-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/support/frame-helper.html rename to tests/wpt/tests/css/css-view-transitions/support/frame-helper.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/support/iframe-scrollbar-child.html b/tests/wpt/tests/css/css-view-transitions/support/iframe-scrollbar-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/support/iframe-scrollbar-child.html rename to tests/wpt/tests/css/css-view-transitions/support/iframe-scrollbar-child.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/support/transition-in-empty-iframe-child.html b/tests/wpt/tests/css/css-view-transitions/support/transition-in-empty-iframe-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/support/transition-in-empty-iframe-child.html rename to tests/wpt/tests/css/css-view-transitions/support/transition-in-empty-iframe-child.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/synchronous-callback-skipped-before-run.html b/tests/wpt/tests/css/css-view-transitions/synchronous-callback-skipped-before-run.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/synchronous-callback-skipped-before-run.html rename to tests/wpt/tests/css/css-view-transitions/synchronous-callback-skipped-before-run.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/transform-origin-view-transition-group-ref.html b/tests/wpt/tests/css/css-view-transitions/transform-origin-view-transition-group-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/transform-origin-view-transition-group-ref.html rename to tests/wpt/tests/css/css-view-transitions/transform-origin-view-transition-group-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/transform-origin-view-transition-group.html b/tests/wpt/tests/css/css-view-transitions/transform-origin-view-transition-group.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/transform-origin-view-transition-group.html rename to tests/wpt/tests/css/css-view-transitions/transform-origin-view-transition-group.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/transition-in-empty-iframe-ref.html b/tests/wpt/tests/css/css-view-transitions/transition-in-empty-iframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/transition-in-empty-iframe-ref.html rename to tests/wpt/tests/css/css-view-transitions/transition-in-empty-iframe-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/transition-in-empty-iframe.html b/tests/wpt/tests/css/css-view-transitions/transition-in-empty-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/transition-in-empty-iframe.html rename to tests/wpt/tests/css/css-view-transitions/transition-in-empty-iframe.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/transition-skipped-after-animation-started.html b/tests/wpt/tests/css/css-view-transitions/transition-skipped-after-animation-started.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/transition-skipped-after-animation-started.html rename to tests/wpt/tests/css/css-view-transitions/transition-skipped-after-animation-started.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/transition-skipped-from-invalid-callback.html b/tests/wpt/tests/css/css-view-transitions/transition-skipped-from-invalid-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/transition-skipped-from-invalid-callback.html rename to tests/wpt/tests/css/css-view-transitions/transition-skipped-from-invalid-callback.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/unset-and-initial-view-transition-name.html b/tests/wpt/tests/css/css-view-transitions/unset-and-initial-view-transition-name.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/unset-and-initial-view-transition-name.html rename to tests/wpt/tests/css/css-view-transitions/unset-and-initial-view-transition-name.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-is-backdrop-filter-root-ref.html b/tests/wpt/tests/css/css-view-transitions/view-transition-name-is-backdrop-filter-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-is-backdrop-filter-root-ref.html rename to tests/wpt/tests/css/css-view-transitions/view-transition-name-is-backdrop-filter-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-is-backdrop-filter-root.html b/tests/wpt/tests/css/css-view-transitions/view-transition-name-is-backdrop-filter-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-is-backdrop-filter-root.html rename to tests/wpt/tests/css/css-view-transitions/view-transition-name-is-backdrop-filter-root.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-is-grouping-ref.html b/tests/wpt/tests/css/css-view-transitions/view-transition-name-is-grouping-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-is-grouping-ref.html rename to tests/wpt/tests/css/css-view-transitions/view-transition-name-is-grouping-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-is-grouping.html b/tests/wpt/tests/css/css-view-transitions/view-transition-name-is-grouping.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-is-grouping.html rename to tests/wpt/tests/css/css-view-transitions/view-transition-name-is-grouping.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-on-document-root-ref.html b/tests/wpt/tests/css/css-view-transitions/view-transition-name-on-document-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-on-document-root-ref.html rename to tests/wpt/tests/css/css-view-transitions/view-transition-name-on-document-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-on-document-root.html b/tests/wpt/tests/css/css-view-transitions/view-transition-name-on-document-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-on-document-root.html rename to tests/wpt/tests/css/css-view-transitions/view-transition-name-on-document-root.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-on-removed-element.html b/tests/wpt/tests/css/css-view-transitions/view-transition-name-on-removed-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-on-removed-element.html rename to tests/wpt/tests/css/css-view-transitions/view-transition-name-on-removed-element.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-removed-mid-transition-ref.html b/tests/wpt/tests/css/css-view-transitions/view-transition-name-removed-mid-transition-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-removed-mid-transition-ref.html rename to tests/wpt/tests/css/css-view-transitions/view-transition-name-removed-mid-transition-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-removed-mid-transition.html b/tests/wpt/tests/css/css-view-transitions/view-transition-name-removed-mid-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/view-transition-name-removed-mid-transition.html rename to tests/wpt/tests/css/css-view-transitions/view-transition-name-removed-mid-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/web-animation-pseudo-incorrect-name.html b/tests/wpt/tests/css/css-view-transitions/web-animation-pseudo-incorrect-name.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/web-animation-pseudo-incorrect-name.html rename to tests/wpt/tests/css/css-view-transitions/web-animation-pseudo-incorrect-name.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/web-animations-api-ref.html b/tests/wpt/tests/css/css-view-transitions/web-animations-api-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/web-animations-api-ref.html rename to tests/wpt/tests/css/css-view-transitions/web-animations-api-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/web-animations-api.html b/tests/wpt/tests/css/css-view-transitions/web-animations-api.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/web-animations-api.html rename to tests/wpt/tests/css/css-view-transitions/web-animations-api.html diff --git a/tests/wpt/web-platform-tests/css/css-view-transitions/window-resize-aborts-transition.html b/tests/wpt/tests/css/css-view-transitions/window-resize-aborts-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-view-transitions/window-resize-aborts-transition.html rename to tests/wpt/tests/css/css-view-transitions/window-resize-aborts-transition.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/META.yml b/tests/wpt/tests/css/css-will-change/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/META.yml rename to tests/wpt/tests/css/css-will-change/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-will-change/green-square-100-by-100-offset-ref.html b/tests/wpt/tests/css/css-will-change/green-square-100-by-100-offset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/green-square-100-by-100-offset-ref.html rename to tests/wpt/tests/css/css-will-change/green-square-100-by-100-offset-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/green-square-100-by-100-ref.html b/tests/wpt/tests/css/css-will-change/green-square-100-by-100-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/green-square-100-by-100-ref.html rename to tests/wpt/tests/css/css-will-change/green-square-100-by-100-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/inheritance.html b/tests/wpt/tests/css/css-will-change/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/inheritance.html rename to tests/wpt/tests/css/css-will-change/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/parsing/will-change-computed.html b/tests/wpt/tests/css/css-will-change/parsing/will-change-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/parsing/will-change-computed.html rename to tests/wpt/tests/css/css-will-change/parsing/will-change-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/parsing/will-change-invalid.html b/tests/wpt/tests/css/css-will-change/parsing/will-change-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/parsing/will-change-invalid.html rename to tests/wpt/tests/css/css-will-change/parsing/will-change-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/parsing/will-change-valid.html b/tests/wpt/tests/css/css-will-change/parsing/will-change-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/parsing/will-change-valid.html rename to tests/wpt/tests/css/css-will-change/parsing/will-change-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-abspos-cb-001-ref.html b/tests/wpt/tests/css/css-will-change/will-change-abspos-cb-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-abspos-cb-001-ref.html rename to tests/wpt/tests/css/css-will-change/will-change-abspos-cb-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-abspos-cb-001.html b/tests/wpt/tests/css/css-will-change/will-change-abspos-cb-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-abspos-cb-001.html rename to tests/wpt/tests/css/css-will-change/will-change-abspos-cb-001.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-abspos-cb-002-ref.html b/tests/wpt/tests/css/css-will-change/will-change-abspos-cb-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-abspos-cb-002-ref.html rename to tests/wpt/tests/css/css-will-change/will-change-abspos-cb-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-abspos-cb-002.html b/tests/wpt/tests/css/css-will-change/will-change-abspos-cb-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-abspos-cb-002.html rename to tests/wpt/tests/css/css-will-change/will-change-abspos-cb-002.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-abspos-cb-003-ref.html b/tests/wpt/tests/css/css-will-change/will-change-abspos-cb-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-abspos-cb-003-ref.html rename to tests/wpt/tests/css/css-will-change/will-change-abspos-cb-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-abspos-cb-003.html b/tests/wpt/tests/css/css-will-change/will-change-abspos-cb-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-abspos-cb-003.html rename to tests/wpt/tests/css/css-will-change/will-change-abspos-cb-003.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-abspos-cb-dynamic-001.html b/tests/wpt/tests/css/css-will-change/will-change-abspos-cb-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-abspos-cb-dynamic-001.html rename to tests/wpt/tests/css/css-will-change/will-change-abspos-cb-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-001-ref.html b/tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-001-ref.html rename to tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-001.html b/tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-001.html rename to tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-001.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-002-ref.html b/tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-002-ref.html rename to tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-002.html b/tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-002.html rename to tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-002.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-003-ref.html b/tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-003-ref.html rename to tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-003.html b/tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-003.html rename to tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-003.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-004-ref.html b/tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-004-ref.html rename to tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-004.html b/tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-004.html rename to tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-004.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-005-ref.html b/tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-005-ref.html rename to tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-005.html b/tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-005.html rename to tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-005.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-006-ref.html b/tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-006-ref.html rename to tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-006.html b/tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixedpos-cb-006.html rename to tests/wpt/tests/css/css-will-change/will-change-fixedpos-cb-006.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-contain-1.html b/tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-contain-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-contain-1.html rename to tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-contain-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-filter-1.html b/tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-filter-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-filter-1.html rename to tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-filter-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-height-1.html b/tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-height-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-height-1.html rename to tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-height-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-offset-path-1.html b/tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-offset-path-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-offset-path-1.html rename to tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-offset-path-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-perspective-1.html b/tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-perspective-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-perspective-1.html rename to tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-perspective-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-position-1.html b/tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-position-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-position-1.html rename to tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-position-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-transform-1.html b/tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-transform-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-transform-1.html rename to tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-transform-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-transform-style-1.html b/tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-transform-style-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-transform-style-1.html rename to tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-transform-style-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-translate-1.html b/tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-translate-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-translate-1.html rename to tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-translate-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-webkit-perspective-1.html b/tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-webkit-perspective-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-fixpos-cb-webkit-perspective-1.html rename to tests/wpt/tests/css/css-will-change/will-change-fixpos-cb-webkit-perspective-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-inherit-dynamic.html b/tests/wpt/tests/css/css-will-change/will-change-inherit-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-inherit-dynamic.html rename to tests/wpt/tests/css/css-will-change/will-change-inherit-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-backdrop-filter-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-backdrop-filter-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-backdrop-filter-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-backdrop-filter-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-clip-path-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-clip-path-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-clip-path-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-clip-path-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-filter-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-filter-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-filter-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-filter-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-height-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-height-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-height-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-height-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-isolation-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-isolation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-isolation-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-isolation-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-mask-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-mask-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-mask-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-mask-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-mix-blend-mode-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-mix-blend-mode-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-mix-blend-mode-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-mix-blend-mode-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-offset-path-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-offset-path-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-offset-path-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-offset-path-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-opacity-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-opacity-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-opacity-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-opacity-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-opacity-2.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-opacity-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-opacity-2.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-opacity-2.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-perspective-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-perspective-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-perspective-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-perspective-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-position-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-position-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-position-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-position-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-transform-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-transform-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-transform-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-transform-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-transform-style-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-transform-style-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-transform-style-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-transform-style-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-translate-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-translate-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-translate-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-translate-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-z-index-1.html b/tests/wpt/tests/css/css-will-change/will-change-stacking-context-z-index-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-z-index-1.html rename to tests/wpt/tests/css/css-will-change/will-change-stacking-context-z-index-1.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-add-content-ref.html b/tests/wpt/tests/css/css-will-change/will-change-transform-add-content-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-add-content-ref.html rename to tests/wpt/tests/css/css-will-change/will-change-transform-add-content-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-add-content.html b/tests/wpt/tests/css/css-will-change/will-change-transform-add-content.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-add-content.html rename to tests/wpt/tests/css/css-will-change/will-change-transform-add-content.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-huge-offset-scrolled-ref.html b/tests/wpt/tests/css/css-will-change/will-change-transform-huge-offset-scrolled-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-huge-offset-scrolled-ref.html rename to tests/wpt/tests/css/css-will-change/will-change-transform-huge-offset-scrolled-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-huge-offset-scrolled.html b/tests/wpt/tests/css/css-will-change/will-change-transform-huge-offset-scrolled.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-huge-offset-scrolled.html rename to tests/wpt/tests/css/css-will-change/will-change-transform-huge-offset-scrolled.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-image-ref.html b/tests/wpt/tests/css/css-will-change/will-change-transform-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-image-ref.html rename to tests/wpt/tests/css/css-will-change/will-change-transform-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-image.html b/tests/wpt/tests/css/css-will-change/will-change-transform-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-image.html rename to tests/wpt/tests/css/css-will-change/will-change-transform-image.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-inline-ref.html b/tests/wpt/tests/css/css-will-change/will-change-transform-inline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-inline-ref.html rename to tests/wpt/tests/css/css-will-change/will-change-transform-inline-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-inline.html b/tests/wpt/tests/css/css-will-change/will-change-transform-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-inline.html rename to tests/wpt/tests/css/css-will-change/will-change-transform-inline.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-zero-size-child-overflow-visible-ref.html b/tests/wpt/tests/css/css-will-change/will-change-transform-zero-size-child-overflow-visible-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-zero-size-child-overflow-visible-ref.html rename to tests/wpt/tests/css/css-will-change/will-change-transform-zero-size-child-overflow-visible-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-zero-size-child-overflow-visible.html b/tests/wpt/tests/css/css-will-change/will-change-transform-zero-size-child-overflow-visible.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-transform-zero-size-child-overflow-visible.html rename to tests/wpt/tests/css/css-will-change/will-change-transform-zero-size-child-overflow-visible.html diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-will-change-1.html b/tests/wpt/tests/css/css-will-change/will-change-will-change-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-will-change/will-change-will-change-1.html rename to tests/wpt/tests/css/css-will-change/will-change-will-change-1.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/META.yml b/tests/wpt/tests/css/css-writing-modes/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/META.yml rename to tests/wpt/tests/css/css-writing-modes/META.yml diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-border-offset-001-ref.html b/tests/wpt/tests/css/css-writing-modes/abs-pos-border-offset-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-border-offset-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/abs-pos-border-offset-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-border-offset-001.html b/tests/wpt/tests/css/css-writing-modes/abs-pos-border-offset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-border-offset-001.html rename to tests/wpt/tests/css/css-writing-modes/abs-pos-border-offset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-border-offset-002-ref.html b/tests/wpt/tests/css/css-writing-modes/abs-pos-border-offset-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-border-offset-002-ref.html rename to tests/wpt/tests/css/css-writing-modes/abs-pos-border-offset-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-border-offset-002.html b/tests/wpt/tests/css/css-writing-modes/abs-pos-border-offset-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-border-offset-002.html rename to tests/wpt/tests/css/css-writing-modes/abs-pos-border-offset-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-011.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-011.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-013.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-013.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-015.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-015.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-017.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-017.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-019.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-019.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-019.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-021.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-021.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-021.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-023.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-023.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-023.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-025.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-025.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-025.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-027.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-027.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-027.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-029.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-029.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-029.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-031.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-031.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-031.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-033.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-033.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-033.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-010.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-010.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-014.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-014.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-016.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-016.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-018.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-018.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-020.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-020.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-020.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-022.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-022.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-022.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-024.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-024.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-024.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-026.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-026.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-026.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-028.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-028.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-028.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-030.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-030.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-030.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-032.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-032.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-032.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-007-ref.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-007-ref.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-009-ref.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-009-ref.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-011.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-011.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-013-ref.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-013-ref.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-013.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-013.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-015.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-015.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-017.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-017.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-019.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-019.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-019.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-021.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-021.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-021.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-023.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-023.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-023.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-025.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-025.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-025.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-027.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-027.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-027.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-029.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-029.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-029.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-031.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-031.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-031.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-033.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-033.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-033.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-035.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-035.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-035.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-037.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-037.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-037.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-039.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-039.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-039.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-041.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-041.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-041.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-043.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-043.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-043.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-045.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-045.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-045.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-047.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-047.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-047.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-049.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-049.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-049.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-051.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-051.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-051.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-053.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-053.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-053.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-055.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-055.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-055.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-057.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-057.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-057.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-059.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-059.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-059.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-061.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-061.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-061.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-063.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-063.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-063.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-065.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-065.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-065.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-067.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-067.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-067.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-067.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-069.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-069.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-069.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-069.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-071.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-071.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-071.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-071.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-073.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-073.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-073.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-073.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-075.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-075.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-075.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-075.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-077.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-077.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-077.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-077.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-079.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-079.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-079.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-079.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-081.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-081.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-081.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-081.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-083.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-083.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-083.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-083.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-085.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-085.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-085.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-085.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-087.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-087.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-087.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-087.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-089.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-089.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-089.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-089.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-091.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-091.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-091.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-091.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-093.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-093.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-093.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-093.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-095.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-095.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-095.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-095.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-097.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-097.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-097.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-097.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-103.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-103.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-103.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-103.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-105.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-105.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-105.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-105.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-107.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-107.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-107.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-107.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-109.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-109.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-109.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-109.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-111.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-111.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-111.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-111.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-113.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-113.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-113.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-113.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-115.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-115.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-115.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-115.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-117.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-117.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-117.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-117.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-119.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-119.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-119.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-119.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-121.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-121.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-121.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-121.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-123.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-123.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-123.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-123.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-125.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-125.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-125.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-125.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-127.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-127.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-127.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-127.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-129.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-129.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-129.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-129.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-131.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-131.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-131.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-131.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-133.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-133.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-133.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-133.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-135.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-135.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-135.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-135.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-137.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-137.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-137.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-137.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-139.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-139.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-139.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-139.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-141.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-141.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-141.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-141.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-143.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-143.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-143.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-143.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-145.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-145.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-145.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-145.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-147.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-147.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-147.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-147.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-149.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-149.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-149.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-149.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-151.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-151.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-151.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-151.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-153.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-153.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-153.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-153.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-155-ref.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-155-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-155-ref.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-155-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-155.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-155.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-155.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-155.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-157.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-157.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-157.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-157.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-159.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-159.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-159.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-159.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-161.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-161.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-161.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-161.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-163-ref.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-163-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-163-ref.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-163-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-163.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-163.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-163.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-163.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-165.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-165.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-165.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-165.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-167.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-167.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-167.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-167.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-169.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-169.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-169.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-169.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-171.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-171.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-171.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-171.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-173.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-173.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-173.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-173.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-175.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-175.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-175.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-175.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-177.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-177.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-177.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-177.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-179.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-179.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-179.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-179.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-181.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-181.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-181.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-181.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-183.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-183.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-183.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-183.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-185.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-185.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-185.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-185.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-187.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-187.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-187.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-187.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-189.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-189.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-189.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-189.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-191.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-191.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-191.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-191.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-193.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-193.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-193.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-193.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-195.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-195.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-195.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-195.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-197.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-197.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-197.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-197.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-199.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-199.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-199.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-199.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-201.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-201.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-201.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-201.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-203.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-203.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-203.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-203.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-205.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-205.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-205.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-205.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-207.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-207.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-207.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-207.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-209.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-209.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-209.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-209.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-211.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-211.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-211.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-211.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-213.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-213.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-213.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-213.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-215.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-215.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-215.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-215.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-217.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-217.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-217.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-217.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-219.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-219.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-219.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-219.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-221.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-221.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-221.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-221.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-223.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-223.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-223.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-223.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-225.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-225.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-225.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-225.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-227.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-227.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-227.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-227.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-229.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-229.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vlr-229.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vlr-229.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-010.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-010.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-012-ref.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-012-ref.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-014.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-014.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-016.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-016.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-018.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-018.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-020.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-020.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-020.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-022.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-022.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-022.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-024.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-024.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-024.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-026.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-026.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-026.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-028.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-028.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-028.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-030.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-030.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-030.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-032.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-032.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-032.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-034.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-034.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-034.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-036.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-036.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-036.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-038.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-038.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-038.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-040.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-040.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-040.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-042.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-042.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-042.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-044.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-044.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-044.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-044.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-046.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-046.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-046.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-048.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-048.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-048.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-050.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-050.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-050.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-052.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-052.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-052.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-054.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-054.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-054.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-056.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-056.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-056.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-058.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-058.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-058.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-060.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-060.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-060.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-062.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-062.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-062.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-064.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-064.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-064.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-066.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-066.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-066.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-068.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-068.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-068.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-068.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-070.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-070.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-070.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-070.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-072.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-072.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-072.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-072.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-074.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-074.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-074.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-074.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-076.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-076.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-076.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-076.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-078.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-078.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-078.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-078.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-080.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-080.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-080.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-080.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-082.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-082.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-082.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-082.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-084.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-084.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-084.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-084.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-086.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-086.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-086.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-086.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-088.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-088.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-088.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-088.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-090.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-090.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-090.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-090.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-092.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-092.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-092.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-092.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-094.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-094.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-094.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-094.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-096.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-096.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-096.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-096.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-102.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-102.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-102.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-102.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-104.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-104.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-104.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-104.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-106.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-106.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-106.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-106.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-108.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-108.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-108.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-108.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-110.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-110.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-110.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-110.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-112.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-112.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-112.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-112.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-114.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-114.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-114.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-114.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-116.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-116.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-116.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-116.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-118.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-118.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-118.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-118.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-120.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-120.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-120.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-120.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-122-ref.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-122-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-122-ref.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-122-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-122.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-122.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-122.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-122.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-124.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-124.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-124.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-124.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-126.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-126.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-126.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-126.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-128.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-128.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-128.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-128.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-130-ref.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-130-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-130-ref.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-130-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-130.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-130.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-130.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-130.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-132.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-132.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-132.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-132.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-134.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-134.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-134.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-134.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-136.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-136.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-136.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-136.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-138.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-138.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-138.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-138.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-140.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-140.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-140.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-140.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-142.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-142.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-142.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-142.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-144.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-144.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-144.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-144.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-146.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-146.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-146.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-146.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-148.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-148.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-148.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-148.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-150.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-150.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-150.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-150.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-152.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-152.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-152.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-152.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-154.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-154.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-154.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-154.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-156.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-156.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-156.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-156.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-158.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-158.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-158.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-158.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-160.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-160.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-160.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-160.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-162.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-162.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-162.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-162.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-164.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-164.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-164.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-164.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-166.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-166.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-166.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-166.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-168.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-168.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-168.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-168.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-170.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-170.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-170.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-170.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-172.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-172.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-172.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-172.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-174.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-174.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-174.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-174.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-176.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-176.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-176.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-176.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-178.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-178.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-178.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-178.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-180.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-180.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-180.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-180.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-182.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-182.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-182.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-182.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-184.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-184.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-184.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-184.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-186.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-186.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-186.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-186.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-188.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-188.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-188.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-188.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-190.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-190.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-190.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-190.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-192.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-192.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-192.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-192.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-194.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-194.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-194.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-194.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-196.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-196.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-196.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-196.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-198.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-198.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-198.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-198.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-200.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-200.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-200.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-200.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-202.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-202.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-202.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-202.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-204.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-204.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-204.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-204.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-206.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-206.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-206.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-206.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-208.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-208.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-208.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-208.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-210.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-210.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-210.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-210.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-212.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-212.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-212.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-212.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-214.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-214.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-214.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-214.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-216.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-216.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-216.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-216.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-218.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-218.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-218.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-218.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-220.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-220.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-220.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-220.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-222.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-222.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-222.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-222.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-224.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-224.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-224.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-224.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-226.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-226.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-226.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-226.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-228.xht b/tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-228.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-non-replaced-vrl-228.xht rename to tests/wpt/tests/css/css-writing-modes/abs-pos-non-replaced-vrl-228.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-replaced-vrl-001-ref.html b/tests/wpt/tests/css/css-writing-modes/abs-pos-replaced-vrl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-replaced-vrl-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/abs-pos-replaced-vrl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-replaced-vrl-001.html b/tests/wpt/tests/css/css-writing-modes/abs-pos-replaced-vrl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-replaced-vrl-001.html rename to tests/wpt/tests/css/css-writing-modes/abs-pos-replaced-vrl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-vlr-border-001-ref.html b/tests/wpt/tests/css/css-writing-modes/abs-pos-vlr-border-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-vlr-border-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/abs-pos-vlr-border-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-vlr-border-001.html b/tests/wpt/tests/css/css-writing-modes/abs-pos-vlr-border-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-vlr-border-001.html rename to tests/wpt/tests/css/css-writing-modes/abs-pos-vlr-border-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-vlr-padding-001-ref.html b/tests/wpt/tests/css/css-writing-modes/abs-pos-vlr-padding-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-vlr-padding-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/abs-pos-vlr-padding-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-vlr-padding-001.html b/tests/wpt/tests/css/css-writing-modes/abs-pos-vlr-padding-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-vlr-padding-001.html rename to tests/wpt/tests/css/css-writing-modes/abs-pos-vlr-padding-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-with-replaced-child.html b/tests/wpt/tests/css/css-writing-modes/abs-pos-with-replaced-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/abs-pos-with-replaced-child.html rename to tests/wpt/tests/css/css-writing-modes/abs-pos-with-replaced-child.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/alt-display-vertical-001-manual.html b/tests/wpt/tests/css/css-writing-modes/alt-display-vertical-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/alt-display-vertical-001-manual.html rename to tests/wpt/tests/css/css-writing-modes/alt-display-vertical-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/adlam-anti-ref.html b/tests/wpt/tests/css/css-writing-modes/astral-bidi/adlam-anti-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/adlam-anti-ref.html rename to tests/wpt/tests/css/css-writing-modes/astral-bidi/adlam-anti-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/adlam-ref.html b/tests/wpt/tests/css/css-writing-modes/astral-bidi/adlam-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/adlam-ref.html rename to tests/wpt/tests/css/css-writing-modes/astral-bidi/adlam-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/adlam.html b/tests/wpt/tests/css/css-writing-modes/astral-bidi/adlam.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/adlam.html rename to tests/wpt/tests/css/css-writing-modes/astral-bidi/adlam.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/cypriot-anti-ref.html b/tests/wpt/tests/css/css-writing-modes/astral-bidi/cypriot-anti-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/cypriot-anti-ref.html rename to tests/wpt/tests/css/css-writing-modes/astral-bidi/cypriot-anti-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/cypriot-ref.html b/tests/wpt/tests/css/css-writing-modes/astral-bidi/cypriot-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/cypriot-ref.html rename to tests/wpt/tests/css/css-writing-modes/astral-bidi/cypriot-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/cypriot.html b/tests/wpt/tests/css/css-writing-modes/astral-bidi/cypriot.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/cypriot.html rename to tests/wpt/tests/css/css-writing-modes/astral-bidi/cypriot.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/support/adlam.css b/tests/wpt/tests/css/css-writing-modes/astral-bidi/support/adlam.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/support/adlam.css rename to tests/wpt/tests/css/css-writing-modes/astral-bidi/support/adlam.css diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/support/cypriot.css b/tests/wpt/tests/css/css-writing-modes/astral-bidi/support/cypriot.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/astral-bidi/support/cypriot.css rename to tests/wpt/tests/css/css-writing-modes/astral-bidi/support/cypriot.css diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-001.html b/tests/wpt/tests/css/css-writing-modes/available-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-001.html rename to tests/wpt/tests/css/css-writing-modes/available-size-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-002.html b/tests/wpt/tests/css/css-writing-modes/available-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-002.html rename to tests/wpt/tests/css/css-writing-modes/available-size-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-003.html b/tests/wpt/tests/css/css-writing-modes/available-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-003.html rename to tests/wpt/tests/css/css-writing-modes/available-size-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-004.html b/tests/wpt/tests/css/css-writing-modes/available-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-004.html rename to tests/wpt/tests/css/css-writing-modes/available-size-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-005.html b/tests/wpt/tests/css/css-writing-modes/available-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-005.html rename to tests/wpt/tests/css/css-writing-modes/available-size-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-006.html b/tests/wpt/tests/css/css-writing-modes/available-size-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-006.html rename to tests/wpt/tests/css/css-writing-modes/available-size-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-007.html b/tests/wpt/tests/css/css-writing-modes/available-size-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-007.html rename to tests/wpt/tests/css/css-writing-modes/available-size-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-008.html b/tests/wpt/tests/css/css-writing-modes/available-size-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-008.html rename to tests/wpt/tests/css/css-writing-modes/available-size-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-009.html b/tests/wpt/tests/css/css-writing-modes/available-size-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-009.html rename to tests/wpt/tests/css/css-writing-modes/available-size-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-010.html b/tests/wpt/tests/css/css-writing-modes/available-size-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-010.html rename to tests/wpt/tests/css/css-writing-modes/available-size-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-011.html b/tests/wpt/tests/css/css-writing-modes/available-size-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-011.html rename to tests/wpt/tests/css/css-writing-modes/available-size-011.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-012.html b/tests/wpt/tests/css/css-writing-modes/available-size-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-012.html rename to tests/wpt/tests/css/css-writing-modes/available-size-012.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-013.html b/tests/wpt/tests/css/css-writing-modes/available-size-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-013.html rename to tests/wpt/tests/css/css-writing-modes/available-size-013.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-014.html b/tests/wpt/tests/css/css-writing-modes/available-size-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-014.html rename to tests/wpt/tests/css/css-writing-modes/available-size-014.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-015.html b/tests/wpt/tests/css/css-writing-modes/available-size-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-015.html rename to tests/wpt/tests/css/css-writing-modes/available-size-015.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-016.html b/tests/wpt/tests/css/css-writing-modes/available-size-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-016.html rename to tests/wpt/tests/css/css-writing-modes/available-size-016.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-017.html b/tests/wpt/tests/css/css-writing-modes/available-size-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-017.html rename to tests/wpt/tests/css/css-writing-modes/available-size-017.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-018.html b/tests/wpt/tests/css/css-writing-modes/available-size-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-018.html rename to tests/wpt/tests/css/css-writing-modes/available-size-018.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-019.html b/tests/wpt/tests/css/css-writing-modes/available-size-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/available-size-019.html rename to tests/wpt/tests/css/css-writing-modes/available-size-019.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-011.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vlr-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-011.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vlr-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-013.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vlr-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-013.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vlr-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-015.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vlr-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-015.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vlr-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-017.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vlr-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vlr-017.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vlr-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-010.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vrl-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-010.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vrl-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-014.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vrl-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-014.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vrl-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-016.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vrl-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-016.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vrl-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-018-ref.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vrl-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-018-ref.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vrl-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-018.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vrl-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-018.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vrl-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-020.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vrl-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-020.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vrl-020.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-022.xht b/tests/wpt/tests/css/css-writing-modes/background-position-vrl-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-position-vrl-022.xht rename to tests/wpt/tests/css/css-writing-modes/background-position-vrl-022.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-size-document-root-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/background-size-document-root-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-size-document-root-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/background-size-document-root-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-size-document-root-vrl-002.html b/tests/wpt/tests/css/css-writing-modes/background-size-document-root-vrl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-size-document-root-vrl-002.html rename to tests/wpt/tests/css/css-writing-modes/background-size-document-root-vrl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-size-document-root-vrl-004.html b/tests/wpt/tests/css/css-writing-modes/background-size-document-root-vrl-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-size-document-root-vrl-004.html rename to tests/wpt/tests/css/css-writing-modes/background-size-document-root-vrl-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-size-document-root-vrl-006.html b/tests/wpt/tests/css/css-writing-modes/background-size-document-root-vrl-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-size-document-root-vrl-006.html rename to tests/wpt/tests/css/css-writing-modes/background-size-document-root-vrl-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/background-size-document-root-vrl-008.html b/tests/wpt/tests/css/css-writing-modes/background-size-document-root-vrl-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/background-size-document-root-vrl-008.html rename to tests/wpt/tests/css/css-writing-modes/background-size-document-root-vrl-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/baseline-inline-non-replaced-002.xht b/tests/wpt/tests/css/css-writing-modes/baseline-inline-non-replaced-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/baseline-inline-non-replaced-002.xht rename to tests/wpt/tests/css/css-writing-modes/baseline-inline-non-replaced-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/baseline-inline-non-replaced-003.xht b/tests/wpt/tests/css/css-writing-modes/baseline-inline-non-replaced-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/baseline-inline-non-replaced-003.xht rename to tests/wpt/tests/css/css-writing-modes/baseline-inline-non-replaced-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/baseline-inline-non-replaced-004.xht b/tests/wpt/tests/css/css-writing-modes/baseline-inline-non-replaced-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/baseline-inline-non-replaced-004.xht rename to tests/wpt/tests/css/css-writing-modes/baseline-inline-non-replaced-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/baseline-inline-non-replaced-005.xht b/tests/wpt/tests/css/css-writing-modes/baseline-inline-non-replaced-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/baseline-inline-non-replaced-005.xht rename to tests/wpt/tests/css/css-writing-modes/baseline-inline-non-replaced-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/baseline-inline-replaced-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/baseline-inline-replaced-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/baseline-inline-replaced-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/baseline-inline-replaced-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/baseline-inline-replaced-002.xht b/tests/wpt/tests/css/css-writing-modes/baseline-inline-replaced-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/baseline-inline-replaced-002.xht rename to tests/wpt/tests/css/css-writing-modes/baseline-inline-replaced-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/baseline-inline-replaced-003.xht b/tests/wpt/tests/css/css-writing-modes/baseline-inline-replaced-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/baseline-inline-replaced-003.xht rename to tests/wpt/tests/css/css-writing-modes/baseline-inline-replaced-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/baseline-with-orthogonal-flow-001.html b/tests/wpt/tests/css/css-writing-modes/baseline-with-orthogonal-flow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/baseline-with-orthogonal-flow-001.html rename to tests/wpt/tests/css/css-writing-modes/baseline-with-orthogonal-flow-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-dynamic-iframe-001-ref.html b/tests/wpt/tests/css/css-writing-modes/bidi-dynamic-iframe-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-dynamic-iframe-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/bidi-dynamic-iframe-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-dynamic-iframe-001.html b/tests/wpt/tests/css/css-writing-modes/bidi-dynamic-iframe-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-dynamic-iframe-001.html rename to tests/wpt/tests/css/css-writing-modes/bidi-dynamic-iframe-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-001.html b/tests/wpt/tests/css/css-writing-modes/bidi-embed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-001.html rename to tests/wpt/tests/css/css-writing-modes/bidi-embed-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-002.html b/tests/wpt/tests/css/css-writing-modes/bidi-embed-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-002.html rename to tests/wpt/tests/css/css-writing-modes/bidi-embed-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-003.html b/tests/wpt/tests/css/css-writing-modes/bidi-embed-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-003.html rename to tests/wpt/tests/css/css-writing-modes/bidi-embed-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-004.html b/tests/wpt/tests/css/css-writing-modes/bidi-embed-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-004.html rename to tests/wpt/tests/css/css-writing-modes/bidi-embed-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-005.html b/tests/wpt/tests/css/css-writing-modes/bidi-embed-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-005.html rename to tests/wpt/tests/css/css-writing-modes/bidi-embed-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-006.html b/tests/wpt/tests/css/css-writing-modes/bidi-embed-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-006.html rename to tests/wpt/tests/css/css-writing-modes/bidi-embed-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-007.html b/tests/wpt/tests/css/css-writing-modes/bidi-embed-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-007.html rename to tests/wpt/tests/css/css-writing-modes/bidi-embed-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-008.html b/tests/wpt/tests/css/css-writing-modes/bidi-embed-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-008.html rename to tests/wpt/tests/css/css-writing-modes/bidi-embed-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-009.html b/tests/wpt/tests/css/css-writing-modes/bidi-embed-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-009.html rename to tests/wpt/tests/css/css-writing-modes/bidi-embed-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-010.html b/tests/wpt/tests/css/css-writing-modes/bidi-embed-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-010.html rename to tests/wpt/tests/css/css-writing-modes/bidi-embed-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-011.html b/tests/wpt/tests/css/css-writing-modes/bidi-embed-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-embed-011.html rename to tests/wpt/tests/css/css-writing-modes/bidi-embed-011.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-inline-fragment-crash.html b/tests/wpt/tests/css/css-writing-modes/bidi-inline-fragment-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-inline-fragment-crash.html rename to tests/wpt/tests/css/css-writing-modes/bidi-inline-fragment-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-001.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-001.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-002.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-002.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-003.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-003.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-004.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-004.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-005.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-005.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-006.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-006.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-007.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-007.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-008.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-008.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-009.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-009.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-010.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-010.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-011.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-011.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-011.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-001.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-001.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-002.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-002.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-003.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-003.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-004.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-004.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-005.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-005.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-006.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-006.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-007.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-007.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-008.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-008.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-009.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-009.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-010.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-010.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-011.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-011.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-011.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-012.html b/tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-isolate-override-012.html rename to tests/wpt/tests/css/css-writing-modes/bidi-isolate-override-012.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-line-break-001.html b/tests/wpt/tests/css/css-writing-modes/bidi-line-break-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-line-break-001.html rename to tests/wpt/tests/css/css-writing-modes/bidi-line-break-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-001.html b/tests/wpt/tests/css/css-writing-modes/bidi-normal-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-001.html rename to tests/wpt/tests/css/css-writing-modes/bidi-normal-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-002.html b/tests/wpt/tests/css/css-writing-modes/bidi-normal-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-002.html rename to tests/wpt/tests/css/css-writing-modes/bidi-normal-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-003.html b/tests/wpt/tests/css/css-writing-modes/bidi-normal-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-003.html rename to tests/wpt/tests/css/css-writing-modes/bidi-normal-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-004.html b/tests/wpt/tests/css/css-writing-modes/bidi-normal-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-004.html rename to tests/wpt/tests/css/css-writing-modes/bidi-normal-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-005.html b/tests/wpt/tests/css/css-writing-modes/bidi-normal-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-005.html rename to tests/wpt/tests/css/css-writing-modes/bidi-normal-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-006.html b/tests/wpt/tests/css/css-writing-modes/bidi-normal-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-006.html rename to tests/wpt/tests/css/css-writing-modes/bidi-normal-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-007.html b/tests/wpt/tests/css/css-writing-modes/bidi-normal-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-007.html rename to tests/wpt/tests/css/css-writing-modes/bidi-normal-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-008.html b/tests/wpt/tests/css/css-writing-modes/bidi-normal-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-008.html rename to tests/wpt/tests/css/css-writing-modes/bidi-normal-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-009.html b/tests/wpt/tests/css/css-writing-modes/bidi-normal-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-009.html rename to tests/wpt/tests/css/css-writing-modes/bidi-normal-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-010.html b/tests/wpt/tests/css/css-writing-modes/bidi-normal-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-010.html rename to tests/wpt/tests/css/css-writing-modes/bidi-normal-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-011.html b/tests/wpt/tests/css/css-writing-modes/bidi-normal-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-normal-011.html rename to tests/wpt/tests/css/css-writing-modes/bidi-normal-011.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-001.html b/tests/wpt/tests/css/css-writing-modes/bidi-override-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-001.html rename to tests/wpt/tests/css/css-writing-modes/bidi-override-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-002.html b/tests/wpt/tests/css/css-writing-modes/bidi-override-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-002.html rename to tests/wpt/tests/css/css-writing-modes/bidi-override-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-003.html b/tests/wpt/tests/css/css-writing-modes/bidi-override-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-003.html rename to tests/wpt/tests/css/css-writing-modes/bidi-override-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-004.html b/tests/wpt/tests/css/css-writing-modes/bidi-override-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-004.html rename to tests/wpt/tests/css/css-writing-modes/bidi-override-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-005.html b/tests/wpt/tests/css/css-writing-modes/bidi-override-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-005.html rename to tests/wpt/tests/css/css-writing-modes/bidi-override-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-006.html b/tests/wpt/tests/css/css-writing-modes/bidi-override-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-006.html rename to tests/wpt/tests/css/css-writing-modes/bidi-override-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-007.html b/tests/wpt/tests/css/css-writing-modes/bidi-override-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-007.html rename to tests/wpt/tests/css/css-writing-modes/bidi-override-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-008.html b/tests/wpt/tests/css/css-writing-modes/bidi-override-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-008.html rename to tests/wpt/tests/css/css-writing-modes/bidi-override-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-009.html b/tests/wpt/tests/css/css-writing-modes/bidi-override-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-009.html rename to tests/wpt/tests/css/css-writing-modes/bidi-override-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-010.html b/tests/wpt/tests/css/css-writing-modes/bidi-override-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-010.html rename to tests/wpt/tests/css/css-writing-modes/bidi-override-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-011.html b/tests/wpt/tests/css/css-writing-modes/bidi-override-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-011.html rename to tests/wpt/tests/css/css-writing-modes/bidi-override-011.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-012.html b/tests/wpt/tests/css/css-writing-modes/bidi-override-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-override-012.html rename to tests/wpt/tests/css/css-writing-modes/bidi-override-012.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-001.html b/tests/wpt/tests/css/css-writing-modes/bidi-plaintext-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-001.html rename to tests/wpt/tests/css/css-writing-modes/bidi-plaintext-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-002.html b/tests/wpt/tests/css/css-writing-modes/bidi-plaintext-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-002.html rename to tests/wpt/tests/css/css-writing-modes/bidi-plaintext-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-003.html b/tests/wpt/tests/css/css-writing-modes/bidi-plaintext-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-003.html rename to tests/wpt/tests/css/css-writing-modes/bidi-plaintext-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-004.html b/tests/wpt/tests/css/css-writing-modes/bidi-plaintext-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-004.html rename to tests/wpt/tests/css/css-writing-modes/bidi-plaintext-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-005.html b/tests/wpt/tests/css/css-writing-modes/bidi-plaintext-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-005.html rename to tests/wpt/tests/css/css-writing-modes/bidi-plaintext-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-006.html b/tests/wpt/tests/css/css-writing-modes/bidi-plaintext-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-006.html rename to tests/wpt/tests/css/css-writing-modes/bidi-plaintext-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-007.html b/tests/wpt/tests/css/css-writing-modes/bidi-plaintext-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-007.html rename to tests/wpt/tests/css/css-writing-modes/bidi-plaintext-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-008.html b/tests/wpt/tests/css/css-writing-modes/bidi-plaintext-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-008.html rename to tests/wpt/tests/css/css-writing-modes/bidi-plaintext-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-009.html b/tests/wpt/tests/css/css-writing-modes/bidi-plaintext-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-009.html rename to tests/wpt/tests/css/css-writing-modes/bidi-plaintext-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-010.html b/tests/wpt/tests/css/css-writing-modes/bidi-plaintext-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-010.html rename to tests/wpt/tests/css/css-writing-modes/bidi-plaintext-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-011.html b/tests/wpt/tests/css/css-writing-modes/bidi-plaintext-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-011.html rename to tests/wpt/tests/css/css-writing-modes/bidi-plaintext-011.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-br-001.html b/tests/wpt/tests/css/css-writing-modes/bidi-plaintext-br-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-plaintext-br-001.html rename to tests/wpt/tests/css/css-writing-modes/bidi-plaintext-br-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-table-001.html b/tests/wpt/tests/css/css-writing-modes/bidi-table-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-table-001.html rename to tests/wpt/tests/css/css-writing-modes/bidi-table-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-001.html b/tests/wpt/tests/css/css-writing-modes/bidi-unset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-001.html rename to tests/wpt/tests/css/css-writing-modes/bidi-unset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-002.html b/tests/wpt/tests/css/css-writing-modes/bidi-unset-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-002.html rename to tests/wpt/tests/css/css-writing-modes/bidi-unset-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-003.html b/tests/wpt/tests/css/css-writing-modes/bidi-unset-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-003.html rename to tests/wpt/tests/css/css-writing-modes/bidi-unset-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-004.html b/tests/wpt/tests/css/css-writing-modes/bidi-unset-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-004.html rename to tests/wpt/tests/css/css-writing-modes/bidi-unset-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-005.html b/tests/wpt/tests/css/css-writing-modes/bidi-unset-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-005.html rename to tests/wpt/tests/css/css-writing-modes/bidi-unset-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-006.html b/tests/wpt/tests/css/css-writing-modes/bidi-unset-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-006.html rename to tests/wpt/tests/css/css-writing-modes/bidi-unset-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-007.html b/tests/wpt/tests/css/css-writing-modes/bidi-unset-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-007.html rename to tests/wpt/tests/css/css-writing-modes/bidi-unset-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-008.html b/tests/wpt/tests/css/css-writing-modes/bidi-unset-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-008.html rename to tests/wpt/tests/css/css-writing-modes/bidi-unset-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-009.html b/tests/wpt/tests/css/css-writing-modes/bidi-unset-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-009.html rename to tests/wpt/tests/css/css-writing-modes/bidi-unset-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-010.html b/tests/wpt/tests/css/css-writing-modes/bidi-unset-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/bidi-unset-010.html rename to tests/wpt/tests/css/css-writing-modes/bidi-unset-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-embed-001.html b/tests/wpt/tests/css/css-writing-modes/block-embed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-embed-001.html rename to tests/wpt/tests/css/css-writing-modes/block-embed-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-embed-002.html b/tests/wpt/tests/css/css-writing-modes/block-embed-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-embed-002.html rename to tests/wpt/tests/css/css-writing-modes/block-embed-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-embed-003.html b/tests/wpt/tests/css/css-writing-modes/block-embed-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-embed-003.html rename to tests/wpt/tests/css/css-writing-modes/block-embed-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-001-ref.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-001-ref.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-004.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-004.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-025-ref.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-025-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-025-ref.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-025-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-043-ref.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-043-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-043-ref.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-043-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-066-ref.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-066-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-066-ref.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-066-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-htb-001.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-htb-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-htb-001.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-htb-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-043.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-043.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-043.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-047.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-047.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-047.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-048.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-048.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-048.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-050.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-050.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-050.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-054.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-054.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-054.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-055.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-055.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-055.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-056.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-056.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-056.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-058.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-058.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-058.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-060.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-060.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-060.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-062.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-062.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-062.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-062.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-063.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-063.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-063.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-063.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-066.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-066.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-066.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-slr-066.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-042.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-042.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-042.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-045.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-045.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-045.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-046.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-046.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-046.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-049.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-049.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-049.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-051.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-051.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-051.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-052.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-052.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-052.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-053.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-053.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-053.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-057.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-057.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-057.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-059.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-059.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-059.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-061.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-061.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-061.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-061.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-064.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-064.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-064.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-064.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-065.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-065.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-065.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-srl-065.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-008.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-008.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-010.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-010.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-014.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-014.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-015.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-015.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-016.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-016.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-018.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-018.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-020.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-020.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-020.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-022.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-022.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-022.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-023.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vlr-023.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vlr-023.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-005.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-005.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-009.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-009.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-011.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-011.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-013.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-013.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-017.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-017.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-019.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-019.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-019.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-021.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-021.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-021.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-024.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-024.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-024.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-025.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-025.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-025.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-026-ref.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-026-ref.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-026.xht b/tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-vrl-026.xht rename to tests/wpt/tests/css/css-writing-modes/block-flow-direction-vrl-026.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-override-001.html b/tests/wpt/tests/css/css-writing-modes/block-override-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-override-001.html rename to tests/wpt/tests/css/css-writing-modes/block-override-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-override-002.html b/tests/wpt/tests/css/css-writing-modes/block-override-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-override-002.html rename to tests/wpt/tests/css/css-writing-modes/block-override-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-override-003.html b/tests/wpt/tests/css/css-writing-modes/block-override-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-override-003.html rename to tests/wpt/tests/css/css-writing-modes/block-override-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-override-004.html b/tests/wpt/tests/css/css-writing-modes/block-override-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-override-004.html rename to tests/wpt/tests/css/css-writing-modes/block-override-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-override-isolate-001.html b/tests/wpt/tests/css/css-writing-modes/block-override-isolate-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-override-isolate-001.html rename to tests/wpt/tests/css/css-writing-modes/block-override-isolate-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-override-isolate-002.html b/tests/wpt/tests/css/css-writing-modes/block-override-isolate-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-override-isolate-002.html rename to tests/wpt/tests/css/css-writing-modes/block-override-isolate-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-override-isolate-003.html b/tests/wpt/tests/css/css-writing-modes/block-override-isolate-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-override-isolate-003.html rename to tests/wpt/tests/css/css-writing-modes/block-override-isolate-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-override-isolate-004.html b/tests/wpt/tests/css/css-writing-modes/block-override-isolate-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-override-isolate-004.html rename to tests/wpt/tests/css/css-writing-modes/block-override-isolate-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-plaintext-001.html b/tests/wpt/tests/css/css-writing-modes/block-plaintext-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-plaintext-001.html rename to tests/wpt/tests/css/css-writing-modes/block-plaintext-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-plaintext-002.html b/tests/wpt/tests/css/css-writing-modes/block-plaintext-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-plaintext-002.html rename to tests/wpt/tests/css/css-writing-modes/block-plaintext-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-plaintext-003.html b/tests/wpt/tests/css/css-writing-modes/block-plaintext-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-plaintext-003.html rename to tests/wpt/tests/css/css-writing-modes/block-plaintext-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-plaintext-004.html b/tests/wpt/tests/css/css-writing-modes/block-plaintext-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-plaintext-004.html rename to tests/wpt/tests/css/css-writing-modes/block-plaintext-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-plaintext-005.html b/tests/wpt/tests/css/css-writing-modes/block-plaintext-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-plaintext-005.html rename to tests/wpt/tests/css/css-writing-modes/block-plaintext-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-plaintext-006.html b/tests/wpt/tests/css/css-writing-modes/block-plaintext-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/block-plaintext-006.html rename to tests/wpt/tests/css/css-writing-modes/block-plaintext-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/border-conflict-element-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/border-conflict-element-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/border-conflict-element-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/border-conflict-element-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/border-conflict-element-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/border-conflict-element-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/border-conflict-element-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/border-conflict-element-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vlr-011.xht b/tests/wpt/tests/css/css-writing-modes/border-conflict-element-vlr-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vlr-011.xht rename to tests/wpt/tests/css/css-writing-modes/border-conflict-element-vlr-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vlr-013.xht b/tests/wpt/tests/css/css-writing-modes/border-conflict-element-vlr-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vlr-013.xht rename to tests/wpt/tests/css/css-writing-modes/border-conflict-element-vlr-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/border-conflict-element-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/border-conflict-element-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/border-conflict-element-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/border-conflict-element-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/border-conflict-element-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/border-conflict-element-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/border-conflict-element-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/border-conflict-element-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vrl-010.xht b/tests/wpt/tests/css/css-writing-modes/border-conflict-element-vrl-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vrl-010.xht rename to tests/wpt/tests/css/css-writing-modes/border-conflict-element-vrl-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/border-conflict-element-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-conflict-element-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/border-conflict-element-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-spacing-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/border-spacing-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-spacing-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/border-spacing-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-spacing-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/border-spacing-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-spacing-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/border-spacing-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-spacing-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/border-spacing-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-spacing-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/border-spacing-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-spacing-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/border-spacing-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-spacing-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/border-spacing-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-spacing-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/border-spacing-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-spacing-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/border-spacing-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/border-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/border-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/border-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/border-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/border-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/border-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/box-offsets-rel-pos-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/box-offsets-rel-pos-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/box-offsets-rel-pos-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/box-offsets-rel-pos-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/box-offsets-rel-pos-vlr-005-ref.xht b/tests/wpt/tests/css/css-writing-modes/box-offsets-rel-pos-vlr-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/box-offsets-rel-pos-vlr-005-ref.xht rename to tests/wpt/tests/css/css-writing-modes/box-offsets-rel-pos-vlr-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/box-offsets-rel-pos-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/box-offsets-rel-pos-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/box-offsets-rel-pos-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/box-offsets-rel-pos-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/box-offsets-rel-pos-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/box-offsets-rel-pos-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/box-offsets-rel-pos-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/box-offsets-rel-pos-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/box-offsets-rel-pos-vrl-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/box-offsets-rel-pos-vrl-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/box-offsets-rel-pos-vrl-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/box-offsets-rel-pos-vrl-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/box-offsets-rel-pos-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/box-offsets-rel-pos-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/box-offsets-rel-pos-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/box-offsets-rel-pos-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/caption-side-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/caption-side-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/caption-side-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/caption-side-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/caption-side-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/caption-side-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/caption-side-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/caption-side-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/caption-side-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/caption-side-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/caption-side-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/caption-side-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/caption-side-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/caption-side-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/caption-side-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/caption-side-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/central-baseline-alignment-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/central-baseline-alignment-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/central-baseline-alignment-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/central-baseline-alignment-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/central-baseline-alignment-002.xht b/tests/wpt/tests/css/css-writing-modes/central-baseline-alignment-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/central-baseline-alignment-002.xht rename to tests/wpt/tests/css/css-writing-modes/central-baseline-alignment-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/central-baseline-alignment-003.xht b/tests/wpt/tests/css/css-writing-modes/central-baseline-alignment-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/central-baseline-alignment-003.xht rename to tests/wpt/tests/css/css-writing-modes/central-baseline-alignment-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-001.html b/tests/wpt/tests/css/css-writing-modes/ch-units-vrl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-001.html rename to tests/wpt/tests/css/css-writing-modes/ch-units-vrl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-002.html b/tests/wpt/tests/css/css-writing-modes/ch-units-vrl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-002.html rename to tests/wpt/tests/css/css-writing-modes/ch-units-vrl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-003.html b/tests/wpt/tests/css/css-writing-modes/ch-units-vrl-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-003.html rename to tests/wpt/tests/css/css-writing-modes/ch-units-vrl-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-004.html b/tests/wpt/tests/css/css-writing-modes/ch-units-vrl-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-004.html rename to tests/wpt/tests/css/css-writing-modes/ch-units-vrl-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-005.html b/tests/wpt/tests/css/css-writing-modes/ch-units-vrl-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-005.html rename to tests/wpt/tests/css/css-writing-modes/ch-units-vrl-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-006.html b/tests/wpt/tests/css/css-writing-modes/ch-units-vrl-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-006.html rename to tests/wpt/tests/css/css-writing-modes/ch-units-vrl-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-007.html b/tests/wpt/tests/css/css-writing-modes/ch-units-vrl-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-007.html rename to tests/wpt/tests/css/css-writing-modes/ch-units-vrl-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-008.html b/tests/wpt/tests/css/css-writing-modes/ch-units-vrl-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ch-units-vrl-008.html rename to tests/wpt/tests/css/css-writing-modes/ch-units-vrl-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clearance-calculations-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/clearance-calculations-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-011-ref.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-011-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-011.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-011.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-013-ref.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-013-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-013.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-013.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-015-ref.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-015-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-015.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-015.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-017-ref.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-017-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-017-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-017-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-017.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vlr-017.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vlr-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-010-ref.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-010-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-010.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-010.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-012-ref.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-012-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-014-ref.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-014-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-014.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-014.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-016-ref.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-016-ref.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-016.xht b/tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/clip-rect-vrl-016.xht rename to tests/wpt/tests/css/css-writing-modes/clip-rect-vrl-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/contiguous-floated-table-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/contiguous-floated-table-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/crashtests/orthogonal-percent-height-multicol-crash.html b/tests/wpt/tests/css/css-writing-modes/crashtests/orthogonal-percent-height-multicol-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/crashtests/orthogonal-percent-height-multicol-crash.html rename to tests/wpt/tests/css/css-writing-modes/crashtests/orthogonal-percent-height-multicol-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/crashtests/orthogonal-scroll-percent-height-crash.html b/tests/wpt/tests/css/css-writing-modes/crashtests/orthogonal-scroll-percent-height-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/crashtests/orthogonal-scroll-percent-height-crash.html rename to tests/wpt/tests/css/css-writing-modes/crashtests/orthogonal-scroll-percent-height-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/crashtests/orthogonal-table-in-flex-crash.html b/tests/wpt/tests/css/css-writing-modes/crashtests/orthogonal-table-in-flex-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/crashtests/orthogonal-table-in-flex-crash.html rename to tests/wpt/tests/css/css-writing-modes/crashtests/orthogonal-table-in-flex-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/crashtests/table-root-direction-propagation-crash.html b/tests/wpt/tests/css/css-writing-modes/crashtests/table-root-direction-propagation-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/crashtests/table-root-direction-propagation-crash.html rename to tests/wpt/tests/css/css-writing-modes/crashtests/table-root-direction-propagation-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/crashtests/unicode-bidi-select-crash.html b/tests/wpt/tests/css/css-writing-modes/crashtests/unicode-bidi-select-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/crashtests/unicode-bidi-select-crash.html rename to tests/wpt/tests/css/css-writing-modes/crashtests/unicode-bidi-select-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/crashtests/wm-body-propagation-crash.html b/tests/wpt/tests/css/css-writing-modes/crashtests/wm-body-propagation-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/crashtests/wm-body-propagation-crash.html rename to tests/wpt/tests/css/css-writing-modes/crashtests/wm-body-propagation-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/different-block-flow-dir-001.xht b/tests/wpt/tests/css/css-writing-modes/different-block-flow-dir-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/different-block-flow-dir-001.xht rename to tests/wpt/tests/css/css-writing-modes/different-block-flow-dir-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/different-block-flow-dir-002.xht b/tests/wpt/tests/css/css-writing-modes/different-block-flow-dir-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/different-block-flow-dir-002.xht rename to tests/wpt/tests/css/css-writing-modes/different-block-flow-dir-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/direction-propagation-body-contain-root-ref.html b/tests/wpt/tests/css/css-writing-modes/direction-propagation-body-contain-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/direction-propagation-body-contain-root-ref.html rename to tests/wpt/tests/css/css-writing-modes/direction-propagation-body-contain-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/direction-propagation-body-contain-root.html b/tests/wpt/tests/css/css-writing-modes/direction-propagation-body-contain-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/direction-propagation-body-contain-root.html rename to tests/wpt/tests/css/css-writing-modes/direction-propagation-body-contain-root.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/direction-upright-001.html b/tests/wpt/tests/css/css-writing-modes/direction-upright-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/direction-upright-001.html rename to tests/wpt/tests/css/css-writing-modes/direction-upright-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/direction-upright-002.html b/tests/wpt/tests/css/css-writing-modes/direction-upright-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/direction-upright-002.html rename to tests/wpt/tests/css/css-writing-modes/direction-upright-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/direction-vlr-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/direction-vlr-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/direction-vlr-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/direction-vlr-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/direction-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/direction-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/direction-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/direction-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/direction-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/direction-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/direction-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/direction-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/direction-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/direction-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/direction-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/direction-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/direction-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/direction-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/direction-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/direction-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/direction-vrl-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/direction-vrl-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/direction-vrl-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/direction-vrl-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/direction-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/direction-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/direction-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/direction-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/dynamic-offset-rtl-001-ref.html b/tests/wpt/tests/css/css-writing-modes/dynamic-offset-rtl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/dynamic-offset-rtl-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/dynamic-offset-rtl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/dynamic-offset-rtl-001.html b/tests/wpt/tests/css/css-writing-modes/dynamic-offset-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/dynamic-offset-rtl-001.html rename to tests/wpt/tests/css/css-writing-modes/dynamic-offset-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/dynamic-offset-rtl-002.html b/tests/wpt/tests/css/css-writing-modes/dynamic-offset-rtl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/dynamic-offset-rtl-002.html rename to tests/wpt/tests/css/css-writing-modes/dynamic-offset-rtl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/dynamic-offset-vrl-001.html b/tests/wpt/tests/css/css-writing-modes/dynamic-offset-vrl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/dynamic-offset-vrl-001.html rename to tests/wpt/tests/css/css-writing-modes/dynamic-offset-vrl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/dynamic-offset-vrl-002.html b/tests/wpt/tests/css/css-writing-modes/dynamic-offset-vrl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/dynamic-offset-vrl-002.html rename to tests/wpt/tests/css/css-writing-modes/dynamic-offset-vrl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/dynamic-offset-vrl-rtl-001.html b/tests/wpt/tests/css/css-writing-modes/dynamic-offset-vrl-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/dynamic-offset-vrl-rtl-001.html rename to tests/wpt/tests/css/css-writing-modes/dynamic-offset-vrl-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/dynamic-offset-vrl-rtl-002.html b/tests/wpt/tests/css/css-writing-modes/dynamic-offset-vrl-rtl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/dynamic-offset-vrl-rtl-002.html rename to tests/wpt/tests/css/css-writing-modes/dynamic-offset-vrl-rtl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/first-page-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/first-page-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/first-page-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/first-page-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/first-page-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/first-page-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/first-page-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/first-page-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/flexbox_align-items-stretch-writing-modes-ref.html b/tests/wpt/tests/css/css-writing-modes/flexbox_align-items-stretch-writing-modes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/flexbox_align-items-stretch-writing-modes-ref.html rename to tests/wpt/tests/css/css-writing-modes/flexbox_align-items-stretch-writing-modes-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/flexbox_align-items-stretch-writing-modes.html b/tests/wpt/tests/css/css-writing-modes/flexbox_align-items-stretch-writing-modes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/flexbox_align-items-stretch-writing-modes.html rename to tests/wpt/tests/css/css-writing-modes/flexbox_align-items-stretch-writing-modes.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/float-clear-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/float-clear-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/float-clear-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/float-clear-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/float-clear-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/float-clear-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/float-clear-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/float-clear-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/float-clear-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/float-clear-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/float-clear-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/float-clear-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/float-clear-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/float-clear-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/float-clear-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-clear-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/float-clear-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-007-ref.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-007-ref.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-009-ref.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-009-ref.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-011.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-011.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-013.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vlr-013.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vlr-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-010.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-010.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-012-ref.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-012-ref.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-contiguous-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/float-contiguous-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-in-htb-in-vrl.html b/tests/wpt/tests/css/css-writing-modes/float-in-htb-in-vrl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-in-htb-in-vrl.html rename to tests/wpt/tests/css/css-writing-modes/float-in-htb-in-vrl.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-htb-in-vlr-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/float-lft-orthog-htb-in-vlr-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-htb-in-vlr-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/float-lft-orthog-htb-in-vlr-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-htb-in-vlr-002.xht b/tests/wpt/tests/css/css-writing-modes/float-lft-orthog-htb-in-vlr-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-htb-in-vlr-002.xht rename to tests/wpt/tests/css/css-writing-modes/float-lft-orthog-htb-in-vlr-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-htb-in-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/float-lft-orthog-htb-in-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-htb-in-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/float-lft-orthog-htb-in-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-htb-in-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/float-lft-orthog-htb-in-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-htb-in-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/float-lft-orthog-htb-in-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-vlr-in-htb-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/float-lft-orthog-vlr-in-htb-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-vlr-in-htb-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/float-lft-orthog-vlr-in-htb-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-vlr-in-htb-002.xht b/tests/wpt/tests/css/css-writing-modes/float-lft-orthog-vlr-in-htb-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-vlr-in-htb-002.xht rename to tests/wpt/tests/css/css-writing-modes/float-lft-orthog-vlr-in-htb-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-vrl-in-htb-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/float-lft-orthog-vrl-in-htb-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-vrl-in-htb-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/float-lft-orthog-vrl-in-htb-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-vrl-in-htb-002.xht b/tests/wpt/tests/css/css-writing-modes/float-lft-orthog-vrl-in-htb-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-lft-orthog-vrl-in-htb-002.xht rename to tests/wpt/tests/css/css-writing-modes/float-lft-orthog-vrl-in-htb-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-htb-in-vlr-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-htb-in-vlr-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-htb-in-vlr-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-htb-in-vlr-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-htb-in-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-htb-in-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-htb-in-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-htb-in-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-htb-in-vrl-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-htb-in-vrl-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-htb-in-vrl-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-htb-in-vrl-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-htb-in-vrl-003.xht b/tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-htb-in-vrl-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-htb-in-vrl-003.xht rename to tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-htb-in-vrl-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-vlr-in-htb-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-vlr-in-htb-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-vlr-in-htb-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-vlr-in-htb-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-vlr-in-htb-003.xht b/tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-vlr-in-htb-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-vlr-in-htb-003.xht rename to tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-vlr-in-htb-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-vrl-in-htb-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-vrl-in-htb-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-vrl-in-htb-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-vrl-in-htb-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-vrl-in-htb-003.xht b/tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-vrl-in-htb-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-rgt-orthog-vrl-in-htb-003.xht rename to tests/wpt/tests/css/css-writing-modes/float-rgt-orthog-vrl-in-htb-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vrl-vlr-016.xht b/tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vrl-vlr-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-shrink-to-fit-vrl-vlr-016.xht rename to tests/wpt/tests/css/css-writing-modes/float-shrink-to-fit-vrl-vlr-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/float-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/float-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/float-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/float-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/float-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/float-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/float-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/float-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-vlr-011.xht b/tests/wpt/tests/css/css-writing-modes/float-vlr-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-vlr-011.xht rename to tests/wpt/tests/css/css-writing-modes/float-vlr-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-vlr-013.xht b/tests/wpt/tests/css/css-writing-modes/float-vlr-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-vlr-013.xht rename to tests/wpt/tests/css/css-writing-modes/float-vlr-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/float-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/float-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/float-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/float-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/float-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/float-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/float-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/float-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-vrl-010.xht b/tests/wpt/tests/css/css-writing-modes/float-vrl-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-vrl-010.xht rename to tests/wpt/tests/css/css-writing-modes/float-vrl-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/float-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/float-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/float-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/float-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/button-appearance-native-horizontal.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/button-appearance-native-horizontal.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/button-appearance-native-horizontal.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/button-appearance-native-horizontal.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/button-appearance-native-vertical.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/button-appearance-native-vertical.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/button-appearance-native-vertical.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/button-appearance-native-vertical.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/button-appearance-none-horizontal.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/button-appearance-none-horizontal.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/button-appearance-none-horizontal.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/button-appearance-none-horizontal.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/button-appearance-none-vertical.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/button-appearance-none-vertical.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/button-appearance-none-vertical.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/button-appearance-none-vertical.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/color-input-appearance-native-horizontal.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/color-input-appearance-native-horizontal.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/color-input-appearance-native-horizontal.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/color-input-appearance-native-horizontal.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/color-input-appearance-native-vertical.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/color-input-appearance-native-vertical.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/color-input-appearance-native-vertical.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/color-input-appearance-native-vertical.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/color-input-appearance-none-horizontal.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/color-input-appearance-none-horizontal.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/color-input-appearance-none-horizontal.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/color-input-appearance-none-horizontal.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/color-input-appearance-none-vertical.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/color-input-appearance-none-vertical.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/color-input-appearance-none-vertical.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/color-input-appearance-none-vertical.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-slr-007-manual.xht b/tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-slr-007-manual.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-slr-007-manual.xht rename to tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-slr-007-manual.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-slr-008-manual.xht b/tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-slr-008-manual.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-slr-008-manual.xht rename to tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-slr-008-manual.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-srl-007-manual.xht b/tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-srl-007-manual.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-srl-007-manual.xht rename to tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-srl-007-manual.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-srl-008-manual.xht b/tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-srl-008-manual.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-srl-008-manual.xht rename to tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-srl-008-manual.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-001-manual.html b/tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-001-manual.html rename to tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-002-manual.html b/tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-002-manual.html rename to tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-003-manual.html b/tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-003-manual.html rename to tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-004-manual.html b/tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-004-manual.html rename to tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-005-manual.html b/tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-005-manual.html rename to tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-005-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-006-manual.html b/tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-006-manual.html rename to tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-006-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-007-manual.xht b/tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-007-manual.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-007-manual.xht rename to tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-007-manual.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-008-manual.xht b/tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-008-manual.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vlr-008-manual.xht rename to tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vlr-008-manual.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vrl-007-manual.xht b/tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vrl-007-manual.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vrl-007-manual.xht rename to tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vrl-007-manual.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vrl-008-manual.xht b/tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vrl-008-manual.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/form-controls-vrl-008-manual.xht rename to tests/wpt/tests/css/css-writing-modes/forms/manual/form-controls-vrl-008-manual.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/support/form-controls-slr.png b/tests/wpt/tests/css/css-writing-modes/forms/manual/support/form-controls-slr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/support/form-controls-slr.png rename to tests/wpt/tests/css/css-writing-modes/forms/manual/support/form-controls-slr.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/support/form-controls-srl.png b/tests/wpt/tests/css/css-writing-modes/forms/manual/support/form-controls-srl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/support/form-controls-srl.png rename to tests/wpt/tests/css/css-writing-modes/forms/manual/support/form-controls-srl.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/support/form-controls-vlr.png b/tests/wpt/tests/css/css-writing-modes/forms/manual/support/form-controls-vlr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/support/form-controls-vlr.png rename to tests/wpt/tests/css/css-writing-modes/forms/manual/support/form-controls-vlr.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/support/vertical-form.png b/tests/wpt/tests/css/css-writing-modes/forms/manual/support/vertical-form.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/manual/support/vertical-form.png rename to tests/wpt/tests/css/css-writing-modes/forms/manual/support/vertical-form.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/meter-appearance-native-computed-style.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/meter-appearance-native-computed-style.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/meter-appearance-native-computed-style.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/meter-appearance-native-computed-style.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/meter-appearance-native-horizontal.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/meter-appearance-native-horizontal.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/meter-appearance-native-horizontal.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/meter-appearance-native-horizontal.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/meter-appearance-native-vertical.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/meter-appearance-native-vertical.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/meter-appearance-native-vertical.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/meter-appearance-native-vertical.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/number-input-vertical-overflow-ref.html b/tests/wpt/tests/css/css-writing-modes/forms/number-input-vertical-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/number-input-vertical-overflow-ref.html rename to tests/wpt/tests/css/css-writing-modes/forms/number-input-vertical-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/number-input-vertical-overflow.html b/tests/wpt/tests/css/css-writing-modes/forms/number-input-vertical-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/number-input-vertical-overflow.html rename to tests/wpt/tests/css/css-writing-modes/forms/number-input-vertical-overflow.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/progress-appearance-native-computed-style.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/progress-appearance-native-computed-style.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/progress-appearance-native-computed-style.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/progress-appearance-native-computed-style.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/progress-appearance-native-horizontal.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/progress-appearance-native-horizontal.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/progress-appearance-native-horizontal.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/progress-appearance-native-horizontal.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/progress-appearance-native-vertical.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/progress-appearance-native-vertical.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/progress-appearance-native-vertical.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/progress-appearance-native-vertical.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/progress-appearance-none-horizontal.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/progress-appearance-none-horizontal.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/progress-appearance-none-horizontal.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/progress-appearance-none-horizontal.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/progress-appearance-none-vertical.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/progress-appearance-none-vertical.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/progress-appearance-none-vertical.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/progress-appearance-none-vertical.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-native-horizontal-rtl.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-native-horizontal-rtl.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-native-horizontal-rtl.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-native-horizontal-rtl.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-native-horizontal.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-native-horizontal.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-native-horizontal.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-native-horizontal.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-native-vertical-rtl.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-native-vertical-rtl.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-native-vertical-rtl.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-native-vertical-rtl.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-native-vertical.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-native-vertical.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-native-vertical.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-native-vertical.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-none-horizontal-rtl.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-none-horizontal-rtl.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-none-horizontal-rtl.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-none-horizontal-rtl.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-none-horizontal.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-none-horizontal.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-none-horizontal.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-none-horizontal.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-none-vertical-rtl.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-none-vertical-rtl.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-none-vertical-rtl.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-none-vertical-rtl.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-none-vertical.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-none-vertical.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-appearance-none-vertical.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/range-input-appearance-none-vertical.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-painting-ref.html b/tests/wpt/tests/css/css-writing-modes/forms/range-input-painting-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-painting-ref.html rename to tests/wpt/tests/css/css-writing-modes/forms/range-input-painting-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-vertical-ltr-painting.html b/tests/wpt/tests/css/css-writing-modes/forms/range-input-vertical-ltr-painting.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-vertical-ltr-painting.html rename to tests/wpt/tests/css/css-writing-modes/forms/range-input-vertical-ltr-painting.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-vertical-rtl-painting.html b/tests/wpt/tests/css/css-writing-modes/forms/range-input-vertical-rtl-painting.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/range-input-vertical-rtl-painting.html rename to tests/wpt/tests/css/css-writing-modes/forms/range-input-vertical-rtl-painting.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-multiple-appearance-native-horizontal.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/select-multiple-appearance-native-horizontal.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-multiple-appearance-native-horizontal.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/select-multiple-appearance-native-horizontal.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-multiple-appearance-native-vlr.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/select-multiple-appearance-native-vlr.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-multiple-appearance-native-vlr.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/select-multiple-appearance-native-vlr.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-multiple-appearance-native-vrl.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/select-multiple-appearance-native-vrl.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-multiple-appearance-native-vrl.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/select-multiple-appearance-native-vrl.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-multiple-appearance-none-horizontal.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/select-multiple-appearance-none-horizontal.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-multiple-appearance-none-horizontal.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/select-multiple-appearance-none-horizontal.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-multiple-appearance-none-vlr.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/select-multiple-appearance-none-vlr.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-multiple-appearance-none-vlr.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/select-multiple-appearance-none-vlr.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-multiple-appearance-none-vrl.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/select-multiple-appearance-none-vrl.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-multiple-appearance-none-vrl.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/select-multiple-appearance-none-vrl.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-multiple-scrolling.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/select-multiple-scrolling.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-multiple-scrolling.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/select-multiple-scrolling.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-size-scrolling-and-sizing.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/select-size-scrolling-and-sizing.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/select-size-scrolling-and-sizing.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/select-size-scrolling-and-sizing.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/text-input-block-size.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/text-input-block-size.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/text-input-block-size.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/text-input-block-size.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/text-input-vertical-overflow-no-scroll.html b/tests/wpt/tests/css/css-writing-modes/forms/text-input-vertical-overflow-no-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/text-input-vertical-overflow-no-scroll.html rename to tests/wpt/tests/css/css-writing-modes/forms/text-input-vertical-overflow-no-scroll.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/textarea-appearance-native-horizontal.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/textarea-appearance-native-horizontal.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/textarea-appearance-native-horizontal.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/textarea-appearance-native-horizontal.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/textarea-appearance-native-vlr.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/textarea-appearance-native-vlr.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/textarea-appearance-native-vlr.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/textarea-appearance-native-vlr.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/textarea-appearance-native-vrl.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/textarea-appearance-native-vrl.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/textarea-appearance-native-vrl.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/textarea-appearance-native-vrl.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/textarea-appearance-none-horizontal.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/textarea-appearance-none-horizontal.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/textarea-appearance-none-horizontal.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/textarea-appearance-none-horizontal.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/textarea-appearance-none-vlr.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/textarea-appearance-none-vlr.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/textarea-appearance-none-vlr.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/textarea-appearance-none-vlr.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/textarea-appearance-none-vrl.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/textarea-appearance-none-vrl.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/textarea-appearance-none-vrl.optional.html rename to tests/wpt/tests/css/css-writing-modes/forms/textarea-appearance-none-vrl.optional.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/forms/textarea-rows-cols-sizing.html b/tests/wpt/tests/css/css-writing-modes/forms/textarea-rows-cols-sizing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/forms/textarea-rows-cols-sizing.html rename to tests/wpt/tests/css/css-writing-modes/forms/textarea-rows-cols-sizing.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/full-width-001.html b/tests/wpt/tests/css/css-writing-modes/full-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/full-width-001.html rename to tests/wpt/tests/css/css-writing-modes/full-width-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/full-width-002.html b/tests/wpt/tests/css/css-writing-modes/full-width-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/full-width-002.html rename to tests/wpt/tests/css/css-writing-modes/full-width-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/full-width-003.html b/tests/wpt/tests/css/css-writing-modes/full-width-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/full-width-003.html rename to tests/wpt/tests/css/css-writing-modes/full-width-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/height-width-inline-non-replaced-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/height-width-inline-non-replaced-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/height-width-inline-non-replaced-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/height-width-inline-non-replaced-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/height-width-inline-non-replaced-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/height-width-inline-non-replaced-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/height-width-inline-non-replaced-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/height-width-inline-non-replaced-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/horizontal-rule-vlr-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/horizontal-rule-vlr-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/horizontal-rule-vlr-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/horizontal-rule-vlr-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/horizontal-rule-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/horizontal-rule-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/horizontal-rule-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/horizontal-rule-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/horizontal-rule-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/horizontal-rule-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/horizontal-rule-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/horizontal-rule-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/horizontal-rule-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/horizontal-rule-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/horizontal-rule-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/horizontal-rule-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/horizontal-rule-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/horizontal-rule-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/horizontal-rule-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/horizontal-rule-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/horizontal-rule-vrl-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/horizontal-rule-vrl-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/horizontal-rule-vrl-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/horizontal-rule-vrl-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/horizontal-rule-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/horizontal-rule-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/horizontal-rule-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/horizontal-rule-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/img-intrinsic-size-contribution-001.html b/tests/wpt/tests/css/css-writing-modes/img-intrinsic-size-contribution-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/img-intrinsic-size-contribution-001.html rename to tests/wpt/tests/css/css-writing-modes/img-intrinsic-size-contribution-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/img-intrinsic-size-contribution-002.html b/tests/wpt/tests/css/css-writing-modes/img-intrinsic-size-contribution-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/img-intrinsic-size-contribution-002.html rename to tests/wpt/tests/css/css-writing-modes/img-intrinsic-size-contribution-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/img-intrinsic-size-contribution-ref.html b/tests/wpt/tests/css/css-writing-modes/img-intrinsic-size-contribution-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/img-intrinsic-size-contribution-ref.html rename to tests/wpt/tests/css/css-writing-modes/img-intrinsic-size-contribution-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inheritance.html b/tests/wpt/tests/css/css-writing-modes/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inheritance.html rename to tests/wpt/tests/css/css-writing-modes/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-002.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-002.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-003.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-003.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-004.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-004.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-005.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-005.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-006.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-006.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-007-ref.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-007-ref.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-007.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-007.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-slr-009-ref.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-slr-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-slr-009-ref.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-slr-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-slr-009.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-slr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-slr-009.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-slr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-srl-008.xht b/tests/wpt/tests/css/css-writing-modes/inline-block-alignment-srl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-srl-008.xht rename to tests/wpt/tests/css/css-writing-modes/inline-block-alignment-srl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-box-border-vlr-001.html b/tests/wpt/tests/css/css-writing-modes/inline-box-border-vlr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-box-border-vlr-001.html rename to tests/wpt/tests/css/css-writing-modes/inline-box-border-vlr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins-ref.html b/tests/wpt/tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins-ref.html rename to tests/wpt/tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins.html b/tests/wpt/tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins.html rename to tests/wpt/tests/css/css-writing-modes/inline-box-orthogonal-child-with-margins.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-replaced-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/inline-replaced-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-replaced-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/inline-replaced-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-replaced-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/inline-replaced-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-replaced-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/inline-replaced-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-replaced-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/inline-replaced-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-replaced-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/inline-replaced-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-replaced-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/inline-replaced-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-replaced-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/inline-replaced-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-replaced-vrl-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/inline-replaced-vrl-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-replaced-vrl-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/inline-replaced-vrl-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-replaced-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/inline-replaced-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-replaced-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/inline-replaced-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-table-alignment-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/inline-table-alignment-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-table-alignment-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/inline-table-alignment-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-table-alignment-002.xht b/tests/wpt/tests/css/css-writing-modes/inline-table-alignment-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-table-alignment-002.xht rename to tests/wpt/tests/css/css-writing-modes/inline-table-alignment-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-table-alignment-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/inline-table-alignment-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-table-alignment-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/inline-table-alignment-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-table-alignment-003.xht b/tests/wpt/tests/css/css-writing-modes/inline-table-alignment-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-table-alignment-003.xht rename to tests/wpt/tests/css/css-writing-modes/inline-table-alignment-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-table-alignment-004.xht b/tests/wpt/tests/css/css-writing-modes/inline-table-alignment-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-table-alignment-004.xht rename to tests/wpt/tests/css/css-writing-modes/inline-table-alignment-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-table-alignment-005.xht b/tests/wpt/tests/css/css-writing-modes/inline-table-alignment-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/inline-table-alignment-005.xht rename to tests/wpt/tests/css/css-writing-modes/inline-table-alignment-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-htb-001.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-htb-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-htb-001.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-htb-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-043.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-043.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-043.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-043.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-047.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-047.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-047.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-047.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-048.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-048.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-048.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-048.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-050.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-050.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-050.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-050.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-053.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-053.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-053.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-053.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-054.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-054.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-054.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-054.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-056.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-056.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-056.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-056.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-058.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-058.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-058.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-058.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-060.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-060.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-060.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-slr-060.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-042.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-042.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-042.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-042.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-045.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-045.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-045.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-045.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-046.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-046.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-046.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-046.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-049.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-049.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-049.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-049.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-051.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-051.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-051.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-051.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-052.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-052.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-052.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-052.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-055.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-055.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-055.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-055.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-057.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-057.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-057.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-057.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-059.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-059.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-059.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-srl-059.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-008.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-008.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-010.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-010.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-013.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-013.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-014.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-014.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-016.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-016.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-018.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-018.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-020.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vlr-020.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vlr-020.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-005.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-005.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-009.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-009.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-011.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-011.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-015.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-015.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-017.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-017.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-019.xht b/tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-vrl-019.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-direction-vrl-019.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-007-ref.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-007-ref.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-011-ref.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-011-ref.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-011.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-011.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-013.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-013.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-021-ref.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-021-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-021-ref.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-021-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-021.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-021.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-021.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-023-ref.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-023-ref.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-023.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vlr-023.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vlr-023.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-010-ref.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-010-ref.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-010.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-010.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/line-box-height-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/line-box-height-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/link-writing-mode-dependency-crash.html b/tests/wpt/tests/css/css-writing-modes/link-writing-mode-dependency-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/link-writing-mode-dependency-crash.html rename to tests/wpt/tests/css/css-writing-modes/link-writing-mode-dependency-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/logical-physical-mapping-001-ref.html b/tests/wpt/tests/css/css-writing-modes/logical-physical-mapping-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/logical-physical-mapping-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/logical-physical-mapping-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/logical-physical-mapping-001.html b/tests/wpt/tests/css/css-writing-modes/logical-physical-mapping-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/logical-physical-mapping-001.html rename to tests/wpt/tests/css/css-writing-modes/logical-physical-mapping-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/logical-props-001.html b/tests/wpt/tests/css/css-writing-modes/logical-props-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/logical-props-001.html rename to tests/wpt/tests/css/css-writing-modes/logical-props-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/logical-props-002.html b/tests/wpt/tests/css/css-writing-modes/logical-props-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/logical-props-002.html rename to tests/wpt/tests/css/css-writing-modes/logical-props-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/logical-props-003.html b/tests/wpt/tests/css/css-writing-modes/logical-props-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/logical-props-003.html rename to tests/wpt/tests/css/css-writing-modes/logical-props-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/logical-props-004.html b/tests/wpt/tests/css/css-writing-modes/logical-props-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/logical-props-004.html rename to tests/wpt/tests/css/css-writing-modes/logical-props-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-011.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-011.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-015.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-015.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-017.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-017.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-023.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-023.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-023.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-025.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-025.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-025.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-031.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-031.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-031.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-035.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-035.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-035.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-037.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vlr-037.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vlr-037.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-010.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-010.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-014.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-014.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-016.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-016.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-022.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-022.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-022.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-024.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-024.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-024.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-030.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-030.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-030.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-034.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-034.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-034.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-036.xht b/tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-collapse-vrl-036.xht rename to tests/wpt/tests/css/css-writing-modes/margin-collapse-vrl-036.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/margin-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/margin-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/margin-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/margin-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/margin-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/margin-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/margin-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/margin-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/mongolian-orientation-001.html b/tests/wpt/tests/css/css-writing-modes/mongolian-orientation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/mongolian-orientation-001.html rename to tests/wpt/tests/css/css-writing-modes/mongolian-orientation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/mongolian-orientation-002.html b/tests/wpt/tests/css/css-writing-modes/mongolian-orientation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/mongolian-orientation-002.html rename to tests/wpt/tests/css/css-writing-modes/mongolian-orientation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/mongolian-span-001.html b/tests/wpt/tests/css/css-writing-modes/mongolian-span-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/mongolian-span-001.html rename to tests/wpt/tests/css/css-writing-modes/mongolian-span-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/nested-orthogonal-001.html b/tests/wpt/tests/css/css-writing-modes/nested-orthogonal-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/nested-orthogonal-001.html rename to tests/wpt/tests/css/css-writing-modes/nested-orthogonal-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/normal-flow-overconstrained-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/normal-flow-overconstrained-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/normal-flow-overconstrained-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/normal-flow-overconstrained-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/normal-flow-overconstrained-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/normal-flow-overconstrained-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/normal-flow-overconstrained-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/normal-flow-overconstrained-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/normal-flow-overconstrained-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/normal-flow-overconstrained-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/normal-flow-overconstrained-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/normal-flow-overconstrained-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/normal-flow-overconstrained-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/normal-flow-overconstrained-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/normal-flow-overconstrained-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/normal-flow-overconstrained-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-002.xht b/tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-002.xht rename to tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006.xht b/tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006.xht rename to tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-010-ref.xht b/tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-010-ref.xht rename to tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-010.xht b/tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-010.xht rename to tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-014-ref.xht b/tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-014-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-014-ref.xht rename to tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-014-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-014.xht b/tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-014.xht rename to tests/wpt/tests/css/css-writing-modes/ortho-htb-alongside-vrl-floats-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001a.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001a.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001b.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001b.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001b.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001c.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001c.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001c.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001c.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001d.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001d.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001d.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001e.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001e.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001e.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001e.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001f.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001f.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001f.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001f.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001g.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001g.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001g.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001g.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001h.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001h.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001h.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001h.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001i.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001i.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001i.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001i.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001j.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001j.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001j.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001j.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001k.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001k.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001k.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001k.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001l.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001l.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001l.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001l.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001m.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001m.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001m.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001m.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001n.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001n.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001n.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001n.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001o.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001o.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001o.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001o.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001p.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001p.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001p.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001p.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001q.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001q.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001q.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001q.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001r.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001r.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001r.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001r.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001s.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001s.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001s.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001s.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001t.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001t.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001t.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001t.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001u.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001u.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001u.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001u.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001v.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001v.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001v.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001v.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001w.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001w.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001w.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001w.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001x.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001x.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001x.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-parent-shrink-to-fit-001x.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-root-resize-icb-001.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-root-resize-icb-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-root-resize-icb-001.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-root-resize-icb-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-root-resize-icb-002.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-root-resize-icb-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-root-resize-icb-002.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-root-resize-icb-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-root-resize-icb-003.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-root-resize-icb-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-root-resize-icb-003.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-root-resize-icb-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-root-resize-icb-004.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-root-resize-icb-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-root-resize-icb-004.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-root-resize-icb-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-root-resize-icb-005.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-root-resize-icb-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-root-resize-icb-005.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-root-resize-icb-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-root-resize-icb-006.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-root-resize-icb-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-root-resize-icb-006.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-root-resize-icb-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-root-resize-icb-007.html b/tests/wpt/tests/css/css-writing-modes/orthogonal-root-resize-icb-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/orthogonal-root-resize-icb-007.html rename to tests/wpt/tests/css/css-writing-modes/orthogonal-root-resize-icb-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-block-vrl-006.html b/tests/wpt/tests/css/css-writing-modes/outline-inline-block-vrl-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-block-vrl-006.html rename to tests/wpt/tests/css/css-writing-modes/outline-inline-block-vrl-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-slr-005.xht b/tests/wpt/tests/css/css-writing-modes/outline-inline-slr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-slr-005.xht rename to tests/wpt/tests/css/css-writing-modes/outline-inline-slr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-srl-004.xht b/tests/wpt/tests/css/css-writing-modes/outline-inline-srl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-srl-004.xht rename to tests/wpt/tests/css/css-writing-modes/outline-inline-srl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/outline-inline-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/outline-inline-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-vlr-006.html b/tests/wpt/tests/css/css-writing-modes/outline-inline-vlr-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-vlr-006.html rename to tests/wpt/tests/css/css-writing-modes/outline-inline-vlr-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-vlr-013.xht b/tests/wpt/tests/css/css-writing-modes/outline-inline-vlr-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-vlr-013.xht rename to tests/wpt/tests/css/css-writing-modes/outline-inline-vlr-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/outline-inline-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/outline-inline-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-vrl-006.html b/tests/wpt/tests/css/css-writing-modes/outline-inline-vrl-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-vrl-006.html rename to tests/wpt/tests/css/css-writing-modes/outline-inline-vrl-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/outline-inline-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/outline-inline-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vlr-005-ref.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vlr-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vlr-005-ref.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vlr-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vrl-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vrl-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vrl-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vrl-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-left-right-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vlr-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vlr-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vlr-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vlr-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-ltr-top-bottom-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vlr-009-ref.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vlr-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vlr-009-ref.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vlr-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vrl-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vrl-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vrl-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vrl-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-left-right-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vlr-007-ref.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vlr-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vlr-007-ref.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vlr-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vrl-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vrl-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vrl-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vrl-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/overconstrained-rel-pos-rtl-top-bottom-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/padding-percent-orthogonal-dynamic.html b/tests/wpt/tests/css/css-writing-modes/padding-percent-orthogonal-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/padding-percent-orthogonal-dynamic.html rename to tests/wpt/tests/css/css-writing-modes/padding-percent-orthogonal-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/padding-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/padding-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/padding-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/padding-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/padding-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/padding-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/padding-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/padding-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-002.xht b/tests/wpt/tests/css/css-writing-modes/page-flow-direction-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-002.xht rename to tests/wpt/tests/css/css-writing-modes/page-flow-direction-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-003.xht b/tests/wpt/tests/css/css-writing-modes/page-flow-direction-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-003.xht rename to tests/wpt/tests/css/css-writing-modes/page-flow-direction-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-slr-005.xht b/tests/wpt/tests/css/css-writing-modes/page-flow-direction-slr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-slr-005.xht rename to tests/wpt/tests/css/css-writing-modes/page-flow-direction-slr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-srl-004.xht b/tests/wpt/tests/css/css-writing-modes/page-flow-direction-srl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-srl-004.xht rename to tests/wpt/tests/css/css-writing-modes/page-flow-direction-srl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/direction-computed.html b/tests/wpt/tests/css/css-writing-modes/parsing/direction-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/direction-computed.html rename to tests/wpt/tests/css/css-writing-modes/parsing/direction-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/direction-invalid.html b/tests/wpt/tests/css/css-writing-modes/parsing/direction-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/direction-invalid.html rename to tests/wpt/tests/css/css-writing-modes/parsing/direction-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/direction-valid.html b/tests/wpt/tests/css/css-writing-modes/parsing/direction-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/direction-valid.html rename to tests/wpt/tests/css/css-writing-modes/parsing/direction-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/text-combine-upright-computed.html b/tests/wpt/tests/css/css-writing-modes/parsing/text-combine-upright-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/text-combine-upright-computed.html rename to tests/wpt/tests/css/css-writing-modes/parsing/text-combine-upright-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/text-combine-upright-invalid.html b/tests/wpt/tests/css/css-writing-modes/parsing/text-combine-upright-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/text-combine-upright-invalid.html rename to tests/wpt/tests/css/css-writing-modes/parsing/text-combine-upright-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/text-combine-upright-valid.html b/tests/wpt/tests/css/css-writing-modes/parsing/text-combine-upright-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/text-combine-upright-valid.html rename to tests/wpt/tests/css/css-writing-modes/parsing/text-combine-upright-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/text-orientation-computed.html b/tests/wpt/tests/css/css-writing-modes/parsing/text-orientation-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/text-orientation-computed.html rename to tests/wpt/tests/css/css-writing-modes/parsing/text-orientation-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/text-orientation-invalid.html b/tests/wpt/tests/css/css-writing-modes/parsing/text-orientation-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/text-orientation-invalid.html rename to tests/wpt/tests/css/css-writing-modes/parsing/text-orientation-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/text-orientation-valid.html b/tests/wpt/tests/css/css-writing-modes/parsing/text-orientation-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/text-orientation-valid.html rename to tests/wpt/tests/css/css-writing-modes/parsing/text-orientation-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/unicode-bidi-computed.html b/tests/wpt/tests/css/css-writing-modes/parsing/unicode-bidi-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/unicode-bidi-computed.html rename to tests/wpt/tests/css/css-writing-modes/parsing/unicode-bidi-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/unicode-bidi-invalid.html b/tests/wpt/tests/css/css-writing-modes/parsing/unicode-bidi-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/unicode-bidi-invalid.html rename to tests/wpt/tests/css/css-writing-modes/parsing/unicode-bidi-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/unicode-bidi-valid.html b/tests/wpt/tests/css/css-writing-modes/parsing/unicode-bidi-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/unicode-bidi-valid.html rename to tests/wpt/tests/css/css-writing-modes/parsing/unicode-bidi-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/writing-mode-computed.html b/tests/wpt/tests/css/css-writing-modes/parsing/writing-mode-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/writing-mode-computed.html rename to tests/wpt/tests/css/css-writing-modes/parsing/writing-mode-computed.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/writing-mode-invalid.html b/tests/wpt/tests/css/css-writing-modes/parsing/writing-mode-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/writing-mode-invalid.html rename to tests/wpt/tests/css/css-writing-modes/parsing/writing-mode-invalid.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/parsing/writing-mode-valid.html b/tests/wpt/tests/css/css-writing-modes/parsing/writing-mode-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/parsing/writing-mode-valid.html rename to tests/wpt/tests/css/css-writing-modes/parsing/writing-mode-valid.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/percent-margin-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/percent-margin-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/percent-margin-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/percent-margin-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/percent-margin-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/percent-margin-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/percent-margin-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/percent-margin-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/percent-margin-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/percent-margin-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/percent-margin-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/percent-margin-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/percent-margin-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/percent-margin-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/percent-margin-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/percent-margin-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/percent-margin-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/percent-margin-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/percent-margin-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/percent-margin-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/percent-margin-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/percent-margin-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/percent-margin-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/percent-margin-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/percent-padding-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/percent-padding-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/percent-padding-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/percent-padding-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/percent-padding-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/percent-padding-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/percent-padding-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/percent-padding-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/percent-padding-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/percent-padding-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/percent-padding-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/percent-padding-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/percent-padding-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/percent-padding-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/percent-padding-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/percent-padding-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/percent-padding-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/percent-padding-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/percent-padding-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/percent-padding-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/percent-padding-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/percent-padding-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/percent-padding-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/percent-padding-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/percentage-padding-in-shrink-to-fit.html b/tests/wpt/tests/css/css-writing-modes/percentage-padding-in-shrink-to-fit.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/percentage-padding-in-shrink-to-fit.html rename to tests/wpt/tests/css/css-writing-modes/percentage-padding-in-shrink-to-fit.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/available-size-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/available-size-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/available-size-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/available-size-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/available-size-002-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/available-size-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/available-size-002-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/available-size-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/available-size-011-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/available-size-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/available-size-011-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/available-size-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/baseline-with-orthogonal-flow-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/baseline-with-orthogonal-flow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/baseline-with-orthogonal-flow-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/baseline-with-orthogonal-flow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-001.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-002.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-002.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-003.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-003.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-004.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-004.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-005.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-005.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-006.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-006.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-007.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-007.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-008.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-008.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-009.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-009.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-010.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-010.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-011.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-embed-011.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-embed-011.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-001.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-002.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-002.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-003.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-003.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-004.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-004.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-005.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-005.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-006.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-006.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-007.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-007.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-008.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-008.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-009.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-009.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-010.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-010.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-011.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-011.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-011.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-001.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-002.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-002.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-003.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-003.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-004.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-004.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-005.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-005.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-006.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-006.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-007.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-007.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-008.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-008.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-009.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-009.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-010.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-010.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-011.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-011.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-011.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-012.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-isolate-override-012.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-isolate-override-012.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-001.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-002.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-002.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-003.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-003.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-004.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-004.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-005.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-005.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-006.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-006.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-007.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-007.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-008.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-008.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-009.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-009.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-010.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-010.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-011.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-normal-011.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-normal-011.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-001.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-override-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-override-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-002.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-override-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-002.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-override-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-003.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-override-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-003.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-override-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-004.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-override-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-004.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-override-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-005.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-override-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-005.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-override-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-006.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-override-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-006.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-override-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-007.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-override-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-007.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-override-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-008.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-override-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-008.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-override-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-009.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-override-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-009.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-override-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-010.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-override-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-010.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-override-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-011.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-override-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-011.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-override-011.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-012.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-override-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-override-012.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-override-012.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-001.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-002.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-002.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-003.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-003.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-004.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-004.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-005.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-005.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-006.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-006.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-007.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-007.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-008.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-008.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-009.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-009.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-010.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-010.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-011.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-011.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-011.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-br-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-br-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-plaintext-br-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-plaintext-br-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-table-001.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-table-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-table-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-table-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-001.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-002.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-002.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-003.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-003.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-004.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-004.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-005.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-005.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-006.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-006.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-007.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-007.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-008.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-008.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-009.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-009.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-010.html b/tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/bidi-unset-010.html rename to tests/wpt/tests/css/css-writing-modes/reference/bidi-unset-010.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-embed-001.html b/tests/wpt/tests/css/css-writing-modes/reference/block-embed-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-embed-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-embed-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-embed-002.html b/tests/wpt/tests/css/css-writing-modes/reference/block-embed-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-embed-002.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-embed-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-embed-003.html b/tests/wpt/tests/css/css-writing-modes/reference/block-embed-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-embed-003.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-embed-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-001.html b/tests/wpt/tests/css/css-writing-modes/reference/block-override-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-override-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-002.html b/tests/wpt/tests/css/css-writing-modes/reference/block-override-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-002.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-override-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-003.html b/tests/wpt/tests/css/css-writing-modes/reference/block-override-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-003.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-override-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-004.html b/tests/wpt/tests/css/css-writing-modes/reference/block-override-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-004.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-override-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-isolate-001.html b/tests/wpt/tests/css/css-writing-modes/reference/block-override-isolate-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-isolate-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-override-isolate-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-isolate-002.html b/tests/wpt/tests/css/css-writing-modes/reference/block-override-isolate-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-isolate-002.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-override-isolate-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-isolate-003.html b/tests/wpt/tests/css/css-writing-modes/reference/block-override-isolate-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-isolate-003.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-override-isolate-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-isolate-004.html b/tests/wpt/tests/css/css-writing-modes/reference/block-override-isolate-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-override-isolate-004.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-override-isolate-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-plaintext-001.html b/tests/wpt/tests/css/css-writing-modes/reference/block-plaintext-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-plaintext-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-plaintext-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-plaintext-002.html b/tests/wpt/tests/css/css-writing-modes/reference/block-plaintext-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-plaintext-002.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-plaintext-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-plaintext-003.html b/tests/wpt/tests/css/css-writing-modes/reference/block-plaintext-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-plaintext-003.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-plaintext-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-plaintext-004.html b/tests/wpt/tests/css/css-writing-modes/reference/block-plaintext-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-plaintext-004.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-plaintext-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-plaintext-005.html b/tests/wpt/tests/css/css-writing-modes/reference/block-plaintext-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-plaintext-005.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-plaintext-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-plaintext-006.html b/tests/wpt/tests/css/css-writing-modes/reference/block-plaintext-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/block-plaintext-006.html rename to tests/wpt/tests/css/css-writing-modes/reference/block-plaintext-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/ch-units-vrl-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/ch-units-vrl-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/ch-units-vrl-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/ch-units-vrl-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/ch-units-vrl-005-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/ch-units-vrl-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/ch-units-vrl-005-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/ch-units-vrl-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/direction-upright-001.html b/tests/wpt/tests/css/css-writing-modes/reference/direction-upright-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/direction-upright-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/direction-upright-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/direction-upright-002.html b/tests/wpt/tests/css/css-writing-modes/reference/direction-upright-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/direction-upright-002.html rename to tests/wpt/tests/css/css-writing-modes/reference/direction-upright-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/full-width-001-horizontal-notref.html b/tests/wpt/tests/css/css-writing-modes/reference/full-width-001-horizontal-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/full-width-001-horizontal-notref.html rename to tests/wpt/tests/css/css-writing-modes/reference/full-width-001-horizontal-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/full-width-001-nofullwidth-notref.html b/tests/wpt/tests/css/css-writing-modes/reference/full-width-001-nofullwidth-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/full-width-001-nofullwidth-notref.html rename to tests/wpt/tests/css/css-writing-modes/reference/full-width-001-nofullwidth-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/full-width-002-horizontal-notref.html b/tests/wpt/tests/css/css-writing-modes/reference/full-width-002-horizontal-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/full-width-002-horizontal-notref.html rename to tests/wpt/tests/css/css-writing-modes/reference/full-width-002-horizontal-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/full-width-002-notcu-notref.html b/tests/wpt/tests/css/css-writing-modes/reference/full-width-002-notcu-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/full-width-002-notcu-notref.html rename to tests/wpt/tests/css/css-writing-modes/reference/full-width-002-notcu-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/full-width-notcu-notref.html b/tests/wpt/tests/css/css-writing-modes/reference/full-width-notcu-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/full-width-notcu-notref.html rename to tests/wpt/tests/css/css-writing-modes/reference/full-width-notcu-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/full-width-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/full-width-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/full-width-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/full-width-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/horizontal-ahem-1x1-notref.html b/tests/wpt/tests/css/css-writing-modes/reference/horizontal-ahem-1x1-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/horizontal-ahem-1x1-notref.html rename to tests/wpt/tests/css/css-writing-modes/reference/horizontal-ahem-1x1-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/horizontal-ahem-1x3-notref.html b/tests/wpt/tests/css/css-writing-modes/reference/horizontal-ahem-1x3-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/horizontal-ahem-1x3-notref.html rename to tests/wpt/tests/css/css-writing-modes/reference/horizontal-ahem-1x3-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/horizontal-ahem-1x4-notref.html b/tests/wpt/tests/css/css-writing-modes/reference/horizontal-ahem-1x4-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/horizontal-ahem-1x4-notref.html rename to tests/wpt/tests/css/css-writing-modes/reference/horizontal-ahem-1x4-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/horizontal-ahem-1x5-notref.html b/tests/wpt/tests/css/css-writing-modes/reference/horizontal-ahem-1x5-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/horizontal-ahem-1x5-notref.html rename to tests/wpt/tests/css/css-writing-modes/reference/horizontal-ahem-1x5-notref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/inline-box-border-vlr-001.html b/tests/wpt/tests/css/css-writing-modes/reference/inline-box-border-vlr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/inline-box-border-vlr-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/inline-box-border-vlr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/logical-props-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/logical-props-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/logical-props-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/logical-props-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/margin-collapse-022-023-1.xht b/tests/wpt/tests/css/css-writing-modes/reference/margin-collapse-022-023-1.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/margin-collapse-022-023-1.xht rename to tests/wpt/tests/css/css-writing-modes/reference/margin-collapse-022-023-1.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/margin-collapse-022-023-2.xht b/tests/wpt/tests/css/css-writing-modes/reference/margin-collapse-022-023-2.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/margin-collapse-022-023-2.xht rename to tests/wpt/tests/css/css-writing-modes/reference/margin-collapse-022-023-2.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/mongolian-orientation-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/mongolian-orientation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/mongolian-orientation-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/mongolian-orientation-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/mongolian-span-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/mongolian-span-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/mongolian-span-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/mongolian-span-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/outline-inline-block-vrl-006.html b/tests/wpt/tests/css/css-writing-modes/reference/outline-inline-block-vrl-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/outline-inline-block-vrl-006.html rename to tests/wpt/tests/css/css-writing-modes/reference/outline-inline-block-vrl-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/outline-inline-vlr-006.html b/tests/wpt/tests/css/css-writing-modes/reference/outline-inline-vlr-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/outline-inline-vlr-006.html rename to tests/wpt/tests/css/css-writing-modes/reference/outline-inline-vlr-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/outline-inline-vrl-006.html b/tests/wpt/tests/css/css-writing-modes/reference/outline-inline-vrl-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/outline-inline-vrl-006.html rename to tests/wpt/tests/css/css-writing-modes/reference/outline-inline-vrl-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/scrollbar-vertical-rl-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/scrollbar-vertical-rl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/scrollbar-vertical-rl-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/scrollbar-vertical-rl-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/svg-aliasing-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/svg-aliasing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/svg-aliasing-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/svg-aliasing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/svg-aliasing-002-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/svg-aliasing-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/svg-aliasing-002-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/svg-aliasing-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/table-cell-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/table-cell-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/table-cell-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/table-cell-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/table-cell-002-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/table-cell-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/table-cell-002-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/table-cell-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/tcy-white-space-processing-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/tcy-white-space-processing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/tcy-white-space-processing-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/tcy-white-space-processing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/tcy-white-space-processing-002-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/tcy-white-space-processing-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/tcy-white-space-processing-002-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/tcy-white-space-processing-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/tcy-white-space-processing-003-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/tcy-white-space-processing-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/tcy-white-space-processing-003-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/tcy-white-space-processing-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-combine-upright-decorations-001.html b/tests/wpt/tests/css/css-writing-modes/reference/text-combine-upright-decorations-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-combine-upright-decorations-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/text-combine-upright-decorations-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-combine-upright-inherit-all-001.html b/tests/wpt/tests/css/css-writing-modes/reference/text-combine-upright-inherit-all-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-combine-upright-inherit-all-001.html rename to tests/wpt/tests/css/css-writing-modes/reference/text-combine-upright-inherit-all-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-combine-upright-inherit-all-002.html b/tests/wpt/tests/css/css-writing-modes/reference/text-combine-upright-inherit-all-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-combine-upright-inherit-all-002.html rename to tests/wpt/tests/css/css-writing-modes/reference/text-combine-upright-inherit-all-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-combine-upright-layout-rules-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/text-combine-upright-layout-rules-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-combine-upright-layout-rules-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/text-combine-upright-layout-rules-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-combine-upright-sideways-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/text-combine-upright-sideways-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-combine-upright-sideways-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/text-combine-upright-sideways-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-combine-upright-sideways-002-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/text-combine-upright-sideways-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-combine-upright-sideways-002-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/text-combine-upright-sideways-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-combine-upright-value-single-character.html b/tests/wpt/tests/css/css-writing-modes/reference/text-combine-upright-value-single-character.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-combine-upright-value-single-character.html rename to tests/wpt/tests/css/css-writing-modes/reference/text-combine-upright-value-single-character.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-shadow-orientation-upright-001-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/text-shadow-orientation-upright-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/text-shadow-orientation-upright-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/text-shadow-orientation-upright-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/three-levels-of-orthogonal-flows.html b/tests/wpt/tests/css/css-writing-modes/reference/three-levels-of-orthogonal-flows.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/three-levels-of-orthogonal-flows.html rename to tests/wpt/tests/css/css-writing-modes/reference/three-levels-of-orthogonal-flows.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/two-levels-of-orthogonal-flows-fixed.html b/tests/wpt/tests/css/css-writing-modes/reference/two-levels-of-orthogonal-flows-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/two-levels-of-orthogonal-flows-fixed.html rename to tests/wpt/tests/css/css-writing-modes/reference/two-levels-of-orthogonal-flows-fixed.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/two-levels-of-orthogonal-flows-percentage.html b/tests/wpt/tests/css/css-writing-modes/reference/two-levels-of-orthogonal-flows-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/two-levels-of-orthogonal-flows-percentage.html rename to tests/wpt/tests/css/css-writing-modes/reference/two-levels-of-orthogonal-flows-percentage.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/two-levels-of-orthogonal-flows.html b/tests/wpt/tests/css/css-writing-modes/reference/two-levels-of-orthogonal-flows.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/two-levels-of-orthogonal-flows.html rename to tests/wpt/tests/css/css-writing-modes/reference/two-levels-of-orthogonal-flows.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/vertical-ahem-1x1-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/vertical-ahem-1x1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/vertical-ahem-1x1-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/vertical-ahem-1x1-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/vertical-ahem-1x3-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/vertical-ahem-1x3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/vertical-ahem-1x3-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/vertical-ahem-1x3-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/vertical-ahem-1x4-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/vertical-ahem-1x4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/vertical-ahem-1x4-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/vertical-ahem-1x4-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/vertical-ahem-1x5-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/vertical-ahem-1x5-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/vertical-ahem-1x5-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/vertical-ahem-1x5-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-horizontal-001l-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/writing-mode-horizontal-001l-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-horizontal-001l-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/writing-mode-horizontal-001l-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-horizontal-001r-ref.html b/tests/wpt/tests/css/css-writing-modes/reference/writing-mode-horizontal-001r-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-horizontal-001r-ref.html rename to tests/wpt/tests/css/css-writing-modes/reference/writing-mode-horizontal-001r-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-vertical-lr-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/reference/writing-mode-vertical-lr-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-vertical-lr-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/reference/writing-mode-vertical-lr-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-vertical-rl-001-ref.xht b/tests/wpt/tests/css/css-writing-modes/reference/writing-mode-vertical-rl-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-vertical-rl-001-ref.xht rename to tests/wpt/tests/css/css-writing-modes/reference/writing-mode-vertical-rl-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-vertical-rl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/reference/writing-mode-vertical-rl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/reference/writing-mode-vertical-rl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/reference/writing-mode-vertical-rl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/relpos-inline-overflowing-block-vrl.html b/tests/wpt/tests/css/css-writing-modes/relpos-inline-overflowing-block-vrl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/relpos-inline-overflowing-block-vrl.html rename to tests/wpt/tests/css/css-writing-modes/relpos-inline-overflowing-block-vrl.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/replaced-content-image-002.xht b/tests/wpt/tests/css/css-writing-modes/replaced-content-image-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/replaced-content-image-002.xht rename to tests/wpt/tests/css/css-writing-modes/replaced-content-image-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/replaced-content-image-003.xht b/tests/wpt/tests/css/css-writing-modes/replaced-content-image-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/replaced-content-image-003.xht rename to tests/wpt/tests/css/css-writing-modes/replaced-content-image-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/replaced-content-image-004-ref.html b/tests/wpt/tests/css/css-writing-modes/replaced-content-image-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/replaced-content-image-004-ref.html rename to tests/wpt/tests/css/css-writing-modes/replaced-content-image-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/replaced-content-image-004.html b/tests/wpt/tests/css/css-writing-modes/replaced-content-image-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/replaced-content-image-004.html rename to tests/wpt/tests/css/css-writing-modes/replaced-content-image-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-slr-023.xht b/tests/wpt/tests/css/css-writing-modes/row-progression-slr-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-slr-023.xht rename to tests/wpt/tests/css/css-writing-modes/row-progression-slr-023.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-slr-029.xht b/tests/wpt/tests/css/css-writing-modes/row-progression-slr-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-slr-029.xht rename to tests/wpt/tests/css/css-writing-modes/row-progression-slr-029.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-srl-022.xht b/tests/wpt/tests/css/css-writing-modes/row-progression-srl-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-srl-022.xht rename to tests/wpt/tests/css/css-writing-modes/row-progression-srl-022.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-srl-028.xht b/tests/wpt/tests/css/css-writing-modes/row-progression-srl-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-srl-028.xht rename to tests/wpt/tests/css/css-writing-modes/row-progression-srl-028.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/row-progression-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/row-progression-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/row-progression-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/row-progression-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/row-progression-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/row-progression-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/row-progression-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/row-progression-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/row-progression-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/row-progression-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/row-progression-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/row-progression-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/row-progression-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/row-progression-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/row-progression-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/row-progression-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/scrollbar-vertical-rl.html b/tests/wpt/tests/css/css-writing-modes/scrollbar-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/scrollbar-vertical-rl.html rename to tests/wpt/tests/css/css-writing-modes/scrollbar-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-001-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-001-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-001.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-001.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-004.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-004.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-006.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-006.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-007-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-007-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-008.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-008.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-010-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-010-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-010.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-010.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-011-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-011-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-011.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-011.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-012.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-012.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-013-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-013-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-013.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-013.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-015-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-015-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-015.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-015.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-016-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-016-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-016.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-016.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-018-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-018-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-018.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-018.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-019-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-019-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-019.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-019.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-019.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-020-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-020-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-020.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-020.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-020.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-021.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-021.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-021.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-022-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-022-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-022.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-022.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-022.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-023-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-023-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-023.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-023.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-023.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-024.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-024.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vlr-024.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-001-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-001-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-001.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-001.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-003.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-003.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-007-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-007-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-007.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-007.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-009.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-009.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-010-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-010-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-010.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-010.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-011-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-011-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-011.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-011.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-013-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-013-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-013.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-013.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-015-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-015-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-015.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-015.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-016.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-016.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-018-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-018-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-018.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-018.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-019-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-019-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-019.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-019.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-019.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-020-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-020-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-020.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-020.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-020.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-021.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-021.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-021.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-022-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-022-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-022.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-022.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-022.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-023-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-023-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-023.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-023.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-023.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-024.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-024.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-024.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-001-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-001-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-001.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-001.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-002.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-002.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-004.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-004.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-005-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-005-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-006.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-006.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-007-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-007-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-008.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-008.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-003.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-003.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-005-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-005-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-005.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-005.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-007-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-007-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-007.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-007.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-001-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-001-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-001.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-001.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-002.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-002.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-003.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-003.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-004.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-004.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-005-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-005-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-005.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-005.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-006.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-006.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-007-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-007-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-007.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-007.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-008.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-008.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-001-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-001-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-001.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-001.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-002.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-002.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-003.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-003.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-004.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-004.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-005-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-005-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-005.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-005.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-006.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-006.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-007-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-007-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-007.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-007.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-008.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-008.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-001-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-001-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-001.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-001.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-003.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-003.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-004.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-004.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-006.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-006.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-007-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-007-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-007.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-007.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-008.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-008.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-009-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-009-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-009.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-009.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-010-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-010-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-010.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-010.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-011-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-011-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-011.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-011.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-012-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-012-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-012.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-012.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-013-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-013-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-013.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-013.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-015-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-015-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-015.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-015.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-016-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-016-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-016.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-016.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-018-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-018-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-018.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-018.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-019-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-019-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-019.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-019.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-019.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-020-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-020-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-020.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-020.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-020.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-021.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-021.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-021.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-022-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-022-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-022.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-022.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-022.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-023-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-023-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-023.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-023.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-023.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-024.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-024.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vlr-in-htb-024.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-001-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-001-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-001-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-001-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-001.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-001.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-003.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-003.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-004.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-004.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-006.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-006.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-007-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-007-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-007-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-007-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-007.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-007.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-008.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-008.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-009-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-009-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-009.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-009.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-010-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-010-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-010.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-010.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-011-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-011-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-011.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-011.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-012-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-012-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-012.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-012.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-013-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-013-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-013.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-013.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-015-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-015-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-015-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-015-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-015.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-015.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-016-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-016-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-016.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-016.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-018-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-018-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-018-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-018-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-018.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-018.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-019-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-019-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-019-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-019-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-019.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-019.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-019.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-020-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-020-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-020-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-020-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-020.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-020.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-020.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-021.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-021.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-021.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-022-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-022-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-022.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-022.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-022.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-023-ref.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-023-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-023-ref.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-023-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-023.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-023.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-023.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-024.xht b/tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-024.xht rename to tests/wpt/tests/css/css-writing-modes/sizing-orthog-vrl-in-htb-024.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-001-ref.html b/tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-001.html b/tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-001.html rename to tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-002-ref.html b/tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-002-ref.html rename to tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-002.html b/tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-002.html rename to tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-003-ref.html b/tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-003-ref.html rename to tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-003.html b/tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-003.html rename to tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-004.html b/tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-004.html rename to tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-005-ref.html b/tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-005-ref.html rename to tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-005.html b/tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-005.html rename to tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-006-ref.html b/tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-006-ref.html rename to tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-006.html b/tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-006.html rename to tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-007-ref.html b/tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-007-ref.html rename to tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-007.html b/tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-007.html rename to tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-008.html b/tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-008.html rename to tests/wpt/tests/css/css-writing-modes/sizing-orthogonal-percentage-margin-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-percentages-replaced-orthogonal-001-ref.html b/tests/wpt/tests/css/css-writing-modes/sizing-percentages-replaced-orthogonal-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-percentages-replaced-orthogonal-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/sizing-percentages-replaced-orthogonal-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/sizing-percentages-replaced-orthogonal-001.html b/tests/wpt/tests/css/css-writing-modes/sizing-percentages-replaced-orthogonal-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/sizing-percentages-replaced-orthogonal-001.html rename to tests/wpt/tests/css/css-writing-modes/sizing-percentages-replaced-orthogonal-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/slr-alongside-vlr-floats-ref.html b/tests/wpt/tests/css/css-writing-modes/slr-alongside-vlr-floats-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/slr-alongside-vlr-floats-ref.html rename to tests/wpt/tests/css/css-writing-modes/slr-alongside-vlr-floats-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/slr-alongside-vlr-floats.html b/tests/wpt/tests/css/css-writing-modes/slr-alongside-vlr-floats.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/slr-alongside-vlr-floats.html rename to tests/wpt/tests/css/css-writing-modes/slr-alongside-vlr-floats.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/srl-alongside-vrl-floats-ref.html b/tests/wpt/tests/css/css-writing-modes/srl-alongside-vrl-floats-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/srl-alongside-vrl-floats-ref.html rename to tests/wpt/tests/css/css-writing-modes/srl-alongside-vrl-floats-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/srl-alongside-vrl-floats.html b/tests/wpt/tests/css/css-writing-modes/srl-alongside-vrl-floats.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/srl-alongside-vrl-floats.html rename to tests/wpt/tests/css/css-writing-modes/srl-alongside-vrl-floats.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/100x100-lime.png b/tests/wpt/tests/css/css-writing-modes/support/100x100-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/100x100-lime.png rename to tests/wpt/tests/css/css-writing-modes/support/100x100-lime.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/100x100-red.png b/tests/wpt/tests/css/css-writing-modes/support/100x100-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/100x100-red.png rename to tests/wpt/tests/css/css-writing-modes/support/100x100-red.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/DejaVuSerif-webfont.woff b/tests/wpt/tests/css/css-writing-modes/support/DejaVuSerif-webfont.woff similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/DejaVuSerif-webfont.woff rename to tests/wpt/tests/css/css-writing-modes/support/DejaVuSerif-webfont.woff diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/WidthTest-Regular.otf b/tests/wpt/tests/css/css-writing-modes/support/WidthTest-Regular.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/WidthTest-Regular.otf rename to tests/wpt/tests/css/css-writing-modes/support/WidthTest-Regular.otf diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-1col-2row-320x320.png b/tests/wpt/tests/css/css-writing-modes/support/bg-red-1col-2row-320x320.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-1col-2row-320x320.png rename to tests/wpt/tests/css/css-writing-modes/support/bg-red-1col-2row-320x320.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-1col-3row-320x320.png b/tests/wpt/tests/css/css-writing-modes/support/bg-red-1col-3row-320x320.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-1col-3row-320x320.png rename to tests/wpt/tests/css/css-writing-modes/support/bg-red-1col-3row-320x320.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-2col-2row-320x320.png b/tests/wpt/tests/css/css-writing-modes/support/bg-red-2col-2row-320x320.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-2col-2row-320x320.png rename to tests/wpt/tests/css/css-writing-modes/support/bg-red-2col-2row-320x320.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-2col-3row-320x320.png b/tests/wpt/tests/css/css-writing-modes/support/bg-red-2col-3row-320x320.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-2col-3row-320x320.png rename to tests/wpt/tests/css/css-writing-modes/support/bg-red-2col-3row-320x320.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-3col-2row-320x320.png b/tests/wpt/tests/css/css-writing-modes/support/bg-red-3col-2row-320x320.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-3col-2row-320x320.png rename to tests/wpt/tests/css/css-writing-modes/support/bg-red-3col-2row-320x320.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-3col-3row-320x320.png b/tests/wpt/tests/css/css-writing-modes/support/bg-red-3col-3row-320x320.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-3col-3row-320x320.png rename to tests/wpt/tests/css/css-writing-modes/support/bg-red-3col-3row-320x320.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-4col-2row-320x320.png b/tests/wpt/tests/css/css-writing-modes/support/bg-red-4col-2row-320x320.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-4col-2row-320x320.png rename to tests/wpt/tests/css/css-writing-modes/support/bg-red-4col-2row-320x320.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-4col-3row-320x320.png b/tests/wpt/tests/css/css-writing-modes/support/bg-red-4col-3row-320x320.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-4col-3row-320x320.png rename to tests/wpt/tests/css/css-writing-modes/support/bg-red-4col-3row-320x320.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-low-left-corn-320x320.png b/tests/wpt/tests/css/css-writing-modes/support/bg-red-low-left-corn-320x320.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-low-left-corn-320x320.png rename to tests/wpt/tests/css/css-writing-modes/support/bg-red-low-left-corn-320x320.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-low-rght-corn-320x320.png b/tests/wpt/tests/css/css-writing-modes/support/bg-red-low-rght-corn-320x320.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-low-rght-corn-320x320.png rename to tests/wpt/tests/css/css-writing-modes/support/bg-red-low-rght-corn-320x320.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-upp-left-corn-320x320.png b/tests/wpt/tests/css/css-writing-modes/support/bg-red-upp-left-corn-320x320.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-upp-left-corn-320x320.png rename to tests/wpt/tests/css/css-writing-modes/support/bg-red-upp-left-corn-320x320.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-upp-rght-corn-320x320.png b/tests/wpt/tests/css/css-writing-modes/support/bg-red-upp-rght-corn-320x320.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/bg-red-upp-rght-corn-320x320.png rename to tests/wpt/tests/css/css-writing-modes/support/bg-red-upp-rght-corn-320x320.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/block-flow-direction-025-exp-res.png b/tests/wpt/tests/css/css-writing-modes/support/block-flow-direction-025-exp-res.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/block-flow-direction-025-exp-res.png rename to tests/wpt/tests/css/css-writing-modes/support/block-flow-direction-025-exp-res.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/block-flow-direction-066-exp-res.png b/tests/wpt/tests/css/css-writing-modes/support/block-flow-direction-066-exp-res.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/block-flow-direction-066-exp-res.png rename to tests/wpt/tests/css/css-writing-modes/support/block-flow-direction-066-exp-res.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/blue-200x100.png b/tests/wpt/tests/css/css-writing-modes/support/blue-200x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/blue-200x100.png rename to tests/wpt/tests/css/css-writing-modes/support/blue-200x100.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/blue-horiz-line-220x1.png b/tests/wpt/tests/css/css-writing-modes/support/blue-horiz-line-220x1.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/blue-horiz-line-220x1.png rename to tests/wpt/tests/css/css-writing-modes/support/blue-horiz-line-220x1.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/blue-horiz-line-320x1.png b/tests/wpt/tests/css/css-writing-modes/support/blue-horiz-line-320x1.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/blue-horiz-line-320x1.png rename to tests/wpt/tests/css/css-writing-modes/support/blue-horiz-line-320x1.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/blue-vert-line-1x220.png b/tests/wpt/tests/css/css-writing-modes/support/blue-vert-line-1x220.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/blue-vert-line-1x220.png rename to tests/wpt/tests/css/css-writing-modes/support/blue-vert-line-1x220.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/blue-vert-line-1x320.png b/tests/wpt/tests/css/css-writing-modes/support/blue-vert-line-1x320.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/blue-vert-line-1x320.png rename to tests/wpt/tests/css/css-writing-modes/support/blue-vert-line-1x320.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/blue-yellow-206w-165h.png b/tests/wpt/tests/css/css-writing-modes/support/blue-yellow-206w-165h.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/blue-yellow-206w-165h.png rename to tests/wpt/tests/css/css-writing-modes/support/blue-yellow-206w-165h.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/blue1x1.png b/tests/wpt/tests/css/css-writing-modes/support/blue1x1.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/blue1x1.png rename to tests/wpt/tests/css/css-writing-modes/support/blue1x1.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/blue20x20.png b/tests/wpt/tests/css/css-writing-modes/support/blue20x20.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/blue20x20.png rename to tests/wpt/tests/css/css-writing-modes/support/blue20x20.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/cat.png b/tests/wpt/tests/css/css-writing-modes/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/cat.png rename to tests/wpt/tests/css/css-writing-modes/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/clearance-calculation-vrl-002.png b/tests/wpt/tests/css/css-writing-modes/support/clearance-calculation-vrl-002.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/clearance-calculation-vrl-002.png rename to tests/wpt/tests/css/css-writing-modes/support/clearance-calculation-vrl-002.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/clearance-calculation-vrl-004.png b/tests/wpt/tests/css/css-writing-modes/support/clearance-calculation-vrl-004.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/clearance-calculation-vrl-004.png rename to tests/wpt/tests/css/css-writing-modes/support/clearance-calculation-vrl-004.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/clearance-calculation-vrl-006.png b/tests/wpt/tests/css/css-writing-modes/support/clearance-calculation-vrl-006.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/clearance-calculation-vrl-006.png rename to tests/wpt/tests/css/css-writing-modes/support/clearance-calculation-vrl-006.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-007.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-007.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-009.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-009.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-009.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-015.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-015.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-015.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-017.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-017.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-017.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-019.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-019.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-019.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-021.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-021.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-021.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-023.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-023.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-023.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-025.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-025.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-025.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-027.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-027.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-027.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-029.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-029.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-029.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-031.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-031.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-031.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-033.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-033.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vlr-033.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-006.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-006.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-008.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-008.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-014.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-014.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-014.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-016.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-016.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-016.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-018.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-018.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-018.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-020.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-020.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-020.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-022.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-022.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-022.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-024.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-024.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-024.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-026.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-026.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-026.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-028.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-028.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-028.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-030.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-030.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-030.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-032.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-032.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-abs-pos-non-replaced-icb-vrl-032.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-002.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-002.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-004.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-004.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-006.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-006.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-008.html b/tests/wpt/tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-008.html rename to tests/wpt/tests/css/css-writing-modes/support/embedded-doc-for-background-size-root-vrl-008.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/left-bottom-200x300.png b/tests/wpt/tests/css/css-writing-modes/support/left-bottom-200x300.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/left-bottom-200x300.png rename to tests/wpt/tests/css/css-writing-modes/support/left-bottom-200x300.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/left-bottom-green-200x300.png b/tests/wpt/tests/css/css-writing-modes/support/left-bottom-green-200x300.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/left-bottom-green-200x300.png rename to tests/wpt/tests/css/css-writing-modes/support/left-bottom-green-200x300.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/left-center-200x300.png b/tests/wpt/tests/css/css-writing-modes/support/left-center-200x300.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/left-center-200x300.png rename to tests/wpt/tests/css/css-writing-modes/support/left-center-200x300.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/left-center-green-200x300.png b/tests/wpt/tests/css/css-writing-modes/support/left-center-green-200x300.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/left-center-green-200x300.png rename to tests/wpt/tests/css/css-writing-modes/support/left-center-green-200x300.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/left-side-filled-square-40x160.png b/tests/wpt/tests/css/css-writing-modes/support/left-side-filled-square-40x160.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/left-side-filled-square-40x160.png rename to tests/wpt/tests/css/css-writing-modes/support/left-side-filled-square-40x160.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/left-top-200x300.png b/tests/wpt/tests/css/css-writing-modes/support/left-top-200x300.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/left-top-200x300.png rename to tests/wpt/tests/css/css-writing-modes/support/left-top-200x300.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/margin-collapse-2em-space-wm-vert.png b/tests/wpt/tests/css/css-writing-modes/support/margin-collapse-2em-space-wm-vert.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/margin-collapse-2em-space-wm-vert.png rename to tests/wpt/tests/css/css-writing-modes/support/margin-collapse-2em-space-wm-vert.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/mn+arabic.png b/tests/wpt/tests/css/css-writing-modes/support/mn+arabic.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/mn+arabic.png rename to tests/wpt/tests/css/css-writing-modes/support/mn+arabic.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/mn+latin.png b/tests/wpt/tests/css/css-writing-modes/support/mn+latin.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/mn+latin.png rename to tests/wpt/tests/css/css-writing-modes/support/mn+latin.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/mn-orientation.png b/tests/wpt/tests/css/css-writing-modes/support/mn-orientation.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/mn-orientation.png rename to tests/wpt/tests/css/css-writing-modes/support/mn-orientation.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/mn_ar_wrap.png b/tests/wpt/tests/css/css-writing-modes/support/mn_ar_wrap.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/mn_ar_wrap.png rename to tests/wpt/tests/css/css-writing-modes/support/mn_ar_wrap.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/mn_en_wrap.png b/tests/wpt/tests/css/css-writing-modes/support/mn_en_wrap.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/mn_en_wrap.png rename to tests/wpt/tests/css/css-writing-modes/support/mn_en_wrap.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/opaque-square-40x160.png b/tests/wpt/tests/css/css-writing-modes/support/opaque-square-40x160.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/opaque-square-40x160.png rename to tests/wpt/tests/css/css-writing-modes/support/opaque-square-40x160.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/ortho-htb-alongside-vrl-floats-002-exp-res.png b/tests/wpt/tests/css/css-writing-modes/support/ortho-htb-alongside-vrl-floats-002-exp-res.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/ortho-htb-alongside-vrl-floats-002-exp-res.png rename to tests/wpt/tests/css/css-writing-modes/support/ortho-htb-alongside-vrl-floats-002-exp-res.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/page-flow-direction-002p1.png b/tests/wpt/tests/css/css-writing-modes/support/page-flow-direction-002p1.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/page-flow-direction-002p1.png rename to tests/wpt/tests/css/css-writing-modes/support/page-flow-direction-002p1.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/page-flow-direction-002p2.png b/tests/wpt/tests/css/css-writing-modes/support/page-flow-direction-002p2.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/page-flow-direction-002p2.png rename to tests/wpt/tests/css/css-writing-modes/support/page-flow-direction-002p2.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/page-flow-direction-002p3.png b/tests/wpt/tests/css/css-writing-modes/support/page-flow-direction-002p3.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/page-flow-direction-002p3.png rename to tests/wpt/tests/css/css-writing-modes/support/page-flow-direction-002p3.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/page-flow-direction-002p4.png b/tests/wpt/tests/css/css-writing-modes/support/page-flow-direction-002p4.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/page-flow-direction-002p4.png rename to tests/wpt/tests/css/css-writing-modes/support/page-flow-direction-002p4.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-abs-pos-non-replaced.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-abs-pos-non-replaced.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-abs-pos-non-replaced.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-abs-pos-non-replaced.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-002.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-002.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-002.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-002.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-004.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-004.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-004.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-004.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-006.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-006.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-006.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-006.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-008.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-008.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-008.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-008.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-010.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-010.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-010.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-010.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-012.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-012.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-012.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-012.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-014.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-014.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-014.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-014.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-016.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-016.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-016.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-016.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-018.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-018.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-018.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-bg-pos-vrl-018.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-box-offsets-rel-pos.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-box-offsets-rel-pos.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-box-offsets-rel-pos.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-box-offsets-rel-pos.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-clearance-calculations.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-clearance-calculations.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-clearance-calculations.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-clearance-calculations.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-first-page-vlr-003.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-first-page-vlr-003.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-first-page-vlr-003.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-first-page-vlr-003.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-first-page-vrl-002.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-first-page-vrl-002.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-first-page-vrl-002.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-first-page-vrl-002.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-float-contiguous.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-float-contiguous.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-float-contiguous.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-float-contiguous.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-horiz-rule.png b/tests/wpt/tests/css/css-writing-modes/support/pass-cdts-horiz-rule.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pass-cdts-horiz-rule.png rename to tests/wpt/tests/css/css-writing-modes/support/pass-cdts-horiz-rule.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-gg-gr-100x100.png b/tests/wpt/tests/css/css-writing-modes/support/pattern-gg-gr-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-gg-gr-100x100.png rename to tests/wpt/tests/css/css-writing-modes/support/pattern-gg-gr-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-gg-rg-100x100.png b/tests/wpt/tests/css/css-writing-modes/support/pattern-gg-rg-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-gg-rg-100x100.png rename to tests/wpt/tests/css/css-writing-modes/support/pattern-gg-rg-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-gg-rr-100x100.png b/tests/wpt/tests/css/css-writing-modes/support/pattern-gg-rr-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-gg-rr-100x100.png rename to tests/wpt/tests/css/css-writing-modes/support/pattern-gg-rr-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-gr-gg-100x100.png b/tests/wpt/tests/css/css-writing-modes/support/pattern-gr-gg-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-gr-gg-100x100.png rename to tests/wpt/tests/css/css-writing-modes/support/pattern-gr-gg-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-gr-gr-100x100.png b/tests/wpt/tests/css/css-writing-modes/support/pattern-gr-gr-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-gr-gr-100x100.png rename to tests/wpt/tests/css/css-writing-modes/support/pattern-gr-gr-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-gr-rg-100x100.png b/tests/wpt/tests/css/css-writing-modes/support/pattern-gr-rg-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-gr-rg-100x100.png rename to tests/wpt/tests/css/css-writing-modes/support/pattern-gr-rg-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-gr-rr-100x100.png b/tests/wpt/tests/css/css-writing-modes/support/pattern-gr-rr-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-gr-rr-100x100.png rename to tests/wpt/tests/css/css-writing-modes/support/pattern-gr-rr-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-rg-gg-100x100.png b/tests/wpt/tests/css/css-writing-modes/support/pattern-rg-gg-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-rg-gg-100x100.png rename to tests/wpt/tests/css/css-writing-modes/support/pattern-rg-gg-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-rg-gr-100x100.png b/tests/wpt/tests/css/css-writing-modes/support/pattern-rg-gr-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-rg-gr-100x100.png rename to tests/wpt/tests/css/css-writing-modes/support/pattern-rg-gr-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-rg-rg-100x100.png b/tests/wpt/tests/css/css-writing-modes/support/pattern-rg-rg-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-rg-rg-100x100.png rename to tests/wpt/tests/css/css-writing-modes/support/pattern-rg-rg-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-rg-rr-100x100.png b/tests/wpt/tests/css/css-writing-modes/support/pattern-rg-rr-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-rg-rr-100x100.png rename to tests/wpt/tests/css/css-writing-modes/support/pattern-rg-rr-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-rr-gr-100x100.png b/tests/wpt/tests/css/css-writing-modes/support/pattern-rr-gr-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-rr-gr-100x100.png rename to tests/wpt/tests/css/css-writing-modes/support/pattern-rr-gr-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-rr-rg-100x100.png b/tests/wpt/tests/css/css-writing-modes/support/pattern-rr-rg-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/pattern-rr-rg-100x100.png rename to tests/wpt/tests/css/css-writing-modes/support/pattern-rr-rg-100x100.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/right-bottom-200x300.png b/tests/wpt/tests/css/css-writing-modes/support/right-bottom-200x300.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/right-bottom-200x300.png rename to tests/wpt/tests/css/css-writing-modes/support/right-bottom-200x300.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/right-bottom-green-200x300.png b/tests/wpt/tests/css/css-writing-modes/support/right-bottom-green-200x300.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/right-bottom-green-200x300.png rename to tests/wpt/tests/css/css-writing-modes/support/right-bottom-green-200x300.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/right-center-200x300.png b/tests/wpt/tests/css/css-writing-modes/support/right-center-200x300.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/right-center-200x300.png rename to tests/wpt/tests/css/css-writing-modes/support/right-center-200x300.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/right-center-green-200x300.png b/tests/wpt/tests/css/css-writing-modes/support/right-center-green-200x300.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/right-center-green-200x300.png rename to tests/wpt/tests/css/css-writing-modes/support/right-center-green-200x300.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/right-side-filled-square-40x160.png b/tests/wpt/tests/css/css-writing-modes/support/right-side-filled-square-40x160.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/right-side-filled-square-40x160.png rename to tests/wpt/tests/css/css-writing-modes/support/right-side-filled-square-40x160.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/right-top-200x300.png b/tests/wpt/tests/css/css-writing-modes/support/right-top-200x300.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/right-top-200x300.png rename to tests/wpt/tests/css/css-writing-modes/support/right-top-200x300.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/right-top-green-200x300.png b/tests/wpt/tests/css/css-writing-modes/support/right-top-green-200x300.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/right-top-green-200x300.png rename to tests/wpt/tests/css/css-writing-modes/support/right-top-green-200x300.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-aqua.png b/tests/wpt/tests/css/css-writing-modes/support/swatch-aqua.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-aqua.png rename to tests/wpt/tests/css/css-writing-modes/support/swatch-aqua.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-blue.png b/tests/wpt/tests/css/css-writing-modes/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-blue.png rename to tests/wpt/tests/css/css-writing-modes/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-fuchsia.png b/tests/wpt/tests/css/css-writing-modes/support/swatch-fuchsia.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-fuchsia.png rename to tests/wpt/tests/css/css-writing-modes/support/swatch-fuchsia.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-green.png b/tests/wpt/tests/css/css-writing-modes/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-green.png rename to tests/wpt/tests/css/css-writing-modes/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-olive.png b/tests/wpt/tests/css/css-writing-modes/support/swatch-olive.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-olive.png rename to tests/wpt/tests/css/css-writing-modes/support/swatch-olive.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-orange.png b/tests/wpt/tests/css/css-writing-modes/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-orange.png rename to tests/wpt/tests/css/css-writing-modes/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-teal.png b/tests/wpt/tests/css/css-writing-modes/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-teal.png rename to tests/wpt/tests/css/css-writing-modes/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-yellow.png b/tests/wpt/tests/css/css-writing-modes/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/swatch-yellow.png rename to tests/wpt/tests/css/css-writing-modes/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/tcu-font.otf b/tests/wpt/tests/css/css-writing-modes/support/tcu-font.otf similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/tcu-font.otf rename to tests/wpt/tests/css/css-writing-modes/support/tcu-font.otf diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/tcy.css b/tests/wpt/tests/css/css-writing-modes/support/tcy.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/tcy.css rename to tests/wpt/tests/css/css-writing-modes/support/tcy.css diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/test-bl.png b/tests/wpt/tests/css/css-writing-modes/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/test-bl.png rename to tests/wpt/tests/css/css-writing-modes/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/test-br.png b/tests/wpt/tests/css/css-writing-modes/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/test-br.png rename to tests/wpt/tests/css/css-writing-modes/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/test-tl.png b/tests/wpt/tests/css/css-writing-modes/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/test-tl.png rename to tests/wpt/tests/css/css-writing-modes/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/test-tr.png b/tests/wpt/tests/css/css-writing-modes/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/test-tr.png rename to tests/wpt/tests/css/css-writing-modes/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-010.png b/tests/wpt/tests/css/css-writing-modes/support/text-orientation-010.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-010.png rename to tests/wpt/tests/css/css-writing-modes/support/text-orientation-010.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-012.png b/tests/wpt/tests/css/css-writing-modes/support/text-orientation-012.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-012.png rename to tests/wpt/tests/css/css-writing-modes/support/text-orientation-012.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-mixed-vrl-002.png b/tests/wpt/tests/css/css-writing-modes/support/text-orientation-mixed-vrl-002.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-mixed-vrl-002.png rename to tests/wpt/tests/css/css-writing-modes/support/text-orientation-mixed-vrl-002.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-sideways-left-001.png b/tests/wpt/tests/css/css-writing-modes/support/text-orientation-sideways-left-001.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-sideways-left-001.png rename to tests/wpt/tests/css/css-writing-modes/support/text-orientation-sideways-left-001.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-sideways-lr.png b/tests/wpt/tests/css/css-writing-modes/support/text-orientation-sideways-lr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-sideways-lr.png rename to tests/wpt/tests/css/css-writing-modes/support/text-orientation-sideways-lr.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-sideways-right-001.png b/tests/wpt/tests/css/css-writing-modes/support/text-orientation-sideways-right-001.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-sideways-right-001.png rename to tests/wpt/tests/css/css-writing-modes/support/text-orientation-sideways-right-001.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-upright-001.png b/tests/wpt/tests/css/css-writing-modes/support/text-orientation-upright-001.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-upright-001.png rename to tests/wpt/tests/css/css-writing-modes/support/text-orientation-upright-001.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-upright-vrl-002.png b/tests/wpt/tests/css/css-writing-modes/support/text-orientation-upright-vrl-002.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation-upright-vrl-002.png rename to tests/wpt/tests/css/css-writing-modes/support/text-orientation-upright-vrl-002.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation.js b/tests/wpt/tests/css/css-writing-modes/support/text-orientation.js similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/text-orientation.js rename to tests/wpt/tests/css/css-writing-modes/support/text-orientation.js diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/width-test.css b/tests/wpt/tests/css/css-writing-modes/support/width-test.css similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/width-test.css rename to tests/wpt/tests/css/css-writing-modes/support/width-test.css diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/wm-propagation-body-003-exp-res.png b/tests/wpt/tests/css/css-writing-modes/support/wm-propagation-body-003-exp-res.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/wm-propagation-body-003-exp-res.png rename to tests/wpt/tests/css/css-writing-modes/support/wm-propagation-body-003-exp-res.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/wm-propagation-body-035-exp-res.png b/tests/wpt/tests/css/css-writing-modes/support/wm-propagation-body-035-exp-res.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/wm-propagation-body-035-exp-res.png rename to tests/wpt/tests/css/css-writing-modes/support/wm-propagation-body-035-exp-res.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/world.png b/tests/wpt/tests/css/css-writing-modes/support/world.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/world.png rename to tests/wpt/tests/css/css-writing-modes/support/world.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/yellow-square-59x59.png b/tests/wpt/tests/css/css-writing-modes/support/yellow-square-59x59.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/yellow-square-59x59.png rename to tests/wpt/tests/css/css-writing-modes/support/yellow-square-59x59.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/yellow-square-horiz-redline-bottom-59x59.png b/tests/wpt/tests/css/css-writing-modes/support/yellow-square-horiz-redline-bottom-59x59.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/yellow-square-horiz-redline-bottom-59x59.png rename to tests/wpt/tests/css/css-writing-modes/support/yellow-square-horiz-redline-bottom-59x59.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/yellow-square-vert-redline-center-59x59.png b/tests/wpt/tests/css/css-writing-modes/support/yellow-square-vert-redline-center-59x59.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/yellow-square-vert-redline-center-59x59.png rename to tests/wpt/tests/css/css-writing-modes/support/yellow-square-vert-redline-center-59x59.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/yellow-square-vert-redline-left-59x59.png b/tests/wpt/tests/css/css-writing-modes/support/yellow-square-vert-redline-left-59x59.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/yellow-square-vert-redline-left-59x59.png rename to tests/wpt/tests/css/css-writing-modes/support/yellow-square-vert-redline-left-59x59.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/yellow-square-vert-redline-right-59x59.png b/tests/wpt/tests/css/css-writing-modes/support/yellow-square-vert-redline-right-59x59.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/yellow-square-vert-redline-right-59x59.png rename to tests/wpt/tests/css/css-writing-modes/support/yellow-square-vert-redline-right-59x59.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/zh+arabic.png b/tests/wpt/tests/css/css-writing-modes/support/zh+arabic.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/zh+arabic.png rename to tests/wpt/tests/css/css-writing-modes/support/zh+arabic.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/zh+latin.png b/tests/wpt/tests/css/css-writing-modes/support/zh+latin.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/zh+latin.png rename to tests/wpt/tests/css/css-writing-modes/support/zh+latin.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/zh-orientation.png b/tests/wpt/tests/css/css-writing-modes/support/zh-orientation.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/zh-orientation.png rename to tests/wpt/tests/css/css-writing-modes/support/zh-orientation.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/zh_ar_wrap.png b/tests/wpt/tests/css/css-writing-modes/support/zh_ar_wrap.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/zh_ar_wrap.png rename to tests/wpt/tests/css/css-writing-modes/support/zh_ar_wrap.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/support/zh_en_wrap.png b/tests/wpt/tests/css/css-writing-modes/support/zh_en_wrap.png similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/support/zh_en_wrap.png rename to tests/wpt/tests/css/css-writing-modes/support/zh_en_wrap.png diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/svg-aliasing-001.html b/tests/wpt/tests/css/css-writing-modes/svg-aliasing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/svg-aliasing-001.html rename to tests/wpt/tests/css/css-writing-modes/svg-aliasing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/svg-aliasing-002.html b/tests/wpt/tests/css/css-writing-modes/svg-aliasing-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/svg-aliasing-002.html rename to tests/wpt/tests/css/css-writing-modes/svg-aliasing-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-cell-001.html b/tests/wpt/tests/css/css-writing-modes/table-cell-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-cell-001.html rename to tests/wpt/tests/css/css-writing-modes/table-cell-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-cell-002.html b/tests/wpt/tests/css/css-writing-modes/table-cell-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-cell-002.html rename to tests/wpt/tests/css/css-writing-modes/table-cell-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-002.xht b/tests/wpt/tests/css/css-writing-modes/table-column-order-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-002.xht rename to tests/wpt/tests/css/css-writing-modes/table-column-order-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-003.xht b/tests/wpt/tests/css/css-writing-modes/table-column-order-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-003.xht rename to tests/wpt/tests/css/css-writing-modes/table-column-order-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-004.xht b/tests/wpt/tests/css/css-writing-modes/table-column-order-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-004.xht rename to tests/wpt/tests/css/css-writing-modes/table-column-order-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-005.xht b/tests/wpt/tests/css/css-writing-modes/table-column-order-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-005.xht rename to tests/wpt/tests/css/css-writing-modes/table-column-order-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-slr-007.xht b/tests/wpt/tests/css/css-writing-modes/table-column-order-slr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-slr-007.xht rename to tests/wpt/tests/css/css-writing-modes/table-column-order-slr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-srl-006.xht b/tests/wpt/tests/css/css-writing-modes/table-column-order-srl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-srl-006.xht rename to tests/wpt/tests/css/css-writing-modes/table-column-order-srl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-001-ref.html b/tests/wpt/tests/css/css-writing-modes/table-progression-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-002-ref.html b/tests/wpt/tests/css/css-writing-modes/table-progression-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-002-ref.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-slr-001-ref.html b/tests/wpt/tests/css/css-writing-modes/table-progression-slr-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-slr-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-slr-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-slr-001.html b/tests/wpt/tests/css/css-writing-modes/table-progression-slr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-slr-001.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-slr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-slr-002.html b/tests/wpt/tests/css/css-writing-modes/table-progression-slr-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-slr-002.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-slr-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-srl-001.html b/tests/wpt/tests/css/css-writing-modes/table-progression-srl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-srl-001.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-srl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-srl-002.html b/tests/wpt/tests/css/css-writing-modes/table-progression-srl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-srl-002.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-srl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vlr-001.html b/tests/wpt/tests/css/css-writing-modes/table-progression-vlr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vlr-001.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-vlr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vlr-002.html b/tests/wpt/tests/css/css-writing-modes/table-progression-vlr-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vlr-002.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-vlr-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vlr-003.html b/tests/wpt/tests/css/css-writing-modes/table-progression-vlr-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vlr-003.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-vlr-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vlr-004.html b/tests/wpt/tests/css/css-writing-modes/table-progression-vlr-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vlr-004.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-vlr-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vrl-001.html b/tests/wpt/tests/css/css-writing-modes/table-progression-vrl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vrl-001.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-vrl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vrl-002.html b/tests/wpt/tests/css/css-writing-modes/table-progression-vrl-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vrl-002.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-vrl-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vrl-003.html b/tests/wpt/tests/css/css-writing-modes/table-progression-vrl-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vrl-003.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-vrl-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vrl-004.html b/tests/wpt/tests/css/css-writing-modes/table-progression-vrl-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-vrl-004.html rename to tests/wpt/tests/css/css-writing-modes/table-progression-vrl-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/tcy-white-space-processing-001.html b/tests/wpt/tests/css/css-writing-modes/tcy-white-space-processing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/tcy-white-space-processing-001.html rename to tests/wpt/tests/css/css-writing-modes/tcy-white-space-processing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/tcy-white-space-processing-002.html b/tests/wpt/tests/css/css-writing-modes/tcy-white-space-processing-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/tcy-white-space-processing-002.html rename to tests/wpt/tests/css/css-writing-modes/tcy-white-space-processing-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/tcy-white-space-processing-003.html b/tests/wpt/tests/css/css-writing-modes/tcy-white-space-processing-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/tcy-white-space-processing-003.html rename to tests/wpt/tests/css/css-writing-modes/tcy-white-space-processing-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/figure-over_and_under-fail.svg b/tests/wpt/tests/css/css-writing-modes/test-plan/img/figure-over_and_under-fail.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/figure-over_and_under-fail.svg rename to tests/wpt/tests/css/css-writing-modes/test-plan/img/figure-over_and_under-fail.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/figure-over_and_under-pass.svg b/tests/wpt/tests/css/css-writing-modes/test-plan/img/figure-over_and_under-pass.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/figure-over_and_under-pass.svg rename to tests/wpt/tests/css/css-writing-modes/test-plan/img/figure-over_and_under-pass.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/figure-rendering-tcu.svg b/tests/wpt/tests/css/css-writing-modes/test-plan/img/figure-rendering-tcu.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/figure-rendering-tcu.svg rename to tests/wpt/tests/css/css-writing-modes/test-plan/img/figure-rendering-tcu.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/figure-tcufont.svg b/tests/wpt/tests/css/css-writing-modes/test-plan/img/figure-tcufont.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/figure-tcufont.svg rename to tests/wpt/tests/css/css-writing-modes/test-plan/img/figure-tcufont.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/heavy_h.svg b/tests/wpt/tests/css/css-writing-modes/test-plan/img/heavy_h.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/heavy_h.svg rename to tests/wpt/tests/css/css-writing-modes/test-plan/img/heavy_h.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/heavy_h_rotated.svg b/tests/wpt/tests/css/css-writing-modes/test-plan/img/heavy_h_rotated.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/heavy_h_rotated.svg rename to tests/wpt/tests/css/css-writing-modes/test-plan/img/heavy_h_rotated.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/over_and_under.svg b/tests/wpt/tests/css/css-writing-modes/test-plan/img/over_and_under.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/over_and_under.svg rename to tests/wpt/tests/css/css-writing-modes/test-plan/img/over_and_under.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/pointing_right.svg b/tests/wpt/tests/css/css-writing-modes/test-plan/img/pointing_right.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/pointing_right.svg rename to tests/wpt/tests/css/css-writing-modes/test-plan/img/pointing_right.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/pointing_up.svg b/tests/wpt/tests/css/css-writing-modes/test-plan/img/pointing_up.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/pointing_up.svg rename to tests/wpt/tests/css/css-writing-modes/test-plan/img/pointing_up.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/square_black.svg b/tests/wpt/tests/css/css-writing-modes/test-plan/img/square_black.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/square_black.svg rename to tests/wpt/tests/css/css-writing-modes/test-plan/img/square_black.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/square_blank.svg b/tests/wpt/tests/css/css-writing-modes/test-plan/img/square_blank.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/square_blank.svg rename to tests/wpt/tests/css/css-writing-modes/test-plan/img/square_blank.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/stripe_double.svg b/tests/wpt/tests/css/css-writing-modes/test-plan/img/stripe_double.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/stripe_double.svg rename to tests/wpt/tests/css/css-writing-modes/test-plan/img/stripe_double.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/stripe_quad.svg b/tests/wpt/tests/css/css-writing-modes/test-plan/img/stripe_quad.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/stripe_quad.svg rename to tests/wpt/tests/css/css-writing-modes/test-plan/img/stripe_quad.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/stripe_triple.svg b/tests/wpt/tests/css/css-writing-modes/test-plan/img/stripe_triple.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/img/stripe_triple.svg rename to tests/wpt/tests/css/css-writing-modes/test-plan/img/stripe_triple.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/index.html b/tests/wpt/tests/css/css-writing-modes/test-plan/index.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/index.html rename to tests/wpt/tests/css/css-writing-modes/test-plan/index.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/req-tcu-font.html b/tests/wpt/tests/css/css-writing-modes/test-plan/req-tcu-font.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/test-plan/req-tcu-font.html rename to tests/wpt/tests/css/css-writing-modes/test-plan/req-tcu-font.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-009-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vlr-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-009-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vlr-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-011.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vlr-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-011.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vlr-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-013.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vlr-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-013.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vlr-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-015.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vlr-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-015.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vlr-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-017.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vlr-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-017.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vlr-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-019.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vlr-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vlr-019.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vlr-019.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vrl-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vrl-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-010.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vrl-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-010.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vrl-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-014.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vrl-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-014.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vrl-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-016.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vrl-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-016.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vrl-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-018.xht b/tests/wpt/tests/css/css-writing-modes/text-align-vrl-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-align-vrl-018.xht rename to tests/wpt/tests/css/css-writing-modes/text-align-vrl-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-slr-009-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-baseline-slr-009-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-slr-009-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-baseline-slr-009-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-slr-009.xht b/tests/wpt/tests/css/css-writing-modes/text-baseline-slr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-slr-009.xht rename to tests/wpt/tests/css/css-writing-modes/text-baseline-slr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-srl-008.xht b/tests/wpt/tests/css/css-writing-modes/text-baseline-srl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-srl-008.xht rename to tests/wpt/tests/css/css-writing-modes/text-baseline-srl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/text-baseline-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/text-baseline-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/text-baseline-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/text-baseline-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/text-baseline-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/text-baseline-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-baseline-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-baseline-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/text-baseline-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/text-baseline-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/text-baseline-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/text-baseline-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vrl-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-baseline-vrl-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vrl-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-baseline-vrl-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/text-baseline-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/text-baseline-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-all-001-manual.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-all-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-all-001-manual.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-all-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-all-002-manual.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-all-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-all-002-manual.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-all-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-break-inside-001-ref.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-break-inside-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-break-inside-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-break-inside-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-break-inside-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-break-inside-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-break-inside-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-break-inside-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-break-inside-001a.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-break-inside-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-break-inside-001a.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-break-inside-001a.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-001-ref.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-002-ref.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-002-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-002.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-002.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-003-ref.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-003-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-003.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-003.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-004-ref.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-004-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-004.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-004.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-004.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-005-ref.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-005-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-005.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-005.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-005.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-005a.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-005a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-005a.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-005a.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-006-ref.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-006-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-006.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-006.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-006.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-006a.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-006a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-006a.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-006a.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-007-ref.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-007-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-007.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-compression-007.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-compression-007.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-decorations-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-decorations-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-decorations-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-decorations-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-digits-001-manual.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-digits-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-digits-001-manual.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-digits-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-digits-002-manual.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-digits-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-digits-002-manual.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-digits-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-digits-004-manual.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-digits-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-digits-004-manual.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-digits-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-inherit-all-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-inherit-all-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-inherit-all-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-inherit-all-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-inherit-all-002.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-inherit-all-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-inherit-all-002.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-inherit-all-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-layout-rules-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-layout-rules-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-layout-rules-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-layout-rules-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-line-breaking-rules-001-ref.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-line-breaking-rules-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-line-breaking-rules-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-line-breaking-rules-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-line-breaking-rules-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-line-breaking-rules-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-line-breaking-rules-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-line-breaking-rules-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-parsing-digits-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-parsing-digits-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-002.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-parsing-digits-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-002.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-parsing-digits-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-parsing-invalid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-parsing-invalid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-002.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-parsing-invalid-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-002.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-parsing-invalid-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-valid-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-parsing-valid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-valid-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-parsing-valid-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-shadow-ref.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-shadow-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-shadow-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-shadow.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-shadow.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-shadow.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-sideways-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-sideways-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-sideways-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-sideways-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-sideways-002.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-sideways-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-sideways-002.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-sideways-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-all-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-all-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-all-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-all-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-all-002.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-all-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-all-002.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-all-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-all-003.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-all-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-all-003.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-all-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits2-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits2-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-002.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits2-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-002.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits2-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-003.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits2-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-003.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits2-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits3-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits3-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-002.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits3-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-002.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits3-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-003.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits3-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-003.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits3-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits4-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits4-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-002.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits4-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-002.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits4-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-003.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits4-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-003.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-digits4-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-none-001.html b/tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-none-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-none-001.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-upright-value-none-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-webkit-crash.html b/tests/wpt/tests/css/css-writing-modes/text-combine-webkit-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-webkit-crash.html rename to tests/wpt/tests/css/css-writing-modes/text-combine-webkit-crash.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-sideways-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/text-decoration-sideways-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-sideways-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/text-decoration-sideways-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-sideways-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/text-decoration-sideways-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-sideways-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/text-decoration-sideways-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-sideways-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/text-decoration-sideways-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-sideways-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/text-decoration-sideways-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-sideways-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/text-decoration-sideways-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-sideways-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/text-decoration-sideways-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-sideways-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/text-decoration-sideways-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-sideways-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/text-decoration-sideways-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-sideways-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/text-decoration-sideways-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-sideways-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/text-decoration-sideways-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-upright-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/text-decoration-upright-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-upright-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/text-decoration-upright-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-upright-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/text-decoration-upright-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-upright-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/text-decoration-upright-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-upright-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/text-decoration-upright-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-upright-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/text-decoration-upright-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-upright-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/text-decoration-upright-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-upright-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/text-decoration-upright-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-upright-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/text-decoration-upright-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-upright-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/text-decoration-upright-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-upright-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/text-decoration-upright-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-decoration-upright-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/text-decoration-upright-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-003-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vlr-003-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-003-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vlr-003-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-005-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vlr-005-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-005-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vlr-005-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-007.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vlr-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-007.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vlr-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-009.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vlr-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-009.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vlr-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-011-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vlr-011-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-011-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vlr-011-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-011.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vlr-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-011.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vlr-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-013-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vlr-013-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-013-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vlr-013-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-013.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vlr-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-013.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vlr-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-015.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vlr-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-015.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vlr-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-017.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vlr-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vlr-017.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vlr-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vrl-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vrl-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vrl-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vrl-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-006.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vrl-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-006.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vrl-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vrl-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vrl-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-008.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vrl-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-008.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vrl-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-010-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vrl-010-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-010-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vrl-010-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-010.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vrl-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-010.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vrl-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-012-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vrl-012-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-012-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vrl-012-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-014.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vrl-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-014.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vrl-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-016.xht b/tests/wpt/tests/css/css-writing-modes/text-indent-vrl-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-indent-vrl-016.xht rename to tests/wpt/tests/css/css-writing-modes/text-indent-vrl-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-010.xht b/tests/wpt/tests/css/css-writing-modes/text-orientation-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-010.xht rename to tests/wpt/tests/css/css-writing-modes/text-orientation-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-011.xht b/tests/wpt/tests/css/css-writing-modes/text-orientation-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-011.xht rename to tests/wpt/tests/css/css-writing-modes/text-orientation-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-012.xht b/tests/wpt/tests/css/css-writing-modes/text-orientation-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-012.xht rename to tests/wpt/tests/css/css-writing-modes/text-orientation-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-016-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-orientation-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-016-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-orientation-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-016.xht b/tests/wpt/tests/css/css-writing-modes/text-orientation-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-016.xht rename to tests/wpt/tests/css/css-writing-modes/text-orientation-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-initial-ref.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-initial-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-initial-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-initial-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-initial.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-initial.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-slr-015.xht b/tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-slr-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-slr-015.xht rename to tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-slr-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-srl-016-ref.xht b/tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-srl-016-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-srl-016-ref.xht rename to tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-srl-016-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-srl-016.xht b/tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-srl-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-srl-016.xht rename to tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-srl-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-vlr-100-ref.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-vlr-100-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-vlr-100-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-vlr-100-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-vlr-100.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-vlr-100.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-vlr-100.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-vlr-100.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-vrl-100-ref.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-vrl-100-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-vrl-100-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-vrl-100-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-vrl-100.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-vrl-100.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-vrl-100.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-mixed-vrl-100.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-parsing-001.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-parsing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-parsing-001.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-parsing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-parsing-sideways-right-001.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-parsing-sideways-right-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-parsing-sideways-right-001.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-parsing-sideways-right-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-001.xht b/tests/wpt/tests/css/css-writing-modes/text-orientation-sideways-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-001.xht rename to tests/wpt/tests/css/css-writing-modes/text-orientation-sideways-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-slr-019.xht b/tests/wpt/tests/css/css-writing-modes/text-orientation-sideways-slr-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-slr-019.xht rename to tests/wpt/tests/css/css-writing-modes/text-orientation-sideways-slr-019.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-vlr-100-ref.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-sideways-vlr-100-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-vlr-100-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-sideways-vlr-100-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-vlr-100.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-sideways-vlr-100.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-vlr-100.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-sideways-vlr-100.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-vrl-100-ref.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-sideways-vrl-100-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-vrl-100-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-sideways-vrl-100-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-vrl-100.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-sideways-vrl-100.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-vrl-100.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-sideways-vrl-100.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-directionality-001-ref.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-upright-directionality-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-directionality-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-upright-directionality-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-directionality-001.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-upright-directionality-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-directionality-001.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-upright-directionality-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-slr-017.xht b/tests/wpt/tests/css/css-writing-modes/text-orientation-upright-slr-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-slr-017.xht rename to tests/wpt/tests/css/css-writing-modes/text-orientation-upright-slr-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-srl-018.xht b/tests/wpt/tests/css/css-writing-modes/text-orientation-upright-srl-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-srl-018.xht rename to tests/wpt/tests/css/css-writing-modes/text-orientation-upright-srl-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-vlr-100-ref.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-upright-vlr-100-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-vlr-100-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-upright-vlr-100-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-vlr-100.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-upright-vlr-100.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-vlr-100.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-upright-vlr-100.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/text-orientation-upright-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/text-orientation-upright-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-vrl-100-ref.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-upright-vrl-100-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-vrl-100-ref.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-upright-vrl-100-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-vrl-100.html b/tests/wpt/tests/css/css-writing-modes/text-orientation-upright-vrl-100.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-vrl-100.html rename to tests/wpt/tests/css/css-writing-modes/text-orientation-upright-vrl-100.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-shadow-orientation-upright-001.html b/tests/wpt/tests/css/css-writing-modes/text-shadow-orientation-upright-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-shadow-orientation-upright-001.html rename to tests/wpt/tests/css/css-writing-modes/text-shadow-orientation-upright-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-underline-position-alphabetic-001.xht b/tests/wpt/tests/css/css-writing-modes/text-underline-position-alphabetic-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-underline-position-alphabetic-001.xht rename to tests/wpt/tests/css/css-writing-modes/text-underline-position-alphabetic-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-underline-position-auto-001.xht b/tests/wpt/tests/css/css-writing-modes/text-underline-position-auto-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-underline-position-auto-001.xht rename to tests/wpt/tests/css/css-writing-modes/text-underline-position-auto-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-underline-position-left-001.xht b/tests/wpt/tests/css/css-writing-modes/text-underline-position-left-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-underline-position-left-001.xht rename to tests/wpt/tests/css/css-writing-modes/text-underline-position-left-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-underline-position-left-002.xht b/tests/wpt/tests/css/css-writing-modes/text-underline-position-left-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-underline-position-left-002.xht rename to tests/wpt/tests/css/css-writing-modes/text-underline-position-left-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-underline-position-right-001.xht b/tests/wpt/tests/css/css-writing-modes/text-underline-position-right-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-underline-position-right-001.xht rename to tests/wpt/tests/css/css-writing-modes/text-underline-position-right-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-underline-position-right-002.xht b/tests/wpt/tests/css/css-writing-modes/text-underline-position-right-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-underline-position-right-002.xht rename to tests/wpt/tests/css/css-writing-modes/text-underline-position-right-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-underline-position-under-001.xht b/tests/wpt/tests/css/css-writing-modes/text-underline-position-under-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/text-underline-position-under-001.xht rename to tests/wpt/tests/css/css-writing-modes/text-underline-position-under-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/three-levels-of-orthogonal-flows.html b/tests/wpt/tests/css/css-writing-modes/three-levels-of-orthogonal-flows.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/three-levels-of-orthogonal-flows.html rename to tests/wpt/tests/css/css-writing-modes/three-levels-of-orthogonal-flows.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/tools/generators/generate.py b/tests/wpt/tests/css/css-writing-modes/tools/generators/generate.py similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/tools/generators/generate.py rename to tests/wpt/tests/css/css-writing-modes/tools/generators/generate.py diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/tools/generators/template.html b/tests/wpt/tests/css/css-writing-modes/tools/generators/template.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/tools/generators/template.html rename to tests/wpt/tests/css/css-writing-modes/tools/generators/template.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/tooltip-display-vertical-001-manual.html b/tests/wpt/tests/css/css-writing-modes/tooltip-display-vertical-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/tooltip-display-vertical-001-manual.html rename to tests/wpt/tests/css/css-writing-modes/tooltip-display-vertical-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/two-levels-of-orthogonal-flows-fixed.html b/tests/wpt/tests/css/css-writing-modes/two-levels-of-orthogonal-flows-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/two-levels-of-orthogonal-flows-fixed.html rename to tests/wpt/tests/css/css-writing-modes/two-levels-of-orthogonal-flows-fixed.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/two-levels-of-orthogonal-flows-percentage.html b/tests/wpt/tests/css/css-writing-modes/two-levels-of-orthogonal-flows-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/two-levels-of-orthogonal-flows-percentage.html rename to tests/wpt/tests/css/css-writing-modes/two-levels-of-orthogonal-flows-percentage.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/two-levels-of-orthogonal-flows.html b/tests/wpt/tests/css/css-writing-modes/two-levels-of-orthogonal-flows.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/two-levels-of-orthogonal-flows.html rename to tests/wpt/tests/css/css-writing-modes/two-levels-of-orthogonal-flows.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/underline-font-size-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/underline-font-size-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/underline-font-size-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/underline-font-size-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/underline-font-size-vlr-005.xht b/tests/wpt/tests/css/css-writing-modes/underline-font-size-vlr-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/underline-font-size-vlr-005.xht rename to tests/wpt/tests/css/css-writing-modes/underline-font-size-vlr-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/underline-font-size-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/underline-font-size-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/underline-font-size-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/underline-font-size-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/underline-font-size-vrl-004.xht b/tests/wpt/tests/css/css-writing-modes/underline-font-size-vrl-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/underline-font-size-vrl-004.xht rename to tests/wpt/tests/css/css-writing-modes/underline-font-size-vrl-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/underline-mixed-vlr-003.xht b/tests/wpt/tests/css/css-writing-modes/underline-mixed-vlr-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/underline-mixed-vlr-003.xht rename to tests/wpt/tests/css/css-writing-modes/underline-mixed-vlr-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/underline-mixed-vrl-002.xht b/tests/wpt/tests/css/css-writing-modes/underline-mixed-vrl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/underline-mixed-vrl-002.xht rename to tests/wpt/tests/css/css-writing-modes/underline-mixed-vrl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/unicode-bidi-parsing-001.html b/tests/wpt/tests/css/css-writing-modes/unicode-bidi-parsing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/unicode-bidi-parsing-001.html rename to tests/wpt/tests/css/css-writing-modes/unicode-bidi-parsing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/unicode-bidi-parsing-002.html b/tests/wpt/tests/css/css-writing-modes/unicode-bidi-parsing-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/unicode-bidi-parsing-002.html rename to tests/wpt/tests/css/css-writing-modes/unicode-bidi-parsing-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-002-ref.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-002-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-002-ref.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-002-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-002.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-002.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-003.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-003.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-003.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-004-ref.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-004-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-004-ref.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-004-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-004.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-004.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-004.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-004.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-005.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-005.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-005.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-005.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-006-ref.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-006-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-006-ref.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-006-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-006.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-006.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-006.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-006.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-007.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-007.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-007.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-007.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-008-ref.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-008-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-008-ref.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-008-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-008.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-008.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-008.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-008.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-009.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-009.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-009.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-009.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-029.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-029.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-029.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-029.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-031.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-031.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-031.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-031.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-033.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-033.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-033.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-033.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-035.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-035.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-035.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-035.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-037.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-037.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-037.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-037.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-039.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-039.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-039.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-039.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-041.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-041.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-041.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-041.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-049-ref.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-049-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-049-ref.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-slr-049-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-028.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-srl-028.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-028.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-srl-028.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-030.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-srl-030.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-030.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-srl-030.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-032.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-srl-032.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-032.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-srl-032.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-034.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-srl-034.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-034.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-srl-034.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-036.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-srl-036.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-036.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-srl-036.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-038.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-srl-038.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-038.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-srl-038.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-040.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-srl-040.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-040.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-srl-040.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-011.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-011.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-011.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-011.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-013.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-013.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-013.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-013.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-015.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-015.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-015.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-015.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-017.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-017.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-017.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-017.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-019.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-019.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-019.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-019.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-021.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-021.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-021.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-021.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-023.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-023.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-023.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-023.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-025.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-025.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-025.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-025.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-027.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-027.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vlr-027.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vlr-027.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-010.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-010.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-010.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-010.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-012.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-012.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-012.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-012.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-014.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-014.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-014.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-014.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-016.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-016.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-016.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-016.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-018.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-018.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-018.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-018.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-020.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-020.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-020.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-020.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-022-ref.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-022-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-022-ref.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-022-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-022.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-022.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-022.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-022.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-024.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-024.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-024.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-024.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-026-ref.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-026-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-026-ref.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-026-ref.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-026.xht b/tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-026.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-vrl-026.xht rename to tests/wpt/tests/css/css-writing-modes/vertical-alignment-vrl-026.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vlr-text-orientation-sideways-alongside-vlr-floats-ref.html b/tests/wpt/tests/css/css-writing-modes/vlr-text-orientation-sideways-alongside-vlr-floats-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vlr-text-orientation-sideways-alongside-vlr-floats-ref.html rename to tests/wpt/tests/css/css-writing-modes/vlr-text-orientation-sideways-alongside-vlr-floats-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vlr-text-orientation-sideways-alongside-vlr-floats.html b/tests/wpt/tests/css/css-writing-modes/vlr-text-orientation-sideways-alongside-vlr-floats.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vlr-text-orientation-sideways-alongside-vlr-floats.html rename to tests/wpt/tests/css/css-writing-modes/vlr-text-orientation-sideways-alongside-vlr-floats.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vrl-inline-paint-invalidation.html b/tests/wpt/tests/css/css-writing-modes/vrl-inline-paint-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vrl-inline-paint-invalidation.html rename to tests/wpt/tests/css/css-writing-modes/vrl-inline-paint-invalidation.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vrl-text-orientation-sideways-alongside-vrl-floats-ref.html b/tests/wpt/tests/css/css-writing-modes/vrl-text-orientation-sideways-alongside-vrl-floats-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vrl-text-orientation-sideways-alongside-vrl-floats-ref.html rename to tests/wpt/tests/css/css-writing-modes/vrl-text-orientation-sideways-alongside-vrl-floats-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vrl-text-orientation-sideways-alongside-vrl-floats.html b/tests/wpt/tests/css/css-writing-modes/vrl-text-orientation-sideways-alongside-vrl-floats.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/vrl-text-orientation-sideways-alongside-vrl-floats.html rename to tests/wpt/tests/css/css-writing-modes/vrl-text-orientation-sideways-alongside-vrl-floats.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-001-ref.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-001-ref.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-001.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-001.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-002-ref.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-002-ref.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-002.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-002.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-032.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-032.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-032.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-033-ref.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-033-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-033-ref.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-033-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-033.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-033.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-033.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-033.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-034.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-034.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-034.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-035-ref.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-035-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-035-ref.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-035-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-035.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-035.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-035.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-036.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-036.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-036.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-037.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-037.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-037.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-037.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-038.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-038.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-038.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-038.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-039.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-039.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-039.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-039.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-040.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-040.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-040.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-040.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-041.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-041.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-041.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-042-ref.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-042-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-042-ref.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-042-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-042.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-042.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-042.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-043.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-043.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-043.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-043.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-044-ref.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-044-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-044-ref.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-044-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-044.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-044.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-044.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-045.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-045.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-045.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-046.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-046.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-046.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-047-ref.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-047-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-047-ref.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-047-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-047.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-047.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-047.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-048.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-048.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-048.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-049-ref.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-049-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-049-ref.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-049-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-049.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-049.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-049.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-050.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-050.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-050.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-051.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-051.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-051.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-052.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-052.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-052.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-053.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-053.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-053.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-053.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-054-ref.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-054-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-054-ref.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-054-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-054.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-054.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-054.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-054.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-055.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-055.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-055.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-055.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-computed-direction-001.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-computed-direction-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-computed-direction-001.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-computed-direction-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-computed-direction-002.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-computed-direction-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-computed-direction-002.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-computed-direction-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-computed-root.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-computed-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-computed-root.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-computed-root.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-contain-root-ref.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-contain-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-contain-root-ref.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-contain-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-contain-root.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-contain-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-contain-root.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-contain-root.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-dynamic-change-001.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-dynamic-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-dynamic-change-001.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-dynamic-change-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-dynamic-change-002-ref.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-dynamic-change-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-dynamic-change-002-ref.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-dynamic-change-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-dynamic-change-002.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-dynamic-change-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-dynamic-change-002.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-dynamic-change-002.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-dynamic-change-003-ref.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-dynamic-change-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-dynamic-change-003-ref.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-dynamic-change-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-dynamic-change-003.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-dynamic-change-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-dynamic-change-003.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-dynamic-change-003.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-scroll-offset-vertical-lr.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-scroll-offset-vertical-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-scroll-offset-vertical-lr.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-scroll-offset-vertical-lr.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-scroll-offset-vertical-rl.html b/tests/wpt/tests/css/css-writing-modes/wm-propagation-body-scroll-offset-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-scroll-offset-vertical-rl.html rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-body-scroll-offset-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-svg-root-scrollbar.svg b/tests/wpt/tests/css/css-writing-modes/wm-propagation-svg-root-scrollbar.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-svg-root-scrollbar.svg rename to tests/wpt/tests/css/css-writing-modes/wm-propagation-svg-root-scrollbar.svg diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-horizontal-001l.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-horizontal-001l.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-horizontal-001l.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-horizontal-001l.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-horizontal-001r.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-horizontal-001r.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-horizontal-001r.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-horizontal-001r.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-initial-ref.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-initial-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-initial-ref.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-initial-ref.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-initial.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-initial.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-initial.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-001.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-parsing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-001.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-parsing-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-sideways-lr-001.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-parsing-sideways-lr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-sideways-lr-001.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-parsing-sideways-lr-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-sideways-rl-001.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-parsing-sideways-rl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-sideways-rl-001.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-parsing-sideways-rl-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-svg1-001.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-parsing-svg1-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-svg1-001.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-parsing-svg1-001.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-lr-002.xht b/tests/wpt/tests/css/css-writing-modes/writing-mode-vertical-lr-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-lr-002.xht rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vertical-lr-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-001.xht b/tests/wpt/tests/css/css-writing-modes/writing-mode-vertical-rl-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-001.xht rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vertical-rl-001.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-002.xht b/tests/wpt/tests/css/css-writing-modes/writing-mode-vertical-rl-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-002.xht rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vertical-rl-002.xht diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-003-ref.htm b/tests/wpt/tests/css/css-writing-modes/writing-mode-vertical-rl-003-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-003-ref.htm rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vertical-rl-003-ref.htm diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-003.htm b/tests/wpt/tests/css/css-writing-modes/writing-mode-vertical-rl-003.htm similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vertical-rl-003.htm rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vertical-rl-003.htm diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-001-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-001-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-002-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-002-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-003-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-003-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-005-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-005-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-005-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-006-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-006-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-006-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-007-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-007-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-007-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-007-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-008-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-008-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-008-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-008-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-009-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-009-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-009-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-009-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-010-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-010-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-010-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-010-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-012-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-012-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-012-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-012-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-014-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-014-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-014-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-014-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-015-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-015-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-015-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-015-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-table-001-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-table-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-table-001-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-table-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-table-002-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-table-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vlr-table-002-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vlr-table-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-001-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-001-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-002-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-002-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-003-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-003-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-005-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-005-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-005-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-007-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-007-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-007-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-007-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-008-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-008-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-008-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-008-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-009-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-009-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-009-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-009-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-010-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-010-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-010-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-010-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-012-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-012-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-012-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-012-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-014-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-014-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-014-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-014-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-015-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-015-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-015-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-015-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-forms-001-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-forms-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-forms-001-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-forms-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-forms-002-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-forms-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-forms-002-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-forms-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-forms-003-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-forms-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-forms-003-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-forms-003-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-forms-004-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-forms-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-forms-004-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-forms-004-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-forms-005-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-forms-005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-forms-005-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-forms-005-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-forms-006-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-forms-006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-forms-006-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-forms-006-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-table-001-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-table-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-table-001-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-table-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-table-002-manual.html b/tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-table-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-vrl-table-002-manual.html rename to tests/wpt/tests/css/css-writing-modes/writing-mode-vrl-table-002-manual.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/CaretPosition-001.html b/tests/wpt/tests/css/cssom-view/CaretPosition-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/CaretPosition-001.html rename to tests/wpt/tests/css/cssom-view/CaretPosition-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/DOMRectList.html b/tests/wpt/tests/css/cssom-view/DOMRectList.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/DOMRectList.html rename to tests/wpt/tests/css/cssom-view/DOMRectList.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/GetBoundingRect.html b/tests/wpt/tests/css/cssom-view/GetBoundingRect.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/GetBoundingRect.html rename to tests/wpt/tests/css/cssom-view/GetBoundingRect.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/HTMLBody-ScrollArea_quirksmode.html b/tests/wpt/tests/css/cssom-view/HTMLBody-ScrollArea_quirksmode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/HTMLBody-ScrollArea_quirksmode.html rename to tests/wpt/tests/css/cssom-view/HTMLBody-ScrollArea_quirksmode.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/HTMLImageElement-x-and-y-ignore-transforms.html b/tests/wpt/tests/css/cssom-view/HTMLImageElement-x-and-y-ignore-transforms.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/HTMLImageElement-x-and-y-ignore-transforms.html rename to tests/wpt/tests/css/cssom-view/HTMLImageElement-x-and-y-ignore-transforms.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/META.yml b/tests/wpt/tests/css/cssom-view/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/META.yml rename to tests/wpt/tests/css/cssom-view/META.yml diff --git a/tests/wpt/web-platform-tests/css/cssom-view/MediaQueryList-addListener-handleEvent.html b/tests/wpt/tests/css/cssom-view/MediaQueryList-addListener-handleEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/MediaQueryList-addListener-handleEvent.html rename to tests/wpt/tests/css/cssom-view/MediaQueryList-addListener-handleEvent.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/MediaQueryList-addListener-removeListener.html b/tests/wpt/tests/css/cssom-view/MediaQueryList-addListener-removeListener.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/MediaQueryList-addListener-removeListener.html rename to tests/wpt/tests/css/cssom-view/MediaQueryList-addListener-removeListener.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/MediaQueryList-change-event-matches-value.html b/tests/wpt/tests/css/cssom-view/MediaQueryList-change-event-matches-value.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/MediaQueryList-change-event-matches-value.html rename to tests/wpt/tests/css/cssom-view/MediaQueryList-change-event-matches-value.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/MediaQueryList-extends-EventTarget-interop.html b/tests/wpt/tests/css/cssom-view/MediaQueryList-extends-EventTarget-interop.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/MediaQueryList-extends-EventTarget-interop.html rename to tests/wpt/tests/css/cssom-view/MediaQueryList-extends-EventTarget-interop.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/MediaQueryList-extends-EventTarget.html b/tests/wpt/tests/css/cssom-view/MediaQueryList-extends-EventTarget.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/MediaQueryList-extends-EventTarget.html rename to tests/wpt/tests/css/cssom-view/MediaQueryList-extends-EventTarget.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/MediaQueryListEvent.html b/tests/wpt/tests/css/cssom-view/MediaQueryListEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/MediaQueryListEvent.html rename to tests/wpt/tests/css/cssom-view/MediaQueryListEvent.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/Screen-pixelDepth-Screen-colorDepth001.html b/tests/wpt/tests/css/cssom-view/Screen-pixelDepth-Screen-colorDepth001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/Screen-pixelDepth-Screen-colorDepth001.html rename to tests/wpt/tests/css/cssom-view/Screen-pixelDepth-Screen-colorDepth001.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/add-background-attachment-fixed-during-smooth-scroll-ref.html b/tests/wpt/tests/css/cssom-view/add-background-attachment-fixed-during-smooth-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/add-background-attachment-fixed-during-smooth-scroll-ref.html rename to tests/wpt/tests/css/cssom-view/add-background-attachment-fixed-during-smooth-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/add-background-attachment-fixed-during-smooth-scroll.html b/tests/wpt/tests/css/cssom-view/add-background-attachment-fixed-during-smooth-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/add-background-attachment-fixed-during-smooth-scroll.html rename to tests/wpt/tests/css/cssom-view/add-background-attachment-fixed-during-smooth-scroll.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/background-change-during-smooth-scroll.html b/tests/wpt/tests/css/cssom-view/background-change-during-smooth-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/background-change-during-smooth-scroll.html rename to tests/wpt/tests/css/cssom-view/background-change-during-smooth-scroll.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/checkVisibility.html b/tests/wpt/tests/css/cssom-view/checkVisibility.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/checkVisibility.html rename to tests/wpt/tests/css/cssom-view/checkVisibility.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/client-props-inline-list-item.html b/tests/wpt/tests/css/cssom-view/client-props-inline-list-item.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/client-props-inline-list-item.html rename to tests/wpt/tests/css/cssom-view/client-props-inline-list-item.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/client-props-input.html b/tests/wpt/tests/css/cssom-view/client-props-input.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/client-props-input.html rename to tests/wpt/tests/css/cssom-view/client-props-input.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/client-props-root-display-none-crash.html b/tests/wpt/tests/css/cssom-view/client-props-root-display-none-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/client-props-root-display-none-crash.html rename to tests/wpt/tests/css/cssom-view/client-props-root-display-none-crash.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/client-props-root.html b/tests/wpt/tests/css/cssom-view/client-props-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/client-props-root.html rename to tests/wpt/tests/css/cssom-view/client-props-root.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/cssom-getBoundingClientRect-001.html b/tests/wpt/tests/css/cssom-view/cssom-getBoundingClientRect-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/cssom-getBoundingClientRect-001.html rename to tests/wpt/tests/css/cssom-view/cssom-getBoundingClientRect-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/cssom-getBoundingClientRect-002.html b/tests/wpt/tests/css/cssom-view/cssom-getBoundingClientRect-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/cssom-getBoundingClientRect-002.html rename to tests/wpt/tests/css/cssom-view/cssom-getBoundingClientRect-002.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/cssom-getBoundingClientRect-003.html b/tests/wpt/tests/css/cssom-view/cssom-getBoundingClientRect-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/cssom-getBoundingClientRect-003.html rename to tests/wpt/tests/css/cssom-view/cssom-getBoundingClientRect-003.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/cssom-getBoundingClientRect-vertical-rl-ref.html b/tests/wpt/tests/css/cssom-view/cssom-getBoundingClientRect-vertical-rl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/cssom-getBoundingClientRect-vertical-rl-ref.html rename to tests/wpt/tests/css/cssom-view/cssom-getBoundingClientRect-vertical-rl-ref.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/cssom-getBoundingClientRect-vertical-rl.html b/tests/wpt/tests/css/cssom-view/cssom-getBoundingClientRect-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/cssom-getBoundingClientRect-vertical-rl.html rename to tests/wpt/tests/css/cssom-view/cssom-getBoundingClientRect-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/cssom-getBoxQuads-001.html b/tests/wpt/tests/css/cssom-view/cssom-getBoxQuads-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/cssom-getBoxQuads-001.html rename to tests/wpt/tests/css/cssom-view/cssom-getBoxQuads-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/cssom-getBoxQuads-002.html b/tests/wpt/tests/css/cssom-view/cssom-getBoxQuads-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/cssom-getBoxQuads-002.html rename to tests/wpt/tests/css/cssom-view/cssom-getBoxQuads-002.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/cssom-getClientRects-002.html b/tests/wpt/tests/css/cssom-view/cssom-getClientRects-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/cssom-getClientRects-002.html rename to tests/wpt/tests/css/cssom-view/cssom-getClientRects-002.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/cssom-getClientRects.html b/tests/wpt/tests/css/cssom-view/cssom-getClientRects.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/cssom-getClientRects.html rename to tests/wpt/tests/css/cssom-view/cssom-getClientRects.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/cssom-view-img-attributes-001.html b/tests/wpt/tests/css/cssom-view/cssom-view-img-attributes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/cssom-view-img-attributes-001.html rename to tests/wpt/tests/css/cssom-view/cssom-view-img-attributes-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/cssom-view-window-screen-interface.html b/tests/wpt/tests/css/cssom-view/cssom-view-window-screen-interface.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/cssom-view-window-screen-interface.html rename to tests/wpt/tests/css/cssom-view/cssom-view-window-screen-interface.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/devicePixelRatio-undisplayed-iframe.tentative.html b/tests/wpt/tests/css/cssom-view/devicePixelRatio-undisplayed-iframe.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/devicePixelRatio-undisplayed-iframe.tentative.html rename to tests/wpt/tests/css/cssom-view/devicePixelRatio-undisplayed-iframe.tentative.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/dom-element-scroll.html b/tests/wpt/tests/css/cssom-view/dom-element-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/dom-element-scroll.html rename to tests/wpt/tests/css/cssom-view/dom-element-scroll.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-001.html b/tests/wpt/tests/css/cssom-view/elementFromPoint-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-001.html rename to tests/wpt/tests/css/cssom-view/elementFromPoint-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-002.html b/tests/wpt/tests/css/cssom-view/elementFromPoint-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-002.html rename to tests/wpt/tests/css/cssom-view/elementFromPoint-002.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-003.html b/tests/wpt/tests/css/cssom-view/elementFromPoint-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-003.html rename to tests/wpt/tests/css/cssom-view/elementFromPoint-003.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-dynamic-anon-box.html b/tests/wpt/tests/css/cssom-view/elementFromPoint-dynamic-anon-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-dynamic-anon-box.html rename to tests/wpt/tests/css/cssom-view/elementFromPoint-dynamic-anon-box.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html b/tests/wpt/tests/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html rename to tests/wpt/tests/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-float-in-relative.html b/tests/wpt/tests/css/cssom-view/elementFromPoint-float-in-relative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-float-in-relative.html rename to tests/wpt/tests/css/cssom-view/elementFromPoint-float-in-relative.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-float-in-table.html b/tests/wpt/tests/css/cssom-view/elementFromPoint-float-in-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-float-in-table.html rename to tests/wpt/tests/css/cssom-view/elementFromPoint-float-in-table.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-list-001.html b/tests/wpt/tests/css/cssom-view/elementFromPoint-list-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-list-001.html rename to tests/wpt/tests/css/cssom-view/elementFromPoint-list-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-mixed-font-sizes.html b/tests/wpt/tests/css/cssom-view/elementFromPoint-mixed-font-sizes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-mixed-font-sizes.html rename to tests/wpt/tests/css/cssom-view/elementFromPoint-mixed-font-sizes.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-parameters.html b/tests/wpt/tests/css/cssom-view/elementFromPoint-parameters.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-parameters.html rename to tests/wpt/tests/css/cssom-view/elementFromPoint-parameters.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-subpixel.html b/tests/wpt/tests/css/cssom-view/elementFromPoint-subpixel.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-subpixel.html rename to tests/wpt/tests/css/cssom-view/elementFromPoint-subpixel.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html b/tests/wpt/tests/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html rename to tests/wpt/tests/css/cssom-view/elementFromPoint-visibility-hidden-resizer.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint.html b/tests/wpt/tests/css/cssom-view/elementFromPoint.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint.html rename to tests/wpt/tests/css/cssom-view/elementFromPoint.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPosition.html b/tests/wpt/tests/css/cssom-view/elementFromPosition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementFromPosition.html rename to tests/wpt/tests/css/cssom-view/elementFromPosition.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementScroll-002.html b/tests/wpt/tests/css/cssom-view/elementScroll-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementScroll-002.html rename to tests/wpt/tests/css/cssom-view/elementScroll-002.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementScroll.html b/tests/wpt/tests/css/cssom-view/elementScroll.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementScroll.html rename to tests/wpt/tests/css/cssom-view/elementScroll.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-iframes.html b/tests/wpt/tests/css/cssom-view/elementsFromPoint-iframes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-iframes.html rename to tests/wpt/tests/css/cssom-view/elementsFromPoint-iframes.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-inline-htb-ltr.html b/tests/wpt/tests/css/cssom-view/elementsFromPoint-inline-htb-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-inline-htb-ltr.html rename to tests/wpt/tests/css/cssom-view/elementsFromPoint-inline-htb-ltr.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-inline-htb-rtl.html b/tests/wpt/tests/css/cssom-view/elementsFromPoint-inline-htb-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-inline-htb-rtl.html rename to tests/wpt/tests/css/cssom-view/elementsFromPoint-inline-htb-rtl.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-inline-vlr-ltr.html b/tests/wpt/tests/css/cssom-view/elementsFromPoint-inline-vlr-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-inline-vlr-ltr.html rename to tests/wpt/tests/css/cssom-view/elementsFromPoint-inline-vlr-ltr.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-inline-vlr-rtl.html b/tests/wpt/tests/css/cssom-view/elementsFromPoint-inline-vlr-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-inline-vlr-rtl.html rename to tests/wpt/tests/css/cssom-view/elementsFromPoint-inline-vlr-rtl.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-inline-vrl-ltr.html b/tests/wpt/tests/css/cssom-view/elementsFromPoint-inline-vrl-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-inline-vrl-ltr.html rename to tests/wpt/tests/css/cssom-view/elementsFromPoint-inline-vrl-ltr.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-inline-vrl-rtl.html b/tests/wpt/tests/css/cssom-view/elementsFromPoint-inline-vrl-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-inline-vrl-rtl.html rename to tests/wpt/tests/css/cssom-view/elementsFromPoint-inline-vrl-rtl.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-invalid-cases.html b/tests/wpt/tests/css/cssom-view/elementsFromPoint-invalid-cases.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-invalid-cases.html rename to tests/wpt/tests/css/cssom-view/elementsFromPoint-invalid-cases.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-shadowroot.html b/tests/wpt/tests/css/cssom-view/elementsFromPoint-shadowroot.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-shadowroot.html rename to tests/wpt/tests/css/cssom-view/elementsFromPoint-shadowroot.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-simple.html b/tests/wpt/tests/css/cssom-view/elementsFromPoint-simple.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-simple.html rename to tests/wpt/tests/css/cssom-view/elementsFromPoint-simple.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-svg-text.html b/tests/wpt/tests/css/cssom-view/elementsFromPoint-svg-text.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-svg-text.html rename to tests/wpt/tests/css/cssom-view/elementsFromPoint-svg-text.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-svg.html b/tests/wpt/tests/css/cssom-view/elementsFromPoint-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-svg.html rename to tests/wpt/tests/css/cssom-view/elementsFromPoint-svg.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-table.html b/tests/wpt/tests/css/cssom-view/elementsFromPoint-table.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-table.html rename to tests/wpt/tests/css/cssom-view/elementsFromPoint-table.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint.html b/tests/wpt/tests/css/cssom-view/elementsFromPoint.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint.html rename to tests/wpt/tests/css/cssom-view/elementsFromPoint.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/getBoundingClientRect-empty-inline.html b/tests/wpt/tests/css/cssom-view/getBoundingClientRect-empty-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/getBoundingClientRect-empty-inline.html rename to tests/wpt/tests/css/cssom-view/getBoundingClientRect-empty-inline.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/getBoundingClientRect-shy.html b/tests/wpt/tests/css/cssom-view/getBoundingClientRect-shy.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/getBoundingClientRect-shy.html rename to tests/wpt/tests/css/cssom-view/getBoundingClientRect-shy.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/getBoundingClientRect-svg.html b/tests/wpt/tests/css/cssom-view/getBoundingClientRect-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/getBoundingClientRect-svg.html rename to tests/wpt/tests/css/cssom-view/getBoundingClientRect-svg.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/getClientRects-br-htb-ltr.html b/tests/wpt/tests/css/cssom-view/getClientRects-br-htb-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/getClientRects-br-htb-ltr.html rename to tests/wpt/tests/css/cssom-view/getClientRects-br-htb-ltr.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/getClientRects-br-htb-rtl.html b/tests/wpt/tests/css/cssom-view/getClientRects-br-htb-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/getClientRects-br-htb-rtl.html rename to tests/wpt/tests/css/cssom-view/getClientRects-br-htb-rtl.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/getClientRects-br-vlr-ltr.html b/tests/wpt/tests/css/cssom-view/getClientRects-br-vlr-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/getClientRects-br-vlr-ltr.html rename to tests/wpt/tests/css/cssom-view/getClientRects-br-vlr-ltr.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/getClientRects-br-vlr-rtl.html b/tests/wpt/tests/css/cssom-view/getClientRects-br-vlr-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/getClientRects-br-vlr-rtl.html rename to tests/wpt/tests/css/cssom-view/getClientRects-br-vlr-rtl.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/getClientRects-br-vrl-ltr.html b/tests/wpt/tests/css/cssom-view/getClientRects-br-vrl-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/getClientRects-br-vrl-ltr.html rename to tests/wpt/tests/css/cssom-view/getClientRects-br-vrl-ltr.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/getClientRects-br-vrl-rtl.html b/tests/wpt/tests/css/cssom-view/getClientRects-br-vrl-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/getClientRects-br-vrl-rtl.html rename to tests/wpt/tests/css/cssom-view/getClientRects-br-vrl-rtl.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/getClientRects-inline-atomic-child.html b/tests/wpt/tests/css/cssom-view/getClientRects-inline-atomic-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/getClientRects-inline-atomic-child.html rename to tests/wpt/tests/css/cssom-view/getClientRects-inline-atomic-child.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/getClientRects-inline-inline-child.html b/tests/wpt/tests/css/cssom-view/getClientRects-inline-inline-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/getClientRects-inline-inline-child.html rename to tests/wpt/tests/css/cssom-view/getClientRects-inline-inline-child.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/getClientRects-inline.html b/tests/wpt/tests/css/cssom-view/getClientRects-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/getClientRects-inline.html rename to tests/wpt/tests/css/cssom-view/getClientRects-inline.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/historical.html b/tests/wpt/tests/css/cssom-view/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/historical.html rename to tests/wpt/tests/css/cssom-view/historical.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/htmlelement-offset-width-001.html b/tests/wpt/tests/css/cssom-view/htmlelement-offset-width-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/htmlelement-offset-width-001.html rename to tests/wpt/tests/css/cssom-view/htmlelement-offset-width-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/idlharness.html b/tests/wpt/tests/css/cssom-view/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/idlharness.html rename to tests/wpt/tests/css/cssom-view/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/iframe.html b/tests/wpt/tests/css/cssom-view/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/iframe.html rename to tests/wpt/tests/css/cssom-view/iframe.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/inheritance.html b/tests/wpt/tests/css/cssom-view/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/inheritance.html rename to tests/wpt/tests/css/cssom-view/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/long_scroll_composited-ref.html b/tests/wpt/tests/css/cssom-view/long_scroll_composited-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/long_scroll_composited-ref.html rename to tests/wpt/tests/css/cssom-view/long_scroll_composited-ref.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/long_scroll_composited.html b/tests/wpt/tests/css/cssom-view/long_scroll_composited.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/long_scroll_composited.html rename to tests/wpt/tests/css/cssom-view/long_scroll_composited.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/matchMedia-display-none-iframe.html b/tests/wpt/tests/css/cssom-view/matchMedia-display-none-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/matchMedia-display-none-iframe.html rename to tests/wpt/tests/css/cssom-view/matchMedia-display-none-iframe.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/matchMedia.html b/tests/wpt/tests/css/cssom-view/matchMedia.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/matchMedia.html rename to tests/wpt/tests/css/cssom-view/matchMedia.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/mouseEvent-offsetXY-svg.html b/tests/wpt/tests/css/cssom-view/mouseEvent-offsetXY-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/mouseEvent-offsetXY-svg.html rename to tests/wpt/tests/css/cssom-view/mouseEvent-offsetXY-svg.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/mouseEvent.html b/tests/wpt/tests/css/cssom-view/mouseEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/mouseEvent.html rename to tests/wpt/tests/css/cssom-view/mouseEvent.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/negativeMargins.html b/tests/wpt/tests/css/cssom-view/negativeMargins.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/negativeMargins.html rename to tests/wpt/tests/css/cssom-view/negativeMargins.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/offsetParent-block-in-inline.html b/tests/wpt/tests/css/cssom-view/offsetParent-block-in-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/offsetParent-block-in-inline.html rename to tests/wpt/tests/css/cssom-view/offsetParent-block-in-inline.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/offsetParent_element_test.html b/tests/wpt/tests/css/cssom-view/offsetParent_element_test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/offsetParent_element_test.html rename to tests/wpt/tests/css/cssom-view/offsetParent_element_test.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/offsetTop-offsetLeft-nested-offsetParents.html b/tests/wpt/tests/css/cssom-view/offsetTop-offsetLeft-nested-offsetParents.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/offsetTop-offsetLeft-nested-offsetParents.html rename to tests/wpt/tests/css/cssom-view/offsetTop-offsetLeft-nested-offsetParents.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/offsetTopLeft-border-box.html b/tests/wpt/tests/css/cssom-view/offsetTopLeft-border-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/offsetTopLeft-border-box.html rename to tests/wpt/tests/css/cssom-view/offsetTopLeft-border-box.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/offsetTopLeft-empty-inline-offset.html b/tests/wpt/tests/css/cssom-view/offsetTopLeft-empty-inline-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/offsetTopLeft-empty-inline-offset.html rename to tests/wpt/tests/css/cssom-view/offsetTopLeft-empty-inline-offset.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/offsetTopLeft-empty-inline.html b/tests/wpt/tests/css/cssom-view/offsetTopLeft-empty-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/offsetTopLeft-empty-inline.html rename to tests/wpt/tests/css/cssom-view/offsetTopLeft-empty-inline.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/offsetTopLeft-inline.html b/tests/wpt/tests/css/cssom-view/offsetTopLeft-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/offsetTopLeft-inline.html rename to tests/wpt/tests/css/cssom-view/offsetTopLeft-inline.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/offsetTopLeft-leading-space-inline.html b/tests/wpt/tests/css/cssom-view/offsetTopLeft-leading-space-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/offsetTopLeft-leading-space-inline.html rename to tests/wpt/tests/css/cssom-view/offsetTopLeft-leading-space-inline.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/offsetTopLeft-trailing-space-inline.html b/tests/wpt/tests/css/cssom-view/offsetTopLeft-trailing-space-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/offsetTopLeft-trailing-space-inline.html rename to tests/wpt/tests/css/cssom-view/offsetTopLeft-trailing-space-inline.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/offsetTopLeftInScrollableParent.html b/tests/wpt/tests/css/cssom-view/offsetTopLeftInScrollableParent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/offsetTopLeftInScrollableParent.html rename to tests/wpt/tests/css/cssom-view/offsetTopLeftInScrollableParent.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/outer-svg.html b/tests/wpt/tests/css/cssom-view/outer-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/outer-svg.html rename to tests/wpt/tests/css/cssom-view/outer-svg.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/parsing/scroll-behavior-computed.html b/tests/wpt/tests/css/cssom-view/parsing/scroll-behavior-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/parsing/scroll-behavior-computed.html rename to tests/wpt/tests/css/cssom-view/parsing/scroll-behavior-computed.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/parsing/scroll-behavior-invalid.html b/tests/wpt/tests/css/cssom-view/parsing/scroll-behavior-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/parsing/scroll-behavior-invalid.html rename to tests/wpt/tests/css/cssom-view/parsing/scroll-behavior-invalid.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/parsing/scroll-behavior-valid.html b/tests/wpt/tests/css/cssom-view/parsing/scroll-behavior-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/parsing/scroll-behavior-valid.html rename to tests/wpt/tests/css/cssom-view/parsing/scroll-behavior-valid.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/position-sticky-root-scroller-with-scroll-behavior.html b/tests/wpt/tests/css/cssom-view/position-sticky-root-scroller-with-scroll-behavior.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/position-sticky-root-scroller-with-scroll-behavior.html rename to tests/wpt/tests/css/cssom-view/position-sticky-root-scroller-with-scroll-behavior.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/pt-to-px-width.html b/tests/wpt/tests/css/cssom-view/pt-to-px-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/pt-to-px-width.html rename to tests/wpt/tests/css/cssom-view/pt-to-px-width.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/range-bounding-client-rect-with-display-contents.html b/tests/wpt/tests/css/cssom-view/range-bounding-client-rect-with-display-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/range-bounding-client-rect-with-display-contents.html rename to tests/wpt/tests/css/cssom-view/range-bounding-client-rect-with-display-contents.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/resize-event-on-initial-layout.html b/tests/wpt/tests/css/cssom-view/resize-event-on-initial-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/resize-event-on-initial-layout.html rename to tests/wpt/tests/css/cssom-view/resize-event-on-initial-layout.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/resources/elementsFromPoint.js b/tests/wpt/tests/css/cssom-view/resources/elementsFromPoint.js similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/resources/elementsFromPoint.js rename to tests/wpt/tests/css/cssom-view/resources/elementsFromPoint.js diff --git a/tests/wpt/web-platform-tests/css/cssom-view/resources/iframe1.html b/tests/wpt/tests/css/cssom-view/resources/iframe1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/resources/iframe1.html rename to tests/wpt/tests/css/cssom-view/resources/iframe1.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/resources/iframe2.html b/tests/wpt/tests/css/cssom-view/resources/iframe2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/resources/iframe2.html rename to tests/wpt/tests/css/cssom-view/resources/iframe2.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/resources/matchMedia.js b/tests/wpt/tests/css/cssom-view/resources/matchMedia.js similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/resources/matchMedia.js rename to tests/wpt/tests/css/cssom-view/resources/matchMedia.js diff --git a/tests/wpt/web-platform-tests/css/cssom-view/screenLeftTop.html b/tests/wpt/tests/css/cssom-view/screenLeftTop.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/screenLeftTop.html rename to tests/wpt/tests/css/cssom-view/screenLeftTop.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-back-to-initial-position.html b/tests/wpt/tests/css/cssom-view/scroll-back-to-initial-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scroll-back-to-initial-position.html rename to tests/wpt/tests/css/cssom-view/scroll-back-to-initial-position.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-default-css.html b/tests/wpt/tests/css/cssom-view/scroll-behavior-default-css.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-default-css.html rename to tests/wpt/tests/css/cssom-view/scroll-behavior-default-css.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-element.html b/tests/wpt/tests/css/cssom-view/scroll-behavior-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-element.html rename to tests/wpt/tests/css/cssom-view/scroll-behavior-element.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-root.html b/tests/wpt/tests/css/cssom-view/scroll-behavior-main-frame-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-root.html rename to tests/wpt/tests/css/cssom-view/scroll-behavior-main-frame-root.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-window.html b/tests/wpt/tests/css/cssom-view/scroll-behavior-main-frame-window.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-window.html rename to tests/wpt/tests/css/cssom-view/scroll-behavior-main-frame-window.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-scrollintoview-nested.html b/tests/wpt/tests/css/cssom-view/scroll-behavior-scrollintoview-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-scrollintoview-nested.html rename to tests/wpt/tests/css/cssom-view/scroll-behavior-scrollintoview-nested.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-smooth-navigation.html b/tests/wpt/tests/css/cssom-view/scroll-behavior-smooth-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-smooth-navigation.html rename to tests/wpt/tests/css/cssom-view/scroll-behavior-smooth-navigation.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-smooth-positions.html b/tests/wpt/tests/css/cssom-view/scroll-behavior-smooth-positions.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-smooth-positions.html rename to tests/wpt/tests/css/cssom-view/scroll-behavior-smooth-positions.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-smooth.html b/tests/wpt/tests/css/cssom-view/scroll-behavior-smooth.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-smooth.html rename to tests/wpt/tests/css/cssom-view/scroll-behavior-smooth.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-subframe-root.html b/tests/wpt/tests/css/cssom-view/scroll-behavior-subframe-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-subframe-root.html rename to tests/wpt/tests/css/cssom-view/scroll-behavior-subframe-root.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-subframe-window.html b/tests/wpt/tests/css/cssom-view/scroll-behavior-subframe-window.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-subframe-window.html rename to tests/wpt/tests/css/cssom-view/scroll-behavior-subframe-window.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-no-layout-box.html b/tests/wpt/tests/css/cssom-view/scroll-no-layout-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scroll-no-layout-box.html rename to tests/wpt/tests/css/cssom-view/scroll-no-layout-box.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-overflow-clip-quirks-001.html b/tests/wpt/tests/css/cssom-view/scroll-overflow-clip-quirks-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scroll-overflow-clip-quirks-001.html rename to tests/wpt/tests/css/cssom-view/scroll-overflow-clip-quirks-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-overflow-clip-quirks-002.html b/tests/wpt/tests/css/cssom-view/scroll-overflow-clip-quirks-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scroll-overflow-clip-quirks-002.html rename to tests/wpt/tests/css/cssom-view/scroll-overflow-clip-quirks-002.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-fixed.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-fixed.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-fixed.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-horizontal-partially-visible.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-horizontal-partially-visible.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-horizontal-partially-visible.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-horizontal-partially-visible.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-horizontal-tb-writing-mode-and-rtl-direction.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-horizontal-tb-writing-mode-and-rtl-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-horizontal-tb-writing-mode-and-rtl-direction.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-horizontal-tb-writing-mode-and-rtl-direction.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-horizontal-tb-writing-mode.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-horizontal-tb-writing-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-horizontal-tb-writing-mode.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-horizontal-tb-writing-mode.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-inline-image.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-inline-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-inline-image.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-inline-image.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-scrollMargin.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-scrollMargin.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-scrollMargin.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-scrollMargin.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-scrollPadding.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-scrollPadding.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-scrollPadding.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-scrollPadding.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-shadow.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-shadow.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-shadow.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-sideways-lr-writing-mode-and-rtl-direction.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-sideways-lr-writing-mode-and-rtl-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-sideways-lr-writing-mode-and-rtl-direction.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-sideways-lr-writing-mode-and-rtl-direction.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-sideways-lr-writing-mode.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-sideways-lr-writing-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-sideways-lr-writing-mode.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-sideways-lr-writing-mode.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-sideways-rl-writing-mode-and-rtl-direction.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-sideways-rl-writing-mode-and-rtl-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-sideways-rl-writing-mode-and-rtl-direction.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-sideways-rl-writing-mode-and-rtl-direction.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-sideways-rl-writing-mode.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-sideways-rl-writing-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-sideways-rl-writing-mode.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-sideways-rl-writing-mode.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-smooth.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-smooth.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-smooth.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-smooth.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-stuck.tentative.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-stuck.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-stuck.tentative.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-stuck.tentative.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-svg-shape.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-svg-shape.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-svg-shape.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-svg-shape.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-vertical-lr-writing-mode-and-rtl-direction.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-vertical-lr-writing-mode-and-rtl-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-vertical-lr-writing-mode-and-rtl-direction.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-vertical-lr-writing-mode-and-rtl-direction.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-vertical-lr-writing-mode.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-vertical-lr-writing-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-vertical-lr-writing-mode.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-vertical-lr-writing-mode.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-vertical-rl-writing-mode.html b/tests/wpt/tests/css/cssom-view/scrollIntoView-vertical-rl-writing-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-vertical-rl-writing-mode.html rename to tests/wpt/tests/css/cssom-view/scrollIntoView-vertical-rl-writing-mode.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollLeft-of-scroller-with-wider-scrollbar.html b/tests/wpt/tests/css/cssom-view/scrollLeft-of-scroller-with-wider-scrollbar.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollLeft-of-scroller-with-wider-scrollbar.html rename to tests/wpt/tests/css/cssom-view/scrollLeft-of-scroller-with-wider-scrollbar.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollLeftTop.html b/tests/wpt/tests/css/cssom-view/scrollLeftTop.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollLeftTop.html rename to tests/wpt/tests/css/cssom-view/scrollLeftTop.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollTop-display-change-ref.html b/tests/wpt/tests/css/cssom-view/scrollTop-display-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollTop-display-change-ref.html rename to tests/wpt/tests/css/cssom-view/scrollTop-display-change-ref.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollTop-display-change.html b/tests/wpt/tests/css/cssom-view/scrollTop-display-change.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollTop-display-change.html rename to tests/wpt/tests/css/cssom-view/scrollTop-display-change.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollWidthHeight.xht b/tests/wpt/tests/css/cssom-view/scrollWidthHeight.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollWidthHeight.xht rename to tests/wpt/tests/css/cssom-view/scrollWidthHeight.xht diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht b/tests/wpt/tests/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht rename to tests/wpt/tests/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrolling-no-browsing-context.html b/tests/wpt/tests/css/cssom-view/scrolling-no-browsing-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrolling-no-browsing-context.html rename to tests/wpt/tests/css/cssom-view/scrolling-no-browsing-context.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrolling-quirks-vs-nonquirks.html b/tests/wpt/tests/css/cssom-view/scrolling-quirks-vs-nonquirks.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrolling-quirks-vs-nonquirks.html rename to tests/wpt/tests/css/cssom-view/scrolling-quirks-vs-nonquirks.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollingElement-quirks-dynamic-001-ref.html b/tests/wpt/tests/css/cssom-view/scrollingElement-quirks-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollingElement-quirks-dynamic-001-ref.html rename to tests/wpt/tests/css/cssom-view/scrollingElement-quirks-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollingElement-quirks-dynamic-001.html b/tests/wpt/tests/css/cssom-view/scrollingElement-quirks-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollingElement-quirks-dynamic-001.html rename to tests/wpt/tests/css/cssom-view/scrollingElement-quirks-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollingElement-quirks-dynamic-002-ref.html b/tests/wpt/tests/css/cssom-view/scrollingElement-quirks-dynamic-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollingElement-quirks-dynamic-002-ref.html rename to tests/wpt/tests/css/cssom-view/scrollingElement-quirks-dynamic-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollingElement-quirks-dynamic-002.html b/tests/wpt/tests/css/cssom-view/scrollingElement-quirks-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollingElement-quirks-dynamic-002.html rename to tests/wpt/tests/css/cssom-view/scrollingElement-quirks-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollingElement.html b/tests/wpt/tests/css/cssom-view/scrollingElement.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollingElement.html rename to tests/wpt/tests/css/cssom-view/scrollingElement.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollintoview.html b/tests/wpt/tests/css/cssom-view/scrollintoview.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/scrollintoview.html rename to tests/wpt/tests/css/cssom-view/scrollintoview.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/1x1-green.png b/tests/wpt/tests/css/cssom-view/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/1x1-green.png rename to tests/wpt/tests/css/cssom-view/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/1x1-lime.png b/tests/wpt/tests/css/cssom-view/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/1x1-lime.png rename to tests/wpt/tests/css/cssom-view/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/1x1-maroon.png b/tests/wpt/tests/css/cssom-view/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/1x1-maroon.png rename to tests/wpt/tests/css/cssom-view/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/1x1-navy.png b/tests/wpt/tests/css/cssom-view/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/1x1-navy.png rename to tests/wpt/tests/css/cssom-view/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/1x1-red.png b/tests/wpt/tests/css/cssom-view/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/1x1-red.png rename to tests/wpt/tests/css/cssom-view/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/1x1-white.png b/tests/wpt/tests/css/cssom-view/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/1x1-white.png rename to tests/wpt/tests/css/cssom-view/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/60x60-gg-rr.png b/tests/wpt/tests/css/cssom-view/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/60x60-gg-rr.png rename to tests/wpt/tests/css/cssom-view/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/60x60-green.png b/tests/wpt/tests/css/cssom-view/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/60x60-green.png rename to tests/wpt/tests/css/cssom-view/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/README b/tests/wpt/tests/css/cssom-view/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/README rename to tests/wpt/tests/css/cssom-view/support/README diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/a-green.css b/tests/wpt/tests/css/cssom-view/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/a-green.css rename to tests/wpt/tests/css/cssom-view/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/b-green.css b/tests/wpt/tests/css/cssom-view/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/b-green.css rename to tests/wpt/tests/css/cssom-view/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/c-red.css b/tests/wpt/tests/css/cssom-view/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/c-red.css rename to tests/wpt/tests/css/cssom-view/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/cat.png b/tests/wpt/tests/css/cssom-view/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/cat.png rename to tests/wpt/tests/css/cssom-view/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/import-green.css b/tests/wpt/tests/css/cssom-view/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/import-green.css rename to tests/wpt/tests/css/cssom-view/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/import-red.css b/tests/wpt/tests/css/cssom-view/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/import-red.css rename to tests/wpt/tests/css/cssom-view/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/cssom-view/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/cssom-view/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/cssom-view/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/cssom-view/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/cssom-view/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/cssom-view/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/pattern-tr.png b/tests/wpt/tests/css/cssom-view/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/pattern-tr.png rename to tests/wpt/tests/css/cssom-view/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/ruler-h-50%.png b/tests/wpt/tests/css/cssom-view/support/ruler-h-50%.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/ruler-h-50%.png rename to tests/wpt/tests/css/cssom-view/support/ruler-h-50%.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/ruler-h-50px.png b/tests/wpt/tests/css/cssom-view/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/ruler-h-50px.png rename to tests/wpt/tests/css/cssom-view/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/ruler-v-100px.png b/tests/wpt/tests/css/cssom-view/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/ruler-v-100px.png rename to tests/wpt/tests/css/cssom-view/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/ruler-v-50px.png b/tests/wpt/tests/css/cssom-view/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/ruler-v-50px.png rename to tests/wpt/tests/css/cssom-view/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/scroll-behavior.js b/tests/wpt/tests/css/cssom-view/support/scroll-behavior.js similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/scroll-behavior.js rename to tests/wpt/tests/css/cssom-view/support/scroll-behavior.js diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/square-purple.png b/tests/wpt/tests/css/cssom-view/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/square-purple.png rename to tests/wpt/tests/css/cssom-view/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/square-teal.png b/tests/wpt/tests/css/cssom-view/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/square-teal.png rename to tests/wpt/tests/css/cssom-view/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/square-white.png b/tests/wpt/tests/css/cssom-view/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/square-white.png rename to tests/wpt/tests/css/cssom-view/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/support/README b/tests/wpt/tests/css/cssom-view/support/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/support/README rename to tests/wpt/tests/css/cssom-view/support/support/README diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/support/swatch-green.png b/tests/wpt/tests/css/cssom-view/support/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/support/swatch-green.png rename to tests/wpt/tests/css/cssom-view/support/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/support/swatch-red.png b/tests/wpt/tests/css/cssom-view/support/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/support/swatch-red.png rename to tests/wpt/tests/css/cssom-view/support/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/swatch-blue.png b/tests/wpt/tests/css/cssom-view/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/swatch-blue.png rename to tests/wpt/tests/css/cssom-view/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/swatch-green.png b/tests/wpt/tests/css/cssom-view/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/swatch-green.png rename to tests/wpt/tests/css/cssom-view/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/swatch-lime.png b/tests/wpt/tests/css/cssom-view/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/swatch-lime.png rename to tests/wpt/tests/css/cssom-view/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/swatch-orange.png b/tests/wpt/tests/css/cssom-view/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/swatch-orange.png rename to tests/wpt/tests/css/cssom-view/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/swatch-red.png b/tests/wpt/tests/css/cssom-view/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/swatch-red.png rename to tests/wpt/tests/css/cssom-view/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/swatch-teal.png b/tests/wpt/tests/css/cssom-view/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/swatch-teal.png rename to tests/wpt/tests/css/cssom-view/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/swatch-white.png b/tests/wpt/tests/css/cssom-view/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/swatch-white.png rename to tests/wpt/tests/css/cssom-view/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/swatch-yellow.png b/tests/wpt/tests/css/cssom-view/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/swatch-yellow.png rename to tests/wpt/tests/css/cssom-view/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/test-bl.png b/tests/wpt/tests/css/cssom-view/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/test-bl.png rename to tests/wpt/tests/css/cssom-view/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/test-br.png b/tests/wpt/tests/css/cssom-view/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/test-br.png rename to tests/wpt/tests/css/cssom-view/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/test-inner-half-size.png b/tests/wpt/tests/css/cssom-view/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/test-inner-half-size.png rename to tests/wpt/tests/css/cssom-view/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/test-outer.png b/tests/wpt/tests/css/cssom-view/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/test-outer.png rename to tests/wpt/tests/css/cssom-view/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/test-tl.png b/tests/wpt/tests/css/cssom-view/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/test-tl.png rename to tests/wpt/tests/css/cssom-view/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/support/test-tr.png b/tests/wpt/tests/css/cssom-view/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/support/test-tr.png rename to tests/wpt/tests/css/cssom-view/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/cssom-view/table-border-collapse-client-width-height.html b/tests/wpt/tests/css/cssom-view/table-border-collapse-client-width-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/table-border-collapse-client-width-height.html rename to tests/wpt/tests/css/cssom-view/table-border-collapse-client-width-height.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/table-border-separate-client-width-height.html b/tests/wpt/tests/css/cssom-view/table-border-separate-client-width-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/table-border-separate-client-width-height.html rename to tests/wpt/tests/css/cssom-view/table-border-separate-client-width-height.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/table-client-props.html b/tests/wpt/tests/css/cssom-view/table-client-props.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/table-client-props.html rename to tests/wpt/tests/css/cssom-view/table-client-props.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/table-offset-props.html b/tests/wpt/tests/css/cssom-view/table-offset-props.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/table-offset-props.html rename to tests/wpt/tests/css/cssom-view/table-offset-props.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/table-scroll-props.html b/tests/wpt/tests/css/cssom-view/table-scroll-props.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/table-scroll-props.html rename to tests/wpt/tests/css/cssom-view/table-scroll-props.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/table-with-border-client-width-height.html b/tests/wpt/tests/css/cssom-view/table-with-border-client-width-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/table-with-border-client-width-height.html rename to tests/wpt/tests/css/cssom-view/table-with-border-client-width-height.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/ttwf-js-cssomview-getclientrects-length.html b/tests/wpt/tests/css/cssom-view/ttwf-js-cssomview-getclientrects-length.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/ttwf-js-cssomview-getclientrects-length.html rename to tests/wpt/tests/css/cssom-view/ttwf-js-cssomview-getclientrects-length.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/window-screen-height-immutable.html b/tests/wpt/tests/css/cssom-view/window-screen-height-immutable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/window-screen-height-immutable.html rename to tests/wpt/tests/css/cssom-view/window-screen-height-immutable.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/window-screen-height.html b/tests/wpt/tests/css/cssom-view/window-screen-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/window-screen-height.html rename to tests/wpt/tests/css/cssom-view/window-screen-height.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/window-screen-width-immutable.html b/tests/wpt/tests/css/cssom-view/window-screen-width-immutable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/window-screen-width-immutable.html rename to tests/wpt/tests/css/cssom-view/window-screen-width-immutable.html diff --git a/tests/wpt/web-platform-tests/css/cssom-view/window-screen-width.html b/tests/wpt/tests/css/cssom-view/window-screen-width.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom-view/window-screen-width.html rename to tests/wpt/tests/css/cssom-view/window-screen-width.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSS-namespace-object-class-string.html b/tests/wpt/tests/css/cssom/CSS-namespace-object-class-string.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSS-namespace-object-class-string.html rename to tests/wpt/tests/css/cssom/CSS-namespace-object-class-string.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSContainerRule.tentative.html b/tests/wpt/tests/css/cssom/CSSContainerRule.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSContainerRule.tentative.html rename to tests/wpt/tests/css/cssom/CSSContainerRule.tentative.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSCounterStyleRule.html b/tests/wpt/tests/css/cssom/CSSCounterStyleRule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSCounterStyleRule.html rename to tests/wpt/tests/css/cssom/CSSCounterStyleRule.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSFontFaceRule.html b/tests/wpt/tests/css/cssom/CSSFontFaceRule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSFontFaceRule.html rename to tests/wpt/tests/css/cssom/CSSFontFaceRule.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSFontFeatureValuesRule.html b/tests/wpt/tests/css/cssom/CSSFontFeatureValuesRule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSFontFeatureValuesRule.html rename to tests/wpt/tests/css/cssom/CSSFontFeatureValuesRule.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSGroupingRule-cssRules.html b/tests/wpt/tests/css/cssom/CSSGroupingRule-cssRules.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSGroupingRule-cssRules.html rename to tests/wpt/tests/css/cssom/CSSGroupingRule-cssRules.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSGroupingRule-insertRule.html b/tests/wpt/tests/css/cssom/CSSGroupingRule-insertRule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSGroupingRule-insertRule.html rename to tests/wpt/tests/css/cssom/CSSGroupingRule-insertRule.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSKeyframeRule.html b/tests/wpt/tests/css/cssom/CSSKeyframeRule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSKeyframeRule.html rename to tests/wpt/tests/css/cssom/CSSKeyframeRule.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSKeyframesRule.html b/tests/wpt/tests/css/cssom/CSSKeyframesRule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSKeyframesRule.html rename to tests/wpt/tests/css/cssom/CSSKeyframesRule.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSNamespaceRule.html b/tests/wpt/tests/css/cssom/CSSNamespaceRule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSNamespaceRule.html rename to tests/wpt/tests/css/cssom/CSSNamespaceRule.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSRuleList.html b/tests/wpt/tests/css/cssom/CSSRuleList.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSRuleList.html rename to tests/wpt/tests/css/cssom/CSSRuleList.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleRule-set-selectorText-namespace.html b/tests/wpt/tests/css/cssom/CSSStyleRule-set-selectorText-namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleRule-set-selectorText-namespace.html rename to tests/wpt/tests/css/cssom/CSSStyleRule-set-selectorText-namespace.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleRule-set-selectorText.html b/tests/wpt/tests/css/cssom/CSSStyleRule-set-selectorText.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleRule-set-selectorText.html rename to tests/wpt/tests/css/cssom/CSSStyleRule-set-selectorText.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleRule.html b/tests/wpt/tests/css/cssom/CSSStyleRule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleRule.html rename to tests/wpt/tests/css/cssom/CSSStyleRule.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-baseURL.tentative.html b/tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-baseURL.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-baseURL.tentative.html rename to tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-baseURL.tentative.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-concat-ref.html b/tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-concat-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-concat-ref.html rename to tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-concat-ref.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-concat.html b/tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-concat.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-concat.html rename to tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-concat.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-cssRules.html b/tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-cssRules.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-cssRules.html rename to tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-cssRules.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-disabled-regular-sheet-insertion.html b/tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-disabled-regular-sheet-insertion.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-disabled-regular-sheet-insertion.html rename to tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-disabled-regular-sheet-insertion.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-disallow-import.tentative.html b/tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-disallow-import.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-disallow-import.tentative.html rename to tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-disallow-import.tentative.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-duplicate.html b/tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-duplicate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-duplicate.html rename to tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-duplicate.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-replace-on-regular-sheet.html b/tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-replace-on-regular-sheet.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable-replace-on-regular-sheet.html rename to tests/wpt/tests/css/cssom/CSSStyleSheet-constructable-replace-on-regular-sheet.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable.html b/tests/wpt/tests/css/cssom/CSSStyleSheet-constructable.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable.html rename to tests/wpt/tests/css/cssom/CSSStyleSheet-constructable.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-modify-after-removal.html b/tests/wpt/tests/css/cssom/CSSStyleSheet-modify-after-removal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-modify-after-removal.html rename to tests/wpt/tests/css/cssom/CSSStyleSheet-modify-after-removal.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-template-adoption.html b/tests/wpt/tests/css/cssom/CSSStyleSheet-template-adoption.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-template-adoption.html rename to tests/wpt/tests/css/cssom/CSSStyleSheet-template-adoption.html diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet.html b/tests/wpt/tests/css/cssom/CSSStyleSheet.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet.html rename to tests/wpt/tests/css/cssom/CSSStyleSheet.html diff --git a/tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-001.html b/tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-001.html rename to tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-002.html b/tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-002.html rename to tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-002.html diff --git a/tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-003.html b/tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-003.html rename to tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-003.html diff --git a/tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-004.html b/tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-004.html rename to tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-004.html diff --git a/tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-005.html b/tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-005.html rename to tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-005.html diff --git a/tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-006.html b/tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-006.html rename to tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-006.html diff --git a/tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-007.html b/tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-007.html rename to tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-007.html diff --git a/tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-alternate-ref.html b/tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-alternate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-alternate-ref.html rename to tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-alternate-ref.html diff --git a/tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-alternate.html b/tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-alternate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-disabled-alternate.html rename to tests/wpt/tests/css/cssom/HTMLLinkElement-disabled-alternate.html diff --git a/tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-load-event.html b/tests/wpt/tests/css/cssom/HTMLLinkElement-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/HTMLLinkElement-load-event.html rename to tests/wpt/tests/css/cssom/HTMLLinkElement-load-event.html diff --git a/tests/wpt/web-platform-tests/css/cssom/HTMLStyleElement-load-event.html b/tests/wpt/tests/css/cssom/HTMLStyleElement-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/HTMLStyleElement-load-event.html rename to tests/wpt/tests/css/cssom/HTMLStyleElement-load-event.html diff --git a/tests/wpt/web-platform-tests/css/cssom/META.yml b/tests/wpt/tests/css/cssom/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/META.yml rename to tests/wpt/tests/css/cssom/META.yml diff --git a/tests/wpt/web-platform-tests/css/cssom/MediaList.html b/tests/wpt/tests/css/cssom/MediaList.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/MediaList.html rename to tests/wpt/tests/css/cssom/MediaList.html diff --git a/tests/wpt/web-platform-tests/css/cssom/MediaList2.xhtml b/tests/wpt/tests/css/cssom/MediaList2.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/MediaList2.xhtml rename to tests/wpt/tests/css/cssom/MediaList2.xhtml diff --git a/tests/wpt/web-platform-tests/css/cssom/MutationObserver-style.html b/tests/wpt/tests/css/cssom/MutationObserver-style.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/MutationObserver-style.html rename to tests/wpt/tests/css/cssom/MutationObserver-style.html diff --git a/tests/wpt/web-platform-tests/css/cssom/StyleSheetList.html b/tests/wpt/tests/css/cssom/StyleSheetList.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/StyleSheetList.html rename to tests/wpt/tests/css/cssom/StyleSheetList.html diff --git a/tests/wpt/web-platform-tests/css/cssom/adoptedstylesheets-observablearray.html b/tests/wpt/tests/css/cssom/adoptedstylesheets-observablearray.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/adoptedstylesheets-observablearray.html rename to tests/wpt/tests/css/cssom/adoptedstylesheets-observablearray.html diff --git a/tests/wpt/web-platform-tests/css/cssom/at-namespace.html b/tests/wpt/tests/css/cssom/at-namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/at-namespace.html rename to tests/wpt/tests/css/cssom/at-namespace.html diff --git a/tests/wpt/web-platform-tests/css/cssom/base-uri.html b/tests/wpt/tests/css/cssom/base-uri.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/base-uri.html rename to tests/wpt/tests/css/cssom/base-uri.html diff --git a/tests/wpt/web-platform-tests/css/cssom/border-shorthand-serialization.html b/tests/wpt/tests/css/cssom/border-shorthand-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/border-shorthand-serialization.html rename to tests/wpt/tests/css/cssom/border-shorthand-serialization.html diff --git a/tests/wpt/web-platform-tests/css/cssom/caretPositionFromPoint-with-transformation.html b/tests/wpt/tests/css/cssom/caretPositionFromPoint-with-transformation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/caretPositionFromPoint-with-transformation.html rename to tests/wpt/tests/css/cssom/caretPositionFromPoint-with-transformation.html diff --git a/tests/wpt/web-platform-tests/css/cssom/computed-style-001.html b/tests/wpt/tests/css/cssom/computed-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/computed-style-001.html rename to tests/wpt/tests/css/cssom/computed-style-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom/computed-style-002.html b/tests/wpt/tests/css/cssom/computed-style-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/computed-style-002.html rename to tests/wpt/tests/css/cssom/computed-style-002.html diff --git a/tests/wpt/web-platform-tests/css/cssom/computed-style-003.html b/tests/wpt/tests/css/cssom/computed-style-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/computed-style-003.html rename to tests/wpt/tests/css/cssom/computed-style-003.html diff --git a/tests/wpt/web-platform-tests/css/cssom/computed-style-004.html b/tests/wpt/tests/css/cssom/computed-style-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/computed-style-004.html rename to tests/wpt/tests/css/cssom/computed-style-004.html diff --git a/tests/wpt/web-platform-tests/css/cssom/computed-style-005.html b/tests/wpt/tests/css/cssom/computed-style-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/computed-style-005.html rename to tests/wpt/tests/css/cssom/computed-style-005.html diff --git a/tests/wpt/web-platform-tests/css/cssom/computed-style-set-property.html b/tests/wpt/tests/css/cssom/computed-style-set-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/computed-style-set-property.html rename to tests/wpt/tests/css/cssom/computed-style-set-property.html diff --git a/tests/wpt/web-platform-tests/css/cssom/css-style-attr-decl-block.html b/tests/wpt/tests/css/cssom/css-style-attr-decl-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/css-style-attr-decl-block.html rename to tests/wpt/tests/css/cssom/css-style-attr-decl-block.html diff --git a/tests/wpt/web-platform-tests/css/cssom/css-style-attribute-modifications.html b/tests/wpt/tests/css/cssom/css-style-attribute-modifications.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/css-style-attribute-modifications.html rename to tests/wpt/tests/css/cssom/css-style-attribute-modifications.html diff --git a/tests/wpt/web-platform-tests/css/cssom/css-style-declaration-modifications.html b/tests/wpt/tests/css/cssom/css-style-declaration-modifications.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/css-style-declaration-modifications.html rename to tests/wpt/tests/css/cssom/css-style-declaration-modifications.html diff --git a/tests/wpt/web-platform-tests/css/cssom/css-style-reparse.html b/tests/wpt/tests/css/cssom/css-style-reparse.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/css-style-reparse.html rename to tests/wpt/tests/css/cssom/css-style-reparse.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssimportrule-parent.html b/tests/wpt/tests/css/cssom/cssimportrule-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssimportrule-parent.html rename to tests/wpt/tests/css/cssom/cssimportrule-parent.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssimportrule-sheet-identity.html b/tests/wpt/tests/css/cssom/cssimportrule-sheet-identity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssimportrule-sheet-identity.html rename to tests/wpt/tests/css/cssom/cssimportrule-sheet-identity.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssimportrule.html b/tests/wpt/tests/css/cssom/cssimportrule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssimportrule.html rename to tests/wpt/tests/css/cssom/cssimportrule.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssom-cssText-serialize.html b/tests/wpt/tests/css/cssom/cssom-cssText-serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssom-cssText-serialize.html rename to tests/wpt/tests/css/cssom/cssom-cssText-serialize.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssom-cssstyledeclaration-set.html b/tests/wpt/tests/css/cssom/cssom-cssstyledeclaration-set.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssom-cssstyledeclaration-set.html rename to tests/wpt/tests/css/cssom/cssom-cssstyledeclaration-set.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssom-fontfacerule-constructors.html b/tests/wpt/tests/css/cssom/cssom-fontfacerule-constructors.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssom-fontfacerule-constructors.html rename to tests/wpt/tests/css/cssom/cssom-fontfacerule-constructors.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssom-fontfacerule.html b/tests/wpt/tests/css/cssom/cssom-fontfacerule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssom-fontfacerule.html rename to tests/wpt/tests/css/cssom/cssom-fontfacerule.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssom-getPropertyValue-common-checks.html b/tests/wpt/tests/css/cssom/cssom-getPropertyValue-common-checks.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssom-getPropertyValue-common-checks.html rename to tests/wpt/tests/css/cssom/cssom-getPropertyValue-common-checks.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssom-pagerule.html b/tests/wpt/tests/css/cssom/cssom-pagerule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssom-pagerule.html rename to tests/wpt/tests/css/cssom/cssom-pagerule.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssom-ruleTypeAndOrder.html b/tests/wpt/tests/css/cssom/cssom-ruleTypeAndOrder.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssom-ruleTypeAndOrder.html rename to tests/wpt/tests/css/cssom/cssom-ruleTypeAndOrder.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssom-setProperty-shorthand.html b/tests/wpt/tests/css/cssom/cssom-setProperty-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssom-setProperty-shorthand.html rename to tests/wpt/tests/css/cssom/cssom-setProperty-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-cssfontrule.tentative.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-cssfontrule.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-cssfontrule.tentative.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-cssfontrule.tentative.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-csstext-all-shorthand.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-csstext-all-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-csstext-all-shorthand.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-csstext-all-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-csstext-final-delimiter.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-csstext-final-delimiter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-csstext-final-delimiter.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-csstext-final-delimiter.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-csstext-important.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-csstext-important.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-csstext-important.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-csstext-important.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-csstext.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-csstext.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-csstext.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-csstext.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-custom-properties.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-custom-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-custom-properties.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-custom-properties.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-mutability.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-mutability.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-mutability.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-mutability.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-mutationrecord-001.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-mutationrecord-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-mutationrecord-001.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-mutationrecord-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-mutationrecord-002.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-mutationrecord-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-mutationrecord-002.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-mutationrecord-002.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-mutationrecord-003.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-mutationrecord-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-mutationrecord-003.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-mutationrecord-003.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-mutationrecord-004.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-mutationrecord-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-mutationrecord-004.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-mutationrecord-004.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-mutationrecord-005.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-mutationrecord-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-mutationrecord-005.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-mutationrecord-005.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-properties.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-properties.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-properties.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-registered-custom-properties.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-registered-custom-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-registered-custom-properties.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-registered-custom-properties.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-setter-attr.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-setter-attr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-setter-attr.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-setter-attr.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-setter-declarations.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-setter-declarations.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-setter-declarations.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-setter-declarations.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-setter-form-controls.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-setter-form-controls.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-setter-form-controls.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-setter-form-controls.html diff --git a/tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-setter-logical.html b/tests/wpt/tests/css/cssom/cssstyledeclaration-setter-logical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/cssstyledeclaration-setter-logical.html rename to tests/wpt/tests/css/cssom/cssstyledeclaration-setter-logical.html diff --git a/tests/wpt/web-platform-tests/css/cssom/declaration-block-all-crash.html b/tests/wpt/tests/css/cssom/declaration-block-all-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/declaration-block-all-crash.html rename to tests/wpt/tests/css/cssom/declaration-block-all-crash.html diff --git a/tests/wpt/web-platform-tests/css/cssom/escape.html b/tests/wpt/tests/css/cssom/escape.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/escape.html rename to tests/wpt/tests/css/cssom/escape.html diff --git a/tests/wpt/web-platform-tests/css/cssom/flex-serialization.html b/tests/wpt/tests/css/cssom/flex-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/flex-serialization.html rename to tests/wpt/tests/css/cssom/flex-serialization.html diff --git a/tests/wpt/web-platform-tests/css/cssom/font-family-serialization-001.html b/tests/wpt/tests/css/cssom/font-family-serialization-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/font-family-serialization-001.html rename to tests/wpt/tests/css/cssom/font-family-serialization-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom/font-shorthand-serialization.html b/tests/wpt/tests/css/cssom/font-shorthand-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/font-shorthand-serialization.html rename to tests/wpt/tests/css/cssom/font-shorthand-serialization.html diff --git a/tests/wpt/web-platform-tests/css/cssom/font-variant-shorthand-serialization.html b/tests/wpt/tests/css/cssom/font-variant-shorthand-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/font-variant-shorthand-serialization.html rename to tests/wpt/tests/css/cssom/font-variant-shorthand-serialization.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-animations-replaced-into-ib-split.html b/tests/wpt/tests/css/cssom/getComputedStyle-animations-replaced-into-ib-split.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-animations-replaced-into-ib-split.html rename to tests/wpt/tests/css/cssom/getComputedStyle-animations-replaced-into-ib-split.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-detached-subtree.html b/tests/wpt/tests/css/cssom/getComputedStyle-detached-subtree.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-detached-subtree.html rename to tests/wpt/tests/css/cssom/getComputedStyle-detached-subtree.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-display-none-001.html b/tests/wpt/tests/css/cssom/getComputedStyle-display-none-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-display-none-001.html rename to tests/wpt/tests/css/cssom/getComputedStyle-display-none-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-display-none-002.html b/tests/wpt/tests/css/cssom/getComputedStyle-display-none-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-display-none-002.html rename to tests/wpt/tests/css/cssom/getComputedStyle-display-none-002.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-display-none-003.html b/tests/wpt/tests/css/cssom/getComputedStyle-display-none-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-display-none-003.html rename to tests/wpt/tests/css/cssom/getComputedStyle-display-none-003.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-dynamic-subdoc.html b/tests/wpt/tests/css/cssom/getComputedStyle-dynamic-subdoc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-dynamic-subdoc.html rename to tests/wpt/tests/css/cssom/getComputedStyle-dynamic-subdoc.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-getter-v-properties.tentative.html b/tests/wpt/tests/css/cssom/getComputedStyle-getter-v-properties.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-getter-v-properties.tentative.html rename to tests/wpt/tests/css/cssom/getComputedStyle-getter-v-properties.tentative.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-insets-absolute.html b/tests/wpt/tests/css/cssom/getComputedStyle-insets-absolute.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-insets-absolute.html rename to tests/wpt/tests/css/cssom/getComputedStyle-insets-absolute.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-insets-fixed.html b/tests/wpt/tests/css/cssom/getComputedStyle-insets-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-insets-fixed.html rename to tests/wpt/tests/css/cssom/getComputedStyle-insets-fixed.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-insets-nobox.html b/tests/wpt/tests/css/cssom/getComputedStyle-insets-nobox.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-insets-nobox.html rename to tests/wpt/tests/css/cssom/getComputedStyle-insets-nobox.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-insets-relative.html b/tests/wpt/tests/css/cssom/getComputedStyle-insets-relative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-insets-relative.html rename to tests/wpt/tests/css/cssom/getComputedStyle-insets-relative.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-insets-static.html b/tests/wpt/tests/css/cssom/getComputedStyle-insets-static.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-insets-static.html rename to tests/wpt/tests/css/cssom/getComputedStyle-insets-static.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-insets-sticky-container-for-abspos.html b/tests/wpt/tests/css/cssom/getComputedStyle-insets-sticky-container-for-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-insets-sticky-container-for-abspos.html rename to tests/wpt/tests/css/cssom/getComputedStyle-insets-sticky-container-for-abspos.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-insets-sticky.html b/tests/wpt/tests/css/cssom/getComputedStyle-insets-sticky.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-insets-sticky.html rename to tests/wpt/tests/css/cssom/getComputedStyle-insets-sticky.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-layout-dependent-removed-ib-sibling.html b/tests/wpt/tests/css/cssom/getComputedStyle-layout-dependent-removed-ib-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-layout-dependent-removed-ib-sibling.html rename to tests/wpt/tests/css/cssom/getComputedStyle-layout-dependent-removed-ib-sibling.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-layout-dependent-replaced-into-ib-split.html b/tests/wpt/tests/css/cssom/getComputedStyle-layout-dependent-replaced-into-ib-split.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-layout-dependent-replaced-into-ib-split.html rename to tests/wpt/tests/css/cssom/getComputedStyle-layout-dependent-replaced-into-ib-split.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-line-height.html b/tests/wpt/tests/css/cssom/getComputedStyle-line-height.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-line-height.html rename to tests/wpt/tests/css/cssom/getComputedStyle-line-height.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-logical-enumeration.html b/tests/wpt/tests/css/cssom/getComputedStyle-logical-enumeration.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-logical-enumeration.html rename to tests/wpt/tests/css/cssom/getComputedStyle-logical-enumeration.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-property-order.html b/tests/wpt/tests/css/cssom/getComputedStyle-property-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-property-order.html rename to tests/wpt/tests/css/cssom/getComputedStyle-property-order.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-pseudo.html b/tests/wpt/tests/css/cssom/getComputedStyle-pseudo.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-pseudo.html rename to tests/wpt/tests/css/cssom/getComputedStyle-pseudo.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-resolved-colors.html b/tests/wpt/tests/css/cssom/getComputedStyle-resolved-colors.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-resolved-colors.html rename to tests/wpt/tests/css/cssom/getComputedStyle-resolved-colors.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-resolved-min-max-clamping.html b/tests/wpt/tests/css/cssom/getComputedStyle-resolved-min-max-clamping.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-resolved-min-max-clamping.html rename to tests/wpt/tests/css/cssom/getComputedStyle-resolved-min-max-clamping.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-sticky-pos-percent.html b/tests/wpt/tests/css/cssom/getComputedStyle-sticky-pos-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-sticky-pos-percent.html rename to tests/wpt/tests/css/cssom/getComputedStyle-sticky-pos-percent.html diff --git a/tests/wpt/web-platform-tests/css/cssom/getComputedStyle-width-scroll.tentative.html b/tests/wpt/tests/css/cssom/getComputedStyle-width-scroll.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/getComputedStyle-width-scroll.tentative.html rename to tests/wpt/tests/css/cssom/getComputedStyle-width-scroll.tentative.html diff --git a/tests/wpt/web-platform-tests/css/cssom/historical.html b/tests/wpt/tests/css/cssom/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/historical.html rename to tests/wpt/tests/css/cssom/historical.html diff --git a/tests/wpt/web-platform-tests/css/cssom/idlharness.html b/tests/wpt/tests/css/cssom/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/idlharness.html rename to tests/wpt/tests/css/cssom/idlharness.html diff --git a/tests/wpt/web-platform-tests/css/cssom/inline-style-001.html b/tests/wpt/tests/css/cssom/inline-style-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/inline-style-001.html rename to tests/wpt/tests/css/cssom/inline-style-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom/insertRule-across-context.html b/tests/wpt/tests/css/cssom/insertRule-across-context.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/insertRule-across-context.html rename to tests/wpt/tests/css/cssom/insertRule-across-context.html diff --git a/tests/wpt/web-platform-tests/css/cssom/insertRule-charset-no-index.html b/tests/wpt/tests/css/cssom/insertRule-charset-no-index.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/insertRule-charset-no-index.html rename to tests/wpt/tests/css/cssom/insertRule-charset-no-index.html diff --git a/tests/wpt/web-platform-tests/css/cssom/insertRule-from-script-ref.html b/tests/wpt/tests/css/cssom/insertRule-from-script-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/insertRule-from-script-ref.html rename to tests/wpt/tests/css/cssom/insertRule-from-script-ref.html diff --git a/tests/wpt/web-platform-tests/css/cssom/insertRule-from-script.html b/tests/wpt/tests/css/cssom/insertRule-from-script.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/insertRule-from-script.html rename to tests/wpt/tests/css/cssom/insertRule-from-script.html diff --git a/tests/wpt/web-platform-tests/css/cssom/insertRule-import-no-index.html b/tests/wpt/tests/css/cssom/insertRule-import-no-index.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/insertRule-import-no-index.html rename to tests/wpt/tests/css/cssom/insertRule-import-no-index.html diff --git a/tests/wpt/web-platform-tests/css/cssom/insertRule-namespace-no-index.html b/tests/wpt/tests/css/cssom/insertRule-namespace-no-index.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/insertRule-namespace-no-index.html rename to tests/wpt/tests/css/cssom/insertRule-namespace-no-index.html diff --git a/tests/wpt/web-platform-tests/css/cssom/insertRule-no-index.html b/tests/wpt/tests/css/cssom/insertRule-no-index.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/insertRule-no-index.html rename to tests/wpt/tests/css/cssom/insertRule-no-index.html diff --git a/tests/wpt/web-platform-tests/css/cssom/insertRule-syntax-error-01.html b/tests/wpt/tests/css/cssom/insertRule-syntax-error-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/insertRule-syntax-error-01.html rename to tests/wpt/tests/css/cssom/insertRule-syntax-error-01.html diff --git a/tests/wpt/web-platform-tests/css/cssom/medialist-dynamic-001-ref.html b/tests/wpt/tests/css/cssom/medialist-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/medialist-dynamic-001-ref.html rename to tests/wpt/tests/css/cssom/medialist-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/cssom/medialist-dynamic-001.html b/tests/wpt/tests/css/cssom/medialist-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/medialist-dynamic-001.html rename to tests/wpt/tests/css/cssom/medialist-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom/medialist-interfaces-001.html b/tests/wpt/tests/css/cssom/medialist-interfaces-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/medialist-interfaces-001.html rename to tests/wpt/tests/css/cssom/medialist-interfaces-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom/medialist-interfaces-002.html b/tests/wpt/tests/css/cssom/medialist-interfaces-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/medialist-interfaces-002.html rename to tests/wpt/tests/css/cssom/medialist-interfaces-002.html diff --git a/tests/wpt/web-platform-tests/css/cssom/medialist-interfaces-004.html b/tests/wpt/tests/css/cssom/medialist-interfaces-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/medialist-interfaces-004.html rename to tests/wpt/tests/css/cssom/medialist-interfaces-004.html diff --git a/tests/wpt/web-platform-tests/css/cssom/mediaquery-sort-dedup.html b/tests/wpt/tests/css/cssom/mediaquery-sort-dedup.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/mediaquery-sort-dedup.html rename to tests/wpt/tests/css/cssom/mediaquery-sort-dedup.html diff --git a/tests/wpt/web-platform-tests/css/cssom/overflow-serialization.html b/tests/wpt/tests/css/cssom/overflow-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/overflow-serialization.html rename to tests/wpt/tests/css/cssom/overflow-serialization.html diff --git a/tests/wpt/web-platform-tests/css/cssom/page-descriptors.html b/tests/wpt/tests/css/cssom/page-descriptors.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/page-descriptors.html rename to tests/wpt/tests/css/cssom/page-descriptors.html diff --git a/tests/wpt/web-platform-tests/css/cssom/preferred-stylesheet-order.html b/tests/wpt/tests/css/cssom/preferred-stylesheet-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/preferred-stylesheet-order.html rename to tests/wpt/tests/css/cssom/preferred-stylesheet-order.html diff --git a/tests/wpt/web-platform-tests/css/cssom/preferred-stylesheet-reversed-order.html b/tests/wpt/tests/css/cssom/preferred-stylesheet-reversed-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/preferred-stylesheet-reversed-order.html rename to tests/wpt/tests/css/cssom/preferred-stylesheet-reversed-order.html diff --git a/tests/wpt/web-platform-tests/css/cssom/property-accessors.html b/tests/wpt/tests/css/cssom/property-accessors.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/property-accessors.html rename to tests/wpt/tests/css/cssom/property-accessors.html diff --git a/tests/wpt/web-platform-tests/css/cssom/removerule-invalidation-crash.html b/tests/wpt/tests/css/cssom/removerule-invalidation-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/removerule-invalidation-crash.html rename to tests/wpt/tests/css/cssom/removerule-invalidation-crash.html diff --git a/tests/wpt/web-platform-tests/css/cssom/rule-restrictions.html b/tests/wpt/tests/css/cssom/rule-restrictions.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/rule-restrictions.html rename to tests/wpt/tests/css/cssom/rule-restrictions.html diff --git a/tests/wpt/web-platform-tests/css/cssom/selectorSerialize.html b/tests/wpt/tests/css/cssom/selectorSerialize.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/selectorSerialize.html rename to tests/wpt/tests/css/cssom/selectorSerialize.html diff --git a/tests/wpt/web-platform-tests/css/cssom/selectorText-modification-restyle-001-ref.html b/tests/wpt/tests/css/cssom/selectorText-modification-restyle-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/selectorText-modification-restyle-001-ref.html rename to tests/wpt/tests/css/cssom/selectorText-modification-restyle-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/cssom/selectorText-modification-restyle-001.html b/tests/wpt/tests/css/cssom/selectorText-modification-restyle-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/selectorText-modification-restyle-001.html rename to tests/wpt/tests/css/cssom/selectorText-modification-restyle-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom/selectorText-modification-restyle-002.html b/tests/wpt/tests/css/cssom/selectorText-modification-restyle-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/selectorText-modification-restyle-002.html rename to tests/wpt/tests/css/cssom/selectorText-modification-restyle-002.html diff --git a/tests/wpt/web-platform-tests/css/cssom/serialization-CSSDeclaration-with-important.html b/tests/wpt/tests/css/cssom/serialization-CSSDeclaration-with-important.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/serialization-CSSDeclaration-with-important.html rename to tests/wpt/tests/css/cssom/serialization-CSSDeclaration-with-important.html diff --git a/tests/wpt/web-platform-tests/css/cssom/serialize-all-longhands.html b/tests/wpt/tests/css/cssom/serialize-all-longhands.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/serialize-all-longhands.html rename to tests/wpt/tests/css/cssom/serialize-all-longhands.html diff --git a/tests/wpt/web-platform-tests/css/cssom/serialize-custom-props.html b/tests/wpt/tests/css/cssom/serialize-custom-props.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/serialize-custom-props.html rename to tests/wpt/tests/css/cssom/serialize-custom-props.html diff --git a/tests/wpt/web-platform-tests/css/cssom/serialize-media-rule.html b/tests/wpt/tests/css/cssom/serialize-media-rule.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/serialize-media-rule.html rename to tests/wpt/tests/css/cssom/serialize-media-rule.html diff --git a/tests/wpt/web-platform-tests/css/cssom/serialize-namespaced-type-selectors.html b/tests/wpt/tests/css/cssom/serialize-namespaced-type-selectors.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/serialize-namespaced-type-selectors.html rename to tests/wpt/tests/css/cssom/serialize-namespaced-type-selectors.html diff --git a/tests/wpt/web-platform-tests/css/cssom/serialize-values.html b/tests/wpt/tests/css/cssom/serialize-values.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/serialize-values.html rename to tests/wpt/tests/css/cssom/serialize-values.html diff --git a/tests/wpt/web-platform-tests/css/cssom/serialize-variable-reference.html b/tests/wpt/tests/css/cssom/serialize-variable-reference.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/serialize-variable-reference.html rename to tests/wpt/tests/css/cssom/serialize-variable-reference.html diff --git a/tests/wpt/web-platform-tests/css/cssom/setproperty-null-undefined.html b/tests/wpt/tests/css/cssom/setproperty-null-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/setproperty-null-undefined.html rename to tests/wpt/tests/css/cssom/setproperty-null-undefined.html diff --git a/tests/wpt/web-platform-tests/css/cssom/shorthand-serialization.html b/tests/wpt/tests/css/cssom/shorthand-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/shorthand-serialization.html rename to tests/wpt/tests/css/cssom/shorthand-serialization.html diff --git a/tests/wpt/web-platform-tests/css/cssom/shorthand-values.html b/tests/wpt/tests/css/cssom/shorthand-values.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/shorthand-values.html rename to tests/wpt/tests/css/cssom/shorthand-values.html diff --git a/tests/wpt/web-platform-tests/css/cssom/style-attr-update-across-documents.html b/tests/wpt/tests/css/cssom/style-attr-update-across-documents.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/style-attr-update-across-documents.html rename to tests/wpt/tests/css/cssom/style-attr-update-across-documents.html diff --git a/tests/wpt/web-platform-tests/css/cssom/style-sheet-interfaces-001.html b/tests/wpt/tests/css/cssom/style-sheet-interfaces-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/style-sheet-interfaces-001.html rename to tests/wpt/tests/css/cssom/style-sheet-interfaces-001.html diff --git a/tests/wpt/web-platform-tests/css/cssom/style-sheet-interfaces-002.html b/tests/wpt/tests/css/cssom/style-sheet-interfaces-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/style-sheet-interfaces-002.html rename to tests/wpt/tests/css/cssom/style-sheet-interfaces-002.html diff --git a/tests/wpt/web-platform-tests/css/cssom/stylesheet-replacedata-dynamic-ref.html b/tests/wpt/tests/css/cssom/stylesheet-replacedata-dynamic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/stylesheet-replacedata-dynamic-ref.html rename to tests/wpt/tests/css/cssom/stylesheet-replacedata-dynamic-ref.html diff --git a/tests/wpt/web-platform-tests/css/cssom/stylesheet-replacedata-dynamic.html b/tests/wpt/tests/css/cssom/stylesheet-replacedata-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/stylesheet-replacedata-dynamic.html rename to tests/wpt/tests/css/cssom/stylesheet-replacedata-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/cssom/stylesheet-same-origin.css b/tests/wpt/tests/css/cssom/stylesheet-same-origin.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/stylesheet-same-origin.css rename to tests/wpt/tests/css/cssom/stylesheet-same-origin.css diff --git a/tests/wpt/web-platform-tests/css/cssom/stylesheet-same-origin.sub.html b/tests/wpt/tests/css/cssom/stylesheet-same-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/stylesheet-same-origin.sub.html rename to tests/wpt/tests/css/cssom/stylesheet-same-origin.sub.html diff --git a/tests/wpt/web-platform-tests/css/cssom/stylesheet-title.html b/tests/wpt/tests/css/cssom/stylesheet-title.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/stylesheet-title.html rename to tests/wpt/tests/css/cssom/stylesheet-title.html diff --git a/tests/wpt/web-platform-tests/css/cssom/support/1x1-green.png b/tests/wpt/tests/css/cssom/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/1x1-green.png rename to tests/wpt/tests/css/cssom/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/1x1-lime.png b/tests/wpt/tests/css/cssom/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/1x1-lime.png rename to tests/wpt/tests/css/cssom/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/1x1-maroon.png b/tests/wpt/tests/css/cssom/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/1x1-maroon.png rename to tests/wpt/tests/css/cssom/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/1x1-navy.png b/tests/wpt/tests/css/cssom/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/1x1-navy.png rename to tests/wpt/tests/css/cssom/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/1x1-red.png b/tests/wpt/tests/css/cssom/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/1x1-red.png rename to tests/wpt/tests/css/cssom/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/1x1-white.png b/tests/wpt/tests/css/cssom/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/1x1-white.png rename to tests/wpt/tests/css/cssom/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/60x60-gg-rr.png b/tests/wpt/tests/css/cssom/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/60x60-gg-rr.png rename to tests/wpt/tests/css/cssom/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/60x60-green.png b/tests/wpt/tests/css/cssom/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/60x60-green.png rename to tests/wpt/tests/css/cssom/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/README b/tests/wpt/tests/css/cssom/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/README rename to tests/wpt/tests/css/cssom/support/README diff --git a/tests/wpt/web-platform-tests/css/cssom/support/a-green.css b/tests/wpt/tests/css/cssom/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/a-green.css rename to tests/wpt/tests/css/cssom/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/cssom/support/b-green.css b/tests/wpt/tests/css/cssom/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/b-green.css rename to tests/wpt/tests/css/cssom/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/cssom/support/black.css b/tests/wpt/tests/css/cssom/support/black.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/black.css rename to tests/wpt/tests/css/cssom/support/black.css diff --git a/tests/wpt/web-platform-tests/css/cssom/support/c-red.css b/tests/wpt/tests/css/cssom/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/c-red.css rename to tests/wpt/tests/css/cssom/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/cssom/support/cat.png b/tests/wpt/tests/css/cssom/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/cat.png rename to tests/wpt/tests/css/cssom/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/constructable-import.css b/tests/wpt/tests/css/cssom/support/constructable-import.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/constructable-import.css rename to tests/wpt/tests/css/cssom/support/constructable-import.css diff --git a/tests/wpt/web-platform-tests/css/cssom/support/getComputedStyle-insets.js b/tests/wpt/tests/css/cssom/support/getComputedStyle-insets.js similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/getComputedStyle-insets.js rename to tests/wpt/tests/css/cssom/support/getComputedStyle-insets.js diff --git a/tests/wpt/web-platform-tests/css/cssom/support/import-charset.css b/tests/wpt/tests/css/cssom/support/import-charset.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/import-charset.css rename to tests/wpt/tests/css/cssom/support/import-charset.css diff --git a/tests/wpt/web-platform-tests/css/cssom/support/import-green.css b/tests/wpt/tests/css/cssom/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/import-green.css rename to tests/wpt/tests/css/cssom/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/cssom/support/import-red.css b/tests/wpt/tests/css/cssom/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/import-red.css rename to tests/wpt/tests/css/cssom/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/cssom/support/import-rule.css b/tests/wpt/tests/css/cssom/support/import-rule.css similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/import-rule.css rename to tests/wpt/tests/css/cssom/support/import-rule.css diff --git a/tests/wpt/web-platform-tests/css/cssom/support/malformed-http-response.asis b/tests/wpt/tests/css/cssom/support/malformed-http-response.asis similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/malformed-http-response.asis rename to tests/wpt/tests/css/cssom/support/malformed-http-response.asis diff --git a/tests/wpt/web-platform-tests/css/cssom/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/cssom/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/cssom/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/cssom/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/cssom/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/cssom/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/cssom/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/pattern-tr.png b/tests/wpt/tests/css/cssom/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/pattern-tr.png rename to tests/wpt/tests/css/cssom/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/ruler-h-50%.png b/tests/wpt/tests/css/cssom/support/ruler-h-50%.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/ruler-h-50%.png rename to tests/wpt/tests/css/cssom/support/ruler-h-50%.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/ruler-h-50px.png b/tests/wpt/tests/css/cssom/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/ruler-h-50px.png rename to tests/wpt/tests/css/cssom/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/ruler-v-100px.png b/tests/wpt/tests/css/cssom/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/ruler-v-100px.png rename to tests/wpt/tests/css/cssom/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/ruler-v-50px.png b/tests/wpt/tests/css/cssom/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/ruler-v-50px.png rename to tests/wpt/tests/css/cssom/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/square-purple.png b/tests/wpt/tests/css/cssom/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/square-purple.png rename to tests/wpt/tests/css/cssom/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/square-teal.png b/tests/wpt/tests/css/cssom/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/square-teal.png rename to tests/wpt/tests/css/cssom/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/square-white.png b/tests/wpt/tests/css/cssom/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/square-white.png rename to tests/wpt/tests/css/cssom/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/support/README b/tests/wpt/tests/css/cssom/support/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/support/README rename to tests/wpt/tests/css/cssom/support/support/README diff --git a/tests/wpt/web-platform-tests/css/cssom/support/support/swatch-green.png b/tests/wpt/tests/css/cssom/support/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/support/swatch-green.png rename to tests/wpt/tests/css/cssom/support/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/support/swatch-red.png b/tests/wpt/tests/css/cssom/support/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/support/swatch-red.png rename to tests/wpt/tests/css/cssom/support/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/swatch-blue.png b/tests/wpt/tests/css/cssom/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/swatch-blue.png rename to tests/wpt/tests/css/cssom/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/swatch-green.png b/tests/wpt/tests/css/cssom/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/swatch-green.png rename to tests/wpt/tests/css/cssom/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/swatch-lime.png b/tests/wpt/tests/css/cssom/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/swatch-lime.png rename to tests/wpt/tests/css/cssom/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/swatch-orange.png b/tests/wpt/tests/css/cssom/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/swatch-orange.png rename to tests/wpt/tests/css/cssom/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/swatch-red.png b/tests/wpt/tests/css/cssom/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/swatch-red.png rename to tests/wpt/tests/css/cssom/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/swatch-teal.png b/tests/wpt/tests/css/cssom/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/swatch-teal.png rename to tests/wpt/tests/css/cssom/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/swatch-white.png b/tests/wpt/tests/css/cssom/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/swatch-white.png rename to tests/wpt/tests/css/cssom/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/swatch-yellow.png b/tests/wpt/tests/css/cssom/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/swatch-yellow.png rename to tests/wpt/tests/css/cssom/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/test-bl.png b/tests/wpt/tests/css/cssom/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/test-bl.png rename to tests/wpt/tests/css/cssom/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/test-br.png b/tests/wpt/tests/css/cssom/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/test-br.png rename to tests/wpt/tests/css/cssom/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/test-inner-half-size.png b/tests/wpt/tests/css/cssom/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/test-inner-half-size.png rename to tests/wpt/tests/css/cssom/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/test-outer.png b/tests/wpt/tests/css/cssom/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/test-outer.png rename to tests/wpt/tests/css/cssom/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/test-tl.png b/tests/wpt/tests/css/cssom/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/test-tl.png rename to tests/wpt/tests/css/cssom/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/test-tr.png b/tests/wpt/tests/css/cssom/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/test-tr.png rename to tests/wpt/tests/css/cssom/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/cssom/support/xmlss-pi.xhtml b/tests/wpt/tests/css/cssom/support/xmlss-pi.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/support/xmlss-pi.xhtml rename to tests/wpt/tests/css/cssom/support/xmlss-pi.xhtml diff --git a/tests/wpt/web-platform-tests/css/cssom/ttwf-cssom-doc-ext-load-count.html b/tests/wpt/tests/css/cssom/ttwf-cssom-doc-ext-load-count.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/ttwf-cssom-doc-ext-load-count.html rename to tests/wpt/tests/css/cssom/ttwf-cssom-doc-ext-load-count.html diff --git a/tests/wpt/web-platform-tests/css/cssom/ttwf-cssom-doc-ext-load-tree-order.html b/tests/wpt/tests/css/cssom/ttwf-cssom-doc-ext-load-tree-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/ttwf-cssom-doc-ext-load-tree-order.html rename to tests/wpt/tests/css/cssom/ttwf-cssom-doc-ext-load-tree-order.html diff --git a/tests/wpt/web-platform-tests/css/cssom/ttwf-cssom-document-extension.html b/tests/wpt/tests/css/cssom/ttwf-cssom-document-extension.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/ttwf-cssom-document-extension.html rename to tests/wpt/tests/css/cssom/ttwf-cssom-document-extension.html diff --git a/tests/wpt/web-platform-tests/css/cssom/variable-names.html b/tests/wpt/tests/css/cssom/variable-names.html similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/variable-names.html rename to tests/wpt/tests/css/cssom/variable-names.html diff --git a/tests/wpt/web-platform-tests/css/cssom/xml-stylesheet-pi-in-doctype.xhtml b/tests/wpt/tests/css/cssom/xml-stylesheet-pi-in-doctype.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/cssom/xml-stylesheet-pi-in-doctype.xhtml rename to tests/wpt/tests/css/cssom/xml-stylesheet-pi-in-doctype.xhtml diff --git a/tests/wpt/web-platform-tests/css/fetching/fetch-resources.sub.html b/tests/wpt/tests/css/fetching/fetch-resources.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/css/fetching/fetch-resources.sub.html rename to tests/wpt/tests/css/fetching/fetch-resources.sub.html diff --git a/tests/wpt/web-platform-tests/css/fetching/support/echo-css.py b/tests/wpt/tests/css/fetching/support/echo-css.py similarity index 100% rename from tests/wpt/web-platform-tests/css/fetching/support/echo-css.py rename to tests/wpt/tests/css/fetching/support/echo-css.py diff --git a/tests/wpt/web-platform-tests/css/fetching/support/echo-headers.py b/tests/wpt/tests/css/fetching/support/echo-headers.py similarity index 100% rename from tests/wpt/web-platform-tests/css/fetching/support/echo-headers.py rename to tests/wpt/tests/css/fetching/support/echo-headers.py diff --git a/tests/wpt/web-platform-tests/css/fetching/support/echo-helper.js b/tests/wpt/tests/css/fetching/support/echo-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/css/fetching/support/echo-helper.js rename to tests/wpt/tests/css/fetching/support/echo-helper.js diff --git a/tests/wpt/web-platform-tests/css/filter-effects/META.yml b/tests/wpt/tests/css/filter-effects/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/META.yml rename to tests/wpt/tests/css/filter-effects/META.yml diff --git a/tests/wpt/web-platform-tests/css/filter-effects/animation/backdrop-filter-interpolation-001.html b/tests/wpt/tests/css/filter-effects/animation/backdrop-filter-interpolation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/animation/backdrop-filter-interpolation-001.html rename to tests/wpt/tests/css/filter-effects/animation/backdrop-filter-interpolation-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/animation/backdrop-filter-interpolation-002.html b/tests/wpt/tests/css/filter-effects/animation/backdrop-filter-interpolation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/animation/backdrop-filter-interpolation-002.html rename to tests/wpt/tests/css/filter-effects/animation/backdrop-filter-interpolation-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/animation/backdrop-filter-interpolation-003.html b/tests/wpt/tests/css/filter-effects/animation/backdrop-filter-interpolation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/animation/backdrop-filter-interpolation-003.html rename to tests/wpt/tests/css/filter-effects/animation/backdrop-filter-interpolation-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/animation/backdrop-filter-interpolation-004.html b/tests/wpt/tests/css/filter-effects/animation/backdrop-filter-interpolation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/animation/backdrop-filter-interpolation-004.html rename to tests/wpt/tests/css/filter-effects/animation/backdrop-filter-interpolation-004.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/animation/color-interpolation-filters-no-interpolation.html b/tests/wpt/tests/css/filter-effects/animation/color-interpolation-filters-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/animation/color-interpolation-filters-no-interpolation.html rename to tests/wpt/tests/css/filter-effects/animation/color-interpolation-filters-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/animation/filter-interpolation-001.html b/tests/wpt/tests/css/filter-effects/animation/filter-interpolation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/animation/filter-interpolation-001.html rename to tests/wpt/tests/css/filter-effects/animation/filter-interpolation-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/animation/filter-interpolation-002.html b/tests/wpt/tests/css/filter-effects/animation/filter-interpolation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/animation/filter-interpolation-002.html rename to tests/wpt/tests/css/filter-effects/animation/filter-interpolation-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/animation/filter-interpolation-003.html b/tests/wpt/tests/css/filter-effects/animation/filter-interpolation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/animation/filter-interpolation-003.html rename to tests/wpt/tests/css/filter-effects/animation/filter-interpolation-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/animation/filter-interpolation-004.html b/tests/wpt/tests/css/filter-effects/animation/filter-interpolation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/animation/filter-interpolation-004.html rename to tests/wpt/tests/css/filter-effects/animation/filter-interpolation-004.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-basic-background-color-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-basic-background-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-basic-background-color-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-basic-background-color-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-basic-opacity-2-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-basic-opacity-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-basic-opacity-2-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-basic-opacity-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-basic-opacity-2.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-basic-opacity-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-basic-opacity-2.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-basic-opacity-2.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-basic-opacity-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-basic-opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-basic-opacity-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-basic-opacity-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-basic-opacity.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-basic-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-basic-opacity.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-basic-opacity.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-basic-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-basic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-basic-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-basic-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-basic.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-basic.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-basic.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clip-rect-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-clip-rect-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clip-rect-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-clip-rect-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clip-rect.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-clip-rect.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clip-rect.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-clip-rect.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clip-rounded-clip-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-clip-rounded-clip-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clip-rounded-clip-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-clip-rounded-clip-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clip-rounded-clip.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-clip-rounded-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clip-rounded-clip.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-clip-rounded-clip.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clipped-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-clipped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clipped-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-clipped-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clipped.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-clipped.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clipped.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-clipped.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-containing-block-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-containing-block-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-containing-block-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-containing-block-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-containing-block.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-containing-block.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-containing-block.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-containing-block.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-edge-behavior-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-edge-behavior-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-edge-behavior-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-edge-behavior-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-edge-behavior.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-edge-behavior.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-edge-behavior.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-edge-behavior.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-edge-clipping.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-edge-clipping.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-edge-clipping.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-edge-clipping.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-edge-pixels-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-edge-pixels-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-edge-pixels-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-edge-pixels-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-edge-pixels.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-edge-pixels.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-edge-pixels.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-edge-pixels.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-feimage-crash.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-feimage-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-feimage-crash.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-feimage-crash.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-fixed-clip-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-fixed-clip-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-fixed-clip-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-fixed-clip-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-fixed-clip.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-fixed-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-fixed-clip.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-fixed-clip.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-invalid.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-invalid.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-invalid.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-isolation-fixed.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-isolation-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-isolation-fixed.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-isolation-fixed.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-isolation-isolate.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-isolation-isolate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-isolation-isolate.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-isolation-isolate.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-isolation-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-isolation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-isolation-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-isolation-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-isolation.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-isolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-isolation.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-isolation.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-non-isolation-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-non-isolation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-non-isolation-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-non-isolation-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-opacity-rounded-clip-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-opacity-rounded-clip-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-opacity-rounded-clip-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-opacity-rounded-clip-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-opacity-rounded-clip.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-opacity-rounded-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-opacity-rounded-clip.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-opacity-rounded-clip.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-paint-order-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-paint-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-paint-order-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-paint-order-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-paint-order.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-paint-order.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-paint-order.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-paint-order.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-plus-filter-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-plus-filter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-plus-filter-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-plus-filter-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-plus-filter.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-plus-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-plus-filter.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-plus-filter.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-plus-opacity-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-plus-opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-plus-opacity-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-plus-opacity-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-plus-opacity.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-plus-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-plus-opacity.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-plus-opacity.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-plus-will-change-opacity.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-plus-will-change-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-plus-will-change-opacity.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-plus-will-change-opacity.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-reference-filter.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-reference-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-reference-filter.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-reference-filter.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-root-element-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-root-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-root-element-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-root-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-root-element.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-root-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-root-element.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-root-element.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-svg-background-image-blur.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-svg-background-image-blur.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-svg-background-image-blur.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-svg-background-image-blur.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-svg-foreignObject.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-svg-foreignObject.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-svg-foreignObject.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-svg-foreignObject.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-update-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-update-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-update-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-update-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-update.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-update.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-update.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-update.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-zero-size-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-zero-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-zero-size-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-zero-size-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-zero-size.html b/tests/wpt/tests/css/filter-effects/backdrop-filter-zero-size.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-zero-size.html rename to tests/wpt/tests/css/filter-effects/backdrop-filter-zero-size.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-brightness-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-brightness-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-brightness-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-brightness-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-brightness.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-brightness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-brightness.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-brightness.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-contrast-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-contrast-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-contrast-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-contrast-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-contrast.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-contrast.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-contrast.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-contrast.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-grayscale-001.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-grayscale-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-grayscale-001.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-grayscale-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-grayscale-002.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-grayscale-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-grayscale-002.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-grayscale-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-grayscale-003.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-grayscale-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-grayscale-003.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-grayscale-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-hue-rotate-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-hue-rotate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-hue-rotate-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-hue-rotate-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-hue-rotate.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-hue-rotate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-hue-rotate.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-hue-rotate.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-invert-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-invert-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-invert-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-invert-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-invert.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-invert.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-invert.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-invert.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-opacity-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-opacity-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-opacity-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-opacity.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-opacity.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-opacity.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-saturate-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-saturate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-saturate-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-saturate-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-saturate.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-saturate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-saturate.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-saturate.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-sepia-ref.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-sepia-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-sepia-ref.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-sepia-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-sepia.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-sepia.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/backdrop-filters-sepia.html rename to tests/wpt/tests/css/filter-effects/backdrop-filters-sepia.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/background-image-blur-repaint.html b/tests/wpt/tests/css/filter-effects/background-image-blur-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/background-image-blur-repaint.html rename to tests/wpt/tests/css/filter-effects/background-image-blur-repaint.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/blur-clip-stacking-context-001.html b/tests/wpt/tests/css/filter-effects/blur-clip-stacking-context-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/blur-clip-stacking-context-001.html rename to tests/wpt/tests/css/filter-effects/blur-clip-stacking-context-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/blur-clip-stacking-context-002.html b/tests/wpt/tests/css/filter-effects/blur-clip-stacking-context-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/blur-clip-stacking-context-002.html rename to tests/wpt/tests/css/filter-effects/blur-clip-stacking-context-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/blur-clip-stacking-context-ref.html b/tests/wpt/tests/css/filter-effects/blur-clip-stacking-context-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/blur-clip-stacking-context-ref.html rename to tests/wpt/tests/css/filter-effects/blur-clip-stacking-context-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/clip-under-filter-001.html b/tests/wpt/tests/css/filter-effects/clip-under-filter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/clip-under-filter-001.html rename to tests/wpt/tests/css/filter-effects/clip-under-filter-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/clip-under-filter-002.html b/tests/wpt/tests/css/filter-effects/clip-under-filter-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/clip-under-filter-002.html rename to tests/wpt/tests/css/filter-effects/clip-under-filter-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/clip-under-filter-003.html b/tests/wpt/tests/css/filter-effects/clip-under-filter-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/clip-under-filter-003.html rename to tests/wpt/tests/css/filter-effects/clip-under-filter-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/crashtests/broken-reference-crash-001.html b/tests/wpt/tests/css/filter-effects/crashtests/broken-reference-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/crashtests/broken-reference-crash-001.html rename to tests/wpt/tests/css/filter-effects/crashtests/broken-reference-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/crashtests/felighting-display-none-mutation-crash.html b/tests/wpt/tests/css/filter-effects/crashtests/felighting-display-none-mutation-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/crashtests/felighting-display-none-mutation-crash.html rename to tests/wpt/tests/css/filter-effects/crashtests/felighting-display-none-mutation-crash.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/crashtests/multiple-references-id-crash-001.html b/tests/wpt/tests/css/filter-effects/crashtests/multiple-references-id-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/crashtests/multiple-references-id-crash-001.html rename to tests/wpt/tests/css/filter-effects/crashtests/multiple-references-id-crash-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/crashtests/multiple-references-id-crash-002.html b/tests/wpt/tests/css/filter-effects/crashtests/multiple-references-id-crash-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/crashtests/multiple-references-id-crash-002.html rename to tests/wpt/tests/css/filter-effects/crashtests/multiple-references-id-crash-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-blur-ref.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-blur-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-blur-ref.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-blur-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-blur.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-blur.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-blur.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-blur.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-brightness-ref.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-brightness-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-brightness-ref.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-brightness-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-brightness.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-brightness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-brightness.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-brightness.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-combined-ref.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-combined-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-combined-ref.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-combined-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-combined.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-combined.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-combined.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-combined.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-contrast-ref.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-contrast-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-contrast-ref.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-contrast-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-contrast.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-contrast.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-contrast.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-contrast.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-drop-shadow-ref.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-drop-shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-drop-shadow-ref.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-drop-shadow-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-drop-shadow.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-drop-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-drop-shadow.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-drop-shadow.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-grayscale-ref.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-grayscale-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-grayscale-ref.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-grayscale-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-grayscale.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-grayscale.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-grayscale.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-grayscale.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-hue-rotate-ref.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-hue-rotate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-hue-rotate-ref.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-hue-rotate-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-hue-rotate.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-hue-rotate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-hue-rotate.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-hue-rotate.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-invert-ref.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-invert-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-invert-ref.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-invert-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-invert.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-invert.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-invert.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-invert.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-opacity-ref.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-opacity-ref.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-opacity-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-opacity.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-opacity.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-opacity.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-saturate-ref.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-saturate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-saturate-ref.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-saturate-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-saturate.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-saturate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-saturate.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-saturate.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-sepia-ref.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-sepia-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-sepia-ref.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-sepia-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-sepia.html b/tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-sepia.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-backdrop-filters-animation-sepia.html rename to tests/wpt/tests/css/filter-effects/css-backdrop-filters-animation-sepia.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-blur-ref.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-blur-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-blur-ref.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-blur-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-blur.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-blur.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-blur.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-blur.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-brightness-ref.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-brightness-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-brightness-ref.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-brightness-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-brightness.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-brightness.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-brightness.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-brightness.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-combined-001-ref.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-combined-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-combined-001-ref.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-combined-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-combined-001.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-combined-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-combined-001.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-combined-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-contrast-ref.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-contrast-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-contrast-ref.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-contrast-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-contrast.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-contrast.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-contrast.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-contrast.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-drop-shadow-ref.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-drop-shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-drop-shadow-ref.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-drop-shadow-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-drop-shadow.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-drop-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-drop-shadow.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-drop-shadow.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-grayscale-ref.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-grayscale-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-grayscale-ref.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-grayscale-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-grayscale.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-grayscale.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-grayscale.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-grayscale.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-hue-rotate-ref.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-hue-rotate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-hue-rotate-ref.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-hue-rotate-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-hue-rotate.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-hue-rotate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-hue-rotate.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-hue-rotate.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-invert-ref.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-invert-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-invert-ref.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-invert-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-invert.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-invert.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-invert.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-invert.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-opacity-ref.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-opacity-ref.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-opacity-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-opacity.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-opacity.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-opacity.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-saturate-ref.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-saturate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-saturate-ref.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-saturate-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-saturate.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-saturate.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-saturate.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-saturate.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-sepia-ref.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-sepia-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-sepia-ref.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-sepia-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-sepia.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-sepia.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/css-filters-animation-sepia.html rename to tests/wpt/tests/css/filter-effects/css-filters-animation-sepia.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/drop-shadow-clipped-001.html b/tests/wpt/tests/css/filter-effects/drop-shadow-clipped-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/drop-shadow-clipped-001.html rename to tests/wpt/tests/css/filter-effects/drop-shadow-clipped-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/dynamic-filter-changes-001.html b/tests/wpt/tests/css/filter-effects/dynamic-filter-changes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/dynamic-filter-changes-001.html rename to tests/wpt/tests/css/filter-effects/dynamic-filter-changes-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-add-hw-001.html b/tests/wpt/tests/css/filter-effects/effect-reference-add-hw-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-add-hw-001.html rename to tests/wpt/tests/css/filter-effects/effect-reference-add-hw-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-after-001.html b/tests/wpt/tests/css/filter-effects/effect-reference-after-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-after-001.html rename to tests/wpt/tests/css/filter-effects/effect-reference-after-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-delete.html b/tests/wpt/tests/css/filter-effects/effect-reference-delete.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-delete.html rename to tests/wpt/tests/css/filter-effects/effect-reference-delete.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-displacement-negative-scale-001.html b/tests/wpt/tests/css/filter-effects/effect-reference-displacement-negative-scale-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-displacement-negative-scale-001.html rename to tests/wpt/tests/css/filter-effects/effect-reference-displacement-negative-scale-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-feimage-001.html b/tests/wpt/tests/css/filter-effects/effect-reference-feimage-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-feimage-001.html rename to tests/wpt/tests/css/filter-effects/effect-reference-feimage-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-feimage-002.html b/tests/wpt/tests/css/filter-effects/effect-reference-feimage-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-feimage-002.html rename to tests/wpt/tests/css/filter-effects/effect-reference-feimage-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-feimage-003.html b/tests/wpt/tests/css/filter-effects/effect-reference-feimage-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-feimage-003.html rename to tests/wpt/tests/css/filter-effects/effect-reference-feimage-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-feimage-004.html b/tests/wpt/tests/css/filter-effects/effect-reference-feimage-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-feimage-004.html rename to tests/wpt/tests/css/filter-effects/effect-reference-feimage-004.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-lighting-no-light.tentative.html b/tests/wpt/tests/css/filter-effects/effect-reference-lighting-no-light.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-lighting-no-light.tentative.html rename to tests/wpt/tests/css/filter-effects/effect-reference-lighting-no-light.tentative.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-local-url-with-base-001.html b/tests/wpt/tests/css/filter-effects/effect-reference-local-url-with-base-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-local-url-with-base-001.html rename to tests/wpt/tests/css/filter-effects/effect-reference-local-url-with-base-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-merge-no-inputs.tentative.html b/tests/wpt/tests/css/filter-effects/effect-reference-merge-no-inputs.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-merge-no-inputs.tentative.html rename to tests/wpt/tests/css/filter-effects/effect-reference-merge-no-inputs.tentative.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-obb-dimensions.html b/tests/wpt/tests/css/filter-effects/effect-reference-obb-dimensions.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-obb-dimensions.html rename to tests/wpt/tests/css/filter-effects/effect-reference-obb-dimensions.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-on-span.html b/tests/wpt/tests/css/filter-effects/effect-reference-on-span.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-on-span.html rename to tests/wpt/tests/css/filter-effects/effect-reference-on-span.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-on-transparent-element.html b/tests/wpt/tests/css/filter-effects/effect-reference-on-transparent-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-on-transparent-element.html rename to tests/wpt/tests/css/filter-effects/effect-reference-on-transparent-element.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-rename-001.html b/tests/wpt/tests/css/filter-effects/effect-reference-rename-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-rename-001.html rename to tests/wpt/tests/css/filter-effects/effect-reference-rename-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-rename-002.html b/tests/wpt/tests/css/filter-effects/effect-reference-rename-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-rename-002.html rename to tests/wpt/tests/css/filter-effects/effect-reference-rename-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-reset-style-delete-crash.html b/tests/wpt/tests/css/filter-effects/effect-reference-reset-style-delete-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-reset-style-delete-crash.html rename to tests/wpt/tests/css/filter-effects/effect-reference-reset-style-delete-crash.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-source-alpha-001.html b/tests/wpt/tests/css/filter-effects/effect-reference-source-alpha-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-source-alpha-001.html rename to tests/wpt/tests/css/filter-effects/effect-reference-source-alpha-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-source-alpha-002.html b/tests/wpt/tests/css/filter-effects/effect-reference-source-alpha-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/effect-reference-source-alpha-002.html rename to tests/wpt/tests/css/filter-effects/effect-reference-source-alpha-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/empty-element-with-filter.html b/tests/wpt/tests/css/filter-effects/empty-element-with-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/empty-element-with-filter.html rename to tests/wpt/tests/css/filter-effects/empty-element-with-filter.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/fecolormatrix-type-ref.html b/tests/wpt/tests/css/filter-effects/fecolormatrix-type-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/fecolormatrix-type-ref.html rename to tests/wpt/tests/css/filter-effects/fecolormatrix-type-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/fecolormatrix-type.html b/tests/wpt/tests/css/filter-effects/fecolormatrix-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/fecolormatrix-type.html rename to tests/wpt/tests/css/filter-effects/fecolormatrix-type.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/fecomposite-non-zero-inoffset-001.html b/tests/wpt/tests/css/filter-effects/fecomposite-non-zero-inoffset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/fecomposite-non-zero-inoffset-001.html rename to tests/wpt/tests/css/filter-effects/fecomposite-non-zero-inoffset-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/feflood-with-filter-reference.html b/tests/wpt/tests/css/filter-effects/feflood-with-filter-reference.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/feflood-with-filter-reference.html rename to tests/wpt/tests/css/filter-effects/feflood-with-filter-reference.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/feimage-circular-reference-foreign-object-crash.html b/tests/wpt/tests/css/filter-effects/feimage-circular-reference-foreign-object-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/feimage-circular-reference-foreign-object-crash.html rename to tests/wpt/tests/css/filter-effects/feimage-circular-reference-foreign-object-crash.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/feimage-reference-foreign-object-crash.html b/tests/wpt/tests/css/filter-effects/feimage-reference-foreign-object-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/feimage-reference-foreign-object-crash.html rename to tests/wpt/tests/css/filter-effects/feimage-reference-foreign-object-crash.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/feimage-target-child-reference-crash.html b/tests/wpt/tests/css/filter-effects/feimage-target-child-reference-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/feimage-target-child-reference-crash.html rename to tests/wpt/tests/css/filter-effects/feimage-target-child-reference-crash.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/felighting-no-light-source-style-update-crash.html b/tests/wpt/tests/css/filter-effects/felighting-no-light-source-style-update-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/felighting-no-light-source-style-update-crash.html rename to tests/wpt/tests/css/filter-effects/felighting-no-light-source-style-update-crash.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-cb-abspos-inline-001-ref.html b/tests/wpt/tests/css/filter-effects/filter-cb-abspos-inline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-cb-abspos-inline-001-ref.html rename to tests/wpt/tests/css/filter-effects/filter-cb-abspos-inline-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-cb-abspos-inline-001.html b/tests/wpt/tests/css/filter-effects/filter-cb-abspos-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-cb-abspos-inline-001.html rename to tests/wpt/tests/css/filter-effects/filter-cb-abspos-inline-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-cb-abspos-inline-002.html b/tests/wpt/tests/css/filter-effects/filter-cb-abspos-inline-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-cb-abspos-inline-002.html rename to tests/wpt/tests/css/filter-effects/filter-cb-abspos-inline-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-cb-abspos-inline-003-ref.html b/tests/wpt/tests/css/filter-effects/filter-cb-abspos-inline-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-cb-abspos-inline-003-ref.html rename to tests/wpt/tests/css/filter-effects/filter-cb-abspos-inline-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-cb-abspos-inline-003.html b/tests/wpt/tests/css/filter-effects/filter-cb-abspos-inline-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-cb-abspos-inline-003.html rename to tests/wpt/tests/css/filter-effects/filter-cb-abspos-inline-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-cb-dynamic-1-ref.html b/tests/wpt/tests/css/filter-effects/filter-cb-dynamic-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-cb-dynamic-1-ref.html rename to tests/wpt/tests/css/filter-effects/filter-cb-dynamic-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-cb-dynamic-1a.html b/tests/wpt/tests/css/filter-effects/filter-cb-dynamic-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-cb-dynamic-1a.html rename to tests/wpt/tests/css/filter-effects/filter-cb-dynamic-1a.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-cb-dynamic-1b.html b/tests/wpt/tests/css/filter-effects/filter-cb-dynamic-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-cb-dynamic-1b.html rename to tests/wpt/tests/css/filter-effects/filter-cb-dynamic-1b.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-chained-url-url-001.html b/tests/wpt/tests/css/filter-effects/filter-chained-url-url-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-chained-url-url-001.html rename to tests/wpt/tests/css/filter-effects/filter-chained-url-url-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-contrast-001-ref.html b/tests/wpt/tests/css/filter-effects/filter-contrast-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-contrast-001-ref.html rename to tests/wpt/tests/css/filter-effects/filter-contrast-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-contrast-001.html b/tests/wpt/tests/css/filter-effects/filter-contrast-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-contrast-001.html rename to tests/wpt/tests/css/filter-effects/filter-contrast-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-contrast-002-ref.html b/tests/wpt/tests/css/filter-effects/filter-contrast-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-contrast-002-ref.html rename to tests/wpt/tests/css/filter-effects/filter-contrast-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-contrast-002.html b/tests/wpt/tests/css/filter-effects/filter-contrast-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-contrast-002.html rename to tests/wpt/tests/css/filter-effects/filter-contrast-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-contrast-003-ref.html b/tests/wpt/tests/css/filter-effects/filter-contrast-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-contrast-003-ref.html rename to tests/wpt/tests/css/filter-effects/filter-contrast-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-contrast-003.html b/tests/wpt/tests/css/filter-effects/filter-contrast-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-contrast-003.html rename to tests/wpt/tests/css/filter-effects/filter-contrast-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-effect-remove-unattached.html b/tests/wpt/tests/css/filter-effects/filter-effect-remove-unattached.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-effect-remove-unattached.html rename to tests/wpt/tests/css/filter-effects/filter-effect-remove-unattached.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-external-001-ref.html b/tests/wpt/tests/css/filter-effects/filter-external-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-external-001-ref.html rename to tests/wpt/tests/css/filter-effects/filter-external-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-external-001-test.html b/tests/wpt/tests/css/filter-effects/filter-external-001-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-external-001-test.html rename to tests/wpt/tests/css/filter-effects/filter-external-001-test.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-external-002-test.html b/tests/wpt/tests/css/filter-effects/filter-external-002-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-external-002-test.html rename to tests/wpt/tests/css/filter-effects/filter-external-002-test.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-001.html b/tests/wpt/tests/css/filter-effects/filter-function/filter-function-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-001.html rename to tests/wpt/tests/css/filter-effects/filter-function/filter-function-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-002.html b/tests/wpt/tests/css/filter-effects/filter-function/filter-function-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-002.html rename to tests/wpt/tests/css/filter-effects/filter-function/filter-function-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-003.html b/tests/wpt/tests/css/filter-effects/filter-function/filter-function-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-003.html rename to tests/wpt/tests/css/filter-effects/filter-function/filter-function-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-004.html b/tests/wpt/tests/css/filter-effects/filter-function/filter-function-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-004.html rename to tests/wpt/tests/css/filter-effects/filter-function/filter-function-004.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-005.html b/tests/wpt/tests/css/filter-effects/filter-function/filter-function-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-005.html rename to tests/wpt/tests/css/filter-effects/filter-function/filter-function-005.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-006.html b/tests/wpt/tests/css/filter-effects/filter-function/filter-function-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-006.html rename to tests/wpt/tests/css/filter-effects/filter-function/filter-function-006.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-007.html b/tests/wpt/tests/css/filter-effects/filter-function/filter-function-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-007.html rename to tests/wpt/tests/css/filter-effects/filter-function/filter-function-007.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-008.html b/tests/wpt/tests/css/filter-effects/filter-function/filter-function-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-function/filter-function-008.html rename to tests/wpt/tests/css/filter-effects/filter-function/filter-function-008.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-function/resources/green-transparent-100x100.png b/tests/wpt/tests/css/filter-effects/filter-function/resources/green-transparent-100x100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-function/resources/green-transparent-100x100.png rename to tests/wpt/tests/css/filter-effects/filter-function/resources/green-transparent-100x100.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-function/resources/green-transparent-200x200.png b/tests/wpt/tests/css/filter-effects/filter-function/resources/green-transparent-200x200.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-function/resources/green-transparent-200x200.png rename to tests/wpt/tests/css/filter-effects/filter-function/resources/green-transparent-200x200.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-function/resources/green-transparent-20x10.png b/tests/wpt/tests/css/filter-effects/filter-function/resources/green-transparent-20x10.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-function/resources/green-transparent-20x10.png rename to tests/wpt/tests/css/filter-effects/filter-function/resources/green-transparent-20x10.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-function/resources/green-transparent-80x80.png b/tests/wpt/tests/css/filter-effects/filter-function/resources/green-transparent-80x80.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-function/resources/green-transparent-80x80.png rename to tests/wpt/tests/css/filter-effects/filter-function/resources/green-transparent-80x80.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-grayscale-001.html b/tests/wpt/tests/css/filter-effects/filter-grayscale-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-grayscale-001.html rename to tests/wpt/tests/css/filter-effects/filter-grayscale-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-grayscale-002.html b/tests/wpt/tests/css/filter-effects/filter-grayscale-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-grayscale-002.html rename to tests/wpt/tests/css/filter-effects/filter-grayscale-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-grayscale-003.html b/tests/wpt/tests/css/filter-effects/filter-grayscale-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-grayscale-003.html rename to tests/wpt/tests/css/filter-effects/filter-grayscale-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-grayscale-004.html b/tests/wpt/tests/css/filter-effects/filter-grayscale-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-grayscale-004.html rename to tests/wpt/tests/css/filter-effects/filter-grayscale-004.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-grayscale-005.html b/tests/wpt/tests/css/filter-effects/filter-grayscale-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-grayscale-005.html rename to tests/wpt/tests/css/filter-effects/filter-grayscale-005.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-grayscale-ref.html b/tests/wpt/tests/css/filter-effects/filter-grayscale-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-grayscale-ref.html rename to tests/wpt/tests/css/filter-effects/filter-grayscale-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-hue_rotate-001-ref.html b/tests/wpt/tests/css/filter-effects/filter-hue_rotate-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-hue_rotate-001-ref.html rename to tests/wpt/tests/css/filter-effects/filter-hue_rotate-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-hue_rotate-001-test.html b/tests/wpt/tests/css/filter-effects/filter-hue_rotate-001-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-hue_rotate-001-test.html rename to tests/wpt/tests/css/filter-effects/filter-hue_rotate-001-test.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-invalid-ref.html b/tests/wpt/tests/css/filter-effects/filter-invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-invalid-ref.html rename to tests/wpt/tests/css/filter-effects/filter-invalid-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-invalid.html b/tests/wpt/tests/css/filter-effects/filter-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-invalid.html rename to tests/wpt/tests/css/filter-effects/filter-invalid.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-invert-001-ref.html b/tests/wpt/tests/css/filter-effects/filter-invert-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-invert-001-ref.html rename to tests/wpt/tests/css/filter-effects/filter-invert-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-invert-001-test.html b/tests/wpt/tests/css/filter-effects/filter-invert-001-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-invert-001-test.html rename to tests/wpt/tests/css/filter-effects/filter-invert-001-test.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-invert-002-ref.html b/tests/wpt/tests/css/filter-effects/filter-invert-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-invert-002-ref.html rename to tests/wpt/tests/css/filter-effects/filter-invert-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-invert-002-test.html b/tests/wpt/tests/css/filter-effects/filter-invert-002-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-invert-002-test.html rename to tests/wpt/tests/css/filter-effects/filter-invert-002-test.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-region-calc-001.html b/tests/wpt/tests/css/filter-effects/filter-region-calc-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-region-calc-001.html rename to tests/wpt/tests/css/filter-effects/filter-region-calc-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-region-negative-positioned-child-001.html b/tests/wpt/tests/css/filter-effects/filter-region-negative-positioned-child-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-region-negative-positioned-child-001.html rename to tests/wpt/tests/css/filter-effects/filter-region-negative-positioned-child-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-region-transformed-child-001.html b/tests/wpt/tests/css/filter-effects/filter-region-transformed-child-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-region-transformed-child-001.html rename to tests/wpt/tests/css/filter-effects/filter-region-transformed-child-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-region-transformed-composited-child-001.html b/tests/wpt/tests/css/filter-effects/filter-region-transformed-composited-child-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-region-transformed-composited-child-001.html rename to tests/wpt/tests/css/filter-effects/filter-region-transformed-composited-child-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-region-units-001.html b/tests/wpt/tests/css/filter-effects/filter-region-units-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-region-units-001.html rename to tests/wpt/tests/css/filter-effects/filter-region-units-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-saturate-001-ref.html b/tests/wpt/tests/css/filter-effects/filter-saturate-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-saturate-001-ref.html rename to tests/wpt/tests/css/filter-effects/filter-saturate-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-saturate-001-test.html b/tests/wpt/tests/css/filter-effects/filter-saturate-001-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-saturate-001-test.html rename to tests/wpt/tests/css/filter-effects/filter-saturate-001-test.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-scale-001-ref.html b/tests/wpt/tests/css/filter-effects/filter-scale-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-scale-001-ref.html rename to tests/wpt/tests/css/filter-effects/filter-scale-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-scale-001.html b/tests/wpt/tests/css/filter-effects/filter-scale-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-scale-001.html rename to tests/wpt/tests/css/filter-effects/filter-scale-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-scaling-001-ref.html b/tests/wpt/tests/css/filter-effects/filter-scaling-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-scaling-001-ref.html rename to tests/wpt/tests/css/filter-effects/filter-scaling-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-scaling-001.html b/tests/wpt/tests/css/filter-effects/filter-scaling-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-scaling-001.html rename to tests/wpt/tests/css/filter-effects/filter-scaling-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-subregion-01-ref.html b/tests/wpt/tests/css/filter-effects/filter-subregion-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-subregion-01-ref.html rename to tests/wpt/tests/css/filter-effects/filter-subregion-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-subregion-01.html b/tests/wpt/tests/css/filter-effects/filter-subregion-01.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-subregion-01.html rename to tests/wpt/tests/css/filter-effects/filter-subregion-01.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-svg-background-image-blur.html b/tests/wpt/tests/css/filter-effects/filter-svg-background-image-blur.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-svg-background-image-blur.html rename to tests/wpt/tests/css/filter-effects/filter-svg-background-image-blur.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-turbulence-invalid-001.html b/tests/wpt/tests/css/filter-effects/filter-turbulence-invalid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-turbulence-invalid-001.html rename to tests/wpt/tests/css/filter-effects/filter-turbulence-invalid-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filter-url-to-non-existent-filter-001.html b/tests/wpt/tests/css/filter-effects/filter-url-to-non-existent-filter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filter-url-to-non-existent-filter-001.html rename to tests/wpt/tests/css/filter-effects/filter-url-to-non-existent-filter-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filtered-block-is-container-ref.html b/tests/wpt/tests/css/filter-effects/filtered-block-is-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filtered-block-is-container-ref.html rename to tests/wpt/tests/css/filter-effects/filtered-block-is-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filtered-block-is-container.html b/tests/wpt/tests/css/filter-effects/filtered-block-is-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filtered-block-is-container.html rename to tests/wpt/tests/css/filter-effects/filtered-block-is-container.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filtered-html-is-not-container-ref.html b/tests/wpt/tests/css/filter-effects/filtered-html-is-not-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filtered-html-is-not-container-ref.html rename to tests/wpt/tests/css/filter-effects/filtered-html-is-not-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filtered-html-is-not-container.html b/tests/wpt/tests/css/filter-effects/filtered-html-is-not-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filtered-html-is-not-container.html rename to tests/wpt/tests/css/filter-effects/filtered-html-is-not-container.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filtered-inline-applies-to-float-ref.html b/tests/wpt/tests/css/filter-effects/filtered-inline-applies-to-float-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filtered-inline-applies-to-float-ref.html rename to tests/wpt/tests/css/filter-effects/filtered-inline-applies-to-float-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filtered-inline-applies-to-float.html b/tests/wpt/tests/css/filter-effects/filtered-inline-applies-to-float.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filtered-inline-applies-to-float.html rename to tests/wpt/tests/css/filter-effects/filtered-inline-applies-to-float.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filtered-inline-is-container-ref.html b/tests/wpt/tests/css/filter-effects/filtered-inline-is-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filtered-inline-is-container-ref.html rename to tests/wpt/tests/css/filter-effects/filtered-inline-is-container-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filtered-inline-is-container.html b/tests/wpt/tests/css/filter-effects/filtered-inline-is-container.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filtered-inline-is-container.html rename to tests/wpt/tests/css/filter-effects/filtered-inline-is-container.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-drop-shadow-001.html b/tests/wpt/tests/css/filter-effects/filters-drop-shadow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-drop-shadow-001.html rename to tests/wpt/tests/css/filter-effects/filters-drop-shadow-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-drop-shadow-002.html b/tests/wpt/tests/css/filter-effects/filters-drop-shadow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-drop-shadow-002.html rename to tests/wpt/tests/css/filter-effects/filters-drop-shadow-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-drop-shadow-003.html b/tests/wpt/tests/css/filter-effects/filters-drop-shadow-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-drop-shadow-003.html rename to tests/wpt/tests/css/filter-effects/filters-drop-shadow-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-grayscale-001-ref.html b/tests/wpt/tests/css/filter-effects/filters-grayscale-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-grayscale-001-ref.html rename to tests/wpt/tests/css/filter-effects/filters-grayscale-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-grayscale-001-test.html b/tests/wpt/tests/css/filter-effects/filters-grayscale-001-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-grayscale-001-test.html rename to tests/wpt/tests/css/filter-effects/filters-grayscale-001-test.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-opacity-001-test.html b/tests/wpt/tests/css/filter-effects/filters-opacity-001-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-opacity-001-test.html rename to tests/wpt/tests/css/filter-effects/filters-opacity-001-test.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-opacity-002-test.html b/tests/wpt/tests/css/filter-effects/filters-opacity-002-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-opacity-002-test.html rename to tests/wpt/tests/css/filter-effects/filters-opacity-002-test.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-ref-brightness-001.html b/tests/wpt/tests/css/filter-effects/filters-ref-brightness-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-ref-brightness-001.html rename to tests/wpt/tests/css/filter-effects/filters-ref-brightness-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-ref-brightness-002.html b/tests/wpt/tests/css/filter-effects/filters-ref-brightness-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-ref-brightness-002.html rename to tests/wpt/tests/css/filter-effects/filters-ref-brightness-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-ref-brightness-003.html b/tests/wpt/tests/css/filter-effects/filters-ref-brightness-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-ref-brightness-003.html rename to tests/wpt/tests/css/filter-effects/filters-ref-brightness-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-sepia-001-ref.html b/tests/wpt/tests/css/filter-effects/filters-sepia-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-sepia-001-ref.html rename to tests/wpt/tests/css/filter-effects/filters-sepia-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-sepia-001-test.html b/tests/wpt/tests/css/filter-effects/filters-sepia-001-test.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-sepia-001-test.html rename to tests/wpt/tests/css/filter-effects/filters-sepia-001-test.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-test-brightness-001.html b/tests/wpt/tests/css/filter-effects/filters-test-brightness-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-test-brightness-001.html rename to tests/wpt/tests/css/filter-effects/filters-test-brightness-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-test-brightness-002.html b/tests/wpt/tests/css/filter-effects/filters-test-brightness-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-test-brightness-002.html rename to tests/wpt/tests/css/filter-effects/filters-test-brightness-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/filters-test-brightness-003.html b/tests/wpt/tests/css/filter-effects/filters-test-brightness-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/filters-test-brightness-003.html rename to tests/wpt/tests/css/filter-effects/filters-test-brightness-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/fixed-pos-filter-clip-001.html b/tests/wpt/tests/css/filter-effects/fixed-pos-filter-clip-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/fixed-pos-filter-clip-001.html rename to tests/wpt/tests/css/filter-effects/fixed-pos-filter-clip-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/fixed-pos-filter-clip-002-ref.html b/tests/wpt/tests/css/filter-effects/fixed-pos-filter-clip-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/fixed-pos-filter-clip-002-ref.html rename to tests/wpt/tests/css/filter-effects/fixed-pos-filter-clip-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/fixed-pos-filter-clip-002.html b/tests/wpt/tests/css/filter-effects/fixed-pos-filter-clip-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/fixed-pos-filter-clip-002.html rename to tests/wpt/tests/css/filter-effects/fixed-pos-filter-clip-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/idlharness.any.js b/tests/wpt/tests/css/filter-effects/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/idlharness.any.js rename to tests/wpt/tests/css/filter-effects/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/css/filter-effects/inheritance.html b/tests/wpt/tests/css/filter-effects/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/inheritance.html rename to tests/wpt/tests/css/filter-effects/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/morphology-mirrored.html b/tests/wpt/tests/css/filter-effects/morphology-mirrored.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/morphology-mirrored.html rename to tests/wpt/tests/css/filter-effects/morphology-mirrored.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/backdrop-filter-computed.html b/tests/wpt/tests/css/filter-effects/parsing/backdrop-filter-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/backdrop-filter-computed.html rename to tests/wpt/tests/css/filter-effects/parsing/backdrop-filter-computed.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/backdrop-filter-parsing-invalid.html b/tests/wpt/tests/css/filter-effects/parsing/backdrop-filter-parsing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/backdrop-filter-parsing-invalid.html rename to tests/wpt/tests/css/filter-effects/parsing/backdrop-filter-parsing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/backdrop-filter-parsing-valid.html b/tests/wpt/tests/css/filter-effects/parsing/backdrop-filter-parsing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/backdrop-filter-parsing-valid.html rename to tests/wpt/tests/css/filter-effects/parsing/backdrop-filter-parsing-valid.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/color-interpolation-filters-computed.html b/tests/wpt/tests/css/filter-effects/parsing/color-interpolation-filters-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/color-interpolation-filters-computed.html rename to tests/wpt/tests/css/filter-effects/parsing/color-interpolation-filters-computed.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/color-interpolation-filters-parsing-invalid.html b/tests/wpt/tests/css/filter-effects/parsing/color-interpolation-filters-parsing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/color-interpolation-filters-parsing-invalid.html rename to tests/wpt/tests/css/filter-effects/parsing/color-interpolation-filters-parsing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/color-interpolation-filters-parsing-valid.html b/tests/wpt/tests/css/filter-effects/parsing/color-interpolation-filters-parsing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/color-interpolation-filters-parsing-valid.html rename to tests/wpt/tests/css/filter-effects/parsing/color-interpolation-filters-parsing-valid.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/filter-computed.html b/tests/wpt/tests/css/filter-effects/parsing/filter-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/filter-computed.html rename to tests/wpt/tests/css/filter-effects/parsing/filter-computed.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/filter-parsing-invalid.html b/tests/wpt/tests/css/filter-effects/parsing/filter-parsing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/filter-parsing-invalid.html rename to tests/wpt/tests/css/filter-effects/parsing/filter-parsing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/filter-parsing-valid.html b/tests/wpt/tests/css/filter-effects/parsing/filter-parsing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/filter-parsing-valid.html rename to tests/wpt/tests/css/filter-effects/parsing/filter-parsing-valid.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/flood-color-computed.html b/tests/wpt/tests/css/filter-effects/parsing/flood-color-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/flood-color-computed.html rename to tests/wpt/tests/css/filter-effects/parsing/flood-color-computed.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/flood-color-invalid.html b/tests/wpt/tests/css/filter-effects/parsing/flood-color-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/flood-color-invalid.html rename to tests/wpt/tests/css/filter-effects/parsing/flood-color-invalid.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/flood-color-valid.html b/tests/wpt/tests/css/filter-effects/parsing/flood-color-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/flood-color-valid.html rename to tests/wpt/tests/css/filter-effects/parsing/flood-color-valid.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/flood-opacity-computed.svg b/tests/wpt/tests/css/filter-effects/parsing/flood-opacity-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/flood-opacity-computed.svg rename to tests/wpt/tests/css/filter-effects/parsing/flood-opacity-computed.svg diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/flood-opacity-invalid.svg b/tests/wpt/tests/css/filter-effects/parsing/flood-opacity-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/flood-opacity-invalid.svg rename to tests/wpt/tests/css/filter-effects/parsing/flood-opacity-invalid.svg diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/flood-opacity-valid.svg b/tests/wpt/tests/css/filter-effects/parsing/flood-opacity-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/flood-opacity-valid.svg rename to tests/wpt/tests/css/filter-effects/parsing/flood-opacity-valid.svg diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/lighting-color-computed.html b/tests/wpt/tests/css/filter-effects/parsing/lighting-color-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/lighting-color-computed.html rename to tests/wpt/tests/css/filter-effects/parsing/lighting-color-computed.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/lighting-color-parsing-invalid.html b/tests/wpt/tests/css/filter-effects/parsing/lighting-color-parsing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/lighting-color-parsing-invalid.html rename to tests/wpt/tests/css/filter-effects/parsing/lighting-color-parsing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/lighting-color-parsing-valid.html b/tests/wpt/tests/css/filter-effects/parsing/lighting-color-parsing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/parsing/lighting-color-parsing-valid.html rename to tests/wpt/tests/css/filter-effects/parsing/lighting-color-parsing-valid.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference-filter-update-on-attribute-change-001.html b/tests/wpt/tests/css/filter-effects/reference-filter-update-on-attribute-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference-filter-update-on-attribute-change-001.html rename to tests/wpt/tests/css/filter-effects/reference-filter-update-on-attribute-change-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/backdrop-filter-plus-will-change-opacity-ref.html b/tests/wpt/tests/css/filter-effects/reference/backdrop-filter-plus-will-change-opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/backdrop-filter-plus-will-change-opacity-ref.html rename to tests/wpt/tests/css/filter-effects/reference/backdrop-filter-plus-will-change-opacity-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/backdrop-filters-grayscale-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/backdrop-filters-grayscale-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/backdrop-filters-grayscale-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/backdrop-filters-grayscale-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/backdrop-filters-grayscale-002-ref.html b/tests/wpt/tests/css/filter-effects/reference/backdrop-filters-grayscale-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/backdrop-filters-grayscale-002-ref.html rename to tests/wpt/tests/css/filter-effects/reference/backdrop-filters-grayscale-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/backdrop-filters-grayscale-003-ref.html b/tests/wpt/tests/css/filter-effects/reference/backdrop-filters-grayscale-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/backdrop-filters-grayscale-003-ref.html rename to tests/wpt/tests/css/filter-effects/reference/backdrop-filters-grayscale-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/background-image-blur-repaint-ref.html b/tests/wpt/tests/css/filter-effects/reference/background-image-blur-repaint-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/background-image-blur-repaint-ref.html rename to tests/wpt/tests/css/filter-effects/reference/background-image-blur-repaint-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/clip-under-filter-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/clip-under-filter-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/clip-under-filter-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/clip-under-filter-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/clip-under-filter-002-ref.html b/tests/wpt/tests/css/filter-effects/reference/clip-under-filter-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/clip-under-filter-002-ref.html rename to tests/wpt/tests/css/filter-effects/reference/clip-under-filter-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/clip-under-filter-003-ref.html b/tests/wpt/tests/css/filter-effects/reference/clip-under-filter-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/clip-under-filter-003-ref.html rename to tests/wpt/tests/css/filter-effects/reference/clip-under-filter-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/drop-shadow-clipped-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/drop-shadow-clipped-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/drop-shadow-clipped-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/drop-shadow-clipped-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/dynamic-filter-changes-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/dynamic-filter-changes-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/dynamic-filter-changes-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/dynamic-filter-changes-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-add-hw-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-add-hw-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-add-hw-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-add-hw-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-after-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-after-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-after-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-after-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-delete-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-delete-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-delete-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-delete-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-displacement-negative-scale-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-displacement-negative-scale-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-displacement-negative-scale-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-displacement-negative-scale-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-feimage-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-feimage-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-feimage-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-feimage-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-feimage-002-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-feimage-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-feimage-002-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-feimage-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-feimage-003-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-feimage-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-feimage-003-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-feimage-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-feimage-004-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-feimage-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-feimage-004-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-feimage-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-lighting-no-light.tentative-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-lighting-no-light.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-lighting-no-light.tentative-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-lighting-no-light.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-local-url-with-base-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-local-url-with-base-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-local-url-with-base-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-local-url-with-base-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-merge-no-inputs.tentative-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-merge-no-inputs.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-merge-no-inputs.tentative-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-merge-no-inputs.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-obb-dimensions-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-obb-dimensions-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-obb-dimensions-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-obb-dimensions-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-on-span-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-on-span-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-on-span-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-on-span-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-on-transparent-element-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-on-transparent-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-on-transparent-element-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-on-transparent-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-rename-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-rename-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-rename-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-rename-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-rename-002-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-rename-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-rename-002-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-rename-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-source-alpha-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-source-alpha-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-source-alpha-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-source-alpha-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-source-alpha-002-ref.html b/tests/wpt/tests/css/filter-effects/reference/effect-reference-source-alpha-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/effect-reference-source-alpha-002-ref.html rename to tests/wpt/tests/css/filter-effects/reference/effect-reference-source-alpha-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/empty-element-with-filter-ref.html b/tests/wpt/tests/css/filter-effects/reference/empty-element-with-filter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/empty-element-with-filter-ref.html rename to tests/wpt/tests/css/filter-effects/reference/empty-element-with-filter-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/fecomposite-non-zero-inoffset-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/fecomposite-non-zero-inoffset-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/fecomposite-non-zero-inoffset-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/fecomposite-non-zero-inoffset-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/filter-effect-remove-unattached-ref.html b/tests/wpt/tests/css/filter-effects/reference/filter-effect-remove-unattached-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/filter-effect-remove-unattached-ref.html rename to tests/wpt/tests/css/filter-effects/reference/filter-effect-remove-unattached-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/filter-region-negative-positioned-child-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/filter-region-negative-positioned-child-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/filter-region-negative-positioned-child-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/filter-region-negative-positioned-child-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/filter-region-transformed-child-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/filter-region-transformed-child-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/filter-region-transformed-child-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/filter-region-transformed-child-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/filter-region-transformed-composited-child-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/filter-region-transformed-composited-child-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/filter-region-transformed-composited-child-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/filter-region-transformed-composited-child-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/filter-turbulence-invalid-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/filter-turbulence-invalid-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/filter-turbulence-invalid-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/filter-turbulence-invalid-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/filter-url-to-non-existent-filter-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/filter-url-to-non-existent-filter-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/filter-url-to-non-existent-filter-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/filter-url-to-non-existent-filter-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/filters-drop-shadow-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/filters-drop-shadow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/filters-drop-shadow-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/filters-drop-shadow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/filters-drop-shadow-002-ref.html b/tests/wpt/tests/css/filter-effects/reference/filters-drop-shadow-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/filters-drop-shadow-002-ref.html rename to tests/wpt/tests/css/filter-effects/reference/filters-drop-shadow-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/filters-drop-shadow-003-ref.html b/tests/wpt/tests/css/filter-effects/reference/filters-drop-shadow-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/filters-drop-shadow-003-ref.html rename to tests/wpt/tests/css/filter-effects/reference/filters-drop-shadow-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/filters-opacity-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/filters-opacity-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/filters-opacity-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/filters-opacity-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/filters-opacity-002-ref.html b/tests/wpt/tests/css/filter-effects/reference/filters-opacity-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/filters-opacity-002-ref.html rename to tests/wpt/tests/css/filter-effects/reference/filters-opacity-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/green-100x100.html b/tests/wpt/tests/css/filter-effects/reference/green-100x100.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/green-100x100.html rename to tests/wpt/tests/css/filter-effects/reference/green-100x100.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/green-blue-stripe-100x100.html b/tests/wpt/tests/css/filter-effects/reference/green-blue-stripe-100x100.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/green-blue-stripe-100x100.html rename to tests/wpt/tests/css/filter-effects/reference/green-blue-stripe-100x100.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/reference-filter-update-on-attribute-change-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/reference-filter-update-on-attribute-change-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/reference-filter-update-on-attribute-change-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/reference-filter-update-on-attribute-change-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/remove-filter-repaint-ref.html b/tests/wpt/tests/css/filter-effects/reference/remove-filter-repaint-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/remove-filter-repaint-ref.html rename to tests/wpt/tests/css/filter-effects/reference/remove-filter-repaint-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/repaint-added-backdrop-filter-ref.html b/tests/wpt/tests/css/filter-effects/reference/repaint-added-backdrop-filter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/repaint-added-backdrop-filter-ref.html rename to tests/wpt/tests/css/filter-effects/reference/repaint-added-backdrop-filter-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/root-element-with-opacity-filter-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/root-element-with-opacity-filter-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/root-element-with-opacity-filter-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/root-element-with-opacity-filter-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/svg-feflood-ref.html b/tests/wpt/tests/css/filter-effects/reference/svg-feflood-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/svg-feflood-ref.html rename to tests/wpt/tests/css/filter-effects/reference/svg-feflood-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/svg-feimage-ref.html b/tests/wpt/tests/css/filter-effects/reference/svg-feimage-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/svg-feimage-ref.html rename to tests/wpt/tests/css/filter-effects/reference/svg-feimage-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/svg-feoffset-ref.html b/tests/wpt/tests/css/filter-effects/reference/svg-feoffset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/svg-feoffset-ref.html rename to tests/wpt/tests/css/filter-effects/reference/svg-feoffset-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/svg-relative-urls-001-ref.html b/tests/wpt/tests/css/filter-effects/reference/svg-relative-urls-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/svg-relative-urls-001-ref.html rename to tests/wpt/tests/css/filter-effects/reference/svg-relative-urls-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/reference/svg-relative-urls-002-ref.html b/tests/wpt/tests/css/filter-effects/reference/svg-relative-urls-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/reference/svg-relative-urls-002-ref.html rename to tests/wpt/tests/css/filter-effects/reference/svg-relative-urls-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/remove-filter-repaint.html b/tests/wpt/tests/css/filter-effects/remove-filter-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/remove-filter-repaint.html rename to tests/wpt/tests/css/filter-effects/remove-filter-repaint.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/repaint-added-backdrop-filter.html b/tests/wpt/tests/css/filter-effects/repaint-added-backdrop-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/repaint-added-backdrop-filter.html rename to tests/wpt/tests/css/filter-effects/repaint-added-backdrop-filter.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/resources/reference.png b/tests/wpt/tests/css/filter-effects/resources/reference.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/resources/reference.png rename to tests/wpt/tests/css/filter-effects/resources/reference.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/root-element-with-opacity-filter-001.html b/tests/wpt/tests/css/filter-effects/root-element-with-opacity-filter-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/root-element-with-opacity-filter-001.html rename to tests/wpt/tests/css/filter-effects/root-element-with-opacity-filter-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/1x1-green.png b/tests/wpt/tests/css/filter-effects/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/1x1-green.png rename to tests/wpt/tests/css/filter-effects/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/1x1-lime.png b/tests/wpt/tests/css/filter-effects/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/1x1-lime.png rename to tests/wpt/tests/css/filter-effects/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/1x1-maroon.png b/tests/wpt/tests/css/filter-effects/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/1x1-maroon.png rename to tests/wpt/tests/css/filter-effects/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/1x1-navy.png b/tests/wpt/tests/css/filter-effects/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/1x1-navy.png rename to tests/wpt/tests/css/filter-effects/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/1x1-red.png b/tests/wpt/tests/css/filter-effects/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/1x1-red.png rename to tests/wpt/tests/css/filter-effects/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/1x1-white.png b/tests/wpt/tests/css/filter-effects/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/1x1-white.png rename to tests/wpt/tests/css/filter-effects/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/60x60-gg-rr.png b/tests/wpt/tests/css/filter-effects/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/60x60-gg-rr.png rename to tests/wpt/tests/css/filter-effects/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/60x60-green.png b/tests/wpt/tests/css/filter-effects/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/60x60-green.png rename to tests/wpt/tests/css/filter-effects/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/README b/tests/wpt/tests/css/filter-effects/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/README rename to tests/wpt/tests/css/filter-effects/support/README diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/a-green.css b/tests/wpt/tests/css/filter-effects/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/a-green.css rename to tests/wpt/tests/css/filter-effects/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/b-green.css b/tests/wpt/tests/css/filter-effects/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/b-green.css rename to tests/wpt/tests/css/filter-effects/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/c-red.css b/tests/wpt/tests/css/filter-effects/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/c-red.css rename to tests/wpt/tests/css/filter-effects/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/cat.png b/tests/wpt/tests/css/filter-effects/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/cat.png rename to tests/wpt/tests/css/filter-effects/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/color-palette.png b/tests/wpt/tests/css/filter-effects/support/color-palette.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/color-palette.png rename to tests/wpt/tests/css/filter-effects/support/color-palette.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/div-with-filter.html b/tests/wpt/tests/css/filter-effects/support/div-with-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/div-with-filter.html rename to tests/wpt/tests/css/filter-effects/support/div-with-filter.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/filter-external-002-filter.svg b/tests/wpt/tests/css/filter-effects/support/filter-external-002-filter.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/filter-external-002-filter.svg rename to tests/wpt/tests/css/filter-effects/support/filter-external-002-filter.svg diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/filter-from-external-url.css b/tests/wpt/tests/css/filter-effects/support/filter-from-external-url.css similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/filter-from-external-url.css rename to tests/wpt/tests/css/filter-effects/support/filter-from-external-url.css diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/filtersubregion00.png b/tests/wpt/tests/css/filter-effects/support/filtersubregion00.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/filtersubregion00.png rename to tests/wpt/tests/css/filter-effects/support/filtersubregion00.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/hueRotate.svg b/tests/wpt/tests/css/filter-effects/support/hueRotate.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/hueRotate.svg rename to tests/wpt/tests/css/filter-effects/support/hueRotate.svg diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/import-green.css b/tests/wpt/tests/css/filter-effects/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/import-green.css rename to tests/wpt/tests/css/filter-effects/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/import-red.css b/tests/wpt/tests/css/filter-effects/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/import-red.css rename to tests/wpt/tests/css/filter-effects/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/filter-effects/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/filter-effects/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/filter-effects/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/filter-effects/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/filter-effects/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/filter-effects/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/pattern-tr.png b/tests/wpt/tests/css/filter-effects/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/pattern-tr.png rename to tests/wpt/tests/css/filter-effects/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/ruler-h-50%.png b/tests/wpt/tests/css/filter-effects/support/ruler-h-50%.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/ruler-h-50%.png rename to tests/wpt/tests/css/filter-effects/support/ruler-h-50%.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/ruler-h-50px.png b/tests/wpt/tests/css/filter-effects/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/ruler-h-50px.png rename to tests/wpt/tests/css/filter-effects/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/ruler-v-100px.png b/tests/wpt/tests/css/filter-effects/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/ruler-v-100px.png rename to tests/wpt/tests/css/filter-effects/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/ruler-v-50px.png b/tests/wpt/tests/css/filter-effects/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/ruler-v-50px.png rename to tests/wpt/tests/css/filter-effects/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/square-purple.png b/tests/wpt/tests/css/filter-effects/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/square-purple.png rename to tests/wpt/tests/css/filter-effects/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/square-teal.png b/tests/wpt/tests/css/filter-effects/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/square-teal.png rename to tests/wpt/tests/css/filter-effects/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/square-white.png b/tests/wpt/tests/css/filter-effects/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/square-white.png rename to tests/wpt/tests/css/filter-effects/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/support/README b/tests/wpt/tests/css/filter-effects/support/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/support/README rename to tests/wpt/tests/css/filter-effects/support/support/README diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/support/swatch-green.png b/tests/wpt/tests/css/filter-effects/support/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/support/swatch-green.png rename to tests/wpt/tests/css/filter-effects/support/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/support/swatch-red.png b/tests/wpt/tests/css/filter-effects/support/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/support/swatch-red.png rename to tests/wpt/tests/css/filter-effects/support/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/swatch-blue.png b/tests/wpt/tests/css/filter-effects/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/swatch-blue.png rename to tests/wpt/tests/css/filter-effects/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/swatch-green.png b/tests/wpt/tests/css/filter-effects/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/swatch-green.png rename to tests/wpt/tests/css/filter-effects/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/swatch-lime.png b/tests/wpt/tests/css/filter-effects/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/swatch-lime.png rename to tests/wpt/tests/css/filter-effects/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/swatch-orange.png b/tests/wpt/tests/css/filter-effects/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/swatch-orange.png rename to tests/wpt/tests/css/filter-effects/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/swatch-red.png b/tests/wpt/tests/css/filter-effects/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/swatch-red.png rename to tests/wpt/tests/css/filter-effects/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/swatch-teal.png b/tests/wpt/tests/css/filter-effects/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/swatch-teal.png rename to tests/wpt/tests/css/filter-effects/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/swatch-white.png b/tests/wpt/tests/css/filter-effects/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/swatch-white.png rename to tests/wpt/tests/css/filter-effects/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/swatch-yellow.png b/tests/wpt/tests/css/filter-effects/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/swatch-yellow.png rename to tests/wpt/tests/css/filter-effects/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/test-bl.png b/tests/wpt/tests/css/filter-effects/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/test-bl.png rename to tests/wpt/tests/css/filter-effects/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/test-br.png b/tests/wpt/tests/css/filter-effects/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/test-br.png rename to tests/wpt/tests/css/filter-effects/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/test-inner-half-size.png b/tests/wpt/tests/css/filter-effects/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/test-inner-half-size.png rename to tests/wpt/tests/css/filter-effects/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/test-outer.png b/tests/wpt/tests/css/filter-effects/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/test-outer.png rename to tests/wpt/tests/css/filter-effects/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/test-tl.png b/tests/wpt/tests/css/filter-effects/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/test-tl.png rename to tests/wpt/tests/css/filter-effects/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/support/test-tr.png b/tests/wpt/tests/css/filter-effects/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/support/test-tr.png rename to tests/wpt/tests/css/filter-effects/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-empty-container-with-filter-content-added.html b/tests/wpt/tests/css/filter-effects/svg-empty-container-with-filter-content-added.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-empty-container-with-filter-content-added.html rename to tests/wpt/tests/css/filter-effects/svg-empty-container-with-filter-content-added.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-external-filter-resource.html b/tests/wpt/tests/css/filter-effects/svg-external-filter-resource.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-external-filter-resource.html rename to tests/wpt/tests/css/filter-effects/svg-external-filter-resource.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-feflood-001.html b/tests/wpt/tests/css/filter-effects/svg-feflood-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-feflood-001.html rename to tests/wpt/tests/css/filter-effects/svg-feflood-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-feimage-001.html b/tests/wpt/tests/css/filter-effects/svg-feimage-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-feimage-001.html rename to tests/wpt/tests/css/filter-effects/svg-feimage-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-feoffset-001.html b/tests/wpt/tests/css/filter-effects/svg-feoffset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-feoffset-001.html rename to tests/wpt/tests/css/filter-effects/svg-feoffset-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-filter-vs-clip-path.html b/tests/wpt/tests/css/filter-effects/svg-filter-vs-clip-path.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-filter-vs-clip-path.html rename to tests/wpt/tests/css/filter-effects/svg-filter-vs-clip-path.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-filter-vs-mask.html b/tests/wpt/tests/css/filter-effects/svg-filter-vs-mask.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-filter-vs-mask.html rename to tests/wpt/tests/css/filter-effects/svg-filter-vs-mask.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-image-root-filter-ref.html b/tests/wpt/tests/css/filter-effects/svg-image-root-filter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-image-root-filter-ref.html rename to tests/wpt/tests/css/filter-effects/svg-image-root-filter-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-image-root-filter.html b/tests/wpt/tests/css/filter-effects/svg-image-root-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-image-root-filter.html rename to tests/wpt/tests/css/filter-effects/svg-image-root-filter.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-multiple-filter-functions.html b/tests/wpt/tests/css/filter-effects/svg-multiple-filter-functions.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-multiple-filter-functions.html rename to tests/wpt/tests/css/filter-effects/svg-multiple-filter-functions.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-drop-shadow-color.html b/tests/wpt/tests/css/filter-effects/svg-mutation-drop-shadow-color.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-drop-shadow-color.html rename to tests/wpt/tests/css/filter-effects/svg-mutation-drop-shadow-color.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-drop-shadow-offset.html b/tests/wpt/tests/css/filter-effects/svg-mutation-drop-shadow-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-drop-shadow-offset.html rename to tests/wpt/tests/css/filter-effects/svg-mutation-drop-shadow-offset.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-filter-used-by-mask.html b/tests/wpt/tests/css/filter-effects/svg-mutation-filter-used-by-mask.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-filter-used-by-mask.html rename to tests/wpt/tests/css/filter-effects/svg-mutation-filter-used-by-mask.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-function-to-url.html b/tests/wpt/tests/css/filter-effects/svg-mutation-function-to-url.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-function-to-url.html rename to tests/wpt/tests/css/filter-effects/svg-mutation-function-to-url.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-group-position-changed.html b/tests/wpt/tests/css/filter-effects/svg-mutation-group-position-changed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-group-position-changed.html rename to tests/wpt/tests/css/filter-effects/svg-mutation-group-position-changed.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-group-size-changed.html b/tests/wpt/tests/css/filter-effects/svg-mutation-group-size-changed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-group-size-changed.html rename to tests/wpt/tests/css/filter-effects/svg-mutation-group-size-changed.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-group-transform-changed.html b/tests/wpt/tests/css/filter-effects/svg-mutation-group-transform-changed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-group-transform-changed.html rename to tests/wpt/tests/css/filter-effects/svg-mutation-group-transform-changed.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-object-position-changed.html b/tests/wpt/tests/css/filter-effects/svg-mutation-object-position-changed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-object-position-changed.html rename to tests/wpt/tests/css/filter-effects/svg-mutation-object-position-changed.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-object-size-changed.html b/tests/wpt/tests/css/filter-effects/svg-mutation-object-size-changed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-object-size-changed.html rename to tests/wpt/tests/css/filter-effects/svg-mutation-object-size-changed.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-object-transform-changed.html b/tests/wpt/tests/css/filter-effects/svg-mutation-object-transform-changed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-object-transform-changed.html rename to tests/wpt/tests/css/filter-effects/svg-mutation-object-transform-changed.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-single-to-multiple-001.html b/tests/wpt/tests/css/filter-effects/svg-mutation-single-to-multiple-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-single-to-multiple-001.html rename to tests/wpt/tests/css/filter-effects/svg-mutation-single-to-multiple-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-single-to-multiple-002.html b/tests/wpt/tests/css/filter-effects/svg-mutation-single-to-multiple-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-single-to-multiple-002.html rename to tests/wpt/tests/css/filter-effects/svg-mutation-single-to-multiple-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-url-to-function.html b/tests/wpt/tests/css/filter-effects/svg-mutation-url-to-function.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-mutation-url-to-function.html rename to tests/wpt/tests/css/filter-effects/svg-mutation-url-to-function.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-relative-urls-001.html b/tests/wpt/tests/css/filter-effects/svg-relative-urls-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-relative-urls-001.html rename to tests/wpt/tests/css/filter-effects/svg-relative-urls-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-relative-urls-002.html b/tests/wpt/tests/css/filter-effects/svg-relative-urls-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-relative-urls-002.html rename to tests/wpt/tests/css/filter-effects/svg-relative-urls-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-shorthand-drop-shadow-001.html b/tests/wpt/tests/css/filter-effects/svg-shorthand-drop-shadow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-shorthand-drop-shadow-001.html rename to tests/wpt/tests/css/filter-effects/svg-shorthand-drop-shadow-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-shorthand-hue-rotate-001.html b/tests/wpt/tests/css/filter-effects/svg-shorthand-hue-rotate-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-shorthand-hue-rotate-001.html rename to tests/wpt/tests/css/filter-effects/svg-shorthand-hue-rotate-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-sourcegraphic-currentcolor-dynamic-001.html b/tests/wpt/tests/css/filter-effects/svg-sourcegraphic-currentcolor-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-sourcegraphic-currentcolor-dynamic-001.html rename to tests/wpt/tests/css/filter-effects/svg-sourcegraphic-currentcolor-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-sourcegraphic-invalidation-001.html b/tests/wpt/tests/css/filter-effects/svg-sourcegraphic-invalidation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-sourcegraphic-invalidation-001.html rename to tests/wpt/tests/css/filter-effects/svg-sourcegraphic-invalidation-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-unknown-input-001.html b/tests/wpt/tests/css/filter-effects/svg-unknown-input-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-unknown-input-001.html rename to tests/wpt/tests/css/filter-effects/svg-unknown-input-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-unknown-input-002.html b/tests/wpt/tests/css/filter-effects/svg-unknown-input-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-unknown-input-002.html rename to tests/wpt/tests/css/filter-effects/svg-unknown-input-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-unknown-input-ref.html b/tests/wpt/tests/css/filter-effects/svg-unknown-input-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-unknown-input-ref.html rename to tests/wpt/tests/css/filter-effects/svg-unknown-input-ref.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svg-unused-filter-on-clippath-mutated-crash.html b/tests/wpt/tests/css/filter-effects/svg-unused-filter-on-clippath-mutated-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svg-unused-filter-on-clippath-mutated-crash.html rename to tests/wpt/tests/css/filter-effects/svg-unused-filter-on-clippath-mutated-crash.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/svgfeblendelement-mode-001.html b/tests/wpt/tests/css/filter-effects/svgfeblendelement-mode-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/svgfeblendelement-mode-001.html rename to tests/wpt/tests/css/filter-effects/svgfeblendelement-mode-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-feblend-001.html b/tests/wpt/tests/css/filter-effects/tainting-feblend-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-feblend-001.html rename to tests/wpt/tests/css/filter-effects/tainting-feblend-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-feblend-002.html b/tests/wpt/tests/css/filter-effects/tainting-feblend-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-feblend-002.html rename to tests/wpt/tests/css/filter-effects/tainting-feblend-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fecomponenttransfer-001.html b/tests/wpt/tests/css/filter-effects/tainting-fecomponenttransfer-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fecomponenttransfer-001.html rename to tests/wpt/tests/css/filter-effects/tainting-fecomponenttransfer-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fecomponenttransfer-002.html b/tests/wpt/tests/css/filter-effects/tainting-fecomponenttransfer-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fecomponenttransfer-002.html rename to tests/wpt/tests/css/filter-effects/tainting-fecomponenttransfer-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fecomposite-001.html b/tests/wpt/tests/css/filter-effects/tainting-fecomposite-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fecomposite-001.html rename to tests/wpt/tests/css/filter-effects/tainting-fecomposite-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fecomposite-002.html b/tests/wpt/tests/css/filter-effects/tainting-fecomposite-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fecomposite-002.html rename to tests/wpt/tests/css/filter-effects/tainting-fecomposite-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-feconvolvematrix-001.html b/tests/wpt/tests/css/filter-effects/tainting-feconvolvematrix-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-feconvolvematrix-001.html rename to tests/wpt/tests/css/filter-effects/tainting-feconvolvematrix-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-feconvolvematrix-002.html b/tests/wpt/tests/css/filter-effects/tainting-feconvolvematrix-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-feconvolvematrix-002.html rename to tests/wpt/tests/css/filter-effects/tainting-feconvolvematrix-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fediffuselighting-001.html b/tests/wpt/tests/css/filter-effects/tainting-fediffuselighting-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fediffuselighting-001.html rename to tests/wpt/tests/css/filter-effects/tainting-fediffuselighting-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fediffuselighting-002.html b/tests/wpt/tests/css/filter-effects/tainting-fediffuselighting-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fediffuselighting-002.html rename to tests/wpt/tests/css/filter-effects/tainting-fediffuselighting-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fediffuselighting-003.html b/tests/wpt/tests/css/filter-effects/tainting-fediffuselighting-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fediffuselighting-003.html rename to tests/wpt/tests/css/filter-effects/tainting-fediffuselighting-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fediffuselighting-dynamic.html b/tests/wpt/tests/css/filter-effects/tainting-fediffuselighting-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fediffuselighting-dynamic.html rename to tests/wpt/tests/css/filter-effects/tainting-fediffuselighting-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fedisplacementmap-001.html b/tests/wpt/tests/css/filter-effects/tainting-fedisplacementmap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fedisplacementmap-001.html rename to tests/wpt/tests/css/filter-effects/tainting-fedisplacementmap-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fedisplacementmap-002.html b/tests/wpt/tests/css/filter-effects/tainting-fedisplacementmap-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fedisplacementmap-002.html rename to tests/wpt/tests/css/filter-effects/tainting-fedisplacementmap-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fedropshadow-001.html b/tests/wpt/tests/css/filter-effects/tainting-fedropshadow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fedropshadow-001.html rename to tests/wpt/tests/css/filter-effects/tainting-fedropshadow-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fedropshadow-002.html b/tests/wpt/tests/css/filter-effects/tainting-fedropshadow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fedropshadow-002.html rename to tests/wpt/tests/css/filter-effects/tainting-fedropshadow-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fedropshadow-003.html b/tests/wpt/tests/css/filter-effects/tainting-fedropshadow-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fedropshadow-003.html rename to tests/wpt/tests/css/filter-effects/tainting-fedropshadow-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-feflood-001.html b/tests/wpt/tests/css/filter-effects/tainting-feflood-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-feflood-001.html rename to tests/wpt/tests/css/filter-effects/tainting-feflood-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-feflood-002.html b/tests/wpt/tests/css/filter-effects/tainting-feflood-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-feflood-002.html rename to tests/wpt/tests/css/filter-effects/tainting-feflood-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-feflood-dynamic.html b/tests/wpt/tests/css/filter-effects/tainting-feflood-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-feflood-dynamic.html rename to tests/wpt/tests/css/filter-effects/tainting-feflood-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fegaussianblur-001.html b/tests/wpt/tests/css/filter-effects/tainting-fegaussianblur-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fegaussianblur-001.html rename to tests/wpt/tests/css/filter-effects/tainting-fegaussianblur-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fegaussianblur-002.html b/tests/wpt/tests/css/filter-effects/tainting-fegaussianblur-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fegaussianblur-002.html rename to tests/wpt/tests/css/filter-effects/tainting-fegaussianblur-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-femorphology-001.html b/tests/wpt/tests/css/filter-effects/tainting-femorphology-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-femorphology-001.html rename to tests/wpt/tests/css/filter-effects/tainting-femorphology-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-femorphology-002.html b/tests/wpt/tests/css/filter-effects/tainting-femorphology-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-femorphology-002.html rename to tests/wpt/tests/css/filter-effects/tainting-femorphology-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-feoffset-001.html b/tests/wpt/tests/css/filter-effects/tainting-feoffset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-feoffset-001.html rename to tests/wpt/tests/css/filter-effects/tainting-feoffset-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-feoffset-002.html b/tests/wpt/tests/css/filter-effects/tainting-feoffset-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-feoffset-002.html rename to tests/wpt/tests/css/filter-effects/tainting-feoffset-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fespecularlighting-001.html b/tests/wpt/tests/css/filter-effects/tainting-fespecularlighting-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fespecularlighting-001.html rename to tests/wpt/tests/css/filter-effects/tainting-fespecularlighting-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fespecularlighting-002.html b/tests/wpt/tests/css/filter-effects/tainting-fespecularlighting-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fespecularlighting-002.html rename to tests/wpt/tests/css/filter-effects/tainting-fespecularlighting-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fespecularlighting-003.html b/tests/wpt/tests/css/filter-effects/tainting-fespecularlighting-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fespecularlighting-003.html rename to tests/wpt/tests/css/filter-effects/tainting-fespecularlighting-003.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fetile-001.html b/tests/wpt/tests/css/filter-effects/tainting-fetile-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fetile-001.html rename to tests/wpt/tests/css/filter-effects/tainting-fetile-001.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/tainting-fetile-002.html b/tests/wpt/tests/css/filter-effects/tainting-fetile-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/tainting-fetile-002.html rename to tests/wpt/tests/css/filter-effects/tainting-fetile-002.html diff --git a/tests/wpt/web-platform-tests/css/filter-effects/will-change-blur-filter-under-clip.html b/tests/wpt/tests/css/filter-effects/will-change-blur-filter-under-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/css/filter-effects/will-change-blur-filter-under-clip.html rename to tests/wpt/tests/css/filter-effects/will-change-blur-filter-under-clip.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMMatrix-001.html b/tests/wpt/tests/css/geometry/DOMMatrix-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMMatrix-001.html rename to tests/wpt/tests/css/geometry/DOMMatrix-001.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMMatrix-002.html b/tests/wpt/tests/css/geometry/DOMMatrix-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMMatrix-002.html rename to tests/wpt/tests/css/geometry/DOMMatrix-002.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMMatrix-003.html b/tests/wpt/tests/css/geometry/DOMMatrix-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMMatrix-003.html rename to tests/wpt/tests/css/geometry/DOMMatrix-003.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMMatrix-a-f-alias.html b/tests/wpt/tests/css/geometry/DOMMatrix-a-f-alias.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMMatrix-a-f-alias.html rename to tests/wpt/tests/css/geometry/DOMMatrix-a-f-alias.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMMatrix-attributes.html b/tests/wpt/tests/css/geometry/DOMMatrix-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMMatrix-attributes.html rename to tests/wpt/tests/css/geometry/DOMMatrix-attributes.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMMatrix-css-string.worker.js b/tests/wpt/tests/css/geometry/DOMMatrix-css-string.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMMatrix-css-string.worker.js rename to tests/wpt/tests/css/geometry/DOMMatrix-css-string.worker.js diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMMatrix-invert-invertible.html b/tests/wpt/tests/css/geometry/DOMMatrix-invert-invertible.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMMatrix-invert-invertible.html rename to tests/wpt/tests/css/geometry/DOMMatrix-invert-invertible.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMMatrix-invert-non-invertible.html b/tests/wpt/tests/css/geometry/DOMMatrix-invert-non-invertible.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMMatrix-invert-non-invertible.html rename to tests/wpt/tests/css/geometry/DOMMatrix-invert-non-invertible.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMMatrix-invert-preserves-2d.html b/tests/wpt/tests/css/geometry/DOMMatrix-invert-preserves-2d.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMMatrix-invert-preserves-2d.html rename to tests/wpt/tests/css/geometry/DOMMatrix-invert-preserves-2d.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMMatrix-newobject.html b/tests/wpt/tests/css/geometry/DOMMatrix-newobject.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMMatrix-newobject.html rename to tests/wpt/tests/css/geometry/DOMMatrix-newobject.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMMatrix-stringifier.html b/tests/wpt/tests/css/geometry/DOMMatrix-stringifier.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMMatrix-stringifier.html rename to tests/wpt/tests/css/geometry/DOMMatrix-stringifier.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMMatrix2DInit-validate-fixup.html b/tests/wpt/tests/css/geometry/DOMMatrix2DInit-validate-fixup.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMMatrix2DInit-validate-fixup.html rename to tests/wpt/tests/css/geometry/DOMMatrix2DInit-validate-fixup.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMMatrixInit-validate-fixup.html b/tests/wpt/tests/css/geometry/DOMMatrixInit-validate-fixup.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMMatrixInit-validate-fixup.html rename to tests/wpt/tests/css/geometry/DOMMatrixInit-validate-fixup.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMPoint-001.html b/tests/wpt/tests/css/geometry/DOMPoint-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMPoint-001.html rename to tests/wpt/tests/css/geometry/DOMPoint-001.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMPoint-002.html b/tests/wpt/tests/css/geometry/DOMPoint-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMPoint-002.html rename to tests/wpt/tests/css/geometry/DOMPoint-002.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMQuad-001.html b/tests/wpt/tests/css/geometry/DOMQuad-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMQuad-001.html rename to tests/wpt/tests/css/geometry/DOMQuad-001.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMQuad-002.html b/tests/wpt/tests/css/geometry/DOMQuad-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMQuad-002.html rename to tests/wpt/tests/css/geometry/DOMQuad-002.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMQuad-nan.html b/tests/wpt/tests/css/geometry/DOMQuad-nan.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMQuad-nan.html rename to tests/wpt/tests/css/geometry/DOMQuad-nan.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMRect-001.html b/tests/wpt/tests/css/geometry/DOMRect-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMRect-001.html rename to tests/wpt/tests/css/geometry/DOMRect-001.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMRect-002.html b/tests/wpt/tests/css/geometry/DOMRect-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMRect-002.html rename to tests/wpt/tests/css/geometry/DOMRect-002.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMRect-nan.html b/tests/wpt/tests/css/geometry/DOMRect-nan.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMRect-nan.html rename to tests/wpt/tests/css/geometry/DOMRect-nan.html diff --git a/tests/wpt/web-platform-tests/css/geometry/DOMRectList.html b/tests/wpt/tests/css/geometry/DOMRectList.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/DOMRectList.html rename to tests/wpt/tests/css/geometry/DOMRectList.html diff --git a/tests/wpt/web-platform-tests/css/geometry/META.yml b/tests/wpt/tests/css/geometry/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/META.yml rename to tests/wpt/tests/css/geometry/META.yml diff --git a/tests/wpt/web-platform-tests/css/geometry/WebKitCSSMatrix.html b/tests/wpt/tests/css/geometry/WebKitCSSMatrix.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/WebKitCSSMatrix.html rename to tests/wpt/tests/css/geometry/WebKitCSSMatrix.html diff --git a/tests/wpt/web-platform-tests/css/geometry/WebKitCSSMatrix.worker.js b/tests/wpt/tests/css/geometry/WebKitCSSMatrix.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/WebKitCSSMatrix.worker.js rename to tests/wpt/tests/css/geometry/WebKitCSSMatrix.worker.js diff --git a/tests/wpt/web-platform-tests/css/geometry/historical.html b/tests/wpt/tests/css/geometry/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/historical.html rename to tests/wpt/tests/css/geometry/historical.html diff --git a/tests/wpt/web-platform-tests/css/geometry/idlharness.any.js b/tests/wpt/tests/css/geometry/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/idlharness.any.js rename to tests/wpt/tests/css/geometry/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/css/geometry/spec-examples.html b/tests/wpt/tests/css/geometry/spec-examples.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/spec-examples.html rename to tests/wpt/tests/css/geometry/spec-examples.html diff --git a/tests/wpt/web-platform-tests/css/geometry/structured-serialization.html b/tests/wpt/tests/css/geometry/structured-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/structured-serialization.html rename to tests/wpt/tests/css/geometry/structured-serialization.html diff --git a/tests/wpt/web-platform-tests/css/geometry/support/dommatrix-test-util.js b/tests/wpt/tests/css/geometry/support/dommatrix-test-util.js similarity index 100% rename from tests/wpt/web-platform-tests/css/geometry/support/dommatrix-test-util.js rename to tests/wpt/tests/css/geometry/support/dommatrix-test-util.js diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/META.yml b/tests/wpt/tests/css/mediaqueries/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/META.yml rename to tests/wpt/tests/css/mediaqueries/META.yml diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/aspect-ratio-001.html b/tests/wpt/tests/css/mediaqueries/aspect-ratio-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/aspect-ratio-001.html rename to tests/wpt/tests/css/mediaqueries/aspect-ratio-001.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/aspect-ratio-002.html b/tests/wpt/tests/css/mediaqueries/aspect-ratio-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/aspect-ratio-002.html rename to tests/wpt/tests/css/mediaqueries/aspect-ratio-002.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/aspect-ratio-003.html b/tests/wpt/tests/css/mediaqueries/aspect-ratio-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/aspect-ratio-003.html rename to tests/wpt/tests/css/mediaqueries/aspect-ratio-003.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/aspect-ratio-004.html b/tests/wpt/tests/css/mediaqueries/aspect-ratio-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/aspect-ratio-004.html rename to tests/wpt/tests/css/mediaqueries/aspect-ratio-004.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/aspect-ratio-005.html b/tests/wpt/tests/css/mediaqueries/aspect-ratio-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/aspect-ratio-005.html rename to tests/wpt/tests/css/mediaqueries/aspect-ratio-005.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/aspect-ratio-006.html b/tests/wpt/tests/css/mediaqueries/aspect-ratio-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/aspect-ratio-006.html rename to tests/wpt/tests/css/mediaqueries/aspect-ratio-006.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/aspect-ratio-serialization.html b/tests/wpt/tests/css/mediaqueries/aspect-ratio-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/aspect-ratio-serialization.html rename to tests/wpt/tests/css/mediaqueries/aspect-ratio-serialization.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/device-aspect-ratio-002.html b/tests/wpt/tests/css/mediaqueries/device-aspect-ratio-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/device-aspect-ratio-002.html rename to tests/wpt/tests/css/mediaqueries/device-aspect-ratio-002.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/device-aspect-ratio-003.html b/tests/wpt/tests/css/mediaqueries/device-aspect-ratio-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/device-aspect-ratio-003.html rename to tests/wpt/tests/css/mediaqueries/device-aspect-ratio-003.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/device-aspect-ratio-004.html b/tests/wpt/tests/css/mediaqueries/device-aspect-ratio-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/device-aspect-ratio-004.html rename to tests/wpt/tests/css/mediaqueries/device-aspect-ratio-004.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/device-aspect-ratio-006.html b/tests/wpt/tests/css/mediaqueries/device-aspect-ratio-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/device-aspect-ratio-006.html rename to tests/wpt/tests/css/mediaqueries/device-aspect-ratio-006.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/dynamic-range.html b/tests/wpt/tests/css/mediaqueries/dynamic-range.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/dynamic-range.html rename to tests/wpt/tests/css/mediaqueries/dynamic-range.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/forced-colors.html b/tests/wpt/tests/css/mediaqueries/forced-colors.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/forced-colors.html rename to tests/wpt/tests/css/mediaqueries/forced-colors.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/inverted-colors.html b/tests/wpt/tests/css/mediaqueries/inverted-colors.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/inverted-colors.html rename to tests/wpt/tests/css/mediaqueries/inverted-colors.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/match-media-parsing.html b/tests/wpt/tests/css/mediaqueries/match-media-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/match-media-parsing.html rename to tests/wpt/tests/css/mediaqueries/match-media-parsing.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/media-queries-001.xht b/tests/wpt/tests/css/mediaqueries/media-queries-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/media-queries-001.xht rename to tests/wpt/tests/css/mediaqueries/media-queries-001.xht diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/media-queries-002.xht b/tests/wpt/tests/css/mediaqueries/media-queries-002.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/media-queries-002.xht rename to tests/wpt/tests/css/mediaqueries/media-queries-002.xht diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/media-queries-003.xht b/tests/wpt/tests/css/mediaqueries/media-queries-003.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/media-queries-003.xht rename to tests/wpt/tests/css/mediaqueries/media-queries-003.xht diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/media-query-matches-in-iframe.html b/tests/wpt/tests/css/mediaqueries/media-query-matches-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/media-query-matches-in-iframe.html rename to tests/wpt/tests/css/mediaqueries/media-query-matches-in-iframe.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/min-width-001.xht b/tests/wpt/tests/css/mediaqueries/min-width-001.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/min-width-001.xht rename to tests/wpt/tests/css/mediaqueries/min-width-001.xht diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/min-width-tables-001.html b/tests/wpt/tests/css/mediaqueries/min-width-tables-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/min-width-tables-001.html rename to tests/wpt/tests/css/mediaqueries/min-width-tables-001.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-001.html b/tests/wpt/tests/css/mediaqueries/mq-calc-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-001.html rename to tests/wpt/tests/css/mediaqueries/mq-calc-001.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-002.html b/tests/wpt/tests/css/mediaqueries/mq-calc-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-002.html rename to tests/wpt/tests/css/mediaqueries/mq-calc-002.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-003.html b/tests/wpt/tests/css/mediaqueries/mq-calc-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-003.html rename to tests/wpt/tests/css/mediaqueries/mq-calc-003.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-004.html b/tests/wpt/tests/css/mediaqueries/mq-calc-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-004.html rename to tests/wpt/tests/css/mediaqueries/mq-calc-004.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-005.html b/tests/wpt/tests/css/mediaqueries/mq-calc-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-005.html rename to tests/wpt/tests/css/mediaqueries/mq-calc-005.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-006.html b/tests/wpt/tests/css/mediaqueries/mq-calc-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-006.html rename to tests/wpt/tests/css/mediaqueries/mq-calc-006.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-007.html b/tests/wpt/tests/css/mediaqueries/mq-calc-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-007.html rename to tests/wpt/tests/css/mediaqueries/mq-calc-007.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-008.html b/tests/wpt/tests/css/mediaqueries/mq-calc-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-008.html rename to tests/wpt/tests/css/mediaqueries/mq-calc-008.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-resolution.html b/tests/wpt/tests/css/mediaqueries/mq-calc-resolution.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-calc-resolution.html rename to tests/wpt/tests/css/mediaqueries/mq-calc-resolution.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-case-insensitive-001.html b/tests/wpt/tests/css/mediaqueries/mq-case-insensitive-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-case-insensitive-001.html rename to tests/wpt/tests/css/mediaqueries/mq-case-insensitive-001.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-deprecated-001.html b/tests/wpt/tests/css/mediaqueries/mq-deprecated-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-deprecated-001.html rename to tests/wpt/tests/css/mediaqueries/mq-deprecated-001.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-dynamic-empty-children.html b/tests/wpt/tests/css/mediaqueries/mq-dynamic-empty-children.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-dynamic-empty-children.html rename to tests/wpt/tests/css/mediaqueries/mq-dynamic-empty-children.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-gamut-001.html b/tests/wpt/tests/css/mediaqueries/mq-gamut-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-gamut-001.html rename to tests/wpt/tests/css/mediaqueries/mq-gamut-001.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-gamut-002.html b/tests/wpt/tests/css/mediaqueries/mq-gamut-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-gamut-002.html rename to tests/wpt/tests/css/mediaqueries/mq-gamut-002.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-gamut-003.html b/tests/wpt/tests/css/mediaqueries/mq-gamut-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-gamut-003.html rename to tests/wpt/tests/css/mediaqueries/mq-gamut-003.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-gamut-004.html b/tests/wpt/tests/css/mediaqueries/mq-gamut-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-gamut-004.html rename to tests/wpt/tests/css/mediaqueries/mq-gamut-004.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-gamut-005.html b/tests/wpt/tests/css/mediaqueries/mq-gamut-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-gamut-005.html rename to tests/wpt/tests/css/mediaqueries/mq-gamut-005.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-invalid-media-type-001.html b/tests/wpt/tests/css/mediaqueries/mq-invalid-media-type-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-invalid-media-type-001.html rename to tests/wpt/tests/css/mediaqueries/mq-invalid-media-type-001.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-invalid-media-type-002.html b/tests/wpt/tests/css/mediaqueries/mq-invalid-media-type-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-invalid-media-type-002.html rename to tests/wpt/tests/css/mediaqueries/mq-invalid-media-type-002.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-invalid-media-type-003.html b/tests/wpt/tests/css/mediaqueries/mq-invalid-media-type-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-invalid-media-type-003.html rename to tests/wpt/tests/css/mediaqueries/mq-invalid-media-type-003.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-invalid-media-type-004.html b/tests/wpt/tests/css/mediaqueries/mq-invalid-media-type-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-invalid-media-type-004.html rename to tests/wpt/tests/css/mediaqueries/mq-invalid-media-type-004.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-invalid-media-type-005.html b/tests/wpt/tests/css/mediaqueries/mq-invalid-media-type-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-invalid-media-type-005.html rename to tests/wpt/tests/css/mediaqueries/mq-invalid-media-type-005.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-invalid-media-type-layer-001.html b/tests/wpt/tests/css/mediaqueries/mq-invalid-media-type-layer-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-invalid-media-type-layer-001.html rename to tests/wpt/tests/css/mediaqueries/mq-invalid-media-type-layer-001.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-invalid-media-type-layer-002.html b/tests/wpt/tests/css/mediaqueries/mq-invalid-media-type-layer-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-invalid-media-type-layer-002.html rename to tests/wpt/tests/css/mediaqueries/mq-invalid-media-type-layer-002.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-negative-range-001.html b/tests/wpt/tests/css/mediaqueries/mq-negative-range-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-negative-range-001.html rename to tests/wpt/tests/css/mediaqueries/mq-negative-range-001.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-negative-range-002.html b/tests/wpt/tests/css/mediaqueries/mq-negative-range-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-negative-range-002.html rename to tests/wpt/tests/css/mediaqueries/mq-negative-range-002.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-non-matching-lazy-load.tentative.html b/tests/wpt/tests/css/mediaqueries/mq-non-matching-lazy-load.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-non-matching-lazy-load.tentative.html rename to tests/wpt/tests/css/mediaqueries/mq-non-matching-lazy-load.tentative.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-range-001.html b/tests/wpt/tests/css/mediaqueries/mq-range-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-range-001.html rename to tests/wpt/tests/css/mediaqueries/mq-range-001.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/mq-unknown-feature-custom-property.html b/tests/wpt/tests/css/mediaqueries/mq-unknown-feature-custom-property.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/mq-unknown-feature-custom-property.html rename to tests/wpt/tests/css/mediaqueries/mq-unknown-feature-custom-property.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/navigation-controls.tentative.html b/tests/wpt/tests/css/mediaqueries/navigation-controls.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/navigation-controls.tentative.html rename to tests/wpt/tests/css/mediaqueries/navigation-controls.tentative.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/negation-001.html b/tests/wpt/tests/css/mediaqueries/negation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/negation-001.html rename to tests/wpt/tests/css/mediaqueries/negation-001.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/negation-002.html b/tests/wpt/tests/css/mediaqueries/negation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/negation-002.html rename to tests/wpt/tests/css/mediaqueries/negation-002.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/overflow-media-features.html b/tests/wpt/tests/css/mediaqueries/overflow-media-features.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/overflow-media-features.html rename to tests/wpt/tests/css/mediaqueries/overflow-media-features.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-ref.html b/tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-ref.html rename to tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-ref.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-dark-ref.html b/tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-dark-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-dark-ref.html rename to tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-dark-ref.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-dark.html b/tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-dark.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-dark.html rename to tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-dark.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-light-ref.html b/tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-light-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-light-ref.html rename to tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-light-ref.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-light.html b/tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-light.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-light.html rename to tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-light.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-normal.html b/tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image-normal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-normal.html rename to tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image-normal.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-ref.html b/tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-ref.html rename to tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image-ref.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image.html b/tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image.html rename to tests/wpt/tests/css/mediaqueries/prefers-color-scheme-svg-image.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme.html b/tests/wpt/tests/css/mediaqueries/prefers-color-scheme.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/prefers-color-scheme.html rename to tests/wpt/tests/css/mediaqueries/prefers-color-scheme.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-contrast.html b/tests/wpt/tests/css/mediaqueries/prefers-contrast.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/prefers-contrast.html rename to tests/wpt/tests/css/mediaqueries/prefers-contrast.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-reduced-data.html b/tests/wpt/tests/css/mediaqueries/prefers-reduced-data.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/prefers-reduced-data.html rename to tests/wpt/tests/css/mediaqueries/prefers-reduced-data.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-reduced-motion.html b/tests/wpt/tests/css/mediaqueries/prefers-reduced-motion.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/prefers-reduced-motion.html rename to tests/wpt/tests/css/mediaqueries/prefers-reduced-motion.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-reduced-transparency.html b/tests/wpt/tests/css/mediaqueries/prefers-reduced-transparency.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/prefers-reduced-transparency.html rename to tests/wpt/tests/css/mediaqueries/prefers-reduced-transparency.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/reference/ref-green-body.xht b/tests/wpt/tests/css/mediaqueries/reference/ref-green-body.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/reference/ref-green-body.xht rename to tests/wpt/tests/css/mediaqueries/reference/ref-green-body.xht diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/relative-units-001.html b/tests/wpt/tests/css/mediaqueries/relative-units-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/relative-units-001.html rename to tests/wpt/tests/css/mediaqueries/relative-units-001.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/relative-units-002.html b/tests/wpt/tests/css/mediaqueries/relative-units-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/relative-units-002.html rename to tests/wpt/tests/css/mediaqueries/relative-units-002.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/relative-units-003.html b/tests/wpt/tests/css/mediaqueries/relative-units-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/relative-units-003.html rename to tests/wpt/tests/css/mediaqueries/relative-units-003.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/relative-units-004.html b/tests/wpt/tests/css/mediaqueries/relative-units-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/relative-units-004.html rename to tests/wpt/tests/css/mediaqueries/relative-units-004.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/relative-units-005.html b/tests/wpt/tests/css/mediaqueries/relative-units-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/relative-units-005.html rename to tests/wpt/tests/css/mediaqueries/relative-units-005.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/resources/matchmedia-utils.js b/tests/wpt/tests/css/mediaqueries/resources/matchmedia-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/resources/matchmedia-utils.js rename to tests/wpt/tests/css/mediaqueries/resources/matchmedia-utils.js diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/resources/mq-non-matching-lazy-load-style.css b/tests/wpt/tests/css/mediaqueries/resources/mq-non-matching-lazy-load-style.css similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/resources/mq-non-matching-lazy-load-style.css rename to tests/wpt/tests/css/mediaqueries/resources/mq-non-matching-lazy-load-style.css diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/resources/prefers-color-scheme-dark.svg b/tests/wpt/tests/css/mediaqueries/resources/prefers-color-scheme-dark.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/resources/prefers-color-scheme-dark.svg rename to tests/wpt/tests/css/mediaqueries/resources/prefers-color-scheme-dark.svg diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/resources/prefers-color-scheme-light.svg b/tests/wpt/tests/css/mediaqueries/resources/prefers-color-scheme-light.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/resources/prefers-color-scheme-light.svg rename to tests/wpt/tests/css/mediaqueries/resources/prefers-color-scheme-light.svg diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/resources/prefers-color-scheme.svg b/tests/wpt/tests/css/mediaqueries/resources/prefers-color-scheme.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/resources/prefers-color-scheme.svg rename to tests/wpt/tests/css/mediaqueries/resources/prefers-color-scheme.svg diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/scripting-print-noscript-ref.html b/tests/wpt/tests/css/mediaqueries/scripting-print-noscript-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/scripting-print-noscript-ref.html rename to tests/wpt/tests/css/mediaqueries/scripting-print-noscript-ref.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/scripting-print-noscript.html b/tests/wpt/tests/css/mediaqueries/scripting-print-noscript.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/scripting-print-noscript.html rename to tests/wpt/tests/css/mediaqueries/scripting-print-noscript.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/scripting-print-script-ref.html b/tests/wpt/tests/css/mediaqueries/scripting-print-script-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/scripting-print-script-ref.html rename to tests/wpt/tests/css/mediaqueries/scripting-print-script-ref.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/scripting-print-script.html b/tests/wpt/tests/css/mediaqueries/scripting-print-script.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/scripting-print-script.html rename to tests/wpt/tests/css/mediaqueries/scripting-print-script.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/scripting.html b/tests/wpt/tests/css/mediaqueries/scripting.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/scripting.html rename to tests/wpt/tests/css/mediaqueries/scripting.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/support/media_queries_iframe.html b/tests/wpt/tests/css/mediaqueries/support/media_queries_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/support/media_queries_iframe.html rename to tests/wpt/tests/css/mediaqueries/support/media_queries_iframe.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/support/min-width-tables-001-iframe.html b/tests/wpt/tests/css/mediaqueries/support/min-width-tables-001-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/support/min-width-tables-001-iframe.html rename to tests/wpt/tests/css/mediaqueries/support/min-width-tables-001-iframe.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/test_media_queries.html b/tests/wpt/tests/css/mediaqueries/test_media_queries.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/test_media_queries.html rename to tests/wpt/tests/css/mediaqueries/test_media_queries.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/update-media-feature.html b/tests/wpt/tests/css/mediaqueries/update-media-feature.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/update-media-feature.html rename to tests/wpt/tests/css/mediaqueries/update-media-feature.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/viewport-script-dynamic-ref.html b/tests/wpt/tests/css/mediaqueries/viewport-script-dynamic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/viewport-script-dynamic-ref.html rename to tests/wpt/tests/css/mediaqueries/viewport-script-dynamic-ref.html diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/viewport-script-dynamic.html b/tests/wpt/tests/css/mediaqueries/viewport-script-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/mediaqueries/viewport-script-dynamic.html rename to tests/wpt/tests/css/mediaqueries/viewport-script-dynamic.html diff --git a/tests/wpt/web-platform-tests/css/motion/META.yml b/tests/wpt/tests/css/motion/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/META.yml rename to tests/wpt/tests/css/motion/META.yml diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-anchor-composition.html b/tests/wpt/tests/css/motion/animation/offset-anchor-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-anchor-composition.html rename to tests/wpt/tests/css/motion/animation/offset-anchor-composition.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-anchor-interpolation.html b/tests/wpt/tests/css/motion/animation/offset-anchor-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-anchor-interpolation.html rename to tests/wpt/tests/css/motion/animation/offset-anchor-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-distance-composition.html b/tests/wpt/tests/css/motion/animation/offset-distance-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-distance-composition.html rename to tests/wpt/tests/css/motion/animation/offset-distance-composition.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-distance-interpolation.html b/tests/wpt/tests/css/motion/animation/offset-distance-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-distance-interpolation.html rename to tests/wpt/tests/css/motion/animation/offset-distance-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-interpolation.html b/tests/wpt/tests/css/motion/animation/offset-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-interpolation.html rename to tests/wpt/tests/css/motion/animation/offset-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-path-composition.html b/tests/wpt/tests/css/motion/animation/offset-path-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-path-composition.html rename to tests/wpt/tests/css/motion/animation/offset-path-composition.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-path-interpolation-001.html b/tests/wpt/tests/css/motion/animation/offset-path-interpolation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-path-interpolation-001.html rename to tests/wpt/tests/css/motion/animation/offset-path-interpolation-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-path-interpolation-002.html b/tests/wpt/tests/css/motion/animation/offset-path-interpolation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-path-interpolation-002.html rename to tests/wpt/tests/css/motion/animation/offset-path-interpolation-002.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-path-interpolation-003.html b/tests/wpt/tests/css/motion/animation/offset-path-interpolation-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-path-interpolation-003.html rename to tests/wpt/tests/css/motion/animation/offset-path-interpolation-003.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-path-interpolation-004.html b/tests/wpt/tests/css/motion/animation/offset-path-interpolation-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-path-interpolation-004.html rename to tests/wpt/tests/css/motion/animation/offset-path-interpolation-004.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-path-interpolation-005.html b/tests/wpt/tests/css/motion/animation/offset-path-interpolation-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-path-interpolation-005.html rename to tests/wpt/tests/css/motion/animation/offset-path-interpolation-005.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-path-interpolation-006.html b/tests/wpt/tests/css/motion/animation/offset-path-interpolation-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-path-interpolation-006.html rename to tests/wpt/tests/css/motion/animation/offset-path-interpolation-006.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-position-composition.html b/tests/wpt/tests/css/motion/animation/offset-position-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-position-composition.html rename to tests/wpt/tests/css/motion/animation/offset-position-composition.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-position-interpolation.html b/tests/wpt/tests/css/motion/animation/offset-position-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-position-interpolation.html rename to tests/wpt/tests/css/motion/animation/offset-position-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-rotate-composition.html b/tests/wpt/tests/css/motion/animation/offset-rotate-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-rotate-composition.html rename to tests/wpt/tests/css/motion/animation/offset-rotate-composition.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-rotate-interpolation.html b/tests/wpt/tests/css/motion/animation/offset-rotate-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/offset-rotate-interpolation.html rename to tests/wpt/tests/css/motion/animation/offset-rotate-interpolation.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/reftests/offset-distance-interpolation-001.html b/tests/wpt/tests/css/motion/animation/reftests/offset-distance-interpolation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/reftests/offset-distance-interpolation-001.html rename to tests/wpt/tests/css/motion/animation/reftests/offset-distance-interpolation-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/reftests/offset-path-path-interpolation-001.html b/tests/wpt/tests/css/motion/animation/reftests/offset-path-path-interpolation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/reftests/offset-path-path-interpolation-001.html rename to tests/wpt/tests/css/motion/animation/reftests/offset-path-path-interpolation-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/reftests/offset-path-path-interpolation-ref.html b/tests/wpt/tests/css/motion/animation/reftests/offset-path-path-interpolation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/reftests/offset-path-path-interpolation-ref.html rename to tests/wpt/tests/css/motion/animation/reftests/offset-path-path-interpolation-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/reftests/offset-path-with-transforms-001.html b/tests/wpt/tests/css/motion/animation/reftests/offset-path-with-transforms-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/reftests/offset-path-with-transforms-001.html rename to tests/wpt/tests/css/motion/animation/reftests/offset-path-with-transforms-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/reftests/offset-path-with-transforms-ref.html b/tests/wpt/tests/css/motion/animation/reftests/offset-path-with-transforms-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/reftests/offset-path-with-transforms-ref.html rename to tests/wpt/tests/css/motion/animation/reftests/offset-path-with-transforms-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/animation/reftests/offset-rotate-interpolation-001.html b/tests/wpt/tests/css/motion/animation/reftests/offset-rotate-interpolation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/animation/reftests/offset-rotate-interpolation-001.html rename to tests/wpt/tests/css/motion/animation/reftests/offset-rotate-interpolation-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/change-offset-path.html b/tests/wpt/tests/css/motion/change-offset-path.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/change-offset-path.html rename to tests/wpt/tests/css/motion/change-offset-path.html diff --git a/tests/wpt/web-platform-tests/css/motion/inheritance.html b/tests/wpt/tests/css/motion/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/inheritance.html rename to tests/wpt/tests/css/motion/inheritance.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-anchor-transform-box-fill-box-001.html b/tests/wpt/tests/css/motion/offset-anchor-transform-box-fill-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-anchor-transform-box-fill-box-001.html rename to tests/wpt/tests/css/motion/offset-anchor-transform-box-fill-box-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-anchor-transform-box-fill-box-002.html b/tests/wpt/tests/css/motion/offset-anchor-transform-box-fill-box-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-anchor-transform-box-fill-box-002.html rename to tests/wpt/tests/css/motion/offset-anchor-transform-box-fill-box-002.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-anchor-transform-box-fill-box-003.html b/tests/wpt/tests/css/motion/offset-anchor-transform-box-fill-box-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-anchor-transform-box-fill-box-003.html rename to tests/wpt/tests/css/motion/offset-anchor-transform-box-fill-box-003.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-anchor-transform-box-fill-box-ref.html b/tests/wpt/tests/css/motion/offset-anchor-transform-box-fill-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-anchor-transform-box-fill-box-ref.html rename to tests/wpt/tests/css/motion/offset-anchor-transform-box-fill-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-distance-001.html b/tests/wpt/tests/css/motion/offset-distance-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-distance-001.html rename to tests/wpt/tests/css/motion/offset-distance-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-distance-002.html b/tests/wpt/tests/css/motion/offset-distance-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-distance-002.html rename to tests/wpt/tests/css/motion/offset-distance-002.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-distance-003.html b/tests/wpt/tests/css/motion/offset-distance-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-distance-003.html rename to tests/wpt/tests/css/motion/offset-distance-003.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-distance-004.html b/tests/wpt/tests/css/motion/offset-distance-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-distance-004.html rename to tests/wpt/tests/css/motion/offset-distance-004.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-distance-005.html b/tests/wpt/tests/css/motion/offset-distance-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-distance-005.html rename to tests/wpt/tests/css/motion/offset-distance-005.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-distance-006.html b/tests/wpt/tests/css/motion/offset-distance-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-distance-006.html rename to tests/wpt/tests/css/motion/offset-distance-006.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-distance-007.html b/tests/wpt/tests/css/motion/offset-distance-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-distance-007.html rename to tests/wpt/tests/css/motion/offset-distance-007.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-distance-008.html b/tests/wpt/tests/css/motion/offset-distance-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-distance-008.html rename to tests/wpt/tests/css/motion/offset-distance-008.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-distance-009.html b/tests/wpt/tests/css/motion/offset-distance-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-distance-009.html rename to tests/wpt/tests/css/motion/offset-distance-009.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-distance-ref.html b/tests/wpt/tests/css/motion/offset-distance-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-distance-ref.html rename to tests/wpt/tests/css/motion/offset-distance-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-coord-box-001-ref.html b/tests/wpt/tests/css/motion/offset-path-coord-box-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-coord-box-001-ref.html rename to tests/wpt/tests/css/motion/offset-path-coord-box-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-coord-box-001.html b/tests/wpt/tests/css/motion/offset-path-coord-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-coord-box-001.html rename to tests/wpt/tests/css/motion/offset-path-coord-box-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-coord-box-002-ref.html b/tests/wpt/tests/css/motion/offset-path-coord-box-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-coord-box-002-ref.html rename to tests/wpt/tests/css/motion/offset-path-coord-box-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-coord-box-002.html b/tests/wpt/tests/css/motion/offset-path-coord-box-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-coord-box-002.html rename to tests/wpt/tests/css/motion/offset-path-coord-box-002.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-coord-box-003-ref.html b/tests/wpt/tests/css/motion/offset-path-coord-box-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-coord-box-003-ref.html rename to tests/wpt/tests/css/motion/offset-path-coord-box-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-coord-box-003.html b/tests/wpt/tests/css/motion/offset-path-coord-box-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-coord-box-003.html rename to tests/wpt/tests/css/motion/offset-path-coord-box-003.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-geometry-box-ref.html b/tests/wpt/tests/css/motion/offset-path-geometry-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-geometry-box-ref.html rename to tests/wpt/tests/css/motion/offset-path-geometry-box-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-geometry-box.html b/tests/wpt/tests/css/motion/offset-path-geometry-box.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-geometry-box.html rename to tests/wpt/tests/css/motion/offset-path-geometry-box.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-huge-angle-deg-001-crash.html b/tests/wpt/tests/css/motion/offset-path-huge-angle-deg-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-huge-angle-deg-001-crash.html rename to tests/wpt/tests/css/motion/offset-path-huge-angle-deg-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-huge-angle-grad-001-crash.html b/tests/wpt/tests/css/motion/offset-path-huge-angle-grad-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-huge-angle-grad-001-crash.html rename to tests/wpt/tests/css/motion/offset-path-huge-angle-grad-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-huge-angle-turn-001-crash.html b/tests/wpt/tests/css/motion/offset-path-huge-angle-turn-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-huge-angle-turn-001-crash.html rename to tests/wpt/tests/css/motion/offset-path-huge-angle-turn-001-crash.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-001-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-001-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-001.html b/tests/wpt/tests/css/motion/offset-path-ray-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-001.html rename to tests/wpt/tests/css/motion/offset-path-ray-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-002.html b/tests/wpt/tests/css/motion/offset-path-ray-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-002.html rename to tests/wpt/tests/css/motion/offset-path-ray-002.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-003-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-003-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-003.html b/tests/wpt/tests/css/motion/offset-path-ray-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-003.html rename to tests/wpt/tests/css/motion/offset-path-ray-003.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-004.html b/tests/wpt/tests/css/motion/offset-path-ray-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-004.html rename to tests/wpt/tests/css/motion/offset-path-ray-004.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-005-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-005-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-005.html b/tests/wpt/tests/css/motion/offset-path-ray-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-005.html rename to tests/wpt/tests/css/motion/offset-path-ray-005.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-006.html b/tests/wpt/tests/css/motion/offset-path-ray-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-006.html rename to tests/wpt/tests/css/motion/offset-path-ray-006.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-007-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-007-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-007.html b/tests/wpt/tests/css/motion/offset-path-ray-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-007.html rename to tests/wpt/tests/css/motion/offset-path-ray-007.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-008-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-008-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-008-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-008.html b/tests/wpt/tests/css/motion/offset-path-ray-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-008.html rename to tests/wpt/tests/css/motion/offset-path-ray-008.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-009-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-009-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-009-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-009.html b/tests/wpt/tests/css/motion/offset-path-ray-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-009.html rename to tests/wpt/tests/css/motion/offset-path-ray-009.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-010.html b/tests/wpt/tests/css/motion/offset-path-ray-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-010.html rename to tests/wpt/tests/css/motion/offset-path-ray-010.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-011-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-011-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-011.html b/tests/wpt/tests/css/motion/offset-path-ray-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-011.html rename to tests/wpt/tests/css/motion/offset-path-ray-011.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-012-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-012-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-012.html b/tests/wpt/tests/css/motion/offset-path-ray-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-012.html rename to tests/wpt/tests/css/motion/offset-path-ray-012.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-013-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-013-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-013.html b/tests/wpt/tests/css/motion/offset-path-ray-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-013.html rename to tests/wpt/tests/css/motion/offset-path-ray-013.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-014-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-014-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-014-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-014.html b/tests/wpt/tests/css/motion/offset-path-ray-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-014.html rename to tests/wpt/tests/css/motion/offset-path-ray-014.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-015-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-015-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-015-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-015.html b/tests/wpt/tests/css/motion/offset-path-ray-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-015.html rename to tests/wpt/tests/css/motion/offset-path-ray-015.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-016-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-016-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-016-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-016-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-016.html b/tests/wpt/tests/css/motion/offset-path-ray-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-016.html rename to tests/wpt/tests/css/motion/offset-path-ray-016.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-017-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-017-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-017-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-017-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-017.html b/tests/wpt/tests/css/motion/offset-path-ray-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-017.html rename to tests/wpt/tests/css/motion/offset-path-ray-017.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-018-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-018-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-018-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-018-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-018.html b/tests/wpt/tests/css/motion/offset-path-ray-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-018.html rename to tests/wpt/tests/css/motion/offset-path-ray-018.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-001-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-contain-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-001-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-contain-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-001.html b/tests/wpt/tests/css/motion/offset-path-ray-contain-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-001.html rename to tests/wpt/tests/css/motion/offset-path-ray-contain-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-002-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-contain-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-002-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-contain-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-002.html b/tests/wpt/tests/css/motion/offset-path-ray-contain-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-002.html rename to tests/wpt/tests/css/motion/offset-path-ray-contain-002.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-003-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-contain-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-003-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-contain-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-003.html b/tests/wpt/tests/css/motion/offset-path-ray-contain-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-003.html rename to tests/wpt/tests/css/motion/offset-path-ray-contain-003.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-004-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-contain-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-004-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-contain-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-004.html b/tests/wpt/tests/css/motion/offset-path-ray-contain-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-004.html rename to tests/wpt/tests/css/motion/offset-path-ray-contain-004.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-005-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-contain-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-005-ref.html rename to tests/wpt/tests/css/motion/offset-path-ray-contain-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-005.html b/tests/wpt/tests/css/motion/offset-path-ray-contain-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-ray-contain-005.html rename to tests/wpt/tests/css/motion/offset-path-ray-contain-005.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-001-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-001-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-circle-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-001.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-001.html rename to tests/wpt/tests/css/motion/offset-path-shape-circle-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-002-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-002-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-circle-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-002.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-002.html rename to tests/wpt/tests/css/motion/offset-path-shape-circle-002.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-003-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-003-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-circle-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-003.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-003.html rename to tests/wpt/tests/css/motion/offset-path-shape-circle-003.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-004-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-004-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-circle-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-004.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-004.html rename to tests/wpt/tests/css/motion/offset-path-shape-circle-004.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-005-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-005-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-circle-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-005.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-circle-005.html rename to tests/wpt/tests/css/motion/offset-path-shape-circle-005.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-001-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-001-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-ellipse-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-001.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-001.html rename to tests/wpt/tests/css/motion/offset-path-shape-ellipse-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-002-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-002-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-ellipse-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-002.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-002.html rename to tests/wpt/tests/css/motion/offset-path-shape-ellipse-002.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-003-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-003-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-ellipse-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-003.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-003.html rename to tests/wpt/tests/css/motion/offset-path-shape-ellipse-003.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-004-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-004-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-ellipse-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-004.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-004.html rename to tests/wpt/tests/css/motion/offset-path-shape-ellipse-004.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-005-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-005-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-ellipse-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-005.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-ellipse-005.html rename to tests/wpt/tests/css/motion/offset-path-shape-ellipse-005.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-inset-001-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-inset-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-inset-001-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-inset-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-inset-001.html b/tests/wpt/tests/css/motion/offset-path-shape-inset-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-inset-001.html rename to tests/wpt/tests/css/motion/offset-path-shape-inset-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-inset-002-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-inset-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-inset-002-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-inset-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-inset-002.html b/tests/wpt/tests/css/motion/offset-path-shape-inset-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-inset-002.html rename to tests/wpt/tests/css/motion/offset-path-shape-inset-002.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-polygon-001-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-polygon-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-polygon-001-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-polygon-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-polygon-001.html b/tests/wpt/tests/css/motion/offset-path-shape-polygon-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-polygon-001.html rename to tests/wpt/tests/css/motion/offset-path-shape-polygon-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-polygon-002-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-polygon-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-polygon-002-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-polygon-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-polygon-002.html b/tests/wpt/tests/css/motion/offset-path-shape-polygon-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-polygon-002.html rename to tests/wpt/tests/css/motion/offset-path-shape-polygon-002.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-polygon-003-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-polygon-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-polygon-003-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-polygon-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-polygon-003.html b/tests/wpt/tests/css/motion/offset-path-shape-polygon-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-polygon-003.html rename to tests/wpt/tests/css/motion/offset-path-shape-polygon-003.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-rect-001-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-rect-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-rect-001-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-rect-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-rect-001.html b/tests/wpt/tests/css/motion/offset-path-shape-rect-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-rect-001.html rename to tests/wpt/tests/css/motion/offset-path-shape-rect-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-rect-002-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-rect-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-rect-002-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-rect-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-rect-002.html b/tests/wpt/tests/css/motion/offset-path-shape-rect-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-rect-002.html rename to tests/wpt/tests/css/motion/offset-path-shape-rect-002.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-xywh-001-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-xywh-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-xywh-001-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-xywh-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-xywh-001.html b/tests/wpt/tests/css/motion/offset-path-shape-xywh-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-xywh-001.html rename to tests/wpt/tests/css/motion/offset-path-shape-xywh-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-xywh-002-ref.html b/tests/wpt/tests/css/motion/offset-path-shape-xywh-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-xywh-002-ref.html rename to tests/wpt/tests/css/motion/offset-path-shape-xywh-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-shape-xywh-002.html b/tests/wpt/tests/css/motion/offset-path-shape-xywh-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-shape-xywh-002.html rename to tests/wpt/tests/css/motion/offset-path-shape-xywh-002.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-string-001.html b/tests/wpt/tests/css/motion/offset-path-string-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-string-001.html rename to tests/wpt/tests/css/motion/offset-path-string-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-string-002.html b/tests/wpt/tests/css/motion/offset-path-string-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-string-002.html rename to tests/wpt/tests/css/motion/offset-path-string-002.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-string-ref.html b/tests/wpt/tests/css/motion/offset-path-string-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-string-ref.html rename to tests/wpt/tests/css/motion/offset-path-string-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-url-ref.html b/tests/wpt/tests/css/motion/offset-path-url-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-url-ref.html rename to tests/wpt/tests/css/motion/offset-path-url-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-path-url.html b/tests/wpt/tests/css/motion/offset-path-url.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-path-url.html rename to tests/wpt/tests/css/motion/offset-path-url.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-rotate-001.html b/tests/wpt/tests/css/motion/offset-rotate-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-rotate-001.html rename to tests/wpt/tests/css/motion/offset-rotate-001.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-rotate-002.html b/tests/wpt/tests/css/motion/offset-rotate-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-rotate-002.html rename to tests/wpt/tests/css/motion/offset-rotate-002.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-rotate-003.html b/tests/wpt/tests/css/motion/offset-rotate-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-rotate-003.html rename to tests/wpt/tests/css/motion/offset-rotate-003.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-rotate-004.html b/tests/wpt/tests/css/motion/offset-rotate-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-rotate-004.html rename to tests/wpt/tests/css/motion/offset-rotate-004.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-rotate-005.html b/tests/wpt/tests/css/motion/offset-rotate-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-rotate-005.html rename to tests/wpt/tests/css/motion/offset-rotate-005.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-rotate-ref.html b/tests/wpt/tests/css/motion/offset-rotate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-rotate-ref.html rename to tests/wpt/tests/css/motion/offset-rotate-ref.html diff --git a/tests/wpt/web-platform-tests/css/motion/offset-supports-calc.html b/tests/wpt/tests/css/motion/offset-supports-calc.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/offset-supports-calc.html rename to tests/wpt/tests/css/motion/offset-supports-calc.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-anchor-computed.html b/tests/wpt/tests/css/motion/parsing/offset-anchor-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-anchor-computed.html rename to tests/wpt/tests/css/motion/parsing/offset-anchor-computed.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-anchor-parsing-invalid.html b/tests/wpt/tests/css/motion/parsing/offset-anchor-parsing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-anchor-parsing-invalid.html rename to tests/wpt/tests/css/motion/parsing/offset-anchor-parsing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-anchor-parsing-valid.html b/tests/wpt/tests/css/motion/parsing/offset-anchor-parsing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-anchor-parsing-valid.html rename to tests/wpt/tests/css/motion/parsing/offset-anchor-parsing-valid.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-distance-computed.html b/tests/wpt/tests/css/motion/parsing/offset-distance-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-distance-computed.html rename to tests/wpt/tests/css/motion/parsing/offset-distance-computed.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-distance-parsing-invalid.html b/tests/wpt/tests/css/motion/parsing/offset-distance-parsing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-distance-parsing-invalid.html rename to tests/wpt/tests/css/motion/parsing/offset-distance-parsing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-distance-parsing-valid.html b/tests/wpt/tests/css/motion/parsing/offset-distance-parsing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-distance-parsing-valid.html rename to tests/wpt/tests/css/motion/parsing/offset-distance-parsing-valid.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-parsing-invalid.html b/tests/wpt/tests/css/motion/parsing/offset-parsing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-parsing-invalid.html rename to tests/wpt/tests/css/motion/parsing/offset-parsing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-parsing-valid.html b/tests/wpt/tests/css/motion/parsing/offset-parsing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-parsing-valid.html rename to tests/wpt/tests/css/motion/parsing/offset-parsing-valid.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-computed.html b/tests/wpt/tests/css/motion/parsing/offset-path-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-path-computed.html rename to tests/wpt/tests/css/motion/parsing/offset-path-computed.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-parsing-invalid.html b/tests/wpt/tests/css/motion/parsing/offset-path-parsing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-path-parsing-invalid.html rename to tests/wpt/tests/css/motion/parsing/offset-path-parsing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-parsing-valid.html b/tests/wpt/tests/css/motion/parsing/offset-path-parsing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-path-parsing-valid.html rename to tests/wpt/tests/css/motion/parsing/offset-path-parsing-valid.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-position-computed.html b/tests/wpt/tests/css/motion/parsing/offset-position-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-position-computed.html rename to tests/wpt/tests/css/motion/parsing/offset-position-computed.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-position-parsing-invalid.html b/tests/wpt/tests/css/motion/parsing/offset-position-parsing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-position-parsing-invalid.html rename to tests/wpt/tests/css/motion/parsing/offset-position-parsing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-position-parsing-valid.html b/tests/wpt/tests/css/motion/parsing/offset-position-parsing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-position-parsing-valid.html rename to tests/wpt/tests/css/motion/parsing/offset-position-parsing-valid.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-rotate-computed.html b/tests/wpt/tests/css/motion/parsing/offset-rotate-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-rotate-computed.html rename to tests/wpt/tests/css/motion/parsing/offset-rotate-computed.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-rotate-parsing-invalid.html b/tests/wpt/tests/css/motion/parsing/offset-rotate-parsing-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-rotate-parsing-invalid.html rename to tests/wpt/tests/css/motion/parsing/offset-rotate-parsing-invalid.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-rotate-parsing-valid.html b/tests/wpt/tests/css/motion/parsing/offset-rotate-parsing-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-rotate-parsing-valid.html rename to tests/wpt/tests/css/motion/parsing/offset-rotate-parsing-valid.html diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-shorthand.html b/tests/wpt/tests/css/motion/parsing/offset-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/css/motion/parsing/offset-shorthand.html rename to tests/wpt/tests/css/motion/parsing/offset-shorthand.html diff --git a/tests/wpt/web-platform-tests/css/printing/animated-image-print-image-orientation-none.html b/tests/wpt/tests/css/printing/animated-image-print-image-orientation-none.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/animated-image-print-image-orientation-none.html rename to tests/wpt/tests/css/printing/animated-image-print-image-orientation-none.html diff --git a/tests/wpt/web-platform-tests/css/printing/animated-image-print.html b/tests/wpt/tests/css/printing/animated-image-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/animated-image-print.html rename to tests/wpt/tests/css/printing/animated-image-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/animations-print-ref.html b/tests/wpt/tests/css/printing/animations-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/animations-print-ref.html rename to tests/wpt/tests/css/printing/animations-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/animations-print.html b/tests/wpt/tests/css/printing/animations-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/animations-print.html rename to tests/wpt/tests/css/printing/animations-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/animations-shadow-print-ref.html b/tests/wpt/tests/css/printing/animations-shadow-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/animations-shadow-print-ref.html rename to tests/wpt/tests/css/printing/animations-shadow-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/animations-shadow-print.html b/tests/wpt/tests/css/printing/animations-shadow-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/animations-shadow-print.html rename to tests/wpt/tests/css/printing/animations-shadow-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/background-image-print-ref.html b/tests/wpt/tests/css/printing/background-image-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/background-image-print-ref.html rename to tests/wpt/tests/css/printing/background-image-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/background-image-print.html b/tests/wpt/tests/css/printing/background-image-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/background-image-print.html rename to tests/wpt/tests/css/printing/background-image-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/emoji-print.html b/tests/wpt/tests/css/printing/emoji-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/emoji-print.html rename to tests/wpt/tests/css/printing/emoji-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/existing-transition-in-media-print.tentative.html b/tests/wpt/tests/css/printing/existing-transition-in-media-print.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/existing-transition-in-media-print.tentative.html rename to tests/wpt/tests/css/printing/existing-transition-in-media-print.tentative.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-001-print-ref.html b/tests/wpt/tests/css/printing/fixedpos-001-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-001-print-ref.html rename to tests/wpt/tests/css/printing/fixedpos-001-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-001-print.html b/tests/wpt/tests/css/printing/fixedpos-001-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-001-print.html rename to tests/wpt/tests/css/printing/fixedpos-001-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-002-print-ref.html b/tests/wpt/tests/css/printing/fixedpos-002-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-002-print-ref.html rename to tests/wpt/tests/css/printing/fixedpos-002-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-002-print.html b/tests/wpt/tests/css/printing/fixedpos-002-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-002-print.html rename to tests/wpt/tests/css/printing/fixedpos-002-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-003-print-ref.html b/tests/wpt/tests/css/printing/fixedpos-003-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-003-print-ref.html rename to tests/wpt/tests/css/printing/fixedpos-003-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-003-print.html b/tests/wpt/tests/css/printing/fixedpos-003-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-003-print.html rename to tests/wpt/tests/css/printing/fixedpos-003-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-004-print-ref.html b/tests/wpt/tests/css/printing/fixedpos-004-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-004-print-ref.html rename to tests/wpt/tests/css/printing/fixedpos-004-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-004-print.html b/tests/wpt/tests/css/printing/fixedpos-004-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-004-print.html rename to tests/wpt/tests/css/printing/fixedpos-004-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-005-print-ref.html b/tests/wpt/tests/css/printing/fixedpos-005-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-005-print-ref.html rename to tests/wpt/tests/css/printing/fixedpos-005-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-005-print.html b/tests/wpt/tests/css/printing/fixedpos-005-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-005-print.html rename to tests/wpt/tests/css/printing/fixedpos-005-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-006-print-ref.html b/tests/wpt/tests/css/printing/fixedpos-006-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-006-print-ref.html rename to tests/wpt/tests/css/printing/fixedpos-006-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-006-print.html b/tests/wpt/tests/css/printing/fixedpos-006-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-006-print.html rename to tests/wpt/tests/css/printing/fixedpos-006-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-007-print-ref.html b/tests/wpt/tests/css/printing/fixedpos-007-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-007-print-ref.html rename to tests/wpt/tests/css/printing/fixedpos-007-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-007-print.html b/tests/wpt/tests/css/printing/fixedpos-007-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-007-print.html rename to tests/wpt/tests/css/printing/fixedpos-007-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-008-print-ref.html b/tests/wpt/tests/css/printing/fixedpos-008-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-008-print-ref.html rename to tests/wpt/tests/css/printing/fixedpos-008-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-008-print.html b/tests/wpt/tests/css/printing/fixedpos-008-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-008-print.html rename to tests/wpt/tests/css/printing/fixedpos-008-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-with-abspos-with-link-print-ref.html b/tests/wpt/tests/css/printing/fixedpos-with-abspos-with-link-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-with-abspos-with-link-print-ref.html rename to tests/wpt/tests/css/printing/fixedpos-with-abspos-with-link-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-with-abspos-with-link-print.html b/tests/wpt/tests/css/printing/fixedpos-with-abspos-with-link-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-with-abspos-with-link-print.html rename to tests/wpt/tests/css/printing/fixedpos-with-abspos-with-link-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-with-iframe-print-ref.html b/tests/wpt/tests/css/printing/fixedpos-with-iframe-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-with-iframe-print-ref.html rename to tests/wpt/tests/css/printing/fixedpos-with-iframe-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-with-iframe-print.html b/tests/wpt/tests/css/printing/fixedpos-with-iframe-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-with-iframe-print.html rename to tests/wpt/tests/css/printing/fixedpos-with-iframe-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-with-link-with-inline-child-print-ref.html b/tests/wpt/tests/css/printing/fixedpos-with-link-with-inline-child-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-with-link-with-inline-child-print-ref.html rename to tests/wpt/tests/css/printing/fixedpos-with-link-with-inline-child-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/fixedpos-with-link-with-inline-child-print.html b/tests/wpt/tests/css/printing/fixedpos-with-link-with-inline-child-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fixedpos-with-link-with-inline-child-print.html rename to tests/wpt/tests/css/printing/fixedpos-with-link-with-inline-child-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/fragmented-inline-block-001-print.html b/tests/wpt/tests/css/printing/fragmented-inline-block-001-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fragmented-inline-block-001-print.html rename to tests/wpt/tests/css/printing/fragmented-inline-block-001-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/fragmented-inline-block-002-print-ref.html b/tests/wpt/tests/css/printing/fragmented-inline-block-002-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fragmented-inline-block-002-print-ref.html rename to tests/wpt/tests/css/printing/fragmented-inline-block-002-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/fragmented-inline-block-002-print.html b/tests/wpt/tests/css/printing/fragmented-inline-block-002-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/fragmented-inline-block-002-print.html rename to tests/wpt/tests/css/printing/fragmented-inline-block-002-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/input-file-print-ref.html b/tests/wpt/tests/css/printing/input-file-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/input-file-print-ref.html rename to tests/wpt/tests/css/printing/input-file-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/input-file-print.html b/tests/wpt/tests/css/printing/input-file-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/input-file-print.html rename to tests/wpt/tests/css/printing/input-file-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-001-print-ref.html b/tests/wpt/tests/css/printing/monolithic-overflow-001-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-001-print-ref.html rename to tests/wpt/tests/css/printing/monolithic-overflow-001-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-001-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-001-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-001-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-001-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-002-print-ref.html b/tests/wpt/tests/css/printing/monolithic-overflow-002-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-002-print-ref.html rename to tests/wpt/tests/css/printing/monolithic-overflow-002-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-002-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-002-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-002-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-002-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-003-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-003-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-003-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-003-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-004-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-004-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-004-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-004-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-005-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-005-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-005-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-005-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-006-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-006-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-006-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-006-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-007-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-007-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-007-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-007-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-008-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-008-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-008-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-008-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-009-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-009-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-009-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-009-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-010-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-010-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-010-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-010-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-011-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-011-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-011-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-011-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-012-print-ref.html b/tests/wpt/tests/css/printing/monolithic-overflow-012-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-012-print-ref.html rename to tests/wpt/tests/css/printing/monolithic-overflow-012-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-012-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-012-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-012-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-012-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-013-print-ref.html b/tests/wpt/tests/css/printing/monolithic-overflow-013-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-013-print-ref.html rename to tests/wpt/tests/css/printing/monolithic-overflow-013-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-013-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-013-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-013-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-013-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-014-print-ref.html b/tests/wpt/tests/css/printing/monolithic-overflow-014-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-014-print-ref.html rename to tests/wpt/tests/css/printing/monolithic-overflow-014-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-014-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-014-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-014-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-014-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-015-print-ref.html b/tests/wpt/tests/css/printing/monolithic-overflow-015-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-015-print-ref.html rename to tests/wpt/tests/css/printing/monolithic-overflow-015-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-015-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-015-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-015-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-015-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-016-print-ref.html b/tests/wpt/tests/css/printing/monolithic-overflow-016-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-016-print-ref.html rename to tests/wpt/tests/css/printing/monolithic-overflow-016-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-016-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-016-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-016-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-016-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-017-print-ref.html b/tests/wpt/tests/css/printing/monolithic-overflow-017-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-017-print-ref.html rename to tests/wpt/tests/css/printing/monolithic-overflow-017-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-017-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-017-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-017-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-017-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-018-print-ref.html b/tests/wpt/tests/css/printing/monolithic-overflow-018-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-018-print-ref.html rename to tests/wpt/tests/css/printing/monolithic-overflow-018-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-018-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-018-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-018-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-018-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-019-print-ref.html b/tests/wpt/tests/css/printing/monolithic-overflow-019-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-019-print-ref.html rename to tests/wpt/tests/css/printing/monolithic-overflow-019-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-019-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-019-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-019-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-019-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-020-print-ref.html b/tests/wpt/tests/css/printing/monolithic-overflow-020-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-020-print-ref.html rename to tests/wpt/tests/css/printing/monolithic-overflow-020-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-020-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-020-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-020-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-020-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-021-print-ref.html b/tests/wpt/tests/css/printing/monolithic-overflow-021-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-021-print-ref.html rename to tests/wpt/tests/css/printing/monolithic-overflow-021-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/monolithic-overflow-021-print.html b/tests/wpt/tests/css/printing/monolithic-overflow-021-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/monolithic-overflow-021-print.html rename to tests/wpt/tests/css/printing/monolithic-overflow-021-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/page-name-001-print-ref.html b/tests/wpt/tests/css/printing/page-name-001-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/page-name-001-print-ref.html rename to tests/wpt/tests/css/printing/page-name-001-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/page-name-001-print.html b/tests/wpt/tests/css/printing/page-name-001-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/page-name-001-print.html rename to tests/wpt/tests/css/printing/page-name-001-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/page-name-002-print-ref.html b/tests/wpt/tests/css/printing/page-name-002-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/page-name-002-print-ref.html rename to tests/wpt/tests/css/printing/page-name-002-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/page-name-002-print.html b/tests/wpt/tests/css/printing/page-name-002-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/page-name-002-print.html rename to tests/wpt/tests/css/printing/page-name-002-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/page-name-003-print-ref.html b/tests/wpt/tests/css/printing/page-name-003-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/page-name-003-print-ref.html rename to tests/wpt/tests/css/printing/page-name-003-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/page-name-003-print.html b/tests/wpt/tests/css/printing/page-name-003-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/page-name-003-print.html rename to tests/wpt/tests/css/printing/page-name-003-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/page-overflow-crash-print.html b/tests/wpt/tests/css/printing/page-overflow-crash-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/page-overflow-crash-print.html rename to tests/wpt/tests/css/printing/page-overflow-crash-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/paused-animations-print-ref.html b/tests/wpt/tests/css/printing/paused-animations-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/paused-animations-print-ref.html rename to tests/wpt/tests/css/printing/paused-animations-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/paused-animations-print.html b/tests/wpt/tests/css/printing/paused-animations-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/paused-animations-print.html rename to tests/wpt/tests/css/printing/paused-animations-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/pseudo-animations-print-ref.html b/tests/wpt/tests/css/printing/pseudo-animations-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/pseudo-animations-print-ref.html rename to tests/wpt/tests/css/printing/pseudo-animations-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/pseudo-animations-print.html b/tests/wpt/tests/css/printing/pseudo-animations-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/pseudo-animations-print.html rename to tests/wpt/tests/css/printing/pseudo-animations-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/reference/monolithic-overflow-4-pages-print-ref.html b/tests/wpt/tests/css/printing/reference/monolithic-overflow-4-pages-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/reference/monolithic-overflow-4-pages-print-ref.html rename to tests/wpt/tests/css/printing/reference/monolithic-overflow-4-pages-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/transform-001-print-ref.html b/tests/wpt/tests/css/printing/transform-001-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/transform-001-print-ref.html rename to tests/wpt/tests/css/printing/transform-001-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/transform-001-print.html b/tests/wpt/tests/css/printing/transform-001-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/transform-001-print.html rename to tests/wpt/tests/css/printing/transform-001-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/transform-002-print-ref.html b/tests/wpt/tests/css/printing/transform-002-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/transform-002-print-ref.html rename to tests/wpt/tests/css/printing/transform-002-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/transform-002-print.html b/tests/wpt/tests/css/printing/transform-002-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/transform-002-print.html rename to tests/wpt/tests/css/printing/transform-002-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/transform-003-print-ref.html b/tests/wpt/tests/css/printing/transform-003-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/transform-003-print-ref.html rename to tests/wpt/tests/css/printing/transform-003-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/transform-003-print.html b/tests/wpt/tests/css/printing/transform-003-print.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/transform-003-print.html rename to tests/wpt/tests/css/printing/transform-003-print.html diff --git a/tests/wpt/web-platform-tests/css/printing/transition-in-media-print-ref.html b/tests/wpt/tests/css/printing/transition-in-media-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/transition-in-media-print-ref.html rename to tests/wpt/tests/css/printing/transition-in-media-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/printing/transition-in-media-print.tentative.html b/tests/wpt/tests/css/printing/transition-in-media-print.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/transition-in-media-print.tentative.html rename to tests/wpt/tests/css/printing/transition-in-media-print.tentative.html diff --git a/tests/wpt/web-platform-tests/css/printing/zero-size-001-print.tentative.html b/tests/wpt/tests/css/printing/zero-size-001-print.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/zero-size-001-print.tentative.html rename to tests/wpt/tests/css/printing/zero-size-001-print.tentative.html diff --git a/tests/wpt/web-platform-tests/css/printing/zero-size-002-print.tentative.html b/tests/wpt/tests/css/printing/zero-size-002-print.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/zero-size-002-print.tentative.html rename to tests/wpt/tests/css/printing/zero-size-002-print.tentative.html diff --git a/tests/wpt/web-platform-tests/css/printing/zero-size-003-print.tentative.html b/tests/wpt/tests/css/printing/zero-size-003-print.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/zero-size-003-print.tentative.html rename to tests/wpt/tests/css/printing/zero-size-003-print.tentative.html diff --git a/tests/wpt/web-platform-tests/css/printing/zero-size-print-ref.html b/tests/wpt/tests/css/printing/zero-size-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/printing/zero-size-print-ref.html rename to tests/wpt/tests/css/printing/zero-size-print-ref.html diff --git a/tests/wpt/web-platform-tests/css/reference/black_box_ends_when_blue_box_ends_6_boxes_ahem.html b/tests/wpt/tests/css/reference/black_box_ends_when_blue_box_ends_6_boxes_ahem.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/black_box_ends_when_blue_box_ends_6_boxes_ahem.html rename to tests/wpt/tests/css/reference/black_box_ends_when_blue_box_ends_6_boxes_ahem.html diff --git a/tests/wpt/web-platform-tests/css/reference/blank.html b/tests/wpt/tests/css/reference/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/blank.html rename to tests/wpt/tests/css/reference/blank.html diff --git a/tests/wpt/web-platform-tests/css/reference/nothing.html b/tests/wpt/tests/css/reference/nothing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/nothing.html rename to tests/wpt/tests/css/reference/nothing.html diff --git a/tests/wpt/web-platform-tests/css/reference/only_pass_parens_semicolon.html b/tests/wpt/tests/css/reference/only_pass_parens_semicolon.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/only_pass_parens_semicolon.html rename to tests/wpt/tests/css/reference/only_pass_parens_semicolon.html diff --git a/tests/wpt/web-platform-tests/css/reference/pass_if_filler_text_match.xht b/tests/wpt/tests/css/reference/pass_if_filler_text_match.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/pass_if_filler_text_match.xht rename to tests/wpt/tests/css/reference/pass_if_filler_text_match.xht diff --git a/tests/wpt/web-platform-tests/css/reference/pass_if_filler_text_match_bold.xht b/tests/wpt/tests/css/reference/pass_if_filler_text_match_bold.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/pass_if_filler_text_match_bold.xht rename to tests/wpt/tests/css/reference/pass_if_filler_text_match_bold.xht diff --git a/tests/wpt/web-platform-tests/css/reference/pass_if_filler_text_match_smallcaps.xht b/tests/wpt/tests/css/reference/pass_if_filler_text_match_smallcaps.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/pass_if_filler_text_match_smallcaps.xht rename to tests/wpt/tests/css/reference/pass_if_filler_text_match_smallcaps.xht diff --git a/tests/wpt/web-platform-tests/css/reference/pass_if_filler_text_slanted.xht b/tests/wpt/tests/css/reference/pass_if_filler_text_slanted.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/pass_if_filler_text_slanted.xht rename to tests/wpt/tests/css/reference/pass_if_filler_text_slanted.xht diff --git a/tests/wpt/web-platform-tests/css/reference/pass_if_filler_text_underlined-notref.html b/tests/wpt/tests/css/reference/pass_if_filler_text_underlined-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/pass_if_filler_text_underlined-notref.html rename to tests/wpt/tests/css/reference/pass_if_filler_text_underlined-notref.html diff --git a/tests/wpt/web-platform-tests/css/reference/pass_if_filler_text_underlined.html b/tests/wpt/tests/css/reference/pass_if_filler_text_underlined.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/pass_if_filler_text_underlined.html rename to tests/wpt/tests/css/reference/pass_if_filler_text_underlined.html diff --git a/tests/wpt/web-platform-tests/css/reference/pass_if_letter_uppercase.html b/tests/wpt/tests/css/reference/pass_if_letter_uppercase.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/pass_if_letter_uppercase.html rename to tests/wpt/tests/css/reference/pass_if_letter_uppercase.html diff --git a/tests/wpt/web-platform-tests/css/reference/pass_if_number_10.html b/tests/wpt/tests/css/reference/pass_if_number_10.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/pass_if_number_10.html rename to tests/wpt/tests/css/reference/pass_if_number_10.html diff --git a/tests/wpt/web-platform-tests/css/reference/pass_if_number_5.xht b/tests/wpt/tests/css/reference/pass_if_number_5.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/pass_if_number_5.xht rename to tests/wpt/tests/css/reference/pass_if_number_5.xht diff --git a/tests/wpt/web-platform-tests/css/reference/pass_if_pass_below.html b/tests/wpt/tests/css/reference/pass_if_pass_below.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/pass_if_pass_below.html rename to tests/wpt/tests/css/reference/pass_if_pass_below.html diff --git a/tests/wpt/web-platform-tests/css/reference/pass_if_square_96px_black.html b/tests/wpt/tests/css/reference/pass_if_square_96px_black.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/pass_if_square_96px_black.html rename to tests/wpt/tests/css/reference/pass_if_square_96px_black.html diff --git a/tests/wpt/web-platform-tests/css/reference/pass_if_two_words.html b/tests/wpt/tests/css/reference/pass_if_two_words.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/pass_if_two_words.html rename to tests/wpt/tests/css/reference/pass_if_two_words.html diff --git a/tests/wpt/web-platform-tests/css/reference/ref-filled-green-100px-square-only.html b/tests/wpt/tests/css/reference/ref-filled-green-100px-square-only.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/ref-filled-green-100px-square-only.html rename to tests/wpt/tests/css/reference/ref-filled-green-100px-square-only.html diff --git a/tests/wpt/web-platform-tests/css/reference/ref-filled-green-100px-square.xht b/tests/wpt/tests/css/reference/ref-filled-green-100px-square.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/ref-filled-green-100px-square.xht rename to tests/wpt/tests/css/reference/ref-filled-green-100px-square.xht diff --git a/tests/wpt/web-platform-tests/css/reference/ref-filled-green-200px-square.html b/tests/wpt/tests/css/reference/ref-filled-green-200px-square.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/ref-filled-green-200px-square.html rename to tests/wpt/tests/css/reference/ref-filled-green-200px-square.html diff --git a/tests/wpt/web-platform-tests/css/reference/ref-filled-green-300px-square.html b/tests/wpt/tests/css/reference/ref-filled-green-300px-square.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/ref-filled-green-300px-square.html rename to tests/wpt/tests/css/reference/ref-filled-green-300px-square.html diff --git a/tests/wpt/web-platform-tests/css/reference/ref-filled-greenish-100px-square.html b/tests/wpt/tests/css/reference/ref-filled-greenish-100px-square.html similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/ref-filled-greenish-100px-square.html rename to tests/wpt/tests/css/reference/ref-filled-greenish-100px-square.html diff --git a/tests/wpt/web-platform-tests/css/reference/ref-nothing-below.xht b/tests/wpt/tests/css/reference/ref-nothing-below.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/ref-nothing-below.xht rename to tests/wpt/tests/css/reference/ref-nothing-below.xht diff --git a/tests/wpt/web-platform-tests/css/reference/single_square_list_marker.xht b/tests/wpt/tests/css/reference/single_square_list_marker.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/reference/single_square_list_marker.xht rename to tests/wpt/tests/css/reference/single_square_list_marker.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/META.yml b/tests/wpt/tests/css/selectors/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/META.yml rename to tests/wpt/tests/css/selectors/META.yml diff --git a/tests/wpt/web-platform-tests/css/selectors/anplusb-selector-parsing.html b/tests/wpt/tests/css/selectors/anplusb-selector-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/anplusb-selector-parsing.html rename to tests/wpt/tests/css/selectors/anplusb-selector-parsing.html diff --git a/tests/wpt/web-platform-tests/css/selectors/any-link-dynamic-001-ref.html b/tests/wpt/tests/css/selectors/any-link-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/any-link-dynamic-001-ref.html rename to tests/wpt/tests/css/selectors/any-link-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/any-link-dynamic-001.html b/tests/wpt/tests/css/selectors/any-link-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/any-link-dynamic-001.html rename to tests/wpt/tests/css/selectors/any-link-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/cssom.html b/tests/wpt/tests/css/selectors/attribute-selectors/attribute-case/cssom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/cssom.html rename to tests/wpt/tests/css/selectors/attribute-selectors/attribute-case/cssom.html diff --git a/tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/resources/semantics-quirks.html b/tests/wpt/tests/css/selectors/attribute-selectors/attribute-case/resources/semantics-quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/resources/semantics-quirks.html rename to tests/wpt/tests/css/selectors/attribute-selectors/attribute-case/resources/semantics-quirks.html diff --git a/tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/resources/semantics-xml.xhtml b/tests/wpt/tests/css/selectors/attribute-selectors/attribute-case/resources/semantics-xml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/resources/semantics-xml.xhtml rename to tests/wpt/tests/css/selectors/attribute-selectors/attribute-case/resources/semantics-xml.xhtml diff --git a/tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/resources/syntax-quirks.html b/tests/wpt/tests/css/selectors/attribute-selectors/attribute-case/resources/syntax-quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/resources/syntax-quirks.html rename to tests/wpt/tests/css/selectors/attribute-selectors/attribute-case/resources/syntax-quirks.html diff --git a/tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/resources/syntax-xml.xhtml b/tests/wpt/tests/css/selectors/attribute-selectors/attribute-case/resources/syntax-xml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/resources/syntax-xml.xhtml rename to tests/wpt/tests/css/selectors/attribute-selectors/attribute-case/resources/syntax-xml.xhtml diff --git a/tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/semantics.html b/tests/wpt/tests/css/selectors/attribute-selectors/attribute-case/semantics.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/semantics.html rename to tests/wpt/tests/css/selectors/attribute-selectors/attribute-case/semantics.html diff --git a/tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/syntax.html b/tests/wpt/tests/css/selectors/attribute-selectors/attribute-case/syntax.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/syntax.html rename to tests/wpt/tests/css/selectors/attribute-selectors/attribute-case/syntax.html diff --git a/tests/wpt/web-platform-tests/css/selectors/attribute-selectors/style-attribute-selector.html b/tests/wpt/tests/css/selectors/attribute-selectors/style-attribute-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/attribute-selectors/style-attribute-selector.html rename to tests/wpt/tests/css/selectors/attribute-selectors/style-attribute-selector.html diff --git a/tests/wpt/web-platform-tests/css/selectors/case-insensitive-parent-ref.html b/tests/wpt/tests/css/selectors/case-insensitive-parent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/case-insensitive-parent-ref.html rename to tests/wpt/tests/css/selectors/case-insensitive-parent-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/case-insensitive-parent.html b/tests/wpt/tests/css/selectors/case-insensitive-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/case-insensitive-parent.html rename to tests/wpt/tests/css/selectors/case-insensitive-parent.html diff --git a/tests/wpt/web-platform-tests/css/selectors/child-indexed-no-parent-ref.html b/tests/wpt/tests/css/selectors/child-indexed-no-parent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/child-indexed-no-parent-ref.html rename to tests/wpt/tests/css/selectors/child-indexed-no-parent-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/child-indexed-no-parent.html b/tests/wpt/tests/css/selectors/child-indexed-no-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/child-indexed-no-parent.html rename to tests/wpt/tests/css/selectors/child-indexed-no-parent.html diff --git a/tests/wpt/web-platform-tests/css/selectors/child-indexed-pseudo-class.html b/tests/wpt/tests/css/selectors/child-indexed-pseudo-class.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/child-indexed-pseudo-class.html rename to tests/wpt/tests/css/selectors/child-indexed-pseudo-class.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-pseudo-in-has.html b/tests/wpt/tests/css/selectors/dir-pseudo-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-pseudo-in-has.html rename to tests/wpt/tests/css/selectors/dir-pseudo-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-pseudo-on-bdi-element.html b/tests/wpt/tests/css/selectors/dir-pseudo-on-bdi-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-pseudo-on-bdi-element.html rename to tests/wpt/tests/css/selectors/dir-pseudo-on-bdi-element.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-pseudo-on-input-element.html b/tests/wpt/tests/css/selectors/dir-pseudo-on-input-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-pseudo-on-input-element.html rename to tests/wpt/tests/css/selectors/dir-pseudo-on-input-element.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-pseudo-update-document-element-ref.html b/tests/wpt/tests/css/selectors/dir-pseudo-update-document-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-pseudo-update-document-element-ref.html rename to tests/wpt/tests/css/selectors/dir-pseudo-update-document-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-pseudo-update-document-element.html b/tests/wpt/tests/css/selectors/dir-pseudo-update-document-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-pseudo-update-document-element.html rename to tests/wpt/tests/css/selectors/dir-pseudo-update-document-element.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-auto-direction-change-001.html b/tests/wpt/tests/css/selectors/dir-selector-auto-direction-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-auto-direction-change-001.html rename to tests/wpt/tests/css/selectors/dir-selector-auto-direction-change-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-auto.html b/tests/wpt/tests/css/selectors/dir-selector-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-auto.html rename to tests/wpt/tests/css/selectors/dir-selector-auto.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-change-001-ref.html b/tests/wpt/tests/css/selectors/dir-selector-change-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-change-001-ref.html rename to tests/wpt/tests/css/selectors/dir-selector-change-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-change-001.html b/tests/wpt/tests/css/selectors/dir-selector-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-change-001.html rename to tests/wpt/tests/css/selectors/dir-selector-change-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-change-002.html b/tests/wpt/tests/css/selectors/dir-selector-change-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-change-002.html rename to tests/wpt/tests/css/selectors/dir-selector-change-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-change-003-ref.html b/tests/wpt/tests/css/selectors/dir-selector-change-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-change-003-ref.html rename to tests/wpt/tests/css/selectors/dir-selector-change-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-change-003.html b/tests/wpt/tests/css/selectors/dir-selector-change-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-change-003.html rename to tests/wpt/tests/css/selectors/dir-selector-change-003.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-change-004-ref.html b/tests/wpt/tests/css/selectors/dir-selector-change-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-change-004-ref.html rename to tests/wpt/tests/css/selectors/dir-selector-change-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-change-004.html b/tests/wpt/tests/css/selectors/dir-selector-change-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-change-004.html rename to tests/wpt/tests/css/selectors/dir-selector-change-004.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-ltr-001.html b/tests/wpt/tests/css/selectors/dir-selector-ltr-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-ltr-001.html rename to tests/wpt/tests/css/selectors/dir-selector-ltr-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-ltr-002.html b/tests/wpt/tests/css/selectors/dir-selector-ltr-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-ltr-002.html rename to tests/wpt/tests/css/selectors/dir-selector-ltr-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-ltr-003.html b/tests/wpt/tests/css/selectors/dir-selector-ltr-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-ltr-003.html rename to tests/wpt/tests/css/selectors/dir-selector-ltr-003.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-querySelector.html b/tests/wpt/tests/css/selectors/dir-selector-querySelector.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-querySelector.html rename to tests/wpt/tests/css/selectors/dir-selector-querySelector.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-rtl-001.html b/tests/wpt/tests/css/selectors/dir-selector-rtl-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-rtl-001.html rename to tests/wpt/tests/css/selectors/dir-selector-rtl-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-white-space-001-ref.html b/tests/wpt/tests/css/selectors/dir-selector-white-space-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-white-space-001-ref.html rename to tests/wpt/tests/css/selectors/dir-selector-white-space-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-selector-white-space-001.html b/tests/wpt/tests/css/selectors/dir-selector-white-space-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-selector-white-space-001.html rename to tests/wpt/tests/css/selectors/dir-selector-white-space-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-style-01-ref.html b/tests/wpt/tests/css/selectors/dir-style-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-style-01-ref.html rename to tests/wpt/tests/css/selectors/dir-style-01-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-style-01a.html b/tests/wpt/tests/css/selectors/dir-style-01a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-style-01a.html rename to tests/wpt/tests/css/selectors/dir-style-01a.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-style-01b.html b/tests/wpt/tests/css/selectors/dir-style-01b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-style-01b.html rename to tests/wpt/tests/css/selectors/dir-style-01b.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-style-02-ref.html b/tests/wpt/tests/css/selectors/dir-style-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-style-02-ref.html rename to tests/wpt/tests/css/selectors/dir-style-02-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-style-02a.html b/tests/wpt/tests/css/selectors/dir-style-02a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-style-02a.html rename to tests/wpt/tests/css/selectors/dir-style-02a.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-style-02b.html b/tests/wpt/tests/css/selectors/dir-style-02b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-style-02b.html rename to tests/wpt/tests/css/selectors/dir-style-02b.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-style-03-ref.html b/tests/wpt/tests/css/selectors/dir-style-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-style-03-ref.html rename to tests/wpt/tests/css/selectors/dir-style-03-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-style-03a.html b/tests/wpt/tests/css/selectors/dir-style-03a.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-style-03a.html rename to tests/wpt/tests/css/selectors/dir-style-03a.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-style-03b.html b/tests/wpt/tests/css/selectors/dir-style-03b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-style-03b.html rename to tests/wpt/tests/css/selectors/dir-style-03b.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-style-04-ref.html b/tests/wpt/tests/css/selectors/dir-style-04-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-style-04-ref.html rename to tests/wpt/tests/css/selectors/dir-style-04-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/dir-style-04.html b/tests/wpt/tests/css/selectors/dir-style-04.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/dir-style-04.html rename to tests/wpt/tests/css/selectors/dir-style-04.html diff --git a/tests/wpt/web-platform-tests/css/selectors/eof-right-after-selector-crash.html b/tests/wpt/tests/css/selectors/eof-right-after-selector-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/eof-right-after-selector-crash.html rename to tests/wpt/tests/css/selectors/eof-right-after-selector-crash.html diff --git a/tests/wpt/web-platform-tests/css/selectors/eof-some-after-selector-crash.html b/tests/wpt/tests/css/selectors/eof-some-after-selector-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/eof-some-after-selector-crash.html rename to tests/wpt/tests/css/selectors/eof-some-after-selector-crash.html diff --git a/tests/wpt/web-platform-tests/css/selectors/first-child.html b/tests/wpt/tests/css/selectors/first-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/first-child.html rename to tests/wpt/tests/css/selectors/first-child.html diff --git a/tests/wpt/web-platform-tests/css/selectors/first-letter-flag-001-ref.html b/tests/wpt/tests/css/selectors/first-letter-flag-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/first-letter-flag-001-ref.html rename to tests/wpt/tests/css/selectors/first-letter-flag-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/first-letter-flag-001.html b/tests/wpt/tests/css/selectors/first-letter-flag-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/first-letter-flag-001.html rename to tests/wpt/tests/css/selectors/first-letter-flag-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/first-line-bidi-001-ref.html b/tests/wpt/tests/css/selectors/first-line-bidi-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/first-line-bidi-001-ref.html rename to tests/wpt/tests/css/selectors/first-line-bidi-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/first-line-bidi-001.html b/tests/wpt/tests/css/selectors/first-line-bidi-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/first-line-bidi-001.html rename to tests/wpt/tests/css/selectors/first-line-bidi-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/first-line-bidi-002-ref.html b/tests/wpt/tests/css/selectors/first-line-bidi-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/first-line-bidi-002-ref.html rename to tests/wpt/tests/css/selectors/first-line-bidi-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/first-line-bidi-002.html b/tests/wpt/tests/css/selectors/first-line-bidi-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/first-line-bidi-002.html rename to tests/wpt/tests/css/selectors/first-line-bidi-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/first-of-type.html b/tests/wpt/tests/css/selectors/first-of-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/first-of-type.html rename to tests/wpt/tests/css/selectors/first-of-type.html diff --git a/tests/wpt/web-platform-tests/css/selectors/floating-first-letter-05d0.html b/tests/wpt/tests/css/selectors/floating-first-letter-05d0.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/floating-first-letter-05d0.html rename to tests/wpt/tests/css/selectors/floating-first-letter-05d0.html diff --git a/tests/wpt/web-platform-tests/css/selectors/floating-first-letter-feff.html b/tests/wpt/tests/css/selectors/floating-first-letter-feff.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/floating-first-letter-feff.html rename to tests/wpt/tests/css/selectors/floating-first-letter-feff.html diff --git a/tests/wpt/web-platform-tests/css/selectors/floating-first-letter-ref.html b/tests/wpt/tests/css/selectors/floating-first-letter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/floating-first-letter-ref.html rename to tests/wpt/tests/css/selectors/floating-first-letter-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-display-none-001.html b/tests/wpt/tests/css/selectors/focus-display-none-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-display-none-001.html rename to tests/wpt/tests/css/selectors/focus-display-none-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-in-focus-event-001.html b/tests/wpt/tests/css/selectors/focus-in-focus-event-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-in-focus-event-001.html rename to tests/wpt/tests/css/selectors/focus-in-focus-event-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-in-focusin-event-001.html b/tests/wpt/tests/css/selectors/focus-in-focusin-event-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-in-focusin-event-001.html rename to tests/wpt/tests/css/selectors/focus-in-focusin-event-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-001.html b/tests/wpt/tests/css/selectors/focus-visible-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-001.html rename to tests/wpt/tests/css/selectors/focus-visible-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-002.html b/tests/wpt/tests/css/selectors/focus-visible-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-002.html rename to tests/wpt/tests/css/selectors/focus-visible-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-003.html b/tests/wpt/tests/css/selectors/focus-visible-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-003.html rename to tests/wpt/tests/css/selectors/focus-visible-003.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-004.html b/tests/wpt/tests/css/selectors/focus-visible-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-004.html rename to tests/wpt/tests/css/selectors/focus-visible-004.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-005.html b/tests/wpt/tests/css/selectors/focus-visible-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-005.html rename to tests/wpt/tests/css/selectors/focus-visible-005.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-006.html b/tests/wpt/tests/css/selectors/focus-visible-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-006.html rename to tests/wpt/tests/css/selectors/focus-visible-006.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-007.html b/tests/wpt/tests/css/selectors/focus-visible-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-007.html rename to tests/wpt/tests/css/selectors/focus-visible-007.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-008.html b/tests/wpt/tests/css/selectors/focus-visible-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-008.html rename to tests/wpt/tests/css/selectors/focus-visible-008.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-009.html b/tests/wpt/tests/css/selectors/focus-visible-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-009.html rename to tests/wpt/tests/css/selectors/focus-visible-009.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-010.html b/tests/wpt/tests/css/selectors/focus-visible-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-010.html rename to tests/wpt/tests/css/selectors/focus-visible-010.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-011.html b/tests/wpt/tests/css/selectors/focus-visible-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-011.html rename to tests/wpt/tests/css/selectors/focus-visible-011.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-012.html b/tests/wpt/tests/css/selectors/focus-visible-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-012.html rename to tests/wpt/tests/css/selectors/focus-visible-012.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-013.html b/tests/wpt/tests/css/selectors/focus-visible-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-013.html rename to tests/wpt/tests/css/selectors/focus-visible-013.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-014.html b/tests/wpt/tests/css/selectors/focus-visible-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-014.html rename to tests/wpt/tests/css/selectors/focus-visible-014.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-015.html b/tests/wpt/tests/css/selectors/focus-visible-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-015.html rename to tests/wpt/tests/css/selectors/focus-visible-015.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-016.html b/tests/wpt/tests/css/selectors/focus-visible-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-016.html rename to tests/wpt/tests/css/selectors/focus-visible-016.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-017-2.html b/tests/wpt/tests/css/selectors/focus-visible-017-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-017-2.html rename to tests/wpt/tests/css/selectors/focus-visible-017-2.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-017.html b/tests/wpt/tests/css/selectors/focus-visible-017.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-017.html rename to tests/wpt/tests/css/selectors/focus-visible-017.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-018-2.html b/tests/wpt/tests/css/selectors/focus-visible-018-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-018-2.html rename to tests/wpt/tests/css/selectors/focus-visible-018-2.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-018.html b/tests/wpt/tests/css/selectors/focus-visible-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-018.html rename to tests/wpt/tests/css/selectors/focus-visible-018.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-019.html b/tests/wpt/tests/css/selectors/focus-visible-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-019.html rename to tests/wpt/tests/css/selectors/focus-visible-019.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-020.html b/tests/wpt/tests/css/selectors/focus-visible-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-020.html rename to tests/wpt/tests/css/selectors/focus-visible-020.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-021.html b/tests/wpt/tests/css/selectors/focus-visible-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-021.html rename to tests/wpt/tests/css/selectors/focus-visible-021.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-022.tentative.html b/tests/wpt/tests/css/selectors/focus-visible-022.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-022.tentative.html rename to tests/wpt/tests/css/selectors/focus-visible-022.tentative.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-023.html b/tests/wpt/tests/css/selectors/focus-visible-023.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-023.html rename to tests/wpt/tests/css/selectors/focus-visible-023.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-024.html b/tests/wpt/tests/css/selectors/focus-visible-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-024.html rename to tests/wpt/tests/css/selectors/focus-visible-024.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-025.html b/tests/wpt/tests/css/selectors/focus-visible-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-025.html rename to tests/wpt/tests/css/selectors/focus-visible-025.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-026.html b/tests/wpt/tests/css/selectors/focus-visible-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-026.html rename to tests/wpt/tests/css/selectors/focus-visible-026.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-027.html b/tests/wpt/tests/css/selectors/focus-visible-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-027.html rename to tests/wpt/tests/css/selectors/focus-visible-027.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-001.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-001.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-002.tentative.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-002.tentative.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-002.tentative.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-003.tentative.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-003.tentative.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-003.tentative.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-004.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-004.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-004.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-005.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-005.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-005.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-006.tentative.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-006.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-006.tentative.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-006.tentative.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-007.tentative.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-007.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-007.tentative.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-007.tentative.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-008-b.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-008-b.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-008-b.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-008-b.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-008.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-008.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-008.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-009.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-009.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-009.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-010.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-010.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-010.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-011.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-011.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-011.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-012.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-012.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-012.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-013.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-013.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-013.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-014.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-014.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-014.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-015.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-015.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-015.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-016.tentative.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-016.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-016.tentative.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-016.tentative.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-017.tentative.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-017.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-017.tentative.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-017.tentative.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-018.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-018.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-018.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-018.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-019.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-019.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-019.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-019.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-020.html b/tests/wpt/tests/css/selectors/focus-visible-script-focus-020.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-visible-script-focus-020.html rename to tests/wpt/tests/css/selectors/focus-visible-script-focus-020.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-001-ref.html b/tests/wpt/tests/css/selectors/focus-within-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-001-ref.html rename to tests/wpt/tests/css/selectors/focus-within-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-001.html b/tests/wpt/tests/css/selectors/focus-within-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-001.html rename to tests/wpt/tests/css/selectors/focus-within-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-002.html b/tests/wpt/tests/css/selectors/focus-within-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-002.html rename to tests/wpt/tests/css/selectors/focus-within-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-003.html b/tests/wpt/tests/css/selectors/focus-within-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-003.html rename to tests/wpt/tests/css/selectors/focus-within-003.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-004.html b/tests/wpt/tests/css/selectors/focus-within-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-004.html rename to tests/wpt/tests/css/selectors/focus-within-004.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-005.html b/tests/wpt/tests/css/selectors/focus-within-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-005.html rename to tests/wpt/tests/css/selectors/focus-within-005.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-006-ref.html b/tests/wpt/tests/css/selectors/focus-within-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-006-ref.html rename to tests/wpt/tests/css/selectors/focus-within-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-006.html b/tests/wpt/tests/css/selectors/focus-within-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-006.html rename to tests/wpt/tests/css/selectors/focus-within-006.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-007-ref.html b/tests/wpt/tests/css/selectors/focus-within-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-007-ref.html rename to tests/wpt/tests/css/selectors/focus-within-007-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-007.html b/tests/wpt/tests/css/selectors/focus-within-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-007.html rename to tests/wpt/tests/css/selectors/focus-within-007.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-008.html b/tests/wpt/tests/css/selectors/focus-within-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-008.html rename to tests/wpt/tests/css/selectors/focus-within-008.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-009.html b/tests/wpt/tests/css/selectors/focus-within-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-009.html rename to tests/wpt/tests/css/selectors/focus-within-009.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-010.html b/tests/wpt/tests/css/selectors/focus-within-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-010.html rename to tests/wpt/tests/css/selectors/focus-within-010.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-011-ref.html b/tests/wpt/tests/css/selectors/focus-within-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-011-ref.html rename to tests/wpt/tests/css/selectors/focus-within-011-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-011.html b/tests/wpt/tests/css/selectors/focus-within-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-011.html rename to tests/wpt/tests/css/selectors/focus-within-011.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-012-ref.html b/tests/wpt/tests/css/selectors/focus-within-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-012-ref.html rename to tests/wpt/tests/css/selectors/focus-within-012-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-012.html b/tests/wpt/tests/css/selectors/focus-within-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-012.html rename to tests/wpt/tests/css/selectors/focus-within-012.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-013-ref.html b/tests/wpt/tests/css/selectors/focus-within-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-013-ref.html rename to tests/wpt/tests/css/selectors/focus-within-013-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-013.html b/tests/wpt/tests/css/selectors/focus-within-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-013.html rename to tests/wpt/tests/css/selectors/focus-within-013.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-display-none-001.html b/tests/wpt/tests/css/selectors/focus-within-display-none-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-display-none-001.html rename to tests/wpt/tests/css/selectors/focus-within-display-none-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-shadow-001-ref.html b/tests/wpt/tests/css/selectors/focus-within-shadow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-shadow-001-ref.html rename to tests/wpt/tests/css/selectors/focus-within-shadow-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-shadow-001.html b/tests/wpt/tests/css/selectors/focus-within-shadow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-shadow-001.html rename to tests/wpt/tests/css/selectors/focus-within-shadow-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-shadow-002.html b/tests/wpt/tests/css/selectors/focus-within-shadow-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-shadow-002.html rename to tests/wpt/tests/css/selectors/focus-within-shadow-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-shadow-003.html b/tests/wpt/tests/css/selectors/focus-within-shadow-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-shadow-003.html rename to tests/wpt/tests/css/selectors/focus-within-shadow-003.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-shadow-004.html b/tests/wpt/tests/css/selectors/focus-within-shadow-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-shadow-004.html rename to tests/wpt/tests/css/selectors/focus-within-shadow-004.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-shadow-005.html b/tests/wpt/tests/css/selectors/focus-within-shadow-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-shadow-005.html rename to tests/wpt/tests/css/selectors/focus-within-shadow-005.html diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-within-shadow-006.html b/tests/wpt/tests/css/selectors/focus-within-shadow-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/focus-within-shadow-006.html rename to tests/wpt/tests/css/selectors/focus-within-shadow-006.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-argument-with-explicit-scope.html b/tests/wpt/tests/css/selectors/has-argument-with-explicit-scope.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-argument-with-explicit-scope.html rename to tests/wpt/tests/css/selectors/has-argument-with-explicit-scope.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-basic.html b/tests/wpt/tests/css/selectors/has-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-basic.html rename to tests/wpt/tests/css/selectors/has-basic.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-matches-to-uninserted-elements.html b/tests/wpt/tests/css/selectors/has-matches-to-uninserted-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-matches-to-uninserted-elements.html rename to tests/wpt/tests/css/selectors/has-matches-to-uninserted-elements.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-relative-argument.html b/tests/wpt/tests/css/selectors/has-relative-argument.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-relative-argument.html rename to tests/wpt/tests/css/selectors/has-relative-argument.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-specificity.html b/tests/wpt/tests/css/selectors/has-specificity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-specificity.html rename to tests/wpt/tests/css/selectors/has-specificity.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-style-sharing-001-ref.html b/tests/wpt/tests/css/selectors/has-style-sharing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-style-sharing-001-ref.html rename to tests/wpt/tests/css/selectors/has-style-sharing-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-style-sharing-001.html b/tests/wpt/tests/css/selectors/has-style-sharing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-style-sharing-001.html rename to tests/wpt/tests/css/selectors/has-style-sharing-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-style-sharing-002-ref.html b/tests/wpt/tests/css/selectors/has-style-sharing-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-style-sharing-002-ref.html rename to tests/wpt/tests/css/selectors/has-style-sharing-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-style-sharing-002.html b/tests/wpt/tests/css/selectors/has-style-sharing-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-style-sharing-002.html rename to tests/wpt/tests/css/selectors/has-style-sharing-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-style-sharing-003-ref.html b/tests/wpt/tests/css/selectors/has-style-sharing-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-style-sharing-003-ref.html rename to tests/wpt/tests/css/selectors/has-style-sharing-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-style-sharing-003.html b/tests/wpt/tests/css/selectors/has-style-sharing-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-style-sharing-003.html rename to tests/wpt/tests/css/selectors/has-style-sharing-003.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-style-sharing-004-ref.html b/tests/wpt/tests/css/selectors/has-style-sharing-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-style-sharing-004-ref.html rename to tests/wpt/tests/css/selectors/has-style-sharing-004-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-style-sharing-004.html b/tests/wpt/tests/css/selectors/has-style-sharing-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-style-sharing-004.html rename to tests/wpt/tests/css/selectors/has-style-sharing-004.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-style-sharing-005-ref.html b/tests/wpt/tests/css/selectors/has-style-sharing-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-style-sharing-005-ref.html rename to tests/wpt/tests/css/selectors/has-style-sharing-005-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-style-sharing-005.html b/tests/wpt/tests/css/selectors/has-style-sharing-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-style-sharing-005.html rename to tests/wpt/tests/css/selectors/has-style-sharing-005.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-style-sharing-006-ref.html b/tests/wpt/tests/css/selectors/has-style-sharing-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-style-sharing-006-ref.html rename to tests/wpt/tests/css/selectors/has-style-sharing-006-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-style-sharing-006.html b/tests/wpt/tests/css/selectors/has-style-sharing-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-style-sharing-006.html rename to tests/wpt/tests/css/selectors/has-style-sharing-006.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-visited-ref.html b/tests/wpt/tests/css/selectors/has-visited-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-visited-ref.html rename to tests/wpt/tests/css/selectors/has-visited-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/has-visited.html b/tests/wpt/tests/css/selectors/has-visited.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/has-visited.html rename to tests/wpt/tests/css/selectors/has-visited.html diff --git a/tests/wpt/web-platform-tests/css/selectors/historical-xmlid.xht b/tests/wpt/tests/css/selectors/historical-xmlid.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/historical-xmlid.xht rename to tests/wpt/tests/css/selectors/historical-xmlid.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/hover-001-manual.html b/tests/wpt/tests/css/selectors/hover-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/hover-001-manual.html rename to tests/wpt/tests/css/selectors/hover-001-manual.html diff --git a/tests/wpt/web-platform-tests/css/selectors/hover-002.html b/tests/wpt/tests/css/selectors/hover-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/hover-002.html rename to tests/wpt/tests/css/selectors/hover-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/META.yml b/tests/wpt/tests/css/selectors/i18n/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/META.yml rename to tests/wpt/tests/css/selectors/i18n/META.yml diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/README b/tests/wpt/tests/css/selectors/i18n/README similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/README rename to tests/wpt/tests/css/selectors/i18n/README diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-001.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-001.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-002.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-002.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-004.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-004.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-004.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-005.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-005.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-005.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-006.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-006.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-006.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-007.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-007.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-007.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-008.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-008.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-008.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-009.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-009.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-009.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-010.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-010.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-010.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-011.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-011.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-011.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-012.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-012.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-012.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-014.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-014.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-014.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-015.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-015.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-015.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-016.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-016.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-016.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-016.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-021.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-021.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-021.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-021.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-022.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-022.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-022.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-022.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-024.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-024.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-024.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-024.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-025.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-025.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-025.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-025.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-026.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-026.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-026.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-026.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-027.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-027.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-027.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-027.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-028.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-028.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-028.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-028.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-029.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-029.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-029.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-029.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-030.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-030.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-030.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-030.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-031.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-031.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-031.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-031.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-032.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-032.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-032.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-032.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-034.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-034.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-034.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-034.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-035.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-035.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-035.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-035.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-036.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-036.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-036.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-036.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-041.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-041.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-041.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-041.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-042.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-042.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-042.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-042.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-044.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-044.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-044.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-044.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-045.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-045.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-045.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-045.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-046.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-046.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-046.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-046.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-047.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-047.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-047.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-047.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-048.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-048.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-048.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-048.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-049.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-049.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-049.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-049.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-050.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-050.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-050.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-050.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-051.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-051.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-051.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-051.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-052.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-052.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-052.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-052.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-054.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-054.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-054.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-054.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-055.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-055.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-055.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-055.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-056.html b/tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-056.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/css3-selectors-lang-056.html rename to tests/wpt/tests/css/selectors/i18n/css3-selectors-lang-056.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries-ref.html b/tests/wpt/tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries-ref.html rename to tests/wpt/tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries.html b/tests/wpt/tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries.html rename to tests/wpt/tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/lang-pseudo-class-disconnected.html b/tests/wpt/tests/css/selectors/i18n/lang-pseudo-class-disconnected.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/lang-pseudo-class-disconnected.html rename to tests/wpt/tests/css/selectors/i18n/lang-pseudo-class-disconnected.html diff --git a/tests/wpt/web-platform-tests/css/selectors/i18n/lang-pseudo-class-empty-attribute.xhtml b/tests/wpt/tests/css/selectors/i18n/lang-pseudo-class-empty-attribute.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/i18n/lang-pseudo-class-empty-attribute.xhtml rename to tests/wpt/tests/css/selectors/i18n/lang-pseudo-class-empty-attribute.xhtml diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/any-link-pseudo.html b/tests/wpt/tests/css/selectors/invalidation/any-link-pseudo.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/any-link-pseudo.html rename to tests/wpt/tests/css/selectors/invalidation/any-link-pseudo.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/attribute-or-elemental-selectors-in-has.html b/tests/wpt/tests/css/selectors/invalidation/attribute-or-elemental-selectors-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/attribute-or-elemental-selectors-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/attribute-or-elemental-selectors-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/attribute.html b/tests/wpt/tests/css/selectors/invalidation/attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/attribute.html rename to tests/wpt/tests/css/selectors/invalidation/attribute.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/child-indexed-pseudo-classes-in-has.html b/tests/wpt/tests/css/selectors/invalidation/child-indexed-pseudo-classes-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/child-indexed-pseudo-classes-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/child-indexed-pseudo-classes-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/class-id-attr-ref.html b/tests/wpt/tests/css/selectors/invalidation/class-id-attr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/class-id-attr-ref.html rename to tests/wpt/tests/css/selectors/invalidation/class-id-attr-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/class-id-attr.html b/tests/wpt/tests/css/selectors/invalidation/class-id-attr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/class-id-attr.html rename to tests/wpt/tests/css/selectors/invalidation/class-id-attr.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/crashtests/nth-child-of-attribute-crash.html b/tests/wpt/tests/css/selectors/invalidation/crashtests/nth-child-of-attribute-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/crashtests/nth-child-of-attribute-crash.html rename to tests/wpt/tests/css/selectors/invalidation/crashtests/nth-child-of-attribute-crash.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/defined-in-has.html b/tests/wpt/tests/css/selectors/invalidation/defined-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/defined-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/defined-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/defined.html b/tests/wpt/tests/css/selectors/invalidation/defined.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/defined.html rename to tests/wpt/tests/css/selectors/invalidation/defined.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/dir-pseudo-class-in-has.html b/tests/wpt/tests/css/selectors/invalidation/dir-pseudo-class-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/dir-pseudo-class-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/dir-pseudo-class-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/empty-pseudo-in-has.html b/tests/wpt/tests/css/selectors/invalidation/empty-pseudo-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/empty-pseudo-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/empty-pseudo-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/enabled-disabled.html b/tests/wpt/tests/css/selectors/invalidation/enabled-disabled.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/enabled-disabled.html rename to tests/wpt/tests/css/selectors/invalidation/enabled-disabled.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/first-child-last-child.html b/tests/wpt/tests/css/selectors/invalidation/first-child-last-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/first-child-last-child.html rename to tests/wpt/tests/css/selectors/invalidation/first-child-last-child.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/fullscreen-pseudo-class-in-has.html b/tests/wpt/tests/css/selectors/invalidation/fullscreen-pseudo-class-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/fullscreen-pseudo-class-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/fullscreen-pseudo-class-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/has-complexity.html b/tests/wpt/tests/css/selectors/invalidation/has-complexity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/has-complexity.html rename to tests/wpt/tests/css/selectors/invalidation/has-complexity.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/has-in-adjacent-position.html b/tests/wpt/tests/css/selectors/invalidation/has-in-adjacent-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/has-in-adjacent-position.html rename to tests/wpt/tests/css/selectors/invalidation/has-in-adjacent-position.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/has-in-ancestor-position.html b/tests/wpt/tests/css/selectors/invalidation/has-in-ancestor-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/has-in-ancestor-position.html rename to tests/wpt/tests/css/selectors/invalidation/has-in-ancestor-position.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/has-in-parent-position.html b/tests/wpt/tests/css/selectors/invalidation/has-in-parent-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/has-in-parent-position.html rename to tests/wpt/tests/css/selectors/invalidation/has-in-parent-position.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/has-in-sibling-position.html b/tests/wpt/tests/css/selectors/invalidation/has-in-sibling-position.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/has-in-sibling-position.html rename to tests/wpt/tests/css/selectors/invalidation/has-in-sibling-position.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/has-invalidation-after-removing-non-first-element.html b/tests/wpt/tests/css/selectors/invalidation/has-invalidation-after-removing-non-first-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/has-invalidation-after-removing-non-first-element.html rename to tests/wpt/tests/css/selectors/invalidation/has-invalidation-after-removing-non-first-element.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/has-invalidation-for-wiping-an-element.html b/tests/wpt/tests/css/selectors/invalidation/has-invalidation-for-wiping-an-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/has-invalidation-for-wiping-an-element.html rename to tests/wpt/tests/css/selectors/invalidation/has-invalidation-for-wiping-an-element.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/has-sibling.html b/tests/wpt/tests/css/selectors/invalidation/has-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/has-sibling.html rename to tests/wpt/tests/css/selectors/invalidation/has-sibling.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/has-with-not.html b/tests/wpt/tests/css/selectors/invalidation/has-with-not.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/has-with-not.html rename to tests/wpt/tests/css/selectors/invalidation/has-with-not.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/has-with-nth-child.html b/tests/wpt/tests/css/selectors/invalidation/has-with-nth-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/has-with-nth-child.html rename to tests/wpt/tests/css/selectors/invalidation/has-with-nth-child.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/has-with-pseudo-class.html b/tests/wpt/tests/css/selectors/invalidation/has-with-pseudo-class.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/has-with-pseudo-class.html rename to tests/wpt/tests/css/selectors/invalidation/has-with-pseudo-class.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/host-pseudo-class-in-has.html b/tests/wpt/tests/css/selectors/invalidation/host-pseudo-class-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/host-pseudo-class-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/host-pseudo-class-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/input-pseudo-classes-in-has.html b/tests/wpt/tests/css/selectors/invalidation/input-pseudo-classes-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/input-pseudo-classes-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/input-pseudo-classes-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/insert-sibling-001.html b/tests/wpt/tests/css/selectors/invalidation/insert-sibling-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/insert-sibling-001.html rename to tests/wpt/tests/css/selectors/invalidation/insert-sibling-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/insert-sibling-002.html b/tests/wpt/tests/css/selectors/invalidation/insert-sibling-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/insert-sibling-002.html rename to tests/wpt/tests/css/selectors/invalidation/insert-sibling-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/insert-sibling-003.html b/tests/wpt/tests/css/selectors/invalidation/insert-sibling-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/insert-sibling-003.html rename to tests/wpt/tests/css/selectors/invalidation/insert-sibling-003.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/insert-sibling-004.html b/tests/wpt/tests/css/selectors/invalidation/insert-sibling-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/insert-sibling-004.html rename to tests/wpt/tests/css/selectors/invalidation/insert-sibling-004.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/is-pseudo-containing-complex-in-has.html b/tests/wpt/tests/css/selectors/invalidation/is-pseudo-containing-complex-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/is-pseudo-containing-complex-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/is-pseudo-containing-complex-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/is.html b/tests/wpt/tests/css/selectors/invalidation/is.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/is.html rename to tests/wpt/tests/css/selectors/invalidation/is.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-document-element.html b/tests/wpt/tests/css/selectors/invalidation/lang-pseudo-class-in-has-document-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-document-element.html rename to tests/wpt/tests/css/selectors/invalidation/lang-pseudo-class-in-has-document-element.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-multiple-document-elements.html b/tests/wpt/tests/css/selectors/invalidation/lang-pseudo-class-in-has-multiple-document-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-multiple-document-elements.html rename to tests/wpt/tests/css/selectors/invalidation/lang-pseudo-class-in-has-multiple-document-elements.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-xhtml.xhtml b/tests/wpt/tests/css/selectors/invalidation/lang-pseudo-class-in-has-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-xhtml.xhtml rename to tests/wpt/tests/css/selectors/invalidation/lang-pseudo-class-in-has-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has.html b/tests/wpt/tests/css/selectors/invalidation/lang-pseudo-class-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/lang-pseudo-class-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/link-pseudo-in-has.html b/tests/wpt/tests/css/selectors/invalidation/link-pseudo-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/link-pseudo-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/link-pseudo-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/location-pseudo-classes-in-has.html b/tests/wpt/tests/css/selectors/invalidation/location-pseudo-classes-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/location-pseudo-classes-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/location-pseudo-classes-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/media-loading-pseudo-classes-in-has.html b/tests/wpt/tests/css/selectors/invalidation/media-loading-pseudo-classes-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/media-loading-pseudo-classes-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/media-loading-pseudo-classes-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/media-pseudo-classes-in-has.html b/tests/wpt/tests/css/selectors/invalidation/media-pseudo-classes-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/media-pseudo-classes-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/media-pseudo-classes-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/modal-pseudo-class-in-has.html b/tests/wpt/tests/css/selectors/invalidation/modal-pseudo-class-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/modal-pseudo-class-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/modal-pseudo-class-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/negated-nth-child-when-ancestor-changes-ref.html b/tests/wpt/tests/css/selectors/invalidation/negated-nth-child-when-ancestor-changes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/negated-nth-child-when-ancestor-changes-ref.html rename to tests/wpt/tests/css/selectors/invalidation/negated-nth-child-when-ancestor-changes-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/negated-nth-child-when-ancestor-changes.html b/tests/wpt/tests/css/selectors/invalidation/negated-nth-child-when-ancestor-changes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/negated-nth-child-when-ancestor-changes.html rename to tests/wpt/tests/css/selectors/invalidation/negated-nth-child-when-ancestor-changes.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/negated-nth-last-child-when-ancestor-changes-ref.html b/tests/wpt/tests/css/selectors/invalidation/negated-nth-last-child-when-ancestor-changes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/negated-nth-last-child-when-ancestor-changes-ref.html rename to tests/wpt/tests/css/selectors/invalidation/negated-nth-last-child-when-ancestor-changes-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/negated-nth-last-child-when-ancestor-changes.html b/tests/wpt/tests/css/selectors/invalidation/negated-nth-last-child-when-ancestor-changes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/negated-nth-last-child-when-ancestor-changes.html rename to tests/wpt/tests/css/selectors/invalidation/negated-nth-last-child-when-ancestor-changes.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/not-001.html b/tests/wpt/tests/css/selectors/invalidation/not-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/not-001.html rename to tests/wpt/tests/css/selectors/invalidation/not-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/not-002.html b/tests/wpt/tests/css/selectors/invalidation/not-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/not-002.html rename to tests/wpt/tests/css/selectors/invalidation/not-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/not-pseudo-containing-complex-in-has.html b/tests/wpt/tests/css/selectors/invalidation/not-pseudo-containing-complex-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/not-pseudo-containing-complex-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/not-pseudo-containing-complex-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-containing-ancestor-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-containing-ancestor-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-containing-ancestor-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-containing-ancestor-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-containing-ancestor.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-containing-ancestor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-containing-ancestor.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-containing-ancestor.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-in-shadow-root-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-in-shadow-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-in-shadow-root-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-in-shadow-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-in-shadow-root.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-in-shadow-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-in-shadow-root.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-in-shadow-root.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr-largedom-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-attr-largedom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr-largedom-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-attr-largedom-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr-largedom.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-attr-largedom.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr-largedom.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-attr-largedom.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-attr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-attr-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-attr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-attr.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-class-prefix.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-class-prefix.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-class-prefix.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-class-prefix.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-class-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-class-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-class-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-class-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-class.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-class.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-class.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-class.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-has-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-has-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-has-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-has-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-has.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-has.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-id-prefix.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-id-prefix.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-id-prefix.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-id-prefix.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-ids.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-ids.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-ids.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-ids.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-in-ancestor-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-in-ancestor-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-in-ancestor-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-in-ancestor-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-in-ancestor.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-in-ancestor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-in-ancestor.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-in-ancestor.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-in-is.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-in-is.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-in-is.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-in-is.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-in-shadow-root-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-in-shadow-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-in-shadow-root-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-in-shadow-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-in-shadow-root.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-in-shadow-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-in-shadow-root.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-in-shadow-root.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-is.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-is.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-is.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-is.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-pseudo-class-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-pseudo-class-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-pseudo-class-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-pseudo-class-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-pseudo-class.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-pseudo-class.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-pseudo-class.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-pseudo-class.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-sibling-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-sibling-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-sibling-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-sibling-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-sibling.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-of-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-sibling.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-of-sibling.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-when-ancestor-changes-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-when-ancestor-changes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-when-ancestor-changes-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-when-ancestor-changes-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-when-ancestor-changes.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-when-ancestor-changes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-when-ancestor-changes.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-when-ancestor-changes.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-when-sibling-changes-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-when-sibling-changes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-when-sibling-changes-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-when-sibling-changes-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-when-sibling-changes.html b/tests/wpt/tests/css/selectors/invalidation/nth-child-when-sibling-changes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-when-sibling-changes.html rename to tests/wpt/tests/css/selectors/invalidation/nth-child-when-sibling-changes.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-containing-ancestor.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-containing-ancestor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-containing-ancestor.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-containing-ancestor.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-in-shadow-root-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-in-shadow-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-in-shadow-root-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-in-shadow-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-in-shadow-root.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-in-shadow-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-in-shadow-root.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-in-shadow-root.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-attr-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-attr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-attr-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-attr-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-attr.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-attr.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-attr.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-attr.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-class-prefix.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-class-prefix.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-class-prefix.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-class-prefix.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-class-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-class-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-class-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-class-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-class.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-class.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-class.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-class.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-has-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-has-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-has-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-has-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-has.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-has.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-id-prefix.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-id-prefix.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-id-prefix.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-id-prefix.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-ids.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-ids.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-ids.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-ids.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-in-ancestor-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-in-ancestor-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-in-ancestor-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-in-ancestor-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-in-ancestor.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-in-ancestor.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-in-ancestor.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-in-ancestor.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-in-is.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-in-is.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-in-is.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-in-is.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-in-shadow-root-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-in-shadow-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-in-shadow-root-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-in-shadow-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-in-shadow-root.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-in-shadow-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-in-shadow-root.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-in-shadow-root.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-is.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-is.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-is.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-is.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-pseudo-class-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-pseudo-class-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-pseudo-class-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-pseudo-class-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-pseudo-class.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-pseudo-class.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-pseudo-class.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-pseudo-class.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-sibling-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-sibling-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-sibling-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-sibling-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-sibling.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-of-sibling.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-of-sibling.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-when-ancestor-changes-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-when-ancestor-changes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-when-ancestor-changes-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-when-ancestor-changes-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-when-ancestor-changes.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-when-ancestor-changes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-when-ancestor-changes.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-when-ancestor-changes.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-when-sibling-changes-ref.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-when-sibling-changes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-when-sibling-changes-ref.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-when-sibling-changes-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-when-sibling-changes.html b/tests/wpt/tests/css/selectors/invalidation/nth-last-child-when-sibling-changes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/nth-last-child-when-sibling-changes.html rename to tests/wpt/tests/css/selectors/invalidation/nth-last-child-when-sibling-changes.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/quirks-mode-stylesheet-dynamic-add-001.html b/tests/wpt/tests/css/selectors/invalidation/quirks-mode-stylesheet-dynamic-add-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/quirks-mode-stylesheet-dynamic-add-001.html rename to tests/wpt/tests/css/selectors/invalidation/quirks-mode-stylesheet-dynamic-add-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/selectorText-dynamic-001.html b/tests/wpt/tests/css/selectors/invalidation/selectorText-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/selectorText-dynamic-001.html rename to tests/wpt/tests/css/selectors/invalidation/selectorText-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/sheet-going-away-001.html b/tests/wpt/tests/css/selectors/invalidation/sheet-going-away-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/sheet-going-away-001.html rename to tests/wpt/tests/css/selectors/invalidation/sheet-going-away-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/sheet-going-away-002-ref.html b/tests/wpt/tests/css/selectors/invalidation/sheet-going-away-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/sheet-going-away-002-ref.html rename to tests/wpt/tests/css/selectors/invalidation/sheet-going-away-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/sheet-going-away-002.html b/tests/wpt/tests/css/selectors/invalidation/sheet-going-away-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/sheet-going-away-002.html rename to tests/wpt/tests/css/selectors/invalidation/sheet-going-away-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/sibling.html b/tests/wpt/tests/css/selectors/invalidation/sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/sibling.html rename to tests/wpt/tests/css/selectors/invalidation/sibling.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/subject-has-invalidation-with-display-none-anchor-element.html b/tests/wpt/tests/css/selectors/invalidation/subject-has-invalidation-with-display-none-anchor-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/subject-has-invalidation-with-display-none-anchor-element.html rename to tests/wpt/tests/css/selectors/invalidation/subject-has-invalidation-with-display-none-anchor-element.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/target-pseudo-in-has.html b/tests/wpt/tests/css/selectors/invalidation/target-pseudo-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/target-pseudo-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/target-pseudo-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/typed-child-indexed-pseudo-classes-in-has.html b/tests/wpt/tests/css/selectors/invalidation/typed-child-indexed-pseudo-classes-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/typed-child-indexed-pseudo-classes-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/typed-child-indexed-pseudo-classes-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/user-action-pseudo-classes-in-has.html b/tests/wpt/tests/css/selectors/invalidation/user-action-pseudo-classes-in-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/user-action-pseudo-classes-in-has.html rename to tests/wpt/tests/css/selectors/invalidation/user-action-pseudo-classes-in-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/where.html b/tests/wpt/tests/css/selectors/invalidation/where.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/invalidation/where.html rename to tests/wpt/tests/css/selectors/invalidation/where.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-default-ns-001.html b/tests/wpt/tests/css/selectors/is-default-ns-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-default-ns-001.html rename to tests/wpt/tests/css/selectors/is-default-ns-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-default-ns-002.html b/tests/wpt/tests/css/selectors/is-default-ns-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-default-ns-002.html rename to tests/wpt/tests/css/selectors/is-default-ns-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-default-ns-003.html b/tests/wpt/tests/css/selectors/is-default-ns-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-default-ns-003.html rename to tests/wpt/tests/css/selectors/is-default-ns-003.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-nested.html b/tests/wpt/tests/css/selectors/is-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-nested.html rename to tests/wpt/tests/css/selectors/is-nested.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-specificity-shadow.html b/tests/wpt/tests/css/selectors/is-specificity-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-specificity-shadow.html rename to tests/wpt/tests/css/selectors/is-specificity-shadow.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-specificity.html b/tests/wpt/tests/css/selectors/is-specificity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-specificity.html rename to tests/wpt/tests/css/selectors/is-specificity.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-where-basic.html b/tests/wpt/tests/css/selectors/is-where-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-where-basic.html rename to tests/wpt/tests/css/selectors/is-where-basic.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-where-error-recovery.html b/tests/wpt/tests/css/selectors/is-where-error-recovery.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-where-error-recovery.html rename to tests/wpt/tests/css/selectors/is-where-error-recovery.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-where-not.html b/tests/wpt/tests/css/selectors/is-where-not.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-where-not.html rename to tests/wpt/tests/css/selectors/is-where-not.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-where-parsing.html b/tests/wpt/tests/css/selectors/is-where-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-where-parsing.html rename to tests/wpt/tests/css/selectors/is-where-parsing.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-where-pseudo-classes.html b/tests/wpt/tests/css/selectors/is-where-pseudo-classes.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-where-pseudo-classes.html rename to tests/wpt/tests/css/selectors/is-where-pseudo-classes.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-where-pseudo-elements-ref.html b/tests/wpt/tests/css/selectors/is-where-pseudo-elements-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-where-pseudo-elements-ref.html rename to tests/wpt/tests/css/selectors/is-where-pseudo-elements-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-where-pseudo-elements.html b/tests/wpt/tests/css/selectors/is-where-pseudo-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-where-pseudo-elements.html rename to tests/wpt/tests/css/selectors/is-where-pseudo-elements.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-where-shadow.html b/tests/wpt/tests/css/selectors/is-where-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-where-shadow.html rename to tests/wpt/tests/css/selectors/is-where-shadow.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-where-visited-ref.html b/tests/wpt/tests/css/selectors/is-where-visited-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-where-visited-ref.html rename to tests/wpt/tests/css/selectors/is-where-visited-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/is-where-visited.html b/tests/wpt/tests/css/selectors/is-where-visited.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/is-where-visited.html rename to tests/wpt/tests/css/selectors/is-where-visited.html diff --git a/tests/wpt/web-platform-tests/css/selectors/last-child.html b/tests/wpt/tests/css/selectors/last-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/last-child.html rename to tests/wpt/tests/css/selectors/last-child.html diff --git a/tests/wpt/web-platform-tests/css/selectors/last-of-type.html b/tests/wpt/tests/css/selectors/last-of-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/last-of-type.html rename to tests/wpt/tests/css/selectors/last-of-type.html diff --git a/tests/wpt/web-platform-tests/css/selectors/media/media-loading-state.html b/tests/wpt/tests/css/selectors/media/media-loading-state.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/media/media-loading-state.html rename to tests/wpt/tests/css/selectors/media/media-loading-state.html diff --git a/tests/wpt/web-platform-tests/css/selectors/media/media-playback-state.html b/tests/wpt/tests/css/selectors/media/media-playback-state.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/media/media-playback-state.html rename to tests/wpt/tests/css/selectors/media/media-playback-state.html diff --git a/tests/wpt/web-platform-tests/css/selectors/media/sound-state.html b/tests/wpt/tests/css/selectors/media/sound-state.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/media/sound-state.html rename to tests/wpt/tests/css/selectors/media/sound-state.html diff --git a/tests/wpt/web-platform-tests/css/selectors/missing-right-token.html b/tests/wpt/tests/css/selectors/missing-right-token.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/missing-right-token.html rename to tests/wpt/tests/css/selectors/missing-right-token.html diff --git a/tests/wpt/web-platform-tests/css/selectors/modal-pseudo-class.html b/tests/wpt/tests/css/selectors/modal-pseudo-class.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/modal-pseudo-class.html rename to tests/wpt/tests/css/selectors/modal-pseudo-class.html diff --git a/tests/wpt/web-platform-tests/css/selectors/not-complex.html b/tests/wpt/tests/css/selectors/not-complex.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/not-complex.html rename to tests/wpt/tests/css/selectors/not-complex.html diff --git a/tests/wpt/web-platform-tests/css/selectors/not-default-ns-001.html b/tests/wpt/tests/css/selectors/not-default-ns-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/not-default-ns-001.html rename to tests/wpt/tests/css/selectors/not-default-ns-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/not-default-ns-002.html b/tests/wpt/tests/css/selectors/not-default-ns-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/not-default-ns-002.html rename to tests/wpt/tests/css/selectors/not-default-ns-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/not-default-ns-003.html b/tests/wpt/tests/css/selectors/not-default-ns-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/not-default-ns-003.html rename to tests/wpt/tests/css/selectors/not-default-ns-003.html diff --git a/tests/wpt/web-platform-tests/css/selectors/not-links-ref.html b/tests/wpt/tests/css/selectors/not-links-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/not-links-ref.html rename to tests/wpt/tests/css/selectors/not-links-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/not-links.html b/tests/wpt/tests/css/selectors/not-links.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/not-links.html rename to tests/wpt/tests/css/selectors/not-links.html diff --git a/tests/wpt/web-platform-tests/css/selectors/not-specificity.html b/tests/wpt/tests/css/selectors/not-specificity.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/not-specificity.html rename to tests/wpt/tests/css/selectors/not-specificity.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-and-nth-last-child-ref.html b/tests/wpt/tests/css/selectors/nth-child-and-nth-last-child-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-and-nth-last-child-ref.html rename to tests/wpt/tests/css/selectors/nth-child-and-nth-last-child-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-and-nth-last-child.html b/tests/wpt/tests/css/selectors/nth-child-and-nth-last-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-and-nth-last-child.html rename to tests/wpt/tests/css/selectors/nth-child-and-nth-last-child.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-attribute.html b/tests/wpt/tests/css/selectors/nth-child-of-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-attribute.html rename to tests/wpt/tests/css/selectors/nth-child-of-attribute.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-classname-002.html b/tests/wpt/tests/css/selectors/nth-child-of-classname-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-classname-002.html rename to tests/wpt/tests/css/selectors/nth-child-of-classname-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-classname-ref.html b/tests/wpt/tests/css/selectors/nth-child-of-classname-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-classname-ref.html rename to tests/wpt/tests/css/selectors/nth-child-of-classname-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-classname.html b/tests/wpt/tests/css/selectors/nth-child-of-classname.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-classname.html rename to tests/wpt/tests/css/selectors/nth-child-of-classname.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-complex-selector-many-children-2-ref.html b/tests/wpt/tests/css/selectors/nth-child-of-complex-selector-many-children-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-complex-selector-many-children-2-ref.html rename to tests/wpt/tests/css/selectors/nth-child-of-complex-selector-many-children-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-complex-selector-many-children-2.html b/tests/wpt/tests/css/selectors/nth-child-of-complex-selector-many-children-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-complex-selector-many-children-2.html rename to tests/wpt/tests/css/selectors/nth-child-of-complex-selector-many-children-2.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-complex-selector-many-children-ref.html b/tests/wpt/tests/css/selectors/nth-child-of-complex-selector-many-children-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-complex-selector-many-children-ref.html rename to tests/wpt/tests/css/selectors/nth-child-of-complex-selector-many-children-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-complex-selector-many-children.html b/tests/wpt/tests/css/selectors/nth-child-of-complex-selector-many-children.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-complex-selector-many-children.html rename to tests/wpt/tests/css/selectors/nth-child-of-complex-selector-many-children.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-complex-selector-ref.html b/tests/wpt/tests/css/selectors/nth-child-of-complex-selector-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-complex-selector-ref.html rename to tests/wpt/tests/css/selectors/nth-child-of-complex-selector-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-complex-selector.html b/tests/wpt/tests/css/selectors/nth-child-of-complex-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-complex-selector.html rename to tests/wpt/tests/css/selectors/nth-child-of-complex-selector.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-compound-selector-ref.html b/tests/wpt/tests/css/selectors/nth-child-of-compound-selector-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-compound-selector-ref.html rename to tests/wpt/tests/css/selectors/nth-child-of-compound-selector-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-compound-selector.html b/tests/wpt/tests/css/selectors/nth-child-of-compound-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-compound-selector.html rename to tests/wpt/tests/css/selectors/nth-child-of-compound-selector.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-has.html b/tests/wpt/tests/css/selectors/nth-child-of-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-has.html rename to tests/wpt/tests/css/selectors/nth-child-of-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-nesting-ref.html b/tests/wpt/tests/css/selectors/nth-child-of-nesting-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-nesting-ref.html rename to tests/wpt/tests/css/selectors/nth-child-of-nesting-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-nesting.html b/tests/wpt/tests/css/selectors/nth-child-of-nesting.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-nesting.html rename to tests/wpt/tests/css/selectors/nth-child-of-nesting.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-no-space-after-of-ref.html b/tests/wpt/tests/css/selectors/nth-child-of-no-space-after-of-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-no-space-after-of-ref.html rename to tests/wpt/tests/css/selectors/nth-child-of-no-space-after-of-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-no-space-after-of.html b/tests/wpt/tests/css/selectors/nth-child-of-no-space-after-of.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-no-space-after-of.html rename to tests/wpt/tests/css/selectors/nth-child-of-no-space-after-of.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-not.html b/tests/wpt/tests/css/selectors/nth-child-of-not.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-not.html rename to tests/wpt/tests/css/selectors/nth-child-of-not.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-nth-child.html b/tests/wpt/tests/css/selectors/nth-child-of-nth-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-nth-child.html rename to tests/wpt/tests/css/selectors/nth-child-of-nth-child.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-pseudo-ref.html b/tests/wpt/tests/css/selectors/nth-child-of-pseudo-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-pseudo-ref.html rename to tests/wpt/tests/css/selectors/nth-child-of-pseudo-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-pseudo.html b/tests/wpt/tests/css/selectors/nth-child-of-pseudo.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-pseudo.html rename to tests/wpt/tests/css/selectors/nth-child-of-pseudo.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-tagname-ref.html b/tests/wpt/tests/css/selectors/nth-child-of-tagname-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-tagname-ref.html rename to tests/wpt/tests/css/selectors/nth-child-of-tagname-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-tagname.html b/tests/wpt/tests/css/selectors/nth-child-of-tagname.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-tagname.html rename to tests/wpt/tests/css/selectors/nth-child-of-tagname.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-of-universal-selector.html b/tests/wpt/tests/css/selectors/nth-child-of-universal-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-of-universal-selector.html rename to tests/wpt/tests/css/selectors/nth-child-of-universal-selector.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-1-ref.html b/tests/wpt/tests/css/selectors/nth-child-specificity-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-1-ref.html rename to tests/wpt/tests/css/selectors/nth-child-specificity-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-1.html b/tests/wpt/tests/css/selectors/nth-child-specificity-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-1.html rename to tests/wpt/tests/css/selectors/nth-child-specificity-1.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-2-ref.html b/tests/wpt/tests/css/selectors/nth-child-specificity-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-2-ref.html rename to tests/wpt/tests/css/selectors/nth-child-specificity-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-2.html b/tests/wpt/tests/css/selectors/nth-child-specificity-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-2.html rename to tests/wpt/tests/css/selectors/nth-child-specificity-2.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-3-ref.html b/tests/wpt/tests/css/selectors/nth-child-specificity-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-3-ref.html rename to tests/wpt/tests/css/selectors/nth-child-specificity-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-3.html b/tests/wpt/tests/css/selectors/nth-child-specificity-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-3.html rename to tests/wpt/tests/css/selectors/nth-child-specificity-3.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-4-ref.html b/tests/wpt/tests/css/selectors/nth-child-specificity-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-4-ref.html rename to tests/wpt/tests/css/selectors/nth-child-specificity-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-4.html b/tests/wpt/tests/css/selectors/nth-child-specificity-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-child-specificity-4.html rename to tests/wpt/tests/css/selectors/nth-child-specificity-4.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-classname-ref.html b/tests/wpt/tests/css/selectors/nth-last-child-of-classname-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-classname-ref.html rename to tests/wpt/tests/css/selectors/nth-last-child-of-classname-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-classname.html b/tests/wpt/tests/css/selectors/nth-last-child-of-classname.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-classname.html rename to tests/wpt/tests/css/selectors/nth-last-child-of-classname.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-complex-selector-ref.html b/tests/wpt/tests/css/selectors/nth-last-child-of-complex-selector-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-complex-selector-ref.html rename to tests/wpt/tests/css/selectors/nth-last-child-of-complex-selector-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-complex-selector.html b/tests/wpt/tests/css/selectors/nth-last-child-of-complex-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-complex-selector.html rename to tests/wpt/tests/css/selectors/nth-last-child-of-complex-selector.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-compound-selector-ref.html b/tests/wpt/tests/css/selectors/nth-last-child-of-compound-selector-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-compound-selector-ref.html rename to tests/wpt/tests/css/selectors/nth-last-child-of-compound-selector-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-compound-selector.html b/tests/wpt/tests/css/selectors/nth-last-child-of-compound-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-compound-selector.html rename to tests/wpt/tests/css/selectors/nth-last-child-of-compound-selector.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-nesting.html b/tests/wpt/tests/css/selectors/nth-last-child-of-nesting.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-nesting.html rename to tests/wpt/tests/css/selectors/nth-last-child-of-nesting.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-no-space-after-of.html b/tests/wpt/tests/css/selectors/nth-last-child-of-no-space-after-of.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-no-space-after-of.html rename to tests/wpt/tests/css/selectors/nth-last-child-of-no-space-after-of.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-style-sharing-1-ref.html b/tests/wpt/tests/css/selectors/nth-last-child-of-style-sharing-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-style-sharing-1-ref.html rename to tests/wpt/tests/css/selectors/nth-last-child-of-style-sharing-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-style-sharing-1.html b/tests/wpt/tests/css/selectors/nth-last-child-of-style-sharing-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-style-sharing-1.html rename to tests/wpt/tests/css/selectors/nth-last-child-of-style-sharing-1.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-style-sharing-2-ref.html b/tests/wpt/tests/css/selectors/nth-last-child-of-style-sharing-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-style-sharing-2-ref.html rename to tests/wpt/tests/css/selectors/nth-last-child-of-style-sharing-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-style-sharing-2.html b/tests/wpt/tests/css/selectors/nth-last-child-of-style-sharing-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-style-sharing-2.html rename to tests/wpt/tests/css/selectors/nth-last-child-of-style-sharing-2.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-tagname-ref.html b/tests/wpt/tests/css/selectors/nth-last-child-of-tagname-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-tagname-ref.html rename to tests/wpt/tests/css/selectors/nth-last-child-of-tagname-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-tagname.html b/tests/wpt/tests/css/selectors/nth-last-child-of-tagname.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-of-tagname.html rename to tests/wpt/tests/css/selectors/nth-last-child-of-tagname.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-1-ref.html b/tests/wpt/tests/css/selectors/nth-last-child-specificity-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-1-ref.html rename to tests/wpt/tests/css/selectors/nth-last-child-specificity-1-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-1.html b/tests/wpt/tests/css/selectors/nth-last-child-specificity-1.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-1.html rename to tests/wpt/tests/css/selectors/nth-last-child-specificity-1.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-2-ref.html b/tests/wpt/tests/css/selectors/nth-last-child-specificity-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-2-ref.html rename to tests/wpt/tests/css/selectors/nth-last-child-specificity-2-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-2.html b/tests/wpt/tests/css/selectors/nth-last-child-specificity-2.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-2.html rename to tests/wpt/tests/css/selectors/nth-last-child-specificity-2.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-3-ref.html b/tests/wpt/tests/css/selectors/nth-last-child-specificity-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-3-ref.html rename to tests/wpt/tests/css/selectors/nth-last-child-specificity-3-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-3.html b/tests/wpt/tests/css/selectors/nth-last-child-specificity-3.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-3.html rename to tests/wpt/tests/css/selectors/nth-last-child-specificity-3.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-4-ref.html b/tests/wpt/tests/css/selectors/nth-last-child-specificity-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-4-ref.html rename to tests/wpt/tests/css/selectors/nth-last-child-specificity-4-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-4.html b/tests/wpt/tests/css/selectors/nth-last-child-specificity-4.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-last-child-specificity-4.html rename to tests/wpt/tests/css/selectors/nth-last-child-specificity-4.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-of-invalid.html b/tests/wpt/tests/css/selectors/nth-of-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-of-invalid.html rename to tests/wpt/tests/css/selectors/nth-of-invalid.html diff --git a/tests/wpt/web-platform-tests/css/selectors/nth-of-type-namespace.html b/tests/wpt/tests/css/selectors/nth-of-type-namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/nth-of-type-namespace.html rename to tests/wpt/tests/css/selectors/nth-of-type-namespace.html diff --git a/tests/wpt/web-platform-tests/css/selectors/of-type-selectors-ref.xhtml b/tests/wpt/tests/css/selectors/of-type-selectors-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/of-type-selectors-ref.xhtml rename to tests/wpt/tests/css/selectors/of-type-selectors-ref.xhtml diff --git a/tests/wpt/web-platform-tests/css/selectors/of-type-selectors.xhtml b/tests/wpt/tests/css/selectors/of-type-selectors.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/of-type-selectors.xhtml rename to tests/wpt/tests/css/selectors/of-type-selectors.xhtml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-1.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-1.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-1.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-1.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-10.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-10.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-10.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-10.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-100.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-100.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-100.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-100.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-100b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-100b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-100b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-100b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-101.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-101.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-101.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-101.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-101b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-101b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-101b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-101b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-102.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-102.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-102.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-102.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-102b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-102b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-102b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-102b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-103.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-103.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-103.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-103.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-103b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-103b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-103b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-103b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-104.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-104.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-104.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-104.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-104b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-104b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-104b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-104b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-105.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-105.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-105.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-105.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-105b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-105b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-105b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-105b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-106.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-106.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-106.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-106.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-106b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-106b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-106b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-106b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-107.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-107.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-107.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-107.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-107b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-107b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-107b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-107b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-108.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-108.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-108.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-108.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-108b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-108b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-108b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-108b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-109.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-109.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-109.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-109.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-109b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-109b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-109b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-109b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-11.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-11.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-11.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-11.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-110.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-110.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-110.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-110.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-110b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-110b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-110b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-110b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-111.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-111.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-111.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-111.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-111b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-111b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-111b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-111b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-112.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-112.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-112.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-112.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-112b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-112b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-112b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-112b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-113.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-113.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-113.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-113.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-113b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-113b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-113b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-113b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-114.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-114.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-114.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-114.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-114b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-114b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-114b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-114b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-115.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-115.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-115.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-115.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-115b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-115b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-115b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-115b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-116.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-116.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-116.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-116.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-116b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-116b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-116b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-116b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-117.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-117.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-117.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-117.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-117b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-117b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-117b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-117b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-118.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-118.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-118.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-118.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-119.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-119.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-119.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-119.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-120.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-120.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-120.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-120.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-121.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-121.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-121.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-121.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-122.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-122.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-122.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-122.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-123.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-123.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-123.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-123.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-123b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-123b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-123b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-123b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-124.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-124.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-124.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-124.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-124b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-124b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-124b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-124b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-125.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-125.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-125.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-125.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-125b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-125b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-125b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-125b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-126.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-126.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-126.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-126.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-126b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-126b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-126b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-126b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-127.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-127.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-127.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-127.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-127b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-127b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-127b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-127b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-128.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-128.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-128.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-128.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-128b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-128b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-128b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-128b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-129.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-129.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-129.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-129.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-129b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-129b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-129b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-129b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-13.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-13.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-13.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-13.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-130.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-130.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-130.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-130.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-130b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-130b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-130b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-130b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-131.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-131.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-131.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-131.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-131b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-131b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-131b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-131b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-132.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-132.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-132.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-132.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-132b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-132b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-132b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-132b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-133.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-133.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-133.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-133.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-133b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-133b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-133b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-133b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-134.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-134.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-134.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-134.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-134b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-134b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-134b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-134b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-135.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-135.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-135.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-135.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-135b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-135b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-135b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-135b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-136.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-136.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-136.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-136.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-136b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-136b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-136b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-136b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-137.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-137.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-137.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-137.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-137b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-137b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-137b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-137b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-138.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-138.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-138.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-138.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-138b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-138b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-138b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-138b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-139.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-139.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-139.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-139.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-139b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-139b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-139b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-139b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-14.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-14.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-14.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-14.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-140.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-140.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-140.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-140.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-140b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-140b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-140b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-140b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-141.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-141.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-141.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-141.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-141b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-141b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-141b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-141b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-142.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-142.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-142.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-142.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-142b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-142b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-142b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-142b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-143.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-143.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-143.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-143.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-143b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-143b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-143b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-143b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-144.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-144.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-144.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-144.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-145a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-145a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-145a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-145a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-145b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-145b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-145b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-145b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-146a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-146a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-146a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-146a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-146b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-146b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-146b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-146b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-147a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-147a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-147a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-147a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-147b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-147b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-147b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-147b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-148.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-148.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-148.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-148.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-149.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-149.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-149.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-149.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-149b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-149b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-149b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-149b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-14b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-14b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-14b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-14b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-14c.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-14c.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-14c.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-14c.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-14d.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-14d.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-14d.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-14d.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-14e.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-14e.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-14e.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-14e.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-15.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-15.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-15.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-15.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-150.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-150.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-150.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-150.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-151.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-151.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-151.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-151.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-152.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-152.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-152.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-152.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-153.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-153.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-153.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-153.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-154.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-154.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-154.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-154.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-155.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-155.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-155.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-155.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-155a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-155a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-155a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-155a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-155b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-155b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-155b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-155b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-155c.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-155c.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-155c.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-155c.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-155d.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-155d.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-155d.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-155d.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-156.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-156.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-156.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-156.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-156b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-156b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-156b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-156b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-156c.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-156c.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-156c.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-156c.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-157.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-157.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-157.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-157.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-158.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-158.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-158.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-158.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-159.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-159.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-159.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-159.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-15b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-15b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-15b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-15b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-16.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-16.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-16.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-16.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-160.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-160.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-160.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-160.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-161.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-161.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-161.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-161.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-166.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-166.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-166.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-166.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-166a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-166a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-166a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-166a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-167.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-167.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-167.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-167.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-167a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-167a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-167a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-167a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-168.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-168.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-168.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-168.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-168a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-168a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-168a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-168a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-169.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-169.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-169.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-169.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-169a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-169a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-169a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-169a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-17.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-17.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-17.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-17.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-170.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-170.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-170.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-170.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-170a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-170a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-170a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-170a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-170b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-170b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-170b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-170b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-170c.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-170c.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-170c.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-170c.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-170d.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-170d.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-170d.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-170d.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-171.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-171.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-171.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-171.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-172a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-172a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-172a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-172a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-172b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-172b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-172b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-172b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-173a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-173a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-173a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-173a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-173b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-173b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-173b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-173b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-174a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-174a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-174a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-174a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-174b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-174b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-174b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-174b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-175a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-175a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-175a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-175a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-175b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-175b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-175b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-175b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-175c.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-175c.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-175c.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-175c.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-176.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-176.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-176.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-176.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-177a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-177a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-177a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-177a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-177b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-177b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-177b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-177b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-178.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-178.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-178.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-178.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-179.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-179.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-179.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-179.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-179a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-179a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-179a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-179a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-18.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-18.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-18.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-18.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-180a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-180a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-180a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-180a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-181.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-181.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-181.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-181.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-182.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-182.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-182.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-182.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-183.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-183.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-183.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-183.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-184-ref.xht b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-184-ref.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-184-ref.xht rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-184-ref.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-184a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-184a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-184a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-184a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-184b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-184b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-184b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-184b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-184c.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-184c.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-184c.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-184c.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-184d.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-184d.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-184d.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-184d.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-184e.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-184e.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-184e.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-184e.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-184f.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-184f.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-184f.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-184f.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-18a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-18a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-18a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-18a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-18b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-18b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-18b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-18b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-18c.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-18c.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-18c.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-18c.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-19.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-19.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-19.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-19.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-19b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-19b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-19b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-19b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-2.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-2.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-2.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-2.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-20.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-20.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-20.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-20.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-21.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-21.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-21.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-21.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-21b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-21b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-21b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-21b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-21c.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-21c.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-21c.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-21c.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-22.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-22.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-22.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-22.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-25.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-25.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-25.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-25.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-27.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-27.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-27.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-27.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-27a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-27a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-27a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-27a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-27b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-27b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-27b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-27b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-28.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-28.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-28.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-28.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-28b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-28b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-28b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-28b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-29.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-29.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-29.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-29.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-29b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-29b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-29b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-29b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-3.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-3.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-3.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-3.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-30.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-30.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-30.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-30.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-31.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-31.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-31.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-31.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-32.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-32.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-32.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-32.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-33.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-33.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-33.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-33.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-34.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-34.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-34.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-34.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-35.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-35.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-35.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-35.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-36.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-36.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-36.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-36.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-37.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-37.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-37.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-37.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-38.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-38.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-38.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-38.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-39.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-39.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-39.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-39.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-39a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-39a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-39a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-39a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-39b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-39b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-39b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-39b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-39c.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-39c.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-39c.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-39c.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-3a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-3a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-3a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-3a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-4.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-4.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-4.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-4.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-41.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-41.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-41.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-41.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-41a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-41a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-41a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-41a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-42.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-42.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-42.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-42.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-42a.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-42a.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-42a.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-42a.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-43.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-43.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-43.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-43.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-43b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-43b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-43b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-43b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-44.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-44.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-44.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-44.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-44b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-44b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-44b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-44b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-44c.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-44c.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-44c.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-44c.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-44d.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-44d.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-44d.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-44d.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-45.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-45.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-45.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-45.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-45b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-45b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-45b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-45b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-45c.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-45c.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-45c.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-45c.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-46.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-46.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-46.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-46.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-46b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-46b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-46b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-46b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-47.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-47.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-47.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-47.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-48.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-48.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-48.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-48.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-49.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-49.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-49.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-49.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-5.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-5.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-5.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-5.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-50.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-50.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-50.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-50.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-51.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-51.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-51.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-51.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-52.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-52.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-52.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-52.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-53.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-53.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-53.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-53.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-54.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-54.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-54.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-54.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-55.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-55.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-55.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-55.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-56.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-56.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-56.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-56.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-57.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-57.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-57.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-57.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-57b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-57b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-57b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-57b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-59.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-59.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-59.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-59.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-6.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-6.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-6.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-6.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-60.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-60.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-60.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-60.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-61.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-61.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-61.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-61.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-62.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-62.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-62.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-62.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-63.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-63.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-63.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-63.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-64.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-64.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-64.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-64.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-65.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-65.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-65.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-65.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-66.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-66.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-66.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-66.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-66b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-66b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-66b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-66b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-67.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-67.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-67.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-67.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-7.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-7.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-7.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-7.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-70.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-70.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-70.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-70.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-72.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-72.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-72.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-72.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-72b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-72b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-72b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-72b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-73.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-73.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-73.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-73.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-73b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-73b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-73b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-73b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-74.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-74.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-74.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-74.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-74b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-74b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-74b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-74b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-75.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-75.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-75.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-75.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-75b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-75b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-75b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-75b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-76.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-76.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-76.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-76.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-76b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-76b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-76b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-76b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-77.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-77.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-77.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-77.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-77b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-77b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-77b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-77b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-78.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-78.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-78.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-78.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-78b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-78b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-78b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-78b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-79.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-79.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-79.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-79.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-7b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-7b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-7b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-7b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-8.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-8.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-8.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-8.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-80.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-80.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-80.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-80.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-81.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-81.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-81.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-81.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-81b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-81b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-81b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-81b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-82.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-82.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-82.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-82.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-82b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-82b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-82b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-82b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-83-ref.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-83-ref.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-83-ref.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-83-ref.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-83.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-83.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-83.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-83.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-86.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-86.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-86.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-86.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-87.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-87.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-87.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-87.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-87b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-87b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-87b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-87b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-88.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-88.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-88.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-88.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-88b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-88b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-88b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-88b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-89.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-89.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-89.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-89.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-9.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-9.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-9.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-9.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-90.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-90.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-90.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-90.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-90b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-90b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-90b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-90b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-91.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-91.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-91.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-91.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-92.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-92.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-92.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-92.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-93.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-93.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-93.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-93.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-94.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-94.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-94.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-94.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-94b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-94b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-94b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-94b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-95.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-95.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-95.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-95.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-96.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-96.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-96.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-96.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-96b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-96b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-96b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-96b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-97.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-97.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-97.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-97.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-97b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-97b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-97b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-97b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-98.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-98.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-98.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-98.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-98b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-98b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-98b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-98b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-99.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-99.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-99.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-99.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-99b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-99b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-99b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-99b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-d1.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-d1.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-d1.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-d1.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-d1b.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-d1b.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-d1b.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-d1b.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-d2.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-d2.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-d2.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-d2.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-d3.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-d3.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-d3.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-d3.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-d4.xml b/tests/wpt/tests/css/selectors/old-tests/css3-modsel-d4.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/css3-modsel-d4.xml rename to tests/wpt/tests/css/selectors/old-tests/css3-modsel-d4.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/bq-u-u-u-green.xht b/tests/wpt/tests/css/selectors/old-tests/reference/bq-u-u-u-green.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/bq-u-u-u-green.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/bq-u-u-u-green.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-g-g-u.xht b/tests/wpt/tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-g-g-u.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-g-g-u.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-g-g-u.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-g-u-u.xht b/tests/wpt/tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-g-u-u.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-g-u-u.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-g-u-u.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-g-u.xht b/tests/wpt/tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-g-u.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-g-u.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-g-u.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-u-g-g.xht b/tests/wpt/tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-u-g-g.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-u-g-g.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/lime-bg-paras-g-u-u-g-g.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/lime-bg-paras-u-g-g-u-u-g.xht b/tests/wpt/tests/css/selectors/old-tests/reference/lime-bg-paras-u-g-g-u-u-g.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/lime-bg-paras-u-g-g-u-u-g.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/lime-bg-paras-u-g-g-u-u-g.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/lime-bg-paras-u-g-u-g-g.xht b/tests/wpt/tests/css/selectors/old-tests/reference/lime-bg-paras-u-g-u-g-g.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/lime-bg-paras-u-g-u-g-g.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/lime-bg-paras-u-g-u-g-g.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/seven-green-divs.xht b/tests/wpt/tests/css/selectors/old-tests/reference/seven-green-divs.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/seven-green-divs.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/seven-green-divs.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/this-address-p-p-p-lime-background.xht b/tests/wpt/tests/css/selectors/old-tests/reference/this-address-p-p-p-lime-background.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/this-address-p-p-p-lime-background.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/this-address-p-p-p-lime-background.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/this-line-green-background.xht b/tests/wpt/tests/css/selectors/old-tests/reference/this-line-green-background.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/this-line-green-background.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/this-line-green-background.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/this-line-green-color.xht b/tests/wpt/tests/css/selectors/old-tests/reference/this-line-green-color.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/this-line-green-color.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/this-line-green-color.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/this-line-lime-background-offset.xht b/tests/wpt/tests/css/selectors/old-tests/reference/this-line-lime-background-offset.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/this-line-lime-background-offset.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/this-line-lime-background-offset.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/this-line-lime-background.xht b/tests/wpt/tests/css/selectors/old-tests/reference/this-line-lime-background.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/this-line-lime-background.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/this-line-lime-background.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/this-test-has-passed-desc.xht b/tests/wpt/tests/css/selectors/old-tests/reference/this-test-has-passed-desc.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/this-test-has-passed-desc.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/this-test-has-passed-desc.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/three-p-lime-background-except-middle.xht b/tests/wpt/tests/css/selectors/old-tests/reference/three-p-lime-background-except-middle.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/three-p-lime-background-except-middle.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/three-p-lime-background-except-middle.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/old-tests/reference/three-paragraph-lime-characters.xht b/tests/wpt/tests/css/selectors/old-tests/reference/three-paragraph-lime-characters.xht similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/old-tests/reference/three-paragraph-lime-characters.xht rename to tests/wpt/tests/css/selectors/old-tests/reference/three-paragraph-lime-characters.xht diff --git a/tests/wpt/web-platform-tests/css/selectors/only-child.html b/tests/wpt/tests/css/selectors/only-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/only-child.html rename to tests/wpt/tests/css/selectors/only-child.html diff --git a/tests/wpt/web-platform-tests/css/selectors/only-of-type.html b/tests/wpt/tests/css/selectors/only-of-type.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/only-of-type.html rename to tests/wpt/tests/css/selectors/only-of-type.html diff --git a/tests/wpt/web-platform-tests/css/selectors/parsing/parse-attribute.html b/tests/wpt/tests/css/selectors/parsing/parse-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/parsing/parse-attribute.html rename to tests/wpt/tests/css/selectors/parsing/parse-attribute.html diff --git a/tests/wpt/web-platform-tests/css/selectors/parsing/parse-child.html b/tests/wpt/tests/css/selectors/parsing/parse-child.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/parsing/parse-child.html rename to tests/wpt/tests/css/selectors/parsing/parse-child.html diff --git a/tests/wpt/web-platform-tests/css/selectors/parsing/parse-class.html b/tests/wpt/tests/css/selectors/parsing/parse-class.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/parsing/parse-class.html rename to tests/wpt/tests/css/selectors/parsing/parse-class.html diff --git a/tests/wpt/web-platform-tests/css/selectors/parsing/parse-descendant.html b/tests/wpt/tests/css/selectors/parsing/parse-descendant.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/parsing/parse-descendant.html rename to tests/wpt/tests/css/selectors/parsing/parse-descendant.html diff --git a/tests/wpt/web-platform-tests/css/selectors/parsing/parse-focus-visible.html b/tests/wpt/tests/css/selectors/parsing/parse-focus-visible.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/parsing/parse-focus-visible.html rename to tests/wpt/tests/css/selectors/parsing/parse-focus-visible.html diff --git a/tests/wpt/web-platform-tests/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html b/tests/wpt/tests/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html rename to tests/wpt/tests/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/parsing/parse-has.html b/tests/wpt/tests/css/selectors/parsing/parse-has.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/parsing/parse-has.html rename to tests/wpt/tests/css/selectors/parsing/parse-has.html diff --git a/tests/wpt/web-platform-tests/css/selectors/parsing/parse-id.html b/tests/wpt/tests/css/selectors/parsing/parse-id.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/parsing/parse-id.html rename to tests/wpt/tests/css/selectors/parsing/parse-id.html diff --git a/tests/wpt/web-platform-tests/css/selectors/parsing/parse-is.html b/tests/wpt/tests/css/selectors/parsing/parse-is.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/parsing/parse-is.html rename to tests/wpt/tests/css/selectors/parsing/parse-is.html diff --git a/tests/wpt/web-platform-tests/css/selectors/parsing/parse-not.html b/tests/wpt/tests/css/selectors/parsing/parse-not.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/parsing/parse-not.html rename to tests/wpt/tests/css/selectors/parsing/parse-not.html diff --git a/tests/wpt/web-platform-tests/css/selectors/parsing/parse-sibling.html b/tests/wpt/tests/css/selectors/parsing/parse-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/parsing/parse-sibling.html rename to tests/wpt/tests/css/selectors/parsing/parse-sibling.html diff --git a/tests/wpt/web-platform-tests/css/selectors/parsing/parse-universal.html b/tests/wpt/tests/css/selectors/parsing/parse-universal.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/parsing/parse-universal.html rename to tests/wpt/tests/css/selectors/parsing/parse-universal.html diff --git a/tests/wpt/web-platform-tests/css/selectors/parsing/parse-where.html b/tests/wpt/tests/css/selectors/parsing/parse-where.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/parsing/parse-where.html rename to tests/wpt/tests/css/selectors/parsing/parse-where.html diff --git a/tests/wpt/web-platform-tests/css/selectors/pseudo-enabled-disabled.html b/tests/wpt/tests/css/selectors/pseudo-enabled-disabled.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/pseudo-enabled-disabled.html rename to tests/wpt/tests/css/selectors/pseudo-enabled-disabled.html diff --git a/tests/wpt/web-platform-tests/css/selectors/query/query-is.html b/tests/wpt/tests/css/selectors/query/query-is.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/query/query-is.html rename to tests/wpt/tests/css/selectors/query/query-is.html diff --git a/tests/wpt/web-platform-tests/css/selectors/query/query-where.html b/tests/wpt/tests/css/selectors/query/query-where.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/query/query-where.html rename to tests/wpt/tests/css/selectors/query/query-where.html diff --git a/tests/wpt/web-platform-tests/css/selectors/remove-hovered-element-ref.html b/tests/wpt/tests/css/selectors/remove-hovered-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/remove-hovered-element-ref.html rename to tests/wpt/tests/css/selectors/remove-hovered-element-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/remove-hovered-element.html b/tests/wpt/tests/css/selectors/remove-hovered-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/remove-hovered-element.html rename to tests/wpt/tests/css/selectors/remove-hovered-element.html diff --git a/tests/wpt/web-platform-tests/css/selectors/resources/blue15x15.png b/tests/wpt/tests/css/selectors/resources/blue15x15.png similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/resources/blue15x15.png rename to tests/wpt/tests/css/selectors/resources/blue15x15.png diff --git a/tests/wpt/web-platform-tests/css/selectors/root-siblings.html b/tests/wpt/tests/css/selectors/root-siblings.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/root-siblings.html rename to tests/wpt/tests/css/selectors/root-siblings.html diff --git a/tests/wpt/web-platform-tests/css/selectors/scope-selector.html b/tests/wpt/tests/css/selectors/scope-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/scope-selector.html rename to tests/wpt/tests/css/selectors/scope-selector.html diff --git a/tests/wpt/web-platform-tests/css/selectors/scope-without-scoping.html b/tests/wpt/tests/css/selectors/scope-without-scoping.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/scope-without-scoping.html rename to tests/wpt/tests/css/selectors/scope-without-scoping.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selection-image-001-no-selection-noref.html b/tests/wpt/tests/css/selectors/selection-image-001-no-selection-noref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selection-image-001-no-selection-noref.html rename to tests/wpt/tests/css/selectors/selection-image-001-no-selection-noref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selection-image-001-noref.html b/tests/wpt/tests/css/selectors/selection-image-001-noref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selection-image-001-noref.html rename to tests/wpt/tests/css/selectors/selection-image-001-noref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selection-image-001.html b/tests/wpt/tests/css/selectors/selection-image-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selection-image-001.html rename to tests/wpt/tests/css/selectors/selection-image-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selection-image-002.html b/tests/wpt/tests/css/selectors/selection-image-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selection-image-002.html rename to tests/wpt/tests/css/selectors/selection-image-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-placeholder-shown-emptify-placeholder.html b/tests/wpt/tests/css/selectors/selector-placeholder-shown-emptify-placeholder.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-placeholder-shown-emptify-placeholder.html rename to tests/wpt/tests/css/selectors/selector-placeholder-shown-emptify-placeholder.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-placeholder-shown-type-change-001-ref.html b/tests/wpt/tests/css/selectors/selector-placeholder-shown-type-change-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-placeholder-shown-type-change-001-ref.html rename to tests/wpt/tests/css/selectors/selector-placeholder-shown-type-change-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-placeholder-shown-type-change-001.html b/tests/wpt/tests/css/selectors/selector-placeholder-shown-type-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-placeholder-shown-type-change-001.html rename to tests/wpt/tests/css/selectors/selector-placeholder-shown-type-change-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-placeholder-shown-type-change-002-ref.html b/tests/wpt/tests/css/selectors/selector-placeholder-shown-type-change-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-placeholder-shown-type-change-002-ref.html rename to tests/wpt/tests/css/selectors/selector-placeholder-shown-type-change-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-placeholder-shown-type-change-002.html b/tests/wpt/tests/css/selectors/selector-placeholder-shown-type-change-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-placeholder-shown-type-change-002.html rename to tests/wpt/tests/css/selectors/selector-placeholder-shown-type-change-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-placeholder-shown-type-change-003-ref.html b/tests/wpt/tests/css/selectors/selector-placeholder-shown-type-change-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-placeholder-shown-type-change-003-ref.html rename to tests/wpt/tests/css/selectors/selector-placeholder-shown-type-change-003-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-placeholder-shown-type-change-003.html b/tests/wpt/tests/css/selectors/selector-placeholder-shown-type-change-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-placeholder-shown-type-change-003.html rename to tests/wpt/tests/css/selectors/selector-placeholder-shown-type-change-003.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-read-write-type-change-001-ref.html b/tests/wpt/tests/css/selectors/selector-read-write-type-change-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-read-write-type-change-001-ref.html rename to tests/wpt/tests/css/selectors/selector-read-write-type-change-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-read-write-type-change-001.html b/tests/wpt/tests/css/selectors/selector-read-write-type-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-read-write-type-change-001.html rename to tests/wpt/tests/css/selectors/selector-read-write-type-change-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-read-write-type-change-002-ref.html b/tests/wpt/tests/css/selectors/selector-read-write-type-change-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-read-write-type-change-002-ref.html rename to tests/wpt/tests/css/selectors/selector-read-write-type-change-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-read-write-type-change-002.html b/tests/wpt/tests/css/selectors/selector-read-write-type-change-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-read-write-type-change-002.html rename to tests/wpt/tests/css/selectors/selector-read-write-type-change-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-required-ref.html b/tests/wpt/tests/css/selectors/selector-required-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-required-ref.html rename to tests/wpt/tests/css/selectors/selector-required-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-required-type-change-001-ref.html b/tests/wpt/tests/css/selectors/selector-required-type-change-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-required-type-change-001-ref.html rename to tests/wpt/tests/css/selectors/selector-required-type-change-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-required-type-change-001.html b/tests/wpt/tests/css/selectors/selector-required-type-change-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-required-type-change-001.html rename to tests/wpt/tests/css/selectors/selector-required-type-change-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-required-type-change-002-ref.html b/tests/wpt/tests/css/selectors/selector-required-type-change-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-required-type-change-002-ref.html rename to tests/wpt/tests/css/selectors/selector-required-type-change-002-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-required-type-change-002.html b/tests/wpt/tests/css/selectors/selector-required-type-change-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-required-type-change-002.html rename to tests/wpt/tests/css/selectors/selector-required-type-change-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-required.html b/tests/wpt/tests/css/selectors/selector-required.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-required.html rename to tests/wpt/tests/css/selectors/selector-required.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-structural-pseudo-root-ref.html b/tests/wpt/tests/css/selectors/selector-structural-pseudo-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-structural-pseudo-root-ref.html rename to tests/wpt/tests/css/selectors/selector-structural-pseudo-root-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selector-structural-pseudo-root.html b/tests/wpt/tests/css/selectors/selector-structural-pseudo-root.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selector-structural-pseudo-root.html rename to tests/wpt/tests/css/selectors/selector-structural-pseudo-root.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-000-ref.html b/tests/wpt/tests/css/selectors/selectors-4/lang-000-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-000-ref.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-000-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-000.html b/tests/wpt/tests/css/selectors/selectors-4/lang-000.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-000.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-000.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-001.html b/tests/wpt/tests/css/selectors/selectors-4/lang-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-001.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-002.html b/tests/wpt/tests/css/selectors/selectors-4/lang-002.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-002.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-002.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-003.html b/tests/wpt/tests/css/selectors/selectors-4/lang-003.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-003.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-003.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-004.html b/tests/wpt/tests/css/selectors/selectors-4/lang-004.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-004.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-004.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-005.html b/tests/wpt/tests/css/selectors/selectors-4/lang-005.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-005.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-005.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-006.html b/tests/wpt/tests/css/selectors/selectors-4/lang-006.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-006.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-006.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-007.html b/tests/wpt/tests/css/selectors/selectors-4/lang-007.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-007.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-007.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-008.html b/tests/wpt/tests/css/selectors/selectors-4/lang-008.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-008.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-008.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-009.html b/tests/wpt/tests/css/selectors/selectors-4/lang-009.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-009.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-009.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-010.html b/tests/wpt/tests/css/selectors/selectors-4/lang-010.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-010.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-010.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-011.html b/tests/wpt/tests/css/selectors/selectors-4/lang-011.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-011.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-011.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-012.html b/tests/wpt/tests/css/selectors/selectors-4/lang-012.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-012.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-012.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-013.html b/tests/wpt/tests/css/selectors/selectors-4/lang-013.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-013.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-013.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-014.html b/tests/wpt/tests/css/selectors/selectors-4/lang-014.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-014.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-014.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-015.html b/tests/wpt/tests/css/selectors/selectors-4/lang-015.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-4/lang-015.html rename to tests/wpt/tests/css/selectors/selectors-4/lang-015.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-attr-many-ref.html b/tests/wpt/tests/css/selectors/selectors-attr-many-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-attr-many-ref.html rename to tests/wpt/tests/css/selectors/selectors-attr-many-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-attr-many.html b/tests/wpt/tests/css/selectors/selectors-attr-many.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-attr-many.html rename to tests/wpt/tests/css/selectors/selectors-attr-many.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-attr-white-space-001-ref.html b/tests/wpt/tests/css/selectors/selectors-attr-white-space-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-attr-white-space-001-ref.html rename to tests/wpt/tests/css/selectors/selectors-attr-white-space-001-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-attr-white-space-001.html b/tests/wpt/tests/css/selectors/selectors-attr-white-space-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-attr-white-space-001.html rename to tests/wpt/tests/css/selectors/selectors-attr-white-space-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-case-sensitive-001.html b/tests/wpt/tests/css/selectors/selectors-case-sensitive-001.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-case-sensitive-001.html rename to tests/wpt/tests/css/selectors/selectors-case-sensitive-001.html diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-empty-001-ref.xml b/tests/wpt/tests/css/selectors/selectors-empty-001-ref.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-empty-001-ref.xml rename to tests/wpt/tests/css/selectors/selectors-empty-001-ref.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-empty-001.xml b/tests/wpt/tests/css/selectors/selectors-empty-001.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-empty-001.xml rename to tests/wpt/tests/css/selectors/selectors-empty-001.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-namespace-001-ref.xml b/tests/wpt/tests/css/selectors/selectors-namespace-001-ref.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-namespace-001-ref.xml rename to tests/wpt/tests/css/selectors/selectors-namespace-001-ref.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/selectors-namespace-001.xml b/tests/wpt/tests/css/selectors/selectors-namespace-001.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/selectors-namespace-001.xml rename to tests/wpt/tests/css/selectors/selectors-namespace-001.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/sharing-in-svg-use-ref.html b/tests/wpt/tests/css/selectors/sharing-in-svg-use-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/sharing-in-svg-use-ref.html rename to tests/wpt/tests/css/selectors/sharing-in-svg-use-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/sharing-in-svg-use.html b/tests/wpt/tests/css/selectors/sharing-in-svg-use.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/sharing-in-svg-use.html rename to tests/wpt/tests/css/selectors/sharing-in-svg-use.html diff --git a/tests/wpt/web-platform-tests/css/selectors/spurious-brace-crash.html b/tests/wpt/tests/css/selectors/spurious-brace-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/spurious-brace-crash.html rename to tests/wpt/tests/css/selectors/spurious-brace-crash.html diff --git a/tests/wpt/web-platform-tests/css/selectors/user-invalid.html b/tests/wpt/tests/css/selectors/user-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/user-invalid.html rename to tests/wpt/tests/css/selectors/user-invalid.html diff --git a/tests/wpt/web-platform-tests/css/selectors/user-valid.html b/tests/wpt/tests/css/selectors/user-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/user-valid.html rename to tests/wpt/tests/css/selectors/user-valid.html diff --git a/tests/wpt/web-platform-tests/css/selectors/visited-inheritance-ref.html b/tests/wpt/tests/css/selectors/visited-inheritance-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/visited-inheritance-ref.html rename to tests/wpt/tests/css/selectors/visited-inheritance-ref.html diff --git a/tests/wpt/web-platform-tests/css/selectors/visited-inheritance.html b/tests/wpt/tests/css/selectors/visited-inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/visited-inheritance.html rename to tests/wpt/tests/css/selectors/visited-inheritance.html diff --git a/tests/wpt/web-platform-tests/css/selectors/visited-part-crash.html b/tests/wpt/tests/css/selectors/visited-part-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/visited-part-crash.html rename to tests/wpt/tests/css/selectors/visited-part-crash.html diff --git a/tests/wpt/web-platform-tests/css/selectors/webkit-pseudo-element.html b/tests/wpt/tests/css/selectors/webkit-pseudo-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/webkit-pseudo-element.html rename to tests/wpt/tests/css/selectors/webkit-pseudo-element.html diff --git a/tests/wpt/web-platform-tests/css/selectors/x-pseudo-element.html b/tests/wpt/tests/css/selectors/x-pseudo-element.html similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/x-pseudo-element.html rename to tests/wpt/tests/css/selectors/x-pseudo-element.html diff --git a/tests/wpt/web-platform-tests/css/selectors/xml-class-selector-ref.xml b/tests/wpt/tests/css/selectors/xml-class-selector-ref.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/xml-class-selector-ref.xml rename to tests/wpt/tests/css/selectors/xml-class-selector-ref.xml diff --git a/tests/wpt/web-platform-tests/css/selectors/xml-class-selector.xml b/tests/wpt/tests/css/selectors/xml-class-selector.xml similarity index 100% rename from tests/wpt/web-platform-tests/css/selectors/xml-class-selector.xml rename to tests/wpt/tests/css/selectors/xml-class-selector.xml diff --git a/tests/wpt/web-platform-tests/css/support/1x1-green.png b/tests/wpt/tests/css/support/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/1x1-green.png rename to tests/wpt/tests/css/support/1x1-green.png diff --git a/tests/wpt/web-platform-tests/css/support/1x1-lime.png b/tests/wpt/tests/css/support/1x1-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/1x1-lime.png rename to tests/wpt/tests/css/support/1x1-lime.png diff --git a/tests/wpt/web-platform-tests/css/support/1x1-maroon.png b/tests/wpt/tests/css/support/1x1-maroon.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/1x1-maroon.png rename to tests/wpt/tests/css/support/1x1-maroon.png diff --git a/tests/wpt/web-platform-tests/css/support/1x1-navy.png b/tests/wpt/tests/css/support/1x1-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/1x1-navy.png rename to tests/wpt/tests/css/support/1x1-navy.png diff --git a/tests/wpt/web-platform-tests/css/support/1x1-red.png b/tests/wpt/tests/css/support/1x1-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/1x1-red.png rename to tests/wpt/tests/css/support/1x1-red.png diff --git a/tests/wpt/web-platform-tests/css/support/1x1-white.png b/tests/wpt/tests/css/support/1x1-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/1x1-white.png rename to tests/wpt/tests/css/support/1x1-white.png diff --git a/tests/wpt/web-platform-tests/css/support/60x60-gg-rr.png b/tests/wpt/tests/css/support/60x60-gg-rr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/60x60-gg-rr.png rename to tests/wpt/tests/css/support/60x60-gg-rr.png diff --git a/tests/wpt/web-platform-tests/css/support/60x60-green.png b/tests/wpt/tests/css/support/60x60-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/60x60-green.png rename to tests/wpt/tests/css/support/60x60-green.png diff --git a/tests/wpt/web-platform-tests/css/support/60x60-red.png b/tests/wpt/tests/css/support/60x60-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/60x60-red.png rename to tests/wpt/tests/css/support/60x60-red.png diff --git a/tests/wpt/web-platform-tests/css/support/META.yml b/tests/wpt/tests/css/support/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/css/support/META.yml rename to tests/wpt/tests/css/support/META.yml diff --git a/tests/wpt/web-platform-tests/css/support/README b/tests/wpt/tests/css/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/support/README rename to tests/wpt/tests/css/support/README diff --git a/tests/wpt/web-platform-tests/css/support/a-green.css b/tests/wpt/tests/css/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/support/a-green.css rename to tests/wpt/tests/css/support/a-green.css diff --git a/tests/wpt/web-platform-tests/css/support/alignment.css b/tests/wpt/tests/css/support/alignment.css similarity index 100% rename from tests/wpt/web-platform-tests/css/support/alignment.css rename to tests/wpt/tests/css/support/alignment.css diff --git a/tests/wpt/web-platform-tests/css/support/b-green.css b/tests/wpt/tests/css/support/b-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/support/b-green.css rename to tests/wpt/tests/css/support/b-green.css diff --git a/tests/wpt/web-platform-tests/css/support/blue-100.png b/tests/wpt/tests/css/support/blue-100.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/blue-100.png rename to tests/wpt/tests/css/support/blue-100.png diff --git a/tests/wpt/web-platform-tests/css/support/blue32x32.ico b/tests/wpt/tests/css/support/blue32x32.ico similarity index 100% rename from tests/wpt/web-platform-tests/css/support/blue32x32.ico rename to tests/wpt/tests/css/support/blue32x32.ico diff --git a/tests/wpt/web-platform-tests/css/support/c-red.css b/tests/wpt/tests/css/support/c-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/support/c-red.css rename to tests/wpt/tests/css/support/c-red.css diff --git a/tests/wpt/web-platform-tests/css/support/cat.png b/tests/wpt/tests/css/support/cat.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/cat.png rename to tests/wpt/tests/css/support/cat.png diff --git a/tests/wpt/web-platform-tests/css/support/computed-testcommon.js b/tests/wpt/tests/css/support/computed-testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/css/support/computed-testcommon.js rename to tests/wpt/tests/css/support/computed-testcommon.js diff --git a/tests/wpt/web-platform-tests/css/support/delete-other-rule-crash.css b/tests/wpt/tests/css/support/delete-other-rule-crash.css similarity index 100% rename from tests/wpt/web-platform-tests/css/support/delete-other-rule-crash.css rename to tests/wpt/tests/css/support/delete-other-rule-crash.css diff --git a/tests/wpt/web-platform-tests/css/support/green.ico b/tests/wpt/tests/css/support/green.ico similarity index 100% rename from tests/wpt/web-platform-tests/css/support/green.ico rename to tests/wpt/tests/css/support/green.ico diff --git a/tests/wpt/web-platform-tests/css/support/grid.css b/tests/wpt/tests/css/support/grid.css similarity index 100% rename from tests/wpt/web-platform-tests/css/support/grid.css rename to tests/wpt/tests/css/support/grid.css diff --git a/tests/wpt/web-platform-tests/css/support/height-keyword-classes.css b/tests/wpt/tests/css/support/height-keyword-classes.css similarity index 100% rename from tests/wpt/web-platform-tests/css/support/height-keyword-classes.css rename to tests/wpt/tests/css/support/height-keyword-classes.css diff --git a/tests/wpt/web-platform-tests/css/support/import-green.css b/tests/wpt/tests/css/support/import-green.css similarity index 100% rename from tests/wpt/web-platform-tests/css/support/import-green.css rename to tests/wpt/tests/css/support/import-green.css diff --git a/tests/wpt/web-platform-tests/css/support/import-red.css b/tests/wpt/tests/css/support/import-red.css similarity index 100% rename from tests/wpt/web-platform-tests/css/support/import-red.css rename to tests/wpt/tests/css/support/import-red.css diff --git a/tests/wpt/web-platform-tests/css/support/inheritance-testcommon.js b/tests/wpt/tests/css/support/inheritance-testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/css/support/inheritance-testcommon.js rename to tests/wpt/tests/css/support/inheritance-testcommon.js diff --git a/tests/wpt/web-platform-tests/css/support/interpolation-testcommon.js b/tests/wpt/tests/css/support/interpolation-testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/css/support/interpolation-testcommon.js rename to tests/wpt/tests/css/support/interpolation-testcommon.js diff --git a/tests/wpt/web-platform-tests/css/support/numeric-testcommon.js b/tests/wpt/tests/css/support/numeric-testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/css/support/numeric-testcommon.js rename to tests/wpt/tests/css/support/numeric-testcommon.js diff --git a/tests/wpt/web-platform-tests/css/support/parsing-testcommon.js b/tests/wpt/tests/css/support/parsing-testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/css/support/parsing-testcommon.js rename to tests/wpt/tests/css/support/parsing-testcommon.js diff --git a/tests/wpt/web-platform-tests/css/support/pattern-grg-rgr-grg.png b/tests/wpt/tests/css/support/pattern-grg-rgr-grg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/pattern-grg-rgr-grg.png rename to tests/wpt/tests/css/support/pattern-grg-rgr-grg.png diff --git a/tests/wpt/web-platform-tests/css/support/pattern-grg-rrg-rgg.png b/tests/wpt/tests/css/support/pattern-grg-rrg-rgg.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/pattern-grg-rrg-rgg.png rename to tests/wpt/tests/css/support/pattern-grg-rrg-rgg.png diff --git a/tests/wpt/web-platform-tests/css/support/pattern-rgr-grg-rgr.png b/tests/wpt/tests/css/support/pattern-rgr-grg-rgr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/pattern-rgr-grg-rgr.png rename to tests/wpt/tests/css/support/pattern-rgr-grg-rgr.png diff --git a/tests/wpt/web-platform-tests/css/support/pattern-tr.png b/tests/wpt/tests/css/support/pattern-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/pattern-tr.png rename to tests/wpt/tests/css/support/pattern-tr.png diff --git a/tests/wpt/web-platform-tests/css/support/query-testcommon.js b/tests/wpt/tests/css/support/query-testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/css/support/query-testcommon.js rename to tests/wpt/tests/css/support/query-testcommon.js diff --git a/tests/wpt/web-platform-tests/css/support/red-rect.svg b/tests/wpt/tests/css/support/red-rect.svg similarity index 100% rename from tests/wpt/web-platform-tests/css/support/red-rect.svg rename to tests/wpt/tests/css/support/red-rect.svg diff --git a/tests/wpt/web-platform-tests/css/support/red.ico b/tests/wpt/tests/css/support/red.ico similarity index 100% rename from tests/wpt/web-platform-tests/css/support/red.ico rename to tests/wpt/tests/css/support/red.ico diff --git a/tests/wpt/web-platform-tests/css/support/ruler-h-50%.png b/tests/wpt/tests/css/support/ruler-h-50%.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/ruler-h-50%.png rename to tests/wpt/tests/css/support/ruler-h-50%.png diff --git a/tests/wpt/web-platform-tests/css/support/ruler-h-50px.png b/tests/wpt/tests/css/support/ruler-h-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/ruler-h-50px.png rename to tests/wpt/tests/css/support/ruler-h-50px.png diff --git a/tests/wpt/web-platform-tests/css/support/ruler-v-100px.png b/tests/wpt/tests/css/support/ruler-v-100px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/ruler-v-100px.png rename to tests/wpt/tests/css/support/ruler-v-100px.png diff --git a/tests/wpt/web-platform-tests/css/support/ruler-v-50px.png b/tests/wpt/tests/css/support/ruler-v-50px.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/ruler-v-50px.png rename to tests/wpt/tests/css/support/ruler-v-50px.png diff --git a/tests/wpt/web-platform-tests/css/support/serialize-testcommon.js b/tests/wpt/tests/css/support/serialize-testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/css/support/serialize-testcommon.js rename to tests/wpt/tests/css/support/serialize-testcommon.js diff --git a/tests/wpt/web-platform-tests/css/support/shorthand-testcommon.js b/tests/wpt/tests/css/support/shorthand-testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/css/support/shorthand-testcommon.js rename to tests/wpt/tests/css/support/shorthand-testcommon.js diff --git a/tests/wpt/web-platform-tests/css/support/square-purple.png b/tests/wpt/tests/css/support/square-purple.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/square-purple.png rename to tests/wpt/tests/css/support/square-purple.png diff --git a/tests/wpt/web-platform-tests/css/support/square-teal.png b/tests/wpt/tests/css/support/square-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/square-teal.png rename to tests/wpt/tests/css/support/square-teal.png diff --git a/tests/wpt/web-platform-tests/css/support/square-white.png b/tests/wpt/tests/css/support/square-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/square-white.png rename to tests/wpt/tests/css/support/square-white.png diff --git a/tests/wpt/web-platform-tests/css/support/support/README b/tests/wpt/tests/css/support/support/README similarity index 100% rename from tests/wpt/web-platform-tests/css/support/support/README rename to tests/wpt/tests/css/support/support/README diff --git a/tests/wpt/web-platform-tests/css/support/support/swatch-green.png b/tests/wpt/tests/css/support/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/support/swatch-green.png rename to tests/wpt/tests/css/support/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/support/support/swatch-red.png b/tests/wpt/tests/css/support/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/support/swatch-red.png rename to tests/wpt/tests/css/support/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/support/swatch-blue.png b/tests/wpt/tests/css/support/swatch-blue.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/swatch-blue.png rename to tests/wpt/tests/css/support/swatch-blue.png diff --git a/tests/wpt/web-platform-tests/css/support/swatch-green.png b/tests/wpt/tests/css/support/swatch-green.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/swatch-green.png rename to tests/wpt/tests/css/support/swatch-green.png diff --git a/tests/wpt/web-platform-tests/css/support/swatch-lime.png b/tests/wpt/tests/css/support/swatch-lime.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/swatch-lime.png rename to tests/wpt/tests/css/support/swatch-lime.png diff --git a/tests/wpt/web-platform-tests/css/support/swatch-orange.png b/tests/wpt/tests/css/support/swatch-orange.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/swatch-orange.png rename to tests/wpt/tests/css/support/swatch-orange.png diff --git a/tests/wpt/web-platform-tests/css/support/swatch-red.png b/tests/wpt/tests/css/support/swatch-red.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/swatch-red.png rename to tests/wpt/tests/css/support/swatch-red.png diff --git a/tests/wpt/web-platform-tests/css/support/swatch-teal.png b/tests/wpt/tests/css/support/swatch-teal.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/swatch-teal.png rename to tests/wpt/tests/css/support/swatch-teal.png diff --git a/tests/wpt/web-platform-tests/css/support/swatch-white.png b/tests/wpt/tests/css/support/swatch-white.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/swatch-white.png rename to tests/wpt/tests/css/support/swatch-white.png diff --git a/tests/wpt/web-platform-tests/css/support/swatch-yellow.png b/tests/wpt/tests/css/support/swatch-yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/swatch-yellow.png rename to tests/wpt/tests/css/support/swatch-yellow.png diff --git a/tests/wpt/web-platform-tests/css/support/test-bl.png b/tests/wpt/tests/css/support/test-bl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/test-bl.png rename to tests/wpt/tests/css/support/test-bl.png diff --git a/tests/wpt/web-platform-tests/css/support/test-br.png b/tests/wpt/tests/css/support/test-br.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/test-br.png rename to tests/wpt/tests/css/support/test-br.png diff --git a/tests/wpt/web-platform-tests/css/support/test-inner-half-size.png b/tests/wpt/tests/css/support/test-inner-half-size.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/test-inner-half-size.png rename to tests/wpt/tests/css/support/test-inner-half-size.png diff --git a/tests/wpt/web-platform-tests/css/support/test-outer.png b/tests/wpt/tests/css/support/test-outer.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/test-outer.png rename to tests/wpt/tests/css/support/test-outer.png diff --git a/tests/wpt/web-platform-tests/css/support/test-tl.png b/tests/wpt/tests/css/support/test-tl.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/test-tl.png rename to tests/wpt/tests/css/support/test-tl.png diff --git a/tests/wpt/web-platform-tests/css/support/test-tr.png b/tests/wpt/tests/css/support/test-tr.png similarity index 100% rename from tests/wpt/web-platform-tests/css/support/test-tr.png rename to tests/wpt/tests/css/support/test-tr.png diff --git a/tests/wpt/web-platform-tests/css/support/width-keyword-classes.css b/tests/wpt/tests/css/support/width-keyword-classes.css similarity index 100% rename from tests/wpt/web-platform-tests/css/support/width-keyword-classes.css rename to tests/wpt/tests/css/support/width-keyword-classes.css diff --git a/tests/wpt/web-platform-tests/custom-elements/CustomElementRegistry-constructor-and-callbacks-are-held-strongly.html b/tests/wpt/tests/custom-elements/CustomElementRegistry-constructor-and-callbacks-are-held-strongly.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/CustomElementRegistry-constructor-and-callbacks-are-held-strongly.html rename to tests/wpt/tests/custom-elements/CustomElementRegistry-constructor-and-callbacks-are-held-strongly.html diff --git a/tests/wpt/web-platform-tests/custom-elements/CustomElementRegistry-getName.tentative.html b/tests/wpt/tests/custom-elements/CustomElementRegistry-getName.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/CustomElementRegistry-getName.tentative.html rename to tests/wpt/tests/custom-elements/CustomElementRegistry-getName.tentative.html diff --git a/tests/wpt/web-platform-tests/custom-elements/CustomElementRegistry.html b/tests/wpt/tests/custom-elements/CustomElementRegistry.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/CustomElementRegistry.html rename to tests/wpt/tests/custom-elements/CustomElementRegistry.html diff --git a/tests/wpt/web-platform-tests/custom-elements/Document-createElement-customized-builtins.html b/tests/wpt/tests/custom-elements/Document-createElement-customized-builtins.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/Document-createElement-customized-builtins.html rename to tests/wpt/tests/custom-elements/Document-createElement-customized-builtins.html diff --git a/tests/wpt/web-platform-tests/custom-elements/Document-createElement-svg.svg b/tests/wpt/tests/custom-elements/Document-createElement-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/Document-createElement-svg.svg rename to tests/wpt/tests/custom-elements/Document-createElement-svg.svg diff --git a/tests/wpt/web-platform-tests/custom-elements/Document-createElement.html b/tests/wpt/tests/custom-elements/Document-createElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/Document-createElement.html rename to tests/wpt/tests/custom-elements/Document-createElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/Document-createElementNS-customized-builtins.html b/tests/wpt/tests/custom-elements/Document-createElementNS-customized-builtins.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/Document-createElementNS-customized-builtins.html rename to tests/wpt/tests/custom-elements/Document-createElementNS-customized-builtins.html diff --git a/tests/wpt/web-platform-tests/custom-elements/Document-createElementNS.html b/tests/wpt/tests/custom-elements/Document-createElementNS.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/Document-createElementNS.html rename to tests/wpt/tests/custom-elements/Document-createElementNS.html diff --git a/tests/wpt/web-platform-tests/custom-elements/ElementInternals-accessibility.html b/tests/wpt/tests/custom-elements/ElementInternals-accessibility.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/ElementInternals-accessibility.html rename to tests/wpt/tests/custom-elements/ElementInternals-accessibility.html diff --git a/tests/wpt/web-platform-tests/custom-elements/HTMLElement-attachInternals.html b/tests/wpt/tests/custom-elements/HTMLElement-attachInternals.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/HTMLElement-attachInternals.html rename to tests/wpt/tests/custom-elements/HTMLElement-attachInternals.html diff --git a/tests/wpt/web-platform-tests/custom-elements/HTMLElement-constructor-customized-bulitins.html b/tests/wpt/tests/custom-elements/HTMLElement-constructor-customized-bulitins.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/HTMLElement-constructor-customized-bulitins.html rename to tests/wpt/tests/custom-elements/HTMLElement-constructor-customized-bulitins.html diff --git a/tests/wpt/web-platform-tests/custom-elements/HTMLElement-constructor.html b/tests/wpt/tests/custom-elements/HTMLElement-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/HTMLElement-constructor.html rename to tests/wpt/tests/custom-elements/HTMLElement-constructor.html diff --git a/tests/wpt/web-platform-tests/custom-elements/META.yml b/tests/wpt/tests/custom-elements/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/META.yml rename to tests/wpt/tests/custom-elements/META.yml diff --git a/tests/wpt/web-platform-tests/custom-elements/adopted-callback.html b/tests/wpt/tests/custom-elements/adopted-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/adopted-callback.html rename to tests/wpt/tests/custom-elements/adopted-callback.html diff --git a/tests/wpt/web-platform-tests/custom-elements/attribute-changed-callback.html b/tests/wpt/tests/custom-elements/attribute-changed-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/attribute-changed-callback.html rename to tests/wpt/tests/custom-elements/attribute-changed-callback.html diff --git a/tests/wpt/web-platform-tests/custom-elements/builtin-coverage.html b/tests/wpt/tests/custom-elements/builtin-coverage.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/builtin-coverage.html rename to tests/wpt/tests/custom-elements/builtin-coverage.html diff --git a/tests/wpt/web-platform-tests/custom-elements/connected-callbacks-html-fragment-parsing.html b/tests/wpt/tests/custom-elements/connected-callbacks-html-fragment-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/connected-callbacks-html-fragment-parsing.html rename to tests/wpt/tests/custom-elements/connected-callbacks-html-fragment-parsing.html diff --git a/tests/wpt/web-platform-tests/custom-elements/connected-callbacks-template.html b/tests/wpt/tests/custom-elements/connected-callbacks-template.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/connected-callbacks-template.html rename to tests/wpt/tests/custom-elements/connected-callbacks-template.html diff --git a/tests/wpt/web-platform-tests/custom-elements/connected-callbacks.html b/tests/wpt/tests/custom-elements/connected-callbacks.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/connected-callbacks.html rename to tests/wpt/tests/custom-elements/connected-callbacks.html diff --git a/tests/wpt/web-platform-tests/custom-elements/cross-realm-callback-report-exception.html b/tests/wpt/tests/custom-elements/cross-realm-callback-report-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/cross-realm-callback-report-exception.html rename to tests/wpt/tests/custom-elements/cross-realm-callback-report-exception.html diff --git a/tests/wpt/web-platform-tests/custom-elements/custom-element-reaction-queue.html b/tests/wpt/tests/custom-elements/custom-element-reaction-queue.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/custom-element-reaction-queue.html rename to tests/wpt/tests/custom-elements/custom-element-reaction-queue.html diff --git a/tests/wpt/web-platform-tests/custom-elements/custom-element-registry/define-customized-builtins.html b/tests/wpt/tests/custom-elements/custom-element-registry/define-customized-builtins.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/custom-element-registry/define-customized-builtins.html rename to tests/wpt/tests/custom-elements/custom-element-registry/define-customized-builtins.html diff --git a/tests/wpt/web-platform-tests/custom-elements/custom-element-registry/define.html b/tests/wpt/tests/custom-elements/custom-element-registry/define.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/custom-element-registry/define.html rename to tests/wpt/tests/custom-elements/custom-element-registry/define.html diff --git a/tests/wpt/web-platform-tests/custom-elements/custom-element-registry/per-global.html b/tests/wpt/tests/custom-elements/custom-element-registry/per-global.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/custom-element-registry/per-global.html rename to tests/wpt/tests/custom-elements/custom-element-registry/per-global.html diff --git a/tests/wpt/web-platform-tests/custom-elements/custom-element-registry/upgrade.html b/tests/wpt/tests/custom-elements/custom-element-registry/upgrade.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/custom-element-registry/upgrade.html rename to tests/wpt/tests/custom-elements/custom-element-registry/upgrade.html diff --git a/tests/wpt/web-platform-tests/custom-elements/customized-built-in-constructor-exceptions.html b/tests/wpt/tests/custom-elements/customized-built-in-constructor-exceptions.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/customized-built-in-constructor-exceptions.html rename to tests/wpt/tests/custom-elements/customized-built-in-constructor-exceptions.html diff --git a/tests/wpt/web-platform-tests/custom-elements/disconnected-callbacks.html b/tests/wpt/tests/custom-elements/disconnected-callbacks.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/disconnected-callbacks.html rename to tests/wpt/tests/custom-elements/disconnected-callbacks.html diff --git a/tests/wpt/web-platform-tests/custom-elements/element-internals-shadowroot.html b/tests/wpt/tests/custom-elements/element-internals-shadowroot.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/element-internals-shadowroot.html rename to tests/wpt/tests/custom-elements/element-internals-shadowroot.html diff --git a/tests/wpt/web-platform-tests/custom-elements/enqueue-custom-element-callback-reactions-inside-another-callback.html b/tests/wpt/tests/custom-elements/enqueue-custom-element-callback-reactions-inside-another-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/enqueue-custom-element-callback-reactions-inside-another-callback.html rename to tests/wpt/tests/custom-elements/enqueue-custom-element-callback-reactions-inside-another-callback.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-NotSupportedError.html b/tests/wpt/tests/custom-elements/form-associated/ElementInternals-NotSupportedError.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-NotSupportedError.html rename to tests/wpt/tests/custom-elements/form-associated/ElementInternals-NotSupportedError.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-form.html b/tests/wpt/tests/custom-elements/form-associated/ElementInternals-form.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-form.html rename to tests/wpt/tests/custom-elements/form-associated/ElementInternals-form.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-labels.html b/tests/wpt/tests/custom-elements/form-associated/ElementInternals-labels.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-labels.html rename to tests/wpt/tests/custom-elements/form-associated/ElementInternals-labels.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-reportValidity-bubble-ref.html b/tests/wpt/tests/custom-elements/form-associated/ElementInternals-reportValidity-bubble-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-reportValidity-bubble-ref.html rename to tests/wpt/tests/custom-elements/form-associated/ElementInternals-reportValidity-bubble-ref.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-reportValidity-bubble.html b/tests/wpt/tests/custom-elements/form-associated/ElementInternals-reportValidity-bubble.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-reportValidity-bubble.html rename to tests/wpt/tests/custom-elements/form-associated/ElementInternals-reportValidity-bubble.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-setFormValue.html b/tests/wpt/tests/custom-elements/form-associated/ElementInternals-setFormValue.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-setFormValue.html rename to tests/wpt/tests/custom-elements/form-associated/ElementInternals-setFormValue.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-target-element-is-held-strongly.html b/tests/wpt/tests/custom-elements/form-associated/ElementInternals-target-element-is-held-strongly.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-target-element-is-held-strongly.html rename to tests/wpt/tests/custom-elements/form-associated/ElementInternals-target-element-is-held-strongly.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-validation.html b/tests/wpt/tests/custom-elements/form-associated/ElementInternals-validation.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/ElementInternals-validation.html rename to tests/wpt/tests/custom-elements/form-associated/ElementInternals-validation.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/disabled-delegatesFocus.html b/tests/wpt/tests/custom-elements/form-associated/disabled-delegatesFocus.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/disabled-delegatesFocus.html rename to tests/wpt/tests/custom-elements/form-associated/disabled-delegatesFocus.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/fieldset-elements.html b/tests/wpt/tests/custom-elements/form-associated/fieldset-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/fieldset-elements.html rename to tests/wpt/tests/custom-elements/form-associated/fieldset-elements.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/form-associated-callback.html b/tests/wpt/tests/custom-elements/form-associated/form-associated-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/form-associated-callback.html rename to tests/wpt/tests/custom-elements/form-associated/form-associated-callback.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/form-disabled-callback.html b/tests/wpt/tests/custom-elements/form-associated/form-disabled-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/form-disabled-callback.html rename to tests/wpt/tests/custom-elements/form-associated/form-disabled-callback.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/form-elements-namedItem.html b/tests/wpt/tests/custom-elements/form-associated/form-elements-namedItem.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/form-elements-namedItem.html rename to tests/wpt/tests/custom-elements/form-associated/form-elements-namedItem.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/form-reset-callback.html b/tests/wpt/tests/custom-elements/form-associated/form-reset-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/form-reset-callback.html rename to tests/wpt/tests/custom-elements/form-associated/form-reset-callback.html diff --git a/tests/wpt/web-platform-tests/custom-elements/form-associated/label-delegatesFocus.html b/tests/wpt/tests/custom-elements/form-associated/label-delegatesFocus.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/form-associated/label-delegatesFocus.html rename to tests/wpt/tests/custom-elements/form-associated/label-delegatesFocus.html diff --git a/tests/wpt/web-platform-tests/custom-elements/historical.html b/tests/wpt/tests/custom-elements/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/historical.html rename to tests/wpt/tests/custom-elements/historical.html diff --git a/tests/wpt/web-platform-tests/custom-elements/htmlconstructor/newtarget-customized-builtins.html b/tests/wpt/tests/custom-elements/htmlconstructor/newtarget-customized-builtins.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/htmlconstructor/newtarget-customized-builtins.html rename to tests/wpt/tests/custom-elements/htmlconstructor/newtarget-customized-builtins.html diff --git a/tests/wpt/web-platform-tests/custom-elements/htmlconstructor/newtarget.html b/tests/wpt/tests/custom-elements/htmlconstructor/newtarget.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/htmlconstructor/newtarget.html rename to tests/wpt/tests/custom-elements/htmlconstructor/newtarget.html diff --git a/tests/wpt/web-platform-tests/custom-elements/microtasks-and-constructors.html b/tests/wpt/tests/custom-elements/microtasks-and-constructors.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/microtasks-and-constructors.html rename to tests/wpt/tests/custom-elements/microtasks-and-constructors.html diff --git a/tests/wpt/web-platform-tests/custom-elements/overwritten-customElements-global.html b/tests/wpt/tests/custom-elements/overwritten-customElements-global.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/overwritten-customElements-global.html rename to tests/wpt/tests/custom-elements/overwritten-customElements-global.html diff --git a/tests/wpt/web-platform-tests/custom-elements/parser/parser-constructs-custom-element-in-document-write.html b/tests/wpt/tests/custom-elements/parser/parser-constructs-custom-element-in-document-write.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/parser/parser-constructs-custom-element-in-document-write.html rename to tests/wpt/tests/custom-elements/parser/parser-constructs-custom-element-in-document-write.html diff --git a/tests/wpt/web-platform-tests/custom-elements/parser/parser-constructs-custom-element-synchronously.html b/tests/wpt/tests/custom-elements/parser/parser-constructs-custom-element-synchronously.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/parser/parser-constructs-custom-element-synchronously.html rename to tests/wpt/tests/custom-elements/parser/parser-constructs-custom-element-synchronously.html diff --git a/tests/wpt/web-platform-tests/custom-elements/parser/parser-constructs-custom-elements-with-is.html b/tests/wpt/tests/custom-elements/parser/parser-constructs-custom-elements-with-is.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/parser/parser-constructs-custom-elements-with-is.html rename to tests/wpt/tests/custom-elements/parser/parser-constructs-custom-elements-with-is.html diff --git a/tests/wpt/web-platform-tests/custom-elements/parser/parser-constructs-custom-elements.html b/tests/wpt/tests/custom-elements/parser/parser-constructs-custom-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/parser/parser-constructs-custom-elements.html rename to tests/wpt/tests/custom-elements/parser/parser-constructs-custom-elements.html diff --git a/tests/wpt/web-platform-tests/custom-elements/parser/parser-custom-element-in-foreign-content.html b/tests/wpt/tests/custom-elements/parser/parser-custom-element-in-foreign-content.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/parser/parser-custom-element-in-foreign-content.html rename to tests/wpt/tests/custom-elements/parser/parser-custom-element-in-foreign-content.html diff --git a/tests/wpt/web-platform-tests/custom-elements/parser/parser-fallsback-to-unknown-element.html b/tests/wpt/tests/custom-elements/parser/parser-fallsback-to-unknown-element.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/parser/parser-fallsback-to-unknown-element.html rename to tests/wpt/tests/custom-elements/parser/parser-fallsback-to-unknown-element.html diff --git a/tests/wpt/web-platform-tests/custom-elements/parser/parser-sets-attributes-and-children.html b/tests/wpt/tests/custom-elements/parser/parser-sets-attributes-and-children.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/parser/parser-sets-attributes-and-children.html rename to tests/wpt/tests/custom-elements/parser/parser-sets-attributes-and-children.html diff --git a/tests/wpt/web-platform-tests/custom-elements/parser/parser-uses-constructed-element.html b/tests/wpt/tests/custom-elements/parser/parser-uses-constructed-element.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/parser/parser-uses-constructed-element.html rename to tests/wpt/tests/custom-elements/parser/parser-uses-constructed-element.html diff --git a/tests/wpt/web-platform-tests/custom-elements/parser/parser-uses-create-an-element-for-a-token-svg.svg b/tests/wpt/tests/custom-elements/parser/parser-uses-create-an-element-for-a-token-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/parser/parser-uses-create-an-element-for-a-token-svg.svg rename to tests/wpt/tests/custom-elements/parser/parser-uses-create-an-element-for-a-token-svg.svg diff --git a/tests/wpt/web-platform-tests/custom-elements/parser/parser-uses-registry-of-owner-document.html b/tests/wpt/tests/custom-elements/parser/parser-uses-registry-of-owner-document.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/parser/parser-uses-registry-of-owner-document.html rename to tests/wpt/tests/custom-elements/parser/parser-uses-registry-of-owner-document.html diff --git a/tests/wpt/web-platform-tests/custom-elements/parser/serializing-html-fragments-customized-builtins.html b/tests/wpt/tests/custom-elements/parser/serializing-html-fragments-customized-builtins.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/parser/serializing-html-fragments-customized-builtins.html rename to tests/wpt/tests/custom-elements/parser/serializing-html-fragments-customized-builtins.html diff --git a/tests/wpt/web-platform-tests/custom-elements/perform-microtask-checkpoint-before-construction-xml-parser.xhtml b/tests/wpt/tests/custom-elements/perform-microtask-checkpoint-before-construction-xml-parser.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/perform-microtask-checkpoint-before-construction-xml-parser.xhtml rename to tests/wpt/tests/custom-elements/perform-microtask-checkpoint-before-construction-xml-parser.xhtml diff --git a/tests/wpt/web-platform-tests/custom-elements/perform-microtask-checkpoint-before-construction.html b/tests/wpt/tests/custom-elements/perform-microtask-checkpoint-before-construction.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/perform-microtask-checkpoint-before-construction.html rename to tests/wpt/tests/custom-elements/perform-microtask-checkpoint-before-construction.html diff --git a/tests/wpt/web-platform-tests/custom-elements/prevent-extensions-crash.html b/tests/wpt/tests/custom-elements/prevent-extensions-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/prevent-extensions-crash.html rename to tests/wpt/tests/custom-elements/prevent-extensions-crash.html diff --git a/tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined-customized-builtins.html b/tests/wpt/tests/custom-elements/pseudo-class-defined-customized-builtins.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined-customized-builtins.html rename to tests/wpt/tests/custom-elements/pseudo-class-defined-customized-builtins.html diff --git a/tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined-print-ref.html b/tests/wpt/tests/custom-elements/pseudo-class-defined-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined-print-ref.html rename to tests/wpt/tests/custom-elements/pseudo-class-defined-print-ref.html diff --git a/tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined-print.html b/tests/wpt/tests/custom-elements/pseudo-class-defined-print.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined-print.html rename to tests/wpt/tests/custom-elements/pseudo-class-defined-print.html diff --git a/tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined.html b/tests/wpt/tests/custom-elements/pseudo-class-defined.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/pseudo-class-defined.html rename to tests/wpt/tests/custom-elements/pseudo-class-defined.html diff --git a/tests/wpt/web-platform-tests/custom-elements/range-and-constructors.html b/tests/wpt/tests/custom-elements/range-and-constructors.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/range-and-constructors.html rename to tests/wpt/tests/custom-elements/range-and-constructors.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reaction-timing.html b/tests/wpt/tests/custom-elements/reaction-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reaction-timing.html rename to tests/wpt/tests/custom-elements/reaction-timing.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/Animation.html b/tests/wpt/tests/custom-elements/reactions/Animation.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/Animation.html rename to tests/wpt/tests/custom-elements/reactions/Animation.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/AriaMixin-element-attributes.html b/tests/wpt/tests/custom-elements/reactions/AriaMixin-element-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/AriaMixin-element-attributes.html rename to tests/wpt/tests/custom-elements/reactions/AriaMixin-element-attributes.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/AriaMixin-string-attributes.html b/tests/wpt/tests/custom-elements/reactions/AriaMixin-string-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/AriaMixin-string-attributes.html rename to tests/wpt/tests/custom-elements/reactions/AriaMixin-string-attributes.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/Attr.html b/tests/wpt/tests/custom-elements/reactions/Attr.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/Attr.html rename to tests/wpt/tests/custom-elements/reactions/Attr.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/CSSStyleDeclaration.html b/tests/wpt/tests/custom-elements/reactions/CSSStyleDeclaration.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/CSSStyleDeclaration.html rename to tests/wpt/tests/custom-elements/reactions/CSSStyleDeclaration.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/ChildNode.html b/tests/wpt/tests/custom-elements/reactions/ChildNode.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/ChildNode.html rename to tests/wpt/tests/custom-elements/reactions/ChildNode.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/DOMStringMap.html b/tests/wpt/tests/custom-elements/reactions/DOMStringMap.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/DOMStringMap.html rename to tests/wpt/tests/custom-elements/reactions/DOMStringMap.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/DOMTokenList.html b/tests/wpt/tests/custom-elements/reactions/DOMTokenList.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/DOMTokenList.html rename to tests/wpt/tests/custom-elements/reactions/DOMTokenList.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/Document.html b/tests/wpt/tests/custom-elements/reactions/Document.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/Document.html rename to tests/wpt/tests/custom-elements/reactions/Document.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/Element.html b/tests/wpt/tests/custom-elements/reactions/Element.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/Element.html rename to tests/wpt/tests/custom-elements/reactions/Element.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/ElementContentEditable.html b/tests/wpt/tests/custom-elements/reactions/ElementContentEditable.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/ElementContentEditable.html rename to tests/wpt/tests/custom-elements/reactions/ElementContentEditable.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/HTMLAnchorElement.html b/tests/wpt/tests/custom-elements/reactions/HTMLAnchorElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/HTMLAnchorElement.html rename to tests/wpt/tests/custom-elements/reactions/HTMLAnchorElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/HTMLElement.html b/tests/wpt/tests/custom-elements/reactions/HTMLElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/HTMLElement.html rename to tests/wpt/tests/custom-elements/reactions/HTMLElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/HTMLOptionElement.html b/tests/wpt/tests/custom-elements/reactions/HTMLOptionElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/HTMLOptionElement.html rename to tests/wpt/tests/custom-elements/reactions/HTMLOptionElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/HTMLOptionsCollection.html b/tests/wpt/tests/custom-elements/reactions/HTMLOptionsCollection.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/HTMLOptionsCollection.html rename to tests/wpt/tests/custom-elements/reactions/HTMLOptionsCollection.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/HTMLOutputElement.html b/tests/wpt/tests/custom-elements/reactions/HTMLOutputElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/HTMLOutputElement.html rename to tests/wpt/tests/custom-elements/reactions/HTMLOutputElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/HTMLSelectElement.html b/tests/wpt/tests/custom-elements/reactions/HTMLSelectElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/HTMLSelectElement.html rename to tests/wpt/tests/custom-elements/reactions/HTMLSelectElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/HTMLTableElement.html b/tests/wpt/tests/custom-elements/reactions/HTMLTableElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/HTMLTableElement.html rename to tests/wpt/tests/custom-elements/reactions/HTMLTableElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/HTMLTableRowElement.html b/tests/wpt/tests/custom-elements/reactions/HTMLTableRowElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/HTMLTableRowElement.html rename to tests/wpt/tests/custom-elements/reactions/HTMLTableRowElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/HTMLTableSectionElement.html b/tests/wpt/tests/custom-elements/reactions/HTMLTableSectionElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/HTMLTableSectionElement.html rename to tests/wpt/tests/custom-elements/reactions/HTMLTableSectionElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/HTMLTitleElement.html b/tests/wpt/tests/custom-elements/reactions/HTMLTitleElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/HTMLTitleElement.html rename to tests/wpt/tests/custom-elements/reactions/HTMLTitleElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/NamedNodeMap.html b/tests/wpt/tests/custom-elements/reactions/NamedNodeMap.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/NamedNodeMap.html rename to tests/wpt/tests/custom-elements/reactions/NamedNodeMap.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/Node.html b/tests/wpt/tests/custom-elements/reactions/Node.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/Node.html rename to tests/wpt/tests/custom-elements/reactions/Node.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/ParentNode.html b/tests/wpt/tests/custom-elements/reactions/ParentNode.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/ParentNode.html rename to tests/wpt/tests/custom-elements/reactions/ParentNode.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/Range.html b/tests/wpt/tests/custom-elements/reactions/Range.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/Range.html rename to tests/wpt/tests/custom-elements/reactions/Range.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/Selection.html b/tests/wpt/tests/custom-elements/reactions/Selection.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/Selection.html rename to tests/wpt/tests/custom-elements/reactions/Selection.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/ShadowRoot.html b/tests/wpt/tests/custom-elements/reactions/ShadowRoot.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/ShadowRoot.html rename to tests/wpt/tests/custom-elements/reactions/ShadowRoot.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLAreaElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLAreaElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLAreaElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLAreaElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLBaseElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLBaseElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLBaseElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLBaseElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLButtonElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLButtonElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLButtonElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLButtonElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLCanvasElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLCanvasElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLCanvasElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLCanvasElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLDataElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLDataElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLDataElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLDataElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLDetailsElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLDetailsElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLDetailsElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLDetailsElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLEmbedElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLEmbedElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLEmbedElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLEmbedElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLFieldSetElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLFieldSetElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLFieldSetElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLFieldSetElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLImageElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLImageElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLImageElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLImageElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLInputElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLInputElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLInputElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLInputElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLLIElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLLIElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLLIElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLLIElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLLabelElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLLabelElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLLabelElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLLabelElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLMapElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLMapElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLMapElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLMapElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLMediaElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLMediaElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLMediaElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLMediaElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLMetaElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLMetaElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLMetaElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLMetaElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLMeterElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLMeterElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLMeterElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLMeterElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLModElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLModElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLModElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLModElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLOListElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLOListElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLOListElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLOListElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLOptGroupElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLOptGroupElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLOptGroupElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLOptGroupElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLParamElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLParamElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLParamElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLParamElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLProgressElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLProgressElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLProgressElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLProgressElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLQuoteElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLQuoteElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLQuoteElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLQuoteElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLSlotElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLSlotElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLSlotElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLSlotElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLSourceElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLSourceElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLSourceElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLSourceElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLStyleElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLStyleElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLStyleElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLStyleElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLTableCellElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLTableCellElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLTableCellElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLTableCellElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLTableColElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLTableColElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLTableColElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLTableColElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLTimeElement.html b/tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLTimeElement.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/customized-builtins/HTMLTimeElement.html rename to tests/wpt/tests/custom-elements/reactions/customized-builtins/HTMLTimeElement.html diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/resources/reactions.js b/tests/wpt/tests/custom-elements/reactions/resources/reactions.js similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/resources/reactions.js rename to tests/wpt/tests/custom-elements/reactions/resources/reactions.js diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/with-exceptions.html b/tests/wpt/tests/custom-elements/reactions/with-exceptions.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/reactions/with-exceptions.html rename to tests/wpt/tests/custom-elements/reactions/with-exceptions.html diff --git a/tests/wpt/web-platform-tests/custom-elements/resources/custom-elements-helpers.js b/tests/wpt/tests/custom-elements/resources/custom-elements-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/resources/custom-elements-helpers.js rename to tests/wpt/tests/custom-elements/resources/custom-elements-helpers.js diff --git a/tests/wpt/web-platform-tests/custom-elements/resources/empty-html-document.html b/tests/wpt/tests/custom-elements/resources/empty-html-document.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/resources/empty-html-document.html rename to tests/wpt/tests/custom-elements/resources/empty-html-document.html diff --git a/tests/wpt/web-platform-tests/custom-elements/resources/my-custom-element-html-document.html b/tests/wpt/tests/custom-elements/resources/my-custom-element-html-document.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/resources/my-custom-element-html-document.html rename to tests/wpt/tests/custom-elements/resources/my-custom-element-html-document.html diff --git a/tests/wpt/web-platform-tests/custom-elements/resources/navigation-destination.html b/tests/wpt/tests/custom-elements/resources/navigation-destination.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/resources/navigation-destination.html rename to tests/wpt/tests/custom-elements/resources/navigation-destination.html diff --git a/tests/wpt/web-platform-tests/custom-elements/scoped-registry/CustomElementRegistry-constructor.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/CustomElementRegistry-constructor.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/scoped-registry/CustomElementRegistry-constructor.tentative.html rename to tests/wpt/tests/custom-elements/scoped-registry/CustomElementRegistry-constructor.tentative.html diff --git a/tests/wpt/web-platform-tests/custom-elements/scoped-registry/CustomElementRegistry-multi-register.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/CustomElementRegistry-multi-register.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/scoped-registry/CustomElementRegistry-multi-register.tentative.html rename to tests/wpt/tests/custom-elements/scoped-registry/CustomElementRegistry-multi-register.tentative.html diff --git a/tests/wpt/web-platform-tests/custom-elements/scoped-registry/ShadowRoot-init-registry.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-init-registry.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/scoped-registry/ShadowRoot-init-registry.tentative.html rename to tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-init-registry.tentative.html diff --git a/tests/wpt/web-platform-tests/custom-elements/scoped-registry/ShadowRoot-innerHTML-upgrade.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-innerHTML-upgrade.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/scoped-registry/ShadowRoot-innerHTML-upgrade.tentative.html rename to tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-innerHTML-upgrade.tentative.html diff --git a/tests/wpt/web-platform-tests/custom-elements/scoped-registry/constructor-call.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/constructor-call.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/scoped-registry/constructor-call.tentative.html rename to tests/wpt/tests/custom-elements/scoped-registry/constructor-call.tentative.html diff --git a/tests/wpt/web-platform-tests/custom-elements/scoped-registry/constructor-reentry-with-different-definition.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/constructor-reentry-with-different-definition.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/scoped-registry/constructor-reentry-with-different-definition.tentative.html rename to tests/wpt/tests/custom-elements/scoped-registry/constructor-reentry-with-different-definition.tentative.html diff --git a/tests/wpt/web-platform-tests/custom-elements/state/tentative/ElementInternals-states.html b/tests/wpt/tests/custom-elements/state/tentative/ElementInternals-states.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/state/tentative/ElementInternals-states.html rename to tests/wpt/tests/custom-elements/state/tentative/ElementInternals-states.html diff --git a/tests/wpt/web-platform-tests/custom-elements/state/tentative/README.md b/tests/wpt/tests/custom-elements/state/tentative/README.md similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/state/tentative/README.md rename to tests/wpt/tests/custom-elements/state/tentative/README.md diff --git a/tests/wpt/web-platform-tests/custom-elements/state/tentative/state-pseudo-class.html b/tests/wpt/tests/custom-elements/state/tentative/state-pseudo-class.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/state/tentative/state-pseudo-class.html rename to tests/wpt/tests/custom-elements/state/tentative/state-pseudo-class.html diff --git a/tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-construct-xml-parser.xhtml b/tests/wpt/tests/custom-elements/throw-on-dynamic-markup-insertion-counter-construct-xml-parser.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-construct-xml-parser.xhtml rename to tests/wpt/tests/custom-elements/throw-on-dynamic-markup-insertion-counter-construct-xml-parser.xhtml diff --git a/tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-construct.html b/tests/wpt/tests/custom-elements/throw-on-dynamic-markup-insertion-counter-construct.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-construct.html rename to tests/wpt/tests/custom-elements/throw-on-dynamic-markup-insertion-counter-construct.html diff --git a/tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-reactions-xml-parser.xhtml b/tests/wpt/tests/custom-elements/throw-on-dynamic-markup-insertion-counter-reactions-xml-parser.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-reactions-xml-parser.xhtml rename to tests/wpt/tests/custom-elements/throw-on-dynamic-markup-insertion-counter-reactions-xml-parser.xhtml diff --git a/tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-reactions.html b/tests/wpt/tests/custom-elements/throw-on-dynamic-markup-insertion-counter-reactions.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-reactions.html rename to tests/wpt/tests/custom-elements/throw-on-dynamic-markup-insertion-counter-reactions.html diff --git a/tests/wpt/web-platform-tests/custom-elements/upgrading.html b/tests/wpt/tests/custom-elements/upgrading.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/upgrading.html rename to tests/wpt/tests/custom-elements/upgrading.html diff --git a/tests/wpt/web-platform-tests/custom-elements/upgrading/Document-importNode-customized-builtins.html b/tests/wpt/tests/custom-elements/upgrading/Document-importNode-customized-builtins.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/upgrading/Document-importNode-customized-builtins.html rename to tests/wpt/tests/custom-elements/upgrading/Document-importNode-customized-builtins.html diff --git a/tests/wpt/web-platform-tests/custom-elements/upgrading/Document-importNode.html b/tests/wpt/tests/custom-elements/upgrading/Document-importNode.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/upgrading/Document-importNode.html rename to tests/wpt/tests/custom-elements/upgrading/Document-importNode.html diff --git a/tests/wpt/web-platform-tests/custom-elements/upgrading/Node-cloneNode-customized-builtins.html b/tests/wpt/tests/custom-elements/upgrading/Node-cloneNode-customized-builtins.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/upgrading/Node-cloneNode-customized-builtins.html rename to tests/wpt/tests/custom-elements/upgrading/Node-cloneNode-customized-builtins.html diff --git a/tests/wpt/web-platform-tests/custom-elements/upgrading/Node-cloneNode.html b/tests/wpt/tests/custom-elements/upgrading/Node-cloneNode.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/upgrading/Node-cloneNode.html rename to tests/wpt/tests/custom-elements/upgrading/Node-cloneNode.html diff --git a/tests/wpt/web-platform-tests/custom-elements/upgrading/upgrading-enqueue-reactions.html b/tests/wpt/tests/custom-elements/upgrading/upgrading-enqueue-reactions.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/upgrading/upgrading-enqueue-reactions.html rename to tests/wpt/tests/custom-elements/upgrading/upgrading-enqueue-reactions.html diff --git a/tests/wpt/web-platform-tests/custom-elements/upgrading/upgrading-parser-created-element.html b/tests/wpt/tests/custom-elements/upgrading/upgrading-parser-created-element.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/upgrading/upgrading-parser-created-element.html rename to tests/wpt/tests/custom-elements/upgrading/upgrading-parser-created-element.html diff --git a/tests/wpt/web-platform-tests/custom-elements/when-defined-reentry-crash.html b/tests/wpt/tests/custom-elements/when-defined-reentry-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/when-defined-reentry-crash.html rename to tests/wpt/tests/custom-elements/when-defined-reentry-crash.html diff --git a/tests/wpt/web-platform-tests/custom-elements/xhtml-crash.xhtml b/tests/wpt/tests/custom-elements/xhtml-crash.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/custom-elements/xhtml-crash.xhtml rename to tests/wpt/tests/custom-elements/xhtml-crash.xhtml diff --git a/tests/wpt/web-platform-tests/custom-state-pseudo-class/META.yml b/tests/wpt/tests/custom-state-pseudo-class/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/custom-state-pseudo-class/META.yml rename to tests/wpt/tests/custom-state-pseudo-class/META.yml diff --git a/tests/wpt/web-platform-tests/custom-state-pseudo-class/idlharness.window.js b/tests/wpt/tests/custom-state-pseudo-class/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/custom-state-pseudo-class/idlharness.window.js rename to tests/wpt/tests/custom-state-pseudo-class/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/delegated-ink/delete-presentation-area.html b/tests/wpt/tests/delegated-ink/delete-presentation-area.html similarity index 100% rename from tests/wpt/web-platform-tests/delegated-ink/delete-presentation-area.html rename to tests/wpt/tests/delegated-ink/delete-presentation-area.html diff --git a/tests/wpt/web-platform-tests/delegated-ink/exception-thrown-bad-color.tentative.html b/tests/wpt/tests/delegated-ink/exception-thrown-bad-color.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/delegated-ink/exception-thrown-bad-color.tentative.html rename to tests/wpt/tests/delegated-ink/exception-thrown-bad-color.tentative.html diff --git a/tests/wpt/web-platform-tests/delegated-ink/exception-thrown-diameter-less-than-or-equal-to-0.tentative.html b/tests/wpt/tests/delegated-ink/exception-thrown-diameter-less-than-or-equal-to-0.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/delegated-ink/exception-thrown-diameter-less-than-or-equal-to-0.tentative.html rename to tests/wpt/tests/delegated-ink/exception-thrown-diameter-less-than-or-equal-to-0.tentative.html diff --git a/tests/wpt/web-platform-tests/delegated-ink/exception-thrown-untrusted-event.tentative.window.js b/tests/wpt/tests/delegated-ink/exception-thrown-untrusted-event.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/delegated-ink/exception-thrown-untrusted-event.tentative.window.js rename to tests/wpt/tests/delegated-ink/exception-thrown-untrusted-event.tentative.window.js diff --git a/tests/wpt/web-platform-tests/delegated-ink/requestPresenter-returns-valid-promise.tentative.window.js b/tests/wpt/tests/delegated-ink/requestPresenter-returns-valid-promise.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/delegated-ink/requestPresenter-returns-valid-promise.tentative.window.js rename to tests/wpt/tests/delegated-ink/requestPresenter-returns-valid-promise.tentative.window.js diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-image-in-canvas.html b/tests/wpt/tests/density-size-correction/density-corrected-image-in-canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-image-in-canvas.html rename to tests/wpt/tests/density-size-correction/density-corrected-image-in-canvas.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-image-svg-aspect-ratio-cross-origin.sub.html b/tests/wpt/tests/density-size-correction/density-corrected-image-svg-aspect-ratio-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-image-svg-aspect-ratio-cross-origin.sub.html rename to tests/wpt/tests/density-size-correction/density-corrected-image-svg-aspect-ratio-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-image-svg-aspect-ratio-ref.html b/tests/wpt/tests/density-size-correction/density-corrected-image-svg-aspect-ratio-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-image-svg-aspect-ratio-ref.html rename to tests/wpt/tests/density-size-correction/density-corrected-image-svg-aspect-ratio-ref.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-image-svg-aspect-ratio.html b/tests/wpt/tests/density-size-correction/density-corrected-image-svg-aspect-ratio.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-image-svg-aspect-ratio.html rename to tests/wpt/tests/density-size-correction/density-corrected-image-svg-aspect-ratio.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-image-svg-cross-origin.sub.html b/tests/wpt/tests/density-size-correction/density-corrected-image-svg-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-image-svg-cross-origin.sub.html rename to tests/wpt/tests/density-size-correction/density-corrected-image-svg-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-image-svg-ref.html b/tests/wpt/tests/density-size-correction/density-corrected-image-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-image-svg-ref.html rename to tests/wpt/tests/density-size-correction/density-corrected-image-svg-ref.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-image-svg.html b/tests/wpt/tests/density-size-correction/density-corrected-image-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-image-svg.html rename to tests/wpt/tests/density-size-correction/density-corrected-image-svg.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-natural-size.html b/tests/wpt/tests/density-size-correction/density-corrected-natural-size.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-natural-size.html rename to tests/wpt/tests/density-size-correction/density-corrected-natural-size.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-bg-cross-origin.sub.html b/tests/wpt/tests/density-size-correction/density-corrected-size-bg-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-bg-cross-origin.sub.html rename to tests/wpt/tests/density-size-correction/density-corrected-size-bg-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-bg-ref.html b/tests/wpt/tests/density-size-correction/density-corrected-size-bg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-bg-ref.html rename to tests/wpt/tests/density-size-correction/density-corrected-size-bg-ref.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-bg-with-radius-ref.html b/tests/wpt/tests/density-size-correction/density-corrected-size-bg-with-radius-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-bg-with-radius-ref.html rename to tests/wpt/tests/density-size-correction/density-corrected-size-bg-with-radius-ref.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-bg-with-radius.html b/tests/wpt/tests/density-size-correction/density-corrected-size-bg-with-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-bg-with-radius.html rename to tests/wpt/tests/density-size-correction/density-corrected-size-bg-with-radius.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-bg.html b/tests/wpt/tests/density-size-correction/density-corrected-size-bg.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-bg.html rename to tests/wpt/tests/density-size-correction/density-corrected-size-bg.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-img-cross-origin.sub.html b/tests/wpt/tests/density-size-correction/density-corrected-size-img-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-img-cross-origin.sub.html rename to tests/wpt/tests/density-size-correction/density-corrected-size-img-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-img-ref.html b/tests/wpt/tests/density-size-correction/density-corrected-size-img-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-img-ref.html rename to tests/wpt/tests/density-size-correction/density-corrected-size-img-ref.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-img.html b/tests/wpt/tests/density-size-correction/density-corrected-size-img.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-img.html rename to tests/wpt/tests/density-size-correction/density-corrected-size-img.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-pseudo-elements-cross-origin.sub.html b/tests/wpt/tests/density-size-correction/density-corrected-size-pseudo-elements-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-pseudo-elements-cross-origin.sub.html rename to tests/wpt/tests/density-size-correction/density-corrected-size-pseudo-elements-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-pseudo-elements-ref.html b/tests/wpt/tests/density-size-correction/density-corrected-size-pseudo-elements-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-pseudo-elements-ref.html rename to tests/wpt/tests/density-size-correction/density-corrected-size-pseudo-elements-ref.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-pseudo-elements.html b/tests/wpt/tests/density-size-correction/density-corrected-size-pseudo-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-size-pseudo-elements.html rename to tests/wpt/tests/density-size-correction/density-corrected-size-pseudo-elements.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-various-elements-cross-origin.sub.html b/tests/wpt/tests/density-size-correction/density-corrected-various-elements-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-various-elements-cross-origin.sub.html rename to tests/wpt/tests/density-size-correction/density-corrected-various-elements-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-various-elements-ref.html b/tests/wpt/tests/density-size-correction/density-corrected-various-elements-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-various-elements-ref.html rename to tests/wpt/tests/density-size-correction/density-corrected-various-elements-ref.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/density-corrected-various-elements.html b/tests/wpt/tests/density-size-correction/density-corrected-various-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/density-corrected-various-elements.html rename to tests/wpt/tests/density-size-correction/density-corrected-various-elements.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/image-set-001-cross-origin.sub.html b/tests/wpt/tests/density-size-correction/image-set-001-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/image-set-001-cross-origin.sub.html rename to tests/wpt/tests/density-size-correction/image-set-001-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/image-set-001-ref.html b/tests/wpt/tests/density-size-correction/image-set-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/image-set-001-ref.html rename to tests/wpt/tests/density-size-correction/image-set-001-ref.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/image-set-001.html b/tests/wpt/tests/density-size-correction/image-set-001.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/image-set-001.html rename to tests/wpt/tests/density-size-correction/image-set-001.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/image-set-002-cross-origin.sub.html b/tests/wpt/tests/density-size-correction/image-set-002-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/image-set-002-cross-origin.sub.html rename to tests/wpt/tests/density-size-correction/image-set-002-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/image-set-002-ref.html b/tests/wpt/tests/density-size-correction/image-set-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/image-set-002-ref.html rename to tests/wpt/tests/density-size-correction/image-set-002-ref.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/image-set-002.html b/tests/wpt/tests/density-size-correction/image-set-002.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/image-set-002.html rename to tests/wpt/tests/density-size-correction/image-set-002.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/image-set-003.html b/tests/wpt/tests/density-size-correction/image-set-003.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/image-set-003.html rename to tests/wpt/tests/density-size-correction/image-set-003.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-no-change.jpg b/tests/wpt/tests/density-size-correction/resources/exif-resolution-no-change.jpg similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-no-change.jpg rename to tests/wpt/tests/density-size-correction/resources/exif-resolution-no-change.jpg diff --git a/tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-none.jpg b/tests/wpt/tests/density-size-correction/resources/exif-resolution-none.jpg similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-none.jpg rename to tests/wpt/tests/density-size-correction/resources/exif-resolution-none.jpg diff --git a/tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-preapplied-lores.jpg b/tests/wpt/tests/density-size-correction/resources/exif-resolution-preapplied-lores.jpg similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-preapplied-lores.jpg rename to tests/wpt/tests/density-size-correction/resources/exif-resolution-preapplied-lores.jpg diff --git a/tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-preapplied-non-uniform.jpg b/tests/wpt/tests/density-size-correction/resources/exif-resolution-preapplied-non-uniform.jpg similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-preapplied-non-uniform.jpg rename to tests/wpt/tests/density-size-correction/resources/exif-resolution-preapplied-non-uniform.jpg diff --git a/tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-valid-hires.jpg b/tests/wpt/tests/density-size-correction/resources/exif-resolution-valid-hires.jpg similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-valid-hires.jpg rename to tests/wpt/tests/density-size-correction/resources/exif-resolution-valid-hires.jpg diff --git a/tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-valid-lores.jpg b/tests/wpt/tests/density-size-correction/resources/exif-resolution-valid-lores.jpg similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-valid-lores.jpg rename to tests/wpt/tests/density-size-correction/resources/exif-resolution-valid-lores.jpg diff --git a/tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-valid-non-uniform.jpg b/tests/wpt/tests/density-size-correction/resources/exif-resolution-valid-non-uniform.jpg similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-valid-non-uniform.jpg rename to tests/wpt/tests/density-size-correction/resources/exif-resolution-valid-non-uniform.jpg diff --git a/tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-with-orientation.jpg b/tests/wpt/tests/density-size-correction/resources/exif-resolution-with-orientation.jpg similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/resources/exif-resolution-with-orientation.jpg rename to tests/wpt/tests/density-size-correction/resources/exif-resolution-with-orientation.jpg diff --git a/tests/wpt/web-platform-tests/density-size-correction/resources/exify.js b/tests/wpt/tests/density-size-correction/resources/exify.js similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/resources/exify.js rename to tests/wpt/tests/density-size-correction/resources/exify.js diff --git a/tests/wpt/web-platform-tests/density-size-correction/srcset-cross-origin.sub.html b/tests/wpt/tests/density-size-correction/srcset-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/srcset-cross-origin.sub.html rename to tests/wpt/tests/density-size-correction/srcset-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/srcset-ref.html b/tests/wpt/tests/density-size-correction/srcset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/srcset-ref.html rename to tests/wpt/tests/density-size-correction/srcset-ref.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/srcset.html b/tests/wpt/tests/density-size-correction/srcset.html similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/srcset.html rename to tests/wpt/tests/density-size-correction/srcset.html diff --git a/tests/wpt/web-platform-tests/density-size-correction/third_party/piexif/LICENSE.txt b/tests/wpt/tests/density-size-correction/third_party/piexif/LICENSE.txt similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/third_party/piexif/LICENSE.txt rename to tests/wpt/tests/density-size-correction/third_party/piexif/LICENSE.txt diff --git a/tests/wpt/web-platform-tests/density-size-correction/third_party/piexif/piexif.js b/tests/wpt/tests/density-size-correction/third_party/piexif/piexif.js similarity index 100% rename from tests/wpt/web-platform-tests/density-size-correction/third_party/piexif/piexif.js rename to tests/wpt/tests/density-size-correction/third_party/piexif/piexif.js diff --git a/tests/wpt/web-platform-tests/deprecation-reporting/META.yml b/tests/wpt/tests/deprecation-reporting/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/deprecation-reporting/META.yml rename to tests/wpt/tests/deprecation-reporting/META.yml diff --git a/tests/wpt/web-platform-tests/deprecation-reporting/idlharness.any.js b/tests/wpt/tests/deprecation-reporting/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/deprecation-reporting/idlharness.any.js rename to tests/wpt/tests/deprecation-reporting/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/device-memory/META.yml b/tests/wpt/tests/device-memory/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/device-memory/META.yml rename to tests/wpt/tests/device-memory/META.yml diff --git a/tests/wpt/web-platform-tests/device-memory/device-memory.https.any.js b/tests/wpt/tests/device-memory/device-memory.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/device-memory/device-memory.https.any.js rename to tests/wpt/tests/device-memory/device-memory.https.any.js diff --git a/tests/wpt/web-platform-tests/device-memory/idlharness.https.any.js b/tests/wpt/tests/device-memory/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/device-memory/idlharness.https.any.js rename to tests/wpt/tests/device-memory/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/direct-sockets/META.yml b/tests/wpt/tests/direct-sockets/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/direct-sockets/META.yml rename to tests/wpt/tests/direct-sockets/META.yml diff --git a/tests/wpt/web-platform-tests/direct-sockets/README.md b/tests/wpt/tests/direct-sockets/README.md similarity index 100% rename from tests/wpt/web-platform-tests/direct-sockets/README.md rename to tests/wpt/tests/direct-sockets/README.md diff --git a/tests/wpt/web-platform-tests/direct-sockets/disabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/direct-sockets/disabled-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/direct-sockets/disabled-by-permissions-policy.https.sub.html rename to tests/wpt/tests/direct-sockets/disabled-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/direct-sockets/disabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/direct-sockets/disabled-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/direct-sockets/disabled-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/direct-sockets/disabled-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/direct-sockets/disabled-by-permissions-policy.js b/tests/wpt/tests/direct-sockets/disabled-by-permissions-policy.js similarity index 100% rename from tests/wpt/web-platform-tests/direct-sockets/disabled-by-permissions-policy.js rename to tests/wpt/tests/direct-sockets/disabled-by-permissions-policy.js diff --git a/tests/wpt/web-platform-tests/direct-sockets/open-securecontext.http.html b/tests/wpt/tests/direct-sockets/open-securecontext.http.html similarity index 100% rename from tests/wpt/web-platform-tests/direct-sockets/open-securecontext.http.html rename to tests/wpt/tests/direct-sockets/open-securecontext.http.html diff --git a/tests/wpt/web-platform-tests/docs/.gitignore b/tests/wpt/tests/docs/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/docs/.gitignore rename to tests/wpt/tests/docs/.gitignore diff --git a/tests/wpt/web-platform-tests/docs/.ruby-version b/tests/wpt/tests/docs/.ruby-version similarity index 100% rename from tests/wpt/web-platform-tests/docs/.ruby-version rename to tests/wpt/tests/docs/.ruby-version diff --git a/tests/wpt/web-platform-tests/docs/Dockerfile b/tests/wpt/tests/docs/Dockerfile similarity index 100% rename from tests/wpt/web-platform-tests/docs/Dockerfile rename to tests/wpt/tests/docs/Dockerfile diff --git a/tests/wpt/web-platform-tests/docs/META.yml b/tests/wpt/tests/docs/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/docs/META.yml rename to tests/wpt/tests/docs/META.yml diff --git a/tests/wpt/web-platform-tests/docs/README.md b/tests/wpt/tests/docs/README.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/README.md rename to tests/wpt/tests/docs/README.md diff --git a/tests/wpt/web-platform-tests/docs/__init__.py b/tests/wpt/tests/docs/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/docs/__init__.py rename to tests/wpt/tests/docs/__init__.py diff --git a/tests/wpt/web-platform-tests/docs/admin/index.md b/tests/wpt/tests/docs/admin/index.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/admin/index.md rename to tests/wpt/tests/docs/admin/index.md diff --git a/tests/wpt/web-platform-tests/docs/admin/pywebsocket3.rst b/tests/wpt/tests/docs/admin/pywebsocket3.rst similarity index 100% rename from tests/wpt/web-platform-tests/docs/admin/pywebsocket3.rst rename to tests/wpt/tests/docs/admin/pywebsocket3.rst diff --git a/tests/wpt/web-platform-tests/docs/assets/commit-directly.png b/tests/wpt/tests/docs/assets/commit-directly.png similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/commit-directly.png rename to tests/wpt/tests/docs/assets/commit-directly.png diff --git a/tests/wpt/web-platform-tests/docs/assets/commitbtn.png b/tests/wpt/tests/docs/assets/commitbtn.png similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/commitbtn.png rename to tests/wpt/tests/docs/assets/commitbtn.png diff --git a/tests/wpt/web-platform-tests/docs/assets/createpr.png b/tests/wpt/tests/docs/assets/createpr.png similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/createpr.png rename to tests/wpt/tests/docs/assets/createpr.png diff --git a/tests/wpt/web-platform-tests/docs/assets/custom.css b/tests/wpt/tests/docs/assets/custom.css similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/custom.css rename to tests/wpt/tests/docs/assets/custom.css diff --git a/tests/wpt/web-platform-tests/docs/assets/files-changed.png b/tests/wpt/tests/docs/assets/files-changed.png similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/files-changed.png rename to tests/wpt/tests/docs/assets/files-changed.png diff --git a/tests/wpt/web-platform-tests/docs/assets/forkbtn.png b/tests/wpt/tests/docs/assets/forkbtn.png similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/forkbtn.png rename to tests/wpt/tests/docs/assets/forkbtn.png diff --git a/tests/wpt/web-platform-tests/docs/assets/gh-fork-ribbon.scss b/tests/wpt/tests/docs/assets/gh-fork-ribbon.scss similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/gh-fork-ribbon.scss rename to tests/wpt/tests/docs/assets/gh-fork-ribbon.scss diff --git a/tests/wpt/web-platform-tests/docs/assets/more-commits.png b/tests/wpt/tests/docs/assets/more-commits.png similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/more-commits.png rename to tests/wpt/tests/docs/assets/more-commits.png diff --git a/tests/wpt/web-platform-tests/docs/assets/pencil-icon.png b/tests/wpt/tests/docs/assets/pencil-icon.png similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/pencil-icon.png rename to tests/wpt/tests/docs/assets/pencil-icon.png diff --git a/tests/wpt/web-platform-tests/docs/assets/praccepteddelete.png b/tests/wpt/tests/docs/assets/praccepteddelete.png similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/praccepteddelete.png rename to tests/wpt/tests/docs/assets/praccepteddelete.png diff --git a/tests/wpt/web-platform-tests/docs/assets/pullrequestbtn.png b/tests/wpt/tests/docs/assets/pullrequestbtn.png similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/pullrequestbtn.png rename to tests/wpt/tests/docs/assets/pullrequestbtn.png diff --git a/tests/wpt/web-platform-tests/docs/assets/reftest-tutorial-test-screenshot.png b/tests/wpt/tests/docs/assets/reftest-tutorial-test-screenshot.png similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/reftest-tutorial-test-screenshot.png rename to tests/wpt/tests/docs/assets/reftest-tutorial-test-screenshot.png diff --git a/tests/wpt/web-platform-tests/docs/assets/testharness-tutorial-test-screenshot-1.png b/tests/wpt/tests/docs/assets/testharness-tutorial-test-screenshot-1.png similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/testharness-tutorial-test-screenshot-1.png rename to tests/wpt/tests/docs/assets/testharness-tutorial-test-screenshot-1.png diff --git a/tests/wpt/web-platform-tests/docs/assets/testharness-tutorial-test-screenshot-2.png b/tests/wpt/tests/docs/assets/testharness-tutorial-test-screenshot-2.png similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/testharness-tutorial-test-screenshot-2.png rename to tests/wpt/tests/docs/assets/testharness-tutorial-test-screenshot-2.png diff --git a/tests/wpt/web-platform-tests/docs/assets/web-platform.png b/tests/wpt/tests/docs/assets/web-platform.png similarity index 100% rename from tests/wpt/web-platform-tests/docs/assets/web-platform.png rename to tests/wpt/tests/docs/assets/web-platform.png diff --git a/tests/wpt/web-platform-tests/docs/commands.json b/tests/wpt/tests/docs/commands.json similarity index 100% rename from tests/wpt/web-platform-tests/docs/commands.json rename to tests/wpt/tests/docs/commands.json diff --git a/tests/wpt/web-platform-tests/docs/conf.py b/tests/wpt/tests/docs/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/docs/conf.py rename to tests/wpt/tests/docs/conf.py diff --git a/tests/wpt/web-platform-tests/docs/frontend.py b/tests/wpt/tests/docs/frontend.py similarity index 100% rename from tests/wpt/web-platform-tests/docs/frontend.py rename to tests/wpt/tests/docs/frontend.py diff --git a/tests/wpt/web-platform-tests/docs/index.md b/tests/wpt/tests/docs/index.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/index.md rename to tests/wpt/tests/docs/index.md diff --git a/tests/wpt/web-platform-tests/docs/intro-video-transcript.md b/tests/wpt/tests/docs/intro-video-transcript.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/intro-video-transcript.md rename to tests/wpt/tests/docs/intro-video-transcript.md diff --git a/tests/wpt/web-platform-tests/docs/package.json b/tests/wpt/tests/docs/package.json similarity index 100% rename from tests/wpt/web-platform-tests/docs/package.json rename to tests/wpt/tests/docs/package.json diff --git a/tests/wpt/web-platform-tests/docs/requirements.txt b/tests/wpt/tests/docs/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/docs/requirements.txt rename to tests/wpt/tests/docs/requirements.txt diff --git a/tests/wpt/web-platform-tests/docs/reviewing-tests/checklist.md b/tests/wpt/tests/docs/reviewing-tests/checklist.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/reviewing-tests/checklist.md rename to tests/wpt/tests/docs/reviewing-tests/checklist.md diff --git a/tests/wpt/web-platform-tests/docs/reviewing-tests/email.md b/tests/wpt/tests/docs/reviewing-tests/email.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/reviewing-tests/email.md rename to tests/wpt/tests/docs/reviewing-tests/email.md diff --git a/tests/wpt/web-platform-tests/docs/reviewing-tests/git.md b/tests/wpt/tests/docs/reviewing-tests/git.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/reviewing-tests/git.md rename to tests/wpt/tests/docs/reviewing-tests/git.md diff --git a/tests/wpt/web-platform-tests/docs/reviewing-tests/index.md b/tests/wpt/tests/docs/reviewing-tests/index.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/reviewing-tests/index.md rename to tests/wpt/tests/docs/reviewing-tests/index.md diff --git a/tests/wpt/web-platform-tests/docs/reviewing-tests/reverting.md b/tests/wpt/tests/docs/reviewing-tests/reverting.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/reviewing-tests/reverting.md rename to tests/wpt/tests/docs/reviewing-tests/reverting.md diff --git a/tests/wpt/web-platform-tests/docs/running-tests/android_webview.md b/tests/wpt/tests/docs/running-tests/android_webview.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/running-tests/android_webview.md rename to tests/wpt/tests/docs/running-tests/android_webview.md diff --git a/tests/wpt/web-platform-tests/docs/running-tests/chrome-chromium-installation-detection.md b/tests/wpt/tests/docs/running-tests/chrome-chromium-installation-detection.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/running-tests/chrome-chromium-installation-detection.md rename to tests/wpt/tests/docs/running-tests/chrome-chromium-installation-detection.md diff --git a/tests/wpt/web-platform-tests/docs/running-tests/chrome.md b/tests/wpt/tests/docs/running-tests/chrome.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/running-tests/chrome.md rename to tests/wpt/tests/docs/running-tests/chrome.md diff --git a/tests/wpt/web-platform-tests/docs/running-tests/chrome_android.md b/tests/wpt/tests/docs/running-tests/chrome_android.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/running-tests/chrome_android.md rename to tests/wpt/tests/docs/running-tests/chrome_android.md diff --git a/tests/wpt/web-platform-tests/docs/running-tests/command-line-arguments.md b/tests/wpt/tests/docs/running-tests/command-line-arguments.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/running-tests/command-line-arguments.md rename to tests/wpt/tests/docs/running-tests/command-line-arguments.md diff --git a/tests/wpt/web-platform-tests/docs/running-tests/custom-runner.md b/tests/wpt/tests/docs/running-tests/custom-runner.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/running-tests/custom-runner.md rename to tests/wpt/tests/docs/running-tests/custom-runner.md diff --git a/tests/wpt/web-platform-tests/docs/running-tests/from-ci.md b/tests/wpt/tests/docs/running-tests/from-ci.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/running-tests/from-ci.md rename to tests/wpt/tests/docs/running-tests/from-ci.md diff --git a/tests/wpt/web-platform-tests/docs/running-tests/from-local-system.md b/tests/wpt/tests/docs/running-tests/from-local-system.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/running-tests/from-local-system.md rename to tests/wpt/tests/docs/running-tests/from-local-system.md diff --git a/tests/wpt/web-platform-tests/docs/running-tests/from-web.md b/tests/wpt/tests/docs/running-tests/from-web.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/running-tests/from-web.md rename to tests/wpt/tests/docs/running-tests/from-web.md diff --git a/tests/wpt/web-platform-tests/docs/running-tests/index.md b/tests/wpt/tests/docs/running-tests/index.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/running-tests/index.md rename to tests/wpt/tests/docs/running-tests/index.md diff --git a/tests/wpt/web-platform-tests/docs/running-tests/safari.md b/tests/wpt/tests/docs/running-tests/safari.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/running-tests/safari.md rename to tests/wpt/tests/docs/running-tests/safari.md diff --git a/tests/wpt/web-platform-tests/docs/running-tests/testing-polyfills.md b/tests/wpt/tests/docs/running-tests/testing-polyfills.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/running-tests/testing-polyfills.md rename to tests/wpt/tests/docs/running-tests/testing-polyfills.md diff --git a/tests/wpt/web-platform-tests/docs/running-tests/webkitgtk_minibrowser.md b/tests/wpt/tests/docs/running-tests/webkitgtk_minibrowser.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/running-tests/webkitgtk_minibrowser.md rename to tests/wpt/tests/docs/running-tests/webkitgtk_minibrowser.md diff --git a/tests/wpt/web-platform-tests/docs/test-suite-design.md b/tests/wpt/tests/docs/test-suite-design.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/test-suite-design.md rename to tests/wpt/tests/docs/test-suite-design.md diff --git a/tests/wpt/web-platform-tests/docs/wpt_lint_rules.py b/tests/wpt/tests/docs/wpt_lint_rules.py similarity index 100% rename from tests/wpt/web-platform-tests/docs/wpt_lint_rules.py rename to tests/wpt/tests/docs/wpt_lint_rules.py diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/ahem.md b/tests/wpt/tests/docs/writing-tests/ahem.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/ahem.md rename to tests/wpt/tests/docs/writing-tests/ahem.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/assumptions.md b/tests/wpt/tests/docs/writing-tests/assumptions.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/assumptions.md rename to tests/wpt/tests/docs/writing-tests/assumptions.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/channels.md b/tests/wpt/tests/docs/writing-tests/channels.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/channels.md rename to tests/wpt/tests/docs/writing-tests/channels.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/crashtest.md b/tests/wpt/tests/docs/writing-tests/crashtest.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/crashtest.md rename to tests/wpt/tests/docs/writing-tests/crashtest.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/css-metadata.md b/tests/wpt/tests/docs/writing-tests/css-metadata.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/css-metadata.md rename to tests/wpt/tests/docs/writing-tests/css-metadata.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/css-user-styles.md b/tests/wpt/tests/docs/writing-tests/css-user-styles.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/css-user-styles.md rename to tests/wpt/tests/docs/writing-tests/css-user-styles.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/file-names.md b/tests/wpt/tests/docs/writing-tests/file-names.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/file-names.md rename to tests/wpt/tests/docs/writing-tests/file-names.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/general-guidelines.md b/tests/wpt/tests/docs/writing-tests/general-guidelines.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/general-guidelines.md rename to tests/wpt/tests/docs/writing-tests/general-guidelines.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/github-intro.md b/tests/wpt/tests/docs/writing-tests/github-intro.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/github-intro.md rename to tests/wpt/tests/docs/writing-tests/github-intro.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/h2tests.md b/tests/wpt/tests/docs/writing-tests/h2tests.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/h2tests.md rename to tests/wpt/tests/docs/writing-tests/h2tests.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/idlharness.md b/tests/wpt/tests/docs/writing-tests/idlharness.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/idlharness.md rename to tests/wpt/tests/docs/writing-tests/idlharness.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/index.md b/tests/wpt/tests/docs/writing-tests/index.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/index.md rename to tests/wpt/tests/docs/writing-tests/index.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/interacting-features.md b/tests/wpt/tests/docs/writing-tests/interacting-features.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/interacting-features.md rename to tests/wpt/tests/docs/writing-tests/interacting-features.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/lint-tool.md b/tests/wpt/tests/docs/writing-tests/lint-tool.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/lint-tool.md rename to tests/wpt/tests/docs/writing-tests/lint-tool.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/making-a-testing-plan.md b/tests/wpt/tests/docs/writing-tests/making-a-testing-plan.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/making-a-testing-plan.md rename to tests/wpt/tests/docs/writing-tests/making-a-testing-plan.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/manual.md b/tests/wpt/tests/docs/writing-tests/manual.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/manual.md rename to tests/wpt/tests/docs/writing-tests/manual.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/print-reftests.md b/tests/wpt/tests/docs/writing-tests/print-reftests.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/print-reftests.md rename to tests/wpt/tests/docs/writing-tests/print-reftests.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/python-handlers/index.md b/tests/wpt/tests/docs/writing-tests/python-handlers/index.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/python-handlers/index.md rename to tests/wpt/tests/docs/writing-tests/python-handlers/index.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/reftest-tutorial.md b/tests/wpt/tests/docs/writing-tests/reftest-tutorial.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/reftest-tutorial.md rename to tests/wpt/tests/docs/writing-tests/reftest-tutorial.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/reftests.md b/tests/wpt/tests/docs/writing-tests/reftests.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/reftests.md rename to tests/wpt/tests/docs/writing-tests/reftests.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/rendering.md b/tests/wpt/tests/docs/writing-tests/rendering.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/rendering.md rename to tests/wpt/tests/docs/writing-tests/rendering.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/server-features.md b/tests/wpt/tests/docs/writing-tests/server-features.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/server-features.md rename to tests/wpt/tests/docs/writing-tests/server-features.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/server-pipes.md b/tests/wpt/tests/docs/writing-tests/server-pipes.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/server-pipes.md rename to tests/wpt/tests/docs/writing-tests/server-pipes.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/submission-process.md b/tests/wpt/tests/docs/writing-tests/submission-process.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/submission-process.md rename to tests/wpt/tests/docs/writing-tests/submission-process.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/test-templates.md b/tests/wpt/tests/docs/writing-tests/test-templates.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/test-templates.md rename to tests/wpt/tests/docs/writing-tests/test-templates.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/testdriver-extension-tutorial.md b/tests/wpt/tests/docs/writing-tests/testdriver-extension-tutorial.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/testdriver-extension-tutorial.md rename to tests/wpt/tests/docs/writing-tests/testdriver-extension-tutorial.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/testdriver.md b/tests/wpt/tests/docs/writing-tests/testdriver.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/testdriver.md rename to tests/wpt/tests/docs/writing-tests/testdriver.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md b/tests/wpt/tests/docs/writing-tests/testharness-api.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md rename to tests/wpt/tests/docs/writing-tests/testharness-api.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/testharness-tutorial.md b/tests/wpt/tests/docs/writing-tests/testharness-tutorial.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/testharness-tutorial.md rename to tests/wpt/tests/docs/writing-tests/testharness-tutorial.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/testharness.md b/tests/wpt/tests/docs/writing-tests/testharness.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/testharness.md rename to tests/wpt/tests/docs/writing-tests/testharness.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/tools.md b/tests/wpt/tests/docs/writing-tests/tools.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/tools.md rename to tests/wpt/tests/docs/writing-tests/tools.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/visual.md b/tests/wpt/tests/docs/writing-tests/visual.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/visual.md rename to tests/wpt/tests/docs/writing-tests/visual.md diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/wdspec.md b/tests/wpt/tests/docs/writing-tests/wdspec.md similarity index 100% rename from tests/wpt/web-platform-tests/docs/writing-tests/wdspec.md rename to tests/wpt/tests/docs/writing-tests/wdspec.md diff --git a/tests/wpt/web-platform-tests/document-picture-in-picture/META.yml b/tests/wpt/tests/document-picture-in-picture/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/document-picture-in-picture/META.yml rename to tests/wpt/tests/document-picture-in-picture/META.yml diff --git a/tests/wpt/web-platform-tests/document-picture-in-picture/beforeunload-is-disabled.https.html b/tests/wpt/tests/document-picture-in-picture/beforeunload-is-disabled.https.html similarity index 100% rename from tests/wpt/web-platform-tests/document-picture-in-picture/beforeunload-is-disabled.https.html rename to tests/wpt/tests/document-picture-in-picture/beforeunload-is-disabled.https.html diff --git a/tests/wpt/web-platform-tests/document-picture-in-picture/clears-session-on-close.https.html b/tests/wpt/tests/document-picture-in-picture/clears-session-on-close.https.html similarity index 100% rename from tests/wpt/web-platform-tests/document-picture-in-picture/clears-session-on-close.https.html rename to tests/wpt/tests/document-picture-in-picture/clears-session-on-close.https.html diff --git a/tests/wpt/web-platform-tests/document-picture-in-picture/enter-event.https.html b/tests/wpt/tests/document-picture-in-picture/enter-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/document-picture-in-picture/enter-event.https.html rename to tests/wpt/tests/document-picture-in-picture/enter-event.https.html diff --git a/tests/wpt/web-platform-tests/document-picture-in-picture/iframe-document-pip.https.html b/tests/wpt/tests/document-picture-in-picture/iframe-document-pip.https.html similarity index 100% rename from tests/wpt/web-platform-tests/document-picture-in-picture/iframe-document-pip.https.html rename to tests/wpt/tests/document-picture-in-picture/iframe-document-pip.https.html diff --git a/tests/wpt/web-platform-tests/document-picture-in-picture/open-pip-window-from-pip-window.https.html b/tests/wpt/tests/document-picture-in-picture/open-pip-window-from-pip-window.https.html similarity index 100% rename from tests/wpt/web-platform-tests/document-picture-in-picture/open-pip-window-from-pip-window.https.html rename to tests/wpt/tests/document-picture-in-picture/open-pip-window-from-pip-window.https.html diff --git a/tests/wpt/web-platform-tests/document-picture-in-picture/requires-secure-context.html b/tests/wpt/tests/document-picture-in-picture/requires-secure-context.html similarity index 100% rename from tests/wpt/web-platform-tests/document-picture-in-picture/requires-secure-context.html rename to tests/wpt/tests/document-picture-in-picture/requires-secure-context.html diff --git a/tests/wpt/web-platform-tests/document-picture-in-picture/requires-user-gesture.https.html b/tests/wpt/tests/document-picture-in-picture/requires-user-gesture.https.html similarity index 100% rename from tests/wpt/web-platform-tests/document-picture-in-picture/requires-user-gesture.https.html rename to tests/wpt/tests/document-picture-in-picture/requires-user-gesture.https.html diff --git a/tests/wpt/web-platform-tests/document-picture-in-picture/requires-width-and-height-to-both-be-specified.https.html b/tests/wpt/tests/document-picture-in-picture/requires-width-and-height-to-both-be-specified.https.html similarity index 100% rename from tests/wpt/web-platform-tests/document-picture-in-picture/requires-width-and-height-to-both-be-specified.https.html rename to tests/wpt/tests/document-picture-in-picture/requires-width-and-height-to-both-be-specified.https.html diff --git a/tests/wpt/web-platform-tests/document-picture-in-picture/returns-window-with-document.https.html b/tests/wpt/tests/document-picture-in-picture/returns-window-with-document.https.html similarity index 100% rename from tests/wpt/web-platform-tests/document-picture-in-picture/returns-window-with-document.https.html rename to tests/wpt/tests/document-picture-in-picture/returns-window-with-document.https.html diff --git a/tests/wpt/web-platform-tests/document-policy/META.yml b/tests/wpt/tests/document-policy/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/META.yml rename to tests/wpt/tests/document-policy/META.yml diff --git a/tests/wpt/web-platform-tests/document-policy/echo-policy-nested.html b/tests/wpt/tests/document-policy/echo-policy-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/echo-policy-nested.html rename to tests/wpt/tests/document-policy/echo-policy-nested.html diff --git a/tests/wpt/web-platform-tests/document-policy/echo-policy-nested.html.headers b/tests/wpt/tests/document-policy/echo-policy-nested.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/echo-policy-nested.html.headers rename to tests/wpt/tests/document-policy/echo-policy-nested.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/echo-policy.py b/tests/wpt/tests/document-policy/echo-policy.py similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/echo-policy.py rename to tests/wpt/tests/document-policy/echo-policy.py diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/document-write.tentative.html b/tests/wpt/tests/document-policy/experimental-features/document-write.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/document-write.tentative.html rename to tests/wpt/tests/document-policy/experimental-features/document-write.tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/layout-animations-disabled-tentative.html b/tests/wpt/tests/document-policy/experimental-features/layout-animations-disabled-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/layout-animations-disabled-tentative.html rename to tests/wpt/tests/document-policy/experimental-features/layout-animations-disabled-tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/layout-animations-disabled-tentative.html.headers b/tests/wpt/tests/document-policy/experimental-features/layout-animations-disabled-tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/layout-animations-disabled-tentative.html.headers rename to tests/wpt/tests/document-policy/experimental-features/layout-animations-disabled-tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/layout-animations-disabled-violation-report-js-tentative.html b/tests/wpt/tests/document-policy/experimental-features/layout-animations-disabled-violation-report-js-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/layout-animations-disabled-violation-report-js-tentative.html rename to tests/wpt/tests/document-policy/experimental-features/layout-animations-disabled-violation-report-js-tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/layout-animations-disabled-violation-report-js-tentative.html.headers b/tests/wpt/tests/document-policy/experimental-features/layout-animations-disabled-violation-report-js-tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/layout-animations-disabled-violation-report-js-tentative.html.headers rename to tests/wpt/tests/document-policy/experimental-features/layout-animations-disabled-violation-report-js-tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/layout-animations-disabled-violation-report-keyframes-tentative.html b/tests/wpt/tests/document-policy/experimental-features/layout-animations-disabled-violation-report-keyframes-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/layout-animations-disabled-violation-report-keyframes-tentative.html rename to tests/wpt/tests/document-policy/experimental-features/layout-animations-disabled-violation-report-keyframes-tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/layout-animations-disabled-violation-report-keyframes-tentative.html.headers b/tests/wpt/tests/document-policy/experimental-features/layout-animations-disabled-violation-report-keyframes-tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/layout-animations-disabled-violation-report-keyframes-tentative.html.headers rename to tests/wpt/tests/document-policy/experimental-features/layout-animations-disabled-violation-report-keyframes-tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/layout-animations-enabled-tentative.html b/tests/wpt/tests/document-policy/experimental-features/layout-animations-enabled-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/layout-animations-enabled-tentative.html rename to tests/wpt/tests/document-policy/experimental-features/layout-animations-enabled-tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/animation-property-height.js b/tests/wpt/tests/document-policy/experimental-features/resources/animation-property-height.js similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/resources/animation-property-height.js rename to tests/wpt/tests/document-policy/experimental-features/resources/animation-property-height.js diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/async-script.js b/tests/wpt/tests/document-policy/experimental-features/resources/async-script.js similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/resources/async-script.js rename to tests/wpt/tests/document-policy/experimental-features/resources/async-script.js diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/common.js b/tests/wpt/tests/document-policy/experimental-features/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/resources/common.js rename to tests/wpt/tests/document-policy/experimental-features/resources/common.js diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/defer-script.js b/tests/wpt/tests/document-policy/experimental-features/resources/defer-script.js similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/resources/defer-script.js rename to tests/wpt/tests/document-policy/experimental-features/resources/defer-script.js diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-policy-image.html b/tests/wpt/tests/document-policy/experimental-features/resources/document-policy-image.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-policy-image.html rename to tests/wpt/tests/document-policy/experimental-features/resources/document-policy-image.html diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-allowed.html b/tests/wpt/tests/document-policy/experimental-features/resources/document-write-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-allowed.html rename to tests/wpt/tests/document-policy/experimental-features/resources/document-write-allowed.html diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-disallowed.html b/tests/wpt/tests/document-policy/experimental-features/resources/document-write-disallowed.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-disallowed.html rename to tests/wpt/tests/document-policy/experimental-features/resources/document-write-disallowed.html diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-disallowed.html.headers b/tests/wpt/tests/document-policy/experimental-features/resources/document-write-disallowed.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-disallowed.html.headers rename to tests/wpt/tests/document-policy/experimental-features/resources/document-write-disallowed.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/image.jpg b/tests/wpt/tests/document-policy/experimental-features/resources/image.jpg similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/resources/image.jpg rename to tests/wpt/tests/document-policy/experimental-features/resources/image.jpg diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/image.png b/tests/wpt/tests/document-policy/experimental-features/resources/image.png similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/resources/image.png rename to tests/wpt/tests/document-policy/experimental-features/resources/image.png diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/image.svg b/tests/wpt/tests/document-policy/experimental-features/resources/image.svg similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/resources/image.svg rename to tests/wpt/tests/document-policy/experimental-features/resources/image.svg diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/parser-blocking-script.js b/tests/wpt/tests/document-policy/experimental-features/resources/parser-blocking-script.js similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/resources/parser-blocking-script.js rename to tests/wpt/tests/document-policy/experimental-features/resources/parser-blocking-script.js diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/sync-script-test.js b/tests/wpt/tests/document-policy/experimental-features/resources/sync-script-test.js similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/resources/sync-script-test.js rename to tests/wpt/tests/document-policy/experimental-features/resources/sync-script-test.js diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/video.ogv b/tests/wpt/tests/document-policy/experimental-features/resources/video.ogv similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/resources/video.ogv rename to tests/wpt/tests/document-policy/experimental-features/resources/video.ogv diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/sync-script.tentative.https.sub.html b/tests/wpt/tests/document-policy/experimental-features/sync-script.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/sync-script.tentative.https.sub.html rename to tests/wpt/tests/document-policy/experimental-features/sync-script.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/sync-script.tentative.https.sub.html.headers b/tests/wpt/tests/document-policy/experimental-features/sync-script.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/sync-script.tentative.https.sub.html.headers rename to tests/wpt/tests/document-policy/experimental-features/sync-script.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/unsized-media.tentative.https.sub.html b/tests/wpt/tests/document-policy/experimental-features/unsized-media.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/unsized-media.tentative.https.sub.html rename to tests/wpt/tests/document-policy/experimental-features/unsized-media.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/unsized-media.tentative.https.sub.html.headers b/tests/wpt/tests/document-policy/experimental-features/unsized-media.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/experimental-features/unsized-media.tentative.https.sub.html.headers rename to tests/wpt/tests/document-policy/experimental-features/unsized-media.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/override-to-optional.tentative-ref.html b/tests/wpt/tests/document-policy/font-display/override-to-optional.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/override-to-optional.tentative-ref.html rename to tests/wpt/tests/document-policy/font-display/override-to-optional.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/override-to-optional.tentative.html b/tests/wpt/tests/document-policy/font-display/override-to-optional.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/override-to-optional.tentative.html rename to tests/wpt/tests/document-policy/font-display/override-to-optional.tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/override-to-optional.tentative.html.headers b/tests/wpt/tests/document-policy/font-display/override-to-optional.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/override-to-optional.tentative.html.headers rename to tests/wpt/tests/document-policy/font-display/override-to-optional.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/report-only-auto.tentative.html b/tests/wpt/tests/document-policy/font-display/report-only-auto.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/report-only-auto.tentative.html rename to tests/wpt/tests/document-policy/font-display/report-only-auto.tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/report-only-auto.tentative.html.headers b/tests/wpt/tests/document-policy/font-display/report-only-auto.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/report-only-auto.tentative.html.headers rename to tests/wpt/tests/document-policy/font-display/report-only-auto.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/report-only-blank.tentative.html b/tests/wpt/tests/document-policy/font-display/report-only-blank.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/report-only-blank.tentative.html rename to tests/wpt/tests/document-policy/font-display/report-only-blank.tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/report-only-blank.tentative.html.headers b/tests/wpt/tests/document-policy/font-display/report-only-blank.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/report-only-blank.tentative.html.headers rename to tests/wpt/tests/document-policy/font-display/report-only-blank.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/report-only-block.tentative.html b/tests/wpt/tests/document-policy/font-display/report-only-block.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/report-only-block.tentative.html rename to tests/wpt/tests/document-policy/font-display/report-only-block.tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/report-only-block.tentative.html.headers b/tests/wpt/tests/document-policy/font-display/report-only-block.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/report-only-block.tentative.html.headers rename to tests/wpt/tests/document-policy/font-display/report-only-block.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/report-only-fallback.tentative.html b/tests/wpt/tests/document-policy/font-display/report-only-fallback.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/report-only-fallback.tentative.html rename to tests/wpt/tests/document-policy/font-display/report-only-fallback.tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/report-only-fallback.tentative.html.headers b/tests/wpt/tests/document-policy/font-display/report-only-fallback.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/report-only-fallback.tentative.html.headers rename to tests/wpt/tests/document-policy/font-display/report-only-fallback.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/report-only-optional.tentative.html b/tests/wpt/tests/document-policy/font-display/report-only-optional.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/report-only-optional.tentative.html rename to tests/wpt/tests/document-policy/font-display/report-only-optional.tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/report-only-optional.tentative.html.headers b/tests/wpt/tests/document-policy/font-display/report-only-optional.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/report-only-optional.tentative.html.headers rename to tests/wpt/tests/document-policy/font-display/report-only-optional.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/report-only-swap.tentative.html b/tests/wpt/tests/document-policy/font-display/report-only-swap.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/report-only-swap.tentative.html rename to tests/wpt/tests/document-policy/font-display/report-only-swap.tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/report-only-swap.tentative.html.headers b/tests/wpt/tests/document-policy/font-display/report-only-swap.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/report-only-swap.tentative.html.headers rename to tests/wpt/tests/document-policy/font-display/report-only-swap.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/reporting-auto.tentative.html b/tests/wpt/tests/document-policy/font-display/reporting-auto.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/reporting-auto.tentative.html rename to tests/wpt/tests/document-policy/font-display/reporting-auto.tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/reporting-auto.tentative.html.headers b/tests/wpt/tests/document-policy/font-display/reporting-auto.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/reporting-auto.tentative.html.headers rename to tests/wpt/tests/document-policy/font-display/reporting-auto.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/reporting-blank.tentative.html b/tests/wpt/tests/document-policy/font-display/reporting-blank.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/reporting-blank.tentative.html rename to tests/wpt/tests/document-policy/font-display/reporting-blank.tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/reporting-blank.tentative.html.headers b/tests/wpt/tests/document-policy/font-display/reporting-blank.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/reporting-blank.tentative.html.headers rename to tests/wpt/tests/document-policy/font-display/reporting-blank.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/reporting-block.tentative.html b/tests/wpt/tests/document-policy/font-display/reporting-block.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/reporting-block.tentative.html rename to tests/wpt/tests/document-policy/font-display/reporting-block.tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/reporting-block.tentative.html.headers b/tests/wpt/tests/document-policy/font-display/reporting-block.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/reporting-block.tentative.html.headers rename to tests/wpt/tests/document-policy/font-display/reporting-block.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/reporting-fallback.tentative.html b/tests/wpt/tests/document-policy/font-display/reporting-fallback.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/reporting-fallback.tentative.html rename to tests/wpt/tests/document-policy/font-display/reporting-fallback.tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/reporting-fallback.tentative.html.headers b/tests/wpt/tests/document-policy/font-display/reporting-fallback.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/reporting-fallback.tentative.html.headers rename to tests/wpt/tests/document-policy/font-display/reporting-fallback.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/reporting-optional.tentative.html b/tests/wpt/tests/document-policy/font-display/reporting-optional.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/reporting-optional.tentative.html rename to tests/wpt/tests/document-policy/font-display/reporting-optional.tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/reporting-optional.tentative.html.headers b/tests/wpt/tests/document-policy/font-display/reporting-optional.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/reporting-optional.tentative.html.headers rename to tests/wpt/tests/document-policy/font-display/reporting-optional.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/reporting-swap.tentative.html b/tests/wpt/tests/document-policy/font-display/reporting-swap.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/reporting-swap.tentative.html rename to tests/wpt/tests/document-policy/font-display/reporting-swap.tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/reporting-swap.tentative.html.headers b/tests/wpt/tests/document-policy/font-display/reporting-swap.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/reporting-swap.tentative.html.headers rename to tests/wpt/tests/document-policy/font-display/reporting-swap.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/font-display/resources/font-display-reporting-helper.js b/tests/wpt/tests/document-policy/font-display/resources/font-display-reporting-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/font-display/resources/font-display-reporting-helper.js rename to tests/wpt/tests/document-policy/font-display/resources/font-display-reporting-helper.js diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/document-write-report-only-tentative.html b/tests/wpt/tests/document-policy/reporting/document-write-report-only-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/document-write-report-only-tentative.html rename to tests/wpt/tests/document-policy/reporting/document-write-report-only-tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/document-write-report-only-tentative.html.headers b/tests/wpt/tests/document-policy/reporting/document-write-report-only-tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/document-write-report-only-tentative.html.headers rename to tests/wpt/tests/document-policy/reporting/document-write-report-only-tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/document-write-reporting-tentative.html b/tests/wpt/tests/document-policy/reporting/document-write-reporting-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/document-write-reporting-tentative.html rename to tests/wpt/tests/document-policy/reporting/document-write-reporting-tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/document-write-reporting-tentative.html.headers b/tests/wpt/tests/document-policy/reporting/document-write-reporting-tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/document-write-reporting-tentative.html.headers rename to tests/wpt/tests/document-policy/reporting/document-write-reporting-tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/image.jpg b/tests/wpt/tests/document-policy/reporting/image.jpg similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/image.jpg rename to tests/wpt/tests/document-policy/reporting/image.jpg diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html b/tests/wpt/tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html rename to tests/wpt/tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html.headers b/tests/wpt/tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html.headers rename to tests/wpt/tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html b/tests/wpt/tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html rename to tests/wpt/tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html.headers b/tests/wpt/tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html.headers rename to tests/wpt/tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/oversized-images-reporting-tentative.html b/tests/wpt/tests/document-policy/reporting/oversized-images-reporting-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/oversized-images-reporting-tentative.html rename to tests/wpt/tests/document-policy/reporting/oversized-images-reporting-tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/oversized-images-reporting-tentative.html.headers b/tests/wpt/tests/document-policy/reporting/oversized-images-reporting-tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/oversized-images-reporting-tentative.html.headers rename to tests/wpt/tests/document-policy/reporting/oversized-images-reporting-tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/oversized.jpg b/tests/wpt/tests/document-policy/reporting/oversized.jpg similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/oversized.jpg rename to tests/wpt/tests/document-policy/reporting/oversized.jpg diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/resources/sync-script.js b/tests/wpt/tests/document-policy/reporting/resources/sync-script.js similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/resources/sync-script.js rename to tests/wpt/tests/document-policy/reporting/resources/sync-script.js diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/sync-script-reporting.html b/tests/wpt/tests/document-policy/reporting/sync-script-reporting.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/sync-script-reporting.html rename to tests/wpt/tests/document-policy/reporting/sync-script-reporting.html diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/sync-script-reporting.html.headers b/tests/wpt/tests/document-policy/reporting/sync-script-reporting.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/sync-script-reporting.html.headers rename to tests/wpt/tests/document-policy/reporting/sync-script-reporting.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/sync-xhr-report-only.html b/tests/wpt/tests/document-policy/reporting/sync-xhr-report-only.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/sync-xhr-report-only.html rename to tests/wpt/tests/document-policy/reporting/sync-xhr-report-only.html diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/sync-xhr-report-only.html.headers b/tests/wpt/tests/document-policy/reporting/sync-xhr-report-only.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/sync-xhr-report-only.html.headers rename to tests/wpt/tests/document-policy/reporting/sync-xhr-report-only.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/sync-xhr-reporting.html b/tests/wpt/tests/document-policy/reporting/sync-xhr-reporting.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/sync-xhr-reporting.html rename to tests/wpt/tests/document-policy/reporting/sync-xhr-reporting.html diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/sync-xhr-reporting.html.headers b/tests/wpt/tests/document-policy/reporting/sync-xhr-reporting.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/sync-xhr-reporting.html.headers rename to tests/wpt/tests/document-policy/reporting/sync-xhr-reporting.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-image.jpg b/tests/wpt/tests/document-policy/reporting/unoptimized-image.jpg similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-image.jpg rename to tests/wpt/tests/document-policy/reporting/unoptimized-image.jpg diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/unsized-media-reporting-tentative.html b/tests/wpt/tests/document-policy/reporting/unsized-media-reporting-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/unsized-media-reporting-tentative.html rename to tests/wpt/tests/document-policy/reporting/unsized-media-reporting-tentative.html diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/unsized-media-reporting-tentative.html.headers b/tests/wpt/tests/document-policy/reporting/unsized-media-reporting-tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/reporting/unsized-media-reporting-tentative.html.headers rename to tests/wpt/tests/document-policy/reporting/unsized-media-reporting-tentative.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/document-policy.html b/tests/wpt/tests/document-policy/required-policy/document-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/required-policy/document-policy.html rename to tests/wpt/tests/document-policy/required-policy/document-policy.html diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/document-policy.html.headers b/tests/wpt/tests/document-policy/required-policy/document-policy.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/required-policy/document-policy.html.headers rename to tests/wpt/tests/document-policy/required-policy/document-policy.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/no-document-policy.html b/tests/wpt/tests/document-policy/required-policy/no-document-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/required-policy/no-document-policy.html rename to tests/wpt/tests/document-policy/required-policy/no-document-policy.html diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy-nested.html b/tests/wpt/tests/document-policy/required-policy/required-document-policy-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy-nested.html rename to tests/wpt/tests/document-policy/required-policy/required-document-policy-nested.html diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy.html b/tests/wpt/tests/document-policy/required-policy/required-document-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy.html rename to tests/wpt/tests/document-policy/required-policy/required-document-policy.html diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy.html.headers b/tests/wpt/tests/document-policy/required-policy/required-document-policy.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy.html.headers rename to tests/wpt/tests/document-policy/required-policy/required-document-policy.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/separate-document-policies.html b/tests/wpt/tests/document-policy/required-policy/separate-document-policies.html similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/required-policy/separate-document-policies.html rename to tests/wpt/tests/document-policy/required-policy/separate-document-policies.html diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/separate-document-policies.html.headers b/tests/wpt/tests/document-policy/required-policy/separate-document-policies.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/required-policy/separate-document-policies.html.headers rename to tests/wpt/tests/document-policy/required-policy/separate-document-policies.html.headers diff --git a/tests/wpt/web-platform-tests/document-policy/resources/document-policy-report-json.js b/tests/wpt/tests/document-policy/resources/document-policy-report-json.js similarity index 100% rename from tests/wpt/web-platform-tests/document-policy/resources/document-policy-report-json.js rename to tests/wpt/tests/document-policy/resources/document-policy-report-json.js diff --git a/tests/wpt/web-platform-tests/dom/META.yml b/tests/wpt/tests/dom/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/dom/META.yml rename to tests/wpt/tests/dom/META.yml diff --git a/tests/wpt/web-platform-tests/dom/abort/AbortSignal.any.js b/tests/wpt/tests/dom/abort/AbortSignal.any.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/abort/AbortSignal.any.js rename to tests/wpt/tests/dom/abort/AbortSignal.any.js diff --git a/tests/wpt/web-platform-tests/dom/abort/abort-signal-any.any.js b/tests/wpt/tests/dom/abort/abort-signal-any.any.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/abort/abort-signal-any.any.js rename to tests/wpt/tests/dom/abort/abort-signal-any.any.js diff --git a/tests/wpt/web-platform-tests/dom/abort/abort-signal-timeout.html b/tests/wpt/tests/dom/abort/abort-signal-timeout.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/abort/abort-signal-timeout.html rename to tests/wpt/tests/dom/abort/abort-signal-timeout.html diff --git a/tests/wpt/web-platform-tests/dom/abort/crashtests/timeout-close.html b/tests/wpt/tests/dom/abort/crashtests/timeout-close.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/abort/crashtests/timeout-close.html rename to tests/wpt/tests/dom/abort/crashtests/timeout-close.html diff --git a/tests/wpt/web-platform-tests/dom/abort/event.any.js b/tests/wpt/tests/dom/abort/event.any.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/abort/event.any.js rename to tests/wpt/tests/dom/abort/event.any.js diff --git a/tests/wpt/web-platform-tests/dom/abort/reason-constructor.html b/tests/wpt/tests/dom/abort/reason-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/abort/reason-constructor.html rename to tests/wpt/tests/dom/abort/reason-constructor.html diff --git a/tests/wpt/web-platform-tests/dom/abort/resources/abort-signal-any-tests.js b/tests/wpt/tests/dom/abort/resources/abort-signal-any-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/abort/resources/abort-signal-any-tests.js rename to tests/wpt/tests/dom/abort/resources/abort-signal-any-tests.js diff --git a/tests/wpt/web-platform-tests/dom/attributes-are-nodes.html b/tests/wpt/tests/dom/attributes-are-nodes.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/attributes-are-nodes.html rename to tests/wpt/tests/dom/attributes-are-nodes.html diff --git a/tests/wpt/web-platform-tests/dom/collections/HTMLCollection-as-prototype.html b/tests/wpt/tests/dom/collections/HTMLCollection-as-prototype.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/collections/HTMLCollection-as-prototype.html rename to tests/wpt/tests/dom/collections/HTMLCollection-as-prototype.html diff --git a/tests/wpt/web-platform-tests/dom/collections/HTMLCollection-delete.html b/tests/wpt/tests/dom/collections/HTMLCollection-delete.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/collections/HTMLCollection-delete.html rename to tests/wpt/tests/dom/collections/HTMLCollection-delete.html diff --git a/tests/wpt/web-platform-tests/dom/collections/HTMLCollection-empty-name.html b/tests/wpt/tests/dom/collections/HTMLCollection-empty-name.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/collections/HTMLCollection-empty-name.html rename to tests/wpt/tests/dom/collections/HTMLCollection-empty-name.html diff --git a/tests/wpt/web-platform-tests/dom/collections/HTMLCollection-iterator.html b/tests/wpt/tests/dom/collections/HTMLCollection-iterator.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/collections/HTMLCollection-iterator.html rename to tests/wpt/tests/dom/collections/HTMLCollection-iterator.html diff --git a/tests/wpt/web-platform-tests/dom/collections/HTMLCollection-live-mutations.window.js b/tests/wpt/tests/dom/collections/HTMLCollection-live-mutations.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/collections/HTMLCollection-live-mutations.window.js rename to tests/wpt/tests/dom/collections/HTMLCollection-live-mutations.window.js diff --git a/tests/wpt/web-platform-tests/dom/collections/HTMLCollection-own-props.html b/tests/wpt/tests/dom/collections/HTMLCollection-own-props.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/collections/HTMLCollection-own-props.html rename to tests/wpt/tests/dom/collections/HTMLCollection-own-props.html diff --git a/tests/wpt/web-platform-tests/dom/collections/HTMLCollection-supported-property-indices.html b/tests/wpt/tests/dom/collections/HTMLCollection-supported-property-indices.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/collections/HTMLCollection-supported-property-indices.html rename to tests/wpt/tests/dom/collections/HTMLCollection-supported-property-indices.html diff --git a/tests/wpt/web-platform-tests/dom/collections/HTMLCollection-supported-property-names.html b/tests/wpt/tests/dom/collections/HTMLCollection-supported-property-names.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/collections/HTMLCollection-supported-property-names.html rename to tests/wpt/tests/dom/collections/HTMLCollection-supported-property-names.html diff --git a/tests/wpt/web-platform-tests/dom/collections/domstringmap-supported-property-names.html b/tests/wpt/tests/dom/collections/domstringmap-supported-property-names.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/collections/domstringmap-supported-property-names.html rename to tests/wpt/tests/dom/collections/domstringmap-supported-property-names.html diff --git a/tests/wpt/web-platform-tests/dom/collections/namednodemap-supported-property-names.html b/tests/wpt/tests/dom/collections/namednodemap-supported-property-names.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/collections/namednodemap-supported-property-names.html rename to tests/wpt/tests/dom/collections/namednodemap-supported-property-names.html diff --git a/tests/wpt/web-platform-tests/dom/common.js b/tests/wpt/tests/dom/common.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/common.js rename to tests/wpt/tests/dom/common.js diff --git a/tests/wpt/web-platform-tests/dom/constants.js b/tests/wpt/tests/dom/constants.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/constants.js rename to tests/wpt/tests/dom/constants.js diff --git a/tests/wpt/web-platform-tests/dom/eventPathRemoved.html b/tests/wpt/tests/dom/eventPathRemoved.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/eventPathRemoved.html rename to tests/wpt/tests/dom/eventPathRemoved.html diff --git a/tests/wpt/web-platform-tests/dom/events/AddEventListenerOptions-once.any.js b/tests/wpt/tests/dom/events/AddEventListenerOptions-once.any.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/AddEventListenerOptions-once.any.js rename to tests/wpt/tests/dom/events/AddEventListenerOptions-once.any.js diff --git a/tests/wpt/web-platform-tests/dom/events/AddEventListenerOptions-passive.any.js b/tests/wpt/tests/dom/events/AddEventListenerOptions-passive.any.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/AddEventListenerOptions-passive.any.js rename to tests/wpt/tests/dom/events/AddEventListenerOptions-passive.any.js diff --git a/tests/wpt/web-platform-tests/dom/events/AddEventListenerOptions-signal.any.js b/tests/wpt/tests/dom/events/AddEventListenerOptions-signal.any.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/AddEventListenerOptions-signal.any.js rename to tests/wpt/tests/dom/events/AddEventListenerOptions-signal.any.js diff --git a/tests/wpt/web-platform-tests/dom/events/Body-FrameSet-Event-Handlers.html b/tests/wpt/tests/dom/events/Body-FrameSet-Event-Handlers.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Body-FrameSet-Event-Handlers.html rename to tests/wpt/tests/dom/events/Body-FrameSet-Event-Handlers.html diff --git a/tests/wpt/web-platform-tests/dom/events/CustomEvent.html b/tests/wpt/tests/dom/events/CustomEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/CustomEvent.html rename to tests/wpt/tests/dom/events/CustomEvent.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-cancelBubble.html b/tests/wpt/tests/dom/events/Event-cancelBubble.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-cancelBubble.html rename to tests/wpt/tests/dom/events/Event-cancelBubble.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-constants.html b/tests/wpt/tests/dom/events/Event-constants.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-constants.html rename to tests/wpt/tests/dom/events/Event-constants.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-constructors.any.js b/tests/wpt/tests/dom/events/Event-constructors.any.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-constructors.any.js rename to tests/wpt/tests/dom/events/Event-constructors.any.js diff --git a/tests/wpt/web-platform-tests/dom/events/Event-defaultPrevented-after-dispatch.html b/tests/wpt/tests/dom/events/Event-defaultPrevented-after-dispatch.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-defaultPrevented-after-dispatch.html rename to tests/wpt/tests/dom/events/Event-defaultPrevented-after-dispatch.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-defaultPrevented.html b/tests/wpt/tests/dom/events/Event-defaultPrevented.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-defaultPrevented.html rename to tests/wpt/tests/dom/events/Event-defaultPrevented.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-bubble-canceled.html b/tests/wpt/tests/dom/events/Event-dispatch-bubble-canceled.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-bubble-canceled.html rename to tests/wpt/tests/dom/events/Event-dispatch-bubble-canceled.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-bubbles-false.html b/tests/wpt/tests/dom/events/Event-dispatch-bubbles-false.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-bubbles-false.html rename to tests/wpt/tests/dom/events/Event-dispatch-bubbles-false.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-bubbles-true.html b/tests/wpt/tests/dom/events/Event-dispatch-bubbles-true.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-bubbles-true.html rename to tests/wpt/tests/dom/events/Event-dispatch-bubbles-true.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.html b/tests/wpt/tests/dom/events/Event-dispatch-click.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.html rename to tests/wpt/tests/dom/events/Event-dispatch-click.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.tentative.html b/tests/wpt/tests/dom/events/Event-dispatch-click.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.tentative.html rename to tests/wpt/tests/dom/events/Event-dispatch-click.tentative.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-detached-click.html b/tests/wpt/tests/dom/events/Event-dispatch-detached-click.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-detached-click.html rename to tests/wpt/tests/dom/events/Event-dispatch-detached-click.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-detached-input-and-change.html b/tests/wpt/tests/dom/events/Event-dispatch-detached-input-and-change.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-detached-input-and-change.html rename to tests/wpt/tests/dom/events/Event-dispatch-detached-input-and-change.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-handlers-changed.html b/tests/wpt/tests/dom/events/Event-dispatch-handlers-changed.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-handlers-changed.html rename to tests/wpt/tests/dom/events/Event-dispatch-handlers-changed.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-listener-order.window.js b/tests/wpt/tests/dom/events/Event-dispatch-listener-order.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-listener-order.window.js rename to tests/wpt/tests/dom/events/Event-dispatch-listener-order.window.js diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-multiple-cancelBubble.html b/tests/wpt/tests/dom/events/Event-dispatch-multiple-cancelBubble.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-multiple-cancelBubble.html rename to tests/wpt/tests/dom/events/Event-dispatch-multiple-cancelBubble.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-multiple-stopPropagation.html b/tests/wpt/tests/dom/events/Event-dispatch-multiple-stopPropagation.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-multiple-stopPropagation.html rename to tests/wpt/tests/dom/events/Event-dispatch-multiple-stopPropagation.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-omitted-capture.html b/tests/wpt/tests/dom/events/Event-dispatch-omitted-capture.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-omitted-capture.html rename to tests/wpt/tests/dom/events/Event-dispatch-omitted-capture.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-on-disabled-elements.html b/tests/wpt/tests/dom/events/Event-dispatch-on-disabled-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-on-disabled-elements.html rename to tests/wpt/tests/dom/events/Event-dispatch-on-disabled-elements.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-order-at-target.html b/tests/wpt/tests/dom/events/Event-dispatch-order-at-target.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-order-at-target.html rename to tests/wpt/tests/dom/events/Event-dispatch-order-at-target.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-order.html b/tests/wpt/tests/dom/events/Event-dispatch-order.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-order.html rename to tests/wpt/tests/dom/events/Event-dispatch-order.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-other-document.html b/tests/wpt/tests/dom/events/Event-dispatch-other-document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-other-document.html rename to tests/wpt/tests/dom/events/Event-dispatch-other-document.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-propagation-stopped.html b/tests/wpt/tests/dom/events/Event-dispatch-propagation-stopped.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-propagation-stopped.html rename to tests/wpt/tests/dom/events/Event-dispatch-propagation-stopped.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-redispatch.html b/tests/wpt/tests/dom/events/Event-dispatch-redispatch.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-redispatch.html rename to tests/wpt/tests/dom/events/Event-dispatch-redispatch.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-reenter.html b/tests/wpt/tests/dom/events/Event-dispatch-reenter.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-reenter.html rename to tests/wpt/tests/dom/events/Event-dispatch-reenter.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-target-moved.html b/tests/wpt/tests/dom/events/Event-dispatch-target-moved.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-target-moved.html rename to tests/wpt/tests/dom/events/Event-dispatch-target-moved.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-target-removed.html b/tests/wpt/tests/dom/events/Event-dispatch-target-removed.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-target-removed.html rename to tests/wpt/tests/dom/events/Event-dispatch-target-removed.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-throwing.html b/tests/wpt/tests/dom/events/Event-dispatch-throwing.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-dispatch-throwing.html rename to tests/wpt/tests/dom/events/Event-dispatch-throwing.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-init-while-dispatching.html b/tests/wpt/tests/dom/events/Event-init-while-dispatching.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-init-while-dispatching.html rename to tests/wpt/tests/dom/events/Event-init-while-dispatching.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-initEvent.html b/tests/wpt/tests/dom/events/Event-initEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-initEvent.html rename to tests/wpt/tests/dom/events/Event-initEvent.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-isTrusted.any.js b/tests/wpt/tests/dom/events/Event-isTrusted.any.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-isTrusted.any.js rename to tests/wpt/tests/dom/events/Event-isTrusted.any.js diff --git a/tests/wpt/web-platform-tests/dom/events/Event-propagation.html b/tests/wpt/tests/dom/events/Event-propagation.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-propagation.html rename to tests/wpt/tests/dom/events/Event-propagation.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-returnValue.html b/tests/wpt/tests/dom/events/Event-returnValue.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-returnValue.html rename to tests/wpt/tests/dom/events/Event-returnValue.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-stopImmediatePropagation.html b/tests/wpt/tests/dom/events/Event-stopImmediatePropagation.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-stopImmediatePropagation.html rename to tests/wpt/tests/dom/events/Event-stopImmediatePropagation.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-stopPropagation-cancel-bubbling.html b/tests/wpt/tests/dom/events/Event-stopPropagation-cancel-bubbling.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-stopPropagation-cancel-bubbling.html rename to tests/wpt/tests/dom/events/Event-stopPropagation-cancel-bubbling.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-subclasses-constructors.html b/tests/wpt/tests/dom/events/Event-subclasses-constructors.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-subclasses-constructors.html rename to tests/wpt/tests/dom/events/Event-subclasses-constructors.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-timestamp-cross-realm-getter.html b/tests/wpt/tests/dom/events/Event-timestamp-cross-realm-getter.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-timestamp-cross-realm-getter.html rename to tests/wpt/tests/dom/events/Event-timestamp-cross-realm-getter.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-timestamp-high-resolution.html b/tests/wpt/tests/dom/events/Event-timestamp-high-resolution.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-timestamp-high-resolution.html rename to tests/wpt/tests/dom/events/Event-timestamp-high-resolution.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-timestamp-high-resolution.https.html b/tests/wpt/tests/dom/events/Event-timestamp-high-resolution.https.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-timestamp-high-resolution.https.html rename to tests/wpt/tests/dom/events/Event-timestamp-high-resolution.https.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-timestamp-safe-resolution.html b/tests/wpt/tests/dom/events/Event-timestamp-safe-resolution.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-timestamp-safe-resolution.html rename to tests/wpt/tests/dom/events/Event-timestamp-safe-resolution.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-type-empty.html b/tests/wpt/tests/dom/events/Event-type-empty.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-type-empty.html rename to tests/wpt/tests/dom/events/Event-type-empty.html diff --git a/tests/wpt/web-platform-tests/dom/events/Event-type.html b/tests/wpt/tests/dom/events/Event-type.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/Event-type.html rename to tests/wpt/tests/dom/events/Event-type.html diff --git a/tests/wpt/web-platform-tests/dom/events/EventListener-addEventListener.sub.window.js b/tests/wpt/tests/dom/events/EventListener-addEventListener.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventListener-addEventListener.sub.window.js rename to tests/wpt/tests/dom/events/EventListener-addEventListener.sub.window.js diff --git a/tests/wpt/web-platform-tests/dom/events/EventListener-handleEvent-cross-realm.html b/tests/wpt/tests/dom/events/EventListener-handleEvent-cross-realm.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventListener-handleEvent-cross-realm.html rename to tests/wpt/tests/dom/events/EventListener-handleEvent-cross-realm.html diff --git a/tests/wpt/web-platform-tests/dom/events/EventListener-handleEvent.html b/tests/wpt/tests/dom/events/EventListener-handleEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventListener-handleEvent.html rename to tests/wpt/tests/dom/events/EventListener-handleEvent.html diff --git a/tests/wpt/web-platform-tests/dom/events/EventListener-incumbent-global-1.sub.html b/tests/wpt/tests/dom/events/EventListener-incumbent-global-1.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventListener-incumbent-global-1.sub.html rename to tests/wpt/tests/dom/events/EventListener-incumbent-global-1.sub.html diff --git a/tests/wpt/web-platform-tests/dom/events/EventListener-incumbent-global-2.sub.html b/tests/wpt/tests/dom/events/EventListener-incumbent-global-2.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventListener-incumbent-global-2.sub.html rename to tests/wpt/tests/dom/events/EventListener-incumbent-global-2.sub.html diff --git a/tests/wpt/web-platform-tests/dom/events/EventListener-incumbent-global-subframe-1.sub.html b/tests/wpt/tests/dom/events/EventListener-incumbent-global-subframe-1.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventListener-incumbent-global-subframe-1.sub.html rename to tests/wpt/tests/dom/events/EventListener-incumbent-global-subframe-1.sub.html diff --git a/tests/wpt/web-platform-tests/dom/events/EventListener-incumbent-global-subframe-2.sub.html b/tests/wpt/tests/dom/events/EventListener-incumbent-global-subframe-2.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventListener-incumbent-global-subframe-2.sub.html rename to tests/wpt/tests/dom/events/EventListener-incumbent-global-subframe-2.sub.html diff --git a/tests/wpt/web-platform-tests/dom/events/EventListener-incumbent-global-subsubframe.sub.html b/tests/wpt/tests/dom/events/EventListener-incumbent-global-subsubframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventListener-incumbent-global-subsubframe.sub.html rename to tests/wpt/tests/dom/events/EventListener-incumbent-global-subsubframe.sub.html diff --git a/tests/wpt/web-platform-tests/dom/events/EventListener-invoke-legacy.html b/tests/wpt/tests/dom/events/EventListener-invoke-legacy.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventListener-invoke-legacy.html rename to tests/wpt/tests/dom/events/EventListener-invoke-legacy.html diff --git a/tests/wpt/web-platform-tests/dom/events/EventListenerOptions-capture.html b/tests/wpt/tests/dom/events/EventListenerOptions-capture.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventListenerOptions-capture.html rename to tests/wpt/tests/dom/events/EventListenerOptions-capture.html diff --git a/tests/wpt/web-platform-tests/dom/events/EventTarget-add-listener-platform-object.html b/tests/wpt/tests/dom/events/EventTarget-add-listener-platform-object.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventTarget-add-listener-platform-object.html rename to tests/wpt/tests/dom/events/EventTarget-add-listener-platform-object.html diff --git a/tests/wpt/web-platform-tests/dom/events/EventTarget-add-remove-listener.any.js b/tests/wpt/tests/dom/events/EventTarget-add-remove-listener.any.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventTarget-add-remove-listener.any.js rename to tests/wpt/tests/dom/events/EventTarget-add-remove-listener.any.js diff --git a/tests/wpt/web-platform-tests/dom/events/EventTarget-addEventListener.any.js b/tests/wpt/tests/dom/events/EventTarget-addEventListener.any.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventTarget-addEventListener.any.js rename to tests/wpt/tests/dom/events/EventTarget-addEventListener.any.js diff --git a/tests/wpt/web-platform-tests/dom/events/EventTarget-constructible.any.js b/tests/wpt/tests/dom/events/EventTarget-constructible.any.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventTarget-constructible.any.js rename to tests/wpt/tests/dom/events/EventTarget-constructible.any.js diff --git a/tests/wpt/web-platform-tests/dom/events/EventTarget-dispatchEvent-returnvalue.html b/tests/wpt/tests/dom/events/EventTarget-dispatchEvent-returnvalue.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventTarget-dispatchEvent-returnvalue.html rename to tests/wpt/tests/dom/events/EventTarget-dispatchEvent-returnvalue.html diff --git a/tests/wpt/web-platform-tests/dom/events/EventTarget-dispatchEvent.html b/tests/wpt/tests/dom/events/EventTarget-dispatchEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventTarget-dispatchEvent.html rename to tests/wpt/tests/dom/events/EventTarget-dispatchEvent.html diff --git a/tests/wpt/web-platform-tests/dom/events/EventTarget-removeEventListener.any.js b/tests/wpt/tests/dom/events/EventTarget-removeEventListener.any.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventTarget-removeEventListener.any.js rename to tests/wpt/tests/dom/events/EventTarget-removeEventListener.any.js diff --git a/tests/wpt/web-platform-tests/dom/events/EventTarget-this-of-listener.html b/tests/wpt/tests/dom/events/EventTarget-this-of-listener.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/EventTarget-this-of-listener.html rename to tests/wpt/tests/dom/events/EventTarget-this-of-listener.html diff --git a/tests/wpt/web-platform-tests/dom/events/KeyEvent-initKeyEvent.html b/tests/wpt/tests/dom/events/KeyEvent-initKeyEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/KeyEvent-initKeyEvent.html rename to tests/wpt/tests/dom/events/KeyEvent-initKeyEvent.html diff --git a/tests/wpt/web-platform-tests/dom/events/event-disabled-dynamic.html b/tests/wpt/tests/dom/events/event-disabled-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/event-disabled-dynamic.html rename to tests/wpt/tests/dom/events/event-disabled-dynamic.html diff --git a/tests/wpt/web-platform-tests/dom/events/event-global-extra.window.js b/tests/wpt/tests/dom/events/event-global-extra.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/event-global-extra.window.js rename to tests/wpt/tests/dom/events/event-global-extra.window.js diff --git a/tests/wpt/web-platform-tests/dom/events/event-global-is-still-set-when-coercing-beforeunload-result.html b/tests/wpt/tests/dom/events/event-global-is-still-set-when-coercing-beforeunload-result.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/event-global-is-still-set-when-coercing-beforeunload-result.html rename to tests/wpt/tests/dom/events/event-global-is-still-set-when-coercing-beforeunload-result.html diff --git a/tests/wpt/web-platform-tests/dom/events/event-global-is-still-set-when-reporting-exception-onerror.html b/tests/wpt/tests/dom/events/event-global-is-still-set-when-reporting-exception-onerror.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/event-global-is-still-set-when-reporting-exception-onerror.html rename to tests/wpt/tests/dom/events/event-global-is-still-set-when-reporting-exception-onerror.html diff --git a/tests/wpt/web-platform-tests/dom/events/event-global-set-before-handleEvent-lookup.window.js b/tests/wpt/tests/dom/events/event-global-set-before-handleEvent-lookup.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/event-global-set-before-handleEvent-lookup.window.js rename to tests/wpt/tests/dom/events/event-global-set-before-handleEvent-lookup.window.js diff --git a/tests/wpt/web-platform-tests/dom/events/event-global.html b/tests/wpt/tests/dom/events/event-global.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/event-global.html rename to tests/wpt/tests/dom/events/event-global.html diff --git a/tests/wpt/web-platform-tests/dom/events/event-global.worker.js b/tests/wpt/tests/dom/events/event-global.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/event-global.worker.js rename to tests/wpt/tests/dom/events/event-global.worker.js diff --git a/tests/wpt/web-platform-tests/dom/events/focus-event-document-move.html b/tests/wpt/tests/dom/events/focus-event-document-move.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/focus-event-document-move.html rename to tests/wpt/tests/dom/events/focus-event-document-move.html diff --git a/tests/wpt/web-platform-tests/dom/events/keypress-dispatch-crash.html b/tests/wpt/tests/dom/events/keypress-dispatch-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/keypress-dispatch-crash.html rename to tests/wpt/tests/dom/events/keypress-dispatch-crash.html diff --git a/tests/wpt/web-platform-tests/dom/events/legacy-pre-activation-behavior.window.js b/tests/wpt/tests/dom/events/legacy-pre-activation-behavior.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/legacy-pre-activation-behavior.window.js rename to tests/wpt/tests/dom/events/legacy-pre-activation-behavior.window.js diff --git a/tests/wpt/web-platform-tests/dom/events/mouse-event-retarget.html b/tests/wpt/tests/dom/events/mouse-event-retarget.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/mouse-event-retarget.html rename to tests/wpt/tests/dom/events/mouse-event-retarget.html diff --git a/tests/wpt/web-platform-tests/dom/events/no-focus-events-at-clicking-editable-content-in-link.html b/tests/wpt/tests/dom/events/no-focus-events-at-clicking-editable-content-in-link.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/no-focus-events-at-clicking-editable-content-in-link.html rename to tests/wpt/tests/dom/events/no-focus-events-at-clicking-editable-content-in-link.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-body.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-body.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-body.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-body.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-div.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-div.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-div.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-div.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-document.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-document.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-document.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-root.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-root.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-root.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-root.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-window.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-window.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-window.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-mousewheel-event-listener-on-window.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-body.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-body.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-body.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-body.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-div.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-div.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-div.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-div.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-document.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-document.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-document.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-root.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-root.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-root.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-root.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-window.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-window.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-window.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchmove-event-listener-on-window.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-body.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-body.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-body.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-body.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-div.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-div.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-div.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-div.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-document.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-document.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-document.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-root.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-root.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-root.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-root.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-window.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-window.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-window.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-touchstart-event-listener-on-window.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-body.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-body.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-body.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-body.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-div.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-div.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-div.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-div.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-document.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-document.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-document.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-root.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-root.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-root.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-root.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-window.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-window.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-window.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/non-passive-wheel-event-listener-on-window.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-body.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-body.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-body.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-body.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-div.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-div.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-div.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-div.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-document.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-document.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-document.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-root.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-root.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-root.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-root.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-window.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-window.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-window.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-mousewheel-event-listener-on-window.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-body.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-body.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-body.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-body.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-div.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-div.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-div.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-div.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-document.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-document.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-document.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-root.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-root.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-root.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-root.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-window.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-window.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-window.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchmove-event-listener-on-window.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-body.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-body.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-body.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-body.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-div.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-div.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-div.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-div.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-document.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-document.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-document.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-root.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-root.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-root.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-root.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-window.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-window.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-window.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-touchstart-event-listener-on-window.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-body.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-body.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-body.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-body.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-div.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-div.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-div.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-div.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-document.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-document.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-document.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-root.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-root.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-root.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-root.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-window.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-window.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-window.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/passive-wheel-event-listener-on-window.html diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/resources/scrolling.js b/tests/wpt/tests/dom/events/non-cancelable-when-passive/resources/scrolling.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/resources/scrolling.js rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/resources/scrolling.js diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/resources/touching.js b/tests/wpt/tests/dom/events/non-cancelable-when-passive/resources/touching.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/resources/touching.js rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/resources/touching.js diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/resources/wait-for.js b/tests/wpt/tests/dom/events/non-cancelable-when-passive/resources/wait-for.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/resources/wait-for.js rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/resources/wait-for.js diff --git a/tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/synthetic-events-cancelable.html b/tests/wpt/tests/dom/events/non-cancelable-when-passive/synthetic-events-cancelable.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/non-cancelable-when-passive/synthetic-events-cancelable.html rename to tests/wpt/tests/dom/events/non-cancelable-when-passive/synthetic-events-cancelable.html diff --git a/tests/wpt/web-platform-tests/dom/events/passive-by-default.html b/tests/wpt/tests/dom/events/passive-by-default.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/passive-by-default.html rename to tests/wpt/tests/dom/events/passive-by-default.html diff --git a/tests/wpt/web-platform-tests/dom/events/preventDefault-during-activation-behavior.html b/tests/wpt/tests/dom/events/preventDefault-during-activation-behavior.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/preventDefault-during-activation-behavior.html rename to tests/wpt/tests/dom/events/preventDefault-during-activation-behavior.html diff --git a/tests/wpt/web-platform-tests/dom/events/relatedTarget.window.js b/tests/wpt/tests/dom/events/relatedTarget.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/relatedTarget.window.js rename to tests/wpt/tests/dom/events/relatedTarget.window.js diff --git a/tests/wpt/web-platform-tests/dom/events/replace-event-listener-null-browsing-context-crash.html b/tests/wpt/tests/dom/events/replace-event-listener-null-browsing-context-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/replace-event-listener-null-browsing-context-crash.html rename to tests/wpt/tests/dom/events/replace-event-listener-null-browsing-context-crash.html diff --git a/tests/wpt/web-platform-tests/dom/events/resources/empty-document.html b/tests/wpt/tests/dom/events/resources/empty-document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/resources/empty-document.html rename to tests/wpt/tests/dom/events/resources/empty-document.html diff --git a/tests/wpt/web-platform-tests/dom/events/resources/event-global-extra-frame.html b/tests/wpt/tests/dom/events/resources/event-global-extra-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/resources/event-global-extra-frame.html rename to tests/wpt/tests/dom/events/resources/event-global-extra-frame.html diff --git a/tests/wpt/web-platform-tests/dom/events/resources/event-global-is-still-set-when-coercing-beforeunload-result-frame.html b/tests/wpt/tests/dom/events/resources/event-global-is-still-set-when-coercing-beforeunload-result-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/resources/event-global-is-still-set-when-coercing-beforeunload-result-frame.html rename to tests/wpt/tests/dom/events/resources/event-global-is-still-set-when-coercing-beforeunload-result-frame.html diff --git a/tests/wpt/web-platform-tests/dom/events/resources/prefixed-animation-event-tests.js b/tests/wpt/tests/dom/events/resources/prefixed-animation-event-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/resources/prefixed-animation-event-tests.js rename to tests/wpt/tests/dom/events/resources/prefixed-animation-event-tests.js diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/iframe-chains.html b/tests/wpt/tests/dom/events/scrolling/iframe-chains.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/iframe-chains.html rename to tests/wpt/tests/dom/events/scrolling/iframe-chains.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/input-text-scroll-event-when-using-arrow-keys.html b/tests/wpt/tests/dom/events/scrolling/input-text-scroll-event-when-using-arrow-keys.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/input-text-scroll-event-when-using-arrow-keys.html rename to tests/wpt/tests/dom/events/scrolling/input-text-scroll-event-when-using-arrow-keys.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-deltas.html b/tests/wpt/tests/dom/events/scrolling/overscroll-deltas.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-deltas.html rename to tests/wpt/tests/dom/events/scrolling/overscroll-deltas.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-document.html b/tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-document.html rename to tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-document.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-element-with-overscroll-behavior.html b/tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-element-with-overscroll-behavior.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-element-with-overscroll-behavior.html rename to tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-element-with-overscroll-behavior.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html b/tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html rename to tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-window.html b/tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-window.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-window.html rename to tests/wpt/tests/dom/events/scrolling/overscroll-event-fired-to-window.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scroll_support.js b/tests/wpt/tests/dom/events/scrolling/scroll_support.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/scroll_support.js rename to tests/wpt/tests/dom/events/scrolling/scroll_support.js diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-after-sequence-of-scrolls.tentative.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-after-sequence-of-scrolls.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-after-sequence-of-scrolls.tentative.html rename to tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-after-sequence-of-scrolls.tentative.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-after-snap.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-after-snap.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-after-snap.html rename to tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-after-snap.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-for-mandatory-snap-point-after-load.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-for-mandatory-snap-point-after-load.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-for-mandatory-snap-point-after-load.html rename to tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-for-mandatory-snap-point-after-load.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-for-programmatic-scroll.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-for-programmatic-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-for-programmatic-scroll.html rename to tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-for-programmatic-scroll.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html rename to tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-document.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-to-document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-document.html rename to tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-to-document.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-element-with-overscroll-behavior.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-to-element-with-overscroll-behavior.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-element-with-overscroll-behavior.html rename to tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-to-element-with-overscroll-behavior.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-window.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-to-window.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-window.html rename to tests/wpt/tests/dom/events/scrolling/scrollend-event-fired-to-window.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-for-user-scroll.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-for-user-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-for-user-scroll.html rename to tests/wpt/tests/dom/events/scrolling/scrollend-event-for-user-scroll.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-handler-content-attributes.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-handler-content-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-handler-content-attributes.html rename to tests/wpt/tests/dom/events/scrolling/scrollend-event-handler-content-attributes.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-not-fired-after-removing-scroller.tentative.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-not-fired-after-removing-scroller.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-not-fired-after-removing-scroller.tentative.html rename to tests/wpt/tests/dom/events/scrolling/scrollend-event-not-fired-after-removing-scroller.tentative.html diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-not-fired-on-no-scroll.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-not-fired-on-no-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-not-fired-on-no-scroll.html rename to tests/wpt/tests/dom/events/scrolling/scrollend-event-not-fired-on-no-scroll.html diff --git a/tests/wpt/web-platform-tests/dom/events/shadow-relatedTarget.html b/tests/wpt/tests/dom/events/shadow-relatedTarget.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/shadow-relatedTarget.html rename to tests/wpt/tests/dom/events/shadow-relatedTarget.html diff --git a/tests/wpt/web-platform-tests/dom/events/webkit-animation-end-event.html b/tests/wpt/tests/dom/events/webkit-animation-end-event.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/webkit-animation-end-event.html rename to tests/wpt/tests/dom/events/webkit-animation-end-event.html diff --git a/tests/wpt/web-platform-tests/dom/events/webkit-animation-iteration-event.html b/tests/wpt/tests/dom/events/webkit-animation-iteration-event.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/webkit-animation-iteration-event.html rename to tests/wpt/tests/dom/events/webkit-animation-iteration-event.html diff --git a/tests/wpt/web-platform-tests/dom/events/webkit-animation-start-event.html b/tests/wpt/tests/dom/events/webkit-animation-start-event.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/webkit-animation-start-event.html rename to tests/wpt/tests/dom/events/webkit-animation-start-event.html diff --git a/tests/wpt/web-platform-tests/dom/events/webkit-transition-end-event.html b/tests/wpt/tests/dom/events/webkit-transition-end-event.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/events/webkit-transition-end-event.html rename to tests/wpt/tests/dom/events/webkit-transition-end-event.html diff --git a/tests/wpt/web-platform-tests/dom/historical.html b/tests/wpt/tests/dom/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/historical.html rename to tests/wpt/tests/dom/historical.html diff --git a/tests/wpt/web-platform-tests/dom/idlharness-shadowrealm.window.js b/tests/wpt/tests/dom/idlharness-shadowrealm.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/idlharness-shadowrealm.window.js rename to tests/wpt/tests/dom/idlharness-shadowrealm.window.js diff --git a/tests/wpt/web-platform-tests/dom/idlharness.any.js b/tests/wpt/tests/dom/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/idlharness.any.js rename to tests/wpt/tests/dom/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/dom/idlharness.window.js b/tests/wpt/tests/dom/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/idlharness.window.js rename to tests/wpt/tests/dom/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/dom/interface-objects.html b/tests/wpt/tests/dom/interface-objects.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/interface-objects.html rename to tests/wpt/tests/dom/interface-objects.html diff --git a/tests/wpt/web-platform-tests/dom/lists/DOMTokenList-Iterable.html b/tests/wpt/tests/dom/lists/DOMTokenList-Iterable.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/lists/DOMTokenList-Iterable.html rename to tests/wpt/tests/dom/lists/DOMTokenList-Iterable.html diff --git a/tests/wpt/web-platform-tests/dom/lists/DOMTokenList-coverage-for-attributes.html b/tests/wpt/tests/dom/lists/DOMTokenList-coverage-for-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/lists/DOMTokenList-coverage-for-attributes.html rename to tests/wpt/tests/dom/lists/DOMTokenList-coverage-for-attributes.html diff --git a/tests/wpt/web-platform-tests/dom/lists/DOMTokenList-iteration.html b/tests/wpt/tests/dom/lists/DOMTokenList-iteration.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/lists/DOMTokenList-iteration.html rename to tests/wpt/tests/dom/lists/DOMTokenList-iteration.html diff --git a/tests/wpt/web-platform-tests/dom/lists/DOMTokenList-stringifier.html b/tests/wpt/tests/dom/lists/DOMTokenList-stringifier.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/lists/DOMTokenList-stringifier.html rename to tests/wpt/tests/dom/lists/DOMTokenList-stringifier.html diff --git a/tests/wpt/web-platform-tests/dom/lists/DOMTokenList-value.html b/tests/wpt/tests/dom/lists/DOMTokenList-value.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/lists/DOMTokenList-value.html rename to tests/wpt/tests/dom/lists/DOMTokenList-value.html diff --git a/tests/wpt/web-platform-tests/dom/lists/README.md b/tests/wpt/tests/dom/lists/README.md similarity index 100% rename from tests/wpt/web-platform-tests/dom/lists/README.md rename to tests/wpt/tests/dom/lists/README.md diff --git a/tests/wpt/web-platform-tests/dom/nodes/CharacterData-appendChild.html b/tests/wpt/tests/dom/nodes/CharacterData-appendChild.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/CharacterData-appendChild.html rename to tests/wpt/tests/dom/nodes/CharacterData-appendChild.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/CharacterData-appendData.html b/tests/wpt/tests/dom/nodes/CharacterData-appendData.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/CharacterData-appendData.html rename to tests/wpt/tests/dom/nodes/CharacterData-appendData.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/CharacterData-data.html b/tests/wpt/tests/dom/nodes/CharacterData-data.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/CharacterData-data.html rename to tests/wpt/tests/dom/nodes/CharacterData-data.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/CharacterData-deleteData.html b/tests/wpt/tests/dom/nodes/CharacterData-deleteData.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/CharacterData-deleteData.html rename to tests/wpt/tests/dom/nodes/CharacterData-deleteData.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/CharacterData-insertData.html b/tests/wpt/tests/dom/nodes/CharacterData-insertData.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/CharacterData-insertData.html rename to tests/wpt/tests/dom/nodes/CharacterData-insertData.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/CharacterData-remove.html b/tests/wpt/tests/dom/nodes/CharacterData-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/CharacterData-remove.html rename to tests/wpt/tests/dom/nodes/CharacterData-remove.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/CharacterData-replaceData.html b/tests/wpt/tests/dom/nodes/CharacterData-replaceData.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/CharacterData-replaceData.html rename to tests/wpt/tests/dom/nodes/CharacterData-replaceData.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/CharacterData-substringData.html b/tests/wpt/tests/dom/nodes/CharacterData-substringData.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/CharacterData-substringData.html rename to tests/wpt/tests/dom/nodes/CharacterData-substringData.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/CharacterData-surrogates.html b/tests/wpt/tests/dom/nodes/CharacterData-surrogates.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/CharacterData-surrogates.html rename to tests/wpt/tests/dom/nodes/CharacterData-surrogates.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ChildNode-after.html b/tests/wpt/tests/dom/nodes/ChildNode-after.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ChildNode-after.html rename to tests/wpt/tests/dom/nodes/ChildNode-after.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ChildNode-before.html b/tests/wpt/tests/dom/nodes/ChildNode-before.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ChildNode-before.html rename to tests/wpt/tests/dom/nodes/ChildNode-before.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ChildNode-remove.js b/tests/wpt/tests/dom/nodes/ChildNode-remove.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ChildNode-remove.js rename to tests/wpt/tests/dom/nodes/ChildNode-remove.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/ChildNode-replaceWith.html b/tests/wpt/tests/dom/nodes/ChildNode-replaceWith.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ChildNode-replaceWith.html rename to tests/wpt/tests/dom/nodes/ChildNode-replaceWith.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Comment-Text-constructor.js b/tests/wpt/tests/dom/nodes/Comment-Text-constructor.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Comment-Text-constructor.js rename to tests/wpt/tests/dom/nodes/Comment-Text-constructor.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/Comment-constructor.html b/tests/wpt/tests/dom/nodes/Comment-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Comment-constructor.html rename to tests/wpt/tests/dom/nodes/Comment-constructor.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Comment-in-doctype.xhtml b/tests/wpt/tests/dom/nodes/Comment-in-doctype.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Comment-in-doctype.xhtml rename to tests/wpt/tests/dom/nodes/Comment-in-doctype.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-createDocument-with-null-browsing-context-crash.html b/tests/wpt/tests/dom/nodes/DOMImplementation-createDocument-with-null-browsing-context-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-createDocument-with-null-browsing-context-crash.html rename to tests/wpt/tests/dom/nodes/DOMImplementation-createDocument-with-null-browsing-context-crash.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-createDocument.html b/tests/wpt/tests/dom/nodes/DOMImplementation-createDocument.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-createDocument.html rename to tests/wpt/tests/dom/nodes/DOMImplementation-createDocument.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-createDocumentType.html b/tests/wpt/tests/dom/nodes/DOMImplementation-createDocumentType.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-createDocumentType.html rename to tests/wpt/tests/dom/nodes/DOMImplementation-createDocumentType.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-createHTMLDocument-with-null-browsing-context-crash.html b/tests/wpt/tests/dom/nodes/DOMImplementation-createHTMLDocument-with-null-browsing-context-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-createHTMLDocument-with-null-browsing-context-crash.html rename to tests/wpt/tests/dom/nodes/DOMImplementation-createHTMLDocument-with-null-browsing-context-crash.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-createHTMLDocument-with-saved-implementation.html b/tests/wpt/tests/dom/nodes/DOMImplementation-createHTMLDocument-with-saved-implementation.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-createHTMLDocument-with-saved-implementation.html rename to tests/wpt/tests/dom/nodes/DOMImplementation-createHTMLDocument-with-saved-implementation.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-createHTMLDocument.html b/tests/wpt/tests/dom/nodes/DOMImplementation-createHTMLDocument.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-createHTMLDocument.html rename to tests/wpt/tests/dom/nodes/DOMImplementation-createHTMLDocument.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-createHTMLDocument.js b/tests/wpt/tests/dom/nodes/DOMImplementation-createHTMLDocument.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-createHTMLDocument.js rename to tests/wpt/tests/dom/nodes/DOMImplementation-createHTMLDocument.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-hasFeature.html b/tests/wpt/tests/dom/nodes/DOMImplementation-hasFeature.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/DOMImplementation-hasFeature.html rename to tests/wpt/tests/dom/nodes/DOMImplementation-hasFeature.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-Element-getElementsByTagName.js b/tests/wpt/tests/dom/nodes/Document-Element-getElementsByTagName.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-Element-getElementsByTagName.js rename to tests/wpt/tests/dom/nodes/Document-Element-getElementsByTagName.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-Element-getElementsByTagNameNS.js b/tests/wpt/tests/dom/nodes/Document-Element-getElementsByTagNameNS.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-Element-getElementsByTagNameNS.js rename to tests/wpt/tests/dom/nodes/Document-Element-getElementsByTagNameNS.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-URL.html b/tests/wpt/tests/dom/nodes/Document-URL.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-URL.html rename to tests/wpt/tests/dom/nodes/Document-URL.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-adoptNode.html b/tests/wpt/tests/dom/nodes/Document-adoptNode.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-adoptNode.html rename to tests/wpt/tests/dom/nodes/Document-adoptNode.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-characterSet-normalization-1.html b/tests/wpt/tests/dom/nodes/Document-characterSet-normalization-1.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-characterSet-normalization-1.html rename to tests/wpt/tests/dom/nodes/Document-characterSet-normalization-1.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-characterSet-normalization-2.html b/tests/wpt/tests/dom/nodes/Document-characterSet-normalization-2.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-characterSet-normalization-2.html rename to tests/wpt/tests/dom/nodes/Document-characterSet-normalization-2.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-constructor-svg.svg b/tests/wpt/tests/dom/nodes/Document-constructor-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-constructor-svg.svg rename to tests/wpt/tests/dom/nodes/Document-constructor-svg.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-constructor-xml.xml b/tests/wpt/tests/dom/nodes/Document-constructor-xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-constructor-xml.xml rename to tests/wpt/tests/dom/nodes/Document-constructor-xml.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-constructor.html b/tests/wpt/tests/dom/nodes/Document-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-constructor.html rename to tests/wpt/tests/dom/nodes/Document-constructor.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_bmp.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_bmp.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_bmp.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_bmp.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_css.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_css.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_css.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_css.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_gif.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_gif.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_gif.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_gif.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_html.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_html.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_html.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_html.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_javascripturi.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_javascripturi.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_javascripturi.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_javascripturi.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_jpg.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_jpg.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_jpg.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_jpg.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_01.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_01.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_01.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_01.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_png.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_png.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_png.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_png.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_txt.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_txt.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_txt.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_txt.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_xml.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_xml.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/contenttype_xml.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/contenttype_xml.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/createDocument.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/createDocument.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/createDocument.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/createDocument.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/createHTMLDocument.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/createHTMLDocument.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/createHTMLDocument.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/createHTMLDocument.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/xhr_responseType_document.html b/tests/wpt/tests/dom/nodes/Document-contentType/contentType/xhr_responseType_document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/contentType/xhr_responseType_document.html rename to tests/wpt/tests/dom/nodes/Document-contentType/contentType/xhr_responseType_document.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/blob.htm b/tests/wpt/tests/dom/nodes/Document-contentType/resources/blob.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/blob.htm rename to tests/wpt/tests/dom/nodes/Document-contentType/resources/blob.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/blob.txt b/tests/wpt/tests/dom/nodes/Document-contentType/resources/blob.txt similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/blob.txt rename to tests/wpt/tests/dom/nodes/Document-contentType/resources/blob.txt diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/blob.xml b/tests/wpt/tests/dom/nodes/Document-contentType/resources/blob.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/blob.xml rename to tests/wpt/tests/dom/nodes/Document-contentType/resources/blob.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/lib.js b/tests/wpt/tests/dom/nodes/Document-contentType/resources/lib.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/lib.js rename to tests/wpt/tests/dom/nodes/Document-contentType/resources/lib.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/style.css b/tests/wpt/tests/dom/nodes/Document-contentType/resources/style.css similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/style.css rename to tests/wpt/tests/dom/nodes/Document-contentType/resources/style.css diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/t.bmp b/tests/wpt/tests/dom/nodes/Document-contentType/resources/t.bmp similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/t.bmp rename to tests/wpt/tests/dom/nodes/Document-contentType/resources/t.bmp diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/t.gif b/tests/wpt/tests/dom/nodes/Document-contentType/resources/t.gif similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/t.gif rename to tests/wpt/tests/dom/nodes/Document-contentType/resources/t.gif diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/t.jpg b/tests/wpt/tests/dom/nodes/Document-contentType/resources/t.jpg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/t.jpg rename to tests/wpt/tests/dom/nodes/Document-contentType/resources/t.jpg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/t.png b/tests/wpt/tests/dom/nodes/Document-contentType/resources/t.png similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/resources/t.png rename to tests/wpt/tests/dom/nodes/Document-contentType/resources/t.png diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-contentType/support/contenttype_setter.py b/tests/wpt/tests/dom/nodes/Document-contentType/support/contenttype_setter.py similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-contentType/support/contenttype_setter.py rename to tests/wpt/tests/dom/nodes/Document-contentType/support/contenttype_setter.py diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createAttribute.html b/tests/wpt/tests/dom/nodes/Document-createAttribute.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createAttribute.html rename to tests/wpt/tests/dom/nodes/Document-createAttribute.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createCDATASection-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Document-createCDATASection-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createCDATASection-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Document-createCDATASection-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createCDATASection.html b/tests/wpt/tests/dom/nodes/Document-createCDATASection.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createCDATASection.html rename to tests/wpt/tests/dom/nodes/Document-createCDATASection.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createComment-createTextNode.js b/tests/wpt/tests/dom/nodes/Document-createComment-createTextNode.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createComment-createTextNode.js rename to tests/wpt/tests/dom/nodes/Document-createComment-createTextNode.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createComment.html b/tests/wpt/tests/dom/nodes/Document-createComment.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createComment.html rename to tests/wpt/tests/dom/nodes/Document-createComment.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.html b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.html rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.svg b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.svg rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.xhtml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.xhtml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.xml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.xml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_mathml.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.html b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.html rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.svg b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.svg rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.xhtml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.xhtml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.xml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.xml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_svg.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.html b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.html rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.svg b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.svg rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.xhtml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.xml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.xml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/empty.html b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/empty.html rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/empty.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/empty.svg b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/empty.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/empty.svg rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/empty.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/empty.xhtml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/empty.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/empty.xhtml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/empty.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/empty.xml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/empty.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/empty.xml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/empty.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/generate.py b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/generate.py similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/generate.py rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/generate.py diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/mathml.html b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/mathml.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/mathml.html rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/mathml.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/mathml.svg b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/mathml.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/mathml.svg rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/mathml.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/mathml.xhtml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/mathml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/mathml.xhtml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/mathml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/mathml.xml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/mathml.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/mathml.xml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/mathml.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.html b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.html rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.svg b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.svg rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.xhtml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.xhtml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.xml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.xml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/minimal_html.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/svg.html b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/svg.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/svg.html rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/svg.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/svg.svg b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/svg.svg rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/svg.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/svg.xhtml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/svg.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/svg.xhtml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/svg.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/svg.xml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/svg.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/svg.xml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/svg.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml.html b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml.html rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml.svg b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml.svg rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml.xhtml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml.xml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml.xml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.html b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.html rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.svg b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.svg rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.xhtml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.xhtml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.xml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.xml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.html b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.html rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.svg b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.svg rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.xhtml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.xhtml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.xml b/tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.xml rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace.html b/tests/wpt/tests/dom/nodes/Document-createElement-namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement-namespace.html rename to tests/wpt/tests/dom/nodes/Document-createElement-namespace.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement.html b/tests/wpt/tests/dom/nodes/Document-createElement.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElement.html rename to tests/wpt/tests/dom/nodes/Document-createElement.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElementNS.html b/tests/wpt/tests/dom/nodes/Document-createElementNS.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElementNS.html rename to tests/wpt/tests/dom/nodes/Document-createElementNS.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElementNS.js b/tests/wpt/tests/dom/nodes/Document-createElementNS.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createElementNS.js rename to tests/wpt/tests/dom/nodes/Document-createElementNS.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createEvent-touchevent.window.js b/tests/wpt/tests/dom/nodes/Document-createEvent-touchevent.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createEvent-touchevent.window.js rename to tests/wpt/tests/dom/nodes/Document-createEvent-touchevent.window.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createEvent.https.html b/tests/wpt/tests/dom/nodes/Document-createEvent.https.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createEvent.https.html rename to tests/wpt/tests/dom/nodes/Document-createEvent.https.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createEvent.js b/tests/wpt/tests/dom/nodes/Document-createEvent.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createEvent.js rename to tests/wpt/tests/dom/nodes/Document-createEvent.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createProcessingInstruction.html b/tests/wpt/tests/dom/nodes/Document-createProcessingInstruction.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createProcessingInstruction.html rename to tests/wpt/tests/dom/nodes/Document-createProcessingInstruction.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createProcessingInstruction.js b/tests/wpt/tests/dom/nodes/Document-createProcessingInstruction.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createProcessingInstruction.js rename to tests/wpt/tests/dom/nodes/Document-createProcessingInstruction.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createTextNode.html b/tests/wpt/tests/dom/nodes/Document-createTextNode.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createTextNode.html rename to tests/wpt/tests/dom/nodes/Document-createTextNode.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createTreeWalker.html b/tests/wpt/tests/dom/nodes/Document-createTreeWalker.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-createTreeWalker.html rename to tests/wpt/tests/dom/nodes/Document-createTreeWalker.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-doctype.html b/tests/wpt/tests/dom/nodes/Document-doctype.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-doctype.html rename to tests/wpt/tests/dom/nodes/Document-doctype.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-getElementById.html b/tests/wpt/tests/dom/nodes/Document-getElementById.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-getElementById.html rename to tests/wpt/tests/dom/nodes/Document-getElementById.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-getElementsByClassName.html b/tests/wpt/tests/dom/nodes/Document-getElementsByClassName.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-getElementsByClassName.html rename to tests/wpt/tests/dom/nodes/Document-getElementsByClassName.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-getElementsByTagName-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Document-getElementsByTagName-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-getElementsByTagName-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Document-getElementsByTagName-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-getElementsByTagName.html b/tests/wpt/tests/dom/nodes/Document-getElementsByTagName.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-getElementsByTagName.html rename to tests/wpt/tests/dom/nodes/Document-getElementsByTagName.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-getElementsByTagNameNS.html b/tests/wpt/tests/dom/nodes/Document-getElementsByTagNameNS.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-getElementsByTagNameNS.html rename to tests/wpt/tests/dom/nodes/Document-getElementsByTagNameNS.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-implementation.html b/tests/wpt/tests/dom/nodes/Document-implementation.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-implementation.html rename to tests/wpt/tests/dom/nodes/Document-implementation.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-importNode.html b/tests/wpt/tests/dom/nodes/Document-importNode.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Document-importNode.html rename to tests/wpt/tests/dom/nodes/Document-importNode.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/DocumentFragment-constructor.html b/tests/wpt/tests/dom/nodes/DocumentFragment-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/DocumentFragment-constructor.html rename to tests/wpt/tests/dom/nodes/DocumentFragment-constructor.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/DocumentFragment-getElementById.html b/tests/wpt/tests/dom/nodes/DocumentFragment-getElementById.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/DocumentFragment-getElementById.html rename to tests/wpt/tests/dom/nodes/DocumentFragment-getElementById.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/DocumentFragment-querySelectorAll-after-modification.html b/tests/wpt/tests/dom/nodes/DocumentFragment-querySelectorAll-after-modification.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/DocumentFragment-querySelectorAll-after-modification.html rename to tests/wpt/tests/dom/nodes/DocumentFragment-querySelectorAll-after-modification.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/DocumentType-literal-xhtml.xhtml b/tests/wpt/tests/dom/nodes/DocumentType-literal-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/DocumentType-literal-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/DocumentType-literal-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/DocumentType-literal.html b/tests/wpt/tests/dom/nodes/DocumentType-literal.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/DocumentType-literal.html rename to tests/wpt/tests/dom/nodes/DocumentType-literal.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/DocumentType-remove.html b/tests/wpt/tests/dom/nodes/DocumentType-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/DocumentType-remove.html rename to tests/wpt/tests/dom/nodes/DocumentType-remove.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElement-null-svg.svg b/tests/wpt/tests/dom/nodes/Element-childElement-null-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElement-null-svg.svg rename to tests/wpt/tests/dom/nodes/Element-childElement-null-svg.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElement-null-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Element-childElement-null-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElement-null-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Element-childElement-null-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElement-null.html b/tests/wpt/tests/dom/nodes/Element-childElement-null.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElement-null.html rename to tests/wpt/tests/dom/nodes/Element-childElement-null.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-dynamic-add-svg.svg b/tests/wpt/tests/dom/nodes/Element-childElementCount-dynamic-add-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-dynamic-add-svg.svg rename to tests/wpt/tests/dom/nodes/Element-childElementCount-dynamic-add-svg.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-dynamic-add.html b/tests/wpt/tests/dom/nodes/Element-childElementCount-dynamic-add.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-dynamic-add.html rename to tests/wpt/tests/dom/nodes/Element-childElementCount-dynamic-add.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg b/tests/wpt/tests/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg rename to tests/wpt/tests/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-dynamic-remove.html b/tests/wpt/tests/dom/nodes/Element-childElementCount-dynamic-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-dynamic-remove.html rename to tests/wpt/tests/dom/nodes/Element-childElementCount-dynamic-remove.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-nochild-svg.svg b/tests/wpt/tests/dom/nodes/Element-childElementCount-nochild-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-nochild-svg.svg rename to tests/wpt/tests/dom/nodes/Element-childElementCount-nochild-svg.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-nochild.html b/tests/wpt/tests/dom/nodes/Element-childElementCount-nochild.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-nochild.html rename to tests/wpt/tests/dom/nodes/Element-childElementCount-nochild.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-svg.svg b/tests/wpt/tests/dom/nodes/Element-childElementCount-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-svg.svg rename to tests/wpt/tests/dom/nodes/Element-childElementCount-svg.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Element-childElementCount-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Element-childElementCount-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount.html b/tests/wpt/tests/dom/nodes/Element-childElementCount.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-childElementCount.html rename to tests/wpt/tests/dom/nodes/Element-childElementCount.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-children.html b/tests/wpt/tests/dom/nodes/Element-children.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-children.html rename to tests/wpt/tests/dom/nodes/Element-children.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-classlist.html b/tests/wpt/tests/dom/nodes/Element-classlist.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-classlist.html rename to tests/wpt/tests/dom/nodes/Element-classlist.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-closest.html b/tests/wpt/tests/dom/nodes/Element-closest.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-closest.html rename to tests/wpt/tests/dom/nodes/Element-closest.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild-entity.svg b/tests/wpt/tests/dom/nodes/Element-firstElementChild-entity.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild-entity.svg rename to tests/wpt/tests/dom/nodes/Element-firstElementChild-entity.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild-namespace-svg.svg b/tests/wpt/tests/dom/nodes/Element-firstElementChild-namespace-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild-namespace-svg.svg rename to tests/wpt/tests/dom/nodes/Element-firstElementChild-namespace-svg.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild-namespace.html b/tests/wpt/tests/dom/nodes/Element-firstElementChild-namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild-namespace.html rename to tests/wpt/tests/dom/nodes/Element-firstElementChild-namespace.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild-svg.svg b/tests/wpt/tests/dom/nodes/Element-firstElementChild-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild-svg.svg rename to tests/wpt/tests/dom/nodes/Element-firstElementChild-svg.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Element-firstElementChild-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Element-firstElementChild-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild.html b/tests/wpt/tests/dom/nodes/Element-firstElementChild.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-firstElementChild.html rename to tests/wpt/tests/dom/nodes/Element-firstElementChild.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-getElementsByClassName.html b/tests/wpt/tests/dom/nodes/Element-getElementsByClassName.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-getElementsByClassName.html rename to tests/wpt/tests/dom/nodes/Element-getElementsByClassName.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess-iframe.xml b/tests/wpt/tests/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess-iframe.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess-iframe.xml rename to tests/wpt/tests/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess-iframe.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html b/tests/wpt/tests/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html rename to tests/wpt/tests/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-getElementsByTagName.html b/tests/wpt/tests/dom/nodes/Element-getElementsByTagName.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-getElementsByTagName.html rename to tests/wpt/tests/dom/nodes/Element-getElementsByTagName.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-getElementsByTagNameNS.html b/tests/wpt/tests/dom/nodes/Element-getElementsByTagNameNS.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-getElementsByTagNameNS.html rename to tests/wpt/tests/dom/nodes/Element-getElementsByTagNameNS.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-hasAttribute.html b/tests/wpt/tests/dom/nodes/Element-hasAttribute.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-hasAttribute.html rename to tests/wpt/tests/dom/nodes/Element-hasAttribute.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-hasAttributes.html b/tests/wpt/tests/dom/nodes/Element-hasAttributes.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-hasAttributes.html rename to tests/wpt/tests/dom/nodes/Element-hasAttributes.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-insertAdjacentElement.html b/tests/wpt/tests/dom/nodes/Element-insertAdjacentElement.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-insertAdjacentElement.html rename to tests/wpt/tests/dom/nodes/Element-insertAdjacentElement.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-insertAdjacentText.html b/tests/wpt/tests/dom/nodes/Element-insertAdjacentText.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-insertAdjacentText.html rename to tests/wpt/tests/dom/nodes/Element-insertAdjacentText.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-lastElementChild-svg.svg b/tests/wpt/tests/dom/nodes/Element-lastElementChild-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-lastElementChild-svg.svg rename to tests/wpt/tests/dom/nodes/Element-lastElementChild-svg.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-lastElementChild-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Element-lastElementChild-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-lastElementChild-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Element-lastElementChild-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-lastElementChild.html b/tests/wpt/tests/dom/nodes/Element-lastElementChild.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-lastElementChild.html rename to tests/wpt/tests/dom/nodes/Element-lastElementChild.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-matches-init.js b/tests/wpt/tests/dom/nodes/Element-matches-init.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-matches-init.js rename to tests/wpt/tests/dom/nodes/Element-matches-init.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-matches-namespaced-elements.html b/tests/wpt/tests/dom/nodes/Element-matches-namespaced-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-matches-namespaced-elements.html rename to tests/wpt/tests/dom/nodes/Element-matches-namespaced-elements.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-matches.html b/tests/wpt/tests/dom/nodes/Element-matches.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-matches.html rename to tests/wpt/tests/dom/nodes/Element-matches.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-matches.js b/tests/wpt/tests/dom/nodes/Element-matches.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-matches.js rename to tests/wpt/tests/dom/nodes/Element-matches.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-nextElementSibling-svg.svg b/tests/wpt/tests/dom/nodes/Element-nextElementSibling-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-nextElementSibling-svg.svg rename to tests/wpt/tests/dom/nodes/Element-nextElementSibling-svg.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-nextElementSibling-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Element-nextElementSibling-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-nextElementSibling-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Element-nextElementSibling-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-nextElementSibling.html b/tests/wpt/tests/dom/nodes/Element-nextElementSibling.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-nextElementSibling.html rename to tests/wpt/tests/dom/nodes/Element-nextElementSibling.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-previousElementSibling-svg.svg b/tests/wpt/tests/dom/nodes/Element-previousElementSibling-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-previousElementSibling-svg.svg rename to tests/wpt/tests/dom/nodes/Element-previousElementSibling-svg.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-previousElementSibling-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Element-previousElementSibling-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-previousElementSibling-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Element-previousElementSibling-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-previousElementSibling.html b/tests/wpt/tests/dom/nodes/Element-previousElementSibling.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-previousElementSibling.html rename to tests/wpt/tests/dom/nodes/Element-previousElementSibling.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-remove.html b/tests/wpt/tests/dom/nodes/Element-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-remove.html rename to tests/wpt/tests/dom/nodes/Element-remove.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-removeAttribute.html b/tests/wpt/tests/dom/nodes/Element-removeAttribute.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-removeAttribute.html rename to tests/wpt/tests/dom/nodes/Element-removeAttribute.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-removeAttributeNS.html b/tests/wpt/tests/dom/nodes/Element-removeAttributeNS.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-removeAttributeNS.html rename to tests/wpt/tests/dom/nodes/Element-removeAttributeNS.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-setAttribute-crbug-1138487.html b/tests/wpt/tests/dom/nodes/Element-setAttribute-crbug-1138487.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-setAttribute-crbug-1138487.html rename to tests/wpt/tests/dom/nodes/Element-setAttribute-crbug-1138487.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-setAttribute.html b/tests/wpt/tests/dom/nodes/Element-setAttribute.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-setAttribute.html rename to tests/wpt/tests/dom/nodes/Element-setAttribute.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-siblingElement-null-svg.svg b/tests/wpt/tests/dom/nodes/Element-siblingElement-null-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-siblingElement-null-svg.svg rename to tests/wpt/tests/dom/nodes/Element-siblingElement-null-svg.svg diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-siblingElement-null-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Element-siblingElement-null-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-siblingElement-null-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Element-siblingElement-null-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-siblingElement-null.html b/tests/wpt/tests/dom/nodes/Element-siblingElement-null.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-siblingElement-null.html rename to tests/wpt/tests/dom/nodes/Element-siblingElement-null.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-tagName.html b/tests/wpt/tests/dom/nodes/Element-tagName.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-tagName.html rename to tests/wpt/tests/dom/nodes/Element-tagName.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-webkitMatchesSelector.html b/tests/wpt/tests/dom/nodes/Element-webkitMatchesSelector.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Element-webkitMatchesSelector.html rename to tests/wpt/tests/dom/nodes/Element-webkitMatchesSelector.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/MutationObserver-attributes.html b/tests/wpt/tests/dom/nodes/MutationObserver-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/MutationObserver-attributes.html rename to tests/wpt/tests/dom/nodes/MutationObserver-attributes.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/MutationObserver-callback-arguments.html b/tests/wpt/tests/dom/nodes/MutationObserver-callback-arguments.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/MutationObserver-callback-arguments.html rename to tests/wpt/tests/dom/nodes/MutationObserver-callback-arguments.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/MutationObserver-characterData.html b/tests/wpt/tests/dom/nodes/MutationObserver-characterData.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/MutationObserver-characterData.html rename to tests/wpt/tests/dom/nodes/MutationObserver-characterData.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/MutationObserver-childList.html b/tests/wpt/tests/dom/nodes/MutationObserver-childList.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/MutationObserver-childList.html rename to tests/wpt/tests/dom/nodes/MutationObserver-childList.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/MutationObserver-cross-realm-callback-report-exception.html b/tests/wpt/tests/dom/nodes/MutationObserver-cross-realm-callback-report-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/MutationObserver-cross-realm-callback-report-exception.html rename to tests/wpt/tests/dom/nodes/MutationObserver-cross-realm-callback-report-exception.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/MutationObserver-disconnect.html b/tests/wpt/tests/dom/nodes/MutationObserver-disconnect.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/MutationObserver-disconnect.html rename to tests/wpt/tests/dom/nodes/MutationObserver-disconnect.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/MutationObserver-document.html b/tests/wpt/tests/dom/nodes/MutationObserver-document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/MutationObserver-document.html rename to tests/wpt/tests/dom/nodes/MutationObserver-document.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/MutationObserver-inner-outer.html b/tests/wpt/tests/dom/nodes/MutationObserver-inner-outer.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/MutationObserver-inner-outer.html rename to tests/wpt/tests/dom/nodes/MutationObserver-inner-outer.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/MutationObserver-sanity.html b/tests/wpt/tests/dom/nodes/MutationObserver-sanity.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/MutationObserver-sanity.html rename to tests/wpt/tests/dom/nodes/MutationObserver-sanity.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/MutationObserver-takeRecords.html b/tests/wpt/tests/dom/nodes/MutationObserver-takeRecords.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/MutationObserver-takeRecords.html rename to tests/wpt/tests/dom/nodes/MutationObserver-takeRecords.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-appendChild-cereactions-vs-script.window.js b/tests/wpt/tests/dom/nodes/Node-appendChild-cereactions-vs-script.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-appendChild-cereactions-vs-script.window.js rename to tests/wpt/tests/dom/nodes/Node-appendChild-cereactions-vs-script.window.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-appendChild.html b/tests/wpt/tests/dom/nodes/Node-appendChild.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-appendChild.html rename to tests/wpt/tests/dom/nodes/Node-appendChild.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-baseURI.html b/tests/wpt/tests/dom/nodes/Node-baseURI.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-baseURI.html rename to tests/wpt/tests/dom/nodes/Node-baseURI.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-childNodes.html b/tests/wpt/tests/dom/nodes/Node-childNodes.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-childNodes.html rename to tests/wpt/tests/dom/nodes/Node-childNodes.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-cloneNode-XMLDocument.html b/tests/wpt/tests/dom/nodes/Node-cloneNode-XMLDocument.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-cloneNode-XMLDocument.html rename to tests/wpt/tests/dom/nodes/Node-cloneNode-XMLDocument.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-cloneNode-document-with-doctype.html b/tests/wpt/tests/dom/nodes/Node-cloneNode-document-with-doctype.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-cloneNode-document-with-doctype.html rename to tests/wpt/tests/dom/nodes/Node-cloneNode-document-with-doctype.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-cloneNode-external-stylesheet-no-bc.sub.html b/tests/wpt/tests/dom/nodes/Node-cloneNode-external-stylesheet-no-bc.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-cloneNode-external-stylesheet-no-bc.sub.html rename to tests/wpt/tests/dom/nodes/Node-cloneNode-external-stylesheet-no-bc.sub.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-cloneNode-on-inactive-document-crash.html b/tests/wpt/tests/dom/nodes/Node-cloneNode-on-inactive-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-cloneNode-on-inactive-document-crash.html rename to tests/wpt/tests/dom/nodes/Node-cloneNode-on-inactive-document-crash.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-cloneNode-svg.html b/tests/wpt/tests/dom/nodes/Node-cloneNode-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-cloneNode-svg.html rename to tests/wpt/tests/dom/nodes/Node-cloneNode-svg.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-cloneNode.html b/tests/wpt/tests/dom/nodes/Node-cloneNode.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-cloneNode.html rename to tests/wpt/tests/dom/nodes/Node-cloneNode.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-compareDocumentPosition.html b/tests/wpt/tests/dom/nodes/Node-compareDocumentPosition.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-compareDocumentPosition.html rename to tests/wpt/tests/dom/nodes/Node-compareDocumentPosition.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-constants.html b/tests/wpt/tests/dom/nodes/Node-constants.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-constants.html rename to tests/wpt/tests/dom/nodes/Node-constants.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-contains-xml.xml b/tests/wpt/tests/dom/nodes/Node-contains-xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-contains-xml.xml rename to tests/wpt/tests/dom/nodes/Node-contains-xml.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-contains.html b/tests/wpt/tests/dom/nodes/Node-contains.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-contains.html rename to tests/wpt/tests/dom/nodes/Node-contains.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-insertBefore.html b/tests/wpt/tests/dom/nodes/Node-insertBefore.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-insertBefore.html rename to tests/wpt/tests/dom/nodes/Node-insertBefore.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-isConnected-shadow-dom.html b/tests/wpt/tests/dom/nodes/Node-isConnected-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-isConnected-shadow-dom.html rename to tests/wpt/tests/dom/nodes/Node-isConnected-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-isConnected.html b/tests/wpt/tests/dom/nodes/Node-isConnected.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-isConnected.html rename to tests/wpt/tests/dom/nodes/Node-isConnected.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-isEqualNode-iframe1.xml b/tests/wpt/tests/dom/nodes/Node-isEqualNode-iframe1.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-isEqualNode-iframe1.xml rename to tests/wpt/tests/dom/nodes/Node-isEqualNode-iframe1.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-isEqualNode-iframe2.xml b/tests/wpt/tests/dom/nodes/Node-isEqualNode-iframe2.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-isEqualNode-iframe2.xml rename to tests/wpt/tests/dom/nodes/Node-isEqualNode-iframe2.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-isEqualNode-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Node-isEqualNode-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-isEqualNode-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Node-isEqualNode-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-isEqualNode.html b/tests/wpt/tests/dom/nodes/Node-isEqualNode.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-isEqualNode.html rename to tests/wpt/tests/dom/nodes/Node-isEqualNode.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-isSameNode.html b/tests/wpt/tests/dom/nodes/Node-isSameNode.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-isSameNode.html rename to tests/wpt/tests/dom/nodes/Node-isSameNode.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-lookupNamespaceURI.html b/tests/wpt/tests/dom/nodes/Node-lookupNamespaceURI.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-lookupNamespaceURI.html rename to tests/wpt/tests/dom/nodes/Node-lookupNamespaceURI.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-lookupPrefix.xhtml b/tests/wpt/tests/dom/nodes/Node-lookupPrefix.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-lookupPrefix.xhtml rename to tests/wpt/tests/dom/nodes/Node-lookupPrefix.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-mutation-adoptNode.html b/tests/wpt/tests/dom/nodes/Node-mutation-adoptNode.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-mutation-adoptNode.html rename to tests/wpt/tests/dom/nodes/Node-mutation-adoptNode.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-nodeName-xhtml.xhtml b/tests/wpt/tests/dom/nodes/Node-nodeName-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-nodeName-xhtml.xhtml rename to tests/wpt/tests/dom/nodes/Node-nodeName-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-nodeName.html b/tests/wpt/tests/dom/nodes/Node-nodeName.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-nodeName.html rename to tests/wpt/tests/dom/nodes/Node-nodeName.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-nodeValue.html b/tests/wpt/tests/dom/nodes/Node-nodeValue.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-nodeValue.html rename to tests/wpt/tests/dom/nodes/Node-nodeValue.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-normalize.html b/tests/wpt/tests/dom/nodes/Node-normalize.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-normalize.html rename to tests/wpt/tests/dom/nodes/Node-normalize.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-parentElement.html b/tests/wpt/tests/dom/nodes/Node-parentElement.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-parentElement.html rename to tests/wpt/tests/dom/nodes/Node-parentElement.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-parentNode-iframe.html b/tests/wpt/tests/dom/nodes/Node-parentNode-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-parentNode-iframe.html rename to tests/wpt/tests/dom/nodes/Node-parentNode-iframe.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-parentNode.html b/tests/wpt/tests/dom/nodes/Node-parentNode.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-parentNode.html rename to tests/wpt/tests/dom/nodes/Node-parentNode.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-properties.html b/tests/wpt/tests/dom/nodes/Node-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-properties.html rename to tests/wpt/tests/dom/nodes/Node-properties.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-removeChild.html b/tests/wpt/tests/dom/nodes/Node-removeChild.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-removeChild.html rename to tests/wpt/tests/dom/nodes/Node-removeChild.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-replaceChild.html b/tests/wpt/tests/dom/nodes/Node-replaceChild.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-replaceChild.html rename to tests/wpt/tests/dom/nodes/Node-replaceChild.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-textContent.html b/tests/wpt/tests/dom/nodes/Node-textContent.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Node-textContent.html rename to tests/wpt/tests/dom/nodes/Node-textContent.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/NodeList-Iterable.html b/tests/wpt/tests/dom/nodes/NodeList-Iterable.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/NodeList-Iterable.html rename to tests/wpt/tests/dom/nodes/NodeList-Iterable.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/NodeList-live-mutations.window.js b/tests/wpt/tests/dom/nodes/NodeList-live-mutations.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/NodeList-live-mutations.window.js rename to tests/wpt/tests/dom/nodes/NodeList-live-mutations.window.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/NodeList-static-length-getter-tampered-1.html b/tests/wpt/tests/dom/nodes/NodeList-static-length-getter-tampered-1.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/NodeList-static-length-getter-tampered-1.html rename to tests/wpt/tests/dom/nodes/NodeList-static-length-getter-tampered-1.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/NodeList-static-length-getter-tampered-2.html b/tests/wpt/tests/dom/nodes/NodeList-static-length-getter-tampered-2.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/NodeList-static-length-getter-tampered-2.html rename to tests/wpt/tests/dom/nodes/NodeList-static-length-getter-tampered-2.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/NodeList-static-length-getter-tampered-3.html b/tests/wpt/tests/dom/nodes/NodeList-static-length-getter-tampered-3.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/NodeList-static-length-getter-tampered-3.html rename to tests/wpt/tests/dom/nodes/NodeList-static-length-getter-tampered-3.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/NodeList-static-length-getter-tampered-indexOf-1.html b/tests/wpt/tests/dom/nodes/NodeList-static-length-getter-tampered-indexOf-1.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/NodeList-static-length-getter-tampered-indexOf-1.html rename to tests/wpt/tests/dom/nodes/NodeList-static-length-getter-tampered-indexOf-1.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/NodeList-static-length-getter-tampered-indexOf-2.html b/tests/wpt/tests/dom/nodes/NodeList-static-length-getter-tampered-indexOf-2.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/NodeList-static-length-getter-tampered-indexOf-2.html rename to tests/wpt/tests/dom/nodes/NodeList-static-length-getter-tampered-indexOf-2.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/NodeList-static-length-getter-tampered-indexOf-3.html b/tests/wpt/tests/dom/nodes/NodeList-static-length-getter-tampered-indexOf-3.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/NodeList-static-length-getter-tampered-indexOf-3.html rename to tests/wpt/tests/dom/nodes/NodeList-static-length-getter-tampered-indexOf-3.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-append.html b/tests/wpt/tests/dom/nodes/ParentNode-append.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-append.html rename to tests/wpt/tests/dom/nodes/ParentNode-append.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-children.html b/tests/wpt/tests/dom/nodes/ParentNode-children.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-children.html rename to tests/wpt/tests/dom/nodes/ParentNode-children.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-prepend.html b/tests/wpt/tests/dom/nodes/ParentNode-prepend.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-prepend.html rename to tests/wpt/tests/dom/nodes/ParentNode-prepend.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All-content.html b/tests/wpt/tests/dom/nodes/ParentNode-querySelector-All-content.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All-content.html rename to tests/wpt/tests/dom/nodes/ParentNode-querySelector-All-content.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All-content.xht b/tests/wpt/tests/dom/nodes/ParentNode-querySelector-All-content.xht similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All-content.xht rename to tests/wpt/tests/dom/nodes/ParentNode-querySelector-All-content.xht diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All-xht.xht b/tests/wpt/tests/dom/nodes/ParentNode-querySelector-All-xht.xht similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All-xht.xht rename to tests/wpt/tests/dom/nodes/ParentNode-querySelector-All-xht.xht diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.html b/tests/wpt/tests/dom/nodes/ParentNode-querySelector-All.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.html rename to tests/wpt/tests/dom/nodes/ParentNode-querySelector-All.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.js b/tests/wpt/tests/dom/nodes/ParentNode-querySelector-All.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.js rename to tests/wpt/tests/dom/nodes/ParentNode-querySelector-All.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-case-insensitive.html b/tests/wpt/tests/dom/nodes/ParentNode-querySelector-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-case-insensitive.html rename to tests/wpt/tests/dom/nodes/ParentNode-querySelector-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-escapes.html b/tests/wpt/tests/dom/nodes/ParentNode-querySelector-escapes.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-escapes.html rename to tests/wpt/tests/dom/nodes/ParentNode-querySelector-escapes.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-scope.html b/tests/wpt/tests/dom/nodes/ParentNode-querySelector-scope.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-scope.html rename to tests/wpt/tests/dom/nodes/ParentNode-querySelector-scope.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelectorAll-removed-elements.html b/tests/wpt/tests/dom/nodes/ParentNode-querySelectorAll-removed-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelectorAll-removed-elements.html rename to tests/wpt/tests/dom/nodes/ParentNode-querySelectorAll-removed-elements.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelectors-exclusive.html b/tests/wpt/tests/dom/nodes/ParentNode-querySelectors-exclusive.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelectors-exclusive.html rename to tests/wpt/tests/dom/nodes/ParentNode-querySelectors-exclusive.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelectors-namespaces.html b/tests/wpt/tests/dom/nodes/ParentNode-querySelectors-namespaces.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelectors-namespaces.html rename to tests/wpt/tests/dom/nodes/ParentNode-querySelectors-namespaces.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelectors-space-and-dash-attribute-value.html b/tests/wpt/tests/dom/nodes/ParentNode-querySelectors-space-and-dash-attribute-value.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelectors-space-and-dash-attribute-value.html rename to tests/wpt/tests/dom/nodes/ParentNode-querySelectors-space-and-dash-attribute-value.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-replaceChildren.html b/tests/wpt/tests/dom/nodes/ParentNode-replaceChildren.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ParentNode-replaceChildren.html rename to tests/wpt/tests/dom/nodes/ParentNode-replaceChildren.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/ProcessingInstruction-escapes-1.xhtml b/tests/wpt/tests/dom/nodes/ProcessingInstruction-escapes-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ProcessingInstruction-escapes-1.xhtml rename to tests/wpt/tests/dom/nodes/ProcessingInstruction-escapes-1.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/ProcessingInstruction-in-doctype.xhtml b/tests/wpt/tests/dom/nodes/ProcessingInstruction-in-doctype.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ProcessingInstruction-in-doctype.xhtml rename to tests/wpt/tests/dom/nodes/ProcessingInstruction-in-doctype.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/ProcessingInstruction-literal-1.xhtml b/tests/wpt/tests/dom/nodes/ProcessingInstruction-literal-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ProcessingInstruction-literal-1.xhtml rename to tests/wpt/tests/dom/nodes/ProcessingInstruction-literal-1.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/ProcessingInstruction-literal-2.xhtml b/tests/wpt/tests/dom/nodes/ProcessingInstruction-literal-2.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/ProcessingInstruction-literal-2.xhtml rename to tests/wpt/tests/dom/nodes/ProcessingInstruction-literal-2.xhtml diff --git a/tests/wpt/web-platform-tests/dom/nodes/Text-constructor.html b/tests/wpt/tests/dom/nodes/Text-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Text-constructor.html rename to tests/wpt/tests/dom/nodes/Text-constructor.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Text-splitText.html b/tests/wpt/tests/dom/nodes/Text-splitText.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Text-splitText.html rename to tests/wpt/tests/dom/nodes/Text-splitText.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/Text-wholeText.html b/tests/wpt/tests/dom/nodes/Text-wholeText.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/Text-wholeText.html rename to tests/wpt/tests/dom/nodes/Text-wholeText.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/adoption.window.js b/tests/wpt/tests/dom/nodes/adoption.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/adoption.window.js rename to tests/wpt/tests/dom/nodes/adoption.window.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/append-on-Document.html b/tests/wpt/tests/dom/nodes/append-on-Document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/append-on-Document.html rename to tests/wpt/tests/dom/nodes/append-on-Document.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/attributes-namednodemap.html b/tests/wpt/tests/dom/nodes/attributes-namednodemap.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/attributes-namednodemap.html rename to tests/wpt/tests/dom/nodes/attributes-namednodemap.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/attributes.html b/tests/wpt/tests/dom/nodes/attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/attributes.html rename to tests/wpt/tests/dom/nodes/attributes.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/attributes.js b/tests/wpt/tests/dom/nodes/attributes.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/attributes.js rename to tests/wpt/tests/dom/nodes/attributes.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/case.html b/tests/wpt/tests/dom/nodes/case.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/case.html rename to tests/wpt/tests/dom/nodes/case.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/case.js b/tests/wpt/tests/dom/nodes/case.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/case.js rename to tests/wpt/tests/dom/nodes/case.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/characterset-helper.js b/tests/wpt/tests/dom/nodes/characterset-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/characterset-helper.js rename to tests/wpt/tests/dom/nodes/characterset-helper.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/creators.js b/tests/wpt/tests/dom/nodes/creators.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/creators.js rename to tests/wpt/tests/dom/nodes/creators.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/encoding.py b/tests/wpt/tests/dom/nodes/encoding.py similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/encoding.py rename to tests/wpt/tests/dom/nodes/encoding.py diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-01.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-01.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-01.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-01.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-02.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-02.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-02.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-02.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-03.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-03.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-03.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-03.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-04.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-04.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-04.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-04.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-05.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-05.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-05.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-05.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-06.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-06.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-06.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-06.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-07.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-07.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-07.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-07.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-08.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-08.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-08.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-08.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-09.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-09.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-09.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-09.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-10.xml b/tests/wpt/tests/dom/nodes/getElementsByClassName-10.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-10.xml rename to tests/wpt/tests/dom/nodes/getElementsByClassName-10.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-11.xml b/tests/wpt/tests/dom/nodes/getElementsByClassName-11.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-11.xml rename to tests/wpt/tests/dom/nodes/getElementsByClassName-11.xml diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-12.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-12.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-12.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-12.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-13.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-13.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-13.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-13.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-14.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-14.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-14.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-14.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-15.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-15.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-15.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-15.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-16.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-16.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-16.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-16.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-17.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-17.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-17.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-17.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-18.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-18.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-18.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-18.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-19.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-19.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-19.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-19.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-20.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-20.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-20.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-20.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-21.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-21.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-21.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-21.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-22.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-22.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-22.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-22.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-23.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-23.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-23.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-23.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-24.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-24.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-24.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-24.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-25.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-25.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-25.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-25.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-26.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-26.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-26.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-26.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-27.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-27.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-27.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-27.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-28.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-28.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-28.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-28.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-29.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-29.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-29.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-29.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-30.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-30.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-30.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-30.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-31.htm b/tests/wpt/tests/dom/nodes/getElementsByClassName-31.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-31.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassName-31.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-32.html b/tests/wpt/tests/dom/nodes/getElementsByClassName-32.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-32.html rename to tests/wpt/tests/dom/nodes/getElementsByClassName-32.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-empty-set.html b/tests/wpt/tests/dom/nodes/getElementsByClassName-empty-set.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-empty-set.html rename to tests/wpt/tests/dom/nodes/getElementsByClassName-empty-set.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-whitespace-class-names.html b/tests/wpt/tests/dom/nodes/getElementsByClassName-whitespace-class-names.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassName-whitespace-class-names.html rename to tests/wpt/tests/dom/nodes/getElementsByClassName-whitespace-class-names.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/getElementsByClassNameFrame.htm b/tests/wpt/tests/dom/nodes/getElementsByClassNameFrame.htm similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/getElementsByClassNameFrame.htm rename to tests/wpt/tests/dom/nodes/getElementsByClassNameFrame.htm diff --git a/tests/wpt/web-platform-tests/dom/nodes/insert-adjacent.html b/tests/wpt/tests/dom/nodes/insert-adjacent.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/insert-adjacent.html rename to tests/wpt/tests/dom/nodes/insert-adjacent.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/mutationobservers.js b/tests/wpt/tests/dom/nodes/mutationobservers.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/mutationobservers.js rename to tests/wpt/tests/dom/nodes/mutationobservers.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/node-appendchild-crash.html b/tests/wpt/tests/dom/nodes/node-appendchild-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/node-appendchild-crash.html rename to tests/wpt/tests/dom/nodes/node-appendchild-crash.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/pre-insertion-validation-hierarchy.js b/tests/wpt/tests/dom/nodes/pre-insertion-validation-hierarchy.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/pre-insertion-validation-hierarchy.js rename to tests/wpt/tests/dom/nodes/pre-insertion-validation-hierarchy.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/pre-insertion-validation-notfound.js b/tests/wpt/tests/dom/nodes/pre-insertion-validation-notfound.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/pre-insertion-validation-notfound.js rename to tests/wpt/tests/dom/nodes/pre-insertion-validation-notfound.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/prepend-on-Document.html b/tests/wpt/tests/dom/nodes/prepend-on-Document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/prepend-on-Document.html rename to tests/wpt/tests/dom/nodes/prepend-on-Document.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/productions.js b/tests/wpt/tests/dom/nodes/productions.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/productions.js rename to tests/wpt/tests/dom/nodes/productions.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/query-target-in-load-event.html b/tests/wpt/tests/dom/nodes/query-target-in-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/query-target-in-load-event.html rename to tests/wpt/tests/dom/nodes/query-target-in-load-event.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/query-target-in-load-event.part.html b/tests/wpt/tests/dom/nodes/query-target-in-load-event.part.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/query-target-in-load-event.part.html rename to tests/wpt/tests/dom/nodes/query-target-in-load-event.part.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/remove-and-adopt-thcrash.html b/tests/wpt/tests/dom/nodes/remove-and-adopt-thcrash.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/remove-and-adopt-thcrash.html rename to tests/wpt/tests/dom/nodes/remove-and-adopt-thcrash.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/remove-from-shadow-host-and-adopt-into-iframe-ref.html b/tests/wpt/tests/dom/nodes/remove-from-shadow-host-and-adopt-into-iframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/remove-from-shadow-host-and-adopt-into-iframe-ref.html rename to tests/wpt/tests/dom/nodes/remove-from-shadow-host-and-adopt-into-iframe-ref.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/remove-from-shadow-host-and-adopt-into-iframe.html b/tests/wpt/tests/dom/nodes/remove-from-shadow-host-and-adopt-into-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/remove-from-shadow-host-and-adopt-into-iframe.html rename to tests/wpt/tests/dom/nodes/remove-from-shadow-host-and-adopt-into-iframe.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/remove-unscopable.html b/tests/wpt/tests/dom/nodes/remove-unscopable.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/remove-unscopable.html rename to tests/wpt/tests/dom/nodes/remove-unscopable.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/rootNode.html b/tests/wpt/tests/dom/nodes/rootNode.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/rootNode.html rename to tests/wpt/tests/dom/nodes/rootNode.html diff --git a/tests/wpt/web-platform-tests/dom/nodes/selectors.js b/tests/wpt/tests/dom/nodes/selectors.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/selectors.js rename to tests/wpt/tests/dom/nodes/selectors.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/support/NodeList-static-length-tampered.js b/tests/wpt/tests/dom/nodes/support/NodeList-static-length-tampered.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/support/NodeList-static-length-tampered.js rename to tests/wpt/tests/dom/nodes/support/NodeList-static-length-tampered.js diff --git a/tests/wpt/web-platform-tests/dom/nodes/svg-template-querySelector.html b/tests/wpt/tests/dom/nodes/svg-template-querySelector.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/nodes/svg-template-querySelector.html rename to tests/wpt/tests/dom/nodes/svg-template-querySelector.html diff --git a/tests/wpt/web-platform-tests/dom/parts/basic-dom-part-objects.tentative.html b/tests/wpt/tests/dom/parts/basic-dom-part-objects.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/parts/basic-dom-part-objects.tentative.html rename to tests/wpt/tests/dom/parts/basic-dom-part-objects.tentative.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-adopt-test.html b/tests/wpt/tests/dom/ranges/Range-adopt-test.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-adopt-test.html rename to tests/wpt/tests/dom/ranges/Range-adopt-test.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-attributes.html b/tests/wpt/tests/dom/ranges/Range-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-attributes.html rename to tests/wpt/tests/dom/ranges/Range-attributes.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-cloneContents.html b/tests/wpt/tests/dom/ranges/Range-cloneContents.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-cloneContents.html rename to tests/wpt/tests/dom/ranges/Range-cloneContents.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-cloneRange.html b/tests/wpt/tests/dom/ranges/Range-cloneRange.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-cloneRange.html rename to tests/wpt/tests/dom/ranges/Range-cloneRange.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-collapse.html b/tests/wpt/tests/dom/ranges/Range-collapse.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-collapse.html rename to tests/wpt/tests/dom/ranges/Range-collapse.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-commonAncestorContainer-2.html b/tests/wpt/tests/dom/ranges/Range-commonAncestorContainer-2.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-commonAncestorContainer-2.html rename to tests/wpt/tests/dom/ranges/Range-commonAncestorContainer-2.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-commonAncestorContainer.html b/tests/wpt/tests/dom/ranges/Range-commonAncestorContainer.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-commonAncestorContainer.html rename to tests/wpt/tests/dom/ranges/Range-commonAncestorContainer.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-compareBoundaryPoints.html b/tests/wpt/tests/dom/ranges/Range-compareBoundaryPoints.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-compareBoundaryPoints.html rename to tests/wpt/tests/dom/ranges/Range-compareBoundaryPoints.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-comparePoint-2.html b/tests/wpt/tests/dom/ranges/Range-comparePoint-2.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-comparePoint-2.html rename to tests/wpt/tests/dom/ranges/Range-comparePoint-2.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-comparePoint.html b/tests/wpt/tests/dom/ranges/Range-comparePoint.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-comparePoint.html rename to tests/wpt/tests/dom/ranges/Range-comparePoint.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-constructor.html b/tests/wpt/tests/dom/ranges/Range-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-constructor.html rename to tests/wpt/tests/dom/ranges/Range-constructor.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-deleteContents.html b/tests/wpt/tests/dom/ranges/Range-deleteContents.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-deleteContents.html rename to tests/wpt/tests/dom/ranges/Range-deleteContents.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-detach.html b/tests/wpt/tests/dom/ranges/Range-detach.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-detach.html rename to tests/wpt/tests/dom/ranges/Range-detach.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-extractContents.html b/tests/wpt/tests/dom/ranges/Range-extractContents.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-extractContents.html rename to tests/wpt/tests/dom/ranges/Range-extractContents.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-insertNode.html b/tests/wpt/tests/dom/ranges/Range-insertNode.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-insertNode.html rename to tests/wpt/tests/dom/ranges/Range-insertNode.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-intersectsNode-2.html b/tests/wpt/tests/dom/ranges/Range-intersectsNode-2.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-intersectsNode-2.html rename to tests/wpt/tests/dom/ranges/Range-intersectsNode-2.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-intersectsNode-binding.html b/tests/wpt/tests/dom/ranges/Range-intersectsNode-binding.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-intersectsNode-binding.html rename to tests/wpt/tests/dom/ranges/Range-intersectsNode-binding.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-intersectsNode-shadow.html b/tests/wpt/tests/dom/ranges/Range-intersectsNode-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-intersectsNode-shadow.html rename to tests/wpt/tests/dom/ranges/Range-intersectsNode-shadow.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-intersectsNode.html b/tests/wpt/tests/dom/ranges/Range-intersectsNode.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-intersectsNode.html rename to tests/wpt/tests/dom/ranges/Range-intersectsNode.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-isPointInRange.html b/tests/wpt/tests/dom/ranges/Range-isPointInRange.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-isPointInRange.html rename to tests/wpt/tests/dom/ranges/Range-isPointInRange.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-mutations-appendChild.html b/tests/wpt/tests/dom/ranges/Range-mutations-appendChild.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-mutations-appendChild.html rename to tests/wpt/tests/dom/ranges/Range-mutations-appendChild.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-mutations-appendData.html b/tests/wpt/tests/dom/ranges/Range-mutations-appendData.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-mutations-appendData.html rename to tests/wpt/tests/dom/ranges/Range-mutations-appendData.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-mutations-dataChange.html b/tests/wpt/tests/dom/ranges/Range-mutations-dataChange.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-mutations-dataChange.html rename to tests/wpt/tests/dom/ranges/Range-mutations-dataChange.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-mutations-deleteData.html b/tests/wpt/tests/dom/ranges/Range-mutations-deleteData.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-mutations-deleteData.html rename to tests/wpt/tests/dom/ranges/Range-mutations-deleteData.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-mutations-insertBefore.html b/tests/wpt/tests/dom/ranges/Range-mutations-insertBefore.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-mutations-insertBefore.html rename to tests/wpt/tests/dom/ranges/Range-mutations-insertBefore.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-mutations-insertData.html b/tests/wpt/tests/dom/ranges/Range-mutations-insertData.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-mutations-insertData.html rename to tests/wpt/tests/dom/ranges/Range-mutations-insertData.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-mutations-removeChild.html b/tests/wpt/tests/dom/ranges/Range-mutations-removeChild.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-mutations-removeChild.html rename to tests/wpt/tests/dom/ranges/Range-mutations-removeChild.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-mutations-replaceChild.html b/tests/wpt/tests/dom/ranges/Range-mutations-replaceChild.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-mutations-replaceChild.html rename to tests/wpt/tests/dom/ranges/Range-mutations-replaceChild.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-mutations-replaceData.html b/tests/wpt/tests/dom/ranges/Range-mutations-replaceData.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-mutations-replaceData.html rename to tests/wpt/tests/dom/ranges/Range-mutations-replaceData.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-mutations-splitText.html b/tests/wpt/tests/dom/ranges/Range-mutations-splitText.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-mutations-splitText.html rename to tests/wpt/tests/dom/ranges/Range-mutations-splitText.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-mutations.js b/tests/wpt/tests/dom/ranges/Range-mutations.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-mutations.js rename to tests/wpt/tests/dom/ranges/Range-mutations.js diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-selectNode.html b/tests/wpt/tests/dom/ranges/Range-selectNode.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-selectNode.html rename to tests/wpt/tests/dom/ranges/Range-selectNode.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-set.html b/tests/wpt/tests/dom/ranges/Range-set.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-set.html rename to tests/wpt/tests/dom/ranges/Range-set.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-stringifier.html b/tests/wpt/tests/dom/ranges/Range-stringifier.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-stringifier.html rename to tests/wpt/tests/dom/ranges/Range-stringifier.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-surroundContents.html b/tests/wpt/tests/dom/ranges/Range-surroundContents.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-surroundContents.html rename to tests/wpt/tests/dom/ranges/Range-surroundContents.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-test-iframe.html b/tests/wpt/tests/dom/ranges/Range-test-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/Range-test-iframe.html rename to tests/wpt/tests/dom/ranges/Range-test-iframe.html diff --git a/tests/wpt/web-platform-tests/dom/ranges/StaticRange-constructor.html b/tests/wpt/tests/dom/ranges/StaticRange-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/ranges/StaticRange-constructor.html rename to tests/wpt/tests/dom/ranges/StaticRange-constructor.html diff --git a/tests/wpt/web-platform-tests/dom/slot-recalc-ref.html b/tests/wpt/tests/dom/slot-recalc-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/slot-recalc-ref.html rename to tests/wpt/tests/dom/slot-recalc-ref.html diff --git a/tests/wpt/web-platform-tests/dom/slot-recalc.html b/tests/wpt/tests/dom/slot-recalc.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/slot-recalc.html rename to tests/wpt/tests/dom/slot-recalc.html diff --git a/tests/wpt/web-platform-tests/dom/svg-insert-crash.html b/tests/wpt/tests/dom/svg-insert-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/svg-insert-crash.html rename to tests/wpt/tests/dom/svg-insert-crash.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/NodeFilter-constants.html b/tests/wpt/tests/dom/traversal/NodeFilter-constants.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/NodeFilter-constants.html rename to tests/wpt/tests/dom/traversal/NodeFilter-constants.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/NodeIterator-removal.html b/tests/wpt/tests/dom/traversal/NodeIterator-removal.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/NodeIterator-removal.html rename to tests/wpt/tests/dom/traversal/NodeIterator-removal.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/NodeIterator.html b/tests/wpt/tests/dom/traversal/NodeIterator.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/NodeIterator.html rename to tests/wpt/tests/dom/traversal/NodeIterator.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/TreeWalker-acceptNode-filter-cross-realm-null-browsing-context.html b/tests/wpt/tests/dom/traversal/TreeWalker-acceptNode-filter-cross-realm-null-browsing-context.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/TreeWalker-acceptNode-filter-cross-realm-null-browsing-context.html rename to tests/wpt/tests/dom/traversal/TreeWalker-acceptNode-filter-cross-realm-null-browsing-context.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/TreeWalker-acceptNode-filter-cross-realm.html b/tests/wpt/tests/dom/traversal/TreeWalker-acceptNode-filter-cross-realm.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/TreeWalker-acceptNode-filter-cross-realm.html rename to tests/wpt/tests/dom/traversal/TreeWalker-acceptNode-filter-cross-realm.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/TreeWalker-acceptNode-filter.html b/tests/wpt/tests/dom/traversal/TreeWalker-acceptNode-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/TreeWalker-acceptNode-filter.html rename to tests/wpt/tests/dom/traversal/TreeWalker-acceptNode-filter.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/TreeWalker-basic.html b/tests/wpt/tests/dom/traversal/TreeWalker-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/TreeWalker-basic.html rename to tests/wpt/tests/dom/traversal/TreeWalker-basic.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/TreeWalker-currentNode.html b/tests/wpt/tests/dom/traversal/TreeWalker-currentNode.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/TreeWalker-currentNode.html rename to tests/wpt/tests/dom/traversal/TreeWalker-currentNode.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/TreeWalker-previousNodeLastChildReject.html b/tests/wpt/tests/dom/traversal/TreeWalker-previousNodeLastChildReject.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/TreeWalker-previousNodeLastChildReject.html rename to tests/wpt/tests/dom/traversal/TreeWalker-previousNodeLastChildReject.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/TreeWalker-previousSiblingLastChildSkip.html b/tests/wpt/tests/dom/traversal/TreeWalker-previousSiblingLastChildSkip.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/TreeWalker-previousSiblingLastChildSkip.html rename to tests/wpt/tests/dom/traversal/TreeWalker-previousSiblingLastChildSkip.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/TreeWalker-traversal-reject.html b/tests/wpt/tests/dom/traversal/TreeWalker-traversal-reject.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/TreeWalker-traversal-reject.html rename to tests/wpt/tests/dom/traversal/TreeWalker-traversal-reject.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/TreeWalker-traversal-skip-most.html b/tests/wpt/tests/dom/traversal/TreeWalker-traversal-skip-most.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/TreeWalker-traversal-skip-most.html rename to tests/wpt/tests/dom/traversal/TreeWalker-traversal-skip-most.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/TreeWalker-traversal-skip.html b/tests/wpt/tests/dom/traversal/TreeWalker-traversal-skip.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/TreeWalker-traversal-skip.html rename to tests/wpt/tests/dom/traversal/TreeWalker-traversal-skip.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/TreeWalker-walking-outside-a-tree.html b/tests/wpt/tests/dom/traversal/TreeWalker-walking-outside-a-tree.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/TreeWalker-walking-outside-a-tree.html rename to tests/wpt/tests/dom/traversal/TreeWalker-walking-outside-a-tree.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/TreeWalker.html b/tests/wpt/tests/dom/traversal/TreeWalker.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/TreeWalker.html rename to tests/wpt/tests/dom/traversal/TreeWalker.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/support/TreeWalker-acceptNode-filter-cross-realm-null-browsing-context-subframe.html b/tests/wpt/tests/dom/traversal/support/TreeWalker-acceptNode-filter-cross-realm-null-browsing-context-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/support/TreeWalker-acceptNode-filter-cross-realm-null-browsing-context-subframe.html rename to tests/wpt/tests/dom/traversal/support/TreeWalker-acceptNode-filter-cross-realm-null-browsing-context-subframe.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/support/assert-node.js b/tests/wpt/tests/dom/traversal/support/assert-node.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/support/assert-node.js rename to tests/wpt/tests/dom/traversal/support/assert-node.js diff --git a/tests/wpt/web-platform-tests/dom/traversal/support/empty-document.html b/tests/wpt/tests/dom/traversal/support/empty-document.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/support/empty-document.html rename to tests/wpt/tests/dom/traversal/support/empty-document.html diff --git a/tests/wpt/web-platform-tests/dom/traversal/unfinished/001.xml b/tests/wpt/tests/dom/traversal/unfinished/001.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/unfinished/001.xml rename to tests/wpt/tests/dom/traversal/unfinished/001.xml diff --git a/tests/wpt/web-platform-tests/dom/traversal/unfinished/002.xml b/tests/wpt/tests/dom/traversal/unfinished/002.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/unfinished/002.xml rename to tests/wpt/tests/dom/traversal/unfinished/002.xml diff --git a/tests/wpt/web-platform-tests/dom/traversal/unfinished/003.xml b/tests/wpt/tests/dom/traversal/unfinished/003.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/unfinished/003.xml rename to tests/wpt/tests/dom/traversal/unfinished/003.xml diff --git a/tests/wpt/web-platform-tests/dom/traversal/unfinished/004.xml b/tests/wpt/tests/dom/traversal/unfinished/004.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/unfinished/004.xml rename to tests/wpt/tests/dom/traversal/unfinished/004.xml diff --git a/tests/wpt/web-platform-tests/dom/traversal/unfinished/005.xml b/tests/wpt/tests/dom/traversal/unfinished/005.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/unfinished/005.xml rename to tests/wpt/tests/dom/traversal/unfinished/005.xml diff --git a/tests/wpt/web-platform-tests/dom/traversal/unfinished/006.xml b/tests/wpt/tests/dom/traversal/unfinished/006.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/unfinished/006.xml rename to tests/wpt/tests/dom/traversal/unfinished/006.xml diff --git a/tests/wpt/web-platform-tests/dom/traversal/unfinished/007.xml b/tests/wpt/tests/dom/traversal/unfinished/007.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/unfinished/007.xml rename to tests/wpt/tests/dom/traversal/unfinished/007.xml diff --git a/tests/wpt/web-platform-tests/dom/traversal/unfinished/008.xml b/tests/wpt/tests/dom/traversal/unfinished/008.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/unfinished/008.xml rename to tests/wpt/tests/dom/traversal/unfinished/008.xml diff --git a/tests/wpt/web-platform-tests/dom/traversal/unfinished/009.xml b/tests/wpt/tests/dom/traversal/unfinished/009.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/unfinished/009.xml rename to tests/wpt/tests/dom/traversal/unfinished/009.xml diff --git a/tests/wpt/web-platform-tests/dom/traversal/unfinished/010.xml b/tests/wpt/tests/dom/traversal/unfinished/010.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/unfinished/010.xml rename to tests/wpt/tests/dom/traversal/unfinished/010.xml diff --git a/tests/wpt/web-platform-tests/dom/traversal/unfinished/TODO b/tests/wpt/tests/dom/traversal/unfinished/TODO similarity index 100% rename from tests/wpt/web-platform-tests/dom/traversal/unfinished/TODO rename to tests/wpt/tests/dom/traversal/unfinished/TODO diff --git a/tests/wpt/web-platform-tests/dom/window-extends-event-target.html b/tests/wpt/tests/dom/window-extends-event-target.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/window-extends-event-target.html rename to tests/wpt/tests/dom/window-extends-event-target.html diff --git a/tests/wpt/web-platform-tests/dom/xslt/README.md b/tests/wpt/tests/dom/xslt/README.md similarity index 100% rename from tests/wpt/web-platform-tests/dom/xslt/README.md rename to tests/wpt/tests/dom/xslt/README.md diff --git a/tests/wpt/web-platform-tests/dom/xslt/externalScript.js b/tests/wpt/tests/dom/xslt/externalScript.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/xslt/externalScript.js rename to tests/wpt/tests/dom/xslt/externalScript.js diff --git a/tests/wpt/web-platform-tests/dom/xslt/functions.tentative.window.js b/tests/wpt/tests/dom/xslt/functions.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/xslt/functions.tentative.window.js rename to tests/wpt/tests/dom/xslt/functions.tentative.window.js diff --git a/tests/wpt/web-platform-tests/dom/xslt/invalid-output-encoding-crash.html b/tests/wpt/tests/dom/xslt/invalid-output-encoding-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/xslt/invalid-output-encoding-crash.html rename to tests/wpt/tests/dom/xslt/invalid-output-encoding-crash.html diff --git a/tests/wpt/web-platform-tests/dom/xslt/sort-ref.html b/tests/wpt/tests/dom/xslt/sort-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/xslt/sort-ref.html rename to tests/wpt/tests/dom/xslt/sort-ref.html diff --git a/tests/wpt/web-platform-tests/dom/xslt/sort.html b/tests/wpt/tests/dom/xslt/sort.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/xslt/sort.html rename to tests/wpt/tests/dom/xslt/sort.html diff --git a/tests/wpt/web-platform-tests/dom/xslt/strip-space-crash.xml b/tests/wpt/tests/dom/xslt/strip-space-crash.xml similarity index 100% rename from tests/wpt/web-platform-tests/dom/xslt/strip-space-crash.xml rename to tests/wpt/tests/dom/xslt/strip-space-crash.xml diff --git a/tests/wpt/web-platform-tests/dom/xslt/transformToFragment-on-node-from-inactive-document-crash.html b/tests/wpt/tests/dom/xslt/transformToFragment-on-node-from-inactive-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/dom/xslt/transformToFragment-on-node-from-inactive-document-crash.html rename to tests/wpt/tests/dom/xslt/transformToFragment-on-node-from-inactive-document-crash.html diff --git a/tests/wpt/web-platform-tests/dom/xslt/transformToFragment.tentative.window.js b/tests/wpt/tests/dom/xslt/transformToFragment.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/dom/xslt/transformToFragment.tentative.window.js rename to tests/wpt/tests/dom/xslt/transformToFragment.tentative.window.js diff --git a/tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-encoding.html b/tests/wpt/tests/domparsing/DOMParser-parseFromString-encoding.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-encoding.html rename to tests/wpt/tests/domparsing/DOMParser-parseFromString-encoding.html diff --git a/tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-html.html b/tests/wpt/tests/domparsing/DOMParser-parseFromString-html.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-html.html rename to tests/wpt/tests/domparsing/DOMParser-parseFromString-html.html diff --git a/tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-url-base-pushstate.html b/tests/wpt/tests/domparsing/DOMParser-parseFromString-url-base-pushstate.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-url-base-pushstate.html rename to tests/wpt/tests/domparsing/DOMParser-parseFromString-url-base-pushstate.html diff --git a/tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-url-base.html b/tests/wpt/tests/domparsing/DOMParser-parseFromString-url-base.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-url-base.html rename to tests/wpt/tests/domparsing/DOMParser-parseFromString-url-base.html diff --git a/tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-url-moretests.html b/tests/wpt/tests/domparsing/DOMParser-parseFromString-url-moretests.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-url-moretests.html rename to tests/wpt/tests/domparsing/DOMParser-parseFromString-url-moretests.html diff --git a/tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-url-pushstate.html b/tests/wpt/tests/domparsing/DOMParser-parseFromString-url-pushstate.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-url-pushstate.html rename to tests/wpt/tests/domparsing/DOMParser-parseFromString-url-pushstate.html diff --git a/tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-url.html b/tests/wpt/tests/domparsing/DOMParser-parseFromString-url.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-url.html rename to tests/wpt/tests/domparsing/DOMParser-parseFromString-url.html diff --git a/tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-xml-doctype.html b/tests/wpt/tests/domparsing/DOMParser-parseFromString-xml-doctype.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-xml-doctype.html rename to tests/wpt/tests/domparsing/DOMParser-parseFromString-xml-doctype.html diff --git a/tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-xml-internal-subset.html b/tests/wpt/tests/domparsing/DOMParser-parseFromString-xml-internal-subset.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-xml-internal-subset.html rename to tests/wpt/tests/domparsing/DOMParser-parseFromString-xml-internal-subset.html diff --git a/tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-xml-parsererror.html b/tests/wpt/tests/domparsing/DOMParser-parseFromString-xml-parsererror.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-xml-parsererror.html rename to tests/wpt/tests/domparsing/DOMParser-parseFromString-xml-parsererror.html diff --git a/tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-xml.html b/tests/wpt/tests/domparsing/DOMParser-parseFromString-xml.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/DOMParser-parseFromString-xml.html rename to tests/wpt/tests/domparsing/DOMParser-parseFromString-xml.html diff --git a/tests/wpt/web-platform-tests/domparsing/META.yml b/tests/wpt/tests/domparsing/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/META.yml rename to tests/wpt/tests/domparsing/META.yml diff --git a/tests/wpt/web-platform-tests/domparsing/XMLSerializer-serializeToString.html b/tests/wpt/tests/domparsing/XMLSerializer-serializeToString.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/XMLSerializer-serializeToString.html rename to tests/wpt/tests/domparsing/XMLSerializer-serializeToString.html diff --git a/tests/wpt/web-platform-tests/domparsing/createContextualFragment.html b/tests/wpt/tests/domparsing/createContextualFragment.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/createContextualFragment.html rename to tests/wpt/tests/domparsing/createContextualFragment.html diff --git a/tests/wpt/web-platform-tests/domparsing/idlharness.window.js b/tests/wpt/tests/domparsing/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/idlharness.window.js rename to tests/wpt/tests/domparsing/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/domparsing/innerhtml-01.xhtml b/tests/wpt/tests/domparsing/innerhtml-01.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/innerhtml-01.xhtml rename to tests/wpt/tests/domparsing/innerhtml-01.xhtml diff --git a/tests/wpt/web-platform-tests/domparsing/innerhtml-03.xhtml b/tests/wpt/tests/domparsing/innerhtml-03.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/innerhtml-03.xhtml rename to tests/wpt/tests/domparsing/innerhtml-03.xhtml diff --git a/tests/wpt/web-platform-tests/domparsing/innerhtml-04.html b/tests/wpt/tests/domparsing/innerhtml-04.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/innerhtml-04.html rename to tests/wpt/tests/domparsing/innerhtml-04.html diff --git a/tests/wpt/web-platform-tests/domparsing/innerhtml-05.xhtml b/tests/wpt/tests/domparsing/innerhtml-05.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/innerhtml-05.xhtml rename to tests/wpt/tests/domparsing/innerhtml-05.xhtml diff --git a/tests/wpt/web-platform-tests/domparsing/innerhtml-06.html b/tests/wpt/tests/domparsing/innerhtml-06.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/innerhtml-06.html rename to tests/wpt/tests/domparsing/innerhtml-06.html diff --git a/tests/wpt/web-platform-tests/domparsing/innerhtml-07.html b/tests/wpt/tests/domparsing/innerhtml-07.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/innerhtml-07.html rename to tests/wpt/tests/domparsing/innerhtml-07.html diff --git a/tests/wpt/web-platform-tests/domparsing/innerhtml-mxss.sub.html b/tests/wpt/tests/domparsing/innerhtml-mxss.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/innerhtml-mxss.sub.html rename to tests/wpt/tests/domparsing/innerhtml-mxss.sub.html diff --git a/tests/wpt/web-platform-tests/domparsing/insert-adjacent.html b/tests/wpt/tests/domparsing/insert-adjacent.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/insert-adjacent.html rename to tests/wpt/tests/domparsing/insert-adjacent.html diff --git a/tests/wpt/web-platform-tests/domparsing/insert_adjacent_html-xhtml.xhtml b/tests/wpt/tests/domparsing/insert_adjacent_html-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/insert_adjacent_html-xhtml.xhtml rename to tests/wpt/tests/domparsing/insert_adjacent_html-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/domparsing/insert_adjacent_html.html b/tests/wpt/tests/domparsing/insert_adjacent_html.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/insert_adjacent_html.html rename to tests/wpt/tests/domparsing/insert_adjacent_html.html diff --git a/tests/wpt/web-platform-tests/domparsing/insert_adjacent_html.js b/tests/wpt/tests/domparsing/insert_adjacent_html.js similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/insert_adjacent_html.js rename to tests/wpt/tests/domparsing/insert_adjacent_html.js diff --git a/tests/wpt/web-platform-tests/domparsing/outerhtml-01.html b/tests/wpt/tests/domparsing/outerhtml-01.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/outerhtml-01.html rename to tests/wpt/tests/domparsing/outerhtml-01.html diff --git a/tests/wpt/web-platform-tests/domparsing/outerhtml-02.html b/tests/wpt/tests/domparsing/outerhtml-02.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/outerhtml-02.html rename to tests/wpt/tests/domparsing/outerhtml-02.html diff --git a/tests/wpt/web-platform-tests/domparsing/resources/domparser-iframe-base-pushstate.html b/tests/wpt/tests/domparsing/resources/domparser-iframe-base-pushstate.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/resources/domparser-iframe-base-pushstate.html rename to tests/wpt/tests/domparsing/resources/domparser-iframe-base-pushstate.html diff --git a/tests/wpt/web-platform-tests/domparsing/resources/domparser-iframe-base.html b/tests/wpt/tests/domparsing/resources/domparser-iframe-base.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/resources/domparser-iframe-base.html rename to tests/wpt/tests/domparsing/resources/domparser-iframe-base.html diff --git a/tests/wpt/web-platform-tests/domparsing/resources/domparser-iframe-pushstate.html b/tests/wpt/tests/domparsing/resources/domparser-iframe-pushstate.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/resources/domparser-iframe-pushstate.html rename to tests/wpt/tests/domparsing/resources/domparser-iframe-pushstate.html diff --git a/tests/wpt/web-platform-tests/domparsing/resources/domparser-iframe.html b/tests/wpt/tests/domparsing/resources/domparser-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/resources/domparser-iframe.html rename to tests/wpt/tests/domparsing/resources/domparser-iframe.html diff --git a/tests/wpt/web-platform-tests/domparsing/resources/domparser-iframe.js b/tests/wpt/tests/domparsing/resources/domparser-iframe.js similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/resources/domparser-iframe.js rename to tests/wpt/tests/domparsing/resources/domparser-iframe.js diff --git a/tests/wpt/web-platform-tests/domparsing/resources/domparser-url-tests.js b/tests/wpt/tests/domparsing/resources/domparser-url-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/resources/domparser-url-tests.js rename to tests/wpt/tests/domparsing/resources/domparser-url-tests.js diff --git a/tests/wpt/web-platform-tests/domparsing/style_attribute_html.html b/tests/wpt/tests/domparsing/style_attribute_html.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/style_attribute_html.html rename to tests/wpt/tests/domparsing/style_attribute_html.html diff --git a/tests/wpt/web-platform-tests/domparsing/xml-serialization.xhtml b/tests/wpt/tests/domparsing/xml-serialization.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/xml-serialization.xhtml rename to tests/wpt/tests/domparsing/xml-serialization.xhtml diff --git a/tests/wpt/web-platform-tests/domparsing/xmldomparser.html b/tests/wpt/tests/domparsing/xmldomparser.html similarity index 100% rename from tests/wpt/web-platform-tests/domparsing/xmldomparser.html rename to tests/wpt/tests/domparsing/xmldomparser.html diff --git a/tests/wpt/web-platform-tests/domxpath/001.html b/tests/wpt/tests/domxpath/001.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/001.html rename to tests/wpt/tests/domxpath/001.html diff --git a/tests/wpt/web-platform-tests/domxpath/002.html b/tests/wpt/tests/domxpath/002.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/002.html rename to tests/wpt/tests/domxpath/002.html diff --git a/tests/wpt/web-platform-tests/domxpath/META.yml b/tests/wpt/tests/domxpath/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/META.yml rename to tests/wpt/tests/domxpath/META.yml diff --git a/tests/wpt/web-platform-tests/domxpath/README.md b/tests/wpt/tests/domxpath/README.md similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/README.md rename to tests/wpt/tests/domxpath/README.md diff --git a/tests/wpt/web-platform-tests/domxpath/booleans.html b/tests/wpt/tests/domxpath/booleans.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/booleans.html rename to tests/wpt/tests/domxpath/booleans.html diff --git a/tests/wpt/web-platform-tests/domxpath/document.tentative.html b/tests/wpt/tests/domxpath/document.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/document.tentative.html rename to tests/wpt/tests/domxpath/document.tentative.html diff --git a/tests/wpt/web-platform-tests/domxpath/evaluator-constructor.html b/tests/wpt/tests/domxpath/evaluator-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/evaluator-constructor.html rename to tests/wpt/tests/domxpath/evaluator-constructor.html diff --git a/tests/wpt/web-platform-tests/domxpath/fn-concat.html b/tests/wpt/tests/domxpath/fn-concat.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/fn-concat.html rename to tests/wpt/tests/domxpath/fn-concat.html diff --git a/tests/wpt/web-platform-tests/domxpath/fn-contains.html b/tests/wpt/tests/domxpath/fn-contains.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/fn-contains.html rename to tests/wpt/tests/domxpath/fn-contains.html diff --git a/tests/wpt/web-platform-tests/domxpath/fn-lang.html b/tests/wpt/tests/domxpath/fn-lang.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/fn-lang.html rename to tests/wpt/tests/domxpath/fn-lang.html diff --git a/tests/wpt/web-platform-tests/domxpath/fn-normalize-space.html b/tests/wpt/tests/domxpath/fn-normalize-space.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/fn-normalize-space.html rename to tests/wpt/tests/domxpath/fn-normalize-space.html diff --git a/tests/wpt/web-platform-tests/domxpath/fn-starts-with.html b/tests/wpt/tests/domxpath/fn-starts-with.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/fn-starts-with.html rename to tests/wpt/tests/domxpath/fn-starts-with.html diff --git a/tests/wpt/web-platform-tests/domxpath/fn-substring-after.html b/tests/wpt/tests/domxpath/fn-substring-after.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/fn-substring-after.html rename to tests/wpt/tests/domxpath/fn-substring-after.html diff --git a/tests/wpt/web-platform-tests/domxpath/fn-substring-before.html b/tests/wpt/tests/domxpath/fn-substring-before.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/fn-substring-before.html rename to tests/wpt/tests/domxpath/fn-substring-before.html diff --git a/tests/wpt/web-platform-tests/domxpath/fn-substring.html b/tests/wpt/tests/domxpath/fn-substring.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/fn-substring.html rename to tests/wpt/tests/domxpath/fn-substring.html diff --git a/tests/wpt/web-platform-tests/domxpath/fn-translate.html b/tests/wpt/tests/domxpath/fn-translate.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/fn-translate.html rename to tests/wpt/tests/domxpath/fn-translate.html diff --git a/tests/wpt/web-platform-tests/domxpath/helpers.js b/tests/wpt/tests/domxpath/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/helpers.js rename to tests/wpt/tests/domxpath/helpers.js diff --git a/tests/wpt/web-platform-tests/domxpath/lexical-structure.html b/tests/wpt/tests/domxpath/lexical-structure.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/lexical-structure.html rename to tests/wpt/tests/domxpath/lexical-structure.html diff --git a/tests/wpt/web-platform-tests/domxpath/node-sets.html b/tests/wpt/tests/domxpath/node-sets.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/node-sets.html rename to tests/wpt/tests/domxpath/node-sets.html diff --git a/tests/wpt/web-platform-tests/domxpath/numbers.html b/tests/wpt/tests/domxpath/numbers.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/numbers.html rename to tests/wpt/tests/domxpath/numbers.html diff --git a/tests/wpt/web-platform-tests/domxpath/predicates.html b/tests/wpt/tests/domxpath/predicates.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/predicates.html rename to tests/wpt/tests/domxpath/predicates.html diff --git a/tests/wpt/web-platform-tests/domxpath/resolver-callback-interface-cross-realm.tentative.html b/tests/wpt/tests/domxpath/resolver-callback-interface-cross-realm.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/resolver-callback-interface-cross-realm.tentative.html rename to tests/wpt/tests/domxpath/resolver-callback-interface-cross-realm.tentative.html diff --git a/tests/wpt/web-platform-tests/domxpath/resolver-callback-interface.html b/tests/wpt/tests/domxpath/resolver-callback-interface.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/resolver-callback-interface.html rename to tests/wpt/tests/domxpath/resolver-callback-interface.html diff --git a/tests/wpt/web-platform-tests/domxpath/resolver-non-string-result.html b/tests/wpt/tests/domxpath/resolver-non-string-result.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/resolver-non-string-result.html rename to tests/wpt/tests/domxpath/resolver-non-string-result.html diff --git a/tests/wpt/web-platform-tests/domxpath/resources/empty-document.html b/tests/wpt/tests/domxpath/resources/empty-document.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/resources/empty-document.html rename to tests/wpt/tests/domxpath/resources/empty-document.html diff --git a/tests/wpt/web-platform-tests/domxpath/resources/invalid_namespace_test.js b/tests/wpt/tests/domxpath/resources/invalid_namespace_test.js similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/resources/invalid_namespace_test.js rename to tests/wpt/tests/domxpath/resources/invalid_namespace_test.js diff --git a/tests/wpt/web-platform-tests/domxpath/xml_xpath_runner.html b/tests/wpt/tests/domxpath/xml_xpath_runner.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/xml_xpath_runner.html rename to tests/wpt/tests/domxpath/xml_xpath_runner.html diff --git a/tests/wpt/web-platform-tests/domxpath/xml_xpath_tests.xml b/tests/wpt/tests/domxpath/xml_xpath_tests.xml similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/xml_xpath_tests.xml rename to tests/wpt/tests/domxpath/xml_xpath_tests.xml diff --git a/tests/wpt/web-platform-tests/domxpath/xpath-evaluate-crash.html b/tests/wpt/tests/domxpath/xpath-evaluate-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/xpath-evaluate-crash.html rename to tests/wpt/tests/domxpath/xpath-evaluate-crash.html diff --git a/tests/wpt/web-platform-tests/domxpath/xpathevaluatorbase-creatensresolver.html b/tests/wpt/tests/domxpath/xpathevaluatorbase-creatensresolver.html similarity index 100% rename from tests/wpt/web-platform-tests/domxpath/xpathevaluatorbase-creatensresolver.html rename to tests/wpt/tests/domxpath/xpathevaluatorbase-creatensresolver.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/META.yml b/tests/wpt/tests/dpub-aam/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/META.yml rename to tests/wpt/tests/dpub-aam/META.yml diff --git a/tests/wpt/web-platform-tests/dpub-aam/README.md b/tests/wpt/tests/dpub-aam/README.md similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/README.md rename to tests/wpt/tests/dpub-aam/README.md diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-abstract-manual.html b/tests/wpt/tests/dpub-aam/doc-abstract-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-abstract-manual.html rename to tests/wpt/tests/dpub-aam/doc-abstract-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-acknowledgments-manual.html b/tests/wpt/tests/dpub-aam/doc-acknowledgments-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-acknowledgments-manual.html rename to tests/wpt/tests/dpub-aam/doc-acknowledgments-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-afterword-manual.html b/tests/wpt/tests/dpub-aam/doc-afterword-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-afterword-manual.html rename to tests/wpt/tests/dpub-aam/doc-afterword-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-appendix-manual.html b/tests/wpt/tests/dpub-aam/doc-appendix-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-appendix-manual.html rename to tests/wpt/tests/dpub-aam/doc-appendix-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-backlink-manual.html b/tests/wpt/tests/dpub-aam/doc-backlink-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-backlink-manual.html rename to tests/wpt/tests/dpub-aam/doc-backlink-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-biblioentry-manual.html b/tests/wpt/tests/dpub-aam/doc-biblioentry-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-biblioentry-manual.html rename to tests/wpt/tests/dpub-aam/doc-biblioentry-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-bibliography-manual.html b/tests/wpt/tests/dpub-aam/doc-bibliography-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-bibliography-manual.html rename to tests/wpt/tests/dpub-aam/doc-bibliography-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-biblioref-manual.html b/tests/wpt/tests/dpub-aam/doc-biblioref-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-biblioref-manual.html rename to tests/wpt/tests/dpub-aam/doc-biblioref-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-chapter-manual.html b/tests/wpt/tests/dpub-aam/doc-chapter-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-chapter-manual.html rename to tests/wpt/tests/dpub-aam/doc-chapter-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-colophon-manual.html b/tests/wpt/tests/dpub-aam/doc-colophon-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-colophon-manual.html rename to tests/wpt/tests/dpub-aam/doc-colophon-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-conclusion-manual.html b/tests/wpt/tests/dpub-aam/doc-conclusion-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-conclusion-manual.html rename to tests/wpt/tests/dpub-aam/doc-conclusion-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-cover-manual.html b/tests/wpt/tests/dpub-aam/doc-cover-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-cover-manual.html rename to tests/wpt/tests/dpub-aam/doc-cover-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-credit-manual.html b/tests/wpt/tests/dpub-aam/doc-credit-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-credit-manual.html rename to tests/wpt/tests/dpub-aam/doc-credit-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-credits-manual.html b/tests/wpt/tests/dpub-aam/doc-credits-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-credits-manual.html rename to tests/wpt/tests/dpub-aam/doc-credits-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-dedication-manual.html b/tests/wpt/tests/dpub-aam/doc-dedication-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-dedication-manual.html rename to tests/wpt/tests/dpub-aam/doc-dedication-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-endnote-manual.html b/tests/wpt/tests/dpub-aam/doc-endnote-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-endnote-manual.html rename to tests/wpt/tests/dpub-aam/doc-endnote-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-endnotes-manual.html b/tests/wpt/tests/dpub-aam/doc-endnotes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-endnotes-manual.html rename to tests/wpt/tests/dpub-aam/doc-endnotes-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-epigraph-manual.html b/tests/wpt/tests/dpub-aam/doc-epigraph-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-epigraph-manual.html rename to tests/wpt/tests/dpub-aam/doc-epigraph-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-epilogue-manual.html b/tests/wpt/tests/dpub-aam/doc-epilogue-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-epilogue-manual.html rename to tests/wpt/tests/dpub-aam/doc-epilogue-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-errata-manual.html b/tests/wpt/tests/dpub-aam/doc-errata-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-errata-manual.html rename to tests/wpt/tests/dpub-aam/doc-errata-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-example-manual.html b/tests/wpt/tests/dpub-aam/doc-example-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-example-manual.html rename to tests/wpt/tests/dpub-aam/doc-example-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-footnote-manual.html b/tests/wpt/tests/dpub-aam/doc-footnote-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-footnote-manual.html rename to tests/wpt/tests/dpub-aam/doc-footnote-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-foreword-manual.html b/tests/wpt/tests/dpub-aam/doc-foreword-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-foreword-manual.html rename to tests/wpt/tests/dpub-aam/doc-foreword-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-glossary-manual.html b/tests/wpt/tests/dpub-aam/doc-glossary-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-glossary-manual.html rename to tests/wpt/tests/dpub-aam/doc-glossary-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-glossref-manual.html b/tests/wpt/tests/dpub-aam/doc-glossref-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-glossref-manual.html rename to tests/wpt/tests/dpub-aam/doc-glossref-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-index-manual.html b/tests/wpt/tests/dpub-aam/doc-index-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-index-manual.html rename to tests/wpt/tests/dpub-aam/doc-index-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-introduction-manual.html b/tests/wpt/tests/dpub-aam/doc-introduction-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-introduction-manual.html rename to tests/wpt/tests/dpub-aam/doc-introduction-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-noteref-manual.html b/tests/wpt/tests/dpub-aam/doc-noteref-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-noteref-manual.html rename to tests/wpt/tests/dpub-aam/doc-noteref-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-notice-manual.html b/tests/wpt/tests/dpub-aam/doc-notice-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-notice-manual.html rename to tests/wpt/tests/dpub-aam/doc-notice-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-pagebreak-manual.html b/tests/wpt/tests/dpub-aam/doc-pagebreak-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-pagebreak-manual.html rename to tests/wpt/tests/dpub-aam/doc-pagebreak-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-pagelist-manual.html b/tests/wpt/tests/dpub-aam/doc-pagelist-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-pagelist-manual.html rename to tests/wpt/tests/dpub-aam/doc-pagelist-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-part-manual.html b/tests/wpt/tests/dpub-aam/doc-part-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-part-manual.html rename to tests/wpt/tests/dpub-aam/doc-part-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-preface-manual.html b/tests/wpt/tests/dpub-aam/doc-preface-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-preface-manual.html rename to tests/wpt/tests/dpub-aam/doc-preface-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-prologue-manual.html b/tests/wpt/tests/dpub-aam/doc-prologue-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-prologue-manual.html rename to tests/wpt/tests/dpub-aam/doc-prologue-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-pullquote-manual.html b/tests/wpt/tests/dpub-aam/doc-pullquote-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-pullquote-manual.html rename to tests/wpt/tests/dpub-aam/doc-pullquote-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-qna-manual.html b/tests/wpt/tests/dpub-aam/doc-qna-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-qna-manual.html rename to tests/wpt/tests/dpub-aam/doc-qna-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-subtitle-manual.html b/tests/wpt/tests/dpub-aam/doc-subtitle-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-subtitle-manual.html rename to tests/wpt/tests/dpub-aam/doc-subtitle-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-tip-manual.html b/tests/wpt/tests/dpub-aam/doc-tip-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-tip-manual.html rename to tests/wpt/tests/dpub-aam/doc-tip-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-toc-manual.html b/tests/wpt/tests/dpub-aam/doc-toc-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aam/doc-toc-manual.html rename to tests/wpt/tests/dpub-aam/doc-toc-manual.html diff --git a/tests/wpt/web-platform-tests/dpub-aria/.editorconfig b/tests/wpt/tests/dpub-aria/.editorconfig similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aria/.editorconfig rename to tests/wpt/tests/dpub-aria/.editorconfig diff --git a/tests/wpt/web-platform-tests/dpub-aria/META.yml b/tests/wpt/tests/dpub-aria/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aria/META.yml rename to tests/wpt/tests/dpub-aria/META.yml diff --git a/tests/wpt/web-platform-tests/dpub-aria/README.md b/tests/wpt/tests/dpub-aria/README.md similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aria/README.md rename to tests/wpt/tests/dpub-aria/README.md diff --git a/tests/wpt/web-platform-tests/dpub-aria/inuse-manual.html b/tests/wpt/tests/dpub-aria/inuse-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/dpub-aria/inuse-manual.html rename to tests/wpt/tests/dpub-aria/inuse-manual.html diff --git a/tests/wpt/web-platform-tests/ecmascript/regexp-lookbehind.html b/tests/wpt/tests/ecmascript/regexp-lookbehind.html similarity index 100% rename from tests/wpt/web-platform-tests/ecmascript/regexp-lookbehind.html rename to tests/wpt/tests/ecmascript/regexp-lookbehind.html diff --git a/tests/wpt/web-platform-tests/editing/META.yml b/tests/wpt/tests/editing/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/editing/META.yml rename to tests/wpt/tests/editing/META.yml diff --git a/tests/wpt/web-platform-tests/editing/README b/tests/wpt/tests/editing/README similarity index 100% rename from tests/wpt/web-platform-tests/editing/README rename to tests/wpt/tests/editing/README diff --git a/tests/wpt/web-platform-tests/editing/crashtests/backcolor-in-nested-editing-host-td-from-DOMAttrModified.html b/tests/wpt/tests/editing/crashtests/backcolor-in-nested-editing-host-td-from-DOMAttrModified.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/backcolor-in-nested-editing-host-td-from-DOMAttrModified.html rename to tests/wpt/tests/editing/crashtests/backcolor-in-nested-editing-host-td-from-DOMAttrModified.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/bold-in-output.html b/tests/wpt/tests/editing/crashtests/bold-in-output.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/bold-in-output.html rename to tests/wpt/tests/editing/crashtests/bold-in-output.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/contenteditable-will-be-blurred-by-focus-event-listener.html b/tests/wpt/tests/editing/crashtests/contenteditable-will-be-blurred-by-focus-event-listener.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/contenteditable-will-be-blurred-by-focus-event-listener.html rename to tests/wpt/tests/editing/crashtests/contenteditable-will-be-blurred-by-focus-event-listener.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/crash-test.html b/tests/wpt/tests/editing/crashtests/crash-test.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/crash-test.html rename to tests/wpt/tests/editing/crashtests/crash-test.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/delete-after-empty-script-element.html b/tests/wpt/tests/editing/crashtests/delete-after-empty-script-element.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/delete-after-empty-script-element.html rename to tests/wpt/tests/editing/crashtests/delete-after-empty-script-element.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/delete-after-justifyleft-in-closed-editable-dialog.html b/tests/wpt/tests/editing/crashtests/delete-after-justifyleft-in-closed-editable-dialog.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/delete-after-justifyleft-in-closed-editable-dialog.html rename to tests/wpt/tests/editing/crashtests/delete-after-justifyleft-in-closed-editable-dialog.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/delete-and-justifycenter-recursively-with-mutation-event-listeners.html b/tests/wpt/tests/editing/crashtests/delete-and-justifycenter-recursively-with-mutation-event-listeners.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/delete-and-justifycenter-recursively-with-mutation-event-listeners.html rename to tests/wpt/tests/editing/crashtests/delete-and-justifycenter-recursively-with-mutation-event-listeners.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/delete-at-start-of-first-li-in-ol-in-video.html b/tests/wpt/tests/editing/crashtests/delete-at-start-of-first-li-in-ol-in-video.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/delete-at-start-of-first-li-in-ol-in-video.html rename to tests/wpt/tests/editing/crashtests/delete-at-start-of-first-li-in-ol-in-video.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/delete-content-in-no-data-object.html b/tests/wpt/tests/editing/crashtests/delete-content-in-no-data-object.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/delete-content-in-no-data-object.html rename to tests/wpt/tests/editing/crashtests/delete-content-in-no-data-object.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/delete-in-dd-editing-host-after-selectall-with-focus.html b/tests/wpt/tests/editing/crashtests/delete-in-dd-editing-host-after-selectall-with-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/delete-in-dd-editing-host-after-selectall-with-focus.html rename to tests/wpt/tests/editing/crashtests/delete-in-dd-editing-host-after-selectall-with-focus.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/delete-in-dd-editing-host-after-selectall-without-focus.html b/tests/wpt/tests/editing/crashtests/delete-in-dd-editing-host-after-selectall-without-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/delete-in-dd-editing-host-after-selectall-without-focus.html rename to tests/wpt/tests/editing/crashtests/delete-in-dd-editing-host-after-selectall-without-focus.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/delete-in-designMode-without-explicitly-setting-focus.html b/tests/wpt/tests/editing/crashtests/delete-in-designMode-without-explicitly-setting-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/delete-in-designMode-without-explicitly-setting-focus.html rename to tests/wpt/tests/editing/crashtests/delete-in-designMode-without-explicitly-setting-focus.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/delete-in-empty-editable-list-followed-by-non-editable-listitem.html b/tests/wpt/tests/editing/crashtests/delete-in-empty-editable-list-followed-by-non-editable-listitem.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/delete-in-empty-editable-list-followed-by-non-editable-listitem.html rename to tests/wpt/tests/editing/crashtests/delete-in-empty-editable-list-followed-by-non-editable-listitem.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/designMode-document-will-be-blurred-by-focus-event-listener.html b/tests/wpt/tests/editing/crashtests/designMode-document-will-be-blurred-by-focus-event-listener.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/designMode-document-will-be-blurred-by-focus-event-listener.html rename to tests/wpt/tests/editing/crashtests/designMode-document-will-be-blurred-by-focus-event-listener.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/designMode-off-during-inserthorizontalrule.html b/tests/wpt/tests/editing/crashtests/designMode-off-during-inserthorizontalrule.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/designMode-off-during-inserthorizontalrule.html rename to tests/wpt/tests/editing/crashtests/designMode-off-during-inserthorizontalrule.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/execCommand-at-load-with-changing-editing-host.html b/tests/wpt/tests/editing/crashtests/execCommand-at-load-with-changing-editing-host.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/execCommand-at-load-with-changing-editing-host.html rename to tests/wpt/tests/editing/crashtests/execCommand-at-load-with-changing-editing-host.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/execCommand-backcolor-and-hilitecolor-in-empty-iframe-in-designMode.html b/tests/wpt/tests/editing/crashtests/execCommand-backcolor-and-hilitecolor-in-empty-iframe-in-designMode.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/execCommand-backcolor-and-hilitecolor-in-empty-iframe-in-designMode.html rename to tests/wpt/tests/editing/crashtests/execCommand-backcolor-and-hilitecolor-in-empty-iframe-in-designMode.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/execCommand-without-selection-ranges.html b/tests/wpt/tests/editing/crashtests/execCommand-without-selection-ranges.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/execCommand-without-selection-ranges.html rename to tests/wpt/tests/editing/crashtests/execCommand-without-selection-ranges.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/format-block-selection-containing-non-editable-list.html b/tests/wpt/tests/editing/crashtests/format-block-selection-containing-non-editable-list.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/format-block-selection-containing-non-editable-list.html rename to tests/wpt/tests/editing/crashtests/format-block-selection-containing-non-editable-list.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/forwarddelete-after-editable-slot-element-outside-body.html b/tests/wpt/tests/editing/crashtests/forwarddelete-after-editable-slot-element-outside-body.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/forwarddelete-after-editable-slot-element-outside-body.html rename to tests/wpt/tests/editing/crashtests/forwarddelete-after-editable-slot-element-outside-body.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/forwarddelete-at-empty-text-node-in-body.html b/tests/wpt/tests/editing/crashtests/forwarddelete-at-empty-text-node-in-body.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/forwarddelete-at-empty-text-node-in-body.html rename to tests/wpt/tests/editing/crashtests/forwarddelete-at-empty-text-node-in-body.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/forwarddelete-delete-after-justifyleft-indent.html b/tests/wpt/tests/editing/crashtests/forwarddelete-delete-after-justifyleft-indent.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/forwarddelete-delete-after-justifyleft-indent.html rename to tests/wpt/tests/editing/crashtests/forwarddelete-delete-after-justifyleft-indent.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/forwarddelete-in-list-editing-host-after-selectall-with-focus.html b/tests/wpt/tests/editing/crashtests/forwarddelete-in-list-editing-host-after-selectall-with-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/forwarddelete-in-list-editing-host-after-selectall-with-focus.html rename to tests/wpt/tests/editing/crashtests/forwarddelete-in-list-editing-host-after-selectall-with-focus.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/forwarddelete-in-list-editing-host-after-selectall-without-focus.html b/tests/wpt/tests/editing/crashtests/forwarddelete-in-list-editing-host-after-selectall-without-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/forwarddelete-in-list-editing-host-after-selectall-without-focus.html rename to tests/wpt/tests/editing/crashtests/forwarddelete-in-list-editing-host-after-selectall-without-focus.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/forwarddelete-in-text-in-span-in-editable-documentElement.html b/tests/wpt/tests/editing/crashtests/forwarddelete-in-text-in-span-in-editable-documentElement.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/forwarddelete-in-text-in-span-in-editable-documentElement.html rename to tests/wpt/tests/editing/crashtests/forwarddelete-in-text-in-span-in-editable-documentElement.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/indent-in-inline-editing-host-outside-body.html b/tests/wpt/tests/editing/crashtests/indent-in-inline-editing-host-outside-body.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/indent-in-inline-editing-host-outside-body.html rename to tests/wpt/tests/editing/crashtests/indent-in-inline-editing-host-outside-body.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/indent-in-textarea-in-designMode-during-outdent.html b/tests/wpt/tests/editing/crashtests/indent-in-textarea-in-designMode-during-outdent.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/indent-in-textarea-in-designMode-during-outdent.html rename to tests/wpt/tests/editing/crashtests/indent-in-textarea-in-designMode-during-outdent.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/indent-outdent-after-closing-editable-dialog-element.html b/tests/wpt/tests/editing/crashtests/indent-outdent-after-closing-editable-dialog-element.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/indent-outdent-after-closing-editable-dialog-element.html rename to tests/wpt/tests/editing/crashtests/indent-outdent-after-closing-editable-dialog-element.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/insert-image-with-joining-header-element-and-body.html b/tests/wpt/tests/editing/crashtests/insert-image-with-joining-header-element-and-body.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/insert-image-with-joining-header-element-and-body.html rename to tests/wpt/tests/editing/crashtests/insert-image-with-joining-header-element-and-body.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/insertText-at-end-of-text-in-body.html b/tests/wpt/tests/editing/crashtests/insertText-at-end-of-text-in-body.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/insertText-at-end-of-text-in-body.html rename to tests/wpt/tests/editing/crashtests/insertText-at-end-of-text-in-body.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/insertText-nested-by-DOMSubtreeModified.html b/tests/wpt/tests/editing/crashtests/insertText-nested-by-DOMSubtreeModified.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/insertText-nested-by-DOMSubtreeModified.html rename to tests/wpt/tests/editing/crashtests/insertText-nested-by-DOMSubtreeModified.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/inserthorizontalrule-in-fieldset-and-everything-styled-white-space-pre.html b/tests/wpt/tests/editing/crashtests/inserthorizontalrule-in-fieldset-and-everything-styled-white-space-pre.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/inserthorizontalrule-in-fieldset-and-everything-styled-white-space-pre.html rename to tests/wpt/tests/editing/crashtests/inserthorizontalrule-in-fieldset-and-everything-styled-white-space-pre.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/inserthorizontalrule-in-textarea-in-editor-and-undo-on-error-events.html b/tests/wpt/tests/editing/crashtests/inserthorizontalrule-in-textarea-in-editor-and-undo-on-error-events.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/inserthorizontalrule-in-textarea-in-editor-and-undo-on-error-events.html rename to tests/wpt/tests/editing/crashtests/inserthorizontalrule-in-textarea-in-editor-and-undo-on-error-events.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/inserthorizontalrule-with-2-selection-ranges-and-one-is-outside-body.html b/tests/wpt/tests/editing/crashtests/inserthorizontalrule-with-2-selection-ranges-and-one-is-outside-body.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/inserthorizontalrule-with-2-selection-ranges-and-one-is-outside-body.html rename to tests/wpt/tests/editing/crashtests/inserthorizontalrule-with-2-selection-ranges-and-one-is-outside-body.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/inserthorizontalrule-with-range-ending-in-collapsible-spaces-before-comment.html b/tests/wpt/tests/editing/crashtests/inserthorizontalrule-with-range-ending-in-collapsible-spaces-before-comment.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/inserthorizontalrule-with-range-ending-in-collapsible-spaces-before-comment.html rename to tests/wpt/tests/editing/crashtests/inserthorizontalrule-with-range-ending-in-collapsible-spaces-before-comment.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/inserthorizontalrule-with-selecting-text-in-document-element.html b/tests/wpt/tests/editing/crashtests/inserthorizontalrule-with-selecting-text-in-document-element.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/inserthorizontalrule-with-selecting-text-in-document-element.html rename to tests/wpt/tests/editing/crashtests/inserthorizontalrule-with-selecting-text-in-document-element.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/inserthtml-after-temporarily-removing-document-element.html b/tests/wpt/tests/editing/crashtests/inserthtml-after-temporarily-removing-document-element.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/inserthtml-after-temporarily-removing-document-element.html rename to tests/wpt/tests/editing/crashtests/inserthtml-after-temporarily-removing-document-element.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/inserthtml-in-inline-editing-host-at-load-event.html b/tests/wpt/tests/editing/crashtests/inserthtml-in-inline-editing-host-at-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/inserthtml-in-inline-editing-host-at-load-event.html rename to tests/wpt/tests/editing/crashtests/inserthtml-in-inline-editing-host-at-load-event.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/inserthtml-in-li-in-option.html b/tests/wpt/tests/editing/crashtests/inserthtml-in-li-in-option.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/inserthtml-in-li-in-option.html rename to tests/wpt/tests/editing/crashtests/inserthtml-in-li-in-option.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/inserthtml-in-text-adopted-to-other-document.html b/tests/wpt/tests/editing/crashtests/inserthtml-in-text-adopted-to-other-document.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/inserthtml-in-text-adopted-to-other-document.html rename to tests/wpt/tests/editing/crashtests/inserthtml-in-text-adopted-to-other-document.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/inserthtml-indent-delete-when-input-element-in-editing-host-has-focus.html b/tests/wpt/tests/editing/crashtests/inserthtml-indent-delete-when-input-element-in-editing-host-has-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/inserthtml-indent-delete-when-input-element-in-editing-host-has-focus.html rename to tests/wpt/tests/editing/crashtests/inserthtml-indent-delete-when-input-element-in-editing-host-has-focus.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/inserthtml-to-replace-root-list-element-in-designMode.html b/tests/wpt/tests/editing/crashtests/inserthtml-to-replace-root-list-element-in-designMode.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/inserthtml-to-replace-root-list-element-in-designMode.html rename to tests/wpt/tests/editing/crashtests/inserthtml-to-replace-root-list-element-in-designMode.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/insertlinebreak-around-comment-node.html b/tests/wpt/tests/editing/crashtests/insertlinebreak-around-comment-node.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/insertlinebreak-around-comment-node.html rename to tests/wpt/tests/editing/crashtests/insertlinebreak-around-comment-node.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/insertlinebreak-in-map-element-editing-host.html b/tests/wpt/tests/editing/crashtests/insertlinebreak-in-map-element-editing-host.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/insertlinebreak-in-map-element-editing-host.html rename to tests/wpt/tests/editing/crashtests/insertlinebreak-in-map-element-editing-host.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/insertorderedlist-in-focused-inline-editing-host.html b/tests/wpt/tests/editing/crashtests/insertorderedlist-in-focused-inline-editing-host.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/insertorderedlist-in-focused-inline-editing-host.html rename to tests/wpt/tests/editing/crashtests/insertorderedlist-in-focused-inline-editing-host.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/insertorderedlist-in-text-adopted-to-other-document.html b/tests/wpt/tests/editing/crashtests/insertorderedlist-in-text-adopted-to-other-document.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/insertorderedlist-in-text-adopted-to-other-document.html rename to tests/wpt/tests/editing/crashtests/insertorderedlist-in-text-adopted-to-other-document.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/insertparagraph-from-DOMNodeInserted-caused-by-insertorderedlist.html b/tests/wpt/tests/editing/crashtests/insertparagraph-from-DOMNodeInserted-caused-by-insertorderedlist.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/insertparagraph-from-DOMNodeInserted-caused-by-insertorderedlist.html rename to tests/wpt/tests/editing/crashtests/insertparagraph-from-DOMNodeInserted-caused-by-insertorderedlist.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/insertparagraph-in-listitem-in-svg-followed-by-collapsible-spaces.html b/tests/wpt/tests/editing/crashtests/insertparagraph-in-listitem-in-svg-followed-by-collapsible-spaces.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/insertparagraph-in-listitem-in-svg-followed-by-collapsible-spaces.html rename to tests/wpt/tests/editing/crashtests/insertparagraph-in-listitem-in-svg-followed-by-collapsible-spaces.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/insertparagraph-in-map-element-editing-host.html b/tests/wpt/tests/editing/crashtests/insertparagraph-in-map-element-editing-host.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/insertparagraph-in-map-element-editing-host.html rename to tests/wpt/tests/editing/crashtests/insertparagraph-in-map-element-editing-host.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/inserttext-at-start-with-different-style.html b/tests/wpt/tests/editing/crashtests/inserttext-at-start-with-different-style.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/inserttext-at-start-with-different-style.html rename to tests/wpt/tests/editing/crashtests/inserttext-at-start-with-different-style.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/inserttext-with-clearing-subscript.html b/tests/wpt/tests/editing/crashtests/inserttext-with-clearing-subscript.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/inserttext-with-clearing-subscript.html rename to tests/wpt/tests/editing/crashtests/inserttext-with-clearing-subscript.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/insertunorderedlist-in-empty-inline-editing-host.html b/tests/wpt/tests/editing/crashtests/insertunorderedlist-in-empty-inline-editing-host.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/insertunorderedlist-in-empty-inline-editing-host.html rename to tests/wpt/tests/editing/crashtests/insertunorderedlist-in-empty-inline-editing-host.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/insertunorderedlist-in-empty-table-editing-host.html b/tests/wpt/tests/editing/crashtests/insertunorderedlist-in-empty-table-editing-host.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/insertunorderedlist-in-empty-table-editing-host.html rename to tests/wpt/tests/editing/crashtests/insertunorderedlist-in-empty-table-editing-host.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/justifycenter-around-textarea.html b/tests/wpt/tests/editing/crashtests/justifycenter-around-textarea.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/justifycenter-around-textarea.html rename to tests/wpt/tests/editing/crashtests/justifycenter-around-textarea.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/justifycenter-then-delete-selection-on-DOMSubtreeModified.html b/tests/wpt/tests/editing/crashtests/justifycenter-then-delete-selection-on-DOMSubtreeModified.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/justifycenter-then-delete-selection-on-DOMSubtreeModified.html rename to tests/wpt/tests/editing/crashtests/justifycenter-then-delete-selection-on-DOMSubtreeModified.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/justifyfull-selection-containing-non-editable-div-and-everything-styled-white-space-break-space.html b/tests/wpt/tests/editing/crashtests/justifyfull-selection-containing-non-editable-div-and-everything-styled-white-space-break-space.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/justifyfull-selection-containing-non-editable-div-and-everything-styled-white-space-break-space.html rename to tests/wpt/tests/editing/crashtests/justifyfull-selection-containing-non-editable-div-and-everything-styled-white-space-break-space.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/loading-different-page-in-iframe-while-iframe-sets-spellcheck-attr-from-load.html b/tests/wpt/tests/editing/crashtests/loading-different-page-in-iframe-while-iframe-sets-spellcheck-attr-from-load.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/loading-different-page-in-iframe-while-iframe-sets-spellcheck-attr-from-load.html rename to tests/wpt/tests/editing/crashtests/loading-different-page-in-iframe-while-iframe-sets-spellcheck-attr-from-load.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/make-editable-div-inline-and-set-contenteditable-of-input-to-false.html b/tests/wpt/tests/editing/crashtests/make-editable-div-inline-and-set-contenteditable-of-input-to-false.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/make-editable-div-inline-and-set-contenteditable-of-input-to-false.html rename to tests/wpt/tests/editing/crashtests/make-editable-div-inline-and-set-contenteditable-of-input-to-false.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/make-parent-element-editable-after-making-focused-editing-host-non-editable.html b/tests/wpt/tests/editing/crashtests/make-parent-element-editable-after-making-focused-editing-host-non-editable.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/make-parent-element-editable-after-making-focused-editing-host-non-editable.html rename to tests/wpt/tests/editing/crashtests/make-parent-element-editable-after-making-focused-editing-host-non-editable.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/move-editing-host-to-subdocument-when-textarea-has-focus.html b/tests/wpt/tests/editing/crashtests/move-editing-host-to-subdocument-when-textarea-has-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/move-editing-host-to-subdocument-when-textarea-has-focus.html rename to tests/wpt/tests/editing/crashtests/move-editing-host-to-subdocument-when-textarea-has-focus.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/move-first-element-from-editinghost-to-outside-on-input-of-embolden.html b/tests/wpt/tests/editing/crashtests/move-first-element-from-editinghost-to-outside-on-input-of-embolden.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/move-first-element-from-editinghost-to-outside-on-input-of-embolden.html rename to tests/wpt/tests/editing/crashtests/move-first-element-from-editinghost-to-outside-on-input-of-embolden.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/move-legend-followed-by-textarea-into-orphan-div.html b/tests/wpt/tests/editing/crashtests/move-legend-followed-by-textarea-into-orphan-div.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/move-legend-followed-by-textarea-into-orphan-div.html rename to tests/wpt/tests/editing/crashtests/move-legend-followed-by-textarea-into-orphan-div.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/multiple-execCommand-calls-after-interting-long-text.html b/tests/wpt/tests/editing/crashtests/multiple-execCommand-calls-after-interting-long-text.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/multiple-execCommand-calls-after-interting-long-text.html rename to tests/wpt/tests/editing/crashtests/multiple-execCommand-calls-after-interting-long-text.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/non-root-editable-html-element.html b/tests/wpt/tests/editing/crashtests/non-root-editable-html-element.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/non-root-editable-html-element.html rename to tests/wpt/tests/editing/crashtests/non-root-editable-html-element.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/normalize_document_at_DOMSubtreeModified_during_insertparagraph.html b/tests/wpt/tests/editing/crashtests/normalize_document_at_DOMSubtreeModified_during_insertparagraph.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/normalize_document_at_DOMSubtreeModified_during_insertparagraph.html rename to tests/wpt/tests/editing/crashtests/normalize_document_at_DOMSubtreeModified_during_insertparagraph.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/outdent-across-svg-boundary.html b/tests/wpt/tests/editing/crashtests/outdent-across-svg-boundary.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/outdent-across-svg-boundary.html rename to tests/wpt/tests/editing/crashtests/outdent-across-svg-boundary.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/outdent-editing-host-containing-combining-diacritical-mark.html b/tests/wpt/tests/editing/crashtests/outdent-editing-host-containing-combining-diacritical-mark.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/outdent-editing-host-containing-combining-diacritical-mark.html rename to tests/wpt/tests/editing/crashtests/outdent-editing-host-containing-combining-diacritical-mark.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/outdent-in-empty-body-editing-host.html b/tests/wpt/tests/editing/crashtests/outdent-in-empty-body-editing-host.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/outdent-in-empty-body-editing-host.html rename to tests/wpt/tests/editing/crashtests/outdent-in-empty-body-editing-host.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/outdent-in-meter-indented-by-legend-in-css-mode.html b/tests/wpt/tests/editing/crashtests/outdent-in-meter-indented-by-legend-in-css-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/outdent-in-meter-indented-by-legend-in-css-mode.html rename to tests/wpt/tests/editing/crashtests/outdent-in-meter-indented-by-legend-in-css-mode.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/outdent-indent-inserthorizontalrule-on-selectionchange.html b/tests/wpt/tests/editing/crashtests/outdent-indent-inserthorizontalrule-on-selectionchange.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/outdent-indent-inserthorizontalrule-on-selectionchange.html rename to tests/wpt/tests/editing/crashtests/outdent-indent-inserthorizontalrule-on-selectionchange.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/queryCommandIndeterm-backcolor-and-hilitecolor-in-empty-iframe-in-designMode.html b/tests/wpt/tests/editing/crashtests/queryCommandIndeterm-backcolor-and-hilitecolor-in-empty-iframe-in-designMode.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/queryCommandIndeterm-backcolor-and-hilitecolor-in-empty-iframe-in-designMode.html rename to tests/wpt/tests/editing/crashtests/queryCommandIndeterm-backcolor-and-hilitecolor-in-empty-iframe-in-designMode.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/queryCommandIndeterm-backcolor-in-empty-iframe-in-designMode-from-load.html b/tests/wpt/tests/editing/crashtests/queryCommandIndeterm-backcolor-in-empty-iframe-in-designMode-from-load.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/queryCommandIndeterm-backcolor-in-empty-iframe-in-designMode-from-load.html rename to tests/wpt/tests/editing/crashtests/queryCommandIndeterm-backcolor-in-empty-iframe-in-designMode-from-load.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/queryCommandState-backcolor-after-removing-html-element-in-designMode-from-load.html b/tests/wpt/tests/editing/crashtests/queryCommandState-backcolor-after-removing-html-element-in-designMode-from-load.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/queryCommandState-backcolor-after-removing-html-element-in-designMode-from-load.html rename to tests/wpt/tests/editing/crashtests/queryCommandState-backcolor-after-removing-html-element-in-designMode-from-load.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/queryCommandValue-backcolor-after-replacing-html-element-with-new-one-in-designMode-from-load.html b/tests/wpt/tests/editing/crashtests/queryCommandValue-backcolor-after-replacing-html-element-with-new-one-in-designMode-from-load.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/queryCommandValue-backcolor-after-replacing-html-element-with-new-one-in-designMode-from-load.html rename to tests/wpt/tests/editing/crashtests/queryCommandValue-backcolor-after-replacing-html-element-with-new-one-in-designMode-from-load.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/remove-document-element-of-iframe-having-style-content.html b/tests/wpt/tests/editing/crashtests/remove-document-element-of-iframe-having-style-content.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/remove-document-element-of-iframe-having-style-content.html rename to tests/wpt/tests/editing/crashtests/remove-document-element-of-iframe-having-style-content.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/remove-editing-host-during-forwarddelete.html b/tests/wpt/tests/editing/crashtests/remove-editing-host-during-forwarddelete.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/remove-editing-host-during-forwarddelete.html rename to tests/wpt/tests/editing/crashtests/remove-editing-host-during-forwarddelete.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/remove-editing-host-on-DOMNodeInserted-at-indent.html b/tests/wpt/tests/editing/crashtests/remove-editing-host-on-DOMNodeInserted-at-indent.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/remove-editing-host-on-DOMNodeInserted-at-indent.html rename to tests/wpt/tests/editing/crashtests/remove-editing-host-on-DOMNodeInserted-at-indent.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/remove-editing-host-which-is-selected.html b/tests/wpt/tests/editing/crashtests/remove-editing-host-which-is-selected.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/remove-editing-host-which-is-selected.html rename to tests/wpt/tests/editing/crashtests/remove-editing-host-which-is-selected.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/remove-iframe-for-designMode.html b/tests/wpt/tests/editing/crashtests/remove-iframe-for-designMode.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/remove-iframe-for-designMode.html rename to tests/wpt/tests/editing/crashtests/remove-iframe-for-designMode.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/remove-parent-element-during-inserthtml.html b/tests/wpt/tests/editing/crashtests/remove-parent-element-during-inserthtml.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/remove-parent-element-during-inserthtml.html rename to tests/wpt/tests/editing/crashtests/remove-parent-element-during-inserthtml.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/remove-right-block-during-joining-with-parent-left-block.html b/tests/wpt/tests/editing/crashtests/remove-right-block-during-joining-with-parent-left-block.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/remove-right-block-during-joining-with-parent-left-block.html rename to tests/wpt/tests/editing/crashtests/remove-right-block-during-joining-with-parent-left-block.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/removeformat-in-number-input-immediately-after-type-change-and-stepUp.html b/tests/wpt/tests/editing/crashtests/removeformat-in-number-input-immediately-after-type-change-and-stepUp.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/removeformat-in-number-input-immediately-after-type-change-and-stepUp.html rename to tests/wpt/tests/editing/crashtests/removeformat-in-number-input-immediately-after-type-change-and-stepUp.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/remve-documentElement-after-inserthtml-svg-and-td.html b/tests/wpt/tests/editing/crashtests/remve-documentElement-after-inserthtml-svg-and-td.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/remve-documentElement-after-inserthtml-svg-and-td.html rename to tests/wpt/tests/editing/crashtests/remve-documentElement-after-inserthtml-svg-and-td.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/replace-parent-of-editing-host-on-DOMSubtreeModified.html b/tests/wpt/tests/editing/crashtests/replace-parent-of-editing-host-on-DOMSubtreeModified.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/replace-parent-of-editing-host-on-DOMSubtreeModified.html rename to tests/wpt/tests/editing/crashtests/replace-parent-of-editing-host-on-DOMSubtreeModified.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/selectall-and-inerthtml-in-textarea-editing-host.html b/tests/wpt/tests/editing/crashtests/selectall-and-inerthtml-in-textarea-editing-host.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/selectall-and-inerthtml-in-textarea-editing-host.html rename to tests/wpt/tests/editing/crashtests/selectall-and-inerthtml-in-textarea-editing-host.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/selectall-in-head-editing-host-after-body-removed.html b/tests/wpt/tests/editing/crashtests/selectall-in-head-editing-host-after-body-removed.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/selectall-in-head-editing-host-after-body-removed.html rename to tests/wpt/tests/editing/crashtests/selectall-in-head-editing-host-after-body-removed.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/selectall-selection-modify-move-forward-lineboundary-selectall-around-editable-canvas.html b/tests/wpt/tests/editing/crashtests/selectall-selection-modify-move-forward-lineboundary-selectall-around-editable-canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/selectall-selection-modify-move-forward-lineboundary-selectall-around-editable-canvas.html rename to tests/wpt/tests/editing/crashtests/selectall-selection-modify-move-forward-lineboundary-selectall-around-editable-canvas.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/selection-modify-around-input-in-contenteditable.html b/tests/wpt/tests/editing/crashtests/selection-modify-around-input-in-contenteditable.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/selection-modify-around-input-in-contenteditable.html rename to tests/wpt/tests/editing/crashtests/selection-modify-around-input-in-contenteditable.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/selection-modify-extend-backward-character-to-outside-body-in-designMode.html b/tests/wpt/tests/editing/crashtests/selection-modify-extend-backward-character-to-outside-body-in-designMode.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/selection-modify-extend-backward-character-to-outside-body-in-designMode.html rename to tests/wpt/tests/editing/crashtests/selection-modify-extend-backward-character-to-outside-body-in-designMode.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/support/unloading-editor-in-subdocument-containing-misspelled-word-iframe.html b/tests/wpt/tests/editing/crashtests/support/unloading-editor-in-subdocument-containing-misspelled-word-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/support/unloading-editor-in-subdocument-containing-misspelled-word-iframe.html rename to tests/wpt/tests/editing/crashtests/support/unloading-editor-in-subdocument-containing-misspelled-word-iframe.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/textarea-will-be-blurred-by-focus-event-listener.html b/tests/wpt/tests/editing/crashtests/textarea-will-be-blurred-by-focus-event-listener.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/textarea-will-be-blurred-by-focus-event-listener.html rename to tests/wpt/tests/editing/crashtests/textarea-will-be-blurred-by-focus-event-listener.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/unloading-editor-in-subdocument-containing-misspelled-word.html b/tests/wpt/tests/editing/crashtests/unloading-editor-in-subdocument-containing-misspelled-word.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/unloading-editor-in-subdocument-containing-misspelled-word.html rename to tests/wpt/tests/editing/crashtests/unloading-editor-in-subdocument-containing-misspelled-word.html diff --git a/tests/wpt/web-platform-tests/editing/crashtests/update-dom-during-undoing-in-textarea.html b/tests/wpt/tests/editing/crashtests/update-dom-during-undoing-in-textarea.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/crashtests/update-dom-during-undoing-in-textarea.html rename to tests/wpt/tests/editing/crashtests/update-dom-during-undoing-in-textarea.html diff --git a/tests/wpt/web-platform-tests/editing/data/README.md b/tests/wpt/tests/editing/data/README.md similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/README.md rename to tests/wpt/tests/editing/data/README.md diff --git a/tests/wpt/web-platform-tests/editing/data/backcolor.js b/tests/wpt/tests/editing/data/backcolor.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/backcolor.js rename to tests/wpt/tests/editing/data/backcolor.js diff --git a/tests/wpt/web-platform-tests/editing/data/bold.js b/tests/wpt/tests/editing/data/bold.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/bold.js rename to tests/wpt/tests/editing/data/bold.js diff --git a/tests/wpt/web-platform-tests/editing/data/createlink.js b/tests/wpt/tests/editing/data/createlink.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/createlink.js rename to tests/wpt/tests/editing/data/createlink.js diff --git a/tests/wpt/web-platform-tests/editing/data/delete-list-items-in-table-cells.js b/tests/wpt/tests/editing/data/delete-list-items-in-table-cells.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/delete-list-items-in-table-cells.js rename to tests/wpt/tests/editing/data/delete-list-items-in-table-cells.js diff --git a/tests/wpt/web-platform-tests/editing/data/delete.js b/tests/wpt/tests/editing/data/delete.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/delete.js rename to tests/wpt/tests/editing/data/delete.js diff --git a/tests/wpt/web-platform-tests/editing/data/fontname.js b/tests/wpt/tests/editing/data/fontname.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/fontname.js rename to tests/wpt/tests/editing/data/fontname.js diff --git a/tests/wpt/web-platform-tests/editing/data/fontsize.js b/tests/wpt/tests/editing/data/fontsize.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/fontsize.js rename to tests/wpt/tests/editing/data/fontsize.js diff --git a/tests/wpt/web-platform-tests/editing/data/forecolor.js b/tests/wpt/tests/editing/data/forecolor.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/forecolor.js rename to tests/wpt/tests/editing/data/forecolor.js diff --git a/tests/wpt/web-platform-tests/editing/data/formatblock.js b/tests/wpt/tests/editing/data/formatblock.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/formatblock.js rename to tests/wpt/tests/editing/data/formatblock.js diff --git a/tests/wpt/web-platform-tests/editing/data/forwarddelete.js b/tests/wpt/tests/editing/data/forwarddelete.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/forwarddelete.js rename to tests/wpt/tests/editing/data/forwarddelete.js diff --git a/tests/wpt/web-platform-tests/editing/data/hilitecolor.js b/tests/wpt/tests/editing/data/hilitecolor.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/hilitecolor.js rename to tests/wpt/tests/editing/data/hilitecolor.js diff --git a/tests/wpt/web-platform-tests/editing/data/indent.js b/tests/wpt/tests/editing/data/indent.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/indent.js rename to tests/wpt/tests/editing/data/indent.js diff --git a/tests/wpt/web-platform-tests/editing/data/insert-list-items-in-table-cells.js b/tests/wpt/tests/editing/data/insert-list-items-in-table-cells.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/insert-list-items-in-table-cells.js rename to tests/wpt/tests/editing/data/insert-list-items-in-table-cells.js diff --git a/tests/wpt/web-platform-tests/editing/data/inserthorizontalrule.js b/tests/wpt/tests/editing/data/inserthorizontalrule.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/inserthorizontalrule.js rename to tests/wpt/tests/editing/data/inserthorizontalrule.js diff --git a/tests/wpt/web-platform-tests/editing/data/inserthtml.js b/tests/wpt/tests/editing/data/inserthtml.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/inserthtml.js rename to tests/wpt/tests/editing/data/inserthtml.js diff --git a/tests/wpt/web-platform-tests/editing/data/insertimage.js b/tests/wpt/tests/editing/data/insertimage.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/insertimage.js rename to tests/wpt/tests/editing/data/insertimage.js diff --git a/tests/wpt/web-platform-tests/editing/data/insertlinebreak.js b/tests/wpt/tests/editing/data/insertlinebreak.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/insertlinebreak.js rename to tests/wpt/tests/editing/data/insertlinebreak.js diff --git a/tests/wpt/web-platform-tests/editing/data/insertorderedlist.js b/tests/wpt/tests/editing/data/insertorderedlist.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/insertorderedlist.js rename to tests/wpt/tests/editing/data/insertorderedlist.js diff --git a/tests/wpt/web-platform-tests/editing/data/insertparagraph.js b/tests/wpt/tests/editing/data/insertparagraph.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/insertparagraph.js rename to tests/wpt/tests/editing/data/insertparagraph.js diff --git a/tests/wpt/web-platform-tests/editing/data/inserttext.js b/tests/wpt/tests/editing/data/inserttext.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/inserttext.js rename to tests/wpt/tests/editing/data/inserttext.js diff --git a/tests/wpt/web-platform-tests/editing/data/insertunorderedlist.js b/tests/wpt/tests/editing/data/insertunorderedlist.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/insertunorderedlist.js rename to tests/wpt/tests/editing/data/insertunorderedlist.js diff --git a/tests/wpt/web-platform-tests/editing/data/italic.js b/tests/wpt/tests/editing/data/italic.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/italic.js rename to tests/wpt/tests/editing/data/italic.js diff --git a/tests/wpt/web-platform-tests/editing/data/justifycenter.js b/tests/wpt/tests/editing/data/justifycenter.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/justifycenter.js rename to tests/wpt/tests/editing/data/justifycenter.js diff --git a/tests/wpt/web-platform-tests/editing/data/justifyfull.js b/tests/wpt/tests/editing/data/justifyfull.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/justifyfull.js rename to tests/wpt/tests/editing/data/justifyfull.js diff --git a/tests/wpt/web-platform-tests/editing/data/justifyleft.js b/tests/wpt/tests/editing/data/justifyleft.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/justifyleft.js rename to tests/wpt/tests/editing/data/justifyleft.js diff --git a/tests/wpt/web-platform-tests/editing/data/justifyright.js b/tests/wpt/tests/editing/data/justifyright.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/justifyright.js rename to tests/wpt/tests/editing/data/justifyright.js diff --git a/tests/wpt/web-platform-tests/editing/data/misc.js b/tests/wpt/tests/editing/data/misc.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/misc.js rename to tests/wpt/tests/editing/data/misc.js diff --git a/tests/wpt/web-platform-tests/editing/data/multitest.js b/tests/wpt/tests/editing/data/multitest.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/multitest.js rename to tests/wpt/tests/editing/data/multitest.js diff --git a/tests/wpt/web-platform-tests/editing/data/outdent.js b/tests/wpt/tests/editing/data/outdent.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/outdent.js rename to tests/wpt/tests/editing/data/outdent.js diff --git a/tests/wpt/web-platform-tests/editing/data/removeformat.js b/tests/wpt/tests/editing/data/removeformat.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/removeformat.js rename to tests/wpt/tests/editing/data/removeformat.js diff --git a/tests/wpt/web-platform-tests/editing/data/strikethrough.js b/tests/wpt/tests/editing/data/strikethrough.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/strikethrough.js rename to tests/wpt/tests/editing/data/strikethrough.js diff --git a/tests/wpt/web-platform-tests/editing/data/subscript.js b/tests/wpt/tests/editing/data/subscript.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/subscript.js rename to tests/wpt/tests/editing/data/subscript.js diff --git a/tests/wpt/web-platform-tests/editing/data/superscript.js b/tests/wpt/tests/editing/data/superscript.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/superscript.js rename to tests/wpt/tests/editing/data/superscript.js diff --git a/tests/wpt/web-platform-tests/editing/data/underline.js b/tests/wpt/tests/editing/data/underline.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/underline.js rename to tests/wpt/tests/editing/data/underline.js diff --git a/tests/wpt/web-platform-tests/editing/data/unlink.js b/tests/wpt/tests/editing/data/unlink.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/data/unlink.js rename to tests/wpt/tests/editing/data/unlink.js diff --git a/tests/wpt/web-platform-tests/editing/edit-context/edit-context-basics.tentative.html b/tests/wpt/tests/editing/edit-context/edit-context-basics.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/edit-context/edit-context-basics.tentative.html rename to tests/wpt/tests/editing/edit-context/edit-context-basics.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/edit-context/edit-context-input.tentative.html b/tests/wpt/tests/editing/edit-context/edit-context-input.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/edit-context/edit-context-input.tentative.html rename to tests/wpt/tests/editing/edit-context/edit-context-input.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/edit-context/edit-context-property.tentative.html b/tests/wpt/tests/editing/edit-context/edit-context-property.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/edit-context/edit-context-property.tentative.html rename to tests/wpt/tests/editing/edit-context/edit-context-property.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/event.html b/tests/wpt/tests/editing/event.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/event.html rename to tests/wpt/tests/editing/event.html diff --git a/tests/wpt/web-platform-tests/editing/include/editor-test-utils.js b/tests/wpt/tests/editing/include/editor-test-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/include/editor-test-utils.js rename to tests/wpt/tests/editing/include/editor-test-utils.js diff --git a/tests/wpt/web-platform-tests/editing/include/implementation.js b/tests/wpt/tests/editing/include/implementation.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/include/implementation.js rename to tests/wpt/tests/editing/include/implementation.js diff --git a/tests/wpt/web-platform-tests/editing/include/manualtest.js b/tests/wpt/tests/editing/include/manualtest.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/include/manualtest.js rename to tests/wpt/tests/editing/include/manualtest.js diff --git a/tests/wpt/web-platform-tests/editing/include/reset.css b/tests/wpt/tests/editing/include/reset.css similarity index 100% rename from tests/wpt/web-platform-tests/editing/include/reset.css rename to tests/wpt/tests/editing/include/reset.css diff --git a/tests/wpt/web-platform-tests/editing/include/tests.css b/tests/wpt/tests/editing/include/tests.css similarity index 100% rename from tests/wpt/web-platform-tests/editing/include/tests.css rename to tests/wpt/tests/editing/include/tests.css diff --git a/tests/wpt/web-platform-tests/editing/include/tests.js b/tests/wpt/tests/editing/include/tests.js similarity index 100% rename from tests/wpt/web-platform-tests/editing/include/tests.js rename to tests/wpt/tests/editing/include/tests.js diff --git a/tests/wpt/web-platform-tests/editing/manual/delete-manual.html b/tests/wpt/tests/editing/manual/delete-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/manual/delete-manual.html rename to tests/wpt/tests/editing/manual/delete-manual.html diff --git a/tests/wpt/web-platform-tests/editing/manual/forwarddelete-manual.html b/tests/wpt/tests/editing/manual/forwarddelete-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/manual/forwarddelete-manual.html rename to tests/wpt/tests/editing/manual/forwarddelete-manual.html diff --git a/tests/wpt/web-platform-tests/editing/manual/insertlinebreak-manual.html b/tests/wpt/tests/editing/manual/insertlinebreak-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/manual/insertlinebreak-manual.html rename to tests/wpt/tests/editing/manual/insertlinebreak-manual.html diff --git a/tests/wpt/web-platform-tests/editing/manual/insertparagraph-manual.html b/tests/wpt/tests/editing/manual/insertparagraph-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/manual/insertparagraph-manual.html rename to tests/wpt/tests/editing/manual/insertparagraph-manual.html diff --git a/tests/wpt/web-platform-tests/editing/manual/inserttext-manual.html b/tests/wpt/tests/editing/manual/inserttext-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/manual/inserttext-manual.html rename to tests/wpt/tests/editing/manual/inserttext-manual.html diff --git a/tests/wpt/web-platform-tests/editing/manual/inserttext2-manual.html b/tests/wpt/tests/editing/manual/inserttext2-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/manual/inserttext2-manual.html rename to tests/wpt/tests/editing/manual/inserttext2-manual.html diff --git a/tests/wpt/web-platform-tests/editing/other/body-should-not-deleted-even-if-empty.html b/tests/wpt/tests/editing/other/body-should-not-deleted-even-if-empty.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/body-should-not-deleted-even-if-empty.html rename to tests/wpt/tests/editing/other/body-should-not-deleted-even-if-empty.html diff --git a/tests/wpt/web-platform-tests/editing/other/cefalse-boundaries-deletion.html b/tests/wpt/tests/editing/other/cefalse-boundaries-deletion.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/cefalse-boundaries-deletion.html rename to tests/wpt/tests/editing/other/cefalse-boundaries-deletion.html diff --git a/tests/wpt/web-platform-tests/editing/other/cloning-attributes-at-splitting-element.tentative.html b/tests/wpt/tests/editing/other/cloning-attributes-at-splitting-element.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/cloning-attributes-at-splitting-element.tentative.html rename to tests/wpt/tests/editing/other/cloning-attributes-at-splitting-element.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/delete-in-child-of-head.tentative.html b/tests/wpt/tests/editing/other/delete-in-child-of-head.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/delete-in-child-of-head.tentative.html rename to tests/wpt/tests/editing/other/delete-in-child-of-head.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/delete-in-child-of-html.tentative.html b/tests/wpt/tests/editing/other/delete-in-child-of-html.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/delete-in-child-of-html.tentative.html rename to tests/wpt/tests/editing/other/delete-in-child-of-html.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/delete-in-last-definition-list-item-when-parent-list-is-editing-host.html b/tests/wpt/tests/editing/other/delete-in-last-definition-list-item-when-parent-list-is-editing-host.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/delete-in-last-definition-list-item-when-parent-list-is-editing-host.html rename to tests/wpt/tests/editing/other/delete-in-last-definition-list-item-when-parent-list-is-editing-host.html diff --git a/tests/wpt/web-platform-tests/editing/other/delete-in-last-list-item-when-parent-list-is-editing-host.html b/tests/wpt/tests/editing/other/delete-in-last-list-item-when-parent-list-is-editing-host.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/delete-in-last-list-item-when-parent-list-is-editing-host.html rename to tests/wpt/tests/editing/other/delete-in-last-list-item-when-parent-list-is-editing-host.html diff --git a/tests/wpt/web-platform-tests/editing/other/delete.html b/tests/wpt/tests/editing/other/delete.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/delete.html rename to tests/wpt/tests/editing/other/delete.html diff --git a/tests/wpt/web-platform-tests/editing/other/design-mode-textarea-crash.html b/tests/wpt/tests/editing/other/design-mode-textarea-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/design-mode-textarea-crash.html rename to tests/wpt/tests/editing/other/design-mode-textarea-crash.html diff --git a/tests/wpt/web-platform-tests/editing/other/edit-in-textcontrol-immediately-after-hidden.tentative.html b/tests/wpt/tests/editing/other/edit-in-textcontrol-immediately-after-hidden.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/edit-in-textcontrol-immediately-after-hidden.tentative.html rename to tests/wpt/tests/editing/other/edit-in-textcontrol-immediately-after-hidden.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/editable-state-and-focus-in-shadow-dom-in-designMode.tentative.html b/tests/wpt/tests/editing/other/editable-state-and-focus-in-shadow-dom-in-designMode.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/editable-state-and-focus-in-shadow-dom-in-designMode.tentative.html rename to tests/wpt/tests/editing/other/editable-state-and-focus-in-shadow-dom-in-designMode.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/editing-around-select-element.tentative.html b/tests/wpt/tests/editing/other/editing-around-select-element.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/editing-around-select-element.tentative.html rename to tests/wpt/tests/editing/other/editing-around-select-element.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/editing-div-outside-body.html b/tests/wpt/tests/editing/other/editing-div-outside-body.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/editing-div-outside-body.html rename to tests/wpt/tests/editing/other/editing-div-outside-body.html diff --git a/tests/wpt/web-platform-tests/editing/other/editing-style-of-range-around-void-element-child.tentative.html b/tests/wpt/tests/editing/other/editing-style-of-range-around-void-element-child.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/editing-style-of-range-around-void-element-child.tentative.html rename to tests/wpt/tests/editing/other/editing-style-of-range-around-void-element-child.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/empty-elements-insertion.html b/tests/wpt/tests/editing/other/empty-elements-insertion.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/empty-elements-insertion.html rename to tests/wpt/tests/editing/other/empty-elements-insertion.html diff --git a/tests/wpt/web-platform-tests/editing/other/exec-command-never-throw-exceptions.tentative.html b/tests/wpt/tests/editing/other/exec-command-never-throw-exceptions.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/exec-command-never-throw-exceptions.tentative.html rename to tests/wpt/tests/editing/other/exec-command-never-throw-exceptions.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/exec-command-with-text-editor.tentative.html b/tests/wpt/tests/editing/other/exec-command-with-text-editor.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/exec-command-with-text-editor.tentative.html rename to tests/wpt/tests/editing/other/exec-command-with-text-editor.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/exec-command-without-editable-element.tentative.html b/tests/wpt/tests/editing/other/exec-command-without-editable-element.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/exec-command-without-editable-element.tentative.html rename to tests/wpt/tests/editing/other/exec-command-without-editable-element.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/extra-text-nodes.html b/tests/wpt/tests/editing/other/extra-text-nodes.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/extra-text-nodes.html rename to tests/wpt/tests/editing/other/extra-text-nodes.html diff --git a/tests/wpt/web-platform-tests/editing/other/formatblock-preserving-selection.tentative.html b/tests/wpt/tests/editing/other/formatblock-preserving-selection.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/formatblock-preserving-selection.tentative.html rename to tests/wpt/tests/editing/other/formatblock-preserving-selection.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/indent-preserving-selection.tentative.html b/tests/wpt/tests/editing/other/indent-preserving-selection.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/indent-preserving-selection.tentative.html rename to tests/wpt/tests/editing/other/indent-preserving-selection.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/insert-list-preserving-selection.tentative.html b/tests/wpt/tests/editing/other/insert-list-preserving-selection.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/insert-list-preserving-selection.tentative.html rename to tests/wpt/tests/editing/other/insert-list-preserving-selection.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/insert-paragraph-in-void-element.tentative.html b/tests/wpt/tests/editing/other/insert-paragraph-in-void-element.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/insert-paragraph-in-void-element.tentative.html rename to tests/wpt/tests/editing/other/insert-paragraph-in-void-element.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/insert-text-in-void-element.tentative.html b/tests/wpt/tests/editing/other/insert-text-in-void-element.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/insert-text-in-void-element.tentative.html rename to tests/wpt/tests/editing/other/insert-text-in-void-element.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/inserthtml-do-not-preserve-inline-styles.html b/tests/wpt/tests/editing/other/inserthtml-do-not-preserve-inline-styles.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/inserthtml-do-not-preserve-inline-styles.html rename to tests/wpt/tests/editing/other/inserthtml-do-not-preserve-inline-styles.html diff --git a/tests/wpt/web-platform-tests/editing/other/insertlinebreak-with-white-space-style.tentative.html b/tests/wpt/tests/editing/other/insertlinebreak-with-white-space-style.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/insertlinebreak-with-white-space-style.tentative.html rename to tests/wpt/tests/editing/other/insertlinebreak-with-white-space-style.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/insertparagraph-in-child-of-head.tentative.html b/tests/wpt/tests/editing/other/insertparagraph-in-child-of-head.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/insertparagraph-in-child-of-head.tentative.html rename to tests/wpt/tests/editing/other/insertparagraph-in-child-of-head.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/insertparagraph-in-child-of-html.tentative.html b/tests/wpt/tests/editing/other/insertparagraph-in-child-of-html.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/insertparagraph-in-child-of-html.tentative.html rename to tests/wpt/tests/editing/other/insertparagraph-in-child-of-html.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/insertparagraph-in-inline-editing-host.tentative.html b/tests/wpt/tests/editing/other/insertparagraph-in-inline-editing-host.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/insertparagraph-in-inline-editing-host.tentative.html rename to tests/wpt/tests/editing/other/insertparagraph-in-inline-editing-host.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/insertparagraph-in-non-splittable-element.html b/tests/wpt/tests/editing/other/insertparagraph-in-non-splittable-element.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/insertparagraph-in-non-splittable-element.html rename to tests/wpt/tests/editing/other/insertparagraph-in-non-splittable-element.html diff --git a/tests/wpt/web-platform-tests/editing/other/insertparagraph-with-white-space-style.tentative.html b/tests/wpt/tests/editing/other/insertparagraph-with-white-space-style.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/insertparagraph-with-white-space-style.tentative.html rename to tests/wpt/tests/editing/other/insertparagraph-with-white-space-style.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html b/tests/wpt/tests/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html rename to tests/wpt/tests/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html diff --git a/tests/wpt/web-platform-tests/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html b/tests/wpt/tests/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html rename to tests/wpt/tests/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html diff --git a/tests/wpt/web-platform-tests/editing/other/join-different-white-space-style-paragraphs.html b/tests/wpt/tests/editing/other/join-different-white-space-style-paragraphs.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/join-different-white-space-style-paragraphs.html rename to tests/wpt/tests/editing/other/join-different-white-space-style-paragraphs.html diff --git a/tests/wpt/web-platform-tests/editing/other/join-pre-and-other-block.html b/tests/wpt/tests/editing/other/join-pre-and-other-block.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/join-pre-and-other-block.html rename to tests/wpt/tests/editing/other/join-pre-and-other-block.html diff --git a/tests/wpt/web-platform-tests/editing/other/justify-preserving-selection.tentative.html b/tests/wpt/tests/editing/other/justify-preserving-selection.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/justify-preserving-selection.tentative.html rename to tests/wpt/tests/editing/other/justify-preserving-selection.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/keeping-attributes-at-joining-elements.tentative.html b/tests/wpt/tests/editing/other/keeping-attributes-at-joining-elements.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/keeping-attributes-at-joining-elements.tentative.html rename to tests/wpt/tests/editing/other/keeping-attributes-at-joining-elements.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/legacy-edit-command.html b/tests/wpt/tests/editing/other/legacy-edit-command.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/legacy-edit-command.html rename to tests/wpt/tests/editing/other/legacy-edit-command.html diff --git a/tests/wpt/web-platform-tests/editing/other/link-boundaries-insertion.html b/tests/wpt/tests/editing/other/link-boundaries-insertion.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/link-boundaries-insertion.html rename to tests/wpt/tests/editing/other/link-boundaries-insertion.html diff --git a/tests/wpt/web-platform-tests/editing/other/move-inserted-node-from-DOMNodeInserted-during-exec-command-insertHTML.html b/tests/wpt/tests/editing/other/move-inserted-node-from-DOMNodeInserted-during-exec-command-insertHTML.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/move-inserted-node-from-DOMNodeInserted-during-exec-command-insertHTML.html rename to tests/wpt/tests/editing/other/move-inserted-node-from-DOMNodeInserted-during-exec-command-insertHTML.html diff --git a/tests/wpt/web-platform-tests/editing/other/non-html-document.html b/tests/wpt/tests/editing/other/non-html-document.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/non-html-document.html rename to tests/wpt/tests/editing/other/non-html-document.html diff --git a/tests/wpt/web-platform-tests/editing/other/outdent-preserving-selection.tentative.html b/tests/wpt/tests/editing/other/outdent-preserving-selection.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/outdent-preserving-selection.tentative.html rename to tests/wpt/tests/editing/other/outdent-preserving-selection.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/recursive-exec-command-calls.tentative.html b/tests/wpt/tests/editing/other/recursive-exec-command-calls.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/recursive-exec-command-calls.tentative.html rename to tests/wpt/tests/editing/other/recursive-exec-command-calls.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/removing-inline-style-specified-by-parent-block.tentative.html b/tests/wpt/tests/editing/other/removing-inline-style-specified-by-parent-block.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/removing-inline-style-specified-by-parent-block.tentative.html rename to tests/wpt/tests/editing/other/removing-inline-style-specified-by-parent-block.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/restoration.html b/tests/wpt/tests/editing/other/restoration.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/restoration.html rename to tests/wpt/tests/editing/other/restoration.html diff --git a/tests/wpt/web-platform-tests/editing/other/select-all-and-delete-in-html-element-having-contenteditable.html b/tests/wpt/tests/editing/other/select-all-and-delete-in-html-element-having-contenteditable.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/select-all-and-delete-in-html-element-having-contenteditable.html rename to tests/wpt/tests/editing/other/select-all-and-delete-in-html-element-having-contenteditable.html diff --git a/tests/wpt/web-platform-tests/editing/other/selectall-in-editinghost.html b/tests/wpt/tests/editing/other/selectall-in-editinghost.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/selectall-in-editinghost.html rename to tests/wpt/tests/editing/other/selectall-in-editinghost.html diff --git a/tests/wpt/web-platform-tests/editing/other/selectall-without-focus.html b/tests/wpt/tests/editing/other/selectall-without-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/selectall-without-focus.html rename to tests/wpt/tests/editing/other/selectall-without-focus.html diff --git a/tests/wpt/web-platform-tests/editing/other/setting-value-of-textcontrol-immediately-after-hidden.html b/tests/wpt/tests/editing/other/setting-value-of-textcontrol-immediately-after-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/setting-value-of-textcontrol-immediately-after-hidden.html rename to tests/wpt/tests/editing/other/setting-value-of-textcontrol-immediately-after-hidden.html diff --git a/tests/wpt/web-platform-tests/editing/other/typing-around-link-element-after-joining-paragraphs.html b/tests/wpt/tests/editing/other/typing-around-link-element-after-joining-paragraphs.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/typing-around-link-element-after-joining-paragraphs.html rename to tests/wpt/tests/editing/other/typing-around-link-element-after-joining-paragraphs.html diff --git a/tests/wpt/web-platform-tests/editing/other/typing-around-link-element-at-collapsed-selection.tentative.html b/tests/wpt/tests/editing/other/typing-around-link-element-at-collapsed-selection.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/typing-around-link-element-at-collapsed-selection.tentative.html rename to tests/wpt/tests/editing/other/typing-around-link-element-at-collapsed-selection.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/typing-around-link-element-at-non-collapsed-selection.tentative.html b/tests/wpt/tests/editing/other/typing-around-link-element-at-non-collapsed-selection.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/typing-around-link-element-at-non-collapsed-selection.tentative.html rename to tests/wpt/tests/editing/other/typing-around-link-element-at-non-collapsed-selection.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/typing-space-in-editable-button.tentative.html b/tests/wpt/tests/editing/other/typing-space-in-editable-button.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/typing-space-in-editable-button.tentative.html rename to tests/wpt/tests/editing/other/typing-space-in-editable-button.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/typing-space-in-editable-summary.tentative.html b/tests/wpt/tests/editing/other/typing-space-in-editable-summary.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/typing-space-in-editable-summary.tentative.html rename to tests/wpt/tests/editing/other/typing-space-in-editable-summary.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/undo-insertparagraph-after-moving-split-nodes.html b/tests/wpt/tests/editing/other/undo-insertparagraph-after-moving-split-nodes.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/undo-insertparagraph-after-moving-split-nodes.html rename to tests/wpt/tests/editing/other/undo-insertparagraph-after-moving-split-nodes.html diff --git a/tests/wpt/web-platform-tests/editing/other/white-spaces-after-execCommand-delete.tentative.html b/tests/wpt/tests/editing/other/white-spaces-after-execCommand-delete.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/white-spaces-after-execCommand-delete.tentative.html rename to tests/wpt/tests/editing/other/white-spaces-after-execCommand-delete.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/white-spaces-after-execCommand-forwarddelete.tentative.html b/tests/wpt/tests/editing/other/white-spaces-after-execCommand-forwarddelete.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/white-spaces-after-execCommand-forwarddelete.tentative.html rename to tests/wpt/tests/editing/other/white-spaces-after-execCommand-forwarddelete.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/white-spaces-after-execCommand-insertlinebreak.tentative.html b/tests/wpt/tests/editing/other/white-spaces-after-execCommand-insertlinebreak.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/white-spaces-after-execCommand-insertlinebreak.tentative.html rename to tests/wpt/tests/editing/other/white-spaces-after-execCommand-insertlinebreak.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/white-spaces-after-execCommand-insertparagraph.tentative.html b/tests/wpt/tests/editing/other/white-spaces-after-execCommand-insertparagraph.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/white-spaces-after-execCommand-insertparagraph.tentative.html rename to tests/wpt/tests/editing/other/white-spaces-after-execCommand-insertparagraph.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/other/white-spaces-after-execCommand-inserttext.tentative.html b/tests/wpt/tests/editing/other/white-spaces-after-execCommand-inserttext.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/other/white-spaces-after-execCommand-inserttext.tentative.html rename to tests/wpt/tests/editing/other/white-spaces-after-execCommand-inserttext.tentative.html diff --git a/tests/wpt/web-platform-tests/editing/run/backcolor.html b/tests/wpt/tests/editing/run/backcolor.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/backcolor.html rename to tests/wpt/tests/editing/run/backcolor.html diff --git a/tests/wpt/web-platform-tests/editing/run/bold.html b/tests/wpt/tests/editing/run/bold.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/bold.html rename to tests/wpt/tests/editing/run/bold.html diff --git a/tests/wpt/web-platform-tests/editing/run/caret-navigation-after-removing-line-break.html b/tests/wpt/tests/editing/run/caret-navigation-after-removing-line-break.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/caret-navigation-after-removing-line-break.html rename to tests/wpt/tests/editing/run/caret-navigation-after-removing-line-break.html diff --git a/tests/wpt/web-platform-tests/editing/run/caret-navigation-around-line-break.html b/tests/wpt/tests/editing/run/caret-navigation-around-line-break.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/caret-navigation-around-line-break.html rename to tests/wpt/tests/editing/run/caret-navigation-around-line-break.html diff --git a/tests/wpt/web-platform-tests/editing/run/caretnavigation.html b/tests/wpt/tests/editing/run/caretnavigation.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/caretnavigation.html rename to tests/wpt/tests/editing/run/caretnavigation.html diff --git a/tests/wpt/web-platform-tests/editing/run/createlink.html b/tests/wpt/tests/editing/run/createlink.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/createlink.html rename to tests/wpt/tests/editing/run/createlink.html diff --git a/tests/wpt/web-platform-tests/editing/run/delete-list-items-in-table-cell.html b/tests/wpt/tests/editing/run/delete-list-items-in-table-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/delete-list-items-in-table-cell.html rename to tests/wpt/tests/editing/run/delete-list-items-in-table-cell.html diff --git a/tests/wpt/web-platform-tests/editing/run/delete.html b/tests/wpt/tests/editing/run/delete.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/delete.html rename to tests/wpt/tests/editing/run/delete.html diff --git a/tests/wpt/web-platform-tests/editing/run/empty-editable-crash.html b/tests/wpt/tests/editing/run/empty-editable-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/empty-editable-crash.html rename to tests/wpt/tests/editing/run/empty-editable-crash.html diff --git a/tests/wpt/web-platform-tests/editing/run/first-letter-crossing-engine-boundary-crash.html b/tests/wpt/tests/editing/run/first-letter-crossing-engine-boundary-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/first-letter-crossing-engine-boundary-crash.html rename to tests/wpt/tests/editing/run/first-letter-crossing-engine-boundary-crash.html diff --git a/tests/wpt/web-platform-tests/editing/run/fontname.html b/tests/wpt/tests/editing/run/fontname.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/fontname.html rename to tests/wpt/tests/editing/run/fontname.html diff --git a/tests/wpt/web-platform-tests/editing/run/fontsize.html b/tests/wpt/tests/editing/run/fontsize.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/fontsize.html rename to tests/wpt/tests/editing/run/fontsize.html diff --git a/tests/wpt/web-platform-tests/editing/run/forecolor.html b/tests/wpt/tests/editing/run/forecolor.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/forecolor.html rename to tests/wpt/tests/editing/run/forecolor.html diff --git a/tests/wpt/web-platform-tests/editing/run/formatblock.html b/tests/wpt/tests/editing/run/formatblock.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/formatblock.html rename to tests/wpt/tests/editing/run/formatblock.html diff --git a/tests/wpt/web-platform-tests/editing/run/forwarddelete.html b/tests/wpt/tests/editing/run/forwarddelete.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/forwarddelete.html rename to tests/wpt/tests/editing/run/forwarddelete.html diff --git a/tests/wpt/web-platform-tests/editing/run/hilitecolor.html b/tests/wpt/tests/editing/run/hilitecolor.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/hilitecolor.html rename to tests/wpt/tests/editing/run/hilitecolor.html diff --git a/tests/wpt/web-platform-tests/editing/run/indent.html b/tests/wpt/tests/editing/run/indent.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/indent.html rename to tests/wpt/tests/editing/run/indent.html diff --git a/tests/wpt/web-platform-tests/editing/run/insert-list-items-in-table-cell.html b/tests/wpt/tests/editing/run/insert-list-items-in-table-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/insert-list-items-in-table-cell.html rename to tests/wpt/tests/editing/run/insert-list-items-in-table-cell.html diff --git a/tests/wpt/web-platform-tests/editing/run/inserthorizontalrule.html b/tests/wpt/tests/editing/run/inserthorizontalrule.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/inserthorizontalrule.html rename to tests/wpt/tests/editing/run/inserthorizontalrule.html diff --git a/tests/wpt/web-platform-tests/editing/run/inserthtml.html b/tests/wpt/tests/editing/run/inserthtml.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/inserthtml.html rename to tests/wpt/tests/editing/run/inserthtml.html diff --git a/tests/wpt/web-platform-tests/editing/run/insertimage.html b/tests/wpt/tests/editing/run/insertimage.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/insertimage.html rename to tests/wpt/tests/editing/run/insertimage.html diff --git a/tests/wpt/web-platform-tests/editing/run/insertlinebreak.html b/tests/wpt/tests/editing/run/insertlinebreak.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/insertlinebreak.html rename to tests/wpt/tests/editing/run/insertlinebreak.html diff --git a/tests/wpt/web-platform-tests/editing/run/insertorderedlist.html b/tests/wpt/tests/editing/run/insertorderedlist.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/insertorderedlist.html rename to tests/wpt/tests/editing/run/insertorderedlist.html diff --git a/tests/wpt/web-platform-tests/editing/run/insertparagraph.html b/tests/wpt/tests/editing/run/insertparagraph.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/insertparagraph.html rename to tests/wpt/tests/editing/run/insertparagraph.html diff --git a/tests/wpt/web-platform-tests/editing/run/inserttext.html b/tests/wpt/tests/editing/run/inserttext.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/inserttext.html rename to tests/wpt/tests/editing/run/inserttext.html diff --git a/tests/wpt/web-platform-tests/editing/run/insertunorderedlist.html b/tests/wpt/tests/editing/run/insertunorderedlist.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/insertunorderedlist.html rename to tests/wpt/tests/editing/run/insertunorderedlist.html diff --git a/tests/wpt/web-platform-tests/editing/run/italic.html b/tests/wpt/tests/editing/run/italic.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/italic.html rename to tests/wpt/tests/editing/run/italic.html diff --git a/tests/wpt/web-platform-tests/editing/run/justifycenter.html b/tests/wpt/tests/editing/run/justifycenter.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/justifycenter.html rename to tests/wpt/tests/editing/run/justifycenter.html diff --git a/tests/wpt/web-platform-tests/editing/run/justifyfull.html b/tests/wpt/tests/editing/run/justifyfull.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/justifyfull.html rename to tests/wpt/tests/editing/run/justifyfull.html diff --git a/tests/wpt/web-platform-tests/editing/run/justifyleft.html b/tests/wpt/tests/editing/run/justifyleft.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/justifyleft.html rename to tests/wpt/tests/editing/run/justifyleft.html diff --git a/tests/wpt/web-platform-tests/editing/run/justifyright.html b/tests/wpt/tests/editing/run/justifyright.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/justifyright.html rename to tests/wpt/tests/editing/run/justifyright.html diff --git a/tests/wpt/web-platform-tests/editing/run/misc.html b/tests/wpt/tests/editing/run/misc.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/misc.html rename to tests/wpt/tests/editing/run/misc.html diff --git a/tests/wpt/web-platform-tests/editing/run/multitest.html b/tests/wpt/tests/editing/run/multitest.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/multitest.html rename to tests/wpt/tests/editing/run/multitest.html diff --git a/tests/wpt/web-platform-tests/editing/run/outdent.html b/tests/wpt/tests/editing/run/outdent.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/outdent.html rename to tests/wpt/tests/editing/run/outdent.html diff --git a/tests/wpt/web-platform-tests/editing/run/removeformat.html b/tests/wpt/tests/editing/run/removeformat.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/removeformat.html rename to tests/wpt/tests/editing/run/removeformat.html diff --git a/tests/wpt/web-platform-tests/editing/run/strikethrough.html b/tests/wpt/tests/editing/run/strikethrough.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/strikethrough.html rename to tests/wpt/tests/editing/run/strikethrough.html diff --git a/tests/wpt/web-platform-tests/editing/run/subscript.html b/tests/wpt/tests/editing/run/subscript.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/subscript.html rename to tests/wpt/tests/editing/run/subscript.html diff --git a/tests/wpt/web-platform-tests/editing/run/superscript.html b/tests/wpt/tests/editing/run/superscript.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/superscript.html rename to tests/wpt/tests/editing/run/superscript.html diff --git a/tests/wpt/web-platform-tests/editing/run/underline.html b/tests/wpt/tests/editing/run/underline.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/underline.html rename to tests/wpt/tests/editing/run/underline.html diff --git a/tests/wpt/web-platform-tests/editing/run/undo-redo-after-mutation.html b/tests/wpt/tests/editing/run/undo-redo-after-mutation.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/undo-redo-after-mutation.html rename to tests/wpt/tests/editing/run/undo-redo-after-mutation.html diff --git a/tests/wpt/web-platform-tests/editing/run/undo-redo.html b/tests/wpt/tests/editing/run/undo-redo.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/undo-redo.html rename to tests/wpt/tests/editing/run/undo-redo.html diff --git a/tests/wpt/web-platform-tests/editing/run/unlink.html b/tests/wpt/tests/editing/run/unlink.html similarity index 100% rename from tests/wpt/web-platform-tests/editing/run/unlink.html rename to tests/wpt/tests/editing/run/unlink.html diff --git a/tests/wpt/web-platform-tests/element-timing/META.yml b/tests/wpt/tests/element-timing/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/META.yml rename to tests/wpt/tests/element-timing/META.yml diff --git a/tests/wpt/web-platform-tests/element-timing/background-image-data-uri.html b/tests/wpt/tests/element-timing/background-image-data-uri.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/background-image-data-uri.html rename to tests/wpt/tests/element-timing/background-image-data-uri.html diff --git a/tests/wpt/web-platform-tests/element-timing/background-image-multiple-elements.html b/tests/wpt/tests/element-timing/background-image-multiple-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/background-image-multiple-elements.html rename to tests/wpt/tests/element-timing/background-image-multiple-elements.html diff --git a/tests/wpt/web-platform-tests/element-timing/background-image-stretched.html b/tests/wpt/tests/element-timing/background-image-stretched.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/background-image-stretched.html rename to tests/wpt/tests/element-timing/background-image-stretched.html diff --git a/tests/wpt/web-platform-tests/element-timing/buffer-before-onload.html b/tests/wpt/tests/element-timing/buffer-before-onload.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/buffer-before-onload.html rename to tests/wpt/tests/element-timing/buffer-before-onload.html diff --git a/tests/wpt/web-platform-tests/element-timing/buffered-flag.html b/tests/wpt/tests/element-timing/buffered-flag.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/buffered-flag.html rename to tests/wpt/tests/element-timing/buffered-flag.html diff --git a/tests/wpt/web-platform-tests/element-timing/cross-origin-element.sub.html b/tests/wpt/tests/element-timing/cross-origin-element.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/cross-origin-element.sub.html rename to tests/wpt/tests/element-timing/cross-origin-element.sub.html diff --git a/tests/wpt/web-platform-tests/element-timing/cross-origin-iframe-element.sub.html b/tests/wpt/tests/element-timing/cross-origin-iframe-element.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/cross-origin-iframe-element.sub.html rename to tests/wpt/tests/element-timing/cross-origin-iframe-element.sub.html diff --git a/tests/wpt/web-platform-tests/element-timing/css-generated-text.html b/tests/wpt/tests/element-timing/css-generated-text.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/css-generated-text.html rename to tests/wpt/tests/element-timing/css-generated-text.html diff --git a/tests/wpt/web-platform-tests/element-timing/disconnect-image.html b/tests/wpt/tests/element-timing/disconnect-image.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/disconnect-image.html rename to tests/wpt/tests/element-timing/disconnect-image.html diff --git a/tests/wpt/web-platform-tests/element-timing/element-only-when-fully-active.html b/tests/wpt/tests/element-timing/element-only-when-fully-active.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/element-only-when-fully-active.html rename to tests/wpt/tests/element-timing/element-only-when-fully-active.html diff --git a/tests/wpt/web-platform-tests/element-timing/first-letter-background.html b/tests/wpt/tests/element-timing/first-letter-background.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/first-letter-background.html rename to tests/wpt/tests/element-timing/first-letter-background.html diff --git a/tests/wpt/web-platform-tests/element-timing/fixed-id-identifier.html b/tests/wpt/tests/element-timing/fixed-id-identifier.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/fixed-id-identifier.html rename to tests/wpt/tests/element-timing/fixed-id-identifier.html diff --git a/tests/wpt/web-platform-tests/element-timing/idlharness.window.js b/tests/wpt/tests/element-timing/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/idlharness.window.js rename to tests/wpt/tests/element-timing/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/element-timing/image-TAO.sub.html b/tests/wpt/tests/element-timing/image-TAO.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/image-TAO.sub.html rename to tests/wpt/tests/element-timing/image-TAO.sub.html diff --git a/tests/wpt/web-platform-tests/element-timing/image-carousel.html b/tests/wpt/tests/element-timing/image-carousel.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/image-carousel.html rename to tests/wpt/tests/element-timing/image-carousel.html diff --git a/tests/wpt/web-platform-tests/element-timing/image-clipped-svg.html b/tests/wpt/tests/element-timing/image-clipped-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/image-clipped-svg.html rename to tests/wpt/tests/element-timing/image-clipped-svg.html diff --git a/tests/wpt/web-platform-tests/element-timing/image-data-uri.html b/tests/wpt/tests/element-timing/image-data-uri.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/image-data-uri.html rename to tests/wpt/tests/element-timing/image-data-uri.html diff --git a/tests/wpt/web-platform-tests/element-timing/image-not-added.html b/tests/wpt/tests/element-timing/image-not-added.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/image-not-added.html rename to tests/wpt/tests/element-timing/image-not-added.html diff --git a/tests/wpt/web-platform-tests/element-timing/image-not-fully-visible.html b/tests/wpt/tests/element-timing/image-not-fully-visible.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/image-not-fully-visible.html rename to tests/wpt/tests/element-timing/image-not-fully-visible.html diff --git a/tests/wpt/web-platform-tests/element-timing/image-rect-iframe.html b/tests/wpt/tests/element-timing/image-rect-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/image-rect-iframe.html rename to tests/wpt/tests/element-timing/image-rect-iframe.html diff --git a/tests/wpt/web-platform-tests/element-timing/image-src-change.html b/tests/wpt/tests/element-timing/image-src-change.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/image-src-change.html rename to tests/wpt/tests/element-timing/image-src-change.html diff --git a/tests/wpt/web-platform-tests/element-timing/image-with-css-scale.html b/tests/wpt/tests/element-timing/image-with-css-scale.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/image-with-css-scale.html rename to tests/wpt/tests/element-timing/image-with-css-scale.html diff --git a/tests/wpt/web-platform-tests/element-timing/image-with-rotation.html b/tests/wpt/tests/element-timing/image-with-rotation.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/image-with-rotation.html rename to tests/wpt/tests/element-timing/image-with-rotation.html diff --git a/tests/wpt/web-platform-tests/element-timing/images-repeated-resource.html b/tests/wpt/tests/element-timing/images-repeated-resource.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/images-repeated-resource.html rename to tests/wpt/tests/element-timing/images-repeated-resource.html diff --git a/tests/wpt/web-platform-tests/element-timing/invisible-images.html b/tests/wpt/tests/element-timing/invisible-images.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/invisible-images.html rename to tests/wpt/tests/element-timing/invisible-images.html diff --git a/tests/wpt/web-platform-tests/element-timing/multiple-background-images.html b/tests/wpt/tests/element-timing/multiple-background-images.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/multiple-background-images.html rename to tests/wpt/tests/element-timing/multiple-background-images.html diff --git a/tests/wpt/web-platform-tests/element-timing/multiple-redirects-TAO.html b/tests/wpt/tests/element-timing/multiple-redirects-TAO.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/multiple-redirects-TAO.html rename to tests/wpt/tests/element-timing/multiple-redirects-TAO.html diff --git a/tests/wpt/web-platform-tests/element-timing/observe-background-image.html b/tests/wpt/tests/element-timing/observe-background-image.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/observe-background-image.html rename to tests/wpt/tests/element-timing/observe-background-image.html diff --git a/tests/wpt/web-platform-tests/element-timing/observe-child-element.html b/tests/wpt/tests/element-timing/observe-child-element.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/observe-child-element.html rename to tests/wpt/tests/element-timing/observe-child-element.html diff --git a/tests/wpt/web-platform-tests/element-timing/observe-elementtiming.html b/tests/wpt/tests/element-timing/observe-elementtiming.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/observe-elementtiming.html rename to tests/wpt/tests/element-timing/observe-elementtiming.html diff --git a/tests/wpt/web-platform-tests/element-timing/observe-empty-attribute.html b/tests/wpt/tests/element-timing/observe-empty-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/observe-empty-attribute.html rename to tests/wpt/tests/element-timing/observe-empty-attribute.html diff --git a/tests/wpt/web-platform-tests/element-timing/observe-multiple-images.html b/tests/wpt/tests/element-timing/observe-multiple-images.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/observe-multiple-images.html rename to tests/wpt/tests/element-timing/observe-multiple-images.html diff --git a/tests/wpt/web-platform-tests/element-timing/observe-shadow-image.html b/tests/wpt/tests/element-timing/observe-shadow-image.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/observe-shadow-image.html rename to tests/wpt/tests/element-timing/observe-shadow-image.html diff --git a/tests/wpt/web-platform-tests/element-timing/observe-shadow-text.html b/tests/wpt/tests/element-timing/observe-shadow-text.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/observe-shadow-text.html rename to tests/wpt/tests/element-timing/observe-shadow-text.html diff --git a/tests/wpt/web-platform-tests/element-timing/observe-svg-image.html b/tests/wpt/tests/element-timing/observe-svg-image.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/observe-svg-image.html rename to tests/wpt/tests/element-timing/observe-svg-image.html diff --git a/tests/wpt/web-platform-tests/element-timing/observe-text.html b/tests/wpt/tests/element-timing/observe-text.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/observe-text.html rename to tests/wpt/tests/element-timing/observe-text.html diff --git a/tests/wpt/web-platform-tests/element-timing/observe-video-poster.html b/tests/wpt/tests/element-timing/observe-video-poster.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/observe-video-poster.html rename to tests/wpt/tests/element-timing/observe-video-poster.html diff --git a/tests/wpt/web-platform-tests/element-timing/progressively-loaded-image.html b/tests/wpt/tests/element-timing/progressively-loaded-image.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/progressively-loaded-image.html rename to tests/wpt/tests/element-timing/progressively-loaded-image.html diff --git a/tests/wpt/web-platform-tests/element-timing/rectangular-image.html b/tests/wpt/tests/element-timing/rectangular-image.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/rectangular-image.html rename to tests/wpt/tests/element-timing/rectangular-image.html diff --git a/tests/wpt/web-platform-tests/element-timing/redirects-tao-star.html b/tests/wpt/tests/element-timing/redirects-tao-star.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/redirects-tao-star.html rename to tests/wpt/tests/element-timing/redirects-tao-star.html diff --git a/tests/wpt/web-platform-tests/element-timing/resources/TAOImage.py b/tests/wpt/tests/element-timing/resources/TAOImage.py similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/TAOImage.py rename to tests/wpt/tests/element-timing/resources/TAOImage.py diff --git a/tests/wpt/web-platform-tests/element-timing/resources/circle-tao.svg b/tests/wpt/tests/element-timing/resources/circle-tao.svg similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/circle-tao.svg rename to tests/wpt/tests/element-timing/resources/circle-tao.svg diff --git a/tests/wpt/web-platform-tests/element-timing/resources/circle-tao.svg.headers b/tests/wpt/tests/element-timing/resources/circle-tao.svg.headers similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/circle-tao.svg.headers rename to tests/wpt/tests/element-timing/resources/circle-tao.svg.headers diff --git a/tests/wpt/web-platform-tests/element-timing/resources/circle.svg b/tests/wpt/tests/element-timing/resources/circle.svg similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/circle.svg rename to tests/wpt/tests/element-timing/resources/circle.svg diff --git a/tests/wpt/web-platform-tests/element-timing/resources/element-timing-helpers.js b/tests/wpt/tests/element-timing/resources/element-timing-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/element-timing-helpers.js rename to tests/wpt/tests/element-timing/resources/element-timing-helpers.js diff --git a/tests/wpt/web-platform-tests/element-timing/resources/iframe-stores-entry.html b/tests/wpt/tests/element-timing/resources/iframe-stores-entry.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/iframe-stores-entry.html rename to tests/wpt/tests/element-timing/resources/iframe-stores-entry.html diff --git a/tests/wpt/web-platform-tests/element-timing/resources/iframe-with-content.html b/tests/wpt/tests/element-timing/resources/iframe-with-content.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/iframe-with-content.html rename to tests/wpt/tests/element-timing/resources/iframe-with-content.html diff --git a/tests/wpt/web-platform-tests/element-timing/resources/iframe-with-square-sends-entry.html b/tests/wpt/tests/element-timing/resources/iframe-with-square-sends-entry.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/iframe-with-square-sends-entry.html rename to tests/wpt/tests/element-timing/resources/iframe-with-square-sends-entry.html diff --git a/tests/wpt/web-platform-tests/element-timing/resources/iframe-with-square.html b/tests/wpt/tests/element-timing/resources/iframe-with-square.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/iframe-with-square.html rename to tests/wpt/tests/element-timing/resources/iframe-with-square.html diff --git a/tests/wpt/web-platform-tests/element-timing/resources/multiple-redirects.py b/tests/wpt/tests/element-timing/resources/multiple-redirects.py similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/multiple-redirects.py rename to tests/wpt/tests/element-timing/resources/multiple-redirects.py diff --git a/tests/wpt/web-platform-tests/element-timing/resources/progressive-image.py b/tests/wpt/tests/element-timing/resources/progressive-image.py similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/progressive-image.py rename to tests/wpt/tests/element-timing/resources/progressive-image.py diff --git a/tests/wpt/web-platform-tests/element-timing/resources/slow-image.py b/tests/wpt/tests/element-timing/resources/slow-image.py similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/slow-image.py rename to tests/wpt/tests/element-timing/resources/slow-image.py diff --git a/tests/wpt/web-platform-tests/element-timing/resources/square100.png b/tests/wpt/tests/element-timing/resources/square100.png similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/square100.png rename to tests/wpt/tests/element-timing/resources/square100.png diff --git a/tests/wpt/web-platform-tests/element-timing/resources/square20.jpg b/tests/wpt/tests/element-timing/resources/square20.jpg similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/square20.jpg rename to tests/wpt/tests/element-timing/resources/square20.jpg diff --git a/tests/wpt/web-platform-tests/element-timing/resources/square20.png b/tests/wpt/tests/element-timing/resources/square20.png similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/resources/square20.png rename to tests/wpt/tests/element-timing/resources/square20.png diff --git a/tests/wpt/web-platform-tests/element-timing/retrievability.html b/tests/wpt/tests/element-timing/retrievability.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/retrievability.html rename to tests/wpt/tests/element-timing/retrievability.html diff --git a/tests/wpt/web-platform-tests/element-timing/same-origin-redirects.html b/tests/wpt/tests/element-timing/same-origin-redirects.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/same-origin-redirects.html rename to tests/wpt/tests/element-timing/same-origin-redirects.html diff --git a/tests/wpt/web-platform-tests/element-timing/scroll-to-text.html b/tests/wpt/tests/element-timing/scroll-to-text.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/scroll-to-text.html rename to tests/wpt/tests/element-timing/scroll-to-text.html diff --git a/tests/wpt/web-platform-tests/element-timing/supported-element-type.html b/tests/wpt/tests/element-timing/supported-element-type.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/supported-element-type.html rename to tests/wpt/tests/element-timing/supported-element-type.html diff --git a/tests/wpt/web-platform-tests/element-timing/text-with-display-style.html b/tests/wpt/tests/element-timing/text-with-display-style.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/text-with-display-style.html rename to tests/wpt/tests/element-timing/text-with-display-style.html diff --git a/tests/wpt/web-platform-tests/element-timing/toJSON.html b/tests/wpt/tests/element-timing/toJSON.html similarity index 100% rename from tests/wpt/web-platform-tests/element-timing/toJSON.html rename to tests/wpt/tests/element-timing/toJSON.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/__dir__.headers b/tests/wpt/tests/encoding-detection/__dir__.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/__dir__.headers rename to tests/wpt/tests/encoding-detection/__dir__.headers diff --git a/tests/wpt/web-platform-tests/encoding-detection/ar-ISO-8859-6-late.tentative.html b/tests/wpt/tests/encoding-detection/ar-ISO-8859-6-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ar-ISO-8859-6-late.tentative.html rename to tests/wpt/tests/encoding-detection/ar-ISO-8859-6-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ar-ISO-8859-6.tentative.html b/tests/wpt/tests/encoding-detection/ar-ISO-8859-6.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ar-ISO-8859-6.tentative.html rename to tests/wpt/tests/encoding-detection/ar-ISO-8859-6.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ar-windows-1256-late.tentative.html b/tests/wpt/tests/encoding-detection/ar-windows-1256-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ar-windows-1256-late.tentative.html rename to tests/wpt/tests/encoding-detection/ar-windows-1256-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ar-windows-1256.tentative.html b/tests/wpt/tests/encoding-detection/ar-windows-1256.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ar-windows-1256.tentative.html rename to tests/wpt/tests/encoding-detection/ar-windows-1256.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ca-windows-1252-late.tentative.html b/tests/wpt/tests/encoding-detection/ca-windows-1252-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ca-windows-1252-late.tentative.html rename to tests/wpt/tests/encoding-detection/ca-windows-1252-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ca-windows-1252.tentative.html b/tests/wpt/tests/encoding-detection/ca-windows-1252.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ca-windows-1252.tentative.html rename to tests/wpt/tests/encoding-detection/ca-windows-1252.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/el-ISO-8859-7-late.tentative.html b/tests/wpt/tests/encoding-detection/el-ISO-8859-7-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/el-ISO-8859-7-late.tentative.html rename to tests/wpt/tests/encoding-detection/el-ISO-8859-7-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/el-ISO-8859-7.tentative.html b/tests/wpt/tests/encoding-detection/el-ISO-8859-7.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/el-ISO-8859-7.tentative.html rename to tests/wpt/tests/encoding-detection/el-ISO-8859-7.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/el-windows-1253-late.tentative.html b/tests/wpt/tests/encoding-detection/el-windows-1253-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/el-windows-1253-late.tentative.html rename to tests/wpt/tests/encoding-detection/el-windows-1253-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/el-windows-1253.tentative.html b/tests/wpt/tests/encoding-detection/el-windows-1253.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/el-windows-1253.tentative.html rename to tests/wpt/tests/encoding-detection/el-windows-1253.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/en-copyright-windows-1252.tentative.html b/tests/wpt/tests/encoding-detection/en-copyright-windows-1252.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/en-copyright-windows-1252.tentative.html rename to tests/wpt/tests/encoding-detection/en-copyright-windows-1252.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/en-euro-windows-1252.tentative.html b/tests/wpt/tests/encoding-detection/en-euro-windows-1252.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/en-euro-windows-1252.tentative.html rename to tests/wpt/tests/encoding-detection/en-euro-windows-1252.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/en-windows-1252.tentative.html b/tests/wpt/tests/encoding-detection/en-windows-1252.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/en-windows-1252.tentative.html rename to tests/wpt/tests/encoding-detection/en-windows-1252.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/es-maria-windows-1252.html b/tests/wpt/tests/encoding-detection/es-maria-windows-1252.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/es-maria-windows-1252.html rename to tests/wpt/tests/encoding-detection/es-maria-windows-1252.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/es-nuestra-senora-windows-1252.tentative.html b/tests/wpt/tests/encoding-detection/es-nuestra-senora-windows-1252.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/es-nuestra-senora-windows-1252.tentative.html rename to tests/wpt/tests/encoding-detection/es-nuestra-senora-windows-1252.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/es-number-one-windows-1252.tentative.html b/tests/wpt/tests/encoding-detection/es-number-one-windows-1252.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/es-number-one-windows-1252.tentative.html rename to tests/wpt/tests/encoding-detection/es-number-one-windows-1252.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/es-ordinal-windows-1252.html b/tests/wpt/tests/encoding-detection/es-ordinal-windows-1252.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/es-ordinal-windows-1252.html rename to tests/wpt/tests/encoding-detection/es-ordinal-windows-1252.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/fa-windows-1256-late.tentative.html b/tests/wpt/tests/encoding-detection/fa-windows-1256-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/fa-windows-1256-late.tentative.html rename to tests/wpt/tests/encoding-detection/fa-windows-1256-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/fa-windows-1256.tentative.html b/tests/wpt/tests/encoding-detection/fa-windows-1256.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/fa-windows-1256.tentative.html rename to tests/wpt/tests/encoding-detection/fa-windows-1256.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/fi-windows-1252-late.tentative.html b/tests/wpt/tests/encoding-detection/fi-windows-1252-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/fi-windows-1252-late.tentative.html rename to tests/wpt/tests/encoding-detection/fi-windows-1252-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/fi-windows-1252.tentative.html b/tests/wpt/tests/encoding-detection/fi-windows-1252.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/fi-windows-1252.tentative.html rename to tests/wpt/tests/encoding-detection/fi-windows-1252.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/he-ISO-8859-8-late.tentative.html b/tests/wpt/tests/encoding-detection/he-ISO-8859-8-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/he-ISO-8859-8-late.tentative.html rename to tests/wpt/tests/encoding-detection/he-ISO-8859-8-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/he-ISO-8859-8.tentative.html b/tests/wpt/tests/encoding-detection/he-ISO-8859-8.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/he-ISO-8859-8.tentative.html rename to tests/wpt/tests/encoding-detection/he-ISO-8859-8.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/he-windows-1255-late.tentative.html b/tests/wpt/tests/encoding-detection/he-windows-1255-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/he-windows-1255-late.tentative.html rename to tests/wpt/tests/encoding-detection/he-windows-1255-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/he-windows-1255.tentative.html b/tests/wpt/tests/encoding-detection/he-windows-1255.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/he-windows-1255.tentative.html rename to tests/wpt/tests/encoding-detection/he-windows-1255.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/is-windows-1252-late.tentative.html b/tests/wpt/tests/encoding-detection/is-windows-1252-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/is-windows-1252-late.tentative.html rename to tests/wpt/tests/encoding-detection/is-windows-1252-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/is-windows-1252.tentative.html b/tests/wpt/tests/encoding-detection/is-windows-1252.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/is-windows-1252.tentative.html rename to tests/wpt/tests/encoding-detection/is-windows-1252.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/it-number-one-windows-1252.tentative.html b/tests/wpt/tests/encoding-detection/it-number-one-windows-1252.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/it-number-one-windows-1252.tentative.html rename to tests/wpt/tests/encoding-detection/it-number-one-windows-1252.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/it-ordinal-windows-1252.html b/tests/wpt/tests/encoding-detection/it-ordinal-windows-1252.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/it-ordinal-windows-1252.html rename to tests/wpt/tests/encoding-detection/it-ordinal-windows-1252.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/it-roman-ordinal-windows-1252.html b/tests/wpt/tests/encoding-detection/it-roman-ordinal-windows-1252.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/it-roman-ordinal-windows-1252.html rename to tests/wpt/tests/encoding-detection/it-roman-ordinal-windows-1252.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/it-windows-1252-late.tentative.html b/tests/wpt/tests/encoding-detection/it-windows-1252-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/it-windows-1252-late.tentative.html rename to tests/wpt/tests/encoding-detection/it-windows-1252-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/it-windows-1252.tentative.html b/tests/wpt/tests/encoding-detection/it-windows-1252.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/it-windows-1252.tentative.html rename to tests/wpt/tests/encoding-detection/it-windows-1252.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ja-EUC-JP-late.tentative.html b/tests/wpt/tests/encoding-detection/ja-EUC-JP-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ja-EUC-JP-late.tentative.html rename to tests/wpt/tests/encoding-detection/ja-EUC-JP-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ja-EUC-JP.tentative.html b/tests/wpt/tests/encoding-detection/ja-EUC-JP.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ja-EUC-JP.tentative.html rename to tests/wpt/tests/encoding-detection/ja-EUC-JP.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ja-ISO-2022-JP-late.tentative.html b/tests/wpt/tests/encoding-detection/ja-ISO-2022-JP-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ja-ISO-2022-JP-late.tentative.html rename to tests/wpt/tests/encoding-detection/ja-ISO-2022-JP-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ja-ISO-2022-JP.tentative.html b/tests/wpt/tests/encoding-detection/ja-ISO-2022-JP.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ja-ISO-2022-JP.tentative.html rename to tests/wpt/tests/encoding-detection/ja-ISO-2022-JP.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ja-Shift_JIS-late.tentative.html b/tests/wpt/tests/encoding-detection/ja-Shift_JIS-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ja-Shift_JIS-late.tentative.html rename to tests/wpt/tests/encoding-detection/ja-Shift_JIS-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ja-Shift_JIS.tentative.html b/tests/wpt/tests/encoding-detection/ja-Shift_JIS.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ja-Shift_JIS.tentative.html rename to tests/wpt/tests/encoding-detection/ja-Shift_JIS.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ja-half-width-late.tentative.html b/tests/wpt/tests/encoding-detection/ja-half-width-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ja-half-width-late.tentative.html rename to tests/wpt/tests/encoding-detection/ja-half-width-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ja-half-width.tentative.html b/tests/wpt/tests/encoding-detection/ja-half-width.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ja-half-width.tentative.html rename to tests/wpt/tests/encoding-detection/ja-half-width.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ko-EUC-KR-late.tentative.html b/tests/wpt/tests/encoding-detection/ko-EUC-KR-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ko-EUC-KR-late.tentative.html rename to tests/wpt/tests/encoding-detection/ko-EUC-KR-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ko-EUC-KR.tentative.html b/tests/wpt/tests/encoding-detection/ko-EUC-KR.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ko-EUC-KR.tentative.html rename to tests/wpt/tests/encoding-detection/ko-EUC-KR.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/lt-windows-1257-late.tentative.html b/tests/wpt/tests/encoding-detection/lt-windows-1257-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/lt-windows-1257-late.tentative.html rename to tests/wpt/tests/encoding-detection/lt-windows-1257-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/lt-windows-1257.tentative.html b/tests/wpt/tests/encoding-detection/lt-windows-1257.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/lt-windows-1257.tentative.html rename to tests/wpt/tests/encoding-detection/lt-windows-1257.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/lv-windows-1257-late.tentative.html b/tests/wpt/tests/encoding-detection/lv-windows-1257-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/lv-windows-1257-late.tentative.html rename to tests/wpt/tests/encoding-detection/lv-windows-1257-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/lv-windows-1257.tentative.html b/tests/wpt/tests/encoding-detection/lv-windows-1257.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/lv-windows-1257.tentative.html rename to tests/wpt/tests/encoding-detection/lv-windows-1257.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/nbsp-even-windows-1252.tentative.html b/tests/wpt/tests/encoding-detection/nbsp-even-windows-1252.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/nbsp-even-windows-1252.tentative.html rename to tests/wpt/tests/encoding-detection/nbsp-even-windows-1252.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/nbsp-odd-windows-1252.tentative.html b/tests/wpt/tests/encoding-detection/nbsp-odd-windows-1252.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/nbsp-odd-windows-1252.tentative.html rename to tests/wpt/tests/encoding-detection/nbsp-odd-windows-1252.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/pl-ISO-8859-2-late.tentative.html b/tests/wpt/tests/encoding-detection/pl-ISO-8859-2-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/pl-ISO-8859-2-late.tentative.html rename to tests/wpt/tests/encoding-detection/pl-ISO-8859-2-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/pl-ISO-8859-2.tentative.html b/tests/wpt/tests/encoding-detection/pl-ISO-8859-2.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/pl-ISO-8859-2.tentative.html rename to tests/wpt/tests/encoding-detection/pl-ISO-8859-2.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/pl-windows-1250-late.tentative.html b/tests/wpt/tests/encoding-detection/pl-windows-1250-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/pl-windows-1250-late.tentative.html rename to tests/wpt/tests/encoding-detection/pl-windows-1250-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/pl-windows-1250.tentative.html b/tests/wpt/tests/encoding-detection/pl-windows-1250.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/pl-windows-1250.tentative.html rename to tests/wpt/tests/encoding-detection/pl-windows-1250.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/pt-windows-1252-late.tentative.html b/tests/wpt/tests/encoding-detection/pt-windows-1252-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/pt-windows-1252-late.tentative.html rename to tests/wpt/tests/encoding-detection/pt-windows-1252-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/pt-windows-1252.tentative.html b/tests/wpt/tests/encoding-detection/pt-windows-1252.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/pt-windows-1252.tentative.html rename to tests/wpt/tests/encoding-detection/pt-windows-1252.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ru-IBM866-late.tentative.html b/tests/wpt/tests/encoding-detection/ru-IBM866-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ru-IBM866-late.tentative.html rename to tests/wpt/tests/encoding-detection/ru-IBM866-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ru-IBM866.tentative.html b/tests/wpt/tests/encoding-detection/ru-IBM866.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ru-IBM866.tentative.html rename to tests/wpt/tests/encoding-detection/ru-IBM866.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ru-ISO-8859-5-late.tentative.html b/tests/wpt/tests/encoding-detection/ru-ISO-8859-5-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ru-ISO-8859-5-late.tentative.html rename to tests/wpt/tests/encoding-detection/ru-ISO-8859-5-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/ru-ISO-8859-5.tentative.html b/tests/wpt/tests/encoding-detection/ru-ISO-8859-5.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/ru-ISO-8859-5.tentative.html rename to tests/wpt/tests/encoding-detection/ru-ISO-8859-5.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/__dir__.headers b/tests/wpt/tests/encoding-detection/support/__dir__.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/__dir__.headers rename to tests/wpt/tests/encoding-detection/support/__dir__.headers diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/ar-ISO-8859-6-late.sub.html b/tests/wpt/tests/encoding-detection/support/ar-ISO-8859-6-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/ar-ISO-8859-6-late.sub.html rename to tests/wpt/tests/encoding-detection/support/ar-ISO-8859-6-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/ar-windows-1256-late.sub.html b/tests/wpt/tests/encoding-detection/support/ar-windows-1256-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/ar-windows-1256-late.sub.html rename to tests/wpt/tests/encoding-detection/support/ar-windows-1256-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/ca-windows-1252-late.sub.html b/tests/wpt/tests/encoding-detection/support/ca-windows-1252-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/ca-windows-1252-late.sub.html rename to tests/wpt/tests/encoding-detection/support/ca-windows-1252-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/el-ISO-8859-7-late.sub.html b/tests/wpt/tests/encoding-detection/support/el-ISO-8859-7-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/el-ISO-8859-7-late.sub.html rename to tests/wpt/tests/encoding-detection/support/el-ISO-8859-7-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/el-windows-1253-late.sub.html b/tests/wpt/tests/encoding-detection/support/el-windows-1253-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/el-windows-1253-late.sub.html rename to tests/wpt/tests/encoding-detection/support/el-windows-1253-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/fa-windows-1256-late.sub.html b/tests/wpt/tests/encoding-detection/support/fa-windows-1256-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/fa-windows-1256-late.sub.html rename to tests/wpt/tests/encoding-detection/support/fa-windows-1256-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/fi-windows-1252-late.sub.html b/tests/wpt/tests/encoding-detection/support/fi-windows-1252-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/fi-windows-1252-late.sub.html rename to tests/wpt/tests/encoding-detection/support/fi-windows-1252-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/he-ISO-8859-8-late.sub.html b/tests/wpt/tests/encoding-detection/support/he-ISO-8859-8-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/he-ISO-8859-8-late.sub.html rename to tests/wpt/tests/encoding-detection/support/he-ISO-8859-8-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/he-windows-1255-late.sub.html b/tests/wpt/tests/encoding-detection/support/he-windows-1255-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/he-windows-1255-late.sub.html rename to tests/wpt/tests/encoding-detection/support/he-windows-1255-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/is-windows-1252-late.sub.html b/tests/wpt/tests/encoding-detection/support/is-windows-1252-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/is-windows-1252-late.sub.html rename to tests/wpt/tests/encoding-detection/support/is-windows-1252-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/it-windows-1252-late.sub.html b/tests/wpt/tests/encoding-detection/support/it-windows-1252-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/it-windows-1252-late.sub.html rename to tests/wpt/tests/encoding-detection/support/it-windows-1252-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/ja-EUC-JP-late.sub.html b/tests/wpt/tests/encoding-detection/support/ja-EUC-JP-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/ja-EUC-JP-late.sub.html rename to tests/wpt/tests/encoding-detection/support/ja-EUC-JP-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/ja-ISO-2022-JP-late.sub.html b/tests/wpt/tests/encoding-detection/support/ja-ISO-2022-JP-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/ja-ISO-2022-JP-late.sub.html rename to tests/wpt/tests/encoding-detection/support/ja-ISO-2022-JP-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/ja-Shift_JIS-late.sub.html b/tests/wpt/tests/encoding-detection/support/ja-Shift_JIS-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/ja-Shift_JIS-late.sub.html rename to tests/wpt/tests/encoding-detection/support/ja-Shift_JIS-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/ja-half-width-late.sub.html b/tests/wpt/tests/encoding-detection/support/ja-half-width-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/ja-half-width-late.sub.html rename to tests/wpt/tests/encoding-detection/support/ja-half-width-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/ko-EUC-KR-late.sub.html b/tests/wpt/tests/encoding-detection/support/ko-EUC-KR-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/ko-EUC-KR-late.sub.html rename to tests/wpt/tests/encoding-detection/support/ko-EUC-KR-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/lt-windows-1257-late.sub.html b/tests/wpt/tests/encoding-detection/support/lt-windows-1257-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/lt-windows-1257-late.sub.html rename to tests/wpt/tests/encoding-detection/support/lt-windows-1257-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/lv-windows-1257-late.sub.html b/tests/wpt/tests/encoding-detection/support/lv-windows-1257-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/lv-windows-1257-late.sub.html rename to tests/wpt/tests/encoding-detection/support/lv-windows-1257-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/pl-ISO-8859-2-late.sub.html b/tests/wpt/tests/encoding-detection/support/pl-ISO-8859-2-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/pl-ISO-8859-2-late.sub.html rename to tests/wpt/tests/encoding-detection/support/pl-ISO-8859-2-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/pl-windows-1250-late.sub.html b/tests/wpt/tests/encoding-detection/support/pl-windows-1250-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/pl-windows-1250-late.sub.html rename to tests/wpt/tests/encoding-detection/support/pl-windows-1250-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/pt-windows-1252-late.sub.html b/tests/wpt/tests/encoding-detection/support/pt-windows-1252-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/pt-windows-1252-late.sub.html rename to tests/wpt/tests/encoding-detection/support/pt-windows-1252-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/ru-IBM866-late.sub.html b/tests/wpt/tests/encoding-detection/support/ru-IBM866-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/ru-IBM866-late.sub.html rename to tests/wpt/tests/encoding-detection/support/ru-IBM866-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/ru-ISO-8859-5-late.sub.html b/tests/wpt/tests/encoding-detection/support/ru-ISO-8859-5-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/ru-ISO-8859-5-late.sub.html rename to tests/wpt/tests/encoding-detection/support/ru-ISO-8859-5-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/th-windows-874-late.sub.html b/tests/wpt/tests/encoding-detection/support/th-windows-874-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/th-windows-874-late.sub.html rename to tests/wpt/tests/encoding-detection/support/th-windows-874-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/tr-windows-1254-late.sub.html b/tests/wpt/tests/encoding-detection/support/tr-windows-1254-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/tr-windows-1254-late.sub.html rename to tests/wpt/tests/encoding-detection/support/tr-windows-1254-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/uk-KOI8-U-late.sub.html b/tests/wpt/tests/encoding-detection/support/uk-KOI8-U-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/uk-KOI8-U-late.sub.html rename to tests/wpt/tests/encoding-detection/support/uk-KOI8-U-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/uk-windows-1251-late.sub.html b/tests/wpt/tests/encoding-detection/support/uk-windows-1251-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/uk-windows-1251-late.sub.html rename to tests/wpt/tests/encoding-detection/support/uk-windows-1251-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/vi-windows-1258-late.sub.html b/tests/wpt/tests/encoding-detection/support/vi-windows-1258-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/vi-windows-1258-late.sub.html rename to tests/wpt/tests/encoding-detection/support/vi-windows-1258-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/yi-windows-1255-late.sub.html b/tests/wpt/tests/encoding-detection/support/yi-windows-1255-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/yi-windows-1255-late.sub.html rename to tests/wpt/tests/encoding-detection/support/yi-windows-1255-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/zh-Big5-late.sub.html b/tests/wpt/tests/encoding-detection/support/zh-Big5-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/zh-Big5-late.sub.html rename to tests/wpt/tests/encoding-detection/support/zh-Big5-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/support/zh-GBK-late.sub.html b/tests/wpt/tests/encoding-detection/support/zh-GBK-late.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/support/zh-GBK-late.sub.html rename to tests/wpt/tests/encoding-detection/support/zh-GBK-late.sub.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/th-windows-874-late.tentative.html b/tests/wpt/tests/encoding-detection/th-windows-874-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/th-windows-874-late.tentative.html rename to tests/wpt/tests/encoding-detection/th-windows-874-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/th-windows-874.tentative.html b/tests/wpt/tests/encoding-detection/th-windows-874.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/th-windows-874.tentative.html rename to tests/wpt/tests/encoding-detection/th-windows-874.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/tr-windows-1254-late.tentative.html b/tests/wpt/tests/encoding-detection/tr-windows-1254-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/tr-windows-1254-late.tentative.html rename to tests/wpt/tests/encoding-detection/tr-windows-1254-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/tr-windows-1254.tentative.html b/tests/wpt/tests/encoding-detection/tr-windows-1254.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/tr-windows-1254.tentative.html rename to tests/wpt/tests/encoding-detection/tr-windows-1254.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/uk-KOI8-U-late.tentative.html b/tests/wpt/tests/encoding-detection/uk-KOI8-U-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/uk-KOI8-U-late.tentative.html rename to tests/wpt/tests/encoding-detection/uk-KOI8-U-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/uk-KOI8-U.tentative.html b/tests/wpt/tests/encoding-detection/uk-KOI8-U.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/uk-KOI8-U.tentative.html rename to tests/wpt/tests/encoding-detection/uk-KOI8-U.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/uk-windows-1251-late.tentative.html b/tests/wpt/tests/encoding-detection/uk-windows-1251-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/uk-windows-1251-late.tentative.html rename to tests/wpt/tests/encoding-detection/uk-windows-1251-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/uk-windows-1251.tentative.html b/tests/wpt/tests/encoding-detection/uk-windows-1251.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/uk-windows-1251.tentative.html rename to tests/wpt/tests/encoding-detection/uk-windows-1251.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/utf-8.html b/tests/wpt/tests/encoding-detection/utf-8.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/utf-8.html rename to tests/wpt/tests/encoding-detection/utf-8.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/vi-windows-1258-late.tentative.html b/tests/wpt/tests/encoding-detection/vi-windows-1258-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/vi-windows-1258-late.tentative.html rename to tests/wpt/tests/encoding-detection/vi-windows-1258-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/vi-windows-1258.tentative.html b/tests/wpt/tests/encoding-detection/vi-windows-1258.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/vi-windows-1258.tentative.html rename to tests/wpt/tests/encoding-detection/vi-windows-1258.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/yi-windows-1255-late.tentative.html b/tests/wpt/tests/encoding-detection/yi-windows-1255-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/yi-windows-1255-late.tentative.html rename to tests/wpt/tests/encoding-detection/yi-windows-1255-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/yi-windows-1255.tentative.html b/tests/wpt/tests/encoding-detection/yi-windows-1255.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/yi-windows-1255.tentative.html rename to tests/wpt/tests/encoding-detection/yi-windows-1255.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/zh-Big5-late.tentative.html b/tests/wpt/tests/encoding-detection/zh-Big5-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/zh-Big5-late.tentative.html rename to tests/wpt/tests/encoding-detection/zh-Big5-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/zh-Big5.tentative.html b/tests/wpt/tests/encoding-detection/zh-Big5.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/zh-Big5.tentative.html rename to tests/wpt/tests/encoding-detection/zh-Big5.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/zh-GBK-late.tentative.html b/tests/wpt/tests/encoding-detection/zh-GBK-late.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/zh-GBK-late.tentative.html rename to tests/wpt/tests/encoding-detection/zh-GBK-late.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding-detection/zh-GBK.tentative.html b/tests/wpt/tests/encoding-detection/zh-GBK.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding-detection/zh-GBK.tentative.html rename to tests/wpt/tests/encoding-detection/zh-GBK.tentative.html diff --git a/tests/wpt/web-platform-tests/encoding/META.yml b/tests/wpt/tests/encoding/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/encoding/META.yml rename to tests/wpt/tests/encoding/META.yml diff --git a/tests/wpt/web-platform-tests/encoding/api-basics.any.js b/tests/wpt/tests/encoding/api-basics.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/api-basics.any.js rename to tests/wpt/tests/encoding/api-basics.any.js diff --git a/tests/wpt/web-platform-tests/encoding/api-invalid-label.any.js b/tests/wpt/tests/encoding/api-invalid-label.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/api-invalid-label.any.js rename to tests/wpt/tests/encoding/api-invalid-label.any.js diff --git a/tests/wpt/web-platform-tests/encoding/api-replacement-encodings.any.js b/tests/wpt/tests/encoding/api-replacement-encodings.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/api-replacement-encodings.any.js rename to tests/wpt/tests/encoding/api-replacement-encodings.any.js diff --git a/tests/wpt/web-platform-tests/encoding/api-surrogates-utf8.any.js b/tests/wpt/tests/encoding/api-surrogates-utf8.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/api-surrogates-utf8.any.js rename to tests/wpt/tests/encoding/api-surrogates-utf8.any.js diff --git a/tests/wpt/web-platform-tests/encoding/big5-encoder.html b/tests/wpt/tests/encoding/big5-encoder.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/big5-encoder.html rename to tests/wpt/tests/encoding/big5-encoder.html diff --git a/tests/wpt/web-platform-tests/encoding/bom-handling.html b/tests/wpt/tests/encoding/bom-handling.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/bom-handling.html rename to tests/wpt/tests/encoding/bom-handling.html diff --git a/tests/wpt/web-platform-tests/encoding/bom-handling.html.headers b/tests/wpt/tests/encoding/bom-handling.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/bom-handling.html.headers rename to tests/wpt/tests/encoding/bom-handling.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/encodeInto.any.js b/tests/wpt/tests/encoding/encodeInto.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/encodeInto.any.js rename to tests/wpt/tests/encoding/encodeInto.any.js diff --git a/tests/wpt/web-platform-tests/encoding/encodeInto.any.js.headers b/tests/wpt/tests/encoding/encodeInto.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/encodeInto.any.js.headers rename to tests/wpt/tests/encoding/encodeInto.any.js.headers diff --git a/tests/wpt/web-platform-tests/encoding/eof-shift_jis-ref.html b/tests/wpt/tests/encoding/eof-shift_jis-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/eof-shift_jis-ref.html rename to tests/wpt/tests/encoding/eof-shift_jis-ref.html diff --git a/tests/wpt/web-platform-tests/encoding/eof-shift_jis.html b/tests/wpt/tests/encoding/eof-shift_jis.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/eof-shift_jis.html rename to tests/wpt/tests/encoding/eof-shift_jis.html diff --git a/tests/wpt/web-platform-tests/encoding/eof-utf-8-one-ref.html b/tests/wpt/tests/encoding/eof-utf-8-one-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/eof-utf-8-one-ref.html rename to tests/wpt/tests/encoding/eof-utf-8-one-ref.html diff --git a/tests/wpt/web-platform-tests/encoding/eof-utf-8-one.html b/tests/wpt/tests/encoding/eof-utf-8-one.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/eof-utf-8-one.html rename to tests/wpt/tests/encoding/eof-utf-8-one.html diff --git a/tests/wpt/web-platform-tests/encoding/eof-utf-8-three-ref.html b/tests/wpt/tests/encoding/eof-utf-8-three-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/eof-utf-8-three-ref.html rename to tests/wpt/tests/encoding/eof-utf-8-three-ref.html diff --git a/tests/wpt/web-platform-tests/encoding/eof-utf-8-three.html b/tests/wpt/tests/encoding/eof-utf-8-three.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/eof-utf-8-three.html rename to tests/wpt/tests/encoding/eof-utf-8-three.html diff --git a/tests/wpt/web-platform-tests/encoding/eof-utf-8-two-ref.html b/tests/wpt/tests/encoding/eof-utf-8-two-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/eof-utf-8-two-ref.html rename to tests/wpt/tests/encoding/eof-utf-8-two-ref.html diff --git a/tests/wpt/web-platform-tests/encoding/eof-utf-8-two.html b/tests/wpt/tests/encoding/eof-utf-8-two.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/eof-utf-8-two.html rename to tests/wpt/tests/encoding/eof-utf-8-two.html diff --git a/tests/wpt/web-platform-tests/encoding/idlharness-shadowrealm.window.js b/tests/wpt/tests/encoding/idlharness-shadowrealm.window.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/idlharness-shadowrealm.window.js rename to tests/wpt/tests/encoding/idlharness-shadowrealm.window.js diff --git a/tests/wpt/web-platform-tests/encoding/idlharness.any.js b/tests/wpt/tests/encoding/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/idlharness.any.js rename to tests/wpt/tests/encoding/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/encoding/iso-2022-jp-decoder.any.js b/tests/wpt/tests/encoding/iso-2022-jp-decoder.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/iso-2022-jp-decoder.any.js rename to tests/wpt/tests/encoding/iso-2022-jp-decoder.any.js diff --git a/tests/wpt/web-platform-tests/encoding/iso-2022-jp-encoder.html b/tests/wpt/tests/encoding/iso-2022-jp-encoder.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/iso-2022-jp-encoder.html rename to tests/wpt/tests/encoding/iso-2022-jp-encoder.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode-cseucpkdfmtjapanese.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode-cseucpkdfmtjapanese.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode-cseucpkdfmtjapanese.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode-cseucpkdfmtjapanese.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode-errors.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode-errors.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode-errors.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode-errors.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode-x-euc-jp.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode-x-euc-jp.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode-x-euc-jp.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode-x-euc-jp.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decode.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decoder.js b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decoder.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decoder.js rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-decoder.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-cseucpkdfmtjapanese.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-cseucpkdfmtjapanese.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-cseucpkdfmtjapanese.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-cseucpkdfmtjapanese.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-cseucpkdfmtjapanese.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-cseucpkdfmtjapanese.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-cseucpkdfmtjapanese.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-cseucpkdfmtjapanese.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-x-euc-jp.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-x-euc-jp.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-x-euc-jp.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-x-euc-jp.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-x-euc-jp.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-x-euc-jp.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-x-euc-jp.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-x-euc-jp.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encoder.js b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encoder.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encoder.js rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encoder.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-cseucpkdfmtjapanese.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-cseucpkdfmtjapanese.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-cseucpkdfmtjapanese.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-cseucpkdfmtjapanese.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-cseucpkdfmtjapanese.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-cseucpkdfmtjapanese.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-cseucpkdfmtjapanese.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-cseucpkdfmtjapanese.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-x-euc-jp.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-x-euc-jp.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-x-euc-jp.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-x-euc-jp.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-x-euc-jp.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-x-euc-jp.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-x-euc-jp.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars-x-euc-jp.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_chars.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_errors.html b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_errors.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_errors.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_errors.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_errors.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_errors.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp_errors.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/eucjp_errors.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/jis0208_index.js b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/jis0208_index.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/jis0208_index.js rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/jis0208_index.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/jis0212_index.js b/tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/jis0212_index.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/jis0212_index.js rename to tests/wpt/tests/encoding/legacy-mb-japanese/euc-jp/jis0212_index.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decode-csiso2022jp.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decode-csiso2022jp.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decode-csiso2022jp.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decode-csiso2022jp.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decode-errors.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decode-errors.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decode-errors.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decode-errors.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decode.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decode.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decode.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decode.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decoder.js b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decoder.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decoder.js rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-decoder.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-csiso2022jp.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-csiso2022jp.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-csiso2022jp.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-csiso2022jp.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-csiso2022jp.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-csiso2022jp.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-csiso2022jp.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-csiso2022jp.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-stateful.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-stateful.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-stateful.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-stateful.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encoder.js b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encoder.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encoder.js rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encoder.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars-csiso2022jp.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars-csiso2022jp.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars-csiso2022jp.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars-csiso2022jp.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars-csiso2022jp.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars-csiso2022jp.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars-csiso2022jp.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars-csiso2022jp.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_chars.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_errors.html b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_errors.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_errors.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_errors.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_errors.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_errors.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_errors.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp_errors.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/jis0208_index.js b/tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/jis0208_index.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/jis0208_index.js rename to tests/wpt/tests/encoding/legacy-mb-japanese/iso-2022-jp/jis0208_index.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/jis0208_index.js b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/jis0208_index.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/jis0208_index.js rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/jis0208_index.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-csshiftjis.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-csshiftjis.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-csshiftjis.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-csshiftjis.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-errors.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-errors.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-errors.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-errors.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms932.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms932.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms932.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms932.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms_kanji.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms_kanji.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms_kanji.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms_kanji.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-shift-jis.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-shift-jis.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-shift-jis.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-shift-jis.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-sjis.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-sjis.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-sjis.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-sjis.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-windows-31j.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-windows-31j.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-windows-31j.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-windows-31j.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-x-sjis.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-x-sjis.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-x-sjis.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode-x-sjis.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decode.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decoder.js b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decoder.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-decoder.js rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-decoder.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-csshiftjis.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-csshiftjis.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-csshiftjis.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-csshiftjis.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-csshiftjis.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-csshiftjis.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-csshiftjis.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-csshiftjis.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms932.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms932.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms932.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms932.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms932.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms932.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms932.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms932.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms_kanji.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms_kanji.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms_kanji.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms_kanji.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms_kanji.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms_kanji.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms_kanji.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms_kanji.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-shift-jis.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-shift-jis.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-shift-jis.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-shift-jis.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-shift-jis.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-shift-jis.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-shift-jis.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-shift-jis.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-sjis.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-sjis.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-sjis.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-sjis.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-sjis.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-sjis.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-sjis.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-sjis.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-windows-31j.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-windows-31j.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-windows-31j.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-windows-31j.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-windows-31j.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-windows-31j.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-windows-31j.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-windows-31j.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-x-sjis.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-x-sjis.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-x-sjis.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-x-sjis.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-x-sjis.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-x-sjis.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-x-sjis.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-x-sjis.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encoder.js b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encoder.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encoder.js rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encoder.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-csshiftjis.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-csshiftjis.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-csshiftjis.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-csshiftjis.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-csshiftjis.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-csshiftjis.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-csshiftjis.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-csshiftjis.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms932.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms932.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms932.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms932.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms932.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms932.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms932.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms932.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms_kanji.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms_kanji.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms_kanji.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms_kanji.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms_kanji.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms_kanji.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms_kanji.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-ms_kanji.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-shift-jis.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-shift-jis.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-shift-jis.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-shift-jis.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-shift-jis.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-shift-jis.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-shift-jis.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-shift-jis.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-sjis.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-sjis.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-sjis.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-sjis.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-sjis.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-sjis.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-sjis.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-sjis.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-windows-31j.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-windows-31j.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-windows-31j.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-windows-31j.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-windows-31j.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-windows-31j.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-windows-31j.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-windows-31j.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-x-sjis.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-x-sjis.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-x-sjis.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-x-sjis.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-x-sjis.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-x-sjis.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-x-sjis.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars-x-sjis.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_chars.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_errors.html b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_errors.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_errors.html rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_errors.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_errors.html.headers b/tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_errors.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis_errors.html.headers rename to tests/wpt/tests/encoding/legacy-mb-japanese/shift_jis/sjis_errors.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-cseuckr.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-cseuckr.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-cseuckr.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-cseuckr.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-csksc56011987.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-csksc56011987.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-csksc56011987.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-csksc56011987.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-errors.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-errors.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-errors.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-errors.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-iso-ir-149.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-iso-ir-149.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-iso-ir-149.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-iso-ir-149.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-korean.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-korean.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-korean.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-korean.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ks_c_5601-1987.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ks_c_5601-1987.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ks_c_5601-1987.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ks_c_5601-1987.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ks_c_5601-1989.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ks_c_5601-1989.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ks_c_5601-1989.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ks_c_5601-1989.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ksc5601.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ksc5601.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ksc5601.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ksc5601.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ksc_5601.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ksc_5601.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ksc_5601.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-ksc_5601.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-windows-949.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-windows-949.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-windows-949.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode-windows-949.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decode.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decode.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decoder.js b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decoder.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-decoder.js rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-decoder.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-cseuckr.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-cseuckr.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-cseuckr.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-cseuckr.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-cseuckr.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-cseuckr.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-cseuckr.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-cseuckr.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-csksc56011987.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-csksc56011987.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-csksc56011987.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-csksc56011987.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-csksc56011987.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-csksc56011987.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-csksc56011987.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-csksc56011987.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-iso-ir-149.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-iso-ir-149.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-iso-ir-149.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-iso-ir-149.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-iso-ir-149.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-iso-ir-149.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-iso-ir-149.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-iso-ir-149.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-korean.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-korean.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-korean.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-korean.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-korean.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-korean.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-korean.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-korean.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1987.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1987.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1987.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1987.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1987.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1987.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1987.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1987.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1989.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1989.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1989.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1989.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1989.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1989.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1989.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ks_c_5601-1989.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc5601.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc5601.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc5601.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc5601.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc5601.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc5601.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc5601.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc5601.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-windows-949.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-windows-949.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-windows-949.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-windows-949.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-windows-949.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-windows-949.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-windows-949.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-windows-949.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encoder.js b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encoder.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encoder.js rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr-encoder.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-cseuckr.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-cseuckr.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-cseuckr.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-cseuckr.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-cseuckr.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-cseuckr.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-cseuckr.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-cseuckr.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-csksc56011987.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-csksc56011987.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-csksc56011987.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-csksc56011987.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-csksc56011987.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-csksc56011987.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-csksc56011987.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-csksc56011987.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-iso-ir-149.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-iso-ir-149.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-iso-ir-149.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-iso-ir-149.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-iso-ir-149.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-iso-ir-149.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-iso-ir-149.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-iso-ir-149.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-korean.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-korean.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-korean.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-korean.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-korean.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-korean.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-korean.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-korean.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1987.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1987.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1987.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1987.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1987.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1987.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1987.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1987.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1989.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1989.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1989.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1989.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1989.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1989.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1989.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ks_c_5601-1989.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc5601.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc5601.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc5601.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc5601.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc5601.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc5601.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc5601.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc5601.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc_5601.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc_5601.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc_5601.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc_5601.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc_5601.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc_5601.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc_5601.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-ksc_5601.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-windows-949.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-windows-949.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-windows-949.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-windows-949.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-windows-949.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-windows-949.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-windows-949.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars-windows-949.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_chars.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_chars.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_errors.html b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_errors.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_errors.html rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_errors.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_errors.html.headers b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_errors.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_errors.html.headers rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_errors.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_index.js b/tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_index.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr_index.js rename to tests/wpt/tests/encoding/legacy-mb-korean/euc-kr/euckr_index.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js b/tests/wpt/tests/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js rename to tests/wpt/tests/encoding/legacy-mb-schinese/gb18030/gb18030-decoder.any.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-schinese/gb18030/gb18030-encoder.html b/tests/wpt/tests/encoding/legacy-mb-schinese/gb18030/gb18030-encoder.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-schinese/gb18030/gb18030-encoder.html rename to tests/wpt/tests/encoding/legacy-mb-schinese/gb18030/gb18030-encoder.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-schinese/gb18030/resources/ranges.js b/tests/wpt/tests/encoding/legacy-mb-schinese/gb18030/resources/ranges.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-schinese/gb18030/resources/ranges.js rename to tests/wpt/tests/encoding/legacy-mb-schinese/gb18030/resources/ranges.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-schinese/gbk/gbk-decoder.any.js b/tests/wpt/tests/encoding/legacy-mb-schinese/gbk/gbk-decoder.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-schinese/gbk/gbk-decoder.any.js rename to tests/wpt/tests/encoding/legacy-mb-schinese/gbk/gbk-decoder.any.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-schinese/gbk/gbk-encoder.html b/tests/wpt/tests/encoding/legacy-mb-schinese/gbk/gbk-encoder.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-schinese/gbk/gbk-encoder.html rename to tests/wpt/tests/encoding/legacy-mb-schinese/gbk/gbk-encoder.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decode-big5-hkscs.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decode-big5-hkscs.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decode-big5-hkscs.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decode-big5-hkscs.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decode-cn-big5.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decode-cn-big5.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decode-cn-big5.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decode-cn-big5.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decode-csbig5.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decode-csbig5.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decode-csbig5.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decode-csbig5.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decode-errors.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decode-errors.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decode-errors.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decode-errors.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decode-extra.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decode-extra.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decode-extra.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decode-extra.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decode-x-x-big5.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decode-x-x-big5.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decode-x-x-big5.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decode-x-x-big5.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decode.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decode.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decode.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decode.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decoder.js b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decoder.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-decoder.js rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-decoder.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-enc-ascii.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-enc-ascii.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-enc-ascii.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-enc-ascii.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-enc-ascii.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-enc-ascii.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-enc-ascii.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-enc-ascii.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-big5-hkscs.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-big5-hkscs.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-big5-hkscs.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-big5-hkscs.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-big5-hkscs.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-big5-hkscs.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-big5-hkscs.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-big5-hkscs.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-cn-big5.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-cn-big5.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-cn-big5.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-cn-big5.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-cn-big5.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-cn-big5.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-cn-big5.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-cn-big5.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-csbig5.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-csbig5.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-csbig5.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-csbig5.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-csbig5.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-csbig5.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-csbig5.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-csbig5.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-pua.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-pua.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-pua.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-pua.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-x-x-big5.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-x-x-big5.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-x-x-big5.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-x-x-big5.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-x-x-big5.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-x-x-big5.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-x-x-big5.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-x-x-big5.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encoder.js b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encoder.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encoder.js rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5-encoder.js diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-big5-hkscs.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-big5-hkscs.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-big5-hkscs.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-big5-hkscs.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-big5-hkscs.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-big5-hkscs.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-big5-hkscs.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-big5-hkscs.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-cn-big5.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-cn-big5.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-cn-big5.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-cn-big5.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-cn-big5.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-cn-big5.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-cn-big5.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-cn-big5.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-csbig5.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-csbig5.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-csbig5.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-csbig5.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-csbig5.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-csbig5.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-csbig5.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-csbig5.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-x-x-big5.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-x-x-big5.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-x-x-big5.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-x-x-big5.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-x-x-big5.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-x-x-big5.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars-x-x-big5.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars-x-x-big5.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars_extra.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars_extra.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars_extra.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars_extra.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars_extra.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars_extra.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_chars_extra.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_chars_extra.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_errors.html b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_errors.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_errors.html rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_errors.html diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_errors.html.headers b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_errors.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_errors.html.headers rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_errors.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_index.js b/tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_index.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5_index.js rename to tests/wpt/tests/encoding/legacy-mb-tchinese/big5/big5_index.js diff --git a/tests/wpt/web-platform-tests/encoding/remove-only-one-bom.html b/tests/wpt/tests/encoding/remove-only-one-bom.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/remove-only-one-bom.html rename to tests/wpt/tests/encoding/remove-only-one-bom.html diff --git a/tests/wpt/web-platform-tests/encoding/replacement-encodings.any.js b/tests/wpt/tests/encoding/replacement-encodings.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/replacement-encodings.any.js rename to tests/wpt/tests/encoding/replacement-encodings.any.js diff --git a/tests/wpt/web-platform-tests/encoding/resources/decode-common.js b/tests/wpt/tests/encoding/resources/decode-common.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/decode-common.js rename to tests/wpt/tests/encoding/resources/decode-common.js diff --git a/tests/wpt/web-platform-tests/encoding/resources/decoding-helpers.js b/tests/wpt/tests/encoding/resources/decoding-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/decoding-helpers.js rename to tests/wpt/tests/encoding/resources/decoding-helpers.js diff --git a/tests/wpt/web-platform-tests/encoding/resources/encode-form-common.js b/tests/wpt/tests/encoding/resources/encode-form-common.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/encode-form-common.js rename to tests/wpt/tests/encoding/resources/encode-form-common.js diff --git a/tests/wpt/web-platform-tests/encoding/resources/encode-href-common.js b/tests/wpt/tests/encoding/resources/encode-href-common.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/encode-href-common.js rename to tests/wpt/tests/encoding/resources/encode-href-common.js diff --git a/tests/wpt/web-platform-tests/encoding/resources/encodings.js b/tests/wpt/tests/encoding/resources/encodings.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/encodings.js rename to tests/wpt/tests/encoding/resources/encodings.js diff --git a/tests/wpt/web-platform-tests/encoding/resources/ranges.js b/tests/wpt/tests/encoding/resources/ranges.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/ranges.js rename to tests/wpt/tests/encoding/resources/ranges.js diff --git a/tests/wpt/web-platform-tests/encoding/resources/single-byte-raw.py b/tests/wpt/tests/encoding/resources/single-byte-raw.py similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/single-byte-raw.py rename to tests/wpt/tests/encoding/resources/single-byte-raw.py diff --git a/tests/wpt/web-platform-tests/encoding/resources/text-html-meta-charset.py b/tests/wpt/tests/encoding/resources/text-html-meta-charset.py similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/text-html-meta-charset.py rename to tests/wpt/tests/encoding/resources/text-html-meta-charset.py diff --git a/tests/wpt/web-platform-tests/encoding/resources/text-plain-charset.py b/tests/wpt/tests/encoding/resources/text-plain-charset.py similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/text-plain-charset.py rename to tests/wpt/tests/encoding/resources/text-plain-charset.py diff --git a/tests/wpt/web-platform-tests/encoding/resources/two-boms-utf-16be.html b/tests/wpt/tests/encoding/resources/two-boms-utf-16be.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/two-boms-utf-16be.html rename to tests/wpt/tests/encoding/resources/two-boms-utf-16be.html diff --git a/tests/wpt/web-platform-tests/encoding/resources/two-boms-utf-16le.html b/tests/wpt/tests/encoding/resources/two-boms-utf-16le.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/two-boms-utf-16le.html rename to tests/wpt/tests/encoding/resources/two-boms-utf-16le.html diff --git a/tests/wpt/web-platform-tests/encoding/resources/two-boms-utf-8.html b/tests/wpt/tests/encoding/resources/two-boms-utf-8.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/two-boms-utf-8.html rename to tests/wpt/tests/encoding/resources/two-boms-utf-8.html diff --git a/tests/wpt/web-platform-tests/encoding/resources/utf-32-big-endian-bom.html b/tests/wpt/tests/encoding/resources/utf-32-big-endian-bom.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/utf-32-big-endian-bom.html rename to tests/wpt/tests/encoding/resources/utf-32-big-endian-bom.html diff --git a/tests/wpt/web-platform-tests/encoding/resources/utf-32-big-endian-bom.xml b/tests/wpt/tests/encoding/resources/utf-32-big-endian-bom.xml similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/utf-32-big-endian-bom.xml rename to tests/wpt/tests/encoding/resources/utf-32-big-endian-bom.xml diff --git a/tests/wpt/web-platform-tests/encoding/resources/utf-32-big-endian-nobom.html b/tests/wpt/tests/encoding/resources/utf-32-big-endian-nobom.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/utf-32-big-endian-nobom.html rename to tests/wpt/tests/encoding/resources/utf-32-big-endian-nobom.html diff --git a/tests/wpt/web-platform-tests/encoding/resources/utf-32-big-endian-nobom.xml b/tests/wpt/tests/encoding/resources/utf-32-big-endian-nobom.xml similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/utf-32-big-endian-nobom.xml rename to tests/wpt/tests/encoding/resources/utf-32-big-endian-nobom.xml diff --git a/tests/wpt/web-platform-tests/encoding/resources/utf-32-little-endian-bom.html b/tests/wpt/tests/encoding/resources/utf-32-little-endian-bom.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/utf-32-little-endian-bom.html rename to tests/wpt/tests/encoding/resources/utf-32-little-endian-bom.html diff --git a/tests/wpt/web-platform-tests/encoding/resources/utf-32-little-endian-bom.xml b/tests/wpt/tests/encoding/resources/utf-32-little-endian-bom.xml similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/utf-32-little-endian-bom.xml rename to tests/wpt/tests/encoding/resources/utf-32-little-endian-bom.xml diff --git a/tests/wpt/web-platform-tests/encoding/resources/utf-32-little-endian-nobom.html b/tests/wpt/tests/encoding/resources/utf-32-little-endian-nobom.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/utf-32-little-endian-nobom.html rename to tests/wpt/tests/encoding/resources/utf-32-little-endian-nobom.html diff --git a/tests/wpt/web-platform-tests/encoding/resources/utf-32-little-endian-nobom.xml b/tests/wpt/tests/encoding/resources/utf-32-little-endian-nobom.xml similarity index 100% rename from tests/wpt/web-platform-tests/encoding/resources/utf-32-little-endian-nobom.xml rename to tests/wpt/tests/encoding/resources/utf-32-little-endian-nobom.xml diff --git a/tests/wpt/web-platform-tests/encoding/sharedarraybuffer.https.html b/tests/wpt/tests/encoding/sharedarraybuffer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/sharedarraybuffer.https.html rename to tests/wpt/tests/encoding/sharedarraybuffer.https.html diff --git a/tests/wpt/web-platform-tests/encoding/sharedarraybuffer.https.html.headers b/tests/wpt/tests/encoding/sharedarraybuffer.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/sharedarraybuffer.https.html.headers rename to tests/wpt/tests/encoding/sharedarraybuffer.https.html.headers diff --git a/tests/wpt/web-platform-tests/encoding/single-byte-decoder.window.js b/tests/wpt/tests/encoding/single-byte-decoder.window.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/single-byte-decoder.window.js rename to tests/wpt/tests/encoding/single-byte-decoder.window.js diff --git a/tests/wpt/web-platform-tests/encoding/sniffing.html b/tests/wpt/tests/encoding/sniffing.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/sniffing.html rename to tests/wpt/tests/encoding/sniffing.html diff --git a/tests/wpt/web-platform-tests/encoding/streams/backpressure.any.js b/tests/wpt/tests/encoding/streams/backpressure.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/backpressure.any.js rename to tests/wpt/tests/encoding/streams/backpressure.any.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/decode-attributes.any.js b/tests/wpt/tests/encoding/streams/decode-attributes.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/decode-attributes.any.js rename to tests/wpt/tests/encoding/streams/decode-attributes.any.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/decode-bad-chunks.any.js b/tests/wpt/tests/encoding/streams/decode-bad-chunks.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/decode-bad-chunks.any.js rename to tests/wpt/tests/encoding/streams/decode-bad-chunks.any.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/decode-ignore-bom.any.js b/tests/wpt/tests/encoding/streams/decode-ignore-bom.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/decode-ignore-bom.any.js rename to tests/wpt/tests/encoding/streams/decode-ignore-bom.any.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/decode-incomplete-input.any.js b/tests/wpt/tests/encoding/streams/decode-incomplete-input.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/decode-incomplete-input.any.js rename to tests/wpt/tests/encoding/streams/decode-incomplete-input.any.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/decode-non-utf8.any.js b/tests/wpt/tests/encoding/streams/decode-non-utf8.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/decode-non-utf8.any.js rename to tests/wpt/tests/encoding/streams/decode-non-utf8.any.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/decode-split-character.any.js b/tests/wpt/tests/encoding/streams/decode-split-character.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/decode-split-character.any.js rename to tests/wpt/tests/encoding/streams/decode-split-character.any.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/decode-utf8.any.js b/tests/wpt/tests/encoding/streams/decode-utf8.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/decode-utf8.any.js rename to tests/wpt/tests/encoding/streams/decode-utf8.any.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/decode-utf8.any.js.headers b/tests/wpt/tests/encoding/streams/decode-utf8.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/decode-utf8.any.js.headers rename to tests/wpt/tests/encoding/streams/decode-utf8.any.js.headers diff --git a/tests/wpt/web-platform-tests/encoding/streams/encode-bad-chunks.any.js b/tests/wpt/tests/encoding/streams/encode-bad-chunks.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/encode-bad-chunks.any.js rename to tests/wpt/tests/encoding/streams/encode-bad-chunks.any.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/encode-utf8.any.js b/tests/wpt/tests/encoding/streams/encode-utf8.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/encode-utf8.any.js rename to tests/wpt/tests/encoding/streams/encode-utf8.any.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/invalid-realm.window.js b/tests/wpt/tests/encoding/streams/invalid-realm.window.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/invalid-realm.window.js rename to tests/wpt/tests/encoding/streams/invalid-realm.window.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/readable-writable-properties.any.js b/tests/wpt/tests/encoding/streams/readable-writable-properties.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/readable-writable-properties.any.js rename to tests/wpt/tests/encoding/streams/readable-writable-properties.any.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/realms.window.js b/tests/wpt/tests/encoding/streams/realms.window.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/realms.window.js rename to tests/wpt/tests/encoding/streams/realms.window.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/resources/readable-stream-from-array.js b/tests/wpt/tests/encoding/streams/resources/readable-stream-from-array.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/resources/readable-stream-from-array.js rename to tests/wpt/tests/encoding/streams/resources/readable-stream-from-array.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/resources/readable-stream-to-array.js b/tests/wpt/tests/encoding/streams/resources/readable-stream-to-array.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/resources/readable-stream-to-array.js rename to tests/wpt/tests/encoding/streams/resources/readable-stream-to-array.js diff --git a/tests/wpt/web-platform-tests/encoding/streams/stringification-crash.html b/tests/wpt/tests/encoding/streams/stringification-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/streams/stringification-crash.html rename to tests/wpt/tests/encoding/streams/stringification-crash.html diff --git a/tests/wpt/web-platform-tests/encoding/textdecoder-arguments.any.js b/tests/wpt/tests/encoding/textdecoder-arguments.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textdecoder-arguments.any.js rename to tests/wpt/tests/encoding/textdecoder-arguments.any.js diff --git a/tests/wpt/web-platform-tests/encoding/textdecoder-byte-order-marks.any.js b/tests/wpt/tests/encoding/textdecoder-byte-order-marks.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textdecoder-byte-order-marks.any.js rename to tests/wpt/tests/encoding/textdecoder-byte-order-marks.any.js diff --git a/tests/wpt/web-platform-tests/encoding/textdecoder-copy.any.js b/tests/wpt/tests/encoding/textdecoder-copy.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textdecoder-copy.any.js rename to tests/wpt/tests/encoding/textdecoder-copy.any.js diff --git a/tests/wpt/web-platform-tests/encoding/textdecoder-copy.any.js.headers b/tests/wpt/tests/encoding/textdecoder-copy.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textdecoder-copy.any.js.headers rename to tests/wpt/tests/encoding/textdecoder-copy.any.js.headers diff --git a/tests/wpt/web-platform-tests/encoding/textdecoder-eof.any.js b/tests/wpt/tests/encoding/textdecoder-eof.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textdecoder-eof.any.js rename to tests/wpt/tests/encoding/textdecoder-eof.any.js diff --git a/tests/wpt/web-platform-tests/encoding/textdecoder-fatal-single-byte.any.js b/tests/wpt/tests/encoding/textdecoder-fatal-single-byte.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textdecoder-fatal-single-byte.any.js rename to tests/wpt/tests/encoding/textdecoder-fatal-single-byte.any.js diff --git a/tests/wpt/web-platform-tests/encoding/textdecoder-fatal-streaming.any.js b/tests/wpt/tests/encoding/textdecoder-fatal-streaming.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textdecoder-fatal-streaming.any.js rename to tests/wpt/tests/encoding/textdecoder-fatal-streaming.any.js diff --git a/tests/wpt/web-platform-tests/encoding/textdecoder-fatal.any.js b/tests/wpt/tests/encoding/textdecoder-fatal.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textdecoder-fatal.any.js rename to tests/wpt/tests/encoding/textdecoder-fatal.any.js diff --git a/tests/wpt/web-platform-tests/encoding/textdecoder-ignorebom.any.js b/tests/wpt/tests/encoding/textdecoder-ignorebom.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textdecoder-ignorebom.any.js rename to tests/wpt/tests/encoding/textdecoder-ignorebom.any.js diff --git a/tests/wpt/web-platform-tests/encoding/textdecoder-labels.any.js b/tests/wpt/tests/encoding/textdecoder-labels.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textdecoder-labels.any.js rename to tests/wpt/tests/encoding/textdecoder-labels.any.js diff --git a/tests/wpt/web-platform-tests/encoding/textdecoder-streaming.any.js b/tests/wpt/tests/encoding/textdecoder-streaming.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textdecoder-streaming.any.js rename to tests/wpt/tests/encoding/textdecoder-streaming.any.js diff --git a/tests/wpt/web-platform-tests/encoding/textdecoder-streaming.any.js.headers b/tests/wpt/tests/encoding/textdecoder-streaming.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textdecoder-streaming.any.js.headers rename to tests/wpt/tests/encoding/textdecoder-streaming.any.js.headers diff --git a/tests/wpt/web-platform-tests/encoding/textdecoder-utf16-surrogates.any.js b/tests/wpt/tests/encoding/textdecoder-utf16-surrogates.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textdecoder-utf16-surrogates.any.js rename to tests/wpt/tests/encoding/textdecoder-utf16-surrogates.any.js diff --git a/tests/wpt/web-platform-tests/encoding/textencoder-constructor-non-utf.any.js b/tests/wpt/tests/encoding/textencoder-constructor-non-utf.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textencoder-constructor-non-utf.any.js rename to tests/wpt/tests/encoding/textencoder-constructor-non-utf.any.js diff --git a/tests/wpt/web-platform-tests/encoding/textencoder-utf16-surrogates.any.js b/tests/wpt/tests/encoding/textencoder-utf16-surrogates.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/textencoder-utf16-surrogates.any.js rename to tests/wpt/tests/encoding/textencoder-utf16-surrogates.any.js diff --git a/tests/wpt/web-platform-tests/encoding/unsupported-encodings.any.js b/tests/wpt/tests/encoding/unsupported-encodings.any.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/unsupported-encodings.any.js rename to tests/wpt/tests/encoding/unsupported-encodings.any.js diff --git a/tests/wpt/web-platform-tests/encoding/unsupported-labels.window.js b/tests/wpt/tests/encoding/unsupported-labels.window.js similarity index 100% rename from tests/wpt/web-platform-tests/encoding/unsupported-labels.window.js rename to tests/wpt/tests/encoding/unsupported-labels.window.js diff --git a/tests/wpt/web-platform-tests/encoding/utf-32-from-win1252.html b/tests/wpt/tests/encoding/utf-32-from-win1252.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/utf-32-from-win1252.html rename to tests/wpt/tests/encoding/utf-32-from-win1252.html diff --git a/tests/wpt/web-platform-tests/encoding/utf-32.html b/tests/wpt/tests/encoding/utf-32.html similarity index 100% rename from tests/wpt/web-platform-tests/encoding/utf-32.html rename to tests/wpt/tests/encoding/utf-32.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/META.yml b/tests/wpt/tests/encrypted-media/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/META.yml rename to tests/wpt/tests/encrypted-media/META.yml diff --git a/tests/wpt/web-platform-tests/encrypted-media/README.md b/tests/wpt/tests/encrypted-media/README.md similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/README.md rename to tests/wpt/tests/encrypted-media/README.md diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-check-encryption-scheme.https.html b/tests/wpt/tests/encrypted-media/clearkey-check-encryption-scheme.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-check-encryption-scheme.https.html rename to tests/wpt/tests/encrypted-media/clearkey-check-encryption-scheme.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-check-initdata-type.https.html b/tests/wpt/tests/encrypted-media/clearkey-check-initdata-type.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-check-initdata-type.https.html rename to tests/wpt/tests/encrypted-media/clearkey-check-initdata-type.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-check-status-for-hdcp.https.html b/tests/wpt/tests/encrypted-media/clearkey-check-status-for-hdcp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-check-status-for-hdcp.https.html rename to tests/wpt/tests/encrypted-media/clearkey-check-status-for-hdcp.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-events-session-closed-event.https.html b/tests/wpt/tests/encrypted-media/clearkey-events-session-closed-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-events-session-closed-event.https.html rename to tests/wpt/tests/encrypted-media/clearkey-events-session-closed-event.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-events.https.html b/tests/wpt/tests/encrypted-media/clearkey-events.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-events.https.html rename to tests/wpt/tests/encrypted-media/clearkey-events.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-generate-request-disallowed-input.https.html b/tests/wpt/tests/encrypted-media/clearkey-generate-request-disallowed-input.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-generate-request-disallowed-input.https.html rename to tests/wpt/tests/encrypted-media/clearkey-generate-request-disallowed-input.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-invalid-license.https.html b/tests/wpt/tests/encrypted-media/clearkey-invalid-license.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-invalid-license.https.html rename to tests/wpt/tests/encrypted-media/clearkey-invalid-license.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-keystatuses-multiple-sessions.https.html b/tests/wpt/tests/encrypted-media/clearkey-keystatuses-multiple-sessions.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-keystatuses-multiple-sessions.https.html rename to tests/wpt/tests/encrypted-media/clearkey-keystatuses-multiple-sessions.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-keystatuses.https.html b/tests/wpt/tests/encrypted-media/clearkey-keystatuses.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-keystatuses.https.html rename to tests/wpt/tests/encrypted-media/clearkey-keystatuses.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-destroy-persistent-license.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-destroy-persistent-license.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-destroy-persistent-license.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-destroy-persistent-license.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-persistent-license-events.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-license-events.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-persistent-license-events.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-license-events.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-persistent-license.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-license.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-persistent-license.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-license.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-persistent-usage-record-events.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-usage-record-events.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-persistent-usage-record-events.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-usage-record-events.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-persistent-usage-record.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-usage-record.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-persistent-usage-record.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-persistent-usage-record.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-retrieve-destroy-persistent-license.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-destroy-persistent-license.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-retrieve-destroy-persistent-license.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-destroy-persistent-license.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-usage-record.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-usage-record.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-usage-record.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-usage-record.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-clear-encrypted-segmented.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-clear-encrypted-segmented.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-clear-encrypted-segmented.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-clear-encrypted-segmented.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-clear-encrypted.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-clear-encrypted.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-clear-encrypted.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-clear-encrypted.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear-sources.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear-sources.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear-sources.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear-sources.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-events.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-events.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-events.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-events.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential-readyState.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential-readyState.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential-readyState.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential-readyState.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-multikey.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-multikey.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-multikey.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-multikey.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-multisession.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-multisession.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-multisession.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-multisession.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-src.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-src.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-src.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-src.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-update.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-update.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-update.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-update.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-immediately.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-immediately.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-immediately.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-immediately.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-onencrypted.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-onencrypted.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-onencrypted.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-onencrypted.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-two-videos.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-two-videos.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-two-videos.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-two-videos.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-waitingforkey.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-waitingforkey.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary-waitingforkey.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary-waitingforkey.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-playback-temporary.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-playback-temporary.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-requestmediakeysystemaccess.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-requestmediakeysystemaccess.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-requestmediakeysystemaccess.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-requestmediakeysystemaccess.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-reset-src-after-setmediakeys.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-reset-src-after-setmediakeys.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-reset-src-after-setmediakeys.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-reset-src-after-setmediakeys.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys-again-after-playback.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-setmediakeys-again-after-playback.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys-again-after-playback.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-setmediakeys-again-after-playback.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys-again-after-resetting-src.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-setmediakeys-again-after-resetting-src.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys-again-after-resetting-src.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-setmediakeys-again-after-resetting-src.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys-at-same-time.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-setmediakeys-at-same-time.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys-at-same-time.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-setmediakeys-at-same-time.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys-multiple-times-with-different-mediakeys.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-setmediakeys-multiple-times-with-different-mediakeys.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys-multiple-times-with-different-mediakeys.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-setmediakeys-multiple-times-with-different-mediakeys.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys-to-multiple-video-elements.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-setmediakeys-to-multiple-video-elements.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys-to-multiple-video-elements.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-setmediakeys-to-multiple-video-elements.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-setmediakeys.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-setmediakeys.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-setmediakeys.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-syntax-mediakeys.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-syntax-mediakeys.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-syntax-mediakeys.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-syntax-mediakeys.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-syntax-mediakeysession.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-syntax-mediakeysession.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-syntax-mediakeysession.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-syntax-mediakeysession.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-syntax-mediakeysystemaccess.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-syntax-mediakeysystemaccess.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-syntax-mediakeysystemaccess.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-syntax-mediakeysystemaccess.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-unique-origin.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-unique-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-unique-origin.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-unique-origin.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-update-disallowed-input.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-update-disallowed-input.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-update-disallowed-input.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-update-disallowed-input.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-waiting-for-a-key.https.html b/tests/wpt/tests/encrypted-media/clearkey-mp4-waiting-for-a-key.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-mp4-waiting-for-a-key.https.html rename to tests/wpt/tests/encrypted-media/clearkey-mp4-waiting-for-a-key.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-not-callable-after-createsession.https.html b/tests/wpt/tests/encrypted-media/clearkey-not-callable-after-createsession.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-not-callable-after-createsession.https.html rename to tests/wpt/tests/encrypted-media/clearkey-not-callable-after-createsession.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/clearkey-update-non-ascii-input.https.html b/tests/wpt/tests/encrypted-media/clearkey-update-non-ascii-input.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/clearkey-update-non-ascii-input.https.html rename to tests/wpt/tests/encrypted-media/clearkey-update-non-ascii-input.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/content/audio_aac-lc_128k_2keys_2sess.mp4 b/tests/wpt/tests/encrypted-media/content/audio_aac-lc_128k_2keys_2sess.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/content/audio_aac-lc_128k_2keys_2sess.mp4 rename to tests/wpt/tests/encrypted-media/content/audio_aac-lc_128k_2keys_2sess.mp4 diff --git a/tests/wpt/web-platform-tests/encrypted-media/content/audio_aac-lc_128k_dashinit.mp4 b/tests/wpt/tests/encrypted-media/content/audio_aac-lc_128k_dashinit.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/content/audio_aac-lc_128k_dashinit.mp4 rename to tests/wpt/tests/encrypted-media/content/audio_aac-lc_128k_dashinit.mp4 diff --git a/tests/wpt/web-platform-tests/encrypted-media/content/audio_aac-lc_128k_enc_dashinit.mp4 b/tests/wpt/tests/encrypted-media/content/audio_aac-lc_128k_enc_dashinit.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/content/audio_aac-lc_128k_enc_dashinit.mp4 rename to tests/wpt/tests/encrypted-media/content/audio_aac-lc_128k_enc_dashinit.mp4 diff --git a/tests/wpt/web-platform-tests/encrypted-media/content/content-metadata.js b/tests/wpt/tests/encrypted-media/content/content-metadata.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/content/content-metadata.js rename to tests/wpt/tests/encrypted-media/content/content-metadata.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/content/video_512x288_h264-360k_clear_dashinit.mp4 b/tests/wpt/tests/encrypted-media/content/video_512x288_h264-360k_clear_dashinit.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/content/video_512x288_h264-360k_clear_dashinit.mp4 rename to tests/wpt/tests/encrypted-media/content/video_512x288_h264-360k_clear_dashinit.mp4 diff --git a/tests/wpt/web-platform-tests/encrypted-media/content/video_512x288_h264-360k_clear_enc_dashinit.mp4 b/tests/wpt/tests/encrypted-media/content/video_512x288_h264-360k_clear_enc_dashinit.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/content/video_512x288_h264-360k_clear_enc_dashinit.mp4 rename to tests/wpt/tests/encrypted-media/content/video_512x288_h264-360k_clear_enc_dashinit.mp4 diff --git a/tests/wpt/web-platform-tests/encrypted-media/content/video_512x288_h264-360k_dashinit.mp4 b/tests/wpt/tests/encrypted-media/content/video_512x288_h264-360k_dashinit.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/content/video_512x288_h264-360k_dashinit.mp4 rename to tests/wpt/tests/encrypted-media/content/video_512x288_h264-360k_dashinit.mp4 diff --git a/tests/wpt/web-platform-tests/encrypted-media/content/video_512x288_h264-360k_enc_2keys_2sess.mp4 b/tests/wpt/tests/encrypted-media/content/video_512x288_h264-360k_enc_2keys_2sess.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/content/video_512x288_h264-360k_enc_2keys_2sess.mp4 rename to tests/wpt/tests/encrypted-media/content/video_512x288_h264-360k_enc_2keys_2sess.mp4 diff --git a/tests/wpt/web-platform-tests/encrypted-media/content/video_512x288_h264-360k_enc_clear_dashinit.mp4 b/tests/wpt/tests/encrypted-media/content/video_512x288_h264-360k_enc_clear_dashinit.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/content/video_512x288_h264-360k_enc_clear_dashinit.mp4 rename to tests/wpt/tests/encrypted-media/content/video_512x288_h264-360k_enc_clear_dashinit.mp4 diff --git a/tests/wpt/web-platform-tests/encrypted-media/content/video_512x288_h264-360k_enc_dashinit.mp4 b/tests/wpt/tests/encrypted-media/content/video_512x288_h264-360k_enc_dashinit.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/content/video_512x288_h264-360k_enc_dashinit.mp4 rename to tests/wpt/tests/encrypted-media/content/video_512x288_h264-360k_enc_dashinit.mp4 diff --git a/tests/wpt/web-platform-tests/encrypted-media/content/video_512x288_h264-360k_multikey_dashinit.mp4 b/tests/wpt/tests/encrypted-media/content/video_512x288_h264-360k_multikey_dashinit.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/content/video_512x288_h264-360k_multikey_dashinit.mp4 rename to tests/wpt/tests/encrypted-media/content/video_512x288_h264-360k_multikey_dashinit.mp4 diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-check-encryption-scheme.https.html b/tests/wpt/tests/encrypted-media/drm-check-encryption-scheme.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-check-encryption-scheme.https.html rename to tests/wpt/tests/encrypted-media/drm-check-encryption-scheme.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-check-initdata-type.https.html b/tests/wpt/tests/encrypted-media/drm-check-initdata-type.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-check-initdata-type.https.html rename to tests/wpt/tests/encrypted-media/drm-check-initdata-type.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-check-status-for-hdcp.https.html b/tests/wpt/tests/encrypted-media/drm-check-status-for-hdcp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-check-status-for-hdcp.https.html rename to tests/wpt/tests/encrypted-media/drm-check-status-for-hdcp.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-events-session-closed-event.https.html b/tests/wpt/tests/encrypted-media/drm-events-session-closed-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-events-session-closed-event.https.html rename to tests/wpt/tests/encrypted-media/drm-events-session-closed-event.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-events.https.html b/tests/wpt/tests/encrypted-media/drm-events.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-events.https.html rename to tests/wpt/tests/encrypted-media/drm-events.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-expiration.https.html b/tests/wpt/tests/encrypted-media/drm-expiration.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-expiration.https.html rename to tests/wpt/tests/encrypted-media/drm-expiration.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-generate-request-disallowed-input.https.html b/tests/wpt/tests/encrypted-media/drm-generate-request-disallowed-input.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-generate-request-disallowed-input.https.html rename to tests/wpt/tests/encrypted-media/drm-generate-request-disallowed-input.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-invalid-license.https.html b/tests/wpt/tests/encrypted-media/drm-invalid-license.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-invalid-license.https.html rename to tests/wpt/tests/encrypted-media/drm-invalid-license.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-keystatuses-multiple-sessions.https.html b/tests/wpt/tests/encrypted-media/drm-keystatuses-multiple-sessions.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-keystatuses-multiple-sessions.https.html rename to tests/wpt/tests/encrypted-media/drm-keystatuses-multiple-sessions.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-keystatuses.https.html b/tests/wpt/tests/encrypted-media/drm-keystatuses.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-keystatuses.https.html rename to tests/wpt/tests/encrypted-media/drm-keystatuses.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-onencrypted.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-onencrypted.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-onencrypted.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-onencrypted.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-destroy-persistent-license.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-destroy-persistent-license.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-destroy-persistent-license.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-destroy-persistent-license.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-persistent-license-events.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-persistent-license-events.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-persistent-license-events.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-persistent-license-events.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-persistent-license.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-persistent-license.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-persistent-license.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-persistent-license.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-persistent-usage-record-events.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-persistent-usage-record-events.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-persistent-usage-record-events.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-persistent-usage-record-events.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-persistent-usage-record.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-persistent-usage-record.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-persistent-usage-record.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-persistent-usage-record.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-retrieve-destroy-persistent-license.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-retrieve-destroy-persistent-license.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-retrieve-destroy-persistent-license.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-retrieve-destroy-persistent-license.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-retrieve-persistent-license.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-retrieve-persistent-license.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-retrieve-persistent-license.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-retrieve-persistent-license.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-retrieve-persistent-usage-record.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-retrieve-persistent-usage-record.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-retrieve-persistent-usage-record.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-retrieve-persistent-usage-record.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-clear-encrypted.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-clear-encrypted.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-clear-encrypted.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-clear-encrypted.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-encrypted-clear-sources.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-encrypted-clear-sources.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-encrypted-clear-sources.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-encrypted-clear-sources.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-encrypted-clear.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-encrypted-clear.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-encrypted-clear.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-encrypted-clear.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-events.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-events.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-events.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-events.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-expired.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-expired.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-expired.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-expired.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-multikey-sequential-readyState.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-multikey-sequential-readyState.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-multikey-sequential-readyState.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-multikey-sequential-readyState.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-multikey-sequential.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-multikey-sequential.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-multikey-sequential.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-multikey-sequential.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-multikey.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-multikey.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-multikey.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-multikey.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-multisession.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-multisession.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-multisession.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-multisession.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-playduration-keystatus.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-playduration-keystatus.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-playduration-keystatus.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-playduration-keystatus.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-playduration.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-playduration.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-playduration.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-playduration.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-src.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-src.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-src.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-src.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-update.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-update.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-update.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-update.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-immediately.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-immediately.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-immediately.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-immediately.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-onencrypted.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-onencrypted.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-onencrypted.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-onencrypted.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-two-videos.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-two-videos.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-two-videos.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-two-videos.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-waitingforkey.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-waitingforkey.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary-waitingforkey.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary-waitingforkey.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-playback-temporary.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-playback-temporary.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-requestmediakeysystemaccess.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-requestmediakeysystemaccess.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-requestmediakeysystemaccess.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-requestmediakeysystemaccess.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-reset-src-after-setmediakeys.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-reset-src-after-setmediakeys.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-reset-src-after-setmediakeys.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-reset-src-after-setmediakeys.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-setmediakeys-again-after-playback.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-setmediakeys-again-after-playback.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-setmediakeys-again-after-playback.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-setmediakeys-again-after-playback.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-setmediakeys-again-after-resetting-src.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-setmediakeys-again-after-resetting-src.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-setmediakeys-again-after-resetting-src.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-setmediakeys-again-after-resetting-src.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-setmediakeys-at-same-time.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-setmediakeys-at-same-time.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-setmediakeys-at-same-time.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-setmediakeys-at-same-time.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-setmediakeys-multiple-times-with-different-mediakeys.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-setmediakeys-multiple-times-with-different-mediakeys.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-setmediakeys-multiple-times-with-different-mediakeys.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-setmediakeys-multiple-times-with-different-mediakeys.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-setmediakeys-to-multiple-video-elements.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-setmediakeys-to-multiple-video-elements.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-setmediakeys-to-multiple-video-elements.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-setmediakeys-to-multiple-video-elements.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-setmediakeys.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-setmediakeys.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-setmediakeys.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-setmediakeys.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-syntax-mediakeys.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-syntax-mediakeys.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-syntax-mediakeys.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-syntax-mediakeys.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-syntax-mediakeysession.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-syntax-mediakeysession.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-syntax-mediakeysession.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-syntax-mediakeysession.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-syntax-mediakeysystemaccess.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-syntax-mediakeysystemaccess.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-syntax-mediakeysystemaccess.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-syntax-mediakeysystemaccess.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-unique-origin.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-unique-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-unique-origin.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-unique-origin.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-mp4-waiting-for-a-key.https.html b/tests/wpt/tests/encrypted-media/drm-mp4-waiting-for-a-key.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-mp4-waiting-for-a-key.https.html rename to tests/wpt/tests/encrypted-media/drm-mp4-waiting-for-a-key.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-not-callable-after-createsession.https.html b/tests/wpt/tests/encrypted-media/drm-not-callable-after-createsession.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-not-callable-after-createsession.https.html rename to tests/wpt/tests/encrypted-media/drm-not-callable-after-createsession.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/drm-temporary-license-type.https.html b/tests/wpt/tests/encrypted-media/drm-temporary-license-type.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/drm-temporary-license-type.https.html rename to tests/wpt/tests/encrypted-media/drm-temporary-license-type.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/encrypted-media-default-feature-policy.https.sub.html b/tests/wpt/tests/encrypted-media/encrypted-media-default-feature-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/encrypted-media-default-feature-policy.https.sub.html rename to tests/wpt/tests/encrypted-media/encrypted-media-default-feature-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/encrypted-media-supported-by-feature-policy.tentative.html b/tests/wpt/tests/encrypted-media/encrypted-media-supported-by-feature-policy.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/encrypted-media-supported-by-feature-policy.tentative.html rename to tests/wpt/tests/encrypted-media/encrypted-media-supported-by-feature-policy.tentative.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/idlharness.https.html b/tests/wpt/tests/encrypted-media/idlharness.https.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/idlharness.https.html rename to tests/wpt/tests/encrypted-media/idlharness.https.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/polyfill/cast-polyfill.js b/tests/wpt/tests/encrypted-media/polyfill/cast-polyfill.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/polyfill/cast-polyfill.js rename to tests/wpt/tests/encrypted-media/polyfill/cast-polyfill.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/polyfill/chrome-polyfill.js b/tests/wpt/tests/encrypted-media/polyfill/chrome-polyfill.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/polyfill/chrome-polyfill.js rename to tests/wpt/tests/encrypted-media/polyfill/chrome-polyfill.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/polyfill/clearkey-polyfill.js b/tests/wpt/tests/encrypted-media/polyfill/clearkey-polyfill.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/polyfill/clearkey-polyfill.js rename to tests/wpt/tests/encrypted-media/polyfill/clearkey-polyfill.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/polyfill/edge-keystatuses.js b/tests/wpt/tests/encrypted-media/polyfill/edge-keystatuses.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/polyfill/edge-keystatuses.js rename to tests/wpt/tests/encrypted-media/polyfill/edge-keystatuses.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/polyfill/edge-persistent-usage-record.js b/tests/wpt/tests/encrypted-media/polyfill/edge-persistent-usage-record.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/polyfill/edge-persistent-usage-record.js rename to tests/wpt/tests/encrypted-media/polyfill/edge-persistent-usage-record.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/polyfill/firefox-polyfill.js b/tests/wpt/tests/encrypted-media/polyfill/firefox-polyfill.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/polyfill/firefox-polyfill.js rename to tests/wpt/tests/encrypted-media/polyfill/firefox-polyfill.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/polyfill/make-polyfill-tests.py b/tests/wpt/tests/encrypted-media/polyfill/make-polyfill-tests.py similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/polyfill/make-polyfill-tests.py rename to tests/wpt/tests/encrypted-media/polyfill/make-polyfill-tests.py diff --git a/tests/wpt/web-platform-tests/encrypted-media/resources/clearkey-retrieve-destroy-persistent-license.html b/tests/wpt/tests/encrypted-media/resources/clearkey-retrieve-destroy-persistent-license.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/resources/clearkey-retrieve-destroy-persistent-license.html rename to tests/wpt/tests/encrypted-media/resources/clearkey-retrieve-destroy-persistent-license.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/resources/clearkey-retrieve-persistent-license.html b/tests/wpt/tests/encrypted-media/resources/clearkey-retrieve-persistent-license.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/resources/clearkey-retrieve-persistent-license.html rename to tests/wpt/tests/encrypted-media/resources/clearkey-retrieve-persistent-license.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/resources/drm-retrieve-destroy-persistent-license.html b/tests/wpt/tests/encrypted-media/resources/drm-retrieve-destroy-persistent-license.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/resources/drm-retrieve-destroy-persistent-license.html rename to tests/wpt/tests/encrypted-media/resources/drm-retrieve-destroy-persistent-license.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/resources/drm-retrieve-persistent-license.html b/tests/wpt/tests/encrypted-media/resources/drm-retrieve-persistent-license.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/resources/drm-retrieve-persistent-license.html rename to tests/wpt/tests/encrypted-media/resources/drm-retrieve-persistent-license.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/resources/drm-retrieve-persistent-usage-record.html b/tests/wpt/tests/encrypted-media/resources/drm-retrieve-persistent-usage-record.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/resources/drm-retrieve-persistent-usage-record.html rename to tests/wpt/tests/encrypted-media/resources/drm-retrieve-persistent-usage-record.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/resources/retrieve-persistent-usage-record.html b/tests/wpt/tests/encrypted-media/resources/retrieve-persistent-usage-record.html similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/resources/retrieve-persistent-usage-record.html rename to tests/wpt/tests/encrypted-media/resources/retrieve-persistent-usage-record.html diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/check-encryption-scheme.js b/tests/wpt/tests/encrypted-media/scripts/check-encryption-scheme.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/check-encryption-scheme.js rename to tests/wpt/tests/encrypted-media/scripts/check-encryption-scheme.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/check-initdata-type.js b/tests/wpt/tests/encrypted-media/scripts/check-initdata-type.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/check-initdata-type.js rename to tests/wpt/tests/encrypted-media/scripts/check-initdata-type.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/check-status-for-hdcp.js b/tests/wpt/tests/encrypted-media/scripts/check-status-for-hdcp.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/check-status-for-hdcp.js rename to tests/wpt/tests/encrypted-media/scripts/check-status-for-hdcp.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/clearkey-update-non-ascii-input.js b/tests/wpt/tests/encrypted-media/scripts/clearkey-update-non-ascii-input.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/clearkey-update-non-ascii-input.js rename to tests/wpt/tests/encrypted-media/scripts/clearkey-update-non-ascii-input.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/events-session-closed-event.js b/tests/wpt/tests/encrypted-media/scripts/events-session-closed-event.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/events-session-closed-event.js rename to tests/wpt/tests/encrypted-media/scripts/events-session-closed-event.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/events.js b/tests/wpt/tests/encrypted-media/scripts/events.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/events.js rename to tests/wpt/tests/encrypted-media/scripts/events.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/expiration.js b/tests/wpt/tests/encrypted-media/scripts/expiration.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/expiration.js rename to tests/wpt/tests/encrypted-media/scripts/expiration.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/generate-request-disallowed-input.js b/tests/wpt/tests/encrypted-media/scripts/generate-request-disallowed-input.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/generate-request-disallowed-input.js rename to tests/wpt/tests/encrypted-media/scripts/generate-request-disallowed-input.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/invalid-license.js b/tests/wpt/tests/encrypted-media/scripts/invalid-license.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/invalid-license.js rename to tests/wpt/tests/encrypted-media/scripts/invalid-license.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/keystatuses-multiple-sessions.js b/tests/wpt/tests/encrypted-media/scripts/keystatuses-multiple-sessions.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/keystatuses-multiple-sessions.js rename to tests/wpt/tests/encrypted-media/scripts/keystatuses-multiple-sessions.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/keystatuses.js b/tests/wpt/tests/encrypted-media/scripts/keystatuses.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/keystatuses.js rename to tests/wpt/tests/encrypted-media/scripts/keystatuses.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/not-callable-after-createsession.js b/tests/wpt/tests/encrypted-media/scripts/not-callable-after-createsession.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/not-callable-after-createsession.js rename to tests/wpt/tests/encrypted-media/scripts/not-callable-after-createsession.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/onencrypted.js b/tests/wpt/tests/encrypted-media/scripts/onencrypted.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/onencrypted.js rename to tests/wpt/tests/encrypted-media/scripts/onencrypted.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-destroy-persistent-license.js b/tests/wpt/tests/encrypted-media/scripts/playback-destroy-persistent-license.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-destroy-persistent-license.js rename to tests/wpt/tests/encrypted-media/scripts/playback-destroy-persistent-license.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-persistent-license-events.js b/tests/wpt/tests/encrypted-media/scripts/playback-persistent-license-events.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-persistent-license-events.js rename to tests/wpt/tests/encrypted-media/scripts/playback-persistent-license-events.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-persistent-license.js b/tests/wpt/tests/encrypted-media/scripts/playback-persistent-license.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-persistent-license.js rename to tests/wpt/tests/encrypted-media/scripts/playback-persistent-license.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-persistent-usage-record-events.js b/tests/wpt/tests/encrypted-media/scripts/playback-persistent-usage-record-events.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-persistent-usage-record-events.js rename to tests/wpt/tests/encrypted-media/scripts/playback-persistent-usage-record-events.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-persistent-usage-record.js b/tests/wpt/tests/encrypted-media/scripts/playback-persistent-usage-record.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-persistent-usage-record.js rename to tests/wpt/tests/encrypted-media/scripts/playback-persistent-usage-record.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-retrieve-persistent-license.js b/tests/wpt/tests/encrypted-media/scripts/playback-retrieve-persistent-license.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-retrieve-persistent-license.js rename to tests/wpt/tests/encrypted-media/scripts/playback-retrieve-persistent-license.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-retrieve-persistent-usage-record.js b/tests/wpt/tests/encrypted-media/scripts/playback-retrieve-persistent-usage-record.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-retrieve-persistent-usage-record.js rename to tests/wpt/tests/encrypted-media/scripts/playback-retrieve-persistent-usage-record.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-encrypted-clear-segmented-sources.js b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-encrypted-clear-segmented-sources.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-encrypted-clear-segmented-sources.js rename to tests/wpt/tests/encrypted-media/scripts/playback-temporary-encrypted-clear-segmented-sources.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-encrypted-clear-sources.js b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-encrypted-clear-sources.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-encrypted-clear-sources.js rename to tests/wpt/tests/encrypted-media/scripts/playback-temporary-encrypted-clear-sources.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-events.js b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-events.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-events.js rename to tests/wpt/tests/encrypted-media/scripts/playback-temporary-events.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-expired.js b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-expired.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-expired.js rename to tests/wpt/tests/encrypted-media/scripts/playback-temporary-expired.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-multikey-sequential.js b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-multikey-sequential.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-multikey-sequential.js rename to tests/wpt/tests/encrypted-media/scripts/playback-temporary-multikey-sequential.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-multisession.js b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-multisession.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-multisession.js rename to tests/wpt/tests/encrypted-media/scripts/playback-temporary-multisession.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-playduration-keystatus.js b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-playduration-keystatus.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-playduration-keystatus.js rename to tests/wpt/tests/encrypted-media/scripts/playback-temporary-playduration-keystatus.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-playduration.js b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-playduration.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-playduration.js rename to tests/wpt/tests/encrypted-media/scripts/playback-temporary-playduration.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-setMediaKeys.js b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-setMediaKeys.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-setMediaKeys.js rename to tests/wpt/tests/encrypted-media/scripts/playback-temporary-setMediaKeys.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-two-videos.js b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-two-videos.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-two-videos.js rename to tests/wpt/tests/encrypted-media/scripts/playback-temporary-two-videos.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-waitingforkey.js b/tests/wpt/tests/encrypted-media/scripts/playback-temporary-waitingforkey.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary-waitingforkey.js rename to tests/wpt/tests/encrypted-media/scripts/playback-temporary-waitingforkey.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary.js b/tests/wpt/tests/encrypted-media/scripts/playback-temporary.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/playback-temporary.js rename to tests/wpt/tests/encrypted-media/scripts/playback-temporary.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/requestmediakeysystemaccess.js b/tests/wpt/tests/encrypted-media/scripts/requestmediakeysystemaccess.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/requestmediakeysystemaccess.js rename to tests/wpt/tests/encrypted-media/scripts/requestmediakeysystemaccess.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/reset-src-after-setmediakeys.js b/tests/wpt/tests/encrypted-media/scripts/reset-src-after-setmediakeys.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/reset-src-after-setmediakeys.js rename to tests/wpt/tests/encrypted-media/scripts/reset-src-after-setmediakeys.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/setmediakeys-again-after-playback.js b/tests/wpt/tests/encrypted-media/scripts/setmediakeys-again-after-playback.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/setmediakeys-again-after-playback.js rename to tests/wpt/tests/encrypted-media/scripts/setmediakeys-again-after-playback.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/setmediakeys-again-after-resetting-src.js b/tests/wpt/tests/encrypted-media/scripts/setmediakeys-again-after-resetting-src.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/setmediakeys-again-after-resetting-src.js rename to tests/wpt/tests/encrypted-media/scripts/setmediakeys-again-after-resetting-src.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/setmediakeys-at-same-time.js b/tests/wpt/tests/encrypted-media/scripts/setmediakeys-at-same-time.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/setmediakeys-at-same-time.js rename to tests/wpt/tests/encrypted-media/scripts/setmediakeys-at-same-time.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/setmediakeys-multiple-times-with-different-mediakeys.js b/tests/wpt/tests/encrypted-media/scripts/setmediakeys-multiple-times-with-different-mediakeys.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/setmediakeys-multiple-times-with-different-mediakeys.js rename to tests/wpt/tests/encrypted-media/scripts/setmediakeys-multiple-times-with-different-mediakeys.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/setmediakeys-multiple-times-with-the-same-mediakeys.js b/tests/wpt/tests/encrypted-media/scripts/setmediakeys-multiple-times-with-the-same-mediakeys.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/setmediakeys-multiple-times-with-the-same-mediakeys.js rename to tests/wpt/tests/encrypted-media/scripts/setmediakeys-multiple-times-with-the-same-mediakeys.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/setmediakeys-to-multiple-video-elements.js b/tests/wpt/tests/encrypted-media/scripts/setmediakeys-to-multiple-video-elements.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/setmediakeys-to-multiple-video-elements.js rename to tests/wpt/tests/encrypted-media/scripts/setmediakeys-to-multiple-video-elements.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/setmediakeys.js b/tests/wpt/tests/encrypted-media/scripts/setmediakeys.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/setmediakeys.js rename to tests/wpt/tests/encrypted-media/scripts/setmediakeys.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/syntax-mediakeys.js b/tests/wpt/tests/encrypted-media/scripts/syntax-mediakeys.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/syntax-mediakeys.js rename to tests/wpt/tests/encrypted-media/scripts/syntax-mediakeys.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/syntax-mediakeysession.js b/tests/wpt/tests/encrypted-media/scripts/syntax-mediakeysession.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/syntax-mediakeysession.js rename to tests/wpt/tests/encrypted-media/scripts/syntax-mediakeysession.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/syntax-mediakeysystemaccess.js b/tests/wpt/tests/encrypted-media/scripts/syntax-mediakeysystemaccess.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/syntax-mediakeysystemaccess.js rename to tests/wpt/tests/encrypted-media/scripts/syntax-mediakeysystemaccess.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/temporary-license-type.js b/tests/wpt/tests/encrypted-media/scripts/temporary-license-type.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/temporary-license-type.js rename to tests/wpt/tests/encrypted-media/scripts/temporary-license-type.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/unique-origin.js b/tests/wpt/tests/encrypted-media/scripts/unique-origin.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/unique-origin.js rename to tests/wpt/tests/encrypted-media/scripts/unique-origin.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/update-disallowed-input.js b/tests/wpt/tests/encrypted-media/scripts/update-disallowed-input.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/update-disallowed-input.js rename to tests/wpt/tests/encrypted-media/scripts/update-disallowed-input.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/scripts/waiting-for-a-key.js b/tests/wpt/tests/encrypted-media/scripts/waiting-for-a-key.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/scripts/waiting-for-a-key.js rename to tests/wpt/tests/encrypted-media/scripts/waiting-for-a-key.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/util/clearkey-messagehandler.js b/tests/wpt/tests/encrypted-media/util/clearkey-messagehandler.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/util/clearkey-messagehandler.js rename to tests/wpt/tests/encrypted-media/util/clearkey-messagehandler.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/util/drm-messagehandler.js b/tests/wpt/tests/encrypted-media/util/drm-messagehandler.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/util/drm-messagehandler.js rename to tests/wpt/tests/encrypted-media/util/drm-messagehandler.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/util/testmediasource.js b/tests/wpt/tests/encrypted-media/util/testmediasource.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/util/testmediasource.js rename to tests/wpt/tests/encrypted-media/util/testmediasource.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/util/utf8.js b/tests/wpt/tests/encrypted-media/util/utf8.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/util/utf8.js rename to tests/wpt/tests/encrypted-media/util/utf8.js diff --git a/tests/wpt/web-platform-tests/encrypted-media/util/utils.js b/tests/wpt/tests/encrypted-media/util/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/encrypted-media/util/utils.js rename to tests/wpt/tests/encrypted-media/util/utils.js diff --git a/tests/wpt/web-platform-tests/entries-api/META.yml b/tests/wpt/tests/entries-api/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/META.yml rename to tests/wpt/tests/entries-api/META.yml diff --git a/tests/wpt/web-platform-tests/entries-api/README.md b/tests/wpt/tests/entries-api/README.md similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/README.md rename to tests/wpt/tests/entries-api/README.md diff --git a/tests/wpt/web-platform-tests/entries-api/errors-manual.html b/tests/wpt/tests/entries-api/errors-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/errors-manual.html rename to tests/wpt/tests/entries-api/errors-manual.html diff --git a/tests/wpt/web-platform-tests/entries-api/file-webkitRelativePath-manual.html b/tests/wpt/tests/entries-api/file-webkitRelativePath-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/file-webkitRelativePath-manual.html rename to tests/wpt/tests/entries-api/file-webkitRelativePath-manual.html diff --git a/tests/wpt/web-platform-tests/entries-api/filesystem-manual.html b/tests/wpt/tests/entries-api/filesystem-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/filesystem-manual.html rename to tests/wpt/tests/entries-api/filesystem-manual.html diff --git a/tests/wpt/web-platform-tests/entries-api/filesystemdirectoryentry-attributes-manual.html b/tests/wpt/tests/entries-api/filesystemdirectoryentry-attributes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/filesystemdirectoryentry-attributes-manual.html rename to tests/wpt/tests/entries-api/filesystemdirectoryentry-attributes-manual.html diff --git a/tests/wpt/web-platform-tests/entries-api/filesystemdirectoryentry-createReader-manual.html b/tests/wpt/tests/entries-api/filesystemdirectoryentry-createReader-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/filesystemdirectoryentry-createReader-manual.html rename to tests/wpt/tests/entries-api/filesystemdirectoryentry-createReader-manual.html diff --git a/tests/wpt/web-platform-tests/entries-api/filesystemdirectoryentry-getDirectory-manual.html b/tests/wpt/tests/entries-api/filesystemdirectoryentry-getDirectory-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/filesystemdirectoryentry-getDirectory-manual.html rename to tests/wpt/tests/entries-api/filesystemdirectoryentry-getDirectory-manual.html diff --git a/tests/wpt/web-platform-tests/entries-api/filesystemdirectoryentry-getFile-manual.html b/tests/wpt/tests/entries-api/filesystemdirectoryentry-getFile-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/filesystemdirectoryentry-getFile-manual.html rename to tests/wpt/tests/entries-api/filesystemdirectoryentry-getFile-manual.html diff --git a/tests/wpt/web-platform-tests/entries-api/filesystemdirectoryentry-getParent-manual.html b/tests/wpt/tests/entries-api/filesystemdirectoryentry-getParent-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/filesystemdirectoryentry-getParent-manual.html rename to tests/wpt/tests/entries-api/filesystemdirectoryentry-getParent-manual.html diff --git a/tests/wpt/web-platform-tests/entries-api/filesystemdirectoryreader-manual.html b/tests/wpt/tests/entries-api/filesystemdirectoryreader-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/filesystemdirectoryreader-manual.html rename to tests/wpt/tests/entries-api/filesystemdirectoryreader-manual.html diff --git a/tests/wpt/web-platform-tests/entries-api/filesystementry-attributes-manual.html b/tests/wpt/tests/entries-api/filesystementry-attributes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/filesystementry-attributes-manual.html rename to tests/wpt/tests/entries-api/filesystementry-attributes-manual.html diff --git a/tests/wpt/web-platform-tests/entries-api/filesystementry-getParent-manual.html b/tests/wpt/tests/entries-api/filesystementry-getParent-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/filesystementry-getParent-manual.html rename to tests/wpt/tests/entries-api/filesystementry-getParent-manual.html diff --git a/tests/wpt/web-platform-tests/entries-api/filesystemfileentry-attributes-manual.html b/tests/wpt/tests/entries-api/filesystemfileentry-attributes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/filesystemfileentry-attributes-manual.html rename to tests/wpt/tests/entries-api/filesystemfileentry-attributes-manual.html diff --git a/tests/wpt/web-platform-tests/entries-api/filesystemfileentry-file-manual.html b/tests/wpt/tests/entries-api/filesystemfileentry-file-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/filesystemfileentry-file-manual.html rename to tests/wpt/tests/entries-api/filesystemfileentry-file-manual.html diff --git a/tests/wpt/web-platform-tests/entries-api/filesystemfileentry-getParent-manual.html b/tests/wpt/tests/entries-api/filesystemfileentry-getParent-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/filesystemfileentry-getParent-manual.html rename to tests/wpt/tests/entries-api/filesystemfileentry-getParent-manual.html diff --git a/tests/wpt/web-platform-tests/entries-api/idlharness-manual.window.js b/tests/wpt/tests/entries-api/idlharness-manual.window.js similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/idlharness-manual.window.js rename to tests/wpt/tests/entries-api/idlharness-manual.window.js diff --git a/tests/wpt/web-platform-tests/entries-api/idlharness.window.js b/tests/wpt/tests/entries-api/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/idlharness.window.js rename to tests/wpt/tests/entries-api/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/entries-api/support.js b/tests/wpt/tests/entries-api/support.js similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/support.js rename to tests/wpt/tests/entries-api/support.js diff --git a/tests/wpt/web-platform-tests/entries-api/support/a/b/c/3.txt b/tests/wpt/tests/entries-api/support/a/b/c/3.txt similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/support/a/b/c/3.txt rename to tests/wpt/tests/entries-api/support/a/b/c/3.txt diff --git a/tests/wpt/web-platform-tests/entries-api/support/a/b/c/d/1.txt b/tests/wpt/tests/entries-api/support/a/b/c/d/1.txt similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/support/a/b/c/d/1.txt rename to tests/wpt/tests/entries-api/support/a/b/c/d/1.txt diff --git a/tests/wpt/web-platform-tests/entries-api/support/a/b/c/d/2.txt b/tests/wpt/tests/entries-api/support/a/b/c/d/2.txt similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/support/a/b/c/d/2.txt rename to tests/wpt/tests/entries-api/support/a/b/c/d/2.txt diff --git a/tests/wpt/web-platform-tests/entries-api/support/upload.txt b/tests/wpt/tests/entries-api/support/upload.txt similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/support/upload.txt rename to tests/wpt/tests/entries-api/support/upload.txt diff --git a/tests/wpt/web-platform-tests/entries-api/support/upload/file.txt b/tests/wpt/tests/entries-api/support/upload/file.txt similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/support/upload/file.txt rename to tests/wpt/tests/entries-api/support/upload/file.txt diff --git a/tests/wpt/web-platform-tests/entries-api/support/upload/subdir/1.txt b/tests/wpt/tests/entries-api/support/upload/subdir/1.txt similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/support/upload/subdir/1.txt rename to tests/wpt/tests/entries-api/support/upload/subdir/1.txt diff --git a/tests/wpt/web-platform-tests/entries-api/support/upload/subdir/2.txt b/tests/wpt/tests/entries-api/support/upload/subdir/2.txt similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/support/upload/subdir/2.txt rename to tests/wpt/tests/entries-api/support/upload/subdir/2.txt diff --git a/tests/wpt/web-platform-tests/entries-api/support/upload/subdir/3.txt b/tests/wpt/tests/entries-api/support/upload/subdir/3.txt similarity index 100% rename from tests/wpt/web-platform-tests/entries-api/support/upload/subdir/3.txt rename to tests/wpt/tests/entries-api/support/upload/subdir/3.txt diff --git a/tests/wpt/web-platform-tests/event-timing/META.yml b/tests/wpt/tests/event-timing/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/META.yml rename to tests/wpt/tests/event-timing/META.yml diff --git a/tests/wpt/web-platform-tests/event-timing/auxclick.html b/tests/wpt/tests/event-timing/auxclick.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/auxclick.html rename to tests/wpt/tests/event-timing/auxclick.html diff --git a/tests/wpt/web-platform-tests/event-timing/buffered-and-duration-threshold.html b/tests/wpt/tests/event-timing/buffered-and-duration-threshold.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/buffered-and-duration-threshold.html rename to tests/wpt/tests/event-timing/buffered-and-duration-threshold.html diff --git a/tests/wpt/web-platform-tests/event-timing/buffered-flag.html b/tests/wpt/tests/event-timing/buffered-flag.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/buffered-flag.html rename to tests/wpt/tests/event-timing/buffered-flag.html diff --git a/tests/wpt/web-platform-tests/event-timing/click-timing.html b/tests/wpt/tests/event-timing/click-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/click-timing.html rename to tests/wpt/tests/event-timing/click-timing.html diff --git a/tests/wpt/web-platform-tests/event-timing/click.html b/tests/wpt/tests/event-timing/click.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/click.html rename to tests/wpt/tests/event-timing/click.html diff --git a/tests/wpt/web-platform-tests/event-timing/contextmenu.html b/tests/wpt/tests/event-timing/contextmenu.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/contextmenu.html rename to tests/wpt/tests/event-timing/contextmenu.html diff --git a/tests/wpt/web-platform-tests/event-timing/crossiframe.html b/tests/wpt/tests/event-timing/crossiframe.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/crossiframe.html rename to tests/wpt/tests/event-timing/crossiframe.html diff --git a/tests/wpt/web-platform-tests/event-timing/dblclick.html b/tests/wpt/tests/event-timing/dblclick.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/dblclick.html rename to tests/wpt/tests/event-timing/dblclick.html diff --git a/tests/wpt/web-platform-tests/event-timing/disconnect-target.html b/tests/wpt/tests/event-timing/disconnect-target.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/disconnect-target.html rename to tests/wpt/tests/event-timing/disconnect-target.html diff --git a/tests/wpt/web-platform-tests/event-timing/duration-with-target-low.html b/tests/wpt/tests/event-timing/duration-with-target-low.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/duration-with-target-low.html rename to tests/wpt/tests/event-timing/duration-with-target-low.html diff --git a/tests/wpt/web-platform-tests/event-timing/event-click-counts.html b/tests/wpt/tests/event-timing/event-click-counts.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/event-click-counts.html rename to tests/wpt/tests/event-timing/event-click-counts.html diff --git a/tests/wpt/web-platform-tests/event-timing/event-click-visibilitychange.html b/tests/wpt/tests/event-timing/event-click-visibilitychange.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/event-click-visibilitychange.html rename to tests/wpt/tests/event-timing/event-click-visibilitychange.html diff --git a/tests/wpt/web-platform-tests/event-timing/event-counts-zero.html b/tests/wpt/tests/event-timing/event-counts-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/event-counts-zero.html rename to tests/wpt/tests/event-timing/event-counts-zero.html diff --git a/tests/wpt/web-platform-tests/event-timing/event-retarget.html b/tests/wpt/tests/event-timing/event-retarget.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/event-retarget.html rename to tests/wpt/tests/event-timing/event-retarget.html diff --git a/tests/wpt/web-platform-tests/event-timing/first-input-interactionid-click.html b/tests/wpt/tests/event-timing/first-input-interactionid-click.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/first-input-interactionid-click.html rename to tests/wpt/tests/event-timing/first-input-interactionid-click.html diff --git a/tests/wpt/web-platform-tests/event-timing/first-input-interactionid-tap.html b/tests/wpt/tests/event-timing/first-input-interactionid-tap.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/first-input-interactionid-tap.html rename to tests/wpt/tests/event-timing/first-input-interactionid-tap.html diff --git a/tests/wpt/web-platform-tests/event-timing/first-input-shadow-dom.html b/tests/wpt/tests/event-timing/first-input-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/first-input-shadow-dom.html rename to tests/wpt/tests/event-timing/first-input-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/event-timing/idlharness.any.js b/tests/wpt/tests/event-timing/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/idlharness.any.js rename to tests/wpt/tests/event-timing/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/event-timing/interaction-count-click.html b/tests/wpt/tests/event-timing/interaction-count-click.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/interaction-count-click.html rename to tests/wpt/tests/event-timing/interaction-count-click.html diff --git a/tests/wpt/web-platform-tests/event-timing/interaction-count-press-key.html b/tests/wpt/tests/event-timing/interaction-count-press-key.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/interaction-count-press-key.html rename to tests/wpt/tests/event-timing/interaction-count-press-key.html diff --git a/tests/wpt/web-platform-tests/event-timing/interaction-count-tap.html b/tests/wpt/tests/event-timing/interaction-count-tap.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/interaction-count-tap.html rename to tests/wpt/tests/event-timing/interaction-count-tap.html diff --git a/tests/wpt/web-platform-tests/event-timing/interactionid-click.html b/tests/wpt/tests/event-timing/interactionid-click.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/interactionid-click.html rename to tests/wpt/tests/event-timing/interactionid-click.html diff --git a/tests/wpt/web-platform-tests/event-timing/interactionid-press-key-as-input.html b/tests/wpt/tests/event-timing/interactionid-press-key-as-input.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/interactionid-press-key-as-input.html rename to tests/wpt/tests/event-timing/interactionid-press-key-as-input.html diff --git a/tests/wpt/web-platform-tests/event-timing/interactionid-press-key-no-effect.html b/tests/wpt/tests/event-timing/interactionid-press-key-no-effect.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/interactionid-press-key-no-effect.html rename to tests/wpt/tests/event-timing/interactionid-press-key-no-effect.html diff --git a/tests/wpt/web-platform-tests/event-timing/interactionid-tap.html b/tests/wpt/tests/event-timing/interactionid-tap.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/interactionid-tap.html rename to tests/wpt/tests/event-timing/interactionid-tap.html diff --git a/tests/wpt/web-platform-tests/event-timing/keydown.html b/tests/wpt/tests/event-timing/keydown.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/keydown.html rename to tests/wpt/tests/event-timing/keydown.html diff --git a/tests/wpt/web-platform-tests/event-timing/keyup.html b/tests/wpt/tests/event-timing/keyup.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/keyup.html rename to tests/wpt/tests/event-timing/keyup.html diff --git a/tests/wpt/web-platform-tests/event-timing/large-duration-threshold.html b/tests/wpt/tests/event-timing/large-duration-threshold.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/large-duration-threshold.html rename to tests/wpt/tests/event-timing/large-duration-threshold.html diff --git a/tests/wpt/web-platform-tests/event-timing/medium-duration-threshold.html b/tests/wpt/tests/event-timing/medium-duration-threshold.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/medium-duration-threshold.html rename to tests/wpt/tests/event-timing/medium-duration-threshold.html diff --git a/tests/wpt/web-platform-tests/event-timing/min-duration-threshold.html b/tests/wpt/tests/event-timing/min-duration-threshold.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/min-duration-threshold.html rename to tests/wpt/tests/event-timing/min-duration-threshold.html diff --git a/tests/wpt/web-platform-tests/event-timing/mousedown.html b/tests/wpt/tests/event-timing/mousedown.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/mousedown.html rename to tests/wpt/tests/event-timing/mousedown.html diff --git a/tests/wpt/web-platform-tests/event-timing/mouseenter.html b/tests/wpt/tests/event-timing/mouseenter.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/mouseenter.html rename to tests/wpt/tests/event-timing/mouseenter.html diff --git a/tests/wpt/web-platform-tests/event-timing/mouseleave.html b/tests/wpt/tests/event-timing/mouseleave.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/mouseleave.html rename to tests/wpt/tests/event-timing/mouseleave.html diff --git a/tests/wpt/web-platform-tests/event-timing/mouseout.html b/tests/wpt/tests/event-timing/mouseout.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/mouseout.html rename to tests/wpt/tests/event-timing/mouseout.html diff --git a/tests/wpt/web-platform-tests/event-timing/mouseover.html b/tests/wpt/tests/event-timing/mouseover.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/mouseover.html rename to tests/wpt/tests/event-timing/mouseover.html diff --git a/tests/wpt/web-platform-tests/event-timing/mouseup.html b/tests/wpt/tests/event-timing/mouseup.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/mouseup.html rename to tests/wpt/tests/event-timing/mouseup.html diff --git a/tests/wpt/web-platform-tests/event-timing/only-observe-firstInput.html b/tests/wpt/tests/event-timing/only-observe-firstInput.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/only-observe-firstInput.html rename to tests/wpt/tests/event-timing/only-observe-firstInput.html diff --git a/tests/wpt/web-platform-tests/event-timing/pointerdown.html b/tests/wpt/tests/event-timing/pointerdown.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/pointerdown.html rename to tests/wpt/tests/event-timing/pointerdown.html diff --git a/tests/wpt/web-platform-tests/event-timing/pointerenter.html b/tests/wpt/tests/event-timing/pointerenter.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/pointerenter.html rename to tests/wpt/tests/event-timing/pointerenter.html diff --git a/tests/wpt/web-platform-tests/event-timing/pointerleave.html b/tests/wpt/tests/event-timing/pointerleave.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/pointerleave.html rename to tests/wpt/tests/event-timing/pointerleave.html diff --git a/tests/wpt/web-platform-tests/event-timing/pointerout.html b/tests/wpt/tests/event-timing/pointerout.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/pointerout.html rename to tests/wpt/tests/event-timing/pointerout.html diff --git a/tests/wpt/web-platform-tests/event-timing/pointerover.html b/tests/wpt/tests/event-timing/pointerover.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/pointerover.html rename to tests/wpt/tests/event-timing/pointerover.html diff --git a/tests/wpt/web-platform-tests/event-timing/pointerup.html b/tests/wpt/tests/event-timing/pointerup.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/pointerup.html rename to tests/wpt/tests/event-timing/pointerup.html diff --git a/tests/wpt/web-platform-tests/event-timing/programmatic-click-not-observed.html b/tests/wpt/tests/event-timing/programmatic-click-not-observed.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/programmatic-click-not-observed.html rename to tests/wpt/tests/event-timing/programmatic-click-not-observed.html diff --git a/tests/wpt/web-platform-tests/event-timing/resources/crossiframe-childframe.html b/tests/wpt/tests/event-timing/resources/crossiframe-childframe.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/resources/crossiframe-childframe.html rename to tests/wpt/tests/event-timing/resources/crossiframe-childframe.html diff --git a/tests/wpt/web-platform-tests/event-timing/resources/event-timing-test-utils.js b/tests/wpt/tests/event-timing/resources/event-timing-test-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/resources/event-timing-test-utils.js rename to tests/wpt/tests/event-timing/resources/event-timing-test-utils.js diff --git a/tests/wpt/web-platform-tests/event-timing/resources/slow-image.py b/tests/wpt/tests/event-timing/resources/slow-image.py similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/resources/slow-image.py rename to tests/wpt/tests/event-timing/resources/slow-image.py diff --git a/tests/wpt/web-platform-tests/event-timing/retrievability.html b/tests/wpt/tests/event-timing/retrievability.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/retrievability.html rename to tests/wpt/tests/event-timing/retrievability.html diff --git a/tests/wpt/web-platform-tests/event-timing/retrieve-firstInput.html b/tests/wpt/tests/event-timing/retrieve-firstInput.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/retrieve-firstInput.html rename to tests/wpt/tests/event-timing/retrieve-firstInput.html diff --git a/tests/wpt/web-platform-tests/event-timing/shadow-dom-null-target.html b/tests/wpt/tests/event-timing/shadow-dom-null-target.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/shadow-dom-null-target.html rename to tests/wpt/tests/event-timing/shadow-dom-null-target.html diff --git a/tests/wpt/web-platform-tests/event-timing/supported-types-consistent-with-self.html b/tests/wpt/tests/event-timing/supported-types-consistent-with-self.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/supported-types-consistent-with-self.html rename to tests/wpt/tests/event-timing/supported-types-consistent-with-self.html diff --git a/tests/wpt/web-platform-tests/event-timing/supported-types.window.js b/tests/wpt/tests/event-timing/supported-types.window.js similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/supported-types.window.js rename to tests/wpt/tests/event-timing/supported-types.window.js diff --git a/tests/wpt/web-platform-tests/event-timing/timingconditions.html b/tests/wpt/tests/event-timing/timingconditions.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/timingconditions.html rename to tests/wpt/tests/event-timing/timingconditions.html diff --git a/tests/wpt/web-platform-tests/event-timing/toJSON.html b/tests/wpt/tests/event-timing/toJSON.html similarity index 100% rename from tests/wpt/web-platform-tests/event-timing/toJSON.html rename to tests/wpt/tests/event-timing/toJSON.html diff --git a/tests/wpt/web-platform-tests/eventsource/META.yml b/tests/wpt/tests/eventsource/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/META.yml rename to tests/wpt/tests/eventsource/META.yml diff --git a/tests/wpt/web-platform-tests/eventsource/README.md b/tests/wpt/tests/eventsource/README.md similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/README.md rename to tests/wpt/tests/eventsource/README.md diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-close.htm b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-close.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-close.htm rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-close.htm diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-close.js b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-close.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-close.js rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-close.js diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-close2.htm b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-close2.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-close2.htm rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-close2.htm diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-close2.js b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-close2.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-close2.js rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-close2.js diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-constructor-no-new.any.js b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-constructor-no-new.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-constructor-no-new.any.js rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-constructor-no-new.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-constructor-non-same-origin.htm b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-constructor-non-same-origin.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-constructor-non-same-origin.htm rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-constructor-non-same-origin.htm diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-constructor-non-same-origin.js b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-constructor-non-same-origin.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-constructor-non-same-origin.js rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-constructor-non-same-origin.js diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-constructor-url-bogus.js b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-constructor-url-bogus.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-constructor-url-bogus.js rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-constructor-url-bogus.js diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-eventtarget.worker.js b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-eventtarget.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-eventtarget.worker.js rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-eventtarget.worker.js diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-onmesage.js b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-onmesage.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-onmesage.js rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-onmesage.js diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-onmessage.htm b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-onmessage.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-onmessage.htm rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-onmessage.htm diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-onopen.htm b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-onopen.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-onopen.htm rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-onopen.htm diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-onopen.js b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-onopen.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-onopen.js rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-onopen.js diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-prototype.htm b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-prototype.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-prototype.htm rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-prototype.htm diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-prototype.js b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-prototype.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-prototype.js rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-prototype.js diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-url.htm b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-url.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-url.htm rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-url.htm diff --git a/tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-url.js b/tests/wpt/tests/eventsource/dedicated-worker/eventsource-url.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/dedicated-worker/eventsource-url.js rename to tests/wpt/tests/eventsource/dedicated-worker/eventsource-url.js diff --git a/tests/wpt/web-platform-tests/eventsource/event-data.any.js b/tests/wpt/tests/eventsource/event-data.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/event-data.any.js rename to tests/wpt/tests/eventsource/event-data.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-close.window.js b/tests/wpt/tests/eventsource/eventsource-close.window.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-close.window.js rename to tests/wpt/tests/eventsource/eventsource-close.window.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-constructor-document-domain.window.js b/tests/wpt/tests/eventsource/eventsource-constructor-document-domain.window.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-constructor-document-domain.window.js rename to tests/wpt/tests/eventsource/eventsource-constructor-document-domain.window.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-constructor-empty-url.any.js b/tests/wpt/tests/eventsource/eventsource-constructor-empty-url.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-constructor-empty-url.any.js rename to tests/wpt/tests/eventsource/eventsource-constructor-empty-url.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-constructor-non-same-origin.window.js b/tests/wpt/tests/eventsource/eventsource-constructor-non-same-origin.window.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-constructor-non-same-origin.window.js rename to tests/wpt/tests/eventsource/eventsource-constructor-non-same-origin.window.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-constructor-stringify.window.js b/tests/wpt/tests/eventsource/eventsource-constructor-stringify.window.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-constructor-stringify.window.js rename to tests/wpt/tests/eventsource/eventsource-constructor-stringify.window.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-constructor-url-bogus.any.js b/tests/wpt/tests/eventsource/eventsource-constructor-url-bogus.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-constructor-url-bogus.any.js rename to tests/wpt/tests/eventsource/eventsource-constructor-url-bogus.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-constructor-url-multi-window.htm b/tests/wpt/tests/eventsource/eventsource-constructor-url-multi-window.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-constructor-url-multi-window.htm rename to tests/wpt/tests/eventsource/eventsource-constructor-url-multi-window.htm diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-cross-origin.window.js b/tests/wpt/tests/eventsource/eventsource-cross-origin.window.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-cross-origin.window.js rename to tests/wpt/tests/eventsource/eventsource-cross-origin.window.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-eventtarget.any.js b/tests/wpt/tests/eventsource/eventsource-eventtarget.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-eventtarget.any.js rename to tests/wpt/tests/eventsource/eventsource-eventtarget.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-onmessage-realm.htm b/tests/wpt/tests/eventsource/eventsource-onmessage-realm.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-onmessage-realm.htm rename to tests/wpt/tests/eventsource/eventsource-onmessage-realm.htm diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-onmessage-trusted.any.js b/tests/wpt/tests/eventsource/eventsource-onmessage-trusted.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-onmessage-trusted.any.js rename to tests/wpt/tests/eventsource/eventsource-onmessage-trusted.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-onmessage.any.js b/tests/wpt/tests/eventsource/eventsource-onmessage.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-onmessage.any.js rename to tests/wpt/tests/eventsource/eventsource-onmessage.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-onopen.any.js b/tests/wpt/tests/eventsource/eventsource-onopen.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-onopen.any.js rename to tests/wpt/tests/eventsource/eventsource-onopen.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-prototype.any.js b/tests/wpt/tests/eventsource/eventsource-prototype.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-prototype.any.js rename to tests/wpt/tests/eventsource/eventsource-prototype.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-reconnect.window.js b/tests/wpt/tests/eventsource/eventsource-reconnect.window.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-reconnect.window.js rename to tests/wpt/tests/eventsource/eventsource-reconnect.window.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-request-cancellation.any.window.js b/tests/wpt/tests/eventsource/eventsource-request-cancellation.any.window.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-request-cancellation.any.window.js rename to tests/wpt/tests/eventsource/eventsource-request-cancellation.any.window.js diff --git a/tests/wpt/web-platform-tests/eventsource/eventsource-url.any.js b/tests/wpt/tests/eventsource/eventsource-url.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/eventsource-url.any.js rename to tests/wpt/tests/eventsource/eventsource-url.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-bom-2.any.js b/tests/wpt/tests/eventsource/format-bom-2.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-bom-2.any.js rename to tests/wpt/tests/eventsource/format-bom-2.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-bom.any.js b/tests/wpt/tests/eventsource/format-bom.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-bom.any.js rename to tests/wpt/tests/eventsource/format-bom.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-comments.any.js b/tests/wpt/tests/eventsource/format-comments.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-comments.any.js rename to tests/wpt/tests/eventsource/format-comments.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-data-before-final-empty-line.any.js b/tests/wpt/tests/eventsource/format-data-before-final-empty-line.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-data-before-final-empty-line.any.js rename to tests/wpt/tests/eventsource/format-data-before-final-empty-line.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-field-data.any.js b/tests/wpt/tests/eventsource/format-field-data.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-field-data.any.js rename to tests/wpt/tests/eventsource/format-field-data.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-field-event-empty.any.js b/tests/wpt/tests/eventsource/format-field-event-empty.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-field-event-empty.any.js rename to tests/wpt/tests/eventsource/format-field-event-empty.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-field-event.any.js b/tests/wpt/tests/eventsource/format-field-event.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-field-event.any.js rename to tests/wpt/tests/eventsource/format-field-event.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-field-id-2.any.js b/tests/wpt/tests/eventsource/format-field-id-2.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-field-id-2.any.js rename to tests/wpt/tests/eventsource/format-field-id-2.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-field-id-3.window.js b/tests/wpt/tests/eventsource/format-field-id-3.window.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-field-id-3.window.js rename to tests/wpt/tests/eventsource/format-field-id-3.window.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-field-id-null.window.js b/tests/wpt/tests/eventsource/format-field-id-null.window.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-field-id-null.window.js rename to tests/wpt/tests/eventsource/format-field-id-null.window.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-field-id.any.js b/tests/wpt/tests/eventsource/format-field-id.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-field-id.any.js rename to tests/wpt/tests/eventsource/format-field-id.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-field-parsing.any.js b/tests/wpt/tests/eventsource/format-field-parsing.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-field-parsing.any.js rename to tests/wpt/tests/eventsource/format-field-parsing.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-field-retry-bogus.any.js b/tests/wpt/tests/eventsource/format-field-retry-bogus.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-field-retry-bogus.any.js rename to tests/wpt/tests/eventsource/format-field-retry-bogus.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-field-retry-empty.any.js b/tests/wpt/tests/eventsource/format-field-retry-empty.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-field-retry-empty.any.js rename to tests/wpt/tests/eventsource/format-field-retry-empty.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-field-retry.any.js b/tests/wpt/tests/eventsource/format-field-retry.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-field-retry.any.js rename to tests/wpt/tests/eventsource/format-field-retry.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-field-unknown.any.js b/tests/wpt/tests/eventsource/format-field-unknown.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-field-unknown.any.js rename to tests/wpt/tests/eventsource/format-field-unknown.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-leading-space.any.js b/tests/wpt/tests/eventsource/format-leading-space.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-leading-space.any.js rename to tests/wpt/tests/eventsource/format-leading-space.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-mime-bogus.any.js b/tests/wpt/tests/eventsource/format-mime-bogus.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-mime-bogus.any.js rename to tests/wpt/tests/eventsource/format-mime-bogus.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-mime-trailing-semicolon.any.js b/tests/wpt/tests/eventsource/format-mime-trailing-semicolon.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-mime-trailing-semicolon.any.js rename to tests/wpt/tests/eventsource/format-mime-trailing-semicolon.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-mime-valid-bogus.any.js b/tests/wpt/tests/eventsource/format-mime-valid-bogus.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-mime-valid-bogus.any.js rename to tests/wpt/tests/eventsource/format-mime-valid-bogus.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-newlines.any.js b/tests/wpt/tests/eventsource/format-newlines.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-newlines.any.js rename to tests/wpt/tests/eventsource/format-newlines.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-null-character.any.js b/tests/wpt/tests/eventsource/format-null-character.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-null-character.any.js rename to tests/wpt/tests/eventsource/format-null-character.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/format-utf-8.any.js b/tests/wpt/tests/eventsource/format-utf-8.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/format-utf-8.any.js rename to tests/wpt/tests/eventsource/format-utf-8.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/request-accept.any.js b/tests/wpt/tests/eventsource/request-accept.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/request-accept.any.js rename to tests/wpt/tests/eventsource/request-accept.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/request-cache-control.any.js b/tests/wpt/tests/eventsource/request-cache-control.any.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/request-cache-control.any.js rename to tests/wpt/tests/eventsource/request-cache-control.any.js diff --git a/tests/wpt/web-platform-tests/eventsource/request-credentials.any.window.js b/tests/wpt/tests/eventsource/request-credentials.any.window.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/request-credentials.any.window.js rename to tests/wpt/tests/eventsource/request-credentials.any.window.js diff --git a/tests/wpt/web-platform-tests/eventsource/request-redirect.any.window.js b/tests/wpt/tests/eventsource/request-redirect.any.window.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/request-redirect.any.window.js rename to tests/wpt/tests/eventsource/request-redirect.any.window.js diff --git a/tests/wpt/web-platform-tests/eventsource/request-status-error.window.js b/tests/wpt/tests/eventsource/request-status-error.window.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/request-status-error.window.js rename to tests/wpt/tests/eventsource/request-status-error.window.js diff --git a/tests/wpt/web-platform-tests/eventsource/resources/accept.event_stream b/tests/wpt/tests/eventsource/resources/accept.event_stream similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/resources/accept.event_stream rename to tests/wpt/tests/eventsource/resources/accept.event_stream diff --git a/tests/wpt/web-platform-tests/eventsource/resources/cache-control.event_stream b/tests/wpt/tests/eventsource/resources/cache-control.event_stream similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/resources/cache-control.event_stream rename to tests/wpt/tests/eventsource/resources/cache-control.event_stream diff --git a/tests/wpt/web-platform-tests/eventsource/resources/cors-cookie.py b/tests/wpt/tests/eventsource/resources/cors-cookie.py similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/resources/cors-cookie.py rename to tests/wpt/tests/eventsource/resources/cors-cookie.py diff --git a/tests/wpt/web-platform-tests/eventsource/resources/cors.py b/tests/wpt/tests/eventsource/resources/cors.py similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/resources/cors.py rename to tests/wpt/tests/eventsource/resources/cors.py diff --git a/tests/wpt/web-platform-tests/eventsource/resources/eventsource-onmessage-realm.htm b/tests/wpt/tests/eventsource/resources/eventsource-onmessage-realm.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/resources/eventsource-onmessage-realm.htm rename to tests/wpt/tests/eventsource/resources/eventsource-onmessage-realm.htm diff --git a/tests/wpt/web-platform-tests/eventsource/resources/init.htm b/tests/wpt/tests/eventsource/resources/init.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/resources/init.htm rename to tests/wpt/tests/eventsource/resources/init.htm diff --git a/tests/wpt/web-platform-tests/eventsource/resources/last-event-id.py b/tests/wpt/tests/eventsource/resources/last-event-id.py similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/resources/last-event-id.py rename to tests/wpt/tests/eventsource/resources/last-event-id.py diff --git a/tests/wpt/web-platform-tests/eventsource/resources/last-event-id2.py b/tests/wpt/tests/eventsource/resources/last-event-id2.py similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/resources/last-event-id2.py rename to tests/wpt/tests/eventsource/resources/last-event-id2.py diff --git a/tests/wpt/web-platform-tests/eventsource/resources/message.py b/tests/wpt/tests/eventsource/resources/message.py similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/resources/message.py rename to tests/wpt/tests/eventsource/resources/message.py diff --git a/tests/wpt/web-platform-tests/eventsource/resources/message2.py b/tests/wpt/tests/eventsource/resources/message2.py similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/resources/message2.py rename to tests/wpt/tests/eventsource/resources/message2.py diff --git a/tests/wpt/web-platform-tests/eventsource/resources/reconnect-fail.py b/tests/wpt/tests/eventsource/resources/reconnect-fail.py similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/resources/reconnect-fail.py rename to tests/wpt/tests/eventsource/resources/reconnect-fail.py diff --git a/tests/wpt/web-platform-tests/eventsource/resources/status-error.py b/tests/wpt/tests/eventsource/resources/status-error.py similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/resources/status-error.py rename to tests/wpt/tests/eventsource/resources/status-error.py diff --git a/tests/wpt/web-platform-tests/eventsource/resources/status-reconnect.py b/tests/wpt/tests/eventsource/resources/status-reconnect.py similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/resources/status-reconnect.py rename to tests/wpt/tests/eventsource/resources/status-reconnect.py diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-close.htm b/tests/wpt/tests/eventsource/shared-worker/eventsource-close.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-close.htm rename to tests/wpt/tests/eventsource/shared-worker/eventsource-close.htm diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-close.js b/tests/wpt/tests/eventsource/shared-worker/eventsource-close.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-close.js rename to tests/wpt/tests/eventsource/shared-worker/eventsource-close.js diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-constructor-non-same-origin.htm b/tests/wpt/tests/eventsource/shared-worker/eventsource-constructor-non-same-origin.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-constructor-non-same-origin.htm rename to tests/wpt/tests/eventsource/shared-worker/eventsource-constructor-non-same-origin.htm diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-constructor-non-same-origin.js b/tests/wpt/tests/eventsource/shared-worker/eventsource-constructor-non-same-origin.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-constructor-non-same-origin.js rename to tests/wpt/tests/eventsource/shared-worker/eventsource-constructor-non-same-origin.js diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-constructor-url-bogus.js b/tests/wpt/tests/eventsource/shared-worker/eventsource-constructor-url-bogus.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-constructor-url-bogus.js rename to tests/wpt/tests/eventsource/shared-worker/eventsource-constructor-url-bogus.js diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-eventtarget.htm b/tests/wpt/tests/eventsource/shared-worker/eventsource-eventtarget.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-eventtarget.htm rename to tests/wpt/tests/eventsource/shared-worker/eventsource-eventtarget.htm diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-eventtarget.js b/tests/wpt/tests/eventsource/shared-worker/eventsource-eventtarget.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-eventtarget.js rename to tests/wpt/tests/eventsource/shared-worker/eventsource-eventtarget.js diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-onmesage.js b/tests/wpt/tests/eventsource/shared-worker/eventsource-onmesage.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-onmesage.js rename to tests/wpt/tests/eventsource/shared-worker/eventsource-onmesage.js diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-onmessage.htm b/tests/wpt/tests/eventsource/shared-worker/eventsource-onmessage.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-onmessage.htm rename to tests/wpt/tests/eventsource/shared-worker/eventsource-onmessage.htm diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-onopen.htm b/tests/wpt/tests/eventsource/shared-worker/eventsource-onopen.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-onopen.htm rename to tests/wpt/tests/eventsource/shared-worker/eventsource-onopen.htm diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-onopen.js b/tests/wpt/tests/eventsource/shared-worker/eventsource-onopen.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-onopen.js rename to tests/wpt/tests/eventsource/shared-worker/eventsource-onopen.js diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-prototype.htm b/tests/wpt/tests/eventsource/shared-worker/eventsource-prototype.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-prototype.htm rename to tests/wpt/tests/eventsource/shared-worker/eventsource-prototype.htm diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-prototype.js b/tests/wpt/tests/eventsource/shared-worker/eventsource-prototype.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-prototype.js rename to tests/wpt/tests/eventsource/shared-worker/eventsource-prototype.js diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-url.htm b/tests/wpt/tests/eventsource/shared-worker/eventsource-url.htm similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-url.htm rename to tests/wpt/tests/eventsource/shared-worker/eventsource-url.htm diff --git a/tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-url.js b/tests/wpt/tests/eventsource/shared-worker/eventsource-url.js similarity index 100% rename from tests/wpt/web-platform-tests/eventsource/shared-worker/eventsource-url.js rename to tests/wpt/tests/eventsource/shared-worker/eventsource-url.js diff --git a/tests/wpt/web-platform-tests/eyedropper/eye-dropper-abort-signal.tentative.https.html b/tests/wpt/tests/eyedropper/eye-dropper-abort-signal.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/eyedropper/eye-dropper-abort-signal.tentative.https.html rename to tests/wpt/tests/eyedropper/eye-dropper-abort-signal.tentative.https.html diff --git a/tests/wpt/web-platform-tests/eyedropper/manual/eye-dropper.tentative.html b/tests/wpt/tests/eyedropper/manual/eye-dropper.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/eyedropper/manual/eye-dropper.tentative.html rename to tests/wpt/tests/eyedropper/manual/eye-dropper.tentative.html diff --git a/tests/wpt/web-platform-tests/eyedropper/manual/resources/eye_dropper_icon.svg b/tests/wpt/tests/eyedropper/manual/resources/eye_dropper_icon.svg similarity index 100% rename from tests/wpt/web-platform-tests/eyedropper/manual/resources/eye_dropper_icon.svg rename to tests/wpt/tests/eyedropper/manual/resources/eye_dropper_icon.svg diff --git a/tests/wpt/web-platform-tests/feature-policy/META.yml b/tests/wpt/tests/feature-policy/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/META.yml rename to tests/wpt/tests/feature-policy/META.yml diff --git a/tests/wpt/web-platform-tests/feature-policy/README.md b/tests/wpt/tests/feature-policy/README.md similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/README.md rename to tests/wpt/tests/feature-policy/README.md diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/focus-without-user-activation-disabled-tentative.html b/tests/wpt/tests/feature-policy/experimental-features/focus-without-user-activation-disabled-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/focus-without-user-activation-disabled-tentative.html rename to tests/wpt/tests/feature-policy/experimental-features/focus-without-user-activation-disabled-tentative.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/focus-without-user-activation-enabled-tentative.sub.html b/tests/wpt/tests/feature-policy/experimental-features/focus-without-user-activation-enabled-tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/focus-without-user-activation-enabled-tentative.sub.html rename to tests/wpt/tests/feature-policy/experimental-features/focus-without-user-activation-enabled-tentative.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/common.js b/tests/wpt/tests/feature-policy/experimental-features/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/common.js rename to tests/wpt/tests/feature-policy/experimental-features/resources/common.js diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/feature-policy-trust-token-redemption.html b/tests/wpt/tests/feature-policy/experimental-features/resources/feature-policy-trust-token-redemption.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/feature-policy-trust-token-redemption.html rename to tests/wpt/tests/feature-policy/experimental-features/resources/feature-policy-trust-token-redemption.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/focus-without-user-activation-iframe-tentative.html b/tests/wpt/tests/feature-policy/experimental-features/resources/focus-without-user-activation-iframe-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/focus-without-user-activation-iframe-tentative.html rename to tests/wpt/tests/feature-policy/experimental-features/resources/focus-without-user-activation-iframe-tentative.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/lazyload-contents.html b/tests/wpt/tests/feature-policy/experimental-features/resources/lazyload-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/lazyload-contents.html rename to tests/wpt/tests/feature-policy/experimental-features/resources/lazyload-contents.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/lazyload.png b/tests/wpt/tests/feature-policy/experimental-features/resources/lazyload.png similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/lazyload.png rename to tests/wpt/tests/feature-policy/experimental-features/resources/lazyload.png diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-scrollable-content.html b/tests/wpt/tests/feature-policy/experimental-features/resources/vertical-scroll-scrollable-content.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-scrollable-content.html rename to tests/wpt/tests/feature-policy/experimental-features/resources/vertical-scroll-scrollable-content.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-scrollbar-ref.html b/tests/wpt/tests/feature-policy/experimental-features/resources/vertical-scroll-scrollbar-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-scrollbar-ref.html rename to tests/wpt/tests/feature-policy/experimental-features/resources/vertical-scroll-scrollbar-ref.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-scrollintoview.html b/tests/wpt/tests/feature-policy/experimental-features/resources/vertical-scroll-scrollintoview.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-scrollintoview.html rename to tests/wpt/tests/feature-policy/experimental-features/resources/vertical-scroll-scrollintoview.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-touch-action.html b/tests/wpt/tests/feature-policy/experimental-features/resources/vertical-scroll-touch-action.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-touch-action.html rename to tests/wpt/tests/feature-policy/experimental-features/resources/vertical-scroll-touch-action.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-touch-block.html b/tests/wpt/tests/feature-policy/experimental-features/resources/vertical-scroll-touch-block.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-touch-block.html rename to tests/wpt/tests/feature-policy/experimental-features/resources/vertical-scroll-touch-block.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-wheel-block.html b/tests/wpt/tests/feature-policy/experimental-features/resources/vertical-scroll-wheel-block.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-wheel-block.html rename to tests/wpt/tests/feature-policy/experimental-features/resources/vertical-scroll-wheel-block.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll.js b/tests/wpt/tests/feature-policy/experimental-features/resources/vertical-scroll.js similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll.js rename to tests/wpt/tests/feature-policy/experimental-features/resources/vertical-scroll.js diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/trust-token-redemption-default-feature-policy.tentative.https.sub.html b/tests/wpt/tests/feature-policy/experimental-features/trust-token-redemption-default-feature-policy.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/trust-token-redemption-default-feature-policy.tentative.https.sub.html rename to tests/wpt/tests/feature-policy/experimental-features/trust-token-redemption-default-feature-policy.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/trust-token-redemption-supported-by-feature-policy.tentative.html b/tests/wpt/tests/feature-policy/experimental-features/trust-token-redemption-supported-by-feature-policy.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/trust-token-redemption-supported-by-feature-policy.tentative.html rename to tests/wpt/tests/feature-policy/experimental-features/trust-token-redemption-supported-by-feature-policy.tentative.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-disabled-frame-no-scroll-manual.tentative.html b/tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-disabled-frame-no-scroll-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-disabled-frame-no-scroll-manual.tentative.html rename to tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-disabled-frame-no-scroll-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-disabled-scrollbar-tentative.html b/tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-disabled-scrollbar-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-disabled-scrollbar-tentative.html rename to tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-disabled-scrollbar-tentative.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html b/tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html rename to tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html.headers b/tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html.headers rename to tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-scrollintoview.tentative.html b/tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-scrollintoview.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-scrollintoview.tentative.html rename to tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-scrollintoview.tentative.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html b/tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html rename to tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-touch-block-manual.tentative.html b/tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-touch-block-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-touch-block-manual.tentative.html rename to tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-touch-block-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-wheel-block-manual.tentative.html b/tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-wheel-block-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-wheel-block-manual.tentative.html rename to tests/wpt/tests/feature-policy/experimental-features/vertical-scroll-wheel-block-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html.sub.headers b/tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html.sub.headers rename to tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html.sub.headers b/tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html.sub.headers rename to tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some-override.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-some-override.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some-override.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-some-override.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some-override.https.sub.html.sub.headers b/tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-some-override.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some-override.https.sub.html.sub.headers rename to tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-some-override.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html.sub.headers b/tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html.sub.headers rename to tests/wpt/tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html.sub.headers b/tests/wpt/tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html.sub.headers rename to tests/wpt/tests/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-timing-iframe-camera.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-frame-policy-timing-iframe-camera.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-timing-iframe-camera.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-frame-policy-timing-iframe-camera.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-timing.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-frame-policy-timing.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-timing.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-frame-policy-timing.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html.sub.headers b/tests/wpt/tests/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html.sub.headers rename to tests/wpt/tests/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-self.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-header-policy-allowed-for-self.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-self.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-header-policy-allowed-for-self.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-self.https.sub.html.sub.headers b/tests/wpt/tests/feature-policy/feature-policy-header-policy-allowed-for-self.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-self.https.sub.html.sub.headers rename to tests/wpt/tests/feature-policy/feature-policy-header-policy-allowed-for-self.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html.sub.headers b/tests/wpt/tests/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html.sub.headers rename to tests/wpt/tests/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-declined.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-header-policy-declined.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-declined.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-header-policy-declined.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-declined.https.sub.html.sub.headers b/tests/wpt/tests/feature-policy/feature-policy-header-policy-declined.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-declined.https.sub.html.sub.headers rename to tests/wpt/tests/feature-policy/feature-policy-header-policy-declined.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html.sub.headers b/tests/wpt/tests/feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html.sub.headers rename to tests/wpt/tests/feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html.sub.headers b/tests/wpt/tests/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html.sub.headers rename to tests/wpt/tests/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html.sub.headers b/tests/wpt/tests/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html.sub.headers rename to tests/wpt/tests/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-disallowed-for-all.https.sub.html b/tests/wpt/tests/feature-policy/feature-policy-nested-header-policy-disallowed-for-all.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-disallowed-for-all.https.sub.html rename to tests/wpt/tests/feature-policy/feature-policy-nested-header-policy-disallowed-for-all.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-disallowed-for-all.https.sub.html.sub.headers b/tests/wpt/tests/feature-policy/feature-policy-nested-header-policy-disallowed-for-all.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-disallowed-for-all.https.sub.html.sub.headers rename to tests/wpt/tests/feature-policy/feature-policy-nested-header-policy-disallowed-for-all.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/tests/feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html rename to tests/wpt/tests/feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy-attribute.https.sub.html b/tests/wpt/tests/feature-policy/payment-allowed-by-feature-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy-attribute.https.sub.html rename to tests/wpt/tests/feature-policy/payment-allowed-by-feature-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html b/tests/wpt/tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html rename to tests/wpt/tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html.headers b/tests/wpt/tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html.headers rename to tests/wpt/tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/payment-default-feature-policy.https.sub.html b/tests/wpt/tests/feature-policy/payment-default-feature-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/payment-default-feature-policy.https.sub.html rename to tests/wpt/tests/feature-policy/payment-default-feature-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/payment-disabled-by-feature-policy.https.sub.html b/tests/wpt/tests/feature-policy/payment-disabled-by-feature-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/payment-disabled-by-feature-policy.https.sub.html rename to tests/wpt/tests/feature-policy/payment-disabled-by-feature-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/payment-disabled-by-feature-policy.https.sub.html.headers b/tests/wpt/tests/feature-policy/payment-disabled-by-feature-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/payment-disabled-by-feature-policy.https.sub.html.headers rename to tests/wpt/tests/feature-policy/payment-disabled-by-feature-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/payment-supported-by-feature-policy.tentative.html b/tests/wpt/tests/feature-policy/payment-supported-by-feature-policy.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/payment-supported-by-feature-policy.tentative.html rename to tests/wpt/tests/feature-policy/payment-supported-by-feature-policy.tentative.html diff --git a/tests/wpt/web-platform-tests/feature-policy/permissions-policy-feature-policy-coexist.https.html b/tests/wpt/tests/feature-policy/permissions-policy-feature-policy-coexist.https.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/permissions-policy-feature-policy-coexist.https.html rename to tests/wpt/tests/feature-policy/permissions-policy-feature-policy-coexist.https.html diff --git a/tests/wpt/web-platform-tests/feature-policy/permissions-policy-feature-policy-coexist.https.html.headers b/tests/wpt/tests/feature-policy/permissions-policy-feature-policy-coexist.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/permissions-policy-feature-policy-coexist.https.html.headers rename to tests/wpt/tests/feature-policy/permissions-policy-feature-policy-coexist.https.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html b/tests/wpt/tests/feature-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html rename to tests/wpt/tests/feature-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html.sub.headers b/tests/wpt/tests/feature-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html.sub.headers rename to tests/wpt/tests/feature-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html rename to tests/wpt/tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute.https.sub.html b/tests/wpt/tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute.https.sub.html rename to tests/wpt/tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/picture-in-picture-allowed-by-feature-policy.https.sub.html b/tests/wpt/tests/feature-policy/picture-in-picture-allowed-by-feature-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/picture-in-picture-allowed-by-feature-policy.https.sub.html rename to tests/wpt/tests/feature-policy/picture-in-picture-allowed-by-feature-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/picture-in-picture-allowed-by-feature-policy.https.sub.html.headers b/tests/wpt/tests/feature-policy/picture-in-picture-allowed-by-feature-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/picture-in-picture-allowed-by-feature-policy.https.sub.html.headers rename to tests/wpt/tests/feature-policy/picture-in-picture-allowed-by-feature-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/picture-in-picture-default-feature-policy.https.sub.html b/tests/wpt/tests/feature-policy/picture-in-picture-default-feature-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/picture-in-picture-default-feature-policy.https.sub.html rename to tests/wpt/tests/feature-policy/picture-in-picture-default-feature-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/picture-in-picture-disabled-by-feature-policy.https.sub.html b/tests/wpt/tests/feature-policy/picture-in-picture-disabled-by-feature-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/picture-in-picture-disabled-by-feature-policy.https.sub.html rename to tests/wpt/tests/feature-policy/picture-in-picture-disabled-by-feature-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/picture-in-picture-disabled-by-feature-policy.https.sub.html.headers b/tests/wpt/tests/feature-policy/picture-in-picture-disabled-by-feature-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/picture-in-picture-disabled-by-feature-policy.https.sub.html.headers rename to tests/wpt/tests/feature-policy/picture-in-picture-disabled-by-feature-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/picture-in-picture-supported-by-feature-policy.html b/tests/wpt/tests/feature-policy/picture-in-picture-supported-by-feature-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/picture-in-picture-supported-by-feature-policy.html rename to tests/wpt/tests/feature-policy/picture-in-picture-supported-by-feature-policy.html diff --git a/tests/wpt/web-platform-tests/feature-policy/policy-extends-to-sandbox.html b/tests/wpt/tests/feature-policy/policy-extends-to-sandbox.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/policy-extends-to-sandbox.html rename to tests/wpt/tests/feature-policy/policy-extends-to-sandbox.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/camera-reporting.https.html b/tests/wpt/tests/feature-policy/reporting/camera-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/camera-reporting.https.html rename to tests/wpt/tests/feature-policy/reporting/camera-reporting.https.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/camera-reporting.https.html.headers b/tests/wpt/tests/feature-policy/reporting/camera-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/camera-reporting.https.html.headers rename to tests/wpt/tests/feature-policy/reporting/camera-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/encrypted-media-reporting.https.html b/tests/wpt/tests/feature-policy/reporting/encrypted-media-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/encrypted-media-reporting.https.html rename to tests/wpt/tests/feature-policy/reporting/encrypted-media-reporting.https.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/encrypted-media-reporting.https.html.headers b/tests/wpt/tests/feature-policy/reporting/encrypted-media-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/encrypted-media-reporting.https.html.headers rename to tests/wpt/tests/feature-policy/reporting/encrypted-media-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/fullscreen-reporting.html b/tests/wpt/tests/feature-policy/reporting/fullscreen-reporting.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/fullscreen-reporting.html rename to tests/wpt/tests/feature-policy/reporting/fullscreen-reporting.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/fullscreen-reporting.html.headers b/tests/wpt/tests/feature-policy/reporting/fullscreen-reporting.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/fullscreen-reporting.html.headers rename to tests/wpt/tests/feature-policy/reporting/fullscreen-reporting.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/generic-sensor-reporting.https.html b/tests/wpt/tests/feature-policy/reporting/generic-sensor-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/generic-sensor-reporting.https.html rename to tests/wpt/tests/feature-policy/reporting/generic-sensor-reporting.https.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/generic-sensor-reporting.https.html.headers b/tests/wpt/tests/feature-policy/reporting/generic-sensor-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/generic-sensor-reporting.https.html.headers rename to tests/wpt/tests/feature-policy/reporting/generic-sensor-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/geolocation-reporting.https.html b/tests/wpt/tests/feature-policy/reporting/geolocation-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/geolocation-reporting.https.html rename to tests/wpt/tests/feature-policy/reporting/geolocation-reporting.https.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/geolocation-reporting.https.html.headers b/tests/wpt/tests/feature-policy/reporting/geolocation-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/geolocation-reporting.https.html.headers rename to tests/wpt/tests/feature-policy/reporting/geolocation-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/image.bmp b/tests/wpt/tests/feature-policy/reporting/image.bmp similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/image.bmp rename to tests/wpt/tests/feature-policy/reporting/image.bmp diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/microphone-reporting.https.html b/tests/wpt/tests/feature-policy/reporting/microphone-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/microphone-reporting.https.html rename to tests/wpt/tests/feature-policy/reporting/microphone-reporting.https.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/microphone-reporting.https.html.headers b/tests/wpt/tests/feature-policy/reporting/microphone-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/microphone-reporting.https.html.headers rename to tests/wpt/tests/feature-policy/reporting/microphone-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/midi-reporting.https.html b/tests/wpt/tests/feature-policy/reporting/midi-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/midi-reporting.https.html rename to tests/wpt/tests/feature-policy/reporting/midi-reporting.https.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/midi-reporting.https.html.headers b/tests/wpt/tests/feature-policy/reporting/midi-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/midi-reporting.https.html.headers rename to tests/wpt/tests/feature-policy/reporting/midi-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/payment-reporting.https.html b/tests/wpt/tests/feature-policy/reporting/payment-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/payment-reporting.https.html rename to tests/wpt/tests/feature-policy/reporting/payment-reporting.https.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/payment-reporting.https.html.headers b/tests/wpt/tests/feature-policy/reporting/payment-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/payment-reporting.https.html.headers rename to tests/wpt/tests/feature-policy/reporting/payment-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/picture-in-picture-reporting.html b/tests/wpt/tests/feature-policy/reporting/picture-in-picture-reporting.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/picture-in-picture-reporting.html rename to tests/wpt/tests/feature-policy/reporting/picture-in-picture-reporting.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/picture-in-picture-reporting.html.headers b/tests/wpt/tests/feature-policy/reporting/picture-in-picture-reporting.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/picture-in-picture-reporting.html.headers rename to tests/wpt/tests/feature-policy/reporting/picture-in-picture-reporting.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/serial-reporting.https.html b/tests/wpt/tests/feature-policy/reporting/serial-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/serial-reporting.https.html rename to tests/wpt/tests/feature-policy/reporting/serial-reporting.https.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/serial-reporting.https.html.headers b/tests/wpt/tests/feature-policy/reporting/serial-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/serial-reporting.https.html.headers rename to tests/wpt/tests/feature-policy/reporting/serial-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/sync-xhr-reporting.html b/tests/wpt/tests/feature-policy/reporting/sync-xhr-reporting.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/sync-xhr-reporting.html rename to tests/wpt/tests/feature-policy/reporting/sync-xhr-reporting.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/sync-xhr-reporting.html.headers b/tests/wpt/tests/feature-policy/reporting/sync-xhr-reporting.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/sync-xhr-reporting.html.headers rename to tests/wpt/tests/feature-policy/reporting/sync-xhr-reporting.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/usb-reporting.https.html b/tests/wpt/tests/feature-policy/reporting/usb-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/usb-reporting.https.html rename to tests/wpt/tests/feature-policy/reporting/usb-reporting.https.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/usb-reporting.https.html.headers b/tests/wpt/tests/feature-policy/reporting/usb-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/usb-reporting.https.html.headers rename to tests/wpt/tests/feature-policy/reporting/usb-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/vr-report-only.https.html b/tests/wpt/tests/feature-policy/reporting/vr-report-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/vr-report-only.https.html rename to tests/wpt/tests/feature-policy/reporting/vr-report-only.https.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/vr-report-only.https.html.headers b/tests/wpt/tests/feature-policy/reporting/vr-report-only.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/vr-report-only.https.html.headers rename to tests/wpt/tests/feature-policy/reporting/vr-report-only.https.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/vr-reporting.https.html b/tests/wpt/tests/feature-policy/reporting/vr-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/vr-reporting.https.html rename to tests/wpt/tests/feature-policy/reporting/vr-reporting.https.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/vr-reporting.https.html.headers b/tests/wpt/tests/feature-policy/reporting/vr-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/vr-reporting.https.html.headers rename to tests/wpt/tests/feature-policy/reporting/vr-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/xr-reporting.https.html b/tests/wpt/tests/feature-policy/reporting/xr-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/xr-reporting.https.html rename to tests/wpt/tests/feature-policy/reporting/xr-reporting.https.html diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/xr-reporting.https.html.headers b/tests/wpt/tests/feature-policy/reporting/xr-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/reporting/xr-reporting.https.html.headers rename to tests/wpt/tests/feature-policy/reporting/xr-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/autoplay.js b/tests/wpt/tests/feature-policy/resources/autoplay.js similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/autoplay.js rename to tests/wpt/tests/feature-policy/resources/autoplay.js diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-allowedfeatures.html b/tests/wpt/tests/feature-policy/resources/feature-policy-allowedfeatures.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-allowedfeatures.html rename to tests/wpt/tests/feature-policy/resources/feature-policy-allowedfeatures.html diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-autoplay.html b/tests/wpt/tests/feature-policy/resources/feature-policy-autoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-autoplay.html rename to tests/wpt/tests/feature-policy/resources/feature-policy-autoplay.html diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-clipboard-read.html b/tests/wpt/tests/feature-policy/resources/feature-policy-clipboard-read.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-clipboard-read.html rename to tests/wpt/tests/feature-policy/resources/feature-policy-clipboard-read.html diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-clipboard-write.html b/tests/wpt/tests/feature-policy/resources/feature-policy-clipboard-write.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-clipboard-write.html rename to tests/wpt/tests/feature-policy/resources/feature-policy-clipboard-write.html diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-generic-sensor.html b/tests/wpt/tests/feature-policy/resources/feature-policy-generic-sensor.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-generic-sensor.html rename to tests/wpt/tests/feature-policy/resources/feature-policy-generic-sensor.html diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-nested-subframe-policy.https.sub.html b/tests/wpt/tests/feature-policy/resources/feature-policy-nested-subframe-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-nested-subframe-policy.https.sub.html rename to tests/wpt/tests/feature-policy/resources/feature-policy-nested-subframe-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-payment.html b/tests/wpt/tests/feature-policy/resources/feature-policy-payment.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-payment.html rename to tests/wpt/tests/feature-policy/resources/feature-policy-payment.html diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-picture-in-picture.html b/tests/wpt/tests/feature-policy/resources/feature-policy-picture-in-picture.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-picture-in-picture.html rename to tests/wpt/tests/feature-policy/resources/feature-policy-picture-in-picture.html diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-report-json.js b/tests/wpt/tests/feature-policy/resources/feature-policy-report-json.js similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-report-json.js rename to tests/wpt/tests/feature-policy/resources/feature-policy-report-json.js diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-webvr.html b/tests/wpt/tests/feature-policy/resources/feature-policy-webvr.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/feature-policy-webvr.html rename to tests/wpt/tests/feature-policy/resources/feature-policy-webvr.html diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/featurepolicy.js b/tests/wpt/tests/feature-policy/resources/featurepolicy.js similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/featurepolicy.js rename to tests/wpt/tests/feature-policy/resources/featurepolicy.js diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/nested-sandbox.html b/tests/wpt/tests/feature-policy/resources/nested-sandbox.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/nested-sandbox.html rename to tests/wpt/tests/feature-policy/resources/nested-sandbox.html diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/picture-in-picture.js b/tests/wpt/tests/feature-policy/resources/picture-in-picture.js similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/picture-in-picture.js rename to tests/wpt/tests/feature-policy/resources/picture-in-picture.js diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/redirect-on-load.html b/tests/wpt/tests/feature-policy/resources/redirect-on-load.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/redirect-on-load.html rename to tests/wpt/tests/feature-policy/resources/redirect-on-load.html diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/sandbox-self.html b/tests/wpt/tests/feature-policy/resources/sandbox-self.html similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/sandbox-self.html rename to tests/wpt/tests/feature-policy/resources/sandbox-self.html diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/sandbox-self.html.headers b/tests/wpt/tests/feature-policy/resources/sandbox-self.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/feature-policy/resources/sandbox-self.html.headers rename to tests/wpt/tests/feature-policy/resources/sandbox-self.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/README.md b/tests/wpt/tests/fenced-frame/README.md similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/README.md rename to tests/wpt/tests/fenced-frame/README.md diff --git a/tests/wpt/web-platform-tests/fenced-frame/add-fencedframe-to-detached-iframe.https.html b/tests/wpt/tests/fenced-frame/add-fencedframe-to-detached-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/add-fencedframe-to-detached-iframe.https.html rename to tests/wpt/tests/fenced-frame/add-fencedframe-to-detached-iframe.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/ancestor-throttle.https.html b/tests/wpt/tests/fenced-frame/ancestor-throttle.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/ancestor-throttle.https.html rename to tests/wpt/tests/fenced-frame/ancestor-throttle.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/anchor-focus.https.html b/tests/wpt/tests/fenced-frame/anchor-focus.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/anchor-focus.https.html rename to tests/wpt/tests/fenced-frame/anchor-focus.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/autofocus-denied.https.html b/tests/wpt/tests/fenced-frame/autofocus-denied.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/autofocus-denied.https.html rename to tests/wpt/tests/fenced-frame/autofocus-denied.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/automatic-beacon-click-handler.https.html b/tests/wpt/tests/fenced-frame/automatic-beacon-click-handler.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/automatic-beacon-click-handler.https.html rename to tests/wpt/tests/fenced-frame/automatic-beacon-click-handler.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/background-fetch.https.html b/tests/wpt/tests/fenced-frame/background-fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/background-fetch.https.html rename to tests/wpt/tests/fenced-frame/background-fetch.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/background-sync.https.html b/tests/wpt/tests/fenced-frame/background-sync.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/background-sync.https.html rename to tests/wpt/tests/fenced-frame/background-sync.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/badging.https.html b/tests/wpt/tests/fenced-frame/badging.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/badging.https.html rename to tests/wpt/tests/fenced-frame/badging.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/battery_status.https.html b/tests/wpt/tests/fenced-frame/battery_status.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/battery_status.https.html rename to tests/wpt/tests/fenced-frame/battery_status.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/before-unload.https.html b/tests/wpt/tests/fenced-frame/before-unload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/before-unload.https.html rename to tests/wpt/tests/fenced-frame/before-unload.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/can-load-api.https.html b/tests/wpt/tests/fenced-frame/can-load-api.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/can-load-api.https.html rename to tests/wpt/tests/fenced-frame/can-load-api.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/change-src-attribute-after-config-installation-does-not-trigger-navigation.https.html b/tests/wpt/tests/fenced-frame/change-src-attribute-after-config-installation-does-not-trigger-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/change-src-attribute-after-config-installation-does-not-trigger-navigation.https.html rename to tests/wpt/tests/fenced-frame/change-src-attribute-after-config-installation-does-not-trigger-navigation.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/client-hints-meta.https.html b/tests/wpt/tests/fenced-frame/client-hints-meta.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/client-hints-meta.https.html rename to tests/wpt/tests/fenced-frame/client-hints-meta.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/client-hints.https.html b/tests/wpt/tests/fenced-frame/client-hints.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/client-hints.https.html rename to tests/wpt/tests/fenced-frame/client-hints.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/client-hints.https.html.headers b/tests/wpt/tests/fenced-frame/client-hints.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/client-hints.https.html.headers rename to tests/wpt/tests/fenced-frame/client-hints.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/compute-pressure.https.html b/tests/wpt/tests/fenced-frame/compute-pressure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/compute-pressure.https.html rename to tests/wpt/tests/fenced-frame/compute-pressure.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/config-cross-origin-apis.https.html b/tests/wpt/tests/fenced-frame/config-cross-origin-apis.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/config-cross-origin-apis.https.html rename to tests/wpt/tests/fenced-frame/config-cross-origin-apis.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/config-installation-triggers-navigation-of-navigated-fenced-frame.https.html b/tests/wpt/tests/fenced-frame/config-installation-triggers-navigation-of-navigated-fenced-frame.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/config-installation-triggers-navigation-of-navigated-fenced-frame.https.html rename to tests/wpt/tests/fenced-frame/config-installation-triggers-navigation-of-navigated-fenced-frame.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/config-installation-triggers-navigation.https.html b/tests/wpt/tests/fenced-frame/config-installation-triggers-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/config-installation-triggers-navigation.https.html rename to tests/wpt/tests/fenced-frame/config-installation-triggers-navigation.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/config-with-empty-url-installation-unloads-navigated-fenced-frame.https.html b/tests/wpt/tests/fenced-frame/config-with-empty-url-installation-unloads-navigated-fenced-frame.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/config-with-empty-url-installation-unloads-navigated-fenced-frame.https.html rename to tests/wpt/tests/fenced-frame/config-with-empty-url-installation-unloads-navigated-fenced-frame.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/consume-user-activation.https.html b/tests/wpt/tests/fenced-frame/consume-user-activation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/consume-user-activation.https.html rename to tests/wpt/tests/fenced-frame/consume-user-activation.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/content-index.https.html b/tests/wpt/tests/fenced-frame/content-index.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/content-index.https.html rename to tests/wpt/tests/fenced-frame/content-index.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/coop-bcg-swap.https.html b/tests/wpt/tests/fenced-frame/coop-bcg-swap.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/coop-bcg-swap.https.html rename to tests/wpt/tests/fenced-frame/coop-bcg-swap.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/create-credential.https.html b/tests/wpt/tests/fenced-frame/create-credential.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/create-credential.https.html rename to tests/wpt/tests/fenced-frame/create-credential.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/create-in-sandbox-and-adopt-outside-sandbox.https.html b/tests/wpt/tests/fenced-frame/create-in-sandbox-and-adopt-outside-sandbox.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/create-in-sandbox-and-adopt-outside-sandbox.https.html rename to tests/wpt/tests/fenced-frame/create-in-sandbox-and-adopt-outside-sandbox.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/csp-allowed.https.html b/tests/wpt/tests/fenced-frame/csp-allowed.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/csp-allowed.https.html rename to tests/wpt/tests/fenced-frame/csp-allowed.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/csp-blocked.https.html b/tests/wpt/tests/fenced-frame/csp-blocked.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/csp-blocked.https.html rename to tests/wpt/tests/fenced-frame/csp-blocked.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/csp-fenced-frame-src-allowed.https.html b/tests/wpt/tests/fenced-frame/csp-fenced-frame-src-allowed.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/csp-fenced-frame-src-allowed.https.html rename to tests/wpt/tests/fenced-frame/csp-fenced-frame-src-allowed.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/csp-fenced-frame-src-blocked.https.html b/tests/wpt/tests/fenced-frame/csp-fenced-frame-src-blocked.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/csp-fenced-frame-src-blocked.https.html rename to tests/wpt/tests/fenced-frame/csp-fenced-frame-src-blocked.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/csp-frame-src-allowed.https.html b/tests/wpt/tests/fenced-frame/csp-frame-src-allowed.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/csp-frame-src-allowed.https.html rename to tests/wpt/tests/fenced-frame/csp-frame-src-allowed.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/csp-frame-src-blocked.https.html b/tests/wpt/tests/fenced-frame/csp-frame-src-blocked.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/csp-frame-src-blocked.https.html rename to tests/wpt/tests/fenced-frame/csp-frame-src-blocked.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/csp-transparent-url.https.html b/tests/wpt/tests/fenced-frame/csp-transparent-url.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/csp-transparent-url.https.html rename to tests/wpt/tests/fenced-frame/csp-transparent-url.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/csp.https.html b/tests/wpt/tests/fenced-frame/csp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/csp.https.html rename to tests/wpt/tests/fenced-frame/csp.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/cspee.https.html b/tests/wpt/tests/fenced-frame/cspee.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/cspee.https.html rename to tests/wpt/tests/fenced-frame/cspee.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-allow-all.https.html b/tests/wpt/tests/fenced-frame/default-enabled-features-allow-all.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-allow-all.https.html rename to tests/wpt/tests/fenced-frame/default-enabled-features-allow-all.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-allow-all.https.html.headers b/tests/wpt/tests/fenced-frame/default-enabled-features-allow-all.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-allow-all.https.html.headers rename to tests/wpt/tests/fenced-frame/default-enabled-features-allow-all.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-allow-none.https.html b/tests/wpt/tests/fenced-frame/default-enabled-features-allow-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-allow-none.https.html rename to tests/wpt/tests/fenced-frame/default-enabled-features-allow-none.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-allow-none.https.html.headers b/tests/wpt/tests/fenced-frame/default-enabled-features-allow-none.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-allow-none.https.html.headers rename to tests/wpt/tests/fenced-frame/default-enabled-features-allow-none.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-allow-self.https.html b/tests/wpt/tests/fenced-frame/default-enabled-features-allow-self.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-allow-self.https.html rename to tests/wpt/tests/fenced-frame/default-enabled-features-allow-self.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-allow-self.https.html.headers b/tests/wpt/tests/fenced-frame/default-enabled-features-allow-self.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-allow-self.https.html.headers rename to tests/wpt/tests/fenced-frame/default-enabled-features-allow-self.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-attribute-allow.https.html b/tests/wpt/tests/fenced-frame/default-enabled-features-attribute-allow.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-attribute-allow.https.html rename to tests/wpt/tests/fenced-frame/default-enabled-features-attribute-allow.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-attribute-change.https.html b/tests/wpt/tests/fenced-frame/default-enabled-features-attribute-change.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-attribute-change.https.html rename to tests/wpt/tests/fenced-frame/default-enabled-features-attribute-change.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-attribute-disallow.https.html b/tests/wpt/tests/fenced-frame/default-enabled-features-attribute-disallow.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-attribute-disallow.https.html rename to tests/wpt/tests/fenced-frame/default-enabled-features-attribute-disallow.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-attribution-disabled.https.html b/tests/wpt/tests/fenced-frame/default-enabled-features-attribution-disabled.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-attribution-disabled.https.html rename to tests/wpt/tests/fenced-frame/default-enabled-features-attribution-disabled.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-attribution-disabled.https.html.headers b/tests/wpt/tests/fenced-frame/default-enabled-features-attribution-disabled.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-attribution-disabled.https.html.headers rename to tests/wpt/tests/fenced-frame/default-enabled-features-attribution-disabled.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-subframe.https.html b/tests/wpt/tests/fenced-frame/default-enabled-features-subframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-subframe.https.html rename to tests/wpt/tests/fenced-frame/default-enabled-features-subframe.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-unset.https.html b/tests/wpt/tests/fenced-frame/default-enabled-features-unset.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-unset.https.html rename to tests/wpt/tests/fenced-frame/default-enabled-features-unset.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-unset.https.html.headers b/tests/wpt/tests/fenced-frame/default-enabled-features-unset.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/default-enabled-features-unset.https.html.headers rename to tests/wpt/tests/fenced-frame/default-enabled-features-unset.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/deprecated-config-apis.https.html b/tests/wpt/tests/fenced-frame/deprecated-config-apis.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/deprecated-config-apis.https.html rename to tests/wpt/tests/fenced-frame/deprecated-config-apis.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/disallowed-navigation-to-blob.https.html b/tests/wpt/tests/fenced-frame/disallowed-navigation-to-blob.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/disallowed-navigation-to-blob.https.html rename to tests/wpt/tests/fenced-frame/disallowed-navigation-to-blob.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/disallowed-navigation-to-data.https.html b/tests/wpt/tests/fenced-frame/disallowed-navigation-to-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/disallowed-navigation-to-data.https.html rename to tests/wpt/tests/fenced-frame/disallowed-navigation-to-data.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/disallowed-navigation-to-http.https.html b/tests/wpt/tests/fenced-frame/disallowed-navigation-to-http.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/disallowed-navigation-to-http.https.html rename to tests/wpt/tests/fenced-frame/disallowed-navigation-to-http.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/disallowed-navigations-dangling-markup-urn.https.html b/tests/wpt/tests/fenced-frame/disallowed-navigations-dangling-markup-urn.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/disallowed-navigations-dangling-markup-urn.https.html rename to tests/wpt/tests/fenced-frame/disallowed-navigations-dangling-markup-urn.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/disallowed-navigations-dangling-markup.https.html b/tests/wpt/tests/fenced-frame/disallowed-navigations-dangling-markup.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/disallowed-navigations-dangling-markup.https.html rename to tests/wpt/tests/fenced-frame/disallowed-navigations-dangling-markup.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/disallowed-navigations.https.html b/tests/wpt/tests/fenced-frame/disallowed-navigations.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/disallowed-navigations.https.html rename to tests/wpt/tests/fenced-frame/disallowed-navigations.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/document-picture-in-picture-denied.https.html b/tests/wpt/tests/fenced-frame/document-picture-in-picture-denied.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/document-picture-in-picture-denied.https.html rename to tests/wpt/tests/fenced-frame/document-picture-in-picture-denied.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/document-referrer.https.html b/tests/wpt/tests/fenced-frame/document-referrer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/document-referrer.https.html rename to tests/wpt/tests/fenced-frame/document-referrer.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/download.https.html b/tests/wpt/tests/fenced-frame/download.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/download.https.html rename to tests/wpt/tests/fenced-frame/download.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/embedder-coop-coep-blocked.https.html b/tests/wpt/tests/fenced-frame/embedder-coop-coep-blocked.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/embedder-coop-coep-blocked.https.html rename to tests/wpt/tests/fenced-frame/embedder-coop-coep-blocked.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/embedder-coop-coep-blocked.https.html.headers b/tests/wpt/tests/fenced-frame/embedder-coop-coep-blocked.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/embedder-coop-coep-blocked.https.html.headers rename to tests/wpt/tests/fenced-frame/embedder-coop-coep-blocked.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/embedder-csp-not-propagate.https.html b/tests/wpt/tests/fenced-frame/embedder-csp-not-propagate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/embedder-csp-not-propagate.https.html rename to tests/wpt/tests/fenced-frame/embedder-csp-not-propagate.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/embedder-no-coep.https.html b/tests/wpt/tests/fenced-frame/embedder-no-coep.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/embedder-no-coep.https.html rename to tests/wpt/tests/fenced-frame/embedder-no-coep.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/embedder-require-corp.https.html b/tests/wpt/tests/fenced-frame/embedder-require-corp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/embedder-require-corp.https.html rename to tests/wpt/tests/fenced-frame/embedder-require-corp.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/embedder-require-corp.https.html.headers b/tests/wpt/tests/fenced-frame/embedder-require-corp.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/embedder-require-corp.https.html.headers rename to tests/wpt/tests/fenced-frame/embedder-require-corp.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/fedcm-get-credential.https.html b/tests/wpt/tests/fenced-frame/fedcm-get-credential.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/fedcm-get-credential.https.html rename to tests/wpt/tests/fenced-frame/fedcm-get-credential.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/fence-api.https.html b/tests/wpt/tests/fenced-frame/fence-api.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/fence-api.https.html rename to tests/wpt/tests/fenced-frame/fence-api.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/fence-report-event.https.html b/tests/wpt/tests/fenced-frame/fence-report-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/fence-report-event.https.html rename to tests/wpt/tests/fenced-frame/fence-report-event.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/fence-urn-iframes.https.html b/tests/wpt/tests/fenced-frame/fence-urn-iframes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/fence-urn-iframes.https.html rename to tests/wpt/tests/fenced-frame/fence-urn-iframes.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/fledge-container-size-mutation-observer.https.html b/tests/wpt/tests/fenced-frame/fledge-container-size-mutation-observer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/fledge-container-size-mutation-observer.https.html rename to tests/wpt/tests/fenced-frame/fledge-container-size-mutation-observer.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/fledge-container-size.https.html b/tests/wpt/tests/fenced-frame/fledge-container-size.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/fledge-container-size.https.html rename to tests/wpt/tests/fenced-frame/fledge-container-size.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/fragment-navigation.https.html b/tests/wpt/tests/fenced-frame/fragment-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/fragment-navigation.https.html rename to tests/wpt/tests/fenced-frame/fragment-navigation.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/frame-navigation.https.html b/tests/wpt/tests/fenced-frame/frame-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/frame-navigation.https.html rename to tests/wpt/tests/fenced-frame/frame-navigation.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/gamepad.https.html b/tests/wpt/tests/fenced-frame/gamepad.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/gamepad.https.html rename to tests/wpt/tests/fenced-frame/gamepad.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/get-mode-in-nested-frame.https.html b/tests/wpt/tests/fenced-frame/get-mode-in-nested-frame.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/get-mode-in-nested-frame.https.html rename to tests/wpt/tests/fenced-frame/get-mode-in-nested-frame.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/get-nested-configs.https.html b/tests/wpt/tests/fenced-frame/get-nested-configs.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/get-nested-configs.https.html rename to tests/wpt/tests/fenced-frame/get-nested-configs.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/header-referrer.https.html b/tests/wpt/tests/fenced-frame/header-referrer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/header-referrer.https.html rename to tests/wpt/tests/fenced-frame/header-referrer.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/header-secFetchDest.https.html b/tests/wpt/tests/fenced-frame/header-secFetchDest.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/header-secFetchDest.https.html rename to tests/wpt/tests/fenced-frame/header-secFetchDest.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/hid.https.html b/tests/wpt/tests/fenced-frame/hid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/hid.https.html rename to tests/wpt/tests/fenced-frame/hid.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/history-back-and-forward-should-not-work-in-fenced-tree.https.html b/tests/wpt/tests/fenced-frame/history-back-and-forward-should-not-work-in-fenced-tree.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/history-back-and-forward-should-not-work-in-fenced-tree.https.html rename to tests/wpt/tests/fenced-frame/history-back-and-forward-should-not-work-in-fenced-tree.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/history-length-fenced-navigations-replace-do-not-contribute-to-joint.https.html b/tests/wpt/tests/fenced-frame/history-length-fenced-navigations-replace-do-not-contribute-to-joint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/history-length-fenced-navigations-replace-do-not-contribute-to-joint.https.html rename to tests/wpt/tests/fenced-frame/history-length-fenced-navigations-replace-do-not-contribute-to-joint.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/history-length-outer-page-navigation-not-reflected-in-fenced.https.html b/tests/wpt/tests/fenced-frame/history-length-outer-page-navigation-not-reflected-in-fenced.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/history-length-outer-page-navigation-not-reflected-in-fenced.https.html rename to tests/wpt/tests/fenced-frame/history-length-outer-page-navigation-not-reflected-in-fenced.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/ignore-child-fenced-frame-onload-event.https.html b/tests/wpt/tests/fenced-frame/ignore-child-fenced-frame-onload-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/ignore-child-fenced-frame-onload-event.https.html rename to tests/wpt/tests/fenced-frame/ignore-child-fenced-frame-onload-event.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/insecure-context.html b/tests/wpt/tests/fenced-frame/insecure-context.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/insecure-context.html rename to tests/wpt/tests/fenced-frame/insecure-context.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/intersection-observer.https.html b/tests/wpt/tests/fenced-frame/intersection-observer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/intersection-observer.https.html rename to tests/wpt/tests/fenced-frame/intersection-observer.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/invalid-url.https.html b/tests/wpt/tests/fenced-frame/invalid-url.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/invalid-url.https.html rename to tests/wpt/tests/fenced-frame/invalid-url.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/key-scrolling.https.html b/tests/wpt/tests/fenced-frame/key-scrolling.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/key-scrolling.https.html rename to tests/wpt/tests/fenced-frame/key-scrolling.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/key-value-store.https.html b/tests/wpt/tests/fenced-frame/key-value-store.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/key-value-store.https.html rename to tests/wpt/tests/fenced-frame/key-value-store.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/load-ad-with-size.https.html b/tests/wpt/tests/fenced-frame/load-ad-with-size.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/load-ad-with-size.https.html rename to tests/wpt/tests/fenced-frame/load-ad-with-size.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/loading.https.html b/tests/wpt/tests/fenced-frame/loading.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/loading.https.html rename to tests/wpt/tests/fenced-frame/loading.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/location-ancestorOrigins.https.html b/tests/wpt/tests/fenced-frame/location-ancestorOrigins.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/location-ancestorOrigins.https.html rename to tests/wpt/tests/fenced-frame/location-ancestorOrigins.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/mediaDevices-setCaptureHandle.https.html b/tests/wpt/tests/fenced-frame/mediaDevices-setCaptureHandle.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/mediaDevices-setCaptureHandle.https.html rename to tests/wpt/tests/fenced-frame/mediaDevices-setCaptureHandle.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/navigate-ancestor-by-name.https.html b/tests/wpt/tests/fenced-frame/navigate-ancestor-by-name.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/navigate-ancestor-by-name.https.html rename to tests/wpt/tests/fenced-frame/navigate-ancestor-by-name.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/navigate-ancestor-nested-fenced-frame.https.html b/tests/wpt/tests/fenced-frame/navigate-ancestor-nested-fenced-frame.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/navigate-ancestor-nested-fenced-frame.https.html rename to tests/wpt/tests/fenced-frame/navigate-ancestor-nested-fenced-frame.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/navigate-ancestor-nested-iframe.https.html b/tests/wpt/tests/fenced-frame/navigate-ancestor-nested-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/navigate-ancestor-nested-iframe.https.html rename to tests/wpt/tests/fenced-frame/navigate-ancestor-nested-iframe.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/navigate-ancestor-top-level-fenced-frame.https.html b/tests/wpt/tests/fenced-frame/navigate-ancestor-top-level-fenced-frame.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/navigate-ancestor-top-level-fenced-frame.https.html rename to tests/wpt/tests/fenced-frame/navigate-ancestor-top-level-fenced-frame.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/navigate-by-name-succeed.https.html b/tests/wpt/tests/fenced-frame/navigate-by-name-succeed.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/navigate-by-name-succeed.https.html rename to tests/wpt/tests/fenced-frame/navigate-by-name-succeed.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/navigate-descendant-by-name.https.html b/tests/wpt/tests/fenced-frame/navigate-descendant-by-name.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/navigate-descendant-by-name.https.html rename to tests/wpt/tests/fenced-frame/navigate-descendant-by-name.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/navigate-related-page-by-name.https.html b/tests/wpt/tests/fenced-frame/navigate-related-page-by-name.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/navigate-related-page-by-name.https.html rename to tests/wpt/tests/fenced-frame/navigate-related-page-by-name.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/navigator-keyboard-layout-map.https.html b/tests/wpt/tests/fenced-frame/navigator-keyboard-layout-map.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/navigator-keyboard-layout-map.https.html rename to tests/wpt/tests/fenced-frame/navigator-keyboard-layout-map.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/navigator-keyboard-lock.https.html b/tests/wpt/tests/fenced-frame/navigator-keyboard-lock.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/navigator-keyboard-lock.https.html rename to tests/wpt/tests/fenced-frame/navigator-keyboard-lock.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/navigator-subapp.https.html b/tests/wpt/tests/fenced-frame/navigator-subapp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/navigator-subapp.https.html rename to tests/wpt/tests/fenced-frame/navigator-subapp.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/navigator-vibrate.https.html b/tests/wpt/tests/fenced-frame/navigator-vibrate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/navigator-vibrate.https.html rename to tests/wpt/tests/fenced-frame/navigator-vibrate.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/navigator-virtualkeyboard.https.html b/tests/wpt/tests/fenced-frame/navigator-virtualkeyboard.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/navigator-virtualkeyboard.https.html rename to tests/wpt/tests/fenced-frame/navigator-virtualkeyboard.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/nested-opaque-ad-sizes.https.html b/tests/wpt/tests/fenced-frame/nested-opaque-ad-sizes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/nested-opaque-ad-sizes.https.html rename to tests/wpt/tests/fenced-frame/nested-opaque-ad-sizes.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/notification.https.html b/tests/wpt/tests/fenced-frame/notification.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/notification.https.html rename to tests/wpt/tests/fenced-frame/notification.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/opaque-ad-sizes-exact-size.https.html b/tests/wpt/tests/fenced-frame/opaque-ad-sizes-exact-size.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/opaque-ad-sizes-exact-size.https.html rename to tests/wpt/tests/fenced-frame/opaque-ad-sizes-exact-size.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/opaque-ad-sizes-special-cases.https.html b/tests/wpt/tests/fenced-frame/opaque-ad-sizes-special-cases.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/opaque-ad-sizes-special-cases.https.html rename to tests/wpt/tests/fenced-frame/opaque-ad-sizes-special-cases.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/payment-handler.https.html b/tests/wpt/tests/fenced-frame/payment-handler.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/payment-handler.https.html rename to tests/wpt/tests/fenced-frame/payment-handler.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/payment-request.https.html b/tests/wpt/tests/fenced-frame/payment-request.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/payment-request.https.html rename to tests/wpt/tests/fenced-frame/payment-request.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/permission-api-denied-non-standard.https.html b/tests/wpt/tests/fenced-frame/permission-api-denied-non-standard.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/permission-api-denied-non-standard.https.html rename to tests/wpt/tests/fenced-frame/permission-api-denied-non-standard.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/permission-api-denied.https.html b/tests/wpt/tests/fenced-frame/permission-api-denied.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/permission-api-denied.https.html rename to tests/wpt/tests/fenced-frame/permission-api-denied.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/permission-geolocation.https.html b/tests/wpt/tests/fenced-frame/permission-geolocation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/permission-geolocation.https.html rename to tests/wpt/tests/fenced-frame/permission-geolocation.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/permission-notification.https.html b/tests/wpt/tests/fenced-frame/permission-notification.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/permission-notification.https.html rename to tests/wpt/tests/fenced-frame/permission-notification.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/picture-in-picture.https.html b/tests/wpt/tests/fenced-frame/picture-in-picture.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/picture-in-picture.https.html rename to tests/wpt/tests/fenced-frame/picture-in-picture.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/popup-noopener.https.html b/tests/wpt/tests/fenced-frame/popup-noopener.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/popup-noopener.https.html rename to tests/wpt/tests/fenced-frame/popup-noopener.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/prerender.https.html b/tests/wpt/tests/fenced-frame/prerender.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/prerender.https.html rename to tests/wpt/tests/fenced-frame/prerender.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/presentation-receiver.https.html b/tests/wpt/tests/fenced-frame/presentation-receiver.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/presentation-receiver.https.html rename to tests/wpt/tests/fenced-frame/presentation-receiver.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/reinsert.https.html b/tests/wpt/tests/fenced-frame/reinsert.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/reinsert.https.html rename to tests/wpt/tests/fenced-frame/reinsert.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/report-event-inactive-document.https.html b/tests/wpt/tests/fenced-frame/report-event-inactive-document.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/report-event-inactive-document.https.html rename to tests/wpt/tests/fenced-frame/report-event-inactive-document.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resize-lock-input.https.html b/tests/wpt/tests/fenced-frame/resize-lock-input.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resize-lock-input.https.html rename to tests/wpt/tests/fenced-frame/resize-lock-input.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resize-lock-zoom.https.html b/tests/wpt/tests/fenced-frame/resize-lock-zoom.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resize-lock-zoom.https.html rename to tests/wpt/tests/fenced-frame/resize-lock-zoom.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resize-lock.https.html b/tests/wpt/tests/fenced-frame/resize-lock.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resize-lock.https.html rename to tests/wpt/tests/fenced-frame/resize-lock.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resolve-to-config-promise.https.html b/tests/wpt/tests/fenced-frame/resolve-to-config-promise.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resolve-to-config-promise.https.html rename to tests/wpt/tests/fenced-frame/resolve-to-config-promise.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-iframe-csp.https.html b/tests/wpt/tests/fenced-frame/resources/ancestor-throttle-iframe-csp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-iframe-csp.https.html rename to tests/wpt/tests/fenced-frame/resources/ancestor-throttle-iframe-csp.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-iframe-csp.https.html.headers b/tests/wpt/tests/fenced-frame/resources/ancestor-throttle-iframe-csp.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-iframe-csp.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/ancestor-throttle-iframe-csp.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-iframe-xfo.https.html b/tests/wpt/tests/fenced-frame/resources/ancestor-throttle-iframe-xfo.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-iframe-xfo.https.html rename to tests/wpt/tests/fenced-frame/resources/ancestor-throttle-iframe-xfo.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-iframe-xfo.https.html.headers b/tests/wpt/tests/fenced-frame/resources/ancestor-throttle-iframe-xfo.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-iframe-xfo.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/ancestor-throttle-iframe-xfo.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-inner.https.html b/tests/wpt/tests/fenced-frame/resources/ancestor-throttle-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-inner.https.html rename to tests/wpt/tests/fenced-frame/resources/ancestor-throttle-inner.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-inner.https.html.headers b/tests/wpt/tests/fenced-frame/resources/ancestor-throttle-inner.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-inner.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/ancestor-throttle-inner.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-nested.https.html b/tests/wpt/tests/fenced-frame/resources/ancestor-throttle-nested.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-nested.https.html rename to tests/wpt/tests/fenced-frame/resources/ancestor-throttle-nested.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-nested.https.html.headers b/tests/wpt/tests/fenced-frame/resources/ancestor-throttle-nested.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/ancestor-throttle-nested.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/ancestor-throttle-nested.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/automatic-beacon-store.py b/tests/wpt/tests/fenced-frame/resources/automatic-beacon-store.py similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/automatic-beacon-store.py rename to tests/wpt/tests/fenced-frame/resources/automatic-beacon-store.py diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/background-fetch-inner.https.html b/tests/wpt/tests/fenced-frame/resources/background-fetch-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/background-fetch-inner.https.html rename to tests/wpt/tests/fenced-frame/resources/background-fetch-inner.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/background-fetch-inner.https.html.headers b/tests/wpt/tests/fenced-frame/resources/background-fetch-inner.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/background-fetch-inner.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/background-fetch-inner.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/background-fetch-sw-inner.https.html b/tests/wpt/tests/fenced-frame/resources/background-fetch-sw-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/background-fetch-sw-inner.https.html rename to tests/wpt/tests/fenced-frame/resources/background-fetch-sw-inner.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/background-fetch-sw-inner.https.html.headers b/tests/wpt/tests/fenced-frame/resources/background-fetch-sw-inner.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/background-fetch-sw-inner.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/background-fetch-sw-inner.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/background-fetch-sw.js b/tests/wpt/tests/fenced-frame/resources/background-fetch-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/background-fetch-sw.js rename to tests/wpt/tests/fenced-frame/resources/background-fetch-sw.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/background-sync-helper.js b/tests/wpt/tests/fenced-frame/resources/background-sync-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/background-sync-helper.js rename to tests/wpt/tests/fenced-frame/resources/background-sync-helper.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/background-sync-inner.https.html b/tests/wpt/tests/fenced-frame/resources/background-sync-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/background-sync-inner.https.html rename to tests/wpt/tests/fenced-frame/resources/background-sync-inner.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/background-sync-inner.https.html.headers b/tests/wpt/tests/fenced-frame/resources/background-sync-inner.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/background-sync-inner.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/background-sync-inner.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/background-sync-sw-inner.https.html b/tests/wpt/tests/fenced-frame/resources/background-sync-sw-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/background-sync-sw-inner.https.html rename to tests/wpt/tests/fenced-frame/resources/background-sync-sw-inner.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/background-sync-sw-inner.https.html.headers b/tests/wpt/tests/fenced-frame/resources/background-sync-sw-inner.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/background-sync-sw-inner.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/background-sync-sw-inner.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/background-sync-sw.js b/tests/wpt/tests/fenced-frame/resources/background-sync-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/background-sync-sw.js rename to tests/wpt/tests/fenced-frame/resources/background-sync-sw.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/badging-sw.js b/tests/wpt/tests/fenced-frame/resources/badging-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/badging-sw.js rename to tests/wpt/tests/fenced-frame/resources/badging-sw.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/before-unload-inner.html b/tests/wpt/tests/fenced-frame/resources/before-unload-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/before-unload-inner.html rename to tests/wpt/tests/fenced-frame/resources/before-unload-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/before-unload-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/before-unload-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/before-unload-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/before-unload-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/check-header-referrer.py b/tests/wpt/tests/fenced-frame/resources/check-header-referrer.py similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/check-header-referrer.py rename to tests/wpt/tests/fenced-frame/resources/check-header-referrer.py diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/check-header-sec-fetch-dest.py b/tests/wpt/tests/fenced-frame/resources/check-header-sec-fetch-dest.py similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/check-header-sec-fetch-dest.py rename to tests/wpt/tests/fenced-frame/resources/check-header-sec-fetch-dest.py diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-iframe-inner.sub.https.html b/tests/wpt/tests/fenced-frame/resources/client-hints-iframe-inner.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-iframe-inner.sub.https.html rename to tests/wpt/tests/fenced-frame/resources/client-hints-iframe-inner.sub.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-iframe-inner.sub.https.html.headers b/tests/wpt/tests/fenced-frame/resources/client-hints-iframe-inner.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-iframe-inner.sub.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/client-hints-iframe-inner.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-inner.sub.https.html b/tests/wpt/tests/fenced-frame/resources/client-hints-inner.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-inner.sub.https.html rename to tests/wpt/tests/fenced-frame/resources/client-hints-inner.sub.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-inner.sub.https.html.headers b/tests/wpt/tests/fenced-frame/resources/client-hints-inner.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-inner.sub.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/client-hints-inner.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-meta-iframe-inner.sub.https.html b/tests/wpt/tests/fenced-frame/resources/client-hints-meta-iframe-inner.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-meta-iframe-inner.sub.https.html rename to tests/wpt/tests/fenced-frame/resources/client-hints-meta-iframe-inner.sub.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-meta-iframe-inner.sub.https.html.headers b/tests/wpt/tests/fenced-frame/resources/client-hints-meta-iframe-inner.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-meta-iframe-inner.sub.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/client-hints-meta-iframe-inner.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-meta-inner.sub.https.html b/tests/wpt/tests/fenced-frame/resources/client-hints-meta-inner.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-meta-inner.sub.https.html rename to tests/wpt/tests/fenced-frame/resources/client-hints-meta-inner.sub.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-meta-inner.sub.https.html.headers b/tests/wpt/tests/fenced-frame/resources/client-hints-meta-inner.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/client-hints-meta-inner.sub.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/client-hints-meta-inner.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/config-cross-origin-apis-inner.https.html b/tests/wpt/tests/fenced-frame/resources/config-cross-origin-apis-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/config-cross-origin-apis-inner.https.html rename to tests/wpt/tests/fenced-frame/resources/config-cross-origin-apis-inner.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/config-cross-origin-apis-inner.https.html.headers b/tests/wpt/tests/fenced-frame/resources/config-cross-origin-apis-inner.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/config-cross-origin-apis-inner.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/config-cross-origin-apis-inner.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/config-cross-origin-iframe.https.html b/tests/wpt/tests/fenced-frame/resources/config-cross-origin-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/config-cross-origin-iframe.https.html rename to tests/wpt/tests/fenced-frame/resources/config-cross-origin-iframe.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/config-cross-origin-iframe.https.html.headers b/tests/wpt/tests/fenced-frame/resources/config-cross-origin-iframe.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/config-cross-origin-iframe.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/config-cross-origin-iframe.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/config-embed-cross-origin-iframe.https.html b/tests/wpt/tests/fenced-frame/resources/config-embed-cross-origin-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/config-embed-cross-origin-iframe.https.html rename to tests/wpt/tests/fenced-frame/resources/config-embed-cross-origin-iframe.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/config-embed-cross-origin-iframe.https.html.headers b/tests/wpt/tests/fenced-frame/resources/config-embed-cross-origin-iframe.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/config-embed-cross-origin-iframe.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/config-embed-cross-origin-iframe.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/content-index-sw.js b/tests/wpt/tests/fenced-frame/resources/content-index-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/content-index-sw.js rename to tests/wpt/tests/fenced-frame/resources/content-index-sw.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/cookie-access.https.html b/tests/wpt/tests/fenced-frame/resources/cookie-access.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/cookie-access.https.html rename to tests/wpt/tests/fenced-frame/resources/cookie-access.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/cookie-access.https.html.headers b/tests/wpt/tests/fenced-frame/resources/cookie-access.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/cookie-access.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/cookie-access.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/create-credential-inner.https.html b/tests/wpt/tests/fenced-frame/resources/create-credential-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/create-credential-inner.https.html rename to tests/wpt/tests/fenced-frame/resources/create-credential-inner.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/create-credential-inner.https.html.headers b/tests/wpt/tests/fenced-frame/resources/create-credential-inner.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/create-credential-inner.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/create-credential-inner.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/create-popup.html b/tests/wpt/tests/fenced-frame/resources/create-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/create-popup.html rename to tests/wpt/tests/fenced-frame/resources/create-popup.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/create-popup.html.headers b/tests/wpt/tests/fenced-frame/resources/create-popup.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/create-popup.html.headers rename to tests/wpt/tests/fenced-frame/resources/create-popup.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/csp-fenced-frame-src-allowed-inner.html b/tests/wpt/tests/fenced-frame/resources/csp-fenced-frame-src-allowed-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/csp-fenced-frame-src-allowed-inner.html rename to tests/wpt/tests/fenced-frame/resources/csp-fenced-frame-src-allowed-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/csp-fenced-frame-src-allowed-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/csp-fenced-frame-src-allowed-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/csp-fenced-frame-src-allowed-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/csp-fenced-frame-src-allowed-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/csp-fenced-frame-src-blocked-inner.html b/tests/wpt/tests/fenced-frame/resources/csp-fenced-frame-src-blocked-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/csp-fenced-frame-src-blocked-inner.html rename to tests/wpt/tests/fenced-frame/resources/csp-fenced-frame-src-blocked-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/csp-fenced-frame-src-blocked-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/csp-fenced-frame-src-blocked-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/csp-fenced-frame-src-blocked-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/csp-fenced-frame-src-blocked-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/csp-frame-src-allowed-inner.html b/tests/wpt/tests/fenced-frame/resources/csp-frame-src-allowed-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/csp-frame-src-allowed-inner.html rename to tests/wpt/tests/fenced-frame/resources/csp-frame-src-allowed-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/csp-frame-src-allowed-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/csp-frame-src-allowed-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/csp-frame-src-allowed-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/csp-frame-src-allowed-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/csp-frame-src-blocked-inner.html b/tests/wpt/tests/fenced-frame/resources/csp-frame-src-blocked-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/csp-frame-src-blocked-inner.html rename to tests/wpt/tests/fenced-frame/resources/csp-frame-src-blocked-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/csp-frame-src-blocked-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/csp-frame-src-blocked-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/csp-frame-src-blocked-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/csp-frame-src-blocked-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/csp-inner.html b/tests/wpt/tests/fenced-frame/resources/csp-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/csp-inner.html rename to tests/wpt/tests/fenced-frame/resources/csp-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/csp-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/csp-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/csp-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/csp-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/csp.png b/tests/wpt/tests/fenced-frame/resources/csp.png similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/csp.png rename to tests/wpt/tests/fenced-frame/resources/csp.png diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/dangling-markup-helper.js b/tests/wpt/tests/fenced-frame/resources/dangling-markup-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/dangling-markup-helper.js rename to tests/wpt/tests/fenced-frame/resources/dangling-markup-helper.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/default-enabled-features-helper.js b/tests/wpt/tests/fenced-frame/resources/default-enabled-features-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/default-enabled-features-helper.js rename to tests/wpt/tests/fenced-frame/resources/default-enabled-features-helper.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/default-enabled-features-navigate.https.html b/tests/wpt/tests/fenced-frame/resources/default-enabled-features-navigate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/default-enabled-features-navigate.https.html rename to tests/wpt/tests/fenced-frame/resources/default-enabled-features-navigate.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/default-enabled-features-navigate.https.html.headers b/tests/wpt/tests/fenced-frame/resources/default-enabled-features-navigate.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/default-enabled-features-navigate.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/default-enabled-features-navigate.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/default-enabled-features-subframe-fencedframe.https.html b/tests/wpt/tests/fenced-frame/resources/default-enabled-features-subframe-fencedframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/default-enabled-features-subframe-fencedframe.https.html rename to tests/wpt/tests/fenced-frame/resources/default-enabled-features-subframe-fencedframe.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/default-enabled-features-subframe-fencedframe.https.html.headers b/tests/wpt/tests/fenced-frame/resources/default-enabled-features-subframe-fencedframe.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/default-enabled-features-subframe-fencedframe.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/default-enabled-features-subframe-fencedframe.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/default-enabled-features-subframe-iframe.https.html b/tests/wpt/tests/fenced-frame/resources/default-enabled-features-subframe-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/default-enabled-features-subframe-iframe.https.html rename to tests/wpt/tests/fenced-frame/resources/default-enabled-features-subframe-iframe.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/default-enabled-features-subframe-iframe.https.html.headers b/tests/wpt/tests/fenced-frame/resources/default-enabled-features-subframe-iframe.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/default-enabled-features-subframe-iframe.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/default-enabled-features-subframe-iframe.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/download-helper.js b/tests/wpt/tests/fenced-frame/resources/download-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/download-helper.js rename to tests/wpt/tests/fenced-frame/resources/download-helper.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/download-inner.html b/tests/wpt/tests/fenced-frame/resources/download-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/download-inner.html rename to tests/wpt/tests/fenced-frame/resources/download-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/download-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/download-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/download-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/download-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/download-stash.py b/tests/wpt/tests/fenced-frame/resources/download-stash.py similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/download-stash.py rename to tests/wpt/tests/fenced-frame/resources/download-stash.py diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/dummy.html b/tests/wpt/tests/fenced-frame/resources/dummy.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/dummy.html rename to tests/wpt/tests/fenced-frame/resources/dummy.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/embeddee.html b/tests/wpt/tests/fenced-frame/resources/embeddee.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/embeddee.html rename to tests/wpt/tests/fenced-frame/resources/embeddee.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/embeddee.html.headers b/tests/wpt/tests/fenced-frame/resources/embeddee.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/embeddee.html.headers rename to tests/wpt/tests/fenced-frame/resources/embeddee.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/embedder-policy.js b/tests/wpt/tests/fenced-frame/resources/embedder-policy.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/embedder-policy.js rename to tests/wpt/tests/fenced-frame/resources/embedder-policy.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/empty-worker.js b/tests/wpt/tests/fenced-frame/resources/empty-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/empty-worker.js rename to tests/wpt/tests/fenced-frame/resources/empty-worker.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/fedcm-get-credential-inner.https.html b/tests/wpt/tests/fenced-frame/resources/fedcm-get-credential-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/fedcm-get-credential-inner.https.html rename to tests/wpt/tests/fenced-frame/resources/fedcm-get-credential-inner.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/fedcm-get-credential-inner.https.html.headers b/tests/wpt/tests/fenced-frame/resources/fedcm-get-credential-inner.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/fedcm-get-credential-inner.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/fedcm-get-credential-inner.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/fence-api-inner.https.html b/tests/wpt/tests/fenced-frame/resources/fence-api-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/fence-api-inner.https.html rename to tests/wpt/tests/fenced-frame/resources/fence-api-inner.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/fence-api-inner.https.html.headers b/tests/wpt/tests/fenced-frame/resources/fence-api-inner.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/fence-api-inner.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/fence-api-inner.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/fenced-frame-loaded.html b/tests/wpt/tests/fenced-frame/resources/fenced-frame-loaded.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/fenced-frame-loaded.html rename to tests/wpt/tests/fenced-frame/resources/fenced-frame-loaded.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/fenced-frame-loaded.html.headers b/tests/wpt/tests/fenced-frame/resources/fenced-frame-loaded.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/fenced-frame-loaded.html.headers rename to tests/wpt/tests/fenced-frame/resources/fenced-frame-loaded.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/fenced-frame-set-name-and-report-ready-for-outermost-document-to-navigate.html b/tests/wpt/tests/fenced-frame/resources/fenced-frame-set-name-and-report-ready-for-outermost-document-to-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/fenced-frame-set-name-and-report-ready-for-outermost-document-to-navigate.html rename to tests/wpt/tests/fenced-frame/resources/fenced-frame-set-name-and-report-ready-for-outermost-document-to-navigate.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/fenced-frame-set-name-and-report-ready-for-outermost-document-to-navigate.html.headers b/tests/wpt/tests/fenced-frame/resources/fenced-frame-set-name-and-report-ready-for-outermost-document-to-navigate.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/fenced-frame-set-name-and-report-ready-for-outermost-document-to-navigate.html.headers rename to tests/wpt/tests/fenced-frame/resources/fenced-frame-set-name-and-report-ready-for-outermost-document-to-navigate.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/fledge-bidding-logic-with-size.js b/tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic-with-size.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/fledge-bidding-logic-with-size.js rename to tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic-with-size.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/fledge-bidding-logic-with-size.js.headers b/tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic-with-size.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/fledge-bidding-logic-with-size.js.headers rename to tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic-with-size.js.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/fledge-bidding-logic.js b/tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/fledge-bidding-logic.js rename to tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/fledge-bidding-logic.js.headers b/tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/fledge-bidding-logic.js.headers rename to tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic.js.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/fledge-decision-logic.js b/tests/wpt/tests/fenced-frame/resources/fledge-decision-logic.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/fledge-decision-logic.js rename to tests/wpt/tests/fenced-frame/resources/fledge-decision-logic.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/fledge-decision-logic.js.headers b/tests/wpt/tests/fenced-frame/resources/fledge-decision-logic.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/fledge-decision-logic.js.headers rename to tests/wpt/tests/fenced-frame/resources/fledge-decision-logic.js.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/frame-navigation-inner-create-nested.https.html b/tests/wpt/tests/fenced-frame/resources/frame-navigation-inner-create-nested.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/frame-navigation-inner-create-nested.https.html rename to tests/wpt/tests/fenced-frame/resources/frame-navigation-inner-create-nested.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/frame-navigation-inner-create-nested.https.html.headers b/tests/wpt/tests/fenced-frame/resources/frame-navigation-inner-create-nested.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/frame-navigation-inner-create-nested.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/frame-navigation-inner-create-nested.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/frame-navigation-inner-simple.https.html b/tests/wpt/tests/fenced-frame/resources/frame-navigation-inner-simple.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/frame-navigation-inner-simple.https.html rename to tests/wpt/tests/fenced-frame/resources/frame-navigation-inner-simple.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/frame-navigation-inner-simple.https.html.headers b/tests/wpt/tests/fenced-frame/resources/frame-navigation-inner-simple.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/frame-navigation-inner-simple.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/frame-navigation-inner-simple.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/frame-with-intersection-observer.html b/tests/wpt/tests/fenced-frame/resources/frame-with-intersection-observer.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/frame-with-intersection-observer.html rename to tests/wpt/tests/fenced-frame/resources/frame-with-intersection-observer.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/frame-with-intersection-observer.html.headers b/tests/wpt/tests/fenced-frame/resources/frame-with-intersection-observer.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/frame-with-intersection-observer.html.headers rename to tests/wpt/tests/fenced-frame/resources/frame-with-intersection-observer.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/gamepad-inner.html b/tests/wpt/tests/fenced-frame/resources/gamepad-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/gamepad-inner.html rename to tests/wpt/tests/fenced-frame/resources/gamepad-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/gamepad-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/gamepad-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/gamepad-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/gamepad-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/get-nested-configs-inner.html b/tests/wpt/tests/fenced-frame/resources/get-nested-configs-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/get-nested-configs-inner.html rename to tests/wpt/tests/fenced-frame/resources/get-nested-configs-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/get-nested-configs-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/get-nested-configs-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/get-nested-configs-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/get-nested-configs-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/get-nested-configs-nested-iframe.html b/tests/wpt/tests/fenced-frame/resources/get-nested-configs-nested-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/get-nested-configs-nested-iframe.html rename to tests/wpt/tests/fenced-frame/resources/get-nested-configs-nested-iframe.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/get-nested-configs-nested-iframe.html.headers b/tests/wpt/tests/fenced-frame/resources/get-nested-configs-nested-iframe.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/get-nested-configs-nested-iframe.html.headers rename to tests/wpt/tests/fenced-frame/resources/get-nested-configs-nested-iframe.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/get_battery.html b/tests/wpt/tests/fenced-frame/resources/get_battery.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/get_battery.html rename to tests/wpt/tests/fenced-frame/resources/get_battery.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/get_battery.html.headers b/tests/wpt/tests/fenced-frame/resources/get_battery.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/get_battery.html.headers rename to tests/wpt/tests/fenced-frame/resources/get_battery.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/header-referrer-inner.html b/tests/wpt/tests/fenced-frame/resources/header-referrer-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/header-referrer-inner.html rename to tests/wpt/tests/fenced-frame/resources/header-referrer-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/header-referrer-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/header-referrer-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/header-referrer-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/header-referrer-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/header-secFetchDest-inner.html b/tests/wpt/tests/fenced-frame/resources/header-secFetchDest-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/header-secFetchDest-inner.html rename to tests/wpt/tests/fenced-frame/resources/header-secFetchDest-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/header-secFetchDest-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/header-secFetchDest-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/header-secFetchDest-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/header-secFetchDest-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/history-back-and-forward-should-not-work-in-fenced-tree-inner.html b/tests/wpt/tests/fenced-frame/resources/history-back-and-forward-should-not-work-in-fenced-tree-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/history-back-and-forward-should-not-work-in-fenced-tree-inner.html rename to tests/wpt/tests/fenced-frame/resources/history-back-and-forward-should-not-work-in-fenced-tree-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/history-back-and-forward-should-not-work-in-fenced-tree-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/history-back-and-forward-should-not-work-in-fenced-tree-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/history-back-and-forward-should-not-work-in-fenced-tree-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/history-back-and-forward-should-not-work-in-fenced-tree-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/history-length-fenced-navigations-replace-do-not-contribute-to-joint-inner.html b/tests/wpt/tests/fenced-frame/resources/history-length-fenced-navigations-replace-do-not-contribute-to-joint-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/history-length-fenced-navigations-replace-do-not-contribute-to-joint-inner.html rename to tests/wpt/tests/fenced-frame/resources/history-length-fenced-navigations-replace-do-not-contribute-to-joint-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/history-length-fenced-navigations-replace-do-not-contribute-to-joint-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/history-length-fenced-navigations-replace-do-not-contribute-to-joint-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/history-length-fenced-navigations-replace-do-not-contribute-to-joint-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/history-length-fenced-navigations-replace-do-not-contribute-to-joint-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/history-length-outer-page-navigation-not-reflected-in-fenced-inner.html b/tests/wpt/tests/fenced-frame/resources/history-length-outer-page-navigation-not-reflected-in-fenced-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/history-length-outer-page-navigation-not-reflected-in-fenced-inner.html rename to tests/wpt/tests/fenced-frame/resources/history-length-outer-page-navigation-not-reflected-in-fenced-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/history-length-outer-page-navigation-not-reflected-in-fenced-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/history-length-outer-page-navigation-not-reflected-in-fenced-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/history-length-outer-page-navigation-not-reflected-in-fenced-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/history-length-outer-page-navigation-not-reflected-in-fenced-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/ignore-child-fenced-frame-onload-event-inner.html b/tests/wpt/tests/fenced-frame/resources/ignore-child-fenced-frame-onload-event-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/ignore-child-fenced-frame-onload-event-inner.html rename to tests/wpt/tests/fenced-frame/resources/ignore-child-fenced-frame-onload-event-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/ignore-child-fenced-frame-onload-event-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/ignore-child-fenced-frame-onload-event-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/ignore-child-fenced-frame-onload-event-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/ignore-child-fenced-frame-onload-event-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/key-value-store.py b/tests/wpt/tests/fenced-frame/resources/key-value-store.py similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/key-value-store.py rename to tests/wpt/tests/fenced-frame/resources/key-value-store.py diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/location-ancestorOrigins-inner.https.html b/tests/wpt/tests/fenced-frame/resources/location-ancestorOrigins-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/location-ancestorOrigins-inner.https.html rename to tests/wpt/tests/fenced-frame/resources/location-ancestorOrigins-inner.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/location-ancestorOrigins-inner.https.html.headers b/tests/wpt/tests/fenced-frame/resources/location-ancestorOrigins-inner.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/location-ancestorOrigins-inner.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/location-ancestorOrigins-inner.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-destination.https.html b/tests/wpt/tests/fenced-frame/resources/navigate-ancestor-destination.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-destination.https.html rename to tests/wpt/tests/fenced-frame/resources/navigate-ancestor-destination.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-destination.https.html.headers b/tests/wpt/tests/fenced-frame/resources/navigate-ancestor-destination.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-destination.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/navigate-ancestor-destination.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-from-nested-fenced-frame.https.html b/tests/wpt/tests/fenced-frame/resources/navigate-ancestor-from-nested-fenced-frame.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-from-nested-fenced-frame.https.html rename to tests/wpt/tests/fenced-frame/resources/navigate-ancestor-from-nested-fenced-frame.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-from-nested-fenced-frame.https.html.headers b/tests/wpt/tests/fenced-frame/resources/navigate-ancestor-from-nested-fenced-frame.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-from-nested-fenced-frame.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/navigate-ancestor-from-nested-fenced-frame.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-from-nested-iframe.https.html b/tests/wpt/tests/fenced-frame/resources/navigate-ancestor-from-nested-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-from-nested-iframe.https.html rename to tests/wpt/tests/fenced-frame/resources/navigate-ancestor-from-nested-iframe.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-from-nested-iframe.https.html.headers b/tests/wpt/tests/fenced-frame/resources/navigate-ancestor-from-nested-iframe.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-from-nested-iframe.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/navigate-ancestor-from-nested-iframe.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-helper.https.html b/tests/wpt/tests/fenced-frame/resources/navigate-ancestor-helper.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-helper.https.html rename to tests/wpt/tests/fenced-frame/resources/navigate-ancestor-helper.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-helper.https.html.headers b/tests/wpt/tests/fenced-frame/resources/navigate-ancestor-helper.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-helper.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/navigate-ancestor-helper.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-helper.js b/tests/wpt/tests/fenced-frame/resources/navigate-ancestor-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-helper.js rename to tests/wpt/tests/fenced-frame/resources/navigate-ancestor-helper.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-test-runner.https.html b/tests/wpt/tests/fenced-frame/resources/navigate-ancestor-test-runner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-ancestor-test-runner.https.html rename to tests/wpt/tests/fenced-frame/resources/navigate-ancestor-test-runner.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-by-name-inner.html b/tests/wpt/tests/fenced-frame/resources/navigate-by-name-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-by-name-inner.html rename to tests/wpt/tests/fenced-frame/resources/navigate-by-name-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-by-name-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/navigate-by-name-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-by-name-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/navigate-by-name-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-by-name-reporting-helper.html b/tests/wpt/tests/fenced-frame/resources/navigate-by-name-reporting-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-by-name-reporting-helper.html rename to tests/wpt/tests/fenced-frame/resources/navigate-by-name-reporting-helper.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-by-name-reporting-helper.html.headers b/tests/wpt/tests/fenced-frame/resources/navigate-by-name-reporting-helper.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-by-name-reporting-helper.html.headers rename to tests/wpt/tests/fenced-frame/resources/navigate-by-name-reporting-helper.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-nested-config.html b/tests/wpt/tests/fenced-frame/resources/navigate-nested-config.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-nested-config.html rename to tests/wpt/tests/fenced-frame/resources/navigate-nested-config.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigate-nested-config.html.headers b/tests/wpt/tests/fenced-frame/resources/navigate-nested-config.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigate-nested-config.html.headers rename to tests/wpt/tests/fenced-frame/resources/navigate-nested-config.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigator-keyboard-layout-map-inner.html b/tests/wpt/tests/fenced-frame/resources/navigator-keyboard-layout-map-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigator-keyboard-layout-map-inner.html rename to tests/wpt/tests/fenced-frame/resources/navigator-keyboard-layout-map-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigator-keyboard-layout-map-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/navigator-keyboard-layout-map-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigator-keyboard-layout-map-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/navigator-keyboard-layout-map-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigator-keyboard-lock-inner.html b/tests/wpt/tests/fenced-frame/resources/navigator-keyboard-lock-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigator-keyboard-lock-inner.html rename to tests/wpt/tests/fenced-frame/resources/navigator-keyboard-lock-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/navigator-keyboard-lock-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/navigator-keyboard-lock-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/navigator-keyboard-lock-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/navigator-keyboard-lock-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/notification-sw.js b/tests/wpt/tests/fenced-frame/resources/notification-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/notification-sw.js rename to tests/wpt/tests/fenced-frame/resources/notification-sw.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/opaque-ad-sizes-utils.js b/tests/wpt/tests/fenced-frame/resources/opaque-ad-sizes-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/opaque-ad-sizes-utils.js rename to tests/wpt/tests/fenced-frame/resources/opaque-ad-sizes-utils.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/payment-handler-sw.js b/tests/wpt/tests/fenced-frame/resources/payment-handler-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/payment-handler-sw.js rename to tests/wpt/tests/fenced-frame/resources/payment-handler-sw.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/permission-api-denied-inner.html b/tests/wpt/tests/fenced-frame/resources/permission-api-denied-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/permission-api-denied-inner.html rename to tests/wpt/tests/fenced-frame/resources/permission-api-denied-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/permission-api-denied-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/permission-api-denied-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/permission-api-denied-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/permission-api-denied-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/permission-geolocation-inner.html b/tests/wpt/tests/fenced-frame/resources/permission-geolocation-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/permission-geolocation-inner.html rename to tests/wpt/tests/fenced-frame/resources/permission-geolocation-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/permission-geolocation-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/permission-geolocation-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/permission-geolocation-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/permission-geolocation-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/permission-geolocation-test-runner.html b/tests/wpt/tests/fenced-frame/resources/permission-geolocation-test-runner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/permission-geolocation-test-runner.html rename to tests/wpt/tests/fenced-frame/resources/permission-geolocation-test-runner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/permission-notification-inner.html b/tests/wpt/tests/fenced-frame/resources/permission-notification-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/permission-notification-inner.html rename to tests/wpt/tests/fenced-frame/resources/permission-notification-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/permission-notification-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/permission-notification-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/permission-notification-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/permission-notification-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/popup-noopener-destination.html b/tests/wpt/tests/fenced-frame/resources/popup-noopener-destination.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/popup-noopener-destination.html rename to tests/wpt/tests/fenced-frame/resources/popup-noopener-destination.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/popup-noopener-inner.html b/tests/wpt/tests/fenced-frame/resources/popup-noopener-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/popup-noopener-inner.html rename to tests/wpt/tests/fenced-frame/resources/popup-noopener-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/popup-noopener-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/popup-noopener-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/popup-noopener-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/popup-noopener-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/prerender-inner.html b/tests/wpt/tests/fenced-frame/resources/prerender-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/prerender-inner.html rename to tests/wpt/tests/fenced-frame/resources/prerender-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/prerender-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/prerender-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/prerender-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/prerender-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/presentation-receiver-inner.html b/tests/wpt/tests/fenced-frame/resources/presentation-receiver-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/presentation-receiver-inner.html rename to tests/wpt/tests/fenced-frame/resources/presentation-receiver-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/presentation-receiver-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/presentation-receiver-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/presentation-receiver-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/presentation-receiver-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/remote-context-executor.https.html b/tests/wpt/tests/fenced-frame/resources/remote-context-executor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/remote-context-executor.https.html rename to tests/wpt/tests/fenced-frame/resources/remote-context-executor.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/report-url.html b/tests/wpt/tests/fenced-frame/resources/report-url.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/report-url.html rename to tests/wpt/tests/fenced-frame/resources/report-url.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/report-url.html.headers b/tests/wpt/tests/fenced-frame/resources/report-url.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/report-url.html.headers rename to tests/wpt/tests/fenced-frame/resources/report-url.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/resize-lock-inner-input.html b/tests/wpt/tests/fenced-frame/resources/resize-lock-inner-input.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/resize-lock-inner-input.html rename to tests/wpt/tests/fenced-frame/resources/resize-lock-inner-input.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/resize-lock-inner-input.html.headers b/tests/wpt/tests/fenced-frame/resources/resize-lock-inner-input.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/resize-lock-inner-input.html.headers rename to tests/wpt/tests/fenced-frame/resources/resize-lock-inner-input.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/resize-lock-inner.html b/tests/wpt/tests/fenced-frame/resources/resize-lock-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/resize-lock-inner.html rename to tests/wpt/tests/fenced-frame/resources/resize-lock-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/resize-lock-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/resize-lock-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/resize-lock-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/resize-lock-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/response-204.py b/tests/wpt/tests/fenced-frame/resources/response-204.py similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/response-204.py rename to tests/wpt/tests/fenced-frame/resources/response-204.py diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/sandbox-mandatory-flags-iframe.sub.html b/tests/wpt/tests/fenced-frame/resources/sandbox-mandatory-flags-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/sandbox-mandatory-flags-iframe.sub.html rename to tests/wpt/tests/fenced-frame/resources/sandbox-mandatory-flags-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/sandbox-mandatory-flags-inner.sub.html b/tests/wpt/tests/fenced-frame/resources/sandbox-mandatory-flags-inner.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/sandbox-mandatory-flags-inner.sub.html rename to tests/wpt/tests/fenced-frame/resources/sandbox-mandatory-flags-inner.sub.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/sandbox-mandatory-flags-inner.sub.html.headers b/tests/wpt/tests/fenced-frame/resources/sandbox-mandatory-flags-inner.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/sandbox-mandatory-flags-inner.sub.html.headers rename to tests/wpt/tests/fenced-frame/resources/sandbox-mandatory-flags-inner.sub.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/sandbox-mandatory-flags-looser-restriction.sub.html b/tests/wpt/tests/fenced-frame/resources/sandbox-mandatory-flags-looser-restriction.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/sandbox-mandatory-flags-looser-restriction.sub.html rename to tests/wpt/tests/fenced-frame/resources/sandbox-mandatory-flags-looser-restriction.sub.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/sandboxed-features-inner.sub.html b/tests/wpt/tests/fenced-frame/resources/sandboxed-features-inner.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/sandboxed-features-inner.sub.html rename to tests/wpt/tests/fenced-frame/resources/sandboxed-features-inner.sub.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/sandboxed-features-inner.sub.html.headers b/tests/wpt/tests/fenced-frame/resources/sandboxed-features-inner.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/sandboxed-features-inner.sub.html.headers rename to tests/wpt/tests/fenced-frame/resources/sandboxed-features-inner.sub.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/sandboxed-features-looser-restriction.sub.html b/tests/wpt/tests/fenced-frame/resources/sandboxed-features-looser-restriction.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/sandboxed-features-looser-restriction.sub.html rename to tests/wpt/tests/fenced-frame/resources/sandboxed-features-looser-restriction.sub.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/sandboxed-features-looser-restriction.sub.html.headers b/tests/wpt/tests/fenced-frame/resources/sandboxed-features-looser-restriction.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/sandboxed-features-looser-restriction.sub.html.headers rename to tests/wpt/tests/fenced-frame/resources/sandboxed-features-looser-restriction.sub.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/sandboxed-features.js b/tests/wpt/tests/fenced-frame/resources/sandboxed-features.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/sandboxed-features.js rename to tests/wpt/tests/fenced-frame/resources/sandboxed-features.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-dedicated-worker-inner.html b/tests/wpt/tests/fenced-frame/resources/serviceWorker-dedicated-worker-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-dedicated-worker-inner.html rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-dedicated-worker-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-dedicated-worker-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/serviceWorker-dedicated-worker-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-dedicated-worker-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-dedicated-worker-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-dedicated-worker-sw.js b/tests/wpt/tests/fenced-frame/resources/serviceWorker-dedicated-worker-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-dedicated-worker-sw.js rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-dedicated-worker-sw.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-dedicated-worker-sw.js.headers b/tests/wpt/tests/fenced-frame/resources/serviceWorker-dedicated-worker-sw.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-dedicated-worker-sw.js.headers rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-dedicated-worker-sw.js.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-dedicated-worker.js b/tests/wpt/tests/fenced-frame/resources/serviceWorker-dedicated-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-dedicated-worker.js rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-dedicated-worker.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-frameType-inner.html b/tests/wpt/tests/fenced-frame/resources/serviceWorker-frameType-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-frameType-inner.html rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-frameType-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-frameType-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/serviceWorker-frameType-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-frameType-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-frameType-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-frameType-nested.html b/tests/wpt/tests/fenced-frame/resources/serviceWorker-frameType-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-frameType-nested.html rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-frameType-nested.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-frameType-nested.html.headers b/tests/wpt/tests/fenced-frame/resources/serviceWorker-frameType-nested.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-frameType-nested.html.headers rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-frameType-nested.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-frameType.js b/tests/wpt/tests/fenced-frame/resources/serviceWorker-frameType.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-frameType.js rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-frameType.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-navigate-inner-success.html b/tests/wpt/tests/fenced-frame/resources/serviceWorker-navigate-inner-success.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-navigate-inner-success.html rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-navigate-inner-success.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-navigate-inner-success.html.headers b/tests/wpt/tests/fenced-frame/resources/serviceWorker-navigate-inner-success.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-navigate-inner-success.html.headers rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-navigate-inner-success.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-navigate-inner.html b/tests/wpt/tests/fenced-frame/resources/serviceWorker-navigate-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-navigate-inner.html rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-navigate-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-navigate-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/serviceWorker-navigate-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-navigate-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-navigate-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-navigate.js b/tests/wpt/tests/fenced-frame/resources/serviceWorker-navigate.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-navigate.js rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-navigate.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-push-sw.js b/tests/wpt/tests/fenced-frame/resources/serviceWorker-push-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/serviceWorker-push-sw.js rename to tests/wpt/tests/fenced-frame/resources/serviceWorker-push-sw.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/unique-cookie-partition-inner.https.html b/tests/wpt/tests/fenced-frame/resources/unique-cookie-partition-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/unique-cookie-partition-inner.https.html rename to tests/wpt/tests/fenced-frame/resources/unique-cookie-partition-inner.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/unique-cookie-partition-inner.https.html.headers b/tests/wpt/tests/fenced-frame/resources/unique-cookie-partition-inner.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/unique-cookie-partition-inner.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/unique-cookie-partition-inner.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/utils.js b/tests/wpt/tests/fenced-frame/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/utils.js rename to tests/wpt/tests/fenced-frame/resources/utils.js diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/web-bluetooth-inner.html b/tests/wpt/tests/fenced-frame/resources/web-bluetooth-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/web-bluetooth-inner.html rename to tests/wpt/tests/fenced-frame/resources/web-bluetooth-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/web-bluetooth-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/web-bluetooth-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/web-bluetooth-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/web-bluetooth-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/web-nfc-inner.https.html b/tests/wpt/tests/fenced-frame/resources/web-nfc-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/web-nfc-inner.https.html rename to tests/wpt/tests/fenced-frame/resources/web-nfc-inner.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/web-nfc-inner.https.html.headers b/tests/wpt/tests/fenced-frame/resources/web-nfc-inner.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/web-nfc-inner.https.html.headers rename to tests/wpt/tests/fenced-frame/resources/web-nfc-inner.https.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/web-share-inner.html b/tests/wpt/tests/fenced-frame/resources/web-share-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/web-share-inner.html rename to tests/wpt/tests/fenced-frame/resources/web-share-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/web-share-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/web-share-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/web-share-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/web-share-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/window-frameElement-inner.html b/tests/wpt/tests/fenced-frame/resources/window-frameElement-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/window-frameElement-inner.html rename to tests/wpt/tests/fenced-frame/resources/window-frameElement-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/window-frameElement-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/window-frameElement-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/window-frameElement-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/window-frameElement-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/window-navigation-204-inner.html b/tests/wpt/tests/fenced-frame/resources/window-navigation-204-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/window-navigation-204-inner.html rename to tests/wpt/tests/fenced-frame/resources/window-navigation-204-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/window-navigation-204-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/window-navigation-204-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/window-navigation-204-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/window-navigation-204-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/window-outer-dimensions-inner.html b/tests/wpt/tests/fenced-frame/resources/window-outer-dimensions-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/window-outer-dimensions-inner.html rename to tests/wpt/tests/fenced-frame/resources/window-outer-dimensions-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/window-outer-dimensions-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/window-outer-dimensions-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/window-outer-dimensions-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/window-outer-dimensions-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/window-parent-inner.html b/tests/wpt/tests/fenced-frame/resources/window-parent-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/window-parent-inner.html rename to tests/wpt/tests/fenced-frame/resources/window-parent-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/window-parent-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/window-parent-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/window-parent-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/window-parent-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/window-top-inner.html b/tests/wpt/tests/fenced-frame/resources/window-top-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/window-top-inner.html rename to tests/wpt/tests/fenced-frame/resources/window-top-inner.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/resources/window-top-inner.html.headers b/tests/wpt/tests/fenced-frame/resources/window-top-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/resources/window-top-inner.html.headers rename to tests/wpt/tests/fenced-frame/resources/window-top-inner.html.headers diff --git a/tests/wpt/web-platform-tests/fenced-frame/sandbox-attribute.https.html b/tests/wpt/tests/fenced-frame/sandbox-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/sandbox-attribute.https.html rename to tests/wpt/tests/fenced-frame/sandbox-attribute.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/sandbox-mandatory-flags.https.html b/tests/wpt/tests/fenced-frame/sandbox-mandatory-flags.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/sandbox-mandatory-flags.https.html rename to tests/wpt/tests/fenced-frame/sandbox-mandatory-flags.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-alert.https.html b/tests/wpt/tests/fenced-frame/sandboxed-features-alert.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-alert.https.html rename to tests/wpt/tests/fenced-frame/sandboxed-features-alert.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-confirm.https.html b/tests/wpt/tests/fenced-frame/sandboxed-features-confirm.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-confirm.https.html rename to tests/wpt/tests/fenced-frame/sandboxed-features-confirm.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-documentdomain.https.html b/tests/wpt/tests/fenced-frame/sandboxed-features-documentdomain.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-documentdomain.https.html rename to tests/wpt/tests/fenced-frame/sandboxed-features-documentdomain.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-pointerlock.https.html b/tests/wpt/tests/fenced-frame/sandboxed-features-pointerlock.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-pointerlock.https.html rename to tests/wpt/tests/fenced-frame/sandboxed-features-pointerlock.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-presentation-request.https.html b/tests/wpt/tests/fenced-frame/sandboxed-features-presentation-request.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-presentation-request.https.html rename to tests/wpt/tests/fenced-frame/sandboxed-features-presentation-request.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-printdialog.https.html b/tests/wpt/tests/fenced-frame/sandboxed-features-printdialog.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-printdialog.https.html rename to tests/wpt/tests/fenced-frame/sandboxed-features-printdialog.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-prompt.https.html b/tests/wpt/tests/fenced-frame/sandboxed-features-prompt.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-prompt.https.html rename to tests/wpt/tests/fenced-frame/sandboxed-features-prompt.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-screen-orientation-lock.https.html b/tests/wpt/tests/fenced-frame/sandboxed-features-screen-orientation-lock.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/sandboxed-features-screen-orientation-lock.https.html rename to tests/wpt/tests/fenced-frame/sandboxed-features-screen-orientation-lock.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/script-focus.https.html b/tests/wpt/tests/fenced-frame/script-focus.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/script-focus.https.html rename to tests/wpt/tests/fenced-frame/script-focus.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/selecturl-flexible-size.https.html b/tests/wpt/tests/fenced-frame/selecturl-flexible-size.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/selecturl-flexible-size.https.html rename to tests/wpt/tests/fenced-frame/selecturl-flexible-size.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/self-urn-navigation.https.html b/tests/wpt/tests/fenced-frame/self-urn-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/self-urn-navigation.https.html rename to tests/wpt/tests/fenced-frame/self-urn-navigation.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/serviceWorker-dedicated-worker.https.html b/tests/wpt/tests/fenced-frame/serviceWorker-dedicated-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/serviceWorker-dedicated-worker.https.html rename to tests/wpt/tests/fenced-frame/serviceWorker-dedicated-worker.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/serviceWorker-frameType.https.html b/tests/wpt/tests/fenced-frame/serviceWorker-frameType.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/serviceWorker-frameType.https.html rename to tests/wpt/tests/fenced-frame/serviceWorker-frameType.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/serviceWorker-push.https.html b/tests/wpt/tests/fenced-frame/serviceWorker-push.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/serviceWorker-push.https.html rename to tests/wpt/tests/fenced-frame/serviceWorker-push.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/set-automatic-beacon.https.html b/tests/wpt/tests/fenced-frame/set-automatic-beacon.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/set-automatic-beacon.https.html rename to tests/wpt/tests/fenced-frame/set-automatic-beacon.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/show-directory-picker.https.html b/tests/wpt/tests/fenced-frame/show-directory-picker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/show-directory-picker.https.html rename to tests/wpt/tests/fenced-frame/show-directory-picker.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/show-open-file-picker.https.html b/tests/wpt/tests/fenced-frame/show-open-file-picker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/show-open-file-picker.https.html rename to tests/wpt/tests/fenced-frame/show-open-file-picker.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/storage-partitioning.https.html b/tests/wpt/tests/fenced-frame/storage-partitioning.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/storage-partitioning.https.html rename to tests/wpt/tests/fenced-frame/storage-partitioning.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/subframe-loading.https.html b/tests/wpt/tests/fenced-frame/subframe-loading.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/subframe-loading.https.html rename to tests/wpt/tests/fenced-frame/subframe-loading.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/unique-cookie-partition.https.html b/tests/wpt/tests/fenced-frame/unique-cookie-partition.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/unique-cookie-partition.https.html rename to tests/wpt/tests/fenced-frame/unique-cookie-partition.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/user-activation.https.html b/tests/wpt/tests/fenced-frame/user-activation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/user-activation.https.html rename to tests/wpt/tests/fenced-frame/user-activation.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/visual-viewport.https.html b/tests/wpt/tests/fenced-frame/visual-viewport.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/visual-viewport.https.html rename to tests/wpt/tests/fenced-frame/visual-viewport.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/web-bluetooth.https.html b/tests/wpt/tests/fenced-frame/web-bluetooth.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/web-bluetooth.https.html rename to tests/wpt/tests/fenced-frame/web-bluetooth.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/web-nfc.https.html b/tests/wpt/tests/fenced-frame/web-nfc.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/web-nfc.https.html rename to tests/wpt/tests/fenced-frame/web-nfc.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/web-share.https.html b/tests/wpt/tests/fenced-frame/web-share.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/web-share.https.html rename to tests/wpt/tests/fenced-frame/web-share.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/web-usb.https.html b/tests/wpt/tests/fenced-frame/web-usb.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/web-usb.https.html rename to tests/wpt/tests/fenced-frame/web-usb.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/window-close.https.html b/tests/wpt/tests/fenced-frame/window-close.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/window-close.https.html rename to tests/wpt/tests/fenced-frame/window-close.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/window-frameElement.https.html b/tests/wpt/tests/fenced-frame/window-frameElement.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/window-frameElement.https.html rename to tests/wpt/tests/fenced-frame/window-frameElement.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/window-navigation-204.https.html b/tests/wpt/tests/fenced-frame/window-navigation-204.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/window-navigation-204.https.html rename to tests/wpt/tests/fenced-frame/window-navigation-204.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/window-outer-dimensions.https.html b/tests/wpt/tests/fenced-frame/window-outer-dimensions.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/window-outer-dimensions.https.html rename to tests/wpt/tests/fenced-frame/window-outer-dimensions.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/window-parent.https.html b/tests/wpt/tests/fenced-frame/window-parent.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/window-parent.https.html rename to tests/wpt/tests/fenced-frame/window-parent.https.html diff --git a/tests/wpt/web-platform-tests/fenced-frame/window-top.https.html b/tests/wpt/tests/fenced-frame/window-top.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fenced-frame/window-top.https.html rename to tests/wpt/tests/fenced-frame/window-top.https.html diff --git a/tests/wpt/web-platform-tests/fetch/META.yml b/tests/wpt/tests/fetch/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/fetch/META.yml rename to tests/wpt/tests/fetch/META.yml diff --git a/tests/wpt/web-platform-tests/fetch/README.md b/tests/wpt/tests/fetch/README.md similarity index 100% rename from tests/wpt/web-platform-tests/fetch/README.md rename to tests/wpt/tests/fetch/README.md diff --git a/tests/wpt/web-platform-tests/fetch/api/abort/cache.https.any.js b/tests/wpt/tests/fetch/api/abort/cache.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/abort/cache.https.any.js rename to tests/wpt/tests/fetch/api/abort/cache.https.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/abort/destroyed-context.html b/tests/wpt/tests/fetch/api/abort/destroyed-context.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/abort/destroyed-context.html rename to tests/wpt/tests/fetch/api/abort/destroyed-context.html diff --git a/tests/wpt/web-platform-tests/fetch/api/abort/general.any.js b/tests/wpt/tests/fetch/api/abort/general.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/abort/general.any.js rename to tests/wpt/tests/fetch/api/abort/general.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/abort/keepalive.html b/tests/wpt/tests/fetch/api/abort/keepalive.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/abort/keepalive.html rename to tests/wpt/tests/fetch/api/abort/keepalive.html diff --git a/tests/wpt/web-platform-tests/fetch/api/abort/request.any.js b/tests/wpt/tests/fetch/api/abort/request.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/abort/request.any.js rename to tests/wpt/tests/fetch/api/abort/request.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/abort/serviceworker-intercepted.https.html b/tests/wpt/tests/fetch/api/abort/serviceworker-intercepted.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/abort/serviceworker-intercepted.https.html rename to tests/wpt/tests/fetch/api/abort/serviceworker-intercepted.https.html diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/accept-header.any.js b/tests/wpt/tests/fetch/api/basic/accept-header.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/accept-header.any.js rename to tests/wpt/tests/fetch/api/basic/accept-header.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/block-mime-as-script.html b/tests/wpt/tests/fetch/api/basic/block-mime-as-script.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/block-mime-as-script.html rename to tests/wpt/tests/fetch/api/basic/block-mime-as-script.html diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/conditional-get.any.js b/tests/wpt/tests/fetch/api/basic/conditional-get.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/conditional-get.any.js rename to tests/wpt/tests/fetch/api/basic/conditional-get.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/error-after-response.any.js b/tests/wpt/tests/fetch/api/basic/error-after-response.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/error-after-response.any.js rename to tests/wpt/tests/fetch/api/basic/error-after-response.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/header-value-combining.any.js b/tests/wpt/tests/fetch/api/basic/header-value-combining.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/header-value-combining.any.js rename to tests/wpt/tests/fetch/api/basic/header-value-combining.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/header-value-null-byte.any.js b/tests/wpt/tests/fetch/api/basic/header-value-null-byte.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/header-value-null-byte.any.js rename to tests/wpt/tests/fetch/api/basic/header-value-null-byte.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/historical.any.js b/tests/wpt/tests/fetch/api/basic/historical.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/historical.any.js rename to tests/wpt/tests/fetch/api/basic/historical.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/http-response-code.any.js b/tests/wpt/tests/fetch/api/basic/http-response-code.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/http-response-code.any.js rename to tests/wpt/tests/fetch/api/basic/http-response-code.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/integrity.sub.any.js b/tests/wpt/tests/fetch/api/basic/integrity.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/integrity.sub.any.js rename to tests/wpt/tests/fetch/api/basic/integrity.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/keepalive.any.js b/tests/wpt/tests/fetch/api/basic/keepalive.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/keepalive.any.js rename to tests/wpt/tests/fetch/api/basic/keepalive.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/mediasource.window.js b/tests/wpt/tests/fetch/api/basic/mediasource.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/mediasource.window.js rename to tests/wpt/tests/fetch/api/basic/mediasource.window.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/mode-no-cors.sub.any.js b/tests/wpt/tests/fetch/api/basic/mode-no-cors.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/mode-no-cors.sub.any.js rename to tests/wpt/tests/fetch/api/basic/mode-no-cors.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/mode-same-origin.any.js b/tests/wpt/tests/fetch/api/basic/mode-same-origin.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/mode-same-origin.any.js rename to tests/wpt/tests/fetch/api/basic/mode-same-origin.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/referrer.any.js b/tests/wpt/tests/fetch/api/basic/referrer.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/referrer.any.js rename to tests/wpt/tests/fetch/api/basic/referrer.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/request-forbidden-headers.any.js b/tests/wpt/tests/fetch/api/basic/request-forbidden-headers.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/request-forbidden-headers.any.js rename to tests/wpt/tests/fetch/api/basic/request-forbidden-headers.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/request-head.any.js b/tests/wpt/tests/fetch/api/basic/request-head.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/request-head.any.js rename to tests/wpt/tests/fetch/api/basic/request-head.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/request-headers-case.any.js b/tests/wpt/tests/fetch/api/basic/request-headers-case.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/request-headers-case.any.js rename to tests/wpt/tests/fetch/api/basic/request-headers-case.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/request-headers-nonascii.any.js b/tests/wpt/tests/fetch/api/basic/request-headers-nonascii.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/request-headers-nonascii.any.js rename to tests/wpt/tests/fetch/api/basic/request-headers-nonascii.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/request-headers.any.js b/tests/wpt/tests/fetch/api/basic/request-headers.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/request-headers.any.js rename to tests/wpt/tests/fetch/api/basic/request-headers.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/request-referrer-redirected-worker.html b/tests/wpt/tests/fetch/api/basic/request-referrer-redirected-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/request-referrer-redirected-worker.html rename to tests/wpt/tests/fetch/api/basic/request-referrer-redirected-worker.html diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/request-referrer.any.js b/tests/wpt/tests/fetch/api/basic/request-referrer.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/request-referrer.any.js rename to tests/wpt/tests/fetch/api/basic/request-referrer.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/request-upload.any.js b/tests/wpt/tests/fetch/api/basic/request-upload.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/request-upload.any.js rename to tests/wpt/tests/fetch/api/basic/request-upload.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/request-upload.h2.any.js b/tests/wpt/tests/fetch/api/basic/request-upload.h2.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/request-upload.h2.any.js rename to tests/wpt/tests/fetch/api/basic/request-upload.h2.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/response-null-body.any.js b/tests/wpt/tests/fetch/api/basic/response-null-body.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/response-null-body.any.js rename to tests/wpt/tests/fetch/api/basic/response-null-body.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/response-url.sub.any.js b/tests/wpt/tests/fetch/api/basic/response-url.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/response-url.sub.any.js rename to tests/wpt/tests/fetch/api/basic/response-url.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/scheme-about.any.js b/tests/wpt/tests/fetch/api/basic/scheme-about.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/scheme-about.any.js rename to tests/wpt/tests/fetch/api/basic/scheme-about.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/scheme-blob.sub.any.js b/tests/wpt/tests/fetch/api/basic/scheme-blob.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/scheme-blob.sub.any.js rename to tests/wpt/tests/fetch/api/basic/scheme-blob.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/scheme-data.any.js b/tests/wpt/tests/fetch/api/basic/scheme-data.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/scheme-data.any.js rename to tests/wpt/tests/fetch/api/basic/scheme-data.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/scheme-others.sub.any.js b/tests/wpt/tests/fetch/api/basic/scheme-others.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/scheme-others.sub.any.js rename to tests/wpt/tests/fetch/api/basic/scheme-others.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/status.h2.any.js b/tests/wpt/tests/fetch/api/basic/status.h2.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/status.h2.any.js rename to tests/wpt/tests/fetch/api/basic/status.h2.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/stream-response.any.js b/tests/wpt/tests/fetch/api/basic/stream-response.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/stream-response.any.js rename to tests/wpt/tests/fetch/api/basic/stream-response.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/stream-safe-creation.any.js b/tests/wpt/tests/fetch/api/basic/stream-safe-creation.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/stream-safe-creation.any.js rename to tests/wpt/tests/fetch/api/basic/stream-safe-creation.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/text-utf8.any.js b/tests/wpt/tests/fetch/api/basic/text-utf8.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/basic/text-utf8.any.js rename to tests/wpt/tests/fetch/api/basic/text-utf8.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/body/cloned-any.js b/tests/wpt/tests/fetch/api/body/cloned-any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/body/cloned-any.js rename to tests/wpt/tests/fetch/api/body/cloned-any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/body/formdata.any.js b/tests/wpt/tests/fetch/api/body/formdata.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/body/formdata.any.js rename to tests/wpt/tests/fetch/api/body/formdata.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/body/mime-type.any.js b/tests/wpt/tests/fetch/api/body/mime-type.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/body/mime-type.any.js rename to tests/wpt/tests/fetch/api/body/mime-type.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-basic.any.js b/tests/wpt/tests/fetch/api/cors/cors-basic.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-basic.any.js rename to tests/wpt/tests/fetch/api/cors/cors-basic.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-cookies-redirect.any.js b/tests/wpt/tests/fetch/api/cors/cors-cookies-redirect.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-cookies-redirect.any.js rename to tests/wpt/tests/fetch/api/cors/cors-cookies-redirect.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-cookies.any.js b/tests/wpt/tests/fetch/api/cors/cors-cookies.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-cookies.any.js rename to tests/wpt/tests/fetch/api/cors/cors-cookies.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-expose-star.sub.any.js b/tests/wpt/tests/fetch/api/cors/cors-expose-star.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-expose-star.sub.any.js rename to tests/wpt/tests/fetch/api/cors/cors-expose-star.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-filtering.sub.any.js b/tests/wpt/tests/fetch/api/cors/cors-filtering.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-filtering.sub.any.js rename to tests/wpt/tests/fetch/api/cors/cors-filtering.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-keepalive.any.js b/tests/wpt/tests/fetch/api/cors/cors-keepalive.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-keepalive.any.js rename to tests/wpt/tests/fetch/api/cors/cors-keepalive.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins.sub.any.js b/tests/wpt/tests/fetch/api/cors/cors-multiple-origins.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins.sub.any.js rename to tests/wpt/tests/fetch/api/cors/cors-multiple-origins.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-no-preflight.any.js b/tests/wpt/tests/fetch/api/cors/cors-no-preflight.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-no-preflight.any.js rename to tests/wpt/tests/fetch/api/cors/cors-no-preflight.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-origin.any.js b/tests/wpt/tests/fetch/api/cors/cors-origin.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-origin.any.js rename to tests/wpt/tests/fetch/api/cors/cors-origin.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-cache.any.js b/tests/wpt/tests/fetch/api/cors/cors-preflight-cache.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-cache.any.js rename to tests/wpt/tests/fetch/api/cors/cors-preflight-cache.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any.js b/tests/wpt/tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any.js rename to tests/wpt/tests/fetch/api/cors/cors-preflight-not-cors-safelisted.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-redirect.any.js b/tests/wpt/tests/fetch/api/cors/cors-preflight-redirect.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-redirect.any.js rename to tests/wpt/tests/fetch/api/cors/cors-preflight-redirect.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-referrer.any.js b/tests/wpt/tests/fetch/api/cors/cors-preflight-referrer.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-referrer.any.js rename to tests/wpt/tests/fetch/api/cors/cors-preflight-referrer.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-response-validation.any.js b/tests/wpt/tests/fetch/api/cors/cors-preflight-response-validation.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-response-validation.any.js rename to tests/wpt/tests/fetch/api/cors/cors-preflight-response-validation.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-star.any.js b/tests/wpt/tests/fetch/api/cors/cors-preflight-star.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-star.any.js rename to tests/wpt/tests/fetch/api/cors/cors-preflight-star.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-status.any.js b/tests/wpt/tests/fetch/api/cors/cors-preflight-status.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-status.any.js rename to tests/wpt/tests/fetch/api/cors/cors-preflight-status.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight.any.js b/tests/wpt/tests/fetch/api/cors/cors-preflight.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight.any.js rename to tests/wpt/tests/fetch/api/cors/cors-preflight.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-redirect-credentials.any.js b/tests/wpt/tests/fetch/api/cors/cors-redirect-credentials.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-redirect-credentials.any.js rename to tests/wpt/tests/fetch/api/cors/cors-redirect-credentials.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-redirect-preflight.any.js b/tests/wpt/tests/fetch/api/cors/cors-redirect-preflight.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-redirect-preflight.any.js rename to tests/wpt/tests/fetch/api/cors/cors-redirect-preflight.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-redirect.any.js b/tests/wpt/tests/fetch/api/cors/cors-redirect.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-redirect.any.js rename to tests/wpt/tests/fetch/api/cors/cors-redirect.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/data-url-iframe.html b/tests/wpt/tests/fetch/api/cors/data-url-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/data-url-iframe.html rename to tests/wpt/tests/fetch/api/cors/data-url-iframe.html diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/data-url-shared-worker.html b/tests/wpt/tests/fetch/api/cors/data-url-shared-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/data-url-shared-worker.html rename to tests/wpt/tests/fetch/api/cors/data-url-shared-worker.html diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/data-url-worker.html b/tests/wpt/tests/fetch/api/cors/data-url-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/data-url-worker.html rename to tests/wpt/tests/fetch/api/cors/data-url-worker.html diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/resources/corspreflight.js b/tests/wpt/tests/fetch/api/cors/resources/corspreflight.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/resources/corspreflight.js rename to tests/wpt/tests/fetch/api/cors/resources/corspreflight.js diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/resources/not-cors-safelisted.json b/tests/wpt/tests/fetch/api/cors/resources/not-cors-safelisted.json similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/resources/not-cors-safelisted.json rename to tests/wpt/tests/fetch/api/cors/resources/not-cors-safelisted.json diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/sandboxed-iframe.html b/tests/wpt/tests/fetch/api/cors/sandboxed-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/cors/sandboxed-iframe.html rename to tests/wpt/tests/fetch/api/cors/sandboxed-iframe.html diff --git a/tests/wpt/web-platform-tests/fetch/api/crashtests/body-window-destroy.html b/tests/wpt/tests/fetch/api/crashtests/body-window-destroy.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/crashtests/body-window-destroy.html rename to tests/wpt/tests/fetch/api/crashtests/body-window-destroy.html diff --git a/tests/wpt/web-platform-tests/fetch/api/crashtests/request.html b/tests/wpt/tests/fetch/api/crashtests/request.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/crashtests/request.html rename to tests/wpt/tests/fetch/api/crashtests/request.html diff --git a/tests/wpt/web-platform-tests/fetch/api/credentials/authentication-basic.any.js b/tests/wpt/tests/fetch/api/credentials/authentication-basic.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/credentials/authentication-basic.any.js rename to tests/wpt/tests/fetch/api/credentials/authentication-basic.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/credentials/authentication-redirection.any.js b/tests/wpt/tests/fetch/api/credentials/authentication-redirection.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/credentials/authentication-redirection.any.js rename to tests/wpt/tests/fetch/api/credentials/authentication-redirection.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/credentials/cookies.any.js b/tests/wpt/tests/fetch/api/credentials/cookies.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/credentials/cookies.any.js rename to tests/wpt/tests/fetch/api/credentials/cookies.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/headers/header-setcookie.any.js b/tests/wpt/tests/fetch/api/headers/header-setcookie.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/headers/header-setcookie.any.js rename to tests/wpt/tests/fetch/api/headers/header-setcookie.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/headers/header-values-normalize.any.js b/tests/wpt/tests/fetch/api/headers/header-values-normalize.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/headers/header-values-normalize.any.js rename to tests/wpt/tests/fetch/api/headers/header-values-normalize.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/headers/header-values.any.js b/tests/wpt/tests/fetch/api/headers/header-values.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/headers/header-values.any.js rename to tests/wpt/tests/fetch/api/headers/header-values.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/headers/headers-basic.any.js b/tests/wpt/tests/fetch/api/headers/headers-basic.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/headers/headers-basic.any.js rename to tests/wpt/tests/fetch/api/headers/headers-basic.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/headers/headers-casing.any.js b/tests/wpt/tests/fetch/api/headers/headers-casing.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/headers/headers-casing.any.js rename to tests/wpt/tests/fetch/api/headers/headers-casing.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/headers/headers-combine.any.js b/tests/wpt/tests/fetch/api/headers/headers-combine.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/headers/headers-combine.any.js rename to tests/wpt/tests/fetch/api/headers/headers-combine.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/headers/headers-errors.any.js b/tests/wpt/tests/fetch/api/headers/headers-errors.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/headers/headers-errors.any.js rename to tests/wpt/tests/fetch/api/headers/headers-errors.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/headers/headers-no-cors.any.js b/tests/wpt/tests/fetch/api/headers/headers-no-cors.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/headers/headers-no-cors.any.js rename to tests/wpt/tests/fetch/api/headers/headers-no-cors.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/headers/headers-normalize.any.js b/tests/wpt/tests/fetch/api/headers/headers-normalize.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/headers/headers-normalize.any.js rename to tests/wpt/tests/fetch/api/headers/headers-normalize.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/headers/headers-record.any.js b/tests/wpt/tests/fetch/api/headers/headers-record.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/headers/headers-record.any.js rename to tests/wpt/tests/fetch/api/headers/headers-record.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/headers/headers-structure.any.js b/tests/wpt/tests/fetch/api/headers/headers-structure.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/headers/headers-structure.any.js rename to tests/wpt/tests/fetch/api/headers/headers-structure.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/idlharness.any.js b/tests/wpt/tests/fetch/api/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/idlharness.any.js rename to tests/wpt/tests/fetch/api/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/csp-blocked-worker.html b/tests/wpt/tests/fetch/api/policies/csp-blocked-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/csp-blocked-worker.html rename to tests/wpt/tests/fetch/api/policies/csp-blocked-worker.html diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/csp-blocked.html b/tests/wpt/tests/fetch/api/policies/csp-blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/csp-blocked.html rename to tests/wpt/tests/fetch/api/policies/csp-blocked.html diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/csp-blocked.html.headers b/tests/wpt/tests/fetch/api/policies/csp-blocked.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/csp-blocked.html.headers rename to tests/wpt/tests/fetch/api/policies/csp-blocked.html.headers diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/csp-blocked.js b/tests/wpt/tests/fetch/api/policies/csp-blocked.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/csp-blocked.js rename to tests/wpt/tests/fetch/api/policies/csp-blocked.js diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/csp-blocked.js.headers b/tests/wpt/tests/fetch/api/policies/csp-blocked.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/csp-blocked.js.headers rename to tests/wpt/tests/fetch/api/policies/csp-blocked.js.headers diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/nested-policy.js b/tests/wpt/tests/fetch/api/policies/nested-policy.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/nested-policy.js rename to tests/wpt/tests/fetch/api/policies/nested-policy.js diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/nested-policy.js.headers b/tests/wpt/tests/fetch/api/policies/nested-policy.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/nested-policy.js.headers rename to tests/wpt/tests/fetch/api/policies/nested-policy.js.headers diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-no-referrer-service-worker.https.html b/tests/wpt/tests/fetch/api/policies/referrer-no-referrer-service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-no-referrer-service-worker.https.html rename to tests/wpt/tests/fetch/api/policies/referrer-no-referrer-service-worker.https.html diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-no-referrer-worker.html b/tests/wpt/tests/fetch/api/policies/referrer-no-referrer-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-no-referrer-worker.html rename to tests/wpt/tests/fetch/api/policies/referrer-no-referrer-worker.html diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-no-referrer.html b/tests/wpt/tests/fetch/api/policies/referrer-no-referrer.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-no-referrer.html rename to tests/wpt/tests/fetch/api/policies/referrer-no-referrer.html diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-no-referrer.html.headers b/tests/wpt/tests/fetch/api/policies/referrer-no-referrer.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-no-referrer.html.headers rename to tests/wpt/tests/fetch/api/policies/referrer-no-referrer.html.headers diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-no-referrer.js b/tests/wpt/tests/fetch/api/policies/referrer-no-referrer.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-no-referrer.js rename to tests/wpt/tests/fetch/api/policies/referrer-no-referrer.js diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-no-referrer.js.headers b/tests/wpt/tests/fetch/api/policies/referrer-no-referrer.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-no-referrer.js.headers rename to tests/wpt/tests/fetch/api/policies/referrer-no-referrer.js.headers diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-service-worker.https.html b/tests/wpt/tests/fetch/api/policies/referrer-origin-service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-service-worker.https.html rename to tests/wpt/tests/fetch/api/policies/referrer-origin-service-worker.https.html diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-when-cross-origin-service-worker.https.html b/tests/wpt/tests/fetch/api/policies/referrer-origin-when-cross-origin-service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-when-cross-origin-service-worker.https.html rename to tests/wpt/tests/fetch/api/policies/referrer-origin-when-cross-origin-service-worker.https.html diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-when-cross-origin-worker.html b/tests/wpt/tests/fetch/api/policies/referrer-origin-when-cross-origin-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-when-cross-origin-worker.html rename to tests/wpt/tests/fetch/api/policies/referrer-origin-when-cross-origin-worker.html diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-when-cross-origin.html b/tests/wpt/tests/fetch/api/policies/referrer-origin-when-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-when-cross-origin.html rename to tests/wpt/tests/fetch/api/policies/referrer-origin-when-cross-origin.html diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-when-cross-origin.html.headers b/tests/wpt/tests/fetch/api/policies/referrer-origin-when-cross-origin.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-when-cross-origin.html.headers rename to tests/wpt/tests/fetch/api/policies/referrer-origin-when-cross-origin.html.headers diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-when-cross-origin.js b/tests/wpt/tests/fetch/api/policies/referrer-origin-when-cross-origin.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-when-cross-origin.js rename to tests/wpt/tests/fetch/api/policies/referrer-origin-when-cross-origin.js diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-when-cross-origin.js.headers b/tests/wpt/tests/fetch/api/policies/referrer-origin-when-cross-origin.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-when-cross-origin.js.headers rename to tests/wpt/tests/fetch/api/policies/referrer-origin-when-cross-origin.js.headers diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-worker.html b/tests/wpt/tests/fetch/api/policies/referrer-origin-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin-worker.html rename to tests/wpt/tests/fetch/api/policies/referrer-origin-worker.html diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin.html b/tests/wpt/tests/fetch/api/policies/referrer-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin.html rename to tests/wpt/tests/fetch/api/policies/referrer-origin.html diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin.html.headers b/tests/wpt/tests/fetch/api/policies/referrer-origin.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin.html.headers rename to tests/wpt/tests/fetch/api/policies/referrer-origin.html.headers diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin.js b/tests/wpt/tests/fetch/api/policies/referrer-origin.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin.js rename to tests/wpt/tests/fetch/api/policies/referrer-origin.js diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin.js.headers b/tests/wpt/tests/fetch/api/policies/referrer-origin.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-origin.js.headers rename to tests/wpt/tests/fetch/api/policies/referrer-origin.js.headers diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-unsafe-url-service-worker.https.html b/tests/wpt/tests/fetch/api/policies/referrer-unsafe-url-service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-unsafe-url-service-worker.https.html rename to tests/wpt/tests/fetch/api/policies/referrer-unsafe-url-service-worker.https.html diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-unsafe-url-worker.html b/tests/wpt/tests/fetch/api/policies/referrer-unsafe-url-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-unsafe-url-worker.html rename to tests/wpt/tests/fetch/api/policies/referrer-unsafe-url-worker.html diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-unsafe-url.html b/tests/wpt/tests/fetch/api/policies/referrer-unsafe-url.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-unsafe-url.html rename to tests/wpt/tests/fetch/api/policies/referrer-unsafe-url.html diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-unsafe-url.html.headers b/tests/wpt/tests/fetch/api/policies/referrer-unsafe-url.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-unsafe-url.html.headers rename to tests/wpt/tests/fetch/api/policies/referrer-unsafe-url.html.headers diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-unsafe-url.js b/tests/wpt/tests/fetch/api/policies/referrer-unsafe-url.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-unsafe-url.js rename to tests/wpt/tests/fetch/api/policies/referrer-unsafe-url.js diff --git a/tests/wpt/web-platform-tests/fetch/api/policies/referrer-unsafe-url.js.headers b/tests/wpt/tests/fetch/api/policies/referrer-unsafe-url.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/policies/referrer-unsafe-url.js.headers rename to tests/wpt/tests/fetch/api/policies/referrer-unsafe-url.js.headers diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-back-to-original-origin.any.js b/tests/wpt/tests/fetch/api/redirect/redirect-back-to-original-origin.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-back-to-original-origin.any.js rename to tests/wpt/tests/fetch/api/redirect/redirect-back-to-original-origin.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count.any.js b/tests/wpt/tests/fetch/api/redirect/redirect-count.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count.any.js rename to tests/wpt/tests/fetch/api/redirect/redirect-count.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location.any.js b/tests/wpt/tests/fetch/api/redirect/redirect-empty-location.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location.any.js rename to tests/wpt/tests/fetch/api/redirect/redirect-empty-location.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-keepalive.any.js b/tests/wpt/tests/fetch/api/redirect/redirect-keepalive.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-keepalive.any.js rename to tests/wpt/tests/fetch/api/redirect/redirect-keepalive.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location-escape.tentative.any.js b/tests/wpt/tests/fetch/api/redirect/redirect-location-escape.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location-escape.tentative.any.js rename to tests/wpt/tests/fetch/api/redirect/redirect-location-escape.tentative.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.any.js b/tests/wpt/tests/fetch/api/redirect/redirect-location.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.any.js rename to tests/wpt/tests/fetch/api/redirect/redirect-location.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-method.any.js b/tests/wpt/tests/fetch/api/redirect/redirect-method.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-method.any.js rename to tests/wpt/tests/fetch/api/redirect/redirect-method.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode.any.js b/tests/wpt/tests/fetch/api/redirect/redirect-mode.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode.any.js rename to tests/wpt/tests/fetch/api/redirect/redirect-mode.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-origin.any.js b/tests/wpt/tests/fetch/api/redirect/redirect-origin.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-origin.any.js rename to tests/wpt/tests/fetch/api/redirect/redirect-origin.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer-override.any.js b/tests/wpt/tests/fetch/api/redirect/redirect-referrer-override.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer-override.any.js rename to tests/wpt/tests/fetch/api/redirect/redirect-referrer-override.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer.any.js b/tests/wpt/tests/fetch/api/redirect/redirect-referrer.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer.any.js rename to tests/wpt/tests/fetch/api/redirect/redirect-referrer.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-schemes.any.js b/tests/wpt/tests/fetch/api/redirect/redirect-schemes.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-schemes.any.js rename to tests/wpt/tests/fetch/api/redirect/redirect-schemes.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl.any.js b/tests/wpt/tests/fetch/api/redirect/redirect-to-dataurl.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl.any.js rename to tests/wpt/tests/fetch/api/redirect/redirect-to-dataurl.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-upload.h2.any.js b/tests/wpt/tests/fetch/api/redirect/redirect-upload.h2.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-upload.h2.any.js rename to tests/wpt/tests/fetch/api/redirect/redirect-upload.h2.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/fetch-destination-frame.https.html b/tests/wpt/tests/fetch/api/request/destination/fetch-destination-frame.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/fetch-destination-frame.https.html rename to tests/wpt/tests/fetch/api/request/destination/fetch-destination-frame.https.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/fetch-destination-iframe.https.html b/tests/wpt/tests/fetch/api/request/destination/fetch-destination-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/fetch-destination-iframe.https.html rename to tests/wpt/tests/fetch/api/request/destination/fetch-destination-iframe.https.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/fetch-destination-no-load-event.https.html b/tests/wpt/tests/fetch/api/request/destination/fetch-destination-no-load-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/fetch-destination-no-load-event.https.html rename to tests/wpt/tests/fetch/api/request/destination/fetch-destination-no-load-event.https.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/fetch-destination-prefetch.https.html b/tests/wpt/tests/fetch/api/request/destination/fetch-destination-prefetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/fetch-destination-prefetch.https.html rename to tests/wpt/tests/fetch/api/request/destination/fetch-destination-prefetch.https.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/fetch-destination-worker.https.html b/tests/wpt/tests/fetch/api/request/destination/fetch-destination-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/fetch-destination-worker.https.html rename to tests/wpt/tests/fetch/api/request/destination/fetch-destination-worker.https.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/fetch-destination.https.html b/tests/wpt/tests/fetch/api/request/destination/fetch-destination.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/fetch-destination.https.html rename to tests/wpt/tests/fetch/api/request/destination/fetch-destination.https.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy b/tests/wpt/tests/fetch/api/request/destination/resources/dummy similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy rename to tests/wpt/tests/fetch/api/request/destination/resources/dummy diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy.es b/tests/wpt/tests/fetch/api/request/destination/resources/dummy.es similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy.es rename to tests/wpt/tests/fetch/api/request/destination/resources/dummy.es diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy.es.headers b/tests/wpt/tests/fetch/api/request/destination/resources/dummy.es.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy.es.headers rename to tests/wpt/tests/fetch/api/request/destination/resources/dummy.es.headers diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy.html b/tests/wpt/tests/fetch/api/request/destination/resources/dummy.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy.html rename to tests/wpt/tests/fetch/api/request/destination/resources/dummy.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy.png b/tests/wpt/tests/fetch/api/request/destination/resources/dummy.png similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy.png rename to tests/wpt/tests/fetch/api/request/destination/resources/dummy.png diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy.ttf b/tests/wpt/tests/fetch/api/request/destination/resources/dummy.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy.ttf rename to tests/wpt/tests/fetch/api/request/destination/resources/dummy.ttf diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy_audio.mp3 b/tests/wpt/tests/fetch/api/request/destination/resources/dummy_audio.mp3 similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy_audio.mp3 rename to tests/wpt/tests/fetch/api/request/destination/resources/dummy_audio.mp3 diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy_audio.oga b/tests/wpt/tests/fetch/api/request/destination/resources/dummy_audio.oga similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy_audio.oga rename to tests/wpt/tests/fetch/api/request/destination/resources/dummy_audio.oga diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy_video.mp4 b/tests/wpt/tests/fetch/api/request/destination/resources/dummy_video.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy_video.mp4 rename to tests/wpt/tests/fetch/api/request/destination/resources/dummy_video.mp4 diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy_video.ogv b/tests/wpt/tests/fetch/api/request/destination/resources/dummy_video.ogv similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy_video.ogv rename to tests/wpt/tests/fetch/api/request/destination/resources/dummy_video.ogv diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy_video.webm b/tests/wpt/tests/fetch/api/request/destination/resources/dummy_video.webm similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/dummy_video.webm rename to tests/wpt/tests/fetch/api/request/destination/resources/dummy_video.webm diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/empty.https.html b/tests/wpt/tests/fetch/api/request/destination/resources/empty.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/empty.https.html rename to tests/wpt/tests/fetch/api/request/destination/resources/empty.https.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/fetch-destination-worker-frame.js b/tests/wpt/tests/fetch/api/request/destination/resources/fetch-destination-worker-frame.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/fetch-destination-worker-frame.js rename to tests/wpt/tests/fetch/api/request/destination/resources/fetch-destination-worker-frame.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/fetch-destination-worker-iframe.js b/tests/wpt/tests/fetch/api/request/destination/resources/fetch-destination-worker-iframe.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/fetch-destination-worker-iframe.js rename to tests/wpt/tests/fetch/api/request/destination/resources/fetch-destination-worker-iframe.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/fetch-destination-worker-no-load-event.js b/tests/wpt/tests/fetch/api/request/destination/resources/fetch-destination-worker-no-load-event.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/fetch-destination-worker-no-load-event.js rename to tests/wpt/tests/fetch/api/request/destination/resources/fetch-destination-worker-no-load-event.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/fetch-destination-worker.js b/tests/wpt/tests/fetch/api/request/destination/resources/fetch-destination-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/fetch-destination-worker.js rename to tests/wpt/tests/fetch/api/request/destination/resources/fetch-destination-worker.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/destination/resources/importer.js b/tests/wpt/tests/fetch/api/request/destination/resources/importer.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/destination/resources/importer.js rename to tests/wpt/tests/fetch/api/request/destination/resources/importer.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/forbidden-method.any.js b/tests/wpt/tests/fetch/api/request/forbidden-method.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/forbidden-method.any.js rename to tests/wpt/tests/fetch/api/request/forbidden-method.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/multi-globals/construct-in-detached-frame.window.js b/tests/wpt/tests/fetch/api/request/multi-globals/construct-in-detached-frame.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/multi-globals/construct-in-detached-frame.window.js rename to tests/wpt/tests/fetch/api/request/multi-globals/construct-in-detached-frame.window.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/multi-globals/current/current.html b/tests/wpt/tests/fetch/api/request/multi-globals/current/current.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/multi-globals/current/current.html rename to tests/wpt/tests/fetch/api/request/multi-globals/current/current.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/multi-globals/incumbent/incumbent.html b/tests/wpt/tests/fetch/api/request/multi-globals/incumbent/incumbent.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/multi-globals/incumbent/incumbent.html rename to tests/wpt/tests/fetch/api/request/multi-globals/incumbent/incumbent.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/multi-globals/url-parsing.html b/tests/wpt/tests/fetch/api/request/multi-globals/url-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/multi-globals/url-parsing.html rename to tests/wpt/tests/fetch/api/request/multi-globals/url-parsing.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-bad-port.any.js b/tests/wpt/tests/fetch/api/request/request-bad-port.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-bad-port.any.js rename to tests/wpt/tests/fetch/api/request/request-bad-port.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-cache-default-conditional.any.js b/tests/wpt/tests/fetch/api/request/request-cache-default-conditional.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-cache-default-conditional.any.js rename to tests/wpt/tests/fetch/api/request/request-cache-default-conditional.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-cache-default.any.js b/tests/wpt/tests/fetch/api/request/request-cache-default.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-cache-default.any.js rename to tests/wpt/tests/fetch/api/request/request-cache-default.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-cache-force-cache.any.js b/tests/wpt/tests/fetch/api/request/request-cache-force-cache.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-cache-force-cache.any.js rename to tests/wpt/tests/fetch/api/request/request-cache-force-cache.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-cache-no-cache.any.js b/tests/wpt/tests/fetch/api/request/request-cache-no-cache.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-cache-no-cache.any.js rename to tests/wpt/tests/fetch/api/request/request-cache-no-cache.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-cache-no-store.any.js b/tests/wpt/tests/fetch/api/request/request-cache-no-store.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-cache-no-store.any.js rename to tests/wpt/tests/fetch/api/request/request-cache-no-store.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-cache-only-if-cached.any.js b/tests/wpt/tests/fetch/api/request/request-cache-only-if-cached.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-cache-only-if-cached.any.js rename to tests/wpt/tests/fetch/api/request/request-cache-only-if-cached.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-cache-reload.any.js b/tests/wpt/tests/fetch/api/request/request-cache-reload.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-cache-reload.any.js rename to tests/wpt/tests/fetch/api/request/request-cache-reload.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-cache.js b/tests/wpt/tests/fetch/api/request/request-cache.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-cache.js rename to tests/wpt/tests/fetch/api/request/request-cache.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-clone.sub.html b/tests/wpt/tests/fetch/api/request/request-clone.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-clone.sub.html rename to tests/wpt/tests/fetch/api/request/request-clone.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-consume-empty.any.js b/tests/wpt/tests/fetch/api/request/request-consume-empty.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-consume-empty.any.js rename to tests/wpt/tests/fetch/api/request/request-consume-empty.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-consume.any.js b/tests/wpt/tests/fetch/api/request/request-consume.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-consume.any.js rename to tests/wpt/tests/fetch/api/request/request-consume.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-disturbed.any.js b/tests/wpt/tests/fetch/api/request/request-disturbed.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-disturbed.any.js rename to tests/wpt/tests/fetch/api/request/request-disturbed.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-error.any.js b/tests/wpt/tests/fetch/api/request/request-error.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-error.any.js rename to tests/wpt/tests/fetch/api/request/request-error.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-error.js b/tests/wpt/tests/fetch/api/request/request-error.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-error.js rename to tests/wpt/tests/fetch/api/request/request-error.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-headers.any.js b/tests/wpt/tests/fetch/api/request/request-headers.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-headers.any.js rename to tests/wpt/tests/fetch/api/request/request-headers.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-init-001.sub.html b/tests/wpt/tests/fetch/api/request/request-init-001.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-init-001.sub.html rename to tests/wpt/tests/fetch/api/request/request-init-001.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-init-002.any.js b/tests/wpt/tests/fetch/api/request/request-init-002.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-init-002.any.js rename to tests/wpt/tests/fetch/api/request/request-init-002.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-init-003.sub.html b/tests/wpt/tests/fetch/api/request/request-init-003.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-init-003.sub.html rename to tests/wpt/tests/fetch/api/request/request-init-003.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-init-contenttype.any.js b/tests/wpt/tests/fetch/api/request/request-init-contenttype.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-init-contenttype.any.js rename to tests/wpt/tests/fetch/api/request/request-init-contenttype.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-init-priority.any.js b/tests/wpt/tests/fetch/api/request/request-init-priority.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-init-priority.any.js rename to tests/wpt/tests/fetch/api/request/request-init-priority.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-init-stream.any.js b/tests/wpt/tests/fetch/api/request/request-init-stream.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-init-stream.any.js rename to tests/wpt/tests/fetch/api/request/request-init-stream.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-keepalive-quota.html b/tests/wpt/tests/fetch/api/request/request-keepalive-quota.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-keepalive-quota.html rename to tests/wpt/tests/fetch/api/request/request-keepalive-quota.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-keepalive.any.js b/tests/wpt/tests/fetch/api/request/request-keepalive.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-keepalive.any.js rename to tests/wpt/tests/fetch/api/request/request-keepalive.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-reset-attributes.https.html b/tests/wpt/tests/fetch/api/request/request-reset-attributes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-reset-attributes.https.html rename to tests/wpt/tests/fetch/api/request/request-reset-attributes.https.html diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-structure.any.js b/tests/wpt/tests/fetch/api/request/request-structure.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/request-structure.any.js rename to tests/wpt/tests/fetch/api/request/request-structure.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/resources/cache.py b/tests/wpt/tests/fetch/api/request/resources/cache.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/resources/cache.py rename to tests/wpt/tests/fetch/api/request/resources/cache.py diff --git a/tests/wpt/web-platform-tests/fetch/api/request/resources/hello.txt b/tests/wpt/tests/fetch/api/request/resources/hello.txt similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/resources/hello.txt rename to tests/wpt/tests/fetch/api/request/resources/hello.txt diff --git a/tests/wpt/web-platform-tests/fetch/api/request/resources/request-reset-attributes-worker.js b/tests/wpt/tests/fetch/api/request/resources/request-reset-attributes-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/resources/request-reset-attributes-worker.js rename to tests/wpt/tests/fetch/api/request/resources/request-reset-attributes-worker.js diff --git a/tests/wpt/web-platform-tests/fetch/api/request/url-encoding.html b/tests/wpt/tests/fetch/api/request/url-encoding.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/request/url-encoding.html rename to tests/wpt/tests/fetch/api/request/url-encoding.html diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/authentication.py b/tests/wpt/tests/fetch/api/resources/authentication.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/authentication.py rename to tests/wpt/tests/fetch/api/resources/authentication.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/bad-chunk-encoding.py b/tests/wpt/tests/fetch/api/resources/bad-chunk-encoding.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/bad-chunk-encoding.py rename to tests/wpt/tests/fetch/api/resources/bad-chunk-encoding.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/basic.html b/tests/wpt/tests/fetch/api/resources/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/basic.html rename to tests/wpt/tests/fetch/api/resources/basic.html diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/cache.py b/tests/wpt/tests/fetch/api/resources/cache.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/cache.py rename to tests/wpt/tests/fetch/api/resources/cache.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/clean-stash.py b/tests/wpt/tests/fetch/api/resources/clean-stash.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/clean-stash.py rename to tests/wpt/tests/fetch/api/resources/clean-stash.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/cors-top.txt b/tests/wpt/tests/fetch/api/resources/cors-top.txt similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/cors-top.txt rename to tests/wpt/tests/fetch/api/resources/cors-top.txt diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/cors-top.txt.headers b/tests/wpt/tests/fetch/api/resources/cors-top.txt.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/cors-top.txt.headers rename to tests/wpt/tests/fetch/api/resources/cors-top.txt.headers diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/data.json b/tests/wpt/tests/fetch/api/resources/data.json similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/data.json rename to tests/wpt/tests/fetch/api/resources/data.json diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/dump-authorization-header.py b/tests/wpt/tests/fetch/api/resources/dump-authorization-header.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/dump-authorization-header.py rename to tests/wpt/tests/fetch/api/resources/dump-authorization-header.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/echo-content.h2.py b/tests/wpt/tests/fetch/api/resources/echo-content.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/echo-content.h2.py rename to tests/wpt/tests/fetch/api/resources/echo-content.h2.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/echo-content.py b/tests/wpt/tests/fetch/api/resources/echo-content.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/echo-content.py rename to tests/wpt/tests/fetch/api/resources/echo-content.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/empty.txt b/tests/wpt/tests/fetch/api/resources/empty.txt similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/empty.txt rename to tests/wpt/tests/fetch/api/resources/empty.txt diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/infinite-slow-response.py b/tests/wpt/tests/fetch/api/resources/infinite-slow-response.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/infinite-slow-response.py rename to tests/wpt/tests/fetch/api/resources/infinite-slow-response.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/inspect-headers.py b/tests/wpt/tests/fetch/api/resources/inspect-headers.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/inspect-headers.py rename to tests/wpt/tests/fetch/api/resources/inspect-headers.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/keepalive-helper.js b/tests/wpt/tests/fetch/api/resources/keepalive-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/keepalive-helper.js rename to tests/wpt/tests/fetch/api/resources/keepalive-helper.js diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/keepalive-iframe.html b/tests/wpt/tests/fetch/api/resources/keepalive-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/keepalive-iframe.html rename to tests/wpt/tests/fetch/api/resources/keepalive-iframe.html diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/keepalive-redirect-iframe.html b/tests/wpt/tests/fetch/api/resources/keepalive-redirect-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/keepalive-redirect-iframe.html rename to tests/wpt/tests/fetch/api/resources/keepalive-redirect-iframe.html diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/keepalive-redirect-window.html b/tests/wpt/tests/fetch/api/resources/keepalive-redirect-window.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/keepalive-redirect-window.html rename to tests/wpt/tests/fetch/api/resources/keepalive-redirect-window.html diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/method.py b/tests/wpt/tests/fetch/api/resources/method.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/method.py rename to tests/wpt/tests/fetch/api/resources/method.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/preflight.py b/tests/wpt/tests/fetch/api/resources/preflight.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/preflight.py rename to tests/wpt/tests/fetch/api/resources/preflight.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/redirect-empty-location.py b/tests/wpt/tests/fetch/api/resources/redirect-empty-location.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/redirect-empty-location.py rename to tests/wpt/tests/fetch/api/resources/redirect-empty-location.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/redirect.h2.py b/tests/wpt/tests/fetch/api/resources/redirect.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/redirect.h2.py rename to tests/wpt/tests/fetch/api/resources/redirect.h2.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/redirect.py b/tests/wpt/tests/fetch/api/resources/redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/redirect.py rename to tests/wpt/tests/fetch/api/resources/redirect.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/sandboxed-iframe.html b/tests/wpt/tests/fetch/api/resources/sandboxed-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/sandboxed-iframe.html rename to tests/wpt/tests/fetch/api/resources/sandboxed-iframe.html diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/script-with-header.py b/tests/wpt/tests/fetch/api/resources/script-with-header.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/script-with-header.py rename to tests/wpt/tests/fetch/api/resources/script-with-header.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/stash-put.py b/tests/wpt/tests/fetch/api/resources/stash-put.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/stash-put.py rename to tests/wpt/tests/fetch/api/resources/stash-put.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/stash-take.py b/tests/wpt/tests/fetch/api/resources/stash-take.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/stash-take.py rename to tests/wpt/tests/fetch/api/resources/stash-take.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/status.py b/tests/wpt/tests/fetch/api/resources/status.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/status.py rename to tests/wpt/tests/fetch/api/resources/status.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/sw-intercept-abort.js b/tests/wpt/tests/fetch/api/resources/sw-intercept-abort.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/sw-intercept-abort.js rename to tests/wpt/tests/fetch/api/resources/sw-intercept-abort.js diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/sw-intercept.js b/tests/wpt/tests/fetch/api/resources/sw-intercept.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/sw-intercept.js rename to tests/wpt/tests/fetch/api/resources/sw-intercept.js diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/top.txt b/tests/wpt/tests/fetch/api/resources/top.txt similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/top.txt rename to tests/wpt/tests/fetch/api/resources/top.txt diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/trickle.py b/tests/wpt/tests/fetch/api/resources/trickle.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/trickle.py rename to tests/wpt/tests/fetch/api/resources/trickle.py diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/utils.js b/tests/wpt/tests/fetch/api/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/resources/utils.js rename to tests/wpt/tests/fetch/api/resources/utils.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/json.any.js b/tests/wpt/tests/fetch/api/response/json.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/json.any.js rename to tests/wpt/tests/fetch/api/response/json.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/many-empty-chunks-crash.html b/tests/wpt/tests/fetch/api/response/many-empty-chunks-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/many-empty-chunks-crash.html rename to tests/wpt/tests/fetch/api/response/many-empty-chunks-crash.html diff --git a/tests/wpt/web-platform-tests/fetch/api/response/multi-globals/current/current.html b/tests/wpt/tests/fetch/api/response/multi-globals/current/current.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/multi-globals/current/current.html rename to tests/wpt/tests/fetch/api/response/multi-globals/current/current.html diff --git a/tests/wpt/web-platform-tests/fetch/api/response/multi-globals/incumbent/incumbent.html b/tests/wpt/tests/fetch/api/response/multi-globals/incumbent/incumbent.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/multi-globals/incumbent/incumbent.html rename to tests/wpt/tests/fetch/api/response/multi-globals/incumbent/incumbent.html diff --git a/tests/wpt/web-platform-tests/fetch/api/response/multi-globals/relevant/relevant.html b/tests/wpt/tests/fetch/api/response/multi-globals/relevant/relevant.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/multi-globals/relevant/relevant.html rename to tests/wpt/tests/fetch/api/response/multi-globals/relevant/relevant.html diff --git a/tests/wpt/web-platform-tests/fetch/api/response/multi-globals/url-parsing.html b/tests/wpt/tests/fetch/api/response/multi-globals/url-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/multi-globals/url-parsing.html rename to tests/wpt/tests/fetch/api/response/multi-globals/url-parsing.html diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-body-read-task-handling.html b/tests/wpt/tests/fetch/api/response/response-body-read-task-handling.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-body-read-task-handling.html rename to tests/wpt/tests/fetch/api/response/response-body-read-task-handling.html diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-cancel-stream.any.js b/tests/wpt/tests/fetch/api/response/response-cancel-stream.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-cancel-stream.any.js rename to tests/wpt/tests/fetch/api/response/response-cancel-stream.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-clone-iframe.window.js b/tests/wpt/tests/fetch/api/response/response-clone-iframe.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-clone-iframe.window.js rename to tests/wpt/tests/fetch/api/response/response-clone-iframe.window.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-clone.any.js b/tests/wpt/tests/fetch/api/response/response-clone.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-clone.any.js rename to tests/wpt/tests/fetch/api/response/response-clone.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-consume-empty.any.js b/tests/wpt/tests/fetch/api/response/response-consume-empty.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-consume-empty.any.js rename to tests/wpt/tests/fetch/api/response/response-consume-empty.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-consume-stream.any.js b/tests/wpt/tests/fetch/api/response/response-consume-stream.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-consume-stream.any.js rename to tests/wpt/tests/fetch/api/response/response-consume-stream.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-consume.html b/tests/wpt/tests/fetch/api/response/response-consume.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-consume.html rename to tests/wpt/tests/fetch/api/response/response-consume.html diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-error-from-stream.any.js b/tests/wpt/tests/fetch/api/response/response-error-from-stream.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-error-from-stream.any.js rename to tests/wpt/tests/fetch/api/response/response-error-from-stream.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-error.any.js b/tests/wpt/tests/fetch/api/response/response-error.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-error.any.js rename to tests/wpt/tests/fetch/api/response/response-error.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-from-stream.any.js b/tests/wpt/tests/fetch/api/response/response-from-stream.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-from-stream.any.js rename to tests/wpt/tests/fetch/api/response/response-from-stream.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-init-001.any.js b/tests/wpt/tests/fetch/api/response/response-init-001.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-init-001.any.js rename to tests/wpt/tests/fetch/api/response/response-init-001.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-init-002.any.js b/tests/wpt/tests/fetch/api/response/response-init-002.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-init-002.any.js rename to tests/wpt/tests/fetch/api/response/response-init-002.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-init-contenttype.any.js b/tests/wpt/tests/fetch/api/response/response-init-contenttype.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-init-contenttype.any.js rename to tests/wpt/tests/fetch/api/response/response-init-contenttype.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-static-error.any.js b/tests/wpt/tests/fetch/api/response/response-static-error.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-static-error.any.js rename to tests/wpt/tests/fetch/api/response/response-static-error.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-static-json.any.js b/tests/wpt/tests/fetch/api/response/response-static-json.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-static-json.any.js rename to tests/wpt/tests/fetch/api/response/response-static-json.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-static-redirect.any.js b/tests/wpt/tests/fetch/api/response/response-static-redirect.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-static-redirect.any.js rename to tests/wpt/tests/fetch/api/response/response-static-redirect.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-stream-bad-chunk.any.js b/tests/wpt/tests/fetch/api/response/response-stream-bad-chunk.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-stream-bad-chunk.any.js rename to tests/wpt/tests/fetch/api/response/response-stream-bad-chunk.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-1.any.js b/tests/wpt/tests/fetch/api/response/response-stream-disturbed-1.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-1.any.js rename to tests/wpt/tests/fetch/api/response/response-stream-disturbed-1.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-2.any.js b/tests/wpt/tests/fetch/api/response/response-stream-disturbed-2.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-2.any.js rename to tests/wpt/tests/fetch/api/response/response-stream-disturbed-2.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-3.any.js b/tests/wpt/tests/fetch/api/response/response-stream-disturbed-3.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-3.any.js rename to tests/wpt/tests/fetch/api/response/response-stream-disturbed-3.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-4.any.js b/tests/wpt/tests/fetch/api/response/response-stream-disturbed-4.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-4.any.js rename to tests/wpt/tests/fetch/api/response/response-stream-disturbed-4.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-5.any.js b/tests/wpt/tests/fetch/api/response/response-stream-disturbed-5.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-5.any.js rename to tests/wpt/tests/fetch/api/response/response-stream-disturbed-5.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-6.any.js b/tests/wpt/tests/fetch/api/response/response-stream-disturbed-6.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-6.any.js rename to tests/wpt/tests/fetch/api/response/response-stream-disturbed-6.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-by-pipe.any.js b/tests/wpt/tests/fetch/api/response/response-stream-disturbed-by-pipe.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-by-pipe.any.js rename to tests/wpt/tests/fetch/api/response/response-stream-disturbed-by-pipe.any.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-util.js b/tests/wpt/tests/fetch/api/response/response-stream-disturbed-util.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-util.js rename to tests/wpt/tests/fetch/api/response/response-stream-disturbed-util.js diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-stream-with-broken-then.any.js b/tests/wpt/tests/fetch/api/response/response-stream-with-broken-then.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/api/response/response-stream-with-broken-then.any.js rename to tests/wpt/tests/fetch/api/response/response-stream-with-broken-then.any.js diff --git a/tests/wpt/web-platform-tests/fetch/connection-pool/network-partition-key.html b/tests/wpt/tests/fetch/connection-pool/network-partition-key.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/connection-pool/network-partition-key.html rename to tests/wpt/tests/fetch/connection-pool/network-partition-key.html diff --git a/tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-about-blank-checker.html b/tests/wpt/tests/fetch/connection-pool/resources/network-partition-about-blank-checker.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-about-blank-checker.html rename to tests/wpt/tests/fetch/connection-pool/resources/network-partition-about-blank-checker.html diff --git a/tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-checker.html b/tests/wpt/tests/fetch/connection-pool/resources/network-partition-checker.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-checker.html rename to tests/wpt/tests/fetch/connection-pool/resources/network-partition-checker.html diff --git a/tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-iframe-checker.html b/tests/wpt/tests/fetch/connection-pool/resources/network-partition-iframe-checker.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-iframe-checker.html rename to tests/wpt/tests/fetch/connection-pool/resources/network-partition-iframe-checker.html diff --git a/tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-key.js b/tests/wpt/tests/fetch/connection-pool/resources/network-partition-key.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-key.js rename to tests/wpt/tests/fetch/connection-pool/resources/network-partition-key.js diff --git a/tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-key.py b/tests/wpt/tests/fetch/connection-pool/resources/network-partition-key.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-key.py rename to tests/wpt/tests/fetch/connection-pool/resources/network-partition-key.py diff --git a/tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-worker-checker.html b/tests/wpt/tests/fetch/connection-pool/resources/network-partition-worker-checker.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-worker-checker.html rename to tests/wpt/tests/fetch/connection-pool/resources/network-partition-worker-checker.html diff --git a/tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-worker.js b/tests/wpt/tests/fetch/connection-pool/resources/network-partition-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-worker.js rename to tests/wpt/tests/fetch/connection-pool/resources/network-partition-worker.js diff --git a/tests/wpt/web-platform-tests/fetch/content-encoding/bad-gzip-body.any.js b/tests/wpt/tests/fetch/content-encoding/bad-gzip-body.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-encoding/bad-gzip-body.any.js rename to tests/wpt/tests/fetch/content-encoding/bad-gzip-body.any.js diff --git a/tests/wpt/web-platform-tests/fetch/content-encoding/gzip-body.any.js b/tests/wpt/tests/fetch/content-encoding/gzip-body.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-encoding/gzip-body.any.js rename to tests/wpt/tests/fetch/content-encoding/gzip-body.any.js diff --git a/tests/wpt/web-platform-tests/fetch/content-encoding/resources/bad-gzip-body.py b/tests/wpt/tests/fetch/content-encoding/resources/bad-gzip-body.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-encoding/resources/bad-gzip-body.py rename to tests/wpt/tests/fetch/content-encoding/resources/bad-gzip-body.py diff --git a/tests/wpt/web-platform-tests/fetch/content-encoding/resources/foo.octetstream.gz b/tests/wpt/tests/fetch/content-encoding/resources/foo.octetstream.gz similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-encoding/resources/foo.octetstream.gz rename to tests/wpt/tests/fetch/content-encoding/resources/foo.octetstream.gz diff --git a/tests/wpt/web-platform-tests/fetch/content-encoding/resources/foo.octetstream.gz.headers b/tests/wpt/tests/fetch/content-encoding/resources/foo.octetstream.gz.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-encoding/resources/foo.octetstream.gz.headers rename to tests/wpt/tests/fetch/content-encoding/resources/foo.octetstream.gz.headers diff --git a/tests/wpt/web-platform-tests/fetch/content-encoding/resources/foo.text.gz b/tests/wpt/tests/fetch/content-encoding/resources/foo.text.gz similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-encoding/resources/foo.text.gz rename to tests/wpt/tests/fetch/content-encoding/resources/foo.text.gz diff --git a/tests/wpt/web-platform-tests/fetch/content-encoding/resources/foo.text.gz.headers b/tests/wpt/tests/fetch/content-encoding/resources/foo.text.gz.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-encoding/resources/foo.text.gz.headers rename to tests/wpt/tests/fetch/content-encoding/resources/foo.text.gz.headers diff --git a/tests/wpt/web-platform-tests/fetch/content-length/api-and-duplicate-headers.any.js b/tests/wpt/tests/fetch/content-length/api-and-duplicate-headers.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-length/api-and-duplicate-headers.any.js rename to tests/wpt/tests/fetch/content-length/api-and-duplicate-headers.any.js diff --git a/tests/wpt/web-platform-tests/fetch/content-length/content-length.html b/tests/wpt/tests/fetch/content-length/content-length.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-length/content-length.html rename to tests/wpt/tests/fetch/content-length/content-length.html diff --git a/tests/wpt/web-platform-tests/fetch/content-length/content-length.html.headers b/tests/wpt/tests/fetch/content-length/content-length.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-length/content-length.html.headers rename to tests/wpt/tests/fetch/content-length/content-length.html.headers diff --git a/tests/wpt/web-platform-tests/fetch/content-length/parsing.window.js b/tests/wpt/tests/fetch/content-length/parsing.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-length/parsing.window.js rename to tests/wpt/tests/fetch/content-length/parsing.window.js diff --git a/tests/wpt/web-platform-tests/fetch/content-length/resources/content-length.py b/tests/wpt/tests/fetch/content-length/resources/content-length.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-length/resources/content-length.py rename to tests/wpt/tests/fetch/content-length/resources/content-length.py diff --git a/tests/wpt/web-platform-tests/fetch/content-length/resources/content-lengths.json b/tests/wpt/tests/fetch/content-length/resources/content-lengths.json similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-length/resources/content-lengths.json rename to tests/wpt/tests/fetch/content-length/resources/content-lengths.json diff --git a/tests/wpt/web-platform-tests/fetch/content-length/resources/identical-duplicates.asis b/tests/wpt/tests/fetch/content-length/resources/identical-duplicates.asis similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-length/resources/identical-duplicates.asis rename to tests/wpt/tests/fetch/content-length/resources/identical-duplicates.asis diff --git a/tests/wpt/web-platform-tests/fetch/content-length/too-long.window.js b/tests/wpt/tests/fetch/content-length/too-long.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-length/too-long.window.js rename to tests/wpt/tests/fetch/content-length/too-long.window.js diff --git a/tests/wpt/web-platform-tests/fetch/content-type/README.md b/tests/wpt/tests/fetch/content-type/README.md similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-type/README.md rename to tests/wpt/tests/fetch/content-type/README.md diff --git a/tests/wpt/web-platform-tests/fetch/content-type/multipart-malformed.any.js b/tests/wpt/tests/fetch/content-type/multipart-malformed.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-type/multipart-malformed.any.js rename to tests/wpt/tests/fetch/content-type/multipart-malformed.any.js diff --git a/tests/wpt/web-platform-tests/fetch/content-type/multipart.window.js b/tests/wpt/tests/fetch/content-type/multipart.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-type/multipart.window.js rename to tests/wpt/tests/fetch/content-type/multipart.window.js diff --git a/tests/wpt/web-platform-tests/fetch/content-type/resources/content-type.py b/tests/wpt/tests/fetch/content-type/resources/content-type.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-type/resources/content-type.py rename to tests/wpt/tests/fetch/content-type/resources/content-type.py diff --git a/tests/wpt/web-platform-tests/fetch/content-type/resources/content-types.json b/tests/wpt/tests/fetch/content-type/resources/content-types.json similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-type/resources/content-types.json rename to tests/wpt/tests/fetch/content-type/resources/content-types.json diff --git a/tests/wpt/web-platform-tests/fetch/content-type/resources/script-content-types.json b/tests/wpt/tests/fetch/content-type/resources/script-content-types.json similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-type/resources/script-content-types.json rename to tests/wpt/tests/fetch/content-type/resources/script-content-types.json diff --git a/tests/wpt/web-platform-tests/fetch/content-type/response.window.js b/tests/wpt/tests/fetch/content-type/response.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-type/response.window.js rename to tests/wpt/tests/fetch/content-type/response.window.js diff --git a/tests/wpt/web-platform-tests/fetch/content-type/script.window.js b/tests/wpt/tests/fetch/content-type/script.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/content-type/script.window.js rename to tests/wpt/tests/fetch/content-type/script.window.js diff --git a/tests/wpt/web-platform-tests/fetch/corb/README.md b/tests/wpt/tests/fetch/corb/README.md similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/README.md rename to tests/wpt/tests/fetch/corb/README.md diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-html-correctly-labeled.sub-ref.html b/tests/wpt/tests/fetch/corb/img-html-correctly-labeled.sub-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/img-html-correctly-labeled.sub-ref.html rename to tests/wpt/tests/fetch/corb/img-html-correctly-labeled.sub-ref.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-html-correctly-labeled.sub.html b/tests/wpt/tests/fetch/corb/img-html-correctly-labeled.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/img-html-correctly-labeled.sub.html rename to tests/wpt/tests/fetch/corb/img-html-correctly-labeled.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-mime-types-coverage.tentative.sub.html b/tests/wpt/tests/fetch/corb/img-mime-types-coverage.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/img-mime-types-coverage.tentative.sub.html rename to tests/wpt/tests/fetch/corb/img-mime-types-coverage.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub-ref.html b/tests/wpt/tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub-ref.html rename to tests/wpt/tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub-ref.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub.html b/tests/wpt/tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub.html rename to tests/wpt/tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html.sub-ref.html b/tests/wpt/tests/fetch/corb/img-png-mislabeled-as-html.sub-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html.sub-ref.html rename to tests/wpt/tests/fetch/corb/img-png-mislabeled-as-html.sub-ref.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html.sub.html b/tests/wpt/tests/fetch/corb/img-png-mislabeled-as-html.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html.sub.html rename to tests/wpt/tests/fetch/corb/img-png-mislabeled-as-html.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-svg-doctype-html-mimetype-empty.sub.html b/tests/wpt/tests/fetch/corb/img-svg-doctype-html-mimetype-empty.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/img-svg-doctype-html-mimetype-empty.sub.html rename to tests/wpt/tests/fetch/corb/img-svg-doctype-html-mimetype-empty.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-svg-doctype-html-mimetype-svg.sub.html b/tests/wpt/tests/fetch/corb/img-svg-doctype-html-mimetype-svg.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/img-svg-doctype-html-mimetype-svg.sub.html rename to tests/wpt/tests/fetch/corb/img-svg-doctype-html-mimetype-svg.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-svg-invalid.sub-ref.html b/tests/wpt/tests/fetch/corb/img-svg-invalid.sub-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/img-svg-invalid.sub-ref.html rename to tests/wpt/tests/fetch/corb/img-svg-invalid.sub-ref.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-svg-labeled-as-dash.sub.html b/tests/wpt/tests/fetch/corb/img-svg-labeled-as-dash.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/img-svg-labeled-as-dash.sub.html rename to tests/wpt/tests/fetch/corb/img-svg-labeled-as-dash.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-svg-labeled-as-svg-xml.sub.html b/tests/wpt/tests/fetch/corb/img-svg-labeled-as-svg-xml.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/img-svg-labeled-as-svg-xml.sub.html rename to tests/wpt/tests/fetch/corb/img-svg-labeled-as-svg-xml.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-svg-xml-decl.sub.html b/tests/wpt/tests/fetch/corb/img-svg-xml-decl.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/img-svg-xml-decl.sub.html rename to tests/wpt/tests/fetch/corb/img-svg-xml-decl.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-svg.sub-ref.html b/tests/wpt/tests/fetch/corb/img-svg.sub-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/img-svg.sub-ref.html rename to tests/wpt/tests/fetch/corb/img-svg.sub-ref.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/preload-image-png-mislabeled-as-html-nosniff.tentative.sub.html b/tests/wpt/tests/fetch/corb/preload-image-png-mislabeled-as-html-nosniff.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/preload-image-png-mislabeled-as-html-nosniff.tentative.sub.html rename to tests/wpt/tests/fetch/corb/preload-image-png-mislabeled-as-html-nosniff.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/css-mislabeled-as-html-nosniff.css b/tests/wpt/tests/fetch/corb/resources/css-mislabeled-as-html-nosniff.css similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/css-mislabeled-as-html-nosniff.css rename to tests/wpt/tests/fetch/corb/resources/css-mislabeled-as-html-nosniff.css diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/css-mislabeled-as-html-nosniff.css.headers b/tests/wpt/tests/fetch/corb/resources/css-mislabeled-as-html-nosniff.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/css-mislabeled-as-html-nosniff.css.headers rename to tests/wpt/tests/fetch/corb/resources/css-mislabeled-as-html-nosniff.css.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/css-mislabeled-as-html.css b/tests/wpt/tests/fetch/corb/resources/css-mislabeled-as-html.css similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/css-mislabeled-as-html.css rename to tests/wpt/tests/fetch/corb/resources/css-mislabeled-as-html.css diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/css-mislabeled-as-html.css.headers b/tests/wpt/tests/fetch/corb/resources/css-mislabeled-as-html.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/css-mislabeled-as-html.css.headers rename to tests/wpt/tests/fetch/corb/resources/css-mislabeled-as-html.css.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/css-with-json-parser-breaker.css b/tests/wpt/tests/fetch/corb/resources/css-with-json-parser-breaker.css similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/css-with-json-parser-breaker.css rename to tests/wpt/tests/fetch/corb/resources/css-with-json-parser-breaker.css diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/empty-labeled-as-png.png b/tests/wpt/tests/fetch/corb/resources/empty-labeled-as-png.png similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/empty-labeled-as-png.png rename to tests/wpt/tests/fetch/corb/resources/empty-labeled-as-png.png diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/empty-labeled-as-png.png.headers b/tests/wpt/tests/fetch/corb/resources/empty-labeled-as-png.png.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/empty-labeled-as-png.png.headers rename to tests/wpt/tests/fetch/corb/resources/empty-labeled-as-png.png.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/html-correctly-labeled.html b/tests/wpt/tests/fetch/corb/resources/html-correctly-labeled.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/html-correctly-labeled.html rename to tests/wpt/tests/fetch/corb/resources/html-correctly-labeled.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/html-correctly-labeled.html.headers b/tests/wpt/tests/fetch/corb/resources/html-correctly-labeled.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/html-correctly-labeled.html.headers rename to tests/wpt/tests/fetch/corb/resources/html-correctly-labeled.html.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot.js b/tests/wpt/tests/fetch/corb/resources/html-js-polyglot.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot.js rename to tests/wpt/tests/fetch/corb/resources/html-js-polyglot.js diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot.js.headers b/tests/wpt/tests/fetch/corb/resources/html-js-polyglot.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot.js.headers rename to tests/wpt/tests/fetch/corb/resources/html-js-polyglot.js.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot2.js b/tests/wpt/tests/fetch/corb/resources/html-js-polyglot2.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot2.js rename to tests/wpt/tests/fetch/corb/resources/html-js-polyglot2.js diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot2.js.headers b/tests/wpt/tests/fetch/corb/resources/html-js-polyglot2.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot2.js.headers rename to tests/wpt/tests/fetch/corb/resources/html-js-polyglot2.js.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/js-mislabeled-as-html-nosniff.js b/tests/wpt/tests/fetch/corb/resources/js-mislabeled-as-html-nosniff.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/js-mislabeled-as-html-nosniff.js rename to tests/wpt/tests/fetch/corb/resources/js-mislabeled-as-html-nosniff.js diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/js-mislabeled-as-html-nosniff.js.headers b/tests/wpt/tests/fetch/corb/resources/js-mislabeled-as-html-nosniff.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/js-mislabeled-as-html-nosniff.js.headers rename to tests/wpt/tests/fetch/corb/resources/js-mislabeled-as-html-nosniff.js.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/js-mislabeled-as-html.js b/tests/wpt/tests/fetch/corb/resources/js-mislabeled-as-html.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/js-mislabeled-as-html.js rename to tests/wpt/tests/fetch/corb/resources/js-mislabeled-as-html.js diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/js-mislabeled-as-html.js.headers b/tests/wpt/tests/fetch/corb/resources/js-mislabeled-as-html.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/js-mislabeled-as-html.js.headers rename to tests/wpt/tests/fetch/corb/resources/js-mislabeled-as-html.js.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/png-correctly-labeled.png b/tests/wpt/tests/fetch/corb/resources/png-correctly-labeled.png similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/png-correctly-labeled.png rename to tests/wpt/tests/fetch/corb/resources/png-correctly-labeled.png diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/png-correctly-labeled.png.headers b/tests/wpt/tests/fetch/corb/resources/png-correctly-labeled.png.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/png-correctly-labeled.png.headers rename to tests/wpt/tests/fetch/corb/resources/png-correctly-labeled.png.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/png-mislabeled-as-html-nosniff.png b/tests/wpt/tests/fetch/corb/resources/png-mislabeled-as-html-nosniff.png similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/png-mislabeled-as-html-nosniff.png rename to tests/wpt/tests/fetch/corb/resources/png-mislabeled-as-html-nosniff.png diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/png-mislabeled-as-html-nosniff.png.headers b/tests/wpt/tests/fetch/corb/resources/png-mislabeled-as-html-nosniff.png.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/png-mislabeled-as-html-nosniff.png.headers rename to tests/wpt/tests/fetch/corb/resources/png-mislabeled-as-html-nosniff.png.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/png-mislabeled-as-html.png b/tests/wpt/tests/fetch/corb/resources/png-mislabeled-as-html.png similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/png-mislabeled-as-html.png rename to tests/wpt/tests/fetch/corb/resources/png-mislabeled-as-html.png diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/png-mislabeled-as-html.png.headers b/tests/wpt/tests/fetch/corb/resources/png-mislabeled-as-html.png.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/png-mislabeled-as-html.png.headers rename to tests/wpt/tests/fetch/corb/resources/png-mislabeled-as-html.png.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/response_block_probe.js b/tests/wpt/tests/fetch/corb/resources/response_block_probe.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/response_block_probe.js rename to tests/wpt/tests/fetch/corb/resources/response_block_probe.js diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/response_block_probe.js.headers b/tests/wpt/tests/fetch/corb/resources/response_block_probe.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/response_block_probe.js.headers rename to tests/wpt/tests/fetch/corb/resources/response_block_probe.js.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/sniffable-resource.py b/tests/wpt/tests/fetch/corb/resources/sniffable-resource.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/sniffable-resource.py rename to tests/wpt/tests/fetch/corb/resources/sniffable-resource.py diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/subframe-that-posts-html-containing-blob-url-to-parent.html b/tests/wpt/tests/fetch/corb/resources/subframe-that-posts-html-containing-blob-url-to-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/subframe-that-posts-html-containing-blob-url-to-parent.html rename to tests/wpt/tests/fetch/corb/resources/subframe-that-posts-html-containing-blob-url-to-parent.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/svg-doctype-html-mimetype-empty.svg b/tests/wpt/tests/fetch/corb/resources/svg-doctype-html-mimetype-empty.svg similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/svg-doctype-html-mimetype-empty.svg rename to tests/wpt/tests/fetch/corb/resources/svg-doctype-html-mimetype-empty.svg diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/svg-doctype-html-mimetype-empty.svg.headers b/tests/wpt/tests/fetch/corb/resources/svg-doctype-html-mimetype-empty.svg.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/svg-doctype-html-mimetype-empty.svg.headers rename to tests/wpt/tests/fetch/corb/resources/svg-doctype-html-mimetype-empty.svg.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/svg-doctype-html-mimetype-svg.svg b/tests/wpt/tests/fetch/corb/resources/svg-doctype-html-mimetype-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/svg-doctype-html-mimetype-svg.svg rename to tests/wpt/tests/fetch/corb/resources/svg-doctype-html-mimetype-svg.svg diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/svg-doctype-html-mimetype-svg.svg.headers b/tests/wpt/tests/fetch/corb/resources/svg-doctype-html-mimetype-svg.svg.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/svg-doctype-html-mimetype-svg.svg.headers rename to tests/wpt/tests/fetch/corb/resources/svg-doctype-html-mimetype-svg.svg.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/svg-labeled-as-dash.svg b/tests/wpt/tests/fetch/corb/resources/svg-labeled-as-dash.svg similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/svg-labeled-as-dash.svg rename to tests/wpt/tests/fetch/corb/resources/svg-labeled-as-dash.svg diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/svg-labeled-as-dash.svg.headers b/tests/wpt/tests/fetch/corb/resources/svg-labeled-as-dash.svg.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/svg-labeled-as-dash.svg.headers rename to tests/wpt/tests/fetch/corb/resources/svg-labeled-as-dash.svg.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/svg-labeled-as-svg-xml.svg b/tests/wpt/tests/fetch/corb/resources/svg-labeled-as-svg-xml.svg similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/svg-labeled-as-svg-xml.svg rename to tests/wpt/tests/fetch/corb/resources/svg-labeled-as-svg-xml.svg diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/svg-labeled-as-svg-xml.svg.headers b/tests/wpt/tests/fetch/corb/resources/svg-labeled-as-svg-xml.svg.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/svg-labeled-as-svg-xml.svg.headers rename to tests/wpt/tests/fetch/corb/resources/svg-labeled-as-svg-xml.svg.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/svg-xml-decl.svg b/tests/wpt/tests/fetch/corb/resources/svg-xml-decl.svg similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/svg-xml-decl.svg rename to tests/wpt/tests/fetch/corb/resources/svg-xml-decl.svg diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/svg.svg b/tests/wpt/tests/fetch/corb/resources/svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/svg.svg rename to tests/wpt/tests/fetch/corb/resources/svg.svg diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/svg.svg.headers b/tests/wpt/tests/fetch/corb/resources/svg.svg.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/resources/svg.svg.headers rename to tests/wpt/tests/fetch/corb/resources/svg.svg.headers diff --git a/tests/wpt/web-platform-tests/fetch/corb/response_block.tentative.sub.https.html b/tests/wpt/tests/fetch/corb/response_block.tentative.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/response_block.tentative.sub.https.html rename to tests/wpt/tests/fetch/corb/response_block.tentative.sub.https.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/script-html-correctly-labeled.tentative.sub.html b/tests/wpt/tests/fetch/corb/script-html-correctly-labeled.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/script-html-correctly-labeled.tentative.sub.html rename to tests/wpt/tests/fetch/corb/script-html-correctly-labeled.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/script-html-js-polyglot.sub.html b/tests/wpt/tests/fetch/corb/script-html-js-polyglot.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/script-html-js-polyglot.sub.html rename to tests/wpt/tests/fetch/corb/script-html-js-polyglot.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/script-html-via-cross-origin-blob-url.sub.html b/tests/wpt/tests/fetch/corb/script-html-via-cross-origin-blob-url.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/script-html-via-cross-origin-blob-url.sub.html rename to tests/wpt/tests/fetch/corb/script-html-via-cross-origin-blob-url.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/script-js-mislabeled-as-html-nosniff.sub.html b/tests/wpt/tests/fetch/corb/script-js-mislabeled-as-html-nosniff.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/script-js-mislabeled-as-html-nosniff.sub.html rename to tests/wpt/tests/fetch/corb/script-js-mislabeled-as-html-nosniff.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/script-js-mislabeled-as-html.sub.html b/tests/wpt/tests/fetch/corb/script-js-mislabeled-as-html.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/script-js-mislabeled-as-html.sub.html rename to tests/wpt/tests/fetch/corb/script-js-mislabeled-as-html.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/script-resource-with-json-parser-breaker.tentative.sub.html b/tests/wpt/tests/fetch/corb/script-resource-with-json-parser-breaker.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/script-resource-with-json-parser-breaker.tentative.sub.html rename to tests/wpt/tests/fetch/corb/script-resource-with-json-parser-breaker.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/script-resource-with-nonsniffable-types.tentative.sub.html b/tests/wpt/tests/fetch/corb/script-resource-with-nonsniffable-types.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/script-resource-with-nonsniffable-types.tentative.sub.html rename to tests/wpt/tests/fetch/corb/script-resource-with-nonsniffable-types.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/style-css-mislabeled-as-html-nosniff.sub.html b/tests/wpt/tests/fetch/corb/style-css-mislabeled-as-html-nosniff.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/style-css-mislabeled-as-html-nosniff.sub.html rename to tests/wpt/tests/fetch/corb/style-css-mislabeled-as-html-nosniff.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/style-css-mislabeled-as-html.sub.html b/tests/wpt/tests/fetch/corb/style-css-mislabeled-as-html.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/style-css-mislabeled-as-html.sub.html rename to tests/wpt/tests/fetch/corb/style-css-mislabeled-as-html.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/style-css-with-json-parser-breaker.sub.html b/tests/wpt/tests/fetch/corb/style-css-with-json-parser-breaker.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/style-css-with-json-parser-breaker.sub.html rename to tests/wpt/tests/fetch/corb/style-css-with-json-parser-breaker.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/corb/style-html-correctly-labeled.sub.html b/tests/wpt/tests/fetch/corb/style-html-correctly-labeled.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/corb/style-html-correctly-labeled.sub.html rename to tests/wpt/tests/fetch/corb/style-html-correctly-labeled.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/fetch-in-iframe.html b/tests/wpt/tests/fetch/cross-origin-resource-policy/fetch-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/fetch-in-iframe.html rename to tests/wpt/tests/fetch/cross-origin-resource-policy/fetch-in-iframe.html diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/fetch.any.js b/tests/wpt/tests/fetch/cross-origin-resource-policy/fetch.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/fetch.any.js rename to tests/wpt/tests/fetch/cross-origin-resource-policy/fetch.any.js diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/fetch.https.any.js b/tests/wpt/tests/fetch/cross-origin-resource-policy/fetch.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/fetch.https.any.js rename to tests/wpt/tests/fetch/cross-origin-resource-policy/fetch.https.any.js diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/iframe-loads.html b/tests/wpt/tests/fetch/cross-origin-resource-policy/iframe-loads.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/iframe-loads.html rename to tests/wpt/tests/fetch/cross-origin-resource-policy/iframe-loads.html diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/image-loads.html b/tests/wpt/tests/fetch/cross-origin-resource-policy/image-loads.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/image-loads.html rename to tests/wpt/tests/fetch/cross-origin-resource-policy/image-loads.html diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/resources/green.png b/tests/wpt/tests/fetch/cross-origin-resource-policy/resources/green.png similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/resources/green.png rename to tests/wpt/tests/fetch/cross-origin-resource-policy/resources/green.png diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/resources/hello.py b/tests/wpt/tests/fetch/cross-origin-resource-policy/resources/hello.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/resources/hello.py rename to tests/wpt/tests/fetch/cross-origin-resource-policy/resources/hello.py diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/resources/iframe.py b/tests/wpt/tests/fetch/cross-origin-resource-policy/resources/iframe.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/resources/iframe.py rename to tests/wpt/tests/fetch/cross-origin-resource-policy/resources/iframe.py diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/resources/iframeFetch.html b/tests/wpt/tests/fetch/cross-origin-resource-policy/resources/iframeFetch.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/resources/iframeFetch.html rename to tests/wpt/tests/fetch/cross-origin-resource-policy/resources/iframeFetch.html diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/resources/image.py b/tests/wpt/tests/fetch/cross-origin-resource-policy/resources/image.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/resources/image.py rename to tests/wpt/tests/fetch/cross-origin-resource-policy/resources/image.py diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/resources/redirect.py b/tests/wpt/tests/fetch/cross-origin-resource-policy/resources/redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/resources/redirect.py rename to tests/wpt/tests/fetch/cross-origin-resource-policy/resources/redirect.py diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/resources/script.py b/tests/wpt/tests/fetch/cross-origin-resource-policy/resources/script.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/resources/script.py rename to tests/wpt/tests/fetch/cross-origin-resource-policy/resources/script.py diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/scheme-restriction.any.js b/tests/wpt/tests/fetch/cross-origin-resource-policy/scheme-restriction.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/scheme-restriction.any.js rename to tests/wpt/tests/fetch/cross-origin-resource-policy/scheme-restriction.any.js diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/scheme-restriction.https.window.js b/tests/wpt/tests/fetch/cross-origin-resource-policy/scheme-restriction.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/scheme-restriction.https.window.js rename to tests/wpt/tests/fetch/cross-origin-resource-policy/scheme-restriction.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/script-loads.html b/tests/wpt/tests/fetch/cross-origin-resource-policy/script-loads.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/script-loads.html rename to tests/wpt/tests/fetch/cross-origin-resource-policy/script-loads.html diff --git a/tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/syntax.any.js b/tests/wpt/tests/fetch/cross-origin-resource-policy/syntax.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/cross-origin-resource-policy/syntax.any.js rename to tests/wpt/tests/fetch/cross-origin-resource-policy/syntax.any.js diff --git a/tests/wpt/web-platform-tests/fetch/data-urls/README.md b/tests/wpt/tests/fetch/data-urls/README.md similarity index 100% rename from tests/wpt/web-platform-tests/fetch/data-urls/README.md rename to tests/wpt/tests/fetch/data-urls/README.md diff --git a/tests/wpt/web-platform-tests/fetch/data-urls/base64.any.js b/tests/wpt/tests/fetch/data-urls/base64.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/data-urls/base64.any.js rename to tests/wpt/tests/fetch/data-urls/base64.any.js diff --git a/tests/wpt/web-platform-tests/fetch/data-urls/navigate.window.js b/tests/wpt/tests/fetch/data-urls/navigate.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/data-urls/navigate.window.js rename to tests/wpt/tests/fetch/data-urls/navigate.window.js diff --git a/tests/wpt/web-platform-tests/fetch/data-urls/processing.any.js b/tests/wpt/tests/fetch/data-urls/processing.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/data-urls/processing.any.js rename to tests/wpt/tests/fetch/data-urls/processing.any.js diff --git a/tests/wpt/web-platform-tests/fetch/data-urls/resources/base64.json b/tests/wpt/tests/fetch/data-urls/resources/base64.json similarity index 100% rename from tests/wpt/web-platform-tests/fetch/data-urls/resources/base64.json rename to tests/wpt/tests/fetch/data-urls/resources/base64.json diff --git a/tests/wpt/web-platform-tests/fetch/data-urls/resources/data-urls.json b/tests/wpt/tests/fetch/data-urls/resources/data-urls.json similarity index 100% rename from tests/wpt/web-platform-tests/fetch/data-urls/resources/data-urls.json rename to tests/wpt/tests/fetch/data-urls/resources/data-urls.json diff --git a/tests/wpt/web-platform-tests/fetch/h1-parsing/README.md b/tests/wpt/tests/fetch/h1-parsing/README.md similarity index 100% rename from tests/wpt/web-platform-tests/fetch/h1-parsing/README.md rename to tests/wpt/tests/fetch/h1-parsing/README.md diff --git a/tests/wpt/web-platform-tests/fetch/h1-parsing/lone-cr.window.js b/tests/wpt/tests/fetch/h1-parsing/lone-cr.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/h1-parsing/lone-cr.window.js rename to tests/wpt/tests/fetch/h1-parsing/lone-cr.window.js diff --git a/tests/wpt/web-platform-tests/fetch/h1-parsing/resources-with-0x00-in-header.window.js b/tests/wpt/tests/fetch/h1-parsing/resources-with-0x00-in-header.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/h1-parsing/resources-with-0x00-in-header.window.js rename to tests/wpt/tests/fetch/h1-parsing/resources-with-0x00-in-header.window.js diff --git a/tests/wpt/web-platform-tests/fetch/h1-parsing/resources/README.md b/tests/wpt/tests/fetch/h1-parsing/resources/README.md similarity index 100% rename from tests/wpt/web-platform-tests/fetch/h1-parsing/resources/README.md rename to tests/wpt/tests/fetch/h1-parsing/resources/README.md diff --git a/tests/wpt/web-platform-tests/fetch/h1-parsing/resources/blue-with-0x00-in-a-header.asis b/tests/wpt/tests/fetch/h1-parsing/resources/blue-with-0x00-in-a-header.asis similarity index 100% rename from tests/wpt/web-platform-tests/fetch/h1-parsing/resources/blue-with-0x00-in-a-header.asis rename to tests/wpt/tests/fetch/h1-parsing/resources/blue-with-0x00-in-a-header.asis diff --git a/tests/wpt/web-platform-tests/fetch/h1-parsing/resources/document-with-0x00-in-header.py b/tests/wpt/tests/fetch/h1-parsing/resources/document-with-0x00-in-header.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/h1-parsing/resources/document-with-0x00-in-header.py rename to tests/wpt/tests/fetch/h1-parsing/resources/document-with-0x00-in-header.py diff --git a/tests/wpt/web-platform-tests/fetch/h1-parsing/resources/message.py b/tests/wpt/tests/fetch/h1-parsing/resources/message.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/h1-parsing/resources/message.py rename to tests/wpt/tests/fetch/h1-parsing/resources/message.py diff --git a/tests/wpt/web-platform-tests/fetch/h1-parsing/resources/script-with-0x00-in-header.py b/tests/wpt/tests/fetch/h1-parsing/resources/script-with-0x00-in-header.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/h1-parsing/resources/script-with-0x00-in-header.py rename to tests/wpt/tests/fetch/h1-parsing/resources/script-with-0x00-in-header.py diff --git a/tests/wpt/web-platform-tests/fetch/h1-parsing/resources/status-code.py b/tests/wpt/tests/fetch/h1-parsing/resources/status-code.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/h1-parsing/resources/status-code.py rename to tests/wpt/tests/fetch/h1-parsing/resources/status-code.py diff --git a/tests/wpt/web-platform-tests/fetch/h1-parsing/status-code.window.js b/tests/wpt/tests/fetch/h1-parsing/status-code.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/h1-parsing/status-code.window.js rename to tests/wpt/tests/fetch/h1-parsing/status-code.window.js diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/304-update.any.js b/tests/wpt/tests/fetch/http-cache/304-update.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/304-update.any.js rename to tests/wpt/tests/fetch/http-cache/304-update.any.js diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/README.md b/tests/wpt/tests/fetch/http-cache/README.md similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/README.md rename to tests/wpt/tests/fetch/http-cache/README.md diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/basic-auth-cache-test-ref.html b/tests/wpt/tests/fetch/http-cache/basic-auth-cache-test-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/basic-auth-cache-test-ref.html rename to tests/wpt/tests/fetch/http-cache/basic-auth-cache-test-ref.html diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/basic-auth-cache-test.html b/tests/wpt/tests/fetch/http-cache/basic-auth-cache-test.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/basic-auth-cache-test.html rename to tests/wpt/tests/fetch/http-cache/basic-auth-cache-test.html diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/cache-mode.any.js b/tests/wpt/tests/fetch/http-cache/cache-mode.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/cache-mode.any.js rename to tests/wpt/tests/fetch/http-cache/cache-mode.any.js diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/cc-request.any.js b/tests/wpt/tests/fetch/http-cache/cc-request.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/cc-request.any.js rename to tests/wpt/tests/fetch/http-cache/cc-request.any.js diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/credentials.tentative.any.js b/tests/wpt/tests/fetch/http-cache/credentials.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/credentials.tentative.any.js rename to tests/wpt/tests/fetch/http-cache/credentials.tentative.any.js diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/freshness.any.js b/tests/wpt/tests/fetch/http-cache/freshness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/freshness.any.js rename to tests/wpt/tests/fetch/http-cache/freshness.any.js diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/heuristic.any.js b/tests/wpt/tests/fetch/http-cache/heuristic.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/heuristic.any.js rename to tests/wpt/tests/fetch/http-cache/heuristic.any.js diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/http-cache.js b/tests/wpt/tests/fetch/http-cache/http-cache.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/http-cache.js rename to tests/wpt/tests/fetch/http-cache/http-cache.js diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/invalidate.any.js b/tests/wpt/tests/fetch/http-cache/invalidate.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/invalidate.any.js rename to tests/wpt/tests/fetch/http-cache/invalidate.any.js diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/partial.any.js b/tests/wpt/tests/fetch/http-cache/partial.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/partial.any.js rename to tests/wpt/tests/fetch/http-cache/partial.any.js diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/post-patch.any.js b/tests/wpt/tests/fetch/http-cache/post-patch.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/post-patch.any.js rename to tests/wpt/tests/fetch/http-cache/post-patch.any.js diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/resources/http-cache.py b/tests/wpt/tests/fetch/http-cache/resources/http-cache.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/resources/http-cache.py rename to tests/wpt/tests/fetch/http-cache/resources/http-cache.py diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/resources/securedimage.py b/tests/wpt/tests/fetch/http-cache/resources/securedimage.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/resources/securedimage.py rename to tests/wpt/tests/fetch/http-cache/resources/securedimage.py diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/resources/split-cache-popup-with-iframe.html b/tests/wpt/tests/fetch/http-cache/resources/split-cache-popup-with-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/resources/split-cache-popup-with-iframe.html rename to tests/wpt/tests/fetch/http-cache/resources/split-cache-popup-with-iframe.html diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/resources/split-cache-popup.html b/tests/wpt/tests/fetch/http-cache/resources/split-cache-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/resources/split-cache-popup.html rename to tests/wpt/tests/fetch/http-cache/resources/split-cache-popup.html diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/split-cache.html b/tests/wpt/tests/fetch/http-cache/split-cache.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/split-cache.html rename to tests/wpt/tests/fetch/http-cache/split-cache.html diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/status.any.js b/tests/wpt/tests/fetch/http-cache/status.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/status.any.js rename to tests/wpt/tests/fetch/http-cache/status.any.js diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/vary.any.js b/tests/wpt/tests/fetch/http-cache/vary.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/http-cache/vary.any.js rename to tests/wpt/tests/fetch/http-cache/vary.any.js diff --git a/tests/wpt/web-platform-tests/fetch/images/canvas-remote-read-remote-image-redirect.html b/tests/wpt/tests/fetch/images/canvas-remote-read-remote-image-redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/images/canvas-remote-read-remote-image-redirect.html rename to tests/wpt/tests/fetch/images/canvas-remote-read-remote-image-redirect.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/META.yml b/tests/wpt/tests/fetch/local-network-access/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/META.yml rename to tests/wpt/tests/fetch/local-network-access/META.yml diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/README.md b/tests/wpt/tests/fetch/local-network-access/README.md similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/README.md rename to tests/wpt/tests/fetch/local-network-access/README.md diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/fenced-frame-subresource-fetch.tentative.https.window.js b/tests/wpt/tests/fetch/local-network-access/fenced-frame-subresource-fetch.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/fenced-frame-subresource-fetch.tentative.https.window.js rename to tests/wpt/tests/fetch/local-network-access/fenced-frame-subresource-fetch.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/fenced-frame.tentative.https.window.js b/tests/wpt/tests/fetch/local-network-access/fenced-frame.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/fenced-frame.tentative.https.window.js rename to tests/wpt/tests/fetch/local-network-access/fenced-frame.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/fetch-from-treat-as-public.https.window.js b/tests/wpt/tests/fetch/local-network-access/fetch-from-treat-as-public.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/fetch-from-treat-as-public.https.window.js rename to tests/wpt/tests/fetch/local-network-access/fetch-from-treat-as-public.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/fetch.https.window.js b/tests/wpt/tests/fetch/local-network-access/fetch.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/fetch.https.window.js rename to tests/wpt/tests/fetch/local-network-access/fetch.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/fetch.window.js b/tests/wpt/tests/fetch/local-network-access/fetch.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/fetch.window.js rename to tests/wpt/tests/fetch/local-network-access/fetch.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/iframe.tentative.https.window.js b/tests/wpt/tests/fetch/local-network-access/iframe.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/iframe.tentative.https.window.js rename to tests/wpt/tests/fetch/local-network-access/iframe.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/iframe.tentative.window.js b/tests/wpt/tests/fetch/local-network-access/iframe.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/iframe.tentative.window.js rename to tests/wpt/tests/fetch/local-network-access/iframe.tentative.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/mixed-content-fetch.tentative.https.window.js b/tests/wpt/tests/fetch/local-network-access/mixed-content-fetch.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/mixed-content-fetch.tentative.https.window.js rename to tests/wpt/tests/fetch/local-network-access/mixed-content-fetch.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/nested-worker.https.window.js b/tests/wpt/tests/fetch/local-network-access/nested-worker.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/nested-worker.https.window.js rename to tests/wpt/tests/fetch/local-network-access/nested-worker.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/nested-worker.window.js b/tests/wpt/tests/fetch/local-network-access/nested-worker.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/nested-worker.window.js rename to tests/wpt/tests/fetch/local-network-access/nested-worker.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/preflight-cache.https.window.js b/tests/wpt/tests/fetch/local-network-access/preflight-cache.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/preflight-cache.https.window.js rename to tests/wpt/tests/fetch/local-network-access/preflight-cache.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/redirect.https.window.js b/tests/wpt/tests/fetch/local-network-access/redirect.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/redirect.https.window.js rename to tests/wpt/tests/fetch/local-network-access/redirect.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/executor.html b/tests/wpt/tests/fetch/local-network-access/resources/executor.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/executor.html rename to tests/wpt/tests/fetch/local-network-access/resources/executor.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/fenced-frame-fetcher.https.html b/tests/wpt/tests/fetch/local-network-access/resources/fenced-frame-fetcher.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/fenced-frame-fetcher.https.html rename to tests/wpt/tests/fetch/local-network-access/resources/fenced-frame-fetcher.https.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/fenced-frame-fetcher.https.html.headers b/tests/wpt/tests/fetch/local-network-access/resources/fenced-frame-fetcher.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/fenced-frame-fetcher.https.html.headers rename to tests/wpt/tests/fetch/local-network-access/resources/fenced-frame-fetcher.https.html.headers diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/fenced-frame-local-network-access-target.https.html b/tests/wpt/tests/fetch/local-network-access/resources/fenced-frame-local-network-access-target.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/fenced-frame-local-network-access-target.https.html rename to tests/wpt/tests/fetch/local-network-access/resources/fenced-frame-local-network-access-target.https.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/fenced-frame-local-network-access.https.html b/tests/wpt/tests/fetch/local-network-access/resources/fenced-frame-local-network-access.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/fenced-frame-local-network-access.https.html rename to tests/wpt/tests/fetch/local-network-access/resources/fenced-frame-local-network-access.https.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/fenced-frame-local-network-access.https.html.headers b/tests/wpt/tests/fetch/local-network-access/resources/fenced-frame-local-network-access.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/fenced-frame-local-network-access.https.html.headers rename to tests/wpt/tests/fetch/local-network-access/resources/fenced-frame-local-network-access.https.html.headers diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/fetcher.html b/tests/wpt/tests/fetch/local-network-access/resources/fetcher.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/fetcher.html rename to tests/wpt/tests/fetch/local-network-access/resources/fetcher.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/fetcher.js b/tests/wpt/tests/fetch/local-network-access/resources/fetcher.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/fetcher.js rename to tests/wpt/tests/fetch/local-network-access/resources/fetcher.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/iframed.html b/tests/wpt/tests/fetch/local-network-access/resources/iframed.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/iframed.html rename to tests/wpt/tests/fetch/local-network-access/resources/iframed.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/iframer.html b/tests/wpt/tests/fetch/local-network-access/resources/iframer.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/iframer.html rename to tests/wpt/tests/fetch/local-network-access/resources/iframer.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/preflight.py b/tests/wpt/tests/fetch/local-network-access/resources/preflight.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/preflight.py rename to tests/wpt/tests/fetch/local-network-access/resources/preflight.py diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/service-worker-bridge.html b/tests/wpt/tests/fetch/local-network-access/resources/service-worker-bridge.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/service-worker-bridge.html rename to tests/wpt/tests/fetch/local-network-access/resources/service-worker-bridge.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/service-worker.js b/tests/wpt/tests/fetch/local-network-access/resources/service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/service-worker.js rename to tests/wpt/tests/fetch/local-network-access/resources/service-worker.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/shared-fetcher.js b/tests/wpt/tests/fetch/local-network-access/resources/shared-fetcher.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/shared-fetcher.js rename to tests/wpt/tests/fetch/local-network-access/resources/shared-fetcher.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/shared-worker-blob-fetcher.html b/tests/wpt/tests/fetch/local-network-access/resources/shared-worker-blob-fetcher.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/shared-worker-blob-fetcher.html rename to tests/wpt/tests/fetch/local-network-access/resources/shared-worker-blob-fetcher.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/shared-worker-fetcher.html b/tests/wpt/tests/fetch/local-network-access/resources/shared-worker-fetcher.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/shared-worker-fetcher.html rename to tests/wpt/tests/fetch/local-network-access/resources/shared-worker-fetcher.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/socket-opener.html b/tests/wpt/tests/fetch/local-network-access/resources/socket-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/socket-opener.html rename to tests/wpt/tests/fetch/local-network-access/resources/socket-opener.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/support.sub.js b/tests/wpt/tests/fetch/local-network-access/resources/support.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/support.sub.js rename to tests/wpt/tests/fetch/local-network-access/resources/support.sub.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/worker-blob-fetcher.html b/tests/wpt/tests/fetch/local-network-access/resources/worker-blob-fetcher.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/worker-blob-fetcher.html rename to tests/wpt/tests/fetch/local-network-access/resources/worker-blob-fetcher.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/worker-fetcher.html b/tests/wpt/tests/fetch/local-network-access/resources/worker-fetcher.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/worker-fetcher.html rename to tests/wpt/tests/fetch/local-network-access/resources/worker-fetcher.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/worker-fetcher.js b/tests/wpt/tests/fetch/local-network-access/resources/worker-fetcher.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/worker-fetcher.js rename to tests/wpt/tests/fetch/local-network-access/resources/worker-fetcher.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/resources/xhr-sender.html b/tests/wpt/tests/fetch/local-network-access/resources/xhr-sender.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/resources/xhr-sender.html rename to tests/wpt/tests/fetch/local-network-access/resources/xhr-sender.html diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/service-worker-background-fetch.https.window.js b/tests/wpt/tests/fetch/local-network-access/service-worker-background-fetch.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/service-worker-background-fetch.https.window.js rename to tests/wpt/tests/fetch/local-network-access/service-worker-background-fetch.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/service-worker-fetch.https.window.js b/tests/wpt/tests/fetch/local-network-access/service-worker-fetch.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/service-worker-fetch.https.window.js rename to tests/wpt/tests/fetch/local-network-access/service-worker-fetch.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/service-worker-update.https.window.js b/tests/wpt/tests/fetch/local-network-access/service-worker-update.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/service-worker-update.https.window.js rename to tests/wpt/tests/fetch/local-network-access/service-worker-update.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/service-worker.https.window.js b/tests/wpt/tests/fetch/local-network-access/service-worker.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/service-worker.https.window.js rename to tests/wpt/tests/fetch/local-network-access/service-worker.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/shared-worker-blob-fetch.https.window.js b/tests/wpt/tests/fetch/local-network-access/shared-worker-blob-fetch.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/shared-worker-blob-fetch.https.window.js rename to tests/wpt/tests/fetch/local-network-access/shared-worker-blob-fetch.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/shared-worker-blob-fetch.window.js b/tests/wpt/tests/fetch/local-network-access/shared-worker-blob-fetch.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/shared-worker-blob-fetch.window.js rename to tests/wpt/tests/fetch/local-network-access/shared-worker-blob-fetch.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/shared-worker-fetch.https.window.js b/tests/wpt/tests/fetch/local-network-access/shared-worker-fetch.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/shared-worker-fetch.https.window.js rename to tests/wpt/tests/fetch/local-network-access/shared-worker-fetch.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/shared-worker-fetch.window.js b/tests/wpt/tests/fetch/local-network-access/shared-worker-fetch.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/shared-worker-fetch.window.js rename to tests/wpt/tests/fetch/local-network-access/shared-worker-fetch.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/shared-worker.https.window.js b/tests/wpt/tests/fetch/local-network-access/shared-worker.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/shared-worker.https.window.js rename to tests/wpt/tests/fetch/local-network-access/shared-worker.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/shared-worker.window.js b/tests/wpt/tests/fetch/local-network-access/shared-worker.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/shared-worker.window.js rename to tests/wpt/tests/fetch/local-network-access/shared-worker.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/websocket.https.window.js b/tests/wpt/tests/fetch/local-network-access/websocket.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/websocket.https.window.js rename to tests/wpt/tests/fetch/local-network-access/websocket.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/websocket.window.js b/tests/wpt/tests/fetch/local-network-access/websocket.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/websocket.window.js rename to tests/wpt/tests/fetch/local-network-access/websocket.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/worker-blob-fetch.window.js b/tests/wpt/tests/fetch/local-network-access/worker-blob-fetch.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/worker-blob-fetch.window.js rename to tests/wpt/tests/fetch/local-network-access/worker-blob-fetch.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/worker-fetch.https.window.js b/tests/wpt/tests/fetch/local-network-access/worker-fetch.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/worker-fetch.https.window.js rename to tests/wpt/tests/fetch/local-network-access/worker-fetch.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/worker-fetch.window.js b/tests/wpt/tests/fetch/local-network-access/worker-fetch.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/worker-fetch.window.js rename to tests/wpt/tests/fetch/local-network-access/worker-fetch.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/worker.https.window.js b/tests/wpt/tests/fetch/local-network-access/worker.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/worker.https.window.js rename to tests/wpt/tests/fetch/local-network-access/worker.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/worker.window.js b/tests/wpt/tests/fetch/local-network-access/worker.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/worker.window.js rename to tests/wpt/tests/fetch/local-network-access/worker.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/xhr-from-treat-as-public.https.window.js b/tests/wpt/tests/fetch/local-network-access/xhr-from-treat-as-public.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/xhr-from-treat-as-public.https.window.js rename to tests/wpt/tests/fetch/local-network-access/xhr-from-treat-as-public.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/xhr.https.window.js b/tests/wpt/tests/fetch/local-network-access/xhr.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/xhr.https.window.js rename to tests/wpt/tests/fetch/local-network-access/xhr.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/local-network-access/xhr.window.js b/tests/wpt/tests/fetch/local-network-access/xhr.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/local-network-access/xhr.window.js rename to tests/wpt/tests/fetch/local-network-access/xhr.window.js diff --git a/tests/wpt/web-platform-tests/fetch/metadata/META.yml b/tests/wpt/tests/fetch/metadata/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/META.yml rename to tests/wpt/tests/fetch/metadata/META.yml diff --git a/tests/wpt/web-platform-tests/fetch/metadata/README.md b/tests/wpt/tests/fetch/metadata/README.md similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/README.md rename to tests/wpt/tests/fetch/metadata/README.md diff --git a/tests/wpt/web-platform-tests/fetch/metadata/audio-worklet.https.html b/tests/wpt/tests/fetch/metadata/audio-worklet.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/audio-worklet.https.html rename to tests/wpt/tests/fetch/metadata/audio-worklet.https.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/embed.https.sub.tentative.html b/tests/wpt/tests/fetch/metadata/embed.https.sub.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/embed.https.sub.tentative.html rename to tests/wpt/tests/fetch/metadata/embed.https.sub.tentative.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/fetch-preflight.https.sub.any.js b/tests/wpt/tests/fetch/metadata/fetch-preflight.https.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/fetch-preflight.https.sub.any.js rename to tests/wpt/tests/fetch/metadata/fetch-preflight.https.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/metadata/fetch.https.sub.any.js b/tests/wpt/tests/fetch/metadata/fetch.https.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/fetch.https.sub.any.js rename to tests/wpt/tests/fetch/metadata/fetch.https.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/appcache-manifest.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/appcache-manifest.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/appcache-manifest.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/appcache-manifest.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/audioworklet.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/audioworklet.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/audioworklet.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/audioworklet.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/css-font-face.https.sub.tentative.html b/tests/wpt/tests/fetch/metadata/generated/css-font-face.https.sub.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/css-font-face.https.sub.tentative.html rename to tests/wpt/tests/fetch/metadata/generated/css-font-face.https.sub.tentative.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/css-font-face.sub.tentative.html b/tests/wpt/tests/fetch/metadata/generated/css-font-face.sub.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/css-font-face.sub.tentative.html rename to tests/wpt/tests/fetch/metadata/generated/css-font-face.sub.tentative.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/css-images.https.sub.tentative.html b/tests/wpt/tests/fetch/metadata/generated/css-images.https.sub.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/css-images.https.sub.tentative.html rename to tests/wpt/tests/fetch/metadata/generated/css-images.https.sub.tentative.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/css-images.sub.tentative.html b/tests/wpt/tests/fetch/metadata/generated/css-images.sub.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/css-images.sub.tentative.html rename to tests/wpt/tests/fetch/metadata/generated/css-images.sub.tentative.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-a.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-a.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-a.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-a.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-a.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-a.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-a.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-a.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-area.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-area.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-area.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-area.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-area.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-area.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-area.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-area.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-audio.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-audio.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-audio.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-audio.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-audio.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-audio.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-audio.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-audio.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-embed.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-embed.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-embed.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-embed.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-embed.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-embed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-embed.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-embed.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-frame.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-frame.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-frame.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-frame.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-frame.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-frame.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-frame.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-frame.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-iframe.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-iframe.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-iframe.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-iframe.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-iframe.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-iframe.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-img-environment-change.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-img-environment-change.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-img-environment-change.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-img-environment-change.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-img-environment-change.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-img-environment-change.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-img-environment-change.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-img-environment-change.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-img.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-img.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-img.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-img.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-img.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-img.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-img.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-img.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-input-image.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-input-image.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-input-image.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-input-image.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-input-image.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-input-image.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-input-image.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-input-image.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-link-icon.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-link-icon.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-link-icon.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-link-icon.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-link-icon.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-link-icon.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-link-icon.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-link-icon.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-link-prefetch.optional.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-link-prefetch.optional.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-link-prefetch.optional.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-link-prefetch.optional.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-meta-refresh.https.optional.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-meta-refresh.https.optional.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-meta-refresh.https.optional.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-meta-refresh.https.optional.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-meta-refresh.optional.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-meta-refresh.optional.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-meta-refresh.optional.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-meta-refresh.optional.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-picture.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-picture.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-picture.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-picture.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-picture.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-picture.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-picture.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-picture.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-script.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-script.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-script.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-script.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-script.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-script.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-script.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-script.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-video-poster.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-video-poster.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-video-poster.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-video-poster.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-video-poster.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-video-poster.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-video-poster.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-video-poster.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-video.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-video.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-video.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-video.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/element-video.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-video.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/element-video.sub.html rename to tests/wpt/tests/fetch/metadata/generated/element-video.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/fetch.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/fetch.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/fetch.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/fetch.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/fetch.sub.html b/tests/wpt/tests/fetch/metadata/generated/fetch.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/fetch.sub.html rename to tests/wpt/tests/fetch/metadata/generated/fetch.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/form-submission.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/form-submission.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/form-submission.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/form-submission.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/form-submission.sub.html b/tests/wpt/tests/fetch/metadata/generated/form-submission.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/form-submission.sub.html rename to tests/wpt/tests/fetch/metadata/generated/form-submission.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/header-link.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/header-link.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/header-link.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/header-link.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/header-link.https.sub.tentative.html b/tests/wpt/tests/fetch/metadata/generated/header-link.https.sub.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/header-link.https.sub.tentative.html rename to tests/wpt/tests/fetch/metadata/generated/header-link.https.sub.tentative.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/header-link.sub.html b/tests/wpt/tests/fetch/metadata/generated/header-link.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/header-link.sub.html rename to tests/wpt/tests/fetch/metadata/generated/header-link.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/header-refresh.https.optional.sub.html b/tests/wpt/tests/fetch/metadata/generated/header-refresh.https.optional.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/header-refresh.https.optional.sub.html rename to tests/wpt/tests/fetch/metadata/generated/header-refresh.https.optional.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/header-refresh.optional.sub.html b/tests/wpt/tests/fetch/metadata/generated/header-refresh.optional.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/header-refresh.optional.sub.html rename to tests/wpt/tests/fetch/metadata/generated/header-refresh.optional.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/script-module-import-dynamic.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/script-module-import-dynamic.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/script-module-import-dynamic.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/script-module-import-dynamic.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/script-module-import-dynamic.sub.html b/tests/wpt/tests/fetch/metadata/generated/script-module-import-dynamic.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/script-module-import-dynamic.sub.html rename to tests/wpt/tests/fetch/metadata/generated/script-module-import-dynamic.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/script-module-import-static.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/script-module-import-static.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/script-module-import-static.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/script-module-import-static.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/script-module-import-static.sub.html b/tests/wpt/tests/fetch/metadata/generated/script-module-import-static.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/script-module-import-static.sub.html rename to tests/wpt/tests/fetch/metadata/generated/script-module-import-static.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/serviceworker.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/serviceworker.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/serviceworker.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/serviceworker.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/svg-image.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/svg-image.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/svg-image.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/svg-image.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/svg-image.sub.html b/tests/wpt/tests/fetch/metadata/generated/svg-image.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/svg-image.sub.html rename to tests/wpt/tests/fetch/metadata/generated/svg-image.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/window-history.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/window-history.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/window-history.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/window-history.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/window-history.sub.html b/tests/wpt/tests/fetch/metadata/generated/window-history.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/window-history.sub.html rename to tests/wpt/tests/fetch/metadata/generated/window-history.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/window-location.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/window-location.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/window-location.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/window-location.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/window-location.sub.html b/tests/wpt/tests/fetch/metadata/generated/window-location.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/window-location.sub.html rename to tests/wpt/tests/fetch/metadata/generated/window-location.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/worker-dedicated-constructor.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-constructor.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/worker-dedicated-constructor.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/worker-dedicated-constructor.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/worker-dedicated-constructor.sub.html b/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-constructor.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/worker-dedicated-constructor.sub.html rename to tests/wpt/tests/fetch/metadata/generated/worker-dedicated-constructor.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html rename to tests/wpt/tests/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/generated/worker-dedicated-importscripts.sub.html b/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-importscripts.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/generated/worker-dedicated-importscripts.sub.html rename to tests/wpt/tests/fetch/metadata/generated/worker-dedicated-importscripts.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/navigation.https.sub.html b/tests/wpt/tests/fetch/metadata/navigation.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/navigation.https.sub.html rename to tests/wpt/tests/fetch/metadata/navigation.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/object.https.sub.html b/tests/wpt/tests/fetch/metadata/object.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/object.https.sub.html rename to tests/wpt/tests/fetch/metadata/object.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/paint-worklet.https.html b/tests/wpt/tests/fetch/metadata/paint-worklet.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/paint-worklet.https.html rename to tests/wpt/tests/fetch/metadata/paint-worklet.https.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/portal.https.sub.html b/tests/wpt/tests/fetch/metadata/portal.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/portal.https.sub.html rename to tests/wpt/tests/fetch/metadata/portal.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/preload.https.sub.html b/tests/wpt/tests/fetch/metadata/preload.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/preload.https.sub.html rename to tests/wpt/tests/fetch/metadata/preload.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.sub.html b/tests/wpt/tests/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.sub.html rename to tests/wpt/tests/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/redirect/redirect-http-upgrade.sub.html b/tests/wpt/tests/fetch/metadata/redirect/redirect-http-upgrade.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/redirect/redirect-http-upgrade.sub.html rename to tests/wpt/tests/fetch/metadata/redirect/redirect-http-upgrade.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/redirect/redirect-https-downgrade.sub.html b/tests/wpt/tests/fetch/metadata/redirect/redirect-https-downgrade.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/redirect/redirect-https-downgrade.sub.html rename to tests/wpt/tests/fetch/metadata/redirect/redirect-https-downgrade.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/report.https.sub.html b/tests/wpt/tests/fetch/metadata/report.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/report.https.sub.html rename to tests/wpt/tests/fetch/metadata/report.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/report.https.sub.html.sub.headers b/tests/wpt/tests/fetch/metadata/report.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/report.https.sub.html.sub.headers rename to tests/wpt/tests/fetch/metadata/report.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/appcache-iframe.sub.html b/tests/wpt/tests/fetch/metadata/resources/appcache-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/appcache-iframe.sub.html rename to tests/wpt/tests/fetch/metadata/resources/appcache-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/dedicatedWorker.js b/tests/wpt/tests/fetch/metadata/resources/dedicatedWorker.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/dedicatedWorker.js rename to tests/wpt/tests/fetch/metadata/resources/dedicatedWorker.js diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/echo-as-json.py b/tests/wpt/tests/fetch/metadata/resources/echo-as-json.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/echo-as-json.py rename to tests/wpt/tests/fetch/metadata/resources/echo-as-json.py diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/echo-as-script.py b/tests/wpt/tests/fetch/metadata/resources/echo-as-script.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/echo-as-script.py rename to tests/wpt/tests/fetch/metadata/resources/echo-as-script.py diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/es-module.sub.js b/tests/wpt/tests/fetch/metadata/resources/es-module.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/es-module.sub.js rename to tests/wpt/tests/fetch/metadata/resources/es-module.sub.js diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/fetch-via-serviceworker--fallback--sw.js b/tests/wpt/tests/fetch/metadata/resources/fetch-via-serviceworker--fallback--sw.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/fetch-via-serviceworker--fallback--sw.js rename to tests/wpt/tests/fetch/metadata/resources/fetch-via-serviceworker--fallback--sw.js diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/fetch-via-serviceworker--respondWith--sw.js b/tests/wpt/tests/fetch/metadata/resources/fetch-via-serviceworker--respondWith--sw.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/fetch-via-serviceworker--respondWith--sw.js rename to tests/wpt/tests/fetch/metadata/resources/fetch-via-serviceworker--respondWith--sw.js diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/fetch-via-serviceworker-frame.html b/tests/wpt/tests/fetch/metadata/resources/fetch-via-serviceworker-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/fetch-via-serviceworker-frame.html rename to tests/wpt/tests/fetch/metadata/resources/fetch-via-serviceworker-frame.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/header-link.py b/tests/wpt/tests/fetch/metadata/resources/header-link.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/header-link.py rename to tests/wpt/tests/fetch/metadata/resources/header-link.py diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/helper.js b/tests/wpt/tests/fetch/metadata/resources/helper.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/helper.js rename to tests/wpt/tests/fetch/metadata/resources/helper.js diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/helper.sub.js b/tests/wpt/tests/fetch/metadata/resources/helper.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/helper.sub.js rename to tests/wpt/tests/fetch/metadata/resources/helper.sub.js diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/message-opener.html b/tests/wpt/tests/fetch/metadata/resources/message-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/message-opener.html rename to tests/wpt/tests/fetch/metadata/resources/message-opener.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/post-to-owner.py b/tests/wpt/tests/fetch/metadata/resources/post-to-owner.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/post-to-owner.py rename to tests/wpt/tests/fetch/metadata/resources/post-to-owner.py diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/record-header.py b/tests/wpt/tests/fetch/metadata/resources/record-header.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/record-header.py rename to tests/wpt/tests/fetch/metadata/resources/record-header.py diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/record-headers.py b/tests/wpt/tests/fetch/metadata/resources/record-headers.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/record-headers.py rename to tests/wpt/tests/fetch/metadata/resources/record-headers.py diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/redirectTestHelper.sub.js b/tests/wpt/tests/fetch/metadata/resources/redirectTestHelper.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/redirectTestHelper.sub.js rename to tests/wpt/tests/fetch/metadata/resources/redirectTestHelper.sub.js diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/serviceworker-accessors-frame.html b/tests/wpt/tests/fetch/metadata/resources/serviceworker-accessors-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/serviceworker-accessors-frame.html rename to tests/wpt/tests/fetch/metadata/resources/serviceworker-accessors-frame.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/serviceworker-accessors.sw.js b/tests/wpt/tests/fetch/metadata/resources/serviceworker-accessors.sw.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/serviceworker-accessors.sw.js rename to tests/wpt/tests/fetch/metadata/resources/serviceworker-accessors.sw.js diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/sharedWorker.js b/tests/wpt/tests/fetch/metadata/resources/sharedWorker.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/sharedWorker.js rename to tests/wpt/tests/fetch/metadata/resources/sharedWorker.js diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/unload-with-beacon.html b/tests/wpt/tests/fetch/metadata/resources/unload-with-beacon.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/unload-with-beacon.html rename to tests/wpt/tests/fetch/metadata/resources/unload-with-beacon.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/xslt-test.sub.xml b/tests/wpt/tests/fetch/metadata/resources/xslt-test.sub.xml similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/resources/xslt-test.sub.xml rename to tests/wpt/tests/fetch/metadata/resources/xslt-test.sub.xml diff --git a/tests/wpt/web-platform-tests/fetch/metadata/serviceworker-accessors.https.sub.html b/tests/wpt/tests/fetch/metadata/serviceworker-accessors.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/serviceworker-accessors.https.sub.html rename to tests/wpt/tests/fetch/metadata/serviceworker-accessors.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sharedworker.https.sub.html b/tests/wpt/tests/fetch/metadata/sharedworker.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/sharedworker.https.sub.html rename to tests/wpt/tests/fetch/metadata/sharedworker.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/style.https.sub.html b/tests/wpt/tests/fetch/metadata/style.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/style.https.sub.html rename to tests/wpt/tests/fetch/metadata/style.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/README.md b/tests/wpt/tests/fetch/metadata/tools/README.md similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/README.md rename to tests/wpt/tests/fetch/metadata/tools/README.md diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/fetch-metadata.conf.yml b/tests/wpt/tests/fetch/metadata/tools/fetch-metadata.conf.yml similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/fetch-metadata.conf.yml rename to tests/wpt/tests/fetch/metadata/tools/fetch-metadata.conf.yml diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/generate.py b/tests/wpt/tests/fetch/metadata/tools/generate.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/generate.py rename to tests/wpt/tests/fetch/metadata/tools/generate.py diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/appcache-manifest.sub.https.html b/tests/wpt/tests/fetch/metadata/tools/templates/appcache-manifest.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/appcache-manifest.sub.https.html rename to tests/wpt/tests/fetch/metadata/tools/templates/appcache-manifest.sub.https.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/audioworklet.https.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/audioworklet.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/audioworklet.https.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/audioworklet.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/css-font-face.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/css-font-face.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/css-font-face.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/css-font-face.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/css-images.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/css-images.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/css-images.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/css-images.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-a.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-a.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-a.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-a.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-area.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-area.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-area.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-area.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-audio.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-audio.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-audio.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-audio.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-embed.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-embed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-embed.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-embed.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-frame.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-frame.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-frame.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-frame.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-iframe.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-iframe.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-img-environment-change.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-img-environment-change.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-img-environment-change.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-img-environment-change.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-img.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-img.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-img.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-img.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-input-image.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-input-image.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-input-image.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-input-image.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-link-icon.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-link-icon.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-link-icon.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-link-icon.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-link-prefetch.optional.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-link-prefetch.optional.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-link-prefetch.optional.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-link-prefetch.optional.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-meta-refresh.optional.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-meta-refresh.optional.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-meta-refresh.optional.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-meta-refresh.optional.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-picture.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-picture.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-picture.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-picture.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-script.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-script.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-script.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-script.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-video-poster.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-video-poster.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-video-poster.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-video-poster.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-video.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/element-video.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/element-video.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/element-video.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/fetch-via-serviceworker.https.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/fetch-via-serviceworker.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/fetch-via-serviceworker.https.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/fetch-via-serviceworker.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/fetch.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/fetch.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/fetch.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/fetch.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/form-submission.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/form-submission.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/form-submission.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/form-submission.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/header-link.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/header-link.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/header-link.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/header-link.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/header-refresh.optional.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/header-refresh.optional.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/header-refresh.optional.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/header-refresh.optional.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/script-module-import-dynamic.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/script-module-import-dynamic.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/script-module-import-dynamic.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/script-module-import-dynamic.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/script-module-import-static.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/script-module-import-static.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/script-module-import-static.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/script-module-import-static.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/serviceworker.https.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/serviceworker.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/serviceworker.https.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/serviceworker.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/svg-image.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/svg-image.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/svg-image.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/svg-image.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/window-history.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/window-history.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/window-history.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/window-history.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/window-location.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/window-location.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/window-location.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/window-location.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/worker-dedicated-constructor.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/worker-dedicated-constructor.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/worker-dedicated-constructor.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/worker-dedicated-constructor.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/tools/templates/worker-dedicated-importscripts.sub.html b/tests/wpt/tests/fetch/metadata/tools/templates/worker-dedicated-importscripts.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/tools/templates/worker-dedicated-importscripts.sub.html rename to tests/wpt/tests/fetch/metadata/tools/templates/worker-dedicated-importscripts.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/track.https.sub.html b/tests/wpt/tests/fetch/metadata/track.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/track.https.sub.html rename to tests/wpt/tests/fetch/metadata/track.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/trailing-dot.https.sub.any.js b/tests/wpt/tests/fetch/metadata/trailing-dot.https.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/trailing-dot.https.sub.any.js rename to tests/wpt/tests/fetch/metadata/trailing-dot.https.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/metadata/unload.https.sub.html b/tests/wpt/tests/fetch/metadata/unload.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/unload.https.sub.html rename to tests/wpt/tests/fetch/metadata/unload.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/window-open.https.sub.html b/tests/wpt/tests/fetch/metadata/window-open.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/window-open.https.sub.html rename to tests/wpt/tests/fetch/metadata/window-open.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/worker.https.sub.html b/tests/wpt/tests/fetch/metadata/worker.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/worker.https.sub.html rename to tests/wpt/tests/fetch/metadata/worker.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/metadata/xslt.https.sub.html b/tests/wpt/tests/fetch/metadata/xslt.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/metadata/xslt.https.sub.html rename to tests/wpt/tests/fetch/metadata/xslt.https.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/image.html b/tests/wpt/tests/fetch/nosniff/image.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/nosniff/image.html rename to tests/wpt/tests/fetch/nosniff/image.html diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/importscripts.html b/tests/wpt/tests/fetch/nosniff/importscripts.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/nosniff/importscripts.html rename to tests/wpt/tests/fetch/nosniff/importscripts.html diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/importscripts.js b/tests/wpt/tests/fetch/nosniff/importscripts.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/nosniff/importscripts.js rename to tests/wpt/tests/fetch/nosniff/importscripts.js diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/parsing-nosniff.window.js b/tests/wpt/tests/fetch/nosniff/parsing-nosniff.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/nosniff/parsing-nosniff.window.js rename to tests/wpt/tests/fetch/nosniff/parsing-nosniff.window.js diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/resources/css.py b/tests/wpt/tests/fetch/nosniff/resources/css.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/nosniff/resources/css.py rename to tests/wpt/tests/fetch/nosniff/resources/css.py diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/resources/image.py b/tests/wpt/tests/fetch/nosniff/resources/image.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/nosniff/resources/image.py rename to tests/wpt/tests/fetch/nosniff/resources/image.py diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/resources/js.py b/tests/wpt/tests/fetch/nosniff/resources/js.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/nosniff/resources/js.py rename to tests/wpt/tests/fetch/nosniff/resources/js.py diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/resources/nosniff.py b/tests/wpt/tests/fetch/nosniff/resources/nosniff.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/nosniff/resources/nosniff.py rename to tests/wpt/tests/fetch/nosniff/resources/nosniff.py diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/resources/worker.py b/tests/wpt/tests/fetch/nosniff/resources/worker.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/nosniff/resources/worker.py rename to tests/wpt/tests/fetch/nosniff/resources/worker.py diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/resources/x-content-type-options.json b/tests/wpt/tests/fetch/nosniff/resources/x-content-type-options.json similarity index 100% rename from tests/wpt/web-platform-tests/fetch/nosniff/resources/x-content-type-options.json rename to tests/wpt/tests/fetch/nosniff/resources/x-content-type-options.json diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/script.html b/tests/wpt/tests/fetch/nosniff/script.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/nosniff/script.html rename to tests/wpt/tests/fetch/nosniff/script.html diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/stylesheet.html b/tests/wpt/tests/fetch/nosniff/stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/nosniff/stylesheet.html rename to tests/wpt/tests/fetch/nosniff/stylesheet.html diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/worker.html b/tests/wpt/tests/fetch/nosniff/worker.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/nosniff/worker.html rename to tests/wpt/tests/fetch/nosniff/worker.html diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/data.json b/tests/wpt/tests/fetch/orb/resources/data.json similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/data.json rename to tests/wpt/tests/fetch/orb/resources/data.json diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/data_non_ascii.json b/tests/wpt/tests/fetch/orb/resources/data_non_ascii.json similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/data_non_ascii.json rename to tests/wpt/tests/fetch/orb/resources/data_non_ascii.json diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/empty.json b/tests/wpt/tests/fetch/orb/resources/empty.json similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/empty.json rename to tests/wpt/tests/fetch/orb/resources/empty.json diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/font.ttf b/tests/wpt/tests/fetch/orb/resources/font.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/font.ttf rename to tests/wpt/tests/fetch/orb/resources/font.ttf diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/image.png b/tests/wpt/tests/fetch/orb/resources/image.png similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/image.png rename to tests/wpt/tests/fetch/orb/resources/image.png diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/js-unlabeled-utf16-without-bom.json b/tests/wpt/tests/fetch/orb/resources/js-unlabeled-utf16-without-bom.json similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/js-unlabeled-utf16-without-bom.json rename to tests/wpt/tests/fetch/orb/resources/js-unlabeled-utf16-without-bom.json diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/js-unlabeled.js b/tests/wpt/tests/fetch/orb/resources/js-unlabeled.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/js-unlabeled.js rename to tests/wpt/tests/fetch/orb/resources/js-unlabeled.js diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/png-mislabeled-as-html.png b/tests/wpt/tests/fetch/orb/resources/png-mislabeled-as-html.png similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/png-mislabeled-as-html.png rename to tests/wpt/tests/fetch/orb/resources/png-mislabeled-as-html.png diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/png-mislabeled-as-html.png.headers b/tests/wpt/tests/fetch/orb/resources/png-mislabeled-as-html.png.headers similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/png-mislabeled-as-html.png.headers rename to tests/wpt/tests/fetch/orb/resources/png-mislabeled-as-html.png.headers diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/png-unlabeled.png b/tests/wpt/tests/fetch/orb/resources/png-unlabeled.png similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/png-unlabeled.png rename to tests/wpt/tests/fetch/orb/resources/png-unlabeled.png diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/script-iso-8559-1.js b/tests/wpt/tests/fetch/orb/resources/script-iso-8559-1.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/script-iso-8559-1.js rename to tests/wpt/tests/fetch/orb/resources/script-iso-8559-1.js diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/script-utf16-bom.js b/tests/wpt/tests/fetch/orb/resources/script-utf16-bom.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/script-utf16-bom.js rename to tests/wpt/tests/fetch/orb/resources/script-utf16-bom.js diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/script-utf16-without-bom.js b/tests/wpt/tests/fetch/orb/resources/script-utf16-without-bom.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/script-utf16-without-bom.js rename to tests/wpt/tests/fetch/orb/resources/script-utf16-without-bom.js diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/script.js b/tests/wpt/tests/fetch/orb/resources/script.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/script.js rename to tests/wpt/tests/fetch/orb/resources/script.js diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/sound.mp3 b/tests/wpt/tests/fetch/orb/resources/sound.mp3 similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/sound.mp3 rename to tests/wpt/tests/fetch/orb/resources/sound.mp3 diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/text.txt b/tests/wpt/tests/fetch/orb/resources/text.txt similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/text.txt rename to tests/wpt/tests/fetch/orb/resources/text.txt diff --git a/tests/wpt/web-platform-tests/fetch/orb/resources/utils.js b/tests/wpt/tests/fetch/orb/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/resources/utils.js rename to tests/wpt/tests/fetch/orb/resources/utils.js diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/compressed-image-sniffing.sub.html b/tests/wpt/tests/fetch/orb/tentative/compressed-image-sniffing.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/compressed-image-sniffing.sub.html rename to tests/wpt/tests/fetch/orb/tentative/compressed-image-sniffing.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/content-range.sub.any.js b/tests/wpt/tests/fetch/orb/tentative/content-range.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/content-range.sub.any.js rename to tests/wpt/tests/fetch/orb/tentative/content-range.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/img-mime-types-coverage.tentative.sub.html b/tests/wpt/tests/fetch/orb/tentative/img-mime-types-coverage.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/img-mime-types-coverage.tentative.sub.html rename to tests/wpt/tests/fetch/orb/tentative/img-mime-types-coverage.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/img-png-mislabeled-as-html.sub-ref.html b/tests/wpt/tests/fetch/orb/tentative/img-png-mislabeled-as-html.sub-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/img-png-mislabeled-as-html.sub-ref.html rename to tests/wpt/tests/fetch/orb/tentative/img-png-mislabeled-as-html.sub-ref.html diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/img-png-mislabeled-as-html.sub.html b/tests/wpt/tests/fetch/orb/tentative/img-png-mislabeled-as-html.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/img-png-mislabeled-as-html.sub.html rename to tests/wpt/tests/fetch/orb/tentative/img-png-mislabeled-as-html.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/img-png-unlabeled.sub-ref.html b/tests/wpt/tests/fetch/orb/tentative/img-png-unlabeled.sub-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/img-png-unlabeled.sub-ref.html rename to tests/wpt/tests/fetch/orb/tentative/img-png-unlabeled.sub-ref.html diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/img-png-unlabeled.sub.html b/tests/wpt/tests/fetch/orb/tentative/img-png-unlabeled.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/img-png-unlabeled.sub.html rename to tests/wpt/tests/fetch/orb/tentative/img-png-unlabeled.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/known-mime-type.sub.any.js b/tests/wpt/tests/fetch/orb/tentative/known-mime-type.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/known-mime-type.sub.any.js rename to tests/wpt/tests/fetch/orb/tentative/known-mime-type.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/nosniff.sub.any.js b/tests/wpt/tests/fetch/orb/tentative/nosniff.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/nosniff.sub.any.js rename to tests/wpt/tests/fetch/orb/tentative/nosniff.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/script-js-unlabeled-gziped.sub.html b/tests/wpt/tests/fetch/orb/tentative/script-js-unlabeled-gziped.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/script-js-unlabeled-gziped.sub.html rename to tests/wpt/tests/fetch/orb/tentative/script-js-unlabeled-gziped.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/script-unlabeled.sub.html b/tests/wpt/tests/fetch/orb/tentative/script-unlabeled.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/script-unlabeled.sub.html rename to tests/wpt/tests/fetch/orb/tentative/script-unlabeled.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/script-utf16-without-bom-hint-charset.sub.html b/tests/wpt/tests/fetch/orb/tentative/script-utf16-without-bom-hint-charset.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/script-utf16-without-bom-hint-charset.sub.html rename to tests/wpt/tests/fetch/orb/tentative/script-utf16-without-bom-hint-charset.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/status.sub.any.js b/tests/wpt/tests/fetch/orb/tentative/status.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/status.sub.any.js rename to tests/wpt/tests/fetch/orb/tentative/status.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/status.sub.html b/tests/wpt/tests/fetch/orb/tentative/status.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/status.sub.html rename to tests/wpt/tests/fetch/orb/tentative/status.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/orb/tentative/unknown-mime-type.sub.any.js b/tests/wpt/tests/fetch/orb/tentative/unknown-mime-type.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/orb/tentative/unknown-mime-type.sub.any.js rename to tests/wpt/tests/fetch/orb/tentative/unknown-mime-type.sub.any.js diff --git a/tests/wpt/web-platform-tests/fetch/origin/assorted.window.js b/tests/wpt/tests/fetch/origin/assorted.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/origin/assorted.window.js rename to tests/wpt/tests/fetch/origin/assorted.window.js diff --git a/tests/wpt/web-platform-tests/fetch/origin/resources/redirect-and-stash.py b/tests/wpt/tests/fetch/origin/resources/redirect-and-stash.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/origin/resources/redirect-and-stash.py rename to tests/wpt/tests/fetch/origin/resources/redirect-and-stash.py diff --git a/tests/wpt/web-platform-tests/fetch/origin/resources/referrer-policy.py b/tests/wpt/tests/fetch/origin/resources/referrer-policy.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/origin/resources/referrer-policy.py rename to tests/wpt/tests/fetch/origin/resources/referrer-policy.py diff --git a/tests/wpt/web-platform-tests/fetch/range/blob.any.js b/tests/wpt/tests/fetch/range/blob.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/range/blob.any.js rename to tests/wpt/tests/fetch/range/blob.any.js diff --git a/tests/wpt/web-platform-tests/fetch/range/data.any.js b/tests/wpt/tests/fetch/range/data.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/range/data.any.js rename to tests/wpt/tests/fetch/range/data.any.js diff --git a/tests/wpt/web-platform-tests/fetch/range/general.any.js b/tests/wpt/tests/fetch/range/general.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/range/general.any.js rename to tests/wpt/tests/fetch/range/general.any.js diff --git a/tests/wpt/web-platform-tests/fetch/range/general.window.js b/tests/wpt/tests/fetch/range/general.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/range/general.window.js rename to tests/wpt/tests/fetch/range/general.window.js diff --git a/tests/wpt/web-platform-tests/fetch/range/non-matching-range-response.html b/tests/wpt/tests/fetch/range/non-matching-range-response.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/range/non-matching-range-response.html rename to tests/wpt/tests/fetch/range/non-matching-range-response.html diff --git a/tests/wpt/web-platform-tests/fetch/range/resources/basic.html b/tests/wpt/tests/fetch/range/resources/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/range/resources/basic.html rename to tests/wpt/tests/fetch/range/resources/basic.html diff --git a/tests/wpt/web-platform-tests/fetch/range/resources/long-wav.py b/tests/wpt/tests/fetch/range/resources/long-wav.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/range/resources/long-wav.py rename to tests/wpt/tests/fetch/range/resources/long-wav.py diff --git a/tests/wpt/web-platform-tests/fetch/range/resources/partial-script.py b/tests/wpt/tests/fetch/range/resources/partial-script.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/range/resources/partial-script.py rename to tests/wpt/tests/fetch/range/resources/partial-script.py diff --git a/tests/wpt/web-platform-tests/fetch/range/resources/partial-text.py b/tests/wpt/tests/fetch/range/resources/partial-text.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/range/resources/partial-text.py rename to tests/wpt/tests/fetch/range/resources/partial-text.py diff --git a/tests/wpt/web-platform-tests/fetch/range/resources/range-sw.js b/tests/wpt/tests/fetch/range/resources/range-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/range/resources/range-sw.js rename to tests/wpt/tests/fetch/range/resources/range-sw.js diff --git a/tests/wpt/web-platform-tests/fetch/range/resources/stash-take.py b/tests/wpt/tests/fetch/range/resources/stash-take.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/range/resources/stash-take.py rename to tests/wpt/tests/fetch/range/resources/stash-take.py diff --git a/tests/wpt/web-platform-tests/fetch/range/resources/utils.js b/tests/wpt/tests/fetch/range/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/range/resources/utils.js rename to tests/wpt/tests/fetch/range/resources/utils.js diff --git a/tests/wpt/web-platform-tests/fetch/range/resources/video-with-range.py b/tests/wpt/tests/fetch/range/resources/video-with-range.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/range/resources/video-with-range.py rename to tests/wpt/tests/fetch/range/resources/video-with-range.py diff --git a/tests/wpt/web-platform-tests/fetch/range/sw.https.window.js b/tests/wpt/tests/fetch/range/sw.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/range/sw.https.window.js rename to tests/wpt/tests/fetch/range/sw.https.window.js diff --git a/tests/wpt/web-platform-tests/fetch/redirect-navigate/302-found-post-handler.py b/tests/wpt/tests/fetch/redirect-navigate/302-found-post-handler.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/redirect-navigate/302-found-post-handler.py rename to tests/wpt/tests/fetch/redirect-navigate/302-found-post-handler.py diff --git a/tests/wpt/web-platform-tests/fetch/redirect-navigate/302-found-post.html b/tests/wpt/tests/fetch/redirect-navigate/302-found-post.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/redirect-navigate/302-found-post.html rename to tests/wpt/tests/fetch/redirect-navigate/302-found-post.html diff --git a/tests/wpt/web-platform-tests/fetch/redirect-navigate/preserve-fragment.html b/tests/wpt/tests/fetch/redirect-navigate/preserve-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/redirect-navigate/preserve-fragment.html rename to tests/wpt/tests/fetch/redirect-navigate/preserve-fragment.html diff --git a/tests/wpt/web-platform-tests/fetch/redirect-navigate/resources/destination.html b/tests/wpt/tests/fetch/redirect-navigate/resources/destination.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/redirect-navigate/resources/destination.html rename to tests/wpt/tests/fetch/redirect-navigate/resources/destination.html diff --git a/tests/wpt/web-platform-tests/fetch/redirects/data.window.js b/tests/wpt/tests/fetch/redirects/data.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/redirects/data.window.js rename to tests/wpt/tests/fetch/redirects/data.window.js diff --git a/tests/wpt/web-platform-tests/fetch/redirects/subresource-fragments.html b/tests/wpt/tests/fetch/redirects/subresource-fragments.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/redirects/subresource-fragments.html rename to tests/wpt/tests/fetch/redirects/subresource-fragments.html diff --git a/tests/wpt/web-platform-tests/fetch/security/1xx-response.any.js b/tests/wpt/tests/fetch/security/1xx-response.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/security/1xx-response.any.js rename to tests/wpt/tests/fetch/security/1xx-response.any.js diff --git a/tests/wpt/web-platform-tests/fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html b/tests/wpt/tests/fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html rename to tests/wpt/tests/fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/security/dangling-markup-mitigation.tentative.html b/tests/wpt/tests/fetch/security/dangling-markup-mitigation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/security/dangling-markup-mitigation.tentative.html rename to tests/wpt/tests/fetch/security/dangling-markup-mitigation.tentative.html diff --git a/tests/wpt/web-platform-tests/fetch/security/embedded-credentials.tentative.sub.html b/tests/wpt/tests/fetch/security/embedded-credentials.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/security/embedded-credentials.tentative.sub.html rename to tests/wpt/tests/fetch/security/embedded-credentials.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/security/redirect-to-url-with-credentials.https.html b/tests/wpt/tests/fetch/security/redirect-to-url-with-credentials.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/security/redirect-to-url-with-credentials.https.html rename to tests/wpt/tests/fetch/security/redirect-to-url-with-credentials.https.html diff --git a/tests/wpt/web-platform-tests/fetch/security/support/embedded-credential-window.sub.html b/tests/wpt/tests/fetch/security/support/embedded-credential-window.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/security/support/embedded-credential-window.sub.html rename to tests/wpt/tests/fetch/security/support/embedded-credential-window.sub.html diff --git a/tests/wpt/web-platform-tests/fetch/stale-while-revalidate/fetch-sw.https.html b/tests/wpt/tests/fetch/stale-while-revalidate/fetch-sw.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/stale-while-revalidate/fetch-sw.https.html rename to tests/wpt/tests/fetch/stale-while-revalidate/fetch-sw.https.html diff --git a/tests/wpt/web-platform-tests/fetch/stale-while-revalidate/fetch.any.js b/tests/wpt/tests/fetch/stale-while-revalidate/fetch.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/stale-while-revalidate/fetch.any.js rename to tests/wpt/tests/fetch/stale-while-revalidate/fetch.any.js diff --git a/tests/wpt/web-platform-tests/fetch/stale-while-revalidate/resources/stale-css.py b/tests/wpt/tests/fetch/stale-while-revalidate/resources/stale-css.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/stale-while-revalidate/resources/stale-css.py rename to tests/wpt/tests/fetch/stale-while-revalidate/resources/stale-css.py diff --git a/tests/wpt/web-platform-tests/fetch/stale-while-revalidate/resources/stale-image.py b/tests/wpt/tests/fetch/stale-while-revalidate/resources/stale-image.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/stale-while-revalidate/resources/stale-image.py rename to tests/wpt/tests/fetch/stale-while-revalidate/resources/stale-image.py diff --git a/tests/wpt/web-platform-tests/fetch/stale-while-revalidate/resources/stale-script.py b/tests/wpt/tests/fetch/stale-while-revalidate/resources/stale-script.py similarity index 100% rename from tests/wpt/web-platform-tests/fetch/stale-while-revalidate/resources/stale-script.py rename to tests/wpt/tests/fetch/stale-while-revalidate/resources/stale-script.py diff --git a/tests/wpt/web-platform-tests/fetch/stale-while-revalidate/revalidate-not-blocked-by-csp.html b/tests/wpt/tests/fetch/stale-while-revalidate/revalidate-not-blocked-by-csp.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/stale-while-revalidate/revalidate-not-blocked-by-csp.html rename to tests/wpt/tests/fetch/stale-while-revalidate/revalidate-not-blocked-by-csp.html diff --git a/tests/wpt/web-platform-tests/fetch/stale-while-revalidate/stale-css.html b/tests/wpt/tests/fetch/stale-while-revalidate/stale-css.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/stale-while-revalidate/stale-css.html rename to tests/wpt/tests/fetch/stale-while-revalidate/stale-css.html diff --git a/tests/wpt/web-platform-tests/fetch/stale-while-revalidate/stale-image.html b/tests/wpt/tests/fetch/stale-while-revalidate/stale-image.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/stale-while-revalidate/stale-image.html rename to tests/wpt/tests/fetch/stale-while-revalidate/stale-image.html diff --git a/tests/wpt/web-platform-tests/fetch/stale-while-revalidate/stale-script.html b/tests/wpt/tests/fetch/stale-while-revalidate/stale-script.html similarity index 100% rename from tests/wpt/web-platform-tests/fetch/stale-while-revalidate/stale-script.html rename to tests/wpt/tests/fetch/stale-while-revalidate/stale-script.html diff --git a/tests/wpt/web-platform-tests/fetch/stale-while-revalidate/sw-intercept.js b/tests/wpt/tests/fetch/stale-while-revalidate/sw-intercept.js similarity index 100% rename from tests/wpt/web-platform-tests/fetch/stale-while-revalidate/sw-intercept.js rename to tests/wpt/tests/fetch/stale-while-revalidate/sw-intercept.js diff --git a/tests/wpt/web-platform-tests/file-system-access/META.yml b/tests/wpt/tests/file-system-access/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/META.yml rename to tests/wpt/tests/file-system-access/META.yml diff --git a/tests/wpt/web-platform-tests/file-system-access/README.md b/tests/wpt/tests/file-system-access/README.md similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/README.md rename to tests/wpt/tests/file-system-access/README.md diff --git a/tests/wpt/web-platform-tests/file-system-access/idlharness.https.any.js b/tests/wpt/tests/file-system-access/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/idlharness.https.any.js rename to tests/wpt/tests/file-system-access/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-getUniqueId-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-getUniqueId-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-getUniqueId-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-getUniqueId-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-isSameEntry-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-isSameEntry-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-isSameEntry-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-isSameEntry-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-remove-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-remove-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemBaseHandle-remove-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemBaseHandle-remove-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-getFileHandle-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemDirectoryHandle-getFileHandle-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-getFileHandle-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemDirectoryHandle-getFileHandle-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-iteration-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemDirectoryHandle-iteration-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-iteration-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemDirectoryHandle-iteration-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-move-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemDirectoryHandle-move-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-move-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemDirectoryHandle-move-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-partitioned-manual.https.tentative.html b/tests/wpt/tests/file-system-access/local_FileSystemDirectoryHandle-partitioned-manual.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-partitioned-manual.https.tentative.html rename to tests/wpt/tests/file-system-access/local_FileSystemDirectoryHandle-partitioned-manual.https.tentative.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-removeEntry-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemDirectoryHandle-removeEntry-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-removeEntry-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemDirectoryHandle-removeEntry-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-resolve-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemDirectoryHandle-resolve-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemDirectoryHandle-resolve-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemDirectoryHandle-resolve-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemFileHandle-create-sync-access-handle-manual.https.tentative.html b/tests/wpt/tests/file-system-access/local_FileSystemFileHandle-create-sync-access-handle-manual.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemFileHandle-create-sync-access-handle-manual.https.tentative.html rename to tests/wpt/tests/file-system-access/local_FileSystemFileHandle-create-sync-access-handle-manual.https.tentative.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemFileHandle-getFile-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemFileHandle-getFile-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemFileHandle-getFile-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemFileHandle-getFile-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemFileHandle-move-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemFileHandle-move-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemFileHandle-move-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemFileHandle-move-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemFileHandle-partitioned-manual.https.tentative.html b/tests/wpt/tests/file-system-access/local_FileSystemFileHandle-partitioned-manual.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemFileHandle-partitioned-manual.https.tentative.html rename to tests/wpt/tests/file-system-access/local_FileSystemFileHandle-partitioned-manual.https.tentative.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemWritableFileStream-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemWritableFileStream-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-piped-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemWritableFileStream-piped-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-piped-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemWritableFileStream-piped-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-write-manual.https.html b/tests/wpt/tests/file-system-access/local_FileSystemWritableFileStream-write-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/local_FileSystemWritableFileStream-write-manual.https.html rename to tests/wpt/tests/file-system-access/local_FileSystemWritableFileStream-write-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/opaque-origin.https.window.js b/tests/wpt/tests/file-system-access/opaque-origin.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/opaque-origin.https.window.js rename to tests/wpt/tests/file-system-access/opaque-origin.https.window.js diff --git a/tests/wpt/web-platform-tests/file-system-access/resources/data/testfile.txt b/tests/wpt/tests/file-system-access/resources/data/testfile.txt similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/resources/data/testfile.txt rename to tests/wpt/tests/file-system-access/resources/data/testfile.txt diff --git a/tests/wpt/web-platform-tests/file-system-access/resources/local-fs-test-helpers.js b/tests/wpt/tests/file-system-access/resources/local-fs-test-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/resources/local-fs-test-helpers.js rename to tests/wpt/tests/file-system-access/resources/local-fs-test-helpers.js diff --git a/tests/wpt/web-platform-tests/file-system-access/resources/opaque-origin-sandbox.html b/tests/wpt/tests/file-system-access/resources/opaque-origin-sandbox.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/resources/opaque-origin-sandbox.html rename to tests/wpt/tests/file-system-access/resources/opaque-origin-sandbox.html diff --git a/tests/wpt/web-platform-tests/file-system-access/resources/test-helpers.js b/tests/wpt/tests/file-system-access/resources/test-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/resources/test-helpers.js rename to tests/wpt/tests/file-system-access/resources/test-helpers.js diff --git a/tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemDirectoryHandle-move.https.any.js b/tests/wpt/tests/file-system-access/sandboxed_FileSystemDirectoryHandle-move.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/sandboxed_FileSystemDirectoryHandle-move.https.any.js rename to tests/wpt/tests/file-system-access/sandboxed_FileSystemDirectoryHandle-move.https.any.js diff --git a/tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemDirectoryHandle-move.js b/tests/wpt/tests/file-system-access/script-tests/FileSystemDirectoryHandle-move.js similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/script-tests/FileSystemDirectoryHandle-move.js rename to tests/wpt/tests/file-system-access/script-tests/FileSystemDirectoryHandle-move.js diff --git a/tests/wpt/web-platform-tests/file-system-access/showDirectoryPicker-manual.https.html b/tests/wpt/tests/file-system-access/showDirectoryPicker-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/showDirectoryPicker-manual.https.html rename to tests/wpt/tests/file-system-access/showDirectoryPicker-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/showOpenFilePicker-manual.https.html b/tests/wpt/tests/file-system-access/showOpenFilePicker-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/showOpenFilePicker-manual.https.html rename to tests/wpt/tests/file-system-access/showOpenFilePicker-manual.https.html diff --git a/tests/wpt/web-platform-tests/file-system-access/showPicker-errors.https.window.js b/tests/wpt/tests/file-system-access/showPicker-errors.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/showPicker-errors.https.window.js rename to tests/wpt/tests/file-system-access/showPicker-errors.https.window.js diff --git a/tests/wpt/web-platform-tests/file-system-access/showSaveFilePicker-manual.https.html b/tests/wpt/tests/file-system-access/showSaveFilePicker-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/file-system-access/showSaveFilePicker-manual.https.html rename to tests/wpt/tests/file-system-access/showSaveFilePicker-manual.https.html diff --git a/tests/wpt/web-platform-tests/fledge/tentative/TODO b/tests/wpt/tests/fledge/tentative/TODO similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/TODO rename to tests/wpt/tests/fledge/tentative/TODO diff --git a/tests/wpt/web-platform-tests/fledge/tentative/auction-config.https.sub.window.js b/tests/wpt/tests/fledge/tentative/auction-config.https.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/auction-config.https.sub.window.js rename to tests/wpt/tests/fledge/tentative/auction-config.https.sub.window.js diff --git a/tests/wpt/web-platform-tests/fledge/tentative/fetch-ad-auction-headers-insecure-context.tentative.http.html b/tests/wpt/tests/fledge/tentative/fetch-ad-auction-headers-insecure-context.tentative.http.html similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/fetch-ad-auction-headers-insecure-context.tentative.http.html rename to tests/wpt/tests/fledge/tentative/fetch-ad-auction-headers-insecure-context.tentative.http.html diff --git a/tests/wpt/web-platform-tests/fledge/tentative/fetch-ad-auction-headers.tentative.https.html b/tests/wpt/tests/fledge/tentative/fetch-ad-auction-headers.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/fetch-ad-auction-headers.tentative.https.html rename to tests/wpt/tests/fledge/tentative/fetch-ad-auction-headers.tentative.https.html diff --git a/tests/wpt/web-platform-tests/fledge/tentative/insecure-context.window.js b/tests/wpt/tests/fledge/tentative/insecure-context.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/insecure-context.window.js rename to tests/wpt/tests/fledge/tentative/insecure-context.window.js diff --git a/tests/wpt/web-platform-tests/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js b/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js rename to tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js diff --git a/tests/wpt/web-platform-tests/fledge/tentative/no-winner.https.sub.window.js b/tests/wpt/tests/fledge/tentative/no-winner.https.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/no-winner.https.sub.window.js rename to tests/wpt/tests/fledge/tentative/no-winner.https.sub.window.js diff --git a/tests/wpt/web-platform-tests/fledge/tentative/register-ad-beacon.https.sub.window.js b/tests/wpt/tests/fledge/tentative/register-ad-beacon.https.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/register-ad-beacon.https.sub.window.js rename to tests/wpt/tests/fledge/tentative/register-ad-beacon.https.sub.window.js diff --git a/tests/wpt/web-platform-tests/fledge/tentative/reporting-arguments.https.sub.window.js b/tests/wpt/tests/fledge/tentative/reporting-arguments.https.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/reporting-arguments.https.sub.window.js rename to tests/wpt/tests/fledge/tentative/reporting-arguments.https.sub.window.js diff --git a/tests/wpt/web-platform-tests/fledge/tentative/resources/bidding-logic.sub.py b/tests/wpt/tests/fledge/tentative/resources/bidding-logic.sub.py similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/resources/bidding-logic.sub.py rename to tests/wpt/tests/fledge/tentative/resources/bidding-logic.sub.py diff --git a/tests/wpt/web-platform-tests/fledge/tentative/resources/decision-logic.sub.py b/tests/wpt/tests/fledge/tentative/resources/decision-logic.sub.py similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/resources/decision-logic.sub.py rename to tests/wpt/tests/fledge/tentative/resources/decision-logic.sub.py diff --git a/tests/wpt/web-platform-tests/fledge/tentative/resources/empty.html b/tests/wpt/tests/fledge/tentative/resources/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/resources/empty.html rename to tests/wpt/tests/fledge/tentative/resources/empty.html diff --git a/tests/wpt/web-platform-tests/fledge/tentative/resources/fenced-frame.sub.py b/tests/wpt/tests/fledge/tentative/resources/fenced-frame.sub.py similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/resources/fenced-frame.sub.py rename to tests/wpt/tests/fledge/tentative/resources/fenced-frame.sub.py diff --git a/tests/wpt/web-platform-tests/fledge/tentative/resources/fledge-util.js b/tests/wpt/tests/fledge/tentative/resources/fledge-util.js similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/resources/fledge-util.js rename to tests/wpt/tests/fledge/tentative/resources/fledge-util.js diff --git a/tests/wpt/web-platform-tests/fledge/tentative/resources/request-tracker.py b/tests/wpt/tests/fledge/tentative/resources/request-tracker.py similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/resources/request-tracker.py rename to tests/wpt/tests/fledge/tentative/resources/request-tracker.py diff --git a/tests/wpt/web-platform-tests/fledge/tentative/resources/trusted-bidding-signals.py b/tests/wpt/tests/fledge/tentative/resources/trusted-bidding-signals.py similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/resources/trusted-bidding-signals.py rename to tests/wpt/tests/fledge/tentative/resources/trusted-bidding-signals.py diff --git a/tests/wpt/web-platform-tests/fledge/tentative/send-report-to.https.sub.window.js b/tests/wpt/tests/fledge/tentative/send-report-to.https.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/send-report-to.https.sub.window.js rename to tests/wpt/tests/fledge/tentative/send-report-to.https.sub.window.js diff --git a/tests/wpt/web-platform-tests/fledge/tentative/trusted-bidding-signals.https.sub.window.js b/tests/wpt/tests/fledge/tentative/trusted-bidding-signals.https.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fledge/tentative/trusted-bidding-signals.https.sub.window.js rename to tests/wpt/tests/fledge/tentative/trusted-bidding-signals.https.sub.window.js diff --git a/tests/wpt/web-platform-tests/focus/activeelement-after-calling-window-focus.sub.html b/tests/wpt/tests/focus/activeelement-after-calling-window-focus.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/activeelement-after-calling-window-focus.sub.html rename to tests/wpt/tests/focus/activeelement-after-calling-window-focus.sub.html diff --git a/tests/wpt/web-platform-tests/focus/activeelement-after-focusing-different-site-iframe-contentwindow.html b/tests/wpt/tests/focus/activeelement-after-focusing-different-site-iframe-contentwindow.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/activeelement-after-focusing-different-site-iframe-contentwindow.html rename to tests/wpt/tests/focus/activeelement-after-focusing-different-site-iframe-contentwindow.html diff --git a/tests/wpt/web-platform-tests/focus/activeelement-after-focusing-different-site-iframe-then-immediately-focusing-back.html b/tests/wpt/tests/focus/activeelement-after-focusing-different-site-iframe-then-immediately-focusing-back.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/activeelement-after-focusing-different-site-iframe-then-immediately-focusing-back.html rename to tests/wpt/tests/focus/activeelement-after-focusing-different-site-iframe-then-immediately-focusing-back.html diff --git a/tests/wpt/web-platform-tests/focus/activeelement-after-focusing-different-site-iframe.html b/tests/wpt/tests/focus/activeelement-after-focusing-different-site-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/activeelement-after-focusing-different-site-iframe.html rename to tests/wpt/tests/focus/activeelement-after-focusing-different-site-iframe.html diff --git a/tests/wpt/web-platform-tests/focus/activeelement-after-focusing-same-site-iframe-contentwindow.html b/tests/wpt/tests/focus/activeelement-after-focusing-same-site-iframe-contentwindow.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/activeelement-after-focusing-same-site-iframe-contentwindow.html rename to tests/wpt/tests/focus/activeelement-after-focusing-same-site-iframe-contentwindow.html diff --git a/tests/wpt/web-platform-tests/focus/activeelement-after-focusing-same-site-iframe.html b/tests/wpt/tests/focus/activeelement-after-focusing-same-site-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/activeelement-after-focusing-same-site-iframe.html rename to tests/wpt/tests/focus/activeelement-after-focusing-same-site-iframe.html diff --git a/tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-different-site-iframe-contentwindow.html b/tests/wpt/tests/focus/activeelement-after-immediately-focusing-different-site-iframe-contentwindow.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-different-site-iframe-contentwindow.html rename to tests/wpt/tests/focus/activeelement-after-immediately-focusing-different-site-iframe-contentwindow.html diff --git a/tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-different-site-iframe.html b/tests/wpt/tests/focus/activeelement-after-immediately-focusing-different-site-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-different-site-iframe.html rename to tests/wpt/tests/focus/activeelement-after-immediately-focusing-different-site-iframe.html diff --git a/tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-same-site-iframe-contentwindow.html b/tests/wpt/tests/focus/activeelement-after-immediately-focusing-same-site-iframe-contentwindow.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-same-site-iframe-contentwindow.html rename to tests/wpt/tests/focus/activeelement-after-immediately-focusing-same-site-iframe-contentwindow.html diff --git a/tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-same-site-iframe.html b/tests/wpt/tests/focus/activeelement-after-immediately-focusing-same-site-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/activeelement-after-immediately-focusing-same-site-iframe.html rename to tests/wpt/tests/focus/activeelement-after-immediately-focusing-same-site-iframe.html diff --git a/tests/wpt/web-platform-tests/focus/focus-already-focused-iframe-deep-different-site.html b/tests/wpt/tests/focus/focus-already-focused-iframe-deep-different-site.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/focus-already-focused-iframe-deep-different-site.html rename to tests/wpt/tests/focus/focus-already-focused-iframe-deep-different-site.html diff --git a/tests/wpt/web-platform-tests/focus/focus-already-focused-iframe-deep-same-site.html b/tests/wpt/tests/focus/focus-already-focused-iframe-deep-same-site.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/focus-already-focused-iframe-deep-same-site.html rename to tests/wpt/tests/focus/focus-already-focused-iframe-deep-same-site.html diff --git a/tests/wpt/web-platform-tests/focus/focus-already-focused-iframe-different-site.html b/tests/wpt/tests/focus/focus-already-focused-iframe-different-site.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/focus-already-focused-iframe-different-site.html rename to tests/wpt/tests/focus/focus-already-focused-iframe-different-site.html diff --git a/tests/wpt/web-platform-tests/focus/focus-already-focused-iframe-same-site.html b/tests/wpt/tests/focus/focus-already-focused-iframe-same-site.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/focus-already-focused-iframe-same-site.html rename to tests/wpt/tests/focus/focus-already-focused-iframe-same-site.html diff --git a/tests/wpt/web-platform-tests/focus/focus-event-after-focusing-iframes.html b/tests/wpt/tests/focus/focus-event-after-focusing-iframes.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/focus-event-after-focusing-iframes.html rename to tests/wpt/tests/focus/focus-event-after-focusing-iframes.html diff --git a/tests/wpt/web-platform-tests/focus/focus-event-after-iframe-gets-focus.html b/tests/wpt/tests/focus/focus-event-after-iframe-gets-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/focus-event-after-iframe-gets-focus.html rename to tests/wpt/tests/focus/focus-event-after-iframe-gets-focus.html diff --git a/tests/wpt/web-platform-tests/focus/focus-restoration-in-different-site-iframes-window.html b/tests/wpt/tests/focus/focus-restoration-in-different-site-iframes-window.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/focus-restoration-in-different-site-iframes-window.html rename to tests/wpt/tests/focus/focus-restoration-in-different-site-iframes-window.html diff --git a/tests/wpt/web-platform-tests/focus/focus-restoration-in-different-site-iframes.html b/tests/wpt/tests/focus/focus-restoration-in-different-site-iframes.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/focus-restoration-in-different-site-iframes.html rename to tests/wpt/tests/focus/focus-restoration-in-different-site-iframes.html diff --git a/tests/wpt/web-platform-tests/focus/focus-restoration-in-same-site-iframes-window.html b/tests/wpt/tests/focus/focus-restoration-in-same-site-iframes-window.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/focus-restoration-in-same-site-iframes-window.html rename to tests/wpt/tests/focus/focus-restoration-in-same-site-iframes-window.html diff --git a/tests/wpt/web-platform-tests/focus/hasfocus-different-site.html b/tests/wpt/tests/focus/hasfocus-different-site.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/hasfocus-different-site.html rename to tests/wpt/tests/focus/hasfocus-different-site.html diff --git a/tests/wpt/web-platform-tests/focus/hasfocus-same-site.html b/tests/wpt/tests/focus/hasfocus-same-site.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/hasfocus-same-site.html rename to tests/wpt/tests/focus/hasfocus-same-site.html diff --git a/tests/wpt/web-platform-tests/focus/iframe-activeelement-after-focusing-out-iframes.html b/tests/wpt/tests/focus/iframe-activeelement-after-focusing-out-iframes.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/iframe-activeelement-after-focusing-out-iframes.html rename to tests/wpt/tests/focus/iframe-activeelement-after-focusing-out-iframes.html diff --git a/tests/wpt/web-platform-tests/focus/iframe-contentwindow-focus-with-different-site-intermediate-frame.html b/tests/wpt/tests/focus/iframe-contentwindow-focus-with-different-site-intermediate-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/iframe-contentwindow-focus-with-different-site-intermediate-frame.html rename to tests/wpt/tests/focus/iframe-contentwindow-focus-with-different-site-intermediate-frame.html diff --git a/tests/wpt/web-platform-tests/focus/iframe-contentwindow-focus-with-same-as-top-intermediate-frame.html b/tests/wpt/tests/focus/iframe-contentwindow-focus-with-same-as-top-intermediate-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/iframe-contentwindow-focus-with-same-as-top-intermediate-frame.html rename to tests/wpt/tests/focus/iframe-contentwindow-focus-with-same-as-top-intermediate-frame.html diff --git a/tests/wpt/web-platform-tests/focus/iframe-focus-with-different-site-intermediate-frame.html b/tests/wpt/tests/focus/iframe-focus-with-different-site-intermediate-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/iframe-focus-with-different-site-intermediate-frame.html rename to tests/wpt/tests/focus/iframe-focus-with-different-site-intermediate-frame.html diff --git a/tests/wpt/web-platform-tests/focus/iframe-focus-with-same-as-top-intermediate-frame.html b/tests/wpt/tests/focus/iframe-focus-with-same-as-top-intermediate-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/iframe-focus-with-same-as-top-intermediate-frame.html rename to tests/wpt/tests/focus/iframe-focus-with-same-as-top-intermediate-frame.html diff --git a/tests/wpt/web-platform-tests/focus/iframe-focuses-parent-different-site.html b/tests/wpt/tests/focus/iframe-focuses-parent-different-site.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/iframe-focuses-parent-different-site.html rename to tests/wpt/tests/focus/iframe-focuses-parent-different-site.html diff --git a/tests/wpt/web-platform-tests/focus/iframe-focuses-parent-same-site.html b/tests/wpt/tests/focus/iframe-focuses-parent-same-site.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/iframe-focuses-parent-same-site.html rename to tests/wpt/tests/focus/iframe-focuses-parent-same-site.html diff --git a/tests/wpt/web-platform-tests/focus/scroll-matches-focus.html b/tests/wpt/tests/focus/scroll-matches-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/scroll-matches-focus.html rename to tests/wpt/tests/focus/scroll-matches-focus.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-calling-window-focus-inner.html b/tests/wpt/tests/focus/support/activeelement-after-calling-window-focus-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-calling-window-focus-inner.html rename to tests/wpt/tests/focus/support/activeelement-after-calling-window-focus-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-calling-window-focus-middle.sub.html b/tests/wpt/tests/focus/support/activeelement-after-calling-window-focus-middle.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-calling-window-focus-middle.sub.html rename to tests/wpt/tests/focus/support/activeelement-after-calling-window-focus-middle.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-calling-window-focus-outer-different.sub.html b/tests/wpt/tests/focus/support/activeelement-after-calling-window-focus-outer-different.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-calling-window-focus-outer-different.sub.html rename to tests/wpt/tests/focus/support/activeelement-after-calling-window-focus-outer-different.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-calling-window-focus-outer-same.sub.html b/tests/wpt/tests/focus/support/activeelement-after-calling-window-focus-outer-same.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-calling-window-focus-outer-same.sub.html rename to tests/wpt/tests/focus/support/activeelement-after-calling-window-focus-outer-same.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-different-site-iframe-inner-contentwindow.html b/tests/wpt/tests/focus/support/activeelement-after-focusing-different-site-iframe-inner-contentwindow.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-different-site-iframe-inner-contentwindow.html rename to tests/wpt/tests/focus/support/activeelement-after-focusing-different-site-iframe-inner-contentwindow.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-different-site-iframe-inner.html b/tests/wpt/tests/focus/support/activeelement-after-focusing-different-site-iframe-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-different-site-iframe-inner.html rename to tests/wpt/tests/focus/support/activeelement-after-focusing-different-site-iframe-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-different-site-iframe-outer-contentwindow.sub.html b/tests/wpt/tests/focus/support/activeelement-after-focusing-different-site-iframe-outer-contentwindow.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-different-site-iframe-outer-contentwindow.sub.html rename to tests/wpt/tests/focus/support/activeelement-after-focusing-different-site-iframe-outer-contentwindow.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-different-site-iframe-outer.sub.html b/tests/wpt/tests/focus/support/activeelement-after-focusing-different-site-iframe-outer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-different-site-iframe-outer.sub.html rename to tests/wpt/tests/focus/support/activeelement-after-focusing-different-site-iframe-outer.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-different-site-iframe-then-immediately-focusing-back-outer.sub.html b/tests/wpt/tests/focus/support/activeelement-after-focusing-different-site-iframe-then-immediately-focusing-back-outer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-different-site-iframe-then-immediately-focusing-back-outer.sub.html rename to tests/wpt/tests/focus/support/activeelement-after-focusing-different-site-iframe-then-immediately-focusing-back-outer.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-same-site-iframe-inner-contentwindow.html b/tests/wpt/tests/focus/support/activeelement-after-focusing-same-site-iframe-inner-contentwindow.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-same-site-iframe-inner-contentwindow.html rename to tests/wpt/tests/focus/support/activeelement-after-focusing-same-site-iframe-inner-contentwindow.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-same-site-iframe-inner.html b/tests/wpt/tests/focus/support/activeelement-after-focusing-same-site-iframe-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-same-site-iframe-inner.html rename to tests/wpt/tests/focus/support/activeelement-after-focusing-same-site-iframe-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-same-site-iframe-outer-contentwindow.html b/tests/wpt/tests/focus/support/activeelement-after-focusing-same-site-iframe-outer-contentwindow.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-same-site-iframe-outer-contentwindow.html rename to tests/wpt/tests/focus/support/activeelement-after-focusing-same-site-iframe-outer-contentwindow.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-same-site-iframe-outer.html b/tests/wpt/tests/focus/support/activeelement-after-focusing-same-site-iframe-outer.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-focusing-same-site-iframe-outer.html rename to tests/wpt/tests/focus/support/activeelement-after-focusing-same-site-iframe-outer.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-inner-contentwindow.html b/tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-inner-contentwindow.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-inner-contentwindow.html rename to tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-inner-contentwindow.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-inner.html b/tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-inner.html rename to tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-outer-contentwindow.sub.html b/tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-outer-contentwindow.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-outer-contentwindow.sub.html rename to tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-outer-contentwindow.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-outer.sub.html b/tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-outer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-outer.sub.html rename to tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-different-site-iframe-outer.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-inner-contentwindow.html b/tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-inner-contentwindow.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-inner-contentwindow.html rename to tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-inner-contentwindow.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-inner.html b/tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-inner.html rename to tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-outer-contentwindow.html b/tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-outer-contentwindow.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-outer-contentwindow.html rename to tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-outer-contentwindow.html diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-outer.html b/tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-outer.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-outer.html rename to tests/wpt/tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-outer.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-already-focused-iframe-deep-different-site-outer.sub.html b/tests/wpt/tests/focus/support/focus-already-focused-iframe-deep-different-site-outer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-already-focused-iframe-deep-different-site-outer.sub.html rename to tests/wpt/tests/focus/support/focus-already-focused-iframe-deep-different-site-outer.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-already-focused-iframe-deep-same-site-outer.html b/tests/wpt/tests/focus/support/focus-already-focused-iframe-deep-same-site-outer.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-already-focused-iframe-deep-same-site-outer.html rename to tests/wpt/tests/focus/support/focus-already-focused-iframe-deep-same-site-outer.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-already-focused-iframe-different-site-outer.sub.html b/tests/wpt/tests/focus/support/focus-already-focused-iframe-different-site-outer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-already-focused-iframe-different-site-outer.sub.html rename to tests/wpt/tests/focus/support/focus-already-focused-iframe-different-site-outer.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-already-focused-iframe-inner.html b/tests/wpt/tests/focus/support/focus-already-focused-iframe-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-already-focused-iframe-inner.html rename to tests/wpt/tests/focus/support/focus-already-focused-iframe-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-already-focused-iframe-middle.html b/tests/wpt/tests/focus/support/focus-already-focused-iframe-middle.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-already-focused-iframe-middle.html rename to tests/wpt/tests/focus/support/focus-already-focused-iframe-middle.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-already-focused-iframe-same-site-outer.html b/tests/wpt/tests/focus/support/focus-already-focused-iframe-same-site-outer.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-already-focused-iframe-same-site-outer.html rename to tests/wpt/tests/focus/support/focus-already-focused-iframe-same-site-outer.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-event-after-different-site-iframe-gets-focus-outer.sub.html b/tests/wpt/tests/focus/support/focus-event-after-different-site-iframe-gets-focus-outer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-event-after-different-site-iframe-gets-focus-outer.sub.html rename to tests/wpt/tests/focus/support/focus-event-after-different-site-iframe-gets-focus-outer.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-event-after-focusing-different-site-iframes-outer.sub.html b/tests/wpt/tests/focus/support/focus-event-after-focusing-different-site-iframes-outer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-event-after-focusing-different-site-iframes-outer.sub.html rename to tests/wpt/tests/focus/support/focus-event-after-focusing-different-site-iframes-outer.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-event-after-focusing-iframes-inner.html b/tests/wpt/tests/focus/support/focus-event-after-focusing-iframes-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-event-after-focusing-iframes-inner.html rename to tests/wpt/tests/focus/support/focus-event-after-focusing-iframes-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-event-after-focusing-same-site-iframes-outer.html b/tests/wpt/tests/focus/support/focus-event-after-focusing-same-site-iframes-outer.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-event-after-focusing-same-site-iframes-outer.html rename to tests/wpt/tests/focus/support/focus-event-after-focusing-same-site-iframes-outer.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-event-after-iframe-gets-focus-inner.html b/tests/wpt/tests/focus/support/focus-event-after-iframe-gets-focus-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-event-after-iframe-gets-focus-inner.html rename to tests/wpt/tests/focus/support/focus-event-after-iframe-gets-focus-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-event-after-innermost-different-site-iframe-gets-focus-middle.sub.html b/tests/wpt/tests/focus/support/focus-event-after-innermost-different-site-iframe-gets-focus-middle.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-event-after-innermost-different-site-iframe-gets-focus-middle.sub.html rename to tests/wpt/tests/focus/support/focus-event-after-innermost-different-site-iframe-gets-focus-middle.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-event-after-innermost-different-site-iframe-gets-focus-outer.sub.html b/tests/wpt/tests/focus/support/focus-event-after-innermost-different-site-iframe-gets-focus-outer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-event-after-innermost-different-site-iframe-gets-focus-outer.sub.html rename to tests/wpt/tests/focus/support/focus-event-after-innermost-different-site-iframe-gets-focus-outer.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-event-after-same-site-iframe-gets-focus-outer.html b/tests/wpt/tests/focus/support/focus-event-after-same-site-iframe-gets-focus-outer.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-event-after-same-site-iframe-gets-focus-outer.html rename to tests/wpt/tests/focus/support/focus-event-after-same-site-iframe-gets-focus-outer.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-inner-window.html b/tests/wpt/tests/focus/support/focus-restoration-in-different-site-iframes-inner-window.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-inner-window.html rename to tests/wpt/tests/focus/support/focus-restoration-in-different-site-iframes-inner-window.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-inner.html b/tests/wpt/tests/focus/support/focus-restoration-in-different-site-iframes-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-inner.html rename to tests/wpt/tests/focus/support/focus-restoration-in-different-site-iframes-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-other.html b/tests/wpt/tests/focus/support/focus-restoration-in-different-site-iframes-other.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-other.html rename to tests/wpt/tests/focus/support/focus-restoration-in-different-site-iframes-other.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-outer-window.sub.html b/tests/wpt/tests/focus/support/focus-restoration-in-different-site-iframes-outer-window.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-outer-window.sub.html rename to tests/wpt/tests/focus/support/focus-restoration-in-different-site-iframes-outer-window.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-outer.sub.html b/tests/wpt/tests/focus/support/focus-restoration-in-different-site-iframes-outer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-restoration-in-different-site-iframes-outer.sub.html rename to tests/wpt/tests/focus/support/focus-restoration-in-different-site-iframes-outer.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-same-site-iframes-inner-window.html b/tests/wpt/tests/focus/support/focus-restoration-in-same-site-iframes-inner-window.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-restoration-in-same-site-iframes-inner-window.html rename to tests/wpt/tests/focus/support/focus-restoration-in-same-site-iframes-inner-window.html diff --git a/tests/wpt/web-platform-tests/focus/support/focus-restoration-in-same-site-iframes-outer-window.html b/tests/wpt/tests/focus/support/focus-restoration-in-same-site-iframes-outer-window.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/focus-restoration-in-same-site-iframes-outer-window.html rename to tests/wpt/tests/focus/support/focus-restoration-in-same-site-iframes-outer-window.html diff --git a/tests/wpt/web-platform-tests/focus/support/hasfocus-different-site-outer.sub.html b/tests/wpt/tests/focus/support/hasfocus-different-site-outer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/hasfocus-different-site-outer.sub.html rename to tests/wpt/tests/focus/support/hasfocus-different-site-outer.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/hasfocus-inner.html b/tests/wpt/tests/focus/support/hasfocus-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/hasfocus-inner.html rename to tests/wpt/tests/focus/support/hasfocus-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/hasfocus-other.html b/tests/wpt/tests/focus/support/hasfocus-other.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/hasfocus-other.html rename to tests/wpt/tests/focus/support/hasfocus-other.html diff --git a/tests/wpt/web-platform-tests/focus/support/hasfocus-same-site-outer.html b/tests/wpt/tests/focus/support/hasfocus-same-site-outer.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/hasfocus-same-site-outer.html rename to tests/wpt/tests/focus/support/hasfocus-same-site-outer.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-activeelement-after-focusing-out-different-site-iframes-outer.sub.html b/tests/wpt/tests/focus/support/iframe-activeelement-after-focusing-out-different-site-iframes-outer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-activeelement-after-focusing-out-different-site-iframes-outer.sub.html rename to tests/wpt/tests/focus/support/iframe-activeelement-after-focusing-out-different-site-iframes-outer.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-activeelement-after-focusing-out-iframes-inner.html b/tests/wpt/tests/focus/support/iframe-activeelement-after-focusing-out-iframes-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-activeelement-after-focusing-out-iframes-inner.html rename to tests/wpt/tests/focus/support/iframe-activeelement-after-focusing-out-iframes-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-activeelement-after-focusing-out-same-site-iframes-outer.html b/tests/wpt/tests/focus/support/iframe-activeelement-after-focusing-out-same-site-iframes-outer.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-activeelement-after-focusing-out-same-site-iframes-outer.html rename to tests/wpt/tests/focus/support/iframe-activeelement-after-focusing-out-same-site-iframes-outer.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-inner.html b/tests/wpt/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-inner.html rename to tests/wpt/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-middle.sub.html b/tests/wpt/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-middle.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-middle.sub.html rename to tests/wpt/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-middle.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-outer.sub.html b/tests/wpt/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-outer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-outer.sub.html rename to tests/wpt/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-outer.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-inner.html b/tests/wpt/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-inner.html rename to tests/wpt/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-middle.sub.html b/tests/wpt/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-middle.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-middle.sub.html rename to tests/wpt/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-middle.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-outer.html b/tests/wpt/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-outer.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-outer.html rename to tests/wpt/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-outer.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-focus-with-different-site-intermediate-frame-inner.html b/tests/wpt/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-focus-with-different-site-intermediate-frame-inner.html rename to tests/wpt/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-focus-with-different-site-intermediate-frame-middle.sub.html b/tests/wpt/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-middle.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-focus-with-different-site-intermediate-frame-middle.sub.html rename to tests/wpt/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-middle.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-focus-with-different-site-intermediate-frame-outer.sub.html b/tests/wpt/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-outer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-focus-with-different-site-intermediate-frame-outer.sub.html rename to tests/wpt/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-outer.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-inner.html b/tests/wpt/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-inner.html rename to tests/wpt/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-middle.sub.html b/tests/wpt/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-middle.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-middle.sub.html rename to tests/wpt/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-middle.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-outer.html b/tests/wpt/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-outer.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-outer.html rename to tests/wpt/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-outer.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-focuses-parent-different-site-inner.html b/tests/wpt/tests/focus/support/iframe-focuses-parent-different-site-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-focuses-parent-different-site-inner.html rename to tests/wpt/tests/focus/support/iframe-focuses-parent-different-site-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-focuses-parent-different-site-other.html b/tests/wpt/tests/focus/support/iframe-focuses-parent-different-site-other.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-focuses-parent-different-site-other.html rename to tests/wpt/tests/focus/support/iframe-focuses-parent-different-site-other.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-focuses-parent-different-site-outer.sub.html b/tests/wpt/tests/focus/support/iframe-focuses-parent-different-site-outer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-focuses-parent-different-site-outer.sub.html rename to tests/wpt/tests/focus/support/iframe-focuses-parent-different-site-outer.sub.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-focuses-parent-same-site-inner.html b/tests/wpt/tests/focus/support/iframe-focuses-parent-same-site-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-focuses-parent-same-site-inner.html rename to tests/wpt/tests/focus/support/iframe-focuses-parent-same-site-inner.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-focuses-parent-same-site-other.html b/tests/wpt/tests/focus/support/iframe-focuses-parent-same-site-other.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-focuses-parent-same-site-other.html rename to tests/wpt/tests/focus/support/iframe-focuses-parent-same-site-other.html diff --git a/tests/wpt/web-platform-tests/focus/support/iframe-focuses-parent-same-site-outer.html b/tests/wpt/tests/focus/support/iframe-focuses-parent-same-site-outer.html similarity index 100% rename from tests/wpt/web-platform-tests/focus/support/iframe-focuses-parent-same-site-outer.html rename to tests/wpt/tests/focus/support/iframe-focuses-parent-same-site-outer.html diff --git a/tests/wpt/web-platform-tests/font-access/README.md b/tests/wpt/tests/font-access/README.md similarity index 100% rename from tests/wpt/web-platform-tests/font-access/README.md rename to tests/wpt/tests/font-access/README.md diff --git a/tests/wpt/web-platform-tests/font-access/font_access_basic.tentative.https.window.js b/tests/wpt/tests/font-access/font_access_basic.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/font-access/font_access_basic.tentative.https.window.js rename to tests/wpt/tests/font-access/font_access_basic.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/font-access/font_access_blob.tentative.https.window.js b/tests/wpt/tests/font-access/font_access_blob.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/font-access/font_access_blob.tentative.https.window.js rename to tests/wpt/tests/font-access/font_access_blob.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/font-access/font_access_detached_iframe.tentative.https.window.js b/tests/wpt/tests/font-access/font_access_detached_iframe.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/font-access/font_access_detached_iframe.tentative.https.window.js rename to tests/wpt/tests/font-access/font_access_detached_iframe.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/font-access/font_access_permission.tentative.https.window.js b/tests/wpt/tests/font-access/font_access_permission.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/font-access/font_access_permission.tentative.https.window.js rename to tests/wpt/tests/font-access/font_access_permission.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/font-access/font_access_query_select.tentative.https.window.js b/tests/wpt/tests/font-access/font_access_query_select.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/font-access/font_access_query_select.tentative.https.window.js rename to tests/wpt/tests/font-access/font_access_query_select.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/font-access/font_access_sorted.tentative.https.window.js b/tests/wpt/tests/font-access/font_access_sorted.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/font-access/font_access_sorted.tentative.https.window.js rename to tests/wpt/tests/font-access/font_access_sorted.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html rename to tests/wpt/tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html diff --git a/tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy-attribute.https.sub.html b/tests/wpt/tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy-attribute.https.sub.html rename to tests/wpt/tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy.https.sub.html b/tests/wpt/tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy.https.sub.html rename to tests/wpt/tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/font-access/permissions-policy/local-fonts-allowed-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-default-permissions-policy.https.sub.html b/tests/wpt/tests/font-access/permissions-policy/local-fonts-default-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-default-permissions-policy.https.sub.html rename to tests/wpt/tests/font-access/permissions-policy/local-fonts-default-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-disabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/font-access/permissions-policy/local-fonts-disabled-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-disabled-by-permissions-policy.https.sub.html rename to tests/wpt/tests/font-access/permissions-policy/local-fonts-disabled-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-disabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/font-access/permissions-policy/local-fonts-disabled-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-disabled-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/font-access/permissions-policy/local-fonts-disabled-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-supported-by-permissions-policy.html b/tests/wpt/tests/font-access/permissions-policy/local-fonts-supported-by-permissions-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/font-access/permissions-policy/local-fonts-supported-by-permissions-policy.html rename to tests/wpt/tests/font-access/permissions-policy/local-fonts-supported-by-permissions-policy.html diff --git a/tests/wpt/web-platform-tests/font-access/resources/font-asserts.js b/tests/wpt/tests/font-access/resources/font-asserts.js similarity index 100% rename from tests/wpt/web-platform-tests/font-access/resources/font-asserts.js rename to tests/wpt/tests/font-access/resources/font-asserts.js diff --git a/tests/wpt/web-platform-tests/font-access/resources/font-data.js b/tests/wpt/tests/font-access/resources/font-data.js similarity index 100% rename from tests/wpt/web-platform-tests/font-access/resources/font-data.js rename to tests/wpt/tests/font-access/resources/font-data.js diff --git a/tests/wpt/web-platform-tests/font-access/resources/font-test-utils.js b/tests/wpt/tests/font-access/resources/font-test-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/font-access/resources/font-test-utils.js rename to tests/wpt/tests/font-access/resources/font-test-utils.js diff --git a/tests/wpt/web-platform-tests/fonts/AD.woff b/tests/wpt/tests/fonts/AD.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/AD.woff rename to tests/wpt/tests/fonts/AD.woff diff --git a/tests/wpt/web-platform-tests/fonts/Ahem.ttf b/tests/wpt/tests/fonts/Ahem.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/Ahem.ttf rename to tests/wpt/tests/fonts/Ahem.ttf diff --git a/tests/wpt/web-platform-tests/fonts/Ahem.ttf.headers b/tests/wpt/tests/fonts/Ahem.ttf.headers similarity index 100% rename from tests/wpt/web-platform-tests/fonts/Ahem.ttf.headers rename to tests/wpt/tests/fonts/Ahem.ttf.headers diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/LICENSE b/tests/wpt/tests/fonts/CSSTest/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/LICENSE rename to tests/wpt/tests/fonts/CSSTest/LICENSE diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/README b/tests/wpt/tests/fonts/CSSTest/README similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/README rename to tests/wpt/tests/fonts/CSSTest/README diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-ascii.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-ascii.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-ascii.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-ascii.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-basic-bold.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-basic-bold.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-basic-bold.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-basic-bold.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-basic-bolditalic.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-basic-bolditalic.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-basic-bolditalic.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-basic-bolditalic.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-basic-italic.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-basic-italic.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-basic-italic.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-basic-italic.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-basic-regular.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-basic-regular.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-basic-regular.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-basic-regular.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-fallback.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-fallback.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-fallback.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-fallback.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-familyname-bold.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-familyname-bold.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-familyname-bold.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-familyname-bold.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-familyname-funkyA.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-familyname-funkyA.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-familyname-funkyA.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-familyname-funkyA.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-familyname-funkyB.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-familyname-funkyB.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-familyname-funkyB.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-familyname-funkyB.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-familyname-funkyC.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-familyname-funkyC.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-familyname-funkyC.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-familyname-funkyC.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-familyname.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-familyname.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-familyname.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-familyname.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-verify.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-verify.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-verify.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-verify.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-100.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-100.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-100.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-100.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-1479-w1.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-1479-w1.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-1479-w1.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-1479-w1.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-1479-w4.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-1479-w4.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-1479-w4.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-1479-w4.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-1479-w7.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-1479-w7.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-1479-w7.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-1479-w7.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-1479-w9.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-1479-w9.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-1479-w9.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-1479-w9.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-15-w1.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-15-w1.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-15-w1.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-15-w1.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-15-w5.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-15-w5.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-15-w5.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-15-w5.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-200.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-200.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-200.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-200.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-24-w2.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-24-w2.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-24-w2.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-24-w2.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-24-w4.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-24-w4.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-24-w4.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-24-w4.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-2569-w2.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-2569-w2.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-2569-w2.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-2569-w2.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-2569-w5.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-2569-w5.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-2569-w5.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-2569-w5.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-2569-w6.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-2569-w6.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-2569-w6.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-2569-w6.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-2569-w9.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-2569-w9.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-2569-w9.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-2569-w9.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-258-w2.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-258-w2.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-258-w2.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-258-w2.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-258-w5.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-258-w5.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-258-w5.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-258-w5.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-258-w8.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-258-w8.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-258-w8.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-258-w8.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-300.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-300.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-300.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-300.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-3589-w3.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-3589-w3.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-3589-w3.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-3589-w3.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-3589-w5.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-3589-w5.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-3589-w5.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-3589-w5.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-3589-w8.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-3589-w8.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-3589-w8.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-3589-w8.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-3589-w9.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-3589-w9.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-3589-w9.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-3589-w9.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-400.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-400.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-400.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-400.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-47-w4.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-47-w4.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-47-w4.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-47-w4.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-47-w7.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-47-w7.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-47-w7.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-47-w7.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-500.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-500.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-500.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-500.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-600.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-600.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-600.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-600.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-700.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-700.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-700.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-700.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-800.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-800.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-800.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-800.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-900.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-900.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-900.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-900.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w1.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w1.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w1.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w1.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w2.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w2.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w2.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w2.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w3.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w3.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w3.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w3.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w4.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w4.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w4.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w4.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w5.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w5.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w5.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w5.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w6.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w6.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w6.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w6.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w7.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w7.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w7.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w7.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w8.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w8.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w8.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w8.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w9.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w9.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights-full-w9.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights-full-w9.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights.ttf b/tests/wpt/tests/fonts/CSSTest/csstest-weights.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CSSTest/csstest-weights.ttf rename to tests/wpt/tests/fonts/CSSTest/csstest-weights.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CanvasTest.ttf b/tests/wpt/tests/fonts/CanvasTest.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CanvasTest.ttf rename to tests/wpt/tests/fonts/CanvasTest.ttf diff --git a/tests/wpt/web-platform-tests/fonts/CanvasTest.ttf.headers b/tests/wpt/tests/fonts/CanvasTest.ttf.headers similarity index 100% rename from tests/wpt/web-platform-tests/fonts/CanvasTest.ttf.headers rename to tests/wpt/tests/fonts/CanvasTest.ttf.headers diff --git a/tests/wpt/web-platform-tests/fonts/GentiumPlus-R.woff b/tests/wpt/tests/fonts/GentiumPlus-R.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/GentiumPlus-R.woff rename to tests/wpt/tests/fonts/GentiumPlus-R.woff diff --git a/tests/wpt/web-platform-tests/fonts/META.yml b/tests/wpt/tests/fonts/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/fonts/META.yml rename to tests/wpt/tests/fonts/META.yml diff --git a/tests/wpt/web-platform-tests/fonts/README.md b/tests/wpt/tests/fonts/README.md similarity index 100% rename from tests/wpt/web-platform-tests/fonts/README.md rename to tests/wpt/tests/fonts/README.md diff --git a/tests/wpt/web-platform-tests/fonts/Revalia.woff b/tests/wpt/tests/fonts/Revalia.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/Revalia.woff rename to tests/wpt/tests/fonts/Revalia.woff diff --git a/tests/wpt/web-platform-tests/fonts/Scheherazade-Regular.woff b/tests/wpt/tests/fonts/Scheherazade-Regular.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/Scheherazade-Regular.woff rename to tests/wpt/tests/fonts/Scheherazade-Regular.woff diff --git a/tests/wpt/web-platform-tests/fonts/adobe-fonts/CSSFWOrientationTest.otf b/tests/wpt/tests/fonts/adobe-fonts/CSSFWOrientationTest.otf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/adobe-fonts/CSSFWOrientationTest.otf rename to tests/wpt/tests/fonts/adobe-fonts/CSSFWOrientationTest.otf diff --git a/tests/wpt/web-platform-tests/fonts/adobe-fonts/CSSHWOrientationTest.otf b/tests/wpt/tests/fonts/adobe-fonts/CSSHWOrientationTest.otf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/adobe-fonts/CSSHWOrientationTest.otf rename to tests/wpt/tests/fonts/adobe-fonts/CSSHWOrientationTest.otf diff --git a/tests/wpt/web-platform-tests/fonts/adobe-fonts/LICENSE b/tests/wpt/tests/fonts/adobe-fonts/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/fonts/adobe-fonts/LICENSE rename to tests/wpt/tests/fonts/adobe-fonts/LICENSE diff --git a/tests/wpt/web-platform-tests/fonts/adobe-fonts/README.md b/tests/wpt/tests/fonts/adobe-fonts/README.md similarity index 100% rename from tests/wpt/web-platform-tests/fonts/adobe-fonts/README.md rename to tests/wpt/tests/fonts/adobe-fonts/README.md diff --git a/tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_Ahem!.TTF b/tests/wpt/tests/fonts/ahem-extra/AHEM_Ahem!.TTF similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_Ahem!.TTF rename to tests/wpt/tests/fonts/ahem-extra/AHEM_Ahem!.TTF diff --git a/tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_MissingItalicOblique.TTF b/tests/wpt/tests/fonts/ahem-extra/AHEM_MissingItalicOblique.TTF similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_MissingItalicOblique.TTF rename to tests/wpt/tests/fonts/ahem-extra/AHEM_MissingItalicOblique.TTF diff --git a/tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_MissingNormal.TTF b/tests/wpt/tests/fonts/ahem-extra/AHEM_MissingNormal.TTF similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_MissingNormal.TTF rename to tests/wpt/tests/fonts/ahem-extra/AHEM_MissingNormal.TTF diff --git a/tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_SmallCaps.TTF b/tests/wpt/tests/fonts/ahem-extra/AHEM_SmallCaps.TTF similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_SmallCaps.TTF rename to tests/wpt/tests/fonts/ahem-extra/AHEM_SmallCaps.TTF diff --git a/tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_WhiteSpace.TTF b/tests/wpt/tests/fonts/ahem-extra/AHEM_WhiteSpace.TTF similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_WhiteSpace.TTF rename to tests/wpt/tests/fonts/ahem-extra/AHEM_WhiteSpace.TTF diff --git a/tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_cursive.TTF b/tests/wpt/tests/fonts/ahem-extra/AHEM_cursive.TTF similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_cursive.TTF rename to tests/wpt/tests/fonts/ahem-extra/AHEM_cursive.TTF diff --git a/tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_default.TTF b/tests/wpt/tests/fonts/ahem-extra/AHEM_default.TTF similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_default.TTF rename to tests/wpt/tests/fonts/ahem-extra/AHEM_default.TTF diff --git a/tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_fantasy.TTF b/tests/wpt/tests/fonts/ahem-extra/AHEM_fantasy.TTF similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_fantasy.TTF rename to tests/wpt/tests/fonts/ahem-extra/AHEM_fantasy.TTF diff --git a/tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_inherit.TTF b/tests/wpt/tests/fonts/ahem-extra/AHEM_inherit.TTF similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_inherit.TTF rename to tests/wpt/tests/fonts/ahem-extra/AHEM_inherit.TTF diff --git a/tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_initial.TTF b/tests/wpt/tests/fonts/ahem-extra/AHEM_initial.TTF similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_initial.TTF rename to tests/wpt/tests/fonts/ahem-extra/AHEM_initial.TTF diff --git a/tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_monospace.TTF b/tests/wpt/tests/fonts/ahem-extra/AHEM_monospace.TTF similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_monospace.TTF rename to tests/wpt/tests/fonts/ahem-extra/AHEM_monospace.TTF diff --git a/tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_sans-serif.TTF b/tests/wpt/tests/fonts/ahem-extra/AHEM_sans-serif.TTF similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_sans-serif.TTF rename to tests/wpt/tests/fonts/ahem-extra/AHEM_sans-serif.TTF diff --git a/tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_serif.TTF b/tests/wpt/tests/fonts/ahem-extra/AHEM_serif.TTF similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem-extra/AHEM_serif.TTF rename to tests/wpt/tests/fonts/ahem-extra/AHEM_serif.TTF diff --git a/tests/wpt/web-platform-tests/fonts/ahem.css b/tests/wpt/tests/fonts/ahem.css similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem.css rename to tests/wpt/tests/fonts/ahem.css diff --git a/tests/wpt/web-platform-tests/fonts/ahem.css.headers b/tests/wpt/tests/fonts/ahem.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/fonts/ahem.css.headers rename to tests/wpt/tests/fonts/ahem.css.headers diff --git a/tests/wpt/web-platform-tests/fonts/fail.woff b/tests/wpt/tests/fonts/fail.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/fail.woff rename to tests/wpt/tests/fonts/fail.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/axisheight5000-verticalarrow14000.woff b/tests/wpt/tests/fonts/math/axisheight5000-verticalarrow14000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/axisheight5000-verticalarrow14000.woff rename to tests/wpt/tests/fonts/math/axisheight5000-verticalarrow14000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/fraction-axisheight7000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/fraction-axisheight7000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/fraction-axisheight7000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/fraction-axisheight7000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/fraction-denominatordisplaystylegapmin5000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/fraction-denominatordisplaystylegapmin5000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/fraction-denominatordisplaystylegapmin5000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/fraction-denominatordisplaystylegapmin5000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/fraction-denominatordisplaystyleshiftdown6000-axisheight1000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/fraction-denominatordisplaystyleshiftdown6000-axisheight1000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/fraction-denominatordisplaystyleshiftdown6000-axisheight1000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/fraction-denominatordisplaystyleshiftdown6000-axisheight1000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/fraction-denominatorgapmin4000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/fraction-denominatorgapmin4000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/fraction-denominatorgapmin4000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/fraction-denominatorgapmin4000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/fraction-denominatorshiftdown3000-axisheight1000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/fraction-denominatorshiftdown3000-axisheight1000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/fraction-denominatorshiftdown3000-axisheight1000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/fraction-denominatorshiftdown3000-axisheight1000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/fraction-numeratordisplaystylegapmin8000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/fraction-numeratordisplaystylegapmin8000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/fraction-numeratordisplaystylegapmin8000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/fraction-numeratordisplaystylegapmin8000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/fraction-numeratordisplaystyleshiftup2000-axisheight1000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/fraction-numeratordisplaystyleshiftup2000-axisheight1000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/fraction-numeratordisplaystyleshiftup2000-axisheight1000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/fraction-numeratordisplaystyleshiftup2000-axisheight1000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/fraction-numeratorgapmin9000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/fraction-numeratorgapmin9000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/fraction-numeratorgapmin9000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/fraction-numeratorgapmin9000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/fraction-numeratorshiftup11000-axisheight1000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/fraction-numeratorshiftup11000-axisheight1000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/fraction-numeratorshiftup11000-axisheight1000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/fraction-numeratorshiftup11000-axisheight1000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/fraction-rulethickness10000.woff b/tests/wpt/tests/fonts/math/fraction-rulethickness10000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/fraction-rulethickness10000.woff rename to tests/wpt/tests/fonts/math/fraction-rulethickness10000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/largeop-displayoperatorminheight2000-2AFF-italiccorrection3000.woff b/tests/wpt/tests/fonts/math/largeop-displayoperatorminheight2000-2AFF-italiccorrection3000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/largeop-displayoperatorminheight2000-2AFF-italiccorrection3000.woff rename to tests/wpt/tests/fonts/math/largeop-displayoperatorminheight2000-2AFF-italiccorrection3000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/largeop-displayoperatorminheight5000.woff b/tests/wpt/tests/fonts/math/largeop-displayoperatorminheight5000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/largeop-displayoperatorminheight5000.woff rename to tests/wpt/tests/fonts/math/largeop-displayoperatorminheight5000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/largeop-displayoperatorminheight7000-2AFF-italiccorrection5000.woff b/tests/wpt/tests/fonts/math/largeop-displayoperatorminheight7000-2AFF-italiccorrection5000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/largeop-displayoperatorminheight7000-2AFF-italiccorrection5000.woff rename to tests/wpt/tests/fonts/math/largeop-displayoperatorminheight7000-2AFF-italiccorrection5000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/limits-lowerlimitbaselinedropmin3000.woff b/tests/wpt/tests/fonts/math/limits-lowerlimitbaselinedropmin3000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/limits-lowerlimitbaselinedropmin3000.woff rename to tests/wpt/tests/fonts/math/limits-lowerlimitbaselinedropmin3000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/limits-lowerlimitgapmin11000.woff b/tests/wpt/tests/fonts/math/limits-lowerlimitgapmin11000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/limits-lowerlimitgapmin11000.woff rename to tests/wpt/tests/fonts/math/limits-lowerlimitgapmin11000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/limits-upperlimitbaselinerisemin5000.woff b/tests/wpt/tests/fonts/math/limits-upperlimitbaselinerisemin5000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/limits-upperlimitbaselinerisemin5000.woff rename to tests/wpt/tests/fonts/math/limits-upperlimitbaselinerisemin5000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/limits-upperlimitgapmin7000.woff b/tests/wpt/tests/fonts/math/limits-upperlimitgapmin7000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/limits-upperlimitgapmin7000.woff rename to tests/wpt/tests/fonts/math/limits-upperlimitgapmin7000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/lineheight5000-typolineheight2300.woff b/tests/wpt/tests/fonts/math/lineheight5000-typolineheight2300.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/lineheight5000-typolineheight2300.woff rename to tests/wpt/tests/fonts/math/lineheight5000-typolineheight2300.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/math-text.woff b/tests/wpt/tests/fonts/math/math-text.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/math-text.woff rename to tests/wpt/tests/fonts/math/math-text.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-bold-fraktur.woff b/tests/wpt/tests/fonts/math/mathvariant-bold-fraktur.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-bold-fraktur.woff rename to tests/wpt/tests/fonts/math/mathvariant-bold-fraktur.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-bold-italic.woff b/tests/wpt/tests/fonts/math/mathvariant-bold-italic.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-bold-italic.woff rename to tests/wpt/tests/fonts/math/mathvariant-bold-italic.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-bold-sans-serif.woff b/tests/wpt/tests/fonts/math/mathvariant-bold-sans-serif.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-bold-sans-serif.woff rename to tests/wpt/tests/fonts/math/mathvariant-bold-sans-serif.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-bold-script.woff b/tests/wpt/tests/fonts/math/mathvariant-bold-script.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-bold-script.woff rename to tests/wpt/tests/fonts/math/mathvariant-bold-script.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-bold.woff b/tests/wpt/tests/fonts/math/mathvariant-bold.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-bold.woff rename to tests/wpt/tests/fonts/math/mathvariant-bold.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-double-struck.woff b/tests/wpt/tests/fonts/math/mathvariant-double-struck.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-double-struck.woff rename to tests/wpt/tests/fonts/math/mathvariant-double-struck.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-fraktur.woff b/tests/wpt/tests/fonts/math/mathvariant-fraktur.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-fraktur.woff rename to tests/wpt/tests/fonts/math/mathvariant-fraktur.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-initial.woff b/tests/wpt/tests/fonts/math/mathvariant-initial.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-initial.woff rename to tests/wpt/tests/fonts/math/mathvariant-initial.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-italic.woff b/tests/wpt/tests/fonts/math/mathvariant-italic.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-italic.woff rename to tests/wpt/tests/fonts/math/mathvariant-italic.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-looped.woff b/tests/wpt/tests/fonts/math/mathvariant-looped.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-looped.woff rename to tests/wpt/tests/fonts/math/mathvariant-looped.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-monospace.woff b/tests/wpt/tests/fonts/math/mathvariant-monospace.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-monospace.woff rename to tests/wpt/tests/fonts/math/mathvariant-monospace.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-sans-serif-bold-italic.woff b/tests/wpt/tests/fonts/math/mathvariant-sans-serif-bold-italic.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-sans-serif-bold-italic.woff rename to tests/wpt/tests/fonts/math/mathvariant-sans-serif-bold-italic.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-sans-serif-italic.woff b/tests/wpt/tests/fonts/math/mathvariant-sans-serif-italic.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-sans-serif-italic.woff rename to tests/wpt/tests/fonts/math/mathvariant-sans-serif-italic.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-sans-serif.woff b/tests/wpt/tests/fonts/math/mathvariant-sans-serif.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-sans-serif.woff rename to tests/wpt/tests/fonts/math/mathvariant-sans-serif.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-script.woff b/tests/wpt/tests/fonts/math/mathvariant-script.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-script.woff rename to tests/wpt/tests/fonts/math/mathvariant-script.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-stretched.woff b/tests/wpt/tests/fonts/math/mathvariant-stretched.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-stretched.woff rename to tests/wpt/tests/fonts/math/mathvariant-stretched.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/mathvariant-tailed.woff b/tests/wpt/tests/fonts/math/mathvariant-tailed.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/mathvariant-tailed.woff rename to tests/wpt/tests/fonts/math/mathvariant-tailed.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/operators.woff b/tests/wpt/tests/fonts/math/operators.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/operators.woff rename to tests/wpt/tests/fonts/math/operators.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/radical-degreebottomraisepercent25-rulethickness1000.woff b/tests/wpt/tests/fonts/math/radical-degreebottomraisepercent25-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/radical-degreebottomraisepercent25-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/radical-degreebottomraisepercent25-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/radical-displaystyleverticalgap7000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/radical-displaystyleverticalgap7000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/radical-displaystyleverticalgap7000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/radical-displaystyleverticalgap7000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/radical-extraascender3000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/radical-extraascender3000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/radical-extraascender3000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/radical-extraascender3000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/radical-kernafterdegreeminus5000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/radical-kernafterdegreeminus5000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/radical-kernafterdegreeminus5000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/radical-kernafterdegreeminus5000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/radical-kernbeforedegree4000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/radical-kernbeforedegree4000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/radical-kernbeforedegree4000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/radical-kernbeforedegree4000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/radical-negativekernbeforedegree1000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/radical-negativekernbeforedegree1000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/radical-negativekernbeforedegree1000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/radical-negativekernbeforedegree1000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/radical-rulethickness8000.woff b/tests/wpt/tests/fonts/math/radical-rulethickness8000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/radical-rulethickness8000.woff rename to tests/wpt/tests/fonts/math/radical-rulethickness8000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/radical-verticalgap6000-rulethickness1000.woff b/tests/wpt/tests/fonts/math/radical-verticalgap6000-rulethickness1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/radical-verticalgap6000-rulethickness1000.woff rename to tests/wpt/tests/fonts/math/radical-verticalgap6000-rulethickness1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/scriptpercentscaledown0-scriptscriptpercentscaledown40.woff b/tests/wpt/tests/fonts/math/scriptpercentscaledown0-scriptscriptpercentscaledown40.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/scriptpercentscaledown0-scriptscriptpercentscaledown40.woff rename to tests/wpt/tests/fonts/math/scriptpercentscaledown0-scriptscriptpercentscaledown40.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/scriptpercentscaledown80-scriptscriptpercentscaledown0.woff b/tests/wpt/tests/fonts/math/scriptpercentscaledown80-scriptscriptpercentscaledown0.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/scriptpercentscaledown80-scriptscriptpercentscaledown0.woff rename to tests/wpt/tests/fonts/math/scriptpercentscaledown80-scriptscriptpercentscaledown0.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/scriptpercentscaledown80-scriptscriptpercentscaledown40.woff b/tests/wpt/tests/fonts/math/scriptpercentscaledown80-scriptscriptpercentscaledown40.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/scriptpercentscaledown80-scriptscriptpercentscaledown40.woff rename to tests/wpt/tests/fonts/math/scriptpercentscaledown80-scriptscriptpercentscaledown40.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/scripts-spaceafterscript3000.woff b/tests/wpt/tests/fonts/math/scripts-spaceafterscript3000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/scripts-spaceafterscript3000.woff rename to tests/wpt/tests/fonts/math/scripts-spaceafterscript3000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/scripts-subscriptbaselinedropmin9000.woff b/tests/wpt/tests/fonts/math/scripts-subscriptbaselinedropmin9000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/scripts-subscriptbaselinedropmin9000.woff rename to tests/wpt/tests/fonts/math/scripts-subscriptbaselinedropmin9000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/scripts-subscriptshiftdown6000.woff b/tests/wpt/tests/fonts/math/scripts-subscriptshiftdown6000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/scripts-subscriptshiftdown6000.woff rename to tests/wpt/tests/fonts/math/scripts-subscriptshiftdown6000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/scripts-subscripttopmax4000.woff b/tests/wpt/tests/fonts/math/scripts-subscripttopmax4000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/scripts-subscripttopmax4000.woff rename to tests/wpt/tests/fonts/math/scripts-subscripttopmax4000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/scripts-subsuperscriptgapmin11000-superscriptbottommaxwithsubscript3000.woff b/tests/wpt/tests/fonts/math/scripts-subsuperscriptgapmin11000-superscriptbottommaxwithsubscript3000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/scripts-subsuperscriptgapmin11000-superscriptbottommaxwithsubscript3000.woff rename to tests/wpt/tests/fonts/math/scripts-subsuperscriptgapmin11000-superscriptbottommaxwithsubscript3000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/scripts-subsuperscriptgapmin11000.woff b/tests/wpt/tests/fonts/math/scripts-subsuperscriptgapmin11000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/scripts-subsuperscriptgapmin11000.woff rename to tests/wpt/tests/fonts/math/scripts-subsuperscriptgapmin11000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/scripts-superscriptbaselinedropmax10000.woff b/tests/wpt/tests/fonts/math/scripts-superscriptbaselinedropmax10000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/scripts-superscriptbaselinedropmax10000.woff rename to tests/wpt/tests/fonts/math/scripts-superscriptbaselinedropmax10000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/scripts-superscriptbottommin8000.woff b/tests/wpt/tests/fonts/math/scripts-superscriptbottommin8000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/scripts-superscriptbottommin8000.woff rename to tests/wpt/tests/fonts/math/scripts-superscriptbottommin8000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/scripts-superscriptshiftup7000.woff b/tests/wpt/tests/fonts/math/scripts-superscriptshiftup7000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/scripts-superscriptshiftup7000.woff rename to tests/wpt/tests/fonts/math/scripts-superscriptshiftup7000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/scripts-superscriptshiftupcramped5000.woff b/tests/wpt/tests/fonts/math/scripts-superscriptshiftupcramped5000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/scripts-superscriptshiftupcramped5000.woff rename to tests/wpt/tests/fonts/math/scripts-superscriptshiftupcramped5000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/stack-bottomdisplaystyleshiftdown5000-axisheight1000.woff b/tests/wpt/tests/fonts/math/stack-bottomdisplaystyleshiftdown5000-axisheight1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/stack-bottomdisplaystyleshiftdown5000-axisheight1000.woff rename to tests/wpt/tests/fonts/math/stack-bottomdisplaystyleshiftdown5000-axisheight1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/stack-bottomshiftdown6000-axisheight1000.woff b/tests/wpt/tests/fonts/math/stack-bottomshiftdown6000-axisheight1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/stack-bottomshiftdown6000-axisheight1000.woff rename to tests/wpt/tests/fonts/math/stack-bottomshiftdown6000-axisheight1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/stack-displaystylegapmin4000.woff b/tests/wpt/tests/fonts/math/stack-displaystylegapmin4000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/stack-displaystylegapmin4000.woff rename to tests/wpt/tests/fonts/math/stack-displaystylegapmin4000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/stack-gapmin8000.woff b/tests/wpt/tests/fonts/math/stack-gapmin8000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/stack-gapmin8000.woff rename to tests/wpt/tests/fonts/math/stack-gapmin8000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/stack-topdisplaystyleshiftup3000-axisheight1000.woff b/tests/wpt/tests/fonts/math/stack-topdisplaystyleshiftup3000-axisheight1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/stack-topdisplaystyleshiftup3000-axisheight1000.woff rename to tests/wpt/tests/fonts/math/stack-topdisplaystyleshiftup3000-axisheight1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/stack-topshiftup9000-axisheight1000.woff b/tests/wpt/tests/fonts/math/stack-topshiftup9000-axisheight1000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/stack-topshiftup9000-axisheight1000.woff rename to tests/wpt/tests/fonts/math/stack-topshiftup9000-axisheight1000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/stretchstack-bottomshiftdown3000.woff b/tests/wpt/tests/fonts/math/stretchstack-bottomshiftdown3000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/stretchstack-bottomshiftdown3000.woff rename to tests/wpt/tests/fonts/math/stretchstack-bottomshiftdown3000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/stretchstack-gapabovemin7000.woff b/tests/wpt/tests/fonts/math/stretchstack-gapabovemin7000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/stretchstack-gapabovemin7000.woff rename to tests/wpt/tests/fonts/math/stretchstack-gapabovemin7000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/stretchstack-gapbelowmin11000.woff b/tests/wpt/tests/fonts/math/stretchstack-gapbelowmin11000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/stretchstack-gapbelowmin11000.woff rename to tests/wpt/tests/fonts/math/stretchstack-gapbelowmin11000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/stretchstack-topshiftup5000.woff b/tests/wpt/tests/fonts/math/stretchstack-topshiftup5000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/stretchstack-topshiftup5000.woff rename to tests/wpt/tests/fonts/math/stretchstack-topshiftup5000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/stretchy-centered-on-baseline.woff b/tests/wpt/tests/fonts/math/stretchy-centered-on-baseline.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/stretchy-centered-on-baseline.woff rename to tests/wpt/tests/fonts/math/stretchy-centered-on-baseline.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/stretchy.woff b/tests/wpt/tests/fonts/math/stretchy.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/stretchy.woff rename to tests/wpt/tests/fonts/math/stretchy.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/underover-accentbaseheight4000-overbarextraascender3000.woff b/tests/wpt/tests/fonts/math/underover-accentbaseheight4000-overbarextraascender3000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/underover-accentbaseheight4000-overbarextraascender3000.woff rename to tests/wpt/tests/fonts/math/underover-accentbaseheight4000-overbarextraascender3000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/underover-accentbaseheight4000-overbarverticalgap11000.woff b/tests/wpt/tests/fonts/math/underover-accentbaseheight4000-overbarverticalgap11000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/underover-accentbaseheight4000-overbarverticalgap11000.woff rename to tests/wpt/tests/fonts/math/underover-accentbaseheight4000-overbarverticalgap11000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/underover-accentbaseheight4000-underbarextradescender5000.woff b/tests/wpt/tests/fonts/math/underover-accentbaseheight4000-underbarextradescender5000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/underover-accentbaseheight4000-underbarextradescender5000.woff rename to tests/wpt/tests/fonts/math/underover-accentbaseheight4000-underbarextradescender5000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/underover-accentbaseheight4000-underbarverticalgap7000.woff b/tests/wpt/tests/fonts/math/underover-accentbaseheight4000-underbarverticalgap7000.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/underover-accentbaseheight4000-underbarverticalgap7000.woff rename to tests/wpt/tests/fonts/math/underover-accentbaseheight4000-underbarverticalgap7000.woff diff --git a/tests/wpt/web-platform-tests/fonts/math/xheight500.woff b/tests/wpt/tests/fonts/math/xheight500.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/math/xheight500.woff rename to tests/wpt/tests/fonts/math/xheight500.woff diff --git a/tests/wpt/web-platform-tests/fonts/mplus-1p-regular.woff b/tests/wpt/tests/fonts/mplus-1p-regular.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/mplus-1p-regular.woff rename to tests/wpt/tests/fonts/mplus-1p-regular.woff diff --git a/tests/wpt/web-platform-tests/fonts/noto/NotoNaskhArabic-regular.woff2 b/tests/wpt/tests/fonts/noto/NotoNaskhArabic-regular.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/fonts/noto/NotoNaskhArabic-regular.woff2 rename to tests/wpt/tests/fonts/noto/NotoNaskhArabic-regular.woff2 diff --git a/tests/wpt/web-platform-tests/fonts/noto/NotoSansAdlam-hinted/LICENSE_OFL.txt b/tests/wpt/tests/fonts/noto/NotoSansAdlam-hinted/LICENSE_OFL.txt similarity index 100% rename from tests/wpt/web-platform-tests/fonts/noto/NotoSansAdlam-hinted/LICENSE_OFL.txt rename to tests/wpt/tests/fonts/noto/NotoSansAdlam-hinted/LICENSE_OFL.txt diff --git a/tests/wpt/web-platform-tests/fonts/noto/NotoSansAdlam-hinted/NotoSansAdlam-Regular.ttf b/tests/wpt/tests/fonts/noto/NotoSansAdlam-hinted/NotoSansAdlam-Regular.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/noto/NotoSansAdlam-hinted/NotoSansAdlam-Regular.ttf rename to tests/wpt/tests/fonts/noto/NotoSansAdlam-hinted/NotoSansAdlam-Regular.ttf diff --git a/tests/wpt/web-platform-tests/fonts/noto/NotoSansAdlam-hinted/README b/tests/wpt/tests/fonts/noto/NotoSansAdlam-hinted/README similarity index 100% rename from tests/wpt/web-platform-tests/fonts/noto/NotoSansAdlam-hinted/README rename to tests/wpt/tests/fonts/noto/NotoSansAdlam-hinted/README diff --git a/tests/wpt/web-platform-tests/fonts/noto/NotoSansCypriot-hinted/LICENSE_OFL.txt b/tests/wpt/tests/fonts/noto/NotoSansCypriot-hinted/LICENSE_OFL.txt similarity index 100% rename from tests/wpt/web-platform-tests/fonts/noto/NotoSansCypriot-hinted/LICENSE_OFL.txt rename to tests/wpt/tests/fonts/noto/NotoSansCypriot-hinted/LICENSE_OFL.txt diff --git a/tests/wpt/web-platform-tests/fonts/noto/NotoSansCypriot-hinted/NotoSansCypriot-Regular.ttf b/tests/wpt/tests/fonts/noto/NotoSansCypriot-hinted/NotoSansCypriot-Regular.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/noto/NotoSansCypriot-hinted/NotoSansCypriot-Regular.ttf rename to tests/wpt/tests/fonts/noto/NotoSansCypriot-hinted/NotoSansCypriot-Regular.ttf diff --git a/tests/wpt/web-platform-tests/fonts/noto/NotoSansCypriot-hinted/README b/tests/wpt/tests/fonts/noto/NotoSansCypriot-hinted/README similarity index 100% rename from tests/wpt/web-platform-tests/fonts/noto/NotoSansCypriot-hinted/README rename to tests/wpt/tests/fonts/noto/NotoSansCypriot-hinted/README diff --git a/tests/wpt/web-platform-tests/fonts/noto/NotoSansDeseret-Regular.ttf b/tests/wpt/tests/fonts/noto/NotoSansDeseret-Regular.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/noto/NotoSansDeseret-Regular.ttf rename to tests/wpt/tests/fonts/noto/NotoSansDeseret-Regular.ttf diff --git a/tests/wpt/web-platform-tests/fonts/noto/NotoSansDevanagari-Regular.ttf b/tests/wpt/tests/fonts/noto/NotoSansDevanagari-Regular.ttf similarity index 100% rename from tests/wpt/web-platform-tests/fonts/noto/NotoSansDevanagari-Regular.ttf rename to tests/wpt/tests/fonts/noto/NotoSansDevanagari-Regular.ttf diff --git a/tests/wpt/web-platform-tests/fonts/noto/NotoSansMongolian-regular.woff2 b/tests/wpt/tests/fonts/noto/NotoSansMongolian-regular.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/fonts/noto/NotoSansMongolian-regular.woff2 rename to tests/wpt/tests/fonts/noto/NotoSansMongolian-regular.woff2 diff --git a/tests/wpt/web-platform-tests/fonts/noto/NotoSansNko-regular-webfont.woff2 b/tests/wpt/tests/fonts/noto/NotoSansNko-regular-webfont.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/fonts/noto/NotoSansNko-regular-webfont.woff2 rename to tests/wpt/tests/fonts/noto/NotoSansNko-regular-webfont.woff2 diff --git a/tests/wpt/web-platform-tests/fonts/noto/noto-sans-v8-latin-regular.woff b/tests/wpt/tests/fonts/noto/noto-sans-v8-latin-regular.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/noto/noto-sans-v8-latin-regular.woff rename to tests/wpt/tests/fonts/noto/noto-sans-v8-latin-regular.woff diff --git a/tests/wpt/web-platform-tests/fonts/pass.woff b/tests/wpt/tests/fonts/pass.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/pass.woff rename to tests/wpt/tests/fonts/pass.woff diff --git a/tests/wpt/web-platform-tests/fonts/sileot-webfont.woff b/tests/wpt/tests/fonts/sileot-webfont.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/sileot-webfont.woff rename to tests/wpt/tests/fonts/sileot-webfont.woff diff --git a/tests/wpt/web-platform-tests/fonts/tcu-font.woff b/tests/wpt/tests/fonts/tcu-font.woff similarity index 100% rename from tests/wpt/web-platform-tests/fonts/tcu-font.woff rename to tests/wpt/tests/fonts/tcu-font.woff diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/README.txt b/tests/wpt/tests/forced-colors-mode/README.txt similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/README.txt rename to tests/wpt/tests/forced-colors-mode/README.txt diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01-ref.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01-ref.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02-ref.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02-ref.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03-ref.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03-ref.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04-ref.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04-ref.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05-ref.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05-ref.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06-ref.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06-ref.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08-ref.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08-ref.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09-ref.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09-ref.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10-ref.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10-ref.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11-ref.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11-ref.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11.html b/tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11.html rename to tests/wpt/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-01-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-01-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-01-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-01.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-01.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-01.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-01.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-02-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-02-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-02-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-02.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-02.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-02.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-02.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-03.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-03.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-03.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-03.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-05-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-05-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-05-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-05-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-05.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-05.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-05.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-05.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-06-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-06-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-06-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-06-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-06.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-06.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-06.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-06.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-07-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-07-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-07-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-07-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-07.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-07.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-07.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-07.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-08-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-08-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-08.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-08.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-09.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-09.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-09.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-09.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-10.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-10.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-10.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-10.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-11.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-11.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-11.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-11.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-14-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-14-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-14-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-14-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-14.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-14.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-14.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-14.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-17-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-17-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-17.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-17.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-18-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-18-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-18.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-18.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-19-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-19-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-19-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-19-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-19.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-19.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-19.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-19.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-20.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-20.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-20.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-20.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-21.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-21.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-21.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-21.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-23-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-23-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-23-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-23-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-23.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-23.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-23.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-23.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-25-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-25-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-25-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-25-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-25.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-25.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-25.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-25.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-26-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-26-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-26.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-26.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-27.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-27.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-27.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-27.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-28-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-28-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-28-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-28-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-28.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-28.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-28.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-28.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-29-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-29-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-29-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-29-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-29.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-29.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-29.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-29.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-30-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-30-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-30-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-30-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-30.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-30.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-30.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-30.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-31-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-31-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-31-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-31-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-31.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-31.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-31.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-31.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-33-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-33-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-33-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-33-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-33.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-33.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-33.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-33.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-34-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-34-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-34-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-34-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-34.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-34.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-34.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-34.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-35-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-35-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-35-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-35-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-35.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-35.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-35.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-35.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-36-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-36-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-36-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-36-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-36.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-36.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-36.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-36.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-37-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-37-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-37-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-37-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-37.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-37.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-37.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-37.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-38-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-38-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-38-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-38-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-38.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-38.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-38.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-38.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-39-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-39-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-39-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-39-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-39.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-39.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-39.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-39.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-40.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-40.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-40.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-40.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-41.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-41.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-41.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-41.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-42-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-42-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-42-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-42-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-42.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-42.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-42.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-42.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-43-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-43-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-43-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-43-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-43.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-43.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-43.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-43.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-44-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-44-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-44-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-44-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-44.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-44.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-44.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-44.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-45-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-45-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-45-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-45-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-45.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-45.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-45.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-45.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-46-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-46-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-46-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-46-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-46.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-46.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-46.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-46.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-47-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-47-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-47-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-47-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-47.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-47.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-47.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-47.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-48-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-48-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-48-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-48-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-48.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-48.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-48.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-48.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-49-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-49-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-49-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-49-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-49.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-49.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-49.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-49.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-50.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-50.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-50.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-50.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-51.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-51.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-51.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-51.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-52-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-52-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-52-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-52-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-52.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-52.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-52.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-52.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-53-ref.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-53-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-53-ref.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-53-ref.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-53.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-53.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-53.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-53.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-54.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-54.html similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-54.html rename to tests/wpt/tests/forced-colors-mode/forced-colors-mode-54.html diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/resources/float-image.jpg b/tests/wpt/tests/forced-colors-mode/resources/float-image.jpg similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/resources/float-image.jpg rename to tests/wpt/tests/forced-colors-mode/resources/float-image.jpg diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/resources/test-image.jpg b/tests/wpt/tests/forced-colors-mode/resources/test-image.jpg similarity index 100% rename from tests/wpt/web-platform-tests/forced-colors-mode/resources/test-image.jpg rename to tests/wpt/tests/forced-colors-mode/resources/test-image.jpg diff --git a/tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-IndexedDB.https.any.js b/tests/wpt/tests/fs/FileSystemBaseHandle-IndexedDB.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-IndexedDB.https.any.js rename to tests/wpt/tests/fs/FileSystemBaseHandle-IndexedDB.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-buckets.https.any.js b/tests/wpt/tests/fs/FileSystemBaseHandle-buckets.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-buckets.https.any.js rename to tests/wpt/tests/fs/FileSystemBaseHandle-buckets.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-getUniqueId.https.any.js b/tests/wpt/tests/fs/FileSystemBaseHandle-getUniqueId.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-getUniqueId.https.any.js rename to tests/wpt/tests/fs/FileSystemBaseHandle-getUniqueId.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-isSameEntry.https.any.js b/tests/wpt/tests/fs/FileSystemBaseHandle-isSameEntry.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-isSameEntry.https.any.js rename to tests/wpt/tests/fs/FileSystemBaseHandle-isSameEntry.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.js b/tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.js rename to tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-Error.https.window.js b/tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-Error.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-Error.https.window.js rename to tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-Error.https.window.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.js b/tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.js rename to tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.js b/tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.js rename to tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.js b/tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.js rename to tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-frames.https.window.js b/tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-frames.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-frames.https.window.js rename to tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-frames.https.window.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-windows.https.window.js b/tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-windows.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-windows.https.window.js rename to tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-windows.https.window.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-workers.https.window.js b/tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-workers.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-postMessage-workers.https.window.js rename to tests/wpt/tests/fs/FileSystemBaseHandle-postMessage-workers.https.window.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-remove.https.any.js b/tests/wpt/tests/fs/FileSystemBaseHandle-remove.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemBaseHandle-remove.https.any.js rename to tests/wpt/tests/fs/FileSystemBaseHandle-remove.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemDirectoryHandle-getDirectoryHandle.https.any.js b/tests/wpt/tests/fs/FileSystemDirectoryHandle-getDirectoryHandle.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemDirectoryHandle-getDirectoryHandle.https.any.js rename to tests/wpt/tests/fs/FileSystemDirectoryHandle-getDirectoryHandle.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemDirectoryHandle-getFileHandle.https.any.js b/tests/wpt/tests/fs/FileSystemDirectoryHandle-getFileHandle.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemDirectoryHandle-getFileHandle.https.any.js rename to tests/wpt/tests/fs/FileSystemDirectoryHandle-getFileHandle.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemDirectoryHandle-iteration.https.any.js b/tests/wpt/tests/fs/FileSystemDirectoryHandle-iteration.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemDirectoryHandle-iteration.https.any.js rename to tests/wpt/tests/fs/FileSystemDirectoryHandle-iteration.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemDirectoryHandle-removeEntry.https.any.js b/tests/wpt/tests/fs/FileSystemDirectoryHandle-removeEntry.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemDirectoryHandle-removeEntry.https.any.js rename to tests/wpt/tests/fs/FileSystemDirectoryHandle-removeEntry.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemDirectoryHandle-resolve.https.any.js b/tests/wpt/tests/fs/FileSystemDirectoryHandle-resolve.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemDirectoryHandle-resolve.https.any.js rename to tests/wpt/tests/fs/FileSystemDirectoryHandle-resolve.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemFileHandle-create-sync-access-handle.https.tentative.window.js b/tests/wpt/tests/fs/FileSystemFileHandle-create-sync-access-handle.https.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemFileHandle-create-sync-access-handle.https.tentative.window.js rename to tests/wpt/tests/fs/FileSystemFileHandle-create-sync-access-handle.https.tentative.window.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemFileHandle-getFile.https.any.js b/tests/wpt/tests/fs/FileSystemFileHandle-getFile.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemFileHandle-getFile.https.any.js rename to tests/wpt/tests/fs/FileSystemFileHandle-getFile.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemFileHandle-move.https.any.js b/tests/wpt/tests/fs/FileSystemFileHandle-move.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemFileHandle-move.https.any.js rename to tests/wpt/tests/fs/FileSystemFileHandle-move.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemFileHandle-sync-access-handle-writable-lock.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-writable-lock.https.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemFileHandle-sync-access-handle-writable-lock.https.tentative.worker.js rename to tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-writable-lock.https.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemSyncAccessHandle-close.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemSyncAccessHandle-close.https.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemSyncAccessHandle-close.https.tentative.worker.js rename to tests/wpt/tests/fs/FileSystemSyncAccessHandle-close.https.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemSyncAccessHandle-flush.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemSyncAccessHandle-flush.https.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemSyncAccessHandle-flush.https.tentative.worker.js rename to tests/wpt/tests/fs/FileSystemSyncAccessHandle-flush.https.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemSyncAccessHandle-getSize.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemSyncAccessHandle-getSize.https.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemSyncAccessHandle-getSize.https.tentative.worker.js rename to tests/wpt/tests/fs/FileSystemSyncAccessHandle-getSize.https.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemSyncAccessHandle-read-write.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemSyncAccessHandle-read-write.https.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemSyncAccessHandle-read-write.https.tentative.worker.js rename to tests/wpt/tests/fs/FileSystemSyncAccessHandle-read-write.https.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemSyncAccessHandle-truncate.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemSyncAccessHandle-truncate.https.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemSyncAccessHandle-truncate.https.tentative.worker.js rename to tests/wpt/tests/fs/FileSystemSyncAccessHandle-truncate.https.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemWritableFileStream-piped.https.any.js b/tests/wpt/tests/fs/FileSystemWritableFileStream-piped.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemWritableFileStream-piped.https.any.js rename to tests/wpt/tests/fs/FileSystemWritableFileStream-piped.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemWritableFileStream-write.https.any.js b/tests/wpt/tests/fs/FileSystemWritableFileStream-write.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemWritableFileStream-write.https.any.js rename to tests/wpt/tests/fs/FileSystemWritableFileStream-write.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/FileSystemWritableFileStream.https.any.js b/tests/wpt/tests/fs/FileSystemWritableFileStream.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/FileSystemWritableFileStream.https.any.js rename to tests/wpt/tests/fs/FileSystemWritableFileStream.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/META.yml b/tests/wpt/tests/fs/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/fs/META.yml rename to tests/wpt/tests/fs/META.yml diff --git a/tests/wpt/web-platform-tests/fs/README.md b/tests/wpt/tests/fs/README.md similarity index 100% rename from tests/wpt/web-platform-tests/fs/README.md rename to tests/wpt/tests/fs/README.md diff --git a/tests/wpt/web-platform-tests/fs/idlharness.https.any.js b/tests/wpt/tests/fs/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/idlharness.https.any.js rename to tests/wpt/tests/fs/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/opaque-origin.https.window.js b/tests/wpt/tests/fs/opaque-origin.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/opaque-origin.https.window.js rename to tests/wpt/tests/fs/opaque-origin.https.window.js diff --git a/tests/wpt/web-platform-tests/fs/resources/message-target-dedicated-worker.js b/tests/wpt/tests/fs/resources/message-target-dedicated-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/resources/message-target-dedicated-worker.js rename to tests/wpt/tests/fs/resources/message-target-dedicated-worker.js diff --git a/tests/wpt/web-platform-tests/fs/resources/message-target-service-worker.js b/tests/wpt/tests/fs/resources/message-target-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/resources/message-target-service-worker.js rename to tests/wpt/tests/fs/resources/message-target-service-worker.js diff --git a/tests/wpt/web-platform-tests/fs/resources/message-target-shared-worker.js b/tests/wpt/tests/fs/resources/message-target-shared-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/resources/message-target-shared-worker.js rename to tests/wpt/tests/fs/resources/message-target-shared-worker.js diff --git a/tests/wpt/web-platform-tests/fs/resources/message-target.html b/tests/wpt/tests/fs/resources/message-target.html similarity index 100% rename from tests/wpt/web-platform-tests/fs/resources/message-target.html rename to tests/wpt/tests/fs/resources/message-target.html diff --git a/tests/wpt/web-platform-tests/fs/resources/message-target.js b/tests/wpt/tests/fs/resources/message-target.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/resources/message-target.js rename to tests/wpt/tests/fs/resources/message-target.js diff --git a/tests/wpt/web-platform-tests/fs/resources/messaging-blob-helpers.js b/tests/wpt/tests/fs/resources/messaging-blob-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/resources/messaging-blob-helpers.js rename to tests/wpt/tests/fs/resources/messaging-blob-helpers.js diff --git a/tests/wpt/web-platform-tests/fs/resources/messaging-helpers.js b/tests/wpt/tests/fs/resources/messaging-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/resources/messaging-helpers.js rename to tests/wpt/tests/fs/resources/messaging-helpers.js diff --git a/tests/wpt/web-platform-tests/fs/resources/messaging-serialize-helpers.js b/tests/wpt/tests/fs/resources/messaging-serialize-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/resources/messaging-serialize-helpers.js rename to tests/wpt/tests/fs/resources/messaging-serialize-helpers.js diff --git a/tests/wpt/web-platform-tests/fs/resources/opaque-origin-sandbox.html b/tests/wpt/tests/fs/resources/opaque-origin-sandbox.html similarity index 100% rename from tests/wpt/web-platform-tests/fs/resources/opaque-origin-sandbox.html rename to tests/wpt/tests/fs/resources/opaque-origin-sandbox.html diff --git a/tests/wpt/web-platform-tests/fs/resources/sandboxed-fs-test-helpers.js b/tests/wpt/tests/fs/resources/sandboxed-fs-test-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/resources/sandboxed-fs-test-helpers.js rename to tests/wpt/tests/fs/resources/sandboxed-fs-test-helpers.js diff --git a/tests/wpt/web-platform-tests/fs/resources/sync-access-handle-test.js b/tests/wpt/tests/fs/resources/sync-access-handle-test.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/resources/sync-access-handle-test.js rename to tests/wpt/tests/fs/resources/sync-access-handle-test.js diff --git a/tests/wpt/web-platform-tests/fs/resources/test-helpers.js b/tests/wpt/tests/fs/resources/test-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/resources/test-helpers.js rename to tests/wpt/tests/fs/resources/test-helpers.js diff --git a/tests/wpt/web-platform-tests/fs/root-name.https.any.js b/tests/wpt/tests/fs/root-name.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/root-name.https.any.js rename to tests/wpt/tests/fs/root-name.https.any.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-IndexedDB.js b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-IndexedDB.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-IndexedDB.js rename to tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-IndexedDB.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-buckets.js b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-buckets.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-buckets.js rename to tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-buckets.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-getUniqueId.js b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-getUniqueId.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-getUniqueId.js rename to tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-getUniqueId.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-isSameEntry.js b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-isSameEntry.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-isSameEntry.js rename to tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-isSameEntry.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js rename to tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-Error.js b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-Error.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-Error.js rename to tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-Error.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js rename to tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js rename to tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js rename to tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-frames.js b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-frames.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-frames.js rename to tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-frames.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-windows.js b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-windows.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-windows.js rename to tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-windows.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-workers.js b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-workers.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-postMessage-workers.js rename to tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-postMessage-workers.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-remove.js b/tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-remove.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemBaseHandle-remove.js rename to tests/wpt/tests/fs/script-tests/FileSystemBaseHandle-remove.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js b/tests/wpt/tests/fs/script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js rename to tests/wpt/tests/fs/script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemDirectoryHandle-getFileHandle.js b/tests/wpt/tests/fs/script-tests/FileSystemDirectoryHandle-getFileHandle.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemDirectoryHandle-getFileHandle.js rename to tests/wpt/tests/fs/script-tests/FileSystemDirectoryHandle-getFileHandle.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemDirectoryHandle-iteration.js b/tests/wpt/tests/fs/script-tests/FileSystemDirectoryHandle-iteration.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemDirectoryHandle-iteration.js rename to tests/wpt/tests/fs/script-tests/FileSystemDirectoryHandle-iteration.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemDirectoryHandle-removeEntry.js b/tests/wpt/tests/fs/script-tests/FileSystemDirectoryHandle-removeEntry.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemDirectoryHandle-removeEntry.js rename to tests/wpt/tests/fs/script-tests/FileSystemDirectoryHandle-removeEntry.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemDirectoryHandle-resolve.js b/tests/wpt/tests/fs/script-tests/FileSystemDirectoryHandle-resolve.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemDirectoryHandle-resolve.js rename to tests/wpt/tests/fs/script-tests/FileSystemDirectoryHandle-resolve.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemFileHandle-create-sync-access-handle.js b/tests/wpt/tests/fs/script-tests/FileSystemFileHandle-create-sync-access-handle.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemFileHandle-create-sync-access-handle.js rename to tests/wpt/tests/fs/script-tests/FileSystemFileHandle-create-sync-access-handle.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemFileHandle-getFile.js b/tests/wpt/tests/fs/script-tests/FileSystemFileHandle-getFile.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemFileHandle-getFile.js rename to tests/wpt/tests/fs/script-tests/FileSystemFileHandle-getFile.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemFileHandle-move.js b/tests/wpt/tests/fs/script-tests/FileSystemFileHandle-move.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemFileHandle-move.js rename to tests/wpt/tests/fs/script-tests/FileSystemFileHandle-move.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemSyncAccessHandle-flush.js b/tests/wpt/tests/fs/script-tests/FileSystemSyncAccessHandle-flush.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemSyncAccessHandle-flush.js rename to tests/wpt/tests/fs/script-tests/FileSystemSyncAccessHandle-flush.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemWritableFileStream-piped.js b/tests/wpt/tests/fs/script-tests/FileSystemWritableFileStream-piped.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemWritableFileStream-piped.js rename to tests/wpt/tests/fs/script-tests/FileSystemWritableFileStream-piped.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemWritableFileStream-write.js b/tests/wpt/tests/fs/script-tests/FileSystemWritableFileStream-write.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemWritableFileStream-write.js rename to tests/wpt/tests/fs/script-tests/FileSystemWritableFileStream-write.js diff --git a/tests/wpt/web-platform-tests/fs/script-tests/FileSystemWritableFileStream.js b/tests/wpt/tests/fs/script-tests/FileSystemWritableFileStream.js similarity index 100% rename from tests/wpt/web-platform-tests/fs/script-tests/FileSystemWritableFileStream.js rename to tests/wpt/tests/fs/script-tests/FileSystemWritableFileStream.js diff --git a/tests/wpt/web-platform-tests/fullscreen/META.yml b/tests/wpt/tests/fullscreen/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/META.yml rename to tests/wpt/tests/fullscreen/META.yml diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-exit-fullscreen-active-document.html b/tests/wpt/tests/fullscreen/api/document-exit-fullscreen-active-document.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-exit-fullscreen-active-document.html rename to tests/wpt/tests/fullscreen/api/document-exit-fullscreen-active-document.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-exit-fullscreen-nested-in-iframe.html b/tests/wpt/tests/fullscreen/api/document-exit-fullscreen-nested-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-exit-fullscreen-nested-in-iframe.html rename to tests/wpt/tests/fullscreen/api/document-exit-fullscreen-nested-in-iframe.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-exit-fullscreen-nested-shadow-dom.html b/tests/wpt/tests/fullscreen/api/document-exit-fullscreen-nested-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-exit-fullscreen-nested-shadow-dom.html rename to tests/wpt/tests/fullscreen/api/document-exit-fullscreen-nested-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-exit-fullscreen-nested.html b/tests/wpt/tests/fullscreen/api/document-exit-fullscreen-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-exit-fullscreen-nested.html rename to tests/wpt/tests/fullscreen/api/document-exit-fullscreen-nested.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-exit-fullscreen-timing.html b/tests/wpt/tests/fullscreen/api/document-exit-fullscreen-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-exit-fullscreen-timing.html rename to tests/wpt/tests/fullscreen/api/document-exit-fullscreen-timing.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-exit-fullscreen-twice.html b/tests/wpt/tests/fullscreen/api/document-exit-fullscreen-twice.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-exit-fullscreen-twice.html rename to tests/wpt/tests/fullscreen/api/document-exit-fullscreen-twice.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-exit-fullscreen.html b/tests/wpt/tests/fullscreen/api/document-exit-fullscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-exit-fullscreen.html rename to tests/wpt/tests/fullscreen/api/document-exit-fullscreen.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-element.html b/tests/wpt/tests/fullscreen/api/document-fullscreen-element.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-element.html rename to tests/wpt/tests/fullscreen/api/document-fullscreen-element.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled-active-document.html b/tests/wpt/tests/fullscreen/api/document-fullscreen-enabled-active-document.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled-active-document.html rename to tests/wpt/tests/fullscreen/api/document-fullscreen-enabled-active-document.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled-cross-origin.sub.html b/tests/wpt/tests/fullscreen/api/document-fullscreen-enabled-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled-cross-origin.sub.html rename to tests/wpt/tests/fullscreen/api/document-fullscreen-enabled-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled-removing-allowfullscreen.sub.html b/tests/wpt/tests/fullscreen/api/document-fullscreen-enabled-removing-allowfullscreen.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled-removing-allowfullscreen.sub.html rename to tests/wpt/tests/fullscreen/api/document-fullscreen-enabled-removing-allowfullscreen.sub.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled-setting-allowfullscreen-timing.sub.html b/tests/wpt/tests/fullscreen/api/document-fullscreen-enabled-setting-allowfullscreen-timing.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled-setting-allowfullscreen-timing.sub.html rename to tests/wpt/tests/fullscreen/api/document-fullscreen-enabled-setting-allowfullscreen-timing.sub.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled-setting-allowfullscreen.sub.html b/tests/wpt/tests/fullscreen/api/document-fullscreen-enabled-setting-allowfullscreen.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled-setting-allowfullscreen.sub.html rename to tests/wpt/tests/fullscreen/api/document-fullscreen-enabled-setting-allowfullscreen.sub.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled.html b/tests/wpt/tests/fullscreen/api/document-fullscreen-enabled.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled.html rename to tests/wpt/tests/fullscreen/api/document-fullscreen-enabled.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-onfullscreenchange.html b/tests/wpt/tests/fullscreen/api/document-onfullscreenchange.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-onfullscreenchange.html rename to tests/wpt/tests/fullscreen/api/document-onfullscreenchange.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-onfullscreenerror.html b/tests/wpt/tests/fullscreen/api/document-onfullscreenerror.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/document-onfullscreenerror.html rename to tests/wpt/tests/fullscreen/api/document-onfullscreenerror.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-ready-allowed.html b/tests/wpt/tests/fullscreen/api/element-ready-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-ready-allowed.html rename to tests/wpt/tests/fullscreen/api/element-ready-allowed.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-ready-check-allowed-cross-origin.sub.html b/tests/wpt/tests/fullscreen/api/element-ready-check-allowed-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-ready-check-allowed-cross-origin.sub.html rename to tests/wpt/tests/fullscreen/api/element-ready-check-allowed-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-ready-check-containing-iframe.html b/tests/wpt/tests/fullscreen/api/element-ready-check-containing-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-ready-check-containing-iframe.html rename to tests/wpt/tests/fullscreen/api/element-ready-check-containing-iframe.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-ready-check-fullscreen-element-sibling.html b/tests/wpt/tests/fullscreen/api/element-ready-check-fullscreen-element-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-ready-check-fullscreen-element-sibling.html rename to tests/wpt/tests/fullscreen/api/element-ready-check-fullscreen-element-sibling.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-ready-check-fullscreen-iframe-child.html b/tests/wpt/tests/fullscreen/api/element-ready-check-fullscreen-iframe-child.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-ready-check-fullscreen-iframe-child.html rename to tests/wpt/tests/fullscreen/api/element-ready-check-fullscreen-iframe-child.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-ready-check-iframe-child.html b/tests/wpt/tests/fullscreen/api/element-ready-check-iframe-child.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-ready-check-iframe-child.html rename to tests/wpt/tests/fullscreen/api/element-ready-check-iframe-child.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-ready-check-not-allowed-cross-origin.sub.html b/tests/wpt/tests/fullscreen/api/element-ready-check-not-allowed-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-ready-check-not-allowed-cross-origin.sub.html rename to tests/wpt/tests/fullscreen/api/element-ready-check-not-allowed-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-ready-check-not-in-document.html b/tests/wpt/tests/fullscreen/api/element-ready-check-not-in-document.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-ready-check-not-in-document.html rename to tests/wpt/tests/fullscreen/api/element-ready-check-not-in-document.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-active-document.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-active-document.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-active-document.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-active-document.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-after-error.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-after-error.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-after-error.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-after-error.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-and-exit-iframe.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-and-exit-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-and-exit-iframe.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-and-exit-iframe.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-and-move-to-iframe.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-and-move-to-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-and-move-to-iframe.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-and-move-to-iframe.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-and-move.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-and-move.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-and-move.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-and-move.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-and-remove-iframe.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-and-remove-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-and-remove-iframe.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-and-remove-iframe.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-and-remove.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-and-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-and-remove.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-and-remove.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-consume-user-activation.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-consume-user-activation.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-consume-user-activation.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-consume-user-activation.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-cross-origin.sub.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-cross-origin.sub.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-dialog.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-dialog.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-dialog.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-dialog.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-namespaces.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-namespaces.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-namespaces.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-namespaces.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-non-top.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-non-top.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-non-top.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-non-top.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-not-allowed.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-not-allowed.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-not-allowed.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-not-allowed.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-options.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-options.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-options.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-options.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-options.tentative.https.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-options.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-options.tentative.https.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-options.tentative.https.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-same-element.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-same-element.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-same-element.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-same-element.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-same.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-same.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-same.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-same.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-screen-size.https.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-screen-size.https.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-screen-size.https.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-screen-size.https.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-svg-rect.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-svg-rect.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-svg-rect.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-svg-rect.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-svg-svg.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-svg-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-svg-svg.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-svg-svg.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-timing.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-timing.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-timing.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-top.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-top.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-top.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-top.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-twice.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-twice.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-twice.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-twice.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-two-elements.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen-two-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen-two-elements.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen-two-elements.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen.html b/tests/wpt/tests/fullscreen/api/element-request-fullscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/element-request-fullscreen.html rename to tests/wpt/tests/fullscreen/api/element-request-fullscreen.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/fullscreen-display-contents.html b/tests/wpt/tests/fullscreen/api/fullscreen-display-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/fullscreen-display-contents.html rename to tests/wpt/tests/fullscreen/api/fullscreen-display-contents.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/fullscreen-reordering.html b/tests/wpt/tests/fullscreen/api/fullscreen-reordering.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/fullscreen-reordering.html rename to tests/wpt/tests/fullscreen/api/fullscreen-reordering.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/historical.html b/tests/wpt/tests/fullscreen/api/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/historical.html rename to tests/wpt/tests/fullscreen/api/historical.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/promises-reject.html b/tests/wpt/tests/fullscreen/api/promises-reject.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/promises-reject.html rename to tests/wpt/tests/fullscreen/api/promises-reject.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/promises-resolve.html b/tests/wpt/tests/fullscreen/api/promises-resolve.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/promises-resolve.html rename to tests/wpt/tests/fullscreen/api/promises-resolve.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/resources/attempt-fullscreen.html b/tests/wpt/tests/fullscreen/api/resources/attempt-fullscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/resources/attempt-fullscreen.html rename to tests/wpt/tests/fullscreen/api/resources/attempt-fullscreen.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/resources/echo-fullscreenEnabled.html b/tests/wpt/tests/fullscreen/api/resources/echo-fullscreenEnabled.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/resources/echo-fullscreenEnabled.html rename to tests/wpt/tests/fullscreen/api/resources/echo-fullscreenEnabled.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/resources/recursive-iframe-fullscreen.html b/tests/wpt/tests/fullscreen/api/resources/recursive-iframe-fullscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/resources/recursive-iframe-fullscreen.html rename to tests/wpt/tests/fullscreen/api/resources/recursive-iframe-fullscreen.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/resources/report-fullscreen-enabled.html b/tests/wpt/tests/fullscreen/api/resources/report-fullscreen-enabled.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/resources/report-fullscreen-enabled.html rename to tests/wpt/tests/fullscreen/api/resources/report-fullscreen-enabled.html diff --git a/tests/wpt/web-platform-tests/fullscreen/api/shadowroot-fullscreen-element.html b/tests/wpt/tests/fullscreen/api/shadowroot-fullscreen-element.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/api/shadowroot-fullscreen-element.html rename to tests/wpt/tests/fullscreen/api/shadowroot-fullscreen-element.html diff --git a/tests/wpt/web-platform-tests/fullscreen/crashtests/backdrop-list-item.html b/tests/wpt/tests/fullscreen/crashtests/backdrop-list-item.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/crashtests/backdrop-list-item.html rename to tests/wpt/tests/fullscreen/crashtests/backdrop-list-item.html diff --git a/tests/wpt/web-platform-tests/fullscreen/crashtests/chrome-1312699.html b/tests/wpt/tests/fullscreen/crashtests/chrome-1312699.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/crashtests/chrome-1312699.html rename to tests/wpt/tests/fullscreen/crashtests/chrome-1312699.html diff --git a/tests/wpt/web-platform-tests/fullscreen/crashtests/content-visibility-crash.html b/tests/wpt/tests/fullscreen/crashtests/content-visibility-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/crashtests/content-visibility-crash.html rename to tests/wpt/tests/fullscreen/crashtests/content-visibility-crash.html diff --git a/tests/wpt/web-platform-tests/fullscreen/idlharness.window.js b/tests/wpt/tests/fullscreen/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/idlharness.window.js rename to tests/wpt/tests/fullscreen/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/fullscreen/model/move-fullscreen-element.html b/tests/wpt/tests/fullscreen/model/move-fullscreen-element.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/model/move-fullscreen-element.html rename to tests/wpt/tests/fullscreen/model/move-fullscreen-element.html diff --git a/tests/wpt/web-platform-tests/fullscreen/model/move-to-fullscreen-iframe.html b/tests/wpt/tests/fullscreen/model/move-to-fullscreen-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/model/move-to-fullscreen-iframe.html rename to tests/wpt/tests/fullscreen/model/move-to-fullscreen-iframe.html diff --git a/tests/wpt/web-platform-tests/fullscreen/model/move-to-iframe.html b/tests/wpt/tests/fullscreen/model/move-to-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/model/move-to-iframe.html rename to tests/wpt/tests/fullscreen/model/move-to-iframe.html diff --git a/tests/wpt/web-platform-tests/fullscreen/model/move-to-inactive-document.html b/tests/wpt/tests/fullscreen/model/move-to-inactive-document.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/model/move-to-inactive-document.html rename to tests/wpt/tests/fullscreen/model/move-to-inactive-document.html diff --git a/tests/wpt/web-platform-tests/fullscreen/model/remove-child.html b/tests/wpt/tests/fullscreen/model/remove-child.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/model/remove-child.html rename to tests/wpt/tests/fullscreen/model/remove-child.html diff --git a/tests/wpt/web-platform-tests/fullscreen/model/remove-first.html b/tests/wpt/tests/fullscreen/model/remove-first.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/model/remove-first.html rename to tests/wpt/tests/fullscreen/model/remove-first.html diff --git a/tests/wpt/web-platform-tests/fullscreen/model/remove-last.html b/tests/wpt/tests/fullscreen/model/remove-last.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/model/remove-last.html rename to tests/wpt/tests/fullscreen/model/remove-last.html diff --git a/tests/wpt/web-platform-tests/fullscreen/model/remove-parent.html b/tests/wpt/tests/fullscreen/model/remove-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/model/remove-parent.html rename to tests/wpt/tests/fullscreen/model/remove-parent.html diff --git a/tests/wpt/web-platform-tests/fullscreen/model/remove-single.html b/tests/wpt/tests/fullscreen/model/remove-single.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/model/remove-single.html rename to tests/wpt/tests/fullscreen/model/remove-single.html diff --git a/tests/wpt/web-platform-tests/fullscreen/rendering/backdrop-iframe-ref.html b/tests/wpt/tests/fullscreen/rendering/backdrop-iframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/rendering/backdrop-iframe-ref.html rename to tests/wpt/tests/fullscreen/rendering/backdrop-iframe-ref.html diff --git a/tests/wpt/web-platform-tests/fullscreen/rendering/backdrop-iframe.html b/tests/wpt/tests/fullscreen/rendering/backdrop-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/rendering/backdrop-iframe.html rename to tests/wpt/tests/fullscreen/rendering/backdrop-iframe.html diff --git a/tests/wpt/web-platform-tests/fullscreen/rendering/backdrop-object-ref.html b/tests/wpt/tests/fullscreen/rendering/backdrop-object-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/rendering/backdrop-object-ref.html rename to tests/wpt/tests/fullscreen/rendering/backdrop-object-ref.html diff --git a/tests/wpt/web-platform-tests/fullscreen/rendering/backdrop-object.html b/tests/wpt/tests/fullscreen/rendering/backdrop-object.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/rendering/backdrop-object.html rename to tests/wpt/tests/fullscreen/rendering/backdrop-object.html diff --git a/tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-css-invalidation.html b/tests/wpt/tests/fullscreen/rendering/fullscreen-css-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-css-invalidation.html rename to tests/wpt/tests/fullscreen/rendering/fullscreen-css-invalidation.html diff --git a/tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-css-transition.html b/tests/wpt/tests/fullscreen/rendering/fullscreen-css-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-css-transition.html rename to tests/wpt/tests/fullscreen/rendering/fullscreen-css-transition.html diff --git a/tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-pseudo-class-support.html b/tests/wpt/tests/fullscreen/rendering/fullscreen-pseudo-class-support.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-pseudo-class-support.html rename to tests/wpt/tests/fullscreen/rendering/fullscreen-pseudo-class-support.html diff --git a/tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-pseudo-class.html b/tests/wpt/tests/fullscreen/rendering/fullscreen-pseudo-class.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-pseudo-class.html rename to tests/wpt/tests/fullscreen/rendering/fullscreen-pseudo-class.html diff --git a/tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-root-block-scroll.html b/tests/wpt/tests/fullscreen/rendering/fullscreen-root-block-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-root-block-scroll.html rename to tests/wpt/tests/fullscreen/rendering/fullscreen-root-block-scroll.html diff --git a/tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-root-block-size.html b/tests/wpt/tests/fullscreen/rendering/fullscreen-root-block-size.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-root-block-size.html rename to tests/wpt/tests/fullscreen/rendering/fullscreen-root-block-size.html diff --git a/tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-root-fills-page-ref.html b/tests/wpt/tests/fullscreen/rendering/fullscreen-root-fills-page-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-root-fills-page-ref.html rename to tests/wpt/tests/fullscreen/rendering/fullscreen-root-fills-page-ref.html diff --git a/tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-root-fills-page.html b/tests/wpt/tests/fullscreen/rendering/fullscreen-root-fills-page.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-root-fills-page.html rename to tests/wpt/tests/fullscreen/rendering/fullscreen-root-fills-page.html diff --git a/tests/wpt/web-platform-tests/fullscreen/rendering/ua-style-iframe.html b/tests/wpt/tests/fullscreen/rendering/ua-style-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/rendering/ua-style-iframe.html rename to tests/wpt/tests/fullscreen/rendering/ua-style-iframe.html diff --git a/tests/wpt/web-platform-tests/fullscreen/trusted-click.js b/tests/wpt/tests/fullscreen/trusted-click.js similarity index 100% rename from tests/wpt/web-platform-tests/fullscreen/trusted-click.js rename to tests/wpt/tests/fullscreen/trusted-click.js diff --git a/tests/wpt/web-platform-tests/gamepad/META.yml b/tests/wpt/tests/gamepad/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/gamepad/META.yml rename to tests/wpt/tests/gamepad/META.yml diff --git a/tests/wpt/web-platform-tests/gamepad/events-manual.html b/tests/wpt/tests/gamepad/events-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/gamepad/events-manual.html rename to tests/wpt/tests/gamepad/events-manual.html diff --git a/tests/wpt/web-platform-tests/gamepad/feature-policy-gamepad.html b/tests/wpt/tests/gamepad/feature-policy-gamepad.html similarity index 100% rename from tests/wpt/web-platform-tests/gamepad/feature-policy-gamepad.html rename to tests/wpt/tests/gamepad/feature-policy-gamepad.html diff --git a/tests/wpt/web-platform-tests/gamepad/gamepad-default-feature-policy.https.sub.html b/tests/wpt/tests/gamepad/gamepad-default-feature-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/gamepad/gamepad-default-feature-policy.https.sub.html rename to tests/wpt/tests/gamepad/gamepad-default-feature-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/gamepad/gamepad-secure-context.html b/tests/wpt/tests/gamepad/gamepad-secure-context.html similarity index 100% rename from tests/wpt/web-platform-tests/gamepad/gamepad-secure-context.html rename to tests/wpt/tests/gamepad/gamepad-secure-context.html diff --git a/tests/wpt/web-platform-tests/gamepad/gamepad-supported-by-feature-policy.html b/tests/wpt/tests/gamepad/gamepad-supported-by-feature-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/gamepad/gamepad-supported-by-feature-policy.html rename to tests/wpt/tests/gamepad/gamepad-supported-by-feature-policy.html diff --git a/tests/wpt/web-platform-tests/gamepad/getgamepads-polling-manual.html b/tests/wpt/tests/gamepad/getgamepads-polling-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/gamepad/getgamepads-polling-manual.html rename to tests/wpt/tests/gamepad/getgamepads-polling-manual.html diff --git a/tests/wpt/web-platform-tests/gamepad/idlharness-extensions.https.window.js b/tests/wpt/tests/gamepad/idlharness-extensions.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/gamepad/idlharness-extensions.https.window.js rename to tests/wpt/tests/gamepad/idlharness-extensions.https.window.js diff --git a/tests/wpt/web-platform-tests/gamepad/idlharness-manual.html b/tests/wpt/tests/gamepad/idlharness-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/gamepad/idlharness-manual.html rename to tests/wpt/tests/gamepad/idlharness-manual.html diff --git a/tests/wpt/web-platform-tests/gamepad/idlharness.https.window.js b/tests/wpt/tests/gamepad/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/gamepad/idlharness.https.window.js rename to tests/wpt/tests/gamepad/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/gamepad/not-fully-active.https.html b/tests/wpt/tests/gamepad/not-fully-active.https.html similarity index 100% rename from tests/wpt/web-platform-tests/gamepad/not-fully-active.https.html rename to tests/wpt/tests/gamepad/not-fully-active.https.html diff --git a/tests/wpt/web-platform-tests/gamepad/timestamp-manual.html b/tests/wpt/tests/gamepad/timestamp-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/gamepad/timestamp-manual.html rename to tests/wpt/tests/gamepad/timestamp-manual.html diff --git a/tests/wpt/web-platform-tests/generic-sensor/META.yml b/tests/wpt/tests/generic-sensor/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/generic-sensor/META.yml rename to tests/wpt/tests/generic-sensor/META.yml diff --git a/tests/wpt/web-platform-tests/generic-sensor/README.md b/tests/wpt/tests/generic-sensor/README.md similarity index 100% rename from tests/wpt/web-platform-tests/generic-sensor/README.md rename to tests/wpt/tests/generic-sensor/README.md diff --git a/tests/wpt/web-platform-tests/generic-sensor/SensorErrorEvent-constructor.https.html b/tests/wpt/tests/generic-sensor/SensorErrorEvent-constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/generic-sensor/SensorErrorEvent-constructor.https.html rename to tests/wpt/tests/generic-sensor/SensorErrorEvent-constructor.https.html diff --git a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-feature-policy-test.sub.js b/tests/wpt/tests/generic-sensor/generic-sensor-feature-policy-test.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/generic-sensor/generic-sensor-feature-policy-test.sub.js rename to tests/wpt/tests/generic-sensor/generic-sensor-feature-policy-test.sub.js diff --git a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-iframe-tests.sub.js b/tests/wpt/tests/generic-sensor/generic-sensor-iframe-tests.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/generic-sensor/generic-sensor-iframe-tests.sub.js rename to tests/wpt/tests/generic-sensor/generic-sensor-iframe-tests.sub.js diff --git a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-permission.https.html b/tests/wpt/tests/generic-sensor/generic-sensor-permission.https.html similarity index 100% rename from tests/wpt/web-platform-tests/generic-sensor/generic-sensor-permission.https.html rename to tests/wpt/tests/generic-sensor/generic-sensor-permission.https.html diff --git a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-tests.js b/tests/wpt/tests/generic-sensor/generic-sensor-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/generic-sensor/generic-sensor-tests.js rename to tests/wpt/tests/generic-sensor/generic-sensor-tests.js diff --git a/tests/wpt/web-platform-tests/generic-sensor/idlharness.https.window.js b/tests/wpt/tests/generic-sensor/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/generic-sensor/idlharness.https.window.js rename to tests/wpt/tests/generic-sensor/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/generic-sensor/resources/generic-sensor-helpers.js b/tests/wpt/tests/generic-sensor/resources/generic-sensor-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/generic-sensor/resources/generic-sensor-helpers.js rename to tests/wpt/tests/generic-sensor/resources/generic-sensor-helpers.js diff --git a/tests/wpt/web-platform-tests/generic-sensor/resources/iframe_sensor_handler.html b/tests/wpt/tests/generic-sensor/resources/iframe_sensor_handler.html similarity index 100% rename from tests/wpt/web-platform-tests/generic-sensor/resources/iframe_sensor_handler.html rename to tests/wpt/tests/generic-sensor/resources/iframe_sensor_handler.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/META.yml b/tests/wpt/tests/geolocation-API/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/META.yml rename to tests/wpt/tests/geolocation-API/META.yml diff --git a/tests/wpt/web-platform-tests/geolocation-API/PositionOptions.https.html b/tests/wpt/tests/geolocation-API/PositionOptions.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/PositionOptions.https.html rename to tests/wpt/tests/geolocation-API/PositionOptions.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/clearWatch_TypeError.https.html b/tests/wpt/tests/geolocation-API/clearWatch_TypeError.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/clearWatch_TypeError.https.html rename to tests/wpt/tests/geolocation-API/clearWatch_TypeError.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/disabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/geolocation-API/disabled-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/disabled-by-permissions-policy.https.sub.html rename to tests/wpt/tests/geolocation-API/disabled-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/disabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/geolocation-API/disabled-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/disabled-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/geolocation-API/disabled-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/geolocation-API/enabled-by-permission-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/tests/geolocation-API/enabled-by-permission-policy-attribute-redirect-on-load.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/enabled-by-permission-policy-attribute-redirect-on-load.https.sub.html rename to tests/wpt/tests/geolocation-API/enabled-by-permission-policy-attribute-redirect-on-load.https.sub.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/enabled-by-permission-policy-attribute.https.sub.html b/tests/wpt/tests/geolocation-API/enabled-by-permission-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/enabled-by-permission-policy-attribute.https.sub.html rename to tests/wpt/tests/geolocation-API/enabled-by-permission-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/enabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/geolocation-API/enabled-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/enabled-by-permissions-policy.https.sub.html rename to tests/wpt/tests/geolocation-API/enabled-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/enabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/geolocation-API/enabled-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/enabled-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/geolocation-API/enabled-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/geolocation-API/enabled-on-self-origin-by-permissions-policy.https.sub.html b/tests/wpt/tests/geolocation-API/enabled-on-self-origin-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/enabled-on-self-origin-by-permissions-policy.https.sub.html rename to tests/wpt/tests/geolocation-API/enabled-on-self-origin-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/enabled-on-self-origin-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/geolocation-API/enabled-on-self-origin-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/enabled-on-self-origin-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/geolocation-API/enabled-on-self-origin-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/geolocation-API/getCurrentPosition_TypeError.https.html b/tests/wpt/tests/geolocation-API/getCurrentPosition_TypeError.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/getCurrentPosition_TypeError.https.html rename to tests/wpt/tests/geolocation-API/getCurrentPosition_TypeError.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/getCurrentPosition_permission_allow.https.html b/tests/wpt/tests/geolocation-API/getCurrentPosition_permission_allow.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/getCurrentPosition_permission_allow.https.html rename to tests/wpt/tests/geolocation-API/getCurrentPosition_permission_allow.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/getCurrentPosition_permission_deny.https.html b/tests/wpt/tests/geolocation-API/getCurrentPosition_permission_deny.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/getCurrentPosition_permission_deny.https.html rename to tests/wpt/tests/geolocation-API/getCurrentPosition_permission_deny.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/idlharness.https.window.js b/tests/wpt/tests/geolocation-API/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/idlharness.https.window.js rename to tests/wpt/tests/geolocation-API/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/geolocation-API/non-fully-active.https.html b/tests/wpt/tests/geolocation-API/non-fully-active.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/non-fully-active.https.html rename to tests/wpt/tests/geolocation-API/non-fully-active.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/non-secure-contexts.http.html b/tests/wpt/tests/geolocation-API/non-secure-contexts.http.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/non-secure-contexts.http.html rename to tests/wpt/tests/geolocation-API/non-secure-contexts.http.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/permission.https.html b/tests/wpt/tests/geolocation-API/permission.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/permission.https.html rename to tests/wpt/tests/geolocation-API/permission.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/resources/iframe.html b/tests/wpt/tests/geolocation-API/resources/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/resources/iframe.html rename to tests/wpt/tests/geolocation-API/resources/iframe.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/support.js b/tests/wpt/tests/geolocation-API/support.js similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/support.js rename to tests/wpt/tests/geolocation-API/support.js diff --git a/tests/wpt/web-platform-tests/geolocation-API/watchPosition_TypeError.https.html b/tests/wpt/tests/geolocation-API/watchPosition_TypeError.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/watchPosition_TypeError.https.html rename to tests/wpt/tests/geolocation-API/watchPosition_TypeError.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-API/watchPosition_permission_deny.https.html b/tests/wpt/tests/geolocation-API/watchPosition_permission_deny.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-API/watchPosition_permission_deny.https.html rename to tests/wpt/tests/geolocation-API/watchPosition_permission_deny.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html b/tests/wpt/tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html rename to tests/wpt/tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html.headers b/tests/wpt/tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html.headers rename to tests/wpt/tests/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/tests/wpt/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html rename to tests/wpt/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute.https.html b/tests/wpt/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute.https.html rename to tests/wpt/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html b/tests/wpt/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html rename to tests/wpt/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html.headers b/tests/wpt/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html.headers rename to tests/wpt/tests/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html b/tests/wpt/tests/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html rename to tests/wpt/tests/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers b/tests/wpt/tests/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers rename to tests/wpt/tests/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-iframe-access.https.html b/tests/wpt/tests/geolocation-sensor/GeolocationSensor-iframe-access.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-iframe-access.https.html rename to tests/wpt/tests/geolocation-sensor/GeolocationSensor-iframe-access.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-supported-by-feature-policy.html b/tests/wpt/tests/geolocation-sensor/GeolocationSensor-supported-by-feature-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor-supported-by-feature-policy.html rename to tests/wpt/tests/geolocation-sensor/GeolocationSensor-supported-by-feature-policy.html diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor.https.html b/tests/wpt/tests/geolocation-sensor/GeolocationSensor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor.https.html rename to tests/wpt/tests/geolocation-sensor/GeolocationSensor.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor_insecure_context.html b/tests/wpt/tests/geolocation-sensor/GeolocationSensor_insecure_context.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor_insecure_context.html rename to tests/wpt/tests/geolocation-sensor/GeolocationSensor_insecure_context.html diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor_read.https.html b/tests/wpt/tests/geolocation-sensor/GeolocationSensor_read.https.html similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/GeolocationSensor_read.https.html rename to tests/wpt/tests/geolocation-sensor/GeolocationSensor_read.https.html diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/META.yml b/tests/wpt/tests/geolocation-sensor/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/META.yml rename to tests/wpt/tests/geolocation-sensor/META.yml diff --git a/tests/wpt/web-platform-tests/geolocation-sensor/idlharness.https.window.js b/tests/wpt/tests/geolocation-sensor/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/geolocation-sensor/idlharness.https.window.js rename to tests/wpt/tests/geolocation-sensor/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/graphics-aam/META.yml b/tests/wpt/tests/graphics-aam/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/graphics-aam/META.yml rename to tests/wpt/tests/graphics-aam/META.yml diff --git a/tests/wpt/web-platform-tests/graphics-aam/graphics-document_on_html_element-manual.html b/tests/wpt/tests/graphics-aam/graphics-document_on_html_element-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/graphics-aam/graphics-document_on_html_element-manual.html rename to tests/wpt/tests/graphics-aam/graphics-document_on_html_element-manual.html diff --git a/tests/wpt/web-platform-tests/graphics-aam/graphics-document_on_svg_element-manual.html b/tests/wpt/tests/graphics-aam/graphics-document_on_svg_element-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/graphics-aam/graphics-document_on_svg_element-manual.html rename to tests/wpt/tests/graphics-aam/graphics-document_on_svg_element-manual.html diff --git a/tests/wpt/web-platform-tests/graphics-aam/graphics-object_on_html_element-manual.html b/tests/wpt/tests/graphics-aam/graphics-object_on_html_element-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/graphics-aam/graphics-object_on_html_element-manual.html rename to tests/wpt/tests/graphics-aam/graphics-object_on_html_element-manual.html diff --git a/tests/wpt/web-platform-tests/graphics-aam/graphics-object_on_svg_element-manual.html b/tests/wpt/tests/graphics-aam/graphics-object_on_svg_element-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/graphics-aam/graphics-object_on_svg_element-manual.html rename to tests/wpt/tests/graphics-aam/graphics-object_on_svg_element-manual.html diff --git a/tests/wpt/web-platform-tests/graphics-aam/graphics-symbol_on_html_element-manual.html b/tests/wpt/tests/graphics-aam/graphics-symbol_on_html_element-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/graphics-aam/graphics-symbol_on_html_element-manual.html rename to tests/wpt/tests/graphics-aam/graphics-symbol_on_html_element-manual.html diff --git a/tests/wpt/web-platform-tests/graphics-aam/graphics-symbol_on_svg_element-manual.html b/tests/wpt/tests/graphics-aam/graphics-symbol_on_svg_element-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/graphics-aam/graphics-symbol_on_svg_element-manual.html rename to tests/wpt/tests/graphics-aam/graphics-symbol_on_svg_element-manual.html diff --git a/tests/wpt/web-platform-tests/graphics-aria/META.yml b/tests/wpt/tests/graphics-aria/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/graphics-aria/META.yml rename to tests/wpt/tests/graphics-aria/META.yml diff --git a/tests/wpt/web-platform-tests/graphics-aria/graphics-roles.html b/tests/wpt/tests/graphics-aria/graphics-roles.html similarity index 100% rename from tests/wpt/web-platform-tests/graphics-aria/graphics-roles.html rename to tests/wpt/tests/graphics-aria/graphics-roles.html diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html b/tests/wpt/tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html rename to tests/wpt/tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html.headers b/tests/wpt/tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html.headers rename to tests/wpt/tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/tests/wpt/tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html similarity index 100% rename from tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html rename to tests/wpt/tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html b/tests/wpt/tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html rename to tests/wpt/tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html b/tests/wpt/tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html rename to tests/wpt/tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html.headers b/tests/wpt/tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html.headers rename to tests/wpt/tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html b/tests/wpt/tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html rename to tests/wpt/tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html.headers b/tests/wpt/tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html.headers rename to tests/wpt/tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-iframe-access.https.html b/tests/wpt/tests/gyroscope/Gyroscope-iframe-access.https.html similarity index 100% rename from tests/wpt/web-platform-tests/gyroscope/Gyroscope-iframe-access.https.html rename to tests/wpt/tests/gyroscope/Gyroscope-iframe-access.https.html diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-supported-by-feature-policy.html b/tests/wpt/tests/gyroscope/Gyroscope-supported-by-feature-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/gyroscope/Gyroscope-supported-by-feature-policy.html rename to tests/wpt/tests/gyroscope/Gyroscope-supported-by-feature-policy.html diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope.https.html b/tests/wpt/tests/gyroscope/Gyroscope.https.html similarity index 100% rename from tests/wpt/web-platform-tests/gyroscope/Gyroscope.https.html rename to tests/wpt/tests/gyroscope/Gyroscope.https.html diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope_insecure_context.html b/tests/wpt/tests/gyroscope/Gyroscope_insecure_context.html similarity index 100% rename from tests/wpt/web-platform-tests/gyroscope/Gyroscope_insecure_context.html rename to tests/wpt/tests/gyroscope/Gyroscope_insecure_context.html diff --git a/tests/wpt/web-platform-tests/gyroscope/META.yml b/tests/wpt/tests/gyroscope/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/gyroscope/META.yml rename to tests/wpt/tests/gyroscope/META.yml diff --git a/tests/wpt/web-platform-tests/gyroscope/idlharness.https.window.js b/tests/wpt/tests/gyroscope/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/gyroscope/idlharness.https.window.js rename to tests/wpt/tests/gyroscope/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/hr-time/META.yml b/tests/wpt/tests/hr-time/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/META.yml rename to tests/wpt/tests/hr-time/META.yml diff --git a/tests/wpt/web-platform-tests/hr-time/basic.any.js b/tests/wpt/tests/hr-time/basic.any.js similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/basic.any.js rename to tests/wpt/tests/hr-time/basic.any.js diff --git a/tests/wpt/web-platform-tests/hr-time/clamped-time-origin-isolated.https.html b/tests/wpt/tests/hr-time/clamped-time-origin-isolated.https.html similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/clamped-time-origin-isolated.https.html rename to tests/wpt/tests/hr-time/clamped-time-origin-isolated.https.html diff --git a/tests/wpt/web-platform-tests/hr-time/clamped-time-origin-isolated.https.html.headers b/tests/wpt/tests/hr-time/clamped-time-origin-isolated.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/clamped-time-origin-isolated.https.html.headers rename to tests/wpt/tests/hr-time/clamped-time-origin-isolated.https.html.headers diff --git a/tests/wpt/web-platform-tests/hr-time/clamped-time-origin.html b/tests/wpt/tests/hr-time/clamped-time-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/clamped-time-origin.html rename to tests/wpt/tests/hr-time/clamped-time-origin.html diff --git a/tests/wpt/web-platform-tests/hr-time/cross-origin-isolated-timing-attack.https.html b/tests/wpt/tests/hr-time/cross-origin-isolated-timing-attack.https.html similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/cross-origin-isolated-timing-attack.https.html rename to tests/wpt/tests/hr-time/cross-origin-isolated-timing-attack.https.html diff --git a/tests/wpt/web-platform-tests/hr-time/cross-origin-isolated-timing-attack.https.html.headers b/tests/wpt/tests/hr-time/cross-origin-isolated-timing-attack.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/cross-origin-isolated-timing-attack.https.html.headers rename to tests/wpt/tests/hr-time/cross-origin-isolated-timing-attack.https.html.headers diff --git a/tests/wpt/web-platform-tests/hr-time/idlharness-shadowrealm.window.js b/tests/wpt/tests/hr-time/idlharness-shadowrealm.window.js similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/idlharness-shadowrealm.window.js rename to tests/wpt/tests/hr-time/idlharness-shadowrealm.window.js diff --git a/tests/wpt/web-platform-tests/hr-time/idlharness.any.js b/tests/wpt/tests/hr-time/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/idlharness.any.js rename to tests/wpt/tests/hr-time/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/hr-time/monotonic-clock.any.js b/tests/wpt/tests/hr-time/monotonic-clock.any.js similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/monotonic-clock.any.js rename to tests/wpt/tests/hr-time/monotonic-clock.any.js diff --git a/tests/wpt/web-platform-tests/hr-time/navigation-start-post-before-unload.html b/tests/wpt/tests/hr-time/navigation-start-post-before-unload.html similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/navigation-start-post-before-unload.html rename to tests/wpt/tests/hr-time/navigation-start-post-before-unload.html diff --git a/tests/wpt/web-platform-tests/hr-time/performance-tojson.html b/tests/wpt/tests/hr-time/performance-tojson.html similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/performance-tojson.html rename to tests/wpt/tests/hr-time/performance-tojson.html diff --git a/tests/wpt/web-platform-tests/hr-time/resources/clamped-time-origin.js b/tests/wpt/tests/hr-time/resources/clamped-time-origin.js similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/resources/clamped-time-origin.js rename to tests/wpt/tests/hr-time/resources/clamped-time-origin.js diff --git a/tests/wpt/web-platform-tests/hr-time/resources/now_frame.html b/tests/wpt/tests/hr-time/resources/now_frame.html similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/resources/now_frame.html rename to tests/wpt/tests/hr-time/resources/now_frame.html diff --git a/tests/wpt/web-platform-tests/hr-time/resources/post.html b/tests/wpt/tests/hr-time/resources/post.html similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/resources/post.html rename to tests/wpt/tests/hr-time/resources/post.html diff --git a/tests/wpt/web-platform-tests/hr-time/resources/timing-attack.js b/tests/wpt/tests/hr-time/resources/timing-attack.js similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/resources/timing-attack.js rename to tests/wpt/tests/hr-time/resources/timing-attack.js diff --git a/tests/wpt/web-platform-tests/hr-time/resources/unload-a.html b/tests/wpt/tests/hr-time/resources/unload-a.html similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/resources/unload-a.html rename to tests/wpt/tests/hr-time/resources/unload-a.html diff --git a/tests/wpt/web-platform-tests/hr-time/resources/unload-b.html b/tests/wpt/tests/hr-time/resources/unload-b.html similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/resources/unload-b.html rename to tests/wpt/tests/hr-time/resources/unload-b.html diff --git a/tests/wpt/web-platform-tests/hr-time/resources/unload-c.html b/tests/wpt/tests/hr-time/resources/unload-c.html similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/resources/unload-c.html rename to tests/wpt/tests/hr-time/resources/unload-c.html diff --git a/tests/wpt/web-platform-tests/hr-time/resources/unload.js b/tests/wpt/tests/hr-time/resources/unload.js similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/resources/unload.js rename to tests/wpt/tests/hr-time/resources/unload.js diff --git a/tests/wpt/web-platform-tests/hr-time/test_cross_frame_start.html b/tests/wpt/tests/hr-time/test_cross_frame_start.html similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/test_cross_frame_start.html rename to tests/wpt/tests/hr-time/test_cross_frame_start.html diff --git a/tests/wpt/web-platform-tests/hr-time/timeOrigin.html b/tests/wpt/tests/hr-time/timeOrigin.html similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/timeOrigin.html rename to tests/wpt/tests/hr-time/timeOrigin.html diff --git a/tests/wpt/web-platform-tests/hr-time/timing-attack.html b/tests/wpt/tests/hr-time/timing-attack.html similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/timing-attack.html rename to tests/wpt/tests/hr-time/timing-attack.html diff --git a/tests/wpt/web-platform-tests/hr-time/unload-manual.html b/tests/wpt/tests/hr-time/unload-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/unload-manual.html rename to tests/wpt/tests/hr-time/unload-manual.html diff --git a/tests/wpt/web-platform-tests/hr-time/window-worker-timeOrigin.window.js b/tests/wpt/tests/hr-time/window-worker-timeOrigin.window.js similarity index 100% rename from tests/wpt/web-platform-tests/hr-time/window-worker-timeOrigin.window.js rename to tests/wpt/tests/hr-time/window-worker-timeOrigin.window.js diff --git a/tests/wpt/web-platform-tests/html-aam/META.yaml b/tests/wpt/tests/html-aam/META.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html-aam/META.yaml rename to tests/wpt/tests/html-aam/META.yaml diff --git a/tests/wpt/web-platform-tests/html-aam/fragile/area-role.html b/tests/wpt/tests/html-aam/fragile/area-role.html similarity index 100% rename from tests/wpt/web-platform-tests/html-aam/fragile/area-role.html rename to tests/wpt/tests/html-aam/fragile/area-role.html diff --git a/tests/wpt/web-platform-tests/html-aam/fragile/optgroup-role.html b/tests/wpt/tests/html-aam/fragile/optgroup-role.html similarity index 100% rename from tests/wpt/web-platform-tests/html-aam/fragile/optgroup-role.html rename to tests/wpt/tests/html-aam/fragile/optgroup-role.html diff --git a/tests/wpt/web-platform-tests/html-aam/roles.html b/tests/wpt/tests/html-aam/roles.html similarity index 100% rename from tests/wpt/web-platform-tests/html-aam/roles.html rename to tests/wpt/tests/html-aam/roles.html diff --git a/tests/wpt/web-platform-tests/html-aam/table-roles.html b/tests/wpt/tests/html-aam/table-roles.html similarity index 100% rename from tests/wpt/web-platform-tests/html-aam/table-roles.html rename to tests/wpt/tests/html-aam/table-roles.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/META.yml b/tests/wpt/tests/html-longdesc/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/META.yml rename to tests/wpt/tests/html-longdesc/META.yml diff --git a/tests/wpt/web-platform-tests/html-longdesc/README.html b/tests/wpt/tests/html-longdesc/README.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/README.html rename to tests/wpt/tests/html-longdesc/README.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/data-uri-image-data-uri-description-manual.html b/tests/wpt/tests/html-longdesc/data-uri-image-data-uri-description-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/data-uri-image-data-uri-description-manual.html rename to tests/wpt/tests/html-longdesc/data-uri-image-data-uri-description-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/data-uri-image-external-description-fragment-manual.html b/tests/wpt/tests/html-longdesc/data-uri-image-external-description-fragment-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/data-uri-image-external-description-fragment-manual.html rename to tests/wpt/tests/html-longdesc/data-uri-image-external-description-fragment-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/data-uri-image-external-description-manual.html b/tests/wpt/tests/html-longdesc/data-uri-image-external-description-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/data-uri-image-external-description-manual.html rename to tests/wpt/tests/html-longdesc/data-uri-image-external-description-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/data-uri-image-internal-description-manual.html b/tests/wpt/tests/html-longdesc/data-uri-image-internal-description-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/data-uri-image-internal-description-manual.html rename to tests/wpt/tests/html-longdesc/data-uri-image-internal-description-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/empty-image-data-uri-description-manual.html b/tests/wpt/tests/html-longdesc/empty-image-data-uri-description-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/empty-image-data-uri-description-manual.html rename to tests/wpt/tests/html-longdesc/empty-image-data-uri-description-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/empty-image-external-description-fragment-manual.html b/tests/wpt/tests/html-longdesc/empty-image-external-description-fragment-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/empty-image-external-description-fragment-manual.html rename to tests/wpt/tests/html-longdesc/empty-image-external-description-fragment-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/empty-image-external-description-manual.html b/tests/wpt/tests/html-longdesc/empty-image-external-description-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/empty-image-external-description-manual.html rename to tests/wpt/tests/html-longdesc/empty-image-external-description-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/empty-image-internal-description-manual.html b/tests/wpt/tests/html-longdesc/empty-image-internal-description-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/empty-image-internal-description-manual.html rename to tests/wpt/tests/html-longdesc/empty-image-internal-description-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/empty-longdesc-manual.html b/tests/wpt/tests/html-longdesc/empty-longdesc-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/empty-longdesc-manual.html rename to tests/wpt/tests/html-longdesc/empty-longdesc-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/external-image-data-uri-description-girt-by-spaces-manual.html b/tests/wpt/tests/html-longdesc/external-image-data-uri-description-girt-by-spaces-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/external-image-data-uri-description-girt-by-spaces-manual.html rename to tests/wpt/tests/html-longdesc/external-image-data-uri-description-girt-by-spaces-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/external-image-data-uri-description-manual.html b/tests/wpt/tests/html-longdesc/external-image-data-uri-description-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/external-image-data-uri-description-manual.html rename to tests/wpt/tests/html-longdesc/external-image-data-uri-description-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/external-image-external-description-fragment-girt-by-spaces-manual.html b/tests/wpt/tests/html-longdesc/external-image-external-description-fragment-girt-by-spaces-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/external-image-external-description-fragment-girt-by-spaces-manual.html rename to tests/wpt/tests/html-longdesc/external-image-external-description-fragment-girt-by-spaces-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/external-image-external-description-fragment-manual.html b/tests/wpt/tests/html-longdesc/external-image-external-description-fragment-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/external-image-external-description-fragment-manual.html rename to tests/wpt/tests/html-longdesc/external-image-external-description-fragment-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/external-image-external-description-girt-by-spaces-manual.html b/tests/wpt/tests/html-longdesc/external-image-external-description-girt-by-spaces-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/external-image-external-description-girt-by-spaces-manual.html rename to tests/wpt/tests/html-longdesc/external-image-external-description-girt-by-spaces-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/external-image-external-description-manual.html b/tests/wpt/tests/html-longdesc/external-image-external-description-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/external-image-external-description-manual.html rename to tests/wpt/tests/html-longdesc/external-image-external-description-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/external-image-internal-description-girt-by-spaces-manual.html b/tests/wpt/tests/html-longdesc/external-image-internal-description-girt-by-spaces-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/external-image-internal-description-girt-by-spaces-manual.html rename to tests/wpt/tests/html-longdesc/external-image-internal-description-girt-by-spaces-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/external-image-internal-description-manual.html b/tests/wpt/tests/html-longdesc/external-image-internal-description-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/external-image-internal-description-manual.html rename to tests/wpt/tests/html-longdesc/external-image-internal-description-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/external-image-with-absolute-base-external-description-manual.html b/tests/wpt/tests/html-longdesc/external-image-with-absolute-base-external-description-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/external-image-with-absolute-base-external-description-manual.html rename to tests/wpt/tests/html-longdesc/external-image-with-absolute-base-external-description-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/external-image-with-relative-base-external-description-manual.html b/tests/wpt/tests/html-longdesc/external-image-with-relative-base-external-description-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/external-image-with-relative-base-external-description-manual.html rename to tests/wpt/tests/html-longdesc/external-image-with-relative-base-external-description-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/fail-fragment-pointer-manual.html b/tests/wpt/tests/html-longdesc/fail-fragment-pointer-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/fail-fragment-pointer-manual.html rename to tests/wpt/tests/html-longdesc/fail-fragment-pointer-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/fail-fragment.html b/tests/wpt/tests/html-longdesc/fail-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/fail-fragment.html rename to tests/wpt/tests/html-longdesc/fail-fragment.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/fail.html b/tests/wpt/tests/html-longdesc/fail.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/fail.html rename to tests/wpt/tests/html-longdesc/fail.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/iframe-discoverability-manual.html b/tests/wpt/tests/html-longdesc/iframe-discoverability-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/iframe-discoverability-manual.html rename to tests/wpt/tests/html-longdesc/iframe-discoverability-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/invalid-longdesc-manual.html b/tests/wpt/tests/html-longdesc/invalid-longdesc-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/invalid-longdesc-manual.html rename to tests/wpt/tests/html-longdesc/invalid-longdesc-manual.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/pass-fragment.html b/tests/wpt/tests/html-longdesc/pass-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/pass-fragment.html rename to tests/wpt/tests/html-longdesc/pass-fragment.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/pass.html b/tests/wpt/tests/html-longdesc/pass.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/pass.html rename to tests/wpt/tests/html-longdesc/pass.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/picture.png b/tests/wpt/tests/html-longdesc/picture.png similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/picture.png rename to tests/wpt/tests/html-longdesc/picture.png diff --git a/tests/wpt/web-platform-tests/html-longdesc/rebased/fail.html b/tests/wpt/tests/html-longdesc/rebased/fail.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/rebased/fail.html rename to tests/wpt/tests/html-longdesc/rebased/fail.html diff --git a/tests/wpt/web-platform-tests/html-longdesc/rebased/picture2.png b/tests/wpt/tests/html-longdesc/rebased/picture2.png similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/rebased/picture2.png rename to tests/wpt/tests/html-longdesc/rebased/picture2.png diff --git a/tests/wpt/web-platform-tests/html-longdesc/reflected-changing-longdesc-manual.html b/tests/wpt/tests/html-longdesc/reflected-changing-longdesc-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-longdesc/reflected-changing-longdesc-manual.html rename to tests/wpt/tests/html-longdesc/reflected-changing-longdesc-manual.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/META.yml b/tests/wpt/tests/html-media-capture/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/META.yml rename to tests/wpt/tests/html-media-capture/META.yml diff --git a/tests/wpt/web-platform-tests/html-media-capture/capture_audio-manual.html b/tests/wpt/tests/html-media-capture/capture_audio-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/capture_audio-manual.html rename to tests/wpt/tests/html-media-capture/capture_audio-manual.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/capture_audio_cancel-manual.html b/tests/wpt/tests/html-media-capture/capture_audio_cancel-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/capture_audio_cancel-manual.html rename to tests/wpt/tests/html-media-capture/capture_audio_cancel-manual.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/capture_fallback_file_upload-manual.html b/tests/wpt/tests/html-media-capture/capture_fallback_file_upload-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/capture_fallback_file_upload-manual.html rename to tests/wpt/tests/html-media-capture/capture_fallback_file_upload-manual.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/capture_image_cancel-manual.html b/tests/wpt/tests/html-media-capture/capture_image_cancel-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/capture_image_cancel-manual.html rename to tests/wpt/tests/html-media-capture/capture_image_cancel-manual.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/capture_image_environment-manual.html b/tests/wpt/tests/html-media-capture/capture_image_environment-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/capture_image_environment-manual.html rename to tests/wpt/tests/html-media-capture/capture_image_environment-manual.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/capture_image_invalid-manual.html b/tests/wpt/tests/html-media-capture/capture_image_invalid-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/capture_image_invalid-manual.html rename to tests/wpt/tests/html-media-capture/capture_image_invalid-manual.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/capture_image_missing-manual.html b/tests/wpt/tests/html-media-capture/capture_image_missing-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/capture_image_missing-manual.html rename to tests/wpt/tests/html-media-capture/capture_image_missing-manual.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/capture_image_user-manual.html b/tests/wpt/tests/html-media-capture/capture_image_user-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/capture_image_user-manual.html rename to tests/wpt/tests/html-media-capture/capture_image_user-manual.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/capture_reflect.html b/tests/wpt/tests/html-media-capture/capture_reflect.html similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/capture_reflect.html rename to tests/wpt/tests/html-media-capture/capture_reflect.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/capture_video_cancel-manual.html b/tests/wpt/tests/html-media-capture/capture_video_cancel-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/capture_video_cancel-manual.html rename to tests/wpt/tests/html-media-capture/capture_video_cancel-manual.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/capture_video_environment-manual.html b/tests/wpt/tests/html-media-capture/capture_video_environment-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/capture_video_environment-manual.html rename to tests/wpt/tests/html-media-capture/capture_video_environment-manual.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/capture_video_invalid-manual.html b/tests/wpt/tests/html-media-capture/capture_video_invalid-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/capture_video_invalid-manual.html rename to tests/wpt/tests/html-media-capture/capture_video_invalid-manual.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/capture_video_missing-manual.html b/tests/wpt/tests/html-media-capture/capture_video_missing-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/capture_video_missing-manual.html rename to tests/wpt/tests/html-media-capture/capture_video_missing-manual.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/capture_video_user-manual.html b/tests/wpt/tests/html-media-capture/capture_video_user-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/capture_video_user-manual.html rename to tests/wpt/tests/html-media-capture/capture_video_user-manual.html diff --git a/tests/wpt/web-platform-tests/html-media-capture/idlharness.window.js b/tests/wpt/tests/html-media-capture/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/idlharness.window.js rename to tests/wpt/tests/html-media-capture/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/html-media-capture/support/upload.txt b/tests/wpt/tests/html-media-capture/support/upload.txt similarity index 100% rename from tests/wpt/web-platform-tests/html-media-capture/support/upload.txt rename to tests/wpt/tests/html-media-capture/support/upload.txt diff --git a/tests/wpt/web-platform-tests/html/META.yml b/tests/wpt/tests/html/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/META.yml rename to tests/wpt/tests/html/META.yml diff --git a/tests/wpt/web-platform-tests/html/README.md b/tests/wpt/tests/html/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/README.md rename to tests/wpt/tests/html/README.md diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/anonymous-iframe-popup.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/anonymous-iframe-popup.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/anonymous-iframe-popup.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/anonymous-iframe-popup.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/anonymous-window.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/anonymous-window.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/anonymous-window.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/anonymous-window.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/cache-storage.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/cache-storage.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/cache-storage.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/cache-storage.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/cookie-store.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/cookie-store.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/cookie-store.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/cookie-store.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/cookie.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/cookie.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/cookie.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/cookie.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/embedding.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/embedding.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/embedding.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/embedding.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/fenced-frame-bypass.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/fenced-frame-bypass.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/fenced-frame-bypass.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/fenced-frame-bypass.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/fenced-frame.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/fenced-frame.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/fenced-frame.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/fenced-frame.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/indexeddb.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/indexeddb.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/indexeddb.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/indexeddb.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/initial-empty-document.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/initial-empty-document.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/initial-empty-document.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/initial-empty-document.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/local-storage-initial-empty-document.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/local-storage-initial-empty-document.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/local-storage-initial-empty-document.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/local-storage-initial-empty-document.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/local-storage.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/local-storage.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/local-storage.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/local-storage.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/require-corp-embed-anonymous-iframe.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/require-corp-embed-anonymous-iframe.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/require-corp-embed-anonymous-iframe.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/require-corp-embed-anonymous-iframe.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/require-corp-embed-anonymous-iframe.tentative.https.window.js.headers b/tests/wpt/tests/html/anonymous-iframe/require-corp-embed-anonymous-iframe.tentative.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/require-corp-embed-anonymous-iframe.tentative.https.window.js.headers rename to tests/wpt/tests/html/anonymous-iframe/require-corp-embed-anonymous-iframe.tentative.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/resources/common.js b/tests/wpt/tests/html/anonymous-iframe/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/resources/common.js rename to tests/wpt/tests/html/anonymous-iframe/resources/common.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/resources/embedding-test.js b/tests/wpt/tests/html/anonymous-iframe/resources/embedding-test.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/resources/embedding-test.js rename to tests/wpt/tests/html/anonymous-iframe/resources/embedding-test.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/resources/serviceworker-partitioning-helper.js b/tests/wpt/tests/html/anonymous-iframe/resources/serviceworker-partitioning-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/resources/serviceworker-partitioning-helper.js rename to tests/wpt/tests/html/anonymous-iframe/resources/serviceworker-partitioning-helper.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/resources/sharedworker-partitioning-helper.js b/tests/wpt/tests/html/anonymous-iframe/resources/sharedworker-partitioning-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/resources/sharedworker-partitioning-helper.js rename to tests/wpt/tests/html/anonymous-iframe/resources/sharedworker-partitioning-helper.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/serviceworker-partitioning.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/serviceworker-partitioning.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/serviceworker-partitioning.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/serviceworker-partitioning.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/session-storage.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/session-storage.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/session-storage.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/session-storage.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/sharedworker-partitioning.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/sharedworker-partitioning.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/sharedworker-partitioning.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/sharedworker-partitioning.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/web-lock.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/web-lock.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/web-lock.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/web-lock.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/anonymous-iframe/worker-cookies.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/worker-cookies.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/anonymous-iframe/worker-cookies.tentative.https.window.js rename to tests/wpt/tests/html/anonymous-iframe/worker-cookies.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/README.md b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/README.md rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/README.md diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/broadcast-channel.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/broadcast-channel.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/broadcast-channel.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/broadcast-channel.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/dedicated-worker.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/dedicated-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/dedicated-worker.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/dedicated-worker.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-cors.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-cors.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-cors.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-cors.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-redirects.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-redirects.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-redirects.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/inflight-fetch-redirects.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/shared-worker.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/shared-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/shared-worker.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/eligibility/shared-worker.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/events.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/events.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/events.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/focus.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/focus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/focus.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/focus.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/pushstate.https.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/pushstate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/pushstate.https.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/pushstate.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/echo-worker.js b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/echo-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/echo-worker.js rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/echo-worker.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/event-recorder.js b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/event-recorder.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/event-recorder.js rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/event-recorder.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/executor-pushstate.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/executor-pushstate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/executor-pushstate.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/executor-pushstate.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/executor.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/executor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/executor.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/executor.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/executor.js b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/executor.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/executor.js rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/executor.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/helper.sub.js b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/helper.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/helper.sub.js rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/helper.sub.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/inflight-fetch-helper.js b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/inflight-fetch-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/inflight-fetch-helper.js rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/inflight-fetch-helper.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/service-worker.js b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/service-worker.js rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/service-worker.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/slow.py b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/slow.py similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/slow.py rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/slow.py diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/worker-helper.js b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/worker-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/resources/worker-helper.js rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/worker-helper.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-client-postmessage.https.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-client-postmessage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-client-postmessage.https.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-client-postmessage.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-clients-claim.https.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-clients-claim.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-clients-claim.https.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-clients-claim.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-clients-matchall.https.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-clients-matchall.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-clients-matchall.https.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-clients-matchall.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-controlled-after-restore.https.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-controlled-after-restore.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-controlled-after-restore.https.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-controlled-after-restore.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-unregister.https.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-unregister.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-unregister.https.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/service-worker-unregister.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/storage-events.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/storage-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/storage-events.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/storage-events.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/timers.html b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/timers.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/back-forward-cache/timers.html rename to tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/timers.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/001-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/001-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/001-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/001-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/001-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/001-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/001-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/001-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/001.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/001.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/api-availability.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/api-availability.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/api-availability.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/api-availability.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-0.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-0.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-0.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-0.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-3.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-3.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-3.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-4.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-4.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-4.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin-0.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin-0.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin-0.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin-0.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_2.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_3.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_3.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_3.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/document-state.https.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/document-state.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/document-state.https.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/document-state.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-hash-twice.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-hash-twice.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-hash-twice.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-hash-twice.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-hash.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-hash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-hash.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-hash.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-pushState.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-pushState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-pushState.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-pushState.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-replaceState.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-replaceState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-replaceState.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/after-load-replaceState.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-hash-twice.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-hash-twice.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-hash-twice.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-hash-twice.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-hash.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-hash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-hash.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-hash.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-pushState.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-pushState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-pushState.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-pushState.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-replaceState.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-replaceState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-replaceState.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/before-load-replaceState.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/pushState-inside-popstate.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/pushState-inside-popstate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/pushState-inside-popstate.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/pushState-inside-popstate.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/same-document-traverse-immediate.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/same-document-traverse-immediate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/same-document-traverse-immediate.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/same-document-traverse-immediate.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/same-document-traverse-wait.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/same-document-traverse-wait.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/event-order/same-document-traverse-wait.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/event-order/same-document-traverse-wait.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/events.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/events.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/events.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/hashchange_event.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/hashchange_event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/hashchange_event.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/hashchange_event.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/history-traversal-navigate-parent-while-child-loading.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/history-traversal-navigate-parent-while-child-loading.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/history-traversal-navigate-parent-while-child-loading.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/history-traversal-navigate-parent-while-child-loading.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/history-traversal-navigates-multiple-frames.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/history-traversal-navigates-multiple-frames.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/history-traversal-navigates-multiple-frames.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/history-traversal-navigates-multiple-frames.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/blank1.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/blank1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/blank1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/blank1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/blank2.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/blank2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/blank2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/blank2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/page-with-fragment.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/page-with-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/page-with-fragment.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/page-with-fragment.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/post_name_on_load.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/post_name_on_load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/post_name_on_load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resources/post_name_on_load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resume-timer-on-history-back.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resume-timer-on-history-back.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resume-timer-on-history-back.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/resume-timer-on-history-back.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-basic.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-basic.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-basic.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-samedoc.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-samedoc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-samedoc.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-samedoc.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-navigation-cross-origin.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-navigation-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-navigation-cross-origin.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-navigation-cross-origin.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-navigation-samedoc.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-navigation-samedoc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-navigation-samedoc.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-navigation-samedoc.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/popstate_event.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/popstate_event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/popstate_event.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/popstate_event.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/a.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/resources/a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/a.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/resources/a.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/api-availability-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/resources/api-availability-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/api-availability-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/resources/api-availability-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/api-availability-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/resources/api-availability-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/api-availability-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/resources/api-availability-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/b.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/resources/b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/b.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/resources/b.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/c.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/resources/c.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/c.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/resources/c.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/unset_context_name-1.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/resources/unset_context_name-1.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/unset_context_name-1.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/resources/unset_context_name-1.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/unset_context_name_stash.py b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/resources/unset_context_name_stash.py similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/resources/unset_context_name_stash.py rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/resources/unset_context_name_stash.py diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/same-url.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/same-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/same-url.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/same-url.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/scroll-restoration-order.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/scroll-restoration-order.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/scroll-restoration-order.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/scroll-restoration-order.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/srcdoc/srcdoc-history-entries.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/srcdoc/srcdoc-history-entries.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/srcdoc/srcdoc-history-entries.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/srcdoc/srcdoc-history-entries.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/support/window-name-after-cross-origin-main-frame-navigation-popup.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/support/window-name-after-cross-origin-main-frame-navigation-popup.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/support/window-name-after-cross-origin-main-frame-navigation-popup.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/support/window-name-after-cross-origin-main-frame-navigation-popup.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/support/window-name-after-same-origin-main-frame-navigation-1.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/support/window-name-after-same-origin-main-frame-navigation-1.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/support/window-name-after-same-origin-main-frame-navigation-1.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/support/window-name-after-same-origin-main-frame-navigation-1.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/support/window-name-navigation.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/support/window-name-navigation.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/support/window-name-navigation.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/support/window-name-navigation.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/support/window-name-test.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/support/window-name-test.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/support/window-name-test.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/support/window-name-test.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/unset_context_name.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/unset_context_name.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/unset_context_name.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/unset_context_name.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-aux-frame-navigation.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-aux-frame-navigation.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-aux-frame-navigation.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-aux-frame-navigation.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-main-frame-navigation.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-main-frame-navigation.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-main-frame-navigation.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-main-frame-navigation.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-sub-frame-navigation.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-sub-frame-navigation.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-sub-frame-navigation.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-sub-frame-navigation.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/window-name-after-same-origin-aux-frame-navigation.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/window-name-after-same-origin-aux-frame-navigation.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/window-name-after-same-origin-aux-frame-navigation.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/window-name-after-same-origin-aux-frame-navigation.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/window-name-after-same-origin-main-frame-navigation.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/window-name-after-same-origin-main-frame-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/window-name-after-same-origin-main-frame-navigation.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/window-name-after-same-origin-main-frame-navigation.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/window-name-after-same-origin-sub-frame-navigation.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/window-name-after-same-origin-sub-frame-navigation.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/history-traversal/window-name-after-same-origin-sub-frame-navigation.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/window-name-after-same-origin-sub-frame-navigation.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/003-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/003-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/003-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/003-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-3.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/003-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-3.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/003-3.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/003.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/004-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/004-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/004-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/004-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-3.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/004-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-3.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/004-3.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/004.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/005.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/005.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/005.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/006.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/006.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/006.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/007.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/007.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/007.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/008.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/008.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/008.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/009.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/009.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/009.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/010.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/010.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/010.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/011.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/011.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/011.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/011.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/012.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/012.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/012.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/012.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/013.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/013.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/013.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/013.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/014.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/014.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/014.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/014.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/015.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/015.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/015.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/015.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/abort-document-load-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/abort-document-load-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/abort-document-load-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/abort-document-load-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/abort-document-load-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/abort-document-load-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/abort-document-load-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/abort-document-load-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/abort-document-load.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/abort-document-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/abort-document-load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/abort-document-load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/about-srcdoc-navigation-blocked.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/about-srcdoc-navigation-blocked.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/about-srcdoc-navigation-blocked.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/about-srcdoc-navigation-blocked.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-longfragment.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-longfragment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-longfragment.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-longfragment.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-withpath.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-withpath.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-withpath.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-withpath.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-jsurl-form-submit.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-jsurl-form-submit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-jsurl-form-submit.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-jsurl-form-submit.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child-navigates-parent-cross-origin.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/child-navigates-parent-cross-origin.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child-navigates-parent-cross-origin.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/child-navigates-parent-cross-origin.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child-navigates-parent-same-origin.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/child-navigates-parent-same-origin.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child-navigates-parent-same-origin.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/child-navigates-parent-same-origin.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/cross-origin-top-navigation-with-user-activation-in-parent.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/cross-origin-top-navigation-with-user-activation-in-parent.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/cross-origin-top-navigation-with-user-activation-in-parent.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/cross-origin-top-navigation-with-user-activation-in-parent.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/cross-origin-top-navigation-without-user-activation.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/cross-origin-top-navigation-without-user-activation.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/cross-origin-top-navigation-without-user-activation.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/cross-origin-top-navigation-without-user-activation.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/empty-iframe-load-event.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/empty-iframe-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/empty-iframe-load-event.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/empty-iframe-load-event.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/empty_fragment.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/empty_fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/empty_fragment.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/empty_fragment.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/empty_fragment_iframe.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/empty_fragment_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/empty_fragment_iframe.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/empty_fragment_iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-nosrc.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-nosrc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-nosrc.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-nosrc.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204-fragment.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204-fragment.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204-fragment.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204-pushState-replaceState.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204-pushState-replaceState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204-pushState-replaceState.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204-pushState-replaceState.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-204.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-wait-for-load.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-wait-for-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-wait-for-load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-wait-for-load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/initial-content-replacement.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/initial-content-replacement.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/initial-content-replacement.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/initial-content-replacement.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-event-iframe-element.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-event-iframe-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-event-iframe-element.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-event-iframe-element.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/resources/code-injector.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/resources/code-injector.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/resources/code-injector.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/resources/code-injector.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/resources/helpers.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/resources/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/resources/helpers.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/resources/helpers.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-204-fragment.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-204-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-204-fragment.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-204-fragment.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-204-pushState-replaceState.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-204-pushState-replaceState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-204-pushState-replaceState.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-204-pushState-replaceState.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-204.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-204.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-204.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-204.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-aboutblank.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-aboutblank.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-aboutblank.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-aboutblank.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-history-length.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-history-length.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-history-length.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-history-length.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-nourl.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-nourl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-nourl.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/window-open-nourl.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-string.tentative.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-string.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-string.tentative.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-string.tentative.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/support/iframe-and-links.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/support/iframe-and-links.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/support/iframe-and-links.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/support/iframe-and-links.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/support/set-child-loaded.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/support/set-child-loaded.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/support/set-child-loaded.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/support/set-child-loaded.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-global-scope.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-global-scope.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-global-scope.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-global-scope.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-load-as-html.xhtml b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-load-as-html.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-load-as-html.xhtml rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-load-as-html.xhtml diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-no-beforeunload.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-query-fragment-components.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-query-fragment-components.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-query-fragment-components.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-query-fragment-components.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-referrer.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-security-check-failure.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-security-check-failure.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-security-check-failure.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-security-check-failure.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-security-check-multi-globals.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-security-check-multi-globals.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-security-check-multi-globals.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-security-check-multi-globals.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-security-check-same-origin-domain.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-security-check-same-origin-domain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-security-check-same-origin-domain.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-security-check-same-origin-domain.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-task-queuing.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-task-queuing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-task-queuing.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-task-queuing.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-location-assign.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-location-assign.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-location-assign.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-location-assign.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-location-href.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-location-href.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-location-href.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-location-href.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-location.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-location.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-location.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-location.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-window-open.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-window-open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-window-open.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/context-for-window-open.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/entry/entry.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/entry/entry.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/entry/entry.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/entry/entry.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/entry/target.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/entry/target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/entry/target.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/entry/target.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/incumbent/empty.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/incumbent/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/incumbent/empty.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/incumbent/empty.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/incumbent/target.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/incumbent/target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/incumbent/target.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/incumbent/target.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/relevant/empty.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/relevant/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/relevant/empty.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/relevant/empty.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/relevant/target.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/relevant/target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/relevant/target.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/relevant/target.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/resources/context-helper.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/resources/context-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/resources/context-helper.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/resources/context-helper.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/resources/target.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/resources/target.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/resources/target.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/multiple-globals/resources/target.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-cross-origin-iframe-to-same-url-with-fragment-fire-load-event.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-cross-origin-iframe-to-same-url-with-fragment-fire-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-cross-origin-iframe-to-same-url-with-fragment-fire-load-event.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-cross-origin-iframe-to-same-url-with-fragment-fire-load-event.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-cross-origin-iframe-to-same-url-with-fragment.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-cross-origin-iframe-to-same-url-with-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-cross-origin-iframe-to-same-url-with-fragment.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-cross-origin-iframe-to-same-url-with-fragment.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-cross-origin-iframe-to-same-url.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-cross-origin-iframe-to-same-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-cross-origin-iframe-to-same-url.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-cross-origin-iframe-to-same-url.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-to-unparseable-url.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-to-unparseable-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-to-unparseable-url.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigate-to-unparseable-url.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-data-url.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-data-url.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-data-url.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-data-url.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-form-submit-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-form-submit-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-form-submit-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-form-submit-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-form-submit-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-form-submit-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-form-submit-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-form-submit-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-form-submit.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-form-submit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-form-submit.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-form-submit.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-javascript-url.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-javascript-url.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-javascript-url.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-javascript-url.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/plugin-document.historical.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/plugin-document.historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/plugin-document.historical.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/plugin-document.historical.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/redirect-to-about.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/redirect-to-about.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/redirect-to-about.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/redirect-to-about.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/redirect-to-data.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/redirect-to-data.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/redirect-to-data.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/redirect-to-data.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/redirect-to-unparseable-url.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/redirect-to-unparseable-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/redirect-to-unparseable-url.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/redirect-to-unparseable-url.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/README.md b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/README.md rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/README.md diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/multiple.asis b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/multiple.asis similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/multiple.asis rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/multiple.asis diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refresh.py b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refresh.py similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refresh.py rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refresh.py diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refreshed.txt b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refreshed.txt similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refreshed.txt rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refreshed.txt diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/subresource.any.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/subresource.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/subresource.any.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/subresource.any.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click-during-load.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click-during-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click-during-load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click-during-load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click-during-pageshow.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click-during-pageshow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click-during-pageshow.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click-during-pageshow.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-user-click-during-load.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-user-click-during-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-user-click-during-load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-user-click-during-load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-user-click-during-pageshow.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-user-click-during-pageshow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-user-click-during-pageshow.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-user-click-during-pageshow.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-user-click.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-user-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-user-click.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-user-click.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-requestsubmit-during-load.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-requestsubmit-during-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-requestsubmit-during-load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-requestsubmit-during-load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-requestsubmit-during-pageshow.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-requestsubmit-during-pageshow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-requestsubmit-during-pageshow.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-requestsubmit-during-pageshow.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-requestsubmit.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-requestsubmit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-requestsubmit.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-requestsubmit.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click-during-load.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click-during-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click-during-load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click-during-load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click-during-pageshow.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click-during-pageshow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click-during-pageshow.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click-during-pageshow.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-button-click.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-cross-frame-crossorigin.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-cross-frame-crossorigin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-cross-frame-crossorigin.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-cross-frame-crossorigin.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-cross-frame.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-cross-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-cross-frame.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-cross-frame.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-during-load.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-during-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-during-load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-during-load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-during-pageshow.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-during-pageshow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-during-pageshow.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-during-pageshow.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-popup-crossorigin.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-popup-crossorigin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-popup-crossorigin.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-popup-crossorigin.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-popup.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-popup.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit-popup.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/form-submit.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/history-pushstate-during-load.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/history-pushstate-during-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/history-pushstate-during-load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/history-pushstate-during-load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/history-pushstate-during-pageshow.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/history-pushstate-during-pageshow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/history-pushstate-during-pageshow.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/history-pushstate-during-pageshow.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/history-pushstate.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/history-pushstate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/history-pushstate.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/history-pushstate.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/iframe-src-during-load.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/iframe-src-during-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/iframe-src-during-load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/iframe-src-during-load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/iframe-src-during-pageshow.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/iframe-src-during-pageshow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/iframe-src-during-pageshow.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/iframe-src-during-pageshow.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/iframe-src.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/iframe-src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/iframe-src.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/iframe-src.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign-during-load.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign-during-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign-during-load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign-during-load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign-during-pageshow.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign-during-pageshow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign-during-pageshow.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign-during-pageshow.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign-user-click.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign-user-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign-user-click.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign-user-click.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-assign.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-during-load.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-during-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-during-load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-during-load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-during-pageshow.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-during-pageshow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-during-pageshow.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-during-pageshow.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-user-click.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-user-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-user-click.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-user-click.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-user-mouseup.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-user-mouseup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-user-mouseup.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter-user-mouseup.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/location-setter.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/code-injector.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/code-injector.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/code-injector.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/code-injector.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/helpers.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/helpers.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/helpers.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/message-opener.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/message-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/message-opener.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/message-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/slow-code-injector.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/slow-code-injector.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/slow-code-injector.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/slow-code-injector.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/slow-message-source-with-history-and-location.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/slow-message-source-with-history-and-location.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/slow-message-source-with-history-and-location.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/resources/slow-message-source-with-history-and-location.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-popup-during-load.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-popup-during-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-popup-during-load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-popup-during-load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-popup-during-pageshow.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-popup-during-pageshow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-popup-during-pageshow.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-popup-during-pageshow.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-popup.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-popup.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-popup.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-self-during-load.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-self-during-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-self-during-load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-self-during-load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-self-during-pageshow.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-self-during-pageshow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-self-during-pageshow.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-self-during-pageshow.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-self.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-self.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-self.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/window-open-self.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/blank.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/blank.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/blank.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-cross-origin-inner.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-cross-origin-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-cross-origin-inner.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-cross-origin-inner.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-destination.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-destination.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-destination.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-destination.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-location-initial.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-location-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-location-initial.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-location-initial.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-location-inner.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-location-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-location-inner.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-location-inner.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-submit-initial.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-submit-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-submit-initial.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-submit-initial.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-submit-inner.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-submit-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-submit-inner.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/child-navigates-parent-submit-inner.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/click.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/click.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/click.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/document-domain-set-to-site.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/document-domain-set-to-site.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/document-domain-set-to-site.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/document-domain-set-to-site.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/form.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/form.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/form.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/form.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/href.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/href.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/href.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/href.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/message-opener.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/message-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/message-opener.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/message-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/message-parent.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/message-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/message-parent.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/message-parent.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/multi-globals-subframe-1.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/multi-globals-subframe-1.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/multi-globals-subframe-1.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/multi-globals-subframe-1.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/multi-globals-subframe-2.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/multi-globals-subframe-2.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/multi-globals-subframe-2.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/multi-globals-subframe-2.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/no-cache-single-redirect.py b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/no-cache-single-redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/no-cache-single-redirect.py rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/no-cache-single-redirect.py diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/page-that-post-message-to-opener.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/page-that-post-message-to-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/page-that-post-message-to-opener.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/page-that-post-message-to-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/page-with-top-navigating-iframe.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/page-with-top-navigating-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/page-with-top-navigating-iframe.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/page-with-top-navigating-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/portable-document-format-sample-valid.pdf b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/portable-document-format-sample-valid.pdf similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/portable-document-format-sample-valid.pdf rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/portable-document-format-sample-valid.pdf diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/portable-document-format-sample-valid.pdf.headers b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/portable-document-format-sample-valid.pdf.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/portable-document-format-sample-valid.pdf.headers rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/portable-document-format-sample-valid.pdf.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/redirect.py b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/redirect.py rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/redirect.py diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/top-navigating-page.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/top-navigating-page.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/top-navigating-page.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/top-navigating-page.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/wait-for-messages.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/wait-for-messages.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/wait-for-messages.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/wait-for-messages.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/xhtml-and-non-utf-8.xhtml b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/xhtml-and-non-utf-8.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/resources/xhtml-and-non-utf-8.xhtml rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/resources/xhtml-and-non-utf-8.xhtml diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-parent-then-fragment.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-parent-then-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-parent-then-fragment.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-parent-then-fragment.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-parent.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-parent.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-parent.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-src.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-src.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-src.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-src-about-blank.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-src-about-blank.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-src-about-blank.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-src-about-blank.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/support/dummy.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/support/dummy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/support/dummy.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/support/dummy.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/support/location-set.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/support/location-set.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/support/location-set.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/support/location-set.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/support/set-parent-src.html b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/support/set-parent-src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/support/set-parent-src.html rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/source/support/set-parent-src.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/top-level-data-url.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/top-level-data-url.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/top-level-data-url.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/navigating-across-documents/top-level-data-url.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/README.md b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/README.md rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/README.md diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/anchor-fragment-history-back-on-click.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/anchor-fragment-history-back-on-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/anchor-fragment-history-back-on-click.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/anchor-fragment-history-back-on-click.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-cross-document-nav.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-cross-document-nav.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-cross-document-nav.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-cross-document-nav.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-cross-document-traversal.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-cross-document-traversal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-cross-document-traversal.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-cross-document-traversal.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-same-document-nav.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-same-document-nav.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-same-document-nav.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-same-document-nav.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-same-document-traversal.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-same-document-traversal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-same-document-traversal.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-same-document-traversal.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-stop.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-stop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-stop.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-nav-stop.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-cross-document-nav.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-cross-document-nav.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-cross-document-nav.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-cross-document-nav.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-cross-document-traversal.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-cross-document-traversal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-cross-document-traversal.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-cross-document-traversal.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-same-document-nav.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-same-document-nav.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-same-document-nav.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-same-document-nav.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-same-document-traversal.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-same-document-traversal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-same-document-traversal.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-same-document-traversal.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-stop.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-stop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-stop.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/cross-document-traversal-stop.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/forward-to-pruned-entry.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/forward-to-pruned-entry.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/forward-to-pruned-entry.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/forward-to-pruned-entry.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/resources/helpers.mjs b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/resources/helpers.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/resources/helpers.mjs rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/resources/helpers.mjs diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/resources/nav-cancelation-2-helper.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/resources/nav-cancelation-2-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/resources/nav-cancelation-2-helper.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/resources/nav-cancelation-2-helper.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/resources/slow.py b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/resources/slow.py similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/resources/slow.py rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/resources/slow.py diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-cross-document-nav.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-cross-document-nav.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-cross-document-nav.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-cross-document-nav.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-cross-document-traversal.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-cross-document-traversal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-cross-document-traversal.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-cross-document-traversal.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-same-document-nav.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-same-document-nav.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-same-document-nav.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-same-document-nav.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-same-document-traversal.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-same-document-traversal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-same-document-traversal.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-same-document-traversal.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-stop.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-stop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-stop.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-nav-stop.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-cross-document-nav.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-cross-document-nav.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-cross-document-nav.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-cross-document-nav.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-cross-document-traversal.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-cross-document-traversal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-cross-document-traversal.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-cross-document-traversal.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-same-document-nav.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-same-document-nav.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-same-document-nav.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-same-document-nav.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-same-document-traversal-hashchange.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-same-document-traversal-hashchange.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-same-document-traversal-hashchange.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-same-document-traversal-hashchange.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-same-document-traversal-pushstate.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-same-document-traversal-pushstate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-same-document-traversal-pushstate.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-same-document-traversal-pushstate.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-stop.html b/tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-stop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-stop.html rename to tests/wpt/tests/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-stop.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/cross-origin-video.html b/tests/wpt/tests/html/browsers/browsing-the-web/read-media/cross-origin-video.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/cross-origin-video.html rename to tests/wpt/tests/html/browsers/browsing-the-web/read-media/cross-origin-video.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image-in-popup.html b/tests/wpt/tests/html/browsers/browsing-the-web/read-media/pageload-image-in-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image-in-popup.html rename to tests/wpt/tests/html/browsers/browsing-the-web/read-media/pageload-image-in-popup.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image.html b/tests/wpt/tests/html/browsers/browsing-the-web/read-media/pageload-image.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image.html rename to tests/wpt/tests/html/browsers/browsing-the-web/read-media/pageload-image.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video.html b/tests/wpt/tests/html/browsers/browsing-the-web/read-media/pageload-video.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video.html rename to tests/wpt/tests/html/browsers/browsing-the-web/read-media/pageload-video.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/resources/iframe-document.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/read-media/resources/iframe-document.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/resources/iframe-document.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/read-media/resources/iframe-document.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-text/load-text-plain.html b/tests/wpt/tests/html/browsers/browsing-the-web/read-text/load-text-plain.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-text/load-text-plain.html rename to tests/wpt/tests/html/browsers/browsing-the-web/read-text/load-text-plain.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addHTML.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addHTML.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addHTML.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addHTML.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addIframe.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addIframe.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addIframe.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addIframe.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addScripts.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addScripts.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addScripts.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addScripts.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-defaults.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-defaults.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-defaults.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-defaults.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-extra-config.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-extra-config.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-extra-config.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-extra-config.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-features.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-features.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-features.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-features.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-invalid-origin.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-invalid-origin.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-invalid-origin.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-invalid-origin.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-startOn.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-startOn.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-startOn.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-startOn.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-target.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-target.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-target.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWindow-target.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWorker.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWorker.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWorker.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/addWorker.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/constructor.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/constructor.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/constructor.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/constructor.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/createContext-bad-executorCreator.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/createContext-bad-executorCreator.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/createContext-bad-executorCreator.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/createContext-bad-executorCreator.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigateToNew.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigateToNew.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigateToNew.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigateToNew.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigation-bfcache.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigation-bfcache.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigation-bfcache.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigation-bfcache.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigation-helpers.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigation-helpers.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigation-helpers.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigation-helpers.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigation-same-document.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigation-same-document.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigation-same-document.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/navigation-same-document.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/resources/test-helper.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/resources/test-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/resources/test-helper.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/resources/test-helper.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/resources/test-script.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/resources/test-script.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/resources/test-script.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/resources/test-script.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/resources/test-script2.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/resources/test-script2.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper-tests/resources/test-script2.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/resources/test-script2.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-common.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-common.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-common.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-worker.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-worker.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-worker.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor.sub.html rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js rename to tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/resources/has-iframe.html b/tests/wpt/tests/html/browsers/browsing-the-web/resources/has-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/resources/has-iframe.html rename to tests/wpt/tests/html/browsers/browsing-the-web/resources/has-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/resources/helpers.js b/tests/wpt/tests/html/browsers/browsing-the-web/resources/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/resources/helpers.js rename to tests/wpt/tests/html/browsers/browsing-the-web/resources/helpers.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/resources/post-top-opener-on-load.html b/tests/wpt/tests/html/browsers/browsing-the-web/resources/post-top-opener-on-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/resources/post-top-opener-on-load.html rename to tests/wpt/tests/html/browsers/browsing-the-web/resources/post-top-opener-on-load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/001.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/001.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/002.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/002.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/002.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/003.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/003.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/003.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/004.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/004.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/004.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/005.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/005.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/005.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/006.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/006.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/006.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/007.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/007.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/007.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/forward-triggers-hashchange.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/forward-triggers-hashchange.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/forward-triggers-hashchange.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/forward-triggers-hashchange.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/navigate-helpers.js b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/navigate-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/navigate-helpers.js rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/navigate-helpers.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/replacement-enabled.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/replacement-enabled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/replacement-enabled.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/replacement-enabled.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-frag-non-utf8-encoded-document.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-frag-non-utf8-encoded-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-frag-non-utf8-encoded-document.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-frag-non-utf8-encoded-document.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-frag-percent-encoded.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-frag-percent-encoded.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-frag-percent-encoded.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-frag-percent-encoded.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-position-vertical-lr.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-position-vertical-lr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-position-vertical-lr.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-position-vertical-lr.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-position-vertical-rl.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-position-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-position-vertical-rl.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-position-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-position.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-position.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-position.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-position.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-anchor-name.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-anchor-name.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-anchor-name.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-anchor-name.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-id-top.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-id-top.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-id-top.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-id-top.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-top.html b/tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-top.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-top.html rename to tests/wpt/tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-top.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/001.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/001.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/002.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/002.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/002.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/003.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/003.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/003.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/004.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/004.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/004.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/005.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/005.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/005.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/base.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/base.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/base.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/base.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-canceling-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-canceling-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-canceling-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-canceling-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-canceling.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-canceling.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-canceling.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-canceling.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-iframe.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-iframe.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-manual.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-manual.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-popup.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-popup.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-popup.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-synchronous.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-synchronous.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-synchronous.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-synchronous.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt-and-unload-script-closeable.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt-and-unload-script-closeable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt-and-unload-script-closeable.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt-and-unload-script-closeable.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt-and-unload-script-uncloseable-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt-and-unload-script-uncloseable-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt-and-unload-script-uncloseable-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt-and-unload-script-uncloseable-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt-and-unload-script-uncloseable.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt-and-unload-script-uncloseable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt-and-unload-script-uncloseable.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt-and-unload-script-uncloseable.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/001.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/001.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/002-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/002-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/002-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/002-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/002.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/002.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/002.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/003.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/003.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/003.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/004-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/004-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/004-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/004-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/004-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/004-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/004-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/004-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/004.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/004.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/004.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-001.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-001.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-002.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-002.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-002.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-003.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-003.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-003.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-004.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-004.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-004.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-005.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-005.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-005.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-006.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-006.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-006.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/next.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/next.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/next.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/prompt/next.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/001-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/001-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/001-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/001-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/001a.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/001a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/001a.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/001a.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/001b.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/001b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/001b.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/001b.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/002-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/002-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/002-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/002-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/002a.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/002a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/002a.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/002a.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/002b.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/002b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/002b.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/002b.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/003-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/003-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/003-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/003-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/003a.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/003a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/003a.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/003a.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/003b.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/003b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/003b.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/003b.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/004-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/004-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/004-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/004-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/004a.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/004a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/004a.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/004a.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/004b.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/004b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/004b.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/004b.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/005-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/005-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/005-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/005-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/005a.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/005a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/005a.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/005a.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/005b.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/005b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/005b.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/005b.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-destination.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-destination.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-destination.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-destination.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-start.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-start.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-start.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-start.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/001-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/001-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/001-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/001-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/001-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/001-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/001-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/001-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/001.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/001.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/002-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/002-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/002-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/002-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/002.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/002.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/002.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/003-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/003-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/003-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/003-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/003.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/003.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/003.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/004-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/004-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/004-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/004-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/004.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/004.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/004.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/006-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/006-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/006-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/006-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/006-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/006-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/006-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/006-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/006.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/006.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/006.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/007-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/007-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-2.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/007-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-2.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/007-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/007.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/008-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/008-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/008-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/008-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/008.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/008.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/008.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/009-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/009-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/009-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/009-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/009.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/009.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/009.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/pagehide-manual-1.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/pagehide-manual-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/pagehide-manual-1.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/pagehide-manual-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/pagehide-manual.html b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/pagehide-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/pagehide-manual.html rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/pagehide-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/unload-main-frame-cross-origin.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/unload-main-frame-cross-origin.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/unload-main-frame-cross-origin.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/unload-main-frame-cross-origin.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/unload-main-frame-same-origin.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/unload-main-frame-same-origin.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/unload-main-frame-same-origin.window.js rename to tests/wpt/tests/html/browsers/browsing-the-web/unloading-documents/unload/unload-main-frame-same-origin.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-child1.html b/tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-child1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-child1.html rename to tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-child1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-child2.html b/tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-child2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-child2.html rename to tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-child2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-filler.html b/tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-filler.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-filler.html rename to tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-filler.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-grandchild1.html b/tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-grandchild1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-grandchild1.html rename to tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-grandchild1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-grandchild2.html b/tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-grandchild2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-grandchild2.html rename to tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-grandchild2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-iframe-state.html b/tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-iframe-state.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-iframe-state.html rename to tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-iframe-state.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html b/tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html rename to tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-remove-iframe.html b/tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-remove-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-remove-iframe.html rename to tests/wpt/tests/html/browsers/history/joint-session-history/joint-session-history-remove-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/001.html b/tests/wpt/tests/html/browsers/history/the-history-interface/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/001.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/002.html b/tests/wpt/tests/html/browsers/history/the-history-interface/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/002.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/002.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/004.html b/tests/wpt/tests/html/browsers/history/the-history-interface/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/004.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/004.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/005.html b/tests/wpt/tests/html/browsers/history/the-history-interface/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/005.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/005.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/006.html b/tests/wpt/tests/html/browsers/history/the-history-interface/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/006.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/006.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/007.html b/tests/wpt/tests/html/browsers/history/the-history-interface/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/007.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/007.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/008.html b/tests/wpt/tests/html/browsers/history/the-history-interface/008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/008.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/008.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/008.js b/tests/wpt/tests/html/browsers/history/the-history-interface/008.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/008.js rename to tests/wpt/tests/html/browsers/history/the-history-interface/008.js diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/009-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/009-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/009-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/009-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/009-3.html b/tests/wpt/tests/html/browsers/history/the-history-interface/009-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/009-3.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/009-3.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/009-5.html b/tests/wpt/tests/html/browsers/history/the-history-interface/009-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/009-5.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/009-5.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/009.html b/tests/wpt/tests/html/browsers/history/the-history-interface/009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/009.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/009.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/010-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/010-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/010-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/010-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/010-3.html b/tests/wpt/tests/html/browsers/history/the-history-interface/010-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/010-3.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/010-3.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/010-5.html b/tests/wpt/tests/html/browsers/history/the-history-interface/010-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/010-5.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/010-5.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/010.html b/tests/wpt/tests/html/browsers/history/the-history-interface/010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/010.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/010.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/011.html b/tests/wpt/tests/html/browsers/history/the-history-interface/011.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/011.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/011.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/012.html b/tests/wpt/tests/html/browsers/history/the-history-interface/012.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/012.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/012.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/blank-new.html b/tests/wpt/tests/html/browsers/history/the-history-interface/blank-new.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/blank-new.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/blank-new.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/blank-old.html b/tests/wpt/tests/html/browsers/history/the-history-interface/blank-old.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/blank-old.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/blank-old.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/blank.html b/tests/wpt/tests/html/browsers/history/the-history-interface/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/blank.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/blank.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/blank2.html b/tests/wpt/tests/html/browsers/history/the-history-interface/blank2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/blank2.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/blank2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/blank3.html b/tests/wpt/tests/html/browsers/history/the-history-interface/blank3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/blank3.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/blank3.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/combination_history_001.html b/tests/wpt/tests/html/browsers/history/the-history-interface/combination_history_001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/combination_history_001.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/combination_history_001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/combination_history_002.html b/tests/wpt/tests/html/browsers/history/the-history-interface/combination_history_002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/combination_history_002.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/combination_history_002.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/combination_history_003.html b/tests/wpt/tests/html/browsers/history/the-history-interface/combination_history_003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/combination_history_003.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/combination_history_003.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/combination_history_004.html b/tests/wpt/tests/html/browsers/history/the-history-interface/combination_history_004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/combination_history_004.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/combination_history_004.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/combination_history_005.html b/tests/wpt/tests/html/browsers/history/the-history-interface/combination_history_005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/combination_history_005.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/combination_history_005.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/combination_history_006.html b/tests/wpt/tests/html/browsers/history/the-history-interface/combination_history_006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/combination_history_006.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/combination_history_006.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/combination_history_007.html b/tests/wpt/tests/html/browsers/history/the-history-interface/combination_history_007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/combination_history_007.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/combination_history_007.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history-associated-with-document.window.js b/tests/wpt/tests/html/browsers/history/the-history-interface/history-associated-with-document.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history-associated-with-document.window.js rename to tests/wpt/tests/html/browsers/history/the-history-interface/history-associated-with-document.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history-state-after-bfcache.window.js b/tests/wpt/tests/html/browsers/history/the-history-interface/history-state-after-bfcache.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history-state-after-bfcache.window.js rename to tests/wpt/tests/html/browsers/history/the-history-interface/history-state-after-bfcache.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history.js b/tests/wpt/tests/html/browsers/history/the-history-interface/history.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history.js rename to tests/wpt/tests/html/browsers/history/the-history-interface/history.js diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_back-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_back-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_back-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_back-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_back.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_back.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_back.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_back.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_back_1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_back_1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_back_1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_back_1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_back_cross_realm_method.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_back_cross_realm_method.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_back_cross_realm_method.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_back_cross_realm_method.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_entry.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_entry.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_entry.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_entry.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_forward-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_forward-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_forward-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_forward-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_forward-2.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_forward-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_forward-2.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_forward-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_forward.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_forward.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_forward.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_forward.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_forward_1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_forward_1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_forward_1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_forward_1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_forward_cross_realm_method.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_forward_cross_realm_method.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_forward_cross_realm_method.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_forward_cross_realm_method.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_cross_realm_method.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_go_cross_realm_method.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_cross_realm_method.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_go_cross_realm_method.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_minus.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_go_minus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_minus.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_go_minus.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_no_argument-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_go_no_argument-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_no_argument-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_go_no_argument-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_no_argument.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_go_no_argument.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_no_argument.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_go_no_argument.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_plus.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_go_plus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_plus.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_go_plus.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_to_uri-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_go_to_uri-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_to_uri-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_go_to_uri-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_to_uri.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_go_to_uri.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_to_uri.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_go_to_uri.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_undefined-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_go_undefined-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_undefined-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_go_undefined-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_undefined.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_go_undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_undefined.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_go_undefined.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_zero-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_go_zero-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_zero-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_go_zero-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_zero.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_go_zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_zero.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_go_zero.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_zero_which_document.window.js b/tests/wpt/tests/html/browsers/history/the-history-interface/history_go_zero_which_document.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_go_zero_which_document.window.js rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_go_zero_which_document.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_properties_only_fully_active.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_properties_only_fully_active.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_properties_only_fully_active.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_properties_only_fully_active.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_pushstate.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_pushstate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_pushstate.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_pushstate.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_pushstate_err.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_pushstate_err.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_pushstate_err.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_pushstate_err.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_pushstate_nooptionalparam.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_pushstate_nooptionalparam.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_pushstate_nooptionalparam.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_pushstate_nooptionalparam.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_pushstate_url.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_pushstate_url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_pushstate_url.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_pushstate_url.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_pushstate_url_rewriting.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_pushstate_url_rewriting.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_pushstate_url_rewriting.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_pushstate_url_rewriting.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_replacestate.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_replacestate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_replacestate.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_replacestate.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_replacestate_err.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_replacestate_err.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_replacestate_err.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_replacestate_err.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_replacestate_nooptionalparam.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_replacestate_nooptionalparam.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_replacestate_nooptionalparam.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_replacestate_nooptionalparam.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_state.html b/tests/wpt/tests/html/browsers/history/the-history-interface/history_state.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_state.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/history_state.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/iframe_history_go_0.html b/tests/wpt/tests/html/browsers/history/the-history-interface/iframe_history_go_0.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/iframe_history_go_0.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/iframe_history_go_0.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/001-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/joint_session_history/001-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/001-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/joint_session_history/001-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/001.html b/tests/wpt/tests/html/browsers/history/the-history-interface/joint_session_history/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/001.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/joint_session_history/001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/002-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/joint_session_history/002-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/002-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/joint_session_history/002-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/002.html b/tests/wpt/tests/html/browsers/history/the-history-interface/joint_session_history/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/002.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/joint_session_history/002.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/filler.html b/tests/wpt/tests/html/browsers/history/the-history-interface/joint_session_history/filler.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/filler.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/joint_session_history/filler.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/history.js b/tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/history.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/history.js rename to tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/history.js diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/history_entry.html b/tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/history_entry.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/history_entry.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/history_entry.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-manual.html b/tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-manual.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_2-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_2-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_2-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_2-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_2-manual.html b/tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_2-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_2-manual.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_2-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/traverse_the_session_history_unload_prompt_1-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/traverse_the_session_history_unload_prompt_1-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/traverse_the_session_history_unload_prompt_1-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/traverse_the_session_history_unload_prompt_1-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/traverse_the_session_history_unload_prompt_1-manual.html b/tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/traverse_the_session_history_unload_prompt_1-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/non-automated/traverse_the_session_history_unload_prompt_1-manual.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/non-automated/traverse_the_session_history_unload_prompt_1-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/pushstate-base.html b/tests/wpt/tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/pushstate-base.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/pushstate-base.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/pushstate-base.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/pushstate-whitespace.html b/tests/wpt/tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/pushstate-whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/pushstate-whitespace.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/pushstate-whitespace.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/pushstate.html b/tests/wpt/tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/pushstate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/pushstate.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/pushstate.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/replacestate-base.html b/tests/wpt/tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/replacestate-base.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/replacestate-base.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/replacestate-base.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/replacestate-whitespace.html b/tests/wpt/tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/replacestate-whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/replacestate-whitespace.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/replacestate-whitespace.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/replacestate.html b/tests/wpt/tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/replacestate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/replacestate.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/pushstate-replacestate-empty-string/replacestate.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/resources/message-opener.sub.html b/tests/wpt/tests/html/browsers/history/the-history-interface/resources/message-opener.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/resources/message-opener.sub.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/resources/message-opener.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/resources/traverse-during-beforeunload.html b/tests/wpt/tests/html/browsers/history/the-history-interface/resources/traverse-during-beforeunload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/resources/traverse-during-beforeunload.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/resources/traverse-during-beforeunload.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/resources/traverse-during-unload.html b/tests/wpt/tests/html/browsers/history/the-history-interface/resources/traverse-during-unload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/resources/traverse-during-unload.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/resources/traverse-during-unload.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/resources/url-rewriting-helper.html b/tests/wpt/tests/html/browsers/history/the-history-interface/resources/url-rewriting-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/resources/url-rewriting-helper.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/resources/url-rewriting-helper.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse-during-beforeunload.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse-during-beforeunload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse-during-beforeunload.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse-during-beforeunload.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse-during-unload.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse-during-unload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse-during-unload.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse-during-unload.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_1-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_1-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_1-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_1-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_2-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_2-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_2-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_2-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_2.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_2.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_3-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_3-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_3-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_3-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_3.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_3.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_3.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_4-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_4-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_4-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_4-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_4.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_4.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_4.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_5-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_5-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_5-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_5-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_5.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_5.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_5.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_unload_1-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_unload_1-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_unload_1-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_unload_1-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_unload_1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_unload_1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_unload_1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_unload_1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_2-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_2-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_2-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_2-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_2.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_2.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2-1.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2-1.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2.html b/tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2.html rename to tests/wpt/tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/allow_prototype_cycle_through_location.sub.html b/tests/wpt/tests/html/browsers/history/the-location-interface/allow_prototype_cycle_through_location.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/allow_prototype_cycle_through_location.sub.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/allow_prototype_cycle_through_location.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/assign_after_load-1.html b/tests/wpt/tests/html/browsers/history/the-location-interface/assign_after_load-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/assign_after_load-1.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/assign_after_load-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/assign_after_load-2.html b/tests/wpt/tests/html/browsers/history/the-location-interface/assign_after_load-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/assign_after_load-2.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/assign_after_load-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/assign_after_load.html b/tests/wpt/tests/html/browsers/history/the-location-interface/assign_after_load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/assign_after_load.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/assign_after_load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/assign_before_load-1.html b/tests/wpt/tests/html/browsers/history/the-location-interface/assign_before_load-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/assign_before_load-1.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/assign_before_load-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/assign_before_load-2.html b/tests/wpt/tests/html/browsers/history/the-location-interface/assign_before_load-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/assign_before_load-2.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/assign_before_load-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/assign_before_load.html b/tests/wpt/tests/html/browsers/history/the-location-interface/assign_before_load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/assign_before_load.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/assign_before_load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/cross_origin_joined_frame.sub.html b/tests/wpt/tests/html/browsers/history/the-location-interface/cross_origin_joined_frame.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/cross_origin_joined_frame.sub.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/cross_origin_joined_frame.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/document_location.html b/tests/wpt/tests/html/browsers/history/the-location-interface/document_location.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/document_location.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/document_location.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-non-configurable-toString-valueOf.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-non-configurable-toString-valueOf.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-non-configurable-toString-valueOf.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-non-configurable-toString-valueOf.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-origin-idna.sub.window.js b/tests/wpt/tests/html/browsers/history/the-location-interface/location-origin-idna.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-origin-idna.sub.window.js rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-origin-idna.sub.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-pathname-setter-question-mark.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-pathname-setter-question-mark.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-pathname-setter-question-mark.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-pathname-setter-question-mark.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prevent-extensions.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-prevent-extensions.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prevent-extensions.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-prevent-extensions.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-protocol-setter-sameish.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-protocol-setter-sameish.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-protocol-setter-sameish.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-protocol-setter-sameish.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-protocol-setter-with-colon.sub.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-protocol-setter-with-colon.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-protocol-setter-with-colon.sub.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-protocol-setter-with-colon.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-protocol-setter.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-protocol-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-protocol-setter.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-protocol-setter.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-no-toString-valueOf.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-prototype-no-toString-valueOf.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-no-toString-valueOf.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-prototype-no-toString-valueOf.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin-domain.sub.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin-domain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin-domain.sub.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin-domain.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin.sub.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin.sub.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-setting-goes-cross-origin-domain.sub.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-prototype-setting-goes-cross-origin-domain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-setting-goes-cross-origin-domain.sub.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-prototype-setting-goes-cross-origin-domain.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-setting-same-origin-domain.sub.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-prototype-setting-same-origin-domain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-setting-same-origin-domain.sub.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-prototype-setting-same-origin-domain.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-setting-same-origin.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-prototype-setting-same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-prototype-setting-same-origin.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-prototype-setting-same-origin.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-stringifier.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-stringifier.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-stringifier.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-stringifier.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-symbol-toprimitive.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-symbol-toprimitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-symbol-toprimitive.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-symbol-toprimitive.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-tojson.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-tojson.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-tojson.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-tojson.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-valueof.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location-valueof.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location-valueof.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location-valueof.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_assign.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_assign.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_assign.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_assign.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_assign_about_blank-1.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_assign_about_blank-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_assign_about_blank-1.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_assign_about_blank-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_assign_about_blank.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_assign_about_blank.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_assign_about_blank.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_assign_about_blank.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_hash.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_hash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_hash.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_hash.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_host.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_host.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_host.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_host.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_hostname.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_hostname.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_hostname.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_hostname.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_href.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_href.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_href.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_href.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_origin.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_origin.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_origin.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_pathname.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_pathname.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_pathname.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_pathname.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_port.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_port.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_port.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_port.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_protocol.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_protocol.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_protocol.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_protocol.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_reload-iframe.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_reload-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_reload-iframe.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_reload-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_reload.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_reload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_reload.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_reload.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_reload_javascript_url.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_reload_javascript_url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_reload_javascript_url.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_reload_javascript_url.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_replace.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_replace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_replace.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_replace.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_search.html b/tests/wpt/tests/html/browsers/history/the-location-interface/location_search.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/location_search.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/location_search.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/no-browsing-context.window.js b/tests/wpt/tests/html/browsers/history/the-location-interface/no-browsing-context.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/no-browsing-context.window.js rename to tests/wpt/tests/html/browsers/history/the-location-interface/no-browsing-context.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-1.html b/tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-1.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-2.html b/tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-2.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-manual.html b/tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-manual.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-1.html b/tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-1.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-2.html b/tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-2.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-manual.html b/tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-manual.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_click_replace_during_load-manual.html b/tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_click_replace_during_load-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_click_replace_during_load-manual.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_click_replace_during_load-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-1.html b/tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-1.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-2.html b/tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-2.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-manual.html b/tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-manual.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/reload_in_resize-1.html b/tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/reload_in_resize-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/reload_in_resize-1.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/reload_in_resize-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/reload_in_resize-manual.html b/tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/reload_in_resize-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/non-automated/reload_in_resize-manual.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/non-automated/reload_in_resize-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/per-global.window.js b/tests/wpt/tests/html/browsers/history/the-location-interface/per-global.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/per-global.window.js rename to tests/wpt/tests/html/browsers/history/the-location-interface/per-global.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/reload_document_open_write-1.html b/tests/wpt/tests/html/browsers/history/the-location-interface/reload_document_open_write-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/reload_document_open_write-1.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/reload_document_open_write-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/reload_document_open_write.html b/tests/wpt/tests/html/browsers/history/the-location-interface/reload_document_open_write.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/reload_document_open_write.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/reload_document_open_write.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/reload_document_write-1.html b/tests/wpt/tests/html/browsers/history/the-location-interface/reload_document_write-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/reload_document_write-1.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/reload_document_write-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/reload_document_write.html b/tests/wpt/tests/html/browsers/history/the-location-interface/reload_document_write.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/reload_document_write.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/reload_document_write.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/reload_document_write_onload-1.html b/tests/wpt/tests/html/browsers/history/the-location-interface/reload_document_write_onload-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/reload_document_write_onload-1.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/reload_document_write_onload-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/reload_document_write_onload.html b/tests/wpt/tests/html/browsers/history/the-location-interface/reload_document_write_onload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/reload_document_write_onload.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/reload_document_write_onload.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/reload_post_1-manual.html b/tests/wpt/tests/html/browsers/history/the-location-interface/reload_post_1-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/reload_post_1-manual.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/reload_post_1-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/resources/post-your-origin.html b/tests/wpt/tests/html/browsers/history/the-location-interface/resources/post-your-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/resources/post-your-origin.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/resources/post-your-origin.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/resources/post-your-protocol.html b/tests/wpt/tests/html/browsers/history/the-location-interface/resources/post-your-protocol.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/resources/post-your-protocol.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/resources/post-your-protocol.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/resources/reload_post_1-1.py b/tests/wpt/tests/html/browsers/history/the-location-interface/resources/reload_post_1-1.py similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/resources/reload_post_1-1.py rename to tests/wpt/tests/html/browsers/history/the-location-interface/resources/reload_post_1-1.py diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/same-hash.html b/tests/wpt/tests/html/browsers/history/the-location-interface/same-hash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/same-hash.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/same-hash.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/same_origin_frame.html b/tests/wpt/tests/html/browsers/history/the-location-interface/same_origin_frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/same_origin_frame.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/same_origin_frame.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load-1.html b/tests/wpt/tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load-1.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load-2.html b/tests/wpt/tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load-2.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html b/tests/wpt/tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load-1.html b/tests/wpt/tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load-1.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load-2.html b/tests/wpt/tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load-2.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load.html b/tests/wpt/tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load-1.html b/tests/wpt/tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load-1.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load-2.html b/tests/wpt/tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load-2.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html b/tests/wpt/tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html rename to tests/wpt/tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/security_location_0.htm b/tests/wpt/tests/html/browsers/history/the-location-interface/security_location_0.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-location-interface/security_location_0.htm rename to tests/wpt/tests/html/browsers/history/the-location-interface/security_location_0.htm diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload.html b/tests/wpt/tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload.html rename to tests/wpt/tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-1.html b/tests/wpt/tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-1.html rename to tests/wpt/tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-2.html b/tests/wpt/tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-2.html rename to tests/wpt/tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-dynamic-iframe.html b/tests/wpt/tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-dynamic-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-dynamic-iframe.html rename to tests/wpt/tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-dynamic-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-iframe.html b/tests/wpt/tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-iframe.html rename to tests/wpt/tests/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload_form-submission-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/application-cache-api/api_status_checking-manual.html b/tests/wpt/tests/html/browsers/offline/application-cache-api/api_status_checking-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/application-cache-api/api_status_checking-manual.html rename to tests/wpt/tests/html/browsers/offline/application-cache-api/api_status_checking-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/application-cache-api/api_status_downloading-manual.html b/tests/wpt/tests/html/browsers/offline/application-cache-api/api_status_downloading-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/application-cache-api/api_status_downloading-manual.html rename to tests/wpt/tests/html/browsers/offline/application-cache-api/api_status_downloading-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/application-cache-api/api_status_obsolete-manual.html b/tests/wpt/tests/html/browsers/offline/application-cache-api/api_status_obsolete-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/application-cache-api/api_status_obsolete-manual.html rename to tests/wpt/tests/html/browsers/offline/application-cache-api/api_status_obsolete-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/application-cache-api/api_status_updateready-manual.html b/tests/wpt/tests/html/browsers/offline/application-cache-api/api_status_updateready-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/application-cache-api/api_status_updateready-manual.html rename to tests/wpt/tests/html/browsers/offline/application-cache-api/api_status_updateready-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/application-cache-api/api_swapcache-manual.html b/tests/wpt/tests/html/browsers/offline/application-cache-api/api_swapcache-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/application-cache-api/api_swapcache-manual.html rename to tests/wpt/tests/html/browsers/offline/application-cache-api/api_swapcache-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/browser-state/navigator_online_event-manual.https.html b/tests/wpt/tests/html/browsers/offline/browser-state/navigator_online_event-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/browser-state/navigator_online_event-manual.https.html rename to tests/wpt/tests/html/browsers/offline/browser-state/navigator_online_event-manual.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/browser-state/navigator_online_online.https.html b/tests/wpt/tests/html/browsers/offline/browser-state/navigator_online_online.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/browser-state/navigator_online_online.https.html rename to tests/wpt/tests/html/browsers/offline/browser-state/navigator_online_online.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/changestonetworkingmodel/original-id.json b/tests/wpt/tests/html/browsers/offline/changestonetworkingmodel/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/changestonetworkingmodel/original-id.json rename to tests/wpt/tests/html/browsers/offline/changestonetworkingmodel/original-id.json diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/introduction-4/event_downloading-manual.html b/tests/wpt/tests/html/browsers/offline/introduction-4/event_downloading-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/introduction-4/event_downloading-manual.html rename to tests/wpt/tests/html/browsers/offline/introduction-4/event_downloading-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/introduction-4/event_error-manual.html b/tests/wpt/tests/html/browsers/offline/introduction-4/event_error-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/introduction-4/event_error-manual.html rename to tests/wpt/tests/html/browsers/offline/introduction-4/event_error-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/introduction-4/event_obsolete-manual.html b/tests/wpt/tests/html/browsers/offline/introduction-4/event_obsolete-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/introduction-4/event_obsolete-manual.html rename to tests/wpt/tests/html/browsers/offline/introduction-4/event_obsolete-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/introduction-4/event_updateready-manual.html b/tests/wpt/tests/html/browsers/offline/introduction-4/event_updateready-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/introduction-4/event_updateready-manual.html rename to tests/wpt/tests/html/browsers/offline/introduction-4/event_updateready-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/introduction-4/event_updateready_swapcache-manual.html b/tests/wpt/tests/html/browsers/offline/introduction-4/event_updateready_swapcache-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/introduction-4/event_updateready_swapcache-manual.html rename to tests/wpt/tests/html/browsers/offline/introduction-4/event_updateready_swapcache-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/manifest_main_empty-manual.https.html b/tests/wpt/tests/html/browsers/offline/manifest_main_empty-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/manifest_main_empty-manual.https.html rename to tests/wpt/tests/html/browsers/offline/manifest_main_empty-manual.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/manifest_notchanged_online-manual.https.html b/tests/wpt/tests/html/browsers/offline/manifest_notchanged_online-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/manifest_notchanged_online-manual.https.html rename to tests/wpt/tests/html/browsers/offline/manifest_notchanged_online-manual.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/manifest_section_empty-manual.https.html b/tests/wpt/tests/html/browsers/offline/manifest_section_empty-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/manifest_section_empty-manual.https.html rename to tests/wpt/tests/html/browsers/offline/manifest_section_empty-manual.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/manifest_section_many-manual.https.html b/tests/wpt/tests/html/browsers/offline/manifest_section_many-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/manifest_section_many-manual.https.html rename to tests/wpt/tests/html/browsers/offline/manifest_section_many-manual.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/resources/css/clock.css b/tests/wpt/tests/html/browsers/offline/resources/css/clock.css similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/resources/css/clock.css rename to tests/wpt/tests/html/browsers/offline/resources/css/clock.css diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/resources/css/offline.css b/tests/wpt/tests/html/browsers/offline/resources/css/offline.css similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/resources/css/offline.css rename to tests/wpt/tests/html/browsers/offline/resources/css/offline.css diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/resources/css/online.css b/tests/wpt/tests/html/browsers/offline/resources/css/online.css similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/resources/css/online.css rename to tests/wpt/tests/html/browsers/offline/resources/css/online.css diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/resources/css/result.css b/tests/wpt/tests/html/browsers/offline/resources/css/result.css similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/resources/css/result.css rename to tests/wpt/tests/html/browsers/offline/resources/css/result.css diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/resources/html/clock.html b/tests/wpt/tests/html/browsers/offline/resources/html/clock.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/resources/html/clock.html rename to tests/wpt/tests/html/browsers/offline/resources/html/clock.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/resources/js/clock.js b/tests/wpt/tests/html/browsers/offline/resources/js/clock.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/resources/js/clock.js rename to tests/wpt/tests/html/browsers/offline/resources/js/clock.js diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/resources/manifest/clock.manifest b/tests/wpt/tests/html/browsers/offline/resources/manifest/clock.manifest similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/resources/manifest/clock.manifest rename to tests/wpt/tests/html/browsers/offline/resources/manifest/clock.manifest diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/resources/manifest/section_empty.manifest b/tests/wpt/tests/html/browsers/offline/resources/manifest/section_empty.manifest similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/resources/manifest/section_empty.manifest rename to tests/wpt/tests/html/browsers/offline/resources/manifest/section_empty.manifest diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/resources/manifest/section_many.manifest b/tests/wpt/tests/html/browsers/offline/resources/manifest/section_many.manifest similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/resources/manifest/section_many.manifest rename to tests/wpt/tests/html/browsers/offline/resources/manifest/section_many.manifest diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/resources/manifest/url_check.manifest b/tests/wpt/tests/html/browsers/offline/resources/manifest/url_check.manifest similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/resources/manifest/url_check.manifest rename to tests/wpt/tests/html/browsers/offline/resources/manifest/url_check.manifest diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/section_network_offline-manual.https.html b/tests/wpt/tests/html/browsers/offline/section_network_offline-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/section_network_offline-manual.https.html rename to tests/wpt/tests/html/browsers/offline/section_network_offline-manual.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/offline/section_network_online-manual.https.html b/tests/wpt/tests/html/browsers/offline/section_network_online-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/offline/section_network_online-manual.https.html rename to tests/wpt/tests/html/browsers/offline/section_network_online-manual.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-due-to-document-domain-only.html b/tests/wpt/tests/html/browsers/origin/cross-origin-objects/cross-origin-due-to-document-domain-only.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-due-to-document-domain-only.html rename to tests/wpt/tests/html/browsers/origin/cross-origin-objects/cross-origin-due-to-document-domain-only.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-caching.html b/tests/wpt/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-caching.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-caching.html rename to tests/wpt/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-caching.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-common.js b/tests/wpt/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-common.js rename to tests/wpt/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-common.js diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-length.html b/tests/wpt/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-length.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-length.html rename to tests/wpt/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-length.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-name.html b/tests/wpt/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-name.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-name.html rename to tests/wpt/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-function-name.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html b/tests/wpt/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html rename to tests/wpt/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html b/tests/wpt/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html rename to tests/wpt/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/frame-with-then.html b/tests/wpt/tests/html/browsers/origin/cross-origin-objects/frame-with-then.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/frame-with-then.html rename to tests/wpt/tests/html/browsers/origin/cross-origin-objects/frame-with-then.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/frame.html b/tests/wpt/tests/html/browsers/origin/cross-origin-objects/frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/frame.html rename to tests/wpt/tests/html/browsers/origin/cross-origin-objects/frame.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/location-properties-smoke-test.html b/tests/wpt/tests/html/browsers/origin/cross-origin-objects/location-properties-smoke-test.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/location-properties-smoke-test.html rename to tests/wpt/tests/html/browsers/origin/cross-origin-objects/location-properties-smoke-test.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/resources/cross-origin-due-to-document-domain-only-helper.html b/tests/wpt/tests/html/browsers/origin/cross-origin-objects/resources/cross-origin-due-to-document-domain-only-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/resources/cross-origin-due-to-document-domain-only-helper.html rename to tests/wpt/tests/html/browsers/origin/cross-origin-objects/resources/cross-origin-due-to-document-domain-only-helper.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/win-documentdomain.sub.html b/tests/wpt/tests/html/browsers/origin/cross-origin-objects/win-documentdomain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/win-documentdomain.sub.html rename to tests/wpt/tests/html/browsers/origin/cross-origin-objects/win-documentdomain.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/window-location-and-location-href-cross-realm-set.html b/tests/wpt/tests/html/browsers/origin/cross-origin-objects/window-location-and-location-href-cross-realm-set.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/window-location-and-location-href-cross-realm-set.html rename to tests/wpt/tests/html/browsers/origin/cross-origin-objects/window-location-and-location-href-cross-realm-set.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/inheritance/about-blank-iframe.html b/tests/wpt/tests/html/browsers/origin/inheritance/about-blank-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/inheritance/about-blank-iframe.html rename to tests/wpt/tests/html/browsers/origin/inheritance/about-blank-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/inheritance/about-blank-window.html b/tests/wpt/tests/html/browsers/origin/inheritance/about-blank-window.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/inheritance/about-blank-window.html rename to tests/wpt/tests/html/browsers/origin/inheritance/about-blank-window.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/inheritance/about-srcdoc.html b/tests/wpt/tests/html/browsers/origin/inheritance/about-srcdoc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/inheritance/about-srcdoc.html rename to tests/wpt/tests/html/browsers/origin/inheritance/about-srcdoc.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/inheritance/document-write.https.window.js b/tests/wpt/tests/html/browsers/origin/inheritance/document-write.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/inheritance/document-write.https.window.js rename to tests/wpt/tests/html/browsers/origin/inheritance/document-write.https.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/inheritance/document-write.https.window.js.headers b/tests/wpt/tests/html/browsers/origin/inheritance/document-write.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/inheritance/document-write.https.window.js.headers rename to tests/wpt/tests/html/browsers/origin/inheritance/document-write.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/inheritance/javascript-url.html b/tests/wpt/tests/html/browsers/origin/inheritance/javascript-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/inheritance/javascript-url.html rename to tests/wpt/tests/html/browsers/origin/inheritance/javascript-url.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/inheritance/resources/document-write.html b/tests/wpt/tests/html/browsers/origin/inheritance/resources/document-write.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/inheritance/resources/document-write.html rename to tests/wpt/tests/html/browsers/origin/inheritance/resources/document-write.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/inheritance/resources/document-write.html.headers b/tests/wpt/tests/html/browsers/origin/inheritance/resources/document-write.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/inheritance/resources/document-write.html.headers rename to tests/wpt/tests/html/browsers/origin/inheritance/resources/document-write.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/inheritance/resources/iframe-with-about-blank-iframe.html b/tests/wpt/tests/html/browsers/origin/inheritance/resources/iframe-with-about-blank-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/inheritance/resources/iframe-with-about-blank-iframe.html rename to tests/wpt/tests/html/browsers/origin/inheritance/resources/iframe-with-about-blank-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/inheritance/resources/iframe-with-about-blank-iframe.html.headers b/tests/wpt/tests/html/browsers/origin/inheritance/resources/iframe-with-about-blank-iframe.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/inheritance/resources/iframe-with-about-blank-iframe.html.headers rename to tests/wpt/tests/html/browsers/origin/inheritance/resources/iframe-with-about-blank-iframe.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-bad-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-port.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-same.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain-with-redirect.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-subdomain.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-port.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/META.yml b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/META.yml rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/META.yml diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/README.md b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/README.md rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/README.md diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/about-blank.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/cross-origin-isolated.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/cross-origin-isolated.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/cross-origin-isolated.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/cross-origin-isolated.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/cross-origin-isolated.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/cross-origin-isolated.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/cross-origin-isolated.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/cross-origin-isolated.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-to-javascript-test.mjs b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-to-javascript-test.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-to-javascript-test.mjs rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-to-javascript-test.mjs diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-url-test.mjs b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-url-test.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-url-test.mjs rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-url-test.mjs diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/helpers.mjs b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/helpers.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/helpers.mjs rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/helpers.mjs diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/javascript-url-test.mjs b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/javascript-url-test.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/javascript-url-test.mjs rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/javascript-url-test.mjs diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/sandboxed-same-origin-iframe-test.sub.mjs b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/sandboxed-same-origin-iframe-test.sub.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/sandboxed-same-origin-iframe-test.sub.mjs rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/sandboxed-same-origin-iframe-test.sub.mjs diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-no.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups-crash.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups-crash.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups-crash.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/regression-1399759.https.sub.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/regression-1399759.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/regression-1399759.https.sub.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/regression-1399759.https.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/README.md b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/README.md rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/README.md diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/coep-frame.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/coep-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/coep-frame.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/coep-frame.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/coep-frame.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/coep-frame.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/coep-frame.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/coep-frame.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-header-page-script.mjs b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-header-page-script.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-header-page-script.mjs rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-header-page-script.mjs diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-header-page-script.mjs.headers b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-header-page-script.mjs.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-header-page-script.mjs.headers rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-header-page-script.mjs.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-oac-header.py b/tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-oac-header.py similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-oac-header.py rename to tests/wpt/tests/html/browsers/origin/origin-keyed-agent-clusters/resources/send-oac-header.py diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-of-data-document.html b/tests/wpt/tests/html/browsers/origin/origin-of-data-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/origin-of-data-document.html rename to tests/wpt/tests/html/browsers/origin/origin-of-data-document.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain.html b/tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain.html rename to tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_access_details.sub.html b/tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_access_details.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_access_details.sub.html rename to tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_access_details.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter.html b/tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter.html rename to tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter_srcdoc.html b/tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter_srcdoc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter_srcdoc.html rename to tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter_srcdoc.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/sandboxed-document_domain.html b/tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/sandboxed-document_domain.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/sandboxed-document_domain.html rename to tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/sandboxed-document_domain.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/sandboxed-document_domain.html.headers b/tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/sandboxed-document_domain.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/sandboxed-document_domain.html.headers rename to tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/sandboxed-document_domain.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_frame.html b/tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_frame.html rename to tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_frame.html diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_frame.sub.js b/tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_frame.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_frame.sub.js rename to tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_frame.sub.js diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_setter_iframe.html b/tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_setter_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_setter_iframe.html rename to tests/wpt/tests/html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_setter_iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/inner-iframe.html b/tests/wpt/tests/html/browsers/sandboxing/inner-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/inner-iframe.html rename to tests/wpt/tests/html/browsers/sandboxing/inner-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/noscript-iframe.html b/tests/wpt/tests/html/browsers/sandboxing/noscript-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/noscript-iframe.html rename to tests/wpt/tests/html/browsers/sandboxing/noscript-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/popup-from-initial-empty-sandboxed-document.window.js b/tests/wpt/tests/html/browsers/sandboxing/popup-from-initial-empty-sandboxed-document.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/popup-from-initial-empty-sandboxed-document.window.js rename to tests/wpt/tests/html/browsers/sandboxing/popup-from-initial-empty-sandboxed-document.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/check-sandbox-flags.html b/tests/wpt/tests/html/browsers/sandboxing/resources/check-sandbox-flags.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/check-sandbox-flags.html rename to tests/wpt/tests/html/browsers/sandboxing/resources/check-sandbox-flags.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/document-open.html b/tests/wpt/tests/html/browsers/sandboxing/resources/document-open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/document-open.html rename to tests/wpt/tests/html/browsers/sandboxing/resources/document-open.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/execute-postmessage.html b/tests/wpt/tests/html/browsers/sandboxing/resources/execute-postmessage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/execute-postmessage.html rename to tests/wpt/tests/html/browsers/sandboxing/resources/execute-postmessage.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/post-done-to-opener.html b/tests/wpt/tests/html/browsers/sandboxing/resources/post-done-to-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/post-done-to-opener.html rename to tests/wpt/tests/html/browsers/sandboxing/resources/post-done-to-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/sandbox-inherited-from-initiator-response-helper.html b/tests/wpt/tests/html/browsers/sandboxing/resources/sandbox-inherited-from-initiator-response-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/sandbox-inherited-from-initiator-response-helper.html rename to tests/wpt/tests/html/browsers/sandboxing/resources/sandbox-inherited-from-initiator-response-helper.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/sandbox-inherited-from-initiator-response-helper.html.headers b/tests/wpt/tests/html/browsers/sandboxing/resources/sandbox-inherited-from-initiator-response-helper.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/sandbox-inherited-from-initiator-response-helper.html.headers rename to tests/wpt/tests/html/browsers/sandboxing/resources/sandbox-inherited-from-initiator-response-helper.html.headers diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/sandbox-javascript-window-open.html b/tests/wpt/tests/html/browsers/sandboxing/resources/sandbox-javascript-window-open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/sandbox-javascript-window-open.html rename to tests/wpt/tests/html/browsers/sandboxing/resources/sandbox-javascript-window-open.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-allow-same-origin.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-allow-same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-allow-same-origin.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-allow-same-origin.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-allow-scripts.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-allow-scripts.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-allow-scripts.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-allow-scripts.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-disallow-popups.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-disallow-popups.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-disallow-popups.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-disallow-popups.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-disallow-same-origin.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-disallow-same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-disallow-same-origin.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-disallow-same-origin.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-disallow-scripts-via-unsandboxed-popup.tentative.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-disallow-scripts-via-unsandboxed-popup.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-disallow-scripts-via-unsandboxed-popup.tentative.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-disallow-scripts-via-unsandboxed-popup.tentative.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-disallow-scripts.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-disallow-scripts.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-disallow-scripts.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-disallow-scripts.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-document-open-mutation.window.js b/tests/wpt/tests/html/browsers/sandboxing/sandbox-document-open-mutation.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-document-open-mutation.window.js rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-document-open-mutation.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-document-open.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-document-open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-document-open.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-document-open.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-inherited-from-initiator-frame.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-inherited-from-initiator-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-inherited-from-initiator-frame.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-inherited-from-initiator-frame.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-inherited-from-initiator-response.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-inherited-from-initiator-response.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-inherited-from-initiator-response.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-inherited-from-initiator-response.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-inherited-from-required-csp.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-inherited-from-required-csp.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-inherited-from-required-csp.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-inherited-from-required-csp.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-initial-empty-document-toward-same-origin.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-initial-empty-document-toward-same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-initial-empty-document-toward-same-origin.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-initial-empty-document-toward-same-origin.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-javascript-window-open.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-javascript-window-open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-javascript-window-open.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-javascript-window-open.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-navigation-timing-iframe.tentative.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-navigation-timing-iframe.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-navigation-timing-iframe.tentative.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-navigation-timing-iframe.tentative.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-navigation-timing.tentative.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-navigation-timing.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-navigation-timing.tentative.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-navigation-timing.tentative.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-new-execution-context-iframe.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-new-execution-context-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-new-execution-context-iframe.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-new-execution-context-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-new-execution-context.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-new-execution-context.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-new-execution-context.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-new-execution-context.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-parse-noscript-ref.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-parse-noscript-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-parse-noscript-ref.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-parse-noscript-ref.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-parse-noscript.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-parse-noscript.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-parse-noscript.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-parse-noscript.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-window-open-srcdoc.html b/tests/wpt/tests/html/browsers/sandboxing/sandbox-window-open-srcdoc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-window-open-srcdoc.html rename to tests/wpt/tests/html/browsers/sandboxing/sandbox-window-open-srcdoc.html diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/window-open-blank-from-different-initiator.html b/tests/wpt/tests/html/browsers/sandboxing/window-open-blank-from-different-initiator.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/sandboxing/window-open-blank-from-different-initiator.html rename to tests/wpt/tests/html/browsers/sandboxing/window-open-blank-from-different-initiator.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/BarProp.window.js b/tests/wpt/tests/html/browsers/the-window-object/BarProp.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/BarProp.window.js rename to tests/wpt/tests/html/browsers/the-window-object/BarProp.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/Document-defaultView.html b/tests/wpt/tests/html/browsers/the-window-object/Document-defaultView.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/Document-defaultView.html rename to tests/wpt/tests/html/browsers/the-window-object/Document-defaultView.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/Window-document.html b/tests/wpt/tests/html/browsers/the-window-object/Window-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/Window-document.html rename to tests/wpt/tests/html/browsers/the-window-object/Window-document.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-01.html b/tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-01.html rename to tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-01.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-02.html b/tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-02.html rename to tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-02.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-03.html b/tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-03.html rename to tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-03.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/iterator.html b/tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/iterator.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/iterator.html rename to tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/iterator.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test1.html b/tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test1.html rename to tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test2.html b/tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test2.html rename to tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test3.html b/tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test3.html rename to tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test3.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/window_length.html b/tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/window_length.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/window_length.html rename to tests/wpt/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/window_length.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/close-method.window.js b/tests/wpt/tests/html/browsers/the-window-object/close-method.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/close-method.window.js rename to tests/wpt/tests/html/browsers/the-window-object/close-method.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/closed-attribute.window.js b/tests/wpt/tests/html/browsers/the-window-object/closed-attribute.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/closed-attribute.window.js rename to tests/wpt/tests/html/browsers/the-window-object/closed-attribute.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/defaultstatus.html b/tests/wpt/tests/html/browsers/the-window-object/defaultstatus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/defaultstatus.html rename to tests/wpt/tests/html/browsers/the-window-object/defaultstatus.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/document-attribute.window.js b/tests/wpt/tests/html/browsers/the-window-object/document-attribute.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/document-attribute.window.js rename to tests/wpt/tests/html/browsers/the-window-object/document-attribute.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/focus.window.js b/tests/wpt/tests/html/browsers/the-window-object/focus.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/focus.window.js rename to tests/wpt/tests/html/browsers/the-window-object/focus.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1-1.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1-1.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1-2.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1-2.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2-1.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2-1.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-1.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-1.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-2.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-2.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-3.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-3.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-3.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-1.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-1.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-2.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-2.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-3.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-3.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-3.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-1.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-1.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-2.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-2.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-manual.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-manual.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-1.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-1.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-2.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-2.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-3.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-3.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-3.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-manual.html b/tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-manual.html rename to tests/wpt/tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/historical.window.js b/tests/wpt/tests/html/browsers/the-window-object/historical.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/historical.window.js rename to tests/wpt/tests/html/browsers/the-window-object/historical.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/length-attribute.window.js b/tests/wpt/tests/html/browsers/the-window-object/length-attribute.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/length-attribute.window.js rename to tests/wpt/tests/html/browsers/the-window-object/length-attribute.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/name-attribute.window.js b/tests/wpt/tests/html/browsers/the-window-object/name-attribute.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/name-attribute.window.js rename to tests/wpt/tests/html/browsers/the-window-object/name-attribute.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/cross-global-npo.html b/tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/cross-global-npo.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/cross-global-npo.html rename to tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/cross-global-npo.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/cross-global-support.html b/tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/cross-global-support.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/cross-global-support.html rename to tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/cross-global-support.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/named-objects.html b/tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/named-objects.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/named-objects.html rename to tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/named-objects.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/navigated-named-objects.window.js b/tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/navigated-named-objects.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/navigated-named-objects.window.js rename to tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/navigated-named-objects.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/prototype.html b/tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/prototype.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/prototype.html rename to tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/prototype.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/strict-mode-redefine-readonly-property.html b/tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/strict-mode-redefine-readonly-property.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/strict-mode-redefine-readonly-property.html rename to tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/strict-mode-redefine-readonly-property.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/test.html b/tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/test.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/test.html rename to tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/test.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/window-named-properties.html b/tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/window-named-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/window-named-properties.html rename to tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/window-named-properties.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/window-null-names.html b/tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/window-null-names.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/window-null-names.html rename to tests/wpt/tests/html/browsers/the-window-object/named-access-on-the-window-object/window-null-names.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/navigate-to-about-blank-while-initial-load-pending.html b/tests/wpt/tests/html/browsers/the-window-object/navigate-to-about-blank-while-initial-load-pending.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/navigate-to-about-blank-while-initial-load-pending.html rename to tests/wpt/tests/html/browsers/the-window-object/navigate-to-about-blank-while-initial-load-pending.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/noopener-noreferrer-BarProp.window.js b/tests/wpt/tests/html/browsers/the-window-object/noopener-noreferrer-BarProp.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/noopener-noreferrer-BarProp.window.js rename to tests/wpt/tests/html/browsers/the-window-object/noopener-noreferrer-BarProp.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/noopener-noreferrer-sizing.window.js b/tests/wpt/tests/html/browsers/the-window-object/noopener-noreferrer-sizing.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/noopener-noreferrer-sizing.window.js rename to tests/wpt/tests/html/browsers/the-window-object/noopener-noreferrer-sizing.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/callback.js b/tests/wpt/tests/html/browsers/the-window-object/open-close/callback.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/callback.js rename to tests/wpt/tests/html/browsers/the-window-object/open-close/callback.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/close_beforeunload-1.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/close_beforeunload-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/close_beforeunload-1.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/close_beforeunload-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/close_beforeunload.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/close_beforeunload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/close_beforeunload.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/close_beforeunload.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/close_script_defer-1.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/close_script_defer-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/close_script_defer-1.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/close_script_defer-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/close_script_defer.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/close_script_defer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/close_script_defer.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/close_script_defer.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/close_unload-1.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/close_unload-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/close_unload-1.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/close_unload-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/close_unload.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/close_unload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/close_unload.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/close_unload.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/no_window_open_when_term_nesting_level_nonzero.window.js b/tests/wpt/tests/html/browsers/the-window-object/open-close/no_window_open_when_term_nesting_level_nonzero.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/no_window_open_when_term_nesting_level_nonzero.window.js rename to tests/wpt/tests/html/browsers/the-window-object/open-close/no_window_open_when_term_nesting_level_nonzero.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/non_automated/001-1.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/non_automated/001-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/non_automated/001-1.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/non_automated/001-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/non_automated/001-2.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/non_automated/001-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/non_automated/001-2.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/non_automated/001-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/non_automated/001.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/non_automated/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/non_automated/001.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/non_automated/001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/non_automated/002-1.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/non_automated/002-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/non_automated/002-1.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/non_automated/002-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/non_automated/002-2.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/non_automated/002-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/non_automated/002-2.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/non_automated/002-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/non_automated/002.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/non_automated/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/non_automated/002.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/non_automated/002.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-is-popup-condition.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-is-popup-condition.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-is-popup-condition.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-is-popup-condition.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-negative-innerwidth-innerheight.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-negative-innerwidth-innerheight.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-negative-innerwidth-innerheight.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-negative-innerwidth-innerheight.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-negative-screenx-screeny.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-negative-screenx-screeny.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-negative-screenx-screeny.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-negative-screenx-screeny.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-negative-top-left.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-negative-top-left.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-negative-top-left.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-negative-top-left.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-negative-width-height.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-negative-width-height.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-negative-width-height.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-negative-width-height.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-height.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-height.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-height.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-height.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-innerheight.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-innerheight.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-innerheight.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-innerheight.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-innerwidth.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-innerwidth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-innerwidth.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-innerwidth.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-left.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-left.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-left.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-left.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-screenx.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-screenx.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-screenx.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-screenx.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-screeny.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-screeny.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-screeny.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-screeny.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-top.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-top.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-top.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-top.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-width.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-width.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-non-integer-width.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-non-integer-width.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-tokenization-innerheight-innerwidth.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-tokenization-innerheight-innerwidth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-tokenization-innerheight-innerwidth.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-tokenization-innerheight-innerwidth.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-tokenization-noopener.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-tokenization-noopener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-tokenization-noopener.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-tokenization-noopener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-tokenization-noreferrer.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-tokenization-noreferrer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-tokenization-noreferrer.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-tokenization-noreferrer.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-tokenization-screenx-screeny.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-tokenization-screenx-screeny.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-tokenization-screenx-screeny.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-tokenization-screenx-screeny.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-tokenization-top-left.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-tokenization-top-left.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-tokenization-top-left.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-tokenization-top-left.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-tokenization-width-height.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-tokenization-width-height.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/open-features-tokenization-width-height.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/open-features-tokenization-width-height.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/resources/close-self.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/resources/close-self.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/resources/close-self.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/resources/close-self.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/resources/is-popup-barprop.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/resources/is-popup-barprop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/resources/is-popup-barprop.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/resources/is-popup-barprop.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/resources/message-opener.html b/tests/wpt/tests/html/browsers/the-window-object/open-close/resources/message-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/resources/message-opener.html rename to tests/wpt/tests/html/browsers/the-window-object/open-close/resources/message-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/resources/tokenization-noopener-noreferrer.js b/tests/wpt/tests/html/browsers/the-window-object/open-close/resources/tokenization-noopener-noreferrer.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/open-close/resources/tokenization-noopener-noreferrer.js rename to tests/wpt/tests/html/browsers/the-window-object/open-close/resources/tokenization-noopener-noreferrer.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/proxy-getOwnPropertyDescriptor.html b/tests/wpt/tests/html/browsers/the-window-object/proxy-getOwnPropertyDescriptor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/proxy-getOwnPropertyDescriptor.html rename to tests/wpt/tests/html/browsers/the-window-object/proxy-getOwnPropertyDescriptor.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/security-window/window-security.https.html b/tests/wpt/tests/html/browsers/the-window-object/security-window/window-security.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/security-window/window-security.https.html rename to tests/wpt/tests/html/browsers/the-window-object/security-window/window-security.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/self-et-al.window.js b/tests/wpt/tests/html/browsers/the-window-object/self-et-al.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/self-et-al.window.js rename to tests/wpt/tests/html/browsers/the-window-object/self-et-al.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/support/BarProp-target.html b/tests/wpt/tests/html/browsers/the-window-object/support/BarProp-target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/support/BarProp-target.html rename to tests/wpt/tests/html/browsers/the-window-object/support/BarProp-target.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/support/closed.html b/tests/wpt/tests/html/browsers/the-window-object/support/closed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/support/closed.html rename to tests/wpt/tests/html/browsers/the-window-object/support/closed.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/support/noopener-target.html b/tests/wpt/tests/html/browsers/the-window-object/support/noopener-target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/support/noopener-target.html rename to tests/wpt/tests/html/browsers/the-window-object/support/noopener-target.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/support/noreferrer-target.html b/tests/wpt/tests/html/browsers/the-window-object/support/noreferrer-target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/support/noreferrer-target.html rename to tests/wpt/tests/html/browsers/the-window-object/support/noreferrer-target.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/support/same-origin-iframe.html b/tests/wpt/tests/html/browsers/the-window-object/support/same-origin-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/support/same-origin-iframe.html rename to tests/wpt/tests/html/browsers/the-window-object/support/same-origin-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/support/sizing-target.html b/tests/wpt/tests/html/browsers/the-window-object/support/sizing-target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/support/sizing-target.html rename to tests/wpt/tests/html/browsers/the-window-object/support/sizing-target.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/support/window-open-popup-target.html b/tests/wpt/tests/html/browsers/the-window-object/support/window-open-popup-target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/support/window-open-popup-target.html rename to tests/wpt/tests/html/browsers/the-window-object/support/window-open-popup-target.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/support/windowFeature-values-target.html b/tests/wpt/tests/html/browsers/the-window-object/support/windowFeature-values-target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/support/windowFeature-values-target.html rename to tests/wpt/tests/html/browsers/the-window-object/support/windowFeature-values-target.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-aliases.html b/tests/wpt/tests/html/browsers/the-window-object/window-aliases.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-aliases.html rename to tests/wpt/tests/html/browsers/the-window-object/window-aliases.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-indexed-access-vs-named-access.html b/tests/wpt/tests/html/browsers/the-window-object/window-indexed-access-vs-named-access.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-indexed-access-vs-named-access.html rename to tests/wpt/tests/html/browsers/the-window-object/window-indexed-access-vs-named-access.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-indexed-properties-delete-no-cache.html b/tests/wpt/tests/html/browsers/the-window-object/window-indexed-properties-delete-no-cache.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-indexed-properties-delete-no-cache.html rename to tests/wpt/tests/html/browsers/the-window-object/window-indexed-properties-delete-no-cache.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-indexed-properties-strict.html b/tests/wpt/tests/html/browsers/the-window-object/window-indexed-properties-strict.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-indexed-properties-strict.html rename to tests/wpt/tests/html/browsers/the-window-object/window-indexed-properties-strict.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-indexed-properties.html b/tests/wpt/tests/html/browsers/the-window-object/window-indexed-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-indexed-properties.html rename to tests/wpt/tests/html/browsers/the-window-object/window-indexed-properties.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-open-defaults.window.js b/tests/wpt/tests/html/browsers/the-window-object/window-open-defaults.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-open-defaults.window.js rename to tests/wpt/tests/html/browsers/the-window-object/window-open-defaults.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-open-invalid-url.html b/tests/wpt/tests/html/browsers/the-window-object/window-open-invalid-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-open-invalid-url.html rename to tests/wpt/tests/html/browsers/the-window-object/window-open-invalid-url.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-open-noopener.html b/tests/wpt/tests/html/browsers/the-window-object/window-open-noopener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-open-noopener.html rename to tests/wpt/tests/html/browsers/the-window-object/window-open-noopener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-open-noreferrer.html b/tests/wpt/tests/html/browsers/the-window-object/window-open-noreferrer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-open-noreferrer.html rename to tests/wpt/tests/html/browsers/the-window-object/window-open-noreferrer.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-open-popup-behavior.html b/tests/wpt/tests/html/browsers/the-window-object/window-open-popup-behavior.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-open-popup-behavior.html rename to tests/wpt/tests/html/browsers/the-window-object/window-open-popup-behavior.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-open-windowfeatures-values.html b/tests/wpt/tests/html/browsers/the-window-object/window-open-windowfeatures-values.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-open-windowfeatures-values.html rename to tests/wpt/tests/html/browsers/the-window-object/window-open-windowfeatures-values.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-opener-unconfigurable.window.js b/tests/wpt/tests/html/browsers/the-window-object/window-opener-unconfigurable.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-opener-unconfigurable.window.js rename to tests/wpt/tests/html/browsers/the-window-object/window-opener-unconfigurable.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-properties.https.html b/tests/wpt/tests/html/browsers/the-window-object/window-properties.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-properties.https.html rename to tests/wpt/tests/html/browsers/the-window-object/window-properties.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-prototype-chain.html b/tests/wpt/tests/html/browsers/the-window-object/window-prototype-chain.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-prototype-chain.html rename to tests/wpt/tests/html/browsers/the-window-object/window-prototype-chain.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/window-reuse-in-nested-browsing-contexts.tentative.html b/tests/wpt/tests/html/browsers/the-window-object/window-reuse-in-nested-browsing-contexts.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-window-object/window-reuse-in-nested-browsing-contexts.tentative.html rename to tests/wpt/tests/html/browsers/the-window-object/window-reuse-in-nested-browsing-contexts.tentative.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/document-tree-child-browsing-context-name-property-set.sub.html b/tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/document-tree-child-browsing-context-name-property-set.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/document-tree-child-browsing-context-name-property-set.sub.html rename to tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/document-tree-child-browsing-context-name-property-set.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-define-own-property-unforgeable-same-origin.html b/tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/windowproxy-define-own-property-unforgeable-same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-define-own-property-unforgeable-same-origin.html rename to tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/windowproxy-define-own-property-unforgeable-same-origin.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prevent-extensions.html b/tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prevent-extensions.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prevent-extensions.html rename to tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prevent-extensions.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-cross-origin-domain.sub.html b/tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-cross-origin-domain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-cross-origin-domain.sub.html rename to tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-cross-origin-domain.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-cross-origin.sub.html b/tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-cross-origin.sub.html rename to tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-goes-cross-origin-domain.sub.html b/tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-goes-cross-origin-domain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-goes-cross-origin-domain.sub.html rename to tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-goes-cross-origin-domain.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-same-origin-domain.sub.html b/tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-same-origin-domain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-same-origin-domain.sub.html rename to tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-same-origin-domain.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-same-origin.html b/tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-same-origin.html rename to tests/wpt/tests/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-same-origin.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-closed.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/opener-closed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-closed.html rename to tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/opener-closed.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-multiple.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/opener-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-multiple.html rename to tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/opener-multiple.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-noopener.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/opener-noopener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-noopener.html rename to tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/opener-noopener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-noreferrer.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/opener-noreferrer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-noreferrer.html rename to tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/opener-noreferrer.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html rename to tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.window.js b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.window.js rename to tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener.html rename to tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/close-opener.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/resources/close-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/close-opener.html rename to tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/resources/close-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/message-window-opener.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/resources/message-window-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/message-window-opener.html rename to tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/resources/message-window-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/multiple-opener.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/resources/multiple-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/multiple-opener.html rename to tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/resources/multiple-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/no-opener.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/resources/no-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/no-opener.html rename to tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/resources/no-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/open-closer.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/resources/open-closer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/open-closer.html rename to tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/resources/open-closer.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/opener-setter.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/resources/opener-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/opener-setter.html rename to tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/resources/opener-setter.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_blank-001.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_blank-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_blank-001.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_blank-001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_blank-002.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_blank-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_blank-002.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_blank-002.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_blank-003.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_blank-003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_blank-003.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_blank-003.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_parent-001.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_parent-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_parent-001.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_parent-001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_parent-002.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_parent-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_parent-002.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_parent-002.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_parent-003.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_parent-003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_parent-003.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_parent-003.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_parent-004.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_parent-004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_parent-004.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_parent-004.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_self-001.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_self-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_self-001.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_self-001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_self-002.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_self-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_self-002.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_self-002.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_top-001.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_top-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_top-001.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_top-001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_top-002.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_top-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_top-002.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_top-002.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_top-003.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_top-003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-_top-003.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-_top-003.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-default-001.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-default-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-default-001.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-default-001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-default-002.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-default-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-default-002.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-default-002.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-existing-001.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-existing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/choose-existing-001.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/choose-existing-001.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-001-iframe-1.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-001-iframe-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-001-iframe-1.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-001-iframe-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-002-iframe.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-002-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-002-iframe.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-002-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-002-window.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-002-window.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-002-window.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-002-window.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-003-iframe.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-003-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-003-iframe.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-003-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-003-window.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-003-window.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-003-window.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-003-window.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-004-iframe-1.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-004-iframe-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-004-iframe-1.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-004-iframe-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-004-iframe-2.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-004-iframe-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-004-iframe-2.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_parent-004-iframe-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_self-001-iframe.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_self-001-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_self-001-iframe.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_self-001-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_self-002-iframe.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_self-002-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_self-002-iframe.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_self-002-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_top-002-window.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_top-002-window.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_top-002-window.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_top-002-window.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_top-003-iframe-1.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_top-003-iframe-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_top-003-iframe-1.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_top-003-iframe-1.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_top-003-iframe-2.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_top-003-iframe-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-_top-003-iframe-2.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-_top-003-iframe-2.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-default-002-iframe.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-default-002-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-default-002-iframe.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-default-002-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-existing-001-iframe.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-existing-001-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/choose-existing-001-iframe.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/choose-existing-001-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/open-in-_parent.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/open-in-_parent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/open-in-_parent.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/open-in-_parent.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/open-in-_top.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/open-in-_top.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/open-in-_top.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/open-in-_top.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/post-to-opener.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/post-to-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/post-to-opener.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/post-to-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/post-to-top.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/post-to-top.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/post-to-top.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/post-to-top.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/report-has-opener.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/report-has-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/report-has-opener.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/report-has-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/report-is-top.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/report-is-top.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-names/resources/report-is-top.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-names/resources/report-is-top.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-window.html b/tests/wpt/tests/html/browsers/windows/browsing-context-window.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context-window.html rename to tests/wpt/tests/html/browsers/windows/browsing-context-window.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/browsing-context.html b/tests/wpt/tests/html/browsers/windows/browsing-context.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/browsing-context.html rename to tests/wpt/tests/html/browsers/windows/browsing-context.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/clear-window-name.https.html b/tests/wpt/tests/html/browsers/windows/clear-window-name.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/clear-window-name.https.html rename to tests/wpt/tests/html/browsers/windows/clear-window-name.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/dangling-markup-window-name.tentative.html b/tests/wpt/tests/html/browsers/windows/dangling-markup-window-name.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/dangling-markup-window-name.tentative.html rename to tests/wpt/tests/html/browsers/windows/dangling-markup-window-name.tentative.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/document-domain-nested-navigate.window.js b/tests/wpt/tests/html/browsers/windows/document-domain-nested-navigate.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/document-domain-nested-navigate.window.js rename to tests/wpt/tests/html/browsers/windows/document-domain-nested-navigate.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/document-domain-nested-set.window.js b/tests/wpt/tests/html/browsers/windows/document-domain-nested-set.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/document-domain-nested-set.window.js rename to tests/wpt/tests/html/browsers/windows/document-domain-nested-set.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/document-domain-nested.window.js b/tests/wpt/tests/html/browsers/windows/document-domain-nested.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/document-domain-nested.window.js rename to tests/wpt/tests/html/browsers/windows/document-domain-nested.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/document-domain-removed-iframe.html b/tests/wpt/tests/html/browsers/windows/document-domain-removed-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/document-domain-removed-iframe.html rename to tests/wpt/tests/html/browsers/windows/document-domain-removed-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/embedded-opener-a-form.html b/tests/wpt/tests/html/browsers/windows/embedded-opener-a-form.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/embedded-opener-a-form.html rename to tests/wpt/tests/html/browsers/windows/embedded-opener-a-form.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/embedded-opener-remove-frame.html b/tests/wpt/tests/html/browsers/windows/embedded-opener-remove-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/embedded-opener-remove-frame.html rename to tests/wpt/tests/html/browsers/windows/embedded-opener-remove-frame.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/embedded-opener.html b/tests/wpt/tests/html/browsers/windows/embedded-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/embedded-opener.html rename to tests/wpt/tests/html/browsers/windows/embedded-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/iframe-cross-origin-print.sub.html b/tests/wpt/tests/html/browsers/windows/iframe-cross-origin-print.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/iframe-cross-origin-print.sub.html rename to tests/wpt/tests/html/browsers/windows/iframe-cross-origin-print.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/iframe-cross-origin-scaled-print.sub.html b/tests/wpt/tests/html/browsers/windows/iframe-cross-origin-scaled-print.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/iframe-cross-origin-scaled-print.sub.html rename to tests/wpt/tests/html/browsers/windows/iframe-cross-origin-scaled-print.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/iframe-nested-print-ref.html b/tests/wpt/tests/html/browsers/windows/iframe-nested-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/iframe-nested-print-ref.html rename to tests/wpt/tests/html/browsers/windows/iframe-nested-print-ref.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/iframe-nested-print.html b/tests/wpt/tests/html/browsers/windows/iframe-nested-print.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/iframe-nested-print.html rename to tests/wpt/tests/html/browsers/windows/iframe-nested-print.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/iframe-nested-scaled-print-ref.html b/tests/wpt/tests/html/browsers/windows/iframe-nested-scaled-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/iframe-nested-scaled-print-ref.html rename to tests/wpt/tests/html/browsers/windows/iframe-nested-scaled-print-ref.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/frameElement-siblings.sub.html b/tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/frameElement-siblings.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/frameElement-siblings.sub.html rename to tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/frameElement-siblings.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html b/tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html rename to tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js b/tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js rename to tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-nested-frame.html b/tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-nested-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-nested-frame.html rename to tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-nested-frame.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-sibling-accessed.html b/tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-sibling-accessed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-sibling-accessed.html rename to tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-sibling-accessed.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-sibling-accessor.html b/tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-sibling-accessor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-sibling-accessor.html rename to tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-sibling-accessor.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-window-post.html b/tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-window-post.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-window-post.html rename to tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/resources/frameElement-window-post.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/resources/post-to-opener.html b/tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/resources/post-to-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/resources/post-to-opener.html rename to tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/resources/post-to-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/resources/post-to-parent.html b/tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/resources/post-to-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/resources/post-to-parent.html rename to tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/resources/post-to-parent.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/window-parent-null.html b/tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/window-parent-null.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/window-parent-null.html rename to tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/window-parent-null.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/window-parent.html b/tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/window-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/window-parent.html rename to tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/window-parent.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/window-top-null.html b/tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/window-top-null.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/window-top-null.html rename to tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/window-top-null.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/window-top.html b/tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/window-top.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/nested-browsing-contexts/window-top.html rename to tests/wpt/tests/html/browsers/windows/nested-browsing-contexts/window-top.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/noreferrer-cross-origin-close-manual.sub.html b/tests/wpt/tests/html/browsers/windows/noreferrer-cross-origin-close-manual.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/noreferrer-cross-origin-close-manual.sub.html rename to tests/wpt/tests/html/browsers/windows/noreferrer-cross-origin-close-manual.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/noreferrer-cross-origin-manual.html b/tests/wpt/tests/html/browsers/windows/noreferrer-cross-origin-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/noreferrer-cross-origin-manual.html rename to tests/wpt/tests/html/browsers/windows/noreferrer-cross-origin-manual.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/noreferrer-cross-origin-window-name-manual.sub.html b/tests/wpt/tests/html/browsers/windows/noreferrer-cross-origin-window-name-manual.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/noreferrer-cross-origin-window-name-manual.sub.html rename to tests/wpt/tests/html/browsers/windows/noreferrer-cross-origin-window-name-manual.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/noreferrer-null-opener.html b/tests/wpt/tests/html/browsers/windows/noreferrer-null-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/noreferrer-null-opener.html rename to tests/wpt/tests/html/browsers/windows/noreferrer-null-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/noreferrer-window-name.html b/tests/wpt/tests/html/browsers/windows/noreferrer-window-name.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/noreferrer-window-name.html rename to tests/wpt/tests/html/browsers/windows/noreferrer-window-name.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/opener-cross-origin-manual.sub.html b/tests/wpt/tests/html/browsers/windows/opener-cross-origin-manual.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/opener-cross-origin-manual.sub.html rename to tests/wpt/tests/html/browsers/windows/opener-cross-origin-manual.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/opener-string.window.js b/tests/wpt/tests/html/browsers/windows/opener-string.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/opener-string.window.js rename to tests/wpt/tests/html/browsers/windows/opener-string.window.js diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/first-party-to-first-party-cross-partition.sub.html b/tests/wpt/tests/html/browsers/windows/post-message/first-party-to-first-party-cross-partition.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/first-party-to-first-party-cross-partition.sub.html rename to tests/wpt/tests/html/browsers/windows/post-message/first-party-to-first-party-cross-partition.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/first-party-to-first-party-same-partition.html b/tests/wpt/tests/html/browsers/windows/post-message/first-party-to-first-party-same-partition.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/first-party-to-first-party-same-partition.html rename to tests/wpt/tests/html/browsers/windows/post-message/first-party-to-first-party-same-partition.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/first-party-to-third-party-cross-partition-cross-origin.sub.html b/tests/wpt/tests/html/browsers/windows/post-message/first-party-to-third-party-cross-partition-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/first-party-to-third-party-cross-partition-cross-origin.sub.html rename to tests/wpt/tests/html/browsers/windows/post-message/first-party-to-third-party-cross-partition-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/first-party-to-third-party-cross-partition-same-origin.sub.html b/tests/wpt/tests/html/browsers/windows/post-message/first-party-to-third-party-cross-partition-same-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/first-party-to-third-party-cross-partition-same-origin.sub.html rename to tests/wpt/tests/html/browsers/windows/post-message/first-party-to-third-party-cross-partition-same-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/first-party-to-first-party-cross-partition-window.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/first-party-to-first-party-cross-partition-window.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/first-party-to-first-party-cross-partition-window.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/first-party-to-first-party-cross-partition-window.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/first-party-to-first-party-same-partition-window.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/first-party-to-first-party-same-partition-window.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/first-party-to-first-party-same-partition-window.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/first-party-to-first-party-same-partition-window.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-cross-origin-iframe.https.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-cross-origin-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-cross-origin-iframe.https.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-cross-origin-iframe.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-cross-origin-window.sub.https.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-cross-origin-window.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-cross-origin-window.sub.https.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-cross-origin-window.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-same-origin-iframe.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-same-origin-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-same-origin-iframe.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-same-origin-iframe.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-same-origin-window.sub.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-same-origin-window.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-same-origin-window.sub.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/first-party-to-third-party-cross-partition-same-origin-window.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-cross-origin-iframe.sub.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-cross-origin-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-cross-origin-iframe.sub.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-cross-origin-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-cross-origin-window.https.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-cross-origin-window.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-cross-origin-window.https.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-cross-origin-window.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-same-origin-iframe.sub.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-same-origin-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-same-origin-iframe.sub.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-same-origin-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-same-origin-window.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-same-origin-window.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-same-origin-window.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-first-party-cross-partition-same-origin-window.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-cross-origin-iframe-a.sub.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-cross-origin-iframe-a.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-cross-origin-iframe-a.sub.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-cross-origin-iframe-a.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-cross-origin-iframe-b.https.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-cross-origin-iframe-b.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-cross-origin-iframe-b.https.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-cross-origin-iframe-b.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-cross-origin-window.sub.https.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-cross-origin-window.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-cross-origin-window.sub.https.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-cross-origin-window.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-same-origin-iframe-a.sub.https.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-same-origin-iframe-a.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-same-origin-iframe-a.sub.https.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-same-origin-iframe-a.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-same-origin-iframe-b.https.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-same-origin-iframe-b.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-same-origin-iframe-b.https.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-same-origin-iframe-b.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-same-origin-window.sub.https.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-same-origin-window.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-same-origin-window.sub.https.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-cross-partition-same-origin-window.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-same-partition-iframe-a.sub.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-same-partition-iframe-a.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-same-partition-iframe-a.sub.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-same-partition-iframe-a.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-same-partition-iframe-b.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-same-partition-iframe-b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-same-partition-iframe-b.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-same-partition-iframe-b.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-same-partition-window.sub.html b/tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-same-partition-window.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/resources/third-party-to-third-party-same-partition-window.sub.html rename to tests/wpt/tests/html/browsers/windows/post-message/resources/third-party-to-third-party-same-partition-window.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/third-party-to-first-party-cross-partition-cross-origin.sub.html b/tests/wpt/tests/html/browsers/windows/post-message/third-party-to-first-party-cross-partition-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/third-party-to-first-party-cross-partition-cross-origin.sub.html rename to tests/wpt/tests/html/browsers/windows/post-message/third-party-to-first-party-cross-partition-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/third-party-to-first-party-cross-partition-same-origin.sub.html b/tests/wpt/tests/html/browsers/windows/post-message/third-party-to-first-party-cross-partition-same-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/third-party-to-first-party-cross-partition-same-origin.sub.html rename to tests/wpt/tests/html/browsers/windows/post-message/third-party-to-first-party-cross-partition-same-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/third-party-to-third-party-cross-partition-cross-origin.sub.html b/tests/wpt/tests/html/browsers/windows/post-message/third-party-to-third-party-cross-partition-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/third-party-to-third-party-cross-partition-cross-origin.sub.html rename to tests/wpt/tests/html/browsers/windows/post-message/third-party-to-third-party-cross-partition-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/third-party-to-third-party-cross-partition-same-origin.sub.html b/tests/wpt/tests/html/browsers/windows/post-message/third-party-to-third-party-cross-partition-same-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/third-party-to-third-party-cross-partition-same-origin.sub.html rename to tests/wpt/tests/html/browsers/windows/post-message/third-party-to-third-party-cross-partition-same-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/post-message/third-party-to-third-party-same-partition.sub.html b/tests/wpt/tests/html/browsers/windows/post-message/third-party-to-third-party-same-partition.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/post-message/third-party-to-third-party-same-partition.sub.html rename to tests/wpt/tests/html/browsers/windows/post-message/third-party-to-third-party-same-partition.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/browsing-context-window.html b/tests/wpt/tests/html/browsers/windows/resources/browsing-context-window.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/browsing-context-window.html rename to tests/wpt/tests/html/browsers/windows/resources/browsing-context-window.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/document-domain-setter.html b/tests/wpt/tests/html/browsers/windows/resources/document-domain-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/document-domain-setter.html rename to tests/wpt/tests/html/browsers/windows/resources/document-domain-setter.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/echo-window-name.html b/tests/wpt/tests/html/browsers/windows/resources/echo-window-name.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/echo-window-name.html rename to tests/wpt/tests/html/browsers/windows/resources/echo-window-name.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/iframe-nested-cross-origin.html b/tests/wpt/tests/html/browsers/windows/resources/iframe-nested-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/iframe-nested-cross-origin.html rename to tests/wpt/tests/html/browsers/windows/resources/iframe-nested-cross-origin.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/iframe-nested-printing-pass.html b/tests/wpt/tests/html/browsers/windows/resources/iframe-nested-printing-pass.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/iframe-nested-printing-pass.html rename to tests/wpt/tests/html/browsers/windows/resources/iframe-nested-printing-pass.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/message-parent.html b/tests/wpt/tests/html/browsers/windows/resources/message-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/message-parent.html rename to tests/wpt/tests/html/browsers/windows/resources/message-parent.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/nested-post-to-opener.html b/tests/wpt/tests/html/browsers/windows/resources/nested-post-to-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/nested-post-to-opener.html rename to tests/wpt/tests/html/browsers/windows/resources/nested-post-to-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/noreferrer-window-name.html b/tests/wpt/tests/html/browsers/windows/resources/noreferrer-window-name.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/noreferrer-window-name.html rename to tests/wpt/tests/html/browsers/windows/resources/noreferrer-window-name.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/opener-cross-origin-embed.sub.html b/tests/wpt/tests/html/browsers/windows/resources/opener-cross-origin-embed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/opener-cross-origin-embed.sub.html rename to tests/wpt/tests/html/browsers/windows/resources/opener-cross-origin-embed.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/opener-cross-origin-end.txt b/tests/wpt/tests/html/browsers/windows/resources/opener-cross-origin-end.txt similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/opener-cross-origin-end.txt rename to tests/wpt/tests/html/browsers/windows/resources/opener-cross-origin-end.txt diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/opener-cross-origin.html b/tests/wpt/tests/html/browsers/windows/resources/opener-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/opener-cross-origin.html rename to tests/wpt/tests/html/browsers/windows/resources/opener-cross-origin.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/post-to-opener.html b/tests/wpt/tests/html/browsers/windows/resources/post-to-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/post-to-opener.html rename to tests/wpt/tests/html/browsers/windows/resources/post-to-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/restore-window-name-back.sub.html b/tests/wpt/tests/html/browsers/windows/resources/restore-window-name-back.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/restore-window-name-back.sub.html rename to tests/wpt/tests/html/browsers/windows/resources/restore-window-name-back.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/restore-window-name.sub.html b/tests/wpt/tests/html/browsers/windows/resources/restore-window-name.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/restore-window-name.sub.html rename to tests/wpt/tests/html/browsers/windows/resources/restore-window-name.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/target-cross-origin.sub.html b/tests/wpt/tests/html/browsers/windows/resources/target-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/target-cross-origin.sub.html rename to tests/wpt/tests/html/browsers/windows/resources/target-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/window-close-button.html b/tests/wpt/tests/html/browsers/windows/resources/window-close-button.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/window-close-button.html rename to tests/wpt/tests/html/browsers/windows/resources/window-close-button.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/window-name-stash.py b/tests/wpt/tests/html/browsers/windows/resources/window-name-stash.py similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/window-name-stash.py rename to tests/wpt/tests/html/browsers/windows/resources/window-name-stash.py diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/window-name.sub.html b/tests/wpt/tests/html/browsers/windows/resources/window-name.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/window-name.sub.html rename to tests/wpt/tests/html/browsers/windows/resources/window-name.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/resources/window-opener.html b/tests/wpt/tests/html/browsers/windows/resources/window-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/resources/window-opener.html rename to tests/wpt/tests/html/browsers/windows/resources/window-opener.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/restore-window-name-manual.https.html b/tests/wpt/tests/html/browsers/windows/restore-window-name-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/restore-window-name-manual.https.html rename to tests/wpt/tests/html/browsers/windows/restore-window-name-manual.https.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/targeting-cross-origin-nested-browsing-contexts.html b/tests/wpt/tests/html/browsers/windows/targeting-cross-origin-nested-browsing-contexts.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/targeting-cross-origin-nested-browsing-contexts.html rename to tests/wpt/tests/html/browsers/windows/targeting-cross-origin-nested-browsing-contexts.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/targeting-multiple-cross-origin-manual.sub.html b/tests/wpt/tests/html/browsers/windows/targeting-multiple-cross-origin-manual.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/targeting-multiple-cross-origin-manual.sub.html rename to tests/wpt/tests/html/browsers/windows/targeting-multiple-cross-origin-manual.sub.html diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/targeting-with-embedded-null-in-target.html b/tests/wpt/tests/html/browsers/windows/targeting-with-embedded-null-in-target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/browsers/windows/targeting-with-embedded-null-in-target.html rename to tests/wpt/tests/html/browsers/windows/targeting-with-embedded-null-in-target.html diff --git a/tests/wpt/web-platform-tests/html/canvas/META.yml b/tests/wpt/tests/html/canvas/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/META.yml rename to tests/wpt/tests/html/canvas/META.yml diff --git a/tests/wpt/web-platform-tests/html/canvas/README.md b/tests/wpt/tests/html/canvas/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/README.md rename to tests/wpt/tests/html/canvas/README.md diff --git a/tests/wpt/web-platform-tests/html/canvas/element/2d.conformance.requirements.basics.html b/tests/wpt/tests/html/canvas/element/2d.conformance.requirements.basics.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/2d.conformance.requirements.basics.html rename to tests/wpt/tests/html/canvas/element/2d.conformance.requirements.basics.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/2d.conformance.requirements.delete.html b/tests/wpt/tests/html/canvas/element/2d.conformance.requirements.delete.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/2d.conformance.requirements.delete.html rename to tests/wpt/tests/html/canvas/element/2d.conformance.requirements.delete.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/2d.conformance.requirements.drawings.html b/tests/wpt/tests/html/canvas/element/2d.conformance.requirements.drawings.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/2d.conformance.requirements.drawings.html rename to tests/wpt/tests/html/canvas/element/2d.conformance.requirements.drawings.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/2d.conformance.requirements.missingargs.html b/tests/wpt/tests/html/canvas/element/2d.conformance.requirements.missingargs.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/2d.conformance.requirements.missingargs.html rename to tests/wpt/tests/html/canvas/element/2d.conformance.requirements.missingargs.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/2d.text-outside-of-the-flat-tree-ref.html b/tests/wpt/tests/html/canvas/element/2d.text-outside-of-the-flat-tree-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/2d.text-outside-of-the-flat-tree-ref.html rename to tests/wpt/tests/html/canvas/element/2d.text-outside-of-the-flat-tree-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/2d.text-outside-of-the-flat-tree.html b/tests/wpt/tests/html/canvas/element/2d.text-outside-of-the-flat-tree.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/2d.text-outside-of-the-flat-tree.html rename to tests/wpt/tests/html/canvas/element/2d.text-outside-of-the-flat-tree.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.clear.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.clear.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.clear.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.clear.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.clear.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.clear.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.clear.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.clear.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.copy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.copy.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.copy.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.copy.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.copy.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.copy.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-atop.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-atop.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-atop.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-atop.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-out.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-out.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-out.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-out.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-out.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-over.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-over.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-over.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.destination-over.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.destination-over.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.lighter.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.lighter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.lighter.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.lighter.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.lighter.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.lighter.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.lighter.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.lighter.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-atop.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-atop.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-atop.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-atop.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-atop.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-out.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-out.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-out.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-out.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-out.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-over.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-over.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-over.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.source-over.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.source-over.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.xor.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.xor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.xor.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.xor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.xor.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.xor.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.canvas.xor.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.canvas.xor.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.clear.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.clear.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.clear.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.clear.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.copy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.copy.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.destination-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.destination-atop.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.destination-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.destination-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.destination-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.destination-out.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.destination-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.destination-over.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.destination-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.lighter.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.lighter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.lighter.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.lighter.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.source-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.source-atop.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.source-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.source-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.source-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.source-out.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.source-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.source-over.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.source-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.xor.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.xor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.clip.xor.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.clip.xor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.canvas.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.canvas.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.canvascopy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.canvascopy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.canvascopy.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.canvascopy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.canvaspattern.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.canvaspattern.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.canvaspattern.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.canvaspattern.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.default.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.default.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.fill.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.fill.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.fill.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.fill.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.image.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.image.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.image.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.image.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.imagepattern.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.imagepattern.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.imagepattern.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.imagepattern.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.invalid.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.invalid.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.range.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.range.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.globalAlpha.range.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.globalAlpha.range.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.clear.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.clear.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.clear.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.clear.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.clear.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.clear.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.clear.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.clear.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.copy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.copy.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.copy.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.copy.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.copy.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.copy.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-atop.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-atop.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-atop.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-atop.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-atop.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-out.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-out.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-out.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-out.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-out.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-over.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-over.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-over.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.destination-over.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.destination-over.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.lighter.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.lighter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.lighter.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.lighter.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.lighter.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.lighter.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.lighter.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.lighter.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-atop.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-atop.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-atop.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-atop.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-atop.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-out.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-out.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-out.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-out.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-out.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-over.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-over.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-over.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.source-over.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.source-over.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.xor.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.xor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.xor.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.xor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.xor.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.xor.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.image.xor.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.image.xor.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.casesensitive.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.casesensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.casesensitive.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.casesensitive.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.clear.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.clear.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.clear.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.clear.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.darker.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.darker.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.darker.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.darker.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.default.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.default.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.get.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.get.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.get.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.get.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.highlight.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.highlight.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.highlight.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.highlight.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.nullsuffix.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.nullsuffix.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.nullsuffix.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.nullsuffix.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.over.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.unrecognised.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.unrecognised.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.operation.unrecognised.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.operation.unrecognised.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.clear.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.clear.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.clear.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.clear.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.clear.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.clear.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.clear.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.clear.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.copy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.copy.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.copy.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.copy.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.copy.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.copy.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-atop.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-atop.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-atop.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-atop.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-atop.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-out.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-out.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-out.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-out.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-out.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-over.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-over.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-over.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.destination-over.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.destination-over.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.lighter.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.lighter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.lighter.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.lighter.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.lighter.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.lighter.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.lighter.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.lighter.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-atop.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-atop.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-atop.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-atop.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-atop.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-out.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-out.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-out.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-out.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-out.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-over.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-over.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-over.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.source-over.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.source-over.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.xor.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.xor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.xor.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.xor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.xor.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.xor.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.solid.xor.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.solid.xor.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.clear.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.clear.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.clear.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.clear.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.clear.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.clear.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.clear.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.clear.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.copy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.copy.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.copy.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.copy.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.copy.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.copy.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-atop.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-atop.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-atop.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-atop.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-atop.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-out.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-out.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-out.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-out.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-out.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-over.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-over.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-over.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.destination-over.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.destination-over.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.lighter.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.lighter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.lighter.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.lighter.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.lighter.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.lighter.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.lighter.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.lighter.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-atop.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-atop.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-atop.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-atop.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-atop.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-out.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-out.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-out.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-out.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-out.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-over.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-over.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-over.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-over.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.source-over.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.source-over.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.xor.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.xor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.xor.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.xor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.xor.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.xor.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.transparent.xor.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.transparent.xor.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.copy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.copy.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.copy.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.copy.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.copy.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.copy.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-atop.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-atop.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-atop.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-atop.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-atop.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.destination-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-out.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-out.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-out.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-out.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.fill.source-out.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.copy.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.copy.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.copy.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.copy.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-atop.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.destination-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.image.source-out.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.copy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.copy.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.copy.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.copy.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.copy.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.copy.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-atop.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-atop.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-atop.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-atop.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-atop.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.destination-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-out.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-out.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-out.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-out.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.nocontext.source-out.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.copy.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-atop.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.destination-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-in.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.png b/tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.png rename to tests/wpt/tests/html/canvas/element/compositing/2d.composite.uncovered.pattern.source-out.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.basics.html b/tests/wpt/tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.basics.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.basics.html rename to tests/wpt/tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.basics.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.delete.html b/tests/wpt/tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.delete.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.delete.html rename to tests/wpt/tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.delete.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.drawings.html b/tests/wpt/tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.drawings.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.drawings.html rename to tests/wpt/tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.drawings.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.missingargs.html b/tests/wpt/tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.missingargs.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.missingargs.html rename to tests/wpt/tests/html/canvas/element/conformance-requirements/2d.conformance.requirements.missingargs.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.3arg.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.3arg.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.3arg.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.3arg.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.5arg.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.5arg.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.5arg.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.5arg.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.alpha.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.alpha.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.animated.gif.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.animated.gif.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.animated.gif.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.animated.gif.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.broken.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.broken.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.broken.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.broken.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.canvas.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.canvas.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.clip.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.clip.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.clip.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.composite.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.composite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.composite.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.composite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.floatsource.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.floatsource.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.floatsource.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.floatsource.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.emptysrc.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.emptysrc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.emptysrc.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.emptysrc.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.immediate.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.immediate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.immediate.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.immediate.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.nosrc.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.nosrc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.nosrc.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.nosrc.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.reload.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.reload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.reload.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.reload.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.removedsrc.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.removedsrc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.removedsrc.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.incomplete.removedsrc.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.negativedest.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.negativedest.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.negativedest.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.negativedest.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.negativedir.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.negativedir.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.negativedir.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.negativedir.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.negativesource.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.negativesource.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.negativesource.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.negativesource.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonexistent.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonexistent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonexistent.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonexistent.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nowrap.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nowrap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nowrap.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nowrap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.null.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.null.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.null.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.null.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.path.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.path.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.self.1.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.self.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.self.1.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.self.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.self.2.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.self.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.self.2.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.self.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.svg.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.svg.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.svg.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.svg.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.transform.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.transform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.transform.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.transform.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.wrongtype.paragraph.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.wrongtype.paragraph.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.wrongtype.paragraph.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.wrongtype.paragraph.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.zerosource.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.zerosource.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.zerosource.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.zerosource.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html b/tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html rename to tests/wpt/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.path.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.path.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.path.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.path.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html b/tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html rename to tests/wpt/tests/html/canvas/element/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.center.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.center.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.center.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.center.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.end.ltr.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.end.ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.end.ltr.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.end.ltr.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.end.rtl.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.end.rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.end.rtl.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.end.rtl.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.left.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.left.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.left.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.left.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.right.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.right.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.right.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.right.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.start.ltr.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.start.ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.start.ltr.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.start.ltr.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.start.rtl.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.start.rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.start.rtl.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.align.start.rtl.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.basic-manual.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.basic-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.basic-manual.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.basic-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.basic.png b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.basic.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.basic.png rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.basic.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.NaN.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.NaN.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.NaN.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.NaN.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.bound.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.bound.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.bound.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.bound.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.fontface.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.fontface.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.fontface.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.fontface.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large-manual.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large-manual.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large.png b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large.png rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.negative.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.negative.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.small.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.small.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.small.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.small.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.zero.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.zero.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.rtl-manual.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.rtl-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.rtl-manual.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.rtl-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.rtl.png b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.rtl.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.rtl.png rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.rtl.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.unaffected.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.unaffected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.unaffected.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.unaffected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.repeat.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.repeat.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.repeat.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.repeat.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.kern.consistent-manual.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.kern.consistent-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.kern.consistent-manual.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.kern.consistent-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.space.basic.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.space.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.space.basic.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.space.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.space.collapse.nonspace.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.space.collapse.nonspace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.space.collapse.nonspace.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.space.collapse.nonspace.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.stroke.basic-manual.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.stroke.basic-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.stroke.basic-manual.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.stroke.basic-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.stroke.basic.png b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.stroke.basic.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.stroke.basic.png rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.stroke.basic.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.stroke.unaffected.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.stroke.unaffected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.stroke.unaffected.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.stroke.unaffected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.absolute.spacing.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.absolute.spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.absolute.spacing.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.absolute.spacing.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.font-relative.spacing.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.font-relative.spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.font-relative.spacing.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.font-relative.spacing.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.fontKerning.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.fontKerning.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.fontKerning.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.fontKerning.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.fontKerning.with.uppercase.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.fontKerning.with.uppercase.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.fontKerning.with.uppercase.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.fontKerning.with.uppercase.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.fontVariant.settings.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.fontVariant.settings.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.fontVariant.settings.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.fontVariant.settings.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.invalid.spacing.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.invalid.spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.invalid.spacing.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.invalid.spacing.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.letterSpacing.change.font.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.letterSpacing.change.font.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.letterSpacing.change.font.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.letterSpacing.change.font.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.letterSpacing.measure.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.letterSpacing.measure.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.letterSpacing.measure.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.letterSpacing.measure.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.nonfinite.spacing.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.nonfinite.spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.nonfinite.spacing.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.nonfinite.spacing.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.textRendering.settings.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.textRendering.settings.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.textRendering.settings.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.textRendering.settings.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.wordSpacing.change.font.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.wordSpacing.change.font.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.wordSpacing.change.font.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.wordSpacing.change.font.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.wordSpacing.measure.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.wordSpacing.measure.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.wordSpacing.measure.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.wordSpacing.measure.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.actualBoundingBox.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.actualBoundingBox.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.actualBoundingBox.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.actualBoundingBox.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.advances.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.advances.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.advances.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.advances.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.baselines.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.baselines.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.baselines.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.baselines.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.boundingBox.direction.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.boundingBox.direction.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.boundingBox.direction.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.boundingBox.direction.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.boundingBox.textAlign.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.boundingBox.textAlign.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.boundingBox.textAlign.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.boundingBox.textAlign.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.emHeights.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.emHeights.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.emHeights.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.emHeights.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.fontBoundingBox.ahem.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.fontBoundingBox.ahem.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.fontBoundingBox.ahem.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.fontBoundingBox.ahem.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.fontBoundingBox.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.fontBoundingBox.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.fontBoundingBox.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.fontBoundingBox.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.rtl.text.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.rtl.text.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.rtl.text.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.rtl.text.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.width.basic.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.width.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.width.basic.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.width.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.width.empty.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.width.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.width.empty.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/2d.text.measure.width.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/direction-inherit-rtl.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/direction-inherit-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/direction-inherit-rtl.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/direction-inherit-rtl.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/direction-ltr.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/direction-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/direction-ltr.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/direction-ltr.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/direction-rtl.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/direction-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/direction-rtl.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/direction-rtl.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/reference/direction-default-ref.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/reference/direction-default-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/reference/direction-default-ref.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/reference/direction-default-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/reference/direction-rtl-ref.html b/tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/reference/direction-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/drawing-text-to-the-canvas/reference/direction-rtl-ref.html rename to tests/wpt/tests/html/canvas/element/drawing-text-to-the-canvas/reference/direction-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.CSSHSL.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.CSSHSL.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.CSSHSL.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.CSSHSL.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.CSSRGB.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.CSSRGB.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.CSSRGB.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.CSSRGB.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.colorObject.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.colorObject.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.colorObject.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.colorObject.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.colorObject.transparency.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.colorObject.transparency.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.colorObject.transparency.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.colorObject.transparency.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.default.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.default.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.solid.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.solid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.solid.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.solid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.transparent.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.transparent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.transparent.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.get.transparent.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.invalidstring.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.invalidstring.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.invalidstring.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.invalidstring.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.invalidtype.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.invalidtype.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.invalidtype.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.invalidtype.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.basic.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.basic.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.changed.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.changed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.changed.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.changed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.removed.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.removed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.removed.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.removed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.removed.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.removed.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.removed.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.current.removed.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex3.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex3.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex3.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex3.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex4.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex4.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex4.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex4.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex6.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex6.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex6.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex6.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex8.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex8.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex8.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hex8.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.html4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.html4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.html4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.html4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.html4.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.html4.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.html4.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.html4.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.system.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.system.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.system.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.system.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.empty.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.empty.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.alpha.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.alpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.alpha.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.alpha.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.color.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.color.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.color.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.color.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.color.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.color.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.color.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.color.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.multiple.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.multiple.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.multiple.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.multiple.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.outside.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.outside.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.overlap.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.overlap.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.overlap.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.overlap.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.solid.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.solid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.solid.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.solid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.vertical.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.vertical.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.vertical.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.vertical.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillText.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillText.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillText.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillText.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeText.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeText.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeText.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeText.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.transform.1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.transform.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.transform.1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.transform.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.transform.2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.transform.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.transform.2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.transform.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.transform.3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.transform.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.transform.3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.linear.transform.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.compare.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.compare.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.compare.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.compare.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.current.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.current.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.current.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.current.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.current.png b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.current.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.current.png rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.current.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.invalidcolor.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.invalidcolor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.invalidcolor.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.invalidcolor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.return.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.return.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.return.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.return.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.type.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.type.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.type.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.update.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.update.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.update.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.object.update.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.front.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.front.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.front.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.front.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.top.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.top.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.top.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.cone.top.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.equal.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.equal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.equal.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.equal.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.inside3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.negative.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.negative.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.outside3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.touch3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.transform.1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.transform.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.transform.1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.transform.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.transform.2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.transform.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.transform.2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.transform.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.transform.3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.transform.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.transform.3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.gradient.radial.transform.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.animated.gif.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.animated.gif.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.animated.gif.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.animated.gif.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.canvas.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.canvas.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.image.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.image.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.image.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.image.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.nocontext.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.nocontext.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.nocontext.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.nocontext.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.type.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.type.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.type.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.crosscanvas.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.crosscanvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.crosscanvas.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.crosscanvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.broken.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.broken.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.broken.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.broken.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.emptysrc.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.emptysrc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.emptysrc.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.emptysrc.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.immediate.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.immediate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.immediate.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.immediate.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.nosrc.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.nosrc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.nosrc.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.nosrc.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.reload.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.reload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.reload.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.reload.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.removedsrc.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.removedsrc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.removedsrc.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.incomplete.removedsrc.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.nonexistent-but-loading.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.nonexistent-but-loading.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.nonexistent-but-loading.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.nonexistent-but-loading.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.nonexistent.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.nonexistent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.nonexistent.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.nonexistent.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.nosrc.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.nosrc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.nosrc.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.nosrc.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.null.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.null.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.null.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.null.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.string.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.string.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.string.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.string.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.undefined.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.undefined.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.undefined.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.zeroheight.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.zeroheight.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.zeroheight.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.zeroheight.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.zerowidth.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.zerowidth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.zerowidth.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.image.zerowidth.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.canvas1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.canvas1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.canvas1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.canvas1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.canvas2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.canvas2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.canvas2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.canvas2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.image1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.image1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.image1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.image1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.image2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.image2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.image2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.image2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.case.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.case.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.case.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.case.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.empty.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.empty.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.null.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.null.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.null.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.null.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.undefined.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.undefined.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.undefined.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.svgimage.nonexistent.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.svgimage.nonexistent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.svgimage.nonexistent.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.svgimage.nonexistent.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.svgimage.zeroheight.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.svgimage.zeroheight.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.svgimage.zeroheight.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.svgimage.zeroheight.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.svgimage.zerowidth.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.svgimage.zerowidth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.svgimage.zerowidth.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.svgimage.zerowidth.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.transform.identity.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.transform.identity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.transform.identity.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.transform.identity.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.transform.infinity.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.transform.infinity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.transform.infinity.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.transform.infinity.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.transform.invalid.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.transform.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.transform.invalid.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.transform.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.strokeStyle.colorObject.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.strokeStyle.colorObject.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.strokeStyle.colorObject.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.strokeStyle.colorObject.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.strokeStyle.colorObject.transparency.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.strokeStyle.colorObject.transparency.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.strokeStyle.colorObject.transparency.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.strokeStyle.colorObject.transparency.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.strokeStyle.default.html b/tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.strokeStyle.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.strokeStyle.default.html rename to tests/wpt/tests/html/canvas/element/fill-and-stroke-styles/2d.strokeStyle.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html b/tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html rename to tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html b/tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html rename to tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html b/tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html rename to tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html b/tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html rename to tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html b/tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html rename to tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html b/tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html rename to tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html b/tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html rename to tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html b/tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html rename to tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.dropShadow.exceptions.tentative.html b/tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.dropShadow.exceptions.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.dropShadow.exceptions.tentative.html rename to tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.dropShadow.exceptions.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.dropShadow.tentative-expected.html b/tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.dropShadow.tentative-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.dropShadow.tentative-expected.html rename to tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.dropShadow.tentative-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.dropShadow.tentative.html b/tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.dropShadow.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.dropShadow.tentative.html rename to tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.dropShadow.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.tentative.html b/tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.tentative.html rename to tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html b/tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html rename to tests/wpt/tests/html/canvas/element/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.value.html b/tests/wpt/tests/html/canvas/element/filters/2d.filter.value.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/filters/2d.filter.value.html rename to tests/wpt/tests/html/canvas/element/filters/2d.filter.value.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.cross-layer-paths-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.cross-layer-paths-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.cross-layer-paths-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.cross-layer-paths-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.cross-layer-paths.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.cross-layer-paths.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.cross-layer-paths.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.cross-layer-paths.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.blending-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.blending-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.blending.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.blending.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.composite-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.composite-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.composite.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.composite.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.blending-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.blending-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.composite-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.composite-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.no-global-states-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.no-global-states-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.no-global-states-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.no-global-states-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.no-global-states.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.no-global-states.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.no-global-states.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.no-global-states.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.no-global-states-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.no-global-states-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.no-global-states-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.no-global-states-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.no-global-states.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.no-global-states.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.no-global-states.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.no-global-states.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.shadow-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.global-states.shadow.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.invalid-calls.beginLayer-reset-endLayer.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.invalid-calls.beginLayer-reset-endLayer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.invalid-calls.beginLayer-reset-endLayer.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.invalid-calls.beginLayer-reset-endLayer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.invalid-calls.beginLayer-restore.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.invalid-calls.beginLayer-restore.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.invalid-calls.beginLayer-restore.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.invalid-calls.beginLayer-restore.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.invalid-calls.beginLayer-save-endLayer.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.invalid-calls.beginLayer-save-endLayer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.invalid-calls.beginLayer-save-endLayer.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.invalid-calls.beginLayer-save-endLayer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.invalid-calls.endLayer.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.invalid-calls.endLayer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.invalid-calls.endLayer.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.invalid-calls.endLayer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.invalid-calls.save-beginLayer-restore.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.invalid-calls.save-beginLayer-restore.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.invalid-calls.save-beginLayer-restore.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.invalid-calls.save-beginLayer-restore.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.invalid-calls.save-endLayer.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.invalid-calls.save-endLayer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.invalid-calls.save-endLayer.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.invalid-calls.save-endLayer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.nested-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.nested-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.nested-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.nested-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.nested.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.nested.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.nested.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.nested.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.createImageBitmap-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.createImageBitmap-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.createImageBitmap-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.createImageBitmap-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.createImageBitmap.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.createImageBitmap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.createImageBitmap.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.createImageBitmap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.drawImage-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.drawImage-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.drawImage-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.drawImage-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.drawImage.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.drawImage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.drawImage.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.drawImage.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.getImageData-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.getImageData-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.getImageData-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.getImageData-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.getImageData.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.getImageData.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.getImageData.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.getImageData.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.putImageData-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.putImageData-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.putImageData-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.putImageData-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.putImageData.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.putImageData.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.putImageData.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.putImageData.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.requestAnimationFrame-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.requestAnimationFrame-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.requestAnimationFrame-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.requestAnimationFrame-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.requestAnimationFrame.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.requestAnimationFrame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.requestAnimationFrame.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.requestAnimationFrame.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.toBlob-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.toBlob-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.toBlob-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.toBlob-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.toBlob.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.toBlob.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.toBlob.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.toBlob.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.toDataURL-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.toDataURL-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.toDataURL-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.toDataURL-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.toDataURL.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.toDataURL.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.render-opportunities.toDataURL.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.render-opportunities.toDataURL.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.reset-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.reset-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.reset-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.reset-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.reset.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.reset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.reset.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.reset.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.restore-style-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.restore-style-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.restore-style-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.restore-style-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.restore-style.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.restore-style.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.restore-style.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.restore-style.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.several-complex-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.several-complex-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.several-complex-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.several-complex-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.several-complex.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.several-complex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.several-complex.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.several-complex.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.unclosed-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.unclosed-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.unclosed-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.unclosed-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.unclosed-nested-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.unclosed-nested-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.unclosed-nested-expected.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.unclosed-nested-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.unclosed-nested.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.unclosed-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.unclosed-nested.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.unclosed-nested.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.unclosed.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.unclosed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.unclosed.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.unclosed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.beginLayer-endLayer.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.beginLayer-endLayer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.beginLayer-endLayer.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.beginLayer-endLayer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.beginLayer-save.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.beginLayer-save.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.beginLayer-save.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.beginLayer-save.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.beginLayer.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.beginLayer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.beginLayer.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.beginLayer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.restore.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.restore.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.restore.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.restore.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.save-beginLayer.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.save-beginLayer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.save-beginLayer.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.save-beginLayer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.save.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.save.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.save.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.save.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.save_reset_restore.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.save_reset_restore.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.save_reset_restore.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.save_reset_restore.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.save_restore.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.save_restore.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/layers/2d.layer.valid-calls.save_restore.html rename to tests/wpt/tests/html/canvas/element/layers/2d.layer.valid-calls.save_restore.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cap.butt.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.cap.butt.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cap.butt.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.cap.butt.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cap.closed.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.cap.closed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cap.closed.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.cap.closed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cap.invalid.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.cap.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cap.invalid.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.cap.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cap.open.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.cap.open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cap.open.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.cap.open.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cap.round.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.cap.round.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cap.round.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.cap.round.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cap.square.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.cap.square.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cap.square.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.cap.square.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cap.valid.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.cap.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cap.valid.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.cap.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cross.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.cross.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.cross.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.cross.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.defaults.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.defaults.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.defaults.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.defaults.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.fill.noop.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.fill.noop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.fill.noop.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.fill.noop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.invalid.strokestyle.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.invalid.strokestyle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.invalid.strokestyle.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.invalid.strokestyle.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.bevel.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.bevel.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.bevel.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.bevel.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.closed.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.closed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.closed.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.closed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.invalid.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.invalid.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.miter.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.miter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.miter.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.miter.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.open.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.open.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.open.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.parallel.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.parallel.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.parallel.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.parallel.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.round.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.round.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.round.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.round.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.valid.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.join.valid.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.join.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.acute.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.acute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.acute.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.acute.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.exceeded.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.exceeded.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.exceeded.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.exceeded.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.invalid.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.invalid.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.lineedge.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.lineedge.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.lineedge.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.lineedge.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.obtuse.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.obtuse.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.obtuse.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.obtuse.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.rightangle.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.rightangle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.rightangle.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.rightangle.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.valid.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.valid.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.within.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.within.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.miter.within.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.miter.within.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.union.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.union.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.union.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.union.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.width.basic.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.width.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.width.basic.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.width.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.width.invalid.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.width.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.width.invalid.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.width.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.width.scaledefault.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.width.scaledefault.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.width.scaledefault.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.width.scaledefault.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.width.transformed.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.width.transformed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.width.transformed.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.width.transformed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.width.valid.html b/tests/wpt/tests/html/canvas/element/line-styles/2d.line.width.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/line-styles/2d.line.width.valid.html rename to tests/wpt/tests/html/canvas/element/line-styles/2d.line.width.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/README.md b/tests/wpt/tests/html/canvas/element/manual/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/README.md rename to tests/wpt/tests/html/canvas/element/manual/README.md diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/building-paths/canvas_complexshapes_arcto_001-ref.htm b/tests/wpt/tests/html/canvas/element/manual/building-paths/canvas_complexshapes_arcto_001-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/building-paths/canvas_complexshapes_arcto_001-ref.htm rename to tests/wpt/tests/html/canvas/element/manual/building-paths/canvas_complexshapes_arcto_001-ref.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/building-paths/canvas_complexshapes_arcto_001.htm b/tests/wpt/tests/html/canvas/element/manual/building-paths/canvas_complexshapes_arcto_001.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/building-paths/canvas_complexshapes_arcto_001.htm rename to tests/wpt/tests/html/canvas/element/manual/building-paths/canvas_complexshapes_arcto_001.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/building-paths/canvas_complexshapes_beziercurveto_001-ref.htm b/tests/wpt/tests/html/canvas/element/manual/building-paths/canvas_complexshapes_beziercurveto_001-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/building-paths/canvas_complexshapes_beziercurveto_001-ref.htm rename to tests/wpt/tests/html/canvas/element/manual/building-paths/canvas_complexshapes_beziercurveto_001-ref.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/building-paths/canvas_complexshapes_beziercurveto_001.htm b/tests/wpt/tests/html/canvas/element/manual/building-paths/canvas_complexshapes_beziercurveto_001.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/building-paths/canvas_complexshapes_beziercurveto_001.htm rename to tests/wpt/tests/html/canvas/element/manual/building-paths/canvas_complexshapes_beziercurveto_001.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/compositing/alpha_filter_shadow-ref.html b/tests/wpt/tests/html/canvas/element/manual/compositing/alpha_filter_shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/compositing/alpha_filter_shadow-ref.html rename to tests/wpt/tests/html/canvas/element/manual/compositing/alpha_filter_shadow-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/compositing/alpha_filter_shadow.html b/tests/wpt/tests/html/canvas/element/manual/compositing/alpha_filter_shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/compositing/alpha_filter_shadow.html rename to tests/wpt/tests/html/canvas/element/manual/compositing/alpha_filter_shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/compositing/canvas_compositing_globalcompositeoperation_001-ref.htm b/tests/wpt/tests/html/canvas/element/manual/compositing/canvas_compositing_globalcompositeoperation_001-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/compositing/canvas_compositing_globalcompositeoperation_001-ref.htm rename to tests/wpt/tests/html/canvas/element/manual/compositing/canvas_compositing_globalcompositeoperation_001-ref.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/compositing/canvas_compositing_globalcompositeoperation_001.htm b/tests/wpt/tests/html/canvas/element/manual/compositing/canvas_compositing_globalcompositeoperation_001.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/compositing/canvas_compositing_globalcompositeoperation_001.htm rename to tests/wpt/tests/html/canvas/element/manual/compositing/canvas_compositing_globalcompositeoperation_001.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/canvas-with-padding.html b/tests/wpt/tests/html/canvas/element/manual/context-attributes/canvas-with-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/canvas-with-padding.html rename to tests/wpt/tests/html/canvas/element/manual/context-attributes/canvas-with-padding.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/clearRect_alpha_false-ref.html b/tests/wpt/tests/html/canvas/element/manual/context-attributes/clearRect_alpha_false-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/clearRect_alpha_false-ref.html rename to tests/wpt/tests/html/canvas/element/manual/context-attributes/clearRect_alpha_false-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/clearRect_alpha_false.html b/tests/wpt/tests/html/canvas/element/manual/context-attributes/clearRect_alpha_false.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/clearRect_alpha_false.html rename to tests/wpt/tests/html/canvas/element/manual/context-attributes/clearRect_alpha_false.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/drawImage_alpha_false-ref.html b/tests/wpt/tests/html/canvas/element/manual/context-attributes/drawImage_alpha_false-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/drawImage_alpha_false-ref.html rename to tests/wpt/tests/html/canvas/element/manual/context-attributes/drawImage_alpha_false-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/drawImage_alpha_false.html b/tests/wpt/tests/html/canvas/element/manual/context-attributes/drawImage_alpha_false.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/drawImage_alpha_false.html rename to tests/wpt/tests/html/canvas/element/manual/context-attributes/drawImage_alpha_false.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/fillRect_alpha_false-ref.html b/tests/wpt/tests/html/canvas/element/manual/context-attributes/fillRect_alpha_false-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/fillRect_alpha_false-ref.html rename to tests/wpt/tests/html/canvas/element/manual/context-attributes/fillRect_alpha_false-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/fillRect_alpha_false.html b/tests/wpt/tests/html/canvas/element/manual/context-attributes/fillRect_alpha_false.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/fillRect_alpha_false.html rename to tests/wpt/tests/html/canvas/element/manual/context-attributes/fillRect_alpha_false.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/fill_alpha_false-ref.html b/tests/wpt/tests/html/canvas/element/manual/context-attributes/fill_alpha_false-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/fill_alpha_false-ref.html rename to tests/wpt/tests/html/canvas/element/manual/context-attributes/fill_alpha_false-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/fill_alpha_false.html b/tests/wpt/tests/html/canvas/element/manual/context-attributes/fill_alpha_false.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/fill_alpha_false.html rename to tests/wpt/tests/html/canvas/element/manual/context-attributes/fill_alpha_false.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/getContextAttributes.html b/tests/wpt/tests/html/canvas/element/manual/context-attributes/getContextAttributes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/getContextAttributes.html rename to tests/wpt/tests/html/canvas/element/manual/context-attributes/getContextAttributes.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/initial_color_alpha_false-ref.html b/tests/wpt/tests/html/canvas/element/manual/context-attributes/initial_color_alpha_false-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/initial_color_alpha_false-ref.html rename to tests/wpt/tests/html/canvas/element/manual/context-attributes/initial_color_alpha_false-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/initial_color_alpha_false.html b/tests/wpt/tests/html/canvas/element/manual/context-attributes/initial_color_alpha_false.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/initial_color_alpha_false.html rename to tests/wpt/tests/html/canvas/element/manual/context-attributes/initial_color_alpha_false.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/reset_color_alpha_false-ref.html b/tests/wpt/tests/html/canvas/element/manual/context-attributes/reset_color_alpha_false-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/reset_color_alpha_false-ref.html rename to tests/wpt/tests/html/canvas/element/manual/context-attributes/reset_color_alpha_false-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/reset_color_alpha_false.html b/tests/wpt/tests/html/canvas/element/manual/context-attributes/reset_color_alpha_false.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/context-attributes/reset_color_alpha_false.html rename to tests/wpt/tests/html/canvas/element/manual/context-attributes/reset_color_alpha_false.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_canvas.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_canvas.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_canvas_self.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_canvas_self.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_canvas_self.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_canvas_self.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_canvas_self_ref.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_canvas_self_ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_canvas_self_ref.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_canvas_self_ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_crossorigin.sub.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_crossorigin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_crossorigin.sub.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_crossorigin.sub.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_html_image.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_html_image.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_html_image.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_html_image.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_svg_image_1.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_svg_image_1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_svg_image_1.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_svg_image_1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_svg_image_with_foreign_object_does_not_taint.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_svg_image_with_foreign_object_does_not_taint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_svg_image_with_foreign_object_does_not_taint.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/drawimage_svg_image_with_foreign_object_does_not_taint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-orientation-none-ref.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-orientation-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-orientation-none-ref.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-orientation-none-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-orientation-none.tentative.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-orientation-none.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-orientation-none.tentative.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-orientation-none.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-ref.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-ref.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none-ref.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none-ref.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-orientation-none.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-ref.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-ref.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap-swap-width-height.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap.tentative.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap.tentative.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-bitmap.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-blob-ref.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-blob-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-blob-ref.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-blob-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-blob.tentative.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-blob.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-blob.tentative.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-blob.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-orientation-none-ref.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-orientation-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-orientation-none-ref.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-orientation-none-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-orientation-none.tentative.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-orientation-none.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-orientation-none.tentative.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-orientation-none.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-ref.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-ref.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-orientation-none-ref.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-orientation-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-orientation-none-ref.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-orientation-none-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-orientation-none.tentative.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-orientation-none.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-orientation-none.tentative.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-orientation-none.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-ref.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-ref.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element-swap-width-height.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element.tentative.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element.tentative.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-element.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-with-src-rect-ref.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-with-src-rect-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-with-src-rect-ref.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-with-src-rect-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-with-src-rect.tentative.html b/tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-with-src-rect.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-with-src-rect.tentative.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-with-src-rect.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-paths-to-the-canvas/canvas_complexshapes_ispointInpath_001.htm b/tests/wpt/tests/html/canvas/element/manual/drawing-paths-to-the-canvas/canvas_complexshapes_ispointInpath_001.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-paths-to-the-canvas/canvas_complexshapes_ispointInpath_001.htm rename to tests/wpt/tests/html/canvas/element/manual/drawing-paths-to-the-canvas/canvas_complexshapes_ispointInpath_001.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-paths-to-the-canvas/canvas_focus_drawFocusIfNeeded_AAPI_001-manual.html b/tests/wpt/tests/html/canvas/element/manual/drawing-paths-to-the-canvas/canvas_focus_drawFocusIfNeeded_AAPI_001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-paths-to-the-canvas/canvas_focus_drawFocusIfNeeded_AAPI_001-manual.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-paths-to-the-canvas/canvas_focus_drawFocusIfNeeded_AAPI_001-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_001.html b/tests/wpt/tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_001.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_001.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_002.html b/tests/wpt/tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_002.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_002.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_003.html b/tests/wpt/tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_003.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_003.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_004.html b/tests/wpt/tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_004.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_004.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_005.html b/tests/wpt/tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_005.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-paths-to-the-canvas/drawFocusIfNeeded_005.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.disconnected-ref.html b/tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.disconnected-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.disconnected-ref.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.disconnected-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.disconnected.html b/tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.disconnected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.disconnected.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.disconnected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch-ref.html b/tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch-ref.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.condensed.html b/tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.condensed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.condensed.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.condensed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.expanded.html b/tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.expanded.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.expanded.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.expanded.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-condensed.html b/tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-condensed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-condensed.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-condensed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-expanded.html b/tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-expanded.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-expanded.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-expanded.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.normal.html b/tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.normal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.normal.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.normal.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-condensed.html b/tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-condensed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-condensed.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-condensed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-expanded.html b/tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-expanded.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-expanded.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-expanded.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-condensed.html b/tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-condensed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-condensed.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-condensed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-expanded.html b/tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-expanded.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-expanded.html rename to tests/wpt/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-expanded.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/fill-and-stroke-styles/2d.fillStyle.parse.current.notrendered.html b/tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/2d.fillStyle.parse.current.notrendered.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/fill-and-stroke-styles/2d.fillStyle.parse.current.notrendered.html rename to tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/2d.fillStyle.parse.current.notrendered.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/fill-and-stroke-styles/canvas_colorsandstyles_createlineargradient_001.htm b/tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/canvas_colorsandstyles_createlineargradient_001.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/fill-and-stroke-styles/canvas_colorsandstyles_createlineargradient_001.htm rename to tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/canvas_colorsandstyles_createlineargradient_001.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient-expected.html b/tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient-expected.html rename to tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient-rotation-expected.html b/tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient-rotation-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient-rotation-expected.html rename to tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient-rotation-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient-rotation.html b/tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient-rotation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient-rotation.html rename to tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient-rotation.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient.html b/tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient.html rename to tests/wpt/tests/html/canvas/element/manual/fill-and-stroke-styles/conic-gradient.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-fillStyle-opacity.html b/tests/wpt/tests/html/canvas/element/manual/filters/canvas-fillStyle-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-fillStyle-opacity.html rename to tests/wpt/tests/html/canvas/element/manual/filters/canvas-fillStyle-opacity.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-opacity-alpha-and-fillStyle-expected.html b/tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-opacity-alpha-and-fillStyle-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-opacity-alpha-and-fillStyle-expected.html rename to tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-opacity-alpha-and-fillStyle-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-opacity-alpha-and-fillStyle.html b/tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-opacity-alpha-and-fillStyle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-opacity-alpha-and-fillStyle.html rename to tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-opacity-alpha-and-fillStyle.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-opacity.html b/tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-opacity.html rename to tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-opacity.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-blur-expected.html b/tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-blur-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-blur-expected.html rename to tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-blur-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-blur.html b/tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-blur.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-blur.html rename to tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-blur.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-expected.html b/tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-expected.html rename to tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties.html b/tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties.html rename to tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow-expected.html b/tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow-expected.html rename to tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow.html b/tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow.html rename to tests/wpt/tests/html/canvas/element/manual/filters/canvas-filter-shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-globalAlpha.html b/tests/wpt/tests/html/canvas/element/manual/filters/canvas-globalAlpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-globalAlpha.html rename to tests/wpt/tests/html/canvas/element/manual/filters/canvas-globalAlpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-opacity-blend-modes-expected.html b/tests/wpt/tests/html/canvas/element/manual/filters/canvas-opacity-blend-modes-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-opacity-blend-modes-expected.html rename to tests/wpt/tests/html/canvas/element/manual/filters/canvas-opacity-blend-modes-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-opacity-blend-modes.html b/tests/wpt/tests/html/canvas/element/manual/filters/canvas-opacity-blend-modes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-opacity-blend-modes.html rename to tests/wpt/tests/html/canvas/element/manual/filters/canvas-opacity-blend-modes.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-opacity-expected.html b/tests/wpt/tests/html/canvas/element/manual/filters/canvas-opacity-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/canvas-opacity-expected.html rename to tests/wpt/tests/html/canvas/element/manual/filters/canvas-opacity-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-blur-expected.html b/tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-blur-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-blur-expected.html rename to tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-blur-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-blur.html b/tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-blur.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-blur.html rename to tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-blur.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-component-transfer-expected.html b/tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-component-transfer-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-component-transfer-expected.html rename to tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-component-transfer-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-component-transfer.html b/tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-component-transfer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-component-transfer.html rename to tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-component-transfer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-convolve-matrix-expected.html b/tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-convolve-matrix-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-convolve-matrix-expected.html rename to tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-convolve-matrix-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-convolve-matrix.html b/tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-convolve-matrix.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-convolve-matrix.html rename to tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-convolve-matrix.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-turbulence-expected.html b/tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-turbulence-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-turbulence-expected.html rename to tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-turbulence-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-turbulence.html b/tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-turbulence.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-turbulence.html rename to tests/wpt/tests/html/canvas/element/manual/filters/tentative/canvas-filter-object-turbulence.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-boolean-conversion-expected.html b/tests/wpt/tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-boolean-conversion-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-boolean-conversion-expected.html rename to tests/wpt/tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-boolean-conversion-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-boolean-conversion.html b/tests/wpt/tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-boolean-conversion.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-boolean-conversion.html rename to tests/wpt/tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-boolean-conversion.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-long-conversion-expected.html b/tests/wpt/tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-long-conversion-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-long-conversion-expected.html rename to tests/wpt/tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-long-conversion-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-long-conversion.html b/tests/wpt/tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-long-conversion.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-long-conversion.html rename to tests/wpt/tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-long-conversion.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-sequence-conversion.html b/tests/wpt/tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-sequence-conversion.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-sequence-conversion.html rename to tests/wpt/tests/html/canvas/element/manual/filters/tentative/idl-conversions/canvas-filter-sequence-conversion.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/image-smoothing/imagesmoothing.html b/tests/wpt/tests/html/canvas/element/manual/image-smoothing/imagesmoothing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/image-smoothing/imagesmoothing.html rename to tests/wpt/tests/html/canvas/element/manual/image-smoothing/imagesmoothing.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/canvas-ImageBitmap-close.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/canvas-ImageBitmap-close.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/canvas-ImageBitmap-close.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/canvas-ImageBitmap-close.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/canvas-createImageBitmap-resize.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/canvas-createImageBitmap-resize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/canvas-createImageBitmap-resize.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/canvas-createImageBitmap-resize.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/canvas-createImageBitmap-video-resize.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/canvas-createImageBitmap-video-resize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/canvas-createImageBitmap-video-resize.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/canvas-createImageBitmap-video-resize.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/common.sub.js b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/common.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/common.sub.js rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/common.sub.js diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-blob-invalidtype.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-blob-invalidtype.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-blob-invalidtype.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-blob-invalidtype.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-bounds.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-bounds.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-bounds.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-bounds.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-colorSpaceConversion.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-colorSpaceConversion.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-colorSpaceConversion.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-colorSpaceConversion.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-drawImage-closed.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-drawImage-closed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-drawImage-closed.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-drawImage-closed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-drawImage.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-drawImage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-drawImage.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-drawImage.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation_none.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation_none.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation_none.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation_none.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-in-worker-transfer.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-in-worker-transfer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-in-worker-transfer.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-in-worker-transfer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-invalid-args.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-invalid-args.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-invalid-args.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-invalid-args.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-origin.sub.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-origin.sub.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-serializable.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-serializable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-serializable.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-serializable.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-sizeOverflow.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-sizeOverflow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-sizeOverflow.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-sizeOverflow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-worker.js b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/createImageBitmap-worker.js rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/createImageBitmap-worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmap-from-imageData-no-image-rotation-expected.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmap-from-imageData-no-image-rotation-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmap-from-imageData-no-image-rotation-expected.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmap-from-imageData-no-image-rotation-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmap-from-imageData-no-image-rotation.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmap-from-imageData-no-image-rotation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmap-from-imageData-no-image-rotation.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmap-from-imageData-no-image-rotation.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-expected.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-expected.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-flipped-expected.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-flipped-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-flipped-expected.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-flipped-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-flipped.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-flipped.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-flipped.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-flipped.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-webgl-expected.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-webgl-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-webgl-expected.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-webgl-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-webgl.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-webgl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-webgl.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-webgl.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imagebitmap-replication-exif-orientation.html b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/imagebitmap-replication-exif-orientation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/imagebitmap-replication-exif-orientation.html rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/imagebitmap-replication-exif-orientation.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_1.jpg b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_1.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_1.jpg rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_1.jpg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_2.jpg b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_2.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_2.jpg rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_2.jpg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_3.jpg b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_3.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_3.jpg rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_3.jpg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_4.jpg b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_4.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_4.jpg rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_4.jpg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_5.jpg b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_5.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_5.jpg rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_5.jpg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_6.jpg b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_6.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_6.jpg rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_6.jpg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_7.jpg b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_7.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_7.jpg rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_7.jpg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_8.jpg b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_8.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/resources/squares_8.jpg rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/resources/squares_8.jpg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/serialize-worker.js b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/serialize-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/serialize-worker.js rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/serialize-worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/transfer-worker.js b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/transfer-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/transfer-worker.js rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/transfer-worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/worker-onmessage-noop.js b/tests/wpt/tests/html/canvas/element/manual/imagebitmap/worker-onmessage-noop.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/imagebitmap/worker-onmessage-noop.js rename to tests/wpt/tests/html/canvas/element/manual/imagebitmap/worker-onmessage-noop.js diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/line-styles/canvas_linestyles_linecap_001-ref.htm b/tests/wpt/tests/html/canvas/element/manual/line-styles/canvas_linestyles_linecap_001-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/line-styles/canvas_linestyles_linecap_001-ref.htm rename to tests/wpt/tests/html/canvas/element/manual/line-styles/canvas_linestyles_linecap_001-ref.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/line-styles/canvas_linestyles_linecap_001.htm b/tests/wpt/tests/html/canvas/element/manual/line-styles/canvas_linestyles_linecap_001.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/line-styles/canvas_linestyles_linecap_001.htm rename to tests/wpt/tests/html/canvas/element/manual/line-styles/canvas_linestyles_linecap_001.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/line-styles/lineto_a.html b/tests/wpt/tests/html/canvas/element/manual/line-styles/lineto_a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/line-styles/lineto_a.html rename to tests/wpt/tests/html/canvas/element/manual/line-styles/lineto_a.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/line-styles/lineto_ref.html b/tests/wpt/tests/html/canvas/element/manual/line-styles/lineto_ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/line-styles/lineto_ref.html rename to tests/wpt/tests/html/canvas/element/manual/line-styles/lineto_ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/line-styles/setLineDash.html b/tests/wpt/tests/html/canvas/element/manual/line-styles/setLineDash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/line-styles/setLineDash.html rename to tests/wpt/tests/html/canvas/element/manual/line-styles/setLineDash.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/shadows/canvas_shadows_001.htm b/tests/wpt/tests/html/canvas/element/manual/shadows/canvas_shadows_001.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/shadows/canvas_shadows_001.htm rename to tests/wpt/tests/html/canvas/element/manual/shadows/canvas_shadows_001.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/shadows/canvas_shadows_002-ref.htm b/tests/wpt/tests/html/canvas/element/manual/shadows/canvas_shadows_002-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/shadows/canvas_shadows_002-ref.htm rename to tests/wpt/tests/html/canvas/element/manual/shadows/canvas_shadows_002-ref.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/shadows/canvas_shadows_002.htm b/tests/wpt/tests/html/canvas/element/manual/shadows/canvas_shadows_002.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/shadows/canvas_shadows_002.htm rename to tests/wpt/tests/html/canvas/element/manual/shadows/canvas_shadows_002.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/shadows/canvas_shadows_system_colors-expected.html b/tests/wpt/tests/html/canvas/element/manual/shadows/canvas_shadows_system_colors-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/shadows/canvas_shadows_system_colors-expected.html rename to tests/wpt/tests/html/canvas/element/manual/shadows/canvas_shadows_system_colors-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/shadows/canvas_shadows_system_colors.html b/tests/wpt/tests/html/canvas/element/manual/shadows/canvas_shadows_system_colors.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/shadows/canvas_shadows_system_colors.html rename to tests/wpt/tests/html/canvas/element/manual/shadows/canvas_shadows_system_colors.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/shadows/shadowBlur_gaussian_tolerance.1.html b/tests/wpt/tests/html/canvas/element/manual/shadows/shadowBlur_gaussian_tolerance.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/shadows/shadowBlur_gaussian_tolerance.1.html rename to tests/wpt/tests/html/canvas/element/manual/shadows/shadowBlur_gaussian_tolerance.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/text-styles/canvas_text_font_001-ref.htm b/tests/wpt/tests/html/canvas/element/manual/text-styles/canvas_text_font_001-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/text-styles/canvas_text_font_001-ref.htm rename to tests/wpt/tests/html/canvas/element/manual/text-styles/canvas_text_font_001-ref.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/text-styles/canvas_text_font_001.htm b/tests/wpt/tests/html/canvas/element/manual/text-styles/canvas_text_font_001.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/text-styles/canvas_text_font_001.htm rename to tests/wpt/tests/html/canvas/element/manual/text-styles/canvas_text_font_001.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/the-canvas-state/2d.state.saverestore.imageSmoothingEnabled.html b/tests/wpt/tests/html/canvas/element/manual/the-canvas-state/2d.state.saverestore.imageSmoothingEnabled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/the-canvas-state/2d.state.saverestore.imageSmoothingEnabled.html rename to tests/wpt/tests/html/canvas/element/manual/the-canvas-state/2d.state.saverestore.imageSmoothingEnabled.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/the-canvas-state/2d.zero.size.canvas.html b/tests/wpt/tests/html/canvas/element/manual/the-canvas-state/2d.zero.size.canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/the-canvas-state/2d.zero.size.canvas.html rename to tests/wpt/tests/html/canvas/element/manual/the-canvas-state/2d.zero.size.canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/the-canvas-state/canvas_state_restore_001-ref.htm b/tests/wpt/tests/html/canvas/element/manual/the-canvas-state/canvas_state_restore_001-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/the-canvas-state/canvas_state_restore_001-ref.htm rename to tests/wpt/tests/html/canvas/element/manual/the-canvas-state/canvas_state_restore_001-ref.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/the-canvas-state/canvas_state_restore_001.htm b/tests/wpt/tests/html/canvas/element/manual/the-canvas-state/canvas_state_restore_001.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/the-canvas-state/canvas_state_restore_001.htm rename to tests/wpt/tests/html/canvas/element/manual/the-canvas-state/canvas_state_restore_001.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/transformations/2d.transformation.getTransform.html b/tests/wpt/tests/html/canvas/element/manual/transformations/2d.transformation.getTransform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/transformations/2d.transformation.getTransform.html rename to tests/wpt/tests/html/canvas/element/manual/transformations/2d.transformation.getTransform.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/transformations/canvas_transformations_reset_001-ref.html b/tests/wpt/tests/html/canvas/element/manual/transformations/canvas_transformations_reset_001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/transformations/canvas_transformations_reset_001-ref.html rename to tests/wpt/tests/html/canvas/element/manual/transformations/canvas_transformations_reset_001-ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/transformations/canvas_transformations_reset_001.html b/tests/wpt/tests/html/canvas/element/manual/transformations/canvas_transformations_reset_001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/transformations/canvas_transformations_reset_001.html rename to tests/wpt/tests/html/canvas/element/manual/transformations/canvas_transformations_reset_001.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/transformations/canvas_transformations_scale_001-ref.htm b/tests/wpt/tests/html/canvas/element/manual/transformations/canvas_transformations_scale_001-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/transformations/canvas_transformations_scale_001-ref.htm rename to tests/wpt/tests/html/canvas/element/manual/transformations/canvas_transformations_scale_001-ref.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/transformations/canvas_transformations_scale_001.htm b/tests/wpt/tests/html/canvas/element/manual/transformations/canvas_transformations_scale_001.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/transformations/canvas_transformations_scale_001.htm rename to tests/wpt/tests/html/canvas/element/manual/transformations/canvas_transformations_scale_001.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/transformations/transform_a.html b/tests/wpt/tests/html/canvas/element/manual/transformations/transform_a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/transformations/transform_a.html rename to tests/wpt/tests/html/canvas/element/manual/transformations/transform_a.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/transformations/transform_ref.html b/tests/wpt/tests/html/canvas/element/manual/transformations/transform_ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/transformations/transform_ref.html rename to tests/wpt/tests/html/canvas/element/manual/transformations/transform_ref.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-1-expected.htm b/tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-1-expected.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-1-expected.htm rename to tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-1-expected.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-1.htm b/tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-1.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-1.htm rename to tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-1.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-2-expected.htm b/tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-2-expected.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-2-expected.htm rename to tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-2-expected.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-2.htm b/tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-2.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-2.htm rename to tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-2.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-3-expected.htm b/tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-3-expected.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-3-expected.htm rename to tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-3-expected.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-3.htm b/tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-3.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-3.htm rename to tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-3.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-4-expected.htm b/tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-4-expected.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-4-expected.htm rename to tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-4-expected.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-4.htm b/tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-4.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/unclosed-canvas-4.htm rename to tests/wpt/tests/html/canvas/element/manual/unclosed-canvas-4.htm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/ImageData-fidelity.html b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/ImageData-fidelity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/ImageData-fidelity.html rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/ImageData-fidelity.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-Blob.html b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-Blob.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-Blob.html rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-Blob.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-ImageBitmap.html b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-ImageBitmap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-ImageBitmap.html rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-ImageBitmap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-ImageData.html b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-ImageData.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-ImageData.html rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-ImageData.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-canvas.html b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-canvas.html rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-cloned.html b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-cloned.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-cloned.html rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-cloned.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-image.html b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-image.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-image.html rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-image.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-video.html b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-video.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-video.html rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-ImageBitmap-video.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-video.html b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-video.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-video.html rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage-video.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage.https.html b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage.https.html rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage.https.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-pattern-canvas.html b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-pattern-canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-pattern-canvas.html rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-pattern-canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-pattern-image.html b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-pattern-image.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-pattern-image.html rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-pattern-image.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-settings.html b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-settings.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-settings.html rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-settings.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3.js b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3.js rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3.js diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imagedata-no-color-settings-crash.html b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/imagedata-no-color-settings-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imagedata-no-color-settings-crash.html rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/imagedata-no-color-settings-crash.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BB0000CC.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BB0000CC.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BB0000CC.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BB0000CC.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BB0000FF.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BB0000FF.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BB0000FF.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BB0000FF.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BBBC00000000CCCC.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BBBC00000000CCCC.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BBBC00000000CCCC.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BBBC00000000CCCC.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BBBC00000000FFFF.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BBBC00000000FFFF.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BBBC00000000FFFF.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-BBBC00000000FFFF.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FF0000CC.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FF0000CC.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FF0000CC.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FF0000CC.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FF0000FF.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FF0000FF.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FF0000FF.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FF0000FF.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FFFF00000000CCCC.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FFFF00000000CCCC.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FFFF00000000CCCC.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FFFF00000000CCCC.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FFFF00000000FFFF.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FFFF00000000FFFF.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FFFF00000000FFFF.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Adobe-RGB-FFFF00000000FFFF.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-0.7333-0-0.svg b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-0.7333-0-0.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-0.7333-0-0.svg rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-0.7333-0-0.svg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-1-0-0.svg b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-1-0-0.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-1-0-0.svg rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-1-0-0.svg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BB0000CC.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BB0000CC.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BB0000CC.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BB0000CC.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BB0000FF.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BB0000FF.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BB0000FF.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BB0000FF.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BBBC00000000CCCC.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BBBC00000000CCCC.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BBBC00000000CCCC.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BBBC00000000CCCC.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BBBC00000000FFFF.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BBBC00000000FFFF.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BBBC00000000FFFF.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-BBBC00000000FFFF.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FF0000CC.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FF0000CC.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FF0000CC.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FF0000CC.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FF0000FF.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FF0000FF.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FF0000FF.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FF0000FF.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FFFF00000000CCCC.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FFFF00000000CCCC.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FFFF00000000CCCC.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FFFF00000000CCCC.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FFFF00000000FFFF.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FFFF00000000FFFF.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FFFF00000000FFFF.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Display-P3-FFFF00000000FFFF.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Generic-CMYK-BE000000.jpg b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Generic-CMYK-BE000000.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Generic-CMYK-BE000000.jpg rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Generic-CMYK-BE000000.jpg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Generic-CMYK-FF000000.jpg b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Generic-CMYK-FF000000.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Generic-CMYK-FF000000.jpg rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Generic-CMYK-FF000000.jpg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-222000000.mp4 b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-222000000.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-222000000.mp4 rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-222000000.mp4 diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-222000000.webm b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-222000000.webm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-222000000.webm rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-222000000.webm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-3FF000000.mp4 b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-3FF000000.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-3FF000000.mp4 rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-3FF000000.mp4 diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-3FF000000.webm b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-3FF000000.webm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-3FF000000.webm rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/Rec2020-3FF000000.webm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-semitransparent-p3d65.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-semitransparent-p3d65.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-semitransparent-p3d65.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-semitransparent-p3d65.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-semitransparent-rec2020.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-semitransparent-rec2020.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-semitransparent-rec2020.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-semitransparent-rec2020.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-semitransparent-srgb.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-semitransparent-srgb.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-semitransparent-srgb.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-semitransparent-srgb.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-fullcolor.ogv b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-fullcolor.ogv similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-fullcolor.ogv rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-fullcolor.ogv diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.avif b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.avif similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.avif rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.avif diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.bmp b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.bmp similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.bmp rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.bmp diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.ico b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.ico similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.ico rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.ico diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.webp b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.webp similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.webp rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb-transparent.webp diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.avif b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.avif similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.avif rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.avif diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.bmp b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.bmp similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.bmp rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.bmp diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.gif b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.gif similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.gif rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.gif diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.ico b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.ico similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.ico rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.ico diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.jpg b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.jpg rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.jpg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.svg b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.svg rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.svg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.webp b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.webp similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.webp rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/pattern-srgb.webp diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_AdobeRGB_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_AdobeRGB_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_AdobeRGB_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_AdobeRGB_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_AdobeRGB_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_AdobeRGB_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_AdobeRGB_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_AdobeRGB_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_DisplayP3_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_DisplayP3_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_DisplayP3_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_DisplayP3_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_DisplayP3_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_DisplayP3_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_DisplayP3_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_DisplayP3_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_ProPhoto_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_ProPhoto_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_ProPhoto_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_ProPhoto_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_ProPhoto_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_ProPhoto_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_ProPhoto_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_ProPhoto_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_Rec2020_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_Rec2020_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_Rec2020_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_Rec2020_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_Rec2020_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_Rec2020_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_Rec2020_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_Rec2020_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_AdobeRGB_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_AdobeRGB_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_AdobeRGB_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_AdobeRGB_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_AdobeRGB_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_AdobeRGB_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_AdobeRGB_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_AdobeRGB_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_DisplayP3_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_DisplayP3_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_DisplayP3_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_DisplayP3_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_DisplayP3_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_DisplayP3_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_DisplayP3_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_DisplayP3_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_ProPhoto_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_ProPhoto_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_ProPhoto_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_ProPhoto_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_ProPhoto_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_ProPhoto_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_ProPhoto_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_ProPhoto_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_Rec2020_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_Rec2020_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_Rec2020_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_Rec2020_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_Rec2020_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_Rec2020_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_Rec2020_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_Rec2020_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_sRGB_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_sRGB_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_sRGB_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_sRGB_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_sRGB_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_sRGB_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_sRGB_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_interlaced_sRGB_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_sRGB_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_sRGB_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_sRGB_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_sRGB_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_sRGB_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_sRGB_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_sRGB_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_16bit_sRGB_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_AdobeRGB_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_AdobeRGB_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_AdobeRGB_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_AdobeRGB_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_AdobeRGB_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_AdobeRGB_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_AdobeRGB_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_AdobeRGB_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_DisplayP3_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_DisplayP3_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_DisplayP3_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_DisplayP3_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_DisplayP3_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_DisplayP3_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_DisplayP3_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_DisplayP3_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_ProPhoto_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_ProPhoto_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_ProPhoto_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_ProPhoto_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_ProPhoto_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_ProPhoto_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_ProPhoto_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_ProPhoto_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_Rec2020_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_Rec2020_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_Rec2020_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_Rec2020_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_Rec2020_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_Rec2020_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_Rec2020_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_Rec2020_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_sRGB_opaque.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_sRGB_opaque.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_sRGB_opaque.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_sRGB_opaque.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_sRGB_transparent.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_sRGB_transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_sRGB_transparent.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/png-16bit/2x2_8bit_sRGB_transparent.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000.mp4 b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000.mp4 rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000.mp4 diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000.svg b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000.svg rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000.svg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000.webm b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000.webm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000.webm rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000.webm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000CC.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000CC.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000CC.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000CC.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000FF.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000FF.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000FF.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BB0000FF.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BBBC00000000CCCC.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BBBC00000000CCCC.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BBBC00000000CCCC.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BBBC00000000CCCC.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BBBC00000000FFFF.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BBBC00000000FFFF.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BBBC00000000FFFF.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-BBBC00000000FFFF.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0000.svg b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0000.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0000.svg rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0000.svg diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0000CC.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0000CC.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0000CC.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0000CC.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0000FF.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0000FF.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0000FF.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0000FF.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0100.mp4 b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0100.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0100.mp4 rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0100.mp4 diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0100.webm b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0100.webm similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0100.webm rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FF0100.webm diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FFFF00000000CCCC.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FFFF00000000CCCC.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FFFF00000000CCCC.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FFFF00000000CCCC.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FFFF00000000FFFF.png b/tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FFFF00000000FFFF.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FFFF00000000FFFF.png rename to tests/wpt/tests/html/canvas/element/manual/wide-gamut-canvas/resources/sRGB-FFFF00000000FFFF.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.angle.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.angle.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.angle.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.angle.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.angle.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.angle.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.angle.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.angle.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.angle.3.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.angle.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.angle.3.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.angle.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.angle.4.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.angle.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.angle.4.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.angle.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.angle.5.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.angle.5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.angle.5.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.angle.5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.angle.6.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.angle.6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.angle.6.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.angle.6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.default.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.default.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.empty.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.empty.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.end.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.end.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.end.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.end.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.negative.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.negative.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.nonempty.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.nonempty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.nonempty.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.nonempty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.nonfinite.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.nonfinite.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.scale.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.scale.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.scale.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.scale.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.scale.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.scale.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.scale.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.scale.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.selfintersect.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.selfintersect.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.selfintersect.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.selfintersect.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.selfintersect.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.selfintersect.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.selfintersect.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.selfintersect.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.shape.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.shape.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.shape.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.shape.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.shape.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.shape.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.shape.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.shape.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.shape.3.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.shape.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.shape.3.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.shape.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.shape.4.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.shape.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.shape.4.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.shape.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.shape.5.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.shape.5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.shape.5.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.shape.5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.twopie.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.twopie.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.twopie.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.twopie.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.twopie.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.twopie.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.twopie.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.twopie.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.twopie.3.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.twopie.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.twopie.3.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.twopie.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.twopie.4.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.twopie.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.twopie.4.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.twopie.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.zero.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.zero.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.zero.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.zero.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.zero.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.zero.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.zero.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.zero.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.zeroradius.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.zeroradius.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arc.zeroradius.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arc.zeroradius.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.coincide.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.coincide.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.coincide.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.coincide.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.coincide.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.coincide.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.coincide.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.coincide.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.collinear.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.collinear.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.collinear.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.collinear.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.collinear.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.collinear.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.collinear.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.collinear.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.collinear.3.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.collinear.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.collinear.3.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.collinear.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.ensuresubpath.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.ensuresubpath.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.ensuresubpath.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.ensuresubpath.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.ensuresubpath.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.ensuresubpath.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.ensuresubpath.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.ensuresubpath.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.negative.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.negative.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.nonfinite.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.nonfinite.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.scale.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.scale.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.scale.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.scale.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.shape.curve1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.shape.curve1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.shape.curve1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.shape.curve1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.shape.curve2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.shape.curve2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.shape.curve2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.shape.curve2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.shape.end.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.shape.end.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.shape.end.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.shape.end.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.shape.start.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.shape.start.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.shape.start.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.shape.start.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.transformation.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.transformation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.transformation.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.transformation.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.zero.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.zero.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.zero.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.zero.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.zero.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.zero.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.arcTo.zero.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.arcTo.zero.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.beginPath.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.beginPath.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.beginPath.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.beginPath.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.basic.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.basic.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.nonfinite.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.nonfinite.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.scaled.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.scaled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.scaled.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.scaled.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.shape.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.shape.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.shape.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.bezierCurveTo.shape.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.clip.basic.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.clip.basic.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.clip.basic.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.clip.basic.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.clip.basic.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.clip.basic.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.clip.basic.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.clip.basic.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.clip.empty.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.clip.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.clip.empty.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.clip.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.clip.intersect.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.clip.intersect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.clip.intersect.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.clip.intersect.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.clip.unaffected.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.clip.unaffected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.clip.unaffected.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.clip.unaffected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.clip.winding.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.clip.winding.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.clip.winding.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.clip.winding.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.clip.winding.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.clip.winding.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.clip.winding.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.clip.winding.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.closePath.empty.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.closePath.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.closePath.empty.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.closePath.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.closePath.newline.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.closePath.newline.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.closePath.newline.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.closePath.newline.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.closePath.nextpoint.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.closePath.nextpoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.closePath.nextpoint.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.closePath.nextpoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.ellipse.basics.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.ellipse.basics.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.ellipse.basics.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.ellipse.basics.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.closed.basic.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.closed.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.closed.basic.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.closed.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.closed.unaffected.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.closed.unaffected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.closed.unaffected.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.closed.unaffected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.overlap.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.overlap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.overlap.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.overlap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.overlap.png b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.overlap.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.overlap.png rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.overlap.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.winding.add.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.winding.add.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.winding.add.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.winding.add.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.winding.subtract.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.winding.subtract.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.winding.subtract.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.winding.subtract.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.winding.subtract.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.winding.subtract.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.winding.subtract.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.winding.subtract.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.winding.subtract.3.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.winding.subtract.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.fill.winding.subtract.3.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.fill.winding.subtract.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.initial.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.initial.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.initial.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.arc.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.arc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.arc.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.arc.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.basic.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.basic.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.basic.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.basic.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.basic.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.basic.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.basic.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.basic.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.basic.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.basic.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.bezier.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.bezier.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.bezier.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.bezier.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.bigarc.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.bigarc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.bigarc.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.bigarc.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.edge.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.edge.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.edge.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.edge.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.empty.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.empty.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.nonfinite.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.nonfinite.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.outside.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.outside.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.subpath.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.subpath.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.subpath.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.subpath.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.3.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.3.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.4.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.4.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.transform.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.unclosed.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.unclosed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.unclosed.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.unclosed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.winding.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.winding.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInPath.winding.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInPath.winding.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInStroke.scaleddashes.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInStroke.scaleddashes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInStroke.scaleddashes.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInStroke.scaleddashes.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInpath.invalid.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInpath.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInpath.invalid.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInpath.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInpath.multi.path.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInpath.multi.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.isPointInpath.multi.path.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.isPointInpath.multi.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.lineTo.basic.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.lineTo.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.lineTo.basic.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.lineTo.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.lineTo.ensuresubpath.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.lineTo.ensuresubpath.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.lineTo.ensuresubpath.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.lineTo.ensuresubpath.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.lineTo.ensuresubpath.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.lineTo.ensuresubpath.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.lineTo.ensuresubpath.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.lineTo.ensuresubpath.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.lineTo.nextpoint.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.lineTo.nextpoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.lineTo.nextpoint.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.lineTo.nextpoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.lineTo.nonfinite.details.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.lineTo.nonfinite.details.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.lineTo.nonfinite.details.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.lineTo.nonfinite.details.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.lineTo.nonfinite.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.lineTo.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.lineTo.nonfinite.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.lineTo.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.moveTo.basic.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.moveTo.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.moveTo.basic.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.moveTo.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.moveTo.multiple.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.moveTo.multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.moveTo.multiple.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.moveTo.multiple.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.moveTo.newsubpath.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.moveTo.newsubpath.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.moveTo.newsubpath.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.moveTo.newsubpath.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.moveTo.nonfinite.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.moveTo.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.moveTo.nonfinite.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.moveTo.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.basic.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.basic.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.nonfinite.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.nonfinite.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.scaled.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.scaled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.scaled.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.scaled.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.shape.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.shape.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.shape.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.quadraticCurveTo.shape.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.basic.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.basic.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.closed.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.closed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.closed.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.closed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.end.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.end.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.end.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.end.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.end.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.end.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.end.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.end.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.negative.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.negative.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.newsubpath.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.newsubpath.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.newsubpath.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.newsubpath.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.nonfinite.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.nonfinite.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.selfintersect.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.selfintersect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.selfintersect.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.selfintersect.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.winding.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.winding.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.winding.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.winding.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.zero.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.zero.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.zero.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.zero.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.zero.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.zero.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.zero.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.zero.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.zero.3.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.zero.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.zero.3.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.zero.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.zero.4.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.zero.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.zero.4.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.zero.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.zero.5.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.zero.5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.zero.5.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.zero.5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.zero.6.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.zero.6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.rect.zero.6.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.rect.zero.6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompoint.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompoint.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompoint.single argument.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompoint.single argument.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompoint.single argument.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompoint.single argument.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompointinit.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompointinit.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompointinit.single.argument.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompointinit.single.argument.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompointinit.single.argument.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.dompointinit.single.argument.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.double.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.double.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.double.single.argument.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.double.single.argument.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.double.single.argument.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.1.radius.double.single.argument.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.1.dompoint.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.1.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.1.dompoint.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.1.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.1.dompointinit.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.1.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.1.dompointinit.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.1.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.1.double.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.1.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.1.double.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.1.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.2.dompoint.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.2.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.2.dompoint.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.2.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.2.dompointinit.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.2.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.2.dompointinit.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.2.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.2.double.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.2.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.2.double.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.2.radii.2.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.1.dompoint.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.1.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.1.dompoint.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.1.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.1.dompointinit.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.1.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.1.dompointinit.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.1.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.1.double.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.1.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.1.double.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.1.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.2.dompoint.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.2.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.2.dompoint.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.2.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.2.dompointinit.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.2.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.2.dompointinit.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.2.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.2.double.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.2.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.2.double.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.2.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.3.dompoint.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.3.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.3.dompoint.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.3.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.3.dompointinit.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.3.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.3.dompointinit.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.3.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.3.double.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.3.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.3.double.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.3.radii.3.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.1.dompoint.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.1.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.1.dompoint.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.1.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.1.dompointinit.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.1.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.1.dompointinit.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.1.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.1.double.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.1.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.1.double.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.1.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.2.dompoint.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.2.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.2.dompoint.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.2.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.2.dompointinit.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.2.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.2.dompointinit.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.2.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.2.double.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.2.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.2.double.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.2.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.3.dompoint.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.3.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.3.dompoint.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.3.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.3.dompointinit.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.3.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.3.dompointinit.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.3.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.3.double.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.3.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.3.double.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.3.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.4.dompoint.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.4.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.4.dompoint.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.4.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.4.dompointinit.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.4.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.4.dompointinit.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.4.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.4.double.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.4.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.4.double.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.4.radii.4.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.badinput.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.badinput.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.badinput.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.badinput.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.closed.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.closed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.closed.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.closed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.end.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.end.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.end.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.end.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.end.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.end.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.end.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.end.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.end.3.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.end.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.end.3.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.end.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.end.4.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.end.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.end.4.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.end.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.negative.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.negative.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.newsubpath.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.newsubpath.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.newsubpath.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.newsubpath.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.nonfinite.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.nonfinite.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.radius.intersecting.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.radius.intersecting.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.radius.intersecting.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.radius.intersecting.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.radius.intersecting.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.radius.intersecting.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.radius.intersecting.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.radius.intersecting.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.radius.negative.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.radius.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.radius.negative.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.radius.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.radius.noargument.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.radius.noargument.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.radius.noargument.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.radius.noargument.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.radius.noarugment.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.radius.noarugment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.radius.noarugment.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.radius.noarugment.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.radius.none.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.radius.none.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.radius.none.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.radius.none.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.radius.toomany.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.radius.toomany.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.radius.toomany.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.radius.toomany.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.selfintersect.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.selfintersect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.selfintersect.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.selfintersect.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.winding.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.winding.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.winding.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.winding.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.zero.1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.zero.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.zero.1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.zero.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.zero.2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.zero.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.zero.2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.zero.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.zero.3.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.zero.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.zero.3.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.zero.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.zero.4.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.zero.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.zero.4.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.zero.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.zero.5.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.zero.5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.zero.5.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.zero.5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.zero.6.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.zero.6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.roundrect.zero.6.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.roundrect.zero.6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.empty.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.empty.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.overlap.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.overlap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.overlap.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.overlap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.overlap.png b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.overlap.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.overlap.png rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.overlap.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.prune.arc.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.prune.arc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.prune.arc.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.prune.arc.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.prune.closed.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.prune.closed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.prune.closed.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.prune.closed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.prune.corner.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.prune.corner.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.prune.corner.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.prune.corner.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.prune.curve.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.prune.curve.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.prune.curve.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.prune.curve.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.prune.line.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.prune.line.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.prune.line.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.prune.line.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.prune.rect.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.prune.rect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.prune.rect.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.prune.rect.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.scale1.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.scale1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.scale1.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.scale1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.scale2.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.scale2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.scale2.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.scale2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.skew.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.skew.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.skew.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.skew.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.unaffected.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.unaffected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.unaffected.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.unaffected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.union.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.union.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.stroke.union.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.stroke.union.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.transformation.basic.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.transformation.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.transformation.basic.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.transformation.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.transformation.changing.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.transformation.changing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.transformation.changing.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.transformation.changing.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.transformation.multiple.html b/tests/wpt/tests/html/canvas/element/path-objects/2d.path.transformation.multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/path-objects/2d.path.transformation.multiple.html rename to tests/wpt/tests/html/canvas/element/path-objects/2d.path.transformation.multiple.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create.and.resize.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create.and.resize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create.and.resize.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create.and.resize.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.basic.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.basic.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.initial.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.initial.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.initial.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.this.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.this.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.this.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.this.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.type.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.type.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.type.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.zero.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.zero.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create1.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.basic.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.basic.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.double.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.double.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.initial.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.initial.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.initial.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.large.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.large.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.large.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.large.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.negative.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.negative.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.nonfinite.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.nonfinite.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.round.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.round.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.round.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.round.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.this.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.this.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.this.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.this.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.type.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.type.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.type.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.zero.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.zero.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.basic.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.basic.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.clamp.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.clamp.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.clamp.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.clamp.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.double.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.double.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.invalid.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.invalid.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.large.crash.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.large.crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.large.crash.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.large.crash.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.length.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.length.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.length.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.length.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.nonfinite.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.nonfinite.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.nonpremul.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.nonpremul.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.nonpremul.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.nonpremul.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.alpha.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.alpha.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.cols.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.cols.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.cols.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.cols.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.rgb.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.rgb.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.rgb.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.rgb.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.rows.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.rows.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.rows.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.order.rows.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.range.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.range.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.range.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.range.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.rounding.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.rounding.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.rounding.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.rounding.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.source.negative.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.source.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.source.negative.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.source.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.source.outside.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.source.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.source.outside.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.source.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.source.size.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.source.size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.source.size.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.source.size.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.type.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.type.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.type.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.unaffected.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.unaffected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.unaffected.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.unaffected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.zero.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.get.zero.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.get.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.clamp.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.clamp.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.clamp.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.clamp.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.array.bounds.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.array.bounds.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.array.bounds.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.array.bounds.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.array.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.array.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.array.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.array.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.basics.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.basics.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.basics.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.basics.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.size.bounds.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.size.bounds.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.size.bounds.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.size.bounds.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.size.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.size.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.ctor.size.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.nan.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.nan.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.nan.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.nan.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.properties.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.properties.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.properties.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.properties.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.readonly.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.readonly.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.readonly.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.readonly.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.round.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.round.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.round.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.round.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.set.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.set.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.set.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.set.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.string.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.string.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.string.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.string.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.undefined.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.object.undefined.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.object.undefined.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.alpha.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.alpha.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.alpha.png b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.alpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.alpha.png rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.alpha.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.basic.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.basic.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.clip.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.clip.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.clip.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.created.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.created.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.created.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.created.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.cross.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.cross.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.cross.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.cross.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.negative.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.negative.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.outside.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.outside.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.rect1.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.rect1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.rect1.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.rect1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.rect2.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.rect2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.rect2.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.rect2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.zero.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.zero.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.dirty.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.modified.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.modified.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.modified.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.modified.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.nonfinite.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.nonfinite.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.null.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.null.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.null.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.null.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.path.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.path.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.unaffected.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.unaffected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.unaffected.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.unaffected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.unchanged.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.unchanged.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.unchanged.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.unchanged.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.wrongtype.html b/tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.wrongtype.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.put.wrongtype.html rename to tests/wpt/tests/html/canvas/element/pixel-manipulation/2d.imageData.put.wrongtype.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/reset/2d.reset.basic.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/reset/2d.reset.basic.html rename to tests/wpt/tests/html/canvas/element/reset/2d.reset.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/scroll/2d.scrollPathIntoView.basic.html b/tests/wpt/tests/html/canvas/element/scroll/2d.scrollPathIntoView.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/scroll/2d.scrollPathIntoView.basic.html rename to tests/wpt/tests/html/canvas/element/scroll/2d.scrollPathIntoView.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/scroll/2d.scrollPathIntoView.path.html b/tests/wpt/tests/html/canvas/element/scroll/2d.scrollPathIntoView.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/scroll/2d.scrollPathIntoView.path.html rename to tests/wpt/tests/html/canvas/element/scroll/2d.scrollPathIntoView.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/scroll/2d.scrollPathIntoView.verticalLR.html b/tests/wpt/tests/html/canvas/element/scroll/2d.scrollPathIntoView.verticalLR.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/scroll/2d.scrollPathIntoView.verticalLR.html rename to tests/wpt/tests/html/canvas/element/scroll/2d.scrollPathIntoView.verticalLR.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/scroll/2d.scrollPathIntoView.verticalRL.html b/tests/wpt/tests/html/canvas/element/scroll/2d.scrollPathIntoView.verticalRL.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/scroll/2d.scrollPathIntoView.verticalRL.html rename to tests/wpt/tests/html/canvas/element/scroll/2d.scrollPathIntoView.verticalRL.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.1.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.1.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.2.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.2.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.2.png b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.2.png rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.3.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.3.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.3.png b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.3.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.3.png rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.3.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.4.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.4.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.4.png b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.4.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.4.png rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.4.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.5.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.5.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.5.png b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.5.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.alpha.5.png rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.alpha.5.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowBlur.initial.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowBlur.initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowBlur.initial.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowBlur.initial.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowBlur.invalid.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowBlur.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowBlur.invalid.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowBlur.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowBlur.valid.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowBlur.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowBlur.valid.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowBlur.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowColor.initial.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowColor.initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowColor.initial.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowColor.initial.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowColor.invalid.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowColor.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowColor.invalid.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowColor.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowColor.valid.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowColor.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowColor.valid.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowColor.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowOffset.initial.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowOffset.initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowOffset.initial.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowOffset.initial.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowOffset.invalid.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowOffset.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowOffset.invalid.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowOffset.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowOffset.valid.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowOffset.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.attributes.shadowOffset.valid.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.attributes.shadowOffset.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.blur.high-manual.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.blur.high-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.blur.high-manual.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.blur.high-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.blur.high.png b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.blur.high.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.blur.high.png rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.blur.high.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.blur.low-manual.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.blur.low-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.blur.low-manual.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.blur.low-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.blur.low.png b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.blur.low.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.blur.low.png rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.blur.low.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.canvas.alpha.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.canvas.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.canvas.alpha.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.canvas.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.canvas.alpha.png b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.canvas.alpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.canvas.alpha.png rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.canvas.alpha.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.canvas.basic.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.canvas.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.canvas.basic.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.canvas.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.canvas.transparent.1.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.canvas.transparent.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.canvas.transparent.1.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.canvas.transparent.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.canvas.transparent.2.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.canvas.transparent.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.canvas.transparent.2.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.canvas.transparent.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.clip.1.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.clip.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.clip.1.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.clip.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.clip.2.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.clip.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.clip.2.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.clip.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.clip.3.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.clip.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.clip.3.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.clip.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.composite.1.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.composite.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.composite.1.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.composite.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.composite.2.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.composite.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.composite.2.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.composite.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.composite.3.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.composite.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.composite.3.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.composite.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.enable.blur.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.enable.blur.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.enable.blur.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.enable.blur.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.enable.off.1.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.enable.off.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.enable.off.1.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.enable.off.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.enable.off.2.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.enable.off.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.enable.off.2.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.enable.off.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.enable.x.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.enable.x.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.enable.x.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.enable.x.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.enable.y.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.enable.y.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.enable.y.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.enable.y.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.gradient.alpha.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.gradient.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.gradient.alpha.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.gradient.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.gradient.alpha.png b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.gradient.alpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.gradient.alpha.png rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.gradient.alpha.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.gradient.basic.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.gradient.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.gradient.basic.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.gradient.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.gradient.transparent.1.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.gradient.transparent.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.gradient.transparent.1.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.gradient.transparent.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.gradient.transparent.2.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.gradient.transparent.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.gradient.transparent.2.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.gradient.transparent.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.image.alpha.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.image.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.image.alpha.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.image.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.image.alpha.png b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.image.alpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.image.alpha.png rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.image.alpha.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.image.basic.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.image.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.image.basic.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.image.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.image.scale.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.image.scale.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.image.scale.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.image.scale.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.image.section.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.image.section.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.image.section.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.image.section.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.image.transparent.1.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.image.transparent.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.image.transparent.1.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.image.transparent.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.image.transparent.2.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.image.transparent.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.image.transparent.2.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.image.transparent.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.offset.negativeX.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.offset.negativeX.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.offset.negativeX.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.offset.negativeX.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.offset.negativeY.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.offset.negativeY.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.offset.negativeY.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.offset.negativeY.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.offset.positiveX.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.offset.positiveX.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.offset.positiveX.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.offset.positiveX.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.offset.positiveY.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.offset.positiveY.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.offset.positiveY.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.offset.positiveY.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.outside.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.outside.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.pattern.alpha.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.pattern.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.pattern.alpha.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.pattern.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.pattern.alpha.png b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.pattern.alpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.pattern.alpha.png rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.pattern.alpha.png diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.pattern.basic.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.pattern.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.pattern.basic.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.pattern.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.pattern.transparent.1.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.pattern.transparent.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.pattern.transparent.1.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.pattern.transparent.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.pattern.transparent.2.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.pattern.transparent.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.pattern.transparent.2.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.pattern.transparent.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.stroke.basic.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.stroke.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.stroke.basic.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.stroke.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.stroke.cap.1.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.stroke.cap.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.stroke.cap.1.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.stroke.cap.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.stroke.cap.2.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.stroke.cap.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.stroke.cap.2.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.stroke.cap.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.stroke.join.1.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.stroke.join.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.stroke.join.1.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.stroke.join.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.stroke.join.2.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.stroke.join.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.stroke.join.2.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.stroke.join.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.stroke.join.3.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.stroke.join.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.stroke.join.3.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.stroke.join.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.transform.1.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.transform.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.transform.1.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.transform.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.transform.2.html b/tests/wpt/tests/html/canvas/element/shadows/2d.shadow.transform.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/shadows/2d.shadow.transform.2.html rename to tests/wpt/tests/html/canvas/element/shadows/2d.shadow.transform.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.align.default.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.align.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.align.default.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.align.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.align.invalid.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.align.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.align.invalid.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.align.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.align.valid.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.align.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.align.valid.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.align.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.baseline.default.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.baseline.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.baseline.default.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.baseline.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.baseline.invalid.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.baseline.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.baseline.invalid.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.baseline.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.baseline.valid.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.baseline.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.baseline.valid.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.baseline.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.baseline.alphabetic.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.baseline.alphabetic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.baseline.alphabetic.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.baseline.alphabetic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.baseline.bottom.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.baseline.bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.baseline.bottom.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.baseline.bottom.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.baseline.hanging.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.baseline.hanging.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.baseline.hanging.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.baseline.hanging.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.baseline.ideographic.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.baseline.ideographic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.baseline.ideographic.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.baseline.ideographic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.baseline.middle.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.baseline.middle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.baseline.middle.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.baseline.middle.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.baseline.top.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.baseline.top.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.baseline.top.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.baseline.top.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.end.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.end.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.end.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.end.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.other.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.other.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.other.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.other.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.space.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.space.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.space.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.space.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.start.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.start.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.start.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.draw.space.collapse.start.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.default.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.default.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.basic.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.basic.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.complex.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.complex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.complex.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.complex.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.complex2.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.complex2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.complex2.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.complex2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.family.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.family.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.family.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.family.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.invalid.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.invalid.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.size.percentage.default.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.size.percentage.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.size.percentage.default.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.size.percentage.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.size.percentage.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.size.percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.size.percentage.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.size.percentage.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.system.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.system.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.system.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.system.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.tiny.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.tiny.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.parse.tiny.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.parse.tiny.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.relative_size.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.relative_size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.font.relative_size.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.font.relative_size.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.measure.width.space.html b/tests/wpt/tests/html/canvas/element/text-styles/2d.text.measure.width.space.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/2d.text.measure.width.space.html rename to tests/wpt/tests/html/canvas/element/text-styles/2d.text.measure.width.space.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/text-styles/parent-style-relative-units.html b/tests/wpt/tests/html/canvas/element/text-styles/parent-style-relative-units.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/text-styles/parent-style-relative-units.html rename to tests/wpt/tests/html/canvas/element/text-styles/parent-style-relative-units.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.bitmap.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.bitmap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.bitmap.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.bitmap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.clip.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.clip.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.clip.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.fillStyle.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.fillStyle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.fillStyle.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.fillStyle.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.font.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.font.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.font.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.font.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.globalAlpha.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.globalAlpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.globalAlpha.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.globalAlpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.lineCap.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.lineCap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.lineCap.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.lineCap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.lineJoin.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.lineJoin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.lineJoin.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.lineJoin.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.lineWidth.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.lineWidth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.lineWidth.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.lineWidth.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.miterLimit.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.miterLimit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.miterLimit.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.miterLimit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.path.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.path.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowBlur.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowBlur.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowBlur.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowBlur.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowColor.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowColor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowColor.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowColor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowOffsetX.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowOffsetX.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowOffsetX.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowOffsetX.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowOffsetY.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowOffsetY.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowOffsetY.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.shadowOffsetY.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.stack.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.stack.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.stack.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.stack.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.stackdepth.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.stackdepth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.stackdepth.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.stackdepth.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.strokeStyle.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.strokeStyle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.strokeStyle.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.strokeStyle.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.textAlign.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.textAlign.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.textAlign.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.textAlign.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.textBaseline.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.textBaseline.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.textBaseline.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.textBaseline.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.transformation.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.transformation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.transformation.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.transformation.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.underflow.html b/tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.underflow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/the-canvas-state/2d.state.saverestore.underflow.html rename to tests/wpt/tests/html/canvas/element/the-canvas-state/2d.state.saverestore.underflow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.order.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.order.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.order.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.order.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.rotate.direction.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.rotate.direction.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.rotate.direction.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.rotate.direction.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.rotate.nonfinite.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.rotate.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.rotate.nonfinite.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.rotate.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.rotate.radians.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.rotate.radians.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.rotate.radians.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.rotate.radians.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.rotate.wrap.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.rotate.wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.rotate.wrap.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.rotate.wrap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.rotate.wrapnegative.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.rotate.wrapnegative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.rotate.wrapnegative.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.rotate.wrapnegative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.rotate.zero.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.rotate.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.rotate.zero.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.rotate.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.scale.basic.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.scale.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.scale.basic.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.scale.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.scale.large.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.scale.large.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.scale.large.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.scale.large.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.scale.multiple.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.scale.multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.scale.multiple.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.scale.multiple.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.scale.negative.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.scale.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.scale.negative.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.scale.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.scale.nonfinite.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.scale.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.scale.nonfinite.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.scale.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.scale.zero.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.scale.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.scale.zero.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.scale.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.setTransform.multiple.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.setTransform.multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.setTransform.multiple.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.setTransform.multiple.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.setTransform.nonfinite.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.setTransform.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.setTransform.nonfinite.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.setTransform.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.setTransform.skewed.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.setTransform.skewed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.setTransform.skewed.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.setTransform.skewed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.transform.identity.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.transform.identity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.transform.identity.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.transform.identity.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.transform.multiply.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.transform.multiply.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.transform.multiply.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.transform.multiply.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.transform.nonfinite.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.transform.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.transform.nonfinite.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.transform.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.transform.skewed.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.transform.skewed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.transform.skewed.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.transform.skewed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.translate.basic.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.translate.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.translate.basic.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.translate.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.translate.nonfinite.html b/tests/wpt/tests/html/canvas/element/transformations/2d.transformation.translate.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/transformations/2d.transformation.translate.nonfinite.html rename to tests/wpt/tests/html/canvas/element/transformations/2d.transformation.translate.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/video/2d.video.invalid.html b/tests/wpt/tests/html/canvas/element/video/2d.video.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/video/2d.video.invalid.html rename to tests/wpt/tests/html/canvas/element/video/2d.video.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText.html b/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText.html rename to tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText.shadow.html b/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText.shadow.html rename to tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.strokeText.html b/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.strokeText.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.strokeText.html rename to tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.strokeText.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.to.p3.html b/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.to.p3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.to.p3.html rename to tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.to.p3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.to.srgb.html b/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.to.srgb.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.to.srgb.html rename to tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.to.srgb.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toBlob.p3.canvas.html b/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toBlob.p3.canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toBlob.p3.canvas.html rename to tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toBlob.p3.canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toBlob.with.putImageData.html b/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toBlob.with.putImageData.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toBlob.with.putImageData.html rename to tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toBlob.with.putImageData.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toDataURL.jpeg.p3.canvas.html b/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toDataURL.jpeg.p3.canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toDataURL.jpeg.p3.canvas.html rename to tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toDataURL.jpeg.p3.canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toDataURL.p3.canvas.html b/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toDataURL.p3.canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toDataURL.p3.canvas.html rename to tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toDataURL.p3.canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toDataURL.with.putImageData.html b/tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toDataURL.with.putImageData.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toDataURL.with.putImageData.html rename to tests/wpt/tests/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.toDataURL.with.putImageData.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/2d.conformance.requirements.basics.html b/tests/wpt/tests/html/canvas/offscreen/2d.conformance.requirements.basics.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/2d.conformance.requirements.basics.html rename to tests/wpt/tests/html/canvas/offscreen/2d.conformance.requirements.basics.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/2d.conformance.requirements.basics.worker.js b/tests/wpt/tests/html/canvas/offscreen/2d.conformance.requirements.basics.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/2d.conformance.requirements.basics.worker.js rename to tests/wpt/tests/html/canvas/offscreen/2d.conformance.requirements.basics.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/2d.conformance.requirements.missingargs.html b/tests/wpt/tests/html/canvas/offscreen/2d.conformance.requirements.missingargs.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/2d.conformance.requirements.missingargs.html rename to tests/wpt/tests/html/canvas/offscreen/2d.conformance.requirements.missingargs.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/2d.conformance.requirements.missingargs.worker.js b/tests/wpt/tests/html/canvas/offscreen/2d.conformance.requirements.missingargs.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/2d.conformance.requirements.missingargs.worker.js rename to tests/wpt/tests/html/canvas/offscreen/2d.conformance.requirements.missingargs.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/META.yml b/tests/wpt/tests/html/canvas/offscreen/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/META.yml rename to tests/wpt/tests/html/canvas/offscreen/META.yml diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.clear.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.copy.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.canvas.xor.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.clear.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.copy.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.lighter.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-out.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.source-over.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.clip.xor.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvas.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvas.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvas.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvas.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvas.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvas.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvascopy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvascopy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvascopy.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvascopy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvascopy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvascopy.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvascopy.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvascopy.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvaspattern.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvaspattern.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvaspattern.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvaspattern.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvaspattern.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvaspattern.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvaspattern.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvaspattern.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.default.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.default.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.default.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.default.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.default.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.default.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.fill.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.fill.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.fill.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.fill.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.fill.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.fill.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.fill.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.fill.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.image.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.image.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.image.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.image.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.image.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.image.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.image.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.image.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.imagepattern.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.imagepattern.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.imagepattern.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.imagepattern.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.imagepattern.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.imagepattern.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.imagepattern.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.imagepattern.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.invalid.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.invalid.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.invalid.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.invalid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.invalid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.range.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.range.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.range.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.range.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.range.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.range.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.range.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.range.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.clear.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.clear.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.clear.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.clear.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.clear.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.clear.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.clear.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.clear.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.copy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.copy.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.copy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.copy.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.copy.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.copy.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-out.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.destination-over.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.lighter.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-atop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-out.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.source-over.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.xor.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.xor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.xor.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.xor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.xor.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.xor.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.image.xor.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.image.xor.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.casesensitive.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.casesensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.casesensitive.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.casesensitive.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.casesensitive.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.casesensitive.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.casesensitive.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.casesensitive.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.clear.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.clear.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.clear.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.clear.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.clear.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.clear.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.clear.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.clear.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.darker.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.darker.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.darker.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.darker.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.darker.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.darker.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.darker.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.darker.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.default.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.default.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.default.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.default.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.default.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.default.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.get.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.get.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.get.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.get.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.get.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.get.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.get.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.get.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.highlight.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.highlight.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.highlight.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.highlight.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.highlight.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.highlight.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.highlight.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.highlight.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.nullsuffix.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.nullsuffix.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.nullsuffix.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.nullsuffix.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.nullsuffix.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.nullsuffix.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.nullsuffix.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.nullsuffix.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.over.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.over.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.over.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.over.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.unrecognised.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.unrecognised.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.unrecognised.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.unrecognised.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.unrecognised.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.unrecognised.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.unrecognised.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.operation.unrecognised.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.clear.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.clear.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.clear.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.clear.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.clear.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.clear.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.clear.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.clear.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.copy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.copy.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.copy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.copy.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.copy.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.copy.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.lighter.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.lighter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.lighter.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.lighter.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.lighter.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.lighter.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.lighter.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.lighter.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-out.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-out.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-out.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-out.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-over.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-over.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.source-over.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.source-over.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.xor.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.xor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.xor.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.xor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.xor.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.xor.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.solid.xor.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.solid.xor.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.clear.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.clear.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.clear.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.clear.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.clear.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.clear.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.clear.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.clear.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.copy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.copy.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.copy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.copy.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.copy.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.copy.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.xor.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.xor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.xor.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.xor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.xor.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.xor.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.transparent.xor.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.transparent.xor.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.html b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.html rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js b/tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js rename to tests/wpt/tests/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.html b/tests/wpt/tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.html rename to tests/wpt/tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.worker.js b/tests/wpt/tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.worker.js rename to tests/wpt/tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.missingargs.html b/tests/wpt/tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.missingargs.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.missingargs.html rename to tests/wpt/tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.missingargs.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.missingargs.worker.js b/tests/wpt/tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.missingargs.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.missingargs.worker.js rename to tests/wpt/tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.missingargs.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.worker.js b/tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.CSSHSL.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.CSSHSL.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.CSSHSL.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.CSSHSL.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.CSSRGB.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.CSSRGB.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.CSSRGB.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.CSSRGB.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.halftransparent.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.png b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.png rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.color.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.color.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.color.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.color.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.color.png b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.color.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.color.png rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.color.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.color.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.color.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.color.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.color.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.png b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.png rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.coloralpha.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.png b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.png rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.png b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.png rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.png b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.png rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillText.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillText.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillText.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillText.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillText.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillText.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillText.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillText.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeText.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeText.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeText.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeText.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeText.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeText.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeText.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeText.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolor.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolor.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolor.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolor.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolor.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolor.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.return.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.return.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.return.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.return.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.return.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.return.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.return.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.return.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.type.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.type.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.type.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.type.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.type.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.type.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.type.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.type.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.type.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.type.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.type.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.type.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.type.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.type.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.identity.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.identity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.identity.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.identity.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.identity.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.identity.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.identity.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.identity.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.infinity.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.infinity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.infinity.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.infinity.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.infinity.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.infinity.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.infinity.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.infinity.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.invalid.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.invalid.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.invalid.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.invalid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.transform.invalid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.html b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.html rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.worker.js b/tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.worker.js rename to tests/wpt/tests/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.exceptions.tentative.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.exceptions.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.exceptions.tentative.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.exceptions.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.exceptions.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.exceptions.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.exceptions.tentative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.exceptions.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.tentative-expected.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.tentative-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.tentative-expected.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.tentative-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.tentative.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.tentative.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.tentative.w.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.tentative.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.tentative.w.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.dropShadow.tentative.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.value.html b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.value.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.value.html rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.value.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.value.worker.js b/tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.value.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.value.worker.js rename to tests/wpt/tests/html/canvas/offscreen/filters/2d.filter.value.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.cross-layer-paths-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.cross-layer-paths-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.cross-layer-paths-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.cross-layer-paths-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.cross-layer-paths.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.cross-layer-paths.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.cross-layer-paths.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.cross-layer-paths.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.cross-layer-paths.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.cross-layer-paths.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.cross-layer-paths.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.cross-layer-paths.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.blending-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.blending-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.composite-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.composite-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.no-global-states-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.no-global-states-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.no-global-states-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.no-global-states-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.no-global-states.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.no-global-states.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.no-global-states.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.no-global-states.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.no-global-states.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.no-global-states.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.no-global-states.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.no-global-states.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.no-global-states-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.no-global-states-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.no-global-states-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.no-global-states-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.no-global-states.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.no-global-states.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.no-global-states.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.no-global-states.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.no-global-states.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.no-global-states.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.no-global-states.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.no-global-states.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-reset-endLayer.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-reset-endLayer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-reset-endLayer.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-reset-endLayer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-reset-endLayer.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-reset-endLayer.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-reset-endLayer.worker.js rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-reset-endLayer.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-restore.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-restore.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-restore.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-restore.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-restore.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-restore.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-restore.worker.js rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-restore.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-save-endLayer.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-save-endLayer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-save-endLayer.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-save-endLayer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-save-endLayer.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-save-endLayer.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-save-endLayer.worker.js rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.beginLayer-save-endLayer.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.endLayer.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.endLayer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.endLayer.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.endLayer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.endLayer.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.endLayer.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.endLayer.worker.js rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.endLayer.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-beginLayer-restore.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-beginLayer-restore.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-beginLayer-restore.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-beginLayer-restore.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-beginLayer-restore.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-beginLayer-restore.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-beginLayer-restore.worker.js rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-beginLayer-restore.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-endLayer.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-endLayer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-endLayer.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-endLayer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-endLayer.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-endLayer.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-endLayer.worker.js rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.invalid-calls.save-endLayer.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.nested-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.nested-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.nested-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.nested-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.nested.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.nested.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.nested.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.nested.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.nested.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.nested.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.nested.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.nested.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.convertToBlob-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.convertToBlob-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.convertToBlob-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.convertToBlob-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.convertToBlob.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.convertToBlob.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.convertToBlob.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.convertToBlob.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.convertToBlob.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.convertToBlob.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.convertToBlob.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.convertToBlob.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.createImageBitmap-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.createImageBitmap-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.createImageBitmap-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.createImageBitmap-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.createImageBitmap.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.createImageBitmap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.createImageBitmap.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.createImageBitmap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.createImageBitmap.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.createImageBitmap.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.createImageBitmap.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.createImageBitmap.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.drawImage-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.drawImage-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.drawImage-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.drawImage-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.drawImage.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.drawImage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.drawImage.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.drawImage.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.drawImage.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.drawImage.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.drawImage.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.drawImage.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.getImageData-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.getImageData-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.getImageData-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.getImageData-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.getImageData.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.getImageData.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.getImageData.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.getImageData.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.getImageData.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.getImageData.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.getImageData.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.getImageData.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.putImageData-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.putImageData-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.putImageData-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.putImageData-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.putImageData.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.putImageData.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.putImageData.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.putImageData.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.putImageData.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.putImageData.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.putImageData.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.putImageData.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.transferToImageBitmap-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.transferToImageBitmap-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.transferToImageBitmap-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.transferToImageBitmap-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.transferToImageBitmap.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.transferToImageBitmap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.transferToImageBitmap.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.transferToImageBitmap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.transferToImageBitmap.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.transferToImageBitmap.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.transferToImageBitmap.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.render-opportunities.transferToImageBitmap.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.reset-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.reset-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.reset-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.reset-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.reset.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.reset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.reset.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.reset.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.reset.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.reset.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.reset.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.reset.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.restore-style-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.restore-style-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.restore-style-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.restore-style-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.restore-style.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.restore-style.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.restore-style.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.restore-style.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.restore-style.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.restore-style.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.restore-style.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.restore-style.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.several-complex-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.several-complex-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.several-complex.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.several-complex.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.several-complex.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.several-complex.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.unclosed-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.unclosed-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.unclosed-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.unclosed-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.unclosed-nested-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.unclosed-nested-expected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.unclosed-nested-expected.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.unclosed-nested-expected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.unclosed-nested.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.unclosed-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.unclosed-nested.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.unclosed-nested.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.unclosed-nested.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.unclosed-nested.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.unclosed-nested.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.unclosed-nested.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.unclosed.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.unclosed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.unclosed.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.unclosed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.unclosed.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.unclosed.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.unclosed.w.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.unclosed.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-endLayer.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-endLayer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-endLayer.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-endLayer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-endLayer.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-endLayer.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-endLayer.worker.js rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-endLayer.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-save.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-save.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-save.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-save.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-save.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-save.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-save.worker.js rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer-save.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer.worker.js rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.beginLayer.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.restore.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.restore.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.restore.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.restore.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.restore.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.restore.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.restore.worker.js rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.restore.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save-beginLayer.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save-beginLayer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save-beginLayer.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save-beginLayer.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save-beginLayer.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save-beginLayer.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save-beginLayer.worker.js rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save-beginLayer.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save.worker.js rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_reset_restore.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_reset_restore.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_reset_restore.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_reset_restore.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_reset_restore.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_reset_restore.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_reset_restore.worker.js rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_reset_restore.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_restore.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_restore.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_restore.html rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_restore.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_restore.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_restore.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_restore.worker.js rename to tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.valid-calls.save_restore.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.butt.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.butt.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.butt.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.butt.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.butt.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.butt.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.butt.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.butt.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.closed.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.closed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.closed.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.closed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.closed.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.closed.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.closed.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.closed.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.invalid.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.invalid.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.invalid.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.invalid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.invalid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.open.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.open.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.open.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.open.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.open.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.open.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.open.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.round.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.round.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.round.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.round.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.round.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.round.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.round.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.round.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.square.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.square.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.square.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.square.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.square.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.square.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.square.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.square.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.valid.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.valid.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.valid.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.valid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.valid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cap.valid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cross.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cross.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cross.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cross.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cross.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cross.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cross.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.cross.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.defaults.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.defaults.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.defaults.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.defaults.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.defaults.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.defaults.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.defaults.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.defaults.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.fill.noop.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.fill.noop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.fill.noop.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.fill.noop.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.fill.noop.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.fill.noop.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.fill.noop.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.fill.noop.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.invalid.strokestyle.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.invalid.strokestyle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.invalid.strokestyle.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.invalid.strokestyle.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.invalid.strokestyle.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.invalid.strokestyle.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.invalid.strokestyle.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.invalid.strokestyle.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.bevel.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.bevel.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.bevel.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.bevel.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.bevel.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.bevel.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.bevel.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.bevel.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.closed.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.closed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.closed.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.closed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.closed.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.closed.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.closed.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.closed.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.invalid.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.invalid.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.invalid.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.invalid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.invalid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.miter.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.miter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.miter.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.miter.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.miter.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.miter.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.miter.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.miter.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.open.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.open.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.open.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.open.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.open.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.open.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.open.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.parallel.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.parallel.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.parallel.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.parallel.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.parallel.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.parallel.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.parallel.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.parallel.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.round.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.round.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.round.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.round.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.round.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.round.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.round.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.round.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.valid.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.valid.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.valid.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.valid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.valid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.join.valid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.acute.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.acute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.acute.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.acute.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.acute.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.acute.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.acute.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.acute.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.invalid.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.invalid.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.invalid.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.invalid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.invalid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.valid.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.valid.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.valid.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.valid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.valid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.valid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.within.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.within.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.within.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.within.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.within.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.within.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.within.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.miter.within.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.union.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.union.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.union.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.union.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.union.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.union.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.union.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.union.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.basic.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.basic.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.invalid.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.invalid.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.invalid.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.invalid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.invalid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.transformed.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.transformed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.transformed.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.transformed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.transformed.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.transformed.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.transformed.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.transformed.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.valid.html b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.valid.html rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.valid.worker.js b/tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.valid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.valid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/line-styles/2d.line.width.valid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/convert-to-blob/offscreencanvas.convert.to.blob.html b/tests/wpt/tests/html/canvas/offscreen/manual/convert-to-blob/offscreencanvas.convert.to.blob.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/convert-to-blob/offscreencanvas.convert.to.blob.html rename to tests/wpt/tests/html/canvas/offscreen/manual/convert-to-blob/offscreencanvas.convert.to.blob.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/convert-to-blob/offscreencanvas.convert.to.blob.w.html b/tests/wpt/tests/html/canvas/offscreen/manual/convert-to-blob/offscreencanvas.convert.to.blob.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/convert-to-blob/offscreencanvas.convert.to.blob.w.html rename to tests/wpt/tests/html/canvas/offscreen/manual/convert-to-blob/offscreencanvas.convert.to.blob.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/draw-generic-family/2d.text.draw.generic.family.html b/tests/wpt/tests/html/canvas/offscreen/manual/draw-generic-family/2d.text.draw.generic.family.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/draw-generic-family/2d.text.draw.generic.family.html rename to tests/wpt/tests/html/canvas/offscreen/manual/draw-generic-family/2d.text.draw.generic.family.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/draw-generic-family/2d.text.draw.generic.family.w.html b/tests/wpt/tests/html/canvas/offscreen/manual/draw-generic-family/2d.text.draw.generic.family.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/draw-generic-family/2d.text.draw.generic.family.w.html rename to tests/wpt/tests/html/canvas/offscreen/manual/draw-generic-family/2d.text.draw.generic.family.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/filter/offscreencanvas.filter.html b/tests/wpt/tests/html/canvas/offscreen/manual/filter/offscreencanvas.filter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/filter/offscreencanvas.filter.html rename to tests/wpt/tests/html/canvas/offscreen/manual/filter/offscreencanvas.filter.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/filter/offscreencanvas.filter.js b/tests/wpt/tests/html/canvas/offscreen/manual/filter/offscreencanvas.filter.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/filter/offscreencanvas.filter.js rename to tests/wpt/tests/html/canvas/offscreen/manual/filter/offscreencanvas.filter.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/filter/offscreencanvas.filter.w.html b/tests/wpt/tests/html/canvas/offscreen/manual/filter/offscreencanvas.filter.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/filter/offscreencanvas.filter.w.html rename to tests/wpt/tests/html/canvas/offscreen/manual/filter/offscreencanvas.filter.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/image-smoothing/image.smoothing.html b/tests/wpt/tests/html/canvas/offscreen/manual/image-smoothing/image.smoothing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/image-smoothing/image.smoothing.html rename to tests/wpt/tests/html/canvas/offscreen/manual/image-smoothing/image.smoothing.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/image-smoothing/image.smoothing.worker.js b/tests/wpt/tests/html/canvas/offscreen/manual/image-smoothing/image.smoothing.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/image-smoothing/image.smoothing.worker.js rename to tests/wpt/tests/html/canvas/offscreen/manual/image-smoothing/image.smoothing.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.constructor.html b/tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.constructor.html rename to tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.constructor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.constructor.worker.js b/tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.constructor.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.constructor.worker.js rename to tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.constructor.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.getcontext.html b/tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.getcontext.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.getcontext.html rename to tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.getcontext.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.getcontext.worker.js b/tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.getcontext.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.getcontext.worker.js rename to tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.getcontext.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.resize.html b/tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.resize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.resize.html rename to tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.resize.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.lowlatency.nocrash.html b/tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.lowlatency.nocrash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.lowlatency.nocrash.html rename to tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.lowlatency.nocrash.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.html b/tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.html rename to tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.nocrash.html b/tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.nocrash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.nocrash.html rename to tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.nocrash.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.w.html b/tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.w.html rename to tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfercontrol.to.offscreen.html b/tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfercontrol.to.offscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfercontrol.to.offscreen.html rename to tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfercontrol.to.offscreen.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfercontrol.to.offscreen.w.html b/tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfercontrol.to.offscreen.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfercontrol.to.offscreen.w.html rename to tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfercontrol.to.offscreen.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transferrable.html b/tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transferrable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transferrable.html rename to tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transferrable.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transferrable.w.html b/tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transferrable.w.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transferrable.w.html rename to tests/wpt/tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transferrable.w.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/transformations/2d.transformation.getTransform.html b/tests/wpt/tests/html/canvas/offscreen/manual/transformations/2d.transformation.getTransform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/transformations/2d.transformation.getTransform.html rename to tests/wpt/tests/html/canvas/offscreen/manual/transformations/2d.transformation.getTransform.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/wide-gamut-canvas/2d.color.space.p3.convertToBlobp3.canvas.html b/tests/wpt/tests/html/canvas/offscreen/manual/wide-gamut-canvas/2d.color.space.p3.convertToBlobp3.canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/manual/wide-gamut-canvas/2d.color.space.p3.convertToBlobp3.canvas.html rename to tests/wpt/tests/html/canvas/offscreen/manual/wide-gamut-canvas/2d.color.space.p3.convertToBlobp3.canvas.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.default.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.default.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.default.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.default.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.default.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.default.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.empty.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.empty.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.empty.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.empty.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.empty.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.empty.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.end.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.end.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.end.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.end.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.end.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.end.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.end.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.end.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.negative.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.negative.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.negative.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.negative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.negative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.negative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.beginPath.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.beginPath.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.beginPath.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.beginPath.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.beginPath.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.beginPath.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.beginPath.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.beginPath.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.empty.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.empty.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.empty.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.empty.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.empty.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.empty.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.intersect.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.intersect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.intersect.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.intersect.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.intersect.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.intersect.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.intersect.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.intersect.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.closePath.empty.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.closePath.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.closePath.empty.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.closePath.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.closePath.empty.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.closePath.empty.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.closePath.empty.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.closePath.empty.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.closePath.newline.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.closePath.newline.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.closePath.newline.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.closePath.newline.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.closePath.newline.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.closePath.newline.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.closePath.newline.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.closePath.newline.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.ellipse.basics.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.ellipse.basics.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.ellipse.basics.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.ellipse.basics.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.ellipse.basics.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.ellipse.basics.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.ellipse.basics.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.ellipse.basics.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.overlap.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.overlap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.overlap.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.overlap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.overlap.png b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.overlap.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.overlap.png rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.overlap.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.overlap.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.overlap.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.overlap.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.overlap.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.initial.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.initial.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.initial.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.initial.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.initial.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.initial.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.initial.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.scaleddashes.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.scaleddashes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.scaleddashes.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.scaleddashes.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.scaleddashes.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.scaleddashes.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.scaleddashes.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.scaleddashes.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.invalid.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.invalid.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.invalid.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.invalid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.invalid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.multi.path.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.multi.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.multi.path.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.multi.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.multi.path.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.multi.path.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.multi.path.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.isPointInpath.multi.path.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.basic.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.basic.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.closed.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.closed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.closed.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.closed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.closed.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.closed.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.closed.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.closed.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.end.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.end.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.end.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.end.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.end.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.end.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.end.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.end.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.end.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.end.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.end.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.end.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.end.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.end.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.end.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.end.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.negative.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.negative.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.negative.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.negative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.negative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.negative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.winding.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.winding.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.winding.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.winding.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.winding.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.winding.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.winding.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.winding.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.single argument.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.single argument.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.single argument.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.single argument.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.single argument.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.single argument.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.single argument.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.single argument.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.single.argument.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.single.argument.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.single.argument.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.single.argument.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.single.argument.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.single.argument.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.single.argument.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.single.argument.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.single.argument.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.single.argument.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.single.argument.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.single.argument.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.single.argument.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.single.argument.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.single.argument.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.single.argument.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.badinput.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.badinput.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.badinput.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.badinput.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.badinput.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.badinput.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.badinput.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.badinput.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.noargument.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.noargument.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.noargument.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.noargument.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.noargument.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.noargument.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.noargument.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.noargument.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.empty.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.empty.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.empty.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.empty.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.empty.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.empty.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.png b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.png rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.skew.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.skew.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.skew.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.skew.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.skew.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.skew.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.skew.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.skew.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.union.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.union.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.union.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.union.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.union.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.union.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.stroke.union.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.stroke.union.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.transformation.basic.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.transformation.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.transformation.basic.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.transformation.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.transformation.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.transformation.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.transformation.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.transformation.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.transformation.changing.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.transformation.changing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.transformation.changing.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.transformation.changing.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.transformation.changing.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.transformation.changing.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.transformation.changing.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.transformation.changing.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.html b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.html rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.worker.js b/tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.worker.js rename to tests/wpt/tests/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.png b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.png rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.html b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.html rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.worker.js b/tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.worker.js rename to tests/wpt/tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/set-proprietary-font-names-001-crash.html b/tests/wpt/tests/html/canvas/offscreen/set-proprietary-font-names-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/set-proprietary-font-names-001-crash.html rename to tests/wpt/tests/html/canvas/offscreen/set-proprietary-font-names-001-crash.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.1.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.1.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.2.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.2.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.2.png b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.2.png rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.3.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.3.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.3.png b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.3.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.3.png rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.3.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.4.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.4.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.4.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.4.png b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.4.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.4.png rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.4.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.4.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.4.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.4.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.4.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.5.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.5.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.5.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.5.png b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.5.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.5.png rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.5.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.5.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.5.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.alpha.5.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.alpha.5.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.blur.high-manual.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.blur.high-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.blur.high-manual.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.blur.high-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.blur.high-manual.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.blur.high-manual.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.blur.high-manual.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.blur.high-manual.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.blur.high.png b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.blur.high.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.blur.high.png rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.blur.high.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.blur.low-manual.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.blur.low-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.blur.low-manual.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.blur.low-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.blur.low-manual.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.blur.low-manual.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.blur.low-manual.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.blur.low-manual.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.blur.low.png b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.blur.low.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.blur.low.png rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.blur.low.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.png b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.png rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.clip.1.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.clip.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.clip.1.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.clip.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.clip.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.clip.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.clip.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.clip.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.clip.2.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.clip.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.clip.2.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.clip.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.clip.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.clip.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.clip.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.clip.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.clip.3.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.clip.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.clip.3.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.clip.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.clip.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.clip.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.clip.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.clip.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.composite.1.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.composite.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.composite.1.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.composite.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.composite.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.composite.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.composite.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.composite.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.composite.2.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.composite.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.composite.2.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.composite.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.composite.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.composite.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.composite.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.composite.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.composite.3.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.composite.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.composite.3.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.composite.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.composite.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.composite.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.composite.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.composite.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.blur.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.blur.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.blur.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.blur.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.blur.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.blur.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.blur.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.blur.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.x.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.x.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.x.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.x.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.x.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.x.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.x.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.x.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.y.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.y.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.y.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.y.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.y.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.y.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.enable.y.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.enable.y.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.png b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.png rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.alpha.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.alpha.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.alpha.png b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.alpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.alpha.png rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.alpha.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.alpha.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.alpha.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.alpha.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.alpha.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.basic.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.basic.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.scale.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.scale.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.scale.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.scale.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.scale.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.scale.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.scale.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.scale.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.section.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.section.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.section.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.section.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.section.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.section.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.section.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.section.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.outside.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.outside.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.outside.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.outside.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.outside.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.outside.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.outside.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.png b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.png rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.transform.1.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.transform.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.transform.1.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.transform.1.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.transform.1.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.transform.1.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.transform.1.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.transform.1.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.transform.2.html b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.transform.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.transform.2.html rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.transform.2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.transform.2.worker.js b/tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.transform.2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/shadows/2d.shadow.transform.2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/shadows/2d.shadow.transform.2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.align.default.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.align.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.align.default.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.align.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.align.default.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.align.default.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.align.default.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.align.default.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.align.invalid.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.align.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.align.invalid.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.align.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.align.invalid.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.align.invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.align.invalid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.align.invalid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.align.valid.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.align.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.align.valid.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.align.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.align.valid.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.align.valid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.align.valid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.align.valid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.baseline.default.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.baseline.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.baseline.default.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.baseline.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.baseline.default.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.baseline.default.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.baseline.default.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.baseline.default.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.baseline.invalid.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.baseline.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.baseline.invalid.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.baseline.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.baseline.invalid.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.baseline.invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.baseline.invalid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.baseline.invalid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.baseline.valid.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.baseline.valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.baseline.valid.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.baseline.valid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.baseline.valid.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.baseline.valid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.baseline.valid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.baseline.valid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.center.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.center.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.center.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.center.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.center.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.center.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.center.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.center.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.left.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.left.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.left.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.left.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.left.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.left.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.left.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.left.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.right.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.right.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.right.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.right.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.right.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.right.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.right.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.right.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.middle.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.middle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.middle.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.middle.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.middle.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.middle.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.middle.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.middle.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.top.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.top.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.top.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.top.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.top.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.top.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.baseline.top.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.baseline.top.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.basic.png b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.basic.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.basic.png rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.basic.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large.png b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large.png rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.rtl.png b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.rtl.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.rtl.png rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.rtl.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fontface.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fontface.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fontface.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fontface.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fontface.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fontface.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.fontface.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.fontface.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.basic.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.basic.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.stroke.basic.png b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.stroke.basic.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.stroke.basic.png rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.stroke.basic.png diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.absolute.spacing.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.absolute.spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.absolute.spacing.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.absolute.spacing.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.absolute.spacing.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.absolute.spacing.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.absolute.spacing.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.absolute.spacing.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.font-relative.spacing.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.font-relative.spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.font-relative.spacing.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.font-relative.spacing.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.font-relative.spacing.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.font-relative.spacing.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.font-relative.spacing.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.font-relative.spacing.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.invalid.spacing.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.invalid.spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.invalid.spacing.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.invalid.spacing.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.invalid.spacing.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.invalid.spacing.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.invalid.spacing.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.invalid.spacing.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.absolute.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.absolute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.absolute.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.absolute.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.absolute.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.absolute.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.absolute.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.absolute.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.relative.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.relative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.relative.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.relative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.relative.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.relative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.relative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.relative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.absolute.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.absolute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.absolute.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.absolute.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.absolute.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.absolute.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.absolute.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.absolute.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.relative.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.relative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.relative.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.relative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.relative.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.relative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.relative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.relative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.default.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.default.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.default.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.default.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.default.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.default.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.basic.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.basic.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.complex.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.complex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.complex.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.complex.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.complex.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.complex.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.complex.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.complex.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.complex2.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.complex2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.complex2.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.complex2.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.complex2.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.complex2.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.complex2.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.complex2.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.family.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.family.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.family.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.family.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.family.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.family.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.family.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.family.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.invalid.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.invalid.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.invalid.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.invalid.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.invalid.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.invalid.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.system.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.system.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.system.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.system.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.system.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.system.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.system.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.system.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.tiny.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.tiny.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.tiny.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.tiny.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.tiny.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.tiny.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.parse.tiny.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.parse.tiny.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.relative_size.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.relative_size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.relative_size.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.relative_size.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.relative_size.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.relative_size.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.font.relative_size.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.font.relative_size.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.advances.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.advances.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.advances.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.advances.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.advances.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.advances.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.advances.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.advances.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.baselines.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.baselines.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.baselines.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.baselines.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.baselines.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.baselines.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.baselines.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.baselines.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.emHeights.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.width.basic.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.width.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.width.basic.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.width.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.width.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.width.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.width.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.width.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.width.empty.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.width.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.width.empty.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.width.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.width.empty.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.width.empty.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.width.empty.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.width.empty.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.width.space.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.width.space.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.width.space.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.width.space.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.width.space.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.width.space.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.measure.width.space.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.width.space.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.setFont.mathFont.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.setFont.mathFont.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.setFont.mathFont.html rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.setFont.mathFont.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.setFont.mathFont.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.setFont.mathFont.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.setFont.mathFont.worker.js rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.setFont.mathFont.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.html b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.html rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.color.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.color.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.color.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.color.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.color.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.color.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.color.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.color.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.large.html b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.large.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.large.html rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.large.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.large.worker.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.large.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/the-offscreen-canvas/size.large.worker.js rename to tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.large.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.order.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.order.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.order.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.order.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.order.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.order.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.order.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.order.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.basic.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.basic.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.large.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.large.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.large.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.large.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.large.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.large.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.large.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.large.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.negative.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.negative.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.negative.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.negative.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.negative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.negative.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.negative.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.zero.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.zero.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.zero.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.zero.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.zero.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.scale.zero.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.scale.zero.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.identity.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.identity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.identity.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.identity.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.identity.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.identity.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.identity.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.identity.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.translate.basic.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.translate.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.translate.basic.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.translate.basic.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.translate.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.translate.basic.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.translate.basic.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.translate.basic.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.html b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.html rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.worker.js b/tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.worker.js rename to tests/wpt/tests/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.html b/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.html rename to tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.worker.js b/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.worker.js rename to tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.html b/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.html rename to tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.html diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.worker.js b/tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.worker.js rename to tests/wpt/tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/resources/2x2.png b/tests/wpt/tests/html/canvas/resources/2x2.png similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/resources/2x2.png rename to tests/wpt/tests/html/canvas/resources/2x2.png diff --git a/tests/wpt/web-platform-tests/html/canvas/resources/canvas-frame.css b/tests/wpt/tests/html/canvas/resources/canvas-frame.css similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/resources/canvas-frame.css rename to tests/wpt/tests/html/canvas/resources/canvas-frame.css diff --git a/tests/wpt/web-platform-tests/html/canvas/resources/canvas-frame.css.headers b/tests/wpt/tests/html/canvas/resources/canvas-frame.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/resources/canvas-frame.css.headers rename to tests/wpt/tests/html/canvas/resources/canvas-frame.css.headers diff --git a/tests/wpt/web-platform-tests/html/canvas/resources/canvas-index.css b/tests/wpt/tests/html/canvas/resources/canvas-index.css similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/resources/canvas-index.css rename to tests/wpt/tests/html/canvas/resources/canvas-index.css diff --git a/tests/wpt/web-platform-tests/html/canvas/resources/canvas-index.css.headers b/tests/wpt/tests/html/canvas/resources/canvas-index.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/resources/canvas-index.css.headers rename to tests/wpt/tests/html/canvas/resources/canvas-index.css.headers diff --git a/tests/wpt/web-platform-tests/html/canvas/resources/canvas-spec.css b/tests/wpt/tests/html/canvas/resources/canvas-spec.css similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/resources/canvas-spec.css rename to tests/wpt/tests/html/canvas/resources/canvas-spec.css diff --git a/tests/wpt/web-platform-tests/html/canvas/resources/canvas-spec.css.headers b/tests/wpt/tests/html/canvas/resources/canvas-spec.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/resources/canvas-spec.css.headers rename to tests/wpt/tests/html/canvas/resources/canvas-spec.css.headers diff --git a/tests/wpt/web-platform-tests/html/canvas/resources/canvas-tests.css b/tests/wpt/tests/html/canvas/resources/canvas-tests.css similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/resources/canvas-tests.css rename to tests/wpt/tests/html/canvas/resources/canvas-tests.css diff --git a/tests/wpt/web-platform-tests/html/canvas/resources/canvas-tests.css.headers b/tests/wpt/tests/html/canvas/resources/canvas-tests.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/resources/canvas-tests.css.headers rename to tests/wpt/tests/html/canvas/resources/canvas-tests.css.headers diff --git a/tests/wpt/web-platform-tests/html/canvas/resources/canvas-tests.js b/tests/wpt/tests/html/canvas/resources/canvas-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/resources/canvas-tests.js rename to tests/wpt/tests/html/canvas/resources/canvas-tests.js diff --git a/tests/wpt/web-platform-tests/html/canvas/resources/canvas-tests.js.headers b/tests/wpt/tests/html/canvas/resources/canvas-tests.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/resources/canvas-tests.js.headers rename to tests/wpt/tests/html/canvas/resources/canvas-tests.js.headers diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/gentest.py b/tests/wpt/tests/html/canvas/tools/gentest.py similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/gentest.py rename to tests/wpt/tests/html/canvas/tools/gentest.py diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/gentest_union.py b/tests/wpt/tests/html/canvas/tools/gentest_union.py similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/gentest_union.py rename to tests/wpt/tests/html/canvas/tools/gentest_union.py diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/gentestutils.py b/tests/wpt/tests/html/canvas/tools/gentestutils.py similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/gentestutils.py rename to tests/wpt/tests/html/canvas/tools/gentestutils.py diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/gentestutilsunion.py b/tests/wpt/tests/html/canvas/tools/gentestutilsunion.py similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/gentestutilsunion.py rename to tests/wpt/tests/html/canvas/tools/gentestutilsunion.py diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/name2dir-canvas.yaml b/tests/wpt/tests/html/canvas/tools/name2dir-canvas.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/name2dir-canvas.yaml rename to tests/wpt/tests/html/canvas/tools/name2dir-canvas.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/name2dir-offscreen.yaml b/tests/wpt/tests/html/canvas/tools/name2dir-offscreen.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/name2dir-offscreen.yaml rename to tests/wpt/tests/html/canvas/tools/name2dir-offscreen.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/name2dir.yaml b/tests/wpt/tests/html/canvas/tools/name2dir.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/name2dir.yaml rename to tests/wpt/tests/html/canvas/tools/name2dir.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/templates.yaml b/tests/wpt/tests/html/canvas/tools/templates.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/templates.yaml rename to tests/wpt/tests/html/canvas/tools/templates.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/templates/reftest.html b/tests/wpt/tests/html/canvas/tools/templates/reftest.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/templates/reftest.html rename to tests/wpt/tests/html/canvas/tools/templates/reftest.html diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/templates/reftest_element.html b/tests/wpt/tests/html/canvas/tools/templates/reftest_element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/templates/reftest_element.html rename to tests/wpt/tests/html/canvas/tools/templates/reftest_element.html diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/templates/reftest_offscreen.html b/tests/wpt/tests/html/canvas/tools/templates/reftest_offscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/templates/reftest_offscreen.html rename to tests/wpt/tests/html/canvas/tools/templates/reftest_offscreen.html diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/templates/reftest_worker.html b/tests/wpt/tests/html/canvas/tools/templates/reftest_worker.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/templates/reftest_worker.html rename to tests/wpt/tests/html/canvas/tools/templates/reftest_worker.html diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/templates/testharness_element.html b/tests/wpt/tests/html/canvas/tools/templates/testharness_element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/templates/testharness_element.html rename to tests/wpt/tests/html/canvas/tools/templates/testharness_element.html diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/templates/testharness_offscreen.html b/tests/wpt/tests/html/canvas/tools/templates/testharness_offscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/templates/testharness_offscreen.html rename to tests/wpt/tests/html/canvas/tools/templates/testharness_offscreen.html diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/templates/testharness_worker.js b/tests/wpt/tests/html/canvas/tools/templates/testharness_worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/templates/testharness_worker.js rename to tests/wpt/tests/html/canvas/tools/templates/testharness_worker.js diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/color_space.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/color_space.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/color_space.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/color_space.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/compositing.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/compositing.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/compositing.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/compositing.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/conformance_requirements.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/conformance_requirements.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/conformance_requirements.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/conformance_requirements.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/drawing-images-to-the-canvas.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/drawing-images-to-the-canvas.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/drawing-images-to-the-canvas.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/drawing-images-to-the-canvas.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/drawing-rectangles-to-the-canvas.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/drawing-rectangles-to-the-canvas.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/drawing-rectangles-to-the-canvas.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/drawing-rectangles-to-the-canvas.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/fill-and-stroke-styles.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/fill-and-stroke-styles.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/fill-and-stroke-styles.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/fill-and-stroke-styles.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/filters.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/filters.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/filters.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/filters.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/layers.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/layers.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/layers.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/layers.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/line-styles.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/line-styles.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/line-styles.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/line-styles.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/path-objects.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/path-objects.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/path-objects.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/path-objects.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/pixel-manipulation.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/pixel-manipulation.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/pixel-manipulation.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/pixel-manipulation.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/reset.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/reset.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/reset.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/reset.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/scroll.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/scroll.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/scroll.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/scroll.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/shadows.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/shadows.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/shadows.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/shadows.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/the-canvas-state.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/the-canvas-state.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/the-canvas-state.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/the-canvas-state.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/transformations.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/transformations.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/transformations.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/transformations.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/video.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/video.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/video.yaml rename to tests/wpt/tests/html/canvas/tools/yaml-new/video.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/drawing-text-to-the-canvas.yaml b/tests/wpt/tests/html/canvas/tools/yaml/element/drawing-text-to-the-canvas.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/drawing-text-to-the-canvas.yaml rename to tests/wpt/tests/html/canvas/tools/yaml/element/drawing-text-to-the-canvas.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/meta.yaml b/tests/wpt/tests/html/canvas/tools/yaml/element/meta.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/meta.yaml rename to tests/wpt/tests/html/canvas/tools/yaml/element/meta.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/text-styles.yaml b/tests/wpt/tests/html/canvas/tools/yaml/element/text-styles.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/text-styles.yaml rename to tests/wpt/tests/html/canvas/tools/yaml/element/text-styles.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/the-canvas-element.yaml b/tests/wpt/tests/html/canvas/tools/yaml/element/the-canvas-element.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/the-canvas-element.yaml rename to tests/wpt/tests/html/canvas/tools/yaml/element/the-canvas-element.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/meta.yaml b/tests/wpt/tests/html/canvas/tools/yaml/offscreen/meta.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/meta.yaml rename to tests/wpt/tests/html/canvas/tools/yaml/offscreen/meta.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/text.yaml b/tests/wpt/tests/html/canvas/tools/yaml/offscreen/text.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/text.yaml rename to tests/wpt/tests/html/canvas/tools/yaml/offscreen/text.yaml diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/the-offscreen-canvas.yaml b/tests/wpt/tests/html/canvas/tools/yaml/offscreen/the-offscreen-canvas.yaml similarity index 100% rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/the-offscreen-canvas.yaml rename to tests/wpt/tests/html/canvas/tools/yaml/offscreen/the-offscreen-canvas.yaml diff --git a/tests/wpt/web-platform-tests/html/capability-delegation/delegate-fullscreen-request-popup-cross-origin.https.sub.tentative.html b/tests/wpt/tests/html/capability-delegation/delegate-fullscreen-request-popup-cross-origin.https.sub.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/capability-delegation/delegate-fullscreen-request-popup-cross-origin.https.sub.tentative.html rename to tests/wpt/tests/html/capability-delegation/delegate-fullscreen-request-popup-cross-origin.https.sub.tentative.html diff --git a/tests/wpt/web-platform-tests/html/capability-delegation/delegate-fullscreen-request-popup-same-origin.https.tentative.html b/tests/wpt/tests/html/capability-delegation/delegate-fullscreen-request-popup-same-origin.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/capability-delegation/delegate-fullscreen-request-popup-same-origin.https.tentative.html rename to tests/wpt/tests/html/capability-delegation/delegate-fullscreen-request-popup-same-origin.https.tentative.html diff --git a/tests/wpt/web-platform-tests/html/capability-delegation/delegate-fullscreen-request-subframe-cross-origin.https.sub.tentative.html b/tests/wpt/tests/html/capability-delegation/delegate-fullscreen-request-subframe-cross-origin.https.sub.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/capability-delegation/delegate-fullscreen-request-subframe-cross-origin.https.sub.tentative.html rename to tests/wpt/tests/html/capability-delegation/delegate-fullscreen-request-subframe-cross-origin.https.sub.tentative.html diff --git a/tests/wpt/web-platform-tests/html/capability-delegation/delegate-fullscreen-request-subframe-same-origin.https.tentative.html b/tests/wpt/tests/html/capability-delegation/delegate-fullscreen-request-subframe-same-origin.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/capability-delegation/delegate-fullscreen-request-subframe-same-origin.https.tentative.html rename to tests/wpt/tests/html/capability-delegation/delegate-fullscreen-request-subframe-same-origin.https.tentative.html diff --git a/tests/wpt/web-platform-tests/html/capability-delegation/delegation-consumes-activation.https.tentative.html b/tests/wpt/tests/html/capability-delegation/delegation-consumes-activation.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/capability-delegation/delegation-consumes-activation.https.tentative.html rename to tests/wpt/tests/html/capability-delegation/delegation-consumes-activation.https.tentative.html diff --git a/tests/wpt/web-platform-tests/html/capability-delegation/delegation-sender-checks.tentative.html b/tests/wpt/tests/html/capability-delegation/delegation-sender-checks.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/capability-delegation/delegation-sender-checks.tentative.html rename to tests/wpt/tests/html/capability-delegation/delegation-sender-checks.tentative.html diff --git a/tests/wpt/web-platform-tests/html/capability-delegation/resources/delegate-fullscreen-request-recipient.html b/tests/wpt/tests/html/capability-delegation/resources/delegate-fullscreen-request-recipient.html similarity index 100% rename from tests/wpt/web-platform-tests/html/capability-delegation/resources/delegate-fullscreen-request-recipient.html rename to tests/wpt/tests/html/capability-delegation/resources/delegate-fullscreen-request-recipient.html diff --git a/tests/wpt/web-platform-tests/html/capability-delegation/resources/utils.js b/tests/wpt/tests/html/capability-delegation/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/html/capability-delegation/resources/utils.js rename to tests/wpt/tests/html/capability-delegation/resources/utils.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/META.yml b/tests/wpt/tests/html/cross-origin-embedder-policy/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/META.yml rename to tests/wpt/tests/html/cross-origin-embedder-policy/META.yml diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/README.md b/tests/wpt/tests/html/cross-origin-embedder-policy/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/README.md rename to tests/wpt/tests/html/cross-origin-embedder-policy/README.md diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/about-blank-popup.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/about-blank-popup.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/about-blank-popup.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/about-blank-popup.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/about-blank-popup.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/about-blank-popup.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/about-blank-popup.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/about-blank-popup.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/blob.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/blob.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/blob.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/blob.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/blob.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/blob.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/blob.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/blob.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/block-local-documents-inheriting-none.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/block-local-documents-inheriting-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/block-local-documents-inheriting-none.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/block-local-documents-inheriting-none.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-dedicated-worker.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/cache-storage-reporting-dedicated-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-dedicated-worker.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/cache-storage-reporting-dedicated-worker.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-document.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/cache-storage-reporting-document.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-document.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/cache-storage-reporting-document.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-service-worker.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/cache-storage-reporting-service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-service-worker.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/cache-storage-reporting-service-worker.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-shared-worker.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/cache-storage-reporting-shared-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-shared-worker.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/cache-storage-reporting-shared-worker.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/coep-frame-javascript.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/coep-frame-javascript.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/coep-frame-javascript.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/coep-frame-javascript.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/coep-on-response-from-service-worker.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/coep-on-response-from-service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/coep-on-response-from-service-worker.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/coep-on-response-from-service-worker.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/META.yml b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/META.yml rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/META.yml diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/README.md b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/README.md rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/README.md diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/cache-storage.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/cache-storage.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/cache-storage.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/cache-storage.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/cache.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/cache.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/cache.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/cache.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/cross-origin-isolated.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/cross-origin-isolated.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/cross-origin-isolated.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/cross-origin-isolated.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/dedicated-worker.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/dedicated-worker.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/dedicated-worker.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/dedicated-worker.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/fetch.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/fetch.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/fetch.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/fetch.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-credentialless.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-credentialless.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-credentialless.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-credentialless.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-none.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-none.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-none.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-none.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-redirect.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-redirect.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-redirect.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-redirect.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-require-corp.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-require-corp.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-require-corp.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-require-corp.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/iframe.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/iframe.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/image.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/image.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/image.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/image.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/link.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/link.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/link.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/link.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/redirect.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/redirect.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/redirect.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/redirect.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/reporting-navigation.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/reporting-navigation.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/reporting-navigation.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/reporting-navigation.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/reporting-subresource-corp.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/reporting-subresource-corp.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/reporting-subresource-corp.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/reporting-subresource-corp.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/common.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/common.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/resources/common.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/iframeTest.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/resources/iframeTest.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/iframeTest.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/resources/iframeTest.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/redirect_none_to_credentialless.py b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/resources/redirect_none_to_credentialless.py similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/redirect_none_to_credentialless.py rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/resources/redirect_none_to_credentialless.py diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/script.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/script.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/script.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/script.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/service-worker-coep-credentialless-proxy.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/service-worker-coep-credentialless-proxy.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/service-worker-coep-credentialless-proxy.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/service-worker-coep-credentialless-proxy.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/service-worker-coep-none-proxy.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/service-worker-coep-none-proxy.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/service-worker-coep-none-proxy.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/service-worker-coep-none-proxy.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/service-worker.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/service-worker.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/service-worker.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/service-worker.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/shared-worker.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/shared-worker.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/shared-worker.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/shared-worker.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/video.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/video.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/video.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/video.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/video.https.window.js.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/video.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/video.https.window.js.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/video.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/websocket.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/websocket.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/websocket.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/credentialless/websocket.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-iframe.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-iframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-iframe.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-iframe.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-iframe.https.window.js.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-iframe.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-iframe.https.window.js.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-iframe.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-worker.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-worker.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-worker.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-worker.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-worker.https.window.js.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-worker.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-worker.https.window.js.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission-worker.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/data.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/data.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/data.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/data.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/data.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/data.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/dedicated-worker-cache-storage.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/dedicated-worker-cache-storage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/dedicated-worker-cache-storage.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/dedicated-worker-cache-storage.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/dedicated-worker.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/dedicated-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/dedicated-worker.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/dedicated-worker.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/header-parsing.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/header-parsing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/header-parsing.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/header-parsing.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/iframe-history-none-require-corp.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/iframe-history-none-require-corp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/iframe-history-none-require-corp.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/iframe-history-none-require-corp.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/javascript.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/javascript.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/javascript.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/javascript.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/javascript.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/javascript.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/javascript.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/javascript.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/meta-http-equiv.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/meta-http-equiv.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/meta-http-equiv.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/meta-http-equiv.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/current/current.html b/tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/current/current.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/current/current.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/current/current.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/current/current.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/current/current.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/current/current.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/current/current.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/current/worker.js b/tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/current/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/current/worker.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/current/worker.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/incumbent/incumbent.html b/tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/incumbent/incumbent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/incumbent/incumbent.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/incumbent/incumbent.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/incumbent/incumbent.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/incumbent/incumbent.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/incumbent/incumbent.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/incumbent/incumbent.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/incumbent/worker.js b/tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/incumbent/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/incumbent/worker.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/incumbent/worker.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/worker.js b/tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/worker.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/worker.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/workers-coep-report.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/workers-coep-report.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/workers-coep-report.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/workers-coep-report.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/workers-coep-report.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/workers-coep-report.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/multi-globals/workers-coep-report.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/multi-globals/workers-coep-report.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/no-secure-context.html b/tests/wpt/tests/html/cross-origin-embedder-policy/no-secure-context.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/no-secure-context.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/no-secure-context.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/no-secure-context.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/no-secure-context.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/no-secure-context.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/no-secure-context.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/non-initial-about-blank.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/non-initial-about-blank.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/non-initial-about-blank.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/non-initial-about-blank.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/non-initial-about-blank.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/non-initial-about-blank.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/non-initial-about-blank.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/non-initial-about-blank.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-load-from-cache-storage.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/none-load-from-cache-storage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-load-from-cache-storage.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/none-load-from-cache-storage.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-sw-from-none.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/none-sw-from-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-sw-from-none.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/none-sw-from-none.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-sw-from-require-corp.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/none-sw-from-require-corp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-sw-from-require-corp.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/none-sw-from-require-corp.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-sw-from-require-corp.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/none-sw-from-require-corp.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-sw-from-require-corp.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/none-sw-from-require-corp.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/none.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/none.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/none.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reflection-credentialless.tentative.https.any.js b/tests/wpt/tests/html/cross-origin-embedder-policy/reflection-credentialless.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reflection-credentialless.tentative.https.any.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/reflection-credentialless.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reflection-credentialless.tentative.https.any.js.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/reflection-credentialless.tentative.https.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reflection-credentialless.tentative.https.any.js.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/reflection-credentialless.tentative.https.any.js.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reflection-require-corp.tentative.https.any.js b/tests/wpt/tests/html/cross-origin-embedder-policy/reflection-require-corp.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reflection-require-corp.tentative.https.any.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/reflection-require-corp.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reflection-require-corp.tentative.https.any.js.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/reflection-require-corp.tentative.https.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reflection-require-corp.tentative.https.any.js.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/reflection-require-corp.tentative.https.any.js.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reflection-unsafe-none.tentative.https.any.js b/tests/wpt/tests/html/cross-origin-embedder-policy/reflection-unsafe-none.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reflection-unsafe-none.tentative.https.any.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/reflection-unsafe-none.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/report-only-require-corp.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/report-only-require-corp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/report-only-require-corp.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/report-only-require-corp.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/report-only-require-corp.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/report-only-require-corp.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/report-only-require-corp.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/report-only-require-corp.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-navigation.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/reporting-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-navigation.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/reporting-navigation.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-subresource-corp.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/reporting-subresource-corp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-subresource-corp.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/reporting-subresource-corp.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-document-reporting-endpoint.https.window.js b/tests/wpt/tests/html/cross-origin-embedder-policy/reporting-to-document-reporting-endpoint.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-document-reporting-endpoint.https.window.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/reporting-to-document-reporting-endpoint.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-endpoint.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/reporting-to-endpoint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-endpoint.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/reporting-to-endpoint.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-endpoint.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/reporting-to-endpoint.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-endpoint.https.html.sub.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/reporting-to-endpoint.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-frame-owner.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/reporting-to-frame-owner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-frame-owner.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/reporting-to-frame-owner.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-worker-owner.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/reporting-to-worker-owner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-worker-owner.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/reporting-to-worker-owner.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-about-blank.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-about-blank.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-about-blank.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-about-blank.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-about-blank.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-about-blank.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-about-blank.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-about-blank.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-about-srcdoc.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-about-srcdoc.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-about-srcdoc.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-about-srcdoc.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-about-srcdoc.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-about-srcdoc.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-about-srcdoc.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-about-srcdoc.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-cached-images.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-cached-images.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-cached-images.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-cached-images.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-cached-images.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-cached-images.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-cached-images.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-cached-images.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-revalidated-images.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-revalidated-images.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-revalidated-images.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-revalidated-images.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw-from-none.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-sw-from-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw-from-none.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-sw-from-none.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw-from-require-corp.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-sw-from-require-corp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw-from-require-corp.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-sw-from-require-corp.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw-from-require-corp.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-sw-from-require-corp.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw-from-require-corp.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-sw-from-require-corp.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-sw.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-sw.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-worker-script-revalidation.html b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-worker-script-revalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-worker-script-revalidation.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp-worker-script-revalidation.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/require-corp.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/require-corp.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/blob-url-factory.html b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/blob-url-factory.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/blob-url-factory.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/blob-url-factory.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/blob-url-factory.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/blob-url-factory.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/blob-url-factory.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/blob-url-factory.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/cache-storage-reporting.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/cache-storage-reporting.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/cache-storage-reporting.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/cache-storage-reporting.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/coep-frame.html b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/coep-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/coep-frame.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/coep-frame.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/coep-frame.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/coep-frame.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/coep-frame.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/coep-frame.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/common.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/common.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/common.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/corp-image.py b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/corp-image.py similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/corp-image.py rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/corp-image.py diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/dedicated-worker-supporting-revalidation.py b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/dedicated-worker-supporting-revalidation.py similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/dedicated-worker-supporting-revalidation.py rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/dedicated-worker-supporting-revalidation.py diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/dedicated-worker.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/dedicated-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/dedicated-worker.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/dedicated-worker.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/empty-coep.py b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/empty-coep.py similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/empty-coep.py rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/empty-coep.py diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/fetch-and-create-url.html b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/fetch-and-create-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/fetch-and-create-url.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/fetch-and-create-url.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/fetch-in-dedicated-worker.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/fetch-in-dedicated-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/fetch-in-dedicated-worker.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/fetch-in-dedicated-worker.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/iframe.html b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/iframe.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/iframe.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/load-corp-images.html b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/load-corp-images.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/load-corp-images.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/load-corp-images.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/load-corp-images.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/load-corp-images.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/load-corp-images.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/load-corp-images.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-none.sub.html b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/navigate-none.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-none.sub.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/navigate-none.sub.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp.sub.html b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/navigate-require-corp.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp.sub.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/navigate-require-corp.sub.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp.sub.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/navigate-require-corp.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp.sub.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/navigate-require-corp.sub.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/nothing-cross-origin-corp.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/nothing-cross-origin-corp.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/nothing-cross-origin-corp.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/nothing-cross-origin-corp.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/nothing-cross-origin-corp.js.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/nothing-cross-origin-corp.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/nothing-cross-origin-corp.js.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/nothing-cross-origin-corp.js.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/nothing-same-origin-corp.txt b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/nothing-same-origin-corp.txt similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/nothing-same-origin-corp.txt rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/nothing-same-origin-corp.txt diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/nothing-same-origin-corp.txt.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/nothing-same-origin-corp.txt.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/nothing-same-origin-corp.txt.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/nothing-same-origin-corp.txt.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/postmessage-ready.html b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/postmessage-ready.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/postmessage-ready.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/postmessage-ready.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/report.py b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/report.py similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/report.py rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/report.py diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/reporting-empty-frame-multiple-headers.html.asis b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/reporting-empty-frame-multiple-headers.html.asis similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/reporting-empty-frame-multiple-headers.html.asis rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/reporting-empty-frame-multiple-headers.html.asis diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/reporting-empty-frame.html b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/reporting-empty-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/reporting-empty-frame.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/reporting-empty-frame.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/reporting-worker.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/reporting-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/reporting-worker.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/reporting-worker.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/require-corp-sw-import-scripts.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/require-corp-sw-import-scripts.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/require-corp-sw-import-scripts.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/require-corp-sw-import-scripts.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/require-corp-sw-import-scripts.js.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/require-corp-sw-import-scripts.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/require-corp-sw-import-scripts.js.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/require-corp-sw-import-scripts.js.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/require-corp-sw.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/require-corp-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/require-corp-sw.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/require-corp-sw.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/require-corp-sw.js.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/require-corp-sw.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/require-corp-sw.js.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/require-corp-sw.js.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/script-factory.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/script-factory.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/script-factory.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/script-factory.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/shared-worker-fetch.js.py b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/shared-worker-fetch.js.py similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/shared-worker-fetch.js.py rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/shared-worker-fetch.js.py diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/shared-worker.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/shared-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/shared-worker.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/shared-worker.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/sw-store-to-cache-storage.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/sw-store-to-cache-storage.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/sw-store-to-cache-storage.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/sw-store-to-cache-storage.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/sw.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/sw.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/sw.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/sw.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/universal-worker.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/universal-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/universal-worker.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/universal-worker.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/worker-owner-frame.html b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/worker-owner-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/worker-owner-frame.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/worker-owner-frame.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/worker-owner.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/worker-owner.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/worker-owner.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/worker-owner.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/worker-support.js b/tests/wpt/tests/html/cross-origin-embedder-policy/resources/worker-support.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/worker-support.js rename to tests/wpt/tests/html/cross-origin-embedder-policy/resources/worker-support.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/sandbox.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/sandbox.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/sandbox.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/sandbox.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/sandbox.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/sandbox.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/sandbox.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/sandbox.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/service-worker-cache-storage.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/service-worker-cache-storage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/service-worker-cache-storage.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/service-worker-cache-storage.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/shared-workers.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/shared-workers.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/shared-workers.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/shared-workers.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/srcdoc.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/srcdoc.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/srcdoc.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/srcdoc.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/srcdoc.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/srcdoc.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/srcdoc.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/srcdoc.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/worker-inheritance.sub.https.html b/tests/wpt/tests/html/cross-origin-embedder-policy/worker-inheritance.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/worker-inheritance.sub.https.html rename to tests/wpt/tests/html/cross-origin-embedder-policy/worker-inheritance.sub.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/worker-inheritance.sub.https.html.headers b/tests/wpt/tests/html/cross-origin-embedder-policy/worker-inheritance.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/worker-inheritance.sub.https.html.headers rename to tests/wpt/tests/html/cross-origin-embedder-policy/worker-inheritance.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/META.yml b/tests/wpt/tests/html/cross-origin-opener-policy/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/META.yml rename to tests/wpt/tests/html/cross-origin-opener-policy/META.yml diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/README.md b/tests/wpt/tests/html/cross-origin-opener-policy/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/README.md rename to tests/wpt/tests/html/cross-origin-opener-policy/README.md diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/blob-popup.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/blob-popup.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/blob-popup.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/blob-popup.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/blob-popup.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/blob-popup.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/blob-popup.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/blob-popup.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-blob-popup.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coep-blob-popup.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-blob-popup.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coep-blob-popup.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-blob-popup.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/coep-blob-popup.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-blob-popup.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/coep-blob-popup.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-navigate-popup.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coep-navigate-popup.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-navigate-popup.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coep-navigate-popup.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-navigate-popup.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/coep-navigate-popup.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-navigate-popup.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/coep-navigate-popup.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-redirect.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coep-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-redirect.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coep-redirect.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-redirect.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/coep-redirect.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-redirect.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/coep-redirect.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-with-cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coep-with-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-with-cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coep-with-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-with-cross-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/coep-with-cross-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-with-cross-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/coep-with-cross-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-with-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coep-with-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-with-same-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coep-with-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-with-same-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/coep-with-same-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-with-same-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/coep-with-same-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-with-same-site.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coep-with-same-site.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-with-same-site.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coep-with-same-site.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-with-same-site.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/coep-with-same-site.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-with-same-site.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/coep-with-same-site.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-coep-sandbox.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coop-coep-sandbox.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-coep-sandbox.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-coep-sandbox.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-coep-sandbox.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/coop-coep-sandbox.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-coep-sandbox.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-coep-sandbox.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-csp-sandbox-navigate.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coop-csp-sandbox-navigate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-csp-sandbox-navigate.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-csp-sandbox-navigate.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-csp-sandbox.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coop-csp-sandbox.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-csp-sandbox.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-csp-sandbox.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-navigate-same-origin-csp-sandbox.html b/tests/wpt/tests/html/cross-origin-opener-policy/coop-navigate-same-origin-csp-sandbox.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-navigate-same-origin-csp-sandbox.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-navigate-same-origin-csp-sandbox.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-navigated-history-popup.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coop-navigated-history-popup.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-navigated-history-popup.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-navigated-history-popup.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-navigated-popup.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coop-navigated-popup.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-navigated-popup.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-navigated-popup.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-navigated-popup.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/coop-navigated-popup.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-navigated-popup.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-navigated-popup.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-popup-opener-navigates.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coop-popup-opener-navigates.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-popup-opener-navigates.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-popup-opener-navigates.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-popup-opener-navigates.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/coop-popup-opener-navigates.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-popup-opener-navigates.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-popup-opener-navigates.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-same-origin-allow-popups-document-write.html b/tests/wpt/tests/html/cross-origin-opener-policy/coop-same-origin-allow-popups-document-write.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-same-origin-allow-popups-document-write.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-same-origin-allow-popups-document-write.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-sandbox-cuts-opener.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coop-sandbox-cuts-opener.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-sandbox-cuts-opener.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-sandbox-cuts-opener.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-sandbox-redirects-cuts-opener.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coop-sandbox-redirects-cuts-opener.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-sandbox-redirects-cuts-opener.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-sandbox-redirects-cuts-opener.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-sandbox.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/coop-sandbox.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-sandbox.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-sandbox.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-sandbox.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/coop-sandbox.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-sandbox.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/coop-sandbox.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing-failures.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/header-parsing-failures.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing-failures.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/header-parsing-failures.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing-non-ascii.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/header-parsing-non-ascii.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing-non-ascii.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/header-parsing-non-ascii.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing-non-ascii.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/header-parsing-non-ascii.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing-non-ascii.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/header-parsing-non-ascii.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing-repeated.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/header-parsing-repeated.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing-repeated.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/header-parsing-repeated.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing-repeated.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/header-parsing-repeated.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing-repeated.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/header-parsing-repeated.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing-successes.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/header-parsing-successes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing-successes.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/header-parsing-successes.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/coep-navigate-popup-unsafe-inherit.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/historical/coep-navigate-popup-unsafe-inherit.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/coep-navigate-popup-unsafe-inherit.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/coep-navigate-popup-unsafe-inherit.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-cross-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-cross-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-cross-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-cross-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-site.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-site.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-site.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-site.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-site.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-site.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-site.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-same-site.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-cross-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-cross-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-cross-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-cross-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-site.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-site.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-site.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-site.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-site.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-site.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-site.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-site.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-with-cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-with-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-with-cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-with-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-with-cross-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-with-cross-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-with-cross-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-with-cross-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-unsafe-none.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-unsafe-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-unsafe-none.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-unsafe-none.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-unsafe-none.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-unsafe-none.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-unsafe-none.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-unsafe-none.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-unsafe-none.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-unsafe-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-unsafe-none.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-unsafe-none.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-unsafe-none.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-unsafe-none.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-unsafe-none.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-unsafe-none.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/javascript-url.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/javascript-url.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/javascript-url.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/javascript-url.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/navigate-to-aboutblank.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/navigate-to-aboutblank.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/navigate-to-aboutblank.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/navigate-to-aboutblank.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/navigate-top-to-aboutblank.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/navigate-top-to-aboutblank.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/navigate-top-to-aboutblank.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/navigate-top-to-aboutblank.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/no-https.html b/tests/wpt/tests/html/cross-origin-opener-policy/no-https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/no-https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/no-https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/no-https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/no-https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/no-https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/no-https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-coop-by-sw.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-coop-by-sw.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-coop-by-sw.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-coop-by-sw.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-meta-http-equiv.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-meta-http-equiv.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-meta-http-equiv.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-meta-http-equiv.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-redirect-cache.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-redirect-cache.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-redirect-cache.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-redirect-cache.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-redirect-cache.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/popup-redirect-cache.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-redirect-cache.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-redirect-cache.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-redirect-same-origin-allow-popups.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-redirect-same-origin-allow-popups.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-redirect-same-origin-allow-popups.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-redirect-same-origin-allow-popups.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-site.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-site.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-site.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-site.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-site.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-site.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-site.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-same-site.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-non-initial-about-blank.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-non-initial-about-blank.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-non-initial-about-blank.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-non-initial-about-blank.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-non-initial-about-blank.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-non-initial-about-blank.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-non-initial-about-blank.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-non-initial-about-blank.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-with-cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-with-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-with-cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-with-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-with-cross-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-with-cross-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-with-cross-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-with-cross-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-with-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-with-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-with-same-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-with-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-with-same-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-with-same-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-with-same-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-with-same-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-with-same-site.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-with-same-site.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-with-same-site.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-with-same-site.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-with-same-site.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-with-same-site.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-same-origin-with-same-site.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-same-origin-with-same-site.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-site.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-site.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-site.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-site.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-site.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-site.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-site.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-unsafe-none-with-same-site.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unspecified-with-cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-unspecified-with-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unspecified-with-cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-unspecified-with-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unspecified-with-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-unspecified-with-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unspecified-with-same-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-unspecified-with-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unspecified-with-same-site.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-unspecified-with-same-site.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-unspecified-with-same-site.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-unspecified-with-same-site.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/popup-with-structured-header.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/META.yml b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/META.yml rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/META.yml diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro_cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro_cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro_cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro_cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro_cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro_cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro_cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro_cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro_cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro_cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro_cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro_cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro_cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro_cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro_cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro_cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro_cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro_cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro_cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro_cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro_cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro_cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro_cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro_cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-blur.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-blur.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-blur.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-blur.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-close.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-close.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-close.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-close.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-focus.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-focus.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-focus.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-focus.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-frames.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-frames.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-frames.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-frames.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-indexed-getter.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-indexed-getter.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-indexed-getter.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-indexed-getter.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-indexed-getter.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-indexed-getter.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-indexed-getter.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-indexed-getter.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-length.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-length.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-length.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-length.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-location-get.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-location-get.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-location-get.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-location-get.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-location-set.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-location-set.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-location-set.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-location-set.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-named-getter.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-named-getter.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-named-getter.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-named-getter.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-named-getter.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-named-getter.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-named-getter.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-named-getter.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-get.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-get.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-get.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-get.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-set.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-set.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-set.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-set.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-postmessage-1.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-postmessage-1.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-postmessage-1.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-postmessage-1.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-postmessage-2.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-postmessage-2.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-postmessage-2.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-postmessage-2.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-self.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-self.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-self.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-self.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-top.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-top.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-top.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-top.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-window.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-window.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/property-window.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/property-window.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/report-to-both_coop-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/report-to-both_coop-ro.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/report-to-both_coop-ro.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/report-to-both_coop-ro.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/reporting-observer.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/reporting-observer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/reporting-observer.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/access-reporting/reporting-observer.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/document-reporting/report-only-four-reports.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/document-reporting/report-only-four-reports.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/document-reporting/report-only-four-reports.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/document-reporting/report-only-four-reports.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/document-reporting/report-only-four-reports.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/document-reporting/report-only-four-reports.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/document-reporting/report-only-four-reports.https.html.sub.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/document-reporting/report-only-four-reports.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/document-reporting/report-to-both_coop-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/document-reporting/report-to-both_coop-ro.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/document-reporting/report-to-both_coop-ro.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/document-reporting/report-to-both_coop-ro.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-same-origin-allow-popups.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-same-origin-allow-popups.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-same-origin-allow-popups.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-same-origin-allow-popups.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-unsafe-none.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-unsafe-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-unsafe-none.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-unsafe-none.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html.sub.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html.sub.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep-report-only.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep-report-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep-report-only.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep-report-only.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep-report-only.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep-report-only.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep-report-only.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep-report-only.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-with-coep.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-opener.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-opener.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-opener.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-opener.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html.sub.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html.sub.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html.sub.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html.sub.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html.sub.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-redirect-with-same-origin-allow-popups.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-redirect-with-same-origin-allow-popups.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-redirect-with-same-origin-allow-popups.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-redirect-with-same-origin-allow-popups.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/reporting-common.js b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/resources/reporting-common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/reporting-common.js rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/resources/reporting-common.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/test-access-property.js b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/resources/test-access-property.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/test-access-property.js rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/resources/test-access-property.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/try-access.js b/tests/wpt/tests/html/cross-origin-opener-policy/reporting/resources/try-access.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/try-access.js rename to tests/wpt/tests/html/cross-origin-opener-policy/reporting/resources/try-access.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resource-popup.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/resource-popup.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resource-popup.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/resource-popup.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/call-functionCalledByOpenee.html b/tests/wpt/tests/html/cross-origin-opener-policy/resources/call-functionCalledByOpenee.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/call-functionCalledByOpenee.html rename to tests/wpt/tests/html/cross-origin-opener-policy/resources/call-functionCalledByOpenee.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/common.js b/tests/wpt/tests/html/cross-origin-opener-policy/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/common.js rename to tests/wpt/tests/html/cross-origin-opener-policy/resources/common.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/coop-coep.py b/tests/wpt/tests/html/cross-origin-opener-policy/resources/coop-coep.py similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/coop-coep.py rename to tests/wpt/tests/html/cross-origin-opener-policy/resources/coop-coep.py diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/coop-same-origin-repeated.asis b/tests/wpt/tests/html/cross-origin-opener-policy/resources/coop-same-origin-repeated.asis similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/coop-same-origin-repeated.asis rename to tests/wpt/tests/html/cross-origin-opener-policy/resources/coop-same-origin-repeated.asis diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/csp-sandbox.py b/tests/wpt/tests/html/cross-origin-opener-policy/resources/csp-sandbox.py similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/csp-sandbox.py rename to tests/wpt/tests/html/cross-origin-opener-policy/resources/csp-sandbox.py diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/fully-loaded.js b/tests/wpt/tests/html/cross-origin-opener-policy/resources/fully-loaded.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/fully-loaded.js rename to tests/wpt/tests/html/cross-origin-opener-policy/resources/fully-loaded.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/iframe-test.js b/tests/wpt/tests/html/cross-origin-opener-policy/resources/iframe-test.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/iframe-test.js rename to tests/wpt/tests/html/cross-origin-opener-policy/resources/iframe-test.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/popup-test.js b/tests/wpt/tests/html/cross-origin-opener-policy/resources/popup-test.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/popup-test.js rename to tests/wpt/tests/html/cross-origin-opener-policy/resources/popup-test.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/postback.html b/tests/wpt/tests/html/cross-origin-opener-policy/resources/postback.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/postback.html rename to tests/wpt/tests/html/cross-origin-opener-policy/resources/postback.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/postback.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/resources/postback.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/postback.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/resources/postback.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/redirect.py b/tests/wpt/tests/html/cross-origin-opener-policy/resources/redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/redirect.py rename to tests/wpt/tests/html/cross-origin-opener-policy/resources/redirect.py diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/resource-cleanup.html b/tests/wpt/tests/html/cross-origin-opener-policy/resources/resource-cleanup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/resource-cleanup.html rename to tests/wpt/tests/html/cross-origin-opener-policy/resources/resource-cleanup.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/resource-popup.html b/tests/wpt/tests/html/cross-origin-opener-policy/resources/resource-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/resource-popup.html rename to tests/wpt/tests/html/cross-origin-opener-policy/resources/resource-popup.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/universal-worker.js b/tests/wpt/tests/html/cross-origin-opener-policy/resources/universal-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/universal-worker.js rename to tests/wpt/tests/html/cross-origin-opener-policy/resources/universal-worker.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/README.md b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/README.md rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/README.md diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-closed.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-closed.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-closed.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-closed.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-openee-rp-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-openee-rp-ro.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-openee-rp-ro.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-openee-rp-ro.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-opener-rp-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-opener-rp-ro.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-opener-rp-ro.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-opener-rp-ro.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-post-message.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-post-message.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-post-message.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/access-reporting-post-message.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/coop-rp-in-navigation-chain.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/coop-rp-in-navigation-chain.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/coop-rp-in-navigation-chain.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/coop-rp-in-navigation-chain.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/coop-rp-in-navigation-chain.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/coop-rp-in-navigation-chain.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/coop-rp-in-navigation-chain.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/coop-rp-in-navigation-chain.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-un.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/named_targeting.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/named_targeting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/named_targeting.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/named_targeting.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-u.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-u.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-u.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-u.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-un.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-un.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-un.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-un.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-un.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-un.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-un.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-un.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-bcg-reuse.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-bcg-reuse.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-bcg-reuse.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-bcg-reuse.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-bcg-reuse.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-bcg-reuse.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-bcg-reuse.https.html.sub.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-bcg-reuse.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp-ro.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp-ro.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp-ro.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp-ro.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp-ro.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp-ro.https.html.sub.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp-ro.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp.https.html.sub.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp.https.html.sub.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-from-rp.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp-ro.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp-ro.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp-ro.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp-ro.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp-ro.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp-ro.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp-ro.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp-ro.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp.https.html b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp.https.html rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp.https.html diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp.https.html.headers b/tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp.https.html.headers rename to tests/wpt/tests/html/cross-origin-opener-policy/tentative/restrict-properties/reporting-to-rp.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/dom/aria-attribute-reflection.html b/tests/wpt/tests/html/dom/aria-attribute-reflection.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/aria-attribute-reflection.html rename to tests/wpt/tests/html/dom/aria-attribute-reflection.html diff --git a/tests/wpt/web-platform-tests/html/dom/aria-element-reflection-disconnected.html b/tests/wpt/tests/html/dom/aria-element-reflection-disconnected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/aria-element-reflection-disconnected.html rename to tests/wpt/tests/html/dom/aria-element-reflection-disconnected.html diff --git a/tests/wpt/web-platform-tests/html/dom/aria-element-reflection.html b/tests/wpt/tests/html/dom/aria-element-reflection.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/aria-element-reflection.html rename to tests/wpt/tests/html/dom/aria-element-reflection.html diff --git a/tests/wpt/web-platform-tests/html/dom/directionality/bdi-element-invalid-dir-ref.html b/tests/wpt/tests/html/dom/directionality/bdi-element-invalid-dir-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/directionality/bdi-element-invalid-dir-ref.html rename to tests/wpt/tests/html/dom/directionality/bdi-element-invalid-dir-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/directionality/bdi-element-invalid-dir.html b/tests/wpt/tests/html/dom/directionality/bdi-element-invalid-dir.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/directionality/bdi-element-invalid-dir.html rename to tests/wpt/tests/html/dom/directionality/bdi-element-invalid-dir.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/Document.body.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/Document.body.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.currentScript.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/Document.currentScript.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.currentScript.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/Document.currentScript.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.getElementsByClassName-null-undef.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/Document.getElementsByClassName-null-undef.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.getElementsByClassName-null-undef.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/Document.getElementsByClassName-null-undef.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Element.getElementsByClassName-null-undef.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/Element.getElementsByClassName-null-undef.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Element.getElementsByClassName-null-undef.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/Element.getElementsByClassName-null-undef.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/cross-domain.js b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/cross-domain.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/cross-domain.js rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/cross-domain.js diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.embeds-document.plugins-01.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.embeds-document.plugins-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.embeds-document.plugins-01.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.embeds-document.plugins-01.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.forms.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.forms.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.forms.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.forms.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-liveness.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-liveness.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-liveness.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-liveness.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.head-01.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.head-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.head-01.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.head-01.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.head-02.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.head-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.head-02.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.head-02.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.images.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.images.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.images.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.images.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.links.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.links.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.links.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.links.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.scripts.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.scripts.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.scripts.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.scripts.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-01.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-01.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-01.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-02.xhtml b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-02.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-02.xhtml rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-02.xhtml diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-03.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-03.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-03.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-04.xhtml b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-04.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-04.xhtml rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-04.xhtml diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-05.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-05.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-05.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-05.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-06.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-06.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-06.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-06.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-07.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-07.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-07.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-07.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-08.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-08.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-08.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-08.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-09.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-09.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-09.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-09.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-not-in-html-svg.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-not-in-html-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-not-in-html-svg.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/document.title-not-in-html-svg.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-01.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-01.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-01.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-02.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-02.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-02.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-03.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-03.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-03.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-04.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-04.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-04.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-04.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-05.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-05.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-05.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-05.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-06.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-06.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-06.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-06.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-07.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-07.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-07.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-07.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-08.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-08.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-08.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-08.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-names.html b/tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-names.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-names.html rename to tests/wpt/tests/html/dom/documents/dom-tree-accessors/nameditem-names.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-compatmode-01.html b/tests/wpt/tests/html/dom/documents/resource-metadata-management/document-compatmode-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-compatmode-01.html rename to tests/wpt/tests/html/dom/documents/resource-metadata-management/document-compatmode-01.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-compatmode-02.html b/tests/wpt/tests/html/dom/documents/resource-metadata-management/document-compatmode-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-compatmode-02.html rename to tests/wpt/tests/html/dom/documents/resource-metadata-management/document-compatmode-02.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-compatmode-03.html b/tests/wpt/tests/html/dom/documents/resource-metadata-management/document-compatmode-03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-compatmode-03.html rename to tests/wpt/tests/html/dom/documents/resource-metadata-management/document-compatmode-03.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-compatmode-04.xhtml b/tests/wpt/tests/html/dom/documents/resource-metadata-management/document-compatmode-04.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-compatmode-04.xhtml rename to tests/wpt/tests/html/dom/documents/resource-metadata-management/document-compatmode-04.xhtml diff --git a/tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-compatmode-05.xhtml b/tests/wpt/tests/html/dom/documents/resource-metadata-management/document-compatmode-05.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-compatmode-05.xhtml rename to tests/wpt/tests/html/dom/documents/resource-metadata-management/document-compatmode-05.xhtml diff --git a/tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-compatmode-06.xhtml b/tests/wpt/tests/html/dom/documents/resource-metadata-management/document-compatmode-06.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-compatmode-06.xhtml rename to tests/wpt/tests/html/dom/documents/resource-metadata-management/document-compatmode-06.xhtml diff --git a/tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-cookie.html b/tests/wpt/tests/html/dom/documents/resource-metadata-management/document-cookie.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-cookie.html rename to tests/wpt/tests/html/dom/documents/resource-metadata-management/document-cookie.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified-01.html b/tests/wpt/tests/html/dom/documents/resource-metadata-management/document-lastModified-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified-01.html rename to tests/wpt/tests/html/dom/documents/resource-metadata-management/document-lastModified-01.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified.html b/tests/wpt/tests/html/dom/documents/resource-metadata-management/document-lastModified.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified.html rename to tests/wpt/tests/html/dom/documents/resource-metadata-management/document-lastModified.html diff --git a/tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified.html.headers b/tests/wpt/tests/html/dom/documents/resource-metadata-management/document-lastModified.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-lastModified.html.headers rename to tests/wpt/tests/html/dom/documents/resource-metadata-management/document-lastModified.html.headers diff --git a/tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-readyState.html b/tests/wpt/tests/html/dom/documents/resource-metadata-management/document-readyState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/documents/resource-metadata-management/document-readyState.html rename to tests/wpt/tests/html/dom/documents/resource-metadata-management/document-readyState.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements-embedded.js b/tests/wpt/tests/html/dom/elements-embedded.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements-embedded.js rename to tests/wpt/tests/html/dom/elements-embedded.js diff --git a/tests/wpt/web-platform-tests/html/dom/elements-forms-weekmonth.js b/tests/wpt/tests/html/dom/elements-forms-weekmonth.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements-forms-weekmonth.js rename to tests/wpt/tests/html/dom/elements-forms-weekmonth.js diff --git a/tests/wpt/web-platform-tests/html/dom/elements-forms.js b/tests/wpt/tests/html/dom/elements-forms.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements-forms.js rename to tests/wpt/tests/html/dom/elements-forms.js diff --git a/tests/wpt/web-platform-tests/html/dom/elements-grouping.js b/tests/wpt/tests/html/dom/elements-grouping.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements-grouping.js rename to tests/wpt/tests/html/dom/elements-grouping.js diff --git a/tests/wpt/web-platform-tests/html/dom/elements-metadata.js b/tests/wpt/tests/html/dom/elements-metadata.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements-metadata.js rename to tests/wpt/tests/html/dom/elements-metadata.js diff --git a/tests/wpt/web-platform-tests/html/dom/elements-misc.js b/tests/wpt/tests/html/dom/elements-misc.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements-misc.js rename to tests/wpt/tests/html/dom/elements-misc.js diff --git a/tests/wpt/web-platform-tests/html/dom/elements-obsolete.js b/tests/wpt/tests/html/dom/elements-obsolete.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements-obsolete.js rename to tests/wpt/tests/html/dom/elements-obsolete.js diff --git a/tests/wpt/web-platform-tests/html/dom/elements-sections.js b/tests/wpt/tests/html/dom/elements-sections.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements-sections.js rename to tests/wpt/tests/html/dom/elements-sections.js diff --git a/tests/wpt/web-platform-tests/html/dom/elements-tabular.js b/tests/wpt/tests/html/dom/elements-tabular.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements-tabular.js rename to tests/wpt/tests/html/dom/elements-tabular.js diff --git a/tests/wpt/web-platform-tests/html/dom/elements-text.js b/tests/wpt/tests/html/dom/elements-text.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements-text.js rename to tests/wpt/tests/html/dom/elements-text.js diff --git a/tests/wpt/web-platform-tests/html/dom/elements/elements-in-the-dom/historical.html b/tests/wpt/tests/html/dom/elements/elements-in-the-dom/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/elements-in-the-dom/historical.html rename to tests/wpt/tests/html/dom/elements/elements-in-the-dom/historical.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/elements-in-the-dom/unknown-element.html b/tests/wpt/tests/html/dom/elements/elements-in-the-dom/unknown-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/elements-in-the-dom/unknown-element.html rename to tests/wpt/tests/html/dom/elements/elements-in-the-dom/unknown-element.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/.htaccess b/tests/wpt/tests/html/dom/elements/global-attributes/.htaccess similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/.htaccess rename to tests/wpt/tests/html/dom/elements/global-attributes/.htaccess diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/classlist-nonstring.html b/tests/wpt/tests/html/dom/elements/global-attributes/classlist-nonstring.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/classlist-nonstring.html rename to tests/wpt/tests/html/dom/elements/global-attributes/classlist-nonstring.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/custom-attrs.html b/tests/wpt/tests/html/dom/elements/global-attributes/custom-attrs.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/custom-attrs.html rename to tests/wpt/tests/html/dom/elements/global-attributes/custom-attrs.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/data_unicode_attr.html b/tests/wpt/tests/html/dom/elements/global-attributes/data_unicode_attr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/data_unicode_attr.html rename to tests/wpt/tests/html/dom/elements/global-attributes/data_unicode_attr.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dataset-binding.window.js b/tests/wpt/tests/html/dom/elements/global-attributes/dataset-binding.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dataset-binding.window.js rename to tests/wpt/tests/html/dom/elements/global-attributes/dataset-binding.window.js diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dataset-delete.html b/tests/wpt/tests/html/dom/elements/global-attributes/dataset-delete.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dataset-delete.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dataset-delete.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dataset-enumeration.html b/tests/wpt/tests/html/dom/elements/global-attributes/dataset-enumeration.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dataset-enumeration.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dataset-enumeration.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dataset-get.html b/tests/wpt/tests/html/dom/elements/global-attributes/dataset-get.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dataset-get.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dataset-get.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dataset-prototype.html b/tests/wpt/tests/html/dom/elements/global-attributes/dataset-prototype.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dataset-prototype.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dataset-prototype.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dataset-set.html b/tests/wpt/tests/html/dom/elements/global-attributes/dataset-set.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dataset-set.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dataset-set.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dataset.html b/tests/wpt/tests/html/dom/elements/global-attributes/dataset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dataset.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dataset.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir-auto-div-append-child.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir-auto-div-append-child.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir-auto-div-append-child.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir-auto-div-append-child.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir-bdi-script.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir-bdi-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir-bdi-script.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir-bdi-script.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-EN-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-EN-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-EN-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-EN-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-EN-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-EN-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-EN-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-EN-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-EN-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-EN-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-EN-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-EN-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-EN-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-EN-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-EN-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-EN-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-EN-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-EN-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-EN-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-EN-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-EN-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-EN-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-EN-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-EN-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-EN-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-EN-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-EN.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-EN.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-N-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-script-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-script-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-script-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-script-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-script-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-script-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-script-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-script-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-script-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-script-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-script-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-script-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-script-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-script-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-script-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-script-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-style-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-style-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-style-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-style-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-style-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-style-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-style-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-style-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-style-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-style-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-style-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-style-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-style-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-style-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-style-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-style-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-EN-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-EN-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-EN-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-EN-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-EN-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-EN-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-EN-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-EN-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-EN-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-EN-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-EN-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-EN-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-EN-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-EN-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-EN-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-EN-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-EN.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-EN.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-N-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-N-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-R-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-R-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-R-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-R-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-R.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-R.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-input-script-R.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-input-script-R.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-isolate-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-isolate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-isolate-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-isolate-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-isolate.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-isolate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-isolate.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-isolate.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-pre-N-EN-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-pre-N-EN-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-pre-N-EN-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-pre-N-EN-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-pre-N-EN.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-pre-N-EN.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-pre-N-EN.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-pre-N-EN.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-pre-mixed-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-pre-mixed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-pre-mixed-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-pre-mixed-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-pre-mixed.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-pre-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-pre-mixed.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-pre-mixed.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-N-EN-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-EN-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-N-EN-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-EN-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-N-EN.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-EN.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-N-EN.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-EN.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-mixed-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-mixed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-mixed-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-mixed-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-mixed.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-mixed.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-mixed.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed.html rename to tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/document-dir.html b/tests/wpt/tests/html/dom/elements/global-attributes/document-dir.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/document-dir.html rename to tests/wpt/tests/html/dom/elements/global-attributes/document-dir.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/id-attribute.html b/tests/wpt/tests/html/dom/elements/global-attributes/id-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/id-attribute.html rename to tests/wpt/tests/html/dom/elements/global-attributes/id-attribute.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/id-name-specialcase.html b/tests/wpt/tests/html/dom/elements/global-attributes/id-name-specialcase.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/id-name-specialcase.html rename to tests/wpt/tests/html/dom/elements/global-attributes/id-name-specialcase.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/id-name.html b/tests/wpt/tests/html/dom/elements/global-attributes/id-name.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/id-name.html rename to tests/wpt/tests/html/dom/elements/global-attributes/id-name.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/lang-xmllang-01-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/lang-xmllang-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/lang-xmllang-01-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/lang-xmllang-01-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/lang-xmllang-01.html b/tests/wpt/tests/html/dom/elements/global-attributes/lang-xmllang-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/lang-xmllang-01.html rename to tests/wpt/tests/html/dom/elements/global-attributes/lang-xmllang-01.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/lang-xyzzy-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/lang-xyzzy-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/lang-xyzzy-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/lang-xyzzy-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/lang-xyzzy.html b/tests/wpt/tests/html/dom/elements/global-attributes/lang-xyzzy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/lang-xyzzy.html rename to tests/wpt/tests/html/dom/elements/global-attributes/lang-xyzzy.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/mapped-attribute-adopt-001.html b/tests/wpt/tests/html/dom/elements/global-attributes/mapped-attribute-adopt-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/mapped-attribute-adopt-001.html rename to tests/wpt/tests/html/dom/elements/global-attributes/mapped-attribute-adopt-001.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/style-01-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/style-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/style-01-ref.html rename to tests/wpt/tests/html/dom/elements/global-attributes/style-01-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/style-01.html b/tests/wpt/tests/html/dom/elements/global-attributes/style-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/style-01.html rename to tests/wpt/tests/html/dom/elements/global-attributes/style-01.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-anchor-attribute-001.tentative.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-anchor-attribute-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-anchor-attribute-001.tentative.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-anchor-attribute-001.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-anchor-attribute-002.tentative.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-anchor-attribute-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-anchor-attribute-002.tentative.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-anchor-attribute-002.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-anchor-attribute-003.tentative.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-anchor-attribute-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-anchor-attribute-003.tentative.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-anchor-attribute-003.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-001.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-001.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-001.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-002.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-002.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-002.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-003.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-003.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-003.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-003.html.headers b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-003.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-003.html.headers rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-003.html.headers diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-004.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-004.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-004.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-005.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-005.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-005.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-005.html.headers b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-005.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-005.html.headers rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-005.html.headers diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-006.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-006.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-006.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-006.html.headers b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-006.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-006.html.headers rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-006.html.headers diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-007.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-007.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-007.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-008.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-008.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-008.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-009.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-009.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-009.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-009.html.headers b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-009.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-009.html.headers rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-009.html.headers diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-010.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-010.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-010.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-011.html.headers b/tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-011.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-lang-attribute-011.html.headers rename to tests/wpt/tests/html/dom/elements/global-attributes/the-lang-attribute-011.html.headers diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-translate-attribute-007.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-translate-attribute-007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-translate-attribute-007.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-translate-attribute-007.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-translate-attribute-008.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-translate-attribute-008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-translate-attribute-008.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-translate-attribute-008.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-translate-attribute-009.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-translate-attribute-009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-translate-attribute-009.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-translate-attribute-009.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-translate-attribute-010.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-translate-attribute-010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-translate-attribute-010.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-translate-attribute-010.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-translate-attribute-011.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-translate-attribute-011.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-translate-attribute-011.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-translate-attribute-011.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-translate-attribute-012.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-translate-attribute-012.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/the-translate-attribute-012.html rename to tests/wpt/tests/html/dom/elements/global-attributes/the-translate-attribute-012.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/title-manual.html b/tests/wpt/tests/html/dom/elements/global-attributes/title-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/title-manual.html rename to tests/wpt/tests/html/dom/elements/global-attributes/title-manual.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/translate-enumerated-ascii-case-insensitive.html b/tests/wpt/tests/html/dom/elements/global-attributes/translate-enumerated-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/translate-enumerated-ascii-case-insensitive.html rename to tests/wpt/tests/html/dom/elements/global-attributes/translate-enumerated-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/translate-inherit-no-parent-element.html b/tests/wpt/tests/html/dom/elements/global-attributes/translate-inherit-no-parent-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/translate-inherit-no-parent-element.html rename to tests/wpt/tests/html/dom/elements/global-attributes/translate-inherit-no-parent-element.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/global-attributes/translate-non-html-translation-mode.html b/tests/wpt/tests/html/dom/elements/global-attributes/translate-non-html-translation-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/global-attributes/translate-non-html-translation-mode.html rename to tests/wpt/tests/html/dom/elements/global-attributes/translate-non-html-translation-mode.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/images/bypass-cache-revalidation.html b/tests/wpt/tests/html/dom/elements/images/bypass-cache-revalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/images/bypass-cache-revalidation.html rename to tests/wpt/tests/html/dom/elements/images/bypass-cache-revalidation.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/images/image.py b/tests/wpt/tests/html/dom/elements/images/image.py similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/images/image.py rename to tests/wpt/tests/html/dom/elements/images/image.py diff --git a/tests/wpt/web-platform-tests/html/dom/elements/name-content-attribute-and-property.html b/tests/wpt/tests/html/dom/elements/name-content-attribute-and-property.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/name-content-attribute-and-property.html rename to tests/wpt/tests/html/dom/elements/name-content-attribute-and-property.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-001a.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-001a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-001a.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-001a.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-001b.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-001b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-001b.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-001b.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-001c.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-001c.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-001c.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-001c.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-002a.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-002a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-002a.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-002a.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-002b.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-002b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-002b.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-002b.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-002c.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-002c.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-002c.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-002c.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-003a.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-003a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-003a.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-003a.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-003b.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-003b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-003b.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-003b.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-003c.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-003c.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-003c.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-003c.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-004a.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-004a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-004a.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-004a.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-004b.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-004b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-004b.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-004b.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-004c.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-004c.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-004c.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-004c.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-005a.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-005a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-005a.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-005a.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-005b.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-005b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-005b.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-005b.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-005c.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-005c.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-005c.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-005c.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-006a.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-006a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-006a.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-006a.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-006b.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-006b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-006b.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-006b.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-006c.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-006c.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-006c.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-006c.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-007a.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-007a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-007a.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-007a.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-007b.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-007b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-007b.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-007b.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-007c.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-007c.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-007c.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-007c.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-008a.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-008a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-008a.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-008a.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-008b.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-008b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-008b.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-008b.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-008c.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-008c.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-008c.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-008c.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-009a.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-009a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-009a.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-009a.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-009b.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-009b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-009b.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-009b.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-009c.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-009c.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-009c.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/dir-isolation-009c.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-001-ref.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-001-ref.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-002a-ref.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-002a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-002a-ref.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-002a-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-002b-ref.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-002b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-002b-ref.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-002b-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-002c-ref.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-002c-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-002c-ref.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-002c-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-003-ref.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-003-ref.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-003-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-004-ref.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-004-ref.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-004-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-005-ref.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-005-ref.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-005-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-006-ref.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-006-ref.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-006-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-006c-ref.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-006c-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-006c-ref.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-006c-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-007-ref.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-007-ref.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-007-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-008-ref.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-008-ref.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-008-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-009-ref.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-009-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-009-ref.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-009-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-009b-ref.html b/tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-009b-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-009b-ref.html rename to tests/wpt/tests/html/dom/elements/requirements-relating-to-bidirectional-algorithm-formatting-characters/reference/dir-isolation-009b-ref.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/dynamic-getter.html b/tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/dynamic-getter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/dynamic-getter.html rename to tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/dynamic-getter.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/getter-first-letter-marker-multicol.html b/tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/getter-first-letter-marker-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/getter-first-letter-marker-multicol.html rename to tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/getter-first-letter-marker-multicol.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/getter-tests.js b/tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/getter-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/getter-tests.js rename to tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/getter-tests.js diff --git a/tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/getter.html b/tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/getter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/getter.html rename to tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/getter.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/innertext-domnoderemoved-crash.html b/tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/innertext-domnoderemoved-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/innertext-domnoderemoved-crash.html rename to tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/innertext-domnoderemoved-crash.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/innertext-setter-tests.js b/tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/innertext-setter-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/innertext-setter-tests.js rename to tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/innertext-setter-tests.js diff --git a/tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/innertext-setter.html b/tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/innertext-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/innertext-setter.html rename to tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/innertext-setter.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/multiple-text-nodes.window.js b/tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/multiple-text-nodes.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/multiple-text-nodes.window.js rename to tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/multiple-text-nodes.window.js diff --git a/tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/outertext-setter.html b/tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/outertext-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/the-innertext-and-outertext-properties/outertext-setter.html rename to tests/wpt/tests/html/dom/elements/the-innertext-and-outertext-properties/outertext-setter.html diff --git a/tests/wpt/web-platform-tests/html/dom/elements/wai-aria/README.md b/tests/wpt/tests/html/dom/elements/wai-aria/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/elements/wai-aria/README.md rename to tests/wpt/tests/html/dom/elements/wai-aria/README.md diff --git a/tests/wpt/web-platform-tests/html/dom/historical.html b/tests/wpt/tests/html/dom/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/historical.html rename to tests/wpt/tests/html/dom/historical.html diff --git a/tests/wpt/web-platform-tests/html/dom/idlharness-shadowrealm.window.js b/tests/wpt/tests/html/dom/idlharness-shadowrealm.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/idlharness-shadowrealm.window.js rename to tests/wpt/tests/html/dom/idlharness-shadowrealm.window.js diff --git a/tests/wpt/web-platform-tests/html/dom/idlharness.https.html b/tests/wpt/tests/html/dom/idlharness.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/idlharness.https.html rename to tests/wpt/tests/html/dom/idlharness.https.html diff --git a/tests/wpt/web-platform-tests/html/dom/idlharness.worker.js b/tests/wpt/tests/html/dom/idlharness.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/idlharness.worker.js rename to tests/wpt/tests/html/dom/idlharness.worker.js diff --git a/tests/wpt/web-platform-tests/html/dom/new-harness.js b/tests/wpt/tests/html/dom/new-harness.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/new-harness.js rename to tests/wpt/tests/html/dom/new-harness.js diff --git a/tests/wpt/web-platform-tests/html/dom/original-harness.js b/tests/wpt/tests/html/dom/original-harness.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/original-harness.js rename to tests/wpt/tests/html/dom/original-harness.js diff --git a/tests/wpt/web-platform-tests/html/dom/reflection-embedded.html b/tests/wpt/tests/html/dom/reflection-embedded.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/reflection-embedded.html rename to tests/wpt/tests/html/dom/reflection-embedded.html diff --git a/tests/wpt/web-platform-tests/html/dom/reflection-forms-weekmonth.html b/tests/wpt/tests/html/dom/reflection-forms-weekmonth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/reflection-forms-weekmonth.html rename to tests/wpt/tests/html/dom/reflection-forms-weekmonth.html diff --git a/tests/wpt/web-platform-tests/html/dom/reflection-forms.html b/tests/wpt/tests/html/dom/reflection-forms.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/reflection-forms.html rename to tests/wpt/tests/html/dom/reflection-forms.html diff --git a/tests/wpt/web-platform-tests/html/dom/reflection-grouping.html b/tests/wpt/tests/html/dom/reflection-grouping.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/reflection-grouping.html rename to tests/wpt/tests/html/dom/reflection-grouping.html diff --git a/tests/wpt/web-platform-tests/html/dom/reflection-metadata.html b/tests/wpt/tests/html/dom/reflection-metadata.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/reflection-metadata.html rename to tests/wpt/tests/html/dom/reflection-metadata.html diff --git a/tests/wpt/web-platform-tests/html/dom/reflection-misc.html b/tests/wpt/tests/html/dom/reflection-misc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/reflection-misc.html rename to tests/wpt/tests/html/dom/reflection-misc.html diff --git a/tests/wpt/web-platform-tests/html/dom/reflection-obsolete.html b/tests/wpt/tests/html/dom/reflection-obsolete.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/reflection-obsolete.html rename to tests/wpt/tests/html/dom/reflection-obsolete.html diff --git a/tests/wpt/web-platform-tests/html/dom/reflection-original.html b/tests/wpt/tests/html/dom/reflection-original.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/reflection-original.html rename to tests/wpt/tests/html/dom/reflection-original.html diff --git a/tests/wpt/web-platform-tests/html/dom/reflection-sections.html b/tests/wpt/tests/html/dom/reflection-sections.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/reflection-sections.html rename to tests/wpt/tests/html/dom/reflection-sections.html diff --git a/tests/wpt/web-platform-tests/html/dom/reflection-tabular.html b/tests/wpt/tests/html/dom/reflection-tabular.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/reflection-tabular.html rename to tests/wpt/tests/html/dom/reflection-tabular.html diff --git a/tests/wpt/web-platform-tests/html/dom/reflection-text.html b/tests/wpt/tests/html/dom/reflection-text.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/reflection-text.html rename to tests/wpt/tests/html/dom/reflection-text.html diff --git a/tests/wpt/web-platform-tests/html/dom/reflection.js b/tests/wpt/tests/html/dom/reflection.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/reflection.js rename to tests/wpt/tests/html/dom/reflection.js diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/blocking-idl-attr.tentative.html b/tests/wpt/tests/html/dom/render-blocking/blocking-idl-attr.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/blocking-idl-attr.tentative.html rename to tests/wpt/tests/html/dom/render-blocking/blocking-idl-attr.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/non-render-blocking-scripts.optional.html b/tests/wpt/tests/html/dom/render-blocking/non-render-blocking-scripts.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/non-render-blocking-scripts.optional.html rename to tests/wpt/tests/html/dom/render-blocking/non-render-blocking-scripts.optional.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/parser-blocking-script.tentative.html b/tests/wpt/tests/html/dom/render-blocking/parser-blocking-script.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/parser-blocking-script.tentative.html rename to tests/wpt/tests/html/dom/render-blocking/parser-blocking-script.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/parser-inserted-async-script.tentative.html b/tests/wpt/tests/html/dom/render-blocking/parser-inserted-async-script.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/parser-inserted-async-script.tentative.html rename to tests/wpt/tests/html/dom/render-blocking/parser-inserted-async-script.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/parser-inserted-defer-script.tentative.html b/tests/wpt/tests/html/dom/render-blocking/parser-inserted-defer-script.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/parser-inserted-defer-script.tentative.html rename to tests/wpt/tests/html/dom/render-blocking/parser-inserted-defer-script.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/parser-inserted-module-script.tentative.html b/tests/wpt/tests/html/dom/render-blocking/parser-inserted-module-script.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/parser-inserted-module-script.tentative.html rename to tests/wpt/tests/html/dom/render-blocking/parser-inserted-module-script.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/parser-inserted-style-element.tentative.html b/tests/wpt/tests/html/dom/render-blocking/parser-inserted-style-element.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/parser-inserted-style-element.tentative.html rename to tests/wpt/tests/html/dom/render-blocking/parser-inserted-style-element.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/parser-inserted-stylesheet-link.tentative.html b/tests/wpt/tests/html/dom/render-blocking/parser-inserted-stylesheet-link.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/parser-inserted-stylesheet-link.tentative.html rename to tests/wpt/tests/html/dom/render-blocking/parser-inserted-stylesheet-link.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/remove-attr-script-keeps-blocking.tentative.html b/tests/wpt/tests/html/dom/render-blocking/remove-attr-script-keeps-blocking.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/remove-attr-script-keeps-blocking.tentative.html rename to tests/wpt/tests/html/dom/render-blocking/remove-attr-script-keeps-blocking.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/remove-attr-style-keeps-blocking.tentative.html b/tests/wpt/tests/html/dom/render-blocking/remove-attr-style-keeps-blocking.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/remove-attr-style-keeps-blocking.tentative.html rename to tests/wpt/tests/html/dom/render-blocking/remove-attr-style-keeps-blocking.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/remove-attr-stylesheet-link-keeps-blocking.tentative.html b/tests/wpt/tests/html/dom/render-blocking/remove-attr-stylesheet-link-keeps-blocking.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/remove-attr-stylesheet-link-keeps-blocking.tentative.html rename to tests/wpt/tests/html/dom/render-blocking/remove-attr-stylesheet-link-keeps-blocking.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/remove-attr-unblocks-rendering.optional.html b/tests/wpt/tests/html/dom/render-blocking/remove-attr-unblocks-rendering.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/remove-attr-unblocks-rendering.optional.html rename to tests/wpt/tests/html/dom/render-blocking/remove-attr-unblocks-rendering.optional.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/remove-element-unblocks-rendering.optional.html b/tests/wpt/tests/html/dom/render-blocking/remove-element-unblocks-rendering.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/remove-element-unblocks-rendering.optional.html rename to tests/wpt/tests/html/dom/render-blocking/remove-element-unblocks-rendering.optional.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/remove-pending-async-render-blocking-script.html b/tests/wpt/tests/html/dom/render-blocking/remove-pending-async-render-blocking-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/remove-pending-async-render-blocking-script.html rename to tests/wpt/tests/html/dom/render-blocking/remove-pending-async-render-blocking-script.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/script-inserted-module-script.tentative.html b/tests/wpt/tests/html/dom/render-blocking/script-inserted-module-script.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/script-inserted-module-script.tentative.html rename to tests/wpt/tests/html/dom/render-blocking/script-inserted-module-script.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/script-inserted-script.html b/tests/wpt/tests/html/dom/render-blocking/script-inserted-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/script-inserted-script.html rename to tests/wpt/tests/html/dom/render-blocking/script-inserted-script.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/script-inserted-style-element.tentative.html b/tests/wpt/tests/html/dom/render-blocking/script-inserted-style-element.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/script-inserted-style-element.tentative.html rename to tests/wpt/tests/html/dom/render-blocking/script-inserted-style-element.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/script-inserted-stylesheet-link.tentative.html b/tests/wpt/tests/html/dom/render-blocking/script-inserted-stylesheet-link.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/script-inserted-stylesheet-link.tentative.html rename to tests/wpt/tests/html/dom/render-blocking/script-inserted-stylesheet-link.tentative.html diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/support/dummy-1.js b/tests/wpt/tests/html/dom/render-blocking/support/dummy-1.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/support/dummy-1.js rename to tests/wpt/tests/html/dom/render-blocking/support/dummy-1.js diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/support/dummy-1.mjs b/tests/wpt/tests/html/dom/render-blocking/support/dummy-1.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/support/dummy-1.mjs rename to tests/wpt/tests/html/dom/render-blocking/support/dummy-1.mjs diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/support/target-red.css b/tests/wpt/tests/html/dom/render-blocking/support/target-red.css similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/support/target-red.css rename to tests/wpt/tests/html/dom/render-blocking/support/target-red.css diff --git a/tests/wpt/web-platform-tests/html/dom/render-blocking/support/test-render-blocking.js b/tests/wpt/tests/html/dom/render-blocking/support/test-render-blocking.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/render-blocking/support/test-render-blocking.js rename to tests/wpt/tests/html/dom/render-blocking/support/test-render-blocking.js diff --git a/tests/wpt/web-platform-tests/html/dom/resources/self-origin-subframe.html b/tests/wpt/tests/html/dom/resources/self-origin-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/resources/self-origin-subframe.html rename to tests/wpt/tests/html/dom/resources/self-origin-subframe.html diff --git a/tests/wpt/web-platform-tests/html/dom/self-origin.any.js b/tests/wpt/tests/html/dom/self-origin.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/self-origin.any.js rename to tests/wpt/tests/html/dom/self-origin.any.js diff --git a/tests/wpt/web-platform-tests/html/dom/self-origin.sub.html b/tests/wpt/tests/html/dom/self-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/self-origin.sub.html rename to tests/wpt/tests/html/dom/self-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/dom/usvstring-reflection.https.html b/tests/wpt/tests/html/dom/usvstring-reflection.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/dom/usvstring-reflection.https.html rename to tests/wpt/tests/html/dom/usvstring-reflection.https.html diff --git a/tests/wpt/web-platform-tests/html/editing/activation/click.html b/tests/wpt/tests/html/editing/activation/click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/activation/click.html rename to tests/wpt/tests/html/editing/activation/click.html diff --git a/tests/wpt/web-platform-tests/html/editing/activation/click_checkbox.html b/tests/wpt/tests/html/editing/activation/click_checkbox.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/activation/click_checkbox.html rename to tests/wpt/tests/html/editing/activation/click_checkbox.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/README b/tests/wpt/tests/html/editing/dnd/README similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/README rename to tests/wpt/tests/html/editing/dnd/README diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/001.html b/tests/wpt/tests/html/editing/dnd/canvas/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/001.html rename to tests/wpt/tests/html/editing/dnd/canvas/001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/002.html b/tests/wpt/tests/html/editing/dnd/canvas/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/002.html rename to tests/wpt/tests/html/editing/dnd/canvas/002.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/003-1.xhtml b/tests/wpt/tests/html/editing/dnd/canvas/003-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/003-1.xhtml rename to tests/wpt/tests/html/editing/dnd/canvas/003-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/003.html b/tests/wpt/tests/html/editing/dnd/canvas/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/003.html rename to tests/wpt/tests/html/editing/dnd/canvas/003.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/004.xhtml b/tests/wpt/tests/html/editing/dnd/canvas/004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/004.xhtml rename to tests/wpt/tests/html/editing/dnd/canvas/004.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/005.html b/tests/wpt/tests/html/editing/dnd/canvas/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/005.html rename to tests/wpt/tests/html/editing/dnd/canvas/005.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/006.xhtml b/tests/wpt/tests/html/editing/dnd/canvas/006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/006.xhtml rename to tests/wpt/tests/html/editing/dnd/canvas/006.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/007.html b/tests/wpt/tests/html/editing/dnd/canvas/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/007.html rename to tests/wpt/tests/html/editing/dnd/canvas/007.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/008.xhtml b/tests/wpt/tests/html/editing/dnd/canvas/008.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/008.xhtml rename to tests/wpt/tests/html/editing/dnd/canvas/008.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/009.xhtml b/tests/wpt/tests/html/editing/dnd/canvas/009.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/009.xhtml rename to tests/wpt/tests/html/editing/dnd/canvas/009.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/010-1.xhtml b/tests/wpt/tests/html/editing/dnd/canvas/010-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/010-1.xhtml rename to tests/wpt/tests/html/editing/dnd/canvas/010-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/010.xhtml b/tests/wpt/tests/html/editing/dnd/canvas/010.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/010.xhtml rename to tests/wpt/tests/html/editing/dnd/canvas/010.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/011.xhtml b/tests/wpt/tests/html/editing/dnd/canvas/011.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/011.xhtml rename to tests/wpt/tests/html/editing/dnd/canvas/011.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/012.xhtml b/tests/wpt/tests/html/editing/dnd/canvas/012.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/012.xhtml rename to tests/wpt/tests/html/editing/dnd/canvas/012.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/013.xhtml b/tests/wpt/tests/html/editing/dnd/canvas/013.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/013.xhtml rename to tests/wpt/tests/html/editing/dnd/canvas/013.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/014.xhtml b/tests/wpt/tests/html/editing/dnd/canvas/014.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/014.xhtml rename to tests/wpt/tests/html/editing/dnd/canvas/014.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/cross-domain/001-manual.xhtml b/tests/wpt/tests/html/editing/dnd/canvas/cross-domain/001-manual.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/cross-domain/001-manual.xhtml rename to tests/wpt/tests/html/editing/dnd/canvas/cross-domain/001-manual.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/helper-drag-me-green-box.xhtml b/tests/wpt/tests/html/editing/dnd/canvas/helper-drag-me-green-box.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/helper-drag-me-green-box.xhtml rename to tests/wpt/tests/html/editing/dnd/canvas/helper-drag-me-green-box.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/canvas/helper-drop-here-canvas.xhtml b/tests/wpt/tests/html/editing/dnd/canvas/helper-drop-here-canvas.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/canvas/helper-drop-here-canvas.xhtml rename to tests/wpt/tests/html/editing/dnd/canvas/helper-drop-here-canvas.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/crashers/dialog-001.html b/tests/wpt/tests/html/editing/dnd/crashers/dialog-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/crashers/dialog-001.html rename to tests/wpt/tests/html/editing/dnd/crashers/dialog-001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/cross-document/001-1.html b/tests/wpt/tests/html/editing/dnd/cross-document/001-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/cross-document/001-1.html rename to tests/wpt/tests/html/editing/dnd/cross-document/001-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/cross-document/001.html b/tests/wpt/tests/html/editing/dnd/cross-document/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/cross-document/001.html rename to tests/wpt/tests/html/editing/dnd/cross-document/001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/cross-document/002-manual.html b/tests/wpt/tests/html/editing/dnd/cross-document/002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/cross-document/002-manual.html rename to tests/wpt/tests/html/editing/dnd/cross-document/002-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/cross-document/003-1.html b/tests/wpt/tests/html/editing/dnd/cross-document/003-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/cross-document/003-1.html rename to tests/wpt/tests/html/editing/dnd/cross-document/003-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/cross-document/003.html b/tests/wpt/tests/html/editing/dnd/cross-document/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/cross-document/003.html rename to tests/wpt/tests/html/editing/dnd/cross-document/003.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/001.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/001.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/001.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/002.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/002.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/002.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/003.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/003.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/003.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/004.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/004.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/004.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/005.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/005.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/005.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/006.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/006.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/006.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/007.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/007.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/007.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/007.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/008.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/008.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/008.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/008.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/009-1.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/009-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/009-1.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/009-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/009.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/009.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/009.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/009.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/010-1.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/010-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/010-1.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/010-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/010.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/010.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/010.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/010.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/011.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/011.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/011.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/011.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/012.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/012.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/012.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/012.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/013-1.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/013-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/013-1.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/013-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/013.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/013.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/013.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/013.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/014-1.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/014-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/014-1.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/014-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/014.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/014.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/014.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/014.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/015-manual.html b/tests/wpt/tests/html/editing/dnd/datastore/015-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/015-manual.html rename to tests/wpt/tests/html/editing/dnd/datastore/015-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/016.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/016.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/016.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/016.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/017.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/017.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/017.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/017.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/018.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/018.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/018.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/018.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/019.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/019.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/019.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/019.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/020.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/020.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/020.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/020.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/021.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/021.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/021.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/021.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/022.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/022.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/022.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/022.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/023.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/023.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/023.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/023.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/024.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/024.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/024.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/024.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/025.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/025.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/025.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/025.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/026.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/026.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/026.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/026.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/027.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/027.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/027.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/027.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/028.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/028.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/028.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/028.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/029.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/029.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/029.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/029.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/030.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/030.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/030.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/030.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/031.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/031.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/031.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/031.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/032.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/032.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/032.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/032.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/033.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/033.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/033.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/033.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/034.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/034.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/034.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/034.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/035.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/035.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/035.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/035.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/036.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/036.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/036.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/036.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/037.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/037.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/037.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/037.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/038.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/038.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/038.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/038.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/039.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/039.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/039.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/039.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/040.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/040.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/040.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/040.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/041.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/041.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/041.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/041.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/042.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/042.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/042.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/042.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/043.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/043.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/043.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/043.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/044.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/044.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/044.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/044.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/045.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/045.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/045.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/045.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/046.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/046.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/046.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/046.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/047.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/047.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/047.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/047.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/048.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/048.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/048.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/048.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/049.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/049.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/049.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/049.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/050.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/050.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/050.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/050.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/051.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/051.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/051.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/051.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/052.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/052.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/052.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/052.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/053.html b/tests/wpt/tests/html/editing/dnd/datastore/053.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/053.html rename to tests/wpt/tests/html/editing/dnd/datastore/053.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/054.html b/tests/wpt/tests/html/editing/dnd/datastore/054.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/054.html rename to tests/wpt/tests/html/editing/dnd/datastore/054.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/055.html b/tests/wpt/tests/html/editing/dnd/datastore/055.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/055.html rename to tests/wpt/tests/html/editing/dnd/datastore/055.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/056.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/056.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/056.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/056.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/057.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/057.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/057.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/057.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/058.html b/tests/wpt/tests/html/editing/dnd/datastore/058.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/058.html rename to tests/wpt/tests/html/editing/dnd/datastore/058.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/datatransfer-constructor-001.html b/tests/wpt/tests/html/editing/dnd/datastore/datatransfer-constructor-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/datatransfer-constructor-001.html rename to tests/wpt/tests/html/editing/dnd/datastore/datatransfer-constructor-001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/datatransfer-types.html b/tests/wpt/tests/html/editing/dnd/datastore/datatransfer-types.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/datatransfer-types.html rename to tests/wpt/tests/html/editing/dnd/datastore/datatransfer-types.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/datatransferitemlist-remove.html b/tests/wpt/tests/html/editing/dnd/datastore/datatransferitemlist-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/datatransferitemlist-remove.html rename to tests/wpt/tests/html/editing/dnd/datastore/datatransferitemlist-remove.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/helper-drop-box-here.xhtml b/tests/wpt/tests/html/editing/dnd/datastore/helper-drop-box-here.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/datastore/helper-drop-box-here.xhtml rename to tests/wpt/tests/html/editing/dnd/datastore/helper-drop-box-here.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/dom/draggable.html b/tests/wpt/tests/html/editing/dnd/dom/draggable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/dom/draggable.html rename to tests/wpt/tests/html/editing/dnd/dom/draggable.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/dom/events.html b/tests/wpt/tests/html/editing/dnd/dom/events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/dom/events.html rename to tests/wpt/tests/html/editing/dnd/dom/events.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/dom/specials.html b/tests/wpt/tests/html/editing/dnd/dom/specials.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/dom/specials.html rename to tests/wpt/tests/html/editing/dnd/dom/specials.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/draggable-areas/border-radius.html b/tests/wpt/tests/html/editing/dnd/draggable-areas/border-radius.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/draggable-areas/border-radius.html rename to tests/wpt/tests/html/editing/dnd/draggable-areas/border-radius.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/draggable-areas/border.html b/tests/wpt/tests/html/editing/dnd/draggable-areas/border.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/draggable-areas/border.html rename to tests/wpt/tests/html/editing/dnd/draggable-areas/border.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/draggable-areas/box-shadow.html b/tests/wpt/tests/html/editing/dnd/draggable-areas/box-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/draggable-areas/box-shadow.html rename to tests/wpt/tests/html/editing/dnd/draggable-areas/box-shadow.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/draggable-areas/outline.html b/tests/wpt/tests/html/editing/dnd/draggable-areas/outline.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/draggable-areas/outline.html rename to tests/wpt/tests/html/editing/dnd/draggable-areas/outline.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/draggable-areas/transform.html b/tests/wpt/tests/html/editing/dnd/draggable-areas/transform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/draggable-areas/transform.html rename to tests/wpt/tests/html/editing/dnd/draggable-areas/transform.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/draggable-areas/z-index.html b/tests/wpt/tests/html/editing/dnd/draggable-areas/z-index.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/draggable-areas/z-index.html rename to tests/wpt/tests/html/editing/dnd/draggable-areas/z-index.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/001.xhtml b/tests/wpt/tests/html/editing/dnd/drop/001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/001.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/001.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/002.xhtml b/tests/wpt/tests/html/editing/dnd/drop/002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/002.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/002.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/003.xhtml b/tests/wpt/tests/html/editing/dnd/drop/003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/003.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/003.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/004.xhtml b/tests/wpt/tests/html/editing/dnd/drop/004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/004.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/004.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/005.xhtml b/tests/wpt/tests/html/editing/dnd/drop/005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/005.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/005.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/006.xhtml b/tests/wpt/tests/html/editing/dnd/drop/006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/006.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/006.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/007.xhtml b/tests/wpt/tests/html/editing/dnd/drop/007.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/007.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/007.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/008.xhtml b/tests/wpt/tests/html/editing/dnd/drop/008.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/008.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/008.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/009.xhtml b/tests/wpt/tests/html/editing/dnd/drop/009.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/009.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/009.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/010.xhtml b/tests/wpt/tests/html/editing/dnd/drop/010.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/010.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/010.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/011.xhtml b/tests/wpt/tests/html/editing/dnd/drop/011.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/011.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/011.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/012.xhtml b/tests/wpt/tests/html/editing/dnd/drop/012.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/012.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/012.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/013.xhtml b/tests/wpt/tests/html/editing/dnd/drop/013.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/013.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/013.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/014.xhtml b/tests/wpt/tests/html/editing/dnd/drop/014.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/014.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/014.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/015.xhtml b/tests/wpt/tests/html/editing/dnd/drop/015.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/015.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/015.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/016.xhtml b/tests/wpt/tests/html/editing/dnd/drop/016.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/016.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/016.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/017.xhtml b/tests/wpt/tests/html/editing/dnd/drop/017.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/017.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/017.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/018.xhtml b/tests/wpt/tests/html/editing/dnd/drop/018.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/018.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/018.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/019.xhtml b/tests/wpt/tests/html/editing/dnd/drop/019.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/019.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/019.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/020.xhtml b/tests/wpt/tests/html/editing/dnd/drop/020.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/020.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/020.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/021.xhtml b/tests/wpt/tests/html/editing/dnd/drop/021.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/021.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/021.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/022.xhtml b/tests/wpt/tests/html/editing/dnd/drop/022.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/022.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/022.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/023.xhtml b/tests/wpt/tests/html/editing/dnd/drop/023.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/023.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/023.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/024.xhtml b/tests/wpt/tests/html/editing/dnd/drop/024.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/024.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/024.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/025.html b/tests/wpt/tests/html/editing/dnd/drop/025.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/025.html rename to tests/wpt/tests/html/editing/dnd/drop/025.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/026.xhtml b/tests/wpt/tests/html/editing/dnd/drop/026.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/026.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/026.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/027.xhtml b/tests/wpt/tests/html/editing/dnd/drop/027.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/027.xhtml rename to tests/wpt/tests/html/editing/dnd/drop/027.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/drop/028.html b/tests/wpt/tests/html/editing/dnd/drop/028.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/drop/028.html rename to tests/wpt/tests/html/editing/dnd/drop/028.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/dropzone/001.xhtml b/tests/wpt/tests/html/editing/dnd/dropzone/001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/dropzone/001.xhtml rename to tests/wpt/tests/html/editing/dnd/dropzone/001.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/dropzone/002.xhtml b/tests/wpt/tests/html/editing/dnd/dropzone/002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/dropzone/002.xhtml rename to tests/wpt/tests/html/editing/dnd/dropzone/002.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/dropzone/003.xhtml b/tests/wpt/tests/html/editing/dnd/dropzone/003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/dropzone/003.xhtml rename to tests/wpt/tests/html/editing/dnd/dropzone/003.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/dropzone/004.xhtml b/tests/wpt/tests/html/editing/dnd/dropzone/004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/dropzone/004.xhtml rename to tests/wpt/tests/html/editing/dnd/dropzone/004.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/dropzone/005.xhtml b/tests/wpt/tests/html/editing/dnd/dropzone/005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/dropzone/005.xhtml rename to tests/wpt/tests/html/editing/dnd/dropzone/005.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/dropzone/006.xhtml b/tests/wpt/tests/html/editing/dnd/dropzone/006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/dropzone/006.xhtml rename to tests/wpt/tests/html/editing/dnd/dropzone/006.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/dropzone/007.html b/tests/wpt/tests/html/editing/dnd/dropzone/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/dropzone/007.html rename to tests/wpt/tests/html/editing/dnd/dropzone/007.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/dropzone/008.html b/tests/wpt/tests/html/editing/dnd/dropzone/008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/dropzone/008.html rename to tests/wpt/tests/html/editing/dnd/dropzone/008.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/dropzone/009.html b/tests/wpt/tests/html/editing/dnd/dropzone/009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/dropzone/009.html rename to tests/wpt/tests/html/editing/dnd/dropzone/009.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/dropzone/010.html b/tests/wpt/tests/html/editing/dnd/dropzone/010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/dropzone/010.html rename to tests/wpt/tests/html/editing/dnd/dropzone/010.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/001-1.xhtml b/tests/wpt/tests/html/editing/dnd/events/001-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/001-1.xhtml rename to tests/wpt/tests/html/editing/dnd/events/001-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/001.xhtml b/tests/wpt/tests/html/editing/dnd/events/001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/001.xhtml rename to tests/wpt/tests/html/editing/dnd/events/001.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/002-1.xhtml b/tests/wpt/tests/html/editing/dnd/events/002-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/002-1.xhtml rename to tests/wpt/tests/html/editing/dnd/events/002-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/002.xhtml b/tests/wpt/tests/html/editing/dnd/events/002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/002.xhtml rename to tests/wpt/tests/html/editing/dnd/events/002.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/003-1.xhtml b/tests/wpt/tests/html/editing/dnd/events/003-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/003-1.xhtml rename to tests/wpt/tests/html/editing/dnd/events/003-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/003.xhtml b/tests/wpt/tests/html/editing/dnd/events/003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/003.xhtml rename to tests/wpt/tests/html/editing/dnd/events/003.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/004.xhtml b/tests/wpt/tests/html/editing/dnd/events/004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/004.xhtml rename to tests/wpt/tests/html/editing/dnd/events/004.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/005.xhtml b/tests/wpt/tests/html/editing/dnd/events/005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/005.xhtml rename to tests/wpt/tests/html/editing/dnd/events/005.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/006.xhtml b/tests/wpt/tests/html/editing/dnd/events/006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/006.xhtml rename to tests/wpt/tests/html/editing/dnd/events/006.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/007.xhtml b/tests/wpt/tests/html/editing/dnd/events/007.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/007.xhtml rename to tests/wpt/tests/html/editing/dnd/events/007.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/008.xhtml b/tests/wpt/tests/html/editing/dnd/events/008.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/008.xhtml rename to tests/wpt/tests/html/editing/dnd/events/008.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/009.xhtml b/tests/wpt/tests/html/editing/dnd/events/009.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/009.xhtml rename to tests/wpt/tests/html/editing/dnd/events/009.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/010.xhtml b/tests/wpt/tests/html/editing/dnd/events/010.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/010.xhtml rename to tests/wpt/tests/html/editing/dnd/events/010.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/011.xhtml b/tests/wpt/tests/html/editing/dnd/events/011.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/011.xhtml rename to tests/wpt/tests/html/editing/dnd/events/011.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/012.xhtml b/tests/wpt/tests/html/editing/dnd/events/012.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/012.xhtml rename to tests/wpt/tests/html/editing/dnd/events/012.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/013.xhtml b/tests/wpt/tests/html/editing/dnd/events/013.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/013.xhtml rename to tests/wpt/tests/html/editing/dnd/events/013.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/014.xhtml b/tests/wpt/tests/html/editing/dnd/events/014.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/014.xhtml rename to tests/wpt/tests/html/editing/dnd/events/014.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/015.xhtml b/tests/wpt/tests/html/editing/dnd/events/015.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/015.xhtml rename to tests/wpt/tests/html/editing/dnd/events/015.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/016.xhtml b/tests/wpt/tests/html/editing/dnd/events/016.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/016.xhtml rename to tests/wpt/tests/html/editing/dnd/events/016.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/017.xhtml b/tests/wpt/tests/html/editing/dnd/events/017.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/017.xhtml rename to tests/wpt/tests/html/editing/dnd/events/017.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/018.xhtml b/tests/wpt/tests/html/editing/dnd/events/018.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/018.xhtml rename to tests/wpt/tests/html/editing/dnd/events/018.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/019.xhtml b/tests/wpt/tests/html/editing/dnd/events/019.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/019.xhtml rename to tests/wpt/tests/html/editing/dnd/events/019.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/020.xhtml b/tests/wpt/tests/html/editing/dnd/events/020.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/020.xhtml rename to tests/wpt/tests/html/editing/dnd/events/020.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/021.xhtml b/tests/wpt/tests/html/editing/dnd/events/021.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/021.xhtml rename to tests/wpt/tests/html/editing/dnd/events/021.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/022.xhtml b/tests/wpt/tests/html/editing/dnd/events/022.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/022.xhtml rename to tests/wpt/tests/html/editing/dnd/events/022.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/023.xhtml b/tests/wpt/tests/html/editing/dnd/events/023.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/023.xhtml rename to tests/wpt/tests/html/editing/dnd/events/023.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/024.xhtml b/tests/wpt/tests/html/editing/dnd/events/024.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/024.xhtml rename to tests/wpt/tests/html/editing/dnd/events/024.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/025.html b/tests/wpt/tests/html/editing/dnd/events/025.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/025.html rename to tests/wpt/tests/html/editing/dnd/events/025.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/026.html b/tests/wpt/tests/html/editing/dnd/events/026.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/026.html rename to tests/wpt/tests/html/editing/dnd/events/026.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/027.xhtml b/tests/wpt/tests/html/editing/dnd/events/027.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/027.xhtml rename to tests/wpt/tests/html/editing/dnd/events/027.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/028.xhtml b/tests/wpt/tests/html/editing/dnd/events/028.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/028.xhtml rename to tests/wpt/tests/html/editing/dnd/events/028.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/029.html b/tests/wpt/tests/html/editing/dnd/events/029.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/029.html rename to tests/wpt/tests/html/editing/dnd/events/029.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/030.html b/tests/wpt/tests/html/editing/dnd/events/030.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/030.html rename to tests/wpt/tests/html/editing/dnd/events/030.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/031-1.html b/tests/wpt/tests/html/editing/dnd/events/031-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/031-1.html rename to tests/wpt/tests/html/editing/dnd/events/031-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/031.html b/tests/wpt/tests/html/editing/dnd/events/031.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/031.html rename to tests/wpt/tests/html/editing/dnd/events/031.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/032.html b/tests/wpt/tests/html/editing/dnd/events/032.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/032.html rename to tests/wpt/tests/html/editing/dnd/events/032.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/033.html b/tests/wpt/tests/html/editing/dnd/events/033.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/033.html rename to tests/wpt/tests/html/editing/dnd/events/033.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/034.html b/tests/wpt/tests/html/editing/dnd/events/034.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/034.html rename to tests/wpt/tests/html/editing/dnd/events/034.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/035.html b/tests/wpt/tests/html/editing/dnd/events/035.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/035.html rename to tests/wpt/tests/html/editing/dnd/events/035.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/036.html b/tests/wpt/tests/html/editing/dnd/events/036.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/036.html rename to tests/wpt/tests/html/editing/dnd/events/036.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/037-proposed.xhtml b/tests/wpt/tests/html/editing/dnd/events/037-proposed.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/037-proposed.xhtml rename to tests/wpt/tests/html/editing/dnd/events/037-proposed.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/037-spec.xhtml b/tests/wpt/tests/html/editing/dnd/events/037-spec.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/037-spec.xhtml rename to tests/wpt/tests/html/editing/dnd/events/037-spec.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/038-proposed.html b/tests/wpt/tests/html/editing/dnd/events/038-proposed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/038-proposed.html rename to tests/wpt/tests/html/editing/dnd/events/038-proposed.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/drag-event-div-manual.html b/tests/wpt/tests/html/editing/dnd/events/drag-event-div-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/drag-event-div-manual.html rename to tests/wpt/tests/html/editing/dnd/events/drag-event-div-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/drag-event-manual.html b/tests/wpt/tests/html/editing/dnd/events/drag-event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/drag-event-manual.html rename to tests/wpt/tests/html/editing/dnd/events/drag-event-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/dragend-event-manual.html b/tests/wpt/tests/html/editing/dnd/events/dragend-event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/dragend-event-manual.html rename to tests/wpt/tests/html/editing/dnd/events/dragend-event-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/dragenter-event-manual.html b/tests/wpt/tests/html/editing/dnd/events/dragenter-event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/dragenter-event-manual.html rename to tests/wpt/tests/html/editing/dnd/events/dragenter-event-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/dragleave-event-manual.html b/tests/wpt/tests/html/editing/dnd/events/dragleave-event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/dragleave-event-manual.html rename to tests/wpt/tests/html/editing/dnd/events/dragleave-event-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/dragover-event-manual.html b/tests/wpt/tests/html/editing/dnd/events/dragover-event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/dragover-event-manual.html rename to tests/wpt/tests/html/editing/dnd/events/dragover-event-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/dragstart-event-manual.html b/tests/wpt/tests/html/editing/dnd/events/dragstart-event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/dragstart-event-manual.html rename to tests/wpt/tests/html/editing/dnd/events/dragstart-event-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/drop-event-manual.html b/tests/wpt/tests/html/editing/dnd/events/drop-event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/drop-event-manual.html rename to tests/wpt/tests/html/editing/dnd/events/drop-event-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-cross-document-suite-HELPER-1.html b/tests/wpt/tests/html/editing/dnd/events/events-cross-document-suite-HELPER-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/events-cross-document-suite-HELPER-1.html rename to tests/wpt/tests/html/editing/dnd/events/events-cross-document-suite-HELPER-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-cross-document-suite-HELPER-2.html b/tests/wpt/tests/html/editing/dnd/events/events-cross-document-suite-HELPER-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/events-cross-document-suite-HELPER-2.html rename to tests/wpt/tests/html/editing/dnd/events/events-cross-document-suite-HELPER-2.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-cross-document-suite-manual.html b/tests/wpt/tests/html/editing/dnd/events/events-cross-document-suite-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/events-cross-document-suite-manual.html rename to tests/wpt/tests/html/editing/dnd/events/events-cross-document-suite-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-file-suite-manual.html b/tests/wpt/tests/html/editing/dnd/events/events-file-suite-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/events-file-suite-manual.html rename to tests/wpt/tests/html/editing/dnd/events/events-file-suite-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-non-draggable-001-manual.html b/tests/wpt/tests/html/editing/dnd/events/events-non-draggable-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/events-non-draggable-001-manual.html rename to tests/wpt/tests/html/editing/dnd/events/events-non-draggable-001-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-non-draggable-002-manual.html b/tests/wpt/tests/html/editing/dnd/events/events-non-draggable-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/events-non-draggable-002-manual.html rename to tests/wpt/tests/html/editing/dnd/events/events-non-draggable-002-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-suite-manual.html b/tests/wpt/tests/html/editing/dnd/events/events-suite-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/events-suite-manual.html rename to tests/wpt/tests/html/editing/dnd/events/events-suite-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/helper-drag-me-input-with-circle.xhtml b/tests/wpt/tests/html/editing/dnd/events/helper-drag-me-input-with-circle.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/helper-drag-me-input-with-circle.xhtml rename to tests/wpt/tests/html/editing/dnd/events/helper-drag-me-input-with-circle.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/helper-drag-me-link-with-circle.xhtml b/tests/wpt/tests/html/editing/dnd/events/helper-drag-me-link-with-circle.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/helper-drag-me-link-with-circle.xhtml rename to tests/wpt/tests/html/editing/dnd/events/helper-drag-me-link-with-circle.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/helper-drag-me-p-with-circle.xhtml b/tests/wpt/tests/html/editing/dnd/events/helper-drag-me-p-with-circle.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/helper-drag-me-p-with-circle.xhtml rename to tests/wpt/tests/html/editing/dnd/events/helper-drag-me-p-with-circle.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/helper-drop-here-body-circle.xhtml b/tests/wpt/tests/html/editing/dnd/events/helper-drop-here-body-circle.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/helper-drop-here-body-circle.xhtml rename to tests/wpt/tests/html/editing/dnd/events/helper-drop-here-body-circle.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/historical-manual.html b/tests/wpt/tests/html/editing/dnd/events/historical-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/historical-manual.html rename to tests/wpt/tests/html/editing/dnd/events/historical-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/relatedTarget-attribute-manual.html b/tests/wpt/tests/html/editing/dnd/events/relatedTarget-attribute-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/events/relatedTarget-attribute-manual.html rename to tests/wpt/tests/html/editing/dnd/events/relatedTarget-attribute-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/001.html b/tests/wpt/tests/html/editing/dnd/file/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/001.html rename to tests/wpt/tests/html/editing/dnd/file/001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/002.html b/tests/wpt/tests/html/editing/dnd/file/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/002.html rename to tests/wpt/tests/html/editing/dnd/file/002.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/003.html b/tests/wpt/tests/html/editing/dnd/file/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/003.html rename to tests/wpt/tests/html/editing/dnd/file/003.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/004.html b/tests/wpt/tests/html/editing/dnd/file/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/004.html rename to tests/wpt/tests/html/editing/dnd/file/004.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/005.html b/tests/wpt/tests/html/editing/dnd/file/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/005.html rename to tests/wpt/tests/html/editing/dnd/file/005.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/006.html b/tests/wpt/tests/html/editing/dnd/file/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/006.html rename to tests/wpt/tests/html/editing/dnd/file/006.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/007.html b/tests/wpt/tests/html/editing/dnd/file/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/007.html rename to tests/wpt/tests/html/editing/dnd/file/007.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/008.html b/tests/wpt/tests/html/editing/dnd/file/008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/008.html rename to tests/wpt/tests/html/editing/dnd/file/008.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/009.html b/tests/wpt/tests/html/editing/dnd/file/009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/009.html rename to tests/wpt/tests/html/editing/dnd/file/009.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/010.html b/tests/wpt/tests/html/editing/dnd/file/010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/010.html rename to tests/wpt/tests/html/editing/dnd/file/010.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/011.html b/tests/wpt/tests/html/editing/dnd/file/011.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/011.html rename to tests/wpt/tests/html/editing/dnd/file/011.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/fail.txt b/tests/wpt/tests/html/editing/dnd/file/fail.txt similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/fail.txt rename to tests/wpt/tests/html/editing/dnd/file/fail.txt diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/001.html b/tests/wpt/tests/html/editing/dnd/file/prompt/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/001.html rename to tests/wpt/tests/html/editing/dnd/file/prompt/001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/002.html b/tests/wpt/tests/html/editing/dnd/file/prompt/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/002.html rename to tests/wpt/tests/html/editing/dnd/file/prompt/002.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/003.html b/tests/wpt/tests/html/editing/dnd/file/prompt/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/003.html rename to tests/wpt/tests/html/editing/dnd/file/prompt/003.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/004.html b/tests/wpt/tests/html/editing/dnd/file/prompt/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/004.html rename to tests/wpt/tests/html/editing/dnd/file/prompt/004.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/005.html b/tests/wpt/tests/html/editing/dnd/file/prompt/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/005.html rename to tests/wpt/tests/html/editing/dnd/file/prompt/005.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/006.html b/tests/wpt/tests/html/editing/dnd/file/prompt/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/006.html rename to tests/wpt/tests/html/editing/dnd/file/prompt/006.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/007.html b/tests/wpt/tests/html/editing/dnd/file/prompt/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/007.html rename to tests/wpt/tests/html/editing/dnd/file/prompt/007.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/008.html b/tests/wpt/tests/html/editing/dnd/file/prompt/008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/008.html rename to tests/wpt/tests/html/editing/dnd/file/prompt/008.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/009.html b/tests/wpt/tests/html/editing/dnd/file/prompt/009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/file/prompt/009.html rename to tests/wpt/tests/html/editing/dnd/file/prompt/009.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/historical.html b/tests/wpt/tests/html/editing/dnd/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/historical.html rename to tests/wpt/tests/html/editing/dnd/historical.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/001.html b/tests/wpt/tests/html/editing/dnd/images/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/001.html rename to tests/wpt/tests/html/editing/dnd/images/001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/002.html b/tests/wpt/tests/html/editing/dnd/images/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/002.html rename to tests/wpt/tests/html/editing/dnd/images/002.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/003.html b/tests/wpt/tests/html/editing/dnd/images/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/003.html rename to tests/wpt/tests/html/editing/dnd/images/003.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/004.html b/tests/wpt/tests/html/editing/dnd/images/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/004.html rename to tests/wpt/tests/html/editing/dnd/images/004.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/005.html b/tests/wpt/tests/html/editing/dnd/images/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/005.html rename to tests/wpt/tests/html/editing/dnd/images/005.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/006.html b/tests/wpt/tests/html/editing/dnd/images/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/006.html rename to tests/wpt/tests/html/editing/dnd/images/006.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/007.html b/tests/wpt/tests/html/editing/dnd/images/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/007.html rename to tests/wpt/tests/html/editing/dnd/images/007.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/008.html b/tests/wpt/tests/html/editing/dnd/images/008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/008.html rename to tests/wpt/tests/html/editing/dnd/images/008.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/009.html b/tests/wpt/tests/html/editing/dnd/images/009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/009.html rename to tests/wpt/tests/html/editing/dnd/images/009.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/010.html b/tests/wpt/tests/html/editing/dnd/images/010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/010.html rename to tests/wpt/tests/html/editing/dnd/images/010.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/011.xhtml b/tests/wpt/tests/html/editing/dnd/images/011.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/011.xhtml rename to tests/wpt/tests/html/editing/dnd/images/011.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/012-1.xhtml b/tests/wpt/tests/html/editing/dnd/images/012-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/012-1.xhtml rename to tests/wpt/tests/html/editing/dnd/images/012-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/012.xhtml b/tests/wpt/tests/html/editing/dnd/images/012.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/012.xhtml rename to tests/wpt/tests/html/editing/dnd/images/012.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/013-1.xhtml b/tests/wpt/tests/html/editing/dnd/images/013-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/013-1.xhtml rename to tests/wpt/tests/html/editing/dnd/images/013-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/013.xhtml b/tests/wpt/tests/html/editing/dnd/images/013.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/013.xhtml rename to tests/wpt/tests/html/editing/dnd/images/013.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/014-1.xhtml b/tests/wpt/tests/html/editing/dnd/images/014-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/014-1.xhtml rename to tests/wpt/tests/html/editing/dnd/images/014-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/014.xhtml b/tests/wpt/tests/html/editing/dnd/images/014.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/014.xhtml rename to tests/wpt/tests/html/editing/dnd/images/014.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/015.html b/tests/wpt/tests/html/editing/dnd/images/015.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/015.html rename to tests/wpt/tests/html/editing/dnd/images/015.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/016.html b/tests/wpt/tests/html/editing/dnd/images/016.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/016.html rename to tests/wpt/tests/html/editing/dnd/images/016.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/017.html b/tests/wpt/tests/html/editing/dnd/images/017.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/017.html rename to tests/wpt/tests/html/editing/dnd/images/017.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/018.html b/tests/wpt/tests/html/editing/dnd/images/018.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/018.html rename to tests/wpt/tests/html/editing/dnd/images/018.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/021.html b/tests/wpt/tests/html/editing/dnd/images/021.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/021.html rename to tests/wpt/tests/html/editing/dnd/images/021.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/022.xhtml b/tests/wpt/tests/html/editing/dnd/images/022.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/022.xhtml rename to tests/wpt/tests/html/editing/dnd/images/022.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/023.html b/tests/wpt/tests/html/editing/dnd/images/023.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/023.html rename to tests/wpt/tests/html/editing/dnd/images/023.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/024.html b/tests/wpt/tests/html/editing/dnd/images/024.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/024.html rename to tests/wpt/tests/html/editing/dnd/images/024.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/025.xhtml b/tests/wpt/tests/html/editing/dnd/images/025.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/025.xhtml rename to tests/wpt/tests/html/editing/dnd/images/025.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/026.xhtml b/tests/wpt/tests/html/editing/dnd/images/026.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/026.xhtml rename to tests/wpt/tests/html/editing/dnd/images/026.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/027.xhtml b/tests/wpt/tests/html/editing/dnd/images/027.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/027.xhtml rename to tests/wpt/tests/html/editing/dnd/images/027.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/028.xhtml b/tests/wpt/tests/html/editing/dnd/images/028.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/028.xhtml rename to tests/wpt/tests/html/editing/dnd/images/028.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/cross-domain/001-manual.xhtml b/tests/wpt/tests/html/editing/dnd/images/cross-domain/001-manual.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/cross-domain/001-manual.xhtml rename to tests/wpt/tests/html/editing/dnd/images/cross-domain/001-manual.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/helper-circle.xhtml b/tests/wpt/tests/html/editing/dnd/images/helper-circle.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/helper-circle.xhtml rename to tests/wpt/tests/html/editing/dnd/images/helper-circle.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/helper-drag-me-data-url-image.xhtml b/tests/wpt/tests/html/editing/dnd/images/helper-drag-me-data-url-image.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/helper-drag-me-data-url-image.xhtml rename to tests/wpt/tests/html/editing/dnd/images/helper-drag-me-data-url-image.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/helper-drop-horizontal-scrollbar.xhtml b/tests/wpt/tests/html/editing/dnd/images/helper-drop-horizontal-scrollbar.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/helper-drop-horizontal-scrollbar.xhtml rename to tests/wpt/tests/html/editing/dnd/images/helper-drop-horizontal-scrollbar.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/helper-drop-image-here.xhtml b/tests/wpt/tests/html/editing/dnd/images/helper-drop-image-here.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/helper-drop-image-here.xhtml rename to tests/wpt/tests/html/editing/dnd/images/helper-drop-image-here.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/images/helper-drop-vertical-scrollbar.xhtml b/tests/wpt/tests/html/editing/dnd/images/helper-drop-vertical-scrollbar.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/images/helper-drop-vertical-scrollbar.xhtml rename to tests/wpt/tests/html/editing/dnd/images/helper-drop-vertical-scrollbar.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactive/frames-1.html b/tests/wpt/tests/html/editing/dnd/interactive/frames-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactive/frames-1.html rename to tests/wpt/tests/html/editing/dnd/interactive/frames-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactive/frames.html b/tests/wpt/tests/html/editing/dnd/interactive/frames.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactive/frames.html rename to tests/wpt/tests/html/editing/dnd/interactive/frames.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactive/object-retention.html b/tests/wpt/tests/html/editing/dnd/interactive/object-retention.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactive/object-retention.html rename to tests/wpt/tests/html/editing/dnd/interactive/object-retention.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactive/plugins.html b/tests/wpt/tests/html/editing/dnd/interactive/plugins.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactive/plugins.html rename to tests/wpt/tests/html/editing/dnd/interactive/plugins.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/001.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/001.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/002.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/002.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/002.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/003.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/003.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/003.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/004.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/004.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/004.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/005.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/005.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/005.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/006.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/006.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/006.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/007.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/007.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/007.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/008.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/008.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/008.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/009.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/009.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/009.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/010.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/010.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/010.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/011.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/011.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/011.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/011.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/012.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/012.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/012.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/012.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/015.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/015.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/015.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/015.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/016.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/016.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/016.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/016.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/017.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/017.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/017.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/017.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/018.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/018.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/018.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/018.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/019.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/019.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/019.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/019.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/020.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/020.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/020.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/020.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/021.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/021.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/021.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/021.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/022.html b/tests/wpt/tests/html/editing/dnd/interactiveelements/022.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/interactiveelements/022.html rename to tests/wpt/tests/html/editing/dnd/interactiveelements/022.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/media/001.xhtml b/tests/wpt/tests/html/editing/dnd/media/001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/media/001.xhtml rename to tests/wpt/tests/html/editing/dnd/media/001.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/000.html b/tests/wpt/tests/html/editing/dnd/microdata/000.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/000.html rename to tests/wpt/tests/html/editing/dnd/microdata/000.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/001.html b/tests/wpt/tests/html/editing/dnd/microdata/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/001.html rename to tests/wpt/tests/html/editing/dnd/microdata/001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/002.html b/tests/wpt/tests/html/editing/dnd/microdata/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/002.html rename to tests/wpt/tests/html/editing/dnd/microdata/002.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/003.html b/tests/wpt/tests/html/editing/dnd/microdata/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/003.html rename to tests/wpt/tests/html/editing/dnd/microdata/003.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/004.html b/tests/wpt/tests/html/editing/dnd/microdata/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/004.html rename to tests/wpt/tests/html/editing/dnd/microdata/004.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/005.html b/tests/wpt/tests/html/editing/dnd/microdata/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/005.html rename to tests/wpt/tests/html/editing/dnd/microdata/005.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/006.html b/tests/wpt/tests/html/editing/dnd/microdata/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/006.html rename to tests/wpt/tests/html/editing/dnd/microdata/006.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/007.html b/tests/wpt/tests/html/editing/dnd/microdata/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/007.html rename to tests/wpt/tests/html/editing/dnd/microdata/007.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/008.html b/tests/wpt/tests/html/editing/dnd/microdata/008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/008.html rename to tests/wpt/tests/html/editing/dnd/microdata/008.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/009.html b/tests/wpt/tests/html/editing/dnd/microdata/009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/009.html rename to tests/wpt/tests/html/editing/dnd/microdata/009.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/010.html b/tests/wpt/tests/html/editing/dnd/microdata/010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/010.html rename to tests/wpt/tests/html/editing/dnd/microdata/010.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/011.html b/tests/wpt/tests/html/editing/dnd/microdata/011.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/011.html rename to tests/wpt/tests/html/editing/dnd/microdata/011.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/012.html b/tests/wpt/tests/html/editing/dnd/microdata/012.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/012.html rename to tests/wpt/tests/html/editing/dnd/microdata/012.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/013.html b/tests/wpt/tests/html/editing/dnd/microdata/013.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/013.html rename to tests/wpt/tests/html/editing/dnd/microdata/013.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/014.html b/tests/wpt/tests/html/editing/dnd/microdata/014.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/014.html rename to tests/wpt/tests/html/editing/dnd/microdata/014.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/015.html b/tests/wpt/tests/html/editing/dnd/microdata/015.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/015.html rename to tests/wpt/tests/html/editing/dnd/microdata/015.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/016.html b/tests/wpt/tests/html/editing/dnd/microdata/016.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/016.html rename to tests/wpt/tests/html/editing/dnd/microdata/016.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/017.html b/tests/wpt/tests/html/editing/dnd/microdata/017.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/017.html rename to tests/wpt/tests/html/editing/dnd/microdata/017.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/018.html b/tests/wpt/tests/html/editing/dnd/microdata/018.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/018.html rename to tests/wpt/tests/html/editing/dnd/microdata/018.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/019.html b/tests/wpt/tests/html/editing/dnd/microdata/019.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/019.html rename to tests/wpt/tests/html/editing/dnd/microdata/019.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/020.html b/tests/wpt/tests/html/editing/dnd/microdata/020.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/020.html rename to tests/wpt/tests/html/editing/dnd/microdata/020.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/021.html b/tests/wpt/tests/html/editing/dnd/microdata/021.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/021.html rename to tests/wpt/tests/html/editing/dnd/microdata/021.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/microdata/test b/tests/wpt/tests/html/editing/dnd/microdata/test similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/microdata/test rename to tests/wpt/tests/html/editing/dnd/microdata/test diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/001-1.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/001-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/001-1.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/001-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/001.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/001.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/001.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/002.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/002.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/002.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/003.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/003.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/003.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/004.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/004.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/004.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/005.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/005.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/005.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/006.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/006.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/006.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/007-1.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/007-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/007-1.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/007-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/007.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/007.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/007.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/007.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/008-1.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/008-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/008-1.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/008-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/008.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/008.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/008.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/008.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/009-1.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/009-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/009-1.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/009-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/009.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/009.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/009.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/009.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/010-1.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/010-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/010-1.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/010-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/010.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/010.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/010.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/010.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/011-1.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/011-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/011-1.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/011-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/011.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/011.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/011.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/011.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/012.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/012.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/012.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/012.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/013.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/013.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/013.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/013.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/014.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/014.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/014.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/014.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/015.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/015.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/015.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/015.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/016-1.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/016-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/016-1.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/016-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/016.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/016.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/016.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/016.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/017.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/017.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/017.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/017.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/018.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/018.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/018.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/018.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/019.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/019.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/019.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/019.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/020.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/020.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/020.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/020.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/021-1.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/021-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/021-1.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/021-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/021.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/021.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/021.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/021.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/022-1.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/022-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/022-1.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/022-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/022.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/022.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/022.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/022.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/023-1.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/023-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/023-1.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/023-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/023.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/023.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/023.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/023.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/helper-drag-image-dont-drop.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/helper-drag-image-dont-drop.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/helper-drag-image-dont-drop.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/helper-drag-image-dont-drop.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/helper-drag-selection-dont-drop.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/helper-drag-selection-dont-drop.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/helper-drag-selection-dont-drop.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/helper-drag-selection-dont-drop.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/helper-drop-here-reload.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/helper-drop-here-reload.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/helper-drop-here-reload.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/helper-drop-here-reload.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/helper-drop-image-now.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/helper-drop-image-now.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/helper-drop-image-now.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/helper-drop-image-now.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/helper-drop-link-now.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/helper-drop-link-now.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/helper-drop-link-now.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/helper-drop-link-now.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/helper-drop-now.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/helper-drop-now.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/helper-drop-now.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/helper-drop-now.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/navigation/helper-drop-selection-here.xhtml b/tests/wpt/tests/html/editing/dnd/navigation/helper-drop-selection-here.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/navigation/helper-drop-selection-here.xhtml rename to tests/wpt/tests/html/editing/dnd/navigation/helper-drop-selection-here.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/001.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/001.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/001.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/002.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/002.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/002.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/003.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/003.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/003.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/004.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/004.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/004.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/005.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/005.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/005.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/006.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/006.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/006.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/007.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/007.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/007.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/007.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/008.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/008.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/008.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/008.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/009.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/009.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/009.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/009.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/010.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/010.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/010.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/010.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/011.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/011.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/011.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/011.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/012.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/012.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/012.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/012.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/013.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/013.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/013.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/013.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/014.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/014.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/014.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/014.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/015.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/015.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/015.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/015.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/016.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/016.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/016.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/016.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/017.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/017.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/017.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/017.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/018.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/018.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/018.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/018.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/019.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/019.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/019.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/019.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/020.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/020.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/020.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/020.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/021.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/021.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/021.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/021.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/022.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/022.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/022.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/022.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/023.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/023.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/023.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/023.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/024.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/024.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/024.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/024.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/025.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/025.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/025.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/025.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/026.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/026.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/026.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/026.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/027.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/027.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/027.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/027.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/028.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/028.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/028.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/028.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/029.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/029.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/029.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/029.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/030.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/030.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/030.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/030.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/031.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/031.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/031.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/031.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/032.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/032.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/032.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/032.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/033.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/033.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/033.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/033.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/034.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/034.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/034.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/034.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/035.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/035.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/035.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/035.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/036.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/036.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/036.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/036.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/038.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/038.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/038.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/038.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/039.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/039.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/039.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/039.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/040.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/040.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/040.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/040.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/041.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/041.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/041.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/041.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/042.html b/tests/wpt/tests/html/editing/dnd/overlay/042.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/042.html rename to tests/wpt/tests/html/editing/dnd/overlay/042.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/043.html b/tests/wpt/tests/html/editing/dnd/overlay/043.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/043.html rename to tests/wpt/tests/html/editing/dnd/overlay/043.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/044.html b/tests/wpt/tests/html/editing/dnd/overlay/044.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/044.html rename to tests/wpt/tests/html/editing/dnd/overlay/044.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/045.html b/tests/wpt/tests/html/editing/dnd/overlay/045.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/045.html rename to tests/wpt/tests/html/editing/dnd/overlay/045.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/046.html b/tests/wpt/tests/html/editing/dnd/overlay/046.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/046.html rename to tests/wpt/tests/html/editing/dnd/overlay/046.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/047.html b/tests/wpt/tests/html/editing/dnd/overlay/047.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/047.html rename to tests/wpt/tests/html/editing/dnd/overlay/047.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/048.html b/tests/wpt/tests/html/editing/dnd/overlay/048.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/048.html rename to tests/wpt/tests/html/editing/dnd/overlay/048.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/049.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/049.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/049.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/049.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/050.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/050.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/050.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/050.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/051.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/051.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/051.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/051.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/052.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/052.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/052.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/052.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/053.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/053.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/053.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/053.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/054.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/054.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/054.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/054.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/055.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/055.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/055.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/055.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/056.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/056.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/056.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/056.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/057.xhtml b/tests/wpt/tests/html/editing/dnd/overlay/057.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/057.xhtml rename to tests/wpt/tests/html/editing/dnd/overlay/057.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/058.html b/tests/wpt/tests/html/editing/dnd/overlay/058.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/058.html rename to tests/wpt/tests/html/editing/dnd/overlay/058.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/059.html b/tests/wpt/tests/html/editing/dnd/overlay/059.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/059.html rename to tests/wpt/tests/html/editing/dnd/overlay/059.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/060.html b/tests/wpt/tests/html/editing/dnd/overlay/060.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/060.html rename to tests/wpt/tests/html/editing/dnd/overlay/060.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/061.html b/tests/wpt/tests/html/editing/dnd/overlay/061.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/061.html rename to tests/wpt/tests/html/editing/dnd/overlay/061.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/062.html b/tests/wpt/tests/html/editing/dnd/overlay/062.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/062.html rename to tests/wpt/tests/html/editing/dnd/overlay/062.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-001.html b/tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-001.html rename to tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-002.html b/tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-002.html rename to tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-002.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-003.html b/tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-003.html rename to tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-003.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-004.html b/tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-004.html rename to tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-004.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-005.html b/tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-005.html rename to tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-005.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-006.html b/tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-006.html rename to tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-006.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-007.html b/tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-007.html rename to tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-007.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-008.html b/tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-008.html rename to tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-008.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-009.html b/tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/heavy-styling-009.html rename to tests/wpt/tests/html/editing/dnd/overlay/heavy-styling-009.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/outside-viewport-001.html b/tests/wpt/tests/html/editing/dnd/overlay/outside-viewport-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/outside-viewport-001.html rename to tests/wpt/tests/html/editing/dnd/overlay/outside-viewport-001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/outside-viewport-002.html b/tests/wpt/tests/html/editing/dnd/overlay/outside-viewport-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/outside-viewport-002.html rename to tests/wpt/tests/html/editing/dnd/overlay/outside-viewport-002.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/outside-viewport-003.html b/tests/wpt/tests/html/editing/dnd/overlay/outside-viewport-003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/outside-viewport-003.html rename to tests/wpt/tests/html/editing/dnd/overlay/outside-viewport-003.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/outside-viewport-004.html b/tests/wpt/tests/html/editing/dnd/overlay/outside-viewport-004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/outside-viewport-004.html rename to tests/wpt/tests/html/editing/dnd/overlay/outside-viewport-004.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/outside-viewport-005.html b/tests/wpt/tests/html/editing/dnd/overlay/outside-viewport-005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/outside-viewport-005.html rename to tests/wpt/tests/html/editing/dnd/overlay/outside-viewport-005.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/outside-viewport-006.html b/tests/wpt/tests/html/editing/dnd/overlay/outside-viewport-006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/outside-viewport-006.html rename to tests/wpt/tests/html/editing/dnd/overlay/outside-viewport-006.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/overlay/oversized-001.html b/tests/wpt/tests/html/editing/dnd/overlay/oversized-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/overlay/oversized-001.html rename to tests/wpt/tests/html/editing/dnd/overlay/oversized-001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/alttab.html b/tests/wpt/tests/html/editing/dnd/platform/alttab.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/alttab.html rename to tests/wpt/tests/html/editing/dnd/platform/alttab.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/cancel-middle-click.html b/tests/wpt/tests/html/editing/dnd/platform/cancel-middle-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/cancel-middle-click.html rename to tests/wpt/tests/html/editing/dnd/platform/cancel-middle-click.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/cancel-right-click.html b/tests/wpt/tests/html/editing/dnd/platform/cancel-right-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/cancel-right-click.html rename to tests/wpt/tests/html/editing/dnd/platform/cancel-right-click.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-001-manual.html b/tests/wpt/tests/html/editing/dnd/platform/close-drag-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-001-manual.html rename to tests/wpt/tests/html/editing/dnd/platform/close-drag-001-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-002-manual.html b/tests/wpt/tests/html/editing/dnd/platform/close-drag-002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-002-manual.html rename to tests/wpt/tests/html/editing/dnd/platform/close-drag-002-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-003-manual.html b/tests/wpt/tests/html/editing/dnd/platform/close-drag-003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-003-manual.html rename to tests/wpt/tests/html/editing/dnd/platform/close-drag-003-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-004-manual.html b/tests/wpt/tests/html/editing/dnd/platform/close-drag-004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-004-manual.html rename to tests/wpt/tests/html/editing/dnd/platform/close-drag-004-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-005-manual.html b/tests/wpt/tests/html/editing/dnd/platform/close-drag-005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-005-manual.html rename to tests/wpt/tests/html/editing/dnd/platform/close-drag-005-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-006-manual.html b/tests/wpt/tests/html/editing/dnd/platform/close-drag-006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-006-manual.html rename to tests/wpt/tests/html/editing/dnd/platform/close-drag-006-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/001.html b/tests/wpt/tests/html/editing/dnd/platform/cursors/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/001.html rename to tests/wpt/tests/html/editing/dnd/platform/cursors/001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/002.html b/tests/wpt/tests/html/editing/dnd/platform/cursors/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/002.html rename to tests/wpt/tests/html/editing/dnd/platform/cursors/002.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/003.html b/tests/wpt/tests/html/editing/dnd/platform/cursors/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/003.html rename to tests/wpt/tests/html/editing/dnd/platform/cursors/003.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/004.html b/tests/wpt/tests/html/editing/dnd/platform/cursors/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/004.html rename to tests/wpt/tests/html/editing/dnd/platform/cursors/004.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/005.html b/tests/wpt/tests/html/editing/dnd/platform/cursors/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/005.html rename to tests/wpt/tests/html/editing/dnd/platform/cursors/005.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/006.html b/tests/wpt/tests/html/editing/dnd/platform/cursors/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/006.html rename to tests/wpt/tests/html/editing/dnd/platform/cursors/006.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/007.html b/tests/wpt/tests/html/editing/dnd/platform/cursors/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/007.html rename to tests/wpt/tests/html/editing/dnd/platform/cursors/007.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/008.html b/tests/wpt/tests/html/editing/dnd/platform/cursors/008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/008.html rename to tests/wpt/tests/html/editing/dnd/platform/cursors/008.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/009.html b/tests/wpt/tests/html/editing/dnd/platform/cursors/009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/009.html rename to tests/wpt/tests/html/editing/dnd/platform/cursors/009.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/010.html b/tests/wpt/tests/html/editing/dnd/platform/cursors/010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/010.html rename to tests/wpt/tests/html/editing/dnd/platform/cursors/010.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/011.html b/tests/wpt/tests/html/editing/dnd/platform/cursors/011.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/cursors/011.html rename to tests/wpt/tests/html/editing/dnd/platform/cursors/011.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-keypress-manual.html b/tests/wpt/tests/html/editing/dnd/platform/drag-keypress-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-keypress-manual.html rename to tests/wpt/tests/html/editing/dnd/platform/drag-keypress-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-link-manual.html b/tests/wpt/tests/html/editing/dnd/platform/drag-link-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-link-manual.html rename to tests/wpt/tests/html/editing/dnd/platform/drag-link-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-to-title-manual.html b/tests/wpt/tests/html/editing/dnd/platform/drag-to-title-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-to-title-manual.html rename to tests/wpt/tests/html/editing/dnd/platform/drag-to-title-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/file-drop-position.html b/tests/wpt/tests/html/editing/dnd/platform/file-drop-position.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/file-drop-position.html rename to tests/wpt/tests/html/editing/dnd/platform/file-drop-position.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/file-os-to-os.html b/tests/wpt/tests/html/editing/dnd/platform/file-os-to-os.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/file-os-to-os.html rename to tests/wpt/tests/html/editing/dnd/platform/file-os-to-os.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/file-to-system.html b/tests/wpt/tests/html/editing/dnd/platform/file-to-system.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/file-to-system.html rename to tests/wpt/tests/html/editing/dnd/platform/file-to-system.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/html-to-os-HELPER-FILE.html b/tests/wpt/tests/html/editing/dnd/platform/html-to-os-HELPER-FILE.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/html-to-os-HELPER-FILE.html rename to tests/wpt/tests/html/editing/dnd/platform/html-to-os-HELPER-FILE.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/html-to-os.html b/tests/wpt/tests/html/editing/dnd/platform/html-to-os.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/html-to-os.html rename to tests/wpt/tests/html/editing/dnd/platform/html-to-os.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/html-unicode-to-os.html b/tests/wpt/tests/html/editing/dnd/platform/html-unicode-to-os.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/html-unicode-to-os.html rename to tests/wpt/tests/html/editing/dnd/platform/html-unicode-to-os.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/inputs-no-js.html b/tests/wpt/tests/html/editing/dnd/platform/inputs-no-js.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/inputs-no-js.html rename to tests/wpt/tests/html/editing/dnd/platform/inputs-no-js.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/001.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/001.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/002.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/002.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/002.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/003.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/003.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/003.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/004.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/004.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/004.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/005.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/005.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/005.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/006.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/006.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/006.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/007.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/007.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/007.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/008.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/008.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/008.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/009.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/009.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/009.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/010.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/010.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/010.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/011.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/011.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/011.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/011.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/012.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/012.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/012.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/012.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/013.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/013.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/013.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/013.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/014.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/014.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/014.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/014.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/015.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/015.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/015.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/015.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/016.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/016.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/016.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/016.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/017.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/017.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/017.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/017.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/018.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/018.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/018.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/018.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/019.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/019.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/019.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/019.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/020.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/020.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/020.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/020.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/021.html b/tests/wpt/tests/html/editing/dnd/platform/interrupt/021.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/021.html rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/021.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/fail.txt b/tests/wpt/tests/html/editing/dnd/platform/interrupt/fail.txt similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/fail.txt rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/fail.txt diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/file1.txt b/tests/wpt/tests/html/editing/dnd/platform/interrupt/file1.txt similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/file1.txt rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/file1.txt diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/file2.txt b/tests/wpt/tests/html/editing/dnd/platform/interrupt/file2.txt similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/file2.txt rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/file2.txt diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/pass.txt b/tests/wpt/tests/html/editing/dnd/platform/interrupt/pass.txt similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/interrupt/pass.txt rename to tests/wpt/tests/html/editing/dnd/platform/interrupt/pass.txt diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/keyboardshortcuts.html b/tests/wpt/tests/html/editing/dnd/platform/keyboardshortcuts.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/keyboardshortcuts.html rename to tests/wpt/tests/html/editing/dnd/platform/keyboardshortcuts.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/all.html b/tests/wpt/tests/html/editing/dnd/platform/modifiers/all.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/all.html rename to tests/wpt/tests/html/editing/dnd/platform/modifiers/all.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/copy.html b/tests/wpt/tests/html/editing/dnd/platform/modifiers/copy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/copy.html rename to tests/wpt/tests/html/editing/dnd/platform/modifiers/copy.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/copylink.html b/tests/wpt/tests/html/editing/dnd/platform/modifiers/copylink.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/copylink.html rename to tests/wpt/tests/html/editing/dnd/platform/modifiers/copylink.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/copymove.html b/tests/wpt/tests/html/editing/dnd/platform/modifiers/copymove.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/copymove.html rename to tests/wpt/tests/html/editing/dnd/platform/modifiers/copymove.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/link.html b/tests/wpt/tests/html/editing/dnd/platform/modifiers/link.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/link.html rename to tests/wpt/tests/html/editing/dnd/platform/modifiers/link.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/linkmove.html b/tests/wpt/tests/html/editing/dnd/platform/modifiers/linkmove.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/linkmove.html rename to tests/wpt/tests/html/editing/dnd/platform/modifiers/linkmove.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/move.html b/tests/wpt/tests/html/editing/dnd/platform/modifiers/move.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/move.html rename to tests/wpt/tests/html/editing/dnd/platform/modifiers/move.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/onlydropzone.html b/tests/wpt/tests/html/editing/dnd/platform/modifiers/onlydropzone.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/onlydropzone.html rename to tests/wpt/tests/html/editing/dnd/platform/modifiers/onlydropzone.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/onlydropzoneevents.html b/tests/wpt/tests/html/editing/dnd/platform/modifiers/onlydropzoneevents.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/onlydropzoneevents.html rename to tests/wpt/tests/html/editing/dnd/platform/modifiers/onlydropzoneevents.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/releasemodifiersdrag-manual.html b/tests/wpt/tests/html/editing/dnd/platform/modifiers/releasemodifiersdrag-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/releasemodifiersdrag-manual.html rename to tests/wpt/tests/html/editing/dnd/platform/modifiers/releasemodifiersdrag-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/releasemodifiersdrop.html b/tests/wpt/tests/html/editing/dnd/platform/modifiers/releasemodifiersdrop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/releasemodifiersdrop.html rename to tests/wpt/tests/html/editing/dnd/platform/modifiers/releasemodifiersdrop.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/scriptmodified.html b/tests/wpt/tests/html/editing/dnd/platform/modifiers/scriptmodified.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/scriptmodified.html rename to tests/wpt/tests/html/editing/dnd/platform/modifiers/scriptmodified.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/moving-window.html b/tests/wpt/tests/html/editing/dnd/platform/moving-window.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/moving-window.html rename to tests/wpt/tests/html/editing/dnd/platform/moving-window.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/overlappingwindows.html b/tests/wpt/tests/html/editing/dnd/platform/overlappingwindows.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/overlappingwindows.html rename to tests/wpt/tests/html/editing/dnd/platform/overlappingwindows.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/placeholderposition1.html b/tests/wpt/tests/html/editing/dnd/platform/placeholderposition1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/placeholderposition1.html rename to tests/wpt/tests/html/editing/dnd/platform/placeholderposition1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/placeholderposition2.html b/tests/wpt/tests/html/editing/dnd/platform/placeholderposition2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/placeholderposition2.html rename to tests/wpt/tests/html/editing/dnd/platform/placeholderposition2.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/plugindrop.html b/tests/wpt/tests/html/editing/dnd/platform/plugindrop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/plugindrop.html rename to tests/wpt/tests/html/editing/dnd/platform/plugindrop.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-between-ui.html b/tests/wpt/tests/html/editing/dnd/platform/selection-between-ui.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-between-ui.html rename to tests/wpt/tests/html/editing/dnd/platform/selection-between-ui.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-from-os.html b/tests/wpt/tests/html/editing/dnd/platform/selection-from-os.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-from-os.html rename to tests/wpt/tests/html/editing/dnd/platform/selection-from-os.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-from-ui.html b/tests/wpt/tests/html/editing/dnd/platform/selection-from-ui.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-from-ui.html rename to tests/wpt/tests/html/editing/dnd/platform/selection-from-ui.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-to-os.html b/tests/wpt/tests/html/editing/dnd/platform/selection-to-os.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-to-os.html rename to tests/wpt/tests/html/editing/dnd/platform/selection-to-os.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-to-ui-via.html b/tests/wpt/tests/html/editing/dnd/platform/selection-to-ui-via.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-to-ui-via.html rename to tests/wpt/tests/html/editing/dnd/platform/selection-to-ui-via.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-to-ui.html b/tests/wpt/tests/html/editing/dnd/platform/selection-to-ui.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-to-ui.html rename to tests/wpt/tests/html/editing/dnd/platform/selection-to-ui.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-ui-to-self.html b/tests/wpt/tests/html/editing/dnd/platform/selection-ui-to-self.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-ui-to-self.html rename to tests/wpt/tests/html/editing/dnd/platform/selection-ui-to-self.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-unicode-to-os.html b/tests/wpt/tests/html/editing/dnd/platform/selection-unicode-to-os.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/selection-unicode-to-os.html rename to tests/wpt/tests/html/editing/dnd/platform/selection-unicode-to-os.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/taskbardrop.html b/tests/wpt/tests/html/editing/dnd/platform/taskbardrop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/taskbardrop.html rename to tests/wpt/tests/html/editing/dnd/platform/taskbardrop.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/taskbarminimise.html b/tests/wpt/tests/html/editing/dnd/platform/taskbarminimise.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/taskbarminimise.html rename to tests/wpt/tests/html/editing/dnd/platform/taskbarminimise.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/text-os-to-os.html b/tests/wpt/tests/html/editing/dnd/platform/text-os-to-os.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/text-os-to-os.html rename to tests/wpt/tests/html/editing/dnd/platform/text-os-to-os.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/text-to-os.html b/tests/wpt/tests/html/editing/dnd/platform/text-to-os.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/text-to-os.html rename to tests/wpt/tests/html/editing/dnd/platform/text-to-os.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/001.xhtml b/tests/wpt/tests/html/editing/dnd/reload/001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/001.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/001.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/002.xhtml b/tests/wpt/tests/html/editing/dnd/reload/002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/002.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/002.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/003.xhtml b/tests/wpt/tests/html/editing/dnd/reload/003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/003.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/003.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/004.xhtml b/tests/wpt/tests/html/editing/dnd/reload/004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/004.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/004.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/005.xhtml b/tests/wpt/tests/html/editing/dnd/reload/005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/005.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/005.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/006.xhtml b/tests/wpt/tests/html/editing/dnd/reload/006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/006.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/006.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/007.xhtml b/tests/wpt/tests/html/editing/dnd/reload/007.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/007.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/007.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/008.xhtml b/tests/wpt/tests/html/editing/dnd/reload/008.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/008.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/008.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/009-1.xhtml b/tests/wpt/tests/html/editing/dnd/reload/009-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/009-1.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/009-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/009.xhtml b/tests/wpt/tests/html/editing/dnd/reload/009.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/009.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/009.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/010-1.xhtml b/tests/wpt/tests/html/editing/dnd/reload/010-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/010-1.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/010-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/010.xhtml b/tests/wpt/tests/html/editing/dnd/reload/010.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/010.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/010.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/011-1.xhtml b/tests/wpt/tests/html/editing/dnd/reload/011-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/011-1.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/011-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/011.xhtml b/tests/wpt/tests/html/editing/dnd/reload/011.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/011.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/011.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/012-1.xhtml b/tests/wpt/tests/html/editing/dnd/reload/012-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/012-1.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/012-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/012-2.xhtml b/tests/wpt/tests/html/editing/dnd/reload/012-2.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/012-2.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/012-2.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/reload/012.xhtml b/tests/wpt/tests/html/editing/dnd/reload/012.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/reload/012.xhtml rename to tests/wpt/tests/html/editing/dnd/reload/012.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/001.xhtml b/tests/wpt/tests/html/editing/dnd/remove/001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/001.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/001.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/002.xhtml b/tests/wpt/tests/html/editing/dnd/remove/002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/002.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/002.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/003.xhtml b/tests/wpt/tests/html/editing/dnd/remove/003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/003.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/003.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/004.xhtml b/tests/wpt/tests/html/editing/dnd/remove/004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/004.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/004.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/005.xhtml b/tests/wpt/tests/html/editing/dnd/remove/005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/005.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/005.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/006.xhtml b/tests/wpt/tests/html/editing/dnd/remove/006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/006.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/006.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/007.xhtml b/tests/wpt/tests/html/editing/dnd/remove/007.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/007.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/007.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/008.xhtml b/tests/wpt/tests/html/editing/dnd/remove/008.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/008.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/008.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/009.xhtml b/tests/wpt/tests/html/editing/dnd/remove/009.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/009.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/009.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/010.xhtml b/tests/wpt/tests/html/editing/dnd/remove/010.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/010.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/010.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/011.xhtml b/tests/wpt/tests/html/editing/dnd/remove/011.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/011.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/011.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/012.xhtml b/tests/wpt/tests/html/editing/dnd/remove/012.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/012.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/012.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/013.xhtml b/tests/wpt/tests/html/editing/dnd/remove/013.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/013.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/013.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/014.xhtml b/tests/wpt/tests/html/editing/dnd/remove/014.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/014.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/014.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/015.xhtml b/tests/wpt/tests/html/editing/dnd/remove/015.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/015.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/015.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/016.xhtml b/tests/wpt/tests/html/editing/dnd/remove/016.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/016.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/016.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/017.xhtml b/tests/wpt/tests/html/editing/dnd/remove/017.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/017.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/017.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/018.xhtml b/tests/wpt/tests/html/editing/dnd/remove/018.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/018.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/018.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/019.xhtml b/tests/wpt/tests/html/editing/dnd/remove/019.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/019.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/019.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/020.xhtml b/tests/wpt/tests/html/editing/dnd/remove/020.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/020.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/020.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/021.xhtml b/tests/wpt/tests/html/editing/dnd/remove/021.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/021.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/021.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/022-1.html b/tests/wpt/tests/html/editing/dnd/remove/022-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/022-1.html rename to tests/wpt/tests/html/editing/dnd/remove/022-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/022.html b/tests/wpt/tests/html/editing/dnd/remove/022.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/022.html rename to tests/wpt/tests/html/editing/dnd/remove/022.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/helper-drag-me-input.xhtml b/tests/wpt/tests/html/editing/dnd/remove/helper-drag-me-input.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/helper-drag-me-input.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/helper-drag-me-input.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/helper-drag-me-link.xhtml b/tests/wpt/tests/html/editing/dnd/remove/helper-drag-me-link.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/helper-drag-me-link.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/helper-drag-me-link.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/remove/helper-drag-me-p.xhtml b/tests/wpt/tests/html/editing/dnd/remove/helper-drag-me-p.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/remove/helper-drag-me-p.xhtml rename to tests/wpt/tests/html/editing/dnd/remove/helper-drag-me-p.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/resources/100x100-navy.png b/tests/wpt/tests/html/editing/dnd/resources/100x100-navy.png similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/resources/100x100-navy.png rename to tests/wpt/tests/html/editing/dnd/resources/100x100-navy.png diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/resources/1x1-transparent.gif b/tests/wpt/tests/html/editing/dnd/resources/1x1-transparent.gif similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/resources/1x1-transparent.gif rename to tests/wpt/tests/html/editing/dnd/resources/1x1-transparent.gif diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/resources/32mb.py b/tests/wpt/tests/html/editing/dnd/resources/32mb.py similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/resources/32mb.py rename to tests/wpt/tests/html/editing/dnd/resources/32mb.py diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/resources/boxnavy.swf b/tests/wpt/tests/html/editing/dnd/resources/boxnavy.swf similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/resources/boxnavy.swf rename to tests/wpt/tests/html/editing/dnd/resources/boxnavy.swf diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/resources/circle.png b/tests/wpt/tests/html/editing/dnd/resources/circle.png similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/resources/circle.png rename to tests/wpt/tests/html/editing/dnd/resources/circle.png diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/resources/crossorigin.sub.js b/tests/wpt/tests/html/editing/dnd/resources/crossorigin.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/resources/crossorigin.sub.js rename to tests/wpt/tests/html/editing/dnd/resources/crossorigin.sub.js diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/resources/dragdrop_support.js b/tests/wpt/tests/html/editing/dnd/resources/dragdrop_support.js similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/resources/dragdrop_support.js rename to tests/wpt/tests/html/editing/dnd/resources/dragdrop_support.js diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/resources/fail.png b/tests/wpt/tests/html/editing/dnd/resources/fail.png similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/resources/fail.png rename to tests/wpt/tests/html/editing/dnd/resources/fail.png diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/resources/filler.html b/tests/wpt/tests/html/editing/dnd/resources/filler.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/resources/filler.html rename to tests/wpt/tests/html/editing/dnd/resources/filler.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/resources/pass.png b/tests/wpt/tests/html/editing/dnd/resources/pass.png similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/resources/pass.png rename to tests/wpt/tests/html/editing/dnd/resources/pass.png diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/resources/test-helper.js b/tests/wpt/tests/html/editing/dnd/resources/test-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/resources/test-helper.js rename to tests/wpt/tests/html/editing/dnd/resources/test-helper.js diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/001.xhtml b/tests/wpt/tests/html/editing/dnd/roundtrip/001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/001.xhtml rename to tests/wpt/tests/html/editing/dnd/roundtrip/001.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/002.xhtml b/tests/wpt/tests/html/editing/dnd/roundtrip/002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/002.xhtml rename to tests/wpt/tests/html/editing/dnd/roundtrip/002.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/003.xhtml b/tests/wpt/tests/html/editing/dnd/roundtrip/003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/003.xhtml rename to tests/wpt/tests/html/editing/dnd/roundtrip/003.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/004.xhtml b/tests/wpt/tests/html/editing/dnd/roundtrip/004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/004.xhtml rename to tests/wpt/tests/html/editing/dnd/roundtrip/004.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/005.xhtml b/tests/wpt/tests/html/editing/dnd/roundtrip/005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/005.xhtml rename to tests/wpt/tests/html/editing/dnd/roundtrip/005.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/006.xhtml b/tests/wpt/tests/html/editing/dnd/roundtrip/006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/006.xhtml rename to tests/wpt/tests/html/editing/dnd/roundtrip/006.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/007.xhtml b/tests/wpt/tests/html/editing/dnd/roundtrip/007.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/007.xhtml rename to tests/wpt/tests/html/editing/dnd/roundtrip/007.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/008.xhtml b/tests/wpt/tests/html/editing/dnd/roundtrip/008.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/roundtrip/008.xhtml rename to tests/wpt/tests/html/editing/dnd/roundtrip/008.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/001.xhtml b/tests/wpt/tests/html/editing/dnd/selection/001.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/001.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/001.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/002.xhtml b/tests/wpt/tests/html/editing/dnd/selection/002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/002.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/002.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/003.xhtml b/tests/wpt/tests/html/editing/dnd/selection/003.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/003.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/003.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/004.xhtml b/tests/wpt/tests/html/editing/dnd/selection/004.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/004.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/004.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/005.xhtml b/tests/wpt/tests/html/editing/dnd/selection/005.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/005.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/005.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/006.xhtml b/tests/wpt/tests/html/editing/dnd/selection/006.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/006.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/006.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/007.xhtml b/tests/wpt/tests/html/editing/dnd/selection/007.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/007.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/007.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/008.xhtml b/tests/wpt/tests/html/editing/dnd/selection/008.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/008.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/008.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/009.xhtml b/tests/wpt/tests/html/editing/dnd/selection/009.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/009.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/009.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/010.xhtml b/tests/wpt/tests/html/editing/dnd/selection/010.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/010.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/010.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/011.xhtml b/tests/wpt/tests/html/editing/dnd/selection/011.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/011.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/011.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/012.xhtml b/tests/wpt/tests/html/editing/dnd/selection/012.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/012.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/012.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/013.xhtml b/tests/wpt/tests/html/editing/dnd/selection/013.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/013.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/013.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/014.xhtml b/tests/wpt/tests/html/editing/dnd/selection/014.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/014.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/014.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/015.xhtml b/tests/wpt/tests/html/editing/dnd/selection/015.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/015.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/015.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/016.xhtml b/tests/wpt/tests/html/editing/dnd/selection/016.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/016.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/016.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/017.xhtml b/tests/wpt/tests/html/editing/dnd/selection/017.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/017.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/017.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/018.xhtml b/tests/wpt/tests/html/editing/dnd/selection/018.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/018.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/018.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/019.xhtml b/tests/wpt/tests/html/editing/dnd/selection/019.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/019.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/019.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/020.xhtml b/tests/wpt/tests/html/editing/dnd/selection/020.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/020.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/020.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/021.xhtml b/tests/wpt/tests/html/editing/dnd/selection/021.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/021.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/021.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/022.xhtml b/tests/wpt/tests/html/editing/dnd/selection/022.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/022.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/022.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/023.xhtml b/tests/wpt/tests/html/editing/dnd/selection/023.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/023.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/023.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/024.xhtml b/tests/wpt/tests/html/editing/dnd/selection/024.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/024.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/024.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/025.xhtml b/tests/wpt/tests/html/editing/dnd/selection/025.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/025.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/025.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/026.xhtml b/tests/wpt/tests/html/editing/dnd/selection/026.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/026.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/026.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/027.xhtml b/tests/wpt/tests/html/editing/dnd/selection/027.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/027.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/027.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/028.xhtml b/tests/wpt/tests/html/editing/dnd/selection/028.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/028.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/028.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/029.xhtml b/tests/wpt/tests/html/editing/dnd/selection/029.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/029.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/029.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/030.xhtml b/tests/wpt/tests/html/editing/dnd/selection/030.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/030.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/030.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/031.xhtml b/tests/wpt/tests/html/editing/dnd/selection/031.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/031.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/031.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/032.xhtml b/tests/wpt/tests/html/editing/dnd/selection/032.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/032.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/032.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/033.xhtml b/tests/wpt/tests/html/editing/dnd/selection/033.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/033.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/033.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/034.xhtml b/tests/wpt/tests/html/editing/dnd/selection/034.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/034.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/034.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/035.xhtml b/tests/wpt/tests/html/editing/dnd/selection/035.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/035.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/035.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/036.xhtml b/tests/wpt/tests/html/editing/dnd/selection/036.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/036.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/036.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/037.xhtml b/tests/wpt/tests/html/editing/dnd/selection/037.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/037.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/037.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/038.xhtml b/tests/wpt/tests/html/editing/dnd/selection/038.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/038.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/038.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/039.xhtml b/tests/wpt/tests/html/editing/dnd/selection/039.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/039.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/039.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/040.xhtml b/tests/wpt/tests/html/editing/dnd/selection/040.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/040.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/040.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/041.xhtml b/tests/wpt/tests/html/editing/dnd/selection/041.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/041.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/041.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/042.xhtml b/tests/wpt/tests/html/editing/dnd/selection/042.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/042.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/042.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/043.xhtml b/tests/wpt/tests/html/editing/dnd/selection/043.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/043.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/043.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/044.xhtml b/tests/wpt/tests/html/editing/dnd/selection/044.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/044.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/044.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/045.xhtml b/tests/wpt/tests/html/editing/dnd/selection/045.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/045.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/045.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/046.xhtml b/tests/wpt/tests/html/editing/dnd/selection/046.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/046.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/046.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/047.xhtml b/tests/wpt/tests/html/editing/dnd/selection/047.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/047.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/047.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/048.xhtml b/tests/wpt/tests/html/editing/dnd/selection/048.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/048.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/048.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/049.xhtml b/tests/wpt/tests/html/editing/dnd/selection/049.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/049.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/049.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/050.xhtml b/tests/wpt/tests/html/editing/dnd/selection/050.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/050.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/050.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/051.xhtml b/tests/wpt/tests/html/editing/dnd/selection/051.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/051.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/051.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/052.xhtml b/tests/wpt/tests/html/editing/dnd/selection/052.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/052.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/052.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/053.xhtml b/tests/wpt/tests/html/editing/dnd/selection/053.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/053.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/053.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/054.xhtml b/tests/wpt/tests/html/editing/dnd/selection/054.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/054.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/054.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/055.xhtml b/tests/wpt/tests/html/editing/dnd/selection/055.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/055.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/055.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/056.xhtml b/tests/wpt/tests/html/editing/dnd/selection/056.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/056.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/056.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/057.xhtml b/tests/wpt/tests/html/editing/dnd/selection/057.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/057.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/057.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/058.xhtml b/tests/wpt/tests/html/editing/dnd/selection/058.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/058.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/058.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/059.xhtml b/tests/wpt/tests/html/editing/dnd/selection/059.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/059.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/059.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/060.xhtml b/tests/wpt/tests/html/editing/dnd/selection/060.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/060.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/060.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/061.xhtml b/tests/wpt/tests/html/editing/dnd/selection/061.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/061.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/061.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/062.xhtml b/tests/wpt/tests/html/editing/dnd/selection/062.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/062.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/062.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/063.xhtml b/tests/wpt/tests/html/editing/dnd/selection/063.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/063.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/063.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/064-1.xhtml b/tests/wpt/tests/html/editing/dnd/selection/064-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/064-1.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/064-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/064.xhtml b/tests/wpt/tests/html/editing/dnd/selection/064.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/064.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/064.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/065.xhtml b/tests/wpt/tests/html/editing/dnd/selection/065.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/065.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/065.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/066.xhtml b/tests/wpt/tests/html/editing/dnd/selection/066.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/066.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/066.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/067-1.xhtml b/tests/wpt/tests/html/editing/dnd/selection/067-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/067-1.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/067-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/067-2.xhtml b/tests/wpt/tests/html/editing/dnd/selection/067-2.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/067-2.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/067-2.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/067.xhtml b/tests/wpt/tests/html/editing/dnd/selection/067.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/067.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/067.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/068-1.xhtml b/tests/wpt/tests/html/editing/dnd/selection/068-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/068-1.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/068-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/068-2.xhtml b/tests/wpt/tests/html/editing/dnd/selection/068-2.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/068-2.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/068-2.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/068.xhtml b/tests/wpt/tests/html/editing/dnd/selection/068.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/068.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/068.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/069.xhtml b/tests/wpt/tests/html/editing/dnd/selection/069.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/069.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/069.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/070.xhtml b/tests/wpt/tests/html/editing/dnd/selection/070.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/070.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/070.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/071.xhtml b/tests/wpt/tests/html/editing/dnd/selection/071.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/071.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/071.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/072.xhtml b/tests/wpt/tests/html/editing/dnd/selection/072.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/072.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/072.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/073.xhtml b/tests/wpt/tests/html/editing/dnd/selection/073.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/073.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/073.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/074.xhtml b/tests/wpt/tests/html/editing/dnd/selection/074.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/074.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/074.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/075.xhtml b/tests/wpt/tests/html/editing/dnd/selection/075.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/075.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/075.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/076.xhtml b/tests/wpt/tests/html/editing/dnd/selection/076.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/076.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/076.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/077.xhtml b/tests/wpt/tests/html/editing/dnd/selection/077.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/077.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/077.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/078.xhtml b/tests/wpt/tests/html/editing/dnd/selection/078.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/078.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/078.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/079.xhtml b/tests/wpt/tests/html/editing/dnd/selection/079.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/079.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/079.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/080.xhtml b/tests/wpt/tests/html/editing/dnd/selection/080.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/080.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/080.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/081.xhtml b/tests/wpt/tests/html/editing/dnd/selection/081.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/081.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/081.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/082.xhtml b/tests/wpt/tests/html/editing/dnd/selection/082.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/082.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/082.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/083.xhtml b/tests/wpt/tests/html/editing/dnd/selection/083.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/083.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/083.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/084.xhtml b/tests/wpt/tests/html/editing/dnd/selection/084.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/084.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/084.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/085.xhtml b/tests/wpt/tests/html/editing/dnd/selection/085.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/085.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/085.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/086.xhtml b/tests/wpt/tests/html/editing/dnd/selection/086.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/086.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/086.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/087.xhtml b/tests/wpt/tests/html/editing/dnd/selection/087.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/087.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/087.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/088.xhtml b/tests/wpt/tests/html/editing/dnd/selection/088.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/088.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/088.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/089.xhtml b/tests/wpt/tests/html/editing/dnd/selection/089.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/089.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/089.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/090.xhtml b/tests/wpt/tests/html/editing/dnd/selection/090.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/090.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/090.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/091-1.xhtml b/tests/wpt/tests/html/editing/dnd/selection/091-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/091-1.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/091-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/091-2.xhtml b/tests/wpt/tests/html/editing/dnd/selection/091-2.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/091-2.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/091-2.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/091.xhtml b/tests/wpt/tests/html/editing/dnd/selection/091.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/091.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/091.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/092.xhtml b/tests/wpt/tests/html/editing/dnd/selection/092.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/092.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/092.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/093.xhtml b/tests/wpt/tests/html/editing/dnd/selection/093.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/093.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/093.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/094.xhtml b/tests/wpt/tests/html/editing/dnd/selection/094.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/094.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/094.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/095.xhtml b/tests/wpt/tests/html/editing/dnd/selection/095.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/095.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/095.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/096.xhtml b/tests/wpt/tests/html/editing/dnd/selection/096.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/096.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/096.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/097.xhtml b/tests/wpt/tests/html/editing/dnd/selection/097.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/097.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/097.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/098.xhtml b/tests/wpt/tests/html/editing/dnd/selection/098.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/098.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/098.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/099.xhtml b/tests/wpt/tests/html/editing/dnd/selection/099.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/099.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/099.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/100.xhtml b/tests/wpt/tests/html/editing/dnd/selection/100.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/100.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/100.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/101.xhtml b/tests/wpt/tests/html/editing/dnd/selection/101.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/101.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/101.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/102.xhtml b/tests/wpt/tests/html/editing/dnd/selection/102.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/102.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/102.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/103.xhtml b/tests/wpt/tests/html/editing/dnd/selection/103.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/103.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/103.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/104.xhtml b/tests/wpt/tests/html/editing/dnd/selection/104.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/104.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/104.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/105.xhtml b/tests/wpt/tests/html/editing/dnd/selection/105.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/105.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/105.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/106.xhtml b/tests/wpt/tests/html/editing/dnd/selection/106.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/106.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/106.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/107-1.html b/tests/wpt/tests/html/editing/dnd/selection/107-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/107-1.html rename to tests/wpt/tests/html/editing/dnd/selection/107-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/107.html b/tests/wpt/tests/html/editing/dnd/selection/107.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/107.html rename to tests/wpt/tests/html/editing/dnd/selection/107.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/108-1.html b/tests/wpt/tests/html/editing/dnd/selection/108-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/108-1.html rename to tests/wpt/tests/html/editing/dnd/selection/108-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/108.html b/tests/wpt/tests/html/editing/dnd/selection/108.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/108.html rename to tests/wpt/tests/html/editing/dnd/selection/108.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/109.xhtml b/tests/wpt/tests/html/editing/dnd/selection/109.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/109.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/109.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/110.xhtml b/tests/wpt/tests/html/editing/dnd/selection/110.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/110.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/110.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/111.xhtml b/tests/wpt/tests/html/editing/dnd/selection/111.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/111.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/111.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/112.xhtml b/tests/wpt/tests/html/editing/dnd/selection/112.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/112.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/112.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/113.xhtml b/tests/wpt/tests/html/editing/dnd/selection/113.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/113.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/113.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/114.xhtml b/tests/wpt/tests/html/editing/dnd/selection/114.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/114.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/114.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/115.xhtml b/tests/wpt/tests/html/editing/dnd/selection/115.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/115.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/115.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/116.xhtml b/tests/wpt/tests/html/editing/dnd/selection/116.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/116.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/116.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/117.xhtml b/tests/wpt/tests/html/editing/dnd/selection/117.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/117.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/117.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/118.xhtml b/tests/wpt/tests/html/editing/dnd/selection/118.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/118.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/118.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/119.xhtml b/tests/wpt/tests/html/editing/dnd/selection/119.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/119.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/119.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/120.xhtml b/tests/wpt/tests/html/editing/dnd/selection/120.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/120.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/120.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/121.xhtml b/tests/wpt/tests/html/editing/dnd/selection/121.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/121.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/121.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/122.xhtml b/tests/wpt/tests/html/editing/dnd/selection/122.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/122.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/122.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/123.xhtml b/tests/wpt/tests/html/editing/dnd/selection/123.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/123.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/123.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/124.xhtml b/tests/wpt/tests/html/editing/dnd/selection/124.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/124.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/124.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/125.xhtml b/tests/wpt/tests/html/editing/dnd/selection/125.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/125.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/125.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/126.xhtml b/tests/wpt/tests/html/editing/dnd/selection/126.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/126.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/126.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/127.xhtml b/tests/wpt/tests/html/editing/dnd/selection/127.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/127.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/127.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/128.xhtml b/tests/wpt/tests/html/editing/dnd/selection/128.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/128.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/128.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/129.xhtml b/tests/wpt/tests/html/editing/dnd/selection/129.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/129.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/129.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/130.xhtml b/tests/wpt/tests/html/editing/dnd/selection/130.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/130.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/130.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/131.xhtml b/tests/wpt/tests/html/editing/dnd/selection/131.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/131.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/131.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/132.xhtml b/tests/wpt/tests/html/editing/dnd/selection/132.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/132.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/132.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/133.xhtml b/tests/wpt/tests/html/editing/dnd/selection/133.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/133.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/133.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/134.xhtml b/tests/wpt/tests/html/editing/dnd/selection/134.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/134.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/134.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/135.xhtml b/tests/wpt/tests/html/editing/dnd/selection/135.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/135.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/135.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/136.xhtml b/tests/wpt/tests/html/editing/dnd/selection/136.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/136.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/136.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/137.xhtml b/tests/wpt/tests/html/editing/dnd/selection/137.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/137.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/137.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/138.xhtml b/tests/wpt/tests/html/editing/dnd/selection/138.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/138.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/138.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/139.xhtml b/tests/wpt/tests/html/editing/dnd/selection/139.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/139.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/139.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/140.xhtml b/tests/wpt/tests/html/editing/dnd/selection/140.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/140.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/140.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/141.xhtml b/tests/wpt/tests/html/editing/dnd/selection/141.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/141.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/141.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/142.xhtml b/tests/wpt/tests/html/editing/dnd/selection/142.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/142.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/142.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/143.xhtml b/tests/wpt/tests/html/editing/dnd/selection/143.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/143.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/143.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/144.xhtml b/tests/wpt/tests/html/editing/dnd/selection/144.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/144.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/144.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/145.xhtml b/tests/wpt/tests/html/editing/dnd/selection/145.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/145.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/145.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/146.xhtml b/tests/wpt/tests/html/editing/dnd/selection/146.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/146.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/146.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/147.html b/tests/wpt/tests/html/editing/dnd/selection/147.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/147.html rename to tests/wpt/tests/html/editing/dnd/selection/147.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/148.html b/tests/wpt/tests/html/editing/dnd/selection/148.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/148.html rename to tests/wpt/tests/html/editing/dnd/selection/148.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/149.html b/tests/wpt/tests/html/editing/dnd/selection/149.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/149.html rename to tests/wpt/tests/html/editing/dnd/selection/149.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/150.html b/tests/wpt/tests/html/editing/dnd/selection/150.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/150.html rename to tests/wpt/tests/html/editing/dnd/selection/150.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/151.xhtml b/tests/wpt/tests/html/editing/dnd/selection/151.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/151.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/151.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/152.xhtml b/tests/wpt/tests/html/editing/dnd/selection/152.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/152.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/152.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/153.xhtml b/tests/wpt/tests/html/editing/dnd/selection/153.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/153.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/153.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/154.xhtml b/tests/wpt/tests/html/editing/dnd/selection/154.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/154.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/154.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/155.xhtml b/tests/wpt/tests/html/editing/dnd/selection/155.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/155.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/155.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/156.xhtml b/tests/wpt/tests/html/editing/dnd/selection/156.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/156.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/156.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/157.xhtml b/tests/wpt/tests/html/editing/dnd/selection/157.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/157.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/157.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/158.xhtml b/tests/wpt/tests/html/editing/dnd/selection/158.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/158.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/158.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/159.xhtml b/tests/wpt/tests/html/editing/dnd/selection/159.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/159.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/159.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/160.xhtml b/tests/wpt/tests/html/editing/dnd/selection/160.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/160.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/160.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/161.xhtml b/tests/wpt/tests/html/editing/dnd/selection/161.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/161.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/161.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/162.xhtml b/tests/wpt/tests/html/editing/dnd/selection/162.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/162.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/162.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/163.xhtml b/tests/wpt/tests/html/editing/dnd/selection/163.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/163.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/163.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/164.xhtml b/tests/wpt/tests/html/editing/dnd/selection/164.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/164.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/164.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/165.xhtml b/tests/wpt/tests/html/editing/dnd/selection/165.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/165.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/165.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/166.xhtml b/tests/wpt/tests/html/editing/dnd/selection/166.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/166.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/166.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/167.xhtml b/tests/wpt/tests/html/editing/dnd/selection/167.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/167.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/167.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/168.xhtml b/tests/wpt/tests/html/editing/dnd/selection/168.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/168.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/168.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/169.xhtml b/tests/wpt/tests/html/editing/dnd/selection/169.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/169.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/169.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/170.xhtml b/tests/wpt/tests/html/editing/dnd/selection/170.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/170.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/170.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/171.xhtml b/tests/wpt/tests/html/editing/dnd/selection/171.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/171.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/171.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/172.html b/tests/wpt/tests/html/editing/dnd/selection/172.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/172.html rename to tests/wpt/tests/html/editing/dnd/selection/172.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/173.html b/tests/wpt/tests/html/editing/dnd/selection/173.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/173.html rename to tests/wpt/tests/html/editing/dnd/selection/173.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drag-me-input-to-other-input.xhtml b/tests/wpt/tests/html/editing/dnd/selection/helper-drag-me-input-to-other-input.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drag-me-input-to-other-input.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/helper-drag-me-input-to-other-input.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drag-me-input-to-other-textarea.xhtml b/tests/wpt/tests/html/editing/dnd/selection/helper-drag-me-input-to-other-textarea.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drag-me-input-to-other-textarea.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/helper-drag-me-input-to-other-textarea.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drag-me-input.xhtml b/tests/wpt/tests/html/editing/dnd/selection/helper-drag-me-input.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drag-me-input.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/helper-drag-me-input.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drag-me-textarea-to-other-blue-box.xhtml b/tests/wpt/tests/html/editing/dnd/selection/helper-drag-me-textarea-to-other-blue-box.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drag-me-textarea-to-other-blue-box.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/helper-drag-me-textarea-to-other-blue-box.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drag-me-textarea-to-other-input.xhtml b/tests/wpt/tests/html/editing/dnd/selection/helper-drag-me-textarea-to-other-input.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drag-me-textarea-to-other-input.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/helper-drag-me-textarea-to-other-input.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drag-me-textarea-to-other-textarea.xhtml b/tests/wpt/tests/html/editing/dnd/selection/helper-drag-me-textarea-to-other-textarea.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drag-me-textarea-to-other-textarea.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/helper-drag-me-textarea-to-other-textarea.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drop-here-blue-box-contenteditable.xhtml b/tests/wpt/tests/html/editing/dnd/selection/helper-drop-here-blue-box-contenteditable.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drop-here-blue-box-contenteditable.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/helper-drop-here-blue-box-contenteditable.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drop-here-blue-box.xhtml b/tests/wpt/tests/html/editing/dnd/selection/helper-drop-here-blue-box.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drop-here-blue-box.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/helper-drop-here-blue-box.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drop-here-input.xhtml b/tests/wpt/tests/html/editing/dnd/selection/helper-drop-here-input.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drop-here-input.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/helper-drop-here-input.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drop-here-textarea.xhtml b/tests/wpt/tests/html/editing/dnd/selection/helper-drop-here-textarea.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-drop-here-textarea.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/helper-drop-here-textarea.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-scroll-then-drop-input.xhtml b/tests/wpt/tests/html/editing/dnd/selection/helper-scroll-then-drop-input.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/selection/helper-scroll-then-drop-input.xhtml rename to tests/wpt/tests/html/editing/dnd/selection/helper-scroll-then-drop-input.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/001.svg b/tests/wpt/tests/html/editing/dnd/svg/001.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/001.svg rename to tests/wpt/tests/html/editing/dnd/svg/001.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/002.svg b/tests/wpt/tests/html/editing/dnd/svg/002.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/002.svg rename to tests/wpt/tests/html/editing/dnd/svg/002.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/003.svg b/tests/wpt/tests/html/editing/dnd/svg/003.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/003.svg rename to tests/wpt/tests/html/editing/dnd/svg/003.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/004.svg b/tests/wpt/tests/html/editing/dnd/svg/004.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/004.svg rename to tests/wpt/tests/html/editing/dnd/svg/004.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/005.svg b/tests/wpt/tests/html/editing/dnd/svg/005.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/005.svg rename to tests/wpt/tests/html/editing/dnd/svg/005.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/006.svg b/tests/wpt/tests/html/editing/dnd/svg/006.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/006.svg rename to tests/wpt/tests/html/editing/dnd/svg/006.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/007.svg b/tests/wpt/tests/html/editing/dnd/svg/007.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/007.svg rename to tests/wpt/tests/html/editing/dnd/svg/007.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/008.svg b/tests/wpt/tests/html/editing/dnd/svg/008.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/008.svg rename to tests/wpt/tests/html/editing/dnd/svg/008.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/009.svg b/tests/wpt/tests/html/editing/dnd/svg/009.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/009.svg rename to tests/wpt/tests/html/editing/dnd/svg/009.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/010.svg b/tests/wpt/tests/html/editing/dnd/svg/010.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/010.svg rename to tests/wpt/tests/html/editing/dnd/svg/010.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/011.svg b/tests/wpt/tests/html/editing/dnd/svg/011.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/011.svg rename to tests/wpt/tests/html/editing/dnd/svg/011.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/012.svg b/tests/wpt/tests/html/editing/dnd/svg/012.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/012.svg rename to tests/wpt/tests/html/editing/dnd/svg/012.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/013-1.xhtml b/tests/wpt/tests/html/editing/dnd/svg/013-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/013-1.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/013-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/013.svg b/tests/wpt/tests/html/editing/dnd/svg/013.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/013.svg rename to tests/wpt/tests/html/editing/dnd/svg/013.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/014-1.xhtml b/tests/wpt/tests/html/editing/dnd/svg/014-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/014-1.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/014-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/014.svg b/tests/wpt/tests/html/editing/dnd/svg/014.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/014.svg rename to tests/wpt/tests/html/editing/dnd/svg/014.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/015-1.xhtml b/tests/wpt/tests/html/editing/dnd/svg/015-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/015-1.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/015-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/015.svg b/tests/wpt/tests/html/editing/dnd/svg/015.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/015.svg rename to tests/wpt/tests/html/editing/dnd/svg/015.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/016-1.xhtml b/tests/wpt/tests/html/editing/dnd/svg/016-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/016-1.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/016-1.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/016.svg b/tests/wpt/tests/html/editing/dnd/svg/016.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/016.svg rename to tests/wpt/tests/html/editing/dnd/svg/016.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/017.xhtml b/tests/wpt/tests/html/editing/dnd/svg/017.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/017.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/017.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/018.xhtml b/tests/wpt/tests/html/editing/dnd/svg/018.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/018.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/018.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/019.xhtml b/tests/wpt/tests/html/editing/dnd/svg/019.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/019.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/019.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/020.xhtml b/tests/wpt/tests/html/editing/dnd/svg/020.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/020.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/020.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/021.xhtml b/tests/wpt/tests/html/editing/dnd/svg/021.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/021.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/021.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/022.xhtml b/tests/wpt/tests/html/editing/dnd/svg/022.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/022.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/022.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/023.xhtml b/tests/wpt/tests/html/editing/dnd/svg/023.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/023.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/023.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/024.xhtml b/tests/wpt/tests/html/editing/dnd/svg/024.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/024.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/024.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/025.xhtml b/tests/wpt/tests/html/editing/dnd/svg/025.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/025.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/025.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/026.xhtml b/tests/wpt/tests/html/editing/dnd/svg/026.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/026.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/026.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/027.xhtml b/tests/wpt/tests/html/editing/dnd/svg/027.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/027.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/027.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/028.xhtml b/tests/wpt/tests/html/editing/dnd/svg/028.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/028.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/028.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/029.xhtml b/tests/wpt/tests/html/editing/dnd/svg/029.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/029.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/029.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/030-1.svg b/tests/wpt/tests/html/editing/dnd/svg/030-1.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/030-1.svg rename to tests/wpt/tests/html/editing/dnd/svg/030-1.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/030.xhtml b/tests/wpt/tests/html/editing/dnd/svg/030.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/030.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/030.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/031.xhtml b/tests/wpt/tests/html/editing/dnd/svg/031.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/031.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/031.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/032.xhtml b/tests/wpt/tests/html/editing/dnd/svg/032.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/032.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/032.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/033.xhtml b/tests/wpt/tests/html/editing/dnd/svg/033.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/033.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/033.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/034.xhtml b/tests/wpt/tests/html/editing/dnd/svg/034.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/034.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/034.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/035.xhtml b/tests/wpt/tests/html/editing/dnd/svg/035.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/035.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/035.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/036-1.svg b/tests/wpt/tests/html/editing/dnd/svg/036-1.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/036-1.svg rename to tests/wpt/tests/html/editing/dnd/svg/036-1.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/036.xhtml b/tests/wpt/tests/html/editing/dnd/svg/036.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/036.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/036.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/037.xhtml b/tests/wpt/tests/html/editing/dnd/svg/037.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/037.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/037.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/038.xhtml b/tests/wpt/tests/html/editing/dnd/svg/038.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/038.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/038.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/039-1.svg b/tests/wpt/tests/html/editing/dnd/svg/039-1.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/039-1.svg rename to tests/wpt/tests/html/editing/dnd/svg/039-1.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/039.xhtml b/tests/wpt/tests/html/editing/dnd/svg/039.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/039.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/039.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/040.xhtml b/tests/wpt/tests/html/editing/dnd/svg/040.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/040.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/040.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/041.xhtml b/tests/wpt/tests/html/editing/dnd/svg/041.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/041.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/041.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/042.xhtml b/tests/wpt/tests/html/editing/dnd/svg/042.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/042.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/042.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/043.xhtml b/tests/wpt/tests/html/editing/dnd/svg/043.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/043.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/043.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/044.svg b/tests/wpt/tests/html/editing/dnd/svg/044.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/044.svg rename to tests/wpt/tests/html/editing/dnd/svg/044.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/045.svg b/tests/wpt/tests/html/editing/dnd/svg/045.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/045.svg rename to tests/wpt/tests/html/editing/dnd/svg/045.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/046.svg b/tests/wpt/tests/html/editing/dnd/svg/046.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/046.svg rename to tests/wpt/tests/html/editing/dnd/svg/046.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/047.svg b/tests/wpt/tests/html/editing/dnd/svg/047.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/047.svg rename to tests/wpt/tests/html/editing/dnd/svg/047.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/048.svg b/tests/wpt/tests/html/editing/dnd/svg/048.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/048.svg rename to tests/wpt/tests/html/editing/dnd/svg/048.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/049.xhtml b/tests/wpt/tests/html/editing/dnd/svg/049.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/049.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/049.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/050.xhtml b/tests/wpt/tests/html/editing/dnd/svg/050.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/050.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/050.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/051.xhtml b/tests/wpt/tests/html/editing/dnd/svg/051.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/051.xhtml rename to tests/wpt/tests/html/editing/dnd/svg/051.xhtml diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/052.svg b/tests/wpt/tests/html/editing/dnd/svg/052.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/052.svg rename to tests/wpt/tests/html/editing/dnd/svg/052.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/053.svg b/tests/wpt/tests/html/editing/dnd/svg/053.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/053.svg rename to tests/wpt/tests/html/editing/dnd/svg/053.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/054.svg b/tests/wpt/tests/html/editing/dnd/svg/054.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/054.svg rename to tests/wpt/tests/html/editing/dnd/svg/054.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/055.svg b/tests/wpt/tests/html/editing/dnd/svg/055.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/055.svg rename to tests/wpt/tests/html/editing/dnd/svg/055.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/056.svg b/tests/wpt/tests/html/editing/dnd/svg/056.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/056.svg rename to tests/wpt/tests/html/editing/dnd/svg/056.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/057.svg b/tests/wpt/tests/html/editing/dnd/svg/057.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/057.svg rename to tests/wpt/tests/html/editing/dnd/svg/057.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/058.svg b/tests/wpt/tests/html/editing/dnd/svg/058.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/058.svg rename to tests/wpt/tests/html/editing/dnd/svg/058.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/059-1.svg b/tests/wpt/tests/html/editing/dnd/svg/059-1.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/059-1.svg rename to tests/wpt/tests/html/editing/dnd/svg/059-1.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/059.svg b/tests/wpt/tests/html/editing/dnd/svg/059.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/059.svg rename to tests/wpt/tests/html/editing/dnd/svg/059.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/060-1.svg b/tests/wpt/tests/html/editing/dnd/svg/060-1.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/060-1.svg rename to tests/wpt/tests/html/editing/dnd/svg/060-1.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/060.svg b/tests/wpt/tests/html/editing/dnd/svg/060.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/060.svg rename to tests/wpt/tests/html/editing/dnd/svg/060.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/061.svg b/tests/wpt/tests/html/editing/dnd/svg/061.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/061.svg rename to tests/wpt/tests/html/editing/dnd/svg/061.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/062.svg b/tests/wpt/tests/html/editing/dnd/svg/062.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/062.svg rename to tests/wpt/tests/html/editing/dnd/svg/062.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/063.svg b/tests/wpt/tests/html/editing/dnd/svg/063.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/063.svg rename to tests/wpt/tests/html/editing/dnd/svg/063.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/064.svg b/tests/wpt/tests/html/editing/dnd/svg/064.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/064.svg rename to tests/wpt/tests/html/editing/dnd/svg/064.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/065.svg b/tests/wpt/tests/html/editing/dnd/svg/065.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/065.svg rename to tests/wpt/tests/html/editing/dnd/svg/065.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/066.svg b/tests/wpt/tests/html/editing/dnd/svg/066.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/066.svg rename to tests/wpt/tests/html/editing/dnd/svg/066.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/067.svg b/tests/wpt/tests/html/editing/dnd/svg/067.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/067.svg rename to tests/wpt/tests/html/editing/dnd/svg/067.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/svg/helper-drop-selection-here-textArea.svg b/tests/wpt/tests/html/editing/dnd/svg/helper-drop-selection-here-textArea.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/svg/helper-drop-selection-here-textArea.svg rename to tests/wpt/tests/html/editing/dnd/svg/helper-drop-selection-here-textArea.svg diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/001.html b/tests/wpt/tests/html/editing/dnd/synthetic/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/synthetic/001.html rename to tests/wpt/tests/html/editing/dnd/synthetic/001.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/005-manual.html b/tests/wpt/tests/html/editing/dnd/synthetic/005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/synthetic/005-manual.html rename to tests/wpt/tests/html/editing/dnd/synthetic/005-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/006-manual.html b/tests/wpt/tests/html/editing/dnd/synthetic/006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/synthetic/006-manual.html rename to tests/wpt/tests/html/editing/dnd/synthetic/006-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/001-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/001-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/001-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/002-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/002-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/002-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/002-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/003-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/003-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/003-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/003-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/004-1.html b/tests/wpt/tests/html/editing/dnd/target-origin/004-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/004-1.html rename to tests/wpt/tests/html/editing/dnd/target-origin/004-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/004-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/004-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/004-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/004-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/005-1.html b/tests/wpt/tests/html/editing/dnd/target-origin/005-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/005-1.html rename to tests/wpt/tests/html/editing/dnd/target-origin/005-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/005-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/005-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/005-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/005-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/006-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/006-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/006-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/006-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/007-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/007-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/007-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/007-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/008-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/008-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/008-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/008-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/009-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/009-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/009-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/009-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/010-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/010-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/010-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/010-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/011-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/011-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/011-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/011-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/012-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/012-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/012-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/012-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/013-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/013-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/013-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/013-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/101-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/101-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/101-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/101-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/102-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/102-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/102-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/102-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/103-1.html b/tests/wpt/tests/html/editing/dnd/target-origin/103-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/103-1.html rename to tests/wpt/tests/html/editing/dnd/target-origin/103-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/103-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/103-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/103-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/103-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/104-1.html b/tests/wpt/tests/html/editing/dnd/target-origin/104-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/104-1.html rename to tests/wpt/tests/html/editing/dnd/target-origin/104-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/104-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/104-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/104-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/104-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/105-1.html b/tests/wpt/tests/html/editing/dnd/target-origin/105-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/105-1.html rename to tests/wpt/tests/html/editing/dnd/target-origin/105-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/105-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/105-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/105-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/105-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/106-1.html b/tests/wpt/tests/html/editing/dnd/target-origin/106-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/106-1.html rename to tests/wpt/tests/html/editing/dnd/target-origin/106-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/106-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/106-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/106-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/106-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/107-1.html b/tests/wpt/tests/html/editing/dnd/target-origin/107-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/107-1.html rename to tests/wpt/tests/html/editing/dnd/target-origin/107-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/107-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/107-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/107-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/107-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/108-1.html b/tests/wpt/tests/html/editing/dnd/target-origin/108-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/108-1.html rename to tests/wpt/tests/html/editing/dnd/target-origin/108-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/108-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/108-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/108-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/108-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/109-1.html b/tests/wpt/tests/html/editing/dnd/target-origin/109-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/109-1.html rename to tests/wpt/tests/html/editing/dnd/target-origin/109-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/109-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/109-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/109-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/109-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/110-1.html b/tests/wpt/tests/html/editing/dnd/target-origin/110-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/110-1.html rename to tests/wpt/tests/html/editing/dnd/target-origin/110-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/110-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/110-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/110-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/110-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/111-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/111-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/111-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/111-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/112-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/112-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/112-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/112-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/113-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/113-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/113-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/113-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/114-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/114-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/114-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/114-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/115-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/115-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/115-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/115-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/116-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/116-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/116-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/116-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/117-1.html b/tests/wpt/tests/html/editing/dnd/target-origin/117-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/117-1.html rename to tests/wpt/tests/html/editing/dnd/target-origin/117-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/117-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/117-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/117-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/117-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/118-1.html b/tests/wpt/tests/html/editing/dnd/target-origin/118-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/118-1.html rename to tests/wpt/tests/html/editing/dnd/target-origin/118-1.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/118-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/118-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/118-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/118-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/201-manual.html b/tests/wpt/tests/html/editing/dnd/target-origin/201-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/201-manual.html rename to tests/wpt/tests/html/editing/dnd/target-origin/201-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/202.html b/tests/wpt/tests/html/editing/dnd/target-origin/202.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/202.html rename to tests/wpt/tests/html/editing/dnd/target-origin/202.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/HELPER-mustallow.html b/tests/wpt/tests/html/editing/dnd/target-origin/HELPER-mustallow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/HELPER-mustallow.html rename to tests/wpt/tests/html/editing/dnd/target-origin/HELPER-mustallow.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/HELPER-mustblock.html b/tests/wpt/tests/html/editing/dnd/target-origin/HELPER-mustblock.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/HELPER-mustblock.html rename to tests/wpt/tests/html/editing/dnd/target-origin/HELPER-mustblock.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/HELPER-showorigin.html b/tests/wpt/tests/html/editing/dnd/target-origin/HELPER-showorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/target-origin/HELPER-showorigin.html rename to tests/wpt/tests/html/editing/dnd/target-origin/HELPER-showorigin.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/DataTransfer-types-manual.html b/tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/DataTransfer-types-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/DataTransfer-types-manual.html rename to tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/DataTransfer-types-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/dndTransferCases-manual.html b/tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/dndTransferCases-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/dndTransferCases-manual.html rename to tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/dndTransferCases-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/effectAllowed-manual.html b/tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/effectAllowed-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/effectAllowed-manual.html rename to tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/effectAllowed-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/files-manual.html b/tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/files-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/files-manual.html rename to tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/files-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/protectedDragDataTransfer-manual.html b/tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/protectedDragDataTransfer-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/protectedDragDataTransfer-manual.html rename to tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/protectedDragDataTransfer-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/protectedPasteDataTransfer-manual.html b/tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/protectedPasteDataTransfer-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/protectedPasteDataTransfer-manual.html rename to tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/protectedPasteDataTransfer-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/setData-manual.html b/tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/setData-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/setData-manual.html rename to tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/setData-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/types-manual.html b/tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/types-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-datatransfer-interface/types-manual.html rename to tests/wpt/tests/html/editing/dnd/the-datatransfer-interface/types-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-datatransferitem-interface/getAsString-manual.html b/tests/wpt/tests/html/editing/dnd/the-datatransferitem-interface/getAsString-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-datatransferitem-interface/getAsString-manual.html rename to tests/wpt/tests/html/editing/dnd/the-datatransferitem-interface/getAsString-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dragevent-interface/dragevent-manual.html b/tests/wpt/tests/html/editing/dnd/the-dragevent-interface/dragevent-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dragevent-interface/dragevent-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dragevent-interface/dragevent-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-draggable-attribute/draggable-enumerated-ascii-case-insensitive.html b/tests/wpt/tests/html/editing/dnd/the-draggable-attribute/draggable-enumerated-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-draggable-attribute/draggable-enumerated-ascii-case-insensitive.html rename to tests/wpt/tests/html/editing/dnd/the-draggable-attribute/draggable-enumerated-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-draggable-attribute/draggable_attribute.html b/tests/wpt/tests/html/editing/dnd/the-draggable-attribute/draggable_attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-draggable-attribute/draggable_attribute.html rename to tests/wpt/tests/html/editing/dnd/the-draggable-attribute/draggable_attribute.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_file_type-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_file_type-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_file_type-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_file_type-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_file-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_file-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_file-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_file-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_string-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_string-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_string-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_string-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_string_type-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_string_type-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_string_type-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_string_type-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element_dbcs-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element_dbcs-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element_dbcs-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element_dbcs-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_link_element-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_link_element-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_link_element-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_link_element-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_COpy-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_COpy-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_COpy-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_COpy-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_STRING-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_STRING-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_STRING-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_STRING-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_String_-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_String_-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_String_-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_String_-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_linK-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_linK-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_linK-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_linK-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_copy-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_copy-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_copy-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_copy-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_foo-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_foo-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_foo-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_foo-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_link-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_link-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_link-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_link-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_move-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_move-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_move-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_move-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_bar_move-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_bar_move-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_bar_move-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_bar_move-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_link-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_link-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_link-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_link-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_move_copy-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_move_copy-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_move_copy-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_move_copy-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_not_specified-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_not_specified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_not_specified-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_not_specified-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_unordered_unique_space_separated-manual.html b/tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_unordered_unique_space_separated-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_unordered_unique_space_separated-manual.html rename to tests/wpt/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_unordered_unique_space_separated-manual.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/autocapitalization/autocapitalize.html b/tests/wpt/tests/html/editing/editing-0/autocapitalization/autocapitalize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/autocapitalization/autocapitalize.html rename to tests/wpt/tests/html/editing/editing-0/autocapitalization/autocapitalize.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contentEditable-slotted-inherit.html b/tests/wpt/tests/html/editing/editing-0/contenteditable/contentEditable-slotted-inherit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contentEditable-slotted-inherit.html rename to tests/wpt/tests/html/editing/editing-0/contenteditable/contentEditable-slotted-inherit.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-enumerated-ascii-case-insensitive.html b/tests/wpt/tests/html/editing/editing-0/contenteditable/contenteditable-enumerated-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-enumerated-ascii-case-insensitive.html rename to tests/wpt/tests/html/editing/editing-0/contenteditable/contenteditable-enumerated-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height-ref.html b/tests/wpt/tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height-ref.html rename to tests/wpt/tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height-ref.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height.html b/tests/wpt/tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height.html rename to tests/wpt/tests/html/editing/editing-0/contenteditable/contenteditable-overflow-height.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-with-empty-block-ref.html b/tests/wpt/tests/html/editing/editing-0/contenteditable/contenteditable-with-empty-block-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-with-empty-block-ref.html rename to tests/wpt/tests/html/editing/editing-0/contenteditable/contenteditable-with-empty-block-ref.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-with-empty-block.html b/tests/wpt/tests/html/editing/editing-0/contenteditable/contenteditable-with-empty-block.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-with-empty-block.html rename to tests/wpt/tests/html/editing/editing-0/contenteditable/contenteditable-with-empty-block.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/selection-in-contentEditable-at-turning-designMode-on-off.tentative.html b/tests/wpt/tests/html/editing/editing-0/contenteditable/selection-in-contentEditable-at-turning-designMode-on-off.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/selection-in-contentEditable-at-turning-designMode-on-off.tentative.html rename to tests/wpt/tests/html/editing/editing-0/contenteditable/selection-in-contentEditable-at-turning-designMode-on-off.tentative.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/user-interaction-editing-contenteditable.html b/tests/wpt/tests/html/editing/editing-0/contenteditable/user-interaction-editing-contenteditable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/user-interaction-editing-contenteditable.html rename to tests/wpt/tests/html/editing/editing-0/contenteditable/user-interaction-editing-contenteditable.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/original-id.json b/tests/wpt/tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/original-id.json rename to tests/wpt/tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/original-id.json diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode-svg.svg b/tests/wpt/tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode-svg.svg rename to tests/wpt/tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode-svg.svg diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode-xml.xml b/tests/wpt/tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode-xml.xml similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode-xml.xml rename to tests/wpt/tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode-xml.xml diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode.html b/tests/wpt/tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode.html rename to tests/wpt/tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/references/spelling-markers-001-ref.html b/tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/references/spelling-markers-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/references/spelling-markers-001-ref.html rename to tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/references/spelling-markers-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spellcheck-enumerated-ascii-case-insensitive.html b/tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spellcheck-enumerated-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spellcheck-enumerated-ascii-case-insensitive.html rename to tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spellcheck-enumerated-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-001.html b/tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-001.html rename to tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-001.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-002.html b/tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-002.html rename to tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-002.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-003.html b/tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-003.html rename to tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-003.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-004.html b/tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-004.html rename to tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-004.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-005.html b/tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-005.html rename to tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-005.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-006.html b/tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-006.html rename to tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-006.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-007.html b/tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-007.html rename to tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-007.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-008.html b/tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-008.html rename to tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-008.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-009.html b/tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-009.html rename to tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-009.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-010.html b/tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-010.html rename to tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-010.html diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/user-interaction-editing-spellcheck.html b/tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/user-interaction-editing-spellcheck.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/editing-0/spelling-and-grammar-checking/user-interaction-editing-spellcheck.html rename to tests/wpt/tests/html/editing/editing-0/spelling-and-grammar-checking/user-interaction-editing-spellcheck.html diff --git a/tests/wpt/web-platform-tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-event.html b/tests/wpt/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-event.html rename to tests/wpt/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-event.html diff --git a/tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/beforematch-element-fragment-navigation.html b/tests/wpt/tests/html/editing/the-hidden-attribute/beforematch-element-fragment-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/beforematch-element-fragment-navigation.html rename to tests/wpt/tests/html/editing/the-hidden-attribute/beforematch-element-fragment-navigation.html diff --git a/tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1-ref.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1-ref.html rename to tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1-ref.html diff --git a/tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1a.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1a.html rename to tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1a.html diff --git a/tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1b.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1b.html rename to tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1b.html diff --git a/tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1c.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1c.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1c.html rename to tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1c.html diff --git a/tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1d.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1d.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1d.html rename to tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1d.html diff --git a/tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1e.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1e.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1e.html rename to tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1e.html diff --git a/tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1f.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1f.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1f.html rename to tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1f.html diff --git a/tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1g.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1g.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-1g.html rename to tests/wpt/tests/html/editing/the-hidden-attribute/hidden-1g.html diff --git a/tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-2-ref.svg b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-2-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-2-ref.svg rename to tests/wpt/tests/html/editing/the-hidden-attribute/hidden-2-ref.svg diff --git a/tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-2.svg b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-2.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-2.svg rename to tests/wpt/tests/html/editing/the-hidden-attribute/hidden-2.svg diff --git a/tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-idl.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-idl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-idl.html rename to tests/wpt/tests/html/editing/the-hidden-attribute/hidden-idl.html diff --git a/tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-ua-stylesheet.html b/tests/wpt/tests/html/editing/the-hidden-attribute/hidden-ua-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/html/editing/the-hidden-attribute/hidden-ua-stylesheet.html rename to tests/wpt/tests/html/editing/the-hidden-attribute/hidden-ua-stylesheet.html diff --git a/tests/wpt/web-platform-tests/html/embedded-content/the-img-element/attr-img-fetchpriority.html b/tests/wpt/tests/html/embedded-content/the-img-element/attr-img-fetchpriority.html similarity index 100% rename from tests/wpt/web-platform-tests/html/embedded-content/the-img-element/attr-img-fetchpriority.html rename to tests/wpt/tests/html/embedded-content/the-img-element/attr-img-fetchpriority.html diff --git a/tests/wpt/web-platform-tests/html/iana/application-x-www-form-urlencoded/original-id.json b/tests/wpt/tests/html/iana/application-x-www-form-urlencoded/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/iana/application-x-www-form-urlencoded/original-id.json rename to tests/wpt/tests/html/iana/application-x-www-form-urlencoded/original-id.json diff --git a/tests/wpt/web-platform-tests/html/iana/application-xhtml-xml/original-id.json b/tests/wpt/tests/html/iana/application-xhtml-xml/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/iana/application-xhtml-xml/original-id.json rename to tests/wpt/tests/html/iana/application-xhtml-xml/original-id.json diff --git a/tests/wpt/web-platform-tests/html/iana/multipart-x-mixed-replace/original-id.json b/tests/wpt/tests/html/iana/multipart-x-mixed-replace/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/iana/multipart-x-mixed-replace/original-id.json rename to tests/wpt/tests/html/iana/multipart-x-mixed-replace/original-id.json diff --git a/tests/wpt/web-platform-tests/html/iana/text-cache-manifest/original-id.json b/tests/wpt/tests/html/iana/text-cache-manifest/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/iana/text-cache-manifest/original-id.json rename to tests/wpt/tests/html/iana/text-cache-manifest/original-id.json diff --git a/tests/wpt/web-platform-tests/html/iana/text-html/original-id.json b/tests/wpt/tests/html/iana/text-html/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/iana/text-html/original-id.json rename to tests/wpt/tests/html/iana/text-html/original-id.json diff --git a/tests/wpt/web-platform-tests/html/iana/web-scheme-prefix/original-id.json b/tests/wpt/tests/html/iana/web-scheme-prefix/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/iana/web-scheme-prefix/original-id.json rename to tests/wpt/tests/html/iana/web-scheme-prefix/original-id.json diff --git a/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/domstringlist.html b/tests/wpt/tests/html/infrastructure/common-dom-interfaces/collections/domstringlist.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/domstringlist.html rename to tests/wpt/tests/html/infrastructure/common-dom-interfaces/collections/domstringlist.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/historical.html b/tests/wpt/tests/html/infrastructure/common-dom-interfaces/collections/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/historical.html rename to tests/wpt/tests/html/infrastructure/common-dom-interfaces/collections/historical.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/htmlallcollection.html b/tests/wpt/tests/html/infrastructure/common-dom-interfaces/collections/htmlallcollection.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/htmlallcollection.html rename to tests/wpt/tests/html/infrastructure/common-dom-interfaces/collections/htmlallcollection.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html b/tests/wpt/tests/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html rename to tests/wpt/tests/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/htmloptionscollection.html b/tests/wpt/tests/html/infrastructure/common-dom-interfaces/collections/htmloptionscollection.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/htmloptionscollection.html rename to tests/wpt/tests/html/infrastructure/common-dom-interfaces/collections/htmloptionscollection.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/radionodelist.html b/tests/wpt/tests/html/infrastructure/common-dom-interfaces/collections/radionodelist.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/common-dom-interfaces/collections/radionodelist.html rename to tests/wpt/tests/html/infrastructure/common-dom-interfaces/collections/radionodelist.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/common-microsyntaxes/colours/parsing-legacy-colour-value-ascii-case-insensitive-ref.html b/tests/wpt/tests/html/infrastructure/common-microsyntaxes/colours/parsing-legacy-colour-value-ascii-case-insensitive-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/common-microsyntaxes/colours/parsing-legacy-colour-value-ascii-case-insensitive-ref.html rename to tests/wpt/tests/html/infrastructure/common-microsyntaxes/colours/parsing-legacy-colour-value-ascii-case-insensitive-ref.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/common-microsyntaxes/colours/parsing-legacy-colour-value-ascii-case-insensitive.html b/tests/wpt/tests/html/infrastructure/common-microsyntaxes/colours/parsing-legacy-colour-value-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/common-microsyntaxes/colours/parsing-legacy-colour-value-ascii-case-insensitive.html rename to tests/wpt/tests/html/infrastructure/common-microsyntaxes/colours/parsing-legacy-colour-value-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/conformance-requirements/extensibility/foreign.html b/tests/wpt/tests/html/infrastructure/conformance-requirements/extensibility/foreign.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/conformance-requirements/extensibility/foreign.html rename to tests/wpt/tests/html/infrastructure/conformance-requirements/extensibility/foreign.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/fetching-resources/crossorigin-enumerated-ascii-case-insensitive.html b/tests/wpt/tests/html/infrastructure/fetching-resources/crossorigin-enumerated-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/fetching-resources/crossorigin-enumerated-ascii-case-insensitive.html rename to tests/wpt/tests/html/infrastructure/fetching-resources/crossorigin-enumerated-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/cross-origin-transfer-resizable-arraybuffer.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/cross-origin-transfer-resizable-arraybuffer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/cross-origin-transfer-resizable-arraybuffer.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/cross-origin-transfer-resizable-arraybuffer.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/messagechannel.any.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/messagechannel.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/messagechannel.any.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/messagechannel.any.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-iframe.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-iframe.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-iframe.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-iframe.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-iframe.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-iframe.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-iframe.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-worker.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-worker.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-worker.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-worker.js.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-worker.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-worker.js.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/resources/echo-worker.js.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/resources/iframe-resizable-arraybuffer-helper.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/resources/iframe-resizable-arraybuffer-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/resources/iframe-resizable-arraybuffer-helper.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/resources/iframe-resizable-arraybuffer-helper.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/resources/post-parent-type-error.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/resources/post-parent-type-error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/resources/post-parent-type-error.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/resources/post-parent-type-error.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success-and-failure.https.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success-and-failure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success-and-failure.https.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success-and-failure.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success-and-failure.https.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success-and-failure.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success-and-failure.https.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success-and-failure.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success.https.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success.https.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success.https.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success.https.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/identity-not-preserved.https.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/identity-not-preserved.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/identity-not-preserved.https.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/identity-not-preserved.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/identity-not-preserved.https.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/identity-not-preserved.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/identity-not-preserved.https.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/identity-not-preserved.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-sharedworker-success.https.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-sharedworker-success.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-sharedworker-success.https.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-sharedworker-success.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-sharedworker-success.https.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-sharedworker-success.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-sharedworker-success.https.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-sharedworker-success.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-worker-success.https.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-worker-success.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-worker-success.https.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-worker-success.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-worker-success.https.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-worker-success.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-worker-success.https.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/nested-worker-success.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/no-coop-coep.https.any.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/no-coop-coep.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/no-coop-coep.https.any.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/no-coop-coep.https.any.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/no-transferring.https.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/no-transferring.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/no-transferring.https.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/no-transferring.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/no-transferring.https.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/no-transferring.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/no-transferring.https.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/no-transferring.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/blank.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/blank.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/blank.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/blank.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/blank.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/blank.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/blank.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-iframe.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-iframe.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-iframe.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-iframe.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-iframe.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-iframe.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-iframe.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-sharedworker.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-sharedworker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-sharedworker.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-sharedworker.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-sharedworker.js.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-sharedworker.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-sharedworker.js.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-sharedworker.js.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-worker.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-worker.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-worker.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-worker.js.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-worker.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-worker.js.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/broadcastchannel-worker.js.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-domain-failure.sub.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-domain-failure.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-domain-failure.sub.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-domain-failure.sub.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-domain-failure.sub.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-domain-failure.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-domain-failure.sub.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-domain-failure.sub.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-failure.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-failure.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-failure.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-failure.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-failure.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-failure.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-failure.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-failure.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-complex.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-complex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-complex.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-complex.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-complex.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-complex.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-complex.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-complex.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-failure.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-failure.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-failure.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-failure.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-failure.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-failure.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-failure.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-failure.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-site-failure.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-site-failure.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-site-failure.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-site-failure.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-site-failure.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-site-failure.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-site-failure.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/iframe-messagechannel-site-failure.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe-messagechannel.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe-messagechannel.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe-messagechannel.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe-messagechannel.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe-messagechannel.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe-messagechannel.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe-messagechannel.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe-messagechannel.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-iframe.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-popup.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-popup.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-popup.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-popup.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-popup.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-popup.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-popup.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker-with-channel.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker-with-channel.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker-with-channel.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker-with-channel.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker-with-channel.js.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker-with-channel.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker-with-channel.js.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker-with-channel.js.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker.js.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker.js.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/incrementer-worker.js.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-1.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-1.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-1.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-1.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-1.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-1.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-1.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-2.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-2.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-2.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-2.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-2.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-2.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-2.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-3.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-3.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-3.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-3.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-3.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-3.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-3.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-4-incrementer.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-4-incrementer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-4-incrementer.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-4-incrementer.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-4-incrementer.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-4-incrementer.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-4-incrementer.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-iframe-4-incrementer.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-worker-success.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-worker-success.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-worker-success.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-worker-success.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-worker-success.js.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-worker-success.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-worker-success.js.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/nested-worker-success.js.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/serviceworker-failure.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/serviceworker-failure.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/serviceworker-failure.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/serviceworker-failure.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/serviceworker-failure.js.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/serviceworker-failure.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/serviceworker-failure.js.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/serviceworker-failure.js.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/sharedworker-failure.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/sharedworker-failure.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/sharedworker-failure.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/sharedworker-failure.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/sharedworker-failure.js.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/sharedworker-failure.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/sharedworker-failure.js.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/sharedworker-failure.js.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/test-incrementer.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/test-incrementer.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/test-incrementer.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/test-incrementer.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/test-sab.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/test-sab.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/test-sab.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/resources/test-sab.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-history.https.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-history.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-history.https.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-history.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-history.https.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-history.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-history.https.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-history.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-idb.any.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-idb.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-idb.any.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-idb.any.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-notifications-api.any.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-notifications-api.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-notifications-api.any.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/serialization-via-notifications-api.any.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-domain-failure.https.sub.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-domain-failure.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-domain-failure.https.sub.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-domain-failure.https.sub.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-domain-failure.https.sub.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-domain-failure.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-domain-failure.https.sub.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-domain-failure.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-failure.https.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-failure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-failure.https.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-failure.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-failure.https.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-failure.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-failure.https.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-failure.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-iframe-messagechannel.https.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-iframe-messagechannel.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-iframe-messagechannel.https.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-iframe-messagechannel.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-iframe-messagechannel.https.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-iframe-messagechannel.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-iframe-messagechannel.https.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-iframe-messagechannel.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-messagechannel-success.https.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-messagechannel-success.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-messagechannel-success.https.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-messagechannel-success.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-messagechannel-success.https.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-messagechannel-success.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-messagechannel-success.https.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-messagechannel-success.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-serviceworker-failure.https.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-serviceworker-failure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-serviceworker-failure.https.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-serviceworker-failure.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-serviceworker-failure.https.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-serviceworker-failure.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-serviceworker-failure.https.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-serviceworker-failure.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-sharedworker-failure.https.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-sharedworker-failure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-sharedworker-failure.https.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-sharedworker-failure.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-sharedworker-failure.https.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-sharedworker-failure.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-sharedworker-failure.https.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-sharedworker-failure.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-simple-success.https.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-simple-success.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-simple-success.https.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-simple-success.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-simple-success.https.html.headers b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-simple-success.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-simple-success.https.html.headers rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-simple-success.https.html.headers diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/structured-cloning-error-extra.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/structured-cloning-error-extra.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/structured-cloning-error-extra.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/structured-cloning-error-extra.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/structured-cloning-error-stack-optional.sub.window.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/structured-cloning-error-stack-optional.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/structured-cloning-error-stack-optional.sub.window.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/structured-cloning-error-stack-optional.sub.window.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/structuredclone_0.html b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/structuredclone_0.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/structuredclone_0.html rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/structuredclone_0.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/transfer-errors.window.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/transfer-errors.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/transfer-errors.window.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/transfer-errors.window.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/window-postmessage.window.js b/tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/window-postmessage.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/window-postmessage.window.js rename to tests/wpt/tests/html/infrastructure/safe-passing-of-structured-data/window-postmessage.window.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/terminology/plugins/sample.txt b/tests/wpt/tests/html/infrastructure/terminology/plugins/sample.txt similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/terminology/plugins/sample.txt rename to tests/wpt/tests/html/infrastructure/terminology/plugins/sample.txt diff --git a/tests/wpt/web-platform-tests/html/infrastructure/terminology/plugins/text-plain.html b/tests/wpt/tests/html/infrastructure/terminology/plugins/text-plain.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/terminology/plugins/text-plain.html rename to tests/wpt/tests/html/infrastructure/terminology/plugins/text-plain.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/base-url/document-base-url-changes-about-srcdoc-2.https.html b/tests/wpt/tests/html/infrastructure/urls/base-url/document-base-url-changes-about-srcdoc-2.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/base-url/document-base-url-changes-about-srcdoc-2.https.html rename to tests/wpt/tests/html/infrastructure/urls/base-url/document-base-url-changes-about-srcdoc-2.https.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/dynamic-changes-to-base-urls/dynamic-urls.sub.html b/tests/wpt/tests/html/infrastructure/urls/dynamic-changes-to-base-urls/dynamic-urls.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/dynamic-changes-to-base-urls/dynamic-urls.sub.html rename to tests/wpt/tests/html/infrastructure/urls/dynamic-changes-to-base-urls/dynamic-urls.sub.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/dynamic-changes-to-base-urls/historical.sub.xhtml b/tests/wpt/tests/html/infrastructure/urls/dynamic-changes-to-base-urls/historical.sub.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/dynamic-changes-to-base-urls/historical.sub.xhtml rename to tests/wpt/tests/html/infrastructure/urls/dynamic-changes-to-base-urls/historical.sub.xhtml diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/attributes.sub.html b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/attributes.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/attributes.sub.html rename to tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/attributes.sub.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html rename to tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/lone-surrogates.sub.html b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/lone-surrogates.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/lone-surrogates.sub.html rename to tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/lone-surrogates.sub.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/navigation.sub.html b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/navigation.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/navigation.sub.html rename to tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/navigation.sub.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/blank.py b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/blank.py similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/blank.py rename to tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/blank.py diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/css-tmpl.py b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/css-tmpl.py similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/css-tmpl.py rename to tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/css-tmpl.py diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js rename to tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resource.py b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resource.py similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resource.py rename to tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resource.py diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/stash.py b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/stash.py similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/stash.py rename to tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/stash.py diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html rename to tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html rename to tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html rename to tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html rename to tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html rename to tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/terminology-0/document-base-url-about-srcdoc.https.window.js b/tests/wpt/tests/html/infrastructure/urls/terminology-0/document-base-url-about-srcdoc.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/terminology-0/document-base-url-about-srcdoc.https.window.js rename to tests/wpt/tests/html/infrastructure/urls/terminology-0/document-base-url-about-srcdoc.https.window.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/terminology-0/document-base-url-changes-about-srcdoc.https.window.js b/tests/wpt/tests/html/infrastructure/urls/terminology-0/document-base-url-changes-about-srcdoc.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/terminology-0/document-base-url-changes-about-srcdoc.https.window.js rename to tests/wpt/tests/html/infrastructure/urls/terminology-0/document-base-url-changes-about-srcdoc.https.window.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/terminology-0/document-base-url-changes-after-nav-about-srcdoc.https.window.js b/tests/wpt/tests/html/infrastructure/urls/terminology-0/document-base-url-changes-after-nav-about-srcdoc.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/terminology-0/document-base-url-changes-after-nav-about-srcdoc.https.window.js rename to tests/wpt/tests/html/infrastructure/urls/terminology-0/document-base-url-changes-after-nav-about-srcdoc.https.window.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/terminology-0/document-base-url-initiated-grand-parent.https.window.js b/tests/wpt/tests/html/infrastructure/urls/terminology-0/document-base-url-initiated-grand-parent.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/terminology-0/document-base-url-initiated-grand-parent.https.window.js rename to tests/wpt/tests/html/infrastructure/urls/terminology-0/document-base-url-initiated-grand-parent.https.window.js diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/terminology-0/document-base-url.html b/tests/wpt/tests/html/infrastructure/urls/terminology-0/document-base-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/terminology-0/document-base-url.html rename to tests/wpt/tests/html/infrastructure/urls/terminology-0/document-base-url.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/terminology-0/multiple-base.sub.html b/tests/wpt/tests/html/infrastructure/urls/terminology-0/multiple-base.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/terminology-0/multiple-base.sub.html rename to tests/wpt/tests/html/infrastructure/urls/terminology-0/multiple-base.sub.html diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/terminology-0/resources/send-back-base-url.html b/tests/wpt/tests/html/infrastructure/urls/terminology-0/resources/send-back-base-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/infrastructure/urls/terminology-0/resources/send-back-base-url.html rename to tests/wpt/tests/html/infrastructure/urls/terminology-0/resources/send-back-base-url.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/chrome-object-tab-focus-bug.html b/tests/wpt/tests/html/interaction/focus/chrome-object-tab-focus-bug.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/chrome-object-tab-focus-bug.html rename to tests/wpt/tests/html/interaction/focus/chrome-object-tab-focus-bug.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/composed.window.js b/tests/wpt/tests/html/interaction/focus/composed.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/composed.window.js rename to tests/wpt/tests/html/interaction/focus/composed.window.js diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html b/tests/wpt/tests/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html rename to tests/wpt/tests/html/interaction/focus/document-level-focus-apis/document-has-system-focus.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/document-level-focus-apis/document-level-apis.html b/tests/wpt/tests/html/interaction/focus/document-level-focus-apis/document-level-apis.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/document-level-focus-apis/document-level-apis.html rename to tests/wpt/tests/html/interaction/focus/document-level-focus-apis/document-level-apis.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/document-level-focus-apis/support/popup.html b/tests/wpt/tests/html/interaction/focus/document-level-focus-apis/support/popup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/document-level-focus-apis/support/popup.html rename to tests/wpt/tests/html/interaction/focus/document-level-focus-apis/support/popup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/document-level-focus-apis/support/test.html b/tests/wpt/tests/html/interaction/focus/document-level-focus-apis/support/test.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/document-level-focus-apis/support/test.html rename to tests/wpt/tests/html/interaction/focus/document-level-focus-apis/support/test.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focus-01.html b/tests/wpt/tests/html/interaction/focus/focus-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focus-01.html rename to tests/wpt/tests/html/interaction/focus/focus-01.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focus-02.html b/tests/wpt/tests/html/interaction/focus/focus-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focus-02.html rename to tests/wpt/tests/html/interaction/focus/focus-02.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focus-file-input.html b/tests/wpt/tests/html/interaction/focus/focus-file-input.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focus-file-input.html rename to tests/wpt/tests/html/interaction/focus/focus-file-input.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focus-input-type-switch.html b/tests/wpt/tests/html/interaction/focus/focus-input-type-switch.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focus-input-type-switch.html rename to tests/wpt/tests/html/interaction/focus/focus-input-type-switch.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focus-keyboard-js.html b/tests/wpt/tests/html/interaction/focus/focus-keyboard-js.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focus-keyboard-js.html rename to tests/wpt/tests/html/interaction/focus/focus-keyboard-js.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focus-management/focus-event-targets-simple.html b/tests/wpt/tests/html/interaction/focus/focus-management/focus-event-targets-simple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focus-management/focus-event-targets-simple.html rename to tests/wpt/tests/html/interaction/focus/focus-management/focus-event-targets-simple.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focus-management/focus-events.html b/tests/wpt/tests/html/interaction/focus/focus-management/focus-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focus-management/focus-events.html rename to tests/wpt/tests/html/interaction/focus/focus-management/focus-events.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focused-element-move-documents-crash.html b/tests/wpt/tests/html/interaction/focus/focused-element-move-documents-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focused-element-move-documents-crash.html rename to tests/wpt/tests/html/interaction/focus/focused-element-move-documents-crash.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/descends-into-extending-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/descends-into-extending-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/descends-into-extending-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/descends-into-extending-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-on-focusgroup-root.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-on-focusgroup-root.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-on-focusgroup-root.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-on-focusgroup-root.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-on-non-focusgroup-item.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-on-non-focusgroup-item.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-on-non-focusgroup-item.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-on-non-focusgroup-item.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-only-one-item-and-wraps.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-only-one-item-and-wraps.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-only-one-item-and-wraps.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-only-one-item-and-wraps.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-only-one-item.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-only-one-item.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-only-one-item.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-only-one-item.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-outside-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-outside-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-outside-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-move-when-outside-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-wrap-when-not-supported.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-wrap-when-not-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-wrap-when-not-supported.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/does-not-wrap-when-not-supported.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/ascends-to-parent-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/ascends-to-parent-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/ascends-to-parent-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/ascends-to-parent-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/does-not-ascend-out-of-non-extending-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/does-not-ascend-out-of-non-extending-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/does-not-ascend-out-of-non-extending-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/does-not-ascend-out-of-non-extending-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/does-not-move-when-axis-not-supported.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/does-not-move-when-axis-not-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/does-not-move-when-axis-not-supported.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/does-not-move-when-axis-not-supported.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/does-not-wrap-in-orthogonal-axis.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/does-not-wrap-in-orthogonal-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/does-not-wrap-in-orthogonal-axis.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/does-not-wrap-in-orthogonal-axis.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/moves-when-only-current-axis-supported.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/moves-when-only-current-axis-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/moves-when-only-current-axis-supported.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/moves-when-only-current-axis-supported.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/skips-focusgroup-that-extends-in-orthogonal-axis-complex-case.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/skips-focusgroup-that-extends-in-orthogonal-axis-complex-case.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/skips-focusgroup-that-extends-in-orthogonal-axis-complex-case.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/skips-focusgroup-that-extends-in-orthogonal-axis-complex-case.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/skips-focusgroup-that-extends-in-orthogonal-axis.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/skips-focusgroup-that-extends-in-orthogonal-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/skips-focusgroup-that-extends-in-orthogonal-axis.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/skips-focusgroup-that-extends-in-orthogonal-axis.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/wraps-in-axis.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/wraps-in-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/wraps-in-axis.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/horizontal/wraps-in-axis.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/moves-to-previous-item-and-skips-focusable-item.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/moves-to-previous-item-and-skips-focusable-item.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/moves-to-previous-item-and-skips-focusable-item.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/moves-to-previous-item-and-skips-focusable-item.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/moves-to-previous-item.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/moves-to-previous-item.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/moves-to-previous-item.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/moves-to-previous-item.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-empty-wrapping-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-empty-wrapping-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-empty-wrapping-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-empty-wrapping-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-non-focusgroup-subtree.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-non-focusgroup-subtree.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-non-focusgroup-subtree.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-non-focusgroup-subtree.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-root-focusgroup-complex-case.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-root-focusgroup-complex-case.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-root-focusgroup-complex-case.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-root-focusgroup-complex-case.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-root-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-root-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-root-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/skips-root-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/ascends-to-parent-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/ascends-to-parent-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/ascends-to-parent-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/ascends-to-parent-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/does-not-ascend-out-of-non-extending-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/does-not-ascend-out-of-non-extending-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/does-not-ascend-out-of-non-extending-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/does-not-ascend-out-of-non-extending-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/does-not-move-when-axis-not-supported.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/does-not-move-when-axis-not-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/does-not-move-when-axis-not-supported.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/does-not-move-when-axis-not-supported.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/does-not-wrap-in-orthogonal-axis.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/does-not-wrap-in-orthogonal-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/does-not-wrap-in-orthogonal-axis.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/does-not-wrap-in-orthogonal-axis.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/moves-when-only-current-axis-supported.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/moves-when-only-current-axis-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/moves-when-only-current-axis-supported.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/moves-when-only-current-axis-supported.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/skips-focusgroup-that-extends-in-orthogonal-axis-complex-case.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/skips-focusgroup-that-extends-in-orthogonal-axis-complex-case.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/skips-focusgroup-that-extends-in-orthogonal-axis-complex-case.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/skips-focusgroup-that-extends-in-orthogonal-axis-complex-case.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/skips-focusgroup-that-extends-in-orthogonal-axis.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/skips-focusgroup-that-extends-in-orthogonal-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/skips-focusgroup-that-extends-in-orthogonal-axis.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/skips-focusgroup-that-extends-in-orthogonal-axis.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/wraps-in-axis.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/wraps-in-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/wraps-in-axis.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/vertical/wraps-in-axis.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/wraps-in-extending-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/wraps-in-extending-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/wraps-in-extending-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/wraps-in-extending-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/wraps-successfully-complex-case.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/wraps-successfully-complex-case.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/wraps-successfully-complex-case.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/wraps-successfully-complex-case.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/wraps-successfully.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/wraps-successfully.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/backward-navigation/wraps-successfully.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/backward-navigation/wraps-successfully.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-on-focusgroup-root.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-on-focusgroup-root.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-on-focusgroup-root.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-on-focusgroup-root.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-on-non-item.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-on-non-item.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-on-non-item.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-on-non-item.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-only-one-item-and-wraps.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-only-one-item-and-wraps.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-only-one-item-and-wraps.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-only-one-item-and-wraps.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-only-one-item.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-only-one-item.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-only-one-item.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-only-one-item.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-outside-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-outside-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-outside-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-move-when-outside-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-wrap-in-focusgroup-with-no-items.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-wrap-in-focusgroup-with-no-items.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-wrap-in-focusgroup-with-no-items.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-wrap-in-focusgroup-with-no-items.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-wrap-when-not-supported.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-wrap-when-not-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-wrap-when-not-supported.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/does-not-wrap-when-not-supported.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/descends-in-horizontal-inner-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/descends-in-horizontal-inner-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/descends-in-horizontal-inner-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/descends-in-horizontal-inner-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/does-not-move-when-axis-not-supported.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/does-not-move-when-axis-not-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/does-not-move-when-axis-not-supported.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/does-not-move-when-axis-not-supported.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/does-not-wrap-even-when-other-axis-supported.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/does-not-wrap-even-when-other-axis-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/does-not-wrap-even-when-other-axis-supported.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/does-not-wrap-even-when-other-axis-supported.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/moves-when-only-current-axis-supported.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/moves-when-only-current-axis-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/moves-when-only-current-axis-supported.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/moves-when-only-current-axis-supported.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/skips-focusgroup-that-extends-in-orthogonal-axis.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/skips-focusgroup-that-extends-in-orthogonal-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/skips-focusgroup-that-extends-in-orthogonal-axis.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/skips-focusgroup-that-extends-in-orthogonal-axis.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/wraps-and-skips-orthogonal-inner-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/wraps-and-skips-orthogonal-inner-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/wraps-and-skips-orthogonal-inner-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/wraps-and-skips-orthogonal-inner-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/wraps-in-appropriate-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/wraps-in-appropriate-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/wraps-in-appropriate-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/wraps-in-appropriate-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/wraps-in-inner-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/wraps-in-inner-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/wraps-in-inner-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/horizontal/wraps-in-inner-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-inside-extending-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-inside-extending-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-inside-extending-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-inside-extending-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item-and-skips-non-focusable.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item-and-skips-non-focusable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item-and-skips-non-focusable.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item-and-skips-non-focusable.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item-outside-extending-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item-outside-extending-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item-outside-extending-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item-outside-extending-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item-within-descendants.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item-within-descendants.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item-within-descendants.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item-within-descendants.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/moves-to-next-item.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/descends-in-vertical-inner-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/descends-in-vertical-inner-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/descends-in-vertical-inner-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/descends-in-vertical-inner-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/does-not-move-when-axis-not-supported.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/does-not-move-when-axis-not-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/does-not-move-when-axis-not-supported.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/does-not-move-when-axis-not-supported.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/does-not-wrap-even-when-other-axis-supported.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/does-not-wrap-even-when-other-axis-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/does-not-wrap-even-when-other-axis-supported.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/does-not-wrap-even-when-other-axis-supported.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/moves-when-only-current-axis-supported.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/moves-when-only-current-axis-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/moves-when-only-current-axis-supported.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/moves-when-only-current-axis-supported.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/skips-focusgroup-that-extends-in-orthogonal-axis.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/skips-focusgroup-that-extends-in-orthogonal-axis.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/skips-focusgroup-that-extends-in-orthogonal-axis.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/skips-focusgroup-that-extends-in-orthogonal-axis.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/wraps-and-skips-orthogonal-inner-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/wraps-and-skips-orthogonal-inner-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/wraps-and-skips-orthogonal-inner-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/wraps-and-skips-orthogonal-inner-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/wraps-in-appropriate-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/wraps-in-appropriate-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/wraps-in-appropriate-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/wraps-in-appropriate-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/wraps-in-inner-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/wraps-in-inner-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/wraps-in-inner-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/vertical/wraps-in-inner-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/wraps-and-goes-into-inner-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/wraps-and-goes-into-inner-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/wraps-and-goes-into-inner-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/wraps-and-goes-into-inner-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/wraps-successfully.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/wraps-successfully.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/wraps-successfully.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/wraps-successfully.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/wraps-to-parent-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/wraps-to-parent-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/forward-navigation/wraps-to-parent-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/forward-navigation/wraps-to-parent-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/col-flow-only.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/col-flow-only.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/col-flow-only.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/col-flow-only.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/col-wrap-and-row-flow.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/col-wrap-and-row-flow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/col-wrap-and-row-flow.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/col-wrap-and-row-flow.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/col-wrap-only.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/col-wrap-only.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/col-wrap-only.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/col-wrap-only.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/colspan.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/colspan.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/colspan.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/colspan.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/css-table-not-focusgroup.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/css-table-not-focusgroup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/css-table-not-focusgroup.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/css-table-not-focusgroup.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/css-table.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/css-table.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/css-table.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/css-table.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/does-not-wrap-or-flow.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/does-not-wrap-or-flow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/does-not-wrap-or-flow.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/does-not-wrap-or-flow.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/empty-spaces.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/empty-spaces.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/empty-spaces.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/empty-spaces.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/flows-in-both-axes.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/flows-in-both-axes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/flows-in-both-axes.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/flows-in-both-axes.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/moves-across-table-sections.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/moves-across-table-sections.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/moves-across-table-sections.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/moves-across-table-sections.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/non-table.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/non-table.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/non-table.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/non-table.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/relayout-before-navigation.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/relayout-before-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/relayout-before-navigation.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/relayout-before-navigation.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/row-flow-only.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/row-flow-only.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/row-flow-only.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/row-flow-only.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/row-wrap-and-col-flow.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/row-wrap-and-col-flow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/row-wrap-and-col-flow.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/row-wrap-and-col-flow.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/row-wrap-only.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/row-wrap-only.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/row-wrap-only.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/row-wrap-only.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/rowspan.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/rowspan.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/rowspan.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/rowspan.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/simple-case-with-non-focusable-cell-in-the-center.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/simple-case-with-non-focusable-cell-in-the-center.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/simple-case-with-non-focusable-cell-in-the-center.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/simple-case-with-non-focusable-cell-in-the-center.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/simple-case.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/simple-case.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/simple-case.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/simple-case.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/wraps-in-both-axes.html b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/wraps-in-both-axes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/grid-navigation/wraps-in-both-axes.html rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/grid-navigation/wraps-in-both-axes.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/resources/focusgroup-utils.js b/tests/wpt/tests/html/interaction/focus/focusgroup/tentative/resources/focusgroup-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/focusgroup/tentative/resources/focusgroup-utils.js rename to tests/wpt/tests/html/interaction/focus/focusgroup/tentative/resources/focusgroup-utils.js diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/processing-model/focus-fixup-rule-one-no-dialogs.html b/tests/wpt/tests/html/interaction/focus/processing-model/focus-fixup-rule-one-no-dialogs.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/processing-model/focus-fixup-rule-one-no-dialogs.html rename to tests/wpt/tests/html/interaction/focus/processing-model/focus-fixup-rule-one-no-dialogs.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/processing-model/focusVisible.html b/tests/wpt/tests/html/interaction/focus/processing-model/focusVisible.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/processing-model/focusVisible.html rename to tests/wpt/tests/html/interaction/focus/processing-model/focusVisible.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/processing-model/legend-focusable.html b/tests/wpt/tests/html/interaction/focus/processing-model/legend-focusable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/processing-model/legend-focusable.html rename to tests/wpt/tests/html/interaction/focus/processing-model/legend-focusable.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/processing-model/legend.html b/tests/wpt/tests/html/interaction/focus/processing-model/legend.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/processing-model/legend.html rename to tests/wpt/tests/html/interaction/focus/processing-model/legend.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/processing-model/preventScroll-nested-scroll-elements.html b/tests/wpt/tests/html/interaction/focus/processing-model/preventScroll-nested-scroll-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/processing-model/preventScroll-nested-scroll-elements.html rename to tests/wpt/tests/html/interaction/focus/processing-model/preventScroll-nested-scroll-elements.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/processing-model/preventScroll-textarea.html b/tests/wpt/tests/html/interaction/focus/processing-model/preventScroll-textarea.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/processing-model/preventScroll-textarea.html rename to tests/wpt/tests/html/interaction/focus/processing-model/preventScroll-textarea.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/processing-model/preventScroll.html b/tests/wpt/tests/html/interaction/focus/processing-model/preventScroll.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/processing-model/preventScroll.html rename to tests/wpt/tests/html/interaction/focus/processing-model/preventScroll.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/processing-model/support/preventScroll-helper.html b/tests/wpt/tests/html/interaction/focus/processing-model/support/preventScroll-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/processing-model/support/preventScroll-helper.html rename to tests/wpt/tests/html/interaction/focus/processing-model/support/preventScroll-helper.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/processing-model/textarea-scroll-selection.html b/tests/wpt/tests/html/interaction/focus/processing-model/textarea-scroll-selection.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/processing-model/textarea-scroll-selection.html rename to tests/wpt/tests/html/interaction/focus/processing-model/textarea-scroll-selection.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-default-value.html b/tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-default-value.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-default-value.html rename to tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-default-value.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-negative.html b/tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-negative.html rename to tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-negative.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order.html b/tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order.html rename to tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-positive.html b/tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-positive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-positive.html rename to tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-positive.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-zero.html b/tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-zero.html rename to tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-zero.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/resources/frameset-using-page.html b/tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/resources/frameset-using-page.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/resources/frameset-using-page.html rename to tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/resources/frameset-using-page.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/tabindex-getter-frame.html b/tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/tabindex-getter-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/tabindex-getter-frame.html rename to tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/tabindex-getter-frame.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/tabindex-getter.html b/tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/tabindex-getter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/tabindex-getter.html rename to tests/wpt/tests/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/tabindex-getter.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/tabindex-focus-flag.html b/tests/wpt/tests/html/interaction/focus/tabindex-focus-flag.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/tabindex-focus-flag.html rename to tests/wpt/tests/html/interaction/focus/tabindex-focus-flag.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/autofocus-dialog.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/autofocus-dialog.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/autofocus-dialog.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/autofocus-dialog.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/autofocus-in-not-fully-active-document.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/autofocus-in-not-fully-active-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/autofocus-in-not-fully-active-document.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/autofocus-in-not-fully-active-document.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/autofocus-on-stable-document.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/autofocus-on-stable-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/autofocus-on-stable-document.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/autofocus-on-stable-document.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-empty.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-empty.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-empty.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-nonexistent.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-nonexistent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-nonexistent.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-nonexistent.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-valid.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-valid.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/document-with-fragment-valid.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/first-reconnected.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/first-reconnected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/first-reconnected.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/first-reconnected.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/first-when-later-but-before.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/first-when-later-but-before.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/first-when-later-but-before.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/first-when-later-but-before.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/first-when-later.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/first-when-later.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/first-when-later.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/first-when-later.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/first.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/first.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/first.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/first.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/focusable-area-in-top-document.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/focusable-area-in-top-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/focusable-area-in-top-document.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/focusable-area-in-top-document.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/no-autofocus-on-changing-input-type.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/no-autofocus-on-changing-input-type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/no-autofocus-on-changing-input-type.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/no-autofocus-on-changing-input-type.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/no-cross-origin-autofocus.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/no-cross-origin-autofocus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/no-cross-origin-autofocus.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/no-cross-origin-autofocus.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/no-sandboxed-automatic-features.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/no-sandboxed-automatic-features.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/no-sandboxed-automatic-features.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/no-sandboxed-automatic-features.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/not-on-first-task.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/not-on-first-task.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/not-on-first-task.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/not-on-first-task.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/queue-non-focusable.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/queue-non-focusable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/queue-non-focusable.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/queue-non-focusable.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/child-autofocus.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/child-autofocus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/child-autofocus.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/child-autofocus.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/child-iframe.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/child-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/child-iframe.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/child-iframe.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/erase-first.css b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/erase-first.css similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/erase-first.css rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/erase-first.css diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/frame-with-a.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/frame-with-a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/frame-with-a.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/frame-with-a.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/frame-with-anchor.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/frame-with-anchor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/frame-with-anchor.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/frame-with-anchor.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/frame-with-autofocus-element.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/frame-with-autofocus-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/frame-with-autofocus-element.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/frame-with-autofocus-element.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/grand-child-autofocus.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/grand-child-autofocus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/grand-child-autofocus.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/grand-child-autofocus.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/imagemap.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/imagemap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/imagemap.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/imagemap.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/moving-autofocus-to-parent.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/moving-autofocus-to-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/moving-autofocus-to-parent.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/moving-autofocus-to-parent.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/utils.js b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/utils.js rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/resources/utils.js diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/same-origin-autofocus.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/same-origin-autofocus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/same-origin-autofocus.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/same-origin-autofocus.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/skip-non-focusable.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/skip-non-focusable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/skip-non-focusable.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/skip-non-focusable.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/skip-not-fully-active.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/skip-not-fully-active.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/skip-not-fully-active.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/skip-not-fully-active.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/spin-by-blocking-style-sheet.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/spin-by-blocking-style-sheet.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/spin-by-blocking-style-sheet.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/spin-by-blocking-style-sheet.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/supported-elements.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/supported-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/supported-elements.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/supported-elements.html diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html b/tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html rename to tests/wpt/tests/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html diff --git a/tests/wpt/web-platform-tests/html/links/icon/no-error-event.sub.html b/tests/wpt/tests/html/links/icon/no-error-event.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/links/icon/no-error-event.sub.html rename to tests/wpt/tests/html/links/icon/no-error-event.sub.html diff --git a/tests/wpt/web-platform-tests/html/links/icon/no-load-event.html b/tests/wpt/tests/html/links/icon/no-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/links/icon/no-load-event.html rename to tests/wpt/tests/html/links/icon/no-load-event.html diff --git a/tests/wpt/web-platform-tests/html/links/manifest/document-not-attached-manual.html b/tests/wpt/tests/html/links/manifest/document-not-attached-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/document-not-attached-manual.html rename to tests/wpt/tests/html/links/manifest/document-not-attached-manual.html diff --git a/tests/wpt/web-platform-tests/html/links/manifest/link-relationship/link-rel-manifest.html b/tests/wpt/tests/html/links/manifest/link-relationship/link-rel-manifest.html similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/link-relationship/link-rel-manifest.html rename to tests/wpt/tests/html/links/manifest/link-relationship/link-rel-manifest.html diff --git a/tests/wpt/web-platform-tests/html/links/manifest/link-relationship/link-tree-order-manual.html b/tests/wpt/tests/html/links/manifest/link-relationship/link-tree-order-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/link-relationship/link-tree-order-manual.html rename to tests/wpt/tests/html/links/manifest/link-relationship/link-tree-order-manual.html diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-application-json-manual.html b/tests/wpt/tests/html/links/manifest/mime-type-application-json-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-application-json-manual.html rename to tests/wpt/tests/html/links/manifest/mime-type-application-json-manual.html diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-application-json.webmanifest b/tests/wpt/tests/html/links/manifest/mime-type-application-json.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-application-json.webmanifest rename to tests/wpt/tests/html/links/manifest/mime-type-application-json.webmanifest diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-application-json.webmanifest.headers b/tests/wpt/tests/html/links/manifest/mime-type-application-json.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-application-json.webmanifest.headers rename to tests/wpt/tests/html/links/manifest/mime-type-application-json.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-application-manifest+json-manual.html b/tests/wpt/tests/html/links/manifest/mime-type-application-manifest+json-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-application-manifest+json-manual.html rename to tests/wpt/tests/html/links/manifest/mime-type-application-manifest+json-manual.html diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-application-manifest+json.webmanifest b/tests/wpt/tests/html/links/manifest/mime-type-application-manifest+json.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-application-manifest+json.webmanifest rename to tests/wpt/tests/html/links/manifest/mime-type-application-manifest+json.webmanifest diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-application-manifest+json.webmanifest.headers b/tests/wpt/tests/html/links/manifest/mime-type-application-manifest+json.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-application-manifest+json.webmanifest.headers rename to tests/wpt/tests/html/links/manifest/mime-type-application-manifest+json.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-invalid-manual.html b/tests/wpt/tests/html/links/manifest/mime-type-invalid-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-invalid-manual.html rename to tests/wpt/tests/html/links/manifest/mime-type-invalid-manual.html diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-invalid.webmanifest b/tests/wpt/tests/html/links/manifest/mime-type-invalid.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-invalid.webmanifest rename to tests/wpt/tests/html/links/manifest/mime-type-invalid.webmanifest diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-invalid.webmanifest.headers b/tests/wpt/tests/html/links/manifest/mime-type-invalid.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-invalid.webmanifest.headers rename to tests/wpt/tests/html/links/manifest/mime-type-invalid.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-none-manual.html b/tests/wpt/tests/html/links/manifest/mime-type-none-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-none-manual.html rename to tests/wpt/tests/html/links/manifest/mime-type-none-manual.html diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-none.webmanifest b/tests/wpt/tests/html/links/manifest/mime-type-none.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-none.webmanifest rename to tests/wpt/tests/html/links/manifest/mime-type-none.webmanifest diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-none.webmanifest.headers b/tests/wpt/tests/html/links/manifest/mime-type-none.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-none.webmanifest.headers rename to tests/wpt/tests/html/links/manifest/mime-type-none.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-text-json-manual.html b/tests/wpt/tests/html/links/manifest/mime-type-text-json-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-text-json-manual.html rename to tests/wpt/tests/html/links/manifest/mime-type-text-json-manual.html diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-text-json.webmanifest b/tests/wpt/tests/html/links/manifest/mime-type-text-json.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-text-json.webmanifest rename to tests/wpt/tests/html/links/manifest/mime-type-text-json.webmanifest diff --git a/tests/wpt/web-platform-tests/html/links/manifest/mime-type-text-json.webmanifest.headers b/tests/wpt/tests/html/links/manifest/mime-type-text-json.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/mime-type-text-json.webmanifest.headers rename to tests/wpt/tests/html/links/manifest/mime-type-text-json.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/html/links/manifest/no-manifest-from-iframe-manual.html b/tests/wpt/tests/html/links/manifest/no-manifest-from-iframe-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/no-manifest-from-iframe-manual.html rename to tests/wpt/tests/html/links/manifest/no-manifest-from-iframe-manual.html diff --git a/tests/wpt/web-platform-tests/html/links/manifest/wrong-mime-type-text-plain-manual.html b/tests/wpt/tests/html/links/manifest/wrong-mime-type-text-plain-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/wrong-mime-type-text-plain-manual.html rename to tests/wpt/tests/html/links/manifest/wrong-mime-type-text-plain-manual.html diff --git a/tests/wpt/web-platform-tests/html/links/manifest/wrong-mime-type-text-plain.webmanifest b/tests/wpt/tests/html/links/manifest/wrong-mime-type-text-plain.webmanifest similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/wrong-mime-type-text-plain.webmanifest rename to tests/wpt/tests/html/links/manifest/wrong-mime-type-text-plain.webmanifest diff --git a/tests/wpt/web-platform-tests/html/links/manifest/wrong-mime-type-text-plain.webmanifest.headers b/tests/wpt/tests/html/links/manifest/wrong-mime-type-text-plain.webmanifest.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/links/manifest/wrong-mime-type-text-plain.webmanifest.headers rename to tests/wpt/tests/html/links/manifest/wrong-mime-type-text-plain.webmanifest.headers diff --git a/tests/wpt/web-platform-tests/html/obsolete/META.yml b/tests/wpt/tests/html/obsolete/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/META.yml rename to tests/wpt/tests/html/obsolete/META.yml diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-all.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-all.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-all.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-all.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-04.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-04.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-04.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-04.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/heading-obsolete-attributes-01.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/heading-obsolete-attributes-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/heading-obsolete-attributes-01.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/heading-obsolete-attributes-01.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/nothing.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/nothing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/nothing.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/nothing.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/original-id.json b/tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/original-id.json rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/original-id.json diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/crashtests/marquee-with-calc.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/crashtests/marquee-with-calc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/crashtests/marquee-with-calc.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/crashtests/marquee-with-calc.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/crashtests/marquee-with-table.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/crashtests/marquee-with-table.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/crashtests/marquee-with-table.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/crashtests/marquee-with-table.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-adopt-to-inactive-document-crash.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-adopt-to-inactive-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-adopt-to-inactive-document-crash.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-adopt-to-inactive-document-crash.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-down-manual.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-down-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-down-manual.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-down-manual.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-left-manual.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-left-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-left-manual.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-left-manual.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-right-manual.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-right-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-right-manual.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-right-manual.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-up-manual.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-up-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-up-manual.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-up-manual.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-events-historical.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-events-historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-events-historical.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-events-historical.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-loop.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-loop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-loop.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-loop.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-min-intrinsic-size-ref.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-min-intrinsic-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-min-intrinsic-size-ref.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-min-intrinsic-size-ref.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-min-intrinsic-size.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-min-intrinsic-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-min-intrinsic-size.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-min-intrinsic-size.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount-effect-manual.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount-effect-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount-effect-manual.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount-effect-manual.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrolldelay.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrolldelay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrolldelay.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrolldelay.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-start-manual.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-start-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-start-manual.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-start-manual.html diff --git a/tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-stop-manual.html b/tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-stop-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-stop-manual.html rename to tests/wpt/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-stop-manual.html diff --git a/tests/wpt/web-platform-tests/html/rendering/bindings/the-button-element/button-type-menu-historical-ref.html b/tests/wpt/tests/html/rendering/bindings/the-button-element/button-type-menu-historical-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/bindings/the-button-element/button-type-menu-historical-ref.html rename to tests/wpt/tests/html/rendering/bindings/the-button-element/button-type-menu-historical-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/bindings/the-button-element/button-type-menu-historical.html b/tests/wpt/tests/html/rendering/bindings/the-button-element/button-type-menu-historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/bindings/the-button-element/button-type-menu-historical.html rename to tests/wpt/tests/html/rendering/bindings/the-button-element/button-type-menu-historical.html diff --git a/tests/wpt/web-platform-tests/html/rendering/bindings/the-input-element-as-a-text-entry-widget/unrecognized-type-should-fallback-as-text-type-ref.html b/tests/wpt/tests/html/rendering/bindings/the-input-element-as-a-text-entry-widget/unrecognized-type-should-fallback-as-text-type-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/bindings/the-input-element-as-a-text-entry-widget/unrecognized-type-should-fallback-as-text-type-ref.html rename to tests/wpt/tests/html/rendering/bindings/the-input-element-as-a-text-entry-widget/unrecognized-type-should-fallback-as-text-type-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/bindings/the-input-element-as-a-text-entry-widget/unrecognized-type-should-fallback-as-text-type.html b/tests/wpt/tests/html/rendering/bindings/the-input-element-as-a-text-entry-widget/unrecognized-type-should-fallback-as-text-type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/bindings/the-input-element-as-a-text-entry-widget/unrecognized-type-should-fallback-as-text-type.html rename to tests/wpt/tests/html/rendering/bindings/the-input-element-as-a-text-entry-widget/unrecognized-type-should-fallback-as-text-type.html diff --git a/tests/wpt/web-platform-tests/html/rendering/bindings/the-select-element-0/option-label-ref.html b/tests/wpt/tests/html/rendering/bindings/the-select-element-0/option-label-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/bindings/the-select-element-0/option-label-ref.html rename to tests/wpt/tests/html/rendering/bindings/the-select-element-0/option-label-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/bindings/the-select-element-0/option-label.html b/tests/wpt/tests/html/rendering/bindings/the-select-element-0/option-label.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/bindings/the-select-element-0/option-label.html rename to tests/wpt/tests/html/rendering/bindings/the-select-element-0/option-label.html diff --git a/tests/wpt/web-platform-tests/html/rendering/bindings/the-textarea-element-0/cols-default.html b/tests/wpt/tests/html/rendering/bindings/the-textarea-element-0/cols-default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/bindings/the-textarea-element-0/cols-default.html rename to tests/wpt/tests/html/rendering/bindings/the-textarea-element-0/cols-default.html diff --git a/tests/wpt/web-platform-tests/html/rendering/bindings/the-textarea-element-0/cols-zero.html b/tests/wpt/tests/html/rendering/bindings/the-textarea-element-0/cols-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/bindings/the-textarea-element-0/cols-zero.html rename to tests/wpt/tests/html/rendering/bindings/the-textarea-element-0/cols-zero.html diff --git a/tests/wpt/web-platform-tests/html/rendering/bindings/the-textarea-element-0/rows-default.html b/tests/wpt/tests/html/rendering/bindings/the-textarea-element-0/rows-default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/bindings/the-textarea-element-0/rows-default.html rename to tests/wpt/tests/html/rendering/bindings/the-textarea-element-0/rows-default.html diff --git a/tests/wpt/web-platform-tests/html/rendering/bindings/the-textarea-element-0/rows-zero.html b/tests/wpt/tests/html/rendering/bindings/the-textarea-element-0/rows-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/bindings/the-textarea-element-0/rows-zero.html rename to tests/wpt/tests/html/rendering/bindings/the-textarea-element-0/rows-zero.html diff --git a/tests/wpt/web-platform-tests/html/rendering/bindings/the-textarea-element-0/textarea-ref.html b/tests/wpt/tests/html/rendering/bindings/the-textarea-element-0/textarea-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/bindings/the-textarea-element-0/textarea-ref.html rename to tests/wpt/tests/html/rendering/bindings/the-textarea-element-0/textarea-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/dimension-attributes.html b/tests/wpt/tests/html/rendering/dimension-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/dimension-attributes.html rename to tests/wpt/tests/html/rendering/dimension-attributes.html diff --git a/tests/wpt/web-platform-tests/html/rendering/interactive-media/links-forms-and-navigation/original-id.json b/tests/wpt/tests/html/rendering/interactive-media/links-forms-and-navigation/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/interactive-media/links-forms-and-navigation/original-id.json rename to tests/wpt/tests/html/rendering/interactive-media/links-forms-and-navigation/original-id.json diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/dialog-display.html b/tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/dialog-display.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/dialog-display.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/dialog-display.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/dialog.html b/tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/dialog.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/dialog.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/dialog.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/div-align.html b/tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/div-align.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/div-align.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/div-align.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/figure-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/figure-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/figure-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/figure-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/figure.html b/tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/figure.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/figure.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/figure.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/form-margin-quirk.html b/tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/form-margin-quirk.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/form-margin-quirk.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/form-margin-quirk.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/search-styles-iso-8859-8.html b/tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/search-styles-iso-8859-8.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/search-styles-iso-8859-8.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/search-styles-iso-8859-8.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/search-styles.html b/tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/search-styles.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/search-styles.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/search-styles.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/support/dialog-framed.html b/tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/support/dialog-framed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/support/dialog-framed.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/flow-content-0/support/dialog-framed.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/datetime-dynamic-type-change-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/datetime-dynamic-type-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/datetime-dynamic-type-change-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/datetime-dynamic-type-change-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/datetime-dynamic-type-change.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/datetime-dynamic-type-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/datetime-dynamic-type-change.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/datetime-dynamic-type-change.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/input-line-height-computed.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/input-line-height-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/input-line-height-computed.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/input-line-height-computed.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/input-line-height-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/input-line-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/input-line-height-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/input-line-height-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/input-line-height.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/input-line-height.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/input-line-height.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/input-line-height.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/input-placeholder-line-height-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/input-placeholder-line-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/input-placeholder-line-height-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/input-placeholder-line-height-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/input-placeholder-line-height.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/input-placeholder-line-height.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/input-placeholder-line-height.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/input-placeholder-line-height.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/placeholder-opacity-default.tentative.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/placeholder-opacity-default.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/placeholder-opacity-default.tentative.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/placeholder-opacity-default.tentative.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/resets.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/resets.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/resets.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/resets.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/select-fixedpos-crash.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/select-fixedpos-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/select-fixedpos-crash.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/select-fixedpos-crash.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/select-sizing-001-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/select-sizing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/select-sizing-001-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/select-sizing-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/select-sizing-001.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/select-sizing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/select-sizing-001.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/select-sizing-001.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/text-transform-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/text-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/text-transform-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/text-transform-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/text-transform.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/text-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/text-transform.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/text-transform.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/toggle-display-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/toggle-display-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/toggle-display-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/toggle-display-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/toggle-display.html b/tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/toggle-display.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/toggle-display.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/form-controls/toggle-display.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/hidden-elements.html b/tests/wpt/tests/html/rendering/non-replaced-elements/hidden-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/hidden-elements.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/hidden-elements.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/TODO-lists.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/TODO-lists.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/TODO-lists.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/TODO-lists.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/dir-type-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/dir-type-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/dir-type-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/dir-type-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/dir-type.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/dir-type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/dir-type.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/dir-type.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-text-align.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-text-align.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-text-align.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-text-align.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-supported-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-supported-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-supported-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-supported-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-supported-xhtml.xhtml b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-supported-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-supported-xhtml.xhtml rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-supported-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-supported.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-supported.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-supported.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-lower-alpha.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-lower-alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-lower-alpha.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-lower-alpha.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-lower-roman.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-lower-roman.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-lower-roman.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-lower-roman.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-upper-alpha.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-upper-alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-upper-alpha.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-upper-alpha.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-upper-roman.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-upper-roman.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-upper-roman.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/li-type-unsupported-upper-roman.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/lists-presentational-hints-ascii-case-insensitive.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/lists-presentational-hints-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/lists-presentational-hints-ascii-case-insensitive.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/lists-presentational-hints-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/lists-styles.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/lists-styles.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/lists-styles.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/lists-styles.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-display-contents-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-display-contents-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-display-contents-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-display-contents-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-start-display-contents.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-start-display-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-start-display-contents.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-start-display-contents.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-start-reversed-display-contents.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-start-reversed-display-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-start-reversed-display-contents.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-start-reversed-display-contents.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-supported-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-supported-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-supported-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-supported-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-supported-xhtml.xhtml b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-supported-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-supported-xhtml.xhtml rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-supported-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-supported.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-supported.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-supported.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-circle.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-circle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-circle.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-circle.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-disc.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-disc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-disc.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-disc.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-invalid.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-invalid.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-invalid.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-lower-alpha.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-lower-alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-lower-alpha.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-lower-alpha.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-lower-roman.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-lower-roman.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-lower-roman.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-lower-roman.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-none.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-none.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-none.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-none.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-round.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-round.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-round.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-round.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-square.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-square.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-square.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-square.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-upper-alpha.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-upper-alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-upper-alpha.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-upper-alpha.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-upper-roman.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-upper-roman.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-upper-roman.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ol-type-unsupported-upper-roman.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-supported-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-supported-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-supported-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-supported-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-supported-xhtml.xhtml b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-supported-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-supported-xhtml.xhtml rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-supported-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-supported.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-supported.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-supported.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-decimal.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-decimal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-decimal.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-decimal.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-invalid.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-invalid.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-invalid.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-lower-alpha.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-lower-alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-lower-alpha.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-lower-alpha.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-lower-roman.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-lower-roman.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-lower-roman.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-lower-roman.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-upper-alpha.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-upper-alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-upper-alpha.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-upper-alpha.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-upper-roman.html b/tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-upper-roman.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-upper-roman.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/lists/ul-type-unsupported-upper-roman.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/margin-collapsing-quirks/compare-computed-style.js b/tests/wpt/tests/html/rendering/non-replaced-elements/margin-collapsing-quirks/compare-computed-style.js similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/margin-collapsing-quirks/compare-computed-style.js rename to tests/wpt/tests/html/rendering/non-replaced-elements/margin-collapsing-quirks/compare-computed-style.js diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/margin-collapsing-quirks/multicol-quirks-mode.html b/tests/wpt/tests/html/rendering/non-replaced-elements/margin-collapsing-quirks/multicol-quirks-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/margin-collapsing-quirks/multicol-quirks-mode.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/margin-collapsing-quirks/multicol-quirks-mode.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/margin-collapsing-quirks/multicol-standards-mode.html b/tests/wpt/tests/html/rendering/non-replaced-elements/margin-collapsing-quirks/multicol-standards-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/margin-collapsing-quirks/multicol-standards-mode.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/margin-collapsing-quirks/multicol-standards-mode.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/br-wbr-content/content-property.tentative.html b/tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/br-wbr-content/content-property.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/br-wbr-content/content-property.tentative.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/br-wbr-content/content-property.tentative.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html b/tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html b/tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html b/tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml b/tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml rename to tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/font-face.html b/tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/font-face.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/font-face.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/font-face.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/font-size.html b/tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/font-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/font-size.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/font-size.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/sections-and-headings/headings-styles.html b/tests/wpt/tests/html/rendering/non-replaced-elements/sections-and-headings/headings-styles.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/sections-and-headings/headings-styles.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/sections-and-headings/headings-styles.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/colgroup_valign-ref.xhtml b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/colgroup_valign-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/colgroup_valign-ref.xhtml rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/colgroup_valign-ref.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/colgroup_valign_bottom.xhtml b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/colgroup_valign_bottom.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/colgroup_valign_bottom.xhtml rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/colgroup_valign_bottom.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/colgroup_valign_top.xhtml b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/colgroup_valign_top.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/colgroup_valign_top.xhtml rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/colgroup_valign_top.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/form-in-tables-xhtml.xhtml b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/form-in-tables-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/form-in-tables-xhtml.xhtml rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/form-in-tables-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/form-in-tables.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/form-in-tables.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/form-in-tables.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/form-in-tables.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/hidden-attr.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/hidden-attr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/hidden-attr.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/hidden-attr.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/resources/aqua-yellow-32x32.png b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/resources/aqua-yellow-32x32.png similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/resources/aqua-yellow-32x32.png rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/resources/aqua-yellow-32x32.png diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/resources/blue-16x20-green-16x20.png b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/resources/blue-16x20-green-16x20.png similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/resources/blue-16x20-green-16x20.png rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/resources/blue-16x20-green-16x20.png diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/resources/fuchsia-32x32.png b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/resources/fuchsia-32x32.png similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/resources/fuchsia-32x32.png rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/resources/fuchsia-32x32.png diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/resources/red-32x32.png b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/resources/red-32x32.png similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/resources/red-32x32.png rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/resources/red-32x32.png diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/resources/yellow-32x32.png b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/resources/yellow-32x32.png similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/resources/yellow-32x32.png rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/resources/yellow-32x32.png diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-attribute.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-attribute.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-attribute.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-background-print-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-background-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-background-print-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-background-print-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-background-print.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-background-print.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-background-print.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-background-print.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-1-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-1-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-1-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-1.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-1.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-1.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-2-notref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-2-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-2-notref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-2-notref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-2-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-2-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-2-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-2.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-2.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-2.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-3-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-3-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-3-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-3q.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-3q.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-3q.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-3q.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-3s.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-3s.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-3s.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-3s.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-presentational-hints-ascii-case-insensitive-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-presentational-hints-ascii-case-insensitive-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-presentational-hints-ascii-case-insensitive-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-presentational-hints-ascii-case-insensitive-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-presentational-hints-ascii-case-insensitive.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-presentational-hints-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-border-presentational-hints-ascii-case-insensitive.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-border-presentational-hints-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-bordercolor-001-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-bordercolor-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-bordercolor-001-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-bordercolor-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-bordercolor-001.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-bordercolor-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-bordercolor-001.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-bordercolor-001.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-cell-nowrap-with-fixed-width-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-cell-nowrap-with-fixed-width-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-cell-nowrap-with-fixed-width-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-cell-nowrap-with-fixed-width-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-cell-nowrap-with-fixed-width.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-cell-nowrap-with-fixed-width.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-cell-nowrap-with-fixed-width.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-cell-nowrap-with-fixed-width.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-cell-width-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-cell-width-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-cell-width-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-cell-width-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-cell-width-s.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-cell-width-s.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-cell-width-s.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-cell-width-s.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-cell-width.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-cell-width.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-cell-width.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-cell-width.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-column-width-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-column-width-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-column-width-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-column-width-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-column-width.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-column-width.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-column-width.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-column-width.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-direction-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-direction-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-direction-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-direction-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-direction.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-direction.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-direction.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-layout-notref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-layout-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-layout-notref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-layout-notref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-layout-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-layout-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-layout-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-layout-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-layout.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-layout.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-layout.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-direction-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-direction-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-direction-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-direction-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-direction.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-direction.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-direction.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-group-direction-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-group-direction-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-group-direction-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-group-direction-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-group-direction.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-group-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-group-direction.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-group-direction.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-group-height-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-group-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-group-height-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-group-height-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-group-height.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-group-height.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-group-height.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-group-height.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-height-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-height-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-height-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-height.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-height.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-height.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-height.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-001-print.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-pagination-002-print-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-002-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-pagination-002-print-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-002-print-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-pagination-002-print.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-002-print.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-row-pagination-002-print.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-row-pagination-002-print.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-ua-stylesheet.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-ua-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-ua-stylesheet.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-ua-stylesheet.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-valign-baseline-ascii-case-insensitive.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-valign-baseline-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-valign-baseline-ascii-case-insensitive.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-valign-baseline-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-vspace-hspace-s.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-vspace-hspace-s.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-vspace-hspace-s.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-vspace-hspace-s.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-vspace-hspace.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-vspace-hspace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-vspace-hspace.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-vspace-hspace.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-width-150percent-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-width-150percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-width-150percent-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-width-150percent-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-width-150percent.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-width-150percent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-width-150percent.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-width-150percent.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-width-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-width-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-width-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-width-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-width-s.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-width-s.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-width-s.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-width-s.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-width.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-width.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/table-width.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/table-width.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/tr-transform-and-will-change-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/tr-transform-and-will-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/tr-transform-and-will-change-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/tr-transform-and-will-change-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/tr-transform-and-will-change.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/tr-transform-and-will-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/tr-transform-and-will-change.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/tr-transform-and-will-change.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/transformed-tbody-tr-collapsed-border-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/transformed-tbody-tr-collapsed-border-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/transformed-tbody-tr-collapsed-border-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/transformed-tbody-tr-collapsed-border-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/transformed-tbody-tr-collapsed-border.html b/tests/wpt/tests/html/rendering/non-replaced-elements/tables/transformed-tbody-tr-collapsed-border.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/tables/transformed-tbody-tr-collapsed-border.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/tables/transformed-tbody-tr-collapsed-border.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/META.yml b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/META.yml rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/META.yml diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/absolute-fixed-in-legend-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/absolute-fixed-in-legend-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/absolute-fixed-in-legend-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/absolute-fixed-in-legend-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/absolute-fixed-in-legend.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/absolute-fixed-in-legend.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/absolute-fixed-in-legend.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/absolute-fixed-in-legend.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/empty-scrollable-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/empty-scrollable-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/empty-scrollable-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/empty-scrollable-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/empty-scrollable.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/empty-scrollable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/empty-scrollable.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/empty-scrollable.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-baseline-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-baseline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-baseline-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-baseline-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-baseline.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-baseline.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-baseline.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-block-formatting-context.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-block-formatting-context.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-block-formatting-context.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-block-formatting-context.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-block-size.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-block-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-block-size.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-block-size.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-negative-margin.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-negative-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-negative-margin.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-negative-margin.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-hittest.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-hittest.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-hittest.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-hittest.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-calculating-min-max-content.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-calculating-min-max-content.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-calculating-min-max-content.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-calculating-min-max-content.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-containing-block-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-containing-block-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-containing-block-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-containing-block-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-containing-block.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-containing-block.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-containing-block.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-containing-block.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-before-legend.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-before-legend.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-before-legend.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-before-legend.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-percentage-size.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-percentage-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-percentage-size.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-percentage-size.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-rtl-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-rtl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-rtl-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-rtl-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-rtl.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-rtl.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-rtl.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-crash.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-crash.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-crash.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-default-style.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-default-style.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-default-style.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-default-style.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-div-display-contents.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-div-display-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-div-display-contents.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-div-display-contents.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-baseline-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-baseline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-baseline-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-baseline-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-baseline.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-baseline.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-baseline.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-oof-container-crash.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-oof-container-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-oof-container-crash.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-oof-container-crash.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-pseudo-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-pseudo-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-pseudo-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-pseudo-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-pseudo.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-pseudo.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-pseudo.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-dynamic-pseudo.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-flexbox.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-flexbox.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-flexbox.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-flexbox.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-foo-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-foo-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-foo-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-foo-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-generated-content.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-generated-content.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-generated-content.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-generated-content.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-grid.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-grid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-grid.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-grid.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-list-item-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-list-item-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-list-item-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-list-item-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-list-item.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-list-item.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-list-item.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-list-item.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-hidden-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-hidden-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-hidden-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-hidden-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-hidden.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-hidden.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-hidden.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-painting-order-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-painting-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-painting-order-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-painting-order-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-painting-order.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-painting-order.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-painting-order.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-painting-order.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-percentage-block-size.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-percentage-block-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-percentage-block-size.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-percentage-block-size.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-percentage-padding.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-percentage-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-percentage-padding.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-percentage-padding.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-shadow-dom.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-shadow-dom.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-vertical-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-vertical-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-vertical-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-vertical-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-vertical.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-vertical.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-vertical.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/flex-legend-float-abspos.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/flex-legend-float-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/flex-legend-float-abspos.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/flex-legend-float-abspos.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/grid-template-propagation-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/grid-template-propagation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/grid-template-propagation-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/grid-template-propagation-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/grid-template-propagation.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/grid-template-propagation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/grid-template-propagation.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/grid-template-propagation.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/insert-legend-in-multicol-fieldset-crash.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/insert-legend-in-multicol-fieldset-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/insert-legend-in-multicol-fieldset-crash.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/insert-legend-in-multicol-fieldset-crash.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align-justify-self.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align-justify-self.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align-justify-self.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align-justify-self.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align-text-align.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align-text-align.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align-text-align.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align-text-align.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-auto-margins-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-auto-margins-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-auto-margins-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-auto-margins-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-auto-margins.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-auto-margins.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-auto-margins.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-auto-margins.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-formatting-context.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-formatting-context.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-formatting-context.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-formatting-context.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins-2-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins-2-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins-2-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins-2.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins-2.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins-2.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-position-centering.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-position-centering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-position-centering.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-position-centering.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-none-rendering-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-none-rendering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-none-rendering-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-none-rendering-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-none-rendering.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-none-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-none-rendering.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-none-rendering.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-none.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-none.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-none.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-rendering-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-rendering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-rendering-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-rendering-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-rendering.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-rendering.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display-rendering.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-dynamic-update.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-dynamic-update.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-dynamic-update.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-dynamic-update.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-float-abspos.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-float-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-float-abspos.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-float-abspos.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-float-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-float-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-float-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-float-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-float.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-float.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-float.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-float.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-grid-flex-multicol.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-grid-flex-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-grid-flex-multicol.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-grid-flex-multicol.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-hover.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-hover.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-hover.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-hover.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-in-slot-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-in-slot-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-in-slot-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-in-slot-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-in-slot.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-in-slot.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-in-slot.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-in-slot.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-inline-position-with-fieldset-padding.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-inline-position-with-fieldset-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-inline-position-with-fieldset-padding.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-inline-position-with-fieldset-padding.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item-numbering-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item-numbering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item-numbering-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item-numbering-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item-numbering.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item-numbering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item-numbering.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item-numbering.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-list-item.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-margin-inline.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-margin-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-margin-inline.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-margin-inline.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-painting-order-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-painting-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-painting-order-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-painting-order-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-painting-order.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-painting-order.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-painting-order.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-painting-order.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sans-fieldset-display.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sans-fieldset-display.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sans-fieldset-display.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sans-fieldset-display.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sticky-crash.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sticky-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sticky-crash.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sticky-crash.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-tall-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-tall-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-tall-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-tall-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-tall.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-tall.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-tall.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-tall.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/min-inline-size.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/min-inline-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/min-inline-size.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/min-inline-size.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/multicol-legend-becomes-floated-crash.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/multicol-legend-becomes-floated-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/multicol-legend-becomes-floated-crash.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/multicol-legend-becomes-floated-crash.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/no-red-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/no-red-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/no-red-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/no-red-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/resources/fieldset-vertical.css b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/resources/fieldset-vertical.css similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/resources/fieldset-vertical.css rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/resources/fieldset-vertical.css diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/second-legend-becomes-rendered-legend-crash.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/second-legend-becomes-rendered-legend-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/second-legend-becomes-rendered-legend-crash.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/second-legend-becomes-rendered-legend-crash.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-crash.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-crash.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-crash.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/different-writing-modes.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/different-writing-modes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/different-writing-modes.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/different-writing-modes.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/exceed-then-not-exceed.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/exceed-then-not-exceed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/exceed-then-not-exceed.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/exceed-then-not-exceed.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/frameset-visibility-hidden.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/frameset-visibility-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/frameset-visibility-hidden.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/frameset-visibility-hidden.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/multicol-table-crash.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/multicol-table-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/multicol-table-crash.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/multicol-table-crash.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/different-writing-modes-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/different-writing-modes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/different-writing-modes-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/different-writing-modes-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/empty-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/empty-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/empty-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/empty-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/green-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/green-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/green-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/green-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/green.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/green.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/green.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/green.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/red.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/red.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/red.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/red.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/align-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/align-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/align-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/align-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/align.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/align.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/align.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/align.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/color-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/color-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/color-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/color.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/color.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/color.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/color.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/hr.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/hr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/hr.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/hr.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/setting-overflow-visible.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/setting-overflow-visible.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/setting-overflow-visible.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/setting-overflow-visible.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/width-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/width-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/width-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/width-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/width.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/width.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-hr-element-0/width.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-hr-element-0/width.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1a.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1a.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1a.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1b.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1b.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1b.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1c.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1c.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1c.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1c.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1d.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1d.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1d.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1d.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1e.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1e.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1e.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1e.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1f.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1f.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1f.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1f.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1g.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1g.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1g.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1g.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1h.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1h.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1h.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1h.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1i.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1i.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1i.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1i.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1j.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1j.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1j.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1j.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1k.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1k.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1k.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1k.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1l.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1l.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-1l.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-1l.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2a.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2a.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2a.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2b.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2b.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2b.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2c.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2c.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2c.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2c.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2d.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2d.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2d.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2d.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2e.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2e.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2e.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2e.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2f.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2f.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2f.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2f.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2g.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2g.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2g.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2g.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2h.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2h.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2h.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2h.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2i.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2i.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2i.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2i.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2j.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2j.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2j.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2j.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2k.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2k.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2k.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2k.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2l.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2l.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body-margin-2l.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body-margin-2l.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body_link.xhtml b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body_link.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body_link.xhtml rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body_link.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body_text_00ffff-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body_text_00ffff-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body_text_00ffff-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body_text_00ffff-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body_text_00ffff.xhtml b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body_text_00ffff.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/body_text_00ffff.xhtml rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/body_text_00ffff.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/crashtests/body-huge-attr-value-crash.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/crashtests/body-huge-attr-value-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/crashtests/body-huge-attr-value-crash.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/crashtests/body-huge-attr-value-crash.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/iframe-body-margin-attributes.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/iframe-body-margin-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/iframe-body-margin-attributes.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/iframe-body-margin-attributes.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/iframe-marginwidth-marginheight.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/iframe-marginwidth-marginheight.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/iframe-marginwidth-marginheight.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/iframe-marginwidth-marginheight.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values-ref.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values-ref.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/support/big-page.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/support/big-page.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/support/big-page.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/support/big-page.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/support/body-marginwidth-marginheight.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/support/body-marginwidth-marginheight.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/support/body-marginwidth-marginheight.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/support/body-marginwidth-marginheight.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/support/body-topmargin-leftmargin.html b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/support/body-topmargin-leftmargin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/support/body-topmargin-leftmargin.html rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/support/body-topmargin-leftmargin.html diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/test-body.xhtml b/tests/wpt/tests/html/rendering/non-replaced-elements/the-page/test-body.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-page/test-body.xhtml rename to tests/wpt/tests/html/rendering/non-replaced-elements/the-page/test-body.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/pixel-length-attributes.html b/tests/wpt/tests/html/rendering/pixel-length-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/pixel-length-attributes.html rename to tests/wpt/tests/html/rendering/pixel-length-attributes.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/align.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/align.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/align.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/align.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/canvas-aspect-ratio.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/canvas-aspect-ratio.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/canvas-aspect-ratio.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/canvas-aspect-ratio.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/content-aspect-ratio.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/content-aspect-ratio.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/content-aspect-ratio.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/content-aspect-ratio.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/embedded-and-images-presentational-hints-ascii-case-insensitive.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/embedded-and-images-presentational-hints-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/embedded-and-images-presentational-hints-ascii-case-insensitive.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/embedded-and-images-presentational-hints-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-alt-crash-001.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-alt-crash-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-alt-crash-001.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-alt-crash-001.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-lazy.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-lazy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-lazy.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-lazy.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-dim-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-dim-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-dim-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-dim-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-dim.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-dim.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-dim.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-dim.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-empty-alt-replaced.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-empty-alt-replaced.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-empty-alt-replaced.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-empty-alt-replaced.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-no-alt-replaced.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-no-alt-replaced.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-no-alt-replaced.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-no-alt-replaced.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-replaced-box-while-loading.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-replaced-box-while-loading.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-replaced-box-while-loading.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-replaced-box-while-loading.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-title-only-w-sizing.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-title-only-w-sizing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-title-only-w-sizing.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-title-only-w-sizing.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border-ref.xhtml b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border-ref.xhtml rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border-ref.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border_percent.xhtml b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border_percent.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border_percent.xhtml rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border_percent.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-align-right-1.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-align-right-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-align-right-1.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-align-right-1.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-align-right-2.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-align-right-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-align-right-2.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-align-right-2.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-align-right-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-align-right-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-align-right-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-align-right-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-image-content-crash.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-image-content-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-image-content-crash.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-image-content-crash.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-image-inline-alt-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-image-inline-alt-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-image-inline-alt-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-image-inline-alt-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-image-inline-alt.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-image-inline-alt.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-image-inline-alt.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-image-inline-alt.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-type-change-from-image-1-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-type-change-from-image-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-type-change-from-image-1-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-type-change-from-image-1-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-type-change-from-image-1.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-type-change-from-image-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-type-change-from-image-1.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/input-type-change-from-image-1.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/number-placeholder-right-aligned-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/number-placeholder-right-aligned-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/number-placeholder-right-aligned-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/number-placeholder-right-aligned-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/number-placeholder-right-aligned.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/number-placeholder-right-aligned.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/number-placeholder-right-aligned.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/number-placeholder-right-aligned.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border-ref.xhtml b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border-ref.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border-ref.xhtml rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border-ref.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border_perc.xhtml b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border_perc.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border_perc.xhtml rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border_perc.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border_pixel.xhtml b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border_pixel.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border_pixel.xhtml rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border_pixel.xhtml diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/resources/aspect-ratio.js b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/resources/aspect-ratio.js similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/resources/aspect-ratio.js rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/resources/aspect-ratio.js diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-aspect-ratio.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-aspect-ratio.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-aspect-ratio.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-aspect-ratio.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-intrinsic-width-height.html b/tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-intrinsic-width-height.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-intrinsic-width-height.html rename to tests/wpt/tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-intrinsic-width-height.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/audio-controls-001.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/audio-controls-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/audio-controls-001.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/audio-controls-001.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/audio-controls-002.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/audio-controls-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/audio-controls-002.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/audio-controls-002.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/audio-without-controls.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/audio-without-controls.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/audio-without-controls.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/audio-without-controls.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-fallback-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-fallback-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-fallback-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-fallback-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-fallback.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-fallback.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-fallback.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-update-with-border-object-fit-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-update-with-border-object-fit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-update-with-border-object-fit-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-update-with-border-object-fit-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-update-with-border-object-fit.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-update-with-border-object-fit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-update-with-border-object-fit.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas-update-with-border-object-fit.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale_ref.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale_ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale_ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_scale_ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_ref.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/audio-controls-intrinsic-size.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content/audio-controls-intrinsic-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/audio-controls-intrinsic-size.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content/audio-controls-intrinsic-size.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/change-src-while-not-displayed-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content/change-src-while-not-displayed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/change-src-while-not-displayed-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content/change-src-while-not-displayed-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/change-src-while-not-displayed.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content/change-src-while-not-displayed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/change-src-while-not-displayed.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content/change-src-while-not-displayed.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe-in-multicol.sub-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe-in-multicol.sub-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe-in-multicol.sub-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe-in-multicol.sub-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe-in-multicol.sub.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe-in-multicol.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe-in-multicol.sub.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe-in-multicol.sub.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe.sub-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe.sub-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe.sub-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe.sub-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe.sub.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe.sub.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content/cross-domain-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/object-fallback-text-decoration-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content/object-fallback-text-decoration-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/object-fallback-text-decoration-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content/object-fallback-text-decoration-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/object-fallback-text-decoration.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content/object-fallback-text-decoration.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/object-fallback-text-decoration.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content/object-fallback-text-decoration.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/resources/tall.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content/resources/tall.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/resources/tall.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content/resources/tall.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/tall-cross-domain-iframe-in-scrolled.sub-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content/tall-cross-domain-iframe-in-scrolled.sub-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/tall-cross-domain-iframe-in-scrolled.sub-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content/tall-cross-domain-iframe-in-scrolled.sub-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/tall-cross-domain-iframe-in-scrolled.sub.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content/tall-cross-domain-iframe-in-scrolled.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/tall-cross-domain-iframe-in-scrolled.sub.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content/tall-cross-domain-iframe-in-scrolled.sub.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode.html b/tests/wpt/tests/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode.html rename to tests/wpt/tests/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/blocked-by-csp-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/images/blocked-by-csp-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/blocked-by-csp-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/images/blocked-by-csp-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/blocked-by-csp.html b/tests/wpt/tests/html/rendering/replaced-elements/images/blocked-by-csp.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/blocked-by-csp.html rename to tests/wpt/tests/html/rendering/replaced-elements/images/blocked-by-csp.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/input-image-content-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/images/input-image-content-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/input-image-content-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/images/input-image-content-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/input-image-content.html b/tests/wpt/tests/html/rendering/replaced-elements/images/input-image-content.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/input-image-content.html rename to tests/wpt/tests/html/rendering/replaced-elements/images/input-image-content.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/revoked-blob-print-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/images/revoked-blob-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/revoked-blob-print-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/images/revoked-blob-print-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/revoked-blob-print.html b/tests/wpt/tests/html/rendering/replaced-elements/images/revoked-blob-print.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/revoked-blob-print.html rename to tests/wpt/tests/html/rendering/replaced-elements/images/revoked-blob-print.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/space-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/images/space-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/space-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/images/space-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/space.html b/tests/wpt/tests/html/rendering/replaced-elements/images/space.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/images/space.html rename to tests/wpt/tests/html/rendering/replaced-elements/images/space.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/resources/svg-sizing.js b/tests/wpt/tests/html/rendering/replaced-elements/resources/svg-sizing.js similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/resources/svg-sizing.js rename to tests/wpt/tests/html/rendering/replaced-elements/resources/svg-sizing.js diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-embedded-sizing.js b/tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-embedded-sizing.js similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-embedded-sizing.js rename to tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-embedded-sizing.js diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-auto.html b/tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-auto.html rename to tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-auto.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-fixed.html b/tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-fixed.html rename to tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-fixed.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-percentage.html b/tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-percentage.html rename to tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-percentage.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-auto.html b/tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-auto.html rename to tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-auto.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-fixed.html b/tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-fixed.html rename to tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-fixed.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-percentage.html b/tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-percentage.html rename to tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-percentage.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-auto.html b/tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-auto.html rename to tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-auto.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-fixed.html b/tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-fixed.html rename to tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-fixed.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html b/tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html rename to tests/wpt/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html b/tests/wpt/tests/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html rename to tests/wpt/tests/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.js b/tests/wpt/tests/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.js similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.js rename to tests/wpt/tests/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.js diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-option-element/option-with-br-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/the-option-element/option-with-br-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-option-element/option-with-br-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-option-element/option-with-br-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-option-element/option-with-br.html b/tests/wpt/tests/html/rendering/replaced-elements/the-option-element/option-with-br.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-option-element/option-with-br.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-option-element/option-with-br.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-option-element/select-multiple-covered-by-abspos-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/the-option-element/select-multiple-covered-by-abspos-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-option-element/select-multiple-covered-by-abspos-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-option-element/select-multiple-covered-by-abspos-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-option-element/select-multiple-covered-by-abspos.html b/tests/wpt/tests/html/rendering/replaced-elements/the-option-element/select-multiple-covered-by-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-option-element/select-multiple-covered-by-abspos.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-option-element/select-multiple-covered-by-abspos.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-001-ref-2.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-001-ref-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-001-ref-2.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-001-ref-2.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-001-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-001-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-001.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-001.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-001.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-1-block-size-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-1-block-size.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-1-block-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-1-block-size.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-1-block-size.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-1-line-height-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-1-line-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-1-line-height-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-1-line-height-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-1-line-height.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-1-line-height.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-1-line-height.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-1-line-height.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-empty-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-empty-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-empty-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-empty-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-empty.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-empty.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-empty.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-option-font-size-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-option-font-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-option-font-size-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-option-font-size-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-option-font-size.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-option-font-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-option-font-size.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-option-font-size.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-text-transform-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-text-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-text-transform-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-text-transform-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-text-transform.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-text-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-text-transform.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-intrinsic-text-transform.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-multiple-re-add-option-via-document-fragment-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-multiple-re-add-option-via-document-fragment-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-multiple-re-add-option-via-document-fragment-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-multiple-re-add-option-via-document-fragment-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-multiple-re-add-option-via-document-fragment.html b/tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-multiple-re-add-option-via-document-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-select-element/select-multiple-re-add-option-via-document-fragment.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-select-element/select-multiple-re-add-option-via-document-fragment.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bend-overlaps-content-001-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bend-overlaps-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bend-overlaps-content-001-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bend-overlaps-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bend-overlaps-content-001.tentative.html b/tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bend-overlaps-content-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bend-overlaps-content-001.tentative.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bend-overlaps-content-001.tentative.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bstart-moves-content-001-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bstart-moves-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bstart-moves-content-001-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bstart-moves-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bstart-moves-content-001.tentative.html b/tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bstart-moves-content-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bstart-moves-content-001.tentative.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-bstart-moves-content-001.tentative.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-iend-overlaps-content-001-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-iend-overlaps-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-iend-overlaps-content-001-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-iend-overlaps-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-iend-overlaps-content-001.tentative.html b/tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-iend-overlaps-content-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-iend-overlaps-content-001.tentative.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-iend-overlaps-content-001.tentative.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-istart-moves-content-001-ref.html b/tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-istart-moves-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-istart-moves-content-001-ref.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-istart-moves-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-istart-moves-content-001.tentative.html b/tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-istart-moves-content-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-istart-moves-content-001.tentative.html rename to tests/wpt/tests/html/rendering/replaced-elements/the-textarea-element/textarea-padding-istart-moves-content-001.tentative.html diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/tools/gen-svgsizing-tests.py b/tests/wpt/tests/html/rendering/replaced-elements/tools/gen-svgsizing-tests.py similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/replaced-elements/tools/gen-svgsizing-tests.py rename to tests/wpt/tests/html/rendering/replaced-elements/tools/gen-svgsizing-tests.py diff --git a/tests/wpt/web-platform-tests/html/rendering/support/test-ua-stylesheet.js b/tests/wpt/tests/html/rendering/support/test-ua-stylesheet.js similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/support/test-ua-stylesheet.js rename to tests/wpt/tests/html/rendering/support/test-ua-stylesheet.js diff --git a/tests/wpt/web-platform-tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/body-bgcolor-attribute-change-ref.html b/tests/wpt/tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/body-bgcolor-attribute-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/body-bgcolor-attribute-change-ref.html rename to tests/wpt/tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/body-bgcolor-attribute-change-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/body-bgcolor-attribute-change.html b/tests/wpt/tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/body-bgcolor-attribute-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/body-bgcolor-attribute-change.html rename to tests/wpt/tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/body-bgcolor-attribute-change.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/mouse-cursor-imagemap.html b/tests/wpt/tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/mouse-cursor-imagemap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/mouse-cursor-imagemap.html rename to tests/wpt/tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/mouse-cursor-imagemap.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/no-help-cursor-on-links.historical.html b/tests/wpt/tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/no-help-cursor-on-links.historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/no-help-cursor-on-links.historical.html rename to tests/wpt/tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/no-help-cursor-on-links.historical.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-after.html b/tests/wpt/tests/html/rendering/the-details-element/details-after.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/details-after.html rename to tests/wpt/tests/html/rendering/the-details-element/details-after.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-before.html b/tests/wpt/tests/html/rendering/the-details-element/details-before.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/details-before.html rename to tests/wpt/tests/html/rendering/the-details-element/details-before.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-blockification.html b/tests/wpt/tests/html/rendering/the-details-element/details-blockification.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/details-blockification.html rename to tests/wpt/tests/html/rendering/the-details-element/details-blockification.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-display-property-is-ignored-ref.html b/tests/wpt/tests/html/rendering/the-details-element/details-display-property-is-ignored-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/details-display-property-is-ignored-ref.html rename to tests/wpt/tests/html/rendering/the-details-element/details-display-property-is-ignored-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-display-property-is-ignored.html b/tests/wpt/tests/html/rendering/the-details-element/details-display-property-is-ignored.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/details-display-property-is-ignored.html rename to tests/wpt/tests/html/rendering/the-details-element/details-display-property-is-ignored.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-page-break-after-1-print.html b/tests/wpt/tests/html/rendering/the-details-element/details-page-break-after-1-print.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/details-page-break-after-1-print.html rename to tests/wpt/tests/html/rendering/the-details-element/details-page-break-after-1-print.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-page-break-after-2-print.html b/tests/wpt/tests/html/rendering/the-details-element/details-page-break-after-2-print.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/details-page-break-after-2-print.html rename to tests/wpt/tests/html/rendering/the-details-element/details-page-break-after-2-print.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-page-break-before-1-print.html b/tests/wpt/tests/html/rendering/the-details-element/details-page-break-before-1-print.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/details-page-break-before-1-print.html rename to tests/wpt/tests/html/rendering/the-details-element/details-page-break-before-1-print.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-page-break-before-2-print.html b/tests/wpt/tests/html/rendering/the-details-element/details-page-break-before-2-print.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/details-page-break-before-2-print.html rename to tests/wpt/tests/html/rendering/the-details-element/details-page-break-before-2-print.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-revert-ref.html b/tests/wpt/tests/html/rendering/the-details-element/details-revert-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/details-revert-ref.html rename to tests/wpt/tests/html/rendering/the-details-element/details-revert-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-revert.html b/tests/wpt/tests/html/rendering/the-details-element/details-revert.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/details-revert.html rename to tests/wpt/tests/html/rendering/the-details-element/details-revert.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/details-two-pages-print-ref.html b/tests/wpt/tests/html/rendering/the-details-element/details-two-pages-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/details-two-pages-print-ref.html rename to tests/wpt/tests/html/rendering/the-details-element/details-two-pages-print-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/empty-crash.html b/tests/wpt/tests/html/rendering/the-details-element/empty-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/empty-crash.html rename to tests/wpt/tests/html/rendering/the-details-element/empty-crash.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/single-summary.html b/tests/wpt/tests/html/rendering/the-details-element/single-summary.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/single-summary.html rename to tests/wpt/tests/html/rendering/the-details-element/single-summary.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-flex-ref.html b/tests/wpt/tests/html/rendering/the-details-element/summary-display-flex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-flex-ref.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-display-flex-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-flex.html b/tests/wpt/tests/html/rendering/the-details-element/summary-display-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-flex.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-display-flex.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-grid-ref.html b/tests/wpt/tests/html/rendering/the-details-element/summary-display-grid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-grid-ref.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-display-grid-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-grid.html b/tests/wpt/tests/html/rendering/the-details-element/summary-display-grid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-grid.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-display-grid.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-inline-flex-ref.html b/tests/wpt/tests/html/rendering/the-details-element/summary-display-inline-flex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-inline-flex-ref.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-display-inline-flex-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-inline-flex.html b/tests/wpt/tests/html/rendering/the-details-element/summary-display-inline-flex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-inline-flex.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-display-inline-flex.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-inline-grid-ref.html b/tests/wpt/tests/html/rendering/the-details-element/summary-display-inline-grid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-inline-grid-ref.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-display-inline-grid-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-inline-grid.html b/tests/wpt/tests/html/rendering/the-details-element/summary-display-inline-grid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-inline-grid.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-display-inline-grid.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-list-item-001-ref.html b/tests/wpt/tests/html/rendering/the-details-element/summary-display-list-item-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-list-item-001-ref.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-display-list-item-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-list-item-001.html b/tests/wpt/tests/html/rendering/the-details-element/summary-display-list-item-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-list-item-001.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-display-list-item-001.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-list-item-002-ref.html b/tests/wpt/tests/html/rendering/the-details-element/summary-display-list-item-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-list-item-002-ref.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-display-list-item-002-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-list-item-002.html b/tests/wpt/tests/html/rendering/the-details-element/summary-display-list-item-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-display-list-item-002.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-display-list-item-002.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-in-ol-ref.html b/tests/wpt/tests/html/rendering/the-details-element/summary-in-ol-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-in-ol-ref.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-in-ol-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-in-ol.html b/tests/wpt/tests/html/rendering/the-details-element/summary-in-ol.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-in-ol.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-in-ol.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-text-decoration-ref.html b/tests/wpt/tests/html/rendering/the-details-element/summary-text-decoration-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-text-decoration-ref.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-text-decoration-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-text-decoration.html b/tests/wpt/tests/html/rendering/the-details-element/summary-text-decoration.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/summary-text-decoration.html rename to tests/wpt/tests/html/rendering/the-details-element/summary-text-decoration.html diff --git a/tests/wpt/web-platform-tests/html/rendering/the-details-element/two-summaries-removal-crash.html b/tests/wpt/tests/html/rendering/the-details-element/two-summaries-removal-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/the-details-element/two-summaries-removal-crash.html rename to tests/wpt/tests/html/rendering/the-details-element/two-summaries-removal-crash.html diff --git a/tests/wpt/web-platform-tests/html/rendering/unmapped-attributes.html b/tests/wpt/tests/html/rendering/unmapped-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/unmapped-attributes.html rename to tests/wpt/tests/html/rendering/unmapped-attributes.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-animation-001.html b/tests/wpt/tests/html/rendering/widgets/appearance/appearance-animation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-animation-001.html rename to tests/wpt/tests/html/rendering/widgets/appearance/appearance-animation-001.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-animation-002-ref.html b/tests/wpt/tests/html/rendering/widgets/appearance/appearance-animation-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-animation-002-ref.html rename to tests/wpt/tests/html/rendering/widgets/appearance/appearance-animation-002-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-animation-002.html b/tests/wpt/tests/html/rendering/widgets/appearance/appearance-animation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-animation-002.html rename to tests/wpt/tests/html/rendering/widgets/appearance/appearance-animation-002.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-transition-001-ref.html b/tests/wpt/tests/html/rendering/widgets/appearance/appearance-transition-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-transition-001-ref.html rename to tests/wpt/tests/html/rendering/widgets/appearance/appearance-transition-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-transition-001.html b/tests/wpt/tests/html/rendering/widgets/appearance/appearance-transition-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-transition-001.html rename to tests/wpt/tests/html/rendering/widgets/appearance/appearance-transition-001.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-transition-002-ref.html b/tests/wpt/tests/html/rendering/widgets/appearance/appearance-transition-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-transition-002-ref.html rename to tests/wpt/tests/html/rendering/widgets/appearance/appearance-transition-002-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-transition-002.html b/tests/wpt/tests/html/rendering/widgets/appearance/appearance-transition-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-transition-002.html rename to tests/wpt/tests/html/rendering/widgets/appearance/appearance-transition-002.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-transition-003.html b/tests/wpt/tests/html/rendering/widgets/appearance/appearance-transition-003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/appearance/appearance-transition-003.html rename to tests/wpt/tests/html/rendering/widgets/appearance/appearance-transition-003.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/appearance/default-styles.html b/tests/wpt/tests/html/rendering/widgets/appearance/default-styles.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/appearance/default-styles.html rename to tests/wpt/tests/html/rendering/widgets/appearance/default-styles.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html b/tests/wpt/tests/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html rename to tests/wpt/tests/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/anonymous-button-content-box-ref.html b/tests/wpt/tests/html/rendering/widgets/button-layout/anonymous-button-content-box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/anonymous-button-content-box-ref.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/anonymous-button-content-box-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/anonymous-button-content-box.html b/tests/wpt/tests/html/rendering/widgets/button-layout/anonymous-button-content-box.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/anonymous-button-content-box.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/anonymous-button-content-box.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/computed-style.html b/tests/wpt/tests/html/rendering/widgets/button-layout/computed-style.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/computed-style.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/computed-style.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/display-other.html b/tests/wpt/tests/html/rendering/widgets/button-layout/display-other.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/display-other.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/display-other.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/flex.html b/tests/wpt/tests/html/rendering/widgets/button-layout/flex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/flex.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/flex.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/grid.html b/tests/wpt/tests/html/rendering/widgets/button-layout/grid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/grid.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/grid.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/inline-level-ref.html b/tests/wpt/tests/html/rendering/widgets/button-layout/inline-level-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/inline-level-ref.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/inline-level-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/inline-level.html b/tests/wpt/tests/html/rendering/widgets/button-layout/inline-level.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/inline-level.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/inline-level.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/input-type-button-newline-2-mismatch.html b/tests/wpt/tests/html/rendering/widgets/button-layout/input-type-button-newline-2-mismatch.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/input-type-button-newline-2-mismatch.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/input-type-button-newline-2-mismatch.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/input-type-button-newline-2.html b/tests/wpt/tests/html/rendering/widgets/button-layout/input-type-button-newline-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/input-type-button-newline-2.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/input-type-button-newline-2.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/input-type-button-newline-mismatch.html b/tests/wpt/tests/html/rendering/widgets/button-layout/input-type-button-newline-mismatch.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/input-type-button-newline-mismatch.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/input-type-button-newline-mismatch.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/input-type-button-newline.html b/tests/wpt/tests/html/rendering/widgets/button-layout/input-type-button-newline.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/input-type-button-newline.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/input-type-button-newline.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/propagate-text-decoration-ref.html b/tests/wpt/tests/html/rendering/widgets/button-layout/propagate-text-decoration-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/propagate-text-decoration-ref.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/propagate-text-decoration-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/propagate-text-decoration.html b/tests/wpt/tests/html/rendering/widgets/button-layout/propagate-text-decoration.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/propagate-text-decoration.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/propagate-text-decoration.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/shrink-wrap.html b/tests/wpt/tests/html/rendering/widgets/button-layout/shrink-wrap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/button-layout/shrink-wrap.html rename to tests/wpt/tests/html/rendering/widgets/button-layout/shrink-wrap.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-checkbox-disabled-checked-notref.html b/tests/wpt/tests/html/rendering/widgets/input-checkbox-disabled-checked-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-checkbox-disabled-checked-notref.html rename to tests/wpt/tests/html/rendering/widgets/input-checkbox-disabled-checked-notref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-checkbox-disabled-checked.html b/tests/wpt/tests/html/rendering/widgets/input-checkbox-disabled-checked.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-checkbox-disabled-checked.html rename to tests/wpt/tests/html/rendering/widgets/input-checkbox-disabled-checked.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-checkbox-no-centering.html b/tests/wpt/tests/html/rendering/widgets/input-checkbox-no-centering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-checkbox-no-centering.html rename to tests/wpt/tests/html/rendering/widgets/input-checkbox-no-centering.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-date-baseline-min-height-ref.html b/tests/wpt/tests/html/rendering/widgets/input-date-baseline-min-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-date-baseline-min-height-ref.html rename to tests/wpt/tests/html/rendering/widgets/input-date-baseline-min-height-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-date-baseline-min-height.html b/tests/wpt/tests/html/rendering/widgets/input-date-baseline-min-height.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-date-baseline-min-height.html rename to tests/wpt/tests/html/rendering/widgets/input-date-baseline-min-height.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-date-baseline-print.html b/tests/wpt/tests/html/rendering/widgets/input-date-baseline-print.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-date-baseline-print.html rename to tests/wpt/tests/html/rendering/widgets/input-date-baseline-print.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-date-baseline-ref.html b/tests/wpt/tests/html/rendering/widgets/input-date-baseline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-date-baseline-ref.html rename to tests/wpt/tests/html/rendering/widgets/input-date-baseline-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-date-baseline.html b/tests/wpt/tests/html/rendering/widgets/input-date-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-date-baseline.html rename to tests/wpt/tests/html/rendering/widgets/input-date-baseline.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-date-content-size-ref.html b/tests/wpt/tests/html/rendering/widgets/input-date-content-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-date-content-size-ref.html rename to tests/wpt/tests/html/rendering/widgets/input-date-content-size-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-date-content-size.html b/tests/wpt/tests/html/rendering/widgets/input-date-content-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-date-content-size.html rename to tests/wpt/tests/html/rendering/widgets/input-date-content-size.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-date-no-resize-on-hover.html b/tests/wpt/tests/html/rendering/widgets/input-date-no-resize-on-hover.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-date-no-resize-on-hover.html rename to tests/wpt/tests/html/rendering/widgets/input-date-no-resize-on-hover.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-no-centering-ref.html b/tests/wpt/tests/html/rendering/widgets/input-no-centering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-no-centering-ref.html rename to tests/wpt/tests/html/rendering/widgets/input-no-centering-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-radio-disabled-checked-notref.html b/tests/wpt/tests/html/rendering/widgets/input-radio-disabled-checked-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-radio-disabled-checked-notref.html rename to tests/wpt/tests/html/rendering/widgets/input-radio-disabled-checked-notref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-radio-disabled-checked.html b/tests/wpt/tests/html/rendering/widgets/input-radio-disabled-checked.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-radio-disabled-checked.html rename to tests/wpt/tests/html/rendering/widgets/input-radio-disabled-checked.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-radio-no-centering.html b/tests/wpt/tests/html/rendering/widgets/input-radio-no-centering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-radio-no-centering.html rename to tests/wpt/tests/html/rendering/widgets/input-radio-no-centering.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-time-content-size-ref.html b/tests/wpt/tests/html/rendering/widgets/input-time-content-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-time-content-size-ref.html rename to tests/wpt/tests/html/rendering/widgets/input-time-content-size-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/input-time-content-size.html b/tests/wpt/tests/html/rendering/widgets/input-time-content-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/input-time-content-size.html rename to tests/wpt/tests/html/rendering/widgets/input-time-content-size.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/select-wrap-no-spill.optional.html b/tests/wpt/tests/html/rendering/widgets/select-wrap-no-spill.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/select-wrap-no-spill.optional.html rename to tests/wpt/tests/html/rendering/widgets/select-wrap-no-spill.optional.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-add-label-quirks.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/option-add-label-quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-add-label-quirks.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/option-add-label-quirks.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-add-label.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/option-add-label.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-add-label.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/option-add-label.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-checked-styling-ref.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/option-checked-styling-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-checked-styling-ref.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/option-checked-styling-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-checked-styling.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/option-checked-styling.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-checked-styling.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/option-checked-styling.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-empty-label-to-empty-string.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/option-empty-label-to-empty-string.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-empty-label-to-empty-string.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/option-empty-label-to-empty-string.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-empty-label.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/option-empty-label.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-empty-label.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/option-empty-label.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-label-and-text.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/option-label-and-text.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-label-and-text.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/option-label-and-text.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-label-ref.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/option-label-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-label-ref.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/option-label-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-only-label.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/option-only-label.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-only-label.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/option-only-label.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-rm-label.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/option-rm-label.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/option-rm-label.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/option-rm-label.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/select-as-listbox-default-styles.tentative.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/select-as-listbox-default-styles.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/select-as-listbox-default-styles.tentative.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/select-as-listbox-default-styles.tentative.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/select-invalidation-ref.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/select-invalidation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/select-invalidation-ref.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/select-invalidation-ref.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/select-invalidation.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/select-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/select-invalidation.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/select-invalidation.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/select-size-001.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/select-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/select-size-001.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/select-size-001.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/select-size-002.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/select-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/select-size-002.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/select-size-002.html diff --git a/tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/select-size-ref.html b/tests/wpt/tests/html/rendering/widgets/the-select-element/select-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/rendering/widgets/the-select-element/select-size-ref.html rename to tests/wpt/tests/html/rendering/widgets/the-select-element/select-size-ref.html diff --git a/tests/wpt/web-platform-tests/html/resources/common.js b/tests/wpt/tests/html/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/resources/common.js rename to tests/wpt/tests/html/resources/common.js diff --git a/tests/wpt/web-platform-tests/html/scripting/the-script-element/attr-script-fetchpriority.html b/tests/wpt/tests/html/scripting/the-script-element/attr-script-fetchpriority.html similarity index 100% rename from tests/wpt/web-platform-tests/html/scripting/the-script-element/attr-script-fetchpriority.html rename to tests/wpt/tests/html/scripting/the-script-element/attr-script-fetchpriority.html diff --git a/tests/wpt/web-platform-tests/html/scripting/the-script-element/resources/script.js b/tests/wpt/tests/html/scripting/the-script-element/resources/script.js similarity index 100% rename from tests/wpt/web-platform-tests/html/scripting/the-script-element/resources/script.js rename to tests/wpt/tests/html/scripting/the-script-element/resources/script.js diff --git a/tests/wpt/web-platform-tests/html/select/options-length-too-large.html b/tests/wpt/tests/html/select/options-length-too-large.html similarity index 100% rename from tests/wpt/web-platform-tests/html/select/options-length-too-large.html rename to tests/wpt/tests/html/select/options-length-too-large.html diff --git a/tests/wpt/web-platform-tests/html/semantics/disabled-elements/disabled-event-dispatch.tentative.html b/tests/wpt/tests/html/semantics/disabled-elements/disabled-event-dispatch.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/disabled-elements/disabled-event-dispatch.tentative.html rename to tests/wpt/tests/html/semantics/disabled-elements/disabled-event-dispatch.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/disabled-elements/disabledElement.html b/tests/wpt/tests/html/semantics/disabled-elements/disabledElement.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/disabled-elements/disabledElement.html rename to tests/wpt/tests/html/semantics/disabled-elements/disabledElement.html diff --git a/tests/wpt/web-platform-tests/html/semantics/disabled-elements/event-propagate-disabled-keyboard.tentative.html b/tests/wpt/tests/html/semantics/disabled-elements/event-propagate-disabled-keyboard.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/disabled-elements/event-propagate-disabled-keyboard.tentative.html rename to tests/wpt/tests/html/semantics/disabled-elements/event-propagate-disabled-keyboard.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/disabled-elements/event-propagate-disabled.tentative.html b/tests/wpt/tests/html/semantics/disabled-elements/event-propagate-disabled.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/disabled-elements/event-propagate-disabled.tentative.html rename to tests/wpt/tests/html/semantics/disabled-elements/event-propagate-disabled.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/disabled-elements/fieldset-event-propagation.tentative.html b/tests/wpt/tests/html/semantics/disabled-elements/fieldset-event-propagation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/disabled-elements/fieldset-event-propagation.tentative.html rename to tests/wpt/tests/html/semantics/disabled-elements/fieldset-event-propagation.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/conditionally-block-rendering-on-link-media-attr.html b/tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/conditionally-block-rendering-on-link-media-attr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/conditionally-block-rendering-on-link-media-attr.html rename to tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/conditionally-block-rendering-on-link-media-attr.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/dynamic-render-blocking-link-stylesheet-does-not-block-script.html b/tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/dynamic-render-blocking-link-stylesheet-does-not-block-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/dynamic-render-blocking-link-stylesheet-does-not-block-script.html rename to tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/dynamic-render-blocking-link-stylesheet-does-not-block-script.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/dynamic-render-blocking-style-element-does-not-block-script.html b/tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/dynamic-render-blocking-style-element-does-not-block-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/dynamic-render-blocking-style-element-does-not-block-script.html rename to tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/dynamic-render-blocking-style-element-does-not-block-script.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/link-stylesheet-with-non-match-media-does-not-block-render.tentative.html b/tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/link-stylesheet-with-non-match-media-does-not-block-render.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/link-stylesheet-with-non-match-media-does-not-block-render.tentative.html rename to tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/link-stylesheet-with-non-match-media-does-not-block-render.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/script-created-link-stylesheet-does-not-block-script.html b/tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/script-created-link-stylesheet-does-not-block-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/script-created-link-stylesheet-does-not-block-script.html rename to tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/script-created-link-stylesheet-does-not-block-script.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/script-created-style-element-does-not-block-script.html b/tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/script-created-style-element-does-not-block-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/script-created-style-element-does-not-block-script.html rename to tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/script-created-style-element-does-not-block-script.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/style-element-media-match-block-script.html b/tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/style-element-media-match-block-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/style-element-media-match-block-script.html rename to tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/style-element-media-match-block-script.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/style-element-media-not-match-does-not-block-script.html b/tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/style-element-media-not-match-does-not-block-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/style-element-media-not-match-does-not-block-script.html rename to tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/style-element-media-not-match-does-not-block-script.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/stylesheet.py b/tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/stylesheet.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/stylesheet.py rename to tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/stylesheet.py diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/support/link-style.css b/tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/support/link-style.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/support/link-style.css rename to tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/support/link-style.css diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/support/utils.js b/tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/support/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/support/utils.js rename to tests/wpt/tests/html/semantics/document-metadata/interactions-of-styling-and-scripting/support/utils.js diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/styling/LinkStyle.html b/tests/wpt/tests/html/semantics/document-metadata/styling/LinkStyle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/styling/LinkStyle.html rename to tests/wpt/tests/html/semantics/document-metadata/styling/LinkStyle.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/styling/support/alternate.css b/tests/wpt/tests/html/semantics/document-metadata/styling/support/alternate.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/styling/support/alternate.css rename to tests/wpt/tests/html/semantics/document-metadata/styling/support/alternate.css diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/styling/support/emptytitle.css b/tests/wpt/tests/html/semantics/document-metadata/styling/support/emptytitle.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/styling/support/emptytitle.css rename to tests/wpt/tests/html/semantics/document-metadata/styling/support/emptytitle.css diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/styling/support/normal.css b/tests/wpt/tests/html/semantics/document-metadata/styling/support/normal.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/styling/support/normal.css rename to tests/wpt/tests/html/semantics/document-metadata/styling/support/normal.css diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/styling/support/notitle.css b/tests/wpt/tests/html/semantics/document-metadata/styling/support/notitle.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/styling/support/notitle.css rename to tests/wpt/tests/html/semantics/document-metadata/styling/support/notitle.css diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/styling/support/unmatch.css b/tests/wpt/tests/html/semantics/document-metadata/styling/support/unmatch.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/styling/support/unmatch.css rename to tests/wpt/tests/html/semantics/document-metadata/styling/support/unmatch.css diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_about_blank.html b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_about_blank.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_about_blank.html rename to tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_about_blank.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_href_empty.html b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_href_empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_href_empty.html rename to tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_href_empty.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_href_invalid.html b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_href_invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_href_invalid.html rename to tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_href_invalid.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_href_specified.html b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_href_specified.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_href_specified.html rename to tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_href_specified.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_href_unspecified.html b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_href_unspecified.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_href_unspecified.html rename to tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_href_unspecified.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_multiple.html b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_multiple.html rename to tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_multiple.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_srcdoc.html b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_srcdoc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_srcdoc.html rename to tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_srcdoc.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_target_does_not_affect_iframe_src_navigation.html b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_target_does_not_affect_iframe_src_navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_target_does_not_affect_iframe_src_navigation.html rename to tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_target_does_not_affect_iframe_src_navigation.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_target_does_not_affect_location_assignment.html b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_target_does_not_affect_location_assignment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/base_target_does_not_affect_location_assignment.html rename to tests/wpt/tests/html/semantics/document-metadata/the-base-element/base_target_does_not_affect_location_assignment.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/example.html b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/example.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/example.html rename to tests/wpt/tests/html/semantics/document-metadata/the-base-element/example.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/example2.html b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/example2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-base-element/example2.html rename to tests/wpt/tests/html/semantics/document-metadata/the-base-element/example2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/all b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/all similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/all rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/all diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/all.headers b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/all.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/all.headers rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/all.headers diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/document-without-browsing-context.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/document-without-browsing-context.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/document-without-browsing-context.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/document-without-browsing-context.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-error-fired-before-scripting-unblocked.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-error-fired-before-scripting-unblocked.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-error-fired-before-scripting-unblocked.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-error-fired-before-scripting-unblocked.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-load-error-events.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-load-error-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-load-error-events.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-load-error-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-load-error-events.https.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-load-error-events.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-load-error-events.https.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-load-error-events.https.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-load-event.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-load-event.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-load-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-load-fired-before-scripting-unblocked.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-load-fired-before-scripting-unblocked.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-load-fired-before-scripting-unblocked.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-load-fired-before-scripting-unblocked.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-error-events.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-multiple-error-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-error-events.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-multiple-error-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-load-events.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-multiple-load-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-load-events.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-multiple-load-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-rel-attribute-ascii-case-insensitive-notref.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-rel-attribute-ascii-case-insensitive-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-rel-attribute-ascii-case-insensitive-notref.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-rel-attribute-ascii-case-insensitive-notref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-rel-attribute-ascii-case-insensitive.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-rel-attribute-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-rel-attribute-ascii-case-insensitive.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-rel-attribute-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-rel-attribute.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-rel-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-rel-attribute.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-rel-attribute.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-rellist.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-rellist.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-rellist.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-rellist.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-style-error-01.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-style-error-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-style-error-01.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-style-error-01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-style-error-limited-quirks.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-style-error-limited-quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-style-error-limited-quirks.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-style-error-limited-quirks.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-style-error-quirks.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-style-error-quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-style-error-quirks.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-style-error-quirks.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-type-attribute-ref.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-type-attribute-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-type-attribute-ref.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-type-attribute-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-type-attribute.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-type-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-type-attribute.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/link-type-attribute.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/bad.css b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/bad.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/bad.css rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/bad.css diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/css.py b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/css.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/css.py rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/css.py diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/empty-href.css b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/empty-href.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/empty-href.css rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/empty-href.css diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/good.css b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/good.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/good.css rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/good.css diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/link-load-error-events.sub.js b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/link-load-error-events.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/link-load-error-events.sub.js rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/link-load-error-events.sub.js diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/link-rel-attribute.css b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/link-rel-attribute.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/link-rel-attribute.css rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/link-rel-attribute.css diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/link-style-error.js b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/link-style-error.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/link-style-error.js rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/link-style-error.js diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/neutral.css b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/neutral.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/neutral.css rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/neutral.css diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/stylesheet.css b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/stylesheet.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/resources/stylesheet.css rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/resources/stylesheet.css diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/style.css b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/style.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/style.css rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/style.css diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-change-href-ref.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-change-href-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-change-href-ref.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-change-href-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-change-href.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-change-href.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-change-href.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-change-href.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-empty-href-ref.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-empty-href-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-empty-href-ref.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-empty-href-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-empty-href.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-empty-href.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-empty-href.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-empty-href.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-media-ref.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-media-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-media-ref.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-media-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-media.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-media.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-media.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-media.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-not-removed-until-next-stylesheet-loads.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-not-removed-until-next-stylesheet-loads.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-not-removed-until-next-stylesheet-loads.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-not-removed-until-next-stylesheet-loads.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-with-base-ref.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-with-base-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-with-base-ref.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-with-base-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-with-base.html b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-with-base.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet-with-base.html rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet-with-base.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet.css b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet.css rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet.css diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet.py b/tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/stylesheet.py rename to tests/wpt/tests/html/semantics/document-metadata/the-link-element/stylesheet.py diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-attribute-changes.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-attribute-changes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-attribute-changes.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-attribute-changes.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-empty-content-value.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-empty-content-value.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-empty-content-value.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-empty-content-value.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-first-valid-applies.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-first-valid-applies.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-first-valid-applies.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-first-valid-applies.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-insert.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-insert.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-insert.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-insert.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-no-content-value.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-no-content-value.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-no-content-value.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-no-content-value.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-normal-descendant-change.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-normal-descendant-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-normal-descendant-change.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-normal-descendant-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-remove-head.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-remove-head.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-remove-head.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-remove-head.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-remove.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-remove.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-remove.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-single-value-in-body.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-single-value-in-body.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-single-value-in-body.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-single-value-in-body.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-single-value-in-head.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-single-value-in-head.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-single-value-in-head.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-single-value-in-head.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-single-value-in-shadow-tree.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-single-value-in-shadow-tree.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-single-value-in-shadow-tree.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/meta-color-scheme-single-value-in-shadow-tree.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/support/compute-root-color-scheme.js b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/support/compute-root-color-scheme.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/color-scheme/support/compute-root-color-scheme.js rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/color-scheme/support/compute-root-color-scheme.js diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/http-equiv-and-name-1.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/http-equiv-and-name-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/http-equiv-and-name-1.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/http-equiv-and-name-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/http-equiv-and-name-2.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/http-equiv-and-name-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/http-equiv-and-name-2.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/http-equiv-and-name-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-1.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-1.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-2.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-2.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/dynamic-append.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/dynamic-append.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/dynamic-append.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/dynamic-append.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/not-in-shadow-tree.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/not-in-shadow-tree.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/not-in-shadow-tree.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/not-in-shadow-tree.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/parsing.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/parsing.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/parsing.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/remove-from-document.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/remove-from-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/remove-from-document.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/remove-from-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/;url=foo b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/;url=foo similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/;url=foo rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/;url=foo diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/__dir__.headers b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/__dir__.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/__dir__.headers rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/__dir__.headers diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/foo b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/foo similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/foo rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/foo diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/foo'bar b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/foo'bar similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/foo'bar rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/foo'bar diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/refresh.py b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/refresh.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/refresh.py rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/refresh.py diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/refresh.sub.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/refresh.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/refresh.sub.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/refresh.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/ufoo b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/ufoo similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/ufoo rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/ufoo diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/urfoo b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/urfoo similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/urfoo rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/urfoo diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/url foo b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/url foo similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/url foo rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/url foo diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/urlfoo b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/urlfoo similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/urlfoo rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/urlfoo diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/x;url=foo b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/x;url=foo similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/x;url=foo rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/support/x;url=foo diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-lower.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-lower.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-lower.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-lower.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-message.js b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-message.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-message.js rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-message.js diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-mixed.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-mixed.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-mixed.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-other.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-other.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-other.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive-other.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/pragma-directives/http-equiv-enumerated-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/the-lang-attribute-012.html b/tests/wpt/tests/html/semantics/document-metadata/the-meta-element/the-lang-attribute-012.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-meta-element/the-lang-attribute-012.html rename to tests/wpt/tests/html/semantics/document-metadata/the-meta-element/the-lang-attribute-012.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/historical.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/historical.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/historical.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/html_style_in_comment-ref.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/html_style_in_comment-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/html_style_in_comment-ref.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/html_style_in_comment-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/html_style_in_comment.xhtml b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/html_style_in_comment.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/html_style_in_comment.xhtml rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/html_style_in_comment.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/mutations.window.js b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/mutations.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/mutations.window.js rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/mutations.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style-error-01.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/style-error-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style-error-01.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/style-error-01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style-load-after-mutate.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/style-load-after-mutate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style-load-after-mutate.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/style-load-after-mutate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_disabled.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_disabled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_disabled.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_disabled.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_events.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_events.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_load_async.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_load_async.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_load_async.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_load_async.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_load_event.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_load_event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_load_event.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_load_event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_media.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_media.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_media.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_media.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_media_change.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_media_change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_media_change.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_media_change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_non_matching_media.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_non_matching_media.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_non_matching_media.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_non_matching_media.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_type_change.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_type_change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_type_change.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_type_change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_type_html.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_type_html.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_type_html.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_type_html.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_type_svg.svg b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_type_svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/style_type_svg.svg rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/style_type_svg.svg diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/support/css-red.txt b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/support/css-red.txt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/support/css-red.txt rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/support/css-red.txt diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/update-style-block-ascii-case-insensitive-ref.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/update-style-block-ascii-case-insensitive-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/update-style-block-ascii-case-insensitive-ref.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/update-style-block-ascii-case-insensitive-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/update-style-block-ascii-case-insensitive.html b/tests/wpt/tests/html/semantics/document-metadata/the-style-element/update-style-block-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-style-element/update-style-block-ascii-case-insensitive.html rename to tests/wpt/tests/html/semantics/document-metadata/the-style-element/update-style-block-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-01.html b/tests/wpt/tests/html/semantics/document-metadata/the-title-element/title.text-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-01.html rename to tests/wpt/tests/html/semantics/document-metadata/the-title-element/title.text-01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-02.xhtml b/tests/wpt/tests/html/semantics/document-metadata/the-title-element/title.text-02.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-02.xhtml rename to tests/wpt/tests/html/semantics/document-metadata/the-title-element/title.text-02.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-03.html b/tests/wpt/tests/html/semantics/document-metadata/the-title-element/title.text-03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-03.html rename to tests/wpt/tests/html/semantics/document-metadata/the-title-element/title.text-03.html diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-04.xhtml b/tests/wpt/tests/html/semantics/document-metadata/the-title-element/title.text-04.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-04.xhtml rename to tests/wpt/tests/html/semantics/document-metadata/the-title-element/title.text-04.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/edits/the-del-element/del_effect.html b/tests/wpt/tests/html/semantics/edits/the-del-element/del_effect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/edits/the-del-element/del_effect.html rename to tests/wpt/tests/html/semantics/edits/the-del-element/del_effect.html diff --git a/tests/wpt/web-platform-tests/html/semantics/edits/the-ins-element/ins_effect.html b/tests/wpt/tests/html/semantics/edits/the-ins-element/ins_effect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/edits/the-ins-element/ins_effect.html rename to tests/wpt/tests/html/semantics/edits/the-ins-element/ins_effect.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/META.yml b/tests/wpt/tests/html/semantics/embedded-content/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/META.yml rename to tests/wpt/tests/html/semantics/embedded-content/META.yml diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/bfcache/embedded-html.html b/tests/wpt/tests/html/semantics/embedded-content/bfcache/embedded-html.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/bfcache/embedded-html.html rename to tests/wpt/tests/html/semantics/embedded-content/bfcache/embedded-html.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/bfcache/embedded-img.html b/tests/wpt/tests/html/semantics/embedded-content/bfcache/embedded-img.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/bfcache/embedded-img.html rename to tests/wpt/tests/html/semantics/embedded-content/bfcache/embedded-img.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/bfcache/embedded-js.html b/tests/wpt/tests/html/semantics/embedded-content/bfcache/embedded-js.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/bfcache/embedded-js.html rename to tests/wpt/tests/html/semantics/embedded-content/bfcache/embedded-js.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/bfcache/embedded-mp4.html b/tests/wpt/tests/html/semantics/embedded-content/bfcache/embedded-mp4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/bfcache/embedded-mp4.html rename to tests/wpt/tests/html/semantics/embedded-content/bfcache/embedded-mp4.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/bfcache/embedded-not-found.html b/tests/wpt/tests/html/semantics/embedded-content/bfcache/embedded-not-found.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/bfcache/embedded-not-found.html rename to tests/wpt/tests/html/semantics/embedded-content/bfcache/embedded-not-found.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/bfcache/embedded-type-only.html b/tests/wpt/tests/html/semantics/embedded-content/bfcache/embedded-type-only.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/bfcache/embedded-type-only.html rename to tests/wpt/tests/html/semantics/embedded-content/bfcache/embedded-type-only.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/bfcache/resources/common.js b/tests/wpt/tests/html/semantics/embedded-content/bfcache/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/bfcache/resources/common.js rename to tests/wpt/tests/html/semantics/embedded-content/bfcache/resources/common.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference-test-data.html b/tests/wpt/tests/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference-test-data.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference-test-data.html rename to tests/wpt/tests/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference-test-data.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html b/tests/wpt/tests/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html rename to tests/wpt/tests/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_controls_present-manual.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_controls_present-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_controls_present-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_controls_present-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_loop_base.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_loop_base.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_loop_base.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_loop_base.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_loop_seek_to_eos.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_loop_seek_to_eos.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_loop_seek_to_eos.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_loop_seek_to_eos.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_muted_overriding_volume-manual.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_muted_overriding_volume-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_muted_overriding_volume-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_muted_overriding_volume-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_muted_present-manual.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_muted_present-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_muted_present-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_muted_present-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_volume_check.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_volume_check.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_volume_check.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_volume_check.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_volume_loudest-manual.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_volume_loudest-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_volume_loudest-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_volume_loudest-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_volume_silent-manual.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_volume_silent-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/audio_volume_silent-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/audio_volume_silent-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute.https.sub.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute.https.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html.headers b/tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html.headers rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-default-feature-policy.https.sub.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-default-feature-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-default-feature-policy.https.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-default-feature-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html.headers b/tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html.headers rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-supported-by-feature-policy.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-supported-by-feature-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-supported-by-feature-policy.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-supported-by-feature-policy.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-with-broken-track.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-with-broken-track.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/autoplay-with-broken-track.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/autoplay-with-broken-track.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/controlsList.tentative.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/controlsList.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/controlsList.tentative.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/controlsList.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/error-codes/error.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/error-codes/error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/error-codes/error.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/error-codes/error.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_canplay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_canplay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_canplaythrough.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_canplaythrough.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_loadeddata.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_loadeddata.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadedmetadata.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_loadedmetadata.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadedmetadata.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_loadedmetadata.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadstart.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_loadstart.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadstart.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_loadstart.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadstart_noautoplay.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_loadstart_noautoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadstart_noautoplay.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_loadstart_noautoplay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_pause.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_pause.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_pause.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_pause.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_play.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_play.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_play.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_play.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_play_noautoplay.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_play_noautoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_play_noautoplay.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_play_noautoplay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_playing.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_playing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_playing.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_playing.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_progress.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_progress.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_timeupdate.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_timeupdate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_timeupdate.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_timeupdate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_volumechange.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/event_volumechange.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_volumechange.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/event_volumechange.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/historical.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/historical.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/historical.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/addTextTrack.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/addTextTrack.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/addTextTrack.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/addTextTrack.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/crossOrigin.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/crossOrigin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/crossOrigin.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/crossOrigin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/textTracks.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/textTracks.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/textTracks.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/textTracks.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/default.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/default.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/default.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/kind.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/kind.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/kind.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/kind.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/label.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/label.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/label.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/label.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/readyState.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/readyState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/readyState.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/readyState.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/src.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/src.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/src.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/srclang.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/srclang.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/srclang.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/srclang.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/track.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/track.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/track.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/track.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/activeCues.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/activeCues.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/activeCues.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/activeCues.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/constants.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/constants.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/constants.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/constants.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/cues.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/cues.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/cues.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/cues.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/kind.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/kind.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/kind.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/kind.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/label.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/label.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/label.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/label.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/language.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/language.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/language.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/language.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/mode.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/mode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/mode.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/mode.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/oncuechange.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/oncuechange.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/oncuechange.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/oncuechange.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/removeCue.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/removeCue.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/removeCue.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrack/removeCue.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/constructor.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/constructor.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/constructor.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/endTime.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/endTime.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/endTime.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/endTime.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/id.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/id.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/id.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/id.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onenter.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onenter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onenter.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onenter.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onexit.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onexit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onexit.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onexit.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/pauseOnExit.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/pauseOnExit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/pauseOnExit.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/pauseOnExit.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/startTime.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/startTime.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/startTime.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/startTime.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/track.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/track.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/track.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/track.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getCueById.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getCueById.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getCueById.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getCueById.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getter.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getter.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getter.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/length.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/length.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/length.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/length.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getTrackById.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getTrackById.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getTrackById.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getTrackById.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getter.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getter.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getter.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/length.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/length.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/length.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/length.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onaddtrack.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onaddtrack.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onaddtrack.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onaddtrack.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onremovetrack.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onremovetrack.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onremovetrack.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onremovetrack.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/constructor.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/constructor.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/constructor.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/createEvent.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/createEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/createEvent.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/createEvent.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-removes-queued-error-event.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-removes-queued-error-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-removes-queued-error-event.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-removes-queued-error-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-moved.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-moved.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-moved.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-moved.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-addEventListener.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-addEventListener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-addEventListener.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-addEventListener.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-no-listener.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-no-listener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-no-listener.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-no-listener.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-onerror.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-onerror.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-onerror.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-onerror.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-currentSrc.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-currentSrc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-currentSrc.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-currentSrc.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor-no-src.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor-no-src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor-no-src.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor-no-src.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-in-sync-event.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-in-sync-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-in-sync-event.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-in-sync-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-fragment-into-document.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-fragment-into-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-fragment-into-document.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-fragment-into-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-document.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-document.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-iframe.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-iframe.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-parent-into-document.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-parent-into-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-parent-into-document.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-parent-into-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-in-div.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-in-div.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-in-div.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-in-div.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-in-namespace.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-in-namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-in-namespace.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-in-namespace.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-networkState.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-networkState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-networkState.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-networkState.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-load.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-load.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-load.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-play.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-play.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-play.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-play.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-in-namespace.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-in-namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-in-namespace.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-in-namespace.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-networkState.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-networkState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-networkState.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-networkState.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-not-in-document.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-not-in-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-not-in-document.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-not-in-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-control.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-control.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-control.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-control.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-br.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-br.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-br.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-br.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-source.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-source.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-source.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-source.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-text.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-text.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-text.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-text.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source-after.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source-after.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source-after.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source-after.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-text.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-text.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-text.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-text.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-source.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-source.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-source.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-source.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-src.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-src.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-src.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-resumes-onload.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-resumes-onload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-resumes-onload.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-resumes-onload.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media-env-change.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media-env-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media-env-change.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media-env-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resources/delayed-broken-video.py b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resources/delayed-broken-video.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resources/delayed-broken-video.py rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resources/delayed-broken-video.py diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resources/media-min-width.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resources/media-min-width.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resources/media-min-width.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resources/media-min-width.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-beforeunload-manual.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-beforeunload-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-beforeunload-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-beforeunload-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-dialogs-manual.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-dialogs-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-dialogs-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-dialogs-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-print-manual.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-print-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-print-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-print-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/media_fragment_seek.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/media_fragment_seek.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/media_fragment_seek.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/media_fragment_seek.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/networkState_during_loadstart.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/networkState_during_loadstart.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/networkState_during_loadstart.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/networkState_during_loadstart.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/networkState_initial.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/networkState_initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/networkState_initial.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/networkState_initial.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/currentTime.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/currentTime.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/currentTime.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/currentTime.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/duration.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/duration.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/duration.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/duration.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/paused_false_during_play.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/paused_false_during_play.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/paused_false_during_play.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/paused_false_during_play.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/paused_true_during_pause.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/paused_true_during_pause.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/paused_true_during_pause.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/paused_true_during_pause.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/pitch-detector.js b/tests/wpt/tests/html/semantics/embedded-content/media-elements/pitch-detector.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/pitch-detector.js rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/pitch-detector.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/loop-from-ended.tentative.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/loop-from-ended.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/loop-from-ended.tentative.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/loop-from-ended.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-different-load.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-different-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-different-load.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-different-load.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/play-in-detached-document.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/play-in-detached-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/play-in-detached-document.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/play-in-detached-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/playbackRate.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/playbackRate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/playbackRate.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/playing-the-media-resource/playbackRate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/preserves-pitch.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/preserves-pitch.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/preserves-pitch.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/preserves-pitch.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/ready-states/autoplay-hidden.optional.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/ready-states/autoplay-hidden.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/ready-states/autoplay-hidden.optional.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/ready-states/autoplay-hidden.optional.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/ready-states/autoplay-with-slow-text-tracks.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/ready-states/autoplay-with-slow-text-tracks.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/ready-states/autoplay-with-slow-text-tracks.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/ready-states/autoplay-with-slow-text-tracks.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/ready-states/autoplay.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/ready-states/autoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/ready-states/autoplay.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/ready-states/autoplay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_playing.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/readyState_during_playing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_during_playing.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/readyState_during_playing.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_initial.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/readyState_initial.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/readyState_initial.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/readyState_initial.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/seeking/seek-to-currentTime.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/seeking/seek-to-currentTime.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/seeking/seek-to-currentTime.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/seeking/seek-to-currentTime.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/seeking/seek-to-max-value.htm b/tests/wpt/tests/html/semantics/embedded-content/media-elements/seeking/seek-to-max-value.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/seeking/seek-to-max-value.htm rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/seeking/seek-to-max-value.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/seeking/seek-to-negative-time.htm b/tests/wpt/tests/html/semantics/embedded-content/media-elements/seeking/seek-to-negative-time.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/seeking/seek-to-negative-time.htm rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/seeking/seek-to-negative-time.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/src_object_blob.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/src_object_blob.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/src_object_blob.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/src_object_blob.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/src_reflects_attribute_not_source_elements.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/src_reflects_attribute_not_source_elements.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/src_reflects_attribute_not_source_elements.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/src_reflects_attribute_not_source_elements.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cloneNode.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cloneNode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cloneNode.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cloneNode.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/003.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/003.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/003.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/004.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/004.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/004.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/005.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/005.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/005.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/006.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/006.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/006.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/007.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/007.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/007.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/008.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/008.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/008.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/009.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/009.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/009.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/010.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/010.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/010.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/011.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/011.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/011.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/011.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/012.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/012.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/012.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/012.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/013.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/013.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/013.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/013.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/014.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/014.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/014.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/014.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/015.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/015.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/015.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/015.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/016.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/016.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/016.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/016.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/017.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/017.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/017.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/017.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/018.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/018.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/018.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/018.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/019.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/019.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/019.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/019.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/020.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/020.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/020.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/020.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/021.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/021.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/021.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/021.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/022.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/022.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/022.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/022.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/023.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/023.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/023.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/023.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/024.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/024.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/024.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/024.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/025.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/025.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/025.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/025.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/026.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/026.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/026.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/026.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/027.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/027.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/027.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/027.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/028.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/028.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/028.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/028.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/029.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/029.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/029.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/029.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/030.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/030.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/030.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/030.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/031.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/031.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/031.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/031.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/032.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/032.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/032.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/032.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/033.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/033.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/033.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/033.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/034.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/034.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/034.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/034.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/035.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/035.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/035.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/035.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/036.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/036.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/036.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/036.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/037.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/037.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/037.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/037.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/038.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/038.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/038.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/038.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/039.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/039.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/039.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/039.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/040.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/040.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/040.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/040.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/041.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/041.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/041.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/041.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/042.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/042.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/042.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/042.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/043.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/043.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/043.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/043.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/044.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/044.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/044.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/044.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/045.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/045.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/045.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/045.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/046.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/046.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/046.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/046.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/common.js b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/common.js rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/common.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/cors-tester.py b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/cors-tester.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/cors-tester.py rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/cors-tester.py diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/remove-cookie.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/remove-cookie.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/remove-cookie.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/remove-cookie.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/set-cookie.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/set-cookie.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/set-cookie.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/cors/support/set-cookie.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/crashtests/track-element-src-aborted-load-onerror-crash.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/crashtests/track-element-src-aborted-load-onerror-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/crashtests/track-element-src-aborted-load-onerror-crash.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/crashtests/track-element-src-aborted-load-onerror-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-positioning-bad.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-positioning-bad.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-positioning-bad.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-positioning-bad.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-positioning.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-positioning.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-positioning.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-positioning.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-text-line-position-bad.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-text-line-position-bad.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-text-line-position-bad.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-text-line-position-bad.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-text-line-position.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-text-line-position.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-text-line-position.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/align-text-line-position.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/alignment-bad.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/alignment-bad.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/alignment-bad.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/alignment-bad.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/alignment-ltr.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/alignment-ltr.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/alignment-ltr.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/alignment-ltr.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/alignment.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/alignment.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/alignment.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/alignment.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/bom.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/bom.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/bom.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/bom.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions-fast.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions-fast.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions-fast.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions-fast.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions-gaps.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions-gaps.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions-gaps.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions-gaps.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions-html.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions-html.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions-html.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions-html.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/captions.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/class-bad.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/class-bad.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/class-bad.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/class-bad.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/class.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/class.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/class.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/class.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-id-error.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-id-error.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-id-error.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-id-error.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-id.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-id.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-id.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-id.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-no-id-error.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-no-id-error.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-no-id-error.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-no-id-error.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-no-id.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-no-id.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-no-id.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-no-id.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-recovery-cuetext.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-recovery-cuetext.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-recovery-cuetext.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-recovery-cuetext.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-recovery-header.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-recovery-header.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-recovery-header.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-recovery-header.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-recovery-note.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-recovery-note.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-recovery-note.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-recovery-note.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size-align-bad.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size-align-bad.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size-align-bad.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size-align-bad.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size-align.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size-align.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size-align.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size-align.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size-bad.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size-bad.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size-bad.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size-bad.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cue-size.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues-chrono-order.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues-chrono-order.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues-chrono-order.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues-chrono-order.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues-no-separation.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues-no-separation.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues-no-separation.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues-no-separation.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues-overlapping.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues-overlapping.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues-overlapping.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues-overlapping.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/cues.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/default-styles.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/default-styles.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/default-styles.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/default-styles.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/degenerate-cues.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/degenerate-cues.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/degenerate-cues.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/degenerate-cues.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/empty-cue.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/empty-cue.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/empty-cue.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/empty-cue.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/entities-wrong.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/entities-wrong.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/entities-wrong.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/entities-wrong.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/entities.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/entities.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/entities.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/entities.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/interspersed-non-cue.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/interspersed-non-cue.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/interspersed-non-cue.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/interspersed-non-cue.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/iso2022jp3.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/iso2022jp3.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/iso2022jp3.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/iso2022jp3.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/large-timestamp.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/large-timestamp.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/large-timestamp.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/large-timestamp.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/line-position-bad.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/line-position-bad.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/line-position-bad.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/line-position-bad.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/line-position.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/line-position.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/line-position.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/line-position.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/markup-bad.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/markup-bad.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/markup-bad.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/markup-bad.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/markup.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/markup.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/markup.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/markup.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/metadata-area.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/metadata-area.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/metadata-area.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/metadata-area.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/metadata.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/metadata.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/metadata.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/metadata.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/missed-cues.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/missed-cues.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/missed-cues.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/missed-cues.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/no-newline-at-eof.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/no-newline-at-eof.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/no-newline-at-eof.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/no-newline-at-eof.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/no-timings.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/no-timings.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/no-timings.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/no-timings.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/no-webvtt.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/no-webvtt.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/no-webvtt.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/no-webvtt.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/positioning-bad.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/positioning-bad.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/positioning-bad.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/positioning-bad.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/positioning-ltr.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/positioning-ltr.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/positioning-ltr.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/positioning-ltr.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/positioning.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/positioning.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/positioning.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/positioning.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/settings-bad-separation.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/settings-bad-separation.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/settings-bad-separation.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/settings-bad-separation.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/settings.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/settings.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/settings.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/settings.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/simple-captions.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/simple-captions.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/simple-captions.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/simple-captions.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/sorted-dispatch.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/sorted-dispatch.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/sorted-dispatch.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/sorted-dispatch.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timestamp-bad.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timestamp-bad.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timestamp-bad.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timestamp-bad.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timestamp.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timestamp.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timestamp.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timestamp.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-hour-error.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-hour-error.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-hour-error.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-hour-error.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-hour.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-hour.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-hour.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-hour.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-no-hour-errors.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-no-hour-errors.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-no-hour-errors.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-no-hour-errors.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-no-hour.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-no-hour.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-no-hour.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-no-hour.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-whitespace.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-whitespace.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-whitespace.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/timings-whitespace.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.de.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.de.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.de.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.de.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.en.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.en.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.en.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.en.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.fr.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.fr.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.fr.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.fr.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/track.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/unsupported-markup.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/unsupported-markup.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/unsupported-markup.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/unsupported-markup.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/utf8.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/utf8.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/utf8.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/utf8.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/valign-bad.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/valign-bad.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/valign-bad.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/valign-bad.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/valign-ltr.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/valign-ltr.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/valign-ltr.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/valign-ltr.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/valign.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/valign.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/valign.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/valign.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/voice-bad.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/voice-bad.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/voice-bad.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/voice-bad.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/voice.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/voice.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/voice.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/voice.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/vp8-vorbis-webvtt.webm b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/vp8-vorbis-webvtt.webm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/vp8-vorbis-webvtt.webm rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/vp8-vorbis-webvtt.webm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/webvtt-file.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/webvtt-file.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/webvtt-file.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/webvtt-file.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/webvtt-rubbish.vtt b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/webvtt-rubbish.vtt similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/resources/webvtt-rubbish.vtt rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/resources/webvtt-rubbish.vtt diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/src-clear-cues.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/src-clear-cues.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/src-clear-cues.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/src-clear-cues.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/src-empty-string.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/src-empty-string.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/src-empty-string.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/src-empty-string.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-active-cues.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-active-cues.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-active-cues.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-active-cues.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-add-remove-cue.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-add-remove-cue.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-add-remove-cue.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-add-remove-cue.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-add-track.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-add-track.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-add-track.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-add-track.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-addtrack-kind.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-addtrack-kind.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-addtrack-kind.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-addtrack-kind.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-api-texttracks.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-api-texttracks.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-api-texttracks.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-api-texttracks.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-change-event.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-change-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-change-event.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-change-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-css-cue-pseudo-class.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-css-cue-pseudo-class.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-css-cue-pseudo-class.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-css-cue-pseudo-class.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-empty.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-empty.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-empty.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-inline.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-inline.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-inline.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-mutable-fragment.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-mutable-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-mutable-fragment.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-mutable-fragment.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-mutable.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-mutable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-mutable.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-mutable.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-negative-duration.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-negative-duration.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-negative-duration.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-negative-duration.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-negative-timestamp-events.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-negative-timestamp-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-negative-timestamp-events.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-negative-timestamp-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-negative-timestamp.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-negative-timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-negative-timestamp.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-negative-timestamp.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-order.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-order.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-order.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-order.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-added-ref.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-added-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-added-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-added-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-added.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-added.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-added.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-added.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed-ref.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-empty-cue.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-empty-cue.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-empty-cue.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-empty-cue.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit-ref.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video-ref.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-cuechange-dynamically-created-track-element.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-cuechange-dynamically-created-track-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-cuechange-dynamically-created-track-element.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-cuechange-dynamically-created-track-element.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-cuechange.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-cuechange.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-cuechange.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-cuechange.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-enter-exit.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-enter-exit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-enter-exit.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-enter-exit.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-enter-seeking.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-enter-seeking.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-enter-seeking.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-enter-seeking.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-missed.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-missed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-missed.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-missed.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-pause-on-exit.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-pause-on-exit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-pause-on-exit.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-pause-on-exit.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-seeking.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-seeking.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-seeking.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-seeking.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-sorted-before-dispatch.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-sorted-before-dispatch.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-sorted-before-dispatch.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cues-sorted-before-dispatch.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-data-url.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-data-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-data-url.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-data-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-default-attribute.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-default-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-default-attribute.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-default-attribute.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-delete-during-setup.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-delete-during-setup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-delete-during-setup.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-delete-during-setup.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-disabled-addcue.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-disabled-addcue.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-disabled-addcue.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-disabled-addcue.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-disabled.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-disabled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-disabled.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-disabled.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-dom-change.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-dom-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-dom-change.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-dom-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-src-aborted-load.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-src-aborted-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-src-aborted-load.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-src-aborted-load.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-src-change-error.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-src-change-error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-src-change-error.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-src-change-error.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-src-change.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-src-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-src-change.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-element-src-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-helpers.js b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-helpers.js rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-helpers.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-id.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-id.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-id.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-id.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-insert-after-load.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-insert-after-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-insert-after-load.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-insert-after-load.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-large-timestamp.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-large-timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-large-timestamp.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-large-timestamp.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-load-error-readyState.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-load-error-readyState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-load-error-readyState.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-load-error-readyState.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-load-from-element-readyState.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-load-from-element-readyState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-load-from-element-readyState.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-load-from-element-readyState.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-load-from-src-readyState.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-load-from-src-readyState.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-load-from-src-readyState.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-load-from-src-readyState.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode-disabled.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode-disabled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode-disabled.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode-disabled.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode-not-changed-by-new-track.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode-not-changed-by-new-track.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode-not-changed-by-new-track.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode-not-changed-by-new-track.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode-triggers-loading.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode-triggers-loading.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode-triggers-loading.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode-triggers-loading.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-node-add-remove.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-node-add-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-node-add-remove.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-node-add-remove.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-active-cue.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-active-cue.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-active-cue.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-active-cue.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-by-setting-innerHTML.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-by-setting-innerHTML.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-by-setting-innerHTML.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-by-setting-innerHTML.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-insert-ready-state.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-insert-ready-state.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-insert-ready-state.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-insert-ready-state.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-quickly.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-quickly.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-quickly.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-quickly.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track-inband.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track-inband.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track-inband.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track-inband.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-selection-metadata.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-selection-metadata.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-selection-metadata.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-selection-metadata.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-selection-task-order.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-selection-task-order.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-selection-task-order.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-selection-task-order.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-text-track-cue-list.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-text-track-cue-list.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-text-track-cue-list.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-text-track-cue-list.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-texttracks.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-texttracks.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-texttracks.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-texttracks.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-align-positioning.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-align-positioning.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-align-positioning.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-align-positioning.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-align-text-line-position.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-align-text-line-position.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-align-text-line-position.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-align-text-line-position.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-alignment.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-alignment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-alignment.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-alignment.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-blank-lines.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-blank-lines.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-blank-lines.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-blank-lines.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-bom.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-bom.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-bom.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-bom.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-class-markup.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-class-markup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-class-markup.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-class-markup.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-identifiers.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-identifiers.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-identifiers.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-identifiers.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-no-id.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-no-id.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-no-id.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-no-id.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-recovery.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-recovery.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-recovery.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-recovery.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-size-align.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-size-align.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-size-align.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-size-align.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-size.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-size.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-cue-size.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-degenerate-cues.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-degenerate-cues.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-degenerate-cues.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-degenerate-cues.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-empty-cue.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-empty-cue.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-empty-cue.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-empty-cue.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-entities.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-entities.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-entities.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-entities.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-header-comment.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-header-comment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-header-comment.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-header-comment.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-interspersed-non-cue.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-interspersed-non-cue.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-interspersed-non-cue.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-interspersed-non-cue.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-line-position.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-line-position.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-line-position.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-line-position.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-magic-header.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-magic-header.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-magic-header.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-magic-header.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-markup.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-markup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-markup.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-markup.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-newlines.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-newlines.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-newlines.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-newlines.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-no-timings.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-no-timings.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-no-timings.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-no-timings.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-non-snap-to-lines-ref.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-non-snap-to-lines-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-non-snap-to-lines-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-non-snap-to-lines-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-non-snap-to-lines.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-non-snap-to-lines.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-non-snap-to-lines.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-non-snap-to-lines.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-positioning.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-positioning.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-positioning.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-positioning.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-settings.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-settings.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-settings.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-settings.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timestamp.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timestamp.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timestamp.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timings-hour.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timings-hour.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timings-hour.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timings-hour.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timings-no-hours.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timings-no-hours.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timings-no-hours.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timings-no-hours.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timings-whitespace.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timings-whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timings-whitespace.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-timings-whitespace.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-two-cue-layout-after-first-end-ref.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-two-cue-layout-after-first-end-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-two-cue-layout-after-first-end-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-two-cue-layout-after-first-end-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-two-cue-layout-after-first-end.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-two-cue-layout-after-first-end.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-two-cue-layout-after-first-end.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-two-cue-layout-after-first-end.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-unsupported-markup.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-unsupported-markup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-unsupported-markup.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-unsupported-markup.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-utf8.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-utf8.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-utf8.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-utf8.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-valign.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-valign.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-valign.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-valign.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-voice.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-voice.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-voice.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-voice.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/vtt-cue-float-precision.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/vtt-cue-float-precision.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/vtt-cue-float-precision.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/track/track-element/vtt-cue-float-precision.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/user-interface/muted.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/user-interface/muted.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/user-interface/muted.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/user-interface/muted.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_controls_present-manual.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/video_controls_present-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_controls_present-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/video_controls_present-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_loop_base.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/video_loop_base.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_loop_base.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/video_loop_base.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_muted_overriding_volume-manual.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/video_muted_overriding_volume-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_muted_overriding_volume-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/video_muted_overriding_volume-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_muted_present-manual.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/video_muted_present-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_muted_present-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/video_muted_present-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_volume_check.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/video_volume_check.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_volume_check.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/video_volume_check.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_volume_loudest-manual.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/video_volume_loudest-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_volume_loudest-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/video_volume_loudest-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_volume_silent-manual.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/video_volume_silent-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/video_volume_silent-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/video_volume_silent-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/volume_nonfinite.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/volume_nonfinite.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/volume_nonfinite.html rename to tests/wpt/tests/html/semantics/embedded-content/media-elements/volume_nonfinite.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/common.js b/tests/wpt/tests/html/semantics/embedded-content/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/common.js rename to tests/wpt/tests/html/semantics/embedded-content/resources/common.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/not-embeddable.html b/tests/wpt/tests/html/semantics/embedded-content/resources/not-embeddable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/not-embeddable.html rename to tests/wpt/tests/html/semantics/embedded-content/resources/not-embeddable.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/not-embeddable.html.headers b/tests/wpt/tests/html/semantics/embedded-content/resources/not-embeddable.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/not-embeddable.html.headers rename to tests/wpt/tests/html/semantics/embedded-content/resources/not-embeddable.html.headers diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/should-load.html b/tests/wpt/tests/html/semantics/embedded-content/resources/should-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/should-load.html rename to tests/wpt/tests/html/semantics/embedded-content/resources/should-load.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/should-not-load.html b/tests/wpt/tests/html/semantics/embedded-content/resources/should-not-load.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/resources/should-not-load.html rename to tests/wpt/tests/html/semantics/embedded-content/resources/should-not-load.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-area-element/area-coords.html b/tests/wpt/tests/html/semantics/embedded-content/the-area-element/area-coords.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-area-element/area-coords.html rename to tests/wpt/tests/html/semantics/embedded-content/the-area-element/area-coords.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-area-element/area-download-click.html b/tests/wpt/tests/html/semantics/embedded-content/the-area-element/area-download-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-area-element/area-download-click.html rename to tests/wpt/tests/html/semantics/embedded-content/the-area-element/area-download-click.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-area-element/area-processing.html b/tests/wpt/tests/html/semantics/embedded-content/the-area-element/area-processing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-area-element/area-processing.html rename to tests/wpt/tests/html/semantics/embedded-content/the-area-element/area-processing.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-area-element/area-shape.html b/tests/wpt/tests/html/semantics/embedded-content/the-area-element/area-shape.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-area-element/area-shape.html rename to tests/wpt/tests/html/semantics/embedded-content/the-area-element/area-shape.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-area-element/area-stringifier.html b/tests/wpt/tests/html/semantics/embedded-content/the-area-element/area-stringifier.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-area-element/area-stringifier.html rename to tests/wpt/tests/html/semantics/embedded-content/the-area-element/area-stringifier.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-area-element/resources/area-download-click.html b/tests/wpt/tests/html/semantics/embedded-content/the-area-element/resources/area-download-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-area-element/resources/area-download-click.html rename to tests/wpt/tests/html/semantics/embedded-content/the-area-element/resources/area-download-click.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-area-element/support/hit-test.js b/tests/wpt/tests/html/semantics/embedded-content/the-area-element/support/hit-test.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-area-element/support/hit-test.js rename to tests/wpt/tests/html/semantics/embedded-content/the-area-element/support/hit-test.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-audio-element/audio-appendChild-to-inactive-document-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-audio-element/audio-appendChild-to-inactive-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-audio-element/audio-appendChild-to-inactive-document-crash.html rename to tests/wpt/tests/html/semantics/embedded-content/the-audio-element/audio-appendChild-to-inactive-document-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-audio-element/audio-play-in-inactive-document-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-audio-element/audio-play-in-inactive-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-audio-element/audio-play-in-inactive-document-crash.html rename to tests/wpt/tests/html/semantics/embedded-content/the-audio-element/audio-play-in-inactive-document-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-audio-element/audio_001.htm b/tests/wpt/tests/html/semantics/embedded-content/the-audio-element/audio_001.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-audio-element/audio_001.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-audio-element/audio_001.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-audio-element/audio_002.htm b/tests/wpt/tests/html/semantics/embedded-content/the-audio-element/audio_002.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-audio-element/audio_002.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-audio-element/audio_002.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-audio-element/audio_constructor.html b/tests/wpt/tests/html/semantics/embedded-content/the-audio-element/audio_constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-audio-element/audio_constructor.html rename to tests/wpt/tests/html/semantics/embedded-content/the-audio-element/audio_constructor.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-audio-element/audio_content-ref.htm b/tests/wpt/tests/html/semantics/embedded-content/the-audio-element/audio_content-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-audio-element/audio_content-ref.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-audio-element/audio_content-ref.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d-getcontext-options.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d-getcontext-options.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d-getcontext-options.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d-getcontext-options.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.context.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.context.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.context.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.context.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.readonly.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.readonly.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.readonly.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.readonly.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.reference.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.reference.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.reference.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.reference.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.exists.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.exists.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.exists.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.exists.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.cache.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.cache.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.cache.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.cache.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.create.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.create.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.create.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.create.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.invalid.args.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.invalid.args.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.invalid.args.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.invalid.args.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.shared.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.shared.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.shared.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.shared.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.unique.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.unique.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.unique.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.unique.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.scaled.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.scaled.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.scaled.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.scaled.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.type.exists.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.exists.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.type.exists.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.exists.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.type.extend.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.extend.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.type.extend.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.extend.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.type.prototype.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.prototype.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.type.prototype.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.prototype.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.type.replace.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.replace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/2d.type.replace.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.replace.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-001.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-001.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-001.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-002.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-002.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-002.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-003.tentative.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-003.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-003.tentative.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-003.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-004.tentative.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-004.tentative.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-004.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-005.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-005.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/canvas-descendants-focusability-005.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/context.arguments.missing.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/context.arguments.missing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/context.arguments.missing.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/context.arguments.missing.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/context.casesensitive.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/context.casesensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/context.casesensitive.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/context.casesensitive.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/context.emptystring.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/context.emptystring.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/context.emptystring.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/context.emptystring.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badname.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badname.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badname.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badname.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badsuffix.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badsuffix.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badsuffix.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badsuffix.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.nullsuffix.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.nullsuffix.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.nullsuffix.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.nullsuffix.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.unicode.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.unicode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.unicode.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.unicode.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/fallback.basic.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/fallback.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/fallback.basic.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/fallback.basic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/fallback.multiple.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/fallback.multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/fallback.multiple.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/fallback.multiple.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/fallback.nested.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/fallback.nested.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/fallback.nested.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/fallback.nested.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/historical.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/historical.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/historical.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/imagedata.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/imagedata.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/imagedata.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/imagedata.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.colour.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.colour.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.colour.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.colour.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.colour.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.colour.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.colour.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.colour.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.2dstate.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.2dstate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.2dstate.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.2dstate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.clip.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.clip.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.clip.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.different.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.different.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.different.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.different.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.different.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.different.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.different.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.different.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.gradient.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.gradient.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.gradient.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.path.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.path.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.path.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.path.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.path.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.path.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.path.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.pattern.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.pattern.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.pattern.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.pattern.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.same.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.same.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.same.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.same.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.same.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.same.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.same.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.same.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.transform.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.transform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/initial.reset.transform.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.transform.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.dataURI.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.dataURI.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.dataURI.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.dataURI.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.canvas.cross.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.canvas.cross.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.canvas.cross.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.canvas.cross.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.canvas.redirect.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.canvas.redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.canvas.redirect.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.canvas.redirect.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.image.cross.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.image.cross.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.image.cross.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.image.cross.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.image.redirect.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.image.redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.image.redirect.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.image.redirect.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.fillStyle.cross.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.fillStyle.cross.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.fillStyle.cross.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.fillStyle.cross.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.fillStyle.redirect.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.fillStyle.redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.fillStyle.redirect.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.fillStyle.redirect.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.strokeStyle.cross.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.strokeStyle.cross.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.strokeStyle.cross.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.strokeStyle.cross.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.strokeStyle.redirect.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.strokeStyle.redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.strokeStyle.redirect.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.strokeStyle.redirect.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.timing.cross.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.timing.cross.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.timing.cross.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.timing.cross.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.timing.redirect.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.timing.redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.timing.redirect.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.timing.redirect.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.create.cross.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.create.cross.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.create.cross.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.create.cross.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.create.redirect.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.create.redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.create.redirect.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.create.redirect.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.cross.cross.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.cross.cross.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.cross.cross.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.cross.cross.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.cross.redirect.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.cross.redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.cross.redirect.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.cross.redirect.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.fillStyle.sub.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.fillStyle.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.fillStyle.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.fillStyle.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.fillStyle.cross.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.fillStyle.cross.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.fillStyle.cross.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.fillStyle.cross.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.fillStyle.redirect.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.fillStyle.redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.fillStyle.redirect.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.fillStyle.redirect.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.strokeStyle.cross.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.strokeStyle.cross.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.strokeStyle.cross.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.strokeStyle.cross.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.strokeStyle.redirect.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.strokeStyle.redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.strokeStyle.redirect.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.strokeStyle.redirect.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.reset.cross.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.reset.cross.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.reset.cross.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.reset.cross.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.reset.redirect.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.reset.redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/security.reset.redirect.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/security.reset.redirect.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.default.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.default.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.default.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.default.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.default.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.default.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.default.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.get.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.get.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.get.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.get.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.set.zero.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.set.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.set.zero.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.set.zero.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.hex.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.hex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.hex.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.hex.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.zero.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.zero.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.zero.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidlzero.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidlzero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidlzero.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidlzero.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.removed.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.removed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.removed.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.removed.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.removed.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.removed.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.removed.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.removed.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.set.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.set.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.set.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.set.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.hex.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.hex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.hex.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.hex.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.zero.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.zero.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.zero.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob-cross-realm-callback-report-exception.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toBlob-cross-realm-callback-report-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob-cross-realm-callback-report-exception.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toBlob-cross-realm-callback-report-exception.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.jpeg.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toBlob.jpeg.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.jpeg.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toBlob.jpeg.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.null.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toBlob.null.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.null.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toBlob.null.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.png.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toBlob.png.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toBlob.png.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toBlob.png.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.1.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.1.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.2.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.2.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.3.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.3.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.3.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.bogustype.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.bogustype.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.bogustype.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.bogustype.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.default.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.default.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.default.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.notnumber.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.notnumber.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.notnumber.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.notnumber.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.outsiderange.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.outsiderange.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.outsiderange.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.outsiderange.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpg.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpg.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpg.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpg.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.ascii.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.ascii.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.ascii.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.ascii.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.unicode.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.unicode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.unicode.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.unicode.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.nocontext.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.nocontext.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.nocontext.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.nocontext.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.png b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.png rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.unrecognised.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.unrecognised.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.unrecognised.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.unrecognised.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zeroheight.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zeroheight.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zeroheight.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zeroheight.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerosize.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerosize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerosize.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerosize.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerowidth.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerowidth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerowidth.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerowidth.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/type.delete.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/type.delete.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/type.delete.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/type.delete.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/type.exists.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/type.exists.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/type.exists.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/type.exists.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/type.extend.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/type.extend.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/type.extend.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/type.extend.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/type.name.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/type.name.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/type.name.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/type.name.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/type.prototype.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/type.prototype.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/type.prototype.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/type.prototype.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/type.replace.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/type.replace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-canvas-element/type.replace.html rename to tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/type.replace.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/document-getters-return-null-for-cross-origin.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/document-getters-return-null-for-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/document-getters-return-null-for-cross-origin.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/document-getters-return-null-for-cross-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-change-src.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-change-src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-change-src.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-change-src.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-dimension.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-dimension.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-dimension.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-dimension.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-document-under-content-visibility-focus.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-document-under-content-visibility-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-document-under-content-visibility-focus.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-document-under-content-visibility-focus.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-document-under-content-visibility-gbcr.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-document-under-content-visibility-gbcr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-document-under-content-visibility-gbcr.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-document-under-content-visibility-gbcr.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-document.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-document.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-hidden-attribute-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-hidden-attribute-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-hidden-attribute-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-hidden-attribute-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-hidden-attribute.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-hidden-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-hidden-attribute.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-hidden-attribute.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-iframe.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-iframe.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-ignored-in-media-element.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-ignored-in-media-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-ignored-in-media-element.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-ignored-in-media-element.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback-2.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback-2.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback-subdocument.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback-subdocument.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback-subdocument.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback-subdocument.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-network-error.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-01.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-01.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-02.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-02.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-02.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-03.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-03.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-03.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-04.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-04.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-04.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-04.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-svg-navigation-resets-size.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-svg-navigation-resets-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-svg-navigation-resets-size.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-svg-navigation-resets-size.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/historical.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-embed-element/historical.html rename to tests/wpt/tests/html/semantics/embedded-content/the-embed-element/historical.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-frame-element/document-getters-return-null-for-cross-origin.html b/tests/wpt/tests/html/semantics/embedded-content/the-frame-element/document-getters-return-null-for-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-frame-element/document-getters-return-null-for-cross-origin.html rename to tests/wpt/tests/html/semantics/embedded-content/the-frame-element/document-getters-return-null-for-cross-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/change_child.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/change_child.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/change_child.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/change_child.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/change_grandchild.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/change_grandchild.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/change_grandchild.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/change_grandchild.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/change_parentage.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/change_parentage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/change_parentage.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/change_parentage.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/content_document_changes_only_after_load_matures.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/content_document_changes_only_after_load_matures.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/content_document_changes_only_after_load_matures.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/content_document_changes_only_after_load_matures.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross-origin-to-whom-part-2.window.js b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/cross-origin-to-whom-part-2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross-origin-to-whom-part-2.window.js rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/cross-origin-to-whom-part-2.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross-origin-to-whom.window.js b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/cross-origin-to-whom.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross-origin-to-whom.window.js rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/cross-origin-to-whom.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_child.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/cross_origin_child.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_child.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/cross_origin_child.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_grandchild.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/cross_origin_grandchild.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_grandchild.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/cross_origin_grandchild.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.sub.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/document-getters-return-null-for-cross-origin.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/document-getters-return-null-for-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/document-getters-return-null-for-cross-origin.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/document-getters-return-null-for-cross-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/historical.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/historical.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/historical.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/hittest-detached-iframe-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/hittest-detached-iframe-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/hittest-detached-iframe-crash.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/hittest-detached-iframe-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-allow.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-allow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-allow.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-allow.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-allowfullscreen.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-allowfullscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-allowfullscreen.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-allowfullscreen.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-append-to-child-document.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-append-to-child-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-append-to-child-document.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-append-to-child-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-display-none-with-object.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-display-none-with-object.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-display-none-with-object.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-display-none-with-object.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-document-move-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-document-move-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-document-move-crash.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-document-move-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-first-load-canceled-second-load-blank.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-first-load-canceled-second-load-blank.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-first-load-canceled-second-load-blank.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-first-load-canceled-second-load-blank.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-initially-empty-is-updated-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-initially-empty-is-updated-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-initially-empty-is-updated-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-initially-empty-is-updated-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-initially-empty-is-updated.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-initially-empty-is-updated.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-initially-empty-is-updated.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-initially-empty-is-updated.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-load-event.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-load-event.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-load-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-eager.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-eager.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-eager.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-eager.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-base-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-in-script-disabled-iframe.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-in-script-disabled-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-in-script-disabled-iframe.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-in-script-disabled-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-load-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-queued-navigations.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-queued-navigations.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-queued-navigations.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-queued-navigations.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-multiple-times.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-referrerpolicy-change.sub.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-referrerpolicy-change.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-referrerpolicy-change.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-referrerpolicy-change.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-to-eager.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-modify-scrolling-attr-to-yes-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-modify-scrolling-attr-to-yes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-modify-scrolling-attr-to-yes-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-modify-scrolling-attr-to-yes-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-modify-scrolling-attr-to-yes.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-modify-scrolling-attr-to-yes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-modify-scrolling-attr-to-yes.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-modify-scrolling-attr-to-yes.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-network-error.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-nosrc.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-nosrc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-nosrc.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-nosrc.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-synchronously-discard.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-synchronously-discard.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-synchronously-discard.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-synchronously-discard.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-with-base-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-with-base-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-with-base-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-with-base-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-with-base.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-with-base.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-with-base.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe-with-base.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_harness.js b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_harness.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_harness.js rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_harness.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_navigate_ancestor-1.sub.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_navigate_ancestor-1.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_navigate_ancestor-1.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_navigate_ancestor-1.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_remove_src.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_remove_src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_remove_src.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_remove_src.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-1.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-1.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-2.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-2.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-3.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-3.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-3.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation_by_user_activation-manual.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation_by_user_activation-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation_by_user_activation-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation_by_user_activation-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation_by_user_activation_without_user_gesture.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation_by_user_activation_without_user_gesture.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation_by_user_activation_without_user_gesture.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation_by_user_activation_without_user_gesture.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_allow_downloads.tentative.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_allow_downloads.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_allow_downloads.tentative.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_allow_downloads.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.tentative.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.tentative.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-1.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-1.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-2.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-2.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-3.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-3.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-3.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-4.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-4.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_block_modals-4.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_ancestor-1.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_ancestor-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_ancestor-1.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_ancestor-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_ancestor-2.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_ancestor-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_ancestor-2.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_ancestor-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_descendants.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_descendants.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_descendants.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_descendants.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_history_go_back-2.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_history_go_back-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_history_go_back-2.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_history_go_back-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_history_go_back.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_history_go_back.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_history_go_back.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_history_go_back.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_history_go_forward.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_history_go_forward.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_history_go_forward.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_history_go_forward.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_itself.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_itself.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_itself.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_itself.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_other_frame_popup.sub.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_other_frame_popup.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_other_frame_popup.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigate_other_frame_popup.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads.sub.tentative.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads.sub.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads.sub.tentative.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads.sub.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-1.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-1.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-2.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-2.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-3.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-3.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper-3.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_block_downloads.tentative.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_block_downloads.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_block_downloads.tentative.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_block_downloads.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_03.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_03.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_03.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/resources/empty.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/resources/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/resources/empty.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/resources/empty.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/resources/hello-world.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/resources/hello-world.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/resources/hello-world.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/resources/hello-world.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/resources/iframe-loading-lazy-in-viewport.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/resources/iframe-loading-lazy-in-viewport.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/resources/iframe-loading-lazy-in-viewport.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/resources/iframe-loading-lazy-in-viewport.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/resources/post-origin-to-opener.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/resources/post-origin-to-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/resources/post-origin-to-opener.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/resources/post-origin-to-opener.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/resources/sandbox-top-navigation-helper.js b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/resources/sandbox-top-navigation-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/resources/sandbox-top-navigation-helper.js rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/resources/sandbox-top-navigation-helper.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/resources/subframe.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/resources/subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/resources/subframe.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/resources/subframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/resources/unload-reporter.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/resources/unload-reporter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/resources/unload-reporter.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/resources/unload-reporter.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/same_origin_child.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/same_origin_child.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/same_origin_child.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/same_origin_child.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/same_origin_grandchild.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/same_origin_grandchild.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/same_origin_grandchild.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/same_origin_grandchild.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/same_origin_parentage.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/same_origin_parentage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/same_origin_parentage.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/same_origin_parentage.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-ascii-case-insensitive.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-ascii-case-insensitive.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-inherit-to-blank-document-unsandboxed-frame.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-inherit-to-blank-document-unsandboxed-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-inherit-to-blank-document-unsandboxed-frame.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-inherit-to-blank-document-unsandboxed-frame.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-inherit-to-blank-document-unsandboxed.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-inherit-to-blank-document-unsandboxed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-inherit-to-blank-document-unsandboxed.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-inherit-to-blank-document-unsandboxed.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-inherit-to-blank-document-unsandboxed.html.headers b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-inherit-to-blank-document-unsandboxed.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-inherit-to-blank-document-unsandboxed.html.headers rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-inherit-to-blank-document-unsandboxed.html.headers diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-toggle-in-inactive-document-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-toggle-in-inactive-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-toggle-in-inactive-document-crash.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-toggle-in-inactive-document-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child.tentative.sub.window.js b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child.tentative.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child.tentative.sub.window.js rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child.tentative.sub.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-escalate-privileges.tentative.sub.window.js b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-escalate-privileges.tentative.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-escalate-privileges.tentative.sub.window.js rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-escalate-privileges.tentative.sub.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-grandchild.tentative.sub.window.js b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-grandchild.tentative.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-grandchild.tentative.sub.window.js rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-grandchild.tentative.sub.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_001.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_001.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_001.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_001.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_002.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_002.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_002.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_002.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_003-manual.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_003-manual.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_003-manual.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_003-manual.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_004.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_004.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_004.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_004.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_005.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_005.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_005.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_005.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_006-manual.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_006-manual.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_006-manual.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_006-manual.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_007-manual.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_007-manual.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_007-manual.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_007-manual.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_008-manual.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_008-manual.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_008-manual.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_008-manual.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_010-manual.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_010-manual.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_010-manual.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_010-manual.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_011.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_011.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_011.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_011.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_012.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_012.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_012.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_012.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_013.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_013.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_013.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_013.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_014.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_014.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_014.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_014.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_015.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_015.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_015.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_015.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_016.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_016.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_016.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_016.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_017.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_017.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_017.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_017.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_018.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_018.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_018.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_018.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_019.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_019.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_019.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_019.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_020-manual.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_020-manual.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_020-manual.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_020-manual.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_021-manual.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_021-manual.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_021-manual.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_021-manual.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_022-manual.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_022-manual.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_022-manual.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_022-manual.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_023.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_023.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_023.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_023.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_024.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_024.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_024.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_024.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_025.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_025.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_025.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_025.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_026.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_026.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_026.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_026.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_027.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_027.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_027.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_027.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_028.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_028.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_028.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_028.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_029.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_029.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_029.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_029.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_030.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_030.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_030.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_030.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_031.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_031.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_031.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_031.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_032.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_032.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/sandbox_032.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/sandbox_032.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/src-repeated-in-ancestor.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/src-repeated-in-ancestor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/src-repeated-in-ancestor.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/src-repeated-in-ancestor.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/srcdoc-anchor.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/srcdoc-anchor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/srcdoc-anchor.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/srcdoc-anchor.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/srcdoc-attribute-reset.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/srcdoc-attribute-reset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/srcdoc-attribute-reset.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/srcdoc-attribute-reset.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/srcdoc_change_hash.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/srcdoc_change_hash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/srcdoc_change_hash.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/srcdoc_change_hash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/srcdoc_process_attributes.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/srcdoc_process_attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/srcdoc_process_attributes.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/srcdoc_process_attributes.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/stash.py b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/stash.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/stash.py rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/stash.py diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/blank.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/blank.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/blank.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/blank.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/document-with-embedded-svg.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/document-with-embedded-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/document-with-embedded-svg.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/document-with-embedded-svg.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/download_stash.py b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/download_stash.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/download_stash.py rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/download_stash.py diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-checks-contentDocument.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-checks-contentDocument.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-checks-contentDocument.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-checks-contentDocument.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-opens-modals.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-opens-modals.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-opens-modals.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-opens-modals.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-performs-top-navigation-on-popup.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-performs-top-navigation-on-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-performs-top-navigation-on-popup.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-performs-top-navigation-on-popup.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-performs-top-navigation-without-user-gesture-failed.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-performs-top-navigation-without-user-gesture-failed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-performs-top-navigation-without-user-gesture-failed.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-performs-top-navigation-without-user-gesture-failed.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-performs-top-navigation.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-performs-top-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-performs-top-navigation.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-performs-top-navigation.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-send-message-to-the-opener.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-send-message-to-the-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-send-message-to-the-opener.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-send-message-to-the-opener.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-tries-to-navigate-parent-and-sends-result-to-grandparent.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-tries-to-navigate-parent-and-sends-result-to-grandparent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-tries-to-navigate-parent-and-sends-result-to-grandparent.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-that-tries-to-navigate-parent-and-sends-result-to-grandparent.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-tried-to-be-navigated-by-history.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-tried-to-be-navigated-by-history.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-tried-to-be-navigated-by-history.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-tried-to-be-navigated-by-history.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-tried-to-be-navigated-by-its-child.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-tried-to-be-navigated-by-its-child.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-tried-to-be-navigated-by-its-child.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-tried-to-be-navigated-by-its-child.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-trying-to-navigate-its-child.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-trying-to-navigate-its-child.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-trying-to-navigate-its-child.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-trying-to-navigate-its-child.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-trying-to-navigate-itself.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-trying-to-navigate-itself.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-trying-to-navigate-itself.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-trying-to-navigate-itself.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-which-content-height-equals-400px.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-which-content-height-equals-400px.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-which-content-height-equals-400px.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-which-content-height-equals-400px.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-with-object.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-with-object.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe-with-object.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe-with-object.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_001.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_001.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_001.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_001.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_002.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_002.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_002.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_002.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_003.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_003.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_003.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_003.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_004.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_004.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_004.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_004.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_006.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_006.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_006.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_006.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_007.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_007.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_007.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_007.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_008.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_008.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_008.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_008.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_010.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_010.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_010.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_010.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_012.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_012.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_012.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_012.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_020.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_020.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_020.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_020.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_020a.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_020a.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_020a.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_020a.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_021.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_021.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_021.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_021.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_021a.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_021a.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_021a.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_021a.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_022.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_022.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_022.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_022.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_023.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_023.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_023.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_023.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_024.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_024.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_024.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_024.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_026.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_026.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_026.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_026.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_027.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_027.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_027.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_027.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_028.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_028.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_028.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_028.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_029.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_029.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_029.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_029.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_031.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_031.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_031.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_031.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_032.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_032.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_032.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_032.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_block_modals.js b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_block_modals.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_block_modals.js rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_block_modals.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_download_helper.js b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_download_helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_download_helper.js rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_download_helper.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/load-into-the-iframe.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/load-into-the-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/load-into-the-iframe.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/load-into-the-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/navigation-changed-iframe.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/navigation-changed-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/navigation-changed-iframe.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/navigation-changed-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/sandbox.pdf b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/sandbox.pdf similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/sandbox.pdf rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/sandbox.pdf diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/sandbox.pdf.headers b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/sandbox.pdf.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/sandbox.pdf.headers rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/sandbox.pdf.headers diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/sandbox_allow_script.html b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/sandbox_allow_script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/sandbox_allow_script.html rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/sandbox_allow_script.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/sandbox_helper.js b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/sandbox_helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/sandbox_helper.js rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/sandbox_helper.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/standalone-fail.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/standalone-fail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/standalone-fail.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/standalone-fail.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/standalone-iframe-content.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/standalone-iframe-content.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/standalone-iframe-content.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/standalone-iframe-content.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/standalone-pass.htm b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/standalone-pass.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/standalone-pass.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/standalone-pass.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/svg.svg b/tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/svg.svg rename to tests/wpt/tests/html/semantics/embedded-content/the-iframe-element/support/svg.svg diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/3.jpg b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/3.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/3.jpg rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/3.jpg diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/404-response-with-actual-image-data.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/404-response-with-actual-image-data.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/404-response-with-actual-image-data.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/404-response-with-actual-image-data.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/404-response-with-actual-image-data.py b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/404-response-with-actual-image-data.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/404-response-with-actual-image-data.py rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/404-response-with-actual-image-data.py diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/Image-constructor.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/Image-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/Image-constructor.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/Image-constructor.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/adopt-from-image-document.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/adopt-from-image-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/adopt-from-image-document.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/adopt-from-image-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/adoption.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/adoption.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/adoption.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/adoption.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/already-loaded-image-sync-width.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/already-loaded-image-sync-width.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/already-loaded-image-sync-width.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/already-loaded-image-sync-width.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/available-images-onload.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/available-images-onload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/available-images-onload.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/available-images-onload.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/available-images-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/available-images-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/available-images-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/available-images-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/available-images.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/available-images.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/available-images.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/available-images.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/below-viewport-image-loading-lazy-load-event.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/below-viewport-image-loading-lazy-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/below-viewport-image-loading-lazy-load-event.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/below-viewport-image-loading-lazy-load-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/brokenimg.jpg b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/brokenimg.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/brokenimg.jpg rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/brokenimg.jpg diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/current-pixel-density/error.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/current-pixel-density/error.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/error.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/currentSrc-blob-cache.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/currentSrc-blob-cache.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/currentSrc-blob-cache.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/currentSrc-blob-cache.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/data-url.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/data-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/data-url.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/data-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-iframe.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-iframe.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-image-document.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-image-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-image-document.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-image-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-path-changes-svg.tentative.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-path-changes-svg.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-path-changes-svg.tentative.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-path-changes-svg.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-path-changes.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-path-changes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-path-changes.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-path-changes.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-picture.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-picture.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-picture.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-picture.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-svg.tentative.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-svg.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-svg.tentative.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-svg.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-with-quick-attach-svg.tentative.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-with-quick-attach-svg.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-with-quick-attach-svg.tentative.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-with-quick-attach-svg.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-with-quick-attach.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-with-quick-attach.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-with-quick-attach.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode-with-quick-attach.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/decode/image-decode.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/delay-load-event-detached.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/delay-load-event-detached.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/delay-load-event-detached.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/delay-load-event-detached.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/delay-load-event-until-move-to-empty-source.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/delay-load-event-until-move-to-empty-source.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/delay-load-event-until-move-to-empty-source.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/delay-load-event-until-move-to-empty-source.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/delay-load-event.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/delay-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/delay-load-event.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/delay-load-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/disconnected-image-loading-lazy.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/disconnected-image-loading-lazy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/disconnected-image-loading-lazy.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/disconnected-image-loading-lazy.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-adopt-base-url.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/document-adopt-base-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-adopt-base-url.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/document-adopt-base-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-base-url-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/document-base-url-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-base-url-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/document-base-url-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-base-url.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/document-base-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-base-url.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/document-base-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-destroyed-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/document-destroyed-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/document-destroyed-crash.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/document-destroyed-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/environment-changes/iframed.sub.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/environment-changes/iframed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/environment-changes/iframed.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/environment-changes/iframed.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/historical-progress-event.window.js b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/historical-progress-event.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/historical-progress-event.window.js rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/historical-progress-event.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-1.jpg b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-1.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-1.jpg rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-1.jpg diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-base-url.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-base-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-base-url.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-base-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-change-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-compositing-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-change-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-compositing-change-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-change.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-compositing-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-change.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-compositing-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-eager.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-eager.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-eager.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-eager.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-available.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-available.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-available.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-available.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url-2.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url-2.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-below-viewport-dynamic.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-below-viewport-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-below-viewport-dynamic.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-below-viewport-dynamic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-clip-path-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-clip-path-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-clip-path-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-clip-path-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-clip-path.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-clip-path.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-clip-path.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-clip-path.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-crossorigin-change.sub.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-crossorigin-change.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-crossorigin-change.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-crossorigin-change.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-data-url-to-https-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-data-url-to-https-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-data-url-to-https-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-data-url-to-https-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-data-url-to-https.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-data-url-to-https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-data-url-to-https.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-data-url-to-https.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-empty-src.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-empty-src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-empty-src.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-empty-src.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-001.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-iframe-002.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-script-disabled-iframe.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-script-disabled-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-script-disabled-iframe.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-script-disabled-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-viewport-dynamic.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-viewport-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-viewport-dynamic.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-viewport-dynamic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-move-document.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-move-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-move-document.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-move-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-move-into-script-disabled-iframe.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-move-into-script-disabled-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-move-into-script-disabled-iframe.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-move-into-script-disabled-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-multicol.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-multicol.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-multicol.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-negative-margin.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-negative-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-negative-margin.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-negative-margin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-referrerpolicy-change.sub.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-referrerpolicy-change.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-referrerpolicy-change.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-referrerpolicy-change.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-relevant-mutations.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-relevant-mutations.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-relevant-mutations.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-relevant-mutations.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-aspect-ratio-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-aspect-ratio-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-aspect-ratio-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-aspect-ratio-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-aspect-ratio.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-aspect-ratio.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-aspect-ratio.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-aspect-ratio.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-srcset.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-srcset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-srcset.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-srcset.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-subframe-detached-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-subframe-detached-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-subframe-detached-crash.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-subframe-detached-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-to-eager.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-to-eager.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-to-eager.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-to-eager.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-use-list-of-available-images.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-use-list-of-available-images.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-use-list-of-available-images.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-use-list-of-available-images.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-zero-intersection-area.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-zero-intersection-area.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-zero-intersection-area.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-zero-intersection-area.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-lazy.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-subpixel-clip-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-subpixel-clip-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-subpixel-clip-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-subpixel-clip-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-subpixel-clip.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-subpixel-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-subpixel-clip.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-loading-subpixel-clip.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-srcdoc-relative-uri-print-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-srcdoc-relative-uri-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-srcdoc-relative-uri-print-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-srcdoc-relative-uri-print-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-srcdoc-relative-uri-print.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-srcdoc-relative-uri-print.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-srcdoc-relative-uri-print.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image-srcdoc-relative-uri-print.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image.png b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/image.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image.png rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/image.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img-created-in-active-document-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/img-created-in-active-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img-created-in-active-document-crash.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/img-created-in-active-document-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img-picture-ancestor.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/img-picture-ancestor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img-picture-ancestor.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/img-picture-ancestor.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img-with-containment-and-size-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/img-with-containment-and-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img-with-containment-and-size-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/img-with-containment-and-size-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img-with-containment-and-size.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/img-with-containment-and-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img-with-containment-and-size.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/img-with-containment-and-size.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img.complete.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/img.complete.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img.complete.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/img.complete.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/invalid-src.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/invalid-src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/invalid-src.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/invalid-src.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/invisible-image.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/invisible-image.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/invisible-image.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/invisible-image.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-after.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-after.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-after.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-after.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-before.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-before.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-before.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-before.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-inside.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-inside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-inside.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-inside.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-manual.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-manual.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/list-of-available-images-does-not-coalesce-in-flight-requests.sub.tentative.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/list-of-available-images-does-not-coalesce-in-flight-requests.sub.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/list-of-available-images-does-not-coalesce-in-flight-requests.sub.tentative.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/list-of-available-images-does-not-coalesce-in-flight-requests.sub.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/list-of-available-images-matching.https.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/list-of-available-images-matching.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/list-of-available-images-matching.https.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/list-of-available-images-matching.https.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/move-element-and-scroll.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/move-element-and-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/move-element-and-scroll.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/move-element-and-scroll.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/natural-size-orientation.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/natural-size-orientation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/natural-size-orientation.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/natural-size-orientation.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/non-active-document.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/non-active-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/non-active-document.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/non-active-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/nonexistent-image.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/nonexistent-image.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/nonexistent-image.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/nonexistent-image.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/not-rendered-below-viewport-image-loading-lazy.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/not-rendered-below-viewport-image-loading-lazy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/not-rendered-below-viewport-image-loading-lazy.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/not-rendered-below-viewport-image-loading-lazy.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/not-rendered-dimension-getter.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/not-rendered-dimension-getter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/not-rendered-dimension-getter.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/not-rendered-dimension-getter.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/not-rendered-image-loading-lazy.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/not-rendered-image-loading-lazy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/not-rendered-image-loading-lazy.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/not-rendered-image-loading-lazy.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/null-image-source.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/null-image-source.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/null-image-source.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/null-image-source.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/picture-loading-lazy.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/picture-loading-lazy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/picture-loading-lazy.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/picture-loading-lazy.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/relevant-mutations-lazy.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/relevant-mutations-lazy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/relevant-mutations-lazy.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/relevant-mutations-lazy.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/relevant-mutations.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/relevant-mutations.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/relevant-mutations.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/relevant-mutations.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/remove-element-and-scroll.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/remove-element-and-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/remove-element-and-scroll.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/remove-element-and-scroll.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/blue-10.png b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/blue-10.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/blue-10.png rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/blue-10.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/cat.jpg b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/cat.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/cat.jpg rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/cat.jpg diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/green.png b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/green.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/green.png rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/green.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-and-stash.py b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/image-and-stash.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-and-stash.py rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/image-and-stash.py diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-below-viewport.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-below-viewport.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-below-viewport.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-below-viewport.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-in-viewport.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-in-viewport.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-in-viewport.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/image-loading-lazy-in-viewport.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image.png b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/image.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/image.png rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/image.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/newwindow.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/newwindow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/newwindow.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/newwindow.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/red.png b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/red.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/red.png rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/red.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/referrer-checker-img.py b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/referrer-checker-img.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/referrer-checker-img.py rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/referrer-checker-img.py diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/sw.js b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/sw.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/sw.js rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/sw.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/sw.js.headers b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/sw.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/resources/sw.js.headers rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/resources/sw.js.headers diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/responsive-image-select-print-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/responsive-image-select-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/responsive-image-select-print-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/responsive-image-select-print-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/responsive-image-select-print.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/responsive-image-select-print.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/responsive-image-select-print.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/responsive-image-select-print.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/scrolling-below-viewport-image-lazy-loading-in-iframe.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/scrolling-below-viewport-image-lazy-loading-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/scrolling-below-viewport-image-lazy-loading-in-iframe.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/scrolling-below-viewport-image-lazy-loading-in-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/implicit-sizes-ignores-width.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/implicit-sizes-ignores-width.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/implicit-sizes-ignores-width.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/implicit-sizes-ignores-width.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-display-none.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-display-none.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-display-none.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-standards-mode.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-standards-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-standards-mode.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-standards-mode.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-width-1000px.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-width-1000px.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-width-1000px.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-width-1000px.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-auto.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/sizes-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-auto.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/sizes-auto.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-002.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-002.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/support/parse-a-sizes-attribute.js b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/support/parse-a-sizes-attribute.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/support/parse-a-sizes-attribute.js rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/support/parse-a-sizes-attribute.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/support/sizes-iframed.sub.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/support/sizes-iframed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/support/sizes-iframed.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/sizes/support/sizes-iframed.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/source-media-outside-doc.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/source-media-outside-doc.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/source-media-outside-doc.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/source-media-outside-doc.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/avoid-reload-on-resize.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/avoid-reload-on-resize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/avoid-reload-on-resize.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/avoid-reload-on-resize.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/common.js b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/common.js rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/common.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/parse-a-srcset-attribute.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/parse-a-srcset-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/parse-a-srcset-attribute.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/parse-a-srcset-attribute.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/resources/image.png b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/resources/image.png similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/resources/image.png rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/resources/image.png diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/resources/image.png.headers b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/resources/image.png.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/resources/image.png.headers rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/resources/image.png.headers diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/resources/resized.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/resources/resized.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/resources/resized.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/resources/resized.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/select-an-image-source.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/select-an-image-source.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/select-an-image-source.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/select-an-image-source.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/srcset-media-dynamic.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/srcset-media-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/srcset/srcset-media-dynamic.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/srcset/srcset-media-dynamic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/support/external-sheet.svg b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/support/external-sheet.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/support/external-sheet.svg rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/support/external-sheet.svg diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/support/red-bg.css b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/support/red-bg.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/support/red-bg.css rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/support/red-bg.css diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/support/relevant-mutations.js b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/support/relevant-mutations.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/support/relevant-mutations.js rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/support/relevant-mutations.js diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/svg-img-with-external-stylesheet-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/svg-img-with-external-stylesheet-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/svg-img-with-external-stylesheet-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/svg-img-with-external-stylesheet-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/svg-img-with-external-stylesheet.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/svg-img-with-external-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/svg-img-with-external-stylesheet.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/svg-img-with-external-stylesheet.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/update-media.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/update-media.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/update-media.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/update-media.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/update-src-complete.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/update-src-complete.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/update-src-complete.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/update-src-complete.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/update-the-image-data/current-request-microtask.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/update-the-image-data/current-request-microtask.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/update-the-image-data/current-request-microtask.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/update-the-image-data/current-request-microtask.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/update-the-image-data/fail-to-resolve.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/update-the-image-data/fail-to-resolve.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/update-the-image-data/fail-to-resolve.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/update-the-image-data/fail-to-resolve.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/update-the-source-set.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/update-the-source-set.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/update-the-source-set.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/update-the-source-set.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/usemap-casing.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/usemap-casing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/usemap-casing.html rename to tests/wpt/tests/html/semantics/embedded-content/the-img-element/usemap-casing.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/block-object-with-ruby-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/block-object-with-ruby-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/block-object-with-ruby-crash.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/block-object-with-ruby-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/document-getters-return-null-for-cross-origin.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/document-getters-return-null-for-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/document-getters-return-null-for-cross-origin.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/document-getters-return-null-for-cross-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/historical.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/historical.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/historical.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-attributes.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-attributes.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-attributes.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-construct-in-document-with-null-browsing-context-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-construct-in-document-with-null-browsing-context-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-construct-in-document-with-null-browsing-context-crash.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-construct-in-document-with-null-browsing-context-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-events.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-events.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-fallback-failed-cross-origin-navigation.sub.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-fallback-failed-cross-origin-navigation.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-fallback-failed-cross-origin-navigation.sub.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-fallback-failed-cross-origin-navigation.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-handler.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-handler.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-handler.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-handler.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-ignored-in-media-element.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-ignored-in-media-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-ignored-in-media-element.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-ignored-in-media-element.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-in-display-none-load-event.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-in-display-none-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-in-display-none-load-event.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-in-display-none-load-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-in-object-fallback-2.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-in-object-fallback-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-in-object-fallback-2.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-in-object-fallback-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-param-url-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-param-url-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-param-url-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-param-url-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-param-url.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-param-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-param-url.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-param-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-remove-param-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-remove-param-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-remove-param-crash.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-remove-param-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-setcustomvalidity.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-setcustomvalidity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/object-setcustomvalidity.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/object-setcustomvalidity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/test0.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/test0.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/test0.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/test0.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/test1.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/test1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/test1.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/test1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/usemap-casing.html b/tests/wpt/tests/html/semantics/embedded-content/the-object-element/usemap-casing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-object-element/usemap-casing.html rename to tests/wpt/tests/html/semantics/embedded-content/the-object-element/usemap-casing.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/intrinsic_sizes.htm b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/intrinsic_sizes.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/intrinsic_sizes.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/intrinsic_sizes.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/resize-during-playback.html b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/resize-during-playback.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/resize-during-playback.html rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/resize-during-playback.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video-import-to-inactive-document-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/video-import-to-inactive-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video-import-to-inactive-document-crash.html rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/video-import-to-inactive-document-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video-poster-shown-preload-auto-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/video-poster-shown-preload-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video-poster-shown-preload-auto-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/video-poster-shown-preload-auto-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video-poster-shown-preload-auto.html b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/video-poster-shown-preload-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video-poster-shown-preload-auto.html rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/video-poster-shown-preload-auto.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video-tabindex.html b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/video-tabindex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video-tabindex.html rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/video-tabindex.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_content-ref.htm b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_content-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_content-ref.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_content-ref.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_content_image.htm b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_content_image.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_content_image.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_content_image.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_content_text.htm b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_content_text.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_content_text.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_content_text.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_crash_empty_src.html b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_crash_empty_src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_crash_empty_src.html rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_crash_empty_src.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster-ref.htm b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster-ref.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster-ref.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster-ref.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_absolute.htm b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_absolute.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_absolute.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_absolute.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_relative.htm b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_relative.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_relative.htm rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_relative.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_initially_paused-ref.html b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_initially_paused-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_initially_paused-ref.html rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_initially_paused-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_initially_paused.html b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_initially_paused.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_initially_paused.html rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_initially_paused.html diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_size_preserved_after_ended.html b/tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_size_preserved_after_ended.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/video_size_preserved_after_ended.html rename to tests/wpt/tests/html/semantics/embedded-content/the-video-element/video_size_preserved_after_ended.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/META.yml b/tests/wpt/tests/html/semantics/forms/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/META.yml rename to tests/wpt/tests/html/semantics/forms/META.yml diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-ltr.html b/tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-ltr.html rename to tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-ltr.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-only-if-applies.html b/tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-only-if-applies.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-only-if-applies.html rename to tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-only-if-applies.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-auto.html b/tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-auto.html rename to tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-auto.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-inherited.html b/tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-inherited.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-inherited.html rename to tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-inherited.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-manual.html b/tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-manual.html rename to tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/disabled-elements-01.html b/tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/disabled-elements-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/disabled-elements-01.html rename to tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/disabled-elements-01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/formAction_document_address.html b/tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/formAction_document_address.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/formAction_document_address.html rename to tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/formAction_document_address.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/formaction.html b/tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/formaction.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/formaction.html rename to tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/formaction.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/resources/dirname-iframe.html b/tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/resources/dirname-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/resources/dirname-iframe.html rename to tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/resources/dirname-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/resources/dirname.js b/tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/resources/dirname.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/resources/dirname.js rename to tests/wpt/tests/html/semantics/forms/attributes-common-to-form-controls/resources/dirname.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/beforeinput.tentative.html b/tests/wpt/tests/html/semantics/forms/beforeinput.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/beforeinput.tentative.html rename to tests/wpt/tests/html/semantics/forms/beforeinput.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-checkValidity.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-checkValidity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-checkValidity.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-checkValidity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-reportValidity.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-reportValidity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-reportValidity.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-reportValidity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validate.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validate.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-badInput.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-badInput.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-badInput.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-badInput.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-customError.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-customError.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-customError.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-customError.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-patternMismatch.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-patternMismatch.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-patternMismatch.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-patternMismatch.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow-weekmonth.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow-weekmonth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow-weekmonth.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow-weekmonth.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow-weekmonth.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow-weekmonth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow-weekmonth.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow-weekmonth.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-tooLong.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-tooLong.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-tooLong.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-tooLong.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-tooShort.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-tooShort.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-tooShort.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-tooShort.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-typeMismatch.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-typeMismatch.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-typeMismatch.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-typeMismatch.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-valid-weekmonth.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-valid-weekmonth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-valid-weekmonth.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-valid-weekmonth.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-valid.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-valid.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-valid.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-valueMissing-weekmonth.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-valueMissing-weekmonth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-valueMissing-weekmonth.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-valueMissing-weekmonth.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-valueMissing.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-valueMissing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-valueMissing.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-validity-valueMissing.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-willValidate-datalist.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-willValidate-datalist.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-willValidate-datalist.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-willValidate-datalist.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-willValidate.html b/tests/wpt/tests/html/semantics/forms/constraints/form-validation-willValidate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-willValidate.html rename to tests/wpt/tests/html/semantics/forms/constraints/form-validation-willValidate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/infinite_backtracking.html b/tests/wpt/tests/html/semantics/forms/constraints/infinite_backtracking.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/infinite_backtracking.html rename to tests/wpt/tests/html/semantics/forms/constraints/infinite_backtracking.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/input-maxlength-emoji.html b/tests/wpt/tests/html/semantics/forms/constraints/input-maxlength-emoji.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/input-maxlength-emoji.html rename to tests/wpt/tests/html/semantics/forms/constraints/input-maxlength-emoji.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/input-number-validity-dynamic-value-no-change.html b/tests/wpt/tests/html/semantics/forms/constraints/input-number-validity-dynamic-value-no-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/input-number-validity-dynamic-value-no-change.html rename to tests/wpt/tests/html/semantics/forms/constraints/input-number-validity-dynamic-value-no-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/input-pattern-dynamic-value.html b/tests/wpt/tests/html/semantics/forms/constraints/input-pattern-dynamic-value.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/input-pattern-dynamic-value.html rename to tests/wpt/tests/html/semantics/forms/constraints/input-pattern-dynamic-value.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/inputwillvalidate.html b/tests/wpt/tests/html/semantics/forms/constraints/inputwillvalidate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/inputwillvalidate.html rename to tests/wpt/tests/html/semantics/forms/constraints/inputwillvalidate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/number-input-lang-validationMessage-crash.html b/tests/wpt/tests/html/semantics/forms/constraints/number-input-lang-validationMessage-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/number-input-lang-validationMessage-crash.html rename to tests/wpt/tests/html/semantics/forms/constraints/number-input-lang-validationMessage-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/radio-valueMissing.html b/tests/wpt/tests/html/semantics/forms/constraints/radio-valueMissing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/radio-valueMissing.html rename to tests/wpt/tests/html/semantics/forms/constraints/radio-valueMissing.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/reportValidity-crash.html b/tests/wpt/tests/html/semantics/forms/constraints/reportValidity-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/reportValidity-crash.html rename to tests/wpt/tests/html/semantics/forms/constraints/reportValidity-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/support/validator.js b/tests/wpt/tests/html/semantics/forms/constraints/support/validator.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/support/validator.js rename to tests/wpt/tests/html/semantics/forms/constraints/support/validator.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooLong-input-email-delete-manual.html b/tests/wpt/tests/html/semantics/forms/constraints/tooLong-input-email-delete-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooLong-input-email-delete-manual.html rename to tests/wpt/tests/html/semantics/forms/constraints/tooLong-input-email-delete-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooLong-input-password-delete-manual.html b/tests/wpt/tests/html/semantics/forms/constraints/tooLong-input-password-delete-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooLong-input-password-delete-manual.html rename to tests/wpt/tests/html/semantics/forms/constraints/tooLong-input-password-delete-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooLong-input-search-delete-manual.html b/tests/wpt/tests/html/semantics/forms/constraints/tooLong-input-search-delete-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooLong-input-search-delete-manual.html rename to tests/wpt/tests/html/semantics/forms/constraints/tooLong-input-search-delete-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooLong-input-tel-delete-manual.html b/tests/wpt/tests/html/semantics/forms/constraints/tooLong-input-tel-delete-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooLong-input-tel-delete-manual.html rename to tests/wpt/tests/html/semantics/forms/constraints/tooLong-input-tel-delete-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooLong-input-text-delete-manual.html b/tests/wpt/tests/html/semantics/forms/constraints/tooLong-input-text-delete-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooLong-input-text-delete-manual.html rename to tests/wpt/tests/html/semantics/forms/constraints/tooLong-input-text-delete-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooLong-input-url-delete-manual.html b/tests/wpt/tests/html/semantics/forms/constraints/tooLong-input-url-delete-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooLong-input-url-delete-manual.html rename to tests/wpt/tests/html/semantics/forms/constraints/tooLong-input-url-delete-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooLong-textarea-delete-manual.html b/tests/wpt/tests/html/semantics/forms/constraints/tooLong-textarea-delete-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooLong-textarea-delete-manual.html rename to tests/wpt/tests/html/semantics/forms/constraints/tooLong-textarea-delete-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooShort-input-email-add-manual.html b/tests/wpt/tests/html/semantics/forms/constraints/tooShort-input-email-add-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooShort-input-email-add-manual.html rename to tests/wpt/tests/html/semantics/forms/constraints/tooShort-input-email-add-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooShort-input-password-add-manual.html b/tests/wpt/tests/html/semantics/forms/constraints/tooShort-input-password-add-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooShort-input-password-add-manual.html rename to tests/wpt/tests/html/semantics/forms/constraints/tooShort-input-password-add-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooShort-input-search-add-manual.html b/tests/wpt/tests/html/semantics/forms/constraints/tooShort-input-search-add-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooShort-input-search-add-manual.html rename to tests/wpt/tests/html/semantics/forms/constraints/tooShort-input-search-add-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooShort-input-tel-add-manual.html b/tests/wpt/tests/html/semantics/forms/constraints/tooShort-input-tel-add-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooShort-input-tel-add-manual.html rename to tests/wpt/tests/html/semantics/forms/constraints/tooShort-input-tel-add-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooShort-input-text-add-manual.html b/tests/wpt/tests/html/semantics/forms/constraints/tooShort-input-text-add-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooShort-input-text-add-manual.html rename to tests/wpt/tests/html/semantics/forms/constraints/tooShort-input-text-add-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooShort-input-url-add-manual.html b/tests/wpt/tests/html/semantics/forms/constraints/tooShort-input-url-add-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooShort-input-url-add-manual.html rename to tests/wpt/tests/html/semantics/forms/constraints/tooShort-input-url-add-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooShort-textarea-add-manual.html b/tests/wpt/tests/html/semantics/forms/constraints/tooShort-textarea-add-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/constraints/tooShort-textarea-add-manual.html rename to tests/wpt/tests/html/semantics/forms/constraints/tooShort-textarea-add-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-control-infrastructure/association.window.js b/tests/wpt/tests/html/semantics/forms/form-control-infrastructure/association.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-control-infrastructure/association.window.js rename to tests/wpt/tests/html/semantics/forms/form-control-infrastructure/association.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-control-infrastructure/form.html b/tests/wpt/tests/html/semantics/forms/form-control-infrastructure/form.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-control-infrastructure/form.html rename to tests/wpt/tests/html/semantics/forms/form-control-infrastructure/form.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-control-infrastructure/form_attribute.html b/tests/wpt/tests/html/semantics/forms/form-control-infrastructure/form_attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-control-infrastructure/form_attribute.html rename to tests/wpt/tests/html/semantics/forms/form-control-infrastructure/form_attribute.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-control-infrastructure/form_owner_and_table.html b/tests/wpt/tests/html/semantics/forms/form-control-infrastructure/form_owner_and_table.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-control-infrastructure/form_owner_and_table.html rename to tests/wpt/tests/html/semantics/forms/form-control-infrastructure/form_owner_and_table.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-control-infrastructure/form_owner_and_table_2.html b/tests/wpt/tests/html/semantics/forms/form-control-infrastructure/form_owner_and_table_2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-control-infrastructure/form_owner_and_table_2.html rename to tests/wpt/tests/html/semantics/forms/form-control-infrastructure/form_owner_and_table_2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-control-infrastructure/form_owner_and_table_3.html b/tests/wpt/tests/html/semantics/forms/form-control-infrastructure/form_owner_and_table_3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-control-infrastructure/form_owner_and_table_3.html rename to tests/wpt/tests/html/semantics/forms/form-control-infrastructure/form_owner_and_table_3.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/FormDataEvent.window.js b/tests/wpt/tests/html/semantics/forms/form-submission-0/FormDataEvent.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/FormDataEvent.window.js rename to tests/wpt/tests/html/semantics/forms/form-submission-0/FormDataEvent.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/SubmitEvent.window.js b/tests/wpt/tests/html/semantics/forms/form-submission-0/SubmitEvent.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/SubmitEvent.window.js rename to tests/wpt/tests/html/semantics/forms/form-submission-0/SubmitEvent.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/constructing-form-data-set.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/constructing-form-data-set.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/constructing-form-data-set.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/constructing-form-data-set.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/enctypes-helper.js b/tests/wpt/tests/html/semantics/forms/form-submission-0/enctypes-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/enctypes-helper.js rename to tests/wpt/tests/html/semantics/forms/form-submission-0/enctypes-helper.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-empty-file.window.js b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-data-set-empty-file.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-empty-file.window.js rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-data-set-empty-file.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-usv-form.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-data-set-usv-form.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-usv-form.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-data-set-usv-form.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-usv.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-data-set-usv.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-usv.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-data-set-usv.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-2.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-2.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-3.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-3.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-3.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-default-action.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-default-action.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-default-action.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-default-action.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-multiple-targets.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-multiple-targets.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-multiple-targets.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-multiple-targets.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-preventdefault-click.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-preventdefault-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-preventdefault-click.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-preventdefault-click.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-preventdefault.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-preventdefault.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-preventdefault.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-preventdefault.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-requestsubmit.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-requestsubmit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-requestsubmit.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-requestsubmit.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-to-different-origin-frame.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-to-different-origin-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-to-different-origin-frame.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit-to-different-origin-frame.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-double-submit.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-echo.py b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-echo.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-echo.py rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-echo.py diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-submission-algorithm.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-submission-algorithm.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-submission-algorithm.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-submission-algorithm.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-submit-iframe-then-location-navigate.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/form-submit-iframe-then-location-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-submit-iframe-then-location-navigate.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/form-submit-iframe-then-location-navigate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/getactionurl.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/getactionurl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/getactionurl.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/getactionurl.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/historical.window.js b/tests/wpt/tests/html/semantics/forms/form-submission-0/historical.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/historical.window.js rename to tests/wpt/tests/html/semantics/forms/form-submission-0/historical.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/implicit-submission.optional.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/implicit-submission.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/implicit-submission.optional.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/implicit-submission.optional.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/jsurl-form-submit.tentative.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/jsurl-form-submit.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/jsurl-form-submit.tentative.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/jsurl-form-submit.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/jsurl-navigation-then-form-submit.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/jsurl-navigation-then-form-submit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/jsurl-navigation-then-form-submit.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/jsurl-navigation-then-form-submit.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/multipart-formdata.window.js b/tests/wpt/tests/html/semantics/forms/form-submission-0/multipart-formdata.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/multipart-formdata.window.js rename to tests/wpt/tests/html/semantics/forms/form-submission-0/multipart-formdata.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/newline-normalization.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/newline-normalization.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/newline-normalization.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/newline-normalization.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/reparent-form-during-planned-navigation-task.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/reparent-form-during-planned-navigation-task.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/reparent-form-during-planned-navigation-task.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/reparent-form-during-planned-navigation-task.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/request-submit-activation.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/request-submit-activation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/request-submit-activation.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/request-submit-activation.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/file-submission.py b/tests/wpt/tests/html/semantics/forms/form-submission-0/resources/file-submission.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/file-submission.py rename to tests/wpt/tests/html/semantics/forms/form-submission-0/resources/file-submission.py diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/form-submission.py b/tests/wpt/tests/html/semantics/forms/form-submission-0/resources/form-submission.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/form-submission.py rename to tests/wpt/tests/html/semantics/forms/form-submission-0/resources/form-submission.py diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/form.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/resources/form.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/form.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/resources/form.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/getactionurl-iframe.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/resources/getactionurl-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/getactionurl-iframe.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/resources/getactionurl-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/jsurl-form-submit-iframe.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/resources/jsurl-form-submit-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/jsurl-form-submit-iframe.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/resources/jsurl-form-submit-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/location.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/resources/location.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/location.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/resources/location.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/targetted-form.js b/tests/wpt/tests/html/semantics/forms/form-submission-0/resources/targetted-form.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/resources/targetted-form.js rename to tests/wpt/tests/html/semantics/forms/form-submission-0/resources/targetted-form.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/submission-checks.window.js b/tests/wpt/tests/html/semantics/forms/form-submission-0/submission-checks.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/submission-checks.window.js rename to tests/wpt/tests/html/semantics/forms/form-submission-0/submission-checks.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/submit-entity-body.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/submit-entity-body.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/submit-entity-body.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/submit-entity-body.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/submit-file.sub.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/submit-file.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/submit-file.sub.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/submit-file.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/text-plain.window.js b/tests/wpt/tests/html/semantics/forms/form-submission-0/text-plain.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/text-plain.window.js rename to tests/wpt/tests/html/semantics/forms/form-submission-0/text-plain.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/url-encoded.html b/tests/wpt/tests/html/semantics/forms/form-submission-0/url-encoded.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/url-encoded.html rename to tests/wpt/tests/html/semantics/forms/form-submission-0/url-encoded.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/urlencoded2.window.js b/tests/wpt/tests/html/semantics/forms/form-submission-0/urlencoded2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/urlencoded2.window.js rename to tests/wpt/tests/html/semantics/forms/form-submission-0/urlencoded2.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/form-target-iframe-helper.py b/tests/wpt/tests/html/semantics/forms/form-submission-target/form-target-iframe-helper.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/form-target-iframe-helper.py rename to tests/wpt/tests/html/semantics/forms/form-submission-target/form-target-iframe-helper.py diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/form-target-iframe.html b/tests/wpt/tests/html/semantics/forms/form-submission-target/form-target-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/form-target-iframe.html rename to tests/wpt/tests/html/semantics/forms/form-submission-target/form-target-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/form-target-request-header.html b/tests/wpt/tests/html/semantics/forms/form-submission-target/form-target-request-header.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/form-target-request-header.html rename to tests/wpt/tests/html/semantics/forms/form-submission-target/form-target-request-header.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/rel-base-target.html b/tests/wpt/tests/html/semantics/forms/form-submission-target/rel-base-target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/rel-base-target.html rename to tests/wpt/tests/html/semantics/forms/form-submission-target/rel-base-target.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/rel-button-target.html b/tests/wpt/tests/html/semantics/forms/form-submission-target/rel-button-target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/rel-button-target.html rename to tests/wpt/tests/html/semantics/forms/form-submission-target/rel-button-target.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/rel-form-target.html b/tests/wpt/tests/html/semantics/forms/form-submission-target/rel-form-target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/rel-form-target.html rename to tests/wpt/tests/html/semantics/forms/form-submission-target/rel-form-target.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/rel-input-target.html b/tests/wpt/tests/html/semantics/forms/form-submission-target/rel-input-target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/rel-input-target.html rename to tests/wpt/tests/html/semantics/forms/form-submission-target/rel-input-target.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/resources/endpoint.html b/tests/wpt/tests/html/semantics/forms/form-submission-target/resources/endpoint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/resources/endpoint.html rename to tests/wpt/tests/html/semantics/forms/form-submission-target/resources/endpoint.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/resources/form-target-request-header-helper.py b/tests/wpt/tests/html/semantics/forms/form-submission-target/resources/form-target-request-header-helper.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/resources/form-target-request-header-helper.py rename to tests/wpt/tests/html/semantics/forms/form-submission-target/resources/form-target-request-header-helper.py diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/resources/reltester.js b/tests/wpt/tests/html/semantics/forms/form-submission-target/resources/reltester.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/form-submission-target/resources/reltester.js rename to tests/wpt/tests/html/semantics/forms/form-submission-target/resources/reltester.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/historical-search-event.html b/tests/wpt/tests/html/semantics/forms/historical-search-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/historical-search-event.html rename to tests/wpt/tests/html/semantics/forms/historical-search-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/historical.html b/tests/wpt/tests/html/semantics/forms/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/historical.html rename to tests/wpt/tests/html/semantics/forms/historical.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/input-change-event-properties.html b/tests/wpt/tests/html/semantics/forms/input-change-event-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/input-change-event-properties.html rename to tests/wpt/tests/html/semantics/forms/input-change-event-properties.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/resetting-a-form/reset-event.html b/tests/wpt/tests/html/semantics/forms/resetting-a-form/reset-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/resetting-a-form/reset-event.html rename to tests/wpt/tests/html/semantics/forms/resetting-a-form/reset-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/resetting-a-form/reset-form-2.html b/tests/wpt/tests/html/semantics/forms/resetting-a-form/reset-form-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/resetting-a-form/reset-form-2.html rename to tests/wpt/tests/html/semantics/forms/resetting-a-form/reset-form-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/resetting-a-form/reset-form-event-realm.html b/tests/wpt/tests/html/semantics/forms/resetting-a-form/reset-form-event-realm.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/resetting-a-form/reset-form-event-realm.html rename to tests/wpt/tests/html/semantics/forms/resetting-a-form/reset-form-event-realm.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/resetting-a-form/reset-form.html b/tests/wpt/tests/html/semantics/forms/resetting-a-form/reset-form.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/resetting-a-form/reset-form.html rename to tests/wpt/tests/html/semantics/forms/resetting-a-form/reset-form.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/resetting-a-form/support/reset-form-event-realm.html b/tests/wpt/tests/html/semantics/forms/resetting-a-form/support/reset-form-event-realm.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/resetting-a-form/support/reset-form-event-realm.html rename to tests/wpt/tests/html/semantics/forms/resetting-a-form/support/reset-form-event-realm.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/defaultSelection.html b/tests/wpt/tests/html/semantics/forms/textfieldselection/defaultSelection.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/defaultSelection.html rename to tests/wpt/tests/html/semantics/forms/textfieldselection/defaultSelection.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/original-id.json b/tests/wpt/tests/html/semantics/forms/textfieldselection/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/original-id.json rename to tests/wpt/tests/html/semantics/forms/textfieldselection/original-id.json diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/select-event.html b/tests/wpt/tests/html/semantics/forms/textfieldselection/select-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/select-event.html rename to tests/wpt/tests/html/semantics/forms/textfieldselection/select-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-after-content-change.html b/tests/wpt/tests/html/semantics/forms/textfieldselection/selection-after-content-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-after-content-change.html rename to tests/wpt/tests/html/semantics/forms/textfieldselection/selection-after-content-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-not-application-textarea.html b/tests/wpt/tests/html/semantics/forms/textfieldselection/selection-not-application-textarea.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-not-application-textarea.html rename to tests/wpt/tests/html/semantics/forms/textfieldselection/selection-not-application-textarea.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-not-application.html b/tests/wpt/tests/html/semantics/forms/textfieldselection/selection-not-application.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-not-application.html rename to tests/wpt/tests/html/semantics/forms/textfieldselection/selection-not-application.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-start-end-extra.html b/tests/wpt/tests/html/semantics/forms/textfieldselection/selection-start-end-extra.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-start-end-extra.html rename to tests/wpt/tests/html/semantics/forms/textfieldselection/selection-start-end-extra.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-start-end.html b/tests/wpt/tests/html/semantics/forms/textfieldselection/selection-start-end.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-start-end.html rename to tests/wpt/tests/html/semantics/forms/textfieldselection/selection-start-end.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-value-interactions.html b/tests/wpt/tests/html/semantics/forms/textfieldselection/selection-value-interactions.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-value-interactions.html rename to tests/wpt/tests/html/semantics/forms/textfieldselection/selection-value-interactions.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection.html b/tests/wpt/tests/html/semantics/forms/textfieldselection/selection.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection.html rename to tests/wpt/tests/html/semantics/forms/textfieldselection/selection.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/setSelectionRange.html b/tests/wpt/tests/html/semantics/forms/textfieldselection/setSelectionRange.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/setSelectionRange.html rename to tests/wpt/tests/html/semantics/forms/textfieldselection/setSelectionRange.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/textarea-selection-while-parsing.xhtml b/tests/wpt/tests/html/semantics/forms/textfieldselection/textarea-selection-while-parsing.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/textarea-selection-while-parsing.xhtml rename to tests/wpt/tests/html/semantics/forms/textfieldselection/textarea-selection-while-parsing.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/textfieldselection-setRangeText.html b/tests/wpt/tests/html/semantics/forms/textfieldselection/textfieldselection-setRangeText.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/textfieldselection-setRangeText.html rename to tests/wpt/tests/html/semantics/forms/textfieldselection/textfieldselection-setRangeText.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/textfieldselection-setSelectionRange.html b/tests/wpt/tests/html/semantics/forms/textfieldselection/textfieldselection-setSelectionRange.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/textfieldselection-setSelectionRange.html rename to tests/wpt/tests/html/semantics/forms/textfieldselection/textfieldselection-setSelectionRange.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/active-onblur.html b/tests/wpt/tests/html/semantics/forms/the-button-element/active-onblur.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/active-onblur.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/active-onblur.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-activate-frame.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-activate-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-activate-frame.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-activate-frame.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-activate-keyup-prevented.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-activate-keyup-prevented.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-activate-keyup-prevented.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-activate-keyup-prevented.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-activate.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-activate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-activate.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-activate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-checkvalidity.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-checkvalidity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-checkvalidity.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-checkvalidity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-click-submits.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-click-submits.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-click-submits.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-click-submits.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-events.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-events.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-labels.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-labels.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-labels.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-labels.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-menu-historical.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-menu-historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-menu-historical.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-menu-historical.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-setcustomvalidity.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-setcustomvalidity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-setcustomvalidity.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-setcustomvalidity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-submit-children.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-submit-children.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-submit-children.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-submit-children.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-submit-remove-children-jssubmit.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-submit-remove-children-jssubmit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-submit-remove-children-jssubmit.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-submit-remove-children-jssubmit.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-submit-remove-children.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-submit-remove-children.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-submit-remove-children.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-submit-remove-children.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-submit-remove-jssubmit.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-submit-remove-jssubmit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-submit-remove-jssubmit.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-submit-remove-jssubmit.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-type-enumerated-ascii-case-insensitive.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-type-enumerated-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-type-enumerated-ascii-case-insensitive.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-type-enumerated-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-type.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-type.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-type.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-untrusted-key-event.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-untrusted-key-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-untrusted-key-event.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-untrusted-key-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-validation.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-validation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-validation.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-validation.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-validationmessage.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-validationmessage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-validationmessage.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-validationmessage.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-validity.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-validity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-validity.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-validity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-willvalidate-readonly-attribute.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-willvalidate-readonly-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-willvalidate-readonly-attribute.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-willvalidate-readonly-attribute.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-willvalidate.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-willvalidate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-button-element/button-willvalidate.html rename to tests/wpt/tests/html/semantics/forms/the-button-element/button-willvalidate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-datalist-element/datalistoptions.html b/tests/wpt/tests/html/semantics/forms/the-datalist-element/datalistoptions.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-datalist-element/datalistoptions.html rename to tests/wpt/tests/html/semantics/forms/the-datalist-element/datalistoptions.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-datalist-element/remove-datalist-crash.html b/tests/wpt/tests/html/semantics/forms/the-datalist-element/remove-datalist-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-datalist-element/remove-datalist-crash.html rename to tests/wpt/tests/html/semantics/forms/the-datalist-element/remove-datalist-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/README.md b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/README.md rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/README.md diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/aria-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/aria-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/aria-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/aria-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/baseline-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/baseline-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/baseline-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/baseline-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-appearance-none-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-appearance-none-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-appearance-none-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-appearance-none-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-contents-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-contents-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-contents-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-contents-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-none-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-none-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-none-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-none-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-div-display-contents-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-div-display-contents-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-div-display-contents-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-div-display-contents-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-none-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-none-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-none-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-none-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-presentation-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-presentation-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-presentation-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-presentation-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-visibility-collapse-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-visibility-collapse-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-visibility-collapse-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-visibility-collapse-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-visibility-hidden-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-visibility-hidden-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-visibility-hidden-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/fieldset-visibility-hidden-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/flexbox-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/flexbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/flexbox-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/flexbox-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/grid-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/grid-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/grid-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/grid-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-abspos-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-abspos-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-abspos-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-abspos-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-child-display-none-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-child-display-none-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-child-display-none-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-child-display-none-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-child-visibility-hidden-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-child-visibility-hidden-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-child-visibility-hidden-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-child-visibility-hidden-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-display-contents-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-display-contents-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-display-contents-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-display-contents-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-display-none-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-display-none-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-display-none-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-display-none-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-float-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-float-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-float-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-float-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-role-group-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-role-group-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-role-group-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-role-group-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-collapse-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-collapse-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-collapse-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-collapse-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-hidden-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-hidden-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-hidden-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-hidden-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/multiple-legends-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/multiple-legends-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/multiple-legends-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/multiple-legends-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/role-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/role-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/role-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/role-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/shadow-dom-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/shadow-dom-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/shadow-dom-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/shadow-dom-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/title-attribute-and-empty-legend-manual.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/title-attribute-and-empty-legend-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/accessibility/title-attribute-and-empty-legend-manual.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/accessibility/title-attribute-and-empty-legend-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/disabled-001.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/disabled-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/disabled-001.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/disabled-001.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/disabled-002.xhtml b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/disabled-002.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/disabled-002.xhtml rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/disabled-002.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/disabled-003.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/disabled-003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/disabled-003.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/disabled-003.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/fieldset-checkvalidity.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/fieldset-checkvalidity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/fieldset-checkvalidity.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/fieldset-checkvalidity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/fieldset-intrinsic-size.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/fieldset-intrinsic-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/fieldset-intrinsic-size.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/fieldset-intrinsic-size.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/fieldset-setcustomvalidity.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/fieldset-setcustomvalidity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/fieldset-setcustomvalidity.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/fieldset-setcustomvalidity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/fieldset-validationmessage.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/fieldset-validationmessage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/fieldset-validationmessage.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/fieldset-validationmessage.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/fieldset-validity.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/fieldset-validity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/fieldset-validity.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/fieldset-validity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/fieldset-willvalidate.html b/tests/wpt/tests/html/semantics/forms/the-fieldset-element/fieldset-willvalidate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-fieldset-element/fieldset-willvalidate.html rename to tests/wpt/tests/html/semantics/forms/the-fieldset-element/fieldset-willvalidate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-action-in-inactive-document-crash.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-action-in-inactive-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-action-in-inactive-document-crash.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-action-in-inactive-document-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-action-reflection-with-base-url.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-action-reflection-with-base-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-action-reflection-with-base-url.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-action-reflection-with-base-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-action-reflection.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-action-reflection.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-action-reflection.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-action-reflection.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-action-submission-with-base-url.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-action-submission-with-base-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-action-submission-with-base-url.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-action-submission-with-base-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-action-submission.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-action-submission.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-action-submission.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-action-submission.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-action.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-action.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-action.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-action.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-autocomplete.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-autocomplete.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-autocomplete.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-autocomplete.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-checkvalidity.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-checkvalidity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-checkvalidity.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-checkvalidity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-filter.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-elements-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-filter.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-elements-filter.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-interfaces-01.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-elements-interfaces-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-interfaces-01.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-elements-interfaces-01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-matches.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-elements-matches.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-matches.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-elements-matches.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-nameditem-01.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-elements-nameditem-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-nameditem-01.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-elements-nameditem-01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-nameditem-02.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-elements-nameditem-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-nameditem-02.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-elements-nameditem-02.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-sameobject.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-elements-sameobject.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-elements-sameobject.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-elements-sameobject.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-indexed-element.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-indexed-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-indexed-element.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-indexed-element.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-length.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-length.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-length.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-length.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-nameditem.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-nameditem.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-nameditem.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-nameditem.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-requestsubmit.html b/tests/wpt/tests/html/semantics/forms/the-form-element/form-requestsubmit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/form-requestsubmit.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/form-requestsubmit.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/form-no-action-with-base.html b/tests/wpt/tests/html/semantics/forms/the-form-element/resources/form-no-action-with-base.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/form-no-action-with-base.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/resources/form-no-action-with-base.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/form-no-action.html b/tests/wpt/tests/html/semantics/forms/the-form-element/resources/form-no-action.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/form-no-action.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/resources/form-no-action.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/form-with-action-and-base.sub.html b/tests/wpt/tests/html/semantics/forms/the-form-element/resources/form-with-action-and-base.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/form-with-action-and-base.sub.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/resources/form-with-action-and-base.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/form-with-action.sub.html b/tests/wpt/tests/html/semantics/forms/the-form-element/resources/form-with-action.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/form-with-action.sub.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/resources/form-with-action.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/target/form-action-url-target.html b/tests/wpt/tests/html/semantics/forms/the-form-element/resources/target/form-action-url-target.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-form-element/resources/target/form-action-url-target.html rename to tests/wpt/tests/html/semantics/forms/the-form-element/resources/target/form-action-url-target.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/anchor-active-contenteditable.html b/tests/wpt/tests/html/semantics/forms/the-input-element/anchor-active-contenteditable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/anchor-active-contenteditable.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/anchor-active-contenteditable.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/anchor-contenteditable-navigate.html b/tests/wpt/tests/html/semantics/forms/the-input-element/anchor-contenteditable-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/anchor-contenteditable-navigate.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/anchor-contenteditable-navigate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/button.html b/tests/wpt/tests/html/semantics/forms/the-input-element/button.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/button.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/button.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkable-active-onblur-with-click.html b/tests/wpt/tests/html/semantics/forms/the-input-element/checkable-active-onblur-with-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkable-active-onblur-with-click.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/checkable-active-onblur-with-click.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkable-active-onblur.html b/tests/wpt/tests/html/semantics/forms/the-input-element/checkable-active-onblur.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkable-active-onblur.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/checkable-active-onblur.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkable-active-space-key-being-disabled.html b/tests/wpt/tests/html/semantics/forms/the-input-element/checkable-active-space-key-being-disabled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkable-active-space-key-being-disabled.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/checkable-active-space-key-being-disabled.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkable-active-space-key-prevented-default.html b/tests/wpt/tests/html/semantics/forms/the-input-element/checkable-active-space-key-prevented-default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkable-active-space-key-prevented-default.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/checkable-active-space-key-prevented-default.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkable-active-space-key-untrusted-event.html b/tests/wpt/tests/html/semantics/forms/the-input-element/checkable-active-space-key-untrusted-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkable-active-space-key-untrusted-event.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/checkable-active-space-key-untrusted-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkbox-click-events.html b/tests/wpt/tests/html/semantics/forms/the-input-element/checkbox-click-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkbox-click-events.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/checkbox-click-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkbox.html b/tests/wpt/tests/html/semantics/forms/the-input-element/checkbox.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checkbox.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/checkbox.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checked.xhtml b/tests/wpt/tests/html/semantics/forms/the-input-element/checked.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/checked.xhtml rename to tests/wpt/tests/html/semantics/forms/the-input-element/checked.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/clone.html b/tests/wpt/tests/html/semantics/forms/the-input-element/clone.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/clone.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/clone.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/cloning-steps.html b/tests/wpt/tests/html/semantics/forms/the-input-element/cloning-steps.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/cloning-steps.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/cloning-steps.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/color.html b/tests/wpt/tests/html/semantics/forms/the-input-element/color.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/color.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/color.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/date.html b/tests/wpt/tests/html/semantics/forms/the-input-element/date.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/date.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/date.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/datetime-local-trailing-zeros.html b/tests/wpt/tests/html/semantics/forms/the-input-element/datetime-local-trailing-zeros.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/datetime-local-trailing-zeros.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/datetime-local-trailing-zeros.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/datetime-local.html b/tests/wpt/tests/html/semantics/forms/the-input-element/datetime-local.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/datetime-local.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/datetime-local.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/datetime-weekmonth.html b/tests/wpt/tests/html/semantics/forms/the-input-element/datetime-weekmonth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/datetime-weekmonth.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/datetime-weekmonth.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/datetime.html b/tests/wpt/tests/html/semantics/forms/the-input-element/datetime.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/datetime.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/datetime.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/defaultValue-clobbering.html b/tests/wpt/tests/html/semantics/forms/the-input-element/defaultValue-clobbering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/defaultValue-clobbering.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/defaultValue-clobbering.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/disabled-click-picker-manual.html b/tests/wpt/tests/html/semantics/forms/the-input-element/disabled-click-picker-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/disabled-click-picker-manual.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/disabled-click-picker-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/email-set-value.html b/tests/wpt/tests/html/semantics/forms/the-input-element/email-set-value.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/email-set-value.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/email-set-value.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/email.html b/tests/wpt/tests/html/semantics/forms/the-input-element/email.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/email.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/email.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/event-select-manual.html b/tests/wpt/tests/html/semantics/forms/the-input-element/event-select-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/event-select-manual.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/event-select-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/file-manual.html b/tests/wpt/tests/html/semantics/forms/the-input-element/file-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/file-manual.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/file-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/files.html b/tests/wpt/tests/html/semantics/forms/the-input-element/files.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/files.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/files.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/focus-dynamic-type-change-on-blur.html b/tests/wpt/tests/html/semantics/forms/the-input-element/focus-dynamic-type-change-on-blur.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/focus-dynamic-type-change-on-blur.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/focus-dynamic-type-change-on-blur.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/focus-dynamic-type-change.html b/tests/wpt/tests/html/semantics/forms/the-input-element/focus-dynamic-type-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/focus-dynamic-type-change.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/focus-dynamic-type-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/hidden-charset-case-sensitive-child.html b/tests/wpt/tests/html/semantics/forms/the-input-element/hidden-charset-case-sensitive-child.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/hidden-charset-case-sensitive-child.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/hidden-charset-case-sensitive-child.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/hidden-charset-case-sensitive.html b/tests/wpt/tests/html/semantics/forms/the-input-element/hidden-charset-case-sensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/hidden-charset-case-sensitive.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/hidden-charset-case-sensitive.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/hidden.html b/tests/wpt/tests/html/semantics/forms/the-input-element/hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/hidden.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/hidden.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/image-click-form-data.html b/tests/wpt/tests/html/semantics/forms/the-input-element/image-click-form-data.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/image-click-form-data.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/image-click-form-data.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/image01-ref.html b/tests/wpt/tests/html/semantics/forms/the-input-element/image01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/image01-ref.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/image01-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/image01.html b/tests/wpt/tests/html/semantics/forms/the-input-element/image01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/image01.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/image01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-checkvalidity.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-checkvalidity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-checkvalidity.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-checkvalidity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-form-detach-style-crash.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-form-detach-style-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-form-detach-style-crash.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-form-detach-style-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-height.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-height.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-height.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-height.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-labels.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-labels.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-labels.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-labels.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-list.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-list.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-list.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-list.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-seconds-leading-zeroes.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-seconds-leading-zeroes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-seconds-leading-zeroes.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-seconds-leading-zeroes.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-setcustomvalidity.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-setcustomvalidity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-setcustomvalidity.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-setcustomvalidity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-stepdown-weekmonth.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-stepdown-weekmonth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-stepdown-weekmonth.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-stepdown-weekmonth.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-stepdown.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-stepdown.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-stepdown.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-stepdown.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-stepup-weekmonth.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-stepup-weekmonth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-stepup-weekmonth.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-stepup-weekmonth.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-stepup.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-stepup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-stepup.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-stepup.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-submit-remove-jssubmit.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-submit-remove-jssubmit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-submit-remove-jssubmit.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-submit-remove-jssubmit.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-type-button.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-type-button.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-type-button.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-type-button.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-type-change-empty-crash.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-type-change-empty-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-type-change-empty-crash.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-type-change-empty-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-type-change-value.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-type-change-value.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-type-change-value.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-type-change-value.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-type-checkbox.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-type-checkbox.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-type-checkbox.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-type-checkbox.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-type-number-rtl-invalid-crash.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-type-number-rtl-invalid-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-type-number-rtl-invalid-crash.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-type-number-rtl-invalid-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-types.js b/tests/wpt/tests/html/semantics/forms/the-input-element/input-types.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-types.js rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-types.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-untrusted-key-event.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-untrusted-key-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-untrusted-key-event.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-untrusted-key-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-validationmessage.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-validationmessage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-validationmessage.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-validationmessage.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-validity.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-validity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-validity.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-validity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-value-invalidstateerr.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-value-invalidstateerr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-value-invalidstateerr.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-value-invalidstateerr.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-valueasdate-invalidstateerr.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-valueasdate-invalidstateerr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-valueasdate-invalidstateerr.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-valueasdate-invalidstateerr.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-valueasdate-stepping.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-valueasdate-stepping.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-valueasdate-stepping.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-valueasdate-stepping.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-valueasdate.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-valueasdate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-valueasdate.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-valueasdate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-valueasnumber-invalidstateerr.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-valueasnumber-invalidstateerr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-valueasnumber-invalidstateerr.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-valueasnumber-invalidstateerr.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-valueasnumber-stepping.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-valueasnumber-stepping.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-valueasnumber-stepping.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-valueasnumber-stepping.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-valueasnumber.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-valueasnumber.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-valueasnumber.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-valueasnumber.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-whitespace.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-whitespace.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-whitespace.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-width.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-width.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-width.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-width.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-willvalidate.html b/tests/wpt/tests/html/semantics/forms/the-input-element/input-willvalidate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/input-willvalidate.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/input-willvalidate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/invalid-datalist-options-crash.html b/tests/wpt/tests/html/semantics/forms/the-input-element/invalid-datalist-options-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/invalid-datalist-options-crash.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/invalid-datalist-options-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/large-step-crash.html b/tests/wpt/tests/html/semantics/forms/the-input-element/large-step-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/large-step-crash.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/large-step-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/maxlength-manual.html b/tests/wpt/tests/html/semantics/forms/the-input-element/maxlength-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/maxlength-manual.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/maxlength-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/maxlength-number.html b/tests/wpt/tests/html/semantics/forms/the-input-element/maxlength-number.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/maxlength-number.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/maxlength-number.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/maxlength.html b/tests/wpt/tests/html/semantics/forms/the-input-element/maxlength.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/maxlength.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/maxlength.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/minlength.html b/tests/wpt/tests/html/semantics/forms/the-input-element/minlength.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/minlength.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/minlength.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/month.html b/tests/wpt/tests/html/semantics/forms/the-input-element/month.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/month.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/month.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/multiline-placeholder-cr.html b/tests/wpt/tests/html/semantics/forms/the-input-element/multiline-placeholder-cr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/multiline-placeholder-cr.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/multiline-placeholder-cr.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/multiline-placeholder-crlf.html b/tests/wpt/tests/html/semantics/forms/the-input-element/multiline-placeholder-crlf.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/multiline-placeholder-crlf.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/multiline-placeholder-crlf.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/multiline-placeholder-ref.html b/tests/wpt/tests/html/semantics/forms/the-input-element/multiline-placeholder-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/multiline-placeholder-ref.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/multiline-placeholder-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/multiline-placeholder.html b/tests/wpt/tests/html/semantics/forms/the-input-element/multiline-placeholder.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/multiline-placeholder.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/multiline-placeholder.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/number-disabled.html b/tests/wpt/tests/html/semantics/forms/the-input-element/number-disabled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/number-disabled.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/number-disabled.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/number.html b/tests/wpt/tests/html/semantics/forms/the-input-element/number.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/number.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/number.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/password-delete-space.html b/tests/wpt/tests/html/semantics/forms/the-input-element/password-delete-space.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/password-delete-space.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/password-delete-space.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/password.html b/tests/wpt/tests/html/semantics/forms/the-input-element/password.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/password.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/password.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/pattern_attribute.html b/tests/wpt/tests/html/semantics/forms/the-input-element/pattern_attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/pattern_attribute.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/pattern_attribute.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/pattern_attribute_v_flag.html b/tests/wpt/tests/html/semantics/forms/the-input-element/pattern_attribute_v_flag.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/pattern_attribute_v_flag.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/pattern_attribute_v_flag.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/placeholder-update-ref.html b/tests/wpt/tests/html/semantics/forms/the-input-element/placeholder-update-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/placeholder-update-ref.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/placeholder-update-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/placeholder-update.html b/tests/wpt/tests/html/semantics/forms/the-input-element/placeholder-update.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/placeholder-update.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/placeholder-update.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/radio-double-activate-pseudo.html b/tests/wpt/tests/html/semantics/forms/the-input-element/radio-double-activate-pseudo.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/radio-double-activate-pseudo.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/radio-double-activate-pseudo.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/radio-groupname-case.html b/tests/wpt/tests/html/semantics/forms/the-input-element/radio-groupname-case.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/radio-groupname-case.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/radio-groupname-case.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/radio-input-cancel.html b/tests/wpt/tests/html/semantics/forms/the-input-element/radio-input-cancel.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/radio-input-cancel.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/radio-input-cancel.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/radio-morphed.html b/tests/wpt/tests/html/semantics/forms/the-input-element/radio-morphed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/radio-morphed.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/radio-morphed.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/radio-multiple-selected.html b/tests/wpt/tests/html/semantics/forms/the-input-element/radio-multiple-selected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/radio-multiple-selected.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/radio-multiple-selected.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/radio.html b/tests/wpt/tests/html/semantics/forms/the-input-element/radio.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/radio.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/radio.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-2.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-2.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-intrinsic-size-ref.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-intrinsic-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-intrinsic-size-ref.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-intrinsic-size-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-intrinsic-size.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-intrinsic-size.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-intrinsic-size.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-intrinsic-size.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-list-added-repaint.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-list-added-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-list-added-repaint.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-list-added-repaint.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-list-change-repaint.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-list-change-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-list-change-repaint.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-list-change-repaint.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-list-duplicate-id-repaint.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-list-duplicate-id-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-list-duplicate-id-repaint.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-list-duplicate-id-repaint.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-list-nonexistent.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-list-nonexistent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-list-nonexistent.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-list-nonexistent.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-option-add-repaint.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-option-add-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-option-add-repaint.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-option-add-repaint.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-option-remove-repaint.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-option-remove-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-option-remove-repaint.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-option-remove-repaint.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-option-value-change-repaint.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-option-value-change-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-option-value-change-repaint.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-option-value-change-repaint.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-restore-oninput-onchange-event.https.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-restore-oninput-onchange-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-restore-oninput-onchange-event.https.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-restore-oninput-onchange-event.https.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-setattribute-value-ref.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-setattribute-value-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-setattribute-value-ref.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-setattribute-value-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-setattribute-value.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-setattribute-value.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-setattribute-value.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-setattribute-value.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-01-notref.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-01-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-01-notref.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-01-notref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-01.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-01.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-02-ref.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-02-ref.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-02-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-02.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-02.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-02.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-03-notref.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-03-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-03-notref.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-03-notref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-03.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-03.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-03.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-04-ref.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-04-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-04-ref.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-04-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-04.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-04.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-04.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-04.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-05-ref.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-05-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-05-ref.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-05-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-05.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-05.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range-tick-marks-05.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range-tick-marks-05.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range.html b/tests/wpt/tests/html/semantics/forms/the-input-element/range.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/range.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/required_attribute.html b/tests/wpt/tests/html/semantics/forms/the-input-element/required_attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/required_attribute.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/required_attribute.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/reset.html b/tests/wpt/tests/html/semantics/forms/the-input-element/reset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/reset.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/reset.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/resources/image-submit-click.html b/tests/wpt/tests/html/semantics/forms/the-input-element/resources/image-submit-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/resources/image-submit-click.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/resources/image-submit-click.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/resources/loadresolver.html b/tests/wpt/tests/html/semantics/forms/the-input-element/resources/loadresolver.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/resources/loadresolver.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/resources/loadresolver.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/resources/range-restore-events.html b/tests/wpt/tests/html/semantics/forms/the-input-element/resources/range-restore-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/resources/range-restore-events.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/resources/range-restore-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/resources/range-restore-events.html.headers b/tests/wpt/tests/html/semantics/forms/the-input-element/resources/range-restore-events.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/resources/range-restore-events.html.headers rename to tests/wpt/tests/html/semantics/forms/the-input-element/resources/range-restore-events.html.headers diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/resources/show-picker-child-iframe.html b/tests/wpt/tests/html/semantics/forms/the-input-element/resources/show-picker-child-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/resources/show-picker-child-iframe.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/resources/show-picker-child-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/resources/text-restore-events.html b/tests/wpt/tests/html/semantics/forms/the-input-element/resources/text-restore-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/resources/text-restore-events.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/resources/text-restore-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/resources/text-restore-events.html.headers b/tests/wpt/tests/html/semantics/forms/the-input-element/resources/text-restore-events.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/resources/text-restore-events.html.headers rename to tests/wpt/tests/html/semantics/forms/the-input-element/resources/text-restore-events.html.headers diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/search_input.html b/tests/wpt/tests/html/semantics/forms/the-input-element/search_input.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/search_input.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/search_input.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/selection-pointer.html b/tests/wpt/tests/html/semantics/forms/the-input-element/selection-pointer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/selection-pointer.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/selection-pointer.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/selection-weekmonth.html b/tests/wpt/tests/html/semantics/forms/the-input-element/selection-weekmonth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/selection-weekmonth.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/selection-weekmonth.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/selection.html b/tests/wpt/tests/html/semantics/forms/the-input-element/selection.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/selection.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/selection.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/show-picker-cross-origin-iframe.html b/tests/wpt/tests/html/semantics/forms/the-input-element/show-picker-cross-origin-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/show-picker-cross-origin-iframe.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/show-picker-cross-origin-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/show-picker-disabled-readonly.html b/tests/wpt/tests/html/semantics/forms/the-input-element/show-picker-disabled-readonly.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/show-picker-disabled-readonly.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/show-picker-disabled-readonly.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/show-picker-user-gesture.html b/tests/wpt/tests/html/semantics/forms/the-input-element/show-picker-user-gesture.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/show-picker-user-gesture.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/show-picker-user-gesture.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/telephone.html b/tests/wpt/tests/html/semantics/forms/the-input-element/telephone.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/telephone.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/telephone.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/text.html b/tests/wpt/tests/html/semantics/forms/the-input-element/text.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/text.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/text.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/time-2.html b/tests/wpt/tests/html/semantics/forms/the-input-element/time-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/time-2.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/time-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/time-datalist-crash.html b/tests/wpt/tests/html/semantics/forms/the-input-element/time-datalist-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/time-datalist-crash.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/time-datalist-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/time-focus-dynamic-value-change.html b/tests/wpt/tests/html/semantics/forms/the-input-element/time-focus-dynamic-value-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/time-focus-dynamic-value-change.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/time-focus-dynamic-value-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/time.html b/tests/wpt/tests/html/semantics/forms/the-input-element/time.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/time.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/time.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/type-change-file-to-text-crash.html b/tests/wpt/tests/html/semantics/forms/the-input-element/type-change-file-to-text-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/type-change-file-to-text-crash.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/type-change-file-to-text-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/type-change-state-weekmonth.html b/tests/wpt/tests/html/semantics/forms/the-input-element/type-change-state-weekmonth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/type-change-state-weekmonth.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/type-change-state-weekmonth.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/type-change-state.html b/tests/wpt/tests/html/semantics/forms/the-input-element/type-change-state.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/type-change-state.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/type-change-state.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/url.html b/tests/wpt/tests/html/semantics/forms/the-input-element/url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/url.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/valueMode-weekmonth.html b/tests/wpt/tests/html/semantics/forms/the-input-element/valueMode-weekmonth.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/valueMode-weekmonth.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/valueMode-weekmonth.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/valueMode.html b/tests/wpt/tests/html/semantics/forms/the-input-element/valueMode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/valueMode.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/valueMode.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/week.html b/tests/wpt/tests/html/semantics/forms/the-input-element/week.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/week.html rename to tests/wpt/tests/html/semantics/forms/the-input-element/week.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/clicking-interactive-content.html b/tests/wpt/tests/html/semantics/forms/the-label-element/clicking-interactive-content.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/clicking-interactive-content.html rename to tests/wpt/tests/html/semantics/forms/the-label-element/clicking-interactive-content.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/clicking-noninteractive-labelable-content.html b/tests/wpt/tests/html/semantics/forms/the-label-element/clicking-noninteractive-labelable-content.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/clicking-noninteractive-labelable-content.html rename to tests/wpt/tests/html/semantics/forms/the-label-element/clicking-noninteractive-labelable-content.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/clicking-noninteractive-unlabelable-content.html b/tests/wpt/tests/html/semantics/forms/the-label-element/clicking-noninteractive-unlabelable-content.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/clicking-noninteractive-unlabelable-content.html rename to tests/wpt/tests/html/semantics/forms/the-label-element/clicking-noninteractive-unlabelable-content.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/forward-focus-to-associated-element.html b/tests/wpt/tests/html/semantics/forms/the-label-element/forward-focus-to-associated-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/forward-focus-to-associated-element.html rename to tests/wpt/tests/html/semantics/forms/the-label-element/forward-focus-to-associated-element.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/iframe-label-attributes.html b/tests/wpt/tests/html/semantics/forms/the-label-element/iframe-label-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/iframe-label-attributes.html rename to tests/wpt/tests/html/semantics/forms/the-label-element/iframe-label-attributes.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/label-attributes.sub.html b/tests/wpt/tests/html/semantics/forms/the-label-element/label-attributes.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/label-attributes.sub.html rename to tests/wpt/tests/html/semantics/forms/the-label-element/label-attributes.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/label-inside-anchor.html b/tests/wpt/tests/html/semantics/forms/the-label-element/label-inside-anchor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/label-inside-anchor.html rename to tests/wpt/tests/html/semantics/forms/the-label-element/label-inside-anchor.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/labelable-elements.html b/tests/wpt/tests/html/semantics/forms/the-label-element/labelable-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/labelable-elements.html rename to tests/wpt/tests/html/semantics/forms/the-label-element/labelable-elements.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/proxy-click-to-associated-element.html b/tests/wpt/tests/html/semantics/forms/the-label-element/proxy-click-to-associated-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/proxy-click-to-associated-element.html rename to tests/wpt/tests/html/semantics/forms/the-label-element/proxy-click-to-associated-element.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/proxy-modifier-click-to-associated-element.tentative.html b/tests/wpt/tests/html/semantics/forms/the-label-element/proxy-modifier-click-to-associated-element.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/proxy-modifier-click-to-associated-element.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-label-element/proxy-modifier-click-to-associated-element.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-legend-element/HTMLLegendElement.html b/tests/wpt/tests/html/semantics/forms/the-legend-element/HTMLLegendElement.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-legend-element/HTMLLegendElement.html rename to tests/wpt/tests/html/semantics/forms/the-legend-element/HTMLLegendElement.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-legend-element/legend-form.html b/tests/wpt/tests/html/semantics/forms/the-legend-element/legend-form.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-legend-element/legend-form.html rename to tests/wpt/tests/html/semantics/forms/the-legend-element/legend-form.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-meter-element/meter-min-rendering-ref.html b/tests/wpt/tests/html/semantics/forms/the-meter-element/meter-min-rendering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-meter-element/meter-min-rendering-ref.html rename to tests/wpt/tests/html/semantics/forms/the-meter-element/meter-min-rendering-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-meter-element/meter-min-rendering.html b/tests/wpt/tests/html/semantics/forms/the-meter-element/meter-min-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-meter-element/meter-min-rendering.html rename to tests/wpt/tests/html/semantics/forms/the-meter-element/meter-min-rendering.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-meter-element/meter.html b/tests/wpt/tests/html/semantics/forms/the-meter-element/meter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-meter-element/meter.html rename to tests/wpt/tests/html/semantics/forms/the-meter-element/meter.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-optgroup-element/optgroup-disabled-manual.html b/tests/wpt/tests/html/semantics/forms/the-optgroup-element/optgroup-disabled-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-optgroup-element/optgroup-disabled-manual.html rename to tests/wpt/tests/html/semantics/forms/the-optgroup-element/optgroup-disabled-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/dynamic-content-change-rendering-ref.html b/tests/wpt/tests/html/semantics/forms/the-option-element/dynamic-content-change-rendering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/dynamic-content-change-rendering-ref.html rename to tests/wpt/tests/html/semantics/forms/the-option-element/dynamic-content-change-rendering-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/dynamic-content-change-rendering.html b/tests/wpt/tests/html/semantics/forms/the-option-element/dynamic-content-change-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/dynamic-content-change-rendering.html rename to tests/wpt/tests/html/semantics/forms/the-option-element/dynamic-content-change-rendering.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-disabled-manual.html b/tests/wpt/tests/html/semantics/forms/the-option-element/option-disabled-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-disabled-manual.html rename to tests/wpt/tests/html/semantics/forms/the-option-element/option-disabled-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-element-constructor.html b/tests/wpt/tests/html/semantics/forms/the-option-element/option-element-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-element-constructor.html rename to tests/wpt/tests/html/semantics/forms/the-option-element/option-element-constructor.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-form.html b/tests/wpt/tests/html/semantics/forms/the-option-element/option-form.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-form.html rename to tests/wpt/tests/html/semantics/forms/the-option-element/option-form.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-index.html b/tests/wpt/tests/html/semantics/forms/the-option-element/option-index.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-index.html rename to tests/wpt/tests/html/semantics/forms/the-option-element/option-index.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-label-value.js b/tests/wpt/tests/html/semantics/forms/the-option-element/option-label-value.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-label-value.js rename to tests/wpt/tests/html/semantics/forms/the-option-element/option-label-value.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-label.html b/tests/wpt/tests/html/semantics/forms/the-option-element/option-label.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-label.html rename to tests/wpt/tests/html/semantics/forms/the-option-element/option-label.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-selected.html b/tests/wpt/tests/html/semantics/forms/the-option-element/option-selected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-selected.html rename to tests/wpt/tests/html/semantics/forms/the-option-element/option-selected.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-text-backslash.html b/tests/wpt/tests/html/semantics/forms/the-option-element/option-text-backslash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-text-backslash.html rename to tests/wpt/tests/html/semantics/forms/the-option-element/option-text-backslash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-text-label.html b/tests/wpt/tests/html/semantics/forms/the-option-element/option-text-label.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-text-label.html rename to tests/wpt/tests/html/semantics/forms/the-option-element/option-text-label.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-text-recurse.html b/tests/wpt/tests/html/semantics/forms/the-option-element/option-text-recurse.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-text-recurse.html rename to tests/wpt/tests/html/semantics/forms/the-option-element/option-text-recurse.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-text-setter.html b/tests/wpt/tests/html/semantics/forms/the-option-element/option-text-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-text-setter.html rename to tests/wpt/tests/html/semantics/forms/the-option-element/option-text-setter.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-text-spaces.html b/tests/wpt/tests/html/semantics/forms/the-option-element/option-text-spaces.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-text-spaces.html rename to tests/wpt/tests/html/semantics/forms/the-option-element/option-text-spaces.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-value.html b/tests/wpt/tests/html/semantics/forms/the-option-element/option-value.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-option-element/option-value.html rename to tests/wpt/tests/html/semantics/forms/the-option-element/option-value.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-output-element/mutations.window.js b/tests/wpt/tests/html/semantics/forms/the-output-element/mutations.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-output-element/mutations.window.js rename to tests/wpt/tests/html/semantics/forms/the-output-element/mutations.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-output-element/output-setcustomvalidity.html b/tests/wpt/tests/html/semantics/forms/the-output-element/output-setcustomvalidity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-output-element/output-setcustomvalidity.html rename to tests/wpt/tests/html/semantics/forms/the-output-element/output-setcustomvalidity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-output-element/output-validity.html b/tests/wpt/tests/html/semantics/forms/the-output-element/output-validity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-output-element/output-validity.html rename to tests/wpt/tests/html/semantics/forms/the-output-element/output-validity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-output-element/output.html b/tests/wpt/tests/html/semantics/forms/the-output-element/output.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-output-element/output.html rename to tests/wpt/tests/html/semantics/forms/the-output-element/output.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-progress-element/progress-2.html b/tests/wpt/tests/html/semantics/forms/the-progress-element/progress-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-progress-element/progress-2.html rename to tests/wpt/tests/html/semantics/forms/the-progress-element/progress-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-progress-element/progress.html b/tests/wpt/tests/html/semantics/forms/the-progress-element/progress.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-progress-element/progress.html rename to tests/wpt/tests/html/semantics/forms/the-progress-element/progress.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-progress-element/progress.window.js b/tests/wpt/tests/html/semantics/forms/the-progress-element/progress.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-progress-element/progress.window.js rename to tests/wpt/tests/html/semantics/forms/the-progress-element/progress.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection-add.html b/tests/wpt/tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection-add.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection-add.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection-add.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection-namedItem.html b/tests/wpt/tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection-namedItem.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection-namedItem.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection-namedItem.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection.html b/tests/wpt/tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/inserted-or-removed.html b/tests/wpt/tests/html/semantics/forms/the-select-element/inserted-or-removed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/inserted-or-removed.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/inserted-or-removed.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/reset-algorithm-rendering-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/reset-algorithm-rendering-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/reset-algorithm-rendering-ref.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/reset-algorithm-rendering-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/reset-algorithm-rendering.html b/tests/wpt/tests/html/semantics/forms/the-select-element/reset-algorithm-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/reset-algorithm-rendering.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/reset-algorithm-rendering.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-add-option-crash.html b/tests/wpt/tests/html/semantics/forms/the-select-element/select-add-option-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-add-option-crash.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/select-add-option-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-add.html b/tests/wpt/tests/html/semantics/forms/the-select-element/select-add.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-add.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/select-add.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-ask-for-reset.html b/tests/wpt/tests/html/semantics/forms/the-select-element/select-ask-for-reset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-ask-for-reset.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/select-ask-for-reset.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-multiple.html b/tests/wpt/tests/html/semantics/forms/the-select-element/select-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-multiple.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/select-multiple.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-named-getter.html b/tests/wpt/tests/html/semantics/forms/the-select-element/select-named-getter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-named-getter.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/select-named-getter.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-remove.html b/tests/wpt/tests/html/semantics/forms/the-select-element/select-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-remove.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/select-remove.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-selectedOptions.html b/tests/wpt/tests/html/semantics/forms/the-select-element/select-selectedOptions.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-selectedOptions.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/select-selectedOptions.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-setcustomvalidity.html b/tests/wpt/tests/html/semantics/forms/the-select-element/select-setcustomvalidity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-setcustomvalidity.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/select-setcustomvalidity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-validity.html b/tests/wpt/tests/html/semantics/forms/the-select-element/select-validity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-validity.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/select-validity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-value.html b/tests/wpt/tests/html/semantics/forms/the-select-element/select-value.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-value.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/select-value.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-willvalidate-readonly-attribute.html b/tests/wpt/tests/html/semantics/forms/the-select-element/select-willvalidate-readonly-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/select-willvalidate-readonly-attribute.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/select-willvalidate-readonly-attribute.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/selected-index.html b/tests/wpt/tests/html/semantics/forms/the-select-element/selected-index.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-select-element/selected-index.html rename to tests/wpt/tests/html/semantics/forms/the-select-element/selected-index.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-disabled.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-disabled.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-disabled.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-disabled.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-events.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-events.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-events.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-events.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-attribute.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-attribute.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-attribute.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-attribute.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-elements.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-elements.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-elements.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-elements.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-keyboard.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-keyboard.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-keyboard.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-keyboard.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-listbox-fallback-change-crash.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-listbox-fallback-change-crash.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-listbox-fallback-change-crash.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-listbox-fallback-change-crash.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-many-options.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-many-options.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-many-options.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-many-options.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part-ref.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot-ref.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-nested.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-nested.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-nested.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-nested.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed-ref.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed-ref.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed-ref.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed-ref.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed-ref.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed-ref.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-focusable.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-focusable.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-focusable.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-focusable.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-parts-structure.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-parts-structure.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-parts-structure.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-parts-structure.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position-with-zoom.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position-with-zoom.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position-with-zoom.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position-with-zoom.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-light-dismiss-invalidation.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-light-dismiss-invalidation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-light-dismiss-invalidation.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-light-dismiss-invalidation.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-required-attribute.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-required-attribute.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-required-attribute.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-required-attribute.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior-ref.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part-ref.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot-ref.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-tab-navigation.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-tab-navigation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-tab-navigation.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-tab-navigation.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-tabindex-order.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-tabindex-order.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-tabindex-order.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-tabindex-order.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-tb-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-tb-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-tb-ref.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-tb-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/support/back.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/support/back.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/support/back.html rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/support/back.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/support/fake-selectmenu.js b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/support/fake-selectmenu.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/support/fake-selectmenu.js rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/support/fake-selectmenu.js diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/support/selectmenu_button_icon.svg b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/support/selectmenu_button_icon.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-selectmenu-element/support/selectmenu_button_icon.svg rename to tests/wpt/tests/html/semantics/forms/the-selectmenu-element/support/selectmenu_button_icon.svg diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/cloning-steps.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/cloning-steps.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/cloning-steps.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/cloning-steps.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/multiline-placeholder-cr.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/multiline-placeholder-cr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/multiline-placeholder-cr.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/multiline-placeholder-cr.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/multiline-placeholder-crlf.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/multiline-placeholder-crlf.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/multiline-placeholder-crlf.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/multiline-placeholder-crlf.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/multiline-placeholder-ref.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/multiline-placeholder-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/multiline-placeholder-ref.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/multiline-placeholder-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/multiline-placeholder.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/multiline-placeholder.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/multiline-placeholder.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/multiline-placeholder.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/placeholder-white-space-notref.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/placeholder-white-space-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/placeholder-white-space-notref.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/placeholder-white-space-notref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/placeholder-white-space.tentative.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/placeholder-white-space.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/placeholder-white-space.tentative.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/placeholder-white-space.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/support/placeholder.css b/tests/wpt/tests/html/semantics/forms/the-textarea-element/support/placeholder.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/support/placeholder.css rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/support/placeholder.css diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-maxlength.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-maxlength.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-maxlength.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-maxlength.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-minlength.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-minlength.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-minlength.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-minlength.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi-ref.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi-ref.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-placeholder-lineheight.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-placeholder-lineheight.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-placeholder-lineheight.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-placeholder-lineheight.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-placeholder-manual.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-placeholder-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-placeholder-manual.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-placeholder-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-select-event-manual.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-select-event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-select-event-manual.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-select-event-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-select-manual.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-select-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-select-manual.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-select-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-setcustomvalidity.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-setcustomvalidity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-setcustomvalidity.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-setcustomvalidity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-splittext-with-range-crash.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-splittext-with-range-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-splittext-with-range-crash.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-splittext-with-range-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-splittext-with-range-simple-crash.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-splittext-with-range-simple-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-splittext-with-range-simple-crash.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-splittext-with-range-simple-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-textLength.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-textLength.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-textLength.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-textLength.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-type.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-type.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-type.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-validity-clone.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-validity-clone.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-validity-clone.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-validity-clone.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-validity-valueMissing-inside-datalist.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-validity-valueMissing-inside-datalist.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/textarea-validity-valueMissing-inside-datalist.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/textarea-validity-valueMissing-inside-datalist.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/value-defaultValue-textContent-xhtml.xhtml b/tests/wpt/tests/html/semantics/forms/the-textarea-element/value-defaultValue-textContent-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/value-defaultValue-textContent-xhtml.xhtml rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/value-defaultValue-textContent-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/value-defaultValue-textContent.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/value-defaultValue-textContent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/value-defaultValue-textContent.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/value-defaultValue-textContent.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/wrap-enumerated-ascii-case-insensitive-child.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/wrap-enumerated-ascii-case-insensitive-child.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/wrap-enumerated-ascii-case-insensitive-child.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/wrap-enumerated-ascii-case-insensitive-child.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/wrap-enumerated-ascii-case-insensitive.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/wrap-enumerated-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/wrap-enumerated-ascii-case-insensitive.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/wrap-enumerated-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/wrap-reflect-1-ref.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/wrap-reflect-1-ref.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/wrap-reflect-1a.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/wrap-reflect-1a.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1a.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/wrap-reflect-1b.html b/tests/wpt/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/wrap-reflect-1b.html rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1b.html diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/wrapping-transformation.window.js b/tests/wpt/tests/html/semantics/forms/the-textarea-element/wrapping-transformation.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/forms/the-textarea-element/wrapping-transformation.window.js rename to tests/wpt/tests/html/semantics/forms/the-textarea-element/wrapping-transformation.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/META.yml b/tests/wpt/tests/html/semantics/grouping-content/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/META.yml rename to tests/wpt/tests/html/semantics/grouping-content/META.yml diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-dd-element/grouping-dd.html b/tests/wpt/tests/html/semantics/grouping-content/the-dd-element/grouping-dd.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-dd-element/grouping-dd.html rename to tests/wpt/tests/html/semantics/grouping-content/the-dd-element/grouping-dd.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-div-element/grouping-div.html b/tests/wpt/tests/html/semantics/grouping-content/the-div-element/grouping-div.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-div-element/grouping-div.html rename to tests/wpt/tests/html/semantics/grouping-content/the-div-element/grouping-div.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-dl-element/grouping-dl.html b/tests/wpt/tests/html/semantics/grouping-content/the-dl-element/grouping-dl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-dl-element/grouping-dl.html rename to tests/wpt/tests/html/semantics/grouping-content/the-dl-element/grouping-dl.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-dt-element/grouping-dt.html b/tests/wpt/tests/html/semantics/grouping-content/the-dt-element/grouping-dt.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-dt-element/grouping-dt.html rename to tests/wpt/tests/html/semantics/grouping-content/the-dt-element/grouping-dt.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-figcaption-element/grouping-figcaption.html b/tests/wpt/tests/html/semantics/grouping-content/the-figcaption-element/grouping-figcaption.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-figcaption-element/grouping-figcaption.html rename to tests/wpt/tests/html/semantics/grouping-content/the-figcaption-element/grouping-figcaption.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-figure-element/grouping-figure.html b/tests/wpt/tests/html/semantics/grouping-content/the-figure-element/grouping-figure.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-figure-element/grouping-figure.html rename to tests/wpt/tests/html/semantics/grouping-content/the-figure-element/grouping-figure.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-hr-element/grouping-hr.html b/tests/wpt/tests/html/semantics/grouping-content/the-hr-element/grouping-hr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-hr-element/grouping-hr.html rename to tests/wpt/tests/html/semantics/grouping-content/the-hr-element/grouping-hr.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-novalue-manual.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-novalue-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-novalue-manual.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-novalue-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-003-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-003-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-003-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-003.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-003.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-003.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-006.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-006.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-006.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-007.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-007.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-007.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-display-list-item-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-display-list-item-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-display-list-item-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-display-list-item-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-display-list-item.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-display-list-item.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-display-list-item.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-display-list-item.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-menu-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-menu-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-menu-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-menu-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-menu.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-menu.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-menu.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-menu.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-mixed-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-mixed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-mixed-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-mixed-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-mixed.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-mixed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-mixed.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-mixed.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-not-dir-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-not-dir-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-not-dir-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-not-dir-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-not-dir.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-not-dir.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-not-dir.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-not-dir.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ol-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ol-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ol-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ol-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ol.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ol.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ol.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ol.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-parent-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-parent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-parent-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-parent-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-parent.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-parent.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-parent.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-skip-no-boxes-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-skip-no-boxes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-skip-no-boxes-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-skip-no-boxes-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-skip-no-boxes.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-skip-no-boxes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-skip-no-boxes.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-skip-no-boxes.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ul-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ul-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ul-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ul-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ul.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ul.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ul.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-list-owner-ul.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-not-being-rendered-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-not-being-rendered-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-not-being-rendered-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-not-being-rendered-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-not-being-rendered.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-not-being-rendered.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-not-being-rendered.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-not-being-rendered.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li.html b/tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li.html rename to tests/wpt/tests/html/semantics/grouping-content/the-li-element/grouping-li.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/grouping-ol.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/grouping-ol.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-1.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-1.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-2.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-2.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-1-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1a.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-1a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1a.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-1a.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1b.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-1b.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1b.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-1b.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1c.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-1c.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1c.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-1c.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1d.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-1d.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1d.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-1d.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1e.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-1e.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1e.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-1e.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-2-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-2-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-2-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-2.html b/tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-2.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ol-element/reversed-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-p-element/grouping-p.html b/tests/wpt/tests/html/semantics/grouping-content/the-p-element/grouping-p.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-p-element/grouping-p.html rename to tests/wpt/tests/html/semantics/grouping-content/the-p-element/grouping-p.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001.html b/tests/wpt/tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001.html rename to tests/wpt/tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-pre-element/grouping-pre.html b/tests/wpt/tests/html/semantics/grouping-content/the-pre-element/grouping-pre.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-pre-element/grouping-pre.html rename to tests/wpt/tests/html/semantics/grouping-content/the-pre-element/grouping-pre.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi-ref.html b/tests/wpt/tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi-ref.html rename to tests/wpt/tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi.html b/tests/wpt/tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi.html rename to tests/wpt/tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi.html diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ul-element/grouping-ul.html b/tests/wpt/tests/html/semantics/grouping-content/the-ul-element/grouping-ul.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/grouping-content/the-ul-element/grouping-ul.html rename to tests/wpt/tests/html/semantics/grouping-content/the-ul-element/grouping-ul.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/META.yml b/tests/wpt/tests/html/semantics/interactive-elements/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/META.yml rename to tests/wpt/tests/html/semantics/interactive-elements/META.yml diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/common/accesskey.js b/tests/wpt/tests/html/semantics/interactive-elements/commands/common/accesskey.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/common/accesskey.js rename to tests/wpt/tests/html/semantics/interactive-elements/commands/common/accesskey.js diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/first-input-after-legend-manual.html b/tests/wpt/tests/html/semantics/interactive-elements/commands/legend/first-input-after-legend-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/first-input-after-legend-manual.html rename to tests/wpt/tests/html/semantics/interactive-elements/commands/legend/first-input-after-legend-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/first-input-before-legend-manual.html b/tests/wpt/tests/html/semantics/interactive-elements/commands/legend/first-input-before-legend-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/first-input-before-legend-manual.html rename to tests/wpt/tests/html/semantics/interactive-elements/commands/legend/first-input-before-legend-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/first-input-inside-legend-manual.html b/tests/wpt/tests/html/semantics/interactive-elements/commands/legend/first-input-inside-legend-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/first-input-inside-legend-manual.html rename to tests/wpt/tests/html/semantics/interactive-elements/commands/legend/first-input-inside-legend-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/focusable-legend-manual.html b/tests/wpt/tests/html/semantics/interactive-elements/commands/legend/focusable-legend-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/focusable-legend-manual.html rename to tests/wpt/tests/html/semantics/interactive-elements/commands/legend/focusable-legend-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/focusable-legend-sibling-manual.html b/tests/wpt/tests/html/semantics/interactive-elements/commands/legend/focusable-legend-sibling-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/focusable-legend-sibling-manual.html rename to tests/wpt/tests/html/semantics/interactive-elements/commands/legend/focusable-legend-sibling-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/input-outside-fieldset-manual.html b/tests/wpt/tests/html/semantics/interactive-elements/commands/legend/input-outside-fieldset-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/input-outside-fieldset-manual.html rename to tests/wpt/tests/html/semantics/interactive-elements/commands/legend/input-outside-fieldset-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/label-sibling-manual.html b/tests/wpt/tests/html/semantics/interactive-elements/commands/legend/label-sibling-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/label-sibling-manual.html rename to tests/wpt/tests/html/semantics/interactive-elements/commands/legend/label-sibling-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/no-fieldset-parent-manual.html b/tests/wpt/tests/html/semantics/interactive-elements/commands/legend/no-fieldset-parent-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/commands/legend/no-fieldset-parent-manual.html rename to tests/wpt/tests/html/semantics/interactive-elements/commands/legend/no-fieldset-parent-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/contextmenu-historical.html b/tests/wpt/tests/html/semantics/interactive-elements/contextmenu-historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/contextmenu-historical.html rename to tests/wpt/tests/html/semantics/interactive-elements/contextmenu-historical.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/auto-expand-ax-slot-recalc-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/auto-expand-ax-slot-recalc-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/auto-expand-ax-slot-recalc-crash.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/auto-expand-ax-slot-recalc-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/auto-expand-details-element-fragment.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/auto-expand-details-element-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/auto-expand-details-element-fragment.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/auto-expand-details-element-fragment.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/auto-expand-window-find-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/auto-expand-window-find-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/auto-expand-window-find-crash.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/auto-expand-window-find-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/closed-details-layout-apis.tentative.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/closed-details-layout-apis.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/closed-details-layout-apis.tentative.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/closed-details-layout-apis.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/details-add-summary-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/details-add-summary-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/details-add-summary-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/details-add-summary-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/details-add-summary.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/details-add-summary.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/details-add-summary.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/details-add-summary.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/details-cq-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/details-cq-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/details-cq-crash.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/details-cq-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/details-findstring-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/details-findstring-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/details-findstring-crash.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/details-findstring-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/details-keyboard-activation.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/details-keyboard-activation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/details-keyboard-activation.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/details-keyboard-activation.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/details.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/details.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/details.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/details.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/display-table-with-rt-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/display-table-with-rt-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/display-table-with-rt-crash.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/display-table-with-rt-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/modified-details-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/modified-details-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/modified-details-crash.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/modified-details-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/nested-details-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/nested-details-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/nested-details-crash.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/nested-details-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/nested-top-layer-elements-in-details-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/nested-top-layer-elements-in-details-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/nested-top-layer-elements-in-details-crash.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/nested-top-layer-elements-in-details-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/toggleEvent.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/toggleEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-details-element/toggleEvent.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-details-element/toggleEvent.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-descendant-selector-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-descendant-selector-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-descendant-selector-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-descendant-selector-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-descendant-selector.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-descendant-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-descendant-selector.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-descendant-selector.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-display-none-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-display-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-display-none-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-display-none-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-display-none.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-display-none.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-display-none.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-style-change-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-style-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-style-change-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-style-change-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-style-change.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-style-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-style-change.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-style-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-in-flow-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-in-flow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-in-flow-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-in-flow-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-in-flow.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-in-flow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-in-flow.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-in-flow.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-receives-element-events.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-receives-element-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-receives-element-events.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-receives-element-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-stacking-order-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-stacking-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-stacking-order-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-stacking-order-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-stacking-order.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-stacking-order.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/backdrop-stacking-order.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-stacking-order.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/centering-iframe.sub.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/centering-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/centering-iframe.sub.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/centering-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/centering.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/centering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/centering.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/centering.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/child-sequential-focus.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/child-sequential-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/child-sequential-focus.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/child-sequential-focus.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/closed-dialog-does-not-block-mouse-events.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/closed-dialog-does-not-block-mouse-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/closed-dialog-does-not-block-mouse-events.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/closed-dialog-does-not-block-mouse-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/default-color.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/default-color.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/default-color.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/default-color.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-audio-video-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-audio-video-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-audio-video-crash.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-audio-video-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-autofocus-just-once.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-autofocus-just-once.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-autofocus-just-once.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-autofocus-just-once.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-autofocus-multiple-times.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-autofocus-multiple-times.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-autofocus-multiple-times.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-autofocus-multiple-times.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-autofocus.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-autofocus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-autofocus.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-autofocus.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-events-closewatcher.tentative.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-events-closewatcher.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-events-closewatcher.tentative.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-events-closewatcher.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-events.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-events.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-preventDefault-closewatcher.tentative.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-preventDefault-closewatcher.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-preventDefault-closewatcher.tentative.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-preventDefault-closewatcher.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-preventDefault.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-preventDefault.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-preventDefault.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-preventDefault.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-with-input.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-with-input.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-with-input.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-with-input.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-with-select.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-with-select.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-with-select.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-with-select.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-canceling.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-canceling.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-canceling.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-canceling.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-close-event-async.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-close-event-async.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-close-event-async.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-close-event-async.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-close-event.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-close-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-close-event.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-close-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-close.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-close.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-close.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-close.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-enabled.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-enabled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-enabled.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-enabled.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-focus-previous-outside.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focus-previous-outside.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-focus-previous-outside.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focus-previous-outside.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-focus-shadow-double-nested.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focus-shadow-double-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-focus-shadow-double-nested.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focus-shadow-double-nested.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-focus-shadow.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focus-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-focus-shadow.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focus-shadow.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusing-steps-disconnected.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusing-steps-disconnected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusing-steps-disconnected.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusing-steps-disconnected.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusing-steps-inert.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusing-steps-inert.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusing-steps-inert.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusing-steps-inert.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusing-steps-prevent-autofocus.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusing-steps-prevent-autofocus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusing-steps-prevent-autofocus.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-focusing-steps-prevent-autofocus.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission-unusual.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission-unusual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission-unusual.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission-unusual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-inert.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-inert.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-inert.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-inert.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-keydown-preventDefault.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-keydown-preventDefault.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-keydown-preventDefault.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-keydown-preventDefault.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-no-throw-requested-state.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-no-throw-requested-state.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-no-throw-requested-state.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-no-throw-requested-state.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-not-in-tree-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-not-in-tree-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-not-in-tree-crash.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-not-in-tree-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-open-2.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-open-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-open-2.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-open-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-open.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-open.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-open.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-overlay-re-add-during-transition.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-overlay-re-add-during-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-overlay-re-add-during-transition.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-overlay-re-add-during-transition.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-overlay.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-overlay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-overlay.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-overlay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-return-value.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal-inert-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal-inert-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal-inert-crash.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal-inert-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal-remove.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal-remove.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal-remove.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialogs-with-no-backdrop-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialogs-with-no-backdrop-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialogs-with-no-backdrop-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialogs-with-no-backdrop-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialogs-with-no-backdrop.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialogs-with-no-backdrop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialogs-with-no-backdrop.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialogs-with-no-backdrop.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dont-share-style-to-top-layer-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dont-share-style-to-top-layer-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dont-share-style-to-top-layer-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dont-share-style-to-top-layer-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dont-share-style-to-top-layer.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dont-share-style-to-top-layer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dont-share-style-to-top-layer.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dont-share-style-to-top-layer.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/element-removed-from-top-layer-has-original-position-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/element-removed-from-top-layer-has-original-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/element-removed-from-top-layer-has-original-position-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/element-removed-from-top-layer-has-original-position-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/element-removed-from-top-layer-has-original-position.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/element-removed-from-top-layer-has-original-position.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/element-removed-from-top-layer-has-original-position.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/element-removed-from-top-layer-has-original-position.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-contain-ancestor.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-contain-ancestor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-contain-ancestor.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-contain-ancestor.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-fixed-position-cb-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-fixed-position-cb-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-fixed-position-cb-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-fixed-position-cb-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-fo-ancestor.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-fo-ancestor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-fo-ancestor.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-fo-ancestor.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-transformed-ancestor.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-transformed-ancestor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-transformed-ancestor.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-transformed-ancestor.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-will-change-ancestor.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-will-change-ancestor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-will-change-ancestor.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/fixed-position-child-with-will-change-ancestor.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/focus-after-close.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/focus-after-close.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/focus-after-close.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/focus-after-close.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/green-dialog-and-backdrop.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/green-dialog-and-backdrop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/green-dialog-and-backdrop.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/green-dialog-and-backdrop.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-does-not-match-disabled-selector.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-does-not-match-disabled-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-does-not-match-disabled-selector.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-does-not-match-disabled-selector.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-focus-in-frames.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-focus-in-frames.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-focus-in-frames.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-focus-in-frames.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-inlines.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-inlines.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-inlines.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-inlines.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-label-focus.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-label-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-label-focus.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-label-focus.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-not-highlighted-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-not-highlighted-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-not-highlighted-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-not-highlighted-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-not-highlighted.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-not-highlighted.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-not-highlighted.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-not-highlighted.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-uneditable.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-uneditable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-uneditable.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-uneditable.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-unfocusable.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-unfocusable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-unfocusable.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-unfocusable.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-unselectable.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-unselectable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-unselectable.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-node-is-unselectable.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-svg-hittest.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-svg-hittest.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inert-svg-hittest.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inert-svg-hittest.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inertness-with-modal-dialogs-and-iframes.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inertness-with-modal-dialogs-and-iframes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/inertness-with-modal-dialogs-and-iframes.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/inertness-with-modal-dialogs-and-iframes.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-ancestor-is-inert.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-ancestor-is-inert.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-ancestor-is-inert.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-ancestor-is-inert.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop-opacity-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop-opacity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop-opacity-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop-opacity-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop-opacity.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop-opacity.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop-opacity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-backdrop.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-blocks-mouse-events.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-blocks-mouse-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-blocks-mouse-events.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-blocks-mouse-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-display-contents-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-display-contents-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-display-contents-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-display-contents-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-display-contents.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-display-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-display-contents.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-display-contents.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-generated-content-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-generated-content-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-generated-content-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-generated-content-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-generated-content.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-generated-content.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-generated-content.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-generated-content.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-iframe-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-iframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-iframe-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-iframe-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-iframe.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-iframe.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-object-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-object-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-object-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-object-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-object.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-object.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-object.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-object.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-replaced-renderer-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-replaced-renderer-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-replaced-renderer-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-replaced-renderer-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-replaced-renderer.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-replaced-renderer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-replaced-renderer.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-replaced-renderer.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-table-column-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-table-column-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-table-column-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-table-column-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-table-column.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-table-column.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-table-column.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-table-column.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-visibility-hidden.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-visibility-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-visibility-hidden.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-in-visibility-hidden.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-scroll-height.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-scroll-height.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-scroll-height.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-scroll-height.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-selection.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-selection.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-selection.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-selection.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-sibling-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-sibling-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-sibling-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-sibling-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-sibling.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-sibling.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/modal-dialog-sibling.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/multiple-centered-dialogs.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/multiple-centered-dialogs.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/multiple-centered-dialogs.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/multiple-centered-dialogs.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/non-modal-dialog-does-not-block-mouse-events.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/non-modal-dialog-does-not-block-mouse-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/non-modal-dialog-does-not-block-mouse-events.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/non-modal-dialog-does-not-block-mouse-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/non-modal-dialog-layout.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/non-modal-dialog-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/non-modal-dialog-layout.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/non-modal-dialog-layout.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/pass-dialog-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/pass-dialog-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/pass-dialog-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/pass-dialog-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/remove-dialog-should-unblock-document.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/remove-dialog-should-unblock-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/remove-dialog-should-unblock-document.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/remove-dialog-should-unblock-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/removed-element-is-removed-from-top-layer-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/removed-element-is-removed-from-top-layer-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/removed-element-is-removed-from-top-layer-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/removed-element-is-removed-from-top-layer-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/removed-element-is-removed-from-top-layer.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/removed-element-is-removed-from-top-layer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/removed-element-is-removed-from-top-layer.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/removed-element-is-removed-from-top-layer.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/resources/common.js b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/resources/common.js rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/resources/common.js diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/resources/dialog.css b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/resources/dialog.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/resources/dialog.css rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/resources/dialog.css diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/resources/inert-focus-in-frames-frame1.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/resources/inert-focus-in-frames-frame1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/resources/inert-focus-in-frames-frame1.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/resources/inert-focus-in-frames-frame1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/resources/inert-focus-in-frames-frame2.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/resources/inert-focus-in-frames-frame2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/resources/inert-focus-in-frames-frame2.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/resources/inert-focus-in-frames-frame2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/resources/submit.jpg b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/resources/submit.jpg similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/resources/submit.jpg rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/resources/submit.jpg diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/show-modal-focusing-steps.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/showmodal-in-shadow-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/showmodal-in-shadow-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/showmodal-in-shadow-crash.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/showmodal-in-shadow-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/showmodal-shadow-sibling-frame-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/showmodal-shadow-sibling-frame-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/showmodal-shadow-sibling-frame-crash.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/showmodal-shadow-sibling-frame-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/simulated-click-inert.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/simulated-click-inert.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/simulated-click-inert.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/simulated-click-inert.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/submit-dialog-close-event.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/submit-dialog-close-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/submit-dialog-close-event.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/submit-dialog-close-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/synthetic-click-inert.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/synthetic-click-inert.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/synthetic-click-inert.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/synthetic-click-inert.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-containing-block-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-containing-block-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-containing-block-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-containing-block-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-containing-block.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-containing-block.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-containing-block.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-containing-block.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-display-none-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-display-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-display-none-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-display-none-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-display-none.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-display-none.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-display-none.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-nesting-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-nesting-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-nesting-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-nesting-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-nesting.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-nesting.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-nesting.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-nesting.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-clip.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-clip.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-clip.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-filter.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-filter.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-filter.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-mask.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-mask.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-mask.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-mask.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-opacity.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-opacity.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-opacity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-overflow-clip.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-overflow-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-overflow-clip.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-overflow-clip.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-overflow-hidden.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-overflow-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-overflow-hidden.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-overflow-hidden.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-overflow-scroll.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-overflow-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-overflow-scroll.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-overflow-scroll.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-transform.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-transform.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-parent-transform.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position-relative.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position-relative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position-relative.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position-relative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position-static.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position-static.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position-static.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position-static.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-position.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-correct-order-remove-readd-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-correct-order-remove-readd-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-correct-order-remove-readd-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-correct-order-remove-readd-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-correct-order-remove-readd.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-correct-order-remove-readd.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-correct-order-remove-readd.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-correct-order-remove-readd.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-dynamic-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-dynamic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-dynamic-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-dynamic-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-dynamic.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-dynamic.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-dynamic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-ref.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/top-layer-stacking.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-summary-element/activation-behavior.html b/tests/wpt/tests/html/semantics/interactive-elements/the-summary-element/activation-behavior.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-summary-element/activation-behavior.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-summary-element/activation-behavior.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-summary-element/anchor-with-inline-element.html b/tests/wpt/tests/html/semantics/interactive-elements/the-summary-element/anchor-with-inline-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-summary-element/anchor-with-inline-element.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-summary-element/anchor-with-inline-element.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-summary-element/anchor-without-link.html b/tests/wpt/tests/html/semantics/interactive-elements/the-summary-element/anchor-without-link.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-summary-element/anchor-without-link.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-summary-element/anchor-without-link.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-summary-element/click-behavior-optional.tentative.html b/tests/wpt/tests/html/semantics/interactive-elements/the-summary-element/click-behavior-optional.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-summary-element/click-behavior-optional.tentative.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-summary-element/click-behavior-optional.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-summary-element/display-table-with-rt-crash.html b/tests/wpt/tests/html/semantics/interactive-elements/the-summary-element/display-table-with-rt-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-summary-element/display-table-with-rt-crash.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-summary-element/display-table-with-rt-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-summary-element/summary-untrusted-key-event.html b/tests/wpt/tests/html/semantics/interactive-elements/the-summary-element/summary-untrusted-key-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-summary-element/summary-untrusted-key-event.html rename to tests/wpt/tests/html/semantics/interactive-elements/the-summary-element/summary-untrusted-key-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interfaces.html b/tests/wpt/tests/html/semantics/interfaces.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interfaces.html rename to tests/wpt/tests/html/semantics/interfaces.html diff --git a/tests/wpt/web-platform-tests/html/semantics/interfaces.js b/tests/wpt/tests/html/semantics/interfaces.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/interfaces.js rename to tests/wpt/tests/html/semantics/interfaces.js diff --git a/tests/wpt/web-platform-tests/html/semantics/links/META.yml b/tests/wpt/tests/html/semantics/links/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/META.yml rename to tests/wpt/tests/html/semantics/links/META.yml diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-no-referrer-when-downgrade.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-no-referrer-when-downgrade.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-no-referrer-when-downgrade.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-no-referrer-when-downgrade.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-no-referrer.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-no-referrer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-no-referrer.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-no-referrer.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-origin-when-cross-origin.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-origin-when-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-origin-when-cross-origin.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-origin-when-cross-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-origin.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-origin.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-same-origin.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-same-origin.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-same-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-strict-origin-when-cross-origin.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-strict-origin-when-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-strict-origin-when-cross-origin.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-strict-origin-when-cross-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-strict-origin.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-strict-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-strict-origin.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-strict-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-unsafe-url.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-unsafe-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin-unsafe-url.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-origin-unsafe-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin.js b/tests/wpt/tests/html/semantics/links/downloading-resources/header-origin.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-origin.js rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-origin.js diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-no-referrer-when-downgrade.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-no-referrer-when-downgrade.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-no-referrer-when-downgrade.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-no-referrer-when-downgrade.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-no-referrer.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-no-referrer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-no-referrer.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-no-referrer.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-origin-when-cross-origin.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-origin-when-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-origin-when-cross-origin.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-origin-when-cross-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-origin.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-origin.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-same-origin.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-same-origin.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-same-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-strict-origin-when-cross-origin.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-strict-origin-when-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-strict-origin-when-cross-origin.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-strict-origin-when-cross-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-strict-origin.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-strict-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-strict-origin.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-strict-origin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-unsafe-url.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-unsafe-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer-unsafe-url.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer-unsafe-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer.html b/tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer.html rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer.js b/tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/header-referrer.js rename to tests/wpt/tests/html/semantics/links/downloading-resources/header-referrer.js diff --git a/tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/resources/inspect-header.py b/tests/wpt/tests/html/semantics/links/downloading-resources/resources/inspect-header.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/downloading-resources/resources/inspect-header.py rename to tests/wpt/tests/html/semantics/links/downloading-resources/resources/inspect-header.py diff --git a/tests/wpt/web-platform-tests/html/semantics/links/following-hyperlinks/activation-behavior.window.js b/tests/wpt/tests/html/semantics/links/following-hyperlinks/activation-behavior.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/following-hyperlinks/activation-behavior.window.js rename to tests/wpt/tests/html/semantics/links/following-hyperlinks/activation-behavior.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/links/following-hyperlinks/active-document.window.js b/tests/wpt/tests/html/semantics/links/following-hyperlinks/active-document.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/following-hyperlinks/active-document.window.js rename to tests/wpt/tests/html/semantics/links/following-hyperlinks/active-document.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/links/hyperlink-auditing/headers.optional.html b/tests/wpt/tests/html/semantics/links/hyperlink-auditing/headers.optional.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/hyperlink-auditing/headers.optional.html rename to tests/wpt/tests/html/semantics/links/hyperlink-auditing/headers.optional.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/hyperlink-auditing/resources/stash-headers.py b/tests/wpt/tests/html/semantics/links/hyperlink-auditing/resources/stash-headers.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/hyperlink-auditing/resources/stash-headers.py rename to tests/wpt/tests/html/semantics/links/hyperlink-auditing/resources/stash-headers.py diff --git a/tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_attribute-getter-setter.html b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_attribute-getter-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_attribute-getter-setter.html rename to tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_attribute-getter-setter.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_getter.html b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_getter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_getter.html rename to tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_getter.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html rename to tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/support/noopener-popup.html b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/support/noopener-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/support/noopener-popup.html rename to tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/support/noopener-popup.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/support/noopener-target-1.html b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/support/noopener-target-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/support/noopener-target-1.html rename to tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/support/noopener-target-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/support/noopener-target-2.html b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/support/noopener-target-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/support/noopener-target-2.html rename to tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/support/noopener-target-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/support/target_blank_implicit_noopener.html b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/support/target_blank_implicit_noopener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/support/target_blank_implicit_noopener.html rename to tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/support/target_blank_implicit_noopener.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener.html b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener.html rename to tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener_base.html b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener_base.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener_base.html rename to tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener_base.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/linktypes/alternate-css-ref.html b/tests/wpt/tests/html/semantics/links/linktypes/alternate-css-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/linktypes/alternate-css-ref.html rename to tests/wpt/tests/html/semantics/links/linktypes/alternate-css-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/linktypes/alternate-css.html b/tests/wpt/tests/html/semantics/links/linktypes/alternate-css.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/linktypes/alternate-css.html rename to tests/wpt/tests/html/semantics/links/linktypes/alternate-css.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/linktypes/alternate-import.css b/tests/wpt/tests/html/semantics/links/linktypes/alternate-import.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/linktypes/alternate-import.css rename to tests/wpt/tests/html/semantics/links/linktypes/alternate-import.css diff --git a/tests/wpt/web-platform-tests/html/semantics/links/linktypes/alternate.css b/tests/wpt/tests/html/semantics/links/linktypes/alternate.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/linktypes/alternate.css rename to tests/wpt/tests/html/semantics/links/linktypes/alternate.css diff --git a/tests/wpt/web-platform-tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-lower.css b/tests/wpt/tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-lower.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-lower.css rename to tests/wpt/tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-lower.css diff --git a/tests/wpt/web-platform-tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-mixed.css b/tests/wpt/tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-mixed.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-mixed.css rename to tests/wpt/tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-mixed.css diff --git a/tests/wpt/web-platform-tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-other.css b/tests/wpt/tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-other.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-other.css rename to tests/wpt/tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-other.css diff --git a/tests/wpt/web-platform-tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-ref.html b/tests/wpt/tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-ref.html rename to tests/wpt/tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive.css b/tests/wpt/tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive.css rename to tests/wpt/tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive.css diff --git a/tests/wpt/web-platform-tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive.html b/tests/wpt/tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive.html rename to tests/wpt/tests/html/semantics/links/linktypes/link-type-stylesheet/process-stylesheet-linked-resource-ascii-case-insensitive.html diff --git a/tests/wpt/web-platform-tests/html/semantics/links/linktypes/original-id.json b/tests/wpt/tests/html/semantics/links/linktypes/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/linktypes/original-id.json rename to tests/wpt/tests/html/semantics/links/linktypes/original-id.json diff --git a/tests/wpt/web-platform-tests/html/semantics/links/linktypes/preferred.css b/tests/wpt/tests/html/semantics/links/linktypes/preferred.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/links/linktypes/preferred.css rename to tests/wpt/tests/html/semantics/links/linktypes/preferred.css diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/hide-other-popover-side-effects.html b/tests/wpt/tests/html/semantics/popovers/hide-other-popover-side-effects.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/hide-other-popover-side-effects.html rename to tests/wpt/tests/html/semantics/popovers/hide-other-popover-side-effects.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/light-dismiss-event-ordering.html b/tests/wpt/tests/html/semantics/popovers/light-dismiss-event-ordering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/light-dismiss-event-ordering.html rename to tests/wpt/tests/html/semantics/popovers/light-dismiss-event-ordering.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-change-display-ref.html b/tests/wpt/tests/html/semantics/popovers/popover-anchor-change-display-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-change-display-ref.html rename to tests/wpt/tests/html/semantics/popovers/popover-anchor-change-display-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-change-display.html b/tests/wpt/tests/html/semantics/popovers/popover-anchor-change-display.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-change-display.html rename to tests/wpt/tests/html/semantics/popovers/popover-anchor-change-display.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-display-none.html b/tests/wpt/tests/html/semantics/popovers/popover-anchor-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-display-none.html rename to tests/wpt/tests/html/semantics/popovers/popover-anchor-display-none.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-display-ref.html b/tests/wpt/tests/html/semantics/popovers/popover-anchor-display-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-display-ref.html rename to tests/wpt/tests/html/semantics/popovers/popover-anchor-display-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-display.html b/tests/wpt/tests/html/semantics/popovers/popover-anchor-display.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-display.html rename to tests/wpt/tests/html/semantics/popovers/popover-anchor-display.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-idl-property.html b/tests/wpt/tests/html/semantics/popovers/popover-anchor-idl-property.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-idl-property.html rename to tests/wpt/tests/html/semantics/popovers/popover-anchor-idl-property.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-multicol-display.html b/tests/wpt/tests/html/semantics/popovers/popover-anchor-multicol-display.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-multicol-display.html rename to tests/wpt/tests/html/semantics/popovers/popover-anchor-multicol-display.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-nested-display-ref.html b/tests/wpt/tests/html/semantics/popovers/popover-anchor-nested-display-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-nested-display-ref.html rename to tests/wpt/tests/html/semantics/popovers/popover-anchor-nested-display-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-nested-display.html b/tests/wpt/tests/html/semantics/popovers/popover-anchor-nested-display.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-nested-display.html rename to tests/wpt/tests/html/semantics/popovers/popover-anchor-nested-display.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-nesting.html b/tests/wpt/tests/html/semantics/popovers/popover-anchor-nesting.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-nesting.html rename to tests/wpt/tests/html/semantics/popovers/popover-anchor-nesting.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-scroll-display-ref.html b/tests/wpt/tests/html/semantics/popovers/popover-anchor-scroll-display-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-scroll-display-ref.html rename to tests/wpt/tests/html/semantics/popovers/popover-anchor-scroll-display-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-scroll-display.html b/tests/wpt/tests/html/semantics/popovers/popover-anchor-scroll-display.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-scroll-display.html rename to tests/wpt/tests/html/semantics/popovers/popover-anchor-scroll-display.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-transition.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-anchor-transition.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-anchor-transition.tentative.html rename to tests/wpt/tests/html/semantics/popovers/popover-anchor-transition.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-and-svg-ref.html b/tests/wpt/tests/html/semantics/popovers/popover-and-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-and-svg-ref.html rename to tests/wpt/tests/html/semantics/popovers/popover-and-svg-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-and-svg.html b/tests/wpt/tests/html/semantics/popovers/popover-and-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-and-svg.html rename to tests/wpt/tests/html/semantics/popovers/popover-and-svg.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-appearance-ref.html b/tests/wpt/tests/html/semantics/popovers/popover-appearance-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-appearance-ref.html rename to tests/wpt/tests/html/semantics/popovers/popover-appearance-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-appearance.html b/tests/wpt/tests/html/semantics/popovers/popover-appearance.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-appearance.html rename to tests/wpt/tests/html/semantics/popovers/popover-appearance.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-attribute-all-elements.html b/tests/wpt/tests/html/semantics/popovers/popover-attribute-all-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-attribute-all-elements.html rename to tests/wpt/tests/html/semantics/popovers/popover-attribute-all-elements.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-attribute-basic.html b/tests/wpt/tests/html/semantics/popovers/popover-attribute-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-attribute-basic.html rename to tests/wpt/tests/html/semantics/popovers/popover-attribute-basic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-backdrop-appearance-ref.html b/tests/wpt/tests/html/semantics/popovers/popover-backdrop-appearance-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-backdrop-appearance-ref.html rename to tests/wpt/tests/html/semantics/popovers/popover-backdrop-appearance-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-backdrop-appearance.html b/tests/wpt/tests/html/semantics/popovers/popover-backdrop-appearance.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-backdrop-appearance.html rename to tests/wpt/tests/html/semantics/popovers/popover-backdrop-appearance.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-beforetoggle-opening-event.html b/tests/wpt/tests/html/semantics/popovers/popover-beforetoggle-opening-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-beforetoggle-opening-event.html rename to tests/wpt/tests/html/semantics/popovers/popover-beforetoggle-opening-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-change-type.html b/tests/wpt/tests/html/semantics/popovers/popover-change-type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-change-type.html rename to tests/wpt/tests/html/semantics/popovers/popover-change-type.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-css-properties.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-css-properties.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-css-properties.tentative.html rename to tests/wpt/tests/html/semantics/popovers/popover-css-properties.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-dialog-appearance-ref.html b/tests/wpt/tests/html/semantics/popovers/popover-dialog-appearance-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-dialog-appearance-ref.html rename to tests/wpt/tests/html/semantics/popovers/popover-dialog-appearance-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-dialog-appearance.html b/tests/wpt/tests/html/semantics/popovers/popover-dialog-appearance.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-dialog-appearance.html rename to tests/wpt/tests/html/semantics/popovers/popover-dialog-appearance.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-dialog-crash.html b/tests/wpt/tests/html/semantics/popovers/popover-dialog-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-dialog-crash.html rename to tests/wpt/tests/html/semantics/popovers/popover-dialog-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-document-open.html b/tests/wpt/tests/html/semantics/popovers/popover-document-open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-document-open.html rename to tests/wpt/tests/html/semantics/popovers/popover-document-open.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-events.html b/tests/wpt/tests/html/semantics/popovers/popover-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-events.html rename to tests/wpt/tests/html/semantics/popovers/popover-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-focus-2.html b/tests/wpt/tests/html/semantics/popovers/popover-focus-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-focus-2.html rename to tests/wpt/tests/html/semantics/popovers/popover-focus-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-focus.html b/tests/wpt/tests/html/semantics/popovers/popover-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-focus.html rename to tests/wpt/tests/html/semantics/popovers/popover-focus.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-hidden-display-ref.html b/tests/wpt/tests/html/semantics/popovers/popover-hidden-display-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-hidden-display-ref.html rename to tests/wpt/tests/html/semantics/popovers/popover-hidden-display-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-hidden-display.html b/tests/wpt/tests/html/semantics/popovers/popover-hidden-display.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-hidden-display.html rename to tests/wpt/tests/html/semantics/popovers/popover-hidden-display.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-hint-crash.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-hint-crash.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-hint-crash.tentative.html rename to tests/wpt/tests/html/semantics/popovers/popover-hint-crash.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-hover-hide-hide.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-hide.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-hover-hide-hide.tentative.html rename to tests/wpt/tests/html/semantics/popovers/popover-hover-hide-hide.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-hover-hide-hover.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-hover.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-hover-hide-hover.tentative.html rename to tests/wpt/tests/html/semantics/popovers/popover-hover-hide-hover.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-hover-hide-show.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-show.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-hover-hide-show.tentative.html rename to tests/wpt/tests/html/semantics/popovers/popover-hover-hide-show.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-hover-hide-toggle.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-hover-hide-toggle.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-hover-hide-toggle.tentative.html rename to tests/wpt/tests/html/semantics/popovers/popover-hover-hide-toggle.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-inside-display-none-ref.html b/tests/wpt/tests/html/semantics/popovers/popover-inside-display-none-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-inside-display-none-ref.html rename to tests/wpt/tests/html/semantics/popovers/popover-inside-display-none-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-inside-display-none.html b/tests/wpt/tests/html/semantics/popovers/popover-inside-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-inside-display-none.html rename to tests/wpt/tests/html/semantics/popovers/popover-inside-display-none.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-invoker-reset.html b/tests/wpt/tests/html/semantics/popovers/popover-invoker-reset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-invoker-reset.html rename to tests/wpt/tests/html/semantics/popovers/popover-invoker-reset.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-invoking-attribute.html b/tests/wpt/tests/html/semantics/popovers/popover-invoking-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-invoking-attribute.html rename to tests/wpt/tests/html/semantics/popovers/popover-invoking-attribute.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-light-dismiss-on-scroll.html b/tests/wpt/tests/html/semantics/popovers/popover-light-dismiss-on-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-light-dismiss-on-scroll.html rename to tests/wpt/tests/html/semantics/popovers/popover-light-dismiss-on-scroll.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-light-dismiss.html b/tests/wpt/tests/html/semantics/popovers/popover-light-dismiss.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-light-dismiss.html rename to tests/wpt/tests/html/semantics/popovers/popover-light-dismiss.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-manual-crash.html b/tests/wpt/tests/html/semantics/popovers/popover-manual-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-manual-crash.html rename to tests/wpt/tests/html/semantics/popovers/popover-manual-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-move-documents.html b/tests/wpt/tests/html/semantics/popovers/popover-move-documents.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-move-documents.html rename to tests/wpt/tests/html/semantics/popovers/popover-move-documents.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-not-keyboard-focusable.html b/tests/wpt/tests/html/semantics/popovers/popover-not-keyboard-focusable.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-not-keyboard-focusable.html rename to tests/wpt/tests/html/semantics/popovers/popover-not-keyboard-focusable.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-open-display-ref.html b/tests/wpt/tests/html/semantics/popovers/popover-open-display-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-open-display-ref.html rename to tests/wpt/tests/html/semantics/popovers/popover-open-display-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-open-display.html b/tests/wpt/tests/html/semantics/popovers/popover-open-display.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-open-display.html rename to tests/wpt/tests/html/semantics/popovers/popover-open-display.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-open-overflow-display-ref.html b/tests/wpt/tests/html/semantics/popovers/popover-open-overflow-display-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-open-overflow-display-ref.html rename to tests/wpt/tests/html/semantics/popovers/popover-open-overflow-display-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-open-overflow-display.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-open-overflow-display.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-open-overflow-display.tentative.html rename to tests/wpt/tests/html/semantics/popovers/popover-open-overflow-display.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-overlay.html b/tests/wpt/tests/html/semantics/popovers/popover-overlay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-overlay.html rename to tests/wpt/tests/html/semantics/popovers/popover-overlay.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-removal-2.html b/tests/wpt/tests/html/semantics/popovers/popover-removal-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-removal-2.html rename to tests/wpt/tests/html/semantics/popovers/popover-removal-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-removal.html b/tests/wpt/tests/html/semantics/popovers/popover-removal.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-removal.html rename to tests/wpt/tests/html/semantics/popovers/popover-removal.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-shadow-dom.html b/tests/wpt/tests/html/semantics/popovers/popover-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-shadow-dom.html rename to tests/wpt/tests/html/semantics/popovers/popover-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-shadowhost-focus.html b/tests/wpt/tests/html/semantics/popovers/popover-shadowhost-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-shadowhost-focus.html rename to tests/wpt/tests/html/semantics/popovers/popover-shadowhost-focus.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-stacking-context-ref.html b/tests/wpt/tests/html/semantics/popovers/popover-stacking-context-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-stacking-context-ref.html rename to tests/wpt/tests/html/semantics/popovers/popover-stacking-context-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-stacking-context.html b/tests/wpt/tests/html/semantics/popovers/popover-stacking-context.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-stacking-context.html rename to tests/wpt/tests/html/semantics/popovers/popover-stacking-context.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-stacking.html b/tests/wpt/tests/html/semantics/popovers/popover-stacking.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-stacking.html rename to tests/wpt/tests/html/semantics/popovers/popover-stacking.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-target-action-hover.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-target-action-hover.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-target-action-hover.tentative.html rename to tests/wpt/tests/html/semantics/popovers/popover-target-action-hover.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-target-element-disabled.html b/tests/wpt/tests/html/semantics/popovers/popover-target-element-disabled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-target-element-disabled.html rename to tests/wpt/tests/html/semantics/popovers/popover-target-element-disabled.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-top-layer-combinations.html b/tests/wpt/tests/html/semantics/popovers/popover-top-layer-combinations.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-top-layer-combinations.html rename to tests/wpt/tests/html/semantics/popovers/popover-top-layer-combinations.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-top-layer-interactions.html b/tests/wpt/tests/html/semantics/popovers/popover-top-layer-interactions.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-top-layer-interactions.html rename to tests/wpt/tests/html/semantics/popovers/popover-top-layer-interactions.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-types-with-hints.tentative.html b/tests/wpt/tests/html/semantics/popovers/popover-types-with-hints.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-types-with-hints.tentative.html rename to tests/wpt/tests/html/semantics/popovers/popover-types-with-hints.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-types.html b/tests/wpt/tests/html/semantics/popovers/popover-types.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/popover-types.html rename to tests/wpt/tests/html/semantics/popovers/popover-types.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/resources/popover-hover-hide-common.js b/tests/wpt/tests/html/semantics/popovers/resources/popover-hover-hide-common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/resources/popover-hover-hide-common.js rename to tests/wpt/tests/html/semantics/popovers/resources/popover-hover-hide-common.js diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/resources/popover-styles.css b/tests/wpt/tests/html/semantics/popovers/resources/popover-styles.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/resources/popover-styles.css rename to tests/wpt/tests/html/semantics/popovers/resources/popover-styles.css diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/resources/popover-utils.js b/tests/wpt/tests/html/semantics/popovers/resources/popover-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/resources/popover-utils.js rename to tests/wpt/tests/html/semantics/popovers/resources/popover-utils.js diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/togglePopover.html b/tests/wpt/tests/html/semantics/popovers/togglePopover.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/togglePopover.html rename to tests/wpt/tests/html/semantics/popovers/togglePopover.html diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/toggleevent-interface.html b/tests/wpt/tests/html/semantics/popovers/toggleevent-interface.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/popovers/toggleevent-interface.html rename to tests/wpt/tests/html/semantics/popovers/toggleevent-interface.html diff --git a/tests/wpt/web-platform-tests/html/semantics/rellist-feature-detection.html b/tests/wpt/tests/html/semantics/rellist-feature-detection.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/rellist-feature-detection.html rename to tests/wpt/tests/html/semantics/rellist-feature-detection.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/META.yml b/tests/wpt/tests/html/semantics/scripting-1/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/META.yml rename to tests/wpt/tests/html/semantics/scripting-1/META.yml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-noscript-element/non-html-noscript.html b/tests/wpt/tests/html/semantics/scripting-1/the-noscript-element/non-html-noscript.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-noscript-element/non-html-noscript.html rename to tests/wpt/tests/html/semantics/scripting-1/the-noscript-element/non-html-noscript.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_001.htm b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_001.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_001.htm rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_001.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_002.htm b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_002.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_002.htm rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_002.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_003.htm b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_003.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_003.htm rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_003.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_004.htm b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_004.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_004.htm rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_004.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_005.htm b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_005.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_005.htm rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_005.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_006.htm b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_006.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_006.htm rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_006.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_007.htm b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_007.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_007.htm rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_007.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_008.htm b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_008.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_008.htm rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_008.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_009.htm b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_009.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_009.htm rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_009.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_010.htm b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_010.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_010.htm rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_010.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_011.htm b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_011.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/async_011.htm rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/async_011.htm diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/cacheable-script-throw.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/cacheable-script-throw.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/cacheable-script-throw.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/cacheable-script-throw.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/charset-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/charset-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/charset-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/charset-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/charset-bom.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/charset-bom.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/charset-bom.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/charset-bom.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/charset.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/charset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/charset.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/charset.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/content-type-checking.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/content-type-checking.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/content-type-checking.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/content-type-checking.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/cors-crossorigin-requests.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/cors-crossorigin-requests.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/cors-crossorigin-requests.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/cors-crossorigin-requests.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/credentials.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/credentials.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/credentials.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/credentials.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/import-css-module-basic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/import-css-module-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/import-css-module-basic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/import-css-module-basic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/import-css-module-dynamic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/import-css-module-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/import-css-module-dynamic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/import-css-module-dynamic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/integrity.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/integrity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/integrity.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/integrity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/load-error-events.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/load-error-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/load-error-events.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/load-error-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/referrer-policies.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/referrer-policies.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/referrer-policies.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/referrer-policies.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/relative-urls.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/relative-urls.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/relative-urls.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/relative-urls.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/atImported.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/atImported.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/atImported.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/atImported.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/bad-import.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/bad-import.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/bad-import.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/bad-import.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/basic-large.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/basic-large.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/basic-large.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/basic-large.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/basic.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/basic.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/basic.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/basic.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/bom-utf-16be.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/bom-utf-16be.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/bom-utf-16be.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/bom-utf-16be.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/bom-utf-16le.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/bom-utf-16le.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/bom-utf-16le.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/bom-utf-16le.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/bom-utf-8.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/bom-utf-8.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/bom-utf-8.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/bom-utf-8.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/credentials-iframe.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/credentials-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/credentials-iframe.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/credentials-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/cross-origin.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/cross-origin.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/cross-origin.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/cross-origin.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/crossorigin-import-parse-error-with-cors.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/crossorigin-import-parse-error-with-cors.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/crossorigin-import-parse-error-with-cors.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/crossorigin-import-parse-error-with-cors.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/crossorigin-import-with-cors.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/crossorigin-import-with-cors.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/crossorigin-import-with-cors.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/crossorigin-import-with-cors.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/crossorigin-import-without-cors.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/crossorigin-import-without-cors.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/crossorigin-import-without-cors.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/crossorigin-import-without-cors.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/css-module-without-assertion-iframe.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/css-module-without-assertion-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/css-module-without-assertion-iframe.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/css-module-without-assertion-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/integrity-matches.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/integrity-matches.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/integrity-matches.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/integrity-matches.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/integrity-mismatches.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/integrity-mismatches.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/integrity-mismatches.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/integrity-mismatches.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/load-error-events.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/load-error-events.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/load-error-events.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/load-error-events.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/load-relative-url.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/load-relative-url.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/load-relative-url.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/load-relative-url.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/malformed.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/malformed.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/malformed.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/malformed.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/parse-error.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/parse-error.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/parse-error.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/parse-error.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/record-fetch.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/record-fetch.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/record-fetch.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/record-fetch.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/referrer-checker.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/referrer-checker.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/referrer-checker.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/referrer-checker.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/utf-8.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/utf-8.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/utf-8.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/utf-8.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/windows-1250.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/windows-1250.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/windows-1250.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/windows-1250.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/worker-dynamic-import.sub.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/worker-dynamic-import.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/worker-dynamic-import.sub.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/worker-dynamic-import.sub.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/worker.sub.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/worker.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/resources/worker.sub.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/resources/worker.sub.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/script-element-css-src.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/script-element-css-src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/script-element-css-src.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/css-module/script-element-css-src.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/data-url.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/data-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/data-url.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/data-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/README.md b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/README.md rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/README.md diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/async-script-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/async-script-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/async-script-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/async-script-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/async-script.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/async-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/async-script.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/async-script.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/defer-script-xml.xhtml b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/defer-script-xml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/defer-script-xml.xhtml rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/defer-script-xml.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/defer-script.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/defer-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/defer-script.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/defer-script.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/document-write.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/document-write.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/document-write.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/document-write.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/async-script-1.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/async-script-1.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/async-script-1.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/async-script-1.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/defer-script-1.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/defer-script-1.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/defer-script-1.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/defer-script-1.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/defer-script-2.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/defer-script-2.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/defer-script-2.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/defer-script-2.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-open-write-close.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-open-write-close.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-open-write-close.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-open-write-close.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-open-write.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-open-write.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-open-write.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-open-write.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-write-close.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-write-close.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-write-close.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-write-close.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-write-iframe.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-write-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-write-iframe.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-write-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-write.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-write.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-write.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/document-write.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/helper.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/helper.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/helper.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/sync-script-1.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/sync-script-1.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/sync-script-1.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/sync-script-1.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/sync-script-2.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/sync-script-2.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/resources/sync-script-2.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/resources/sync-script-2.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/support/async-script.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/support/async-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer-script/support/async-script.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer-script/support/async-script.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/defer.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/defer.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/emptyish-script-elements.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/emptyish-script-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/emptyish-script-elements.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/emptyish-script-elements.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/001.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/001.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/001.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/002.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/002.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/002.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/003.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/003.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/003.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/004.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/004.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/004.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/005.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/005.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/005.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/006.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/006.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/006.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/007.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/007.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/007.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/008.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/008.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/008.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/009.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/009.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/009.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/010.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/010.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/010.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/011.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/011.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/011.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/011.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/012.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/012.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/012.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/012.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/013.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/013.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/013.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/013.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/014.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/014.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/014.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/014.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/015.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/015.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/015.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/015.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/015a.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/015a.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/015a.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/015a.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/016.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/016.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/016.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/016.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/017.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/017.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/017.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/017.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/018.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/018.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/018.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/018.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/019.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/019.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/019.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/019.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/020.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/020.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/020.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/020.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/021.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/021.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/021.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/021.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/022.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/022.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/022.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/022.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/023.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/023.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/023.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/023.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/024.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/024.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/024.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/024.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/025.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/025.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/025.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/025.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/026.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/026.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/026.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/026.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/027.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/027.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/027.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/027.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/028.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/028.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/028.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/028.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/030.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/030.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/030.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/030.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/031.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/031.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/031.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/031.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/032.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/032.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/032.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/032.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/033.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/033.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/033.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/033.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/034.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/034.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/034.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/034.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/035.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/035.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/035.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/035.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/036.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/036.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/036.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/036.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/037.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/037.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/037.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/037.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/038.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/038.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/038.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/038.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/039.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/039.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/039.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/039.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/040.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/040.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/040.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/040.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/041.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/041.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/041.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/041.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/042.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/042.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/042.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/042.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/043.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/043.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/043.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/043.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/044.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/044.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/044.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/044.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/045.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/045.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/045.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/045.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/046.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/046.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/046.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/046.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/047.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/047.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/047.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/047.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/048.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/048.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/048.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/048.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/049.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/049.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/049.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/049.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/050.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/050.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/050.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/050.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/051.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/051.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/051.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/051.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/052.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/052.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/052.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/052.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/053.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/053.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/053.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/053.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/054.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/054.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/054.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/054.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/055.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/055.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/055.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/055.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/056.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/056.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/056.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/056.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/057.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/057.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/057.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/057.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/058.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/058.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/058.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/058.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/059.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/059.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/059.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/059.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/060.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/060.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/060.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/060.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/061.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/061.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/061.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/061.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/062.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/062.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/062.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/062.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/063.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/063.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/063.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/063.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/064.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/064.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/064.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/064.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/065.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/065.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/065.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/065.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/066.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/066.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/066.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/066.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/067.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/067.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/067.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/067.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/068.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/068.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/068.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/068.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/069.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/069.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/069.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/069.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/070.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/070.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/070.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/070.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/071.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/071.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/071.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/071.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/072.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/072.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/072.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/072.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/073.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/073.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/073.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/073.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/074.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/074.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/074.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/074.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/075.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/075.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/075.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/075.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/076.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/076.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/076.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/076.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/077.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/077.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/077.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/077.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/078.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/078.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/078.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/078.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/079.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/079.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/079.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/079.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/081.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/081.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/081.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/081.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/082.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/082.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/082.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/082.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/083.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/083.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/083.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/083.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/084.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/084.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/084.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/084.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/085.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/085.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/085.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/085.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/086.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/086.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/086.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/086.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/087.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/087.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/087.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/087.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/088.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/088.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/088.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/088.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/089.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/089.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/089.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/089.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/090.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/090.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/090.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/090.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/091.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/091.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/091.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/091.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/092.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/092.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/092.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/092.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/094.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/094.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/094.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/094.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/095.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/095.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/095.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/095.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/096.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/096.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/096.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/096.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/097.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/097.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/097.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/097.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/099.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/099.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/099.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/099.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/101.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/101.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/101.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/101.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/102.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/102.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/102.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/102.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/103.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/103.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/103.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/103.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/104.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/104.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/104.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/104.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/105.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/105.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/105.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/105.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-defer-import.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-defer-import.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-defer-import.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-defer-import.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-defer-noimport.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-defer-noimport.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-defer-noimport.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-defer-noimport.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-import.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-import.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-import.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-import.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-module-import.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-module-import.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-module-import.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-module-import.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-module-noimport.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-module-noimport.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-module-noimport.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-module-noimport.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-noimport.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-noimport.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-noimport.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-external-noimport.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-import-xhtml.xhtml b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-import-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-import-xhtml.xhtml rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-import-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-import.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-import.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-import.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-import.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-module-import.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-module-import.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-module-import.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-module-import.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-module-noimport.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-module-noimport.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-module-noimport.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-module-noimport.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-noimport-xhtml.xhtml b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-noimport-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-noimport-xhtml.xhtml rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-noimport-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-noimport.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-noimport.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/106-noimport.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/106-noimport.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/107-import.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/107-import.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/107-import.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/107-import.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/107-noimport.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/107-noimport.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/107-noimport.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/107-noimport.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/108.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/108.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/108.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/108.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/109.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/109.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/109.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/109.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/110.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/110.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/110.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/110.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/111.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/111.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/111.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/111.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/112.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/112.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/112.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/112.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/113.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/113.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/113.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/113.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/114.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/114.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/114.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/114.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/115.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/115.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/115.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/115.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/116.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/116.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/116.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/116.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/117.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/117.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/117.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/117.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/118.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/118.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/118.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/118.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/119.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/119.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/119.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/119.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/120.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/120.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/120.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/120.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/121.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/121.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/121.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/121.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/122.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/122.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/122.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/122.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/123.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/123.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/123.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/123.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/124.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/124.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/124.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/124.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/125.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/125.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/125.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/125.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/126.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/126.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/126.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/126.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/127.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/127.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/127.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/127.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/128.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/128.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/128.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/128.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/129.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/129.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/129.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/129.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/130.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/130.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/130.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/130.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/131.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/131.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/131.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/131.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/132.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/132.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/132.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/132.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/133.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/133.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/133.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/133.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/134.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/134.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/134.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/134.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/135.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/135.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/135.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/135.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/136.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/136.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/136.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/136.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/137.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/137.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/137.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/137.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/138.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/138.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/138.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/138.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/139.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/139.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/139.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/139.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/140.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/140.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/140.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/140.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/141.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/141.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/141.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/141.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/142.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/142.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/142.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/142.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/143.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/143.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/143.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/143.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/144.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/144.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/144.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/144.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/145.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/145.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/145.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/145.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/146-href.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/146-href.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/146-href.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/146-href.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/146.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/146.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/146.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/146.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/147.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/147.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/147.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/147.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/148.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/148.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/148.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/148.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/149.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/149.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/149.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/149.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/150-import-xhtml.xhtml b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/150-import-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/150-import-xhtml.xhtml rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/150-import-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/150-import.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/150-import.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/150-import.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/150-import.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/150-noimport-xhtml.xhtml b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/150-noimport-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/150-noimport-xhtml.xhtml rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/150-noimport-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/150-noimport.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/150-noimport.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/150-noimport.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/150-noimport.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/css/background.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/css/background.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/css/background.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/css/background.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/css/import.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/css/import.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/css/import.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/css/import.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/non-external-no-import.tentative.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/non-external-no-import.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/non-external-no-import.tentative.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/non-external-no-import.tentative.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/pages/helloworld-postMessage.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/pages/helloworld-postMessage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/pages/helloworld-postMessage.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/pages/helloworld-postMessage.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/pages/helloworld.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/pages/helloworld.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/pages/helloworld.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/pages/helloworld.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/check-style-sheet.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/check-style-sheet.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/check-style-sheet.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/check-style-sheet.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/count-script-tags.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/count-script-tags.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/count-script-tags.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/count-script-tags.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/find-body.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/find-body.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/find-body.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/find-body.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/find-foo.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/find-foo.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/find-foo.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/find-foo.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-1.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-1.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-1.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-1.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-10.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-10.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-10.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-10.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-11.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-11.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-11.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-11.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-2.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-2.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-2.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-2.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-3.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-3.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-3.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-3.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-4.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-4.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-4.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-4.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-5.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-5.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-5.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-5.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-6.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-6.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-6.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-6.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-7.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-7.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-7.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-7.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-8.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-8.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-8.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-8.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-9.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-9.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-9.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/scripts/include-9.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/testlib/testlib.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/testlib/testlib.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/testlib/testlib.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/execution-timing/testlib/testlib.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/external-script-utf8.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/external-script-utf8.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/external-script-utf8.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/external-script-utf8.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/external-script-windows1250.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/external-script-windows1250.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/external-script-windows1250.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/external-script-windows1250.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/fetch-src/alpha/base.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/fetch-src/alpha/base.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/fetch-src/alpha/base.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/fetch-src/alpha/base.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/fetch-src/alpha/test.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/fetch-src/alpha/test.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/fetch-src/alpha/test.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/fetch-src/alpha/test.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/fetch-src/beta/test.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/fetch-src/beta/test.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/fetch-src/beta/test.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/fetch-src/beta/test.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/fetch-src/empty-with-base.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/fetch-src/empty-with-base.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/fetch-src/empty-with-base.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/fetch-src/empty-with-base.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/fetch-src/empty.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/fetch-src/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/fetch-src/empty.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/fetch-src/empty.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/fetch-src/failure.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/fetch-src/failure.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/fetch-src/failure.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/fetch-src/failure.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/fetch-src/unreachable.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/fetch-src/unreachable.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/fetch-src/unreachable.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/fetch-src/unreachable.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/historical.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/historical.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/historical.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/empty-assertion-clause.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/empty-assertion-clause.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/empty-assertion-clause.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/empty-assertion-clause.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/empty-assertion-clause.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/empty-assertion-clause.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/empty-assertion-clause.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/empty-assertion-clause.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/empty-type-assertion.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/empty-type-assertion.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/empty-type-assertion.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/empty-type-assertion.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/export-hello.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/export-hello.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/export-hello.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/export-hello.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/hello.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/hello.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/hello.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/hello.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/invalid-type-assertion-error.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/invalid-type-assertion-error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/invalid-type-assertion-error.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/invalid-type-assertion-error.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/invalid-type-assertion.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/invalid-type-assertion.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/invalid-type-assertion.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/invalid-type-assertion.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/javascript-type-assertion.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/javascript-type-assertion.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/javascript-type-assertion.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/javascript-type-assertion.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/js-type-assertion.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/js-type-assertion.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/js-type-assertion.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/js-type-assertion.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/unsupported-assertion.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/unsupported-assertion.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/unsupported-assertion.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/unsupported-assertion.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/unsupported-assertion.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/unsupported-assertion.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/unsupported-assertion.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/unsupported-assertion.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/is-module-goal.mjs b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/is-module-goal.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/is-module-goal.mjs rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/is-module-goal.mjs diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/is-script-goal.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/is-script-goal.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/is-script-goal.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/is-script-goal.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/array.json b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/array.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/array.json rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/array.json diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/bom-utf-16be.json b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/bom-utf-16be.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/bom-utf-16be.json rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/bom-utf-16be.json diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/bom-utf-16le.json b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/bom-utf-16le.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/bom-utf-16le.json rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/bom-utf-16le.json diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/bom-utf-8.json b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/bom-utf-8.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/bom-utf-8.json rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/bom-utf-8.json diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/charset-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/charset-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/charset-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/charset-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/charset-bom.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/charset-bom.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/charset-bom.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/charset-bom.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/charset.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/charset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/charset.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/charset.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/cors-crossorigin-requests.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/cors-crossorigin-requests.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/cors-crossorigin-requests.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/cors-crossorigin-requests.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/credentials-iframe.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/credentials-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/credentials-iframe.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/credentials-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/credentials.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/credentials.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/credentials.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/credentials.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/cross-origin.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/cross-origin.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/cross-origin.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/cross-origin.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/crossorigin-import-parse-error-with-cors.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/crossorigin-import-parse-error-with-cors.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/crossorigin-import-parse-error-with-cors.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/crossorigin-import-parse-error-with-cors.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/crossorigin-import-with-cors.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/crossorigin-import-with-cors.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/crossorigin-import-with-cors.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/crossorigin-import-with-cors.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/crossorigin-import-without-cors.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/crossorigin-import-without-cors.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/crossorigin-import-without-cors.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/crossorigin-import-without-cors.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/data.json b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/data.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/data.json rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/data.json diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/false.json b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/false.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/false.json rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/false.json diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/integrity-matches.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/integrity-matches.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/integrity-matches.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/integrity-matches.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/integrity-mismatches.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/integrity-mismatches.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/integrity-mismatches.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/integrity-mismatches.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/integrity.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/integrity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/integrity.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/integrity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/invalid-content-type.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/invalid-content-type.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/invalid-content-type.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/invalid-content-type.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/json-module-service-worker-test.https.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/json-module-service-worker-test.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/json-module-service-worker-test.https.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/json-module-service-worker-test.https.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/load-error-events.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/load-error-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/load-error-events.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/load-error-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/load-error-events.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/load-error-events.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/load-error-events.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/load-error-events.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/module.json b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/module.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/module.json rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/module.json diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/non-object.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/non-object.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/non-object.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/non-object.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/null.json b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/null.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/null.json rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/null.json diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/parse-error.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/parse-error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/parse-error.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/parse-error.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/parse-error.json b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/parse-error.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/parse-error.json rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/parse-error.json diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/referrer-checker.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/referrer-checker.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/referrer-checker.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/referrer-checker.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/referrer-policies.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/referrer-policies.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/referrer-policies.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/referrer-policies.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/repeated-imports.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/repeated-imports.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/repeated-imports.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/repeated-imports.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/script-element-json-src.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/script-element-json-src.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/script-element-json-src.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/script-element-json-src.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/serviceworker-dynamic-import.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/serviceworker-dynamic-import.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/serviceworker-dynamic-import.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/serviceworker-dynamic-import.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/serviceworker.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/serviceworker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/serviceworker.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/serviceworker.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/string.json b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/string.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/string.json rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/string.json diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/true.json b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/true.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/true.json rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/true.json diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/utf-8.json b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/utf-8.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/utf-8.json rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/utf-8.json diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/valid-content-type.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/valid-content-type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/valid-content-type.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/valid-content-type.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/windows-1250.json b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/windows-1250.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/windows-1250.json rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/json-module/windows-1250.json diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/load-error-events-1.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/load-error-events-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/load-error-events-1.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/load-error-events-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/load-error-events-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/load-error-events-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/load-error-events-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/load-error-events-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/load-error-events-3.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/load-error-events-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/load-error-events-3.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/load-error-events-3.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/log.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/log.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/log.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/log.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-window-onerror-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-window-onerror-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-window-onerror-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-window-onerror-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-window-onerror.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-window-onerror.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-window-onerror.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-window-onerror.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-workerglobalscope-onerror-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-workerglobalscope-onerror-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-workerglobalscope-onerror-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-workerglobalscope-onerror-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-workerglobalscope-onerror.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-workerglobalscope-onerror.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-workerglobalscope-onerror.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-workerglobalscope-onerror.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-importScripts.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-importScripts.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-importScripts.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-importScripts.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-nothrow-importScripts.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-nothrow-importScripts.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-nothrow-importScripts.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-nothrow-importScripts.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-nothrow-static-import.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-nothrow-static-import.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-nothrow-static-import.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-nothrow-static-import.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-throw-importScripts.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-throw-importScripts.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-throw-importScripts.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-throw-importScripts.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-throw-static-import.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-throw-static-import.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-throw-static-import.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1-throw-static-import.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-2.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-2.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-2.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-2.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-3.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-3.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-3.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-3.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-3.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-3.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-3.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-4.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-4.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/evaluation-order-4.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/checkpoint-after-error-event-worker-module.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/checkpoint-after-error-event-worker-module.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/checkpoint-after-error-event-worker-module.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/checkpoint-after-error-event-worker-module.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/checkpoint-after-error-event-worker.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/checkpoint-after-error-event-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/checkpoint-after-error-event-worker.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/checkpoint-after-error-event-worker.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/checkpoint-after-error-event.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/checkpoint-after-error-event.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/checkpoint-after-error-event.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/checkpoint-after-error-event.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-nothrow-setup.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-nothrow-setup.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-nothrow-setup.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-nothrow-setup.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-nothrow.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-nothrow.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-nothrow.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-nothrow.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-throw-setup.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-throw-setup.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-throw-setup.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-throw-setup.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-throw.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-throw.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-throw.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-1-throw.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-2-setup.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-2-setup.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-2-setup.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-2-setup.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-2.1.mjs b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-2.1.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-2.1.mjs rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-2.1.mjs diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-2.2.mjs b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-2.2.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-2.2.mjs rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-2.2.mjs diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-3-setup.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-3-setup.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-3-setup.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-3-setup.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-3.1.mjs b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-3.1.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-3.1.mjs rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-3.1.mjs diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-3.2.mjs b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-3.2.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-3.2.mjs rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-3.2.mjs diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-4.1.mjs b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-4.1.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-4.1.mjs rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-4.1.mjs diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-4.2.mjs b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-4.2.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-4.2.mjs rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-4.2.mjs diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-setup.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-setup.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-setup.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/evaluation-order-setup.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/resolve-then-throw.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/resolve-then-throw.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/resources/resolve-then-throw.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/microtasks/resources/resolve-then-throw.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/bad-module-specifier.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/bad-module-specifier.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/bad-module-specifier.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/bad-module-specifier.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/charset-01.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/charset-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/charset-01.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/charset-01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/charset-02.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/charset-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/charset-02.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/charset-02.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/charset-03.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/charset-03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/charset-03.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/charset-03.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-1.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-1.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-1a.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-1a.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-1a.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-1a.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-1b.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-1b.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-1b.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-1b.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2a.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2a.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2a.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2a.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2b.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2b.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2b.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-2b.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-3.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-3.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-3.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-3a.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-3a.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-3a.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-3a.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-3b.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-3b.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-3b.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/choice-of-error-3b.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/compilation-error-1.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/compilation-error-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/compilation-error-1.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/compilation-error-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/compilation-error-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/compilation-error-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/compilation-error-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/compilation-error-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/credentials.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/credentials.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/credentials.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/credentials.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-common.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-common.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-common.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-different.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-different.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-different.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-different.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-missingheader.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-missingheader.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-missingheader.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-missingheader.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-same.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-same.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-same.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-same.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-wrongheader.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-wrongheader.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-wrongheader.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-import-wrongheader.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-different.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-different.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-different.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-different.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-missingheader.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-missingheader.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-missingheader.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-missingheader.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-same.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-same.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-same.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-same.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-wrongheader.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-wrongheader.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-wrongheader.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-root-wrongheader.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-scripterror.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-scripterror.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin-scripterror.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin-scripterror.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/crossorigin.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/crossorigin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/currentScript-null.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/currentScript-null.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/currentScript-null.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/currentScript-null.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/currentscript.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/currentscript.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/currentscript.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/currentscript.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/custom-element-exception.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/custom-element-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/custom-element-exception.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/custom-element-exception.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/cycle-tdz-access-a.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/cycle-tdz-access-a.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/cycle-tdz-access-a.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/cycle-tdz-access-a.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/cycle-tdz-access.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/cycle-tdz-access.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/cycle-tdz-access.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/cycle-tdz-access.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/cycle-unresolvable-a.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/cycle-unresolvable-a.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/cycle-unresolvable-a.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/cycle-unresolvable-a.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/cycle-unresolvable.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/cycle-unresolvable.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/cycle-unresolvable.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/cycle-unresolvable.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/duplicated-imports-1.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/duplicated-imports-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/duplicated-imports-1.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/duplicated-imports-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/duplicated-imports-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/duplicated-imports-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/duplicated-imports-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/duplicated-imports-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker-importScripts.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker-importScripts.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker-importScripts.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker-importScripts.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/code-cache.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/code-cache.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/code-cache.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/code-cache.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/import.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/import.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/import.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/import.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/worker-importScripts.sub.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/worker-importScripts.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/worker-importScripts.sub.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/worker-importScripts.sub.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/beta/code-cache.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/beta/code-cache.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/beta/code-cache.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/beta/code-cache.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/beta/import.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/beta/import.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/beta/import.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/beta/import.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/beta/redirect.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/beta/redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/beta/redirect.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/beta/redirect.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/blob-url-workers.window.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/blob-url-workers.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/blob-url-workers.window.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/blob-url-workers.window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/blob-url.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/blob-url.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/blob-url.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/blob-url.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/code-cache-base-url.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/code-cache-base-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/code-cache-base-url.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/code-cache-base-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/code-cache-nonce.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/code-cache-nonce.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/code-cache-nonce.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/code-cache-nonce.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/delay-load-event.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/delay-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/delay-load-event.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/delay-load-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials-setTimeout.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials-setTimeout.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials-setTimeout.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials-setTimeout.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-credentials.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/base-url.sub.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/base-url.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/base-url.sub.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/base-url.sub.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/code-cache.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/code-cache.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/code-cache.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/code-cache.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/import.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/import.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/import.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/import.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/inline-event-handler.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/inline-event-handler.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/inline-event-handler.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/inline-event-handler.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/basic.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/basic.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/basic.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/basic.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/css-import-in-worker.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/css-import-in-worker.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/css-import-in-worker.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/css-import-in-worker.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/empty-module.css b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/empty-module.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/empty-module.css rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/empty-module.css diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/empty-module.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/empty-module.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/empty-module.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/empty-module.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/serviceworker.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/serviceworker.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/serviceworker.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/serviceworker.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/ticker.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/ticker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/ticker.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/ticker.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/with-import-assertions.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/with-import-assertions.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/with-import-assertions.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/with-import-assertions.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/worklet-ref.https.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/worklet-ref.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/worklet-ref.https.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/worklet-ref.https.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/worklet.https.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/worklet.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/worklet.https.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/microtasks/worklet.https.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/no-active-script-classic-manual.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/no-active-script-classic-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/no-active-script-classic-manual.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/no-active-script-classic-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/no-active-script-module-manual.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/no-active-script-module-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/no-active-script-module-manual.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/no-active-script-module-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-external.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-inline-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-inline-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-inline-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-inline-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-inline-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-inline-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-inline-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/propagate-nonce-inline-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/blob-url-worker.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/blob-url-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/blob-url-worker.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/blob-url-worker.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/code-cache-nonce-iframe.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/code-cache-nonce-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/code-cache-nonce-iframe.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/code-cache-nonce-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/code-cache-nonce.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/code-cache-nonce.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/code-cache-nonce.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/code-cache-nonce.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/empty-iframe.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/empty-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/empty-iframe.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/empty-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/status-changing-script.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/status-changing-script.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/status-changing-script.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/status-changing-script.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/v8-code-cache-iframe.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/v8-code-cache-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/v8-code-cache-iframe.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/v8-code-cache-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/v8-code-cache.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/v8-code-cache.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/v8-code-cache.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/resources/v8-code-cache.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/Function.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/Function.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/Function.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/Function.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/eval.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/eval.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/eval.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/eval.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/inline-event-handlers-UA-code.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/inline-event-handlers-UA-code.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/inline-event-handlers-UA-code.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/inline-event-handlers-UA-code.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/no-active-script.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/no-active-script.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/no-active-script.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/no-active-script.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/reflected-inline-event-handlers.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/reflected-inline-event-handlers.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/reflected-inline-event-handlers.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/reflected-inline-event-handlers.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/setTimeout.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/setTimeout.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/setTimeout.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/scripts/setTimeout.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-inline-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-inline-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-inline-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-inline-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-inline-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-inline-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-inline-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-base-url-inline-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-nonce-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-of-promise-result.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-of-promise-result.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-of-promise-result.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-of-promise-result.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-other-document.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-other-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-other-document.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-other-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/v8-code-cache.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/v8-code-cache.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/v8-code-cache.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/v8-code-cache.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-and-slow-dependency.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/error-and-slow-dependency.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-and-slow-dependency.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/error-and-slow-dependency.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-1.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/error-type-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-1.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/error-type-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-1.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/error-type-1.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-1.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/error-type-1.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/error-type-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/error-type-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-2.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/error-type-2.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-2.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/error-type-2.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-3.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/error-type-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-3.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/error-type-3.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-3.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/error-type-3.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/error-type-3.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/error-type-3.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-common.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-common.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-common.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependent.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependent.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependent.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependent.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependent.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependent.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependent.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependentmultiple.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependentmultiple.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependentmultiple.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependentmultiple.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependentmultiple.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependentmultiple.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependentmultiple.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-dependentmultiple.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-root.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-root.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-root.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-parseerror-root.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-wrongMimetype-import.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-wrongMimetype-import.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-wrongMimetype-import.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-wrongMimetype-import.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-wrongMimetype.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-wrongMimetype.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-wrongMimetype.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling-wrongMimetype.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-1.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-1.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-3.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-3.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-3.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-4.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-4.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/evaluation-error-4.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicordered2.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicordered2.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicordered2.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicordered2.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicordered3.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicordered3.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicordered3.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicordered3.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicordered4.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicordered4.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicordered4.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicordered4.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicunordered1.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicunordered1.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicunordered1.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicunordered1.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicunordered2.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicunordered2.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicunordered2.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-dynamicunordered2.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedordered2.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedordered2.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedordered2.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedordered2.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedordered4.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedordered4.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedordered4.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedordered4.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedunordered1.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedunordered1.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedunordered1.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedunordered1.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedunordered2.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedunordered2.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedunordered2.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder-parsedunordered2.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/execorder.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/execorder.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/export-default.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/export-default.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/export-default.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/export-default.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/export-something-nested.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/export-something-nested.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/export-something-nested.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/export-something-nested.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/export-something.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/export-something.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/export-something.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/export-something.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/fetch-error-1.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/fetch-error-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/fetch-error-1.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/fetch-error-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/fetch-error-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/fetch-error-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/fetch-error-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/fetch-error-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/fetch-error-2.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/fetch-error-2.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/fetch-error-2.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/fetch-error-2.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-dependent.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-dependent.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-dependent.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-dependent.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-object.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-object.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-object.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-object.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-resolve-importmap.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-resolve-importmap.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-resolve-importmap.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-resolve-importmap.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-resolve-multiple-scripts.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-resolve-multiple-scripts.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-resolve-multiple-scripts.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-resolve-multiple-scripts.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-resolve.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-resolve.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-resolve.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-resolve.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-root.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-root.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-root.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-root.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.any.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.any.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.any.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/postmessage-worker.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/postmessage-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/postmessage-worker.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/postmessage-worker.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/export-1.mjs b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/export-1.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/export-1.mjs rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/export-1.mjs diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/export-2.mjs b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/export-2.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/export-2.mjs rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/export-2.mjs diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/export-import-meta.mjs b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/export-import-meta.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/export-import-meta.mjs rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/export-import-meta.mjs diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/store-import-meta.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/store-import-meta.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/store-import-meta.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-meta/resources/store-import-meta.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-something-namespace.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-something-namespace.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-something-namespace.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-something-namespace.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-subgraph-404.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-subgraph-404.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-subgraph-404.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/import-subgraph-404.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-a.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-a.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-a.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-a.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-b.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-b.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-b.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-b.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-cycle-a.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-cycle-a.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-cycle-a.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-cycle-a.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-cycle-b.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-cycle-b.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-cycle-b.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-cycle-b.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-cycle.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-cycle.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-cycle.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-cycle.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-inc-a.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-inc-a.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-inc-a.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-inc-a.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-inc-ab.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-inc-ab.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-inc-ab.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-inc-ab.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-inc-b.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-inc-b.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-inc-b.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-inc-b.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-self-inner.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-self-inner.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-self-inner.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-self-inner.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-self.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-self.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports-self.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports-self.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/imports.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/imports.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/inactive-context-import.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/inactive-context-import.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/inactive-context-import.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/inactive-context-import.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/inline-async-execorder.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/inline-async-execorder.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/inline-async-execorder.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/inline-async-execorder.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4a.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4a.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4a.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4a.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4b.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4b.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4b.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4b.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4c.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4c.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4c.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4c.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4d.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4d.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4d.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-4d.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5a.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5a.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5a.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5a.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5b.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5b.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5b.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5b.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5c.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5c.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5c.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5c.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5d.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5d.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5d.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5d.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5e.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5e.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5e.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-5e.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6a.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6a.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6a.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6a.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6b.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6b.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6b.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6b.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6c.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6c.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6c.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6c.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6d.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6d.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6d.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-6d.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7a.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7a.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7a.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7a.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7b.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7b.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7b.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7b.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7c.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7c.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7c.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7c.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7d.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7d.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7d.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7d.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7e.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7e.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7e.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7e.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7f.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7f.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7f.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-7f.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-8.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-8.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-8.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-8.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/integrity-matches-inner.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/integrity-matches-inner.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/integrity-matches-inner.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/integrity-matches-inner.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/integrity-matches.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/integrity-matches.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/integrity-matches.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/integrity-matches.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/integrity-mismatches-inner.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/integrity-mismatches-inner.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/integrity-mismatches-inner.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/integrity-mismatches-inner.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/integrity-mismatches.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/integrity-mismatches.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/integrity-mismatches.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/integrity-mismatches.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/integrity.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/integrity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/integrity.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/integrity.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/late-namespace-request.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/late-namespace-request.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/late-namespace-request.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/late-namespace-request.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/late-star-export-request.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/late-star-export-request.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/late-star-export-request.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/late-star-export-request.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/load-error-events-inline.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/load-error-events-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/load-error-events-inline.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/load-error-events-inline.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/load-error-events.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/load-error-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/load-error-events.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/load-error-events.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/missing-export-nested.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/missing-export-nested.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/missing-export-nested.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/missing-export-nested.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/missing-export.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/missing-export.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/missing-export.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/missing-export.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/module-in-xhtml.xhtml b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/module-in-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/module-in-xhtml.xhtml rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/module-in-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/module-vs-script-1.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/module-vs-script-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/module-vs-script-1.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/module-vs-script-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/module-vs-script-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/module-vs-script-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/module-vs-script-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/module-vs-script-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-a.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-a.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-a.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-a.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-b.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-b.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-b.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-b.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-c.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-c.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-c.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-c.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-d.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-d.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-d.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-d.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-e.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-e.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-e.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-e.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-f.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-f.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-f.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-f.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-g.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-g.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-g.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-g.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-h.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-h.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports-h.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports-h.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-imports.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-imports.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-missing-export.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-missing-export.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nested-missing-export.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nested-missing-export.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nomodule-attribute.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nomodule-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/nomodule-attribute.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/nomodule-attribute.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-no-referrer.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-no-referrer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-no-referrer.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-no-referrer.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-origin-when-cross-origin.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-origin-when-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-origin-when-cross-origin.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-origin-when-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-origin.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-origin.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-same-origin.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-same-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-same-origin.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-same-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-strict-policies.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-strict-policies.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-strict-policies.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-strict-policies.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-unsafe-url.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-unsafe-url.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-unsafe-url.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-unsafe-url.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/404-but-js.asis b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/404-but-js.asis similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/404-but-js.asis rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/404-but-js.asis diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/500-but-js.asis b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/500-but-js.asis similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/500-but-js.asis rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/500-but-js.asis diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/check-cookie.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/credentials-iframe.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/credentials-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/credentials-iframe.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/credentials-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/delayed-modulescript.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/delayed-modulescript.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/delayed-modulescript.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/delayed-modulescript.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-helper.sub.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-helper.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-helper.sub.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-helper.sub.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-iframe.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-iframe.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-setTimeout-iframe.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-setTimeout-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-setTimeout-iframe.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/dynamic-import-credentials-setTimeout-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/fast-module.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/fast-module.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/fast-module.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/fast-module.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-non-utf8-with-charset-header.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-non-utf8-with-charset-header.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-non-utf8-with-charset-header.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-non-utf8-with-charset-header.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-non-utf8.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-non-utf8.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-non-utf8.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-non-utf8.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker-insecure.sub.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker-insecure.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker-insecure.sub.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker-insecure.sub.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker-insecure.sub.js.headers b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker-insecure.sub.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker-insecure.sub.js.headers rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker-insecure.sub.js.headers diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js.headers b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js.headers rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js.headers diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-remote-origin-referrer-checker.sub.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-remote-origin-referrer-checker.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-remote-origin-referrer-checker.sub.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-remote-origin-referrer-checker.sub.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js.headers b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js.headers rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js.headers diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-utf8-with-charset-header.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-utf8-with-charset-header.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-utf8-with-charset-header.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-utf8-with-charset-header.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-utf8.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-utf8.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-utf8.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/import-utf8.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-404-but-js.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/imports-404-but-js.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-404-but-js.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/imports-404-but-js.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-500-but-js.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/imports-500-but-js.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-500-but-js.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/imports-500-but-js.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-b-cross-origin.sub.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/imports-b-cross-origin.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/imports-b-cross-origin.sub.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/imports-b-cross-origin.sub.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/referrer-checker.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/referrer-checker.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/referrer-checker.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/referrer-checker.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/slow-module.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/slow-module.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/slow-module.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/resources/slow-module.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/script-for-event.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/script-for-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/script-for-event.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/script-for-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/set-currentScript-on-window.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/set-currentScript-on-window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/set-currentScript-on-window.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/set-currentScript-on-window.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/single-evaluation-1.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/single-evaluation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/single-evaluation-1.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/single-evaluation-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/single-evaluation-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/single-evaluation-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/single-evaluation-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/single-evaluation-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/slow-cycle.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/slow-cycle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/slow-cycle.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/slow-cycle.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/slow-module-graph-a.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/slow-module-graph-a.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/slow-module-graph-a.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/slow-module-graph-a.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/slow-module-graph-b.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/slow-module-graph-b.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/slow-module-graph-b.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/slow-module-graph-b.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/specifier-error.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/specifier-error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/specifier-error.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/specifier-error.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/syntaxerror-nested.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/syntaxerror-nested.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/syntaxerror-nested.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/syntaxerror-nested.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/syntaxerror.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/syntaxerror.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/syntaxerror.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/syntaxerror.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/this-nested.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/this-nested.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/this-nested.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/this-nested.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/this.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/this.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/this.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/this.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/throw-error.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/throw-error.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/throw-error.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/throw-error.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/throw-nested.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/throw-nested.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/throw-nested.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/throw-nested.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/throw.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/throw.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/throw.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/throw.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/throw2.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/throw2.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/throw2.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/throw2.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/type.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/type.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/type.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents-during-evaluation.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents-during-evaluation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents-during-evaluation.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents-during-evaluation.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/README.md b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/README.md rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/README.md diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-fetch-error-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-fetch-error-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-fetch-error-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-fetch-error-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-fetch-error-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-fetch-error-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-fetch-error-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-fetch-error-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-inline-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-inline-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-inline-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-inline-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-inline-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-inline-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-inline-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-inline-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-fetch-error-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-fetch-error-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-fetch-error-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-fetch-error-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-fetch-error-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-fetch-error-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-fetch-error-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-fetch-error-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-inline-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-inline-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-inline-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-inline-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-inline-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-inline-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-inline-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-parse-error-inline-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-empty-src-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-empty-src-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-empty-src-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-empty-src-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-empty-src-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-empty-src-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-empty-src-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-empty-src-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-inline-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-inline-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-inline-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-inline-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-inline-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-inline-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-inline-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-createHTMLDocument-success-inline-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-inline-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-inline-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-inline-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-inline-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-inline-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-inline-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-inline-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-inline-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-empty-src-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-empty-src-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-empty-src-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-empty-src-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-empty-src-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-empty-src-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-empty-src-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-empty-src-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-inline-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-inline-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-inline-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-inline-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-inline-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-inline-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-inline-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-success-inline-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-fetch-error-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-fetch-error-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-fetch-error-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-fetch-error-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-fetch-error-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-fetch-error-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-fetch-error-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-fetch-error-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-parse-error-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-parse-error-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-parse-error-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-parse-error-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-parse-error-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-parse-error-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-parse-error-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-parse-error-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-success-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-success-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-success-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-success-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-success-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-success-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-success-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-createHTMLDocument-success-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-fetch-error-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-fetch-error-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-fetch-error-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-fetch-error-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-fetch-error-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-fetch-error-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-fetch-error-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-fetch-error-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-parse-error-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-parse-error-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-parse-error-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-parse-error-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-parse-error-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-parse-error-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-parse-error-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-parse-error-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-parse-error-inline-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-parse-error-inline-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-parse-error-inline-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-parse-error-inline-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-success-external-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-success-external-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-success-external-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-success-external-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-success-external-module.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-success-external-module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-success-external-module.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-success-external-module.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-success-inline-classic.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-success-inline-classic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-success-inline-classic.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/move-back-iframe-success-inline-classic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/README.md b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/README.md rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/README.md diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/delay-load-event-1.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/delay-load-event-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/delay-load-event-1.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/delay-load-event-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/delay-load-event-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/delay-load-event-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/delay-load-event-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/delay-load-event-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/delay-load-event-iframe.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/delay-load-event-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/delay-load-event-iframe.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/delay-load-event-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/helper.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/helper.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/helper.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/in-order.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/in-order.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/in-order.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/in-order.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/parser-blocking.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/parser-blocking.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/parser-blocking.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/ordering/parser-blocking.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/moving-between-documents-helper.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/moving-between-documents-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/moving-between-documents-helper.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/moving-between-documents-helper.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/moving-between-documents-iframe.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/moving-between-documents-iframe.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/moving-between-documents-iframe.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/moving-between-documents-iframe.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/slow-flag-setter.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/slow-flag-setter.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/slow-flag-setter.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/slow-flag-setter.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/tools/generate.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/tools/generate.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/moving-between-documents/tools/generate.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/tools/generate.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/muted-errors-iframe.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/muted-errors-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/muted-errors-iframe.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/muted-errors-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/muted-errors.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/muted-errors.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/muted-errors.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/muted-errors.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/nomodule-reflect.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/nomodule-reflect.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/nomodule-reflect.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/nomodule-reflect.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-async-classic-script.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-async-classic-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-async-classic-script.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-async-classic-script.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-external-module-script.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-external-module-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-external-module-script.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-external-module-script.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-inline-classic-scripts.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-inline-classic-scripts.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-inline-classic-scripts.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-inline-classic-scripts.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-inline-module-script.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-inline-module-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-inline-module-script.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-inline-module-script.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-synchronously-loaded-classic-scripts.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-synchronously-loaded-classic-scripts.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-synchronously-loaded-classic-scripts.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/nomodule-set-on-synchronously-loaded-classic-scripts.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/promise-reject-and-remove.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/promise-reject-and-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/promise-reject-and-remove.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/promise-reject-and-remove.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/bom-utf-16be.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/bom-utf-16be.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/bom-utf-16be.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/bom-utf-16be.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/bom-utf-16le.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/bom-utf-16le.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/bom-utf-16le.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/bom-utf-16le.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/bom-utf-8.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/bom-utf-8.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/bom-utf-8.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/bom-utf-8.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/cocoa-module.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/cocoa-module.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/cocoa-module.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/cocoa-module.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/cross-origin.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/cross-origin.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/cross-origin.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/cross-origin.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/exports-cocoa.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/exports-cocoa.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/exports-cocoa.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/exports-cocoa.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/flag-setter.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/flag-setter.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/flag-setter.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/flag-setter.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/load-error-events-helpers.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/load-error-events-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/load-error-events-helpers.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/load-error-events-helpers.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/load-error-events.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/load-error-events.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/load-error-events.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/load-error-events.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/promise-reject-and-remove-iframe.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/promise-reject-and-remove-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/promise-reject-and-remove-iframe.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/promise-reject-and-remove-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/script-type-and-language-js.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/script-type-and-language-js.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/script-type-and-language-js.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/script-type-and-language-js.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/set-script-executed.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/set-script-executed.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/set-script-executed.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/set-script-executed.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/syntax-error.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/syntax-error.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/syntax-error.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/syntax-error.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/throw.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/throw.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/resources/throw.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/resources/throw.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-charset-01.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-charset-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-charset-01.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-charset-01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-charset-02.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-charset-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-charset-02.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-charset-02.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-charset-03.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-charset-03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-charset-03.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-charset-03.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-crossorigin-network.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-crossorigin-network.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-crossorigin-network.sub.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-crossorigin-network.sub.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-crossorigin.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-crossorigin.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-crossorigin.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-defer-xhtml.xhtml b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-defer-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-defer-xhtml.xhtml rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-defer-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-defer.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-defer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-defer.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-defer.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-for-event.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-for-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-for-event.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-for-event.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-noembed-noframes-iframe.xhtml b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-noembed-noframes-iframe.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-noembed-noframes-iframe.xhtml rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-noembed-noframes-iframe.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown-child.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown-child.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown-child.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown-child.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-found-not-executed-2.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-not-found-not-executed-2.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-found-not-executed-2.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-not-found-not-executed-2.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-found-not-executed.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-not-found-not-executed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-found-not-executed.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-not-found-not-executed.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-found-not-executed.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-not-found-not-executed.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-found-not-executed.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-not-found-not-executed.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-1.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-1.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-onload-insertion-point.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-onload-insertion-point.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-onload-insertion-point.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-onload-insertion-point.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-onload-string.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-onload-string.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-onload-string.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-onload-string.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-referrerpolicy-idl.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-referrerpolicy-idl.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-referrerpolicy-idl.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-referrerpolicy-idl.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-supports.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-supports.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-supports.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-supports.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-modifications-csp.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-text-modifications-csp.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-modifications-csp.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-text-modifications-csp.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-modifications.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-text-modifications.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-modifications.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-text-modifications.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-text.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-text.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-type-and-language-empty.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-type-and-language-empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-type-and-language-empty.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-type-and-language-empty.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-type-and-language-js-svg.svg b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-type-and-language-js-svg.svg similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-type-and-language-js-svg.svg rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-type-and-language-js-svg.svg diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-type-and-language-js-xhtml.xhtml b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-type-and-language-js-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-type-and-language-js-xhtml.xhtml rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-type-and-language-js-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-type-and-language-js.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-type-and-language-js.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-type-and-language-js.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-type-and-language-js.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-type-and-language-with-params.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-type-and-language-with-params.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-type-and-language-with-params.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-type-and-language-with-params.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-type-whitespace.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-type-whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/script-type-whitespace.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/script-type-whitespace.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/scripting-enabled.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/scripting-enabled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/scripting-enabled.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/scripting-enabled.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/serve-json-then-js.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/serve-json-then-js.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/serve-json-then-js.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/serve-json-then-js.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/serve-with-content-type.py b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/serve-with-content-type.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/serve-with-content-type.py rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/serve-with-content-type.py diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/support/script-onerror-insertion-point-1-helper.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/support/script-onerror-insertion-point-1-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/support/script-onerror-insertion-point-1-helper.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/support/script-onerror-insertion-point-1-helper.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/support/script-onerror-insertion-point-2-helper.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/support/script-onerror-insertion-point-2-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/support/script-onerror-insertion-point-2-helper.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/support/script-onerror-insertion-point-2-helper.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/support/script-onload-insertion-point-helper.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/support/script-onload-insertion-point-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/support/script-onload-insertion-point-helper.html rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/support/script-onload-insertion-point-helper.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/support/script-onload-insertion-point-helper.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/support/script-onload-insertion-point-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/support/script-onload-insertion-point-helper.js rename to tests/wpt/tests/html/semantics/scripting-1/the-script-element/support/script-onload-insertion-point-helper.js diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/tag-name.xhtml b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/tag-name.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/tag-name.xhtml rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/tag-name.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/template-child-nodes.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/template-child-nodes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/template-child-nodes.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/template-child-nodes.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-serializing-xhtml-documents/outerhtml.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-serializing-xhtml-documents/outerhtml.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-serializing-xhtml-documents/outerhtml.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-serializing-xhtml-documents/outerhtml.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001-ref.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001-ref.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-002.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-002.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-002.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-003.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-003.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-003.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-the-steps-to-clone-a-node/template-clone-children.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-the-steps-to-clone-a-node/template-clone-children.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-the-steps-to-clone-a-node/template-clone-children.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-the-steps-to-clone-a-node/template-clone-children.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-the-steps-to-clone-a-node/templates-copy-document-owner.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-the-steps-to-clone-a-node/templates-copy-document-owner.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/additions-to-the-steps-to-clone-a-node/templates-copy-document-owner.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/additions-to-the-steps-to-clone-a-node/templates-copy-document-owner.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-document-type.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-document-type.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-document-type.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-document-type.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-test-001.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-test-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-test-001.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-test-001.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-test-002.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-test-002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-test-002.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-test-002.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/definitions/template-contents.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/definitions/template-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/definitions/template-contents.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/definitions/template-contents.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/innerhtml-on-templates/innerhtml.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/innerhtml-on-templates/innerhtml.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/innerhtml-on-templates/innerhtml.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/innerhtml-on-templates/innerhtml.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/end-template-tag-in-body.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/end-template-tag-in-body.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/end-template-tag-in-body.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/end-template-tag-in-body.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/end-template-tag-in-head.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/end-template-tag-in-head.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/end-template-tag-in-head.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/end-template-tag-in-head.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/frameset-end-tag.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/frameset-end-tag.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/frameset-end-tag.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/frameset-end-tag.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/head-template-contents-div-no-end-tag.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/head-template-contents-div-no-end-tag.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/head-template-contents-div-no-end-tag.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/head-template-contents-div-no-end-tag.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/head-template-contents-table-no-end-tag.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/head-template-contents-table-no-end-tag.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/head-template-contents-table-no-end-tag.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/head-template-contents-table-no-end-tag.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/html-start-tag.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/html-start-tag.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/html-start-tag.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/html-start-tag.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-child-nodes-div.xhtml b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-child-nodes-div.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-child-nodes-div.xhtml rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-child-nodes-div.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-child-nodes-nested.xhtml b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-child-nodes-nested.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-child-nodes-nested.xhtml rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-child-nodes-nested.xhtml diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-attribute.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-attribute.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-attribute.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-body.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-body.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-body.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-body.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-div-no-end-tag.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-div-no-end-tag.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-div-no-end-tag.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-div-no-end-tag.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-empty.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-empty.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-empty.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-frameset.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-frameset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-frameset.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-frameset.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-head.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-head.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-head.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-head.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-html.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-html.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-html.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-html.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-nested.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-nested.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-nested.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-table-no-end-tag.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-table-no-end-tag.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-table-no-end-tag.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-table-no-end-tag.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-text.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-text.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents-text.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents-text.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-contents.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-contents.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-descendant-body.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-descendant-body.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-descendant-body.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-descendant-body.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-descendant-frameset.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-descendant-frameset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-descendant-frameset.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-descendant-frameset.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-descendant-head.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-descendant-head.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/template-descendant-head.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/template-descendant-head.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/two-templates.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/two-templates.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/resources/two-templates.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/resources/two-templates.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/serializing-html-templates/outerhtml.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/serializing-html-templates/outerhtml.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/serializing-html-templates/outerhtml.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/serializing-html-templates/outerhtml.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/content-attribute.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/content-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/content-attribute.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/content-attribute.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/node-document-changes.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/node-document-changes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/node-document-changes.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/node-document-changes.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-as-a-descendant.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-as-a-descendant.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-as-a-descendant.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-as-a-descendant.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-construction-in-inactive-document-crash.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-construction-in-inactive-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-construction-in-inactive-document-crash.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-construction-in-inactive-document-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-content-hierarcy.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-content-hierarcy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-content-hierarcy.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-content-hierarcy.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-content-in-inactive-document-crash.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-content-in-inactive-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-content-in-inactive-document-crash.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-content-in-inactive-document-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-content-move-to-inactive-document-crash.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-content-move-to-inactive-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-content-move-to-inactive-document-crash.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-content-move-to-inactive-document-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-content-node-document.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-content-node-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-content-node-document.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-content-node-document.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-content.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-content.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-content.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-content.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-descendant-body.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-descendant-body.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-descendant-body.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-descendant-body.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-descendant-frameset.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-descendant-frameset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-descendant-frameset.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-descendant-frameset.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-descendant-head.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-descendant-head.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-descendant-head.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-descendant-head.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-element-clone-into-inactive-document-crash.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-element-clone-into-inactive-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-element-clone-into-inactive-document-crash.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-element-clone-into-inactive-document-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-set-inner-html-in-inactive-document-crash.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-set-inner-html-in-inactive-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-set-inner-html-in-inactive-document-crash.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-element/template-set-inner-html-in-inactive-document-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-table-crash.html b/tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-table-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-table-crash.html rename to tests/wpt/tests/html/semantics/scripting-1/the-template-element/template-table-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/sections/the-h1-h2-h3-h4-h5-and-h6-elements/original-id.json b/tests/wpt/tests/html/semantics/sections/the-h1-h2-h3-h4-h5-and-h6-elements/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/sections/the-h1-h2-h3-h4-h5-and-h6-elements/original-id.json rename to tests/wpt/tests/html/semantics/sections/the-h1-h2-h3-h4-h5-and-h6-elements/original-id.json diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/META.yml b/tests/wpt/tests/html/semantics/selectors/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/META.yml rename to tests/wpt/tests/html/semantics/selectors/META.yml diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/active-disabled.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/active-disabled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/active-disabled.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/active-disabled.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/autofill.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/autofill.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/autofill.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/autofill.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/checked-001-manual.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/checked-001-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/checked-001-manual.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/checked-001-manual.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/checked-type-change.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/checked-type-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/checked-type-change.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/checked-type-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/checked.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/checked.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/checked.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/checked.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/default.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/default.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/default.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/dir-dynamic.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/dir-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/dir-dynamic.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/dir-dynamic.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/dir-html-input-dynamic-text.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/dir-html-input-dynamic-text.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/dir-html-input-dynamic-text.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/dir-html-input-dynamic-text.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/dir.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/dir.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/dir.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/dir.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/dir01.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/dir01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/dir01.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/dir01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/disabled.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/disabled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/disabled.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/disabled.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/enabled.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/enabled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/enabled.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/enabled.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/focus-autofocus.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/focus-autofocus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/focus-autofocus.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/focus-autofocus.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/focus-iframe.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/focus-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/focus-iframe.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/focus-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/focus.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/focus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/focus.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/focus.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/indeterminate-radio.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/indeterminate-radio.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/indeterminate-radio.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/indeterminate-radio.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/indeterminate-type-change.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/indeterminate-type-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/indeterminate-type-change.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/indeterminate-type-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/indeterminate.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/indeterminate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/indeterminate.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/indeterminate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/inrange-outofrange-type-change.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/inrange-outofrange-type-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/inrange-outofrange-type-change.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/inrange-outofrange-type-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/inrange-outofrange.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/inrange-outofrange.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/inrange-outofrange.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/inrange-outofrange.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/invalid-after-clone.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/invalid-after-clone.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/invalid-after-clone.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/invalid-after-clone.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/link.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/link.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/link.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/link.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/placeholder-shown-type-change.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/placeholder-shown-type-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/placeholder-shown-type-change.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/placeholder-shown-type-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/readwrite-readonly-type-change.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/readwrite-readonly-type-change.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/readwrite-readonly-type-change.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/readwrite-readonly-type-change.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/readwrite-readonly.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/readwrite-readonly.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/readwrite-readonly.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/readwrite-readonly.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/required-optional-hidden.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/required-optional-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/required-optional-hidden.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/required-optional-hidden.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/required-optional.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/required-optional.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/required-optional.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/required-optional.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/utils.js b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/utils.js rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/utils.js diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/valid-invalid-fieldset-disconnected.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/valid-invalid-fieldset-disconnected.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/valid-invalid-fieldset-disconnected.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/valid-invalid-fieldset-disconnected.html diff --git a/tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/valid-invalid.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/valid-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/selectors/pseudo-classes/valid-invalid.html rename to tests/wpt/tests/html/semantics/selectors/pseudo-classes/valid-invalid.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/META.yml b/tests/wpt/tests/html/semantics/tabular-data/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/META.yml rename to tests/wpt/tests/html/semantics/tabular-data/META.yml diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/attributes-common-to-td-and-th-elements/cellIndex.html b/tests/wpt/tests/html/semantics/tabular-data/attributes-common-to-td-and-th-elements/cellIndex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/attributes-common-to-td-and-th-elements/cellIndex.html rename to tests/wpt/tests/html/semantics/tabular-data/attributes-common-to-td-and-th-elements/cellIndex.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/historical.html b/tests/wpt/tests/html/semantics/tabular-data/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/historical.html rename to tests/wpt/tests/html/semantics/tabular-data/historical.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/html-table-section-element.js b/tests/wpt/tests/html/semantics/tabular-data/html-table-section-element.js similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/html-table-section-element.js rename to tests/wpt/tests/html/semantics/tabular-data/html-table-section-element.js diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/processing-model-1/col-span-limits.html b/tests/wpt/tests/html/semantics/tabular-data/processing-model-1/col-span-limits.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/processing-model-1/col-span-limits.html rename to tests/wpt/tests/html/semantics/tabular-data/processing-model-1/col-span-limits.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/processing-model-1/span-limits.html b/tests/wpt/tests/html/semantics/tabular-data/processing-model-1/span-limits.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/processing-model-1/span-limits.html rename to tests/wpt/tests/html/semantics/tabular-data/processing-model-1/span-limits.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-caption-element/caption_001.html b/tests/wpt/tests/html/semantics/tabular-data/the-caption-element/caption_001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-caption-element/caption_001.html rename to tests/wpt/tests/html/semantics/tabular-data/the-caption-element/caption_001.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/caption-methods.html b/tests/wpt/tests/html/semantics/tabular-data/the-table-element/caption-methods.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/caption-methods.html rename to tests/wpt/tests/html/semantics/tabular-data/the-table-element/caption-methods.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/createTBody.html b/tests/wpt/tests/html/semantics/tabular-data/the-table-element/createTBody.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/createTBody.html rename to tests/wpt/tests/html/semantics/tabular-data/the-table-element/createTBody.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/delete-caption.html b/tests/wpt/tests/html/semantics/tabular-data/the-table-element/delete-caption.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/delete-caption.html rename to tests/wpt/tests/html/semantics/tabular-data/the-table-element/delete-caption.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/insertRow-method-01.html b/tests/wpt/tests/html/semantics/tabular-data/the-table-element/insertRow-method-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/insertRow-method-01.html rename to tests/wpt/tests/html/semantics/tabular-data/the-table-element/insertRow-method-01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/insertRow-method-02.html b/tests/wpt/tests/html/semantics/tabular-data/the-table-element/insertRow-method-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/insertRow-method-02.html rename to tests/wpt/tests/html/semantics/tabular-data/the-table-element/insertRow-method-02.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/insertRow-method-03.html b/tests/wpt/tests/html/semantics/tabular-data/the-table-element/insertRow-method-03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/insertRow-method-03.html rename to tests/wpt/tests/html/semantics/tabular-data/the-table-element/insertRow-method-03.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/remove-row.html b/tests/wpt/tests/html/semantics/tabular-data/the-table-element/remove-row.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/remove-row.html rename to tests/wpt/tests/html/semantics/tabular-data/the-table-element/remove-row.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/tBodies.html b/tests/wpt/tests/html/semantics/tabular-data/the-table-element/tBodies.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/tBodies.html rename to tests/wpt/tests/html/semantics/tabular-data/the-table-element/tBodies.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/tFoot.html b/tests/wpt/tests/html/semantics/tabular-data/the-table-element/tFoot.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/tFoot.html rename to tests/wpt/tests/html/semantics/tabular-data/the-table-element/tFoot.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/tHead.html b/tests/wpt/tests/html/semantics/tabular-data/the-table-element/tHead.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/tHead.html rename to tests/wpt/tests/html/semantics/tabular-data/the-table-element/tHead.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/table-insertRow.html b/tests/wpt/tests/html/semantics/tabular-data/the-table-element/table-insertRow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/table-insertRow.html rename to tests/wpt/tests/html/semantics/tabular-data/the-table-element/table-insertRow.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/table-rows.html b/tests/wpt/tests/html/semantics/tabular-data/the-table-element/table-rows.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-table-element/table-rows.html rename to tests/wpt/tests/html/semantics/tabular-data/the-table-element/table-rows.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tbody-element/deleteRow.html b/tests/wpt/tests/html/semantics/tabular-data/the-tbody-element/deleteRow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tbody-element/deleteRow.html rename to tests/wpt/tests/html/semantics/tabular-data/the-tbody-element/deleteRow.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tbody-element/insertRow.html b/tests/wpt/tests/html/semantics/tabular-data/the-tbody-element/insertRow.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tbody-element/insertRow.html rename to tests/wpt/tests/html/semantics/tabular-data/the-tbody-element/insertRow.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tbody-element/rows.html b/tests/wpt/tests/html/semantics/tabular-data/the-tbody-element/rows.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tbody-element/rows.html rename to tests/wpt/tests/html/semantics/tabular-data/the-tbody-element/rows.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tfoot-element/rows.html b/tests/wpt/tests/html/semantics/tabular-data/the-tfoot-element/rows.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tfoot-element/rows.html rename to tests/wpt/tests/html/semantics/tabular-data/the-tfoot-element/rows.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-thead-element/rows.html b/tests/wpt/tests/html/semantics/tabular-data/the-thead-element/rows.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-thead-element/rows.html rename to tests/wpt/tests/html/semantics/tabular-data/the-thead-element/rows.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tr-element/cells.html b/tests/wpt/tests/html/semantics/tabular-data/the-tr-element/cells.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tr-element/cells.html rename to tests/wpt/tests/html/semantics/tabular-data/the-tr-element/cells.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tr-element/deleteCell.html b/tests/wpt/tests/html/semantics/tabular-data/the-tr-element/deleteCell.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tr-element/deleteCell.html rename to tests/wpt/tests/html/semantics/tabular-data/the-tr-element/deleteCell.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tr-element/insertCell.html b/tests/wpt/tests/html/semantics/tabular-data/the-tr-element/insertCell.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tr-element/insertCell.html rename to tests/wpt/tests/html/semantics/tabular-data/the-tr-element/insertCell.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tr-element/rowIndex.html b/tests/wpt/tests/html/semantics/tabular-data/the-tr-element/rowIndex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tr-element/rowIndex.html rename to tests/wpt/tests/html/semantics/tabular-data/the-tr-element/rowIndex.html diff --git a/tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tr-element/sectionRowIndex.html b/tests/wpt/tests/html/semantics/tabular-data/the-tr-element/sectionRowIndex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/tabular-data/the-tr-element/sectionRowIndex.html rename to tests/wpt/tests/html/semantics/tabular-data/the-tr-element/sectionRowIndex.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/historical.html b/tests/wpt/tests/html/semantics/text-level-semantics/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/historical.html rename to tests/wpt/tests/html/semantics/text-level-semantics/historical.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-click-handler-with-null-browsing-context-crash.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a-click-handler-with-null-browsing-context-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-click-handler-with-null-browsing-context-crash.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a-click-handler-with-null-browsing-context-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-download-404.py b/tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a-download-404.py similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-download-404.py rename to tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a-download-404.py diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-download-click-404.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a-download-click-404.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-download-click-404.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a-download-click-404.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-download-click-redirect-to-javascript.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a-download-click-redirect-to-javascript.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-download-click-redirect-to-javascript.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a-download-click-redirect-to-javascript.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-download-click.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a-download-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-download-click.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a-download-click.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-stringifier.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a-stringifier.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-stringifier.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a-stringifier.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a.text-getter-01.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a.text-getter-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a.text-getter-01.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a.text-getter-01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a.text-setter-01.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a.text-setter-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a.text-setter-01.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/a.text-setter-01.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/resources/a-download-404.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/resources/a-download-404.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/resources/a-download-404.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/resources/a-download-404.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/resources/a-download-click.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/resources/a-download-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/resources/a-download-click.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/resources/a-download-click.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/resources/a-download-redirect-to-javascript.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/resources/a-download-redirect-to-javascript.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/resources/a-download-redirect-to-javascript.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/resources/a-download-redirect-to-javascript.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/resources/a-onclick-handler-iframe.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/resources/a-onclick-handler-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/resources/a-onclick-handler-iframe.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-a-element/resources/a-onclick-handler-iframe.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-b-element/b-usage-notref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-b-element/b-usage-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-b-element/b-usage-notref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-b-element/b-usage-notref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-b-element/b-usage.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-b-element/b-usage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-b-element/b-usage.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-b-element/b-usage.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdo-element/bdo-child.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-child.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdo-element/bdo-child.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-child.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdo-element/bdo-ltr.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdo-element/bdo-ltr.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-ltr.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdo-element/bdo-override.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-override.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdo-element/bdo-override.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-override.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdo-element/bidi-001-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdo-element/bidi-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdo-element/bidi-001-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdo-element/bidi-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdo-element/bidi-001.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-bdo-element/bidi-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-bdo-element/bidi-001.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-bdo-element/bidi-001.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-br-element/br-bidi-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-br-element/br-bidi-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-br-element/br-bidi-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-br-element/br-bidi-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-br-element/br-bidi.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-br-element/br-bidi.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-br-element/br-bidi.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-br-element/br-bidi.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-ruby-element/rt-without-ruby-crash.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-ruby-element/rt-without-ruby-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-ruby-element/rt-without-ruby-crash.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-ruby-element/rt-without-ruby-crash.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-ruby-element/ruby-usage-notref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-ruby-element/ruby-usage-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-ruby-element/ruby-usage-notref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-ruby-element/ruby-usage-notref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-ruby-element/ruby-usage.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-ruby-element/ruby-usage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-ruby-element/ruby-usage.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-ruby-element/ruby-usage.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-time-element/001.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-time-element/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-time-element/001.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-time-element/001.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-wbr-element/wbr-element-ref.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-wbr-element/wbr-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-wbr-element/wbr-element-ref.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-wbr-element/wbr-element-ref.html diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html b/tests/wpt/tests/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html rename to tests/wpt/tests/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html diff --git a/tests/wpt/web-platform-tests/html/semantics/the-link-element/attr-link-fetchpriority.html b/tests/wpt/tests/html/semantics/the-link-element/attr-link-fetchpriority.html similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/the-link-element/attr-link-fetchpriority.html rename to tests/wpt/tests/html/semantics/the-link-element/attr-link-fetchpriority.html diff --git a/tests/wpt/web-platform-tests/html/semantics/the-link-element/resources/stylesheet.css b/tests/wpt/tests/html/semantics/the-link-element/resources/stylesheet.css similarity index 100% rename from tests/wpt/web-platform-tests/html/semantics/the-link-element/resources/stylesheet.css rename to tests/wpt/tests/html/semantics/the-link-element/resources/stylesheet.css diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/README.md b/tests/wpt/tests/html/syntax/charset/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/README.md rename to tests/wpt/tests/html/syntax/charset/README.md diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/after-1kb.html b/tests/wpt/tests/html/syntax/charset/after-1kb.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/after-1kb.html rename to tests/wpt/tests/html/syntax/charset/after-1kb.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/after-bogus-after-1kb.html b/tests/wpt/tests/html/syntax/charset/after-bogus-after-1kb.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/after-bogus-after-1kb.html rename to tests/wpt/tests/html/syntax/charset/after-bogus-after-1kb.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/after-bogus.html b/tests/wpt/tests/html/syntax/charset/after-bogus.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/after-bogus.html rename to tests/wpt/tests/html/syntax/charset/after-bogus.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/after-head-after-1kb-crlf.html b/tests/wpt/tests/html/syntax/charset/after-head-after-1kb-crlf.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/after-head-after-1kb-crlf.html rename to tests/wpt/tests/html/syntax/charset/after-head-after-1kb-crlf.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/after-head-after-1kb.html b/tests/wpt/tests/html/syntax/charset/after-head-after-1kb.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/after-head-after-1kb.html rename to tests/wpt/tests/html/syntax/charset/after-head-after-1kb.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/after-head-in-1kb-crlf.html b/tests/wpt/tests/html/syntax/charset/after-head-in-1kb-crlf.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/after-head-in-1kb-crlf.html rename to tests/wpt/tests/html/syntax/charset/after-head-in-1kb-crlf.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/after-head-in-1kb.html b/tests/wpt/tests/html/syntax/charset/after-head-in-1kb.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/after-head-in-1kb.html rename to tests/wpt/tests/html/syntax/charset/after-head-in-1kb.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/baseline.html b/tests/wpt/tests/html/syntax/charset/baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/baseline.html rename to tests/wpt/tests/html/syntax/charset/baseline.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/document-write.html b/tests/wpt/tests/html/syntax/charset/document-write.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/document-write.html rename to tests/wpt/tests/html/syntax/charset/document-write.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/in-comment.html b/tests/wpt/tests/html/syntax/charset/in-comment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/in-comment.html rename to tests/wpt/tests/html/syntax/charset/in-comment.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/in-noscript-after-template-after-1kb.html b/tests/wpt/tests/html/syntax/charset/in-noscript-after-template-after-1kb.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/in-noscript-after-template-after-1kb.html rename to tests/wpt/tests/html/syntax/charset/in-noscript-after-template-after-1kb.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/in-object.html b/tests/wpt/tests/html/syntax/charset/in-object.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/in-object.html rename to tests/wpt/tests/html/syntax/charset/in-object.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/in-script.html b/tests/wpt/tests/html/syntax/charset/in-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/in-script.html rename to tests/wpt/tests/html/syntax/charset/in-script.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/in-style.html b/tests/wpt/tests/html/syntax/charset/in-style.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/in-style.html rename to tests/wpt/tests/html/syntax/charset/in-style.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/in-svg-in-cdata.html b/tests/wpt/tests/html/syntax/charset/in-svg-in-cdata.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/in-svg-in-cdata.html rename to tests/wpt/tests/html/syntax/charset/in-svg-in-cdata.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/in-svg.html b/tests/wpt/tests/html/syntax/charset/in-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/in-svg.html rename to tests/wpt/tests/html/syntax/charset/in-svg.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/in-template-after-1kb.html b/tests/wpt/tests/html/syntax/charset/in-template-after-1kb.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/in-template-after-1kb.html rename to tests/wpt/tests/html/syntax/charset/in-template-after-1kb.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/in-template.html b/tests/wpt/tests/html/syntax/charset/in-template.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/in-template.html rename to tests/wpt/tests/html/syntax/charset/in-template.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/in-title.html b/tests/wpt/tests/html/syntax/charset/in-title.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/in-title.html rename to tests/wpt/tests/html/syntax/charset/in-title.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/inheritance-bogus-meta-utf-8.html b/tests/wpt/tests/html/syntax/charset/inheritance-bogus-meta-utf-8.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/inheritance-bogus-meta-utf-8.html rename to tests/wpt/tests/html/syntax/charset/inheritance-bogus-meta-utf-8.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/inheritance-bogus-meta.html b/tests/wpt/tests/html/syntax/charset/inheritance-bogus-meta.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/inheritance-bogus-meta.html rename to tests/wpt/tests/html/syntax/charset/inheritance-bogus-meta.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/ncr.html b/tests/wpt/tests/html/syntax/charset/ncr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/ncr.html rename to tests/wpt/tests/html/syntax/charset/ncr.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/non-ascii-in-comment-before.html b/tests/wpt/tests/html/syntax/charset/non-ascii-in-comment-before.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/non-ascii-in-comment-before.html rename to tests/wpt/tests/html/syntax/charset/non-ascii-in-comment-before.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/non-ascii-in-title-before.html b/tests/wpt/tests/html/syntax/charset/non-ascii-in-title-before.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/non-ascii-in-title-before.html rename to tests/wpt/tests/html/syntax/charset/non-ascii-in-title-before.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/after-1kb-ref.html b/tests/wpt/tests/html/syntax/charset/references/after-1kb-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/after-1kb-ref.html rename to tests/wpt/tests/html/syntax/charset/references/after-1kb-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/after-bogus-after-1kb-ref.html b/tests/wpt/tests/html/syntax/charset/references/after-bogus-after-1kb-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/after-bogus-after-1kb-ref.html rename to tests/wpt/tests/html/syntax/charset/references/after-bogus-after-1kb-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/after-bogus-ref.html b/tests/wpt/tests/html/syntax/charset/references/after-bogus-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/after-bogus-ref.html rename to tests/wpt/tests/html/syntax/charset/references/after-bogus-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/after-head-after-1kb-crlf-ref.html b/tests/wpt/tests/html/syntax/charset/references/after-head-after-1kb-crlf-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/after-head-after-1kb-crlf-ref.html rename to tests/wpt/tests/html/syntax/charset/references/after-head-after-1kb-crlf-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/after-head-after-1kb-ref.html b/tests/wpt/tests/html/syntax/charset/references/after-head-after-1kb-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/after-head-after-1kb-ref.html rename to tests/wpt/tests/html/syntax/charset/references/after-head-after-1kb-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/after-head-in-1kb-crlf-ref.html b/tests/wpt/tests/html/syntax/charset/references/after-head-in-1kb-crlf-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/after-head-in-1kb-crlf-ref.html rename to tests/wpt/tests/html/syntax/charset/references/after-head-in-1kb-crlf-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/after-head-in-1kb-ref.html b/tests/wpt/tests/html/syntax/charset/references/after-head-in-1kb-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/after-head-in-1kb-ref.html rename to tests/wpt/tests/html/syntax/charset/references/after-head-in-1kb-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/baseline-ref.html b/tests/wpt/tests/html/syntax/charset/references/baseline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/baseline-ref.html rename to tests/wpt/tests/html/syntax/charset/references/baseline-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/document-write-ref.html b/tests/wpt/tests/html/syntax/charset/references/document-write-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/document-write-ref.html rename to tests/wpt/tests/html/syntax/charset/references/document-write-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/in-comment-ref.html b/tests/wpt/tests/html/syntax/charset/references/in-comment-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/in-comment-ref.html rename to tests/wpt/tests/html/syntax/charset/references/in-comment-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/in-noscript-after-template-after-1kb-ref.html b/tests/wpt/tests/html/syntax/charset/references/in-noscript-after-template-after-1kb-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/in-noscript-after-template-after-1kb-ref.html rename to tests/wpt/tests/html/syntax/charset/references/in-noscript-after-template-after-1kb-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/in-object-ref.html b/tests/wpt/tests/html/syntax/charset/references/in-object-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/in-object-ref.html rename to tests/wpt/tests/html/syntax/charset/references/in-object-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/in-script-ref.html b/tests/wpt/tests/html/syntax/charset/references/in-script-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/in-script-ref.html rename to tests/wpt/tests/html/syntax/charset/references/in-script-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/in-style-ref.html b/tests/wpt/tests/html/syntax/charset/references/in-style-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/in-style-ref.html rename to tests/wpt/tests/html/syntax/charset/references/in-style-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/in-svg-in-cdata-ref.html b/tests/wpt/tests/html/syntax/charset/references/in-svg-in-cdata-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/in-svg-in-cdata-ref.html rename to tests/wpt/tests/html/syntax/charset/references/in-svg-in-cdata-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/in-svg-ref.html b/tests/wpt/tests/html/syntax/charset/references/in-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/in-svg-ref.html rename to tests/wpt/tests/html/syntax/charset/references/in-svg-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/in-template-after-1kb-ref.html b/tests/wpt/tests/html/syntax/charset/references/in-template-after-1kb-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/in-template-after-1kb-ref.html rename to tests/wpt/tests/html/syntax/charset/references/in-template-after-1kb-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/in-template-ref.html b/tests/wpt/tests/html/syntax/charset/references/in-template-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/in-template-ref.html rename to tests/wpt/tests/html/syntax/charset/references/in-template-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/in-title-ref.html b/tests/wpt/tests/html/syntax/charset/references/in-title-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/in-title-ref.html rename to tests/wpt/tests/html/syntax/charset/references/in-title-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/ncr-ref.html b/tests/wpt/tests/html/syntax/charset/references/ncr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/ncr-ref.html rename to tests/wpt/tests/html/syntax/charset/references/ncr-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/non-ascii-in-comment-before-ref.html b/tests/wpt/tests/html/syntax/charset/references/non-ascii-in-comment-before-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/non-ascii-in-comment-before-ref.html rename to tests/wpt/tests/html/syntax/charset/references/non-ascii-in-comment-before-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/references/non-ascii-in-title-before-ref.html b/tests/wpt/tests/html/syntax/charset/references/non-ascii-in-title-before-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/references/non-ascii-in-title-before-ref.html rename to tests/wpt/tests/html/syntax/charset/references/non-ascii-in-title-before-ref.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/resources/bogus-charset-http-valid-meta.py b/tests/wpt/tests/html/syntax/charset/resources/bogus-charset-http-valid-meta.py similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/resources/bogus-charset-http-valid-meta.py rename to tests/wpt/tests/html/syntax/charset/resources/bogus-charset-http-valid-meta.py diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/resources/bogus-charset-http.py b/tests/wpt/tests/html/syntax/charset/resources/bogus-charset-http.py similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/resources/bogus-charset-http.py rename to tests/wpt/tests/html/syntax/charset/resources/bogus-charset-http.py diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/resources/bogus-charset.html b/tests/wpt/tests/html/syntax/charset/resources/bogus-charset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/resources/bogus-charset.html rename to tests/wpt/tests/html/syntax/charset/resources/bogus-charset.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/with-inheritance.html b/tests/wpt/tests/html/syntax/charset/with-inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/with-inheritance.html rename to tests/wpt/tests/html/syntax/charset/with-inheritance.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/without-inheritance.html b/tests/wpt/tests/html/syntax/charset/without-inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/without-inheritance.html rename to tests/wpt/tests/html/syntax/charset/without-inheritance.html diff --git a/tests/wpt/web-platform-tests/html/syntax/charset/xhr.html b/tests/wpt/tests/html/syntax/charset/xhr.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/charset/xhr.html rename to tests/wpt/tests/html/syntax/charset/xhr.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/innerHTML-setter-default-namespace.xhtml b/tests/wpt/tests/html/syntax/parsing-html-fragments/innerHTML-setter-default-namespace.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/innerHTML-setter-default-namespace.xhtml rename to tests/wpt/tests/html/syntax/parsing-html-fragments/innerHTML-setter-default-namespace.xhtml diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/support/encodingtests-1.css b/tests/wpt/tests/html/syntax/parsing-html-fragments/support/encodingtests-1.css similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/support/encodingtests-1.css rename to tests/wpt/tests/html/syntax/parsing-html-fragments/support/encodingtests-1.css diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/support/encodingtests-15-inverse.css b/tests/wpt/tests/html/syntax/parsing-html-fragments/support/encodingtests-15-inverse.css similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/support/encodingtests-15-inverse.css rename to tests/wpt/tests/html/syntax/parsing-html-fragments/support/encodingtests-15-inverse.css diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/support/encodingtests-15.css b/tests/wpt/tests/html/syntax/parsing-html-fragments/support/encodingtests-15.css similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/support/encodingtests-15.css rename to tests/wpt/tests/html/syntax/parsing-html-fragments/support/encodingtests-15.css diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/support/encodingtests-utf8.css b/tests/wpt/tests/html/syntax/parsing-html-fragments/support/encodingtests-utf8.css similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/support/encodingtests-utf8.css rename to tests/wpt/tests/html/syntax/parsing-html-fragments/support/encodingtests-utf8.css diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html.headers b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html.headers rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-003.html b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-003.html rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-003.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-004.html b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-004.html rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-004.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html.headers b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html.headers rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html.headers b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html.headers rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html.headers b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html.headers rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html.headers b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html.headers rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html.headers b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html.headers rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-034.html b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-034.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-034.html rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-034.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-034.html.headers b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-034.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-034.html.headers rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-034.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-037.html b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-037.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-037.html rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-037.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-037.html.headers b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-037.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-037.html.headers rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-037.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-038.html b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-038.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-038.html rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-038.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-038.html.headers b/tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-038.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/the-input-byte-stream-038.html.headers rename to tests/wpt/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-038.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/tokenizer-modes-001.html b/tests/wpt/tests/html/syntax/parsing-html-fragments/tokenizer-modes-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing-html-fragments/tokenizer-modes-001.html rename to tests/wpt/tests/html/syntax/parsing-html-fragments/tokenizer-modes-001.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/DOMContentLoaded-defer.html b/tests/wpt/tests/html/syntax/parsing/DOMContentLoaded-defer.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/DOMContentLoaded-defer.html rename to tests/wpt/tests/html/syntax/parsing/DOMContentLoaded-defer.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/Document.getElementsByTagName-foreign-01.html b/tests/wpt/tests/html/syntax/parsing/Document.getElementsByTagName-foreign-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/Document.getElementsByTagName-foreign-01.html rename to tests/wpt/tests/html/syntax/parsing/Document.getElementsByTagName-foreign-01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/Document.getElementsByTagName-foreign-02.html b/tests/wpt/tests/html/syntax/parsing/Document.getElementsByTagName-foreign-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/Document.getElementsByTagName-foreign-02.html rename to tests/wpt/tests/html/syntax/parsing/Document.getElementsByTagName-foreign-02.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/Element.getElementsByTagName-foreign-01.html b/tests/wpt/tests/html/syntax/parsing/Element.getElementsByTagName-foreign-01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/Element.getElementsByTagName-foreign-01.html rename to tests/wpt/tests/html/syntax/parsing/Element.getElementsByTagName-foreign-01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/Element.getElementsByTagName-foreign-02.html b/tests/wpt/tests/html/syntax/parsing/Element.getElementsByTagName-foreign-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/Element.getElementsByTagName-foreign-02.html rename to tests/wpt/tests/html/syntax/parsing/Element.getElementsByTagName-foreign-02.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/README b/tests/wpt/tests/html/syntax/parsing/README similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/README rename to tests/wpt/tests/html/syntax/parsing/README diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/adoption_agency_check_the_end_tag_name.html b/tests/wpt/tests/html/syntax/parsing/adoption_agency_check_the_end_tag_name.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/adoption_agency_check_the_end_tag_name.html rename to tests/wpt/tests/html/syntax/parsing/adoption_agency_check_the_end_tag_name.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/ambiguous-ampersand.html b/tests/wpt/tests/html/syntax/parsing/ambiguous-ampersand.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/ambiguous-ampersand.html rename to tests/wpt/tests/html/syntax/parsing/ambiguous-ampersand.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/common.js b/tests/wpt/tests/html/syntax/parsing/common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/common.js rename to tests/wpt/tests/html/syntax/parsing/common.js diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/empty-doctype-ids.html b/tests/wpt/tests/html/syntax/parsing/empty-doctype-ids.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/empty-doctype-ids.html rename to tests/wpt/tests/html/syntax/parsing/empty-doctype-ids.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_001.html b/tests/wpt/tests/html/syntax/parsing/foreign_content_001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_001.html rename to tests/wpt/tests/html/syntax/parsing/foreign_content_001.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_003.html b/tests/wpt/tests/html/syntax/parsing/foreign_content_003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_003.html rename to tests/wpt/tests/html/syntax/parsing/foreign_content_003.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_004.html b/tests/wpt/tests/html/syntax/parsing/foreign_content_004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_004.html rename to tests/wpt/tests/html/syntax/parsing/foreign_content_004.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_005.html b/tests/wpt/tests/html/syntax/parsing/foreign_content_005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_005.html rename to tests/wpt/tests/html/syntax/parsing/foreign_content_005.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_006.html b/tests/wpt/tests/html/syntax/parsing/foreign_content_006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_006.html rename to tests/wpt/tests/html/syntax/parsing/foreign_content_006.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_008.html b/tests/wpt/tests/html/syntax/parsing/foreign_content_008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_008.html rename to tests/wpt/tests/html/syntax/parsing/foreign_content_008.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_009.html b/tests/wpt/tests/html/syntax/parsing/foreign_content_009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_009.html rename to tests/wpt/tests/html/syntax/parsing/foreign_content_009.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_010.html b/tests/wpt/tests/html/syntax/parsing/foreign_content_010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_010.html rename to tests/wpt/tests/html/syntax/parsing/foreign_content_010.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_011.html b/tests/wpt/tests/html/syntax/parsing/foreign_content_011.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_011.html rename to tests/wpt/tests/html/syntax/parsing/foreign_content_011.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_013.html b/tests/wpt/tests/html/syntax/parsing/foreign_content_013.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/foreign_content_013.html rename to tests/wpt/tests/html/syntax/parsing/foreign_content_013.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html-integration-point.html b/tests/wpt/tests/html/syntax/parsing/html-integration-point.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html-integration-point.html rename to tests/wpt/tests/html/syntax/parsing/html-integration-point.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_adoption01.html b/tests/wpt/tests/html/syntax/parsing/html5lib_adoption01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_adoption01.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_adoption01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_adoption02.html b/tests/wpt/tests/html/syntax/parsing/html5lib_adoption02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_adoption02.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_adoption02.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_blocks.html b/tests/wpt/tests/html/syntax/parsing/html5lib_blocks.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_blocks.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_blocks.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_comments01.html b/tests/wpt/tests/html/syntax/parsing/html5lib_comments01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_comments01.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_comments01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_doctype01.html b/tests/wpt/tests/html/syntax/parsing/html5lib_doctype01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_doctype01.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_doctype01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_domjs-unsafe.html b/tests/wpt/tests/html/syntax/parsing/html5lib_domjs-unsafe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_domjs-unsafe.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_domjs-unsafe.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_entities01.html b/tests/wpt/tests/html/syntax/parsing/html5lib_entities01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_entities01.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_entities01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_entities02.html b/tests/wpt/tests/html/syntax/parsing/html5lib_entities02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_entities02.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_entities02.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_html5test-com.html b/tests/wpt/tests/html/syntax/parsing/html5lib_html5test-com.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_html5test-com.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_html5test-com.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_inbody01.html b/tests/wpt/tests/html/syntax/parsing/html5lib_inbody01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_inbody01.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_inbody01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_adoption01.html b/tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_adoption01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_adoption01.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_adoption01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_foreign-fragment.html b/tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_foreign-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_foreign-fragment.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_foreign-fragment.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_math.html b/tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_math.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_math.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_math.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_svg.html b/tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_svg.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_svg.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_svg.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_template.html b/tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_template.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_template.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_template.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_tests4.html b/tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_tests4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_tests4.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_tests4.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_tests6.html b/tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_tests6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_tests6.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_tests6.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_tests7.html b/tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_tests7.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_tests7.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_tests7.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_tests_innerHTML_1.html b/tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_tests_innerHTML_1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_tests_innerHTML_1.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_tests_innerHTML_1.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_webkit02.html b/tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_webkit02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_innerHTML_webkit02.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_innerHTML_webkit02.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_isindex.html b/tests/wpt/tests/html/syntax/parsing/html5lib_isindex.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_isindex.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_isindex.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_main-element.html b/tests/wpt/tests/html/syntax/parsing/html5lib_main-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_main-element.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_main-element.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_menuitem-element.html b/tests/wpt/tests/html/syntax/parsing/html5lib_menuitem-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_menuitem-element.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_menuitem-element.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_namespace-sensitivity.html b/tests/wpt/tests/html/syntax/parsing/html5lib_namespace-sensitivity.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_namespace-sensitivity.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_namespace-sensitivity.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_pending-spec-changes-plain-text-unsafe.html b/tests/wpt/tests/html/syntax/parsing/html5lib_pending-spec-changes-plain-text-unsafe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_pending-spec-changes-plain-text-unsafe.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_pending-spec-changes-plain-text-unsafe.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_pending-spec-changes.html b/tests/wpt/tests/html/syntax/parsing/html5lib_pending-spec-changes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_pending-spec-changes.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_pending-spec-changes.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_plain-text-unsafe.html b/tests/wpt/tests/html/syntax/parsing/html5lib_plain-text-unsafe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_plain-text-unsafe.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_plain-text-unsafe.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_ruby.html b/tests/wpt/tests/html/syntax/parsing/html5lib_ruby.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_ruby.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_ruby.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_scriptdata01.html b/tests/wpt/tests/html/syntax/parsing/html5lib_scriptdata01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_scriptdata01.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_scriptdata01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_scripted_adoption01.html b/tests/wpt/tests/html/syntax/parsing/html5lib_scripted_adoption01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_scripted_adoption01.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_scripted_adoption01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_scripted_ark.html b/tests/wpt/tests/html/syntax/parsing/html5lib_scripted_ark.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_scripted_ark.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_scripted_ark.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_scripted_webkit01.html b/tests/wpt/tests/html/syntax/parsing/html5lib_scripted_webkit01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_scripted_webkit01.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_scripted_webkit01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_search-element.html b/tests/wpt/tests/html/syntax/parsing/html5lib_search-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_search-element.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_search-element.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tables01.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tables01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tables01.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tables01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_template.html b/tests/wpt/tests/html/syntax/parsing/html5lib_template.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_template.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_template.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests1.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests1.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests1.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests10.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests10.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests10.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests10.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests11.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests11.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests11.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests11.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests12.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests12.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests12.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests12.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests14.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests14.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests14.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests14.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests15.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests15.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests15.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests15.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests16.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests16.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests16.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests16.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests17.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests17.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests17.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests17.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests18.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests18.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests18.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests18.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests19.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests19.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests19.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests19.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests2.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests2.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests2.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests20.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests20.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests20.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests20.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests21.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests21.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests21.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests21.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests22.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests22.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests22.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests22.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests23.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests23.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests23.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests23.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests24.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests24.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests24.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests24.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests25.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests25.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests25.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests25.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests26.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests26.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests26.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests26.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests3.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests3.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests3.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests5.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests5.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests5.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests6.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests6.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests6.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests6.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests7.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests7.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests7.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests7.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests8.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests8.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests8.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests8.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests9.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tests9.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tests9.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tests9.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tricky01.html b/tests/wpt/tests/html/syntax/parsing/html5lib_tricky01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_tricky01.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_tricky01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_webkit01.html b/tests/wpt/tests/html/syntax/parsing/html5lib_webkit01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_webkit01.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_webkit01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_webkit02.html b/tests/wpt/tests/html/syntax/parsing/html5lib_webkit02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html5lib_webkit02.html rename to tests/wpt/tests/html/syntax/parsing/html5lib_webkit02.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/html_content_in_foreign_context.html b/tests/wpt/tests/html/syntax/parsing/html_content_in_foreign_context.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/html_content_in_foreign_context.html rename to tests/wpt/tests/html/syntax/parsing/html_content_in_foreign_context.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/inhead-noscript-head.html b/tests/wpt/tests/html/syntax/parsing/inhead-noscript-head.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/inhead-noscript-head.html rename to tests/wpt/tests/html/syntax/parsing/inhead-noscript-head.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/math-parse01.html b/tests/wpt/tests/html/syntax/parsing/math-parse01.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/math-parse01.html rename to tests/wpt/tests/html/syntax/parsing/math-parse01.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/math-parse03.html b/tests/wpt/tests/html/syntax/parsing/math-parse03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/math-parse03.html rename to tests/wpt/tests/html/syntax/parsing/math-parse03.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/meta-inhead-insertion-mode.html b/tests/wpt/tests/html/syntax/parsing/meta-inhead-insertion-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/meta-inhead-insertion-mode.html rename to tests/wpt/tests/html/syntax/parsing/meta-inhead-insertion-mode.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/named-character-references-data.js b/tests/wpt/tests/html/syntax/parsing/named-character-references-data.js similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/named-character-references-data.js rename to tests/wpt/tests/html/syntax/parsing/named-character-references-data.js diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/named-character-references.html b/tests/wpt/tests/html/syntax/parsing/named-character-references.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/named-character-references.html rename to tests/wpt/tests/html/syntax/parsing/named-character-references.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/no-doctype-name.html b/tests/wpt/tests/html/syntax/parsing/no-doctype-name.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/no-doctype-name.html rename to tests/wpt/tests/html/syntax/parsing/no-doctype-name.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/quotes-in-meta.html b/tests/wpt/tests/html/syntax/parsing/quotes-in-meta.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/quotes-in-meta.html rename to tests/wpt/tests/html/syntax/parsing/quotes-in-meta.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/support/DOMContentLoaded-defer.js b/tests/wpt/tests/html/syntax/parsing/support/DOMContentLoaded-defer.js similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/support/DOMContentLoaded-defer.js rename to tests/wpt/tests/html/syntax/parsing/support/DOMContentLoaded-defer.js diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/support/no-doctype-name-eof.html b/tests/wpt/tests/html/syntax/parsing/support/no-doctype-name-eof.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/support/no-doctype-name-eof.html rename to tests/wpt/tests/html/syntax/parsing/support/no-doctype-name-eof.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/support/no-doctype-name-line.html b/tests/wpt/tests/html/syntax/parsing/support/no-doctype-name-line.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/support/no-doctype-name-line.html rename to tests/wpt/tests/html/syntax/parsing/support/no-doctype-name-line.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/support/no-doctype-name-space.html b/tests/wpt/tests/html/syntax/parsing/support/no-doctype-name-space.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/support/no-doctype-name-space.html rename to tests/wpt/tests/html/syntax/parsing/support/no-doctype-name-space.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template.js b/tests/wpt/tests/html/syntax/parsing/template.js similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template.js rename to tests/wpt/tests/html/syntax/parsing/template.js diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-foster-parenting/template-is-a-foster-parent-element.html b/tests/wpt/tests/html/syntax/parsing/template/additions-to-foster-parenting/template-is-a-foster-parent-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-foster-parenting/template-is-a-foster-parent-element.html rename to tests/wpt/tests/html/syntax/parsing/template/additions-to-foster-parenting/template-is-a-foster-parent-element.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-foster-parenting/template-is-not-a-foster-parent-element.html b/tests/wpt/tests/html/syntax/parsing/template/additions-to-foster-parenting/template-is-not-a-foster-parent-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-foster-parenting/template-is-not-a-foster-parent-element.html rename to tests/wpt/tests/html/syntax/parsing/template/additions-to-foster-parenting/template-is-not-a-foster-parent-element.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/generating-of-implied-end-tags.html b/tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/generating-of-implied-end-tags.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/generating-of-implied-end-tags.html rename to tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/generating-of-implied-end-tags.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-body-token.html b/tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-body-token.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-body-token.html rename to tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-body-token.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html b/tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html rename to tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html b/tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html rename to tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html b/tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html rename to tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-body.html b/tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-body.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-body.html rename to tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-body.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-html.html b/tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-html.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-html.html rename to tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-html.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/template-end-tag-without-start-one.html b/tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/template-end-tag-without-start-one.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/template-end-tag-without-start-one.html rename to tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/template-end-tag-without-start-one.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-frameset-insertion-mode/end-tag-frameset.html b/tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-frameset-insertion-mode/end-tag-frameset.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-frameset-insertion-mode/end-tag-frameset.html rename to tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-frameset-insertion-mode/end-tag-frameset.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/generating-of-implied-end-tags.html b/tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/generating-of-implied-end-tags.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/generating-of-implied-end-tags.html rename to tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/generating-of-implied-end-tags.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/template-end-tag-without-start-one.html b/tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/template-end-tag-without-start-one.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/template-end-tag-without-start-one.html rename to tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/template-end-tag-without-start-one.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-table-insertion-mode/end-tag-table.html b/tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-table-insertion-mode/end-tag-table.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/additions-to-the-in-table-insertion-mode/end-tag-table.html rename to tests/wpt/tests/html/syntax/parsing/template/additions-to-the-in-table-insertion-mode/end-tag-table.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/appending-to-a-template/template-child-nodes.html b/tests/wpt/tests/html/syntax/parsing/template/appending-to-a-template/template-child-nodes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/appending-to-a-template/template-child-nodes.html rename to tests/wpt/tests/html/syntax/parsing/template/appending-to-a-template/template-child-nodes.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html b/tests/wpt/tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html rename to tests/wpt/tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html b/tests/wpt/tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html rename to tests/wpt/tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html b/tests/wpt/tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html rename to tests/wpt/tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html b/tests/wpt/tests/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html rename to tests/wpt/tests/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/test.js b/tests/wpt/tests/html/syntax/parsing/test.js similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/test.js rename to tests/wpt/tests/html/syntax/parsing/test.js diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/the-end.html b/tests/wpt/tests/html/syntax/parsing/the-end.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/the-end.html rename to tests/wpt/tests/html/syntax/parsing/the-end.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/unclosed-svg-script.html b/tests/wpt/tests/html/syntax/parsing/unclosed-svg-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/unclosed-svg-script.html rename to tests/wpt/tests/html/syntax/parsing/unclosed-svg-script.html diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/zero.html b/tests/wpt/tests/html/syntax/parsing/zero.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/parsing/zero.html rename to tests/wpt/tests/html/syntax/parsing/zero.html diff --git a/tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/escaping.html b/tests/wpt/tests/html/syntax/serializing-html-fragments/escaping.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/escaping.html rename to tests/wpt/tests/html/syntax/serializing-html-fragments/escaping.html diff --git a/tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/initial-linefeed-pre.html b/tests/wpt/tests/html/syntax/serializing-html-fragments/initial-linefeed-pre.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/initial-linefeed-pre.html rename to tests/wpt/tests/html/syntax/serializing-html-fragments/initial-linefeed-pre.html diff --git a/tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/outerHTML.html b/tests/wpt/tests/html/syntax/serializing-html-fragments/outerHTML.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/outerHTML.html rename to tests/wpt/tests/html/syntax/serializing-html-fragments/outerHTML.html diff --git a/tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/serializing.html b/tests/wpt/tests/html/syntax/serializing-html-fragments/serializing.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/serializing.html rename to tests/wpt/tests/html/syntax/serializing-html-fragments/serializing.html diff --git a/tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/template.html b/tests/wpt/tests/html/syntax/serializing-html-fragments/template.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/template.html rename to tests/wpt/tests/html/syntax/serializing-html-fragments/template.html diff --git a/tests/wpt/web-platform-tests/html/syntax/serializing-xml-fragments/outerHTML.html b/tests/wpt/tests/html/syntax/serializing-xml-fragments/outerHTML.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/serializing-xml-fragments/outerHTML.html rename to tests/wpt/tests/html/syntax/serializing-xml-fragments/outerHTML.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-charset/speculative-script.tentative.html b/tests/wpt/tests/html/syntax/speculative-charset/speculative-script.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-charset/speculative-script.tentative.html rename to tests/wpt/tests/html/syntax/speculative-charset/speculative-script.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-charset/support/script.py b/tests/wpt/tests/html/syntax/speculative-charset/support/script.py similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-charset/support/script.py rename to tests/wpt/tests/html/syntax/speculative-charset/support/script.py diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-charset/support/speculative-script.py b/tests/wpt/tests/html/syntax/speculative-charset/support/speculative-script.py similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-charset/support/speculative-script.py rename to tests/wpt/tests/html/syntax/speculative-charset/support/speculative-script.py diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/base-href-script-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/base-href-script-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/base-href-script-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/base-href-script-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/image-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/image-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/image-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/image-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/img-data-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/img-data-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/img-data-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/img-data-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/img-src-crossorigin.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/img-src-crossorigin.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/img-src-crossorigin.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/img-src-crossorigin.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/img-src-loading-lazy.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/img-src-loading-lazy.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/img-src-loading-lazy.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/img-src-loading-lazy.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/img-src-referrerpolicy-no-referrer.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/img-src-referrerpolicy-no-referrer.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/img-src-referrerpolicy-no-referrer.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/img-src-referrerpolicy-no-referrer.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/img-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/img-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/img-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/img-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/img-srcset.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/img-srcset.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/img-srcset.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/img-srcset.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-no-rel.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-no-rel.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-no-rel.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-no-rel.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-alternate-stylesheet.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-alternate-stylesheet.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-alternate-stylesheet.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-alternate-stylesheet.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-font-crossorigin.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-font-crossorigin.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-font-crossorigin.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-font-crossorigin.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-image.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-image.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-image.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-image.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-script.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-script.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-script.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-script.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-style.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-style.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-style.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-preload-as-style.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-crossorigin.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-crossorigin.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-crossorigin.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-crossorigin.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-disabled.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-disabled.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-disabled.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-disabled.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-integrity.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-integrity.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-integrity.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-integrity.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-nomatch-media.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-nomatch-media.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-nomatch-media.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-nomatch-media.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-referrerpolicy-no-referrer.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-referrerpolicy-no-referrer.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-referrerpolicy-no-referrer.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-referrerpolicy-no-referrer.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-type-text-css.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-type-text-css.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-type-text-css.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-type-text-css.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-unsupported-type.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-unsupported-type.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-unsupported-type.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet-unsupported-type.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/link-rel-stylesheet.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/math-font-face-script-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/math-font-face-script-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/math-font-face-script-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/math-font-face-script-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/math-font-script-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/math-font-script-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/math-font-script-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/math-font-script-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/math-script-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/math-script-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/math-script-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/math-script-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/meta-charset-script-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/meta-charset-script-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/meta-charset-script-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/meta-charset-script-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/meta-csp-img-src-asterisk.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/meta-csp-img-src-asterisk.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/meta-csp-img-src-asterisk.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/meta-csp-img-src-asterisk.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/meta-csp-img-src-none.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/meta-csp-img-src-none.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/meta-csp-img-src-none.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/meta-csp-img-src-none.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/meta-referrer-no-referrer-img-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/meta-referrer-no-referrer-img-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/meta-referrer-no-referrer-img-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/meta-referrer-no-referrer-img-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/meta-viewport-link-stylesheet-media.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/meta-viewport-link-stylesheet-media.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/meta-viewport-link-stylesheet-media.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/meta-viewport-link-stylesheet-media.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/nested-template-shadowrootmode-1.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/nested-template-shadowrootmode-1.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/nested-template-shadowrootmode-1.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/nested-template-shadowrootmode-1.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/nested-template-shadowrootmode-2.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/nested-template-shadowrootmode-2.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/nested-template-shadowrootmode-2.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/nested-template-shadowrootmode-2.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/picture-source-br-img.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/picture-source-br-img.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/picture-source-br-img.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/picture-source-br-img.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/picture-source-no-img.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/picture-source-no-img.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/picture-source-no-img.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/picture-source-no-img.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/picture-source-nomatch-media.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/picture-source-nomatch-media.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/picture-source-nomatch-media.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/picture-source-nomatch-media.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/picture-source-unsupported-type.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/picture-source-unsupported-type.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/picture-source-unsupported-type.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/picture-source-unsupported-type.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-async.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-async.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-async.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-async.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-crossorigin.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-crossorigin.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-crossorigin.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-crossorigin.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-defer.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-defer.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-defer.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-defer.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-integrity.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-integrity.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-integrity.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-integrity.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-module.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-module.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-module.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-module.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-nomodule.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-nomodule.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-nomodule.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-nomodule.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-referrerpolicy-no-referrer.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-referrerpolicy-no-referrer.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-referrerpolicy-no-referrer.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-referrerpolicy-no-referrer.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-type-application-ecmascript.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-type-application-ecmascript.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-type-application-ecmascript.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-type-application-ecmascript.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-unsupported-type.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-unsupported-type.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src-unsupported-type.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src-unsupported-type.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/script-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/script-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/svg-image-href.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/svg-image-href.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/svg-image-href.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/svg-image-href.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/svg-image-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/svg-image-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/svg-image-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/svg-image-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/svg-image-xlinkhref.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/svg-image-xlinkhref.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/svg-image-xlinkhref.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/svg-image-xlinkhref.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/svg-script-href.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/svg-script-href.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/svg-script-href.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/svg-script-href.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/svg-script-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/svg-script-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/svg-script-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/svg-script-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/svg-script-xlinkhref.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/svg-script-xlinkhref.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/svg-script-xlinkhref.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/svg-script-xlinkhref.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/template-img-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/template-img-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/template-img-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/template-img-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/template-link-stylesheet.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/template-link-stylesheet.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/template-link-stylesheet.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/template-link-stylesheet.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/template-script-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/template-script-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/template-script-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/template-script-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/template-shadowrootmode-img-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/template-shadowrootmode-img-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/template-shadowrootmode-img-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/template-shadowrootmode-img-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/template-shadowrootmode-link-stylesheet.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/template-shadowrootmode-link-stylesheet.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/template-shadowrootmode-link-stylesheet.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/template-shadowrootmode-link-stylesheet.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/template-shadowrootmode-script-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/template-shadowrootmode-script-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/template-shadowrootmode-script-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/template-shadowrootmode-script-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/video-poster.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/video-poster.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/video-poster.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/video-poster.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/xmp-script-src.tentative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/xmp-script-src.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/document-write/xmp-script-src.tentative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/document-write/xmp-script-src.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/base-href-script-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/base-href-script-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/base-href-script-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/base-href-script-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/image-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/image-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/image-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/image-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/img-data-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/img-data-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/img-data-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/img-data-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/img-src-crossorigin.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/img-src-crossorigin.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/img-src-crossorigin.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/img-src-crossorigin.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/img-src-loading-lazy.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/img-src-loading-lazy.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/img-src-loading-lazy.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/img-src-loading-lazy.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/img-src-referrerpolicy-no-referrer.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/img-src-referrerpolicy-no-referrer.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/img-src-referrerpolicy-no-referrer.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/img-src-referrerpolicy-no-referrer.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/img-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/img-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/img-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/img-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/img-srcset.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/img-srcset.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/img-srcset.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/img-srcset.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-no-rel.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-no-rel.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-no-rel.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-no-rel.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-alternate-stylesheet.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-alternate-stylesheet.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-alternate-stylesheet.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-alternate-stylesheet.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-font-crossorigin.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-font-crossorigin.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-font-crossorigin.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-font-crossorigin.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-image.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-image.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-image.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-image.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-script.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-script.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-script.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-script.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-style.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-style.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-style.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-preload-as-style.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-crossorigin.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-crossorigin.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-crossorigin.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-crossorigin.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-disabled.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-disabled.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-disabled.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-disabled.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-integrity.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-integrity.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-integrity.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-integrity.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-nomatch-media.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-nomatch-media.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-nomatch-media.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-nomatch-media.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-referrerpolicy-no-referrer.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-referrerpolicy-no-referrer.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-referrerpolicy-no-referrer.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-referrerpolicy-no-referrer.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-type-text-css.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-type-text-css.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-type-text-css.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-type-text-css.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-unsupported-type.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-unsupported-type.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-unsupported-type.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet-unsupported-type.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/link-rel-stylesheet.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/math-font-face-script-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/math-font-face-script-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/math-font-face-script-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/math-font-face-script-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/math-font-script-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/math-font-script-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/math-font-script-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/math-font-script-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/math-script-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/math-script-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/math-script-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/math-script-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/meta-charset-script-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/meta-charset-script-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/meta-charset-script-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/meta-charset-script-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/meta-csp-img-src-asterisk.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/meta-csp-img-src-asterisk.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/meta-csp-img-src-asterisk.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/meta-csp-img-src-asterisk.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/meta-csp-img-src-none.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/meta-csp-img-src-none.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/meta-csp-img-src-none.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/meta-csp-img-src-none.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/meta-referrer-no-referrer-img-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/meta-referrer-no-referrer-img-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/meta-referrer-no-referrer-img-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/meta-referrer-no-referrer-img-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/meta-viewport-link-stylesheet-media.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/meta-viewport-link-stylesheet-media.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/meta-viewport-link-stylesheet-media.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/meta-viewport-link-stylesheet-media.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/nested-template-shadowrootmode-1.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/nested-template-shadowrootmode-1.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/nested-template-shadowrootmode-1.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/nested-template-shadowrootmode-1.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/nested-template-shadowrootmode-2.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/nested-template-shadowrootmode-2.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/nested-template-shadowrootmode-2.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/nested-template-shadowrootmode-2.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/picture-source-br-img.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/picture-source-br-img.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/picture-source-br-img.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/picture-source-br-img.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/picture-source-no-img.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/picture-source-no-img.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/picture-source-no-img.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/picture-source-no-img.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/picture-source-nomatch-media.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/picture-source-nomatch-media.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/picture-source-nomatch-media.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/picture-source-nomatch-media.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/picture-source-unsupported-type.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/picture-source-unsupported-type.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/picture-source-unsupported-type.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/picture-source-unsupported-type.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/base-href-script-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/base-href-script-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/base-href-script-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/base-href-script-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/image-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/image-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/image-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/image-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/img-data-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/img-data-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/img-data-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/img-data-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-crossorigin-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-crossorigin-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-crossorigin-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-crossorigin-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-loading-lazy-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-loading-lazy-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-loading-lazy-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-loading-lazy-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-referrerpolicy-no-referrer-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-referrerpolicy-no-referrer-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-referrerpolicy-no-referrer-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/img-src-referrerpolicy-no-referrer-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/img-srcset-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/img-srcset-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/img-srcset-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/img-srcset-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-no-rel-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-no-rel-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-no-rel-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-no-rel-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-alternate-stylesheet-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-alternate-stylesheet-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-alternate-stylesheet-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-alternate-stylesheet-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-font-crossorigin-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-font-crossorigin-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-font-crossorigin-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-font-crossorigin-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-image-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-image-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-image-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-image-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-script-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-script-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-script-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-script-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-style-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-style-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-style-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-preload-as-style-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-crossorigin-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-crossorigin-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-crossorigin-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-crossorigin-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-disabled-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-disabled-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-disabled-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-disabled-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-integrity-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-integrity-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-integrity-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-integrity-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-nomatch-media-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-nomatch-media-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-nomatch-media-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-nomatch-media-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-referrerpolicy-no-referrer-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-referrerpolicy-no-referrer-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-referrerpolicy-no-referrer-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-referrerpolicy-no-referrer-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-type-text-css-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-type-text-css-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-type-text-css-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-type-text-css-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-unsupported-type-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-unsupported-type-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-unsupported-type-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/link-rel-stylesheet-unsupported-type-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/math-font-face-script-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/math-font-face-script-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/math-font-face-script-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/math-font-face-script-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/math-font-script-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/math-font-script-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/math-font-script-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/math-font-script-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/math-script-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/math-script-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/math-script-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/math-script-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-charset-script-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-charset-script-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-charset-script-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-charset-script-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-csp-img-src-asterisk-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-csp-img-src-asterisk-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-csp-img-src-asterisk-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-csp-img-src-asterisk-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-csp-img-src-none-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-csp-img-src-none-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-csp-img-src-none-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-csp-img-src-none-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-referrer-no-referrer-img-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-referrer-no-referrer-img-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-referrer-no-referrer-img-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-referrer-no-referrer-img-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-viewport-link-stylesheet-media-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-viewport-link-stylesheet-media-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-viewport-link-stylesheet-media-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/meta-viewport-link-stylesheet-media-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/nested-template-shadowrootmode-1-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/nested-template-shadowrootmode-1-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/nested-template-shadowrootmode-1-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/nested-template-shadowrootmode-1-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/nested-template-shadowrootmode-2-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/nested-template-shadowrootmode-2-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/nested-template-shadowrootmode-2-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/nested-template-shadowrootmode-2-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-br-img-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-br-img-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-br-img-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-br-img-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-no-img-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-no-img-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-no-img-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-no-img-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-nomatch-media-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-nomatch-media-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-nomatch-media-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-nomatch-media-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-unsupported-type-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-unsupported-type-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-unsupported-type-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/picture-source-unsupported-type-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-async-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-async-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-async-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-async-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-crossorigin-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-crossorigin-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-crossorigin-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-crossorigin-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-defer-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-defer-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-defer-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-defer-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-integrity-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-integrity-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-integrity-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-integrity-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-module-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-module-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-module-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-module-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-nomodule-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-nomodule-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-nomodule-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-nomodule-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-referrerpolicy-no-referrer-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-referrerpolicy-no-referrer-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-referrerpolicy-no-referrer-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-referrerpolicy-no-referrer-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-type-application-ecmascript-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-type-application-ecmascript-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-type-application-ecmascript-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-type-application-ecmascript-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-unsupported-type-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-unsupported-type-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-unsupported-type-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/script-src-unsupported-type-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-image-href-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-image-href-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-image-href-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-image-href-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-image-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-image-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-image-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-image-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-image-xlinkhref-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-image-xlinkhref-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-image-xlinkhref-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-image-xlinkhref-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-script-href-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-script-href-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-script-href-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-script-href-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-script-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-script-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-script-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-script-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-script-xlinkhref-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-script-xlinkhref-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-script-xlinkhref-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/svg-script-xlinkhref-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/template-img-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/template-img-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/template-img-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/template-img-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/template-link-stylesheet-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/template-link-stylesheet-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/template-link-stylesheet-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/template-link-stylesheet-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/template-script-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/template-script-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/template-script-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/template-script-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/template-shadowrootmode-img-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/template-shadowrootmode-img-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/template-shadowrootmode-img-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/template-shadowrootmode-img-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/template-shadowrootmode-link-stylesheet-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/template-shadowrootmode-link-stylesheet-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/template-shadowrootmode-link-stylesheet-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/template-shadowrootmode-link-stylesheet-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/template-shadowrootmode-script-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/template-shadowrootmode-script-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/template-shadowrootmode-script-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/template-shadowrootmode-script-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/video-poster-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/video-poster-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/video-poster-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/video-poster-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/xmp-script-src-framed.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/xmp-script-src-framed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/resources/xmp-script-src-framed.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/resources/xmp-script-src-framed.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-async.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-async.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-async.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-async.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-crossorigin.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-crossorigin.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-crossorigin.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-crossorigin.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-defer.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-defer.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-defer.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-defer.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-integrity.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-integrity.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-integrity.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-integrity.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-module.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-module.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-module.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-module.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-nomodule.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-nomodule.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-nomodule.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-nomodule.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-referrerpolicy-no-referrer.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-referrerpolicy-no-referrer.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-referrerpolicy-no-referrer.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-referrerpolicy-no-referrer.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-type-application-ecmascript.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-type-application-ecmascript.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-type-application-ecmascript.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-type-application-ecmascript.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-unsupported-type.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-unsupported-type.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src-unsupported-type.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src-unsupported-type.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/script-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/script-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/svg-image-href.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/svg-image-href.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/svg-image-href.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/svg-image-href.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/svg-image-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/svg-image-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/svg-image-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/svg-image-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/svg-image-xlinkhref.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/svg-image-xlinkhref.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/svg-image-xlinkhref.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/svg-image-xlinkhref.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/svg-script-href.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/svg-script-href.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/svg-script-href.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/svg-script-href.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/svg-script-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/svg-script-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/svg-script-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/svg-script-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/svg-script-xlinkhref.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/svg-script-xlinkhref.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/svg-script-xlinkhref.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/svg-script-xlinkhref.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/template-img-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/template-img-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/template-img-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/template-img-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/template-link-stylesheet.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/template-link-stylesheet.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/template-link-stylesheet.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/template-link-stylesheet.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/template-script-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/template-script-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/template-script-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/template-script-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/template-shadowrootmode-img-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/template-shadowrootmode-img-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/template-shadowrootmode-img-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/template-shadowrootmode-img-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/template-shadowrootmode-link-stylesheet.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/template-shadowrootmode-link-stylesheet.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/template-shadowrootmode-link-stylesheet.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/template-shadowrootmode-link-stylesheet.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/template-shadowrootmode-script-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/template-shadowrootmode-script-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/template-shadowrootmode-script-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/template-shadowrootmode-script-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/video-poster.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/video-poster.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/video-poster.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/video-poster.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/xmp-script-src.tentative.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/xmp-script-src.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/page-load/xmp-script-src.tentative.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/page-load/xmp-script-src.tentative.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/base-href-script-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/base-href-script-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/base-href-script-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/base-href-script-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/image-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/image-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/image-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/image-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/img-data-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/img-data-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/img-data-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/img-data-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/img-src-crossorigin-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/img-src-crossorigin-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/img-src-crossorigin-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/img-src-crossorigin-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/img-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/img-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/img-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/img-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/img-src-referrerpolicy-no-referrer-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/img-src-referrerpolicy-no-referrer-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/img-src-referrerpolicy-no-referrer-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/img-src-referrerpolicy-no-referrer-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/img-srcset-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/img-srcset-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/img-srcset-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/img-srcset-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-no-rel-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-no-rel-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-no-rel-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-no-rel-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-alternate-stylesheet-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-alternate-stylesheet-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-alternate-stylesheet-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-alternate-stylesheet-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-font-crossorigin-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-font-crossorigin-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-font-crossorigin-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-font-crossorigin-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-image-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-image-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-image-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-image-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-script-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-script-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-script-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-script-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-style-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-style-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-style-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-preload-as-style-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-crossorigin-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-crossorigin-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-crossorigin-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-crossorigin-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-disabled-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-disabled-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-disabled-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-disabled-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-integrity-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-integrity-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-integrity-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-integrity-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-nomatch-media-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-nomatch-media-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-nomatch-media-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-nomatch-media-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-referrerpolicy-no-referrer-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-referrerpolicy-no-referrer-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-referrerpolicy-no-referrer-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-referrerpolicy-no-referrer-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-type-text-css-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-type-text-css-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-type-text-css-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-type-text-css-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-unsupported-type-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-unsupported-type-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-unsupported-type-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/link-rel-stylesheet-unsupported-type-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/math-font-face-script-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/math-font-face-script-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/math-font-face-script-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/math-font-face-script-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/math-font-script-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/math-font-script-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/math-font-script-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/math-font-script-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/math-script-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/math-script-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/math-script-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/math-script-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/meta-charset-script-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/meta-charset-script-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/meta-charset-script-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/meta-charset-script-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/meta-csp-img-src-asterisk-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/meta-csp-img-src-asterisk-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/meta-csp-img-src-asterisk-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/meta-csp-img-src-asterisk-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/meta-csp-img-src-none-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/meta-csp-img-src-none-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/meta-csp-img-src-none-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/meta-csp-img-src-none-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/meta-referrer-no-referrer-img-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/meta-referrer-no-referrer-img-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/meta-referrer-no-referrer-img-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/meta-referrer-no-referrer-img-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/meta-viewport-link-stylesheet-media-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/meta-viewport-link-stylesheet-media-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/meta-viewport-link-stylesheet-media-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/meta-viewport-link-stylesheet-media-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/nested-template-shadowrootmode-1-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/nested-template-shadowrootmode-1-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/nested-template-shadowrootmode-1-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/nested-template-shadowrootmode-1-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/nested-template-shadowrootmode-2-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/nested-template-shadowrootmode-2-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/nested-template-shadowrootmode-2-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/nested-template-shadowrootmode-2-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/picture-source-br-img-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/picture-source-br-img-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/picture-source-br-img-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/picture-source-br-img-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/picture-source-no-img-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/picture-source-no-img-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/picture-source-no-img-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/picture-source-no-img-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/picture-source-nomatch-media-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/picture-source-nomatch-media-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/picture-source-nomatch-media-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/picture-source-nomatch-media-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/picture-source-unsupported-type-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/picture-source-unsupported-type-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/picture-source-unsupported-type-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/picture-source-unsupported-type-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-async-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-async-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-async-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-async-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-crossorigin-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-crossorigin-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-crossorigin-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-crossorigin-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-defer-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-defer-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-defer-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-defer-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-integrity-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-integrity-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-integrity-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-integrity-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-module-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-module-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-module-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-module-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-nomodule-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-nomodule-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-nomodule-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-nomodule-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-referrerpolicy-no-referrer-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-referrerpolicy-no-referrer-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-referrerpolicy-no-referrer-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-referrerpolicy-no-referrer-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-type-application-ecmascript-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-type-application-ecmascript-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-type-application-ecmascript-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-type-application-ecmascript-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-unsupported-type-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-unsupported-type-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/script-src-unsupported-type-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/script-src-unsupported-type-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/svg-image-href-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/svg-image-href-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/svg-image-href-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/svg-image-href-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/svg-image-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/svg-image-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/svg-image-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/svg-image-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/svg-image-xlinkhref-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/svg-image-xlinkhref-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/svg-image-xlinkhref-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/svg-image-xlinkhref-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/svg-script-href-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/svg-script-href-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/svg-script-href-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/svg-script-href-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/svg-script-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/svg-script-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/svg-script-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/svg-script-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/svg-script-xlinkhref-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/svg-script-xlinkhref-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/svg-script-xlinkhref-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/svg-script-xlinkhref-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/template-img-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/template-img-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/template-img-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/template-img-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/template-link-stylesheet-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/template-link-stylesheet-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/template-link-stylesheet-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/template-link-stylesheet-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/template-script-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/template-script-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/template-script-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/template-script-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/template-shadowrootmode-img-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/template-shadowrootmode-img-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/template-shadowrootmode-img-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/template-shadowrootmode-img-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/template-shadowrootmode-link-stylesheet-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/template-shadowrootmode-link-stylesheet-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/template-shadowrootmode-link-stylesheet-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/template-shadowrootmode-link-stylesheet-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/template-shadowrootmode-script-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/template-shadowrootmode-script-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/template-shadowrootmode-script-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/template-shadowrootmode-script-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/video-poster-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/video-poster-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/video-poster-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/video-poster-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/xmp-script-src-nonspeculative.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/xmp-script-src-nonspeculative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/generated/resources/xmp-script-src-nonspeculative.sub.html rename to tests/wpt/tests/html/syntax/speculative-parsing/generated/resources/xmp-script-src-nonspeculative.sub.html diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/resources/speculative-parsing-util.js b/tests/wpt/tests/html/syntax/speculative-parsing/resources/speculative-parsing-util.js similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/resources/speculative-parsing-util.js rename to tests/wpt/tests/html/syntax/speculative-parsing/resources/speculative-parsing-util.js diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/resources/stash.py b/tests/wpt/tests/html/syntax/speculative-parsing/resources/stash.py similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/resources/stash.py rename to tests/wpt/tests/html/syntax/speculative-parsing/resources/stash.py diff --git a/tests/wpt/web-platform-tests/html/syntax/speculative-parsing/tools/generate.py b/tests/wpt/tests/html/syntax/speculative-parsing/tools/generate.py similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/speculative-parsing/tools/generate.py rename to tests/wpt/tests/html/syntax/speculative-parsing/tools/generate.py diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/ENCODING-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/ENCODING-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/ENCODING-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/ENCODING-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/ENCODING.htm b/tests/wpt/tests/html/syntax/xmldecl/support/ENCODING.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/ENCODING.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/ENCODING.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/VERSION-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/VERSION-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/VERSION-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/VERSION-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/VERSION.htm b/tests/wpt/tests/html/syntax/xmldecl/support/VERSION.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/VERSION.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/VERSION.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/WINDOWS-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/WINDOWS-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/WINDOWS-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/WINDOWS-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/WINDOWS.htm b/tests/wpt/tests/html/syntax/xmldecl/support/WINDOWS.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/WINDOWS.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/WINDOWS.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/XML-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/XML-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/XML-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/XML-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/XML.htm b/tests/wpt/tests/html/syntax/xmldecl/support/XML.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/XML.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/XML.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/ascii-decl-for-utf-16.htm b/tests/wpt/tests/html/syntax/xmldecl/support/ascii-decl-for-utf-16.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/ascii-decl-for-utf-16.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/ascii-decl-for-utf-16.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/baseline-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/baseline-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/baseline-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/baseline-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/baseline.htm b/tests/wpt/tests/html/syntax/xmldecl/support/baseline.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/baseline.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/baseline.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/cp1251-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/cp1251-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/cp1251-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/cp1251-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/cp1251.htm b/tests/wpt/tests/html/syntax/xmldecl/support/cp1251.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/cp1251.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/cp1251.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/encoding-equals-encoding-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/encoding-equals-encoding-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/encoding-equals-encoding-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/encoding-equals-encoding-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/encoding-equals-encoding.htm b/tests/wpt/tests/html/syntax/xmldecl/support/encoding-equals-encoding.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/encoding-equals-encoding.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/encoding-equals-encoding.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/encodingencoding-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/encodingencoding-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/encodingencoding-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/encodingencoding-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/encodingencoding.htm b/tests/wpt/tests/html/syntax/xmldecl/support/encodingencoding.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/encodingencoding.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/encodingencoding.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/gt-between-xml-and-encoding-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/gt-between-xml-and-encoding-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/gt-between-xml-and-encoding-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/gt-between-xml-and-encoding-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/gt-between-xml-and-encoding.htm b/tests/wpt/tests/html/syntax/xmldecl/support/gt-between-xml-and-encoding.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/gt-between-xml-and-encoding.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/gt-between-xml-and-encoding.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/incomplete-utf-16be-and-meta-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/incomplete-utf-16be-and-meta-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/incomplete-utf-16be-and-meta-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/incomplete-utf-16be-and-meta-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/incomplete-utf-16be-and-meta.htm b/tests/wpt/tests/html/syntax/xmldecl/support/incomplete-utf-16be-and-meta.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/incomplete-utf-16be-and-meta.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/incomplete-utf-16be-and-meta.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/incomplete-utf-16le-and-meta-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/incomplete-utf-16le-and-meta-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/incomplete-utf-16le-and-meta-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/incomplete-utf-16le-and-meta-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/incomplete-utf-16le-and-meta.htm b/tests/wpt/tests/html/syntax/xmldecl/support/incomplete-utf-16le-and-meta.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/incomplete-utf-16le-and-meta.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/incomplete-utf-16le-and-meta.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-after-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-after-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-after-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-after-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-after.htm b/tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-after.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-after.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-after.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-before-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-before-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-before-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-before-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-before.htm b/tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-before.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-before.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-before.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-plus-one-after-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-plus-one-after-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-plus-one-after-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-plus-one-after-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-plus-one-after.htm b/tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-plus-one-after.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-plus-one-after.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-plus-one-after.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-plus-one-before-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-plus-one-before-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-plus-one-before-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-plus-one-before-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-plus-one-before.htm b/tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-plus-one-before.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/kilobyte-plus-one-before.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/kilobyte-plus-one-before.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/letter-between-xml-and-encoding-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/letter-between-xml-and-encoding-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/letter-between-xml-and-encoding-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/letter-between-xml-and-encoding-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/letter-between-xml-and-encoding.htm b/tests/wpt/tests/html/syntax/xmldecl/support/letter-between-xml-and-encoding.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/letter-between-xml-and-encoding.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/letter-between-xml-and-encoding.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/lt-between-xml-and-encoding-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/lt-between-xml-and-encoding-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/lt-between-xml-and-encoding-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/lt-between-xml-and-encoding-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/lt-between-xml-and-encoding.htm b/tests/wpt/tests/html/syntax/xmldecl/support/lt-between-xml-and-encoding.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/lt-between-xml-and-encoding.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/lt-between-xml-and-encoding.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/meta-inside-xml-charset-before-encoding-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/meta-inside-xml-charset-before-encoding-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/meta-inside-xml-charset-before-encoding-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/meta-inside-xml-charset-before-encoding-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/meta-inside-xml-charset-before-encoding.htm b/tests/wpt/tests/html/syntax/xmldecl/support/meta-inside-xml-charset-before-encoding.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/meta-inside-xml-charset-before-encoding.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/meta-inside-xml-charset-before-encoding.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/meta-inside-xml-encoding-before-charset-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/meta-inside-xml-encoding-before-charset-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/meta-inside-xml-encoding-before-charset-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/meta-inside-xml-encoding-before-charset-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/meta-inside-xml-encoding-before-charset.htm b/tests/wpt/tests/html/syntax/xmldecl/support/meta-inside-xml-encoding-before-charset.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/meta-inside-xml-encoding-before-charset.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/meta-inside-xml-encoding-before-charset.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-quotes-space-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-quotes-space-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-quotes-space-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-quotes-space-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-quotes-space.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-quotes-space.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-quotes-space.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-quotes-space.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-quotes-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-quotes-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-quotes-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-quotes-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-quotes.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-quotes.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-quotes.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-quotes.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-and-line-breaks-around-equals-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-and-line-breaks-around-equals-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-and-line-breaks-around-equals-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-and-line-breaks-around-equals-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-and-line-breaks-around-equals.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-and-line-breaks-around-equals.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-and-line-breaks-around-equals.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-and-line-breaks-around-equals.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-around-equals-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-around-equals-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-around-equals-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-around-equals-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-around-equals.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-around-equals.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-around-equals.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-spaces-around-equals.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-single-quotes.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-body.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-lt-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-lt-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-lt-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-lt-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-lt.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-lt.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-lt.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question-trailing-lt.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-or-trailing-question.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-or-space.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-or-space.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version.htm b/tests/wpt/tests/html/syntax/xmldecl/support/no-version.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/no-version.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/no-version.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/one-around-equals-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/one-around-equals-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/one-around-equals-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/one-around-equals-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/one-around-equals.htm b/tests/wpt/tests/html/syntax/xmldecl/support/one-around-equals.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/one-around-equals.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/one-around-equals.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/one-around-label-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/one-around-label-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/one-around-label-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/one-around-label-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/one-around-label.htm b/tests/wpt/tests/html/syntax/xmldecl/support/one-around-label.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/one-around-label.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/one-around-label.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/replacement-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/replacement-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/replacement-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/replacement-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/replacement.htm b/tests/wpt/tests/html/syntax/xmldecl/support/replacement.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/replacement.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/replacement.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/space-around-label-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/space-around-label-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/space-around-label-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/space-around-label-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/space-around-label.htm b/tests/wpt/tests/html/syntax/xmldecl/support/space-around-label.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/space-around-label.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/space-around-label.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/space-before-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/space-before-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/space-before-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/space-before-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/space-before.htm b/tests/wpt/tests/html/syntax/xmldecl/support/space-before.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/space-before.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/space-before.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/test_support.js b/tests/wpt/tests/html/syntax/xmldecl/support/test_support.js similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/test_support.js rename to tests/wpt/tests/html/syntax/xmldecl/support/test_support.js diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/trickle.py b/tests/wpt/tests/html/syntax/xmldecl/support/trickle.py similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/trickle.py rename to tests/wpt/tests/html/syntax/xmldecl/support/trickle.py diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/unmatched-quotes-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/unmatched-quotes-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/unmatched-quotes-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/unmatched-quotes-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/unmatched-quotes.htm b/tests/wpt/tests/html/syntax/xmldecl/support/unmatched-quotes.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/unmatched-quotes.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/unmatched-quotes.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16be-and-meta-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/utf-16be-and-meta-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16be-and-meta-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/utf-16be-and-meta-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16be-and-meta.htm b/tests/wpt/tests/html/syntax/xmldecl/support/utf-16be-and-meta.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16be-and-meta.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/utf-16be-and-meta.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16be-vs-http-trail.html b/tests/wpt/tests/html/syntax/xmldecl/support/utf-16be-vs-http-trail.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16be-vs-http-trail.html rename to tests/wpt/tests/html/syntax/xmldecl/support/utf-16be-vs-http-trail.html diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16be-vs-http-trail.html.headers b/tests/wpt/tests/html/syntax/xmldecl/support/utf-16be-vs-http-trail.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16be-vs-http-trail.html.headers rename to tests/wpt/tests/html/syntax/xmldecl/support/utf-16be-vs-http-trail.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16be-vs-http.html b/tests/wpt/tests/html/syntax/xmldecl/support/utf-16be-vs-http.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16be-vs-http.html rename to tests/wpt/tests/html/syntax/xmldecl/support/utf-16be-vs-http.html diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16be-vs-http.html.headers b/tests/wpt/tests/html/syntax/xmldecl/support/utf-16be-vs-http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16be-vs-http.html.headers rename to tests/wpt/tests/html/syntax/xmldecl/support/utf-16be-vs-http.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16le-and-meta-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/utf-16le-and-meta-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16le-and-meta-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/utf-16le-and-meta-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16le-and-meta.htm b/tests/wpt/tests/html/syntax/xmldecl/support/utf-16le-and-meta.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16le-and-meta.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/utf-16le-and-meta.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16le-vs-http-trail.html b/tests/wpt/tests/html/syntax/xmldecl/support/utf-16le-vs-http-trail.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16le-vs-http-trail.html rename to tests/wpt/tests/html/syntax/xmldecl/support/utf-16le-vs-http-trail.html diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16le-vs-http-trail.html.headers b/tests/wpt/tests/html/syntax/xmldecl/support/utf-16le-vs-http-trail.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16le-vs-http-trail.html.headers rename to tests/wpt/tests/html/syntax/xmldecl/support/utf-16le-vs-http-trail.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16le-vs-http.html b/tests/wpt/tests/html/syntax/xmldecl/support/utf-16le-vs-http.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16le-vs-http.html rename to tests/wpt/tests/html/syntax/xmldecl/support/utf-16le-vs-http.html diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16le-vs-http.html.headers b/tests/wpt/tests/html/syntax/xmldecl/support/utf-16le-vs-http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/utf-16le-vs-http.html.headers rename to tests/wpt/tests/html/syntax/xmldecl/support/utf-16le-vs-http.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/xml-and-meta-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/xml-and-meta-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/xml-and-meta-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/xml-and-meta-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/xml-and-meta.htm b/tests/wpt/tests/html/syntax/xmldecl/support/xml-and-meta.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/xml-and-meta.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/xml-and-meta.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/xml-vs-http-trail.html b/tests/wpt/tests/html/syntax/xmldecl/support/xml-vs-http-trail.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/xml-vs-http-trail.html rename to tests/wpt/tests/html/syntax/xmldecl/support/xml-vs-http-trail.html diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/xml-vs-http-trail.html.headers b/tests/wpt/tests/html/syntax/xmldecl/support/xml-vs-http-trail.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/xml-vs-http-trail.html.headers rename to tests/wpt/tests/html/syntax/xmldecl/support/xml-vs-http-trail.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/xml-vs-http.html b/tests/wpt/tests/html/syntax/xmldecl/support/xml-vs-http.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/xml-vs-http.html rename to tests/wpt/tests/html/syntax/xmldecl/support/xml-vs-http.html diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/xml-vs-http.html.headers b/tests/wpt/tests/html/syntax/xmldecl/support/xml-vs-http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/xml-vs-http.html.headers rename to tests/wpt/tests/html/syntax/xmldecl/support/xml-vs-http.html.headers diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/zero-around-equals-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/zero-around-equals-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/zero-around-equals-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/zero-around-equals-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/zero-around-equals.htm b/tests/wpt/tests/html/syntax/xmldecl/support/zero-around-equals.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/zero-around-equals.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/zero-around-equals.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/zero-around-label-trail.htm b/tests/wpt/tests/html/syntax/xmldecl/support/zero-around-label-trail.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/zero-around-label-trail.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/zero-around-label-trail.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/support/zero-around-label.htm b/tests/wpt/tests/html/syntax/xmldecl/support/zero-around-label.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/support/zero-around-label.htm rename to tests/wpt/tests/html/syntax/xmldecl/support/zero-around-label.htm diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/xmldecl-1.html b/tests/wpt/tests/html/syntax/xmldecl/xmldecl-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/xmldecl-1.html rename to tests/wpt/tests/html/syntax/xmldecl/xmldecl-1.html diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/xmldecl-2.html b/tests/wpt/tests/html/syntax/xmldecl/xmldecl-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/xmldecl-2.html rename to tests/wpt/tests/html/syntax/xmldecl/xmldecl-2.html diff --git a/tests/wpt/web-platform-tests/html/syntax/xmldecl/xmldecl-3.html b/tests/wpt/tests/html/syntax/xmldecl/xmldecl-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/syntax/xmldecl/xmldecl-3.html rename to tests/wpt/tests/html/syntax/xmldecl/xmldecl-3.html diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/adopt-while-parsing-001-ref.html b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/adopt-while-parsing-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/adopt-while-parsing-001-ref.html rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/adopt-while-parsing-001-ref.html diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/adopt-while-parsing-001.html b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/adopt-while-parsing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/adopt-while-parsing-001.html rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/adopt-while-parsing-001.html diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/adopt-while-parsing.xhtml b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/adopt-while-parsing.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/adopt-while-parsing.xhtml rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/adopt-while-parsing.xhtml diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/data-xhtml-with-dtd-ref.html b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/data-xhtml-with-dtd-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/data-xhtml-with-dtd-ref.html rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/data-xhtml-with-dtd-ref.html diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/data-xhtml-with-dtd.html b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/data-xhtml-with-dtd.html similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/data-xhtml-with-dtd.html rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/data-xhtml-with-dtd.html diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/support/entities.json b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/support/entities.json similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/support/entities.json rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/support/entities.json diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/support/xhtml-mathml-dtd-entity.htm b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/support/xhtml-mathml-dtd-entity.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/support/xhtml-mathml-dtd-entity.htm rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/support/xhtml-mathml-dtd-entity.htm diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-1.htm b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-1.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-1.htm rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-1.htm diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-10.htm b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-10.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-10.htm rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-10.htm diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-2.htm b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-2.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-2.htm rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-2.htm diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-3.htm b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-3.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-3.htm rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-3.htm diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-4.htm b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-4.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-4.htm rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-4.htm diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-5.htm b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-5.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-5.htm rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-5.htm diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-6.htm b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-6.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-6.htm rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-6.htm diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-7.htm b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-7.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-7.htm rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-7.htm diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-8.htm b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-8.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-8.htm rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-8.htm diff --git a/tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-9.htm b/tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-9.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-9.htm rename to tests/wpt/tests/html/the-xhtml-syntax/parsing-xhtml-documents/xhtml-mathml-dtd-entity-9.htm diff --git a/tests/wpt/web-platform-tests/html/tools/README b/tests/wpt/tests/html/tools/README similarity index 100% rename from tests/wpt/web-platform-tests/html/tools/README rename to tests/wpt/tests/html/tools/README diff --git a/tests/wpt/web-platform-tests/html/tools/html5lib_python_revision b/tests/wpt/tests/html/tools/html5lib_python_revision similarity index 100% rename from tests/wpt/web-platform-tests/html/tools/html5lib_python_revision rename to tests/wpt/tests/html/tools/html5lib_python_revision diff --git a/tests/wpt/web-platform-tests/html/tools/html5lib_test.xml b/tests/wpt/tests/html/tools/html5lib_test.xml similarity index 100% rename from tests/wpt/web-platform-tests/html/tools/html5lib_test.xml rename to tests/wpt/tests/html/tools/html5lib_test.xml diff --git a/tests/wpt/web-platform-tests/html/tools/html5lib_test_fragment.xml b/tests/wpt/tests/html/tools/html5lib_test_fragment.xml similarity index 100% rename from tests/wpt/web-platform-tests/html/tools/html5lib_test_fragment.xml rename to tests/wpt/tests/html/tools/html5lib_test_fragment.xml diff --git a/tests/wpt/web-platform-tests/html/tools/html5lib_tests_revision b/tests/wpt/tests/html/tools/html5lib_tests_revision similarity index 100% rename from tests/wpt/web-platform-tests/html/tools/html5lib_tests_revision rename to tests/wpt/tests/html/tools/html5lib_tests_revision diff --git a/tests/wpt/web-platform-tests/html/tools/update_html5lib_tests.py b/tests/wpt/tests/html/tools/update_html5lib_tests.py similarity index 100% rename from tests/wpt/web-platform-tests/html/tools/update_html5lib_tests.py rename to tests/wpt/tests/html/tools/update_html5lib_tests.py diff --git a/tests/wpt/web-platform-tests/html/user-activation/META.yml b/tests/wpt/tests/html/user-activation/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/META.yml rename to tests/wpt/tests/html/user-activation/META.yml diff --git a/tests/wpt/web-platform-tests/html/user-activation/activation-trigger-keyboard-enter.html b/tests/wpt/tests/html/user-activation/activation-trigger-keyboard-enter.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/activation-trigger-keyboard-enter.html rename to tests/wpt/tests/html/user-activation/activation-trigger-keyboard-enter.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/activation-trigger-keyboard-escape.html b/tests/wpt/tests/html/user-activation/activation-trigger-keyboard-escape.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/activation-trigger-keyboard-escape.html rename to tests/wpt/tests/html/user-activation/activation-trigger-keyboard-escape.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/activation-trigger-mouse-left.html b/tests/wpt/tests/html/user-activation/activation-trigger-mouse-left.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/activation-trigger-mouse-left.html rename to tests/wpt/tests/html/user-activation/activation-trigger-mouse-left.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/activation-trigger-mouse-right.html b/tests/wpt/tests/html/user-activation/activation-trigger-mouse-right.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/activation-trigger-mouse-right.html rename to tests/wpt/tests/html/user-activation/activation-trigger-mouse-right.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/activation-trigger-pointerevent.html b/tests/wpt/tests/html/user-activation/activation-trigger-pointerevent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/activation-trigger-pointerevent.html rename to tests/wpt/tests/html/user-activation/activation-trigger-pointerevent.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/chained-setTimeout.html b/tests/wpt/tests/html/user-activation/chained-setTimeout.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/chained-setTimeout.html rename to tests/wpt/tests/html/user-activation/chained-setTimeout.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/detached-iframe.html b/tests/wpt/tests/html/user-activation/detached-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/detached-iframe.html rename to tests/wpt/tests/html/user-activation/detached-iframe.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/message-event-activation-api-iframe-cross-origin.sub.tentative.html b/tests/wpt/tests/html/user-activation/message-event-activation-api-iframe-cross-origin.sub.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/message-event-activation-api-iframe-cross-origin.sub.tentative.html rename to tests/wpt/tests/html/user-activation/message-event-activation-api-iframe-cross-origin.sub.tentative.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/message-event-init.tentative.html b/tests/wpt/tests/html/user-activation/message-event-init.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/message-event-init.tentative.html rename to tests/wpt/tests/html/user-activation/message-event-init.tentative.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/navigation-state-reset-crossorigin.sub.html b/tests/wpt/tests/html/user-activation/navigation-state-reset-crossorigin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/navigation-state-reset-crossorigin.sub.html rename to tests/wpt/tests/html/user-activation/navigation-state-reset-crossorigin.sub.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/navigation-state-reset-sameorigin.html b/tests/wpt/tests/html/user-activation/navigation-state-reset-sameorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/navigation-state-reset-sameorigin.html rename to tests/wpt/tests/html/user-activation/navigation-state-reset-sameorigin.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/no-activation-thru-escape-key.html b/tests/wpt/tests/html/user-activation/no-activation-thru-escape-key.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/no-activation-thru-escape-key.html rename to tests/wpt/tests/html/user-activation/no-activation-thru-escape-key.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/propagation-crossorigin.sub.html b/tests/wpt/tests/html/user-activation/propagation-crossorigin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/propagation-crossorigin.sub.html rename to tests/wpt/tests/html/user-activation/propagation-crossorigin.sub.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/propagation-same-and-cross-origin.sub.html b/tests/wpt/tests/html/user-activation/propagation-same-and-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/propagation-same-and-cross-origin.sub.html rename to tests/wpt/tests/html/user-activation/propagation-same-and-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/propagation-sameorigin.html b/tests/wpt/tests/html/user-activation/propagation-sameorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/propagation-sameorigin.html rename to tests/wpt/tests/html/user-activation/propagation-sameorigin.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/resources/child-message-event-api.html b/tests/wpt/tests/html/user-activation/resources/child-message-event-api.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/resources/child-message-event-api.html rename to tests/wpt/tests/html/user-activation/resources/child-message-event-api.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/resources/child-one.html b/tests/wpt/tests/html/user-activation/resources/child-one.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/resources/child-one.html rename to tests/wpt/tests/html/user-activation/resources/child-one.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/resources/child-two.html b/tests/wpt/tests/html/user-activation/resources/child-two.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/resources/child-two.html rename to tests/wpt/tests/html/user-activation/resources/child-two.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/resources/consumption-crossorigin-child.sub.html b/tests/wpt/tests/html/user-activation/resources/consumption-crossorigin-child.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/resources/consumption-crossorigin-child.sub.html rename to tests/wpt/tests/html/user-activation/resources/consumption-crossorigin-child.sub.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/resources/consumption-sameorigin-child.html b/tests/wpt/tests/html/user-activation/resources/consumption-sameorigin-child.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/resources/consumption-sameorigin-child.html rename to tests/wpt/tests/html/user-activation/resources/consumption-sameorigin-child.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/resources/propagation-crossorigin-child.sub.html b/tests/wpt/tests/html/user-activation/resources/propagation-crossorigin-child.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/resources/propagation-crossorigin-child.sub.html rename to tests/wpt/tests/html/user-activation/resources/propagation-crossorigin-child.sub.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/resources/propagation-sameorigin-child.html b/tests/wpt/tests/html/user-activation/resources/propagation-sameorigin-child.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/resources/propagation-sameorigin-child.html rename to tests/wpt/tests/html/user-activation/resources/propagation-sameorigin-child.html diff --git a/tests/wpt/web-platform-tests/html/user-activation/resources/utils.js b/tests/wpt/tests/html/user-activation/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/resources/utils.js rename to tests/wpt/tests/html/user-activation/resources/utils.js diff --git a/tests/wpt/web-platform-tests/html/user-activation/user-activation-interface.html b/tests/wpt/tests/html/user-activation/user-activation-interface.html similarity index 100% rename from tests/wpt/web-platform-tests/html/user-activation/user-activation-interface.html rename to tests/wpt/tests/html/user-activation/user-activation-interface.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/animation-frames/callback-cross-realm-report-exception.html b/tests/wpt/tests/html/webappapis/animation-frames/callback-cross-realm-report-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/animation-frames/callback-cross-realm-report-exception.html rename to tests/wpt/tests/html/webappapis/animation-frames/callback-cross-realm-report-exception.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/animation-frames/callback-exception.html b/tests/wpt/tests/html/webappapis/animation-frames/callback-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/animation-frames/callback-exception.html rename to tests/wpt/tests/html/webappapis/animation-frames/callback-exception.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/animation-frames/callback-handle.html b/tests/wpt/tests/html/webappapis/animation-frames/callback-handle.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/animation-frames/callback-handle.html rename to tests/wpt/tests/html/webappapis/animation-frames/callback-handle.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/animation-frames/callback-invoked.html b/tests/wpt/tests/html/webappapis/animation-frames/callback-invoked.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/animation-frames/callback-invoked.html rename to tests/wpt/tests/html/webappapis/animation-frames/callback-invoked.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/animation-frames/callback-multicalls.html b/tests/wpt/tests/html/webappapis/animation-frames/callback-multicalls.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/animation-frames/callback-multicalls.html rename to tests/wpt/tests/html/webappapis/animation-frames/callback-multicalls.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/animation-frames/callback-timestamp.html b/tests/wpt/tests/html/webappapis/animation-frames/callback-timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/animation-frames/callback-timestamp.html rename to tests/wpt/tests/html/webappapis/animation-frames/callback-timestamp.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/animation-frames/cancel-handle-manual.html b/tests/wpt/tests/html/webappapis/animation-frames/cancel-handle-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/animation-frames/cancel-handle-manual.html rename to tests/wpt/tests/html/webappapis/animation-frames/cancel-handle-manual.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/animation-frames/cancel-invoked.html b/tests/wpt/tests/html/webappapis/animation-frames/cancel-invoked.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/animation-frames/cancel-invoked.html rename to tests/wpt/tests/html/webappapis/animation-frames/cancel-invoked.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/animation-frames/cancel-pending.html b/tests/wpt/tests/html/webappapis/animation-frames/cancel-pending.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/animation-frames/cancel-pending.html rename to tests/wpt/tests/html/webappapis/animation-frames/cancel-pending.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/animation-frames/same-dispatch-time.html b/tests/wpt/tests/html/webappapis/animation-frames/same-dispatch-time.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/animation-frames/same-dispatch-time.html rename to tests/wpt/tests/html/webappapis/animation-frames/same-dispatch-time.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/atob/base64.any.js b/tests/wpt/tests/html/webappapis/atob/base64.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/atob/base64.any.js rename to tests/wpt/tests/html/webappapis/atob/base64.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/closing-the-input-stream/document-close-with-pending-script.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/closing-the-input-stream/document-close-with-pending-script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/closing-the-input-stream/document-close-with-pending-script.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/closing-the-input-stream/document-close-with-pending-script.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/closing-the-input-stream/document.close-01.xhtml b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/closing-the-input-stream/document.close-01.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/closing-the-input-stream/document.close-01.xhtml rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/closing-the-input-stream/document.close-01.xhtml diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/closing-the-input-stream/load-event-after-location-set-during-write.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/closing-the-input-stream/load-event-after-location-set-during-write.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/closing-the-input-stream/load-event-after-location-set-during-write.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/closing-the-input-stream/load-event-after-location-set-during-write.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/001.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/001.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/001.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/002.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/002.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/002.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/003.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/003.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/003.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/004.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/004.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/004.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/005.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/005.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/005.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/005.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/005.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/005.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/005.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/006.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/006.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/006.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/006.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/006.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/006.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/006.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/007.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/007.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/007.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/007.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/007.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/007.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/007.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/008-1.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/008-1.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/008-1.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/008-1.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/008.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/008.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/008.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/008.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/008.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/008.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/008.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/009.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/009.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/009.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/010-1.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/010-1.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/010-1.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/010-1.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/010.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/010.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/010.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/010.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/010.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/010.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/010.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/011-1.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/011-1.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/011-1.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/011-1.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/011.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/011.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/011.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/011.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/011.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/011.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/011.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/011.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/012.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/012.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/012.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/012.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/012.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/012.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/012.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/012.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/013.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/013.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/013.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/013.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/013.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/013.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/013.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/013.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/014.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/014.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/014.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/014.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/015.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/015.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/015.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/015.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/016.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/016.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/016.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/016.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/017.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/017.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/017.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/017.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/018.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/018.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/018.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/018.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/019.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/019.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/019.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/019.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/020.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/020.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/020.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/020.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/021.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/021.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/021.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/021.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/022.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/022.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/022.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/022.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/023.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/023.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/023.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/023.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/024.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/024.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/024.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/024.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/025.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/025.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/025.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/025.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/026.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/026.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/026.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/026.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/027.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/027.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/027.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/027.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/028.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/028.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/028.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/028.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/029.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/029.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/029.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/029.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/030.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/030.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/030.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/030.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/031.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/031.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/031.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/031.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/032.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/032.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/032.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/032.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/033.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/033.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/033.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/033.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/034.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/034.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/034.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/034.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/035.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/035.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/035.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/035.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/036.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/036.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/036.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/036.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/037.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/037.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/037.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/037.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/038.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/038.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/038.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/038.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/039.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/039.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/039.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/039.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/040.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/040.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/040.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/040.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/041.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/041.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/041.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/041.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/042.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/042.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/042.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/042.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/043.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/043.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/043.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/043.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/044.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/044.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/044.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/044.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/045.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/045.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/045.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/045.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/046.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/046.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/046.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/046.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/047-1.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/047-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/047-1.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/047-1.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/047.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/047.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/047.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/047.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/049.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/049.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/049.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/049.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/050.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/050.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/050.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/050.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/051.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/051.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/051.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/051.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/contentType.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/contentType.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/contentType.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/contentType.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/document.write-01.xhtml b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/document.write-01.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/document.write-01.xhtml rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/document.write-01.xhtml diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/document.write-02.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/document.write-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/document.write-02.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/document.write-02.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/during-readystatechange.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/during-readystatechange.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/during-readystatechange.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/during-readystatechange.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/empty.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/empty.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/empty.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_001.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_001.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_001.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_002.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_002.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_002.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_003.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_003.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_003.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_004.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_004.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_004.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_005.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_006.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_006.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_006.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_007.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_007.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_007.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_008.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_008.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_008.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_009.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_009.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_009.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_010.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_010.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/iframe_010.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-delayed-iframe.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-delayed-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-delayed-iframe.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-delayed-iframe.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import-iframe.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import-iframe.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import-iframe.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import.mjs b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import.mjs rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import.mjs diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-iframe.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-iframe.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-iframe.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed-iframe.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed-iframe.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed-iframe.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.mjs b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.mjs rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.mjs diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-iframe.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-iframe.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-iframe.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import.mjs b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import.mjs rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-static-import.mjs diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed-iframe.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed-iframe.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed-iframe.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-immediate-promise-iframe.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-immediate-promise-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-immediate-promise-iframe.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-immediate-promise-iframe.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-immediate-promise.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-immediate-promise.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-immediate-promise.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-immediate-promise.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import-iframe.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import-iframe.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import-iframe.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import.mjs b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import.mjs similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import.mjs rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import.mjs diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-promise-iframe.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-promise-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-promise-iframe.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-promise-iframe.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-promise.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-promise.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-promise.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module-tla-promise.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/module.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/module.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/nested-document-write-1.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/nested-document-write-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/nested-document-write-1.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/nested-document-write-1.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/nested-document-write-2.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/nested-document-write-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/nested-document-write-2.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/nested-document-write-2.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/nested-document-write-external.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/nested-document-write-external.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/nested-document-write-external.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/nested-document-write-external.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/original-id.json b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/original-id.json rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/original-id.json diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_001.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_001.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_001.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_001.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_002.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_002.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_002.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_003.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_003.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_003.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_003.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_004.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_004.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_004.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_005.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_005.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_005.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_005.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_006.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_006.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_006.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_007.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_007.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_007.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_007.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_008.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_008.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_008.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_008.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_009.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_009.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_009.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_009.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_010.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_010.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_010.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_010.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_011.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_011.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_011.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_011.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_012.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_012.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_012.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_012.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_013.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_013.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/script_013.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/script_013.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/write-active-document.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/write-active-document.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-write/write-active-document.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-write/write-active-document.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-writeln/document.writeln-01.xhtml b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-writeln/document.writeln-01.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-writeln/document.writeln-01.xhtml rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-writeln/document.writeln-01.xhtml diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-writeln/document.writeln-02.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-writeln/document.writeln-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-writeln/document.writeln-02.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-writeln/document.writeln-02.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-writeln/document.writeln-03.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-writeln/document.writeln-03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-writeln/document.writeln-03.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-writeln/document.writeln-03.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-writeln/original-id.json b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-writeln/original-id.json similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/document-writeln/original-id.json rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/document-writeln/original-id.json diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/002.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/002.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/002.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/002.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/004.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/004.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/004.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/004.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/006.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/006.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/006.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/006.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/011-1.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/011-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/011-1.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/011-1.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/011.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/011.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/011.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/011.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/012-1.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/012-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/012-1.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/012-1.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/012.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/012.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/012.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/012.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/013-1.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/013-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/013-1.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/013-1.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/013.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/013.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/013.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/013.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/014-1.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/014-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/014-1.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/014-1.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/014.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/014.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/014.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/014.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/015-1.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/015-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/015-1.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/015-1.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/015.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/015.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/015.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/015.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/016-1.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/016-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/016-1.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/016-1.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/016.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/016.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/016.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/016.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-refresh-immediate.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-refresh-immediate.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-refresh-immediate.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-refresh-immediate.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-refresh-multisecond-header.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-refresh-multisecond-header.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-refresh-multisecond-header.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-refresh-multisecond-header.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-refresh-multisecond-meta.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-refresh-multisecond-meta.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-refresh-multisecond-meta.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-refresh-multisecond-meta.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-while-navigating.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-while-navigating.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-while-navigating.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort-while-navigating.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort.sub.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort.sub.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/abort.sub.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/aborted-parser.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/aborted-parser.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/aborted-parser.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/aborted-parser.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/active.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/active.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/active.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/active.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-origin.sub.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-origin.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-origin.sub.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-origin.sub.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-ignore-opens-during-unload.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-ignore-opens-during-unload.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-ignore-opens-during-unload.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-ignore-opens-during-unload.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-same-origin-domain.sub.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-same-origin-domain.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-same-origin-domain.sub.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-same-origin-domain.sub.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-synchronous-script.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-synchronous-script.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-synchronous-script.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-synchronous-script.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-xml.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-xml.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-xml.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-xml.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/beforeunload.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/beforeunload.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/beforeunload.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/beforeunload.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/crbug-583445-regression.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/crbug-583445-regression.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/crbug-583445-regression.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/crbug-583445-regression.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/custom-element.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/custom-element.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/custom-element.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/custom-element.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document-open-cancels-javascript-url-navigation.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document-open-cancels-javascript-url-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document-open-cancels-javascript-url-navigation.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document-open-cancels-javascript-url-navigation.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-01.xhtml b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-01.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-01.xhtml rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-01.xhtml diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-02.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-02.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-02.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-02.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-03-frame.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-03-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-03-frame.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-03-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-03.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-03.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-03.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/document.open-03.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/encoding.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/encoding.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/encoding.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/encoding.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/form-control-state.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/form-control-state.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/form-control-state.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/form-control-state.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/history-state.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/history-state.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/history-state.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/history-state.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/history.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/history.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/history.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/history.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/location-set-and-document-open.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/location-set-and-document-open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/location-set-and-document-open.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/location-set-and-document-open.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/mutation-events.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/mutation-events.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/mutation-events.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/mutation-events.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/mutation-observer.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/mutation-observer.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/mutation-observer.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/mutation-observer.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/no-new-global.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/no-new-global.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/no-new-global.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/no-new-global.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/origin-check-in-document-open-basic.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/origin-check-in-document-open-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/origin-check-in-document-open-basic.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/origin-check-in-document-open-basic.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/origin-check-in-document-open-same-origin-domain.sub.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/origin-check-in-document-open-same-origin-domain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/origin-check-in-document-open-same-origin-domain.sub.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/origin-check-in-document-open-same-origin-domain.sub.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/quirks.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/quirks.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/quirks.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/quirks.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/readiness.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/readiness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/readiness.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/readiness.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/reload.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/reload.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/reload.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/reload.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/remove-initial-about-blankness.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/remove-initial-about-blankness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/remove-initial-about-blankness.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/remove-initial-about-blankness.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/aborted-parser-async-frame.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/aborted-parser-async-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/aborted-parser-async-frame.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/aborted-parser-async-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/aborted-parser-frame.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/aborted-parser-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/aborted-parser-frame.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/aborted-parser-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-custom-element-with-domain-frame.sub.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-custom-element-with-domain-frame.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-custom-element-with-domain-frame.sub.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-custom-element-with-domain-frame.sub.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-synchronous-script-frame.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-synchronous-script-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-synchronous-script-frame.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-synchronous-script-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-synchronous-script-with-domain-frame.sub.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-synchronous-script-with-domain-frame.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-synchronous-script-with-domain-frame.sub.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-synchronous-script-with-domain-frame.sub.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-xml-with-domain-frame.sub.xhtml b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-xml-with-domain-frame.sub.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-xml-with-domain-frame.sub.xhtml rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-xml-with-domain-frame.sub.xhtml diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-xml-with-synchronous-script-frame.xhtml b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-xml-with-synchronous-script-frame.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-xml-with-synchronous-script-frame.xhtml rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/bailout-order-xml-with-synchronous-script-frame.xhtml diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/document-open-side-effects.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/document-open-side-effects.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/document-open-side-effects.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/document-open-side-effects.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/dummy.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/dummy.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/dummy.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/dummy.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/encoding-frame.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/encoding-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/encoding-frame.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/encoding-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/global-variables-frame.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/global-variables-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/global-variables-frame.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/global-variables-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/history-frame.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/history-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/history-frame.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/history-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/http-refresh.py b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/http-refresh.py similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/http-refresh.py rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/http-refresh.py diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/meta-refresh.py b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/meta-refresh.py similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/meta-refresh.py rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/meta-refresh.py diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/page-with-frame.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/page-with-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/page-with-frame.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/page-with-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/set-document-domain.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/set-document-domain.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/set-document-domain.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/set-document-domain.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/slow-png.py b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/slow-png.py similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/slow-png.py rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/slow-png.py diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/url-entry-document-incumbent-frame.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/url-entry-document-incumbent-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/url-entry-document-incumbent-frame.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/url-entry-document-incumbent-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/url-entry-document-timer-frame.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/url-entry-document-timer-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/url-entry-document-timer-frame.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/url-entry-document-timer-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/url-frame.html b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/url-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/url-frame.html rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/url-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/tasks.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/tasks.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/tasks.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/tasks.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/type-argument-plaintext-subframe.txt b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/type-argument-plaintext-subframe.txt similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/type-argument-plaintext-subframe.txt rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/type-argument-plaintext-subframe.txt diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/type-argument-plaintext.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/type-argument-plaintext.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/type-argument-plaintext.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/type-argument-plaintext.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/type-argument.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/unload.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/unload.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/unload.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/unload.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url-entry-document-sync-call.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url-entry-document-sync-call.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url-entry-document-sync-call.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url-entry-document-sync-call.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url-entry-document.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url-entry-document.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url-entry-document.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url-entry-document.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url-fragment.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url-fragment.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url-fragment.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url-fragment.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url.window.js b/tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url.window.js rename to tests/wpt/tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/url.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/microtask-queuing/queue-microtask-cross-realm-callback-report-exception.html b/tests/wpt/tests/html/webappapis/microtask-queuing/queue-microtask-cross-realm-callback-report-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/microtask-queuing/queue-microtask-cross-realm-callback-report-exception.html rename to tests/wpt/tests/html/webappapis/microtask-queuing/queue-microtask-cross-realm-callback-report-exception.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/microtask-queuing/queue-microtask-exceptions.any.js b/tests/wpt/tests/html/webappapis/microtask-queuing/queue-microtask-exceptions.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/microtask-queuing/queue-microtask-exceptions.any.js rename to tests/wpt/tests/html/webappapis/microtask-queuing/queue-microtask-exceptions.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/microtask-queuing/queue-microtask.any.js b/tests/wpt/tests/html/webappapis/microtask-queuing/queue-microtask.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/microtask-queuing/queue-microtask.any.js rename to tests/wpt/tests/html/webappapis/microtask-queuing/queue-microtask.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/microtask-queuing/queue-microtask.window.js b/tests/wpt/tests/html/webappapis/microtask-queuing/queue-microtask.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/microtask-queuing/queue-microtask.window.js rename to tests/wpt/tests/html/webappapis/microtask-queuing/queue-microtask.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/fully_active_document.window.js b/tests/wpt/tests/html/webappapis/scripting/event-loops/fully_active_document.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/fully_active_document.window.js rename to tests/wpt/tests/html/webappapis/scripting/event-loops/fully_active_document.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/microtask_after_raf.html b/tests/wpt/tests/html/webappapis/scripting/event-loops/microtask_after_raf.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/microtask_after_raf.html rename to tests/wpt/tests/html/webappapis/scripting/event-loops/microtask_after_raf.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/microtask_after_script.html b/tests/wpt/tests/html/webappapis/scripting/event-loops/microtask_after_script.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/microtask_after_script.html rename to tests/wpt/tests/html/webappapis/scripting/event-loops/microtask_after_script.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/resources/common.js b/tests/wpt/tests/html/webappapis/scripting/event-loops/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/resources/common.js rename to tests/wpt/tests/html/webappapis/scripting/event-loops/resources/common.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/resources/iframe.html b/tests/wpt/tests/html/webappapis/scripting/event-loops/resources/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/resources/iframe.html rename to tests/wpt/tests/html/webappapis/scripting/event-loops/resources/iframe.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/resources/page-with-frame.html b/tests/wpt/tests/html/webappapis/scripting/event-loops/resources/page-with-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/resources/page-with-frame.html rename to tests/wpt/tests/html/webappapis/scripting/event-loops/resources/page-with-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/task_microtask_ordering-manual.html b/tests/wpt/tests/html/webappapis/scripting/event-loops/task_microtask_ordering-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/task_microtask_ordering-manual.html rename to tests/wpt/tests/html/webappapis/scripting/event-loops/task_microtask_ordering-manual.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/task_microtask_ordering.html b/tests/wpt/tests/html/webappapis/scripting/event-loops/task_microtask_ordering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/event-loops/task_microtask_ordering.html rename to tests/wpt/tests/html/webappapis/scripting/event-loops/task_microtask_ordering.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/body-onload.html b/tests/wpt/tests/html/webappapis/scripting/events/body-onload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/body-onload.html rename to tests/wpt/tests/html/webappapis/scripting/events/body-onload.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/compile-event-handler-lexical-scopes-form-owner.html b/tests/wpt/tests/html/webappapis/scripting/events/compile-event-handler-lexical-scopes-form-owner.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/compile-event-handler-lexical-scopes-form-owner.html rename to tests/wpt/tests/html/webappapis/scripting/events/compile-event-handler-lexical-scopes-form-owner.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/compile-event-handler-lexical-scopes.html b/tests/wpt/tests/html/webappapis/scripting/events/compile-event-handler-lexical-scopes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/compile-event-handler-lexical-scopes.html rename to tests/wpt/tests/html/webappapis/scripting/events/compile-event-handler-lexical-scopes.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/compile-event-handler-settings-objects.html b/tests/wpt/tests/html/webappapis/scripting/events/compile-event-handler-settings-objects.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/compile-event-handler-settings-objects.html rename to tests/wpt/tests/html/webappapis/scripting/events/compile-event-handler-settings-objects.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/compile-event-handler-symbol-unscopables.html b/tests/wpt/tests/html/webappapis/scripting/events/compile-event-handler-symbol-unscopables.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/compile-event-handler-symbol-unscopables.html rename to tests/wpt/tests/html/webappapis/scripting/events/compile-event-handler-symbol-unscopables.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/contextmenu-event-manual.htm b/tests/wpt/tests/html/webappapis/scripting/events/contextmenu-event-manual.htm similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/contextmenu-event-manual.htm rename to tests/wpt/tests/html/webappapis/scripting/events/contextmenu-event-manual.htm diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-all-global-events.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-all-global-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-all-global-events.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-all-global-events.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-attributes-body-window.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-attributes-body-window.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-attributes-body-window.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-attributes-body-window.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-attributes-frameset-window.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-attributes-windowless-body.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-attributes-windowless-body.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-attributes-windowless-body.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-attributes-windowless-body.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-handleEvent-ignored.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-handleEvent-ignored.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-handleEvent-ignored.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-handleEvent-ignored.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-javascript.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-javascript.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-javascript.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-javascript.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-onresize.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-onresize.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-onresize.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-onresize.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/body-element-synthetic-errorevent.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/body-element-synthetic-errorevent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/body-element-synthetic-errorevent.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/body-element-synthetic-errorevent.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/body-element-synthetic-event.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/body-element-synthetic-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/body-element-synthetic-event.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/body-element-synthetic-event.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/document-synthetic-errorevent.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/document-synthetic-errorevent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/document-synthetic-errorevent.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/document-synthetic-errorevent.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/document-synthetic-event.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/document-synthetic-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/document-synthetic-event.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/document-synthetic-event.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/frameset-element-synthetic-errorevent.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/frameset-element-synthetic-errorevent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/frameset-element-synthetic-errorevent.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/frameset-element-synthetic-errorevent.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/frameset-element-synthetic-event.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/frameset-element-synthetic-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/frameset-element-synthetic-event.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/frameset-element-synthetic-event.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/resources/frameset-frame.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/resources/frameset-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/resources/frameset-frame.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/resources/frameset-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/resources/no-op-worker.js b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/resources/no-op-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/resources/no-op-worker.js rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/resources/no-op-worker.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/resources/worker-with-syntax-error.js b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/resources/worker-with-syntax-error.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/resources/worker-with-syntax-error.js rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/resources/worker-with-syntax-error.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/script-element.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/script-element.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/script-element.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/script-element.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/synthetic-errorevent-click.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/synthetic-errorevent-click.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/synthetic-errorevent-click.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/synthetic-errorevent-click.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/synthetic-errorevent-click.worker.js b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/synthetic-errorevent-click.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/synthetic-errorevent-click.worker.js rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/synthetic-errorevent-click.worker.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/window-runtime-error.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/window-runtime-error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/window-runtime-error.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/window-runtime-error.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/window-synthetic-errorevent.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/window-synthetic-errorevent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/window-synthetic-errorevent.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/window-synthetic-errorevent.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/window-synthetic-event.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/window-synthetic-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/window-synthetic-event.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/window-synthetic-event.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/worker.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/worker.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/worker.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/worker.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/workerglobalscope-runtime-error.worker.js b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/workerglobalscope-runtime-error.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/workerglobalscope-runtime-error.worker.js rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/workerglobalscope-runtime-error.worker.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/workerglobalscope-synthetic-errorevent.worker.js b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/workerglobalscope-synthetic-errorevent.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/workerglobalscope-synthetic-errorevent.worker.js rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/workerglobalscope-synthetic-errorevent.worker.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/workerglobalscope-synthetic-event.worker.js b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/workerglobalscope-synthetic-event.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/workerglobalscope-synthetic-event.worker.js rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-error/workerglobalscope-synthetic-event.worker.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-manual.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm-manual.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm-manual.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-processing-algorithm.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-processing-algorithm.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-removal.window.js b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-removal.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-removal.window.js rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-removal.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-sourcetext.html b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-sourcetext.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-sourcetext.html rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-sourcetext.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-spec-example.window.js b/tests/wpt/tests/html/webappapis/scripting/events/event-handler-spec-example.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-spec-example.window.js rename to tests/wpt/tests/html/webappapis/scripting/events/event-handler-spec-example.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/eventhandler-cancellation.html b/tests/wpt/tests/html/webappapis/scripting/events/eventhandler-cancellation.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/eventhandler-cancellation.html rename to tests/wpt/tests/html/webappapis/scripting/events/eventhandler-cancellation.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/inline-event-handler-ordering.html b/tests/wpt/tests/html/webappapis/scripting/events/inline-event-handler-ordering.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/inline-event-handler-ordering.html rename to tests/wpt/tests/html/webappapis/scripting/events/inline-event-handler-ordering.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/invalid-uncompiled-raw-handler-compiled-late.window.js b/tests/wpt/tests/html/webappapis/scripting/events/invalid-uncompiled-raw-handler-compiled-late.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/invalid-uncompiled-raw-handler-compiled-late.window.js rename to tests/wpt/tests/html/webappapis/scripting/events/invalid-uncompiled-raw-handler-compiled-late.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/invalid-uncompiled-raw-handler-compiled-once.window.js b/tests/wpt/tests/html/webappapis/scripting/events/invalid-uncompiled-raw-handler-compiled-once.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/invalid-uncompiled-raw-handler-compiled-once.window.js rename to tests/wpt/tests/html/webappapis/scripting/events/invalid-uncompiled-raw-handler-compiled-once.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/invalid-uncompiled-raw-handler-keeps-position.window.js b/tests/wpt/tests/html/webappapis/scripting/events/invalid-uncompiled-raw-handler-keeps-position.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/invalid-uncompiled-raw-handler-keeps-position.window.js rename to tests/wpt/tests/html/webappapis/scripting/events/invalid-uncompiled-raw-handler-keeps-position.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/messageevent-constructor.https.html b/tests/wpt/tests/html/webappapis/scripting/events/messageevent-constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/messageevent-constructor.https.html rename to tests/wpt/tests/html/webappapis/scripting/events/messageevent-constructor.https.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/onerroreventhandler-frame.html b/tests/wpt/tests/html/webappapis/scripting/events/onerroreventhandler-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/onerroreventhandler-frame.html rename to tests/wpt/tests/html/webappapis/scripting/events/onerroreventhandler-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/onerroreventhandler.html b/tests/wpt/tests/html/webappapis/scripting/events/onerroreventhandler.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/onerroreventhandler.html rename to tests/wpt/tests/html/webappapis/scripting/events/onerroreventhandler.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/resources/compiled-event-handler-settings-objects-support.html b/tests/wpt/tests/html/webappapis/scripting/events/resources/compiled-event-handler-settings-objects-support.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/resources/compiled-event-handler-settings-objects-support.html rename to tests/wpt/tests/html/webappapis/scripting/events/resources/compiled-event-handler-settings-objects-support.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/resources/event-handler-body.js b/tests/wpt/tests/html/webappapis/scripting/events/resources/event-handler-body.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/resources/event-handler-body.js rename to tests/wpt/tests/html/webappapis/scripting/events/resources/event-handler-body.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/resources/open-window.html b/tests/wpt/tests/html/webappapis/scripting/events/resources/open-window.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/resources/open-window.html rename to tests/wpt/tests/html/webappapis/scripting/events/resources/open-window.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/uncompiled_event_handler_with_scripting_disabled.html b/tests/wpt/tests/html/webappapis/scripting/events/uncompiled_event_handler_with_scripting_disabled.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/events/uncompiled_event_handler_with_scripting_disabled.html rename to tests/wpt/tests/html/webappapis/scripting/events/uncompiled_event_handler_with_scripting_disabled.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/addEventListener.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/addEventListener.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/addEventListener.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/addEventListener.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/body-onerror-compile-error-data-url.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/body-onerror-compile-error-data-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/body-onerror-compile-error-data-url.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/body-onerror-compile-error-data-url.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/body-onerror-compile-error.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/body-onerror-compile-error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/body-onerror-compile-error.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/body-onerror-compile-error.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/body-onerror-runtime-error.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/body-onerror-runtime-error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/body-onerror-runtime-error.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/body-onerror-runtime-error.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-cross-origin.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-data-url.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-data-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-data-url.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-data-url.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-in-attribute.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-in-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-in-attribute.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-in-attribute.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-in-body-onerror.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-in-body-onerror.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-in-body-onerror.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-in-body-onerror.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-same-origin-with-hash.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-same-origin-with-hash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-same-origin-with-hash.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-same-origin-with-hash.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-same-origin.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error-same-origin.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error-same-origin.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/compile-error.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/compile-error.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/atomics-wait-async.https.any.js b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/atomics-wait-async.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/atomics-wait-async.https.any.js rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/atomics-wait-async.https.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/atomics-wait-async.https.any.js.headers b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/atomics-wait-async.https.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/atomics-wait-async.https.any.js.headers rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/atomics-wait-async.https.any.js.headers diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-failure.https.any.js b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-failure.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-failure.https.any.js rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-failure.https.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-success.any.js b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-success.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-success.any.js rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-success.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/resources/notify-worker.js b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/resources/notify-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/resources/notify-worker.js rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/resources/notify-worker.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/resources/notify-worker.js.headers b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/resources/notify-worker.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/resources/notify-worker.js.headers rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/resources/notify-worker.js.headers diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/README.md b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/README.md rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/README.md diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/current/current.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/current/current.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/current/current.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/current/current.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/current/resources/window-to-open.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/current/resources/window-to-open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/current/resources/window-to-open.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/current/resources/window-to-open.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/function/function.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/function/function.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/function/function.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/function/function.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/function/resources/window-to-open.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/function/resources/window-to-open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/function/resources/window-to-open.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/function/resources/window-to-open.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-entry-incumbent.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-entry-incumbent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-entry-incumbent.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-entry-incumbent.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-incumbent.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-incumbent.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-incumbent.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-incumbent.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-resolver.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-resolver.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-resolver.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-resolver.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/relevant/relevant.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/relevant/relevant.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/relevant/relevant.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/relevant/relevant.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/relevant/resources/window-to-open.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/relevant/resources/window-to-open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/relevant/resources/window-to-open.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/relevant/resources/window-to-open.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/resources/window-to-open.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/resources/window-to-open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/resources/window-to-open.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/resources/window-to-open.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/window-to-open.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/window-to-open.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/window-to-open.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/window-to-open.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-data-url.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-data-url.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-data-url.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-data-url.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-in-attribute.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-in-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-in-attribute.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-in-attribute.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-in-body-onerror.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-in-body-onerror.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-in-body-onerror.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-in-body-onerror.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-in-window-onerror.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-in-window-onerror.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-in-window-onerror.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-in-window-onerror.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-same-origin-with-hash.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-same-origin-with-hash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-same-origin-with-hash.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-same-origin-with-hash.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-same-origin.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error-same-origin.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error-same-origin.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/runtime-error.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/runtime-error.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setTimeout.js b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setTimeout.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setTimeout.js rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setTimeout.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/syntax-error.js b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/support/syntax-error.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/syntax-error.js rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/support/syntax-error.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setTimeout.js b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setTimeout.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setTimeout.js rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setTimeout.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/undefined-variable.js b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/support/undefined-variable.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/support/undefined-variable.js rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/support/undefined-variable.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/allow-crossorigin.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/allow-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/allow-crossorigin.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/allow-crossorigin.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/disallow-crossorigin.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/disallow-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/disallow-crossorigin.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/disallow-crossorigin.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-event-constructor.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-event-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-event-constructor.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-event-constructor.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-event-during-parse.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-event-during-parse.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-event-during-parse.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-event-during-parse.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-attached-in-event.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-attached-in-event.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-attached-in-event.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-attached-in-event.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-iframe.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-iframe.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-iframe.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-onerror.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-onerror.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-onerror.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events-onerror.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.dedicatedworker.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.dedicatedworker.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.dedicatedworker.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.dedicatedworker.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.serviceworker.https.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.serviceworker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.serviceworker.https.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.serviceworker.https.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.sharedworker.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.sharedworker.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.sharedworker.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.sharedworker.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-resolution-order.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-resolution-order.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-resolution-order.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-resolution-order.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/support/promise-access-control.py b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/support/promise-access-control.py similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/support/promise-access-control.py rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/support/promise-access-control.py diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/support/promise-rejection-events.js b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/support/promise-rejection-events.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/support/promise-rejection-events.js rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/support/promise-rejection-events.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-1.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-1.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-1.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-1.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-2.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-2.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-2.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-2.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-3.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-3.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-3.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-3.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-4.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-4.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-4.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-4.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-5.html b/tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-5.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-5.html rename to tests/wpt/tests/html/webappapis/scripting/processing-model-2/window-onerror-with-cross-frame-event-listeners-5.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/reporterror-cross-realm-method.html b/tests/wpt/tests/html/webappapis/scripting/reporterror-cross-realm-method.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/reporterror-cross-realm-method.html rename to tests/wpt/tests/html/webappapis/scripting/reporterror-cross-realm-method.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/reporterror-in-detached-window-crash.html b/tests/wpt/tests/html/webappapis/scripting/reporterror-in-detached-window-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/reporterror-in-detached-window-crash.html rename to tests/wpt/tests/html/webappapis/scripting/reporterror-in-detached-window-crash.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/reporterror.any.js b/tests/wpt/tests/html/webappapis/scripting/reporterror.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/scripting/reporterror.any.js rename to tests/wpt/tests/html/webappapis/scripting/reporterror.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests-harness.js b/tests/wpt/tests/html/webappapis/structured-clone/structured-clone-battery-of-tests-harness.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests-harness.js rename to tests/wpt/tests/html/webappapis/structured-clone/structured-clone-battery-of-tests-harness.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests-with-transferables.js b/tests/wpt/tests/html/webappapis/structured-clone/structured-clone-battery-of-tests-with-transferables.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests-with-transferables.js rename to tests/wpt/tests/html/webappapis/structured-clone/structured-clone-battery-of-tests-with-transferables.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests.js b/tests/wpt/tests/html/webappapis/structured-clone/structured-clone-battery-of-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests.js rename to tests/wpt/tests/html/webappapis/structured-clone/structured-clone-battery-of-tests.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-cross-realm-method.html b/tests/wpt/tests/html/webappapis/structured-clone/structured-clone-cross-realm-method.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-cross-realm-method.html rename to tests/wpt/tests/html/webappapis/structured-clone/structured-clone-cross-realm-method.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-detached-window-crash.html b/tests/wpt/tests/html/webappapis/structured-clone/structured-clone-detached-window-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-detached-window-crash.html rename to tests/wpt/tests/html/webappapis/structured-clone/structured-clone-detached-window-crash.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone.any.js b/tests/wpt/tests/html/webappapis/structured-clone/structured-clone.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone.any.js rename to tests/wpt/tests/html/webappapis/structured-clone/structured-clone.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/clientinformation.window.js b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/clientinformation.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/clientinformation.window.js rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/clientinformation.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/get-navigatorlanguage-manual.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/get-navigatorlanguage-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/get-navigatorlanguage-manual.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/get-navigatorlanguage-manual.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/historical.https.window.js b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/historical.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/historical.https.window.js rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/historical.https.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-indexed.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-indexed.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-indexed.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-indexed.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator.any.js b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator.any.js rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.tentative.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.tentative.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.tentative.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigatorcookies-cookieenabled-false-manual.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigatorcookies-cookieenabled-false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigatorcookies-cookieenabled-false-manual.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigatorcookies-cookieenabled-false-manual.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigatorcookies-cookieenabled-true.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigatorcookies-cookieenabled-true.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigatorcookies-cookieenabled-true.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigatorcookies-cookieenabled-true.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigatorlanguage.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigatorlanguage.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigatorlanguage.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigatorlanguage.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/per-global.window.js b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/per-global.window.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/per-global.window.js rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/per-global.window.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/plugins-and-mimetypes.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/plugins-and-mimetypes.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/plugins-and-mimetypes.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/plugins-and-mimetypes.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-fragment-manual.https.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-fragment-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-fragment-manual.https.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-fragment-manual.https.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-fragment-nosw-manual.https.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-fragment-nosw-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-fragment-nosw-manual.https.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-fragment-nosw-manual.https.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-path-manual.https.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-path-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-path-manual.https.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-path-manual.https.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-query-manual.https.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-query-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-query-manual.https.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-query-manual.https.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-query-nosw-manual.https.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-query-nosw-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-query-nosw-manual.https.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol-handler-query-nosw-manual.https.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/resources/handler-sw.js b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/resources/handler-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/resources/handler-sw.js rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/resources/handler-sw.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/resources/handler-tools.js b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/resources/handler-tools.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/resources/handler-tools.js rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/resources/handler-tools.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/resources/handler.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/resources/handler.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/resources/handler.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/resources/handler.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/secure_context.html b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/secure_context.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/secure_context.html rename to tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/secure_context.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/the-windoworworkerglobalscope-mixin/README.md b/tests/wpt/tests/html/webappapis/the-windoworworkerglobalscope-mixin/README.md similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/the-windoworworkerglobalscope-mixin/README.md rename to tests/wpt/tests/html/webappapis/the-windoworworkerglobalscope-mixin/README.md diff --git a/tests/wpt/web-platform-tests/html/webappapis/the-windoworworkerglobalscope-mixin/Worker_Self_Origin.html b/tests/wpt/tests/html/webappapis/the-windoworworkerglobalscope-mixin/Worker_Self_Origin.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/the-windoworworkerglobalscope-mixin/Worker_Self_Origin.html rename to tests/wpt/tests/html/webappapis/the-windoworworkerglobalscope-mixin/Worker_Self_Origin.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/the-windoworworkerglobalscope-mixin/support/WorkerSelfOriginSharedWorker.js b/tests/wpt/tests/html/webappapis/the-windoworworkerglobalscope-mixin/support/WorkerSelfOriginSharedWorker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/the-windoworworkerglobalscope-mixin/support/WorkerSelfOriginSharedWorker.js rename to tests/wpt/tests/html/webappapis/the-windoworworkerglobalscope-mixin/support/WorkerSelfOriginSharedWorker.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/the-windoworworkerglobalscope-mixin/support/WorkerSelfOriginWorker.js b/tests/wpt/tests/html/webappapis/the-windoworworkerglobalscope-mixin/support/WorkerSelfOriginWorker.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/the-windoworworkerglobalscope-mixin/support/WorkerSelfOriginWorker.js rename to tests/wpt/tests/html/webappapis/the-windoworworkerglobalscope-mixin/support/WorkerSelfOriginWorker.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/timers/clearinterval-from-callback.any.js b/tests/wpt/tests/html/webappapis/timers/clearinterval-from-callback.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/timers/clearinterval-from-callback.any.js rename to tests/wpt/tests/html/webappapis/timers/clearinterval-from-callback.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/timers/cleartimeout-clearinterval.any.js b/tests/wpt/tests/html/webappapis/timers/cleartimeout-clearinterval.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/timers/cleartimeout-clearinterval.any.js rename to tests/wpt/tests/html/webappapis/timers/cleartimeout-clearinterval.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/timers/evil-spec-example.any.js b/tests/wpt/tests/html/webappapis/timers/evil-spec-example.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/timers/evil-spec-example.any.js rename to tests/wpt/tests/html/webappapis/timers/evil-spec-example.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/timers/missing-timeout-setinterval.any.js b/tests/wpt/tests/html/webappapis/timers/missing-timeout-setinterval.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/timers/missing-timeout-setinterval.any.js rename to tests/wpt/tests/html/webappapis/timers/missing-timeout-setinterval.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/timers/negative-setinterval.any.js b/tests/wpt/tests/html/webappapis/timers/negative-setinterval.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/timers/negative-setinterval.any.js rename to tests/wpt/tests/html/webappapis/timers/negative-setinterval.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/timers/negative-settimeout.any.js b/tests/wpt/tests/html/webappapis/timers/negative-settimeout.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/timers/negative-settimeout.any.js rename to tests/wpt/tests/html/webappapis/timers/negative-settimeout.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/timers/setinterval-cross-realm-callback-report-exception.html b/tests/wpt/tests/html/webappapis/timers/setinterval-cross-realm-callback-report-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/timers/setinterval-cross-realm-callback-report-exception.html rename to tests/wpt/tests/html/webappapis/timers/setinterval-cross-realm-callback-report-exception.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/timers/settimeout-cross-realm-callback-report-exception.html b/tests/wpt/tests/html/webappapis/timers/settimeout-cross-realm-callback-report-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/timers/settimeout-cross-realm-callback-report-exception.html rename to tests/wpt/tests/html/webappapis/timers/settimeout-cross-realm-callback-report-exception.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/timers/type-long-setinterval.any.js b/tests/wpt/tests/html/webappapis/timers/type-long-setinterval.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/timers/type-long-setinterval.any.js rename to tests/wpt/tests/html/webappapis/timers/type-long-setinterval.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/timers/type-long-settimeout.any.js b/tests/wpt/tests/html/webappapis/timers/type-long-settimeout.any.js similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/timers/type-long-settimeout.any.js rename to tests/wpt/tests/html/webappapis/timers/type-long-settimeout.any.js diff --git a/tests/wpt/web-platform-tests/html/webappapis/update-rendering/child-document-raf-order.html b/tests/wpt/tests/html/webappapis/update-rendering/child-document-raf-order.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/update-rendering/child-document-raf-order.html rename to tests/wpt/tests/html/webappapis/update-rendering/child-document-raf-order.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/confirm-different-origin-frame.sub.html b/tests/wpt/tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/confirm-different-origin-frame.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/confirm-different-origin-frame.sub.html rename to tests/wpt/tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/confirm-different-origin-frame.sub.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/prompt-different-origin-frame.sub.html b/tests/wpt/tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/prompt-different-origin-frame.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/prompt-different-origin-frame.sub.html rename to tests/wpt/tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/prompt-different-origin-frame.sub.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/support/confirm.html b/tests/wpt/tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/support/confirm.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/support/confirm.html rename to tests/wpt/tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/support/confirm.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/support/prompt.html b/tests/wpt/tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/support/prompt.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/support/prompt.html rename to tests/wpt/tests/html/webappapis/user-prompts/cannot-show-simple-dialogs/support/prompt.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/user-prompts/newline-normalization-manual.html b/tests/wpt/tests/html/webappapis/user-prompts/newline-normalization-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/user-prompts/newline-normalization-manual.html rename to tests/wpt/tests/html/webappapis/user-prompts/newline-normalization-manual.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/user-prompts/print-during-beforeunload.html b/tests/wpt/tests/html/webappapis/user-prompts/print-during-beforeunload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/user-prompts/print-during-beforeunload.html rename to tests/wpt/tests/html/webappapis/user-prompts/print-during-beforeunload.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/user-prompts/print-during-unload.html b/tests/wpt/tests/html/webappapis/user-prompts/print-during-unload.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/user-prompts/print-during-unload.html rename to tests/wpt/tests/html/webappapis/user-prompts/print-during-unload.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/user-prompts/print-in-detached-frame.html b/tests/wpt/tests/html/webappapis/user-prompts/print-in-detached-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/user-prompts/print-in-detached-frame.html rename to tests/wpt/tests/html/webappapis/user-prompts/print-in-detached-frame.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/user-prompts/print-manual.html b/tests/wpt/tests/html/webappapis/user-prompts/print-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/user-prompts/print-manual.html rename to tests/wpt/tests/html/webappapis/user-prompts/print-manual.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/user-prompts/resources/destination.html b/tests/wpt/tests/html/webappapis/user-prompts/resources/destination.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/user-prompts/resources/destination.html rename to tests/wpt/tests/html/webappapis/user-prompts/resources/destination.html diff --git a/tests/wpt/web-platform-tests/html/webappapis/user-prompts/resources/print-during-event.sub.html b/tests/wpt/tests/html/webappapis/user-prompts/resources/print-during-event.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/html/webappapis/user-prompts/resources/print-during-event.sub.html rename to tests/wpt/tests/html/webappapis/user-prompts/resources/print-during-event.sub.html diff --git a/tests/wpt/web-platform-tests/https-upgrades/resources/pass.html b/tests/wpt/tests/https-upgrades/resources/pass.html similarity index 100% rename from tests/wpt/web-platform-tests/https-upgrades/resources/pass.html rename to tests/wpt/tests/https-upgrades/resources/pass.html diff --git a/tests/wpt/web-platform-tests/https-upgrades/tentative/fallback.sub.html b/tests/wpt/tests/https-upgrades/tentative/fallback.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/https-upgrades/tentative/fallback.sub.html rename to tests/wpt/tests/https-upgrades/tentative/fallback.sub.html diff --git a/tests/wpt/web-platform-tests/https-upgrades/tentative/upgrade.https.sub.html b/tests/wpt/tests/https-upgrades/tentative/upgrade.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/https-upgrades/tentative/upgrade.https.sub.html rename to tests/wpt/tests/https-upgrades/tentative/upgrade.https.sub.html diff --git a/tests/wpt/web-platform-tests/idle-detection/META.yml b/tests/wpt/tests/idle-detection/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/META.yml rename to tests/wpt/tests/idle-detection/META.yml diff --git a/tests/wpt/web-platform-tests/idle-detection/basics.tentative.https.window.js b/tests/wpt/tests/idle-detection/basics.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/basics.tentative.https.window.js rename to tests/wpt/tests/idle-detection/basics.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/idle-detection/idle-detection-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/tests/idle-detection/idle-detection-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/idle-detection-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html rename to tests/wpt/tests/idle-detection/idle-detection-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html diff --git a/tests/wpt/web-platform-tests/idle-detection/idle-detection-allowed-by-permissions-policy-attribute.https.sub.html b/tests/wpt/tests/idle-detection/idle-detection-allowed-by-permissions-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/idle-detection-allowed-by-permissions-policy-attribute.https.sub.html rename to tests/wpt/tests/idle-detection/idle-detection-allowed-by-permissions-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/idle-detection/idle-detection-allowed-by-permissions-policy.https.sub.html b/tests/wpt/tests/idle-detection/idle-detection-allowed-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/idle-detection-allowed-by-permissions-policy.https.sub.html rename to tests/wpt/tests/idle-detection/idle-detection-allowed-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/idle-detection/idle-detection-allowed-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/idle-detection/idle-detection-allowed-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/idle-detection-allowed-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/idle-detection/idle-detection-allowed-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/idle-detection/idle-detection-default-permissions-policy.https.sub.html b/tests/wpt/tests/idle-detection/idle-detection-default-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/idle-detection-default-permissions-policy.https.sub.html rename to tests/wpt/tests/idle-detection/idle-detection-default-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/idle-detection/idle-detection-disabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/idle-detection/idle-detection-disabled-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/idle-detection-disabled-by-permissions-policy.https.sub.html rename to tests/wpt/tests/idle-detection/idle-detection-disabled-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/idle-detection/idle-detection-disabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/idle-detection/idle-detection-disabled-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/idle-detection-disabled-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/idle-detection/idle-detection-disabled-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/idle-detection/idle-permission.tentative.https.window.js b/tests/wpt/tests/idle-detection/idle-permission.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/idle-permission.tentative.https.window.js rename to tests/wpt/tests/idle-detection/idle-permission.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/idle-detection/idlharness-worker.https.window.js b/tests/wpt/tests/idle-detection/idlharness-worker.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/idlharness-worker.https.window.js rename to tests/wpt/tests/idle-detection/idlharness-worker.https.window.js diff --git a/tests/wpt/web-platform-tests/idle-detection/idlharness.https.window.js b/tests/wpt/tests/idle-detection/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/idlharness.https.window.js rename to tests/wpt/tests/idle-detection/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/idle-detection/interceptor.https.html b/tests/wpt/tests/idle-detection/interceptor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/interceptor.https.html rename to tests/wpt/tests/idle-detection/interceptor.https.html diff --git a/tests/wpt/web-platform-tests/idle-detection/page-visibility.https.html b/tests/wpt/tests/idle-detection/page-visibility.https.html similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/page-visibility.https.html rename to tests/wpt/tests/idle-detection/page-visibility.https.html diff --git a/tests/wpt/web-platform-tests/idle-detection/resources/idle-detection-allowed-by-permissions-policy-worker.js b/tests/wpt/tests/idle-detection/resources/idle-detection-allowed-by-permissions-policy-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/resources/idle-detection-allowed-by-permissions-policy-worker.js rename to tests/wpt/tests/idle-detection/resources/idle-detection-allowed-by-permissions-policy-worker.js diff --git a/tests/wpt/web-platform-tests/idle-detection/resources/idle-detection-disabled-by-permissions-policy-worker.js b/tests/wpt/tests/idle-detection/resources/idle-detection-disabled-by-permissions-policy-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/resources/idle-detection-disabled-by-permissions-policy-worker.js rename to tests/wpt/tests/idle-detection/resources/idle-detection-disabled-by-permissions-policy-worker.js diff --git a/tests/wpt/web-platform-tests/idle-detection/resources/idle-detection-helper.js b/tests/wpt/tests/idle-detection/resources/idle-detection-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/resources/idle-detection-helper.js rename to tests/wpt/tests/idle-detection/resources/idle-detection-helper.js diff --git a/tests/wpt/web-platform-tests/idle-detection/resources/idlharness-worker.js b/tests/wpt/tests/idle-detection/resources/idlharness-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/idle-detection/resources/idlharness-worker.js rename to tests/wpt/tests/idle-detection/resources/idlharness-worker.js diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/META.yml b/tests/wpt/tests/imagebitmap-renderingcontext/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/META.yml rename to tests/wpt/tests/imagebitmap-renderingcontext/META.yml diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/bitmaprenderer-as-imagesource.html b/tests/wpt/tests/imagebitmap-renderingcontext/bitmaprenderer-as-imagesource.html similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/bitmaprenderer-as-imagesource.html rename to tests/wpt/tests/imagebitmap-renderingcontext/bitmaprenderer-as-imagesource.html diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/context-creation-offscreen-with-alpha.html b/tests/wpt/tests/imagebitmap-renderingcontext/context-creation-offscreen-with-alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/context-creation-offscreen-with-alpha.html rename to tests/wpt/tests/imagebitmap-renderingcontext/context-creation-offscreen-with-alpha.html diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/context-creation-offscreen.html b/tests/wpt/tests/imagebitmap-renderingcontext/context-creation-offscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/context-creation-offscreen.html rename to tests/wpt/tests/imagebitmap-renderingcontext/context-creation-offscreen.html diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/context-creation-with-alpha.html b/tests/wpt/tests/imagebitmap-renderingcontext/context-creation-with-alpha.html similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/context-creation-with-alpha.html rename to tests/wpt/tests/imagebitmap-renderingcontext/context-creation-with-alpha.html diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/context-creation.html b/tests/wpt/tests/imagebitmap-renderingcontext/context-creation.html similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/context-creation.html rename to tests/wpt/tests/imagebitmap-renderingcontext/context-creation.html diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/context-preserves-canvas.html b/tests/wpt/tests/imagebitmap-renderingcontext/context-preserves-canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/context-preserves-canvas.html rename to tests/wpt/tests/imagebitmap-renderingcontext/context-preserves-canvas.html diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/toBlob-origin-clean-offscreen.sub.html b/tests/wpt/tests/imagebitmap-renderingcontext/toBlob-origin-clean-offscreen.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/toBlob-origin-clean-offscreen.sub.html rename to tests/wpt/tests/imagebitmap-renderingcontext/toBlob-origin-clean-offscreen.sub.html diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/transferFromImageBitmap-ToBlob-offscreen.html b/tests/wpt/tests/imagebitmap-renderingcontext/transferFromImageBitmap-ToBlob-offscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/transferFromImageBitmap-ToBlob-offscreen.html rename to tests/wpt/tests/imagebitmap-renderingcontext/transferFromImageBitmap-ToBlob-offscreen.html diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/transferFromImageBitmap-ToBlob-transferControlToOffscreen.html b/tests/wpt/tests/imagebitmap-renderingcontext/transferFromImageBitmap-ToBlob-transferControlToOffscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/transferFromImageBitmap-ToBlob-transferControlToOffscreen.html rename to tests/wpt/tests/imagebitmap-renderingcontext/transferFromImageBitmap-ToBlob-transferControlToOffscreen.html diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/transferFromImageBitmap-TransferToImageBitmap-offscreen.html b/tests/wpt/tests/imagebitmap-renderingcontext/transferFromImageBitmap-TransferToImageBitmap-offscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/transferFromImageBitmap-TransferToImageBitmap-offscreen.html rename to tests/wpt/tests/imagebitmap-renderingcontext/transferFromImageBitmap-TransferToImageBitmap-offscreen.html diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/transferFromImageBitmap-TransferToImageBitmap-transferControlToOffscreen.html b/tests/wpt/tests/imagebitmap-renderingcontext/transferFromImageBitmap-TransferToImageBitmap-transferControlToOffscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/transferFromImageBitmap-TransferToImageBitmap-transferControlToOffscreen.html rename to tests/wpt/tests/imagebitmap-renderingcontext/transferFromImageBitmap-TransferToImageBitmap-transferControlToOffscreen.html diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/transferFromImageBitmap-detached.html b/tests/wpt/tests/imagebitmap-renderingcontext/transferFromImageBitmap-detached.html similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/transferFromImageBitmap-detached.html rename to tests/wpt/tests/imagebitmap-renderingcontext/transferFromImageBitmap-detached.html diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/transferFromImageBitmap-null-offscreen.html b/tests/wpt/tests/imagebitmap-renderingcontext/transferFromImageBitmap-null-offscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/transferFromImageBitmap-null-offscreen.html rename to tests/wpt/tests/imagebitmap-renderingcontext/transferFromImageBitmap-null-offscreen.html diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/transferFromImageBitmap-null.html b/tests/wpt/tests/imagebitmap-renderingcontext/transferFromImageBitmap-null.html similarity index 100% rename from tests/wpt/web-platform-tests/imagebitmap-renderingcontext/transferFromImageBitmap-null.html rename to tests/wpt/tests/imagebitmap-renderingcontext/transferFromImageBitmap-null.html diff --git a/tests/wpt/web-platform-tests/images/100px-green-rect.svg b/tests/wpt/tests/images/100px-green-rect.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/100px-green-rect.svg rename to tests/wpt/tests/images/100px-green-rect.svg diff --git a/tests/wpt/web-platform-tests/images/META.yml b/tests/wpt/tests/images/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/images/META.yml rename to tests/wpt/tests/images/META.yml diff --git a/tests/wpt/web-platform-tests/images/README.md b/tests/wpt/tests/images/README.md similarity index 100% rename from tests/wpt/web-platform-tests/images/README.md rename to tests/wpt/tests/images/README.md diff --git a/tests/wpt/web-platform-tests/images/anim-gr.gif b/tests/wpt/tests/images/anim-gr.gif similarity index 100% rename from tests/wpt/web-platform-tests/images/anim-gr.gif rename to tests/wpt/tests/images/anim-gr.gif diff --git a/tests/wpt/web-platform-tests/images/anim-gr.png b/tests/wpt/tests/images/anim-gr.png similarity index 100% rename from tests/wpt/web-platform-tests/images/anim-gr.png rename to tests/wpt/tests/images/anim-gr.png diff --git a/tests/wpt/web-platform-tests/images/anim-tao.png b/tests/wpt/tests/images/anim-tao.png similarity index 100% rename from tests/wpt/web-platform-tests/images/anim-tao.png rename to tests/wpt/tests/images/anim-tao.png diff --git a/tests/wpt/web-platform-tests/images/anim-tao.png.headers b/tests/wpt/tests/images/anim-tao.png.headers similarity index 100% rename from tests/wpt/web-platform-tests/images/anim-tao.png.headers rename to tests/wpt/tests/images/anim-tao.png.headers diff --git a/tests/wpt/web-platform-tests/images/animated-avif.avif b/tests/wpt/tests/images/animated-avif.avif similarity index 100% rename from tests/wpt/web-platform-tests/images/animated-avif.avif rename to tests/wpt/tests/images/animated-avif.avif diff --git a/tests/wpt/web-platform-tests/images/apng.png b/tests/wpt/tests/images/apng.png similarity index 100% rename from tests/wpt/web-platform-tests/images/apng.png rename to tests/wpt/tests/images/apng.png diff --git a/tests/wpt/web-platform-tests/images/arrow-oriented-upright.jpg b/tests/wpt/tests/images/arrow-oriented-upright.jpg similarity index 100% rename from tests/wpt/web-platform-tests/images/arrow-oriented-upright.jpg rename to tests/wpt/tests/images/arrow-oriented-upright.jpg diff --git a/tests/wpt/web-platform-tests/images/background.png b/tests/wpt/tests/images/background.png similarity index 100% rename from tests/wpt/web-platform-tests/images/background.png rename to tests/wpt/tests/images/background.png diff --git a/tests/wpt/web-platform-tests/images/black-rectangle.png b/tests/wpt/tests/images/black-rectangle.png similarity index 100% rename from tests/wpt/web-platform-tests/images/black-rectangle.png rename to tests/wpt/tests/images/black-rectangle.png diff --git a/tests/wpt/web-platform-tests/images/blue-area.png b/tests/wpt/tests/images/blue-area.png similarity index 100% rename from tests/wpt/web-platform-tests/images/blue-area.png rename to tests/wpt/tests/images/blue-area.png diff --git a/tests/wpt/web-platform-tests/images/blue-border.png b/tests/wpt/tests/images/blue-border.png similarity index 100% rename from tests/wpt/web-platform-tests/images/blue-border.png rename to tests/wpt/tests/images/blue-border.png diff --git a/tests/wpt/web-platform-tests/images/blue-png-cachable.py b/tests/wpt/tests/images/blue-png-cachable.py similarity index 100% rename from tests/wpt/web-platform-tests/images/blue-png-cachable.py rename to tests/wpt/tests/images/blue-png-cachable.py diff --git a/tests/wpt/web-platform-tests/images/blue.png b/tests/wpt/tests/images/blue.png similarity index 100% rename from tests/wpt/web-platform-tests/images/blue.png rename to tests/wpt/tests/images/blue.png diff --git a/tests/wpt/web-platform-tests/images/blue96x96.png b/tests/wpt/tests/images/blue96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/images/blue96x96.png rename to tests/wpt/tests/images/blue96x96.png diff --git a/tests/wpt/web-platform-tests/images/broken.png b/tests/wpt/tests/images/broken.png similarity index 100% rename from tests/wpt/web-platform-tests/images/broken.png rename to tests/wpt/tests/images/broken.png diff --git a/tests/wpt/web-platform-tests/images/clear-100x50.png b/tests/wpt/tests/images/clear-100x50.png similarity index 100% rename from tests/wpt/web-platform-tests/images/clear-100x50.png rename to tests/wpt/tests/images/clear-100x50.png diff --git a/tests/wpt/web-platform-tests/images/colors.svg b/tests/wpt/tests/images/colors.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/colors.svg rename to tests/wpt/tests/images/colors.svg diff --git a/tests/wpt/web-platform-tests/images/fail.gif b/tests/wpt/tests/images/fail.gif similarity index 100% rename from tests/wpt/web-platform-tests/images/fail.gif rename to tests/wpt/tests/images/fail.gif diff --git a/tests/wpt/web-platform-tests/images/fyi-logo/fyi_color.svg b/tests/wpt/tests/images/fyi-logo/fyi_color.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/fyi-logo/fyi_color.svg rename to tests/wpt/tests/images/fyi-logo/fyi_color.svg diff --git a/tests/wpt/web-platform-tests/images/fyi-logo/fyi_color_bg.svg b/tests/wpt/tests/images/fyi-logo/fyi_color_bg.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/fyi-logo/fyi_color_bg.svg rename to tests/wpt/tests/images/fyi-logo/fyi_color_bg.svg diff --git a/tests/wpt/web-platform-tests/images/fyi-logo/fyi_monochromatic.svg b/tests/wpt/tests/images/fyi-logo/fyi_monochromatic.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/fyi-logo/fyi_monochromatic.svg rename to tests/wpt/tests/images/fyi-logo/fyi_monochromatic.svg diff --git a/tests/wpt/web-platform-tests/images/fyi-logo/fyi_monochromatic_bg.svg b/tests/wpt/tests/images/fyi-logo/fyi_monochromatic_bg.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/fyi-logo/fyi_monochromatic_bg.svg rename to tests/wpt/tests/images/fyi-logo/fyi_monochromatic_bg.svg diff --git a/tests/wpt/web-platform-tests/images/ggrr-256x256.png b/tests/wpt/tests/images/ggrr-256x256.png similarity index 100% rename from tests/wpt/web-platform-tests/images/ggrr-256x256.png rename to tests/wpt/tests/images/ggrr-256x256.png diff --git a/tests/wpt/web-platform-tests/images/green-100x50.png b/tests/wpt/tests/images/green-100x50.png similarity index 100% rename from tests/wpt/web-platform-tests/images/green-100x50.png rename to tests/wpt/tests/images/green-100x50.png diff --git a/tests/wpt/web-platform-tests/images/green-16x16.png b/tests/wpt/tests/images/green-16x16.png similarity index 100% rename from tests/wpt/web-platform-tests/images/green-16x16.png rename to tests/wpt/tests/images/green-16x16.png diff --git a/tests/wpt/web-platform-tests/images/green-1x1.png b/tests/wpt/tests/images/green-1x1.png similarity index 100% rename from tests/wpt/web-platform-tests/images/green-1x1.png rename to tests/wpt/tests/images/green-1x1.png diff --git a/tests/wpt/web-platform-tests/images/green-256x256.png b/tests/wpt/tests/images/green-256x256.png similarity index 100% rename from tests/wpt/web-platform-tests/images/green-256x256.png rename to tests/wpt/tests/images/green-256x256.png diff --git a/tests/wpt/web-platform-tests/images/green-2x2.png b/tests/wpt/tests/images/green-2x2.png similarity index 100% rename from tests/wpt/web-platform-tests/images/green-2x2.png rename to tests/wpt/tests/images/green-2x2.png diff --git a/tests/wpt/web-platform-tests/images/green-96x96.svg b/tests/wpt/tests/images/green-96x96.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/green-96x96.svg rename to tests/wpt/tests/images/green-96x96.svg diff --git a/tests/wpt/web-platform-tests/images/green.avif b/tests/wpt/tests/images/green.avif similarity index 100% rename from tests/wpt/web-platform-tests/images/green.avif rename to tests/wpt/tests/images/green.avif diff --git a/tests/wpt/web-platform-tests/images/green.png b/tests/wpt/tests/images/green.png similarity index 100% rename from tests/wpt/web-platform-tests/images/green.png rename to tests/wpt/tests/images/green.png diff --git a/tests/wpt/web-platform-tests/images/green.svg b/tests/wpt/tests/images/green.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/green.svg rename to tests/wpt/tests/images/green.svg diff --git a/tests/wpt/web-platform-tests/images/grgr-256x256.png b/tests/wpt/tests/images/grgr-256x256.png similarity index 100% rename from tests/wpt/web-platform-tests/images/grgr-256x256.png rename to tests/wpt/tests/images/grgr-256x256.png diff --git a/tests/wpt/web-platform-tests/images/lcp-100x50-alt.png b/tests/wpt/tests/images/lcp-100x50-alt.png similarity index 100% rename from tests/wpt/web-platform-tests/images/lcp-100x50-alt.png rename to tests/wpt/tests/images/lcp-100x50-alt.png diff --git a/tests/wpt/web-platform-tests/images/lcp-100x50.png b/tests/wpt/tests/images/lcp-100x50.png similarity index 100% rename from tests/wpt/web-platform-tests/images/lcp-100x50.png rename to tests/wpt/tests/images/lcp-100x50.png diff --git a/tests/wpt/web-platform-tests/images/lcp-133x106.png b/tests/wpt/tests/images/lcp-133x106.png similarity index 100% rename from tests/wpt/web-platform-tests/images/lcp-133x106.png rename to tests/wpt/tests/images/lcp-133x106.png diff --git a/tests/wpt/web-platform-tests/images/lcp-16x16.png b/tests/wpt/tests/images/lcp-16x16.png similarity index 100% rename from tests/wpt/web-platform-tests/images/lcp-16x16.png rename to tests/wpt/tests/images/lcp-16x16.png diff --git a/tests/wpt/web-platform-tests/images/lcp-1x1.png b/tests/wpt/tests/images/lcp-1x1.png similarity index 100% rename from tests/wpt/web-platform-tests/images/lcp-1x1.png rename to tests/wpt/tests/images/lcp-1x1.png diff --git a/tests/wpt/web-platform-tests/images/lcp-256x256.png b/tests/wpt/tests/images/lcp-256x256.png similarity index 100% rename from tests/wpt/web-platform-tests/images/lcp-256x256.png rename to tests/wpt/tests/images/lcp-256x256.png diff --git a/tests/wpt/web-platform-tests/images/lcp-2x2.png b/tests/wpt/tests/images/lcp-2x2.png similarity index 100% rename from tests/wpt/web-platform-tests/images/lcp-2x2.png rename to tests/wpt/tests/images/lcp-2x2.png diff --git a/tests/wpt/web-platform-tests/images/lcp-96x96.png b/tests/wpt/tests/images/lcp-96x96.png similarity index 100% rename from tests/wpt/web-platform-tests/images/lcp-96x96.png rename to tests/wpt/tests/images/lcp-96x96.png diff --git a/tests/wpt/web-platform-tests/images/movie_300_frame_0.png b/tests/wpt/tests/images/movie_300_frame_0.png similarity index 100% rename from tests/wpt/web-platform-tests/images/movie_300_frame_0.png rename to tests/wpt/tests/images/movie_300_frame_0.png diff --git a/tests/wpt/web-platform-tests/images/pattern-nosize.svg b/tests/wpt/tests/images/pattern-nosize.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/pattern-nosize.svg rename to tests/wpt/tests/images/pattern-nosize.svg diff --git a/tests/wpt/web-platform-tests/images/pattern.mp4 b/tests/wpt/tests/images/pattern.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/images/pattern.mp4 rename to tests/wpt/tests/images/pattern.mp4 diff --git a/tests/wpt/web-platform-tests/images/pattern.ogv b/tests/wpt/tests/images/pattern.ogv similarity index 100% rename from tests/wpt/web-platform-tests/images/pattern.ogv rename to tests/wpt/tests/images/pattern.ogv diff --git a/tests/wpt/web-platform-tests/images/pattern.png b/tests/wpt/tests/images/pattern.png similarity index 100% rename from tests/wpt/web-platform-tests/images/pattern.png rename to tests/wpt/tests/images/pattern.png diff --git a/tests/wpt/web-platform-tests/images/pattern.svg b/tests/wpt/tests/images/pattern.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/pattern.svg rename to tests/wpt/tests/images/pattern.svg diff --git a/tests/wpt/web-platform-tests/images/pattern.webm b/tests/wpt/tests/images/pattern.webm similarity index 100% rename from tests/wpt/web-platform-tests/images/pattern.webm rename to tests/wpt/tests/images/pattern.webm diff --git a/tests/wpt/web-platform-tests/images/red-16x16.png b/tests/wpt/tests/images/red-16x16.png similarity index 100% rename from tests/wpt/web-platform-tests/images/red-16x16.png rename to tests/wpt/tests/images/red-16x16.png diff --git a/tests/wpt/web-platform-tests/images/red-zeroheight.svg b/tests/wpt/tests/images/red-zeroheight.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/red-zeroheight.svg rename to tests/wpt/tests/images/red-zeroheight.svg diff --git a/tests/wpt/web-platform-tests/images/red-zerosize.svg b/tests/wpt/tests/images/red-zerosize.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/red-zerosize.svg rename to tests/wpt/tests/images/red-zerosize.svg diff --git a/tests/wpt/web-platform-tests/images/red-zerowidth.svg b/tests/wpt/tests/images/red-zerowidth.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/red-zerowidth.svg rename to tests/wpt/tests/images/red-zerowidth.svg diff --git a/tests/wpt/web-platform-tests/images/red.png b/tests/wpt/tests/images/red.png similarity index 100% rename from tests/wpt/web-platform-tests/images/red.png rename to tests/wpt/tests/images/red.png diff --git a/tests/wpt/web-platform-tests/images/redtransparent.png b/tests/wpt/tests/images/redtransparent.png similarity index 100% rename from tests/wpt/web-platform-tests/images/redtransparent.png rename to tests/wpt/tests/images/redtransparent.png diff --git a/tests/wpt/web-platform-tests/images/rgrg-256x256.png b/tests/wpt/tests/images/rgrg-256x256.png similarity index 100% rename from tests/wpt/web-platform-tests/images/rgrg-256x256.png rename to tests/wpt/tests/images/rgrg-256x256.png diff --git a/tests/wpt/web-platform-tests/images/rrgg-256x256.png b/tests/wpt/tests/images/rrgg-256x256.png similarity index 100% rename from tests/wpt/web-platform-tests/images/rrgg-256x256.png rename to tests/wpt/tests/images/rrgg-256x256.png diff --git a/tests/wpt/web-platform-tests/images/smiley.png b/tests/wpt/tests/images/smiley.png similarity index 100% rename from tests/wpt/web-platform-tests/images/smiley.png rename to tests/wpt/tests/images/smiley.png diff --git a/tests/wpt/web-platform-tests/images/smiley.png.headers b/tests/wpt/tests/images/smiley.png.headers similarity index 100% rename from tests/wpt/web-platform-tests/images/smiley.png.headers rename to tests/wpt/tests/images/smiley.png.headers diff --git a/tests/wpt/web-platform-tests/images/threecolors.png b/tests/wpt/tests/images/threecolors.png similarity index 100% rename from tests/wpt/web-platform-tests/images/threecolors.png rename to tests/wpt/tests/images/threecolors.png diff --git a/tests/wpt/web-platform-tests/images/transparent.png b/tests/wpt/tests/images/transparent.png similarity index 100% rename from tests/wpt/web-platform-tests/images/transparent.png rename to tests/wpt/tests/images/transparent.png diff --git a/tests/wpt/web-platform-tests/images/transparent50.png b/tests/wpt/tests/images/transparent50.png similarity index 100% rename from tests/wpt/web-platform-tests/images/transparent50.png rename to tests/wpt/tests/images/transparent50.png diff --git a/tests/wpt/web-platform-tests/images/undecodable.png b/tests/wpt/tests/images/undecodable.png similarity index 100% rename from tests/wpt/web-platform-tests/images/undecodable.png rename to tests/wpt/tests/images/undecodable.png diff --git a/tests/wpt/web-platform-tests/images/webp-animated.webp b/tests/wpt/tests/images/webp-animated.webp similarity index 100% rename from tests/wpt/web-platform-tests/images/webp-animated.webp rename to tests/wpt/tests/images/webp-animated.webp diff --git a/tests/wpt/web-platform-tests/images/wide-gamut-pattern.png b/tests/wpt/tests/images/wide-gamut-pattern.png similarity index 100% rename from tests/wpt/web-platform-tests/images/wide-gamut-pattern.png rename to tests/wpt/tests/images/wide-gamut-pattern.png diff --git a/tests/wpt/web-platform-tests/images/wpt-logo/wpt-logo-darkblue-bg.svg b/tests/wpt/tests/images/wpt-logo/wpt-logo-darkblue-bg.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/wpt-logo/wpt-logo-darkblue-bg.svg rename to tests/wpt/tests/images/wpt-logo/wpt-logo-darkblue-bg.svg diff --git a/tests/wpt/web-platform-tests/images/wpt-logo/wpt-logo-darkblue.svg b/tests/wpt/tests/images/wpt-logo/wpt-logo-darkblue.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/wpt-logo/wpt-logo-darkblue.svg rename to tests/wpt/tests/images/wpt-logo/wpt-logo-darkblue.svg diff --git a/tests/wpt/web-platform-tests/images/wpt-logo/wpt-logo-lightblue-bg.svg b/tests/wpt/tests/images/wpt-logo/wpt-logo-lightblue-bg.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/wpt-logo/wpt-logo-lightblue-bg.svg rename to tests/wpt/tests/images/wpt-logo/wpt-logo-lightblue-bg.svg diff --git a/tests/wpt/web-platform-tests/images/wpt-logo/wpt-logo-orange-bg.svg b/tests/wpt/tests/images/wpt-logo/wpt-logo-orange-bg.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/wpt-logo/wpt-logo-orange-bg.svg rename to tests/wpt/tests/images/wpt-logo/wpt-logo-orange-bg.svg diff --git a/tests/wpt/web-platform-tests/images/wpt-logo/wpt-logo-white.svg b/tests/wpt/tests/images/wpt-logo/wpt-logo-white.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/wpt-logo/wpt-logo-white.svg rename to tests/wpt/tests/images/wpt-logo/wpt-logo-white.svg diff --git a/tests/wpt/web-platform-tests/images/wpt-pr-bot-logo/wpt-pr-bot-logo-darkblue.svg b/tests/wpt/tests/images/wpt-pr-bot-logo/wpt-pr-bot-logo-darkblue.svg similarity index 100% rename from tests/wpt/web-platform-tests/images/wpt-pr-bot-logo/wpt-pr-bot-logo-darkblue.svg rename to tests/wpt/tests/images/wpt-pr-bot-logo/wpt-pr-bot-logo-darkblue.svg diff --git a/tests/wpt/web-platform-tests/images/yellow.png b/tests/wpt/tests/images/yellow.png similarity index 100% rename from tests/wpt/web-platform-tests/images/yellow.png rename to tests/wpt/tests/images/yellow.png diff --git a/tests/wpt/web-platform-tests/images/yellow75.png b/tests/wpt/tests/images/yellow75.png similarity index 100% rename from tests/wpt/web-platform-tests/images/yellow75.png rename to tests/wpt/tests/images/yellow75.png diff --git a/tests/wpt/web-platform-tests/import-maps/META.yml b/tests/wpt/tests/import-maps/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/META.yml rename to tests/wpt/tests/import-maps/META.yml diff --git a/tests/wpt/web-platform-tests/import-maps/acquiring/README.md b/tests/wpt/tests/import-maps/acquiring/README.md similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/acquiring/README.md rename to tests/wpt/tests/import-maps/acquiring/README.md diff --git a/tests/wpt/web-platform-tests/import-maps/acquiring/dynamic-import.html b/tests/wpt/tests/import-maps/acquiring/dynamic-import.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/acquiring/dynamic-import.html rename to tests/wpt/tests/import-maps/acquiring/dynamic-import.html diff --git a/tests/wpt/web-platform-tests/import-maps/acquiring/modulepreload-link-header.html b/tests/wpt/tests/import-maps/acquiring/modulepreload-link-header.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/acquiring/modulepreload-link-header.html rename to tests/wpt/tests/import-maps/acquiring/modulepreload-link-header.html diff --git a/tests/wpt/web-platform-tests/import-maps/acquiring/modulepreload-link-header.html.headers b/tests/wpt/tests/import-maps/acquiring/modulepreload-link-header.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/acquiring/modulepreload-link-header.html.headers rename to tests/wpt/tests/import-maps/acquiring/modulepreload-link-header.html.headers diff --git a/tests/wpt/web-platform-tests/import-maps/acquiring/modulepreload.html b/tests/wpt/tests/import-maps/acquiring/modulepreload.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/acquiring/modulepreload.html rename to tests/wpt/tests/import-maps/acquiring/modulepreload.html diff --git a/tests/wpt/web-platform-tests/import-maps/acquiring/script-tag-inline.html b/tests/wpt/tests/import-maps/acquiring/script-tag-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/acquiring/script-tag-inline.html rename to tests/wpt/tests/import-maps/acquiring/script-tag-inline.html diff --git a/tests/wpt/web-platform-tests/import-maps/acquiring/script-tag.html b/tests/wpt/tests/import-maps/acquiring/script-tag.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/acquiring/script-tag.html rename to tests/wpt/tests/import-maps/acquiring/script-tag.html diff --git a/tests/wpt/web-platform-tests/import-maps/acquiring/worker-request.html b/tests/wpt/tests/import-maps/acquiring/worker-request.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/acquiring/worker-request.html rename to tests/wpt/tests/import-maps/acquiring/worker-request.html diff --git a/tests/wpt/web-platform-tests/import-maps/bare-specifiers.sub.html b/tests/wpt/tests/import-maps/bare-specifiers.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/bare-specifiers.sub.html rename to tests/wpt/tests/import-maps/bare-specifiers.sub.html diff --git a/tests/wpt/web-platform-tests/import-maps/bare/README.md b/tests/wpt/tests/import-maps/bare/README.md similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/bare/README.md rename to tests/wpt/tests/import-maps/bare/README.md diff --git a/tests/wpt/web-platform-tests/import-maps/bare/__dir__.headers b/tests/wpt/tests/import-maps/bare/__dir__.headers similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/bare/__dir__.headers rename to tests/wpt/tests/import-maps/bare/__dir__.headers diff --git a/tests/wpt/web-platform-tests/import-maps/bare/bare b/tests/wpt/tests/import-maps/bare/bare similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/bare/bare rename to tests/wpt/tests/import-maps/bare/bare diff --git a/tests/wpt/web-platform-tests/import-maps/bare/cross-origin-bare b/tests/wpt/tests/import-maps/bare/cross-origin-bare similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/bare/cross-origin-bare rename to tests/wpt/tests/import-maps/bare/cross-origin-bare diff --git a/tests/wpt/web-platform-tests/import-maps/bare/to-bare b/tests/wpt/tests/import-maps/bare/to-bare similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/bare/to-bare rename to tests/wpt/tests/import-maps/bare/to-bare diff --git a/tests/wpt/web-platform-tests/import-maps/bare/to-data b/tests/wpt/tests/import-maps/bare/to-data similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/bare/to-data rename to tests/wpt/tests/import-maps/bare/to-data diff --git a/tests/wpt/web-platform-tests/import-maps/csp/applied-to-target-dynamic.sub.html b/tests/wpt/tests/import-maps/csp/applied-to-target-dynamic.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/csp/applied-to-target-dynamic.sub.html rename to tests/wpt/tests/import-maps/csp/applied-to-target-dynamic.sub.html diff --git a/tests/wpt/web-platform-tests/import-maps/csp/applied-to-target.sub.html b/tests/wpt/tests/import-maps/csp/applied-to-target.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/csp/applied-to-target.sub.html rename to tests/wpt/tests/import-maps/csp/applied-to-target.sub.html diff --git a/tests/wpt/web-platform-tests/import-maps/csp/hash-failure.html b/tests/wpt/tests/import-maps/csp/hash-failure.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/csp/hash-failure.html rename to tests/wpt/tests/import-maps/csp/hash-failure.html diff --git a/tests/wpt/web-platform-tests/import-maps/csp/hash.html b/tests/wpt/tests/import-maps/csp/hash.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/csp/hash.html rename to tests/wpt/tests/import-maps/csp/hash.html diff --git a/tests/wpt/web-platform-tests/import-maps/csp/nonce-failure.html b/tests/wpt/tests/import-maps/csp/nonce-failure.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/csp/nonce-failure.html rename to tests/wpt/tests/import-maps/csp/nonce-failure.html diff --git a/tests/wpt/web-platform-tests/import-maps/csp/nonce.html b/tests/wpt/tests/import-maps/csp/nonce.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/csp/nonce.html rename to tests/wpt/tests/import-maps/csp/nonce.html diff --git a/tests/wpt/web-platform-tests/import-maps/csp/unsafe-inline.html b/tests/wpt/tests/import-maps/csp/unsafe-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/csp/unsafe-inline.html rename to tests/wpt/tests/import-maps/csp/unsafe-inline.html diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/README.md b/tests/wpt/tests/import-maps/data-driven/README.md similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/README.md rename to tests/wpt/tests/import-maps/data-driven/README.md diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resolving.html b/tests/wpt/tests/import-maps/data-driven/resolving.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resolving.html rename to tests/wpt/tests/import-maps/data-driven/resolving.html diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/data-url-prefix.json b/tests/wpt/tests/import-maps/data-driven/resources/data-url-prefix.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/data-url-prefix.json rename to tests/wpt/tests/import-maps/data-driven/resources/data-url-prefix.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/empty-import-map.json b/tests/wpt/tests/import-maps/data-driven/resources/empty-import-map.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/empty-import-map.json rename to tests/wpt/tests/import-maps/data-driven/resources/empty-import-map.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/overlapping-entries.json b/tests/wpt/tests/import-maps/data-driven/resources/overlapping-entries.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/overlapping-entries.json rename to tests/wpt/tests/import-maps/data-driven/resources/overlapping-entries.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json b/tests/wpt/tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json rename to tests/wpt/tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-addresses-absolute.json b/tests/wpt/tests/import-maps/data-driven/resources/parsing-addresses-absolute.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-addresses-absolute.json rename to tests/wpt/tests/import-maps/data-driven/resources/parsing-addresses-absolute.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-addresses-invalid.json b/tests/wpt/tests/import-maps/data-driven/resources/parsing-addresses-invalid.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-addresses-invalid.json rename to tests/wpt/tests/import-maps/data-driven/resources/parsing-addresses-invalid.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-addresses.json b/tests/wpt/tests/import-maps/data-driven/resources/parsing-addresses.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-addresses.json rename to tests/wpt/tests/import-maps/data-driven/resources/parsing-addresses.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-invalid-json.json b/tests/wpt/tests/import-maps/data-driven/resources/parsing-invalid-json.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-invalid-json.json rename to tests/wpt/tests/import-maps/data-driven/resources/parsing-invalid-json.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-normalization.json b/tests/wpt/tests/import-maps/data-driven/resources/parsing-schema-normalization.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-normalization.json rename to tests/wpt/tests/import-maps/data-driven/resources/parsing-schema-normalization.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-scope.json b/tests/wpt/tests/import-maps/data-driven/resources/parsing-schema-scope.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-scope.json rename to tests/wpt/tests/import-maps/data-driven/resources/parsing-schema-scope.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-specifier-map.json b/tests/wpt/tests/import-maps/data-driven/resources/parsing-schema-specifier-map.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-specifier-map.json rename to tests/wpt/tests/import-maps/data-driven/resources/parsing-schema-specifier-map.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-toplevel.json b/tests/wpt/tests/import-maps/data-driven/resources/parsing-schema-toplevel.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-toplevel.json rename to tests/wpt/tests/import-maps/data-driven/resources/parsing-schema-toplevel.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-scope-keys.json b/tests/wpt/tests/import-maps/data-driven/resources/parsing-scope-keys.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-scope-keys.json rename to tests/wpt/tests/import-maps/data-driven/resources/parsing-scope-keys.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-specifier-keys.json b/tests/wpt/tests/import-maps/data-driven/resources/parsing-specifier-keys.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-specifier-keys.json rename to tests/wpt/tests/import-maps/data-driven/resources/parsing-specifier-keys.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-trailing-slashes.json b/tests/wpt/tests/import-maps/data-driven/resources/parsing-trailing-slashes.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-trailing-slashes.json rename to tests/wpt/tests/import-maps/data-driven/resources/parsing-trailing-slashes.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/resolving-null.json b/tests/wpt/tests/import-maps/data-driven/resources/resolving-null.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/resolving-null.json rename to tests/wpt/tests/import-maps/data-driven/resources/resolving-null.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/scopes-exact-vs-prefix.json b/tests/wpt/tests/import-maps/data-driven/resources/scopes-exact-vs-prefix.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/scopes-exact-vs-prefix.json rename to tests/wpt/tests/import-maps/data-driven/resources/scopes-exact-vs-prefix.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/scopes.json b/tests/wpt/tests/import-maps/data-driven/resources/scopes.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/scopes.json rename to tests/wpt/tests/import-maps/data-driven/resources/scopes.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/test-helper-iframe.js b/tests/wpt/tests/import-maps/data-driven/resources/test-helper-iframe.js similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/test-helper-iframe.js rename to tests/wpt/tests/import-maps/data-driven/resources/test-helper-iframe.js diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/test-helper.js b/tests/wpt/tests/import-maps/data-driven/resources/test-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/test-helper.js rename to tests/wpt/tests/import-maps/data-driven/resources/test-helper.js diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/tricky-specifiers.json b/tests/wpt/tests/import-maps/data-driven/resources/tricky-specifiers.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/tricky-specifiers.json rename to tests/wpt/tests/import-maps/data-driven/resources/tricky-specifiers.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/url-specifiers-schemes.json b/tests/wpt/tests/import-maps/data-driven/resources/url-specifiers-schemes.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/url-specifiers-schemes.json rename to tests/wpt/tests/import-maps/data-driven/resources/url-specifiers-schemes.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/resources/url-specifiers.json b/tests/wpt/tests/import-maps/data-driven/resources/url-specifiers.json similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/resources/url-specifiers.json rename to tests/wpt/tests/import-maps/data-driven/resources/url-specifiers.json diff --git a/tests/wpt/web-platform-tests/import-maps/data-driven/tools/format_json.py b/tests/wpt/tests/import-maps/data-driven/tools/format_json.py similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-driven/tools/format_json.py rename to tests/wpt/tests/import-maps/data-driven/tools/format_json.py diff --git a/tests/wpt/web-platform-tests/import-maps/data-url-specifiers.sub.html b/tests/wpt/tests/import-maps/data-url-specifiers.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/data-url-specifiers.sub.html rename to tests/wpt/tests/import-maps/data-url-specifiers.sub.html diff --git a/tests/wpt/web-platform-tests/import-maps/http-url-like-specifiers.sub.html b/tests/wpt/tests/import-maps/http-url-like-specifiers.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/http-url-like-specifiers.sub.html rename to tests/wpt/tests/import-maps/http-url-like-specifiers.sub.html diff --git a/tests/wpt/web-platform-tests/import-maps/import-maps-base-url.sub.html b/tests/wpt/tests/import-maps/import-maps-base-url.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/import-maps-base-url.sub.html rename to tests/wpt/tests/import-maps/import-maps-base-url.sub.html diff --git a/tests/wpt/web-platform-tests/import-maps/module-map-key.html b/tests/wpt/tests/import-maps/module-map-key.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/module-map-key.html rename to tests/wpt/tests/import-maps/module-map-key.html diff --git a/tests/wpt/web-platform-tests/import-maps/multiple-import-maps/basic.html b/tests/wpt/tests/import-maps/multiple-import-maps/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/multiple-import-maps/basic.html rename to tests/wpt/tests/import-maps/multiple-import-maps/basic.html diff --git a/tests/wpt/web-platform-tests/import-maps/multiple-import-maps/with-errors.html b/tests/wpt/tests/import-maps/multiple-import-maps/with-errors.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/multiple-import-maps/with-errors.html rename to tests/wpt/tests/import-maps/multiple-import-maps/with-errors.html diff --git a/tests/wpt/web-platform-tests/import-maps/not-as-classic-script.html b/tests/wpt/tests/import-maps/not-as-classic-script.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/not-as-classic-script.html rename to tests/wpt/tests/import-maps/not-as-classic-script.html diff --git a/tests/wpt/web-platform-tests/import-maps/resources/empty.js b/tests/wpt/tests/import-maps/resources/empty.js similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/resources/empty.js rename to tests/wpt/tests/import-maps/resources/empty.js diff --git a/tests/wpt/web-platform-tests/import-maps/resources/inject-base.js b/tests/wpt/tests/import-maps/resources/inject-base.js similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/resources/inject-base.js rename to tests/wpt/tests/import-maps/resources/inject-base.js diff --git a/tests/wpt/web-platform-tests/import-maps/resources/log.js b/tests/wpt/tests/import-maps/resources/log.js similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/resources/log.js rename to tests/wpt/tests/import-maps/resources/log.js diff --git a/tests/wpt/web-platform-tests/import-maps/resources/log.js.headers b/tests/wpt/tests/import-maps/resources/log.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/resources/log.js.headers rename to tests/wpt/tests/import-maps/resources/log.js.headers diff --git a/tests/wpt/web-platform-tests/import-maps/resources/test-helper.js b/tests/wpt/tests/import-maps/resources/test-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/resources/test-helper.js rename to tests/wpt/tests/import-maps/resources/test-helper.js diff --git a/tests/wpt/web-platform-tests/import-maps/script-supports-importmap.html b/tests/wpt/tests/import-maps/script-supports-importmap.html similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/script-supports-importmap.html rename to tests/wpt/tests/import-maps/script-supports-importmap.html diff --git a/tests/wpt/web-platform-tests/import-maps/static-import.py b/tests/wpt/tests/import-maps/static-import.py similarity index 100% rename from tests/wpt/web-platform-tests/import-maps/static-import.py rename to tests/wpt/tests/import-maps/static-import.py diff --git a/tests/wpt/web-platform-tests/inert/dynamic-inert-on-focused-element.html b/tests/wpt/tests/inert/dynamic-inert-on-focused-element.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/dynamic-inert-on-focused-element.html rename to tests/wpt/tests/inert/dynamic-inert-on-focused-element.html diff --git a/tests/wpt/web-platform-tests/inert/inert-and-contenteditable.html b/tests/wpt/tests/inert/inert-and-contenteditable.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-and-contenteditable.html rename to tests/wpt/tests/inert/inert-and-contenteditable.html diff --git a/tests/wpt/web-platform-tests/inert/inert-canvas-fallback-content.html b/tests/wpt/tests/inert/inert-canvas-fallback-content.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-canvas-fallback-content.html rename to tests/wpt/tests/inert/inert-canvas-fallback-content.html diff --git a/tests/wpt/web-platform-tests/inert/inert-computed-style.html b/tests/wpt/tests/inert/inert-computed-style.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-computed-style.html rename to tests/wpt/tests/inert/inert-computed-style.html diff --git a/tests/wpt/web-platform-tests/inert/inert-does-not-match-disabled-selector.html b/tests/wpt/tests/inert/inert-does-not-match-disabled-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-does-not-match-disabled-selector.html rename to tests/wpt/tests/inert/inert-does-not-match-disabled-selector.html diff --git a/tests/wpt/web-platform-tests/inert/inert-iframe-hittest.html b/tests/wpt/tests/inert/inert-iframe-hittest.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-iframe-hittest.html rename to tests/wpt/tests/inert/inert-iframe-hittest.html diff --git a/tests/wpt/web-platform-tests/inert/inert-iframe-tabbing.html b/tests/wpt/tests/inert/inert-iframe-tabbing.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-iframe-tabbing.html rename to tests/wpt/tests/inert/inert-iframe-tabbing.html diff --git a/tests/wpt/web-platform-tests/inert/inert-in-shadow-dom.html b/tests/wpt/tests/inert/inert-in-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-in-shadow-dom.html rename to tests/wpt/tests/inert/inert-in-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/inert/inert-inlines-around-selection-range-in-contenteditable.html b/tests/wpt/tests/inert/inert-inlines-around-selection-range-in-contenteditable.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-inlines-around-selection-range-in-contenteditable.html rename to tests/wpt/tests/inert/inert-inlines-around-selection-range-in-contenteditable.html diff --git a/tests/wpt/web-platform-tests/inert/inert-inlines.html b/tests/wpt/tests/inert/inert-inlines.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-inlines.html rename to tests/wpt/tests/inert/inert-inlines.html diff --git a/tests/wpt/web-platform-tests/inert/inert-label-focus.html b/tests/wpt/tests/inert/inert-label-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-label-focus.html rename to tests/wpt/tests/inert/inert-label-focus.html diff --git a/tests/wpt/web-platform-tests/inert/inert-node-is-uneditable.html b/tests/wpt/tests/inert/inert-node-is-uneditable.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-node-is-uneditable.html rename to tests/wpt/tests/inert/inert-node-is-uneditable.html diff --git a/tests/wpt/web-platform-tests/inert/inert-node-is-unfocusable.html b/tests/wpt/tests/inert/inert-node-is-unfocusable.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-node-is-unfocusable.html rename to tests/wpt/tests/inert/inert-node-is-unfocusable.html diff --git a/tests/wpt/web-platform-tests/inert/inert-node-is-unselectable.html b/tests/wpt/tests/inert/inert-node-is-unselectable.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-node-is-unselectable.html rename to tests/wpt/tests/inert/inert-node-is-unselectable.html diff --git a/tests/wpt/web-platform-tests/inert/inert-on-non-html.html b/tests/wpt/tests/inert/inert-on-non-html.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-on-non-html.html rename to tests/wpt/tests/inert/inert-on-non-html.html diff --git a/tests/wpt/web-platform-tests/inert/inert-on-slots.html b/tests/wpt/tests/inert/inert-on-slots.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-on-slots.html rename to tests/wpt/tests/inert/inert-on-slots.html diff --git a/tests/wpt/web-platform-tests/inert/inert-pseudo-element-hittest.html b/tests/wpt/tests/inert/inert-pseudo-element-hittest.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-pseudo-element-hittest.html rename to tests/wpt/tests/inert/inert-pseudo-element-hittest.html diff --git a/tests/wpt/web-platform-tests/inert/inert-svg-hittest.html b/tests/wpt/tests/inert/inert-svg-hittest.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-svg-hittest.html rename to tests/wpt/tests/inert/inert-svg-hittest.html diff --git a/tests/wpt/web-platform-tests/inert/inert-with-modal-dialog-001.html b/tests/wpt/tests/inert/inert-with-modal-dialog-001.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-with-modal-dialog-001.html rename to tests/wpt/tests/inert/inert-with-modal-dialog-001.html diff --git a/tests/wpt/web-platform-tests/inert/inert-with-modal-dialog-002.html b/tests/wpt/tests/inert/inert-with-modal-dialog-002.html similarity index 100% rename from tests/wpt/web-platform-tests/inert/inert-with-modal-dialog-002.html rename to tests/wpt/tests/inert/inert-with-modal-dialog-002.html diff --git a/tests/wpt/web-platform-tests/infrastructure/META.yml b/tests/wpt/tests/infrastructure/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/META.yml rename to tests/wpt/tests/infrastructure/META.yml diff --git a/tests/wpt/web-platform-tests/infrastructure/README.md b/tests/wpt/tests/infrastructure/README.md similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/README.md rename to tests/wpt/tests/infrastructure/README.md diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/README.md b/tests/wpt/tests/infrastructure/assumptions/README.md similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/README.md rename to tests/wpt/tests/infrastructure/assumptions/README.md diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/ahem-notref.html b/tests/wpt/tests/infrastructure/assumptions/ahem-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/ahem-notref.html rename to tests/wpt/tests/infrastructure/assumptions/ahem-notref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/ahem-ref.html b/tests/wpt/tests/infrastructure/assumptions/ahem-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/ahem-ref.html rename to tests/wpt/tests/infrastructure/assumptions/ahem-ref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/ahem.html b/tests/wpt/tests/infrastructure/assumptions/ahem.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/ahem.html rename to tests/wpt/tests/infrastructure/assumptions/ahem.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/allowed-to-play.html b/tests/wpt/tests/infrastructure/assumptions/allowed-to-play.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/allowed-to-play.html rename to tests/wpt/tests/infrastructure/assumptions/allowed-to-play.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/blank.html b/tests/wpt/tests/infrastructure/assumptions/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/blank.html rename to tests/wpt/tests/infrastructure/assumptions/blank.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/canvas-background-ref.html b/tests/wpt/tests/infrastructure/assumptions/canvas-background-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/canvas-background-ref.html rename to tests/wpt/tests/infrastructure/assumptions/canvas-background-ref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/canvas-background.html b/tests/wpt/tests/infrastructure/assumptions/canvas-background.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/canvas-background.html rename to tests/wpt/tests/infrastructure/assumptions/canvas-background.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/cookie.html b/tests/wpt/tests/infrastructure/assumptions/cookie.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/cookie.html rename to tests/wpt/tests/infrastructure/assumptions/cookie.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/document-fonts-ready.html b/tests/wpt/tests/infrastructure/assumptions/document-fonts-ready.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/document-fonts-ready.html rename to tests/wpt/tests/infrastructure/assumptions/document-fonts-ready.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/html-elements.html b/tests/wpt/tests/infrastructure/assumptions/html-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/html-elements.html rename to tests/wpt/tests/infrastructure/assumptions/html-elements.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/initial-color-ref.html b/tests/wpt/tests/infrastructure/assumptions/initial-color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/initial-color-ref.html rename to tests/wpt/tests/infrastructure/assumptions/initial-color-ref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/initial-color.html b/tests/wpt/tests/infrastructure/assumptions/initial-color.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/initial-color.html rename to tests/wpt/tests/infrastructure/assumptions/initial-color.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/medium-font-size-ref.html b/tests/wpt/tests/infrastructure/assumptions/medium-font-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/medium-font-size-ref.html rename to tests/wpt/tests/infrastructure/assumptions/medium-font-size-ref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/medium-font-size.html b/tests/wpt/tests/infrastructure/assumptions/medium-font-size.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/medium-font-size.html rename to tests/wpt/tests/infrastructure/assumptions/medium-font-size.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/min-font-size-ref.html b/tests/wpt/tests/infrastructure/assumptions/min-font-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/min-font-size-ref.html rename to tests/wpt/tests/infrastructure/assumptions/min-font-size-ref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/min-font-size.html b/tests/wpt/tests/infrastructure/assumptions/min-font-size.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/min-font-size.html rename to tests/wpt/tests/infrastructure/assumptions/min-font-size.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/non-local-ports.sub.window.js b/tests/wpt/tests/infrastructure/assumptions/non-local-ports.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/non-local-ports.sub.window.js rename to tests/wpt/tests/infrastructure/assumptions/non-local-ports.sub.window.js diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/non-secure-context.any.js b/tests/wpt/tests/infrastructure/assumptions/non-secure-context.any.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/non-secure-context.any.js rename to tests/wpt/tests/infrastructure/assumptions/non-secure-context.any.js diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/resources/fetch-and-post-result.html b/tests/wpt/tests/infrastructure/assumptions/resources/fetch-and-post-result.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/resources/fetch-and-post-result.html rename to tests/wpt/tests/infrastructure/assumptions/resources/fetch-and-post-result.html diff --git a/tests/wpt/web-platform-tests/infrastructure/assumptions/tools/ahem-generate-table.py b/tests/wpt/tests/infrastructure/assumptions/tools/ahem-generate-table.py similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/assumptions/tools/ahem-generate-table.py rename to tests/wpt/tests/infrastructure/assumptions/tools/ahem-generate-table.py diff --git a/tests/wpt/web-platform-tests/infrastructure/browsers/firefox/prefs.html b/tests/wpt/tests/infrastructure/browsers/firefox/prefs.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/browsers/firefox/prefs.html rename to tests/wpt/tests/infrastructure/browsers/firefox/prefs.html diff --git a/tests/wpt/web-platform-tests/infrastructure/channels/child_message.html b/tests/wpt/tests/infrastructure/channels/child_message.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/channels/child_message.html rename to tests/wpt/tests/infrastructure/channels/child_message.html diff --git a/tests/wpt/web-platform-tests/infrastructure/channels/child_script.html b/tests/wpt/tests/infrastructure/channels/child_script.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/channels/child_script.html rename to tests/wpt/tests/infrastructure/channels/child_script.html diff --git a/tests/wpt/web-platform-tests/infrastructure/channels/serialize-data.js b/tests/wpt/tests/infrastructure/channels/serialize-data.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/channels/serialize-data.js rename to tests/wpt/tests/infrastructure/channels/serialize-data.js diff --git a/tests/wpt/web-platform-tests/infrastructure/channels/serialize_child.html b/tests/wpt/tests/infrastructure/channels/serialize_child.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/channels/serialize_child.html rename to tests/wpt/tests/infrastructure/channels/serialize_child.html diff --git a/tests/wpt/web-platform-tests/infrastructure/channels/test_call.html b/tests/wpt/tests/infrastructure/channels/test_call.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/channels/test_call.html rename to tests/wpt/tests/infrastructure/channels/test_call.html diff --git a/tests/wpt/web-platform-tests/infrastructure/channels/test_postMessage.html b/tests/wpt/tests/infrastructure/channels/test_postMessage.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/channels/test_postMessage.html rename to tests/wpt/tests/infrastructure/channels/test_postMessage.html diff --git a/tests/wpt/web-platform-tests/infrastructure/channels/test_serialize.html b/tests/wpt/tests/infrastructure/channels/test_serialize.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/channels/test_serialize.html rename to tests/wpt/tests/infrastructure/channels/test_serialize.html diff --git a/tests/wpt/web-platform-tests/infrastructure/crashtests/example.html b/tests/wpt/tests/infrastructure/crashtests/example.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/crashtests/example.html rename to tests/wpt/tests/infrastructure/crashtests/example.html diff --git a/tests/wpt/web-platform-tests/infrastructure/expected-fail/failing-test.html b/tests/wpt/tests/infrastructure/expected-fail/failing-test.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/expected-fail/failing-test.html rename to tests/wpt/tests/infrastructure/expected-fail/failing-test.html diff --git a/tests/wpt/web-platform-tests/infrastructure/expected-fail/timeout.html b/tests/wpt/tests/infrastructure/expected-fail/timeout.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/expected-fail/timeout.html rename to tests/wpt/tests/infrastructure/expected-fail/timeout.html diff --git a/tests/wpt/web-platform-tests/infrastructure/expected-fail/uncaught-exception-following-subtest.html b/tests/wpt/tests/infrastructure/expected-fail/uncaught-exception-following-subtest.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/expected-fail/uncaught-exception-following-subtest.html rename to tests/wpt/tests/infrastructure/expected-fail/uncaught-exception-following-subtest.html diff --git a/tests/wpt/web-platform-tests/infrastructure/expected-fail/uncaught-exception-single-test.html b/tests/wpt/tests/infrastructure/expected-fail/uncaught-exception-single-test.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/expected-fail/uncaught-exception-single-test.html rename to tests/wpt/tests/infrastructure/expected-fail/uncaught-exception-single-test.html diff --git a/tests/wpt/web-platform-tests/infrastructure/expected-fail/uncaught-exception.html b/tests/wpt/tests/infrastructure/expected-fail/uncaught-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/expected-fail/uncaught-exception.html rename to tests/wpt/tests/infrastructure/expected-fail/uncaught-exception.html diff --git a/tests/wpt/web-platform-tests/infrastructure/expected-fail/unhandled-rejection-following-subtest.html b/tests/wpt/tests/infrastructure/expected-fail/unhandled-rejection-following-subtest.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/expected-fail/unhandled-rejection-following-subtest.html rename to tests/wpt/tests/infrastructure/expected-fail/unhandled-rejection-following-subtest.html diff --git a/tests/wpt/web-platform-tests/infrastructure/expected-fail/unhandled-rejection-single-test.html b/tests/wpt/tests/infrastructure/expected-fail/unhandled-rejection-single-test.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/expected-fail/unhandled-rejection-single-test.html rename to tests/wpt/tests/infrastructure/expected-fail/unhandled-rejection-single-test.html diff --git a/tests/wpt/web-platform-tests/infrastructure/expected-fail/unhandled-rejection.html b/tests/wpt/tests/infrastructure/expected-fail/unhandled-rejection.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/expected-fail/unhandled-rejection.html rename to tests/wpt/tests/infrastructure/expected-fail/unhandled-rejection.html diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/assumptions/ahem.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/ahem.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/assumptions/ahem.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/ahem.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/assumptions/allowed-to-play.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/allowed-to-play.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/assumptions/allowed-to-play.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/allowed-to-play.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/assumptions/document-fonts-ready.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/document-fonts-ready.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/assumptions/document-fonts-ready.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/document-fonts-ready.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/assumptions/non-local-ports.sub.window.js.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/non-local-ports.sub.window.js.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/assumptions/non-local-ports.sub.window.js.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/assumptions/non-local-ports.sub.window.js.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/browsers/firefox/__dir__.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/browsers/firefox/__dir__.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/browsers/firefox/__dir__.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/browsers/firefox/__dir__.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/browsers/firefox/prefs.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/browsers/firefox/prefs.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/browsers/firefox/prefs.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/browsers/firefox/prefs.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/failing-test.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/failing-test.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/failing-test.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/failing-test.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/timeout.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/timeout.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/timeout.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/timeout.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/uncaught-exception-following-subtest.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/uncaught-exception-following-subtest.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/uncaught-exception-following-subtest.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/uncaught-exception-following-subtest.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/uncaught-exception-single-test.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/uncaught-exception-single-test.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/uncaught-exception-single-test.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/uncaught-exception-single-test.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/uncaught-exception.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/uncaught-exception.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/uncaught-exception.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/uncaught-exception.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/unhandled-rejection-following-subtest.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/unhandled-rejection-following-subtest.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/unhandled-rejection-following-subtest.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/unhandled-rejection-following-subtest.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/unhandled-rejection-single-test.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/unhandled-rejection-single-test.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/unhandled-rejection-single-test.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/unhandled-rejection-single-test.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/unhandled-rejection.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/unhandled-rejection.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/unhandled-rejection.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/unhandled-rejection.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/window-onload-test.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/window-onload-test.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/window-onload-test.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/expected-fail/window-onload-test.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/fuzzy-ref-2.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/fuzzy-ref-2.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/fuzzy-ref-2.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/fuzzy-ref-2.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_and_fail_0-ref.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_and_fail_0-ref.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_and_fail_0-ref.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_and_fail_0-ref.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_cycle_fail_0-ref.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_cycle_fail_0-ref.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_cycle_fail_0-ref.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_cycle_fail_0-ref.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_1.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_1.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_1.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_1.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_full.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_full.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_full.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_full.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_short.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_short.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_short.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_short.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-0.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-0.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-0.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-0.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-1.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-1.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-1.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-1.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-4.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-4.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-4.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-4.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-5.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-5.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-5.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-5.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-6.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-6.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-6.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-6.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-7.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-7.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-7.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_and_mismatch-7.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_fail-print.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_fail-print.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_fail-print.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_fail-print.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_fail.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_fail.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_match_fail.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_match_fail.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_mismatch_fail-print.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_mismatch_fail-print.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_mismatch_fail-print.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_mismatch_fail-print.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_mismatch_fail.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_mismatch_fail.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_mismatch_fail.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_mismatch_fail.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_multiple_mismatch-0.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_multiple_mismatch-0.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_multiple_mismatch-0.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_multiple_mismatch-0.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_multiple_mismatch-1.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_multiple_mismatch-1.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_multiple_mismatch-1.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_multiple_mismatch-1.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_ref_timeout.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_ref_timeout.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_ref_timeout.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_ref_timeout.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_timeout.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_timeout.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/reftest/reftest_timeout.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/reftest_timeout.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/context.any.js.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/server/context.any.js.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/context.any.js.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/server/context.any.js.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/http2-context.sub.h2.any.js.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/server/http2-context.sub.h2.any.js.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/http2-context.sub.h2.any.js.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/server/http2-context.sub.h2.any.js.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/http2-websocket.sub.h2.any.js.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/server/http2-websocket.sub.h2.any.js.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/http2-websocket.sub.h2.any.js.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/server/http2-websocket.sub.h2.any.js.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/secure-context.https.any.js.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/server/secure-context.https.any.js.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/secure-context.https.any.js.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/server/secure-context.https.any.js.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/test-pac.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/server/test-pac.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/test-pac.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/server/test-pac.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/webtransport-h3.https.sub.any.js.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/server/webtransport-h3.https.sub.any.js.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/webtransport-h3.https.sub.any.js.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/server/webtransport-h3.https.sub.any.js.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/wpt-server-http.sub.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/server/wpt-server-http.sub.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/wpt-server-http.sub.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/server/wpt-server-http.sub.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/wpt-server-websocket.sub.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/server/wpt-server-websocket.sub.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/server/wpt-server-websocket.sub.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/server/wpt-server-websocket.sub.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/crossOrigin.sub.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/crossOrigin.sub.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/crossOrigin.sub.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/crossOrigin.sub.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/eventOrder.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/eventOrder.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/eventOrder.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/eventOrder.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/mouseClickCount.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/mouseClickCount.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/mouseClickCount.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/mouseClickCount.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPoints.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPoints.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPoints.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPoints.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseFirstPoint.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseFirstPoint.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseFirstPoint.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseFirstPoint.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsSimultaneousMove.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsSimultaneousMove.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsSimultaneousMove.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsSimultaneousMove.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsTwoTouchStarts.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsTwoTouchStarts.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsTwoTouchStarts.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsTwoTouchStarts.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsWithPause.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsWithPause.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsWithPause.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsWithPause.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/pause.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/pause.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/pause.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/pause.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEventProperties.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEventProperties.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEventProperties.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEventProperties.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEvents.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEvents.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEvents.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEvents.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/touchPointerEventProperties.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/touchPointerEventProperties.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/touchPointerEventProperties.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/touchPointerEventProperties.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/wheelScroll.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/wheelScroll.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/wheelScroll.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/actions/wheelScroll.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/click_iframe_crossorigin.sub.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/click_iframe_crossorigin.sub.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/click_iframe_crossorigin.sub.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/click_iframe_crossorigin.sub.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/file_upload.sub.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/file_upload.sub.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/file_upload.sub.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/file_upload.sub.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/generate_test_report.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/generate_test_report.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/generate_test_report.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/generate_test_report.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/set_permission.https.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/set_permission.https.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/set_permission.https.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/set_permission.https.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/virtual_authenticator.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/virtual_authenticator.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/virtual_authenticator.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/virtual_authenticator.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testharness/lone-surrogates.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testharness/lone-surrogates.html.ini similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testharness/lone-surrogates.html.ini rename to tests/wpt/tests/infrastructure/metadata/infrastructure/testharness/lone-surrogates.html.ini diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/update_properties.json b/tests/wpt/tests/infrastructure/metadata/update_properties.json similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/metadata/update_properties.json rename to tests/wpt/tests/infrastructure/metadata/update_properties.json diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest-wait-ref.html b/tests/wpt/tests/infrastructure/reftest-wait-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest-wait-ref.html rename to tests/wpt/tests/infrastructure/reftest-wait-ref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest-wait.html b/tests/wpt/tests/infrastructure/reftest-wait.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest-wait.html rename to tests/wpt/tests/infrastructure/reftest-wait.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/fuzzy-ref-1.html b/tests/wpt/tests/infrastructure/reftest/fuzzy-ref-1.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/fuzzy-ref-1.html rename to tests/wpt/tests/infrastructure/reftest/fuzzy-ref-1.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/green-ref.html b/tests/wpt/tests/infrastructure/reftest/green-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/green-ref.html rename to tests/wpt/tests/infrastructure/reftest/green-ref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/green.html b/tests/wpt/tests/infrastructure/reftest/green.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/green.html rename to tests/wpt/tests/infrastructure/reftest/green.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/README.md b/tests/wpt/tests/infrastructure/reftest/legacy/README.md similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/legacy/README.md rename to tests/wpt/tests/infrastructure/reftest/legacy/README.md diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/fuzzy-ref-2.html b/tests/wpt/tests/infrastructure/reftest/legacy/fuzzy-ref-2.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/legacy/fuzzy-ref-2.html rename to tests/wpt/tests/infrastructure/reftest/legacy/fuzzy-ref-2.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/fuzzy-ref-2a.html b/tests/wpt/tests/infrastructure/reftest/legacy/fuzzy-ref-2a.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/legacy/fuzzy-ref-2a.html rename to tests/wpt/tests/infrastructure/reftest/legacy/fuzzy-ref-2a.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_fail.html b/tests/wpt/tests/infrastructure/reftest/legacy/reftest_and_fail.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_fail.html rename to tests/wpt/tests/infrastructure/reftest/legacy/reftest_and_fail.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_fail_0-ref.html b/tests/wpt/tests/infrastructure/reftest/legacy/reftest_and_fail_0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_fail_0-ref.html rename to tests/wpt/tests/infrastructure/reftest/legacy/reftest_and_fail_0-ref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_mismatch.html b/tests/wpt/tests/infrastructure/reftest/legacy/reftest_and_mismatch.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_mismatch.html rename to tests/wpt/tests/infrastructure/reftest/legacy/reftest_and_mismatch.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_mismatch_0.html b/tests/wpt/tests/infrastructure/reftest/legacy/reftest_and_mismatch_0.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_mismatch_0.html rename to tests/wpt/tests/infrastructure/reftest/legacy/reftest_and_mismatch_0.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_mismatch_1.html b/tests/wpt/tests/infrastructure/reftest/legacy/reftest_and_mismatch_1.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_and_mismatch_1.html rename to tests/wpt/tests/infrastructure/reftest/legacy/reftest_and_mismatch_1.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle.html b/tests/wpt/tests/infrastructure/reftest/legacy/reftest_cycle.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle.html rename to tests/wpt/tests/infrastructure/reftest/legacy/reftest_cycle.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_0-ref.html b/tests/wpt/tests/infrastructure/reftest/legacy/reftest_cycle_0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_0-ref.html rename to tests/wpt/tests/infrastructure/reftest/legacy/reftest_cycle_0-ref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_1-ref.html b/tests/wpt/tests/infrastructure/reftest/legacy/reftest_cycle_1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_1-ref.html rename to tests/wpt/tests/infrastructure/reftest/legacy/reftest_cycle_1-ref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_fail.html b/tests/wpt/tests/infrastructure/reftest/legacy/reftest_cycle_fail.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_fail.html rename to tests/wpt/tests/infrastructure/reftest/legacy/reftest_cycle_fail.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_fail_0-ref.html b/tests/wpt/tests/infrastructure/reftest/legacy/reftest_cycle_fail_0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_cycle_fail_0-ref.html rename to tests/wpt/tests/infrastructure/reftest/legacy/reftest_cycle_fail_0-ref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html b/tests/wpt/tests/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html rename to tests/wpt/tests/infrastructure/reftest/legacy/reftest_fuzzy_chain_ini.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/red.html b/tests/wpt/tests/infrastructure/reftest/red.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/red.html rename to tests/wpt/tests/infrastructure/reftest/red.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest.https.html b/tests/wpt/tests/infrastructure/reftest/reftest.https.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest.https.html rename to tests/wpt/tests/infrastructure/reftest/reftest.https.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest.www.sub.html b/tests/wpt/tests/infrastructure/reftest/reftest.www.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest.www.sub.html rename to tests/wpt/tests/infrastructure/reftest/reftest.www.sub.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_fuzzy_1.html b/tests/wpt/tests/infrastructure/reftest/reftest_fuzzy_1.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_fuzzy_1.html rename to tests/wpt/tests/infrastructure/reftest/reftest_fuzzy_1.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_fuzzy_ini_full.html b/tests/wpt/tests/infrastructure/reftest/reftest_fuzzy_ini_full.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_fuzzy_ini_full.html rename to tests/wpt/tests/infrastructure/reftest/reftest_fuzzy_ini_full.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html b/tests/wpt/tests/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html rename to tests/wpt/tests/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_fuzzy_ini_short.html b/tests/wpt/tests/infrastructure/reftest/reftest_fuzzy_ini_short.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_fuzzy_ini_short.html rename to tests/wpt/tests/infrastructure/reftest/reftest_fuzzy_ini_short.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_fuzzy_no_differences.html b/tests/wpt/tests/infrastructure/reftest/reftest_fuzzy_no_differences.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_fuzzy_no_differences.html rename to tests/wpt/tests/infrastructure/reftest/reftest_fuzzy_no_differences.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_fuzzy_no_differences_1.html b/tests/wpt/tests/infrastructure/reftest/reftest_fuzzy_no_differences_1.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_fuzzy_no_differences_1.html rename to tests/wpt/tests/infrastructure/reftest/reftest_fuzzy_no_differences_1.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match-print-ref.html b/tests/wpt/tests/infrastructure/reftest/reftest_match-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match-print-ref.html rename to tests/wpt/tests/infrastructure/reftest/reftest_match-print-ref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match-print.html b/tests/wpt/tests/infrastructure/reftest/reftest_match-print.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match-print.html rename to tests/wpt/tests/infrastructure/reftest/reftest_match-print.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match.html b/tests/wpt/tests/infrastructure/reftest/reftest_match.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match.html rename to tests/wpt/tests/infrastructure/reftest/reftest_match.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-0.html b/tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-0.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-0.html rename to tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-0.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-1.html b/tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-1.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-1.html rename to tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-1.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-2.html b/tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-2.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-2.html rename to tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-2.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-3.html b/tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-3.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-3.html rename to tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-3.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-4.html b/tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-4.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-4.html rename to tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-4.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-5.html b/tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-5.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-5.html rename to tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-5.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-6.html b/tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-6.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-6.html rename to tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-6.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-7.html b/tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-7.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_and_mismatch-7.html rename to tests/wpt/tests/infrastructure/reftest/reftest_match_and_mismatch-7.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_fail-print.html b/tests/wpt/tests/infrastructure/reftest/reftest_match_fail-print.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_fail-print.html rename to tests/wpt/tests/infrastructure/reftest/reftest_match_fail-print.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_fail.html b/tests/wpt/tests/infrastructure/reftest/reftest_match_fail.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match_fail.html rename to tests/wpt/tests/infrastructure/reftest/reftest_match_fail.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_mismatch-num-pages-print.html b/tests/wpt/tests/infrastructure/reftest/reftest_mismatch-num-pages-print.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_mismatch-num-pages-print.html rename to tests/wpt/tests/infrastructure/reftest/reftest_mismatch-num-pages-print.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_mismatch-print.html b/tests/wpt/tests/infrastructure/reftest/reftest_mismatch-print.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_mismatch-print.html rename to tests/wpt/tests/infrastructure/reftest/reftest_mismatch-print.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_mismatch.html b/tests/wpt/tests/infrastructure/reftest/reftest_mismatch.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_mismatch.html rename to tests/wpt/tests/infrastructure/reftest/reftest_mismatch.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_mismatch_fail-print.html b/tests/wpt/tests/infrastructure/reftest/reftest_mismatch_fail-print.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_mismatch_fail-print.html rename to tests/wpt/tests/infrastructure/reftest/reftest_mismatch_fail-print.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_mismatch_fail.html b/tests/wpt/tests/infrastructure/reftest/reftest_mismatch_fail.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_mismatch_fail.html rename to tests/wpt/tests/infrastructure/reftest/reftest_mismatch_fail.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_mismatch_page_margins-print.html b/tests/wpt/tests/infrastructure/reftest/reftest_mismatch_page_margins-print.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_mismatch_page_margins-print.html rename to tests/wpt/tests/infrastructure/reftest/reftest_mismatch_page_margins-print.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_match-0.html b/tests/wpt/tests/infrastructure/reftest/reftest_multiple_match-0.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_match-0.html rename to tests/wpt/tests/infrastructure/reftest/reftest_multiple_match-0.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_match-1.html b/tests/wpt/tests/infrastructure/reftest/reftest_multiple_match-1.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_match-1.html rename to tests/wpt/tests/infrastructure/reftest/reftest_multiple_match-1.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_mismatch-0.html b/tests/wpt/tests/infrastructure/reftest/reftest_multiple_mismatch-0.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_mismatch-0.html rename to tests/wpt/tests/infrastructure/reftest/reftest_multiple_mismatch-0.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_mismatch-1.html b/tests/wpt/tests/infrastructure/reftest/reftest_multiple_mismatch-1.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_multiple_mismatch-1.html rename to tests/wpt/tests/infrastructure/reftest/reftest_multiple_mismatch-1.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_ref_timeout-ref.html b/tests/wpt/tests/infrastructure/reftest/reftest_ref_timeout-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_ref_timeout-ref.html rename to tests/wpt/tests/infrastructure/reftest/reftest_ref_timeout-ref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_ref_timeout.html b/tests/wpt/tests/infrastructure/reftest/reftest_ref_timeout.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_ref_timeout.html rename to tests/wpt/tests/infrastructure/reftest/reftest_ref_timeout.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_timeout.html b/tests/wpt/tests/infrastructure/reftest/reftest_timeout.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_timeout.html rename to tests/wpt/tests/infrastructure/reftest/reftest_timeout.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_wait_0.html b/tests/wpt/tests/infrastructure/reftest/reftest_wait_0.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_wait_0.html rename to tests/wpt/tests/infrastructure/reftest/reftest_wait_0.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_wait_TestRendered.html b/tests/wpt/tests/infrastructure/reftest/reftest_wait_TestRendered.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/reftest_wait_TestRendered.html rename to tests/wpt/tests/infrastructure/reftest/reftest_wait_TestRendered.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/size-ref.html b/tests/wpt/tests/infrastructure/reftest/size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/size-ref.html rename to tests/wpt/tests/infrastructure/reftest/size-ref.html diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/size.html b/tests/wpt/tests/infrastructure/reftest/size.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/reftest/size.html rename to tests/wpt/tests/infrastructure/reftest/size.html diff --git a/tests/wpt/web-platform-tests/infrastructure/resources/ok.txt b/tests/wpt/tests/infrastructure/resources/ok.txt similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/resources/ok.txt rename to tests/wpt/tests/infrastructure/resources/ok.txt diff --git a/tests/wpt/web-platform-tests/infrastructure/resources/ok.txt.headers b/tests/wpt/tests/infrastructure/resources/ok.txt.headers similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/resources/ok.txt.headers rename to tests/wpt/tests/infrastructure/resources/ok.txt.headers diff --git a/tests/wpt/web-platform-tests/infrastructure/server/context.any.js b/tests/wpt/tests/infrastructure/server/context.any.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/context.any.js rename to tests/wpt/tests/infrastructure/server/context.any.js diff --git a/tests/wpt/web-platform-tests/infrastructure/server/http2-context.sub.h2.any.js b/tests/wpt/tests/infrastructure/server/http2-context.sub.h2.any.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/http2-context.sub.h2.any.js rename to tests/wpt/tests/infrastructure/server/http2-context.sub.h2.any.js diff --git a/tests/wpt/web-platform-tests/infrastructure/server/http2-websocket.sub.h2.any.js b/tests/wpt/tests/infrastructure/server/http2-websocket.sub.h2.any.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/http2-websocket.sub.h2.any.js rename to tests/wpt/tests/infrastructure/server/http2-websocket.sub.h2.any.js diff --git a/tests/wpt/web-platform-tests/infrastructure/server/order-of-metas.any.js b/tests/wpt/tests/infrastructure/server/order-of-metas.any.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/order-of-metas.any.js rename to tests/wpt/tests/infrastructure/server/order-of-metas.any.js diff --git a/tests/wpt/web-platform-tests/infrastructure/server/order-of-metas.window.js b/tests/wpt/tests/infrastructure/server/order-of-metas.window.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/order-of-metas.window.js rename to tests/wpt/tests/infrastructure/server/order-of-metas.window.js diff --git a/tests/wpt/web-platform-tests/infrastructure/server/resources/expect-global.js b/tests/wpt/tests/infrastructure/server/resources/expect-global.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/resources/expect-global.js rename to tests/wpt/tests/infrastructure/server/resources/expect-global.js diff --git a/tests/wpt/web-platform-tests/infrastructure/server/resources/expect-seen-testharness.js b/tests/wpt/tests/infrastructure/server/resources/expect-seen-testharness.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/resources/expect-seen-testharness.js rename to tests/wpt/tests/infrastructure/server/resources/expect-seen-testharness.js diff --git a/tests/wpt/web-platform-tests/infrastructure/server/resources/expect-title-meta.js b/tests/wpt/tests/infrastructure/server/resources/expect-title-meta.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/resources/expect-title-meta.js rename to tests/wpt/tests/infrastructure/server/resources/expect-title-meta.js diff --git a/tests/wpt/web-platform-tests/infrastructure/server/resources/proxy.sub.pac b/tests/wpt/tests/infrastructure/server/resources/proxy.sub.pac similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/resources/proxy.sub.pac rename to tests/wpt/tests/infrastructure/server/resources/proxy.sub.pac diff --git a/tests/wpt/web-platform-tests/infrastructure/server/secure-context.https.any.js b/tests/wpt/tests/infrastructure/server/secure-context.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/secure-context.https.any.js rename to tests/wpt/tests/infrastructure/server/secure-context.https.any.js diff --git a/tests/wpt/web-platform-tests/infrastructure/server/subdomain-flag.www.sub.window.js b/tests/wpt/tests/infrastructure/server/subdomain-flag.www.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/subdomain-flag.www.sub.window.js rename to tests/wpt/tests/infrastructure/server/subdomain-flag.www.sub.window.js diff --git a/tests/wpt/web-platform-tests/infrastructure/server/test-pac.html b/tests/wpt/tests/infrastructure/server/test-pac.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/test-pac.html rename to tests/wpt/tests/infrastructure/server/test-pac.html diff --git a/tests/wpt/web-platform-tests/infrastructure/server/title.any.js b/tests/wpt/tests/infrastructure/server/title.any.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/title.any.js rename to tests/wpt/tests/infrastructure/server/title.any.js diff --git a/tests/wpt/web-platform-tests/infrastructure/server/webtransport-h3.https.sub.any.js b/tests/wpt/tests/infrastructure/server/webtransport-h3.https.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/webtransport-h3.https.sub.any.js rename to tests/wpt/tests/infrastructure/server/webtransport-h3.https.sub.any.js diff --git a/tests/wpt/web-platform-tests/infrastructure/server/wpt-server-http.sub.html b/tests/wpt/tests/infrastructure/server/wpt-server-http.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/wpt-server-http.sub.html rename to tests/wpt/tests/infrastructure/server/wpt-server-http.sub.html diff --git a/tests/wpt/web-platform-tests/infrastructure/server/wpt-server-websocket.sub.html b/tests/wpt/tests/infrastructure/server/wpt-server-websocket.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/wpt-server-websocket.sub.html rename to tests/wpt/tests/infrastructure/server/wpt-server-websocket.sub.html diff --git a/tests/wpt/web-platform-tests/infrastructure/server/wpt-server-wpt-flags.sub.html b/tests/wpt/tests/infrastructure/server/wpt-server-wpt-flags.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/server/wpt-server-wpt-flags.sub.html rename to tests/wpt/tests/infrastructure/server/wpt-server-wpt-flags.sub.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/actionsWithKeyPressed.html b/tests/wpt/tests/infrastructure/testdriver/actions/actionsWithKeyPressed.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/actionsWithKeyPressed.html rename to tests/wpt/tests/infrastructure/testdriver/actions/actionsWithKeyPressed.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/crossOrigin.sub.html b/tests/wpt/tests/infrastructure/testdriver/actions/crossOrigin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/crossOrigin.sub.html rename to tests/wpt/tests/infrastructure/testdriver/actions/crossOrigin.sub.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/crossOriginChild.html b/tests/wpt/tests/infrastructure/testdriver/actions/crossOriginChild.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/crossOriginChild.html rename to tests/wpt/tests/infrastructure/testdriver/actions/crossOriginChild.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/elementPosition.html b/tests/wpt/tests/infrastructure/testdriver/actions/elementPosition.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/elementPosition.html rename to tests/wpt/tests/infrastructure/testdriver/actions/elementPosition.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/elementTiming.html b/tests/wpt/tests/infrastructure/testdriver/actions/elementTiming.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/elementTiming.html rename to tests/wpt/tests/infrastructure/testdriver/actions/elementTiming.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/eventOrder.html b/tests/wpt/tests/infrastructure/testdriver/actions/eventOrder.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/eventOrder.html rename to tests/wpt/tests/infrastructure/testdriver/actions/eventOrder.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/iframe.html b/tests/wpt/tests/infrastructure/testdriver/actions/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/iframe.html rename to tests/wpt/tests/infrastructure/testdriver/actions/iframe.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/iframeChild.html b/tests/wpt/tests/infrastructure/testdriver/actions/iframeChild.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/iframeChild.html rename to tests/wpt/tests/infrastructure/testdriver/actions/iframeChild.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/mouseClickCount.html b/tests/wpt/tests/infrastructure/testdriver/actions/mouseClickCount.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/mouseClickCount.html rename to tests/wpt/tests/infrastructure/testdriver/actions/mouseClickCount.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiDevice.html b/tests/wpt/tests/infrastructure/testdriver/actions/multiDevice.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiDevice.html rename to tests/wpt/tests/infrastructure/testdriver/actions/multiDevice.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPoints.html b/tests/wpt/tests/infrastructure/testdriver/actions/multiTouchPoints.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPoints.html rename to tests/wpt/tests/infrastructure/testdriver/actions/multiTouchPoints.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPointsReleaseFirstPoint.html b/tests/wpt/tests/infrastructure/testdriver/actions/multiTouchPointsReleaseFirstPoint.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPointsReleaseFirstPoint.html rename to tests/wpt/tests/infrastructure/testdriver/actions/multiTouchPointsReleaseFirstPoint.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html b/tests/wpt/tests/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html rename to tests/wpt/tests/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPointsSimultaneousMove.html b/tests/wpt/tests/infrastructure/testdriver/actions/multiTouchPointsSimultaneousMove.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPointsSimultaneousMove.html rename to tests/wpt/tests/infrastructure/testdriver/actions/multiTouchPointsSimultaneousMove.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPointsTwoTouchStarts.html b/tests/wpt/tests/infrastructure/testdriver/actions/multiTouchPointsTwoTouchStarts.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPointsTwoTouchStarts.html rename to tests/wpt/tests/infrastructure/testdriver/actions/multiTouchPointsTwoTouchStarts.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPointsWithPause.html b/tests/wpt/tests/infrastructure/testdriver/actions/multiTouchPointsWithPause.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPointsWithPause.html rename to tests/wpt/tests/infrastructure/testdriver/actions/multiTouchPointsWithPause.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/pause.html b/tests/wpt/tests/infrastructure/testdriver/actions/pause.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/pause.html rename to tests/wpt/tests/infrastructure/testdriver/actions/pause.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/penPointerEventProperties.html b/tests/wpt/tests/infrastructure/testdriver/actions/penPointerEventProperties.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/penPointerEventProperties.html rename to tests/wpt/tests/infrastructure/testdriver/actions/penPointerEventProperties.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/penPointerEvents.html b/tests/wpt/tests/infrastructure/testdriver/actions/penPointerEvents.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/penPointerEvents.html rename to tests/wpt/tests/infrastructure/testdriver/actions/penPointerEvents.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/textEditCommands.html b/tests/wpt/tests/infrastructure/testdriver/actions/textEditCommands.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/textEditCommands.html rename to tests/wpt/tests/infrastructure/testdriver/actions/textEditCommands.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/touchEvents.js b/tests/wpt/tests/infrastructure/testdriver/actions/touchEvents.js similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/touchEvents.js rename to tests/wpt/tests/infrastructure/testdriver/actions/touchEvents.js diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/touchPointerEventProperties.html b/tests/wpt/tests/infrastructure/testdriver/actions/touchPointerEventProperties.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/touchPointerEventProperties.html rename to tests/wpt/tests/infrastructure/testdriver/actions/touchPointerEventProperties.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/wheelScroll.html b/tests/wpt/tests/infrastructure/testdriver/actions/wheelScroll.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/actions/wheelScroll.html rename to tests/wpt/tests/infrastructure/testdriver/actions/wheelScroll.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/bless.html b/tests/wpt/tests/infrastructure/testdriver/bless.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/bless.html rename to tests/wpt/tests/infrastructure/testdriver/bless.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/click-multiple.html b/tests/wpt/tests/infrastructure/testdriver/click-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/click-multiple.html rename to tests/wpt/tests/infrastructure/testdriver/click-multiple.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/click.html b/tests/wpt/tests/infrastructure/testdriver/click.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/click.html rename to tests/wpt/tests/infrastructure/testdriver/click.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/click_child.html b/tests/wpt/tests/infrastructure/testdriver/click_child.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/click_child.html rename to tests/wpt/tests/infrastructure/testdriver/click_child.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/click_child_crossorigin.html b/tests/wpt/tests/infrastructure/testdriver/click_child_crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/click_child_crossorigin.html rename to tests/wpt/tests/infrastructure/testdriver/click_child_crossorigin.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/click_child_testdriver.html b/tests/wpt/tests/infrastructure/testdriver/click_child_testdriver.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/click_child_testdriver.html rename to tests/wpt/tests/infrastructure/testdriver/click_child_testdriver.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/click_iframe.html b/tests/wpt/tests/infrastructure/testdriver/click_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/click_iframe.html rename to tests/wpt/tests/infrastructure/testdriver/click_iframe.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/click_iframe_crossorigin.sub.html b/tests/wpt/tests/infrastructure/testdriver/click_iframe_crossorigin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/click_iframe_crossorigin.sub.html rename to tests/wpt/tests/infrastructure/testdriver/click_iframe_crossorigin.sub.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/click_nested.html b/tests/wpt/tests/infrastructure/testdriver/click_nested.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/click_nested.html rename to tests/wpt/tests/infrastructure/testdriver/click_nested.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/click_nested_crossorigin.sub.html b/tests/wpt/tests/infrastructure/testdriver/click_nested_crossorigin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/click_nested_crossorigin.sub.html rename to tests/wpt/tests/infrastructure/testdriver/click_nested_crossorigin.sub.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/click_outer_child.html b/tests/wpt/tests/infrastructure/testdriver/click_outer_child.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/click_outer_child.html rename to tests/wpt/tests/infrastructure/testdriver/click_outer_child.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/click_outer_child.sub.html b/tests/wpt/tests/infrastructure/testdriver/click_outer_child.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/click_outer_child.sub.html rename to tests/wpt/tests/infrastructure/testdriver/click_outer_child.sub.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/click_window.html b/tests/wpt/tests/infrastructure/testdriver/click_window.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/click_window.html rename to tests/wpt/tests/infrastructure/testdriver/click_window.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/delete_all_cookies.html b/tests/wpt/tests/infrastructure/testdriver/delete_all_cookies.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/delete_all_cookies.html rename to tests/wpt/tests/infrastructure/testdriver/delete_all_cookies.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/file_upload.py b/tests/wpt/tests/infrastructure/testdriver/file_upload.py similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/file_upload.py rename to tests/wpt/tests/infrastructure/testdriver/file_upload.py diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/file_upload.sub.html b/tests/wpt/tests/infrastructure/testdriver/file_upload.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/file_upload.sub.html rename to tests/wpt/tests/infrastructure/testdriver/file_upload.sub.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/file_upload_data.txt b/tests/wpt/tests/infrastructure/testdriver/file_upload_data.txt similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/file_upload_data.txt rename to tests/wpt/tests/infrastructure/testdriver/file_upload_data.txt diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/generate_test_report.html b/tests/wpt/tests/infrastructure/testdriver/generate_test_report.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/generate_test_report.html rename to tests/wpt/tests/infrastructure/testdriver/generate_test_report.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/get_all_cookies.sub.html b/tests/wpt/tests/infrastructure/testdriver/get_all_cookies.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/get_all_cookies.sub.html rename to tests/wpt/tests/infrastructure/testdriver/get_all_cookies.sub.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/get_all_cookies.sub.html.headers b/tests/wpt/tests/infrastructure/testdriver/get_all_cookies.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/get_all_cookies.sub.html.headers rename to tests/wpt/tests/infrastructure/testdriver/get_all_cookies.sub.html.headers diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/get_all_cookies.sub.https.html b/tests/wpt/tests/infrastructure/testdriver/get_all_cookies.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/get_all_cookies.sub.https.html rename to tests/wpt/tests/infrastructure/testdriver/get_all_cookies.sub.https.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/get_all_cookies.sub.https.html.headers b/tests/wpt/tests/infrastructure/testdriver/get_all_cookies.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/get_all_cookies.sub.https.html.headers rename to tests/wpt/tests/infrastructure/testdriver/get_all_cookies.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/get_named_cookie.sub.html b/tests/wpt/tests/infrastructure/testdriver/get_named_cookie.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/get_named_cookie.sub.html rename to tests/wpt/tests/infrastructure/testdriver/get_named_cookie.sub.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/get_named_cookie.sub.html.headers b/tests/wpt/tests/infrastructure/testdriver/get_named_cookie.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/get_named_cookie.sub.html.headers rename to tests/wpt/tests/infrastructure/testdriver/get_named_cookie.sub.html.headers diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/get_named_cookie.sub.https.html b/tests/wpt/tests/infrastructure/testdriver/get_named_cookie.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/get_named_cookie.sub.https.html rename to tests/wpt/tests/infrastructure/testdriver/get_named_cookie.sub.https.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/get_named_cookie.sub.https.html.headers b/tests/wpt/tests/infrastructure/testdriver/get_named_cookie.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/get_named_cookie.sub.https.html.headers rename to tests/wpt/tests/infrastructure/testdriver/get_named_cookie.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/send_keys.html b/tests/wpt/tests/infrastructure/testdriver/send_keys.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/send_keys.html rename to tests/wpt/tests/infrastructure/testdriver/send_keys.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/set_permission.https.html b/tests/wpt/tests/infrastructure/testdriver/set_permission.https.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/set_permission.https.html rename to tests/wpt/tests/infrastructure/testdriver/set_permission.https.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/virtual_authenticator.html b/tests/wpt/tests/infrastructure/testdriver/virtual_authenticator.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testdriver/virtual_authenticator.html rename to tests/wpt/tests/infrastructure/testdriver/virtual_authenticator.html diff --git a/tests/wpt/web-platform-tests/infrastructure/testharness/lone-surrogates.html b/tests/wpt/tests/infrastructure/testharness/lone-surrogates.html similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/testharness/lone-surrogates.html rename to tests/wpt/tests/infrastructure/testharness/lone-surrogates.html diff --git a/tests/wpt/web-platform-tests/infrastructure/webdriver/tests/conftest.py b/tests/wpt/tests/infrastructure/webdriver/tests/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/webdriver/tests/conftest.py rename to tests/wpt/tests/infrastructure/webdriver/tests/conftest.py diff --git a/tests/wpt/web-platform-tests/infrastructure/webdriver/tests/test_load_file.py b/tests/wpt/tests/infrastructure/webdriver/tests/test_load_file.py similarity index 100% rename from tests/wpt/web-platform-tests/infrastructure/webdriver/tests/test_load_file.py rename to tests/wpt/tests/infrastructure/webdriver/tests/test_load_file.py diff --git a/tests/wpt/web-platform-tests/input-device-capabilities/META.yml b/tests/wpt/tests/input-device-capabilities/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/input-device-capabilities/META.yml rename to tests/wpt/tests/input-device-capabilities/META.yml diff --git a/tests/wpt/web-platform-tests/input-device-capabilities/idlharness.window.js b/tests/wpt/tests/input-device-capabilities/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/input-device-capabilities/idlharness.window.js rename to tests/wpt/tests/input-device-capabilities/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/input-events/META.yml b/tests/wpt/tests/input-events/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/input-events/META.yml rename to tests/wpt/tests/input-events/META.yml diff --git a/tests/wpt/web-platform-tests/input-events/idlharness.window.js b/tests/wpt/tests/input-events/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/input-events/idlharness.window.js rename to tests/wpt/tests/input-events/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/input-events/input-events-cut-paste.html b/tests/wpt/tests/input-events/input-events-cut-paste.html similarity index 100% rename from tests/wpt/web-platform-tests/input-events/input-events-cut-paste.html rename to tests/wpt/tests/input-events/input-events-cut-paste.html diff --git a/tests/wpt/web-platform-tests/input-events/input-events-exec-command.html b/tests/wpt/tests/input-events/input-events-exec-command.html similarity index 100% rename from tests/wpt/web-platform-tests/input-events/input-events-exec-command.html rename to tests/wpt/tests/input-events/input-events-exec-command.html diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-backspace.tentative.html b/tests/wpt/tests/input-events/input-events-get-target-ranges-backspace.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-backspace.tentative.html rename to tests/wpt/tests/input-events/input-events-get-target-ranges-backspace.tentative.html diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-deleting-in-list-items.tentative.html b/tests/wpt/tests/input-events/input-events-get-target-ranges-deleting-in-list-items.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-deleting-in-list-items.tentative.html rename to tests/wpt/tests/input-events/input-events-get-target-ranges-deleting-in-list-items.tentative.html diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-deleting-range-across-editing-host-boundaries.tentative.html b/tests/wpt/tests/input-events/input-events-get-target-ranges-deleting-range-across-editing-host-boundaries.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-deleting-range-across-editing-host-boundaries.tentative.html rename to tests/wpt/tests/input-events/input-events-get-target-ranges-deleting-range-across-editing-host-boundaries.tentative.html diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-during-and-after-dispatch.tentative.html b/tests/wpt/tests/input-events/input-events-get-target-ranges-during-and-after-dispatch.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-during-and-after-dispatch.tentative.html rename to tests/wpt/tests/input-events/input-events-get-target-ranges-during-and-after-dispatch.tentative.html diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html b/tests/wpt/tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html rename to tests/wpt/tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-joining-dl-element-and-another-list.tentative.html b/tests/wpt/tests/input-events/input-events-get-target-ranges-joining-dl-element-and-another-list.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-joining-dl-element-and-another-list.tentative.html rename to tests/wpt/tests/input-events/input-events-get-target-ranges-joining-dl-element-and-another-list.tentative.html diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-joining-dl-elements.tentative.html b/tests/wpt/tests/input-events/input-events-get-target-ranges-joining-dl-elements.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-joining-dl-elements.tentative.html rename to tests/wpt/tests/input-events/input-events-get-target-ranges-joining-dl-elements.tentative.html diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-non-collapsed-selection.tentative.html b/tests/wpt/tests/input-events/input-events-get-target-ranges-non-collapsed-selection.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-non-collapsed-selection.tentative.html rename to tests/wpt/tests/input-events/input-events-get-target-ranges-non-collapsed-selection.tentative.html diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges.html b/tests/wpt/tests/input-events/input-events-get-target-ranges.html similarity index 100% rename from tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges.html rename to tests/wpt/tests/input-events/input-events-get-target-ranges.html diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges.js b/tests/wpt/tests/input-events/input-events-get-target-ranges.js similarity index 100% rename from tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges.js rename to tests/wpt/tests/input-events/input-events-get-target-ranges.js diff --git a/tests/wpt/web-platform-tests/input-events/input-events-typing.html b/tests/wpt/tests/input-events/input-events-typing.html similarity index 100% rename from tests/wpt/web-platform-tests/input-events/input-events-typing.html rename to tests/wpt/tests/input-events/input-events-typing.html diff --git a/tests/wpt/web-platform-tests/input-events/select-event-drag-remove.html b/tests/wpt/tests/input-events/select-event-drag-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/input-events/select-event-drag-remove.html rename to tests/wpt/tests/input-events/select-event-drag-remove.html diff --git a/tests/wpt/web-platform-tests/installedapp/META.yml b/tests/wpt/tests/installedapp/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/installedapp/META.yml rename to tests/wpt/tests/installedapp/META.yml diff --git a/tests/wpt/web-platform-tests/installedapp/idlharness.https.window.js b/tests/wpt/tests/installedapp/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/installedapp/idlharness.https.window.js rename to tests/wpt/tests/installedapp/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/installedapp/installedapp.https.window.js b/tests/wpt/tests/installedapp/installedapp.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/installedapp/installedapp.https.window.js rename to tests/wpt/tests/installedapp/installedapp.https.window.js diff --git a/tests/wpt/web-platform-tests/installedapp/resources/iframe.html b/tests/wpt/tests/installedapp/resources/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/installedapp/resources/iframe.html rename to tests/wpt/tests/installedapp/resources/iframe.html diff --git a/tests/wpt/web-platform-tests/interfaces/ANGLE_instanced_arrays.idl b/tests/wpt/tests/interfaces/ANGLE_instanced_arrays.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/ANGLE_instanced_arrays.idl rename to tests/wpt/tests/interfaces/ANGLE_instanced_arrays.idl diff --git a/tests/wpt/web-platform-tests/interfaces/CSP.idl b/tests/wpt/tests/interfaces/CSP.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/CSP.idl rename to tests/wpt/tests/interfaces/CSP.idl diff --git a/tests/wpt/web-platform-tests/interfaces/DOM-Parsing.idl b/tests/wpt/tests/interfaces/DOM-Parsing.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/DOM-Parsing.idl rename to tests/wpt/tests/interfaces/DOM-Parsing.idl diff --git a/tests/wpt/web-platform-tests/interfaces/EXT_blend_minmax.idl b/tests/wpt/tests/interfaces/EXT_blend_minmax.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/EXT_blend_minmax.idl rename to tests/wpt/tests/interfaces/EXT_blend_minmax.idl diff --git a/tests/wpt/web-platform-tests/interfaces/EXT_color_buffer_float.idl b/tests/wpt/tests/interfaces/EXT_color_buffer_float.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/EXT_color_buffer_float.idl rename to tests/wpt/tests/interfaces/EXT_color_buffer_float.idl diff --git a/tests/wpt/web-platform-tests/interfaces/EXT_color_buffer_half_float.idl b/tests/wpt/tests/interfaces/EXT_color_buffer_half_float.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/EXT_color_buffer_half_float.idl rename to tests/wpt/tests/interfaces/EXT_color_buffer_half_float.idl diff --git a/tests/wpt/web-platform-tests/interfaces/EXT_disjoint_timer_query.idl b/tests/wpt/tests/interfaces/EXT_disjoint_timer_query.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/EXT_disjoint_timer_query.idl rename to tests/wpt/tests/interfaces/EXT_disjoint_timer_query.idl diff --git a/tests/wpt/web-platform-tests/interfaces/EXT_disjoint_timer_query_webgl2.idl b/tests/wpt/tests/interfaces/EXT_disjoint_timer_query_webgl2.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/EXT_disjoint_timer_query_webgl2.idl rename to tests/wpt/tests/interfaces/EXT_disjoint_timer_query_webgl2.idl diff --git a/tests/wpt/web-platform-tests/interfaces/EXT_float_blend.idl b/tests/wpt/tests/interfaces/EXT_float_blend.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/EXT_float_blend.idl rename to tests/wpt/tests/interfaces/EXT_float_blend.idl diff --git a/tests/wpt/web-platform-tests/interfaces/EXT_frag_depth.idl b/tests/wpt/tests/interfaces/EXT_frag_depth.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/EXT_frag_depth.idl rename to tests/wpt/tests/interfaces/EXT_frag_depth.idl diff --git a/tests/wpt/web-platform-tests/interfaces/EXT_sRGB.idl b/tests/wpt/tests/interfaces/EXT_sRGB.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/EXT_sRGB.idl rename to tests/wpt/tests/interfaces/EXT_sRGB.idl diff --git a/tests/wpt/web-platform-tests/interfaces/EXT_shader_texture_lod.idl b/tests/wpt/tests/interfaces/EXT_shader_texture_lod.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/EXT_shader_texture_lod.idl rename to tests/wpt/tests/interfaces/EXT_shader_texture_lod.idl diff --git a/tests/wpt/web-platform-tests/interfaces/EXT_texture_compression_bptc.idl b/tests/wpt/tests/interfaces/EXT_texture_compression_bptc.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/EXT_texture_compression_bptc.idl rename to tests/wpt/tests/interfaces/EXT_texture_compression_bptc.idl diff --git a/tests/wpt/web-platform-tests/interfaces/EXT_texture_compression_rgtc.idl b/tests/wpt/tests/interfaces/EXT_texture_compression_rgtc.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/EXT_texture_compression_rgtc.idl rename to tests/wpt/tests/interfaces/EXT_texture_compression_rgtc.idl diff --git a/tests/wpt/web-platform-tests/interfaces/EXT_texture_filter_anisotropic.idl b/tests/wpt/tests/interfaces/EXT_texture_filter_anisotropic.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/EXT_texture_filter_anisotropic.idl rename to tests/wpt/tests/interfaces/EXT_texture_filter_anisotropic.idl diff --git a/tests/wpt/web-platform-tests/interfaces/EXT_texture_norm16.idl b/tests/wpt/tests/interfaces/EXT_texture_norm16.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/EXT_texture_norm16.idl rename to tests/wpt/tests/interfaces/EXT_texture_norm16.idl diff --git a/tests/wpt/web-platform-tests/interfaces/FedCM.idl b/tests/wpt/tests/interfaces/FedCM.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/FedCM.idl rename to tests/wpt/tests/interfaces/FedCM.idl diff --git a/tests/wpt/web-platform-tests/interfaces/FileAPI.idl b/tests/wpt/tests/interfaces/FileAPI.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/FileAPI.idl rename to tests/wpt/tests/interfaces/FileAPI.idl diff --git a/tests/wpt/web-platform-tests/interfaces/IndexedDB.idl b/tests/wpt/tests/interfaces/IndexedDB.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/IndexedDB.idl rename to tests/wpt/tests/interfaces/IndexedDB.idl diff --git a/tests/wpt/web-platform-tests/interfaces/KHR_parallel_shader_compile.idl b/tests/wpt/tests/interfaces/KHR_parallel_shader_compile.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/KHR_parallel_shader_compile.idl rename to tests/wpt/tests/interfaces/KHR_parallel_shader_compile.idl diff --git a/tests/wpt/web-platform-tests/interfaces/META.yml b/tests/wpt/tests/interfaces/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/META.yml rename to tests/wpt/tests/interfaces/META.yml diff --git a/tests/wpt/web-platform-tests/interfaces/OES_draw_buffers_indexed.idl b/tests/wpt/tests/interfaces/OES_draw_buffers_indexed.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/OES_draw_buffers_indexed.idl rename to tests/wpt/tests/interfaces/OES_draw_buffers_indexed.idl diff --git a/tests/wpt/web-platform-tests/interfaces/OES_element_index_uint.idl b/tests/wpt/tests/interfaces/OES_element_index_uint.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/OES_element_index_uint.idl rename to tests/wpt/tests/interfaces/OES_element_index_uint.idl diff --git a/tests/wpt/web-platform-tests/interfaces/OES_fbo_render_mipmap.idl b/tests/wpt/tests/interfaces/OES_fbo_render_mipmap.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/OES_fbo_render_mipmap.idl rename to tests/wpt/tests/interfaces/OES_fbo_render_mipmap.idl diff --git a/tests/wpt/web-platform-tests/interfaces/OES_standard_derivatives.idl b/tests/wpt/tests/interfaces/OES_standard_derivatives.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/OES_standard_derivatives.idl rename to tests/wpt/tests/interfaces/OES_standard_derivatives.idl diff --git a/tests/wpt/web-platform-tests/interfaces/OES_texture_float.idl b/tests/wpt/tests/interfaces/OES_texture_float.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/OES_texture_float.idl rename to tests/wpt/tests/interfaces/OES_texture_float.idl diff --git a/tests/wpt/web-platform-tests/interfaces/OES_texture_float_linear.idl b/tests/wpt/tests/interfaces/OES_texture_float_linear.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/OES_texture_float_linear.idl rename to tests/wpt/tests/interfaces/OES_texture_float_linear.idl diff --git a/tests/wpt/web-platform-tests/interfaces/OES_texture_half_float.idl b/tests/wpt/tests/interfaces/OES_texture_half_float.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/OES_texture_half_float.idl rename to tests/wpt/tests/interfaces/OES_texture_half_float.idl diff --git a/tests/wpt/web-platform-tests/interfaces/OES_texture_half_float_linear.idl b/tests/wpt/tests/interfaces/OES_texture_half_float_linear.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/OES_texture_half_float_linear.idl rename to tests/wpt/tests/interfaces/OES_texture_half_float_linear.idl diff --git a/tests/wpt/web-platform-tests/interfaces/OES_vertex_array_object.idl b/tests/wpt/tests/interfaces/OES_vertex_array_object.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/OES_vertex_array_object.idl rename to tests/wpt/tests/interfaces/OES_vertex_array_object.idl diff --git a/tests/wpt/web-platform-tests/interfaces/OVR_multiview2.idl b/tests/wpt/tests/interfaces/OVR_multiview2.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/OVR_multiview2.idl rename to tests/wpt/tests/interfaces/OVR_multiview2.idl diff --git a/tests/wpt/web-platform-tests/interfaces/README.md b/tests/wpt/tests/interfaces/README.md similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/README.md rename to tests/wpt/tests/interfaces/README.md diff --git a/tests/wpt/web-platform-tests/interfaces/SVG.idl b/tests/wpt/tests/interfaces/SVG.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/SVG.idl rename to tests/wpt/tests/interfaces/SVG.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_blend_equation_advanced_coherent.idl b/tests/wpt/tests/interfaces/WEBGL_blend_equation_advanced_coherent.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_blend_equation_advanced_coherent.idl rename to tests/wpt/tests/interfaces/WEBGL_blend_equation_advanced_coherent.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_clip_cull_distance.idl b/tests/wpt/tests/interfaces/WEBGL_clip_cull_distance.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_clip_cull_distance.idl rename to tests/wpt/tests/interfaces/WEBGL_clip_cull_distance.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_color_buffer_float.idl b/tests/wpt/tests/interfaces/WEBGL_color_buffer_float.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_color_buffer_float.idl rename to tests/wpt/tests/interfaces/WEBGL_color_buffer_float.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_compressed_texture_astc.idl b/tests/wpt/tests/interfaces/WEBGL_compressed_texture_astc.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_compressed_texture_astc.idl rename to tests/wpt/tests/interfaces/WEBGL_compressed_texture_astc.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_compressed_texture_etc.idl b/tests/wpt/tests/interfaces/WEBGL_compressed_texture_etc.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_compressed_texture_etc.idl rename to tests/wpt/tests/interfaces/WEBGL_compressed_texture_etc.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_compressed_texture_etc1.idl b/tests/wpt/tests/interfaces/WEBGL_compressed_texture_etc1.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_compressed_texture_etc1.idl rename to tests/wpt/tests/interfaces/WEBGL_compressed_texture_etc1.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_compressed_texture_pvrtc.idl b/tests/wpt/tests/interfaces/WEBGL_compressed_texture_pvrtc.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_compressed_texture_pvrtc.idl rename to tests/wpt/tests/interfaces/WEBGL_compressed_texture_pvrtc.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_compressed_texture_s3tc.idl b/tests/wpt/tests/interfaces/WEBGL_compressed_texture_s3tc.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_compressed_texture_s3tc.idl rename to tests/wpt/tests/interfaces/WEBGL_compressed_texture_s3tc.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_compressed_texture_s3tc_srgb.idl b/tests/wpt/tests/interfaces/WEBGL_compressed_texture_s3tc_srgb.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_compressed_texture_s3tc_srgb.idl rename to tests/wpt/tests/interfaces/WEBGL_compressed_texture_s3tc_srgb.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_debug_renderer_info.idl b/tests/wpt/tests/interfaces/WEBGL_debug_renderer_info.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_debug_renderer_info.idl rename to tests/wpt/tests/interfaces/WEBGL_debug_renderer_info.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_debug_shaders.idl b/tests/wpt/tests/interfaces/WEBGL_debug_shaders.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_debug_shaders.idl rename to tests/wpt/tests/interfaces/WEBGL_debug_shaders.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_depth_texture.idl b/tests/wpt/tests/interfaces/WEBGL_depth_texture.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_depth_texture.idl rename to tests/wpt/tests/interfaces/WEBGL_depth_texture.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_draw_buffers.idl b/tests/wpt/tests/interfaces/WEBGL_draw_buffers.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_draw_buffers.idl rename to tests/wpt/tests/interfaces/WEBGL_draw_buffers.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_draw_instanced_base_vertex_base_instance.idl b/tests/wpt/tests/interfaces/WEBGL_draw_instanced_base_vertex_base_instance.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_draw_instanced_base_vertex_base_instance.idl rename to tests/wpt/tests/interfaces/WEBGL_draw_instanced_base_vertex_base_instance.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_lose_context.idl b/tests/wpt/tests/interfaces/WEBGL_lose_context.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_lose_context.idl rename to tests/wpt/tests/interfaces/WEBGL_lose_context.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_multi_draw.idl b/tests/wpt/tests/interfaces/WEBGL_multi_draw.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_multi_draw.idl rename to tests/wpt/tests/interfaces/WEBGL_multi_draw.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_multi_draw_instanced_base_vertex_base_instance.idl b/tests/wpt/tests/interfaces/WEBGL_multi_draw_instanced_base_vertex_base_instance.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_multi_draw_instanced_base_vertex_base_instance.idl rename to tests/wpt/tests/interfaces/WEBGL_multi_draw_instanced_base_vertex_base_instance.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WEBGL_provoking_vertex.idl b/tests/wpt/tests/interfaces/WEBGL_provoking_vertex.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WEBGL_provoking_vertex.idl rename to tests/wpt/tests/interfaces/WEBGL_provoking_vertex.idl diff --git a/tests/wpt/web-platform-tests/interfaces/WebCryptoAPI.idl b/tests/wpt/tests/interfaces/WebCryptoAPI.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/WebCryptoAPI.idl rename to tests/wpt/tests/interfaces/WebCryptoAPI.idl diff --git a/tests/wpt/web-platform-tests/interfaces/accelerometer.idl b/tests/wpt/tests/interfaces/accelerometer.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/accelerometer.idl rename to tests/wpt/tests/interfaces/accelerometer.idl diff --git a/tests/wpt/web-platform-tests/interfaces/ambient-light.idl b/tests/wpt/tests/interfaces/ambient-light.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/ambient-light.idl rename to tests/wpt/tests/interfaces/ambient-light.idl diff --git a/tests/wpt/web-platform-tests/interfaces/anchors.idl b/tests/wpt/tests/interfaces/anchors.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/anchors.idl rename to tests/wpt/tests/interfaces/anchors.idl diff --git a/tests/wpt/web-platform-tests/interfaces/attribution-reporting-api.idl b/tests/wpt/tests/interfaces/attribution-reporting-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/attribution-reporting-api.idl rename to tests/wpt/tests/interfaces/attribution-reporting-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/audio-output.idl b/tests/wpt/tests/interfaces/audio-output.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/audio-output.idl rename to tests/wpt/tests/interfaces/audio-output.idl diff --git a/tests/wpt/web-platform-tests/interfaces/autoplay-detection.idl b/tests/wpt/tests/interfaces/autoplay-detection.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/autoplay-detection.idl rename to tests/wpt/tests/interfaces/autoplay-detection.idl diff --git a/tests/wpt/web-platform-tests/interfaces/background-fetch.idl b/tests/wpt/tests/interfaces/background-fetch.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/background-fetch.idl rename to tests/wpt/tests/interfaces/background-fetch.idl diff --git a/tests/wpt/web-platform-tests/interfaces/background-sync.idl b/tests/wpt/tests/interfaces/background-sync.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/background-sync.idl rename to tests/wpt/tests/interfaces/background-sync.idl diff --git a/tests/wpt/web-platform-tests/interfaces/badging.idl b/tests/wpt/tests/interfaces/badging.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/badging.idl rename to tests/wpt/tests/interfaces/badging.idl diff --git a/tests/wpt/web-platform-tests/interfaces/battery-status.idl b/tests/wpt/tests/interfaces/battery-status.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/battery-status.idl rename to tests/wpt/tests/interfaces/battery-status.idl diff --git a/tests/wpt/web-platform-tests/interfaces/beacon.idl b/tests/wpt/tests/interfaces/beacon.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/beacon.idl rename to tests/wpt/tests/interfaces/beacon.idl diff --git a/tests/wpt/web-platform-tests/interfaces/capture-handle-identity.idl b/tests/wpt/tests/interfaces/capture-handle-identity.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/capture-handle-identity.idl rename to tests/wpt/tests/interfaces/capture-handle-identity.idl diff --git a/tests/wpt/web-platform-tests/interfaces/clipboard-apis.idl b/tests/wpt/tests/interfaces/clipboard-apis.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/clipboard-apis.idl rename to tests/wpt/tests/interfaces/clipboard-apis.idl diff --git a/tests/wpt/web-platform-tests/interfaces/close-watcher.idl b/tests/wpt/tests/interfaces/close-watcher.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/close-watcher.idl rename to tests/wpt/tests/interfaces/close-watcher.idl diff --git a/tests/wpt/web-platform-tests/interfaces/compat.idl b/tests/wpt/tests/interfaces/compat.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/compat.idl rename to tests/wpt/tests/interfaces/compat.idl diff --git a/tests/wpt/web-platform-tests/interfaces/compression.idl b/tests/wpt/tests/interfaces/compression.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/compression.idl rename to tests/wpt/tests/interfaces/compression.idl diff --git a/tests/wpt/web-platform-tests/interfaces/compute-pressure.idl b/tests/wpt/tests/interfaces/compute-pressure.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/compute-pressure.idl rename to tests/wpt/tests/interfaces/compute-pressure.idl diff --git a/tests/wpt/web-platform-tests/interfaces/console.idl b/tests/wpt/tests/interfaces/console.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/console.idl rename to tests/wpt/tests/interfaces/console.idl diff --git a/tests/wpt/web-platform-tests/interfaces/contact-picker.idl b/tests/wpt/tests/interfaces/contact-picker.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/contact-picker.idl rename to tests/wpt/tests/interfaces/contact-picker.idl diff --git a/tests/wpt/web-platform-tests/interfaces/content-index.idl b/tests/wpt/tests/interfaces/content-index.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/content-index.idl rename to tests/wpt/tests/interfaces/content-index.idl diff --git a/tests/wpt/web-platform-tests/interfaces/cookie-store.idl b/tests/wpt/tests/interfaces/cookie-store.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/cookie-store.idl rename to tests/wpt/tests/interfaces/cookie-store.idl diff --git a/tests/wpt/web-platform-tests/interfaces/crash-reporting.idl b/tests/wpt/tests/interfaces/crash-reporting.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/crash-reporting.idl rename to tests/wpt/tests/interfaces/crash-reporting.idl diff --git a/tests/wpt/web-platform-tests/interfaces/credential-management.idl b/tests/wpt/tests/interfaces/credential-management.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/credential-management.idl rename to tests/wpt/tests/interfaces/credential-management.idl diff --git a/tests/wpt/web-platform-tests/interfaces/csp-embedded-enforcement.idl b/tests/wpt/tests/interfaces/csp-embedded-enforcement.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/csp-embedded-enforcement.idl rename to tests/wpt/tests/interfaces/csp-embedded-enforcement.idl diff --git a/tests/wpt/web-platform-tests/interfaces/csp-next.idl b/tests/wpt/tests/interfaces/csp-next.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/csp-next.idl rename to tests/wpt/tests/interfaces/csp-next.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-animation-worklet.idl b/tests/wpt/tests/interfaces/css-animation-worklet.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-animation-worklet.idl rename to tests/wpt/tests/interfaces/css-animation-worklet.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-animations-2.idl b/tests/wpt/tests/interfaces/css-animations-2.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-animations-2.idl rename to tests/wpt/tests/interfaces/css-animations-2.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-animations.idl b/tests/wpt/tests/interfaces/css-animations.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-animations.idl rename to tests/wpt/tests/interfaces/css-animations.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-cascade-6.idl b/tests/wpt/tests/interfaces/css-cascade-6.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-cascade-6.idl rename to tests/wpt/tests/interfaces/css-cascade-6.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-cascade.idl b/tests/wpt/tests/interfaces/css-cascade.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-cascade.idl rename to tests/wpt/tests/interfaces/css-cascade.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-color-5.idl b/tests/wpt/tests/interfaces/css-color-5.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-color-5.idl rename to tests/wpt/tests/interfaces/css-color-5.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-conditional.idl b/tests/wpt/tests/interfaces/css-conditional.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-conditional.idl rename to tests/wpt/tests/interfaces/css-conditional.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-contain-3.idl b/tests/wpt/tests/interfaces/css-contain-3.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-contain-3.idl rename to tests/wpt/tests/interfaces/css-contain-3.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-contain.idl b/tests/wpt/tests/interfaces/css-contain.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-contain.idl rename to tests/wpt/tests/interfaces/css-contain.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-counter-styles.idl b/tests/wpt/tests/interfaces/css-counter-styles.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-counter-styles.idl rename to tests/wpt/tests/interfaces/css-counter-styles.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-font-loading.idl b/tests/wpt/tests/interfaces/css-font-loading.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-font-loading.idl rename to tests/wpt/tests/interfaces/css-font-loading.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-fonts.idl b/tests/wpt/tests/interfaces/css-fonts.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-fonts.idl rename to tests/wpt/tests/interfaces/css-fonts.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-highlight-api.idl b/tests/wpt/tests/interfaces/css-highlight-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-highlight-api.idl rename to tests/wpt/tests/interfaces/css-highlight-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-images-4.idl b/tests/wpt/tests/interfaces/css-images-4.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-images-4.idl rename to tests/wpt/tests/interfaces/css-images-4.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-layout-api.idl b/tests/wpt/tests/interfaces/css-layout-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-layout-api.idl rename to tests/wpt/tests/interfaces/css-layout-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-masking.idl b/tests/wpt/tests/interfaces/css-masking.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-masking.idl rename to tests/wpt/tests/interfaces/css-masking.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-nav.idl b/tests/wpt/tests/interfaces/css-nav.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-nav.idl rename to tests/wpt/tests/interfaces/css-nav.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-nesting.idl b/tests/wpt/tests/interfaces/css-nesting.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-nesting.idl rename to tests/wpt/tests/interfaces/css-nesting.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-paint-api.idl b/tests/wpt/tests/interfaces/css-paint-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-paint-api.idl rename to tests/wpt/tests/interfaces/css-paint-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-parser-api.idl b/tests/wpt/tests/interfaces/css-parser-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-parser-api.idl rename to tests/wpt/tests/interfaces/css-parser-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-properties-values-api.idl b/tests/wpt/tests/interfaces/css-properties-values-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-properties-values-api.idl rename to tests/wpt/tests/interfaces/css-properties-values-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-pseudo.idl b/tests/wpt/tests/interfaces/css-pseudo.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-pseudo.idl rename to tests/wpt/tests/interfaces/css-pseudo.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-regions.idl b/tests/wpt/tests/interfaces/css-regions.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-regions.idl rename to tests/wpt/tests/interfaces/css-regions.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-shadow-parts.idl b/tests/wpt/tests/interfaces/css-shadow-parts.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-shadow-parts.idl rename to tests/wpt/tests/interfaces/css-shadow-parts.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-toggle.tentative.idl b/tests/wpt/tests/interfaces/css-toggle.tentative.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-toggle.tentative.idl rename to tests/wpt/tests/interfaces/css-toggle.tentative.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-transitions-2.idl b/tests/wpt/tests/interfaces/css-transitions-2.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-transitions-2.idl rename to tests/wpt/tests/interfaces/css-transitions-2.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-transitions.idl b/tests/wpt/tests/interfaces/css-transitions.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-transitions.idl rename to tests/wpt/tests/interfaces/css-transitions.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-typed-om.idl b/tests/wpt/tests/interfaces/css-typed-om.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-typed-om.idl rename to tests/wpt/tests/interfaces/css-typed-om.idl diff --git a/tests/wpt/web-platform-tests/interfaces/css-view-transitions.idl b/tests/wpt/tests/interfaces/css-view-transitions.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/css-view-transitions.idl rename to tests/wpt/tests/interfaces/css-view-transitions.idl diff --git a/tests/wpt/web-platform-tests/interfaces/cssom-view.idl b/tests/wpt/tests/interfaces/cssom-view.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/cssom-view.idl rename to tests/wpt/tests/interfaces/cssom-view.idl diff --git a/tests/wpt/web-platform-tests/interfaces/cssom.idl b/tests/wpt/tests/interfaces/cssom.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/cssom.idl rename to tests/wpt/tests/interfaces/cssom.idl diff --git a/tests/wpt/web-platform-tests/interfaces/custom-state-pseudo-class.idl b/tests/wpt/tests/interfaces/custom-state-pseudo-class.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/custom-state-pseudo-class.idl rename to tests/wpt/tests/interfaces/custom-state-pseudo-class.idl diff --git a/tests/wpt/web-platform-tests/interfaces/datacue.idl b/tests/wpt/tests/interfaces/datacue.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/datacue.idl rename to tests/wpt/tests/interfaces/datacue.idl diff --git a/tests/wpt/web-platform-tests/interfaces/deprecation-reporting.idl b/tests/wpt/tests/interfaces/deprecation-reporting.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/deprecation-reporting.idl rename to tests/wpt/tests/interfaces/deprecation-reporting.idl diff --git a/tests/wpt/web-platform-tests/interfaces/device-memory.idl b/tests/wpt/tests/interfaces/device-memory.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/device-memory.idl rename to tests/wpt/tests/interfaces/device-memory.idl diff --git a/tests/wpt/web-platform-tests/interfaces/device-posture.idl b/tests/wpt/tests/interfaces/device-posture.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/device-posture.idl rename to tests/wpt/tests/interfaces/device-posture.idl diff --git a/tests/wpt/web-platform-tests/interfaces/digital-goods.idl b/tests/wpt/tests/interfaces/digital-goods.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/digital-goods.idl rename to tests/wpt/tests/interfaces/digital-goods.idl diff --git a/tests/wpt/web-platform-tests/interfaces/document-picture-in-picture.idl b/tests/wpt/tests/interfaces/document-picture-in-picture.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/document-picture-in-picture.idl rename to tests/wpt/tests/interfaces/document-picture-in-picture.idl diff --git a/tests/wpt/web-platform-tests/interfaces/dom.idl b/tests/wpt/tests/interfaces/dom.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/dom.idl rename to tests/wpt/tests/interfaces/dom.idl diff --git a/tests/wpt/web-platform-tests/interfaces/edit-context.idl b/tests/wpt/tests/interfaces/edit-context.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/edit-context.idl rename to tests/wpt/tests/interfaces/edit-context.idl diff --git a/tests/wpt/web-platform-tests/interfaces/element-timing.idl b/tests/wpt/tests/interfaces/element-timing.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/element-timing.idl rename to tests/wpt/tests/interfaces/element-timing.idl diff --git a/tests/wpt/web-platform-tests/interfaces/encoding.idl b/tests/wpt/tests/interfaces/encoding.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/encoding.idl rename to tests/wpt/tests/interfaces/encoding.idl diff --git a/tests/wpt/web-platform-tests/interfaces/encrypted-media.idl b/tests/wpt/tests/interfaces/encrypted-media.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/encrypted-media.idl rename to tests/wpt/tests/interfaces/encrypted-media.idl diff --git a/tests/wpt/web-platform-tests/interfaces/entries-api.idl b/tests/wpt/tests/interfaces/entries-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/entries-api.idl rename to tests/wpt/tests/interfaces/entries-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/event-timing.idl b/tests/wpt/tests/interfaces/event-timing.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/event-timing.idl rename to tests/wpt/tests/interfaces/event-timing.idl diff --git a/tests/wpt/web-platform-tests/interfaces/eyedropper-api.idl b/tests/wpt/tests/interfaces/eyedropper-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/eyedropper-api.idl rename to tests/wpt/tests/interfaces/eyedropper-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/fenced-frame.idl b/tests/wpt/tests/interfaces/fenced-frame.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/fenced-frame.idl rename to tests/wpt/tests/interfaces/fenced-frame.idl diff --git a/tests/wpt/web-platform-tests/interfaces/fetch.idl b/tests/wpt/tests/interfaces/fetch.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/fetch.idl rename to tests/wpt/tests/interfaces/fetch.idl diff --git a/tests/wpt/web-platform-tests/interfaces/fido.idl b/tests/wpt/tests/interfaces/fido.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/fido.idl rename to tests/wpt/tests/interfaces/fido.idl diff --git a/tests/wpt/web-platform-tests/interfaces/file-system-access.idl b/tests/wpt/tests/interfaces/file-system-access.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/file-system-access.idl rename to tests/wpt/tests/interfaces/file-system-access.idl diff --git a/tests/wpt/web-platform-tests/interfaces/filter-effects.idl b/tests/wpt/tests/interfaces/filter-effects.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/filter-effects.idl rename to tests/wpt/tests/interfaces/filter-effects.idl diff --git a/tests/wpt/web-platform-tests/interfaces/font-metrics-api.idl b/tests/wpt/tests/interfaces/font-metrics-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/font-metrics-api.idl rename to tests/wpt/tests/interfaces/font-metrics-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/fs.idl b/tests/wpt/tests/interfaces/fs.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/fs.idl rename to tests/wpt/tests/interfaces/fs.idl diff --git a/tests/wpt/web-platform-tests/interfaces/fullscreen.idl b/tests/wpt/tests/interfaces/fullscreen.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/fullscreen.idl rename to tests/wpt/tests/interfaces/fullscreen.idl diff --git a/tests/wpt/web-platform-tests/interfaces/gamepad-extensions.idl b/tests/wpt/tests/interfaces/gamepad-extensions.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/gamepad-extensions.idl rename to tests/wpt/tests/interfaces/gamepad-extensions.idl diff --git a/tests/wpt/web-platform-tests/interfaces/gamepad.idl b/tests/wpt/tests/interfaces/gamepad.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/gamepad.idl rename to tests/wpt/tests/interfaces/gamepad.idl diff --git a/tests/wpt/web-platform-tests/interfaces/generic-sensor.idl b/tests/wpt/tests/interfaces/generic-sensor.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/generic-sensor.idl rename to tests/wpt/tests/interfaces/generic-sensor.idl diff --git a/tests/wpt/web-platform-tests/interfaces/geolocation-sensor.idl b/tests/wpt/tests/interfaces/geolocation-sensor.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/geolocation-sensor.idl rename to tests/wpt/tests/interfaces/geolocation-sensor.idl diff --git a/tests/wpt/web-platform-tests/interfaces/geolocation.idl b/tests/wpt/tests/interfaces/geolocation.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/geolocation.idl rename to tests/wpt/tests/interfaces/geolocation.idl diff --git a/tests/wpt/web-platform-tests/interfaces/geometry.idl b/tests/wpt/tests/interfaces/geometry.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/geometry.idl rename to tests/wpt/tests/interfaces/geometry.idl diff --git a/tests/wpt/web-platform-tests/interfaces/get-installed-related-apps.idl b/tests/wpt/tests/interfaces/get-installed-related-apps.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/get-installed-related-apps.idl rename to tests/wpt/tests/interfaces/get-installed-related-apps.idl diff --git a/tests/wpt/web-platform-tests/interfaces/gpc-spec.idl b/tests/wpt/tests/interfaces/gpc-spec.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/gpc-spec.idl rename to tests/wpt/tests/interfaces/gpc-spec.idl diff --git a/tests/wpt/web-platform-tests/interfaces/gyroscope.idl b/tests/wpt/tests/interfaces/gyroscope.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/gyroscope.idl rename to tests/wpt/tests/interfaces/gyroscope.idl diff --git a/tests/wpt/web-platform-tests/interfaces/hr-time.idl b/tests/wpt/tests/interfaces/hr-time.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/hr-time.idl rename to tests/wpt/tests/interfaces/hr-time.idl diff --git a/tests/wpt/web-platform-tests/interfaces/html-media-capture.idl b/tests/wpt/tests/interfaces/html-media-capture.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/html-media-capture.idl rename to tests/wpt/tests/interfaces/html-media-capture.idl diff --git a/tests/wpt/web-platform-tests/interfaces/html.idl b/tests/wpt/tests/interfaces/html.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/html.idl rename to tests/wpt/tests/interfaces/html.idl diff --git a/tests/wpt/web-platform-tests/interfaces/idle-detection.idl b/tests/wpt/tests/interfaces/idle-detection.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/idle-detection.idl rename to tests/wpt/tests/interfaces/idle-detection.idl diff --git a/tests/wpt/web-platform-tests/interfaces/image-capture.idl b/tests/wpt/tests/interfaces/image-capture.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/image-capture.idl rename to tests/wpt/tests/interfaces/image-capture.idl diff --git a/tests/wpt/web-platform-tests/interfaces/image-resource.idl b/tests/wpt/tests/interfaces/image-resource.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/image-resource.idl rename to tests/wpt/tests/interfaces/image-resource.idl diff --git a/tests/wpt/web-platform-tests/interfaces/ink-enhancement.idl b/tests/wpt/tests/interfaces/ink-enhancement.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/ink-enhancement.idl rename to tests/wpt/tests/interfaces/ink-enhancement.idl diff --git a/tests/wpt/web-platform-tests/interfaces/input-device-capabilities.idl b/tests/wpt/tests/interfaces/input-device-capabilities.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/input-device-capabilities.idl rename to tests/wpt/tests/interfaces/input-device-capabilities.idl diff --git a/tests/wpt/web-platform-tests/interfaces/input-events.idl b/tests/wpt/tests/interfaces/input-events.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/input-events.idl rename to tests/wpt/tests/interfaces/input-events.idl diff --git a/tests/wpt/web-platform-tests/interfaces/intersection-observer.idl b/tests/wpt/tests/interfaces/intersection-observer.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/intersection-observer.idl rename to tests/wpt/tests/interfaces/intersection-observer.idl diff --git a/tests/wpt/web-platform-tests/interfaces/intervention-reporting.idl b/tests/wpt/tests/interfaces/intervention-reporting.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/intervention-reporting.idl rename to tests/wpt/tests/interfaces/intervention-reporting.idl diff --git a/tests/wpt/web-platform-tests/interfaces/is-input-pending.idl b/tests/wpt/tests/interfaces/is-input-pending.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/is-input-pending.idl rename to tests/wpt/tests/interfaces/is-input-pending.idl diff --git a/tests/wpt/web-platform-tests/interfaces/js-self-profiling.idl b/tests/wpt/tests/interfaces/js-self-profiling.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/js-self-profiling.idl rename to tests/wpt/tests/interfaces/js-self-profiling.idl diff --git a/tests/wpt/web-platform-tests/interfaces/keyboard-lock.idl b/tests/wpt/tests/interfaces/keyboard-lock.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/keyboard-lock.idl rename to tests/wpt/tests/interfaces/keyboard-lock.idl diff --git a/tests/wpt/web-platform-tests/interfaces/keyboard-map.idl b/tests/wpt/tests/interfaces/keyboard-map.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/keyboard-map.idl rename to tests/wpt/tests/interfaces/keyboard-map.idl diff --git a/tests/wpt/web-platform-tests/interfaces/largest-contentful-paint.idl b/tests/wpt/tests/interfaces/largest-contentful-paint.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/largest-contentful-paint.idl rename to tests/wpt/tests/interfaces/largest-contentful-paint.idl diff --git a/tests/wpt/web-platform-tests/interfaces/layout-instability.idl b/tests/wpt/tests/interfaces/layout-instability.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/layout-instability.idl rename to tests/wpt/tests/interfaces/layout-instability.idl diff --git a/tests/wpt/web-platform-tests/interfaces/local-font-access.idl b/tests/wpt/tests/interfaces/local-font-access.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/local-font-access.idl rename to tests/wpt/tests/interfaces/local-font-access.idl diff --git a/tests/wpt/web-platform-tests/interfaces/longtasks.idl b/tests/wpt/tests/interfaces/longtasks.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/longtasks.idl rename to tests/wpt/tests/interfaces/longtasks.idl diff --git a/tests/wpt/web-platform-tests/interfaces/magnetometer.idl b/tests/wpt/tests/interfaces/magnetometer.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/magnetometer.idl rename to tests/wpt/tests/interfaces/magnetometer.idl diff --git a/tests/wpt/web-platform-tests/interfaces/manifest-incubations.idl b/tests/wpt/tests/interfaces/manifest-incubations.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/manifest-incubations.idl rename to tests/wpt/tests/interfaces/manifest-incubations.idl diff --git a/tests/wpt/web-platform-tests/interfaces/mathml-core.idl b/tests/wpt/tests/interfaces/mathml-core.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/mathml-core.idl rename to tests/wpt/tests/interfaces/mathml-core.idl diff --git a/tests/wpt/web-platform-tests/interfaces/media-capabilities.idl b/tests/wpt/tests/interfaces/media-capabilities.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/media-capabilities.idl rename to tests/wpt/tests/interfaces/media-capabilities.idl diff --git a/tests/wpt/web-platform-tests/interfaces/media-playback-quality.idl b/tests/wpt/tests/interfaces/media-playback-quality.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/media-playback-quality.idl rename to tests/wpt/tests/interfaces/media-playback-quality.idl diff --git a/tests/wpt/web-platform-tests/interfaces/media-source.idl b/tests/wpt/tests/interfaces/media-source.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/media-source.idl rename to tests/wpt/tests/interfaces/media-source.idl diff --git a/tests/wpt/web-platform-tests/interfaces/mediacapture-automation.idl b/tests/wpt/tests/interfaces/mediacapture-automation.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/mediacapture-automation.idl rename to tests/wpt/tests/interfaces/mediacapture-automation.idl diff --git a/tests/wpt/web-platform-tests/interfaces/mediacapture-fromelement.idl b/tests/wpt/tests/interfaces/mediacapture-fromelement.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/mediacapture-fromelement.idl rename to tests/wpt/tests/interfaces/mediacapture-fromelement.idl diff --git a/tests/wpt/web-platform-tests/interfaces/mediacapture-handle-actions.idl b/tests/wpt/tests/interfaces/mediacapture-handle-actions.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/mediacapture-handle-actions.idl rename to tests/wpt/tests/interfaces/mediacapture-handle-actions.idl diff --git a/tests/wpt/web-platform-tests/interfaces/mediacapture-region.idl b/tests/wpt/tests/interfaces/mediacapture-region.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/mediacapture-region.idl rename to tests/wpt/tests/interfaces/mediacapture-region.idl diff --git a/tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl b/tests/wpt/tests/interfaces/mediacapture-streams.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl rename to tests/wpt/tests/interfaces/mediacapture-streams.idl diff --git a/tests/wpt/web-platform-tests/interfaces/mediacapture-transform.idl b/tests/wpt/tests/interfaces/mediacapture-transform.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/mediacapture-transform.idl rename to tests/wpt/tests/interfaces/mediacapture-transform.idl diff --git a/tests/wpt/web-platform-tests/interfaces/mediacapture-viewport.idl b/tests/wpt/tests/interfaces/mediacapture-viewport.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/mediacapture-viewport.idl rename to tests/wpt/tests/interfaces/mediacapture-viewport.idl diff --git a/tests/wpt/web-platform-tests/interfaces/mediasession.idl b/tests/wpt/tests/interfaces/mediasession.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/mediasession.idl rename to tests/wpt/tests/interfaces/mediasession.idl diff --git a/tests/wpt/web-platform-tests/interfaces/mediastream-recording.idl b/tests/wpt/tests/interfaces/mediastream-recording.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/mediastream-recording.idl rename to tests/wpt/tests/interfaces/mediastream-recording.idl diff --git a/tests/wpt/web-platform-tests/interfaces/model-element.idl b/tests/wpt/tests/interfaces/model-element.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/model-element.idl rename to tests/wpt/tests/interfaces/model-element.idl diff --git a/tests/wpt/web-platform-tests/interfaces/mst-content-hint.idl b/tests/wpt/tests/interfaces/mst-content-hint.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/mst-content-hint.idl rename to tests/wpt/tests/interfaces/mst-content-hint.idl diff --git a/tests/wpt/web-platform-tests/interfaces/navigation-timing.idl b/tests/wpt/tests/interfaces/navigation-timing.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/navigation-timing.idl rename to tests/wpt/tests/interfaces/navigation-timing.idl diff --git a/tests/wpt/web-platform-tests/interfaces/netinfo.idl b/tests/wpt/tests/interfaces/netinfo.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/netinfo.idl rename to tests/wpt/tests/interfaces/netinfo.idl diff --git a/tests/wpt/web-platform-tests/interfaces/notifications.idl b/tests/wpt/tests/interfaces/notifications.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/notifications.idl rename to tests/wpt/tests/interfaces/notifications.idl diff --git a/tests/wpt/web-platform-tests/interfaces/orientation-event.idl b/tests/wpt/tests/interfaces/orientation-event.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/orientation-event.idl rename to tests/wpt/tests/interfaces/orientation-event.idl diff --git a/tests/wpt/web-platform-tests/interfaces/orientation-sensor.idl b/tests/wpt/tests/interfaces/orientation-sensor.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/orientation-sensor.idl rename to tests/wpt/tests/interfaces/orientation-sensor.idl diff --git a/tests/wpt/web-platform-tests/interfaces/page-lifecycle.idl b/tests/wpt/tests/interfaces/page-lifecycle.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/page-lifecycle.idl rename to tests/wpt/tests/interfaces/page-lifecycle.idl diff --git a/tests/wpt/web-platform-tests/interfaces/paint-timing.idl b/tests/wpt/tests/interfaces/paint-timing.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/paint-timing.idl rename to tests/wpt/tests/interfaces/paint-timing.idl diff --git a/tests/wpt/web-platform-tests/interfaces/parakeet.tentative.idl b/tests/wpt/tests/interfaces/parakeet.tentative.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/parakeet.tentative.idl rename to tests/wpt/tests/interfaces/parakeet.tentative.idl diff --git a/tests/wpt/web-platform-tests/interfaces/payment-handler.idl b/tests/wpt/tests/interfaces/payment-handler.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/payment-handler.idl rename to tests/wpt/tests/interfaces/payment-handler.idl diff --git a/tests/wpt/web-platform-tests/interfaces/payment-request.idl b/tests/wpt/tests/interfaces/payment-request.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/payment-request.idl rename to tests/wpt/tests/interfaces/payment-request.idl diff --git a/tests/wpt/web-platform-tests/interfaces/performance-measure-memory.idl b/tests/wpt/tests/interfaces/performance-measure-memory.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/performance-measure-memory.idl rename to tests/wpt/tests/interfaces/performance-measure-memory.idl diff --git a/tests/wpt/web-platform-tests/interfaces/performance-timeline.idl b/tests/wpt/tests/interfaces/performance-timeline.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/performance-timeline.idl rename to tests/wpt/tests/interfaces/performance-timeline.idl diff --git a/tests/wpt/web-platform-tests/interfaces/periodic-background-sync.idl b/tests/wpt/tests/interfaces/periodic-background-sync.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/periodic-background-sync.idl rename to tests/wpt/tests/interfaces/periodic-background-sync.idl diff --git a/tests/wpt/web-platform-tests/interfaces/permissions-policy.idl b/tests/wpt/tests/interfaces/permissions-policy.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/permissions-policy.idl rename to tests/wpt/tests/interfaces/permissions-policy.idl diff --git a/tests/wpt/web-platform-tests/interfaces/permissions-request.idl b/tests/wpt/tests/interfaces/permissions-request.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/permissions-request.idl rename to tests/wpt/tests/interfaces/permissions-request.idl diff --git a/tests/wpt/web-platform-tests/interfaces/permissions-revoke.idl b/tests/wpt/tests/interfaces/permissions-revoke.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/permissions-revoke.idl rename to tests/wpt/tests/interfaces/permissions-revoke.idl diff --git a/tests/wpt/web-platform-tests/interfaces/permissions.idl b/tests/wpt/tests/interfaces/permissions.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/permissions.idl rename to tests/wpt/tests/interfaces/permissions.idl diff --git a/tests/wpt/web-platform-tests/interfaces/picture-in-picture.idl b/tests/wpt/tests/interfaces/picture-in-picture.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/picture-in-picture.idl rename to tests/wpt/tests/interfaces/picture-in-picture.idl diff --git a/tests/wpt/web-platform-tests/interfaces/pointerevents.idl b/tests/wpt/tests/interfaces/pointerevents.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/pointerevents.idl rename to tests/wpt/tests/interfaces/pointerevents.idl diff --git a/tests/wpt/web-platform-tests/interfaces/pointerlock.idl b/tests/wpt/tests/interfaces/pointerlock.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/pointerlock.idl rename to tests/wpt/tests/interfaces/pointerlock.idl diff --git a/tests/wpt/web-platform-tests/interfaces/portals.idl b/tests/wpt/tests/interfaces/portals.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/portals.idl rename to tests/wpt/tests/interfaces/portals.idl diff --git a/tests/wpt/web-platform-tests/interfaces/prefer-current-tab.idl b/tests/wpt/tests/interfaces/prefer-current-tab.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/prefer-current-tab.idl rename to tests/wpt/tests/interfaces/prefer-current-tab.idl diff --git a/tests/wpt/web-platform-tests/interfaces/prerendering-revamped.idl b/tests/wpt/tests/interfaces/prerendering-revamped.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/prerendering-revamped.idl rename to tests/wpt/tests/interfaces/prerendering-revamped.idl diff --git a/tests/wpt/web-platform-tests/interfaces/presentation-api.idl b/tests/wpt/tests/interfaces/presentation-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/presentation-api.idl rename to tests/wpt/tests/interfaces/presentation-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/private-click-measurement.idl b/tests/wpt/tests/interfaces/private-click-measurement.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/private-click-measurement.idl rename to tests/wpt/tests/interfaces/private-click-measurement.idl diff --git a/tests/wpt/web-platform-tests/interfaces/proximity.idl b/tests/wpt/tests/interfaces/proximity.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/proximity.idl rename to tests/wpt/tests/interfaces/proximity.idl diff --git a/tests/wpt/web-platform-tests/interfaces/push-api.idl b/tests/wpt/tests/interfaces/push-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/push-api.idl rename to tests/wpt/tests/interfaces/push-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/raw-camera-access.idl b/tests/wpt/tests/interfaces/raw-camera-access.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/raw-camera-access.idl rename to tests/wpt/tests/interfaces/raw-camera-access.idl diff --git a/tests/wpt/web-platform-tests/interfaces/real-world-meshing.idl b/tests/wpt/tests/interfaces/real-world-meshing.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/real-world-meshing.idl rename to tests/wpt/tests/interfaces/real-world-meshing.idl diff --git a/tests/wpt/web-platform-tests/interfaces/referrer-policy.idl b/tests/wpt/tests/interfaces/referrer-policy.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/referrer-policy.idl rename to tests/wpt/tests/interfaces/referrer-policy.idl diff --git a/tests/wpt/web-platform-tests/interfaces/remote-playback.idl b/tests/wpt/tests/interfaces/remote-playback.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/remote-playback.idl rename to tests/wpt/tests/interfaces/remote-playback.idl diff --git a/tests/wpt/web-platform-tests/interfaces/reporting.idl b/tests/wpt/tests/interfaces/reporting.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/reporting.idl rename to tests/wpt/tests/interfaces/reporting.idl diff --git a/tests/wpt/web-platform-tests/interfaces/requestStorageAccessFor.idl b/tests/wpt/tests/interfaces/requestStorageAccessFor.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/requestStorageAccessFor.idl rename to tests/wpt/tests/interfaces/requestStorageAccessFor.idl diff --git a/tests/wpt/web-platform-tests/interfaces/requestidlecallback.idl b/tests/wpt/tests/interfaces/requestidlecallback.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/requestidlecallback.idl rename to tests/wpt/tests/interfaces/requestidlecallback.idl diff --git a/tests/wpt/web-platform-tests/interfaces/resize-observer.idl b/tests/wpt/tests/interfaces/resize-observer.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/resize-observer.idl rename to tests/wpt/tests/interfaces/resize-observer.idl diff --git a/tests/wpt/web-platform-tests/interfaces/resource-timing.idl b/tests/wpt/tests/interfaces/resource-timing.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/resource-timing.idl rename to tests/wpt/tests/interfaces/resource-timing.idl diff --git a/tests/wpt/web-platform-tests/interfaces/sanitizer-api.idl b/tests/wpt/tests/interfaces/sanitizer-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/sanitizer-api.idl rename to tests/wpt/tests/interfaces/sanitizer-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/sanitizer-api.tentative.idl b/tests/wpt/tests/interfaces/sanitizer-api.tentative.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/sanitizer-api.tentative.idl rename to tests/wpt/tests/interfaces/sanitizer-api.tentative.idl diff --git a/tests/wpt/web-platform-tests/interfaces/savedata.idl b/tests/wpt/tests/interfaces/savedata.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/savedata.idl rename to tests/wpt/tests/interfaces/savedata.idl diff --git a/tests/wpt/web-platform-tests/interfaces/scheduling-apis.idl b/tests/wpt/tests/interfaces/scheduling-apis.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/scheduling-apis.idl rename to tests/wpt/tests/interfaces/scheduling-apis.idl diff --git a/tests/wpt/web-platform-tests/interfaces/screen-capture.idl b/tests/wpt/tests/interfaces/screen-capture.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/screen-capture.idl rename to tests/wpt/tests/interfaces/screen-capture.idl diff --git a/tests/wpt/web-platform-tests/interfaces/screen-orientation.idl b/tests/wpt/tests/interfaces/screen-orientation.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/screen-orientation.idl rename to tests/wpt/tests/interfaces/screen-orientation.idl diff --git a/tests/wpt/web-platform-tests/interfaces/screen-wake-lock.idl b/tests/wpt/tests/interfaces/screen-wake-lock.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/screen-wake-lock.idl rename to tests/wpt/tests/interfaces/screen-wake-lock.idl diff --git a/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl b/tests/wpt/tests/interfaces/scroll-animations.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/scroll-animations.idl rename to tests/wpt/tests/interfaces/scroll-animations.idl diff --git a/tests/wpt/web-platform-tests/interfaces/scroll-to-text-fragment.idl b/tests/wpt/tests/interfaces/scroll-to-text-fragment.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/scroll-to-text-fragment.idl rename to tests/wpt/tests/interfaces/scroll-to-text-fragment.idl diff --git a/tests/wpt/web-platform-tests/interfaces/secure-payment-confirmation.idl b/tests/wpt/tests/interfaces/secure-payment-confirmation.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/secure-payment-confirmation.idl rename to tests/wpt/tests/interfaces/secure-payment-confirmation.idl diff --git a/tests/wpt/web-platform-tests/interfaces/selection-api.idl b/tests/wpt/tests/interfaces/selection-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/selection-api.idl rename to tests/wpt/tests/interfaces/selection-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/serial.idl b/tests/wpt/tests/interfaces/serial.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/serial.idl rename to tests/wpt/tests/interfaces/serial.idl diff --git a/tests/wpt/web-platform-tests/interfaces/server-timing.idl b/tests/wpt/tests/interfaces/server-timing.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/server-timing.idl rename to tests/wpt/tests/interfaces/server-timing.idl diff --git a/tests/wpt/web-platform-tests/interfaces/service-workers.idl b/tests/wpt/tests/interfaces/service-workers.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/service-workers.idl rename to tests/wpt/tests/interfaces/service-workers.idl diff --git a/tests/wpt/web-platform-tests/interfaces/shape-detection-api.idl b/tests/wpt/tests/interfaces/shape-detection-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/shape-detection-api.idl rename to tests/wpt/tests/interfaces/shape-detection-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/shared-storage.idl b/tests/wpt/tests/interfaces/shared-storage.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/shared-storage.idl rename to tests/wpt/tests/interfaces/shared-storage.idl diff --git a/tests/wpt/web-platform-tests/interfaces/speech-api.idl b/tests/wpt/tests/interfaces/speech-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/speech-api.idl rename to tests/wpt/tests/interfaces/speech-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/storage-access.idl b/tests/wpt/tests/interfaces/storage-access.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/storage-access.idl rename to tests/wpt/tests/interfaces/storage-access.idl diff --git a/tests/wpt/web-platform-tests/interfaces/storage-buckets.idl b/tests/wpt/tests/interfaces/storage-buckets.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/storage-buckets.idl rename to tests/wpt/tests/interfaces/storage-buckets.idl diff --git a/tests/wpt/web-platform-tests/interfaces/storage-buckets.tentative.idl b/tests/wpt/tests/interfaces/storage-buckets.tentative.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/storage-buckets.tentative.idl rename to tests/wpt/tests/interfaces/storage-buckets.tentative.idl diff --git a/tests/wpt/web-platform-tests/interfaces/storage.idl b/tests/wpt/tests/interfaces/storage.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/storage.idl rename to tests/wpt/tests/interfaces/storage.idl diff --git a/tests/wpt/web-platform-tests/interfaces/streams.idl b/tests/wpt/tests/interfaces/streams.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/streams.idl rename to tests/wpt/tests/interfaces/streams.idl diff --git a/tests/wpt/web-platform-tests/interfaces/sub-apps.tentative.idl b/tests/wpt/tests/interfaces/sub-apps.tentative.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/sub-apps.tentative.idl rename to tests/wpt/tests/interfaces/sub-apps.tentative.idl diff --git a/tests/wpt/web-platform-tests/interfaces/svg-animations.idl b/tests/wpt/tests/interfaces/svg-animations.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/svg-animations.idl rename to tests/wpt/tests/interfaces/svg-animations.idl diff --git a/tests/wpt/web-platform-tests/interfaces/testutils.idl b/tests/wpt/tests/interfaces/testutils.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/testutils.idl rename to tests/wpt/tests/interfaces/testutils.idl diff --git a/tests/wpt/web-platform-tests/interfaces/text-detection-api.idl b/tests/wpt/tests/interfaces/text-detection-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/text-detection-api.idl rename to tests/wpt/tests/interfaces/text-detection-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/touch-events.idl b/tests/wpt/tests/interfaces/touch-events.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/touch-events.idl rename to tests/wpt/tests/interfaces/touch-events.idl diff --git a/tests/wpt/web-platform-tests/interfaces/trust-token-api.idl b/tests/wpt/tests/interfaces/trust-token-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/trust-token-api.idl rename to tests/wpt/tests/interfaces/trust-token-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/trusted-types.idl b/tests/wpt/tests/interfaces/trusted-types.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/trusted-types.idl rename to tests/wpt/tests/interfaces/trusted-types.idl diff --git a/tests/wpt/web-platform-tests/interfaces/turtledove.idl b/tests/wpt/tests/interfaces/turtledove.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/turtledove.idl rename to tests/wpt/tests/interfaces/turtledove.idl diff --git a/tests/wpt/web-platform-tests/interfaces/ua-client-hints.idl b/tests/wpt/tests/interfaces/ua-client-hints.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/ua-client-hints.idl rename to tests/wpt/tests/interfaces/ua-client-hints.idl diff --git a/tests/wpt/web-platform-tests/interfaces/uievents.idl b/tests/wpt/tests/interfaces/uievents.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/uievents.idl rename to tests/wpt/tests/interfaces/uievents.idl diff --git a/tests/wpt/web-platform-tests/interfaces/url.idl b/tests/wpt/tests/interfaces/url.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/url.idl rename to tests/wpt/tests/interfaces/url.idl diff --git a/tests/wpt/web-platform-tests/interfaces/urlpattern.idl b/tests/wpt/tests/interfaces/urlpattern.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/urlpattern.idl rename to tests/wpt/tests/interfaces/urlpattern.idl diff --git a/tests/wpt/web-platform-tests/interfaces/user-timing.idl b/tests/wpt/tests/interfaces/user-timing.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/user-timing.idl rename to tests/wpt/tests/interfaces/user-timing.idl diff --git a/tests/wpt/web-platform-tests/interfaces/vibration.idl b/tests/wpt/tests/interfaces/vibration.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/vibration.idl rename to tests/wpt/tests/interfaces/vibration.idl diff --git a/tests/wpt/web-platform-tests/interfaces/video-rvfc.idl b/tests/wpt/tests/interfaces/video-rvfc.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/video-rvfc.idl rename to tests/wpt/tests/interfaces/video-rvfc.idl diff --git a/tests/wpt/web-platform-tests/interfaces/virtual-keyboard.idl b/tests/wpt/tests/interfaces/virtual-keyboard.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/virtual-keyboard.idl rename to tests/wpt/tests/interfaces/virtual-keyboard.idl diff --git a/tests/wpt/web-platform-tests/interfaces/virtual-keyboard.tentative.idl b/tests/wpt/tests/interfaces/virtual-keyboard.tentative.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/virtual-keyboard.tentative.idl rename to tests/wpt/tests/interfaces/virtual-keyboard.tentative.idl diff --git a/tests/wpt/web-platform-tests/interfaces/wai-aria.idl b/tests/wpt/tests/interfaces/wai-aria.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/wai-aria.idl rename to tests/wpt/tests/interfaces/wai-aria.idl diff --git a/tests/wpt/web-platform-tests/interfaces/wasm-js-api.idl b/tests/wpt/tests/interfaces/wasm-js-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/wasm-js-api.idl rename to tests/wpt/tests/interfaces/wasm-js-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/wasm-web-api.idl b/tests/wpt/tests/interfaces/wasm-web-api.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/wasm-web-api.idl rename to tests/wpt/tests/interfaces/wasm-web-api.idl diff --git a/tests/wpt/web-platform-tests/interfaces/web-animations-2.idl b/tests/wpt/tests/interfaces/web-animations-2.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/web-animations-2.idl rename to tests/wpt/tests/interfaces/web-animations-2.idl diff --git a/tests/wpt/web-platform-tests/interfaces/web-animations.idl b/tests/wpt/tests/interfaces/web-animations.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/web-animations.idl rename to tests/wpt/tests/interfaces/web-animations.idl diff --git a/tests/wpt/web-platform-tests/interfaces/web-app-launch.idl b/tests/wpt/tests/interfaces/web-app-launch.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/web-app-launch.idl rename to tests/wpt/tests/interfaces/web-app-launch.idl diff --git a/tests/wpt/web-platform-tests/interfaces/web-bluetooth.idl b/tests/wpt/tests/interfaces/web-bluetooth.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/web-bluetooth.idl rename to tests/wpt/tests/interfaces/web-bluetooth.idl diff --git a/tests/wpt/web-platform-tests/interfaces/web-locks.idl b/tests/wpt/tests/interfaces/web-locks.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/web-locks.idl rename to tests/wpt/tests/interfaces/web-locks.idl diff --git a/tests/wpt/web-platform-tests/interfaces/web-nfc.idl b/tests/wpt/tests/interfaces/web-nfc.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/web-nfc.idl rename to tests/wpt/tests/interfaces/web-nfc.idl diff --git a/tests/wpt/web-platform-tests/interfaces/web-otp.idl b/tests/wpt/tests/interfaces/web-otp.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/web-otp.idl rename to tests/wpt/tests/interfaces/web-otp.idl diff --git a/tests/wpt/web-platform-tests/interfaces/web-share.idl b/tests/wpt/tests/interfaces/web-share.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/web-share.idl rename to tests/wpt/tests/interfaces/web-share.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webaudio.idl b/tests/wpt/tests/interfaces/webaudio.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webaudio.idl rename to tests/wpt/tests/interfaces/webaudio.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webauthn.idl b/tests/wpt/tests/interfaces/webauthn.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webauthn.idl rename to tests/wpt/tests/interfaces/webauthn.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webcodecs-aac-codec-registration.idl b/tests/wpt/tests/interfaces/webcodecs-aac-codec-registration.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webcodecs-aac-codec-registration.idl rename to tests/wpt/tests/interfaces/webcodecs-aac-codec-registration.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webcodecs-av1-codec-registration.idl b/tests/wpt/tests/interfaces/webcodecs-av1-codec-registration.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webcodecs-av1-codec-registration.idl rename to tests/wpt/tests/interfaces/webcodecs-av1-codec-registration.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webcodecs-avc-codec-registration.idl b/tests/wpt/tests/interfaces/webcodecs-avc-codec-registration.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webcodecs-avc-codec-registration.idl rename to tests/wpt/tests/interfaces/webcodecs-avc-codec-registration.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webcodecs-flac-codec-registration.idl b/tests/wpt/tests/interfaces/webcodecs-flac-codec-registration.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webcodecs-flac-codec-registration.idl rename to tests/wpt/tests/interfaces/webcodecs-flac-codec-registration.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webcodecs-hevc-codec-registration.idl b/tests/wpt/tests/interfaces/webcodecs-hevc-codec-registration.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webcodecs-hevc-codec-registration.idl rename to tests/wpt/tests/interfaces/webcodecs-hevc-codec-registration.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webcodecs-opus-codec-registration.idl b/tests/wpt/tests/interfaces/webcodecs-opus-codec-registration.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webcodecs-opus-codec-registration.idl rename to tests/wpt/tests/interfaces/webcodecs-opus-codec-registration.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webcodecs-vp9-codec-registration.idl b/tests/wpt/tests/interfaces/webcodecs-vp9-codec-registration.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webcodecs-vp9-codec-registration.idl rename to tests/wpt/tests/interfaces/webcodecs-vp9-codec-registration.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webcodecs.idl b/tests/wpt/tests/interfaces/webcodecs.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webcodecs.idl rename to tests/wpt/tests/interfaces/webcodecs.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webcrypto-secure-curves.idl b/tests/wpt/tests/interfaces/webcrypto-secure-curves.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webcrypto-secure-curves.idl rename to tests/wpt/tests/interfaces/webcrypto-secure-curves.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webdriver.idl b/tests/wpt/tests/interfaces/webdriver.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webdriver.idl rename to tests/wpt/tests/interfaces/webdriver.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webgl1.idl b/tests/wpt/tests/interfaces/webgl1.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webgl1.idl rename to tests/wpt/tests/interfaces/webgl1.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webgl2.idl b/tests/wpt/tests/interfaces/webgl2.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webgl2.idl rename to tests/wpt/tests/interfaces/webgl2.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webgpu.idl b/tests/wpt/tests/interfaces/webgpu.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webgpu.idl rename to tests/wpt/tests/interfaces/webgpu.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webhid.idl b/tests/wpt/tests/interfaces/webhid.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webhid.idl rename to tests/wpt/tests/interfaces/webhid.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webidl.idl b/tests/wpt/tests/interfaces/webidl.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webidl.idl rename to tests/wpt/tests/interfaces/webidl.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webmidi.idl b/tests/wpt/tests/interfaces/webmidi.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webmidi.idl rename to tests/wpt/tests/interfaces/webmidi.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webnn.idl b/tests/wpt/tests/interfaces/webnn.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webnn.idl rename to tests/wpt/tests/interfaces/webnn.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc-encoded-transform.idl b/tests/wpt/tests/interfaces/webrtc-encoded-transform.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webrtc-encoded-transform.idl rename to tests/wpt/tests/interfaces/webrtc-encoded-transform.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc-ice.idl b/tests/wpt/tests/interfaces/webrtc-ice.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webrtc-ice.idl rename to tests/wpt/tests/interfaces/webrtc-ice.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc-identity.idl b/tests/wpt/tests/interfaces/webrtc-identity.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webrtc-identity.idl rename to tests/wpt/tests/interfaces/webrtc-identity.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc-priority.idl b/tests/wpt/tests/interfaces/webrtc-priority.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webrtc-priority.idl rename to tests/wpt/tests/interfaces/webrtc-priority.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc-stats.idl b/tests/wpt/tests/interfaces/webrtc-stats.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webrtc-stats.idl rename to tests/wpt/tests/interfaces/webrtc-stats.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc-svc.idl b/tests/wpt/tests/interfaces/webrtc-svc.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webrtc-svc.idl rename to tests/wpt/tests/interfaces/webrtc-svc.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc.idl b/tests/wpt/tests/interfaces/webrtc.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webrtc.idl rename to tests/wpt/tests/interfaces/webrtc.idl diff --git a/tests/wpt/web-platform-tests/interfaces/websockets.idl b/tests/wpt/tests/interfaces/websockets.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/websockets.idl rename to tests/wpt/tests/interfaces/websockets.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webtransport.idl b/tests/wpt/tests/interfaces/webtransport.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webtransport.idl rename to tests/wpt/tests/interfaces/webtransport.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webusb.idl b/tests/wpt/tests/interfaces/webusb.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webusb.idl rename to tests/wpt/tests/interfaces/webusb.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webvr.tentative.idl b/tests/wpt/tests/interfaces/webvr.tentative.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webvr.tentative.idl rename to tests/wpt/tests/interfaces/webvr.tentative.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webvtt.idl b/tests/wpt/tests/interfaces/webvtt.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webvtt.idl rename to tests/wpt/tests/interfaces/webvtt.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webxr-ar-module.idl b/tests/wpt/tests/interfaces/webxr-ar-module.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webxr-ar-module.idl rename to tests/wpt/tests/interfaces/webxr-ar-module.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webxr-depth-sensing.idl b/tests/wpt/tests/interfaces/webxr-depth-sensing.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webxr-depth-sensing.idl rename to tests/wpt/tests/interfaces/webxr-depth-sensing.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webxr-dom-overlays.idl b/tests/wpt/tests/interfaces/webxr-dom-overlays.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webxr-dom-overlays.idl rename to tests/wpt/tests/interfaces/webxr-dom-overlays.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webxr-gamepads-module.idl b/tests/wpt/tests/interfaces/webxr-gamepads-module.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webxr-gamepads-module.idl rename to tests/wpt/tests/interfaces/webxr-gamepads-module.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webxr-hand-input.idl b/tests/wpt/tests/interfaces/webxr-hand-input.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webxr-hand-input.idl rename to tests/wpt/tests/interfaces/webxr-hand-input.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webxr-hit-test.idl b/tests/wpt/tests/interfaces/webxr-hit-test.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webxr-hit-test.idl rename to tests/wpt/tests/interfaces/webxr-hit-test.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webxr-lighting-estimation.idl b/tests/wpt/tests/interfaces/webxr-lighting-estimation.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webxr-lighting-estimation.idl rename to tests/wpt/tests/interfaces/webxr-lighting-estimation.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webxr.idl b/tests/wpt/tests/interfaces/webxr.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webxr.idl rename to tests/wpt/tests/interfaces/webxr.idl diff --git a/tests/wpt/web-platform-tests/interfaces/webxrlayers.idl b/tests/wpt/tests/interfaces/webxrlayers.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/webxrlayers.idl rename to tests/wpt/tests/interfaces/webxrlayers.idl diff --git a/tests/wpt/web-platform-tests/interfaces/window-controls-overlay.idl b/tests/wpt/tests/interfaces/window-controls-overlay.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/window-controls-overlay.idl rename to tests/wpt/tests/interfaces/window-controls-overlay.idl diff --git a/tests/wpt/web-platform-tests/interfaces/window-management.idl b/tests/wpt/tests/interfaces/window-management.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/window-management.idl rename to tests/wpt/tests/interfaces/window-management.idl diff --git a/tests/wpt/web-platform-tests/interfaces/xhr.idl b/tests/wpt/tests/interfaces/xhr.idl similarity index 100% rename from tests/wpt/web-platform-tests/interfaces/xhr.idl rename to tests/wpt/tests/interfaces/xhr.idl diff --git a/tests/wpt/web-platform-tests/intersection-observer/META.yml b/tests/wpt/tests/intersection-observer/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/META.yml rename to tests/wpt/tests/intersection-observer/META.yml diff --git a/tests/wpt/web-platform-tests/intersection-observer/bounding-box.html b/tests/wpt/tests/intersection-observer/bounding-box.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/bounding-box.html rename to tests/wpt/tests/intersection-observer/bounding-box.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/callback-cross-realm-report-exception.html b/tests/wpt/tests/intersection-observer/callback-cross-realm-report-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/callback-cross-realm-report-exception.html rename to tests/wpt/tests/intersection-observer/callback-cross-realm-report-exception.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/client-rect.html b/tests/wpt/tests/intersection-observer/client-rect.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/client-rect.html rename to tests/wpt/tests/intersection-observer/client-rect.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/clip-path.html b/tests/wpt/tests/intersection-observer/clip-path.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/clip-path.html rename to tests/wpt/tests/intersection-observer/clip-path.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/containing-block.html b/tests/wpt/tests/intersection-observer/containing-block.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/containing-block.html rename to tests/wpt/tests/intersection-observer/containing-block.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/cross-document-root.html b/tests/wpt/tests/intersection-observer/cross-document-root.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/cross-document-root.html rename to tests/wpt/tests/intersection-observer/cross-document-root.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/cross-origin-iframe.sub.html b/tests/wpt/tests/intersection-observer/cross-origin-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/cross-origin-iframe.sub.html rename to tests/wpt/tests/intersection-observer/cross-origin-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/disconnect.html b/tests/wpt/tests/intersection-observer/disconnect.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/disconnect.html rename to tests/wpt/tests/intersection-observer/disconnect.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/display-none.html b/tests/wpt/tests/intersection-observer/display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/display-none.html rename to tests/wpt/tests/intersection-observer/display-none.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/document-scrolling-element-root.html b/tests/wpt/tests/intersection-observer/document-scrolling-element-root.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/document-scrolling-element-root.html rename to tests/wpt/tests/intersection-observer/document-scrolling-element-root.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/edge-inclusive-intersection.html b/tests/wpt/tests/intersection-observer/edge-inclusive-intersection.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/edge-inclusive-intersection.html rename to tests/wpt/tests/intersection-observer/edge-inclusive-intersection.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/empty-root-margin.html b/tests/wpt/tests/intersection-observer/empty-root-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/empty-root-margin.html rename to tests/wpt/tests/intersection-observer/empty-root-margin.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/explicit-root-different-document.tentative.html b/tests/wpt/tests/intersection-observer/explicit-root-different-document.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/explicit-root-different-document.tentative.html rename to tests/wpt/tests/intersection-observer/explicit-root-different-document.tentative.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/idlharness.window.js b/tests/wpt/tests/intersection-observer/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/idlharness.window.js rename to tests/wpt/tests/intersection-observer/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/intersection-observer/iframe-no-root-with-wrapping-scroller.html b/tests/wpt/tests/intersection-observer/iframe-no-root-with-wrapping-scroller.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/iframe-no-root-with-wrapping-scroller.html rename to tests/wpt/tests/intersection-observer/iframe-no-root-with-wrapping-scroller.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/iframe-no-root.html b/tests/wpt/tests/intersection-observer/iframe-no-root.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/iframe-no-root.html rename to tests/wpt/tests/intersection-observer/iframe-no-root.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/initial-observation-with-threshold.html b/tests/wpt/tests/intersection-observer/initial-observation-with-threshold.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/initial-observation-with-threshold.html rename to tests/wpt/tests/intersection-observer/initial-observation-with-threshold.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/inline-client-rect.html b/tests/wpt/tests/intersection-observer/inline-client-rect.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/inline-client-rect.html rename to tests/wpt/tests/intersection-observer/inline-client-rect.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/inline-with-block-child-client-rect.html b/tests/wpt/tests/intersection-observer/inline-with-block-child-client-rect.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/inline-with-block-child-client-rect.html rename to tests/wpt/tests/intersection-observer/inline-with-block-child-client-rect.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/intersection-ratio-ib-split.html b/tests/wpt/tests/intersection-observer/intersection-ratio-ib-split.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/intersection-ratio-ib-split.html rename to tests/wpt/tests/intersection-observer/intersection-ratio-ib-split.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/intersection-ratio-with-fractional-bounds-2.html b/tests/wpt/tests/intersection-observer/intersection-ratio-with-fractional-bounds-2.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/intersection-ratio-with-fractional-bounds-2.html rename to tests/wpt/tests/intersection-observer/intersection-ratio-with-fractional-bounds-2.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/intersection-ratio-with-fractional-bounds-in-iframe.html b/tests/wpt/tests/intersection-observer/intersection-ratio-with-fractional-bounds-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/intersection-ratio-with-fractional-bounds-in-iframe.html rename to tests/wpt/tests/intersection-observer/intersection-ratio-with-fractional-bounds-in-iframe.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/intersection-ratio-with-fractional-bounds.html b/tests/wpt/tests/intersection-observer/intersection-ratio-with-fractional-bounds.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/intersection-ratio-with-fractional-bounds.html rename to tests/wpt/tests/intersection-observer/intersection-ratio-with-fractional-bounds.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/isIntersecting-change-events.html b/tests/wpt/tests/intersection-observer/isIntersecting-change-events.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/isIntersecting-change-events.html rename to tests/wpt/tests/intersection-observer/isIntersecting-change-events.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/isIntersecting-threshold.html b/tests/wpt/tests/intersection-observer/isIntersecting-threshold.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/isIntersecting-threshold.html rename to tests/wpt/tests/intersection-observer/isIntersecting-threshold.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/multiple-targets.html b/tests/wpt/tests/intersection-observer/multiple-targets.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/multiple-targets.html rename to tests/wpt/tests/intersection-observer/multiple-targets.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/multiple-thresholds.html b/tests/wpt/tests/intersection-observer/multiple-thresholds.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/multiple-thresholds.html rename to tests/wpt/tests/intersection-observer/multiple-thresholds.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/nested-cross-origin-iframe.sub.html b/tests/wpt/tests/intersection-observer/nested-cross-origin-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/nested-cross-origin-iframe.sub.html rename to tests/wpt/tests/intersection-observer/nested-cross-origin-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/not-in-containing-block-chain.tentative.html b/tests/wpt/tests/intersection-observer/not-in-containing-block-chain.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/not-in-containing-block-chain.tentative.html rename to tests/wpt/tests/intersection-observer/not-in-containing-block-chain.tentative.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/observer-attributes.html b/tests/wpt/tests/intersection-observer/observer-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/observer-attributes.html rename to tests/wpt/tests/intersection-observer/observer-attributes.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/observer-callback-arguments.html b/tests/wpt/tests/intersection-observer/observer-callback-arguments.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/observer-callback-arguments.html rename to tests/wpt/tests/intersection-observer/observer-callback-arguments.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/observer-exceptions.html b/tests/wpt/tests/intersection-observer/observer-exceptions.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/observer-exceptions.html rename to tests/wpt/tests/intersection-observer/observer-exceptions.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/observer-in-iframe.html b/tests/wpt/tests/intersection-observer/observer-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/observer-in-iframe.html rename to tests/wpt/tests/intersection-observer/observer-in-iframe.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/observer-without-js-reference.html b/tests/wpt/tests/intersection-observer/observer-without-js-reference.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/observer-without-js-reference.html rename to tests/wpt/tests/intersection-observer/observer-without-js-reference.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/remove-element.html b/tests/wpt/tests/intersection-observer/remove-element.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/remove-element.html rename to tests/wpt/tests/intersection-observer/remove-element.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/resources/cross-origin-child-iframe.sub.html b/tests/wpt/tests/intersection-observer/resources/cross-origin-child-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/resources/cross-origin-child-iframe.sub.html rename to tests/wpt/tests/intersection-observer/resources/cross-origin-child-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/resources/cross-origin-subframe.html b/tests/wpt/tests/intersection-observer/resources/cross-origin-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/resources/cross-origin-subframe.html rename to tests/wpt/tests/intersection-observer/resources/cross-origin-subframe.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/resources/iframe-no-root-subframe.html b/tests/wpt/tests/intersection-observer/resources/iframe-no-root-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/resources/iframe-no-root-subframe.html rename to tests/wpt/tests/intersection-observer/resources/iframe-no-root-subframe.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/resources/intersection-observer-test-utils.js b/tests/wpt/tests/intersection-observer/resources/intersection-observer-test-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/resources/intersection-observer-test-utils.js rename to tests/wpt/tests/intersection-observer/resources/intersection-observer-test-utils.js diff --git a/tests/wpt/web-platform-tests/intersection-observer/resources/intersection-ratio-with-fractional-bounds-in-iframe-content.html b/tests/wpt/tests/intersection-observer/resources/intersection-ratio-with-fractional-bounds-in-iframe-content.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/resources/intersection-ratio-with-fractional-bounds-in-iframe-content.html rename to tests/wpt/tests/intersection-observer/resources/intersection-ratio-with-fractional-bounds-in-iframe-content.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/resources/nested-cross-origin-child-iframe.sub.html b/tests/wpt/tests/intersection-observer/resources/nested-cross-origin-child-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/resources/nested-cross-origin-child-iframe.sub.html rename to tests/wpt/tests/intersection-observer/resources/nested-cross-origin-child-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/resources/nested-cross-origin-grand-child-iframe.html b/tests/wpt/tests/intersection-observer/resources/nested-cross-origin-grand-child-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/resources/nested-cross-origin-grand-child-iframe.html rename to tests/wpt/tests/intersection-observer/resources/nested-cross-origin-grand-child-iframe.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/resources/observer-in-iframe-subframe.html b/tests/wpt/tests/intersection-observer/resources/observer-in-iframe-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/resources/observer-in-iframe-subframe.html rename to tests/wpt/tests/intersection-observer/resources/observer-in-iframe-subframe.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/resources/same-origin-grand-child-iframe.html b/tests/wpt/tests/intersection-observer/resources/same-origin-grand-child-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/resources/same-origin-grand-child-iframe.html rename to tests/wpt/tests/intersection-observer/resources/same-origin-grand-child-iframe.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/resources/scaled-target-subframe.html b/tests/wpt/tests/intersection-observer/resources/scaled-target-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/resources/scaled-target-subframe.html rename to tests/wpt/tests/intersection-observer/resources/scaled-target-subframe.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/resources/timestamp-subframe.html b/tests/wpt/tests/intersection-observer/resources/timestamp-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/resources/timestamp-subframe.html rename to tests/wpt/tests/intersection-observer/resources/timestamp-subframe.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/resources/v2-subframe.html b/tests/wpt/tests/intersection-observer/resources/v2-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/resources/v2-subframe.html rename to tests/wpt/tests/intersection-observer/resources/v2-subframe.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/root-margin-root-element.html b/tests/wpt/tests/intersection-observer/root-margin-root-element.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/root-margin-root-element.html rename to tests/wpt/tests/intersection-observer/root-margin-root-element.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/root-margin-rounding.html b/tests/wpt/tests/intersection-observer/root-margin-rounding.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/root-margin-rounding.html rename to tests/wpt/tests/intersection-observer/root-margin-rounding.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/root-margin.html b/tests/wpt/tests/intersection-observer/root-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/root-margin.html rename to tests/wpt/tests/intersection-observer/root-margin.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/rtl-clipped-root.html b/tests/wpt/tests/intersection-observer/rtl-clipped-root.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/rtl-clipped-root.html rename to tests/wpt/tests/intersection-observer/rtl-clipped-root.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/same-document-no-root.html b/tests/wpt/tests/intersection-observer/same-document-no-root.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/same-document-no-root.html rename to tests/wpt/tests/intersection-observer/same-document-no-root.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/same-document-root.html b/tests/wpt/tests/intersection-observer/same-document-root.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/same-document-root.html rename to tests/wpt/tests/intersection-observer/same-document-root.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/same-document-with-document-root.html b/tests/wpt/tests/intersection-observer/same-document-with-document-root.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/same-document-with-document-root.html rename to tests/wpt/tests/intersection-observer/same-document-with-document-root.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/same-document-zero-size-target.html b/tests/wpt/tests/intersection-observer/same-document-zero-size-target.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/same-document-zero-size-target.html rename to tests/wpt/tests/intersection-observer/same-document-zero-size-target.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/same-origin-grand-child-iframe.sub.html b/tests/wpt/tests/intersection-observer/same-origin-grand-child-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/same-origin-grand-child-iframe.sub.html rename to tests/wpt/tests/intersection-observer/same-origin-grand-child-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/shadow-content.html b/tests/wpt/tests/intersection-observer/shadow-content.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/shadow-content.html rename to tests/wpt/tests/intersection-observer/shadow-content.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/target-in-detached-document.html b/tests/wpt/tests/intersection-observer/target-in-detached-document.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/target-in-detached-document.html rename to tests/wpt/tests/intersection-observer/target-in-detached-document.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/target-in-different-window.html b/tests/wpt/tests/intersection-observer/target-in-different-window.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/target-in-different-window.html rename to tests/wpt/tests/intersection-observer/target-in-different-window.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/target-is-root.html b/tests/wpt/tests/intersection-observer/target-is-root.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/target-is-root.html rename to tests/wpt/tests/intersection-observer/target-is-root.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/text-target.html b/tests/wpt/tests/intersection-observer/text-target.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/text-target.html rename to tests/wpt/tests/intersection-observer/text-target.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/timestamp.html b/tests/wpt/tests/intersection-observer/timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/timestamp.html rename to tests/wpt/tests/intersection-observer/timestamp.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/unclipped-root.html b/tests/wpt/tests/intersection-observer/unclipped-root.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/unclipped-root.html rename to tests/wpt/tests/intersection-observer/unclipped-root.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/animated-occlusion.html b/tests/wpt/tests/intersection-observer/v2/animated-occlusion.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/animated-occlusion.html rename to tests/wpt/tests/intersection-observer/v2/animated-occlusion.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/blur-filter.html b/tests/wpt/tests/intersection-observer/v2/blur-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/blur-filter.html rename to tests/wpt/tests/intersection-observer/v2/blur-filter.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/box-shadow.html b/tests/wpt/tests/intersection-observer/v2/box-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/box-shadow.html rename to tests/wpt/tests/intersection-observer/v2/box-shadow.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/cross-origin-effects.sub.html b/tests/wpt/tests/intersection-observer/v2/cross-origin-effects.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/cross-origin-effects.sub.html rename to tests/wpt/tests/intersection-observer/v2/cross-origin-effects.sub.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/cross-origin-occlusion.sub.html b/tests/wpt/tests/intersection-observer/v2/cross-origin-occlusion.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/cross-origin-occlusion.sub.html rename to tests/wpt/tests/intersection-observer/v2/cross-origin-occlusion.sub.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/delay-test.html b/tests/wpt/tests/intersection-observer/v2/delay-test.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/delay-test.html rename to tests/wpt/tests/intersection-observer/v2/delay-test.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/drop-shadow-filter-vertical-rl.html b/tests/wpt/tests/intersection-observer/v2/drop-shadow-filter-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/drop-shadow-filter-vertical-rl.html rename to tests/wpt/tests/intersection-observer/v2/drop-shadow-filter-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/iframe-target.html b/tests/wpt/tests/intersection-observer/v2/iframe-target.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/iframe-target.html rename to tests/wpt/tests/intersection-observer/v2/iframe-target.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/inline-occlusion.html b/tests/wpt/tests/intersection-observer/v2/inline-occlusion.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/inline-occlusion.html rename to tests/wpt/tests/intersection-observer/v2/inline-occlusion.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/position-absolute-overflow-visible-and-not-visible.html b/tests/wpt/tests/intersection-observer/v2/position-absolute-overflow-visible-and-not-visible.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/position-absolute-overflow-visible-and-not-visible.html rename to tests/wpt/tests/intersection-observer/v2/position-absolute-overflow-visible-and-not-visible.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/position-relative.html b/tests/wpt/tests/intersection-observer/v2/position-relative.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/position-relative.html rename to tests/wpt/tests/intersection-observer/v2/position-relative.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/scaled-target.html b/tests/wpt/tests/intersection-observer/v2/scaled-target.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/scaled-target.html rename to tests/wpt/tests/intersection-observer/v2/scaled-target.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/simple-effects.html b/tests/wpt/tests/intersection-observer/v2/simple-effects.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/simple-effects.html rename to tests/wpt/tests/intersection-observer/v2/simple-effects.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/simple-occlusion-svg-foreign-object.html b/tests/wpt/tests/intersection-observer/v2/simple-occlusion-svg-foreign-object.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/simple-occlusion-svg-foreign-object.html rename to tests/wpt/tests/intersection-observer/v2/simple-occlusion-svg-foreign-object.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/simple-occlusion.html b/tests/wpt/tests/intersection-observer/v2/simple-occlusion.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/simple-occlusion.html rename to tests/wpt/tests/intersection-observer/v2/simple-occlusion.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/text-editor-occlusion.html b/tests/wpt/tests/intersection-observer/v2/text-editor-occlusion.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/text-editor-occlusion.html rename to tests/wpt/tests/intersection-observer/v2/text-editor-occlusion.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/text-shadow.html b/tests/wpt/tests/intersection-observer/v2/text-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/v2/text-shadow.html rename to tests/wpt/tests/intersection-observer/v2/text-shadow.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/zero-area-element-hidden.html b/tests/wpt/tests/intersection-observer/zero-area-element-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/zero-area-element-hidden.html rename to tests/wpt/tests/intersection-observer/zero-area-element-hidden.html diff --git a/tests/wpt/web-platform-tests/intersection-observer/zero-area-element-visible.html b/tests/wpt/tests/intersection-observer/zero-area-element-visible.html similarity index 100% rename from tests/wpt/web-platform-tests/intersection-observer/zero-area-element-visible.html rename to tests/wpt/tests/intersection-observer/zero-area-element-visible.html diff --git a/tests/wpt/web-platform-tests/intervention-reporting/META.yml b/tests/wpt/tests/intervention-reporting/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/intervention-reporting/META.yml rename to tests/wpt/tests/intervention-reporting/META.yml diff --git a/tests/wpt/web-platform-tests/intervention-reporting/idlharness.any.js b/tests/wpt/tests/intervention-reporting/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/intervention-reporting/idlharness.any.js rename to tests/wpt/tests/intervention-reporting/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/is-input-pending/META.yml b/tests/wpt/tests/is-input-pending/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/META.yml rename to tests/wpt/tests/is-input-pending/META.yml diff --git a/tests/wpt/web-platform-tests/is-input-pending/README.md b/tests/wpt/tests/is-input-pending/README.md similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/README.md rename to tests/wpt/tests/is-input-pending/README.md diff --git a/tests/wpt/web-platform-tests/is-input-pending/idlharness.window.js b/tests/wpt/tests/is-input-pending/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/idlharness.window.js rename to tests/wpt/tests/is-input-pending/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/is-input-pending/resources/blank.html b/tests/wpt/tests/is-input-pending/resources/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/resources/blank.html rename to tests/wpt/tests/is-input-pending/resources/blank.html diff --git a/tests/wpt/web-platform-tests/is-input-pending/resources/input-onmessage.js b/tests/wpt/tests/is-input-pending/resources/input-onmessage.js similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/resources/input-onmessage.js rename to tests/wpt/tests/is-input-pending/resources/input-onmessage.js diff --git a/tests/wpt/web-platform-tests/is-input-pending/resources/pending-input-utils.js b/tests/wpt/tests/is-input-pending/resources/pending-input-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/resources/pending-input-utils.js rename to tests/wpt/tests/is-input-pending/resources/pending-input-utils.js diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-complex-clip.sub.html b/tests/wpt/tests/is-input-pending/security/cross-origin-subframe-complex-clip.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-complex-clip.sub.html rename to tests/wpt/tests/is-input-pending/security/cross-origin-subframe-complex-clip.sub.html diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-complex-clip.sub.html b/tests/wpt/tests/is-input-pending/security/cross-origin-subframe-masked-complex-clip.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-complex-clip.sub.html rename to tests/wpt/tests/is-input-pending/security/cross-origin-subframe-masked-complex-clip.sub.html diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed-2.sub.html b/tests/wpt/tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed-2.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed-2.sub.html rename to tests/wpt/tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed-2.sub.html diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed.sub.html b/tests/wpt/tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed.sub.html rename to tests/wpt/tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed.sub.html diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-none.sub.html b/tests/wpt/tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-none.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-none.sub.html rename to tests/wpt/tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-none.sub.html diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-overlap.sub.html b/tests/wpt/tests/is-input-pending/security/cross-origin-subframe-overlap.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-overlap.sub.html rename to tests/wpt/tests/is-input-pending/security/cross-origin-subframe-overlap.sub.html diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-pointer-events-none.sub.html b/tests/wpt/tests/is-input-pending/security/cross-origin-subframe-pointer-events-none.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-pointer-events-none.sub.html rename to tests/wpt/tests/is-input-pending/security/cross-origin-subframe-pointer-events-none.sub.html diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-transformed.sub.html b/tests/wpt/tests/is-input-pending/security/cross-origin-subframe-transformed.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-transformed.sub.html rename to tests/wpt/tests/is-input-pending/security/cross-origin-subframe-transformed.sub.html diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe.sub.html b/tests/wpt/tests/is-input-pending/security/cross-origin-subframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe.sub.html rename to tests/wpt/tests/is-input-pending/security/cross-origin-subframe.sub.html diff --git a/tests/wpt/web-platform-tests/is-input-pending/tentative/same-origin-subframe.sub.html b/tests/wpt/tests/is-input-pending/tentative/same-origin-subframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/tentative/same-origin-subframe.sub.html rename to tests/wpt/tests/is-input-pending/tentative/same-origin-subframe.sub.html diff --git a/tests/wpt/web-platform-tests/is-input-pending/tentative/toplevel.html b/tests/wpt/tests/is-input-pending/tentative/toplevel.html similarity index 100% rename from tests/wpt/web-platform-tests/is-input-pending/tentative/toplevel.html rename to tests/wpt/tests/is-input-pending/tentative/toplevel.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/META.yml b/tests/wpt/tests/js-self-profiling/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/META.yml rename to tests/wpt/tests/js-self-profiling/META.yml diff --git a/tests/wpt/web-platform-tests/js-self-profiling/__dir__.headers b/tests/wpt/tests/js-self-profiling/__dir__.headers similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/__dir__.headers rename to tests/wpt/tests/js-self-profiling/__dir__.headers diff --git a/tests/wpt/web-platform-tests/js-self-profiling/class-getter-names.https.html b/tests/wpt/tests/js-self-profiling/class-getter-names.https.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/class-getter-names.https.html rename to tests/wpt/tests/js-self-profiling/class-getter-names.https.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/class-names.https.html b/tests/wpt/tests/js-self-profiling/class-names.https.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/class-names.https.html rename to tests/wpt/tests/js-self-profiling/class-names.https.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/class-setter-names.https.html b/tests/wpt/tests/js-self-profiling/class-setter-names.https.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/class-setter-names.https.html rename to tests/wpt/tests/js-self-profiling/class-setter-names.https.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/concurrent-profilers.https.html b/tests/wpt/tests/js-self-profiling/concurrent-profilers.https.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/concurrent-profilers.https.html rename to tests/wpt/tests/js-self-profiling/concurrent-profilers.https.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/cross-origin-script-cors.sub.html b/tests/wpt/tests/js-self-profiling/cross-origin-script-cors.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/cross-origin-script-cors.sub.html rename to tests/wpt/tests/js-self-profiling/cross-origin-script-cors.sub.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/cross-origin-script-no-cors.sub.html b/tests/wpt/tests/js-self-profiling/cross-origin-script-no-cors.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/cross-origin-script-no-cors.sub.html rename to tests/wpt/tests/js-self-profiling/cross-origin-script-no-cors.sub.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/external-script.https.html b/tests/wpt/tests/js-self-profiling/external-script.https.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/external-script.https.html rename to tests/wpt/tests/js-self-profiling/external-script.https.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/function-anonymous-names.https.html b/tests/wpt/tests/js-self-profiling/function-anonymous-names.https.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/function-anonymous-names.https.html rename to tests/wpt/tests/js-self-profiling/function-anonymous-names.https.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/function-declaration-names.https.html b/tests/wpt/tests/js-self-profiling/function-declaration-names.https.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/function-declaration-names.https.html rename to tests/wpt/tests/js-self-profiling/function-declaration-names.https.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/function-expression-names.https.html b/tests/wpt/tests/js-self-profiling/function-expression-names.https.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/function-expression-names.https.html rename to tests/wpt/tests/js-self-profiling/function-expression-names.https.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/idlharness.https.html b/tests/wpt/tests/js-self-profiling/idlharness.https.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/idlharness.https.html rename to tests/wpt/tests/js-self-profiling/idlharness.https.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/iframe-context-filtration.https.html b/tests/wpt/tests/js-self-profiling/iframe-context-filtration.https.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/iframe-context-filtration.https.html rename to tests/wpt/tests/js-self-profiling/iframe-context-filtration.https.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/inline-script.html b/tests/wpt/tests/js-self-profiling/inline-script.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/inline-script.html rename to tests/wpt/tests/js-self-profiling/inline-script.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/max-buffer-size.window.js b/tests/wpt/tests/js-self-profiling/max-buffer-size.window.js similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/max-buffer-size.window.js rename to tests/wpt/tests/js-self-profiling/max-buffer-size.window.js diff --git a/tests/wpt/web-platform-tests/js-self-profiling/resources/__dir__.headers b/tests/wpt/tests/js-self-profiling/resources/__dir__.headers similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/resources/__dir__.headers rename to tests/wpt/tests/js-self-profiling/resources/__dir__.headers diff --git a/tests/wpt/web-platform-tests/js-self-profiling/resources/child-frame.html b/tests/wpt/tests/js-self-profiling/resources/child-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/resources/child-frame.html rename to tests/wpt/tests/js-self-profiling/resources/child-frame.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/resources/external-script.js b/tests/wpt/tests/js-self-profiling/resources/external-script.js similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/resources/external-script.js rename to tests/wpt/tests/js-self-profiling/resources/external-script.js diff --git a/tests/wpt/web-platform-tests/js-self-profiling/resources/external-script.js.headers b/tests/wpt/tests/js-self-profiling/resources/external-script.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/resources/external-script.js.headers rename to tests/wpt/tests/js-self-profiling/resources/external-script.js.headers diff --git a/tests/wpt/web-platform-tests/js-self-profiling/resources/profile-utils.js b/tests/wpt/tests/js-self-profiling/resources/profile-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/resources/profile-utils.js rename to tests/wpt/tests/js-self-profiling/resources/profile-utils.js diff --git a/tests/wpt/web-platform-tests/js-self-profiling/resources/profiling-script.js b/tests/wpt/tests/js-self-profiling/resources/profiling-script.js similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/resources/profiling-script.js rename to tests/wpt/tests/js-self-profiling/resources/profiling-script.js diff --git a/tests/wpt/web-platform-tests/js-self-profiling/resources/profiling-script.js.headers b/tests/wpt/tests/js-self-profiling/resources/profiling-script.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/resources/profiling-script.js.headers rename to tests/wpt/tests/js-self-profiling/resources/profiling-script.js.headers diff --git a/tests/wpt/web-platform-tests/js-self-profiling/tentative/README.md b/tests/wpt/tests/js-self-profiling/tentative/README.md similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/tentative/README.md rename to tests/wpt/tests/js-self-profiling/tentative/README.md diff --git a/tests/wpt/web-platform-tests/js-self-profiling/tentative/marker-vm-state.https.html b/tests/wpt/tests/js-self-profiling/tentative/marker-vm-state.https.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/tentative/marker-vm-state.https.html rename to tests/wpt/tests/js-self-profiling/tentative/marker-vm-state.https.html diff --git a/tests/wpt/web-platform-tests/js-self-profiling/tentative/marker-vm-state.https.html.headers b/tests/wpt/tests/js-self-profiling/tentative/marker-vm-state.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/tentative/marker-vm-state.https.html.headers rename to tests/wpt/tests/js-self-profiling/tentative/marker-vm-state.https.html.headers diff --git a/tests/wpt/web-platform-tests/js-self-profiling/time-domain.window.js b/tests/wpt/tests/js-self-profiling/time-domain.window.js similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/time-domain.window.js rename to tests/wpt/tests/js-self-profiling/time-domain.window.js diff --git a/tests/wpt/web-platform-tests/js-self-profiling/without-document-policy/disabled.https.html b/tests/wpt/tests/js-self-profiling/without-document-policy/disabled.https.html similarity index 100% rename from tests/wpt/web-platform-tests/js-self-profiling/without-document-policy/disabled.https.html rename to tests/wpt/tests/js-self-profiling/without-document-policy/disabled.https.html diff --git a/tests/wpt/web-platform-tests/js/META.yml b/tests/wpt/tests/js/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/js/META.yml rename to tests/wpt/tests/js/META.yml diff --git a/tests/wpt/web-platform-tests/js/behaviours/HostEnsureCanAddPrivateElement.window.js b/tests/wpt/tests/js/behaviours/HostEnsureCanAddPrivateElement.window.js similarity index 100% rename from tests/wpt/web-platform-tests/js/behaviours/HostEnsureCanAddPrivateElement.window.js rename to tests/wpt/tests/js/behaviours/HostEnsureCanAddPrivateElement.window.js diff --git a/tests/wpt/web-platform-tests/js/behaviours/SetPrototypeOf-window.html b/tests/wpt/tests/js/behaviours/SetPrototypeOf-window.html similarity index 100% rename from tests/wpt/web-platform-tests/js/behaviours/SetPrototypeOf-window.html rename to tests/wpt/tests/js/behaviours/SetPrototypeOf-window.html diff --git a/tests/wpt/web-platform-tests/js/behaviours/frame.html b/tests/wpt/tests/js/behaviours/frame.html similarity index 100% rename from tests/wpt/web-platform-tests/js/behaviours/frame.html rename to tests/wpt/tests/js/behaviours/frame.html diff --git a/tests/wpt/web-platform-tests/js/builtins/Array.DefineOwnProperty.html b/tests/wpt/tests/js/builtins/Array.DefineOwnProperty.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Array.DefineOwnProperty.html rename to tests/wpt/tests/js/builtins/Array.DefineOwnProperty.html diff --git a/tests/wpt/web-platform-tests/js/builtins/Array.prototype.join-order.html b/tests/wpt/tests/js/builtins/Array.prototype.join-order.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Array.prototype.join-order.html rename to tests/wpt/tests/js/builtins/Array.prototype.join-order.html diff --git a/tests/wpt/web-platform-tests/js/builtins/Math.max.html b/tests/wpt/tests/js/builtins/Math.max.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Math.max.html rename to tests/wpt/tests/js/builtins/Math.max.html diff --git a/tests/wpt/web-platform-tests/js/builtins/Math.maxmin.js b/tests/wpt/tests/js/builtins/Math.maxmin.js similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Math.maxmin.js rename to tests/wpt/tests/js/builtins/Math.maxmin.js diff --git a/tests/wpt/web-platform-tests/js/builtins/Math.min.html b/tests/wpt/tests/js/builtins/Math.min.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Math.min.html rename to tests/wpt/tests/js/builtins/Math.min.html diff --git a/tests/wpt/web-platform-tests/js/builtins/Object.prototype.freeze.html b/tests/wpt/tests/js/builtins/Object.prototype.freeze.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Object.prototype.freeze.html rename to tests/wpt/tests/js/builtins/Object.prototype.freeze.html diff --git a/tests/wpt/web-platform-tests/js/builtins/Object.prototype.getOwnPropertyNames.html b/tests/wpt/tests/js/builtins/Object.prototype.getOwnPropertyNames.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Object.prototype.getOwnPropertyNames.html rename to tests/wpt/tests/js/builtins/Object.prototype.getOwnPropertyNames.html diff --git a/tests/wpt/web-platform-tests/js/builtins/Object.prototype.hasOwnProperty-order.html b/tests/wpt/tests/js/builtins/Object.prototype.hasOwnProperty-order.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Object.prototype.hasOwnProperty-order.html rename to tests/wpt/tests/js/builtins/Object.prototype.hasOwnProperty-order.html diff --git a/tests/wpt/web-platform-tests/js/builtins/Object.prototype.hasOwnProperty-prototype-chain.html b/tests/wpt/tests/js/builtins/Object.prototype.hasOwnProperty-prototype-chain.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Object.prototype.hasOwnProperty-prototype-chain.html rename to tests/wpt/tests/js/builtins/Object.prototype.hasOwnProperty-prototype-chain.html diff --git a/tests/wpt/web-platform-tests/js/builtins/Object.prototype.preventExtensions.html b/tests/wpt/tests/js/builtins/Object.prototype.preventExtensions.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Object.prototype.preventExtensions.html rename to tests/wpt/tests/js/builtins/Object.prototype.preventExtensions.html diff --git a/tests/wpt/web-platform-tests/js/builtins/Object.prototype.seal.html b/tests/wpt/tests/js/builtins/Object.prototype.seal.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Object.prototype.seal.html rename to tests/wpt/tests/js/builtins/Object.prototype.seal.html diff --git a/tests/wpt/web-platform-tests/js/builtins/Promise-incumbent-global-subframe.sub.html b/tests/wpt/tests/js/builtins/Promise-incumbent-global-subframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Promise-incumbent-global-subframe.sub.html rename to tests/wpt/tests/js/builtins/Promise-incumbent-global-subframe.sub.html diff --git a/tests/wpt/web-platform-tests/js/builtins/Promise-incumbent-global-subsubframe.sub.html b/tests/wpt/tests/js/builtins/Promise-incumbent-global-subsubframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Promise-incumbent-global-subsubframe.sub.html rename to tests/wpt/tests/js/builtins/Promise-incumbent-global-subsubframe.sub.html diff --git a/tests/wpt/web-platform-tests/js/builtins/Promise-incumbent-global.sub.html b/tests/wpt/tests/js/builtins/Promise-incumbent-global.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Promise-incumbent-global.sub.html rename to tests/wpt/tests/js/builtins/Promise-incumbent-global.sub.html diff --git a/tests/wpt/web-platform-tests/js/builtins/Promise-subclassing.html b/tests/wpt/tests/js/builtins/Promise-subclassing.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/Promise-subclassing.html rename to tests/wpt/tests/js/builtins/Promise-subclassing.html diff --git a/tests/wpt/web-platform-tests/js/builtins/WeakMap.prototype-properties.html b/tests/wpt/tests/js/builtins/WeakMap.prototype-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/WeakMap.prototype-properties.html rename to tests/wpt/tests/js/builtins/WeakMap.prototype-properties.html diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js b/tests/wpt/tests/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js rename to tests/wpt/tests/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js b/tests/wpt/tests/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js rename to tests/wpt/tests/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/finalizationregistry-cleanupCallback-gets-a-microtask.optional.any.js b/tests/wpt/tests/js/builtins/weakrefs/finalizationregistry-cleanupCallback-gets-a-microtask.optional.any.js similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/weakrefs/finalizationregistry-cleanupCallback-gets-a-microtask.optional.any.js rename to tests/wpt/tests/js/builtins/weakrefs/finalizationregistry-cleanupCallback-gets-a-microtask.optional.any.js diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/finalizationregistry-cleanupCallback-throws-onerror-interaction.optional.window.js b/tests/wpt/tests/js/builtins/weakrefs/finalizationregistry-cleanupCallback-throws-onerror-interaction.optional.window.js similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/weakrefs/finalizationregistry-cleanupCallback-throws-onerror-interaction.optional.window.js rename to tests/wpt/tests/js/builtins/weakrefs/finalizationregistry-cleanupCallback-throws-onerror-interaction.optional.window.js diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback-queueMicrotask.optional.any.js b/tests/wpt/tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback-queueMicrotask.optional.any.js similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback-queueMicrotask.optional.any.js rename to tests/wpt/tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback-queueMicrotask.optional.any.js diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback-queueMicrotaskMutationObserver.optional.window.js b/tests/wpt/tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback-queueMicrotaskMutationObserver.optional.window.js similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback-queueMicrotaskMutationObserver.optional.window.js rename to tests/wpt/tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback-queueMicrotaskMutationObserver.optional.window.js diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js b/tests/wpt/tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js rename to tests/wpt/tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/holdings-multiple-values.optional.any.js b/tests/wpt/tests/js/builtins/weakrefs/holdings-multiple-values.optional.any.js similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/weakrefs/holdings-multiple-values.optional.any.js rename to tests/wpt/tests/js/builtins/weakrefs/holdings-multiple-values.optional.any.js diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/reentrancy.optional.any.js b/tests/wpt/tests/js/builtins/weakrefs/reentrancy.optional.any.js similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/weakrefs/reentrancy.optional.any.js rename to tests/wpt/tests/js/builtins/weakrefs/reentrancy.optional.any.js diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/resources/maybe-garbage-collect.js b/tests/wpt/tests/js/builtins/weakrefs/resources/maybe-garbage-collect.js similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/weakrefs/resources/maybe-garbage-collect.js rename to tests/wpt/tests/js/builtins/weakrefs/resources/maybe-garbage-collect.js diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js b/tests/wpt/tests/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js rename to tests/wpt/tests/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js b/tests/wpt/tests/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js similarity index 100% rename from tests/wpt/web-platform-tests/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js rename to tests/wpt/tests/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js diff --git a/tests/wpt/web-platform-tests/keyboard-lock/META.yml b/tests/wpt/tests/keyboard-lock/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-lock/META.yml rename to tests/wpt/tests/keyboard-lock/META.yml diff --git a/tests/wpt/web-platform-tests/keyboard-lock/idlharness.https.window.js b/tests/wpt/tests/keyboard-lock/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-lock/idlharness.https.window.js rename to tests/wpt/tests/keyboard-lock/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock-blocked-from-cross-origin-iframe.https.html b/tests/wpt/tests/keyboard-lock/navigator-keyboard-lock-blocked-from-cross-origin-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock-blocked-from-cross-origin-iframe.https.html rename to tests/wpt/tests/keyboard-lock/navigator-keyboard-lock-blocked-from-cross-origin-iframe.https.html diff --git a/tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock-blocked-from-iframe.https.html b/tests/wpt/tests/keyboard-lock/navigator-keyboard-lock-blocked-from-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock-blocked-from-iframe.https.html rename to tests/wpt/tests/keyboard-lock/navigator-keyboard-lock-blocked-from-iframe.https.html diff --git a/tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock-two-parallel-requests.https.html b/tests/wpt/tests/keyboard-lock/navigator-keyboard-lock-two-parallel-requests.https.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock-two-parallel-requests.https.html rename to tests/wpt/tests/keyboard-lock/navigator-keyboard-lock-two-parallel-requests.https.html diff --git a/tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock-two-sequential-requests.https.html b/tests/wpt/tests/keyboard-lock/navigator-keyboard-lock-two-sequential-requests.https.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock-two-sequential-requests.https.html rename to tests/wpt/tests/keyboard-lock/navigator-keyboard-lock-two-sequential-requests.https.html diff --git a/tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock.https.html b/tests/wpt/tests/keyboard-lock/navigator-keyboard-lock.https.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock.https.html rename to tests/wpt/tests/keyboard-lock/navigator-keyboard-lock.https.html diff --git a/tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-unlock.https.html b/tests/wpt/tests/keyboard-lock/navigator-keyboard-unlock.https.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-unlock.https.html rename to tests/wpt/tests/keyboard-lock/navigator-keyboard-unlock.https.html diff --git a/tests/wpt/web-platform-tests/keyboard-lock/resources/iframe-lock-helper.html b/tests/wpt/tests/keyboard-lock/resources/iframe-lock-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-lock/resources/iframe-lock-helper.html rename to tests/wpt/tests/keyboard-lock/resources/iframe-lock-helper.html diff --git a/tests/wpt/web-platform-tests/keyboard-map/META.yml b/tests/wpt/tests/keyboard-map/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-map/META.yml rename to tests/wpt/tests/keyboard-map/META.yml diff --git a/tests/wpt/web-platform-tests/keyboard-map/idlharness.https.window.js b/tests/wpt/tests/keyboard-map/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-map/idlharness.https.window.js rename to tests/wpt/tests/keyboard-map/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/keyboard-map/navigator-keyboard-map-allowed-from-cross-origin-iframe.https.html b/tests/wpt/tests/keyboard-map/navigator-keyboard-map-allowed-from-cross-origin-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-map/navigator-keyboard-map-allowed-from-cross-origin-iframe.https.html rename to tests/wpt/tests/keyboard-map/navigator-keyboard-map-allowed-from-cross-origin-iframe.https.html diff --git a/tests/wpt/web-platform-tests/keyboard-map/navigator-keyboard-map-allowed-from-iframe.https.html b/tests/wpt/tests/keyboard-map/navigator-keyboard-map-allowed-from-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-map/navigator-keyboard-map-allowed-from-iframe.https.html rename to tests/wpt/tests/keyboard-map/navigator-keyboard-map-allowed-from-iframe.https.html diff --git a/tests/wpt/web-platform-tests/keyboard-map/navigator-keyboard-map-blocked-from-cross-origin-iframe.https.html b/tests/wpt/tests/keyboard-map/navigator-keyboard-map-blocked-from-cross-origin-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-map/navigator-keyboard-map-blocked-from-cross-origin-iframe.https.html rename to tests/wpt/tests/keyboard-map/navigator-keyboard-map-blocked-from-cross-origin-iframe.https.html diff --git a/tests/wpt/web-platform-tests/keyboard-map/navigator-keyboard-map-blocked-from-iframe.https.html b/tests/wpt/tests/keyboard-map/navigator-keyboard-map-blocked-from-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-map/navigator-keyboard-map-blocked-from-iframe.https.html rename to tests/wpt/tests/keyboard-map/navigator-keyboard-map-blocked-from-iframe.https.html diff --git a/tests/wpt/web-platform-tests/keyboard-map/navigator-keyboard-map-two-parallel-requests.https.html b/tests/wpt/tests/keyboard-map/navigator-keyboard-map-two-parallel-requests.https.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-map/navigator-keyboard-map-two-parallel-requests.https.html rename to tests/wpt/tests/keyboard-map/navigator-keyboard-map-two-parallel-requests.https.html diff --git a/tests/wpt/web-platform-tests/keyboard-map/navigator-keyboard-map-two-sequential-requests.https.html b/tests/wpt/tests/keyboard-map/navigator-keyboard-map-two-sequential-requests.https.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-map/navigator-keyboard-map-two-sequential-requests.https.html rename to tests/wpt/tests/keyboard-map/navigator-keyboard-map-two-sequential-requests.https.html diff --git a/tests/wpt/web-platform-tests/keyboard-map/navigator-keyboard-map.https.html b/tests/wpt/tests/keyboard-map/navigator-keyboard-map.https.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-map/navigator-keyboard-map.https.html rename to tests/wpt/tests/keyboard-map/navigator-keyboard-map.https.html diff --git a/tests/wpt/web-platform-tests/keyboard-map/resources/iframe-keyboard-map-allow-helper.html b/tests/wpt/tests/keyboard-map/resources/iframe-keyboard-map-allow-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-map/resources/iframe-keyboard-map-allow-helper.html rename to tests/wpt/tests/keyboard-map/resources/iframe-keyboard-map-allow-helper.html diff --git a/tests/wpt/web-platform-tests/keyboard-map/resources/iframe-keyboard-map-helper.html b/tests/wpt/tests/keyboard-map/resources/iframe-keyboard-map-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/keyboard-map/resources/iframe-keyboard-map-helper.html rename to tests/wpt/tests/keyboard-map/resources/iframe-keyboard-map-helper.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/META.yml b/tests/wpt/tests/largest-contentful-paint/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/META.yml rename to tests/wpt/tests/largest-contentful-paint/META.yml diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/animated/observe-animated-image-gif.tentative.html b/tests/wpt/tests/largest-contentful-paint/animated/observe-animated-image-gif.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/animated/observe-animated-image-gif.tentative.html rename to tests/wpt/tests/largest-contentful-paint/animated/observe-animated-image-gif.tentative.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/animated/observe-animated-image-webp.tentative.html b/tests/wpt/tests/largest-contentful-paint/animated/observe-animated-image-webp.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/animated/observe-animated-image-webp.tentative.html rename to tests/wpt/tests/largest-contentful-paint/animated/observe-animated-image-webp.tentative.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/animated/observe-animated-image.tentative.html b/tests/wpt/tests/largest-contentful-paint/animated/observe-animated-image.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/animated/observe-animated-image.tentative.html rename to tests/wpt/tests/largest-contentful-paint/animated/observe-animated-image.tentative.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/animated/observe-cross-origin-animated-image.tentative.html b/tests/wpt/tests/largest-contentful-paint/animated/observe-cross-origin-animated-image.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/animated/observe-cross-origin-animated-image.tentative.html rename to tests/wpt/tests/largest-contentful-paint/animated/observe-cross-origin-animated-image.tentative.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/animated/observe-cross-origin-tao-animated-image.tentative.html b/tests/wpt/tests/largest-contentful-paint/animated/observe-cross-origin-tao-animated-image.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/animated/observe-cross-origin-tao-animated-image.tentative.html rename to tests/wpt/tests/largest-contentful-paint/animated/observe-cross-origin-tao-animated-image.tentative.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/animated/observe-non-animated-image.tentative.html b/tests/wpt/tests/largest-contentful-paint/animated/observe-non-animated-image.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/animated/observe-non-animated-image.tentative.html rename to tests/wpt/tests/largest-contentful-paint/animated/observe-non-animated-image.tentative.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/animated/observe-video.tentative.html b/tests/wpt/tests/largest-contentful-paint/animated/observe-video.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/animated/observe-video.tentative.html rename to tests/wpt/tests/largest-contentful-paint/animated/observe-video.tentative.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/contracted-image.html b/tests/wpt/tests/largest-contentful-paint/contracted-image.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/contracted-image.html rename to tests/wpt/tests/largest-contentful-paint/contracted-image.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/cross-origin-image.sub.html b/tests/wpt/tests/largest-contentful-paint/cross-origin-image.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/cross-origin-image.sub.html rename to tests/wpt/tests/largest-contentful-paint/cross-origin-image.sub.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/element-only-when-fully-active.html b/tests/wpt/tests/largest-contentful-paint/element-only-when-fully-active.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/element-only-when-fully-active.html rename to tests/wpt/tests/largest-contentful-paint/element-only-when-fully-active.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/expanded-image.html b/tests/wpt/tests/largest-contentful-paint/expanded-image.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/expanded-image.html rename to tests/wpt/tests/largest-contentful-paint/expanded-image.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/first-letter-background.html b/tests/wpt/tests/largest-contentful-paint/first-letter-background.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/first-letter-background.html rename to tests/wpt/tests/largest-contentful-paint/first-letter-background.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/first-paint-equals-lcp-text.html b/tests/wpt/tests/largest-contentful-paint/first-paint-equals-lcp-text.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/first-paint-equals-lcp-text.html rename to tests/wpt/tests/largest-contentful-paint/first-paint-equals-lcp-text.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/idlharness.html b/tests/wpt/tests/largest-contentful-paint/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/idlharness.html rename to tests/wpt/tests/largest-contentful-paint/idlharness.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/iframe-content-not-observed.html b/tests/wpt/tests/largest-contentful-paint/iframe-content-not-observed.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/iframe-content-not-observed.html rename to tests/wpt/tests/largest-contentful-paint/iframe-content-not-observed.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/image-TAO.sub.html b/tests/wpt/tests/largest-contentful-paint/image-TAO.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/image-TAO.sub.html rename to tests/wpt/tests/largest-contentful-paint/image-TAO.sub.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/image-full-viewport.html b/tests/wpt/tests/largest-contentful-paint/image-full-viewport.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/image-full-viewport.html rename to tests/wpt/tests/largest-contentful-paint/image-full-viewport.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/image-inside-svg.html b/tests/wpt/tests/largest-contentful-paint/image-inside-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/image-inside-svg.html rename to tests/wpt/tests/largest-contentful-paint/image-inside-svg.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/image-not-fully-visible.html b/tests/wpt/tests/largest-contentful-paint/image-not-fully-visible.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/image-not-fully-visible.html rename to tests/wpt/tests/largest-contentful-paint/image-not-fully-visible.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/image-removed-before-load.html b/tests/wpt/tests/largest-contentful-paint/image-removed-before-load.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/image-removed-before-load.html rename to tests/wpt/tests/largest-contentful-paint/image-removed-before-load.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/image-src-change.html b/tests/wpt/tests/largest-contentful-paint/image-src-change.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/image-src-change.html rename to tests/wpt/tests/largest-contentful-paint/image-src-change.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/image-sw-same-origin.https.html b/tests/wpt/tests/largest-contentful-paint/image-sw-same-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/image-sw-same-origin.https.html rename to tests/wpt/tests/largest-contentful-paint/image-sw-same-origin.https.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/image-upscaling.html b/tests/wpt/tests/largest-contentful-paint/image-upscaling.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/image-upscaling.html rename to tests/wpt/tests/largest-contentful-paint/image-upscaling.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/initially-invisible-images.html b/tests/wpt/tests/largest-contentful-paint/initially-invisible-images.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/initially-invisible-images.html rename to tests/wpt/tests/largest-contentful-paint/initially-invisible-images.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images-composited-1.html b/tests/wpt/tests/largest-contentful-paint/invisible-images-composited-1.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images-composited-1.html rename to tests/wpt/tests/largest-contentful-paint/invisible-images-composited-1.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images-composited-2.html b/tests/wpt/tests/largest-contentful-paint/invisible-images-composited-2.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images-composited-2.html rename to tests/wpt/tests/largest-contentful-paint/invisible-images-composited-2.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images.html b/tests/wpt/tests/largest-contentful-paint/invisible-images.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images.html rename to tests/wpt/tests/largest-contentful-paint/invisible-images.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/larger-image.html b/tests/wpt/tests/largest-contentful-paint/larger-image.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/larger-image.html rename to tests/wpt/tests/largest-contentful-paint/larger-image.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/larger-text.html b/tests/wpt/tests/largest-contentful-paint/larger-text.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/larger-text.html rename to tests/wpt/tests/largest-contentful-paint/larger-text.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/loadTime-after-appendChild.html b/tests/wpt/tests/largest-contentful-paint/loadTime-after-appendChild.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/loadTime-after-appendChild.html rename to tests/wpt/tests/largest-contentful-paint/loadTime-after-appendChild.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/mouseover-heuristics-background.tentative.html b/tests/wpt/tests/largest-contentful-paint/mouseover-heuristics-background.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/mouseover-heuristics-background.tentative.html rename to tests/wpt/tests/largest-contentful-paint/mouseover-heuristics-background.tentative.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/mouseover-heuristics-element.tentative.html b/tests/wpt/tests/largest-contentful-paint/mouseover-heuristics-element.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/mouseover-heuristics-element.tentative.html rename to tests/wpt/tests/largest-contentful-paint/mouseover-heuristics-element.tentative.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/multiple-image-same-src.html b/tests/wpt/tests/largest-contentful-paint/multiple-image-same-src.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/multiple-image-same-src.html rename to tests/wpt/tests/largest-contentful-paint/multiple-image-same-src.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/multiple-redirects-TAO.html b/tests/wpt/tests/largest-contentful-paint/multiple-redirects-TAO.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/multiple-redirects-TAO.html rename to tests/wpt/tests/largest-contentful-paint/multiple-redirects-TAO.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/non-tao-image-load-after-fcp.tentative.html b/tests/wpt/tests/largest-contentful-paint/non-tao-image-load-after-fcp.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/non-tao-image-load-after-fcp.tentative.html rename to tests/wpt/tests/largest-contentful-paint/non-tao-image-load-after-fcp.tentative.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/non-tao-image-load-before-fcp-render-after.tentative.html b/tests/wpt/tests/largest-contentful-paint/non-tao-image-load-before-fcp-render-after.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/non-tao-image-load-before-fcp-render-after.tentative.html rename to tests/wpt/tests/largest-contentful-paint/non-tao-image-load-before-fcp-render-after.tentative.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/non-tao-image-load-before-fcp-render-at-fcp.tentative.html b/tests/wpt/tests/largest-contentful-paint/non-tao-image-load-before-fcp-render-at-fcp.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/non-tao-image-load-before-fcp-render-at-fcp.tentative.html rename to tests/wpt/tests/largest-contentful-paint/non-tao-image-load-before-fcp-render-at-fcp.tentative.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/non-tao-image-subsequent-lcp-candidate.tentative.html b/tests/wpt/tests/largest-contentful-paint/non-tao-image-subsequent-lcp-candidate.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/non-tao-image-subsequent-lcp-candidate.tentative.html rename to tests/wpt/tests/largest-contentful-paint/non-tao-image-subsequent-lcp-candidate.tentative.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/observe-after-untrusted-scroll.html b/tests/wpt/tests/largest-contentful-paint/observe-after-untrusted-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/observe-after-untrusted-scroll.html rename to tests/wpt/tests/largest-contentful-paint/observe-after-untrusted-scroll.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/observe-css-generated-text.html b/tests/wpt/tests/largest-contentful-paint/observe-css-generated-text.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/observe-css-generated-text.html rename to tests/wpt/tests/largest-contentful-paint/observe-css-generated-text.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/observe-image.html b/tests/wpt/tests/largest-contentful-paint/observe-image.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/observe-image.html rename to tests/wpt/tests/largest-contentful-paint/observe-image.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/observe-svg-background-image.html b/tests/wpt/tests/largest-contentful-paint/observe-svg-background-image.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/observe-svg-background-image.html rename to tests/wpt/tests/largest-contentful-paint/observe-svg-background-image.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/observe-svg-data-uri-background-image.html b/tests/wpt/tests/largest-contentful-paint/observe-svg-data-uri-background-image.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/observe-svg-data-uri-background-image.html rename to tests/wpt/tests/largest-contentful-paint/observe-svg-data-uri-background-image.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/observe-svg-data-uri-image.html b/tests/wpt/tests/largest-contentful-paint/observe-svg-data-uri-image.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/observe-svg-data-uri-image.html rename to tests/wpt/tests/largest-contentful-paint/observe-svg-data-uri-image.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/observe-svg-image.html b/tests/wpt/tests/largest-contentful-paint/observe-svg-image.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/observe-svg-image.html rename to tests/wpt/tests/largest-contentful-paint/observe-svg-image.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/observe-text.html b/tests/wpt/tests/largest-contentful-paint/observe-text.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/observe-text.html rename to tests/wpt/tests/largest-contentful-paint/observe-text.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/placeholder-image.html b/tests/wpt/tests/largest-contentful-paint/placeholder-image.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/placeholder-image.html rename to tests/wpt/tests/largest-contentful-paint/placeholder-image.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/redirects-tao-star.html b/tests/wpt/tests/largest-contentful-paint/redirects-tao-star.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/redirects-tao-star.html rename to tests/wpt/tests/largest-contentful-paint/redirects-tao-star.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/repeated-image.html b/tests/wpt/tests/largest-contentful-paint/repeated-image.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/repeated-image.html rename to tests/wpt/tests/largest-contentful-paint/repeated-image.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/resources/iframe-stores-entry.html b/tests/wpt/tests/largest-contentful-paint/resources/iframe-stores-entry.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/resources/iframe-stores-entry.html rename to tests/wpt/tests/largest-contentful-paint/resources/iframe-stores-entry.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/resources/invisible-images.js b/tests/wpt/tests/largest-contentful-paint/resources/invisible-images.js similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/resources/invisible-images.js rename to tests/wpt/tests/largest-contentful-paint/resources/invisible-images.js diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/resources/largest-contentful-paint-helpers.js b/tests/wpt/tests/largest-contentful-paint/resources/largest-contentful-paint-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/resources/largest-contentful-paint-helpers.js rename to tests/wpt/tests/largest-contentful-paint/resources/largest-contentful-paint-helpers.js diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/resources/lcp-sw-from-cache.js b/tests/wpt/tests/largest-contentful-paint/resources/lcp-sw-from-cache.js similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/resources/lcp-sw-from-cache.js rename to tests/wpt/tests/largest-contentful-paint/resources/lcp-sw-from-cache.js diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/resources/lcp-sw.https.html b/tests/wpt/tests/largest-contentful-paint/resources/lcp-sw.https.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/resources/lcp-sw.https.html rename to tests/wpt/tests/largest-contentful-paint/resources/lcp-sw.https.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/resources/mouseover-utils.js b/tests/wpt/tests/largest-contentful-paint/resources/mouseover-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/resources/mouseover-utils.js rename to tests/wpt/tests/largest-contentful-paint/resources/mouseover-utils.js diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/resources/slow-style-change.py b/tests/wpt/tests/largest-contentful-paint/resources/slow-style-change.py similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/resources/slow-style-change.py rename to tests/wpt/tests/largest-contentful-paint/resources/slow-style-change.py diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/same-origin-redirects.html b/tests/wpt/tests/largest-contentful-paint/same-origin-redirects.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/same-origin-redirects.html rename to tests/wpt/tests/largest-contentful-paint/same-origin-redirects.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/supported-lcp-type.html b/tests/wpt/tests/largest-contentful-paint/supported-lcp-type.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/supported-lcp-type.html rename to tests/wpt/tests/largest-contentful-paint/supported-lcp-type.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/text-with-display-style.html b/tests/wpt/tests/largest-contentful-paint/text-with-display-style.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/text-with-display-style.html rename to tests/wpt/tests/largest-contentful-paint/text-with-display-style.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/toJSON.html b/tests/wpt/tests/largest-contentful-paint/toJSON.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/toJSON.html rename to tests/wpt/tests/largest-contentful-paint/toJSON.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/update-on-style-change.tentative.html b/tests/wpt/tests/largest-contentful-paint/update-on-style-change.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/update-on-style-change.tentative.html rename to tests/wpt/tests/largest-contentful-paint/update-on-style-change.tentative.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/video-data-uri.html b/tests/wpt/tests/largest-contentful-paint/video-data-uri.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/video-data-uri.html rename to tests/wpt/tests/largest-contentful-paint/video-data-uri.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/video-poster.html b/tests/wpt/tests/largest-contentful-paint/video-poster.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/video-poster.html rename to tests/wpt/tests/largest-contentful-paint/video-poster.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/web-font-styled-text-resize-block.html b/tests/wpt/tests/largest-contentful-paint/web-font-styled-text-resize-block.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/web-font-styled-text-resize-block.html rename to tests/wpt/tests/largest-contentful-paint/web-font-styled-text-resize-block.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/web-font-styled-text-resize-swap-after-interaction.html b/tests/wpt/tests/largest-contentful-paint/web-font-styled-text-resize-swap-after-interaction.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/web-font-styled-text-resize-swap-after-interaction.html rename to tests/wpt/tests/largest-contentful-paint/web-font-styled-text-resize-swap-after-interaction.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/web-font-styled-text-resize-swap-smaller.html b/tests/wpt/tests/largest-contentful-paint/web-font-styled-text-resize-swap-smaller.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/web-font-styled-text-resize-swap-smaller.html rename to tests/wpt/tests/largest-contentful-paint/web-font-styled-text-resize-swap-smaller.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/web-font-styled-text-resize-swap-subnode.html b/tests/wpt/tests/largest-contentful-paint/web-font-styled-text-resize-swap-subnode.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/web-font-styled-text-resize-swap-subnode.html rename to tests/wpt/tests/largest-contentful-paint/web-font-styled-text-resize-swap-subnode.html diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/web-font-styled-text-resize-swap.html b/tests/wpt/tests/largest-contentful-paint/web-font-styled-text-resize-swap.html similarity index 100% rename from tests/wpt/web-platform-tests/largest-contentful-paint/web-font-styled-text-resize-swap.html rename to tests/wpt/tests/largest-contentful-paint/web-font-styled-text-resize-swap.html diff --git a/tests/wpt/web-platform-tests/layout-instability/META.yml b/tests/wpt/tests/layout-instability/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/META.yml rename to tests/wpt/tests/layout-instability/META.yml diff --git a/tests/wpt/web-platform-tests/layout-instability/absolute-child-shift-with-parent-contain.html b/tests/wpt/tests/layout-instability/absolute-child-shift-with-parent-contain.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/absolute-child-shift-with-parent-contain.html rename to tests/wpt/tests/layout-instability/absolute-child-shift-with-parent-contain.html diff --git a/tests/wpt/web-platform-tests/layout-instability/absolute-child-shift-with-parent-negative-overflow.html b/tests/wpt/tests/layout-instability/absolute-child-shift-with-parent-negative-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/absolute-child-shift-with-parent-negative-overflow.html rename to tests/wpt/tests/layout-instability/absolute-child-shift-with-parent-negative-overflow.html diff --git a/tests/wpt/web-platform-tests/layout-instability/absolute-child-shift-with-parent-overflow.html b/tests/wpt/tests/layout-instability/absolute-child-shift-with-parent-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/absolute-child-shift-with-parent-overflow.html rename to tests/wpt/tests/layout-instability/absolute-child-shift-with-parent-overflow.html diff --git a/tests/wpt/web-platform-tests/layout-instability/absolute-child-shift-with-parent-will-change.html b/tests/wpt/tests/layout-instability/absolute-child-shift-with-parent-will-change.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/absolute-child-shift-with-parent-will-change.html rename to tests/wpt/tests/layout-instability/absolute-child-shift-with-parent-will-change.html diff --git a/tests/wpt/web-platform-tests/layout-instability/add-remove-position-fixed.html b/tests/wpt/tests/layout-instability/add-remove-position-fixed.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/add-remove-position-fixed.html rename to tests/wpt/tests/layout-instability/add-remove-position-fixed.html diff --git a/tests/wpt/web-platform-tests/layout-instability/add-remove-position-sticky.html b/tests/wpt/tests/layout-instability/add-remove-position-sticky.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/add-remove-position-sticky.html rename to tests/wpt/tests/layout-instability/add-remove-position-sticky.html diff --git a/tests/wpt/web-platform-tests/layout-instability/body-display-change.html b/tests/wpt/tests/layout-instability/body-display-change.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/body-display-change.html rename to tests/wpt/tests/layout-instability/body-display-change.html diff --git a/tests/wpt/web-platform-tests/layout-instability/buffer-layout-shift.html b/tests/wpt/tests/layout-instability/buffer-layout-shift.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/buffer-layout-shift.html rename to tests/wpt/tests/layout-instability/buffer-layout-shift.html diff --git a/tests/wpt/web-platform-tests/layout-instability/buffered-flag.html b/tests/wpt/tests/layout-instability/buffered-flag.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/buffered-flag.html rename to tests/wpt/tests/layout-instability/buffered-flag.html diff --git a/tests/wpt/web-platform-tests/layout-instability/child-shift-with-parent-overflow-hidden.html b/tests/wpt/tests/layout-instability/child-shift-with-parent-overflow-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/child-shift-with-parent-overflow-hidden.html rename to tests/wpt/tests/layout-instability/child-shift-with-parent-overflow-hidden.html diff --git a/tests/wpt/web-platform-tests/layout-instability/child-shift-with-parent-overflow-x-clip.html b/tests/wpt/tests/layout-instability/child-shift-with-parent-overflow-x-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/child-shift-with-parent-overflow-x-clip.html rename to tests/wpt/tests/layout-instability/child-shift-with-parent-overflow-x-clip.html diff --git a/tests/wpt/web-platform-tests/layout-instability/child-shift-with-parent.html b/tests/wpt/tests/layout-instability/child-shift-with-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/child-shift-with-parent.html rename to tests/wpt/tests/layout-instability/child-shift-with-parent.html diff --git a/tests/wpt/web-platform-tests/layout-instability/clip-negative-bottom-margin.html b/tests/wpt/tests/layout-instability/clip-negative-bottom-margin.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/clip-negative-bottom-margin.html rename to tests/wpt/tests/layout-instability/clip-negative-bottom-margin.html diff --git a/tests/wpt/web-platform-tests/layout-instability/composited-element-movement.html b/tests/wpt/tests/layout-instability/composited-element-movement.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/composited-element-movement.html rename to tests/wpt/tests/layout-instability/composited-element-movement.html diff --git a/tests/wpt/web-platform-tests/layout-instability/contain-paint-fully-clipped.html b/tests/wpt/tests/layout-instability/contain-paint-fully-clipped.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/contain-paint-fully-clipped.html rename to tests/wpt/tests/layout-instability/contain-paint-fully-clipped.html diff --git a/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-offscreen.html b/tests/wpt/tests/layout-instability/content-visibility-auto-offscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-offscreen.html rename to tests/wpt/tests/layout-instability/content-visibility-auto-offscreen.html diff --git a/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-onscreen.html b/tests/wpt/tests/layout-instability/content-visibility-auto-onscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-onscreen.html rename to tests/wpt/tests/layout-instability/content-visibility-auto-onscreen.html diff --git a/tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-resize.html b/tests/wpt/tests/layout-instability/content-visibility-auto-resize.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/content-visibility-auto-resize.html rename to tests/wpt/tests/layout-instability/content-visibility-auto-resize.html diff --git a/tests/wpt/web-platform-tests/layout-instability/content-visibility-hidden.html b/tests/wpt/tests/layout-instability/content-visibility-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/content-visibility-hidden.html rename to tests/wpt/tests/layout-instability/content-visibility-hidden.html diff --git a/tests/wpt/web-platform-tests/layout-instability/display-change-with-transform.html b/tests/wpt/tests/layout-instability/display-change-with-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/display-change-with-transform.html rename to tests/wpt/tests/layout-instability/display-change-with-transform.html diff --git a/tests/wpt/web-platform-tests/layout-instability/expand-above-viewport.html b/tests/wpt/tests/layout-instability/expand-above-viewport.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/expand-above-viewport.html rename to tests/wpt/tests/layout-instability/expand-above-viewport.html diff --git a/tests/wpt/web-platform-tests/layout-instability/fixed-position-move.html b/tests/wpt/tests/layout-instability/fixed-position-move.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/fixed-position-move.html rename to tests/wpt/tests/layout-instability/fixed-position-move.html diff --git a/tests/wpt/web-platform-tests/layout-instability/fully-clipped-visual-rect.html b/tests/wpt/tests/layout-instability/fully-clipped-visual-rect.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/fully-clipped-visual-rect.html rename to tests/wpt/tests/layout-instability/fully-clipped-visual-rect.html diff --git a/tests/wpt/web-platform-tests/layout-instability/idlharness.html b/tests/wpt/tests/layout-instability/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/idlharness.html rename to tests/wpt/tests/layout-instability/idlharness.html diff --git a/tests/wpt/web-platform-tests/layout-instability/ignore-fixed-and-sticky.html b/tests/wpt/tests/layout-instability/ignore-fixed-and-sticky.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/ignore-fixed-and-sticky.html rename to tests/wpt/tests/layout-instability/ignore-fixed-and-sticky.html diff --git a/tests/wpt/web-platform-tests/layout-instability/inline-flow-shift-one-line.html b/tests/wpt/tests/layout-instability/inline-flow-shift-one-line.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/inline-flow-shift-one-line.html rename to tests/wpt/tests/layout-instability/inline-flow-shift-one-line.html diff --git a/tests/wpt/web-platform-tests/layout-instability/inline-flow-shift-vertical-rl.html b/tests/wpt/tests/layout-instability/inline-flow-shift-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/inline-flow-shift-vertical-rl.html rename to tests/wpt/tests/layout-instability/inline-flow-shift-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/layout-instability/inline-flow-shift.html b/tests/wpt/tests/layout-instability/inline-flow-shift.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/inline-flow-shift.html rename to tests/wpt/tests/layout-instability/inline-flow-shift.html diff --git a/tests/wpt/web-platform-tests/layout-instability/input-timestamp.html b/tests/wpt/tests/layout-instability/input-timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/input-timestamp.html rename to tests/wpt/tests/layout-instability/input-timestamp.html diff --git a/tests/wpt/web-platform-tests/layout-instability/local-shift-without-viewport-shift-2.html b/tests/wpt/tests/layout-instability/local-shift-without-viewport-shift-2.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/local-shift-without-viewport-shift-2.html rename to tests/wpt/tests/layout-instability/local-shift-without-viewport-shift-2.html diff --git a/tests/wpt/web-platform-tests/layout-instability/local-shift-without-viewport-shift.html b/tests/wpt/tests/layout-instability/local-shift-without-viewport-shift.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/local-shift-without-viewport-shift.html rename to tests/wpt/tests/layout-instability/local-shift-without-viewport-shift.html diff --git a/tests/wpt/web-platform-tests/layout-instability/main-frame.html b/tests/wpt/tests/layout-instability/main-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/main-frame.html rename to tests/wpt/tests/layout-instability/main-frame.html diff --git a/tests/wpt/web-platform-tests/layout-instability/mousemove-becomes-drag.html b/tests/wpt/tests/layout-instability/mousemove-becomes-drag.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/mousemove-becomes-drag.html rename to tests/wpt/tests/layout-instability/mousemove-becomes-drag.html diff --git a/tests/wpt/web-platform-tests/layout-instability/move-distance-clamped.html b/tests/wpt/tests/layout-instability/move-distance-clamped.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/move-distance-clamped.html rename to tests/wpt/tests/layout-instability/move-distance-clamped.html diff --git a/tests/wpt/web-platform-tests/layout-instability/move-transformed.html b/tests/wpt/tests/layout-instability/move-transformed.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/move-transformed.html rename to tests/wpt/tests/layout-instability/move-transformed.html diff --git a/tests/wpt/web-platform-tests/layout-instability/multi-clip-visual-rect.html b/tests/wpt/tests/layout-instability/multi-clip-visual-rect.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/multi-clip-visual-rect.html rename to tests/wpt/tests/layout-instability/multi-clip-visual-rect.html diff --git a/tests/wpt/web-platform-tests/layout-instability/multicol-000.html b/tests/wpt/tests/layout-instability/multicol-000.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/multicol-000.html rename to tests/wpt/tests/layout-instability/multicol-000.html diff --git a/tests/wpt/web-platform-tests/layout-instability/multicol-001.html b/tests/wpt/tests/layout-instability/multicol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/multicol-001.html rename to tests/wpt/tests/layout-instability/multicol-001.html diff --git a/tests/wpt/web-platform-tests/layout-instability/opacity-nonzero-to-zero.html b/tests/wpt/tests/layout-instability/opacity-nonzero-to-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/opacity-nonzero-to-zero.html rename to tests/wpt/tests/layout-instability/opacity-nonzero-to-zero.html diff --git a/tests/wpt/web-platform-tests/layout-instability/opacity-zero-layout-and-visible.html b/tests/wpt/tests/layout-instability/opacity-zero-layout-and-visible.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/opacity-zero-layout-and-visible.html rename to tests/wpt/tests/layout-instability/opacity-zero-layout-and-visible.html diff --git a/tests/wpt/web-platform-tests/layout-instability/opacity-zero.html b/tests/wpt/tests/layout-instability/opacity-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/opacity-zero.html rename to tests/wpt/tests/layout-instability/opacity-zero.html diff --git a/tests/wpt/web-platform-tests/layout-instability/outline.html b/tests/wpt/tests/layout-instability/outline.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/outline.html rename to tests/wpt/tests/layout-instability/outline.html diff --git a/tests/wpt/web-platform-tests/layout-instability/partially-clipped-visual-rect.html b/tests/wpt/tests/layout-instability/partially-clipped-visual-rect.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/partially-clipped-visual-rect.html rename to tests/wpt/tests/layout-instability/partially-clipped-visual-rect.html diff --git a/tests/wpt/web-platform-tests/layout-instability/pointerdown-becomes-scroll.html b/tests/wpt/tests/layout-instability/pointerdown-becomes-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/pointerdown-becomes-scroll.html rename to tests/wpt/tests/layout-instability/pointerdown-becomes-scroll.html diff --git a/tests/wpt/web-platform-tests/layout-instability/pointerdown-becomes-tap.html b/tests/wpt/tests/layout-instability/pointerdown-becomes-tap.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/pointerdown-becomes-tap.html rename to tests/wpt/tests/layout-instability/pointerdown-becomes-tap.html diff --git a/tests/wpt/web-platform-tests/layout-instability/pointermove-becomes-drag.html b/tests/wpt/tests/layout-instability/pointermove-becomes-drag.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/pointermove-becomes-drag.html rename to tests/wpt/tests/layout-instability/pointermove-becomes-drag.html diff --git a/tests/wpt/web-platform-tests/layout-instability/recent-input.html b/tests/wpt/tests/layout-instability/recent-input.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/recent-input.html rename to tests/wpt/tests/layout-instability/recent-input.html diff --git a/tests/wpt/web-platform-tests/layout-instability/resources/slow-image.py b/tests/wpt/tests/layout-instability/resources/slow-image.py similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/resources/slow-image.py rename to tests/wpt/tests/layout-instability/resources/slow-image.py diff --git a/tests/wpt/web-platform-tests/layout-instability/resources/test-adapter.js b/tests/wpt/tests/layout-instability/resources/test-adapter.js similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/resources/test-adapter.js rename to tests/wpt/tests/layout-instability/resources/test-adapter.js diff --git a/tests/wpt/web-platform-tests/layout-instability/resources/util.js b/tests/wpt/tests/layout-instability/resources/util.js similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/resources/util.js rename to tests/wpt/tests/layout-instability/resources/util.js diff --git a/tests/wpt/web-platform-tests/layout-instability/rtl-distance.html b/tests/wpt/tests/layout-instability/rtl-distance.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/rtl-distance.html rename to tests/wpt/tests/layout-instability/rtl-distance.html diff --git a/tests/wpt/web-platform-tests/layout-instability/shift-into-viewport-inline-direction-and-scroll.html b/tests/wpt/tests/layout-instability/shift-into-viewport-inline-direction-and-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/shift-into-viewport-inline-direction-and-scroll.html rename to tests/wpt/tests/layout-instability/shift-into-viewport-inline-direction-and-scroll.html diff --git a/tests/wpt/web-platform-tests/layout-instability/shift-into-viewport-inline-direction.html b/tests/wpt/tests/layout-instability/shift-into-viewport-inline-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/shift-into-viewport-inline-direction.html rename to tests/wpt/tests/layout-instability/shift-into-viewport-inline-direction.html diff --git a/tests/wpt/web-platform-tests/layout-instability/shift-into-viewport.html b/tests/wpt/tests/layout-instability/shift-into-viewport.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/shift-into-viewport.html rename to tests/wpt/tests/layout-instability/shift-into-viewport.html diff --git a/tests/wpt/web-platform-tests/layout-instability/shift-invisible.html b/tests/wpt/tests/layout-instability/shift-invisible.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/shift-invisible.html rename to tests/wpt/tests/layout-instability/shift-invisible.html diff --git a/tests/wpt/web-platform-tests/layout-instability/shift-outside-viewport-inline-direction.html b/tests/wpt/tests/layout-instability/shift-outside-viewport-inline-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/shift-outside-viewport-inline-direction.html rename to tests/wpt/tests/layout-instability/shift-outside-viewport-inline-direction.html diff --git a/tests/wpt/web-platform-tests/layout-instability/shift-outside-viewport.html b/tests/wpt/tests/layout-instability/shift-outside-viewport.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/shift-outside-viewport.html rename to tests/wpt/tests/layout-instability/shift-outside-viewport.html diff --git a/tests/wpt/web-platform-tests/layout-instability/shift-scroll-anchoring-natural-scroll.html b/tests/wpt/tests/layout-instability/shift-scroll-anchoring-natural-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/shift-scroll-anchoring-natural-scroll.html rename to tests/wpt/tests/layout-instability/shift-scroll-anchoring-natural-scroll.html diff --git a/tests/wpt/web-platform-tests/layout-instability/shift-while-scrolled.html b/tests/wpt/tests/layout-instability/shift-while-scrolled.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/shift-while-scrolled.html rename to tests/wpt/tests/layout-instability/shift-while-scrolled.html diff --git a/tests/wpt/web-platform-tests/layout-instability/shift-with-counter-scroll-and-transform.html b/tests/wpt/tests/layout-instability/shift-with-counter-scroll-and-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/shift-with-counter-scroll-and-transform.html rename to tests/wpt/tests/layout-instability/shift-with-counter-scroll-and-transform.html diff --git a/tests/wpt/web-platform-tests/layout-instability/shift-with-counter-scroll-and-translate.html b/tests/wpt/tests/layout-instability/shift-with-counter-scroll-and-translate.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/shift-with-counter-scroll-and-translate.html rename to tests/wpt/tests/layout-instability/shift-with-counter-scroll-and-translate.html diff --git a/tests/wpt/web-platform-tests/layout-instability/shift-with-counterscroll-2.html b/tests/wpt/tests/layout-instability/shift-with-counterscroll-2.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/shift-with-counterscroll-2.html rename to tests/wpt/tests/layout-instability/shift-with-counterscroll-2.html diff --git a/tests/wpt/web-platform-tests/layout-instability/shift-with-counterscroll.html b/tests/wpt/tests/layout-instability/shift-with-counterscroll.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/shift-with-counterscroll.html rename to tests/wpt/tests/layout-instability/shift-with-counterscroll.html diff --git a/tests/wpt/web-platform-tests/layout-instability/shift-with-overflow-status-change.html b/tests/wpt/tests/layout-instability/shift-with-overflow-status-change.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/shift-with-overflow-status-change.html rename to tests/wpt/tests/layout-instability/shift-with-overflow-status-change.html diff --git a/tests/wpt/web-platform-tests/layout-instability/simple-block-movement.html b/tests/wpt/tests/layout-instability/simple-block-movement.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/simple-block-movement.html rename to tests/wpt/tests/layout-instability/simple-block-movement.html diff --git a/tests/wpt/web-platform-tests/layout-instability/sources-enclosure.html b/tests/wpt/tests/layout-instability/sources-enclosure.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/sources-enclosure.html rename to tests/wpt/tests/layout-instability/sources-enclosure.html diff --git a/tests/wpt/web-platform-tests/layout-instability/sources-maximpact.html b/tests/wpt/tests/layout-instability/sources-maximpact.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/sources-maximpact.html rename to tests/wpt/tests/layout-instability/sources-maximpact.html diff --git a/tests/wpt/web-platform-tests/layout-instability/sources.html b/tests/wpt/tests/layout-instability/sources.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/sources.html rename to tests/wpt/tests/layout-instability/sources.html diff --git a/tests/wpt/web-platform-tests/layout-instability/sticky-descendant-move.html b/tests/wpt/tests/layout-instability/sticky-descendant-move.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/sticky-descendant-move.html rename to tests/wpt/tests/layout-instability/sticky-descendant-move.html diff --git a/tests/wpt/web-platform-tests/layout-instability/sticky-layout-no-change.html b/tests/wpt/tests/layout-instability/sticky-layout-no-change.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/sticky-layout-no-change.html rename to tests/wpt/tests/layout-instability/sticky-layout-no-change.html diff --git a/tests/wpt/web-platform-tests/layout-instability/sub-frame.html b/tests/wpt/tests/layout-instability/sub-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/sub-frame.html rename to tests/wpt/tests/layout-instability/sub-frame.html diff --git a/tests/wpt/web-platform-tests/layout-instability/supported-layout-type.html b/tests/wpt/tests/layout-instability/supported-layout-type.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/supported-layout-type.html rename to tests/wpt/tests/layout-instability/supported-layout-type.html diff --git a/tests/wpt/web-platform-tests/layout-instability/toJSON.html b/tests/wpt/tests/layout-instability/toJSON.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/toJSON.html rename to tests/wpt/tests/layout-instability/toJSON.html diff --git a/tests/wpt/web-platform-tests/layout-instability/transform-above-filter-dynamic.html b/tests/wpt/tests/layout-instability/transform-above-filter-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/transform-above-filter-dynamic.html rename to tests/wpt/tests/layout-instability/transform-above-filter-dynamic.html diff --git a/tests/wpt/web-platform-tests/layout-instability/transform-above-perspective-dynamic.html b/tests/wpt/tests/layout-instability/transform-above-perspective-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/transform-above-perspective-dynamic.html rename to tests/wpt/tests/layout-instability/transform-above-perspective-dynamic.html diff --git a/tests/wpt/web-platform-tests/layout-instability/transform-change.html b/tests/wpt/tests/layout-instability/transform-change.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/transform-change.html rename to tests/wpt/tests/layout-instability/transform-change.html diff --git a/tests/wpt/web-platform-tests/layout-instability/transform-counter-layout-shift.html b/tests/wpt/tests/layout-instability/transform-counter-layout-shift.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/transform-counter-layout-shift.html rename to tests/wpt/tests/layout-instability/transform-counter-layout-shift.html diff --git a/tests/wpt/web-platform-tests/layout-instability/transform.html b/tests/wpt/tests/layout-instability/transform.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/transform.html rename to tests/wpt/tests/layout-instability/transform.html diff --git a/tests/wpt/web-platform-tests/layout-instability/translate-change.html b/tests/wpt/tests/layout-instability/translate-change.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/translate-change.html rename to tests/wpt/tests/layout-instability/translate-change.html diff --git a/tests/wpt/web-platform-tests/layout-instability/translate-counter-layout-shift.html b/tests/wpt/tests/layout-instability/translate-counter-layout-shift.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/translate-counter-layout-shift.html rename to tests/wpt/tests/layout-instability/translate-counter-layout-shift.html diff --git a/tests/wpt/web-platform-tests/layout-instability/video.html b/tests/wpt/tests/layout-instability/video.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/video.html rename to tests/wpt/tests/layout-instability/video.html diff --git a/tests/wpt/web-platform-tests/layout-instability/visibility-hidden-layout-and-visible.html b/tests/wpt/tests/layout-instability/visibility-hidden-layout-and-visible.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/visibility-hidden-layout-and-visible.html rename to tests/wpt/tests/layout-instability/visibility-hidden-layout-and-visible.html diff --git a/tests/wpt/web-platform-tests/layout-instability/visibility-hidden.html b/tests/wpt/tests/layout-instability/visibility-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/visibility-hidden.html rename to tests/wpt/tests/layout-instability/visibility-hidden.html diff --git a/tests/wpt/web-platform-tests/layout-instability/visible-to-hidden.html b/tests/wpt/tests/layout-instability/visible-to-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/layout-instability/visible-to-hidden.html rename to tests/wpt/tests/layout-instability/visible-to-hidden.html diff --git a/tests/wpt/web-platform-tests/lifecycle/META.yml b/tests/wpt/tests/lifecycle/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/lifecycle/META.yml rename to tests/wpt/tests/lifecycle/META.yml diff --git a/tests/wpt/web-platform-tests/lifecycle/child-display-none.tentative.html b/tests/wpt/tests/lifecycle/child-display-none.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/lifecycle/child-display-none.tentative.html rename to tests/wpt/tests/lifecycle/child-display-none.tentative.html diff --git a/tests/wpt/web-platform-tests/lifecycle/child-out-of-viewport.tentative.html b/tests/wpt/tests/lifecycle/child-out-of-viewport.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/lifecycle/child-out-of-viewport.tentative.html rename to tests/wpt/tests/lifecycle/child-out-of-viewport.tentative.html diff --git a/tests/wpt/web-platform-tests/lifecycle/freeze.html b/tests/wpt/tests/lifecycle/freeze.html similarity index 100% rename from tests/wpt/web-platform-tests/lifecycle/freeze.html rename to tests/wpt/tests/lifecycle/freeze.html diff --git a/tests/wpt/web-platform-tests/lifecycle/resources/beacon.py b/tests/wpt/tests/lifecycle/resources/beacon.py similarity index 100% rename from tests/wpt/web-platform-tests/lifecycle/resources/beacon.py rename to tests/wpt/tests/lifecycle/resources/beacon.py diff --git a/tests/wpt/web-platform-tests/lifecycle/resources/child.html b/tests/wpt/tests/lifecycle/resources/child.html similarity index 100% rename from tests/wpt/web-platform-tests/lifecycle/resources/child.html rename to tests/wpt/tests/lifecycle/resources/child.html diff --git a/tests/wpt/web-platform-tests/lifecycle/resources/subframe.html b/tests/wpt/tests/lifecycle/resources/subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/lifecycle/resources/subframe.html rename to tests/wpt/tests/lifecycle/resources/subframe.html diff --git a/tests/wpt/web-platform-tests/lifecycle/resources/subframe_worker.html b/tests/wpt/tests/lifecycle/resources/subframe_worker.html similarity index 100% rename from tests/wpt/web-platform-tests/lifecycle/resources/subframe_worker.html rename to tests/wpt/tests/lifecycle/resources/subframe_worker.html diff --git a/tests/wpt/web-platform-tests/lifecycle/resources/subframe_worker1.js b/tests/wpt/tests/lifecycle/resources/subframe_worker1.js similarity index 100% rename from tests/wpt/web-platform-tests/lifecycle/resources/subframe_worker1.js rename to tests/wpt/tests/lifecycle/resources/subframe_worker1.js diff --git a/tests/wpt/web-platform-tests/lifecycle/resources/subframe_worker2.js b/tests/wpt/tests/lifecycle/resources/subframe_worker2.js similarity index 100% rename from tests/wpt/web-platform-tests/lifecycle/resources/subframe_worker2.js rename to tests/wpt/tests/lifecycle/resources/subframe_worker2.js diff --git a/tests/wpt/web-platform-tests/lifecycle/resources/window.html b/tests/wpt/tests/lifecycle/resources/window.html similarity index 100% rename from tests/wpt/web-platform-tests/lifecycle/resources/window.html rename to tests/wpt/tests/lifecycle/resources/window.html diff --git a/tests/wpt/web-platform-tests/lifecycle/set-composited-layer-position-ref.html b/tests/wpt/tests/lifecycle/set-composited-layer-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/lifecycle/set-composited-layer-position-ref.html rename to tests/wpt/tests/lifecycle/set-composited-layer-position-ref.html diff --git a/tests/wpt/web-platform-tests/lifecycle/set-composited-layer-position.html b/tests/wpt/tests/lifecycle/set-composited-layer-position.html similarity index 100% rename from tests/wpt/web-platform-tests/lifecycle/set-composited-layer-position.html rename to tests/wpt/tests/lifecycle/set-composited-layer-position.html diff --git a/tests/wpt/web-platform-tests/lifecycle/worker-dispay-none.tentative.html b/tests/wpt/tests/lifecycle/worker-dispay-none.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/lifecycle/worker-dispay-none.tentative.html rename to tests/wpt/tests/lifecycle/worker-dispay-none.tentative.html diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/tests/lint.ignore similarity index 100% rename from tests/wpt/web-platform-tests/lint.ignore rename to tests/wpt/tests/lint.ignore diff --git a/tests/wpt/web-platform-tests/loading/early-hints/404-with-early-hints.h2.window.js b/tests/wpt/tests/loading/early-hints/404-with-early-hints.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/404-with-early-hints.h2.window.js rename to tests/wpt/tests/loading/early-hints/404-with-early-hints.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/arbitrary-header-in-early-hints.h2.window.js b/tests/wpt/tests/loading/early-hints/arbitrary-header-in-early-hints.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/arbitrary-header-in-early-hints.h2.window.js rename to tests/wpt/tests/loading/early-hints/arbitrary-header-in-early-hints.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/coep-early-hints-none-final-require-corp.h2.window.js b/tests/wpt/tests/loading/early-hints/coep-early-hints-none-final-require-corp.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/coep-early-hints-none-final-require-corp.h2.window.js rename to tests/wpt/tests/loading/early-hints/coep-early-hints-none-final-require-corp.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/coep-early-hints-require-corp-final-none.h2.window.js b/tests/wpt/tests/loading/early-hints/coep-early-hints-require-corp-final-none.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/coep-early-hints-require-corp-final-none.h2.window.js rename to tests/wpt/tests/loading/early-hints/coep-early-hints-require-corp-final-none.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-absent-final-absent.h2.window.js b/tests/wpt/tests/loading/early-hints/csp-early-hints-absent-final-absent.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-absent-final-absent.h2.window.js rename to tests/wpt/tests/loading/early-hints/csp-early-hints-absent-final-absent.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-absent-final-allowed.h2.window.js b/tests/wpt/tests/loading/early-hints/csp-early-hints-absent-final-allowed.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-absent-final-allowed.h2.window.js rename to tests/wpt/tests/loading/early-hints/csp-early-hints-absent-final-allowed.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-absent-final-disallowed.h2.window.js b/tests/wpt/tests/loading/early-hints/csp-early-hints-absent-final-disallowed.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-absent-final-disallowed.h2.window.js rename to tests/wpt/tests/loading/early-hints/csp-early-hints-absent-final-disallowed.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-allowed-final-absent.h2.window.js b/tests/wpt/tests/loading/early-hints/csp-early-hints-allowed-final-absent.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-allowed-final-absent.h2.window.js rename to tests/wpt/tests/loading/early-hints/csp-early-hints-allowed-final-absent.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-allowed-final-allowed.h2.window.js b/tests/wpt/tests/loading/early-hints/csp-early-hints-allowed-final-allowed.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-allowed-final-allowed.h2.window.js rename to tests/wpt/tests/loading/early-hints/csp-early-hints-allowed-final-allowed.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-allowed-final-disallowed.h2.window.js b/tests/wpt/tests/loading/early-hints/csp-early-hints-allowed-final-disallowed.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-allowed-final-disallowed.h2.window.js rename to tests/wpt/tests/loading/early-hints/csp-early-hints-allowed-final-disallowed.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-disallowed-final-absent.h2.window.js b/tests/wpt/tests/loading/early-hints/csp-early-hints-disallowed-final-absent.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-disallowed-final-absent.h2.window.js rename to tests/wpt/tests/loading/early-hints/csp-early-hints-disallowed-final-absent.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-disallowed-final-allowed.h2.window.js b/tests/wpt/tests/loading/early-hints/csp-early-hints-disallowed-final-allowed.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-disallowed-final-allowed.h2.window.js rename to tests/wpt/tests/loading/early-hints/csp-early-hints-disallowed-final-allowed.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-disallowed-final-disallowed.h2.window.js b/tests/wpt/tests/loading/early-hints/csp-early-hints-disallowed-final-disallowed.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/csp-early-hints-disallowed-final-disallowed.h2.window.js rename to tests/wpt/tests/loading/early-hints/csp-early-hints-disallowed-final-disallowed.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/early-hints-response-time.h2.html b/tests/wpt/tests/loading/early-hints/early-hints-response-time.h2.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/early-hints-response-time.h2.html rename to tests/wpt/tests/loading/early-hints/early-hints-response-time.h2.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/embed-object.h2.window.js b/tests/wpt/tests/loading/early-hints/embed-object.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/embed-object.h2.window.js rename to tests/wpt/tests/loading/early-hints/embed-object.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/iframe-coep-disallow.h2.html b/tests/wpt/tests/loading/early-hints/iframe-coep-disallow.h2.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/iframe-coep-disallow.h2.html rename to tests/wpt/tests/loading/early-hints/iframe-coep-disallow.h2.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/iframe-coep-disallow.h2.html.headers b/tests/wpt/tests/loading/early-hints/iframe-coep-disallow.h2.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/iframe-coep-disallow.h2.html.headers rename to tests/wpt/tests/loading/early-hints/iframe-coep-disallow.h2.html.headers diff --git a/tests/wpt/web-platform-tests/loading/early-hints/iframe-pdf.h2.window.js b/tests/wpt/tests/loading/early-hints/iframe-pdf.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/iframe-pdf.h2.window.js rename to tests/wpt/tests/loading/early-hints/iframe-pdf.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/iframe-x-frame-options-deny.h2.window.js b/tests/wpt/tests/loading/early-hints/iframe-x-frame-options-deny.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/iframe-x-frame-options-deny.h2.window.js rename to tests/wpt/tests/loading/early-hints/iframe-x-frame-options-deny.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/invalid-headers-in-early-hints.h2.window.js b/tests/wpt/tests/loading/early-hints/invalid-headers-in-early-hints.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/invalid-headers-in-early-hints.h2.window.js rename to tests/wpt/tests/loading/early-hints/invalid-headers-in-early-hints.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/modulepreload-in-early-hints.h2.window.js b/tests/wpt/tests/loading/early-hints/modulepreload-in-early-hints.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/modulepreload-in-early-hints.h2.window.js rename to tests/wpt/tests/loading/early-hints/modulepreload-in-early-hints.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/multiple-early-hints-responses.h2.window.js b/tests/wpt/tests/loading/early-hints/multiple-early-hints-responses.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/multiple-early-hints-responses.h2.window.js rename to tests/wpt/tests/loading/early-hints/multiple-early-hints-responses.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/preconnect-in-early-hints.h2.window.js b/tests/wpt/tests/loading/early-hints/preconnect-in-early-hints.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/preconnect-in-early-hints.h2.window.js rename to tests/wpt/tests/loading/early-hints/preconnect-in-early-hints.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/preload-fetch.h2.window.js b/tests/wpt/tests/loading/early-hints/preload-fetch.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/preload-fetch.h2.window.js rename to tests/wpt/tests/loading/early-hints/preload-fetch.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/preload-finished-before-final-response.h2.window.js b/tests/wpt/tests/loading/early-hints/preload-finished-before-final-response.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/preload-finished-before-final-response.h2.window.js rename to tests/wpt/tests/loading/early-hints/preload-finished-before-final-response.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/preload-finished-while-receiving-final-response-body.h2.window.js b/tests/wpt/tests/loading/early-hints/preload-finished-while-receiving-final-response-body.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/preload-finished-while-receiving-final-response-body.h2.window.js rename to tests/wpt/tests/loading/early-hints/preload-finished-while-receiving-final-response-body.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/preload-in-flight-when-consumed.h2.window.js b/tests/wpt/tests/loading/early-hints/preload-in-flight-when-consumed.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/preload-in-flight-when-consumed.h2.window.js rename to tests/wpt/tests/loading/early-hints/preload-in-flight-when-consumed.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/preload-initiator-type.h2.window.js b/tests/wpt/tests/loading/early-hints/preload-initiator-type.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/preload-initiator-type.h2.window.js rename to tests/wpt/tests/loading/early-hints/preload-initiator-type.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/preload-with-csp-document-disallow.h2.window.js b/tests/wpt/tests/loading/early-hints/preload-with-csp-document-disallow.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/preload-with-csp-document-disallow.h2.window.js rename to tests/wpt/tests/loading/early-hints/preload-with-csp-document-disallow.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/preload-with-invalid-as.h2.window.js b/tests/wpt/tests/loading/early-hints/preload-with-invalid-as.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/preload-with-invalid-as.h2.window.js rename to tests/wpt/tests/loading/early-hints/preload-with-invalid-as.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/preload-without-as.h2.window.js b/tests/wpt/tests/loading/early-hints/preload-without-as.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/preload-without-as.h2.window.js rename to tests/wpt/tests/loading/early-hints/preload-without-as.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/preload-without-csp-document-disallow.h2.window.js b/tests/wpt/tests/loading/early-hints/preload-without-csp-document-disallow.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/preload-without-csp-document-disallow.h2.window.js rename to tests/wpt/tests/loading/early-hints/preload-without-csp-document-disallow.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/redirect-cross-origin-between-early-hints.h2.window.js b/tests/wpt/tests/loading/early-hints/redirect-cross-origin-between-early-hints.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/redirect-cross-origin-between-early-hints.h2.window.js rename to tests/wpt/tests/loading/early-hints/redirect-cross-origin-between-early-hints.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/redirect-cross-origin.h2.window.js b/tests/wpt/tests/loading/early-hints/redirect-cross-origin.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/redirect-cross-origin.h2.window.js rename to tests/wpt/tests/loading/early-hints/redirect-cross-origin.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/redirect-same-origin-between-early-hints.h2.window.js b/tests/wpt/tests/loading/early-hints/redirect-same-origin-between-early-hints.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/redirect-same-origin-between-early-hints.h2.window.js rename to tests/wpt/tests/loading/early-hints/redirect-same-origin-between-early-hints.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/redirect-same-origin.h2.window.js b/tests/wpt/tests/loading/early-hints/redirect-same-origin.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/redirect-same-origin.h2.window.js rename to tests/wpt/tests/loading/early-hints/redirect-same-origin.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/referrer-policy-no-referrer.h2.window.js b/tests/wpt/tests/loading/early-hints/referrer-policy-no-referrer.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/referrer-policy-no-referrer.h2.window.js rename to tests/wpt/tests/loading/early-hints/referrer-policy-no-referrer.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/referrer-policy-origin-when-cross-origin.h2.window.js b/tests/wpt/tests/loading/early-hints/referrer-policy-origin-when-cross-origin.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/referrer-policy-origin-when-cross-origin.h2.window.js rename to tests/wpt/tests/loading/early-hints/referrer-policy-origin-when-cross-origin.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/referrer-policy-origin.h2.window.js b/tests/wpt/tests/loading/early-hints/referrer-policy-origin.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/referrer-policy-origin.h2.window.js rename to tests/wpt/tests/loading/early-hints/referrer-policy-origin.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/referrer-policy-same-origin.h2.window.js b/tests/wpt/tests/loading/early-hints/referrer-policy-same-origin.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/referrer-policy-same-origin.h2.window.js rename to tests/wpt/tests/loading/early-hints/referrer-policy-same-origin.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/referrer-policy-unsafe-url.h2.window.js b/tests/wpt/tests/loading/early-hints/referrer-policy-unsafe-url.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/referrer-policy-unsafe-url.h2.window.js rename to tests/wpt/tests/loading/early-hints/referrer-policy-unsafe-url.h2.window.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/404-with-early-hints.h2.py b/tests/wpt/tests/loading/early-hints/resources/404-with-early-hints.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/404-with-early-hints.h2.py rename to tests/wpt/tests/loading/early-hints/resources/404-with-early-hints.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/404-with-early-hints.html b/tests/wpt/tests/loading/early-hints/resources/404-with-early-hints.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/404-with-early-hints.html rename to tests/wpt/tests/loading/early-hints/resources/404-with-early-hints.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/arbitrary-header-in-early-hints.h2.py b/tests/wpt/tests/loading/early-hints/resources/arbitrary-header-in-early-hints.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/arbitrary-header-in-early-hints.h2.py rename to tests/wpt/tests/loading/early-hints/resources/arbitrary-header-in-early-hints.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/arbitrary-header-in-early-hints.html b/tests/wpt/tests/loading/early-hints/resources/arbitrary-header-in-early-hints.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/arbitrary-header-in-early-hints.html rename to tests/wpt/tests/loading/early-hints/resources/arbitrary-header-in-early-hints.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/coep-mismatch.h2.py b/tests/wpt/tests/loading/early-hints/resources/coep-mismatch.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/coep-mismatch.h2.py rename to tests/wpt/tests/loading/early-hints/resources/coep-mismatch.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/coep-mismatch.html b/tests/wpt/tests/loading/early-hints/resources/coep-mismatch.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/coep-mismatch.html rename to tests/wpt/tests/loading/early-hints/resources/coep-mismatch.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/csp-basic-loader.h2.py b/tests/wpt/tests/loading/early-hints/resources/csp-basic-loader.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/csp-basic-loader.h2.py rename to tests/wpt/tests/loading/early-hints/resources/csp-basic-loader.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/csp-basic.html b/tests/wpt/tests/loading/early-hints/resources/csp-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/csp-basic.html rename to tests/wpt/tests/loading/early-hints/resources/csp-basic.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/csp-document-disallow-loader.h2.py b/tests/wpt/tests/loading/early-hints/resources/csp-document-disallow-loader.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/csp-document-disallow-loader.h2.py rename to tests/wpt/tests/loading/early-hints/resources/csp-document-disallow-loader.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/csp-document-disallow.html b/tests/wpt/tests/loading/early-hints/resources/csp-document-disallow.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/csp-document-disallow.html rename to tests/wpt/tests/loading/early-hints/resources/csp-document-disallow.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/delayed-js.h2.py b/tests/wpt/tests/loading/early-hints/resources/delayed-js.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/delayed-js.h2.py rename to tests/wpt/tests/loading/early-hints/resources/delayed-js.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/early-hints-delay.h2.py b/tests/wpt/tests/loading/early-hints/resources/early-hints-delay.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/early-hints-delay.h2.py rename to tests/wpt/tests/loading/early-hints/resources/early-hints-delay.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/early-hints-helpers.sub.js b/tests/wpt/tests/loading/early-hints/resources/early-hints-helpers.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/early-hints-helpers.sub.js rename to tests/wpt/tests/loading/early-hints/resources/early-hints-helpers.sub.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/early-hints-test-loader.h2.py b/tests/wpt/tests/loading/early-hints/resources/early-hints-test-loader.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/early-hints-test-loader.h2.py rename to tests/wpt/tests/loading/early-hints/resources/early-hints-test-loader.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/empty-corp-absent.js b/tests/wpt/tests/loading/early-hints/resources/empty-corp-absent.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/empty-corp-absent.js rename to tests/wpt/tests/loading/early-hints/resources/empty-corp-absent.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/empty-corp-absent.js.headers b/tests/wpt/tests/loading/early-hints/resources/empty-corp-absent.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/empty-corp-absent.js.headers rename to tests/wpt/tests/loading/early-hints/resources/empty-corp-absent.js.headers diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/empty.js b/tests/wpt/tests/loading/early-hints/resources/empty.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/empty.js rename to tests/wpt/tests/loading/early-hints/resources/empty.js diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/empty.js.headers b/tests/wpt/tests/loading/early-hints/resources/empty.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/empty.js.headers rename to tests/wpt/tests/loading/early-hints/resources/empty.js.headers diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/empty.json b/tests/wpt/tests/loading/early-hints/resources/empty.json similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/empty.json rename to tests/wpt/tests/loading/early-hints/resources/empty.json diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/empty.json.headers b/tests/wpt/tests/loading/early-hints/resources/empty.json.headers similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/empty.json.headers rename to tests/wpt/tests/loading/early-hints/resources/empty.json.headers diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/example.pdf b/tests/wpt/tests/loading/early-hints/resources/example.pdf similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/example.pdf rename to tests/wpt/tests/loading/early-hints/resources/example.pdf diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/fetch-and-record-js.h2.py b/tests/wpt/tests/loading/early-hints/resources/fetch-and-record-js.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/fetch-and-record-js.h2.py rename to tests/wpt/tests/loading/early-hints/resources/fetch-and-record-js.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/get-fetch-timing-and-headers.h2.py b/tests/wpt/tests/loading/early-hints/resources/get-fetch-timing-and-headers.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/get-fetch-timing-and-headers.h2.py rename to tests/wpt/tests/loading/early-hints/resources/get-fetch-timing-and-headers.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/html-with-early-hints.h2.py b/tests/wpt/tests/loading/early-hints/resources/html-with-early-hints.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/html-with-early-hints.h2.py rename to tests/wpt/tests/loading/early-hints/resources/html-with-early-hints.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/invalid-headers-in-early-hints.h2.py b/tests/wpt/tests/loading/early-hints/resources/invalid-headers-in-early-hints.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/invalid-headers-in-early-hints.h2.py rename to tests/wpt/tests/loading/early-hints/resources/invalid-headers-in-early-hints.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/modulepreload-in-early-hints.h2.py b/tests/wpt/tests/loading/early-hints/resources/modulepreload-in-early-hints.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/modulepreload-in-early-hints.h2.py rename to tests/wpt/tests/loading/early-hints/resources/modulepreload-in-early-hints.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/modulepreload-in-early-hints.html b/tests/wpt/tests/loading/early-hints/resources/modulepreload-in-early-hints.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/modulepreload-in-early-hints.html rename to tests/wpt/tests/loading/early-hints/resources/modulepreload-in-early-hints.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/multiple-early-hints-responses.h2.py b/tests/wpt/tests/loading/early-hints/resources/multiple-early-hints-responses.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/multiple-early-hints-responses.h2.py rename to tests/wpt/tests/loading/early-hints/resources/multiple-early-hints-responses.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/multiple-early-hints-responses.html b/tests/wpt/tests/loading/early-hints/resources/multiple-early-hints-responses.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/multiple-early-hints-responses.html rename to tests/wpt/tests/loading/early-hints/resources/multiple-early-hints-responses.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/pdf-with-early-hints.h2.py b/tests/wpt/tests/loading/early-hints/resources/pdf-with-early-hints.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/pdf-with-early-hints.h2.py rename to tests/wpt/tests/loading/early-hints/resources/pdf-with-early-hints.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/png-with-early-hints.h2.py b/tests/wpt/tests/loading/early-hints/resources/png-with-early-hints.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/png-with-early-hints.h2.py rename to tests/wpt/tests/loading/early-hints/resources/png-with-early-hints.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/preconnect-in-early-hints.h2.py b/tests/wpt/tests/loading/early-hints/resources/preconnect-in-early-hints.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/preconnect-in-early-hints.h2.py rename to tests/wpt/tests/loading/early-hints/resources/preconnect-in-early-hints.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/preconnect-in-early-hints.html b/tests/wpt/tests/loading/early-hints/resources/preconnect-in-early-hints.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/preconnect-in-early-hints.html rename to tests/wpt/tests/loading/early-hints/resources/preconnect-in-early-hints.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/preload-as-test.h2.py b/tests/wpt/tests/loading/early-hints/resources/preload-as-test.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/preload-as-test.h2.py rename to tests/wpt/tests/loading/early-hints/resources/preload-as-test.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/preload-as-test.html b/tests/wpt/tests/loading/early-hints/resources/preload-as-test.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/preload-as-test.html rename to tests/wpt/tests/loading/early-hints/resources/preload-as-test.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/preload-fetch.html b/tests/wpt/tests/loading/early-hints/resources/preload-fetch.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/preload-fetch.html rename to tests/wpt/tests/loading/early-hints/resources/preload-fetch.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/preload-finished-before-final-response.h2.py b/tests/wpt/tests/loading/early-hints/resources/preload-finished-before-final-response.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/preload-finished-before-final-response.h2.py rename to tests/wpt/tests/loading/early-hints/resources/preload-finished-before-final-response.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/preload-finished-before-final-response.html b/tests/wpt/tests/loading/early-hints/resources/preload-finished-before-final-response.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/preload-finished-before-final-response.html rename to tests/wpt/tests/loading/early-hints/resources/preload-finished-before-final-response.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/preload-finished-while-receiving-final-response-body.h2.py b/tests/wpt/tests/loading/early-hints/resources/preload-finished-while-receiving-final-response-body.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/preload-finished-while-receiving-final-response-body.h2.py rename to tests/wpt/tests/loading/early-hints/resources/preload-finished-while-receiving-final-response-body.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/preload-finished-while-receiving-final-response-body.html b/tests/wpt/tests/loading/early-hints/resources/preload-finished-while-receiving-final-response-body.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/preload-finished-while-receiving-final-response-body.html rename to tests/wpt/tests/loading/early-hints/resources/preload-finished-while-receiving-final-response-body.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/preload-in-flight-when-consumed.h2.py b/tests/wpt/tests/loading/early-hints/resources/preload-in-flight-when-consumed.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/preload-in-flight-when-consumed.h2.py rename to tests/wpt/tests/loading/early-hints/resources/preload-in-flight-when-consumed.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/preload-in-flight-when-consumed.html b/tests/wpt/tests/loading/early-hints/resources/preload-in-flight-when-consumed.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/preload-in-flight-when-consumed.html rename to tests/wpt/tests/loading/early-hints/resources/preload-in-flight-when-consumed.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/preload-initiator-type.html b/tests/wpt/tests/loading/early-hints/resources/preload-initiator-type.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/preload-initiator-type.html rename to tests/wpt/tests/loading/early-hints/resources/preload-initiator-type.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/redirect-between-early-hints.h2.py b/tests/wpt/tests/loading/early-hints/resources/redirect-between-early-hints.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/redirect-between-early-hints.h2.py rename to tests/wpt/tests/loading/early-hints/resources/redirect-between-early-hints.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/redirect-cross-origin-between-early-hints.html b/tests/wpt/tests/loading/early-hints/resources/redirect-cross-origin-between-early-hints.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/redirect-cross-origin-between-early-hints.html rename to tests/wpt/tests/loading/early-hints/resources/redirect-cross-origin-between-early-hints.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/redirect-cross-origin.html b/tests/wpt/tests/loading/early-hints/resources/redirect-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/redirect-cross-origin.html rename to tests/wpt/tests/loading/early-hints/resources/redirect-cross-origin.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/redirect-same-origin-between-early-hints.html b/tests/wpt/tests/loading/early-hints/resources/redirect-same-origin-between-early-hints.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/redirect-same-origin-between-early-hints.html rename to tests/wpt/tests/loading/early-hints/resources/redirect-same-origin-between-early-hints.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/redirect-same-origin.html b/tests/wpt/tests/loading/early-hints/resources/redirect-same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/redirect-same-origin.html rename to tests/wpt/tests/loading/early-hints/resources/redirect-same-origin.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/redirect-with-early-hints.h2.py b/tests/wpt/tests/loading/early-hints/resources/redirect-with-early-hints.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/redirect-with-early-hints.h2.py rename to tests/wpt/tests/loading/early-hints/resources/redirect-with-early-hints.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/referrer-policy-test-loader.h2.py b/tests/wpt/tests/loading/early-hints/resources/referrer-policy-test-loader.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/referrer-policy-test-loader.h2.py rename to tests/wpt/tests/loading/early-hints/resources/referrer-policy-test-loader.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/referrer-policy-test.html b/tests/wpt/tests/loading/early-hints/resources/referrer-policy-test.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/referrer-policy-test.html rename to tests/wpt/tests/loading/early-hints/resources/referrer-policy-test.html diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/resume-delayed-js.h2.py b/tests/wpt/tests/loading/early-hints/resources/resume-delayed-js.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/resume-delayed-js.h2.py rename to tests/wpt/tests/loading/early-hints/resources/resume-delayed-js.h2.py diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/square.png b/tests/wpt/tests/loading/early-hints/resources/square.png similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/square.png rename to tests/wpt/tests/loading/early-hints/resources/square.png diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/square.png.headers b/tests/wpt/tests/loading/early-hints/resources/square.png.headers similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/square.png.headers rename to tests/wpt/tests/loading/early-hints/resources/square.png.headers diff --git a/tests/wpt/web-platform-tests/loading/early-hints/resources/utils.py b/tests/wpt/tests/loading/early-hints/resources/utils.py similarity index 100% rename from tests/wpt/web-platform-tests/loading/early-hints/resources/utils.py rename to tests/wpt/tests/loading/early-hints/resources/utils.py diff --git a/tests/wpt/web-platform-tests/loading/preloader-css-import-no-quote.tentative.html b/tests/wpt/tests/loading/preloader-css-import-no-quote.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/preloader-css-import-no-quote.tentative.html rename to tests/wpt/tests/loading/preloader-css-import-no-quote.tentative.html diff --git a/tests/wpt/web-platform-tests/loading/preloader-css-import-no-semicolon.tentative.html b/tests/wpt/tests/loading/preloader-css-import-no-semicolon.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/preloader-css-import-no-semicolon.tentative.html rename to tests/wpt/tests/loading/preloader-css-import-no-semicolon.tentative.html diff --git a/tests/wpt/web-platform-tests/loading/preloader-css-import-no-space.tentative.html b/tests/wpt/tests/loading/preloader-css-import-no-space.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/preloader-css-import-no-space.tentative.html rename to tests/wpt/tests/loading/preloader-css-import-no-space.tentative.html diff --git a/tests/wpt/web-platform-tests/loading/preloader-css-import-single-quote.tentative.html b/tests/wpt/tests/loading/preloader-css-import-single-quote.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/preloader-css-import-single-quote.tentative.html rename to tests/wpt/tests/loading/preloader-css-import-single-quote.tentative.html diff --git a/tests/wpt/web-platform-tests/loading/preloader-css-import.tentative.html b/tests/wpt/tests/loading/preloader-css-import.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/preloader-css-import.tentative.html rename to tests/wpt/tests/loading/preloader-css-import.tentative.html diff --git a/tests/wpt/web-platform-tests/loading/preloader-link-media.tentative.html b/tests/wpt/tests/loading/preloader-link-media.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/preloader-link-media.tentative.html rename to tests/wpt/tests/loading/preloader-link-media.tentative.html diff --git a/tests/wpt/web-platform-tests/loading/preloader-template.tentative.html b/tests/wpt/tests/loading/preloader-template.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/loading/preloader-template.tentative.html rename to tests/wpt/tests/loading/preloader-template.tentative.html diff --git a/tests/wpt/web-platform-tests/loading/resources/dummy.css b/tests/wpt/tests/loading/resources/dummy.css similarity index 100% rename from tests/wpt/web-platform-tests/loading/resources/dummy.css rename to tests/wpt/tests/loading/resources/dummy.css diff --git a/tests/wpt/web-platform-tests/loading/resources/dummy.js b/tests/wpt/tests/loading/resources/dummy.js similarity index 100% rename from tests/wpt/web-platform-tests/loading/resources/dummy.js rename to tests/wpt/tests/loading/resources/dummy.js diff --git a/tests/wpt/web-platform-tests/long-animation-frame/META.yml b/tests/wpt/tests/long-animation-frame/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/META.yml rename to tests/wpt/tests/long-animation-frame/META.yml diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-basic.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-basic.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-basic.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-blocking-duration.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-blocking-duration.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-blocking-duration.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-blocking-duration.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-buffered.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-buffered.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-buffered.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-buffered.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-desired-exec-time.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-desired-exec-time.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-desired-exec-time.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-desired-exec-time.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-event-listener.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-event-listener.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-event-listener.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-event-listener.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-first-ui-event.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-first-ui-event.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-first-ui-event.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-first-ui-event.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-idle.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-idle.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-idle.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-idle.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-iframe-popup.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-iframe-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-iframe-popup.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-iframe-popup.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-pause-duration.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-pause-duration.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-pause-duration.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-pause-duration.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-promise.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-promise.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-promise.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-promise.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-script-block.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-script-block.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-script-block.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-script-block.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-script-window-attribution.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-script-window-attribution.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-script-window-attribution.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-script-window-attribution.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-source-location.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-source-location.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-source-location.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-source-location.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-supportedEntryTypes.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-supportedEntryTypes.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-supportedEntryTypes.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-supportedEntryTypes.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-timeline.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-timeline.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-timeline.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-timeline.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-toJSON.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-toJSON.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-toJSON.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-toJSON.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-user-callback.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-user-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-user-callback.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-user-callback.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-visibility.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-visibility.html similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-visibility.html rename to tests/wpt/tests/long-animation-frame/tentative/loaf-visibility.html diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-window-only.worker.js b/tests/wpt/tests/long-animation-frame/tentative/loaf-window-only.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-window-only.worker.js rename to tests/wpt/tests/long-animation-frame/tentative/loaf-window-only.worker.js diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/resources/busy.js b/tests/wpt/tests/long-animation-frame/tentative/resources/busy.js similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/resources/busy.js rename to tests/wpt/tests/long-animation-frame/tentative/resources/busy.js diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/resources/utils.js b/tests/wpt/tests/long-animation-frame/tentative/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/long-animation-frame/tentative/resources/utils.js rename to tests/wpt/tests/long-animation-frame/tentative/resources/utils.js diff --git a/tests/wpt/web-platform-tests/longtask-timing/META.yml b/tests/wpt/tests/longtask-timing/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/META.yml rename to tests/wpt/tests/longtask-timing/META.yml diff --git a/tests/wpt/web-platform-tests/longtask-timing/buffered-flag.window.js b/tests/wpt/tests/longtask-timing/buffered-flag.window.js similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/buffered-flag.window.js rename to tests/wpt/tests/longtask-timing/buffered-flag.window.js diff --git a/tests/wpt/web-platform-tests/longtask-timing/containerNames.html b/tests/wpt/tests/longtask-timing/containerNames.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/containerNames.html rename to tests/wpt/tests/longtask-timing/containerNames.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/containerTypes.html b/tests/wpt/tests/longtask-timing/containerTypes.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/containerTypes.html rename to tests/wpt/tests/longtask-timing/containerTypes.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/idlharness.window.js b/tests/wpt/tests/longtask-timing/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/idlharness.window.js rename to tests/wpt/tests/longtask-timing/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/longtask-timing/long-microtask.window.js b/tests/wpt/tests/longtask-timing/long-microtask.window.js similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/long-microtask.window.js rename to tests/wpt/tests/longtask-timing/long-microtask.window.js diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-attributes.html b/tests/wpt/tests/longtask-timing/longtask-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/longtask-attributes.html rename to tests/wpt/tests/longtask-timing/longtask-attributes.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-before-observer.window.js b/tests/wpt/tests/longtask-timing/longtask-before-observer.window.js similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/longtask-before-observer.window.js rename to tests/wpt/tests/longtask-timing/longtask-before-observer.window.js diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-detach-frame.html b/tests/wpt/tests/longtask-timing/longtask-detach-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/longtask-detach-frame.html rename to tests/wpt/tests/longtask-timing/longtask-detach-frame.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-childiframe-crossorigin.html b/tests/wpt/tests/longtask-timing/longtask-in-childiframe-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/longtask-in-childiframe-crossorigin.html rename to tests/wpt/tests/longtask-timing/longtask-in-childiframe-crossorigin.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-childiframe.html b/tests/wpt/tests/longtask-timing/longtask-in-childiframe.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/longtask-in-childiframe.html rename to tests/wpt/tests/longtask-timing/longtask-in-childiframe.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-externalscript.html b/tests/wpt/tests/longtask-timing/longtask-in-externalscript.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/longtask-in-externalscript.html rename to tests/wpt/tests/longtask-timing/longtask-in-externalscript.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-parentiframe.html b/tests/wpt/tests/longtask-timing/longtask-in-parentiframe.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/longtask-in-parentiframe.html rename to tests/wpt/tests/longtask-timing/longtask-in-parentiframe.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-raf.html b/tests/wpt/tests/longtask-timing/longtask-in-raf.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/longtask-in-raf.html rename to tests/wpt/tests/longtask-timing/longtask-in-raf.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-sibling-iframe-crossorigin.html b/tests/wpt/tests/longtask-timing/longtask-in-sibling-iframe-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/longtask-in-sibling-iframe-crossorigin.html rename to tests/wpt/tests/longtask-timing/longtask-in-sibling-iframe-crossorigin.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-in-sibling-iframe.html b/tests/wpt/tests/longtask-timing/longtask-in-sibling-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/longtask-in-sibling-iframe.html rename to tests/wpt/tests/longtask-timing/longtask-in-sibling-iframe.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-promise.html b/tests/wpt/tests/longtask-timing/longtask-promise.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/longtask-promise.html rename to tests/wpt/tests/longtask-timing/longtask-promise.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-sync-xhr.html b/tests/wpt/tests/longtask-timing/longtask-sync-xhr.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/longtask-sync-xhr.html rename to tests/wpt/tests/longtask-timing/longtask-sync-xhr.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/longtask-tojson.html b/tests/wpt/tests/longtask-timing/longtask-tojson.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/longtask-tojson.html rename to tests/wpt/tests/longtask-timing/longtask-tojson.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/resources/makelongtask.js b/tests/wpt/tests/longtask-timing/resources/makelongtask.js similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/resources/makelongtask.js rename to tests/wpt/tests/longtask-timing/resources/makelongtask.js diff --git a/tests/wpt/web-platform-tests/longtask-timing/resources/raflongtask.js b/tests/wpt/tests/longtask-timing/resources/raflongtask.js similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/resources/raflongtask.js rename to tests/wpt/tests/longtask-timing/resources/raflongtask.js diff --git a/tests/wpt/web-platform-tests/longtask-timing/resources/subframe-observing-longtask.html b/tests/wpt/tests/longtask-timing/resources/subframe-observing-longtask.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/resources/subframe-observing-longtask.html rename to tests/wpt/tests/longtask-timing/resources/subframe-observing-longtask.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/resources/subframe-with-longtask.html b/tests/wpt/tests/longtask-timing/resources/subframe-with-longtask.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/resources/subframe-with-longtask.html rename to tests/wpt/tests/longtask-timing/resources/subframe-with-longtask.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/resources/utils.js b/tests/wpt/tests/longtask-timing/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/resources/utils.js rename to tests/wpt/tests/longtask-timing/resources/utils.js diff --git a/tests/wpt/web-platform-tests/longtask-timing/shared-renderer/longtask-in-new-window.html b/tests/wpt/tests/longtask-timing/shared-renderer/longtask-in-new-window.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/shared-renderer/longtask-in-new-window.html rename to tests/wpt/tests/longtask-timing/shared-renderer/longtask-in-new-window.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/shared-renderer/resources/frame-with-longtask.html b/tests/wpt/tests/longtask-timing/shared-renderer/resources/frame-with-longtask.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/shared-renderer/resources/frame-with-longtask.html rename to tests/wpt/tests/longtask-timing/shared-renderer/resources/frame-with-longtask.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/spin-eventloop-not-longtask.html b/tests/wpt/tests/longtask-timing/spin-eventloop-not-longtask.html similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/spin-eventloop-not-longtask.html rename to tests/wpt/tests/longtask-timing/spin-eventloop-not-longtask.html diff --git a/tests/wpt/web-platform-tests/longtask-timing/supported-longtask-types.window.js b/tests/wpt/tests/longtask-timing/supported-longtask-types.window.js similarity index 100% rename from tests/wpt/web-platform-tests/longtask-timing/supported-longtask-types.window.js rename to tests/wpt/tests/longtask-timing/supported-longtask-types.window.js diff --git a/tests/wpt/web-platform-tests/magnetometer/META.yml b/tests/wpt/tests/magnetometer/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/magnetometer/META.yml rename to tests/wpt/tests/magnetometer/META.yml diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html b/tests/wpt/tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html rename to tests/wpt/tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html.headers b/tests/wpt/tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html.headers rename to tests/wpt/tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/tests/wpt/tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html similarity index 100% rename from tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html rename to tests/wpt/tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html b/tests/wpt/tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html rename to tests/wpt/tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html b/tests/wpt/tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html rename to tests/wpt/tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html.headers b/tests/wpt/tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html.headers rename to tests/wpt/tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html b/tests/wpt/tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html rename to tests/wpt/tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html.headers b/tests/wpt/tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html.headers rename to tests/wpt/tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-iframe-access.https.html b/tests/wpt/tests/magnetometer/Magnetometer-iframe-access.https.html similarity index 100% rename from tests/wpt/web-platform-tests/magnetometer/Magnetometer-iframe-access.https.html rename to tests/wpt/tests/magnetometer/Magnetometer-iframe-access.https.html diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-supported-by-feature-policy.html b/tests/wpt/tests/magnetometer/Magnetometer-supported-by-feature-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/magnetometer/Magnetometer-supported-by-feature-policy.html rename to tests/wpt/tests/magnetometer/Magnetometer-supported-by-feature-policy.html diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer.https.html b/tests/wpt/tests/magnetometer/Magnetometer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/magnetometer/Magnetometer.https.html rename to tests/wpt/tests/magnetometer/Magnetometer.https.html diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer_insecure_context.html b/tests/wpt/tests/magnetometer/Magnetometer_insecure_context.html similarity index 100% rename from tests/wpt/web-platform-tests/magnetometer/Magnetometer_insecure_context.html rename to tests/wpt/tests/magnetometer/Magnetometer_insecure_context.html diff --git a/tests/wpt/web-platform-tests/magnetometer/idlharness.https.window.js b/tests/wpt/tests/magnetometer/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/magnetometer/idlharness.https.window.js rename to tests/wpt/tests/magnetometer/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/managed/META.yml b/tests/wpt/tests/managed/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/managed/META.yml rename to tests/wpt/tests/managed/META.yml diff --git a/tests/wpt/web-platform-tests/managed/managed-config-error.https.window.js b/tests/wpt/tests/managed/managed-config-error.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/managed/managed-config-error.https.window.js rename to tests/wpt/tests/managed/managed-config-error.https.window.js diff --git a/tests/wpt/web-platform-tests/managed/managed-config-success.https.window.js b/tests/wpt/tests/managed/managed-config-success.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/managed/managed-config-success.https.window.js rename to tests/wpt/tests/managed/managed-config-success.https.window.js diff --git a/tests/wpt/web-platform-tests/managed/resources/managed-configuration-helper.js b/tests/wpt/tests/managed/resources/managed-configuration-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/managed/resources/managed-configuration-helper.js rename to tests/wpt/tests/managed/resources/managed-configuration-helper.js diff --git a/tests/wpt/web-platform-tests/mathml/META.yml b/tests/wpt/tests/mathml/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/META.yml rename to tests/wpt/tests/mathml/META.yml diff --git a/tests/wpt/web-platform-tests/mathml/README.md b/tests/wpt/tests/mathml/README.md similarity index 100% rename from tests/wpt/web-platform-tests/mathml/README.md rename to tests/wpt/tests/mathml/README.md diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/children-with-negative-block-sizes.html b/tests/wpt/tests/mathml/crashtests/children-with-negative-block-sizes.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/children-with-negative-block-sizes.html rename to tests/wpt/tests/mathml/crashtests/children-with-negative-block-sizes.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/children-with-negative-inline-sizes.html b/tests/wpt/tests/mathml/crashtests/children-with-negative-inline-sizes.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/children-with-negative-inline-sizes.html rename to tests/wpt/tests/mathml/crashtests/children-with-negative-inline-sizes.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/chrome-bug-1287843.html b/tests/wpt/tests/mathml/crashtests/chrome-bug-1287843.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/chrome-bug-1287843.html rename to tests/wpt/tests/mathml/crashtests/chrome-bug-1287843.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/display-and-column-properties.html b/tests/wpt/tests/mathml/crashtests/display-and-column-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/display-and-column-properties.html rename to tests/wpt/tests/mathml/crashtests/display-and-column-properties.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/dynamic-height-within-table-cell.html b/tests/wpt/tests/mathml/crashtests/dynamic-height-within-table-cell.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/dynamic-height-within-table-cell.html rename to tests/wpt/tests/mathml/crashtests/dynamic-height-within-table-cell.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/fixed-pos-children.html b/tests/wpt/tests/mathml/crashtests/fixed-pos-children.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/fixed-pos-children.html rename to tests/wpt/tests/mathml/crashtests/fixed-pos-children.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/math-depth-overflow.html b/tests/wpt/tests/mathml/crashtests/math-depth-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/math-depth-overflow.html rename to tests/wpt/tests/mathml/crashtests/math-depth-overflow.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mathml-in-svg-001.html b/tests/wpt/tests/mathml/crashtests/mathml-in-svg-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mathml-in-svg-001.html rename to tests/wpt/tests/mathml/crashtests/mathml-in-svg-001.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mmultiscripts-with-two-prescripts.html b/tests/wpt/tests/mathml/crashtests/mmultiscripts-with-two-prescripts.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mmultiscripts-with-two-prescripts.html rename to tests/wpt/tests/mathml/crashtests/mmultiscripts-with-two-prescripts.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/1028521-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/1028521-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/1028521-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/1028521-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/1061027.html b/tests/wpt/tests/mathml/crashtests/mozilla/1061027.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/1061027.html rename to tests/wpt/tests/mathml/crashtests/mozilla/1061027.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/1221888-1.html b/tests/wpt/tests/mathml/crashtests/mozilla/1221888-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/1221888-1.html rename to tests/wpt/tests/mathml/crashtests/mozilla/1221888-1.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/1373767-1.html b/tests/wpt/tests/mathml/crashtests/mozilla/1373767-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/1373767-1.html rename to tests/wpt/tests/mathml/crashtests/mozilla/1373767-1.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/1376158.html b/tests/wpt/tests/mathml/crashtests/mozilla/1376158.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/1376158.html rename to tests/wpt/tests/mathml/crashtests/mozilla/1376158.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/151054-1.xml b/tests/wpt/tests/mathml/crashtests/mozilla/151054-1.xml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/151054-1.xml rename to tests/wpt/tests/mathml/crashtests/mozilla/151054-1.xml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/1600635.html b/tests/wpt/tests/mathml/crashtests/mozilla/1600635.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/1600635.html rename to tests/wpt/tests/mathml/crashtests/mozilla/1600635.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/289180-1.xml b/tests/wpt/tests/mathml/crashtests/mozilla/289180-1.xml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/289180-1.xml rename to tests/wpt/tests/mathml/crashtests/mozilla/289180-1.xml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/307826-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/307826-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/307826-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/307826-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/307839-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/307839-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/307839-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/307839-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/307839-2.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/307839-2.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/307839-2.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/307839-2.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/323733-1.xml b/tests/wpt/tests/mathml/crashtests/mozilla/323733-1.xml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/323733-1.xml rename to tests/wpt/tests/mathml/crashtests/mozilla/323733-1.xml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/323737-1.xml b/tests/wpt/tests/mathml/crashtests/mozilla/323737-1.xml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/323737-1.xml rename to tests/wpt/tests/mathml/crashtests/mozilla/323737-1.xml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/323738-1.xml b/tests/wpt/tests/mathml/crashtests/mozilla/323738-1.xml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/323738-1.xml rename to tests/wpt/tests/mathml/crashtests/mozilla/323738-1.xml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/323741-1.xml b/tests/wpt/tests/mathml/crashtests/mozilla/323741-1.xml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/323741-1.xml rename to tests/wpt/tests/mathml/crashtests/mozilla/323741-1.xml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/323742-1.xml b/tests/wpt/tests/mathml/crashtests/mozilla/323742-1.xml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/323742-1.xml rename to tests/wpt/tests/mathml/crashtests/mozilla/323742-1.xml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/336074-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/336074-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/336074-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/336074-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/347355-1-inner.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/347355-1-inner.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/347355-1-inner.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/347355-1-inner.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/347355-1.gif b/tests/wpt/tests/mathml/crashtests/mozilla/347355-1.gif similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/347355-1.gif rename to tests/wpt/tests/mathml/crashtests/mozilla/347355-1.gif diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/347355-1.html b/tests/wpt/tests/mathml/crashtests/mozilla/347355-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/347355-1.html rename to tests/wpt/tests/mathml/crashtests/mozilla/347355-1.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/347495-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/347495-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/347495-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/347495-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/347507-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/347507-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/347507-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/347507-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/348492-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/348492-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/348492-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/348492-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/348709-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/348709-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/348709-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/348709-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/348811-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/348811-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/348811-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/348811-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/348811-2.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/348811-2.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/348811-2.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/348811-2.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/353612-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/353612-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/353612-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/353612-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/355986-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/355986-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/355986-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/355986-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/364685-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/364685-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/364685-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/364685-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/366012-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/366012-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/366012-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/366012-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/366564-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/366564-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/366564-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/366564-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/367107-1.html b/tests/wpt/tests/mathml/crashtests/mozilla/367107-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/367107-1.html rename to tests/wpt/tests/mathml/crashtests/mozilla/367107-1.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/368430-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/368430-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/368430-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/368430-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/370791-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/370791-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/370791-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/370791-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/370862-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/370862-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/370862-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/370862-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/372483-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/372483-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/372483-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/372483-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/373472-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/373472-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/373472-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/373472-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/373472-2.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/373472-2.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/373472-2.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/373472-2.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/375562-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/375562-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/375562-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/375562-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/377824-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/377824-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/377824-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/377824-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/379418-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/379418-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/379418-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/379418-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/385226-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/385226-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/385226-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/385226-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/393760-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/393760-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/393760-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/393760-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/397518-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/397518-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/397518-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/397518-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/398038-1.html b/tests/wpt/tests/mathml/crashtests/mozilla/398038-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/398038-1.html rename to tests/wpt/tests/mathml/crashtests/mozilla/398038-1.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/400475-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/400475-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/400475-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/400475-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/402400-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/402400-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/402400-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/402400-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/403156-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/403156-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/403156-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/403156-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/404485-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/404485-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/404485-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/404485-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/405187-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/405187-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/405187-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/405187-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/405271-1.xml b/tests/wpt/tests/mathml/crashtests/mozilla/405271-1.xml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/405271-1.xml rename to tests/wpt/tests/mathml/crashtests/mozilla/405271-1.xml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/412237-1.xml b/tests/wpt/tests/mathml/crashtests/mozilla/412237-1.xml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/412237-1.xml rename to tests/wpt/tests/mathml/crashtests/mozilla/412237-1.xml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/413063-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/413063-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/413063-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/413063-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/416907-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/416907-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/416907-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/416907-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/420420-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/420420-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/420420-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/420420-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/431072-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/431072-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/431072-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/431072-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/443089-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/443089-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/443089-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/443089-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/462929-1.html b/tests/wpt/tests/mathml/crashtests/mozilla/462929-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/462929-1.html rename to tests/wpt/tests/mathml/crashtests/mozilla/462929-1.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/463763-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/463763-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/463763-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/463763-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/463763-2.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/463763-2.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/463763-2.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/463763-2.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/476547-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/476547-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/476547-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/476547-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/541620-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/541620-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/541620-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/541620-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/557474-1.html b/tests/wpt/tests/mathml/crashtests/mozilla/557474-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/557474-1.html rename to tests/wpt/tests/mathml/crashtests/mozilla/557474-1.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/654928-1.html b/tests/wpt/tests/mathml/crashtests/mozilla/654928-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/654928-1.html rename to tests/wpt/tests/mathml/crashtests/mozilla/654928-1.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/655451-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/655451-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/655451-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/655451-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/713606-1.html b/tests/wpt/tests/mathml/crashtests/mozilla/713606-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/713606-1.html rename to tests/wpt/tests/mathml/crashtests/mozilla/713606-1.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/716349-1.html b/tests/wpt/tests/mathml/crashtests/mozilla/716349-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/716349-1.html rename to tests/wpt/tests/mathml/crashtests/mozilla/716349-1.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/767251.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/767251.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/767251.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/767251.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/770710-1.html b/tests/wpt/tests/mathml/crashtests/mozilla/770710-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/770710-1.html rename to tests/wpt/tests/mathml/crashtests/mozilla/770710-1.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/848725-1.html b/tests/wpt/tests/mathml/crashtests/mozilla/848725-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/848725-1.html rename to tests/wpt/tests/mathml/crashtests/mozilla/848725-1.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/848725-2.html b/tests/wpt/tests/mathml/crashtests/mozilla/848725-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/848725-2.html rename to tests/wpt/tests/mathml/crashtests/mozilla/848725-2.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/947557-1.html b/tests/wpt/tests/mathml/crashtests/mozilla/947557-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/947557-1.html rename to tests/wpt/tests/mathml/crashtests/mozilla/947557-1.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mozilla/973322-1.xhtml b/tests/wpt/tests/mathml/crashtests/mozilla/973322-1.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mozilla/973322-1.xhtml rename to tests/wpt/tests/mathml/crashtests/mozilla/973322-1.xhtml diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mspace-mpadded-negative-dimensions.html b/tests/wpt/tests/mathml/crashtests/mspace-mpadded-negative-dimensions.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mspace-mpadded-negative-dimensions.html rename to tests/wpt/tests/mathml/crashtests/mspace-mpadded-negative-dimensions.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/mtd-as-multicol.html b/tests/wpt/tests/mathml/crashtests/mtd-as-multicol.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/mtd-as-multicol.html rename to tests/wpt/tests/mathml/crashtests/mtd-as-multicol.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/multicol-inside-ms.html b/tests/wpt/tests/mathml/crashtests/multicol-inside-ms.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/multicol-inside-ms.html rename to tests/wpt/tests/mathml/crashtests/multicol-inside-ms.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/multicol-on-token-elements.html b/tests/wpt/tests/mathml/crashtests/multicol-on-token-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/multicol-on-token-elements.html rename to tests/wpt/tests/mathml/crashtests/multicol-on-token-elements.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/operator-and-first-letter.html b/tests/wpt/tests/mathml/crashtests/operator-and-first-letter.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/operator-and-first-letter.html rename to tests/wpt/tests/mathml/crashtests/operator-and-first-letter.html diff --git a/tests/wpt/web-platform-tests/mathml/crashtests/scrollbar-caching-assert.html b/tests/wpt/tests/mathml/crashtests/scrollbar-caching-assert.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/crashtests/scrollbar-caching-assert.html rename to tests/wpt/tests/mathml/crashtests/scrollbar-caching-assert.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-006-ref.html b/tests/wpt/tests/mathml/presentation-markup/direction/direction-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-006-ref.html rename to tests/wpt/tests/mathml/presentation-markup/direction/direction-006-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-006.html b/tests/wpt/tests/mathml/presentation-markup/direction/direction-006.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-006.html rename to tests/wpt/tests/mathml/presentation-markup/direction/direction-006.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-007-ref.html b/tests/wpt/tests/mathml/presentation-markup/direction/direction-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-007-ref.html rename to tests/wpt/tests/mathml/presentation-markup/direction/direction-007-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-007.html b/tests/wpt/tests/mathml/presentation-markup/direction/direction-007.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-007.html rename to tests/wpt/tests/mathml/presentation-markup/direction/direction-007.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-008-ref.html b/tests/wpt/tests/mathml/presentation-markup/direction/direction-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-008-ref.html rename to tests/wpt/tests/mathml/presentation-markup/direction/direction-008-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-008.html b/tests/wpt/tests/mathml/presentation-markup/direction/direction-008.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-008.html rename to tests/wpt/tests/mathml/presentation-markup/direction/direction-008.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-010-ref.html b/tests/wpt/tests/mathml/presentation-markup/direction/direction-010-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-010-ref.html rename to tests/wpt/tests/mathml/presentation-markup/direction/direction-010-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-010.html b/tests/wpt/tests/mathml/presentation-markup/direction/direction-010.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-010.html rename to tests/wpt/tests/mathml/presentation-markup/direction/direction-010.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-overall-ref.html b/tests/wpt/tests/mathml/presentation-markup/direction/direction-overall-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-overall-ref.html rename to tests/wpt/tests/mathml/presentation-markup/direction/direction-overall-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-overall.html b/tests/wpt/tests/mathml/presentation-markup/direction/direction-overall.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-overall.html rename to tests/wpt/tests/mathml/presentation-markup/direction/direction-overall.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-token-ref.html b/tests/wpt/tests/mathml/presentation-markup/direction/direction-token-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-token-ref.html rename to tests/wpt/tests/mathml/presentation-markup/direction/direction-token-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-token.html b/tests/wpt/tests/mathml/presentation-markup/direction/direction-token.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction-token.html rename to tests/wpt/tests/mathml/presentation-markup/direction/direction-token.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction.html b/tests/wpt/tests/mathml/presentation-markup/direction/direction.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/direction/direction.html rename to tests/wpt/tests/mathml/presentation-markup/direction/direction.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-1.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-1.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-1.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-bar-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-bar-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-001.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-bar-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-001.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-bar-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-002-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-bar-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-002-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-bar-002-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-002.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-bar-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-002.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-bar-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-003-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-bar-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-003-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-bar-003-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-003.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-bar-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-003.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-bar-003.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-001-notref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-color-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-001-notref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-color-001-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-001.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-001.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-color-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-002-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-color-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-002-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-color-002-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-002.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-color-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-002.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-color-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-created-dynamically-2-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-created-dynamically-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-created-dynamically-2-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-created-dynamically-2-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-created-dynamically-2.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-created-dynamically-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-created-dynamically-2.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-created-dynamically-2.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-created-dynamically-3-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-created-dynamically-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-created-dynamically-3-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-created-dynamically-3-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-created-dynamically-3.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-created-dynamically-3.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-created-dynamically-3.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-created-dynamically-3.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-created-dynamically-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-created-dynamically-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-created-dynamically-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-created-dynamically-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-created-dynamically.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-created-dynamically.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-created-dynamically.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-created-dynamically.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-default-padding-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-default-padding-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-default-padding-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-default-padding-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-default-padding.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-default-padding.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-default-padding.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-default-padding.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-invalid-2-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-invalid-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-invalid-2-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-invalid-2-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-invalid-2.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-invalid-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-invalid-2.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-invalid-2.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-invalid-3-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-invalid-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-invalid-3-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-invalid-3-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-invalid-3.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-invalid-3.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-invalid-3.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-invalid-3.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-invalid-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-invalid-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-invalid-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-invalid-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-invalid.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-invalid.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-invalid.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-legacy-bevelled-attribute.tentative-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-legacy-bevelled-attribute.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-legacy-bevelled-attribute.tentative-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-legacy-bevelled-attribute.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-legacy-bevelled-attribute.tentative.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-legacy-bevelled-attribute.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-legacy-bevelled-attribute.tentative.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-legacy-bevelled-attribute.tentative.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-linethickness-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-linethickness-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-001.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-linethickness-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-001.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-linethickness-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-002.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-linethickness-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-002.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-linethickness-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-003-notref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-linethickness-003-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-003-notref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-linethickness-003-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-003.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-linethickness-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-003.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-linethickness-003.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-004-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-linethickness-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-004-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-linethickness-004-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-004.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-linethickness-004.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-004.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-linethickness-004.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-mrow-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-mrow-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-mrow-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-mrow-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-mrow-001.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-mrow-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-mrow-001.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-mrow-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-1.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-2.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-3.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-3.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-3.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-3.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-001.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-001.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-002-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-002-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-002-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-002.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-002.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-003-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-003-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-003-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-003.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-003.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-003.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-004-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-004-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-004-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-004.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-004.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-004.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-004.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-005-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-005-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-005-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-005.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-005.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-005.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-005.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-006-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-006-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-006-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-006.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-006.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-006.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-parameters-gap-006.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-rendering-from-in-flow-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-rendering-from-in-flow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-rendering-from-in-flow-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-rendering-from-in-flow-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-rendering-from-in-flow.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-rendering-from-in-flow.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-rendering-from-in-flow.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-rendering-from-in-flow.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-visibility-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-visibility-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-visibility-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-visibility-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-visibility-001.html b/tests/wpt/tests/mathml/presentation-markup/fractions/frac-visibility-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-visibility-001.html rename to tests/wpt/tests/mathml/presentation-markup/fractions/frac-visibility-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/menclose/legacy-menclose-radical-notation-ref.html b/tests/wpt/tests/mathml/presentation-markup/menclose/legacy-menclose-radical-notation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/menclose/legacy-menclose-radical-notation-ref.html rename to tests/wpt/tests/mathml/presentation-markup/menclose/legacy-menclose-radical-notation-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/menclose/legacy-menclose-radical-notation.html b/tests/wpt/tests/mathml/presentation-markup/menclose/legacy-menclose-radical-notation.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/menclose/legacy-menclose-radical-notation.html rename to tests/wpt/tests/mathml/presentation-markup/menclose/legacy-menclose-radical-notation.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/legacy-orthogonal-pseudo-units.html b/tests/wpt/tests/mathml/presentation-markup/mpadded/legacy-orthogonal-pseudo-units.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/legacy-orthogonal-pseudo-units.html rename to tests/wpt/tests/mathml/presentation-markup/mpadded/legacy-orthogonal-pseudo-units.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-001.html b/tests/wpt/tests/mathml/presentation-markup/mpadded/mpadded-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-001.html rename to tests/wpt/tests/mathml/presentation-markup/mpadded/mpadded-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-002.html b/tests/wpt/tests/mathml/presentation-markup/mpadded/mpadded-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-002.html rename to tests/wpt/tests/mathml/presentation-markup/mpadded/mpadded-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-003.html b/tests/wpt/tests/mathml/presentation-markup/mpadded/mpadded-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-003.html rename to tests/wpt/tests/mathml/presentation-markup/mpadded/mpadded-003.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-percentage-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/mpadded/mpadded-percentage-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-percentage-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/mpadded/mpadded-percentage-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-percentage-001.html b/tests/wpt/tests/mathml/presentation-markup/mpadded/mpadded-percentage-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-percentage-001.html rename to tests/wpt/tests/mathml/presentation-markup/mpadded/mpadded-percentage-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-percentage-002.html b/tests/wpt/tests/mathml/presentation-markup/mpadded/mpadded-percentage-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-percentage-002.html rename to tests/wpt/tests/mathml/presentation-markup/mpadded/mpadded-percentage-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/dynamic-mrow-like-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/mrow/dynamic-mrow-like-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/dynamic-mrow-like-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/dynamic-mrow-like-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/dynamic-mrow-like-001.html b/tests/wpt/tests/mathml/presentation-markup/mrow/dynamic-mrow-like-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/dynamic-mrow-like-001.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/dynamic-mrow-like-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/inferred-mrow-baseline.html b/tests/wpt/tests/mathml/presentation-markup/mrow/inferred-mrow-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/inferred-mrow-baseline.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/inferred-mrow-baseline.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/inferred-mrow-stretchy.html b/tests/wpt/tests/mathml/presentation-markup/mrow/inferred-mrow-stretchy.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/inferred-mrow-stretchy.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/inferred-mrow-stretchy.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/legacy-mfenced-element-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/mrow/legacy-mfenced-element-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/legacy-mfenced-element-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/legacy-mfenced-element-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/legacy-mfenced-element-001.html b/tests/wpt/tests/mathml/presentation-markup/mrow/legacy-mfenced-element-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/legacy-mfenced-element-001.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/legacy-mfenced-element-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/legacy-mrow-like-elements-001.html b/tests/wpt/tests/mathml/presentation-markup/mrow/legacy-mrow-like-elements-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/legacy-mrow-like-elements-001.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/legacy-mrow-like-elements-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/legacy-mrow-like-elements-002-ref.html b/tests/wpt/tests/mathml/presentation-markup/mrow/legacy-mrow-like-elements-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/legacy-mrow-like-elements-002-ref.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/legacy-mrow-like-elements-002-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/legacy-mrow-like-elements-002.html b/tests/wpt/tests/mathml/presentation-markup/mrow/legacy-mrow-like-elements-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/legacy-mrow-like-elements-002.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/legacy-mrow-like-elements-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/legacy-mstyle-attributes.html b/tests/wpt/tests/mathml/presentation-markup/mrow/legacy-mstyle-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/legacy-mstyle-attributes.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/legacy-mstyle-attributes.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/merror-001.html b/tests/wpt/tests/mathml/presentation-markup/mrow/merror-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/merror-001.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/merror-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/mrow-fallback.html b/tests/wpt/tests/mathml/presentation-markup/mrow/mrow-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/mrow-fallback.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/mrow-fallback.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/mrow-painting-order-ref.html b/tests/wpt/tests/mathml/presentation-markup/mrow/mrow-painting-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/mrow-painting-order-ref.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/mrow-painting-order-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/mrow-painting-order.html b/tests/wpt/tests/mathml/presentation-markup/mrow/mrow-painting-order.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/mrow-painting-order.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/mrow-painting-order.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/mrow-preferred-width.html b/tests/wpt/tests/mathml/presentation-markup/mrow/mrow-preferred-width.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/mrow-preferred-width.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/mrow-preferred-width.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/no-spacing.html b/tests/wpt/tests/mathml/presentation-markup/mrow/no-spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/no-spacing.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/no-spacing.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/spacing.html b/tests/wpt/tests/mathml/presentation-markup/mrow/spacing.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/spacing.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/spacing.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/stretch-along-block-axis-001.html b/tests/wpt/tests/mathml/presentation-markup/mrow/stretch-along-block-axis-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/stretch-along-block-axis-001.html rename to tests/wpt/tests/mathml/presentation-markup/mrow/stretch-along-block-axis-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-001-crash.html b/tests/wpt/tests/mathml/presentation-markup/operators/embellished-operator-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-001-crash.html rename to tests/wpt/tests/mathml/presentation-markup/operators/embellished-operator-001-crash.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-001.html b/tests/wpt/tests/mathml/presentation-markup/operators/embellished-operator-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-001.html rename to tests/wpt/tests/mathml/presentation-markup/operators/embellished-operator-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-002.html b/tests/wpt/tests/mathml/presentation-markup/operators/embellished-operator-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-002.html rename to tests/wpt/tests/mathml/presentation-markup/operators/embellished-operator-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-003.html b/tests/wpt/tests/mathml/presentation-markup/operators/embellished-operator-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-003.html rename to tests/wpt/tests/mathml/presentation-markup/operators/embellished-operator-003.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-dynamic-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/embellished-operator-dynamic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-dynamic-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/embellished-operator-dynamic-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-dynamic-001.html b/tests/wpt/tests/mathml/presentation-markup/operators/embellished-operator-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-dynamic-001.html rename to tests/wpt/tests/mathml/presentation-markup/operators/embellished-operator-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-dynamic-002.html b/tests/wpt/tests/mathml/presentation-markup/operators/embellished-operator-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-dynamic-002.html rename to tests/wpt/tests/mathml/presentation-markup/operators/embellished-operator-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/largeop-hit-testing.html b/tests/wpt/tests/mathml/presentation-markup/operators/largeop-hit-testing.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/largeop-hit-testing.html rename to tests/wpt/tests/mathml/presentation-markup/operators/largeop-hit-testing.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-axis-height-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-axis-height-1.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-font-relative-lengths-001.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-font-relative-lengths-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-font-relative-lengths-001.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-font-relative-lengths-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-dynamic-002-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-form-dynamic-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-dynamic-002-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-form-dynamic-002-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-dynamic-002.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-form-dynamic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-dynamic-002.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-form-dynamic-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-dynamic-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-form-dynamic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-dynamic-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-form-dynamic-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-dynamic.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-form-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-dynamic.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-form-dynamic.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-fallback-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-form-fallback-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-fallback-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-form-fallback-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-fallback.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-form-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-fallback.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-form-fallback.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-minus-plus-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-form-minus-plus-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-minus-plus-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-form-minus-plus-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-minus-plus.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-form-minus-plus.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-minus-plus.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-form-minus-plus.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-form-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-form-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-form.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-form.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-form.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-2-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-2-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-2-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-2.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-2.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-2.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-3-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-3-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-3-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-3.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-3.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-3.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-3.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-4-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-4-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-4-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-4.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-4.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-4.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-4.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-dynamic-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-dynamic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-dynamic-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-dynamic-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-dynamic.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-dynamic.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-dynamic.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-lspace-rspace.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-lspace-rspace.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-minsize-maxsize-001.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-minsize-maxsize-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-minsize-maxsize-001.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-minsize-maxsize-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-and-embellished-operator-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-and-embellished-operator-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-and-embellished-operator-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-and-embellished-operator-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-and-embellished-operator.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-and-embellished-operator.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-and-embellished-operator.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-and-embellished-operator.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-default-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-default-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-default-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-default-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-default.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-default.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-default.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-default.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-dynamic-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-dynamic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-dynamic-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-dynamic-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-dynamic.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-dynamic.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-dynamic.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-from-in-flow-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-from-in-flow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-from-in-flow-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-from-in-flow-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-from-in-flow.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-from-in-flow.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-from-in-flow.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-from-in-flow.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-movablelimits.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-paint-lspace-rspace-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-paint-lspace-rspace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-paint-lspace-rspace-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-paint-lspace-rspace-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-paint-lspace-rspace.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-paint-lspace-rspace.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-paint-lspace-rspace.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-paint-lspace-rspace.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-single-char-and-children-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-single-char-and-children-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-single-char-and-children-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-single-char-and-children-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-single-char-and-children.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-single-char-and-children.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-single-char-and-children.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-single-char-and-children.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-stretch-properties-001.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-stretch-properties-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-stretch-properties-001.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-stretch-properties-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-stretch-properties-dynamic-001.html b/tests/wpt/tests/mathml/presentation-markup/operators/mo-stretch-properties-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-stretch-properties-dynamic-001.html rename to tests/wpt/tests/mathml/presentation-markup/operators/mo-stretch-properties-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-1-notref.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-1-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-1-notref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-1-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-1.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-1.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-1.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-12-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-12-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-12-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-12-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-12.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-12.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-12.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-12.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-13-notref.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-13-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-13-notref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-13-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-13.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-13.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-13.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-13.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-2-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-2-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-2-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-2.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-2.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-2.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-3-notref.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-3-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-3-notref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-3-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-3.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-3.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-3.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-3.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-4-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-4-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-4-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-4-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-4.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-4.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-4.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-4.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-5-notref.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-5-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-5-notref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-5-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-5.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-5.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-5.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-5.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-6-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-6-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-6-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-6-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-6.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-6.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-6.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-6.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-7-notref.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-7-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-7-notref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-7-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-7.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-7.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-7.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-7.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-8-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-8-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-8-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-8-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-8.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-8.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-8.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-8.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-9-notref.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-9-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-9-notref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-9-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-9.html b/tests/wpt/tests/mathml/presentation-markup/operators/op-dict-9.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/op-dict-9.html rename to tests/wpt/tests/mathml/presentation-markup/operators/op-dict-9.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-arabic-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-arabic-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-arabic-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-arabic-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-arabic-001.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-arabic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-arabic-001.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-arabic-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-arabic-002-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-arabic-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-arabic-002-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-arabic-002-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-arabic-002.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-arabic-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-arabic-002.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-arabic-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-combining.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-combining.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-combining.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-combining.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-empty-and-three-chars-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-empty-and-three-chars-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-empty-and-three-chars-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-empty-and-three-chars-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-empty-and-three-chars.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-empty-and-three-chars.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-empty-and-three-chars.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-empty-and-three-chars.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-largeop-001.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-largeop-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-largeop-001.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-largeop-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-largeop-002.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-largeop-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-largeop-002.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-largeop-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-largeop-003.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-largeop-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-largeop-003.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-largeop-003.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-largeop-004.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-largeop-004.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-largeop-004.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-largeop-004.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-largeop-005.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-largeop-005.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-largeop-005.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-largeop-005.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-largeop-006.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-largeop-006.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-largeop-006.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-largeop-006.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-001.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-001.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-002.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-002.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-003.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-003.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-003.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-004.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-004.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-004.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-004.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-005.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-005.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-005.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-005.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-006.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-006.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-006.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-movablelimits-006.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-spacing-001.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-spacing-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-spacing-001.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-spacing-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-spacing-002.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-spacing-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-spacing-002.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-spacing-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-spacing-003.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-spacing-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-spacing-003.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-spacing-003.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-spacing-004.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-spacing-004.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-spacing-004.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-spacing-004.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-spacing-005.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-spacing-005.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-spacing-005.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-spacing-005.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-spacing-006.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-spacing-006.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-spacing-006.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-spacing-006.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-001.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-001.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-002.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-002.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-003.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-003.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-003.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-004.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-004.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-004.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-004.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-005.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-005.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-005.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-005.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-006.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-006.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-006.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-stretchy-006.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-001.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-001.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-002.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-002.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-003.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-003.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-003.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-004.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-004.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-004.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-004.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-005.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-005.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-005.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-005.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-006.html b/tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-006.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-006.html rename to tests/wpt/tests/mathml/presentation-markup/operators/operator-dictionary-symmetric-006.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/painting-stretchy-operator-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/operators/painting-stretchy-operator-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/painting-stretchy-operator-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/operators/painting-stretchy-operator-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/painting-stretchy-operator-001.html b/tests/wpt/tests/mathml/presentation-markup/operators/painting-stretchy-operator-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/painting-stretchy-operator-001.html rename to tests/wpt/tests/mathml/presentation-markup/operators/painting-stretchy-operator-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/support/operator-dictionary-tests.css b/tests/wpt/tests/mathml/presentation-markup/operators/support/operator-dictionary-tests.css similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/support/operator-dictionary-tests.css rename to tests/wpt/tests/mathml/presentation-markup/operators/support/operator-dictionary-tests.css diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/support/operator-dictionary-tests.js b/tests/wpt/tests/mathml/presentation-markup/operators/support/operator-dictionary-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/operators/support/operator-dictionary-tests.js rename to tests/wpt/tests/mathml/presentation-markup/operators/support/operator-dictionary-tests.js diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/dynamic-radical-paint-invalidation-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/radicals/dynamic-radical-paint-invalidation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/dynamic-radical-paint-invalidation-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/radicals/dynamic-radical-paint-invalidation-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/dynamic-radical-paint-invalidation-001.html b/tests/wpt/tests/mathml/presentation-markup/radicals/dynamic-radical-paint-invalidation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/dynamic-radical-paint-invalidation-001.html rename to tests/wpt/tests/mathml/presentation-markup/radicals/dynamic-radical-paint-invalidation-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/radical-rendering-from-in-flow-ref.html b/tests/wpt/tests/mathml/presentation-markup/radicals/radical-rendering-from-in-flow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/radical-rendering-from-in-flow-ref.html rename to tests/wpt/tests/mathml/presentation-markup/radicals/radical-rendering-from-in-flow-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/radical-rendering-from-in-flow.html b/tests/wpt/tests/mathml/presentation-markup/radicals/radical-rendering-from-in-flow.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/radical-rendering-from-in-flow.html rename to tests/wpt/tests/mathml/presentation-markup/radicals/radical-rendering-from-in-flow.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html b/tests/wpt/tests/mathml/presentation-markup/radicals/root-parameters-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html rename to tests/wpt/tests/mathml/presentation-markup/radicals/root-parameters-1.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-2.html b/tests/wpt/tests/mathml/presentation-markup/radicals/root-parameters-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-2.html rename to tests/wpt/tests/mathml/presentation-markup/radicals/root-parameters-2.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/cramped-001.html b/tests/wpt/tests/mathml/presentation-markup/scripts/cramped-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/cramped-001.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/cramped-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/empty-underover.html b/tests/wpt/tests/mathml/presentation-markup/scripts/empty-underover.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/empty-underover.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/empty-underover.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/mover-accent-dynamic-change-ref.html b/tests/wpt/tests/mathml/presentation-markup/scripts/mover-accent-dynamic-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/mover-accent-dynamic-change-ref.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/mover-accent-dynamic-change-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/mover-accent-dynamic-change.html b/tests/wpt/tests/mathml/presentation-markup/scripts/mover-accent-dynamic-change.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/mover-accent-dynamic-change.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/mover-accent-dynamic-change.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/mprescripts-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/scripts/mprescripts-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/mprescripts-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/mprescripts-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/mprescripts-001.html b/tests/wpt/tests/mathml/presentation-markup/scripts/mprescripts-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/mprescripts-001.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/mprescripts-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/none-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/scripts/none-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/none-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/none-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/none-001.html b/tests/wpt/tests/mathml/presentation-markup/scripts/none-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/none-001.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/none-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/none-002-ref.html b/tests/wpt/tests/mathml/presentation-markup/scripts/none-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/none-002-ref.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/none-002-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/none-002.html b/tests/wpt/tests/mathml/presentation-markup/scripts/none-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/none-002.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/none-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-1.html b/tests/wpt/tests/mathml/presentation-markup/scripts/subsup-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-1.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/subsup-1.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-2.html b/tests/wpt/tests/mathml/presentation-markup/scripts/subsup-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-2.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/subsup-2.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-3.html b/tests/wpt/tests/mathml/presentation-markup/scripts/subsup-3.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-3.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/subsup-3.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-4.html b/tests/wpt/tests/mathml/presentation-markup/scripts/subsup-4.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-4.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/subsup-4.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-5.html b/tests/wpt/tests/mathml/presentation-markup/scripts/subsup-5.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-5.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/subsup-5.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-6.html b/tests/wpt/tests/mathml/presentation-markup/scripts/subsup-6.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-6.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/subsup-6.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-legacy-scriptshift-attributes-001.tentative-ref.html b/tests/wpt/tests/mathml/presentation-markup/scripts/subsup-legacy-scriptshift-attributes-001.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-legacy-scriptshift-attributes-001.tentative-ref.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/subsup-legacy-scriptshift-attributes-001.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-legacy-scriptshift-attributes-001.tentative.html b/tests/wpt/tests/mathml/presentation-markup/scripts/subsup-legacy-scriptshift-attributes-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-legacy-scriptshift-attributes-001.tentative.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/subsup-legacy-scriptshift-attributes-001.tentative.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html b/tests/wpt/tests/mathml/presentation-markup/scripts/subsup-parameters-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/subsup-parameters-1.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-2.html b/tests/wpt/tests/mathml/presentation-markup/scripts/subsup-parameters-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-2.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/subsup-parameters-2.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-1.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-1.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-1.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-legacy-align-attribute-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-legacy-align-attribute-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-legacy-align-attribute-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-legacy-align-attribute-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-legacy-align-attribute-001.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-legacy-align-attribute-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-legacy-align-attribute-001.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-legacy-align-attribute-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-parameters-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-parameters-1.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-parameters-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-parameters-2.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-parameters-3.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-parameters-3.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.tentative.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-parameters-4.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.tentative.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-parameters-4.tentative.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-and-embellished-operator-1.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-parameters-and-embellished-operator-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-and-embellished-operator-1.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-parameters-and-embellished-operator-1.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-and-embellished-operator-2.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-parameters-and-embellished-operator-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-and-embellished-operator-2.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-parameters-and-embellished-operator-2.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-stretchy-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-stretchy-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-stretchy-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-stretchy-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-stretchy-001.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-stretchy-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-stretchy-001.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-stretchy-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-stretchy-002-ref.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-stretchy-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-stretchy-002-ref.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-stretchy-002-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-stretchy-002.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-stretchy-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-stretchy-002.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-stretchy-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-stretchy-003-ref.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-stretchy-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-stretchy-003-ref.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-stretchy-003-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-stretchy-003.html b/tests/wpt/tests/mathml/presentation-markup/scripts/underover-stretchy-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-stretchy-003.html rename to tests/wpt/tests/mathml/presentation-markup/scripts/underover-stretchy-003.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/mspace-children-ref.html b/tests/wpt/tests/mathml/presentation-markup/spaces/mspace-children-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/mspace-children-ref.html rename to tests/wpt/tests/mathml/presentation-markup/spaces/mspace-children-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/mspace-children.html b/tests/wpt/tests/mathml/presentation-markup/spaces/mspace-children.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/mspace-children.html rename to tests/wpt/tests/mathml/presentation-markup/spaces/mspace-children.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/mspace-percentage-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/spaces/mspace-percentage-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/mspace-percentage-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/spaces/mspace-percentage-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/mspace-percentage-001.html b/tests/wpt/tests/mathml/presentation-markup/spaces/mspace-percentage-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/mspace-percentage-001.html rename to tests/wpt/tests/mathml/presentation-markup/spaces/mspace-percentage-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/mspace-width-height-001.html b/tests/wpt/tests/mathml/presentation-markup/spaces/mspace-width-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/mspace-width-height-001.html rename to tests/wpt/tests/mathml/presentation-markup/spaces/mspace-width-height-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-1.html b/tests/wpt/tests/mathml/presentation-markup/spaces/space-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-1.html rename to tests/wpt/tests/mathml/presentation-markup/spaces/space-1.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-2-ref.html b/tests/wpt/tests/mathml/presentation-markup/spaces/space-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-2-ref.html rename to tests/wpt/tests/mathml/presentation-markup/spaces/space-2-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-2.html b/tests/wpt/tests/mathml/presentation-markup/spaces/space-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-2.html rename to tests/wpt/tests/mathml/presentation-markup/spaces/space-2.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-like-001.html b/tests/wpt/tests/mathml/presentation-markup/spaces/space-like-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-like-001.html rename to tests/wpt/tests/mathml/presentation-markup/spaces/space-like-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-like-002.html b/tests/wpt/tests/mathml/presentation-markup/spaces/space-like-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-like-002.html rename to tests/wpt/tests/mathml/presentation-markup/spaces/space-like-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-like-003.html b/tests/wpt/tests/mathml/presentation-markup/spaces/space-like-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-like-003.html rename to tests/wpt/tests/mathml/presentation-markup/spaces/space-like-003.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-like-004.html b/tests/wpt/tests/mathml/presentation-markup/spaces/space-like-004.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-like-004.html rename to tests/wpt/tests/mathml/presentation-markup/spaces/space-like-004.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-vertical-align.tentative-ref.html b/tests/wpt/tests/mathml/presentation-markup/spaces/space-vertical-align.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-vertical-align.tentative-ref.html rename to tests/wpt/tests/mathml/presentation-markup/spaces/space-vertical-align.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-vertical-align.tentative.html b/tests/wpt/tests/mathml/presentation-markup/spaces/space-vertical-align.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-vertical-align.tentative.html rename to tests/wpt/tests/mathml/presentation-markup/spaces/space-vertical-align.tentative.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/dynamic-table-001.html b/tests/wpt/tests/mathml/presentation-markup/tables/dynamic-table-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/tables/dynamic-table-001.html rename to tests/wpt/tests/mathml/presentation-markup/tables/dynamic-table-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-001.html b/tests/wpt/tests/mathml/presentation-markup/tables/table-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-001.html rename to tests/wpt/tests/mathml/presentation-markup/tables/table-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-002.html b/tests/wpt/tests/mathml/presentation-markup/tables/table-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-002.html rename to tests/wpt/tests/mathml/presentation-markup/tables/table-002.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-003.html b/tests/wpt/tests/mathml/presentation-markup/tables/table-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-003.html rename to tests/wpt/tests/mathml/presentation-markup/tables/table-003.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html b/tests/wpt/tests/mathml/presentation-markup/tables/table-axis-height.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html rename to tests/wpt/tests/mathml/presentation-markup/tables/table-axis-height.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-cell-mrow-layout.html b/tests/wpt/tests/mathml/presentation-markup/tables/table-cell-mrow-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-cell-mrow-layout.html rename to tests/wpt/tests/mathml/presentation-markup/tables/table-cell-mrow-layout.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-default-styles-001.html b/tests/wpt/tests/mathml/presentation-markup/tables/table-default-styles-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-default-styles-001.html rename to tests/wpt/tests/mathml/presentation-markup/tables/table-default-styles-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/tokens/dynamic-mtext-like-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/tokens/dynamic-mtext-like-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/tokens/dynamic-mtext-like-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/tokens/dynamic-mtext-like-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/tokens/dynamic-mtext-like-001.html b/tests/wpt/tests/mathml/presentation-markup/tokens/dynamic-mtext-like-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/tokens/dynamic-mtext-like-001.html rename to tests/wpt/tests/mathml/presentation-markup/tokens/dynamic-mtext-like-001.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/tokens/ms-001-ref.html b/tests/wpt/tests/mathml/presentation-markup/tokens/ms-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/tokens/ms-001-ref.html rename to tests/wpt/tests/mathml/presentation-markup/tokens/ms-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/tokens/ms-001.html b/tests/wpt/tests/mathml/presentation-markup/tokens/ms-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/presentation-markup/tokens/ms-001.html rename to tests/wpt/tests/mathml/presentation-markup/tokens/ms-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/attribute-mapping-001.html b/tests/wpt/tests/mathml/relations/css-styling/attribute-mapping-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/attribute-mapping-001.html rename to tests/wpt/tests/mathml/relations/css-styling/attribute-mapping-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/attribute-mapping-002.html b/tests/wpt/tests/mathml/relations/css-styling/attribute-mapping-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/attribute-mapping-002.html rename to tests/wpt/tests/mathml/relations/css-styling/attribute-mapping-002.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/blur-filter-ref.html b/tests/wpt/tests/mathml/relations/css-styling/blur-filter-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/blur-filter-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/blur-filter-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/blur-filter.html b/tests/wpt/tests/mathml/relations/css-styling/blur-filter.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/blur-filter.html rename to tests/wpt/tests/mathml/relations/css-styling/blur-filter.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/clip-path-ref.html b/tests/wpt/tests/mathml/relations/css-styling/clip-path-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/clip-path-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/clip-path-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/clip-path.html b/tests/wpt/tests/mathml/relations/css-styling/clip-path.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/clip-path.html rename to tests/wpt/tests/mathml/relations/css-styling/clip-path.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/clip-ref.html b/tests/wpt/tests/mathml/relations/css-styling/clip-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/clip-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/clip-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/clip.html b/tests/wpt/tests/mathml/relations/css-styling/clip.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/clip.html rename to tests/wpt/tests/mathml/relations/css-styling/clip.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-001-ref.html b/tests/wpt/tests/mathml/relations/css-styling/color-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/color-001-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/color-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-001.html b/tests/wpt/tests/mathml/relations/css-styling/color-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/color-001.html rename to tests/wpt/tests/mathml/relations/css-styling/color-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-002-ref.html b/tests/wpt/tests/mathml/relations/css-styling/color-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/color-002-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/color-002-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-002.html b/tests/wpt/tests/mathml/relations/css-styling/color-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/color-002.html rename to tests/wpt/tests/mathml/relations/css-styling/color-002.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-003-ref.html b/tests/wpt/tests/mathml/relations/css-styling/color-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/color-003-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/color-003-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-003.html b/tests/wpt/tests/mathml/relations/css-styling/color-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/color-003.html rename to tests/wpt/tests/mathml/relations/css-styling/color-003.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-004.tentative-ref.html b/tests/wpt/tests/mathml/relations/css-styling/color-004.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/color-004.tentative-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/color-004.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-004.tentative.html b/tests/wpt/tests/mathml/relations/css-styling/color-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/color-004.tentative.html rename to tests/wpt/tests/mathml/relations/css-styling/color-004.tentative.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-005-ref.html b/tests/wpt/tests/mathml/relations/css-styling/color-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/color-005-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/color-005-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-005.html b/tests/wpt/tests/mathml/relations/css-styling/color-005.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/color-005.html rename to tests/wpt/tests/mathml/relations/css-styling/color-005.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/default-font-family.html b/tests/wpt/tests/mathml/relations/css-styling/default-font-family.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/default-font-family.html rename to tests/wpt/tests/mathml/relations/css-styling/default-font-family.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/default-properties-on-semantics-and-maction.html b/tests/wpt/tests/mathml/relations/css-styling/default-properties-on-semantics-and-maction.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/default-properties-on-semantics-and-maction.html rename to tests/wpt/tests/mathml/relations/css-styling/default-properties-on-semantics-and-maction.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/default-properties-on-the-math-root.html b/tests/wpt/tests/mathml/relations/css-styling/default-properties-on-the-math-root.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/default-properties-on-the-math-root.html rename to tests/wpt/tests/mathml/relations/css-styling/default-properties-on-the-math-root.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/display-1-ref.html b/tests/wpt/tests/mathml/relations/css-styling/display-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/display-1-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/display-1-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/display-1.html b/tests/wpt/tests/mathml/relations/css-styling/display-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/display-1.html rename to tests/wpt/tests/mathml/relations/css-styling/display-1.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/display-2.html b/tests/wpt/tests/mathml/relations/css-styling/display-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/display-2.html rename to tests/wpt/tests/mathml/relations/css-styling/display-2.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/display-contents.html b/tests/wpt/tests/mathml/relations/css-styling/display-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/display-contents.html rename to tests/wpt/tests/mathml/relations/css-styling/display-contents.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/display-with-overflow-ref.html b/tests/wpt/tests/mathml/relations/css-styling/display-with-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/display-with-overflow-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/display-with-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/display-with-overflow.html b/tests/wpt/tests/mathml/relations/css-styling/display-with-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/display-with-overflow.html rename to tests/wpt/tests/mathml/relations/css-styling/display-with-overflow.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-011-ref.html b/tests/wpt/tests/mathml/relations/css-styling/displaystyle-011-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-011-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/displaystyle-011-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-011.html b/tests/wpt/tests/mathml/relations/css-styling/displaystyle-011.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-011.html rename to tests/wpt/tests/mathml/relations/css-styling/displaystyle-011.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-012-ref.html b/tests/wpt/tests/mathml/relations/css-styling/displaystyle-012-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-012-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/displaystyle-012-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-012.html b/tests/wpt/tests/mathml/relations/css-styling/displaystyle-012.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-012.html rename to tests/wpt/tests/mathml/relations/css-styling/displaystyle-012.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-013-ref.html b/tests/wpt/tests/mathml/relations/css-styling/displaystyle-013-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-013-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/displaystyle-013-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-013.html b/tests/wpt/tests/mathml/relations/css-styling/displaystyle-013.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-013.html rename to tests/wpt/tests/mathml/relations/css-styling/displaystyle-013.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-014-ref.html b/tests/wpt/tests/mathml/relations/css-styling/displaystyle-014-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-014-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/displaystyle-014-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-014.html b/tests/wpt/tests/mathml/relations/css-styling/displaystyle-014.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-014.html rename to tests/wpt/tests/mathml/relations/css-styling/displaystyle-014.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-015-ref.html b/tests/wpt/tests/mathml/relations/css-styling/displaystyle-015-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-015-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/displaystyle-015-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-015.html b/tests/wpt/tests/mathml/relations/css-styling/displaystyle-015.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-015.html rename to tests/wpt/tests/mathml/relations/css-styling/displaystyle-015.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html b/tests/wpt/tests/mathml/relations/css-styling/displaystyle-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html rename to tests/wpt/tests/mathml/relations/css-styling/displaystyle-1.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-2.html b/tests/wpt/tests/mathml/relations/css-styling/displaystyle-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-2.html rename to tests/wpt/tests/mathml/relations/css-styling/displaystyle-2.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-3.html b/tests/wpt/tests/mathml/relations/css-styling/displaystyle-3.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-3.html rename to tests/wpt/tests/mathml/relations/css-styling/displaystyle-3.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/dynamic-dir-1-ref.html b/tests/wpt/tests/mathml/relations/css-styling/dynamic-dir-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/dynamic-dir-1-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/dynamic-dir-1-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/dynamic-dir-1.html b/tests/wpt/tests/mathml/relations/css-styling/dynamic-dir-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/dynamic-dir-1.html rename to tests/wpt/tests/mathml/relations/css-styling/dynamic-dir-1.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/floats/floating-inside-mathml-with-block-display-ref.html b/tests/wpt/tests/mathml/relations/css-styling/floats/floating-inside-mathml-with-block-display-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/floats/floating-inside-mathml-with-block-display-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/floats/floating-inside-mathml-with-block-display-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/floats/floating-inside-mathml-with-block-display.html b/tests/wpt/tests/mathml/relations/css-styling/floats/floating-inside-mathml-with-block-display.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/floats/floating-inside-mathml-with-block-display.html rename to tests/wpt/tests/mathml/relations/css-styling/floats/floating-inside-mathml-with-block-display.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/floats/floating-math-ref.html b/tests/wpt/tests/mathml/relations/css-styling/floats/floating-math-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/floats/floating-math-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/floats/floating-math-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/floats/floating-math.html b/tests/wpt/tests/mathml/relations/css-styling/floats/floating-math.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/floats/floating-math.html rename to tests/wpt/tests/mathml/relations/css-styling/floats/floating-math.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/floats/not-floating-001.html b/tests/wpt/tests/mathml/relations/css-styling/floats/not-floating-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/floats/not-floating-001.html rename to tests/wpt/tests/mathml/relations/css-styling/floats/not-floating-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/ignored-properties-001.html b/tests/wpt/tests/mathml/relations/css-styling/ignored-properties-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/ignored-properties-001.html rename to tests/wpt/tests/mathml/relations/css-styling/ignored-properties-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/legacy-scriptminsize-attribute-ref.html b/tests/wpt/tests/mathml/relations/css-styling/legacy-scriptminsize-attribute-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/legacy-scriptminsize-attribute-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/legacy-scriptminsize-attribute-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/legacy-scriptminsize-attribute.html b/tests/wpt/tests/mathml/relations/css-styling/legacy-scriptminsize-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/legacy-scriptminsize-attribute.html rename to tests/wpt/tests/mathml/relations/css-styling/legacy-scriptminsize-attribute.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/legacy-scriptsizemultiplier-attribute-ref.html b/tests/wpt/tests/mathml/relations/css-styling/legacy-scriptsizemultiplier-attribute-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/legacy-scriptsizemultiplier-attribute-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/legacy-scriptsizemultiplier-attribute-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/legacy-scriptsizemultiplier-attribute.html b/tests/wpt/tests/mathml/relations/css-styling/legacy-scriptsizemultiplier-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/legacy-scriptsizemultiplier-attribute.html rename to tests/wpt/tests/mathml/relations/css-styling/legacy-scriptsizemultiplier-attribute.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-1-ref.html b/tests/wpt/tests/mathml/relations/css-styling/lengths-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-1-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/lengths-1-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-1.html b/tests/wpt/tests/mathml/relations/css-styling/lengths-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-1.html rename to tests/wpt/tests/mathml/relations/css-styling/lengths-1.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-2.html b/tests/wpt/tests/mathml/relations/css-styling/lengths-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-2.html rename to tests/wpt/tests/mathml/relations/css-styling/lengths-2.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-001-notref.html b/tests/wpt/tests/mathml/relations/css-styling/mathbackground-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-001-notref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathbackground-001-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-001.html b/tests/wpt/tests/mathml/relations/css-styling/mathbackground-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-001.html rename to tests/wpt/tests/mathml/relations/css-styling/mathbackground-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-002-notref.html b/tests/wpt/tests/mathml/relations/css-styling/mathbackground-002-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-002-notref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathbackground-002-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-002.html b/tests/wpt/tests/mathml/relations/css-styling/mathbackground-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-002.html rename to tests/wpt/tests/mathml/relations/css-styling/mathbackground-002.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-003-notref.html b/tests/wpt/tests/mathml/relations/css-styling/mathbackground-003-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-003-notref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathbackground-003-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-003.html b/tests/wpt/tests/mathml/relations/css-styling/mathbackground-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-003.html rename to tests/wpt/tests/mathml/relations/css-styling/mathbackground-003.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-004-notref.html b/tests/wpt/tests/mathml/relations/css-styling/mathbackground-004-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-004-notref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathbackground-004-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-004.html b/tests/wpt/tests/mathml/relations/css-styling/mathbackground-004.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathbackground-004.html rename to tests/wpt/tests/mathml/relations/css-styling/mathbackground-004.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-001-notref.html b/tests/wpt/tests/mathml/relations/css-styling/mathcolor-001-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-001-notref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathcolor-001-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-001.html b/tests/wpt/tests/mathml/relations/css-styling/mathcolor-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-001.html rename to tests/wpt/tests/mathml/relations/css-styling/mathcolor-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-002-notref.html b/tests/wpt/tests/mathml/relations/css-styling/mathcolor-002-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-002-notref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathcolor-002-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-002.html b/tests/wpt/tests/mathml/relations/css-styling/mathcolor-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-002.html rename to tests/wpt/tests/mathml/relations/css-styling/mathcolor-002.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-003-notref.html b/tests/wpt/tests/mathml/relations/css-styling/mathcolor-003-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-003-notref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathcolor-003-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-003.html b/tests/wpt/tests/mathml/relations/css-styling/mathcolor-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-003.html rename to tests/wpt/tests/mathml/relations/css-styling/mathcolor-003.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-004-notref.html b/tests/wpt/tests/mathml/relations/css-styling/mathcolor-004-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-004-notref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathcolor-004-notref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-004.html b/tests/wpt/tests/mathml/relations/css-styling/mathcolor-004.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-004.html rename to tests/wpt/tests/mathml/relations/css-styling/mathcolor-004.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-mathbackground-css-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathcolor-mathbackground-css-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-mathbackground-css-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathcolor-mathbackground-css-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-mathbackground-css.html b/tests/wpt/tests/mathml/relations/css-styling/mathcolor-mathbackground-css.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathcolor-mathbackground-css.html rename to tests/wpt/tests/mathml/relations/css-styling/mathcolor-mathbackground-css.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathsize-attribute-css-keywords-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathsize-attribute-css-keywords-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathsize-attribute-css-keywords-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathsize-attribute-css-keywords-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathsize-attribute-css-keywords.html b/tests/wpt/tests/mathml/relations/css-styling/mathsize-attribute-css-keywords.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathsize-attribute-css-keywords.html rename to tests/wpt/tests/mathml/relations/css-styling/mathsize-attribute-css-keywords.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathsize-attribute-legacy-values-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathsize-attribute-legacy-values-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathsize-attribute-legacy-values-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathsize-attribute-legacy-values-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathsize-attribute-legacy-values.html b/tests/wpt/tests/mathml/relations/css-styling/mathsize-attribute-legacy-values.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathsize-attribute-legacy-values.html rename to tests/wpt/tests/mathml/relations/css-styling/mathsize-attribute-legacy-values.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathsize-attribute-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathsize-attribute-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathsize-attribute-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathsize-attribute-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathsize-attribute.html b/tests/wpt/tests/mathml/relations/css-styling/mathsize-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathsize-attribute.html rename to tests/wpt/tests/mathml/relations/css-styling/mathsize-attribute.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-auto-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-auto-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-auto-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-auto-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-auto.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-auto.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-auto.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-basic-transforms-with-default-font-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-basic-transforms-with-default-font-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-basic-transforms-with-default-font-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-basic-transforms-with-default-font-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-basic-transforms-with-default-font.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-basic-transforms-with-default-font.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-basic-transforms-with-default-font.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-basic-transforms-with-default-font.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-fraktur-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-fraktur-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-fraktur-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-fraktur-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-fraktur.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-fraktur.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-fraktur.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-fraktur.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-italic-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-italic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-italic-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-italic-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-italic.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-italic.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-italic.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-italic.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-sans-serif-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-sans-serif-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-sans-serif-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-sans-serif-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-sans-serif.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-sans-serif.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-sans-serif.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-sans-serif.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-script-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-script-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-script-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-script-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-script.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-script.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-script.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold-script.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-bold.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-case-sensitivity-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-case-sensitivity-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-case-sensitivity-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-case-sensitivity-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-case-sensitivity.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-case-sensitivity.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-case-sensitivity.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-case-sensitivity.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck-font-style-font-weight-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-double-struck-font-style-font-weight-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck-font-style-font-weight-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-double-struck-font-style-font-weight-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck-font-style-font-weight.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-double-struck-font-style-font-weight.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck-font-style-font-weight.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-double-struck-font-style-font-weight.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-double-struck-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-double-struck-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-double-struck.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-double-struck.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-font-style-font-weight-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-font-style-font-weight-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-font-style-font-weight-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-font-style-font-weight-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-font-style-font-weight.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-font-style-font-weight.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-font-style-font-weight.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-font-style-font-weight.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-fraktur-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-fraktur-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-fraktur-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-fraktur-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-fraktur.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-fraktur.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-fraktur.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-fraktur.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-initial-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-initial-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-initial-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-initial-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-initial.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-initial.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-initial.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-italic-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-italic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-italic-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-italic-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-italic.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-italic.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-italic.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-italic.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-looped-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-looped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-looped-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-looped-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-looped.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-looped.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-looped.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-looped.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-monospace-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-monospace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-monospace-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-monospace-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-monospace.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-monospace.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-monospace.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-monospace.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-italic-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-sans-serif-italic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-italic-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-sans-serif-italic-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-italic.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-sans-serif-italic.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-italic.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-sans-serif-italic.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-sans-serif-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-sans-serif-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-sans-serif.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-sans-serif.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-script-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-script-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-script-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-script-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-script.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-script.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-script.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-script.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-stretched-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-stretched-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-stretched-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-stretched-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-stretched.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-stretched.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-stretched.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-stretched.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-tailed-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-tailed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-tailed-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-tailed-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-tailed.html b/tests/wpt/tests/mathml/relations/css-styling/mathvariant-tailed.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-tailed.html rename to tests/wpt/tests/mathml/relations/css-styling/mathvariant-tailed.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mi-fontstyle-fontweight-ref.html b/tests/wpt/tests/mathml/relations/css-styling/mi-fontstyle-fontweight-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mi-fontstyle-fontweight-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/mi-fontstyle-fontweight-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mi-fontstyle-fontweight.html b/tests/wpt/tests/mathml/relations/css-styling/mi-fontstyle-fontweight.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/mi-fontstyle-fontweight.html rename to tests/wpt/tests/mathml/relations/css-styling/mi-fontstyle-fontweight.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/multi-column-layout.html b/tests/wpt/tests/mathml/relations/css-styling/multi-column-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/multi-column-layout.html rename to tests/wpt/tests/mathml/relations/css-styling/multi-column-layout.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/not-participating-to-parent-layout.html b/tests/wpt/tests/mathml/relations/css-styling/not-participating-to-parent-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/not-participating-to-parent-layout.html rename to tests/wpt/tests/mathml/relations/css-styling/not-participating-to-parent-layout.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/out-of-flow/absolutely-positioned-001-ref.html b/tests/wpt/tests/mathml/relations/css-styling/out-of-flow/absolutely-positioned-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/out-of-flow/absolutely-positioned-001-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/out-of-flow/absolutely-positioned-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/out-of-flow/absolutely-positioned-001.html b/tests/wpt/tests/mathml/relations/css-styling/out-of-flow/absolutely-positioned-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/out-of-flow/absolutely-positioned-001.html rename to tests/wpt/tests/mathml/relations/css-styling/out-of-flow/absolutely-positioned-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/out-of-flow/all-mathml-containers.html b/tests/wpt/tests/mathml/relations/css-styling/out-of-flow/all-mathml-containers.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/out-of-flow/all-mathml-containers.html rename to tests/wpt/tests/mathml/relations/css-styling/out-of-flow/all-mathml-containers.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/out-of-flow/fixed-positioned-001-ref.html b/tests/wpt/tests/mathml/relations/css-styling/out-of-flow/fixed-positioned-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/out-of-flow/fixed-positioned-001-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/out-of-flow/fixed-positioned-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/out-of-flow/fixed-positioned-001.html b/tests/wpt/tests/mathml/relations/css-styling/out-of-flow/fixed-positioned-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/out-of-flow/fixed-positioned-001.html rename to tests/wpt/tests/mathml/relations/css-styling/out-of-flow/fixed-positioned-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/overflow/computed-value-001.html b/tests/wpt/tests/mathml/relations/css-styling/overflow/computed-value-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/overflow/computed-value-001.html rename to tests/wpt/tests/mathml/relations/css-styling/overflow/computed-value-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/border-001.html b/tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/border-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/border-001.html rename to tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/border-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/border-002.html b/tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/border-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/border-002.html rename to tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/border-002.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/margin-001.html b/tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/margin-001.html rename to tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/margin-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/margin-002.html b/tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/margin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/margin-002.html rename to tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/margin-002.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/margin-003.html b/tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/margin-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/margin-003.html rename to tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/margin-003.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-001.html b/tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-001.html rename to tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-002.html b/tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-002.html rename to tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-002.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-001-ref.html b/tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-001-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-001.html b/tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-001.html rename to tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-002-ref.html b/tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-002-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-002-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-002.html b/tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-002.html rename to tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-002.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-003-ref.html b/tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-003-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-003-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-003.html b/tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-003.html rename to tests/wpt/tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-003.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/presentational-hints-001-ref.html b/tests/wpt/tests/mathml/relations/css-styling/presentational-hints-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/presentational-hints-001-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/presentational-hints-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/presentational-hints-001.html b/tests/wpt/tests/mathml/relations/css-styling/presentational-hints-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/presentational-hints-001.html rename to tests/wpt/tests/mathml/relations/css-styling/presentational-hints-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/presentational-hints-002-ref.html b/tests/wpt/tests/mathml/relations/css-styling/presentational-hints-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/presentational-hints-002-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/presentational-hints-002-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/presentational-hints-002.html b/tests/wpt/tests/mathml/relations/css-styling/presentational-hints-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/presentational-hints-002.html rename to tests/wpt/tests/mathml/relations/css-styling/presentational-hints-002.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/scriptlevel-001.html b/tests/wpt/tests/mathml/relations/css-styling/scriptlevel-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/scriptlevel-001.html rename to tests/wpt/tests/mathml/relations/css-styling/scriptlevel-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/transform-ref.html b/tests/wpt/tests/mathml/relations/css-styling/transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/transform-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/transform-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/transform.html b/tests/wpt/tests/mathml/relations/css-styling/transform.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/transform.html rename to tests/wpt/tests/mathml/relations/css-styling/transform.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-001-ref.html b/tests/wpt/tests/mathml/relations/css-styling/visibility-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-001-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/visibility-001-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-001.html b/tests/wpt/tests/mathml/relations/css-styling/visibility-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-001.html rename to tests/wpt/tests/mathml/relations/css-styling/visibility-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-002-ref.html b/tests/wpt/tests/mathml/relations/css-styling/visibility-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-002-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/visibility-002-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-002.html b/tests/wpt/tests/mathml/relations/css-styling/visibility-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-002.html rename to tests/wpt/tests/mathml/relations/css-styling/visibility-002.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-003-ref.html b/tests/wpt/tests/mathml/relations/css-styling/visibility-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-003-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/visibility-003-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-003.html b/tests/wpt/tests/mathml/relations/css-styling/visibility-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-003.html rename to tests/wpt/tests/mathml/relations/css-styling/visibility-003.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-004.tentative-ref.html b/tests/wpt/tests/mathml/relations/css-styling/visibility-004.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-004.tentative-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/visibility-004.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-004.tentative.html b/tests/wpt/tests/mathml/relations/css-styling/visibility-004.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-004.tentative.html rename to tests/wpt/tests/mathml/relations/css-styling/visibility-004.tentative.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-005-ref.html b/tests/wpt/tests/mathml/relations/css-styling/visibility-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-005-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/visibility-005-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-005.html b/tests/wpt/tests/mathml/relations/css-styling/visibility-005.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-005.html rename to tests/wpt/tests/mathml/relations/css-styling/visibility-005.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/width-height-001.html b/tests/wpt/tests/mathml/relations/css-styling/width-height-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/width-height-001.html rename to tests/wpt/tests/mathml/relations/css-styling/width-height-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/width-height-002-ref.html b/tests/wpt/tests/mathml/relations/css-styling/width-height-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/width-height-002-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/width-height-002-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/width-height-002.html b/tests/wpt/tests/mathml/relations/css-styling/width-height-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/width-height-002.html rename to tests/wpt/tests/mathml/relations/css-styling/width-height-002.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/width-height-003-ref.html b/tests/wpt/tests/mathml/relations/css-styling/width-height-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/width-height-003-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/width-height-003-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/width-height-003.html b/tests/wpt/tests/mathml/relations/css-styling/width-height-003.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/width-height-003.html rename to tests/wpt/tests/mathml/relations/css-styling/width-height-003.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/width-height-004.html b/tests/wpt/tests/mathml/relations/css-styling/width-height-004.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/width-height-004.html rename to tests/wpt/tests/mathml/relations/css-styling/width-height-004.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/writing-mode/force-horizontal-tb.html b/tests/wpt/tests/mathml/relations/css-styling/writing-mode/force-horizontal-tb.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/writing-mode/force-horizontal-tb.html rename to tests/wpt/tests/mathml/relations/css-styling/writing-mode/force-horizontal-tb.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/writing-mode/reset-and-logicial-property-ref.html b/tests/wpt/tests/mathml/relations/css-styling/writing-mode/reset-and-logicial-property-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/writing-mode/reset-and-logicial-property-ref.html rename to tests/wpt/tests/mathml/relations/css-styling/writing-mode/reset-and-logicial-property-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/writing-mode/reset-and-logicial-property.html b/tests/wpt/tests/mathml/relations/css-styling/writing-mode/reset-and-logicial-property.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/writing-mode/reset-and-logicial-property.html rename to tests/wpt/tests/mathml/relations/css-styling/writing-mode/reset-and-logicial-property.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/writing-mode/writing-mode-001.html b/tests/wpt/tests/mathml/relations/css-styling/writing-mode/writing-mode-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/writing-mode/writing-mode-001.html rename to tests/wpt/tests/mathml/relations/css-styling/writing-mode/writing-mode-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/writing-mode/writing-mode-002.html b/tests/wpt/tests/mathml/relations/css-styling/writing-mode/writing-mode-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/css-styling/writing-mode/writing-mode-002.html rename to tests/wpt/tests/mathml/relations/css-styling/writing-mode/writing-mode-002.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/class-1-ref.html b/tests/wpt/tests/mathml/relations/html5-tree/class-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/class-1-ref.html rename to tests/wpt/tests/mathml/relations/html5-tree/class-1-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/class-1.html b/tests/wpt/tests/mathml/relations/html5-tree/class-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/class-1.html rename to tests/wpt/tests/mathml/relations/html5-tree/class-1.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/class-2.html b/tests/wpt/tests/mathml/relations/html5-tree/class-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/class-2.html rename to tests/wpt/tests/mathml/relations/html5-tree/class-2.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html b/tests/wpt/tests/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html rename to tests/wpt/tests/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/color-attributes-1-ref.html b/tests/wpt/tests/mathml/relations/html5-tree/color-attributes-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/color-attributes-1-ref.html rename to tests/wpt/tests/mathml/relations/html5-tree/color-attributes-1-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/color-attributes-1.html b/tests/wpt/tests/mathml/relations/html5-tree/color-attributes-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/color-attributes-1.html rename to tests/wpt/tests/mathml/relations/html5-tree/color-attributes-1.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/content-editable.html b/tests/wpt/tests/mathml/relations/html5-tree/content-editable.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/content-editable.html rename to tests/wpt/tests/mathml/relations/html5-tree/content-editable.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html b/tests/wpt/tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html rename to tests/wpt/tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative.html b/tests/wpt/tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative.html rename to tests/wpt/tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-interface.tentative.html b/tests/wpt/tests/mathml/relations/html5-tree/css-inline-style-interface.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-interface.tentative.html rename to tests/wpt/tests/mathml/relations/html5-tree/css-inline-style-interface.tentative.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/display-1.html b/tests/wpt/tests/mathml/relations/html5-tree/display-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/display-1.html rename to tests/wpt/tests/mathml/relations/html5-tree/display-1.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/display-2-ref.html b/tests/wpt/tests/mathml/relations/html5-tree/display-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/display-2-ref.html rename to tests/wpt/tests/mathml/relations/html5-tree/display-2-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/display-2.html b/tests/wpt/tests/mathml/relations/html5-tree/display-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/display-2.html rename to tests/wpt/tests/mathml/relations/html5-tree/display-2.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-1-ref.html b/tests/wpt/tests/mathml/relations/html5-tree/dynamic-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-1-ref.html rename to tests/wpt/tests/mathml/relations/html5-tree/dynamic-1-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-1.html b/tests/wpt/tests/mathml/relations/html5-tree/dynamic-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-1.html rename to tests/wpt/tests/mathml/relations/html5-tree/dynamic-1.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-2-ref.html b/tests/wpt/tests/mathml/relations/html5-tree/dynamic-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-2-ref.html rename to tests/wpt/tests/mathml/relations/html5-tree/dynamic-2-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-2.html b/tests/wpt/tests/mathml/relations/html5-tree/dynamic-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-2.html rename to tests/wpt/tests/mathml/relations/html5-tree/dynamic-2.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-childlist-001.html b/tests/wpt/tests/mathml/relations/html5-tree/dynamic-childlist-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-childlist-001.html rename to tests/wpt/tests/mathml/relations/html5-tree/dynamic-childlist-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-childlist-002.html b/tests/wpt/tests/mathml/relations/html5-tree/dynamic-childlist-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-childlist-002.html rename to tests/wpt/tests/mathml/relations/html5-tree/dynamic-childlist-002.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-1-ref.html b/tests/wpt/tests/mathml/relations/html5-tree/href-click-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-1-ref.html rename to tests/wpt/tests/mathml/relations/html5-tree/href-click-1-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-1.html b/tests/wpt/tests/mathml/relations/html5-tree/href-click-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-1.html rename to tests/wpt/tests/mathml/relations/html5-tree/href-click-1.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-2-ref.html b/tests/wpt/tests/mathml/relations/html5-tree/href-click-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-2-ref.html rename to tests/wpt/tests/mathml/relations/html5-tree/href-click-2-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-2.html b/tests/wpt/tests/mathml/relations/html5-tree/href-click-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-2.html rename to tests/wpt/tests/mathml/relations/html5-tree/href-click-2.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-3.html b/tests/wpt/tests/mathml/relations/html5-tree/href-click-3.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-3.html rename to tests/wpt/tests/mathml/relations/html5-tree/href-click-3.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/html-or-foreign-element-interfaces.tentative.html b/tests/wpt/tests/mathml/relations/html5-tree/html-or-foreign-element-interfaces.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/html-or-foreign-element-interfaces.tentative.html rename to tests/wpt/tests/mathml/relations/html5-tree/html-or-foreign-element-interfaces.tentative.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-1-ref.html b/tests/wpt/tests/mathml/relations/html5-tree/integration-point-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-1-ref.html rename to tests/wpt/tests/mathml/relations/html5-tree/integration-point-1-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-1.html b/tests/wpt/tests/mathml/relations/html5-tree/integration-point-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-1.html rename to tests/wpt/tests/mathml/relations/html5-tree/integration-point-1.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-2-ref.html b/tests/wpt/tests/mathml/relations/html5-tree/integration-point-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-2-ref.html rename to tests/wpt/tests/mathml/relations/html5-tree/integration-point-2-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-2.html b/tests/wpt/tests/mathml/relations/html5-tree/integration-point-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-2.html rename to tests/wpt/tests/mathml/relations/html5-tree/integration-point-2.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-3-ref.html b/tests/wpt/tests/mathml/relations/html5-tree/integration-point-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-3-ref.html rename to tests/wpt/tests/mathml/relations/html5-tree/integration-point-3-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-3.html b/tests/wpt/tests/mathml/relations/html5-tree/integration-point-3.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-3.html rename to tests/wpt/tests/mathml/relations/html5-tree/integration-point-3.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-4.html b/tests/wpt/tests/mathml/relations/html5-tree/integration-point-4.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-4.html rename to tests/wpt/tests/mathml/relations/html5-tree/integration-point-4.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-5.html b/tests/wpt/tests/mathml/relations/html5-tree/integration-point-5.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-5.html rename to tests/wpt/tests/mathml/relations/html5-tree/integration-point-5.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html b/tests/wpt/tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html rename to tests/wpt/tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/required-extensions-2-ref.html b/tests/wpt/tests/mathml/relations/html5-tree/required-extensions-2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/required-extensions-2-ref.html rename to tests/wpt/tests/mathml/relations/html5-tree/required-extensions-2-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/required-extensions-2.html b/tests/wpt/tests/mathml/relations/html5-tree/required-extensions-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/required-extensions-2.html rename to tests/wpt/tests/mathml/relations/html5-tree/required-extensions-2.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/tabindex-001.html b/tests/wpt/tests/mathml/relations/html5-tree/tabindex-001.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/tabindex-001.html rename to tests/wpt/tests/mathml/relations/html5-tree/tabindex-001.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/tabindex-002.html b/tests/wpt/tests/mathml/relations/html5-tree/tabindex-002.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/tabindex-002.html rename to tests/wpt/tests/mathml/relations/html5-tree/tabindex-002.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-1-iframe-1.html b/tests/wpt/tests/mathml/relations/html5-tree/unique-identifier-1-iframe-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-1-iframe-1.html rename to tests/wpt/tests/mathml/relations/html5-tree/unique-identifier-1-iframe-1.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-1-iframe-2.html b/tests/wpt/tests/mathml/relations/html5-tree/unique-identifier-1-iframe-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-1-iframe-2.html rename to tests/wpt/tests/mathml/relations/html5-tree/unique-identifier-1-iframe-2.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-1-ref.html b/tests/wpt/tests/mathml/relations/html5-tree/unique-identifier-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-1-ref.html rename to tests/wpt/tests/mathml/relations/html5-tree/unique-identifier-1-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-1.html b/tests/wpt/tests/mathml/relations/html5-tree/unique-identifier-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-1.html rename to tests/wpt/tests/mathml/relations/html5-tree/unique-identifier-1.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-2.html b/tests/wpt/tests/mathml/relations/html5-tree/unique-identifier-2.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-2.html rename to tests/wpt/tests/mathml/relations/html5-tree/unique-identifier-2.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-3-ref.html b/tests/wpt/tests/mathml/relations/html5-tree/unique-identifier-3-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-3-ref.html rename to tests/wpt/tests/mathml/relations/html5-tree/unique-identifier-3-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-3.html b/tests/wpt/tests/mathml/relations/html5-tree/unique-identifier-3.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-3.html rename to tests/wpt/tests/mathml/relations/html5-tree/unique-identifier-3.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/text-and-math/basic-mathematical-alphanumeric-symbols-with-default-font.html b/tests/wpt/tests/mathml/relations/text-and-math/basic-mathematical-alphanumeric-symbols-with-default-font.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/text-and-math/basic-mathematical-alphanumeric-symbols-with-default-font.html rename to tests/wpt/tests/mathml/relations/text-and-math/basic-mathematical-alphanumeric-symbols-with-default-font.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/text-and-math/use-typo-metrics-1-ref.html b/tests/wpt/tests/mathml/relations/text-and-math/use-typo-metrics-1-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/text-and-math/use-typo-metrics-1-ref.html rename to tests/wpt/tests/mathml/relations/text-and-math/use-typo-metrics-1-ref.html diff --git a/tests/wpt/web-platform-tests/mathml/relations/text-and-math/use-typo-metrics-1.html b/tests/wpt/tests/mathml/relations/text-and-math/use-typo-metrics-1.html similarity index 100% rename from tests/wpt/web-platform-tests/mathml/relations/text-and-math/use-typo-metrics-1.html rename to tests/wpt/tests/mathml/relations/text-and-math/use-typo-metrics-1.html diff --git a/tests/wpt/web-platform-tests/mathml/support/attribute-values.js b/tests/wpt/tests/mathml/support/attribute-values.js similarity index 100% rename from tests/wpt/web-platform-tests/mathml/support/attribute-values.js rename to tests/wpt/tests/mathml/support/attribute-values.js diff --git a/tests/wpt/web-platform-tests/mathml/support/box-comparison.js b/tests/wpt/tests/mathml/support/box-comparison.js similarity index 100% rename from tests/wpt/web-platform-tests/mathml/support/box-comparison.js rename to tests/wpt/tests/mathml/support/box-comparison.js diff --git a/tests/wpt/web-platform-tests/mathml/support/box-navigation.js b/tests/wpt/tests/mathml/support/box-navigation.js similarity index 100% rename from tests/wpt/web-platform-tests/mathml/support/box-navigation.js rename to tests/wpt/tests/mathml/support/box-navigation.js diff --git a/tests/wpt/web-platform-tests/mathml/support/feature-detection-operators.js b/tests/wpt/tests/mathml/support/feature-detection-operators.js similarity index 100% rename from tests/wpt/web-platform-tests/mathml/support/feature-detection-operators.js rename to tests/wpt/tests/mathml/support/feature-detection-operators.js diff --git a/tests/wpt/web-platform-tests/mathml/support/feature-detection.js b/tests/wpt/tests/mathml/support/feature-detection.js similarity index 100% rename from tests/wpt/web-platform-tests/mathml/support/feature-detection.js rename to tests/wpt/tests/mathml/support/feature-detection.js diff --git a/tests/wpt/web-platform-tests/mathml/support/fonts.js b/tests/wpt/tests/mathml/support/fonts.js similarity index 100% rename from tests/wpt/web-platform-tests/mathml/support/fonts.js rename to tests/wpt/tests/mathml/support/fonts.js diff --git a/tests/wpt/web-platform-tests/mathml/support/layout-comparison.js b/tests/wpt/tests/mathml/support/layout-comparison.js similarity index 100% rename from tests/wpt/web-platform-tests/mathml/support/layout-comparison.js rename to tests/wpt/tests/mathml/support/layout-comparison.js diff --git a/tests/wpt/web-platform-tests/mathml/support/mathml-fragments.js b/tests/wpt/tests/mathml/support/mathml-fragments.js similarity index 100% rename from tests/wpt/web-platform-tests/mathml/support/mathml-fragments.js rename to tests/wpt/tests/mathml/support/mathml-fragments.js diff --git a/tests/wpt/web-platform-tests/mathml/support/operator-dictionary.js b/tests/wpt/tests/mathml/support/operator-dictionary.js similarity index 100% rename from tests/wpt/web-platform-tests/mathml/support/operator-dictionary.js rename to tests/wpt/tests/mathml/support/operator-dictionary.js diff --git a/tests/wpt/web-platform-tests/mathml/support/operator-dictionary.json b/tests/wpt/tests/mathml/support/operator-dictionary.json similarity index 100% rename from tests/wpt/web-platform-tests/mathml/support/operator-dictionary.json rename to tests/wpt/tests/mathml/support/operator-dictionary.json diff --git a/tests/wpt/web-platform-tests/mathml/tools/axisheight.py b/tests/wpt/tests/mathml/tools/axisheight.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/axisheight.py rename to tests/wpt/tests/mathml/tools/axisheight.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/fractions.py b/tests/wpt/tests/mathml/tools/fractions.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/fractions.py rename to tests/wpt/tests/mathml/tools/fractions.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/largeop.py b/tests/wpt/tests/mathml/tools/largeop.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/largeop.py rename to tests/wpt/tests/mathml/tools/largeop.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/limits.py b/tests/wpt/tests/mathml/tools/limits.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/limits.py rename to tests/wpt/tests/mathml/tools/limits.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/math-text.py b/tests/wpt/tests/mathml/tools/math-text.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/math-text.py rename to tests/wpt/tests/mathml/tools/math-text.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/mathvariant-transforms.py b/tests/wpt/tests/mathml/tools/mathvariant-transforms.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/mathvariant-transforms.py rename to tests/wpt/tests/mathml/tools/mathvariant-transforms.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/operator-dictionary.py b/tests/wpt/tests/mathml/tools/operator-dictionary.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/operator-dictionary.py rename to tests/wpt/tests/mathml/tools/operator-dictionary.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/operator-dictionary.xsl b/tests/wpt/tests/mathml/tools/operator-dictionary.xsl similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/operator-dictionary.xsl rename to tests/wpt/tests/mathml/tools/operator-dictionary.xsl diff --git a/tests/wpt/web-platform-tests/mathml/tools/percentscaledown.py b/tests/wpt/tests/mathml/tools/percentscaledown.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/percentscaledown.py rename to tests/wpt/tests/mathml/tools/percentscaledown.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/radicals.py b/tests/wpt/tests/mathml/tools/radicals.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/radicals.py rename to tests/wpt/tests/mathml/tools/radicals.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/scripts.py b/tests/wpt/tests/mathml/tools/scripts.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/scripts.py rename to tests/wpt/tests/mathml/tools/scripts.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/stacks.py b/tests/wpt/tests/mathml/tools/stacks.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/stacks.py rename to tests/wpt/tests/mathml/tools/stacks.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/stretchstacks.py b/tests/wpt/tests/mathml/tools/stretchstacks.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/stretchstacks.py rename to tests/wpt/tests/mathml/tools/stretchstacks.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/stretchy-centered-on-baseline.py b/tests/wpt/tests/mathml/tools/stretchy-centered-on-baseline.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/stretchy-centered-on-baseline.py rename to tests/wpt/tests/mathml/tools/stretchy-centered-on-baseline.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/stretchy.py b/tests/wpt/tests/mathml/tools/stretchy.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/stretchy.py rename to tests/wpt/tests/mathml/tools/stretchy.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/underover.py b/tests/wpt/tests/mathml/tools/underover.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/underover.py rename to tests/wpt/tests/mathml/tools/underover.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/use-typo-lineheight.py b/tests/wpt/tests/mathml/tools/use-typo-lineheight.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/use-typo-lineheight.py rename to tests/wpt/tests/mathml/tools/use-typo-lineheight.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/utils/__init__.py b/tests/wpt/tests/mathml/tools/utils/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/utils/__init__.py rename to tests/wpt/tests/mathml/tools/utils/__init__.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/utils/mathfont.py b/tests/wpt/tests/mathml/tools/utils/mathfont.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/utils/mathfont.py rename to tests/wpt/tests/mathml/tools/utils/mathfont.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/utils/misc.py b/tests/wpt/tests/mathml/tools/utils/misc.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/utils/misc.py rename to tests/wpt/tests/mathml/tools/utils/misc.py diff --git a/tests/wpt/web-platform-tests/mathml/tools/xHeight.py b/tests/wpt/tests/mathml/tools/xHeight.py similarity index 100% rename from tests/wpt/web-platform-tests/mathml/tools/xHeight.py rename to tests/wpt/tests/mathml/tools/xHeight.py diff --git a/tests/wpt/web-platform-tests/measure-memory/META.yml b/tests/wpt/tests/measure-memory/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/META.yml rename to tests/wpt/tests/measure-memory/META.yml diff --git a/tests/wpt/web-platform-tests/measure-memory/README.md b/tests/wpt/tests/measure-memory/README.md similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/README.md rename to tests/wpt/tests/measure-memory/README.md diff --git a/tests/wpt/web-platform-tests/measure-memory/detached.https.window.js b/tests/wpt/tests/measure-memory/detached.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/detached.https.window.js rename to tests/wpt/tests/measure-memory/detached.https.window.js diff --git a/tests/wpt/web-platform-tests/measure-memory/detached.https.window.js.headers b/tests/wpt/tests/measure-memory/detached.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/detached.https.window.js.headers rename to tests/wpt/tests/measure-memory/detached.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/idlharness.window.js b/tests/wpt/tests/measure-memory/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/idlharness.window.js rename to tests/wpt/tests/measure-memory/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/measure-memory/iframe.cross-origin.https.window.js b/tests/wpt/tests/measure-memory/iframe.cross-origin.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/iframe.cross-origin.https.window.js rename to tests/wpt/tests/measure-memory/iframe.cross-origin.https.window.js diff --git a/tests/wpt/web-platform-tests/measure-memory/iframe.cross-origin.https.window.js.headers b/tests/wpt/tests/measure-memory/iframe.cross-origin.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/iframe.cross-origin.https.window.js.headers rename to tests/wpt/tests/measure-memory/iframe.cross-origin.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/iframe.cross-site.https.window.js b/tests/wpt/tests/measure-memory/iframe.cross-site.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/iframe.cross-site.https.window.js rename to tests/wpt/tests/measure-memory/iframe.cross-site.https.window.js diff --git a/tests/wpt/web-platform-tests/measure-memory/iframe.cross-site.https.window.js.headers b/tests/wpt/tests/measure-memory/iframe.cross-site.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/iframe.cross-site.https.window.js.headers rename to tests/wpt/tests/measure-memory/iframe.cross-site.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/iframe.same-origin.https.window.js b/tests/wpt/tests/measure-memory/iframe.same-origin.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/iframe.same-origin.https.window.js rename to tests/wpt/tests/measure-memory/iframe.same-origin.https.window.js diff --git a/tests/wpt/web-platform-tests/measure-memory/iframe.same-origin.https.window.js.headers b/tests/wpt/tests/measure-memory/iframe.same-origin.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/iframe.same-origin.https.window.js.headers rename to tests/wpt/tests/measure-memory/iframe.same-origin.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/main-frame-and-worker.https.window.js b/tests/wpt/tests/measure-memory/main-frame-and-worker.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/main-frame-and-worker.https.window.js rename to tests/wpt/tests/measure-memory/main-frame-and-worker.https.window.js diff --git a/tests/wpt/web-platform-tests/measure-memory/main-frame-and-worker.https.window.js.headers b/tests/wpt/tests/measure-memory/main-frame-and-worker.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/main-frame-and-worker.https.window.js.headers rename to tests/wpt/tests/measure-memory/main-frame-and-worker.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/main-frame.https.window.js b/tests/wpt/tests/measure-memory/main-frame.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/main-frame.https.window.js rename to tests/wpt/tests/measure-memory/main-frame.https.window.js diff --git a/tests/wpt/web-platform-tests/measure-memory/main-frame.https.window.js.headers b/tests/wpt/tests/measure-memory/main-frame.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/main-frame.https.window.js.headers rename to tests/wpt/tests/measure-memory/main-frame.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/randomized-breakdown.https.window.js b/tests/wpt/tests/measure-memory/randomized-breakdown.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/randomized-breakdown.https.window.js rename to tests/wpt/tests/measure-memory/randomized-breakdown.https.window.js diff --git a/tests/wpt/web-platform-tests/measure-memory/randomized-breakdown.https.window.js.headers b/tests/wpt/tests/measure-memory/randomized-breakdown.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/randomized-breakdown.https.window.js.headers rename to tests/wpt/tests/measure-memory/randomized-breakdown.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/redirect.client.https.window.js b/tests/wpt/tests/measure-memory/redirect.client.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/redirect.client.https.window.js rename to tests/wpt/tests/measure-memory/redirect.client.https.window.js diff --git a/tests/wpt/web-platform-tests/measure-memory/redirect.client.https.window.js.headers b/tests/wpt/tests/measure-memory/redirect.client.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/redirect.client.https.window.js.headers rename to tests/wpt/tests/measure-memory/redirect.client.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/redirect.server.https.window.js b/tests/wpt/tests/measure-memory/redirect.server.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/redirect.server.https.window.js rename to tests/wpt/tests/measure-memory/redirect.server.https.window.js diff --git a/tests/wpt/web-platform-tests/measure-memory/redirect.server.https.window.js.headers b/tests/wpt/tests/measure-memory/redirect.server.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/redirect.server.https.window.js.headers rename to tests/wpt/tests/measure-memory/redirect.server.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/checker.js b/tests/wpt/tests/measure-memory/resources/checker.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/checker.js rename to tests/wpt/tests/measure-memory/resources/checker.js diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/common.js b/tests/wpt/tests/measure-memory/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/common.js rename to tests/wpt/tests/measure-memory/resources/common.js diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/iframe.redirect.sub.html b/tests/wpt/tests/measure-memory/resources/iframe.redirect.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/iframe.redirect.sub.html rename to tests/wpt/tests/measure-memory/resources/iframe.redirect.sub.html diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/iframe.redirect.sub.html.headers b/tests/wpt/tests/measure-memory/resources/iframe.redirect.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/iframe.redirect.sub.html.headers rename to tests/wpt/tests/measure-memory/resources/iframe.redirect.sub.html.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/iframe.secret.sub.html b/tests/wpt/tests/measure-memory/resources/iframe.secret.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/iframe.secret.sub.html rename to tests/wpt/tests/measure-memory/resources/iframe.secret.sub.html diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/iframe.secret.sub.html.headers b/tests/wpt/tests/measure-memory/resources/iframe.secret.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/iframe.secret.sub.html.headers rename to tests/wpt/tests/measure-memory/resources/iframe.secret.sub.html.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/iframe.sub.html b/tests/wpt/tests/measure-memory/resources/iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/iframe.sub.html rename to tests/wpt/tests/measure-memory/resources/iframe.sub.html diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/iframe.sub.html.headers b/tests/wpt/tests/measure-memory/resources/iframe.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/iframe.sub.html.headers rename to tests/wpt/tests/measure-memory/resources/iframe.sub.html.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/redirect.py b/tests/wpt/tests/measure-memory/resources/redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/redirect.py rename to tests/wpt/tests/measure-memory/resources/redirect.py diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/window.redirect.sub.html b/tests/wpt/tests/measure-memory/resources/window.redirect.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/window.redirect.sub.html rename to tests/wpt/tests/measure-memory/resources/window.redirect.sub.html diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/window.redirect.sub.html.headers b/tests/wpt/tests/measure-memory/resources/window.redirect.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/window.redirect.sub.html.headers rename to tests/wpt/tests/measure-memory/resources/window.redirect.sub.html.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/window.secret.sub.html b/tests/wpt/tests/measure-memory/resources/window.secret.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/window.secret.sub.html rename to tests/wpt/tests/measure-memory/resources/window.secret.sub.html diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/window.secret.sub.html.headers b/tests/wpt/tests/measure-memory/resources/window.secret.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/window.secret.sub.html.headers rename to tests/wpt/tests/measure-memory/resources/window.secret.sub.html.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/window.sub.html b/tests/wpt/tests/measure-memory/resources/window.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/window.sub.html rename to tests/wpt/tests/measure-memory/resources/window.sub.html diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/window.sub.html.headers b/tests/wpt/tests/measure-memory/resources/window.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/window.sub.html.headers rename to tests/wpt/tests/measure-memory/resources/window.sub.html.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/worker.js b/tests/wpt/tests/measure-memory/resources/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/worker.js rename to tests/wpt/tests/measure-memory/resources/worker.js diff --git a/tests/wpt/web-platform-tests/measure-memory/resources/worker.js.headers b/tests/wpt/tests/measure-memory/resources/worker.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/resources/worker.js.headers rename to tests/wpt/tests/measure-memory/resources/worker.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/service-worker.https.any.js b/tests/wpt/tests/measure-memory/service-worker.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/service-worker.https.any.js rename to tests/wpt/tests/measure-memory/service-worker.https.any.js diff --git a/tests/wpt/web-platform-tests/measure-memory/service-worker.https.any.js.headers b/tests/wpt/tests/measure-memory/service-worker.https.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/service-worker.https.any.js.headers rename to tests/wpt/tests/measure-memory/service-worker.https.any.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/shared-worker.https.any.js b/tests/wpt/tests/measure-memory/shared-worker.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/shared-worker.https.any.js rename to tests/wpt/tests/measure-memory/shared-worker.https.any.js diff --git a/tests/wpt/web-platform-tests/measure-memory/shared-worker.https.any.js.headers b/tests/wpt/tests/measure-memory/shared-worker.https.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/shared-worker.https.any.js.headers rename to tests/wpt/tests/measure-memory/shared-worker.https.any.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.cross-origin.https.window.js b/tests/wpt/tests/measure-memory/window-open.cross-origin.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/window-open.cross-origin.https.window.js rename to tests/wpt/tests/measure-memory/window-open.cross-origin.https.window.js diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.cross-origin.https.window.js.headers b/tests/wpt/tests/measure-memory/window-open.cross-origin.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/window-open.cross-origin.https.window.js.headers rename to tests/wpt/tests/measure-memory/window-open.cross-origin.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.cross-site.https.window.js b/tests/wpt/tests/measure-memory/window-open.cross-site.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/window-open.cross-site.https.window.js rename to tests/wpt/tests/measure-memory/window-open.cross-site.https.window.js diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.cross-site.https.window.js.headers b/tests/wpt/tests/measure-memory/window-open.cross-site.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/window-open.cross-site.https.window.js.headers rename to tests/wpt/tests/measure-memory/window-open.cross-site.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.mix.https.window.js b/tests/wpt/tests/measure-memory/window-open.mix.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/window-open.mix.https.window.js rename to tests/wpt/tests/measure-memory/window-open.mix.https.window.js diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.mix.https.window.js.headers b/tests/wpt/tests/measure-memory/window-open.mix.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/window-open.mix.https.window.js.headers rename to tests/wpt/tests/measure-memory/window-open.mix.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.same-origin.https.window.js b/tests/wpt/tests/measure-memory/window-open.same-origin.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/window-open.same-origin.https.window.js rename to tests/wpt/tests/measure-memory/window-open.same-origin.https.window.js diff --git a/tests/wpt/web-platform-tests/measure-memory/window-open.same-origin.https.window.js.headers b/tests/wpt/tests/measure-memory/window-open.same-origin.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/measure-memory/window-open.same-origin.https.window.js.headers rename to tests/wpt/tests/measure-memory/window-open.same-origin.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/media-capabilities/META.yml b/tests/wpt/tests/media-capabilities/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/media-capabilities/META.yml rename to tests/wpt/tests/media-capabilities/META.yml diff --git a/tests/wpt/web-platform-tests/media-capabilities/README.md b/tests/wpt/tests/media-capabilities/README.md similarity index 100% rename from tests/wpt/web-platform-tests/media-capabilities/README.md rename to tests/wpt/tests/media-capabilities/README.md diff --git a/tests/wpt/web-platform-tests/media-capabilities/decodingInfo.any.js b/tests/wpt/tests/media-capabilities/decodingInfo.any.js similarity index 100% rename from tests/wpt/web-platform-tests/media-capabilities/decodingInfo.any.js rename to tests/wpt/tests/media-capabilities/decodingInfo.any.js diff --git a/tests/wpt/web-platform-tests/media-capabilities/decodingInfo.webrtc.html b/tests/wpt/tests/media-capabilities/decodingInfo.webrtc.html similarity index 100% rename from tests/wpt/web-platform-tests/media-capabilities/decodingInfo.webrtc.html rename to tests/wpt/tests/media-capabilities/decodingInfo.webrtc.html diff --git a/tests/wpt/web-platform-tests/media-capabilities/decodingInfoEncryptedMedia.http.html b/tests/wpt/tests/media-capabilities/decodingInfoEncryptedMedia.http.html similarity index 100% rename from tests/wpt/web-platform-tests/media-capabilities/decodingInfoEncryptedMedia.http.html rename to tests/wpt/tests/media-capabilities/decodingInfoEncryptedMedia.http.html diff --git a/tests/wpt/web-platform-tests/media-capabilities/decodingInfoEncryptedMedia.https.html b/tests/wpt/tests/media-capabilities/decodingInfoEncryptedMedia.https.html similarity index 100% rename from tests/wpt/web-platform-tests/media-capabilities/decodingInfoEncryptedMedia.https.html rename to tests/wpt/tests/media-capabilities/decodingInfoEncryptedMedia.https.html diff --git a/tests/wpt/web-platform-tests/media-capabilities/encodingInfo.any.js b/tests/wpt/tests/media-capabilities/encodingInfo.any.js similarity index 100% rename from tests/wpt/web-platform-tests/media-capabilities/encodingInfo.any.js rename to tests/wpt/tests/media-capabilities/encodingInfo.any.js diff --git a/tests/wpt/web-platform-tests/media-capabilities/encodingInfo.webrtc.html b/tests/wpt/tests/media-capabilities/encodingInfo.webrtc.html similarity index 100% rename from tests/wpt/web-platform-tests/media-capabilities/encodingInfo.webrtc.html rename to tests/wpt/tests/media-capabilities/encodingInfo.webrtc.html diff --git a/tests/wpt/web-platform-tests/media-capabilities/idlharness.any.js b/tests/wpt/tests/media-capabilities/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/media-capabilities/idlharness.any.js rename to tests/wpt/tests/media-capabilities/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/media-playback-quality/META.yml b/tests/wpt/tests/media-playback-quality/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/media-playback-quality/META.yml rename to tests/wpt/tests/media-playback-quality/META.yml diff --git a/tests/wpt/web-platform-tests/media-playback-quality/idlharness.window.js b/tests/wpt/tests/media-playback-quality/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/media-playback-quality/idlharness.window.js rename to tests/wpt/tests/media-playback-quality/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/media-source/META.yml b/tests/wpt/tests/media-source/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/media-source/META.yml rename to tests/wpt/tests/media-source/META.yml diff --git a/tests/wpt/web-platform-tests/media-source/SourceBuffer-abort-readyState.html b/tests/wpt/tests/media-source/SourceBuffer-abort-readyState.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/SourceBuffer-abort-readyState.html rename to tests/wpt/tests/media-source/SourceBuffer-abort-readyState.html diff --git a/tests/wpt/web-platform-tests/media-source/SourceBuffer-abort-removed.html b/tests/wpt/tests/media-source/SourceBuffer-abort-removed.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/SourceBuffer-abort-removed.html rename to tests/wpt/tests/media-source/SourceBuffer-abort-removed.html diff --git a/tests/wpt/web-platform-tests/media-source/SourceBuffer-abort-updating.html b/tests/wpt/tests/media-source/SourceBuffer-abort-updating.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/SourceBuffer-abort-updating.html rename to tests/wpt/tests/media-source/SourceBuffer-abort-updating.html diff --git a/tests/wpt/web-platform-tests/media-source/SourceBuffer-abort.html b/tests/wpt/tests/media-source/SourceBuffer-abort.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/SourceBuffer-abort.html rename to tests/wpt/tests/media-source/SourceBuffer-abort.html diff --git a/tests/wpt/web-platform-tests/media-source/URL-createObjectURL-null.html b/tests/wpt/tests/media-source/URL-createObjectURL-null.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/URL-createObjectURL-null.html rename to tests/wpt/tests/media-source/URL-createObjectURL-null.html diff --git a/tests/wpt/web-platform-tests/media-source/URL-createObjectURL-revoke.html b/tests/wpt/tests/media-source/URL-createObjectURL-revoke.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/URL-createObjectURL-revoke.html rename to tests/wpt/tests/media-source/URL-createObjectURL-revoke.html diff --git a/tests/wpt/web-platform-tests/media-source/URL-createObjectURL.html b/tests/wpt/tests/media-source/URL-createObjectURL.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/URL-createObjectURL.html rename to tests/wpt/tests/media-source/URL-createObjectURL.html diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-message-util.js b/tests/wpt/tests/media-source/dedicated-worker/mediasource-message-util.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-message-util.js rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-message-util.js diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-detach-element.html b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-detach-element.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-detach-element.html rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-detach-element.html diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-detach-element.js b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-detach-element.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-detach-element.js rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-detach-element.js diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-duration.html b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-duration.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-duration.html rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-duration.html diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-duration.js b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-duration.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-duration.js rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-duration.js diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-get-objecturl.js b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-get-objecturl.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-get-objecturl.js rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-get-objecturl.js diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-handle-transfer-to-main.js b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-handle-transfer-to-main.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-handle-transfer-to-main.js rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-handle-transfer-to-main.js diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-handle-transfer.html b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-handle-transfer.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-handle-transfer.html rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-handle-transfer.html diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-handle-transfer.js b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-handle-transfer.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-handle-transfer.js rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-handle-transfer.js diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-handle.html b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-handle.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-handle.html rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-handle.html diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-handle.js b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-handle.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-handle.js rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-handle.js diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-must-fail-if-unsupported.js b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-must-fail-if-unsupported.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-must-fail-if-unsupported.js rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-must-fail-if-unsupported.js diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-objecturl.html b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-objecturl.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-objecturl.html rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-objecturl.html diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-objecturl.js b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-objecturl.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-objecturl.js rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-objecturl.js diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.html b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.html rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.html diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.js b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.js rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.js diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-play.html b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-play.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-play.html rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-play.html diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-play.js b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-play.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-play.js rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-play.js diff --git a/tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-util.js b/tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-util.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/dedicated-worker/mediasource-worker-util.js rename to tests/wpt/tests/media-source/dedicated-worker/mediasource-worker-util.js diff --git a/tests/wpt/web-platform-tests/media-source/generate-config-change-tests.py b/tests/wpt/tests/media-source/generate-config-change-tests.py similarity index 100% rename from tests/wpt/web-platform-tests/media-source/generate-config-change-tests.py rename to tests/wpt/tests/media-source/generate-config-change-tests.py diff --git a/tests/wpt/web-platform-tests/media-source/idlharness.window.js b/tests/wpt/tests/media-source/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/idlharness.window.js rename to tests/wpt/tests/media-source/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/media-source/import_tests.sh b/tests/wpt/tests/media-source/import_tests.sh similarity index 100% rename from tests/wpt/web-platform-tests/media-source/import_tests.sh rename to tests/wpt/tests/media-source/import_tests.sh diff --git a/tests/wpt/web-platform-tests/media-source/manifest.txt b/tests/wpt/tests/media-source/manifest.txt similarity index 100% rename from tests/wpt/web-platform-tests/media-source/manifest.txt rename to tests/wpt/tests/media-source/manifest.txt diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-activesourcebuffers.html b/tests/wpt/tests/media-source/mediasource-activesourcebuffers.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-activesourcebuffers.html rename to tests/wpt/tests/media-source/mediasource-activesourcebuffers.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-addsourcebuffer-mode.html b/tests/wpt/tests/media-source/mediasource-addsourcebuffer-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-addsourcebuffer-mode.html rename to tests/wpt/tests/media-source/mediasource-addsourcebuffer-mode.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-addsourcebuffer.html b/tests/wpt/tests/media-source/mediasource-addsourcebuffer.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-addsourcebuffer.html rename to tests/wpt/tests/media-source/mediasource-addsourcebuffer.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-append-buffer.html b/tests/wpt/tests/media-source/mediasource-append-buffer.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-append-buffer.html rename to tests/wpt/tests/media-source/mediasource-append-buffer.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-appendbuffer-quota-exceeded.html b/tests/wpt/tests/media-source/mediasource-appendbuffer-quota-exceeded.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-appendbuffer-quota-exceeded.html rename to tests/wpt/tests/media-source/mediasource-appendbuffer-quota-exceeded.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-appendwindow.html b/tests/wpt/tests/media-source/mediasource-appendwindow.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-appendwindow.html rename to tests/wpt/tests/media-source/mediasource-appendwindow.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-attach-stops-delaying-load-event.html b/tests/wpt/tests/media-source/mediasource-attach-stops-delaying-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-attach-stops-delaying-load-event.html rename to tests/wpt/tests/media-source/mediasource-attach-stops-delaying-load-event.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-avtracks.html b/tests/wpt/tests/media-source/mediasource-avtracks.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-avtracks.html rename to tests/wpt/tests/media-source/mediasource-avtracks.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-buffered.html b/tests/wpt/tests/media-source/mediasource-buffered.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-buffered.html rename to tests/wpt/tests/media-source/mediasource-buffered.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-changetype-play-implicit.html b/tests/wpt/tests/media-source/mediasource-changetype-play-implicit.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-changetype-play-implicit.html rename to tests/wpt/tests/media-source/mediasource-changetype-play-implicit.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-changetype-play-negative.html b/tests/wpt/tests/media-source/mediasource-changetype-play-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-changetype-play-negative.html rename to tests/wpt/tests/media-source/mediasource-changetype-play-negative.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-changetype-play-without-codecs-parameter.html b/tests/wpt/tests/media-source/mediasource-changetype-play-without-codecs-parameter.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-changetype-play-without-codecs-parameter.html rename to tests/wpt/tests/media-source/mediasource-changetype-play-without-codecs-parameter.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-changetype-play.html b/tests/wpt/tests/media-source/mediasource-changetype-play.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-changetype-play.html rename to tests/wpt/tests/media-source/mediasource-changetype-play.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-changetype-util.js b/tests/wpt/tests/media-source/mediasource-changetype-util.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-changetype-util.js rename to tests/wpt/tests/media-source/mediasource-changetype-util.js diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-changetype.html b/tests/wpt/tests/media-source/mediasource-changetype.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-changetype.html rename to tests/wpt/tests/media-source/mediasource-changetype.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-closed.html b/tests/wpt/tests/media-source/mediasource-closed.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-closed.html rename to tests/wpt/tests/media-source/mediasource-closed.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-change-mp4-a-bitrate.html b/tests/wpt/tests/media-source/mediasource-config-change-mp4-a-bitrate.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-change-mp4-a-bitrate.html rename to tests/wpt/tests/media-source/mediasource-config-change-mp4-a-bitrate.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-change-mp4-av-audio-bitrate.html b/tests/wpt/tests/media-source/mediasource-config-change-mp4-av-audio-bitrate.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-change-mp4-av-audio-bitrate.html rename to tests/wpt/tests/media-source/mediasource-config-change-mp4-av-audio-bitrate.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-change-mp4-av-framesize.html b/tests/wpt/tests/media-source/mediasource-config-change-mp4-av-framesize.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-change-mp4-av-framesize.html rename to tests/wpt/tests/media-source/mediasource-config-change-mp4-av-framesize.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-change-mp4-av-video-bitrate.html b/tests/wpt/tests/media-source/mediasource-config-change-mp4-av-video-bitrate.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-change-mp4-av-video-bitrate.html rename to tests/wpt/tests/media-source/mediasource-config-change-mp4-av-video-bitrate.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-change-mp4-v-bitrate.html b/tests/wpt/tests/media-source/mediasource-config-change-mp4-v-bitrate.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-change-mp4-v-bitrate.html rename to tests/wpt/tests/media-source/mediasource-config-change-mp4-v-bitrate.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-change-mp4-v-framerate.html b/tests/wpt/tests/media-source/mediasource-config-change-mp4-v-framerate.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-change-mp4-v-framerate.html rename to tests/wpt/tests/media-source/mediasource-config-change-mp4-v-framerate.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-change-mp4-v-framesize.html b/tests/wpt/tests/media-source/mediasource-config-change-mp4-v-framesize.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-change-mp4-v-framesize.html rename to tests/wpt/tests/media-source/mediasource-config-change-mp4-v-framesize.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-change-webm-a-bitrate.html b/tests/wpt/tests/media-source/mediasource-config-change-webm-a-bitrate.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-change-webm-a-bitrate.html rename to tests/wpt/tests/media-source/mediasource-config-change-webm-a-bitrate.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-change-webm-av-audio-bitrate.html b/tests/wpt/tests/media-source/mediasource-config-change-webm-av-audio-bitrate.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-change-webm-av-audio-bitrate.html rename to tests/wpt/tests/media-source/mediasource-config-change-webm-av-audio-bitrate.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-change-webm-av-framesize.html b/tests/wpt/tests/media-source/mediasource-config-change-webm-av-framesize.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-change-webm-av-framesize.html rename to tests/wpt/tests/media-source/mediasource-config-change-webm-av-framesize.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-change-webm-av-video-bitrate.html b/tests/wpt/tests/media-source/mediasource-config-change-webm-av-video-bitrate.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-change-webm-av-video-bitrate.html rename to tests/wpt/tests/media-source/mediasource-config-change-webm-av-video-bitrate.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-change-webm-v-bitrate.html b/tests/wpt/tests/media-source/mediasource-config-change-webm-v-bitrate.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-change-webm-v-bitrate.html rename to tests/wpt/tests/media-source/mediasource-config-change-webm-v-bitrate.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-change-webm-v-framerate.html b/tests/wpt/tests/media-source/mediasource-config-change-webm-v-framerate.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-change-webm-v-framerate.html rename to tests/wpt/tests/media-source/mediasource-config-change-webm-v-framerate.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-change-webm-v-framesize.html b/tests/wpt/tests/media-source/mediasource-config-change-webm-v-framesize.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-change-webm-v-framesize.html rename to tests/wpt/tests/media-source/mediasource-config-change-webm-v-framesize.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-config-changes.js b/tests/wpt/tests/media-source/mediasource-config-changes.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-config-changes.js rename to tests/wpt/tests/media-source/mediasource-config-changes.js diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-correct-frames-after-reappend.html b/tests/wpt/tests/media-source/mediasource-correct-frames-after-reappend.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-correct-frames-after-reappend.html rename to tests/wpt/tests/media-source/mediasource-correct-frames-after-reappend.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-correct-frames.html b/tests/wpt/tests/media-source/mediasource-correct-frames.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-correct-frames.html rename to tests/wpt/tests/media-source/mediasource-correct-frames.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-detach.html b/tests/wpt/tests/media-source/mediasource-detach.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-detach.html rename to tests/wpt/tests/media-source/mediasource-detach.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-duration-boundaryconditions.html b/tests/wpt/tests/media-source/mediasource-duration-boundaryconditions.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-duration-boundaryconditions.html rename to tests/wpt/tests/media-source/mediasource-duration-boundaryconditions.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-duration.html b/tests/wpt/tests/media-source/mediasource-duration.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-duration.html rename to tests/wpt/tests/media-source/mediasource-duration.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-endofstream-invaliderror.html b/tests/wpt/tests/media-source/mediasource-endofstream-invaliderror.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-endofstream-invaliderror.html rename to tests/wpt/tests/media-source/mediasource-endofstream-invaliderror.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-endofstream.html b/tests/wpt/tests/media-source/mediasource-endofstream.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-endofstream.html rename to tests/wpt/tests/media-source/mediasource-endofstream.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-errors.html b/tests/wpt/tests/media-source/mediasource-errors.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-errors.html rename to tests/wpt/tests/media-source/mediasource-errors.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-getvideoplaybackquality.html b/tests/wpt/tests/media-source/mediasource-getvideoplaybackquality.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-getvideoplaybackquality.html rename to tests/wpt/tests/media-source/mediasource-getvideoplaybackquality.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-h264-play-starved.html b/tests/wpt/tests/media-source/mediasource-h264-play-starved.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-h264-play-starved.html rename to tests/wpt/tests/media-source/mediasource-h264-play-starved.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-invalid-codec.html b/tests/wpt/tests/media-source/mediasource-invalid-codec.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-invalid-codec.html rename to tests/wpt/tests/media-source/mediasource-invalid-codec.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-is-type-supported.html b/tests/wpt/tests/media-source/mediasource-is-type-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-is-type-supported.html rename to tests/wpt/tests/media-source/mediasource-is-type-supported.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-liveseekable.html b/tests/wpt/tests/media-source/mediasource-liveseekable.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-liveseekable.html rename to tests/wpt/tests/media-source/mediasource-liveseekable.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-multiple-attach.html b/tests/wpt/tests/media-source/mediasource-multiple-attach.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-multiple-attach.html rename to tests/wpt/tests/media-source/mediasource-multiple-attach.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-play-then-seek-back.html b/tests/wpt/tests/media-source/mediasource-play-then-seek-back.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-play-then-seek-back.html rename to tests/wpt/tests/media-source/mediasource-play-then-seek-back.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-play.html b/tests/wpt/tests/media-source/mediasource-play.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-play.html rename to tests/wpt/tests/media-source/mediasource-play.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-preload.html b/tests/wpt/tests/media-source/mediasource-preload.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-preload.html rename to tests/wpt/tests/media-source/mediasource-preload.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-redundant-seek.html b/tests/wpt/tests/media-source/mediasource-redundant-seek.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-redundant-seek.html rename to tests/wpt/tests/media-source/mediasource-redundant-seek.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-remove.html b/tests/wpt/tests/media-source/mediasource-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-remove.html rename to tests/wpt/tests/media-source/mediasource-remove.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-removesourcebuffer.html b/tests/wpt/tests/media-source/mediasource-removesourcebuffer.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-removesourcebuffer.html rename to tests/wpt/tests/media-source/mediasource-removesourcebuffer.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-replay.html b/tests/wpt/tests/media-source/mediasource-replay.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-replay.html rename to tests/wpt/tests/media-source/mediasource-replay.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-seek-beyond-duration.html b/tests/wpt/tests/media-source/mediasource-seek-beyond-duration.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-seek-beyond-duration.html rename to tests/wpt/tests/media-source/mediasource-seek-beyond-duration.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-seek-during-pending-seek.html b/tests/wpt/tests/media-source/mediasource-seek-during-pending-seek.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-seek-during-pending-seek.html rename to tests/wpt/tests/media-source/mediasource-seek-during-pending-seek.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-seekable.html b/tests/wpt/tests/media-source/mediasource-seekable.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-seekable.html rename to tests/wpt/tests/media-source/mediasource-seekable.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-sequencemode-append-buffer.html b/tests/wpt/tests/media-source/mediasource-sequencemode-append-buffer.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-sequencemode-append-buffer.html rename to tests/wpt/tests/media-source/mediasource-sequencemode-append-buffer.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-sourcebuffer-mode-timestamps.html b/tests/wpt/tests/media-source/mediasource-sourcebuffer-mode-timestamps.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-sourcebuffer-mode-timestamps.html rename to tests/wpt/tests/media-source/mediasource-sourcebuffer-mode-timestamps.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-sourcebuffer-mode.html b/tests/wpt/tests/media-source/mediasource-sourcebuffer-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-sourcebuffer-mode.html rename to tests/wpt/tests/media-source/mediasource-sourcebuffer-mode.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-sourcebuffer-trackdefaults.html b/tests/wpt/tests/media-source/mediasource-sourcebuffer-trackdefaults.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-sourcebuffer-trackdefaults.html rename to tests/wpt/tests/media-source/mediasource-sourcebuffer-trackdefaults.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-sourcebufferlist.html b/tests/wpt/tests/media-source/mediasource-sourcebufferlist.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-sourcebufferlist.html rename to tests/wpt/tests/media-source/mediasource-sourcebufferlist.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-timestamp-offset.html b/tests/wpt/tests/media-source/mediasource-timestamp-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-timestamp-offset.html rename to tests/wpt/tests/media-source/mediasource-timestamp-offset.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-trackdefault.html b/tests/wpt/tests/media-source/mediasource-trackdefault.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-trackdefault.html rename to tests/wpt/tests/media-source/mediasource-trackdefault.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-trackdefaultlist.html b/tests/wpt/tests/media-source/mediasource-trackdefaultlist.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-trackdefaultlist.html rename to tests/wpt/tests/media-source/mediasource-trackdefaultlist.html diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-util.js b/tests/wpt/tests/media-source/mediasource-util.js similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mediasource-util.js rename to tests/wpt/tests/media-source/mediasource-util.js diff --git a/tests/wpt/web-platform-tests/media-source/mp3/sound_5.mp3 b/tests/wpt/tests/media-source/mp3/sound_5.mp3 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp3/sound_5.mp3 rename to tests/wpt/tests/media-source/mp3/sound_5.mp3 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/h264-starvation-init.mp4 b/tests/wpt/tests/media-source/mp4/h264-starvation-init.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/h264-starvation-init.mp4 rename to tests/wpt/tests/media-source/mp4/h264-starvation-init.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/h264-starvation-media.mp4 b/tests/wpt/tests/media-source/mp4/h264-starvation-media.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/h264-starvation-media.mp4 rename to tests/wpt/tests/media-source/mp4/h264-starvation-media.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/invalid-codec.mp4 b/tests/wpt/tests/media-source/mp4/invalid-codec.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/invalid-codec.mp4 rename to tests/wpt/tests/media-source/mp4/invalid-codec.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-a-128k-44100Hz-1ch-manifest.json b/tests/wpt/tests/media-source/mp4/test-a-128k-44100Hz-1ch-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-a-128k-44100Hz-1ch-manifest.json rename to tests/wpt/tests/media-source/mp4/test-a-128k-44100Hz-1ch-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-a-128k-44100Hz-1ch.mp4 b/tests/wpt/tests/media-source/mp4/test-a-128k-44100Hz-1ch.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-a-128k-44100Hz-1ch.mp4 rename to tests/wpt/tests/media-source/mp4/test-a-128k-44100Hz-1ch.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-a-192k-44100Hz-1ch-manifest.json b/tests/wpt/tests/media-source/mp4/test-a-192k-44100Hz-1ch-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-a-192k-44100Hz-1ch-manifest.json rename to tests/wpt/tests/media-source/mp4/test-a-192k-44100Hz-1ch-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-a-192k-44100Hz-1ch.mp4 b/tests/wpt/tests/media-source/mp4/test-a-192k-44100Hz-1ch.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-a-192k-44100Hz-1ch.mp4 rename to tests/wpt/tests/media-source/mp4/test-a-192k-44100Hz-1ch.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json rename to tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.mp4 b/tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.mp4 rename to tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json rename to tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.mp4 b/tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.mp4 rename to tests/wpt/tests/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json rename to tests/wpt/tests/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.mp4 b/tests/wpt/tests/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.mp4 rename to tests/wpt/tests/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json rename to tests/wpt/tests/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.mp4 b/tests/wpt/tests/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.mp4 rename to tests/wpt/tests/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-boxes-audio.mp4 b/tests/wpt/tests/media-source/mp4/test-boxes-audio.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-boxes-audio.mp4 rename to tests/wpt/tests/media-source/mp4/test-boxes-audio.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-boxes-video.mp4 b/tests/wpt/tests/media-source/mp4/test-boxes-video.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-boxes-video.mp4 rename to tests/wpt/tests/media-source/mp4/test-boxes-video.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-v-128k-320x240-24fps-8kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-v-128k-320x240-24fps-8kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-v-128k-320x240-24fps-8kfr-manifest.json rename to tests/wpt/tests/media-source/mp4/test-v-128k-320x240-24fps-8kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-v-128k-320x240-24fps-8kfr.mp4 b/tests/wpt/tests/media-source/mp4/test-v-128k-320x240-24fps-8kfr.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-v-128k-320x240-24fps-8kfr.mp4 rename to tests/wpt/tests/media-source/mp4/test-v-128k-320x240-24fps-8kfr.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-v-128k-320x240-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-v-128k-320x240-30fps-10kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-v-128k-320x240-30fps-10kfr-manifest.json rename to tests/wpt/tests/media-source/mp4/test-v-128k-320x240-30fps-10kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-v-128k-320x240-30fps-10kfr.mp4 b/tests/wpt/tests/media-source/mp4/test-v-128k-320x240-30fps-10kfr.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-v-128k-320x240-30fps-10kfr.mp4 rename to tests/wpt/tests/media-source/mp4/test-v-128k-320x240-30fps-10kfr.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-v-128k-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-v-128k-640x480-30fps-10kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-v-128k-640x480-30fps-10kfr-manifest.json rename to tests/wpt/tests/media-source/mp4/test-v-128k-640x480-30fps-10kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-v-128k-640x480-30fps-10kfr.mp4 b/tests/wpt/tests/media-source/mp4/test-v-128k-640x480-30fps-10kfr.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-v-128k-640x480-30fps-10kfr.mp4 rename to tests/wpt/tests/media-source/mp4/test-v-128k-640x480-30fps-10kfr.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-v-256k-320x240-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/mp4/test-v-256k-320x240-30fps-10kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-v-256k-320x240-30fps-10kfr-manifest.json rename to tests/wpt/tests/media-source/mp4/test-v-256k-320x240-30fps-10kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test-v-256k-320x240-30fps-10kfr.mp4 b/tests/wpt/tests/media-source/mp4/test-v-256k-320x240-30fps-10kfr.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test-v-256k-320x240-30fps-10kfr.mp4 rename to tests/wpt/tests/media-source/mp4/test-v-256k-320x240-30fps-10kfr.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mp4/test.mp4 b/tests/wpt/tests/media-source/mp4/test.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mp4/test.mp4 rename to tests/wpt/tests/media-source/mp4/test.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-addsourcebuffer.html b/tests/wpt/tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-addsourcebuffer.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-addsourcebuffer.html rename to tests/wpt/tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-addsourcebuffer.html diff --git a/tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-appendencodedchunks-play.html b/tests/wpt/tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-appendencodedchunks-play.html similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-appendencodedchunks-play.html rename to tests/wpt/tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-appendencodedchunks-play.html diff --git a/tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/vp9.mp4 b/tests/wpt/tests/media-source/mse-for-webcodecs/tentative/vp9.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/vp9.mp4 rename to tests/wpt/tests/media-source/mse-for-webcodecs/tentative/vp9.mp4 diff --git a/tests/wpt/web-platform-tests/media-source/webm/invalid-codec.webm b/tests/wpt/tests/media-source/webm/invalid-codec.webm similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/invalid-codec.webm rename to tests/wpt/tests/media-source/webm/invalid-codec.webm diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-a-128k-44100Hz-1ch-manifest.json b/tests/wpt/tests/media-source/webm/test-a-128k-44100Hz-1ch-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-a-128k-44100Hz-1ch-manifest.json rename to tests/wpt/tests/media-source/webm/test-a-128k-44100Hz-1ch-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-a-128k-44100Hz-1ch.webm b/tests/wpt/tests/media-source/webm/test-a-128k-44100Hz-1ch.webm similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-a-128k-44100Hz-1ch.webm rename to tests/wpt/tests/media-source/webm/test-a-128k-44100Hz-1ch.webm diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-a-192k-44100Hz-1ch-manifest.json b/tests/wpt/tests/media-source/webm/test-a-192k-44100Hz-1ch-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-a-192k-44100Hz-1ch-manifest.json rename to tests/wpt/tests/media-source/webm/test-a-192k-44100Hz-1ch-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-a-192k-44100Hz-1ch.webm b/tests/wpt/tests/media-source/webm/test-a-192k-44100Hz-1ch.webm similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-a-192k-44100Hz-1ch.webm rename to tests/wpt/tests/media-source/webm/test-a-192k-44100Hz-1ch.webm diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json rename to tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm b/tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm rename to tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json rename to tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.webm b/tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.webm similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.webm rename to tests/wpt/tests/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.webm diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json rename to tests/wpt/tests/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.webm b/tests/wpt/tests/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.webm similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.webm rename to tests/wpt/tests/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.webm diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json rename to tests/wpt/tests/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.webm b/tests/wpt/tests/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.webm similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.webm rename to tests/wpt/tests/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.webm diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-v-128k-320x240-24fps-8kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-v-128k-320x240-24fps-8kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-v-128k-320x240-24fps-8kfr-manifest.json rename to tests/wpt/tests/media-source/webm/test-v-128k-320x240-24fps-8kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-v-128k-320x240-24fps-8kfr.webm b/tests/wpt/tests/media-source/webm/test-v-128k-320x240-24fps-8kfr.webm similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-v-128k-320x240-24fps-8kfr.webm rename to tests/wpt/tests/media-source/webm/test-v-128k-320x240-24fps-8kfr.webm diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-v-128k-320x240-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-v-128k-320x240-30fps-10kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-v-128k-320x240-30fps-10kfr-manifest.json rename to tests/wpt/tests/media-source/webm/test-v-128k-320x240-30fps-10kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-v-128k-320x240-30fps-10kfr.webm b/tests/wpt/tests/media-source/webm/test-v-128k-320x240-30fps-10kfr.webm similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-v-128k-320x240-30fps-10kfr.webm rename to tests/wpt/tests/media-source/webm/test-v-128k-320x240-30fps-10kfr.webm diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-v-128k-640x480-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-v-128k-640x480-30fps-10kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-v-128k-640x480-30fps-10kfr-manifest.json rename to tests/wpt/tests/media-source/webm/test-v-128k-640x480-30fps-10kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-v-128k-640x480-30fps-10kfr.webm b/tests/wpt/tests/media-source/webm/test-v-128k-640x480-30fps-10kfr.webm similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-v-128k-640x480-30fps-10kfr.webm rename to tests/wpt/tests/media-source/webm/test-v-128k-640x480-30fps-10kfr.webm diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-v-256k-320x240-30fps-10kfr-manifest.json b/tests/wpt/tests/media-source/webm/test-v-256k-320x240-30fps-10kfr-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-v-256k-320x240-30fps-10kfr-manifest.json rename to tests/wpt/tests/media-source/webm/test-v-256k-320x240-30fps-10kfr-manifest.json diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-v-256k-320x240-30fps-10kfr.webm b/tests/wpt/tests/media-source/webm/test-v-256k-320x240-30fps-10kfr.webm similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-v-256k-320x240-30fps-10kfr.webm rename to tests/wpt/tests/media-source/webm/test-v-256k-320x240-30fps-10kfr.webm diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-vp8-vorbis-webvtt.webm b/tests/wpt/tests/media-source/webm/test-vp8-vorbis-webvtt.webm similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-vp8-vorbis-webvtt.webm rename to tests/wpt/tests/media-source/webm/test-vp8-vorbis-webvtt.webm diff --git a/tests/wpt/web-platform-tests/media-source/webm/test-vp9.webm b/tests/wpt/tests/media-source/webm/test-vp9.webm similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test-vp9.webm rename to tests/wpt/tests/media-source/webm/test-vp9.webm diff --git a/tests/wpt/web-platform-tests/media-source/webm/test.webm b/tests/wpt/tests/media-source/webm/test.webm similarity index 100% rename from tests/wpt/web-platform-tests/media-source/webm/test.webm rename to tests/wpt/tests/media-source/webm/test.webm diff --git a/tests/wpt/web-platform-tests/media/1x1-green.png b/tests/wpt/tests/media/1x1-green.png similarity index 100% rename from tests/wpt/web-platform-tests/media/1x1-green.png rename to tests/wpt/tests/media/1x1-green.png diff --git a/tests/wpt/web-platform-tests/media/2048x1360-random.jpg b/tests/wpt/tests/media/2048x1360-random.jpg similarity index 100% rename from tests/wpt/web-platform-tests/media/2048x1360-random.jpg rename to tests/wpt/tests/media/2048x1360-random.jpg diff --git a/tests/wpt/web-platform-tests/media/2x2-green.mp4 b/tests/wpt/tests/media/2x2-green.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media/2x2-green.mp4 rename to tests/wpt/tests/media/2x2-green.mp4 diff --git a/tests/wpt/web-platform-tests/media/2x2-green.ogv b/tests/wpt/tests/media/2x2-green.ogv similarity index 100% rename from tests/wpt/web-platform-tests/media/2x2-green.ogv rename to tests/wpt/tests/media/2x2-green.ogv diff --git a/tests/wpt/web-platform-tests/media/2x2-green.webm b/tests/wpt/tests/media/2x2-green.webm similarity index 100% rename from tests/wpt/web-platform-tests/media/2x2-green.webm rename to tests/wpt/tests/media/2x2-green.webm diff --git a/tests/wpt/web-platform-tests/media/400x300-red-resize-200x150-green.mp4 b/tests/wpt/tests/media/400x300-red-resize-200x150-green.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media/400x300-red-resize-200x150-green.mp4 rename to tests/wpt/tests/media/400x300-red-resize-200x150-green.mp4 diff --git a/tests/wpt/web-platform-tests/media/400x300-red-resize-200x150-green.webm b/tests/wpt/tests/media/400x300-red-resize-200x150-green.webm similarity index 100% rename from tests/wpt/web-platform-tests/media/400x300-red-resize-200x150-green.webm rename to tests/wpt/tests/media/400x300-red-resize-200x150-green.webm diff --git a/tests/wpt/web-platform-tests/media/A4.mp4 b/tests/wpt/tests/media/A4.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media/A4.mp4 rename to tests/wpt/tests/media/A4.mp4 diff --git a/tests/wpt/web-platform-tests/media/A4.ogv b/tests/wpt/tests/media/A4.ogv similarity index 100% rename from tests/wpt/web-platform-tests/media/A4.ogv rename to tests/wpt/tests/media/A4.ogv diff --git a/tests/wpt/web-platform-tests/media/A4.webm b/tests/wpt/tests/media/A4.webm similarity index 100% rename from tests/wpt/web-platform-tests/media/A4.webm rename to tests/wpt/tests/media/A4.webm diff --git a/tests/wpt/web-platform-tests/media/META.yml b/tests/wpt/tests/media/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/media/META.yml rename to tests/wpt/tests/media/META.yml diff --git a/tests/wpt/web-platform-tests/media/counting.mp4 b/tests/wpt/tests/media/counting.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media/counting.mp4 rename to tests/wpt/tests/media/counting.mp4 diff --git a/tests/wpt/web-platform-tests/media/counting.ogv b/tests/wpt/tests/media/counting.ogv similarity index 100% rename from tests/wpt/web-platform-tests/media/counting.ogv rename to tests/wpt/tests/media/counting.ogv diff --git a/tests/wpt/web-platform-tests/media/counting.webm b/tests/wpt/tests/media/counting.webm similarity index 100% rename from tests/wpt/web-platform-tests/media/counting.webm rename to tests/wpt/tests/media/counting.webm diff --git a/tests/wpt/web-platform-tests/media/foo-no-cors.vtt b/tests/wpt/tests/media/foo-no-cors.vtt similarity index 100% rename from tests/wpt/web-platform-tests/media/foo-no-cors.vtt rename to tests/wpt/tests/media/foo-no-cors.vtt diff --git a/tests/wpt/web-platform-tests/media/foo.vtt b/tests/wpt/tests/media/foo.vtt similarity index 100% rename from tests/wpt/web-platform-tests/media/foo.vtt rename to tests/wpt/tests/media/foo.vtt diff --git a/tests/wpt/web-platform-tests/media/foo.vtt.headers b/tests/wpt/tests/media/foo.vtt.headers similarity index 100% rename from tests/wpt/web-platform-tests/media/foo.vtt.headers rename to tests/wpt/tests/media/foo.vtt.headers diff --git a/tests/wpt/web-platform-tests/media/green-at-15.mp4 b/tests/wpt/tests/media/green-at-15.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media/green-at-15.mp4 rename to tests/wpt/tests/media/green-at-15.mp4 diff --git a/tests/wpt/web-platform-tests/media/green-at-15.ogv b/tests/wpt/tests/media/green-at-15.ogv similarity index 100% rename from tests/wpt/web-platform-tests/media/green-at-15.ogv rename to tests/wpt/tests/media/green-at-15.ogv diff --git a/tests/wpt/web-platform-tests/media/green-at-15.webm b/tests/wpt/tests/media/green-at-15.webm similarity index 100% rename from tests/wpt/web-platform-tests/media/green-at-15.webm rename to tests/wpt/tests/media/green-at-15.webm diff --git a/tests/wpt/web-platform-tests/media/movie_300.mp4 b/tests/wpt/tests/media/movie_300.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media/movie_300.mp4 rename to tests/wpt/tests/media/movie_300.mp4 diff --git a/tests/wpt/web-platform-tests/media/movie_300.ogv b/tests/wpt/tests/media/movie_300.ogv similarity index 100% rename from tests/wpt/web-platform-tests/media/movie_300.ogv rename to tests/wpt/tests/media/movie_300.ogv diff --git a/tests/wpt/web-platform-tests/media/movie_300.webm b/tests/wpt/tests/media/movie_300.webm similarity index 100% rename from tests/wpt/web-platform-tests/media/movie_300.webm rename to tests/wpt/tests/media/movie_300.webm diff --git a/tests/wpt/web-platform-tests/media/movie_5.mp4 b/tests/wpt/tests/media/movie_5.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media/movie_5.mp4 rename to tests/wpt/tests/media/movie_5.mp4 diff --git a/tests/wpt/web-platform-tests/media/movie_5.ogv b/tests/wpt/tests/media/movie_5.ogv similarity index 100% rename from tests/wpt/web-platform-tests/media/movie_5.ogv rename to tests/wpt/tests/media/movie_5.ogv diff --git a/tests/wpt/web-platform-tests/media/movie_5.webm b/tests/wpt/tests/media/movie_5.webm similarity index 100% rename from tests/wpt/web-platform-tests/media/movie_5.webm rename to tests/wpt/tests/media/movie_5.webm diff --git a/tests/wpt/web-platform-tests/media/poster.png b/tests/wpt/tests/media/poster.png similarity index 100% rename from tests/wpt/web-platform-tests/media/poster.png rename to tests/wpt/tests/media/poster.png diff --git a/tests/wpt/web-platform-tests/media/sine440.mp3 b/tests/wpt/tests/media/sine440.mp3 similarity index 100% rename from tests/wpt/web-platform-tests/media/sine440.mp3 rename to tests/wpt/tests/media/sine440.mp3 diff --git a/tests/wpt/web-platform-tests/media/sound_0.mp3 b/tests/wpt/tests/media/sound_0.mp3 similarity index 100% rename from tests/wpt/web-platform-tests/media/sound_0.mp3 rename to tests/wpt/tests/media/sound_0.mp3 diff --git a/tests/wpt/web-platform-tests/media/sound_0.oga b/tests/wpt/tests/media/sound_0.oga similarity index 100% rename from tests/wpt/web-platform-tests/media/sound_0.oga rename to tests/wpt/tests/media/sound_0.oga diff --git a/tests/wpt/web-platform-tests/media/sound_5.mp3 b/tests/wpt/tests/media/sound_5.mp3 similarity index 100% rename from tests/wpt/web-platform-tests/media/sound_5.mp3 rename to tests/wpt/tests/media/sound_5.mp3 diff --git a/tests/wpt/web-platform-tests/media/sound_5.oga b/tests/wpt/tests/media/sound_5.oga similarity index 100% rename from tests/wpt/web-platform-tests/media/sound_5.oga rename to tests/wpt/tests/media/sound_5.oga diff --git a/tests/wpt/web-platform-tests/media/test-1s.mp4 b/tests/wpt/tests/media/test-1s.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media/test-1s.mp4 rename to tests/wpt/tests/media/test-1s.mp4 diff --git a/tests/wpt/web-platform-tests/media/test-1s.webm b/tests/wpt/tests/media/test-1s.webm similarity index 100% rename from tests/wpt/web-platform-tests/media/test-1s.webm rename to tests/wpt/tests/media/test-1s.webm diff --git a/tests/wpt/web-platform-tests/media/test-a-128k-44100Hz-1ch.webm b/tests/wpt/tests/media/test-a-128k-44100Hz-1ch.webm similarity index 100% rename from tests/wpt/web-platform-tests/media/test-a-128k-44100Hz-1ch.webm rename to tests/wpt/tests/media/test-a-128k-44100Hz-1ch.webm diff --git a/tests/wpt/web-platform-tests/media/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm b/tests/wpt/tests/media/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm similarity index 100% rename from tests/wpt/web-platform-tests/media/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm rename to tests/wpt/tests/media/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm diff --git a/tests/wpt/web-platform-tests/media/test-v-128k-320x240-24fps-8kfr.webm b/tests/wpt/tests/media/test-v-128k-320x240-24fps-8kfr.webm similarity index 100% rename from tests/wpt/web-platform-tests/media/test-v-128k-320x240-24fps-8kfr.webm rename to tests/wpt/tests/media/test-v-128k-320x240-24fps-8kfr.webm diff --git a/tests/wpt/web-platform-tests/media/test.mp4 b/tests/wpt/tests/media/test.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media/test.mp4 rename to tests/wpt/tests/media/test.mp4 diff --git a/tests/wpt/web-platform-tests/media/test.ogv b/tests/wpt/tests/media/test.ogv similarity index 100% rename from tests/wpt/web-platform-tests/media/test.ogv rename to tests/wpt/tests/media/test.ogv diff --git a/tests/wpt/web-platform-tests/media/test.webm b/tests/wpt/tests/media/test.webm similarity index 100% rename from tests/wpt/web-platform-tests/media/test.webm rename to tests/wpt/tests/media/test.webm diff --git a/tests/wpt/web-platform-tests/media/video.ogv b/tests/wpt/tests/media/video.ogv similarity index 100% rename from tests/wpt/web-platform-tests/media/video.ogv rename to tests/wpt/tests/media/video.ogv diff --git a/tests/wpt/web-platform-tests/media/video.webm b/tests/wpt/tests/media/video.webm similarity index 100% rename from tests/wpt/web-platform-tests/media/video.webm rename to tests/wpt/tests/media/video.webm diff --git a/tests/wpt/web-platform-tests/media/white.mp4 b/tests/wpt/tests/media/white.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/media/white.mp4 rename to tests/wpt/tests/media/white.mp4 diff --git a/tests/wpt/web-platform-tests/media/white.webm b/tests/wpt/tests/media/white.webm similarity index 100% rename from tests/wpt/web-platform-tests/media/white.webm rename to tests/wpt/tests/media/white.webm diff --git a/tests/wpt/web-platform-tests/mediacapture-extensions/GUM-backgroundBlur.https.html b/tests/wpt/tests/mediacapture-extensions/GUM-backgroundBlur.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-extensions/GUM-backgroundBlur.https.html rename to tests/wpt/tests/mediacapture-extensions/GUM-backgroundBlur.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-fromelement/HTMLCanvasElement-getImageData-noframe.html b/tests/wpt/tests/mediacapture-fromelement/HTMLCanvasElement-getImageData-noframe.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-fromelement/HTMLCanvasElement-getImageData-noframe.html rename to tests/wpt/tests/mediacapture-fromelement/HTMLCanvasElement-getImageData-noframe.html diff --git a/tests/wpt/web-platform-tests/mediacapture-fromelement/META.yml b/tests/wpt/tests/mediacapture-fromelement/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-fromelement/META.yml rename to tests/wpt/tests/mediacapture-fromelement/META.yml diff --git a/tests/wpt/web-platform-tests/mediacapture-fromelement/capture.html b/tests/wpt/tests/mediacapture-fromelement/capture.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-fromelement/capture.html rename to tests/wpt/tests/mediacapture-fromelement/capture.html diff --git a/tests/wpt/web-platform-tests/mediacapture-fromelement/creation.html b/tests/wpt/tests/mediacapture-fromelement/creation.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-fromelement/creation.html rename to tests/wpt/tests/mediacapture-fromelement/creation.html diff --git a/tests/wpt/web-platform-tests/mediacapture-fromelement/cross-origin.html b/tests/wpt/tests/mediacapture-fromelement/cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-fromelement/cross-origin.html rename to tests/wpt/tests/mediacapture-fromelement/cross-origin.html diff --git a/tests/wpt/web-platform-tests/mediacapture-fromelement/ended.html b/tests/wpt/tests/mediacapture-fromelement/ended.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-fromelement/ended.html rename to tests/wpt/tests/mediacapture-fromelement/ended.html diff --git a/tests/wpt/web-platform-tests/mediacapture-fromelement/historical.html b/tests/wpt/tests/mediacapture-fromelement/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-fromelement/historical.html rename to tests/wpt/tests/mediacapture-fromelement/historical.html diff --git a/tests/wpt/web-platform-tests/mediacapture-fromelement/idlharness.window.js b/tests/wpt/tests/mediacapture-fromelement/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-fromelement/idlharness.window.js rename to tests/wpt/tests/mediacapture-fromelement/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/mediacapture-handle/identity/MediaDevices-setCaptureHandleConfig.https.window.js b/tests/wpt/tests/mediacapture-handle/identity/MediaDevices-setCaptureHandleConfig.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-handle/identity/MediaDevices-setCaptureHandleConfig.https.window.js rename to tests/wpt/tests/mediacapture-handle/identity/MediaDevices-setCaptureHandleConfig.https.window.js diff --git a/tests/wpt/web-platform-tests/mediacapture-image/ImageCapture-MediaTrackSupportedConstraints.https.html b/tests/wpt/tests/mediacapture-image/ImageCapture-MediaTrackSupportedConstraints.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/ImageCapture-MediaTrackSupportedConstraints.https.html rename to tests/wpt/tests/mediacapture-image/ImageCapture-MediaTrackSupportedConstraints.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/ImageCapture-creation.https.html b/tests/wpt/tests/mediacapture-image/ImageCapture-creation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/ImageCapture-creation.https.html rename to tests/wpt/tests/mediacapture-image/ImageCapture-creation.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/ImageCapture-grabFrame-crash.html b/tests/wpt/tests/mediacapture-image/ImageCapture-grabFrame-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/ImageCapture-grabFrame-crash.html rename to tests/wpt/tests/mediacapture-image/ImageCapture-grabFrame-crash.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/ImageCapture-grabFrame.html b/tests/wpt/tests/mediacapture-image/ImageCapture-grabFrame.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/ImageCapture-grabFrame.html rename to tests/wpt/tests/mediacapture-image/ImageCapture-grabFrame.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/ImageCapture-track.html b/tests/wpt/tests/mediacapture-image/ImageCapture-track.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/ImageCapture-track.html rename to tests/wpt/tests/mediacapture-image/ImageCapture-track.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/META.yml b/tests/wpt/tests/mediacapture-image/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/META.yml rename to tests/wpt/tests/mediacapture-image/META.yml diff --git a/tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-applyConstraints-fast.html b/tests/wpt/tests/mediacapture-image/MediaStreamTrack-applyConstraints-fast.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-applyConstraints-fast.html rename to tests/wpt/tests/mediacapture-image/MediaStreamTrack-applyConstraints-fast.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-applyConstraints-getSettings.https.html b/tests/wpt/tests/mediacapture-image/MediaStreamTrack-applyConstraints-getSettings.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-applyConstraints-getSettings.https.html rename to tests/wpt/tests/mediacapture-image/MediaStreamTrack-applyConstraints-getSettings.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-applyConstraints-reject.https.html b/tests/wpt/tests/mediacapture-image/MediaStreamTrack-applyConstraints-reject.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-applyConstraints-reject.https.html rename to tests/wpt/tests/mediacapture-image/MediaStreamTrack-applyConstraints-reject.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-applyConstraints.https.html b/tests/wpt/tests/mediacapture-image/MediaStreamTrack-applyConstraints.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-applyConstraints.https.html rename to tests/wpt/tests/mediacapture-image/MediaStreamTrack-applyConstraints.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-clone.https.html b/tests/wpt/tests/mediacapture-image/MediaStreamTrack-clone.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-clone.https.html rename to tests/wpt/tests/mediacapture-image/MediaStreamTrack-clone.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-getCapabilities-fast.html b/tests/wpt/tests/mediacapture-image/MediaStreamTrack-getCapabilities-fast.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-getCapabilities-fast.html rename to tests/wpt/tests/mediacapture-image/MediaStreamTrack-getCapabilities-fast.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-getCapabilities.https.html b/tests/wpt/tests/mediacapture-image/MediaStreamTrack-getCapabilities.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-getCapabilities.https.html rename to tests/wpt/tests/mediacapture-image/MediaStreamTrack-getCapabilities.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-getConstraints.https.html b/tests/wpt/tests/mediacapture-image/MediaStreamTrack-getConstraints.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-getConstraints.https.html rename to tests/wpt/tests/mediacapture-image/MediaStreamTrack-getConstraints.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-getSettings-fast.html b/tests/wpt/tests/mediacapture-image/MediaStreamTrack-getSettings-fast.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-getSettings-fast.html rename to tests/wpt/tests/mediacapture-image/MediaStreamTrack-getSettings-fast.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-getSettings.https.html b/tests/wpt/tests/mediacapture-image/MediaStreamTrack-getSettings.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/MediaStreamTrack-getSettings.https.html rename to tests/wpt/tests/mediacapture-image/MediaStreamTrack-getSettings.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/detached-HTMLCanvasElement.html b/tests/wpt/tests/mediacapture-image/detached-HTMLCanvasElement.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/detached-HTMLCanvasElement.html rename to tests/wpt/tests/mediacapture-image/detached-HTMLCanvasElement.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/getPhotoCapabilities.html b/tests/wpt/tests/mediacapture-image/getPhotoCapabilities.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/getPhotoCapabilities.html rename to tests/wpt/tests/mediacapture-image/getPhotoCapabilities.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/getPhotoSettings.html b/tests/wpt/tests/mediacapture-image/getPhotoSettings.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/getPhotoSettings.html rename to tests/wpt/tests/mediacapture-image/getPhotoSettings.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/getusermedia.https.html b/tests/wpt/tests/mediacapture-image/getusermedia.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/getusermedia.https.html rename to tests/wpt/tests/mediacapture-image/getusermedia.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/idlharness.window.js b/tests/wpt/tests/mediacapture-image/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/idlharness.window.js rename to tests/wpt/tests/mediacapture-image/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/mediacapture-image/resources/imagecapture-helpers.js b/tests/wpt/tests/mediacapture-image/resources/imagecapture-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/resources/imagecapture-helpers.js rename to tests/wpt/tests/mediacapture-image/resources/imagecapture-helpers.js diff --git a/tests/wpt/web-platform-tests/mediacapture-image/takePhoto-reject.html b/tests/wpt/tests/mediacapture-image/takePhoto-reject.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/takePhoto-reject.html rename to tests/wpt/tests/mediacapture-image/takePhoto-reject.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/takePhoto-with-PhotoSettings.html b/tests/wpt/tests/mediacapture-image/takePhoto-with-PhotoSettings.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/takePhoto-with-PhotoSettings.html rename to tests/wpt/tests/mediacapture-image/takePhoto-with-PhotoSettings.html diff --git a/tests/wpt/web-platform-tests/mediacapture-image/takePhoto-without-PhotoCapabilities.https.window.js b/tests/wpt/tests/mediacapture-image/takePhoto-without-PhotoCapabilities.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/takePhoto-without-PhotoCapabilities.https.window.js rename to tests/wpt/tests/mediacapture-image/takePhoto-without-PhotoCapabilities.https.window.js diff --git a/tests/wpt/web-platform-tests/mediacapture-image/takePhoto.html b/tests/wpt/tests/mediacapture-image/takePhoto.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-image/takePhoto.html rename to tests/wpt/tests/mediacapture-image/takePhoto.html diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-audio.https.html b/tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-audio.https.html rename to tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-audio.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-in-service-worker.https.html b/tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-in-service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-in-service-worker.https.html rename to tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-in-service-worker.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-in-shared-worker.https.html b/tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-in-shared-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-in-shared-worker.https.html rename to tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-in-shared-worker.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-in-worker.https.html b/tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-in-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-in-worker.https.html rename to tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-in-worker.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-pipes-data-in-worker.https.html b/tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-pipes-data-in-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-pipes-data-in-worker.https.html rename to tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-pipes-data-in-worker.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-video.https.html b/tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-video.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-video.https.html rename to tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-video.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-audio.https.html b/tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-audio.https.html rename to tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-audio.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-backpressure.https.html b/tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-backpressure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-backpressure.https.html rename to tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-backpressure.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-video.https.html b/tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-video.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-video.https.html rename to tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-video.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-worker.js b/tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-worker.js rename to tests/wpt/tests/mediacapture-insertable-streams/MediaStreamTrackProcessor-worker.js diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/VideoTrackGenerator.https.html b/tests/wpt/tests/mediacapture-insertable-streams/VideoTrackGenerator.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-insertable-streams/VideoTrackGenerator.https.html rename to tests/wpt/tests/mediacapture-insertable-streams/VideoTrackGenerator.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/dedicated-worker.js b/tests/wpt/tests/mediacapture-insertable-streams/dedicated-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-insertable-streams/dedicated-worker.js rename to tests/wpt/tests/mediacapture-insertable-streams/dedicated-worker.js diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/service-worker.js b/tests/wpt/tests/mediacapture-insertable-streams/service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-insertable-streams/service-worker.js rename to tests/wpt/tests/mediacapture-insertable-streams/service-worker.js diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/shared-worker.js b/tests/wpt/tests/mediacapture-insertable-streams/shared-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-insertable-streams/shared-worker.js rename to tests/wpt/tests/mediacapture-insertable-streams/shared-worker.js diff --git a/tests/wpt/web-platform-tests/mediacapture-record/BlobEvent-constructor.html b/tests/wpt/tests/mediacapture-record/BlobEvent-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/BlobEvent-constructor.html rename to tests/wpt/tests/mediacapture-record/BlobEvent-constructor.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/META.yml b/tests/wpt/tests/mediacapture-record/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/META.yml rename to tests/wpt/tests/mediacapture-record/META.yml diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-bitrate.https.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-bitrate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-bitrate.https.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-bitrate.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-canvas-media-source.https.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-canvas-media-source.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-canvas-media-source.https.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-canvas-media-source.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-creation.https.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-creation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-creation.https.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-creation.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-destroy-script-execution.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-destroy-script-execution.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-destroy-script-execution.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-destroy-script-execution.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-detached-context.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-detached-context.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-detached-context.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-detached-context.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-disabled-tracks.https.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-disabled-tracks.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-disabled-tracks.https.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-disabled-tracks.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-error.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-error.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-error.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-error.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-events-and-exceptions.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-events-and-exceptions.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-events-and-exceptions.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-events-and-exceptions.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-mimetype.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-mimetype.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-mimetype.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-mimetype.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-pause-resume.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-pause-resume.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-pause-resume.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-pause-resume.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-peerconnection.https.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-peerconnection.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-peerconnection.https.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-peerconnection.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-start.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-start.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-start.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-start.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-stop.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-stop.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-stop.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-stop.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-video-key-frame-distance.html b/tests/wpt/tests/mediacapture-record/MediaRecorder-video-key-frame-distance.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-video-key-frame-distance.html rename to tests/wpt/tests/mediacapture-record/MediaRecorder-video-key-frame-distance.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/idlharness.window.js b/tests/wpt/tests/mediacapture-record/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/idlharness.window.js rename to tests/wpt/tests/mediacapture-record/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/mediacapture-record/passthrough/MediaRecorder-passthrough.https.html b/tests/wpt/tests/mediacapture-record/passthrough/MediaRecorder-passthrough.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/passthrough/MediaRecorder-passthrough.https.html rename to tests/wpt/tests/mediacapture-record/passthrough/MediaRecorder-passthrough.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/support/MediaRecorder-iframe.html b/tests/wpt/tests/mediacapture-record/support/MediaRecorder-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/support/MediaRecorder-iframe.html rename to tests/wpt/tests/mediacapture-record/support/MediaRecorder-iframe.html diff --git a/tests/wpt/web-platform-tests/mediacapture-record/utils/peerconnection.js b/tests/wpt/tests/mediacapture-record/utils/peerconnection.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/utils/peerconnection.js rename to tests/wpt/tests/mediacapture-record/utils/peerconnection.js diff --git a/tests/wpt/web-platform-tests/mediacapture-record/utils/sources.js b/tests/wpt/tests/mediacapture-record/utils/sources.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-record/utils/sources.js rename to tests/wpt/tests/mediacapture-record/utils/sources.js diff --git a/tests/wpt/web-platform-tests/mediacapture-region/CropTarget-fromElement.https.html b/tests/wpt/tests/mediacapture-region/CropTarget-fromElement.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-region/CropTarget-fromElement.https.html rename to tests/wpt/tests/mediacapture-region/CropTarget-fromElement.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/GUM-api.https.html b/tests/wpt/tests/mediacapture-streams/GUM-api.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/GUM-api.https.html rename to tests/wpt/tests/mediacapture-streams/GUM-api.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/GUM-deny.https.html b/tests/wpt/tests/mediacapture-streams/GUM-deny.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/GUM-deny.https.html rename to tests/wpt/tests/mediacapture-streams/GUM-deny.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/GUM-empty-option-param.https.html b/tests/wpt/tests/mediacapture-streams/GUM-empty-option-param.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/GUM-empty-option-param.https.html rename to tests/wpt/tests/mediacapture-streams/GUM-empty-option-param.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/GUM-impossible-constraint.https.html b/tests/wpt/tests/mediacapture-streams/GUM-impossible-constraint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/GUM-impossible-constraint.https.html rename to tests/wpt/tests/mediacapture-streams/GUM-impossible-constraint.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/GUM-invalid-facing-mode.https.html b/tests/wpt/tests/mediacapture-streams/GUM-invalid-facing-mode.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/GUM-invalid-facing-mode.https.html rename to tests/wpt/tests/mediacapture-streams/GUM-invalid-facing-mode.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/GUM-non-applicable-constraint.https.html b/tests/wpt/tests/mediacapture-streams/GUM-non-applicable-constraint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/GUM-non-applicable-constraint.https.html rename to tests/wpt/tests/mediacapture-streams/GUM-non-applicable-constraint.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/GUM-optional-constraint.https.html b/tests/wpt/tests/mediacapture-streams/GUM-optional-constraint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/GUM-optional-constraint.https.html rename to tests/wpt/tests/mediacapture-streams/GUM-optional-constraint.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/GUM-required-constraint-with-ideal-value.https.html b/tests/wpt/tests/mediacapture-streams/GUM-required-constraint-with-ideal-value.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/GUM-required-constraint-with-ideal-value.https.html rename to tests/wpt/tests/mediacapture-streams/GUM-required-constraint-with-ideal-value.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/GUM-trivial-constraint.https.html b/tests/wpt/tests/mediacapture-streams/GUM-trivial-constraint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/GUM-trivial-constraint.https.html rename to tests/wpt/tests/mediacapture-streams/GUM-trivial-constraint.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/GUM-unknownkey-option-param.https.html b/tests/wpt/tests/mediacapture-streams/GUM-unknownkey-option-param.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/GUM-unknownkey-option-param.https.html rename to tests/wpt/tests/mediacapture-streams/GUM-unknownkey-option-param.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/META.yml b/tests/wpt/tests/mediacapture-streams/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/META.yml rename to tests/wpt/tests/mediacapture-streams/META.yml diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-SecureContext.html b/tests/wpt/tests/mediacapture-streams/MediaDevices-SecureContext.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-SecureContext.html rename to tests/wpt/tests/mediacapture-streams/MediaDevices-SecureContext.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-after-discard.https.html b/tests/wpt/tests/mediacapture-streams/MediaDevices-after-discard.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-after-discard.https.html rename to tests/wpt/tests/mediacapture-streams/MediaDevices-after-discard.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html b/tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html rename to tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html.headers b/tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html.headers rename to tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html.headers diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html b/tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html rename to tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html.headers b/tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html.headers rename to tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html.headers diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-per-origin-ids.sub.https.html b/tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-per-origin-ids.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-per-origin-ids.sub.https.html rename to tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-per-origin-ids.sub.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-persistent-permission.https.html b/tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-persistent-permission.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-persistent-permission.https.html rename to tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-persistent-permission.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-returned-objects.https.html b/tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-returned-objects.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-returned-objects.https.html rename to tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices-returned-objects.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices.https.html b/tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices.https.html rename to tests/wpt/tests/mediacapture-streams/MediaDevices-enumerateDevices.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-getSupportedConstraints.https.html b/tests/wpt/tests/mediacapture-streams/MediaDevices-getSupportedConstraints.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-getSupportedConstraints.https.html rename to tests/wpt/tests/mediacapture-streams/MediaDevices-getSupportedConstraints.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-getUserMedia.https.html b/tests/wpt/tests/mediacapture-streams/MediaDevices-getUserMedia.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-getUserMedia.https.html rename to tests/wpt/tests/mediacapture-streams/MediaDevices-getUserMedia.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-MediaElement-firstframe.https.html b/tests/wpt/tests/mediacapture-streams/MediaStream-MediaElement-firstframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-MediaElement-firstframe.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStream-MediaElement-firstframe.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-MediaElement-preload-none.https.html b/tests/wpt/tests/mediacapture-streams/MediaStream-MediaElement-preload-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-MediaElement-preload-none.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStream-MediaElement-preload-none.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-MediaElement-srcObject.https.html b/tests/wpt/tests/mediacapture-streams/MediaStream-MediaElement-srcObject.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-MediaElement-srcObject.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStream-MediaElement-srcObject.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-add-audio-track.https.html b/tests/wpt/tests/mediacapture-streams/MediaStream-add-audio-track.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-add-audio-track.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStream-add-audio-track.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-audio-only.https.html b/tests/wpt/tests/mediacapture-streams/MediaStream-audio-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-audio-only.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStream-audio-only.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-clone.https.html b/tests/wpt/tests/mediacapture-streams/MediaStream-clone.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-clone.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStream-clone.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-default-feature-policy.https.html b/tests/wpt/tests/mediacapture-streams/MediaStream-default-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-default-feature-policy.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStream-default-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-finished-add.https.html b/tests/wpt/tests/mediacapture-streams/MediaStream-finished-add.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-finished-add.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStream-finished-add.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-gettrackid.https.html b/tests/wpt/tests/mediacapture-streams/MediaStream-gettrackid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-gettrackid.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStream-gettrackid.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-id.https.html b/tests/wpt/tests/mediacapture-streams/MediaStream-id.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-id.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStream-id.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-idl.https.html b/tests/wpt/tests/mediacapture-streams/MediaStream-idl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-idl.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStream-idl.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-removetrack.https.html b/tests/wpt/tests/mediacapture-streams/MediaStream-removetrack.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-removetrack.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStream-removetrack.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-supported-by-feature-policy.html b/tests/wpt/tests/mediacapture-streams/MediaStream-supported-by-feature-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-supported-by-feature-policy.html rename to tests/wpt/tests/mediacapture-streams/MediaStream-supported-by-feature-policy.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-video-only.https.html b/tests/wpt/tests/mediacapture-streams/MediaStream-video-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStream-video-only.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStream-video-only.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-audio-is-silence.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-audio-is-silence.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-audio-is-silence.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-audio-is-silence.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-applyConstraints.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-applyConstraints.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-applyConstraints.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStreamTrack-applyConstraints.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-end-manual.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-end-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-end-manual.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStreamTrack-end-manual.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getCapabilities.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-getCapabilities.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getCapabilities.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStreamTrack-getCapabilities.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-id.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-id.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-id.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStreamTrack-id.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-iframe-audio-transfer.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-iframe-audio-transfer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-iframe-audio-transfer.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStreamTrack-iframe-audio-transfer.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-iframe-transfer.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-iframe-transfer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-iframe-transfer.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStreamTrack-iframe-transfer.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-init.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-init.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-init.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStreamTrack-init.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-transfer-video.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-transfer-video.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-transfer-video.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStreamTrack-transfer-video.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-transfer.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-transfer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-transfer.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStreamTrack-transfer.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrackEvent-constructor.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrackEvent-constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrackEvent-constructor.https.html rename to tests/wpt/tests/mediacapture-streams/MediaStreamTrackEvent-constructor.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/crashtests/enumerateDevices-after-discard-1.https.html b/tests/wpt/tests/mediacapture-streams/crashtests/enumerateDevices-after-discard-1.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/crashtests/enumerateDevices-after-discard-1.https.html rename to tests/wpt/tests/mediacapture-streams/crashtests/enumerateDevices-after-discard-1.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/enumerateDevices-with-navigation.https.html b/tests/wpt/tests/mediacapture-streams/enumerateDevices-with-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/enumerateDevices-with-navigation.https.html rename to tests/wpt/tests/mediacapture-streams/enumerateDevices-with-navigation.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/historical.https.html b/tests/wpt/tests/mediacapture-streams/historical.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/historical.https.html rename to tests/wpt/tests/mediacapture-streams/historical.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/idlharness.https.window.js b/tests/wpt/tests/mediacapture-streams/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/idlharness.https.window.js rename to tests/wpt/tests/mediacapture-streams/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/iframe-enumerate-cleared.html b/tests/wpt/tests/mediacapture-streams/iframe-enumerate-cleared.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/iframe-enumerate-cleared.html rename to tests/wpt/tests/mediacapture-streams/iframe-enumerate-cleared.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/iframe-enumerate-cleared.html.headers b/tests/wpt/tests/mediacapture-streams/iframe-enumerate-cleared.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/iframe-enumerate-cleared.html.headers rename to tests/wpt/tests/mediacapture-streams/iframe-enumerate-cleared.html.headers diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/iframe-enumerate-nogum.html b/tests/wpt/tests/mediacapture-streams/iframe-enumerate-nogum.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/iframe-enumerate-nogum.html rename to tests/wpt/tests/mediacapture-streams/iframe-enumerate-nogum.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/iframe-enumerate.html b/tests/wpt/tests/mediacapture-streams/iframe-enumerate.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/iframe-enumerate.html rename to tests/wpt/tests/mediacapture-streams/iframe-enumerate.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/message-enumerateddevices-nogum.js b/tests/wpt/tests/mediacapture-streams/message-enumerateddevices-nogum.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/message-enumerateddevices-nogum.js rename to tests/wpt/tests/mediacapture-streams/message-enumerateddevices-nogum.js diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/message-enumerateddevices.js b/tests/wpt/tests/mediacapture-streams/message-enumerateddevices.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/message-enumerateddevices.js rename to tests/wpt/tests/mediacapture-streams/message-enumerateddevices.js diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/overconstrained_error.https.html b/tests/wpt/tests/mediacapture-streams/overconstrained_error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/overconstrained_error.https.html rename to tests/wpt/tests/mediacapture-streams/overconstrained_error.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/parallel-capture-requests.https.html b/tests/wpt/tests/mediacapture-streams/parallel-capture-requests.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/parallel-capture-requests.https.html rename to tests/wpt/tests/mediacapture-streams/parallel-capture-requests.https.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/permission-helper.js b/tests/wpt/tests/mediacapture-streams/permission-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/permission-helper.js rename to tests/wpt/tests/mediacapture-streams/permission-helper.js diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/support/iframe-MediaStreamTrack-transfer-video.html b/tests/wpt/tests/mediacapture-streams/support/iframe-MediaStreamTrack-transfer-video.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/support/iframe-MediaStreamTrack-transfer-video.html rename to tests/wpt/tests/mediacapture-streams/support/iframe-MediaStreamTrack-transfer-video.html diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/support/iframe-MediaStreamTrack-transfer.html b/tests/wpt/tests/mediacapture-streams/support/iframe-MediaStreamTrack-transfer.html similarity index 100% rename from tests/wpt/web-platform-tests/mediacapture-streams/support/iframe-MediaStreamTrack-transfer.html rename to tests/wpt/tests/mediacapture-streams/support/iframe-MediaStreamTrack-transfer.html diff --git a/tests/wpt/web-platform-tests/mediasession/META.yml b/tests/wpt/tests/mediasession/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/mediasession/META.yml rename to tests/wpt/tests/mediasession/META.yml diff --git a/tests/wpt/web-platform-tests/mediasession/README.md b/tests/wpt/tests/mediasession/README.md similarity index 100% rename from tests/wpt/web-platform-tests/mediasession/README.md rename to tests/wpt/tests/mediasession/README.md diff --git a/tests/wpt/web-platform-tests/mediasession/helper/artwork-generator.html b/tests/wpt/tests/mediasession/helper/artwork-generator.html similarity index 100% rename from tests/wpt/web-platform-tests/mediasession/helper/artwork-generator.html rename to tests/wpt/tests/mediasession/helper/artwork-generator.html diff --git a/tests/wpt/web-platform-tests/mediasession/idlharness.window.js b/tests/wpt/tests/mediasession/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/mediasession/idlharness.window.js rename to tests/wpt/tests/mediasession/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/mediasession/mediametadata.html b/tests/wpt/tests/mediasession/mediametadata.html similarity index 100% rename from tests/wpt/web-platform-tests/mediasession/mediametadata.html rename to tests/wpt/tests/mediasession/mediametadata.html diff --git a/tests/wpt/web-platform-tests/mediasession/playbackstate.html b/tests/wpt/tests/mediasession/playbackstate.html similarity index 100% rename from tests/wpt/web-platform-tests/mediasession/playbackstate.html rename to tests/wpt/tests/mediasession/playbackstate.html diff --git a/tests/wpt/web-platform-tests/mediasession/positionstate.html b/tests/wpt/tests/mediasession/positionstate.html similarity index 100% rename from tests/wpt/web-platform-tests/mediasession/positionstate.html rename to tests/wpt/tests/mediasession/positionstate.html diff --git a/tests/wpt/web-platform-tests/mediasession/setactionhandler.html b/tests/wpt/tests/mediasession/setactionhandler.html similarity index 100% rename from tests/wpt/web-platform-tests/mediasession/setactionhandler.html rename to tests/wpt/tests/mediasession/setactionhandler.html diff --git a/tests/wpt/web-platform-tests/mediasession/setcameraactive.html b/tests/wpt/tests/mediasession/setcameraactive.html similarity index 100% rename from tests/wpt/web-platform-tests/mediasession/setcameraactive.html rename to tests/wpt/tests/mediasession/setcameraactive.html diff --git a/tests/wpt/web-platform-tests/mediasession/setmicrophoneactive.html b/tests/wpt/tests/mediasession/setmicrophoneactive.html similarity index 100% rename from tests/wpt/web-platform-tests/mediasession/setmicrophoneactive.html rename to tests/wpt/tests/mediasession/setmicrophoneactive.html diff --git a/tests/wpt/web-platform-tests/merchant-validation/META.yml b/tests/wpt/tests/merchant-validation/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/merchant-validation/META.yml rename to tests/wpt/tests/merchant-validation/META.yml diff --git a/tests/wpt/web-platform-tests/merchant-validation/complete-method.tentative.https.html b/tests/wpt/tests/merchant-validation/complete-method.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/merchant-validation/complete-method.tentative.https.html rename to tests/wpt/tests/merchant-validation/complete-method.tentative.https.html diff --git a/tests/wpt/web-platform-tests/merchant-validation/constructor.tentative.http.html b/tests/wpt/tests/merchant-validation/constructor.tentative.http.html similarity index 100% rename from tests/wpt/web-platform-tests/merchant-validation/constructor.tentative.http.html rename to tests/wpt/tests/merchant-validation/constructor.tentative.http.html diff --git a/tests/wpt/web-platform-tests/merchant-validation/constructor.tentative.https.html b/tests/wpt/tests/merchant-validation/constructor.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/merchant-validation/constructor.tentative.https.html rename to tests/wpt/tests/merchant-validation/constructor.tentative.https.html diff --git a/tests/wpt/web-platform-tests/merchant-validation/onmerchantvalidation-attribute.https.html b/tests/wpt/tests/merchant-validation/onmerchantvalidation-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/merchant-validation/onmerchantvalidation-attribute.https.html rename to tests/wpt/tests/merchant-validation/onmerchantvalidation-attribute.https.html diff --git a/tests/wpt/web-platform-tests/mimesniff/META.yml b/tests/wpt/tests/mimesniff/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/META.yml rename to tests/wpt/tests/mimesniff/META.yml diff --git a/tests/wpt/web-platform-tests/mimesniff/README.md b/tests/wpt/tests/mimesniff/README.md similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/README.md rename to tests/wpt/tests/mimesniff/README.md diff --git a/tests/wpt/web-platform-tests/mimesniff/media/media-sniff.window.js b/tests/wpt/tests/mimesniff/media/media-sniff.window.js similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/media/media-sniff.window.js rename to tests/wpt/tests/mimesniff/media/media-sniff.window.js diff --git a/tests/wpt/web-platform-tests/mimesniff/media/resources/flac.flac b/tests/wpt/tests/mimesniff/media/resources/flac.flac similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/media/resources/flac.flac rename to tests/wpt/tests/mimesniff/media/resources/flac.flac diff --git a/tests/wpt/web-platform-tests/mimesniff/media/resources/make-vectors.sh b/tests/wpt/tests/mimesniff/media/resources/make-vectors.sh similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/media/resources/make-vectors.sh rename to tests/wpt/tests/mimesniff/media/resources/make-vectors.sh diff --git a/tests/wpt/web-platform-tests/mimesniff/media/resources/mp3-raw.mp3 b/tests/wpt/tests/mimesniff/media/resources/mp3-raw.mp3 similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/media/resources/mp3-raw.mp3 rename to tests/wpt/tests/mimesniff/media/resources/mp3-raw.mp3 diff --git a/tests/wpt/web-platform-tests/mimesniff/media/resources/mp3-with-id3.mp3 b/tests/wpt/tests/mimesniff/media/resources/mp3-with-id3.mp3 similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/media/resources/mp3-with-id3.mp3 rename to tests/wpt/tests/mimesniff/media/resources/mp3-with-id3.mp3 diff --git a/tests/wpt/web-platform-tests/mimesniff/media/resources/mp4.mp4 b/tests/wpt/tests/mimesniff/media/resources/mp4.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/media/resources/mp4.mp4 rename to tests/wpt/tests/mimesniff/media/resources/mp4.mp4 diff --git a/tests/wpt/web-platform-tests/mimesniff/media/resources/ogg.ogg b/tests/wpt/tests/mimesniff/media/resources/ogg.ogg similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/media/resources/ogg.ogg rename to tests/wpt/tests/mimesniff/media/resources/ogg.ogg diff --git a/tests/wpt/web-platform-tests/mimesniff/media/resources/wav.wav b/tests/wpt/tests/mimesniff/media/resources/wav.wav similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/media/resources/wav.wav rename to tests/wpt/tests/mimesniff/media/resources/wav.wav diff --git a/tests/wpt/web-platform-tests/mimesniff/media/resources/webm.webm b/tests/wpt/tests/mimesniff/media/resources/webm.webm similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/media/resources/webm.webm rename to tests/wpt/tests/mimesniff/media/resources/webm.webm diff --git a/tests/wpt/web-platform-tests/mimesniff/mime-types/README.md b/tests/wpt/tests/mimesniff/mime-types/README.md similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/mime-types/README.md rename to tests/wpt/tests/mimesniff/mime-types/README.md diff --git a/tests/wpt/web-platform-tests/mimesniff/mime-types/charset-parameter.window.js b/tests/wpt/tests/mimesniff/mime-types/charset-parameter.window.js similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/mime-types/charset-parameter.window.js rename to tests/wpt/tests/mimesniff/mime-types/charset-parameter.window.js diff --git a/tests/wpt/web-platform-tests/mimesniff/mime-types/parsing.any.js b/tests/wpt/tests/mimesniff/mime-types/parsing.any.js similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/mime-types/parsing.any.js rename to tests/wpt/tests/mimesniff/mime-types/parsing.any.js diff --git a/tests/wpt/web-platform-tests/mimesniff/mime-types/resources/generated-mime-types.json b/tests/wpt/tests/mimesniff/mime-types/resources/generated-mime-types.json similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/mime-types/resources/generated-mime-types.json rename to tests/wpt/tests/mimesniff/mime-types/resources/generated-mime-types.json diff --git a/tests/wpt/web-platform-tests/mimesniff/mime-types/resources/generated-mime-types.py b/tests/wpt/tests/mimesniff/mime-types/resources/generated-mime-types.py similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/mime-types/resources/generated-mime-types.py rename to tests/wpt/tests/mimesniff/mime-types/resources/generated-mime-types.py diff --git a/tests/wpt/web-platform-tests/mimesniff/mime-types/resources/mime-charset.py b/tests/wpt/tests/mimesniff/mime-types/resources/mime-charset.py similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/mime-types/resources/mime-charset.py rename to tests/wpt/tests/mimesniff/mime-types/resources/mime-charset.py diff --git a/tests/wpt/web-platform-tests/mimesniff/mime-types/resources/mime-groups.json b/tests/wpt/tests/mimesniff/mime-types/resources/mime-groups.json similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/mime-types/resources/mime-groups.json rename to tests/wpt/tests/mimesniff/mime-types/resources/mime-groups.json diff --git a/tests/wpt/web-platform-tests/mimesniff/mime-types/resources/mime-types.json b/tests/wpt/tests/mimesniff/mime-types/resources/mime-types.json similarity index 100% rename from tests/wpt/web-platform-tests/mimesniff/mime-types/resources/mime-types.json rename to tests/wpt/tests/mimesniff/mime-types/resources/mime-types.json diff --git a/tests/wpt/web-platform-tests/mixed-content/META.yml b/tests/wpt/tests/mixed-content/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/META.yml rename to tests/wpt/tests/mixed-content/META.yml diff --git a/tests/wpt/web-platform-tests/mixed-content/README.md b/tests/wpt/tests/mixed-content/README.md similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/README.md rename to tests/wpt/tests/mixed-content/README.md diff --git a/tests/wpt/web-platform-tests/mixed-content/blob.https.sub.html b/tests/wpt/tests/mixed-content/blob.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/blob.https.sub.html rename to tests/wpt/tests/mixed-content/blob.https.sub.html diff --git a/tests/wpt/web-platform-tests/mixed-content/csp.https.window.js b/tests/wpt/tests/mixed-content/csp.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/csp.https.window.js rename to tests/wpt/tests/mixed-content/csp.https.window.js diff --git a/tests/wpt/web-platform-tests/mixed-content/csp.https.window.js.headers b/tests/wpt/tests/mixed-content/csp.https.window.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/csp.https.window.js.headers rename to tests/wpt/tests/mixed-content/csp.https.window.js.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/fetch.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/fetch.https.html.headers b/tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/fetch.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/fetch.https.html.headers rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/fetch.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/websocket.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/websocket.https.html.headers b/tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/websocket.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/websocket.https.html.headers rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/websocket.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/xhr.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/xhr.https.html.headers b/tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/xhr.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/xhr.https.html.headers rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/xhr.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/fetch.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/websocket.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/xhr.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/fetch.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.meta/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.meta/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/websocket.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.meta/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.meta/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/xhr.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.meta/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic-data.meta/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/fetch.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/fetch.https.html.headers b/tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/unset/fetch.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/fetch.https.html.headers rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/unset/fetch.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/websocket.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/websocket.https.html.headers b/tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/unset/websocket.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/websocket.https.html.headers rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/unset/websocket.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/xhr.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/xhr.https.html.headers b/tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/unset/xhr.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/xhr.https.html.headers rename to tests/wpt/tests/mixed-content/gen/sharedworker-classic.http-rp/unset/xhr.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/fetch.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/fetch.https.html.headers b/tests/wpt/tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/fetch.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/fetch.https.html.headers rename to tests/wpt/tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/fetch.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/websocket.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/websocket.https.html.headers b/tests/wpt/tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/websocket.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/websocket.https.html.headers rename to tests/wpt/tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/websocket.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/xhr.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/xhr.https.html.headers b/tests/wpt/tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/xhr.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/xhr.https.html.headers rename to tests/wpt/tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/xhr.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/fetch.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/websocket.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/xhr.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/fetch.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module-data.meta/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module-data.meta/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/websocket.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module-data.meta/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module-data.meta/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/xhr.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module-data.meta/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module-data.meta/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/fetch.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/fetch.https.html.headers b/tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/unset/fetch.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/fetch.https.html.headers rename to tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/unset/fetch.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/websocket.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/websocket.https.html.headers b/tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/unset/websocket.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/websocket.https.html.headers rename to tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/unset/websocket.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/xhr.https.html b/tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/xhr.https.html.headers b/tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/unset/xhr.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/xhr.https.html.headers rename to tests/wpt/tests/mixed-content/gen/sharedworker-module.http-rp/unset/xhr.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/beacon.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/beacon.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/beacon.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/beacon.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/fetch.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/fetch.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/object-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/object-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/object-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/object-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag-dynamic-import.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/script-tag-dynamic-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag-dynamic-import.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/script-tag-dynamic-import.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag-dynamic-import.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/script-tag-dynamic-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag-dynamic-import.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/script-tag-dynamic-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/websocket.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/websocket.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr.https.html b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr.https.html.headers b/tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/xhr.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr.https.html.headers rename to tests/wpt/tests/mixed-content/gen/top.http-rp/opt-in/xhr.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/audio-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/audio-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/beacon.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/beacon.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/img-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/img-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/link-css-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/link-css-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/object-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/object-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/picture-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/picture-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag-dynamic-import.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/script-tag-dynamic-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag-dynamic-import.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/script-tag-dynamic-import.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/script-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/script-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-classic.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-classic.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-import.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-import.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-module.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-module.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/video-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/video-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/opt-in/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/opt-in/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/audio-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/audio-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/beacon.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/beacon.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/img-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/img-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/link-css-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/link-css-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/object-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/object-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/picture-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/picture-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag-dynamic-import.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/script-tag-dynamic-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag-dynamic-import.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/script-tag-dynamic-import.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/script-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/script-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-import.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-import.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/video-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/video-tag.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr.https.html b/tests/wpt/tests/mixed-content/gen/top.meta/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/top.meta/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/websocket.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/websocket.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/websocket.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/websocket.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/websocket.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/websocket.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic-data.meta/opt-in/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic-data.meta/opt-in/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/xhr.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic-data.meta/opt-in/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic-data.meta/opt-in/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/websocket.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic-data.meta/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic-data.meta/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/xhr.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic-data.meta/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic-data.meta/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/opt-in/fetch.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/opt-in/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/opt-in/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/opt-in/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/opt-in/websocket.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/opt-in/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/opt-in/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/opt-in/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/opt-in/worker-classic.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/opt-in/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/opt-in/worker-classic.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/opt-in/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/opt-in/worker-module.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/opt-in/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/opt-in/worker-module.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/opt-in/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/opt-in/xhr.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/opt-in/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/opt-in/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/opt-in/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/fetch.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/fetch.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/fetch.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/fetch.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/fetch.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/websocket.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/websocket.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/websocket.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/websocket.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/websocket.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/worker-classic.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/worker-classic.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/worker-classic.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/worker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/worker-classic.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/worker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/worker-module.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/worker-module.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/worker-module.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/worker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/worker-module.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/worker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/xhr.https.html b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/xhr.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/xhr.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-classic.http-rp/unset/xhr.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-classic.http-rp/unset/xhr.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/fetch.https.html b/tests/wpt/tests/mixed-content/gen/worker-module-data.http-rp/opt-in/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module-data.http-rp/opt-in/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/fetch.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-module-data.http-rp/opt-in/fetch.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/fetch.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-module-data.http-rp/opt-in/fetch.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/websocket.https.html b/tests/wpt/tests/mixed-content/gen/worker-module-data.http-rp/opt-in/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module-data.http-rp/opt-in/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/websocket.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-module-data.http-rp/opt-in/websocket.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/websocket.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-module-data.http-rp/opt-in/websocket.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/xhr.https.html b/tests/wpt/tests/mixed-content/gen/worker-module-data.http-rp/opt-in/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module-data.http-rp/opt-in/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/xhr.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-module-data.http-rp/opt-in/xhr.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/xhr.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-module-data.http-rp/opt-in/xhr.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/fetch.https.html b/tests/wpt/tests/mixed-content/gen/worker-module-data.meta/opt-in/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module-data.meta/opt-in/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/websocket.https.html b/tests/wpt/tests/mixed-content/gen/worker-module-data.meta/opt-in/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module-data.meta/opt-in/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/xhr.https.html b/tests/wpt/tests/mixed-content/gen/worker-module-data.meta/opt-in/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module-data.meta/opt-in/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/fetch.https.html b/tests/wpt/tests/mixed-content/gen/worker-module-data.meta/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module-data.meta/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/websocket.https.html b/tests/wpt/tests/mixed-content/gen/worker-module-data.meta/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module-data.meta/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/xhr.https.html b/tests/wpt/tests/mixed-content/gen/worker-module-data.meta/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module-data.meta/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/opt-in/fetch.https.html b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/opt-in/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/opt-in/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/opt-in/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/opt-in/websocket.https.html b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/opt-in/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/opt-in/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/opt-in/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/opt-in/worker-classic.https.html b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/opt-in/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/opt-in/worker-classic.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/opt-in/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/opt-in/worker-module.https.html b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/opt-in/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/opt-in/worker-module.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/opt-in/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/opt-in/xhr.https.html b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/opt-in/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/opt-in/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/opt-in/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/fetch.https.html b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/fetch.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/fetch.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/fetch.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/fetch.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/fetch.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/websocket.https.html b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/websocket.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/websocket.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/websocket.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/websocket.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/websocket.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/worker-classic.https.html b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/worker-classic.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/worker-classic.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/worker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/worker-classic.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/worker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/worker-module.https.html b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/worker-module.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/worker-module.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/worker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/worker-module.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/worker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/xhr.https.html b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/xhr.https.html rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/xhr.https.html.headers b/tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/xhr.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/gen/worker-module.http-rp/unset/xhr.https.html.headers rename to tests/wpt/tests/mixed-content/gen/worker-module.http-rp/unset/xhr.https.html.headers diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/sanity-checker.js b/tests/wpt/tests/mixed-content/generic/sanity-checker.js similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/generic/sanity-checker.js rename to tests/wpt/tests/mixed-content/generic/sanity-checker.js diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/test-case.sub.js b/tests/wpt/tests/mixed-content/generic/test-case.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/generic/test-case.sub.js rename to tests/wpt/tests/mixed-content/generic/test-case.sub.js diff --git a/tests/wpt/web-platform-tests/mixed-content/imageset.https.sub.html b/tests/wpt/tests/mixed-content/imageset.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/imageset.https.sub.html rename to tests/wpt/tests/mixed-content/imageset.https.sub.html diff --git a/tests/wpt/web-platform-tests/mixed-content/nested-iframes.window.js b/tests/wpt/tests/mixed-content/nested-iframes.window.js similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/nested-iframes.window.js rename to tests/wpt/tests/mixed-content/nested-iframes.window.js diff --git a/tests/wpt/web-platform-tests/mixed-content/resources/blob-popup.html b/tests/wpt/tests/mixed-content/resources/blob-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/resources/blob-popup.html rename to tests/wpt/tests/mixed-content/resources/blob-popup.html diff --git a/tests/wpt/web-platform-tests/mixed-content/resources/middle-frame.html b/tests/wpt/tests/mixed-content/resources/middle-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/resources/middle-frame.html rename to tests/wpt/tests/mixed-content/resources/middle-frame.html diff --git a/tests/wpt/web-platform-tests/mixed-content/spec.src.json b/tests/wpt/tests/mixed-content/spec.src.json similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/spec.src.json rename to tests/wpt/tests/mixed-content/spec.src.json diff --git a/tests/wpt/web-platform-tests/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html b/tests/wpt/tests/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html rename to tests/wpt/tests/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html diff --git a/tests/wpt/web-platform-tests/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html b/tests/wpt/tests/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html rename to tests/wpt/tests/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html diff --git a/tests/wpt/web-platform-tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html b/tests/wpt/tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html rename to tests/wpt/tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html diff --git a/tests/wpt/web-platform-tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html b/tests/wpt/tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html rename to tests/wpt/tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html diff --git a/tests/wpt/web-platform-tests/mixed-content/tentative/resources/pass.png b/tests/wpt/tests/mixed-content/tentative/resources/pass.png similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/tentative/resources/pass.png rename to tests/wpt/tests/mixed-content/tentative/resources/pass.png diff --git a/tests/wpt/web-platform-tests/mixed-content/tentative/resources/test.ogv b/tests/wpt/tests/mixed-content/tentative/resources/test.ogv similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/tentative/resources/test.ogv rename to tests/wpt/tests/mixed-content/tentative/resources/test.ogv diff --git a/tests/wpt/web-platform-tests/mixed-content/tentative/resources/test.wav b/tests/wpt/tests/mixed-content/tentative/resources/test.wav similarity index 100% rename from tests/wpt/web-platform-tests/mixed-content/tentative/resources/test.wav rename to tests/wpt/tests/mixed-content/tentative/resources/test.wav diff --git a/tests/wpt/web-platform-tests/mst-content-hint/META.yml b/tests/wpt/tests/mst-content-hint/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/mst-content-hint/META.yml rename to tests/wpt/tests/mst-content-hint/META.yml diff --git a/tests/wpt/web-platform-tests/mst-content-hint/MediaStreamTrack-contentHint.html b/tests/wpt/tests/mst-content-hint/MediaStreamTrack-contentHint.html similarity index 100% rename from tests/wpt/web-platform-tests/mst-content-hint/MediaStreamTrack-contentHint.html rename to tests/wpt/tests/mst-content-hint/MediaStreamTrack-contentHint.html diff --git a/tests/wpt/web-platform-tests/mst-content-hint/RTCRtpSendParameters-degradationPreference.html b/tests/wpt/tests/mst-content-hint/RTCRtpSendParameters-degradationPreference.html similarity index 100% rename from tests/wpt/web-platform-tests/mst-content-hint/RTCRtpSendParameters-degradationPreference.html rename to tests/wpt/tests/mst-content-hint/RTCRtpSendParameters-degradationPreference.html diff --git a/tests/wpt/web-platform-tests/mst-content-hint/idlharness.window.js b/tests/wpt/tests/mst-content-hint/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/mst-content-hint/idlharness.window.js rename to tests/wpt/tests/mst-content-hint/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/navigation-api/META.yml b/tests/wpt/tests/navigation-api/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/META.yml rename to tests/wpt/tests/navigation-api/META.yml diff --git a/tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-new-navigation-before-commit.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-new-navigation-before-commit.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-new-navigation-before-commit.html rename to tests/wpt/tests/navigation-api/commit-behavior/after-transition-new-navigation-before-commit.html diff --git a/tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-push.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-push.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-push.html rename to tests/wpt/tests/navigation-api/commit-behavior/after-transition-push.html diff --git a/tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-reload.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-reload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-reload.html rename to tests/wpt/tests/navigation-api/commit-behavior/after-transition-reload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-replace.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-replace.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-replace.html rename to tests/wpt/tests/navigation-api/commit-behavior/after-transition-replace.html diff --git a/tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-traversal-commit-new-navigation-before-commit.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-traversal-commit-new-navigation-before-commit.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-traversal-commit-new-navigation-before-commit.html rename to tests/wpt/tests/navigation-api/commit-behavior/after-transition-traversal-commit-new-navigation-before-commit.html diff --git a/tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-traverse.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-traverse.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-traverse.html rename to tests/wpt/tests/navigation-api/commit-behavior/after-transition-traverse.html diff --git a/tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-uncancelable.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-uncancelable.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-uncancelable.html rename to tests/wpt/tests/navigation-api/commit-behavior/after-transition-uncancelable.html diff --git a/tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-window-stop-before-commit.html b/tests/wpt/tests/navigation-api/commit-behavior/after-transition-window-stop-before-commit.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/commit-behavior/after-transition-window-stop-before-commit.html rename to tests/wpt/tests/navigation-api/commit-behavior/after-transition-window-stop-before-commit.html diff --git a/tests/wpt/web-platform-tests/navigation-api/commit-behavior/commit-throws.html b/tests/wpt/tests/navigation-api/commit-behavior/commit-throws.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/commit-behavior/commit-throws.html rename to tests/wpt/tests/navigation-api/commit-behavior/commit-throws.html diff --git a/tests/wpt/web-platform-tests/navigation-api/commit-behavior/multiple-intercept.html b/tests/wpt/tests/navigation-api/commit-behavior/multiple-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/commit-behavior/multiple-intercept.html rename to tests/wpt/tests/navigation-api/commit-behavior/multiple-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/commit-behavior/resources/after-transition-commit-helpers.js b/tests/wpt/tests/navigation-api/commit-behavior/resources/after-transition-commit-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/commit-behavior/resources/after-transition-commit-helpers.js rename to tests/wpt/tests/navigation-api/commit-behavior/resources/after-transition-commit-helpers.js diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/anchor-click.html b/tests/wpt/tests/navigation-api/currententrychange-event/anchor-click.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/anchor-click.html rename to tests/wpt/tests/navigation-api/currententrychange-event/anchor-click.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/constructor.html b/tests/wpt/tests/navigation-api/currententrychange-event/constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/constructor.html rename to tests/wpt/tests/navigation-api/currententrychange-event/constructor.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/history-back-same-doc.html b/tests/wpt/tests/navigation-api/currententrychange-event/history-back-same-doc.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/history-back-same-doc.html rename to tests/wpt/tests/navigation-api/currententrychange-event/history-back-same-doc.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/history-pushState.html b/tests/wpt/tests/navigation-api/currententrychange-event/history-pushState.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/history-pushState.html rename to tests/wpt/tests/navigation-api/currententrychange-event/history-pushState.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/history-replaceState.html b/tests/wpt/tests/navigation-api/currententrychange-event/history-replaceState.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/history-replaceState.html rename to tests/wpt/tests/navigation-api/currententrychange-event/history-replaceState.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/location-api.html b/tests/wpt/tests/navigation-api/currententrychange-event/location-api.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/location-api.html rename to tests/wpt/tests/navigation-api/currententrychange-event/location-api.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc-popup.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc-popup.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc-popup.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-back-forward-cross-doc.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigation-back-forward-cross-doc.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-back-forward-cross-doc.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigation-back-forward-cross-doc.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-back-forward-same-doc.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigation-back-forward-same-doc.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-back-forward-same-doc.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigation-back-forward-same-doc.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-navigate-cross-doc.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigation-navigate-cross-doc.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-navigate-cross-doc.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigation-navigate-cross-doc.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-navigate-intercept.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigation-navigate-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-navigate-intercept.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigation-navigate-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-navigate-preventDefault.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigation-navigate-preventDefault.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-navigate-preventDefault.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigation-navigate-preventDefault.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-navigate-replace-cross-doc.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigation-navigate-replace-cross-doc.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-navigate-replace-cross-doc.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigation-navigate-replace-cross-doc.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-navigate-replace-intercept.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigation-navigate-replace-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-navigate-replace-intercept.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigation-navigate-replace-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-navigate-replace-same-doc.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigation-navigate-replace-same-doc.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-navigate-replace-same-doc.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigation-navigate-replace-same-doc.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-navigate-same-doc.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigation-navigate-same-doc.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-navigate-same-doc.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigation-navigate-same-doc.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-reload-cross-doc.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigation-reload-cross-doc.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-reload-cross-doc.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigation-reload-cross-doc.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-reload-intercept.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigation-reload-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-reload-intercept.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigation-reload-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-updateCurrentEntry.html b/tests/wpt/tests/navigation-api/currententrychange-event/navigation-updateCurrentEntry.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/navigation-updateCurrentEntry.html rename to tests/wpt/tests/navigation-api/currententrychange-event/navigation-updateCurrentEntry.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/not-on-load.html b/tests/wpt/tests/navigation-api/currententrychange-event/not-on-load.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/not-on-load.html rename to tests/wpt/tests/navigation-api/currententrychange-event/not-on-load.html diff --git a/tests/wpt/web-platform-tests/navigation-api/currententrychange-event/properties.html b/tests/wpt/tests/navigation-api/currententrychange-event/properties.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/currententrychange-event/properties.html rename to tests/wpt/tests/navigation-api/currententrychange-event/properties.html diff --git a/tests/wpt/web-platform-tests/navigation-api/focus-reset/autofocus.html b/tests/wpt/tests/navigation-api/focus-reset/autofocus.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/focus-reset/autofocus.html rename to tests/wpt/tests/navigation-api/focus-reset/autofocus.html diff --git a/tests/wpt/web-platform-tests/navigation-api/focus-reset/basic.html b/tests/wpt/tests/navigation-api/focus-reset/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/focus-reset/basic.html rename to tests/wpt/tests/navigation-api/focus-reset/basic.html diff --git a/tests/wpt/web-platform-tests/navigation-api/focus-reset/change-focus-again-in-blur-during-intercept.html b/tests/wpt/tests/navigation-api/focus-reset/change-focus-again-in-blur-during-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/focus-reset/change-focus-again-in-blur-during-intercept.html rename to tests/wpt/tests/navigation-api/focus-reset/change-focus-again-in-blur-during-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/focus-reset/change-focus-back-to-origial-during-intercept.html b/tests/wpt/tests/navigation-api/focus-reset/change-focus-back-to-origial-during-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/focus-reset/change-focus-back-to-origial-during-intercept.html rename to tests/wpt/tests/navigation-api/focus-reset/change-focus-back-to-origial-during-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/focus-reset/change-focus-during-intercept.html b/tests/wpt/tests/navigation-api/focus-reset/change-focus-during-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/focus-reset/change-focus-during-intercept.html rename to tests/wpt/tests/navigation-api/focus-reset/change-focus-during-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/focus-reset/change-focus-then-remove-during-intercept.html b/tests/wpt/tests/navigation-api/focus-reset/change-focus-then-remove-during-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/focus-reset/change-focus-then-remove-during-intercept.html rename to tests/wpt/tests/navigation-api/focus-reset/change-focus-then-remove-during-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/focus-reset/focus-reset-timing.html b/tests/wpt/tests/navigation-api/focus-reset/focus-reset-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/focus-reset/focus-reset-timing.html rename to tests/wpt/tests/navigation-api/focus-reset/focus-reset-timing.html diff --git a/tests/wpt/web-platform-tests/navigation-api/focus-reset/multiple-intercept.html b/tests/wpt/tests/navigation-api/focus-reset/multiple-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/focus-reset/multiple-intercept.html rename to tests/wpt/tests/navigation-api/focus-reset/multiple-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/focus-reset/resources/helpers.mjs b/tests/wpt/tests/navigation-api/focus-reset/resources/helpers.mjs similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/focus-reset/resources/helpers.mjs rename to tests/wpt/tests/navigation-api/focus-reset/resources/helpers.mjs diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-origin-traversal-does-not-fire-navigate.html b/tests/wpt/tests/navigation-api/navigate-event/cross-origin-traversal-does-not-fire-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-origin-traversal-does-not-fire-navigate.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-origin-traversal-does-not-fire-navigate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/click-crossdocument-crossorigin-sameorigindomain.sub.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/click-crossdocument-crossorigin-sameorigindomain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/click-crossdocument-crossorigin-sameorigindomain.sub.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/click-crossdocument-crossorigin-sameorigindomain.sub.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/click-crossdocument-crossorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/click-crossdocument-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/click-crossdocument-crossorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/click-crossdocument-crossorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/click-crossdocument-sameorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/click-crossdocument-sameorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/click-crossdocument-sameorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/click-crossdocument-sameorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/click-samedocument-crossorigin-sameorigindomain.sub.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/click-samedocument-crossorigin-sameorigindomain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/click-samedocument-crossorigin-sameorigindomain.sub.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/click-samedocument-crossorigin-sameorigindomain.sub.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/click-samedocument-crossorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/click-samedocument-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/click-samedocument-crossorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/click-samedocument-crossorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/click-samedocument-sameorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/click-samedocument-sameorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/click-samedocument-sameorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/click-samedocument-sameorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/location-crossdocument-crossorigin-sameorigindomain.sub.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/location-crossdocument-crossorigin-sameorigindomain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/location-crossdocument-crossorigin-sameorigindomain.sub.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/location-crossdocument-crossorigin-sameorigindomain.sub.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/location-crossdocument-crossorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/location-crossdocument-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/location-crossdocument-crossorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/location-crossdocument-crossorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/location-crossdocument-sameorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/location-crossdocument-sameorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/location-crossdocument-sameorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/location-crossdocument-sameorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/location-samedocument-crossorigin-sameorigindomain.sub.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/location-samedocument-crossorigin-sameorigindomain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/location-samedocument-crossorigin-sameorigindomain.sub.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/location-samedocument-crossorigin-sameorigindomain.sub.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/location-samedocument-crossorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/location-samedocument-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/location-samedocument-crossorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/location-samedocument-crossorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/location-samedocument-sameorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/location-samedocument-sameorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/location-samedocument-sameorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/location-samedocument-sameorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/open-crossdocument-crossorigin-sameorigindomain.sub.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/open-crossdocument-crossorigin-sameorigindomain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/open-crossdocument-crossorigin-sameorigindomain.sub.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/open-crossdocument-crossorigin-sameorigindomain.sub.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/open-crossdocument-crossorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/open-crossdocument-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/open-crossdocument-crossorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/open-crossdocument-crossorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/open-crossdocument-sameorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/open-crossdocument-sameorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/open-crossdocument-sameorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/open-crossdocument-sameorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/open-samedocument-crossorigin-sameorigindomain.sub.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/open-samedocument-crossorigin-sameorigindomain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/open-samedocument-crossorigin-sameorigindomain.sub.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/open-samedocument-crossorigin-sameorigindomain.sub.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/open-samedocument-crossorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/open-samedocument-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/open-samedocument-crossorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/open-samedocument-crossorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/open-samedocument-sameorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/open-samedocument-sameorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/open-samedocument-sameorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/open-samedocument-sameorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/resources/cross-origin-iframe-helper.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/resources/cross-origin-iframe-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/resources/cross-origin-iframe-helper.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/resources/cross-origin-iframe-helper.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/resources/document-domain-setter.sub.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/resources/document-domain-setter.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/resources/document-domain-setter.sub.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/resources/document-domain-setter.sub.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/submit-crossdocument-crossorigin-sameorigindomain.sub.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/submit-crossdocument-crossorigin-sameorigindomain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/submit-crossdocument-crossorigin-sameorigindomain.sub.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/submit-crossdocument-crossorigin-sameorigindomain.sub.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/submit-crossdocument-crossorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/submit-crossdocument-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/submit-crossdocument-crossorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/submit-crossdocument-crossorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/submit-crossdocument-sameorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/submit-crossdocument-sameorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/submit-crossdocument-sameorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/submit-crossdocument-sameorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/submit-samedocument-crossorigin-sameorigindomain.sub.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/submit-samedocument-crossorigin-sameorigindomain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/submit-samedocument-crossorigin-sameorigindomain.sub.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/submit-samedocument-crossorigin-sameorigindomain.sub.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/submit-samedocument-crossorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/submit-samedocument-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/submit-samedocument-crossorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/submit-samedocument-crossorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/submit-samedocument-sameorigin.html b/tests/wpt/tests/navigation-api/navigate-event/cross-window/submit-samedocument-sameorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/cross-window/submit-samedocument-sameorigin.html rename to tests/wpt/tests/navigation-api/navigate-event/cross-window/submit-samedocument-sameorigin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/defaultPrevented-navigation-preempted.html b/tests/wpt/tests/navigation-api/navigate-event/defaultPrevented-navigation-preempted.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/defaultPrevented-navigation-preempted.html rename to tests/wpt/tests/navigation-api/navigate-event/defaultPrevented-navigation-preempted.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/defaultPrevented-window-stop-after-dispatch.html b/tests/wpt/tests/navigation-api/navigate-event/defaultPrevented-window-stop-after-dispatch.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/defaultPrevented-window-stop-after-dispatch.html rename to tests/wpt/tests/navigation-api/navigate-event/defaultPrevented-window-stop-after-dispatch.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/event-constructor.html b/tests/wpt/tests/navigation-api/navigate-event/event-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/event-constructor.html rename to tests/wpt/tests/navigation-api/navigate-event/event-constructor.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-after-dispatch.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-after-dispatch.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-after-dispatch.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-after-dispatch.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-and-navigate.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-and-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-and-navigate.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-and-navigate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-canceled-event.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-canceled-event.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-canceled-event.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-canceled-event.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-cross-document-same-origin.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-cross-document-same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-cross-document-same-origin.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-cross-document-same-origin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-cross-origin.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-cross-origin.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-cross-origin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-detach-multiple.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-detach-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-detach-multiple.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-detach-multiple.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-detach.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-detach.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-detach.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-detach.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-handler-null-or-undefined.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-handler-null-or-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-handler-null-or-undefined.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-handler-null-or-undefined.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-handler-returns-non-promise.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-handler-returns-non-promise.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-handler-returns-non-promise.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-handler-returns-non-promise.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-handler-throws.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-handler-throws.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-handler-throws.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-handler-throws.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-history-pushState.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-history-pushState.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-history-pushState.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-history-pushState.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-history-replaceState.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-history-replaceState.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-history-replaceState.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-history-replaceState.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-multiple-times-reject.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-multiple-times-reject.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-multiple-times-reject.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-multiple-times-reject.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-multiple-times.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-multiple-times.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-multiple-times.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-multiple-times.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-navigation-back.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-navigation-back.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-navigation-back.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-navigation-back.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-on-synthetic-event.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-on-synthetic-event.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-on-synthetic-event.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-on-synthetic-event.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-popstate.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-popstate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-popstate.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-popstate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-reject.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-reject.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-reject.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-reject.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-resolve.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-resolve.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-resolve.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-resolve.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-same-document-history-back.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-same-document-history-back.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/intercept-same-document-history-back.html rename to tests/wpt/tests/navigation-api/navigate-event/intercept-same-document-history-back.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-anchor-cross-origin.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-anchor-cross-origin.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-cross-origin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-anchor-download-userInitiated.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-download-userInitiated.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-anchor-download-userInitiated.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-download-userInitiated.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-anchor-download.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-download.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-anchor-download.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-download.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-anchor-fragment.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-anchor-fragment.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-fragment.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-anchor-same-origin-cross-document.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-same-origin-cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-anchor-same-origin-cross-document.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-same-origin-cross-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-anchor-userInitiated.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-userInitiated.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-anchor-userInitiated.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-userInitiated.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-anchor-with-target.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-with-target.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-anchor-with-target.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-with-target.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-destination-after-detach.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-after-detach.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-destination-after-detach.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-destination-after-detach.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-destination-dynamic-index.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-dynamic-index.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-destination-dynamic-index.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-destination-dynamic-index.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-destination-getState-back-forward.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-back-forward.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-destination-getState-back-forward.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-back-forward.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-destination-getState-navigate.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-destination-getState-navigate.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-navigate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-destination-getState-reload.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-reload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-destination-getState-reload.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-reload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-form-get.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-get.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-form-get.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-form-get.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-form-reload.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-reload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-form-reload.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-form-reload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-form-traverse.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-traverse.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-form-traverse.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-form-traverse.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-form-userInitiated.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-userInitiated.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-form-userInitiated.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-form-userInitiated.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-form-with-target.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-with-target.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-form-with-target.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-form-with-target.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-form.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-form.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-form.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-form.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-history-back-after-fragment.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-after-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-history-back-after-fragment.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-after-fragment.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-history-back-after-pushState.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-after-pushState.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-history-back-after-pushState.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-after-pushState.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-history-back-cross-document.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-history-back-cross-document.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-cross-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-history-back-noop.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-noop.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-history-back-noop.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-noop.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-history-go-0.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-go-0.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-history-go-0.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-history-go-0.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-history-pushState.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-pushState.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-history-pushState.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-history-pushState.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-history-replaceState.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-replaceState.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-history-replaceState.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-history-replaceState.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-iframe-location.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-iframe-location.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-iframe-location.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-iframe-location.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-location.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-location.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-location.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-location.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-meta-refresh.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-meta-refresh.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-meta-refresh.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-meta-refresh.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-navigation-back-cross-document.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-navigation-back-cross-document.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-cross-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-navigation-back-same-document-in-iframe.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-navigation-back-same-document-in-iframe.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document-in-iframe.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-navigation-back-same-document.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-navigation-back-same-document.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-navigation-navigate.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-navigation-navigate.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-navigate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-to-javascript.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-to-javascript.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-to-javascript.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-to-javascript.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-to-srcdoc.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-to-srcdoc.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-to-srcdoc.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-to-srcdoc.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-window-open-self.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-window-open-self.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-window-open-self.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-window-open-self.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-window-open.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-window-open.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigate-window-open.html rename to tests/wpt/tests/navigation-api/navigate-event/navigate-window-open.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigatesuccess-cross-document.html b/tests/wpt/tests/navigation-api/navigate-event/navigatesuccess-cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigatesuccess-cross-document.html rename to tests/wpt/tests/navigation-api/navigate-event/navigatesuccess-cross-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigatesuccess-same-document.html b/tests/wpt/tests/navigation-api/navigate-event/navigatesuccess-same-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigatesuccess-same-document.html rename to tests/wpt/tests/navigation-api/navigate-event/navigatesuccess-same-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-back-cross-document-preventDefault.html b/tests/wpt/tests/navigation-api/navigate-event/navigation-back-cross-document-preventDefault.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-back-cross-document-preventDefault.html rename to tests/wpt/tests/navigation-api/navigate-event/navigation-back-cross-document-preventDefault.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-back-same-document-preventDefault.html b/tests/wpt/tests/navigation-api/navigate-event/navigation-back-same-document-preventDefault.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-back-same-document-preventDefault.html rename to tests/wpt/tests/navigation-api/navigate-event/navigation-back-same-document-preventDefault.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-traverseTo-in-iframe-same-document-preventDefault.html b/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-in-iframe-same-document-preventDefault.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-traverseTo-in-iframe-same-document-preventDefault.html rename to tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-in-iframe-same-document-preventDefault.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-traverseTo-navigates-top-and-same-doc-child-and-cross-doc-child.html b/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-navigates-top-and-same-doc-child-and-cross-doc-child.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-traverseTo-navigates-top-and-same-doc-child-and-cross-doc-child.html rename to tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-navigates-top-and-same-doc-child-and-cross-doc-child.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-traverseTo-same-document-preventDefault-multiple-windows.html b/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-same-document-preventDefault-multiple-windows.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-traverseTo-same-document-preventDefault-multiple-windows.html rename to tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-same-document-preventDefault-multiple-windows.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-traverseTo-top-cancels-cross-document-child.html b/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-top-cancels-cross-document-child.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/navigation-traverseTo-top-cancels-cross-document-child.html rename to tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-top-cancels-cross-document-child.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/replaceState-in-unload-then-remove-iframe.html b/tests/wpt/tests/navigation-api/navigate-event/replaceState-in-unload-then-remove-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/replaceState-in-unload-then-remove-iframe.html rename to tests/wpt/tests/navigation-api/navigate-event/replaceState-in-unload-then-remove-iframe.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/replaceState-inside-back-handler.html b/tests/wpt/tests/navigation-api/navigate-event/replaceState-inside-back-handler.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/replaceState-inside-back-handler.html rename to tests/wpt/tests/navigation-api/navigate-event/replaceState-inside-back-handler.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/resources/meta-refresh.html b/tests/wpt/tests/navigation-api/navigate-event/resources/meta-refresh.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/resources/meta-refresh.html rename to tests/wpt/tests/navigation-api/navigate-event/resources/meta-refresh.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/resources/navigatesuccess-cross-document-helper.html b/tests/wpt/tests/navigation-api/navigate-event/resources/navigatesuccess-cross-document-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/resources/navigatesuccess-cross-document-helper.html rename to tests/wpt/tests/navigation-api/navigate-event/resources/navigatesuccess-cross-document-helper.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/resources/opener-postMessage-onload.html b/tests/wpt/tests/navigation-api/navigate-event/resources/opener-postMessage-onload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/resources/opener-postMessage-onload.html rename to tests/wpt/tests/navigation-api/navigate-event/resources/opener-postMessage-onload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/same-url-replace-cross-document.html b/tests/wpt/tests/navigation-api/navigate-event/same-url-replace-cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/same-url-replace-cross-document.html rename to tests/wpt/tests/navigation-api/navigate-event/same-url-replace-cross-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/same-url-replace-same-document.html b/tests/wpt/tests/navigation-api/navigate-event/same-url-replace-same-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/same-url-replace-same-document.html rename to tests/wpt/tests/navigation-api/navigate-event/same-url-replace-same-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/signal-abort-detach-in-onnavigate.html b/tests/wpt/tests/navigation-api/navigate-event/signal-abort-detach-in-onnavigate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/signal-abort-detach-in-onnavigate.html rename to tests/wpt/tests/navigation-api/navigate-event/signal-abort-detach-in-onnavigate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/signal-abort-intercept.html b/tests/wpt/tests/navigation-api/navigate-event/signal-abort-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/signal-abort-intercept.html rename to tests/wpt/tests/navigation-api/navigate-event/signal-abort-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/signal-abort-preventDefault.html b/tests/wpt/tests/navigation-api/navigate-event/signal-abort-preventDefault.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/signal-abort-preventDefault.html rename to tests/wpt/tests/navigation-api/navigate-event/signal-abort-preventDefault.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/signal-abort-window-stop-after-intercept.html b/tests/wpt/tests/navigation-api/navigate-event/signal-abort-window-stop-after-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/signal-abort-window-stop-after-intercept.html rename to tests/wpt/tests/navigation-api/navigate-event/signal-abort-window-stop-after-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/signal-abort-window-stop-in-onnavigate.html b/tests/wpt/tests/navigation-api/navigate-event/signal-abort-window-stop-in-onnavigate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/signal-abort-window-stop-in-onnavigate.html rename to tests/wpt/tests/navigation-api/navigate-event/signal-abort-window-stop-in-onnavigate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigate-event/signal-abort-window-stop.html b/tests/wpt/tests/navigation-api/navigate-event/signal-abort-window-stop.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigate-event/signal-abort-window-stop.html rename to tests/wpt/tests/navigation-api/navigate-event/signal-abort-window-stop.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/after-detach.html b/tests/wpt/tests/navigation-api/navigation-history-entry/after-detach.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/after-detach.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/after-detach.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/current-basic.html b/tests/wpt/tests/navigation-api/navigation-history-entry/current-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/current-basic.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/current-basic.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-across-origins.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entries-across-origins.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-across-origins.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entries-across-origins.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-bfcache-in-iframe.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-bfcache-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-bfcache-in-iframe.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-bfcache-in-iframe.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-bfcache.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-bfcache.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-bfcache.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-bfcache.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-blank-navigation-from-cross-origin.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-blank-navigation-from-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-blank-navigation-from-cross-origin.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-blank-navigation-from-cross-origin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-blank-navigation.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-blank-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-blank-navigation.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-blank-navigation.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-blob-navigation.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-blob-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-blob-navigation.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-blob-navigation.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-cross-document-forward-pruning.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-cross-document-forward-pruning.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-cross-document-forward-pruning.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-cross-document-forward-pruning.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-javascript-url-navigation.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-javascript-url-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-javascript-url-navigation.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-javascript-url-navigation.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-navigations-in-multiple-windows.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-navigations-in-multiple-windows.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-navigations-in-multiple-windows.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-navigations-in-multiple-windows.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-srcdoc-navigation.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-srcdoc-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-after-srcdoc-navigation.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entries-after-srcdoc-navigation.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-array-equality.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entries-array-equality.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-array-equality.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entries-array-equality.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-in-new-javascript-url-iframe.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entries-in-new-javascript-url-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-in-new-javascript-url-iframe.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entries-in-new-javascript-url-iframe.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-in-new-srcdoc-iframe.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entries-in-new-srcdoc-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-in-new-srcdoc-iframe.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entries-in-new-srcdoc-iframe.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-when-inactive.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entries-when-inactive.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entries-when-inactive.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entries-when-inactive.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entry-after-detach.html b/tests/wpt/tests/navigation-api/navigation-history-entry/entry-after-detach.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/entry-after-detach.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/entry-after-detach.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/index-not-in-entries.html b/tests/wpt/tests/navigation-api/navigation-history-entry/index-not-in-entries.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/index-not-in-entries.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/index-not-in-entries.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/key-id-back-cross-document.html b/tests/wpt/tests/navigation-api/navigation-history-entry/key-id-back-cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/key-id-back-cross-document.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/key-id-back-cross-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/key-id-back-same-document.html b/tests/wpt/tests/navigation-api/navigation-history-entry/key-id-back-same-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/key-id-back-same-document.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/key-id-back-same-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/key-id-location-reload-intercept.html b/tests/wpt/tests/navigation-api/navigation-history-entry/key-id-location-reload-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/key-id-location-reload-intercept.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/key-id-location-reload-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/key-id-location-reload.html b/tests/wpt/tests/navigation-api/navigation-history-entry/key-id-location-reload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/key-id-location-reload.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/key-id-location-reload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/key-id-location-replace-cross-origin.html b/tests/wpt/tests/navigation-api/navigation-history-entry/key-id-location-replace-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/key-id-location-replace-cross-origin.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/key-id-location-replace-cross-origin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/key-id-location-replace.html b/tests/wpt/tests/navigation-api/navigation-history-entry/key-id-location-replace.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/key-id-location-replace.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/key-id-location-replace.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/no-referrer-dynamic-url-censored.html b/tests/wpt/tests/navigation-api/navigation-history-entry/no-referrer-dynamic-url-censored.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/no-referrer-dynamic-url-censored.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/no-referrer-dynamic-url-censored.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/no-referrer-from-meta-url-censored.html b/tests/wpt/tests/navigation-api/navigation-history-entry/no-referrer-from-meta-url-censored.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/no-referrer-from-meta-url-censored.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/no-referrer-from-meta-url-censored.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/no-referrer-url-censored.html b/tests/wpt/tests/navigation-api/navigation-history-entry/no-referrer-url-censored.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/no-referrer-url-censored.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/no-referrer-url-censored.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/opaque-origin-data-url.html b/tests/wpt/tests/navigation-api/navigation-history-entry/opaque-origin-data-url.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/opaque-origin-data-url.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/opaque-origin-data-url.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/opaque-origin.html b/tests/wpt/tests/navigation-api/navigation-history-entry/opaque-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/opaque-origin.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/opaque-origin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/is_uuid.js b/tests/wpt/tests/navigation-api/navigation-history-entry/resources/is_uuid.js similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/is_uuid.js rename to tests/wpt/tests/navigation-api/navigation-history-entry/resources/is_uuid.js diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/key-navigate-back-cross-document-helper.html b/tests/wpt/tests/navigation-api/navigation-history-entry/resources/key-navigate-back-cross-document-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/key-navigate-back-cross-document-helper.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/resources/key-navigate-back-cross-document-helper.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/no-referrer-meta.html b/tests/wpt/tests/navigation-api/navigation-history-entry/resources/no-referrer-meta.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/no-referrer-meta.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/resources/no-referrer-meta.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/no-referrer.html b/tests/wpt/tests/navigation-api/navigation-history-entry/resources/no-referrer.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/no-referrer.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/resources/no-referrer.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/no-referrer.html.headers b/tests/wpt/tests/navigation-api/navigation-history-entry/resources/no-referrer.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/no-referrer.html.headers rename to tests/wpt/tests/navigation-api/navigation-history-entry/resources/no-referrer.html.headers diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/opaque-origin-page.html b/tests/wpt/tests/navigation-api/navigation-history-entry/resources/opaque-origin-page.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/opaque-origin-page.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/resources/opaque-origin-page.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/post-entries-length-to-top.html b/tests/wpt/tests/navigation-api/navigation-history-entry/resources/post-entries-length-to-top.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/post-entries-length-to-top.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/resources/post-entries-length-to-top.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/post-key-to-top.html b/tests/wpt/tests/navigation-api/navigation-history-entry/resources/post-key-to-top.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/resources/post-key-to-top.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/resources/post-key-to-top.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/sameDocument-after-fragment-navigate.html b/tests/wpt/tests/navigation-api/navigation-history-entry/sameDocument-after-fragment-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/sameDocument-after-fragment-navigate.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/sameDocument-after-fragment-navigate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/sameDocument-after-navigate-restore.html b/tests/wpt/tests/navigation-api/navigation-history-entry/sameDocument-after-navigate-restore.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/sameDocument-after-navigate-restore.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/sameDocument-after-navigate-restore.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/sameDocument-after-navigate.html b/tests/wpt/tests/navigation-api/navigation-history-entry/sameDocument-after-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/sameDocument-after-navigate.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/sameDocument-after-navigate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/state-after-navigate-restore.html b/tests/wpt/tests/navigation-api/navigation-history-entry/state-after-navigate-restore.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-history-entry/state-after-navigate-restore.html rename to tests/wpt/tests/navigation-api/navigation-history-entry/state-after-navigate-restore.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/back-forward-multiple-frames.html b/tests/wpt/tests/navigation-api/navigation-methods/back-forward-multiple-frames.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/back-forward-multiple-frames.html rename to tests/wpt/tests/navigation-api/navigation-methods/back-forward-multiple-frames.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/disambigaute-back.html b/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-back.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/disambigaute-back.html rename to tests/wpt/tests/navigation-api/navigation-methods/disambigaute-back.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/disambigaute-forward.html b/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-forward.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/disambigaute-forward.html rename to tests/wpt/tests/navigation-api/navigation-methods/disambigaute-forward.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/disambigaute-traverseTo-back-multiple.html b/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-traverseTo-back-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/disambigaute-traverseTo-back-multiple.html rename to tests/wpt/tests/navigation-api/navigation-methods/disambigaute-traverseTo-back-multiple.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/disambigaute-traverseTo-forward-multiple.html b/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-traverseTo-forward-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/disambigaute-traverseTo-forward-multiple.html rename to tests/wpt/tests/navigation-api/navigation-methods/disambigaute-traverseTo-forward-multiple.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/forward-to-pruned-entry.html b/tests/wpt/tests/navigation-api/navigation-methods/forward-to-pruned-entry.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/forward-to-pruned-entry.html rename to tests/wpt/tests/navigation-api/navigation-methods/forward-to-pruned-entry.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-base-url.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-base-url.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-base-url.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-base-url.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-from-initial-about-blank-gc.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-from-initial-about-blank-gc.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-from-initial-about-blank-gc.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-from-initial-about-blank-gc.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-from-initial-about-blank-src.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-from-initial-about-blank-src.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-from-initial-about-blank-src.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-from-initial-about-blank-src.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-from-initial-about-blank.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-from-initial-about-blank.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-from-initial-about-blank.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-from-initial-about-blank.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-history-push-not-loaded.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-history-push-not-loaded.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-history-push-not-loaded.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-history-push-not-loaded.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-history-push-same-url-cross-document.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-history-push-same-url-cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-history-push-same-url-cross-document.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-history-push-same-url-cross-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-history-push-same-url.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-history-push-same-url.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-history-push-same-url.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-history-push-same-url.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-history-state-replace.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-history-state-replace.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-history-state-replace.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-history-state-replace.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-history-state.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-history-state.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-history-state.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-history-state.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-info-and-state.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-info-and-state.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-info-and-state.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-info-and-state.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-intercept-history-state.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-intercept-history-state.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-intercept-history-state.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-intercept-history-state.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-relative-url.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-relative-url.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-relative-url.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-relative-url.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-replace-cross-document.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-replace-cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-replace-cross-document.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-replace-cross-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-replace-same-document.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-replace-same-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-replace-same-document.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-replace-same-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-same-document.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-same-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-same-document.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-same-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-state-repeated-await.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-state-repeated-await.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-state-repeated-await.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-state-repeated-await.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-state-repeated.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-state-repeated.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/navigate-state-repeated.html rename to tests/wpt/tests/navigation-api/navigation-methods/navigate-state-repeated.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/reload-base-url.html b/tests/wpt/tests/navigation-api/navigation-methods/reload-base-url.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/reload-base-url.html rename to tests/wpt/tests/navigation-api/navigation-methods/reload-base-url.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/reload-info.html b/tests/wpt/tests/navigation-api/navigation-methods/reload-info.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/reload-info.html rename to tests/wpt/tests/navigation-api/navigation-methods/reload-info.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/reload-navigation-timing.html b/tests/wpt/tests/navigation-api/navigation-methods/reload-navigation-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/reload-navigation-timing.html rename to tests/wpt/tests/navigation-api/navigation-methods/reload-navigation-timing.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/reload-no-args.html b/tests/wpt/tests/navigation-api/navigation-methods/reload-no-args.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/reload-no-args.html rename to tests/wpt/tests/navigation-api/navigation-methods/reload-no-args.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/reload-service-worker-fetch-event.html b/tests/wpt/tests/navigation-api/navigation-methods/reload-service-worker-fetch-event.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/reload-service-worker-fetch-event.html rename to tests/wpt/tests/navigation-api/navigation-methods/reload-service-worker-fetch-event.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/reload-state-and-info.html b/tests/wpt/tests/navigation-api/navigation-methods/reload-state-and-info.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/reload-state-and-info.html rename to tests/wpt/tests/navigation-api/navigation-methods/reload-state-and-info.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/reload-state-undefined.html b/tests/wpt/tests/navigation-api/navigation-methods/reload-state-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/reload-state-undefined.html rename to tests/wpt/tests/navigation-api/navigation-methods/reload-state-undefined.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/resources/fetch-event-test-worker.js b/tests/wpt/tests/navigation-api/navigation-methods/resources/fetch-event-test-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/resources/fetch-event-test-worker.js rename to tests/wpt/tests/navigation-api/navigation-methods/resources/fetch-event-test-worker.js diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/resources/navigate-parent.html b/tests/wpt/tests/navigation-api/navigation-methods/resources/navigate-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/resources/navigate-parent.html rename to tests/wpt/tests/navigation-api/navigation-methods/resources/navigate-parent.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/resources/navigate-sibling.html b/tests/wpt/tests/navigation-api/navigation-methods/resources/navigate-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/resources/navigate-sibling.html rename to tests/wpt/tests/navigation-api/navigation-methods/resources/navigate-sibling.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/resources/navigation-back.html b/tests/wpt/tests/navigation-api/navigation-methods/resources/navigation-back.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/resources/navigation-back.html rename to tests/wpt/tests/navigation-api/navigation-methods/resources/navigation-back.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/resources/page-with-base-url-common.html b/tests/wpt/tests/navigation-api/navigation-methods/resources/page-with-base-url-common.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/resources/page-with-base-url-common.html rename to tests/wpt/tests/navigation-api/navigation-methods/resources/page-with-base-url-common.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/resources/service-worker-page.html b/tests/wpt/tests/navigation-api/navigation-methods/resources/service-worker-page.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/resources/service-worker-page.html rename to tests/wpt/tests/navigation-api/navigation-methods/resources/service-worker-page.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/resources/slow-no-store.py b/tests/wpt/tests/navigation-api/navigation-methods/resources/slow-no-store.py similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/resources/slow-no-store.py rename to tests/wpt/tests/navigation-api/navigation-methods/resources/slow-no-store.py diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-204-205-download.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-204-205-download.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-204-205-download.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/back-204-205-download.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-already-detached.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-already-detached.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-already-detached.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/back-already-detached.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-beforeunload.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-beforeunload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-beforeunload.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/back-beforeunload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-forward-initial-about-blank.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-forward-initial-about-blank.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-forward-initial-about-blank.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/back-forward-initial-about-blank.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-forward-opaque-origin.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-forward-opaque-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-forward-opaque-origin.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/back-forward-opaque-origin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-forward-out-of-bounds.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-forward-out-of-bounds.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-forward-out-of-bounds.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/back-forward-out-of-bounds.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-intercept-rejected.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-intercept-rejected.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-intercept-rejected.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/back-intercept-rejected.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-intercept.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back-intercept.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/back-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/back.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/back.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/forward-already-detached.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-already-detached.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/forward-already-detached.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-already-detached.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/forward-beforeunload.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-beforeunload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/forward-beforeunload.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-beforeunload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/forward-intercept-rejected.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-intercept-rejected.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/forward-intercept-rejected.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-intercept-rejected.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/forward-intercept.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/forward-intercept.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/forward.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/forward.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/forward.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-204-205-download.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-204-205-download.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-204-205-download.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-204-205-download.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-already-detached.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-already-detached.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-already-detached.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-already-detached.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-beforeunload.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-beforeunload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-beforeunload.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-beforeunload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-cross-document.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-cross-document.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-cross-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-detach-in-onnavigate.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-detach-in-onnavigate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-detach-in-onnavigate.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-detach-in-onnavigate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-detach-in-serialization.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-detach-in-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-detach-in-serialization.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-detach-in-serialization.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-file-url.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-file-url.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-file-url.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-file-url.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-initial-about-blank-cross-document.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-initial-about-blank-cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-initial-about-blank-cross-document.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-initial-about-blank-cross-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-initial-about-blank.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-initial-about-blank.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-initial-about-blank.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-initial-about-blank.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-intercept-interrupted.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-intercept-interrupted.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-intercept-interrupted.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-intercept-interrupted.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-intercept-rejected.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-intercept-rejected.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-intercept-rejected.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-intercept-rejected.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-intercept.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-intercept.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-interrupted-within-onnavigate.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-interrupted-within-onnavigate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-interrupted-within-onnavigate.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-interrupted-within-onnavigate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-interrupted.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-interrupted.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-interrupted.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-interrupted.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-invalid-url.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-invalid-url.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-invalid-url.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-invalid-url.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-opaque-origin.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-opaque-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-opaque-origin.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-opaque-origin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-preventDefault.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-preventDefault.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-preventDefault.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-preventDefault.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-push-initial-about-blank.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-push-initial-about-blank.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-push-initial-about-blank.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-push-initial-about-blank.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-push-javascript-url.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-push-javascript-url.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-push-javascript-url.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-push-javascript-url.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-beforeunload-unserializablestate.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-beforeunload-unserializablestate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-beforeunload-unserializablestate.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-beforeunload-unserializablestate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-detached-unserializablestate.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-detached-unserializablestate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-detached-unserializablestate.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-detached-unserializablestate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-beforeunload.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-beforeunload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-beforeunload.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-beforeunload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-detached.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-detached.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-detached.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-detached.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-unload.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-unload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-unload.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-unload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-unserializablestate.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-unserializablestate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-unserializablestate.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-invalidurl-unserializablestate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-unload-unserializablestate.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-unload-unserializablestate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-unload-unserializablestate.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-rejection-order-unload-unserializablestate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-unload.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-unload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-unload.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-unload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-unserializable-state.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-unserializable-state.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate-unserializable-state.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-unserializable-state.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/navigate.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-already-detached.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-already-detached.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-already-detached.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-already-detached.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-beforeunload.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-beforeunload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-beforeunload.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-beforeunload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-detach-in-onnavigate.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-detach-in-onnavigate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-detach-in-onnavigate.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-detach-in-onnavigate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-detach-in-serialization.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-detach-in-serialization.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-detach-in-serialization.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-detach-in-serialization.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-initial-about-blank.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-initial-about-blank.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-initial-about-blank.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-initial-about-blank.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-intercept-rejected.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-intercept-rejected.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-intercept-rejected.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-intercept-rejected.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-intercept.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-intercept.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-preventDefault.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-preventDefault.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-preventDefault.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-preventDefault.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-rejection-order-beforeunload-unserializablestate.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-rejection-order-beforeunload-unserializablestate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-rejection-order-beforeunload-unserializablestate.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-rejection-order-beforeunload-unserializablestate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-rejection-order-detached-unserializablestate.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-rejection-order-detached-unserializablestate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-rejection-order-detached-unserializablestate.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-rejection-order-detached-unserializablestate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-rejection-order-unload-unserializablestate.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-rejection-order-unload-unserializablestate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-rejection-order-unload-unserializablestate.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-rejection-order-unload-unserializablestate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-unload.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-unload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-unload.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-unload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-unserializable-state.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-unserializable-state.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload-unserializable-state.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/reload-unserializable-state.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/reload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/reload.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/reload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/resources/204-205-download-on-second-visit.py b/tests/wpt/tests/navigation-api/navigation-methods/return-value/resources/204-205-download-on-second-visit.py similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/resources/204-205-download-on-second-visit.py rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/resources/204-205-download-on-second-visit.py diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/resources/back-forward-opaque-origin-page.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/resources/back-forward-opaque-origin-page.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/resources/back-forward-opaque-origin-page.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/resources/back-forward-opaque-origin-page.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/resources/helpers.js b/tests/wpt/tests/navigation-api/navigation-methods/return-value/resources/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/resources/helpers.js rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/resources/helpers.js diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/resources/navigate-opaque-origin-page.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/resources/navigate-opaque-origin-page.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/resources/navigate-opaque-origin-page.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/resources/navigate-opaque-origin-page.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-already-detached.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-already-detached.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-already-detached.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-already-detached.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-beforeunload.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-beforeunload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-beforeunload.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-beforeunload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-cross-document-preventDefault.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-cross-document-preventDefault.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-cross-document-preventDefault.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-cross-document-preventDefault.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-current.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-current.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-current.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-current.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-detach-cross-document-before-navigate-event.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-detach-cross-document-before-navigate-event.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-detach-cross-document-before-navigate-event.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-detach-cross-document-before-navigate-event.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-detach-cross-document.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-detach-cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-detach-cross-document.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-detach-cross-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-detach-same-document-before-navigate-event.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-detach-same-document-before-navigate-event.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-detach-same-document-before-navigate-event.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-detach-same-document-before-navigate-event.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-detach-same-document.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-detach-same-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-detach-same-document.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-detach-same-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-intercept-rejected.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-intercept-rejected.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-intercept-rejected.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-intercept-rejected.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-intercept.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-intercept.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-invalid-key.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-invalid-key.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-invalid-key.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-invalid-key.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-repeated.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-repeated.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo-repeated.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-repeated.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/return-value/traverseTo.html rename to tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-back-parent.html b/tests/wpt/tests/navigation-api/navigation-methods/sandboxing-back-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-back-parent.html rename to tests/wpt/tests/navigation-api/navigation-methods/sandboxing-back-parent.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-back-sibling.html b/tests/wpt/tests/navigation-api/navigation-methods/sandboxing-back-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-back-sibling.html rename to tests/wpt/tests/navigation-api/navigation-methods/sandboxing-back-sibling.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-navigate-parent.html b/tests/wpt/tests/navigation-api/navigation-methods/sandboxing-navigate-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-navigate-parent.html rename to tests/wpt/tests/navigation-api/navigation-methods/sandboxing-navigate-parent.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-navigate-sibling.html b/tests/wpt/tests/navigation-api/navigation-methods/sandboxing-navigate-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/sandboxing-navigate-sibling.html rename to tests/wpt/tests/navigation-api/navigation-methods/sandboxing-navigate-sibling.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-after-adding-iframe.html b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-after-adding-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-after-adding-iframe.html rename to tests/wpt/tests/navigation-api/navigation-methods/traverseTo-after-adding-iframe.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-after-data-url.html b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-after-data-url.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-after-data-url.html rename to tests/wpt/tests/navigation-api/navigation-methods/traverseTo-after-data-url.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-cross-document.html b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-cross-document.html rename to tests/wpt/tests/navigation-api/navigation-methods/traverseTo-cross-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-detach-between-navigate-and-navigatesuccess.html b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-detach-between-navigate-and-navigatesuccess.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-detach-between-navigate-and-navigatesuccess.html rename to tests/wpt/tests/navigation-api/navigation-methods/traverseTo-detach-between-navigate-and-navigatesuccess.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-multiple-steps.html b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-multiple-steps.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-multiple-steps.html rename to tests/wpt/tests/navigation-api/navigation-methods/traverseTo-multiple-steps.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-navigates-multiple-iframes.html b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-navigates-multiple-iframes.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-navigates-multiple-iframes.html rename to tests/wpt/tests/navigation-api/navigation-methods/traverseTo-navigates-multiple-iframes.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-same-document.html b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-same-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-same-document.html rename to tests/wpt/tests/navigation-api/navigation-methods/traverseTo-same-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-with-cross-origin-in-history.html b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-with-cross-origin-in-history.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/navigation-methods/traverseTo-with-cross-origin-in-history.html rename to tests/wpt/tests/navigation-api/navigation-methods/traverseTo-with-cross-origin-in-history.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/README.md b/tests/wpt/tests/navigation-api/ordering-and-transition/README.md similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/README.md rename to tests/wpt/tests/navigation-api/ordering-and-transition/README.md diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/anchor-download-intercept-reject.html b/tests/wpt/tests/navigation-api/ordering-and-transition/anchor-download-intercept-reject.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/anchor-download-intercept-reject.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/anchor-download-intercept-reject.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/anchor-download-intercept.html b/tests/wpt/tests/navigation-api/ordering-and-transition/anchor-download-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/anchor-download-intercept.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/anchor-download-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/anchor-download.html b/tests/wpt/tests/navigation-api/ordering-and-transition/anchor-download.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/anchor-download.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/anchor-download.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/back-same-document-intercept-reject.html b/tests/wpt/tests/navigation-api/ordering-and-transition/back-same-document-intercept-reject.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/back-same-document-intercept-reject.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/back-same-document-intercept-reject.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/back-same-document-intercept.html b/tests/wpt/tests/navigation-api/ordering-and-transition/back-same-document-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/back-same-document-intercept.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/back-same-document-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/back-same-document.html b/tests/wpt/tests/navigation-api/ordering-and-transition/back-same-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/back-same-document.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/back-same-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/currententrychange-before-popstate-intercept.html b/tests/wpt/tests/navigation-api/ordering-and-transition/currententrychange-before-popstate-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/currententrychange-before-popstate-intercept.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/currententrychange-before-popstate-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/currententrychange-dispose-ordering.html b/tests/wpt/tests/navigation-api/ordering-and-transition/currententrychange-dispose-ordering.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/currententrychange-dispose-ordering.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/currententrychange-dispose-ordering.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/intercept-async.html b/tests/wpt/tests/navigation-api/ordering-and-transition/intercept-async.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/intercept-async.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/intercept-async.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/location-href-canceled.html b/tests/wpt/tests/navigation-api/ordering-and-transition/location-href-canceled.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/location-href-canceled.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/location-href-canceled.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/location-href-double-intercept.html b/tests/wpt/tests/navigation-api/ordering-and-transition/location-href-double-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/location-href-double-intercept.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/location-href-double-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/location-href-intercept-reentrant.html b/tests/wpt/tests/navigation-api/ordering-and-transition/location-href-intercept-reentrant.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/location-href-intercept-reentrant.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/location-href-intercept-reentrant.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/location-href-intercept-reject.html b/tests/wpt/tests/navigation-api/ordering-and-transition/location-href-intercept-reject.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/location-href-intercept-reject.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/location-href-intercept-reject.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/location-href-intercept.html b/tests/wpt/tests/navigation-api/ordering-and-transition/location-href-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/location-href-intercept.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/location-href-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-204-205-download-then-same-document.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-204-205-download-then-same-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-204-205-download-then-same-document.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/navigate-204-205-download-then-same-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-canceled.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-canceled.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-canceled.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/navigate-canceled.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-commit-after-transition-intercept.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-commit-after-transition-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-commit-after-transition-intercept.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/navigate-commit-after-transition-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-cross-document-double.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-cross-document-double.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-cross-document-double.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/navigate-cross-document-double.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-cross-document-event-order.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-cross-document-event-order.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-cross-document-event-order.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/navigate-cross-document-event-order.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-double-intercept.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-double-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-double-intercept.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/navigate-double-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-in-transition-finished.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-in-transition-finished.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-in-transition-finished.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/navigate-in-transition-finished.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-intercept-stop.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-stop.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-intercept-stop.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept-stop.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-intercept.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-intercept.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/navigate-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reentrant.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reentrant.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reentrant.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reentrant.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-same-document.html b/tests/wpt/tests/navigation-api/ordering-and-transition/navigate-same-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/navigate-same-document.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/navigate-same-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/reload-canceled.html b/tests/wpt/tests/navigation-api/ordering-and-transition/reload-canceled.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/reload-canceled.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/reload-canceled.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/reload-intercept-reject.html b/tests/wpt/tests/navigation-api/ordering-and-transition/reload-intercept-reject.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/reload-intercept-reject.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/reload-intercept-reject.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/reload-intercept.html b/tests/wpt/tests/navigation-api/ordering-and-transition/reload-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/reload-intercept.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/reload-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/resources/helpers.mjs b/tests/wpt/tests/navigation-api/ordering-and-transition/resources/helpers.mjs similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/resources/helpers.mjs rename to tests/wpt/tests/navigation-api/ordering-and-transition/resources/helpers.mjs diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/resources/notify-top-early.html b/tests/wpt/tests/navigation-api/ordering-and-transition/resources/notify-top-early.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/resources/notify-top-early.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/resources/notify-top-early.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/transition-cross-document.html b/tests/wpt/tests/navigation-api/ordering-and-transition/transition-cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/transition-cross-document.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/transition-cross-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/transition-finished-mark-as-handled.html b/tests/wpt/tests/navigation-api/ordering-and-transition/transition-finished-mark-as-handled.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/transition-finished-mark-as-handled.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/transition-finished-mark-as-handled.html diff --git a/tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/transition-realms-and-identity.html b/tests/wpt/tests/navigation-api/ordering-and-transition/transition-realms-and-identity.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/ordering-and-transition/transition-realms-and-identity.html rename to tests/wpt/tests/navigation-api/ordering-and-transition/transition-realms-and-identity.html diff --git a/tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-after-bfcache.html b/tests/wpt/tests/navigation-api/per-entry-events/dispose-after-bfcache.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-after-bfcache.html rename to tests/wpt/tests/navigation-api/per-entry-events/dispose-after-bfcache.html diff --git a/tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-cross-document.html b/tests/wpt/tests/navigation-api/per-entry-events/dispose-cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-cross-document.html rename to tests/wpt/tests/navigation-api/per-entry-events/dispose-cross-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-for-full-session-history.tentative.html b/tests/wpt/tests/navigation-api/per-entry-events/dispose-for-full-session-history.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-for-full-session-history.tentative.html rename to tests/wpt/tests/navigation-api/per-entry-events/dispose-for-full-session-history.tentative.html diff --git a/tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-for-navigation-in-child.html b/tests/wpt/tests/navigation-api/per-entry-events/dispose-for-navigation-in-child.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-for-navigation-in-child.html rename to tests/wpt/tests/navigation-api/per-entry-events/dispose-for-navigation-in-child.html diff --git a/tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-same-document-intercept.html b/tests/wpt/tests/navigation-api/per-entry-events/dispose-same-document-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-same-document-intercept.html rename to tests/wpt/tests/navigation-api/per-entry-events/dispose-same-document-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-same-document-navigate-during.html b/tests/wpt/tests/navigation-api/per-entry-events/dispose-same-document-navigate-during.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-same-document-navigate-during.html rename to tests/wpt/tests/navigation-api/per-entry-events/dispose-same-document-navigate-during.html diff --git a/tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-same-document-reload-with-intercept.html b/tests/wpt/tests/navigation-api/per-entry-events/dispose-same-document-reload-with-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-same-document-reload-with-intercept.html rename to tests/wpt/tests/navigation-api/per-entry-events/dispose-same-document-reload-with-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-same-document-replace-with-intercept.html b/tests/wpt/tests/navigation-api/per-entry-events/dispose-same-document-replace-with-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-same-document-replace-with-intercept.html rename to tests/wpt/tests/navigation-api/per-entry-events/dispose-same-document-replace-with-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-same-document-replaceState.html b/tests/wpt/tests/navigation-api/per-entry-events/dispose-same-document-replaceState.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-same-document-replaceState.html rename to tests/wpt/tests/navigation-api/per-entry-events/dispose-same-document-replaceState.html diff --git a/tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-same-document.html b/tests/wpt/tests/navigation-api/per-entry-events/dispose-same-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-same-document.html rename to tests/wpt/tests/navigation-api/per-entry-events/dispose-same-document.html diff --git a/tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-skip-current-on-truncate.html b/tests/wpt/tests/navigation-api/per-entry-events/dispose-skip-current-on-truncate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/per-entry-events/dispose-skip-current-on-truncate.html rename to tests/wpt/tests/navigation-api/per-entry-events/dispose-skip-current-on-truncate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-basic.html b/tests/wpt/tests/navigation-api/scroll-behavior/after-transition-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-basic.html rename to tests/wpt/tests/navigation-api/scroll-behavior/after-transition-basic.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-change-history-scroll-restoration-during-promise.html b/tests/wpt/tests/navigation-api/scroll-behavior/after-transition-change-history-scroll-restoration-during-promise.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-change-history-scroll-restoration-during-promise.html rename to tests/wpt/tests/navigation-api/scroll-behavior/after-transition-change-history-scroll-restoration-during-promise.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-explicit-scroll.html b/tests/wpt/tests/navigation-api/scroll-behavior/after-transition-explicit-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-explicit-scroll.html rename to tests/wpt/tests/navigation-api/scroll-behavior/after-transition-explicit-scroll.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-intercept-handler-modifies.html b/tests/wpt/tests/navigation-api/scroll-behavior/after-transition-intercept-handler-modifies.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-intercept-handler-modifies.html rename to tests/wpt/tests/navigation-api/scroll-behavior/after-transition-intercept-handler-modifies.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-push.html b/tests/wpt/tests/navigation-api/scroll-behavior/after-transition-push.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-push.html rename to tests/wpt/tests/navigation-api/scroll-behavior/after-transition-push.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-reject.html b/tests/wpt/tests/navigation-api/scroll-behavior/after-transition-reject.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-reject.html rename to tests/wpt/tests/navigation-api/scroll-behavior/after-transition-reject.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-reload.html b/tests/wpt/tests/navigation-api/scroll-behavior/after-transition-reload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-reload.html rename to tests/wpt/tests/navigation-api/scroll-behavior/after-transition-reload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-replace.html b/tests/wpt/tests/navigation-api/scroll-behavior/after-transition-replace.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-replace.html rename to tests/wpt/tests/navigation-api/scroll-behavior/after-transition-replace.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-timing.html b/tests/wpt/tests/navigation-api/scroll-behavior/after-transition-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-timing.html rename to tests/wpt/tests/navigation-api/scroll-behavior/after-transition-timing.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-with-history-scroll-restoration-manual.html b/tests/wpt/tests/navigation-api/scroll-behavior/after-transition-with-history-scroll-restoration-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/after-transition-with-history-scroll-restoration-manual.html rename to tests/wpt/tests/navigation-api/scroll-behavior/after-transition-with-history-scroll-restoration-manual.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-basic.html b/tests/wpt/tests/navigation-api/scroll-behavior/manual-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-basic.html rename to tests/wpt/tests/navigation-api/scroll-behavior/manual-basic.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-immediate-scroll.html b/tests/wpt/tests/navigation-api/scroll-behavior/manual-immediate-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-immediate-scroll.html rename to tests/wpt/tests/navigation-api/scroll-behavior/manual-immediate-scroll.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-after-dispatch.html b/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-after-dispatch.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-after-dispatch.html rename to tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-after-dispatch.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-after-resolve.html b/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-after-resolve.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-after-resolve.html rename to tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-after-resolve.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-before-after-transition-commit.html b/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-before-after-transition-commit.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-before-after-transition-commit.html rename to tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-before-after-transition-commit.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-fragment-does-not-exist.html b/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-fragment-does-not-exist.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-fragment-does-not-exist.html rename to tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-fragment-does-not-exist.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-push.html b/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-push.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-push.html rename to tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-push.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-reload.html b/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-reload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-reload.html rename to tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-reload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-repeated.html b/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-repeated.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-repeated.html rename to tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-repeated.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-replace.html b/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-replace.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-replace.html rename to tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-replace.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-resets-when-no-fragment.html b/tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-resets-when-no-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/manual-scroll-resets-when-no-fragment.html rename to tests/wpt/tests/navigation-api/scroll-behavior/manual-scroll-resets-when-no-fragment.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/scroll-after-preventDefault.html b/tests/wpt/tests/navigation-api/scroll-behavior/scroll-after-preventDefault.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/scroll-after-preventDefault.html rename to tests/wpt/tests/navigation-api/scroll-behavior/scroll-after-preventDefault.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/scroll-on-synthetic-event.html b/tests/wpt/tests/navigation-api/scroll-behavior/scroll-on-synthetic-event.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/scroll-on-synthetic-event.html rename to tests/wpt/tests/navigation-api/scroll-behavior/scroll-on-synthetic-event.html diff --git a/tests/wpt/web-platform-tests/navigation-api/scroll-behavior/scroll-without-intercept.html b/tests/wpt/tests/navigation-api/scroll-behavior/scroll-without-intercept.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/scroll-behavior/scroll-without-intercept.html rename to tests/wpt/tests/navigation-api/scroll-behavior/scroll-without-intercept.html diff --git a/tests/wpt/web-platform-tests/navigation-api/state/cross-document-away-and-back.html b/tests/wpt/tests/navigation-api/state/cross-document-away-and-back.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/state/cross-document-away-and-back.html rename to tests/wpt/tests/navigation-api/state/cross-document-away-and-back.html diff --git a/tests/wpt/web-platform-tests/navigation-api/state/cross-document-getState-undefined.html b/tests/wpt/tests/navigation-api/state/cross-document-getState-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/state/cross-document-getState-undefined.html rename to tests/wpt/tests/navigation-api/state/cross-document-getState-undefined.html diff --git a/tests/wpt/web-platform-tests/navigation-api/state/cross-document-getState.html b/tests/wpt/tests/navigation-api/state/cross-document-getState.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/state/cross-document-getState.html rename to tests/wpt/tests/navigation-api/state/cross-document-getState.html diff --git a/tests/wpt/web-platform-tests/navigation-api/state/cross-document-location-api.html b/tests/wpt/tests/navigation-api/state/cross-document-location-api.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/state/cross-document-location-api.html rename to tests/wpt/tests/navigation-api/state/cross-document-location-api.html diff --git a/tests/wpt/web-platform-tests/navigation-api/state/history-pushState.html b/tests/wpt/tests/navigation-api/state/history-pushState.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/state/history-pushState.html rename to tests/wpt/tests/navigation-api/state/history-pushState.html diff --git a/tests/wpt/web-platform-tests/navigation-api/state/history-replaceState.html b/tests/wpt/tests/navigation-api/state/history-replaceState.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/state/history-replaceState.html rename to tests/wpt/tests/navigation-api/state/history-replaceState.html diff --git a/tests/wpt/web-platform-tests/navigation-api/state/location-reload.html b/tests/wpt/tests/navigation-api/state/location-reload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/state/location-reload.html rename to tests/wpt/tests/navigation-api/state/location-reload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/state/same-document-away-and-back-location-api.html b/tests/wpt/tests/navigation-api/state/same-document-away-and-back-location-api.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/state/same-document-away-and-back-location-api.html rename to tests/wpt/tests/navigation-api/state/same-document-away-and-back-location-api.html diff --git a/tests/wpt/web-platform-tests/navigation-api/state/same-document-away-and-back-navigation-api.html b/tests/wpt/tests/navigation-api/state/same-document-away-and-back-navigation-api.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/state/same-document-away-and-back-navigation-api.html rename to tests/wpt/tests/navigation-api/state/same-document-away-and-back-navigation-api.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/basic.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/basic.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/basic.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/cross-document-away-and-back.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/cross-document-away-and-back.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/cross-document-away-and-back.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/cross-document-away-and-back.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/cross-document-location-api.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/cross-document-location-api.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/cross-document-location-api.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/cross-document-location-api.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/exception-order-initial-about-blank-unserializablestate.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/exception-order-initial-about-blank-unserializablestate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/exception-order-initial-about-blank-unserializablestate.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/exception-order-initial-about-blank-unserializablestate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/exception-order-not-fully-active-unserializablestate.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/exception-order-not-fully-active-unserializablestate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/exception-order-not-fully-active-unserializablestate.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/exception-order-not-fully-active-unserializablestate.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/history-pushState.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/history-pushState.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/history-pushState.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/history-pushState.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/history-replaceState.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/history-replaceState.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/history-replaceState.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/history-replaceState.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/initial-about-blank.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/initial-about-blank.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/initial-about-blank.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/initial-about-blank.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/location-reload.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/location-reload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/location-reload.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/location-reload.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/no-args.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/no-args.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/no-args.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/no-args.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/not-fully-active.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/not-fully-active.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/not-fully-active.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/not-fully-active.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/opaque-origin.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/opaque-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/opaque-origin.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/opaque-origin.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/resources/opaque-origin-page.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/resources/opaque-origin-page.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/resources/opaque-origin-page.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/resources/opaque-origin-page.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/same-document-away-and-back-location-api.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/same-document-away-and-back-location-api.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/same-document-away-and-back-location-api.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/same-document-away-and-back-location-api.html diff --git a/tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/unserializable.html b/tests/wpt/tests/navigation-api/updateCurrentEntry-method/unserializable.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-api/updateCurrentEntry-method/unserializable.html rename to tests/wpt/tests/navigation-api/updateCurrentEntry-method/unserializable.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/META.yml b/tests/wpt/tests/navigation-timing/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/META.yml rename to tests/wpt/tests/navigation-timing/META.yml diff --git a/tests/wpt/web-platform-tests/navigation-timing/buffered-flag.window.js b/tests/wpt/tests/navigation-timing/buffered-flag.window.js similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/buffered-flag.window.js rename to tests/wpt/tests/navigation-timing/buffered-flag.window.js diff --git a/tests/wpt/web-platform-tests/navigation-timing/dom-interactive-image-document.html b/tests/wpt/tests/navigation-timing/dom-interactive-image-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/dom-interactive-image-document.html rename to tests/wpt/tests/navigation-timing/dom-interactive-image-document.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/dom-interactive-media-document.html b/tests/wpt/tests/navigation-timing/dom-interactive-media-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/dom-interactive-media-document.html rename to tests/wpt/tests/navigation-timing/dom-interactive-media-document.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/idlharness.window.js b/tests/wpt/tests/navigation-timing/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/idlharness.window.js rename to tests/wpt/tests/navigation-timing/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-data-uri.html b/tests/wpt/tests/navigation-timing/nav2-data-uri.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-data-uri.html rename to tests/wpt/tests/navigation-timing/nav2-data-uri.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-attributes-exist.html b/tests/wpt/tests/navigation-timing/nav2-test-attributes-exist.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-attributes-exist.html rename to tests/wpt/tests/navigation-timing/nav2-test-attributes-exist.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-attributes-values.html b/tests/wpt/tests/navigation-timing/nav2-test-attributes-values.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-attributes-values.html rename to tests/wpt/tests/navigation-timing/nav2-test-attributes-values.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-document-open.html b/tests/wpt/tests/navigation-timing/nav2-test-document-open.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-document-open.html rename to tests/wpt/tests/navigation-timing/nav2-test-document-open.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-document-replaced.html b/tests/wpt/tests/navigation-timing/nav2-test-document-replaced.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-document-replaced.html rename to tests/wpt/tests/navigation-timing/nav2-test-document-replaced.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-frame-removed.html b/tests/wpt/tests/navigation-timing/nav2-test-frame-removed.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-frame-removed.html rename to tests/wpt/tests/navigation-timing/nav2-test-frame-removed.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-instance-accessible-from-the-start.html b/tests/wpt/tests/navigation-timing/nav2-test-instance-accessible-from-the-start.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-instance-accessible-from-the-start.html rename to tests/wpt/tests/navigation-timing/nav2-test-instance-accessible-from-the-start.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-instance-accessors.html b/tests/wpt/tests/navigation-timing/nav2-test-instance-accessors.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-instance-accessors.html rename to tests/wpt/tests/navigation-timing/nav2-test-instance-accessors.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-navigate-iframe.html b/tests/wpt/tests/navigation-timing/nav2-test-navigate-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-navigate-iframe.html rename to tests/wpt/tests/navigation-timing/nav2-test-navigate-iframe.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-navigate-within-document.html b/tests/wpt/tests/navigation-timing/nav2-test-navigate-within-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-navigate-within-document.html rename to tests/wpt/tests/navigation-timing/nav2-test-navigate-within-document.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-navigation-type-backforward.html b/tests/wpt/tests/navigation-timing/nav2-test-navigation-type-backforward.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-navigation-type-backforward.html rename to tests/wpt/tests/navigation-timing/nav2-test-navigation-type-backforward.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-navigation-type-navigate.html b/tests/wpt/tests/navigation-timing/nav2-test-navigation-type-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-navigation-type-navigate.html rename to tests/wpt/tests/navigation-timing/nav2-test-navigation-type-navigate.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-navigation-type-reload.html b/tests/wpt/tests/navigation-timing/nav2-test-navigation-type-reload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-navigation-type-reload.html rename to tests/wpt/tests/navigation-timing/nav2-test-navigation-type-reload.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-redirect-chain-xserver-final-original-origin.html b/tests/wpt/tests/navigation-timing/nav2-test-redirect-chain-xserver-final-original-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-redirect-chain-xserver-final-original-origin.html rename to tests/wpt/tests/navigation-timing/nav2-test-redirect-chain-xserver-final-original-origin.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-redirect-chain-xserver-partial-opt-in.html b/tests/wpt/tests/navigation-timing/nav2-test-redirect-chain-xserver-partial-opt-in.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-redirect-chain-xserver-partial-opt-in.html rename to tests/wpt/tests/navigation-timing/nav2-test-redirect-chain-xserver-partial-opt-in.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-redirect-none.html b/tests/wpt/tests/navigation-timing/nav2-test-redirect-none.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-redirect-none.html rename to tests/wpt/tests/navigation-timing/nav2-test-redirect-none.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-redirect-server.html b/tests/wpt/tests/navigation-timing/nav2-test-redirect-server.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-redirect-server.html rename to tests/wpt/tests/navigation-timing/nav2-test-redirect-server.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-redirect-xserver.html b/tests/wpt/tests/navigation-timing/nav2-test-redirect-xserver.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-redirect-xserver.html rename to tests/wpt/tests/navigation-timing/nav2-test-redirect-xserver.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-response-end-and-duration-before-during-and-after-load-event.html b/tests/wpt/tests/navigation-timing/nav2-test-response-end-and-duration-before-during-and-after-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-response-end-and-duration-before-during-and-after-load-event.html rename to tests/wpt/tests/navigation-timing/nav2-test-response-end-and-duration-before-during-and-after-load-event.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2-test-unique-nav-instances.html b/tests/wpt/tests/navigation-timing/nav2-test-unique-nav-instances.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nav2-test-unique-nav-instances.html rename to tests/wpt/tests/navigation-timing/nav2-test-unique-nav-instances.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/navigation-type-post-backforward.html b/tests/wpt/tests/navigation-timing/navigation-type-post-backforward.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/navigation-type-post-backforward.html rename to tests/wpt/tests/navigation-timing/navigation-type-post-backforward.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/nested-unload-timing.html b/tests/wpt/tests/navigation-timing/nested-unload-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/nested-unload-timing.html rename to tests/wpt/tests/navigation-timing/nested-unload-timing.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/po-navigation.html b/tests/wpt/tests/navigation-timing/po-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/po-navigation.html rename to tests/wpt/tests/navigation-timing/po-navigation.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/prefetch-transfer-size-executor.html b/tests/wpt/tests/navigation-timing/prefetch-transfer-size-executor.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/prefetch-transfer-size-executor.html rename to tests/wpt/tests/navigation-timing/prefetch-transfer-size-executor.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/prefetch-transfer-size-iframe.html b/tests/wpt/tests/navigation-timing/prefetch-transfer-size-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/prefetch-transfer-size-iframe.html rename to tests/wpt/tests/navigation-timing/prefetch-transfer-size-iframe.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/blank-page-green-with-onunload.html b/tests/wpt/tests/navigation-timing/resources/blank-page-green-with-onunload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/blank-page-green-with-onunload.html rename to tests/wpt/tests/navigation-timing/resources/blank-page-green-with-onunload.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/blank-page-green.html b/tests/wpt/tests/navigation-timing/resources/blank-page-green.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/blank-page-green.html rename to tests/wpt/tests/navigation-timing/resources/blank-page-green.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/blank-page-meta-redirect.html b/tests/wpt/tests/navigation-timing/resources/blank-page-meta-redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/blank-page-meta-redirect.html rename to tests/wpt/tests/navigation-timing/resources/blank-page-meta-redirect.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/blank-page-unload.html b/tests/wpt/tests/navigation-timing/resources/blank-page-unload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/blank-page-unload.html rename to tests/wpt/tests/navigation-timing/resources/blank-page-unload.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/blank-page-yellow-with-onunload.html b/tests/wpt/tests/navigation-timing/resources/blank-page-yellow-with-onunload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/blank-page-yellow-with-onunload.html rename to tests/wpt/tests/navigation-timing/resources/blank-page-yellow-with-onunload.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/blank-page-yellow.html b/tests/wpt/tests/navigation-timing/resources/blank-page-yellow.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/blank-page-yellow.html rename to tests/wpt/tests/navigation-timing/resources/blank-page-yellow.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/blank_page_prefetch.html b/tests/wpt/tests/navigation-timing/resources/blank_page_prefetch.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/blank_page_prefetch.html rename to tests/wpt/tests/navigation-timing/resources/blank_page_prefetch.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/blank_page_prefetch.html.headers b/tests/wpt/tests/navigation-timing/resources/blank_page_prefetch.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/blank_page_prefetch.html.headers rename to tests/wpt/tests/navigation-timing/resources/blank_page_prefetch.html.headers diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/iframe-prefetch-transfer-size.html b/tests/wpt/tests/navigation-timing/resources/iframe-prefetch-transfer-size.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/iframe-prefetch-transfer-size.html rename to tests/wpt/tests/navigation-timing/resources/iframe-prefetch-transfer-size.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/navigation-type-post-back.html b/tests/wpt/tests/navigation-timing/resources/navigation-type-post-back.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/navigation-type-post-back.html rename to tests/wpt/tests/navigation-timing/resources/navigation-type-post-back.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/navigation_type_post_back.py b/tests/wpt/tests/navigation-timing/resources/navigation_type_post_back.py similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/navigation_type_post_back.py rename to tests/wpt/tests/navigation-timing/resources/navigation_type_post_back.py diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/performance-attribute-sender.html b/tests/wpt/tests/navigation-timing/resources/performance-attribute-sender.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/performance-attribute-sender.html rename to tests/wpt/tests/navigation-timing/resources/performance-attribute-sender.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/respond-slowly.py b/tests/wpt/tests/navigation-timing/resources/respond-slowly.py similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/respond-slowly.py rename to tests/wpt/tests/navigation-timing/resources/respond-slowly.py diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/secure-connection-interim.html b/tests/wpt/tests/navigation-timing/resources/secure-connection-interim.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/secure-connection-interim.html rename to tests/wpt/tests/navigation-timing/resources/secure-connection-interim.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/secure-connection-interim.html.headers b/tests/wpt/tests/navigation-timing/resources/secure-connection-interim.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/secure-connection-interim.html.headers rename to tests/wpt/tests/navigation-timing/resources/secure-connection-interim.html.headers diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/secure-connection-test.html b/tests/wpt/tests/navigation-timing/resources/secure-connection-test.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/secure-connection-test.html rename to tests/wpt/tests/navigation-timing/resources/secure-connection-test.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/resources/webperftestharness.js b/tests/wpt/tests/navigation-timing/resources/webperftestharness.js similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/resources/webperftestharness.js rename to tests/wpt/tests/navigation-timing/resources/webperftestharness.js diff --git a/tests/wpt/web-platform-tests/navigation-timing/secure-connection-start-non-zero.https.html b/tests/wpt/tests/navigation-timing/secure-connection-start-non-zero.https.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/secure-connection-start-non-zero.https.html rename to tests/wpt/tests/navigation-timing/secure-connection-start-non-zero.https.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/secure-connection-start-reuse.https.html b/tests/wpt/tests/navigation-timing/secure-connection-start-reuse.https.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/secure-connection-start-reuse.https.html rename to tests/wpt/tests/navigation-timing/secure-connection-start-reuse.https.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/supported-navigation-type.window.js b/tests/wpt/tests/navigation-timing/supported-navigation-type.window.js similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/supported-navigation-type.window.js rename to tests/wpt/tests/navigation-timing/supported-navigation-type.window.js diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-document-onload.html b/tests/wpt/tests/navigation-timing/test-document-onload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-document-onload.html rename to tests/wpt/tests/navigation-timing/test-document-onload.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-document-open.html b/tests/wpt/tests/navigation-timing/test-document-open.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-document-open.html rename to tests/wpt/tests/navigation-timing/test-document-open.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-document-readiness-exist.html b/tests/wpt/tests/navigation-timing/test-document-readiness-exist.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-document-readiness-exist.html rename to tests/wpt/tests/navigation-timing/test-document-readiness-exist.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-navigate-within-document.html b/tests/wpt/tests/navigation-timing/test-navigate-within-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-navigate-within-document.html rename to tests/wpt/tests/navigation-timing/test-navigate-within-document.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-navigation-attributes-exist.html b/tests/wpt/tests/navigation-timing/test-navigation-attributes-exist.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-navigation-attributes-exist.html rename to tests/wpt/tests/navigation-timing/test-navigation-attributes-exist.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-navigation-redirectCount-none.html b/tests/wpt/tests/navigation-timing/test-navigation-redirectCount-none.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-navigation-redirectCount-none.html rename to tests/wpt/tests/navigation-timing/test-navigation-redirectCount-none.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-navigation-type-backforward.html b/tests/wpt/tests/navigation-timing/test-navigation-type-backforward.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-navigation-type-backforward.html rename to tests/wpt/tests/navigation-timing/test-navigation-type-backforward.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-navigation-type-enums.html b/tests/wpt/tests/navigation-timing/test-navigation-type-enums.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-navigation-type-enums.html rename to tests/wpt/tests/navigation-timing/test-navigation-type-enums.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-navigation-type-reload.html b/tests/wpt/tests/navigation-timing/test-navigation-type-reload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-navigation-type-reload.html rename to tests/wpt/tests/navigation-timing/test-navigation-type-reload.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-no-previous-document.html b/tests/wpt/tests/navigation-timing/test-no-previous-document.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-no-previous-document.html rename to tests/wpt/tests/navigation-timing/test-no-previous-document.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-performance-attributes-exist-in-object.html b/tests/wpt/tests/navigation-timing/test-performance-attributes-exist-in-object.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-performance-attributes-exist-in-object.html rename to tests/wpt/tests/navigation-timing/test-performance-attributes-exist-in-object.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-performance-attributes-exist.html b/tests/wpt/tests/navigation-timing/test-performance-attributes-exist.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-performance-attributes-exist.html rename to tests/wpt/tests/navigation-timing/test-performance-attributes-exist.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-performance-attributes.sub.html b/tests/wpt/tests/navigation-timing/test-performance-attributes.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-performance-attributes.sub.html rename to tests/wpt/tests/navigation-timing/test-performance-attributes.sub.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-readwrite.html b/tests/wpt/tests/navigation-timing/test-readwrite.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-readwrite.html rename to tests/wpt/tests/navigation-timing/test-readwrite.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-timing-attributes-exist.html b/tests/wpt/tests/navigation-timing/test-timing-attributes-exist.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-timing-attributes-exist.html rename to tests/wpt/tests/navigation-timing/test-timing-attributes-exist.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-timing-attributes-order.html b/tests/wpt/tests/navigation-timing/test-timing-attributes-order.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-timing-attributes-order.html rename to tests/wpt/tests/navigation-timing/test-timing-attributes-order.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-timing-client-redirect.html b/tests/wpt/tests/navigation-timing/test-timing-client-redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-timing-client-redirect.html rename to tests/wpt/tests/navigation-timing/test-timing-client-redirect.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-timing-reload.html b/tests/wpt/tests/navigation-timing/test-timing-reload.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-timing-reload.html rename to tests/wpt/tests/navigation-timing/test-timing-reload.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-timing-server-redirect.html b/tests/wpt/tests/navigation-timing/test-timing-server-redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-timing-server-redirect.html rename to tests/wpt/tests/navigation-timing/test-timing-server-redirect.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-timing-xserver-redirect.html b/tests/wpt/tests/navigation-timing/test-timing-xserver-redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-timing-xserver-redirect.html rename to tests/wpt/tests/navigation-timing/test-timing-xserver-redirect.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/test-unique-performance-objects.html b/tests/wpt/tests/navigation-timing/test-unique-performance-objects.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/test-unique-performance-objects.html rename to tests/wpt/tests/navigation-timing/test-unique-performance-objects.html diff --git a/tests/wpt/web-platform-tests/navigation-timing/unload-event-same-origin-check.html b/tests/wpt/tests/navigation-timing/unload-event-same-origin-check.html similarity index 100% rename from tests/wpt/web-platform-tests/navigation-timing/unload-event-same-origin-check.html rename to tests/wpt/tests/navigation-timing/unload-event-same-origin-check.html diff --git a/tests/wpt/web-platform-tests/netinfo/META.yml b/tests/wpt/tests/netinfo/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/netinfo/META.yml rename to tests/wpt/tests/netinfo/META.yml diff --git a/tests/wpt/web-platform-tests/netinfo/idlharness.any.js b/tests/wpt/tests/netinfo/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/netinfo/idlharness.any.js rename to tests/wpt/tests/netinfo/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/netinfo/netinfo-basics.html b/tests/wpt/tests/netinfo/netinfo-basics.html similarity index 100% rename from tests/wpt/web-platform-tests/netinfo/netinfo-basics.html rename to tests/wpt/tests/netinfo/netinfo-basics.html diff --git a/tests/wpt/web-platform-tests/network-error-logging/META.yml b/tests/wpt/tests/network-error-logging/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/META.yml rename to tests/wpt/tests/network-error-logging/META.yml diff --git a/tests/wpt/web-platform-tests/network-error-logging/README.md b/tests/wpt/tests/network-error-logging/README.md similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/README.md rename to tests/wpt/tests/network-error-logging/README.md diff --git a/tests/wpt/web-platform-tests/network-error-logging/no-report-on-failed-cors-preflight.https.html b/tests/wpt/tests/network-error-logging/no-report-on-failed-cors-preflight.https.html similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/no-report-on-failed-cors-preflight.https.html rename to tests/wpt/tests/network-error-logging/no-report-on-failed-cors-preflight.https.html diff --git a/tests/wpt/web-platform-tests/network-error-logging/no-report-on-subdomain-404.https.html b/tests/wpt/tests/network-error-logging/no-report-on-subdomain-404.https.html similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/no-report-on-subdomain-404.https.html rename to tests/wpt/tests/network-error-logging/no-report-on-subdomain-404.https.html diff --git a/tests/wpt/web-platform-tests/network-error-logging/no-report-on-subdomain-success.https.html b/tests/wpt/tests/network-error-logging/no-report-on-subdomain-success.https.html similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/no-report-on-subdomain-success.https.html rename to tests/wpt/tests/network-error-logging/no-report-on-subdomain-success.https.html diff --git a/tests/wpt/web-platform-tests/network-error-logging/no-report-on-unexpired-cached-response.https.html b/tests/wpt/tests/network-error-logging/no-report-on-unexpired-cached-response.https.html similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/no-report-on-unexpired-cached-response.https.html rename to tests/wpt/tests/network-error-logging/no-report-on-unexpired-cached-response.https.html diff --git a/tests/wpt/web-platform-tests/network-error-logging/reports-are-not-observable.https.html b/tests/wpt/tests/network-error-logging/reports-are-not-observable.https.html similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/reports-are-not-observable.https.html rename to tests/wpt/tests/network-error-logging/reports-are-not-observable.https.html diff --git a/tests/wpt/web-platform-tests/network-error-logging/sends-report-on-404.https.html b/tests/wpt/tests/network-error-logging/sends-report-on-404.https.html similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/sends-report-on-404.https.html rename to tests/wpt/tests/network-error-logging/sends-report-on-404.https.html diff --git a/tests/wpt/web-platform-tests/network-error-logging/sends-report-on-cache-validation.https.html b/tests/wpt/tests/network-error-logging/sends-report-on-cache-validation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/sends-report-on-cache-validation.https.html rename to tests/wpt/tests/network-error-logging/sends-report-on-cache-validation.https.html diff --git a/tests/wpt/web-platform-tests/network-error-logging/sends-report-on-redirect.https.html b/tests/wpt/tests/network-error-logging/sends-report-on-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/sends-report-on-redirect.https.html rename to tests/wpt/tests/network-error-logging/sends-report-on-redirect.https.html diff --git a/tests/wpt/web-platform-tests/network-error-logging/sends-report-on-subdomain-dns-failure.https.html b/tests/wpt/tests/network-error-logging/sends-report-on-subdomain-dns-failure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/sends-report-on-subdomain-dns-failure.https.html rename to tests/wpt/tests/network-error-logging/sends-report-on-subdomain-dns-failure.https.html diff --git a/tests/wpt/web-platform-tests/network-error-logging/sends-report-on-success-with-subdomain-policy.https.html b/tests/wpt/tests/network-error-logging/sends-report-on-success-with-subdomain-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/sends-report-on-success-with-subdomain-policy.https.html rename to tests/wpt/tests/network-error-logging/sends-report-on-success-with-subdomain-policy.https.html diff --git a/tests/wpt/web-platform-tests/network-error-logging/sends-report-on-success.https.html b/tests/wpt/tests/network-error-logging/sends-report-on-success.https.html similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/sends-report-on-success.https.html rename to tests/wpt/tests/network-error-logging/sends-report-on-success.https.html diff --git a/tests/wpt/web-platform-tests/network-error-logging/support/cached-for-one-minute.png b/tests/wpt/tests/network-error-logging/support/cached-for-one-minute.png similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/support/cached-for-one-minute.png rename to tests/wpt/tests/network-error-logging/support/cached-for-one-minute.png diff --git a/tests/wpt/web-platform-tests/network-error-logging/support/cached-for-one-minute.png.sub.headers b/tests/wpt/tests/network-error-logging/support/cached-for-one-minute.png.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/support/cached-for-one-minute.png.sub.headers rename to tests/wpt/tests/network-error-logging/support/cached-for-one-minute.png.sub.headers diff --git a/tests/wpt/web-platform-tests/network-error-logging/support/cached-with-validation.py b/tests/wpt/tests/network-error-logging/support/cached-with-validation.py similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/support/cached-with-validation.py rename to tests/wpt/tests/network-error-logging/support/cached-with-validation.py diff --git a/tests/wpt/web-platform-tests/network-error-logging/support/clear-policy-pass.png b/tests/wpt/tests/network-error-logging/support/clear-policy-pass.png similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/support/clear-policy-pass.png rename to tests/wpt/tests/network-error-logging/support/clear-policy-pass.png diff --git a/tests/wpt/web-platform-tests/network-error-logging/support/clear-policy-pass.png.sub.headers b/tests/wpt/tests/network-error-logging/support/clear-policy-pass.png.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/support/clear-policy-pass.png.sub.headers rename to tests/wpt/tests/network-error-logging/support/clear-policy-pass.png.sub.headers diff --git a/tests/wpt/web-platform-tests/network-error-logging/support/lock.py b/tests/wpt/tests/network-error-logging/support/lock.py similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/support/lock.py rename to tests/wpt/tests/network-error-logging/support/lock.py diff --git a/tests/wpt/web-platform-tests/network-error-logging/support/nel.sub.js b/tests/wpt/tests/network-error-logging/support/nel.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/support/nel.sub.js rename to tests/wpt/tests/network-error-logging/support/nel.sub.js diff --git a/tests/wpt/web-platform-tests/network-error-logging/support/no-policy-pass.png b/tests/wpt/tests/network-error-logging/support/no-policy-pass.png similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/support/no-policy-pass.png rename to tests/wpt/tests/network-error-logging/support/no-policy-pass.png diff --git a/tests/wpt/web-platform-tests/network-error-logging/support/pass.png b/tests/wpt/tests/network-error-logging/support/pass.png similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/support/pass.png rename to tests/wpt/tests/network-error-logging/support/pass.png diff --git a/tests/wpt/web-platform-tests/network-error-logging/support/pass.png.sub.headers b/tests/wpt/tests/network-error-logging/support/pass.png.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/support/pass.png.sub.headers rename to tests/wpt/tests/network-error-logging/support/pass.png.sub.headers diff --git a/tests/wpt/web-platform-tests/network-error-logging/support/redirect.py b/tests/wpt/tests/network-error-logging/support/redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/support/redirect.py rename to tests/wpt/tests/network-error-logging/support/redirect.py diff --git a/tests/wpt/web-platform-tests/network-error-logging/support/subdomains-pass.png b/tests/wpt/tests/network-error-logging/support/subdomains-pass.png similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/support/subdomains-pass.png rename to tests/wpt/tests/network-error-logging/support/subdomains-pass.png diff --git a/tests/wpt/web-platform-tests/network-error-logging/support/subdomains-pass.png.sub.headers b/tests/wpt/tests/network-error-logging/support/subdomains-pass.png.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/network-error-logging/support/subdomains-pass.png.sub.headers rename to tests/wpt/tests/network-error-logging/support/subdomains-pass.png.sub.headers diff --git a/tests/wpt/web-platform-tests/notifications/META.yml b/tests/wpt/tests/notifications/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/notifications/META.yml rename to tests/wpt/tests/notifications/META.yml diff --git a/tests/wpt/web-platform-tests/notifications/body-basic-manual.https.html b/tests/wpt/tests/notifications/body-basic-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/body-basic-manual.https.html rename to tests/wpt/tests/notifications/body-basic-manual.https.html diff --git a/tests/wpt/web-platform-tests/notifications/body-empty-manual.https.html b/tests/wpt/tests/notifications/body-empty-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/body-empty-manual.https.html rename to tests/wpt/tests/notifications/body-empty-manual.https.html diff --git a/tests/wpt/web-platform-tests/notifications/common.js b/tests/wpt/tests/notifications/common.js similarity index 100% rename from tests/wpt/web-platform-tests/notifications/common.js rename to tests/wpt/tests/notifications/common.js diff --git a/tests/wpt/web-platform-tests/notifications/constructor-basic.https.html b/tests/wpt/tests/notifications/constructor-basic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/constructor-basic.https.html rename to tests/wpt/tests/notifications/constructor-basic.https.html diff --git a/tests/wpt/web-platform-tests/notifications/constructor-invalid.https.html b/tests/wpt/tests/notifications/constructor-invalid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/constructor-invalid.https.html rename to tests/wpt/tests/notifications/constructor-invalid.https.html diff --git a/tests/wpt/web-platform-tests/notifications/constructor-non-secure.html b/tests/wpt/tests/notifications/constructor-non-secure.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/constructor-non-secure.html rename to tests/wpt/tests/notifications/constructor-non-secure.html diff --git a/tests/wpt/web-platform-tests/notifications/event-onclick-manual.https.html b/tests/wpt/tests/notifications/event-onclick-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/event-onclick-manual.https.html rename to tests/wpt/tests/notifications/event-onclick-manual.https.html diff --git a/tests/wpt/web-platform-tests/notifications/event-onclose.https.html b/tests/wpt/tests/notifications/event-onclose.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/event-onclose.https.html rename to tests/wpt/tests/notifications/event-onclose.https.html diff --git a/tests/wpt/web-platform-tests/notifications/event-onerror-default-manual.https.html b/tests/wpt/tests/notifications/event-onerror-default-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/event-onerror-default-manual.https.html rename to tests/wpt/tests/notifications/event-onerror-default-manual.https.html diff --git a/tests/wpt/web-platform-tests/notifications/event-onerror-denied-manual.https.html b/tests/wpt/tests/notifications/event-onerror-denied-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/event-onerror-denied-manual.https.html rename to tests/wpt/tests/notifications/event-onerror-denied-manual.https.html diff --git a/tests/wpt/web-platform-tests/notifications/event-onshow.https.html b/tests/wpt/tests/notifications/event-onshow.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/event-onshow.https.html rename to tests/wpt/tests/notifications/event-onshow.https.html diff --git a/tests/wpt/web-platform-tests/notifications/getnotifications-across-processes.https.window.js b/tests/wpt/tests/notifications/getnotifications-across-processes.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/notifications/getnotifications-across-processes.https.window.js rename to tests/wpt/tests/notifications/getnotifications-across-processes.https.window.js diff --git a/tests/wpt/web-platform-tests/notifications/getnotifications-sw.js b/tests/wpt/tests/notifications/getnotifications-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/notifications/getnotifications-sw.js rename to tests/wpt/tests/notifications/getnotifications-sw.js diff --git a/tests/wpt/web-platform-tests/notifications/historical.any.js b/tests/wpt/tests/notifications/historical.any.js similarity index 100% rename from tests/wpt/web-platform-tests/notifications/historical.any.js rename to tests/wpt/tests/notifications/historical.any.js diff --git a/tests/wpt/web-platform-tests/notifications/icon-basic-manual.https.html b/tests/wpt/tests/notifications/icon-basic-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/icon-basic-manual.https.html rename to tests/wpt/tests/notifications/icon-basic-manual.https.html diff --git a/tests/wpt/web-platform-tests/notifications/icon-empty-manual.https.html b/tests/wpt/tests/notifications/icon-empty-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/icon-empty-manual.https.html rename to tests/wpt/tests/notifications/icon-empty-manual.https.html diff --git a/tests/wpt/web-platform-tests/notifications/idlharness.https.any.js b/tests/wpt/tests/notifications/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/notifications/idlharness.https.any.js rename to tests/wpt/tests/notifications/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/notifications/instance.https.html b/tests/wpt/tests/notifications/instance.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/instance.https.html rename to tests/wpt/tests/notifications/instance.https.html diff --git a/tests/wpt/web-platform-tests/notifications/lang.https.html b/tests/wpt/tests/notifications/lang.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/lang.https.html rename to tests/wpt/tests/notifications/lang.https.html diff --git a/tests/wpt/web-platform-tests/notifications/noop-sw.js b/tests/wpt/tests/notifications/noop-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/notifications/noop-sw.js rename to tests/wpt/tests/notifications/noop-sw.js diff --git a/tests/wpt/web-platform-tests/notifications/permission.html b/tests/wpt/tests/notifications/permission.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/permission.html rename to tests/wpt/tests/notifications/permission.html diff --git a/tests/wpt/web-platform-tests/notifications/permissions-non-secure.html b/tests/wpt/tests/notifications/permissions-non-secure.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/permissions-non-secure.html rename to tests/wpt/tests/notifications/permissions-non-secure.html diff --git a/tests/wpt/web-platform-tests/notifications/requestPermission-denied-manual.https.html b/tests/wpt/tests/notifications/requestPermission-denied-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/requestPermission-denied-manual.https.html rename to tests/wpt/tests/notifications/requestPermission-denied-manual.https.html diff --git a/tests/wpt/web-platform-tests/notifications/requestPermission-granted-manual.https.html b/tests/wpt/tests/notifications/requestPermission-granted-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/requestPermission-granted-manual.https.html rename to tests/wpt/tests/notifications/requestPermission-granted-manual.https.html diff --git a/tests/wpt/web-platform-tests/notifications/resources/custom-data.js b/tests/wpt/tests/notifications/resources/custom-data.js similarity index 100% rename from tests/wpt/web-platform-tests/notifications/resources/custom-data.js rename to tests/wpt/tests/notifications/resources/custom-data.js diff --git a/tests/wpt/web-platform-tests/notifications/resources/icon.png b/tests/wpt/tests/notifications/resources/icon.png similarity index 100% rename from tests/wpt/web-platform-tests/notifications/resources/icon.png rename to tests/wpt/tests/notifications/resources/icon.png diff --git a/tests/wpt/web-platform-tests/notifications/resources/shownotification-sw.js b/tests/wpt/tests/notifications/resources/shownotification-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/notifications/resources/shownotification-sw.js rename to tests/wpt/tests/notifications/resources/shownotification-sw.js diff --git a/tests/wpt/web-platform-tests/notifications/shownotification-resolve-manual.https.html b/tests/wpt/tests/notifications/shownotification-resolve-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/shownotification-resolve-manual.https.html rename to tests/wpt/tests/notifications/shownotification-resolve-manual.https.html diff --git a/tests/wpt/web-platform-tests/notifications/shownotification.https.window.js b/tests/wpt/tests/notifications/shownotification.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/notifications/shownotification.https.window.js rename to tests/wpt/tests/notifications/shownotification.https.window.js diff --git a/tests/wpt/web-platform-tests/notifications/tag-different-manual.https.html b/tests/wpt/tests/notifications/tag-different-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/tag-different-manual.https.html rename to tests/wpt/tests/notifications/tag-different-manual.https.html diff --git a/tests/wpt/web-platform-tests/notifications/tag-same-manual.https.html b/tests/wpt/tests/notifications/tag-same-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/notifications/tag-same-manual.https.html rename to tests/wpt/tests/notifications/tag-same-manual.https.html diff --git a/tests/wpt/web-platform-tests/old-tests/META.yml b/tests/wpt/tests/old-tests/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/META.yml rename to tests/wpt/tests/old-tests/META.yml diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_002.html b/tests/wpt/tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_002.html similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_002.html rename to tests/wpt/tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_002.html diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_007.html b/tests/wpt/tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_007.html similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_007.html rename to tests/wpt/tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_007.html diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_012.html b/tests/wpt/tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_012.html similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_012.html rename to tests/wpt/tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_012.html diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_014.html b/tests/wpt/tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_014.html similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_014.html rename to tests/wpt/tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_014.html diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_015.html b/tests/wpt/tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_015.html similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_015.html rename to tests/wpt/tests/old-tests/submission/Microsoft/foreigncontent/foreign_content_015.html diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/history/history_000.htm b/tests/wpt/tests/old-tests/submission/Microsoft/history/history_000.htm similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/history/history_000.htm rename to tests/wpt/tests/old-tests/submission/Microsoft/history/history_000.htm diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/RemoveElementContainingSelection.htm b/tests/wpt/tests/old-tests/submission/Microsoft/selection/RemoveElementContainingSelection.htm similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/RemoveElementContainingSelection.htm rename to tests/wpt/tests/old-tests/submission/Microsoft/selection/RemoveElementContainingSelection.htm diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/collapseToEnd.htm b/tests/wpt/tests/old-tests/submission/Microsoft/selection/collapseToEnd.htm similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/collapseToEnd.htm rename to tests/wpt/tests/old-tests/submission/Microsoft/selection/collapseToEnd.htm diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/collapseToStart.htm b/tests/wpt/tests/old-tests/submission/Microsoft/selection/collapseToStart.htm similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/collapseToStart.htm rename to tests/wpt/tests/old-tests/submission/Microsoft/selection/collapseToStart.htm diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/common.js b/tests/wpt/tests/old-tests/submission/Microsoft/selection/common.js similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/common.js rename to tests/wpt/tests/old-tests/submission/Microsoft/selection/common.js diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/deleteFromDocument.htm b/tests/wpt/tests/old-tests/submission/Microsoft/selection/deleteFromDocument.htm similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/deleteFromDocument.htm rename to tests/wpt/tests/old-tests/submission/Microsoft/selection/deleteFromDocument.htm diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/getRangeAt.htm b/tests/wpt/tests/old-tests/submission/Microsoft/selection/getRangeAt.htm similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/getRangeAt.htm rename to tests/wpt/tests/old-tests/submission/Microsoft/selection/getRangeAt.htm diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm b/tests/wpt/tests/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm rename to tests/wpt/tests/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/removeAllRanges.htm b/tests/wpt/tests/old-tests/submission/Microsoft/selection/removeAllRanges.htm similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/removeAllRanges.htm rename to tests/wpt/tests/old-tests/submission/Microsoft/selection/removeAllRanges.htm diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/removeRange.htm b/tests/wpt/tests/old-tests/submission/Microsoft/selection/removeRange.htm similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/removeRange.htm rename to tests/wpt/tests/old-tests/submission/Microsoft/selection/removeRange.htm diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/select.htm b/tests/wpt/tests/old-tests/submission/Microsoft/selection/select.htm similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/select.htm rename to tests/wpt/tests/old-tests/submission/Microsoft/selection/select.htm diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/selectAllChildren.htm b/tests/wpt/tests/old-tests/submission/Microsoft/selection/selectAllChildren.htm similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/selectAllChildren.htm rename to tests/wpt/tests/old-tests/submission/Microsoft/selection/selectAllChildren.htm diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/selectionStartEnd.htm b/tests/wpt/tests/old-tests/submission/Microsoft/selection/selectionStartEnd.htm similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/selectionStartEnd.htm rename to tests/wpt/tests/old-tests/submission/Microsoft/selection/selectionStartEnd.htm diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/setSelectionRange.htm b/tests/wpt/tests/old-tests/submission/Microsoft/selection/setSelectionRange.htm similarity index 100% rename from tests/wpt/web-platform-tests/old-tests/submission/Microsoft/selection/setSelectionRange.htm rename to tests/wpt/tests/old-tests/submission/Microsoft/selection/setSelectionRange.htm diff --git a/tests/wpt/web-platform-tests/orientation-event/META.yml b/tests/wpt/tests/orientation-event/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/META.yml rename to tests/wpt/tests/orientation-event/META.yml diff --git a/tests/wpt/web-platform-tests/orientation-event/README.md b/tests/wpt/tests/orientation-event/README.md similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/README.md rename to tests/wpt/tests/orientation-event/README.md diff --git a/tests/wpt/web-platform-tests/orientation-event/device-orientation-events-of-detached-documents.https.html b/tests/wpt/tests/orientation-event/device-orientation-events-of-detached-documents.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/device-orientation-events-of-detached-documents.https.html rename to tests/wpt/tests/orientation-event/device-orientation-events-of-detached-documents.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/device-orientation-events-unavailable-on-insecure-origins.html b/tests/wpt/tests/orientation-event/device-orientation-events-unavailable-on-insecure-origins.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/device-orientation-events-unavailable-on-insecure-origins.html rename to tests/wpt/tests/orientation-event/device-orientation-events-unavailable-on-insecure-origins.html diff --git a/tests/wpt/web-platform-tests/orientation-event/idlharness.https.window.js b/tests/wpt/tests/orientation-event/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/idlharness.https.window.js rename to tests/wpt/tests/orientation-event/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/orientation-event/motion/add-during-dispatch.https.html b/tests/wpt/tests/orientation-event/motion/add-during-dispatch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/motion/add-during-dispatch.https.html rename to tests/wpt/tests/orientation-event/motion/add-during-dispatch.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/motion/add-listener-from-callback.https.html b/tests/wpt/tests/orientation-event/motion/add-listener-from-callback.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/motion/add-listener-from-callback.https.html rename to tests/wpt/tests/orientation-event/motion/add-listener-from-callback.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/motion/create-event.https.html b/tests/wpt/tests/orientation-event/motion/create-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/motion/create-event.https.html rename to tests/wpt/tests/orientation-event/motion/create-event.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/motion/free-fall-manual.https.html b/tests/wpt/tests/orientation-event/motion/free-fall-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/motion/free-fall-manual.https.html rename to tests/wpt/tests/orientation-event/motion/free-fall-manual.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/motion/multiple-event-listeners.https.html b/tests/wpt/tests/orientation-event/motion/multiple-event-listeners.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/motion/multiple-event-listeners.https.html rename to tests/wpt/tests/orientation-event/motion/multiple-event-listeners.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/motion/null-values.https.html b/tests/wpt/tests/orientation-event/motion/null-values.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/motion/null-values.https.html rename to tests/wpt/tests/orientation-event/motion/null-values.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/motion/optional-event-properties.https.html b/tests/wpt/tests/orientation-event/motion/optional-event-properties.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/motion/optional-event-properties.https.html rename to tests/wpt/tests/orientation-event/motion/optional-event-properties.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/motion/page-visibility-manual.https.html b/tests/wpt/tests/orientation-event/motion/page-visibility-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/motion/page-visibility-manual.https.html rename to tests/wpt/tests/orientation-event/motion/page-visibility-manual.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/motion/requestPermission.https.window.js b/tests/wpt/tests/orientation-event/motion/requestPermission.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/motion/requestPermission.https.window.js rename to tests/wpt/tests/orientation-event/motion/requestPermission.https.window.js diff --git a/tests/wpt/web-platform-tests/orientation-event/motion/screen-upmost-manual.https.html b/tests/wpt/tests/orientation-event/motion/screen-upmost-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/motion/screen-upmost-manual.https.html rename to tests/wpt/tests/orientation-event/motion/screen-upmost-manual.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/motion/screen-upright-manual.https.html b/tests/wpt/tests/orientation-event/motion/screen-upright-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/motion/screen-upright-manual.https.html rename to tests/wpt/tests/orientation-event/motion/screen-upright-manual.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/motion/t025-manual.https.html b/tests/wpt/tests/orientation-event/motion/t025-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/motion/t025-manual.https.html rename to tests/wpt/tests/orientation-event/motion/t025-manual.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/motion/t028-manual.https.html b/tests/wpt/tests/orientation-event/motion/t028-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/motion/t028-manual.https.html rename to tests/wpt/tests/orientation-event/motion/t028-manual.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/absolute-fallback.https.html b/tests/wpt/tests/orientation-event/orientation/absolute-fallback.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/absolute-fallback.https.html rename to tests/wpt/tests/orientation-event/orientation/absolute-fallback.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/add-listener-from-callback.https.html b/tests/wpt/tests/orientation-event/orientation/add-listener-from-callback.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/add-listener-from-callback.https.html rename to tests/wpt/tests/orientation-event/orientation/add-listener-from-callback.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/basic-operation-absolute.https.html b/tests/wpt/tests/orientation-event/orientation/basic-operation-absolute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/basic-operation-absolute.https.html rename to tests/wpt/tests/orientation-event/orientation/basic-operation-absolute.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/basic-operation.https.html b/tests/wpt/tests/orientation-event/orientation/basic-operation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/basic-operation.https.html rename to tests/wpt/tests/orientation-event/orientation/basic-operation.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/create-event.https.html b/tests/wpt/tests/orientation-event/orientation/create-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/create-event.https.html rename to tests/wpt/tests/orientation-event/orientation/create-event.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/horizontal-surface-manual.https.html b/tests/wpt/tests/orientation-event/orientation/horizontal-surface-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/horizontal-surface-manual.https.html rename to tests/wpt/tests/orientation-event/orientation/horizontal-surface-manual.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/multiple-event-listeners.https.html b/tests/wpt/tests/orientation-event/orientation/multiple-event-listeners.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/multiple-event-listeners.https.html rename to tests/wpt/tests/orientation-event/orientation/multiple-event-listeners.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/no-synchronous-events.https.html b/tests/wpt/tests/orientation-event/orientation/no-synchronous-events.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/no-synchronous-events.https.html rename to tests/wpt/tests/orientation-event/orientation/no-synchronous-events.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/null-values.https.html b/tests/wpt/tests/orientation-event/orientation/null-values.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/null-values.https.html rename to tests/wpt/tests/orientation-event/orientation/null-values.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/optional-event-properties.https.html b/tests/wpt/tests/orientation-event/orientation/optional-event-properties.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/optional-event-properties.https.html rename to tests/wpt/tests/orientation-event/orientation/optional-event-properties.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/page-visibility-manual.https.html b/tests/wpt/tests/orientation-event/orientation/page-visibility-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/page-visibility-manual.https.html rename to tests/wpt/tests/orientation-event/orientation/page-visibility-manual.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/requestPermission.https.window.js b/tests/wpt/tests/orientation-event/orientation/requestPermission.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/requestPermission.https.window.js rename to tests/wpt/tests/orientation-event/orientation/requestPermission.https.window.js diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/t006-manual.https.html b/tests/wpt/tests/orientation-event/orientation/t006-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/t006-manual.https.html rename to tests/wpt/tests/orientation-event/orientation/t006-manual.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/t009-manual.https.html b/tests/wpt/tests/orientation-event/orientation/t009-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/t009-manual.https.html rename to tests/wpt/tests/orientation-event/orientation/t009-manual.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/t010-manual.https.html b/tests/wpt/tests/orientation-event/orientation/t010-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/t010-manual.https.html rename to tests/wpt/tests/orientation-event/orientation/t010-manual.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/t012-manual.https.html b/tests/wpt/tests/orientation-event/orientation/t012-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/t012-manual.https.html rename to tests/wpt/tests/orientation-event/orientation/t012-manual.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/orientation/updates.https.html b/tests/wpt/tests/orientation-event/orientation/updates.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/orientation/updates.https.html rename to tests/wpt/tests/orientation-event/orientation/updates.https.html diff --git a/tests/wpt/web-platform-tests/orientation-event/resources/orientation-event-helpers.js b/tests/wpt/tests/orientation-event/resources/orientation-event-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/orientation-event/resources/orientation-event-helpers.js rename to tests/wpt/tests/orientation-event/resources/orientation-event-helpers.js diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html b/tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html rename to tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html.headers b/tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html.headers rename to tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html rename to tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html b/tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html rename to tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html b/tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html rename to tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html.headers b/tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html.headers rename to tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html b/tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html rename to tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers b/tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers rename to tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-iframe-access.https.html b/tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-iframe-access.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-iframe-access.https.html rename to tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor-iframe-access.https.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor.https.html b/tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor.https.html rename to tests/wpt/tests/orientation-sensor/AbsoluteOrientationSensor.https.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/META.yml b/tests/wpt/tests/orientation-sensor/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/META.yml rename to tests/wpt/tests/orientation-sensor/META.yml diff --git a/tests/wpt/web-platform-tests/orientation-sensor/OrientationSensor_insecure_context.html b/tests/wpt/tests/orientation-sensor/OrientationSensor_insecure_context.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/OrientationSensor_insecure_context.html rename to tests/wpt/tests/orientation-sensor/OrientationSensor_insecure_context.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html b/tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html rename to tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html.headers b/tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html.headers rename to tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html rename to tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html b/tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html rename to tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html b/tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html rename to tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html.headers b/tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html.headers rename to tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html b/tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html rename to tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers b/tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers rename to tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-iframe-access.https.html b/tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-iframe-access.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-iframe-access.https.html rename to tests/wpt/tests/orientation-sensor/RelativeOrientationSensor-iframe-access.https.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor.https.html b/tests/wpt/tests/orientation-sensor/RelativeOrientationSensor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor.https.html rename to tests/wpt/tests/orientation-sensor/RelativeOrientationSensor.https.html diff --git a/tests/wpt/web-platform-tests/orientation-sensor/idlharness.https.window.js b/tests/wpt/tests/orientation-sensor/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/idlharness.https.window.js rename to tests/wpt/tests/orientation-sensor/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/orientation-sensor/orientation-sensor-tests.js b/tests/wpt/tests/orientation-sensor/orientation-sensor-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/orientation-sensor/orientation-sensor-tests.js rename to tests/wpt/tests/orientation-sensor/orientation-sensor-tests.js diff --git a/tests/wpt/web-platform-tests/page-lifecycle/META.yml b/tests/wpt/tests/page-lifecycle/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/page-lifecycle/META.yml rename to tests/wpt/tests/page-lifecycle/META.yml diff --git a/tests/wpt/web-platform-tests/page-lifecycle/idlharness.html b/tests/wpt/tests/page-lifecycle/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/page-lifecycle/idlharness.html rename to tests/wpt/tests/page-lifecycle/idlharness.html diff --git a/tests/wpt/web-platform-tests/page-visibility/META.yml b/tests/wpt/tests/page-visibility/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/META.yml rename to tests/wpt/tests/page-visibility/META.yml diff --git a/tests/wpt/web-platform-tests/page-visibility/iframe-session-history.html b/tests/wpt/tests/page-visibility/iframe-session-history.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/iframe-session-history.html rename to tests/wpt/tests/page-visibility/iframe-session-history.html diff --git a/tests/wpt/web-platform-tests/page-visibility/iframe-unload.html b/tests/wpt/tests/page-visibility/iframe-unload.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/iframe-unload.html rename to tests/wpt/tests/page-visibility/iframe-unload.html diff --git a/tests/wpt/web-platform-tests/page-visibility/minimize.html b/tests/wpt/tests/page-visibility/minimize.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/minimize.html rename to tests/wpt/tests/page-visibility/minimize.html diff --git a/tests/wpt/web-platform-tests/page-visibility/onvisibilitychange.html b/tests/wpt/tests/page-visibility/onvisibilitychange.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/onvisibilitychange.html rename to tests/wpt/tests/page-visibility/onvisibilitychange.html diff --git a/tests/wpt/web-platform-tests/page-visibility/resources/blank_page_green.html b/tests/wpt/tests/page-visibility/resources/blank_page_green.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/resources/blank_page_green.html rename to tests/wpt/tests/page-visibility/resources/blank_page_green.html diff --git a/tests/wpt/web-platform-tests/page-visibility/resources/iframe-post-load.html b/tests/wpt/tests/page-visibility/resources/iframe-post-load.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/resources/iframe-post-load.html rename to tests/wpt/tests/page-visibility/resources/iframe-post-load.html diff --git a/tests/wpt/web-platform-tests/page-visibility/resources/iframe-with-subframes.html b/tests/wpt/tests/page-visibility/resources/iframe-with-subframes.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/resources/iframe-with-subframes.html rename to tests/wpt/tests/page-visibility/resources/iframe-with-subframes.html diff --git a/tests/wpt/web-platform-tests/page-visibility/resources/iframe.html b/tests/wpt/tests/page-visibility/resources/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/resources/iframe.html rename to tests/wpt/tests/page-visibility/resources/iframe.html diff --git a/tests/wpt/web-platform-tests/page-visibility/resources/pagevistestharness.js b/tests/wpt/tests/page-visibility/resources/pagevistestharness.js similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/resources/pagevistestharness.js rename to tests/wpt/tests/page-visibility/resources/pagevistestharness.js diff --git a/tests/wpt/web-platform-tests/page-visibility/resources/unload-bubbles.html b/tests/wpt/tests/page-visibility/resources/unload-bubbles.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/resources/unload-bubbles.html rename to tests/wpt/tests/page-visibility/resources/unload-bubbles.html diff --git a/tests/wpt/web-platform-tests/page-visibility/resources/unload.html b/tests/wpt/tests/page-visibility/resources/unload.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/resources/unload.html rename to tests/wpt/tests/page-visibility/resources/unload.html diff --git a/tests/wpt/web-platform-tests/page-visibility/resources/window_state_context.js b/tests/wpt/tests/page-visibility/resources/window_state_context.js similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/resources/window_state_context.js rename to tests/wpt/tests/page-visibility/resources/window_state_context.js diff --git a/tests/wpt/web-platform-tests/page-visibility/test_attributes_exist.html b/tests/wpt/tests/page-visibility/test_attributes_exist.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/test_attributes_exist.html rename to tests/wpt/tests/page-visibility/test_attributes_exist.html diff --git a/tests/wpt/web-platform-tests/page-visibility/test_child_document.html b/tests/wpt/tests/page-visibility/test_child_document.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/test_child_document.html rename to tests/wpt/tests/page-visibility/test_child_document.html diff --git a/tests/wpt/web-platform-tests/page-visibility/test_default_view.html b/tests/wpt/tests/page-visibility/test_default_view.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/test_default_view.html rename to tests/wpt/tests/page-visibility/test_default_view.html diff --git a/tests/wpt/web-platform-tests/page-visibility/test_minimize-manual.html b/tests/wpt/tests/page-visibility/test_minimize-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/test_minimize-manual.html rename to tests/wpt/tests/page-visibility/test_minimize-manual.html diff --git a/tests/wpt/web-platform-tests/page-visibility/test_read_only.html b/tests/wpt/tests/page-visibility/test_read_only.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/test_read_only.html rename to tests/wpt/tests/page-visibility/test_read_only.html diff --git a/tests/wpt/web-platform-tests/page-visibility/test_tab_state_change-manual.html b/tests/wpt/tests/page-visibility/test_tab_state_change-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/test_tab_state_change-manual.html rename to tests/wpt/tests/page-visibility/test_tab_state_change-manual.html diff --git a/tests/wpt/web-platform-tests/page-visibility/unload-bubbles.html b/tests/wpt/tests/page-visibility/unload-bubbles.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/unload-bubbles.html rename to tests/wpt/tests/page-visibility/unload-bubbles.html diff --git a/tests/wpt/web-platform-tests/page-visibility/unload.html b/tests/wpt/tests/page-visibility/unload.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/unload.html rename to tests/wpt/tests/page-visibility/unload.html diff --git a/tests/wpt/web-platform-tests/page-visibility/visibility-state-entry.tentative.html b/tests/wpt/tests/page-visibility/visibility-state-entry.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/page-visibility/visibility-state-entry.tentative.html rename to tests/wpt/tests/page-visibility/visibility-state-entry.tentative.html diff --git a/tests/wpt/web-platform-tests/paint-timing/META.yml b/tests/wpt/tests/paint-timing/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/META.yml rename to tests/wpt/tests/paint-timing/META.yml diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/buffered-flag.window.js b/tests/wpt/tests/paint-timing/fcp-only/buffered-flag.window.js similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/buffered-flag.window.js rename to tests/wpt/tests/paint-timing/fcp-only/buffered-flag.window.js diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-background-size.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-background-size.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-background-size.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-background-size.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-bg-image-set.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-bg-image-set.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-bg-image-set.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-bg-image-set.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-bg-image-two-steps.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-bg-image-two-steps.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-bg-image-two-steps.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-bg-image-two-steps.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-canvas-context.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-canvas-context.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-canvas-context.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-canvas-context.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-document-opacity-image.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-document-opacity-image.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-document-opacity-image.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-document-opacity-image.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-document-opacity-text.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-document-opacity-text.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-document-opacity-text.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-document-opacity-text.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-gradient.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-gradient.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-gradient.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-gradient.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-iframe.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-iframe.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-iframe.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-ignore-from-subframe.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-ignore-from-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-ignore-from-subframe.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-ignore-from-subframe.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-invisible-3d-rotate-descendant.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-invisible-3d-rotate-descendant.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-invisible-3d-rotate-descendant.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-invisible-3d-rotate-descendant.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-invisible-3d-rotate.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-invisible-3d-rotate.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-invisible-3d-rotate.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-invisible-3d-rotate.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-invisible-scale-transition.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-invisible-scale-transition.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-invisible-scale-transition.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-invisible-scale-transition.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-invisible-scale.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-invisible-scale.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-invisible-scale.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-invisible-scale.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-invisible-text.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-invisible-text.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-invisible-text.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-invisible-text.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-opacity-descendant.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-opacity-descendant.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-opacity-descendant.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-opacity-descendant.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-opacity.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-opacity.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-opacity.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-out-of-bounds-translate.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-out-of-bounds-translate.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-out-of-bounds-translate.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-out-of-bounds-translate.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-out-of-bounds.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-out-of-bounds.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-out-of-bounds.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-out-of-bounds.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-display.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-pseudo-element-display.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-display.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-pseudo-element-display.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-image.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-pseudo-element-image.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-image.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-pseudo-element-image.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-opacity.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-pseudo-element-opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-opacity.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-pseudo-element-opacity.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-text.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-pseudo-element-text.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-text.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-pseudo-element-text.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-visibility.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-pseudo-element-visibility.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-visibility.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-pseudo-element-visibility.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-svg.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-svg.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-svg.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-text-input.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-text-input.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-text-input.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-text-input.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-typographic-pseudo.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-typographic-pseudo.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-typographic-pseudo.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-typographic-pseudo.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-video-frame.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-video-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-video-frame.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-video-frame.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-video-poster.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-video-poster.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-video-poster.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-video-poster.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-whitespace.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-whitespace.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-whitespace.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-with-rtl.html b/tests/wpt/tests/paint-timing/fcp-only/fcp-with-rtl.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-with-rtl.html rename to tests/wpt/tests/paint-timing/fcp-only/fcp-with-rtl.html diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/svg-in-iframe.html b/tests/wpt/tests/paint-timing/fcp-only/svg-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/fcp-only/svg-in-iframe.html rename to tests/wpt/tests/paint-timing/fcp-only/svg-in-iframe.html diff --git a/tests/wpt/web-platform-tests/paint-timing/first-contentful-canvas-none.html b/tests/wpt/tests/paint-timing/first-contentful-canvas-none.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/first-contentful-canvas-none.html rename to tests/wpt/tests/paint-timing/first-contentful-canvas-none.html diff --git a/tests/wpt/web-platform-tests/paint-timing/idlharness.window.js b/tests/wpt/tests/paint-timing/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/idlharness.window.js rename to tests/wpt/tests/paint-timing/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/paint-timing/input-text.html b/tests/wpt/tests/paint-timing/input-text.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/input-text.html rename to tests/wpt/tests/paint-timing/input-text.html diff --git a/tests/wpt/web-platform-tests/paint-timing/replaced-content-image.html b/tests/wpt/tests/paint-timing/replaced-content-image.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/replaced-content-image.html rename to tests/wpt/tests/paint-timing/replaced-content-image.html diff --git a/tests/wpt/web-platform-tests/paint-timing/resources/circle.svg b/tests/wpt/tests/paint-timing/resources/circle.svg similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/resources/circle.svg rename to tests/wpt/tests/paint-timing/resources/circle.svg diff --git a/tests/wpt/web-platform-tests/paint-timing/resources/circles.png b/tests/wpt/tests/paint-timing/resources/circles.png similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/resources/circles.png rename to tests/wpt/tests/paint-timing/resources/circles.png diff --git a/tests/wpt/web-platform-tests/paint-timing/resources/subframe-painting.html b/tests/wpt/tests/paint-timing/resources/subframe-painting.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/resources/subframe-painting.html rename to tests/wpt/tests/paint-timing/resources/subframe-painting.html diff --git a/tests/wpt/web-platform-tests/paint-timing/resources/subframe-sending-paint.html b/tests/wpt/tests/paint-timing/resources/subframe-sending-paint.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/resources/subframe-sending-paint.html rename to tests/wpt/tests/paint-timing/resources/subframe-sending-paint.html diff --git a/tests/wpt/web-platform-tests/paint-timing/resources/svg.html b/tests/wpt/tests/paint-timing/resources/svg.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/resources/svg.html rename to tests/wpt/tests/paint-timing/resources/svg.html diff --git a/tests/wpt/web-platform-tests/paint-timing/resources/utils.js b/tests/wpt/tests/paint-timing/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/resources/utils.js rename to tests/wpt/tests/paint-timing/resources/utils.js diff --git a/tests/wpt/web-platform-tests/paint-timing/supported-paint-type.window.js b/tests/wpt/tests/paint-timing/supported-paint-type.window.js similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/supported-paint-type.window.js rename to tests/wpt/tests/paint-timing/supported-paint-type.window.js diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/basetest.html b/tests/wpt/tests/paint-timing/with-first-paint/basetest.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/basetest.html rename to tests/wpt/tests/paint-timing/with-first-paint/basetest.html diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/border-image.html b/tests/wpt/tests/paint-timing/with-first-paint/border-image.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/border-image.html rename to tests/wpt/tests/paint-timing/with-first-paint/border-image.html diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/buffered-flag.window.js b/tests/wpt/tests/paint-timing/with-first-paint/buffered-flag.window.js similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/buffered-flag.window.js rename to tests/wpt/tests/paint-timing/with-first-paint/buffered-flag.window.js diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/child-painting-first-image.html b/tests/wpt/tests/paint-timing/with-first-paint/child-painting-first-image.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/child-painting-first-image.html rename to tests/wpt/tests/paint-timing/with-first-paint/child-painting-first-image.html diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-contentful-bg-image.html b/tests/wpt/tests/paint-timing/with-first-paint/first-contentful-bg-image.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-contentful-bg-image.html rename to tests/wpt/tests/paint-timing/with-first-paint/first-contentful-bg-image.html diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-contentful-canvas-webgl2.html b/tests/wpt/tests/paint-timing/with-first-paint/first-contentful-canvas-webgl2.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-contentful-canvas-webgl2.html rename to tests/wpt/tests/paint-timing/with-first-paint/first-contentful-canvas-webgl2.html diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-contentful-canvas.html b/tests/wpt/tests/paint-timing/with-first-paint/first-contentful-canvas.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-contentful-canvas.html rename to tests/wpt/tests/paint-timing/with-first-paint/first-contentful-canvas.html diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-contentful-image.html b/tests/wpt/tests/paint-timing/with-first-paint/first-contentful-image.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-contentful-image.html rename to tests/wpt/tests/paint-timing/with-first-paint/first-contentful-image.html diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-contentful-paint.html b/tests/wpt/tests/paint-timing/with-first-paint/first-contentful-paint.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-contentful-paint.html rename to tests/wpt/tests/paint-timing/with-first-paint/first-contentful-paint.html diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-contentful-svg.html b/tests/wpt/tests/paint-timing/with-first-paint/first-contentful-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-contentful-svg.html rename to tests/wpt/tests/paint-timing/with-first-paint/first-contentful-svg.html diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-image-child.html b/tests/wpt/tests/paint-timing/with-first-paint/first-image-child.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-image-child.html rename to tests/wpt/tests/paint-timing/with-first-paint/first-image-child.html diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-paint-bg-color.html b/tests/wpt/tests/paint-timing/with-first-paint/first-paint-bg-color.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-paint-bg-color.html rename to tests/wpt/tests/paint-timing/with-first-paint/first-paint-bg-color.html diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-paint-only.html b/tests/wpt/tests/paint-timing/with-first-paint/first-paint-only.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/first-paint-only.html rename to tests/wpt/tests/paint-timing/with-first-paint/first-paint-only.html diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/mask-image.html b/tests/wpt/tests/paint-timing/with-first-paint/mask-image.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/mask-image.html rename to tests/wpt/tests/paint-timing/with-first-paint/mask-image.html diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/paint-visited.html b/tests/wpt/tests/paint-timing/with-first-paint/paint-visited.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/paint-visited.html rename to tests/wpt/tests/paint-timing/with-first-paint/paint-visited.html diff --git a/tests/wpt/web-platform-tests/paint-timing/with-first-paint/sibling-painting-first-image.html b/tests/wpt/tests/paint-timing/with-first-paint/sibling-painting-first-image.html similarity index 100% rename from tests/wpt/web-platform-tests/paint-timing/with-first-paint/sibling-painting-first-image.html rename to tests/wpt/tests/paint-timing/with-first-paint/sibling-painting-first-image.html diff --git a/tests/wpt/web-platform-tests/parakeet/META.yml b/tests/wpt/tests/parakeet/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/parakeet/META.yml rename to tests/wpt/tests/parakeet/META.yml diff --git a/tests/wpt/web-platform-tests/parakeet/createAdRequest.tentative.https.sub.window.js b/tests/wpt/tests/parakeet/createAdRequest.tentative.https.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/parakeet/createAdRequest.tentative.https.sub.window.js rename to tests/wpt/tests/parakeet/createAdRequest.tentative.https.sub.window.js diff --git a/tests/wpt/web-platform-tests/parakeet/finalizeAd.tentative.https.sub.window.js b/tests/wpt/tests/parakeet/finalizeAd.tentative.https.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/parakeet/finalizeAd.tentative.https.sub.window.js rename to tests/wpt/tests/parakeet/finalizeAd.tentative.https.sub.window.js diff --git a/tests/wpt/web-platform-tests/parakeet/idlharness.tentative.https.window.js b/tests/wpt/tests/parakeet/idlharness.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/parakeet/idlharness.tentative.https.window.js rename to tests/wpt/tests/parakeet/idlharness.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/payment-handler/META.yml b/tests/wpt/tests/payment-handler/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/META.yml rename to tests/wpt/tests/payment-handler/META.yml diff --git a/tests/wpt/web-platform-tests/payment-handler/app-can-make-payment.js b/tests/wpt/tests/payment-handler/app-can-make-payment.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/app-can-make-payment.js rename to tests/wpt/tests/payment-handler/app-can-make-payment.js diff --git a/tests/wpt/web-platform-tests/payment-handler/app-change-payment-method.js b/tests/wpt/tests/payment-handler/app-change-payment-method.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/app-change-payment-method.js rename to tests/wpt/tests/payment-handler/app-change-payment-method.js diff --git a/tests/wpt/web-platform-tests/payment-handler/app-change-shipping-address.js b/tests/wpt/tests/payment-handler/app-change-shipping-address.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/app-change-shipping-address.js rename to tests/wpt/tests/payment-handler/app-change-shipping-address.js diff --git a/tests/wpt/web-platform-tests/payment-handler/app-change-shipping-option.js b/tests/wpt/tests/payment-handler/app-change-shipping-option.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/app-change-shipping-option.js rename to tests/wpt/tests/payment-handler/app-change-shipping-option.js diff --git a/tests/wpt/web-platform-tests/payment-handler/app-simple.js b/tests/wpt/tests/payment-handler/app-simple.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/app-simple.js rename to tests/wpt/tests/payment-handler/app-simple.js diff --git a/tests/wpt/web-platform-tests/payment-handler/app-supports-shipping-contact-delegation.js b/tests/wpt/tests/payment-handler/app-supports-shipping-contact-delegation.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/app-supports-shipping-contact-delegation.js rename to tests/wpt/tests/payment-handler/app-supports-shipping-contact-delegation.js diff --git a/tests/wpt/web-platform-tests/payment-handler/can-make-payment-event-constructor.https.html b/tests/wpt/tests/payment-handler/can-make-payment-event-constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/can-make-payment-event-constructor.https.html rename to tests/wpt/tests/payment-handler/can-make-payment-event-constructor.https.html diff --git a/tests/wpt/web-platform-tests/payment-handler/can-make-payment-event-constructor.https.serviceworker.html b/tests/wpt/tests/payment-handler/can-make-payment-event-constructor.https.serviceworker.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/can-make-payment-event-constructor.https.serviceworker.html rename to tests/wpt/tests/payment-handler/can-make-payment-event-constructor.https.serviceworker.html diff --git a/tests/wpt/web-platform-tests/payment-handler/can-make-payment-event-constructor.https.serviceworker.js b/tests/wpt/tests/payment-handler/can-make-payment-event-constructor.https.serviceworker.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/can-make-payment-event-constructor.https.serviceworker.js rename to tests/wpt/tests/payment-handler/can-make-payment-event-constructor.https.serviceworker.js diff --git a/tests/wpt/web-platform-tests/payment-handler/can-make-payment-event-constructor.https.worker.js b/tests/wpt/tests/payment-handler/can-make-payment-event-constructor.https.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/can-make-payment-event-constructor.https.worker.js rename to tests/wpt/tests/payment-handler/can-make-payment-event-constructor.https.worker.js diff --git a/tests/wpt/web-platform-tests/payment-handler/can-make-payment-event-manifest.json b/tests/wpt/tests/payment-handler/can-make-payment-event-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/can-make-payment-event-manifest.json rename to tests/wpt/tests/payment-handler/can-make-payment-event-manifest.json diff --git a/tests/wpt/web-platform-tests/payment-handler/can-make-payment-event.https.html b/tests/wpt/tests/payment-handler/can-make-payment-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/can-make-payment-event.https.html rename to tests/wpt/tests/payment-handler/can-make-payment-event.https.html diff --git a/tests/wpt/web-platform-tests/payment-handler/change-payment-method-manual-manifest.json b/tests/wpt/tests/payment-handler/change-payment-method-manual-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/change-payment-method-manual-manifest.json rename to tests/wpt/tests/payment-handler/change-payment-method-manual-manifest.json diff --git a/tests/wpt/web-platform-tests/payment-handler/change-payment-method-manual.https.html b/tests/wpt/tests/payment-handler/change-payment-method-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/change-payment-method-manual.https.html rename to tests/wpt/tests/payment-handler/change-payment-method-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-handler/change-shipping-address-manual-manifest.json b/tests/wpt/tests/payment-handler/change-shipping-address-manual-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/change-shipping-address-manual-manifest.json rename to tests/wpt/tests/payment-handler/change-shipping-address-manual-manifest.json diff --git a/tests/wpt/web-platform-tests/payment-handler/change-shipping-address-manual.https.html b/tests/wpt/tests/payment-handler/change-shipping-address-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/change-shipping-address-manual.https.html rename to tests/wpt/tests/payment-handler/change-shipping-address-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-handler/change-shipping-option-manual-manifest.json b/tests/wpt/tests/payment-handler/change-shipping-option-manual-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/change-shipping-option-manual-manifest.json rename to tests/wpt/tests/payment-handler/change-shipping-option-manual-manifest.json diff --git a/tests/wpt/web-platform-tests/payment-handler/change-shipping-option-manual.https.html b/tests/wpt/tests/payment-handler/change-shipping-option-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/change-shipping-option-manual.https.html rename to tests/wpt/tests/payment-handler/change-shipping-option-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-handler/idlharness.https.any.js b/tests/wpt/tests/payment-handler/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/idlharness.https.any.js rename to tests/wpt/tests/payment-handler/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/payment-handler/manifest.json b/tests/wpt/tests/payment-handler/manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/manifest.json rename to tests/wpt/tests/payment-handler/manifest.json diff --git a/tests/wpt/web-platform-tests/payment-handler/payment-app/payment.html b/tests/wpt/tests/payment-handler/payment-app/payment.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/payment-app/payment.html rename to tests/wpt/tests/payment-handler/payment-app/payment.html diff --git a/tests/wpt/web-platform-tests/payment-handler/payment-request-event-constructor.https.html b/tests/wpt/tests/payment-handler/payment-request-event-constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/payment-request-event-constructor.https.html rename to tests/wpt/tests/payment-handler/payment-request-event-constructor.https.html diff --git a/tests/wpt/web-platform-tests/payment-handler/payment-request-event-constructor.https.serviceworker.html b/tests/wpt/tests/payment-handler/payment-request-event-constructor.https.serviceworker.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/payment-request-event-constructor.https.serviceworker.html rename to tests/wpt/tests/payment-handler/payment-request-event-constructor.https.serviceworker.html diff --git a/tests/wpt/web-platform-tests/payment-handler/payment-request-event-constructor.https.serviceworker.js b/tests/wpt/tests/payment-handler/payment-request-event-constructor.https.serviceworker.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/payment-request-event-constructor.https.serviceworker.js rename to tests/wpt/tests/payment-handler/payment-request-event-constructor.https.serviceworker.js diff --git a/tests/wpt/web-platform-tests/payment-handler/payment-request-event-constructor.https.worker.js b/tests/wpt/tests/payment-handler/payment-request-event-constructor.https.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/payment-request-event-constructor.https.worker.js rename to tests/wpt/tests/payment-handler/payment-request-event-constructor.https.worker.js diff --git a/tests/wpt/web-platform-tests/payment-handler/payment-request-event-manual-manifest.json b/tests/wpt/tests/payment-handler/payment-request-event-manual-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/payment-request-event-manual-manifest.json rename to tests/wpt/tests/payment-handler/payment-request-event-manual-manifest.json diff --git a/tests/wpt/web-platform-tests/payment-handler/payment-request-event-manual.https.html b/tests/wpt/tests/payment-handler/payment-request-event-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/payment-request-event-manual.https.html rename to tests/wpt/tests/payment-handler/payment-request-event-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-handler/same-object-attributes.https.html b/tests/wpt/tests/payment-handler/same-object-attributes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/same-object-attributes.https.html rename to tests/wpt/tests/payment-handler/same-object-attributes.https.html diff --git a/tests/wpt/web-platform-tests/payment-handler/supports-shipping-contact-delegation-manual-manifest.json b/tests/wpt/tests/payment-handler/supports-shipping-contact-delegation-manual-manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/supports-shipping-contact-delegation-manual-manifest.json rename to tests/wpt/tests/payment-handler/supports-shipping-contact-delegation-manual-manifest.json diff --git a/tests/wpt/web-platform-tests/payment-handler/supports-shipping-contact-delegation-manual.https.html b/tests/wpt/tests/payment-handler/supports-shipping-contact-delegation-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/supports-shipping-contact-delegation-manual.https.html rename to tests/wpt/tests/payment-handler/supports-shipping-contact-delegation-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-handler/untrusted-event.https.html b/tests/wpt/tests/payment-handler/untrusted-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/untrusted-event.https.html rename to tests/wpt/tests/payment-handler/untrusted-event.https.html diff --git a/tests/wpt/web-platform-tests/payment-handler/untrusted-event.js b/tests/wpt/tests/payment-handler/untrusted-event.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-handler/untrusted-event.js rename to tests/wpt/tests/payment-handler/untrusted-event.js diff --git a/tests/wpt/web-platform-tests/payment-method-basic-card/META.yml b/tests/wpt/tests/payment-method-basic-card/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/payment-method-basic-card/META.yml rename to tests/wpt/tests/payment-method-basic-card/META.yml diff --git a/tests/wpt/web-platform-tests/payment-method-basic-card/apply_the_modifiers.html b/tests/wpt/tests/payment-method-basic-card/apply_the_modifiers.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-method-basic-card/apply_the_modifiers.html rename to tests/wpt/tests/payment-method-basic-card/apply_the_modifiers.html diff --git a/tests/wpt/web-platform-tests/payment-method-basic-card/billing-address-is-null-manual.https.html b/tests/wpt/tests/payment-method-basic-card/billing-address-is-null-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-method-basic-card/billing-address-is-null-manual.https.html rename to tests/wpt/tests/payment-method-basic-card/billing-address-is-null-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-method-basic-card/empty-data-manual.https.html b/tests/wpt/tests/payment-method-basic-card/empty-data-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-method-basic-card/empty-data-manual.https.html rename to tests/wpt/tests/payment-method-basic-card/empty-data-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-method-basic-card/historical.https.html b/tests/wpt/tests/payment-method-basic-card/historical.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-method-basic-card/historical.https.html rename to tests/wpt/tests/payment-method-basic-card/historical.https.html diff --git a/tests/wpt/web-platform-tests/payment-method-basic-card/payment-request-canmakepayment-method.https.html b/tests/wpt/tests/payment-method-basic-card/payment-request-canmakepayment-method.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-method-basic-card/payment-request-canmakepayment-method.https.html rename to tests/wpt/tests/payment-method-basic-card/payment-request-canmakepayment-method.https.html diff --git a/tests/wpt/web-platform-tests/payment-method-basic-card/steps_for_selecting_the_payment_handler.html b/tests/wpt/tests/payment-method-basic-card/steps_for_selecting_the_payment_handler.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-method-basic-card/steps_for_selecting_the_payment_handler.html rename to tests/wpt/tests/payment-method-basic-card/steps_for_selecting_the_payment_handler.html diff --git a/tests/wpt/web-platform-tests/payment-method-id/META.yml b/tests/wpt/tests/payment-method-id/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/payment-method-id/META.yml rename to tests/wpt/tests/payment-method-id/META.yml diff --git a/tests/wpt/web-platform-tests/payment-method-id/README.md b/tests/wpt/tests/payment-method-id/README.md similarity index 100% rename from tests/wpt/web-platform-tests/payment-method-id/README.md rename to tests/wpt/tests/payment-method-id/README.md diff --git a/tests/wpt/web-platform-tests/payment-method-id/payment-request-ctor-pmi-handling.https.sub.html b/tests/wpt/tests/payment-method-id/payment-request-ctor-pmi-handling.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-method-id/payment-request-ctor-pmi-handling.https.sub.html rename to tests/wpt/tests/payment-method-id/payment-request-ctor-pmi-handling.https.sub.html diff --git a/tests/wpt/web-platform-tests/payment-request/META.yml b/tests/wpt/tests/payment-request/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/META.yml rename to tests/wpt/tests/payment-request/META.yml diff --git a/tests/wpt/web-platform-tests/payment-request/PaymentMethodChangeEvent/methodDetails-attribute.https.html b/tests/wpt/tests/payment-request/PaymentMethodChangeEvent/methodDetails-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/PaymentMethodChangeEvent/methodDetails-attribute.https.html rename to tests/wpt/tests/payment-request/PaymentMethodChangeEvent/methodDetails-attribute.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/PaymentMethodChangeEvent/methodName-attribute.https.html b/tests/wpt/tests/payment-request/PaymentMethodChangeEvent/methodName-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/PaymentMethodChangeEvent/methodName-attribute.https.html rename to tests/wpt/tests/payment-request/PaymentMethodChangeEvent/methodName-attribute.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/PaymentRequestUpdateEvent/constructor.http.html b/tests/wpt/tests/payment-request/PaymentRequestUpdateEvent/constructor.http.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/PaymentRequestUpdateEvent/constructor.http.html rename to tests/wpt/tests/payment-request/PaymentRequestUpdateEvent/constructor.http.html diff --git a/tests/wpt/web-platform-tests/payment-request/PaymentRequestUpdateEvent/constructor.https.html b/tests/wpt/tests/payment-request/PaymentRequestUpdateEvent/constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/PaymentRequestUpdateEvent/constructor.https.html rename to tests/wpt/tests/payment-request/PaymentRequestUpdateEvent/constructor.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/PaymentRequestUpdateEvent/updatewith-method.https.html b/tests/wpt/tests/payment-request/PaymentRequestUpdateEvent/updatewith-method.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/PaymentRequestUpdateEvent/updatewith-method.https.html rename to tests/wpt/tests/payment-request/PaymentRequestUpdateEvent/updatewith-method.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/PaymentValidationErrors/retry-shows-error-member-manual.https.html b/tests/wpt/tests/payment-request/PaymentValidationErrors/retry-shows-error-member-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/PaymentValidationErrors/retry-shows-error-member-manual.https.html rename to tests/wpt/tests/payment-request/PaymentValidationErrors/retry-shows-error-member-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/PaymentValidationErrors/retry-shows-payer-member-manual.https.html b/tests/wpt/tests/payment-request/PaymentValidationErrors/retry-shows-payer-member-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/PaymentValidationErrors/retry-shows-payer-member-manual.https.html rename to tests/wpt/tests/payment-request/PaymentValidationErrors/retry-shows-payer-member-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/constructor_convert_method_data.https.html b/tests/wpt/tests/payment-request/constructor_convert_method_data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/constructor_convert_method_data.https.html rename to tests/wpt/tests/payment-request/constructor_convert_method_data.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/delegate-request.https.sub.html b/tests/wpt/tests/payment-request/delegate-request.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/delegate-request.https.sub.html rename to tests/wpt/tests/payment-request/delegate-request.https.sub.html diff --git a/tests/wpt/web-platform-tests/payment-request/historical.https.html b/tests/wpt/tests/payment-request/historical.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/historical.https.html rename to tests/wpt/tests/payment-request/historical.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/idlharness.https.window.js b/tests/wpt/tests/payment-request/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/idlharness.https.window.js rename to tests/wpt/tests/payment-request/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/payment-request/onpaymentmethodchange-attribute.https.html b/tests/wpt/tests/payment-request/onpaymentmethodchange-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/onpaymentmethodchange-attribute.https.html rename to tests/wpt/tests/payment-request/onpaymentmethodchange-attribute.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-is-showing.https.html b/tests/wpt/tests/payment-request/payment-is-showing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-is-showing.https.html rename to tests/wpt/tests/payment-request/payment-is-showing.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-abort-method.https.html b/tests/wpt/tests/payment-request/payment-request-abort-method.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-request-abort-method.https.html rename to tests/wpt/tests/payment-request/payment-request-abort-method.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-canmakepayment-method.https.html b/tests/wpt/tests/payment-request/payment-request-canmakepayment-method.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-request-canmakepayment-method.https.html rename to tests/wpt/tests/payment-request/payment-request-canmakepayment-method.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-constructor.https.sub.html b/tests/wpt/tests/payment-request/payment-request-constructor.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-request-constructor.https.sub.html rename to tests/wpt/tests/payment-request/payment-request-constructor.https.sub.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-ctor-currency-code-checks.https.sub.html b/tests/wpt/tests/payment-request/payment-request-ctor-currency-code-checks.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-request-ctor-currency-code-checks.https.sub.html rename to tests/wpt/tests/payment-request/payment-request-ctor-currency-code-checks.https.sub.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-ctor-pmi-handling.https.sub.html b/tests/wpt/tests/payment-request/payment-request-ctor-pmi-handling.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-request-ctor-pmi-handling.https.sub.html rename to tests/wpt/tests/payment-request/payment-request-ctor-pmi-handling.https.sub.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-disallowed-when-hidden.https.html b/tests/wpt/tests/payment-request/payment-request-disallowed-when-hidden.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-request-disallowed-when-hidden.https.html rename to tests/wpt/tests/payment-request/payment-request-disallowed-when-hidden.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-hasenrolledinstrument-method-manual.tentative.https.html b/tests/wpt/tests/payment-request/payment-request-hasenrolledinstrument-method-manual.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-request-hasenrolledinstrument-method-manual.tentative.https.html rename to tests/wpt/tests/payment-request/payment-request-hasenrolledinstrument-method-manual.tentative.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-hasenrolledinstrument-method-protection.tentative.https.html b/tests/wpt/tests/payment-request/payment-request-hasenrolledinstrument-method-protection.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-request-hasenrolledinstrument-method-protection.tentative.https.html rename to tests/wpt/tests/payment-request/payment-request-hasenrolledinstrument-method-protection.tentative.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-hasenrolledinstrument-method.tentative.https.html b/tests/wpt/tests/payment-request/payment-request-hasenrolledinstrument-method.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-request-hasenrolledinstrument-method.tentative.https.html rename to tests/wpt/tests/payment-request/payment-request-hasenrolledinstrument-method.tentative.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-id-attribute.https.html b/tests/wpt/tests/payment-request/payment-request-id-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-request-id-attribute.https.html rename to tests/wpt/tests/payment-request/payment-request-id-attribute.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-insecure.http.html b/tests/wpt/tests/payment-request/payment-request-insecure.http.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-request-insecure.http.html rename to tests/wpt/tests/payment-request/payment-request-insecure.http.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-not-exposed.https.worker.js b/tests/wpt/tests/payment-request/payment-request-not-exposed.https.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-request-not-exposed.https.worker.js rename to tests/wpt/tests/payment-request/payment-request-not-exposed.https.worker.js diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-show-method.https.html b/tests/wpt/tests/payment-request/payment-request-show-method.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-request-show-method.https.html rename to tests/wpt/tests/payment-request/payment-request-show-method.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-response/complete-method-manual.https.html b/tests/wpt/tests/payment-request/payment-response/complete-method-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-response/complete-method-manual.https.html rename to tests/wpt/tests/payment-request/payment-response/complete-method-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-response/helpers.js b/tests/wpt/tests/payment-request/payment-response/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-response/helpers.js rename to tests/wpt/tests/payment-request/payment-response/helpers.js diff --git a/tests/wpt/web-platform-tests/payment-request/payment-response/methodName-attribute-manual.https.html b/tests/wpt/tests/payment-request/payment-response/methodName-attribute-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-response/methodName-attribute-manual.https.html rename to tests/wpt/tests/payment-request/payment-response/methodName-attribute-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-response/onpayerdetailchange-attribute-manual.https.html b/tests/wpt/tests/payment-request/payment-response/onpayerdetailchange-attribute-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-response/onpayerdetailchange-attribute-manual.https.html rename to tests/wpt/tests/payment-request/payment-response/onpayerdetailchange-attribute-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-response/onpayerdetailchange-attribute.https.html b/tests/wpt/tests/payment-request/payment-response/onpayerdetailchange-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-response/onpayerdetailchange-attribute.https.html rename to tests/wpt/tests/payment-request/payment-response/onpayerdetailchange-attribute.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-response/payerEmail-attribute-manual.https.html b/tests/wpt/tests/payment-request/payment-response/payerEmail-attribute-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-response/payerEmail-attribute-manual.https.html rename to tests/wpt/tests/payment-request/payment-response/payerEmail-attribute-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-response/payerName-attribute-manual.https.html b/tests/wpt/tests/payment-request/payment-response/payerName-attribute-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-response/payerName-attribute-manual.https.html rename to tests/wpt/tests/payment-request/payment-response/payerName-attribute-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-response/payerPhone-attribute-manual.https.html b/tests/wpt/tests/payment-request/payment-response/payerPhone-attribute-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-response/payerPhone-attribute-manual.https.html rename to tests/wpt/tests/payment-request/payment-response/payerPhone-attribute-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-response/payerdetailschange-updateWith-immediate-manual.https.html b/tests/wpt/tests/payment-request/payment-response/payerdetailschange-updateWith-immediate-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-response/payerdetailschange-updateWith-immediate-manual.https.html rename to tests/wpt/tests/payment-request/payment-response/payerdetailschange-updateWith-immediate-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-response/payerdetailschange-updateWith-manual.https.html b/tests/wpt/tests/payment-request/payment-response/payerdetailschange-updateWith-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-response/payerdetailschange-updateWith-manual.https.html rename to tests/wpt/tests/payment-request/payment-response/payerdetailschange-updateWith-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-response/rejects_if_not_active-manual.https.html b/tests/wpt/tests/payment-request/payment-response/rejects_if_not_active-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-response/rejects_if_not_active-manual.https.html rename to tests/wpt/tests/payment-request/payment-response/rejects_if_not_active-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/payment-response/requestId-attribute-manual.https.html b/tests/wpt/tests/payment-request/payment-response/requestId-attribute-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/payment-response/requestId-attribute-manual.https.html rename to tests/wpt/tests/payment-request/payment-response/requestId-attribute-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active.https.html b/tests/wpt/tests/payment-request/rejects_if_not_active.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/rejects_if_not_active.https.html rename to tests/wpt/tests/payment-request/rejects_if_not_active.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/resources/delegate-request-subframe.sub.html b/tests/wpt/tests/payment-request/resources/delegate-request-subframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/resources/delegate-request-subframe.sub.html rename to tests/wpt/tests/payment-request/resources/delegate-request-subframe.sub.html diff --git a/tests/wpt/web-platform-tests/payment-request/resources/page1.html b/tests/wpt/tests/payment-request/resources/page1.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/resources/page1.html rename to tests/wpt/tests/payment-request/resources/page1.html diff --git a/tests/wpt/web-platform-tests/payment-request/resources/page2.html b/tests/wpt/tests/payment-request/resources/page2.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/resources/page2.html rename to tests/wpt/tests/payment-request/resources/page2.html diff --git a/tests/wpt/web-platform-tests/payment-request/show-consume-activation.https.html b/tests/wpt/tests/payment-request/show-consume-activation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/show-consume-activation.https.html rename to tests/wpt/tests/payment-request/show-consume-activation.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/show-method-optional-promise-rejects.https.html b/tests/wpt/tests/payment-request/show-method-optional-promise-rejects.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/show-method-optional-promise-rejects.https.html rename to tests/wpt/tests/payment-request/show-method-optional-promise-rejects.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/show-method-postmessage-iframe.html b/tests/wpt/tests/payment-request/show-method-postmessage-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/show-method-postmessage-iframe.html rename to tests/wpt/tests/payment-request/show-method-postmessage-iframe.html diff --git a/tests/wpt/web-platform-tests/payment-request/show-method-postmessage-manual.https.html b/tests/wpt/tests/payment-request/show-method-postmessage-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/show-method-postmessage-manual.https.html rename to tests/wpt/tests/payment-request/show-method-postmessage-manual.https.html diff --git a/tests/wpt/web-platform-tests/payment-request/user-abort-algorithm-manual.https.html b/tests/wpt/tests/payment-request/user-abort-algorithm-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/payment-request/user-abort-algorithm-manual.https.html rename to tests/wpt/tests/payment-request/user-abort-algorithm-manual.https.html diff --git a/tests/wpt/web-platform-tests/pending-beacon/META.yml b/tests/wpt/tests/pending-beacon/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/pending-beacon/META.yml rename to tests/wpt/tests/pending-beacon/META.yml diff --git a/tests/wpt/web-platform-tests/pending-beacon/pending_beacon-basic.tentative.https.window.js b/tests/wpt/tests/pending-beacon/pending_beacon-basic.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/pending-beacon/pending_beacon-basic.tentative.https.window.js rename to tests/wpt/tests/pending-beacon/pending_beacon-basic.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/pending-beacon/pending_beacon-basic.window.js b/tests/wpt/tests/pending-beacon/pending_beacon-basic.window.js similarity index 100% rename from tests/wpt/web-platform-tests/pending-beacon/pending_beacon-basic.window.js rename to tests/wpt/tests/pending-beacon/pending_beacon-basic.window.js diff --git a/tests/wpt/web-platform-tests/pending-beacon/pending_beacon-deactivate.tentative.https.window.js b/tests/wpt/tests/pending-beacon/pending_beacon-deactivate.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/pending-beacon/pending_beacon-deactivate.tentative.https.window.js rename to tests/wpt/tests/pending-beacon/pending_beacon-deactivate.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/pending-beacon/pending_beacon-sendnow.tentative.https.window.js b/tests/wpt/tests/pending-beacon/pending_beacon-sendnow.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/pending-beacon/pending_beacon-sendnow.tentative.https.window.js rename to tests/wpt/tests/pending-beacon/pending_beacon-sendnow.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js b/tests/wpt/tests/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js rename to tests/wpt/tests/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/pending-beacon/pending_beacon-sendonhidden.tentative.https.window.js b/tests/wpt/tests/pending-beacon/pending_beacon-sendonhidden.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/pending-beacon/pending_beacon-sendonhidden.tentative.https.window.js rename to tests/wpt/tests/pending-beacon/pending_beacon-sendonhidden.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/pending-beacon/pending_get_beacon-cors.tentative.https.window.js b/tests/wpt/tests/pending-beacon/pending_get_beacon-cors.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/pending-beacon/pending_get_beacon-cors.tentative.https.window.js rename to tests/wpt/tests/pending-beacon/pending_get_beacon-cors.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/pending-beacon/pending_get_beacon-send.tentative.https.window.js b/tests/wpt/tests/pending-beacon/pending_get_beacon-send.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/pending-beacon/pending_get_beacon-send.tentative.https.window.js rename to tests/wpt/tests/pending-beacon/pending_get_beacon-send.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/pending-beacon/pending_post_beacon-cors.tentative.https.window.js b/tests/wpt/tests/pending-beacon/pending_post_beacon-cors.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/pending-beacon/pending_post_beacon-cors.tentative.https.window.js rename to tests/wpt/tests/pending-beacon/pending_post_beacon-cors.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/pending-beacon/pending_post_beacon-sendwithdata.tentative.https.window.js b/tests/wpt/tests/pending-beacon/pending_post_beacon-sendwithdata.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/pending-beacon/pending_post_beacon-sendwithdata.tentative.https.window.js rename to tests/wpt/tests/pending-beacon/pending_post_beacon-sendwithdata.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/pending-beacon/resources/get_beacon.py b/tests/wpt/tests/pending-beacon/resources/get_beacon.py similarity index 100% rename from tests/wpt/web-platform-tests/pending-beacon/resources/get_beacon.py rename to tests/wpt/tests/pending-beacon/resources/get_beacon.py diff --git a/tests/wpt/web-platform-tests/pending-beacon/resources/pending_beacon-helper.js b/tests/wpt/tests/pending-beacon/resources/pending_beacon-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/pending-beacon/resources/pending_beacon-helper.js rename to tests/wpt/tests/pending-beacon/resources/pending_beacon-helper.js diff --git a/tests/wpt/web-platform-tests/pending-beacon/resources/set_beacon.py b/tests/wpt/tests/pending-beacon/resources/set_beacon.py similarity index 100% rename from tests/wpt/web-platform-tests/pending-beacon/resources/set_beacon.py rename to tests/wpt/tests/pending-beacon/resources/set_beacon.py diff --git a/tests/wpt/web-platform-tests/performance-timeline/META.yml b/tests/wpt/tests/performance-timeline/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/META.yml rename to tests/wpt/tests/performance-timeline/META.yml diff --git a/tests/wpt/web-platform-tests/performance-timeline/back-forward-cache-restoration.tentative.html b/tests/wpt/tests/performance-timeline/back-forward-cache-restoration.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/back-forward-cache-restoration.tentative.html rename to tests/wpt/tests/performance-timeline/back-forward-cache-restoration.tentative.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/buffered-flag-after-timeout.any.js b/tests/wpt/tests/performance-timeline/buffered-flag-after-timeout.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/buffered-flag-after-timeout.any.js rename to tests/wpt/tests/performance-timeline/buffered-flag-after-timeout.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/buffered-flag-observer.any.js b/tests/wpt/tests/performance-timeline/buffered-flag-observer.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/buffered-flag-observer.any.js rename to tests/wpt/tests/performance-timeline/buffered-flag-observer.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/case-sensitivity.any.js b/tests/wpt/tests/performance-timeline/case-sensitivity.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/case-sensitivity.any.js rename to tests/wpt/tests/performance-timeline/case-sensitivity.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/droppedentriescount.any.js b/tests/wpt/tests/performance-timeline/droppedentriescount.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/droppedentriescount.any.js rename to tests/wpt/tests/performance-timeline/droppedentriescount.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/get-invalid-entries.html b/tests/wpt/tests/performance-timeline/get-invalid-entries.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/get-invalid-entries.html rename to tests/wpt/tests/performance-timeline/get-invalid-entries.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/idlharness-shadowrealm.window.js b/tests/wpt/tests/performance-timeline/idlharness-shadowrealm.window.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/idlharness-shadowrealm.window.js rename to tests/wpt/tests/performance-timeline/idlharness-shadowrealm.window.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/idlharness.any.js b/tests/wpt/tests/performance-timeline/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/idlharness.any.js rename to tests/wpt/tests/performance-timeline/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/multiple-buffered-flag-observers.any.js b/tests/wpt/tests/performance-timeline/multiple-buffered-flag-observers.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/multiple-buffered-flag-observers.any.js rename to tests/wpt/tests/performance-timeline/multiple-buffered-flag-observers.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/navigation-id-detached-frame.tentative.html b/tests/wpt/tests/performance-timeline/navigation-id-detached-frame.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/navigation-id-detached-frame.tentative.html rename to tests/wpt/tests/performance-timeline/navigation-id-detached-frame.tentative.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/navigation-id-element-timing.tentative.html b/tests/wpt/tests/performance-timeline/navigation-id-element-timing.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/navigation-id-element-timing.tentative.html rename to tests/wpt/tests/performance-timeline/navigation-id-element-timing.tentative.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/navigation-id-initial-load.tentative.html b/tests/wpt/tests/performance-timeline/navigation-id-initial-load.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/navigation-id-initial-load.tentative.html rename to tests/wpt/tests/performance-timeline/navigation-id-initial-load.tentative.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/navigation-id-long-task-task-attribution.tentative.html b/tests/wpt/tests/performance-timeline/navigation-id-long-task-task-attribution.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/navigation-id-long-task-task-attribution.tentative.html rename to tests/wpt/tests/performance-timeline/navigation-id-long-task-task-attribution.tentative.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/navigation-id-mark-measure.tentative.html b/tests/wpt/tests/performance-timeline/navigation-id-mark-measure.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/navigation-id-mark-measure.tentative.html rename to tests/wpt/tests/performance-timeline/navigation-id-mark-measure.tentative.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/navigation-id-reset.tentative.html b/tests/wpt/tests/performance-timeline/navigation-id-reset.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/navigation-id-reset.tentative.html rename to tests/wpt/tests/performance-timeline/navigation-id-reset.tentative.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/navigation-id-resource-timing.tentative.html b/tests/wpt/tests/performance-timeline/navigation-id-resource-timing.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/navigation-id-resource-timing.tentative.html rename to tests/wpt/tests/performance-timeline/navigation-id-resource-timing.tentative.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/navigation-id-worker-created-entries.html b/tests/wpt/tests/performance-timeline/navigation-id-worker-created-entries.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/navigation-id-worker-created-entries.html rename to tests/wpt/tests/performance-timeline/navigation-id-worker-created-entries.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/navigation-id.helper.js b/tests/wpt/tests/performance-timeline/navigation-id.helper.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/navigation-id.helper.js rename to tests/wpt/tests/performance-timeline/navigation-id.helper.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/not-clonable.html b/tests/wpt/tests/performance-timeline/not-clonable.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/not-clonable.html rename to tests/wpt/tests/performance-timeline/not-clonable.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-attributes.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-attributes.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-attributes.tentative.window.js rename to tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-attributes.tentative.window.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-bfcache-reasons-stay.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-bfcache-reasons-stay.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-bfcache-reasons-stay.tentative.window.js rename to tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-bfcache-reasons-stay.tentative.window.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-bfcache.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-bfcache.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-bfcache.tentative.window.js rename to tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-bfcache.tentative.window.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-cross-origin-bfcache.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-cross-origin-bfcache.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-cross-origin-bfcache.tentative.window.js rename to tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-cross-origin-bfcache.tentative.window.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-not-bfcached.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-not-bfcached.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-not-bfcached.tentative.window.js rename to tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-not-bfcached.tentative.window.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-redirect-on-history.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-redirect-on-history.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-redirect-on-history.tentative.window.js rename to tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-redirect-on-history.tentative.window.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js rename to tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-replace.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-replace.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-replace.tentative.window.js rename to tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-replace.tentative.window.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/test-helper.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/test-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/not-restored-reasons/test-helper.js rename to tests/wpt/tests/performance-timeline/not-restored-reasons/test-helper.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/observer-buffered-false.any.js b/tests/wpt/tests/performance-timeline/observer-buffered-false.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/observer-buffered-false.any.js rename to tests/wpt/tests/performance-timeline/observer-buffered-false.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/performanceentry-tojson.any.js b/tests/wpt/tests/performance-timeline/performanceentry-tojson.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/performanceentry-tojson.any.js rename to tests/wpt/tests/performance-timeline/performanceentry-tojson.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/performanceobservers.js b/tests/wpt/tests/performance-timeline/performanceobservers.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/performanceobservers.js rename to tests/wpt/tests/performance-timeline/performanceobservers.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-callback-mutate.any.js b/tests/wpt/tests/performance-timeline/po-callback-mutate.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/po-callback-mutate.any.js rename to tests/wpt/tests/performance-timeline/po-callback-mutate.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-disconnect-removes-observed-types.any.js b/tests/wpt/tests/performance-timeline/po-disconnect-removes-observed-types.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/po-disconnect-removes-observed-types.any.js rename to tests/wpt/tests/performance-timeline/po-disconnect-removes-observed-types.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-disconnect.any.js b/tests/wpt/tests/performance-timeline/po-disconnect.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/po-disconnect.any.js rename to tests/wpt/tests/performance-timeline/po-disconnect.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-entries-sort.any.js b/tests/wpt/tests/performance-timeline/po-entries-sort.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/po-entries-sort.any.js rename to tests/wpt/tests/performance-timeline/po-entries-sort.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-getentries.any.js b/tests/wpt/tests/performance-timeline/po-getentries.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/po-getentries.any.js rename to tests/wpt/tests/performance-timeline/po-getentries.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-mark-measure.any.js b/tests/wpt/tests/performance-timeline/po-mark-measure.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/po-mark-measure.any.js rename to tests/wpt/tests/performance-timeline/po-mark-measure.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-observe-repeated-type.any.js b/tests/wpt/tests/performance-timeline/po-observe-repeated-type.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/po-observe-repeated-type.any.js rename to tests/wpt/tests/performance-timeline/po-observe-repeated-type.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-observe-type.any.js b/tests/wpt/tests/performance-timeline/po-observe-type.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/po-observe-type.any.js rename to tests/wpt/tests/performance-timeline/po-observe-type.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-observe.any.js b/tests/wpt/tests/performance-timeline/po-observe.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/po-observe.any.js rename to tests/wpt/tests/performance-timeline/po-observe.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-observe.html b/tests/wpt/tests/performance-timeline/po-observe.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/po-observe.html rename to tests/wpt/tests/performance-timeline/po-observe.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-resource.html b/tests/wpt/tests/performance-timeline/po-resource.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/po-resource.html rename to tests/wpt/tests/performance-timeline/po-resource.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-takeRecords.any.js b/tests/wpt/tests/performance-timeline/po-takeRecords.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/po-takeRecords.any.js rename to tests/wpt/tests/performance-timeline/po-takeRecords.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/resources/child-frame.html b/tests/wpt/tests/performance-timeline/resources/child-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/resources/child-frame.html rename to tests/wpt/tests/performance-timeline/resources/child-frame.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/resources/empty.html b/tests/wpt/tests/performance-timeline/resources/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/resources/empty.html rename to tests/wpt/tests/performance-timeline/resources/empty.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/resources/include-frames-helper.js b/tests/wpt/tests/performance-timeline/resources/include-frames-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/resources/include-frames-helper.js rename to tests/wpt/tests/performance-timeline/resources/include-frames-helper.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/resources/include-frames-subframe.html b/tests/wpt/tests/performance-timeline/resources/include-frames-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/resources/include-frames-subframe.html rename to tests/wpt/tests/performance-timeline/resources/include-frames-subframe.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/resources/json_resource.json b/tests/wpt/tests/performance-timeline/resources/json_resource.json similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/resources/json_resource.json rename to tests/wpt/tests/performance-timeline/resources/json_resource.json diff --git a/tests/wpt/web-platform-tests/performance-timeline/resources/make_long_task.js b/tests/wpt/tests/performance-timeline/resources/make_long_task.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/resources/make_long_task.js rename to tests/wpt/tests/performance-timeline/resources/make_long_task.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/resources/navigation-id-detached-frame-page.html b/tests/wpt/tests/performance-timeline/resources/navigation-id-detached-frame-page.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/resources/navigation-id-detached-frame-page.html rename to tests/wpt/tests/performance-timeline/resources/navigation-id-detached-frame-page.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/resources/postmessage-entry.html b/tests/wpt/tests/performance-timeline/resources/postmessage-entry.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/resources/postmessage-entry.html rename to tests/wpt/tests/performance-timeline/resources/postmessage-entry.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/resources/square.png b/tests/wpt/tests/performance-timeline/resources/square.png similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/resources/square.png rename to tests/wpt/tests/performance-timeline/resources/square.png diff --git a/tests/wpt/web-platform-tests/performance-timeline/resources/worker-invalid-entries.js b/tests/wpt/tests/performance-timeline/resources/worker-invalid-entries.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/resources/worker-invalid-entries.js rename to tests/wpt/tests/performance-timeline/resources/worker-invalid-entries.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/resources/worker-navigation-id.js b/tests/wpt/tests/performance-timeline/resources/worker-navigation-id.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/resources/worker-navigation-id.js rename to tests/wpt/tests/performance-timeline/resources/worker-navigation-id.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/resources/worker-with-performance-observer.js b/tests/wpt/tests/performance-timeline/resources/worker-with-performance-observer.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/resources/worker-with-performance-observer.js rename to tests/wpt/tests/performance-timeline/resources/worker-with-performance-observer.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/supportedEntryTypes-cross-realm-access.html b/tests/wpt/tests/performance-timeline/supportedEntryTypes-cross-realm-access.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/supportedEntryTypes-cross-realm-access.html rename to tests/wpt/tests/performance-timeline/supportedEntryTypes-cross-realm-access.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/supportedEntryTypes.any.js b/tests/wpt/tests/performance-timeline/supportedEntryTypes.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/supportedEntryTypes.any.js rename to tests/wpt/tests/performance-timeline/supportedEntryTypes.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/tentative/detached-frame.html b/tests/wpt/tests/performance-timeline/tentative/detached-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/tentative/detached-frame.html rename to tests/wpt/tests/performance-timeline/tentative/detached-frame.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/tentative/include-frames-originA-A-A.html b/tests/wpt/tests/performance-timeline/tentative/include-frames-originA-A-A.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/tentative/include-frames-originA-A-A.html rename to tests/wpt/tests/performance-timeline/tentative/include-frames-originA-A-A.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/tentative/include-frames-originA-A.html b/tests/wpt/tests/performance-timeline/tentative/include-frames-originA-A.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/tentative/include-frames-originA-A.html rename to tests/wpt/tests/performance-timeline/tentative/include-frames-originA-A.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/tentative/include-frames-originA-AA.html b/tests/wpt/tests/performance-timeline/tentative/include-frames-originA-AA.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/tentative/include-frames-originA-AA.html rename to tests/wpt/tests/performance-timeline/tentative/include-frames-originA-AA.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/tentative/include-frames-originA-AB.html b/tests/wpt/tests/performance-timeline/tentative/include-frames-originA-AB.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/tentative/include-frames-originA-AB.html rename to tests/wpt/tests/performance-timeline/tentative/include-frames-originA-AB.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/tentative/include-frames-originA-B-A.html b/tests/wpt/tests/performance-timeline/tentative/include-frames-originA-B-A.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/tentative/include-frames-originA-B-A.html rename to tests/wpt/tests/performance-timeline/tentative/include-frames-originA-B-A.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/tentative/include-frames-originA-B-B.html b/tests/wpt/tests/performance-timeline/tentative/include-frames-originA-B-B.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/tentative/include-frames-originA-B-B.html rename to tests/wpt/tests/performance-timeline/tentative/include-frames-originA-B-B.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/tentative/include-frames-originA-B.html b/tests/wpt/tests/performance-timeline/tentative/include-frames-originA-B.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/tentative/include-frames-originA-B.html rename to tests/wpt/tests/performance-timeline/tentative/include-frames-originA-B.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/tentative/performance-entry-source.html b/tests/wpt/tests/performance-timeline/tentative/performance-entry-source.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/tentative/performance-entry-source.html rename to tests/wpt/tests/performance-timeline/tentative/performance-entry-source.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/tentative/with-filter-options-originA.html b/tests/wpt/tests/performance-timeline/tentative/with-filter-options-originA.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/tentative/with-filter-options-originA.html rename to tests/wpt/tests/performance-timeline/tentative/with-filter-options-originA.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/timing-removed-iframe.html b/tests/wpt/tests/performance-timeline/timing-removed-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/timing-removed-iframe.html rename to tests/wpt/tests/performance-timeline/timing-removed-iframe.html diff --git a/tests/wpt/web-platform-tests/performance-timeline/webtiming-resolution.any.js b/tests/wpt/tests/performance-timeline/webtiming-resolution.any.js similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/webtiming-resolution.any.js rename to tests/wpt/tests/performance-timeline/webtiming-resolution.any.js diff --git a/tests/wpt/web-platform-tests/performance-timeline/worker-with-performance-observer.html b/tests/wpt/tests/performance-timeline/worker-with-performance-observer.html similarity index 100% rename from tests/wpt/web-platform-tests/performance-timeline/worker-with-performance-observer.html rename to tests/wpt/tests/performance-timeline/worker-with-performance-observer.html diff --git a/tests/wpt/web-platform-tests/periodic-background-sync/META.yml b/tests/wpt/tests/periodic-background-sync/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/periodic-background-sync/META.yml rename to tests/wpt/tests/periodic-background-sync/META.yml diff --git a/tests/wpt/web-platform-tests/periodic-background-sync/idlharness.https.any.js b/tests/wpt/tests/periodic-background-sync/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/periodic-background-sync/idlharness.https.any.js rename to tests/wpt/tests/periodic-background-sync/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/periodic-background-sync/periodicsync.https.window.js b/tests/wpt/tests/periodic-background-sync/periodicsync.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/periodic-background-sync/periodicsync.https.window.js rename to tests/wpt/tests/periodic-background-sync/periodicsync.https.window.js diff --git a/tests/wpt/web-platform-tests/periodic-background-sync/service_workers/sw.js b/tests/wpt/tests/periodic-background-sync/service_workers/sw.js similarity index 100% rename from tests/wpt/web-platform-tests/periodic-background-sync/service_workers/sw.js rename to tests/wpt/tests/periodic-background-sync/service_workers/sw.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/META.yml b/tests/wpt/tests/permissions-policy/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/META.yml rename to tests/wpt/tests/permissions-policy/META.yml diff --git a/tests/wpt/web-platform-tests/permissions-policy/README.md b/tests/wpt/tests/permissions-policy/README.md similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/README.md rename to tests/wpt/tests/permissions-policy/README.md diff --git a/tests/wpt/web-platform-tests/permissions-policy/bluetooth-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/tests/permissions-policy/bluetooth-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/bluetooth-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html rename to tests/wpt/tests/permissions-policy/bluetooth-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/bluetooth-allowed-by-permissions-policy-attribute.https.sub.html b/tests/wpt/tests/permissions-policy/bluetooth-allowed-by-permissions-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/bluetooth-allowed-by-permissions-policy-attribute.https.sub.html rename to tests/wpt/tests/permissions-policy/bluetooth-allowed-by-permissions-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/bluetooth-allowed-by-permissions-policy.https.sub.html b/tests/wpt/tests/permissions-policy/bluetooth-allowed-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/bluetooth-allowed-by-permissions-policy.https.sub.html rename to tests/wpt/tests/permissions-policy/bluetooth-allowed-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/bluetooth-allowed-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/permissions-policy/bluetooth-allowed-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/bluetooth-allowed-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/permissions-policy/bluetooth-allowed-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/bluetooth-default-permissions-policy.https.sub.html b/tests/wpt/tests/permissions-policy/bluetooth-default-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/bluetooth-default-permissions-policy.https.sub.html rename to tests/wpt/tests/permissions-policy/bluetooth-default-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/bluetooth-disabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/permissions-policy/bluetooth-disabled-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/bluetooth-disabled-by-permissions-policy.https.sub.html rename to tests/wpt/tests/permissions-policy/bluetooth-disabled-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/bluetooth-disabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/permissions-policy/bluetooth-disabled-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/bluetooth-disabled-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/permissions-policy/bluetooth-disabled-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/focus-without-user-activation-disabled-tentative.html b/tests/wpt/tests/permissions-policy/experimental-features/focus-without-user-activation-disabled-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/focus-without-user-activation-disabled-tentative.html rename to tests/wpt/tests/permissions-policy/experimental-features/focus-without-user-activation-disabled-tentative.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/focus-without-user-activation-enabled-tentative.sub.html b/tests/wpt/tests/permissions-policy/experimental-features/focus-without-user-activation-enabled-tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/focus-without-user-activation-enabled-tentative.sub.html rename to tests/wpt/tests/permissions-policy/experimental-features/focus-without-user-activation-enabled-tentative.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/permissions-policy-header-host-wildcard.https.sub.html b/tests/wpt/tests/permissions-policy/experimental-features/permissions-policy-header-host-wildcard.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/permissions-policy-header-host-wildcard.https.sub.html rename to tests/wpt/tests/permissions-policy/experimental-features/permissions-policy-header-host-wildcard.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/permissions-policy-header-host-wildcard.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/experimental-features/permissions-policy-header-host-wildcard.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/permissions-policy-header-host-wildcard.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/experimental-features/permissions-policy-header-host-wildcard.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/permissions-policy-header-port-wildcard.https.sub.html b/tests/wpt/tests/permissions-policy/experimental-features/permissions-policy-header-port-wildcard.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/permissions-policy-header-port-wildcard.https.sub.html rename to tests/wpt/tests/permissions-policy/experimental-features/permissions-policy-header-port-wildcard.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/permissions-policy-header-port-wildcard.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/experimental-features/permissions-policy-header-port-wildcard.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/permissions-policy-header-port-wildcard.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/experimental-features/permissions-policy-header-port-wildcard.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/permissions-policy-header-scheme-only.https.sub.html b/tests/wpt/tests/permissions-policy/experimental-features/permissions-policy-header-scheme-only.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/permissions-policy-header-scheme-only.https.sub.html rename to tests/wpt/tests/permissions-policy/experimental-features/permissions-policy-header-scheme-only.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/permissions-policy-header-scheme-only.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/experimental-features/permissions-policy-header-scheme-only.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/permissions-policy-header-scheme-only.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/experimental-features/permissions-policy-header-scheme-only.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/private-state-token-redemption-default-permissions-policy.tentative.https.sub.html b/tests/wpt/tests/permissions-policy/experimental-features/private-state-token-redemption-default-permissions-policy.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/private-state-token-redemption-default-permissions-policy.tentative.https.sub.html rename to tests/wpt/tests/permissions-policy/experimental-features/private-state-token-redemption-default-permissions-policy.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/private-state-token-redemption-supported-by-permissions-policy.tentative.html b/tests/wpt/tests/permissions-policy/experimental-features/private-state-token-redemption-supported-by-permissions-policy.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/private-state-token-redemption-supported-by-permissions-policy.tentative.html rename to tests/wpt/tests/permissions-policy/experimental-features/private-state-token-redemption-supported-by-permissions-policy.tentative.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/common.js b/tests/wpt/tests/permissions-policy/experimental-features/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/common.js rename to tests/wpt/tests/permissions-policy/experimental-features/resources/common.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/focus-without-user-activation-iframe-tentative.html b/tests/wpt/tests/permissions-policy/experimental-features/resources/focus-without-user-activation-iframe-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/focus-without-user-activation-iframe-tentative.html rename to tests/wpt/tests/permissions-policy/experimental-features/resources/focus-without-user-activation-iframe-tentative.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/lazyload-contents.html b/tests/wpt/tests/permissions-policy/experimental-features/resources/lazyload-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/lazyload-contents.html rename to tests/wpt/tests/permissions-policy/experimental-features/resources/lazyload-contents.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/lazyload.png b/tests/wpt/tests/permissions-policy/experimental-features/resources/lazyload.png similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/lazyload.png rename to tests/wpt/tests/permissions-policy/experimental-features/resources/lazyload.png diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/permissions-policy-private-state-token-redemption.html b/tests/wpt/tests/permissions-policy/experimental-features/resources/permissions-policy-private-state-token-redemption.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/permissions-policy-private-state-token-redemption.html rename to tests/wpt/tests/permissions-policy/experimental-features/resources/permissions-policy-private-state-token-redemption.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/unload-helper.js b/tests/wpt/tests/permissions-policy/experimental-features/resources/unload-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/unload-helper.js rename to tests/wpt/tests/permissions-policy/experimental-features/resources/unload-helper.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/vertical-scroll-scrollable-content.html b/tests/wpt/tests/permissions-policy/experimental-features/resources/vertical-scroll-scrollable-content.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/vertical-scroll-scrollable-content.html rename to tests/wpt/tests/permissions-policy/experimental-features/resources/vertical-scroll-scrollable-content.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/vertical-scroll-scrollbar-ref.html b/tests/wpt/tests/permissions-policy/experimental-features/resources/vertical-scroll-scrollbar-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/vertical-scroll-scrollbar-ref.html rename to tests/wpt/tests/permissions-policy/experimental-features/resources/vertical-scroll-scrollbar-ref.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/vertical-scroll-scrollintoview.html b/tests/wpt/tests/permissions-policy/experimental-features/resources/vertical-scroll-scrollintoview.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/vertical-scroll-scrollintoview.html rename to tests/wpt/tests/permissions-policy/experimental-features/resources/vertical-scroll-scrollintoview.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/vertical-scroll-touch-action.html b/tests/wpt/tests/permissions-policy/experimental-features/resources/vertical-scroll-touch-action.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/vertical-scroll-touch-action.html rename to tests/wpt/tests/permissions-policy/experimental-features/resources/vertical-scroll-touch-action.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/vertical-scroll-touch-block.html b/tests/wpt/tests/permissions-policy/experimental-features/resources/vertical-scroll-touch-block.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/vertical-scroll-touch-block.html rename to tests/wpt/tests/permissions-policy/experimental-features/resources/vertical-scroll-touch-block.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/vertical-scroll-wheel-block.html b/tests/wpt/tests/permissions-policy/experimental-features/resources/vertical-scroll-wheel-block.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/vertical-scroll-wheel-block.html rename to tests/wpt/tests/permissions-policy/experimental-features/resources/vertical-scroll-wheel-block.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/vertical-scroll.js b/tests/wpt/tests/permissions-policy/experimental-features/resources/vertical-scroll.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/vertical-scroll.js rename to tests/wpt/tests/permissions-policy/experimental-features/resources/vertical-scroll.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/unload-allowed-by-default.tentative.window.js b/tests/wpt/tests/permissions-policy/experimental-features/unload-allowed-by-default.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/unload-allowed-by-default.tentative.window.js rename to tests/wpt/tests/permissions-policy/experimental-features/unload-allowed-by-default.tentative.window.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/unload-disallowed-subframe.tentative.window.js b/tests/wpt/tests/permissions-policy/experimental-features/unload-disallowed-subframe.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/unload-disallowed-subframe.tentative.window.js rename to tests/wpt/tests/permissions-policy/experimental-features/unload-disallowed-subframe.tentative.window.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/unload-disallowed.tentative.window.js b/tests/wpt/tests/permissions-policy/experimental-features/unload-disallowed.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/unload-disallowed.tentative.window.js rename to tests/wpt/tests/permissions-policy/experimental-features/unload-disallowed.tentative.window.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-disabled-frame-no-scroll-manual.tentative.html b/tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-disabled-frame-no-scroll-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-disabled-frame-no-scroll-manual.tentative.html rename to tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-disabled-frame-no-scroll-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-disabled-scrollbar-tentative.html b/tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-disabled-scrollbar-tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-disabled-scrollbar-tentative.html rename to tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-disabled-scrollbar-tentative.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html b/tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html rename to tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html.headers b/tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html.headers rename to tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-main-frame-manual.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-scrollintoview.tentative.html b/tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-scrollintoview.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-scrollintoview.tentative.html rename to tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-scrollintoview.tentative.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html b/tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html rename to tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-touch-block-manual.tentative.html b/tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-touch-block-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-touch-block-manual.tentative.html rename to tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-touch-block-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-wheel-block-manual.tentative.html b/tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-wheel-block-manual.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/experimental-features/vertical-scroll-wheel-block-manual.tentative.html rename to tests/wpt/tests/permissions-policy/experimental-features/vertical-scroll-wheel-block-manual.tentative.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/idlharness.window.js b/tests/wpt/tests/permissions-policy/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/idlharness.window.js rename to tests/wpt/tests/permissions-policy/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/tests/permissions-policy/payment-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html rename to tests/wpt/tests/permissions-policy/payment-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy-attribute.https.sub.html b/tests/wpt/tests/permissions-policy/payment-allowed-by-permissions-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy-attribute.https.sub.html rename to tests/wpt/tests/permissions-policy/payment-allowed-by-permissions-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub.html b/tests/wpt/tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub.html rename to tests/wpt/tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/payment-default-permissions-policy.https.sub.html b/tests/wpt/tests/permissions-policy/payment-default-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/payment-default-permissions-policy.https.sub.html rename to tests/wpt/tests/permissions-policy/payment-default-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/payment-disabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/permissions-policy/payment-disabled-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/payment-disabled-by-permissions-policy.https.sub.html rename to tests/wpt/tests/permissions-policy/payment-disabled-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/payment-disabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/permissions-policy/payment-disabled-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/payment-disabled-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/permissions-policy/payment-disabled-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/payment-extension-allowed-by-permissions-policy-attribute.https.sub.html b/tests/wpt/tests/permissions-policy/payment-extension-allowed-by-permissions-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/payment-extension-allowed-by-permissions-policy-attribute.https.sub.html rename to tests/wpt/tests/permissions-policy/payment-extension-allowed-by-permissions-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/payment-supported-by-permissions-policy.tentative.html b/tests/wpt/tests/permissions-policy/payment-supported-by-permissions-policy.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/payment-supported-by-permissions-policy.tentative.html rename to tests/wpt/tests/permissions-policy/payment-supported-by-permissions-policy.tentative.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-all.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-all.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-all.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-all.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-all.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-all.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-all.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-all.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-self.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-self.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-self.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-self.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-self.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-self.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-self.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-self.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some-override.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some-override.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some-override.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some-override.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some-override.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some-override.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some-override.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some-override.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-allowed-for-some.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-disallowed-for-all.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-disallowed-for-all.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-disallowed-for-all.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-disallowed-for-all.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-disallowed-for-all.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-disallowed-for-all.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-disallowed-for-all.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-disallowed-for-all.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-timing-iframe-camera.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-timing-iframe-camera.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-timing-iframe-camera.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-timing-iframe-camera.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-timing.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-timing.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-frame-policy-timing.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-frame-policy-timing.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-all.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-all.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-all.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-all.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-all.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-all.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-all.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-all.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-malformed-wildcard.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-malformed-wildcard.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-malformed-wildcard.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-malformed-wildcard.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-malformed-wildcard.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-malformed-wildcard.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-malformed-wildcard.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-malformed-wildcard.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-self.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-some.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-some.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-some.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-some.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-some.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-some.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-some.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-some.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-wildcard.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-wildcard.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-wildcard.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-wildcard.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-wildcard.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-wildcard.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-wildcard.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-header-policy-allowed-for-wildcard.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-declined.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-header-policy-declined.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-declined.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-header-policy-declined.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-declined.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-header-policy-declined.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-declined.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-header-policy-declined.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-disallowed-for-all.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-header-policy-disallowed-for-all.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-disallowed-for-all.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-header-policy-disallowed-for-all.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-disallowed-for-all.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-header-policy-disallowed-for-all.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-disallowed-for-all.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-header-policy-disallowed-for-all.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-javascript-url-frame-policy.https.html b/tests/wpt/tests/permissions-policy/permissions-policy-javascript-url-frame-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-javascript-url-frame-policy.https.html rename to tests/wpt/tests/permissions-policy/permissions-policy-javascript-url-frame-policy.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-all.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-all.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-all.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-all.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-all.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-all.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-all.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-all.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-self.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-self.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-self.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-self.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-self.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-self.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-self.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-self.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-disallowed-for-all.https.sub.html b/tests/wpt/tests/permissions-policy/permissions-policy-nested-header-policy-disallowed-for-all.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-disallowed-for-all.https.sub.html rename to tests/wpt/tests/permissions-policy/permissions-policy-nested-header-policy-disallowed-for-all.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-disallowed-for-all.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/permissions-policy-nested-header-policy-disallowed-for-all.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-disallowed-for-all.https.sub.html.sub.headers rename to tests/wpt/tests/permissions-policy/permissions-policy-nested-header-policy-disallowed-for-all.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-opaque-origin-history.https.html b/tests/wpt/tests/permissions-policy/permissions-policy-opaque-origin-history.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-opaque-origin-history.https.html rename to tests/wpt/tests/permissions-policy/permissions-policy-opaque-origin-history.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-opaque-origin.https.html b/tests/wpt/tests/permissions-policy/permissions-policy-opaque-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/permissions-policy-opaque-origin.https.html rename to tests/wpt/tests/permissions-policy/permissions-policy-opaque-origin.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html rename to tests/wpt/tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy-attribute.https.sub.html b/tests/wpt/tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy-attribute.https.sub.html rename to tests/wpt/tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy.https.sub.html b/tests/wpt/tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy.https.sub.html rename to tests/wpt/tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/permissions-policy/picture-in-picture-allowed-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-default-permissions-policy.https.sub.html b/tests/wpt/tests/permissions-policy/picture-in-picture-default-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-default-permissions-policy.https.sub.html rename to tests/wpt/tests/permissions-policy/picture-in-picture-default-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-disabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/permissions-policy/picture-in-picture-disabled-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-disabled-by-permissions-policy.https.sub.html rename to tests/wpt/tests/permissions-policy/picture-in-picture-disabled-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-disabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/permissions-policy/picture-in-picture-disabled-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-disabled-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/permissions-policy/picture-in-picture-disabled-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-supported-by-permissions-policy.html b/tests/wpt/tests/permissions-policy/picture-in-picture-supported-by-permissions-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/picture-in-picture-supported-by-permissions-policy.html rename to tests/wpt/tests/permissions-policy/picture-in-picture-supported-by-permissions-policy.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/policy-extends-to-sandbox.html b/tests/wpt/tests/permissions-policy/policy-extends-to-sandbox.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/policy-extends-to-sandbox.html rename to tests/wpt/tests/permissions-policy/policy-extends-to-sandbox.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/private-state-token-issue-allowed-by-permissions-policy-attribute.tentative.https.sub.html b/tests/wpt/tests/permissions-policy/private-state-token-issue-allowed-by-permissions-policy-attribute.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/private-state-token-issue-allowed-by-permissions-policy-attribute.tentative.https.sub.html rename to tests/wpt/tests/permissions-policy/private-state-token-issue-allowed-by-permissions-policy-attribute.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/private-state-token-issue-disabled-by-permissions-policy.tentative.https.sub.html b/tests/wpt/tests/permissions-policy/private-state-token-issue-disabled-by-permissions-policy.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/private-state-token-issue-disabled-by-permissions-policy.tentative.https.sub.html rename to tests/wpt/tests/permissions-policy/private-state-token-issue-disabled-by-permissions-policy.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/private-state-token-issue-disabled-by-permissions-policy.tentative.https.sub.html.headers b/tests/wpt/tests/permissions-policy/private-state-token-issue-disabled-by-permissions-policy.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/private-state-token-issue-disabled-by-permissions-policy.tentative.https.sub.html.headers rename to tests/wpt/tests/permissions-policy/private-state-token-issue-disabled-by-permissions-policy.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/private-state-token-issue-enabled-by-permissions-policy.tentative.https.sub.html b/tests/wpt/tests/permissions-policy/private-state-token-issue-enabled-by-permissions-policy.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/private-state-token-issue-enabled-by-permissions-policy.tentative.https.sub.html rename to tests/wpt/tests/permissions-policy/private-state-token-issue-enabled-by-permissions-policy.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/private-state-token-issue-enabled-by-permissions-policy.tentative.https.sub.html.headers b/tests/wpt/tests/permissions-policy/private-state-token-issue-enabled-by-permissions-policy.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/private-state-token-issue-enabled-by-permissions-policy.tentative.https.sub.html.headers rename to tests/wpt/tests/permissions-policy/private-state-token-issue-enabled-by-permissions-policy.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/private-state-token-issue-supported-by-permissions-policy.tentative.html b/tests/wpt/tests/permissions-policy/private-state-token-issue-supported-by-permissions-policy.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/private-state-token-issue-supported-by-permissions-policy.tentative.html rename to tests/wpt/tests/permissions-policy/private-state-token-issue-supported-by-permissions-policy.tentative.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/bluetooth-report-only.https.html b/tests/wpt/tests/permissions-policy/reporting/bluetooth-report-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/bluetooth-report-only.https.html rename to tests/wpt/tests/permissions-policy/reporting/bluetooth-report-only.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/bluetooth-report-only.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/bluetooth-report-only.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/bluetooth-report-only.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/bluetooth-report-only.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/bluetooth-reporting.https.html b/tests/wpt/tests/permissions-policy/reporting/bluetooth-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/bluetooth-reporting.https.html rename to tests/wpt/tests/permissions-policy/reporting/bluetooth-reporting.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/bluetooth-reporting.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/bluetooth-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/bluetooth-reporting.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/bluetooth-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/camera-report-only.https.html b/tests/wpt/tests/permissions-policy/reporting/camera-report-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/camera-report-only.https.html rename to tests/wpt/tests/permissions-policy/reporting/camera-report-only.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/camera-report-only.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/camera-report-only.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/camera-report-only.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/camera-report-only.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/camera-reporting.https.html b/tests/wpt/tests/permissions-policy/reporting/camera-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/camera-reporting.https.html rename to tests/wpt/tests/permissions-policy/reporting/camera-reporting.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/camera-reporting.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/camera-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/camera-reporting.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/camera-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-report-only.https.html b/tests/wpt/tests/permissions-policy/reporting/encrypted-media-report-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-report-only.https.html rename to tests/wpt/tests/permissions-policy/reporting/encrypted-media-report-only.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-report-only.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/encrypted-media-report-only.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-report-only.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/encrypted-media-report-only.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-reporting.https.html b/tests/wpt/tests/permissions-policy/reporting/encrypted-media-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-reporting.https.html rename to tests/wpt/tests/permissions-policy/reporting/encrypted-media-reporting.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-reporting.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/encrypted-media-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-reporting.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/encrypted-media-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-report-only.html b/tests/wpt/tests/permissions-policy/reporting/fullscreen-report-only.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-report-only.html rename to tests/wpt/tests/permissions-policy/reporting/fullscreen-report-only.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-report-only.html.headers b/tests/wpt/tests/permissions-policy/reporting/fullscreen-report-only.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-report-only.html.headers rename to tests/wpt/tests/permissions-policy/reporting/fullscreen-report-only.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-reporting.html b/tests/wpt/tests/permissions-policy/reporting/fullscreen-reporting.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-reporting.html rename to tests/wpt/tests/permissions-policy/reporting/fullscreen-reporting.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-reporting.html.headers b/tests/wpt/tests/permissions-policy/reporting/fullscreen-reporting.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-reporting.html.headers rename to tests/wpt/tests/permissions-policy/reporting/fullscreen-reporting.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-report-only.https.html b/tests/wpt/tests/permissions-policy/reporting/generic-sensor-report-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-report-only.https.html rename to tests/wpt/tests/permissions-policy/reporting/generic-sensor-report-only.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-report-only.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/generic-sensor-report-only.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-report-only.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/generic-sensor-report-only.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-reporting.https.html b/tests/wpt/tests/permissions-policy/reporting/generic-sensor-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-reporting.https.html rename to tests/wpt/tests/permissions-policy/reporting/generic-sensor-reporting.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-reporting.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/generic-sensor-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-reporting.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/generic-sensor-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-report-only.https.html b/tests/wpt/tests/permissions-policy/reporting/geolocation-report-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-report-only.https.html rename to tests/wpt/tests/permissions-policy/reporting/geolocation-report-only.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-report-only.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/geolocation-report-only.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-report-only.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/geolocation-report-only.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-reporting.https.html b/tests/wpt/tests/permissions-policy/reporting/geolocation-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-reporting.https.html rename to tests/wpt/tests/permissions-policy/reporting/geolocation-reporting.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-reporting.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/geolocation-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-reporting.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/geolocation-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/image.bmp b/tests/wpt/tests/permissions-policy/reporting/image.bmp similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/image.bmp rename to tests/wpt/tests/permissions-policy/reporting/image.bmp diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-report-only.https.html b/tests/wpt/tests/permissions-policy/reporting/microphone-report-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-report-only.https.html rename to tests/wpt/tests/permissions-policy/reporting/microphone-report-only.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-report-only.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/microphone-report-only.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-report-only.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/microphone-report-only.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-reporting.https.html b/tests/wpt/tests/permissions-policy/reporting/microphone-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-reporting.https.html rename to tests/wpt/tests/permissions-policy/reporting/microphone-reporting.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-reporting.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/microphone-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-reporting.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/microphone-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/midi-report-only.https.html b/tests/wpt/tests/permissions-policy/reporting/midi-report-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/midi-report-only.https.html rename to tests/wpt/tests/permissions-policy/reporting/midi-report-only.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/midi-report-only.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/midi-report-only.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/midi-report-only.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/midi-report-only.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/midi-reporting.https.html b/tests/wpt/tests/permissions-policy/reporting/midi-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/midi-reporting.https.html rename to tests/wpt/tests/permissions-policy/reporting/midi-reporting.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/midi-reporting.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/midi-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/midi-reporting.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/midi-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/payment-report-only.https.html b/tests/wpt/tests/permissions-policy/reporting/payment-report-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/payment-report-only.https.html rename to tests/wpt/tests/permissions-policy/reporting/payment-report-only.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/payment-report-only.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/payment-report-only.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/payment-report-only.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/payment-report-only.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/payment-reporting.https.html b/tests/wpt/tests/permissions-policy/reporting/payment-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/payment-reporting.https.html rename to tests/wpt/tests/permissions-policy/reporting/payment-reporting.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/payment-reporting.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/payment-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/payment-reporting.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/payment-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-report-only.html b/tests/wpt/tests/permissions-policy/reporting/picture-in-picture-report-only.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-report-only.html rename to tests/wpt/tests/permissions-policy/reporting/picture-in-picture-report-only.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-report-only.html.headers b/tests/wpt/tests/permissions-policy/reporting/picture-in-picture-report-only.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-report-only.html.headers rename to tests/wpt/tests/permissions-policy/reporting/picture-in-picture-report-only.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-reporting.html b/tests/wpt/tests/permissions-policy/reporting/picture-in-picture-reporting.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-reporting.html rename to tests/wpt/tests/permissions-policy/reporting/picture-in-picture-reporting.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-reporting.html.headers b/tests/wpt/tests/permissions-policy/reporting/picture-in-picture-reporting.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-reporting.html.headers rename to tests/wpt/tests/permissions-policy/reporting/picture-in-picture-reporting.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/screen-wake-lock-reporting.https.html b/tests/wpt/tests/permissions-policy/reporting/screen-wake-lock-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/screen-wake-lock-reporting.https.html rename to tests/wpt/tests/permissions-policy/reporting/screen-wake-lock-reporting.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/screen-wake-lock-reporting.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/screen-wake-lock-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/screen-wake-lock-reporting.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/screen-wake-lock-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/serial-report-only.https.html b/tests/wpt/tests/permissions-policy/reporting/serial-report-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/serial-report-only.https.html rename to tests/wpt/tests/permissions-policy/reporting/serial-report-only.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/serial-report-only.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/serial-report-only.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/serial-report-only.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/serial-report-only.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/serial-reporting.https.html b/tests/wpt/tests/permissions-policy/reporting/serial-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/serial-reporting.https.html rename to tests/wpt/tests/permissions-policy/reporting/serial-reporting.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/serial-reporting.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/serial-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/serial-reporting.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/serial-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-report-only.html b/tests/wpt/tests/permissions-policy/reporting/sync-xhr-report-only.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-report-only.html rename to tests/wpt/tests/permissions-policy/reporting/sync-xhr-report-only.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-report-only.html.headers b/tests/wpt/tests/permissions-policy/reporting/sync-xhr-report-only.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-report-only.html.headers rename to tests/wpt/tests/permissions-policy/reporting/sync-xhr-report-only.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-reporting.html b/tests/wpt/tests/permissions-policy/reporting/sync-xhr-reporting.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-reporting.html rename to tests/wpt/tests/permissions-policy/reporting/sync-xhr-reporting.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-reporting.html.headers b/tests/wpt/tests/permissions-policy/reporting/sync-xhr-reporting.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-reporting.html.headers rename to tests/wpt/tests/permissions-policy/reporting/sync-xhr-reporting.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/usb-report-only.https.html b/tests/wpt/tests/permissions-policy/reporting/usb-report-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/usb-report-only.https.html rename to tests/wpt/tests/permissions-policy/reporting/usb-report-only.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/usb-report-only.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/usb-report-only.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/usb-report-only.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/usb-report-only.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/usb-reporting.https.html b/tests/wpt/tests/permissions-policy/reporting/usb-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/usb-reporting.https.html rename to tests/wpt/tests/permissions-policy/reporting/usb-reporting.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/usb-reporting.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/usb-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/usb-reporting.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/usb-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/xr-report-only.https.html b/tests/wpt/tests/permissions-policy/reporting/xr-report-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/xr-report-only.https.html rename to tests/wpt/tests/permissions-policy/reporting/xr-report-only.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/xr-report-only.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/xr-report-only.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/xr-report-only.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/xr-report-only.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/xr-reporting.https.html b/tests/wpt/tests/permissions-policy/reporting/xr-reporting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/xr-reporting.https.html rename to tests/wpt/tests/permissions-policy/reporting/xr-reporting.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/xr-reporting.https.html.headers b/tests/wpt/tests/permissions-policy/reporting/xr-reporting.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/reporting/xr-reporting.https.html.headers rename to tests/wpt/tests/permissions-policy/reporting/xr-reporting.https.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/autoplay.js b/tests/wpt/tests/permissions-policy/resources/autoplay.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/autoplay.js rename to tests/wpt/tests/permissions-policy/resources/autoplay.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/nested-sandbox.html b/tests/wpt/tests/permissions-policy/resources/nested-sandbox.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/nested-sandbox.html rename to tests/wpt/tests/permissions-policy/resources/nested-sandbox.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/opaque-origin-history1.sub.https.html b/tests/wpt/tests/permissions-policy/resources/opaque-origin-history1.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/opaque-origin-history1.sub.https.html rename to tests/wpt/tests/permissions-policy/resources/opaque-origin-history1.sub.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/opaque-origin-history2.https.html b/tests/wpt/tests/permissions-policy/resources/opaque-origin-history2.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/opaque-origin-history2.https.html rename to tests/wpt/tests/permissions-policy/resources/opaque-origin-history2.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/opaque-origin1.sub.https.html b/tests/wpt/tests/permissions-policy/resources/opaque-origin1.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/opaque-origin1.sub.https.html rename to tests/wpt/tests/permissions-policy/resources/opaque-origin1.sub.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/opaque-origin2.https.html b/tests/wpt/tests/permissions-policy/resources/opaque-origin2.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/opaque-origin2.https.html rename to tests/wpt/tests/permissions-policy/resources/opaque-origin2.https.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-allowedfeatures.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-allowedfeatures.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-allowedfeatures.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-allowedfeatures.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-autoplay.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-autoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-autoplay.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-autoplay.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-battery.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-battery.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-battery.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-battery.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-bluetooth.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-bluetooth.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-bluetooth.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-bluetooth.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-clipboard-read.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-clipboard-read.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-clipboard-read.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-clipboard-read.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-clipboard-write.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-clipboard-write.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-clipboard-write.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-clipboard-write.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-compute-pressure.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-compute-pressure.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-compute-pressure.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-compute-pressure.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-generic-sensor.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-generic-sensor.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-generic-sensor.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-generic-sensor.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-geolocation.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-geolocation.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-geolocation.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-geolocation.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-idle-detection-worker.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-idle-detection-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-idle-detection-worker.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-idle-detection-worker.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-idle-detection-worker.js b/tests/wpt/tests/permissions-policy/resources/permissions-policy-idle-detection-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-idle-detection-worker.js rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-idle-detection-worker.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-idle-detection.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-idle-detection.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-idle-detection.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-idle-detection.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-local-fonts.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-local-fonts.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-local-fonts.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-local-fonts.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-nested-subframe-policy.https.sub.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-nested-subframe-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-nested-subframe-policy.https.sub.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-nested-subframe-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-payment-extension.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-payment-extension.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-payment-extension.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-payment-extension.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-payment.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-payment.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-payment.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-payment.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-picture-in-picture.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-picture-in-picture.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-picture-in-picture.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-picture-in-picture.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-private-state-token-issuance.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-private-state-token-issuance.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-private-state-token-issuance.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-private-state-token-issuance.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-report-json.js b/tests/wpt/tests/permissions-policy/resources/permissions-policy-report-json.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-report-json.js rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-report-json.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-screen-wakelock.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-screen-wakelock.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-screen-wakelock.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-screen-wakelock.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-serial-worker.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-serial-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-serial-worker.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-serial-worker.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-serial-worker.js b/tests/wpt/tests/permissions-policy/resources/permissions-policy-serial-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-serial-worker.js rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-serial-worker.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-serial.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-serial.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-serial.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-serial.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-usb-worker.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-usb-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-usb-worker.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-usb-worker.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-usb-worker.js b/tests/wpt/tests/permissions-policy/resources/permissions-policy-usb-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-usb-worker.js rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-usb-worker.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-usb.html b/tests/wpt/tests/permissions-policy/resources/permissions-policy-usb.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy-usb.html rename to tests/wpt/tests/permissions-policy/resources/permissions-policy-usb.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy.js b/tests/wpt/tests/permissions-policy/resources/permissions-policy.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy.js rename to tests/wpt/tests/permissions-policy/resources/permissions-policy.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/picture-in-picture.js b/tests/wpt/tests/permissions-policy/resources/picture-in-picture.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/picture-in-picture.js rename to tests/wpt/tests/permissions-policy/resources/picture-in-picture.js diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/redirect-on-load.html b/tests/wpt/tests/permissions-policy/resources/redirect-on-load.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/redirect-on-load.html rename to tests/wpt/tests/permissions-policy/resources/redirect-on-load.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/sandbox-self.html b/tests/wpt/tests/permissions-policy/resources/sandbox-self.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/sandbox-self.html rename to tests/wpt/tests/permissions-policy/resources/sandbox-self.html diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/sandbox-self.html.headers b/tests/wpt/tests/permissions-policy/resources/sandbox-self.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/permissions-policy/resources/sandbox-self.html.headers rename to tests/wpt/tests/permissions-policy/resources/sandbox-self.html.headers diff --git a/tests/wpt/web-platform-tests/permissions-request/META.yml b/tests/wpt/tests/permissions-request/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/permissions-request/META.yml rename to tests/wpt/tests/permissions-request/META.yml diff --git a/tests/wpt/web-platform-tests/permissions-request/idlharness.any.js b/tests/wpt/tests/permissions-request/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-request/idlharness.any.js rename to tests/wpt/tests/permissions-request/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/permissions-revoke/META.yml b/tests/wpt/tests/permissions-revoke/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/permissions-revoke/META.yml rename to tests/wpt/tests/permissions-revoke/META.yml diff --git a/tests/wpt/web-platform-tests/permissions-revoke/idlharness.any.js b/tests/wpt/tests/permissions-revoke/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions-revoke/idlharness.any.js rename to tests/wpt/tests/permissions-revoke/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/permissions/META.yml b/tests/wpt/tests/permissions/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/permissions/META.yml rename to tests/wpt/tests/permissions/META.yml diff --git a/tests/wpt/web-platform-tests/permissions/all-permissions.html b/tests/wpt/tests/permissions/all-permissions.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions/all-permissions.html rename to tests/wpt/tests/permissions/all-permissions.html diff --git a/tests/wpt/web-platform-tests/permissions/feature-policy-permissions-query.html b/tests/wpt/tests/permissions/feature-policy-permissions-query.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions/feature-policy-permissions-query.html rename to tests/wpt/tests/permissions/feature-policy-permissions-query.html diff --git a/tests/wpt/web-platform-tests/permissions/idlharness.any.js b/tests/wpt/tests/permissions/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/permissions/idlharness.any.js rename to tests/wpt/tests/permissions/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/permissions/midi-permission.html b/tests/wpt/tests/permissions/midi-permission.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions/midi-permission.html rename to tests/wpt/tests/permissions/midi-permission.html diff --git a/tests/wpt/web-platform-tests/permissions/non-fully-active.https.html b/tests/wpt/tests/permissions/non-fully-active.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions/non-fully-active.https.html rename to tests/wpt/tests/permissions/non-fully-active.https.html diff --git a/tests/wpt/web-platform-tests/permissions/permissions-cg.https.html b/tests/wpt/tests/permissions/permissions-cg.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions/permissions-cg.https.html rename to tests/wpt/tests/permissions/permissions-cg.https.html diff --git a/tests/wpt/web-platform-tests/permissions/permissions-garbage-collect.https.html b/tests/wpt/tests/permissions/permissions-garbage-collect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions/permissions-garbage-collect.https.html rename to tests/wpt/tests/permissions/permissions-garbage-collect.https.html diff --git a/tests/wpt/web-platform-tests/permissions/permissions-query-feature-policy-attribute.https.sub.html b/tests/wpt/tests/permissions/permissions-query-feature-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions/permissions-query-feature-policy-attribute.https.sub.html rename to tests/wpt/tests/permissions/permissions-query-feature-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/permissions/permissionsstatus-name.html b/tests/wpt/tests/permissions/permissionsstatus-name.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions/permissionsstatus-name.html rename to tests/wpt/tests/permissions/permissionsstatus-name.html diff --git a/tests/wpt/web-platform-tests/permissions/resources/empty.html b/tests/wpt/tests/permissions/resources/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/permissions/resources/empty.html rename to tests/wpt/tests/permissions/resources/empty.html diff --git a/tests/wpt/web-platform-tests/picture-in-picture/META.yml b/tests/wpt/tests/picture-in-picture/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/META.yml rename to tests/wpt/tests/picture-in-picture/META.yml diff --git a/tests/wpt/web-platform-tests/picture-in-picture/css-selector.html b/tests/wpt/tests/picture-in-picture/css-selector.html similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/css-selector.html rename to tests/wpt/tests/picture-in-picture/css-selector.html diff --git a/tests/wpt/web-platform-tests/picture-in-picture/disable-picture-in-picture.html b/tests/wpt/tests/picture-in-picture/disable-picture-in-picture.html similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/disable-picture-in-picture.html rename to tests/wpt/tests/picture-in-picture/disable-picture-in-picture.html diff --git a/tests/wpt/web-platform-tests/picture-in-picture/enter-picture-in-picture.html b/tests/wpt/tests/picture-in-picture/enter-picture-in-picture.html similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/enter-picture-in-picture.html rename to tests/wpt/tests/picture-in-picture/enter-picture-in-picture.html diff --git a/tests/wpt/web-platform-tests/picture-in-picture/exit-picture-in-picture.html b/tests/wpt/tests/picture-in-picture/exit-picture-in-picture.html similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/exit-picture-in-picture.html rename to tests/wpt/tests/picture-in-picture/exit-picture-in-picture.html diff --git a/tests/wpt/web-platform-tests/picture-in-picture/idlharness.window.js b/tests/wpt/tests/picture-in-picture/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/idlharness.window.js rename to tests/wpt/tests/picture-in-picture/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/picture-in-picture/leave-picture-in-picture.html b/tests/wpt/tests/picture-in-picture/leave-picture-in-picture.html similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/leave-picture-in-picture.html rename to tests/wpt/tests/picture-in-picture/leave-picture-in-picture.html diff --git a/tests/wpt/web-platform-tests/picture-in-picture/mediastream.html b/tests/wpt/tests/picture-in-picture/mediastream.html similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/mediastream.html rename to tests/wpt/tests/picture-in-picture/mediastream.html diff --git a/tests/wpt/web-platform-tests/picture-in-picture/picture-in-picture-element.html b/tests/wpt/tests/picture-in-picture/picture-in-picture-element.html similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/picture-in-picture-element.html rename to tests/wpt/tests/picture-in-picture/picture-in-picture-element.html diff --git a/tests/wpt/web-platform-tests/picture-in-picture/picture-in-picture-window.html b/tests/wpt/tests/picture-in-picture/picture-in-picture-window.html similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/picture-in-picture-window.html rename to tests/wpt/tests/picture-in-picture/picture-in-picture-window.html diff --git a/tests/wpt/web-platform-tests/picture-in-picture/removed-from-document.html b/tests/wpt/tests/picture-in-picture/removed-from-document.html similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/removed-from-document.html rename to tests/wpt/tests/picture-in-picture/removed-from-document.html diff --git a/tests/wpt/web-platform-tests/picture-in-picture/request-picture-in-picture-twice.html b/tests/wpt/tests/picture-in-picture/request-picture-in-picture-twice.html similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/request-picture-in-picture-twice.html rename to tests/wpt/tests/picture-in-picture/request-picture-in-picture-twice.html diff --git a/tests/wpt/web-platform-tests/picture-in-picture/request-picture-in-picture.html b/tests/wpt/tests/picture-in-picture/request-picture-in-picture.html similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/request-picture-in-picture.html rename to tests/wpt/tests/picture-in-picture/request-picture-in-picture.html diff --git a/tests/wpt/web-platform-tests/picture-in-picture/resources/picture-in-picture-helpers.js b/tests/wpt/tests/picture-in-picture/resources/picture-in-picture-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/resources/picture-in-picture-helpers.js rename to tests/wpt/tests/picture-in-picture/resources/picture-in-picture-helpers.js diff --git a/tests/wpt/web-platform-tests/picture-in-picture/shadow-dom.html b/tests/wpt/tests/picture-in-picture/shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/picture-in-picture/shadow-dom.html rename to tests/wpt/tests/picture-in-picture/shadow-dom.html diff --git a/tests/wpt/web-platform-tests/png/META.yml b/tests/wpt/tests/png/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/png/META.yml rename to tests/wpt/tests/png/META.yml diff --git a/tests/wpt/web-platform-tests/png/cicp-chunk.html b/tests/wpt/tests/png/cicp-chunk.html similarity index 100% rename from tests/wpt/web-platform-tests/png/cicp-chunk.html rename to tests/wpt/tests/png/cicp-chunk.html diff --git a/tests/wpt/web-platform-tests/png/support/cicp-display-p3.png b/tests/wpt/tests/png/support/cicp-display-p3.png similarity index 100% rename from tests/wpt/web-platform-tests/png/support/cicp-display-p3.png rename to tests/wpt/tests/png/support/cicp-display-p3.png diff --git a/tests/wpt/web-platform-tests/png/support/trns-high-bits-set.png b/tests/wpt/tests/png/support/trns-high-bits-set.png similarity index 100% rename from tests/wpt/web-platform-tests/png/support/trns-high-bits-set.png rename to tests/wpt/tests/png/support/trns-high-bits-set.png diff --git a/tests/wpt/web-platform-tests/png/trns-chunk.html b/tests/wpt/tests/png/trns-chunk.html similarity index 100% rename from tests/wpt/web-platform-tests/png/trns-chunk.html rename to tests/wpt/tests/png/trns-chunk.html diff --git a/tests/wpt/web-platform-tests/pointerevents/META.yml b/tests/wpt/tests/pointerevents/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/META.yml rename to tests/wpt/tests/pointerevents/META.yml diff --git a/tests/wpt/web-platform-tests/pointerevents/README.md b/tests/wpt/tests/pointerevents/README.md similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/README.md rename to tests/wpt/tests/pointerevents/README.md diff --git a/tests/wpt/web-platform-tests/pointerevents/capturing_boundary_event_handler_at_ua_shadowdom.html b/tests/wpt/tests/pointerevents/capturing_boundary_event_handler_at_ua_shadowdom.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/capturing_boundary_event_handler_at_ua_shadowdom.html rename to tests/wpt/tests/pointerevents/capturing_boundary_event_handler_at_ua_shadowdom.html diff --git a/tests/wpt/web-platform-tests/pointerevents/coalesced_events_attributes.html b/tests/wpt/tests/pointerevents/coalesced_events_attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/coalesced_events_attributes.html rename to tests/wpt/tests/pointerevents/coalesced_events_attributes.html diff --git a/tests/wpt/web-platform-tests/pointerevents/coalesced_events_attributes_under_load.html b/tests/wpt/tests/pointerevents/coalesced_events_attributes_under_load.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/coalesced_events_attributes_under_load.html rename to tests/wpt/tests/pointerevents/coalesced_events_attributes_under_load.html diff --git a/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_compat-mouse-events-when-removing-nodes.html b/tests/wpt/tests/pointerevents/compat/pointerevent_compat-mouse-events-when-removing-nodes.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_compat-mouse-events-when-removing-nodes.html rename to tests/wpt/tests/pointerevents/compat/pointerevent_compat-mouse-events-when-removing-nodes.html diff --git a/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-on-object.html b/tests/wpt/tests/pointerevents/compat/pointerevent_mouse-on-object.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-on-object.html rename to tests/wpt/tests/pointerevents/compat/pointerevent_mouse-on-object.html diff --git a/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-on-scrollbar.html b/tests/wpt/tests/pointerevents/compat/pointerevent_mouse-pointer-on-scrollbar.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-on-scrollbar.html rename to tests/wpt/tests/pointerevents/compat/pointerevent_mouse-pointer-on-scrollbar.html diff --git a/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault-passive.html b/tests/wpt/tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault-passive.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault-passive.html rename to tests/wpt/tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault-passive.html diff --git a/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault.html b/tests/wpt/tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault.html rename to tests/wpt/tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault.html diff --git a/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-updown-events.html b/tests/wpt/tests/pointerevents/compat/pointerevent_mouse-pointer-updown-events.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-updown-events.html rename to tests/wpt/tests/pointerevents/compat/pointerevent_mouse-pointer-updown-events.html diff --git a/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouseevent_key_pressed.html b/tests/wpt/tests/pointerevents/compat/pointerevent_mouseevent_key_pressed.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouseevent_key_pressed.html rename to tests/wpt/tests/pointerevents/compat/pointerevent_mouseevent_key_pressed.html diff --git a/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_touch-action-verification.html b/tests/wpt/tests/pointerevents/compat/pointerevent_touch-action-verification.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_touch-action-verification.html rename to tests/wpt/tests/pointerevents/compat/pointerevent_touch-action-verification.html diff --git a/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_touch-action_two-finger_interaction.html b/tests/wpt/tests/pointerevents/compat/pointerevent_touch-action_two-finger_interaction.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_touch-action_two-finger_interaction.html rename to tests/wpt/tests/pointerevents/compat/pointerevent_touch-action_two-finger_interaction.html diff --git a/tests/wpt/web-platform-tests/pointerevents/html/pointerevent_drag_interaction-manual.html b/tests/wpt/tests/pointerevents/html/pointerevent_drag_interaction-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/html/pointerevent_drag_interaction-manual.html rename to tests/wpt/tests/pointerevents/html/pointerevent_drag_interaction-manual.html diff --git a/tests/wpt/web-platform-tests/pointerevents/idlharness.window.js b/tests/wpt/tests/pointerevents/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/idlharness.window.js rename to tests/wpt/tests/pointerevents/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/pointerevents/inheritance.html b/tests/wpt/tests/pointerevents/inheritance.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/inheritance.html rename to tests/wpt/tests/pointerevents/inheritance.html diff --git a/tests/wpt/web-platform-tests/pointerevents/mouse-pointer-boundary-events-for-shadowdom.html b/tests/wpt/tests/pointerevents/mouse-pointer-boundary-events-for-shadowdom.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/mouse-pointer-boundary-events-for-shadowdom.html rename to tests/wpt/tests/pointerevents/mouse-pointer-boundary-events-for-shadowdom.html diff --git a/tests/wpt/web-platform-tests/pointerevents/parsing/touch-action-computed.html b/tests/wpt/tests/pointerevents/parsing/touch-action-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/parsing/touch-action-computed.html rename to tests/wpt/tests/pointerevents/parsing/touch-action-computed.html diff --git a/tests/wpt/web-platform-tests/pointerevents/parsing/touch-action-invalid.html b/tests/wpt/tests/pointerevents/parsing/touch-action-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/parsing/touch-action-invalid.html rename to tests/wpt/tests/pointerevents/parsing/touch-action-invalid.html diff --git a/tests/wpt/web-platform-tests/pointerevents/parsing/touch-action-valid.html b/tests/wpt/tests/pointerevents/parsing/touch-action-valid.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/parsing/touch-action-valid.html rename to tests/wpt/tests/pointerevents/parsing/touch-action-valid.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_after_target_removed.html b/tests/wpt/tests/pointerevents/pointerevent_after_target_removed.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_after_target_removed.html rename to tests/wpt/tests/pointerevents/pointerevent_after_target_removed.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_attributes_hoverable_pointers.html b/tests/wpt/tests/pointerevents/pointerevent_attributes_hoverable_pointers.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_attributes_hoverable_pointers.html rename to tests/wpt/tests/pointerevents/pointerevent_attributes_hoverable_pointers.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_attributes_hoverable_rightbutton.html b/tests/wpt/tests/pointerevents/pointerevent_attributes_hoverable_rightbutton.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_attributes_hoverable_rightbutton.html rename to tests/wpt/tests/pointerevents/pointerevent_attributes_hoverable_rightbutton.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_attributes_nohover_pointers.html b/tests/wpt/tests/pointerevents/pointerevent_attributes_nohover_pointers.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_attributes_nohover_pointers.html rename to tests/wpt/tests/pointerevents/pointerevent_attributes_nohover_pointers.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html b/tests/wpt/tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html rename to tests/wpt/tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_boundary_events_at_implicit_release_hoverable_pointers.html b/tests/wpt/tests/pointerevents/pointerevent_boundary_events_at_implicit_release_hoverable_pointers.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_boundary_events_at_implicit_release_hoverable_pointers.html rename to tests/wpt/tests/pointerevents/pointerevent_boundary_events_at_implicit_release_hoverable_pointers.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_boundary_events_in_capturing.html b/tests/wpt/tests/pointerevents/pointerevent_boundary_events_in_capturing.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_boundary_events_in_capturing.html rename to tests/wpt/tests/pointerevents/pointerevent_boundary_events_in_capturing.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_capture_mouse.html b/tests/wpt/tests/pointerevents/pointerevent_capture_mouse.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_capture_mouse.html rename to tests/wpt/tests/pointerevents/pointerevent_capture_mouse.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_capture_suppressing_mouse.html b/tests/wpt/tests/pointerevents/pointerevent_capture_suppressing_mouse.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_capture_suppressing_mouse.html rename to tests/wpt/tests/pointerevents/pointerevent_capture_suppressing_mouse.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_change-touch-action-onpointerdown_touch.html b/tests/wpt/tests/pointerevents/pointerevent_change-touch-action-onpointerdown_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_change-touch-action-onpointerdown_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_change-touch-action-onpointerdown_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_click_during_capture.html b/tests/wpt/tests/pointerevents/pointerevent_click_during_capture.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_click_during_capture.html rename to tests/wpt/tests/pointerevents/pointerevent_click_during_capture.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_click_is_a_pointerevent.html b/tests/wpt/tests/pointerevents/pointerevent_click_is_a_pointerevent.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_click_is_a_pointerevent.html rename to tests/wpt/tests/pointerevents/pointerevent_click_is_a_pointerevent.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_click_is_a_pointerevent_multiple_clicks.html b/tests/wpt/tests/pointerevents/pointerevent_click_is_a_pointerevent_multiple_clicks.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_click_is_a_pointerevent_multiple_clicks.html rename to tests/wpt/tests/pointerevents/pointerevent_click_is_a_pointerevent_multiple_clicks.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_constructor.html b/tests/wpt/tests/pointerevents/pointerevent_constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_constructor.html rename to tests/wpt/tests/pointerevents/pointerevent_constructor.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_contextmenu_is_a_pointerevent.html b/tests/wpt/tests/pointerevents/pointerevent_contextmenu_is_a_pointerevent.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_contextmenu_is_a_pointerevent.html rename to tests/wpt/tests/pointerevents/pointerevent_contextmenu_is_a_pointerevent.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_disabled_form_control.html b/tests/wpt/tests/pointerevents/pointerevent_disabled_form_control.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_disabled_form_control.html rename to tests/wpt/tests/pointerevents/pointerevent_disabled_form_control.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_element_haspointercapture.html b/tests/wpt/tests/pointerevents/pointerevent_element_haspointercapture.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_element_haspointercapture.html rename to tests/wpt/tests/pointerevents/pointerevent_element_haspointercapture.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_element_haspointercapture_release_pending_capture.html b/tests/wpt/tests/pointerevents/pointerevent_element_haspointercapture_release_pending_capture.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_element_haspointercapture_release_pending_capture.html rename to tests/wpt/tests/pointerevents/pointerevent_element_haspointercapture_release_pending_capture.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_fractional_coordinates.html b/tests/wpt/tests/pointerevents/pointerevent_fractional_coordinates.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_fractional_coordinates.html rename to tests/wpt/tests/pointerevents/pointerevent_fractional_coordinates.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_hit_test_scroll.html b/tests/wpt/tests/pointerevents/pointerevent_hit_test_scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_hit_test_scroll.html rename to tests/wpt/tests/pointerevents/pointerevent_hit_test_scroll.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_hit_test_scroll_visible_descendant.html b/tests/wpt/tests/pointerevents/pointerevent_hit_test_scroll_visible_descendant.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_hit_test_scroll_visible_descendant.html rename to tests/wpt/tests/pointerevents/pointerevent_hit_test_scroll_visible_descendant.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_iframe-touch-action-none_touch.html b/tests/wpt/tests/pointerevents/pointerevent_iframe-touch-action-none_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_iframe-touch-action-none_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_iframe-touch-action-none_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html b/tests/wpt/tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html rename to tests/wpt/tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node_in_shadow_dom.html b/tests/wpt/tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node_in_shadow_dom.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node_in_shadow_dom.html rename to tests/wpt/tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node_in_shadow_dom.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_shadow_host.html b/tests/wpt/tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_shadow_host.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_shadow_host.html rename to tests/wpt/tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_shadow_host.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_lostpointercapture_is_first.html b/tests/wpt/tests/pointerevents/pointerevent_lostpointercapture_is_first.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_lostpointercapture_is_first.html rename to tests/wpt/tests/pointerevents/pointerevent_lostpointercapture_is_first.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_mouse_capture_change_hover.html b/tests/wpt/tests/pointerevents/pointerevent_mouse_capture_change_hover.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_mouse_capture_change_hover.html rename to tests/wpt/tests/pointerevents/pointerevent_mouse_capture_change_hover.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_mouse_pointercapture_inactivate_pointer.html b/tests/wpt/tests/pointerevents/pointerevent_mouse_pointercapture_inactivate_pointer.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_mouse_pointercapture_inactivate_pointer.html rename to tests/wpt/tests/pointerevents/pointerevent_mouse_pointercapture_inactivate_pointer.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_movementxy.html b/tests/wpt/tests/pointerevents/pointerevent_movementxy.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_movementxy.html rename to tests/wpt/tests/pointerevents/pointerevent_movementxy.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_multiple_primary_pointers_boundary_events-manual.html b/tests/wpt/tests/pointerevents/pointerevent_multiple_primary_pointers_boundary_events-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_multiple_primary_pointers_boundary_events-manual.html rename to tests/wpt/tests/pointerevents/pointerevent_multiple_primary_pointers_boundary_events-manual.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_on_event_handlers.html b/tests/wpt/tests/pointerevents/pointerevent_on_event_handlers.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_on_event_handlers.html rename to tests/wpt/tests/pointerevents/pointerevent_on_event_handlers.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerId_scope.html b/tests/wpt/tests/pointerevents/pointerevent_pointerId_scope.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerId_scope.html rename to tests/wpt/tests/pointerevents/pointerevent_pointerId_scope.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercancel_touch.html b/tests/wpt/tests/pointerevents/pointerevent_pointercancel_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercancel_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_pointercancel_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture-in-custom-element.html b/tests/wpt/tests/pointerevents/pointerevent_pointercapture-in-custom-element.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture-in-custom-element.html rename to tests/wpt/tests/pointerevents/pointerevent_pointercapture-in-custom-element.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture-in-shadow-dom.html b/tests/wpt/tests/pointerevents/pointerevent_pointercapture-in-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture-in-shadow-dom.html rename to tests/wpt/tests/pointerevents/pointerevent_pointercapture-in-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture-not-lost-in-chorded-buttons.html b/tests/wpt/tests/pointerevents/pointerevent_pointercapture-not-lost-in-chorded-buttons.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture-not-lost-in-chorded-buttons.html rename to tests/wpt/tests/pointerevents/pointerevent_pointercapture-not-lost-in-chorded-buttons.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture_in_frame.html b/tests/wpt/tests/pointerevents/pointerevent_pointercapture_in_frame.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture_in_frame.html rename to tests/wpt/tests/pointerevents/pointerevent_pointercapture_in_frame.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerenter_does_not_bubble.html b/tests/wpt/tests/pointerevents/pointerevent_pointerenter_does_not_bubble.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerenter_does_not_bubble.html rename to tests/wpt/tests/pointerevents/pointerevent_pointerenter_does_not_bubble.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html b/tests/wpt/tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerleave_descendant_over.html b/tests/wpt/tests/pointerevents/pointerevent_pointerleave_descendant_over.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerleave_descendant_over.html rename to tests/wpt/tests/pointerevents/pointerevent_pointerleave_descendant_over.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerleave_descendants.html b/tests/wpt/tests/pointerevents/pointerevent_pointerleave_descendants.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerleave_descendants.html rename to tests/wpt/tests/pointerevents/pointerevent_pointerleave_descendants.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerleave_does_not_bubble.html b/tests/wpt/tests/pointerevents/pointerevent_pointerleave_does_not_bubble.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerleave_does_not_bubble.html rename to tests/wpt/tests/pointerevents/pointerevent_pointerleave_does_not_bubble.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerleave_pen-manual.html b/tests/wpt/tests/pointerevents/pointerevent_pointerleave_pen-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerleave_pen-manual.html rename to tests/wpt/tests/pointerevents/pointerevent_pointerleave_pen-manual.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointermove.html b/tests/wpt/tests/pointerevents/pointerevent_pointermove.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointermove.html rename to tests/wpt/tests/pointerevents/pointerevent_pointermove.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointermove_isprimary_same_as_pointerdown.html b/tests/wpt/tests/pointerevents/pointerevent_pointermove_isprimary_same_as_pointerdown.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointermove_isprimary_same_as_pointerdown.html rename to tests/wpt/tests/pointerevents/pointerevent_pointermove_isprimary_same_as_pointerdown.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointermove_on_chorded_mouse_button.html b/tests/wpt/tests/pointerevents/pointerevent_pointermove_on_chorded_mouse_button.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointermove_on_chorded_mouse_button.html rename to tests/wpt/tests/pointerevents/pointerevent_pointermove_on_chorded_mouse_button.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html b/tests/wpt/tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerout_pen.html b/tests/wpt/tests/pointerevents/pointerevent_pointerout_pen.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerout_pen.html rename to tests/wpt/tests/pointerevents/pointerevent_pointerout_pen.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerout_received_once.html b/tests/wpt/tests/pointerevents/pointerevent_pointerout_received_once.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerout_received_once.html rename to tests/wpt/tests/pointerevents/pointerevent_pointerout_received_once.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerrawupdate.html b/tests/wpt/tests/pointerevents/pointerevent_pointerrawupdate.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerrawupdate.html rename to tests/wpt/tests/pointerevents/pointerevent_pointerrawupdate.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_events_to_original_target.html b/tests/wpt/tests/pointerevents/pointerevent_releasepointercapture_events_to_original_target.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_events_to_original_target.html rename to tests/wpt/tests/pointerevents/pointerevent_releasepointercapture_events_to_original_target.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_invalid_pointerid.html b/tests/wpt/tests/pointerevents/pointerevent_releasepointercapture_invalid_pointerid.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_invalid_pointerid.html rename to tests/wpt/tests/pointerevents/pointerevent_releasepointercapture_invalid_pointerid.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch.html b/tests/wpt/tests/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_onpointerup_mouse.html b/tests/wpt/tests/pointerevents/pointerevent_releasepointercapture_onpointerup_mouse.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_onpointerup_mouse.html rename to tests/wpt/tests/pointerevents/pointerevent_releasepointercapture_onpointerup_mouse.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_pointerup_mouse.html b/tests/wpt/tests/pointerevents/pointerevent_releasepointercapture_pointerup_mouse.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_pointerup_mouse.html rename to tests/wpt/tests/pointerevents/pointerevent_releasepointercapture_pointerup_mouse.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_pointerup_touch.html b/tests/wpt/tests/pointerevents/pointerevent_releasepointercapture_pointerup_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_pointerup_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_releasepointercapture_pointerup_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_release_right_after_capture.html b/tests/wpt/tests/pointerevents/pointerevent_releasepointercapture_release_right_after_capture.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_release_right_after_capture.html rename to tests/wpt/tests/pointerevents/pointerevent_releasepointercapture_release_right_after_capture.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_root_computed_style.html b/tests/wpt/tests/pointerevents/pointerevent_root_computed_style.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_root_computed_style.html rename to tests/wpt/tests/pointerevents/pointerevent_root_computed_style.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_root_hit_test.html b/tests/wpt/tests/pointerevents/pointerevent_root_hit_test.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_root_hit_test.html rename to tests/wpt/tests/pointerevents/pointerevent_root_hit_test.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_sequence_at_implicit_release_on_click.html b/tests/wpt/tests/pointerevents/pointerevent_sequence_at_implicit_release_on_click.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_sequence_at_implicit_release_on_click.html rename to tests/wpt/tests/pointerevents/pointerevent_sequence_at_implicit_release_on_click.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_sequence_at_implicit_release_on_drag.html b/tests/wpt/tests/pointerevents/pointerevent_sequence_at_implicit_release_on_drag.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_sequence_at_implicit_release_on_drag.html rename to tests/wpt/tests/pointerevents/pointerevent_sequence_at_implicit_release_on_drag.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_disconnected.html b/tests/wpt/tests/pointerevents/pointerevent_setpointercapture_disconnected.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_disconnected.html rename to tests/wpt/tests/pointerevents/pointerevent_setpointercapture_disconnected.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html b/tests/wpt/tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html rename to tests/wpt/tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_invalid_pointerid.html b/tests/wpt/tests/pointerevents/pointerevent_setpointercapture_invalid_pointerid.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_invalid_pointerid.html rename to tests/wpt/tests/pointerevents/pointerevent_setpointercapture_invalid_pointerid.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_override_pending_capture_element.html b/tests/wpt/tests/pointerevents/pointerevent_setpointercapture_override_pending_capture_element.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_override_pending_capture_element.html rename to tests/wpt/tests/pointerevents/pointerevent_setpointercapture_override_pending_capture_element.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_pointerup_mouse.html b/tests/wpt/tests/pointerevents/pointerevent_setpointercapture_pointerup_mouse.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_pointerup_mouse.html rename to tests/wpt/tests/pointerevents/pointerevent_setpointercapture_pointerup_mouse.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_pointerup_touch.html b/tests/wpt/tests/pointerevents/pointerevent_setpointercapture_pointerup_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_pointerup_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_setpointercapture_pointerup_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_relatedtarget.html b/tests/wpt/tests/pointerevents/pointerevent_setpointercapture_relatedtarget.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_relatedtarget.html rename to tests/wpt/tests/pointerevents/pointerevent_setpointercapture_relatedtarget.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_to_same_element_twice.html b/tests/wpt/tests/pointerevents/pointerevent_setpointercapture_to_same_element_twice.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_to_same_element_twice.html rename to tests/wpt/tests/pointerevents/pointerevent_setpointercapture_to_same_element_twice.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_styles.css b/tests/wpt/tests/pointerevents/pointerevent_styles.css similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_styles.css rename to tests/wpt/tests/pointerevents/pointerevent_styles.css diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_support.js b/tests/wpt/tests/pointerevents/pointerevent_support.js similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_support.js rename to tests/wpt/tests/pointerevents/pointerevent_support.js diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_suppress_compat_events_on_click.html b/tests/wpt/tests/pointerevents/pointerevent_suppress_compat_events_on_click.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_suppress_compat_events_on_click.html rename to tests/wpt/tests/pointerevents/pointerevent_suppress_compat_events_on_click.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_suppress_compat_events_on_drag_mouse.html b/tests/wpt/tests/pointerevents/pointerevent_suppress_compat_events_on_drag_mouse.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_suppress_compat_events_on_drag_mouse.html rename to tests/wpt/tests/pointerevents/pointerevent_suppress_compat_events_on_drag_mouse.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_tiltX_tiltY_to_azimuth_altitude.html b/tests/wpt/tests/pointerevents/pointerevent_tiltX_tiltY_to_azimuth_altitude.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_tiltX_tiltY_to_azimuth_altitude.html rename to tests/wpt/tests/pointerevents/pointerevent_tiltX_tiltY_to_azimuth_altitude.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-auto-css_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-auto-css_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-auto-css_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-auto-css_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-button-none-test_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-button-none-test_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-button-none-test_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-button-none-test_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-illegal.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-illegal.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-illegal.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-illegal.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_child-none_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-inherit_child-none_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_child-none_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-inherit_child-none_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_highest-parent-none_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-inherit_highest-parent-none_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_highest-parent-none_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-inherit_highest-parent-none_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_parent-none_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-inherit_parent-none_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_parent-none_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-inherit_parent-none_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-keyboard.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-keyboard.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-keyboard.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-keyboard.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-modified_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-modified_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-modified_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-modified_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-mouse.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-mouse.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-mouse.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-mouse.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-none-css_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-none-css_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-none-css_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-none-css_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-none-on-body-when-style-propagates-to-viewport_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-none-on-body-when-style-propagates-to-viewport_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-none-on-body-when-style-propagates-to-viewport_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-none-on-body-when-style-propagates-to-viewport_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-down-css_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-down-css_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-down-css_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-down-css_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-left-css_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-left-css_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-left-css_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-left-css_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-right-css_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-right-css_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-right-css_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-right-css_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-up-css_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-up-css_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-up-css_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-up-css_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-x-css_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-x-css_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-x-css_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-x-css_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-x-pan-y-pan-y_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-x-pan-y-pan-y_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-x-pan-y-pan-y_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-x-pan-y-pan-y_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-x-pan-y_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-x-pan-y_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-x-pan-y_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-x-pan-y_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-y-css_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-y-css_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-y-css_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-pan-y-css_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-rotated-divs_touch-manual.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-rotated-divs_touch-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-rotated-divs_touch-manual.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-rotated-divs_touch-manual.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-span-none-test_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-span-none-test_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-span-none-test_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-span-none-test_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-svg-none-test_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-svg-none-test_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-svg-none-test_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-svg-none-test_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-table-none-test_touch.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-table-none-test_touch.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-table-none-test_touch.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-table-none-test_touch.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-verification.html b/tests/wpt/tests/pointerevents/pointerevent_touch-action-verification.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-verification.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-action-verification.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-adjustment_click_target.html b/tests/wpt/tests/pointerevents/pointerevent_touch-adjustment_click_target.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-adjustment_click_target.html rename to tests/wpt/tests/pointerevents/pointerevent_touch-adjustment_click_target.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_coordinates_when_locked.html b/tests/wpt/tests/pointerevents/pointerlock/pointerevent_coordinates_when_locked.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_coordinates_when_locked.html rename to tests/wpt/tests/pointerevents/pointerlock/pointerevent_coordinates_when_locked.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html b/tests/wpt/tests/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html rename to tests/wpt/tests/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_getPredictedEvents_when_pointerlocked-manual.html b/tests/wpt/tests/pointerevents/pointerlock/pointerevent_getPredictedEvents_when_pointerlocked-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_getPredictedEvents_when_pointerlocked-manual.html rename to tests/wpt/tests/pointerevents/pointerlock/pointerevent_getPredictedEvents_when_pointerlocked-manual.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html b/tests/wpt/tests/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html rename to tests/wpt/tests/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointerlock_after_pointercapture.html b/tests/wpt/tests/pointerevents/pointerlock/pointerevent_pointerlock_after_pointercapture.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointerlock_after_pointercapture.html rename to tests/wpt/tests/pointerevents/pointerlock/pointerevent_pointerlock_after_pointercapture.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html b/tests/wpt/tests/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html rename to tests/wpt/tests/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock.html b/tests/wpt/tests/pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock.html rename to tests/wpt/tests/pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html b/tests/wpt/tests/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html rename to tests/wpt/tests/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointerrawupdate_in_pointerlock.html b/tests/wpt/tests/pointerevents/pointerlock/pointerevent_pointerrawupdate_in_pointerlock.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointerrawupdate_in_pointerlock.html rename to tests/wpt/tests/pointerevents/pointerlock/pointerevent_pointerrawupdate_in_pointerlock.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerlock/resources/pointerevent_movementxy-iframe.html b/tests/wpt/tests/pointerevents/pointerlock/resources/pointerevent_movementxy-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerlock/resources/pointerevent_movementxy-iframe.html rename to tests/wpt/tests/pointerevents/pointerlock/resources/pointerevent_movementxy-iframe.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerlock/resources/pointerevent_pointermove_in_pointerlock-iframe.html b/tests/wpt/tests/pointerevents/pointerlock/resources/pointerevent_pointermove_in_pointerlock-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerlock/resources/pointerevent_pointermove_in_pointerlock-iframe.html rename to tests/wpt/tests/pointerevents/pointerlock/resources/pointerevent_pointermove_in_pointerlock-iframe.html diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerup_after_pointerdown_target_removed.html b/tests/wpt/tests/pointerevents/pointerup_after_pointerdown_target_removed.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/pointerup_after_pointerdown_target_removed.html rename to tests/wpt/tests/pointerevents/pointerup_after_pointerdown_target_removed.html diff --git a/tests/wpt/web-platform-tests/pointerevents/predicted_events_attributes.html b/tests/wpt/tests/pointerevents/predicted_events_attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/predicted_events_attributes.html rename to tests/wpt/tests/pointerevents/predicted_events_attributes.html diff --git a/tests/wpt/web-platform-tests/pointerevents/resources/iframe-touch-action-none-subframe.html b/tests/wpt/tests/pointerevents/resources/iframe-touch-action-none-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/resources/iframe-touch-action-none-subframe.html rename to tests/wpt/tests/pointerevents/resources/iframe-touch-action-none-subframe.html diff --git a/tests/wpt/web-platform-tests/pointerevents/resources/minimal.html b/tests/wpt/tests/pointerevents/resources/minimal.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/resources/minimal.html rename to tests/wpt/tests/pointerevents/resources/minimal.html diff --git a/tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_attributes_hoverable_pointers-iframe.html b/tests/wpt/tests/pointerevents/resources/pointerevent_attributes_hoverable_pointers-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_attributes_hoverable_pointers-iframe.html rename to tests/wpt/tests/pointerevents/resources/pointerevent_attributes_hoverable_pointers-iframe.html diff --git a/tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_fractional_coordinates-iframe.html b/tests/wpt/tests/pointerevents/resources/pointerevent_fractional_coordinates-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_fractional_coordinates-iframe.html rename to tests/wpt/tests/pointerevents/resources/pointerevent_fractional_coordinates-iframe.html diff --git a/tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_mouse_pointercapture_inactivate_pointer-iframe.html b/tests/wpt/tests/pointerevents/resources/pointerevent_mouse_pointercapture_inactivate_pointer-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_mouse_pointercapture_inactivate_pointer-iframe.html rename to tests/wpt/tests/pointerevents/resources/pointerevent_mouse_pointercapture_inactivate_pointer-iframe.html diff --git a/tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_pointerId_scope-iframe.html b/tests/wpt/tests/pointerevents/resources/pointerevent_pointerId_scope-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_pointerId_scope-iframe.html rename to tests/wpt/tests/pointerevents/resources/pointerevent_pointerId_scope-iframe.html diff --git a/tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_pointercapture-iframe.html b/tests/wpt/tests/pointerevents/resources/pointerevent_pointercapture-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_pointercapture-iframe.html rename to tests/wpt/tests/pointerevents/resources/pointerevent_pointercapture-iframe.html diff --git a/tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_pointerrawupdate_in_pointerlock-iframe.html b/tests/wpt/tests/pointerevents/resources/pointerevent_pointerrawupdate_in_pointerlock-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_pointerrawupdate_in_pointerlock-iframe.html rename to tests/wpt/tests/pointerevents/resources/pointerevent_pointerrawupdate_in_pointerlock-iframe.html diff --git a/tests/wpt/web-platform-tests/pointerevents/touch-action-with-swipe-dir-change.html b/tests/wpt/tests/pointerevents/touch-action-with-swipe-dir-change.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerevents/touch-action-with-swipe-dir-change.html rename to tests/wpt/tests/pointerevents/touch-action-with-swipe-dir-change.html diff --git a/tests/wpt/web-platform-tests/pointerlock/META.yml b/tests/wpt/tests/pointerlock/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/pointerlock/META.yml rename to tests/wpt/tests/pointerlock/META.yml diff --git a/tests/wpt/web-platform-tests/pointerlock/constructor.html b/tests/wpt/tests/pointerlock/constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerlock/constructor.html rename to tests/wpt/tests/pointerlock/constructor.html diff --git a/tests/wpt/web-platform-tests/pointerlock/idlharness.window.js b/tests/wpt/tests/pointerlock/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/pointerlock/idlharness.window.js rename to tests/wpt/tests/pointerlock/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/pointerlock/mouse_buttons_back_forward.html b/tests/wpt/tests/pointerlock/mouse_buttons_back_forward.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerlock/mouse_buttons_back_forward.html rename to tests/wpt/tests/pointerlock/mouse_buttons_back_forward.html diff --git a/tests/wpt/web-platform-tests/pointerlock/movementX_Y_basic.html b/tests/wpt/tests/pointerlock/movementX_Y_basic.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerlock/movementX_Y_basic.html rename to tests/wpt/tests/pointerlock/movementX_Y_basic.html diff --git a/tests/wpt/web-platform-tests/pointerlock/movementX_Y_no-jumps-manual.html b/tests/wpt/tests/pointerlock/movementX_Y_no-jumps-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerlock/movementX_Y_no-jumps-manual.html rename to tests/wpt/tests/pointerlock/movementX_Y_no-jumps-manual.html diff --git a/tests/wpt/web-platform-tests/pointerlock/pointerlock_basic-manual.html b/tests/wpt/tests/pointerlock/pointerlock_basic-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerlock/pointerlock_basic-manual.html rename to tests/wpt/tests/pointerlock/pointerlock_basic-manual.html diff --git a/tests/wpt/web-platform-tests/pointerlock/pointerlock_fullscreen-manual.html b/tests/wpt/tests/pointerlock/pointerlock_fullscreen-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerlock/pointerlock_fullscreen-manual.html rename to tests/wpt/tests/pointerlock/pointerlock_fullscreen-manual.html diff --git a/tests/wpt/web-platform-tests/pointerlock/pointerlock_indefinite-manual.html b/tests/wpt/tests/pointerlock/pointerlock_indefinite-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerlock/pointerlock_indefinite-manual.html rename to tests/wpt/tests/pointerlock/pointerlock_indefinite-manual.html diff --git a/tests/wpt/web-platform-tests/pointerlock/pointerlock_leave_Tab-manual.html b/tests/wpt/tests/pointerlock/pointerlock_leave_Tab-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerlock/pointerlock_leave_Tab-manual.html rename to tests/wpt/tests/pointerlock/pointerlock_leave_Tab-manual.html diff --git a/tests/wpt/web-platform-tests/pointerlock/pointerlock_leave_UA-manual.html b/tests/wpt/tests/pointerlock/pointerlock_leave_UA-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerlock/pointerlock_leave_UA-manual.html rename to tests/wpt/tests/pointerlock/pointerlock_leave_UA-manual.html diff --git a/tests/wpt/web-platform-tests/pointerlock/pointerlock_remove_target.html b/tests/wpt/tests/pointerlock/pointerlock_remove_target.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerlock/pointerlock_remove_target.html rename to tests/wpt/tests/pointerlock/pointerlock_remove_target.html diff --git a/tests/wpt/web-platform-tests/pointerlock/pointerlock_remove_target_on_mouseup.html b/tests/wpt/tests/pointerlock/pointerlock_remove_target_on_mouseup.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerlock/pointerlock_remove_target_on_mouseup.html rename to tests/wpt/tests/pointerlock/pointerlock_remove_target_on_mouseup.html diff --git a/tests/wpt/web-platform-tests/pointerlock/pointerlock_shadow.html b/tests/wpt/tests/pointerlock/pointerlock_shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/pointerlock/pointerlock_shadow.html rename to tests/wpt/tests/pointerlock/pointerlock_shadow.html diff --git a/tests/wpt/web-platform-tests/portals/META.yml b/tests/wpt/tests/portals/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/portals/META.yml rename to tests/wpt/tests/portals/META.yml diff --git a/tests/wpt/web-platform-tests/portals/README.md b/tests/wpt/tests/portals/README.md similarity index 100% rename from tests/wpt/web-platform-tests/portals/README.md rename to tests/wpt/tests/portals/README.md diff --git a/tests/wpt/web-platform-tests/portals/about-blank-cannot-host.html b/tests/wpt/tests/portals/about-blank-cannot-host.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/about-blank-cannot-host.html rename to tests/wpt/tests/portals/about-blank-cannot-host.html diff --git a/tests/wpt/web-platform-tests/portals/csp/frame-ancestors.sub.html b/tests/wpt/tests/portals/csp/frame-ancestors.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/csp/frame-ancestors.sub.html rename to tests/wpt/tests/portals/csp/frame-ancestors.sub.html diff --git a/tests/wpt/web-platform-tests/portals/csp/frame-src.sub.html b/tests/wpt/tests/portals/csp/frame-src.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/csp/frame-src.sub.html rename to tests/wpt/tests/portals/csp/frame-src.sub.html diff --git a/tests/wpt/web-platform-tests/portals/csp/resources/frame-src.sub.html b/tests/wpt/tests/portals/csp/resources/frame-src.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/csp/resources/frame-src.sub.html rename to tests/wpt/tests/portals/csp/resources/frame-src.sub.html diff --git a/tests/wpt/web-platform-tests/portals/csp/resources/frame-src.sub.html.sub.headers b/tests/wpt/tests/portals/csp/resources/frame-src.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/portals/csp/resources/frame-src.sub.html.sub.headers rename to tests/wpt/tests/portals/csp/resources/frame-src.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/portals/history/history-manipulation-inside-portal-with-subframes.html b/tests/wpt/tests/portals/history/history-manipulation-inside-portal-with-subframes.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/history/history-manipulation-inside-portal-with-subframes.html rename to tests/wpt/tests/portals/history/history-manipulation-inside-portal-with-subframes.html diff --git a/tests/wpt/web-platform-tests/portals/history/history-manipulation-inside-portal.html b/tests/wpt/tests/portals/history/history-manipulation-inside-portal.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/history/history-manipulation-inside-portal.html rename to tests/wpt/tests/portals/history/history-manipulation-inside-portal.html diff --git a/tests/wpt/web-platform-tests/portals/history/resources/inner-iframe.html b/tests/wpt/tests/portals/history/resources/inner-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/history/resources/inner-iframe.html rename to tests/wpt/tests/portals/history/resources/inner-iframe.html diff --git a/tests/wpt/web-platform-tests/portals/history/resources/portal-harness.js b/tests/wpt/tests/portals/history/resources/portal-harness.js similarity index 100% rename from tests/wpt/web-platform-tests/portals/history/resources/portal-harness.js rename to tests/wpt/tests/portals/history/resources/portal-harness.js diff --git a/tests/wpt/web-platform-tests/portals/history/resources/portal-manipulate-history-with-subframes.sub.html b/tests/wpt/tests/portals/history/resources/portal-manipulate-history-with-subframes.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/history/resources/portal-manipulate-history-with-subframes.sub.html rename to tests/wpt/tests/portals/history/resources/portal-manipulate-history-with-subframes.sub.html diff --git a/tests/wpt/web-platform-tests/portals/history/resources/portal-manipulate-history.html b/tests/wpt/tests/portals/history/resources/portal-manipulate-history.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/history/resources/portal-manipulate-history.html rename to tests/wpt/tests/portals/history/resources/portal-manipulate-history.html diff --git a/tests/wpt/web-platform-tests/portals/history/resources/run-test-in-portal.js b/tests/wpt/tests/portals/history/resources/run-test-in-portal.js similarity index 100% rename from tests/wpt/web-platform-tests/portals/history/resources/run-test-in-portal.js rename to tests/wpt/tests/portals/history/resources/run-test-in-portal.js diff --git a/tests/wpt/web-platform-tests/portals/htmlportalelement-event-handler-content-attributes.html b/tests/wpt/tests/portals/htmlportalelement-event-handler-content-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/htmlportalelement-event-handler-content-attributes.html rename to tests/wpt/tests/portals/htmlportalelement-event-handler-content-attributes.html diff --git a/tests/wpt/web-platform-tests/portals/idlharness.window.js b/tests/wpt/tests/portals/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/portals/idlharness.window.js rename to tests/wpt/tests/portals/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/portals/no-portal-in-sandboxed-popup.html b/tests/wpt/tests/portals/no-portal-in-sandboxed-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/no-portal-in-sandboxed-popup.html rename to tests/wpt/tests/portals/no-portal-in-sandboxed-popup.html diff --git a/tests/wpt/web-platform-tests/portals/portal-activate-data.html b/tests/wpt/tests/portals/portal-activate-data.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portal-activate-data.html rename to tests/wpt/tests/portals/portal-activate-data.html diff --git a/tests/wpt/web-platform-tests/portals/portal-activate-default.html b/tests/wpt/tests/portals/portal-activate-default.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portal-activate-default.html rename to tests/wpt/tests/portals/portal-activate-default.html diff --git a/tests/wpt/web-platform-tests/portals/portal-activate-event-constructor.html b/tests/wpt/tests/portals/portal-activate-event-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portal-activate-event-constructor.html rename to tests/wpt/tests/portals/portal-activate-event-constructor.html diff --git a/tests/wpt/web-platform-tests/portals/portal-activate-event.html b/tests/wpt/tests/portals/portal-activate-event.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portal-activate-event.html rename to tests/wpt/tests/portals/portal-activate-event.html diff --git a/tests/wpt/web-platform-tests/portals/portal-non-http-navigation.html b/tests/wpt/tests/portals/portal-non-http-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portal-non-http-navigation.html rename to tests/wpt/tests/portals/portal-non-http-navigation.html diff --git a/tests/wpt/web-platform-tests/portals/portal-onload-event.html b/tests/wpt/tests/portals/portal-onload-event.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portal-onload-event.html rename to tests/wpt/tests/portals/portal-onload-event.html diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-empty-browsing-context.html b/tests/wpt/tests/portals/portals-activate-empty-browsing-context.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-activate-empty-browsing-context.html rename to tests/wpt/tests/portals/portals-activate-empty-browsing-context.html diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-inside-iframe.html b/tests/wpt/tests/portals/portals-activate-inside-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-activate-inside-iframe.html rename to tests/wpt/tests/portals/portals-activate-inside-iframe.html diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-inside-portal.html b/tests/wpt/tests/portals/portals-activate-inside-portal.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-activate-inside-portal.html rename to tests/wpt/tests/portals/portals-activate-inside-portal.html diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-network-error.html b/tests/wpt/tests/portals/portals-activate-network-error.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-activate-network-error.html rename to tests/wpt/tests/portals/portals-activate-network-error.html diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-no-browsing-context.html b/tests/wpt/tests/portals/portals-activate-no-browsing-context.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-activate-no-browsing-context.html rename to tests/wpt/tests/portals/portals-activate-no-browsing-context.html diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-resolution.html b/tests/wpt/tests/portals/portals-activate-resolution.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-activate-resolution.html rename to tests/wpt/tests/portals/portals-activate-resolution.html diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-twice.html b/tests/wpt/tests/portals/portals-activate-twice.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-activate-twice.html rename to tests/wpt/tests/portals/portals-activate-twice.html diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-while-unloading.html b/tests/wpt/tests/portals/portals-activate-while-unloading.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-activate-while-unloading.html rename to tests/wpt/tests/portals/portals-activate-while-unloading.html diff --git a/tests/wpt/web-platform-tests/portals/portals-adopt-predecessor.html b/tests/wpt/tests/portals/portals-adopt-predecessor.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-adopt-predecessor.html rename to tests/wpt/tests/portals/portals-adopt-predecessor.html diff --git a/tests/wpt/web-platform-tests/portals/portals-api.html b/tests/wpt/tests/portals/portals-api.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-api.html rename to tests/wpt/tests/portals/portals-api.html diff --git a/tests/wpt/web-platform-tests/portals/portals-close-window.html b/tests/wpt/tests/portals/portals-close-window.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-close-window.html rename to tests/wpt/tests/portals/portals-close-window.html diff --git a/tests/wpt/web-platform-tests/portals/portals-cross-origin-load.sub.html b/tests/wpt/tests/portals/portals-cross-origin-load.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-cross-origin-load.sub.html rename to tests/wpt/tests/portals/portals-cross-origin-load.sub.html diff --git a/tests/wpt/web-platform-tests/portals/portals-focus.sub.html b/tests/wpt/tests/portals/portals-focus.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-focus.sub.html rename to tests/wpt/tests/portals/portals-focus.sub.html diff --git a/tests/wpt/web-platform-tests/portals/portals-host-exposure.sub.html b/tests/wpt/tests/portals/portals-host-exposure.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-host-exposure.sub.html rename to tests/wpt/tests/portals/portals-host-exposure.sub.html diff --git a/tests/wpt/web-platform-tests/portals/portals-host-hidden-after-activation.html b/tests/wpt/tests/portals/portals-host-hidden-after-activation.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-host-hidden-after-activation.html rename to tests/wpt/tests/portals/portals-host-hidden-after-activation.html diff --git a/tests/wpt/web-platform-tests/portals/portals-host-null.html b/tests/wpt/tests/portals/portals-host-null.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-host-null.html rename to tests/wpt/tests/portals/portals-host-null.html diff --git a/tests/wpt/web-platform-tests/portals/portals-host-post-message.sub.html b/tests/wpt/tests/portals/portals-host-post-message.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-host-post-message.sub.html rename to tests/wpt/tests/portals/portals-host-post-message.sub.html diff --git a/tests/wpt/web-platform-tests/portals/portals-navigate-after-adoption.html b/tests/wpt/tests/portals/portals-navigate-after-adoption.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-navigate-after-adoption.html rename to tests/wpt/tests/portals/portals-navigate-after-adoption.html diff --git a/tests/wpt/web-platform-tests/portals/portals-nested.html b/tests/wpt/tests/portals/portals-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-nested.html rename to tests/wpt/tests/portals/portals-nested.html diff --git a/tests/wpt/web-platform-tests/portals/portals-no-frame-crash.html b/tests/wpt/tests/portals/portals-no-frame-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-no-frame-crash.html rename to tests/wpt/tests/portals/portals-no-frame-crash.html diff --git a/tests/wpt/web-platform-tests/portals/portals-post-message.sub.html b/tests/wpt/tests/portals/portals-post-message.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-post-message.sub.html rename to tests/wpt/tests/portals/portals-post-message.sub.html diff --git a/tests/wpt/web-platform-tests/portals/portals-referrer-inherit-header.html b/tests/wpt/tests/portals/portals-referrer-inherit-header.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-referrer-inherit-header.html rename to tests/wpt/tests/portals/portals-referrer-inherit-header.html diff --git a/tests/wpt/web-platform-tests/portals/portals-referrer-inherit-header.html.headers b/tests/wpt/tests/portals/portals-referrer-inherit-header.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-referrer-inherit-header.html.headers rename to tests/wpt/tests/portals/portals-referrer-inherit-header.html.headers diff --git a/tests/wpt/web-platform-tests/portals/portals-referrer-inherit-meta.html b/tests/wpt/tests/portals/portals-referrer-inherit-meta.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-referrer-inherit-meta.html rename to tests/wpt/tests/portals/portals-referrer-inherit-meta.html diff --git a/tests/wpt/web-platform-tests/portals/portals-referrer.html b/tests/wpt/tests/portals/portals-referrer.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-referrer.html rename to tests/wpt/tests/portals/portals-referrer.html diff --git a/tests/wpt/web-platform-tests/portals/portals-rendering.html b/tests/wpt/tests/portals/portals-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-rendering.html rename to tests/wpt/tests/portals/portals-rendering.html diff --git a/tests/wpt/web-platform-tests/portals/portals-repeated-activate.html b/tests/wpt/tests/portals/portals-repeated-activate.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-repeated-activate.html rename to tests/wpt/tests/portals/portals-repeated-activate.html diff --git a/tests/wpt/web-platform-tests/portals/portals-set-src-after-activate.html b/tests/wpt/tests/portals/portals-set-src-after-activate.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/portals-set-src-after-activate.html rename to tests/wpt/tests/portals/portals-set-src-after-activate.html diff --git a/tests/wpt/web-platform-tests/portals/predecessor-fires-unload.html b/tests/wpt/tests/portals/predecessor-fires-unload.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/predecessor-fires-unload.html rename to tests/wpt/tests/portals/predecessor-fires-unload.html diff --git a/tests/wpt/web-platform-tests/portals/references/portals-rendering.html b/tests/wpt/tests/portals/references/portals-rendering.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/references/portals-rendering.html rename to tests/wpt/tests/portals/references/portals-rendering.html diff --git a/tests/wpt/web-platform-tests/portals/resources/attempt-portal-load.html b/tests/wpt/tests/portals/resources/attempt-portal-load.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/attempt-portal-load.html rename to tests/wpt/tests/portals/resources/attempt-portal-load.html diff --git a/tests/wpt/web-platform-tests/portals/resources/blank-host.html b/tests/wpt/tests/portals/resources/blank-host.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/blank-host.html rename to tests/wpt/tests/portals/resources/blank-host.html diff --git a/tests/wpt/web-platform-tests/portals/resources/eval-portal.html b/tests/wpt/tests/portals/resources/eval-portal.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/eval-portal.html rename to tests/wpt/tests/portals/resources/eval-portal.html diff --git a/tests/wpt/web-platform-tests/portals/resources/focus-page-with-autofocus.html b/tests/wpt/tests/portals/resources/focus-page-with-autofocus.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/focus-page-with-autofocus.html rename to tests/wpt/tests/portals/resources/focus-page-with-autofocus.html diff --git a/tests/wpt/web-platform-tests/portals/resources/focus-page-with-button.html b/tests/wpt/tests/portals/resources/focus-page-with-button.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/focus-page-with-button.html rename to tests/wpt/tests/portals/resources/focus-page-with-button.html diff --git a/tests/wpt/web-platform-tests/portals/resources/focus-page-with-x-origin-iframe.sub.html b/tests/wpt/tests/portals/resources/focus-page-with-x-origin-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/focus-page-with-x-origin-iframe.sub.html rename to tests/wpt/tests/portals/resources/focus-page-with-x-origin-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/portals/resources/invalid.asis b/tests/wpt/tests/portals/resources/invalid.asis similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/invalid.asis rename to tests/wpt/tests/portals/resources/invalid.asis diff --git a/tests/wpt/web-platform-tests/portals/resources/open-blank-host.js b/tests/wpt/tests/portals/resources/open-blank-host.js similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/open-blank-host.js rename to tests/wpt/tests/portals/resources/open-blank-host.js diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-activate-broadcastchannel.html b/tests/wpt/tests/portals/resources/portal-activate-broadcastchannel.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-activate-broadcastchannel.html rename to tests/wpt/tests/portals/resources/portal-activate-broadcastchannel.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-activate-data-portal.html b/tests/wpt/tests/portals/resources/portal-activate-data-portal.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-activate-data-portal.html rename to tests/wpt/tests/portals/resources/portal-activate-data-portal.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-activate-event-portal.html b/tests/wpt/tests/portals/resources/portal-activate-event-portal.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-activate-event-portal.html rename to tests/wpt/tests/portals/resources/portal-activate-event-portal.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-activate-in-handler.html b/tests/wpt/tests/portals/resources/portal-activate-in-handler.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-activate-in-handler.html rename to tests/wpt/tests/portals/resources/portal-activate-in-handler.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-activate-inside-portal.html b/tests/wpt/tests/portals/resources/portal-activate-inside-portal.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-activate-inside-portal.html rename to tests/wpt/tests/portals/resources/portal-activate-inside-portal.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-activate-twice-window-1.html b/tests/wpt/tests/portals/resources/portal-activate-twice-window-1.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-activate-twice-window-1.html rename to tests/wpt/tests/portals/resources/portal-activate-twice-window-1.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-activate-twice-window-2.html b/tests/wpt/tests/portals/resources/portal-activate-twice-window-2.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-activate-twice-window-2.html rename to tests/wpt/tests/portals/resources/portal-activate-twice-window-2.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-close-window.html b/tests/wpt/tests/portals/resources/portal-close-window.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-close-window.html rename to tests/wpt/tests/portals/resources/portal-close-window.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-embed-and-activate.html b/tests/wpt/tests/portals/resources/portal-embed-and-activate.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-embed-and-activate.html rename to tests/wpt/tests/portals/resources/portal-embed-and-activate.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-host-cross-origin-navigate.sub.html b/tests/wpt/tests/portals/resources/portal-host-cross-origin-navigate.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-host-cross-origin-navigate.sub.html rename to tests/wpt/tests/portals/resources/portal-host-cross-origin-navigate.sub.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-host-hidden-after-activation-portal.html b/tests/wpt/tests/portals/resources/portal-host-hidden-after-activation-portal.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-host-hidden-after-activation-portal.html rename to tests/wpt/tests/portals/resources/portal-host-hidden-after-activation-portal.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-host-post-message-after-activate.html b/tests/wpt/tests/portals/resources/portal-host-post-message-after-activate.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-host-post-message-after-activate.html rename to tests/wpt/tests/portals/resources/portal-host-post-message-after-activate.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-host-post-message-navigate-1.html b/tests/wpt/tests/portals/resources/portal-host-post-message-navigate-1.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-host-post-message-navigate-1.html rename to tests/wpt/tests/portals/resources/portal-host-post-message-navigate-1.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-host-post-message-navigate-2.html b/tests/wpt/tests/portals/resources/portal-host-post-message-navigate-2.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-host-post-message-navigate-2.html rename to tests/wpt/tests/portals/resources/portal-host-post-message-navigate-2.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-host-post-message-x-origin.html b/tests/wpt/tests/portals/resources/portal-host-post-message-x-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-host-post-message-x-origin.html rename to tests/wpt/tests/portals/resources/portal-host-post-message-x-origin.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-host-post-message.html b/tests/wpt/tests/portals/resources/portal-host-post-message.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-host-post-message.html rename to tests/wpt/tests/portals/resources/portal-host-post-message.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-host.html b/tests/wpt/tests/portals/resources/portal-host.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-host.html rename to tests/wpt/tests/portals/resources/portal-host.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-inside-iframe.html b/tests/wpt/tests/portals/resources/portal-inside-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-inside-iframe.html rename to tests/wpt/tests/portals/resources/portal-inside-iframe.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-post-message-after-activate-window.html b/tests/wpt/tests/portals/resources/portal-post-message-after-activate-window.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-post-message-after-activate-window.html rename to tests/wpt/tests/portals/resources/portal-post-message-after-activate-window.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-post-message-before-activate-portal.html b/tests/wpt/tests/portals/resources/portal-post-message-before-activate-portal.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-post-message-before-activate-portal.html rename to tests/wpt/tests/portals/resources/portal-post-message-before-activate-portal.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-post-message-before-activate-window.html b/tests/wpt/tests/portals/resources/portal-post-message-before-activate-window.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-post-message-before-activate-window.html rename to tests/wpt/tests/portals/resources/portal-post-message-before-activate-window.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-post-message-during-activate-window.html b/tests/wpt/tests/portals/resources/portal-post-message-during-activate-window.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-post-message-during-activate-window.html rename to tests/wpt/tests/portals/resources/portal-post-message-during-activate-window.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-post-message-portal.html b/tests/wpt/tests/portals/resources/portal-post-message-portal.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-post-message-portal.html rename to tests/wpt/tests/portals/resources/portal-post-message-portal.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-post-message-x-origin-portal.html b/tests/wpt/tests/portals/resources/portal-post-message-x-origin-portal.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-post-message-x-origin-portal.html rename to tests/wpt/tests/portals/resources/portal-post-message-x-origin-portal.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-repeated-activate-window.html b/tests/wpt/tests/portals/resources/portal-repeated-activate-window.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portal-repeated-activate-window.html rename to tests/wpt/tests/portals/resources/portal-repeated-activate-window.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portals-adopt-predecessor-portal.html b/tests/wpt/tests/portals/resources/portals-adopt-predecessor-portal.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portals-adopt-predecessor-portal.html rename to tests/wpt/tests/portals/resources/portals-adopt-predecessor-portal.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portals-adopt-predecessor.html b/tests/wpt/tests/portals/resources/portals-adopt-predecessor.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portals-adopt-predecessor.html rename to tests/wpt/tests/portals/resources/portals-adopt-predecessor.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portals-nested-portal.html b/tests/wpt/tests/portals/resources/portals-nested-portal.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portals-nested-portal.html rename to tests/wpt/tests/portals/resources/portals-nested-portal.html diff --git a/tests/wpt/web-platform-tests/portals/resources/portals-rendering-portal.html b/tests/wpt/tests/portals/resources/portals-rendering-portal.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/portals-rendering-portal.html rename to tests/wpt/tests/portals/resources/portals-rendering-portal.html diff --git a/tests/wpt/web-platform-tests/portals/resources/postmessage-referrer.sub.html b/tests/wpt/tests/portals/resources/postmessage-referrer.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/postmessage-referrer.sub.html rename to tests/wpt/tests/portals/resources/postmessage-referrer.sub.html diff --git a/tests/wpt/web-platform-tests/portals/resources/predecessor-fires-unload-watch-unload.html b/tests/wpt/tests/portals/resources/predecessor-fires-unload-watch-unload.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/predecessor-fires-unload-watch-unload.html rename to tests/wpt/tests/portals/resources/predecessor-fires-unload-watch-unload.html diff --git a/tests/wpt/web-platform-tests/portals/resources/simple-portal-adopts-and-activates-predecessor.html b/tests/wpt/tests/portals/resources/simple-portal-adopts-and-activates-predecessor.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/simple-portal-adopts-and-activates-predecessor.html rename to tests/wpt/tests/portals/resources/simple-portal-adopts-and-activates-predecessor.html diff --git a/tests/wpt/web-platform-tests/portals/resources/simple-portal-adopts-predecessor.html b/tests/wpt/tests/portals/resources/simple-portal-adopts-predecessor.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/simple-portal-adopts-predecessor.html rename to tests/wpt/tests/portals/resources/simple-portal-adopts-predecessor.html diff --git a/tests/wpt/web-platform-tests/portals/resources/simple-portal.html b/tests/wpt/tests/portals/resources/simple-portal.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/simple-portal.html rename to tests/wpt/tests/portals/resources/simple-portal.html diff --git a/tests/wpt/web-platform-tests/portals/resources/stash-utils.sub.js b/tests/wpt/tests/portals/resources/stash-utils.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/portals/resources/stash-utils.sub.js rename to tests/wpt/tests/portals/resources/stash-utils.sub.js diff --git a/tests/wpt/web-platform-tests/portals/xfo/portals-xfo-deny.sub.html b/tests/wpt/tests/portals/xfo/portals-xfo-deny.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/xfo/portals-xfo-deny.sub.html rename to tests/wpt/tests/portals/xfo/portals-xfo-deny.sub.html diff --git a/tests/wpt/web-platform-tests/portals/xfo/portals-xfo-sameorigin.html b/tests/wpt/tests/portals/xfo/portals-xfo-sameorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/portals/xfo/portals-xfo-sameorigin.html rename to tests/wpt/tests/portals/xfo/portals-xfo-sameorigin.html diff --git a/tests/wpt/web-platform-tests/portals/xfo/resources/xfo-deny.asis b/tests/wpt/tests/portals/xfo/resources/xfo-deny.asis similarity index 100% rename from tests/wpt/web-platform-tests/portals/xfo/resources/xfo-deny.asis rename to tests/wpt/tests/portals/xfo/resources/xfo-deny.asis diff --git a/tests/wpt/web-platform-tests/portals/xfo/resources/xfo-sameorigin.asis b/tests/wpt/tests/portals/xfo/resources/xfo-sameorigin.asis similarity index 100% rename from tests/wpt/web-platform-tests/portals/xfo/resources/xfo-sameorigin.asis rename to tests/wpt/tests/portals/xfo/resources/xfo-sameorigin.asis diff --git a/tests/wpt/web-platform-tests/preload/META.yml b/tests/wpt/tests/preload/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/preload/META.yml rename to tests/wpt/tests/preload/META.yml diff --git a/tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-modulepreload-exec.html b/tests/wpt/tests/preload/avoid-delaying-onload-link-modulepreload-exec.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-modulepreload-exec.html rename to tests/wpt/tests/preload/avoid-delaying-onload-link-modulepreload-exec.html diff --git a/tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-modulepreload.html b/tests/wpt/tests/preload/avoid-delaying-onload-link-modulepreload.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-modulepreload.html rename to tests/wpt/tests/preload/avoid-delaying-onload-link-modulepreload.html diff --git a/tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-preload-style.html b/tests/wpt/tests/preload/avoid-delaying-onload-link-preload-style.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-preload-style.html rename to tests/wpt/tests/preload/avoid-delaying-onload-link-preload-style.html diff --git a/tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-preload.html b/tests/wpt/tests/preload/avoid-delaying-onload-link-preload.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-preload.html rename to tests/wpt/tests/preload/avoid-delaying-onload-link-preload.html diff --git a/tests/wpt/web-platform-tests/preload/avoid-prefetching-on-text-plain-inner.html b/tests/wpt/tests/preload/avoid-prefetching-on-text-plain-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/avoid-prefetching-on-text-plain-inner.html rename to tests/wpt/tests/preload/avoid-prefetching-on-text-plain-inner.html diff --git a/tests/wpt/web-platform-tests/preload/avoid-prefetching-on-text-plain-inner.html.headers b/tests/wpt/tests/preload/avoid-prefetching-on-text-plain-inner.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/avoid-prefetching-on-text-plain-inner.html.headers rename to tests/wpt/tests/preload/avoid-prefetching-on-text-plain-inner.html.headers diff --git a/tests/wpt/web-platform-tests/preload/avoid-prefetching-on-text-plain.html b/tests/wpt/tests/preload/avoid-prefetching-on-text-plain.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/avoid-prefetching-on-text-plain.html rename to tests/wpt/tests/preload/avoid-prefetching-on-text-plain.html diff --git a/tests/wpt/web-platform-tests/preload/delaying-onload-link-preload-after-discovery.html b/tests/wpt/tests/preload/delaying-onload-link-preload-after-discovery.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/delaying-onload-link-preload-after-discovery.html rename to tests/wpt/tests/preload/delaying-onload-link-preload-after-discovery.html diff --git a/tests/wpt/web-platform-tests/preload/download-resources.html b/tests/wpt/tests/preload/download-resources.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/download-resources.html rename to tests/wpt/tests/preload/download-resources.html diff --git a/tests/wpt/web-platform-tests/preload/dynamic-adding-preload-imagesrcset.html b/tests/wpt/tests/preload/dynamic-adding-preload-imagesrcset.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/dynamic-adding-preload-imagesrcset.html rename to tests/wpt/tests/preload/dynamic-adding-preload-imagesrcset.html diff --git a/tests/wpt/web-platform-tests/preload/dynamic-adding-preload-nonce.html b/tests/wpt/tests/preload/dynamic-adding-preload-nonce.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/dynamic-adding-preload-nonce.html rename to tests/wpt/tests/preload/dynamic-adding-preload-nonce.html diff --git a/tests/wpt/web-platform-tests/preload/dynamic-adding-preload-nonce.html.headers b/tests/wpt/tests/preload/dynamic-adding-preload-nonce.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/dynamic-adding-preload-nonce.html.headers rename to tests/wpt/tests/preload/dynamic-adding-preload-nonce.html.headers diff --git a/tests/wpt/web-platform-tests/preload/dynamic-adding-preload.html b/tests/wpt/tests/preload/dynamic-adding-preload.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/dynamic-adding-preload.html rename to tests/wpt/tests/preload/dynamic-adding-preload.html diff --git a/tests/wpt/web-platform-tests/preload/link-header-modulepreload.html b/tests/wpt/tests/preload/link-header-modulepreload.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/link-header-modulepreload.html rename to tests/wpt/tests/preload/link-header-modulepreload.html diff --git a/tests/wpt/web-platform-tests/preload/link-header-on-subresource.html b/tests/wpt/tests/preload/link-header-on-subresource.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/link-header-on-subresource.html rename to tests/wpt/tests/preload/link-header-on-subresource.html diff --git a/tests/wpt/web-platform-tests/preload/link-header-preload-delay-onload.html b/tests/wpt/tests/preload/link-header-preload-delay-onload.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/link-header-preload-delay-onload.html rename to tests/wpt/tests/preload/link-header-preload-delay-onload.html diff --git a/tests/wpt/web-platform-tests/preload/link-header-preload-delay-onload.html.headers b/tests/wpt/tests/preload/link-header-preload-delay-onload.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/link-header-preload-delay-onload.html.headers rename to tests/wpt/tests/preload/link-header-preload-delay-onload.html.headers diff --git a/tests/wpt/web-platform-tests/preload/link-header-preload-imagesrcset.html b/tests/wpt/tests/preload/link-header-preload-imagesrcset.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/link-header-preload-imagesrcset.html rename to tests/wpt/tests/preload/link-header-preload-imagesrcset.html diff --git a/tests/wpt/web-platform-tests/preload/link-header-preload-imagesrcset.html.headers b/tests/wpt/tests/preload/link-header-preload-imagesrcset.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/link-header-preload-imagesrcset.html.headers rename to tests/wpt/tests/preload/link-header-preload-imagesrcset.html.headers diff --git a/tests/wpt/web-platform-tests/preload/link-header-preload-non-html.html b/tests/wpt/tests/preload/link-header-preload-non-html.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/link-header-preload-non-html.html rename to tests/wpt/tests/preload/link-header-preload-non-html.html diff --git a/tests/wpt/web-platform-tests/preload/link-header-preload-nonce.html b/tests/wpt/tests/preload/link-header-preload-nonce.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/link-header-preload-nonce.html rename to tests/wpt/tests/preload/link-header-preload-nonce.html diff --git a/tests/wpt/web-platform-tests/preload/link-header-preload.html b/tests/wpt/tests/preload/link-header-preload.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/link-header-preload.html rename to tests/wpt/tests/preload/link-header-preload.html diff --git a/tests/wpt/web-platform-tests/preload/link-header-preload.html.headers b/tests/wpt/tests/preload/link-header-preload.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/link-header-preload.html.headers rename to tests/wpt/tests/preload/link-header-preload.html.headers diff --git a/tests/wpt/web-platform-tests/preload/modulepreload-as.html b/tests/wpt/tests/preload/modulepreload-as.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/modulepreload-as.html rename to tests/wpt/tests/preload/modulepreload-as.html diff --git a/tests/wpt/web-platform-tests/preload/modulepreload-sri.html b/tests/wpt/tests/preload/modulepreload-sri.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/modulepreload-sri.html rename to tests/wpt/tests/preload/modulepreload-sri.html diff --git a/tests/wpt/web-platform-tests/preload/modulepreload.html b/tests/wpt/tests/preload/modulepreload.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/modulepreload.html rename to tests/wpt/tests/preload/modulepreload.html diff --git a/tests/wpt/web-platform-tests/preload/onerror-event.html b/tests/wpt/tests/preload/onerror-event.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/onerror-event.html rename to tests/wpt/tests/preload/onerror-event.html diff --git a/tests/wpt/web-platform-tests/preload/onload-event.html b/tests/wpt/tests/preload/onload-event.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/onload-event.html rename to tests/wpt/tests/preload/onload-event.html diff --git a/tests/wpt/web-platform-tests/preload/preconnect-onerror-event.html b/tests/wpt/tests/preload/preconnect-onerror-event.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preconnect-onerror-event.html rename to tests/wpt/tests/preload/preconnect-onerror-event.html diff --git a/tests/wpt/web-platform-tests/preload/preconnect.html b/tests/wpt/tests/preload/preconnect.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preconnect.html rename to tests/wpt/tests/preload/preconnect.html diff --git a/tests/wpt/web-platform-tests/preload/prefetch-accept.html b/tests/wpt/tests/preload/prefetch-accept.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/prefetch-accept.html rename to tests/wpt/tests/preload/prefetch-accept.html diff --git a/tests/wpt/web-platform-tests/preload/prefetch-cache.html b/tests/wpt/tests/preload/prefetch-cache.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/prefetch-cache.html rename to tests/wpt/tests/preload/prefetch-cache.html diff --git a/tests/wpt/web-platform-tests/preload/prefetch-document.html b/tests/wpt/tests/preload/prefetch-document.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/prefetch-document.html rename to tests/wpt/tests/preload/prefetch-document.html diff --git a/tests/wpt/web-platform-tests/preload/prefetch-events.html b/tests/wpt/tests/preload/prefetch-events.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/prefetch-events.html rename to tests/wpt/tests/preload/prefetch-events.html diff --git a/tests/wpt/web-platform-tests/preload/prefetch-headers.https.html b/tests/wpt/tests/preload/prefetch-headers.https.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/prefetch-headers.https.html rename to tests/wpt/tests/preload/prefetch-headers.https.html diff --git a/tests/wpt/web-platform-tests/preload/prefetch-load-event.html b/tests/wpt/tests/preload/prefetch-load-event.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/prefetch-load-event.html rename to tests/wpt/tests/preload/prefetch-load-event.html diff --git a/tests/wpt/web-platform-tests/preload/prefetch-time-to-fetch.https.html b/tests/wpt/tests/preload/prefetch-time-to-fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/prefetch-time-to-fetch.https.html rename to tests/wpt/tests/preload/prefetch-time-to-fetch.https.html diff --git a/tests/wpt/web-platform-tests/preload/prefetch-types.https.html b/tests/wpt/tests/preload/prefetch-types.https.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/prefetch-types.https.html rename to tests/wpt/tests/preload/prefetch-types.https.html diff --git a/tests/wpt/web-platform-tests/preload/preload-connect-to-doc.html b/tests/wpt/tests/preload/preload-connect-to-doc.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-connect-to-doc.html rename to tests/wpt/tests/preload/preload-connect-to-doc.html diff --git a/tests/wpt/web-platform-tests/preload/preload-csp.sub.html b/tests/wpt/tests/preload/preload-csp.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-csp.sub.html rename to tests/wpt/tests/preload/preload-csp.sub.html diff --git a/tests/wpt/web-platform-tests/preload/preload-default-csp.sub.html b/tests/wpt/tests/preload/preload-default-csp.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-default-csp.sub.html rename to tests/wpt/tests/preload/preload-default-csp.sub.html diff --git a/tests/wpt/web-platform-tests/preload/preload-dynamic-csp.html b/tests/wpt/tests/preload/preload-dynamic-csp.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-dynamic-csp.html rename to tests/wpt/tests/preload/preload-dynamic-csp.html diff --git a/tests/wpt/web-platform-tests/preload/preload-error.sub.html b/tests/wpt/tests/preload/preload-error.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-error.sub.html rename to tests/wpt/tests/preload/preload-error.sub.html diff --git a/tests/wpt/web-platform-tests/preload/preload-font-crossorigin.html b/tests/wpt/tests/preload/preload-font-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-font-crossorigin.html rename to tests/wpt/tests/preload/preload-font-crossorigin.html diff --git a/tests/wpt/web-platform-tests/preload/preload-in-data-doc-ref.html b/tests/wpt/tests/preload/preload-in-data-doc-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-in-data-doc-ref.html rename to tests/wpt/tests/preload/preload-in-data-doc-ref.html diff --git a/tests/wpt/web-platform-tests/preload/preload-in-data-doc.html b/tests/wpt/tests/preload/preload-in-data-doc.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-in-data-doc.html rename to tests/wpt/tests/preload/preload-in-data-doc.html diff --git a/tests/wpt/web-platform-tests/preload/preload-invalid-resources.html b/tests/wpt/tests/preload/preload-invalid-resources.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-invalid-resources.html rename to tests/wpt/tests/preload/preload-invalid-resources.html diff --git a/tests/wpt/web-platform-tests/preload/preload-link-cached-stylesheet-different-doc.html b/tests/wpt/tests/preload/preload-link-cached-stylesheet-different-doc.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-link-cached-stylesheet-different-doc.html rename to tests/wpt/tests/preload/preload-link-cached-stylesheet-different-doc.html diff --git a/tests/wpt/web-platform-tests/preload/preload-referrer-policy.html b/tests/wpt/tests/preload/preload-referrer-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-referrer-policy.html rename to tests/wpt/tests/preload/preload-referrer-policy.html diff --git a/tests/wpt/web-platform-tests/preload/preload-resource-match.https.html b/tests/wpt/tests/preload/preload-resource-match.https.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-resource-match.https.html rename to tests/wpt/tests/preload/preload-resource-match.https.html diff --git a/tests/wpt/web-platform-tests/preload/preload-strict-dynamic.sub.html b/tests/wpt/tests/preload/preload-strict-dynamic.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-strict-dynamic.sub.html rename to tests/wpt/tests/preload/preload-strict-dynamic.sub.html diff --git a/tests/wpt/web-platform-tests/preload/preload-time-to-fetch.https.html b/tests/wpt/tests/preload/preload-time-to-fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-time-to-fetch.https.html rename to tests/wpt/tests/preload/preload-time-to-fetch.https.html diff --git a/tests/wpt/web-platform-tests/preload/preload-type-match.html b/tests/wpt/tests/preload/preload-type-match.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-type-match.html rename to tests/wpt/tests/preload/preload-type-match.html diff --git a/tests/wpt/web-platform-tests/preload/preload-with-type.html b/tests/wpt/tests/preload/preload-with-type.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-with-type.html rename to tests/wpt/tests/preload/preload-with-type.html diff --git a/tests/wpt/web-platform-tests/preload/preload-xhr.html b/tests/wpt/tests/preload/preload-xhr.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/preload-xhr.html rename to tests/wpt/tests/preload/preload-xhr.html diff --git a/tests/wpt/web-platform-tests/preload/reflected-as-value.html b/tests/wpt/tests/preload/reflected-as-value.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/reflected-as-value.html rename to tests/wpt/tests/preload/reflected-as-value.html diff --git a/tests/wpt/web-platform-tests/preload/resources/A4.ogv b/tests/wpt/tests/preload/resources/A4.ogv similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/A4.ogv rename to tests/wpt/tests/preload/resources/A4.ogv diff --git a/tests/wpt/web-platform-tests/preload/resources/A4.ogv.sub.headers b/tests/wpt/tests/preload/resources/A4.ogv.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/A4.ogv.sub.headers rename to tests/wpt/tests/preload/resources/A4.ogv.sub.headers diff --git a/tests/wpt/web-platform-tests/preload/resources/cross-origin-module.py b/tests/wpt/tests/preload/resources/cross-origin-module.py similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/cross-origin-module.py rename to tests/wpt/tests/preload/resources/cross-origin-module.py diff --git a/tests/wpt/web-platform-tests/preload/resources/dummy-preloads-subresource.css b/tests/wpt/tests/preload/resources/dummy-preloads-subresource.css similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/dummy-preloads-subresource.css rename to tests/wpt/tests/preload/resources/dummy-preloads-subresource.css diff --git a/tests/wpt/web-platform-tests/preload/resources/dummy-preloads-subresource.css.sub.headers b/tests/wpt/tests/preload/resources/dummy-preloads-subresource.css.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/dummy-preloads-subresource.css.sub.headers rename to tests/wpt/tests/preload/resources/dummy-preloads-subresource.css.sub.headers diff --git a/tests/wpt/web-platform-tests/preload/resources/dummy.css b/tests/wpt/tests/preload/resources/dummy.css similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/dummy.css rename to tests/wpt/tests/preload/resources/dummy.css diff --git a/tests/wpt/web-platform-tests/preload/resources/dummy.css.sub.headers b/tests/wpt/tests/preload/resources/dummy.css.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/dummy.css.sub.headers rename to tests/wpt/tests/preload/resources/dummy.css.sub.headers diff --git a/tests/wpt/web-platform-tests/preload/resources/dummy.js b/tests/wpt/tests/preload/resources/dummy.js similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/dummy.js rename to tests/wpt/tests/preload/resources/dummy.js diff --git a/tests/wpt/web-platform-tests/preload/resources/dummy.js.sub.headers b/tests/wpt/tests/preload/resources/dummy.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/dummy.js.sub.headers rename to tests/wpt/tests/preload/resources/dummy.js.sub.headers diff --git a/tests/wpt/web-platform-tests/preload/resources/dummy.xml b/tests/wpt/tests/preload/resources/dummy.xml similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/dummy.xml rename to tests/wpt/tests/preload/resources/dummy.xml diff --git a/tests/wpt/web-platform-tests/preload/resources/dummy.xml.sub.headers b/tests/wpt/tests/preload/resources/dummy.xml.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/dummy.xml.sub.headers rename to tests/wpt/tests/preload/resources/dummy.xml.sub.headers diff --git a/tests/wpt/web-platform-tests/preload/resources/echo-preload-header.py b/tests/wpt/tests/preload/resources/echo-preload-header.py similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/echo-preload-header.py rename to tests/wpt/tests/preload/resources/echo-preload-header.py diff --git a/tests/wpt/web-platform-tests/preload/resources/echo-referrer.py b/tests/wpt/tests/preload/resources/echo-referrer.py similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/echo-referrer.py rename to tests/wpt/tests/preload/resources/echo-referrer.py diff --git a/tests/wpt/web-platform-tests/preload/resources/echo-with-cors.py b/tests/wpt/tests/preload/resources/echo-with-cors.py similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/echo-with-cors.py rename to tests/wpt/tests/preload/resources/echo-with-cors.py diff --git a/tests/wpt/web-platform-tests/preload/resources/empty.html b/tests/wpt/tests/preload/resources/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/empty.html rename to tests/wpt/tests/preload/resources/empty.html diff --git a/tests/wpt/web-platform-tests/preload/resources/empty.html.sub.headers b/tests/wpt/tests/preload/resources/empty.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/empty.html.sub.headers rename to tests/wpt/tests/preload/resources/empty.html.sub.headers diff --git a/tests/wpt/web-platform-tests/preload/resources/font.ttf b/tests/wpt/tests/preload/resources/font.ttf similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/font.ttf rename to tests/wpt/tests/preload/resources/font.ttf diff --git a/tests/wpt/web-platform-tests/preload/resources/font.ttf.sub.headers b/tests/wpt/tests/preload/resources/font.ttf.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/font.ttf.sub.headers rename to tests/wpt/tests/preload/resources/font.ttf.sub.headers diff --git a/tests/wpt/web-platform-tests/preload/resources/foo.vtt b/tests/wpt/tests/preload/resources/foo.vtt similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/foo.vtt rename to tests/wpt/tests/preload/resources/foo.vtt diff --git a/tests/wpt/web-platform-tests/preload/resources/foo.vtt.sub.headers b/tests/wpt/tests/preload/resources/foo.vtt.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/foo.vtt.sub.headers rename to tests/wpt/tests/preload/resources/foo.vtt.sub.headers diff --git a/tests/wpt/web-platform-tests/preload/resources/link-header-referrer-policy.html b/tests/wpt/tests/preload/resources/link-header-referrer-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/link-header-referrer-policy.html rename to tests/wpt/tests/preload/resources/link-header-referrer-policy.html diff --git a/tests/wpt/web-platform-tests/preload/resources/link-header-referrer-policy.py b/tests/wpt/tests/preload/resources/link-header-referrer-policy.py similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/link-header-referrer-policy.py rename to tests/wpt/tests/preload/resources/link-header-referrer-policy.py diff --git a/tests/wpt/web-platform-tests/preload/resources/module1.js b/tests/wpt/tests/preload/resources/module1.js similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/module1.js rename to tests/wpt/tests/preload/resources/module1.js diff --git a/tests/wpt/web-platform-tests/preload/resources/module1.mjs b/tests/wpt/tests/preload/resources/module1.mjs similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/module1.mjs rename to tests/wpt/tests/preload/resources/module1.mjs diff --git a/tests/wpt/web-platform-tests/preload/resources/module2.js b/tests/wpt/tests/preload/resources/module2.js similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/module2.js rename to tests/wpt/tests/preload/resources/module2.js diff --git a/tests/wpt/web-platform-tests/preload/resources/modulepreload-iframe.html b/tests/wpt/tests/preload/resources/modulepreload-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/modulepreload-iframe.html rename to tests/wpt/tests/preload/resources/modulepreload-iframe.html diff --git a/tests/wpt/web-platform-tests/preload/resources/prefetch-exec.html b/tests/wpt/tests/preload/resources/prefetch-exec.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/prefetch-exec.html rename to tests/wpt/tests/preload/resources/prefetch-exec.html diff --git a/tests/wpt/web-platform-tests/preload/resources/prefetch-helper.js b/tests/wpt/tests/preload/resources/prefetch-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/prefetch-helper.js rename to tests/wpt/tests/preload/resources/prefetch-helper.js diff --git a/tests/wpt/web-platform-tests/preload/resources/prefetch-info.py b/tests/wpt/tests/preload/resources/prefetch-info.py similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/prefetch-info.py rename to tests/wpt/tests/preload/resources/prefetch-info.py diff --git a/tests/wpt/web-platform-tests/preload/resources/preload_helper.js b/tests/wpt/tests/preload/resources/preload_helper.js similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/preload_helper.js rename to tests/wpt/tests/preload/resources/preload_helper.js diff --git a/tests/wpt/web-platform-tests/preload/resources/slow-exec.js b/tests/wpt/tests/preload/resources/slow-exec.js similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/slow-exec.js rename to tests/wpt/tests/preload/resources/slow-exec.js diff --git a/tests/wpt/web-platform-tests/preload/resources/sound_5.oga b/tests/wpt/tests/preload/resources/sound_5.oga similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/sound_5.oga rename to tests/wpt/tests/preload/resources/sound_5.oga diff --git a/tests/wpt/web-platform-tests/preload/resources/sound_5.oga.sub.headers b/tests/wpt/tests/preload/resources/sound_5.oga.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/sound_5.oga.sub.headers rename to tests/wpt/tests/preload/resources/sound_5.oga.sub.headers diff --git a/tests/wpt/web-platform-tests/preload/resources/square.png b/tests/wpt/tests/preload/resources/square.png similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/square.png rename to tests/wpt/tests/preload/resources/square.png diff --git a/tests/wpt/web-platform-tests/preload/resources/square.png.sub.headers b/tests/wpt/tests/preload/resources/square.png.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/square.png.sub.headers rename to tests/wpt/tests/preload/resources/square.png.sub.headers diff --git a/tests/wpt/web-platform-tests/preload/resources/stash-put.py b/tests/wpt/tests/preload/resources/stash-put.py similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/stash-put.py rename to tests/wpt/tests/preload/resources/stash-put.py diff --git a/tests/wpt/web-platform-tests/preload/resources/stash-take.py b/tests/wpt/tests/preload/resources/stash-take.py similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/stash-take.py rename to tests/wpt/tests/preload/resources/stash-take.py diff --git a/tests/wpt/web-platform-tests/preload/resources/syntax-error.js b/tests/wpt/tests/preload/resources/syntax-error.js similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/syntax-error.js rename to tests/wpt/tests/preload/resources/syntax-error.js diff --git a/tests/wpt/web-platform-tests/preload/resources/white.mp4 b/tests/wpt/tests/preload/resources/white.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/white.mp4 rename to tests/wpt/tests/preload/resources/white.mp4 diff --git a/tests/wpt/web-platform-tests/preload/resources/white.mp4.sub.headers b/tests/wpt/tests/preload/resources/white.mp4.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/preload/resources/white.mp4.sub.headers rename to tests/wpt/tests/preload/resources/white.mp4.sub.headers diff --git a/tests/wpt/web-platform-tests/preload/single-download-late-used-preload.html b/tests/wpt/tests/preload/single-download-late-used-preload.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/single-download-late-used-preload.html rename to tests/wpt/tests/preload/single-download-late-used-preload.html diff --git a/tests/wpt/web-platform-tests/preload/single-download-preload.html b/tests/wpt/tests/preload/single-download-preload.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/single-download-preload.html rename to tests/wpt/tests/preload/single-download-preload.html diff --git a/tests/wpt/web-platform-tests/preload/subresource-integrity-font.html b/tests/wpt/tests/preload/subresource-integrity-font.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/subresource-integrity-font.html rename to tests/wpt/tests/preload/subresource-integrity-font.html diff --git a/tests/wpt/web-platform-tests/preload/subresource-integrity-partial-image.html b/tests/wpt/tests/preload/subresource-integrity-partial-image.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/subresource-integrity-partial-image.html rename to tests/wpt/tests/preload/subresource-integrity-partial-image.html diff --git a/tests/wpt/web-platform-tests/preload/subresource-integrity.html b/tests/wpt/tests/preload/subresource-integrity.html similarity index 100% rename from tests/wpt/web-platform-tests/preload/subresource-integrity.html rename to tests/wpt/tests/preload/subresource-integrity.html diff --git a/tests/wpt/web-platform-tests/presentation-api/META.yml b/tests/wpt/tests/presentation-api/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/META.yml rename to tests/wpt/tests/presentation-api/META.yml diff --git a/tests/wpt/web-platform-tests/presentation-api/README.md b/tests/wpt/tests/presentation-api/README.md similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/README.md rename to tests/wpt/tests/presentation-api/README.md diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationAvailability_onchange-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationAvailability_onchange-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationAvailability_onchange-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/PresentationAvailability_onchange-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationConnectionCloseEvent.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationConnectionCloseEvent.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationConnectionCloseEvent.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/PresentationConnectionCloseEvent.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationConnection_onclose-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationConnection_onclose-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationConnection_onclose-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/PresentationConnection_onclose-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationConnection_onconnect-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationConnection_onconnect-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationConnection_onconnect-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/PresentationConnection_onconnect-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationConnection_onmessage-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationConnection_onmessage-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationConnection_onmessage-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/PresentationConnection_onmessage-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationConnection_onterminate-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationConnection_onterminate-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationConnection_onterminate-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/PresentationConnection_onterminate-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationConnection_send-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationConnection_send-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationConnection_send-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/PresentationConnection_send-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_error.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationRequest_error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_error.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/PresentationRequest_error.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_mixedcontent.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationRequest_mixedcontent.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_mixedcontent.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/PresentationRequest_mixedcontent.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_mixedcontent_multiple.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationRequest_mixedcontent_multiple.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_mixedcontent_multiple.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/PresentationRequest_mixedcontent_multiple.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_onconnectionavailable-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationRequest_onconnectionavailable-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_onconnectionavailable-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/PresentationRequest_onconnectionavailable-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_sandboxing_error.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationRequest_sandboxing_error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_sandboxing_error.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/PresentationRequest_sandboxing_error.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_sandboxing_success.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationRequest_sandboxing_success.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_sandboxing_success.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/PresentationRequest_sandboxing_success.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_success.https.html b/tests/wpt/tests/presentation-api/controlling-ua/PresentationRequest_success.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/PresentationRequest_success.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/PresentationRequest_success.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/common.js b/tests/wpt/tests/presentation-api/controlling-ua/common.js similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/common.js rename to tests/wpt/tests/presentation-api/controlling-ua/common.js diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/defaultRequest.https.html b/tests/wpt/tests/presentation-api/controlling-ua/defaultRequest.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/defaultRequest.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/defaultRequest.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/defaultRequest_success-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/defaultRequest_success-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/defaultRequest_success-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/defaultRequest_success-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/getAvailability.https.html b/tests/wpt/tests/presentation-api/controlling-ua/getAvailability.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/getAvailability.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/getAvailability.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/getAvailability_sandboxing_success.https.html b/tests/wpt/tests/presentation-api/controlling-ua/getAvailability_sandboxing_success.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/getAvailability_sandboxing_success.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/getAvailability_sandboxing_success.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/idlharness.https.html b/tests/wpt/tests/presentation-api/controlling-ua/idlharness.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/idlharness.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/idlharness.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/reconnectToMultiplePresentations_success-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/reconnectToMultiplePresentations_success-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/reconnectToMultiplePresentations_success-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/reconnectToMultiplePresentations_success-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/reconnectToPresentation_notfound_error-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/reconnectToPresentation_notfound_error-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/reconnectToPresentation_notfound_error-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/reconnectToPresentation_notfound_error-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/reconnectToPresentation_sandboxing_success.https.html b/tests/wpt/tests/presentation-api/controlling-ua/reconnectToPresentation_sandboxing_success.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/reconnectToPresentation_sandboxing_success.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/reconnectToPresentation_sandboxing_success.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/reconnectToPresentation_success-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/reconnectToPresentation_success-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/reconnectToPresentation_success-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/reconnectToPresentation_success-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/startMultiplePresentations_success-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/startMultiplePresentations_success-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/startMultiplePresentations_success-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/startMultiplePresentations_success-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/startNewPresentation_displaynotallowed-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/startNewPresentation_displaynotallowed-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/startNewPresentation_displaynotallowed-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/startNewPresentation_displaynotallowed-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/startNewPresentation_displaynotfound-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/startNewPresentation_displaynotfound-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/startNewPresentation_displaynotfound-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/startNewPresentation_displaynotfound-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/startNewPresentation_error.https.html b/tests/wpt/tests/presentation-api/controlling-ua/startNewPresentation_error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/startNewPresentation_error.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/startNewPresentation_error.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/startNewPresentation_sandboxing_success-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/startNewPresentation_sandboxing_success-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/startNewPresentation_sandboxing_success-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/startNewPresentation_sandboxing_success-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/startNewPresentation_success-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/startNewPresentation_success-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/startNewPresentation_success-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/startNewPresentation_success-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/startNewPresentation_unsettledpromise-manual.https.html b/tests/wpt/tests/presentation-api/controlling-ua/startNewPresentation_unsettledpromise-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/startNewPresentation_unsettledpromise-manual.https.html rename to tests/wpt/tests/presentation-api/controlling-ua/startNewPresentation_unsettledpromise-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/support/iframe.html b/tests/wpt/tests/presentation-api/controlling-ua/support/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/support/iframe.html rename to tests/wpt/tests/presentation-api/controlling-ua/support/iframe.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/support/presentation.html b/tests/wpt/tests/presentation-api/controlling-ua/support/presentation.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/support/presentation.html rename to tests/wpt/tests/presentation-api/controlling-ua/support/presentation.html diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/support/stash.js b/tests/wpt/tests/presentation-api/controlling-ua/support/stash.js similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/support/stash.js rename to tests/wpt/tests/presentation-api/controlling-ua/support/stash.js diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/support/stash.py b/tests/wpt/tests/presentation-api/controlling-ua/support/stash.py similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/controlling-ua/support/stash.py rename to tests/wpt/tests/presentation-api/controlling-ua/support/stash.py diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnectionList_onconnectionavailable-manual.https.html b/tests/wpt/tests/presentation-api/receiving-ua/PresentationConnectionList_onconnectionavailable-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnectionList_onconnectionavailable-manual.https.html rename to tests/wpt/tests/presentation-api/receiving-ua/PresentationConnectionList_onconnectionavailable-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_onclose-manual.https.html b/tests/wpt/tests/presentation-api/receiving-ua/PresentationConnection_onclose-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_onclose-manual.https.html rename to tests/wpt/tests/presentation-api/receiving-ua/PresentationConnection_onclose-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_onmessage-manual.https.html b/tests/wpt/tests/presentation-api/receiving-ua/PresentationConnection_onmessage-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_onmessage-manual.https.html rename to tests/wpt/tests/presentation-api/receiving-ua/PresentationConnection_onmessage-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_send-manual.https.html b/tests/wpt/tests/presentation-api/receiving-ua/PresentationConnection_send-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_send-manual.https.html rename to tests/wpt/tests/presentation-api/receiving-ua/PresentationConnection_send-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_terminate-manual.https.html b/tests/wpt/tests/presentation-api/receiving-ua/PresentationConnection_terminate-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_terminate-manual.https.html rename to tests/wpt/tests/presentation-api/receiving-ua/PresentationConnection_terminate-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationReceiver_create-manual.https.html b/tests/wpt/tests/presentation-api/receiving-ua/PresentationReceiver_create-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationReceiver_create-manual.https.html rename to tests/wpt/tests/presentation-api/receiving-ua/PresentationReceiver_create-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/cache.txt b/tests/wpt/tests/presentation-api/receiving-ua/cache.txt similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/cache.txt rename to tests/wpt/tests/presentation-api/receiving-ua/cache.txt diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/common.js b/tests/wpt/tests/presentation-api/receiving-ua/common.js similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/common.js rename to tests/wpt/tests/presentation-api/receiving-ua/common.js diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/idlharness-manual.https.html b/tests/wpt/tests/presentation-api/receiving-ua/idlharness-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/idlharness-manual.https.html rename to tests/wpt/tests/presentation-api/receiving-ua/idlharness-manual.https.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/serviceworker.js b/tests/wpt/tests/presentation-api/receiving-ua/serviceworker.js similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/serviceworker.js rename to tests/wpt/tests/presentation-api/receiving-ua/serviceworker.js diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationConnectionList_onconnectionavailable_receiving-ua.html b/tests/wpt/tests/presentation-api/receiving-ua/support/PresentationConnectionList_onconnectionavailable_receiving-ua.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationConnectionList_onconnectionavailable_receiving-ua.html rename to tests/wpt/tests/presentation-api/receiving-ua/support/PresentationConnectionList_onconnectionavailable_receiving-ua.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationConnection_onclose_receiving-ua.html b/tests/wpt/tests/presentation-api/receiving-ua/support/PresentationConnection_onclose_receiving-ua.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationConnection_onclose_receiving-ua.html rename to tests/wpt/tests/presentation-api/receiving-ua/support/PresentationConnection_onclose_receiving-ua.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationConnection_onmessage_receiving-ua.html b/tests/wpt/tests/presentation-api/receiving-ua/support/PresentationConnection_onmessage_receiving-ua.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationConnection_onmessage_receiving-ua.html rename to tests/wpt/tests/presentation-api/receiving-ua/support/PresentationConnection_onmessage_receiving-ua.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationConnection_send_receiving-ua.html b/tests/wpt/tests/presentation-api/receiving-ua/support/PresentationConnection_send_receiving-ua.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationConnection_send_receiving-ua.html rename to tests/wpt/tests/presentation-api/receiving-ua/support/PresentationConnection_send_receiving-ua.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationConnection_terminate_receiving-ua.html b/tests/wpt/tests/presentation-api/receiving-ua/support/PresentationConnection_terminate_receiving-ua.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationConnection_terminate_receiving-ua.html rename to tests/wpt/tests/presentation-api/receiving-ua/support/PresentationConnection_terminate_receiving-ua.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua.html b/tests/wpt/tests/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua.html rename to tests/wpt/tests/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua_child.html b/tests/wpt/tests/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua_child.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua_child.html rename to tests/wpt/tests/presentation-api/receiving-ua/support/PresentationReceiver_create_receiving-ua_child.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationReceiver_unreached_receiving-ua.html b/tests/wpt/tests/presentation-api/receiving-ua/support/PresentationReceiver_unreached_receiving-ua.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/PresentationReceiver_unreached_receiving-ua.html rename to tests/wpt/tests/presentation-api/receiving-ua/support/PresentationReceiver_unreached_receiving-ua.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/idlharness_receiving-ua.html b/tests/wpt/tests/presentation-api/receiving-ua/support/idlharness_receiving-ua.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/idlharness_receiving-ua.html rename to tests/wpt/tests/presentation-api/receiving-ua/support/idlharness_receiving-ua.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/iframe.html b/tests/wpt/tests/presentation-api/receiving-ua/support/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/iframe.html rename to tests/wpt/tests/presentation-api/receiving-ua/support/iframe.html diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/serviceworker.js b/tests/wpt/tests/presentation-api/receiving-ua/support/serviceworker.js similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/serviceworker.js rename to tests/wpt/tests/presentation-api/receiving-ua/support/serviceworker.js diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/stash.js b/tests/wpt/tests/presentation-api/receiving-ua/support/stash.js similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/stash.js rename to tests/wpt/tests/presentation-api/receiving-ua/support/stash.js diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/stash.py b/tests/wpt/tests/presentation-api/receiving-ua/support/stash.py similarity index 100% rename from tests/wpt/web-platform-tests/presentation-api/receiving-ua/support/stash.py rename to tests/wpt/tests/presentation-api/receiving-ua/support/stash.py diff --git a/tests/wpt/web-platform-tests/private-aggregation/protected-audience-surface-success.https.html b/tests/wpt/tests/private-aggregation/protected-audience-surface-success.https.html similarity index 100% rename from tests/wpt/web-platform-tests/private-aggregation/protected-audience-surface-success.https.html rename to tests/wpt/tests/private-aggregation/protected-audience-surface-success.https.html diff --git a/tests/wpt/web-platform-tests/private-aggregation/resources/protected-audience-helper-module.js b/tests/wpt/tests/private-aggregation/resources/protected-audience-helper-module.js similarity index 100% rename from tests/wpt/web-platform-tests/private-aggregation/resources/protected-audience-helper-module.js rename to tests/wpt/tests/private-aggregation/resources/protected-audience-helper-module.js diff --git a/tests/wpt/web-platform-tests/private-aggregation/resources/reports.py b/tests/wpt/tests/private-aggregation/resources/reports.py similarity index 100% rename from tests/wpt/web-platform-tests/private-aggregation/resources/reports.py rename to tests/wpt/tests/private-aggregation/resources/reports.py diff --git a/tests/wpt/web-platform-tests/private-aggregation/resources/shared-storage-helper-module.js b/tests/wpt/tests/private-aggregation/resources/shared-storage-helper-module.js similarity index 100% rename from tests/wpt/web-platform-tests/private-aggregation/resources/shared-storage-helper-module.js rename to tests/wpt/tests/private-aggregation/resources/shared-storage-helper-module.js diff --git a/tests/wpt/web-platform-tests/private-aggregation/resources/util.js b/tests/wpt/tests/private-aggregation/resources/util.js similarity index 100% rename from tests/wpt/web-platform-tests/private-aggregation/resources/util.js rename to tests/wpt/tests/private-aggregation/resources/util.js diff --git a/tests/wpt/web-platform-tests/private-aggregation/shared-storage-permissions-policy-none.https.html b/tests/wpt/tests/private-aggregation/shared-storage-permissions-policy-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/private-aggregation/shared-storage-permissions-policy-none.https.html rename to tests/wpt/tests/private-aggregation/shared-storage-permissions-policy-none.https.html diff --git a/tests/wpt/web-platform-tests/private-aggregation/shared-storage-permissions-policy-none.https.html.headers b/tests/wpt/tests/private-aggregation/shared-storage-permissions-policy-none.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/private-aggregation/shared-storage-permissions-policy-none.https.html.headers rename to tests/wpt/tests/private-aggregation/shared-storage-permissions-policy-none.https.html.headers diff --git a/tests/wpt/web-platform-tests/private-aggregation/shared-storage-surface-context-id.https.html b/tests/wpt/tests/private-aggregation/shared-storage-surface-context-id.https.html similarity index 100% rename from tests/wpt/web-platform-tests/private-aggregation/shared-storage-surface-context-id.https.html rename to tests/wpt/tests/private-aggregation/shared-storage-surface-context-id.https.html diff --git a/tests/wpt/web-platform-tests/private-aggregation/shared-storage-surface-failure-2.https.html b/tests/wpt/tests/private-aggregation/shared-storage-surface-failure-2.https.html similarity index 100% rename from tests/wpt/web-platform-tests/private-aggregation/shared-storage-surface-failure-2.https.html rename to tests/wpt/tests/private-aggregation/shared-storage-surface-failure-2.https.html diff --git a/tests/wpt/web-platform-tests/private-aggregation/shared-storage-surface-failure.https.html b/tests/wpt/tests/private-aggregation/shared-storage-surface-failure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/private-aggregation/shared-storage-surface-failure.https.html rename to tests/wpt/tests/private-aggregation/shared-storage-surface-failure.https.html diff --git a/tests/wpt/web-platform-tests/private-aggregation/shared-storage-surface-success-2.https.html b/tests/wpt/tests/private-aggregation/shared-storage-surface-success-2.https.html similarity index 100% rename from tests/wpt/web-platform-tests/private-aggregation/shared-storage-surface-success-2.https.html rename to tests/wpt/tests/private-aggregation/shared-storage-surface-success-2.https.html diff --git a/tests/wpt/web-platform-tests/private-aggregation/shared-storage-surface-success.https.html b/tests/wpt/tests/private-aggregation/shared-storage-surface-success.https.html similarity index 100% rename from tests/wpt/web-platform-tests/private-aggregation/shared-storage-surface-success.https.html rename to tests/wpt/tests/private-aggregation/shared-storage-surface-success.https.html diff --git a/tests/wpt/web-platform-tests/private-click-measurement/idlharness.window.js b/tests/wpt/tests/private-click-measurement/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/private-click-measurement/idlharness.window.js rename to tests/wpt/tests/private-click-measurement/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/proximity/META.yml b/tests/wpt/tests/proximity/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/proximity/META.yml rename to tests/wpt/tests/proximity/META.yml diff --git a/tests/wpt/web-platform-tests/proximity/ProximitySensor-iframe-access.https.html b/tests/wpt/tests/proximity/ProximitySensor-iframe-access.https.html similarity index 100% rename from tests/wpt/web-platform-tests/proximity/ProximitySensor-iframe-access.https.html rename to tests/wpt/tests/proximity/ProximitySensor-iframe-access.https.html diff --git a/tests/wpt/web-platform-tests/proximity/ProximitySensor.https.html b/tests/wpt/tests/proximity/ProximitySensor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/proximity/ProximitySensor.https.html rename to tests/wpt/tests/proximity/ProximitySensor.https.html diff --git a/tests/wpt/web-platform-tests/proximity/ProximitySensor_insecure_context.html b/tests/wpt/tests/proximity/ProximitySensor_insecure_context.html similarity index 100% rename from tests/wpt/web-platform-tests/proximity/ProximitySensor_insecure_context.html rename to tests/wpt/tests/proximity/ProximitySensor_insecure_context.html diff --git a/tests/wpt/web-platform-tests/proximity/idlharness.https.window.js b/tests/wpt/tests/proximity/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/proximity/idlharness.https.window.js rename to tests/wpt/tests/proximity/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/push-api/META.yml b/tests/wpt/tests/push-api/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/push-api/META.yml rename to tests/wpt/tests/push-api/META.yml diff --git a/tests/wpt/web-platform-tests/push-api/idlharness.https.any.js b/tests/wpt/tests/push-api/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/push-api/idlharness.https.any.js rename to tests/wpt/tests/push-api/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/push-api/permission.https.html b/tests/wpt/tests/push-api/permission.https.html similarity index 100% rename from tests/wpt/web-platform-tests/push-api/permission.https.html rename to tests/wpt/tests/push-api/permission.https.html diff --git a/tests/wpt/web-platform-tests/quirks/META.yml b/tests/wpt/tests/quirks/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/quirks/META.yml rename to tests/wpt/tests/quirks/META.yml diff --git a/tests/wpt/web-platform-tests/quirks/active-and-hover-manual.html b/tests/wpt/tests/quirks/active-and-hover-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/active-and-hover-manual.html rename to tests/wpt/tests/quirks/active-and-hover-manual.html diff --git a/tests/wpt/web-platform-tests/quirks/blocks-ignore-line-height.html b/tests/wpt/tests/quirks/blocks-ignore-line-height.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/blocks-ignore-line-height.html rename to tests/wpt/tests/quirks/blocks-ignore-line-height.html diff --git a/tests/wpt/web-platform-tests/quirks/body-fills-html-quirk-float.html b/tests/wpt/tests/quirks/body-fills-html-quirk-float.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/body-fills-html-quirk-float.html rename to tests/wpt/tests/quirks/body-fills-html-quirk-float.html diff --git a/tests/wpt/web-platform-tests/quirks/body-fills-html-quirk-inline.html b/tests/wpt/tests/quirks/body-fills-html-quirk-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/body-fills-html-quirk-inline.html rename to tests/wpt/tests/quirks/body-fills-html-quirk-inline.html diff --git a/tests/wpt/web-platform-tests/quirks/body-fills-html-quirk-positioned.html b/tests/wpt/tests/quirks/body-fills-html-quirk-positioned.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/body-fills-html-quirk-positioned.html rename to tests/wpt/tests/quirks/body-fills-html-quirk-positioned.html diff --git a/tests/wpt/web-platform-tests/quirks/body-fills-html-quirk-ref.html b/tests/wpt/tests/quirks/body-fills-html-quirk-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/body-fills-html-quirk-ref.html rename to tests/wpt/tests/quirks/body-fills-html-quirk-ref.html diff --git a/tests/wpt/web-platform-tests/quirks/body-fills-html-quirk-ref2.html b/tests/wpt/tests/quirks/body-fills-html-quirk-ref2.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/body-fills-html-quirk-ref2.html rename to tests/wpt/tests/quirks/body-fills-html-quirk-ref2.html diff --git a/tests/wpt/web-platform-tests/quirks/body-fills-html-quirk-vertical.html b/tests/wpt/tests/quirks/body-fills-html-quirk-vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/body-fills-html-quirk-vertical.html rename to tests/wpt/tests/quirks/body-fills-html-quirk-vertical.html diff --git a/tests/wpt/web-platform-tests/quirks/body-fills-html-quirk.html b/tests/wpt/tests/quirks/body-fills-html-quirk.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/body-fills-html-quirk.html rename to tests/wpt/tests/quirks/body-fills-html-quirk.html diff --git a/tests/wpt/web-platform-tests/quirks/classname-query-after-sibling-adoption.html b/tests/wpt/tests/quirks/classname-query-after-sibling-adoption.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/classname-query-after-sibling-adoption.html rename to tests/wpt/tests/quirks/classname-query-after-sibling-adoption.html diff --git a/tests/wpt/web-platform-tests/quirks/crashtests/list-item-whole-line-quirks-crash.html b/tests/wpt/tests/quirks/crashtests/list-item-whole-line-quirks-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/crashtests/list-item-whole-line-quirks-crash.html rename to tests/wpt/tests/quirks/crashtests/list-item-whole-line-quirks-crash.html diff --git a/tests/wpt/web-platform-tests/quirks/dd-dl-firefox-001-ref.html b/tests/wpt/tests/quirks/dd-dl-firefox-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/dd-dl-firefox-001-ref.html rename to tests/wpt/tests/quirks/dd-dl-firefox-001-ref.html diff --git a/tests/wpt/web-platform-tests/quirks/dd-dl-firefox-001.html b/tests/wpt/tests/quirks/dd-dl-firefox-001.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/dd-dl-firefox-001.html rename to tests/wpt/tests/quirks/dd-dl-firefox-001.html diff --git a/tests/wpt/web-platform-tests/quirks/hashless-hex-color/limited-quirks.html b/tests/wpt/tests/quirks/hashless-hex-color/limited-quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/hashless-hex-color/limited-quirks.html rename to tests/wpt/tests/quirks/hashless-hex-color/limited-quirks.html diff --git a/tests/wpt/web-platform-tests/quirks/hashless-hex-color/no-quirks.html b/tests/wpt/tests/quirks/hashless-hex-color/no-quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/hashless-hex-color/no-quirks.html rename to tests/wpt/tests/quirks/hashless-hex-color/no-quirks.html diff --git a/tests/wpt/web-platform-tests/quirks/hashless-hex-color/quirks.html b/tests/wpt/tests/quirks/hashless-hex-color/quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/hashless-hex-color/quirks.html rename to tests/wpt/tests/quirks/hashless-hex-color/quirks.html diff --git a/tests/wpt/web-platform-tests/quirks/hashless-hex-color/support/common.js b/tests/wpt/tests/quirks/hashless-hex-color/support/common.js similarity index 100% rename from tests/wpt/web-platform-tests/quirks/hashless-hex-color/support/common.js rename to tests/wpt/tests/quirks/hashless-hex-color/support/common.js diff --git a/tests/wpt/web-platform-tests/quirks/historical/list-item-bullet-size-ref.html b/tests/wpt/tests/quirks/historical/list-item-bullet-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/historical/list-item-bullet-size-ref.html rename to tests/wpt/tests/quirks/historical/list-item-bullet-size-ref.html diff --git a/tests/wpt/web-platform-tests/quirks/historical/list-item-bullet-size.html b/tests/wpt/tests/quirks/historical/list-item-bullet-size.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/historical/list-item-bullet-size.html rename to tests/wpt/tests/quirks/historical/list-item-bullet-size.html diff --git a/tests/wpt/web-platform-tests/quirks/historical/reference/vertical-align-in-quirks-ref.html b/tests/wpt/tests/quirks/historical/reference/vertical-align-in-quirks-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/historical/reference/vertical-align-in-quirks-ref.html rename to tests/wpt/tests/quirks/historical/reference/vertical-align-in-quirks-ref.html diff --git a/tests/wpt/web-platform-tests/quirks/historical/vertical-align-in-quirks.html b/tests/wpt/tests/quirks/historical/vertical-align-in-quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/historical/vertical-align-in-quirks.html rename to tests/wpt/tests/quirks/historical/vertical-align-in-quirks.html diff --git a/tests/wpt/web-platform-tests/quirks/html-fills-viewport-quirk-ref.html b/tests/wpt/tests/quirks/html-fills-viewport-quirk-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/html-fills-viewport-quirk-ref.html rename to tests/wpt/tests/quirks/html-fills-viewport-quirk-ref.html diff --git a/tests/wpt/web-platform-tests/quirks/html-fills-viewport-quirk-vertical.html b/tests/wpt/tests/quirks/html-fills-viewport-quirk-vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/html-fills-viewport-quirk-vertical.html rename to tests/wpt/tests/quirks/html-fills-viewport-quirk-vertical.html diff --git a/tests/wpt/web-platform-tests/quirks/html-fills-viewport-quirk.html b/tests/wpt/tests/quirks/html-fills-viewport-quirk.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/html-fills-viewport-quirk.html rename to tests/wpt/tests/quirks/html-fills-viewport-quirk.html diff --git a/tests/wpt/web-platform-tests/quirks/line-height-calculation.html b/tests/wpt/tests/quirks/line-height-calculation.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/line-height-calculation.html rename to tests/wpt/tests/quirks/line-height-calculation.html diff --git a/tests/wpt/web-platform-tests/quirks/line-height-in-list-item.tentative.html b/tests/wpt/tests/quirks/line-height-in-list-item.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/line-height-in-list-item.tentative.html rename to tests/wpt/tests/quirks/line-height-in-list-item.tentative.html diff --git a/tests/wpt/web-platform-tests/quirks/line-height-limited-quirks-mode.html b/tests/wpt/tests/quirks/line-height-limited-quirks-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/line-height-limited-quirks-mode.html rename to tests/wpt/tests/quirks/line-height-limited-quirks-mode.html diff --git a/tests/wpt/web-platform-tests/quirks/line-height-quirks-mode.html b/tests/wpt/tests/quirks/line-height-quirks-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/line-height-quirks-mode.html rename to tests/wpt/tests/quirks/line-height-quirks-mode.html diff --git a/tests/wpt/web-platform-tests/quirks/line-height-ref.html b/tests/wpt/tests/quirks/line-height-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/line-height-ref.html rename to tests/wpt/tests/quirks/line-height-ref.html diff --git a/tests/wpt/web-platform-tests/quirks/line-height-trailing-collapsable-whitespace-ref.html b/tests/wpt/tests/quirks/line-height-trailing-collapsable-whitespace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/line-height-trailing-collapsable-whitespace-ref.html rename to tests/wpt/tests/quirks/line-height-trailing-collapsable-whitespace-ref.html diff --git a/tests/wpt/web-platform-tests/quirks/line-height-trailing-collapsable-whitespace.html b/tests/wpt/tests/quirks/line-height-trailing-collapsable-whitespace.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/line-height-trailing-collapsable-whitespace.html rename to tests/wpt/tests/quirks/line-height-trailing-collapsable-whitespace.html diff --git a/tests/wpt/web-platform-tests/quirks/percentage-height-calculation.html b/tests/wpt/tests/quirks/percentage-height-calculation.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/percentage-height-calculation.html rename to tests/wpt/tests/quirks/percentage-height-calculation.html diff --git a/tests/wpt/web-platform-tests/quirks/percentage-height-quirk-excludes-flex-grid-001.html b/tests/wpt/tests/quirks/percentage-height-quirk-excludes-flex-grid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/percentage-height-quirk-excludes-flex-grid-001.html rename to tests/wpt/tests/quirks/percentage-height-quirk-excludes-flex-grid-001.html diff --git a/tests/wpt/web-platform-tests/quirks/percentage-height-quirk-excludes-flex-grid-002.html b/tests/wpt/tests/quirks/percentage-height-quirk-excludes-flex-grid-002.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/percentage-height-quirk-excludes-flex-grid-002.html rename to tests/wpt/tests/quirks/percentage-height-quirk-excludes-flex-grid-002.html diff --git a/tests/wpt/web-platform-tests/quirks/reference/green-100px-square-no-red.html b/tests/wpt/tests/quirks/reference/green-100px-square-no-red.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/reference/green-100px-square-no-red.html rename to tests/wpt/tests/quirks/reference/green-100px-square-no-red.html diff --git a/tests/wpt/web-platform-tests/quirks/reference/percentage-height-quirk-excludes-flex-grid-001-ref.html b/tests/wpt/tests/quirks/reference/percentage-height-quirk-excludes-flex-grid-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/reference/percentage-height-quirk-excludes-flex-grid-001-ref.html rename to tests/wpt/tests/quirks/reference/percentage-height-quirk-excludes-flex-grid-001-ref.html diff --git a/tests/wpt/web-platform-tests/quirks/reference/percentage-height-quirk-excludes-flex-grid-002-notref.html b/tests/wpt/tests/quirks/reference/percentage-height-quirk-excludes-flex-grid-002-notref.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/reference/percentage-height-quirk-excludes-flex-grid-002-notref.html rename to tests/wpt/tests/quirks/reference/percentage-height-quirk-excludes-flex-grid-002-notref.html diff --git a/tests/wpt/web-platform-tests/quirks/reference/percentage-height-quirk-excludes-flex-grid-002-ref.html b/tests/wpt/tests/quirks/reference/percentage-height-quirk-excludes-flex-grid-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/reference/percentage-height-quirk-excludes-flex-grid-002-ref.html rename to tests/wpt/tests/quirks/reference/percentage-height-quirk-excludes-flex-grid-002-ref.html diff --git a/tests/wpt/web-platform-tests/quirks/reference/table-cell-width-calculation-abspos-ref.html b/tests/wpt/tests/quirks/reference/table-cell-width-calculation-abspos-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/reference/table-cell-width-calculation-abspos-ref.html rename to tests/wpt/tests/quirks/reference/table-cell-width-calculation-abspos-ref.html diff --git a/tests/wpt/web-platform-tests/quirks/support/test-ref-iframe.js b/tests/wpt/tests/quirks/support/test-ref-iframe.js similarity index 100% rename from tests/wpt/web-platform-tests/quirks/support/test-ref-iframe.js rename to tests/wpt/tests/quirks/support/test-ref-iframe.js diff --git a/tests/wpt/web-platform-tests/quirks/supports.html b/tests/wpt/tests/quirks/supports.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/supports.html rename to tests/wpt/tests/quirks/supports.html diff --git a/tests/wpt/web-platform-tests/quirks/table-cell-nowrap-minimum-width-calculation.html b/tests/wpt/tests/quirks/table-cell-nowrap-minimum-width-calculation.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/table-cell-nowrap-minimum-width-calculation.html rename to tests/wpt/tests/quirks/table-cell-nowrap-minimum-width-calculation.html diff --git a/tests/wpt/web-platform-tests/quirks/table-cell-width-calculation-abspos.html b/tests/wpt/tests/quirks/table-cell-width-calculation-abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/table-cell-width-calculation-abspos.html rename to tests/wpt/tests/quirks/table-cell-width-calculation-abspos.html diff --git a/tests/wpt/web-platform-tests/quirks/table-cell-width-calculation-applies-to.html b/tests/wpt/tests/quirks/table-cell-width-calculation-applies-to.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/table-cell-width-calculation-applies-to.html rename to tests/wpt/tests/quirks/table-cell-width-calculation-applies-to.html diff --git a/tests/wpt/web-platform-tests/quirks/table-cell-width-calculation.html b/tests/wpt/tests/quirks/table-cell-width-calculation.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/table-cell-width-calculation.html rename to tests/wpt/tests/quirks/table-cell-width-calculation.html diff --git a/tests/wpt/web-platform-tests/quirks/table-replaced-descendant-percentage-height-crash.html b/tests/wpt/tests/quirks/table-replaced-descendant-percentage-height-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/table-replaced-descendant-percentage-height-crash.html rename to tests/wpt/tests/quirks/table-replaced-descendant-percentage-height-crash.html diff --git a/tests/wpt/web-platform-tests/quirks/text-decoration-doesnt-propagate-into-tables/quirks-ref.html b/tests/wpt/tests/quirks/text-decoration-doesnt-propagate-into-tables/quirks-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/text-decoration-doesnt-propagate-into-tables/quirks-ref.html rename to tests/wpt/tests/quirks/text-decoration-doesnt-propagate-into-tables/quirks-ref.html diff --git a/tests/wpt/web-platform-tests/quirks/text-decoration-doesnt-propagate-into-tables/quirks.html b/tests/wpt/tests/quirks/text-decoration-doesnt-propagate-into-tables/quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/text-decoration-doesnt-propagate-into-tables/quirks.html rename to tests/wpt/tests/quirks/text-decoration-doesnt-propagate-into-tables/quirks.html diff --git a/tests/wpt/web-platform-tests/quirks/text-decoration-doesnt-propagate-into-tables/standards-ref.html b/tests/wpt/tests/quirks/text-decoration-doesnt-propagate-into-tables/standards-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/text-decoration-doesnt-propagate-into-tables/standards-ref.html rename to tests/wpt/tests/quirks/text-decoration-doesnt-propagate-into-tables/standards-ref.html diff --git a/tests/wpt/web-platform-tests/quirks/text-decoration-doesnt-propagate-into-tables/standards.html b/tests/wpt/tests/quirks/text-decoration-doesnt-propagate-into-tables/standards.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/text-decoration-doesnt-propagate-into-tables/standards.html rename to tests/wpt/tests/quirks/text-decoration-doesnt-propagate-into-tables/standards.html diff --git a/tests/wpt/web-platform-tests/quirks/unitless-length/excluded-properties-001.html b/tests/wpt/tests/quirks/unitless-length/excluded-properties-001.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/unitless-length/excluded-properties-001.html rename to tests/wpt/tests/quirks/unitless-length/excluded-properties-001.html diff --git a/tests/wpt/web-platform-tests/quirks/unitless-length/excluded-properties-002.html b/tests/wpt/tests/quirks/unitless-length/excluded-properties-002.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/unitless-length/excluded-properties-002.html rename to tests/wpt/tests/quirks/unitless-length/excluded-properties-002.html diff --git a/tests/wpt/web-platform-tests/quirks/unitless-length/excluded-properties-003.html b/tests/wpt/tests/quirks/unitless-length/excluded-properties-003.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/unitless-length/excluded-properties-003.html rename to tests/wpt/tests/quirks/unitless-length/excluded-properties-003.html diff --git a/tests/wpt/web-platform-tests/quirks/unitless-length/limited-quirks.html b/tests/wpt/tests/quirks/unitless-length/limited-quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/unitless-length/limited-quirks.html rename to tests/wpt/tests/quirks/unitless-length/limited-quirks.html diff --git a/tests/wpt/web-platform-tests/quirks/unitless-length/no-quirks.html b/tests/wpt/tests/quirks/unitless-length/no-quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/unitless-length/no-quirks.html rename to tests/wpt/tests/quirks/unitless-length/no-quirks.html diff --git a/tests/wpt/web-platform-tests/quirks/unitless-length/quirks.html b/tests/wpt/tests/quirks/unitless-length/quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/quirks/unitless-length/quirks.html rename to tests/wpt/tests/quirks/unitless-length/quirks.html diff --git a/tests/wpt/web-platform-tests/quirks/unitless-length/support/common.js b/tests/wpt/tests/quirks/unitless-length/support/common.js similarity index 100% rename from tests/wpt/web-platform-tests/quirks/unitless-length/support/common.js rename to tests/wpt/tests/quirks/unitless-length/support/common.js diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html b/tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/generic/test-case.sub.js b/tests/wpt/tests/referrer-policy/4K+1/generic/test-case.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/generic/test-case.sub.js rename to tests/wpt/tests/referrer-policy/4K+1/generic/test-case.sub.js diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/spec.src.json b/tests/wpt/tests/referrer-policy/4K+1/spec.src.json similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K+1/spec.src.json rename to tests/wpt/tests/referrer-policy/4K+1/spec.src.json diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html b/tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/generic/test-case.sub.js b/tests/wpt/tests/referrer-policy/4K-1/generic/test-case.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/generic/test-case.sub.js rename to tests/wpt/tests/referrer-policy/4K-1/generic/test-case.sub.js diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/spec.src.json b/tests/wpt/tests/referrer-policy/4K-1/spec.src.json similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K-1/spec.src.json rename to tests/wpt/tests/referrer-policy/4K-1/spec.src.json diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/fetch.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/fetch.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/xhr.http.html b/tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/xhr.http.html rename to tests/wpt/tests/referrer-policy/4K/gen/top.meta/unset/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/generic/test-case.sub.js b/tests/wpt/tests/referrer-policy/4K/generic/test-case.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/generic/test-case.sub.js rename to tests/wpt/tests/referrer-policy/4K/generic/test-case.sub.js diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/spec.src.json b/tests/wpt/tests/referrer-policy/4K/spec.src.json similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/4K/spec.src.json rename to tests/wpt/tests/referrer-policy/4K/spec.src.json diff --git a/tests/wpt/web-platform-tests/referrer-policy/META.yml b/tests/wpt/tests/referrer-policy/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/META.yml rename to tests/wpt/tests/referrer-policy/META.yml diff --git a/tests/wpt/web-platform-tests/referrer-policy/README.md b/tests/wpt/tests/referrer-policy/README.md similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/README.md rename to tests/wpt/tests/referrer-policy/README.md diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/README.md b/tests/wpt/tests/referrer-policy/css-integration/README.md similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/README.md rename to tests/wpt/tests/referrer-policy/css-integration/README.md diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html b/tests/wpt/tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html rename to tests/wpt/tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet-with-differentorigin-base-url-from-preload.tentative.html b/tests/wpt/tests/referrer-policy/css-integration/child-css/internal-import-stylesheet-with-differentorigin-base-url-from-preload.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet-with-differentorigin-base-url-from-preload.tentative.html rename to tests/wpt/tests/referrer-policy/css-integration/child-css/internal-import-stylesheet-with-differentorigin-base-url-from-preload.tentative.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet-with-differentorigin-base-url.tentative.html b/tests/wpt/tests/referrer-policy/css-integration/child-css/internal-import-stylesheet-with-differentorigin-base-url.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet-with-differentorigin-base-url.tentative.html rename to tests/wpt/tests/referrer-policy/css-integration/child-css/internal-import-stylesheet-with-differentorigin-base-url.tentative.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html b/tests/wpt/tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html rename to tests/wpt/tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html b/tests/wpt/tests/referrer-policy/css-integration/child-css/processing-instruction.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html rename to tests/wpt/tests/referrer-policy/css-integration/child-css/processing-instruction.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/css-test-helper.js b/tests/wpt/tests/referrer-policy/css-integration/css-test-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/css-test-helper.js rename to tests/wpt/tests/referrer-policy/css-integration/css-test-helper.js diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html b/tests/wpt/tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html rename to tests/wpt/tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html b/tests/wpt/tests/referrer-policy/css-integration/font-face/external-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html rename to tests/wpt/tests/referrer-policy/css-integration/font-face/external-stylesheet.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html b/tests/wpt/tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html rename to tests/wpt/tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html b/tests/wpt/tests/referrer-policy/css-integration/font-face/internal-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html rename to tests/wpt/tests/referrer-policy/css-integration/font-face/internal-stylesheet.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html b/tests/wpt/tests/referrer-policy/css-integration/font-face/processing-instruction.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html rename to tests/wpt/tests/referrer-policy/css-integration/font-face/processing-instruction.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html b/tests/wpt/tests/referrer-policy/css-integration/image/external-import-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html rename to tests/wpt/tests/referrer-policy/css-integration/image/external-import-stylesheet.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html b/tests/wpt/tests/referrer-policy/css-integration/image/external-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html rename to tests/wpt/tests/referrer-policy/css-integration/image/external-stylesheet.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style-with-differentorigin-base-tag.tentative.html b/tests/wpt/tests/referrer-policy/css-integration/image/inline-style-with-differentorigin-base-tag.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style-with-differentorigin-base-tag.tentative.html rename to tests/wpt/tests/referrer-policy/css-integration/image/inline-style-with-differentorigin-base-tag.tentative.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html b/tests/wpt/tests/referrer-policy/css-integration/image/inline-style.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html rename to tests/wpt/tests/referrer-policy/css-integration/image/inline-style.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html b/tests/wpt/tests/referrer-policy/css-integration/image/internal-import-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html rename to tests/wpt/tests/referrer-policy/css-integration/image/internal-import-stylesheet.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html b/tests/wpt/tests/referrer-policy/css-integration/image/internal-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html rename to tests/wpt/tests/referrer-policy/css-integration/image/internal-stylesheet.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html b/tests/wpt/tests/referrer-policy/css-integration/image/presentation-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html rename to tests/wpt/tests/referrer-policy/css-integration/image/presentation-attribute.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html b/tests/wpt/tests/referrer-policy/css-integration/image/processing-instruction.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html rename to tests/wpt/tests/referrer-policy/css-integration/image/processing-instruction.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/external-stylesheet.html b/tests/wpt/tests/referrer-policy/css-integration/svg/external-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/external-stylesheet.html rename to tests/wpt/tests/referrer-policy/css-integration/svg/external-stylesheet.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style-with-differentorigin-base-tag.tentative.html b/tests/wpt/tests/referrer-policy/css-integration/svg/inline-style-with-differentorigin-base-tag.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style-with-differentorigin-base-tag.tentative.html rename to tests/wpt/tests/referrer-policy/css-integration/svg/inline-style-with-differentorigin-base-tag.tentative.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style.html b/tests/wpt/tests/referrer-policy/css-integration/svg/inline-style.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style.html rename to tests/wpt/tests/referrer-policy/css-integration/svg/inline-style.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/internal-stylesheet.html b/tests/wpt/tests/referrer-policy/css-integration/svg/internal-stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/internal-stylesheet.html rename to tests/wpt/tests/referrer-policy/css-integration/svg/internal-stylesheet.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/presentation-attribute.html b/tests/wpt/tests/referrer-policy/css-integration/svg/presentation-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/presentation-attribute.html rename to tests/wpt/tests/referrer-policy/css-integration/svg/presentation-attribute.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/processing-instruction.html b/tests/wpt/tests/referrer-policy/css-integration/svg/processing-instruction.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/processing-instruction.html rename to tests/wpt/tests/referrer-policy/css-integration/svg/processing-instruction.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/always/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/always/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/always/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/always/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/always/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/always/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/always/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/always/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/always/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/always/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/always/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/always/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/always/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/always/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/always/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/always/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/always/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/always/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/always/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/always/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/always/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/default/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/default/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/default/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/default/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/default/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/default/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/default/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/default/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/default/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/default/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/default/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/default/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/default/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/default/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/default/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/default/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/default/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/default/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/default/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/default/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/default/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/never/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/never/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/never/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/never/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/never/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/never/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/never/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/never/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/never/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/never/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/never/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/never/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/never/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/never/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/never/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/never/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/never/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/never/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/never/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/never/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/never/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/iframe.meta/unset/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/no-referrer/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/same-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/same-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/same-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/same-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/same-origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/same-origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/same-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/same-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/strict-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/always/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/always/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/default/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/default/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/never/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/never/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/always/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/always/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/default/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/default/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/never/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/never/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/no-referrer/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/strict-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag-dynamic-import.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag-dynamic-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag-dynamic-import.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag-dynamic-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag-dynamic-import.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag-dynamic-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag-dynamic-import.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag-dynamic-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag-dynamic-import.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag-dynamic-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag-dynamic-import.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag-dynamic-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag-dynamic-import.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/script-tag-dynamic-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag-dynamic-import.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/script-tag-dynamic-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag-dynamic-import.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag-dynamic-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag-dynamic-import.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag-dynamic-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag-dynamic-import.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag-dynamic-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag-dynamic-import.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag-dynamic-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag-dynamic-import.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag-dynamic-import.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag-dynamic-import.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag-dynamic-import.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html.headers b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html.headers rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.http-rp/unset/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/always/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/always/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/always/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/always/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/always/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/always/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/always/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/always/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/always/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/always/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/always/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/always/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/always/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/always/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/always/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/always/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/always/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/always/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/always/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/always/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/always/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/always/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/always/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/default/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/default/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/default/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/default/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/default/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/default/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/default/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/default/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/default/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/default/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/default/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/default/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/default/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/default/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/default/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/default/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/default/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/default/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/default/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/default/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/default/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/default/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/default/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/never/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/never/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/never/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/never/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/never/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/never/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/never/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/never/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/never/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/never/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/never/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/never/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/never/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/never/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/never/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/never/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/never/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/never/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/never/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/never/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/never/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/never/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/never/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/no-referrer/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-crossorigin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/strict-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unset/a-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unset/a-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unset/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unset/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unset/iframe-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unset/iframe-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unset/img-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unset/img-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag-dynamic-import.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unset/script-tag-dynamic-import.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag-dynamic-import.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unset/script-tag-dynamic-import.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unset/script-tag.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unset/script-tag.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unset/sharedworker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unset/sharedworker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unset/sharedworker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unset/sharedworker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unset/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unset/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unset/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unset/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/top.meta/unset/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/top.meta/unset/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-module.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unset/worker-module.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-module.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unset/worker-module.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html b/tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html rename to tests/wpt/tests/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/first-meta-changed-after-second-added.http.html b/tests/wpt/tests/referrer-policy/generic/first-meta-changed-after-second-added.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/first-meta-changed-after-second-added.http.html rename to tests/wpt/tests/referrer-policy/generic/first-meta-changed-after-second-added.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-src-change.html b/tests/wpt/tests/referrer-policy/generic/iframe-src-change.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/iframe-src-change.html rename to tests/wpt/tests/referrer-policy/generic/iframe-src-change.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-upgrade-request-to-cross-origin.sub.html b/tests/wpt/tests/referrer-policy/generic/iframe-upgrade-request-to-cross-origin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/iframe-upgrade-request-to-cross-origin.sub.html rename to tests/wpt/tests/referrer-policy/generic/iframe-upgrade-request-to-cross-origin.sub.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-upgrade-request-to-cross-origin.sub.html.headers b/tests/wpt/tests/referrer-policy/generic/iframe-upgrade-request-to-cross-origin.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/iframe-upgrade-request-to-cross-origin.sub.html.headers rename to tests/wpt/tests/referrer-policy/generic/iframe-upgrade-request-to-cross-origin.sub.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-upgrade-request-to-same-origin.sub.https.html b/tests/wpt/tests/referrer-policy/generic/iframe-upgrade-request-to-same-origin.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/iframe-upgrade-request-to-same-origin.sub.https.html rename to tests/wpt/tests/referrer-policy/generic/iframe-upgrade-request-to-same-origin.sub.https.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-upgrade-request-to-same-origin.sub.https.html.headers b/tests/wpt/tests/referrer-policy/generic/iframe-upgrade-request-to-same-origin.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/iframe-upgrade-request-to-same-origin.sub.https.html.headers rename to tests/wpt/tests/referrer-policy/generic/iframe-upgrade-request-to-same-origin.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html b/tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html rename to tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-data.html b/tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-data.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-data.html rename to tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-data.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-document-write.html b/tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-document-write.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-document-write.html rename to tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-document-write.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-history-about-blank.html b/tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-history-about-blank.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-history-about-blank.html rename to tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-history-about-blank.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-history-about-srcdoc.html b/tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-history-about-srcdoc.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-history-about-srcdoc.html rename to tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-history-about-srcdoc.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html b/tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html rename to tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html b/tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html rename to tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc-child.html b/tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc-child.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc-child.html rename to tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc-child.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html b/tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html rename to tests/wpt/tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/popup-inheritance-about-blank.html b/tests/wpt/tests/referrer-policy/generic/inheritance/popup-inheritance-about-blank.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/popup-inheritance-about-blank.html rename to tests/wpt/tests/referrer-policy/generic/inheritance/popup-inheritance-about-blank.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/popup-inheritance-form-submission.html b/tests/wpt/tests/referrer-policy/generic/inheritance/popup-inheritance-form-submission.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/popup-inheritance-form-submission.html rename to tests/wpt/tests/referrer-policy/generic/inheritance/popup-inheritance-form-submission.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/resources/make-html-script.js b/tests/wpt/tests/referrer-policy/generic/inheritance/resources/make-html-script.js similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/resources/make-html-script.js rename to tests/wpt/tests/referrer-policy/generic/inheritance/resources/make-html-script.js diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/resources/submit-form-and-remove-frame.html b/tests/wpt/tests/referrer-policy/generic/inheritance/resources/submit-form-and-remove-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/resources/submit-form-and-remove-frame.html rename to tests/wpt/tests/referrer-policy/generic/inheritance/resources/submit-form-and-remove-frame.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/workers.html b/tests/wpt/tests/referrer-policy/generic/inheritance/workers.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/workers.html rename to tests/wpt/tests/referrer-policy/generic/inheritance/workers.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/link-rel-prefetch.html b/tests/wpt/tests/referrer-policy/generic/link-rel-prefetch.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/link-rel-prefetch.html rename to tests/wpt/tests/referrer-policy/generic/link-rel-prefetch.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/meta-referrer-outofhead-fetch.http.html b/tests/wpt/tests/referrer-policy/generic/meta-referrer-outofhead-fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/meta-referrer-outofhead-fetch.http.html rename to tests/wpt/tests/referrer-policy/generic/meta-referrer-outofhead-fetch.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/meta-referrer-removed-1.http.html b/tests/wpt/tests/referrer-policy/generic/meta-referrer-removed-1.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/meta-referrer-removed-1.http.html rename to tests/wpt/tests/referrer-policy/generic/meta-referrer-removed-1.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/meta-referrer-removed-2.http.html b/tests/wpt/tests/referrer-policy/generic/meta-referrer-removed-2.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/meta-referrer-removed-2.http.html rename to tests/wpt/tests/referrer-policy/generic/meta-referrer-removed-2.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/meta-tag-in-svg-image.html b/tests/wpt/tests/referrer-policy/generic/meta-tag-in-svg-image.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/meta-tag-in-svg-image.html rename to tests/wpt/tests/referrer-policy/generic/meta-tag-in-svg-image.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html b/tests/wpt/tests/referrer-policy/generic/multiple-headers-and-values.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html rename to tests/wpt/tests/referrer-policy/generic/multiple-headers-and-values.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html.headers b/tests/wpt/tests/referrer-policy/generic/multiple-headers-and-values.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html.headers rename to tests/wpt/tests/referrer-policy/generic/multiple-headers-and-values.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html b/tests/wpt/tests/referrer-policy/generic/multiple-headers-combined.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html rename to tests/wpt/tests/referrer-policy/generic/multiple-headers-combined.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html.headers b/tests/wpt/tests/referrer-policy/generic/multiple-headers-combined.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html.headers rename to tests/wpt/tests/referrer-policy/generic/multiple-headers-combined.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html b/tests/wpt/tests/referrer-policy/generic/multiple-headers-one-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html rename to tests/wpt/tests/referrer-policy/generic/multiple-headers-one-invalid.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html.headers b/tests/wpt/tests/referrer-policy/generic/multiple-headers-one-invalid.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html.headers rename to tests/wpt/tests/referrer-policy/generic/multiple-headers-one-invalid.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html b/tests/wpt/tests/referrer-policy/generic/multiple-headers-one-unknown-token.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html rename to tests/wpt/tests/referrer-policy/generic/multiple-headers-one-unknown-token.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html.headers b/tests/wpt/tests/referrer-policy/generic/multiple-headers-one-unknown-token.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html.headers rename to tests/wpt/tests/referrer-policy/generic/multiple-headers-one-unknown-token.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html b/tests/wpt/tests/referrer-policy/generic/multiple-headers.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html rename to tests/wpt/tests/referrer-policy/generic/multiple-headers.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html.headers b/tests/wpt/tests/referrer-policy/generic/multiple-headers.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html.headers rename to tests/wpt/tests/referrer-policy/generic/multiple-headers.html.headers diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/resources/img-with-referrer-policy.svg b/tests/wpt/tests/referrer-policy/generic/resources/img-with-referrer-policy.svg similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/resources/img-with-referrer-policy.svg rename to tests/wpt/tests/referrer-policy/generic/resources/img-with-referrer-policy.svg diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/resources/referrer.py b/tests/wpt/tests/referrer-policy/generic/resources/referrer.py similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/resources/referrer.py rename to tests/wpt/tests/referrer-policy/generic/resources/referrer.py diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html b/tests/wpt/tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html rename to tests/wpt/tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/sanity-checker.js b/tests/wpt/tests/referrer-policy/generic/sanity-checker.js similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/sanity-checker.js rename to tests/wpt/tests/referrer-policy/generic/sanity-checker.js diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/second-meta-referrer-added-before-first.http.html b/tests/wpt/tests/referrer-policy/generic/second-meta-referrer-added-before-first.http.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/second-meta-referrer-added-before-first.http.html rename to tests/wpt/tests/referrer-policy/generic/second-meta-referrer-added-before-first.http.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html b/tests/wpt/tests/referrer-policy/generic/subresource-test/area-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html rename to tests/wpt/tests/referrer-policy/generic/subresource-test/area-navigate.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html b/tests/wpt/tests/referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html rename to tests/wpt/tests/referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html b/tests/wpt/tests/referrer-policy/generic/subresource-test/fetch-messaging.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html rename to tests/wpt/tests/referrer-policy/generic/subresource-test/fetch-messaging.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html b/tests/wpt/tests/referrer-policy/generic/subresource-test/iframe-messaging.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html rename to tests/wpt/tests/referrer-policy/generic/subresource-test/iframe-messaging.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html b/tests/wpt/tests/referrer-policy/generic/subresource-test/image-decoding.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html rename to tests/wpt/tests/referrer-policy/generic/subresource-test/image-decoding.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html b/tests/wpt/tests/referrer-policy/generic/subresource-test/link-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html rename to tests/wpt/tests/referrer-policy/generic/subresource-test/link-navigate.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html b/tests/wpt/tests/referrer-policy/generic/subresource-test/script-messaging.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html rename to tests/wpt/tests/referrer-policy/generic/subresource-test/script-messaging.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html b/tests/wpt/tests/referrer-policy/generic/subresource-test/worker-messaging.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html rename to tests/wpt/tests/referrer-policy/generic/subresource-test/worker-messaging.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html b/tests/wpt/tests/referrer-policy/generic/subresource-test/xhr-messaging.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html rename to tests/wpt/tests/referrer-policy/generic/subresource-test/xhr-messaging.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/test-case.sub.js b/tests/wpt/tests/referrer-policy/generic/test-case.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/test-case.sub.js rename to tests/wpt/tests/referrer-policy/generic/test-case.sub.js diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html b/tests/wpt/tests/referrer-policy/generic/unsupported-csp-referrer-directive.html similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html rename to tests/wpt/tests/referrer-policy/generic/unsupported-csp-referrer-directive.html diff --git a/tests/wpt/web-platform-tests/referrer-policy/spec.src.json b/tests/wpt/tests/referrer-policy/spec.src.json similarity index 100% rename from tests/wpt/web-platform-tests/referrer-policy/spec.src.json rename to tests/wpt/tests/referrer-policy/spec.src.json diff --git a/tests/wpt/web-platform-tests/remote-playback/META.yml b/tests/wpt/tests/remote-playback/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/remote-playback/META.yml rename to tests/wpt/tests/remote-playback/META.yml diff --git a/tests/wpt/web-platform-tests/remote-playback/README.md b/tests/wpt/tests/remote-playback/README.md similarity index 100% rename from tests/wpt/web-platform-tests/remote-playback/README.md rename to tests/wpt/tests/remote-playback/README.md diff --git a/tests/wpt/web-platform-tests/remote-playback/cancel-watch-availability.html b/tests/wpt/tests/remote-playback/cancel-watch-availability.html similarity index 100% rename from tests/wpt/web-platform-tests/remote-playback/cancel-watch-availability.html rename to tests/wpt/tests/remote-playback/cancel-watch-availability.html diff --git a/tests/wpt/web-platform-tests/remote-playback/disable-remote-playback-cancel-watch-availability-throws.html b/tests/wpt/tests/remote-playback/disable-remote-playback-cancel-watch-availability-throws.html similarity index 100% rename from tests/wpt/web-platform-tests/remote-playback/disable-remote-playback-cancel-watch-availability-throws.html rename to tests/wpt/tests/remote-playback/disable-remote-playback-cancel-watch-availability-throws.html diff --git a/tests/wpt/web-platform-tests/remote-playback/disable-remote-playback-prompt-throws.html b/tests/wpt/tests/remote-playback/disable-remote-playback-prompt-throws.html similarity index 100% rename from tests/wpt/web-platform-tests/remote-playback/disable-remote-playback-prompt-throws.html rename to tests/wpt/tests/remote-playback/disable-remote-playback-prompt-throws.html diff --git a/tests/wpt/web-platform-tests/remote-playback/disable-remote-playback-watch-availability-throws.html b/tests/wpt/tests/remote-playback/disable-remote-playback-watch-availability-throws.html similarity index 100% rename from tests/wpt/web-platform-tests/remote-playback/disable-remote-playback-watch-availability-throws.html rename to tests/wpt/tests/remote-playback/disable-remote-playback-watch-availability-throws.html diff --git a/tests/wpt/web-platform-tests/remote-playback/idlharness.window.js b/tests/wpt/tests/remote-playback/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/remote-playback/idlharness.window.js rename to tests/wpt/tests/remote-playback/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/remote-playback/prompt-in-detached-iframe.html b/tests/wpt/tests/remote-playback/prompt-in-detached-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/remote-playback/prompt-in-detached-iframe.html rename to tests/wpt/tests/remote-playback/prompt-in-detached-iframe.html diff --git a/tests/wpt/web-platform-tests/remote-playback/watch-availability-initial-callback.html b/tests/wpt/tests/remote-playback/watch-availability-initial-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/remote-playback/watch-availability-initial-callback.html rename to tests/wpt/tests/remote-playback/watch-availability-initial-callback.html diff --git a/tests/wpt/web-platform-tests/reporting/META.yml b/tests/wpt/tests/reporting/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/reporting/META.yml rename to tests/wpt/tests/reporting/META.yml diff --git a/tests/wpt/web-platform-tests/reporting/README.md b/tests/wpt/tests/reporting/README.md similarity index 100% rename from tests/wpt/web-platform-tests/reporting/README.md rename to tests/wpt/tests/reporting/README.md diff --git a/tests/wpt/web-platform-tests/reporting/bufferSize.html b/tests/wpt/tests/reporting/bufferSize.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/bufferSize.html rename to tests/wpt/tests/reporting/bufferSize.html diff --git a/tests/wpt/web-platform-tests/reporting/cross-origin-report-no-credentials.https.sub.html b/tests/wpt/tests/reporting/cross-origin-report-no-credentials.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/cross-origin-report-no-credentials.https.sub.html rename to tests/wpt/tests/reporting/cross-origin-report-no-credentials.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/cross-origin-report-no-credentials.https.sub.html.sub.headers b/tests/wpt/tests/reporting/cross-origin-report-no-credentials.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/cross-origin-report-no-credentials.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/cross-origin-report-no-credentials.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/cross-origin-reports-isolated.https.sub.html b/tests/wpt/tests/reporting/cross-origin-reports-isolated.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/cross-origin-reports-isolated.https.sub.html rename to tests/wpt/tests/reporting/cross-origin-reports-isolated.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/cross-origin-reports-isolated.https.sub.html.sub.headers b/tests/wpt/tests/reporting/cross-origin-reports-isolated.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/cross-origin-reports-isolated.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/cross-origin-reports-isolated.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/cross-origin-same-site-credentials.https.sub.html b/tests/wpt/tests/reporting/cross-origin-same-site-credentials.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/cross-origin-same-site-credentials.https.sub.html rename to tests/wpt/tests/reporting/cross-origin-same-site-credentials.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/disconnect.html b/tests/wpt/tests/reporting/disconnect.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/disconnect.html rename to tests/wpt/tests/reporting/disconnect.html diff --git a/tests/wpt/web-platform-tests/reporting/document-reporting-bypass-report-to.https.sub.html b/tests/wpt/tests/reporting/document-reporting-bypass-report-to.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/document-reporting-bypass-report-to.https.sub.html rename to tests/wpt/tests/reporting/document-reporting-bypass-report-to.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/document-reporting-bypass-report-to.https.sub.html.sub.headers b/tests/wpt/tests/reporting/document-reporting-bypass-report-to.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/document-reporting-bypass-report-to.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/document-reporting-bypass-report-to.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/document-reporting-default-endpoint.https.sub.html b/tests/wpt/tests/reporting/document-reporting-default-endpoint.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/document-reporting-default-endpoint.https.sub.html rename to tests/wpt/tests/reporting/document-reporting-default-endpoint.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/document-reporting-default-endpoint.https.sub.html.sub.headers b/tests/wpt/tests/reporting/document-reporting-default-endpoint.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/document-reporting-default-endpoint.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/document-reporting-default-endpoint.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/document-reporting-destroy-after-document-close.https.sub.html b/tests/wpt/tests/reporting/document-reporting-destroy-after-document-close.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/document-reporting-destroy-after-document-close.https.sub.html rename to tests/wpt/tests/reporting/document-reporting-destroy-after-document-close.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/document-reporting-named-endpoints.https.sub.html b/tests/wpt/tests/reporting/document-reporting-named-endpoints.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/document-reporting-named-endpoints.https.sub.html rename to tests/wpt/tests/reporting/document-reporting-named-endpoints.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/document-reporting-named-endpoints.https.sub.html.sub.headers b/tests/wpt/tests/reporting/document-reporting-named-endpoints.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/document-reporting-named-endpoints.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/document-reporting-named-endpoints.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/document-reporting-not-batch-different-document.https.html b/tests/wpt/tests/reporting/document-reporting-not-batch-different-document.https.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/document-reporting-not-batch-different-document.https.html rename to tests/wpt/tests/reporting/document-reporting-not-batch-different-document.https.html diff --git a/tests/wpt/web-platform-tests/reporting/document-reporting-override-endpoint.https.sub.html b/tests/wpt/tests/reporting/document-reporting-override-endpoint.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/document-reporting-override-endpoint.https.sub.html rename to tests/wpt/tests/reporting/document-reporting-override-endpoint.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/document-reporting-override-endpoint.https.sub.html.sub.headers b/tests/wpt/tests/reporting/document-reporting-override-endpoint.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/document-reporting-override-endpoint.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/document-reporting-override-endpoint.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/document-reporting-path-absolute.https.sub.html b/tests/wpt/tests/reporting/document-reporting-path-absolute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/document-reporting-path-absolute.https.sub.html rename to tests/wpt/tests/reporting/document-reporting-path-absolute.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/document-reporting-path-absolute.https.sub.html.sub.headers b/tests/wpt/tests/reporting/document-reporting-path-absolute.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/document-reporting-path-absolute.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/document-reporting-path-absolute.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/generateTestReport-honors-endpoint.https.sub.html b/tests/wpt/tests/reporting/generateTestReport-honors-endpoint.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/generateTestReport-honors-endpoint.https.sub.html rename to tests/wpt/tests/reporting/generateTestReport-honors-endpoint.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/generateTestReport-honors-endpoint.https.sub.html.sub.headers b/tests/wpt/tests/reporting/generateTestReport-honors-endpoint.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/generateTestReport-honors-endpoint.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/generateTestReport-honors-endpoint.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/generateTestReport.html b/tests/wpt/tests/reporting/generateTestReport.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/generateTestReport.html rename to tests/wpt/tests/reporting/generateTestReport.html diff --git a/tests/wpt/web-platform-tests/reporting/idlharness.any.js b/tests/wpt/tests/reporting/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/reporting/idlharness.any.js rename to tests/wpt/tests/reporting/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/reporting/nestedReport.html b/tests/wpt/tests/reporting/nestedReport.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/nestedReport.html rename to tests/wpt/tests/reporting/nestedReport.html diff --git a/tests/wpt/web-platform-tests/reporting/order.html b/tests/wpt/tests/reporting/order.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/order.html rename to tests/wpt/tests/reporting/order.html diff --git a/tests/wpt/web-platform-tests/reporting/reporting-api-honors-limits.https.sub.html b/tests/wpt/tests/reporting/reporting-api-honors-limits.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/reporting-api-honors-limits.https.sub.html rename to tests/wpt/tests/reporting/reporting-api-honors-limits.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/reporting-api-honors-limits.https.sub.html.sub.headers b/tests/wpt/tests/reporting/reporting-api-honors-limits.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/reporting-api-honors-limits.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/reporting-api-honors-limits.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/reporting-isolated-across-navigations.https.sub.html b/tests/wpt/tests/reporting/reporting-isolated-across-navigations.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/reporting-isolated-across-navigations.https.sub.html rename to tests/wpt/tests/reporting/reporting-isolated-across-navigations.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/resources/README.md b/tests/wpt/tests/reporting/resources/README.md similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/README.md rename to tests/wpt/tests/reporting/resources/README.md diff --git a/tests/wpt/web-platform-tests/reporting/resources/csp-error.https.sub.html b/tests/wpt/tests/reporting/resources/csp-error.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/csp-error.https.sub.html rename to tests/wpt/tests/reporting/resources/csp-error.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/resources/csp-error.https.sub.html.sub.headers b/tests/wpt/tests/reporting/resources/csp-error.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/csp-error.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/resources/csp-error.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/resources/fail.png b/tests/wpt/tests/reporting/resources/fail.png similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/fail.png rename to tests/wpt/tests/reporting/resources/fail.png diff --git a/tests/wpt/web-platform-tests/reporting/resources/first-csp-report.https.sub.html b/tests/wpt/tests/reporting/resources/first-csp-report.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/first-csp-report.https.sub.html rename to tests/wpt/tests/reporting/resources/first-csp-report.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/resources/first-csp-report.https.sub.html.sub.headers b/tests/wpt/tests/reporting/resources/first-csp-report.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/first-csp-report.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/resources/first-csp-report.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/resources/generate-csp-report.https.sub.html b/tests/wpt/tests/reporting/resources/generate-csp-report.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/generate-csp-report.https.sub.html rename to tests/wpt/tests/reporting/resources/generate-csp-report.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/resources/generate-csp-report.https.sub.html.sub.headers b/tests/wpt/tests/reporting/resources/generate-csp-report.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/generate-csp-report.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/resources/generate-csp-report.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/resources/generate-report-once.py b/tests/wpt/tests/reporting/resources/generate-report-once.py similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/generate-report-once.py rename to tests/wpt/tests/reporting/resources/generate-report-once.py diff --git a/tests/wpt/web-platform-tests/reporting/resources/generate-report.https.sub.html b/tests/wpt/tests/reporting/resources/generate-report.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/generate-report.https.sub.html rename to tests/wpt/tests/reporting/resources/generate-report.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/resources/middle-frame.https.sub.html b/tests/wpt/tests/reporting/resources/middle-frame.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/middle-frame.https.sub.html rename to tests/wpt/tests/reporting/resources/middle-frame.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/resources/report-helper.js b/tests/wpt/tests/reporting/resources/report-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/report-helper.js rename to tests/wpt/tests/reporting/resources/report-helper.js diff --git a/tests/wpt/web-platform-tests/reporting/resources/report.py b/tests/wpt/tests/reporting/resources/report.py similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/report.py rename to tests/wpt/tests/reporting/resources/report.py diff --git a/tests/wpt/web-platform-tests/reporting/resources/same-origin-report.https.sub.html b/tests/wpt/tests/reporting/resources/same-origin-report.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/same-origin-report.https.sub.html rename to tests/wpt/tests/reporting/resources/same-origin-report.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/resources/same-origin-report.https.sub.html.sub.headers b/tests/wpt/tests/reporting/resources/same-origin-report.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/same-origin-report.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/resources/same-origin-report.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/resources/second-csp-report.https.sub.html b/tests/wpt/tests/reporting/resources/second-csp-report.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/second-csp-report.https.sub.html rename to tests/wpt/tests/reporting/resources/second-csp-report.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/resources/second-csp-report.https.sub.html.sub.headers b/tests/wpt/tests/reporting/resources/second-csp-report.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/resources/second-csp-report.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/resources/second-csp-report.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/same-origin-cross-site-credentials.https.sub.html b/tests/wpt/tests/reporting/same-origin-cross-site-credentials.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/same-origin-cross-site-credentials.https.sub.html rename to tests/wpt/tests/reporting/same-origin-cross-site-credentials.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/same-origin-report-credentials.https.sub.html b/tests/wpt/tests/reporting/same-origin-report-credentials.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/same-origin-report-credentials.https.sub.html rename to tests/wpt/tests/reporting/same-origin-report-credentials.https.sub.html diff --git a/tests/wpt/web-platform-tests/reporting/same-origin-report-credentials.https.sub.html.sub.headers b/tests/wpt/tests/reporting/same-origin-report-credentials.https.sub.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/reporting/same-origin-report-credentials.https.sub.html.sub.headers rename to tests/wpt/tests/reporting/same-origin-report-credentials.https.sub.html.sub.headers diff --git a/tests/wpt/web-platform-tests/reporting/same-origin-same-site-credentials.https.sub.html b/tests/wpt/tests/reporting/same-origin-same-site-credentials.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/reporting/same-origin-same-site-credentials.https.sub.html rename to tests/wpt/tests/reporting/same-origin-same-site-credentials.https.sub.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/META.yml b/tests/wpt/tests/requestidlecallback/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/META.yml rename to tests/wpt/tests/requestidlecallback/META.yml diff --git a/tests/wpt/web-platform-tests/requestidlecallback/basic.html b/tests/wpt/tests/requestidlecallback/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/basic.html rename to tests/wpt/tests/requestidlecallback/basic.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/callback-exception.html b/tests/wpt/tests/requestidlecallback/callback-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/callback-exception.html rename to tests/wpt/tests/requestidlecallback/callback-exception.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/callback-idle-periods.html b/tests/wpt/tests/requestidlecallback/callback-idle-periods.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/callback-idle-periods.html rename to tests/wpt/tests/requestidlecallback/callback-idle-periods.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/callback-iframe.html b/tests/wpt/tests/requestidlecallback/callback-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/callback-iframe.html rename to tests/wpt/tests/requestidlecallback/callback-iframe.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/callback-invoked.html b/tests/wpt/tests/requestidlecallback/callback-invoked.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/callback-invoked.html rename to tests/wpt/tests/requestidlecallback/callback-invoked.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/callback-multiple-calls.html b/tests/wpt/tests/requestidlecallback/callback-multiple-calls.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/callback-multiple-calls.html rename to tests/wpt/tests/requestidlecallback/callback-multiple-calls.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/callback-removed-frame.html b/tests/wpt/tests/requestidlecallback/callback-removed-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/callback-removed-frame.html rename to tests/wpt/tests/requestidlecallback/callback-removed-frame.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/callback-suspended.html b/tests/wpt/tests/requestidlecallback/callback-suspended.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/callback-suspended.html rename to tests/wpt/tests/requestidlecallback/callback-suspended.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/callback-timeRemaining-cross-realm-method.html b/tests/wpt/tests/requestidlecallback/callback-timeRemaining-cross-realm-method.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/callback-timeRemaining-cross-realm-method.html rename to tests/wpt/tests/requestidlecallback/callback-timeRemaining-cross-realm-method.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/callback-timeout-when-busy.html b/tests/wpt/tests/requestidlecallback/callback-timeout-when-busy.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/callback-timeout-when-busy.html rename to tests/wpt/tests/requestidlecallback/callback-timeout-when-busy.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/callback-timeout.html b/tests/wpt/tests/requestidlecallback/callback-timeout.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/callback-timeout.html rename to tests/wpt/tests/requestidlecallback/callback-timeout.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/callback-xhr-sync.html b/tests/wpt/tests/requestidlecallback/callback-xhr-sync.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/callback-xhr-sync.html rename to tests/wpt/tests/requestidlecallback/callback-xhr-sync.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/cancel-invoked.html b/tests/wpt/tests/requestidlecallback/cancel-invoked.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/cancel-invoked.html rename to tests/wpt/tests/requestidlecallback/cancel-invoked.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/deadline-after-expired-timer.html b/tests/wpt/tests/requestidlecallback/deadline-after-expired-timer.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/deadline-after-expired-timer.html rename to tests/wpt/tests/requestidlecallback/deadline-after-expired-timer.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/deadline-max-rAF-dynamic.html b/tests/wpt/tests/requestidlecallback/deadline-max-rAF-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/deadline-max-rAF-dynamic.html rename to tests/wpt/tests/requestidlecallback/deadline-max-rAF-dynamic.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/deadline-max-rAF.html b/tests/wpt/tests/requestidlecallback/deadline-max-rAF.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/deadline-max-rAF.html rename to tests/wpt/tests/requestidlecallback/deadline-max-rAF.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/deadline-max-timeout-dynamic.html b/tests/wpt/tests/requestidlecallback/deadline-max-timeout-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/deadline-max-timeout-dynamic.html rename to tests/wpt/tests/requestidlecallback/deadline-max-timeout-dynamic.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/deadline-max.html b/tests/wpt/tests/requestidlecallback/deadline-max.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/deadline-max.html rename to tests/wpt/tests/requestidlecallback/deadline-max.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/idlharness.window.js b/tests/wpt/tests/requestidlecallback/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/idlharness.window.js rename to tests/wpt/tests/requestidlecallback/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/requestidlecallback/resources/post_name_on_load.html b/tests/wpt/tests/requestidlecallback/resources/post_name_on_load.html similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/resources/post_name_on_load.html rename to tests/wpt/tests/requestidlecallback/resources/post_name_on_load.html diff --git a/tests/wpt/web-platform-tests/requestidlecallback/resources/ric-utils.js b/tests/wpt/tests/requestidlecallback/resources/ric-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/requestidlecallback/resources/ric-utils.js rename to tests/wpt/tests/requestidlecallback/resources/ric-utils.js diff --git a/tests/wpt/web-platform-tests/resize-observer/META.yml b/tests/wpt/tests/resize-observer/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/META.yml rename to tests/wpt/tests/resize-observer/META.yml diff --git a/tests/wpt/web-platform-tests/resize-observer/calculate-depth-for-node.html b/tests/wpt/tests/resize-observer/calculate-depth-for-node.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/calculate-depth-for-node.html rename to tests/wpt/tests/resize-observer/calculate-depth-for-node.html diff --git a/tests/wpt/web-platform-tests/resize-observer/callback-cross-realm-report-exception.html b/tests/wpt/tests/resize-observer/callback-cross-realm-report-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/callback-cross-realm-report-exception.html rename to tests/wpt/tests/resize-observer/callback-cross-realm-report-exception.html diff --git a/tests/wpt/web-platform-tests/resize-observer/change-layout-in-error.html b/tests/wpt/tests/resize-observer/change-layout-in-error.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/change-layout-in-error.html rename to tests/wpt/tests/resize-observer/change-layout-in-error.html diff --git a/tests/wpt/web-platform-tests/resize-observer/create-pattern-data-url.js b/tests/wpt/tests/resize-observer/create-pattern-data-url.js similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/create-pattern-data-url.js rename to tests/wpt/tests/resize-observer/create-pattern-data-url.js diff --git a/tests/wpt/web-platform-tests/resize-observer/devicepixel-ref.html b/tests/wpt/tests/resize-observer/devicepixel-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/devicepixel-ref.html rename to tests/wpt/tests/resize-observer/devicepixel-ref.html diff --git a/tests/wpt/web-platform-tests/resize-observer/devicepixel.html b/tests/wpt/tests/resize-observer/devicepixel.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/devicepixel.html rename to tests/wpt/tests/resize-observer/devicepixel.html diff --git a/tests/wpt/web-platform-tests/resize-observer/devicepixel2-ref.html b/tests/wpt/tests/resize-observer/devicepixel2-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/devicepixel2-ref.html rename to tests/wpt/tests/resize-observer/devicepixel2-ref.html diff --git a/tests/wpt/web-platform-tests/resize-observer/devicepixel2.html b/tests/wpt/tests/resize-observer/devicepixel2.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/devicepixel2.html rename to tests/wpt/tests/resize-observer/devicepixel2.html diff --git a/tests/wpt/web-platform-tests/resize-observer/eventloop.html b/tests/wpt/tests/resize-observer/eventloop.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/eventloop.html rename to tests/wpt/tests/resize-observer/eventloop.html diff --git a/tests/wpt/web-platform-tests/resize-observer/fragments.html b/tests/wpt/tests/resize-observer/fragments.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/fragments.html rename to tests/wpt/tests/resize-observer/fragments.html diff --git a/tests/wpt/web-platform-tests/resize-observer/idlharness.window.js b/tests/wpt/tests/resize-observer/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/idlharness.window.js rename to tests/wpt/tests/resize-observer/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/resize-observer/iframe-same-origin-ref.html b/tests/wpt/tests/resize-observer/iframe-same-origin-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/iframe-same-origin-ref.html rename to tests/wpt/tests/resize-observer/iframe-same-origin-ref.html diff --git a/tests/wpt/web-platform-tests/resize-observer/iframe-same-origin.html b/tests/wpt/tests/resize-observer/iframe-same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/iframe-same-origin.html rename to tests/wpt/tests/resize-observer/iframe-same-origin.html diff --git a/tests/wpt/web-platform-tests/resize-observer/notify.html b/tests/wpt/tests/resize-observer/notify.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/notify.html rename to tests/wpt/tests/resize-observer/notify.html diff --git a/tests/wpt/web-platform-tests/resize-observer/observe.html b/tests/wpt/tests/resize-observer/observe.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/observe.html rename to tests/wpt/tests/resize-observer/observe.html diff --git a/tests/wpt/web-platform-tests/resize-observer/ordering.html b/tests/wpt/tests/resize-observer/ordering.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/ordering.html rename to tests/wpt/tests/resize-observer/ordering.html diff --git a/tests/wpt/web-platform-tests/resize-observer/resources/iframe.html b/tests/wpt/tests/resize-observer/resources/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/resources/iframe.html rename to tests/wpt/tests/resize-observer/resources/iframe.html diff --git a/tests/wpt/web-platform-tests/resize-observer/resources/image.png b/tests/wpt/tests/resize-observer/resources/image.png similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/resources/image.png rename to tests/wpt/tests/resize-observer/resources/image.png diff --git a/tests/wpt/web-platform-tests/resize-observer/resources/resizeTestHelper.js b/tests/wpt/tests/resize-observer/resources/resizeTestHelper.js similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/resources/resizeTestHelper.js rename to tests/wpt/tests/resize-observer/resources/resizeTestHelper.js diff --git a/tests/wpt/web-platform-tests/resize-observer/scrollbars-2.html b/tests/wpt/tests/resize-observer/scrollbars-2.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/scrollbars-2.html rename to tests/wpt/tests/resize-observer/scrollbars-2.html diff --git a/tests/wpt/web-platform-tests/resize-observer/scrollbars.html b/tests/wpt/tests/resize-observer/scrollbars.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/scrollbars.html rename to tests/wpt/tests/resize-observer/scrollbars.html diff --git a/tests/wpt/web-platform-tests/resize-observer/svg-with-css-box-001.html b/tests/wpt/tests/resize-observer/svg-with-css-box-001.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/svg-with-css-box-001.html rename to tests/wpt/tests/resize-observer/svg-with-css-box-001.html diff --git a/tests/wpt/web-platform-tests/resize-observer/svg-with-css-box-002.svg b/tests/wpt/tests/resize-observer/svg-with-css-box-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/svg-with-css-box-002.svg rename to tests/wpt/tests/resize-observer/svg-with-css-box-002.svg diff --git a/tests/wpt/web-platform-tests/resize-observer/svg.html b/tests/wpt/tests/resize-observer/svg.html similarity index 100% rename from tests/wpt/web-platform-tests/resize-observer/svg.html rename to tests/wpt/tests/resize-observer/svg.html diff --git a/tests/wpt/web-platform-tests/resource-timing/304-response-recorded.html b/tests/wpt/tests/resource-timing/304-response-recorded.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/304-response-recorded.html rename to tests/wpt/tests/resource-timing/304-response-recorded.html diff --git a/tests/wpt/web-platform-tests/resource-timing/CodingConventions.md b/tests/wpt/tests/resource-timing/CodingConventions.md similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/CodingConventions.md rename to tests/wpt/tests/resource-timing/CodingConventions.md diff --git a/tests/wpt/web-platform-tests/resource-timing/META.yml b/tests/wpt/tests/resource-timing/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/META.yml rename to tests/wpt/tests/resource-timing/META.yml diff --git a/tests/wpt/web-platform-tests/resource-timing/SO-XO-SO-redirect-chain-tao.https.html b/tests/wpt/tests/resource-timing/SO-XO-SO-redirect-chain-tao.https.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/SO-XO-SO-redirect-chain-tao.https.html rename to tests/wpt/tests/resource-timing/SO-XO-SO-redirect-chain-tao.https.html diff --git a/tests/wpt/web-platform-tests/resource-timing/SyntheticResponse.py b/tests/wpt/tests/resource-timing/SyntheticResponse.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/SyntheticResponse.py rename to tests/wpt/tests/resource-timing/SyntheticResponse.py diff --git a/tests/wpt/web-platform-tests/resource-timing/TAO-match.html b/tests/wpt/tests/resource-timing/TAO-match.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/TAO-match.html rename to tests/wpt/tests/resource-timing/TAO-match.html diff --git a/tests/wpt/web-platform-tests/resource-timing/TAO-port-mismatch-means-crossorigin.html b/tests/wpt/tests/resource-timing/TAO-port-mismatch-means-crossorigin.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/TAO-port-mismatch-means-crossorigin.html rename to tests/wpt/tests/resource-timing/TAO-port-mismatch-means-crossorigin.html diff --git a/tests/wpt/web-platform-tests/resource-timing/__init__.py b/tests/wpt/tests/resource-timing/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/__init__.py rename to tests/wpt/tests/resource-timing/__init__.py diff --git a/tests/wpt/web-platform-tests/resource-timing/body-size-cross-origin.https.html b/tests/wpt/tests/resource-timing/body-size-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/body-size-cross-origin.https.html rename to tests/wpt/tests/resource-timing/body-size-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/resource-timing/buffer-full-add-after-full-event.html b/tests/wpt/tests/resource-timing/buffer-full-add-after-full-event.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/buffer-full-add-after-full-event.html rename to tests/wpt/tests/resource-timing/buffer-full-add-after-full-event.html diff --git a/tests/wpt/web-platform-tests/resource-timing/buffer-full-add-entries-during-callback-that-drop.html b/tests/wpt/tests/resource-timing/buffer-full-add-entries-during-callback-that-drop.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/buffer-full-add-entries-during-callback-that-drop.html rename to tests/wpt/tests/resource-timing/buffer-full-add-entries-during-callback-that-drop.html diff --git a/tests/wpt/web-platform-tests/resource-timing/buffer-full-add-entries-during-callback.html b/tests/wpt/tests/resource-timing/buffer-full-add-entries-during-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/buffer-full-add-entries-during-callback.html rename to tests/wpt/tests/resource-timing/buffer-full-add-entries-during-callback.html diff --git a/tests/wpt/web-platform-tests/resource-timing/buffer-full-add-then-clear.html b/tests/wpt/tests/resource-timing/buffer-full-add-then-clear.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/buffer-full-add-then-clear.html rename to tests/wpt/tests/resource-timing/buffer-full-add-then-clear.html diff --git a/tests/wpt/web-platform-tests/resource-timing/buffer-full-decrease-buffer-during-callback.html b/tests/wpt/tests/resource-timing/buffer-full-decrease-buffer-during-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/buffer-full-decrease-buffer-during-callback.html rename to tests/wpt/tests/resource-timing/buffer-full-decrease-buffer-during-callback.html diff --git a/tests/wpt/web-platform-tests/resource-timing/buffer-full-eventually.html b/tests/wpt/tests/resource-timing/buffer-full-eventually.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/buffer-full-eventually.html rename to tests/wpt/tests/resource-timing/buffer-full-eventually.html diff --git a/tests/wpt/web-platform-tests/resource-timing/buffer-full-increase-buffer-during-callback.html b/tests/wpt/tests/resource-timing/buffer-full-increase-buffer-during-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/buffer-full-increase-buffer-during-callback.html rename to tests/wpt/tests/resource-timing/buffer-full-increase-buffer-during-callback.html diff --git a/tests/wpt/web-platform-tests/resource-timing/buffer-full-inspect-buffer-during-callback.html b/tests/wpt/tests/resource-timing/buffer-full-inspect-buffer-during-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/buffer-full-inspect-buffer-during-callback.html rename to tests/wpt/tests/resource-timing/buffer-full-inspect-buffer-during-callback.html diff --git a/tests/wpt/web-platform-tests/resource-timing/buffer-full-set-to-current-buffer.html b/tests/wpt/tests/resource-timing/buffer-full-set-to-current-buffer.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/buffer-full-set-to-current-buffer.html rename to tests/wpt/tests/resource-timing/buffer-full-set-to-current-buffer.html diff --git a/tests/wpt/web-platform-tests/resource-timing/buffer-full-store-and-clear-during-callback.html b/tests/wpt/tests/resource-timing/buffer-full-store-and-clear-during-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/buffer-full-store-and-clear-during-callback.html rename to tests/wpt/tests/resource-timing/buffer-full-store-and-clear-during-callback.html diff --git a/tests/wpt/web-platform-tests/resource-timing/buffer-full-then-decreased.html b/tests/wpt/tests/resource-timing/buffer-full-then-decreased.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/buffer-full-then-decreased.html rename to tests/wpt/tests/resource-timing/buffer-full-then-decreased.html diff --git a/tests/wpt/web-platform-tests/resource-timing/buffer-full-then-increased.html b/tests/wpt/tests/resource-timing/buffer-full-then-increased.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/buffer-full-then-increased.html rename to tests/wpt/tests/resource-timing/buffer-full-then-increased.html diff --git a/tests/wpt/web-platform-tests/resource-timing/buffer-full-when-populate-entries.html b/tests/wpt/tests/resource-timing/buffer-full-when-populate-entries.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/buffer-full-when-populate-entries.html rename to tests/wpt/tests/resource-timing/buffer-full-when-populate-entries.html diff --git a/tests/wpt/web-platform-tests/resource-timing/buffered-flag.any.js b/tests/wpt/tests/resource-timing/buffered-flag.any.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/buffered-flag.any.js rename to tests/wpt/tests/resource-timing/buffered-flag.any.js diff --git a/tests/wpt/web-platform-tests/resource-timing/cached-image-gets-single-entry.html b/tests/wpt/tests/resource-timing/cached-image-gets-single-entry.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/cached-image-gets-single-entry.html rename to tests/wpt/tests/resource-timing/cached-image-gets-single-entry.html diff --git a/tests/wpt/web-platform-tests/resource-timing/clear-resource-timings.html b/tests/wpt/tests/resource-timing/clear-resource-timings.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/clear-resource-timings.html rename to tests/wpt/tests/resource-timing/clear-resource-timings.html diff --git a/tests/wpt/web-platform-tests/resource-timing/connection-reuse.html b/tests/wpt/tests/resource-timing/connection-reuse.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/connection-reuse.html rename to tests/wpt/tests/resource-timing/connection-reuse.html diff --git a/tests/wpt/web-platform-tests/resource-timing/connection-reuse.https.html b/tests/wpt/tests/resource-timing/connection-reuse.https.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/connection-reuse.https.html rename to tests/wpt/tests/resource-timing/connection-reuse.https.html diff --git a/tests/wpt/web-platform-tests/resource-timing/content-type-parsing.html b/tests/wpt/tests/resource-timing/content-type-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/content-type-parsing.html rename to tests/wpt/tests/resource-timing/content-type-parsing.html diff --git a/tests/wpt/web-platform-tests/resource-timing/content-type.html b/tests/wpt/tests/resource-timing/content-type.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/content-type.html rename to tests/wpt/tests/resource-timing/content-type.html diff --git a/tests/wpt/web-platform-tests/resource-timing/cors-preflight.any.js b/tests/wpt/tests/resource-timing/cors-preflight.any.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/cors-preflight.any.js rename to tests/wpt/tests/resource-timing/cors-preflight.any.js diff --git a/tests/wpt/web-platform-tests/resource-timing/cross-origin-iframe.html b/tests/wpt/tests/resource-timing/cross-origin-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/cross-origin-iframe.html rename to tests/wpt/tests/resource-timing/cross-origin-iframe.html diff --git a/tests/wpt/web-platform-tests/resource-timing/cross-origin-redirects.html b/tests/wpt/tests/resource-timing/cross-origin-redirects.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/cross-origin-redirects.html rename to tests/wpt/tests/resource-timing/cross-origin-redirects.html diff --git a/tests/wpt/web-platform-tests/resource-timing/cross-origin-start-end-time-with-redirects.html b/tests/wpt/tests/resource-timing/cross-origin-start-end-time-with-redirects.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/cross-origin-start-end-time-with-redirects.html rename to tests/wpt/tests/resource-timing/cross-origin-start-end-time-with-redirects.html diff --git a/tests/wpt/web-platform-tests/resource-timing/cross-origin-status-codes.html b/tests/wpt/tests/resource-timing/cross-origin-status-codes.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/cross-origin-status-codes.html rename to tests/wpt/tests/resource-timing/cross-origin-status-codes.html diff --git a/tests/wpt/web-platform-tests/resource-timing/delivery-type.tentative.any.js b/tests/wpt/tests/resource-timing/delivery-type.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/delivery-type.tentative.any.js rename to tests/wpt/tests/resource-timing/delivery-type.tentative.any.js diff --git a/tests/wpt/web-platform-tests/resource-timing/document-domain-no-impact-opener.html b/tests/wpt/tests/resource-timing/document-domain-no-impact-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/document-domain-no-impact-opener.html rename to tests/wpt/tests/resource-timing/document-domain-no-impact-opener.html diff --git a/tests/wpt/web-platform-tests/resource-timing/entries-for-network-errors.sub.https.html b/tests/wpt/tests/resource-timing/entries-for-network-errors.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/entries-for-network-errors.sub.https.html rename to tests/wpt/tests/resource-timing/entries-for-network-errors.sub.https.html diff --git a/tests/wpt/web-platform-tests/resource-timing/entry-attributes.html b/tests/wpt/tests/resource-timing/entry-attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/entry-attributes.html rename to tests/wpt/tests/resource-timing/entry-attributes.html diff --git a/tests/wpt/web-platform-tests/resource-timing/event-source-timing.html b/tests/wpt/tests/resource-timing/event-source-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/event-source-timing.html rename to tests/wpt/tests/resource-timing/event-source-timing.html diff --git a/tests/wpt/web-platform-tests/resource-timing/fetch-cross-origin-redirect.https.html b/tests/wpt/tests/resource-timing/fetch-cross-origin-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/fetch-cross-origin-redirect.https.html rename to tests/wpt/tests/resource-timing/fetch-cross-origin-redirect.https.html diff --git a/tests/wpt/web-platform-tests/resource-timing/font-timestamps.html b/tests/wpt/tests/resource-timing/font-timestamps.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/font-timestamps.html rename to tests/wpt/tests/resource-timing/font-timestamps.html diff --git a/tests/wpt/web-platform-tests/resource-timing/frameset-timing.html b/tests/wpt/tests/resource-timing/frameset-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/frameset-timing.html rename to tests/wpt/tests/resource-timing/frameset-timing.html diff --git a/tests/wpt/web-platform-tests/resource-timing/idlharness.any.js b/tests/wpt/tests/resource-timing/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/idlharness.any.js rename to tests/wpt/tests/resource-timing/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/resource-timing/iframe-failed-commit.html b/tests/wpt/tests/resource-timing/iframe-failed-commit.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/iframe-failed-commit.html rename to tests/wpt/tests/resource-timing/iframe-failed-commit.html diff --git a/tests/wpt/web-platform-tests/resource-timing/iframe-non-html.html b/tests/wpt/tests/resource-timing/iframe-non-html.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/iframe-non-html.html rename to tests/wpt/tests/resource-timing/iframe-non-html.html diff --git a/tests/wpt/web-platform-tests/resource-timing/iframe-redirect-without-location.html b/tests/wpt/tests/resource-timing/iframe-redirect-without-location.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/iframe-redirect-without-location.html rename to tests/wpt/tests/resource-timing/iframe-redirect-without-location.html diff --git a/tests/wpt/web-platform-tests/resource-timing/iframe-sequence-of-events.html b/tests/wpt/tests/resource-timing/iframe-sequence-of-events.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/iframe-sequence-of-events.html rename to tests/wpt/tests/resource-timing/iframe-sequence-of-events.html diff --git a/tests/wpt/web-platform-tests/resource-timing/iframe-with-download.html b/tests/wpt/tests/resource-timing/iframe-with-download.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/iframe-with-download.html rename to tests/wpt/tests/resource-timing/iframe-with-download.html diff --git a/tests/wpt/web-platform-tests/resource-timing/image-sequence-of-events.html b/tests/wpt/tests/resource-timing/image-sequence-of-events.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/image-sequence-of-events.html rename to tests/wpt/tests/resource-timing/image-sequence-of-events.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type-for-script.html b/tests/wpt/tests/resource-timing/initiator-type-for-script.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type-for-script.html rename to tests/wpt/tests/resource-timing/initiator-type-for-script.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/audio.html b/tests/wpt/tests/resource-timing/initiator-type/audio.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/audio.html rename to tests/wpt/tests/resource-timing/initiator-type/audio.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/dynamic-insertion.html b/tests/wpt/tests/resource-timing/initiator-type/dynamic-insertion.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/dynamic-insertion.html rename to tests/wpt/tests/resource-timing/initiator-type/dynamic-insertion.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/embed.html b/tests/wpt/tests/resource-timing/initiator-type/embed.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/embed.html rename to tests/wpt/tests/resource-timing/initiator-type/embed.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/frameset.html b/tests/wpt/tests/resource-timing/initiator-type/frameset.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/frameset.html rename to tests/wpt/tests/resource-timing/initiator-type/frameset.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/iframe.html b/tests/wpt/tests/resource-timing/initiator-type/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/iframe.html rename to tests/wpt/tests/resource-timing/initiator-type/iframe.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/img-srcset.html b/tests/wpt/tests/resource-timing/initiator-type/img-srcset.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/img-srcset.html rename to tests/wpt/tests/resource-timing/initiator-type/img-srcset.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/img.html b/tests/wpt/tests/resource-timing/initiator-type/img.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/img.html rename to tests/wpt/tests/resource-timing/initiator-type/img.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/input.html b/tests/wpt/tests/resource-timing/initiator-type/input.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/input.html rename to tests/wpt/tests/resource-timing/initiator-type/input.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/link.html b/tests/wpt/tests/resource-timing/initiator-type/link.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/link.html rename to tests/wpt/tests/resource-timing/initiator-type/link.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/misc.html b/tests/wpt/tests/resource-timing/initiator-type/misc.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/misc.html rename to tests/wpt/tests/resource-timing/initiator-type/misc.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/picture.html b/tests/wpt/tests/resource-timing/initiator-type/picture.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/picture.html rename to tests/wpt/tests/resource-timing/initiator-type/picture.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/resources/initiator-type-test.js b/tests/wpt/tests/resource-timing/initiator-type/resources/initiator-type-test.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/resources/initiator-type-test.js rename to tests/wpt/tests/resource-timing/initiator-type/resources/initiator-type-test.js diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/script.html b/tests/wpt/tests/resource-timing/initiator-type/script.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/script.html rename to tests/wpt/tests/resource-timing/initiator-type/script.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/style.html b/tests/wpt/tests/resource-timing/initiator-type/style.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/style.html rename to tests/wpt/tests/resource-timing/initiator-type/style.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/svg.html b/tests/wpt/tests/resource-timing/initiator-type/svg.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/svg.html rename to tests/wpt/tests/resource-timing/initiator-type/svg.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/video.html b/tests/wpt/tests/resource-timing/initiator-type/video.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/video.html rename to tests/wpt/tests/resource-timing/initiator-type/video.html diff --git a/tests/wpt/web-platform-tests/resource-timing/initiator-type/workers.html b/tests/wpt/tests/resource-timing/initiator-type/workers.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/initiator-type/workers.html rename to tests/wpt/tests/resource-timing/initiator-type/workers.html diff --git a/tests/wpt/web-platform-tests/resource-timing/input-sequence-of-events.html b/tests/wpt/tests/resource-timing/input-sequence-of-events.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/input-sequence-of-events.html rename to tests/wpt/tests/resource-timing/input-sequence-of-events.html diff --git a/tests/wpt/web-platform-tests/resource-timing/interim-response-times.h2.html b/tests/wpt/tests/resource-timing/interim-response-times.h2.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/interim-response-times.h2.html rename to tests/wpt/tests/resource-timing/interim-response-times.h2.html diff --git a/tests/wpt/web-platform-tests/resource-timing/interim-response-times.html b/tests/wpt/tests/resource-timing/interim-response-times.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/interim-response-times.html rename to tests/wpt/tests/resource-timing/interim-response-times.html diff --git a/tests/wpt/web-platform-tests/resource-timing/link-sequence-of-events.html b/tests/wpt/tests/resource-timing/link-sequence-of-events.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/link-sequence-of-events.html rename to tests/wpt/tests/resource-timing/link-sequence-of-events.html diff --git a/tests/wpt/web-platform-tests/resource-timing/load-from-mem-cache-transfer-size.html b/tests/wpt/tests/resource-timing/load-from-mem-cache-transfer-size.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/load-from-mem-cache-transfer-size.html rename to tests/wpt/tests/resource-timing/load-from-mem-cache-transfer-size.html diff --git a/tests/wpt/web-platform-tests/resource-timing/nested-context-navigations-embed.html b/tests/wpt/tests/resource-timing/nested-context-navigations-embed.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/nested-context-navigations-embed.html rename to tests/wpt/tests/resource-timing/nested-context-navigations-embed.html diff --git a/tests/wpt/web-platform-tests/resource-timing/nested-context-navigations-iframe.html b/tests/wpt/tests/resource-timing/nested-context-navigations-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/nested-context-navigations-iframe.html rename to tests/wpt/tests/resource-timing/nested-context-navigations-iframe.html diff --git a/tests/wpt/web-platform-tests/resource-timing/nested-context-navigations-object.html b/tests/wpt/tests/resource-timing/nested-context-navigations-object.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/nested-context-navigations-object.html rename to tests/wpt/tests/resource-timing/nested-context-navigations-object.html diff --git a/tests/wpt/web-platform-tests/resource-timing/nested-nav-fallback-timing.html b/tests/wpt/tests/resource-timing/nested-nav-fallback-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/nested-nav-fallback-timing.html rename to tests/wpt/tests/resource-timing/nested-nav-fallback-timing.html diff --git a/tests/wpt/web-platform-tests/resource-timing/nextHopProtocol-is-tao-protected.https.html b/tests/wpt/tests/resource-timing/nextHopProtocol-is-tao-protected.https.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/nextHopProtocol-is-tao-protected.https.html rename to tests/wpt/tests/resource-timing/nextHopProtocol-is-tao-protected.https.html diff --git a/tests/wpt/web-platform-tests/resource-timing/no-entries-for-cross-origin-css-fetched-memory-cache.sub.html b/tests/wpt/tests/resource-timing/no-entries-for-cross-origin-css-fetched-memory-cache.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/no-entries-for-cross-origin-css-fetched-memory-cache.sub.html rename to tests/wpt/tests/resource-timing/no-entries-for-cross-origin-css-fetched-memory-cache.sub.html diff --git a/tests/wpt/web-platform-tests/resource-timing/no-entries-for-cross-origin-css-fetched.sub.html b/tests/wpt/tests/resource-timing/no-entries-for-cross-origin-css-fetched.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/no-entries-for-cross-origin-css-fetched.sub.html rename to tests/wpt/tests/resource-timing/no-entries-for-cross-origin-css-fetched.sub.html diff --git a/tests/wpt/web-platform-tests/resource-timing/object-not-found-adds-entry.html b/tests/wpt/tests/resource-timing/object-not-found-adds-entry.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/object-not-found-adds-entry.html rename to tests/wpt/tests/resource-timing/object-not-found-adds-entry.html diff --git a/tests/wpt/web-platform-tests/resource-timing/object-not-found-after-TAO-cross-origin-redirect.html b/tests/wpt/tests/resource-timing/object-not-found-after-TAO-cross-origin-redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/object-not-found-after-TAO-cross-origin-redirect.html rename to tests/wpt/tests/resource-timing/object-not-found-after-TAO-cross-origin-redirect.html diff --git a/tests/wpt/web-platform-tests/resource-timing/object-not-found-after-cross-origin-redirect.html b/tests/wpt/tests/resource-timing/object-not-found-after-cross-origin-redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/object-not-found-after-cross-origin-redirect.html rename to tests/wpt/tests/resource-timing/object-not-found-after-cross-origin-redirect.html diff --git a/tests/wpt/web-platform-tests/resource-timing/opaque-origin.html b/tests/wpt/tests/resource-timing/opaque-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/opaque-origin.html rename to tests/wpt/tests/resource-timing/opaque-origin.html diff --git a/tests/wpt/web-platform-tests/resource-timing/ping-rt-entries.html b/tests/wpt/tests/resource-timing/ping-rt-entries.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/ping-rt-entries.html rename to tests/wpt/tests/resource-timing/ping-rt-entries.html diff --git a/tests/wpt/web-platform-tests/resource-timing/queue-entry-regardless-buffer-size.html b/tests/wpt/tests/resource-timing/queue-entry-regardless-buffer-size.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/queue-entry-regardless-buffer-size.html rename to tests/wpt/tests/resource-timing/queue-entry-regardless-buffer-size.html diff --git a/tests/wpt/web-platform-tests/resource-timing/redirects.html b/tests/wpt/tests/resource-timing/redirects.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/redirects.html rename to tests/wpt/tests/resource-timing/redirects.html diff --git a/tests/wpt/web-platform-tests/resource-timing/render-blocking-status-link.html b/tests/wpt/tests/resource-timing/render-blocking-status-link.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/render-blocking-status-link.html rename to tests/wpt/tests/resource-timing/render-blocking-status-link.html diff --git a/tests/wpt/web-platform-tests/resource-timing/render-blocking-status-script.html b/tests/wpt/tests/resource-timing/render-blocking-status-script.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/render-blocking-status-script.html rename to tests/wpt/tests/resource-timing/render-blocking-status-script.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resource-ignore-data-url.html b/tests/wpt/tests/resource-timing/resource-ignore-data-url.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resource-ignore-data-url.html rename to tests/wpt/tests/resource-timing/resource-ignore-data-url.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resource-reload-TAO.html b/tests/wpt/tests/resource-timing/resource-reload-TAO.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resource-reload-TAO.html rename to tests/wpt/tests/resource-timing/resource-reload-TAO.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resource-timing-level1.js b/tests/wpt/tests/resource-timing/resource-timing-level1.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resource-timing-level1.js rename to tests/wpt/tests/resource-timing/resource-timing-level1.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resource-timing-level1.sub.html b/tests/wpt/tests/resource-timing/resource-timing-level1.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resource-timing-level1.sub.html rename to tests/wpt/tests/resource-timing/resource-timing-level1.sub.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resource_connection_reuse_mixed_content.html b/tests/wpt/tests/resource-timing/resource_connection_reuse_mixed_content.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resource_connection_reuse_mixed_content.html rename to tests/wpt/tests/resource-timing/resource_connection_reuse_mixed_content.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resource_connection_reuse_mixed_content_redirect.html b/tests/wpt/tests/resource-timing/resource_connection_reuse_mixed_content_redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resource_connection_reuse_mixed_content_redirect.html rename to tests/wpt/tests/resource-timing/resource_connection_reuse_mixed_content_redirect.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resource_dedicated_worker.html b/tests/wpt/tests/resource-timing/resource_dedicated_worker.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resource_dedicated_worker.html rename to tests/wpt/tests/resource-timing/resource_dedicated_worker.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resource_nested_dedicated_worker.worker.js b/tests/wpt/tests/resource-timing/resource_nested_dedicated_worker.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resource_nested_dedicated_worker.worker.js rename to tests/wpt/tests/resource-timing/resource_nested_dedicated_worker.worker.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resource_reparenting.html b/tests/wpt/tests/resource-timing/resource_reparenting.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resource_reparenting.html rename to tests/wpt/tests/resource-timing/resource_reparenting.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resource_subframe_self_navigation.html b/tests/wpt/tests/resource-timing/resource_subframe_self_navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resource_subframe_self_navigation.html rename to tests/wpt/tests/resource-timing/resource_subframe_self_navigation.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resource_timing.worker.js b/tests/wpt/tests/resource-timing/resource_timing.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resource_timing.worker.js rename to tests/wpt/tests/resource-timing/resource_timing.worker.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resource_timing_content_length.html b/tests/wpt/tests/resource-timing/resource_timing_content_length.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resource_timing_content_length.html rename to tests/wpt/tests/resource-timing/resource_timing_content_length.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/200.https.asis b/tests/wpt/tests/resource-timing/resources/200.https.asis similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/200.https.asis rename to tests/wpt/tests/resource-timing/resources/200.https.asis diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/200_empty.asis b/tests/wpt/tests/resource-timing/resources/200_empty.asis similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/200_empty.asis rename to tests/wpt/tests/resource-timing/resources/200_empty.asis diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/204_empty.asis b/tests/wpt/tests/resource-timing/resources/204_empty.asis similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/204_empty.asis rename to tests/wpt/tests/resource-timing/resources/204_empty.asis diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/205_empty.asis b/tests/wpt/tests/resource-timing/resources/205_empty.asis similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/205_empty.asis rename to tests/wpt/tests/resource-timing/resources/205_empty.asis diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/TAOResponse.py b/tests/wpt/tests/resource-timing/resources/TAOResponse.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/TAOResponse.py rename to tests/wpt/tests/resource-timing/resources/TAOResponse.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/blank-with-tao.html b/tests/wpt/tests/resource-timing/resources/blank-with-tao.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/blank-with-tao.html rename to tests/wpt/tests/resource-timing/resources/blank-with-tao.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/blank-with-tao.html.headers b/tests/wpt/tests/resource-timing/resources/blank-with-tao.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/blank-with-tao.html.headers rename to tests/wpt/tests/resource-timing/resources/blank-with-tao.html.headers diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/blue-with-tao.png b/tests/wpt/tests/resource-timing/resources/blue-with-tao.png similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/blue-with-tao.png rename to tests/wpt/tests/resource-timing/resources/blue-with-tao.png diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/blue-with-tao.png.headers b/tests/wpt/tests/resource-timing/resources/blue-with-tao.png.headers similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/blue-with-tao.png.headers rename to tests/wpt/tests/resource-timing/resources/blue-with-tao.png.headers diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/blue.png b/tests/wpt/tests/resource-timing/resources/blue.png similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/blue.png rename to tests/wpt/tests/resource-timing/resources/blue.png diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/buffer-full-utilities.js b/tests/wpt/tests/resource-timing/resources/buffer-full-utilities.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/buffer-full-utilities.js rename to tests/wpt/tests/resource-timing/resources/buffer-full-utilities.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/cacheable-and-validated.py b/tests/wpt/tests/resource-timing/resources/cacheable-and-validated.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/cacheable-and-validated.py rename to tests/wpt/tests/resource-timing/resources/cacheable-and-validated.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/close.html b/tests/wpt/tests/resource-timing/resources/close.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/close.html rename to tests/wpt/tests/resource-timing/resources/close.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/connection-reuse-test.js b/tests/wpt/tests/resource-timing/resources/connection-reuse-test.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/connection-reuse-test.js rename to tests/wpt/tests/resource-timing/resources/connection-reuse-test.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/content-type.py b/tests/wpt/tests/resource-timing/resources/content-type.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/content-type.py rename to tests/wpt/tests/resource-timing/resources/content-type.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/cors-ahem.py b/tests/wpt/tests/resource-timing/resources/cors-ahem.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/cors-ahem.py rename to tests/wpt/tests/resource-timing/resources/cors-ahem.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/csp-default-none.html b/tests/wpt/tests/resource-timing/resources/csp-default-none.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/csp-default-none.html rename to tests/wpt/tests/resource-timing/resources/csp-default-none.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/csp-default-none.html.headers b/tests/wpt/tests/resource-timing/resources/csp-default-none.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/csp-default-none.html.headers rename to tests/wpt/tests/resource-timing/resources/csp-default-none.html.headers diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/delay-css.py b/tests/wpt/tests/resource-timing/resources/delay-css.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/delay-css.py rename to tests/wpt/tests/resource-timing/resources/delay-css.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/delay-load.html b/tests/wpt/tests/resource-timing/resources/delay-load.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/delay-load.html rename to tests/wpt/tests/resource-timing/resources/delay-load.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/document-domain-no-impact.html b/tests/wpt/tests/resource-timing/resources/document-domain-no-impact.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/document-domain-no-impact.html rename to tests/wpt/tests/resource-timing/resources/document-domain-no-impact.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/document-navigated.html b/tests/wpt/tests/resource-timing/resources/document-navigated.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/document-navigated.html rename to tests/wpt/tests/resource-timing/resources/document-navigated.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/document-refreshed.html b/tests/wpt/tests/resource-timing/resources/document-refreshed.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/document-refreshed.html rename to tests/wpt/tests/resource-timing/resources/document-refreshed.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/document-that-navigates.html b/tests/wpt/tests/resource-timing/resources/document-that-navigates.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/document-that-navigates.html rename to tests/wpt/tests/resource-timing/resources/document-that-navigates.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/document-that-refreshes.html b/tests/wpt/tests/resource-timing/resources/document-that-refreshes.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/document-that-refreshes.html rename to tests/wpt/tests/resource-timing/resources/document-that-refreshes.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/download.asis b/tests/wpt/tests/resource-timing/resources/download.asis similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/download.asis rename to tests/wpt/tests/resource-timing/resources/download.asis diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/embed-navigate-back.html b/tests/wpt/tests/resource-timing/resources/embed-navigate-back.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/embed-navigate-back.html rename to tests/wpt/tests/resource-timing/resources/embed-navigate-back.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/embed-navigate.html b/tests/wpt/tests/resource-timing/resources/embed-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/embed-navigate.html rename to tests/wpt/tests/resource-timing/resources/embed-navigate.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/embed-refresh.html b/tests/wpt/tests/resource-timing/resources/embed-refresh.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/embed-refresh.html rename to tests/wpt/tests/resource-timing/resources/embed-refresh.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/empty.js b/tests/wpt/tests/resource-timing/resources/empty.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/empty.js rename to tests/wpt/tests/resource-timing/resources/empty.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/empty.py b/tests/wpt/tests/resource-timing/resources/empty.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/empty.py rename to tests/wpt/tests/resource-timing/resources/empty.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/empty_script.js b/tests/wpt/tests/resource-timing/resources/empty_script.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/empty_script.js rename to tests/wpt/tests/resource-timing/resources/empty_script.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/empty_style.css b/tests/wpt/tests/resource-timing/resources/empty_style.css similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/empty_style.css rename to tests/wpt/tests/resource-timing/resources/empty_style.css diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/entry-invariants.js b/tests/wpt/tests/resource-timing/resources/entry-invariants.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/entry-invariants.js rename to tests/wpt/tests/resource-timing/resources/entry-invariants.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/eventsource.py b/tests/wpt/tests/resource-timing/resources/eventsource.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/eventsource.py rename to tests/wpt/tests/resource-timing/resources/eventsource.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/fake_responses.html b/tests/wpt/tests/resource-timing/resources/fake_responses.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/fake_responses.html rename to tests/wpt/tests/resource-timing/resources/fake_responses.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/fake_responses.py b/tests/wpt/tests/resource-timing/resources/fake_responses.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/fake_responses.py rename to tests/wpt/tests/resource-timing/resources/fake_responses.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/fake_responses_https.sub.html b/tests/wpt/tests/resource-timing/resources/fake_responses_https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/fake_responses_https.sub.html rename to tests/wpt/tests/resource-timing/resources/fake_responses_https.sub.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/fake_responses_https_redirect.sub.html b/tests/wpt/tests/resource-timing/resources/fake_responses_https_redirect.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/fake_responses_https_redirect.sub.html rename to tests/wpt/tests/resource-timing/resources/fake_responses_https_redirect.sub.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/frame-timing.js b/tests/wpt/tests/resource-timing/resources/frame-timing.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/frame-timing.js rename to tests/wpt/tests/resource-timing/resources/frame-timing.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/frameset-timing-frame.html b/tests/wpt/tests/resource-timing/resources/frameset-timing-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/frameset-timing-frame.html rename to tests/wpt/tests/resource-timing/resources/frameset-timing-frame.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/green-frame.html b/tests/wpt/tests/resource-timing/resources/green-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/green-frame.html rename to tests/wpt/tests/resource-timing/resources/green-frame.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/green.html b/tests/wpt/tests/resource-timing/resources/green.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/green.html rename to tests/wpt/tests/resource-timing/resources/green.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/green.html.headers b/tests/wpt/tests/resource-timing/resources/green.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/green.html.headers rename to tests/wpt/tests/resource-timing/resources/green.html.headers diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/gzip_xml.py b/tests/wpt/tests/resource-timing/resources/gzip_xml.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/gzip_xml.py rename to tests/wpt/tests/resource-timing/resources/gzip_xml.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/header-delay.h2.py b/tests/wpt/tests/resource-timing/resources/header-delay.h2.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/header-delay.h2.py rename to tests/wpt/tests/resource-timing/resources/header-delay.h2.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/header-delay.py b/tests/wpt/tests/resource-timing/resources/header-delay.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/header-delay.py rename to tests/wpt/tests/resource-timing/resources/header-delay.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/iframe-TAO-crossorigin-port.sub.html b/tests/wpt/tests/resource-timing/resources/iframe-TAO-crossorigin-port.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/iframe-TAO-crossorigin-port.sub.html rename to tests/wpt/tests/resource-timing/resources/iframe-TAO-crossorigin-port.sub.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/iframe-load-from-mem-cache-transfer-size.html b/tests/wpt/tests/resource-timing/resources/iframe-load-from-mem-cache-transfer-size.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/iframe-load-from-mem-cache-transfer-size.html rename to tests/wpt/tests/resource-timing/resources/iframe-load-from-mem-cache-transfer-size.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/iframe-navigate-back.html b/tests/wpt/tests/resource-timing/resources/iframe-navigate-back.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/iframe-navigate-back.html rename to tests/wpt/tests/resource-timing/resources/iframe-navigate-back.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/iframe-navigate.html b/tests/wpt/tests/resource-timing/resources/iframe-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/iframe-navigate.html rename to tests/wpt/tests/resource-timing/resources/iframe-navigate.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/iframe-refresh.html b/tests/wpt/tests/resource-timing/resources/iframe-refresh.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/iframe-refresh.html rename to tests/wpt/tests/resource-timing/resources/iframe-refresh.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/iframe-reload-TAO.html b/tests/wpt/tests/resource-timing/resources/iframe-reload-TAO.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/iframe-reload-TAO.html rename to tests/wpt/tests/resource-timing/resources/iframe-reload-TAO.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/iframe-setdomain.sub.html b/tests/wpt/tests/resource-timing/resources/iframe-setdomain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/iframe-setdomain.sub.html rename to tests/wpt/tests/resource-timing/resources/iframe-setdomain.sub.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/iframe-with-delay.sub.html b/tests/wpt/tests/resource-timing/resources/iframe-with-delay.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/iframe-with-delay.sub.html rename to tests/wpt/tests/resource-timing/resources/iframe-with-delay.sub.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/iframe_TAO_match_origin.html b/tests/wpt/tests/resource-timing/resources/iframe_TAO_match_origin.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/iframe_TAO_match_origin.html rename to tests/wpt/tests/resource-timing/resources/iframe_TAO_match_origin.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/import.sub.css b/tests/wpt/tests/resource-timing/resources/import.sub.css similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/import.sub.css rename to tests/wpt/tests/resource-timing/resources/import.sub.css diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/importer.css b/tests/wpt/tests/resource-timing/resources/importer.css similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/importer.css rename to tests/wpt/tests/resource-timing/resources/importer.css diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/importer.js b/tests/wpt/tests/resource-timing/resources/importer.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/importer.js rename to tests/wpt/tests/resource-timing/resources/importer.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/importer_async.js b/tests/wpt/tests/resource-timing/resources/importer_async.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/importer_async.js rename to tests/wpt/tests/resource-timing/resources/importer_async.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/importer_dynamic.css b/tests/wpt/tests/resource-timing/resources/importer_dynamic.css similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/importer_dynamic.css rename to tests/wpt/tests/resource-timing/resources/importer_dynamic.css diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/importer_print.css b/tests/wpt/tests/resource-timing/resources/importer_print.css similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/importer_print.css rename to tests/wpt/tests/resource-timing/resources/importer_print.css diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/inject_resource_test.html b/tests/wpt/tests/resource-timing/resources/inject_resource_test.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/inject_resource_test.html rename to tests/wpt/tests/resource-timing/resources/inject_resource_test.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/invalid.jpg b/tests/wpt/tests/resource-timing/resources/invalid.jpg similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/invalid.jpg rename to tests/wpt/tests/resource-timing/resources/invalid.jpg diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/manifest.json b/tests/wpt/tests/resource-timing/resources/manifest.json similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/manifest.json rename to tests/wpt/tests/resource-timing/resources/manifest.json diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/multi_redirect.py b/tests/wpt/tests/resource-timing/resources/multi_redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/multi_redirect.py rename to tests/wpt/tests/resource-timing/resources/multi_redirect.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/navigate_back.html b/tests/wpt/tests/resource-timing/resources/navigate_back.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/navigate_back.html rename to tests/wpt/tests/resource-timing/resources/navigate_back.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/nested-contexts.js b/tests/wpt/tests/resource-timing/resources/nested-contexts.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/nested-contexts.js rename to tests/wpt/tests/resource-timing/resources/nested-contexts.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/nested.css b/tests/wpt/tests/resource-timing/resources/nested.css similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/nested.css rename to tests/wpt/tests/resource-timing/resources/nested.css diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/no-entries-for-cross-origin-css-fetched-memory-cache-iframe.sub.html b/tests/wpt/tests/resource-timing/resources/no-entries-for-cross-origin-css-fetched-memory-cache-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/no-entries-for-cross-origin-css-fetched-memory-cache-iframe.sub.html rename to tests/wpt/tests/resource-timing/resources/no-entries-for-cross-origin-css-fetched-memory-cache-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/notify_parent.html b/tests/wpt/tests/resource-timing/resources/notify_parent.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/notify_parent.html rename to tests/wpt/tests/resource-timing/resources/notify_parent.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/object-navigate-back.html b/tests/wpt/tests/resource-timing/resources/object-navigate-back.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/object-navigate-back.html rename to tests/wpt/tests/resource-timing/resources/object-navigate-back.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/object-navigate.html b/tests/wpt/tests/resource-timing/resources/object-navigate.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/object-navigate.html rename to tests/wpt/tests/resource-timing/resources/object-navigate.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/object-refresh.html b/tests/wpt/tests/resource-timing/resources/object-refresh.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/object-refresh.html rename to tests/wpt/tests/resource-timing/resources/object-refresh.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/observe-entry.js b/tests/wpt/tests/resource-timing/resources/observe-entry.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/observe-entry.js rename to tests/wpt/tests/resource-timing/resources/observe-entry.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/preflight.py b/tests/wpt/tests/resource-timing/resources/preflight.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/preflight.py rename to tests/wpt/tests/resource-timing/resources/preflight.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/redirect-cors.py b/tests/wpt/tests/resource-timing/resources/redirect-cors.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/redirect-cors.py rename to tests/wpt/tests/resource-timing/resources/redirect-cors.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/redirect-without-location.py b/tests/wpt/tests/resource-timing/resources/redirect-without-location.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/redirect-without-location.py rename to tests/wpt/tests/resource-timing/resources/redirect-without-location.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/resource-loaders.js b/tests/wpt/tests/resource-timing/resources/resource-loaders.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/resource-loaders.js rename to tests/wpt/tests/resource-timing/resources/resource-loaders.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/resource-timing-content-length.py b/tests/wpt/tests/resource-timing/resources/resource-timing-content-length.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/resource-timing-content-length.py rename to tests/wpt/tests/resource-timing/resources/resource-timing-content-length.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/resource_timing_test0.css b/tests/wpt/tests/resource-timing/resources/resource_timing_test0.css similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/resource_timing_test0.css rename to tests/wpt/tests/resource-timing/resources/resource_timing_test0.css diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/resource_timing_test0.html b/tests/wpt/tests/resource-timing/resources/resource_timing_test0.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/resource_timing_test0.html rename to tests/wpt/tests/resource-timing/resources/resource_timing_test0.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/resource_timing_test0.js b/tests/wpt/tests/resource-timing/resources/resource_timing_test0.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/resource_timing_test0.js rename to tests/wpt/tests/resource-timing/resources/resource_timing_test0.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/resource_timing_test0.js.headers b/tests/wpt/tests/resource-timing/resources/resource_timing_test0.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/resource_timing_test0.js.headers rename to tests/wpt/tests/resource-timing/resources/resource_timing_test0.js.headers diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/resource_timing_test0.png b/tests/wpt/tests/resource-timing/resources/resource_timing_test0.png similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/resource_timing_test0.png rename to tests/wpt/tests/resource-timing/resources/resource_timing_test0.png diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/resource_timing_test0.xml b/tests/wpt/tests/resource-timing/resources/resource_timing_test0.xml similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/resource_timing_test0.xml rename to tests/wpt/tests/resource-timing/resources/resource_timing_test0.xml diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/self_navigation.html b/tests/wpt/tests/resource-timing/resources/self_navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/self_navigation.html rename to tests/wpt/tests/resource-timing/resources/self_navigation.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/shared-worker.js b/tests/wpt/tests/resource-timing/resources/shared-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/shared-worker.js rename to tests/wpt/tests/resource-timing/resources/shared-worker.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/sizes-helper.js b/tests/wpt/tests/resource-timing/resources/sizes-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/sizes-helper.js rename to tests/wpt/tests/resource-timing/resources/sizes-helper.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/status-code.py b/tests/wpt/tests/resource-timing/resources/status-code.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/status-code.py rename to tests/wpt/tests/resource-timing/resources/status-code.py diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/sw-install.html b/tests/wpt/tests/resource-timing/resources/sw-install.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/sw-install.html rename to tests/wpt/tests/resource-timing/resources/sw-install.html diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/sw.js b/tests/wpt/tests/resource-timing/resources/sw.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/sw.js rename to tests/wpt/tests/resource-timing/resources/sw.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/tao-response.js b/tests/wpt/tests/resource-timing/resources/tao-response.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/tao-response.js rename to tests/wpt/tests/resource-timing/resources/tao-response.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/webperftestharness.js b/tests/wpt/tests/resource-timing/resources/webperftestharness.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/webperftestharness.js rename to tests/wpt/tests/resource-timing/resources/webperftestharness.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/webperftestharnessextension.js b/tests/wpt/tests/resource-timing/resources/webperftestharnessextension.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/webperftestharnessextension.js rename to tests/wpt/tests/resource-timing/resources/webperftestharnessextension.js diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/worker_with_images.js b/tests/wpt/tests/resource-timing/resources/worker_with_images.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/resources/worker_with_images.js rename to tests/wpt/tests/resource-timing/resources/worker_with_images.js diff --git a/tests/wpt/web-platform-tests/resource-timing/response-status-code.html b/tests/wpt/tests/resource-timing/response-status-code.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/response-status-code.html rename to tests/wpt/tests/resource-timing/response-status-code.html diff --git a/tests/wpt/web-platform-tests/resource-timing/same-origin-from-cross-origin-redirect.html b/tests/wpt/tests/resource-timing/same-origin-from-cross-origin-redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/same-origin-from-cross-origin-redirect.html rename to tests/wpt/tests/resource-timing/same-origin-from-cross-origin-redirect.html diff --git a/tests/wpt/web-platform-tests/resource-timing/script-rt-entries.html b/tests/wpt/tests/resource-timing/script-rt-entries.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/script-rt-entries.html rename to tests/wpt/tests/resource-timing/script-rt-entries.html diff --git a/tests/wpt/web-platform-tests/resource-timing/secure-iframe-in-insecure-context.html b/tests/wpt/tests/resource-timing/secure-iframe-in-insecure-context.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/secure-iframe-in-insecure-context.html rename to tests/wpt/tests/resource-timing/secure-iframe-in-insecure-context.html diff --git a/tests/wpt/web-platform-tests/resource-timing/shared-worker-rt-entry.html b/tests/wpt/tests/resource-timing/shared-worker-rt-entry.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/shared-worker-rt-entry.html rename to tests/wpt/tests/resource-timing/shared-worker-rt-entry.html diff --git a/tests/wpt/web-platform-tests/resource-timing/sizes-cache.any.js b/tests/wpt/tests/resource-timing/sizes-cache.any.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/sizes-cache.any.js rename to tests/wpt/tests/resource-timing/sizes-cache.any.js diff --git a/tests/wpt/web-platform-tests/resource-timing/sizes-redirect-img.html b/tests/wpt/tests/resource-timing/sizes-redirect-img.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/sizes-redirect-img.html rename to tests/wpt/tests/resource-timing/sizes-redirect-img.html diff --git a/tests/wpt/web-platform-tests/resource-timing/sizes-redirect.any.js b/tests/wpt/tests/resource-timing/sizes-redirect.any.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/sizes-redirect.any.js rename to tests/wpt/tests/resource-timing/sizes-redirect.any.js diff --git a/tests/wpt/web-platform-tests/resource-timing/sleep.py b/tests/wpt/tests/resource-timing/sleep.py similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/sleep.py rename to tests/wpt/tests/resource-timing/sleep.py diff --git a/tests/wpt/web-platform-tests/resource-timing/status-codes-create-entry.html b/tests/wpt/tests/resource-timing/status-codes-create-entry.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/status-codes-create-entry.html rename to tests/wpt/tests/resource-timing/status-codes-create-entry.html diff --git a/tests/wpt/web-platform-tests/resource-timing/supported_resource_type.any.js b/tests/wpt/tests/resource-timing/supported_resource_type.any.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/supported_resource_type.any.js rename to tests/wpt/tests/resource-timing/supported_resource_type.any.js diff --git a/tests/wpt/web-platform-tests/resource-timing/test_resource_timing.html b/tests/wpt/tests/resource-timing/test_resource_timing.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/test_resource_timing.html rename to tests/wpt/tests/resource-timing/test_resource_timing.html diff --git a/tests/wpt/web-platform-tests/resource-timing/test_resource_timing.https.html b/tests/wpt/tests/resource-timing/test_resource_timing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/test_resource_timing.https.html rename to tests/wpt/tests/resource-timing/test_resource_timing.https.html diff --git a/tests/wpt/web-platform-tests/resource-timing/test_resource_timing.js b/tests/wpt/tests/resource-timing/test_resource_timing.js similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/test_resource_timing.js rename to tests/wpt/tests/resource-timing/test_resource_timing.js diff --git a/tests/wpt/web-platform-tests/resource-timing/tojson.html b/tests/wpt/tests/resource-timing/tojson.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/tojson.html rename to tests/wpt/tests/resource-timing/tojson.html diff --git a/tests/wpt/web-platform-tests/resource-timing/workerStart-tao-protected.https.html b/tests/wpt/tests/resource-timing/workerStart-tao-protected.https.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/workerStart-tao-protected.https.html rename to tests/wpt/tests/resource-timing/workerStart-tao-protected.https.html diff --git a/tests/wpt/web-platform-tests/resource-timing/worklet-rt-entries.https.html b/tests/wpt/tests/resource-timing/worklet-rt-entries.https.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/worklet-rt-entries.https.html rename to tests/wpt/tests/resource-timing/worklet-rt-entries.https.html diff --git a/tests/wpt/web-platform-tests/resource-timing/xhr-resource-timing.html b/tests/wpt/tests/resource-timing/xhr-resource-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/resource-timing/xhr-resource-timing.html rename to tests/wpt/tests/resource-timing/xhr-resource-timing.html diff --git a/tests/wpt/web-platform-tests/resources/.htaccess b/tests/wpt/tests/resources/.htaccess similarity index 100% rename from tests/wpt/web-platform-tests/resources/.htaccess rename to tests/wpt/tests/resources/.htaccess diff --git a/tests/wpt/web-platform-tests/resources/META.yml b/tests/wpt/tests/resources/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/resources/META.yml rename to tests/wpt/tests/resources/META.yml diff --git a/tests/wpt/web-platform-tests/resources/SVGAnimationTestCase-testharness.js b/tests/wpt/tests/resources/SVGAnimationTestCase-testharness.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/SVGAnimationTestCase-testharness.js rename to tests/wpt/tests/resources/SVGAnimationTestCase-testharness.js diff --git a/tests/wpt/web-platform-tests/resources/accesskey.js b/tests/wpt/tests/resources/accesskey.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/accesskey.js rename to tests/wpt/tests/resources/accesskey.js diff --git a/tests/wpt/web-platform-tests/resources/blank.html b/tests/wpt/tests/resources/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/blank.html rename to tests/wpt/tests/resources/blank.html diff --git a/tests/wpt/web-platform-tests/resources/channel.sub.js b/tests/wpt/tests/resources/channel.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/channel.sub.js rename to tests/wpt/tests/resources/channel.sub.js diff --git a/tests/wpt/web-platform-tests/resources/check-layout-th.js b/tests/wpt/tests/resources/check-layout-th.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/check-layout-th.js rename to tests/wpt/tests/resources/check-layout-th.js diff --git a/tests/wpt/web-platform-tests/resources/check-layout.js b/tests/wpt/tests/resources/check-layout.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/check-layout.js rename to tests/wpt/tests/resources/check-layout.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/README.md b/tests/wpt/tests/resources/chromium/README.md similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/README.md rename to tests/wpt/tests/resources/chromium/README.md diff --git a/tests/wpt/web-platform-tests/resources/chromium/contacts_manager_mock.js b/tests/wpt/tests/resources/chromium/contacts_manager_mock.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/contacts_manager_mock.js rename to tests/wpt/tests/resources/chromium/contacts_manager_mock.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/content-index-helpers.js b/tests/wpt/tests/resources/chromium/content-index-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/content-index-helpers.js rename to tests/wpt/tests/resources/chromium/content-index-helpers.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/enable-hyperlink-auditing.js b/tests/wpt/tests/resources/chromium/enable-hyperlink-auditing.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/enable-hyperlink-auditing.js rename to tests/wpt/tests/resources/chromium/enable-hyperlink-auditing.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/fake-hid.js b/tests/wpt/tests/resources/chromium/fake-hid.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/fake-hid.js rename to tests/wpt/tests/resources/chromium/fake-hid.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/fake-serial.js b/tests/wpt/tests/resources/chromium/fake-serial.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/fake-serial.js rename to tests/wpt/tests/resources/chromium/fake-serial.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js b/tests/wpt/tests/resources/chromium/generic_sensor_mocks.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js rename to tests/wpt/tests/resources/chromium/generic_sensor_mocks.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js.headers b/tests/wpt/tests/resources/chromium/generic_sensor_mocks.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js.headers rename to tests/wpt/tests/resources/chromium/generic_sensor_mocks.js.headers diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-barcodedetection.js b/tests/wpt/tests/resources/chromium/mock-barcodedetection.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-barcodedetection.js rename to tests/wpt/tests/resources/chromium/mock-barcodedetection.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-barcodedetection.js.headers b/tests/wpt/tests/resources/chromium/mock-barcodedetection.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-barcodedetection.js.headers rename to tests/wpt/tests/resources/chromium/mock-barcodedetection.js.headers diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-battery-monitor.headers b/tests/wpt/tests/resources/chromium/mock-battery-monitor.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-battery-monitor.headers rename to tests/wpt/tests/resources/chromium/mock-battery-monitor.headers diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-battery-monitor.js b/tests/wpt/tests/resources/chromium/mock-battery-monitor.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-battery-monitor.js rename to tests/wpt/tests/resources/chromium/mock-battery-monitor.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-direct-sockets.js b/tests/wpt/tests/resources/chromium/mock-direct-sockets.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-direct-sockets.js rename to tests/wpt/tests/resources/chromium/mock-direct-sockets.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-facedetection.js b/tests/wpt/tests/resources/chromium/mock-facedetection.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-facedetection.js rename to tests/wpt/tests/resources/chromium/mock-facedetection.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-facedetection.js.headers b/tests/wpt/tests/resources/chromium/mock-facedetection.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-facedetection.js.headers rename to tests/wpt/tests/resources/chromium/mock-facedetection.js.headers diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-idle-detection.js b/tests/wpt/tests/resources/chromium/mock-idle-detection.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-idle-detection.js rename to tests/wpt/tests/resources/chromium/mock-idle-detection.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-imagecapture.js b/tests/wpt/tests/resources/chromium/mock-imagecapture.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-imagecapture.js rename to tests/wpt/tests/resources/chromium/mock-imagecapture.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-managed-config.js b/tests/wpt/tests/resources/chromium/mock-managed-config.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-managed-config.js rename to tests/wpt/tests/resources/chromium/mock-managed-config.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-pressure-service.js b/tests/wpt/tests/resources/chromium/mock-pressure-service.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-pressure-service.js rename to tests/wpt/tests/resources/chromium/mock-pressure-service.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-pressure-service.js.headers b/tests/wpt/tests/resources/chromium/mock-pressure-service.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-pressure-service.js.headers rename to tests/wpt/tests/resources/chromium/mock-pressure-service.js.headers diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-subapps.js b/tests/wpt/tests/resources/chromium/mock-subapps.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-subapps.js rename to tests/wpt/tests/resources/chromium/mock-subapps.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-textdetection.js b/tests/wpt/tests/resources/chromium/mock-textdetection.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-textdetection.js rename to tests/wpt/tests/resources/chromium/mock-textdetection.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-textdetection.js.headers b/tests/wpt/tests/resources/chromium/mock-textdetection.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/mock-textdetection.js.headers rename to tests/wpt/tests/resources/chromium/mock-textdetection.js.headers diff --git a/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js b/tests/wpt/tests/resources/chromium/nfc-mock.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js rename to tests/wpt/tests/resources/chromium/nfc-mock.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/web-bluetooth-test.js b/tests/wpt/tests/resources/chromium/web-bluetooth-test.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/web-bluetooth-test.js rename to tests/wpt/tests/resources/chromium/web-bluetooth-test.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/web-bluetooth-test.js.headers b/tests/wpt/tests/resources/chromium/web-bluetooth-test.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/web-bluetooth-test.js.headers rename to tests/wpt/tests/resources/chromium/web-bluetooth-test.js.headers diff --git a/tests/wpt/web-platform-tests/resources/chromium/webusb-child-test.js b/tests/wpt/tests/resources/chromium/webusb-child-test.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/webusb-child-test.js rename to tests/wpt/tests/resources/chromium/webusb-child-test.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/webusb-child-test.js.headers b/tests/wpt/tests/resources/chromium/webusb-child-test.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/webusb-child-test.js.headers rename to tests/wpt/tests/resources/chromium/webusb-child-test.js.headers diff --git a/tests/wpt/web-platform-tests/resources/chromium/webusb-test.js b/tests/wpt/tests/resources/chromium/webusb-test.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/webusb-test.js rename to tests/wpt/tests/resources/chromium/webusb-test.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/webusb-test.js.headers b/tests/wpt/tests/resources/chromium/webusb-test.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/webusb-test.js.headers rename to tests/wpt/tests/resources/chromium/webusb-test.js.headers diff --git a/tests/wpt/web-platform-tests/resources/chromium/webxr-test-math-helper.js b/tests/wpt/tests/resources/chromium/webxr-test-math-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/webxr-test-math-helper.js rename to tests/wpt/tests/resources/chromium/webxr-test-math-helper.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/webxr-test-math-helper.js.headers b/tests/wpt/tests/resources/chromium/webxr-test-math-helper.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/webxr-test-math-helper.js.headers rename to tests/wpt/tests/resources/chromium/webxr-test-math-helper.js.headers diff --git a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js b/tests/wpt/tests/resources/chromium/webxr-test.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/webxr-test.js rename to tests/wpt/tests/resources/chromium/webxr-test.js diff --git a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js.headers b/tests/wpt/tests/resources/chromium/webxr-test.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/chromium/webxr-test.js.headers rename to tests/wpt/tests/resources/chromium/webxr-test.js.headers diff --git a/tests/wpt/web-platform-tests/resources/declarative-shadow-dom-polyfill.js b/tests/wpt/tests/resources/declarative-shadow-dom-polyfill.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/declarative-shadow-dom-polyfill.js rename to tests/wpt/tests/resources/declarative-shadow-dom-polyfill.js diff --git a/tests/wpt/web-platform-tests/resources/idlharness-shadowrealm.js b/tests/wpt/tests/resources/idlharness-shadowrealm.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/idlharness-shadowrealm.js rename to tests/wpt/tests/resources/idlharness-shadowrealm.js diff --git a/tests/wpt/web-platform-tests/resources/idlharness.js b/tests/wpt/tests/resources/idlharness.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/idlharness.js rename to tests/wpt/tests/resources/idlharness.js diff --git a/tests/wpt/web-platform-tests/resources/idlharness.js.headers b/tests/wpt/tests/resources/idlharness.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/idlharness.js.headers rename to tests/wpt/tests/resources/idlharness.js.headers diff --git a/tests/wpt/web-platform-tests/resources/readme.md b/tests/wpt/tests/resources/readme.md similarity index 100% rename from tests/wpt/web-platform-tests/resources/readme.md rename to tests/wpt/tests/resources/readme.md diff --git a/tests/wpt/web-platform-tests/resources/sriharness.js b/tests/wpt/tests/resources/sriharness.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/sriharness.js rename to tests/wpt/tests/resources/sriharness.js diff --git a/tests/wpt/web-platform-tests/resources/test-only-api.js b/tests/wpt/tests/resources/test-only-api.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/test-only-api.js rename to tests/wpt/tests/resources/test-only-api.js diff --git a/tests/wpt/web-platform-tests/resources/test-only-api.js.headers b/tests/wpt/tests/resources/test-only-api.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/test-only-api.js.headers rename to tests/wpt/tests/resources/test-only-api.js.headers diff --git a/tests/wpt/web-platform-tests/resources/test-only-api.m.js b/tests/wpt/tests/resources/test-only-api.m.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/test-only-api.m.js rename to tests/wpt/tests/resources/test-only-api.m.js diff --git a/tests/wpt/web-platform-tests/resources/test-only-api.m.js.headers b/tests/wpt/tests/resources/test-only-api.m.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/test-only-api.m.js.headers rename to tests/wpt/tests/resources/test-only-api.m.js.headers diff --git a/tests/wpt/web-platform-tests/resources/test/README.md b/tests/wpt/tests/resources/test/README.md similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/README.md rename to tests/wpt/tests/resources/test/README.md diff --git a/tests/wpt/web-platform-tests/resources/test/conftest.py b/tests/wpt/tests/resources/test/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/conftest.py rename to tests/wpt/tests/resources/test/conftest.py diff --git a/tests/wpt/web-platform-tests/resources/test/harness.html b/tests/wpt/tests/resources/test/harness.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/harness.html rename to tests/wpt/tests/resources/test/harness.html diff --git a/tests/wpt/web-platform-tests/resources/test/idl-helper.js b/tests/wpt/tests/resources/test/idl-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/idl-helper.js rename to tests/wpt/tests/resources/test/idl-helper.js diff --git a/tests/wpt/web-platform-tests/resources/test/nested-testharness.js b/tests/wpt/tests/resources/test/nested-testharness.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/nested-testharness.js rename to tests/wpt/tests/resources/test/nested-testharness.js diff --git a/tests/wpt/web-platform-tests/resources/test/requirements.txt b/tests/wpt/tests/resources/test/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/requirements.txt rename to tests/wpt/tests/resources/test/requirements.txt diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/abortsignal.html b/tests/wpt/tests/resources/test/tests/functional/abortsignal.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/abortsignal.html rename to tests/wpt/tests/resources/test/tests/functional/abortsignal.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup.html b/tests/wpt/tests/resources/test/tests/functional/add_cleanup.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup.html rename to tests/wpt/tests/resources/test/tests/functional/add_cleanup.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_async.html b/tests/wpt/tests/resources/test/tests/functional/add_cleanup_async.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_async.html rename to tests/wpt/tests/resources/test/tests/functional/add_cleanup_async.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_async_bad_return.html b/tests/wpt/tests/resources/test/tests/functional/add_cleanup_async_bad_return.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_async_bad_return.html rename to tests/wpt/tests/resources/test/tests/functional/add_cleanup_async_bad_return.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_async_rejection.html b/tests/wpt/tests/resources/test/tests/functional/add_cleanup_async_rejection.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_async_rejection.html rename to tests/wpt/tests/resources/test/tests/functional/add_cleanup_async_rejection.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_async_rejection_after_load.html b/tests/wpt/tests/resources/test/tests/functional/add_cleanup_async_rejection_after_load.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_async_rejection_after_load.html rename to tests/wpt/tests/resources/test/tests/functional/add_cleanup_async_rejection_after_load.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_async_timeout.html b/tests/wpt/tests/resources/test/tests/functional/add_cleanup_async_timeout.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_async_timeout.html rename to tests/wpt/tests/resources/test/tests/functional/add_cleanup_async_timeout.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_bad_return.html b/tests/wpt/tests/resources/test/tests/functional/add_cleanup_bad_return.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_bad_return.html rename to tests/wpt/tests/resources/test/tests/functional/add_cleanup_bad_return.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_count.html b/tests/wpt/tests/resources/test/tests/functional/add_cleanup_count.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_count.html rename to tests/wpt/tests/resources/test/tests/functional/add_cleanup_count.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_err.html b/tests/wpt/tests/resources/test/tests/functional/add_cleanup_err.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_err.html rename to tests/wpt/tests/resources/test/tests/functional/add_cleanup_err.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_err_multi.html b/tests/wpt/tests/resources/test/tests/functional/add_cleanup_err_multi.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_err_multi.html rename to tests/wpt/tests/resources/test/tests/functional/add_cleanup_err_multi.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_sync_queue.html b/tests/wpt/tests/resources/test/tests/functional/add_cleanup_sync_queue.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/add_cleanup_sync_queue.html rename to tests/wpt/tests/resources/test/tests/functional/add_cleanup_sync_queue.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-1.html b/tests/wpt/tests/resources/test/tests/functional/api-tests-1.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-1.html rename to tests/wpt/tests/resources/test/tests/functional/api-tests-1.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-2.html b/tests/wpt/tests/resources/test/tests/functional/api-tests-2.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-2.html rename to tests/wpt/tests/resources/test/tests/functional/api-tests-2.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-3.html b/tests/wpt/tests/resources/test/tests/functional/api-tests-3.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-3.html rename to tests/wpt/tests/resources/test/tests/functional/api-tests-3.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/assert-array-equals.html b/tests/wpt/tests/resources/test/tests/functional/assert-array-equals.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/assert-array-equals.html rename to tests/wpt/tests/resources/test/tests/functional/assert-array-equals.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/force_timeout.html b/tests/wpt/tests/resources/test/tests/functional/force_timeout.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/force_timeout.html rename to tests/wpt/tests/resources/test/tests/functional/force_timeout.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/generate-callback.html b/tests/wpt/tests/resources/test/tests/functional/generate-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/generate-callback.html rename to tests/wpt/tests/resources/test/tests/functional/generate-callback.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlDictionary/test_partial_interface_of.html b/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlDictionary/test_partial_interface_of.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlDictionary/test_partial_interface_of.html rename to tests/wpt/tests/resources/test/tests/functional/idlharness/IdlDictionary/test_partial_interface_of.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_exposed_wildcard.html b/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_exposed_wildcard.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_exposed_wildcard.html rename to tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_exposed_wildcard.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_immutable_prototype.html b/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_immutable_prototype.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_immutable_prototype.html rename to tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_immutable_prototype.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_interface_mixin.html b/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_interface_mixin.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_interface_mixin.html rename to tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_interface_mixin.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_partial_interface_of.html b/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_partial_interface_of.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_partial_interface_of.html rename to tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_partial_interface_of.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_primary_interface_of.html b/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_primary_interface_of.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_primary_interface_of.html rename to tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_primary_interface_of.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_to_json_operation.html b/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_to_json_operation.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlInterface/test_to_json_operation.html rename to tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_to_json_operation.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlNamespace/test_attribute.html b/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlNamespace/test_attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlNamespace/test_attribute.html rename to tests/wpt/tests/resources/test/tests/functional/idlharness/IdlNamespace/test_attribute.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlNamespace/test_operation.html b/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlNamespace/test_operation.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlNamespace/test_operation.html rename to tests/wpt/tests/resources/test/tests/functional/idlharness/IdlNamespace/test_operation.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlNamespace/test_partial_namespace.html b/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlNamespace/test_partial_namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/idlharness/IdlNamespace/test_partial_namespace.html rename to tests/wpt/tests/resources/test/tests/functional/idlharness/IdlNamespace/test_partial_namespace.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/iframe-callback.html b/tests/wpt/tests/resources/test/tests/functional/iframe-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/iframe-callback.html rename to tests/wpt/tests/resources/test/tests/functional/iframe-callback.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/iframe-consolidate-errors.html b/tests/wpt/tests/resources/test/tests/functional/iframe-consolidate-errors.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/iframe-consolidate-errors.html rename to tests/wpt/tests/resources/test/tests/functional/iframe-consolidate-errors.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/iframe-consolidate-tests.html b/tests/wpt/tests/resources/test/tests/functional/iframe-consolidate-tests.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/iframe-consolidate-tests.html rename to tests/wpt/tests/resources/test/tests/functional/iframe-consolidate-tests.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/iframe-msg.html b/tests/wpt/tests/resources/test/tests/functional/iframe-msg.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/iframe-msg.html rename to tests/wpt/tests/resources/test/tests/functional/iframe-msg.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/log-insertion.html b/tests/wpt/tests/resources/test/tests/functional/log-insertion.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/log-insertion.html rename to tests/wpt/tests/resources/test/tests/functional/log-insertion.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/no-title.html b/tests/wpt/tests/resources/test/tests/functional/no-title.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/no-title.html rename to tests/wpt/tests/resources/test/tests/functional/no-title.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/order.html b/tests/wpt/tests/resources/test/tests/functional/order.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/order.html rename to tests/wpt/tests/resources/test/tests/functional/order.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/promise-async.html b/tests/wpt/tests/resources/test/tests/functional/promise-async.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/promise-async.html rename to tests/wpt/tests/resources/test/tests/functional/promise-async.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/promise-with-sync.html b/tests/wpt/tests/resources/test/tests/functional/promise-with-sync.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/promise-with-sync.html rename to tests/wpt/tests/resources/test/tests/functional/promise-with-sync.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/promise.html b/tests/wpt/tests/resources/test/tests/functional/promise.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/promise.html rename to tests/wpt/tests/resources/test/tests/functional/promise.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/queue.html b/tests/wpt/tests/resources/test/tests/functional/queue.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/queue.html rename to tests/wpt/tests/resources/test/tests/functional/queue.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/setup-function-worker.js b/tests/wpt/tests/resources/test/tests/functional/setup-function-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/setup-function-worker.js rename to tests/wpt/tests/resources/test/tests/functional/setup-function-worker.js diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/setup-worker-service.html b/tests/wpt/tests/resources/test/tests/functional/setup-worker-service.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/setup-worker-service.html rename to tests/wpt/tests/resources/test/tests/functional/setup-worker-service.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/single-page-test-fail.html b/tests/wpt/tests/resources/test/tests/functional/single-page-test-fail.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/single-page-test-fail.html rename to tests/wpt/tests/resources/test/tests/functional/single-page-test-fail.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/single-page-test-no-assertions.html b/tests/wpt/tests/resources/test/tests/functional/single-page-test-no-assertions.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/single-page-test-no-assertions.html rename to tests/wpt/tests/resources/test/tests/functional/single-page-test-no-assertions.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/single-page-test-no-body.html b/tests/wpt/tests/resources/test/tests/functional/single-page-test-no-body.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/single-page-test-no-body.html rename to tests/wpt/tests/resources/test/tests/functional/single-page-test-no-body.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/single-page-test-pass.html b/tests/wpt/tests/resources/test/tests/functional/single-page-test-pass.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/single-page-test-pass.html rename to tests/wpt/tests/resources/test/tests/functional/single-page-test-pass.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/step_wait.html b/tests/wpt/tests/resources/test/tests/functional/step_wait.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/step_wait.html rename to tests/wpt/tests/resources/test/tests/functional/step_wait.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/step_wait_func.html b/tests/wpt/tests/resources/test/tests/functional/step_wait_func.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/step_wait_func.html rename to tests/wpt/tests/resources/test/tests/functional/step_wait_func.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/task-scheduling-promise-test.html b/tests/wpt/tests/resources/test/tests/functional/task-scheduling-promise-test.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/task-scheduling-promise-test.html rename to tests/wpt/tests/resources/test/tests/functional/task-scheduling-promise-test.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/task-scheduling-test.html b/tests/wpt/tests/resources/test/tests/functional/task-scheduling-test.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/task-scheduling-test.html rename to tests/wpt/tests/resources/test/tests/functional/task-scheduling-test.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/uncaught-exception-handle.html b/tests/wpt/tests/resources/test/tests/functional/uncaught-exception-handle.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/uncaught-exception-handle.html rename to tests/wpt/tests/resources/test/tests/functional/uncaught-exception-handle.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/uncaught-exception-ignore.html b/tests/wpt/tests/resources/test/tests/functional/uncaught-exception-ignore.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/uncaught-exception-ignore.html rename to tests/wpt/tests/resources/test/tests/functional/uncaught-exception-ignore.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/worker-dedicated-uncaught-allow.html b/tests/wpt/tests/resources/test/tests/functional/worker-dedicated-uncaught-allow.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/worker-dedicated-uncaught-allow.html rename to tests/wpt/tests/resources/test/tests/functional/worker-dedicated-uncaught-allow.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/worker-dedicated-uncaught-single.html b/tests/wpt/tests/resources/test/tests/functional/worker-dedicated-uncaught-single.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/worker-dedicated-uncaught-single.html rename to tests/wpt/tests/resources/test/tests/functional/worker-dedicated-uncaught-single.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/worker-dedicated.sub.html b/tests/wpt/tests/resources/test/tests/functional/worker-dedicated.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/worker-dedicated.sub.html rename to tests/wpt/tests/resources/test/tests/functional/worker-dedicated.sub.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/worker-error.js b/tests/wpt/tests/resources/test/tests/functional/worker-error.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/worker-error.js rename to tests/wpt/tests/resources/test/tests/functional/worker-error.js diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/worker-service.html b/tests/wpt/tests/resources/test/tests/functional/worker-service.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/worker-service.html rename to tests/wpt/tests/resources/test/tests/functional/worker-service.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/worker-shared.html b/tests/wpt/tests/resources/test/tests/functional/worker-shared.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/worker-shared.html rename to tests/wpt/tests/resources/test/tests/functional/worker-shared.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/worker-uncaught-allow.js b/tests/wpt/tests/resources/test/tests/functional/worker-uncaught-allow.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/worker-uncaught-allow.js rename to tests/wpt/tests/resources/test/tests/functional/worker-uncaught-allow.js diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/worker-uncaught-single.js b/tests/wpt/tests/resources/test/tests/functional/worker-uncaught-single.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/worker-uncaught-single.js rename to tests/wpt/tests/resources/test/tests/functional/worker-uncaught-single.js diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/worker.js b/tests/wpt/tests/resources/test/tests/functional/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/functional/worker.js rename to tests/wpt/tests/resources/test/tests/functional/worker.js diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlArray/is_json_type.html b/tests/wpt/tests/resources/test/tests/unit/IdlArray/is_json_type.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlArray/is_json_type.html rename to tests/wpt/tests/resources/test/tests/unit/IdlArray/is_json_type.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlDictionary/get_reverse_inheritance_stack.html b/tests/wpt/tests/resources/test/tests/unit/IdlDictionary/get_reverse_inheritance_stack.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlDictionary/get_reverse_inheritance_stack.html rename to tests/wpt/tests/resources/test/tests/unit/IdlDictionary/get_reverse_inheritance_stack.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlDictionary/test_partial_dictionary.html b/tests/wpt/tests/resources/test/tests/unit/IdlDictionary/test_partial_dictionary.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlDictionary/test_partial_dictionary.html rename to tests/wpt/tests/resources/test/tests/unit/IdlDictionary/test_partial_dictionary.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/constructors.html b/tests/wpt/tests/resources/test/tests/unit/IdlInterface/constructors.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/constructors.html rename to tests/wpt/tests/resources/test/tests/unit/IdlInterface/constructors.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/default_to_json_operation.html b/tests/wpt/tests/resources/test/tests/unit/IdlInterface/default_to_json_operation.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/default_to_json_operation.html rename to tests/wpt/tests/resources/test/tests/unit/IdlInterface/default_to_json_operation.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/do_member_unscopable_asserts.html b/tests/wpt/tests/resources/test/tests/unit/IdlInterface/do_member_unscopable_asserts.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/do_member_unscopable_asserts.html rename to tests/wpt/tests/resources/test/tests/unit/IdlInterface/do_member_unscopable_asserts.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/get_interface_object.html b/tests/wpt/tests/resources/test/tests/unit/IdlInterface/get_interface_object.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/get_interface_object.html rename to tests/wpt/tests/resources/test/tests/unit/IdlInterface/get_interface_object.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/get_interface_object_owner.html b/tests/wpt/tests/resources/test/tests/unit/IdlInterface/get_interface_object_owner.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/get_interface_object_owner.html rename to tests/wpt/tests/resources/test/tests/unit/IdlInterface/get_interface_object_owner.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/get_legacy_namespace.html b/tests/wpt/tests/resources/test/tests/unit/IdlInterface/get_legacy_namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/get_legacy_namespace.html rename to tests/wpt/tests/resources/test/tests/unit/IdlInterface/get_legacy_namespace.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/get_qualified_name.html b/tests/wpt/tests/resources/test/tests/unit/IdlInterface/get_qualified_name.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/get_qualified_name.html rename to tests/wpt/tests/resources/test/tests/unit/IdlInterface/get_qualified_name.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/get_reverse_inheritance_stack.html b/tests/wpt/tests/resources/test/tests/unit/IdlInterface/get_reverse_inheritance_stack.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/get_reverse_inheritance_stack.html rename to tests/wpt/tests/resources/test/tests/unit/IdlInterface/get_reverse_inheritance_stack.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/has_default_to_json_regular_operation.html b/tests/wpt/tests/resources/test/tests/unit/IdlInterface/has_default_to_json_regular_operation.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/has_default_to_json_regular_operation.html rename to tests/wpt/tests/resources/test/tests/unit/IdlInterface/has_default_to_json_regular_operation.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/has_to_json_regular_operation.html b/tests/wpt/tests/resources/test/tests/unit/IdlInterface/has_to_json_regular_operation.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/has_to_json_regular_operation.html rename to tests/wpt/tests/resources/test/tests/unit/IdlInterface/has_to_json_regular_operation.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/should_have_interface_object.html b/tests/wpt/tests/resources/test/tests/unit/IdlInterface/should_have_interface_object.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/should_have_interface_object.html rename to tests/wpt/tests/resources/test/tests/unit/IdlInterface/should_have_interface_object.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/test_primary_interface_of_undefined.html b/tests/wpt/tests/resources/test/tests/unit/IdlInterface/test_primary_interface_of_undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterface/test_primary_interface_of_undefined.html rename to tests/wpt/tests/resources/test/tests/unit/IdlInterface/test_primary_interface_of_undefined.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterfaceMember/is_to_json_regular_operation.html b/tests/wpt/tests/resources/test/tests/unit/IdlInterfaceMember/is_to_json_regular_operation.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterfaceMember/is_to_json_regular_operation.html rename to tests/wpt/tests/resources/test/tests/unit/IdlInterfaceMember/is_to_json_regular_operation.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterfaceMember/toString.html b/tests/wpt/tests/resources/test/tests/unit/IdlInterfaceMember/toString.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterfaceMember/toString.html rename to tests/wpt/tests/resources/test/tests/unit/IdlInterfaceMember/toString.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/assert_implements.html b/tests/wpt/tests/resources/test/tests/unit/assert_implements.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/assert_implements.html rename to tests/wpt/tests/resources/test/tests/unit/assert_implements.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/assert_implements_optional.html b/tests/wpt/tests/resources/test/tests/unit/assert_implements_optional.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/assert_implements_optional.html rename to tests/wpt/tests/resources/test/tests/unit/assert_implements_optional.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/assert_object_equals.html b/tests/wpt/tests/resources/test/tests/unit/assert_object_equals.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/assert_object_equals.html rename to tests/wpt/tests/resources/test/tests/unit/assert_object_equals.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/async-test-return-restrictions.html b/tests/wpt/tests/resources/test/tests/unit/async-test-return-restrictions.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/async-test-return-restrictions.html rename to tests/wpt/tests/resources/test/tests/unit/async-test-return-restrictions.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/basic.html b/tests/wpt/tests/resources/test/tests/unit/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/basic.html rename to tests/wpt/tests/resources/test/tests/unit/basic.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/exceptional-cases-timeouts.html b/tests/wpt/tests/resources/test/tests/unit/exceptional-cases-timeouts.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/exceptional-cases-timeouts.html rename to tests/wpt/tests/resources/test/tests/unit/exceptional-cases-timeouts.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/exceptional-cases.html b/tests/wpt/tests/resources/test/tests/unit/exceptional-cases.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/exceptional-cases.html rename to tests/wpt/tests/resources/test/tests/unit/exceptional-cases.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/format-value.html b/tests/wpt/tests/resources/test/tests/unit/format-value.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/format-value.html rename to tests/wpt/tests/resources/test/tests/unit/format-value.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/helpers.js b/tests/wpt/tests/resources/test/tests/unit/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/helpers.js rename to tests/wpt/tests/resources/test/tests/unit/helpers.js diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/late-test.html b/tests/wpt/tests/resources/test/tests/unit/late-test.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/late-test.html rename to tests/wpt/tests/resources/test/tests/unit/late-test.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/promise_setup-timeout.html b/tests/wpt/tests/resources/test/tests/unit/promise_setup-timeout.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/promise_setup-timeout.html rename to tests/wpt/tests/resources/test/tests/unit/promise_setup-timeout.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/promise_setup.html b/tests/wpt/tests/resources/test/tests/unit/promise_setup.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/promise_setup.html rename to tests/wpt/tests/resources/test/tests/unit/promise_setup.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/single_test.html b/tests/wpt/tests/resources/test/tests/unit/single_test.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/single_test.html rename to tests/wpt/tests/resources/test/tests/unit/single_test.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/test-return-restrictions.html b/tests/wpt/tests/resources/test/tests/unit/test-return-restrictions.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/test-return-restrictions.html rename to tests/wpt/tests/resources/test/tests/unit/test-return-restrictions.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/throwing-assertions.html b/tests/wpt/tests/resources/test/tests/unit/throwing-assertions.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/throwing-assertions.html rename to tests/wpt/tests/resources/test/tests/unit/throwing-assertions.html diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/unpaired-surrogates.html b/tests/wpt/tests/resources/test/tests/unit/unpaired-surrogates.html similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tests/unit/unpaired-surrogates.html rename to tests/wpt/tests/resources/test/tests/unit/unpaired-surrogates.html diff --git a/tests/wpt/web-platform-tests/resources/test/tox.ini b/tests/wpt/tests/resources/test/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/tox.ini rename to tests/wpt/tests/resources/test/tox.ini diff --git a/tests/wpt/web-platform-tests/resources/test/wptserver.py b/tests/wpt/tests/resources/test/wptserver.py similarity index 100% rename from tests/wpt/web-platform-tests/resources/test/wptserver.py rename to tests/wpt/tests/resources/test/wptserver.py diff --git a/tests/wpt/web-platform-tests/resources/testdriver-actions.js b/tests/wpt/tests/resources/testdriver-actions.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/testdriver-actions.js rename to tests/wpt/tests/resources/testdriver-actions.js diff --git a/tests/wpt/web-platform-tests/resources/testdriver-vendor.js b/tests/wpt/tests/resources/testdriver-vendor.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/testdriver-vendor.js rename to tests/wpt/tests/resources/testdriver-vendor.js diff --git a/tests/wpt/web-platform-tests/resources/testdriver-vendor.js.headers b/tests/wpt/tests/resources/testdriver-vendor.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/testdriver-vendor.js.headers rename to tests/wpt/tests/resources/testdriver-vendor.js.headers diff --git a/tests/wpt/web-platform-tests/resources/testdriver.js b/tests/wpt/tests/resources/testdriver.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/testdriver.js rename to tests/wpt/tests/resources/testdriver.js diff --git a/tests/wpt/web-platform-tests/resources/testdriver.js.headers b/tests/wpt/tests/resources/testdriver.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/testdriver.js.headers rename to tests/wpt/tests/resources/testdriver.js.headers diff --git a/tests/wpt/web-platform-tests/resources/testharness.js b/tests/wpt/tests/resources/testharness.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/testharness.js rename to tests/wpt/tests/resources/testharness.js diff --git a/tests/wpt/web-platform-tests/resources/testharness.js.headers b/tests/wpt/tests/resources/testharness.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/testharness.js.headers rename to tests/wpt/tests/resources/testharness.js.headers diff --git a/tests/wpt/web-platform-tests/resources/testharnessreport.js b/tests/wpt/tests/resources/testharnessreport.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/testharnessreport.js rename to tests/wpt/tests/resources/testharnessreport.js diff --git a/tests/wpt/web-platform-tests/resources/testharnessreport.js.headers b/tests/wpt/tests/resources/testharnessreport.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/testharnessreport.js.headers rename to tests/wpt/tests/resources/testharnessreport.js.headers diff --git a/tests/wpt/web-platform-tests/resources/webidl2/build.sh b/tests/wpt/tests/resources/webidl2/build.sh similarity index 100% rename from tests/wpt/web-platform-tests/resources/webidl2/build.sh rename to tests/wpt/tests/resources/webidl2/build.sh diff --git a/tests/wpt/web-platform-tests/resources/webidl2/lib/README.md b/tests/wpt/tests/resources/webidl2/lib/README.md similarity index 100% rename from tests/wpt/web-platform-tests/resources/webidl2/lib/README.md rename to tests/wpt/tests/resources/webidl2/lib/README.md diff --git a/tests/wpt/web-platform-tests/resources/webidl2/lib/VERSION.md b/tests/wpt/tests/resources/webidl2/lib/VERSION.md similarity index 100% rename from tests/wpt/web-platform-tests/resources/webidl2/lib/VERSION.md rename to tests/wpt/tests/resources/webidl2/lib/VERSION.md diff --git a/tests/wpt/web-platform-tests/resources/webidl2/lib/webidl2.js b/tests/wpt/tests/resources/webidl2/lib/webidl2.js similarity index 100% rename from tests/wpt/web-platform-tests/resources/webidl2/lib/webidl2.js rename to tests/wpt/tests/resources/webidl2/lib/webidl2.js diff --git a/tests/wpt/web-platform-tests/resources/webidl2/lib/webidl2.js.headers b/tests/wpt/tests/resources/webidl2/lib/webidl2.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/resources/webidl2/lib/webidl2.js.headers rename to tests/wpt/tests/resources/webidl2/lib/webidl2.js.headers diff --git a/tests/wpt/web-platform-tests/sanitizer-api/META.yml b/tests/wpt/tests/sanitizer-api/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/sanitizer-api/META.yml rename to tests/wpt/tests/sanitizer-api/META.yml diff --git a/tests/wpt/web-platform-tests/sanitizer-api/element-set-sanitized-html.https.html b/tests/wpt/tests/sanitizer-api/element-set-sanitized-html.https.html similarity index 100% rename from tests/wpt/web-platform-tests/sanitizer-api/element-set-sanitized-html.https.html rename to tests/wpt/tests/sanitizer-api/element-set-sanitized-html.https.html diff --git a/tests/wpt/web-platform-tests/sanitizer-api/idlharness.https.window.js b/tests/wpt/tests/sanitizer-api/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/sanitizer-api/idlharness.https.window.js rename to tests/wpt/tests/sanitizer-api/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-config.https.html b/tests/wpt/tests/sanitizer-api/sanitizer-config.https.html similarity index 100% rename from tests/wpt/web-platform-tests/sanitizer-api/sanitizer-config.https.html rename to tests/wpt/tests/sanitizer-api/sanitizer-config.https.html diff --git a/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-insecure-context.html b/tests/wpt/tests/sanitizer-api/sanitizer-insecure-context.html similarity index 100% rename from tests/wpt/web-platform-tests/sanitizer-api/sanitizer-insecure-context.html rename to tests/wpt/tests/sanitizer-api/sanitizer-insecure-context.html diff --git a/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-names.https.html b/tests/wpt/tests/sanitizer-api/sanitizer-names.https.html similarity index 100% rename from tests/wpt/web-platform-tests/sanitizer-api/sanitizer-names.https.html rename to tests/wpt/tests/sanitizer-api/sanitizer-names.https.html diff --git a/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-query-config.https.html b/tests/wpt/tests/sanitizer-api/sanitizer-query-config.https.html similarity index 100% rename from tests/wpt/web-platform-tests/sanitizer-api/sanitizer-query-config.https.html rename to tests/wpt/tests/sanitizer-api/sanitizer-query-config.https.html diff --git a/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-sanitize.https.tentative.html b/tests/wpt/tests/sanitizer-api/sanitizer-sanitize.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/sanitizer-api/sanitizer-sanitize.https.tentative.html rename to tests/wpt/tests/sanitizer-api/sanitizer-sanitize.https.tentative.html diff --git a/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-sanitizeFor.https.tentative.html b/tests/wpt/tests/sanitizer-api/sanitizer-sanitizeFor.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/sanitizer-api/sanitizer-sanitizeFor.https.tentative.html rename to tests/wpt/tests/sanitizer-api/sanitizer-sanitizeFor.https.tentative.html diff --git a/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-secure-context.https.html b/tests/wpt/tests/sanitizer-api/sanitizer-secure-context.https.html similarity index 100% rename from tests/wpt/web-platform-tests/sanitizer-api/sanitizer-secure-context.https.html rename to tests/wpt/tests/sanitizer-api/sanitizer-secure-context.https.html diff --git a/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-unknown.https.html b/tests/wpt/tests/sanitizer-api/sanitizer-unknown.https.html similarity index 100% rename from tests/wpt/web-platform-tests/sanitizer-api/sanitizer-unknown.https.html rename to tests/wpt/tests/sanitizer-api/sanitizer-unknown.https.html diff --git a/tests/wpt/web-platform-tests/sanitizer-api/support/testcases.sub.js b/tests/wpt/tests/sanitizer-api/support/testcases.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/sanitizer-api/support/testcases.sub.js rename to tests/wpt/tests/sanitizer-api/support/testcases.sub.js diff --git a/tests/wpt/web-platform-tests/savedata/META.yml b/tests/wpt/tests/savedata/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/savedata/META.yml rename to tests/wpt/tests/savedata/META.yml diff --git a/tests/wpt/web-platform-tests/savedata/idlharness.any.js b/tests/wpt/tests/savedata/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/savedata/idlharness.any.js rename to tests/wpt/tests/savedata/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/META.yml b/tests/wpt/tests/scheduler/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/META.yml rename to tests/wpt/tests/scheduler/META.yml diff --git a/tests/wpt/web-platform-tests/scheduler/post-task-abort-reason.any.js b/tests/wpt/tests/scheduler/post-task-abort-reason.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/post-task-abort-reason.any.js rename to tests/wpt/tests/scheduler/post-task-abort-reason.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/post-task-delay.any.js b/tests/wpt/tests/scheduler/post-task-delay.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/post-task-delay.any.js rename to tests/wpt/tests/scheduler/post-task-delay.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/post-task-result-success.any.js b/tests/wpt/tests/scheduler/post-task-result-success.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/post-task-result-success.any.js rename to tests/wpt/tests/scheduler/post-task-result-success.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/post-task-result-throws.any.js b/tests/wpt/tests/scheduler/post-task-result-throws.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/post-task-result-throws.any.js rename to tests/wpt/tests/scheduler/post-task-result-throws.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/post-task-run-order.any.js b/tests/wpt/tests/scheduler/post-task-run-order.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/post-task-run-order.any.js rename to tests/wpt/tests/scheduler/post-task-run-order.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/post-task-then-detach.html b/tests/wpt/tests/scheduler/post-task-then-detach.html similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/post-task-then-detach.html rename to tests/wpt/tests/scheduler/post-task-then-detach.html diff --git a/tests/wpt/web-platform-tests/scheduler/post-task-with-abort-signal-in-handler.any.js b/tests/wpt/tests/scheduler/post-task-with-abort-signal-in-handler.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/post-task-with-abort-signal-in-handler.any.js rename to tests/wpt/tests/scheduler/post-task-with-abort-signal-in-handler.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/post-task-with-abort-signal.any.js b/tests/wpt/tests/scheduler/post-task-with-abort-signal.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/post-task-with-abort-signal.any.js rename to tests/wpt/tests/scheduler/post-task-with-abort-signal.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/post-task-with-aborted-signal.any.js b/tests/wpt/tests/scheduler/post-task-with-aborted-signal.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/post-task-with-aborted-signal.any.js rename to tests/wpt/tests/scheduler/post-task-with-aborted-signal.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/post-task-with-signal-and-priority.any.js b/tests/wpt/tests/scheduler/post-task-with-signal-and-priority.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/post-task-with-signal-and-priority.any.js rename to tests/wpt/tests/scheduler/post-task-with-signal-and-priority.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/post-task-with-signal-from-detached-iframe.html b/tests/wpt/tests/scheduler/post-task-with-signal-from-detached-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/post-task-with-signal-from-detached-iframe.html rename to tests/wpt/tests/scheduler/post-task-with-signal-from-detached-iframe.html diff --git a/tests/wpt/web-platform-tests/scheduler/post-task-without-signals.any.js b/tests/wpt/tests/scheduler/post-task-without-signals.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/post-task-without-signals.any.js rename to tests/wpt/tests/scheduler/post-task-without-signals.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/scheduler-replaceable.any.js b/tests/wpt/tests/scheduler/scheduler-replaceable.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/scheduler-replaceable.any.js rename to tests/wpt/tests/scheduler/scheduler-replaceable.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/task-controller-abort-completed-tasks.any.js b/tests/wpt/tests/scheduler/task-controller-abort-completed-tasks.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/task-controller-abort-completed-tasks.any.js rename to tests/wpt/tests/scheduler/task-controller-abort-completed-tasks.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/task-controller-abort-signal-and-priority.any.js b/tests/wpt/tests/scheduler/task-controller-abort-signal-and-priority.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/task-controller-abort-signal-and-priority.any.js rename to tests/wpt/tests/scheduler/task-controller-abort-signal-and-priority.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/task-controller-abort1.any.js b/tests/wpt/tests/scheduler/task-controller-abort1.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/task-controller-abort1.any.js rename to tests/wpt/tests/scheduler/task-controller-abort1.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/task-controller-abort2.any.js b/tests/wpt/tests/scheduler/task-controller-abort2.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/task-controller-abort2.any.js rename to tests/wpt/tests/scheduler/task-controller-abort2.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/task-controller-setPriority-delayed-task.any.js b/tests/wpt/tests/scheduler/task-controller-setPriority-delayed-task.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/task-controller-setPriority-delayed-task.any.js rename to tests/wpt/tests/scheduler/task-controller-setPriority-delayed-task.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/task-controller-setPriority-recursive.any.js b/tests/wpt/tests/scheduler/task-controller-setPriority-recursive.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/task-controller-setPriority-recursive.any.js rename to tests/wpt/tests/scheduler/task-controller-setPriority-recursive.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/task-controller-setPriority-repeated.any.js b/tests/wpt/tests/scheduler/task-controller-setPriority-repeated.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/task-controller-setPriority-repeated.any.js rename to tests/wpt/tests/scheduler/task-controller-setPriority-repeated.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/task-controller-setPriority1.any.js b/tests/wpt/tests/scheduler/task-controller-setPriority1.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/task-controller-setPriority1.any.js rename to tests/wpt/tests/scheduler/task-controller-setPriority1.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/task-controller-setPriority2.any.js b/tests/wpt/tests/scheduler/task-controller-setPriority2.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/task-controller-setPriority2.any.js rename to tests/wpt/tests/scheduler/task-controller-setPriority2.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/task-signal-any-abort.tentative.any.js b/tests/wpt/tests/scheduler/task-signal-any-abort.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/task-signal-any-abort.tentative.any.js rename to tests/wpt/tests/scheduler/task-signal-any-abort.tentative.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/task-signal-any-post-task-run-order.tentative.any.js b/tests/wpt/tests/scheduler/task-signal-any-post-task-run-order.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/task-signal-any-post-task-run-order.tentative.any.js rename to tests/wpt/tests/scheduler/task-signal-any-post-task-run-order.tentative.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/task-signal-any-priority.tentative.any.js b/tests/wpt/tests/scheduler/task-signal-any-priority.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/task-signal-any-priority.tentative.any.js rename to tests/wpt/tests/scheduler/task-signal-any-priority.tentative.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/task-signal-onprioritychange.any.js b/tests/wpt/tests/scheduler/task-signal-onprioritychange.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/task-signal-onprioritychange.any.js rename to tests/wpt/tests/scheduler/task-signal-onprioritychange.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/tentative/yield/yield-abort.any.js b/tests/wpt/tests/scheduler/tentative/yield/yield-abort.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/tentative/yield/yield-abort.any.js rename to tests/wpt/tests/scheduler/tentative/yield/yield-abort.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/tentative/yield/yield-inherit-across-promises.any.js b/tests/wpt/tests/scheduler/tentative/yield/yield-inherit-across-promises.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/tentative/yield/yield-inherit-across-promises.any.js rename to tests/wpt/tests/scheduler/tentative/yield/yield-inherit-across-promises.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/tentative/yield/yield-priority-idle-callbacks.html b/tests/wpt/tests/scheduler/tentative/yield/yield-priority-idle-callbacks.html similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/tentative/yield/yield-priority-idle-callbacks.html rename to tests/wpt/tests/scheduler/tentative/yield/yield-priority-idle-callbacks.html diff --git a/tests/wpt/web-platform-tests/scheduler/tentative/yield/yield-priority-posttask.any.js b/tests/wpt/tests/scheduler/tentative/yield/yield-priority-posttask.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/tentative/yield/yield-priority-posttask.any.js rename to tests/wpt/tests/scheduler/tentative/yield/yield-priority-posttask.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/tentative/yield/yield-priority-timers.any.js b/tests/wpt/tests/scheduler/tentative/yield/yield-priority-timers.any.js similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/tentative/yield/yield-priority-timers.any.js rename to tests/wpt/tests/scheduler/tentative/yield/yield-priority-timers.any.js diff --git a/tests/wpt/web-platform-tests/scheduler/tentative/yield/yield-then-detach.html b/tests/wpt/tests/scheduler/tentative/yield/yield-then-detach.html similarity index 100% rename from tests/wpt/web-platform-tests/scheduler/tentative/yield/yield-then-detach.html rename to tests/wpt/tests/scheduler/tentative/yield/yield-then-detach.html diff --git a/tests/wpt/web-platform-tests/screen-capture/META.yml b/tests/wpt/tests/screen-capture/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/screen-capture/META.yml rename to tests/wpt/tests/screen-capture/META.yml diff --git a/tests/wpt/web-platform-tests/screen-capture/delegate-request.https.sub.html b/tests/wpt/tests/screen-capture/delegate-request.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-capture/delegate-request.https.sub.html rename to tests/wpt/tests/screen-capture/delegate-request.https.sub.html diff --git a/tests/wpt/web-platform-tests/screen-capture/getdisplaymedia-after-discard.https.html b/tests/wpt/tests/screen-capture/getdisplaymedia-after-discard.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-capture/getdisplaymedia-after-discard.https.html rename to tests/wpt/tests/screen-capture/getdisplaymedia-after-discard.https.html diff --git a/tests/wpt/web-platform-tests/screen-capture/getdisplaymedia-capture-controller.https.window.js b/tests/wpt/tests/screen-capture/getdisplaymedia-capture-controller.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/screen-capture/getdisplaymedia-capture-controller.https.window.js rename to tests/wpt/tests/screen-capture/getdisplaymedia-capture-controller.https.window.js diff --git a/tests/wpt/web-platform-tests/screen-capture/getdisplaymedia-framerate.https.html b/tests/wpt/tests/screen-capture/getdisplaymedia-framerate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-capture/getdisplaymedia-framerate.https.html rename to tests/wpt/tests/screen-capture/getdisplaymedia-framerate.https.html diff --git a/tests/wpt/web-platform-tests/screen-capture/getdisplaymedia.https.html b/tests/wpt/tests/screen-capture/getdisplaymedia.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-capture/getdisplaymedia.https.html rename to tests/wpt/tests/screen-capture/getdisplaymedia.https.html diff --git a/tests/wpt/web-platform-tests/screen-capture/historical.https.html b/tests/wpt/tests/screen-capture/historical.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-capture/historical.https.html rename to tests/wpt/tests/screen-capture/historical.https.html diff --git a/tests/wpt/web-platform-tests/screen-capture/idlharness.https.window.js b/tests/wpt/tests/screen-capture/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/screen-capture/idlharness.https.window.js rename to tests/wpt/tests/screen-capture/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/screen-capture/permissions-policy-audio+video.https.sub.html b/tests/wpt/tests/screen-capture/permissions-policy-audio+video.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-capture/permissions-policy-audio+video.https.sub.html rename to tests/wpt/tests/screen-capture/permissions-policy-audio+video.https.sub.html diff --git a/tests/wpt/web-platform-tests/screen-capture/permissions-policy-audio.https.sub.html b/tests/wpt/tests/screen-capture/permissions-policy-audio.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-capture/permissions-policy-audio.https.sub.html rename to tests/wpt/tests/screen-capture/permissions-policy-audio.https.sub.html diff --git a/tests/wpt/web-platform-tests/screen-capture/permissions-policy-video.https.sub.html b/tests/wpt/tests/screen-capture/permissions-policy-video.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-capture/permissions-policy-video.https.sub.html rename to tests/wpt/tests/screen-capture/permissions-policy-video.https.sub.html diff --git a/tests/wpt/web-platform-tests/screen-capture/resources/delegate-request-subframe.sub.html b/tests/wpt/tests/screen-capture/resources/delegate-request-subframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-capture/resources/delegate-request-subframe.sub.html rename to tests/wpt/tests/screen-capture/resources/delegate-request-subframe.sub.html diff --git a/tests/wpt/web-platform-tests/screen-details/META.yml b/tests/wpt/tests/screen-details/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/screen-details/META.yml rename to tests/wpt/tests/screen-details/META.yml diff --git a/tests/wpt/web-platform-tests/screen-details/getScreenDetails.tentative.https.window.js b/tests/wpt/tests/screen-details/getScreenDetails.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/screen-details/getScreenDetails.tentative.https.window.js rename to tests/wpt/tests/screen-details/getScreenDetails.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/screen-details/isExtended.tentative.https.window.js b/tests/wpt/tests/screen-details/isExtended.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/screen-details/isExtended.tentative.https.window.js rename to tests/wpt/tests/screen-details/isExtended.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/screen-details/permission.https.window.js b/tests/wpt/tests/screen-details/permission.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/screen-details/permission.https.window.js rename to tests/wpt/tests/screen-details/permission.https.window.js diff --git a/tests/wpt/web-platform-tests/screen-orientation/META.yml b/tests/wpt/tests/screen-orientation/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/META.yml rename to tests/wpt/tests/screen-orientation/META.yml diff --git a/tests/wpt/web-platform-tests/screen-orientation/active-lock.html b/tests/wpt/tests/screen-orientation/active-lock.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/active-lock.html rename to tests/wpt/tests/screen-orientation/active-lock.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/event-before-promise.html b/tests/wpt/tests/screen-orientation/event-before-promise.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/event-before-promise.html rename to tests/wpt/tests/screen-orientation/event-before-promise.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/fullscreen-interactions.html b/tests/wpt/tests/screen-orientation/fullscreen-interactions.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/fullscreen-interactions.html rename to tests/wpt/tests/screen-orientation/fullscreen-interactions.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/hidden_document.html b/tests/wpt/tests/screen-orientation/hidden_document.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/hidden_document.html rename to tests/wpt/tests/screen-orientation/hidden_document.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/idlharness.window.js b/tests/wpt/tests/screen-orientation/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/idlharness.window.js rename to tests/wpt/tests/screen-orientation/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/screen-orientation/lock-bad-argument.html b/tests/wpt/tests/screen-orientation/lock-bad-argument.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/lock-bad-argument.html rename to tests/wpt/tests/screen-orientation/lock-bad-argument.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/lock-basic.html b/tests/wpt/tests/screen-orientation/lock-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/lock-basic.html rename to tests/wpt/tests/screen-orientation/lock-basic.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/lock-sandboxed-iframe.html b/tests/wpt/tests/screen-orientation/lock-sandboxed-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/lock-sandboxed-iframe.html rename to tests/wpt/tests/screen-orientation/lock-sandboxed-iframe.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/lock-unlock-check.html b/tests/wpt/tests/screen-orientation/lock-unlock-check.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/lock-unlock-check.html rename to tests/wpt/tests/screen-orientation/lock-unlock-check.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/nested-documents.html b/tests/wpt/tests/screen-orientation/nested-documents.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/nested-documents.html rename to tests/wpt/tests/screen-orientation/nested-documents.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/non-fully-active.html b/tests/wpt/tests/screen-orientation/non-fully-active.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/non-fully-active.html rename to tests/wpt/tests/screen-orientation/non-fully-active.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/onchange-event-subframe.html b/tests/wpt/tests/screen-orientation/onchange-event-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/onchange-event-subframe.html rename to tests/wpt/tests/screen-orientation/onchange-event-subframe.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/onchange-event.html b/tests/wpt/tests/screen-orientation/onchange-event.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/onchange-event.html rename to tests/wpt/tests/screen-orientation/onchange-event.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/orientation-reading.html b/tests/wpt/tests/screen-orientation/orientation-reading.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/orientation-reading.html rename to tests/wpt/tests/screen-orientation/orientation-reading.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/page-visibility-manual.html b/tests/wpt/tests/screen-orientation/page-visibility-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/page-visibility-manual.html rename to tests/wpt/tests/screen-orientation/page-visibility-manual.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/resources/empty.html b/tests/wpt/tests/screen-orientation/resources/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/resources/empty.html rename to tests/wpt/tests/screen-orientation/resources/empty.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/resources/iframe-listen-orientation-change.html b/tests/wpt/tests/screen-orientation/resources/iframe-listen-orientation-change.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/resources/iframe-listen-orientation-change.html rename to tests/wpt/tests/screen-orientation/resources/iframe-listen-orientation-change.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/resources/orientation-utils.js b/tests/wpt/tests/screen-orientation/resources/orientation-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/resources/orientation-utils.js rename to tests/wpt/tests/screen-orientation/resources/orientation-utils.js diff --git a/tests/wpt/web-platform-tests/screen-orientation/resources/sandboxed-iframe-locking.html b/tests/wpt/tests/screen-orientation/resources/sandboxed-iframe-locking.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/resources/sandboxed-iframe-locking.html rename to tests/wpt/tests/screen-orientation/resources/sandboxed-iframe-locking.html diff --git a/tests/wpt/web-platform-tests/screen-orientation/unlock.html b/tests/wpt/tests/screen-orientation/unlock.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-orientation/unlock.html rename to tests/wpt/tests/screen-orientation/unlock.html diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/META.yml b/tests/wpt/tests/screen-wake-lock/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/META.yml rename to tests/wpt/tests/screen-wake-lock/META.yml diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/chrome-bug-1348019.https.html b/tests/wpt/tests/screen-wake-lock/chrome-bug-1348019.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/chrome-bug-1348019.https.html rename to tests/wpt/tests/screen-wake-lock/chrome-bug-1348019.https.html diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/idlharness.https.window.js b/tests/wpt/tests/screen-wake-lock/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/idlharness.https.window.js rename to tests/wpt/tests/screen-wake-lock/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/resources/page1.html b/tests/wpt/tests/screen-wake-lock/resources/page1.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/resources/page1.html rename to tests/wpt/tests/screen-wake-lock/resources/page1.html diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/resources/page2.html b/tests/wpt/tests/screen-wake-lock/resources/page2.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/resources/page2.html rename to tests/wpt/tests/screen-wake-lock/resources/page2.html diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-active-document.https.window.js b/tests/wpt/tests/screen-wake-lock/wakelock-active-document.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-active-document.https.window.js rename to tests/wpt/tests/screen-wake-lock/wakelock-active-document.https.window.js diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-disabled-by-permissions-policy.https.html b/tests/wpt/tests/screen-wake-lock/wakelock-disabled-by-permissions-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-disabled-by-permissions-policy.https.html rename to tests/wpt/tests/screen-wake-lock/wakelock-disabled-by-permissions-policy.https.html diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-disabled-by-permissions-policy.https.html.headers b/tests/wpt/tests/screen-wake-lock/wakelock-disabled-by-permissions-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-disabled-by-permissions-policy.https.html.headers rename to tests/wpt/tests/screen-wake-lock/wakelock-disabled-by-permissions-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-document-hidden.https.html b/tests/wpt/tests/screen-wake-lock/wakelock-document-hidden.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-document-hidden.https.html rename to tests/wpt/tests/screen-wake-lock/wakelock-document-hidden.https.html diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-enabled-by-permissions-policy-attribute-redirect-on-load.https.html b/tests/wpt/tests/screen-wake-lock/wakelock-enabled-by-permissions-policy-attribute-redirect-on-load.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-enabled-by-permissions-policy-attribute-redirect-on-load.https.html rename to tests/wpt/tests/screen-wake-lock/wakelock-enabled-by-permissions-policy-attribute-redirect-on-load.https.html diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-enabled-by-permissions-policy-attribute.https.html b/tests/wpt/tests/screen-wake-lock/wakelock-enabled-by-permissions-policy-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-enabled-by-permissions-policy-attribute.https.html rename to tests/wpt/tests/screen-wake-lock/wakelock-enabled-by-permissions-policy-attribute.https.html diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-enabled-by-permissions-policy.https.html b/tests/wpt/tests/screen-wake-lock/wakelock-enabled-by-permissions-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-enabled-by-permissions-policy.https.html rename to tests/wpt/tests/screen-wake-lock/wakelock-enabled-by-permissions-policy.https.html diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-enabled-by-permissions-policy.https.html.headers b/tests/wpt/tests/screen-wake-lock/wakelock-enabled-by-permissions-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-enabled-by-permissions-policy.https.html.headers rename to tests/wpt/tests/screen-wake-lock/wakelock-enabled-by-permissions-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-enabled-on-self-origin-by-permissions-policy.https.html b/tests/wpt/tests/screen-wake-lock/wakelock-enabled-on-self-origin-by-permissions-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-enabled-on-self-origin-by-permissions-policy.https.html rename to tests/wpt/tests/screen-wake-lock/wakelock-enabled-on-self-origin-by-permissions-policy.https.html diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-enabled-on-self-origin-by-permissions-policy.https.html.headers b/tests/wpt/tests/screen-wake-lock/wakelock-enabled-on-self-origin-by-permissions-policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-enabled-on-self-origin-by-permissions-policy.https.html.headers rename to tests/wpt/tests/screen-wake-lock/wakelock-enabled-on-self-origin-by-permissions-policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-insecure-context.any.js b/tests/wpt/tests/screen-wake-lock/wakelock-insecure-context.any.js similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-insecure-context.any.js rename to tests/wpt/tests/screen-wake-lock/wakelock-insecure-context.any.js diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-onrelease.https.html b/tests/wpt/tests/screen-wake-lock/wakelock-onrelease.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-onrelease.https.html rename to tests/wpt/tests/screen-wake-lock/wakelock-onrelease.https.html diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-released.https.html b/tests/wpt/tests/screen-wake-lock/wakelock-released.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-released.https.html rename to tests/wpt/tests/screen-wake-lock/wakelock-released.https.html diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-request-denied.https.html b/tests/wpt/tests/screen-wake-lock/wakelock-request-denied.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-request-denied.https.html rename to tests/wpt/tests/screen-wake-lock/wakelock-request-denied.https.html diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-screen-type-on-worker.https.worker.js b/tests/wpt/tests/screen-wake-lock/wakelock-screen-type-on-worker.https.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-screen-type-on-worker.https.worker.js rename to tests/wpt/tests/screen-wake-lock/wakelock-screen-type-on-worker.https.worker.js diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-supported-by-permissions-policy.html b/tests/wpt/tests/screen-wake-lock/wakelock-supported-by-permissions-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-supported-by-permissions-policy.html rename to tests/wpt/tests/screen-wake-lock/wakelock-supported-by-permissions-policy.html diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-type.https.window.js b/tests/wpt/tests/screen-wake-lock/wakelock-type.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelock-type.https.window.js rename to tests/wpt/tests/screen-wake-lock/wakelock-type.https.window.js diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelockpermissiondescriptor.https.html b/tests/wpt/tests/screen-wake-lock/wakelockpermissiondescriptor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/screen-wake-lock/wakelockpermissiondescriptor.https.html rename to tests/wpt/tests/screen-wake-lock/wakelockpermissiondescriptor.https.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/META.yml b/tests/wpt/tests/scroll-animations/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/META.yml rename to tests/wpt/tests/scroll-animations/META.yml diff --git a/tests/wpt/web-platform-tests/scroll-animations/crashtests/invalid-animation-range.html b/tests/wpt/tests/scroll-animations/crashtests/invalid-animation-range.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/crashtests/invalid-animation-range.html rename to tests/wpt/tests/scroll-animations/crashtests/invalid-animation-range.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-duration-auto.tentative.html b/tests/wpt/tests/scroll-animations/css/animation-duration-auto.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-duration-auto.tentative.html rename to tests/wpt/tests/scroll-animations/css/animation-duration-auto.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-fill-outside-range-ref.html b/tests/wpt/tests/scroll-animations/css/animation-fill-outside-range-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-fill-outside-range-ref.html rename to tests/wpt/tests/scroll-animations/css/animation-fill-outside-range-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-fill-outside-range-test.html b/tests/wpt/tests/scroll-animations/css/animation-fill-outside-range-test.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-fill-outside-range-test.html rename to tests/wpt/tests/scroll-animations/css/animation-fill-outside-range-test.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-inactive-outside-range-ref.html b/tests/wpt/tests/scroll-animations/css/animation-inactive-outside-range-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-inactive-outside-range-ref.html rename to tests/wpt/tests/scroll-animations/css/animation-inactive-outside-range-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-inactive-outside-range-test.html b/tests/wpt/tests/scroll-animations/css/animation-inactive-outside-range-test.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-inactive-outside-range-test.html rename to tests/wpt/tests/scroll-animations/css/animation-inactive-outside-range-test.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-range-ignored.html b/tests/wpt/tests/scroll-animations/css/animation-range-ignored.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-range-ignored.html rename to tests/wpt/tests/scroll-animations/css/animation-range-ignored.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-range-normal-matches-cover.html b/tests/wpt/tests/scroll-animations/css/animation-range-normal-matches-cover.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-range-normal-matches-cover.html rename to tests/wpt/tests/scroll-animations/css/animation-range-normal-matches-cover.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-range-visual-test-ref.html b/tests/wpt/tests/scroll-animations/css/animation-range-visual-test-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-range-visual-test-ref.html rename to tests/wpt/tests/scroll-animations/css/animation-range-visual-test-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-range-visual-test.html b/tests/wpt/tests/scroll-animations/css/animation-range-visual-test.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-range-visual-test.html rename to tests/wpt/tests/scroll-animations/css/animation-range-visual-test.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-shorthand.html b/tests/wpt/tests/scroll-animations/css/animation-shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-shorthand.html rename to tests/wpt/tests/scroll-animations/css/animation-shorthand.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-computed.html b/tests/wpt/tests/scroll-animations/css/animation-timeline-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-computed.html rename to tests/wpt/tests/scroll-animations/css/animation-timeline-computed.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-deferred.html b/tests/wpt/tests/scroll-animations/css/animation-timeline-deferred.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-deferred.html rename to tests/wpt/tests/scroll-animations/css/animation-timeline-deferred.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-ignored.tentative.html b/tests/wpt/tests/scroll-animations/css/animation-timeline-ignored.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-ignored.tentative.html rename to tests/wpt/tests/scroll-animations/css/animation-timeline-ignored.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-in-keyframe.html b/tests/wpt/tests/scroll-animations/css/animation-timeline-in-keyframe.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-in-keyframe.html rename to tests/wpt/tests/scroll-animations/css/animation-timeline-in-keyframe.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-multiple.html b/tests/wpt/tests/scroll-animations/css/animation-timeline-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-multiple.html rename to tests/wpt/tests/scroll-animations/css/animation-timeline-multiple.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-named-scroll-progress-timeline.tentative.html b/tests/wpt/tests/scroll-animations/css/animation-timeline-named-scroll-progress-timeline.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-named-scroll-progress-timeline.tentative.html rename to tests/wpt/tests/scroll-animations/css/animation-timeline-named-scroll-progress-timeline.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-none.html b/tests/wpt/tests/scroll-animations/css/animation-timeline-none.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-none.html rename to tests/wpt/tests/scroll-animations/css/animation-timeline-none.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-parsing.html b/tests/wpt/tests/scroll-animations/css/animation-timeline-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-parsing.html rename to tests/wpt/tests/scroll-animations/css/animation-timeline-parsing.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-scroll-functional-notation.tentative.html b/tests/wpt/tests/scroll-animations/css/animation-timeline-scroll-functional-notation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-scroll-functional-notation.tentative.html rename to tests/wpt/tests/scroll-animations/css/animation-timeline-scroll-functional-notation.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-view-functional-notation.tentative.html b/tests/wpt/tests/scroll-animations/css/animation-timeline-view-functional-notation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-view-functional-notation.tentative.html rename to tests/wpt/tests/scroll-animations/css/animation-timeline-view-functional-notation.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-update-ref.html b/tests/wpt/tests/scroll-animations/css/animation-update-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/animation-update-ref.html rename to tests/wpt/tests/scroll-animations/css/animation-update-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/deferred-timeline-composited-ref.html b/tests/wpt/tests/scroll-animations/css/deferred-timeline-composited-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/deferred-timeline-composited-ref.html rename to tests/wpt/tests/scroll-animations/css/deferred-timeline-composited-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/deferred-timeline-composited.html b/tests/wpt/tests/scroll-animations/css/deferred-timeline-composited.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/deferred-timeline-composited.html rename to tests/wpt/tests/scroll-animations/css/deferred-timeline-composited.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/get-animations-inactive-timeline.html b/tests/wpt/tests/scroll-animations/css/get-animations-inactive-timeline.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/get-animations-inactive-timeline.html rename to tests/wpt/tests/scroll-animations/css/get-animations-inactive-timeline.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/merge-timeline-offset-keyframes.html b/tests/wpt/tests/scroll-animations/css/merge-timeline-offset-keyframes.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/merge-timeline-offset-keyframes.html rename to tests/wpt/tests/scroll-animations/css/merge-timeline-offset-keyframes.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/named-range-keyframes-with-document-timeline.tentative.html b/tests/wpt/tests/scroll-animations/css/named-range-keyframes-with-document-timeline.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/named-range-keyframes-with-document-timeline.tentative.html rename to tests/wpt/tests/scroll-animations/css/named-range-keyframes-with-document-timeline.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/printing/animation-timeline-none-with-progress-print.tentative.html b/tests/wpt/tests/scroll-animations/css/printing/animation-timeline-none-with-progress-print.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/printing/animation-timeline-none-with-progress-print.tentative.html rename to tests/wpt/tests/scroll-animations/css/printing/animation-timeline-none-with-progress-print.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/printing/animation-timeline-none-with-progress-ref.html b/tests/wpt/tests/scroll-animations/css/printing/animation-timeline-none-with-progress-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/printing/animation-timeline-none-with-progress-ref.html rename to tests/wpt/tests/scroll-animations/css/printing/animation-timeline-none-with-progress-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/printing/scroll-timeline-default-iframe-print.html b/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-iframe-print.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/printing/scroll-timeline-default-iframe-print.html rename to tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-iframe-print.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/printing/scroll-timeline-default-print-ref.html b/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/printing/scroll-timeline-default-print-ref.html rename to tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-print-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/printing/scroll-timeline-default-print.tentative.html b/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-print.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/printing/scroll-timeline-default-print.tentative.html rename to tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-default-print.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/printing/scroll-timeline-specified-scroller-print.html b/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-specified-scroller-print.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/printing/scroll-timeline-specified-scroller-print.html rename to tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-specified-scroller-print.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/printing/scroll-timeline-specified-scroller-ref.html b/tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-specified-scroller-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/printing/scroll-timeline-specified-scroller-ref.html rename to tests/wpt/tests/scroll-animations/css/printing/scroll-timeline-specified-scroller-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/progress-based-animation-animation-longhand-properties.tentative.html b/tests/wpt/tests/scroll-animations/css/progress-based-animation-animation-longhand-properties.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/progress-based-animation-animation-longhand-properties.tentative.html rename to tests/wpt/tests/scroll-animations/css/progress-based-animation-animation-longhand-properties.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/progress-based-animation-timeline.html b/tests/wpt/tests/scroll-animations/css/progress-based-animation-timeline.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/progress-based-animation-timeline.html rename to tests/wpt/tests/scroll-animations/css/progress-based-animation-timeline.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-animation-initial-offset-ref.html b/tests/wpt/tests/scroll-animations/css/scroll-animation-initial-offset-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-animation-initial-offset-ref.html rename to tests/wpt/tests/scroll-animations/css/scroll-animation-initial-offset-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-animation-initial-offset.html b/tests/wpt/tests/scroll-animations/css/scroll-animation-initial-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-animation-initial-offset.html rename to tests/wpt/tests/scroll-animations/css/scroll-animation-initial-offset.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-axis-computed.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-axis-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-axis-computed.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-axis-computed.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-axis-parsing.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-axis-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-axis-parsing.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-axis-parsing.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-axis-writing-mode.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-axis-writing-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-axis-writing-mode.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-axis-writing-mode.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-default-iframe-ref.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-default-iframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-default-iframe-ref.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-default-iframe-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-default-iframe.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-default-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-default-iframe.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-default-iframe.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-default-quirks-mode.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-default-quirks-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-default-quirks-mode.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-default-quirks-mode.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-default-ref.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-default-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-default-ref.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-default-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-default-writing-mode-rl-ref.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-default-writing-mode-rl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-default-writing-mode-rl-ref.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-default-writing-mode-rl-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-default-writing-mode-rl.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-default-writing-mode-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-default-writing-mode-rl.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-default-writing-mode-rl.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-default.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-default.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-default.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-default.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-document-scroller-quirks.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-document-scroller-quirks.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-document-scroller-quirks.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-document-scroller-quirks.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-dynamic.tentative.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-dynamic.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-dynamic.tentative.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-dynamic.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-frame-size-changed-ref.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-frame-size-changed-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-frame-size-changed-ref.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-frame-size-changed-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-frame-size-changed.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-frame-size-changed.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-frame-size-changed.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-frame-size-changed.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-in-container-query.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-in-container-query.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-in-container-query.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-in-container-query.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-inactive.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-inactive.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-inactive.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-inactive.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-inline-orientation-ref.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-inline-orientation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-inline-orientation-ref.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-inline-orientation-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-inline-orientation.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-inline-orientation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-inline-orientation.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-inline-orientation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-multi-pass.tentative.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-multi-pass.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-multi-pass.tentative.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-multi-pass.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-name-computed.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-name-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-name-computed.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-name-computed.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-name-parsing.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-name-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-name-parsing.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-name-parsing.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-name-shadow.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-name-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-name-shadow.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-name-shadow.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-nearest-dirty.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-nearest-dirty.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-nearest-dirty.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-nearest-dirty.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-nearest-with-absolute-positioned-element.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-nearest-with-absolute-positioned-element.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-nearest-with-absolute-positioned-element.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-nearest-with-absolute-positioned-element.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-paused-animations.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-paused-animations.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-paused-animations.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-paused-animations.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-range-animation.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-range-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-range-animation.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-range-animation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-responsiveness-from-endpoint.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-responsiveness-from-endpoint.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-responsiveness-from-endpoint.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-responsiveness-from-endpoint.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-root-dirty.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-root-dirty.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-root-dirty.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-root-dirty.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-sampling.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-sampling.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-sampling.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-sampling.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-shorthand.tentative.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-shorthand.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-shorthand.tentative.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-shorthand.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-update-reversed-animation.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-update-reversed-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-update-reversed-animation.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-update-reversed-animation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-with-percent-delay.tentative.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-with-percent-delay.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-with-percent-delay.tentative.html rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-with-percent-delay.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/support/animation-range.css b/tests/wpt/tests/scroll-animations/css/support/animation-range.css similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/support/animation-range.css rename to tests/wpt/tests/scroll-animations/css/support/animation-range.css diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/support/testcommon.js b/tests/wpt/tests/scroll-animations/css/support/testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/support/testcommon.js rename to tests/wpt/tests/scroll-animations/css/support/testcommon.js diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/timeline-offset-in-keyframe-change-timeline.tentative.html b/tests/wpt/tests/scroll-animations/css/timeline-offset-in-keyframe-change-timeline.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/timeline-offset-in-keyframe-change-timeline.tentative.html rename to tests/wpt/tests/scroll-animations/css/timeline-offset-in-keyframe-change-timeline.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/timeline-offset-keyframes-hidden-subject.html b/tests/wpt/tests/scroll-animations/css/timeline-offset-keyframes-hidden-subject.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/timeline-offset-keyframes-hidden-subject.html rename to tests/wpt/tests/scroll-animations/css/timeline-offset-keyframes-hidden-subject.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/timeline-offset-keyframes-with-document-timeline.html b/tests/wpt/tests/scroll-animations/css/timeline-offset-keyframes-with-document-timeline.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/timeline-offset-keyframes-with-document-timeline.html rename to tests/wpt/tests/scroll-animations/css/timeline-offset-keyframes-with-document-timeline.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/timeline-range-name-offset-in-keyframes.tentative.html b/tests/wpt/tests/scroll-animations/css/timeline-range-name-offset-in-keyframes.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/timeline-range-name-offset-in-keyframes.tentative.html rename to tests/wpt/tests/scroll-animations/css/timeline-range-name-offset-in-keyframes.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/timeline-scope-computed.tentative.html b/tests/wpt/tests/scroll-animations/css/timeline-scope-computed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/timeline-scope-computed.tentative.html rename to tests/wpt/tests/scroll-animations/css/timeline-scope-computed.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/timeline-scope-parsing.tentative.html b/tests/wpt/tests/scroll-animations/css/timeline-scope-parsing.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/timeline-scope-parsing.tentative.html rename to tests/wpt/tests/scroll-animations/css/timeline-scope-parsing.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/timeline-scope.html b/tests/wpt/tests/scroll-animations/css/timeline-scope.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/timeline-scope.html rename to tests/wpt/tests/scroll-animations/css/timeline-scope.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-animation-range-update.tentative.html b/tests/wpt/tests/scroll-animations/css/view-timeline-animation-range-update.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-animation-range-update.tentative.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-animation-range-update.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-animation.html b/tests/wpt/tests/scroll-animations/css/view-timeline-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-animation.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-animation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-axis-computed.html b/tests/wpt/tests/scroll-animations/css/view-timeline-axis-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-axis-computed.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-axis-computed.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-axis-parsing.html b/tests/wpt/tests/scroll-animations/css/view-timeline-axis-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-axis-parsing.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-axis-parsing.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-dynamic.html b/tests/wpt/tests/scroll-animations/css/view-timeline-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-dynamic.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-dynamic.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-inset-animation.html b/tests/wpt/tests/scroll-animations/css/view-timeline-inset-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-inset-animation.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-inset-animation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-inset-computed.html b/tests/wpt/tests/scroll-animations/css/view-timeline-inset-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-inset-computed.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-inset-computed.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-inset-parsing.html b/tests/wpt/tests/scroll-animations/css/view-timeline-inset-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-inset-parsing.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-inset-parsing.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-keyframe-boundary-interpolation.html b/tests/wpt/tests/scroll-animations/css/view-timeline-keyframe-boundary-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-keyframe-boundary-interpolation.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-keyframe-boundary-interpolation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-lookup.html b/tests/wpt/tests/scroll-animations/css/view-timeline-lookup.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-lookup.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-lookup.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-name-computed.html b/tests/wpt/tests/scroll-animations/css/view-timeline-name-computed.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-name-computed.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-name-computed.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-name-parsing.html b/tests/wpt/tests/scroll-animations/css/view-timeline-name-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-name-parsing.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-name-parsing.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-name-shadow.html b/tests/wpt/tests/scroll-animations/css/view-timeline-name-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-name-shadow.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-name-shadow.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-range-animation.html b/tests/wpt/tests/scroll-animations/css/view-timeline-range-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-range-animation.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-range-animation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-range-update-reversed-animation.html b/tests/wpt/tests/scroll-animations/css/view-timeline-range-update-reversed-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-range-update-reversed-animation.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-range-update-reversed-animation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-range-update.html b/tests/wpt/tests/scroll-animations/css/view-timeline-range-update.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-range-update.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-range-update.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-shorthand.tentative.html b/tests/wpt/tests/scroll-animations/css/view-timeline-shorthand.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-shorthand.tentative.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-shorthand.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-subject-bounds-update.html b/tests/wpt/tests/scroll-animations/css/view-timeline-subject-bounds-update.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-subject-bounds-update.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-subject-bounds-update.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-used-values.html b/tests/wpt/tests/scroll-animations/css/view-timeline-used-values.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-used-values.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-used-values.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-with-delay-and-range.tentative.html b/tests/wpt/tests/scroll-animations/css/view-timeline-with-delay-and-range.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-with-delay-and-range.tentative.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-with-delay-and-range.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-with-transform-on-subject.html b/tests/wpt/tests/scroll-animations/css/view-timeline-with-transform-on-subject.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/css/view-timeline-with-transform-on-subject.html rename to tests/wpt/tests/scroll-animations/css/view-timeline-with-transform-on-subject.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-ref.html b/tests/wpt/tests/scroll-animations/scroll-timelines/animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-ref.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/animation-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-animatable-interface.html b/tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-animatable-interface.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-animatable-interface.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-animatable-interface.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-delay-crash.html b/tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-delay-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-delay-crash.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-delay-crash.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-display-none.html b/tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-display-none.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-display-none.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-offsets-crash.html b/tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-offsets-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-offsets-crash.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-offsets-crash.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-overflow-hidden-ref.html b/tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-overflow-hidden-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-overflow-hidden-ref.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-overflow-hidden-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-overflow-hidden.html b/tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-overflow-hidden.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-overflow-hidden.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-overflow-hidden.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-root-scroller-ref.html b/tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-root-scroller-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-root-scroller-ref.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-root-scroller-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-root-scroller.html b/tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-root-scroller.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-root-scroller.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-root-scroller.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-transform.html b/tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/animation-with-transform.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/animation-with-transform.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/cancel-animation.html b/tests/wpt/tests/scroll-animations/scroll-timelines/cancel-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/cancel-animation.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/cancel-animation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/constructor-no-document.html b/tests/wpt/tests/scroll-animations/scroll-timelines/constructor-no-document.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/constructor-no-document.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/constructor-no-document.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/constructor.html b/tests/wpt/tests/scroll-animations/scroll-timelines/constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/constructor.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/constructor.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/current-time-nan.html b/tests/wpt/tests/scroll-animations/scroll-timelines/current-time-nan.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/current-time-nan.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/current-time-nan.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/current-time-root-scroller.html b/tests/wpt/tests/scroll-animations/scroll-timelines/current-time-root-scroller.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/current-time-root-scroller.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/current-time-root-scroller.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/current-time-writing-modes.html b/tests/wpt/tests/scroll-animations/scroll-timelines/current-time-writing-modes.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/current-time-writing-modes.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/current-time-writing-modes.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/effect-updateTiming.html b/tests/wpt/tests/scroll-animations/scroll-timelines/effect-updateTiming.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/effect-updateTiming.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/effect-updateTiming.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/finish-animation.html b/tests/wpt/tests/scroll-animations/scroll-timelines/finish-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/finish-animation.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/finish-animation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/idlharness.window.js b/tests/wpt/tests/scroll-animations/scroll-timelines/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/idlharness.window.js rename to tests/wpt/tests/scroll-animations/scroll-timelines/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/intrinsic-iteration-duration.tentative.html b/tests/wpt/tests/scroll-animations/scroll-timelines/intrinsic-iteration-duration.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/intrinsic-iteration-duration.tentative.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/intrinsic-iteration-duration.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/layout-changes-on-percentage-based-timeline.html b/tests/wpt/tests/scroll-animations/scroll-timelines/layout-changes-on-percentage-based-timeline.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/layout-changes-on-percentage-based-timeline.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/layout-changes-on-percentage-based-timeline.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/null-scroll-source-crash.html b/tests/wpt/tests/scroll-animations/scroll-timelines/null-scroll-source-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/null-scroll-source-crash.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/null-scroll-source-crash.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/pause-animation.html b/tests/wpt/tests/scroll-animations/scroll-timelines/pause-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/pause-animation.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/pause-animation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/play-animation.html b/tests/wpt/tests/scroll-animations/scroll-timelines/play-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/play-animation.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/play-animation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/progress-based-effect-delay-ref.html b/tests/wpt/tests/scroll-animations/scroll-timelines/progress-based-effect-delay-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/progress-based-effect-delay-ref.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/progress-based-effect-delay-ref.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/progress-based-effect-delay.tentative.html b/tests/wpt/tests/scroll-animations/scroll-timelines/progress-based-effect-delay.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/progress-based-effect-delay.tentative.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/progress-based-effect-delay.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/reverse-animation.html b/tests/wpt/tests/scroll-animations/scroll-timelines/reverse-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/reverse-animation.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/reverse-animation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-animation-effect-fill-modes.tentative.html b/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-animation-effect-fill-modes.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-animation-effect-fill-modes.tentative.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/scroll-animation-effect-fill-modes.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-animation-effect-phases.tentative.html b/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-animation-effect-phases.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-animation-effect-phases.tentative.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/scroll-animation-effect-phases.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-animation-inactive-timeline.html b/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-animation-inactive-timeline.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-animation-inactive-timeline.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/scroll-animation-inactive-timeline.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-animation.html b/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-animation.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/scroll-animation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-timeline-in-removed-iframe-crash.html b/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-timeline-in-removed-iframe-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-timeline-in-removed-iframe-crash.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/scroll-timeline-in-removed-iframe-crash.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-timeline-invalidation.html b/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-timeline-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-timeline-invalidation.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/scroll-timeline-invalidation.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-timeline-range.html b/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-timeline-range.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-timeline-range.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/scroll-timeline-range.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-timeline-snapshotting.html b/tests/wpt/tests/scroll-animations/scroll-timelines/scroll-timeline-snapshotting.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/scroll-timeline-snapshotting.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/scroll-timeline-snapshotting.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/set-current-time-before-play.html b/tests/wpt/tests/scroll-animations/scroll-timelines/set-current-time-before-play.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/set-current-time-before-play.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/set-current-time-before-play.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/setting-current-time.html b/tests/wpt/tests/scroll-animations/scroll-timelines/setting-current-time.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/setting-current-time.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/setting-current-time.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/setting-playback-rate.html b/tests/wpt/tests/scroll-animations/scroll-timelines/setting-playback-rate.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/setting-playback-rate.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/setting-playback-rate.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/setting-start-time.html b/tests/wpt/tests/scroll-animations/scroll-timelines/setting-start-time.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/setting-start-time.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/setting-start-time.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/setting-timeline.tentative.html b/tests/wpt/tests/scroll-animations/scroll-timelines/setting-timeline.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/setting-timeline.tentative.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/setting-timeline.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/source-quirks-mode.html b/tests/wpt/tests/scroll-animations/scroll-timelines/source-quirks-mode.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/source-quirks-mode.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/source-quirks-mode.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/testcommon.js b/tests/wpt/tests/scroll-animations/scroll-timelines/testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/testcommon.js rename to tests/wpt/tests/scroll-animations/scroll-timelines/testcommon.js diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline-cancel-one.html b/tests/wpt/tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline-cancel-one.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline-cancel-one.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline-cancel-one.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline.html b/tests/wpt/tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/two-animations-attach-to-same-scroll-timeline.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/update-playback-rate.html b/tests/wpt/tests/scroll-animations/scroll-timelines/update-playback-rate.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/update-playback-rate.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/update-playback-rate.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/updating-the-finished-state.html b/tests/wpt/tests/scroll-animations/scroll-timelines/updating-the-finished-state.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/scroll-timelines/updating-the-finished-state.html rename to tests/wpt/tests/scroll-animations/scroll-timelines/updating-the-finished-state.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/animation-events.html b/tests/wpt/tests/scroll-animations/view-timelines/animation-events.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/animation-events.html rename to tests/wpt/tests/scroll-animations/view-timelines/animation-events.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/block-view-timeline-current-time-vertical-rl.tentative.html b/tests/wpt/tests/scroll-animations/view-timelines/block-view-timeline-current-time-vertical-rl.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/block-view-timeline-current-time-vertical-rl.tentative.html rename to tests/wpt/tests/scroll-animations/view-timelines/block-view-timeline-current-time-vertical-rl.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/block-view-timeline-current-time.tentative.html b/tests/wpt/tests/scroll-animations/view-timelines/block-view-timeline-current-time.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/block-view-timeline-current-time.tentative.html rename to tests/wpt/tests/scroll-animations/view-timelines/block-view-timeline-current-time.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/block-view-timeline-nested-subject.tentative.html b/tests/wpt/tests/scroll-animations/view-timelines/block-view-timeline-nested-subject.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/block-view-timeline-nested-subject.tentative.html rename to tests/wpt/tests/scroll-animations/view-timelines/block-view-timeline-nested-subject.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/change-animation-range-updates-play-state.html b/tests/wpt/tests/scroll-animations/view-timelines/change-animation-range-updates-play-state.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/change-animation-range-updates-play-state.html rename to tests/wpt/tests/scroll-animations/view-timelines/change-animation-range-updates-play-state.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/get-keyframes-with-timeline-offset.html b/tests/wpt/tests/scroll-animations/view-timelines/get-keyframes-with-timeline-offset.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/get-keyframes-with-timeline-offset.html rename to tests/wpt/tests/scroll-animations/view-timelines/get-keyframes-with-timeline-offset.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/inline-view-timeline-current-time.tentative.html b/tests/wpt/tests/scroll-animations/view-timelines/inline-view-timeline-current-time.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/inline-view-timeline-current-time.tentative.html rename to tests/wpt/tests/scroll-animations/view-timelines/inline-view-timeline-current-time.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/testcommon.js b/tests/wpt/tests/scroll-animations/view-timelines/testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/testcommon.js rename to tests/wpt/tests/scroll-animations/view-timelines/testcommon.js diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/timeline-offset-in-keyframe.html b/tests/wpt/tests/scroll-animations/view-timelines/timeline-offset-in-keyframe.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/timeline-offset-in-keyframe.html rename to tests/wpt/tests/scroll-animations/view-timelines/timeline-offset-in-keyframe.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-get-current-time-range-name.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-get-current-time-range-name.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-get-current-time-range-name.html rename to tests/wpt/tests/scroll-animations/view-timelines/view-timeline-get-current-time-range-name.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-get-set-range.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-get-set-range.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-get-set-range.html rename to tests/wpt/tests/scroll-animations/view-timelines/view-timeline-get-set-range.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-inset.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-inset.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-inset.html rename to tests/wpt/tests/scroll-animations/view-timelines/view-timeline-inset.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-missing-subject.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-missing-subject.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-missing-subject.html rename to tests/wpt/tests/scroll-animations/view-timelines/view-timeline-missing-subject.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-on-display-none-element.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-on-display-none-element.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-on-display-none-element.html rename to tests/wpt/tests/scroll-animations/view-timelines/view-timeline-on-display-none-element.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-range-large-subject.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-range-large-subject.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-range-large-subject.html rename to tests/wpt/tests/scroll-animations/view-timelines/view-timeline-range-large-subject.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-range.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-range.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-range.html rename to tests/wpt/tests/scroll-animations/view-timelines/view-timeline-range.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-root-source.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-root-source.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-root-source.html rename to tests/wpt/tests/scroll-animations/view-timelines/view-timeline-root-source.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-snapport.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-snapport.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-snapport.html rename to tests/wpt/tests/scroll-animations/view-timelines/view-timeline-snapport.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-source.tentative.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-source.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-source.tentative.html rename to tests/wpt/tests/scroll-animations/view-timelines/view-timeline-source.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-sticky-block.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-sticky-block.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-sticky-block.html rename to tests/wpt/tests/scroll-animations/view-timelines/view-timeline-sticky-block.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-sticky-inline.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-sticky-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-sticky-inline.html rename to tests/wpt/tests/scroll-animations/view-timelines/view-timeline-sticky-inline.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-subject-size-changes.html b/tests/wpt/tests/scroll-animations/view-timelines/view-timeline-subject-size-changes.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/view-timeline-subject-size-changes.html rename to tests/wpt/tests/scroll-animations/view-timelines/view-timeline-subject-size-changes.html diff --git a/tests/wpt/web-platform-tests/scroll-animations/view-timelines/zero-intrinsic-iteration-duration.tentative.html b/tests/wpt/tests/scroll-animations/view-timelines/zero-intrinsic-iteration-duration.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-animations/view-timelines/zero-intrinsic-iteration-duration.tentative.html rename to tests/wpt/tests/scroll-animations/view-timelines/zero-intrinsic-iteration-duration.tentative.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/META.yml b/tests/wpt/tests/scroll-to-text-fragment/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/META.yml rename to tests/wpt/tests/scroll-to-text-fragment/META.yml diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/client-redirect.html b/tests/wpt/tests/scroll-to-text-fragment/client-redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/client-redirect.html rename to tests/wpt/tests/scroll-to-text-fragment/client-redirect.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/find-range-from-text-directive-target.html b/tests/wpt/tests/scroll-to-text-fragment/find-range-from-text-directive-target.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/find-range-from-text-directive-target.html rename to tests/wpt/tests/scroll-to-text-fragment/find-range-from-text-directive-target.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/find-range-from-text-directive.html b/tests/wpt/tests/scroll-to-text-fragment/find-range-from-text-directive.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/find-range-from-text-directive.html rename to tests/wpt/tests/scroll-to-text-fragment/find-range-from-text-directive.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top-target.html b/tests/wpt/tests/scroll-to-text-fragment/force-load-at-top-target.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top-target.html rename to tests/wpt/tests/scroll-to-text-fragment/force-load-at-top-target.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top-target.html.headers b/tests/wpt/tests/scroll-to-text-fragment/force-load-at-top-target.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top-target.html.headers rename to tests/wpt/tests/scroll-to-text-fragment/force-load-at-top-target.html.headers diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top.html b/tests/wpt/tests/scroll-to-text-fragment/force-load-at-top.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top.html rename to tests/wpt/tests/scroll-to-text-fragment/force-load-at-top.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top.js b/tests/wpt/tests/scroll-to-text-fragment/force-load-at-top.js similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/force-load-at-top.js rename to tests/wpt/tests/scroll-to-text-fragment/force-load-at-top.js diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/idlharness.window.js b/tests/wpt/tests/scroll-to-text-fragment/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/idlharness.window.js rename to tests/wpt/tests/scroll-to-text-fragment/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/iframe-scroll.sub.html b/tests/wpt/tests/scroll-to-text-fragment/iframe-scroll.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/iframe-scroll.sub.html rename to tests/wpt/tests/scroll-to-text-fragment/iframe-scroll.sub.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/iframe-target.html b/tests/wpt/tests/scroll-to-text-fragment/iframe-target.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/iframe-target.html rename to tests/wpt/tests/scroll-to-text-fragment/iframe-target.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/iframes.sub.html b/tests/wpt/tests/scroll-to-text-fragment/iframes.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/iframes.sub.html rename to tests/wpt/tests/scroll-to-text-fragment/iframes.sub.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/navigate-back.html b/tests/wpt/tests/scroll-to-text-fragment/navigate-back.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/navigate-back.html rename to tests/wpt/tests/scroll-to-text-fragment/navigate-back.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/no-force-load-at-top-target.html b/tests/wpt/tests/scroll-to-text-fragment/no-force-load-at-top-target.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/no-force-load-at-top-target.html rename to tests/wpt/tests/scroll-to-text-fragment/no-force-load-at-top-target.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/no-force-load-at-top-target.html.headers b/tests/wpt/tests/scroll-to-text-fragment/no-force-load-at-top-target.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/no-force-load-at-top-target.html.headers rename to tests/wpt/tests/scroll-to-text-fragment/no-force-load-at-top-target.html.headers diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/non-html-documents.html b/tests/wpt/tests/scroll-to-text-fragment/non-html-documents.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/non-html-documents.html rename to tests/wpt/tests/scroll-to-text-fragment/non-html-documents.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects-target.html b/tests/wpt/tests/scroll-to-text-fragment/redirects-target.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects-target.html rename to tests/wpt/tests/scroll-to-text-fragment/redirects-target.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects-target2.html b/tests/wpt/tests/scroll-to-text-fragment/redirects-target2.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects-target2.html rename to tests/wpt/tests/scroll-to-text-fragment/redirects-target2.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects.html b/tests/wpt/tests/scroll-to-text-fragment/redirects.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects.html rename to tests/wpt/tests/scroll-to-text-fragment/redirects.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/resources/non-html.css b/tests/wpt/tests/scroll-to-text-fragment/resources/non-html.css similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/resources/non-html.css rename to tests/wpt/tests/scroll-to-text-fragment/resources/non-html.css diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/resources/non-html.js b/tests/wpt/tests/scroll-to-text-fragment/resources/non-html.js similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/resources/non-html.js rename to tests/wpt/tests/scroll-to-text-fragment/resources/non-html.js diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/resources/non-html.json b/tests/wpt/tests/scroll-to-text-fragment/resources/non-html.json similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/resources/non-html.json rename to tests/wpt/tests/scroll-to-text-fragment/resources/non-html.json diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/resources/non-html.txt b/tests/wpt/tests/scroll-to-text-fragment/resources/non-html.txt similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/resources/non-html.txt rename to tests/wpt/tests/scroll-to-text-fragment/resources/non-html.txt diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/resources/non-html.xml b/tests/wpt/tests/scroll-to-text-fragment/resources/non-html.xml similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/resources/non-html.xml rename to tests/wpt/tests/scroll-to-text-fragment/resources/non-html.xml diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/resources/self-text-directive-iframe.html b/tests/wpt/tests/scroll-to-text-fragment/resources/self-text-directive-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/resources/self-text-directive-iframe.html rename to tests/wpt/tests/scroll-to-text-fragment/resources/self-text-directive-iframe.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/same-document-tests.html b/tests/wpt/tests/scroll-to-text-fragment/same-document-tests.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/same-document-tests.html rename to tests/wpt/tests/scroll-to-text-fragment/same-document-tests.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-api.html b/tests/wpt/tests/scroll-to-text-fragment/scroll-to-text-fragment-api.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-api.html rename to tests/wpt/tests/scroll-to-text-fragment/scroll-to-text-fragment-api.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-same-doc.html b/tests/wpt/tests/scroll-to-text-fragment/scroll-to-text-fragment-same-doc.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-same-doc.html rename to tests/wpt/tests/scroll-to-text-fragment/scroll-to-text-fragment-same-doc.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-security.sub.html b/tests/wpt/tests/scroll-to-text-fragment/scroll-to-text-fragment-security.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-security.sub.html rename to tests/wpt/tests/scroll-to-text-fragment/scroll-to-text-fragment-security.sub.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html b/tests/wpt/tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html rename to tests/wpt/tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment.html b/tests/wpt/tests/scroll-to-text-fragment/scroll-to-text-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment.html rename to tests/wpt/tests/scroll-to-text-fragment/scroll-to-text-fragment.html diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/stash.js b/tests/wpt/tests/scroll-to-text-fragment/stash.js similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/stash.js rename to tests/wpt/tests/scroll-to-text-fragment/stash.js diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/stash.py b/tests/wpt/tests/scroll-to-text-fragment/stash.py similarity index 100% rename from tests/wpt/web-platform-tests/scroll-to-text-fragment/stash.py rename to tests/wpt/tests/scroll-to-text-fragment/stash.py diff --git a/tests/wpt/web-platform-tests/secure-contexts/META.yml b/tests/wpt/tests/secure-contexts/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/META.yml rename to tests/wpt/tests/secure-contexts/META.yml diff --git a/tests/wpt/web-platform-tests/secure-contexts/basic-dedicated-worker.html b/tests/wpt/tests/secure-contexts/basic-dedicated-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/basic-dedicated-worker.html rename to tests/wpt/tests/secure-contexts/basic-dedicated-worker.html diff --git a/tests/wpt/web-platform-tests/secure-contexts/basic-dedicated-worker.https.html b/tests/wpt/tests/secure-contexts/basic-dedicated-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/basic-dedicated-worker.https.html rename to tests/wpt/tests/secure-contexts/basic-dedicated-worker.https.html diff --git a/tests/wpt/web-platform-tests/secure-contexts/basic-popup-and-iframe-tests.html b/tests/wpt/tests/secure-contexts/basic-popup-and-iframe-tests.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/basic-popup-and-iframe-tests.html rename to tests/wpt/tests/secure-contexts/basic-popup-and-iframe-tests.html diff --git a/tests/wpt/web-platform-tests/secure-contexts/basic-popup-and-iframe-tests.https.html b/tests/wpt/tests/secure-contexts/basic-popup-and-iframe-tests.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/basic-popup-and-iframe-tests.https.html rename to tests/wpt/tests/secure-contexts/basic-popup-and-iframe-tests.https.html diff --git a/tests/wpt/web-platform-tests/secure-contexts/basic-popup-and-iframe-tests.https.js b/tests/wpt/tests/secure-contexts/basic-popup-and-iframe-tests.https.js similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/basic-popup-and-iframe-tests.https.js rename to tests/wpt/tests/secure-contexts/basic-popup-and-iframe-tests.https.js diff --git a/tests/wpt/web-platform-tests/secure-contexts/basic-shared-worker.html b/tests/wpt/tests/secure-contexts/basic-shared-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/basic-shared-worker.html rename to tests/wpt/tests/secure-contexts/basic-shared-worker.html diff --git a/tests/wpt/web-platform-tests/secure-contexts/basic-shared-worker.https.html b/tests/wpt/tests/secure-contexts/basic-shared-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/basic-shared-worker.https.html rename to tests/wpt/tests/secure-contexts/basic-shared-worker.https.html diff --git a/tests/wpt/web-platform-tests/secure-contexts/postMessage-helper.html b/tests/wpt/tests/secure-contexts/postMessage-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/postMessage-helper.html rename to tests/wpt/tests/secure-contexts/postMessage-helper.html diff --git a/tests/wpt/web-platform-tests/secure-contexts/postMessage-helper.https.html b/tests/wpt/tests/secure-contexts/postMessage-helper.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/postMessage-helper.https.html rename to tests/wpt/tests/secure-contexts/postMessage-helper.https.html diff --git a/tests/wpt/web-platform-tests/secure-contexts/server-locations.sub.js b/tests/wpt/tests/secure-contexts/server-locations.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/server-locations.sub.js rename to tests/wpt/tests/secure-contexts/server-locations.sub.js diff --git a/tests/wpt/web-platform-tests/secure-contexts/shared-worker-insecure-first.https.html b/tests/wpt/tests/secure-contexts/shared-worker-insecure-first.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/shared-worker-insecure-first.https.html rename to tests/wpt/tests/secure-contexts/shared-worker-insecure-first.https.html diff --git a/tests/wpt/web-platform-tests/secure-contexts/shared-worker-secure-first.https.html b/tests/wpt/tests/secure-contexts/shared-worker-secure-first.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/shared-worker-secure-first.https.html rename to tests/wpt/tests/secure-contexts/shared-worker-secure-first.https.html diff --git a/tests/wpt/web-platform-tests/secure-contexts/support/dedicated-worker-script.js b/tests/wpt/tests/secure-contexts/support/dedicated-worker-script.js similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/support/dedicated-worker-script.js rename to tests/wpt/tests/secure-contexts/support/dedicated-worker-script.js diff --git a/tests/wpt/web-platform-tests/secure-contexts/support/https-subframe-dedicated.html b/tests/wpt/tests/secure-contexts/support/https-subframe-dedicated.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/support/https-subframe-dedicated.html rename to tests/wpt/tests/secure-contexts/support/https-subframe-dedicated.html diff --git a/tests/wpt/web-platform-tests/secure-contexts/support/https-subframe-shared.html b/tests/wpt/tests/secure-contexts/support/https-subframe-shared.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/support/https-subframe-shared.html rename to tests/wpt/tests/secure-contexts/support/https-subframe-shared.html diff --git a/tests/wpt/web-platform-tests/secure-contexts/support/parent-dedicated-worker-script.js b/tests/wpt/tests/secure-contexts/support/parent-dedicated-worker-script.js similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/support/parent-dedicated-worker-script.js rename to tests/wpt/tests/secure-contexts/support/parent-dedicated-worker-script.js diff --git a/tests/wpt/web-platform-tests/secure-contexts/support/parent-shared-worker-script.js b/tests/wpt/tests/secure-contexts/support/parent-shared-worker-script.js similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/support/parent-shared-worker-script.js rename to tests/wpt/tests/secure-contexts/support/parent-shared-worker-script.js diff --git a/tests/wpt/web-platform-tests/secure-contexts/support/shared-worker-insecure-popup.html b/tests/wpt/tests/secure-contexts/support/shared-worker-insecure-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/support/shared-worker-insecure-popup.html rename to tests/wpt/tests/secure-contexts/support/shared-worker-insecure-popup.html diff --git a/tests/wpt/web-platform-tests/secure-contexts/support/shared-worker-script.js b/tests/wpt/tests/secure-contexts/support/shared-worker-script.js similarity index 100% rename from tests/wpt/web-platform-tests/secure-contexts/support/shared-worker-script.js rename to tests/wpt/tests/secure-contexts/support/shared-worker-script.js diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/META.yml b/tests/wpt/tests/secure-payment-confirmation/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/META.yml rename to tests/wpt/tests/secure-payment-confirmation/META.yml diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-accepted.https.html b/tests/wpt/tests/secure-payment-confirmation/authentication-accepted.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-accepted.https.html rename to tests/wpt/tests/secure-payment-confirmation/authentication-accepted.https.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-cannot-bypass-spc.https.html b/tests/wpt/tests/secure-payment-confirmation/authentication-cannot-bypass-spc.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-cannot-bypass-spc.https.html rename to tests/wpt/tests/secure-payment-confirmation/authentication-cannot-bypass-spc.https.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-cross-origin.sub.https.html b/tests/wpt/tests/secure-payment-confirmation/authentication-cross-origin.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-cross-origin.sub.https.html rename to tests/wpt/tests/secure-payment-confirmation/authentication-cross-origin.sub.https.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-icon-data-url.https.html b/tests/wpt/tests/secure-payment-confirmation/authentication-icon-data-url.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-icon-data-url.https.html rename to tests/wpt/tests/secure-payment-confirmation/authentication-icon-data-url.https.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-in-iframe.sub.https.html b/tests/wpt/tests/secure-payment-confirmation/authentication-in-iframe.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-in-iframe.sub.https.html rename to tests/wpt/tests/secure-payment-confirmation/authentication-in-iframe.sub.https.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-invalid-icon.https.html b/tests/wpt/tests/secure-payment-confirmation/authentication-invalid-icon.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-invalid-icon.https.html rename to tests/wpt/tests/secure-payment-confirmation/authentication-invalid-icon.https.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-optout.https.html b/tests/wpt/tests/secure-payment-confirmation/authentication-optout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-optout.https.html rename to tests/wpt/tests/secure-payment-confirmation/authentication-optout.https.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-rejected.https.html b/tests/wpt/tests/secure-payment-confirmation/authentication-rejected.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-rejected.https.html rename to tests/wpt/tests/secure-payment-confirmation/authentication-rejected.https.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-requires-user-activation.https.html b/tests/wpt/tests/secure-payment-confirmation/authentication-requires-user-activation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/authentication-requires-user-activation.https.html rename to tests/wpt/tests/secure-payment-confirmation/authentication-requires-user-activation.https.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/constructor-validate-payment-method-data.https.html b/tests/wpt/tests/secure-payment-confirmation/constructor-validate-payment-method-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/constructor-validate-payment-method-data.https.html rename to tests/wpt/tests/secure-payment-confirmation/constructor-validate-payment-method-data.https.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/constructor.https.html b/tests/wpt/tests/secure-payment-confirmation/constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/constructor.https.html rename to tests/wpt/tests/secure-payment-confirmation/constructor.https.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/enrollment-in-iframe.sub.https.html b/tests/wpt/tests/secure-payment-confirmation/enrollment-in-iframe.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/enrollment-in-iframe.sub.https.html rename to tests/wpt/tests/secure-payment-confirmation/enrollment-in-iframe.sub.https.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/enrollment.https.html b/tests/wpt/tests/secure-payment-confirmation/enrollment.https.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/enrollment.https.html rename to tests/wpt/tests/secure-payment-confirmation/enrollment.https.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/resources/iframe-authenticate.html b/tests/wpt/tests/secure-payment-confirmation/resources/iframe-authenticate.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/resources/iframe-authenticate.html rename to tests/wpt/tests/secure-payment-confirmation/resources/iframe-authenticate.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/resources/iframe-enroll.html b/tests/wpt/tests/secure-payment-confirmation/resources/iframe-enroll.html similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/resources/iframe-enroll.html rename to tests/wpt/tests/secure-payment-confirmation/resources/iframe-enroll.html diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/troy.png b/tests/wpt/tests/secure-payment-confirmation/troy.png similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/troy.png rename to tests/wpt/tests/secure-payment-confirmation/troy.png diff --git a/tests/wpt/web-platform-tests/secure-payment-confirmation/utils.sub.js b/tests/wpt/tests/secure-payment-confirmation/utils.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/secure-payment-confirmation/utils.sub.js rename to tests/wpt/tests/secure-payment-confirmation/utils.sub.js diff --git a/tests/wpt/web-platform-tests/selection/Document-open.html b/tests/wpt/tests/selection/Document-open.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/Document-open.html rename to tests/wpt/tests/selection/Document-open.html diff --git a/tests/wpt/web-platform-tests/selection/META.yml b/tests/wpt/tests/selection/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/selection/META.yml rename to tests/wpt/tests/selection/META.yml diff --git a/tests/wpt/web-platform-tests/selection/addRange-00.html b/tests/wpt/tests/selection/addRange-00.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-00.html rename to tests/wpt/tests/selection/addRange-00.html diff --git a/tests/wpt/web-platform-tests/selection/addRange-04.html b/tests/wpt/tests/selection/addRange-04.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-04.html rename to tests/wpt/tests/selection/addRange-04.html diff --git a/tests/wpt/web-platform-tests/selection/addRange-08.html b/tests/wpt/tests/selection/addRange-08.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-08.html rename to tests/wpt/tests/selection/addRange-08.html diff --git a/tests/wpt/web-platform-tests/selection/addRange-12.html b/tests/wpt/tests/selection/addRange-12.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-12.html rename to tests/wpt/tests/selection/addRange-12.html diff --git a/tests/wpt/web-platform-tests/selection/addRange-16.html b/tests/wpt/tests/selection/addRange-16.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-16.html rename to tests/wpt/tests/selection/addRange-16.html diff --git a/tests/wpt/web-platform-tests/selection/addRange-20.html b/tests/wpt/tests/selection/addRange-20.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-20.html rename to tests/wpt/tests/selection/addRange-20.html diff --git a/tests/wpt/web-platform-tests/selection/addRange-24.html b/tests/wpt/tests/selection/addRange-24.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-24.html rename to tests/wpt/tests/selection/addRange-24.html diff --git a/tests/wpt/web-platform-tests/selection/addRange-28.html b/tests/wpt/tests/selection/addRange-28.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-28.html rename to tests/wpt/tests/selection/addRange-28.html diff --git a/tests/wpt/web-platform-tests/selection/addRange-32.html b/tests/wpt/tests/selection/addRange-32.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-32.html rename to tests/wpt/tests/selection/addRange-32.html diff --git a/tests/wpt/web-platform-tests/selection/addRange-36.html b/tests/wpt/tests/selection/addRange-36.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-36.html rename to tests/wpt/tests/selection/addRange-36.html diff --git a/tests/wpt/web-platform-tests/selection/addRange-40.html b/tests/wpt/tests/selection/addRange-40.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-40.html rename to tests/wpt/tests/selection/addRange-40.html diff --git a/tests/wpt/web-platform-tests/selection/addRange-44.html b/tests/wpt/tests/selection/addRange-44.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-44.html rename to tests/wpt/tests/selection/addRange-44.html diff --git a/tests/wpt/web-platform-tests/selection/addRange-48.html b/tests/wpt/tests/selection/addRange-48.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-48.html rename to tests/wpt/tests/selection/addRange-48.html diff --git a/tests/wpt/web-platform-tests/selection/addRange-52.html b/tests/wpt/tests/selection/addRange-52.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-52.html rename to tests/wpt/tests/selection/addRange-52.html diff --git a/tests/wpt/web-platform-tests/selection/addRange-56.html b/tests/wpt/tests/selection/addRange-56.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange-56.html rename to tests/wpt/tests/selection/addRange-56.html diff --git a/tests/wpt/web-platform-tests/selection/addRange.htm b/tests/wpt/tests/selection/addRange.htm similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange.htm rename to tests/wpt/tests/selection/addRange.htm diff --git a/tests/wpt/web-platform-tests/selection/addRange.js b/tests/wpt/tests/selection/addRange.js similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange.js rename to tests/wpt/tests/selection/addRange.js diff --git a/tests/wpt/web-platform-tests/selection/addRange.tentative.html b/tests/wpt/tests/selection/addRange.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/addRange.tentative.html rename to tests/wpt/tests/selection/addRange.tentative.html diff --git a/tests/wpt/web-platform-tests/selection/anonymous/details-ancestor.html b/tests/wpt/tests/selection/anonymous/details-ancestor.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/anonymous/details-ancestor.html rename to tests/wpt/tests/selection/anonymous/details-ancestor.html diff --git a/tests/wpt/web-platform-tests/selection/anonymous/details-mutate.html b/tests/wpt/tests/selection/anonymous/details-mutate.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/anonymous/details-mutate.html rename to tests/wpt/tests/selection/anonymous/details-mutate.html diff --git a/tests/wpt/web-platform-tests/selection/bidi/modify.tentative.html b/tests/wpt/tests/selection/bidi/modify.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/bidi/modify.tentative.html rename to tests/wpt/tests/selection/bidi/modify.tentative.html diff --git a/tests/wpt/web-platform-tests/selection/caret/collapse-pre-linestart-1.html b/tests/wpt/tests/selection/caret/collapse-pre-linestart-1.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/caret/collapse-pre-linestart-1.html rename to tests/wpt/tests/selection/caret/collapse-pre-linestart-1.html diff --git a/tests/wpt/web-platform-tests/selection/caret/collapse-pre-linestart-2.html b/tests/wpt/tests/selection/caret/collapse-pre-linestart-2.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/caret/collapse-pre-linestart-2.html rename to tests/wpt/tests/selection/caret/collapse-pre-linestart-2.html diff --git a/tests/wpt/web-platform-tests/selection/caret/collapse-pre-linestart-ref.html b/tests/wpt/tests/selection/caret/collapse-pre-linestart-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/caret/collapse-pre-linestart-ref.html rename to tests/wpt/tests/selection/caret/collapse-pre-linestart-ref.html diff --git a/tests/wpt/web-platform-tests/selection/caret/empty-elements.html b/tests/wpt/tests/selection/caret/empty-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/caret/empty-elements.html rename to tests/wpt/tests/selection/caret/empty-elements.html diff --git a/tests/wpt/web-platform-tests/selection/collapse-00.html b/tests/wpt/tests/selection/collapse-00.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/collapse-00.html rename to tests/wpt/tests/selection/collapse-00.html diff --git a/tests/wpt/web-platform-tests/selection/collapse-15.html b/tests/wpt/tests/selection/collapse-15.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/collapse-15.html rename to tests/wpt/tests/selection/collapse-15.html diff --git a/tests/wpt/web-platform-tests/selection/collapse-30.html b/tests/wpt/tests/selection/collapse-30.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/collapse-30.html rename to tests/wpt/tests/selection/collapse-30.html diff --git a/tests/wpt/web-platform-tests/selection/collapse-45.html b/tests/wpt/tests/selection/collapse-45.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/collapse-45.html rename to tests/wpt/tests/selection/collapse-45.html diff --git a/tests/wpt/web-platform-tests/selection/collapse.htm b/tests/wpt/tests/selection/collapse.htm similarity index 100% rename from tests/wpt/web-platform-tests/selection/collapse.htm rename to tests/wpt/tests/selection/collapse.htm diff --git a/tests/wpt/web-platform-tests/selection/collapse.js b/tests/wpt/tests/selection/collapse.js similarity index 100% rename from tests/wpt/web-platform-tests/selection/collapse.js rename to tests/wpt/tests/selection/collapse.js diff --git a/tests/wpt/web-platform-tests/selection/collapseToStartEnd.html b/tests/wpt/tests/selection/collapseToStartEnd.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/collapseToStartEnd.html rename to tests/wpt/tests/selection/collapseToStartEnd.html diff --git a/tests/wpt/web-platform-tests/selection/common.js b/tests/wpt/tests/selection/common.js similarity index 100% rename from tests/wpt/web-platform-tests/selection/common.js rename to tests/wpt/tests/selection/common.js diff --git a/tests/wpt/web-platform-tests/selection/contenteditable/cefalse-on-boundaries.html b/tests/wpt/tests/selection/contenteditable/cefalse-on-boundaries.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/contenteditable/cefalse-on-boundaries.html rename to tests/wpt/tests/selection/contenteditable/cefalse-on-boundaries.html diff --git a/tests/wpt/web-platform-tests/selection/contenteditable/collapse.html b/tests/wpt/tests/selection/contenteditable/collapse.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/contenteditable/collapse.html rename to tests/wpt/tests/selection/contenteditable/collapse.html diff --git a/tests/wpt/web-platform-tests/selection/contenteditable/initial-selection-on-focus.tentative.html b/tests/wpt/tests/selection/contenteditable/initial-selection-on-focus.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/contenteditable/initial-selection-on-focus.tentative.html rename to tests/wpt/tests/selection/contenteditable/initial-selection-on-focus.tentative.html diff --git a/tests/wpt/web-platform-tests/selection/contenteditable/modify.tentative.html b/tests/wpt/tests/selection/contenteditable/modify.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/contenteditable/modify.tentative.html rename to tests/wpt/tests/selection/contenteditable/modify.tentative.html diff --git a/tests/wpt/web-platform-tests/selection/contenteditable/modifying-selection-with-middle-mouse-button.tentative.html b/tests/wpt/tests/selection/contenteditable/modifying-selection-with-middle-mouse-button.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/contenteditable/modifying-selection-with-middle-mouse-button.tentative.html rename to tests/wpt/tests/selection/contenteditable/modifying-selection-with-middle-mouse-button.tentative.html diff --git a/tests/wpt/web-platform-tests/selection/contenteditable/modifying-selection-with-primary-mouse-button.tentative.html b/tests/wpt/tests/selection/contenteditable/modifying-selection-with-primary-mouse-button.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/contenteditable/modifying-selection-with-primary-mouse-button.tentative.html rename to tests/wpt/tests/selection/contenteditable/modifying-selection-with-primary-mouse-button.tentative.html diff --git a/tests/wpt/web-platform-tests/selection/crashtests/selection-clip-crash.html b/tests/wpt/tests/selection/crashtests/selection-clip-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/crashtests/selection-clip-crash.html rename to tests/wpt/tests/selection/crashtests/selection-clip-crash.html diff --git a/tests/wpt/web-platform-tests/selection/crashtests/selection-modify-around-input.html b/tests/wpt/tests/selection/crashtests/selection-modify-around-input.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/crashtests/selection-modify-around-input.html rename to tests/wpt/tests/selection/crashtests/selection-modify-around-input.html diff --git a/tests/wpt/web-platform-tests/selection/crashtests/table.html b/tests/wpt/tests/selection/crashtests/table.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/crashtests/table.html rename to tests/wpt/tests/selection/crashtests/table.html diff --git a/tests/wpt/web-platform-tests/selection/deleteFromDocument.html b/tests/wpt/tests/selection/deleteFromDocument.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/deleteFromDocument.html rename to tests/wpt/tests/selection/deleteFromDocument.html diff --git a/tests/wpt/web-platform-tests/selection/dir-manual.html b/tests/wpt/tests/selection/dir-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/dir-manual.html rename to tests/wpt/tests/selection/dir-manual.html diff --git a/tests/wpt/web-platform-tests/selection/drag-disabled-textarea-shadow-dom.html b/tests/wpt/tests/selection/drag-disabled-textarea-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/drag-disabled-textarea-shadow-dom.html rename to tests/wpt/tests/selection/drag-disabled-textarea-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/selection/extend-00.html b/tests/wpt/tests/selection/extend-00.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/extend-00.html rename to tests/wpt/tests/selection/extend-00.html diff --git a/tests/wpt/web-platform-tests/selection/extend-20.html b/tests/wpt/tests/selection/extend-20.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/extend-20.html rename to tests/wpt/tests/selection/extend-20.html diff --git a/tests/wpt/web-platform-tests/selection/extend-40.html b/tests/wpt/tests/selection/extend-40.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/extend-40.html rename to tests/wpt/tests/selection/extend-40.html diff --git a/tests/wpt/web-platform-tests/selection/extend-exception.html b/tests/wpt/tests/selection/extend-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/extend-exception.html rename to tests/wpt/tests/selection/extend-exception.html diff --git a/tests/wpt/web-platform-tests/selection/extend.js b/tests/wpt/tests/selection/extend.js similarity index 100% rename from tests/wpt/web-platform-tests/selection/extend.js rename to tests/wpt/tests/selection/extend.js diff --git a/tests/wpt/web-platform-tests/selection/getRangeAt.html b/tests/wpt/tests/selection/getRangeAt.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/getRangeAt.html rename to tests/wpt/tests/selection/getRangeAt.html diff --git a/tests/wpt/web-platform-tests/selection/getSelection.html b/tests/wpt/tests/selection/getSelection.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/getSelection.html rename to tests/wpt/tests/selection/getSelection.html diff --git a/tests/wpt/web-platform-tests/selection/idlharness.window.js b/tests/wpt/tests/selection/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/selection/idlharness.window.js rename to tests/wpt/tests/selection/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/selection/isCollapsed.html b/tests/wpt/tests/selection/isCollapsed.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/isCollapsed.html rename to tests/wpt/tests/selection/isCollapsed.html diff --git a/tests/wpt/web-platform-tests/selection/modify-extend-word-trailing-inline-block.tentative.html b/tests/wpt/tests/selection/modify-extend-word-trailing-inline-block.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/modify-extend-word-trailing-inline-block.tentative.html rename to tests/wpt/tests/selection/modify-extend-word-trailing-inline-block.tentative.html diff --git a/tests/wpt/web-platform-tests/selection/modify-line-flex-column.tentative.html b/tests/wpt/tests/selection/modify-line-flex-column.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/modify-line-flex-column.tentative.html rename to tests/wpt/tests/selection/modify-line-flex-column.tentative.html diff --git a/tests/wpt/web-platform-tests/selection/modify-line-flex-row.tentative.html b/tests/wpt/tests/selection/modify-line-flex-row.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/modify-line-flex-row.tentative.html rename to tests/wpt/tests/selection/modify-line-flex-row.tentative.html diff --git a/tests/wpt/web-platform-tests/selection/modify-line-grid-basic.tentative.html b/tests/wpt/tests/selection/modify-line-grid-basic.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/modify-line-grid-basic.tentative.html rename to tests/wpt/tests/selection/modify-line-grid-basic.tentative.html diff --git a/tests/wpt/web-platform-tests/selection/modify.tentative.html b/tests/wpt/tests/selection/modify.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/modify.tentative.html rename to tests/wpt/tests/selection/modify.tentative.html diff --git a/tests/wpt/web-platform-tests/selection/removeAllRanges.html b/tests/wpt/tests/selection/removeAllRanges.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/removeAllRanges.html rename to tests/wpt/tests/selection/removeAllRanges.html diff --git a/tests/wpt/web-platform-tests/selection/removeRange.html b/tests/wpt/tests/selection/removeRange.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/removeRange.html rename to tests/wpt/tests/selection/removeRange.html diff --git a/tests/wpt/web-platform-tests/selection/script-and-style-elements.html b/tests/wpt/tests/selection/script-and-style-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/script-and-style-elements.html rename to tests/wpt/tests/selection/script-and-style-elements.html diff --git a/tests/wpt/web-platform-tests/selection/select-end-of-line-image.tentative.html b/tests/wpt/tests/selection/select-end-of-line-image.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/select-end-of-line-image.tentative.html rename to tests/wpt/tests/selection/select-end-of-line-image.tentative.html diff --git a/tests/wpt/web-platform-tests/selection/selectAllChildren.html b/tests/wpt/tests/selection/selectAllChildren.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/selectAllChildren.html rename to tests/wpt/tests/selection/selectAllChildren.html diff --git a/tests/wpt/web-platform-tests/selection/selection-select-all-move-input-crash.html b/tests/wpt/tests/selection/selection-select-all-move-input-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/selection-select-all-move-input-crash.html rename to tests/wpt/tests/selection/selection-select-all-move-input-crash.html diff --git a/tests/wpt/web-platform-tests/selection/selection-shadow-dom-crash-print.html b/tests/wpt/tests/selection/selection-shadow-dom-crash-print.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/selection-shadow-dom-crash-print.html rename to tests/wpt/tests/selection/selection-shadow-dom-crash-print.html diff --git a/tests/wpt/web-platform-tests/selection/setBaseAndExtent.html b/tests/wpt/tests/selection/setBaseAndExtent.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/setBaseAndExtent.html rename to tests/wpt/tests/selection/setBaseAndExtent.html diff --git a/tests/wpt/web-platform-tests/selection/stringifier.tentative.html b/tests/wpt/tests/selection/stringifier.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/stringifier.tentative.html rename to tests/wpt/tests/selection/stringifier.tentative.html diff --git a/tests/wpt/web-platform-tests/selection/test-iframe.html b/tests/wpt/tests/selection/test-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/test-iframe.html rename to tests/wpt/tests/selection/test-iframe.html diff --git a/tests/wpt/web-platform-tests/selection/textcontrols/focus.html b/tests/wpt/tests/selection/textcontrols/focus.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/textcontrols/focus.html rename to tests/wpt/tests/selection/textcontrols/focus.html diff --git a/tests/wpt/web-platform-tests/selection/textcontrols/onselectionchange-content-attribute.html b/tests/wpt/tests/selection/textcontrols/onselectionchange-content-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/textcontrols/onselectionchange-content-attribute.html rename to tests/wpt/tests/selection/textcontrols/onselectionchange-content-attribute.html diff --git a/tests/wpt/web-platform-tests/selection/textcontrols/selectionchange-bubble.html b/tests/wpt/tests/selection/textcontrols/selectionchange-bubble.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/textcontrols/selectionchange-bubble.html rename to tests/wpt/tests/selection/textcontrols/selectionchange-bubble.html diff --git a/tests/wpt/web-platform-tests/selection/textcontrols/selectionchange.html b/tests/wpt/tests/selection/textcontrols/selectionchange.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/textcontrols/selectionchange.html rename to tests/wpt/tests/selection/textcontrols/selectionchange.html diff --git a/tests/wpt/web-platform-tests/selection/toString-ff-bug-001.html b/tests/wpt/tests/selection/toString-ff-bug-001.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/toString-ff-bug-001.html rename to tests/wpt/tests/selection/toString-ff-bug-001.html diff --git a/tests/wpt/web-platform-tests/selection/type.html b/tests/wpt/tests/selection/type.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/type.html rename to tests/wpt/tests/selection/type.html diff --git a/tests/wpt/web-platform-tests/selection/user-select-on-input-and-contenteditable.html b/tests/wpt/tests/selection/user-select-on-input-and-contenteditable.html similarity index 100% rename from tests/wpt/web-platform-tests/selection/user-select-on-input-and-contenteditable.html rename to tests/wpt/tests/selection/user-select-on-input-and-contenteditable.html diff --git a/tests/wpt/web-platform-tests/serial/META.yml b/tests/wpt/tests/serial/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/serial/META.yml rename to tests/wpt/tests/serial/META.yml diff --git a/tests/wpt/web-platform-tests/serial/README.md b/tests/wpt/tests/serial/README.md similarity index 100% rename from tests/wpt/web-platform-tests/serial/README.md rename to tests/wpt/tests/serial/README.md diff --git a/tests/wpt/web-platform-tests/serial/getPorts/reject_opaque_origin.https.html b/tests/wpt/tests/serial/getPorts/reject_opaque_origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/serial/getPorts/reject_opaque_origin.https.html rename to tests/wpt/tests/serial/getPorts/reject_opaque_origin.https.html diff --git a/tests/wpt/web-platform-tests/serial/getPorts/reject_opaque_origin.https.html.headers b/tests/wpt/tests/serial/getPorts/reject_opaque_origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/serial/getPorts/reject_opaque_origin.https.html.headers rename to tests/wpt/tests/serial/getPorts/reject_opaque_origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/serial/getPorts/sandboxed_iframe.https.window.js b/tests/wpt/tests/serial/getPorts/sandboxed_iframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/getPorts/sandboxed_iframe.https.window.js rename to tests/wpt/tests/serial/getPorts/sandboxed_iframe.https.window.js diff --git a/tests/wpt/web-platform-tests/serial/idlharness.https.any.js b/tests/wpt/tests/serial/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/idlharness.https.any.js rename to tests/wpt/tests/serial/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/requestPort/reject_opaque_origin.https.html b/tests/wpt/tests/serial/requestPort/reject_opaque_origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/serial/requestPort/reject_opaque_origin.https.html rename to tests/wpt/tests/serial/requestPort/reject_opaque_origin.https.html diff --git a/tests/wpt/web-platform-tests/serial/requestPort/reject_opaque_origin.https.html.headers b/tests/wpt/tests/serial/requestPort/reject_opaque_origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/serial/requestPort/reject_opaque_origin.https.html.headers rename to tests/wpt/tests/serial/requestPort/reject_opaque_origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/serial/requestPort/sandboxed_iframe.https.window.js b/tests/wpt/tests/serial/requestPort/sandboxed_iframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/requestPort/sandboxed_iframe.https.window.js rename to tests/wpt/tests/serial/requestPort/sandboxed_iframe.https.window.js diff --git a/tests/wpt/web-platform-tests/serial/resources/automation.js b/tests/wpt/tests/serial/resources/automation.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/resources/automation.js rename to tests/wpt/tests/serial/resources/automation.js diff --git a/tests/wpt/web-platform-tests/serial/resources/common.js b/tests/wpt/tests/serial/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/resources/common.js rename to tests/wpt/tests/serial/resources/common.js diff --git a/tests/wpt/web-platform-tests/serial/resources/manual.js b/tests/wpt/tests/serial/resources/manual.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/resources/manual.js rename to tests/wpt/tests/serial/resources/manual.js diff --git a/tests/wpt/web-platform-tests/serial/resources/open-in-iframe.html b/tests/wpt/tests/serial/resources/open-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/serial/resources/open-in-iframe.html rename to tests/wpt/tests/serial/resources/open-in-iframe.html diff --git a/tests/wpt/web-platform-tests/serial/resources/serial-allowed-by-permissions-policy-worker.js b/tests/wpt/tests/serial/resources/serial-allowed-by-permissions-policy-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/resources/serial-allowed-by-permissions-policy-worker.js rename to tests/wpt/tests/serial/resources/serial-allowed-by-permissions-policy-worker.js diff --git a/tests/wpt/web-platform-tests/serial/resources/serial-disabled-by-permissions-policy-worker.js b/tests/wpt/tests/serial/resources/serial-disabled-by-permissions-policy-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/resources/serial-disabled-by-permissions-policy-worker.js rename to tests/wpt/tests/serial/resources/serial-disabled-by-permissions-policy-worker.js diff --git a/tests/wpt/web-platform-tests/serial/serial-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/tests/serial/serial-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/serial/serial-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html rename to tests/wpt/tests/serial/serial-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html diff --git a/tests/wpt/web-platform-tests/serial/serial-allowed-by-permissions-policy-attribute.https.sub.html b/tests/wpt/tests/serial/serial-allowed-by-permissions-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/serial/serial-allowed-by-permissions-policy-attribute.https.sub.html rename to tests/wpt/tests/serial/serial-allowed-by-permissions-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/serial/serial-allowed-by-permissions-policy.https.sub.html b/tests/wpt/tests/serial/serial-allowed-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/serial/serial-allowed-by-permissions-policy.https.sub.html rename to tests/wpt/tests/serial/serial-allowed-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/serial/serial-allowed-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/serial/serial-allowed-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/serial/serial-allowed-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/serial/serial-allowed-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/serial/serial-default-permissions-policy.https.sub.html b/tests/wpt/tests/serial/serial-default-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/serial/serial-default-permissions-policy.https.sub.html rename to tests/wpt/tests/serial/serial-default-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/serial/serial-disabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/serial/serial-disabled-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/serial/serial-disabled-by-permissions-policy.https.sub.html rename to tests/wpt/tests/serial/serial-disabled-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/serial/serial-disabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/serial/serial-disabled-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/serial/serial-disabled-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/serial/serial-disabled-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/serial/serialPort_close.https.any.js b/tests/wpt/tests/serial/serialPort_close.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_close.https.any.js rename to tests/wpt/tests/serial/serialPort_close.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_disconnect-manual.https.html b/tests/wpt/tests/serial/serialPort_disconnect-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_disconnect-manual.https.html rename to tests/wpt/tests/serial/serialPort_disconnect-manual.https.html diff --git a/tests/wpt/web-platform-tests/serial/serialPort_events.https.any.js b/tests/wpt/tests/serial/serialPort_events.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_events.https.any.js rename to tests/wpt/tests/serial/serialPort_events.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_forget.https.any.js b/tests/wpt/tests/serial/serialPort_forget.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_forget.https.any.js rename to tests/wpt/tests/serial/serialPort_forget.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_getInfo.https.any.js b/tests/wpt/tests/serial/serialPort_getInfo.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_getInfo.https.any.js rename to tests/wpt/tests/serial/serialPort_getInfo.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_getSignals.https.any.js b/tests/wpt/tests/serial/serialPort_getSignals.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_getSignals.https.any.js rename to tests/wpt/tests/serial/serialPort_getSignals.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_loopback-manual.https.html b/tests/wpt/tests/serial/serialPort_loopback-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_loopback-manual.https.html rename to tests/wpt/tests/serial/serialPort_loopback-manual.https.html diff --git a/tests/wpt/web-platform-tests/serial/serialPort_loopback_BreakError-manual.https.html b/tests/wpt/tests/serial/serialPort_loopback_BreakError-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_loopback_BreakError-manual.https.html rename to tests/wpt/tests/serial/serialPort_loopback_BreakError-manual.https.html diff --git a/tests/wpt/web-platform-tests/serial/serialPort_loopback_BufferOverrunError-manual.https.html b/tests/wpt/tests/serial/serialPort_loopback_BufferOverrunError-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_loopback_BufferOverrunError-manual.https.html rename to tests/wpt/tests/serial/serialPort_loopback_BufferOverrunError-manual.https.html diff --git a/tests/wpt/web-platform-tests/serial/serialPort_loopback_flowControl-manual.https.html b/tests/wpt/tests/serial/serialPort_loopback_flowControl-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_loopback_flowControl-manual.https.html rename to tests/wpt/tests/serial/serialPort_loopback_flowControl-manual.https.html diff --git a/tests/wpt/web-platform-tests/serial/serialPort_ondisconnect.https.any.js b/tests/wpt/tests/serial/serialPort_ondisconnect.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_ondisconnect.https.any.js rename to tests/wpt/tests/serial/serialPort_ondisconnect.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_open.https.any.js b/tests/wpt/tests/serial/serialPort_open.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_open.https.any.js rename to tests/wpt/tests/serial/serialPort_open.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_readable-manual.https.html b/tests/wpt/tests/serial/serialPort_readable-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_readable-manual.https.html rename to tests/wpt/tests/serial/serialPort_readable-manual.https.html diff --git a/tests/wpt/web-platform-tests/serial/serialPort_readable_byob.https.any.js b/tests/wpt/tests/serial/serialPort_readable_byob.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_readable_byob.https.any.js rename to tests/wpt/tests/serial/serialPort_readable_byob.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_readable_cancel.https.any.js b/tests/wpt/tests/serial/serialPort_readable_cancel.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_readable_cancel.https.any.js rename to tests/wpt/tests/serial/serialPort_readable_cancel.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_readable_chain.https.any.js b/tests/wpt/tests/serial/serialPort_readable_chain.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_readable_chain.https.any.js rename to tests/wpt/tests/serial/serialPort_readable_chain.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_readable_closeLocked.https.any.js b/tests/wpt/tests/serial/serialPort_readable_closeLocked.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_readable_closeLocked.https.any.js rename to tests/wpt/tests/serial/serialPort_readable_closeLocked.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_readable_disconnect.https.any.js b/tests/wpt/tests/serial/serialPort_readable_disconnect.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_readable_disconnect.https.any.js rename to tests/wpt/tests/serial/serialPort_readable_disconnect.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_readable_largeRead.https.any.js b/tests/wpt/tests/serial/serialPort_readable_largeRead.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_readable_largeRead.https.any.js rename to tests/wpt/tests/serial/serialPort_readable_largeRead.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_readable_open.https.any.js b/tests/wpt/tests/serial/serialPort_readable_open.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_readable_open.https.any.js rename to tests/wpt/tests/serial/serialPort_readable_open.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_readable_parityError.https.any.js b/tests/wpt/tests/serial/serialPort_readable_parityError.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_readable_parityError.https.any.js rename to tests/wpt/tests/serial/serialPort_readable_parityError.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_readable_pipeThrough.https.any.js b/tests/wpt/tests/serial/serialPort_readable_pipeThrough.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_readable_pipeThrough.https.any.js rename to tests/wpt/tests/serial/serialPort_readable_pipeThrough.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_readable_smallRead.https.any.js b/tests/wpt/tests/serial/serialPort_readable_smallRead.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_readable_smallRead.https.any.js rename to tests/wpt/tests/serial/serialPort_readable_smallRead.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_setSignals.https.any.js b/tests/wpt/tests/serial/serialPort_setSignals.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_setSignals.https.any.js rename to tests/wpt/tests/serial/serialPort_setSignals.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_writable.https.any.js b/tests/wpt/tests/serial/serialPort_writable.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_writable.https.any.js rename to tests/wpt/tests/serial/serialPort_writable.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serialPort_writable_detachBuffer.https.any.js b/tests/wpt/tests/serial/serialPort_writable_detachBuffer.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serialPort_writable_detachBuffer.https.any.js rename to tests/wpt/tests/serial/serialPort_writable_detachBuffer.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serial_getPorts.https.any.js b/tests/wpt/tests/serial/serial_getPorts.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serial_getPorts.https.any.js rename to tests/wpt/tests/serial/serial_getPorts.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serial_onconnect.https.any.js b/tests/wpt/tests/serial/serial_onconnect.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serial_onconnect.https.any.js rename to tests/wpt/tests/serial/serial_onconnect.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serial_ondisconnect.https.any.js b/tests/wpt/tests/serial/serial_ondisconnect.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serial_ondisconnect.https.any.js rename to tests/wpt/tests/serial/serial_ondisconnect.https.any.js diff --git a/tests/wpt/web-platform-tests/serial/serial_requestPort.https.window.js b/tests/wpt/tests/serial/serial_requestPort.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/serial/serial_requestPort.https.window.js rename to tests/wpt/tests/serial/serial_requestPort.https.window.js diff --git a/tests/wpt/web-platform-tests/server-timing/META.yml b/tests/wpt/tests/server-timing/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/META.yml rename to tests/wpt/tests/server-timing/META.yml diff --git a/tests/wpt/web-platform-tests/server-timing/cross_origin.https.html b/tests/wpt/tests/server-timing/cross_origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/cross_origin.https.html rename to tests/wpt/tests/server-timing/cross_origin.https.html diff --git a/tests/wpt/web-platform-tests/server-timing/idlharness.https.any.js b/tests/wpt/tests/server-timing/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/idlharness.https.any.js rename to tests/wpt/tests/server-timing/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/server-timing/navigation-timing-trickle.https.html b/tests/wpt/tests/server-timing/navigation-timing-trickle.https.html similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/navigation-timing-trickle.https.html rename to tests/wpt/tests/server-timing/navigation-timing-trickle.https.html diff --git a/tests/wpt/web-platform-tests/server-timing/navigation_timing_idl.https.html b/tests/wpt/tests/server-timing/navigation_timing_idl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/navigation_timing_idl.https.html rename to tests/wpt/tests/server-timing/navigation_timing_idl.https.html diff --git a/tests/wpt/web-platform-tests/server-timing/resource_timing_idl.https.html b/tests/wpt/tests/server-timing/resource_timing_idl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resource_timing_idl.https.html rename to tests/wpt/tests/server-timing/resource_timing_idl.https.html diff --git a/tests/wpt/web-platform-tests/server-timing/resources/blue.png b/tests/wpt/tests/server-timing/resources/blue.png similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/blue.png rename to tests/wpt/tests/server-timing/resources/blue.png diff --git a/tests/wpt/web-platform-tests/server-timing/resources/blue.png.sub.headers b/tests/wpt/tests/server-timing/resources/blue.png.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/blue.png.sub.headers rename to tests/wpt/tests/server-timing/resources/blue.png.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/blue_cors.png b/tests/wpt/tests/server-timing/resources/blue_cors.png similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/blue_cors.png rename to tests/wpt/tests/server-timing/resources/blue_cors.png diff --git a/tests/wpt/web-platform-tests/server-timing/resources/blue_cors.png.headers b/tests/wpt/tests/server-timing/resources/blue_cors.png.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/blue_cors.png.headers rename to tests/wpt/tests/server-timing/resources/blue_cors.png.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/blue_tao.png b/tests/wpt/tests/server-timing/resources/blue_tao.png similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/blue_tao.png rename to tests/wpt/tests/server-timing/resources/blue_tao.png diff --git a/tests/wpt/web-platform-tests/server-timing/resources/blue_tao.png.sub.headers b/tests/wpt/tests/server-timing/resources/blue_tao.png.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/blue_tao.png.sub.headers rename to tests/wpt/tests/server-timing/resources/blue_tao.png.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/green.png b/tests/wpt/tests/server-timing/resources/green.png similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/green.png rename to tests/wpt/tests/server-timing/resources/green.png diff --git a/tests/wpt/web-platform-tests/server-timing/resources/green.png.sub.headers b/tests/wpt/tests/server-timing/resources/green.png.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/green.png.sub.headers rename to tests/wpt/tests/server-timing/resources/green.png.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/navigation-timing.html b/tests/wpt/tests/server-timing/resources/navigation-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/navigation-timing.html rename to tests/wpt/tests/server-timing/resources/navigation-timing.html diff --git a/tests/wpt/web-platform-tests/server-timing/resources/navigation-timing.html.headers b/tests/wpt/tests/server-timing/resources/navigation-timing.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/navigation-timing.html.headers rename to tests/wpt/tests/server-timing/resources/navigation-timing.html.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/0.js b/tests/wpt/tests/server-timing/resources/parsing/0.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/0.js rename to tests/wpt/tests/server-timing/resources/parsing/0.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/0.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/0.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/0.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/0.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/1.js b/tests/wpt/tests/server-timing/resources/parsing/1.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/1.js rename to tests/wpt/tests/server-timing/resources/parsing/1.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/1.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/1.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/1.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/1.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/10.js b/tests/wpt/tests/server-timing/resources/parsing/10.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/10.js rename to tests/wpt/tests/server-timing/resources/parsing/10.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/10.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/10.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/10.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/10.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/11.js b/tests/wpt/tests/server-timing/resources/parsing/11.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/11.js rename to tests/wpt/tests/server-timing/resources/parsing/11.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/11.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/11.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/11.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/11.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/12.js b/tests/wpt/tests/server-timing/resources/parsing/12.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/12.js rename to tests/wpt/tests/server-timing/resources/parsing/12.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/12.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/12.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/12.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/12.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/13.js b/tests/wpt/tests/server-timing/resources/parsing/13.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/13.js rename to tests/wpt/tests/server-timing/resources/parsing/13.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/13.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/13.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/13.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/13.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/14.js b/tests/wpt/tests/server-timing/resources/parsing/14.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/14.js rename to tests/wpt/tests/server-timing/resources/parsing/14.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/14.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/14.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/14.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/14.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/15.js b/tests/wpt/tests/server-timing/resources/parsing/15.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/15.js rename to tests/wpt/tests/server-timing/resources/parsing/15.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/15.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/15.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/15.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/15.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/16.js b/tests/wpt/tests/server-timing/resources/parsing/16.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/16.js rename to tests/wpt/tests/server-timing/resources/parsing/16.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/16.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/16.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/16.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/16.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/17.js b/tests/wpt/tests/server-timing/resources/parsing/17.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/17.js rename to tests/wpt/tests/server-timing/resources/parsing/17.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/17.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/17.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/17.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/17.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/18.js b/tests/wpt/tests/server-timing/resources/parsing/18.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/18.js rename to tests/wpt/tests/server-timing/resources/parsing/18.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/18.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/18.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/18.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/18.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/19.js b/tests/wpt/tests/server-timing/resources/parsing/19.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/19.js rename to tests/wpt/tests/server-timing/resources/parsing/19.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/19.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/19.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/19.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/19.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/2.js b/tests/wpt/tests/server-timing/resources/parsing/2.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/2.js rename to tests/wpt/tests/server-timing/resources/parsing/2.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/2.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/2.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/2.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/2.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/20.js b/tests/wpt/tests/server-timing/resources/parsing/20.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/20.js rename to tests/wpt/tests/server-timing/resources/parsing/20.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/20.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/20.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/20.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/20.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/21.js b/tests/wpt/tests/server-timing/resources/parsing/21.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/21.js rename to tests/wpt/tests/server-timing/resources/parsing/21.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/21.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/21.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/21.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/21.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/22.js b/tests/wpt/tests/server-timing/resources/parsing/22.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/22.js rename to tests/wpt/tests/server-timing/resources/parsing/22.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/22.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/22.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/22.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/22.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/23.js b/tests/wpt/tests/server-timing/resources/parsing/23.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/23.js rename to tests/wpt/tests/server-timing/resources/parsing/23.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/23.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/23.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/23.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/23.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/24.js b/tests/wpt/tests/server-timing/resources/parsing/24.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/24.js rename to tests/wpt/tests/server-timing/resources/parsing/24.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/24.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/24.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/24.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/24.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/25.js b/tests/wpt/tests/server-timing/resources/parsing/25.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/25.js rename to tests/wpt/tests/server-timing/resources/parsing/25.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/25.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/25.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/25.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/25.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/26.js b/tests/wpt/tests/server-timing/resources/parsing/26.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/26.js rename to tests/wpt/tests/server-timing/resources/parsing/26.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/26.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/26.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/26.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/26.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/27.js b/tests/wpt/tests/server-timing/resources/parsing/27.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/27.js rename to tests/wpt/tests/server-timing/resources/parsing/27.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/27.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/27.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/27.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/27.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/28.js b/tests/wpt/tests/server-timing/resources/parsing/28.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/28.js rename to tests/wpt/tests/server-timing/resources/parsing/28.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/28.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/28.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/28.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/28.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/29.js b/tests/wpt/tests/server-timing/resources/parsing/29.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/29.js rename to tests/wpt/tests/server-timing/resources/parsing/29.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/29.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/29.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/29.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/29.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/3.js b/tests/wpt/tests/server-timing/resources/parsing/3.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/3.js rename to tests/wpt/tests/server-timing/resources/parsing/3.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/3.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/3.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/3.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/3.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/30.js b/tests/wpt/tests/server-timing/resources/parsing/30.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/30.js rename to tests/wpt/tests/server-timing/resources/parsing/30.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/30.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/30.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/30.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/30.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/31.js b/tests/wpt/tests/server-timing/resources/parsing/31.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/31.js rename to tests/wpt/tests/server-timing/resources/parsing/31.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/31.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/31.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/31.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/31.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/32.js b/tests/wpt/tests/server-timing/resources/parsing/32.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/32.js rename to tests/wpt/tests/server-timing/resources/parsing/32.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/32.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/32.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/32.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/32.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/33.js b/tests/wpt/tests/server-timing/resources/parsing/33.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/33.js rename to tests/wpt/tests/server-timing/resources/parsing/33.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/33.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/33.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/33.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/33.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/34.js b/tests/wpt/tests/server-timing/resources/parsing/34.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/34.js rename to tests/wpt/tests/server-timing/resources/parsing/34.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/34.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/34.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/34.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/34.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/35.js b/tests/wpt/tests/server-timing/resources/parsing/35.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/35.js rename to tests/wpt/tests/server-timing/resources/parsing/35.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/35.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/35.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/35.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/35.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/36.js b/tests/wpt/tests/server-timing/resources/parsing/36.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/36.js rename to tests/wpt/tests/server-timing/resources/parsing/36.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/36.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/36.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/36.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/36.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/37.js b/tests/wpt/tests/server-timing/resources/parsing/37.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/37.js rename to tests/wpt/tests/server-timing/resources/parsing/37.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/37.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/37.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/37.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/37.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/38.js b/tests/wpt/tests/server-timing/resources/parsing/38.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/38.js rename to tests/wpt/tests/server-timing/resources/parsing/38.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/38.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/38.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/38.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/38.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/39.js b/tests/wpt/tests/server-timing/resources/parsing/39.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/39.js rename to tests/wpt/tests/server-timing/resources/parsing/39.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/39.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/39.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/39.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/39.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/4.js b/tests/wpt/tests/server-timing/resources/parsing/4.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/4.js rename to tests/wpt/tests/server-timing/resources/parsing/4.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/4.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/4.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/4.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/4.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/40.js b/tests/wpt/tests/server-timing/resources/parsing/40.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/40.js rename to tests/wpt/tests/server-timing/resources/parsing/40.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/40.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/40.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/40.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/40.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/41.js b/tests/wpt/tests/server-timing/resources/parsing/41.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/41.js rename to tests/wpt/tests/server-timing/resources/parsing/41.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/41.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/41.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/41.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/41.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/42.js b/tests/wpt/tests/server-timing/resources/parsing/42.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/42.js rename to tests/wpt/tests/server-timing/resources/parsing/42.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/42.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/42.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/42.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/42.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/43.js b/tests/wpt/tests/server-timing/resources/parsing/43.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/43.js rename to tests/wpt/tests/server-timing/resources/parsing/43.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/43.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/43.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/43.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/43.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/44.js b/tests/wpt/tests/server-timing/resources/parsing/44.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/44.js rename to tests/wpt/tests/server-timing/resources/parsing/44.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/44.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/44.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/44.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/44.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/45.js b/tests/wpt/tests/server-timing/resources/parsing/45.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/45.js rename to tests/wpt/tests/server-timing/resources/parsing/45.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/45.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/45.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/45.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/45.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/46.js b/tests/wpt/tests/server-timing/resources/parsing/46.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/46.js rename to tests/wpt/tests/server-timing/resources/parsing/46.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/46.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/46.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/46.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/46.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/47.js b/tests/wpt/tests/server-timing/resources/parsing/47.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/47.js rename to tests/wpt/tests/server-timing/resources/parsing/47.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/47.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/47.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/47.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/47.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/48.js b/tests/wpt/tests/server-timing/resources/parsing/48.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/48.js rename to tests/wpt/tests/server-timing/resources/parsing/48.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/48.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/48.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/48.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/48.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/49.js b/tests/wpt/tests/server-timing/resources/parsing/49.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/49.js rename to tests/wpt/tests/server-timing/resources/parsing/49.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/49.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/49.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/49.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/49.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/5.js b/tests/wpt/tests/server-timing/resources/parsing/5.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/5.js rename to tests/wpt/tests/server-timing/resources/parsing/5.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/5.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/5.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/5.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/5.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/50.js b/tests/wpt/tests/server-timing/resources/parsing/50.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/50.js rename to tests/wpt/tests/server-timing/resources/parsing/50.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/50.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/50.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/50.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/50.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/51.js b/tests/wpt/tests/server-timing/resources/parsing/51.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/51.js rename to tests/wpt/tests/server-timing/resources/parsing/51.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/51.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/51.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/51.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/51.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/52.js b/tests/wpt/tests/server-timing/resources/parsing/52.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/52.js rename to tests/wpt/tests/server-timing/resources/parsing/52.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/52.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/52.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/52.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/52.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/53.js b/tests/wpt/tests/server-timing/resources/parsing/53.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/53.js rename to tests/wpt/tests/server-timing/resources/parsing/53.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/53.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/53.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/53.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/53.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/54.js b/tests/wpt/tests/server-timing/resources/parsing/54.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/54.js rename to tests/wpt/tests/server-timing/resources/parsing/54.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/54.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/54.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/54.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/54.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/55.js b/tests/wpt/tests/server-timing/resources/parsing/55.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/55.js rename to tests/wpt/tests/server-timing/resources/parsing/55.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/55.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/55.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/55.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/55.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/56.js b/tests/wpt/tests/server-timing/resources/parsing/56.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/56.js rename to tests/wpt/tests/server-timing/resources/parsing/56.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/56.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/56.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/56.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/56.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/57.js b/tests/wpt/tests/server-timing/resources/parsing/57.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/57.js rename to tests/wpt/tests/server-timing/resources/parsing/57.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/57.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/57.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/57.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/57.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/58.js b/tests/wpt/tests/server-timing/resources/parsing/58.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/58.js rename to tests/wpt/tests/server-timing/resources/parsing/58.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/58.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/58.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/58.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/58.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/59.js b/tests/wpt/tests/server-timing/resources/parsing/59.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/59.js rename to tests/wpt/tests/server-timing/resources/parsing/59.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/59.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/59.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/59.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/59.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/6.js b/tests/wpt/tests/server-timing/resources/parsing/6.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/6.js rename to tests/wpt/tests/server-timing/resources/parsing/6.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/6.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/6.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/6.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/6.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/60.js b/tests/wpt/tests/server-timing/resources/parsing/60.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/60.js rename to tests/wpt/tests/server-timing/resources/parsing/60.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/60.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/60.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/60.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/60.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/61.js b/tests/wpt/tests/server-timing/resources/parsing/61.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/61.js rename to tests/wpt/tests/server-timing/resources/parsing/61.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/61.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/61.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/61.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/61.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/62.js b/tests/wpt/tests/server-timing/resources/parsing/62.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/62.js rename to tests/wpt/tests/server-timing/resources/parsing/62.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/62.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/62.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/62.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/62.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/63.js b/tests/wpt/tests/server-timing/resources/parsing/63.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/63.js rename to tests/wpt/tests/server-timing/resources/parsing/63.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/63.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/63.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/63.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/63.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/64.js b/tests/wpt/tests/server-timing/resources/parsing/64.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/64.js rename to tests/wpt/tests/server-timing/resources/parsing/64.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/64.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/64.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/64.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/64.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/65.js b/tests/wpt/tests/server-timing/resources/parsing/65.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/65.js rename to tests/wpt/tests/server-timing/resources/parsing/65.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/65.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/65.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/65.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/65.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/66.js b/tests/wpt/tests/server-timing/resources/parsing/66.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/66.js rename to tests/wpt/tests/server-timing/resources/parsing/66.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/66.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/66.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/66.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/66.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/67.js b/tests/wpt/tests/server-timing/resources/parsing/67.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/67.js rename to tests/wpt/tests/server-timing/resources/parsing/67.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/67.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/67.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/67.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/67.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/68.js b/tests/wpt/tests/server-timing/resources/parsing/68.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/68.js rename to tests/wpt/tests/server-timing/resources/parsing/68.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/68.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/68.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/68.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/68.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/69.js b/tests/wpt/tests/server-timing/resources/parsing/69.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/69.js rename to tests/wpt/tests/server-timing/resources/parsing/69.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/69.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/69.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/69.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/69.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/7.js b/tests/wpt/tests/server-timing/resources/parsing/7.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/7.js rename to tests/wpt/tests/server-timing/resources/parsing/7.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/7.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/7.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/7.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/7.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/70.js b/tests/wpt/tests/server-timing/resources/parsing/70.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/70.js rename to tests/wpt/tests/server-timing/resources/parsing/70.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/70.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/70.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/70.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/70.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/71.js b/tests/wpt/tests/server-timing/resources/parsing/71.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/71.js rename to tests/wpt/tests/server-timing/resources/parsing/71.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/71.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/71.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/71.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/71.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/72.js b/tests/wpt/tests/server-timing/resources/parsing/72.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/72.js rename to tests/wpt/tests/server-timing/resources/parsing/72.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/72.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/72.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/72.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/72.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/73.js b/tests/wpt/tests/server-timing/resources/parsing/73.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/73.js rename to tests/wpt/tests/server-timing/resources/parsing/73.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/73.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/73.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/73.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/73.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/74.js b/tests/wpt/tests/server-timing/resources/parsing/74.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/74.js rename to tests/wpt/tests/server-timing/resources/parsing/74.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/74.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/74.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/74.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/74.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/75.js b/tests/wpt/tests/server-timing/resources/parsing/75.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/75.js rename to tests/wpt/tests/server-timing/resources/parsing/75.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/75.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/75.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/75.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/75.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/76.js b/tests/wpt/tests/server-timing/resources/parsing/76.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/76.js rename to tests/wpt/tests/server-timing/resources/parsing/76.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/76.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/76.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/76.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/76.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/77.js b/tests/wpt/tests/server-timing/resources/parsing/77.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/77.js rename to tests/wpt/tests/server-timing/resources/parsing/77.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/77.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/77.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/77.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/77.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/78.js b/tests/wpt/tests/server-timing/resources/parsing/78.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/78.js rename to tests/wpt/tests/server-timing/resources/parsing/78.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/78.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/78.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/78.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/78.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/79.js b/tests/wpt/tests/server-timing/resources/parsing/79.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/79.js rename to tests/wpt/tests/server-timing/resources/parsing/79.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/79.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/79.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/79.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/79.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/8.js b/tests/wpt/tests/server-timing/resources/parsing/8.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/8.js rename to tests/wpt/tests/server-timing/resources/parsing/8.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/8.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/8.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/8.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/8.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/80.js b/tests/wpt/tests/server-timing/resources/parsing/80.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/80.js rename to tests/wpt/tests/server-timing/resources/parsing/80.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/80.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/80.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/80.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/80.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/81.js b/tests/wpt/tests/server-timing/resources/parsing/81.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/81.js rename to tests/wpt/tests/server-timing/resources/parsing/81.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/81.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/81.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/81.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/81.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/82.js b/tests/wpt/tests/server-timing/resources/parsing/82.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/82.js rename to tests/wpt/tests/server-timing/resources/parsing/82.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/82.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/82.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/82.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/82.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/83.js b/tests/wpt/tests/server-timing/resources/parsing/83.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/83.js rename to tests/wpt/tests/server-timing/resources/parsing/83.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/83.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/83.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/83.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/83.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/84.js b/tests/wpt/tests/server-timing/resources/parsing/84.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/84.js rename to tests/wpt/tests/server-timing/resources/parsing/84.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/84.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/84.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/84.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/84.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/9.js b/tests/wpt/tests/server-timing/resources/parsing/9.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/9.js rename to tests/wpt/tests/server-timing/resources/parsing/9.js diff --git a/tests/wpt/web-platform-tests/server-timing/resources/parsing/9.js.sub.headers b/tests/wpt/tests/server-timing/resources/parsing/9.js.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/resources/parsing/9.js.sub.headers rename to tests/wpt/tests/server-timing/resources/parsing/9.js.sub.headers diff --git a/tests/wpt/web-platform-tests/server-timing/server_timing_header-parsing.https.html b/tests/wpt/tests/server-timing/server_timing_header-parsing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/server_timing_header-parsing.https.html rename to tests/wpt/tests/server-timing/server_timing_header-parsing.https.html diff --git a/tests/wpt/web-platform-tests/server-timing/server_timing_headers_not_visible_in_fetch.https.html b/tests/wpt/tests/server-timing/server_timing_headers_not_visible_in_fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/server_timing_headers_not_visible_in_fetch.https.html rename to tests/wpt/tests/server-timing/server_timing_headers_not_visible_in_fetch.https.html diff --git a/tests/wpt/web-platform-tests/server-timing/service_worker_idl.https.html b/tests/wpt/tests/server-timing/service_worker_idl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/service_worker_idl.https.html rename to tests/wpt/tests/server-timing/service_worker_idl.https.html diff --git a/tests/wpt/web-platform-tests/server-timing/sw.js b/tests/wpt/tests/server-timing/sw.js similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/sw.js rename to tests/wpt/tests/server-timing/sw.js diff --git a/tests/wpt/web-platform-tests/server-timing/test_server_timing.https.html b/tests/wpt/tests/server-timing/test_server_timing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/test_server_timing.https.html rename to tests/wpt/tests/server-timing/test_server_timing.https.html diff --git a/tests/wpt/web-platform-tests/server-timing/test_server_timing.https.html.sub.headers b/tests/wpt/tests/server-timing/test_server_timing.https.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/server-timing/test_server_timing.https.html.sub.headers rename to tests/wpt/tests/server-timing/test_server_timing.https.html.sub.headers diff --git a/tests/wpt/web-platform-tests/service-workers/META.yml b/tests/wpt/tests/service-workers/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/META.yml rename to tests/wpt/tests/service-workers/META.yml diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/META.yml b/tests/wpt/tests/service-workers/cache-storage/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/META.yml rename to tests/wpt/tests/service-workers/cache-storage/META.yml diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/cache-abort.https.any.js b/tests/wpt/tests/service-workers/cache-storage/cache-abort.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/cache-abort.https.any.js rename to tests/wpt/tests/service-workers/cache-storage/cache-abort.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/cache-add.https.any.js b/tests/wpt/tests/service-workers/cache-storage/cache-add.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/cache-add.https.any.js rename to tests/wpt/tests/service-workers/cache-storage/cache-add.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/cache-delete.https.any.js b/tests/wpt/tests/service-workers/cache-storage/cache-delete.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/cache-delete.https.any.js rename to tests/wpt/tests/service-workers/cache-storage/cache-delete.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/cache-keys-attributes-for-service-worker.https.html b/tests/wpt/tests/service-workers/cache-storage/cache-keys-attributes-for-service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/cache-keys-attributes-for-service-worker.https.html rename to tests/wpt/tests/service-workers/cache-storage/cache-keys-attributes-for-service-worker.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/cache-keys.https.any.js b/tests/wpt/tests/service-workers/cache-storage/cache-keys.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/cache-keys.https.any.js rename to tests/wpt/tests/service-workers/cache-storage/cache-keys.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/cache-match.https.any.js b/tests/wpt/tests/service-workers/cache-storage/cache-match.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/cache-match.https.any.js rename to tests/wpt/tests/service-workers/cache-storage/cache-match.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/cache-matchAll.https.any.js b/tests/wpt/tests/service-workers/cache-storage/cache-matchAll.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/cache-matchAll.https.any.js rename to tests/wpt/tests/service-workers/cache-storage/cache-matchAll.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/cache-put.https.any.js b/tests/wpt/tests/service-workers/cache-storage/cache-put.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/cache-put.https.any.js rename to tests/wpt/tests/service-workers/cache-storage/cache-put.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/cache-storage-buckets.https.any.js b/tests/wpt/tests/service-workers/cache-storage/cache-storage-buckets.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/cache-storage-buckets.https.any.js rename to tests/wpt/tests/service-workers/cache-storage/cache-storage-buckets.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/cache-storage-keys.https.any.js b/tests/wpt/tests/service-workers/cache-storage/cache-storage-keys.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/cache-storage-keys.https.any.js rename to tests/wpt/tests/service-workers/cache-storage/cache-storage-keys.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/cache-storage-match.https.any.js b/tests/wpt/tests/service-workers/cache-storage/cache-storage-match.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/cache-storage-match.https.any.js rename to tests/wpt/tests/service-workers/cache-storage/cache-storage-match.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/cache-storage.https.any.js b/tests/wpt/tests/service-workers/cache-storage/cache-storage.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/cache-storage.https.any.js rename to tests/wpt/tests/service-workers/cache-storage/cache-storage.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/common.https.window.js b/tests/wpt/tests/service-workers/cache-storage/common.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/common.https.window.js rename to tests/wpt/tests/service-workers/cache-storage/common.https.window.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/crashtests/cache-response-clone.https.html b/tests/wpt/tests/service-workers/cache-storage/crashtests/cache-response-clone.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/crashtests/cache-response-clone.https.html rename to tests/wpt/tests/service-workers/cache-storage/crashtests/cache-response-clone.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/credentials.https.html b/tests/wpt/tests/service-workers/cache-storage/credentials.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/credentials.https.html rename to tests/wpt/tests/service-workers/cache-storage/credentials.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/cross-partition.https.tentative.html b/tests/wpt/tests/service-workers/cache-storage/cross-partition.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/cross-partition.https.tentative.html rename to tests/wpt/tests/service-workers/cache-storage/cross-partition.https.tentative.html diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/resources/blank.html b/tests/wpt/tests/service-workers/cache-storage/resources/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/resources/blank.html rename to tests/wpt/tests/service-workers/cache-storage/resources/blank.html diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/resources/cache-keys-attributes-for-service-worker.js b/tests/wpt/tests/service-workers/cache-storage/resources/cache-keys-attributes-for-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/resources/cache-keys-attributes-for-service-worker.js rename to tests/wpt/tests/service-workers/cache-storage/resources/cache-keys-attributes-for-service-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/resources/common-worker.js b/tests/wpt/tests/service-workers/cache-storage/resources/common-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/resources/common-worker.js rename to tests/wpt/tests/service-workers/cache-storage/resources/common-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/resources/credentials-iframe.html b/tests/wpt/tests/service-workers/cache-storage/resources/credentials-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/resources/credentials-iframe.html rename to tests/wpt/tests/service-workers/cache-storage/resources/credentials-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/resources/credentials-worker.js b/tests/wpt/tests/service-workers/cache-storage/resources/credentials-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/resources/credentials-worker.js rename to tests/wpt/tests/service-workers/cache-storage/resources/credentials-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/resources/fetch-status.py b/tests/wpt/tests/service-workers/cache-storage/resources/fetch-status.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/resources/fetch-status.py rename to tests/wpt/tests/service-workers/cache-storage/resources/fetch-status.py diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/resources/iframe.html b/tests/wpt/tests/service-workers/cache-storage/resources/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/resources/iframe.html rename to tests/wpt/tests/service-workers/cache-storage/resources/iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/resources/simple.txt b/tests/wpt/tests/service-workers/cache-storage/resources/simple.txt similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/resources/simple.txt rename to tests/wpt/tests/service-workers/cache-storage/resources/simple.txt diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/resources/test-helpers.js b/tests/wpt/tests/service-workers/cache-storage/resources/test-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/resources/test-helpers.js rename to tests/wpt/tests/service-workers/cache-storage/resources/test-helpers.js diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/resources/vary.py b/tests/wpt/tests/service-workers/cache-storage/resources/vary.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/resources/vary.py rename to tests/wpt/tests/service-workers/cache-storage/resources/vary.py diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/sandboxed-iframes.https.html b/tests/wpt/tests/service-workers/cache-storage/sandboxed-iframes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/cache-storage/sandboxed-iframes.https.html rename to tests/wpt/tests/service-workers/cache-storage/sandboxed-iframes.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/idlharness.https.any.js b/tests/wpt/tests/service-workers/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/idlharness.https.any.js rename to tests/wpt/tests/service-workers/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/Service-Worker-Allowed-header.https.html b/tests/wpt/tests/service-workers/service-worker/Service-Worker-Allowed-header.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/Service-Worker-Allowed-header.https.html rename to tests/wpt/tests/service-workers/service-worker/Service-Worker-Allowed-header.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/close.https.html b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/close.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/close.https.html rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/close.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/extendable-message-event-constructor.https.html b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/extendable-message-event-constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/extendable-message-event-constructor.https.html rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/extendable-message-event-constructor.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/extendable-message-event.https.html b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/extendable-message-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/extendable-message-event.https.html rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/extendable-message-event.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/fetch-on-the-right-interface.https.any.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/fetch-on-the-right-interface.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/fetch-on-the-right-interface.https.any.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/fetch-on-the-right-interface.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/isSecureContext.https.html b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/isSecureContext.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/isSecureContext.https.html rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/isSecureContext.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/isSecureContext.serviceworker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/isSecureContext.serviceworker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/isSecureContext.serviceworker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/isSecureContext.serviceworker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/postmessage.https.html b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/postmessage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/postmessage.https.html rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/postmessage.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/registration-attribute.https.html b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/registration-attribute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/registration-attribute.https.html rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/registration-attribute.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/close-worker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/close-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/close-worker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/close-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/error-worker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/error-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/error-worker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/error-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-constructor-worker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-constructor-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-constructor-worker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-constructor-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-loopback-worker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-loopback-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-loopback-worker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-loopback-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-ping-worker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-ping-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-ping-worker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-ping-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-pong-worker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-pong-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-pong-worker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-pong-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-utils.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-utils.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-utils.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-worker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-worker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/extendable-message-event-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/postmessage-loopback-worker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/postmessage-loopback-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/postmessage-loopback-worker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/postmessage-loopback-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/postmessage-ping-worker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/postmessage-ping-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/postmessage-ping-worker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/postmessage-ping-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/postmessage-pong-worker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/postmessage-pong-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/postmessage-pong-worker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/postmessage-pong-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/registration-attribute-newer-worker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/registration-attribute-newer-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/registration-attribute-newer-worker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/registration-attribute-newer-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/registration-attribute-worker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/registration-attribute-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/registration-attribute-worker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/registration-attribute-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/unregister-controlling-worker.html b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/unregister-controlling-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/unregister-controlling-worker.html rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/unregister-controlling-worker.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/unregister-worker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/unregister-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/unregister-worker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/unregister-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/update-worker.js b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/update-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/update-worker.js rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/update-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/update-worker.py b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/update-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/update-worker.py rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/resources/update-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/service-worker-error-event.https.html b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/service-worker-error-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/service-worker-error-event.https.html rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/service-worker-error-event.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/unregister.https.html b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/unregister.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/unregister.https.html rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/unregister.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/update.https.html b/tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/update.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ServiceWorkerGlobalScope/update.https.html rename to tests/wpt/tests/service-workers/service-worker/ServiceWorkerGlobalScope/update.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/about-blank-replacement.https.html b/tests/wpt/tests/service-workers/service-worker/about-blank-replacement.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/about-blank-replacement.https.html rename to tests/wpt/tests/service-workers/service-worker/about-blank-replacement.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/activate-event-after-install-state-change.https.html b/tests/wpt/tests/service-workers/service-worker/activate-event-after-install-state-change.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/activate-event-after-install-state-change.https.html rename to tests/wpt/tests/service-workers/service-worker/activate-event-after-install-state-change.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/activation-after-registration.https.html b/tests/wpt/tests/service-workers/service-worker/activation-after-registration.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/activation-after-registration.https.html rename to tests/wpt/tests/service-workers/service-worker/activation-after-registration.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/activation.https.html b/tests/wpt/tests/service-workers/service-worker/activation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/activation.https.html rename to tests/wpt/tests/service-workers/service-worker/activation.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/active.https.html b/tests/wpt/tests/service-workers/service-worker/active.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/active.https.html rename to tests/wpt/tests/service-workers/service-worker/active.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/claim-affect-other-registration.https.html b/tests/wpt/tests/service-workers/service-worker/claim-affect-other-registration.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/claim-affect-other-registration.https.html rename to tests/wpt/tests/service-workers/service-worker/claim-affect-other-registration.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/claim-fetch.https.html b/tests/wpt/tests/service-workers/service-worker/claim-fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/claim-fetch.https.html rename to tests/wpt/tests/service-workers/service-worker/claim-fetch.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/claim-not-using-registration.https.html b/tests/wpt/tests/service-workers/service-worker/claim-not-using-registration.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/claim-not-using-registration.https.html rename to tests/wpt/tests/service-workers/service-worker/claim-not-using-registration.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/claim-shared-worker-fetch.https.html b/tests/wpt/tests/service-workers/service-worker/claim-shared-worker-fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/claim-shared-worker-fetch.https.html rename to tests/wpt/tests/service-workers/service-worker/claim-shared-worker-fetch.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/claim-using-registration.https.html b/tests/wpt/tests/service-workers/service-worker/claim-using-registration.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/claim-using-registration.https.html rename to tests/wpt/tests/service-workers/service-worker/claim-using-registration.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/claim-with-redirect.https.html b/tests/wpt/tests/service-workers/service-worker/claim-with-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/claim-with-redirect.https.html rename to tests/wpt/tests/service-workers/service-worker/claim-with-redirect.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/claim-worker-fetch.https.html b/tests/wpt/tests/service-workers/service-worker/claim-worker-fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/claim-worker-fetch.https.html rename to tests/wpt/tests/service-workers/service-worker/claim-worker-fetch.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/client-id.https.html b/tests/wpt/tests/service-workers/service-worker/client-id.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/client-id.https.html rename to tests/wpt/tests/service-workers/service-worker/client-id.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/client-navigate.https.html b/tests/wpt/tests/service-workers/service-worker/client-navigate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/client-navigate.https.html rename to tests/wpt/tests/service-workers/service-worker/client-navigate.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/client-url-of-blob-url-worker.https.html b/tests/wpt/tests/service-workers/service-worker/client-url-of-blob-url-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/client-url-of-blob-url-worker.https.html rename to tests/wpt/tests/service-workers/service-worker/client-url-of-blob-url-worker.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-get-client-types.https.html b/tests/wpt/tests/service-workers/service-worker/clients-get-client-types.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/clients-get-client-types.https.html rename to tests/wpt/tests/service-workers/service-worker/clients-get-client-types.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-get-cross-origin.https.html b/tests/wpt/tests/service-workers/service-worker/clients-get-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/clients-get-cross-origin.https.html rename to tests/wpt/tests/service-workers/service-worker/clients-get-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-get-resultingClientId.https.html b/tests/wpt/tests/service-workers/service-worker/clients-get-resultingClientId.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/clients-get-resultingClientId.https.html rename to tests/wpt/tests/service-workers/service-worker/clients-get-resultingClientId.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-get.https.html b/tests/wpt/tests/service-workers/service-worker/clients-get.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/clients-get.https.html rename to tests/wpt/tests/service-workers/service-worker/clients-get.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-blob-url-worker.https.html b/tests/wpt/tests/service-workers/service-worker/clients-matchall-blob-url-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-blob-url-worker.https.html rename to tests/wpt/tests/service-workers/service-worker/clients-matchall-blob-url-worker.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-client-types.https.html b/tests/wpt/tests/service-workers/service-worker/clients-matchall-client-types.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-client-types.https.html rename to tests/wpt/tests/service-workers/service-worker/clients-matchall-client-types.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-exact-controller.https.html b/tests/wpt/tests/service-workers/service-worker/clients-matchall-exact-controller.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-exact-controller.https.html rename to tests/wpt/tests/service-workers/service-worker/clients-matchall-exact-controller.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-frozen.https.html b/tests/wpt/tests/service-workers/service-worker/clients-matchall-frozen.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-frozen.https.html rename to tests/wpt/tests/service-workers/service-worker/clients-matchall-frozen.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html b/tests/wpt/tests/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html rename to tests/wpt/tests/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-on-evaluation.https.html b/tests/wpt/tests/service-workers/service-worker/clients-matchall-on-evaluation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-on-evaluation.https.html rename to tests/wpt/tests/service-workers/service-worker/clients-matchall-on-evaluation.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-order.https.html b/tests/wpt/tests/service-workers/service-worker/clients-matchall-order.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-order.https.html rename to tests/wpt/tests/service-workers/service-worker/clients-matchall-order.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall.https.html b/tests/wpt/tests/service-workers/service-worker/clients-matchall.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall.https.html rename to tests/wpt/tests/service-workers/service-worker/clients-matchall.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/controlled-dedicatedworker-postMessage.https.html b/tests/wpt/tests/service-workers/service-worker/controlled-dedicatedworker-postMessage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/controlled-dedicatedworker-postMessage.https.html rename to tests/wpt/tests/service-workers/service-worker/controlled-dedicatedworker-postMessage.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/controlled-iframe-postMessage.https.html b/tests/wpt/tests/service-workers/service-worker/controlled-iframe-postMessage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/controlled-iframe-postMessage.https.html rename to tests/wpt/tests/service-workers/service-worker/controlled-iframe-postMessage.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/controller-on-disconnect.https.html b/tests/wpt/tests/service-workers/service-worker/controller-on-disconnect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/controller-on-disconnect.https.html rename to tests/wpt/tests/service-workers/service-worker/controller-on-disconnect.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/controller-on-load.https.html b/tests/wpt/tests/service-workers/service-worker/controller-on-load.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/controller-on-load.https.html rename to tests/wpt/tests/service-workers/service-worker/controller-on-load.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/controller-on-reload.https.html b/tests/wpt/tests/service-workers/service-worker/controller-on-reload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/controller-on-reload.https.html rename to tests/wpt/tests/service-workers/service-worker/controller-on-reload.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/controller-with-no-fetch-event-handler.https.html b/tests/wpt/tests/service-workers/service-worker/controller-with-no-fetch-event-handler.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/controller-with-no-fetch-event-handler.https.html rename to tests/wpt/tests/service-workers/service-worker/controller-with-no-fetch-event-handler.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/credentials.https.html b/tests/wpt/tests/service-workers/service-worker/credentials.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/credentials.https.html rename to tests/wpt/tests/service-workers/service-worker/credentials.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/data-iframe.html b/tests/wpt/tests/service-workers/service-worker/data-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/data-iframe.html rename to tests/wpt/tests/service-workers/service-worker/data-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/data-transfer-files.https.html b/tests/wpt/tests/service-workers/service-worker/data-transfer-files.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/data-transfer-files.https.html rename to tests/wpt/tests/service-workers/service-worker/data-transfer-files.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/dedicated-worker-service-worker-interception.https.html b/tests/wpt/tests/service-workers/service-worker/dedicated-worker-service-worker-interception.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/dedicated-worker-service-worker-interception.https.html rename to tests/wpt/tests/service-workers/service-worker/dedicated-worker-service-worker-interception.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html b/tests/wpt/tests/service-workers/service-worker/detached-context.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html rename to tests/wpt/tests/service-workers/service-worker/detached-context.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/embed-and-object-are-not-intercepted.https.html b/tests/wpt/tests/service-workers/service-worker/embed-and-object-are-not-intercepted.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/embed-and-object-are-not-intercepted.https.html rename to tests/wpt/tests/service-workers/service-worker/embed-and-object-are-not-intercepted.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/extendable-event-async-waituntil.https.html b/tests/wpt/tests/service-workers/service-worker/extendable-event-async-waituntil.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/extendable-event-async-waituntil.https.html rename to tests/wpt/tests/service-workers/service-worker/extendable-event-async-waituntil.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/extendable-event-waituntil.https.html b/tests/wpt/tests/service-workers/service-worker/extendable-event-waituntil.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/extendable-event-waituntil.https.html rename to tests/wpt/tests/service-workers/service-worker/extendable-event-waituntil.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-audio-tainting.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-audio-tainting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-audio-tainting.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-audio-tainting.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-double-write.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-canvas-tainting-double-write.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-double-write.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-canvas-tainting-double-write.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-image-cache.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-canvas-tainting-image-cache.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-image-cache.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-canvas-tainting-image-cache.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-image.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-canvas-tainting-image.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-image.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-canvas-tainting-image.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-video-cache.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-canvas-tainting-video-cache.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-video-cache.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-canvas-tainting-video-cache.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-video.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-canvas-tainting-video.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-canvas-tainting-video.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-canvas-tainting-video.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-cors-exposed-header-names.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-cors-exposed-header-names.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-cors-exposed-header-names.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-cors-exposed-header-names.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-cors-xhr.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-cors-xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-cors-xhr.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-cors-xhr.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-csp.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-csp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-csp.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-csp.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-error.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-error.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-error.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-add-async.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-add-async.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-add-async.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-add-async.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-after-navigation-within-page.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-after-navigation-within-page.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-after-navigation-within-page.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-after-navigation-within-page.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-async-respond-with.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-async-respond-with.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-async-respond-with.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-async-respond-with.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-handled.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-handled.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-handled.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-handled.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-is-history-backward-navigation-manual.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-is-history-backward-navigation-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-is-history-backward-navigation-manual.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-is-history-backward-navigation-manual.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-is-history-forward-navigation-manual.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-is-history-forward-navigation-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-is-history-forward-navigation-manual.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-is-history-forward-navigation-manual.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-is-reload-iframe-navigation-manual.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-is-reload-iframe-navigation-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-is-reload-iframe-navigation-manual.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-is-reload-iframe-navigation-manual.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-is-reload-navigation-manual.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-is-reload-navigation-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-is-reload-navigation-manual.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-is-reload-navigation-manual.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-network-error.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-network-error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-network-error.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-network-error.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-redirect.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-redirect.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-redirect.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-referrer-policy.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-referrer-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-referrer-policy.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-referrer-policy.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-argument.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-argument.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-argument.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-argument.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-body-loaded-in-chunk.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-body-loaded-in-chunk.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-body-loaded-in-chunk.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-body-loaded-in-chunk.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-custom-response.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-custom-response.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-custom-response.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-custom-response.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-partial-stream.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-partial-stream.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-partial-stream.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-partial-stream.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-readable-stream-chunk.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-readable-stream-chunk.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-readable-stream-chunk.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-readable-stream-chunk.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-readable-stream.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-readable-stream.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-readable-stream.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-readable-stream.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-response-body-with-invalid-chunk.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-response-body-with-invalid-chunk.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-response-body-with-invalid-chunk.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-response-body-with-invalid-chunk.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-stops-propagation.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-stops-propagation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-stops-propagation.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-respond-with-stops-propagation.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-throws-after-respond-with.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-throws-after-respond-with.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-throws-after-respond-with.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-throws-after-respond-with.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-within-sw-manual.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-within-sw-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-within-sw-manual.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-within-sw-manual.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-within-sw.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event-within-sw.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-within-sw.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event-within-sw.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event.https.h2.html b/tests/wpt/tests/service-workers/service-worker/fetch-event.https.h2.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event.https.h2.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event.https.h2.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-event.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-frame-resource.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-frame-resource.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-frame-resource.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-frame-resource.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-header-visibility.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-header-visibility.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-header-visibility.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-header-visibility.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-base-url.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-request-css-base-url.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-base-url.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-request-css-base-url.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-cross-origin.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-request-css-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-cross-origin.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-request-css-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-images.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-request-css-images.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-images.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-request-css-images.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-fallback.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-request-fallback.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-fallback.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-request-fallback.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-no-freshness-headers.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-request-no-freshness-headers.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-no-freshness-headers.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-request-no-freshness-headers.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-redirect.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-request-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-redirect.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-request-redirect.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-resources.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-request-resources.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-resources.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-request-resources.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-xhr-sync-error.https.window.js b/tests/wpt/tests/service-workers/service-worker/fetch-request-xhr-sync-error.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-xhr-sync-error.https.window.js rename to tests/wpt/tests/service-workers/service-worker/fetch-request-xhr-sync-error.https.window.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-xhr-sync-on-worker.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-request-xhr-sync-on-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-xhr-sync-on-worker.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-request-xhr-sync-on-worker.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-xhr-sync.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-request-xhr-sync.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-xhr-sync.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-request-xhr-sync.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-xhr.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-request-xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-xhr.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-request-xhr.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-response-taint.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-response-taint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-response-taint.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-response-taint.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-response-xhr.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-response-xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-response-xhr.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-response-xhr.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-waits-for-activate.https.html b/tests/wpt/tests/service-workers/service-worker/fetch-waits-for-activate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/fetch-waits-for-activate.https.html rename to tests/wpt/tests/service-workers/service-worker/fetch-waits-for-activate.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/getregistration.https.html b/tests/wpt/tests/service-workers/service-worker/getregistration.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/getregistration.https.html rename to tests/wpt/tests/service-workers/service-worker/getregistration.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/getregistrations.https.html b/tests/wpt/tests/service-workers/service-worker/getregistrations.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/getregistrations.https.html rename to tests/wpt/tests/service-workers/service-worker/getregistrations.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/global-serviceworker.https.any.js b/tests/wpt/tests/service-workers/service-worker/global-serviceworker.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/global-serviceworker.https.any.js rename to tests/wpt/tests/service-workers/service-worker/global-serviceworker.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/historical.https.any.js b/tests/wpt/tests/service-workers/service-worker/historical.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/historical.https.any.js rename to tests/wpt/tests/service-workers/service-worker/historical.https.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/http-to-https-redirect-and-register.https.html b/tests/wpt/tests/service-workers/service-worker/http-to-https-redirect-and-register.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/http-to-https-redirect-and-register.https.html rename to tests/wpt/tests/service-workers/service-worker/http-to-https-redirect-and-register.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/immutable-prototype-serviceworker.https.html b/tests/wpt/tests/service-workers/service-worker/immutable-prototype-serviceworker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/immutable-prototype-serviceworker.https.html rename to tests/wpt/tests/service-workers/service-worker/immutable-prototype-serviceworker.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-cross-origin.https.html b/tests/wpt/tests/service-workers/service-worker/import-scripts-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-cross-origin.https.html rename to tests/wpt/tests/service-workers/service-worker/import-scripts-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-data-url.https.html b/tests/wpt/tests/service-workers/service-worker/import-scripts-data-url.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-data-url.https.html rename to tests/wpt/tests/service-workers/service-worker/import-scripts-data-url.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-mime-types.https.html b/tests/wpt/tests/service-workers/service-worker/import-scripts-mime-types.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-mime-types.https.html rename to tests/wpt/tests/service-workers/service-worker/import-scripts-mime-types.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-redirect.https.html b/tests/wpt/tests/service-workers/service-worker/import-scripts-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-redirect.https.html rename to tests/wpt/tests/service-workers/service-worker/import-scripts-redirect.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-resource-map.https.html b/tests/wpt/tests/service-workers/service-worker/import-scripts-resource-map.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-resource-map.https.html rename to tests/wpt/tests/service-workers/service-worker/import-scripts-resource-map.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-updated-flag.https.html b/tests/wpt/tests/service-workers/service-worker/import-scripts-updated-flag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/import-scripts-updated-flag.https.html rename to tests/wpt/tests/service-workers/service-worker/import-scripts-updated-flag.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/indexeddb.https.html b/tests/wpt/tests/service-workers/service-worker/indexeddb.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/indexeddb.https.html rename to tests/wpt/tests/service-workers/service-worker/indexeddb.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/install-event-type.https.html b/tests/wpt/tests/service-workers/service-worker/install-event-type.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/install-event-type.https.html rename to tests/wpt/tests/service-workers/service-worker/install-event-type.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/installing.https.html b/tests/wpt/tests/service-workers/service-worker/installing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/installing.https.html rename to tests/wpt/tests/service-workers/service-worker/installing.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/interface-requirements-sw.https.html b/tests/wpt/tests/service-workers/service-worker/interface-requirements-sw.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/interface-requirements-sw.https.html rename to tests/wpt/tests/service-workers/service-worker/interface-requirements-sw.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/invalid-blobtype.https.html b/tests/wpt/tests/service-workers/service-worker/invalid-blobtype.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/invalid-blobtype.https.html rename to tests/wpt/tests/service-workers/service-worker/invalid-blobtype.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/invalid-header.https.html b/tests/wpt/tests/service-workers/service-worker/invalid-header.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/invalid-header.https.html rename to tests/wpt/tests/service-workers/service-worker/invalid-header.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/iso-latin1-header.https.html b/tests/wpt/tests/service-workers/service-worker/iso-latin1-header.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/iso-latin1-header.https.html rename to tests/wpt/tests/service-workers/service-worker/iso-latin1-header.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/local-url-inherit-controller.https.html b/tests/wpt/tests/service-workers/service-worker/local-url-inherit-controller.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/local-url-inherit-controller.https.html rename to tests/wpt/tests/service-workers/service-worker/local-url-inherit-controller.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/mime-sniffing.https.html b/tests/wpt/tests/service-workers/service-worker/mime-sniffing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/mime-sniffing.https.html rename to tests/wpt/tests/service-workers/service-worker/mime-sniffing.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/current/current.https.html b/tests/wpt/tests/service-workers/service-worker/multi-globals/current/current.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/current/current.https.html rename to tests/wpt/tests/service-workers/service-worker/multi-globals/current/current.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/current/test-sw.js b/tests/wpt/tests/service-workers/service-worker/multi-globals/current/test-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/current/test-sw.js rename to tests/wpt/tests/service-workers/service-worker/multi-globals/current/test-sw.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/incumbent/incumbent.https.html b/tests/wpt/tests/service-workers/service-worker/multi-globals/incumbent/incumbent.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/incumbent/incumbent.https.html rename to tests/wpt/tests/service-workers/service-worker/multi-globals/incumbent/incumbent.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/incumbent/test-sw.js b/tests/wpt/tests/service-workers/service-worker/multi-globals/incumbent/test-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/incumbent/test-sw.js rename to tests/wpt/tests/service-workers/service-worker/multi-globals/incumbent/test-sw.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/relevant/relevant.https.html b/tests/wpt/tests/service-workers/service-worker/multi-globals/relevant/relevant.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/relevant/relevant.https.html rename to tests/wpt/tests/service-workers/service-worker/multi-globals/relevant/relevant.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/relevant/test-sw.js b/tests/wpt/tests/service-workers/service-worker/multi-globals/relevant/test-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/relevant/test-sw.js rename to tests/wpt/tests/service-workers/service-worker/multi-globals/relevant/test-sw.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/test-sw.js b/tests/wpt/tests/service-workers/service-worker/multi-globals/test-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/test-sw.js rename to tests/wpt/tests/service-workers/service-worker/multi-globals/test-sw.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/url-parsing.https.html b/tests/wpt/tests/service-workers/service-worker/multi-globals/url-parsing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/multi-globals/url-parsing.https.html rename to tests/wpt/tests/service-workers/service-worker/multi-globals/url-parsing.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/multipart-image.https.html b/tests/wpt/tests/service-workers/service-worker/multipart-image.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/multipart-image.https.html rename to tests/wpt/tests/service-workers/service-worker/multipart-image.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/multiple-register.https.html b/tests/wpt/tests/service-workers/service-worker/multiple-register.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/multiple-register.https.html rename to tests/wpt/tests/service-workers/service-worker/multiple-register.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/multiple-update.https.html b/tests/wpt/tests/service-workers/service-worker/multiple-update.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/multiple-update.https.html rename to tests/wpt/tests/service-workers/service-worker/multiple-update.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigate-window.https.html b/tests/wpt/tests/service-workers/service-worker/navigate-window.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigate-window.https.html rename to tests/wpt/tests/service-workers/service-worker/navigate-window.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-headers.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-headers.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-headers.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-headers.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/broken-chunked-encoding.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-preload/broken-chunked-encoding.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/broken-chunked-encoding.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/broken-chunked-encoding.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/chunked-encoding.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-preload/chunked-encoding.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/chunked-encoding.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/chunked-encoding.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/empty-preload-response-body.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-preload/empty-preload-response-body.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/empty-preload-response-body.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/empty-preload-response-body.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/get-state.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-preload/get-state.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/get-state.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/get-state.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/navigationPreload.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-preload/navigationPreload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/navigationPreload.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/navigationPreload.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/redirect.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-preload/redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/redirect.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/redirect.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/request-headers.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-preload/request-headers.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/request-headers.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/request-headers.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resource-timing.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resource-timing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resource-timing.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resource-timing.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/broken-chunked-encoding-scope.asis b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/broken-chunked-encoding-scope.asis similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/broken-chunked-encoding-scope.asis rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/broken-chunked-encoding-scope.asis diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/broken-chunked-encoding-worker.js b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/broken-chunked-encoding-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/broken-chunked-encoding-worker.js rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/broken-chunked-encoding-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/chunked-encoding-scope.py b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/chunked-encoding-scope.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/chunked-encoding-scope.py rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/chunked-encoding-scope.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/chunked-encoding-worker.js b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/chunked-encoding-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/chunked-encoding-worker.js rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/chunked-encoding-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/cookie.py b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/cookie.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/cookie.py rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/cookie.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/empty-preload-response-body-scope.html b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/empty-preload-response-body-scope.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/empty-preload-response-body-scope.html rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/empty-preload-response-body-scope.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/empty-preload-response-body-worker.js b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/empty-preload-response-body-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/empty-preload-response-body-worker.js rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/empty-preload-response-body-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/get-state-worker.js b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/get-state-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/get-state-worker.js rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/get-state-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/helpers.js b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/helpers.js rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/helpers.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/navigation-preload-worker.js b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/navigation-preload-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/navigation-preload-worker.js rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/navigation-preload-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/redirect-redirected.html b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/redirect-redirected.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/redirect-redirected.html rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/redirect-redirected.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/redirect-scope.py b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/redirect-scope.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/redirect-scope.py rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/redirect-scope.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/redirect-worker.js b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/redirect-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/redirect-worker.js rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/redirect-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/request-headers-scope.py b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/request-headers-scope.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/request-headers-scope.py rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/request-headers-scope.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/request-headers-worker.js b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/request-headers-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/request-headers-worker.js rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/request-headers-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/resource-timing-scope.py b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/resource-timing-scope.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/resource-timing-scope.py rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/resource-timing-scope.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/resource-timing-worker.js b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/resource-timing-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/resource-timing-worker.js rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/resource-timing-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/samesite-iframe.html b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/samesite-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/samesite-iframe.html rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/samesite-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/samesite-sw-helper.html b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/samesite-sw-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/samesite-sw-helper.html rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/samesite-sw-helper.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/samesite-worker.js b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/samesite-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/samesite-worker.js rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/samesite-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/wait-for-activate-worker.js b/tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/wait-for-activate-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/resources/wait-for-activate-worker.js rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/resources/wait-for-activate-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/samesite-cookies.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-preload/samesite-cookies.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/samesite-cookies.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/samesite-cookies.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/samesite-iframe.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-preload/samesite-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-preload/samesite-iframe.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-preload/samesite-iframe.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-redirect-body.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-redirect-body.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-redirect-body.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-redirect-body.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-redirect-resolution.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-redirect-resolution.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-redirect-resolution.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-redirect-resolution.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-redirect-to-http.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-redirect-to-http.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-redirect-to-http.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-redirect-to-http.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-redirect.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-redirect.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-redirect.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-sets-cookie.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-sets-cookie.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-sets-cookie.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-sets-cookie.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-timing-extended.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-timing-extended.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-timing-extended.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-timing-extended.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigation-timing.https.html b/tests/wpt/tests/service-workers/service-worker/navigation-timing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/navigation-timing.https.html rename to tests/wpt/tests/service-workers/service-worker/navigation-timing.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/nested-blob-url-workers.https.html b/tests/wpt/tests/service-workers/service-worker/nested-blob-url-workers.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/nested-blob-url-workers.https.html rename to tests/wpt/tests/service-workers/service-worker/nested-blob-url-workers.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/next-hop-protocol.https.html b/tests/wpt/tests/service-workers/service-worker/next-hop-protocol.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/next-hop-protocol.https.html rename to tests/wpt/tests/service-workers/service-worker/next-hop-protocol.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/no-dynamic-import-in-module.any.js b/tests/wpt/tests/service-workers/service-worker/no-dynamic-import-in-module.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/no-dynamic-import-in-module.any.js rename to tests/wpt/tests/service-workers/service-worker/no-dynamic-import-in-module.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/no-dynamic-import.any.js b/tests/wpt/tests/service-workers/service-worker/no-dynamic-import.any.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/no-dynamic-import.any.js rename to tests/wpt/tests/service-workers/service-worker/no-dynamic-import.any.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/onactivate-script-error.https.html b/tests/wpt/tests/service-workers/service-worker/onactivate-script-error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/onactivate-script-error.https.html rename to tests/wpt/tests/service-workers/service-worker/onactivate-script-error.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/oninstall-script-error.https.html b/tests/wpt/tests/service-workers/service-worker/oninstall-script-error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/oninstall-script-error.https.html rename to tests/wpt/tests/service-workers/service-worker/oninstall-script-error.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/opaque-response-preloaded.https.html b/tests/wpt/tests/service-workers/service-worker/opaque-response-preloaded.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/opaque-response-preloaded.https.html rename to tests/wpt/tests/service-workers/service-worker/opaque-response-preloaded.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/opaque-script.https.html b/tests/wpt/tests/service-workers/service-worker/opaque-script.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/opaque-script.https.html rename to tests/wpt/tests/service-workers/service-worker/opaque-script.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/partitioned-claim.tentative.https.html b/tests/wpt/tests/service-workers/service-worker/partitioned-claim.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/partitioned-claim.tentative.https.html rename to tests/wpt/tests/service-workers/service-worker/partitioned-claim.tentative.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/partitioned-cookies.tentative.https.html b/tests/wpt/tests/service-workers/service-worker/partitioned-cookies.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/partitioned-cookies.tentative.https.html rename to tests/wpt/tests/service-workers/service-worker/partitioned-cookies.tentative.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/partitioned-getRegistrations.tentative.https.html b/tests/wpt/tests/service-workers/service-worker/partitioned-getRegistrations.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/partitioned-getRegistrations.tentative.https.html rename to tests/wpt/tests/service-workers/service-worker/partitioned-getRegistrations.tentative.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/partitioned-matchAll.tentative.https.html b/tests/wpt/tests/service-workers/service-worker/partitioned-matchAll.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/partitioned-matchAll.tentative.https.html rename to tests/wpt/tests/service-workers/service-worker/partitioned-matchAll.tentative.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/partitioned.tentative.https.html b/tests/wpt/tests/service-workers/service-worker/partitioned.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/partitioned.tentative.https.html rename to tests/wpt/tests/service-workers/service-worker/partitioned.tentative.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/performance-timeline.https.html b/tests/wpt/tests/service-workers/service-worker/performance-timeline.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/performance-timeline.https.html rename to tests/wpt/tests/service-workers/service-worker/performance-timeline.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/postMessage-client-worker.js b/tests/wpt/tests/service-workers/service-worker/postMessage-client-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/postMessage-client-worker.js rename to tests/wpt/tests/service-workers/service-worker/postMessage-client-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-blob-url.https.html b/tests/wpt/tests/service-workers/service-worker/postmessage-blob-url.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-blob-url.https.html rename to tests/wpt/tests/service-workers/service-worker/postmessage-blob-url.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-from-waiting-serviceworker.https.html b/tests/wpt/tests/service-workers/service-worker/postmessage-from-waiting-serviceworker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-from-waiting-serviceworker.https.html rename to tests/wpt/tests/service-workers/service-worker/postmessage-from-waiting-serviceworker.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-msgport-to-client.https.html b/tests/wpt/tests/service-workers/service-worker/postmessage-msgport-to-client.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-msgport-to-client.https.html rename to tests/wpt/tests/service-workers/service-worker/postmessage-msgport-to-client.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-to-client-message-queue.https.html b/tests/wpt/tests/service-workers/service-worker/postmessage-to-client-message-queue.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-to-client-message-queue.https.html rename to tests/wpt/tests/service-workers/service-worker/postmessage-to-client-message-queue.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-to-client.https.html b/tests/wpt/tests/service-workers/service-worker/postmessage-to-client.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-to-client.https.html rename to tests/wpt/tests/service-workers/service-worker/postmessage-to-client.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/postmessage.https.html b/tests/wpt/tests/service-workers/service-worker/postmessage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/postmessage.https.html rename to tests/wpt/tests/service-workers/service-worker/postmessage.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/ready.https.window.js b/tests/wpt/tests/service-workers/service-worker/ready.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/ready.https.window.js rename to tests/wpt/tests/service-workers/service-worker/ready.https.window.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/redirected-response.https.html b/tests/wpt/tests/service-workers/service-worker/redirected-response.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/redirected-response.https.html rename to tests/wpt/tests/service-workers/service-worker/redirected-response.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/referer.https.html b/tests/wpt/tests/service-workers/service-worker/referer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/referer.https.html rename to tests/wpt/tests/service-workers/service-worker/referer.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/referrer-policy-header.https.html b/tests/wpt/tests/service-workers/service-worker/referrer-policy-header.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/referrer-policy-header.https.html rename to tests/wpt/tests/service-workers/service-worker/referrer-policy-header.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/referrer-toplevel-script-fetch.https.html b/tests/wpt/tests/service-workers/service-worker/referrer-toplevel-script-fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/referrer-toplevel-script-fetch.https.html rename to tests/wpt/tests/service-workers/service-worker/referrer-toplevel-script-fetch.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/register-closed-window.https.html b/tests/wpt/tests/service-workers/service-worker/register-closed-window.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/register-closed-window.https.html rename to tests/wpt/tests/service-workers/service-worker/register-closed-window.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/register-default-scope.https.html b/tests/wpt/tests/service-workers/service-worker/register-default-scope.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/register-default-scope.https.html rename to tests/wpt/tests/service-workers/service-worker/register-default-scope.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/register-same-scope-different-script-url.https.html b/tests/wpt/tests/service-workers/service-worker/register-same-scope-different-script-url.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/register-same-scope-different-script-url.https.html rename to tests/wpt/tests/service-workers/service-worker/register-same-scope-different-script-url.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/register-wait-forever-in-install-worker.https.html b/tests/wpt/tests/service-workers/service-worker/register-wait-forever-in-install-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/register-wait-forever-in-install-worker.https.html rename to tests/wpt/tests/service-workers/service-worker/register-wait-forever-in-install-worker.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-basic.https.html b/tests/wpt/tests/service-workers/service-worker/registration-basic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/registration-basic.https.html rename to tests/wpt/tests/service-workers/service-worker/registration-basic.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-end-to-end.https.html b/tests/wpt/tests/service-workers/service-worker/registration-end-to-end.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/registration-end-to-end.https.html rename to tests/wpt/tests/service-workers/service-worker/registration-end-to-end.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-events.https.html b/tests/wpt/tests/service-workers/service-worker/registration-events.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/registration-events.https.html rename to tests/wpt/tests/service-workers/service-worker/registration-events.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-iframe.https.html b/tests/wpt/tests/service-workers/service-worker/registration-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/registration-iframe.https.html rename to tests/wpt/tests/service-workers/service-worker/registration-iframe.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-mime-types.https.html b/tests/wpt/tests/service-workers/service-worker/registration-mime-types.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/registration-mime-types.https.html rename to tests/wpt/tests/service-workers/service-worker/registration-mime-types.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-schedule-job.https.html b/tests/wpt/tests/service-workers/service-worker/registration-schedule-job.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/registration-schedule-job.https.html rename to tests/wpt/tests/service-workers/service-worker/registration-schedule-job.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-scope-module-static-import.https.html b/tests/wpt/tests/service-workers/service-worker/registration-scope-module-static-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/registration-scope-module-static-import.https.html rename to tests/wpt/tests/service-workers/service-worker/registration-scope-module-static-import.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-scope.https.html b/tests/wpt/tests/service-workers/service-worker/registration-scope.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/registration-scope.https.html rename to tests/wpt/tests/service-workers/service-worker/registration-scope.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-script-module.https.html b/tests/wpt/tests/service-workers/service-worker/registration-script-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/registration-script-module.https.html rename to tests/wpt/tests/service-workers/service-worker/registration-script-module.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-script-url.https.html b/tests/wpt/tests/service-workers/service-worker/registration-script-url.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/registration-script-url.https.html rename to tests/wpt/tests/service-workers/service-worker/registration-script-url.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-script.https.html b/tests/wpt/tests/service-workers/service-worker/registration-script.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/registration-script.https.html rename to tests/wpt/tests/service-workers/service-worker/registration-script.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-security-error.https.html b/tests/wpt/tests/service-workers/service-worker/registration-security-error.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/registration-security-error.https.html rename to tests/wpt/tests/service-workers/service-worker/registration-security-error.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-service-worker-attributes.https.html b/tests/wpt/tests/service-workers/service-worker/registration-service-worker-attributes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/registration-service-worker-attributes.https.html rename to tests/wpt/tests/service-workers/service-worker/registration-service-worker-attributes.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-updateviacache.https.html b/tests/wpt/tests/service-workers/service-worker/registration-updateviacache.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/registration-updateviacache.https.html rename to tests/wpt/tests/service-workers/service-worker/registration-updateviacache.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/rejections.https.html b/tests/wpt/tests/service-workers/service-worker/rejections.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/rejections.https.html rename to tests/wpt/tests/service-workers/service-worker/rejections.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/request-end-to-end.https.html b/tests/wpt/tests/service-workers/service-worker/request-end-to-end.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/request-end-to-end.https.html rename to tests/wpt/tests/service-workers/service-worker/request-end-to-end.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing-bodySize.https.html b/tests/wpt/tests/service-workers/service-worker/resource-timing-bodySize.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing-bodySize.https.html rename to tests/wpt/tests/service-workers/service-worker/resource-timing-bodySize.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing-cross-origin.https.html b/tests/wpt/tests/service-workers/service-worker/resource-timing-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing-cross-origin.https.html rename to tests/wpt/tests/service-workers/service-worker/resource-timing-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing-fetch-variants.https.html b/tests/wpt/tests/service-workers/service-worker/resource-timing-fetch-variants.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing-fetch-variants.https.html rename to tests/wpt/tests/service-workers/service-worker/resource-timing-fetch-variants.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing.sub.https.html b/tests/wpt/tests/service-workers/service-worker/resource-timing.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing.sub.https.html rename to tests/wpt/tests/service-workers/service-worker/resource-timing.sub.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/404.py b/tests/wpt/tests/service-workers/service-worker/resources/404.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/404.py rename to tests/wpt/tests/service-workers/service-worker/resources/404.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-blank-dynamic-nested-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-blank-dynamic-nested-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-blank-dynamic-nested-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-blank-dynamic-nested-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-blank-nested-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-blank-nested-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-blank-nested-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-blank-nested-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-frame.py b/tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-frame.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-frame.py rename to tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-frame.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-ping-frame.py b/tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-ping-frame.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-ping-frame.py rename to tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-ping-frame.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-popup-frame.py b/tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-popup-frame.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-popup-frame.py rename to tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-popup-frame.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-srcdoc-nested-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-srcdoc-nested-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-srcdoc-nested-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-srcdoc-nested-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-uncontrolled-nested-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-uncontrolled-nested-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-uncontrolled-nested-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-uncontrolled-nested-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/about-blank-replacement-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/about-blank-replacement-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/basic-module-2.js b/tests/wpt/tests/service-workers/service-worker/resources/basic-module-2.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/basic-module-2.js rename to tests/wpt/tests/service-workers/service-worker/resources/basic-module-2.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/basic-module.js b/tests/wpt/tests/service-workers/service-worker/resources/basic-module.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/basic-module.js rename to tests/wpt/tests/service-workers/service-worker/resources/basic-module.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/blank.html b/tests/wpt/tests/service-workers/service-worker/resources/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/blank.html rename to tests/wpt/tests/service-workers/service-worker/resources/blank.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/bytecheck-worker-imported-script.py b/tests/wpt/tests/service-workers/service-worker/resources/bytecheck-worker-imported-script.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/bytecheck-worker-imported-script.py rename to tests/wpt/tests/service-workers/service-worker/resources/bytecheck-worker-imported-script.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/bytecheck-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/bytecheck-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/bytecheck-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/bytecheck-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-blob-url-worker-fetch-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/claim-blob-url-worker-fetch-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-blob-url-worker-fetch-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/claim-blob-url-worker-fetch-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-nested-worker-fetch-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/claim-nested-worker-fetch-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-nested-worker-fetch-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/claim-nested-worker-fetch-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-nested-worker-fetch-parent-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/claim-nested-worker-fetch-parent-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-nested-worker-fetch-parent-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/claim-nested-worker-fetch-parent-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-shared-worker-fetch-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/claim-shared-worker-fetch-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-shared-worker-fetch-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/claim-shared-worker-fetch-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-shared-worker-fetch-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/claim-shared-worker-fetch-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-shared-worker-fetch-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/claim-shared-worker-fetch-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-with-redirect-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/claim-with-redirect-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-with-redirect-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/claim-with-redirect-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-worker-fetch-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/claim-worker-fetch-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-worker-fetch-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/claim-worker-fetch-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-worker-fetch-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/claim-worker-fetch-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-worker-fetch-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/claim-worker-fetch-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/claim-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/claim-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/claim-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/classic-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/classic-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/classic-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/classic-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/client-id-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/client-id-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/client-id-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/client-id-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/client-navigate-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/client-navigate-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/client-navigate-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/client-navigate-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/client-navigate-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/client-navigate-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/client-navigate-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/client-navigate-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/client-navigated-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/client-navigated-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/client-navigated-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/client-navigated-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.html b/tests/wpt/tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.html rename to tests/wpt/tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-frame-freeze.html b/tests/wpt/tests/service-workers/service-worker/resources/clients-frame-freeze.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-frame-freeze.html rename to tests/wpt/tests/service-workers/service-worker/resources/clients-frame-freeze.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-client-types-frame-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/clients-get-client-types-frame-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-client-types-frame-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/clients-get-client-types-frame-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-client-types-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/clients-get-client-types-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-client-types-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/clients-get-client-types-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-client-types-shared-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/clients-get-client-types-shared-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-client-types-shared-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/clients-get-client-types-shared-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-client-types-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/clients-get-client-types-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-client-types-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/clients-get-client-types-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-cross-origin-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/clients-get-cross-origin-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-cross-origin-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/clients-get-cross-origin-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/clients-get-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/clients-get-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-other-origin.html b/tests/wpt/tests/service-workers/service-worker/resources/clients-get-other-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-other-origin.html rename to tests/wpt/tests/service-workers/service-worker/resources/clients-get-other-origin.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-resultingClientId-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/clients-get-resultingClientId-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-resultingClientId-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/clients-get-resultingClientId-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/clients-get-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-get-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/clients-get-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-matchall-blob-url-worker.html b/tests/wpt/tests/service-workers/service-worker/resources/clients-matchall-blob-url-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-matchall-blob-url-worker.html rename to tests/wpt/tests/service-workers/service-worker/resources/clients-matchall-blob-url-worker.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-matchall-client-types-dedicated-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/clients-matchall-client-types-dedicated-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-matchall-client-types-dedicated-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/clients-matchall-client-types-dedicated-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-matchall-client-types-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/clients-matchall-client-types-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-matchall-client-types-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/clients-matchall-client-types-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-matchall-client-types-shared-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/clients-matchall-client-types-shared-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-matchall-client-types-shared-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/clients-matchall-client-types-shared-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-matchall-on-evaluation-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/clients-matchall-on-evaluation-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-matchall-on-evaluation-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/clients-matchall-on-evaluation-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-matchall-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/clients-matchall-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/clients-matchall-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/clients-matchall-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/controlled-frame-postMessage.html b/tests/wpt/tests/service-workers/service-worker/resources/controlled-frame-postMessage.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/controlled-frame-postMessage.html rename to tests/wpt/tests/service-workers/service-worker/resources/controlled-frame-postMessage.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/controlled-worker-late-postMessage.js b/tests/wpt/tests/service-workers/service-worker/resources/controlled-worker-late-postMessage.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/controlled-worker-late-postMessage.js rename to tests/wpt/tests/service-workers/service-worker/resources/controlled-worker-late-postMessage.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/controlled-worker-postMessage.js b/tests/wpt/tests/service-workers/service-worker/resources/controlled-worker-postMessage.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/controlled-worker-postMessage.js rename to tests/wpt/tests/service-workers/service-worker/resources/controlled-worker-postMessage.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/cors-approved.txt b/tests/wpt/tests/service-workers/service-worker/resources/cors-approved.txt similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/cors-approved.txt rename to tests/wpt/tests/service-workers/service-worker/resources/cors-approved.txt diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/cors-approved.txt.headers b/tests/wpt/tests/service-workers/service-worker/resources/cors-approved.txt.headers similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/cors-approved.txt.headers rename to tests/wpt/tests/service-workers/service-worker/resources/cors-approved.txt.headers diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/cors-denied.txt b/tests/wpt/tests/service-workers/service-worker/resources/cors-denied.txt similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/cors-denied.txt rename to tests/wpt/tests/service-workers/service-worker/resources/cors-denied.txt diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/create-blob-url-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/create-blob-url-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/create-blob-url-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/create-blob-url-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/create-out-of-scope-worker.html b/tests/wpt/tests/service-workers/service-worker/resources/create-out-of-scope-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/create-out-of-scope-worker.html rename to tests/wpt/tests/service-workers/service-worker/resources/create-out-of-scope-worker.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/echo-content.py b/tests/wpt/tests/service-workers/service-worker/resources/echo-content.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/echo-content.py rename to tests/wpt/tests/service-workers/service-worker/resources/echo-content.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/echo-cookie-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/echo-cookie-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/echo-cookie-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/echo-cookie-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/echo-message-to-source-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/echo-message-to-source-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/echo-message-to-source-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/echo-message-to-source-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/embed-and-object-are-not-intercepted-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/embed-and-object-are-not-intercepted-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/embed-and-object-are-not-intercepted-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/embed-and-object-are-not-intercepted-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/embed-image-is-not-intercepted-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/embed-image-is-not-intercepted-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/embed-image-is-not-intercepted-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/embed-image-is-not-intercepted-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/embed-is-not-intercepted-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/embed-is-not-intercepted-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/embed-is-not-intercepted-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/embed-is-not-intercepted-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/embed-navigation-is-not-intercepted-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/embed-navigation-is-not-intercepted-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/embed-navigation-is-not-intercepted-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/embed-navigation-is-not-intercepted-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/embedded-content-from-server.html b/tests/wpt/tests/service-workers/service-worker/resources/embedded-content-from-server.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/embedded-content-from-server.html rename to tests/wpt/tests/service-workers/service-worker/resources/embedded-content-from-server.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/embedded-content-from-service-worker.html b/tests/wpt/tests/service-workers/service-worker/resources/embedded-content-from-service-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/embedded-content-from-service-worker.html rename to tests/wpt/tests/service-workers/service-worker/resources/embedded-content-from-service-worker.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/empty-but-slow-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/empty-but-slow-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/empty-but-slow-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/empty-but-slow-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/empty-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/empty-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/empty-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/empty-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/empty.h2.js b/tests/wpt/tests/service-workers/service-worker/resources/empty.h2.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/empty.h2.js rename to tests/wpt/tests/service-workers/service-worker/resources/empty.h2.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/empty.html b/tests/wpt/tests/service-workers/service-worker/resources/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/empty.html rename to tests/wpt/tests/service-workers/service-worker/resources/empty.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/empty.js b/tests/wpt/tests/service-workers/service-worker/resources/empty.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/empty.js rename to tests/wpt/tests/service-workers/service-worker/resources/empty.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/enable-client-message-queue.html b/tests/wpt/tests/service-workers/service-worker/resources/enable-client-message-queue.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/enable-client-message-queue.html rename to tests/wpt/tests/service-workers/service-worker/resources/enable-client-message-queue.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/end-to-end-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/end-to-end-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/end-to-end-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/end-to-end-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/events-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/events-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/events-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/events-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/extendable-event-async-waituntil.js b/tests/wpt/tests/service-workers/service-worker/resources/extendable-event-async-waituntil.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/extendable-event-async-waituntil.js rename to tests/wpt/tests/service-workers/service-worker/resources/extendable-event-async-waituntil.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/extendable-event-waituntil.js b/tests/wpt/tests/service-workers/service-worker/resources/extendable-event-waituntil.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/extendable-event-waituntil.js rename to tests/wpt/tests/service-workers/service-worker/resources/extendable-event-waituntil.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fail-on-fetch-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fail-on-fetch-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fail-on-fetch-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fail-on-fetch-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-access-control-login.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-access-control-login.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-access-control-login.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-access-control-login.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-access-control.py b/tests/wpt/tests/service-workers/service-worker/resources/fetch-access-control.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-access-control.py rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-access-control.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-canvas-tainting-double-write-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-canvas-tainting-double-write-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-canvas-tainting-double-write-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-canvas-tainting-double-write-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-canvas-tainting-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-canvas-tainting-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-canvas-tainting-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-canvas-tainting-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-canvas-tainting-tests.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-canvas-tainting-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-canvas-tainting-tests.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-canvas-tainting-tests.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-cors-exposed-header-names-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-cors-exposed-header-names-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-cors-exposed-header-names-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-cors-exposed-header-names-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-cors-xhr-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-cors-xhr-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-cors-xhr-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-cors-xhr-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-csp-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-csp-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-csp-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-csp-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-csp-iframe.html.sub.headers b/tests/wpt/tests/service-workers/service-worker/resources/fetch-csp-iframe.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-csp-iframe.html.sub.headers rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-csp-iframe.html.sub.headers diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-error-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-error-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-error-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-error-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-add-async-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-add-async-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-add-async-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-add-async-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-after-navigation-within-page-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-after-navigation-within-page-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-after-navigation-within-page-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-after-navigation-within-page-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-async-respond-with-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-async-respond-with-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-async-respond-with-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-async-respond-with-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-handled-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-handled-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-handled-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-handled-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-network-error-controllee-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-network-error-controllee-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-network-error-controllee-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-network-error-controllee-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-network-error-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-network-error-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-network-error-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-network-error-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-network-fallback-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-network-fallback-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-network-fallback-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-network-fallback-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-argument-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-argument-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-argument-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-argument-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-argument-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-argument-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-argument-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-argument-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-body-loaded-in-chunk-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-body-loaded-in-chunk-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-body-loaded-in-chunk-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-body-loaded-in-chunk-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-custom-response-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-custom-response-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-custom-response-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-custom-response-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-partial-stream-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-partial-stream-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-partial-stream-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-partial-stream-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-readable-stream-chunk-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-readable-stream-chunk-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-readable-stream-chunk-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-readable-stream-chunk-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-readable-stream-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-readable-stream-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-readable-stream-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-readable-stream-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-response-body-with-invalid-chunk-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-response-body-with-invalid-chunk-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-response-body-with-invalid-chunk-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-response-body-with-invalid-chunk-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-response-body-with-invalid-chunk-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-response-body-with-invalid-chunk-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-response-body-with-invalid-chunk-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-response-body-with-invalid-chunk-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-stops-propagation-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-stops-propagation-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-respond-with-stops-propagation-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-respond-with-stops-propagation-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-test-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-test-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-test-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-test-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-within-sw-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-event-within-sw-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-within-sw-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-event-within-sw-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-header-visibility-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-header-visibility-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-header-visibility-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-header-visibility-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-mixed-content-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-mixed-content-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-base-url-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-base-url-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-base-url-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-base-url-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-base-url-style.css b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-base-url-style.css similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-base-url-style.css rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-base-url-style.css diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-base-url-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-base-url-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-base-url-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-base-url-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-cross.css b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-cross.css similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-cross.css rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-cross.css diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-cross.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-cross.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-cross.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-cross.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-same.css b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-same.css similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-same.css rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-same.css diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-same.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-same.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-same.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-mime-check-same.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-read-contents.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-read-contents.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-read-contents.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-read-contents.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-css-cross-origin-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-fallback-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-fallback-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-fallback-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-fallback-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-fallback-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-fallback-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-fallback-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-fallback-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-html-imports-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-html-imports-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-html-imports-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-html-imports-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-html-imports-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-html-imports-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-html-imports-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-html-imports-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-no-freshness-headers-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-no-freshness-headers-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-no-freshness-headers-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-no-freshness-headers-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-no-freshness-headers-script.py b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-no-freshness-headers-script.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-no-freshness-headers-script.py rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-no-freshness-headers-script.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-no-freshness-headers-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-no-freshness-headers-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-no-freshness-headers-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-no-freshness-headers-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-redirect-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-redirect-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-redirect-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-redirect-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-resources-iframe.https.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-resources-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-resources-iframe.https.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-resources-iframe.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-resources-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-resources-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-resources-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-resources-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-sync-error-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-xhr-sync-error-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-sync-error-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-xhr-sync-error-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-sync-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-xhr-sync-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-sync-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-xhr-sync-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-sync-on-worker-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-xhr-sync-on-worker-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-sync-on-worker-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-xhr-sync-on-worker-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-sync-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-xhr-sync-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-sync-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-xhr-sync-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-request-xhr-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-request-xhr-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response-taint-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-response-taint-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response-taint-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-response-taint-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response-xhr-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-response-xhr-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response-xhr-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-response-xhr-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response.html b/tests/wpt/tests/service-workers/service-worker/resources/fetch-response.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response.html rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-response.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-response.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-response.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-rewrite-worker-referrer-policy.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-rewrite-worker-referrer-policy.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-rewrite-worker-referrer-policy.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-rewrite-worker-referrer-policy.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-rewrite-worker-referrer-policy.js.headers b/tests/wpt/tests/service-workers/service-worker/resources/fetch-rewrite-worker-referrer-policy.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-rewrite-worker-referrer-policy.js.headers rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-rewrite-worker-referrer-policy.js.headers diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-rewrite-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-rewrite-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-rewrite-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-rewrite-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-rewrite-worker.js.headers b/tests/wpt/tests/service-workers/service-worker/resources/fetch-rewrite-worker.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-rewrite-worker.js.headers rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-rewrite-worker.js.headers diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-variants-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-variants-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-variants-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-variants-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-waits-for-activate-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/fetch-waits-for-activate-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-waits-for-activate-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/fetch-waits-for-activate-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/form-poster.html b/tests/wpt/tests/service-workers/service-worker/resources/form-poster.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/form-poster.html rename to tests/wpt/tests/service-workers/service-worker/resources/form-poster.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/frame-for-getregistrations.html b/tests/wpt/tests/service-workers/service-worker/resources/frame-for-getregistrations.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/frame-for-getregistrations.html rename to tests/wpt/tests/service-workers/service-worker/resources/frame-for-getregistrations.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/get-resultingClientId-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/get-resultingClientId-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/get-resultingClientId-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/get-resultingClientId-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/http-to-https-redirect-and-register-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/http-to-https-redirect-and-register-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/http-to-https-redirect-and-register-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/http-to-https-redirect-and-register-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iframe-with-fetch-variants.html b/tests/wpt/tests/service-workers/service-worker/resources/iframe-with-fetch-variants.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/iframe-with-fetch-variants.html rename to tests/wpt/tests/service-workers/service-worker/resources/iframe-with-fetch-variants.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iframe-with-image.html b/tests/wpt/tests/service-workers/service-worker/resources/iframe-with-image.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/iframe-with-image.html rename to tests/wpt/tests/service-workers/service-worker/resources/iframe-with-image.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/immutable-prototype-serviceworker.js b/tests/wpt/tests/service-workers/service-worker/resources/immutable-prototype-serviceworker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/immutable-prototype-serviceworker.js rename to tests/wpt/tests/service-workers/service-worker/resources/immutable-prototype-serviceworker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-echo-cookie-worker-module.py b/tests/wpt/tests/service-workers/service-worker/resources/import-echo-cookie-worker-module.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-echo-cookie-worker-module.py rename to tests/wpt/tests/service-workers/service-worker/resources/import-echo-cookie-worker-module.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-echo-cookie-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/import-echo-cookie-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-echo-cookie-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/import-echo-cookie-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-mime-type-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/import-mime-type-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-mime-type-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/import-mime-type-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-relative.xsl b/tests/wpt/tests/service-workers/service-worker/resources/import-relative.xsl similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-relative.xsl rename to tests/wpt/tests/service-workers/service-worker/resources/import-relative.xsl diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-404-after-update-plus-update-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-404-after-update-plus-update-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-404-after-update-plus-update-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-404-after-update-plus-update-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-404-after-update.js b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-404-after-update.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-404-after-update.js rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-404-after-update.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-404.js b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-404.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-404.js rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-404.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-cross-origin-worker.sub.js b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-cross-origin-worker.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-cross-origin-worker.sub.js rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-cross-origin-worker.sub.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-data-url-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-data-url-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-data-url-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-data-url-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-diff-resource-map-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-diff-resource-map-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-diff-resource-map-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-diff-resource-map-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-echo.py b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-echo.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-echo.py rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-echo.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-get.py b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-get.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-get.py rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-get.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-mime-types-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-mime-types-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-mime-types-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-mime-types-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-redirect-import.js b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-redirect-import.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-redirect-import.js rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-redirect-import.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-redirect-on-second-time-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-redirect-on-second-time-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-redirect-on-second-time-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-redirect-on-second-time-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-redirect-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-redirect-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-redirect-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-redirect-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-resource-map-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-resource-map-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-resource-map-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-resource-map-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-updated-flag-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-updated-flag-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-updated-flag-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-updated-flag-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-version.py b/tests/wpt/tests/service-workers/service-worker/resources/import-scripts-version.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/import-scripts-version.py rename to tests/wpt/tests/service-workers/service-worker/resources/import-scripts-version.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/imported-classic-script.js b/tests/wpt/tests/service-workers/service-worker/resources/imported-classic-script.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/imported-classic-script.js rename to tests/wpt/tests/service-workers/service-worker/resources/imported-classic-script.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/imported-module-script.js b/tests/wpt/tests/service-workers/service-worker/resources/imported-module-script.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/imported-module-script.js rename to tests/wpt/tests/service-workers/service-worker/resources/imported-module-script.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/indexeddb-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/indexeddb-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/indexeddb-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/indexeddb-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/install-event-type-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/install-event-type-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/install-event-type-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/install-event-type-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/install-worker.html b/tests/wpt/tests/service-workers/service-worker/resources/install-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/install-worker.html rename to tests/wpt/tests/service-workers/service-worker/resources/install-worker.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/interface-requirements-worker.sub.js b/tests/wpt/tests/service-workers/service-worker/resources/interface-requirements-worker.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/interface-requirements-worker.sub.js rename to tests/wpt/tests/service-workers/service-worker/resources/interface-requirements-worker.sub.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-blobtype-iframe.https.html b/tests/wpt/tests/service-workers/service-worker/resources/invalid-blobtype-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-blobtype-iframe.https.html rename to tests/wpt/tests/service-workers/service-worker/resources/invalid-blobtype-iframe.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-blobtype-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/invalid-blobtype-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-blobtype-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/invalid-blobtype-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-chunked-encoding-with-flush.py b/tests/wpt/tests/service-workers/service-worker/resources/invalid-chunked-encoding-with-flush.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-chunked-encoding-with-flush.py rename to tests/wpt/tests/service-workers/service-worker/resources/invalid-chunked-encoding-with-flush.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-chunked-encoding.py b/tests/wpt/tests/service-workers/service-worker/resources/invalid-chunked-encoding.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-chunked-encoding.py rename to tests/wpt/tests/service-workers/service-worker/resources/invalid-chunked-encoding.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-header-iframe.https.html b/tests/wpt/tests/service-workers/service-worker/resources/invalid-header-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-header-iframe.https.html rename to tests/wpt/tests/service-workers/service-worker/resources/invalid-header-iframe.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-header-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/invalid-header-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-header-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/invalid-header-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iso-latin1-header-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/iso-latin1-header-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/iso-latin1-header-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/iso-latin1-header-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iso-latin1-header-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/iso-latin1-header-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/iso-latin1-header-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/iso-latin1-header-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/load_worker.js b/tests/wpt/tests/service-workers/service-worker/resources/load_worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/load_worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/load_worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/loaded.html b/tests/wpt/tests/service-workers/service-worker/resources/loaded.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/loaded.html rename to tests/wpt/tests/service-workers/service-worker/resources/loaded.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/local-url-inherit-controller-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/local-url-inherit-controller-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/local-url-inherit-controller-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/local-url-inherit-controller-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/local-url-inherit-controller-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/local-url-inherit-controller-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/local-url-inherit-controller-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/local-url-inherit-controller-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/location-setter.html b/tests/wpt/tests/service-workers/service-worker/resources/location-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/location-setter.html rename to tests/wpt/tests/service-workers/service-worker/resources/location-setter.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/malformed-http-response.asis b/tests/wpt/tests/service-workers/service-worker/resources/malformed-http-response.asis similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/malformed-http-response.asis rename to tests/wpt/tests/service-workers/service-worker/resources/malformed-http-response.asis diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/malformed-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/malformed-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/malformed-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/malformed-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/message-vs-microtask.html b/tests/wpt/tests/service-workers/service-worker/resources/message-vs-microtask.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/message-vs-microtask.html rename to tests/wpt/tests/service-workers/service-worker/resources/message-vs-microtask.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/mime-sniffing-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/mime-sniffing-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/mime-sniffing-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/mime-sniffing-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/mime-type-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/mime-type-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/mime-type-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/mime-type-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/mint-new-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/mint-new-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/mint-new-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/mint-new-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/module-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/module-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/module-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/module-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/multipart-image-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/multipart-image-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/multipart-image-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/multipart-image-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/multipart-image-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/multipart-image-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/multipart-image-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/multipart-image-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/multipart-image.py b/tests/wpt/tests/service-workers/service-worker/resources/multipart-image.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/multipart-image.py rename to tests/wpt/tests/service-workers/service-worker/resources/multipart-image.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigate-window-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/navigate-window-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigate-window-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/navigate-window-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-headers-server.py b/tests/wpt/tests/service-workers/service-worker/resources/navigation-headers-server.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-headers-server.py rename to tests/wpt/tests/service-workers/service-worker/resources/navigation-headers-server.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-body-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-body-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-body-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-body-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-body.py b/tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-body.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-body.py rename to tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-body.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-other-origin.html b/tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-other-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-other-origin.html rename to tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-other-origin.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-out-scope.py b/tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-out-scope.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-out-scope.py rename to tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-out-scope.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-scope1.py b/tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-scope1.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-scope1.py rename to tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-scope1.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-scope2.py b/tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-scope2.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-scope2.py rename to tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-scope2.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-to-http-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-to-http-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-to-http-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-to-http-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-to-http-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-to-http-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-redirect-to-http-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/navigation-redirect-to-http-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-timing-worker-extended.js b/tests/wpt/tests/service-workers/service-worker/resources/navigation-timing-worker-extended.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-timing-worker-extended.js rename to tests/wpt/tests/service-workers/service-worker/resources/navigation-timing-worker-extended.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-timing-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/navigation-timing-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/navigation-timing-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/navigation-timing-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/nested-blob-url-worker-created-from-worker.html b/tests/wpt/tests/service-workers/service-worker/resources/nested-blob-url-worker-created-from-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/nested-blob-url-worker-created-from-worker.html rename to tests/wpt/tests/service-workers/service-worker/resources/nested-blob-url-worker-created-from-worker.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/nested-blob-url-workers.html b/tests/wpt/tests/service-workers/service-worker/resources/nested-blob-url-workers.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/nested-blob-url-workers.html rename to tests/wpt/tests/service-workers/service-worker/resources/nested-blob-url-workers.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/nested-iframe-parent.html b/tests/wpt/tests/service-workers/service-worker/resources/nested-iframe-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/nested-iframe-parent.html rename to tests/wpt/tests/service-workers/service-worker/resources/nested-iframe-parent.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/nested-parent.html b/tests/wpt/tests/service-workers/service-worker/resources/nested-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/nested-parent.html rename to tests/wpt/tests/service-workers/service-worker/resources/nested-parent.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/nested-worker-created-from-blob-url-worker.html b/tests/wpt/tests/service-workers/service-worker/resources/nested-worker-created-from-blob-url-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/nested-worker-created-from-blob-url-worker.html rename to tests/wpt/tests/service-workers/service-worker/resources/nested-worker-created-from-blob-url-worker.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/nested_load_worker.js b/tests/wpt/tests/service-workers/service-worker/resources/nested_load_worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/nested_load_worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/nested_load_worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/no-dynamic-import.js b/tests/wpt/tests/service-workers/service-worker/resources/no-dynamic-import.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/no-dynamic-import.js rename to tests/wpt/tests/service-workers/service-worker/resources/no-dynamic-import.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/notification_icon.py b/tests/wpt/tests/service-workers/service-worker/resources/notification_icon.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/notification_icon.py rename to tests/wpt/tests/service-workers/service-worker/resources/notification_icon.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/object-image-is-not-intercepted-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/object-image-is-not-intercepted-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/object-image-is-not-intercepted-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/object-image-is-not-intercepted-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/object-is-not-intercepted-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/object-is-not-intercepted-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/object-is-not-intercepted-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/object-is-not-intercepted-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/object-navigation-is-not-intercepted-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/object-navigation-is-not-intercepted-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/object-navigation-is-not-intercepted-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/object-navigation-is-not-intercepted-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/onactivate-throw-error-from-nested-event-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/onactivate-throw-error-from-nested-event-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/onactivate-throw-error-from-nested-event-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/onactivate-throw-error-from-nested-event-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/onactivate-throw-error-then-cancel-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/onactivate-throw-error-then-cancel-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/onactivate-throw-error-then-cancel-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/onactivate-throw-error-then-cancel-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/onactivate-throw-error-then-prevent-default-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/onactivate-throw-error-then-prevent-default-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/onactivate-throw-error-then-prevent-default-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/onactivate-throw-error-then-prevent-default-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/onactivate-throw-error-with-empty-onerror-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/onactivate-throw-error-with-empty-onerror-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/onactivate-throw-error-with-empty-onerror-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/onactivate-throw-error-with-empty-onerror-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/onactivate-throw-error-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/onactivate-throw-error-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/onactivate-throw-error-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/onactivate-throw-error-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/onactivate-waituntil-forever.js b/tests/wpt/tests/service-workers/service-worker/resources/onactivate-waituntil-forever.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/onactivate-waituntil-forever.js rename to tests/wpt/tests/service-workers/service-worker/resources/onactivate-waituntil-forever.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/onfetch-waituntil-forever.js b/tests/wpt/tests/service-workers/service-worker/resources/onfetch-waituntil-forever.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/onfetch-waituntil-forever.js rename to tests/wpt/tests/service-workers/service-worker/resources/onfetch-waituntil-forever.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/oninstall-throw-error-from-nested-event-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/oninstall-throw-error-from-nested-event-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/oninstall-throw-error-from-nested-event-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/oninstall-throw-error-from-nested-event-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/oninstall-throw-error-then-cancel-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/oninstall-throw-error-then-cancel-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/oninstall-throw-error-then-cancel-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/oninstall-throw-error-then-cancel-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/oninstall-throw-error-then-prevent-default-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/oninstall-throw-error-then-prevent-default-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/oninstall-throw-error-then-prevent-default-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/oninstall-throw-error-then-prevent-default-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/oninstall-throw-error-with-empty-onerror-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/oninstall-throw-error-with-empty-onerror-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/oninstall-throw-error-with-empty-onerror-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/oninstall-throw-error-with-empty-onerror-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/oninstall-throw-error-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/oninstall-throw-error-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/oninstall-throw-error-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/oninstall-throw-error-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/oninstall-waituntil-forever.js b/tests/wpt/tests/service-workers/service-worker/resources/oninstall-waituntil-forever.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/oninstall-waituntil-forever.js rename to tests/wpt/tests/service-workers/service-worker/resources/oninstall-waituntil-forever.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/oninstall-waituntil-throw-error-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/oninstall-waituntil-throw-error-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/oninstall-waituntil-throw-error-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/oninstall-waituntil-throw-error-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/onparse-infiniteloop-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/onparse-infiniteloop-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/onparse-infiniteloop-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/onparse-infiniteloop-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/opaque-response-being-preloaded-xhr.html b/tests/wpt/tests/service-workers/service-worker/resources/opaque-response-being-preloaded-xhr.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/opaque-response-being-preloaded-xhr.html rename to tests/wpt/tests/service-workers/service-worker/resources/opaque-response-being-preloaded-xhr.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/opaque-response-preloaded-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/opaque-response-preloaded-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/opaque-response-preloaded-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/opaque-response-preloaded-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/opaque-response-preloaded-xhr.html b/tests/wpt/tests/service-workers/service-worker/resources/opaque-response-preloaded-xhr.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/opaque-response-preloaded-xhr.html rename to tests/wpt/tests/service-workers/service-worker/resources/opaque-response-preloaded-xhr.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/opaque-script-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/opaque-script-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/opaque-script-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/opaque-script-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/opaque-script-large.js b/tests/wpt/tests/service-workers/service-worker/resources/opaque-script-large.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/opaque-script-large.js rename to tests/wpt/tests/service-workers/service-worker/resources/opaque-script-large.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/opaque-script-small.js b/tests/wpt/tests/service-workers/service-worker/resources/opaque-script-small.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/opaque-script-small.js rename to tests/wpt/tests/service-workers/service-worker/resources/opaque-script-small.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/opaque-script-sw.js b/tests/wpt/tests/service-workers/service-worker/resources/opaque-script-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/opaque-script-sw.js rename to tests/wpt/tests/service-workers/service-worker/resources/opaque-script-sw.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/other.html b/tests/wpt/tests/service-workers/service-worker/resources/other.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/other.html rename to tests/wpt/tests/service-workers/service-worker/resources/other.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/override_assert_object_equals.js b/tests/wpt/tests/service-workers/service-worker/resources/override_assert_object_equals.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/override_assert_object_equals.js rename to tests/wpt/tests/service-workers/service-worker/resources/override_assert_object_equals.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-cookies-3p-credentialless-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-credentialless-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-cookies-3p-credentialless-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-credentialless-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-cookies-3p-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-cookies-3p-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-cookies-3p-sw.js b/tests/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-cookies-3p-sw.js rename to tests/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-sw.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-cookies-3p-window.html b/tests/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-window.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-cookies-3p-window.html rename to tests/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-window.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-cookies-sw.js b/tests/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-cookies-sw.js rename to tests/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-sw.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-service-worker-iframe-claim.html b/tests/wpt/tests/service-workers/service-worker/resources/partitioned-service-worker-iframe-claim.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-service-worker-iframe-claim.html rename to tests/wpt/tests/service-workers/service-worker/resources/partitioned-service-worker-iframe-claim.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-service-worker-nested-iframe-child.html b/tests/wpt/tests/service-workers/service-worker/resources/partitioned-service-worker-nested-iframe-child.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-service-worker-nested-iframe-child.html rename to tests/wpt/tests/service-workers/service-worker/resources/partitioned-service-worker-nested-iframe-child.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-service-worker-nested-iframe-parent.html b/tests/wpt/tests/service-workers/service-worker/resources/partitioned-service-worker-nested-iframe-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-service-worker-nested-iframe-parent.html rename to tests/wpt/tests/service-workers/service-worker/resources/partitioned-service-worker-nested-iframe-parent.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-iframe-getRegistrations.html b/tests/wpt/tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-iframe-getRegistrations.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-iframe-getRegistrations.html rename to tests/wpt/tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-iframe-getRegistrations.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-iframe-matchAll.html b/tests/wpt/tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-iframe-matchAll.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-iframe-matchAll.html rename to tests/wpt/tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-iframe-matchAll.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-window.html b/tests/wpt/tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-window.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-window.html rename to tests/wpt/tests/service-workers/service-worker/resources/partitioned-service-worker-third-party-window.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-storage-sw.js b/tests/wpt/tests/service-workers/service-worker/resources/partitioned-storage-sw.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-storage-sw.js rename to tests/wpt/tests/service-workers/service-worker/resources/partitioned-storage-sw.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-utils.js b/tests/wpt/tests/service-workers/service-worker/resources/partitioned-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/partitioned-utils.js rename to tests/wpt/tests/service-workers/service-worker/resources/partitioned-utils.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/pass-through-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/pass-through-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/pass-through-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/pass-through-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/pass.txt b/tests/wpt/tests/service-workers/service-worker/resources/pass.txt similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/pass.txt rename to tests/wpt/tests/service-workers/service-worker/resources/pass.txt diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/performance-timeline-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/performance-timeline-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/performance-timeline-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/performance-timeline-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-blob-url.js b/tests/wpt/tests/service-workers/service-worker/resources/postmessage-blob-url.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-blob-url.js rename to tests/wpt/tests/service-workers/service-worker/resources/postmessage-blob-url.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-dictionary-transferables-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/postmessage-dictionary-transferables-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-dictionary-transferables-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/postmessage-dictionary-transferables-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-echo-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/postmessage-echo-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-echo-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/postmessage-echo-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-fetched-text.js b/tests/wpt/tests/service-workers/service-worker/resources/postmessage-fetched-text.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-fetched-text.js rename to tests/wpt/tests/service-workers/service-worker/resources/postmessage-fetched-text.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-msgport-to-client-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/postmessage-msgport-to-client-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-msgport-to-client-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/postmessage-msgport-to-client-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-on-load-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/postmessage-on-load-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-on-load-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/postmessage-on-load-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-to-client-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/postmessage-to-client-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-to-client-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/postmessage-to-client-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-transferables-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/postmessage-transferables-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-transferables-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/postmessage-transferables-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/postmessage-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/postmessage-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/postmessage-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/range-request-to-different-origins-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/range-request-to-different-origins-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/range-request-to-different-origins-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/range-request-to-different-origins-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/range-request-with-different-cors-modes-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/range-request-with-different-cors-modes-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/range-request-with-different-cors-modes-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/range-request-with-different-cors-modes-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/redirect-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/redirect-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/redirect-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/redirect-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/redirect.py b/tests/wpt/tests/service-workers/service-worker/resources/redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/redirect.py rename to tests/wpt/tests/service-workers/service-worker/resources/redirect.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/referer-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/referer-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/referer-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/referer-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/referrer-policy-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/referrer-policy-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/referrer-policy-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/referrer-policy-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/register-closed-window-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/register-closed-window-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/register-closed-window-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/register-closed-window-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/register-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/register-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/register-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/register-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/register-rewrite-worker.html b/tests/wpt/tests/service-workers/service-worker/resources/register-rewrite-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/register-rewrite-worker.html rename to tests/wpt/tests/service-workers/service-worker/resources/register-rewrite-worker.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/registration-tests-mime-types.js b/tests/wpt/tests/service-workers/service-worker/resources/registration-tests-mime-types.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/registration-tests-mime-types.js rename to tests/wpt/tests/service-workers/service-worker/resources/registration-tests-mime-types.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/registration-tests-scope.js b/tests/wpt/tests/service-workers/service-worker/resources/registration-tests-scope.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/registration-tests-scope.js rename to tests/wpt/tests/service-workers/service-worker/resources/registration-tests-scope.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/registration-tests-script-url.js b/tests/wpt/tests/service-workers/service-worker/resources/registration-tests-script-url.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/registration-tests-script-url.js rename to tests/wpt/tests/service-workers/service-worker/resources/registration-tests-script-url.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/registration-tests-script.js b/tests/wpt/tests/service-workers/service-worker/resources/registration-tests-script.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/registration-tests-script.js rename to tests/wpt/tests/service-workers/service-worker/resources/registration-tests-script.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/registration-tests-security-error.js b/tests/wpt/tests/service-workers/service-worker/resources/registration-tests-security-error.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/registration-tests-security-error.js rename to tests/wpt/tests/service-workers/service-worker/resources/registration-tests-security-error.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/registration-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/registration-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/registration-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/registration-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/reject-install-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/reject-install-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/reject-install-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/reject-install-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/reply-to-message.html b/tests/wpt/tests/service-workers/service-worker/resources/reply-to-message.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/reply-to-message.html rename to tests/wpt/tests/service-workers/service-worker/resources/reply-to-message.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/request-end-to-end-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/request-end-to-end-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/request-end-to-end-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/request-end-to-end-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/request-headers.py b/tests/wpt/tests/service-workers/service-worker/resources/request-headers.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/request-headers.py rename to tests/wpt/tests/service-workers/service-worker/resources/request-headers.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-iframe.sub.html b/tests/wpt/tests/service-workers/service-worker/resources/resource-timing-iframe.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-iframe.sub.html rename to tests/wpt/tests/service-workers/service-worker/resources/resource-timing-iframe.sub.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/resource-timing-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/resource-timing-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/respond-then-throw-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/respond-then-throw-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/respond-then-throw-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/respond-then-throw-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/respond-with-body-accessed-response-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/respond-with-body-accessed-response-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/respond-with-body-accessed-response-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/respond-with-body-accessed-response-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/respond-with-body-accessed-response-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/respond-with-body-accessed-response-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/respond-with-body-accessed-response-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/respond-with-body-accessed-response-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/respond-with-body-accessed-response.jsonp b/tests/wpt/tests/service-workers/service-worker/resources/respond-with-body-accessed-response.jsonp similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/respond-with-body-accessed-response.jsonp rename to tests/wpt/tests/service-workers/service-worker/resources/respond-with-body-accessed-response.jsonp diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/sample-worker-interceptor.js b/tests/wpt/tests/service-workers/service-worker/resources/sample-worker-interceptor.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/sample-worker-interceptor.js rename to tests/wpt/tests/service-workers/service-worker/resources/sample-worker-interceptor.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/sample.html b/tests/wpt/tests/service-workers/service-worker/resources/sample.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/sample.html rename to tests/wpt/tests/service-workers/service-worker/resources/sample.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/sample.js b/tests/wpt/tests/service-workers/service-worker/resources/sample.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/sample.js rename to tests/wpt/tests/service-workers/service-worker/resources/sample.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/sample.txt b/tests/wpt/tests/service-workers/service-worker/resources/sample.txt similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/sample.txt rename to tests/wpt/tests/service-workers/service-worker/resources/sample.txt diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/sandboxed-iframe-fetch-event-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/sandboxed-iframe-fetch-event-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/sandboxed-iframe-fetch-event-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/sandboxed-iframe-fetch-event-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/sandboxed-iframe-fetch-event-iframe.py b/tests/wpt/tests/service-workers/service-worker/resources/sandboxed-iframe-fetch-event-iframe.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/sandboxed-iframe-fetch-event-iframe.py rename to tests/wpt/tests/service-workers/service-worker/resources/sandboxed-iframe-fetch-event-iframe.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/sandboxed-iframe-fetch-event-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/sandboxed-iframe-fetch-event-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/sandboxed-iframe-fetch-event-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/sandboxed-iframe-fetch-event-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/sandboxed-iframe-navigator-serviceworker-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/sandboxed-iframe-navigator-serviceworker-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/sandboxed-iframe-navigator-serviceworker-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/sandboxed-iframe-navigator-serviceworker-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/scope1/module-worker-importing-redirect-to-scope2.js b/tests/wpt/tests/service-workers/service-worker/resources/scope1/module-worker-importing-redirect-to-scope2.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/scope1/module-worker-importing-redirect-to-scope2.js rename to tests/wpt/tests/service-workers/service-worker/resources/scope1/module-worker-importing-redirect-to-scope2.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/scope1/module-worker-importing-scope2.js b/tests/wpt/tests/service-workers/service-worker/resources/scope1/module-worker-importing-scope2.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/scope1/module-worker-importing-scope2.js rename to tests/wpt/tests/service-workers/service-worker/resources/scope1/module-worker-importing-scope2.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/scope1/redirect.py b/tests/wpt/tests/service-workers/service-worker/resources/scope1/redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/scope1/redirect.py rename to tests/wpt/tests/service-workers/service-worker/resources/scope1/redirect.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/scope2/import-scripts-echo.py b/tests/wpt/tests/service-workers/service-worker/resources/scope2/import-scripts-echo.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/scope2/import-scripts-echo.py rename to tests/wpt/tests/service-workers/service-worker/resources/scope2/import-scripts-echo.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/scope2/imported-module-script.js b/tests/wpt/tests/service-workers/service-worker/resources/scope2/imported-module-script.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/scope2/imported-module-script.js rename to tests/wpt/tests/service-workers/service-worker/resources/scope2/imported-module-script.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/scope2/simple.txt b/tests/wpt/tests/service-workers/service-worker/resources/scope2/simple.txt similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/scope2/simple.txt rename to tests/wpt/tests/service-workers/service-worker/resources/scope2/simple.txt diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/scope2/worker_interception_redirect_webworker.py b/tests/wpt/tests/service-workers/service-worker/resources/scope2/worker_interception_redirect_webworker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/scope2/worker_interception_redirect_webworker.py rename to tests/wpt/tests/service-workers/service-worker/resources/scope2/worker_interception_redirect_webworker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/secure-context-service-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/secure-context-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/secure-context-service-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/secure-context-service-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/secure-context/sender.html b/tests/wpt/tests/service-workers/service-worker/resources/secure-context/sender.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/secure-context/sender.html rename to tests/wpt/tests/service-workers/service-worker/resources/secure-context/sender.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/secure-context/window.html b/tests/wpt/tests/service-workers/service-worker/resources/secure-context/window.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/secure-context/window.html rename to tests/wpt/tests/service-workers/service-worker/resources/secure-context/window.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-csp-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/service-worker-csp-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-csp-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/service-worker-csp-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-header.py b/tests/wpt/tests/service-workers/service-worker/resources/service-worker-header.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-header.py rename to tests/wpt/tests/service-workers/service-worker/resources/service-worker-header.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-dynamic-import-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/service-worker-interception-dynamic-import-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-dynamic-import-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/service-worker-interception-dynamic-import-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-network-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/service-worker-interception-network-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-network-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/service-worker-interception-network-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-service-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/service-worker-interception-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-service-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/service-worker-interception-service-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-static-import-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/service-worker-interception-static-import-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/service-worker-interception-static-import-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/service-worker-interception-static-import-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/silence.oga b/tests/wpt/tests/service-workers/service-worker/resources/silence.oga similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/silence.oga rename to tests/wpt/tests/service-workers/service-worker/resources/silence.oga diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/simple-intercept-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/simple-intercept-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/simple-intercept-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/simple-intercept-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/simple-intercept-worker.js.headers b/tests/wpt/tests/service-workers/service-worker/resources/simple-intercept-worker.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/simple-intercept-worker.js.headers rename to tests/wpt/tests/service-workers/service-worker/resources/simple-intercept-worker.js.headers diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/simple.html b/tests/wpt/tests/service-workers/service-worker/resources/simple.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/simple.html rename to tests/wpt/tests/service-workers/service-worker/resources/simple.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/simple.txt b/tests/wpt/tests/service-workers/service-worker/resources/simple.txt similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/simple.txt rename to tests/wpt/tests/service-workers/service-worker/resources/simple.txt diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/skip-waiting-installed-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/skip-waiting-installed-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/skip-waiting-installed-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/skip-waiting-installed-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/skip-waiting-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/skip-waiting-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/skip-waiting-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/skip-waiting-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/square.png b/tests/wpt/tests/service-workers/service-worker/resources/square.png similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/square.png rename to tests/wpt/tests/service-workers/service-worker/resources/square.png diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/square.png.sub.headers b/tests/wpt/tests/service-workers/service-worker/resources/square.png.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/square.png.sub.headers rename to tests/wpt/tests/service-workers/service-worker/resources/square.png.sub.headers diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/stalling-service-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/stalling-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/stalling-service-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/stalling-service-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/subdir/blank.html b/tests/wpt/tests/service-workers/service-worker/resources/subdir/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/subdir/blank.html rename to tests/wpt/tests/service-workers/service-worker/resources/subdir/blank.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/subdir/import-scripts-echo.py b/tests/wpt/tests/service-workers/service-worker/resources/subdir/import-scripts-echo.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/subdir/import-scripts-echo.py rename to tests/wpt/tests/service-workers/service-worker/resources/subdir/import-scripts-echo.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/subdir/simple.txt b/tests/wpt/tests/service-workers/service-worker/resources/subdir/simple.txt similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/subdir/simple.txt rename to tests/wpt/tests/service-workers/service-worker/resources/subdir/simple.txt diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/subdir/worker_interception_redirect_webworker.py b/tests/wpt/tests/service-workers/service-worker/resources/subdir/worker_interception_redirect_webworker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/subdir/worker_interception_redirect_webworker.py rename to tests/wpt/tests/service-workers/service-worker/resources/subdir/worker_interception_redirect_webworker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/success.py b/tests/wpt/tests/service-workers/service-worker/resources/success.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/success.py rename to tests/wpt/tests/service-workers/service-worker/resources/success.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/svg-target-reftest-001-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/svg-target-reftest-001-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/svg-target-reftest-001-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/svg-target-reftest-001-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/svg-target-reftest-001.html b/tests/wpt/tests/service-workers/service-worker/resources/svg-target-reftest-001.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/svg-target-reftest-001.html rename to tests/wpt/tests/service-workers/service-worker/resources/svg-target-reftest-001.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/svg-target-reftest-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/svg-target-reftest-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/svg-target-reftest-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/svg-target-reftest-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js b/tests/wpt/tests/service-workers/service-worker/resources/test-helpers.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js rename to tests/wpt/tests/service-workers/service-worker/resources/test-helpers.sub.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-headers-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/test-request-headers-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-headers-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/test-request-headers-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-headers-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/test-request-headers-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-headers-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/test-request-headers-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-mode-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/test-request-mode-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-mode-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/test-request-mode-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-mode-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/test-request-mode-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-mode-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/test-request-mode-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/testharness-helpers.js b/tests/wpt/tests/service-workers/service-worker/resources/testharness-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/testharness-helpers.js rename to tests/wpt/tests/service-workers/service-worker/resources/testharness-helpers.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/trickle.py b/tests/wpt/tests/service-workers/service-worker/resources/trickle.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/trickle.py rename to tests/wpt/tests/service-workers/service-worker/resources/trickle.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/type-check-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/type-check-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/type-check-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/type-check-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/unregister-controller-page.html b/tests/wpt/tests/service-workers/service-worker/resources/unregister-controller-page.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/unregister-controller-page.html rename to tests/wpt/tests/service-workers/service-worker/resources/unregister-controller-page.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/unregister-immediately-helpers.js b/tests/wpt/tests/service-workers/service-worker/resources/unregister-immediately-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/unregister-immediately-helpers.js rename to tests/wpt/tests/service-workers/service-worker/resources/unregister-immediately-helpers.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/unregister-rewrite-worker.html b/tests/wpt/tests/service-workers/service-worker/resources/unregister-rewrite-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/unregister-rewrite-worker.html rename to tests/wpt/tests/service-workers/service-worker/resources/unregister-rewrite-worker.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-claim-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/update-claim-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-claim-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/update-claim-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-during-installation-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/update-during-installation-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-during-installation-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/update-during-installation-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-during-installation-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/update-during-installation-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-during-installation-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/update-during-installation-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-fetch-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/update-fetch-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-fetch-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/update-fetch-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-max-aged-worker-imported-script.py b/tests/wpt/tests/service-workers/service-worker/resources/update-max-aged-worker-imported-script.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-max-aged-worker-imported-script.py rename to tests/wpt/tests/service-workers/service-worker/resources/update-max-aged-worker-imported-script.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-max-aged-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/update-max-aged-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-max-aged-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/update-max-aged-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-missing-import-scripts-imported-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/update-missing-import-scripts-imported-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-missing-import-scripts-imported-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/update-missing-import-scripts-imported-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-missing-import-scripts-main-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/update-missing-import-scripts-main-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-missing-import-scripts-main-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/update-missing-import-scripts-main-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-nocookie-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/update-nocookie-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-nocookie-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/update-nocookie-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-recovery-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/update-recovery-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-recovery-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/update-recovery-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-registration-with-type.py b/tests/wpt/tests/service-workers/service-worker/resources/update-registration-with-type.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-registration-with-type.py rename to tests/wpt/tests/service-workers/service-worker/resources/update-registration-with-type.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-smaller-body-after-update-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/update-smaller-body-after-update-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-smaller-body-after-update-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/update-smaller-body-after-update-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-smaller-body-before-update-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/update-smaller-body-before-update-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-smaller-body-before-update-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/update-smaller-body-before-update-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-worker-from-file.py b/tests/wpt/tests/service-workers/service-worker/resources/update-worker-from-file.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-worker-from-file.py rename to tests/wpt/tests/service-workers/service-worker/resources/update-worker-from-file.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-worker.py b/tests/wpt/tests/service-workers/service-worker/resources/update-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update-worker.py rename to tests/wpt/tests/service-workers/service-worker/resources/update-worker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update/update-after-oneday.https.html b/tests/wpt/tests/service-workers/service-worker/resources/update/update-after-oneday.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update/update-after-oneday.https.html rename to tests/wpt/tests/service-workers/service-worker/resources/update/update-after-oneday.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/update_shell.py b/tests/wpt/tests/service-workers/service-worker/resources/update_shell.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/update_shell.py rename to tests/wpt/tests/service-workers/service-worker/resources/update_shell.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/vtt-frame.html b/tests/wpt/tests/service-workers/service-worker/resources/vtt-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/vtt-frame.html rename to tests/wpt/tests/service-workers/service-worker/resources/vtt-frame.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/wait-forever-in-install-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/wait-forever-in-install-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/wait-forever-in-install-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/wait-forever-in-install-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/websocket-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/websocket-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/websocket-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/websocket-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/websocket.js b/tests/wpt/tests/service-workers/service-worker/resources/websocket.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/websocket.js rename to tests/wpt/tests/service-workers/service-worker/resources/websocket.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/window-opener.html b/tests/wpt/tests/service-workers/service-worker/resources/window-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/window-opener.html rename to tests/wpt/tests/service-workers/service-worker/resources/window-opener.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/windowclient-navigate-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/windowclient-navigate-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/windowclient-navigate-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/windowclient-navigate-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-client-id-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/worker-client-id-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-client-id-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/worker-client-id-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-fetching-cross-origin.js b/tests/wpt/tests/service-workers/service-worker/resources/worker-fetching-cross-origin.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-fetching-cross-origin.js rename to tests/wpt/tests/service-workers/service-worker/resources/worker-fetching-cross-origin.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-interception-redirect-serviceworker.js b/tests/wpt/tests/service-workers/service-worker/resources/worker-interception-redirect-serviceworker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-interception-redirect-serviceworker.js rename to tests/wpt/tests/service-workers/service-worker/resources/worker-interception-redirect-serviceworker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-interception-redirect-webworker.js b/tests/wpt/tests/service-workers/service-worker/resources/worker-interception-redirect-webworker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-interception-redirect-webworker.js rename to tests/wpt/tests/service-workers/service-worker/resources/worker-interception-redirect-webworker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-load-interceptor.js b/tests/wpt/tests/service-workers/service-worker/resources/worker-load-interceptor.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-load-interceptor.js rename to tests/wpt/tests/service-workers/service-worker/resources/worker-load-interceptor.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-testharness.js b/tests/wpt/tests/service-workers/service-worker/resources/worker-testharness.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-testharness.js rename to tests/wpt/tests/service-workers/service-worker/resources/worker-testharness.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker_interception_redirect_webworker.py b/tests/wpt/tests/service-workers/service-worker/resources/worker_interception_redirect_webworker.py similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker_interception_redirect_webworker.py rename to tests/wpt/tests/service-workers/service-worker/resources/worker_interception_redirect_webworker.py diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/xhr-content-length-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/xhr-content-length-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/xhr-content-length-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/xhr-content-length-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/xhr-iframe.html b/tests/wpt/tests/service-workers/service-worker/resources/xhr-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/xhr-iframe.html rename to tests/wpt/tests/service-workers/service-worker/resources/xhr-iframe.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/xhr-response-url-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/xhr-response-url-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/xhr-response-url-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/xhr-response-url-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/xsl-base-url-iframe.xml b/tests/wpt/tests/service-workers/service-worker/resources/xsl-base-url-iframe.xml similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/xsl-base-url-iframe.xml rename to tests/wpt/tests/service-workers/service-worker/resources/xsl-base-url-iframe.xml diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/xsl-base-url-worker.js b/tests/wpt/tests/service-workers/service-worker/resources/xsl-base-url-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/xsl-base-url-worker.js rename to tests/wpt/tests/service-workers/service-worker/resources/xsl-base-url-worker.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/xslt-pass.xsl b/tests/wpt/tests/service-workers/service-worker/resources/xslt-pass.xsl similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/xslt-pass.xsl rename to tests/wpt/tests/service-workers/service-worker/resources/xslt-pass.xsl diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/respond-with-body-accessed-response.https.html b/tests/wpt/tests/service-workers/service-worker/respond-with-body-accessed-response.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/respond-with-body-accessed-response.https.html rename to tests/wpt/tests/service-workers/service-worker/respond-with-body-accessed-response.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/same-site-cookies.https.html b/tests/wpt/tests/service-workers/service-worker/same-site-cookies.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/same-site-cookies.https.html rename to tests/wpt/tests/service-workers/service-worker/same-site-cookies.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/sandboxed-iframe-fetch-event.https.html b/tests/wpt/tests/service-workers/service-worker/sandboxed-iframe-fetch-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/sandboxed-iframe-fetch-event.https.html rename to tests/wpt/tests/service-workers/service-worker/sandboxed-iframe-fetch-event.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/sandboxed-iframe-navigator-serviceworker.https.html b/tests/wpt/tests/service-workers/service-worker/sandboxed-iframe-navigator-serviceworker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/sandboxed-iframe-navigator-serviceworker.https.html rename to tests/wpt/tests/service-workers/service-worker/sandboxed-iframe-navigator-serviceworker.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/secure-context.https.html b/tests/wpt/tests/service-workers/service-worker/secure-context.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/secure-context.https.html rename to tests/wpt/tests/service-workers/service-worker/secure-context.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/service-worker-csp-connect.https.html b/tests/wpt/tests/service-workers/service-worker/service-worker-csp-connect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/service-worker-csp-connect.https.html rename to tests/wpt/tests/service-workers/service-worker/service-worker-csp-connect.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/service-worker-csp-default.https.html b/tests/wpt/tests/service-workers/service-worker/service-worker-csp-default.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/service-worker-csp-default.https.html rename to tests/wpt/tests/service-workers/service-worker/service-worker-csp-default.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/service-worker-csp-script.https.html b/tests/wpt/tests/service-workers/service-worker/service-worker-csp-script.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/service-worker-csp-script.https.html rename to tests/wpt/tests/service-workers/service-worker/service-worker-csp-script.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/service-worker-header.https.html b/tests/wpt/tests/service-workers/service-worker/service-worker-header.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/service-worker-header.https.html rename to tests/wpt/tests/service-workers/service-worker/service-worker-header.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/serviceworker-message-event-historical.https.html b/tests/wpt/tests/service-workers/service-worker/serviceworker-message-event-historical.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/serviceworker-message-event-historical.https.html rename to tests/wpt/tests/service-workers/service-worker/serviceworker-message-event-historical.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/serviceworkerobject-scripturl.https.html b/tests/wpt/tests/service-workers/service-worker/serviceworkerobject-scripturl.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/serviceworkerobject-scripturl.https.html rename to tests/wpt/tests/service-workers/service-worker/serviceworkerobject-scripturl.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/skip-waiting-installed.https.html b/tests/wpt/tests/service-workers/service-worker/skip-waiting-installed.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/skip-waiting-installed.https.html rename to tests/wpt/tests/service-workers/service-worker/skip-waiting-installed.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/skip-waiting-using-registration.https.html b/tests/wpt/tests/service-workers/service-worker/skip-waiting-using-registration.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/skip-waiting-using-registration.https.html rename to tests/wpt/tests/service-workers/service-worker/skip-waiting-using-registration.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/skip-waiting-without-client.https.html b/tests/wpt/tests/service-workers/service-worker/skip-waiting-without-client.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/skip-waiting-without-client.https.html rename to tests/wpt/tests/service-workers/service-worker/skip-waiting-without-client.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/skip-waiting-without-using-registration.https.html b/tests/wpt/tests/service-workers/service-worker/skip-waiting-without-using-registration.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/skip-waiting-without-using-registration.https.html rename to tests/wpt/tests/service-workers/service-worker/skip-waiting-without-using-registration.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/skip-waiting.https.html b/tests/wpt/tests/service-workers/service-worker/skip-waiting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/skip-waiting.https.html rename to tests/wpt/tests/service-workers/service-worker/skip-waiting.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/state.https.html b/tests/wpt/tests/service-workers/service-worker/state.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/state.https.html rename to tests/wpt/tests/service-workers/service-worker/state.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/svg-target-reftest.https.html b/tests/wpt/tests/service-workers/service-worker/svg-target-reftest.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/svg-target-reftest.https.html rename to tests/wpt/tests/service-workers/service-worker/svg-target-reftest.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/synced-state.https.html b/tests/wpt/tests/service-workers/service-worker/synced-state.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/synced-state.https.html rename to tests/wpt/tests/service-workers/service-worker/synced-state.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/uncontrolled-page.https.html b/tests/wpt/tests/service-workers/service-worker/uncontrolled-page.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/uncontrolled-page.https.html rename to tests/wpt/tests/service-workers/service-worker/uncontrolled-page.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/unregister-controller.https.html b/tests/wpt/tests/service-workers/service-worker/unregister-controller.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/unregister-controller.https.html rename to tests/wpt/tests/service-workers/service-worker/unregister-controller.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/unregister-immediately-before-installed.https.html b/tests/wpt/tests/service-workers/service-worker/unregister-immediately-before-installed.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/unregister-immediately-before-installed.https.html rename to tests/wpt/tests/service-workers/service-worker/unregister-immediately-before-installed.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/unregister-immediately-during-extendable-events.https.html b/tests/wpt/tests/service-workers/service-worker/unregister-immediately-during-extendable-events.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/unregister-immediately-during-extendable-events.https.html rename to tests/wpt/tests/service-workers/service-worker/unregister-immediately-during-extendable-events.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/unregister-immediately.https.html b/tests/wpt/tests/service-workers/service-worker/unregister-immediately.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/unregister-immediately.https.html rename to tests/wpt/tests/service-workers/service-worker/unregister-immediately.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/unregister-then-register-new-script.https.html b/tests/wpt/tests/service-workers/service-worker/unregister-then-register-new-script.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/unregister-then-register-new-script.https.html rename to tests/wpt/tests/service-workers/service-worker/unregister-then-register-new-script.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/unregister-then-register.https.html b/tests/wpt/tests/service-workers/service-worker/unregister-then-register.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/unregister-then-register.https.html rename to tests/wpt/tests/service-workers/service-worker/unregister-then-register.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/unregister.https.html b/tests/wpt/tests/service-workers/service-worker/unregister.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/unregister.https.html rename to tests/wpt/tests/service-workers/service-worker/unregister.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-after-navigation-fetch-event.https.html b/tests/wpt/tests/service-workers/service-worker/update-after-navigation-fetch-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update-after-navigation-fetch-event.https.html rename to tests/wpt/tests/service-workers/service-worker/update-after-navigation-fetch-event.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-after-navigation-redirect.https.html b/tests/wpt/tests/service-workers/service-worker/update-after-navigation-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update-after-navigation-redirect.https.html rename to tests/wpt/tests/service-workers/service-worker/update-after-navigation-redirect.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-after-oneday.https.html b/tests/wpt/tests/service-workers/service-worker/update-after-oneday.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update-after-oneday.https.html rename to tests/wpt/tests/service-workers/service-worker/update-after-oneday.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-bytecheck-cors-import.https.html b/tests/wpt/tests/service-workers/service-worker/update-bytecheck-cors-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update-bytecheck-cors-import.https.html rename to tests/wpt/tests/service-workers/service-worker/update-bytecheck-cors-import.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-bytecheck.https.html b/tests/wpt/tests/service-workers/service-worker/update-bytecheck.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update-bytecheck.https.html rename to tests/wpt/tests/service-workers/service-worker/update-bytecheck.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-import-scripts.https.html b/tests/wpt/tests/service-workers/service-worker/update-import-scripts.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update-import-scripts.https.html rename to tests/wpt/tests/service-workers/service-worker/update-import-scripts.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-missing-import-scripts.https.html b/tests/wpt/tests/service-workers/service-worker/update-missing-import-scripts.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update-missing-import-scripts.https.html rename to tests/wpt/tests/service-workers/service-worker/update-missing-import-scripts.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-module-request-mode.https.html b/tests/wpt/tests/service-workers/service-worker/update-module-request-mode.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update-module-request-mode.https.html rename to tests/wpt/tests/service-workers/service-worker/update-module-request-mode.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-no-cache-request-headers.https.html b/tests/wpt/tests/service-workers/service-worker/update-no-cache-request-headers.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update-no-cache-request-headers.https.html rename to tests/wpt/tests/service-workers/service-worker/update-no-cache-request-headers.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-not-allowed.https.html b/tests/wpt/tests/service-workers/service-worker/update-not-allowed.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update-not-allowed.https.html rename to tests/wpt/tests/service-workers/service-worker/update-not-allowed.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-on-navigation.https.html b/tests/wpt/tests/service-workers/service-worker/update-on-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update-on-navigation.https.html rename to tests/wpt/tests/service-workers/service-worker/update-on-navigation.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-recovery.https.html b/tests/wpt/tests/service-workers/service-worker/update-recovery.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update-recovery.https.html rename to tests/wpt/tests/service-workers/service-worker/update-recovery.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-registration-with-type.https.html b/tests/wpt/tests/service-workers/service-worker/update-registration-with-type.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update-registration-with-type.https.html rename to tests/wpt/tests/service-workers/service-worker/update-registration-with-type.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-result.https.html b/tests/wpt/tests/service-workers/service-worker/update-result.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update-result.https.html rename to tests/wpt/tests/service-workers/service-worker/update-result.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update.https.html b/tests/wpt/tests/service-workers/service-worker/update.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/update.https.html rename to tests/wpt/tests/service-workers/service-worker/update.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/waiting.https.html b/tests/wpt/tests/service-workers/service-worker/waiting.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/waiting.https.html rename to tests/wpt/tests/service-workers/service-worker/waiting.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/websocket-in-service-worker.https.html b/tests/wpt/tests/service-workers/service-worker/websocket-in-service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/websocket-in-service-worker.https.html rename to tests/wpt/tests/service-workers/service-worker/websocket-in-service-worker.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/websocket.https.html b/tests/wpt/tests/service-workers/service-worker/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/websocket.https.html rename to tests/wpt/tests/service-workers/service-worker/websocket.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/webvtt-cross-origin.https.html b/tests/wpt/tests/service-workers/service-worker/webvtt-cross-origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/webvtt-cross-origin.https.html rename to tests/wpt/tests/service-workers/service-worker/webvtt-cross-origin.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/windowclient-navigate.https.html b/tests/wpt/tests/service-workers/service-worker/windowclient-navigate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/windowclient-navigate.https.html rename to tests/wpt/tests/service-workers/service-worker/windowclient-navigate.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/worker-client-id.https.html b/tests/wpt/tests/service-workers/service-worker/worker-client-id.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/worker-client-id.https.html rename to tests/wpt/tests/service-workers/service-worker/worker-client-id.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/worker-in-sandboxed-iframe-by-csp-fetch-event.https.html b/tests/wpt/tests/service-workers/service-worker/worker-in-sandboxed-iframe-by-csp-fetch-event.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/worker-in-sandboxed-iframe-by-csp-fetch-event.https.html rename to tests/wpt/tests/service-workers/service-worker/worker-in-sandboxed-iframe-by-csp-fetch-event.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/worker-interception-redirect.https.html b/tests/wpt/tests/service-workers/service-worker/worker-interception-redirect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/worker-interception-redirect.https.html rename to tests/wpt/tests/service-workers/service-worker/worker-interception-redirect.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/worker-interception.https.html b/tests/wpt/tests/service-workers/service-worker/worker-interception.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/worker-interception.https.html rename to tests/wpt/tests/service-workers/service-worker/worker-interception.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/xhr-content-length.https.window.js b/tests/wpt/tests/service-workers/service-worker/xhr-content-length.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/xhr-content-length.https.window.js rename to tests/wpt/tests/service-workers/service-worker/xhr-content-length.https.window.js diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/xhr-response-url.https.html b/tests/wpt/tests/service-workers/service-worker/xhr-response-url.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/xhr-response-url.https.html rename to tests/wpt/tests/service-workers/service-worker/xhr-response-url.https.html diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/xsl-base-url.https.html b/tests/wpt/tests/service-workers/service-worker/xsl-base-url.https.html similarity index 100% rename from tests/wpt/web-platform-tests/service-workers/service-worker/xsl-base-url.https.html rename to tests/wpt/tests/service-workers/service-worker/xsl-base-url.https.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/Document-prototype-adoptNode.html b/tests/wpt/tests/shadow-dom/Document-prototype-adoptNode.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/Document-prototype-adoptNode.html rename to tests/wpt/tests/shadow-dom/Document-prototype-adoptNode.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/Document-prototype-currentScript.html b/tests/wpt/tests/shadow-dom/Document-prototype-currentScript.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/Document-prototype-currentScript.html rename to tests/wpt/tests/shadow-dom/Document-prototype-currentScript.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/Document-prototype-importNode.html b/tests/wpt/tests/shadow-dom/Document-prototype-importNode.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/Document-prototype-importNode.html rename to tests/wpt/tests/shadow-dom/Document-prototype-importNode.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html b/tests/wpt/tests/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html rename to tests/wpt/tests/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/Element-interface-attachShadow-custom-element.html b/tests/wpt/tests/shadow-dom/Element-interface-attachShadow-custom-element.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/Element-interface-attachShadow-custom-element.html rename to tests/wpt/tests/shadow-dom/Element-interface-attachShadow-custom-element.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/Element-interface-attachShadow.html b/tests/wpt/tests/shadow-dom/Element-interface-attachShadow.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/Element-interface-attachShadow.html rename to tests/wpt/tests/shadow-dom/Element-interface-attachShadow.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/Element-interface-shadowRoot-attribute.html b/tests/wpt/tests/shadow-dom/Element-interface-shadowRoot-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/Element-interface-shadowRoot-attribute.html rename to tests/wpt/tests/shadow-dom/Element-interface-shadowRoot-attribute.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/Extensions-to-Event-Interface.html b/tests/wpt/tests/shadow-dom/Extensions-to-Event-Interface.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/Extensions-to-Event-Interface.html rename to tests/wpt/tests/shadow-dom/Extensions-to-Event-Interface.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/HTMLSlotElement-interface.html b/tests/wpt/tests/shadow-dom/HTMLSlotElement-interface.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/HTMLSlotElement-interface.html rename to tests/wpt/tests/shadow-dom/HTMLSlotElement-interface.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/META.yml b/tests/wpt/tests/shadow-dom/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/META.yml rename to tests/wpt/tests/shadow-dom/META.yml diff --git a/tests/wpt/web-platform-tests/shadow-dom/MouseEvent-prototype-offsetX-offsetY.html b/tests/wpt/tests/shadow-dom/MouseEvent-prototype-offsetX-offsetY.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/MouseEvent-prototype-offsetX-offsetY.html rename to tests/wpt/tests/shadow-dom/MouseEvent-prototype-offsetX-offsetY.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/Node-prototype-cloneNode.html b/tests/wpt/tests/shadow-dom/Node-prototype-cloneNode.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/Node-prototype-cloneNode.html rename to tests/wpt/tests/shadow-dom/Node-prototype-cloneNode.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/Range-prototype-insertNode.html b/tests/wpt/tests/shadow-dom/Range-prototype-insertNode.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/Range-prototype-insertNode.html rename to tests/wpt/tests/shadow-dom/Range-prototype-insertNode.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/ShadowRoot-interface.html b/tests/wpt/tests/shadow-dom/ShadowRoot-interface.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/ShadowRoot-interface.html rename to tests/wpt/tests/shadow-dom/ShadowRoot-interface.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/Slottable-mixin.html b/tests/wpt/tests/shadow-dom/Slottable-mixin.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/Slottable-mixin.html rename to tests/wpt/tests/shadow-dom/Slottable-mixin.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/accesskey.tentative.html b/tests/wpt/tests/shadow-dom/accesskey.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/accesskey.tentative.html rename to tests/wpt/tests/shadow-dom/accesskey.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/capturing-and-bubbling-event-listeners-across-shadow-trees.html b/tests/wpt/tests/shadow-dom/capturing-and-bubbling-event-listeners-across-shadow-trees.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/capturing-and-bubbling-event-listeners-across-shadow-trees.html rename to tests/wpt/tests/shadow-dom/capturing-and-bubbling-event-listeners-across-shadow-trees.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/crashtests/move-to-new-tree-1343016.html b/tests/wpt/tests/shadow-dom/crashtests/move-to-new-tree-1343016.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/crashtests/move-to-new-tree-1343016.html rename to tests/wpt/tests/shadow-dom/crashtests/move-to-new-tree-1343016.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-after-attachshadow.tentative.html b/tests/wpt/tests/shadow-dom/declarative/declarative-after-attachshadow.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-after-attachshadow.tentative.html rename to tests/wpt/tests/shadow-dom/declarative/declarative-after-attachshadow.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-parser-interaction.tentative.html b/tests/wpt/tests/shadow-dom/declarative/declarative-parser-interaction.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-parser-interaction.tentative.html rename to tests/wpt/tests/shadow-dom/declarative/declarative-parser-interaction.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html b/tests/wpt/tests/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html rename to tests/wpt/tests/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html b/tests/wpt/tests/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html rename to tests/wpt/tests/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html b/tests/wpt/tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html rename to tests/wpt/tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-with-disabled-shadow.tentative.html b/tests/wpt/tests/shadow-dom/declarative/declarative-with-disabled-shadow.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-with-disabled-shadow.tentative.html rename to tests/wpt/tests/shadow-dom/declarative/declarative-with-disabled-shadow.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/getinnerhtml.tentative.html b/tests/wpt/tests/shadow-dom/declarative/getinnerhtml.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/declarative/getinnerhtml.tentative.html rename to tests/wpt/tests/shadow-dom/declarative/getinnerhtml.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/innerhtml-before-closing-tag.tentative.html b/tests/wpt/tests/shadow-dom/declarative/innerhtml-before-closing-tag.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/declarative/innerhtml-before-closing-tag.tentative.html rename to tests/wpt/tests/shadow-dom/declarative/innerhtml-before-closing-tag.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/innerhtml-on-ordinary-template.tentative.html b/tests/wpt/tests/shadow-dom/declarative/innerhtml-on-ordinary-template.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/declarative/innerhtml-on-ordinary-template.tentative.html rename to tests/wpt/tests/shadow-dom/declarative/innerhtml-on-ordinary-template.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/move-template-before-closing-tag.tentative.html b/tests/wpt/tests/shadow-dom/declarative/move-template-before-closing-tag.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/declarative/move-template-before-closing-tag.tentative.html rename to tests/wpt/tests/shadow-dom/declarative/move-template-before-closing-tag.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/script-access.tentative.html b/tests/wpt/tests/shadow-dom/declarative/script-access.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/declarative/script-access.tentative.html rename to tests/wpt/tests/shadow-dom/declarative/script-access.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/support/declarative-child-frame.html b/tests/wpt/tests/shadow-dom/declarative/support/declarative-child-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/declarative/support/declarative-child-frame.html rename to tests/wpt/tests/shadow-dom/declarative/support/declarative-child-frame.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/support/helpers.js b/tests/wpt/tests/shadow-dom/declarative/support/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/declarative/support/helpers.js rename to tests/wpt/tests/shadow-dom/declarative/support/helpers.js diff --git a/tests/wpt/web-platform-tests/shadow-dom/directionality-001-ref.html b/tests/wpt/tests/shadow-dom/directionality-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/directionality-001-ref.html rename to tests/wpt/tests/shadow-dom/directionality-001-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/directionality-001.tentative.html b/tests/wpt/tests/shadow-dom/directionality-001.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/directionality-001.tentative.html rename to tests/wpt/tests/shadow-dom/directionality-001.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/directionality-002-ref.html b/tests/wpt/tests/shadow-dom/directionality-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/directionality-002-ref.html rename to tests/wpt/tests/shadow-dom/directionality-002-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/directionality-002.tentative.html b/tests/wpt/tests/shadow-dom/directionality-002.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/directionality-002.tentative.html rename to tests/wpt/tests/shadow-dom/directionality-002.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/event-composed-path-after-dom-mutation.html b/tests/wpt/tests/shadow-dom/event-composed-path-after-dom-mutation.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/event-composed-path-after-dom-mutation.html rename to tests/wpt/tests/shadow-dom/event-composed-path-after-dom-mutation.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/event-composed-path-with-related-target.html b/tests/wpt/tests/shadow-dom/event-composed-path-with-related-target.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/event-composed-path-with-related-target.html rename to tests/wpt/tests/shadow-dom/event-composed-path-with-related-target.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/event-composed-path.html b/tests/wpt/tests/shadow-dom/event-composed-path.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/event-composed-path.html rename to tests/wpt/tests/shadow-dom/event-composed-path.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/event-composed.html b/tests/wpt/tests/shadow-dom/event-composed.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/event-composed.html rename to tests/wpt/tests/shadow-dom/event-composed.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/event-dispatch-order.tentative.html b/tests/wpt/tests/shadow-dom/event-dispatch-order.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/event-dispatch-order.tentative.html rename to tests/wpt/tests/shadow-dom/event-dispatch-order.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/event-inside-shadow-tree.html b/tests/wpt/tests/shadow-dom/event-inside-shadow-tree.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/event-inside-shadow-tree.html rename to tests/wpt/tests/shadow-dom/event-inside-shadow-tree.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/event-inside-slotted-node.html b/tests/wpt/tests/shadow-dom/event-inside-slotted-node.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/event-inside-slotted-node.html rename to tests/wpt/tests/shadow-dom/event-inside-slotted-node.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/event-on-pseudo-element-crash.html b/tests/wpt/tests/shadow-dom/event-on-pseudo-element-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/event-on-pseudo-element-crash.html rename to tests/wpt/tests/shadow-dom/event-on-pseudo-element-crash.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/event-post-dispatch.html b/tests/wpt/tests/shadow-dom/event-post-dispatch.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/event-post-dispatch.html rename to tests/wpt/tests/shadow-dom/event-post-dispatch.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/event-with-related-target.html b/tests/wpt/tests/shadow-dom/event-with-related-target.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/event-with-related-target.html rename to tests/wpt/tests/shadow-dom/event-with-related-target.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/delegatesFocus-highlight-sibling.html b/tests/wpt/tests/shadow-dom/focus-navigation/delegatesFocus-highlight-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/delegatesFocus-highlight-sibling.html rename to tests/wpt/tests/shadow-dom/focus-navigation/delegatesFocus-highlight-sibling.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback-default-tabindex.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback-default-tabindex.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback-default-tabindex.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback-default-tabindex.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-2levels.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-2levels.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-2levels.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-2levels.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-delegatesFocus.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-delegatesFocus.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-delegatesFocus.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-delegatesFocus.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-fallback.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-fallback.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-fallback.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-nested.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-nested.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-fallback.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-fallback.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-fallback.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-slot.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-slot.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-slot.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-slot.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-with-tabindex.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-with-tabindex.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slot-with-tabindex.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-with-tabindex.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slots-in-slot.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slots-in-slot.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slots-in-slot.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slots-in-slot.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slots.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slots.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-slots.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slots.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-web-component-radio.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-web-component-radio.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-web-component-radio.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-web-component-radio.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-with-delegatesFocus.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-with-delegatesFocus.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation-with-delegatesFocus.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-with-delegatesFocus.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-navigation.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-nested-slots.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-nested-slots.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-nested-slots.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-nested-slots.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-reverse-unassignable-slot.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-reverse-unassignable-slot.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-reverse-unassignable-slot.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-reverse-unassignable-slot.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-reverse-unassigned-slot.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-reverse-unassigned-slot.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-reverse-unassigned-slot.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-reverse-unassigned-slot.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-unassignable-slot.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-unassignable-slot.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-unassignable-slot.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-unassignable-slot.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-with-negative-index.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-with-negative-index.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/focus-with-negative-index.html rename to tests/wpt/tests/shadow-dom/focus-navigation/focus-with-negative-index.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/resources/focus-utils.js b/tests/wpt/tests/shadow-dom/focus-navigation/resources/focus-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/resources/focus-utils.js rename to tests/wpt/tests/shadow-dom/focus-navigation/resources/focus-utils.js diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-navigation/resources/shadow-dom.js b/tests/wpt/tests/shadow-dom/focus-navigation/resources/shadow-dom.js similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-navigation/resources/shadow-dom.js rename to tests/wpt/tests/shadow-dom/focus-navigation/resources/shadow-dom.js diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-within-shadow.html b/tests/wpt/tests/shadow-dom/focus-within-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus-within-shadow.html rename to tests/wpt/tests/shadow-dom/focus-within-shadow.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/DocumentOrShadowRoot-activeElement.html b/tests/wpt/tests/shadow-dom/focus/DocumentOrShadowRoot-activeElement.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/DocumentOrShadowRoot-activeElement.html rename to tests/wpt/tests/shadow-dom/focus/DocumentOrShadowRoot-activeElement.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/ShadowRoot-delegatesFocus.html b/tests/wpt/tests/shadow-dom/focus/ShadowRoot-delegatesFocus.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/ShadowRoot-delegatesFocus.html rename to tests/wpt/tests/shadow-dom/focus/ShadowRoot-delegatesFocus.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/blur-on-shadow-host-delegatesFocus.html b/tests/wpt/tests/shadow-dom/focus/blur-on-shadow-host-delegatesFocus.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/blur-on-shadow-host-delegatesFocus.html rename to tests/wpt/tests/shadow-dom/focus/blur-on-shadow-host-delegatesFocus.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/click-focus-delegatesFocus-click.html b/tests/wpt/tests/shadow-dom/focus/click-focus-delegatesFocus-click.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/click-focus-delegatesFocus-click.html rename to tests/wpt/tests/shadow-dom/focus/click-focus-delegatesFocus-click.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/click-focus-delegatesFocus-tabindex-varies.html b/tests/wpt/tests/shadow-dom/focus/click-focus-delegatesFocus-tabindex-varies.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/click-focus-delegatesFocus-tabindex-varies.html rename to tests/wpt/tests/shadow-dom/focus/click-focus-delegatesFocus-tabindex-varies.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/click-focus-delegatesFocus-tabindex-zero.html b/tests/wpt/tests/shadow-dom/focus/click-focus-delegatesFocus-tabindex-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/click-focus-delegatesFocus-tabindex-zero.html rename to tests/wpt/tests/shadow-dom/focus/click-focus-delegatesFocus-tabindex-zero.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/delegatesFocus-tabindex-change.html b/tests/wpt/tests/shadow-dom/focus/delegatesFocus-tabindex-change.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/delegatesFocus-tabindex-change.html rename to tests/wpt/tests/shadow-dom/focus/delegatesFocus-tabindex-change.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-autofocus.html b/tests/wpt/tests/shadow-dom/focus/focus-autofocus.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-autofocus.html rename to tests/wpt/tests/shadow-dom/focus/focus-autofocus.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-click-on-shadow-host.html b/tests/wpt/tests/shadow-dom/focus/focus-click-on-shadow-host.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-click-on-shadow-host.html rename to tests/wpt/tests/shadow-dom/focus/focus-click-on-shadow-host.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-method-delegatesFocus-nested-browsing-context.html b/tests/wpt/tests/shadow-dom/focus/focus-method-delegatesFocus-nested-browsing-context.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-method-delegatesFocus-nested-browsing-context.html rename to tests/wpt/tests/shadow-dom/focus/focus-method-delegatesFocus-nested-browsing-context.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-method-delegatesFocus.html b/tests/wpt/tests/shadow-dom/focus/focus-method-delegatesFocus.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-method-delegatesFocus.html rename to tests/wpt/tests/shadow-dom/focus/focus-method-delegatesFocus.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-method-with-delegatesFocus.html b/tests/wpt/tests/shadow-dom/focus/focus-method-with-delegatesFocus.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-method-with-delegatesFocus.html rename to tests/wpt/tests/shadow-dom/focus/focus-method-with-delegatesFocus.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-matches-on-shadow-host.html b/tests/wpt/tests/shadow-dom/focus/focus-pseudo-matches-on-shadow-host.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-matches-on-shadow-host.html rename to tests/wpt/tests/shadow-dom/focus/focus-pseudo-matches-on-shadow-host.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-1.html b/tests/wpt/tests/shadow-dom/focus/focus-pseudo-on-shadow-host-1.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-1.html rename to tests/wpt/tests/shadow-dom/focus/focus-pseudo-on-shadow-host-1.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-2.html b/tests/wpt/tests/shadow-dom/focus/focus-pseudo-on-shadow-host-2.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-2.html rename to tests/wpt/tests/shadow-dom/focus/focus-pseudo-on-shadow-host-2.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-3.html b/tests/wpt/tests/shadow-dom/focus/focus-pseudo-on-shadow-host-3.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-pseudo-on-shadow-host-3.html rename to tests/wpt/tests/shadow-dom/focus/focus-pseudo-on-shadow-host-3.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-selector-delegatesFocus.html b/tests/wpt/tests/shadow-dom/focus/focus-selector-delegatesFocus.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-selector-delegatesFocus.html rename to tests/wpt/tests/shadow-dom/focus/focus-selector-delegatesFocus.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-shadowhost-display-none.html b/tests/wpt/tests/shadow-dom/focus/focus-shadowhost-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-shadowhost-display-none.html rename to tests/wpt/tests/shadow-dom/focus/focus-shadowhost-display-none.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tab-on-shadow-host.html b/tests/wpt/tests/shadow-dom/focus/focus-tab-on-shadow-host.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tab-on-shadow-host.html rename to tests/wpt/tests/shadow-dom/focus/focus-tab-on-shadow-host.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-negative-delegatesFocus.html b/tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-negative-delegatesFocus.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-negative-delegatesFocus.html rename to tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-negative-delegatesFocus.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-negative.html b/tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-negative.html rename to tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-negative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-slot-one.html b/tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-slot-one.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-slot-one.html rename to tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-slot-one.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-delegatesFocus.html b/tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-delegatesFocus.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-delegatesFocus.html rename to tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-delegatesFocus.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-tabindex-2.html b/tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-tabindex-2.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-tabindex-2.html rename to tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-tabindex-2.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-tabindex-3.html b/tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-tabindex-3.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-tabindex-3.html rename to tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-tabindex-3.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-tabindex.html b/tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-tabindex.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-tabindex.html rename to tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-varying-tabindex.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-delegatesFocus.html b/tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-delegatesFocus.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-delegatesFocus.html rename to tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-delegatesFocus.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-negative.html b/tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-negative.html rename to tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-negative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-not-set-scrollable.html b/tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-not-set-scrollable.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-not-set-scrollable.html rename to tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-not-set-scrollable.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-not-set.html b/tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-not-set.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-not-set.html rename to tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-not-set.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-one.html b/tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-one.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-one.html rename to tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-one.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-scrollable.html b/tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-scrollable.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-scrollable.html rename to tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-zero-host-scrollable.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-zero.html b/tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/focus-tabindex-order-shadow-zero.html rename to tests/wpt/tests/shadow-dom/focus/focus-tabindex-order-shadow-zero.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/resources/shadow-utils.js b/tests/wpt/tests/shadow-dom/focus/resources/shadow-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/focus/resources/shadow-utils.js rename to tests/wpt/tests/shadow-dom/focus/resources/shadow-utils.js diff --git a/tests/wpt/web-platform-tests/shadow-dom/form-control-form-attribute.html b/tests/wpt/tests/shadow-dom/form-control-form-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/form-control-form-attribute.html rename to tests/wpt/tests/shadow-dom/form-control-form-attribute.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/getElementById-dynamic-001.html b/tests/wpt/tests/shadow-dom/getElementById-dynamic-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/getElementById-dynamic-001.html rename to tests/wpt/tests/shadow-dom/getElementById-dynamic-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/historical.html b/tests/wpt/tests/shadow-dom/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/historical.html rename to tests/wpt/tests/shadow-dom/historical.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/imperative-slot-api-crash.html b/tests/wpt/tests/shadow-dom/imperative-slot-api-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/imperative-slot-api-crash.html rename to tests/wpt/tests/shadow-dom/imperative-slot-api-crash.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/imperative-slot-api-slotchange.html b/tests/wpt/tests/shadow-dom/imperative-slot-api-slotchange.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/imperative-slot-api-slotchange.html rename to tests/wpt/tests/shadow-dom/imperative-slot-api-slotchange.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/imperative-slot-api.html b/tests/wpt/tests/shadow-dom/imperative-slot-api.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/imperative-slot-api.html rename to tests/wpt/tests/shadow-dom/imperative-slot-api.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/imperative-slot-assign-not-slotable-crash.html b/tests/wpt/tests/shadow-dom/imperative-slot-assign-not-slotable-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/imperative-slot-assign-not-slotable-crash.html rename to tests/wpt/tests/shadow-dom/imperative-slot-assign-not-slotable-crash.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/imperative-slot-fallback-clear.html b/tests/wpt/tests/shadow-dom/imperative-slot-fallback-clear.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/imperative-slot-fallback-clear.html rename to tests/wpt/tests/shadow-dom/imperative-slot-fallback-clear.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/imperative-slot-initial-fallback.html b/tests/wpt/tests/shadow-dom/imperative-slot-initial-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/imperative-slot-initial-fallback.html rename to tests/wpt/tests/shadow-dom/imperative-slot-initial-fallback.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/imperative-slot-layout-invalidation-001-ref.html b/tests/wpt/tests/shadow-dom/imperative-slot-layout-invalidation-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/imperative-slot-layout-invalidation-001-ref.html rename to tests/wpt/tests/shadow-dom/imperative-slot-layout-invalidation-001-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/imperative-slot-layout-invalidation-001.html b/tests/wpt/tests/shadow-dom/imperative-slot-layout-invalidation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/imperative-slot-layout-invalidation-001.html rename to tests/wpt/tests/shadow-dom/imperative-slot-layout-invalidation-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/innerHTML-setter.xhtml b/tests/wpt/tests/shadow-dom/innerHTML-setter.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/innerHTML-setter.xhtml rename to tests/wpt/tests/shadow-dom/innerHTML-setter.xhtml diff --git a/tests/wpt/web-platform-tests/shadow-dom/input-element-list.html b/tests/wpt/tests/shadow-dom/input-element-list.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/input-element-list.html rename to tests/wpt/tests/shadow-dom/input-element-list.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/input-type-radio.html b/tests/wpt/tests/shadow-dom/input-type-radio.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/input-type-radio.html rename to tests/wpt/tests/shadow-dom/input-type-radio.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/invalidate-shadow-dom-crash.html b/tests/wpt/tests/shadow-dom/invalidate-shadow-dom-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/invalidate-shadow-dom-crash.html rename to tests/wpt/tests/shadow-dom/invalidate-shadow-dom-crash.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/invalidate-sibling-different-slots-ref.html b/tests/wpt/tests/shadow-dom/invalidate-sibling-different-slots-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/invalidate-sibling-different-slots-ref.html rename to tests/wpt/tests/shadow-dom/invalidate-sibling-different-slots-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/invalidate-sibling-different-slots.html b/tests/wpt/tests/shadow-dom/invalidate-sibling-different-slots.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/invalidate-sibling-different-slots.html rename to tests/wpt/tests/shadow-dom/invalidate-sibling-different-slots.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/layout-slot-no-longer-assigned.html b/tests/wpt/tests/shadow-dom/layout-slot-no-longer-assigned.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/layout-slot-no-longer-assigned.html rename to tests/wpt/tests/shadow-dom/layout-slot-no-longer-assigned.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/layout-slot-no-longer-fallback.html b/tests/wpt/tests/shadow-dom/layout-slot-no-longer-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/layout-slot-no-longer-fallback.html rename to tests/wpt/tests/shadow-dom/layout-slot-no-longer-fallback.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/leaktests/get-elements.html b/tests/wpt/tests/shadow-dom/leaktests/get-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/leaktests/get-elements.html rename to tests/wpt/tests/shadow-dom/leaktests/get-elements.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/leaktests/html-collection.html b/tests/wpt/tests/shadow-dom/leaktests/html-collection.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/leaktests/html-collection.html rename to tests/wpt/tests/shadow-dom/leaktests/html-collection.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/leaktests/window-frames.html b/tests/wpt/tests/shadow-dom/leaktests/window-frames.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/leaktests/window-frames.html rename to tests/wpt/tests/shadow-dom/leaktests/window-frames.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/nested-slot-remove-crash.html b/tests/wpt/tests/shadow-dom/nested-slot-remove-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/nested-slot-remove-crash.html rename to tests/wpt/tests/shadow-dom/nested-slot-remove-crash.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/offsetParent-across-shadow-boundaries.html b/tests/wpt/tests/shadow-dom/offsetParent-across-shadow-boundaries.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/offsetParent-across-shadow-boundaries.html rename to tests/wpt/tests/shadow-dom/offsetParent-across-shadow-boundaries.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/offsetTop-offsetLeft-across-shadow-boundaries.html b/tests/wpt/tests/shadow-dom/offsetTop-offsetLeft-across-shadow-boundaries.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/offsetTop-offsetLeft-across-shadow-boundaries.html rename to tests/wpt/tests/shadow-dom/offsetTop-offsetLeft-across-shadow-boundaries.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/reference/empty.html b/tests/wpt/tests/shadow-dom/reference/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/reference/empty.html rename to tests/wpt/tests/shadow-dom/reference/empty.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/resources/Document-prototype-currentScript-helper.js b/tests/wpt/tests/shadow-dom/resources/Document-prototype-currentScript-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/resources/Document-prototype-currentScript-helper.js rename to tests/wpt/tests/shadow-dom/resources/Document-prototype-currentScript-helper.js diff --git a/tests/wpt/web-platform-tests/shadow-dom/resources/event-path-test-helpers.js b/tests/wpt/tests/shadow-dom/resources/event-path-test-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/resources/event-path-test-helpers.js rename to tests/wpt/tests/shadow-dom/resources/event-path-test-helpers.js diff --git a/tests/wpt/web-platform-tests/shadow-dom/resources/shadow-dom-utils.js b/tests/wpt/tests/shadow-dom/resources/shadow-dom-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/resources/shadow-dom-utils.js rename to tests/wpt/tests/shadow-dom/resources/shadow-dom-utils.js diff --git a/tests/wpt/web-platform-tests/shadow-dom/resources/shadow-dom.js b/tests/wpt/tests/shadow-dom/resources/shadow-dom.js similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/resources/shadow-dom.js rename to tests/wpt/tests/shadow-dom/resources/shadow-dom.js diff --git a/tests/wpt/web-platform-tests/shadow-dom/scroll-to-the-fragment-in-shadow-tree.html b/tests/wpt/tests/shadow-dom/scroll-to-the-fragment-in-shadow-tree.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/scroll-to-the-fragment-in-shadow-tree.html rename to tests/wpt/tests/shadow-dom/scroll-to-the-fragment-in-shadow-tree.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/selection-collapse-and-extend.tentative.html b/tests/wpt/tests/shadow-dom/selection-collapse-and-extend.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/selection-collapse-and-extend.tentative.html rename to tests/wpt/tests/shadow-dom/selection-collapse-and-extend.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/selection-direction.tentative.html b/tests/wpt/tests/shadow-dom/selection-direction.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/selection-direction.tentative.html rename to tests/wpt/tests/shadow-dom/selection-direction.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/selection-getComposedRanges.tentative.html b/tests/wpt/tests/shadow-dom/selection-getComposedRanges.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/selection-getComposedRanges.tentative.html rename to tests/wpt/tests/shadow-dom/selection-getComposedRanges.tentative.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-style-invalidation-vw-units-ref.html b/tests/wpt/tests/shadow-dom/shadow-style-invalidation-vw-units-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/shadow-style-invalidation-vw-units-ref.html rename to tests/wpt/tests/shadow-dom/shadow-style-invalidation-vw-units-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/shadow-style-invalidation-vw-units.html b/tests/wpt/tests/shadow-dom/shadow-style-invalidation-vw-units.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/shadow-style-invalidation-vw-units.html rename to tests/wpt/tests/shadow-dom/shadow-style-invalidation-vw-units.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-dir-attach-child-crash.html b/tests/wpt/tests/shadow-dom/slot-dir-attach-child-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-dir-attach-child-crash.html rename to tests/wpt/tests/shadow-dom/slot-dir-attach-child-crash.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-001-ref.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-001-ref.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-001-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-001.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-001.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-002-ref.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-002-ref.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-002-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-002.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-002.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-002.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-002.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-003-ref.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-003-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-003-ref.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-003-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-003.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-003.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-003.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-003.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-004-ref.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-004-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-004-ref.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-004-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-004.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-004.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-004.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-004.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-005-ref.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-005-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-005-ref.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-005-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-005.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-005.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-005.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-005.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-006-ref.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-006-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-006-ref.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-006-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-006.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-006.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-006.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-006.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-007-ref.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-007-ref.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-007-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-007.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-007.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-007.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-007.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-008-ref.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-008-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-008-ref.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-008-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-008.html b/tests/wpt/tests/shadow-dom/slot-fallback-content-008.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slot-fallback-content-008.html rename to tests/wpt/tests/shadow-dom/slot-fallback-content-008.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slotchange-customelements.html b/tests/wpt/tests/shadow-dom/slotchange-customelements.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slotchange-customelements.html rename to tests/wpt/tests/shadow-dom/slotchange-customelements.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slotchange-event.html b/tests/wpt/tests/shadow-dom/slotchange-event.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slotchange-event.html rename to tests/wpt/tests/shadow-dom/slotchange-event.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slotchange.html b/tests/wpt/tests/shadow-dom/slotchange.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slotchange.html rename to tests/wpt/tests/shadow-dom/slotchange.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slots-fallback-in-document.html b/tests/wpt/tests/shadow-dom/slots-fallback-in-document.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slots-fallback-in-document.html rename to tests/wpt/tests/shadow-dom/slots-fallback-in-document.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slots-fallback.html b/tests/wpt/tests/shadow-dom/slots-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slots-fallback.html rename to tests/wpt/tests/shadow-dom/slots-fallback.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slots-outside-shadow-dom.html b/tests/wpt/tests/shadow-dom/slots-outside-shadow-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slots-outside-shadow-dom.html rename to tests/wpt/tests/shadow-dom/slots-outside-shadow-dom.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/slots.html b/tests/wpt/tests/shadow-dom/slots.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/slots.html rename to tests/wpt/tests/shadow-dom/slots.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/README b/tests/wpt/tests/shadow-dom/untriaged/README similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/README rename to tests/wpt/tests/shadow-dom/untriaged/README diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/attributes/test-006.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/attributes/test-006.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/attributes/test-006.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/attributes/test-006.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/methods/test-001.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/methods/test-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/methods/test-001.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/methods/test-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/methods/test-002.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/methods/test-002.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/methods/test-002.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/extensions-to-element-interface/methods/test-002.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/activeElement-confirm-return-null.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/activeElement-confirm-return-null.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/activeElement-confirm-return-null.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/activeElement-confirm-return-null.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-007.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-007.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-007.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-007.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-009.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-009.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-009.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-009.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-010.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-010.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-010.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-010.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-011.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-011.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-011.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-011.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-012.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-012.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-012.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-012.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-013.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-013.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-013.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-013.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-001.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-001.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-007.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-007.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-007.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-007.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-010.html b/tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-010.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-010.html rename to tests/wpt/tests/shadow-dom/untriaged/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-010.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/events/event-dispatch/test-002.html b/tests/wpt/tests/shadow-dom/untriaged/events/event-dispatch/test-002.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/events/event-dispatch/test-002.html rename to tests/wpt/tests/shadow-dom/untriaged/events/event-dispatch/test-002.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/events/event-dispatch/test-003.html b/tests/wpt/tests/shadow-dom/untriaged/events/event-dispatch/test-003.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/events/event-dispatch/test-003.html rename to tests/wpt/tests/shadow-dom/untriaged/events/event-dispatch/test-003.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/events/event-retargeting/test-001.html b/tests/wpt/tests/shadow-dom/untriaged/events/event-retargeting/test-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/events/event-retargeting/test-001.html rename to tests/wpt/tests/shadow-dom/untriaged/events/event-retargeting/test-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/events/event-retargeting/test-003.html b/tests/wpt/tests/shadow-dom/untriaged/events/event-retargeting/test-003.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/events/event-retargeting/test-003.html rename to tests/wpt/tests/shadow-dom/untriaged/events/event-retargeting/test-003.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/events/retargeting-focus-events/test-001.html b/tests/wpt/tests/shadow-dom/untriaged/events/retargeting-focus-events/test-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/events/retargeting-focus-events/test-001.html rename to tests/wpt/tests/shadow-dom/untriaged/events/retargeting-focus-events/test-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/events/retargeting-focus-events/test-002.html b/tests/wpt/tests/shadow-dom/untriaged/events/retargeting-focus-events/test-002.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/events/retargeting-focus-events/test-002.html rename to tests/wpt/tests/shadow-dom/untriaged/events/retargeting-focus-events/test-002.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/events/retargeting-focus-events/test-003.html b/tests/wpt/tests/shadow-dom/untriaged/events/retargeting-focus-events/test-003.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/events/retargeting-focus-events/test-003.html rename to tests/wpt/tests/shadow-dom/untriaged/events/retargeting-focus-events/test-003.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/events/retargeting-relatedtarget/test-001.html b/tests/wpt/tests/shadow-dom/untriaged/events/retargeting-relatedtarget/test-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/events/retargeting-relatedtarget/test-001.html rename to tests/wpt/tests/shadow-dom/untriaged/events/retargeting-relatedtarget/test-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/events/retargeting-relatedtarget/test-002.html b/tests/wpt/tests/shadow-dom/untriaged/events/retargeting-relatedtarget/test-002.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/events/retargeting-relatedtarget/test-002.html rename to tests/wpt/tests/shadow-dom/untriaged/events/retargeting-relatedtarget/test-002.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/events/retargeting-relatedtarget/test-003.html b/tests/wpt/tests/shadow-dom/untriaged/events/retargeting-relatedtarget/test-003.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/events/retargeting-relatedtarget/test-003.html rename to tests/wpt/tests/shadow-dom/untriaged/events/retargeting-relatedtarget/test-003.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/events/test-001.html b/tests/wpt/tests/shadow-dom/untriaged/events/test-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/events/test-001.html rename to tests/wpt/tests/shadow-dom/untriaged/events/test-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/html-elements-in-shadow-trees/html-forms/test-001.html b/tests/wpt/tests/shadow-dom/untriaged/html-elements-in-shadow-trees/html-forms/test-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/html-elements-in-shadow-trees/html-forms/test-001.html rename to tests/wpt/tests/shadow-dom/untriaged/html-elements-in-shadow-trees/html-forms/test-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/html-elements-in-shadow-trees/html-forms/test-002.html b/tests/wpt/tests/shadow-dom/untriaged/html-elements-in-shadow-trees/html-forms/test-002.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/html-elements-in-shadow-trees/html-forms/test-002.html rename to tests/wpt/tests/shadow-dom/untriaged/html-elements-in-shadow-trees/html-forms/test-002.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/html-elements-in-shadow-trees/html-forms/test-003.html b/tests/wpt/tests/shadow-dom/untriaged/html-elements-in-shadow-trees/html-forms/test-003.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/html-elements-in-shadow-trees/html-forms/test-003.html rename to tests/wpt/tests/shadow-dom/untriaged/html-elements-in-shadow-trees/html-forms/test-003.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-001.html b/tests/wpt/tests/shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-001.html rename to tests/wpt/tests/shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-002.html b/tests/wpt/tests/shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-002.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-002.html rename to tests/wpt/tests/shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-002.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/resources/blank.html b/tests/wpt/tests/shadow-dom/untriaged/resources/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/resources/blank.html rename to tests/wpt/tests/shadow-dom/untriaged/resources/blank.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/resources/bobs_page.html b/tests/wpt/tests/shadow-dom/untriaged/resources/bobs_page.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/resources/bobs_page.html rename to tests/wpt/tests/shadow-dom/untriaged/resources/bobs_page.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/nested-shadow-trees/nested_tree_reftest-ref.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/nested-shadow-trees/nested_tree_reftest-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/nested-shadow-trees/nested_tree_reftest-ref.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/nested-shadow-trees/nested_tree_reftest-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/nested-shadow-trees/nested_tree_reftest.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/nested-shadow-trees/nested_tree_reftest.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/nested-shadow-trees/nested_tree_reftest.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/nested-shadow-trees/nested_tree_reftest.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/reprojection/reprojection-001-ref.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/reprojection/reprojection-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/reprojection/reprojection-001-ref.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/reprojection/reprojection-001-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/reprojection/reprojection-001.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/reprojection/reprojection-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/reprojection/reprojection-001.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/reprojection/reprojection-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/shadow-root-001-ref.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/shadow-root-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/shadow-root-001-ref.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/shadow-root-001-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/shadow-root-001.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/shadow-root-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/shadow-root-001.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/shadow-root-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/shadow-root-002-ref.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/shadow-root-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/shadow-root-002-ref.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/shadow-root-002-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/shadow-root-002.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/shadow-root-002.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/shadow-root-002.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/shadow-root-002.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-001.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-001.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-002.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-002.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-002.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-002.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/ownerdocument-001.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/ownerdocument-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/ownerdocument-001.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/ownerdocument-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/ownerdocument-002.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/ownerdocument-002.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/ownerdocument-002.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/ownerdocument-002.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/selectors-api-001.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/selectors-api-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/selectors-api-001.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/selectors-api-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/selectors-api-002.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/selectors-api-002.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/selectors-api-002.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/selectors-api-002.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/shadow-root-001.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/shadow-root-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/shadow-root-001.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/shadow-root-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-005.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-005.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-005.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-005.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-007.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-007.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-007.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-007.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-009.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-009.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-009.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-009.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-011.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-011.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-011.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-011.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/window-named-properties-001.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/window-named-properties-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/window-named-properties-001.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/window-named-properties-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/window-named-properties-002.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/window-named-properties-002.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/window-named-properties-002.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/window-named-properties-002.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/window-named-properties-003.html b/tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/window-named-properties-003.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/window-named-properties-003.html rename to tests/wpt/tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/window-named-properties-003.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/styles/not-apply-in-shadow-root-001-ref.html b/tests/wpt/tests/shadow-dom/untriaged/styles/not-apply-in-shadow-root-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/styles/not-apply-in-shadow-root-001-ref.html rename to tests/wpt/tests/shadow-dom/untriaged/styles/not-apply-in-shadow-root-001-ref.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/styles/not-apply-in-shadow-root-001.html b/tests/wpt/tests/shadow-dom/untriaged/styles/not-apply-in-shadow-root-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/styles/not-apply-in-shadow-root-001.html rename to tests/wpt/tests/shadow-dom/untriaged/styles/not-apply-in-shadow-root-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/styles/test-001.html b/tests/wpt/tests/shadow-dom/untriaged/styles/test-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/styles/test-001.html rename to tests/wpt/tests/shadow-dom/untriaged/styles/test-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/styles/test-003.html b/tests/wpt/tests/shadow-dom/untriaged/styles/test-003.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/styles/test-003.html rename to tests/wpt/tests/shadow-dom/untriaged/styles/test-003.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/styles/test-005.html b/tests/wpt/tests/shadow-dom/untriaged/styles/test-005.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/styles/test-005.html rename to tests/wpt/tests/shadow-dom/untriaged/styles/test-005.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/styles/test-008.html b/tests/wpt/tests/shadow-dom/untriaged/styles/test-008.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/styles/test-008.html rename to tests/wpt/tests/shadow-dom/untriaged/styles/test-008.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/user-interaction/active-element/test-001.html b/tests/wpt/tests/shadow-dom/untriaged/user-interaction/active-element/test-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/user-interaction/active-element/test-001.html rename to tests/wpt/tests/shadow-dom/untriaged/user-interaction/active-element/test-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/user-interaction/active-element/test-002.html b/tests/wpt/tests/shadow-dom/untriaged/user-interaction/active-element/test-002.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/user-interaction/active-element/test-002.html rename to tests/wpt/tests/shadow-dom/untriaged/user-interaction/active-element/test-002.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/user-interaction/editing/inheritance-of-content-editable-001.html b/tests/wpt/tests/shadow-dom/untriaged/user-interaction/editing/inheritance-of-content-editable-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/user-interaction/editing/inheritance-of-content-editable-001.html rename to tests/wpt/tests/shadow-dom/untriaged/user-interaction/editing/inheritance-of-content-editable-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-001.html b/tests/wpt/tests/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-001.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-001.html rename to tests/wpt/tests/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-001.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html b/tests/wpt/tests/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html rename to tests/wpt/tests/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html diff --git a/tests/wpt/web-platform-tests/shadow-dom/user-agent-shadow-root-crash.html b/tests/wpt/tests/shadow-dom/user-agent-shadow-root-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/shadow-dom/user-agent-shadow-root-crash.html rename to tests/wpt/tests/shadow-dom/user-agent-shadow-root-crash.html diff --git a/tests/wpt/web-platform-tests/shape-detection/META.yml b/tests/wpt/tests/shape-detection/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/META.yml rename to tests/wpt/tests/shape-detection/META.yml diff --git a/tests/wpt/web-platform-tests/shape-detection/README.md b/tests/wpt/tests/shape-detection/README.md similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/README.md rename to tests/wpt/tests/shape-detection/README.md diff --git a/tests/wpt/web-platform-tests/shape-detection/detected-boundingBox-read-only.https.html b/tests/wpt/tests/shape-detection/detected-boundingBox-read-only.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detected-boundingBox-read-only.https.html rename to tests/wpt/tests/shape-detection/detected-boundingBox-read-only.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/detected-postMessage.https.html b/tests/wpt/tests/shape-detection/detected-postMessage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detected-postMessage.https.html rename to tests/wpt/tests/shape-detection/detected-postMessage.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-Blob.https.window.js b/tests/wpt/tests/shape-detection/detection-Blob.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-Blob.https.window.js rename to tests/wpt/tests/shape-detection/detection-Blob.https.window.js diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-HTMLCanvasElement.https.html b/tests/wpt/tests/shape-detection/detection-HTMLCanvasElement.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-HTMLCanvasElement.https.html rename to tests/wpt/tests/shape-detection/detection-HTMLCanvasElement.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-HTMLImageElement-empty-src.https.html b/tests/wpt/tests/shape-detection/detection-HTMLImageElement-empty-src.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-HTMLImageElement-empty-src.https.html rename to tests/wpt/tests/shape-detection/detection-HTMLImageElement-empty-src.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-HTMLImageElement-zero-dimension-image.https.html b/tests/wpt/tests/shape-detection/detection-HTMLImageElement-zero-dimension-image.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-HTMLImageElement-zero-dimension-image.https.html rename to tests/wpt/tests/shape-detection/detection-HTMLImageElement-zero-dimension-image.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-HTMLImageElement.https.html b/tests/wpt/tests/shape-detection/detection-HTMLImageElement.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-HTMLImageElement.https.html rename to tests/wpt/tests/shape-detection/detection-HTMLImageElement.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-HTMLVideoElement.https.html b/tests/wpt/tests/shape-detection/detection-HTMLVideoElement.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-HTMLVideoElement.https.html rename to tests/wpt/tests/shape-detection/detection-HTMLVideoElement.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-ImageBitmap-closed.https.window.js b/tests/wpt/tests/shape-detection/detection-ImageBitmap-closed.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-ImageBitmap-closed.https.window.js rename to tests/wpt/tests/shape-detection/detection-ImageBitmap-closed.https.window.js diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-ImageBitmap.https.html b/tests/wpt/tests/shape-detection/detection-ImageBitmap.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-ImageBitmap.https.html rename to tests/wpt/tests/shape-detection/detection-ImageBitmap.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-ImageData-detached.https.html b/tests/wpt/tests/shape-detection/detection-ImageData-detached.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-ImageData-detached.https.html rename to tests/wpt/tests/shape-detection/detection-ImageData-detached.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-ImageData.https.html b/tests/wpt/tests/shape-detection/detection-ImageData.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-ImageData.https.html rename to tests/wpt/tests/shape-detection/detection-ImageData.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-ImageDataUint16StorageFormat.https.window.js b/tests/wpt/tests/shape-detection/detection-ImageDataUint16StorageFormat.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-ImageDataUint16StorageFormat.https.window.js rename to tests/wpt/tests/shape-detection/detection-ImageDataUint16StorageFormat.https.window.js diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-SVGImageElement.https.window.js b/tests/wpt/tests/shape-detection/detection-SVGImageElement.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-SVGImageElement.https.window.js rename to tests/wpt/tests/shape-detection/detection-SVGImageElement.https.window.js diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-VideoFrame.https.window.js b/tests/wpt/tests/shape-detection/detection-VideoFrame.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-VideoFrame.https.window.js rename to tests/wpt/tests/shape-detection/detection-VideoFrame.https.window.js diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-getSupportedFormats.https.html b/tests/wpt/tests/shape-detection/detection-getSupportedFormats.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-getSupportedFormats.https.html rename to tests/wpt/tests/shape-detection/detection-getSupportedFormats.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-on-worker.https.worker.js b/tests/wpt/tests/shape-detection/detection-on-worker.https.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-on-worker.https.worker.js rename to tests/wpt/tests/shape-detection/detection-on-worker.https.worker.js diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-options.https.html b/tests/wpt/tests/shape-detection/detection-options.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-options.https.html rename to tests/wpt/tests/shape-detection/detection-options.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-security-test.https.html b/tests/wpt/tests/shape-detection/detection-security-test.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detection-security-test.https.html rename to tests/wpt/tests/shape-detection/detection-security-test.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/detector-same-object.https.html b/tests/wpt/tests/shape-detection/detector-same-object.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/detector-same-object.https.html rename to tests/wpt/tests/shape-detection/detector-same-object.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/idlharness.https.any.js b/tests/wpt/tests/shape-detection/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/idlharness.https.any.js rename to tests/wpt/tests/shape-detection/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/aztec-correction.jpg b/tests/wpt/tests/shape-detection/resources/aztec-correction.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/aztec-correction.jpg rename to tests/wpt/tests/shape-detection/resources/aztec-correction.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/aztec-full.jpg b/tests/wpt/tests/shape-detection/resources/aztec-full.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/aztec-full.jpg rename to tests/wpt/tests/shape-detection/resources/aztec-full.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/aztec-layers.jpg b/tests/wpt/tests/shape-detection/resources/aztec-layers.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/aztec-layers.jpg rename to tests/wpt/tests/shape-detection/resources/aztec-layers.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/aztec.jpg b/tests/wpt/tests/shape-detection/resources/aztec.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/aztec.jpg rename to tests/wpt/tests/shape-detection/resources/aztec.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/barcodes.mov b/tests/wpt/tests/shape-detection/resources/barcodes.mov similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/barcodes.mov rename to tests/wpt/tests/shape-detection/resources/barcodes.mov diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/code128-height.jpg b/tests/wpt/tests/shape-detection/resources/code128-height.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/code128-height.jpg rename to tests/wpt/tests/shape-detection/resources/code128-height.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/code128.jpg b/tests/wpt/tests/shape-detection/resources/code128.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/code128.jpg rename to tests/wpt/tests/shape-detection/resources/code128.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/face-bottom-left.jpg b/tests/wpt/tests/shape-detection/resources/face-bottom-left.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/face-bottom-left.jpg rename to tests/wpt/tests/shape-detection/resources/face-bottom-left.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/face-bottom-right.jpg b/tests/wpt/tests/shape-detection/resources/face-bottom-right.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/face-bottom-right.jpg rename to tests/wpt/tests/shape-detection/resources/face-bottom-right.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/face-center.jpg b/tests/wpt/tests/shape-detection/resources/face-center.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/face-center.jpg rename to tests/wpt/tests/shape-detection/resources/face-center.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/face-top-left.jpg b/tests/wpt/tests/shape-detection/resources/face-top-left.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/face-top-left.jpg rename to tests/wpt/tests/shape-detection/resources/face-top-left.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/face-top-right.jpg b/tests/wpt/tests/shape-detection/resources/face-top-right.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/face-top-right.jpg rename to tests/wpt/tests/shape-detection/resources/face-top-right.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/faces.mov b/tests/wpt/tests/shape-detection/resources/faces.mov similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/faces.mov rename to tests/wpt/tests/shape-detection/resources/faces.mov diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/pdf417-columns.jpg b/tests/wpt/tests/shape-detection/resources/pdf417-columns.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/pdf417-columns.jpg rename to tests/wpt/tests/shape-detection/resources/pdf417-columns.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/pdf417-compact.jpg b/tests/wpt/tests/shape-detection/resources/pdf417-compact.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/pdf417-compact.jpg rename to tests/wpt/tests/shape-detection/resources/pdf417-compact.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/pdf417-compaction.jpg b/tests/wpt/tests/shape-detection/resources/pdf417-compaction.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/pdf417-compaction.jpg rename to tests/wpt/tests/shape-detection/resources/pdf417-compaction.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/pdf417-correction.jpg b/tests/wpt/tests/shape-detection/resources/pdf417-correction.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/pdf417-correction.jpg rename to tests/wpt/tests/shape-detection/resources/pdf417-correction.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/pdf417-rows.jpg b/tests/wpt/tests/shape-detection/resources/pdf417-rows.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/pdf417-rows.jpg rename to tests/wpt/tests/shape-detection/resources/pdf417-rows.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/pdf417-square.jpg b/tests/wpt/tests/shape-detection/resources/pdf417-square.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/pdf417-square.jpg rename to tests/wpt/tests/shape-detection/resources/pdf417-square.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/pdf417-taller.jpg b/tests/wpt/tests/shape-detection/resources/pdf417-taller.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/pdf417-taller.jpg rename to tests/wpt/tests/shape-detection/resources/pdf417-taller.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/pdf417-wider.jpg b/tests/wpt/tests/shape-detection/resources/pdf417-wider.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/pdf417-wider.jpg rename to tests/wpt/tests/shape-detection/resources/pdf417-wider.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/pdf417.jpg b/tests/wpt/tests/shape-detection/resources/pdf417.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/pdf417.jpg rename to tests/wpt/tests/shape-detection/resources/pdf417.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/qr-bottom-left.jpg b/tests/wpt/tests/shape-detection/resources/qr-bottom-left.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/qr-bottom-left.jpg rename to tests/wpt/tests/shape-detection/resources/qr-bottom-left.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/qr-bottom-right.jpg b/tests/wpt/tests/shape-detection/resources/qr-bottom-right.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/qr-bottom-right.jpg rename to tests/wpt/tests/shape-detection/resources/qr-bottom-right.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/qr-center.jpg b/tests/wpt/tests/shape-detection/resources/qr-center.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/qr-center.jpg rename to tests/wpt/tests/shape-detection/resources/qr-center.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/qr-h.jpg b/tests/wpt/tests/shape-detection/resources/qr-h.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/qr-h.jpg rename to tests/wpt/tests/shape-detection/resources/qr-h.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/qr-l.jpg b/tests/wpt/tests/shape-detection/resources/qr-l.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/qr-l.jpg rename to tests/wpt/tests/shape-detection/resources/qr-l.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/qr-m.jpg b/tests/wpt/tests/shape-detection/resources/qr-m.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/qr-m.jpg rename to tests/wpt/tests/shape-detection/resources/qr-m.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/qr-q.jpg b/tests/wpt/tests/shape-detection/resources/qr-q.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/qr-q.jpg rename to tests/wpt/tests/shape-detection/resources/qr-q.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/qr-top-left.jpg b/tests/wpt/tests/shape-detection/resources/qr-top-left.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/qr-top-left.jpg rename to tests/wpt/tests/shape-detection/resources/qr-top-left.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/qr-top-right.jpg b/tests/wpt/tests/shape-detection/resources/qr-top-right.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/qr-top-right.jpg rename to tests/wpt/tests/shape-detection/resources/qr-top-right.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/shapedetection-helpers.js b/tests/wpt/tests/shape-detection/resources/shapedetection-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/shapedetection-helpers.js rename to tests/wpt/tests/shape-detection/resources/shapedetection-helpers.js diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/single-detection-helpers.js b/tests/wpt/tests/shape-detection/resources/single-detection-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/single-detection-helpers.js rename to tests/wpt/tests/shape-detection/resources/single-detection-helpers.js diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/text-bottom-left.jpg b/tests/wpt/tests/shape-detection/resources/text-bottom-left.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/text-bottom-left.jpg rename to tests/wpt/tests/shape-detection/resources/text-bottom-left.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/text-bottom-right.jpg b/tests/wpt/tests/shape-detection/resources/text-bottom-right.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/text-bottom-right.jpg rename to tests/wpt/tests/shape-detection/resources/text-bottom-right.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/text-center.jpg b/tests/wpt/tests/shape-detection/resources/text-center.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/text-center.jpg rename to tests/wpt/tests/shape-detection/resources/text-center.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/text-top-left.jpg b/tests/wpt/tests/shape-detection/resources/text-top-left.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/text-top-left.jpg rename to tests/wpt/tests/shape-detection/resources/text-top-left.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/text-top-right.jpg b/tests/wpt/tests/shape-detection/resources/text-top-right.jpg similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/text-top-right.jpg rename to tests/wpt/tests/shape-detection/resources/text-top-right.jpg diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/text.mov b/tests/wpt/tests/shape-detection/resources/text.mov similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/resources/text.mov rename to tests/wpt/tests/shape-detection/resources/text.mov diff --git a/tests/wpt/web-platform-tests/shape-detection/shapedetection-cross-origin.sub.https.html b/tests/wpt/tests/shape-detection/shapedetection-cross-origin.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/shapedetection-cross-origin.sub.https.html rename to tests/wpt/tests/shape-detection/shapedetection-cross-origin.sub.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/single-barcode-detection.https.html b/tests/wpt/tests/shape-detection/single-barcode-detection.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/single-barcode-detection.https.html rename to tests/wpt/tests/shape-detection/single-barcode-detection.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/single-face-detection.https.html b/tests/wpt/tests/shape-detection/single-face-detection.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/single-face-detection.https.html rename to tests/wpt/tests/shape-detection/single-face-detection.https.html diff --git a/tests/wpt/web-platform-tests/shape-detection/single-text-detection.https.html b/tests/wpt/tests/shape-detection/single-text-detection.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shape-detection/single-text-detection.https.html rename to tests/wpt/tests/shape-detection/single-text-detection.https.html diff --git a/tests/wpt/web-platform-tests/shared-storage-selecturl-limit/resources/run-url-selection-operation-limit-inner.https.html b/tests/wpt/tests/shared-storage-selecturl-limit/resources/run-url-selection-operation-limit-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage-selecturl-limit/resources/run-url-selection-operation-limit-inner.https.html rename to tests/wpt/tests/shared-storage-selecturl-limit/resources/run-url-selection-operation-limit-inner.https.html diff --git a/tests/wpt/web-platform-tests/shared-storage-selecturl-limit/resources/utils.js b/tests/wpt/tests/shared-storage-selecturl-limit/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage-selecturl-limit/resources/utils.js rename to tests/wpt/tests/shared-storage-selecturl-limit/resources/utils.js diff --git a/tests/wpt/web-platform-tests/shared-storage-selecturl-limit/run-url-selection-operation-limit-multiple-origins.tentative.https.sub.html b/tests/wpt/tests/shared-storage-selecturl-limit/run-url-selection-operation-limit-multiple-origins.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage-selecturl-limit/run-url-selection-operation-limit-multiple-origins.tentative.https.sub.html rename to tests/wpt/tests/shared-storage-selecturl-limit/run-url-selection-operation-limit-multiple-origins.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage-selecturl-limit/run-url-selection-operation-limit.tentative.https.sub.html b/tests/wpt/tests/shared-storage-selecturl-limit/run-url-selection-operation-limit.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage-selecturl-limit/run-url-selection-operation-limit.tentative.https.sub.html rename to tests/wpt/tests/shared-storage-selecturl-limit/run-url-selection-operation-limit.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/add-module.tentative.https.sub.html b/tests/wpt/tests/shared-storage/add-module.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/add-module.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/add-module.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/combined-setters-and-operations.tentative.https.sub.html b/tests/wpt/tests/shared-storage/combined-setters-and-operations.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/combined-setters-and-operations.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/combined-setters-and-operations.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/embedder-context.tentative.https.sub.html b/tests/wpt/tests/shared-storage/embedder-context.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/embedder-context.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/embedder-context.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/insecure-context.tentative.http.html b/tests/wpt/tests/shared-storage/insecure-context.tentative.http.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/insecure-context.tentative.http.html rename to tests/wpt/tests/shared-storage/insecure-context.tentative.http.html diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/embedder-context-inner.https.html b/tests/wpt/tests/shared-storage/resources/embedder-context-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/embedder-context-inner.https.html rename to tests/wpt/tests/shared-storage/resources/embedder-context-inner.https.html diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/embedder-context-inner.https.html.headers b/tests/wpt/tests/shared-storage/resources/embedder-context-inner.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/embedder-context-inner.https.html.headers rename to tests/wpt/tests/shared-storage/resources/embedder-context-inner.https.html.headers diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/embedder-context-module.js b/tests/wpt/tests/shared-storage/resources/embedder-context-module.js similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/embedder-context-module.js rename to tests/wpt/tests/shared-storage/resources/embedder-context-module.js diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/embedder-context-nested-iframe.https.html b/tests/wpt/tests/shared-storage/resources/embedder-context-nested-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/embedder-context-nested-iframe.https.html rename to tests/wpt/tests/shared-storage/resources/embedder-context-nested-iframe.https.html diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/embedder-context-nested-inner.https.html b/tests/wpt/tests/shared-storage/resources/embedder-context-nested-inner.https.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/embedder-context-nested-inner.https.html rename to tests/wpt/tests/shared-storage/resources/embedder-context-nested-inner.https.html diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/embedder-context-nested-inner.https.html.headers b/tests/wpt/tests/shared-storage/resources/embedder-context-nested-inner.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/embedder-context-nested-inner.https.html.headers rename to tests/wpt/tests/shared-storage/resources/embedder-context-nested-inner.https.html.headers diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/frame0.html b/tests/wpt/tests/shared-storage/resources/frame0.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/frame0.html rename to tests/wpt/tests/shared-storage/resources/frame0.html diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/frame0.html.headers b/tests/wpt/tests/shared-storage/resources/frame0.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/frame0.html.headers rename to tests/wpt/tests/shared-storage/resources/frame0.html.headers diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/frame1.html b/tests/wpt/tests/shared-storage/resources/frame1.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/frame1.html rename to tests/wpt/tests/shared-storage/resources/frame1.html diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/frame1.html.headers b/tests/wpt/tests/shared-storage/resources/frame1.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/frame1.html.headers rename to tests/wpt/tests/shared-storage/resources/frame1.html.headers diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/report.py b/tests/wpt/tests/shared-storage/resources/report.py similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/report.py rename to tests/wpt/tests/shared-storage/resources/report.py diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/select-url-permissions-policy-helper.html b/tests/wpt/tests/shared-storage/resources/select-url-permissions-policy-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/select-url-permissions-policy-helper.html rename to tests/wpt/tests/shared-storage/resources/select-url-permissions-policy-helper.html diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/sender0.html b/tests/wpt/tests/shared-storage/resources/sender0.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/sender0.html rename to tests/wpt/tests/shared-storage/resources/sender0.html diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/sender0.html.headers b/tests/wpt/tests/shared-storage/resources/sender0.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/sender0.html.headers rename to tests/wpt/tests/shared-storage/resources/sender0.html.headers diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/shared-storage-permissions-policy-helper.html b/tests/wpt/tests/shared-storage/resources/shared-storage-permissions-policy-helper.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/shared-storage-permissions-policy-helper.html rename to tests/wpt/tests/shared-storage/resources/shared-storage-permissions-policy-helper.html diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/simple-module.js b/tests/wpt/tests/shared-storage/resources/simple-module.js similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/simple-module.js rename to tests/wpt/tests/shared-storage/resources/simple-module.js diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/util.js b/tests/wpt/tests/shared-storage/resources/util.js similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/util.js rename to tests/wpt/tests/shared-storage/resources/util.js diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/verify-get-undefined-module.js b/tests/wpt/tests/shared-storage/resources/verify-get-undefined-module.js similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/verify-get-undefined-module.js rename to tests/wpt/tests/shared-storage/resources/verify-get-undefined-module.js diff --git a/tests/wpt/web-platform-tests/shared-storage/resources/verify-storage-entries-module.js b/tests/wpt/tests/shared-storage/resources/verify-storage-entries-module.js similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/resources/verify-storage-entries-module.js rename to tests/wpt/tests/shared-storage/resources/verify-storage-entries-module.js diff --git a/tests/wpt/web-platform-tests/shared-storage/run-operation-in-detached-frame.tentative.https.sub.html b/tests/wpt/tests/shared-storage/run-operation-in-detached-frame.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/run-operation-in-detached-frame.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/run-operation-in-detached-frame.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/run-operation-keep-alive.tentative.https.sub.html b/tests/wpt/tests/shared-storage/run-operation-keep-alive.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/run-operation-keep-alive.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/run-operation-keep-alive.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/run-operation.tentative.https.sub.html b/tests/wpt/tests/shared-storage/run-operation.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/run-operation.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/run-operation.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/run-url-selection-operation-without-add-module.tentative.https.sub.html b/tests/wpt/tests/shared-storage/run-url-selection-operation-without-add-module.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/run-url-selection-operation-without-add-module.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/run-url-selection-operation-without-add-module.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/run-url-selection-operation.tentative.https.sub.html b/tests/wpt/tests/shared-storage/run-url-selection-operation.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/run-url-selection-operation.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/run-url-selection-operation.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/select-url-keep-alive.tentative.https.sub.html b/tests/wpt/tests/shared-storage/select-url-keep-alive.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/select-url-keep-alive.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/select-url-keep-alive.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/select-url-permissions-policy-default.tentative.https.sub.html b/tests/wpt/tests/shared-storage/select-url-permissions-policy-default.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/select-url-permissions-policy-default.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/select-url-permissions-policy-default.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/select-url-permissions-policy-none.tentative.https.sub.html b/tests/wpt/tests/shared-storage/select-url-permissions-policy-none.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/select-url-permissions-policy-none.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/select-url-permissions-policy-none.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/select-url-permissions-policy-none.tentative.https.sub.html.headers b/tests/wpt/tests/shared-storage/select-url-permissions-policy-none.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/select-url-permissions-policy-none.tentative.https.sub.html.headers rename to tests/wpt/tests/shared-storage/select-url-permissions-policy-none.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/shared-storage/select-url-permissions-policy-self.tentative.https.sub.html b/tests/wpt/tests/shared-storage/select-url-permissions-policy-self.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/select-url-permissions-policy-self.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/select-url-permissions-policy-self.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/select-url-permissions-policy-self.tentative.https.sub.html.headers b/tests/wpt/tests/shared-storage/select-url-permissions-policy-self.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/select-url-permissions-policy-self.tentative.https.sub.html.headers rename to tests/wpt/tests/shared-storage/select-url-permissions-policy-self.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/shared-storage/select-url-report-event.tentative.https.sub.html b/tests/wpt/tests/shared-storage/select-url-report-event.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/select-url-report-event.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/select-url-report-event.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/setters.tentative.https.sub.html b/tests/wpt/tests/shared-storage/setters.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/setters.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/setters.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/shared-storage-permissions-policy-default.tentative.https.sub.html b/tests/wpt/tests/shared-storage/shared-storage-permissions-policy-default.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/shared-storage-permissions-policy-default.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/shared-storage-permissions-policy-default.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/shared-storage-permissions-policy-none.tentative.https.sub.html b/tests/wpt/tests/shared-storage/shared-storage-permissions-policy-none.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/shared-storage-permissions-policy-none.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/shared-storage-permissions-policy-none.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/shared-storage-permissions-policy-none.tentative.https.sub.html.headers b/tests/wpt/tests/shared-storage/shared-storage-permissions-policy-none.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/shared-storage-permissions-policy-none.tentative.https.sub.html.headers rename to tests/wpt/tests/shared-storage/shared-storage-permissions-policy-none.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/shared-storage/shared-storage-permissions-policy-self.tentative.https.sub.html b/tests/wpt/tests/shared-storage/shared-storage-permissions-policy-self.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/shared-storage-permissions-policy-self.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/shared-storage-permissions-policy-self.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/shared-storage-permissions-policy-self.tentative.https.sub.html.headers b/tests/wpt/tests/shared-storage/shared-storage-permissions-policy-self.tentative.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/shared-storage-permissions-policy-self.tentative.https.sub.html.headers rename to tests/wpt/tests/shared-storage/shared-storage-permissions-policy-self.tentative.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/shared-storage/shared-storage-writable-insecure-context.tentative.http.sub.html b/tests/wpt/tests/shared-storage/shared-storage-writable-insecure-context.tentative.http.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/shared-storage-writable-insecure-context.tentative.http.sub.html rename to tests/wpt/tests/shared-storage/shared-storage-writable-insecure-context.tentative.http.sub.html diff --git a/tests/wpt/web-platform-tests/shared-storage/verify-get-undefined.tentative.https.sub.html b/tests/wpt/tests/shared-storage/verify-get-undefined.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/shared-storage/verify-get-undefined.tentative.https.sub.html rename to tests/wpt/tests/shared-storage/verify-get-undefined.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/META.yml b/tests/wpt/tests/signed-exchange/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/META.yml rename to tests/wpt/tests/signed-exchange/META.yml diff --git a/tests/wpt/web-platform-tests/signed-exchange/README.md b/tests/wpt/tests/signed-exchange/README.md similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/README.md rename to tests/wpt/tests/signed-exchange/README.md diff --git a/tests/wpt/web-platform-tests/signed-exchange/check-cert-request.tentative.html b/tests/wpt/tests/signed-exchange/check-cert-request.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/check-cert-request.tentative.html rename to tests/wpt/tests/signed-exchange/check-cert-request.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/fallback-to-another-sxg.tentative.html b/tests/wpt/tests/signed-exchange/fallback-to-another-sxg.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/fallback-to-another-sxg.tentative.html rename to tests/wpt/tests/signed-exchange/fallback-to-another-sxg.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/nested-sxg.tentative.html b/tests/wpt/tests/signed-exchange/nested-sxg.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/nested-sxg.tentative.html rename to tests/wpt/tests/signed-exchange/nested-sxg.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok-no-referrer.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-ok-no-referrer.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok-no-referrer.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-ok-no-referrer.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok-origin-referrer.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-ok-origin-referrer.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok-origin-referrer.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-ok-origin-referrer.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html b/tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html rename to tests/wpt/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/127.0.0.1.sxg.ext b/tests/wpt/tests/signed-exchange/resources/127.0.0.1.sxg.ext similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/127.0.0.1.sxg.ext rename to tests/wpt/tests/signed-exchange/resources/127.0.0.1.sxg.ext diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/127.0.0.1.sxg.key b/tests/wpt/tests/signed-exchange/resources/127.0.0.1.sxg.key similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/127.0.0.1.sxg.key rename to tests/wpt/tests/signed-exchange/resources/127.0.0.1.sxg.key diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/127.0.0.1.sxg.pem b/tests/wpt/tests/signed-exchange/resources/127.0.0.1.sxg.pem similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/127.0.0.1.sxg.pem rename to tests/wpt/tests/signed-exchange/resources/127.0.0.1.sxg.pem diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/127.0.0.1.sxg.pem.cbor b/tests/wpt/tests/signed-exchange/resources/127.0.0.1.sxg.pem.cbor similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/127.0.0.1.sxg.pem.cbor rename to tests/wpt/tests/signed-exchange/resources/127.0.0.1.sxg.pem.cbor diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/127.0.0.1.sxg.pem.cbor.headers b/tests/wpt/tests/signed-exchange/resources/127.0.0.1.sxg.pem.cbor.headers similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/127.0.0.1.sxg.pem.cbor.headers rename to tests/wpt/tests/signed-exchange/resources/127.0.0.1.sxg.pem.cbor.headers diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/check-cert-request.py b/tests/wpt/tests/signed-exchange/resources/check-cert-request.py similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/check-cert-request.py rename to tests/wpt/tests/signed-exchange/resources/check-cert-request.py diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/failure.html b/tests/wpt/tests/signed-exchange/resources/failure.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/failure.html rename to tests/wpt/tests/signed-exchange/resources/failure.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-certs.sh b/tests/wpt/tests/signed-exchange/resources/generate-test-certs.sh similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-certs.sh rename to tests/wpt/tests/signed-exchange/resources/generate-test-certs.sh diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-sxgs.sh b/tests/wpt/tests/signed-exchange/resources/generate-test-sxgs.sh similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-sxgs.sh rename to tests/wpt/tests/signed-exchange/resources/generate-test-sxgs.sh diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/inner-url.html b/tests/wpt/tests/signed-exchange/resources/inner-url.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/inner-url.html rename to tests/wpt/tests/signed-exchange/resources/inner-url.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/invalid-cert-format.cbor b/tests/wpt/tests/signed-exchange/resources/invalid-cert-format.cbor similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/invalid-cert-format.cbor rename to tests/wpt/tests/signed-exchange/resources/invalid-cert-format.cbor diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/invalid-cert-format.cbor.headers b/tests/wpt/tests/signed-exchange/resources/invalid-cert-format.cbor.headers similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/invalid-cert-format.cbor.headers rename to tests/wpt/tests/signed-exchange/resources/invalid-cert-format.cbor.headers diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/prefetch-test-cert.py b/tests/wpt/tests/signed-exchange/resources/prefetch-test-cert.py similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/prefetch-test-cert.py rename to tests/wpt/tests/signed-exchange/resources/prefetch-test-cert.py diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/prefetch-test-sxg.py b/tests/wpt/tests/signed-exchange/resources/prefetch-test-sxg.py similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/prefetch-test-sxg.py rename to tests/wpt/tests/signed-exchange/resources/prefetch-test-sxg.py diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/register-sw-after-fallback.html b/tests/wpt/tests/signed-exchange/resources/register-sw-after-fallback.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/register-sw-after-fallback.html rename to tests/wpt/tests/signed-exchange/resources/register-sw-after-fallback.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/register-sw.html b/tests/wpt/tests/signed-exchange/resources/register-sw.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/register-sw.html rename to tests/wpt/tests/signed-exchange/resources/register-sw.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/service-worker.js b/tests/wpt/tests/signed-exchange/resources/service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/service-worker.js rename to tests/wpt/tests/signed-exchange/resources/service-worker.js diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-location.html b/tests/wpt/tests/signed-exchange/resources/sxg-location.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg-location.html rename to tests/wpt/tests/signed-exchange/resources/sxg-location.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-navigation-timing.html b/tests/wpt/tests/signed-exchange/resources/sxg-navigation-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg-navigation-timing.html rename to tests/wpt/tests/signed-exchange/resources/sxg-navigation-timing.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-prefetch-test.html b/tests/wpt/tests/signed-exchange/resources/sxg-prefetch-test.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg-prefetch-test.html rename to tests/wpt/tests/signed-exchange/resources/sxg-prefetch-test.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-iframe.html b/tests/wpt/tests/signed-exchange/resources/sxg-subresource-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-iframe.html rename to tests/wpt/tests/signed-exchange/resources/sxg-subresource-iframe.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-mismatch-iframe.html b/tests/wpt/tests/signed-exchange/resources/sxg-subresource-mismatch-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-mismatch-iframe.html rename to tests/wpt/tests/signed-exchange/resources/sxg-subresource-mismatch-iframe.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-script-inner.js b/tests/wpt/tests/signed-exchange/resources/sxg-subresource-script-inner.js similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-script-inner.js rename to tests/wpt/tests/signed-exchange/resources/sxg-subresource-script-inner.js diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-script.js b/tests/wpt/tests/signed-exchange/resources/sxg-subresource-script.js similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-script.js rename to tests/wpt/tests/signed-exchange/resources/sxg-subresource-script.js diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-sxg-inner.html b/tests/wpt/tests/signed-exchange/resources/sxg-subresource-sxg-inner.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg-subresource-sxg-inner.html rename to tests/wpt/tests/signed-exchange/resources/sxg-subresource-sxg-inner.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-util.js b/tests/wpt/tests/signed-exchange/resources/sxg-util.js similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg-util.js rename to tests/wpt/tests/signed-exchange/resources/sxg-util.js diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-version1b2.sxg b/tests/wpt/tests/signed-exchange/resources/sxg-version1b2.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg-version1b2.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg-version1b2.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg-version1b2.sxg.headers b/tests/wpt/tests/signed-exchange/resources/sxg-version1b2.sxg.headers similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg-version1b2.sxg.headers rename to tests/wpt/tests/signed-exchange/resources/sxg-version1b2.sxg.headers diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/__dir__.headers b/tests/wpt/tests/signed-exchange/resources/sxg/__dir__.headers similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/__dir__.headers rename to tests/wpt/tests/signed-exchange/resources/sxg/__dir__.headers diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/check-cert-request.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/check-cert-request.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/check-cert-request.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/check-cert-request.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/fallback-to-another-sxg.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/fallback-to-another-sxg.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/fallback-to-another-sxg.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/fallback-to-another-sxg.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/invalid-sxg-referrer-remote-origin.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/invalid-sxg-referrer-remote-origin.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/invalid-sxg-referrer-remote-origin.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/invalid-sxg-referrer-remote-origin.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/invalid-sxg-referrer-same-origin.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/invalid-sxg-referrer-same-origin.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/invalid-sxg-referrer-same-origin.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/invalid-sxg-referrer-same-origin.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/nested-sxg.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/nested-sxg.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/nested-sxg.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/nested-sxg.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/register-sw-after-fallback.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/register-sw-after-fallback.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/register-sw-after-fallback.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/register-sw-after-fallback.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/register-sw-from-sxg.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/register-sw-from-sxg.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/register-sw-from-sxg.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/register-sw-from-sxg.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-cert-not-found-on-alt-origin.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-cert-not-found-on-alt-origin.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-cert-not-found-on-alt-origin.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-cert-not-found-on-alt-origin.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-cert-not-found.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-cert-not-found.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-cert-not-found.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-cert-not-found.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-data-cert-url.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-data-cert-url.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-data-cert-url.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-data-cert-url.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-hsts.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-hsts.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-hsts.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-hsts.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-inner-url-bom.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-inner-url-bom.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-inner-url-bom.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-inner-url-bom.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-cert-format-on-alt-origin.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-cert-format-on-alt-origin.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-cert-format-on-alt-origin.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-cert-format-on-alt-origin.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-cert-format.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-cert-format.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-cert-format.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-cert-format.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-cert-sha256-cert-on-alt-origin.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-cert-sha256-cert-on-alt-origin.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-cert-sha256-cert-on-alt-origin.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-cert-sha256-cert-on-alt-origin.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-cert-sha256.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-cert-sha256.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-cert-sha256.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-cert-sha256.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-format.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-format.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-format.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-format.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-integrity-header.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-integrity-header.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-integrity-header.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-integrity-header.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-utf8-inner-url.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-utf8-inner-url.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-utf8-inner-url.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-utf8-inner-url.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-validity-url.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-validity-url.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-invalid-validity-url.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-invalid-validity-url.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-location-cert-on-alt-origin.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-location-cert-on-alt-origin.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-location-cert-on-alt-origin.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-location-cert-on-alt-origin.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-location.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-location.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-location.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-location.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-merkle-integrity-error.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-merkle-integrity-error.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-merkle-integrity-error.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-merkle-integrity-error.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-navigation-timing.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-navigation-timing.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-navigation-timing.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-navigation-timing.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-noncacheable.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-noncacheable.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-noncacheable.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-noncacheable.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-prefetch-test.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-prefetch-test.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-prefetch-test.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-prefetch-test.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-referrer-remote-origin.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-referrer-remote-origin.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-referrer-remote-origin.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-referrer-remote-origin.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-referrer-same-origin.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-referrer-same-origin.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-referrer-same-origin.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-referrer-same-origin.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg.sub.headers b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg.sub.headers rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-subresource-header-integrity-mismatch.sxg.sub.headers diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-script.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-subresource-script.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource-script.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-subresource-script.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-subresource.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-subresource.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource.sxg.sub.headers b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-subresource.sxg.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-subresource.sxg.sub.headers rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-subresource.sxg.sub.headers diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-utf8-inner-url.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-utf8-inner-url.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-utf8-inner-url.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-utf8-inner-url.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-validity-period-too-long-cert-on-alt-origin.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-validity-period-too-long-cert-on-alt-origin.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-validity-period-too-long-cert-on-alt-origin.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-validity-period-too-long-cert-on-alt-origin.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-validity-period-too-long.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-validity-period-too-long.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-validity-period-too-long.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-validity-period-too-long.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-variants-match.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-variants-match.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-variants-match.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-variants-match.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-variants-mismatch.sxg b/tests/wpt/tests/signed-exchange/resources/sxg/sxg-variants-mismatch.sxg similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-variants-mismatch.sxg rename to tests/wpt/tests/signed-exchange/resources/sxg/sxg-variants-mismatch.sxg diff --git a/tests/wpt/web-platform-tests/signed-exchange/service-workers/sxg-sw-register-after-fallback.tentative.https.html b/tests/wpt/tests/signed-exchange/service-workers/sxg-sw-register-after-fallback.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/service-workers/sxg-sw-register-after-fallback.tentative.https.html rename to tests/wpt/tests/signed-exchange/service-workers/sxg-sw-register-after-fallback.tentative.https.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/service-workers/sxg-sw-register.tentative.https.html b/tests/wpt/tests/signed-exchange/service-workers/sxg-sw-register.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/service-workers/sxg-sw-register.tentative.https.html rename to tests/wpt/tests/signed-exchange/service-workers/sxg-sw-register.tentative.https.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html b/tests/wpt/tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html rename to tests/wpt/tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource.tentative.html b/tests/wpt/tests/signed-exchange/subresource/sxg-subresource.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/subresource/sxg-subresource.tentative.html rename to tests/wpt/tests/signed-exchange/subresource/sxg-subresource.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-data-cert-url.tentative.html b/tests/wpt/tests/signed-exchange/sxg-data-cert-url.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-data-cert-url.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-data-cert-url.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-double-prefetch.tentative.html b/tests/wpt/tests/signed-exchange/sxg-double-prefetch.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-double-prefetch.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-double-prefetch.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-fallback-with-fragment.tentative.html b/tests/wpt/tests/signed-exchange/sxg-fallback-with-fragment.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-fallback-with-fragment.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-fallback-with-fragment.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-hsts.tentative.html b/tests/wpt/tests/signed-exchange/sxg-hsts.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-hsts.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-hsts.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-inner-url-bom.tentative.html b/tests/wpt/tests/signed-exchange/sxg-inner-url-bom.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-inner-url-bom.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-inner-url-bom.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-invalid-utf8-inner-url.tentative.html b/tests/wpt/tests/signed-exchange/sxg-invalid-utf8-inner-url.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-invalid-utf8-inner-url.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-invalid-utf8-inner-url.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-invalid-validity-url.tentative.html b/tests/wpt/tests/signed-exchange/sxg-invalid-validity-url.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-invalid-validity-url.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-invalid-validity-url.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-location-fragment.tentative.html b/tests/wpt/tests/signed-exchange/sxg-location-fragment.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-location-fragment.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-location-fragment.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-location.tentative.html b/tests/wpt/tests/signed-exchange/sxg-location.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-location.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-location.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-merkle-integrity-error.tentative.html b/tests/wpt/tests/signed-exchange/sxg-merkle-integrity-error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-merkle-integrity-error.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-merkle-integrity-error.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-navigation-timing.tentative.html b/tests/wpt/tests/signed-exchange/sxg-navigation-timing.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-navigation-timing.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-navigation-timing.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-non-secure-origin.tentative.html b/tests/wpt/tests/signed-exchange/sxg-non-secure-origin.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-non-secure-origin.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-non-secure-origin.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-noncacheable.tentative.html b/tests/wpt/tests/signed-exchange/sxg-noncacheable.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-noncacheable.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-noncacheable.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-prefetch-merkle-integrity-error.tentative.html b/tests/wpt/tests/signed-exchange/sxg-prefetch-merkle-integrity-error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-prefetch-merkle-integrity-error.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-prefetch-merkle-integrity-error.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-prefetch-resource-timing.tentative.html b/tests/wpt/tests/signed-exchange/sxg-prefetch-resource-timing.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-prefetch-resource-timing.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-prefetch-resource-timing.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-prefetch.tentative.https.html b/tests/wpt/tests/signed-exchange/sxg-prefetch.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-prefetch.tentative.https.html rename to tests/wpt/tests/signed-exchange/sxg-prefetch.tentative.https.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-referrer-policy-header.tentative.https.html b/tests/wpt/tests/signed-exchange/sxg-referrer-policy-header.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-referrer-policy-header.tentative.https.html rename to tests/wpt/tests/signed-exchange/sxg-referrer-policy-header.tentative.https.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-referrer-remote-physical-remote-logical.tentative.https.html b/tests/wpt/tests/signed-exchange/sxg-referrer-remote-physical-remote-logical.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-referrer-remote-physical-remote-logical.tentative.https.html rename to tests/wpt/tests/signed-exchange/sxg-referrer-remote-physical-remote-logical.tentative.https.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-referrer-remote-physical-same-logical.tentative.https.html b/tests/wpt/tests/signed-exchange/sxg-referrer-remote-physical-same-logical.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-referrer-remote-physical-same-logical.tentative.https.html rename to tests/wpt/tests/signed-exchange/sxg-referrer-remote-physical-same-logical.tentative.https.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-referrer-same-physical-remote-logical.tentative.https.html b/tests/wpt/tests/signed-exchange/sxg-referrer-same-physical-remote-logical.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-referrer-same-physical-remote-logical.tentative.https.html rename to tests/wpt/tests/signed-exchange/sxg-referrer-same-physical-remote-logical.tentative.https.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-referrer-same-physical-same-logical.tentative.https.html b/tests/wpt/tests/signed-exchange/sxg-referrer-same-physical-same-logical.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-referrer-same-physical-same-logical.tentative.https.html rename to tests/wpt/tests/signed-exchange/sxg-referrer-same-physical-same-logical.tentative.https.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-utf8-inner-url.tentative.html b/tests/wpt/tests/signed-exchange/sxg-utf8-inner-url.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-utf8-inner-url.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-utf8-inner-url.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-variants-match.tentative.html b/tests/wpt/tests/signed-exchange/sxg-variants-match.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-variants-match.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-variants-match.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-variants-mismatch.tentative.html b/tests/wpt/tests/signed-exchange/sxg-variants-mismatch.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-variants-mismatch.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-variants-mismatch.tentative.html diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-version1b2.tentative.html b/tests/wpt/tests/signed-exchange/sxg-version1b2.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/signed-exchange/sxg-version1b2.tentative.html rename to tests/wpt/tests/signed-exchange/sxg-version1b2.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/back.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/back.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/back.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/back.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/dropped-entries.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/dropped-entries.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/dropped-entries.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/dropped-entries.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/hash.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/hash.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/hash.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/hash.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/image-lcp-followed-by-image-softnav-lcp.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/image-lcp-followed-by-image-softnav-lcp.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/image-lcp-followed-by-image-softnav-lcp.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/image-lcp-followed-by-image-softnav-lcp.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/image-lcp-followed-by-text-softnav-lcp.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/image-lcp-followed-by-text-softnav-lcp.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/image-lcp-followed-by-text-softnav-lcp.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/image-lcp-followed-by-text-softnav-lcp.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/image-lcp-followed-by-two-image-softnavs-lcp.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/image-lcp-followed-by-two-image-softnavs-lcp.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/image-lcp-followed-by-two-image-softnavs-lcp.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/image-lcp-followed-by-two-image-softnavs-lcp.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/multiple-paint-entries-buffered.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/multiple-paint-entries-buffered.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/multiple-paint-entries-buffered.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/multiple-paint-entries-buffered.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/navigate-child.html b/tests/wpt/tests/soft-navigation-heuristics/navigate-child.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/navigate-child.html rename to tests/wpt/tests/soft-navigation-heuristics/navigate-child.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-after-transition-commit.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/navigation-api-after-transition-commit.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-after-transition-commit.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/navigation-api-after-transition-commit.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-back.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/navigation-api-back.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-back.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/navigation-api-back.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-forward.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/navigation-api-forward.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-forward.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/navigation-api-forward.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-hash.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/navigation-api-hash.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-hash.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/navigation-api-hash.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-preventDefault.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/navigation-api-preventDefault.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-preventDefault.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/navigation-api-preventDefault.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-rejected.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/navigation-api-rejected.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-rejected.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/navigation-api-rejected.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-traverseto.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/navigation-api-traverseto.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-traverseto.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/navigation-api-traverseto.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-view-transition.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/navigation-api-view-transition.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api-view-transition.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/navigation-api-view-transition.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/navigation-api.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/navigation-api.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/navigation-api.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/popstate.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/popstate.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/popstate.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/popstate.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/replacestate-null-then-push.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/replacestate-null-then-push.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/replacestate-null-then-push.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/replacestate-null-then-push.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/replacestate.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/replacestate.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/replacestate.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/replacestate.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/resources/empty.html b/tests/wpt/tests/soft-navigation-heuristics/resources/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/resources/empty.html rename to tests/wpt/tests/soft-navigation-heuristics/resources/empty.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/resources/soft-navigation-helper.js b/tests/wpt/tests/soft-navigation-heuristics/resources/soft-navigation-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/resources/soft-navigation-helper.js rename to tests/wpt/tests/soft-navigation-heuristics/resources/soft-navigation-helper.js diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/soft-navigation-detection-main-descendent.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/soft-navigation-detection-main-descendent.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/soft-navigation-detection-main-descendent.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/soft-navigation-detection-main-descendent.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/soft-navigation-detection-non-main.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/soft-navigation-detection-non-main.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/soft-navigation-detection-non-main.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/soft-navigation-detection-non-main.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/soft-navigation-detection-web-component-lifecycle.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/soft-navigation-detection-web-component-lifecycle.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/soft-navigation-detection-web-component-lifecycle.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/soft-navigation-detection-web-component-lifecycle.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/soft-navigation-detection.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/soft-navigation-detection.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/soft-navigation-detection.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/soft-navigation-detection.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/soft-navigation-no-url.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/soft-navigation-no-url.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/soft-navigation-no-url.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/soft-navigation-no-url.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/supported-entry-types.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/supported-entry-types.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/supported-entry-types.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/supported-entry-types.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/text-lcp-followed-by-image-softnav-lcp.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/text-lcp-followed-by-image-softnav-lcp.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/text-lcp-followed-by-image-softnav-lcp.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/text-lcp-followed-by-image-softnav-lcp.tentative.html diff --git a/tests/wpt/web-platform-tests/soft-navigation-heuristics/text-lcp-followed-by-text-softnav-lcp.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/text-lcp-followed-by-text-softnav-lcp.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/soft-navigation-heuristics/text-lcp-followed-by-text-softnav-lcp.tentative.html rename to tests/wpt/tests/soft-navigation-heuristics/text-lcp-followed-by-text-softnav-lcp.tentative.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/anonymous-client.https.html b/tests/wpt/tests/speculation-rules/prefetch/anonymous-client.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/anonymous-client.https.html rename to tests/wpt/tests/speculation-rules/prefetch/anonymous-client.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/cross-origin-cookies.https.html b/tests/wpt/tests/speculation-rules/prefetch/cross-origin-cookies.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/cross-origin-cookies.https.html rename to tests/wpt/tests/speculation-rules/prefetch/cross-origin-cookies.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/different-initiators-2.https.html b/tests/wpt/tests/speculation-rules/prefetch/different-initiators-2.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/different-initiators-2.https.html rename to tests/wpt/tests/speculation-rules/prefetch/different-initiators-2.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/different-initiators.sub.https.html b/tests/wpt/tests/speculation-rules/prefetch/different-initiators.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/different-initiators.sub.https.html rename to tests/wpt/tests/speculation-rules/prefetch/different-initiators.sub.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/document-rules.https.html b/tests/wpt/tests/speculation-rules/prefetch/document-rules.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/document-rules.https.html rename to tests/wpt/tests/speculation-rules/prefetch/document-rules.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/duplicate-urls.https.html b/tests/wpt/tests/speculation-rules/prefetch/duplicate-urls.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/duplicate-urls.https.html rename to tests/wpt/tests/speculation-rules/prefetch/duplicate-urls.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/initiators-a-element.sub.https.html b/tests/wpt/tests/speculation-rules/prefetch/initiators-a-element.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/initiators-a-element.sub.https.html rename to tests/wpt/tests/speculation-rules/prefetch/initiators-a-element.sub.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/initiators-iframe-location-href.sub.https.html b/tests/wpt/tests/speculation-rules/prefetch/initiators-iframe-location-href.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/initiators-iframe-location-href.sub.https.html rename to tests/wpt/tests/speculation-rules/prefetch/initiators-iframe-location-href.sub.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/initiators-window-open.sub.https.html b/tests/wpt/tests/speculation-rules/prefetch/initiators-window-open.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/initiators-window-open.sub.https.html rename to tests/wpt/tests/speculation-rules/prefetch/initiators-window-open.sub.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/invalid-rules.https.html b/tests/wpt/tests/speculation-rules/prefetch/invalid-rules.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/invalid-rules.https.html rename to tests/wpt/tests/speculation-rules/prefetch/invalid-rules.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/multiple-url.https.html b/tests/wpt/tests/speculation-rules/prefetch/multiple-url.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/multiple-url.https.html rename to tests/wpt/tests/speculation-rules/prefetch/multiple-url.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/navigation-timing-delivery-type.https.html b/tests/wpt/tests/speculation-rules/prefetch/navigation-timing-delivery-type.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/navigation-timing-delivery-type.https.html rename to tests/wpt/tests/speculation-rules/prefetch/navigation-timing-delivery-type.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/navigation-timing-requestStart-responseStart.https.html b/tests/wpt/tests/speculation-rules/prefetch/navigation-timing-requestStart-responseStart.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/navigation-timing-requestStart-responseStart.https.html rename to tests/wpt/tests/speculation-rules/prefetch/navigation-timing-requestStart-responseStart.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/navigation-timing-sizes.https.html b/tests/wpt/tests/speculation-rules/prefetch/navigation-timing-sizes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/navigation-timing-sizes.https.html rename to tests/wpt/tests/speculation-rules/prefetch/navigation-timing-sizes.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/no-vary-search/README.txt b/tests/wpt/tests/speculation-rules/prefetch/no-vary-search/README.txt similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/no-vary-search/README.txt rename to tests/wpt/tests/speculation-rules/prefetch/no-vary-search/README.txt diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/no-vary-search/prefetch-single-with-hint.https.html b/tests/wpt/tests/speculation-rules/prefetch/no-vary-search/prefetch-single-with-hint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/no-vary-search/prefetch-single-with-hint.https.html rename to tests/wpt/tests/speculation-rules/prefetch/no-vary-search/prefetch-single-with-hint.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/no-vary-search/prefetch-single.https.html b/tests/wpt/tests/speculation-rules/prefetch/no-vary-search/prefetch-single.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/no-vary-search/prefetch-single.https.html rename to tests/wpt/tests/speculation-rules/prefetch/no-vary-search/prefetch-single.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/out-of-document-rule-set.https.html b/tests/wpt/tests/speculation-rules/prefetch/out-of-document-rule-set.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/out-of-document-rule-set.https.html rename to tests/wpt/tests/speculation-rules/prefetch/out-of-document-rule-set.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/prefetch-single.https.html b/tests/wpt/tests/speculation-rules/prefetch/prefetch-single.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/prefetch-single.https.html rename to tests/wpt/tests/speculation-rules/prefetch/prefetch-single.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/prefetch-status.https.html b/tests/wpt/tests/speculation-rules/prefetch/prefetch-status.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/prefetch-status.https.html rename to tests/wpt/tests/speculation-rules/prefetch/prefetch-status.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/prefetch-traverse-reload.sub.html b/tests/wpt/tests/speculation-rules/prefetch/prefetch-traverse-reload.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/prefetch-traverse-reload.sub.html rename to tests/wpt/tests/speculation-rules/prefetch/prefetch-traverse-reload.sub.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/redirect-url.sub.https.html b/tests/wpt/tests/speculation-rules/prefetch/redirect-url.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/redirect-url.sub.https.html rename to tests/wpt/tests/speculation-rules/prefetch/redirect-url.sub.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/referrer-policy-from-rules.https.html b/tests/wpt/tests/speculation-rules/prefetch/referrer-policy-from-rules.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/referrer-policy-from-rules.https.html rename to tests/wpt/tests/speculation-rules/prefetch/referrer-policy-from-rules.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/referrer-policy-not-accepted.https.html b/tests/wpt/tests/speculation-rules/prefetch/referrer-policy-not-accepted.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/referrer-policy-not-accepted.https.html rename to tests/wpt/tests/speculation-rules/prefetch/referrer-policy-not-accepted.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/referrer-policy.https.html b/tests/wpt/tests/speculation-rules/prefetch/referrer-policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/referrer-policy.https.html rename to tests/wpt/tests/speculation-rules/prefetch/referrer-policy.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/authenticate.py b/tests/wpt/tests/speculation-rules/prefetch/resources/authenticate.py similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/authenticate.py rename to tests/wpt/tests/speculation-rules/prefetch/resources/authenticate.py diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/cookies.py b/tests/wpt/tests/speculation-rules/prefetch/resources/cookies.py similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/cookies.py rename to tests/wpt/tests/speculation-rules/prefetch/resources/cookies.py diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/executor.sub.html b/tests/wpt/tests/speculation-rules/prefetch/resources/executor.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/executor.sub.html rename to tests/wpt/tests/speculation-rules/prefetch/resources/executor.sub.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/prefetch.py b/tests/wpt/tests/speculation-rules/prefetch/resources/prefetch.py similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/prefetch.py rename to tests/wpt/tests/speculation-rules/prefetch/resources/prefetch.py diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/prefetch_nvs_hint.py b/tests/wpt/tests/speculation-rules/prefetch/resources/prefetch_nvs_hint.py similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/prefetch_nvs_hint.py rename to tests/wpt/tests/speculation-rules/prefetch/resources/prefetch_nvs_hint.py diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/ruleset.py b/tests/wpt/tests/speculation-rules/prefetch/resources/ruleset.py similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/ruleset.py rename to tests/wpt/tests/speculation-rules/prefetch/resources/ruleset.py diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/sw.js b/tests/wpt/tests/speculation-rules/prefetch/resources/sw.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/sw.js rename to tests/wpt/tests/speculation-rules/prefetch/resources/sw.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/utils.sub.js b/tests/wpt/tests/speculation-rules/prefetch/resources/utils.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/resources/utils.sub.js rename to tests/wpt/tests/speculation-rules/prefetch/resources/utils.sub.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/same-origin-cookies.https.html b/tests/wpt/tests/speculation-rules/prefetch/same-origin-cookies.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/same-origin-cookies.https.html rename to tests/wpt/tests/speculation-rules/prefetch/same-origin-cookies.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prefetch/user-pass.https.html b/tests/wpt/tests/speculation-rules/prefetch/user-pass.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prefetch/user-pass.https.html rename to tests/wpt/tests/speculation-rules/prefetch/user-pass.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/about-blank-iframes.html b/tests/wpt/tests/speculation-rules/prerender/about-blank-iframes.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/about-blank-iframes.html rename to tests/wpt/tests/speculation-rules/prerender/about-blank-iframes.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/accept-client-hint-cache.https.html b/tests/wpt/tests/speculation-rules/prerender/accept-client-hint-cache.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/accept-client-hint-cache.https.html rename to tests/wpt/tests/speculation-rules/prerender/accept-client-hint-cache.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/activation-start.html b/tests/wpt/tests/speculation-rules/prerender/activation-start.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/activation-start.html rename to tests/wpt/tests/speculation-rules/prerender/activation-start.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/blob_object_url.html b/tests/wpt/tests/speculation-rules/prerender/blob_object_url.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/blob_object_url.html rename to tests/wpt/tests/speculation-rules/prerender/blob_object_url.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/cache-storage.https.html b/tests/wpt/tests/speculation-rules/prerender/cache-storage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/cache-storage.https.html rename to tests/wpt/tests/speculation-rules/prerender/cache-storage.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/clients-matchall.https.html b/tests/wpt/tests/speculation-rules/prerender/clients-matchall.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/clients-matchall.https.html rename to tests/wpt/tests/speculation-rules/prerender/clients-matchall.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/cookies.https.html b/tests/wpt/tests/speculation-rules/prerender/cookies.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/cookies.https.html rename to tests/wpt/tests/speculation-rules/prerender/cookies.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/credentialed-prerender-not-opt-in.html b/tests/wpt/tests/speculation-rules/prerender/credentialed-prerender-not-opt-in.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/credentialed-prerender-not-opt-in.html rename to tests/wpt/tests/speculation-rules/prerender/credentialed-prerender-not-opt-in.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/credentialed-prerender-opt-in.html b/tests/wpt/tests/speculation-rules/prerender/credentialed-prerender-opt-in.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/credentialed-prerender-opt-in.html rename to tests/wpt/tests/speculation-rules/prerender/credentialed-prerender-opt-in.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/cross-origin-iframe.html b/tests/wpt/tests/speculation-rules/prerender/cross-origin-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/cross-origin-iframe.html rename to tests/wpt/tests/speculation-rules/prerender/cross-origin-iframe.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/cross-origin-isolated.https.html b/tests/wpt/tests/speculation-rules/prerender/cross-origin-isolated.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/cross-origin-isolated.https.html rename to tests/wpt/tests/speculation-rules/prerender/cross-origin-isolated.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-elem-inline-speculation-rules.html b/tests/wpt/tests/speculation-rules/prerender/csp-script-src-elem-inline-speculation-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-elem-inline-speculation-rules.html rename to tests/wpt/tests/speculation-rules/prerender/csp-script-src-elem-inline-speculation-rules.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-inline-speculation-rules.html b/tests/wpt/tests/speculation-rules/prerender/csp-script-src-inline-speculation-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-inline-speculation-rules.html rename to tests/wpt/tests/speculation-rules/prerender/csp-script-src-inline-speculation-rules.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-self.html b/tests/wpt/tests/speculation-rules/prerender/csp-script-src-self.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-self.html rename to tests/wpt/tests/speculation-rules/prerender/csp-script-src-self.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-strict-dynamic.html b/tests/wpt/tests/speculation-rules/prerender/csp-script-src-strict-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-strict-dynamic.html rename to tests/wpt/tests/speculation-rules/prerender/csp-script-src-strict-dynamic.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-unsafe-inline.html b/tests/wpt/tests/speculation-rules/prerender/csp-script-src-unsafe-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/csp-script-src-unsafe-inline.html rename to tests/wpt/tests/speculation-rules/prerender/csp-script-src-unsafe-inline.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/fetch-blob.html b/tests/wpt/tests/speculation-rules/prerender/fetch-blob.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/fetch-blob.html rename to tests/wpt/tests/speculation-rules/prerender/fetch-blob.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/fetch-intercepted-by-service-worker.https.html b/tests/wpt/tests/speculation-rules/prerender/fetch-intercepted-by-service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/fetch-intercepted-by-service-worker.https.html rename to tests/wpt/tests/speculation-rules/prerender/fetch-intercepted-by-service-worker.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/iframe-added-post-activation.html b/tests/wpt/tests/speculation-rules/prerender/iframe-added-post-activation.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/iframe-added-post-activation.html rename to tests/wpt/tests/speculation-rules/prerender/iframe-added-post-activation.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/indexeddb.html b/tests/wpt/tests/speculation-rules/prerender/indexeddb.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/indexeddb.html rename to tests/wpt/tests/speculation-rules/prerender/indexeddb.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/local-storage.html b/tests/wpt/tests/speculation-rules/prerender/local-storage.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/local-storage.html rename to tests/wpt/tests/speculation-rules/prerender/local-storage.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/main-frame-navigation.https.html b/tests/wpt/tests/speculation-rules/prerender/main-frame-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/main-frame-navigation.https.html rename to tests/wpt/tests/speculation-rules/prerender/main-frame-navigation.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/media-autoplay.html b/tests/wpt/tests/speculation-rules/prerender/media-autoplay.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/media-autoplay.html rename to tests/wpt/tests/speculation-rules/prerender/media-autoplay.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/navigation-intercepted-by-service-worker.https.html b/tests/wpt/tests/speculation-rules/prerender/navigation-intercepted-by-service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/navigation-intercepted-by-service-worker.https.html rename to tests/wpt/tests/speculation-rules/prerender/navigation-intercepted-by-service-worker.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/navigator-plugins.html b/tests/wpt/tests/speculation-rules/prerender/navigator-plugins.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/navigator-plugins.html rename to tests/wpt/tests/speculation-rules/prerender/navigator-plugins.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/prefetch.https.html b/tests/wpt/tests/speculation-rules/prerender/prefetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/prefetch.https.html rename to tests/wpt/tests/speculation-rules/prerender/prefetch.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/referrer-policy-from-rules.html b/tests/wpt/tests/speculation-rules/prerender/referrer-policy-from-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/referrer-policy-from-rules.html rename to tests/wpt/tests/speculation-rules/prerender/referrer-policy-from-rules.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/referrer-policy-mismatch.html b/tests/wpt/tests/speculation-rules/prerender/referrer-policy-mismatch.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/referrer-policy-mismatch.html rename to tests/wpt/tests/speculation-rules/prerender/referrer-policy-mismatch.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/referrer-policy-no-referrer.html b/tests/wpt/tests/speculation-rules/prerender/referrer-policy-no-referrer.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/referrer-policy-no-referrer.html rename to tests/wpt/tests/speculation-rules/prerender/referrer-policy-no-referrer.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/referrer-policy-origin.html b/tests/wpt/tests/speculation-rules/prerender/referrer-policy-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/referrer-policy-origin.html rename to tests/wpt/tests/speculation-rules/prerender/referrer-policy-origin.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/referrer-policy-strict-origin.html b/tests/wpt/tests/speculation-rules/prerender/referrer-policy-strict-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/referrer-policy-strict-origin.html rename to tests/wpt/tests/speculation-rules/prerender/referrer-policy-strict-origin.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/referrer.html b/tests/wpt/tests/speculation-rules/prerender/referrer.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/referrer.html rename to tests/wpt/tests/speculation-rules/prerender/referrer.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/register-service-worker.https.html b/tests/wpt/tests/speculation-rules/prerender/register-service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/register-service-worker.https.html rename to tests/wpt/tests/speculation-rules/prerender/register-service-worker.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/remove-script-element.html b/tests/wpt/tests/speculation-rules/prerender/remove-script-element.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/remove-script-element.html rename to tests/wpt/tests/speculation-rules/prerender/remove-script-element.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/about-blank-iframes.html b/tests/wpt/tests/speculation-rules/prerender/resources/about-blank-iframes.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/about-blank-iframes.html rename to tests/wpt/tests/speculation-rules/prerender/resources/about-blank-iframes.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/accept-ch.html b/tests/wpt/tests/speculation-rules/prerender/resources/accept-ch.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/accept-ch.html rename to tests/wpt/tests/speculation-rules/prerender/resources/accept-ch.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/accept-ch.html.headers b/tests/wpt/tests/speculation-rules/prerender/resources/accept-ch.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/accept-ch.html.headers rename to tests/wpt/tests/speculation-rules/prerender/resources/accept-ch.html.headers diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/audio-setSinkId.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/audio-setSinkId.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/audio-setSinkId.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/audio-setSinkId.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/background-fetch.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/background-fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/background-fetch.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/background-fetch.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/background-sync.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/background-sync.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/background-sync.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/background-sync.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/battery-status.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/battery-status.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/battery-status.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/battery-status.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/bear-av1-opus.mp4 b/tests/wpt/tests/speculation-rules/prerender/resources/bear-av1-opus.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/bear-av1-opus.mp4 rename to tests/wpt/tests/speculation-rules/prerender/resources/bear-av1-opus.mp4 diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/bluetooth-access.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/bluetooth-access.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/bluetooth-access.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/bluetooth-access.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/broadcast-channel.html b/tests/wpt/tests/speculation-rules/prerender/resources/broadcast-channel.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/broadcast-channel.html rename to tests/wpt/tests/speculation-rules/prerender/resources/broadcast-channel.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/cache.txt b/tests/wpt/tests/speculation-rules/prerender/resources/cache.txt similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/cache.txt rename to tests/wpt/tests/speculation-rules/prerender/resources/cache.txt diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/clients-matchall-service-worker.js b/tests/wpt/tests/speculation-rules/prerender/resources/clients-matchall-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/clients-matchall-service-worker.js rename to tests/wpt/tests/speculation-rules/prerender/resources/clients-matchall-service-worker.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/cross-origin-iframe-src.html b/tests/wpt/tests/speculation-rules/prerender/resources/cross-origin-iframe-src.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/cross-origin-iframe-src.html rename to tests/wpt/tests/speculation-rules/prerender/resources/cross-origin-iframe-src.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/cross-origin-iframe.html b/tests/wpt/tests/speculation-rules/prerender/resources/cross-origin-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/cross-origin-iframe.html rename to tests/wpt/tests/speculation-rules/prerender/resources/cross-origin-iframe.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/cross-origin-isolated-iframe.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/cross-origin-isolated-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/cross-origin-isolated-iframe.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/cross-origin-isolated-iframe.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/cross-origin-isolated-iframe.https.html.headers b/tests/wpt/tests/speculation-rules/prerender/resources/cross-origin-isolated-iframe.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/cross-origin-isolated-iframe.https.html.headers rename to tests/wpt/tests/speculation-rules/prerender/resources/cross-origin-isolated-iframe.https.html.headers diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/cross-origin-isolated.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/cross-origin-isolated.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/cross-origin-isolated.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/cross-origin-isolated.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/cross-origin-isolated.https.html.headers b/tests/wpt/tests/speculation-rules/prerender/resources/cross-origin-isolated.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/cross-origin-isolated.https.html.headers rename to tests/wpt/tests/speculation-rules/prerender/resources/cross-origin-isolated.https.html.headers diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-elem-inline-speculation-rules.html b/tests/wpt/tests/speculation-rules/prerender/resources/csp-script-src-elem-inline-speculation-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-elem-inline-speculation-rules.html rename to tests/wpt/tests/speculation-rules/prerender/resources/csp-script-src-elem-inline-speculation-rules.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-inline-speculation-rules.html b/tests/wpt/tests/speculation-rules/prerender/resources/csp-script-src-inline-speculation-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-inline-speculation-rules.html rename to tests/wpt/tests/speculation-rules/prerender/resources/csp-script-src-inline-speculation-rules.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-self.html b/tests/wpt/tests/speculation-rules/prerender/resources/csp-script-src-self.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-self.html rename to tests/wpt/tests/speculation-rules/prerender/resources/csp-script-src-self.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-strict-dynamic.html b/tests/wpt/tests/speculation-rules/prerender/resources/csp-script-src-strict-dynamic.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-strict-dynamic.html rename to tests/wpt/tests/speculation-rules/prerender/resources/csp-script-src-strict-dynamic.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-unsafe-inline.html b/tests/wpt/tests/speculation-rules/prerender/resources/csp-script-src-unsafe-inline.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src-unsafe-inline.html rename to tests/wpt/tests/speculation-rules/prerender/resources/csp-script-src-unsafe-inline.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src.js b/tests/wpt/tests/speculation-rules/prerender/resources/csp-script-src.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/csp-script-src.js rename to tests/wpt/tests/speculation-rules/prerender/resources/csp-script-src.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/dedicated-worker.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/dedicated-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/dedicated-worker.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/dedicated-worker.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/dedicated-worker.js b/tests/wpt/tests/speculation-rules/prerender/resources/dedicated-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/dedicated-worker.js rename to tests/wpt/tests/speculation-rules/prerender/resources/dedicated-worker.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/deferred-promise-utils.js b/tests/wpt/tests/speculation-rules/prerender/resources/deferred-promise-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/deferred-promise-utils.js rename to tests/wpt/tests/speculation-rules/prerender/resources/deferred-promise-utils.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/deprecated-broadcast-channel.py b/tests/wpt/tests/speculation-rules/prerender/resources/deprecated-broadcast-channel.py similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/deprecated-broadcast-channel.py rename to tests/wpt/tests/speculation-rules/prerender/resources/deprecated-broadcast-channel.py diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/do-nothing-worker.js b/tests/wpt/tests/speculation-rules/prerender/resources/do-nothing-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/do-nothing-worker.js rename to tests/wpt/tests/speculation-rules/prerender/resources/do-nothing-worker.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/echo-client-hints-received.py b/tests/wpt/tests/speculation-rules/prerender/resources/echo-client-hints-received.py similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/echo-client-hints-received.py rename to tests/wpt/tests/speculation-rules/prerender/resources/echo-client-hints-received.py diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/echo-prerender-page-client-hints-received.py b/tests/wpt/tests/speculation-rules/prerender/resources/echo-prerender-page-client-hints-received.py similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/echo-prerender-page-client-hints-received.py rename to tests/wpt/tests/speculation-rules/prerender/resources/echo-prerender-page-client-hints-received.py diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/echo-referrer.py b/tests/wpt/tests/speculation-rules/prerender/resources/echo-referrer.py similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/echo-referrer.py rename to tests/wpt/tests/speculation-rules/prerender/resources/echo-referrer.py diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/echo-subresource-client-hints-received.py b/tests/wpt/tests/speculation-rules/prerender/resources/echo-subresource-client-hints-received.py similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/echo-subresource-client-hints-received.py rename to tests/wpt/tests/speculation-rules/prerender/resources/echo-subresource-client-hints-received.py diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/empty.html b/tests/wpt/tests/speculation-rules/prerender/resources/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/empty.html rename to tests/wpt/tests/speculation-rules/prerender/resources/empty.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/encrypted-media.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/encrypted-media.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/encrypted-media.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/encrypted-media.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/exec.html b/tests/wpt/tests/speculation-rules/prerender/resources/exec.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/exec.html rename to tests/wpt/tests/speculation-rules/prerender/resources/exec.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/exec.py b/tests/wpt/tests/speculation-rules/prerender/resources/exec.py similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/exec.py rename to tests/wpt/tests/speculation-rules/prerender/resources/exec.py diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/fetch-intercept-worker.js b/tests/wpt/tests/speculation-rules/prerender/resources/fetch-intercept-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/fetch-intercept-worker.js rename to tests/wpt/tests/speculation-rules/prerender/resources/fetch-intercept-worker.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/fetch-intercepted-by-service-worker.html b/tests/wpt/tests/speculation-rules/prerender/resources/fetch-intercepted-by-service-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/fetch-intercepted-by-service-worker.html rename to tests/wpt/tests/speculation-rules/prerender/resources/fetch-intercepted-by-service-worker.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/file-picker.html b/tests/wpt/tests/speculation-rules/prerender/resources/file-picker.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/file-picker.html rename to tests/wpt/tests/speculation-rules/prerender/resources/file-picker.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/generic-sensor.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/generic-sensor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/generic-sensor.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/generic-sensor.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/idle-detection.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/idle-detection.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/idle-detection.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/idle-detection.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/iframe-added-post-activation.html b/tests/wpt/tests/speculation-rules/prerender/resources/iframe-added-post-activation.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/iframe-added-post-activation.html rename to tests/wpt/tests/speculation-rules/prerender/resources/iframe-added-post-activation.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/indexedb-utils.js b/tests/wpt/tests/speculation-rules/prerender/resources/indexedb-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/indexedb-utils.js rename to tests/wpt/tests/speculation-rules/prerender/resources/indexedb-utils.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/key-value-store.py b/tests/wpt/tests/speculation-rules/prerender/resources/key-value-store.py similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/key-value-store.py rename to tests/wpt/tests/speculation-rules/prerender/resources/key-value-store.py diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/main-frame-navigation.html b/tests/wpt/tests/speculation-rules/prerender/resources/main-frame-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/main-frame-navigation.html rename to tests/wpt/tests/speculation-rules/prerender/resources/main-frame-navigation.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/media-autoplay-attribute.html b/tests/wpt/tests/speculation-rules/prerender/resources/media-autoplay-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/media-autoplay-attribute.html rename to tests/wpt/tests/speculation-rules/prerender/resources/media-autoplay-attribute.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/media-device-info.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/media-device-info.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/media-device-info.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/media-device-info.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/media-devices-access.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/media-devices-access.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/media-devices-access.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/media-devices-access.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/media-play.html b/tests/wpt/tests/speculation-rules/prerender/resources/media-play.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/media-play.html rename to tests/wpt/tests/speculation-rules/prerender/resources/media-play.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/message-boxes.html b/tests/wpt/tests/speculation-rules/prerender/resources/message-boxes.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/message-boxes.html rename to tests/wpt/tests/speculation-rules/prerender/resources/message-boxes.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/midi.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/midi.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/midi.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/midi.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/navigator-plugins.html b/tests/wpt/tests/speculation-rules/prerender/resources/navigator-plugins.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/navigator-plugins.html rename to tests/wpt/tests/speculation-rules/prerender/resources/navigator-plugins.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/notification-before-activation.html b/tests/wpt/tests/speculation-rules/prerender/resources/notification-before-activation.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/notification-before-activation.html rename to tests/wpt/tests/speculation-rules/prerender/resources/notification-before-activation.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/notification-on-activation.html b/tests/wpt/tests/speculation-rules/prerender/resources/notification-on-activation.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/notification-on-activation.html rename to tests/wpt/tests/speculation-rules/prerender/resources/notification-on-activation.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/post-message-prerendering-completion-notification.html b/tests/wpt/tests/speculation-rules/prerender/resources/post-message-prerendering-completion-notification.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/post-message-prerendering-completion-notification.html rename to tests/wpt/tests/speculation-rules/prerender/resources/post-message-prerendering-completion-notification.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/postmessage-to-client-worker.js b/tests/wpt/tests/speculation-rules/prerender/resources/postmessage-to-client-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/postmessage-to-client-worker.js rename to tests/wpt/tests/speculation-rules/prerender/resources/postmessage-to-client-worker.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/postmessage-to-service-worker.html b/tests/wpt/tests/speculation-rules/prerender/resources/postmessage-to-service-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/postmessage-to-service-worker.html rename to tests/wpt/tests/speculation-rules/prerender/resources/postmessage-to-service-worker.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/prerender-response-code.html b/tests/wpt/tests/speculation-rules/prerender/resources/prerender-response-code.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/prerender-response-code.html rename to tests/wpt/tests/speculation-rules/prerender/resources/prerender-response-code.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/prerender-state.html b/tests/wpt/tests/speculation-rules/prerender/resources/prerender-state.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/prerender-state.html rename to tests/wpt/tests/speculation-rules/prerender/resources/prerender-state.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/prerendered-iframe.html b/tests/wpt/tests/speculation-rules/prerender/resources/prerendered-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/prerendered-iframe.html rename to tests/wpt/tests/speculation-rules/prerender/resources/prerendered-iframe.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/prerendered-page.html b/tests/wpt/tests/speculation-rules/prerender/resources/prerendered-page.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/prerendered-page.html rename to tests/wpt/tests/speculation-rules/prerender/resources/prerendered-page.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/presentation-request.html b/tests/wpt/tests/speculation-rules/prerender/resources/presentation-request.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/presentation-request.html rename to tests/wpt/tests/speculation-rules/prerender/resources/presentation-request.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/prompt-by-before-unload-inner-frame.html b/tests/wpt/tests/speculation-rules/prerender/resources/prompt-by-before-unload-inner-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/prompt-by-before-unload-inner-frame.html rename to tests/wpt/tests/speculation-rules/prerender/resources/prompt-by-before-unload-inner-frame.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/prompt-by-before-unload.html b/tests/wpt/tests/speculation-rules/prerender/resources/prompt-by-before-unload.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/prompt-by-before-unload.html rename to tests/wpt/tests/speculation-rules/prerender/resources/prompt-by-before-unload.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/push.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/push.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/push.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/push.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/referrer-test.js b/tests/wpt/tests/speculation-rules/prerender/resources/referrer-test.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/referrer-test.js rename to tests/wpt/tests/speculation-rules/prerender/resources/referrer-test.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/register-service-worker.html b/tests/wpt/tests/speculation-rules/prerender/resources/register-service-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/register-service-worker.html rename to tests/wpt/tests/speculation-rules/prerender/resources/register-service-worker.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/request-picture-in-picture.html b/tests/wpt/tests/speculation-rules/prerender/resources/request-picture-in-picture.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/request-picture-in-picture.html rename to tests/wpt/tests/speculation-rules/prerender/resources/request-picture-in-picture.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/sandbox-iframe.html b/tests/wpt/tests/speculation-rules/prerender/resources/sandbox-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/sandbox-iframe.html rename to tests/wpt/tests/speculation-rules/prerender/resources/sandbox-iframe.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/screen-capture.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/screen-capture.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/screen-capture.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/screen-capture.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/screen-orientation-lock.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/screen-orientation-lock.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/screen-orientation-lock.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/screen-orientation-lock.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/service-worker-unregister.html b/tests/wpt/tests/speculation-rules/prerender/resources/service-worker-unregister.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/service-worker-unregister.html rename to tests/wpt/tests/speculation-rules/prerender/resources/service-worker-unregister.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/service-worker-update.html b/tests/wpt/tests/speculation-rules/prerender/resources/service-worker-update.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/service-worker-update.html rename to tests/wpt/tests/speculation-rules/prerender/resources/service-worker-update.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/service-worker.js b/tests/wpt/tests/speculation-rules/prerender/resources/service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/service-worker.js rename to tests/wpt/tests/speculation-rules/prerender/resources/service-worker.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/session-history-harness.js b/tests/wpt/tests/speculation-rules/prerender/resources/session-history-harness.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/session-history-harness.js rename to tests/wpt/tests/speculation-rules/prerender/resources/session-history-harness.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/session-history-initiator.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/session-history-initiator.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/session-history-initiator.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/session-history-initiator.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/session-history-prerender.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/session-history-prerender.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/session-history-prerender.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/session-history-prerender.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/session-history-test-util.js b/tests/wpt/tests/speculation-rules/prerender/resources/session-history-test-util.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/session-history-test-util.js rename to tests/wpt/tests/speculation-rules/prerender/resources/session-history-test-util.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/shared-worker.py b/tests/wpt/tests/speculation-rules/prerender/resources/shared-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/shared-worker.py rename to tests/wpt/tests/speculation-rules/prerender/resources/shared-worker.py diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/speech-synthesis.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/speech-synthesis.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/speech-synthesis.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/speech-synthesis.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/storage-persist.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/storage-persist.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/storage-persist.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/storage-persist.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/utils.js b/tests/wpt/tests/speculation-rules/prerender/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/utils.js rename to tests/wpt/tests/speculation-rules/prerender/resources/utils.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/wake-lock.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/wake-lock.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/wake-lock.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/wake-lock.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-database-access.html b/tests/wpt/tests/speculation-rules/prerender/resources/web-database-access.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-database-access.html rename to tests/wpt/tests/speculation-rules/prerender/resources/web-database-access.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-hid.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/web-hid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-hid.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/web-hid.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-locks.html b/tests/wpt/tests/speculation-rules/prerender/resources/web-locks.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-locks.html rename to tests/wpt/tests/speculation-rules/prerender/resources/web-locks.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-nfc.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/web-nfc.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-nfc.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/web-nfc.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-serial.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/web-serial.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-serial.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/web-serial.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-share.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/web-share.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-share.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/web-share.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-usb.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/web-usb.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-usb.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/web-usb.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-xr-immersive-vr-session.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/web-xr-immersive-vr-session.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-xr-immersive-vr-session.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/web-xr-immersive-vr-session.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-xr-inline-session.https.html b/tests/wpt/tests/speculation-rules/prerender/resources/web-xr-inline-session.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/web-xr-inline-session.https.html rename to tests/wpt/tests/speculation-rules/prerender/resources/web-xr-inline-session.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/window-move.html b/tests/wpt/tests/speculation-rules/prerender/resources/window-move.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/window-move.html rename to tests/wpt/tests/speculation-rules/prerender/resources/window-move.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/window-open-during-prerendering.html b/tests/wpt/tests/speculation-rules/prerender/resources/window-open-during-prerendering.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/window-open-during-prerendering.html rename to tests/wpt/tests/speculation-rules/prerender/resources/window-open-during-prerendering.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/window-open-in-prerenderingchange.html b/tests/wpt/tests/speculation-rules/prerender/resources/window-open-in-prerenderingchange.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/window-open-in-prerenderingchange.html rename to tests/wpt/tests/speculation-rules/prerender/resources/window-open-in-prerenderingchange.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/window-resize.html b/tests/wpt/tests/speculation-rules/prerender/resources/window-resize.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/window-resize.html rename to tests/wpt/tests/speculation-rules/prerender/resources/window-resize.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/windowclient-navigate-on-iframe.html b/tests/wpt/tests/speculation-rules/prerender/resources/windowclient-navigate-on-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/windowclient-navigate-on-iframe.html rename to tests/wpt/tests/speculation-rules/prerender/resources/windowclient-navigate-on-iframe.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/windowclient-navigate-worker.js b/tests/wpt/tests/speculation-rules/prerender/resources/windowclient-navigate-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/windowclient-navigate-worker.js rename to tests/wpt/tests/speculation-rules/prerender/resources/windowclient-navigate-worker.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/worker-post-timeOrigin.js b/tests/wpt/tests/speculation-rules/prerender/resources/worker-post-timeOrigin.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/worker-post-timeOrigin.js rename to tests/wpt/tests/speculation-rules/prerender/resources/worker-post-timeOrigin.js diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/resources/workers-in-cross-origin-iframe.html b/tests/wpt/tests/speculation-rules/prerender/resources/workers-in-cross-origin-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/resources/workers-in-cross-origin-iframe.html rename to tests/wpt/tests/speculation-rules/prerender/resources/workers-in-cross-origin-iframe.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/response-code-non-successful.html b/tests/wpt/tests/speculation-rules/prerender/response-code-non-successful.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/response-code-non-successful.html rename to tests/wpt/tests/speculation-rules/prerender/response-code-non-successful.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/response-code-successful.html b/tests/wpt/tests/speculation-rules/prerender/response-code-successful.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/response-code-successful.html rename to tests/wpt/tests/speculation-rules/prerender/response-code-successful.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.html b/tests/wpt/tests/speculation-rules/prerender/restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-audio-setSinkId.https.tentative.html b/tests/wpt/tests/speculation-rules/prerender/restriction-audio-setSinkId.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-audio-setSinkId.https.tentative.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-audio-setSinkId.https.tentative.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-background-fetch.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-background-fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-background-fetch.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-background-fetch.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-background-sync.tentative.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-background-sync.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-background-sync.tentative.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-background-sync.tentative.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-battery-status.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-battery-status.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-battery-status.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-battery-status.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-bluetooth.tentative.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-bluetooth.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-bluetooth.tentative.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-bluetooth.tentative.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-broadcast-channel.html b/tests/wpt/tests/speculation-rules/prerender/restriction-broadcast-channel.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-broadcast-channel.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-broadcast-channel.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-dedicated-worker.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-dedicated-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-dedicated-worker.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-dedicated-worker.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-encrypted-media-unsupported-config.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-encrypted-media-unsupported-config.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-encrypted-media-unsupported-config.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-encrypted-media-unsupported-config.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-encrypted-media.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-encrypted-media.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-encrypted-media.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-encrypted-media.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-focus.html b/tests/wpt/tests/speculation-rules/prerender/restriction-focus.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-focus.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-focus.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-idle-detection.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-idle-detection.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-idle-detection.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-idle-detection.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-local-file-system-access.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-local-file-system-access.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-local-file-system-access.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-local-file-system-access.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-media-auto-play-attribute.html b/tests/wpt/tests/speculation-rules/prerender/restriction-media-auto-play-attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-media-auto-play-attribute.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-media-auto-play-attribute.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-media-camera.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-media-camera.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-media-camera.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-media-camera.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-media-device-info.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-media-device-info.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-media-device-info.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-media-device-info.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-media-microphone.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-media-microphone.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-media-microphone.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-media-microphone.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-media-play.html b/tests/wpt/tests/speculation-rules/prerender/restriction-media-play.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-media-play.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-media-play.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-message-boxes.html b/tests/wpt/tests/speculation-rules/prerender/restriction-message-boxes.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-message-boxes.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-message-boxes.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-midi-sysex.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-midi-sysex.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-midi-sysex.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-midi-sysex.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-midi.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-midi.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-midi.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-midi.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-notification.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-notification.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-notification.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-notification.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-presentation-request.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-presentation-request.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-presentation-request.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-presentation-request.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-prompt-by-before-unload.html b/tests/wpt/tests/speculation-rules/prerender/restriction-prompt-by-before-unload.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-prompt-by-before-unload.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-prompt-by-before-unload.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-push.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-push.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-push.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-push.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-request-picture-in-picture.html b/tests/wpt/tests/speculation-rules/prerender/restriction-request-picture-in-picture.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-request-picture-in-picture.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-request-picture-in-picture.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-screen-capture.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-screen-capture.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-screen-capture.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-screen-capture.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-screen-orientation-lock.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-screen-orientation-lock.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-screen-orientation-lock.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-screen-orientation-lock.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-sensor-accelerometer.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-sensor-accelerometer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-sensor-accelerometer.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-sensor-accelerometer.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-sensor-ambient-light-sensor.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-sensor-ambient-light-sensor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-sensor-ambient-light-sensor.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-sensor-ambient-light-sensor.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-sensor-gyroscope.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-sensor-gyroscope.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-sensor-gyroscope.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-sensor-gyroscope.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-sensor-magnetometer.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-sensor-magnetometer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-sensor-magnetometer.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-sensor-magnetometer.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-service-worker-postmessage.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-service-worker-postmessage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-service-worker-postmessage.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-service-worker-postmessage.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-service-worker-unregister.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-service-worker-unregister.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-service-worker-unregister.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-service-worker-unregister.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-service-worker-update.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-service-worker-update.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-service-worker-update.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-service-worker-update.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-speech-synthesis.html b/tests/wpt/tests/speculation-rules/prerender/restriction-speech-synthesis.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-speech-synthesis.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-speech-synthesis.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-storage-persist.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-storage-persist.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-storage-persist.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-storage-persist.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-wake-lock.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-wake-lock.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-wake-lock.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-wake-lock.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-hid.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-web-hid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-hid.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-web-hid.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-locks.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-web-locks.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-locks.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-web-locks.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-nfc.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-web-nfc.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-nfc.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-web-nfc.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-serial.tentative.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-web-serial.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-serial.tentative.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-web-serial.tentative.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-share.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-web-share.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-share.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-web-share.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-usb.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-web-usb.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-usb.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-web-usb.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-xr-immersive-vr-session.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-web-xr-immersive-vr-session.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-xr-immersive-vr-session.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-web-xr-immersive-vr-session.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-xr-inline-session.https.html b/tests/wpt/tests/speculation-rules/prerender/restriction-web-xr-inline-session.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-web-xr-inline-session.https.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-web-xr-inline-session.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-window-move.html b/tests/wpt/tests/speculation-rules/prerender/restriction-window-move.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-window-move.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-window-move.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-window-open.html b/tests/wpt/tests/speculation-rules/prerender/restriction-window-open.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-window-open.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-window-open.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-window-resize.html b/tests/wpt/tests/speculation-rules/prerender/restriction-window-resize.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restriction-window-resize.html rename to tests/wpt/tests/speculation-rules/prerender/restriction-window-resize.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/restrictions.html b/tests/wpt/tests/speculation-rules/prerender/restrictions.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/restrictions.html rename to tests/wpt/tests/speculation-rules/prerender/restrictions.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/sandbox-iframe.html b/tests/wpt/tests/speculation-rules/prerender/sandbox-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/sandbox-iframe.html rename to tests/wpt/tests/speculation-rules/prerender/sandbox-iframe.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/script-supports-speculationrules.html b/tests/wpt/tests/speculation-rules/prerender/script-supports-speculationrules.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/script-supports-speculationrules.html rename to tests/wpt/tests/speculation-rules/prerender/script-supports-speculationrules.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/service-workers.https.html b/tests/wpt/tests/speculation-rules/prerender/service-workers.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/service-workers.https.html rename to tests/wpt/tests/speculation-rules/prerender/service-workers.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/session-history-activation.https.html b/tests/wpt/tests/speculation-rules/prerender/session-history-activation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/session-history-activation.https.html rename to tests/wpt/tests/speculation-rules/prerender/session-history-activation.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/session-history-location.https.html b/tests/wpt/tests/speculation-rules/prerender/session-history-location.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/session-history-location.https.html rename to tests/wpt/tests/speculation-rules/prerender/session-history-location.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/session-history-navigation.https.html b/tests/wpt/tests/speculation-rules/prerender/session-history-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/session-history-navigation.https.html rename to tests/wpt/tests/speculation-rules/prerender/session-history-navigation.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/session-history-pushstate.https.html b/tests/wpt/tests/speculation-rules/prerender/session-history-pushstate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/session-history-pushstate.https.html rename to tests/wpt/tests/speculation-rules/prerender/session-history-pushstate.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/session-history-subframe-navigation.https.html b/tests/wpt/tests/speculation-rules/prerender/session-history-subframe-navigation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/session-history-subframe-navigation.https.html rename to tests/wpt/tests/speculation-rules/prerender/session-history-subframe-navigation.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/session-history-subframe-reload.https.html b/tests/wpt/tests/speculation-rules/prerender/session-history-subframe-reload.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/session-history-subframe-reload.https.html rename to tests/wpt/tests/speculation-rules/prerender/session-history-subframe-reload.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/state-and-event.html b/tests/wpt/tests/speculation-rules/prerender/state-and-event.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/state-and-event.html rename to tests/wpt/tests/speculation-rules/prerender/state-and-event.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/visibility-state.html b/tests/wpt/tests/speculation-rules/prerender/visibility-state.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/visibility-state.html rename to tests/wpt/tests/speculation-rules/prerender/visibility-state.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/web-database.https.html b/tests/wpt/tests/speculation-rules/prerender/web-database.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/web-database.https.html rename to tests/wpt/tests/speculation-rules/prerender/web-database.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/windowclient-navigate-to-cross-origin-url-on-iframe.https.html b/tests/wpt/tests/speculation-rules/prerender/windowclient-navigate-to-cross-origin-url-on-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/windowclient-navigate-to-cross-origin-url-on-iframe.https.html rename to tests/wpt/tests/speculation-rules/prerender/windowclient-navigate-to-cross-origin-url-on-iframe.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/windowclient-navigate-to-same-origin-url-on-iframe.https.html b/tests/wpt/tests/speculation-rules/prerender/windowclient-navigate-to-same-origin-url-on-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/windowclient-navigate-to-same-origin-url-on-iframe.https.html rename to tests/wpt/tests/speculation-rules/prerender/windowclient-navigate-to-same-origin-url-on-iframe.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/windowclient-navigate.https.html b/tests/wpt/tests/speculation-rules/prerender/windowclient-navigate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/windowclient-navigate.https.html rename to tests/wpt/tests/speculation-rules/prerender/windowclient-navigate.https.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/workers-in-cross-origin-iframe.html b/tests/wpt/tests/speculation-rules/prerender/workers-in-cross-origin-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/workers-in-cross-origin-iframe.html rename to tests/wpt/tests/speculation-rules/prerender/workers-in-cross-origin-iframe.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/prerender/workers.html b/tests/wpt/tests/speculation-rules/prerender/workers.html similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/prerender/workers.html rename to tests/wpt/tests/speculation-rules/prerender/workers.html diff --git a/tests/wpt/web-platform-tests/speculation-rules/resources/utils.js b/tests/wpt/tests/speculation-rules/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/speculation-rules/resources/utils.js rename to tests/wpt/tests/speculation-rules/resources/utils.js diff --git a/tests/wpt/web-platform-tests/speech-api/META.yml b/tests/wpt/tests/speech-api/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/META.yml rename to tests/wpt/tests/speech-api/META.yml diff --git a/tests/wpt/web-platform-tests/speech-api/SpeechRecognition-abort-manual.https.html b/tests/wpt/tests/speech-api/SpeechRecognition-abort-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/SpeechRecognition-abort-manual.https.html rename to tests/wpt/tests/speech-api/SpeechRecognition-abort-manual.https.html diff --git a/tests/wpt/web-platform-tests/speech-api/SpeechRecognition-basics.https.html b/tests/wpt/tests/speech-api/SpeechRecognition-basics.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/SpeechRecognition-basics.https.html rename to tests/wpt/tests/speech-api/SpeechRecognition-basics.https.html diff --git a/tests/wpt/web-platform-tests/speech-api/SpeechRecognition-onerror-manual.https.html b/tests/wpt/tests/speech-api/SpeechRecognition-onerror-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/SpeechRecognition-onerror-manual.https.html rename to tests/wpt/tests/speech-api/SpeechRecognition-onerror-manual.https.html diff --git a/tests/wpt/web-platform-tests/speech-api/SpeechRecognition-onresult-manual.https.html b/tests/wpt/tests/speech-api/SpeechRecognition-onresult-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/SpeechRecognition-onresult-manual.https.html rename to tests/wpt/tests/speech-api/SpeechRecognition-onresult-manual.https.html diff --git a/tests/wpt/web-platform-tests/speech-api/SpeechRecognition-stop-manual.https.html b/tests/wpt/tests/speech-api/SpeechRecognition-stop-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/SpeechRecognition-stop-manual.https.html rename to tests/wpt/tests/speech-api/SpeechRecognition-stop-manual.https.html diff --git a/tests/wpt/web-platform-tests/speech-api/SpeechSynthesis-pause-resume.tentative.html b/tests/wpt/tests/speech-api/SpeechSynthesis-pause-resume.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/SpeechSynthesis-pause-resume.tentative.html rename to tests/wpt/tests/speech-api/SpeechSynthesis-pause-resume.tentative.html diff --git a/tests/wpt/web-platform-tests/speech-api/SpeechSynthesis-speak-events.html b/tests/wpt/tests/speech-api/SpeechSynthesis-speak-events.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/SpeechSynthesis-speak-events.html rename to tests/wpt/tests/speech-api/SpeechSynthesis-speak-events.html diff --git a/tests/wpt/web-platform-tests/speech-api/SpeechSynthesis-speak-twice.html b/tests/wpt/tests/speech-api/SpeechSynthesis-speak-twice.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/SpeechSynthesis-speak-twice.html rename to tests/wpt/tests/speech-api/SpeechSynthesis-speak-twice.html diff --git a/tests/wpt/web-platform-tests/speech-api/SpeechSynthesis-speak-without-activation-fails.tentative.html b/tests/wpt/tests/speech-api/SpeechSynthesis-speak-without-activation-fails.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/SpeechSynthesis-speak-without-activation-fails.tentative.html rename to tests/wpt/tests/speech-api/SpeechSynthesis-speak-without-activation-fails.tentative.html diff --git a/tests/wpt/web-platform-tests/speech-api/SpeechSynthesisErrorEvent-constructor.html b/tests/wpt/tests/speech-api/SpeechSynthesisErrorEvent-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/SpeechSynthesisErrorEvent-constructor.html rename to tests/wpt/tests/speech-api/SpeechSynthesisErrorEvent-constructor.html diff --git a/tests/wpt/web-platform-tests/speech-api/SpeechSynthesisEvent-constructor.html b/tests/wpt/tests/speech-api/SpeechSynthesisEvent-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/SpeechSynthesisEvent-constructor.html rename to tests/wpt/tests/speech-api/SpeechSynthesisEvent-constructor.html diff --git a/tests/wpt/web-platform-tests/speech-api/SpeechSynthesisEvent-properties.html b/tests/wpt/tests/speech-api/SpeechSynthesisEvent-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/SpeechSynthesisEvent-properties.html rename to tests/wpt/tests/speech-api/SpeechSynthesisEvent-properties.html diff --git a/tests/wpt/web-platform-tests/speech-api/SpeechSynthesisUtterance-basics.https.html b/tests/wpt/tests/speech-api/SpeechSynthesisUtterance-basics.https.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/SpeechSynthesisUtterance-basics.https.html rename to tests/wpt/tests/speech-api/SpeechSynthesisUtterance-basics.https.html diff --git a/tests/wpt/web-platform-tests/speech-api/SpeechSynthesisUtterance-volume-manual.html b/tests/wpt/tests/speech-api/SpeechSynthesisUtterance-volume-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/SpeechSynthesisUtterance-volume-manual.html rename to tests/wpt/tests/speech-api/SpeechSynthesisUtterance-volume-manual.html diff --git a/tests/wpt/web-platform-tests/speech-api/historical.html b/tests/wpt/tests/speech-api/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/historical.html rename to tests/wpt/tests/speech-api/historical.html diff --git a/tests/wpt/web-platform-tests/speech-api/idlharness.window.js b/tests/wpt/tests/speech-api/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/idlharness.window.js rename to tests/wpt/tests/speech-api/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/speech-api/webspeech.js b/tests/wpt/tests/speech-api/webspeech.js similarity index 100% rename from tests/wpt/web-platform-tests/speech-api/webspeech.js rename to tests/wpt/tests/speech-api/webspeech.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/META.yml b/tests/wpt/tests/storage-access-api/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/META.yml rename to tests/wpt/tests/storage-access-api/META.yml diff --git a/tests/wpt/web-platform-tests/storage-access-api/hasStorageAccess-ABA.tentative.sub.https.window.js b/tests/wpt/tests/storage-access-api/hasStorageAccess-ABA.tentative.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/hasStorageAccess-ABA.tentative.sub.https.window.js rename to tests/wpt/tests/storage-access-api/hasStorageAccess-ABA.tentative.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/hasStorageAccess-insecure.sub.window.js b/tests/wpt/tests/storage-access-api/hasStorageAccess-insecure.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/hasStorageAccess-insecure.sub.window.js rename to tests/wpt/tests/storage-access-api/hasStorageAccess-insecure.sub.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/hasStorageAccess.sub.https.window.js b/tests/wpt/tests/storage-access-api/hasStorageAccess.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/hasStorageAccess.sub.https.window.js rename to tests/wpt/tests/storage-access-api/hasStorageAccess.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/helpers.js b/tests/wpt/tests/storage-access-api/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/helpers.js rename to tests/wpt/tests/storage-access-api/helpers.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/idlharness.window.js b/tests/wpt/tests/storage-access-api/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/idlharness.window.js rename to tests/wpt/tests/storage-access-api/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-ABA.tentative.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-ABA.tentative.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-ABA.tentative.sub.https.window.js rename to tests/wpt/tests/storage-access-api/requestStorageAccess-ABA.tentative.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js rename to tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-cross-site-iframe.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-site-iframe.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-cross-site-iframe.sub.https.window.js rename to tests/wpt/tests/storage-access-api/requestStorageAccess-cross-site-iframe.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js rename to tests/wpt/tests/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-insecure.sub.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-insecure.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-insecure.sub.window.js rename to tests/wpt/tests/storage-access-api/requestStorageAccess-insecure.sub.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-nested-cross-origin-iframe.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-nested-cross-origin-iframe.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-nested-cross-origin-iframe.sub.https.window.js rename to tests/wpt/tests/storage-access-api/requestStorageAccess-nested-cross-origin-iframe.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-nested-cross-site-iframe.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-nested-cross-site-iframe.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-nested-cross-site-iframe.sub.https.window.js rename to tests/wpt/tests/storage-access-api/requestStorageAccess-nested-cross-site-iframe.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-nested-same-origin-iframe.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-nested-same-origin-iframe.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-nested-same-origin-iframe.sub.https.window.js rename to tests/wpt/tests/storage-access-api/requestStorageAccess-nested-same-origin-iframe.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-non-fully-active.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-non-fully-active.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-non-fully-active.sub.https.window.js rename to tests/wpt/tests/storage-access-api/requestStorageAccess-non-fully-active.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-same-site-iframe.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-same-site-iframe.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-same-site-iframe.sub.https.window.js rename to tests/wpt/tests/storage-access-api/requestStorageAccess-same-site-iframe.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess.sub.https.window.js rename to tests/wpt/tests/storage-access-api/requestStorageAccess.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/resources/echo-cookie-header.py b/tests/wpt/tests/storage-access-api/resources/echo-cookie-header.py similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/resources/echo-cookie-header.py rename to tests/wpt/tests/storage-access-api/resources/echo-cookie-header.py diff --git a/tests/wpt/web-platform-tests/storage-access-api/resources/embedded_responder.js b/tests/wpt/tests/storage-access-api/resources/embedded_responder.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/resources/embedded_responder.js rename to tests/wpt/tests/storage-access-api/resources/embedded_responder.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/resources/hasStorageAccess-ABA-iframe.https.html b/tests/wpt/tests/storage-access-api/resources/hasStorageAccess-ABA-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/resources/hasStorageAccess-ABA-iframe.https.html rename to tests/wpt/tests/storage-access-api/resources/hasStorageAccess-ABA-iframe.https.html diff --git a/tests/wpt/web-platform-tests/storage-access-api/resources/hasStorageAccess-ABA-iframe.sub.https.window.js b/tests/wpt/tests/storage-access-api/resources/hasStorageAccess-ABA-iframe.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/resources/hasStorageAccess-ABA-iframe.sub.https.window.js rename to tests/wpt/tests/storage-access-api/resources/hasStorageAccess-ABA-iframe.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/resources/hasStorageAccess-iframe.html b/tests/wpt/tests/storage-access-api/resources/hasStorageAccess-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/resources/hasStorageAccess-iframe.html rename to tests/wpt/tests/storage-access-api/resources/hasStorageAccess-iframe.html diff --git a/tests/wpt/web-platform-tests/storage-access-api/resources/hasStorageAccess-iframe.https.html b/tests/wpt/tests/storage-access-api/resources/hasStorageAccess-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/resources/hasStorageAccess-iframe.https.html rename to tests/wpt/tests/storage-access-api/resources/hasStorageAccess-iframe.https.html diff --git a/tests/wpt/web-platform-tests/storage-access-api/resources/permissions-iframe.https.html b/tests/wpt/tests/storage-access-api/resources/permissions-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/resources/permissions-iframe.https.html rename to tests/wpt/tests/storage-access-api/resources/permissions-iframe.https.html diff --git a/tests/wpt/web-platform-tests/storage-access-api/resources/requestStorageAccess-ABA-iframe.https.html b/tests/wpt/tests/storage-access-api/resources/requestStorageAccess-ABA-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/resources/requestStorageAccess-ABA-iframe.https.html rename to tests/wpt/tests/storage-access-api/resources/requestStorageAccess-ABA-iframe.https.html diff --git a/tests/wpt/web-platform-tests/storage-access-api/resources/requestStorageAccess-ABA-iframe.sub.https.window.js b/tests/wpt/tests/storage-access-api/resources/requestStorageAccess-ABA-iframe.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/resources/requestStorageAccess-ABA-iframe.sub.https.window.js rename to tests/wpt/tests/storage-access-api/resources/requestStorageAccess-ABA-iframe.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/resources/requestStorageAccess-iframe.html b/tests/wpt/tests/storage-access-api/resources/requestStorageAccess-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/resources/requestStorageAccess-iframe.html rename to tests/wpt/tests/storage-access-api/resources/requestStorageAccess-iframe.html diff --git a/tests/wpt/web-platform-tests/storage-access-api/resources/requestStorageAccess-iframe.https.html b/tests/wpt/tests/storage-access-api/resources/requestStorageAccess-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/resources/requestStorageAccess-iframe.https.html rename to tests/wpt/tests/storage-access-api/resources/requestStorageAccess-iframe.https.html diff --git a/tests/wpt/web-platform-tests/storage-access-api/resources/script-with-cookie-header.py b/tests/wpt/tests/storage-access-api/resources/script-with-cookie-header.py similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/resources/script-with-cookie-header.py rename to tests/wpt/tests/storage-access-api/resources/script-with-cookie-header.py diff --git a/tests/wpt/web-platform-tests/storage-access-api/sandboxAttribute.window.js b/tests/wpt/tests/storage-access-api/sandboxAttribute.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/sandboxAttribute.window.js rename to tests/wpt/tests/storage-access-api/sandboxAttribute.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/storage-access-permission.sub.https.window.js b/tests/wpt/tests/storage-access-api/storage-access-permission.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/storage-access-permission.sub.https.window.js rename to tests/wpt/tests/storage-access-api/storage-access-permission.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/storage-access-api/storageAccess.testdriver.sub.html b/tests/wpt/tests/storage-access-api/storageAccess.testdriver.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/storage-access-api/storageAccess.testdriver.sub.html rename to tests/wpt/tests/storage-access-api/storageAccess.testdriver.sub.html diff --git a/tests/wpt/web-platform-tests/storage/META.yml b/tests/wpt/tests/storage/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/storage/META.yml rename to tests/wpt/tests/storage/META.yml diff --git a/tests/wpt/web-platform-tests/storage/README.md b/tests/wpt/tests/storage/README.md similarity index 100% rename from tests/wpt/web-platform-tests/storage/README.md rename to tests/wpt/tests/storage/README.md diff --git a/tests/wpt/web-platform-tests/storage/buckets/META.yml b/tests/wpt/tests/storage/buckets/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/storage/buckets/META.yml rename to tests/wpt/tests/storage/buckets/META.yml diff --git a/tests/wpt/web-platform-tests/storage/buckets/bucket-quota-indexeddb.tentative.https.any.js b/tests/wpt/tests/storage/buckets/bucket-quota-indexeddb.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/buckets/bucket-quota-indexeddb.tentative.https.any.js rename to tests/wpt/tests/storage/buckets/bucket-quota-indexeddb.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/storage/buckets/bucket-storage-policy.tentative.https.any.js b/tests/wpt/tests/storage/buckets/bucket-storage-policy.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/buckets/bucket-storage-policy.tentative.https.any.js rename to tests/wpt/tests/storage/buckets/bucket-storage-policy.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/storage/buckets/resources/cached-resource.txt b/tests/wpt/tests/storage/buckets/resources/cached-resource.txt similarity index 100% rename from tests/wpt/web-platform-tests/storage/buckets/resources/cached-resource.txt rename to tests/wpt/tests/storage/buckets/resources/cached-resource.txt diff --git a/tests/wpt/web-platform-tests/storage/buckets/resources/util.js b/tests/wpt/tests/storage/buckets/resources/util.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/buckets/resources/util.js rename to tests/wpt/tests/storage/buckets/resources/util.js diff --git a/tests/wpt/web-platform-tests/storage/estimate-indexeddb.https.any.js b/tests/wpt/tests/storage/estimate-indexeddb.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/estimate-indexeddb.https.any.js rename to tests/wpt/tests/storage/estimate-indexeddb.https.any.js diff --git a/tests/wpt/web-platform-tests/storage/estimate-parallel.https.any.js b/tests/wpt/tests/storage/estimate-parallel.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/estimate-parallel.https.any.js rename to tests/wpt/tests/storage/estimate-parallel.https.any.js diff --git a/tests/wpt/web-platform-tests/storage/estimate-usage-details-caches.https.tentative.any.js b/tests/wpt/tests/storage/estimate-usage-details-caches.https.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/estimate-usage-details-caches.https.tentative.any.js rename to tests/wpt/tests/storage/estimate-usage-details-caches.https.tentative.any.js diff --git a/tests/wpt/web-platform-tests/storage/estimate-usage-details-indexeddb.https.tentative.any.js b/tests/wpt/tests/storage/estimate-usage-details-indexeddb.https.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/estimate-usage-details-indexeddb.https.tentative.any.js rename to tests/wpt/tests/storage/estimate-usage-details-indexeddb.https.tentative.any.js diff --git a/tests/wpt/web-platform-tests/storage/estimate-usage-details-service-workers.https.tentative.window.js b/tests/wpt/tests/storage/estimate-usage-details-service-workers.https.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/estimate-usage-details-service-workers.https.tentative.window.js rename to tests/wpt/tests/storage/estimate-usage-details-service-workers.https.tentative.window.js diff --git a/tests/wpt/web-platform-tests/storage/estimate-usage-details.https.tentative.any.js b/tests/wpt/tests/storage/estimate-usage-details.https.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/estimate-usage-details.https.tentative.any.js rename to tests/wpt/tests/storage/estimate-usage-details.https.tentative.any.js diff --git a/tests/wpt/web-platform-tests/storage/helpers.js b/tests/wpt/tests/storage/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/helpers.js rename to tests/wpt/tests/storage/helpers.js diff --git a/tests/wpt/web-platform-tests/storage/idlharness.https.any.js b/tests/wpt/tests/storage/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/idlharness.https.any.js rename to tests/wpt/tests/storage/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/storage/opaque-origin.https.window.js b/tests/wpt/tests/storage/opaque-origin.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/opaque-origin.https.window.js rename to tests/wpt/tests/storage/opaque-origin.https.window.js diff --git a/tests/wpt/web-platform-tests/storage/partitioned-estimate-usage-details-caches.tentative.https.sub.html b/tests/wpt/tests/storage/partitioned-estimate-usage-details-caches.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/storage/partitioned-estimate-usage-details-caches.tentative.https.sub.html rename to tests/wpt/tests/storage/partitioned-estimate-usage-details-caches.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/storage/partitioned-estimate-usage-details-indexeddb.tentative.https.sub.html b/tests/wpt/tests/storage/partitioned-estimate-usage-details-indexeddb.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/storage/partitioned-estimate-usage-details-indexeddb.tentative.https.sub.html rename to tests/wpt/tests/storage/partitioned-estimate-usage-details-indexeddb.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/storage/partitioned-estimate-usage-details-service-workers.tentative.https.sub.html b/tests/wpt/tests/storage/partitioned-estimate-usage-details-service-workers.tentative.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/storage/partitioned-estimate-usage-details-service-workers.tentative.https.sub.html rename to tests/wpt/tests/storage/partitioned-estimate-usage-details-service-workers.tentative.https.sub.html diff --git a/tests/wpt/web-platform-tests/storage/permission-query.https.any.js b/tests/wpt/tests/storage/permission-query.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/permission-query.https.any.js rename to tests/wpt/tests/storage/permission-query.https.any.js diff --git a/tests/wpt/web-platform-tests/storage/persist-permission-manual.https.html b/tests/wpt/tests/storage/persist-permission-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/storage/persist-permission-manual.https.html rename to tests/wpt/tests/storage/persist-permission-manual.https.html diff --git a/tests/wpt/web-platform-tests/storage/persisted.https.any.js b/tests/wpt/tests/storage/persisted.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/persisted.https.any.js rename to tests/wpt/tests/storage/persisted.https.any.js diff --git a/tests/wpt/web-platform-tests/storage/quotachange-in-detached-iframe.tentative.https.html b/tests/wpt/tests/storage/quotachange-in-detached-iframe.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/storage/quotachange-in-detached-iframe.tentative.https.html rename to tests/wpt/tests/storage/quotachange-in-detached-iframe.tentative.https.html diff --git a/tests/wpt/web-platform-tests/storage/resources/partitioned-estimate-usage-details-caches-helper-frame.html b/tests/wpt/tests/storage/resources/partitioned-estimate-usage-details-caches-helper-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/storage/resources/partitioned-estimate-usage-details-caches-helper-frame.html rename to tests/wpt/tests/storage/resources/partitioned-estimate-usage-details-caches-helper-frame.html diff --git a/tests/wpt/web-platform-tests/storage/resources/partitioned-estimate-usage-details-indexeddb-helper-frame.html b/tests/wpt/tests/storage/resources/partitioned-estimate-usage-details-indexeddb-helper-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/storage/resources/partitioned-estimate-usage-details-indexeddb-helper-frame.html rename to tests/wpt/tests/storage/resources/partitioned-estimate-usage-details-indexeddb-helper-frame.html diff --git a/tests/wpt/web-platform-tests/storage/resources/partitioned-estimate-usage-details-service-workers-helper-frame.html b/tests/wpt/tests/storage/resources/partitioned-estimate-usage-details-service-workers-helper-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/storage/resources/partitioned-estimate-usage-details-service-workers-helper-frame.html rename to tests/wpt/tests/storage/resources/partitioned-estimate-usage-details-service-workers-helper-frame.html diff --git a/tests/wpt/web-platform-tests/storage/resources/worker.js b/tests/wpt/tests/storage/resources/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/resources/worker.js rename to tests/wpt/tests/storage/resources/worker.js diff --git a/tests/wpt/web-platform-tests/storage/storagemanager-estimate.https.any.js b/tests/wpt/tests/storage/storagemanager-estimate.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/storagemanager-estimate.https.any.js rename to tests/wpt/tests/storage/storagemanager-estimate.https.any.js diff --git a/tests/wpt/web-platform-tests/storage/storagemanager-persist-persisted-match.https.any.js b/tests/wpt/tests/storage/storagemanager-persist-persisted-match.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/storagemanager-persist-persisted-match.https.any.js rename to tests/wpt/tests/storage/storagemanager-persist-persisted-match.https.any.js diff --git a/tests/wpt/web-platform-tests/storage/storagemanager-persist.https.window.js b/tests/wpt/tests/storage/storagemanager-persist.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/storagemanager-persist.https.window.js rename to tests/wpt/tests/storage/storagemanager-persist.https.window.js diff --git a/tests/wpt/web-platform-tests/storage/storagemanager-persist.https.worker.js b/tests/wpt/tests/storage/storagemanager-persist.https.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/storagemanager-persist.https.worker.js rename to tests/wpt/tests/storage/storagemanager-persist.https.worker.js diff --git a/tests/wpt/web-platform-tests/storage/storagemanager-persisted.https.any.js b/tests/wpt/tests/storage/storagemanager-persisted.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/storage/storagemanager-persisted.https.any.js rename to tests/wpt/tests/storage/storagemanager-persisted.https.any.js diff --git a/tests/wpt/web-platform-tests/streams/META.yml b/tests/wpt/tests/streams/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/streams/META.yml rename to tests/wpt/tests/streams/META.yml diff --git a/tests/wpt/web-platform-tests/streams/README.md b/tests/wpt/tests/streams/README.md similarity index 100% rename from tests/wpt/web-platform-tests/streams/README.md rename to tests/wpt/tests/streams/README.md diff --git a/tests/wpt/web-platform-tests/streams/idlharness-shadowrealm.window.js b/tests/wpt/tests/streams/idlharness-shadowrealm.window.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/idlharness-shadowrealm.window.js rename to tests/wpt/tests/streams/idlharness-shadowrealm.window.js diff --git a/tests/wpt/web-platform-tests/streams/idlharness.any.js b/tests/wpt/tests/streams/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/idlharness.any.js rename to tests/wpt/tests/streams/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/streams/piping/abort.any.js b/tests/wpt/tests/streams/piping/abort.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/piping/abort.any.js rename to tests/wpt/tests/streams/piping/abort.any.js diff --git a/tests/wpt/web-platform-tests/streams/piping/close-propagation-backward.any.js b/tests/wpt/tests/streams/piping/close-propagation-backward.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/piping/close-propagation-backward.any.js rename to tests/wpt/tests/streams/piping/close-propagation-backward.any.js diff --git a/tests/wpt/web-platform-tests/streams/piping/close-propagation-forward.any.js b/tests/wpt/tests/streams/piping/close-propagation-forward.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/piping/close-propagation-forward.any.js rename to tests/wpt/tests/streams/piping/close-propagation-forward.any.js diff --git a/tests/wpt/web-platform-tests/streams/piping/error-propagation-backward.any.js b/tests/wpt/tests/streams/piping/error-propagation-backward.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/piping/error-propagation-backward.any.js rename to tests/wpt/tests/streams/piping/error-propagation-backward.any.js diff --git a/tests/wpt/web-platform-tests/streams/piping/error-propagation-forward.any.js b/tests/wpt/tests/streams/piping/error-propagation-forward.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/piping/error-propagation-forward.any.js rename to tests/wpt/tests/streams/piping/error-propagation-forward.any.js diff --git a/tests/wpt/web-platform-tests/streams/piping/flow-control.any.js b/tests/wpt/tests/streams/piping/flow-control.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/piping/flow-control.any.js rename to tests/wpt/tests/streams/piping/flow-control.any.js diff --git a/tests/wpt/web-platform-tests/streams/piping/general-addition.any.js b/tests/wpt/tests/streams/piping/general-addition.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/piping/general-addition.any.js rename to tests/wpt/tests/streams/piping/general-addition.any.js diff --git a/tests/wpt/web-platform-tests/streams/piping/general.any.js b/tests/wpt/tests/streams/piping/general.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/piping/general.any.js rename to tests/wpt/tests/streams/piping/general.any.js diff --git a/tests/wpt/web-platform-tests/streams/piping/multiple-propagation.any.js b/tests/wpt/tests/streams/piping/multiple-propagation.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/piping/multiple-propagation.any.js rename to tests/wpt/tests/streams/piping/multiple-propagation.any.js diff --git a/tests/wpt/web-platform-tests/streams/piping/pipe-through.any.js b/tests/wpt/tests/streams/piping/pipe-through.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/piping/pipe-through.any.js rename to tests/wpt/tests/streams/piping/pipe-through.any.js diff --git a/tests/wpt/web-platform-tests/streams/piping/then-interception.any.js b/tests/wpt/tests/streams/piping/then-interception.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/piping/then-interception.any.js rename to tests/wpt/tests/streams/piping/then-interception.any.js diff --git a/tests/wpt/web-platform-tests/streams/piping/throwing-options.any.js b/tests/wpt/tests/streams/piping/throwing-options.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/piping/throwing-options.any.js rename to tests/wpt/tests/streams/piping/throwing-options.any.js diff --git a/tests/wpt/web-platform-tests/streams/piping/transform-streams.any.js b/tests/wpt/tests/streams/piping/transform-streams.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/piping/transform-streams.any.js rename to tests/wpt/tests/streams/piping/transform-streams.any.js diff --git a/tests/wpt/web-platform-tests/streams/queuing-strategies-size-function-per-global.window.js b/tests/wpt/tests/streams/queuing-strategies-size-function-per-global.window.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/queuing-strategies-size-function-per-global.window.js rename to tests/wpt/tests/streams/queuing-strategies-size-function-per-global.window.js diff --git a/tests/wpt/web-platform-tests/streams/queuing-strategies.any.js b/tests/wpt/tests/streams/queuing-strategies.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/queuing-strategies.any.js rename to tests/wpt/tests/streams/queuing-strategies.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-byte-streams/bad-buffers-and-views.any.js b/tests/wpt/tests/streams/readable-byte-streams/bad-buffers-and-views.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-byte-streams/bad-buffers-and-views.any.js rename to tests/wpt/tests/streams/readable-byte-streams/bad-buffers-and-views.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-byte-streams/construct-byob-request.any.js b/tests/wpt/tests/streams/readable-byte-streams/construct-byob-request.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-byte-streams/construct-byob-request.any.js rename to tests/wpt/tests/streams/readable-byte-streams/construct-byob-request.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js b/tests/wpt/tests/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js rename to tests/wpt/tests/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-byte-streams/general.any.js b/tests/wpt/tests/streams/readable-byte-streams/general.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-byte-streams/general.any.js rename to tests/wpt/tests/streams/readable-byte-streams/general.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-byte-streams/non-transferable-buffers.any.js b/tests/wpt/tests/streams/readable-byte-streams/non-transferable-buffers.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-byte-streams/non-transferable-buffers.any.js rename to tests/wpt/tests/streams/readable-byte-streams/non-transferable-buffers.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-byte-streams/respond-after-enqueue.any.js b/tests/wpt/tests/streams/readable-byte-streams/respond-after-enqueue.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-byte-streams/respond-after-enqueue.any.js rename to tests/wpt/tests/streams/readable-byte-streams/respond-after-enqueue.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-byte-streams/tee.any.js b/tests/wpt/tests/streams/readable-byte-streams/tee.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-byte-streams/tee.any.js rename to tests/wpt/tests/streams/readable-byte-streams/tee.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/async-iterator.any.js b/tests/wpt/tests/streams/readable-streams/async-iterator.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/async-iterator.any.js rename to tests/wpt/tests/streams/readable-streams/async-iterator.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/bad-strategies.any.js b/tests/wpt/tests/streams/readable-streams/bad-strategies.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/bad-strategies.any.js rename to tests/wpt/tests/streams/readable-streams/bad-strategies.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/bad-underlying-sources.any.js b/tests/wpt/tests/streams/readable-streams/bad-underlying-sources.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/bad-underlying-sources.any.js rename to tests/wpt/tests/streams/readable-streams/bad-underlying-sources.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/cancel.any.js b/tests/wpt/tests/streams/readable-streams/cancel.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/cancel.any.js rename to tests/wpt/tests/streams/readable-streams/cancel.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/constructor.any.js b/tests/wpt/tests/streams/readable-streams/constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/constructor.any.js rename to tests/wpt/tests/streams/readable-streams/constructor.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/count-queuing-strategy-integration.any.js b/tests/wpt/tests/streams/readable-streams/count-queuing-strategy-integration.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/count-queuing-strategy-integration.any.js rename to tests/wpt/tests/streams/readable-streams/count-queuing-strategy-integration.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/crashtests/empty.js b/tests/wpt/tests/streams/readable-streams/crashtests/empty.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/crashtests/empty.js rename to tests/wpt/tests/streams/readable-streams/crashtests/empty.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/crashtests/strategy-worker-terminate.html b/tests/wpt/tests/streams/readable-streams/crashtests/strategy-worker-terminate.html similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/crashtests/strategy-worker-terminate.html rename to tests/wpt/tests/streams/readable-streams/crashtests/strategy-worker-terminate.html diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/crashtests/strategy-worker.js b/tests/wpt/tests/streams/readable-streams/crashtests/strategy-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/crashtests/strategy-worker.js rename to tests/wpt/tests/streams/readable-streams/crashtests/strategy-worker.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/cross-realm-crash.window.js b/tests/wpt/tests/streams/readable-streams/cross-realm-crash.window.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/cross-realm-crash.window.js rename to tests/wpt/tests/streams/readable-streams/cross-realm-crash.window.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/default-reader.any.js b/tests/wpt/tests/streams/readable-streams/default-reader.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/default-reader.any.js rename to tests/wpt/tests/streams/readable-streams/default-reader.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/floating-point-total-queue-size.any.js b/tests/wpt/tests/streams/readable-streams/floating-point-total-queue-size.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/floating-point-total-queue-size.any.js rename to tests/wpt/tests/streams/readable-streams/floating-point-total-queue-size.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/from.any.js b/tests/wpt/tests/streams/readable-streams/from.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/from.any.js rename to tests/wpt/tests/streams/readable-streams/from.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/garbage-collection.any.js b/tests/wpt/tests/streams/readable-streams/garbage-collection.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/garbage-collection.any.js rename to tests/wpt/tests/streams/readable-streams/garbage-collection.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/general.any.js b/tests/wpt/tests/streams/readable-streams/general.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/general.any.js rename to tests/wpt/tests/streams/readable-streams/general.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/global.html b/tests/wpt/tests/streams/readable-streams/global.html similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/global.html rename to tests/wpt/tests/streams/readable-streams/global.html diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/owning-type-message-port.any.js b/tests/wpt/tests/streams/readable-streams/owning-type-message-port.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/owning-type-message-port.any.js rename to tests/wpt/tests/streams/readable-streams/owning-type-message-port.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/owning-type-video-frame.any.js b/tests/wpt/tests/streams/readable-streams/owning-type-video-frame.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/owning-type-video-frame.any.js rename to tests/wpt/tests/streams/readable-streams/owning-type-video-frame.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/owning-type.any.js b/tests/wpt/tests/streams/readable-streams/owning-type.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/owning-type.any.js rename to tests/wpt/tests/streams/readable-streams/owning-type.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/patched-global.any.js b/tests/wpt/tests/streams/readable-streams/patched-global.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/patched-global.any.js rename to tests/wpt/tests/streams/readable-streams/patched-global.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/read-task-handling.window.js b/tests/wpt/tests/streams/readable-streams/read-task-handling.window.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/read-task-handling.window.js rename to tests/wpt/tests/streams/readable-streams/read-task-handling.window.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/reentrant-strategies.any.js b/tests/wpt/tests/streams/readable-streams/reentrant-strategies.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/reentrant-strategies.any.js rename to tests/wpt/tests/streams/readable-streams/reentrant-strategies.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/tee.any.js b/tests/wpt/tests/streams/readable-streams/tee.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/tee.any.js rename to tests/wpt/tests/streams/readable-streams/tee.any.js diff --git a/tests/wpt/web-platform-tests/streams/readable-streams/templated.any.js b/tests/wpt/tests/streams/readable-streams/templated.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/readable-streams/templated.any.js rename to tests/wpt/tests/streams/readable-streams/templated.any.js diff --git a/tests/wpt/web-platform-tests/streams/resources/recording-streams.js b/tests/wpt/tests/streams/resources/recording-streams.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/resources/recording-streams.js rename to tests/wpt/tests/streams/resources/recording-streams.js diff --git a/tests/wpt/web-platform-tests/streams/resources/rs-test-templates.js b/tests/wpt/tests/streams/resources/rs-test-templates.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/resources/rs-test-templates.js rename to tests/wpt/tests/streams/resources/rs-test-templates.js diff --git a/tests/wpt/web-platform-tests/streams/resources/rs-utils.js b/tests/wpt/tests/streams/resources/rs-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/resources/rs-utils.js rename to tests/wpt/tests/streams/resources/rs-utils.js diff --git a/tests/wpt/web-platform-tests/streams/resources/test-utils.js b/tests/wpt/tests/streams/resources/test-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/resources/test-utils.js rename to tests/wpt/tests/streams/resources/test-utils.js diff --git a/tests/wpt/web-platform-tests/streams/transferable/deserialize-error.window.js b/tests/wpt/tests/streams/transferable/deserialize-error.window.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/deserialize-error.window.js rename to tests/wpt/tests/streams/transferable/deserialize-error.window.js diff --git a/tests/wpt/web-platform-tests/streams/transferable/gc-crash.html b/tests/wpt/tests/streams/transferable/gc-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/gc-crash.html rename to tests/wpt/tests/streams/transferable/gc-crash.html diff --git a/tests/wpt/web-platform-tests/streams/transferable/readable-stream.html b/tests/wpt/tests/streams/transferable/readable-stream.html similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/readable-stream.html rename to tests/wpt/tests/streams/transferable/readable-stream.html diff --git a/tests/wpt/web-platform-tests/streams/transferable/reason.html b/tests/wpt/tests/streams/transferable/reason.html similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/reason.html rename to tests/wpt/tests/streams/transferable/reason.html diff --git a/tests/wpt/web-platform-tests/streams/transferable/resources/create-wasm-module.js b/tests/wpt/tests/streams/transferable/resources/create-wasm-module.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/resources/create-wasm-module.js rename to tests/wpt/tests/streams/transferable/resources/create-wasm-module.js diff --git a/tests/wpt/web-platform-tests/streams/transferable/resources/deserialize-error-frame.html b/tests/wpt/tests/streams/transferable/resources/deserialize-error-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/resources/deserialize-error-frame.html rename to tests/wpt/tests/streams/transferable/resources/deserialize-error-frame.html diff --git a/tests/wpt/web-platform-tests/streams/transferable/resources/echo-iframe.html b/tests/wpt/tests/streams/transferable/resources/echo-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/resources/echo-iframe.html rename to tests/wpt/tests/streams/transferable/resources/echo-iframe.html diff --git a/tests/wpt/web-platform-tests/streams/transferable/resources/echo-worker.js b/tests/wpt/tests/streams/transferable/resources/echo-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/resources/echo-worker.js rename to tests/wpt/tests/streams/transferable/resources/echo-worker.js diff --git a/tests/wpt/web-platform-tests/streams/transferable/resources/helpers.js b/tests/wpt/tests/streams/transferable/resources/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/resources/helpers.js rename to tests/wpt/tests/streams/transferable/resources/helpers.js diff --git a/tests/wpt/web-platform-tests/streams/transferable/resources/receiving-shared-worker.js b/tests/wpt/tests/streams/transferable/resources/receiving-shared-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/resources/receiving-shared-worker.js rename to tests/wpt/tests/streams/transferable/resources/receiving-shared-worker.js diff --git a/tests/wpt/web-platform-tests/streams/transferable/resources/receiving-worker.js b/tests/wpt/tests/streams/transferable/resources/receiving-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/resources/receiving-worker.js rename to tests/wpt/tests/streams/transferable/resources/receiving-worker.js diff --git a/tests/wpt/web-platform-tests/streams/transferable/resources/sending-shared-worker.js b/tests/wpt/tests/streams/transferable/resources/sending-shared-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/resources/sending-shared-worker.js rename to tests/wpt/tests/streams/transferable/resources/sending-shared-worker.js diff --git a/tests/wpt/web-platform-tests/streams/transferable/resources/sending-worker.js b/tests/wpt/tests/streams/transferable/resources/sending-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/resources/sending-worker.js rename to tests/wpt/tests/streams/transferable/resources/sending-worker.js diff --git a/tests/wpt/web-platform-tests/streams/transferable/resources/service-worker-iframe.html b/tests/wpt/tests/streams/transferable/resources/service-worker-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/resources/service-worker-iframe.html rename to tests/wpt/tests/streams/transferable/resources/service-worker-iframe.html diff --git a/tests/wpt/web-platform-tests/streams/transferable/resources/service-worker.js b/tests/wpt/tests/streams/transferable/resources/service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/resources/service-worker.js rename to tests/wpt/tests/streams/transferable/resources/service-worker.js diff --git a/tests/wpt/web-platform-tests/streams/transferable/service-worker.https.html b/tests/wpt/tests/streams/transferable/service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/service-worker.https.html rename to tests/wpt/tests/streams/transferable/service-worker.https.html diff --git a/tests/wpt/web-platform-tests/streams/transferable/shared-worker.html b/tests/wpt/tests/streams/transferable/shared-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/shared-worker.html rename to tests/wpt/tests/streams/transferable/shared-worker.html diff --git a/tests/wpt/web-platform-tests/streams/transferable/transfer-with-messageport.window.js b/tests/wpt/tests/streams/transferable/transfer-with-messageport.window.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/transfer-with-messageport.window.js rename to tests/wpt/tests/streams/transferable/transfer-with-messageport.window.js diff --git a/tests/wpt/web-platform-tests/streams/transferable/transform-stream-members.any.js b/tests/wpt/tests/streams/transferable/transform-stream-members.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/transform-stream-members.any.js rename to tests/wpt/tests/streams/transferable/transform-stream-members.any.js diff --git a/tests/wpt/web-platform-tests/streams/transferable/transform-stream.html b/tests/wpt/tests/streams/transferable/transform-stream.html similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/transform-stream.html rename to tests/wpt/tests/streams/transferable/transform-stream.html diff --git a/tests/wpt/web-platform-tests/streams/transferable/window.html b/tests/wpt/tests/streams/transferable/window.html similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/window.html rename to tests/wpt/tests/streams/transferable/window.html diff --git a/tests/wpt/web-platform-tests/streams/transferable/worker.html b/tests/wpt/tests/streams/transferable/worker.html similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/worker.html rename to tests/wpt/tests/streams/transferable/worker.html diff --git a/tests/wpt/web-platform-tests/streams/transferable/writable-stream.html b/tests/wpt/tests/streams/transferable/writable-stream.html similarity index 100% rename from tests/wpt/web-platform-tests/streams/transferable/writable-stream.html rename to tests/wpt/tests/streams/transferable/writable-stream.html diff --git a/tests/wpt/web-platform-tests/streams/transform-streams/backpressure.any.js b/tests/wpt/tests/streams/transform-streams/backpressure.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transform-streams/backpressure.any.js rename to tests/wpt/tests/streams/transform-streams/backpressure.any.js diff --git a/tests/wpt/web-platform-tests/streams/transform-streams/errors.any.js b/tests/wpt/tests/streams/transform-streams/errors.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transform-streams/errors.any.js rename to tests/wpt/tests/streams/transform-streams/errors.any.js diff --git a/tests/wpt/web-platform-tests/streams/transform-streams/flush.any.js b/tests/wpt/tests/streams/transform-streams/flush.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transform-streams/flush.any.js rename to tests/wpt/tests/streams/transform-streams/flush.any.js diff --git a/tests/wpt/web-platform-tests/streams/transform-streams/general.any.js b/tests/wpt/tests/streams/transform-streams/general.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transform-streams/general.any.js rename to tests/wpt/tests/streams/transform-streams/general.any.js diff --git a/tests/wpt/web-platform-tests/streams/transform-streams/invalid-realm.tentative.window.js b/tests/wpt/tests/streams/transform-streams/invalid-realm.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transform-streams/invalid-realm.tentative.window.js rename to tests/wpt/tests/streams/transform-streams/invalid-realm.tentative.window.js diff --git a/tests/wpt/web-platform-tests/streams/transform-streams/lipfuzz.any.js b/tests/wpt/tests/streams/transform-streams/lipfuzz.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transform-streams/lipfuzz.any.js rename to tests/wpt/tests/streams/transform-streams/lipfuzz.any.js diff --git a/tests/wpt/web-platform-tests/streams/transform-streams/patched-global.any.js b/tests/wpt/tests/streams/transform-streams/patched-global.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transform-streams/patched-global.any.js rename to tests/wpt/tests/streams/transform-streams/patched-global.any.js diff --git a/tests/wpt/web-platform-tests/streams/transform-streams/properties.any.js b/tests/wpt/tests/streams/transform-streams/properties.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transform-streams/properties.any.js rename to tests/wpt/tests/streams/transform-streams/properties.any.js diff --git a/tests/wpt/web-platform-tests/streams/transform-streams/reentrant-strategies.any.js b/tests/wpt/tests/streams/transform-streams/reentrant-strategies.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transform-streams/reentrant-strategies.any.js rename to tests/wpt/tests/streams/transform-streams/reentrant-strategies.any.js diff --git a/tests/wpt/web-platform-tests/streams/transform-streams/strategies.any.js b/tests/wpt/tests/streams/transform-streams/strategies.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transform-streams/strategies.any.js rename to tests/wpt/tests/streams/transform-streams/strategies.any.js diff --git a/tests/wpt/web-platform-tests/streams/transform-streams/terminate.any.js b/tests/wpt/tests/streams/transform-streams/terminate.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/transform-streams/terminate.any.js rename to tests/wpt/tests/streams/transform-streams/terminate.any.js diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/aborting.any.js b/tests/wpt/tests/streams/writable-streams/aborting.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/writable-streams/aborting.any.js rename to tests/wpt/tests/streams/writable-streams/aborting.any.js diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/bad-strategies.any.js b/tests/wpt/tests/streams/writable-streams/bad-strategies.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/writable-streams/bad-strategies.any.js rename to tests/wpt/tests/streams/writable-streams/bad-strategies.any.js diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/bad-underlying-sinks.any.js b/tests/wpt/tests/streams/writable-streams/bad-underlying-sinks.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/writable-streams/bad-underlying-sinks.any.js rename to tests/wpt/tests/streams/writable-streams/bad-underlying-sinks.any.js diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/byte-length-queuing-strategy.any.js b/tests/wpt/tests/streams/writable-streams/byte-length-queuing-strategy.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/writable-streams/byte-length-queuing-strategy.any.js rename to tests/wpt/tests/streams/writable-streams/byte-length-queuing-strategy.any.js diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/close.any.js b/tests/wpt/tests/streams/writable-streams/close.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/writable-streams/close.any.js rename to tests/wpt/tests/streams/writable-streams/close.any.js diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/constructor.any.js b/tests/wpt/tests/streams/writable-streams/constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/writable-streams/constructor.any.js rename to tests/wpt/tests/streams/writable-streams/constructor.any.js diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/count-queuing-strategy.any.js b/tests/wpt/tests/streams/writable-streams/count-queuing-strategy.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/writable-streams/count-queuing-strategy.any.js rename to tests/wpt/tests/streams/writable-streams/count-queuing-strategy.any.js diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/error.any.js b/tests/wpt/tests/streams/writable-streams/error.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/writable-streams/error.any.js rename to tests/wpt/tests/streams/writable-streams/error.any.js diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/floating-point-total-queue-size.any.js b/tests/wpt/tests/streams/writable-streams/floating-point-total-queue-size.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/writable-streams/floating-point-total-queue-size.any.js rename to tests/wpt/tests/streams/writable-streams/floating-point-total-queue-size.any.js diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/general.any.js b/tests/wpt/tests/streams/writable-streams/general.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/writable-streams/general.any.js rename to tests/wpt/tests/streams/writable-streams/general.any.js diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/properties.any.js b/tests/wpt/tests/streams/writable-streams/properties.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/writable-streams/properties.any.js rename to tests/wpt/tests/streams/writable-streams/properties.any.js diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/reentrant-strategy.any.js b/tests/wpt/tests/streams/writable-streams/reentrant-strategy.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/writable-streams/reentrant-strategy.any.js rename to tests/wpt/tests/streams/writable-streams/reentrant-strategy.any.js diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/start.any.js b/tests/wpt/tests/streams/writable-streams/start.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/writable-streams/start.any.js rename to tests/wpt/tests/streams/writable-streams/start.any.js diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/write.any.js b/tests/wpt/tests/streams/writable-streams/write.any.js similarity index 100% rename from tests/wpt/web-platform-tests/streams/writable-streams/write.any.js rename to tests/wpt/tests/streams/writable-streams/write.any.js diff --git a/tests/wpt/web-platform-tests/subapps/add-error.tentative.https.html b/tests/wpt/tests/subapps/add-error.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/subapps/add-error.tentative.https.html rename to tests/wpt/tests/subapps/add-error.tentative.https.html diff --git a/tests/wpt/web-platform-tests/subapps/add-success.tentative.https.html b/tests/wpt/tests/subapps/add-success.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/subapps/add-success.tentative.https.html rename to tests/wpt/tests/subapps/add-success.tentative.https.html diff --git a/tests/wpt/web-platform-tests/subapps/idlharness.tentative.https.window.js b/tests/wpt/tests/subapps/idlharness.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/subapps/idlharness.tentative.https.window.js rename to tests/wpt/tests/subapps/idlharness.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/subapps/insecure-context-error.tentative.html b/tests/wpt/tests/subapps/insecure-context-error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/subapps/insecure-context-error.tentative.html rename to tests/wpt/tests/subapps/insecure-context-error.tentative.html diff --git a/tests/wpt/web-platform-tests/subapps/list-error.tentative.https.html b/tests/wpt/tests/subapps/list-error.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/subapps/list-error.tentative.https.html rename to tests/wpt/tests/subapps/list-error.tentative.https.html diff --git a/tests/wpt/web-platform-tests/subapps/list-success.tentative.https.html b/tests/wpt/tests/subapps/list-success.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/subapps/list-success.tentative.https.html rename to tests/wpt/tests/subapps/list-success.tentative.https.html diff --git a/tests/wpt/web-platform-tests/subapps/remove-error.tentative.https.html b/tests/wpt/tests/subapps/remove-error.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/subapps/remove-error.tentative.https.html rename to tests/wpt/tests/subapps/remove-error.tentative.https.html diff --git a/tests/wpt/web-platform-tests/subapps/remove-success.tentative.https.html b/tests/wpt/tests/subapps/remove-success.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/subapps/remove-success.tentative.https.html rename to tests/wpt/tests/subapps/remove-success.tentative.https.html diff --git a/tests/wpt/web-platform-tests/subapps/resources/subapps-helpers.js b/tests/wpt/tests/subapps/resources/subapps-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/subapps/resources/subapps-helpers.js rename to tests/wpt/tests/subapps/resources/subapps-helpers.js diff --git a/tests/wpt/web-platform-tests/subresource-integrity/META.yml b/tests/wpt/tests/subresource-integrity/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/subresource-integrity/META.yml rename to tests/wpt/tests/subresource-integrity/META.yml diff --git a/tests/wpt/web-platform-tests/subresource-integrity/alternate.css b/tests/wpt/tests/subresource-integrity/alternate.css similarity index 100% rename from tests/wpt/web-platform-tests/subresource-integrity/alternate.css rename to tests/wpt/tests/subresource-integrity/alternate.css diff --git a/tests/wpt/web-platform-tests/subresource-integrity/crossorigin-anon-style.css b/tests/wpt/tests/subresource-integrity/crossorigin-anon-style.css similarity index 100% rename from tests/wpt/web-platform-tests/subresource-integrity/crossorigin-anon-style.css rename to tests/wpt/tests/subresource-integrity/crossorigin-anon-style.css diff --git a/tests/wpt/web-platform-tests/subresource-integrity/crossorigin-anon-style.css.headers b/tests/wpt/tests/subresource-integrity/crossorigin-anon-style.css.headers similarity index 100% rename from tests/wpt/web-platform-tests/subresource-integrity/crossorigin-anon-style.css.headers rename to tests/wpt/tests/subresource-integrity/crossorigin-anon-style.css.headers diff --git a/tests/wpt/web-platform-tests/subresource-integrity/crossorigin-creds-style.css b/tests/wpt/tests/subresource-integrity/crossorigin-creds-style.css similarity index 100% rename from tests/wpt/web-platform-tests/subresource-integrity/crossorigin-creds-style.css rename to tests/wpt/tests/subresource-integrity/crossorigin-creds-style.css diff --git a/tests/wpt/web-platform-tests/subresource-integrity/crossorigin-creds-style.css.sub.headers b/tests/wpt/tests/subresource-integrity/crossorigin-creds-style.css.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/subresource-integrity/crossorigin-creds-style.css.sub.headers rename to tests/wpt/tests/subresource-integrity/crossorigin-creds-style.css.sub.headers diff --git a/tests/wpt/web-platform-tests/subresource-integrity/crossorigin-ineligible-style.css b/tests/wpt/tests/subresource-integrity/crossorigin-ineligible-style.css similarity index 100% rename from tests/wpt/web-platform-tests/subresource-integrity/crossorigin-ineligible-style.css rename to tests/wpt/tests/subresource-integrity/crossorigin-ineligible-style.css diff --git a/tests/wpt/web-platform-tests/subresource-integrity/image.png b/tests/wpt/tests/subresource-integrity/image.png similarity index 100% rename from tests/wpt/web-platform-tests/subresource-integrity/image.png rename to tests/wpt/tests/subresource-integrity/image.png diff --git a/tests/wpt/web-platform-tests/subresource-integrity/script.js b/tests/wpt/tests/subresource-integrity/script.js similarity index 100% rename from tests/wpt/web-platform-tests/subresource-integrity/script.js rename to tests/wpt/tests/subresource-integrity/script.js diff --git a/tests/wpt/web-platform-tests/subresource-integrity/sri-test-helpers.sub.js b/tests/wpt/tests/subresource-integrity/sri-test-helpers.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/subresource-integrity/sri-test-helpers.sub.js rename to tests/wpt/tests/subresource-integrity/sri-test-helpers.sub.js diff --git a/tests/wpt/web-platform-tests/subresource-integrity/style.css b/tests/wpt/tests/subresource-integrity/style.css similarity index 100% rename from tests/wpt/web-platform-tests/subresource-integrity/style.css rename to tests/wpt/tests/subresource-integrity/style.css diff --git a/tests/wpt/web-platform-tests/subresource-integrity/subresource-integrity.html b/tests/wpt/tests/subresource-integrity/subresource-integrity.html similarity index 100% rename from tests/wpt/web-platform-tests/subresource-integrity/subresource-integrity.html rename to tests/wpt/tests/subresource-integrity/subresource-integrity.html diff --git a/tests/wpt/web-platform-tests/subresource-integrity/tools/generate_javascript.py b/tests/wpt/tests/subresource-integrity/tools/generate_javascript.py similarity index 100% rename from tests/wpt/web-platform-tests/subresource-integrity/tools/generate_javascript.py rename to tests/wpt/tests/subresource-integrity/tools/generate_javascript.py diff --git a/tests/wpt/web-platform-tests/subresource-integrity/tools/list_hashes.py b/tests/wpt/tests/subresource-integrity/tools/list_hashes.py similarity index 100% rename from tests/wpt/web-platform-tests/subresource-integrity/tools/list_hashes.py rename to tests/wpt/tests/subresource-integrity/tools/list_hashes.py diff --git a/tests/wpt/web-platform-tests/svg-aam/META.yml b/tests/wpt/tests/svg-aam/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/svg-aam/META.yml rename to tests/wpt/tests/svg-aam/META.yml diff --git a/tests/wpt/web-platform-tests/svg-aam/README.md b/tests/wpt/tests/svg-aam/README.md similarity index 100% rename from tests/wpt/web-platform-tests/svg-aam/README.md rename to tests/wpt/tests/svg-aam/README.md diff --git a/tests/wpt/web-platform-tests/svg/META.yml b/tests/wpt/tests/svg/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/svg/META.yml rename to tests/wpt/tests/svg/META.yml diff --git a/tests/wpt/web-platform-tests/svg/README.md b/tests/wpt/tests/svg/README.md similarity index 100% rename from tests/wpt/web-platform-tests/svg/README.md rename to tests/wpt/tests/svg/README.md diff --git a/tests/wpt/web-platform-tests/svg/animations/accumulate-values-width-animation.html b/tests/wpt/tests/svg/animations/accumulate-values-width-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/accumulate-values-width-animation.html rename to tests/wpt/tests/svg/animations/accumulate-values-width-animation.html diff --git a/tests/wpt/web-platform-tests/svg/animations/additive-from-to-width-animation.html b/tests/wpt/tests/svg/animations/additive-from-to-width-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/additive-from-to-width-animation.html rename to tests/wpt/tests/svg/animations/additive-from-to-width-animation.html diff --git a/tests/wpt/web-platform-tests/svg/animations/additive-type-by-animation.html b/tests/wpt/tests/svg/animations/additive-type-by-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/additive-type-by-animation.html rename to tests/wpt/tests/svg/animations/additive-type-by-animation.html diff --git a/tests/wpt/web-platform-tests/svg/animations/additive-values-width-animation.html b/tests/wpt/tests/svg/animations/additive-values-width-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/additive-values-width-animation.html rename to tests/wpt/tests/svg/animations/additive-values-width-animation.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animVal-basics.html b/tests/wpt/tests/svg/animations/animVal-basics.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animVal-basics.html rename to tests/wpt/tests/svg/animations/animVal-basics.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-calcMode-spline-by.html b/tests/wpt/tests/svg/animations/animate-calcMode-spline-by.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-calcMode-spline-by.html rename to tests/wpt/tests/svg/animations/animate-calcMode-spline-by.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-calcMode-spline-from-by.html b/tests/wpt/tests/svg/animations/animate-calcMode-spline-from-by.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-calcMode-spline-from-by.html rename to tests/wpt/tests/svg/animations/animate-calcMode-spline-from-by.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-calcMode-spline-from-to.html b/tests/wpt/tests/svg/animations/animate-calcMode-spline-from-to.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-calcMode-spline-from-to.html rename to tests/wpt/tests/svg/animations/animate-calcMode-spline-from-to.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-calcMode-spline-to.html b/tests/wpt/tests/svg/animations/animate-calcMode-spline-to.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-calcMode-spline-to.html rename to tests/wpt/tests/svg/animations/animate-calcMode-spline-to.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-calcMode-spline-values.html b/tests/wpt/tests/svg/animations/animate-calcMode-spline-values.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-calcMode-spline-values.html rename to tests/wpt/tests/svg/animations/animate-calcMode-spline-values.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-color-calcMode-discrete.html b/tests/wpt/tests/svg/animations/animate-color-calcMode-discrete.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-color-calcMode-discrete.html rename to tests/wpt/tests/svg/animations/animate-color-calcMode-discrete.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-color-fill-currentColor.html b/tests/wpt/tests/svg/animations/animate-color-fill-currentColor.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-color-fill-currentColor.html rename to tests/wpt/tests/svg/animations/animate-color-fill-currentColor.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-color-fill-from-by.html b/tests/wpt/tests/svg/animations/animate-color-fill-from-by.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-color-fill-from-by.html rename to tests/wpt/tests/svg/animations/animate-color-fill-from-by.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-color-transparent.html b/tests/wpt/tests/svg/animations/animate-color-transparent.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-color-transparent.html rename to tests/wpt/tests/svg/animations/animate-color-transparent.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-css-xml-attributeType.html b/tests/wpt/tests/svg/animations/animate-css-xml-attributeType.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-css-xml-attributeType.html rename to tests/wpt/tests/svg/animations/animate-css-xml-attributeType.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-currentColor.html b/tests/wpt/tests/svg/animations/animate-currentColor.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-currentColor.html rename to tests/wpt/tests/svg/animations/animate-currentColor.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-dynamic-update-attributeName.html b/tests/wpt/tests/svg/animations/animate-dynamic-update-attributeName.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-dynamic-update-attributeName.html rename to tests/wpt/tests/svg/animations/animate-dynamic-update-attributeName.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-elem-02-t-drt.html b/tests/wpt/tests/svg/animations/animate-elem-02-t-drt.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-elem-02-t-drt.html rename to tests/wpt/tests/svg/animations/animate-elem-02-t-drt.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-elem-14-t-drt.html b/tests/wpt/tests/svg/animations/animate-elem-14-t-drt.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-elem-14-t-drt.html rename to tests/wpt/tests/svg/animations/animate-elem-14-t-drt.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-elem-15-t-drt.html b/tests/wpt/tests/svg/animations/animate-elem-15-t-drt.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-elem-15-t-drt.html rename to tests/wpt/tests/svg/animations/animate-elem-15-t-drt.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-elem-16-t-drt.html b/tests/wpt/tests/svg/animations/animate-elem-16-t-drt.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-elem-16-t-drt.html rename to tests/wpt/tests/svg/animations/animate-elem-16-t-drt.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-elem-17-t-drt.html b/tests/wpt/tests/svg/animations/animate-elem-17-t-drt.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-elem-17-t-drt.html rename to tests/wpt/tests/svg/animations/animate-elem-17-t-drt.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-elem-18-t-drt.html b/tests/wpt/tests/svg/animations/animate-elem-18-t-drt.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-elem-18-t-drt.html rename to tests/wpt/tests/svg/animations/animate-elem-18-t-drt.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-elem-19-t-drt.html b/tests/wpt/tests/svg/animations/animate-elem-19-t-drt.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-elem-19-t-drt.html rename to tests/wpt/tests/svg/animations/animate-elem-19-t-drt.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-end-attribute-numeric-precision.html b/tests/wpt/tests/svg/animations/animate-end-attribute-numeric-precision.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-end-attribute-numeric-precision.html rename to tests/wpt/tests/svg/animations/animate-end-attribute-numeric-precision.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-fill-freeze-with-repeatDur.html b/tests/wpt/tests/svg/animations/animate-fill-freeze-with-repeatDur.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-fill-freeze-with-repeatDur.html rename to tests/wpt/tests/svg/animations/animate-fill-freeze-with-repeatDur.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-from-to-keyTimes.html b/tests/wpt/tests/svg/animations/animate-from-to-keyTimes.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-from-to-keyTimes.html rename to tests/wpt/tests/svg/animations/animate-from-to-keyTimes.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-gradient-transform.html b/tests/wpt/tests/svg/animations/animate-gradient-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-gradient-transform.html rename to tests/wpt/tests/svg/animations/animate-gradient-transform.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-inherit-css-property.html b/tests/wpt/tests/svg/animations/animate-inherit-css-property.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-inherit-css-property.html rename to tests/wpt/tests/svg/animations/animate-inherit-css-property.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-insert-begin.html b/tests/wpt/tests/svg/animations/animate-insert-begin.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-insert-begin.html rename to tests/wpt/tests/svg/animations/animate-insert-begin.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-insert-no-begin.html b/tests/wpt/tests/svg/animations/animate-insert-no-begin.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-insert-no-begin.html rename to tests/wpt/tests/svg/animations/animate-insert-no-begin.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-keySplines.html b/tests/wpt/tests/svg/animations/animate-keySplines.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-keySplines.html rename to tests/wpt/tests/svg/animations/animate-keySplines.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-marker-orient-from-angle-to-angle.html b/tests/wpt/tests/svg/animations/animate-marker-orient-from-angle-to-angle.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-marker-orient-from-angle-to-angle.html rename to tests/wpt/tests/svg/animations/animate-marker-orient-from-angle-to-angle.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-marker-orient-from-angle-to-auto.html b/tests/wpt/tests/svg/animations/animate-marker-orient-from-angle-to-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-marker-orient-from-angle-to-auto.html rename to tests/wpt/tests/svg/animations/animate-marker-orient-from-angle-to-auto.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-marker-orient-from-auto-to-auto-start-reverse.html b/tests/wpt/tests/svg/animations/animate-marker-orient-from-auto-to-auto-start-reverse.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-marker-orient-from-auto-to-auto-start-reverse.html rename to tests/wpt/tests/svg/animations/animate-marker-orient-from-auto-to-auto-start-reverse.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-marker-orient-to-angle.html b/tests/wpt/tests/svg/animations/animate-marker-orient-to-angle.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-marker-orient-to-angle.html rename to tests/wpt/tests/svg/animations/animate-marker-orient-to-angle.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-number-calcMode-discrete-keyTimes.html b/tests/wpt/tests/svg/animations/animate-number-calcMode-discrete-keyTimes.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-number-calcMode-discrete-keyTimes.html rename to tests/wpt/tests/svg/animations/animate-number-calcMode-discrete-keyTimes.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-number-calcMode-discrete.html b/tests/wpt/tests/svg/animations/animate-number-calcMode-discrete.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-number-calcMode-discrete.html rename to tests/wpt/tests/svg/animations/animate-number-calcMode-discrete.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-path-animation-Cc-Ss.tentative.html b/tests/wpt/tests/svg/animations/animate-path-animation-Cc-Ss.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-path-animation-Cc-Ss.tentative.html rename to tests/wpt/tests/svg/animations/animate-path-animation-Cc-Ss.tentative.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-path-animation-Ll-Vv-Hh.tentative.html b/tests/wpt/tests/svg/animations/animate-path-animation-Ll-Vv-Hh.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-path-animation-Ll-Vv-Hh.tentative.html rename to tests/wpt/tests/svg/animations/animate-path-animation-Ll-Vv-Hh.tentative.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-path-animation-Mm-Aa-Z.tentative.html b/tests/wpt/tests/svg/animations/animate-path-animation-Mm-Aa-Z.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-path-animation-Mm-Aa-Z.tentative.html rename to tests/wpt/tests/svg/animations/animate-path-animation-Mm-Aa-Z.tentative.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-path-animation-Qq-Tt.tentative.html b/tests/wpt/tests/svg/animations/animate-path-animation-Qq-Tt.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-path-animation-Qq-Tt.tentative.html rename to tests/wpt/tests/svg/animations/animate-path-animation-Qq-Tt.tentative.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-path-animation-cC-sS-inverse.tentative.html b/tests/wpt/tests/svg/animations/animate-path-animation-cC-sS-inverse.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-path-animation-cC-sS-inverse.tentative.html rename to tests/wpt/tests/svg/animations/animate-path-animation-cC-sS-inverse.tentative.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-path-animation-lL-vV-hH-inverse.tentative.html b/tests/wpt/tests/svg/animations/animate-path-animation-lL-vV-hH-inverse.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-path-animation-lL-vV-hH-inverse.tentative.html rename to tests/wpt/tests/svg/animations/animate-path-animation-lL-vV-hH-inverse.tentative.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-path-animation-mM-aA-Z-inverse.tentative.html b/tests/wpt/tests/svg/animations/animate-path-animation-mM-aA-Z-inverse.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-path-animation-mM-aA-Z-inverse.tentative.html rename to tests/wpt/tests/svg/animations/animate-path-animation-mM-aA-Z-inverse.tentative.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-path-animation-qQ-tT-inverse.tentative.html b/tests/wpt/tests/svg/animations/animate-path-animation-qQ-tT-inverse.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-path-animation-qQ-tT-inverse.tentative.html rename to tests/wpt/tests/svg/animations/animate-path-animation-qQ-tT-inverse.tentative.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-path-to-animation.tentative.html b/tests/wpt/tests/svg/animations/animate-path-to-animation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-path-to-animation.tentative.html rename to tests/wpt/tests/svg/animations/animate-path-to-animation.tentative.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-reset-freeze.html b/tests/wpt/tests/svg/animations/animate-reset-freeze.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-reset-freeze.html rename to tests/wpt/tests/svg/animations/animate-reset-freeze.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animate-stop-currentcolor.html b/tests/wpt/tests/svg/animations/animate-stop-currentcolor.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animate-stop-currentcolor.html rename to tests/wpt/tests/svg/animations/animate-stop-currentcolor.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-base.html b/tests/wpt/tests/svg/animations/animateMotion-base.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animateMotion-base.html rename to tests/wpt/tests/svg/animations/animateMotion-base.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-circle.html b/tests/wpt/tests/svg/animations/animateMotion-circle.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animateMotion-circle.html rename to tests/wpt/tests/svg/animations/animateMotion-circle.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-display-none.html b/tests/wpt/tests/svg/animations/animateMotion-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animateMotion-display-none.html rename to tests/wpt/tests/svg/animations/animateMotion-display-none.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-ellipse.html b/tests/wpt/tests/svg/animations/animateMotion-ellipse.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animateMotion-ellipse.html rename to tests/wpt/tests/svg/animations/animateMotion-ellipse.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-fill-freeze.html b/tests/wpt/tests/svg/animations/animateMotion-fill-freeze.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animateMotion-fill-freeze.html rename to tests/wpt/tests/svg/animations/animateMotion-fill-freeze.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-fill-remove.html b/tests/wpt/tests/svg/animations/animateMotion-fill-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animateMotion-fill-remove.html rename to tests/wpt/tests/svg/animations/animateMotion-fill-remove.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-from-to-rotate-auto.html b/tests/wpt/tests/svg/animations/animateMotion-from-to-rotate-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animateMotion-from-to-rotate-auto.html rename to tests/wpt/tests/svg/animations/animateMotion-from-to-rotate-auto.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-keyPoints-001.html b/tests/wpt/tests/svg/animations/animateMotion-keyPoints-001.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animateMotion-keyPoints-001.html rename to tests/wpt/tests/svg/animations/animateMotion-keyPoints-001.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-line.html b/tests/wpt/tests/svg/animations/animateMotion-line.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animateMotion-line.html rename to tests/wpt/tests/svg/animations/animateMotion-line.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-multiple.html b/tests/wpt/tests/svg/animations/animateMotion-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animateMotion-multiple.html rename to tests/wpt/tests/svg/animations/animateMotion-multiple.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-rect.html b/tests/wpt/tests/svg/animations/animateMotion-rect.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animateMotion-rect.html rename to tests/wpt/tests/svg/animations/animateMotion-rect.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-still.html b/tests/wpt/tests/svg/animations/animateMotion-still.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animateMotion-still.html rename to tests/wpt/tests/svg/animations/animateMotion-still.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animateTransform-pattern-transform.html b/tests/wpt/tests/svg/animations/animateTransform-pattern-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animateTransform-pattern-transform.html rename to tests/wpt/tests/svg/animations/animateTransform-pattern-transform.html diff --git a/tests/wpt/web-platform-tests/svg/animations/animated-classname-crash.svg b/tests/wpt/tests/svg/animations/animated-classname-crash.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/animated-classname-crash.svg rename to tests/wpt/tests/svg/animations/animated-classname-crash.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/attribute-value-unaffected-by-animation-001.html b/tests/wpt/tests/svg/animations/attribute-value-unaffected-by-animation-001.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/attribute-value-unaffected-by-animation-001.html rename to tests/wpt/tests/svg/animations/attribute-value-unaffected-by-animation-001.html diff --git a/tests/wpt/web-platform-tests/svg/animations/attribute-value-unaffected-by-animation-002.html b/tests/wpt/tests/svg/animations/attribute-value-unaffected-by-animation-002.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/attribute-value-unaffected-by-animation-002.html rename to tests/wpt/tests/svg/animations/attribute-value-unaffected-by-animation-002.html diff --git a/tests/wpt/web-platform-tests/svg/animations/attributeTypes.html b/tests/wpt/tests/svg/animations/attributeTypes.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/attributeTypes.html rename to tests/wpt/tests/svg/animations/attributeTypes.html diff --git a/tests/wpt/web-platform-tests/svg/animations/begin-attribute-mutation.html b/tests/wpt/tests/svg/animations/begin-attribute-mutation.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/begin-attribute-mutation.html rename to tests/wpt/tests/svg/animations/begin-attribute-mutation.html diff --git a/tests/wpt/web-platform-tests/svg/animations/begin-event.svg b/tests/wpt/tests/svg/animations/begin-event.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/begin-event.svg rename to tests/wpt/tests/svg/animations/begin-event.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/beginelement-instance-time-1.html b/tests/wpt/tests/svg/animations/beginelement-instance-time-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/beginelement-instance-time-1.html rename to tests/wpt/tests/svg/animations/beginelement-instance-time-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/beginevents-1.html b/tests/wpt/tests/svg/animations/beginevents-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/beginevents-1.html rename to tests/wpt/tests/svg/animations/beginevents-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/change-css-property-while-animating-fill-freeze.html b/tests/wpt/tests/svg/animations/change-css-property-while-animating-fill-freeze.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/change-css-property-while-animating-fill-freeze.html rename to tests/wpt/tests/svg/animations/change-css-property-while-animating-fill-freeze.html diff --git a/tests/wpt/web-platform-tests/svg/animations/change-css-property-while-animating-fill-remove.html b/tests/wpt/tests/svg/animations/change-css-property-while-animating-fill-remove.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/change-css-property-while-animating-fill-remove.html rename to tests/wpt/tests/svg/animations/change-css-property-while-animating-fill-remove.html diff --git a/tests/wpt/web-platform-tests/svg/animations/change-target-while-animating-SVG-property.html b/tests/wpt/tests/svg/animations/change-target-while-animating-SVG-property.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/change-target-while-animating-SVG-property.html rename to tests/wpt/tests/svg/animations/change-target-while-animating-SVG-property.html diff --git a/tests/wpt/web-platform-tests/svg/animations/correct-events-for-short-animations-with-syncbases.html b/tests/wpt/tests/svg/animations/correct-events-for-short-animations-with-syncbases.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/correct-events-for-short-animations-with-syncbases.html rename to tests/wpt/tests/svg/animations/correct-events-for-short-animations-with-syncbases.html diff --git a/tests/wpt/web-platform-tests/svg/animations/cyclic-syncbase-2.html b/tests/wpt/tests/svg/animations/cyclic-syncbase-2.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/cyclic-syncbase-2.html rename to tests/wpt/tests/svg/animations/cyclic-syncbase-2.html diff --git a/tests/wpt/web-platform-tests/svg/animations/cyclic-syncbase-events.html b/tests/wpt/tests/svg/animations/cyclic-syncbase-events.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/cyclic-syncbase-events.html rename to tests/wpt/tests/svg/animations/cyclic-syncbase-events.html diff --git a/tests/wpt/web-platform-tests/svg/animations/cyclic-syncbase.html b/tests/wpt/tests/svg/animations/cyclic-syncbase.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/cyclic-syncbase.html rename to tests/wpt/tests/svg/animations/cyclic-syncbase.html diff --git a/tests/wpt/web-platform-tests/svg/animations/dependent-begin-on-syncbase.html b/tests/wpt/tests/svg/animations/dependent-begin-on-syncbase.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/dependent-begin-on-syncbase.html rename to tests/wpt/tests/svg/animations/dependent-begin-on-syncbase.html diff --git a/tests/wpt/web-platform-tests/svg/animations/dependent-end-on-syncbase.html b/tests/wpt/tests/svg/animations/dependent-end-on-syncbase.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/dependent-end-on-syncbase.html rename to tests/wpt/tests/svg/animations/dependent-end-on-syncbase.html diff --git a/tests/wpt/web-platform-tests/svg/animations/end-attribute-change-end-time.html b/tests/wpt/tests/svg/animations/end-attribute-change-end-time.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/end-attribute-change-end-time.html rename to tests/wpt/tests/svg/animations/end-attribute-change-end-time.html diff --git a/tests/wpt/web-platform-tests/svg/animations/end-event.svg b/tests/wpt/tests/svg/animations/end-event.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/end-event.svg rename to tests/wpt/tests/svg/animations/end-event.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/end-of-time-001-crash.html b/tests/wpt/tests/svg/animations/end-of-time-001-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/end-of-time-001-crash.html rename to tests/wpt/tests/svg/animations/end-of-time-001-crash.html diff --git a/tests/wpt/web-platform-tests/svg/animations/end-of-time-002-crash.html b/tests/wpt/tests/svg/animations/end-of-time-002-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/end-of-time-002-crash.html rename to tests/wpt/tests/svg/animations/end-of-time-002-crash.html diff --git a/tests/wpt/web-platform-tests/svg/animations/eventbase-non-svg-element.html b/tests/wpt/tests/svg/animations/eventbase-non-svg-element.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/eventbase-non-svg-element.html rename to tests/wpt/tests/svg/animations/eventbase-non-svg-element.html diff --git a/tests/wpt/web-platform-tests/svg/animations/first-interval-in-the-past-contribute.html b/tests/wpt/tests/svg/animations/first-interval-in-the-past-contribute.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/first-interval-in-the-past-contribute.html rename to tests/wpt/tests/svg/animations/first-interval-in-the-past-contribute.html diff --git a/tests/wpt/web-platform-tests/svg/animations/first-interval-in-the-past-dont-contribute.html b/tests/wpt/tests/svg/animations/first-interval-in-the-past-dont-contribute.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/first-interval-in-the-past-dont-contribute.html rename to tests/wpt/tests/svg/animations/first-interval-in-the-past-dont-contribute.html diff --git a/tests/wpt/web-platform-tests/svg/animations/force-use-shadow-tree-recreation-while-animating.html b/tests/wpt/tests/svg/animations/force-use-shadow-tree-recreation-while-animating.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/force-use-shadow-tree-recreation-while-animating.html rename to tests/wpt/tests/svg/animations/force-use-shadow-tree-recreation-while-animating.html diff --git a/tests/wpt/web-platform-tests/svg/animations/interval-restart-events.html b/tests/wpt/tests/svg/animations/interval-restart-events.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/interval-restart-events.html rename to tests/wpt/tests/svg/animations/interval-restart-events.html diff --git a/tests/wpt/web-platform-tests/svg/animations/keysplines-x-limits.html b/tests/wpt/tests/svg/animations/keysplines-x-limits.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/keysplines-x-limits.html rename to tests/wpt/tests/svg/animations/keysplines-x-limits.html diff --git a/tests/wpt/web-platform-tests/svg/animations/keysplines-y-limits.html b/tests/wpt/tests/svg/animations/keysplines-y-limits.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/keysplines-y-limits.html rename to tests/wpt/tests/svg/animations/keysplines-y-limits.html diff --git a/tests/wpt/web-platform-tests/svg/animations/multiple-animations-ending.html b/tests/wpt/tests/svg/animations/multiple-animations-ending.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/multiple-animations-ending.html rename to tests/wpt/tests/svg/animations/multiple-animations-ending.html diff --git a/tests/wpt/web-platform-tests/svg/animations/multiple-animations-fill-freeze.html b/tests/wpt/tests/svg/animations/multiple-animations-fill-freeze.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/multiple-animations-fill-freeze.html rename to tests/wpt/tests/svg/animations/multiple-animations-fill-freeze.html diff --git a/tests/wpt/web-platform-tests/svg/animations/multiple-begin-additive-animation.html b/tests/wpt/tests/svg/animations/multiple-begin-additive-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/multiple-begin-additive-animation.html rename to tests/wpt/tests/svg/animations/multiple-begin-additive-animation.html diff --git a/tests/wpt/web-platform-tests/svg/animations/non-additive-type-by-animation.html b/tests/wpt/tests/svg/animations/non-additive-type-by-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/non-additive-type-by-animation.html rename to tests/wpt/tests/svg/animations/non-additive-type-by-animation.html diff --git a/tests/wpt/web-platform-tests/svg/animations/non-additive-type-from-by-animation.html b/tests/wpt/tests/svg/animations/non-additive-type-from-by-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/non-additive-type-from-by-animation.html rename to tests/wpt/tests/svg/animations/non-additive-type-from-by-animation.html diff --git a/tests/wpt/web-platform-tests/svg/animations/onbegin.svg b/tests/wpt/tests/svg/animations/onbegin.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/onbegin.svg rename to tests/wpt/tests/svg/animations/onbegin.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/onend.svg b/tests/wpt/tests/svg/animations/onend.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/onend.svg rename to tests/wpt/tests/svg/animations/onend.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/onrepeat.svg b/tests/wpt/tests/svg/animations/onrepeat.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/onrepeat.svg rename to tests/wpt/tests/svg/animations/onrepeat.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/pruning-first-interval.html b/tests/wpt/tests/svg/animations/pruning-first-interval.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/pruning-first-interval.html rename to tests/wpt/tests/svg/animations/pruning-first-interval.html diff --git a/tests/wpt/web-platform-tests/svg/animations/reinserting-svg-into-document.html b/tests/wpt/tests/svg/animations/reinserting-svg-into-document.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/reinserting-svg-into-document.html rename to tests/wpt/tests/svg/animations/reinserting-svg-into-document.html diff --git a/tests/wpt/web-platform-tests/svg/animations/remove-animation-element-while-animation-is-running.html b/tests/wpt/tests/svg/animations/remove-animation-element-while-animation-is-running.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/remove-animation-element-while-animation-is-running.html rename to tests/wpt/tests/svg/animations/remove-animation-element-while-animation-is-running.html diff --git a/tests/wpt/web-platform-tests/svg/animations/repeat-event.svg b/tests/wpt/tests/svg/animations/repeat-event.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/repeat-event.svg rename to tests/wpt/tests/svg/animations/repeat-event.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/repeat-iteration-event-001.svg b/tests/wpt/tests/svg/animations/repeat-iteration-event-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/repeat-iteration-event-001.svg rename to tests/wpt/tests/svg/animations/repeat-iteration-event-001.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/repeat-iteration-event-002.svg b/tests/wpt/tests/svg/animations/repeat-iteration-event-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/repeat-iteration-event-002.svg rename to tests/wpt/tests/svg/animations/repeat-iteration-event-002.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/repeat-iteration-event-003.svg b/tests/wpt/tests/svg/animations/repeat-iteration-event-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/repeat-iteration-event-003.svg rename to tests/wpt/tests/svg/animations/repeat-iteration-event-003.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/repeat-iteration-event-004.svg b/tests/wpt/tests/svg/animations/repeat-iteration-event-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/repeat-iteration-event-004.svg rename to tests/wpt/tests/svg/animations/repeat-iteration-event-004.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/repeat-iteration-event-005.svg b/tests/wpt/tests/svg/animations/repeat-iteration-event-005.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/repeat-iteration-event-005.svg rename to tests/wpt/tests/svg/animations/repeat-iteration-event-005.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/repeat-iteration-event-006.svg b/tests/wpt/tests/svg/animations/repeat-iteration-event-006.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/repeat-iteration-event-006.svg rename to tests/wpt/tests/svg/animations/repeat-iteration-event-006.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/repeatcount-numeric-limit.tentative.svg b/tests/wpt/tests/svg/animations/repeatcount-numeric-limit.tentative.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/repeatcount-numeric-limit.tentative.svg rename to tests/wpt/tests/svg/animations/repeatcount-numeric-limit.tentative.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/repeatn-remove-add-animation.html b/tests/wpt/tests/svg/animations/repeatn-remove-add-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/repeatn-remove-add-animation.html rename to tests/wpt/tests/svg/animations/repeatn-remove-add-animation.html diff --git a/tests/wpt/web-platform-tests/svg/animations/restart-never-and-begin-click.html b/tests/wpt/tests/svg/animations/restart-never-and-begin-click.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/restart-never-and-begin-click.html rename to tests/wpt/tests/svg/animations/restart-never-and-begin-click.html diff --git a/tests/wpt/web-platform-tests/svg/animations/scripted/SVGAnimationElement-exceptions.html b/tests/wpt/tests/svg/animations/scripted/SVGAnimationElement-exceptions.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/scripted/SVGAnimationElement-exceptions.html rename to tests/wpt/tests/svg/animations/scripted/SVGAnimationElement-exceptions.html diff --git a/tests/wpt/web-platform-tests/svg/animations/scripted/SVGAnimationElement-getStartTime.html b/tests/wpt/tests/svg/animations/scripted/SVGAnimationElement-getStartTime.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/scripted/SVGAnimationElement-getStartTime.html rename to tests/wpt/tests/svg/animations/scripted/SVGAnimationElement-getStartTime.html diff --git a/tests/wpt/web-platform-tests/svg/animations/scripted/animatetransform-type-missing-value-default.html b/tests/wpt/tests/svg/animations/scripted/animatetransform-type-missing-value-default.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/scripted/animatetransform-type-missing-value-default.html rename to tests/wpt/tests/svg/animations/scripted/animatetransform-type-missing-value-default.html diff --git a/tests/wpt/web-platform-tests/svg/animations/scripted/end-element-on-inactive-element.svg b/tests/wpt/tests/svg/animations/scripted/end-element-on-inactive-element.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/scripted/end-element-on-inactive-element.svg rename to tests/wpt/tests/svg/animations/scripted/end-element-on-inactive-element.svg diff --git a/tests/wpt/web-platform-tests/svg/animations/scripted/onhover-syncbases.html b/tests/wpt/tests/svg/animations/scripted/onhover-syncbases.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/scripted/onhover-syncbases.html rename to tests/wpt/tests/svg/animations/scripted/onhover-syncbases.html diff --git a/tests/wpt/web-platform-tests/svg/animations/scripted/paced-value-animation-overwrites-keyTimes.html b/tests/wpt/tests/svg/animations/scripted/paced-value-animation-overwrites-keyTimes.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/scripted/paced-value-animation-overwrites-keyTimes.html rename to tests/wpt/tests/svg/animations/scripted/paced-value-animation-overwrites-keyTimes.html diff --git a/tests/wpt/web-platform-tests/svg/animations/seeking-events-1.html b/tests/wpt/tests/svg/animations/seeking-events-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/seeking-events-1.html rename to tests/wpt/tests/svg/animations/seeking-events-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/seeking-events-2.html b/tests/wpt/tests/svg/animations/seeking-events-2.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/seeking-events-2.html rename to tests/wpt/tests/svg/animations/seeking-events-2.html diff --git a/tests/wpt/web-platform-tests/svg/animations/seeking-events-3.html b/tests/wpt/tests/svg/animations/seeking-events-3.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/seeking-events-3.html rename to tests/wpt/tests/svg/animations/seeking-events-3.html diff --git a/tests/wpt/web-platform-tests/svg/animations/seeking-events-4.html b/tests/wpt/tests/svg/animations/seeking-events-4.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/seeking-events-4.html rename to tests/wpt/tests/svg/animations/seeking-events-4.html diff --git a/tests/wpt/web-platform-tests/svg/animations/seeking-events-5.html b/tests/wpt/tests/svg/animations/seeking-events-5.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/seeking-events-5.html rename to tests/wpt/tests/svg/animations/seeking-events-5.html diff --git a/tests/wpt/web-platform-tests/svg/animations/seeking-events-6.html b/tests/wpt/tests/svg/animations/seeking-events-6.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/seeking-events-6.html rename to tests/wpt/tests/svg/animations/seeking-events-6.html diff --git a/tests/wpt/web-platform-tests/svg/animations/seeking-events-7.html b/tests/wpt/tests/svg/animations/seeking-events-7.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/seeking-events-7.html rename to tests/wpt/tests/svg/animations/seeking-events-7.html diff --git a/tests/wpt/web-platform-tests/svg/animations/seeking-events-8.html b/tests/wpt/tests/svg/animations/seeking-events-8.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/seeking-events-8.html rename to tests/wpt/tests/svg/animations/seeking-events-8.html diff --git a/tests/wpt/web-platform-tests/svg/animations/seeking-to-large-time.html b/tests/wpt/tests/svg/animations/seeking-to-large-time.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/seeking-to-large-time.html rename to tests/wpt/tests/svg/animations/seeking-to-large-time.html diff --git a/tests/wpt/web-platform-tests/svg/animations/short-simple-duration-and-fractional-repeatcount.html b/tests/wpt/tests/svg/animations/short-simple-duration-and-fractional-repeatcount.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/short-simple-duration-and-fractional-repeatcount.html rename to tests/wpt/tests/svg/animations/short-simple-duration-and-fractional-repeatcount.html diff --git a/tests/wpt/web-platform-tests/svg/animations/single-values-animation.html b/tests/wpt/tests/svg/animations/single-values-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/single-values-animation.html rename to tests/wpt/tests/svg/animations/single-values-animation.html diff --git a/tests/wpt/web-platform-tests/svg/animations/slider-switch.html b/tests/wpt/tests/svg/animations/slider-switch.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/slider-switch.html rename to tests/wpt/tests/svg/animations/slider-switch.html diff --git a/tests/wpt/web-platform-tests/svg/animations/spaces-at-end-of-path-data.html b/tests/wpt/tests/svg/animations/spaces-at-end-of-path-data.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/spaces-at-end-of-path-data.html rename to tests/wpt/tests/svg/animations/spaces-at-end-of-path-data.html diff --git a/tests/wpt/web-platform-tests/svg/animations/support/animated-path-helpers.js b/tests/wpt/tests/svg/animations/support/animated-path-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/support/animated-path-helpers.js rename to tests/wpt/tests/svg/animations/support/animated-path-helpers.js diff --git a/tests/wpt/web-platform-tests/svg/animations/svg-style-animate-crash.html b/tests/wpt/tests/svg/animations/svg-style-animate-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svg-style-animate-crash.html rename to tests/wpt/tests/svg/animations/svg-style-animate-crash.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgangle-animation-deg-to-grad.html b/tests/wpt/tests/svg/animations/svgangle-animation-deg-to-grad.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgangle-animation-deg-to-grad.html rename to tests/wpt/tests/svg/animations/svgangle-animation-deg-to-grad.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgangle-animation-deg-to-rad.html b/tests/wpt/tests/svg/animations/svgangle-animation-deg-to-rad.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgangle-animation-deg-to-rad.html rename to tests/wpt/tests/svg/animations/svgangle-animation-deg-to-rad.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgangle-animation-grad-to-deg.html b/tests/wpt/tests/svg/animations/svgangle-animation-grad-to-deg.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgangle-animation-grad-to-deg.html rename to tests/wpt/tests/svg/animations/svgangle-animation-grad-to-deg.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgangle-animation-grad-to-rad.html b/tests/wpt/tests/svg/animations/svgangle-animation-grad-to-rad.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgangle-animation-grad-to-rad.html rename to tests/wpt/tests/svg/animations/svgangle-animation-grad-to-rad.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgangle-animation-rad-to-deg.html b/tests/wpt/tests/svg/animations/svgangle-animation-rad-to-deg.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgangle-animation-rad-to-deg.html rename to tests/wpt/tests/svg/animations/svgangle-animation-rad-to-deg.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgangle-animation-rad-to-grad.html b/tests/wpt/tests/svg/animations/svgangle-animation-rad-to-grad.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgangle-animation-rad-to-grad.html rename to tests/wpt/tests/svg/animations/svgangle-animation-rad-to-grad.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgboolean-animation-1.html b/tests/wpt/tests/svg/animations/svgboolean-animation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgboolean-animation-1.html rename to tests/wpt/tests/svg/animations/svgboolean-animation-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgenum-animation-1.html b/tests/wpt/tests/svg/animations/svgenum-animation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgenum-animation-1.html rename to tests/wpt/tests/svg/animations/svgenum-animation-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgenum-animation-10.html b/tests/wpt/tests/svg/animations/svgenum-animation-10.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgenum-animation-10.html rename to tests/wpt/tests/svg/animations/svgenum-animation-10.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgenum-animation-11.html b/tests/wpt/tests/svg/animations/svgenum-animation-11.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgenum-animation-11.html rename to tests/wpt/tests/svg/animations/svgenum-animation-11.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgenum-animation-12.html b/tests/wpt/tests/svg/animations/svgenum-animation-12.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgenum-animation-12.html rename to tests/wpt/tests/svg/animations/svgenum-animation-12.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgenum-animation-13.html b/tests/wpt/tests/svg/animations/svgenum-animation-13.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgenum-animation-13.html rename to tests/wpt/tests/svg/animations/svgenum-animation-13.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgenum-animation-2.html b/tests/wpt/tests/svg/animations/svgenum-animation-2.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgenum-animation-2.html rename to tests/wpt/tests/svg/animations/svgenum-animation-2.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgenum-animation-3.html b/tests/wpt/tests/svg/animations/svgenum-animation-3.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgenum-animation-3.html rename to tests/wpt/tests/svg/animations/svgenum-animation-3.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgenum-animation-4.html b/tests/wpt/tests/svg/animations/svgenum-animation-4.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgenum-animation-4.html rename to tests/wpt/tests/svg/animations/svgenum-animation-4.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgenum-animation-5.html b/tests/wpt/tests/svg/animations/svgenum-animation-5.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgenum-animation-5.html rename to tests/wpt/tests/svg/animations/svgenum-animation-5.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgenum-animation-6.html b/tests/wpt/tests/svg/animations/svgenum-animation-6.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgenum-animation-6.html rename to tests/wpt/tests/svg/animations/svgenum-animation-6.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgenum-animation-7.html b/tests/wpt/tests/svg/animations/svgenum-animation-7.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgenum-animation-7.html rename to tests/wpt/tests/svg/animations/svgenum-animation-7.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgenum-animation-8.html b/tests/wpt/tests/svg/animations/svgenum-animation-8.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgenum-animation-8.html rename to tests/wpt/tests/svg/animations/svgenum-animation-8.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgenum-animation-9.html b/tests/wpt/tests/svg/animations/svgenum-animation-9.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgenum-animation-9.html rename to tests/wpt/tests/svg/animations/svgenum-animation-9.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svginteger-animation-1.html b/tests/wpt/tests/svg/animations/svginteger-animation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svginteger-animation-1.html rename to tests/wpt/tests/svg/animations/svginteger-animation-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svginteger-animation-2.html b/tests/wpt/tests/svg/animations/svginteger-animation-2.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svginteger-animation-2.html rename to tests/wpt/tests/svg/animations/svginteger-animation-2.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-additive-by-1.html b/tests/wpt/tests/svg/animations/svglength-additive-by-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-additive-by-1.html rename to tests/wpt/tests/svg/animations/svglength-additive-by-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-additive-by-2.html b/tests/wpt/tests/svg/animations/svglength-additive-by-2.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-additive-by-2.html rename to tests/wpt/tests/svg/animations/svglength-additive-by-2.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-additive-by-3.html b/tests/wpt/tests/svg/animations/svglength-additive-by-3.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-additive-by-3.html rename to tests/wpt/tests/svg/animations/svglength-additive-by-3.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-additive-by-4.html b/tests/wpt/tests/svg/animations/svglength-additive-by-4.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-additive-by-4.html rename to tests/wpt/tests/svg/animations/svglength-additive-by-4.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-additive-by-6.html b/tests/wpt/tests/svg/animations/svglength-additive-by-6.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-additive-by-6.html rename to tests/wpt/tests/svg/animations/svglength-additive-by-6.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-additive-by-7.html b/tests/wpt/tests/svg/animations/svglength-additive-by-7.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-additive-by-7.html rename to tests/wpt/tests/svg/animations/svglength-additive-by-7.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-additive-by-8.html b/tests/wpt/tests/svg/animations/svglength-additive-by-8.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-additive-by-8.html rename to tests/wpt/tests/svg/animations/svglength-additive-by-8.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-additive-from-by-1.html b/tests/wpt/tests/svg/animations/svglength-additive-from-by-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-additive-from-by-1.html rename to tests/wpt/tests/svg/animations/svglength-additive-from-by-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-additive-from-by-2.html b/tests/wpt/tests/svg/animations/svglength-additive-from-by-2.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-additive-from-by-2.html rename to tests/wpt/tests/svg/animations/svglength-additive-from-by-2.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-additive-from-by-3.html b/tests/wpt/tests/svg/animations/svglength-additive-from-by-3.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-additive-from-by-3.html rename to tests/wpt/tests/svg/animations/svglength-additive-from-by-3.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-additive-from-by-4.html b/tests/wpt/tests/svg/animations/svglength-additive-from-by-4.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-additive-from-by-4.html rename to tests/wpt/tests/svg/animations/svglength-additive-from-by-4.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-LengthModeHeight.html b/tests/wpt/tests/svg/animations/svglength-animation-LengthModeHeight.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-LengthModeHeight.html rename to tests/wpt/tests/svg/animations/svglength-animation-LengthModeHeight.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-LengthModeOther.html b/tests/wpt/tests/svg/animations/svglength-animation-LengthModeOther.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-LengthModeOther.html rename to tests/wpt/tests/svg/animations/svglength-animation-LengthModeOther.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-LengthModeWidth.html b/tests/wpt/tests/svg/animations/svglength-animation-LengthModeWidth.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-LengthModeWidth.html rename to tests/wpt/tests/svg/animations/svglength-animation-LengthModeWidth.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-1.html b/tests/wpt/tests/svg/animations/svglength-animation-invalid-value-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-1.html rename to tests/wpt/tests/svg/animations/svglength-animation-invalid-value-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-2.html b/tests/wpt/tests/svg/animations/svglength-animation-invalid-value-2.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-2.html rename to tests/wpt/tests/svg/animations/svglength-animation-invalid-value-2.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-3.html b/tests/wpt/tests/svg/animations/svglength-animation-invalid-value-3.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-3.html rename to tests/wpt/tests/svg/animations/svglength-animation-invalid-value-3.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-number-to-number.html b/tests/wpt/tests/svg/animations/svglength-animation-number-to-number.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-number-to-number.html rename to tests/wpt/tests/svg/animations/svglength-animation-number-to-number.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-px-to-cm.html b/tests/wpt/tests/svg/animations/svglength-animation-px-to-cm.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-px-to-cm.html rename to tests/wpt/tests/svg/animations/svglength-animation-px-to-cm.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-px-to-ems.html b/tests/wpt/tests/svg/animations/svglength-animation-px-to-ems.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-px-to-ems.html rename to tests/wpt/tests/svg/animations/svglength-animation-px-to-ems.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-px-to-in.html b/tests/wpt/tests/svg/animations/svglength-animation-px-to-in.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-px-to-in.html rename to tests/wpt/tests/svg/animations/svglength-animation-px-to-in.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-px-to-number.html b/tests/wpt/tests/svg/animations/svglength-animation-px-to-number.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-px-to-number.html rename to tests/wpt/tests/svg/animations/svglength-animation-px-to-number.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-px-to-pc.html b/tests/wpt/tests/svg/animations/svglength-animation-px-to-pc.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-px-to-pc.html rename to tests/wpt/tests/svg/animations/svglength-animation-px-to-pc.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-px-to-pt.html b/tests/wpt/tests/svg/animations/svglength-animation-px-to-pt.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-px-to-pt.html rename to tests/wpt/tests/svg/animations/svglength-animation-px-to-pt.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-px-to-px.html b/tests/wpt/tests/svg/animations/svglength-animation-px-to-px.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-px-to-px.html rename to tests/wpt/tests/svg/animations/svglength-animation-px-to-px.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-unitType.html b/tests/wpt/tests/svg/animations/svglength-animation-unitType.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-unitType.html rename to tests/wpt/tests/svg/animations/svglength-animation-unitType.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-values.html b/tests/wpt/tests/svg/animations/svglength-animation-values.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglength-animation-values.html rename to tests/wpt/tests/svg/animations/svglength-animation-values.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglengthlist-animation-1.html b/tests/wpt/tests/svg/animations/svglengthlist-animation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglengthlist-animation-1.html rename to tests/wpt/tests/svg/animations/svglengthlist-animation-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglengthlist-animation-2.html b/tests/wpt/tests/svg/animations/svglengthlist-animation-2.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglengthlist-animation-2.html rename to tests/wpt/tests/svg/animations/svglengthlist-animation-2.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglengthlist-animation-3.html b/tests/wpt/tests/svg/animations/svglengthlist-animation-3.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglengthlist-animation-3.html rename to tests/wpt/tests/svg/animations/svglengthlist-animation-3.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglengthlist-animation-4.html b/tests/wpt/tests/svg/animations/svglengthlist-animation-4.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglengthlist-animation-4.html rename to tests/wpt/tests/svg/animations/svglengthlist-animation-4.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svglengthlist-animation-5.html b/tests/wpt/tests/svg/animations/svglengthlist-animation-5.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svglengthlist-animation-5.html rename to tests/wpt/tests/svg/animations/svglengthlist-animation-5.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgnumber-animation-1.html b/tests/wpt/tests/svg/animations/svgnumber-animation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgnumber-animation-1.html rename to tests/wpt/tests/svg/animations/svgnumber-animation-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgnumber-animation-2.html b/tests/wpt/tests/svg/animations/svgnumber-animation-2.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgnumber-animation-2.html rename to tests/wpt/tests/svg/animations/svgnumber-animation-2.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgnumber-animation-3.html b/tests/wpt/tests/svg/animations/svgnumber-animation-3.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgnumber-animation-3.html rename to tests/wpt/tests/svg/animations/svgnumber-animation-3.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgnumber-animation-4.html b/tests/wpt/tests/svg/animations/svgnumber-animation-4.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgnumber-animation-4.html rename to tests/wpt/tests/svg/animations/svgnumber-animation-4.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgnumberlist-animation-1.html b/tests/wpt/tests/svg/animations/svgnumberlist-animation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgnumberlist-animation-1.html rename to tests/wpt/tests/svg/animations/svgnumberlist-animation-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgnumberlist-animation-2.html b/tests/wpt/tests/svg/animations/svgnumberlist-animation-2.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgnumberlist-animation-2.html rename to tests/wpt/tests/svg/animations/svgnumberlist-animation-2.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgnumberoptionalnumber-animation-1.html b/tests/wpt/tests/svg/animations/svgnumberoptionalnumber-animation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgnumberoptionalnumber-animation-1.html rename to tests/wpt/tests/svg/animations/svgnumberoptionalnumber-animation-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgnumberoptionalnumber-animation-2.html b/tests/wpt/tests/svg/animations/svgnumberoptionalnumber-animation-2.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgnumberoptionalnumber-animation-2.html rename to tests/wpt/tests/svg/animations/svgnumberoptionalnumber-animation-2.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgnumberoptionalnumber-animation-3.html b/tests/wpt/tests/svg/animations/svgnumberoptionalnumber-animation-3.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgnumberoptionalnumber-animation-3.html rename to tests/wpt/tests/svg/animations/svgnumberoptionalnumber-animation-3.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgnumberoptionalnumber-animation-4.html b/tests/wpt/tests/svg/animations/svgnumberoptionalnumber-animation-4.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgnumberoptionalnumber-animation-4.html rename to tests/wpt/tests/svg/animations/svgnumberoptionalnumber-animation-4.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgpath-animation-1.tentative.html b/tests/wpt/tests/svg/animations/svgpath-animation-1.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgpath-animation-1.tentative.html rename to tests/wpt/tests/svg/animations/svgpath-animation-1.tentative.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgpointlist-animation-1.html b/tests/wpt/tests/svg/animations/svgpointlist-animation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgpointlist-animation-1.html rename to tests/wpt/tests/svg/animations/svgpointlist-animation-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgpointlist-animation-2.html b/tests/wpt/tests/svg/animations/svgpointlist-animation-2.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgpointlist-animation-2.html rename to tests/wpt/tests/svg/animations/svgpointlist-animation-2.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgrect-animation-1.html b/tests/wpt/tests/svg/animations/svgrect-animation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgrect-animation-1.html rename to tests/wpt/tests/svg/animations/svgrect-animation-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgrect-animation-2.html b/tests/wpt/tests/svg/animations/svgrect-animation-2.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgrect-animation-2.html rename to tests/wpt/tests/svg/animations/svgrect-animation-2.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgstring-animation-1.html b/tests/wpt/tests/svg/animations/svgstring-animation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgstring-animation-1.html rename to tests/wpt/tests/svg/animations/svgstring-animation-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgstring-animation-fallback-to-discrete.html b/tests/wpt/tests/svg/animations/svgstring-animation-fallback-to-discrete.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgstring-animation-fallback-to-discrete.html rename to tests/wpt/tests/svg/animations/svgstring-animation-fallback-to-discrete.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgtransform-animation-1.html b/tests/wpt/tests/svg/animations/svgtransform-animation-1.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgtransform-animation-1.html rename to tests/wpt/tests/svg/animations/svgtransform-animation-1.html diff --git a/tests/wpt/web-platform-tests/svg/animations/svgtransform-animation-discrete.html b/tests/wpt/tests/svg/animations/svgtransform-animation-discrete.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/svgtransform-animation-discrete.html rename to tests/wpt/tests/svg/animations/svgtransform-animation-discrete.html diff --git a/tests/wpt/web-platform-tests/svg/animations/switching-animated-target-to-unknown-element.html b/tests/wpt/tests/svg/animations/switching-animated-target-to-unknown-element.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/switching-animated-target-to-unknown-element.html rename to tests/wpt/tests/svg/animations/switching-animated-target-to-unknown-element.html diff --git a/tests/wpt/web-platform-tests/svg/animations/syncbase-remove-add-while-running.html b/tests/wpt/tests/svg/animations/syncbase-remove-add-while-running.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/syncbase-remove-add-while-running.html rename to tests/wpt/tests/svg/animations/syncbase-remove-add-while-running.html diff --git a/tests/wpt/web-platform-tests/svg/animations/use-animate-display-none-symbol.html b/tests/wpt/tests/svg/animations/use-animate-display-none-symbol.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/animations/use-animate-display-none-symbol.html rename to tests/wpt/tests/svg/animations/use-animate-display-none-symbol.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/abspos.html b/tests/wpt/tests/svg/coordinate-systems/abspos.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/abspos.html rename to tests/wpt/tests/svg/coordinate-systems/abspos.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/outer-svg-intrinsic-size-001.html b/tests/wpt/tests/svg/coordinate-systems/outer-svg-intrinsic-size-001.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/outer-svg-intrinsic-size-001.html rename to tests/wpt/tests/svg/coordinate-systems/outer-svg-intrinsic-size-001.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/outer-svg-intrinsic-size-002.html b/tests/wpt/tests/svg/coordinate-systems/outer-svg-intrinsic-size-002.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/outer-svg-intrinsic-size-002.html rename to tests/wpt/tests/svg/coordinate-systems/outer-svg-intrinsic-size-002.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/outer-svg-intrinsic-size-003.html b/tests/wpt/tests/svg/coordinate-systems/outer-svg-intrinsic-size-003.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/outer-svg-intrinsic-size-003.html rename to tests/wpt/tests/svg/coordinate-systems/outer-svg-intrinsic-size-003.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/outer-svg-intrinsic-size-004.html b/tests/wpt/tests/svg/coordinate-systems/outer-svg-intrinsic-size-004.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/outer-svg-intrinsic-size-004.html rename to tests/wpt/tests/svg/coordinate-systems/outer-svg-intrinsic-size-004.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/outer-svg-intrinsic-size-005.html b/tests/wpt/tests/svg/coordinate-systems/outer-svg-intrinsic-size-005.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/outer-svg-intrinsic-size-005.html rename to tests/wpt/tests/svg/coordinate-systems/outer-svg-intrinsic-size-005.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/support/abspos-ref.html b/tests/wpt/tests/svg/coordinate-systems/support/abspos-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/support/abspos-ref.html rename to tests/wpt/tests/svg/coordinate-systems/support/abspos-ref.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/support/simple.svg b/tests/wpt/tests/svg/coordinate-systems/support/simple.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/support/simple.svg rename to tests/wpt/tests/svg/coordinate-systems/support/simple.svg diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/support/viewBox-change-repaint-001-ref.html b/tests/wpt/tests/svg/coordinate-systems/support/viewBox-change-repaint-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/support/viewBox-change-repaint-001-ref.html rename to tests/wpt/tests/svg/coordinate-systems/support/viewBox-change-repaint-001-ref.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/support/viewBox-scaling-text-001-ref.html b/tests/wpt/tests/svg/coordinate-systems/support/viewBox-scaling-text-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/support/viewBox-scaling-text-001-ref.html rename to tests/wpt/tests/svg/coordinate-systems/support/viewBox-scaling-text-001-ref.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/support/views.svg b/tests/wpt/tests/svg/coordinate-systems/support/views.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/support/views.svg rename to tests/wpt/tests/svg/coordinate-systems/support/views.svg diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/svgtransformlist-replaceitem.html b/tests/wpt/tests/svg/coordinate-systems/svgtransformlist-replaceitem.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/svgtransformlist-replaceitem.html rename to tests/wpt/tests/svg/coordinate-systems/svgtransformlist-replaceitem.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/view-invalid-viewBox.html b/tests/wpt/tests/svg/coordinate-systems/view-invalid-viewBox.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/view-invalid-viewBox.html rename to tests/wpt/tests/svg/coordinate-systems/view-invalid-viewBox.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/view-transform-viewBox.html b/tests/wpt/tests/svg/coordinate-systems/view-transform-viewBox.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/view-transform-viewBox.html rename to tests/wpt/tests/svg/coordinate-systems/view-transform-viewBox.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/viewBox-baseVal-change-invalid.html b/tests/wpt/tests/svg/coordinate-systems/viewBox-baseVal-change-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/viewBox-baseVal-change-invalid.html rename to tests/wpt/tests/svg/coordinate-systems/viewBox-baseVal-change-invalid.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/viewBox-change-repaint-001.html b/tests/wpt/tests/svg/coordinate-systems/viewBox-change-repaint-001.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/viewBox-change-repaint-001.html rename to tests/wpt/tests/svg/coordinate-systems/viewBox-change-repaint-001.html diff --git a/tests/wpt/web-platform-tests/svg/coordinate-systems/viewBox-scaling-text-001.html b/tests/wpt/tests/svg/coordinate-systems/viewBox-scaling-text-001.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/coordinate-systems/viewBox-scaling-text-001.html rename to tests/wpt/tests/svg/coordinate-systems/viewBox-scaling-text-001.html diff --git a/tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1172059.html b/tests/wpt/tests/svg/crashtests/chrome-bug-1172059.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1172059.html rename to tests/wpt/tests/svg/crashtests/chrome-bug-1172059.html diff --git a/tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1205852.html b/tests/wpt/tests/svg/crashtests/chrome-bug-1205852.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1205852.html rename to tests/wpt/tests/svg/crashtests/chrome-bug-1205852.html diff --git a/tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1207590.html b/tests/wpt/tests/svg/crashtests/chrome-bug-1207590.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1207590.html rename to tests/wpt/tests/svg/crashtests/chrome-bug-1207590.html diff --git a/tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1238412.html b/tests/wpt/tests/svg/crashtests/chrome-bug-1238412.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1238412.html rename to tests/wpt/tests/svg/crashtests/chrome-bug-1238412.html diff --git a/tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1345806.html b/tests/wpt/tests/svg/crashtests/chrome-bug-1345806.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1345806.html rename to tests/wpt/tests/svg/crashtests/chrome-bug-1345806.html diff --git a/tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1371700.html b/tests/wpt/tests/svg/crashtests/chrome-bug-1371700.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/crashtests/chrome-bug-1371700.html rename to tests/wpt/tests/svg/crashtests/chrome-bug-1371700.html diff --git a/tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1688293.html b/tests/wpt/tests/svg/crashtests/firefox-bug-1688293.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1688293.html rename to tests/wpt/tests/svg/crashtests/firefox-bug-1688293.html diff --git a/tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1703592.html b/tests/wpt/tests/svg/crashtests/firefox-bug-1703592.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1703592.html rename to tests/wpt/tests/svg/crashtests/firefox-bug-1703592.html diff --git a/tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1719483.html b/tests/wpt/tests/svg/crashtests/firefox-bug-1719483.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1719483.html rename to tests/wpt/tests/svg/crashtests/firefox-bug-1719483.html diff --git a/tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1723249.html b/tests/wpt/tests/svg/crashtests/firefox-bug-1723249.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1723249.html rename to tests/wpt/tests/svg/crashtests/firefox-bug-1723249.html diff --git a/tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1724237.html b/tests/wpt/tests/svg/crashtests/firefox-bug-1724237.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1724237.html rename to tests/wpt/tests/svg/crashtests/firefox-bug-1724237.html diff --git a/tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1753105.html b/tests/wpt/tests/svg/crashtests/firefox-bug-1753105.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/crashtests/firefox-bug-1753105.html rename to tests/wpt/tests/svg/crashtests/firefox-bug-1753105.html diff --git a/tests/wpt/web-platform-tests/svg/crashtests/support/used.svg b/tests/wpt/tests/svg/crashtests/support/used.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/crashtests/support/used.svg rename to tests/wpt/tests/svg/crashtests/support/used.svg diff --git a/tests/wpt/web-platform-tests/svg/embedded/image-crossorigin.sub.html b/tests/wpt/tests/svg/embedded/image-crossorigin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/embedded/image-crossorigin.sub.html rename to tests/wpt/tests/svg/embedded/image-crossorigin.sub.html diff --git a/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-nested-svg-in-foreignobject.html b/tests/wpt/tests/svg/embedded/image-embedding-svg-nested-svg-in-foreignobject.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-nested-svg-in-foreignobject.html rename to tests/wpt/tests/svg/embedded/image-embedding-svg-nested-svg-in-foreignobject.html diff --git a/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-viewref-with-viewbox.svg b/tests/wpt/tests/svg/embedded/image-embedding-svg-viewref-with-viewbox.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-viewref-with-viewbox.svg rename to tests/wpt/tests/svg/embedded/image-embedding-svg-viewref-with-viewbox.svg diff --git a/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-auto-height.svg b/tests/wpt/tests/svg/embedded/image-embedding-svg-with-auto-height.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-auto-height.svg rename to tests/wpt/tests/svg/embedded/image-embedding-svg-with-auto-height.svg diff --git a/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-fractional-viewbox.svg b/tests/wpt/tests/svg/embedded/image-embedding-svg-with-fractional-viewbox.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-fractional-viewbox.svg rename to tests/wpt/tests/svg/embedded/image-embedding-svg-with-fractional-viewbox.svg diff --git a/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-near-integral-width-ref.html b/tests/wpt/tests/svg/embedded/image-embedding-svg-with-near-integral-width-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-near-integral-width-ref.html rename to tests/wpt/tests/svg/embedded/image-embedding-svg-with-near-integral-width-ref.html diff --git a/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-near-integral-width.html b/tests/wpt/tests/svg/embedded/image-embedding-svg-with-near-integral-width.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-near-integral-width.html rename to tests/wpt/tests/svg/embedded/image-embedding-svg-with-near-integral-width.html diff --git a/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-viewport-units-inline-style.svg b/tests/wpt/tests/svg/embedded/image-embedding-svg-with-viewport-units-inline-style.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-viewport-units-inline-style.svg rename to tests/wpt/tests/svg/embedded/image-embedding-svg-with-viewport-units-inline-style.svg diff --git a/tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-viewport-units.svg b/tests/wpt/tests/svg/embedded/image-embedding-svg-with-viewport-units.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/embedded/image-embedding-svg-with-viewport-units.svg rename to tests/wpt/tests/svg/embedded/image-embedding-svg-with-viewport-units.svg diff --git a/tests/wpt/web-platform-tests/svg/embedded/image-fractional-width-vertical-fidelity.svg b/tests/wpt/tests/svg/embedded/image-fractional-width-vertical-fidelity.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/embedded/image-fractional-width-vertical-fidelity.svg rename to tests/wpt/tests/svg/embedded/image-fractional-width-vertical-fidelity.svg diff --git a/tests/wpt/web-platform-tests/svg/embedded/reference/green-rect-100x100.svg b/tests/wpt/tests/svg/embedded/reference/green-rect-100x100.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/embedded/reference/green-rect-100x100.svg rename to tests/wpt/tests/svg/embedded/reference/green-rect-100x100.svg diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/composited-inside-object-ref.html b/tests/wpt/tests/svg/extensibility/foreignObject/composited-inside-object-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/composited-inside-object-ref.html rename to tests/wpt/tests/svg/extensibility/foreignObject/composited-inside-object-ref.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/composited-inside-object.html b/tests/wpt/tests/svg/extensibility/foreignObject/composited-inside-object.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/composited-inside-object.html rename to tests/wpt/tests/svg/extensibility/foreignObject/composited-inside-object.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/compositing-backface-visibility-ref.html b/tests/wpt/tests/svg/extensibility/foreignObject/compositing-backface-visibility-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/compositing-backface-visibility-ref.html rename to tests/wpt/tests/svg/extensibility/foreignObject/compositing-backface-visibility-ref.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/compositing-backface-visibility.html b/tests/wpt/tests/svg/extensibility/foreignObject/compositing-backface-visibility.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/compositing-backface-visibility.html rename to tests/wpt/tests/svg/extensibility/foreignObject/compositing-backface-visibility.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/containing-block.html b/tests/wpt/tests/svg/extensibility/foreignObject/containing-block.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/containing-block.html rename to tests/wpt/tests/svg/extensibility/foreignObject/containing-block.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/filter-repaint-ref.html b/tests/wpt/tests/svg/extensibility/foreignObject/filter-repaint-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/filter-repaint-ref.html rename to tests/wpt/tests/svg/extensibility/foreignObject/filter-repaint-ref.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/filter-repaint.html b/tests/wpt/tests/svg/extensibility/foreignObject/filter-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/filter-repaint.html rename to tests/wpt/tests/svg/extensibility/foreignObject/filter-repaint.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-circular-filter-reference-crash.html b/tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-circular-filter-reference-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-circular-filter-reference-crash.html rename to tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-circular-filter-reference-crash.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-margin-collapsing.html b/tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-margin-collapsing.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-margin-collapsing.html rename to tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-margin-collapsing.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect-ref.html b/tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect-ref.html rename to tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect-ref.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect.html b/tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect.html rename to tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-scale-scroll-ref.html b/tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-scale-scroll-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-scale-scroll-ref.html rename to tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-scale-scroll-ref.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-scale-scroll.html b/tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-scale-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-scale-scroll.html rename to tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-scale-scroll.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-size-ref.html b/tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-size-ref.html rename to tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-size-ref.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-size.html b/tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-size.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-size.html rename to tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-size.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-under-clip-path-crash.html b/tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-under-clip-path-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-under-clip-path-crash.html rename to tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-under-clip-path-crash.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-under-defs-crash.html b/tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-under-defs-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-under-defs-crash.html rename to tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-under-defs-crash.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-with-position-under-clip-path.html b/tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-with-position-under-clip-path.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-with-position-under-clip-path.html rename to tests/wpt/tests/svg/extensibility/foreignObject/foreign-object-with-position-under-clip-path.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/getboundingclientrect.html b/tests/wpt/tests/svg/extensibility/foreignObject/getboundingclientrect.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/getboundingclientrect.html rename to tests/wpt/tests/svg/extensibility/foreignObject/getboundingclientrect.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/isolation-with-html-ref.html b/tests/wpt/tests/svg/extensibility/foreignObject/isolation-with-html-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/isolation-with-html-ref.html rename to tests/wpt/tests/svg/extensibility/foreignObject/isolation-with-html-ref.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/isolation-with-html.html b/tests/wpt/tests/svg/extensibility/foreignObject/isolation-with-html.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/isolation-with-html.html rename to tests/wpt/tests/svg/extensibility/foreignObject/isolation-with-html.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/isolation-with-svg-ref.html b/tests/wpt/tests/svg/extensibility/foreignObject/isolation-with-svg-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/isolation-with-svg-ref.html rename to tests/wpt/tests/svg/extensibility/foreignObject/isolation-with-svg-ref.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/isolation-with-svg.html b/tests/wpt/tests/svg/extensibility/foreignObject/isolation-with-svg.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/isolation-with-svg.html rename to tests/wpt/tests/svg/extensibility/foreignObject/isolation-with-svg.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/masked-ref.html b/tests/wpt/tests/svg/extensibility/foreignObject/masked-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/masked-ref.html rename to tests/wpt/tests/svg/extensibility/foreignObject/masked-ref.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/masked.html b/tests/wpt/tests/svg/extensibility/foreignObject/masked.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/masked.html rename to tests/wpt/tests/svg/extensibility/foreignObject/masked.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/overlapped-positioned-and-will-change-transform-descendant.html b/tests/wpt/tests/svg/extensibility/foreignObject/overlapped-positioned-and-will-change-transform-descendant.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/overlapped-positioned-and-will-change-transform-descendant.html rename to tests/wpt/tests/svg/extensibility/foreignObject/overlapped-positioned-and-will-change-transform-descendant.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/position-svg-root-in-foreign-object-ref.html b/tests/wpt/tests/svg/extensibility/foreignObject/position-svg-root-in-foreign-object-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/position-svg-root-in-foreign-object-ref.html rename to tests/wpt/tests/svg/extensibility/foreignObject/position-svg-root-in-foreign-object-ref.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html b/tests/wpt/tests/svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html rename to tests/wpt/tests/svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/properties.svg b/tests/wpt/tests/svg/extensibility/foreignObject/properties.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/properties.svg rename to tests/wpt/tests/svg/extensibility/foreignObject/properties.svg diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/scroll-transform-nested-stacked-children-ref.html b/tests/wpt/tests/svg/extensibility/foreignObject/scroll-transform-nested-stacked-children-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/scroll-transform-nested-stacked-children-ref.html rename to tests/wpt/tests/svg/extensibility/foreignObject/scroll-transform-nested-stacked-children-ref.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/scroll-transform-nested-stacked-children.html b/tests/wpt/tests/svg/extensibility/foreignObject/scroll-transform-nested-stacked-children.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/scroll-transform-nested-stacked-children.html rename to tests/wpt/tests/svg/extensibility/foreignObject/scroll-transform-nested-stacked-children.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/stacking-context-ref.html b/tests/wpt/tests/svg/extensibility/foreignObject/stacking-context-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/stacking-context-ref.html rename to tests/wpt/tests/svg/extensibility/foreignObject/stacking-context-ref.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/stacking-context.html b/tests/wpt/tests/svg/extensibility/foreignObject/stacking-context.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/stacking-context.html rename to tests/wpt/tests/svg/extensibility/foreignObject/stacking-context.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order-ref.html b/tests/wpt/tests/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order-ref.html rename to tests/wpt/tests/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order-ref.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order.html b/tests/wpt/tests/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order.html rename to tests/wpt/tests/svg/extensibility/foreignObject/will-change-in-foreign-object-paint-order.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/will-change-in-transformed-foreign-object-ref.html b/tests/wpt/tests/svg/extensibility/foreignObject/will-change-in-transformed-foreign-object-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/will-change-in-transformed-foreign-object-ref.html rename to tests/wpt/tests/svg/extensibility/foreignObject/will-change-in-transformed-foreign-object-ref.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/will-change-in-transformed-foreign-object.html b/tests/wpt/tests/svg/extensibility/foreignObject/will-change-in-transformed-foreign-object.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/will-change-in-transformed-foreign-object.html rename to tests/wpt/tests/svg/extensibility/foreignObject/will-change-in-transformed-foreign-object.html diff --git a/tests/wpt/web-platform-tests/svg/extensibility/interfaces/foreignObject-graphics.svg b/tests/wpt/tests/svg/extensibility/interfaces/foreignObject-graphics.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/extensibility/interfaces/foreignObject-graphics.svg rename to tests/wpt/tests/svg/extensibility/interfaces/foreignObject-graphics.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/inheritance.svg b/tests/wpt/tests/svg/geometry/inheritance.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/inheritance.svg rename to tests/wpt/tests/svg/geometry/inheritance.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/cx-computed.svg b/tests/wpt/tests/svg/geometry/parsing/cx-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/cx-computed.svg rename to tests/wpt/tests/svg/geometry/parsing/cx-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/cx-invalid.svg b/tests/wpt/tests/svg/geometry/parsing/cx-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/cx-invalid.svg rename to tests/wpt/tests/svg/geometry/parsing/cx-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/cx-valid.svg b/tests/wpt/tests/svg/geometry/parsing/cx-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/cx-valid.svg rename to tests/wpt/tests/svg/geometry/parsing/cx-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/cy-computed.svg b/tests/wpt/tests/svg/geometry/parsing/cy-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/cy-computed.svg rename to tests/wpt/tests/svg/geometry/parsing/cy-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/cy-invalid.svg b/tests/wpt/tests/svg/geometry/parsing/cy-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/cy-invalid.svg rename to tests/wpt/tests/svg/geometry/parsing/cy-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/cy-valid.svg b/tests/wpt/tests/svg/geometry/parsing/cy-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/cy-valid.svg rename to tests/wpt/tests/svg/geometry/parsing/cy-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/height-computed.svg b/tests/wpt/tests/svg/geometry/parsing/height-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/height-computed.svg rename to tests/wpt/tests/svg/geometry/parsing/height-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/r-computed.svg b/tests/wpt/tests/svg/geometry/parsing/r-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/r-computed.svg rename to tests/wpt/tests/svg/geometry/parsing/r-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/r-invalid.svg b/tests/wpt/tests/svg/geometry/parsing/r-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/r-invalid.svg rename to tests/wpt/tests/svg/geometry/parsing/r-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/r-valid.svg b/tests/wpt/tests/svg/geometry/parsing/r-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/r-valid.svg rename to tests/wpt/tests/svg/geometry/parsing/r-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/rx-computed.svg b/tests/wpt/tests/svg/geometry/parsing/rx-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/rx-computed.svg rename to tests/wpt/tests/svg/geometry/parsing/rx-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/rx-invalid.svg b/tests/wpt/tests/svg/geometry/parsing/rx-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/rx-invalid.svg rename to tests/wpt/tests/svg/geometry/parsing/rx-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/rx-valid.svg b/tests/wpt/tests/svg/geometry/parsing/rx-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/rx-valid.svg rename to tests/wpt/tests/svg/geometry/parsing/rx-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/ry-computed.svg b/tests/wpt/tests/svg/geometry/parsing/ry-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/ry-computed.svg rename to tests/wpt/tests/svg/geometry/parsing/ry-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/ry-invalid.svg b/tests/wpt/tests/svg/geometry/parsing/ry-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/ry-invalid.svg rename to tests/wpt/tests/svg/geometry/parsing/ry-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/ry-valid.svg b/tests/wpt/tests/svg/geometry/parsing/ry-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/ry-valid.svg rename to tests/wpt/tests/svg/geometry/parsing/ry-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/sizing-properties-computed.svg b/tests/wpt/tests/svg/geometry/parsing/sizing-properties-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/sizing-properties-computed.svg rename to tests/wpt/tests/svg/geometry/parsing/sizing-properties-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/width-computed.svg b/tests/wpt/tests/svg/geometry/parsing/width-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/width-computed.svg rename to tests/wpt/tests/svg/geometry/parsing/width-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/x-computed.svg b/tests/wpt/tests/svg/geometry/parsing/x-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/x-computed.svg rename to tests/wpt/tests/svg/geometry/parsing/x-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/x-invalid.svg b/tests/wpt/tests/svg/geometry/parsing/x-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/x-invalid.svg rename to tests/wpt/tests/svg/geometry/parsing/x-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/x-valid.svg b/tests/wpt/tests/svg/geometry/parsing/x-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/x-valid.svg rename to tests/wpt/tests/svg/geometry/parsing/x-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/y-computed.svg b/tests/wpt/tests/svg/geometry/parsing/y-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/y-computed.svg rename to tests/wpt/tests/svg/geometry/parsing/y-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/y-invalid.svg b/tests/wpt/tests/svg/geometry/parsing/y-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/y-invalid.svg rename to tests/wpt/tests/svg/geometry/parsing/y-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/parsing/y-valid.svg b/tests/wpt/tests/svg/geometry/parsing/y-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/parsing/y-valid.svg rename to tests/wpt/tests/svg/geometry/parsing/y-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/circle-001.svg b/tests/wpt/tests/svg/geometry/reftests/circle-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/circle-001.svg rename to tests/wpt/tests/svg/geometry/reftests/circle-001.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/circle-002.svg b/tests/wpt/tests/svg/geometry/reftests/circle-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/circle-002.svg rename to tests/wpt/tests/svg/geometry/reftests/circle-002.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/circle-003.svg b/tests/wpt/tests/svg/geometry/reftests/circle-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/circle-003.svg rename to tests/wpt/tests/svg/geometry/reftests/circle-003.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/circle-004.svg b/tests/wpt/tests/svg/geometry/reftests/circle-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/circle-004.svg rename to tests/wpt/tests/svg/geometry/reftests/circle-004.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/circle-005.svg b/tests/wpt/tests/svg/geometry/reftests/circle-005.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/circle-005.svg rename to tests/wpt/tests/svg/geometry/reftests/circle-005.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/circle-ref.svg b/tests/wpt/tests/svg/geometry/reftests/circle-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/circle-ref.svg rename to tests/wpt/tests/svg/geometry/reftests/circle-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/ellipse-001.svg b/tests/wpt/tests/svg/geometry/reftests/ellipse-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/ellipse-001.svg rename to tests/wpt/tests/svg/geometry/reftests/ellipse-001.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/ellipse-002.svg b/tests/wpt/tests/svg/geometry/reftests/ellipse-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/ellipse-002.svg rename to tests/wpt/tests/svg/geometry/reftests/ellipse-002.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/ellipse-003.svg b/tests/wpt/tests/svg/geometry/reftests/ellipse-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/ellipse-003.svg rename to tests/wpt/tests/svg/geometry/reftests/ellipse-003.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/ellipse-004.svg b/tests/wpt/tests/svg/geometry/reftests/ellipse-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/ellipse-004.svg rename to tests/wpt/tests/svg/geometry/reftests/ellipse-004.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/ellipse-ref.svg b/tests/wpt/tests/svg/geometry/reftests/ellipse-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/ellipse-ref.svg rename to tests/wpt/tests/svg/geometry/reftests/ellipse-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/percentage-attribute.svg b/tests/wpt/tests/svg/geometry/reftests/percentage-attribute.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/percentage-attribute.svg rename to tests/wpt/tests/svg/geometry/reftests/percentage-attribute.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/percentage-ref.svg b/tests/wpt/tests/svg/geometry/reftests/percentage-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/percentage-ref.svg rename to tests/wpt/tests/svg/geometry/reftests/percentage-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/percentage.svg b/tests/wpt/tests/svg/geometry/reftests/percentage.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/percentage.svg rename to tests/wpt/tests/svg/geometry/reftests/percentage.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/rect-001.svg b/tests/wpt/tests/svg/geometry/reftests/rect-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/rect-001.svg rename to tests/wpt/tests/svg/geometry/reftests/rect-001.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/rect-002.svg b/tests/wpt/tests/svg/geometry/reftests/rect-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/rect-002.svg rename to tests/wpt/tests/svg/geometry/reftests/rect-002.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/rect-003.svg b/tests/wpt/tests/svg/geometry/reftests/rect-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/rect-003.svg rename to tests/wpt/tests/svg/geometry/reftests/rect-003.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/rect-004.svg b/tests/wpt/tests/svg/geometry/reftests/rect-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/rect-004.svg rename to tests/wpt/tests/svg/geometry/reftests/rect-004.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/reftests/rect-ref.svg b/tests/wpt/tests/svg/geometry/reftests/rect-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/reftests/rect-ref.svg rename to tests/wpt/tests/svg/geometry/reftests/rect-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/geometry/svg-baseval-in-display-none.html b/tests/wpt/tests/svg/geometry/svg-baseval-in-display-none.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/svg-baseval-in-display-none.html rename to tests/wpt/tests/svg/geometry/svg-baseval-in-display-none.html diff --git a/tests/wpt/web-platform-tests/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto-dynamic-image-change.html b/tests/wpt/tests/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto-dynamic-image-change.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto-dynamic-image-change.html rename to tests/wpt/tests/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto-dynamic-image-change.html diff --git a/tests/wpt/web-platform-tests/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto.html b/tests/wpt/tests/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto.html rename to tests/wpt/tests/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto.html diff --git a/tests/wpt/web-platform-tests/svg/historical.html b/tests/wpt/tests/svg/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/historical.html rename to tests/wpt/tests/svg/historical.html diff --git a/tests/wpt/web-platform-tests/svg/idlharness.window.js b/tests/wpt/tests/svg/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/svg/idlharness.window.js rename to tests/wpt/tests/svg/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/svg/import/animate-dom-01-f-manual.svg b/tests/wpt/tests/svg/import/animate-dom-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-dom-01-f-manual.svg rename to tests/wpt/tests/svg/import/animate-dom-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-dom-02-f-manual.svg b/tests/wpt/tests/svg/import/animate-dom-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-dom-02-f-manual.svg rename to tests/wpt/tests/svg/import/animate-dom-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-02-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-02-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-03-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-03-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-04-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-04-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-05-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-05-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-05-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-05-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-06-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-06-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-06-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-06-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-07-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-07-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-07-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-07-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-08-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-08-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-08-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-08-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-09-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-09-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-09-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-09-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-10-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-10-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-10-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-10-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-11-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-11-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-11-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-11-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-12-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-12-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-12-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-12-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-13-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-13-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-13-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-13-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-14-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-14-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-14-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-14-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-15-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-15-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-15-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-15-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-17-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-17-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-17-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-17-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-19-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-19-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-19-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-19-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-20-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-20-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-20-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-20-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-21-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-21-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-21-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-21-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-22-b-manual.svg b/tests/wpt/tests/svg/import/animate-elem-22-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-22-b-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-22-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-23-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-23-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-23-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-23-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-24-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-24-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-24-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-24-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-25-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-25-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-25-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-25-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-26-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-26-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-26-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-26-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-27-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-27-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-27-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-27-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-28-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-28-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-28-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-28-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-29-b-manual.svg b/tests/wpt/tests/svg/import/animate-elem-29-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-29-b-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-29-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-30-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-30-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-30-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-30-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-31-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-31-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-31-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-31-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-32-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-32-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-32-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-32-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-33-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-33-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-33-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-33-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-34-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-34-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-34-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-34-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-35-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-35-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-35-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-35-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-36-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-36-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-36-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-36-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-37-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-37-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-37-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-37-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-38-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-38-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-38-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-38-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-39-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-39-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-39-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-39-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-40-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-40-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-40-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-40-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-41-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-41-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-41-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-41-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-44-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-44-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-44-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-44-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-46-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-46-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-46-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-46-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-52-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-52-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-52-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-52-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-53-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-53-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-53-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-53-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-60-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-60-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-60-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-60-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-61-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-61-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-61-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-61-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-62-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-62-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-62-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-62-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-63-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-63-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-63-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-63-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-64-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-64-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-64-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-64-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-65-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-65-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-65-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-65-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-66-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-66-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-66-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-66-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-67-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-67-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-67-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-67-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-68-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-68-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-68-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-68-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-69-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-69-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-69-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-69-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-70-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-70-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-70-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-70-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-77-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-77-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-77-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-77-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-78-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-78-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-78-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-78-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-80-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-80-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-80-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-80-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-81-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-81-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-81-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-81-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-82-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-82-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-82-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-82-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-83-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-83-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-83-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-83-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-84-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-84-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-84-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-84-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-85-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-85-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-85-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-85-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-86-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-86-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-86-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-86-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-87-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-87-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-87-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-87-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-88-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-88-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-88-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-88-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-89-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-89-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-89-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-89-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-90-b-manual.svg b/tests/wpt/tests/svg/import/animate-elem-90-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-90-b-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-90-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-91-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-91-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-91-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-91-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-elem-92-t-manual.svg b/tests/wpt/tests/svg/import/animate-elem-92-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-elem-92-t-manual.svg rename to tests/wpt/tests/svg/import/animate-elem-92-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-interact-events-01-t-manual.svg b/tests/wpt/tests/svg/import/animate-interact-events-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-interact-events-01-t-manual.svg rename to tests/wpt/tests/svg/import/animate-interact-events-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-interact-pevents-01-t-manual.svg b/tests/wpt/tests/svg/import/animate-interact-pevents-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-interact-pevents-01-t-manual.svg rename to tests/wpt/tests/svg/import/animate-interact-pevents-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-interact-pevents-02-t-manual.svg b/tests/wpt/tests/svg/import/animate-interact-pevents-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-interact-pevents-02-t-manual.svg rename to tests/wpt/tests/svg/import/animate-interact-pevents-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-interact-pevents-03-t-manual.svg b/tests/wpt/tests/svg/import/animate-interact-pevents-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-interact-pevents-03-t-manual.svg rename to tests/wpt/tests/svg/import/animate-interact-pevents-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-interact-pevents-04-t-manual.svg b/tests/wpt/tests/svg/import/animate-interact-pevents-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-interact-pevents-04-t-manual.svg rename to tests/wpt/tests/svg/import/animate-interact-pevents-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-pservers-grad-01-b-manual.svg b/tests/wpt/tests/svg/import/animate-pservers-grad-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-pservers-grad-01-b-manual.svg rename to tests/wpt/tests/svg/import/animate-pservers-grad-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-script-elem-01-b-manual.svg b/tests/wpt/tests/svg/import/animate-script-elem-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-script-elem-01-b-manual.svg rename to tests/wpt/tests/svg/import/animate-script-elem-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/animate-struct-dom-01-b-manual.svg b/tests/wpt/tests/svg/import/animate-struct-dom-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/animate-struct-dom-01-b-manual.svg rename to tests/wpt/tests/svg/import/animate-struct-dom-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/color-prof-01-f-manual.svg b/tests/wpt/tests/svg/import/color-prof-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/color-prof-01-f-manual.svg rename to tests/wpt/tests/svg/import/color-prof-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/color-prop-01-b-manual.svg b/tests/wpt/tests/svg/import/color-prop-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/color-prop-01-b-manual.svg rename to tests/wpt/tests/svg/import/color-prop-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/color-prop-02-f-manual.svg b/tests/wpt/tests/svg/import/color-prop-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/color-prop-02-f-manual.svg rename to tests/wpt/tests/svg/import/color-prop-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/color-prop-03-t-manual.svg b/tests/wpt/tests/svg/import/color-prop-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/color-prop-03-t-manual.svg rename to tests/wpt/tests/svg/import/color-prop-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/color-prop-04-t-manual.svg b/tests/wpt/tests/svg/import/color-prop-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/color-prop-04-t-manual.svg rename to tests/wpt/tests/svg/import/color-prop-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/color-prop-05-t-manual.svg b/tests/wpt/tests/svg/import/color-prop-05-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/color-prop-05-t-manual.svg rename to tests/wpt/tests/svg/import/color-prop-05-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/conform-viewers-02-f-manual.svg b/tests/wpt/tests/svg/import/conform-viewers-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/conform-viewers-02-f-manual.svg rename to tests/wpt/tests/svg/import/conform-viewers-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/conform-viewers-03-f-manual.svg b/tests/wpt/tests/svg/import/conform-viewers-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/conform-viewers-03-f-manual.svg rename to tests/wpt/tests/svg/import/conform-viewers-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-coord-01-t-manual.svg b/tests/wpt/tests/svg/import/coords-coord-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-coord-01-t-manual.svg rename to tests/wpt/tests/svg/import/coords-coord-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-coord-02-t-manual.svg b/tests/wpt/tests/svg/import/coords-coord-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-coord-02-t-manual.svg rename to tests/wpt/tests/svg/import/coords-coord-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-dom-01-f-manual.svg b/tests/wpt/tests/svg/import/coords-dom-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-dom-01-f-manual.svg rename to tests/wpt/tests/svg/import/coords-dom-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-dom-02-f-manual.svg b/tests/wpt/tests/svg/import/coords-dom-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-dom-02-f-manual.svg rename to tests/wpt/tests/svg/import/coords-dom-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-dom-03-f-manual.svg b/tests/wpt/tests/svg/import/coords-dom-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-dom-03-f-manual.svg rename to tests/wpt/tests/svg/import/coords-dom-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-dom-04-f-manual.svg b/tests/wpt/tests/svg/import/coords-dom-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-dom-04-f-manual.svg rename to tests/wpt/tests/svg/import/coords-dom-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-trans-01-b-manual.svg b/tests/wpt/tests/svg/import/coords-trans-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-trans-01-b-manual.svg rename to tests/wpt/tests/svg/import/coords-trans-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-trans-02-t-manual.svg b/tests/wpt/tests/svg/import/coords-trans-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-trans-02-t-manual.svg rename to tests/wpt/tests/svg/import/coords-trans-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-trans-03-t-manual.svg b/tests/wpt/tests/svg/import/coords-trans-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-trans-03-t-manual.svg rename to tests/wpt/tests/svg/import/coords-trans-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-trans-04-t-manual.svg b/tests/wpt/tests/svg/import/coords-trans-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-trans-04-t-manual.svg rename to tests/wpt/tests/svg/import/coords-trans-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-trans-05-t-manual.svg b/tests/wpt/tests/svg/import/coords-trans-05-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-trans-05-t-manual.svg rename to tests/wpt/tests/svg/import/coords-trans-05-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-trans-06-t-manual.svg b/tests/wpt/tests/svg/import/coords-trans-06-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-trans-06-t-manual.svg rename to tests/wpt/tests/svg/import/coords-trans-06-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-trans-07-t-manual.svg b/tests/wpt/tests/svg/import/coords-trans-07-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-trans-07-t-manual.svg rename to tests/wpt/tests/svg/import/coords-trans-07-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-trans-08-t-manual.svg b/tests/wpt/tests/svg/import/coords-trans-08-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-trans-08-t-manual.svg rename to tests/wpt/tests/svg/import/coords-trans-08-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-trans-09-t-manual.svg b/tests/wpt/tests/svg/import/coords-trans-09-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-trans-09-t-manual.svg rename to tests/wpt/tests/svg/import/coords-trans-09-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-trans-10-f-manual.svg b/tests/wpt/tests/svg/import/coords-trans-10-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-trans-10-f-manual.svg rename to tests/wpt/tests/svg/import/coords-trans-10-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-trans-11-f-manual.svg b/tests/wpt/tests/svg/import/coords-trans-11-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-trans-11-f-manual.svg rename to tests/wpt/tests/svg/import/coords-trans-11-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-trans-12-f-manual.svg b/tests/wpt/tests/svg/import/coords-trans-12-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-trans-12-f-manual.svg rename to tests/wpt/tests/svg/import/coords-trans-12-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-trans-13-f-manual.svg b/tests/wpt/tests/svg/import/coords-trans-13-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-trans-13-f-manual.svg rename to tests/wpt/tests/svg/import/coords-trans-13-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-trans-14-f-manual.svg b/tests/wpt/tests/svg/import/coords-trans-14-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-trans-14-f-manual.svg rename to tests/wpt/tests/svg/import/coords-trans-14-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-transformattr-01-f-manual.svg b/tests/wpt/tests/svg/import/coords-transformattr-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-transformattr-01-f-manual.svg rename to tests/wpt/tests/svg/import/coords-transformattr-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-transformattr-02-f-manual.svg b/tests/wpt/tests/svg/import/coords-transformattr-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-transformattr-02-f-manual.svg rename to tests/wpt/tests/svg/import/coords-transformattr-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-transformattr-03-f-manual.svg b/tests/wpt/tests/svg/import/coords-transformattr-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-transformattr-03-f-manual.svg rename to tests/wpt/tests/svg/import/coords-transformattr-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-transformattr-04-f-manual.svg b/tests/wpt/tests/svg/import/coords-transformattr-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-transformattr-04-f-manual.svg rename to tests/wpt/tests/svg/import/coords-transformattr-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-transformattr-05-f-manual.svg b/tests/wpt/tests/svg/import/coords-transformattr-05-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-transformattr-05-f-manual.svg rename to tests/wpt/tests/svg/import/coords-transformattr-05-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-units-01-b-manual.svg b/tests/wpt/tests/svg/import/coords-units-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-units-01-b-manual.svg rename to tests/wpt/tests/svg/import/coords-units-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-units-02-b-manual.svg b/tests/wpt/tests/svg/import/coords-units-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-units-02-b-manual.svg rename to tests/wpt/tests/svg/import/coords-units-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-units-03-b-manual.svg b/tests/wpt/tests/svg/import/coords-units-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-units-03-b-manual.svg rename to tests/wpt/tests/svg/import/coords-units-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-viewattr-01-b-manual.svg b/tests/wpt/tests/svg/import/coords-viewattr-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-viewattr-01-b-manual.svg rename to tests/wpt/tests/svg/import/coords-viewattr-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-viewattr-02-b-manual.svg b/tests/wpt/tests/svg/import/coords-viewattr-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-viewattr-02-b-manual.svg rename to tests/wpt/tests/svg/import/coords-viewattr-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-viewattr-03-b-manual.svg b/tests/wpt/tests/svg/import/coords-viewattr-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-viewattr-03-b-manual.svg rename to tests/wpt/tests/svg/import/coords-viewattr-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/coords-viewattr-04-f-manual.svg b/tests/wpt/tests/svg/import/coords-viewattr-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/coords-viewattr-04-f-manual.svg rename to tests/wpt/tests/svg/import/coords-viewattr-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/extend-namespace-01-f-manual.svg b/tests/wpt/tests/svg/import/extend-namespace-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/extend-namespace-01-f-manual.svg rename to tests/wpt/tests/svg/import/extend-namespace-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-background-01-f-manual.svg b/tests/wpt/tests/svg/import/filters-background-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-background-01-f-manual.svg rename to tests/wpt/tests/svg/import/filters-background-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-blend-01-b-manual.svg b/tests/wpt/tests/svg/import/filters-blend-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-blend-01-b-manual.svg rename to tests/wpt/tests/svg/import/filters-blend-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-color-01-b-manual.svg b/tests/wpt/tests/svg/import/filters-color-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-color-01-b-manual.svg rename to tests/wpt/tests/svg/import/filters-color-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-color-02-b-manual.svg b/tests/wpt/tests/svg/import/filters-color-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-color-02-b-manual.svg rename to tests/wpt/tests/svg/import/filters-color-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-composite-02-b-manual.svg b/tests/wpt/tests/svg/import/filters-composite-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-composite-02-b-manual.svg rename to tests/wpt/tests/svg/import/filters-composite-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-composite-03-f-manual.svg b/tests/wpt/tests/svg/import/filters-composite-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-composite-03-f-manual.svg rename to tests/wpt/tests/svg/import/filters-composite-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-composite-04-f-manual.svg b/tests/wpt/tests/svg/import/filters-composite-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-composite-04-f-manual.svg rename to tests/wpt/tests/svg/import/filters-composite-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-composite-05-f-manual.svg b/tests/wpt/tests/svg/import/filters-composite-05-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-composite-05-f-manual.svg rename to tests/wpt/tests/svg/import/filters-composite-05-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-comptran-01-b-manual.svg b/tests/wpt/tests/svg/import/filters-comptran-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-comptran-01-b-manual.svg rename to tests/wpt/tests/svg/import/filters-comptran-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-conv-01-f-manual.svg b/tests/wpt/tests/svg/import/filters-conv-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-conv-01-f-manual.svg rename to tests/wpt/tests/svg/import/filters-conv-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-conv-02-f-manual.svg b/tests/wpt/tests/svg/import/filters-conv-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-conv-02-f-manual.svg rename to tests/wpt/tests/svg/import/filters-conv-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-conv-03-f-manual.svg b/tests/wpt/tests/svg/import/filters-conv-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-conv-03-f-manual.svg rename to tests/wpt/tests/svg/import/filters-conv-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-conv-04-f-manual.svg b/tests/wpt/tests/svg/import/filters-conv-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-conv-04-f-manual.svg rename to tests/wpt/tests/svg/import/filters-conv-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-conv-05-f-manual.svg b/tests/wpt/tests/svg/import/filters-conv-05-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-conv-05-f-manual.svg rename to tests/wpt/tests/svg/import/filters-conv-05-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-diffuse-01-f-manual.svg b/tests/wpt/tests/svg/import/filters-diffuse-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-diffuse-01-f-manual.svg rename to tests/wpt/tests/svg/import/filters-diffuse-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-displace-01-f-manual.svg b/tests/wpt/tests/svg/import/filters-displace-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-displace-01-f-manual.svg rename to tests/wpt/tests/svg/import/filters-displace-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-displace-02-f-manual.svg b/tests/wpt/tests/svg/import/filters-displace-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-displace-02-f-manual.svg rename to tests/wpt/tests/svg/import/filters-displace-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-example-01-b-manual.svg b/tests/wpt/tests/svg/import/filters-example-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-example-01-b-manual.svg rename to tests/wpt/tests/svg/import/filters-example-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-felem-01-b-manual.svg b/tests/wpt/tests/svg/import/filters-felem-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-felem-01-b-manual.svg rename to tests/wpt/tests/svg/import/filters-felem-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-felem-02-f-manual.svg b/tests/wpt/tests/svg/import/filters-felem-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-felem-02-f-manual.svg rename to tests/wpt/tests/svg/import/filters-felem-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-gauss-01-b-manual.svg b/tests/wpt/tests/svg/import/filters-gauss-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-gauss-01-b-manual.svg rename to tests/wpt/tests/svg/import/filters-gauss-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-gauss-02-f-manual.svg b/tests/wpt/tests/svg/import/filters-gauss-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-gauss-02-f-manual.svg rename to tests/wpt/tests/svg/import/filters-gauss-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-gauss-03-f-manual.svg b/tests/wpt/tests/svg/import/filters-gauss-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-gauss-03-f-manual.svg rename to tests/wpt/tests/svg/import/filters-gauss-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-image-01-b-manual.svg b/tests/wpt/tests/svg/import/filters-image-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-image-01-b-manual.svg rename to tests/wpt/tests/svg/import/filters-image-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-image-02-b-manual.svg b/tests/wpt/tests/svg/import/filters-image-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-image-02-b-manual.svg rename to tests/wpt/tests/svg/import/filters-image-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-image-03-f-manual.svg b/tests/wpt/tests/svg/import/filters-image-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-image-03-f-manual.svg rename to tests/wpt/tests/svg/import/filters-image-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-image-04-f-manual.svg b/tests/wpt/tests/svg/import/filters-image-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-image-04-f-manual.svg rename to tests/wpt/tests/svg/import/filters-image-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-image-05-f-manual.svg b/tests/wpt/tests/svg/import/filters-image-05-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-image-05-f-manual.svg rename to tests/wpt/tests/svg/import/filters-image-05-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-light-01-f-manual.svg b/tests/wpt/tests/svg/import/filters-light-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-light-01-f-manual.svg rename to tests/wpt/tests/svg/import/filters-light-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-light-02-f-manual.svg b/tests/wpt/tests/svg/import/filters-light-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-light-02-f-manual.svg rename to tests/wpt/tests/svg/import/filters-light-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-light-03-f-manual.svg b/tests/wpt/tests/svg/import/filters-light-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-light-03-f-manual.svg rename to tests/wpt/tests/svg/import/filters-light-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-light-04-f-manual.svg b/tests/wpt/tests/svg/import/filters-light-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-light-04-f-manual.svg rename to tests/wpt/tests/svg/import/filters-light-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-light-05-f-manual.svg b/tests/wpt/tests/svg/import/filters-light-05-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-light-05-f-manual.svg rename to tests/wpt/tests/svg/import/filters-light-05-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-morph-01-f-manual.svg b/tests/wpt/tests/svg/import/filters-morph-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-morph-01-f-manual.svg rename to tests/wpt/tests/svg/import/filters-morph-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-offset-01-b-manual.svg b/tests/wpt/tests/svg/import/filters-offset-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-offset-01-b-manual.svg rename to tests/wpt/tests/svg/import/filters-offset-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-offset-02-b-manual.svg b/tests/wpt/tests/svg/import/filters-offset-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-offset-02-b-manual.svg rename to tests/wpt/tests/svg/import/filters-offset-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-overview-01-b-manual.svg b/tests/wpt/tests/svg/import/filters-overview-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-overview-01-b-manual.svg rename to tests/wpt/tests/svg/import/filters-overview-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-overview-02-b-manual.svg b/tests/wpt/tests/svg/import/filters-overview-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-overview-02-b-manual.svg rename to tests/wpt/tests/svg/import/filters-overview-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-overview-03-b-manual.svg b/tests/wpt/tests/svg/import/filters-overview-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-overview-03-b-manual.svg rename to tests/wpt/tests/svg/import/filters-overview-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-specular-01-f-manual.svg b/tests/wpt/tests/svg/import/filters-specular-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-specular-01-f-manual.svg rename to tests/wpt/tests/svg/import/filters-specular-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-tile-01-b-manual.svg b/tests/wpt/tests/svg/import/filters-tile-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-tile-01-b-manual.svg rename to tests/wpt/tests/svg/import/filters-tile-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-turb-01-f-manual.svg b/tests/wpt/tests/svg/import/filters-turb-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-turb-01-f-manual.svg rename to tests/wpt/tests/svg/import/filters-turb-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/filters-turb-02-f-manual.svg b/tests/wpt/tests/svg/import/filters-turb-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/filters-turb-02-f-manual.svg rename to tests/wpt/tests/svg/import/filters-turb-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-desc-01-t-manual.svg b/tests/wpt/tests/svg/import/fonts-desc-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-desc-01-t-manual.svg rename to tests/wpt/tests/svg/import/fonts-desc-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-desc-02-t-manual.svg b/tests/wpt/tests/svg/import/fonts-desc-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-desc-02-t-manual.svg rename to tests/wpt/tests/svg/import/fonts-desc-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-desc-03-t-manual.svg b/tests/wpt/tests/svg/import/fonts-desc-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-desc-03-t-manual.svg rename to tests/wpt/tests/svg/import/fonts-desc-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-desc-04-t-manual.svg b/tests/wpt/tests/svg/import/fonts-desc-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-desc-04-t-manual.svg rename to tests/wpt/tests/svg/import/fonts-desc-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-desc-05-t-manual.svg b/tests/wpt/tests/svg/import/fonts-desc-05-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-desc-05-t-manual.svg rename to tests/wpt/tests/svg/import/fonts-desc-05-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-elem-01-t-manual.svg b/tests/wpt/tests/svg/import/fonts-elem-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-elem-01-t-manual.svg rename to tests/wpt/tests/svg/import/fonts-elem-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-elem-02-t-manual.svg b/tests/wpt/tests/svg/import/fonts-elem-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-elem-02-t-manual.svg rename to tests/wpt/tests/svg/import/fonts-elem-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-elem-03-b-manual.svg b/tests/wpt/tests/svg/import/fonts-elem-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-elem-03-b-manual.svg rename to tests/wpt/tests/svg/import/fonts-elem-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-elem-04-b-manual.svg b/tests/wpt/tests/svg/import/fonts-elem-04-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-elem-04-b-manual.svg rename to tests/wpt/tests/svg/import/fonts-elem-04-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-elem-05-t-manual.svg b/tests/wpt/tests/svg/import/fonts-elem-05-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-elem-05-t-manual.svg rename to tests/wpt/tests/svg/import/fonts-elem-05-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-elem-06-t-manual.svg b/tests/wpt/tests/svg/import/fonts-elem-06-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-elem-06-t-manual.svg rename to tests/wpt/tests/svg/import/fonts-elem-06-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-elem-07-b-manual.svg b/tests/wpt/tests/svg/import/fonts-elem-07-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-elem-07-b-manual.svg rename to tests/wpt/tests/svg/import/fonts-elem-07-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-glyph-02-t-manual.svg b/tests/wpt/tests/svg/import/fonts-glyph-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-glyph-02-t-manual.svg rename to tests/wpt/tests/svg/import/fonts-glyph-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-glyph-03-t-manual.svg b/tests/wpt/tests/svg/import/fonts-glyph-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-glyph-03-t-manual.svg rename to tests/wpt/tests/svg/import/fonts-glyph-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-glyph-04-t-manual.svg b/tests/wpt/tests/svg/import/fonts-glyph-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-glyph-04-t-manual.svg rename to tests/wpt/tests/svg/import/fonts-glyph-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-kern-01-t-manual.svg b/tests/wpt/tests/svg/import/fonts-kern-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-kern-01-t-manual.svg rename to tests/wpt/tests/svg/import/fonts-kern-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/fonts-overview-201-t-manual.svg b/tests/wpt/tests/svg/import/fonts-overview-201-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/fonts-overview-201-t-manual.svg rename to tests/wpt/tests/svg/import/fonts-overview-201-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/imp-path-01-f-manual.svg b/tests/wpt/tests/svg/import/imp-path-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/imp-path-01-f-manual.svg rename to tests/wpt/tests/svg/import/imp-path-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-cursor-01-f-manual.svg b/tests/wpt/tests/svg/import/interact-cursor-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-cursor-01-f-manual.svg rename to tests/wpt/tests/svg/import/interact-cursor-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-dom-01-b-manual.svg b/tests/wpt/tests/svg/import/interact-dom-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-dom-01-b-manual.svg rename to tests/wpt/tests/svg/import/interact-dom-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-events-01-b-manual.svg b/tests/wpt/tests/svg/import/interact-events-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-events-01-b-manual.svg rename to tests/wpt/tests/svg/import/interact-events-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-events-02-b-manual.svg b/tests/wpt/tests/svg/import/interact-events-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-events-02-b-manual.svg rename to tests/wpt/tests/svg/import/interact-events-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-events-202-f-manual.svg b/tests/wpt/tests/svg/import/interact-events-202-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-events-202-f-manual.svg rename to tests/wpt/tests/svg/import/interact-events-202-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-events-203-t-manual.svg b/tests/wpt/tests/svg/import/interact-events-203-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-events-203-t-manual.svg rename to tests/wpt/tests/svg/import/interact-events-203-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-order-01-b-manual.svg b/tests/wpt/tests/svg/import/interact-order-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-order-01-b-manual.svg rename to tests/wpt/tests/svg/import/interact-order-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-order-02-b-manual.svg b/tests/wpt/tests/svg/import/interact-order-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-order-02-b-manual.svg rename to tests/wpt/tests/svg/import/interact-order-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-order-03-b-manual.svg b/tests/wpt/tests/svg/import/interact-order-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-order-03-b-manual.svg rename to tests/wpt/tests/svg/import/interact-order-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-pevents-01-b-manual.svg b/tests/wpt/tests/svg/import/interact-pevents-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-pevents-01-b-manual.svg rename to tests/wpt/tests/svg/import/interact-pevents-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-pevents-03-b-manual.svg b/tests/wpt/tests/svg/import/interact-pevents-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-pevents-03-b-manual.svg rename to tests/wpt/tests/svg/import/interact-pevents-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-pevents-04-t-manual.svg b/tests/wpt/tests/svg/import/interact-pevents-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-pevents-04-t-manual.svg rename to tests/wpt/tests/svg/import/interact-pevents-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-pevents-05-b-manual.svg b/tests/wpt/tests/svg/import/interact-pevents-05-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-pevents-05-b-manual.svg rename to tests/wpt/tests/svg/import/interact-pevents-05-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-pevents-07-t-manual.svg b/tests/wpt/tests/svg/import/interact-pevents-07-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-pevents-07-t-manual.svg rename to tests/wpt/tests/svg/import/interact-pevents-07-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-pevents-08-f-manual.svg b/tests/wpt/tests/svg/import/interact-pevents-08-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-pevents-08-f-manual.svg rename to tests/wpt/tests/svg/import/interact-pevents-08-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-pevents-09-f-manual.svg b/tests/wpt/tests/svg/import/interact-pevents-09-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-pevents-09-f-manual.svg rename to tests/wpt/tests/svg/import/interact-pevents-09-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-pevents-10-f-manual.svg b/tests/wpt/tests/svg/import/interact-pevents-10-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-pevents-10-f-manual.svg rename to tests/wpt/tests/svg/import/interact-pevents-10-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-pointer-01-t-manual.svg b/tests/wpt/tests/svg/import/interact-pointer-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-pointer-01-t-manual.svg rename to tests/wpt/tests/svg/import/interact-pointer-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-pointer-02-t-manual.svg b/tests/wpt/tests/svg/import/interact-pointer-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-pointer-02-t-manual.svg rename to tests/wpt/tests/svg/import/interact-pointer-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-pointer-03-t-manual.svg b/tests/wpt/tests/svg/import/interact-pointer-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-pointer-03-t-manual.svg rename to tests/wpt/tests/svg/import/interact-pointer-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-pointer-04-f-manual.svg b/tests/wpt/tests/svg/import/interact-pointer-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-pointer-04-f-manual.svg rename to tests/wpt/tests/svg/import/interact-pointer-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-zoom-01-t-manual.svg b/tests/wpt/tests/svg/import/interact-zoom-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-zoom-01-t-manual.svg rename to tests/wpt/tests/svg/import/interact-zoom-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-zoom-02-t-manual.svg b/tests/wpt/tests/svg/import/interact-zoom-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-zoom-02-t-manual.svg rename to tests/wpt/tests/svg/import/interact-zoom-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/interact-zoom-03-t-manual.svg b/tests/wpt/tests/svg/import/interact-zoom-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/interact-zoom-03-t-manual.svg rename to tests/wpt/tests/svg/import/interact-zoom-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/linking-a-01-b-manual.svg b/tests/wpt/tests/svg/import/linking-a-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/linking-a-01-b-manual.svg rename to tests/wpt/tests/svg/import/linking-a-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/linking-a-03-b-manual.svg b/tests/wpt/tests/svg/import/linking-a-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/linking-a-03-b-manual.svg rename to tests/wpt/tests/svg/import/linking-a-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/linking-a-04-t-manual.svg b/tests/wpt/tests/svg/import/linking-a-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/linking-a-04-t-manual.svg rename to tests/wpt/tests/svg/import/linking-a-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/linking-a-05-t-manual.svg b/tests/wpt/tests/svg/import/linking-a-05-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/linking-a-05-t-manual.svg rename to tests/wpt/tests/svg/import/linking-a-05-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/linking-a-07-t-manual.svg b/tests/wpt/tests/svg/import/linking-a-07-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/linking-a-07-t-manual.svg rename to tests/wpt/tests/svg/import/linking-a-07-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/linking-a-08-t-manual.svg b/tests/wpt/tests/svg/import/linking-a-08-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/linking-a-08-t-manual.svg rename to tests/wpt/tests/svg/import/linking-a-08-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/linking-a-09-b-manual.svg b/tests/wpt/tests/svg/import/linking-a-09-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/linking-a-09-b-manual.svg rename to tests/wpt/tests/svg/import/linking-a-09-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/linking-a-10-f-manual.svg b/tests/wpt/tests/svg/import/linking-a-10-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/linking-a-10-f-manual.svg rename to tests/wpt/tests/svg/import/linking-a-10-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/linking-frag-01-f-manual.svg b/tests/wpt/tests/svg/import/linking-frag-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/linking-frag-01-f-manual.svg rename to tests/wpt/tests/svg/import/linking-frag-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/linking-uri-01-b-manual.svg b/tests/wpt/tests/svg/import/linking-uri-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/linking-uri-01-b-manual.svg rename to tests/wpt/tests/svg/import/linking-uri-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/linking-uri-02-b-manual.svg b/tests/wpt/tests/svg/import/linking-uri-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/linking-uri-02-b-manual.svg rename to tests/wpt/tests/svg/import/linking-uri-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/linking-uri-03-t-manual.svg b/tests/wpt/tests/svg/import/linking-uri-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/linking-uri-03-t-manual.svg rename to tests/wpt/tests/svg/import/linking-uri-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-filter-01-f-manual.svg b/tests/wpt/tests/svg/import/masking-filter-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-filter-01-f-manual.svg rename to tests/wpt/tests/svg/import/masking-filter-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-intro-01-f-manual.svg b/tests/wpt/tests/svg/import/masking-intro-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-intro-01-f-manual.svg rename to tests/wpt/tests/svg/import/masking-intro-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-mask-01-b-manual.svg b/tests/wpt/tests/svg/import/masking-mask-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-mask-01-b-manual.svg rename to tests/wpt/tests/svg/import/masking-mask-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-mask-02-f-manual.svg b/tests/wpt/tests/svg/import/masking-mask-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-mask-02-f-manual.svg rename to tests/wpt/tests/svg/import/masking-mask-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-opacity-01-b-manual.svg b/tests/wpt/tests/svg/import/masking-opacity-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-opacity-01-b-manual.svg rename to tests/wpt/tests/svg/import/masking-opacity-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-path-01-b-manual.svg b/tests/wpt/tests/svg/import/masking-path-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-path-01-b-manual.svg rename to tests/wpt/tests/svg/import/masking-path-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-path-02-b-manual.svg b/tests/wpt/tests/svg/import/masking-path-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-path-02-b-manual.svg rename to tests/wpt/tests/svg/import/masking-path-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-path-03-b-manual.svg b/tests/wpt/tests/svg/import/masking-path-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-path-03-b-manual.svg rename to tests/wpt/tests/svg/import/masking-path-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-path-04-b-manual.svg b/tests/wpt/tests/svg/import/masking-path-04-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-path-04-b-manual.svg rename to tests/wpt/tests/svg/import/masking-path-04-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-path-05-f-manual.svg b/tests/wpt/tests/svg/import/masking-path-05-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-path-05-f-manual.svg rename to tests/wpt/tests/svg/import/masking-path-05-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-path-06-b-manual.svg b/tests/wpt/tests/svg/import/masking-path-06-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-path-06-b-manual.svg rename to tests/wpt/tests/svg/import/masking-path-06-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-path-07-b-manual.svg b/tests/wpt/tests/svg/import/masking-path-07-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-path-07-b-manual.svg rename to tests/wpt/tests/svg/import/masking-path-07-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-path-08-b-manual.svg b/tests/wpt/tests/svg/import/masking-path-08-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-path-08-b-manual.svg rename to tests/wpt/tests/svg/import/masking-path-08-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-path-09-b-manual.svg b/tests/wpt/tests/svg/import/masking-path-09-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-path-09-b-manual.svg rename to tests/wpt/tests/svg/import/masking-path-09-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-path-10-b-manual.svg b/tests/wpt/tests/svg/import/masking-path-10-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-path-10-b-manual.svg rename to tests/wpt/tests/svg/import/masking-path-10-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-path-11-b-manual.svg b/tests/wpt/tests/svg/import/masking-path-11-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-path-11-b-manual.svg rename to tests/wpt/tests/svg/import/masking-path-11-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-path-12-f-manual.svg b/tests/wpt/tests/svg/import/masking-path-12-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-path-12-f-manual.svg rename to tests/wpt/tests/svg/import/masking-path-12-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-path-13-f-manual.svg b/tests/wpt/tests/svg/import/masking-path-13-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-path-13-f-manual.svg rename to tests/wpt/tests/svg/import/masking-path-13-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/masking-path-14-f-manual.svg b/tests/wpt/tests/svg/import/masking-path-14-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/masking-path-14-f-manual.svg rename to tests/wpt/tests/svg/import/masking-path-14-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/metadata-example-01-t-manual.svg b/tests/wpt/tests/svg/import/metadata-example-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/metadata-example-01-t-manual.svg rename to tests/wpt/tests/svg/import/metadata-example-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-control-01-f-manual.svg b/tests/wpt/tests/svg/import/painting-control-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-control-01-f-manual.svg rename to tests/wpt/tests/svg/import/painting-control-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-control-02-f-manual.svg b/tests/wpt/tests/svg/import/painting-control-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-control-02-f-manual.svg rename to tests/wpt/tests/svg/import/painting-control-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-control-03-f-manual.svg b/tests/wpt/tests/svg/import/painting-control-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-control-03-f-manual.svg rename to tests/wpt/tests/svg/import/painting-control-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-control-04-f-manual.svg b/tests/wpt/tests/svg/import/painting-control-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-control-04-f-manual.svg rename to tests/wpt/tests/svg/import/painting-control-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-control-05-f-manual.svg b/tests/wpt/tests/svg/import/painting-control-05-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-control-05-f-manual.svg rename to tests/wpt/tests/svg/import/painting-control-05-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-control-06-f-manual.svg b/tests/wpt/tests/svg/import/painting-control-06-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-control-06-f-manual.svg rename to tests/wpt/tests/svg/import/painting-control-06-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-fill-01-t-manual.svg b/tests/wpt/tests/svg/import/painting-fill-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-fill-01-t-manual.svg rename to tests/wpt/tests/svg/import/painting-fill-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-fill-02-t-manual.svg b/tests/wpt/tests/svg/import/painting-fill-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-fill-02-t-manual.svg rename to tests/wpt/tests/svg/import/painting-fill-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-fill-03-t-manual.svg b/tests/wpt/tests/svg/import/painting-fill-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-fill-03-t-manual.svg rename to tests/wpt/tests/svg/import/painting-fill-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-fill-04-t-manual.svg b/tests/wpt/tests/svg/import/painting-fill-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-fill-04-t-manual.svg rename to tests/wpt/tests/svg/import/painting-fill-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-fill-05-b-manual.svg b/tests/wpt/tests/svg/import/painting-fill-05-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-fill-05-b-manual.svg rename to tests/wpt/tests/svg/import/painting-fill-05-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-render-01-b-manual.svg b/tests/wpt/tests/svg/import/painting-render-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-render-01-b-manual.svg rename to tests/wpt/tests/svg/import/painting-render-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-render-02-b-manual.svg b/tests/wpt/tests/svg/import/painting-render-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-render-02-b-manual.svg rename to tests/wpt/tests/svg/import/painting-render-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-stroke-01-t-manual.svg b/tests/wpt/tests/svg/import/painting-stroke-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-stroke-01-t-manual.svg rename to tests/wpt/tests/svg/import/painting-stroke-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-stroke-02-t-manual.svg b/tests/wpt/tests/svg/import/painting-stroke-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-stroke-02-t-manual.svg rename to tests/wpt/tests/svg/import/painting-stroke-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-stroke-03-t-manual.svg b/tests/wpt/tests/svg/import/painting-stroke-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-stroke-03-t-manual.svg rename to tests/wpt/tests/svg/import/painting-stroke-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-stroke-04-t-manual.svg b/tests/wpt/tests/svg/import/painting-stroke-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-stroke-04-t-manual.svg rename to tests/wpt/tests/svg/import/painting-stroke-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-stroke-05-t-manual.svg b/tests/wpt/tests/svg/import/painting-stroke-05-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-stroke-05-t-manual.svg rename to tests/wpt/tests/svg/import/painting-stroke-05-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-stroke-06-t-manual.svg b/tests/wpt/tests/svg/import/painting-stroke-06-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-stroke-06-t-manual.svg rename to tests/wpt/tests/svg/import/painting-stroke-06-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-stroke-07-t-manual.svg b/tests/wpt/tests/svg/import/painting-stroke-07-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-stroke-07-t-manual.svg rename to tests/wpt/tests/svg/import/painting-stroke-07-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-stroke-08-t-manual.svg b/tests/wpt/tests/svg/import/painting-stroke-08-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-stroke-08-t-manual.svg rename to tests/wpt/tests/svg/import/painting-stroke-08-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-stroke-09-t-manual.svg b/tests/wpt/tests/svg/import/painting-stroke-09-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-stroke-09-t-manual.svg rename to tests/wpt/tests/svg/import/painting-stroke-09-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/painting-stroke-10-t-manual.svg b/tests/wpt/tests/svg/import/painting-stroke-10-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/painting-stroke-10-t-manual.svg rename to tests/wpt/tests/svg/import/painting-stroke-10-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-01-t-manual.svg b/tests/wpt/tests/svg/import/paths-data-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-01-t-manual.svg rename to tests/wpt/tests/svg/import/paths-data-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-02-t-manual.svg b/tests/wpt/tests/svg/import/paths-data-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-02-t-manual.svg rename to tests/wpt/tests/svg/import/paths-data-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-03-f-manual.svg b/tests/wpt/tests/svg/import/paths-data-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-03-f-manual.svg rename to tests/wpt/tests/svg/import/paths-data-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-04-t-manual.svg b/tests/wpt/tests/svg/import/paths-data-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-04-t-manual.svg rename to tests/wpt/tests/svg/import/paths-data-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-05-t-manual.svg b/tests/wpt/tests/svg/import/paths-data-05-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-05-t-manual.svg rename to tests/wpt/tests/svg/import/paths-data-05-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-06-t-manual.svg b/tests/wpt/tests/svg/import/paths-data-06-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-06-t-manual.svg rename to tests/wpt/tests/svg/import/paths-data-06-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-07-t-manual.svg b/tests/wpt/tests/svg/import/paths-data-07-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-07-t-manual.svg rename to tests/wpt/tests/svg/import/paths-data-07-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-08-t-manual.svg b/tests/wpt/tests/svg/import/paths-data-08-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-08-t-manual.svg rename to tests/wpt/tests/svg/import/paths-data-08-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-09-t-manual.svg b/tests/wpt/tests/svg/import/paths-data-09-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-09-t-manual.svg rename to tests/wpt/tests/svg/import/paths-data-09-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-10-t-manual.svg b/tests/wpt/tests/svg/import/paths-data-10-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-10-t-manual.svg rename to tests/wpt/tests/svg/import/paths-data-10-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-12-t-manual.svg b/tests/wpt/tests/svg/import/paths-data-12-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-12-t-manual.svg rename to tests/wpt/tests/svg/import/paths-data-12-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-13-t-manual.svg b/tests/wpt/tests/svg/import/paths-data-13-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-13-t-manual.svg rename to tests/wpt/tests/svg/import/paths-data-13-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-14-t-manual.svg b/tests/wpt/tests/svg/import/paths-data-14-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-14-t-manual.svg rename to tests/wpt/tests/svg/import/paths-data-14-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-15-t-manual.svg b/tests/wpt/tests/svg/import/paths-data-15-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-15-t-manual.svg rename to tests/wpt/tests/svg/import/paths-data-15-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-16-t-manual.svg b/tests/wpt/tests/svg/import/paths-data-16-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-16-t-manual.svg rename to tests/wpt/tests/svg/import/paths-data-16-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-17-f-manual.svg b/tests/wpt/tests/svg/import/paths-data-17-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-17-f-manual.svg rename to tests/wpt/tests/svg/import/paths-data-17-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-18-f-manual.svg b/tests/wpt/tests/svg/import/paths-data-18-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-18-f-manual.svg rename to tests/wpt/tests/svg/import/paths-data-18-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-19-f-manual.svg b/tests/wpt/tests/svg/import/paths-data-19-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-19-f-manual.svg rename to tests/wpt/tests/svg/import/paths-data-19-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-data-20-f-manual.svg b/tests/wpt/tests/svg/import/paths-data-20-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-data-20-f-manual.svg rename to tests/wpt/tests/svg/import/paths-data-20-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-dom-01-f-manual.svg b/tests/wpt/tests/svg/import/paths-dom-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-dom-01-f-manual.svg rename to tests/wpt/tests/svg/import/paths-dom-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/paths-dom-02-f-manual.svg b/tests/wpt/tests/svg/import/paths-dom-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/paths-dom-02-f-manual.svg rename to tests/wpt/tests/svg/import/paths-dom-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-01-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-01-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-02-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-02-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-03-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-03-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-04-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-04-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-04-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-04-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-05-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-05-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-05-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-05-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-06-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-06-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-06-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-06-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-07-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-07-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-07-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-07-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-08-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-08-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-08-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-08-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-09-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-09-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-09-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-09-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-10-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-10-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-10-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-10-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-11-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-11-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-11-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-11-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-12-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-12-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-12-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-12-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-13-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-13-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-13-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-13-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-14-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-14-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-14-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-14-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-15-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-15-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-15-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-15-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-16-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-16-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-16-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-16-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-17-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-17-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-17-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-17-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-18-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-18-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-18-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-18-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-20-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-20-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-20-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-20-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-21-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-21-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-21-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-21-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-22-b-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-22-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-22-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-22-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-23-f-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-23-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-23-f-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-23-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-24-f-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-24-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-24-f-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-24-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-grad-stops-01-f-manual.svg b/tests/wpt/tests/svg/import/pservers-grad-stops-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-grad-stops-01-f-manual.svg rename to tests/wpt/tests/svg/import/pservers-grad-stops-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-pattern-01-b-manual.svg b/tests/wpt/tests/svg/import/pservers-pattern-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-pattern-01-b-manual.svg rename to tests/wpt/tests/svg/import/pservers-pattern-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-pattern-02-f-manual.svg b/tests/wpt/tests/svg/import/pservers-pattern-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-pattern-02-f-manual.svg rename to tests/wpt/tests/svg/import/pservers-pattern-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-pattern-03-f-manual.svg b/tests/wpt/tests/svg/import/pservers-pattern-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-pattern-03-f-manual.svg rename to tests/wpt/tests/svg/import/pservers-pattern-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-pattern-04-f-manual.svg b/tests/wpt/tests/svg/import/pservers-pattern-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-pattern-04-f-manual.svg rename to tests/wpt/tests/svg/import/pservers-pattern-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-pattern-05-f-manual.svg b/tests/wpt/tests/svg/import/pservers-pattern-05-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-pattern-05-f-manual.svg rename to tests/wpt/tests/svg/import/pservers-pattern-05-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-pattern-06-f-manual.svg b/tests/wpt/tests/svg/import/pservers-pattern-06-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-pattern-06-f-manual.svg rename to tests/wpt/tests/svg/import/pservers-pattern-06-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-pattern-07-f-manual.svg b/tests/wpt/tests/svg/import/pservers-pattern-07-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-pattern-07-f-manual.svg rename to tests/wpt/tests/svg/import/pservers-pattern-07-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-pattern-08-f-manual.svg b/tests/wpt/tests/svg/import/pservers-pattern-08-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-pattern-08-f-manual.svg rename to tests/wpt/tests/svg/import/pservers-pattern-08-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/pservers-pattern-09-f-manual.svg b/tests/wpt/tests/svg/import/pservers-pattern-09-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/pservers-pattern-09-f-manual.svg rename to tests/wpt/tests/svg/import/pservers-pattern-09-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/render-elems-01-t-manual.svg b/tests/wpt/tests/svg/import/render-elems-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/render-elems-01-t-manual.svg rename to tests/wpt/tests/svg/import/render-elems-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/render-elems-02-t-manual.svg b/tests/wpt/tests/svg/import/render-elems-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/render-elems-02-t-manual.svg rename to tests/wpt/tests/svg/import/render-elems-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/render-elems-03-t-manual.svg b/tests/wpt/tests/svg/import/render-elems-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/render-elems-03-t-manual.svg rename to tests/wpt/tests/svg/import/render-elems-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/render-elems-06-t-manual.svg b/tests/wpt/tests/svg/import/render-elems-06-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/render-elems-06-t-manual.svg rename to tests/wpt/tests/svg/import/render-elems-06-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/render-elems-07-t-manual.svg b/tests/wpt/tests/svg/import/render-elems-07-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/render-elems-07-t-manual.svg rename to tests/wpt/tests/svg/import/render-elems-07-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/render-elems-08-t-manual.svg b/tests/wpt/tests/svg/import/render-elems-08-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/render-elems-08-t-manual.svg rename to tests/wpt/tests/svg/import/render-elems-08-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/render-groups-01-b-manual.svg b/tests/wpt/tests/svg/import/render-groups-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/render-groups-01-b-manual.svg rename to tests/wpt/tests/svg/import/render-groups-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/render-groups-03-t-manual.svg b/tests/wpt/tests/svg/import/render-groups-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/render-groups-03-t-manual.svg rename to tests/wpt/tests/svg/import/render-groups-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/script-handle-01-b-manual.svg b/tests/wpt/tests/svg/import/script-handle-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/script-handle-01-b-manual.svg rename to tests/wpt/tests/svg/import/script-handle-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/script-handle-02-b-manual.svg b/tests/wpt/tests/svg/import/script-handle-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/script-handle-02-b-manual.svg rename to tests/wpt/tests/svg/import/script-handle-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/script-handle-03-b-manual.svg b/tests/wpt/tests/svg/import/script-handle-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/script-handle-03-b-manual.svg rename to tests/wpt/tests/svg/import/script-handle-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/script-handle-04-b-manual.svg b/tests/wpt/tests/svg/import/script-handle-04-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/script-handle-04-b-manual.svg rename to tests/wpt/tests/svg/import/script-handle-04-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/script-specify-01-f-manual.svg b/tests/wpt/tests/svg/import/script-specify-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/script-specify-01-f-manual.svg rename to tests/wpt/tests/svg/import/script-specify-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/script-specify-02-f-manual.svg b/tests/wpt/tests/svg/import/script-specify-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/script-specify-02-f-manual.svg rename to tests/wpt/tests/svg/import/script-specify-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-circle-01-t-manual.svg b/tests/wpt/tests/svg/import/shapes-circle-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-circle-01-t-manual.svg rename to tests/wpt/tests/svg/import/shapes-circle-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-circle-02-t-manual.svg b/tests/wpt/tests/svg/import/shapes-circle-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-circle-02-t-manual.svg rename to tests/wpt/tests/svg/import/shapes-circle-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-ellipse-01-t-manual.svg b/tests/wpt/tests/svg/import/shapes-ellipse-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-ellipse-01-t-manual.svg rename to tests/wpt/tests/svg/import/shapes-ellipse-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-ellipse-02-t-manual.svg b/tests/wpt/tests/svg/import/shapes-ellipse-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-ellipse-02-t-manual.svg rename to tests/wpt/tests/svg/import/shapes-ellipse-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-ellipse-03-f-manual.svg b/tests/wpt/tests/svg/import/shapes-ellipse-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-ellipse-03-f-manual.svg rename to tests/wpt/tests/svg/import/shapes-ellipse-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-grammar-01-f-manual.svg b/tests/wpt/tests/svg/import/shapes-grammar-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-grammar-01-f-manual.svg rename to tests/wpt/tests/svg/import/shapes-grammar-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-intro-01-t-manual.svg b/tests/wpt/tests/svg/import/shapes-intro-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-intro-01-t-manual.svg rename to tests/wpt/tests/svg/import/shapes-intro-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-intro-02-f-manual.svg b/tests/wpt/tests/svg/import/shapes-intro-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-intro-02-f-manual.svg rename to tests/wpt/tests/svg/import/shapes-intro-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-line-01-t-manual.svg b/tests/wpt/tests/svg/import/shapes-line-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-line-01-t-manual.svg rename to tests/wpt/tests/svg/import/shapes-line-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-line-02-f-manual.svg b/tests/wpt/tests/svg/import/shapes-line-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-line-02-f-manual.svg rename to tests/wpt/tests/svg/import/shapes-line-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-polygon-01-t-manual.svg b/tests/wpt/tests/svg/import/shapes-polygon-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-polygon-01-t-manual.svg rename to tests/wpt/tests/svg/import/shapes-polygon-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-polygon-02-t-manual.svg b/tests/wpt/tests/svg/import/shapes-polygon-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-polygon-02-t-manual.svg rename to tests/wpt/tests/svg/import/shapes-polygon-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-polygon-03-t-manual.svg b/tests/wpt/tests/svg/import/shapes-polygon-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-polygon-03-t-manual.svg rename to tests/wpt/tests/svg/import/shapes-polygon-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-polyline-01-t-manual.svg b/tests/wpt/tests/svg/import/shapes-polyline-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-polyline-01-t-manual.svg rename to tests/wpt/tests/svg/import/shapes-polyline-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-polyline-02-t-manual.svg b/tests/wpt/tests/svg/import/shapes-polyline-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-polyline-02-t-manual.svg rename to tests/wpt/tests/svg/import/shapes-polyline-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-rect-02-t-manual.svg b/tests/wpt/tests/svg/import/shapes-rect-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-rect-02-t-manual.svg rename to tests/wpt/tests/svg/import/shapes-rect-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-rect-03-t-manual.svg b/tests/wpt/tests/svg/import/shapes-rect-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-rect-03-t-manual.svg rename to tests/wpt/tests/svg/import/shapes-rect-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-rect-04-f-manual.svg b/tests/wpt/tests/svg/import/shapes-rect-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-rect-04-f-manual.svg rename to tests/wpt/tests/svg/import/shapes-rect-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-rect-05-f-manual.svg b/tests/wpt/tests/svg/import/shapes-rect-05-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-rect-05-f-manual.svg rename to tests/wpt/tests/svg/import/shapes-rect-05-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-rect-06-f-manual.svg b/tests/wpt/tests/svg/import/shapes-rect-06-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-rect-06-f-manual.svg rename to tests/wpt/tests/svg/import/shapes-rect-06-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/shapes-rect-07-f-manual.svg b/tests/wpt/tests/svg/import/shapes-rect-07-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/shapes-rect-07-f-manual.svg rename to tests/wpt/tests/svg/import/shapes-rect-07-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-cond-01-t-manual.svg b/tests/wpt/tests/svg/import/struct-cond-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-cond-01-t-manual.svg rename to tests/wpt/tests/svg/import/struct-cond-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-cond-02-t-manual.svg b/tests/wpt/tests/svg/import/struct-cond-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-cond-02-t-manual.svg rename to tests/wpt/tests/svg/import/struct-cond-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-cond-03-t-manual.svg b/tests/wpt/tests/svg/import/struct-cond-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-cond-03-t-manual.svg rename to tests/wpt/tests/svg/import/struct-cond-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-cond-overview-02-f-manual.svg b/tests/wpt/tests/svg/import/struct-cond-overview-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-cond-overview-02-f-manual.svg rename to tests/wpt/tests/svg/import/struct-cond-overview-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-cond-overview-03-f-manual.svg b/tests/wpt/tests/svg/import/struct-cond-overview-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-cond-overview-03-f-manual.svg rename to tests/wpt/tests/svg/import/struct-cond-overview-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-cond-overview-04-f-manual.svg b/tests/wpt/tests/svg/import/struct-cond-overview-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-cond-overview-04-f-manual.svg rename to tests/wpt/tests/svg/import/struct-cond-overview-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-cond-overview-05-f-manual.svg b/tests/wpt/tests/svg/import/struct-cond-overview-05-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-cond-overview-05-f-manual.svg rename to tests/wpt/tests/svg/import/struct-cond-overview-05-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-defs-01-t-manual.svg b/tests/wpt/tests/svg/import/struct-defs-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-defs-01-t-manual.svg rename to tests/wpt/tests/svg/import/struct-defs-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-01-b-manual.svg b/tests/wpt/tests/svg/import/struct-dom-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-01-b-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-02-b-manual.svg b/tests/wpt/tests/svg/import/struct-dom-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-02-b-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-03-b-manual.svg b/tests/wpt/tests/svg/import/struct-dom-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-03-b-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-04-b-manual.svg b/tests/wpt/tests/svg/import/struct-dom-04-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-04-b-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-04-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-05-b-manual.svg b/tests/wpt/tests/svg/import/struct-dom-05-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-05-b-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-05-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-06-b-manual.svg b/tests/wpt/tests/svg/import/struct-dom-06-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-06-b-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-06-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-07-f-manual.svg b/tests/wpt/tests/svg/import/struct-dom-07-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-07-f-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-07-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-08-f-manual.svg b/tests/wpt/tests/svg/import/struct-dom-08-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-08-f-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-08-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-11-f-manual.svg b/tests/wpt/tests/svg/import/struct-dom-11-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-11-f-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-11-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-12-b-manual.svg b/tests/wpt/tests/svg/import/struct-dom-12-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-12-b-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-12-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-13-f-manual.svg b/tests/wpt/tests/svg/import/struct-dom-13-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-13-f-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-13-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-14-f-manual.svg b/tests/wpt/tests/svg/import/struct-dom-14-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-14-f-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-14-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-15-f-manual.svg b/tests/wpt/tests/svg/import/struct-dom-15-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-15-f-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-15-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-16-f-manual.svg b/tests/wpt/tests/svg/import/struct-dom-16-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-16-f-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-16-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-17-f-manual.svg b/tests/wpt/tests/svg/import/struct-dom-17-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-17-f-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-17-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-18-f-manual.svg b/tests/wpt/tests/svg/import/struct-dom-18-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-18-f-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-18-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-19-f-manual.svg b/tests/wpt/tests/svg/import/struct-dom-19-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-19-f-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-19-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-dom-20-f-manual.svg b/tests/wpt/tests/svg/import/struct-dom-20-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-dom-20-f-manual.svg rename to tests/wpt/tests/svg/import/struct-dom-20-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-frag-01-t-manual.svg b/tests/wpt/tests/svg/import/struct-frag-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-frag-01-t-manual.svg rename to tests/wpt/tests/svg/import/struct-frag-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-frag-02-t-manual.svg b/tests/wpt/tests/svg/import/struct-frag-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-frag-02-t-manual.svg rename to tests/wpt/tests/svg/import/struct-frag-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-frag-03-t-manual.svg b/tests/wpt/tests/svg/import/struct-frag-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-frag-03-t-manual.svg rename to tests/wpt/tests/svg/import/struct-frag-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-frag-04-t-manual.svg b/tests/wpt/tests/svg/import/struct-frag-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-frag-04-t-manual.svg rename to tests/wpt/tests/svg/import/struct-frag-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-frag-05-t-manual.svg b/tests/wpt/tests/svg/import/struct-frag-05-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-frag-05-t-manual.svg rename to tests/wpt/tests/svg/import/struct-frag-05-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-frag-06-t-manual.svg b/tests/wpt/tests/svg/import/struct-frag-06-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-frag-06-t-manual.svg rename to tests/wpt/tests/svg/import/struct-frag-06-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-group-01-t-manual.svg b/tests/wpt/tests/svg/import/struct-group-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-group-01-t-manual.svg rename to tests/wpt/tests/svg/import/struct-group-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-group-02-b-manual.svg b/tests/wpt/tests/svg/import/struct-group-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-group-02-b-manual.svg rename to tests/wpt/tests/svg/import/struct-group-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-group-03-t-manual.svg b/tests/wpt/tests/svg/import/struct-group-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-group-03-t-manual.svg rename to tests/wpt/tests/svg/import/struct-group-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-01-t-manual.svg b/tests/wpt/tests/svg/import/struct-image-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-01-t-manual.svg rename to tests/wpt/tests/svg/import/struct-image-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-02-b-manual.svg b/tests/wpt/tests/svg/import/struct-image-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-02-b-manual.svg rename to tests/wpt/tests/svg/import/struct-image-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-03-t-manual.svg b/tests/wpt/tests/svg/import/struct-image-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-03-t-manual.svg rename to tests/wpt/tests/svg/import/struct-image-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-04-t-manual.svg b/tests/wpt/tests/svg/import/struct-image-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-04-t-manual.svg rename to tests/wpt/tests/svg/import/struct-image-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-05-b-manual.svg b/tests/wpt/tests/svg/import/struct-image-05-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-05-b-manual.svg rename to tests/wpt/tests/svg/import/struct-image-05-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-06-t-manual.svg b/tests/wpt/tests/svg/import/struct-image-06-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-06-t-manual.svg rename to tests/wpt/tests/svg/import/struct-image-06-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-07-t-manual.svg b/tests/wpt/tests/svg/import/struct-image-07-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-07-t-manual.svg rename to tests/wpt/tests/svg/import/struct-image-07-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-08-t-manual.svg b/tests/wpt/tests/svg/import/struct-image-08-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-08-t-manual.svg rename to tests/wpt/tests/svg/import/struct-image-08-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-09-t-manual.svg b/tests/wpt/tests/svg/import/struct-image-09-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-09-t-manual.svg rename to tests/wpt/tests/svg/import/struct-image-09-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-10-t-manual.svg b/tests/wpt/tests/svg/import/struct-image-10-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-10-t-manual.svg rename to tests/wpt/tests/svg/import/struct-image-10-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-11-b-manual.svg b/tests/wpt/tests/svg/import/struct-image-11-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-11-b-manual.svg rename to tests/wpt/tests/svg/import/struct-image-11-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-12-b-manual.svg b/tests/wpt/tests/svg/import/struct-image-12-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-12-b-manual.svg rename to tests/wpt/tests/svg/import/struct-image-12-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-13-f-manual.svg b/tests/wpt/tests/svg/import/struct-image-13-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-13-f-manual.svg rename to tests/wpt/tests/svg/import/struct-image-13-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-14-f-manual.svg b/tests/wpt/tests/svg/import/struct-image-14-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-14-f-manual.svg rename to tests/wpt/tests/svg/import/struct-image-14-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-15-f-manual.svg b/tests/wpt/tests/svg/import/struct-image-15-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-15-f-manual.svg rename to tests/wpt/tests/svg/import/struct-image-15-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-16-f-manual.svg b/tests/wpt/tests/svg/import/struct-image-16-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-16-f-manual.svg rename to tests/wpt/tests/svg/import/struct-image-16-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-17-b-manual.svg b/tests/wpt/tests/svg/import/struct-image-17-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-17-b-manual.svg rename to tests/wpt/tests/svg/import/struct-image-17-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-18-f-manual.svg b/tests/wpt/tests/svg/import/struct-image-18-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-18-f-manual.svg rename to tests/wpt/tests/svg/import/struct-image-18-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-image-19-f-manual.svg b/tests/wpt/tests/svg/import/struct-image-19-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-image-19-f-manual.svg rename to tests/wpt/tests/svg/import/struct-image-19-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-svg-01-f-manual.svg b/tests/wpt/tests/svg/import/struct-svg-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-svg-01-f-manual.svg rename to tests/wpt/tests/svg/import/struct-svg-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-svg-02-f-manual.svg b/tests/wpt/tests/svg/import/struct-svg-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-svg-02-f-manual.svg rename to tests/wpt/tests/svg/import/struct-svg-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-svg-03-f-manual.svg b/tests/wpt/tests/svg/import/struct-svg-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-svg-03-f-manual.svg rename to tests/wpt/tests/svg/import/struct-svg-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-symbol-01-b-manual.svg b/tests/wpt/tests/svg/import/struct-symbol-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-symbol-01-b-manual.svg rename to tests/wpt/tests/svg/import/struct-symbol-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-use-01-t-manual.svg b/tests/wpt/tests/svg/import/struct-use-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-use-01-t-manual.svg rename to tests/wpt/tests/svg/import/struct-use-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-use-03-t-manual.svg b/tests/wpt/tests/svg/import/struct-use-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-use-03-t-manual.svg rename to tests/wpt/tests/svg/import/struct-use-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-use-04-b-manual.svg b/tests/wpt/tests/svg/import/struct-use-04-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-use-04-b-manual.svg rename to tests/wpt/tests/svg/import/struct-use-04-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-use-05-b-manual.svg b/tests/wpt/tests/svg/import/struct-use-05-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-use-05-b-manual.svg rename to tests/wpt/tests/svg/import/struct-use-05-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-use-06-b-manual.svg b/tests/wpt/tests/svg/import/struct-use-06-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-use-06-b-manual.svg rename to tests/wpt/tests/svg/import/struct-use-06-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-use-07-b-manual.svg b/tests/wpt/tests/svg/import/struct-use-07-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-use-07-b-manual.svg rename to tests/wpt/tests/svg/import/struct-use-07-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-use-08-b-manual.svg b/tests/wpt/tests/svg/import/struct-use-08-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-use-08-b-manual.svg rename to tests/wpt/tests/svg/import/struct-use-08-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-use-09-b-manual.svg b/tests/wpt/tests/svg/import/struct-use-09-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-use-09-b-manual.svg rename to tests/wpt/tests/svg/import/struct-use-09-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-use-10-f-manual.svg b/tests/wpt/tests/svg/import/struct-use-10-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-use-10-f-manual.svg rename to tests/wpt/tests/svg/import/struct-use-10-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-use-11-f-manual.svg b/tests/wpt/tests/svg/import/struct-use-11-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-use-11-f-manual.svg rename to tests/wpt/tests/svg/import/struct-use-11-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-use-12-f-manual.svg b/tests/wpt/tests/svg/import/struct-use-12-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-use-12-f-manual.svg rename to tests/wpt/tests/svg/import/struct-use-12-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-use-13-f-manual.svg b/tests/wpt/tests/svg/import/struct-use-13-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-use-13-f-manual.svg rename to tests/wpt/tests/svg/import/struct-use-13-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-use-14-f-manual.svg b/tests/wpt/tests/svg/import/struct-use-14-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-use-14-f-manual.svg rename to tests/wpt/tests/svg/import/struct-use-14-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/struct-use-15-f-manual.svg b/tests/wpt/tests/svg/import/struct-use-15-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/struct-use-15-f-manual.svg rename to tests/wpt/tests/svg/import/struct-use-15-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-class-01-f-manual.svg b/tests/wpt/tests/svg/import/styling-class-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-class-01-f-manual.svg rename to tests/wpt/tests/svg/import/styling-class-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-css-01-b-manual.svg b/tests/wpt/tests/svg/import/styling-css-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-css-01-b-manual.svg rename to tests/wpt/tests/svg/import/styling-css-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-css-02-b-manual.svg b/tests/wpt/tests/svg/import/styling-css-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-css-02-b-manual.svg rename to tests/wpt/tests/svg/import/styling-css-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-css-03-b-manual.svg b/tests/wpt/tests/svg/import/styling-css-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-css-03-b-manual.svg rename to tests/wpt/tests/svg/import/styling-css-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-css-04-f-manual.svg b/tests/wpt/tests/svg/import/styling-css-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-css-04-f-manual.svg rename to tests/wpt/tests/svg/import/styling-css-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-css-05-b-manual.svg b/tests/wpt/tests/svg/import/styling-css-05-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-css-05-b-manual.svg rename to tests/wpt/tests/svg/import/styling-css-05-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-css-06-b-manual.svg b/tests/wpt/tests/svg/import/styling-css-06-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-css-06-b-manual.svg rename to tests/wpt/tests/svg/import/styling-css-06-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-css-07-f-manual.svg b/tests/wpt/tests/svg/import/styling-css-07-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-css-07-f-manual.svg rename to tests/wpt/tests/svg/import/styling-css-07-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-css-08-f-manual.svg b/tests/wpt/tests/svg/import/styling-css-08-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-css-08-f-manual.svg rename to tests/wpt/tests/svg/import/styling-css-08-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-css-09-f-manual.svg b/tests/wpt/tests/svg/import/styling-css-09-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-css-09-f-manual.svg rename to tests/wpt/tests/svg/import/styling-css-09-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-css-10-f-manual.svg b/tests/wpt/tests/svg/import/styling-css-10-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-css-10-f-manual.svg rename to tests/wpt/tests/svg/import/styling-css-10-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-elem-01-b-manual.svg b/tests/wpt/tests/svg/import/styling-elem-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-elem-01-b-manual.svg rename to tests/wpt/tests/svg/import/styling-elem-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-inherit-01-b-manual.svg b/tests/wpt/tests/svg/import/styling-inherit-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-inherit-01-b-manual.svg rename to tests/wpt/tests/svg/import/styling-inherit-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-pres-01-t-manual.svg b/tests/wpt/tests/svg/import/styling-pres-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-pres-01-t-manual.svg rename to tests/wpt/tests/svg/import/styling-pres-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-pres-02-f-manual.svg b/tests/wpt/tests/svg/import/styling-pres-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-pres-02-f-manual.svg rename to tests/wpt/tests/svg/import/styling-pres-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-pres-03-f-manual.svg b/tests/wpt/tests/svg/import/styling-pres-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-pres-03-f-manual.svg rename to tests/wpt/tests/svg/import/styling-pres-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-pres-04-f-manual.svg b/tests/wpt/tests/svg/import/styling-pres-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-pres-04-f-manual.svg rename to tests/wpt/tests/svg/import/styling-pres-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/styling-pres-05-f-manual.svg b/tests/wpt/tests/svg/import/styling-pres-05-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/styling-pres-05-f-manual.svg rename to tests/wpt/tests/svg/import/styling-pres-05-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/svgdom-over-01-f-manual.svg b/tests/wpt/tests/svg/import/svgdom-over-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/svgdom-over-01-f-manual.svg rename to tests/wpt/tests/svg/import/svgdom-over-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-align-01-b-manual.svg b/tests/wpt/tests/svg/import/text-align-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-align-01-b-manual.svg rename to tests/wpt/tests/svg/import/text-align-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-align-02-b-manual.svg b/tests/wpt/tests/svg/import/text-align-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-align-02-b-manual.svg rename to tests/wpt/tests/svg/import/text-align-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-align-03-b-manual.svg b/tests/wpt/tests/svg/import/text-align-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-align-03-b-manual.svg rename to tests/wpt/tests/svg/import/text-align-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-align-04-b-manual.svg b/tests/wpt/tests/svg/import/text-align-04-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-align-04-b-manual.svg rename to tests/wpt/tests/svg/import/text-align-04-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-align-05-b-manual.svg b/tests/wpt/tests/svg/import/text-align-05-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-align-05-b-manual.svg rename to tests/wpt/tests/svg/import/text-align-05-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-align-06-b-manual.svg b/tests/wpt/tests/svg/import/text-align-06-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-align-06-b-manual.svg rename to tests/wpt/tests/svg/import/text-align-06-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-align-07-t-manual.svg b/tests/wpt/tests/svg/import/text-align-07-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-align-07-t-manual.svg rename to tests/wpt/tests/svg/import/text-align-07-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-align-08-b-manual.svg b/tests/wpt/tests/svg/import/text-align-08-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-align-08-b-manual.svg rename to tests/wpt/tests/svg/import/text-align-08-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-altglyph-01-b-manual.svg b/tests/wpt/tests/svg/import/text-altglyph-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-altglyph-01-b-manual.svg rename to tests/wpt/tests/svg/import/text-altglyph-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-altglyph-02-b-manual.svg b/tests/wpt/tests/svg/import/text-altglyph-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-altglyph-02-b-manual.svg rename to tests/wpt/tests/svg/import/text-altglyph-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-altglyph-03-b-manual.svg b/tests/wpt/tests/svg/import/text-altglyph-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-altglyph-03-b-manual.svg rename to tests/wpt/tests/svg/import/text-altglyph-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-bidi-01-t-manual.svg b/tests/wpt/tests/svg/import/text-bidi-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-bidi-01-t-manual.svg rename to tests/wpt/tests/svg/import/text-bidi-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-deco-01-b-manual.svg b/tests/wpt/tests/svg/import/text-deco-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-deco-01-b-manual.svg rename to tests/wpt/tests/svg/import/text-deco-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-dom-01-f-manual.svg b/tests/wpt/tests/svg/import/text-dom-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-dom-01-f-manual.svg rename to tests/wpt/tests/svg/import/text-dom-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-dom-02-f-manual.svg b/tests/wpt/tests/svg/import/text-dom-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-dom-02-f-manual.svg rename to tests/wpt/tests/svg/import/text-dom-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-dom-03-f-manual.svg b/tests/wpt/tests/svg/import/text-dom-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-dom-03-f-manual.svg rename to tests/wpt/tests/svg/import/text-dom-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-dom-04-f-manual.svg b/tests/wpt/tests/svg/import/text-dom-04-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-dom-04-f-manual.svg rename to tests/wpt/tests/svg/import/text-dom-04-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-dom-05-f-manual.svg b/tests/wpt/tests/svg/import/text-dom-05-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-dom-05-f-manual.svg rename to tests/wpt/tests/svg/import/text-dom-05-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-fonts-01-t-manual.svg b/tests/wpt/tests/svg/import/text-fonts-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-fonts-01-t-manual.svg rename to tests/wpt/tests/svg/import/text-fonts-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-fonts-02-t-manual.svg b/tests/wpt/tests/svg/import/text-fonts-02-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-fonts-02-t-manual.svg rename to tests/wpt/tests/svg/import/text-fonts-02-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-fonts-03-t-manual.svg b/tests/wpt/tests/svg/import/text-fonts-03-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-fonts-03-t-manual.svg rename to tests/wpt/tests/svg/import/text-fonts-03-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-fonts-04-t-manual.svg b/tests/wpt/tests/svg/import/text-fonts-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-fonts-04-t-manual.svg rename to tests/wpt/tests/svg/import/text-fonts-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-fonts-05-f-manual.svg b/tests/wpt/tests/svg/import/text-fonts-05-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-fonts-05-f-manual.svg rename to tests/wpt/tests/svg/import/text-fonts-05-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-fonts-202-t-manual.svg b/tests/wpt/tests/svg/import/text-fonts-202-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-fonts-202-t-manual.svg rename to tests/wpt/tests/svg/import/text-fonts-202-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-fonts-203-t-manual.svg b/tests/wpt/tests/svg/import/text-fonts-203-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-fonts-203-t-manual.svg rename to tests/wpt/tests/svg/import/text-fonts-203-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-fonts-204-t-manual.svg b/tests/wpt/tests/svg/import/text-fonts-204-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-fonts-204-t-manual.svg rename to tests/wpt/tests/svg/import/text-fonts-204-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-intro-01-t-manual.svg b/tests/wpt/tests/svg/import/text-intro-01-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-intro-01-t-manual.svg rename to tests/wpt/tests/svg/import/text-intro-01-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-intro-02-b-manual.svg b/tests/wpt/tests/svg/import/text-intro-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-intro-02-b-manual.svg rename to tests/wpt/tests/svg/import/text-intro-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-intro-03-b-manual.svg b/tests/wpt/tests/svg/import/text-intro-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-intro-03-b-manual.svg rename to tests/wpt/tests/svg/import/text-intro-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-intro-04-t-manual.svg b/tests/wpt/tests/svg/import/text-intro-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-intro-04-t-manual.svg rename to tests/wpt/tests/svg/import/text-intro-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-intro-05-t-manual.svg b/tests/wpt/tests/svg/import/text-intro-05-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-intro-05-t-manual.svg rename to tests/wpt/tests/svg/import/text-intro-05-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-intro-06-t-manual.svg b/tests/wpt/tests/svg/import/text-intro-06-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-intro-06-t-manual.svg rename to tests/wpt/tests/svg/import/text-intro-06-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-intro-07-t-manual.svg b/tests/wpt/tests/svg/import/text-intro-07-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-intro-07-t-manual.svg rename to tests/wpt/tests/svg/import/text-intro-07-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-intro-09-b-manual.svg b/tests/wpt/tests/svg/import/text-intro-09-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-intro-09-b-manual.svg rename to tests/wpt/tests/svg/import/text-intro-09-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-intro-10-f-manual.svg b/tests/wpt/tests/svg/import/text-intro-10-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-intro-10-f-manual.svg rename to tests/wpt/tests/svg/import/text-intro-10-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-intro-11-t-manual.svg b/tests/wpt/tests/svg/import/text-intro-11-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-intro-11-t-manual.svg rename to tests/wpt/tests/svg/import/text-intro-11-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-intro-12-t-manual.svg b/tests/wpt/tests/svg/import/text-intro-12-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-intro-12-t-manual.svg rename to tests/wpt/tests/svg/import/text-intro-12-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-path-01-b-manual.svg b/tests/wpt/tests/svg/import/text-path-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-path-01-b-manual.svg rename to tests/wpt/tests/svg/import/text-path-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-path-02-b-manual.svg b/tests/wpt/tests/svg/import/text-path-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-path-02-b-manual.svg rename to tests/wpt/tests/svg/import/text-path-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-spacing-01-b-manual.svg b/tests/wpt/tests/svg/import/text-spacing-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-spacing-01-b-manual.svg rename to tests/wpt/tests/svg/import/text-spacing-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-text-01-b-manual.svg b/tests/wpt/tests/svg/import/text-text-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-text-01-b-manual.svg rename to tests/wpt/tests/svg/import/text-text-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-text-03-b-manual.svg b/tests/wpt/tests/svg/import/text-text-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-text-03-b-manual.svg rename to tests/wpt/tests/svg/import/text-text-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-text-04-t-manual.svg b/tests/wpt/tests/svg/import/text-text-04-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-text-04-t-manual.svg rename to tests/wpt/tests/svg/import/text-text-04-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-text-05-t-manual.svg b/tests/wpt/tests/svg/import/text-text-05-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-text-05-t-manual.svg rename to tests/wpt/tests/svg/import/text-text-05-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-text-06-t-manual.svg b/tests/wpt/tests/svg/import/text-text-06-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-text-06-t-manual.svg rename to tests/wpt/tests/svg/import/text-text-06-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-text-07-t-manual.svg b/tests/wpt/tests/svg/import/text-text-07-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-text-07-t-manual.svg rename to tests/wpt/tests/svg/import/text-text-07-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-text-08-b-manual.svg b/tests/wpt/tests/svg/import/text-text-08-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-text-08-b-manual.svg rename to tests/wpt/tests/svg/import/text-text-08-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-text-09-t-manual.svg b/tests/wpt/tests/svg/import/text-text-09-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-text-09-t-manual.svg rename to tests/wpt/tests/svg/import/text-text-09-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-text-10-t-manual.svg b/tests/wpt/tests/svg/import/text-text-10-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-text-10-t-manual.svg rename to tests/wpt/tests/svg/import/text-text-10-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-text-11-t-manual.svg b/tests/wpt/tests/svg/import/text-text-11-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-text-11-t-manual.svg rename to tests/wpt/tests/svg/import/text-text-11-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-text-12-t-manual.svg b/tests/wpt/tests/svg/import/text-text-12-t-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-text-12-t-manual.svg rename to tests/wpt/tests/svg/import/text-text-12-t-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-tref-01-b-manual.svg b/tests/wpt/tests/svg/import/text-tref-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-tref-01-b-manual.svg rename to tests/wpt/tests/svg/import/text-tref-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-tref-02-b-manual.svg b/tests/wpt/tests/svg/import/text-tref-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-tref-02-b-manual.svg rename to tests/wpt/tests/svg/import/text-tref-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-tref-03-b-manual.svg b/tests/wpt/tests/svg/import/text-tref-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-tref-03-b-manual.svg rename to tests/wpt/tests/svg/import/text-tref-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-tselect-01-b-manual.svg b/tests/wpt/tests/svg/import/text-tselect-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-tselect-01-b-manual.svg rename to tests/wpt/tests/svg/import/text-tselect-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-tselect-02-f-manual.svg b/tests/wpt/tests/svg/import/text-tselect-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-tselect-02-f-manual.svg rename to tests/wpt/tests/svg/import/text-tselect-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-tselect-03-f-manual.svg b/tests/wpt/tests/svg/import/text-tselect-03-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-tselect-03-f-manual.svg rename to tests/wpt/tests/svg/import/text-tselect-03-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-tspan-01-b-manual.svg b/tests/wpt/tests/svg/import/text-tspan-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-tspan-01-b-manual.svg rename to tests/wpt/tests/svg/import/text-tspan-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/text-tspan-02-b-manual.svg b/tests/wpt/tests/svg/import/text-tspan-02-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/text-tspan-02-b-manual.svg rename to tests/wpt/tests/svg/import/text-tspan-02-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-basic-01-f-manual.svg b/tests/wpt/tests/svg/import/types-basic-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-basic-01-f-manual.svg rename to tests/wpt/tests/svg/import/types-basic-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-basic-02-f-manual.svg b/tests/wpt/tests/svg/import/types-basic-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-basic-02-f-manual.svg rename to tests/wpt/tests/svg/import/types-basic-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-dom-01-b-manual.svg b/tests/wpt/tests/svg/import/types-dom-01-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-dom-01-b-manual.svg rename to tests/wpt/tests/svg/import/types-dom-01-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-dom-02-f-manual.svg b/tests/wpt/tests/svg/import/types-dom-02-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-dom-02-f-manual.svg rename to tests/wpt/tests/svg/import/types-dom-02-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-dom-03-b-manual.svg b/tests/wpt/tests/svg/import/types-dom-03-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-dom-03-b-manual.svg rename to tests/wpt/tests/svg/import/types-dom-03-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-dom-04-b-manual.svg b/tests/wpt/tests/svg/import/types-dom-04-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-dom-04-b-manual.svg rename to tests/wpt/tests/svg/import/types-dom-04-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-dom-05-b-manual.svg b/tests/wpt/tests/svg/import/types-dom-05-b-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-dom-05-b-manual.svg rename to tests/wpt/tests/svg/import/types-dom-05-b-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-dom-06-f-manual.svg b/tests/wpt/tests/svg/import/types-dom-06-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-dom-06-f-manual.svg rename to tests/wpt/tests/svg/import/types-dom-06-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-dom-07-f-manual.svg b/tests/wpt/tests/svg/import/types-dom-07-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-dom-07-f-manual.svg rename to tests/wpt/tests/svg/import/types-dom-07-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-dom-08-f-manual.svg b/tests/wpt/tests/svg/import/types-dom-08-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-dom-08-f-manual.svg rename to tests/wpt/tests/svg/import/types-dom-08-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-dom-svgfittoviewbox-01-f-manual.svg b/tests/wpt/tests/svg/import/types-dom-svgfittoviewbox-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-dom-svgfittoviewbox-01-f-manual.svg rename to tests/wpt/tests/svg/import/types-dom-svgfittoviewbox-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-dom-svglengthlist-01-f-manual.svg b/tests/wpt/tests/svg/import/types-dom-svglengthlist-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-dom-svglengthlist-01-f-manual.svg rename to tests/wpt/tests/svg/import/types-dom-svglengthlist-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-dom-svgnumberlist-01-f-manual.svg b/tests/wpt/tests/svg/import/types-dom-svgnumberlist-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-dom-svgnumberlist-01-f-manual.svg rename to tests/wpt/tests/svg/import/types-dom-svgnumberlist-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-dom-svgstringlist-01-f-manual.svg b/tests/wpt/tests/svg/import/types-dom-svgstringlist-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-dom-svgstringlist-01-f-manual.svg rename to tests/wpt/tests/svg/import/types-dom-svgstringlist-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/types-dom-svgtransformable-01-f-manual.svg b/tests/wpt/tests/svg/import/types-dom-svgtransformable-01-f-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/types-dom-svgtransformable-01-f-manual.svg rename to tests/wpt/tests/svg/import/types-dom-svgtransformable-01-f-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/Blocky.woff b/tests/wpt/tests/svg/import/woffs/Blocky.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/Blocky.woff rename to tests/wpt/tests/svg/import/woffs/Blocky.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/EzraSILSR.woff b/tests/wpt/tests/svg/import/woffs/EzraSILSR.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/EzraSILSR.woff rename to tests/wpt/tests/svg/import/woffs/EzraSILSR.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/FreeMono.woff b/tests/wpt/tests/svg/import/woffs/FreeMono.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/FreeMono.woff rename to tests/wpt/tests/svg/import/woffs/FreeMono.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/FreeMonoBold.woff b/tests/wpt/tests/svg/import/woffs/FreeMonoBold.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/FreeMonoBold.woff rename to tests/wpt/tests/svg/import/woffs/FreeMonoBold.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/FreeMonoBoldOblique.woff b/tests/wpt/tests/svg/import/woffs/FreeMonoBoldOblique.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/FreeMonoBoldOblique.woff rename to tests/wpt/tests/svg/import/woffs/FreeMonoBoldOblique.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/FreeMonoOblique.woff b/tests/wpt/tests/svg/import/woffs/FreeMonoOblique.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/FreeMonoOblique.woff rename to tests/wpt/tests/svg/import/woffs/FreeMonoOblique.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/FreeSans.woff b/tests/wpt/tests/svg/import/woffs/FreeSans.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/FreeSans.woff rename to tests/wpt/tests/svg/import/woffs/FreeSans.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/FreeSansASCII.woff b/tests/wpt/tests/svg/import/woffs/FreeSansASCII.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/FreeSansASCII.woff rename to tests/wpt/tests/svg/import/woffs/FreeSansASCII.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/FreeSansBold.woff b/tests/wpt/tests/svg/import/woffs/FreeSansBold.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/FreeSansBold.woff rename to tests/wpt/tests/svg/import/woffs/FreeSansBold.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/FreeSansBoldOblique.woff b/tests/wpt/tests/svg/import/woffs/FreeSansBoldOblique.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/FreeSansBoldOblique.woff rename to tests/wpt/tests/svg/import/woffs/FreeSansBoldOblique.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/FreeSansOblique.woff b/tests/wpt/tests/svg/import/woffs/FreeSansOblique.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/FreeSansOblique.woff rename to tests/wpt/tests/svg/import/woffs/FreeSansOblique.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/FreeSerif.woff b/tests/wpt/tests/svg/import/woffs/FreeSerif.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/FreeSerif.woff rename to tests/wpt/tests/svg/import/woffs/FreeSerif.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/FreeSerifBold.woff b/tests/wpt/tests/svg/import/woffs/FreeSerifBold.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/FreeSerifBold.woff rename to tests/wpt/tests/svg/import/woffs/FreeSerifBold.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/FreeSerifBoldItalic.woff b/tests/wpt/tests/svg/import/woffs/FreeSerifBoldItalic.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/FreeSerifBoldItalic.woff rename to tests/wpt/tests/svg/import/woffs/FreeSerifBoldItalic.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/FreeSerifItalic.woff b/tests/wpt/tests/svg/import/woffs/FreeSerifItalic.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/FreeSerifItalic.woff rename to tests/wpt/tests/svg/import/woffs/FreeSerifItalic.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/PlaneOne.woff b/tests/wpt/tests/svg/import/woffs/PlaneOne.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/PlaneOne.woff rename to tests/wpt/tests/svg/import/woffs/PlaneOne.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/ScheherazadeRegOT.woff b/tests/wpt/tests/svg/import/woffs/ScheherazadeRegOT.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/ScheherazadeRegOT.woff rename to tests/wpt/tests/svg/import/woffs/ScheherazadeRegOT.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/Tribase.woff b/tests/wpt/tests/svg/import/woffs/Tribase.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/Tribase.woff rename to tests/wpt/tests/svg/import/woffs/Tribase.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/ZCB.woff b/tests/wpt/tests/svg/import/woffs/ZCB.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/ZCB.woff rename to tests/wpt/tests/svg/import/woffs/ZCB.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/ZCL.woff b/tests/wpt/tests/svg/import/woffs/ZCL.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/ZCL.woff rename to tests/wpt/tests/svg/import/woffs/ZCL.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/ZCR.woff b/tests/wpt/tests/svg/import/woffs/ZCR.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/ZCR.woff rename to tests/wpt/tests/svg/import/woffs/ZCR.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/ZCSB.woff b/tests/wpt/tests/svg/import/woffs/ZCSB.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/ZCSB.woff rename to tests/wpt/tests/svg/import/woffs/ZCSB.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/ZCXB.woff b/tests/wpt/tests/svg/import/woffs/ZCXB.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/ZCXB.woff rename to tests/wpt/tests/svg/import/woffs/ZCXB.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/ZCXL.woff b/tests/wpt/tests/svg/import/woffs/ZCXL.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/ZCXL.woff rename to tests/wpt/tests/svg/import/woffs/ZCXL.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/anglepoi.woff b/tests/wpt/tests/svg/import/woffs/anglepoi.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/anglepoi.woff rename to tests/wpt/tests/svg/import/woffs/anglepoi.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/embeded-text-text-04.woff b/tests/wpt/tests/svg/import/woffs/embeded-text-text-04.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/embeded-text-text-04.woff rename to tests/wpt/tests/svg/import/woffs/embeded-text-text-04.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/embeded-text-text-05.woff b/tests/wpt/tests/svg/import/woffs/embeded-text-text-05.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/embeded-text-text-05.woff rename to tests/wpt/tests/svg/import/woffs/embeded-text-text-05.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/embeded-text-text-06.woff b/tests/wpt/tests/svg/import/woffs/embeded-text-text-06.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/embeded-text-text-06.woff rename to tests/wpt/tests/svg/import/woffs/embeded-text-text-06.woff diff --git a/tests/wpt/web-platform-tests/svg/import/woffs/embeded.woff b/tests/wpt/tests/svg/import/woffs/embeded.woff similarity index 100% rename from tests/wpt/web-platform-tests/svg/import/woffs/embeded.woff rename to tests/wpt/tests/svg/import/woffs/embeded.woff diff --git a/tests/wpt/web-platform-tests/svg/interact/inheritance.svg b/tests/wpt/tests/svg/interact/inheritance.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/inheritance.svg rename to tests/wpt/tests/svg/interact/inheritance.svg diff --git a/tests/wpt/web-platform-tests/svg/interact/manual/event-attribute-001-manual.svg b/tests/wpt/tests/svg/interact/manual/event-attribute-001-manual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/manual/event-attribute-001-manual.svg rename to tests/wpt/tests/svg/interact/manual/event-attribute-001-manual.svg diff --git a/tests/wpt/web-platform-tests/svg/interact/parsing/pointer-events-computed.svg b/tests/wpt/tests/svg/interact/parsing/pointer-events-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/parsing/pointer-events-computed.svg rename to tests/wpt/tests/svg/interact/parsing/pointer-events-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/interact/parsing/pointer-events-invalid.svg b/tests/wpt/tests/svg/interact/parsing/pointer-events-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/parsing/pointer-events-invalid.svg rename to tests/wpt/tests/svg/interact/parsing/pointer-events-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/interact/parsing/pointer-events-valid.svg b/tests/wpt/tests/svg/interact/parsing/pointer-events-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/parsing/pointer-events-valid.svg rename to tests/wpt/tests/svg/interact/parsing/pointer-events-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/interact/script-common.html b/tests/wpt/tests/svg/interact/script-common.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/script-common.html rename to tests/wpt/tests/svg/interact/script-common.html diff --git a/tests/wpt/web-platform-tests/svg/interact/script-content.svg b/tests/wpt/tests/svg/interact/script-content.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/script-content.svg rename to tests/wpt/tests/svg/interact/script-content.svg diff --git a/tests/wpt/web-platform-tests/svg/interact/scripted/composed.window.svg b/tests/wpt/tests/svg/interact/scripted/composed.window.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/scripted/composed.window.svg rename to tests/wpt/tests/svg/interact/scripted/composed.window.svg diff --git a/tests/wpt/web-platform-tests/svg/interact/scripted/ellipse-hittest.html b/tests/wpt/tests/svg/interact/scripted/ellipse-hittest.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/scripted/ellipse-hittest.html rename to tests/wpt/tests/svg/interact/scripted/ellipse-hittest.html diff --git a/tests/wpt/web-platform-tests/svg/interact/scripted/focus-events.svg b/tests/wpt/tests/svg/interact/scripted/focus-events.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/scripted/focus-events.svg rename to tests/wpt/tests/svg/interact/scripted/focus-events.svg diff --git a/tests/wpt/web-platform-tests/svg/interact/scripted/focus-tabindex-default-value.svg b/tests/wpt/tests/svg/interact/scripted/focus-tabindex-default-value.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/scripted/focus-tabindex-default-value.svg rename to tests/wpt/tests/svg/interact/scripted/focus-tabindex-default-value.svg diff --git a/tests/wpt/web-platform-tests/svg/interact/scripted/rect-hittest-001.html b/tests/wpt/tests/svg/interact/scripted/rect-hittest-001.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/scripted/rect-hittest-001.html rename to tests/wpt/tests/svg/interact/scripted/rect-hittest-001.html diff --git a/tests/wpt/web-platform-tests/svg/interact/scripted/rect-hittest-002.html b/tests/wpt/tests/svg/interact/scripted/rect-hittest-002.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/scripted/rect-hittest-002.html rename to tests/wpt/tests/svg/interact/scripted/rect-hittest-002.html diff --git a/tests/wpt/web-platform-tests/svg/interact/scripted/resources/blank.htm b/tests/wpt/tests/svg/interact/scripted/resources/blank.htm similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/scripted/resources/blank.htm rename to tests/wpt/tests/svg/interact/scripted/resources/blank.htm diff --git a/tests/wpt/web-platform-tests/svg/interact/scripted/svg-pointer-events-bbox.html b/tests/wpt/tests/svg/interact/scripted/svg-pointer-events-bbox.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/scripted/svg-pointer-events-bbox.html rename to tests/wpt/tests/svg/interact/scripted/svg-pointer-events-bbox.html diff --git a/tests/wpt/web-platform-tests/svg/interact/scripted/svg-small-big-path.html b/tests/wpt/tests/svg/interact/scripted/svg-small-big-path.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/scripted/svg-small-big-path.html rename to tests/wpt/tests/svg/interact/scripted/svg-small-big-path.html diff --git a/tests/wpt/web-platform-tests/svg/interact/scripted/tabindex-focus-flag.svg b/tests/wpt/tests/svg/interact/scripted/tabindex-focus-flag.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/interact/scripted/tabindex-focus-flag.svg rename to tests/wpt/tests/svg/interact/scripted/tabindex-focus-flag.svg diff --git a/tests/wpt/web-platform-tests/svg/layout/svg-intrinsic-size-invalidation-ref.html b/tests/wpt/tests/svg/layout/svg-intrinsic-size-invalidation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/layout/svg-intrinsic-size-invalidation-ref.html rename to tests/wpt/tests/svg/layout/svg-intrinsic-size-invalidation-ref.html diff --git a/tests/wpt/web-platform-tests/svg/layout/svg-intrinsic-size-invalidation.html b/tests/wpt/tests/svg/layout/svg-intrinsic-size-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/layout/svg-intrinsic-size-invalidation.html rename to tests/wpt/tests/svg/layout/svg-intrinsic-size-invalidation.html diff --git a/tests/wpt/web-platform-tests/svg/layout/svg-use-symbol-width-print-ref.html b/tests/wpt/tests/svg/layout/svg-use-symbol-width-print-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/layout/svg-use-symbol-width-print-ref.html rename to tests/wpt/tests/svg/layout/svg-use-symbol-width-print-ref.html diff --git a/tests/wpt/web-platform-tests/svg/layout/svg-use-symbol-width-print.html b/tests/wpt/tests/svg/layout/svg-use-symbol-width-print.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/layout/svg-use-symbol-width-print.html rename to tests/wpt/tests/svg/layout/svg-use-symbol-width-print.html diff --git a/tests/wpt/web-platform-tests/svg/layout/svg-with-precent-dimensions-relayout-ref.html b/tests/wpt/tests/svg/layout/svg-with-precent-dimensions-relayout-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/layout/svg-with-precent-dimensions-relayout-ref.html rename to tests/wpt/tests/svg/layout/svg-with-precent-dimensions-relayout-ref.html diff --git a/tests/wpt/web-platform-tests/svg/layout/svg-with-precent-dimensions-relayout.html b/tests/wpt/tests/svg/layout/svg-with-precent-dimensions-relayout.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/layout/svg-with-precent-dimensions-relayout.html rename to tests/wpt/tests/svg/layout/svg-with-precent-dimensions-relayout.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-a-element-attr-change.html b/tests/wpt/tests/svg/linking/reftests/href-a-element-attr-change.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-a-element-attr-change.html rename to tests/wpt/tests/svg/linking/reftests/href-a-element-attr-change.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-a-element-ref.html b/tests/wpt/tests/svg/linking/reftests/href-a-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-a-element-ref.html rename to tests/wpt/tests/svg/linking/reftests/href-a-element-ref.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-feImage-element-ref.html b/tests/wpt/tests/svg/linking/reftests/href-feImage-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-feImage-element-ref.html rename to tests/wpt/tests/svg/linking/reftests/href-feImage-element-ref.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-feImage-element.html b/tests/wpt/tests/svg/linking/reftests/href-feImage-element.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-feImage-element.html rename to tests/wpt/tests/svg/linking/reftests/href-feImage-element.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-filter-element-ref.html b/tests/wpt/tests/svg/linking/reftests/href-filter-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-filter-element-ref.html rename to tests/wpt/tests/svg/linking/reftests/href-filter-element-ref.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-filter-element.html b/tests/wpt/tests/svg/linking/reftests/href-filter-element.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-filter-element.html rename to tests/wpt/tests/svg/linking/reftests/href-filter-element.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-gradient-element-ref.html b/tests/wpt/tests/svg/linking/reftests/href-gradient-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-gradient-element-ref.html rename to tests/wpt/tests/svg/linking/reftests/href-gradient-element-ref.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-gradient-element.html b/tests/wpt/tests/svg/linking/reftests/href-gradient-element.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-gradient-element.html rename to tests/wpt/tests/svg/linking/reftests/href-gradient-element.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-image-element-ref.html b/tests/wpt/tests/svg/linking/reftests/href-image-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-image-element-ref.html rename to tests/wpt/tests/svg/linking/reftests/href-image-element-ref.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-image-element.html b/tests/wpt/tests/svg/linking/reftests/href-image-element.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-image-element.html rename to tests/wpt/tests/svg/linking/reftests/href-image-element.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-pattern-element-ref.html b/tests/wpt/tests/svg/linking/reftests/href-pattern-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-pattern-element-ref.html rename to tests/wpt/tests/svg/linking/reftests/href-pattern-element-ref.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-pattern-element.html b/tests/wpt/tests/svg/linking/reftests/href-pattern-element.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-pattern-element.html rename to tests/wpt/tests/svg/linking/reftests/href-pattern-element.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-textPath-element-ref.html b/tests/wpt/tests/svg/linking/reftests/href-textPath-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-textPath-element-ref.html rename to tests/wpt/tests/svg/linking/reftests/href-textPath-element-ref.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-textPath-element.html b/tests/wpt/tests/svg/linking/reftests/href-textPath-element.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-textPath-element.html rename to tests/wpt/tests/svg/linking/reftests/href-textPath-element.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-use-element-ref.html b/tests/wpt/tests/svg/linking/reftests/href-use-element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-use-element-ref.html rename to tests/wpt/tests/svg/linking/reftests/href-use-element-ref.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/href-use-element.html b/tests/wpt/tests/svg/linking/reftests/href-use-element.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/href-use-element.html rename to tests/wpt/tests/svg/linking/reftests/href-use-element.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/reference/green-100x100.svg b/tests/wpt/tests/svg/linking/reftests/reference/green-100x100.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/reference/green-100x100.svg rename to tests/wpt/tests/svg/linking/reftests/reference/green-100x100.svg diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/url-processing-invalid-base.svg b/tests/wpt/tests/svg/linking/reftests/url-processing-invalid-base.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/url-processing-invalid-base.svg rename to tests/wpt/tests/svg/linking/reftests/url-processing-invalid-base.svg diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/url-processing-whitespace-001.svg b/tests/wpt/tests/svg/linking/reftests/url-processing-whitespace-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/url-processing-whitespace-001.svg rename to tests/wpt/tests/svg/linking/reftests/url-processing-whitespace-001.svg diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/url-processing-whitespace-002.svg b/tests/wpt/tests/svg/linking/reftests/url-processing-whitespace-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/url-processing-whitespace-002.svg rename to tests/wpt/tests/svg/linking/reftests/url-processing-whitespace-002.svg diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/url-processing-whitespace-003.svg b/tests/wpt/tests/svg/linking/reftests/url-processing-whitespace-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/url-processing-whitespace-003.svg rename to tests/wpt/tests/svg/linking/reftests/url-processing-whitespace-003.svg diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/url-reference-local-textpath.svg b/tests/wpt/tests/svg/linking/reftests/url-reference-local-textpath.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/url-reference-local-textpath.svg rename to tests/wpt/tests/svg/linking/reftests/url-reference-local-textpath.svg diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/use-descendant-combinator-001.html b/tests/wpt/tests/svg/linking/reftests/use-descendant-combinator-001.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/use-descendant-combinator-001.html rename to tests/wpt/tests/svg/linking/reftests/use-descendant-combinator-001.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/use-descendant-combinator-002.html b/tests/wpt/tests/svg/linking/reftests/use-descendant-combinator-002.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/use-descendant-combinator-002.html rename to tests/wpt/tests/svg/linking/reftests/use-descendant-combinator-002.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/use-descendant-combinator-003.html b/tests/wpt/tests/svg/linking/reftests/use-descendant-combinator-003.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/use-descendant-combinator-003.html rename to tests/wpt/tests/svg/linking/reftests/use-descendant-combinator-003.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/use-descendant-combinator-ref.html b/tests/wpt/tests/svg/linking/reftests/use-descendant-combinator-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/use-descendant-combinator-ref.html rename to tests/wpt/tests/svg/linking/reftests/use-descendant-combinator-ref.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/use-hidden-attr-change.html b/tests/wpt/tests/svg/linking/reftests/use-hidden-attr-change.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/use-hidden-attr-change.html rename to tests/wpt/tests/svg/linking/reftests/use-hidden-attr-change.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/use-keyframes-ref.html b/tests/wpt/tests/svg/linking/reftests/use-keyframes-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/use-keyframes-ref.html rename to tests/wpt/tests/svg/linking/reftests/use-keyframes-ref.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/use-keyframes.html b/tests/wpt/tests/svg/linking/reftests/use-keyframes.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/use-keyframes.html rename to tests/wpt/tests/svg/linking/reftests/use-keyframes.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/use-nested-symbol-001.html b/tests/wpt/tests/svg/linking/reftests/use-nested-symbol-001.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/use-nested-symbol-001.html rename to tests/wpt/tests/svg/linking/reftests/use-nested-symbol-001.html diff --git a/tests/wpt/web-platform-tests/svg/linking/reftests/use-symbol-rendered-001.html b/tests/wpt/tests/svg/linking/reftests/use-symbol-rendered-001.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/reftests/use-symbol-rendered-001.html rename to tests/wpt/tests/svg/linking/reftests/use-symbol-rendered-001.html diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/a-download-click.svg b/tests/wpt/tests/svg/linking/scripted/a-download-click.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/a-download-click.svg rename to tests/wpt/tests/svg/linking/scripted/a-download-click.svg diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/a.rel-getter-01.svg b/tests/wpt/tests/svg/linking/scripted/a.rel-getter-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/a.rel-getter-01.svg rename to tests/wpt/tests/svg/linking/scripted/a.rel-getter-01.svg diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/a.rel-setter-01.svg b/tests/wpt/tests/svg/linking/scripted/a.rel-setter-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/a.rel-setter-01.svg rename to tests/wpt/tests/svg/linking/scripted/a.rel-setter-01.svg diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/a.text-getter-01.svg b/tests/wpt/tests/svg/linking/scripted/a.text-getter-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/a.text-getter-01.svg rename to tests/wpt/tests/svg/linking/scripted/a.text-getter-01.svg diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/a.text-setter-01.svg b/tests/wpt/tests/svg/linking/scripted/a.text-setter-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/a.text-setter-01.svg rename to tests/wpt/tests/svg/linking/scripted/a.text-setter-01.svg diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/href-animate-element.html b/tests/wpt/tests/svg/linking/scripted/href-animate-element.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/href-animate-element.html rename to tests/wpt/tests/svg/linking/scripted/href-animate-element.html diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/href-mpath-element.html b/tests/wpt/tests/svg/linking/scripted/href-mpath-element.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/href-mpath-element.html rename to tests/wpt/tests/svg/linking/scripted/href-mpath-element.html diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/href-script-element-markup.html b/tests/wpt/tests/svg/linking/scripted/href-script-element-markup.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/href-script-element-markup.html rename to tests/wpt/tests/svg/linking/scripted/href-script-element-markup.html diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/href-script-element.html b/tests/wpt/tests/svg/linking/scripted/href-script-element.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/href-script-element.html rename to tests/wpt/tests/svg/linking/scripted/href-script-element.html diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/rellist-feature-detection.svg b/tests/wpt/tests/svg/linking/scripted/rellist-feature-detection.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/rellist-feature-detection.svg rename to tests/wpt/tests/svg/linking/scripted/rellist-feature-detection.svg diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/resources/a-download-click.svg b/tests/wpt/tests/svg/linking/scripted/resources/a-download-click.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/resources/a-download-click.svg rename to tests/wpt/tests/svg/linking/scripted/resources/a-download-click.svg diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/testScripts/dummyScript.js b/tests/wpt/tests/svg/linking/scripted/testScripts/dummyScript.js similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/testScripts/dummyScript.js rename to tests/wpt/tests/svg/linking/scripted/testScripts/dummyScript.js diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/testScripts/externalScript1.js b/tests/wpt/tests/svg/linking/scripted/testScripts/externalScript1.js similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/testScripts/externalScript1.js rename to tests/wpt/tests/svg/linking/scripted/testScripts/externalScript1.js diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/testScripts/externalScript2.js b/tests/wpt/tests/svg/linking/scripted/testScripts/externalScript2.js similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/testScripts/externalScript2.js rename to tests/wpt/tests/svg/linking/scripted/testScripts/externalScript2.js diff --git a/tests/wpt/web-platform-tests/svg/linking/scripted/testcommon.js b/tests/wpt/tests/svg/linking/scripted/testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/svg/linking/scripted/testcommon.js rename to tests/wpt/tests/svg/linking/scripted/testcommon.js diff --git a/tests/wpt/web-platform-tests/svg/painting/OWNERS b/tests/wpt/tests/svg/painting/OWNERS similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/OWNERS rename to tests/wpt/tests/svg/painting/OWNERS diff --git a/tests/wpt/web-platform-tests/svg/painting/color-interpolation-animation.html b/tests/wpt/tests/svg/painting/color-interpolation-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/color-interpolation-animation.html rename to tests/wpt/tests/svg/painting/color-interpolation-animation.html diff --git a/tests/wpt/web-platform-tests/svg/painting/color-mix-currentcolor-fill-stroke-repaint.html b/tests/wpt/tests/svg/painting/color-mix-currentcolor-fill-stroke-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/color-mix-currentcolor-fill-stroke-repaint.html rename to tests/wpt/tests/svg/painting/color-mix-currentcolor-fill-stroke-repaint.html diff --git a/tests/wpt/web-platform-tests/svg/painting/currentColor-override-pserver-fallback-ref.svg b/tests/wpt/tests/svg/painting/currentColor-override-pserver-fallback-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/currentColor-override-pserver-fallback-ref.svg rename to tests/wpt/tests/svg/painting/currentColor-override-pserver-fallback-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/currentColor-override-pserver-fallback.svg b/tests/wpt/tests/svg/painting/currentColor-override-pserver-fallback.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/currentColor-override-pserver-fallback.svg rename to tests/wpt/tests/svg/painting/currentColor-override-pserver-fallback.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/currentColor-override-pserver-fill-ref.svg b/tests/wpt/tests/svg/painting/currentColor-override-pserver-fill-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/currentColor-override-pserver-fill-ref.svg rename to tests/wpt/tests/svg/painting/currentColor-override-pserver-fill-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/currentColor-override-pserver-fill.svg b/tests/wpt/tests/svg/painting/currentColor-override-pserver-fill.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/currentColor-override-pserver-fill.svg rename to tests/wpt/tests/svg/painting/currentColor-override-pserver-fill.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/currentColor-override-pserver-stroke-ref.svg b/tests/wpt/tests/svg/painting/currentColor-override-pserver-stroke-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/currentColor-override-pserver-stroke-ref.svg rename to tests/wpt/tests/svg/painting/currentColor-override-pserver-stroke-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/currentColor-override-pserver-stroke.svg b/tests/wpt/tests/svg/painting/currentColor-override-pserver-stroke.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/currentColor-override-pserver-stroke.svg rename to tests/wpt/tests/svg/painting/currentColor-override-pserver-stroke.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/currentcolor-fill-stroke-repaint.html b/tests/wpt/tests/svg/painting/currentcolor-fill-stroke-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/currentcolor-fill-stroke-repaint.html rename to tests/wpt/tests/svg/painting/currentcolor-fill-stroke-repaint.html diff --git a/tests/wpt/web-platform-tests/svg/painting/fill-rule-no-interpolation.html b/tests/wpt/tests/svg/painting/fill-rule-no-interpolation.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/fill-rule-no-interpolation.html rename to tests/wpt/tests/svg/painting/fill-rule-no-interpolation.html diff --git a/tests/wpt/web-platform-tests/svg/painting/foreignObject-overflow-ref.html b/tests/wpt/tests/svg/painting/foreignObject-overflow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/foreignObject-overflow-ref.html rename to tests/wpt/tests/svg/painting/foreignObject-overflow-ref.html diff --git a/tests/wpt/web-platform-tests/svg/painting/foreignObject-overflow.html b/tests/wpt/tests/svg/painting/foreignObject-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/foreignObject-overflow.html rename to tests/wpt/tests/svg/painting/foreignObject-overflow.html diff --git a/tests/wpt/web-platform-tests/svg/painting/inheritance.svg b/tests/wpt/tests/svg/painting/inheritance.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/inheritance.svg rename to tests/wpt/tests/svg/painting/inheritance.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-001-ref.svg b/tests/wpt/tests/svg/painting/marker-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-001-ref.svg rename to tests/wpt/tests/svg/painting/marker-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-001.svg b/tests/wpt/tests/svg/painting/marker-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-001.svg rename to tests/wpt/tests/svg/painting/marker-001.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-002-ref.svg b/tests/wpt/tests/svg/painting/marker-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-002-ref.svg rename to tests/wpt/tests/svg/painting/marker-002-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-002.svg b/tests/wpt/tests/svg/painting/marker-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-002.svg rename to tests/wpt/tests/svg/painting/marker-002.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-003-ref.svg b/tests/wpt/tests/svg/painting/marker-003-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-003-ref.svg rename to tests/wpt/tests/svg/painting/marker-003-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-003.svg b/tests/wpt/tests/svg/painting/marker-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-003.svg rename to tests/wpt/tests/svg/painting/marker-003.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-004-ref.svg b/tests/wpt/tests/svg/painting/marker-004-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-004-ref.svg rename to tests/wpt/tests/svg/painting/marker-004-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-004.svg b/tests/wpt/tests/svg/painting/marker-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-004.svg rename to tests/wpt/tests/svg/painting/marker-004.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-005-ref.svg b/tests/wpt/tests/svg/painting/marker-005-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-005-ref.svg rename to tests/wpt/tests/svg/painting/marker-005-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-005.svg b/tests/wpt/tests/svg/painting/marker-005.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-005.svg rename to tests/wpt/tests/svg/painting/marker-005.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-006-ref.svg b/tests/wpt/tests/svg/painting/marker-006-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-006-ref.svg rename to tests/wpt/tests/svg/painting/marker-006-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-006.svg b/tests/wpt/tests/svg/painting/marker-006.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-006.svg rename to tests/wpt/tests/svg/painting/marker-006.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-007-ref.svg b/tests/wpt/tests/svg/painting/marker-007-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-007-ref.svg rename to tests/wpt/tests/svg/painting/marker-007-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-007.svg b/tests/wpt/tests/svg/painting/marker-007.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-007.svg rename to tests/wpt/tests/svg/painting/marker-007.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-008-ref.svg b/tests/wpt/tests/svg/painting/marker-008-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-008-ref.svg rename to tests/wpt/tests/svg/painting/marker-008-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-008.svg b/tests/wpt/tests/svg/painting/marker-008.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-008.svg rename to tests/wpt/tests/svg/painting/marker-008.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-009-ref.svg b/tests/wpt/tests/svg/painting/marker-009-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-009-ref.svg rename to tests/wpt/tests/svg/painting/marker-009-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-009.svg b/tests/wpt/tests/svg/painting/marker-009.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-009.svg rename to tests/wpt/tests/svg/painting/marker-009.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-orient-001-ref.svg b/tests/wpt/tests/svg/painting/marker-orient-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-orient-001-ref.svg rename to tests/wpt/tests/svg/painting/marker-orient-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-orient-001.svg b/tests/wpt/tests/svg/painting/marker-orient-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-orient-001.svg rename to tests/wpt/tests/svg/painting/marker-orient-001.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/marker-with-mask-cycle-crash.html b/tests/wpt/tests/svg/painting/marker-with-mask-cycle-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/marker-with-mask-cycle-crash.html rename to tests/wpt/tests/svg/painting/marker-with-mask-cycle-crash.html diff --git a/tests/wpt/web-platform-tests/svg/painting/mask-containing-image-with-clip-path.svg b/tests/wpt/tests/svg/painting/mask-containing-image-with-clip-path.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/mask-containing-image-with-clip-path.svg rename to tests/wpt/tests/svg/painting/mask-containing-image-with-clip-path.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/color-interpolation-computed.svg b/tests/wpt/tests/svg/painting/parsing/color-interpolation-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/color-interpolation-computed.svg rename to tests/wpt/tests/svg/painting/parsing/color-interpolation-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/color-interpolation-invalid.svg b/tests/wpt/tests/svg/painting/parsing/color-interpolation-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/color-interpolation-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/color-interpolation-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/color-interpolation-valid.svg b/tests/wpt/tests/svg/painting/parsing/color-interpolation-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/color-interpolation-valid.svg rename to tests/wpt/tests/svg/painting/parsing/color-interpolation-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/fill-computed.svg b/tests/wpt/tests/svg/painting/parsing/fill-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/fill-computed.svg rename to tests/wpt/tests/svg/painting/parsing/fill-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/fill-invalid.svg b/tests/wpt/tests/svg/painting/parsing/fill-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/fill-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/fill-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/fill-opacity-computed.svg b/tests/wpt/tests/svg/painting/parsing/fill-opacity-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/fill-opacity-computed.svg rename to tests/wpt/tests/svg/painting/parsing/fill-opacity-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/fill-opacity-invalid.svg b/tests/wpt/tests/svg/painting/parsing/fill-opacity-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/fill-opacity-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/fill-opacity-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/fill-opacity-valid.svg b/tests/wpt/tests/svg/painting/parsing/fill-opacity-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/fill-opacity-valid.svg rename to tests/wpt/tests/svg/painting/parsing/fill-opacity-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/fill-rule-computed.svg b/tests/wpt/tests/svg/painting/parsing/fill-rule-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/fill-rule-computed.svg rename to tests/wpt/tests/svg/painting/parsing/fill-rule-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/fill-rule-invalid.svg b/tests/wpt/tests/svg/painting/parsing/fill-rule-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/fill-rule-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/fill-rule-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/fill-rule-valid.svg b/tests/wpt/tests/svg/painting/parsing/fill-rule-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/fill-rule-valid.svg rename to tests/wpt/tests/svg/painting/parsing/fill-rule-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/fill-valid.svg b/tests/wpt/tests/svg/painting/parsing/fill-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/fill-valid.svg rename to tests/wpt/tests/svg/painting/parsing/fill-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/image-rendering-computed.svg b/tests/wpt/tests/svg/painting/parsing/image-rendering-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/image-rendering-computed.svg rename to tests/wpt/tests/svg/painting/parsing/image-rendering-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/image-rendering-invalid.svg b/tests/wpt/tests/svg/painting/parsing/image-rendering-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/image-rendering-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/image-rendering-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/image-rendering-valid.svg b/tests/wpt/tests/svg/painting/parsing/image-rendering-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/image-rendering-valid.svg rename to tests/wpt/tests/svg/painting/parsing/image-rendering-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/marker-computed.svg b/tests/wpt/tests/svg/painting/parsing/marker-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/marker-computed.svg rename to tests/wpt/tests/svg/painting/parsing/marker-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/marker-end-computed.svg b/tests/wpt/tests/svg/painting/parsing/marker-end-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/marker-end-computed.svg rename to tests/wpt/tests/svg/painting/parsing/marker-end-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/marker-end-invalid.svg b/tests/wpt/tests/svg/painting/parsing/marker-end-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/marker-end-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/marker-end-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/marker-end-valid.svg b/tests/wpt/tests/svg/painting/parsing/marker-end-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/marker-end-valid.svg rename to tests/wpt/tests/svg/painting/parsing/marker-end-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/marker-invalid.svg b/tests/wpt/tests/svg/painting/parsing/marker-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/marker-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/marker-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/marker-mid-computed.svg b/tests/wpt/tests/svg/painting/parsing/marker-mid-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/marker-mid-computed.svg rename to tests/wpt/tests/svg/painting/parsing/marker-mid-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/marker-mid-invalid.svg b/tests/wpt/tests/svg/painting/parsing/marker-mid-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/marker-mid-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/marker-mid-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/marker-mid-valid.svg b/tests/wpt/tests/svg/painting/parsing/marker-mid-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/marker-mid-valid.svg rename to tests/wpt/tests/svg/painting/parsing/marker-mid-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/marker-shorthand.svg b/tests/wpt/tests/svg/painting/parsing/marker-shorthand.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/marker-shorthand.svg rename to tests/wpt/tests/svg/painting/parsing/marker-shorthand.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/marker-start-computed.svg b/tests/wpt/tests/svg/painting/parsing/marker-start-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/marker-start-computed.svg rename to tests/wpt/tests/svg/painting/parsing/marker-start-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/marker-start-invalid.svg b/tests/wpt/tests/svg/painting/parsing/marker-start-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/marker-start-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/marker-start-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/marker-start-valid.svg b/tests/wpt/tests/svg/painting/parsing/marker-start-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/marker-start-valid.svg rename to tests/wpt/tests/svg/painting/parsing/marker-start-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/marker-valid.svg b/tests/wpt/tests/svg/painting/parsing/marker-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/marker-valid.svg rename to tests/wpt/tests/svg/painting/parsing/marker-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/paint-order-computed.svg b/tests/wpt/tests/svg/painting/parsing/paint-order-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/paint-order-computed.svg rename to tests/wpt/tests/svg/painting/parsing/paint-order-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/paint-order-invalid.svg b/tests/wpt/tests/svg/painting/parsing/paint-order-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/paint-order-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/paint-order-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/paint-order-valid.svg b/tests/wpt/tests/svg/painting/parsing/paint-order-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/paint-order-valid.svg rename to tests/wpt/tests/svg/painting/parsing/paint-order-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/shape-rendering-computed.svg b/tests/wpt/tests/svg/painting/parsing/shape-rendering-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/shape-rendering-computed.svg rename to tests/wpt/tests/svg/painting/parsing/shape-rendering-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/shape-rendering-invalid.svg b/tests/wpt/tests/svg/painting/parsing/shape-rendering-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/shape-rendering-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/shape-rendering-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/shape-rendering-valid.svg b/tests/wpt/tests/svg/painting/parsing/shape-rendering-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/shape-rendering-valid.svg rename to tests/wpt/tests/svg/painting/parsing/shape-rendering-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-computed.svg b/tests/wpt/tests/svg/painting/parsing/stroke-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-computed.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-dasharray-computed.svg b/tests/wpt/tests/svg/painting/parsing/stroke-dasharray-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-dasharray-computed.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-dasharray-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-dasharray-invalid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-dasharray-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-dasharray-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-dasharray-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-dasharray-valid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-dasharray-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-dasharray-valid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-dasharray-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-dashoffset-computed.svg b/tests/wpt/tests/svg/painting/parsing/stroke-dashoffset-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-dashoffset-computed.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-dashoffset-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-dashoffset-invalid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-dashoffset-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-dashoffset-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-dashoffset-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-dashoffset-valid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-dashoffset-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-dashoffset-valid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-dashoffset-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-invalid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-linecap-computed.svg b/tests/wpt/tests/svg/painting/parsing/stroke-linecap-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-linecap-computed.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-linecap-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-linecap-invalid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-linecap-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-linecap-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-linecap-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-linecap-valid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-linecap-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-linecap-valid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-linecap-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-linejoin-computed.svg b/tests/wpt/tests/svg/painting/parsing/stroke-linejoin-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-linejoin-computed.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-linejoin-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-linejoin-invalid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-linejoin-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-linejoin-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-linejoin-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-linejoin-valid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-linejoin-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-linejoin-valid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-linejoin-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-miterlimit-computed.svg b/tests/wpt/tests/svg/painting/parsing/stroke-miterlimit-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-miterlimit-computed.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-miterlimit-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-miterlimit-invalid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-miterlimit-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-miterlimit-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-miterlimit-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-miterlimit-valid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-miterlimit-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-miterlimit-valid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-miterlimit-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-opacity-computed.svg b/tests/wpt/tests/svg/painting/parsing/stroke-opacity-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-opacity-computed.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-opacity-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-opacity-invalid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-opacity-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-opacity-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-opacity-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-opacity-valid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-opacity-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-opacity-valid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-opacity-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-valid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-valid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-width-computed.svg b/tests/wpt/tests/svg/painting/parsing/stroke-width-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-width-computed.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-width-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-width-invalid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-width-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-width-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-width-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/stroke-width-valid.svg b/tests/wpt/tests/svg/painting/parsing/stroke-width-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/stroke-width-valid.svg rename to tests/wpt/tests/svg/painting/parsing/stroke-width-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/text-rendering-computed.svg b/tests/wpt/tests/svg/painting/parsing/text-rendering-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/text-rendering-computed.svg rename to tests/wpt/tests/svg/painting/parsing/text-rendering-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/text-rendering-invalid.svg b/tests/wpt/tests/svg/painting/parsing/text-rendering-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/text-rendering-invalid.svg rename to tests/wpt/tests/svg/painting/parsing/text-rendering-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/parsing/text-rendering-valid.svg b/tests/wpt/tests/svg/painting/parsing/text-rendering-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/parsing/text-rendering-valid.svg rename to tests/wpt/tests/svg/painting/parsing/text-rendering-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/display-none-mask-ref.html b/tests/wpt/tests/svg/painting/reftests/display-none-mask-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/display-none-mask-ref.html rename to tests/wpt/tests/svg/painting/reftests/display-none-mask-ref.html diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/display-none-mask.html b/tests/wpt/tests/svg/painting/reftests/display-none-mask.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/display-none-mask.html rename to tests/wpt/tests/svg/painting/reftests/display-none-mask.html diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/fallback-001.svg b/tests/wpt/tests/svg/painting/reftests/fallback-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/fallback-001.svg rename to tests/wpt/tests/svg/painting/reftests/fallback-001.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/fallback-002.svg b/tests/wpt/tests/svg/painting/reftests/fallback-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/fallback-002.svg rename to tests/wpt/tests/svg/painting/reftests/fallback-002.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-001-ref.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-001-ref.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-001.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-001.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-001.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-002-ref.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-002-ref.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-002-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-002.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-002.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-002.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-003-ref.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-003-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-003-ref.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-003-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-003.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-003.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-003.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-011-ref.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-011-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-011-ref.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-011-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-011.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-011.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-011.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-011.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-012-ref.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-012-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-012-ref.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-012-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-012.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-012.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-012.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-012.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-013-ref.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-013-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-013-ref.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-013-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-013.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-013.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-013.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-013.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-021-ref.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-021-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-021-ref.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-021-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-021.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-021.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-021.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-021.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-022-ref.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-022-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-022-ref.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-022-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-022.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-022.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-022.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-022.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-023-ref.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-023-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-023-ref.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-023-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-023.svg b/tests/wpt/tests/svg/painting/reftests/marker-path-023.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-path-023.svg rename to tests/wpt/tests/svg/painting/reftests/marker-path-023.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-units-strokewidth-non-scaling-stroke.svg b/tests/wpt/tests/svg/painting/reftests/marker-units-strokewidth-non-scaling-stroke.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-units-strokewidth-non-scaling-stroke.svg rename to tests/wpt/tests/svg/painting/reftests/marker-units-strokewidth-non-scaling-stroke.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/marker-units-userspaceonuse-non-scaling-stroke.svg b/tests/wpt/tests/svg/painting/reftests/marker-units-userspaceonuse-non-scaling-stroke.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/marker-units-userspaceonuse-non-scaling-stroke.svg rename to tests/wpt/tests/svg/painting/reftests/marker-units-userspaceonuse-non-scaling-stroke.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/markers-orient-001-ref.svg b/tests/wpt/tests/svg/painting/reftests/markers-orient-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/markers-orient-001-ref.svg rename to tests/wpt/tests/svg/painting/reftests/markers-orient-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/markers-orient-001.svg b/tests/wpt/tests/svg/painting/reftests/markers-orient-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/markers-orient-001.svg rename to tests/wpt/tests/svg/painting/reftests/markers-orient-001.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/markers-orient-002.svg b/tests/wpt/tests/svg/painting/reftests/markers-orient-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/markers-orient-002.svg rename to tests/wpt/tests/svg/painting/reftests/markers-orient-002.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/mask-print-ref.svg b/tests/wpt/tests/svg/painting/reftests/mask-print-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/mask-print-ref.svg rename to tests/wpt/tests/svg/painting/reftests/mask-print-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/mask-print.svg b/tests/wpt/tests/svg/painting/reftests/mask-print.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/mask-print.svg rename to tests/wpt/tests/svg/painting/reftests/mask-print.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/paint-context-001-ref.svg b/tests/wpt/tests/svg/painting/reftests/paint-context-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/paint-context-001-ref.svg rename to tests/wpt/tests/svg/painting/reftests/paint-context-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/paint-context-001.svg b/tests/wpt/tests/svg/painting/reftests/paint-context-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/paint-context-001.svg rename to tests/wpt/tests/svg/painting/reftests/paint-context-001.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/paint-context-002-ref.svg b/tests/wpt/tests/svg/painting/reftests/paint-context-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/paint-context-002-ref.svg rename to tests/wpt/tests/svg/painting/reftests/paint-context-002-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/paint-context-002.svg b/tests/wpt/tests/svg/painting/reftests/paint-context-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/paint-context-002.svg rename to tests/wpt/tests/svg/painting/reftests/paint-context-002.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/paint-order-001-ref.svg b/tests/wpt/tests/svg/painting/reftests/paint-order-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/paint-order-001-ref.svg rename to tests/wpt/tests/svg/painting/reftests/paint-order-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/paint-order-001.svg b/tests/wpt/tests/svg/painting/reftests/paint-order-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/paint-order-001.svg rename to tests/wpt/tests/svg/painting/reftests/paint-order-001.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/percentage-attribute.svg b/tests/wpt/tests/svg/painting/reftests/percentage-attribute.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/percentage-attribute.svg rename to tests/wpt/tests/svg/painting/reftests/percentage-attribute.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/percentage-ref.svg b/tests/wpt/tests/svg/painting/reftests/percentage-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/percentage-ref.svg rename to tests/wpt/tests/svg/painting/reftests/percentage-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/percentage.svg b/tests/wpt/tests/svg/painting/reftests/percentage.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/reftests/percentage.svg rename to tests/wpt/tests/svg/painting/reftests/percentage.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/scripted/paint-order-computed-value-01.svg b/tests/wpt/tests/svg/painting/scripted/paint-order-computed-value-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/scripted/paint-order-computed-value-01.svg rename to tests/wpt/tests/svg/painting/scripted/paint-order-computed-value-01.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/subpixel-clip-path-transform-ref.html b/tests/wpt/tests/svg/painting/subpixel-clip-path-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/subpixel-clip-path-transform-ref.html rename to tests/wpt/tests/svg/painting/subpixel-clip-path-transform-ref.html diff --git a/tests/wpt/web-platform-tests/svg/painting/subpixel-clip-path-transform.html b/tests/wpt/tests/svg/painting/subpixel-clip-path-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/subpixel-clip-path-transform.html rename to tests/wpt/tests/svg/painting/subpixel-clip-path-transform.html diff --git a/tests/wpt/web-platform-tests/svg/painting/support/white-rect-100x100.svg b/tests/wpt/tests/svg/painting/support/white-rect-100x100.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/support/white-rect-100x100.svg rename to tests/wpt/tests/svg/painting/support/white-rect-100x100.svg diff --git a/tests/wpt/web-platform-tests/svg/painting/svg-child-will-change-transform-invalidation-ref.html b/tests/wpt/tests/svg/painting/svg-child-will-change-transform-invalidation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/svg-child-will-change-transform-invalidation-ref.html rename to tests/wpt/tests/svg/painting/svg-child-will-change-transform-invalidation-ref.html diff --git a/tests/wpt/web-platform-tests/svg/painting/svg-child-will-change-transform-invalidation.html b/tests/wpt/tests/svg/painting/svg-child-will-change-transform-invalidation.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/svg-child-will-change-transform-invalidation.html rename to tests/wpt/tests/svg/painting/svg-child-will-change-transform-invalidation.html diff --git a/tests/wpt/web-platform-tests/svg/painting/svg-with-outline-ref.html b/tests/wpt/tests/svg/painting/svg-with-outline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/svg-with-outline-ref.html rename to tests/wpt/tests/svg/painting/svg-with-outline-ref.html diff --git a/tests/wpt/web-platform-tests/svg/painting/svg-with-outline.html b/tests/wpt/tests/svg/painting/svg-with-outline.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/svg-with-outline.html rename to tests/wpt/tests/svg/painting/svg-with-outline.html diff --git a/tests/wpt/web-platform-tests/svg/painting/text-clip-path-transform-ref.html b/tests/wpt/tests/svg/painting/text-clip-path-transform-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/text-clip-path-transform-ref.html rename to tests/wpt/tests/svg/painting/text-clip-path-transform-ref.html diff --git a/tests/wpt/web-platform-tests/svg/painting/text-clip-path-transform.html b/tests/wpt/tests/svg/painting/text-clip-path-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/text-clip-path-transform.html rename to tests/wpt/tests/svg/painting/text-clip-path-transform.html diff --git a/tests/wpt/web-platform-tests/svg/painting/text-mask-transform.html b/tests/wpt/tests/svg/painting/text-mask-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/text-mask-transform.html rename to tests/wpt/tests/svg/painting/text-mask-transform.html diff --git a/tests/wpt/web-platform-tests/svg/painting/will-change-under-mask.html b/tests/wpt/tests/svg/painting/will-change-under-mask.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/painting/will-change-under-mask.html rename to tests/wpt/tests/svg/painting/will-change-under-mask.html diff --git a/tests/wpt/web-platform-tests/svg/path/bearing/absolute-ref.svg b/tests/wpt/tests/svg/path/bearing/absolute-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/bearing/absolute-ref.svg rename to tests/wpt/tests/svg/path/bearing/absolute-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/bearing/absolute.svg b/tests/wpt/tests/svg/path/bearing/absolute.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/bearing/absolute.svg rename to tests/wpt/tests/svg/path/bearing/absolute.svg diff --git a/tests/wpt/web-platform-tests/svg/path/bearing/relative-ref.svg b/tests/wpt/tests/svg/path/bearing/relative-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/bearing/relative-ref.svg rename to tests/wpt/tests/svg/path/bearing/relative-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/bearing/relative.svg b/tests/wpt/tests/svg/path/bearing/relative.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/bearing/relative.svg rename to tests/wpt/tests/svg/path/bearing/relative.svg diff --git a/tests/wpt/web-platform-tests/svg/path/bearing/zero-ref.svg b/tests/wpt/tests/svg/path/bearing/zero-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/bearing/zero-ref.svg rename to tests/wpt/tests/svg/path/bearing/zero-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/bearing/zero.svg b/tests/wpt/tests/svg/path/bearing/zero.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/bearing/zero.svg rename to tests/wpt/tests/svg/path/bearing/zero.svg diff --git a/tests/wpt/web-platform-tests/svg/path/closepath/segment-completing-ref.svg b/tests/wpt/tests/svg/path/closepath/segment-completing-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/closepath/segment-completing-ref.svg rename to tests/wpt/tests/svg/path/closepath/segment-completing-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/closepath/segment-completing.svg b/tests/wpt/tests/svg/path/closepath/segment-completing.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/closepath/segment-completing.svg rename to tests/wpt/tests/svg/path/closepath/segment-completing.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/pathLength-positive-percentage.svg b/tests/wpt/tests/svg/path/distance/pathLength-positive-percentage.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/pathLength-positive-percentage.svg rename to tests/wpt/tests/svg/path/distance/pathLength-positive-percentage.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/pathLength-positive-ref.svg b/tests/wpt/tests/svg/path/distance/pathLength-positive-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/pathLength-positive-ref.svg rename to tests/wpt/tests/svg/path/distance/pathLength-positive-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/pathLength-positive.svg b/tests/wpt/tests/svg/path/distance/pathLength-positive.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/pathLength-positive.svg rename to tests/wpt/tests/svg/path/distance/pathLength-positive.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/pathLength-zero-percentage-ref.svg b/tests/wpt/tests/svg/path/distance/pathLength-zero-percentage-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/pathLength-zero-percentage-ref.svg rename to tests/wpt/tests/svg/path/distance/pathLength-zero-percentage-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/pathLength-zero-percentage.svg b/tests/wpt/tests/svg/path/distance/pathLength-zero-percentage.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/pathLength-zero-percentage.svg rename to tests/wpt/tests/svg/path/distance/pathLength-zero-percentage.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/pathLength-zero-ref.svg b/tests/wpt/tests/svg/path/distance/pathLength-zero-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/pathLength-zero-ref.svg rename to tests/wpt/tests/svg/path/distance/pathLength-zero-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/pathLength-zero.svg b/tests/wpt/tests/svg/path/distance/pathLength-zero.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/pathLength-zero.svg rename to tests/wpt/tests/svg/path/distance/pathLength-zero.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/pathlength-circle-mutating.svg b/tests/wpt/tests/svg/path/distance/pathlength-circle-mutating.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/pathlength-circle-mutating.svg rename to tests/wpt/tests/svg/path/distance/pathlength-circle-mutating.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/pathlength-path-mutating.svg b/tests/wpt/tests/svg/path/distance/pathlength-path-mutating.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/pathlength-path-mutating.svg rename to tests/wpt/tests/svg/path/distance/pathlength-path-mutating.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/pathlength-path-negative.svg b/tests/wpt/tests/svg/path/distance/pathlength-path-negative.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/pathlength-path-negative.svg rename to tests/wpt/tests/svg/path/distance/pathlength-path-negative.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/pathlength-path-zero.svg b/tests/wpt/tests/svg/path/distance/pathlength-path-zero.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/pathlength-path-zero.svg rename to tests/wpt/tests/svg/path/distance/pathlength-path-zero.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/pathlength-path.svg b/tests/wpt/tests/svg/path/distance/pathlength-path.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/pathlength-path.svg rename to tests/wpt/tests/svg/path/distance/pathlength-path.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/pathlength-rect-mutating.svg b/tests/wpt/tests/svg/path/distance/pathlength-rect-mutating.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/pathlength-rect-mutating.svg rename to tests/wpt/tests/svg/path/distance/pathlength-rect-mutating.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/pathlength-rect.svg b/tests/wpt/tests/svg/path/distance/pathlength-rect.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/pathlength-rect.svg rename to tests/wpt/tests/svg/path/distance/pathlength-rect.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/reference/pathlength-path-mutating-ref.svg b/tests/wpt/tests/svg/path/distance/reference/pathlength-path-mutating-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/reference/pathlength-path-mutating-ref.svg rename to tests/wpt/tests/svg/path/distance/reference/pathlength-path-mutating-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/reference/pathlength-path-negative-ref.svg b/tests/wpt/tests/svg/path/distance/reference/pathlength-path-negative-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/reference/pathlength-path-negative-ref.svg rename to tests/wpt/tests/svg/path/distance/reference/pathlength-path-negative-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/reference/pathlength-path-ref.svg b/tests/wpt/tests/svg/path/distance/reference/pathlength-path-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/reference/pathlength-path-ref.svg rename to tests/wpt/tests/svg/path/distance/reference/pathlength-path-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/reference/pathlength-path-zero-ref.svg b/tests/wpt/tests/svg/path/distance/reference/pathlength-path-zero-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/reference/pathlength-path-zero-ref.svg rename to tests/wpt/tests/svg/path/distance/reference/pathlength-path-zero-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/reference/pathlength-rect-mutating-ref.svg b/tests/wpt/tests/svg/path/distance/reference/pathlength-rect-mutating-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/reference/pathlength-rect-mutating-ref.svg rename to tests/wpt/tests/svg/path/distance/reference/pathlength-rect-mutating-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/distance/reference/pathlength-rect-ref.svg b/tests/wpt/tests/svg/path/distance/reference/pathlength-rect-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/distance/reference/pathlength-rect-ref.svg rename to tests/wpt/tests/svg/path/distance/reference/pathlength-rect-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/error-handling/bounding.svg b/tests/wpt/tests/svg/path/error-handling/bounding.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/error-handling/bounding.svg rename to tests/wpt/tests/svg/path/error-handling/bounding.svg diff --git a/tests/wpt/web-platform-tests/svg/path/error-handling/render-until-error-ref.svg b/tests/wpt/tests/svg/path/error-handling/render-until-error-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/error-handling/render-until-error-ref.svg rename to tests/wpt/tests/svg/path/error-handling/render-until-error-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/error-handling/render-until-error.svg b/tests/wpt/tests/svg/path/error-handling/render-until-error.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/error-handling/render-until-error.svg rename to tests/wpt/tests/svg/path/error-handling/render-until-error.svg diff --git a/tests/wpt/web-platform-tests/svg/path/interfaces/SVGAnimatedPathData-removed.svg b/tests/wpt/tests/svg/path/interfaces/SVGAnimatedPathData-removed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/interfaces/SVGAnimatedPathData-removed.svg rename to tests/wpt/tests/svg/path/interfaces/SVGAnimatedPathData-removed.svg diff --git a/tests/wpt/web-platform-tests/svg/path/property/d-interpolation-discrete.svg b/tests/wpt/tests/svg/path/property/d-interpolation-discrete.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/property/d-interpolation-discrete.svg rename to tests/wpt/tests/svg/path/property/d-interpolation-discrete.svg diff --git a/tests/wpt/web-platform-tests/svg/path/property/d-interpolation-relative-absolute.svg b/tests/wpt/tests/svg/path/property/d-interpolation-relative-absolute.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/property/d-interpolation-relative-absolute.svg rename to tests/wpt/tests/svg/path/property/d-interpolation-relative-absolute.svg diff --git a/tests/wpt/web-platform-tests/svg/path/property/d-interpolation-single.svg b/tests/wpt/tests/svg/path/property/d-interpolation-single.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/property/d-interpolation-single.svg rename to tests/wpt/tests/svg/path/property/d-interpolation-single.svg diff --git a/tests/wpt/web-platform-tests/svg/path/property/getComputedStyle.svg b/tests/wpt/tests/svg/path/property/getComputedStyle.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/property/getComputedStyle.svg rename to tests/wpt/tests/svg/path/property/getComputedStyle.svg diff --git a/tests/wpt/web-platform-tests/svg/path/property/marker-path-ref.svg b/tests/wpt/tests/svg/path/property/marker-path-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/property/marker-path-ref.svg rename to tests/wpt/tests/svg/path/property/marker-path-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/property/marker-path.svg b/tests/wpt/tests/svg/path/property/marker-path.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/property/marker-path.svg rename to tests/wpt/tests/svg/path/property/marker-path.svg diff --git a/tests/wpt/web-platform-tests/svg/path/property/mpath-ref.svg b/tests/wpt/tests/svg/path/property/mpath-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/property/mpath-ref.svg rename to tests/wpt/tests/svg/path/property/mpath-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/property/mpath.svg b/tests/wpt/tests/svg/path/property/mpath.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/property/mpath.svg rename to tests/wpt/tests/svg/path/property/mpath.svg diff --git a/tests/wpt/web-platform-tests/svg/path/property/priority-ref.svg b/tests/wpt/tests/svg/path/property/priority-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/property/priority-ref.svg rename to tests/wpt/tests/svg/path/property/priority-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/path/property/priority.svg b/tests/wpt/tests/svg/path/property/priority.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/property/priority.svg rename to tests/wpt/tests/svg/path/property/priority.svg diff --git a/tests/wpt/web-platform-tests/svg/path/property/resources/interpolation-test-common.js b/tests/wpt/tests/svg/path/property/resources/interpolation-test-common.js similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/property/resources/interpolation-test-common.js rename to tests/wpt/tests/svg/path/property/resources/interpolation-test-common.js diff --git a/tests/wpt/web-platform-tests/svg/path/property/serialization.svg b/tests/wpt/tests/svg/path/property/serialization.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/property/serialization.svg rename to tests/wpt/tests/svg/path/property/serialization.svg diff --git a/tests/wpt/web-platform-tests/svg/path/property/test_style_flush_on_dom_api_with_d_property.html b/tests/wpt/tests/svg/path/property/test_style_flush_on_dom_api_with_d_property.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/path/property/test_style_flush_on_dom_api_with_d_property.html rename to tests/wpt/tests/svg/path/property/test_style_flush_on_dom_api_with_d_property.html diff --git a/tests/wpt/web-platform-tests/svg/print/svg-use-page-break-crash-print.html b/tests/wpt/tests/svg/print/svg-use-page-break-crash-print.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/print/svg-use-page-break-crash-print.html rename to tests/wpt/tests/svg/print/svg-use-page-break-crash-print.html diff --git a/tests/wpt/web-platform-tests/svg/pservers/inheritance.svg b/tests/wpt/tests/svg/pservers/inheritance.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/inheritance.svg rename to tests/wpt/tests/svg/pservers/inheritance.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/parsing/stop-color-computed.svg b/tests/wpt/tests/svg/pservers/parsing/stop-color-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/parsing/stop-color-computed.svg rename to tests/wpt/tests/svg/pservers/parsing/stop-color-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/parsing/stop-color-invalid.svg b/tests/wpt/tests/svg/pservers/parsing/stop-color-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/parsing/stop-color-invalid.svg rename to tests/wpt/tests/svg/pservers/parsing/stop-color-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/parsing/stop-color-valid.svg b/tests/wpt/tests/svg/pservers/parsing/stop-color-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/parsing/stop-color-valid.svg rename to tests/wpt/tests/svg/pservers/parsing/stop-color-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/parsing/stop-opacity-computed.svg b/tests/wpt/tests/svg/pservers/parsing/stop-opacity-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/parsing/stop-opacity-computed.svg rename to tests/wpt/tests/svg/pservers/parsing/stop-opacity-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/parsing/stop-opacity-invalid.svg b/tests/wpt/tests/svg/pservers/parsing/stop-opacity-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/parsing/stop-opacity-invalid.svg rename to tests/wpt/tests/svg/pservers/parsing/stop-opacity-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/parsing/stop-opacity-valid.svg b/tests/wpt/tests/svg/pservers/parsing/stop-opacity-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/parsing/stop-opacity-valid.svg rename to tests/wpt/tests/svg/pservers/parsing/stop-opacity-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/pattern-with-invalid-base-cloned-thcrash.html b/tests/wpt/tests/svg/pservers/pattern-with-invalid-base-cloned-thcrash.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/pattern-with-invalid-base-cloned-thcrash.html rename to tests/wpt/tests/svg/pservers/pattern-with-invalid-base-cloned-thcrash.html diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/gradient-inheritance-not-in-rendertree-01.tentative.svg b/tests/wpt/tests/svg/pservers/reftests/gradient-inheritance-not-in-rendertree-01.tentative.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/gradient-inheritance-not-in-rendertree-01.tentative.svg rename to tests/wpt/tests/svg/pservers/reftests/gradient-inheritance-not-in-rendertree-01.tentative.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/gradient-inheritance-not-in-rendertree-02.tentative.svg b/tests/wpt/tests/svg/pservers/reftests/gradient-inheritance-not-in-rendertree-02.tentative.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/gradient-inheritance-not-in-rendertree-02.tentative.svg rename to tests/wpt/tests/svg/pservers/reftests/gradient-inheritance-not-in-rendertree-02.tentative.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-001-ref.png b/tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-001-ref.png similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-001-ref.png rename to tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-001-ref.png diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-001.svg b/tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-001.svg rename to tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-001.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-002-ref.png b/tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-002-ref.png similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-002-ref.png rename to tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-002-ref.png diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-002.svg b/tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-002.svg rename to tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-002.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-003-ref.png b/tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-003-ref.png similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-003-ref.png rename to tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-003-ref.png diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-003.svg b/tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-003.svg rename to tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-003.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-004-ref.png b/tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-004-ref.png similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-004-ref.png rename to tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-004-ref.png diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-004.svg b/tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-004.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-004.svg rename to tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-004.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-005-ref.png b/tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-005-ref.png similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-005-ref.png rename to tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-005-ref.png diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-005.svg b/tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-005.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-basic-005.svg rename to tests/wpt/tests/svg/pservers/reftests/meshgradient-basic-005.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-bicubic-001-ref.png b/tests/wpt/tests/svg/pservers/reftests/meshgradient-bicubic-001-ref.png similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-bicubic-001-ref.png rename to tests/wpt/tests/svg/pservers/reftests/meshgradient-bicubic-001-ref.png diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-bicubic-001.svg b/tests/wpt/tests/svg/pservers/reftests/meshgradient-bicubic-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-bicubic-001.svg rename to tests/wpt/tests/svg/pservers/reftests/meshgradient-bicubic-001.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-complex-001-ref.png b/tests/wpt/tests/svg/pservers/reftests/meshgradient-complex-001-ref.png similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-complex-001-ref.png rename to tests/wpt/tests/svg/pservers/reftests/meshgradient-complex-001-ref.png diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-complex-001.svg b/tests/wpt/tests/svg/pservers/reftests/meshgradient-complex-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/meshgradient-complex-001.svg rename to tests/wpt/tests/svg/pservers/reftests/meshgradient-complex-001.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-inheritance-not-in-rendertree-01.tentative.svg b/tests/wpt/tests/svg/pservers/reftests/pattern-inheritance-not-in-rendertree-01.tentative.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-inheritance-not-in-rendertree-01.tentative.svg rename to tests/wpt/tests/svg/pservers/reftests/pattern-inheritance-not-in-rendertree-01.tentative.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-inheritance-not-in-rendertree-02.tentative.svg b/tests/wpt/tests/svg/pservers/reftests/pattern-inheritance-not-in-rendertree-02.tentative.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-inheritance-not-in-rendertree-02.tentative.svg rename to tests/wpt/tests/svg/pservers/reftests/pattern-inheritance-not-in-rendertree-02.tentative.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-inheritance-template-pattern-removed.svg b/tests/wpt/tests/svg/pservers/reftests/pattern-inheritance-template-pattern-removed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-inheritance-template-pattern-removed.svg rename to tests/wpt/tests/svg/pservers/reftests/pattern-inheritance-template-pattern-removed.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-opacity-01.svg b/tests/wpt/tests/svg/pservers/reftests/pattern-opacity-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-opacity-01.svg rename to tests/wpt/tests/svg/pservers/reftests/pattern-opacity-01.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-text-01.svg b/tests/wpt/tests/svg/pservers/reftests/pattern-text-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-text-01.svg rename to tests/wpt/tests/svg/pservers/reftests/pattern-text-01.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-viewbox-01.svg b/tests/wpt/tests/svg/pservers/reftests/pattern-viewbox-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/pattern-viewbox-01.svg rename to tests/wpt/tests/svg/pservers/reftests/pattern-viewbox-01.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/radialgradient-basic-002-ref.svg b/tests/wpt/tests/svg/pservers/reftests/radialgradient-basic-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/radialgradient-basic-002-ref.svg rename to tests/wpt/tests/svg/pservers/reftests/radialgradient-basic-002-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/radialgradient-basic-002.svg b/tests/wpt/tests/svg/pservers/reftests/radialgradient-basic-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/radialgradient-basic-002.svg rename to tests/wpt/tests/svg/pservers/reftests/radialgradient-basic-002.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/radialgradient-fully-overlapping.svg b/tests/wpt/tests/svg/pservers/reftests/radialgradient-fully-overlapping.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/radialgradient-fully-overlapping.svg rename to tests/wpt/tests/svg/pservers/reftests/radialgradient-fully-overlapping.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/reference/green-100x100.svg b/tests/wpt/tests/svg/pservers/reftests/reference/green-100x100.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/reference/green-100x100.svg rename to tests/wpt/tests/svg/pservers/reftests/reference/green-100x100.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/reference/pattern-opacity-01-ref.svg b/tests/wpt/tests/svg/pservers/reftests/reference/pattern-opacity-01-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/reference/pattern-opacity-01-ref.svg rename to tests/wpt/tests/svg/pservers/reftests/reference/pattern-opacity-01-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/reference/pattern-viewbox-01-ref.svg b/tests/wpt/tests/svg/pservers/reftests/reference/pattern-viewbox-01-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/reference/pattern-viewbox-01-ref.svg rename to tests/wpt/tests/svg/pservers/reftests/reference/pattern-viewbox-01-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/reftests/stop-color-currentcolor-dynamic-001.svg b/tests/wpt/tests/svg/pservers/reftests/stop-color-currentcolor-dynamic-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/reftests/stop-color-currentcolor-dynamic-001.svg rename to tests/wpt/tests/svg/pservers/reftests/stop-color-currentcolor-dynamic-001.svg diff --git a/tests/wpt/web-platform-tests/svg/pservers/scripted/stop-color-inheritance-currentcolor.svg b/tests/wpt/tests/svg/pservers/scripted/stop-color-inheritance-currentcolor.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/pservers/scripted/stop-color-inheritance-currentcolor.svg rename to tests/wpt/tests/svg/pservers/scripted/stop-color-inheritance-currentcolor.svg diff --git a/tests/wpt/web-platform-tests/svg/render/foreignObject-in-non-rendered-getComputedStyle.html b/tests/wpt/tests/svg/render/foreignObject-in-non-rendered-getComputedStyle.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/foreignObject-in-non-rendered-getComputedStyle.html rename to tests/wpt/tests/svg/render/foreignObject-in-non-rendered-getComputedStyle.html diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/blending-001-ref.svg b/tests/wpt/tests/svg/render/reftests/blending-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/blending-001-ref.svg rename to tests/wpt/tests/svg/render/reftests/blending-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/blending-001.svg b/tests/wpt/tests/svg/render/reftests/blending-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/blending-001.svg rename to tests/wpt/tests/svg/render/reftests/blending-001.svg diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/blending-002-ref.svg b/tests/wpt/tests/svg/render/reftests/blending-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/blending-002-ref.svg rename to tests/wpt/tests/svg/render/reftests/blending-002-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/blending-002.svg b/tests/wpt/tests/svg/render/reftests/blending-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/blending-002.svg rename to tests/wpt/tests/svg/render/reftests/blending-002.svg diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/blending-svg-foreign-object-ref.html b/tests/wpt/tests/svg/render/reftests/blending-svg-foreign-object-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/blending-svg-foreign-object-ref.html rename to tests/wpt/tests/svg/render/reftests/blending-svg-foreign-object-ref.html diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/blending-svg-foreign-object.html b/tests/wpt/tests/svg/render/reftests/blending-svg-foreign-object.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/blending-svg-foreign-object.html rename to tests/wpt/tests/svg/render/reftests/blending-svg-foreign-object.html diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/blending-svg-root-ref.html b/tests/wpt/tests/svg/render/reftests/blending-svg-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/blending-svg-root-ref.html rename to tests/wpt/tests/svg/render/reftests/blending-svg-root-ref.html diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/blending-svg-root.html b/tests/wpt/tests/svg/render/reftests/blending-svg-root.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/blending-svg-root.html rename to tests/wpt/tests/svg/render/reftests/blending-svg-root.html diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/change-sync-for-nested-use-ref.html b/tests/wpt/tests/svg/render/reftests/change-sync-for-nested-use-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/change-sync-for-nested-use-ref.html rename to tests/wpt/tests/svg/render/reftests/change-sync-for-nested-use-ref.html diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/change-sync-for-nested-use.html b/tests/wpt/tests/svg/render/reftests/change-sync-for-nested-use.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/change-sync-for-nested-use.html rename to tests/wpt/tests/svg/render/reftests/change-sync-for-nested-use.html diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/filter-effects-on-pattern-ref.html b/tests/wpt/tests/svg/render/reftests/filter-effects-on-pattern-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/filter-effects-on-pattern-ref.html rename to tests/wpt/tests/svg/render/reftests/filter-effects-on-pattern-ref.html diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/filter-effects-on-pattern.html b/tests/wpt/tests/svg/render/reftests/filter-effects-on-pattern.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/filter-effects-on-pattern.html rename to tests/wpt/tests/svg/render/reftests/filter-effects-on-pattern.html diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/nested-svg-overflow-clip.html b/tests/wpt/tests/svg/render/reftests/nested-svg-overflow-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/nested-svg-overflow-clip.html rename to tests/wpt/tests/svg/render/reftests/nested-svg-overflow-clip.html diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/overflow-clip.html b/tests/wpt/tests/svg/render/reftests/overflow-clip.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/overflow-clip.html rename to tests/wpt/tests/svg/render/reftests/overflow-clip.html diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/rect-ref.html b/tests/wpt/tests/svg/render/reftests/rect-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/rect-ref.html rename to tests/wpt/tests/svg/render/reftests/rect-ref.html diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/render-sync-with-font-size-ref.html b/tests/wpt/tests/svg/render/reftests/render-sync-with-font-size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/render-sync-with-font-size-ref.html rename to tests/wpt/tests/svg/render/reftests/render-sync-with-font-size-ref.html diff --git a/tests/wpt/web-platform-tests/svg/render/reftests/render-sync-with-font-size.html b/tests/wpt/tests/svg/render/reftests/render-sync-with-font-size.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/render/reftests/render-sync-with-font-size.html rename to tests/wpt/tests/svg/render/reftests/render-sync-with-font-size.html diff --git a/tests/wpt/web-platform-tests/svg/rendering/order/clip-path-filter-order-ref.svg b/tests/wpt/tests/svg/rendering/order/clip-path-filter-order-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/rendering/order/clip-path-filter-order-ref.svg rename to tests/wpt/tests/svg/rendering/order/clip-path-filter-order-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/rendering/order/clip-path-filter-order.svg b/tests/wpt/tests/svg/rendering/order/clip-path-filter-order.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/rendering/order/clip-path-filter-order.svg rename to tests/wpt/tests/svg/rendering/order/clip-path-filter-order.svg diff --git a/tests/wpt/web-platform-tests/svg/rendering/order/z-index-ref.svg b/tests/wpt/tests/svg/rendering/order/z-index-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/rendering/order/z-index-ref.svg rename to tests/wpt/tests/svg/rendering/order/z-index-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/rendering/order/z-index.svg b/tests/wpt/tests/svg/rendering/order/z-index.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/rendering/order/z-index.svg rename to tests/wpt/tests/svg/rendering/order/z-index.svg diff --git a/tests/wpt/web-platform-tests/svg/scripted/script-invalid-script-type.html b/tests/wpt/tests/svg/scripted/script-invalid-script-type.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/scripted/script-invalid-script-type.html rename to tests/wpt/tests/svg/scripted/script-invalid-script-type.html diff --git a/tests/wpt/web-platform-tests/svg/scripted/script-runs-in-shadow-tree.html b/tests/wpt/tests/svg/scripted/script-runs-in-shadow-tree.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/scripted/script-runs-in-shadow-tree.html rename to tests/wpt/tests/svg/scripted/script-runs-in-shadow-tree.html diff --git a/tests/wpt/web-platform-tests/svg/scripted/script-style-attribute-csp-ref.html b/tests/wpt/tests/svg/scripted/script-style-attribute-csp-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/scripted/script-style-attribute-csp-ref.html rename to tests/wpt/tests/svg/scripted/script-style-attribute-csp-ref.html diff --git a/tests/wpt/web-platform-tests/svg/scripted/script-style-attribute-csp.html b/tests/wpt/tests/svg/scripted/script-style-attribute-csp.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/scripted/script-style-attribute-csp.html rename to tests/wpt/tests/svg/scripted/script-style-attribute-csp.html diff --git a/tests/wpt/web-platform-tests/svg/scripted/text-attrs-dxdy-have-length.svg b/tests/wpt/tests/svg/scripted/text-attrs-dxdy-have-length.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/scripted/text-attrs-dxdy-have-length.svg rename to tests/wpt/tests/svg/scripted/text-attrs-dxdy-have-length.svg diff --git a/tests/wpt/web-platform-tests/svg/scripted/text-attrs-xyrotate-have-length.svg b/tests/wpt/tests/svg/scripted/text-attrs-xyrotate-have-length.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/scripted/text-attrs-xyrotate-have-length.svg rename to tests/wpt/tests/svg/scripted/text-attrs-xyrotate-have-length.svg diff --git a/tests/wpt/web-platform-tests/svg/scripted/text-tspan-attrs-have-length.svg b/tests/wpt/tests/svg/scripted/text-tspan-attrs-have-length.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/scripted/text-tspan-attrs-have-length.svg rename to tests/wpt/tests/svg/scripted/text-tspan-attrs-have-length.svg diff --git a/tests/wpt/web-platform-tests/svg/scripted/text-tspan-attrs-indexed-access.svg b/tests/wpt/tests/svg/scripted/text-tspan-attrs-indexed-access.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/scripted/text-tspan-attrs-indexed-access.svg rename to tests/wpt/tests/svg/scripted/text-tspan-attrs-indexed-access.svg diff --git a/tests/wpt/web-platform-tests/svg/scripted/tspan-attrs-dxdy-have-length.svg b/tests/wpt/tests/svg/scripted/tspan-attrs-dxdy-have-length.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/scripted/tspan-attrs-dxdy-have-length.svg rename to tests/wpt/tests/svg/scripted/tspan-attrs-dxdy-have-length.svg diff --git a/tests/wpt/web-platform-tests/svg/scripted/tspan-attrs-xyrotate-have-length.svg b/tests/wpt/tests/svg/scripted/tspan-attrs-xyrotate-have-length.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/scripted/tspan-attrs-xyrotate-have-length.svg rename to tests/wpt/tests/svg/scripted/tspan-attrs-xyrotate-have-length.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/animatedPoints-non-animated.html b/tests/wpt/tests/svg/shapes/animatedPoints-non-animated.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/animatedPoints-non-animated.html rename to tests/wpt/tests/svg/shapes/animatedPoints-non-animated.html diff --git a/tests/wpt/web-platform-tests/svg/shapes/circle-01-ref.svg b/tests/wpt/tests/svg/shapes/circle-01-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/circle-01-ref.svg rename to tests/wpt/tests/svg/shapes/circle-01-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/circle-01.svg b/tests/wpt/tests/svg/shapes/circle-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/circle-01.svg rename to tests/wpt/tests/svg/shapes/circle-01.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/ellipse-01-ref.svg b/tests/wpt/tests/svg/shapes/ellipse-01-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/ellipse-01-ref.svg rename to tests/wpt/tests/svg/shapes/ellipse-01-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/ellipse-01.svg b/tests/wpt/tests/svg/shapes/ellipse-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/ellipse-01.svg rename to tests/wpt/tests/svg/shapes/ellipse-01.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/ellipse-02-ref.svg b/tests/wpt/tests/svg/shapes/ellipse-02-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/ellipse-02-ref.svg rename to tests/wpt/tests/svg/shapes/ellipse-02-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/ellipse-02.svg b/tests/wpt/tests/svg/shapes/ellipse-02.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/ellipse-02.svg rename to tests/wpt/tests/svg/shapes/ellipse-02.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/ellipse-03-ref.svg b/tests/wpt/tests/svg/shapes/ellipse-03-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/ellipse-03-ref.svg rename to tests/wpt/tests/svg/shapes/ellipse-03-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/ellipse-03.svg b/tests/wpt/tests/svg/shapes/ellipse-03.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/ellipse-03.svg rename to tests/wpt/tests/svg/shapes/ellipse-03.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/ellipse-04-ref.svg b/tests/wpt/tests/svg/shapes/ellipse-04-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/ellipse-04-ref.svg rename to tests/wpt/tests/svg/shapes/ellipse-04-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/ellipse-04.svg b/tests/wpt/tests/svg/shapes/ellipse-04.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/ellipse-04.svg rename to tests/wpt/tests/svg/shapes/ellipse-04.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/ellipse-05.svg b/tests/wpt/tests/svg/shapes/ellipse-05.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/ellipse-05.svg rename to tests/wpt/tests/svg/shapes/ellipse-05.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/ellipse-06.svg b/tests/wpt/tests/svg/shapes/ellipse-06.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/ellipse-06.svg rename to tests/wpt/tests/svg/shapes/ellipse-06.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/ellipse-07-ref.svg b/tests/wpt/tests/svg/shapes/ellipse-07-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/ellipse-07-ref.svg rename to tests/wpt/tests/svg/shapes/ellipse-07-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/ellipse-07.svg b/tests/wpt/tests/svg/shapes/ellipse-07.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/ellipse-07.svg rename to tests/wpt/tests/svg/shapes/ellipse-07.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/ellipse-08.svg b/tests/wpt/tests/svg/shapes/ellipse-08.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/ellipse-08.svg rename to tests/wpt/tests/svg/shapes/ellipse-08.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/ellipse-09.svg b/tests/wpt/tests/svg/shapes/ellipse-09.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/ellipse-09.svg rename to tests/wpt/tests/svg/shapes/ellipse-09.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/line-dasharray-ref.svg b/tests/wpt/tests/svg/shapes/line-dasharray-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/line-dasharray-ref.svg rename to tests/wpt/tests/svg/shapes/line-dasharray-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/line-dasharray.svg b/tests/wpt/tests/svg/shapes/line-dasharray.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/line-dasharray.svg rename to tests/wpt/tests/svg/shapes/line-dasharray.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/line-getPointAtLength.svg b/tests/wpt/tests/svg/shapes/line-getPointAtLength.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/line-getPointAtLength.svg rename to tests/wpt/tests/svg/shapes/line-getPointAtLength.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/line-pathLength.svg b/tests/wpt/tests/svg/shapes/line-pathLength.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/line-pathLength.svg rename to tests/wpt/tests/svg/shapes/line-pathLength.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/rect-01-ref.html b/tests/wpt/tests/svg/shapes/rect-01-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/rect-01-ref.html rename to tests/wpt/tests/svg/shapes/rect-01-ref.html diff --git a/tests/wpt/web-platform-tests/svg/shapes/rect-01.svg b/tests/wpt/tests/svg/shapes/rect-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/rect-01.svg rename to tests/wpt/tests/svg/shapes/rect-01.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/rect-02-ref.html b/tests/wpt/tests/svg/shapes/rect-02-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/rect-02-ref.html rename to tests/wpt/tests/svg/shapes/rect-02-ref.html diff --git a/tests/wpt/web-platform-tests/svg/shapes/rect-02.svg b/tests/wpt/tests/svg/shapes/rect-02.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/rect-02.svg rename to tests/wpt/tests/svg/shapes/rect-02.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/rect-03-ref.html b/tests/wpt/tests/svg/shapes/rect-03-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/rect-03-ref.html rename to tests/wpt/tests/svg/shapes/rect-03-ref.html diff --git a/tests/wpt/web-platform-tests/svg/shapes/rect-03.svg b/tests/wpt/tests/svg/shapes/rect-03.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/rect-03.svg rename to tests/wpt/tests/svg/shapes/rect-03.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/rect-04-ref.html b/tests/wpt/tests/svg/shapes/rect-04-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/rect-04-ref.html rename to tests/wpt/tests/svg/shapes/rect-04-ref.html diff --git a/tests/wpt/web-platform-tests/svg/shapes/rect-04.svg b/tests/wpt/tests/svg/shapes/rect-04.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/rect-04.svg rename to tests/wpt/tests/svg/shapes/rect-04.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/rect-05-ref.svg b/tests/wpt/tests/svg/shapes/rect-05-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/rect-05-ref.svg rename to tests/wpt/tests/svg/shapes/rect-05-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/rect-05.svg b/tests/wpt/tests/svg/shapes/rect-05.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/rect-05.svg rename to tests/wpt/tests/svg/shapes/rect-05.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/reftests/disabled-shapes-01.svg b/tests/wpt/tests/svg/shapes/reftests/disabled-shapes-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/reftests/disabled-shapes-01.svg rename to tests/wpt/tests/svg/shapes/reftests/disabled-shapes-01.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/reftests/pathlength-001-ref.svg b/tests/wpt/tests/svg/shapes/reftests/pathlength-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/reftests/pathlength-001-ref.svg rename to tests/wpt/tests/svg/shapes/reftests/pathlength-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/reftests/pathlength-001.svg b/tests/wpt/tests/svg/shapes/reftests/pathlength-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/reftests/pathlength-001.svg rename to tests/wpt/tests/svg/shapes/reftests/pathlength-001.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/reftests/pathlength-002-ref.svg b/tests/wpt/tests/svg/shapes/reftests/pathlength-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/reftests/pathlength-002-ref.svg rename to tests/wpt/tests/svg/shapes/reftests/pathlength-002-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/reftests/pathlength-002.svg b/tests/wpt/tests/svg/shapes/reftests/pathlength-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/reftests/pathlength-002.svg rename to tests/wpt/tests/svg/shapes/reftests/pathlength-002.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/reftests/pathlength-003-ref.svg b/tests/wpt/tests/svg/shapes/reftests/pathlength-003-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/reftests/pathlength-003-ref.svg rename to tests/wpt/tests/svg/shapes/reftests/pathlength-003-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/reftests/pathlength-003.svg b/tests/wpt/tests/svg/shapes/reftests/pathlength-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/reftests/pathlength-003.svg rename to tests/wpt/tests/svg/shapes/reftests/pathlength-003.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/reftests/polygon-with-filtered-marker.html b/tests/wpt/tests/svg/shapes/reftests/polygon-with-filtered-marker.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/reftests/polygon-with-filtered-marker.html rename to tests/wpt/tests/svg/shapes/reftests/polygon-with-filtered-marker.html diff --git a/tests/wpt/web-platform-tests/svg/shapes/reftests/reference/empty.svg b/tests/wpt/tests/svg/shapes/reftests/reference/empty.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/reftests/reference/empty.svg rename to tests/wpt/tests/svg/shapes/reftests/reference/empty.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/rx-ry-not-inherited.svg b/tests/wpt/tests/svg/shapes/rx-ry-not-inherited.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/rx-ry-not-inherited.svg rename to tests/wpt/tests/svg/shapes/rx-ry-not-inherited.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/scripted/disabled-shapes-not-hit.svg b/tests/wpt/tests/svg/shapes/scripted/disabled-shapes-not-hit.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/scripted/disabled-shapes-not-hit.svg rename to tests/wpt/tests/svg/shapes/scripted/disabled-shapes-not-hit.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/scripted/shapes-clip-path.svg b/tests/wpt/tests/svg/shapes/scripted/shapes-clip-path.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/scripted/shapes-clip-path.svg rename to tests/wpt/tests/svg/shapes/scripted/shapes-clip-path.svg diff --git a/tests/wpt/web-platform-tests/svg/shapes/scripted/stroke-dashes-hit-at-high-scale.svg b/tests/wpt/tests/svg/shapes/scripted/stroke-dashes-hit-at-high-scale.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/shapes/scripted/stroke-dashes-hit-at-high-scale.svg rename to tests/wpt/tests/svg/shapes/scripted/stroke-dashes-hit-at-high-scale.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/UnknownElement/interface.svg b/tests/wpt/tests/svg/struct/UnknownElement/interface.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/UnknownElement/interface.svg rename to tests/wpt/tests/svg/struct/UnknownElement/interface.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/currentScale-change-repaint.html b/tests/wpt/tests/svg/struct/reftests/currentScale-change-repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/currentScale-change-repaint.html rename to tests/wpt/tests/svg/struct/reftests/currentScale-change-repaint.html diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/currentScale.svg b/tests/wpt/tests/svg/struct/reftests/currentScale.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/currentScale.svg rename to tests/wpt/tests/svg/struct/reftests/currentScale.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/nested-svg-through-display-contents.svg b/tests/wpt/tests/svg/struct/reftests/nested-svg-through-display-contents.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/nested-svg-through-display-contents.svg rename to tests/wpt/tests/svg/struct/reftests/nested-svg-through-display-contents.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/reference/green-100x100.html b/tests/wpt/tests/svg/struct/reftests/reference/green-100x100.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/reference/green-100x100.html rename to tests/wpt/tests/svg/struct/reftests/reference/green-100x100.html diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/reference/green-100x100.svg b/tests/wpt/tests/svg/struct/reftests/reference/green-100x100.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/reference/green-100x100.svg rename to tests/wpt/tests/svg/struct/reftests/reference/green-100x100.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/requiredextensions-empty-string.svg b/tests/wpt/tests/svg/struct/reftests/requiredextensions-empty-string.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/requiredextensions-empty-string.svg rename to tests/wpt/tests/svg/struct/reftests/requiredextensions-empty-string.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/requiredextensions-xhtml.tentative.svg b/tests/wpt/tests/svg/struct/reftests/requiredextensions-xhtml.tentative.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/requiredextensions-xhtml.tentative.svg rename to tests/wpt/tests/svg/struct/reftests/requiredextensions-xhtml.tentative.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg b/tests/wpt/tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg rename to tests/wpt/tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg.headers b/tests/wpt/tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg.headers similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg.headers rename to tests/wpt/tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg.headers diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/support/red-rect.svg b/tests/wpt/tests/svg/struct/reftests/support/red-rect.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/support/red-rect.svg rename to tests/wpt/tests/svg/struct/reftests/support/red-rect.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/support/sprites.svg b/tests/wpt/tests/svg/struct/reftests/support/sprites.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/support/sprites.svg rename to tests/wpt/tests/svg/struct/reftests/support/sprites.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-a.svg b/tests/wpt/tests/svg/struct/reftests/use-a.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-a.svg rename to tests/wpt/tests/svg/struct/reftests/use-a.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-adopted-with-external-resource.tentative.svg b/tests/wpt/tests/svg/struct/reftests/use-adopted-with-external-resource.tentative.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-adopted-with-external-resource.tentative.svg rename to tests/wpt/tests/svg/struct/reftests/use-adopted-with-external-resource.tentative.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-cross-origin.svg b/tests/wpt/tests/svg/struct/reftests/use-cross-origin.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-cross-origin.svg rename to tests/wpt/tests/svg/struct/reftests/use-cross-origin.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-data-url.tentative.svg b/tests/wpt/tests/svg/struct/reftests/use-data-url.tentative.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-data-url.tentative.svg rename to tests/wpt/tests/svg/struct/reftests/use-data-url.tentative.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-external-resource-with-revalidation.tentative.html b/tests/wpt/tests/svg/struct/reftests/use-external-resource-with-revalidation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-external-resource-with-revalidation.tentative.html rename to tests/wpt/tests/svg/struct/reftests/use-external-resource-with-revalidation.tentative.html diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-inheritance-001.svg b/tests/wpt/tests/svg/struct/reftests/use-inheritance-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-inheritance-001.svg rename to tests/wpt/tests/svg/struct/reftests/use-inheritance-001.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-inheritance-nth-child-of.svg b/tests/wpt/tests/svg/struct/reftests/use-inheritance-nth-child-of.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-inheritance-nth-child-of.svg rename to tests/wpt/tests/svg/struct/reftests/use-inheritance-nth-child-of.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-inheritance-nth-last-child-of.svg b/tests/wpt/tests/svg/struct/reftests/use-inheritance-nth-last-child-of.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-inheritance-nth-last-child-of.svg rename to tests/wpt/tests/svg/struct/reftests/use-inheritance-nth-last-child-of.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-no-tspan.svg b/tests/wpt/tests/svg/struct/reftests/use-no-tspan.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-no-tspan.svg rename to tests/wpt/tests/svg/struct/reftests/use-no-tspan.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-same-origin.svg b/tests/wpt/tests/svg/struct/reftests/use-same-origin.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-same-origin.svg rename to tests/wpt/tests/svg/struct/reftests/use-same-origin.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-svg-dimensions-override-001.svg b/tests/wpt/tests/svg/struct/reftests/use-svg-dimensions-override-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-svg-dimensions-override-001.svg rename to tests/wpt/tests/svg/struct/reftests/use-svg-dimensions-override-001.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-svg-dimensions-override-002.svg b/tests/wpt/tests/svg/struct/reftests/use-svg-dimensions-override-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-svg-dimensions-override-002.svg rename to tests/wpt/tests/svg/struct/reftests/use-svg-dimensions-override-002.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-switch.svg b/tests/wpt/tests/svg/struct/reftests/use-switch.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-switch.svg rename to tests/wpt/tests/svg/struct/reftests/use-switch.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-symbol-dimensions-override-001.svg b/tests/wpt/tests/svg/struct/reftests/use-symbol-dimensions-override-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-symbol-dimensions-override-001.svg rename to tests/wpt/tests/svg/struct/reftests/use-symbol-dimensions-override-001.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-symbol-dimensions-override-002.svg b/tests/wpt/tests/svg/struct/reftests/use-symbol-dimensions-override-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/reftests/use-symbol-dimensions-override-002.svg rename to tests/wpt/tests/svg/struct/reftests/use-symbol-dimensions-override-002.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/scripted/autofocus-attribute.svg b/tests/wpt/tests/svg/struct/scripted/autofocus-attribute.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/scripted/autofocus-attribute.svg rename to tests/wpt/tests/svg/struct/scripted/autofocus-attribute.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/scripted/blank.svg b/tests/wpt/tests/svg/struct/scripted/blank.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/scripted/blank.svg rename to tests/wpt/tests/svg/struct/scripted/blank.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/scripted/svg-getIntersectionList.svg b/tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/scripted/svg-getIntersectionList.svg rename to tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList.svg diff --git a/tests/wpt/web-platform-tests/svg/struct/scripted/use-load-error-events.tentative.html b/tests/wpt/tests/svg/struct/scripted/use-load-error-events.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/scripted/use-load-error-events.tentative.html rename to tests/wpt/tests/svg/struct/scripted/use-load-error-events.tentative.html diff --git a/tests/wpt/web-platform-tests/svg/struct/use-getComputedStyle.html b/tests/wpt/tests/svg/struct/use-getComputedStyle.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/struct/use-getComputedStyle.html rename to tests/wpt/tests/svg/struct/use-getComputedStyle.html diff --git a/tests/wpt/web-platform-tests/svg/styling/css-selectors-case-sensitivity.html b/tests/wpt/tests/svg/styling/css-selectors-case-sensitivity.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/css-selectors-case-sensitivity.html rename to tests/wpt/tests/svg/styling/css-selectors-case-sensitivity.html diff --git a/tests/wpt/web-platform-tests/svg/styling/font-size-number-calc-crash.svg b/tests/wpt/tests/svg/styling/font-size-number-calc-crash.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/font-size-number-calc-crash.svg rename to tests/wpt/tests/svg/styling/font-size-number-calc-crash.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/invalidation/nth-child-of-class-ref.svg b/tests/wpt/tests/svg/styling/invalidation/nth-child-of-class-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/invalidation/nth-child-of-class-ref.svg rename to tests/wpt/tests/svg/styling/invalidation/nth-child-of-class-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/invalidation/nth-child-of-class.svg b/tests/wpt/tests/svg/styling/invalidation/nth-child-of-class.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/invalidation/nth-child-of-class.svg rename to tests/wpt/tests/svg/styling/invalidation/nth-child-of-class.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/invalidation/nth-last-child-of-class.svg b/tests/wpt/tests/svg/styling/invalidation/nth-last-child-of-class.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/invalidation/nth-last-child-of-class.svg rename to tests/wpt/tests/svg/styling/invalidation/nth-last-child-of-class.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/padding-on-svg-via-img-ref.tentative.html b/tests/wpt/tests/svg/styling/padding-on-svg-via-img-ref.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/padding-on-svg-via-img-ref.tentative.html rename to tests/wpt/tests/svg/styling/padding-on-svg-via-img-ref.tentative.html diff --git a/tests/wpt/web-platform-tests/svg/styling/padding-on-svg-via-img.tentative.html b/tests/wpt/tests/svg/styling/padding-on-svg-via-img.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/padding-on-svg-via-img.tentative.html rename to tests/wpt/tests/svg/styling/padding-on-svg-via-img.tentative.html diff --git a/tests/wpt/web-platform-tests/svg/styling/presentation-attributes-irrelevant.html b/tests/wpt/tests/svg/styling/presentation-attributes-irrelevant.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/presentation-attributes-irrelevant.html rename to tests/wpt/tests/svg/styling/presentation-attributes-irrelevant.html diff --git a/tests/wpt/web-platform-tests/svg/styling/presentation-attributes-relevant.html b/tests/wpt/tests/svg/styling/presentation-attributes-relevant.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/presentation-attributes-relevant.html rename to tests/wpt/tests/svg/styling/presentation-attributes-relevant.html diff --git a/tests/wpt/web-platform-tests/svg/styling/presentation-attributes-special-cases.html b/tests/wpt/tests/svg/styling/presentation-attributes-special-cases.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/presentation-attributes-special-cases.html rename to tests/wpt/tests/svg/styling/presentation-attributes-special-cases.html diff --git a/tests/wpt/web-platform-tests/svg/styling/presentation-attributes-unknown.html b/tests/wpt/tests/svg/styling/presentation-attributes-unknown.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/presentation-attributes-unknown.html rename to tests/wpt/tests/svg/styling/presentation-attributes-unknown.html diff --git a/tests/wpt/web-platform-tests/svg/styling/presentation-attributes.js b/tests/wpt/tests/svg/styling/presentation-attributes.js similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/presentation-attributes.js rename to tests/wpt/tests/svg/styling/presentation-attributes.js diff --git a/tests/wpt/web-platform-tests/svg/styling/render/transform-box-ref.svg b/tests/wpt/tests/svg/styling/render/transform-box-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/render/transform-box-ref.svg rename to tests/wpt/tests/svg/styling/render/transform-box-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/render/transform-box.svg b/tests/wpt/tests/svg/styling/render/transform-box.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/render/transform-box.svg rename to tests/wpt/tests/svg/styling/render/transform-box.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/render/transform-origin-not-explicit-style-visual-ref.svg b/tests/wpt/tests/svg/styling/render/transform-origin-not-explicit-style-visual-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/render/transform-origin-not-explicit-style-visual-ref.svg rename to tests/wpt/tests/svg/styling/render/transform-origin-not-explicit-style-visual-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/render/transform-origin-not-explicit-style-visual.svg b/tests/wpt/tests/svg/styling/render/transform-origin-not-explicit-style-visual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/render/transform-origin-not-explicit-style-visual.svg rename to tests/wpt/tests/svg/styling/render/transform-origin-not-explicit-style-visual.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/render/transform-origin-ref.svg b/tests/wpt/tests/svg/styling/render/transform-origin-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/render/transform-origin-ref.svg rename to tests/wpt/tests/svg/styling/render/transform-origin-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/render/transform-origin.svg b/tests/wpt/tests/svg/styling/render/transform-origin.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/render/transform-origin.svg rename to tests/wpt/tests/svg/styling/render/transform-origin.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/render/transform-ref.svg b/tests/wpt/tests/svg/styling/render/transform-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/render/transform-ref.svg rename to tests/wpt/tests/svg/styling/render/transform-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/render/transform.svg b/tests/wpt/tests/svg/styling/render/transform.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/render/transform.svg rename to tests/wpt/tests/svg/styling/render/transform.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/required-properties.svg b/tests/wpt/tests/svg/styling/required-properties.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/required-properties.svg rename to tests/wpt/tests/svg/styling/required-properties.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/style-sheet-interfaces.svg b/tests/wpt/tests/svg/styling/style-sheet-interfaces.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/style-sheet-interfaces.svg rename to tests/wpt/tests/svg/styling/style-sheet-interfaces.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/support/a-green.css b/tests/wpt/tests/svg/styling/support/a-green.css similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/support/a-green.css rename to tests/wpt/tests/svg/styling/support/a-green.css diff --git a/tests/wpt/web-platform-tests/svg/styling/support/circle-padding-right.svg b/tests/wpt/tests/svg/styling/support/circle-padding-right.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/support/circle-padding-right.svg rename to tests/wpt/tests/svg/styling/support/circle-padding-right.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/support/circle.svg b/tests/wpt/tests/svg/styling/support/circle.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/support/circle.svg rename to tests/wpt/tests/svg/styling/support/circle.svg diff --git a/tests/wpt/web-platform-tests/svg/styling/use-element-animations.html b/tests/wpt/tests/svg/styling/use-element-animations.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/use-element-animations.html rename to tests/wpt/tests/svg/styling/use-element-animations.html diff --git a/tests/wpt/web-platform-tests/svg/styling/use-element-transitions-ref.html b/tests/wpt/tests/svg/styling/use-element-transitions-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/use-element-transitions-ref.html rename to tests/wpt/tests/svg/styling/use-element-transitions-ref.html diff --git a/tests/wpt/web-platform-tests/svg/styling/use-element-transitions.html b/tests/wpt/tests/svg/styling/use-element-transitions.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/use-element-transitions.html rename to tests/wpt/tests/svg/styling/use-element-transitions.html diff --git a/tests/wpt/web-platform-tests/svg/styling/use-element-web-animations.html b/tests/wpt/tests/svg/styling/use-element-web-animations.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/styling/use-element-web-animations.html rename to tests/wpt/tests/svg/styling/use-element-web-animations.html diff --git a/tests/wpt/web-platform-tests/svg/svg-in-svg/svg-in-svg-circular-filter-reference-crash.html b/tests/wpt/tests/svg/svg-in-svg/svg-in-svg-circular-filter-reference-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/svg-in-svg/svg-in-svg-circular-filter-reference-crash.html rename to tests/wpt/tests/svg/svg-in-svg/svg-in-svg-circular-filter-reference-crash.html diff --git a/tests/wpt/web-platform-tests/svg/text/inheritance.svg b/tests/wpt/tests/svg/text/inheritance.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/inheritance.svg rename to tests/wpt/tests/svg/text/inheritance.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/inline-size-invalid.svg b/tests/wpt/tests/svg/text/parsing/inline-size-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/inline-size-invalid.svg rename to tests/wpt/tests/svg/text/parsing/inline-size-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/inline-size-valid.svg b/tests/wpt/tests/svg/text/parsing/inline-size-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/inline-size-valid.svg rename to tests/wpt/tests/svg/text/parsing/inline-size-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/shape-inside-invalid.svg b/tests/wpt/tests/svg/text/parsing/shape-inside-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/shape-inside-invalid.svg rename to tests/wpt/tests/svg/text/parsing/shape-inside-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/shape-inside-valid.svg b/tests/wpt/tests/svg/text/parsing/shape-inside-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/shape-inside-valid.svg rename to tests/wpt/tests/svg/text/parsing/shape-inside-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/shape-margin-invalid.svg b/tests/wpt/tests/svg/text/parsing/shape-margin-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/shape-margin-invalid.svg rename to tests/wpt/tests/svg/text/parsing/shape-margin-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/shape-margin-valid.svg b/tests/wpt/tests/svg/text/parsing/shape-margin-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/shape-margin-valid.svg rename to tests/wpt/tests/svg/text/parsing/shape-margin-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/shape-subtract-invalid.svg b/tests/wpt/tests/svg/text/parsing/shape-subtract-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/shape-subtract-invalid.svg rename to tests/wpt/tests/svg/text/parsing/shape-subtract-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/shape-subtract-valid.svg b/tests/wpt/tests/svg/text/parsing/shape-subtract-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/shape-subtract-valid.svg rename to tests/wpt/tests/svg/text/parsing/shape-subtract-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/text-anchor-computed.svg b/tests/wpt/tests/svg/text/parsing/text-anchor-computed.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/text-anchor-computed.svg rename to tests/wpt/tests/svg/text/parsing/text-anchor-computed.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/text-anchor-invalid.svg b/tests/wpt/tests/svg/text/parsing/text-anchor-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/text-anchor-invalid.svg rename to tests/wpt/tests/svg/text/parsing/text-anchor-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/text-anchor-valid.svg b/tests/wpt/tests/svg/text/parsing/text-anchor-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/text-anchor-valid.svg rename to tests/wpt/tests/svg/text/parsing/text-anchor-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/text-decoration-fill-invalid.svg b/tests/wpt/tests/svg/text/parsing/text-decoration-fill-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/text-decoration-fill-invalid.svg rename to tests/wpt/tests/svg/text/parsing/text-decoration-fill-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/text-decoration-fill-valid.svg b/tests/wpt/tests/svg/text/parsing/text-decoration-fill-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/text-decoration-fill-valid.svg rename to tests/wpt/tests/svg/text/parsing/text-decoration-fill-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/text-decoration-stroke-invalid.svg b/tests/wpt/tests/svg/text/parsing/text-decoration-stroke-invalid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/text-decoration-stroke-invalid.svg rename to tests/wpt/tests/svg/text/parsing/text-decoration-stroke-invalid.svg diff --git a/tests/wpt/web-platform-tests/svg/text/parsing/text-decoration-stroke-valid.svg b/tests/wpt/tests/svg/text/parsing/text-decoration-stroke-valid.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/parsing/text-decoration-stroke-valid.svg rename to tests/wpt/tests/svg/text/parsing/text-decoration-stroke-valid.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/dominant-baseline-hanging-small-font-size.svg b/tests/wpt/tests/svg/text/reftests/dominant-baseline-hanging-small-font-size.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/dominant-baseline-hanging-small-font-size.svg rename to tests/wpt/tests/svg/text/reftests/dominant-baseline-hanging-small-font-size.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/gradient-after-reposition-ref.html b/tests/wpt/tests/svg/text/reftests/gradient-after-reposition-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/gradient-after-reposition-ref.html rename to tests/wpt/tests/svg/text/reftests/gradient-after-reposition-ref.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/gradient-after-reposition.html b/tests/wpt/tests/svg/text/reftests/gradient-after-reposition.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/gradient-after-reposition.html rename to tests/wpt/tests/svg/text/reftests/gradient-after-reposition.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/lang-attribute-dynamic-ref.svg b/tests/wpt/tests/svg/text/reftests/lang-attribute-dynamic-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/lang-attribute-dynamic-ref.svg rename to tests/wpt/tests/svg/text/reftests/lang-attribute-dynamic-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/lang-attribute-dynamic.svg b/tests/wpt/tests/svg/text/reftests/lang-attribute-dynamic.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/lang-attribute-dynamic.svg rename to tests/wpt/tests/svg/text/reftests/lang-attribute-dynamic.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/lang-attribute-ref.svg b/tests/wpt/tests/svg/text/reftests/lang-attribute-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/lang-attribute-ref.svg rename to tests/wpt/tests/svg/text/reftests/lang-attribute-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/lang-attribute.svg b/tests/wpt/tests/svg/text/reftests/lang-attribute.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/lang-attribute.svg rename to tests/wpt/tests/svg/text/reftests/lang-attribute.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/multiple-textpaths-ref.svg b/tests/wpt/tests/svg/text/reftests/multiple-textpaths-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/multiple-textpaths-ref.svg rename to tests/wpt/tests/svg/text/reftests/multiple-textpaths-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/multiple-textpaths.svg b/tests/wpt/tests/svg/text/reftests/multiple-textpaths.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/multiple-textpaths.svg rename to tests/wpt/tests/svg/text/reftests/multiple-textpaths.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/no-background-ref.svg b/tests/wpt/tests/svg/text/reftests/no-background-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/no-background-ref.svg rename to tests/wpt/tests/svg/text/reftests/no-background-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/no-background.svg b/tests/wpt/tests/svg/text/reftests/no-background.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/no-background.svg rename to tests/wpt/tests/svg/text/reftests/no-background.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/no-margin-border-padding-ref.svg b/tests/wpt/tests/svg/text/reftests/no-margin-border-padding-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/no-margin-border-padding-ref.svg rename to tests/wpt/tests/svg/text/reftests/no-margin-border-padding-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/no-margin-border-padding.svg b/tests/wpt/tests/svg/text/reftests/no-margin-border-padding.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/no-margin-border-padding.svg rename to tests/wpt/tests/svg/text/reftests/no-margin-border-padding.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/opacity-ref.svg b/tests/wpt/tests/svg/text/reftests/opacity-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/opacity-ref.svg rename to tests/wpt/tests/svg/text/reftests/opacity-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/opacity.svg b/tests/wpt/tests/svg/text/reftests/opacity.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/opacity.svg rename to tests/wpt/tests/svg/text/reftests/opacity.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-clipped-offscreen-move-onscreen-ref.html b/tests/wpt/tests/svg/text/reftests/text-clipped-offscreen-move-onscreen-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-clipped-offscreen-move-onscreen-ref.html rename to tests/wpt/tests/svg/text/reftests/text-clipped-offscreen-move-onscreen-ref.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-clipped-offscreen-move-onscreen.html b/tests/wpt/tests/svg/text/reftests/text-clipped-offscreen-move-onscreen.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-clipped-offscreen-move-onscreen.html rename to tests/wpt/tests/svg/text/reftests/text-clipped-offscreen-move-onscreen.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-complex-001-ref.svg b/tests/wpt/tests/svg/text/reftests/text-complex-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-complex-001-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-complex-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-complex-001.svg b/tests/wpt/tests/svg/text/reftests/text-complex-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-complex-001.svg rename to tests/wpt/tests/svg/text/reftests/text-complex-001.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-complex-002-ref.svg b/tests/wpt/tests/svg/text/reftests/text-complex-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-complex-002-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-complex-002-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-complex-002.svg b/tests/wpt/tests/svg/text/reftests/text-complex-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-complex-002.svg rename to tests/wpt/tests/svg/text/reftests/text-complex-002.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-display-contents-crash.html b/tests/wpt/tests/svg/text/reftests/text-display-contents-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-display-contents-crash.html rename to tests/wpt/tests/svg/text/reftests/text-display-contents-crash.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-huge-font-size-crash.html b/tests/wpt/tests/svg/text/reftests/text-huge-font-size-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-huge-font-size-crash.html rename to tests/wpt/tests/svg/text/reftests/text-huge-font-size-crash.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-001-ref.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-001-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-001.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-001.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-001.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-002-ref.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-002-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-002-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-002.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-002.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-002.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-003-ref.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-003-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-003-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-003-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-003.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-003.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-003.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-005-ref.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-005-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-005-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-005-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-005.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-005.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-005.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-005.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-006-ref.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-006-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-006-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-006-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-006.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-006.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-006.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-006.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-007-ref.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-007-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-007-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-007-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-007.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-007.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-007.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-007.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-101-ref.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-101-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-101-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-101-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-101.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-101.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-101.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-101.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-201-ref.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-201-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-201-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-201-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-201.svg b/tests/wpt/tests/svg/text/reftests/text-inline-size-201.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-inline-size-201.svg rename to tests/wpt/tests/svg/text/reftests/text-inline-size-201.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-multiline-001-ref.svg b/tests/wpt/tests/svg/text/reftests/text-multiline-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-multiline-001-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-multiline-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-multiline-001.svg b/tests/wpt/tests/svg/text/reftests/text-multiline-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-multiline-001.svg rename to tests/wpt/tests/svg/text/reftests/text-multiline-001.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-multiline-002-ref.svg b/tests/wpt/tests/svg/text/reftests/text-multiline-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-multiline-002-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-multiline-002-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-multiline-002.svg b/tests/wpt/tests/svg/text/reftests/text-multiline-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-multiline-002.svg rename to tests/wpt/tests/svg/text/reftests/text-multiline-002.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-multiline-003-ref.svg b/tests/wpt/tests/svg/text/reftests/text-multiline-003-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-multiline-003-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-multiline-003-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-multiline-003.svg b/tests/wpt/tests/svg/text/reftests/text-multiline-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-multiline-003.svg rename to tests/wpt/tests/svg/text/reftests/text-multiline-003.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-shape-inside-001-ref.svg b/tests/wpt/tests/svg/text/reftests/text-shape-inside-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-shape-inside-001-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-shape-inside-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-shape-inside-001.svg b/tests/wpt/tests/svg/text/reftests/text-shape-inside-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-shape-inside-001.svg rename to tests/wpt/tests/svg/text/reftests/text-shape-inside-001.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-shape-inside-002-ref.svg b/tests/wpt/tests/svg/text/reftests/text-shape-inside-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-shape-inside-002-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-shape-inside-002-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-shape-inside-002.svg b/tests/wpt/tests/svg/text/reftests/text-shape-inside-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-shape-inside-002.svg rename to tests/wpt/tests/svg/text/reftests/text-shape-inside-002.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-001-ref.svg b/tests/wpt/tests/svg/text/reftests/text-text-anchor-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-001-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-text-anchor-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-001.svg b/tests/wpt/tests/svg/text/reftests/text-text-anchor-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-001.svg rename to tests/wpt/tests/svg/text/reftests/text-text-anchor-001.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-002-ref.svg b/tests/wpt/tests/svg/text/reftests/text-text-anchor-002-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-002-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-text-anchor-002-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-002.svg b/tests/wpt/tests/svg/text/reftests/text-text-anchor-002.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-002.svg rename to tests/wpt/tests/svg/text/reftests/text-text-anchor-002.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-003-ref.svg b/tests/wpt/tests/svg/text/reftests/text-text-anchor-003-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-003-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-text-anchor-003-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-003.svg b/tests/wpt/tests/svg/text/reftests/text-text-anchor-003.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-003.svg rename to tests/wpt/tests/svg/text/reftests/text-text-anchor-003.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-102-ref.svg b/tests/wpt/tests/svg/text/reftests/text-text-anchor-102-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-102-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-text-anchor-102-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-102.svg b/tests/wpt/tests/svg/text/reftests/text-text-anchor-102.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-102.svg rename to tests/wpt/tests/svg/text/reftests/text-text-anchor-102.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-201-ref.svg b/tests/wpt/tests/svg/text/reftests/text-text-anchor-201-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-201-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-text-anchor-201-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-201.svg b/tests/wpt/tests/svg/text/reftests/text-text-anchor-201.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-201.svg rename to tests/wpt/tests/svg/text/reftests/text-text-anchor-201.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-202-ref.svg b/tests/wpt/tests/svg/text/reftests/text-text-anchor-202-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-202-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-text-anchor-202-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-202.svg b/tests/wpt/tests/svg/text/reftests/text-text-anchor-202.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-202.svg rename to tests/wpt/tests/svg/text/reftests/text-text-anchor-202.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-203-ref.svg b/tests/wpt/tests/svg/text/reftests/text-text-anchor-203-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-203-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-text-anchor-203-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-203.svg b/tests/wpt/tests/svg/text/reftests/text-text-anchor-203.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-text-anchor-203.svg rename to tests/wpt/tests/svg/text/reftests/text-text-anchor-203.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-transform-001-ref.html b/tests/wpt/tests/svg/text/reftests/text-transform-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-transform-001-ref.html rename to tests/wpt/tests/svg/text/reftests/text-transform-001-ref.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-transform-001.html b/tests/wpt/tests/svg/text/reftests/text-transform-001.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-transform-001.html rename to tests/wpt/tests/svg/text/reftests/text-transform-001.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-transform-002-ref.html b/tests/wpt/tests/svg/text/reftests/text-transform-002-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-transform-002-ref.html rename to tests/wpt/tests/svg/text/reftests/text-transform-002-ref.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-transform-002.html b/tests/wpt/tests/svg/text/reftests/text-transform-002.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-transform-002.html rename to tests/wpt/tests/svg/text/reftests/text-transform-002.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-xml-space-001-ref.svg b/tests/wpt/tests/svg/text/reftests/text-xml-space-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-xml-space-001-ref.svg rename to tests/wpt/tests/svg/text/reftests/text-xml-space-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/text-xml-space-001.svg b/tests/wpt/tests/svg/text/reftests/text-xml-space-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/text-xml-space-001.svg rename to tests/wpt/tests/svg/text/reftests/text-xml-space-001.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/textpath-shape-001-ref.svg b/tests/wpt/tests/svg/text/reftests/textpath-shape-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/textpath-shape-001-ref.svg rename to tests/wpt/tests/svg/text/reftests/textpath-shape-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/textpath-shape-001.svg b/tests/wpt/tests/svg/text/reftests/textpath-shape-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/textpath-shape-001.svg rename to tests/wpt/tests/svg/text/reftests/textpath-shape-001.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/textpath-side-001-ref.svg b/tests/wpt/tests/svg/text/reftests/textpath-side-001-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/textpath-side-001-ref.svg rename to tests/wpt/tests/svg/text/reftests/textpath-side-001-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/textpath-side-001.svg b/tests/wpt/tests/svg/text/reftests/textpath-side-001.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/textpath-side-001.svg rename to tests/wpt/tests/svg/text/reftests/textpath-side-001.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/transform-dynamic-change-ref.html b/tests/wpt/tests/svg/text/reftests/transform-dynamic-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/transform-dynamic-change-ref.html rename to tests/wpt/tests/svg/text/reftests/transform-dynamic-change-ref.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/transform-dynamic-change-root-ref.html b/tests/wpt/tests/svg/text/reftests/transform-dynamic-change-root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/transform-dynamic-change-root-ref.html rename to tests/wpt/tests/svg/text/reftests/transform-dynamic-change-root-ref.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/transform-dynamic-change-root.html b/tests/wpt/tests/svg/text/reftests/transform-dynamic-change-root.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/transform-dynamic-change-root.html rename to tests/wpt/tests/svg/text/reftests/transform-dynamic-change-root.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/transform-dynamic-change.html b/tests/wpt/tests/svg/text/reftests/transform-dynamic-change.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/transform-dynamic-change.html rename to tests/wpt/tests/svg/text/reftests/transform-dynamic-change.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/tspan-opacity-mixed-direction-ref.svg b/tests/wpt/tests/svg/text/reftests/tspan-opacity-mixed-direction-ref.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/tspan-opacity-mixed-direction-ref.svg rename to tests/wpt/tests/svg/text/reftests/tspan-opacity-mixed-direction-ref.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/tspan-opacity-mixed-direction.svg b/tests/wpt/tests/svg/text/reftests/tspan-opacity-mixed-direction.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/tspan-opacity-mixed-direction.svg rename to tests/wpt/tests/svg/text/reftests/tspan-opacity-mixed-direction.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/writing-mode-dynamic-change-ref.html b/tests/wpt/tests/svg/text/reftests/writing-mode-dynamic-change-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/writing-mode-dynamic-change-ref.html rename to tests/wpt/tests/svg/text/reftests/writing-mode-dynamic-change-ref.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/writing-mode-dynamic-change.html b/tests/wpt/tests/svg/text/reftests/writing-mode-dynamic-change.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/writing-mode-dynamic-change.html rename to tests/wpt/tests/svg/text/reftests/writing-mode-dynamic-change.html diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/xml-lang-attribute-dynamic.svg b/tests/wpt/tests/svg/text/reftests/xml-lang-attribute-dynamic.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/xml-lang-attribute-dynamic.svg rename to tests/wpt/tests/svg/text/reftests/xml-lang-attribute-dynamic.svg diff --git a/tests/wpt/web-platform-tests/svg/text/reftests/xml-lang-attribute.svg b/tests/wpt/tests/svg/text/reftests/xml-lang-attribute.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/reftests/xml-lang-attribute.svg rename to tests/wpt/tests/svg/text/reftests/xml-lang-attribute.svg diff --git a/tests/wpt/web-platform-tests/svg/text/scripted/getextentofchar.html b/tests/wpt/tests/svg/text/scripted/getextentofchar.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/scripted/getextentofchar.html rename to tests/wpt/tests/svg/text/scripted/getextentofchar.html diff --git a/tests/wpt/web-platform-tests/svg/text/scripted/getrotationofchar.html b/tests/wpt/tests/svg/text/scripted/getrotationofchar.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/scripted/getrotationofchar.html rename to tests/wpt/tests/svg/text/scripted/getrotationofchar.html diff --git a/tests/wpt/web-platform-tests/svg/text/scripted/getstartpositionofchar-dominant-baseline.html b/tests/wpt/tests/svg/text/scripted/getstartpositionofchar-dominant-baseline.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/scripted/getstartpositionofchar-dominant-baseline.html rename to tests/wpt/tests/svg/text/scripted/getstartpositionofchar-dominant-baseline.html diff --git a/tests/wpt/web-platform-tests/svg/text/scripted/getsubstringlength-emoji-ligatures.html b/tests/wpt/tests/svg/text/scripted/getsubstringlength-emoji-ligatures.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/scripted/getsubstringlength-emoji-ligatures.html rename to tests/wpt/tests/svg/text/scripted/getsubstringlength-emoji-ligatures.html diff --git a/tests/wpt/web-platform-tests/svg/text/scripted/lengthadjust.html b/tests/wpt/tests/svg/text/scripted/lengthadjust.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/scripted/lengthadjust.html rename to tests/wpt/tests/svg/text/scripted/lengthadjust.html diff --git a/tests/wpt/web-platform-tests/svg/text/scripted/reattach-crash.html b/tests/wpt/tests/svg/text/scripted/reattach-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/scripted/reattach-crash.html rename to tests/wpt/tests/svg/text/scripted/reattach-crash.html diff --git a/tests/wpt/web-platform-tests/svg/text/scripted/textlength-inconsistent.svg b/tests/wpt/tests/svg/text/scripted/textlength-inconsistent.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/scripted/textlength-inconsistent.svg rename to tests/wpt/tests/svg/text/scripted/textlength-inconsistent.svg diff --git a/tests/wpt/web-platform-tests/svg/text/scripted/textpath-textlength-text-anchor-001.tentative.svg b/tests/wpt/tests/svg/text/scripted/textpath-textlength-text-anchor-001.tentative.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/scripted/textpath-textlength-text-anchor-001.tentative.svg rename to tests/wpt/tests/svg/text/scripted/textpath-textlength-text-anchor-001.tentative.svg diff --git a/tests/wpt/web-platform-tests/svg/text/scripted/transform-dynamic-update.html b/tests/wpt/tests/svg/text/scripted/transform-dynamic-update.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/scripted/transform-dynamic-update.html rename to tests/wpt/tests/svg/text/scripted/transform-dynamic-update.html diff --git a/tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-001-visual.svg b/tests/wpt/tests/svg/text/visualtests/text-inline-size-001-visual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-001-visual.svg rename to tests/wpt/tests/svg/text/visualtests/text-inline-size-001-visual.svg diff --git a/tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-002-visual.svg b/tests/wpt/tests/svg/text/visualtests/text-inline-size-002-visual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-002-visual.svg rename to tests/wpt/tests/svg/text/visualtests/text-inline-size-002-visual.svg diff --git a/tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-003-visual.svg b/tests/wpt/tests/svg/text/visualtests/text-inline-size-003-visual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-003-visual.svg rename to tests/wpt/tests/svg/text/visualtests/text-inline-size-003-visual.svg diff --git a/tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-005-visual.svg b/tests/wpt/tests/svg/text/visualtests/text-inline-size-005-visual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-005-visual.svg rename to tests/wpt/tests/svg/text/visualtests/text-inline-size-005-visual.svg diff --git a/tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-006-visual.svg b/tests/wpt/tests/svg/text/visualtests/text-inline-size-006-visual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-006-visual.svg rename to tests/wpt/tests/svg/text/visualtests/text-inline-size-006-visual.svg diff --git a/tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-007-visual.svg b/tests/wpt/tests/svg/text/visualtests/text-inline-size-007-visual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-007-visual.svg rename to tests/wpt/tests/svg/text/visualtests/text-inline-size-007-visual.svg diff --git a/tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-101-visual.svg b/tests/wpt/tests/svg/text/visualtests/text-inline-size-101-visual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-101-visual.svg rename to tests/wpt/tests/svg/text/visualtests/text-inline-size-101-visual.svg diff --git a/tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-201-visual.svg b/tests/wpt/tests/svg/text/visualtests/text-inline-size-201-visual.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/text/visualtests/text-inline-size-201-visual.svg rename to tests/wpt/tests/svg/text/visualtests/text-inline-size-201-visual.svg diff --git a/tests/wpt/web-platform-tests/svg/types/elements/SVGGeometryElement-rect.svg b/tests/wpt/tests/svg/types/elements/SVGGeometryElement-rect.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/elements/SVGGeometryElement-rect.svg rename to tests/wpt/tests/svg/types/elements/SVGGeometryElement-rect.svg diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedAngle.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedAngle.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedAngle.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedAngle.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedBoolean.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedBoolean.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedBoolean.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedBoolean.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGClipPathElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGClipPathElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGClipPathElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGClipPathElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGComponentTransferFunctionElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGComponentTransferFunctionElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGComponentTransferFunctionElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGComponentTransferFunctionElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEColorMatrixElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEColorMatrixElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEColorMatrixElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEColorMatrixElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFECompositeElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFECompositeElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFECompositeElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFECompositeElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEConvolveMatrixElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEConvolveMatrixElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEConvolveMatrixElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEConvolveMatrixElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEDisplacementMapElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEDisplacementMapElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEDisplacementMapElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEDisplacementMapElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEMorphologyElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEMorphologyElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEMorphologyElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEMorphologyElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFETurbulenceElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFETurbulenceElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFETurbulenceElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFETurbulenceElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFilterElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFilterElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFilterElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFilterElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGGradientElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGGradientElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGGradientElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGGradientElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMarkerElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMarkerElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMarkerElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMarkerElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMaskElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMaskElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMaskElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMaskElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGPatternElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGPatternElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGPatternElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGPatternElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextContentElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextContentElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextContentElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextContentElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextPathElement.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextPathElement.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextPathElement.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextPathElement.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedEnumeration.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedInteger.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedInteger.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedInteger.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedInteger.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedLength.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedLength.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedLength.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedLength.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedLengthList.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedLengthList.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedLengthList.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedLengthList.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedNumber.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedNumber.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedNumber.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedNumber.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedNumberList.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedNumberList.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedNumberList.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedNumberList.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedPreserveAspectRatio.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedPreserveAspectRatio.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedPreserveAspectRatio.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedPreserveAspectRatio.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedRect.html b/tests/wpt/tests/svg/types/scripted/SVGAnimatedRect.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedRect.html rename to tests/wpt/tests/svg/types/scripted/SVGAnimatedRect.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGElement.className-01.svg b/tests/wpt/tests/svg/types/scripted/SVGElement.className-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGElement.className-01.svg rename to tests/wpt/tests/svg/types/scripted/SVGElement.className-01.svg diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-01.svg b/tests/wpt/tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-01.svg rename to tests/wpt/tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-01.svg diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-02.svg b/tests/wpt/tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-02.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-02.svg rename to tests/wpt/tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-02.svg diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-03.svg b/tests/wpt/tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-03.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-03.svg rename to tests/wpt/tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-03.svg diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-04.svg b/tests/wpt/tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-04.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-04.svg rename to tests/wpt/tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-04.svg diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-05.svg b/tests/wpt/tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-05.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-05.svg rename to tests/wpt/tests/svg/types/scripted/SVGGeometryElement.getPointAtLength-05.svg diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.getTotalLength-01.svg b/tests/wpt/tests/svg/types/scripted/SVGGeometryElement.getTotalLength-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.getTotalLength-01.svg rename to tests/wpt/tests/svg/types/scripted/SVGGeometryElement.getTotalLength-01.svg diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.isPointInFill-01.svg b/tests/wpt/tests/svg/types/scripted/SVGGeometryElement.isPointInFill-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.isPointInFill-01.svg rename to tests/wpt/tests/svg/types/scripted/SVGGeometryElement.isPointInFill-01.svg diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.isPointInStroke-01.svg b/tests/wpt/tests/svg/types/scripted/SVGGeometryElement.isPointInStroke-01.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.isPointInStroke-01.svg rename to tests/wpt/tests/svg/types/scripted/SVGGeometryElement.isPointInStroke-01.svg diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.isPointInStroke-02.svg b/tests/wpt/tests/svg/types/scripted/SVGGeometryElement.isPointInStroke-02.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGGeometryElement.isPointInStroke-02.svg rename to tests/wpt/tests/svg/types/scripted/SVGGeometryElement.isPointInStroke-02.svg diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGraphicsElement.getBBox-01.html b/tests/wpt/tests/svg/types/scripted/SVGGraphicsElement.getBBox-01.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGGraphicsElement.getBBox-01.html rename to tests/wpt/tests/svg/types/scripted/SVGGraphicsElement.getBBox-01.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGraphicsElement.getBBox-02.html b/tests/wpt/tests/svg/types/scripted/SVGGraphicsElement.getBBox-02.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGGraphicsElement.getBBox-02.html rename to tests/wpt/tests/svg/types/scripted/SVGGraphicsElement.getBBox-02.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGraphicsElement.getBBox-03.html b/tests/wpt/tests/svg/types/scripted/SVGGraphicsElement.getBBox-03.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGGraphicsElement.getBBox-03.html rename to tests/wpt/tests/svg/types/scripted/SVGGraphicsElement.getBBox-03.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGGraphicsElement.svg b/tests/wpt/tests/svg/types/scripted/SVGGraphicsElement.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGGraphicsElement.svg rename to tests/wpt/tests/svg/types/scripted/SVGGraphicsElement.svg diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGLength-ic.html b/tests/wpt/tests/svg/types/scripted/SVGLength-ic.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGLength-ic.html rename to tests/wpt/tests/svg/types/scripted/SVGLength-ic.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGLength-lh.html b/tests/wpt/tests/svg/types/scripted/SVGLength-lh.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGLength-lh.html rename to tests/wpt/tests/svg/types/scripted/SVGLength-lh.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGLength-px-with-context.html b/tests/wpt/tests/svg/types/scripted/SVGLength-px-with-context.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGLength-px-with-context.html rename to tests/wpt/tests/svg/types/scripted/SVGLength-px-with-context.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGLength-px.html b/tests/wpt/tests/svg/types/scripted/SVGLength-px.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGLength-px.html rename to tests/wpt/tests/svg/types/scripted/SVGLength-px.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGLength.html b/tests/wpt/tests/svg/types/scripted/SVGLength.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGLength.html rename to tests/wpt/tests/svg/types/scripted/SVGLength.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGLengthList-appendItem.html b/tests/wpt/tests/svg/types/scripted/SVGLengthList-appendItem.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGLengthList-appendItem.html rename to tests/wpt/tests/svg/types/scripted/SVGLengthList-appendItem.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGLengthList-appendItemFromClearedList.html b/tests/wpt/tests/svg/types/scripted/SVGLengthList-appendItemFromClearedList.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGLengthList-appendItemFromClearedList.html rename to tests/wpt/tests/svg/types/scripted/SVGLengthList-appendItemFromClearedList.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGLengthList-basics.html b/tests/wpt/tests/svg/types/scripted/SVGLengthList-basics.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGLengthList-basics.html rename to tests/wpt/tests/svg/types/scripted/SVGLengthList-basics.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGLengthList-getItem.html b/tests/wpt/tests/svg/types/scripted/SVGLengthList-getItem.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGLengthList-getItem.html rename to tests/wpt/tests/svg/types/scripted/SVGLengthList-getItem.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGPoint.html b/tests/wpt/tests/svg/types/scripted/SVGPoint.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/SVGPoint.html rename to tests/wpt/tests/svg/types/scripted/SVGPoint.html diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/event-handler-all-document-element-events.svg b/tests/wpt/tests/svg/types/scripted/event-handler-all-document-element-events.svg similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/event-handler-all-document-element-events.svg rename to tests/wpt/tests/svg/types/scripted/event-handler-all-document-element-events.svg diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/resources/SVGLengthList-helper.js b/tests/wpt/tests/svg/types/scripted/resources/SVGLengthList-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/resources/SVGLengthList-helper.js rename to tests/wpt/tests/svg/types/scripted/resources/SVGLengthList-helper.js diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/svglength-value-access-when-in-detached-document-crash.html b/tests/wpt/tests/svg/types/scripted/svglength-value-access-when-in-detached-document-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/svg/types/scripted/svglength-value-access-when-in-detached-document-crash.html rename to tests/wpt/tests/svg/types/scripted/svglength-value-access-when-in-detached-document-crash.html diff --git a/tests/wpt/web-platform-tests/testharness_runner.html b/tests/wpt/tests/testharness_runner.html similarity index 100% rename from tests/wpt/web-platform-tests/testharness_runner.html rename to tests/wpt/tests/testharness_runner.html diff --git a/tests/wpt/web-platform-tests/timing-entrytypes-registry/META.yml b/tests/wpt/tests/timing-entrytypes-registry/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/timing-entrytypes-registry/META.yml rename to tests/wpt/tests/timing-entrytypes-registry/META.yml diff --git a/tests/wpt/web-platform-tests/timing-entrytypes-registry/registry.any.js b/tests/wpt/tests/timing-entrytypes-registry/registry.any.js similarity index 100% rename from tests/wpt/web-platform-tests/timing-entrytypes-registry/registry.any.js rename to tests/wpt/tests/timing-entrytypes-registry/registry.any.js diff --git a/tests/wpt/web-platform-tests/timing-entrytypes-registry/registry.window.js b/tests/wpt/tests/timing-entrytypes-registry/registry.window.js similarity index 100% rename from tests/wpt/web-platform-tests/timing-entrytypes-registry/registry.window.js rename to tests/wpt/tests/timing-entrytypes-registry/registry.window.js diff --git a/tests/wpt/web-platform-tests/timing-entrytypes-registry/resources/utils.js b/tests/wpt/tests/timing-entrytypes-registry/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/timing-entrytypes-registry/resources/utils.js rename to tests/wpt/tests/timing-entrytypes-registry/resources/utils.js diff --git a/tests/wpt/web-platform-tests/tools/.coveragerc b/tests/wpt/tests/tools/.coveragerc similarity index 100% rename from tests/wpt/web-platform-tests/tools/.coveragerc rename to tests/wpt/tests/tools/.coveragerc diff --git a/tests/wpt/web-platform-tests/tools/.gitattributes b/tests/wpt/tests/tools/.gitattributes similarity index 100% rename from tests/wpt/web-platform-tests/tools/.gitattributes rename to tests/wpt/tests/tools/.gitattributes diff --git a/tests/wpt/web-platform-tests/tools/.gitignore b/tests/wpt/tests/tools/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/.gitignore rename to tests/wpt/tests/tools/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/META.yml b/tests/wpt/tests/tools/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/META.yml rename to tests/wpt/tests/tools/META.yml diff --git a/tests/wpt/web-platform-tests/tools/__init__.py b/tests/wpt/tests/tools/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/__init__.py rename to tests/wpt/tests/tools/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/certs/README.md b/tests/wpt/tests/tools/certs/README.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/certs/README.md rename to tests/wpt/tests/tools/certs/README.md diff --git a/tests/wpt/web-platform-tests/tools/certs/cacert.key b/tests/wpt/tests/tools/certs/cacert.key similarity index 100% rename from tests/wpt/web-platform-tests/tools/certs/cacert.key rename to tests/wpt/tests/tools/certs/cacert.key diff --git a/tests/wpt/web-platform-tests/tools/certs/cacert.pem b/tests/wpt/tests/tools/certs/cacert.pem similarity index 100% rename from tests/wpt/web-platform-tests/tools/certs/cacert.pem rename to tests/wpt/tests/tools/certs/cacert.pem diff --git a/tests/wpt/web-platform-tests/tools/certs/config.json b/tests/wpt/tests/tools/certs/config.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/certs/config.json rename to tests/wpt/tests/tools/certs/config.json diff --git a/tests/wpt/web-platform-tests/tools/certs/web-platform.test.key b/tests/wpt/tests/tools/certs/web-platform.test.key similarity index 100% rename from tests/wpt/web-platform-tests/tools/certs/web-platform.test.key rename to tests/wpt/tests/tools/certs/web-platform.test.key diff --git a/tests/wpt/web-platform-tests/tools/certs/web-platform.test.pem b/tests/wpt/tests/tools/certs/web-platform.test.pem similarity index 100% rename from tests/wpt/web-platform-tests/tools/certs/web-platform.test.pem rename to tests/wpt/tests/tools/certs/web-platform.test.pem diff --git a/tests/wpt/web-platform-tests/tools/ci/__init__.py b/tests/wpt/tests/tools/ci/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/__init__.py rename to tests/wpt/tests/tools/ci/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/README.md b/tests/wpt/tests/tools/ci/azure/README.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/README.md rename to tests/wpt/tests/tools/ci/azure/README.md diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/affected_tests.yml b/tests/wpt/tests/tools/ci/azure/affected_tests.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/affected_tests.yml rename to tests/wpt/tests/tools/ci/azure/affected_tests.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/checkout.yml b/tests/wpt/tests/tools/ci/azure/checkout.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/checkout.yml rename to tests/wpt/tests/tools/ci/azure/checkout.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/color_profile.yml b/tests/wpt/tests/tools/ci/azure/color_profile.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/color_profile.yml rename to tests/wpt/tests/tools/ci/azure/color_profile.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/com.apple.SafariTechnologyPreview.plist b/tests/wpt/tests/tools/ci/azure/com.apple.SafariTechnologyPreview.plist similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/com.apple.SafariTechnologyPreview.plist rename to tests/wpt/tests/tools/ci/azure/com.apple.SafariTechnologyPreview.plist diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/fyi_hook.yml b/tests/wpt/tests/tools/ci/azure/fyi_hook.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/fyi_hook.yml rename to tests/wpt/tests/tools/ci/azure/fyi_hook.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/install_certs.yml b/tests/wpt/tests/tools/ci/azure/install_certs.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/install_certs.yml rename to tests/wpt/tests/tools/ci/azure/install_certs.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/install_chrome.yml b/tests/wpt/tests/tools/ci/azure/install_chrome.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/install_chrome.yml rename to tests/wpt/tests/tools/ci/azure/install_chrome.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/install_edge.yml b/tests/wpt/tests/tools/ci/azure/install_edge.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/install_edge.yml rename to tests/wpt/tests/tools/ci/azure/install_edge.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/install_firefox.yml b/tests/wpt/tests/tools/ci/azure/install_firefox.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/install_firefox.yml rename to tests/wpt/tests/tools/ci/azure/install_firefox.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/install_fonts.yml b/tests/wpt/tests/tools/ci/azure/install_fonts.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/install_fonts.yml rename to tests/wpt/tests/tools/ci/azure/install_fonts.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/install_safari.yml b/tests/wpt/tests/tools/ci/azure/install_safari.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/install_safari.yml rename to tests/wpt/tests/tools/ci/azure/install_safari.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/pip_install.yml b/tests/wpt/tests/tools/ci/azure/pip_install.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/pip_install.yml rename to tests/wpt/tests/tools/ci/azure/pip_install.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/publish_logs.yml b/tests/wpt/tests/tools/ci/azure/publish_logs.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/publish_logs.yml rename to tests/wpt/tests/tools/ci/azure/publish_logs.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/sysdiagnose.yml b/tests/wpt/tests/tools/ci/azure/sysdiagnose.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/sysdiagnose.yml rename to tests/wpt/tests/tools/ci/azure/sysdiagnose.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/system_info.yml b/tests/wpt/tests/tools/ci/azure/system_info.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/system_info.yml rename to tests/wpt/tests/tools/ci/azure/system_info.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/tox_pytest.yml b/tests/wpt/tests/tools/ci/azure/tox_pytest.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/tox_pytest.yml rename to tests/wpt/tests/tools/ci/azure/tox_pytest.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/update_hosts.yml b/tests/wpt/tests/tools/ci/azure/update_hosts.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/update_hosts.yml rename to tests/wpt/tests/tools/ci/azure/update_hosts.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/update_manifest.yml b/tests/wpt/tests/tools/ci/azure/update_manifest.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/azure/update_manifest.yml rename to tests/wpt/tests/tools/ci/azure/update_manifest.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/ci_built_diff.sh b/tests/wpt/tests/tools/ci/ci_built_diff.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/ci_built_diff.sh rename to tests/wpt/tests/tools/ci/ci_built_diff.sh diff --git a/tests/wpt/web-platform-tests/tools/ci/ci_resources_unittest.sh b/tests/wpt/tests/tools/ci/ci_resources_unittest.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/ci_resources_unittest.sh rename to tests/wpt/tests/tools/ci/ci_resources_unittest.sh diff --git a/tests/wpt/web-platform-tests/tools/ci/ci_tools_integration_test.sh b/tests/wpt/tests/tools/ci/ci_tools_integration_test.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/ci_tools_integration_test.sh rename to tests/wpt/tests/tools/ci/ci_tools_integration_test.sh diff --git a/tests/wpt/web-platform-tests/tools/ci/ci_tools_unittest.sh b/tests/wpt/tests/tools/ci/ci_tools_unittest.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/ci_tools_unittest.sh rename to tests/wpt/tests/tools/ci/ci_tools_unittest.sh diff --git a/tests/wpt/web-platform-tests/tools/ci/ci_wptrunner_infrastructure.sh b/tests/wpt/tests/tools/ci/ci_wptrunner_infrastructure.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/ci_wptrunner_infrastructure.sh rename to tests/wpt/tests/tools/ci/ci_wptrunner_infrastructure.sh diff --git a/tests/wpt/web-platform-tests/tools/ci/commands.json b/tests/wpt/tests/tools/ci/commands.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/commands.json rename to tests/wpt/tests/tools/ci/commands.json diff --git a/tests/wpt/web-platform-tests/tools/ci/epochs_update.sh b/tests/wpt/tests/tools/ci/epochs_update.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/epochs_update.sh rename to tests/wpt/tests/tools/ci/epochs_update.sh diff --git a/tests/wpt/web-platform-tests/tools/ci/interfaces_update.sh b/tests/wpt/tests/tools/ci/interfaces_update.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/interfaces_update.sh rename to tests/wpt/tests/tools/ci/interfaces_update.sh diff --git a/tests/wpt/web-platform-tests/tools/ci/jobs.py b/tests/wpt/tests/tools/ci/jobs.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/jobs.py rename to tests/wpt/tests/tools/ci/jobs.py diff --git a/tests/wpt/web-platform-tests/tools/ci/macos_color_profile.py b/tests/wpt/tests/tools/ci/macos_color_profile.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/macos_color_profile.py rename to tests/wpt/tests/tools/ci/macos_color_profile.py diff --git a/tests/wpt/web-platform-tests/tools/ci/make_hosts_file.py b/tests/wpt/tests/tools/ci/make_hosts_file.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/make_hosts_file.py rename to tests/wpt/tests/tools/ci/make_hosts_file.py diff --git a/tests/wpt/web-platform-tests/tools/ci/manifest_build.py b/tests/wpt/tests/tools/ci/manifest_build.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/manifest_build.py rename to tests/wpt/tests/tools/ci/manifest_build.py diff --git a/tests/wpt/web-platform-tests/tools/ci/regen_certs.py b/tests/wpt/tests/tools/ci/regen_certs.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/regen_certs.py rename to tests/wpt/tests/tools/ci/regen_certs.py diff --git a/tests/wpt/web-platform-tests/tools/ci/requirements_build.txt b/tests/wpt/tests/tools/ci/requirements_build.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/requirements_build.txt rename to tests/wpt/tests/tools/ci/requirements_build.txt diff --git a/tests/wpt/web-platform-tests/tools/ci/requirements_macos_color_profile.txt b/tests/wpt/tests/tools/ci/requirements_macos_color_profile.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/requirements_macos_color_profile.txt rename to tests/wpt/tests/tools/ci/requirements_macos_color_profile.txt diff --git a/tests/wpt/web-platform-tests/tools/ci/requirements_tc.txt b/tests/wpt/tests/tools/ci/requirements_tc.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/requirements_tc.txt rename to tests/wpt/tests/tools/ci/requirements_tc.txt diff --git a/tests/wpt/web-platform-tests/tools/ci/run_tc.py b/tests/wpt/tests/tools/ci/run_tc.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/run_tc.py rename to tests/wpt/tests/tools/ci/run_tc.py diff --git a/tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py b/tests/wpt/tests/tools/ci/taskcluster-run.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py rename to tests/wpt/tests/tools/ci/taskcluster-run.py diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/README.md b/tests/wpt/tests/tools/ci/tc/README.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/README.md rename to tests/wpt/tests/tools/ci/tc/README.md diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/__init__.py b/tests/wpt/tests/tools/ci/tc/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/__init__.py rename to tests/wpt/tests/tools/ci/tc/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/decision.py b/tests/wpt/tests/tools/ci/tc/decision.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/decision.py rename to tests/wpt/tests/tools/ci/tc/decision.py diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/download.py b/tests/wpt/tests/tools/ci/tc/download.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/download.py rename to tests/wpt/tests/tools/ci/tc/download.py diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/github_checks_output.py b/tests/wpt/tests/tools/ci/tc/github_checks_output.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/github_checks_output.py rename to tests/wpt/tests/tools/ci/tc/github_checks_output.py diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/sink_task.py b/tests/wpt/tests/tools/ci/tc/sink_task.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/sink_task.py rename to tests/wpt/tests/tools/ci/tc/sink_task.py diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/taskgraph.py b/tests/wpt/tests/tools/ci/tc/taskgraph.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/taskgraph.py rename to tests/wpt/tests/tools/ci/tc/taskgraph.py diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/tasks/test.yml b/tests/wpt/tests/tools/ci/tc/tasks/test.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/tasks/test.yml rename to tests/wpt/tests/tools/ci/tc/tasks/test.yml diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/testdata/epochs_daily_push_event.json b/tests/wpt/tests/tools/ci/tc/testdata/epochs_daily_push_event.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/testdata/epochs_daily_push_event.json rename to tests/wpt/tests/tools/ci/tc/testdata/epochs_daily_push_event.json diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/testdata/master_push_event.json b/tests/wpt/tests/tools/ci/tc/testdata/master_push_event.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/testdata/master_push_event.json rename to tests/wpt/tests/tools/ci/tc/testdata/master_push_event.json diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/testdata/pr_event.json b/tests/wpt/tests/tools/ci/tc/testdata/pr_event.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/testdata/pr_event.json rename to tests/wpt/tests/tools/ci/tc/testdata/pr_event.json diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/testdata/pr_event_tests_affected.json b/tests/wpt/tests/tools/ci/tc/testdata/pr_event_tests_affected.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/testdata/pr_event_tests_affected.json rename to tests/wpt/tests/tools/ci/tc/testdata/pr_event_tests_affected.json diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/tests/__init__.py b/tests/wpt/tests/tools/ci/tc/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/tests/__init__.py rename to tests/wpt/tests/tools/ci/tc/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/tests/test_decision.py b/tests/wpt/tests/tools/ci/tc/tests/test_decision.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/tests/test_decision.py rename to tests/wpt/tests/tools/ci/tc/tests/test_decision.py diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/tests/test_taskgraph.py b/tests/wpt/tests/tools/ci/tc/tests/test_taskgraph.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/tests/test_taskgraph.py rename to tests/wpt/tests/tools/ci/tc/tests/test_taskgraph.py diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/tests/test_valid.py b/tests/wpt/tests/tools/ci/tc/tests/test_valid.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tc/tests/test_valid.py rename to tests/wpt/tests/tools/ci/tc/tests/test_valid.py diff --git a/tests/wpt/web-platform-tests/tools/ci/tests/__init__.py b/tests/wpt/tests/tools/ci/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tests/__init__.py rename to tests/wpt/tests/tools/ci/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/ci/tests/test_jobs.py b/tests/wpt/tests/tools/ci/tests/test_jobs.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/tests/test_jobs.py rename to tests/wpt/tests/tools/ci/tests/test_jobs.py diff --git a/tests/wpt/web-platform-tests/tools/ci/update_built.py b/tests/wpt/tests/tools/ci/update_built.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/update_built.py rename to tests/wpt/tests/tools/ci/update_built.py diff --git a/tests/wpt/web-platform-tests/tools/ci/website_build.sh b/tests/wpt/tests/tools/ci/website_build.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/ci/website_build.sh rename to tests/wpt/tests/tools/ci/website_build.sh diff --git a/tests/wpt/web-platform-tests/tools/conftest.py b/tests/wpt/tests/tools/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/conftest.py rename to tests/wpt/tests/tools/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/docker/.bashrc b/tests/wpt/tests/tools/docker/.bashrc similarity index 100% rename from tests/wpt/web-platform-tests/tools/docker/.bashrc rename to tests/wpt/tests/tools/docker/.bashrc diff --git a/tests/wpt/web-platform-tests/tools/docker/Dockerfile b/tests/wpt/tests/tools/docker/Dockerfile similarity index 100% rename from tests/wpt/web-platform-tests/tools/docker/Dockerfile rename to tests/wpt/tests/tools/docker/Dockerfile diff --git a/tests/wpt/web-platform-tests/tools/docker/README.md b/tests/wpt/tests/tools/docker/README.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/docker/README.md rename to tests/wpt/tests/tools/docker/README.md diff --git a/tests/wpt/web-platform-tests/tools/docker/__init__.py b/tests/wpt/tests/tools/docker/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/docker/__init__.py rename to tests/wpt/tests/tools/docker/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/docker/commands.json b/tests/wpt/tests/tools/docker/commands.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/docker/commands.json rename to tests/wpt/tests/tools/docker/commands.json diff --git a/tests/wpt/web-platform-tests/tools/docker/frontend.py b/tests/wpt/tests/tools/docker/frontend.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/docker/frontend.py rename to tests/wpt/tests/tools/docker/frontend.py diff --git a/tests/wpt/web-platform-tests/tools/docker/requirements.txt b/tests/wpt/tests/tools/docker/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/docker/requirements.txt rename to tests/wpt/tests/tools/docker/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/docker/retry.py b/tests/wpt/tests/tools/docker/retry.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/docker/retry.py rename to tests/wpt/tests/tools/docker/retry.py diff --git a/tests/wpt/web-platform-tests/tools/docker/seccomp.json b/tests/wpt/tests/tools/docker/seccomp.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/docker/seccomp.json rename to tests/wpt/tests/tools/docker/seccomp.json diff --git a/tests/wpt/web-platform-tests/tools/docker/start.sh b/tests/wpt/tests/tools/docker/start.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/docker/start.sh rename to tests/wpt/tests/tools/docker/start.sh diff --git a/tests/wpt/web-platform-tests/tools/flake8.ini b/tests/wpt/tests/tools/flake8.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/flake8.ini rename to tests/wpt/tests/tools/flake8.ini diff --git a/tests/wpt/web-platform-tests/tools/gitignore/__init__.py b/tests/wpt/tests/tools/gitignore/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/gitignore/__init__.py rename to tests/wpt/tests/tools/gitignore/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/gitignore/gitignore.py b/tests/wpt/tests/tools/gitignore/gitignore.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/gitignore/gitignore.py rename to tests/wpt/tests/tools/gitignore/gitignore.py diff --git a/tests/wpt/web-platform-tests/tools/gitignore/tests/__init__.py b/tests/wpt/tests/tools/gitignore/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/gitignore/tests/__init__.py rename to tests/wpt/tests/tools/gitignore/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/gitignore/tests/test_gitignore.py b/tests/wpt/tests/tools/gitignore/tests/test_gitignore.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/gitignore/tests/test_gitignore.py rename to tests/wpt/tests/tools/gitignore/tests/test_gitignore.py diff --git a/tests/wpt/web-platform-tests/tools/lint/__init__.py b/tests/wpt/tests/tools/lint/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/__init__.py rename to tests/wpt/tests/tools/lint/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/lint/commands.json b/tests/wpt/tests/tools/lint/commands.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/commands.json rename to tests/wpt/tests/tools/lint/commands.json diff --git a/tests/wpt/web-platform-tests/tools/lint/fnmatch.py b/tests/wpt/tests/tools/lint/fnmatch.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/fnmatch.py rename to tests/wpt/tests/tools/lint/fnmatch.py diff --git a/tests/wpt/web-platform-tests/tools/lint/lint.py b/tests/wpt/tests/tools/lint/lint.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/lint.py rename to tests/wpt/tests/tools/lint/lint.py diff --git a/tests/wpt/web-platform-tests/tools/lint/rules.py b/tests/wpt/tests/tools/lint/rules.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/rules.py rename to tests/wpt/tests/tools/lint/rules.py diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/__init__.py b/tests/wpt/tests/tools/lint/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/__init__.py rename to tests/wpt/tests/tools/lint/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/base.py b/tests/wpt/tests/tools/lint/tests/base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/base.py rename to tests/wpt/tests/tools/lint/tests/base.py diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/about_blank.html b/tests/wpt/tests/tools/lint/tests/dummy/about_blank.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/about_blank.html rename to tests/wpt/tests/tools/lint/tests/dummy/about_blank.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/broken.html b/tests/wpt/tests/tools/lint/tests/dummy/broken.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/broken.html rename to tests/wpt/tests/tools/lint/tests/dummy/broken.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/broken_ignored.html b/tests/wpt/tests/tools/lint/tests/dummy/broken_ignored.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/broken_ignored.html rename to tests/wpt/tests/tools/lint/tests/dummy/broken_ignored.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/a-ref.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/a-ref.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/a-ref.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/a.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/a.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/a.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/a.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/match/a-ref.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/match/a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/match/a-ref.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/match/a-ref.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/match/a.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/match/a.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/match/a.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/match/a.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/match/support/a.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/match/support/a.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/match/support/a.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/match/support/a.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/match/support/tools/a.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/match/support/tools/a.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/match/support/tools/a.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/match/support/tools/a.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/match/tools/a.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/match/tools/a.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/match/tools/a.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/match/tools/a.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/not-match/a-ref.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/not-match/a-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/not-match/a-ref.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/not-match/a-ref.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/not-match/a.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/not-match/a.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/not-match/a.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/not-match/a.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/not-match/support/a.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/not-match/support/a.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/not-match/support/a.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/not-match/support/a.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/not-match/tools/a.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/not-match/tools/a.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/not-match/tools/a.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/not-match/tools/a.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/relative-testharness-interact.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/relative-testharness-interact.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/relative-testharness-interact.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/relative-testharness-interact.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/relative-testharness.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/relative-testharness.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/relative-testharness.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/relative-testharness.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/selectors/a.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/selectors/a.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/selectors/a.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/selectors/a.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/support/a.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/support/a.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/support/a.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/support/a.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/support/tools/a.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/support/tools/a.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/support/tools/a.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/support/tools/a.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/tools/a.html b/tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/tools/a.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/tools/a.html rename to tests/wpt/tests/tools/lint/tests/dummy/css/css-unique/tools/a.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/dependency.html b/tests/wpt/tests/tools/lint/tests/dummy/dependency.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/dependency.html rename to tests/wpt/tests/tools/lint/tests/dummy/dependency.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/lint.ignore b/tests/wpt/tests/tools/lint/tests/dummy/lint.ignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/lint.ignore rename to tests/wpt/tests/tools/lint/tests/dummy/lint.ignore diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/okay.html b/tests/wpt/tests/tools/lint/tests/dummy/okay.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/okay.html rename to tests/wpt/tests/tools/lint/tests/dummy/okay.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/absolute.html b/tests/wpt/tests/tools/lint/tests/dummy/ref/absolute.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/absolute.html rename to tests/wpt/tests/tools/lint/tests/dummy/ref/absolute.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/existent_relative-ref.html b/tests/wpt/tests/tools/lint/tests/dummy/ref/existent_relative-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/existent_relative-ref.html rename to tests/wpt/tests/tools/lint/tests/dummy/ref/existent_relative-ref.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/existent_relative.html b/tests/wpt/tests/tools/lint/tests/dummy/ref/existent_relative.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/existent_relative.html rename to tests/wpt/tests/tools/lint/tests/dummy/ref/existent_relative.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/existent_root_relative.html b/tests/wpt/tests/tools/lint/tests/dummy/ref/existent_root_relative.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/existent_root_relative.html rename to tests/wpt/tests/tools/lint/tests/dummy/ref/existent_root_relative.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/non_existent_relative.html b/tests/wpt/tests/tools/lint/tests/dummy/ref/non_existent_relative.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/non_existent_relative.html rename to tests/wpt/tests/tools/lint/tests/dummy/ref/non_existent_relative.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/non_existent_root_relative.html b/tests/wpt/tests/tools/lint/tests/dummy/ref/non_existent_root_relative.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/non_existent_root_relative.html rename to tests/wpt/tests/tools/lint/tests/dummy/ref/non_existent_root_relative.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/same_file_empty.html b/tests/wpt/tests/tools/lint/tests/dummy/ref/same_file_empty.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/same_file_empty.html rename to tests/wpt/tests/tools/lint/tests/dummy/ref/same_file_empty.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/same_file_path.html b/tests/wpt/tests/tools/lint/tests/dummy/ref/same_file_path.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/ref/same_file_path.html rename to tests/wpt/tests/tools/lint/tests/dummy/ref/same_file_path.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/dir1/a.html b/tests/wpt/tests/tools/lint/tests/dummy/tests/dir1/a.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/dir1/a.html rename to tests/wpt/tests/tools/lint/tests/dummy/tests/dir1/a.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/dir1/a.js b/tests/wpt/tests/tools/lint/tests/dummy/tests/dir1/a.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/dir1/a.js rename to tests/wpt/tests/tools/lint/tests/dummy/tests/dir1/a.js diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/dir1/a.xhtml b/tests/wpt/tests/tools/lint/tests/dummy/tests/dir1/a.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/dir1/a.xhtml rename to tests/wpt/tests/tools/lint/tests/dummy/tests/dir1/a.xhtml diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/dir1/b.html b/tests/wpt/tests/tools/lint/tests/dummy/tests/dir1/b.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/dir1/b.html rename to tests/wpt/tests/tools/lint/tests/dummy/tests/dir1/b.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/dir2/a.xhtml b/tests/wpt/tests/tools/lint/tests/dummy/tests/dir2/a.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/dir2/a.xhtml rename to tests/wpt/tests/tools/lint/tests/dummy/tests/dir2/a.xhtml diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/relative-testharness-manual.html b/tests/wpt/tests/tools/lint/tests/dummy/tests/relative-testharness-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/relative-testharness-manual.html rename to tests/wpt/tests/tools/lint/tests/dummy/tests/relative-testharness-manual.html diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/test_file_lints.py b/tests/wpt/tests/tools/lint/tests/test_file_lints.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/test_file_lints.py rename to tests/wpt/tests/tools/lint/tests/test_file_lints.py diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py b/tests/wpt/tests/tools/lint/tests/test_lint.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py rename to tests/wpt/tests/tools/lint/tests/test_lint.py diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/test_path_lints.py b/tests/wpt/tests/tools/lint/tests/test_path_lints.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/lint/tests/test_path_lints.py rename to tests/wpt/tests/tools/lint/tests/test_path_lints.py diff --git a/tests/wpt/web-platform-tests/tools/localpaths.py b/tests/wpt/tests/tools/localpaths.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/localpaths.py rename to tests/wpt/tests/tools/localpaths.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/XMLParser.py b/tests/wpt/tests/tools/manifest/XMLParser.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/XMLParser.py rename to tests/wpt/tests/tools/manifest/XMLParser.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/__init__.py b/tests/wpt/tests/tools/manifest/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/__init__.py rename to tests/wpt/tests/tools/manifest/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/catalog/xhtml.dtd b/tests/wpt/tests/tools/manifest/catalog/xhtml.dtd similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/catalog/xhtml.dtd rename to tests/wpt/tests/tools/manifest/catalog/xhtml.dtd diff --git a/tests/wpt/web-platform-tests/tools/manifest/commands.json b/tests/wpt/tests/tools/manifest/commands.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/commands.json rename to tests/wpt/tests/tools/manifest/commands.json diff --git a/tests/wpt/web-platform-tests/tools/manifest/download.py b/tests/wpt/tests/tools/manifest/download.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/download.py rename to tests/wpt/tests/tools/manifest/download.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/item.py b/tests/wpt/tests/tools/manifest/item.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/item.py rename to tests/wpt/tests/tools/manifest/item.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/jsonlib.py b/tests/wpt/tests/tools/manifest/jsonlib.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/jsonlib.py rename to tests/wpt/tests/tools/manifest/jsonlib.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/log.py b/tests/wpt/tests/tools/manifest/log.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/log.py rename to tests/wpt/tests/tools/manifest/log.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/manifest.py b/tests/wpt/tests/tools/manifest/manifest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/manifest.py rename to tests/wpt/tests/tools/manifest/manifest.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/requirements.txt b/tests/wpt/tests/tools/manifest/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/requirements.txt rename to tests/wpt/tests/tools/manifest/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py b/tests/wpt/tests/tools/manifest/sourcefile.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/sourcefile.py rename to tests/wpt/tests/tools/manifest/sourcefile.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/testpaths.py b/tests/wpt/tests/tools/manifest/testpaths.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/testpaths.py rename to tests/wpt/tests/tools/manifest/testpaths.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/tests/__init__.py b/tests/wpt/tests/tools/manifest/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/tests/__init__.py rename to tests/wpt/tests/tools/manifest/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/tests/test_XMLParser.py b/tests/wpt/tests/tools/manifest/tests/test_XMLParser.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/tests/test_XMLParser.py rename to tests/wpt/tests/tools/manifest/tests/test_XMLParser.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/tests/test_item.py b/tests/wpt/tests/tools/manifest/tests/test_item.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/tests/test_item.py rename to tests/wpt/tests/tools/manifest/tests/test_item.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/tests/test_manifest.py b/tests/wpt/tests/tools/manifest/tests/test_manifest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/tests/test_manifest.py rename to tests/wpt/tests/tools/manifest/tests/test_manifest.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/tests/test_sourcefile.py b/tests/wpt/tests/tools/manifest/tests/test_sourcefile.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/tests/test_sourcefile.py rename to tests/wpt/tests/tools/manifest/tests/test_sourcefile.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/tests/test_utils.py b/tests/wpt/tests/tools/manifest/tests/test_utils.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/tests/test_utils.py rename to tests/wpt/tests/tools/manifest/tests/test_utils.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/typedata.py b/tests/wpt/tests/tools/manifest/typedata.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/typedata.py rename to tests/wpt/tests/tools/manifest/typedata.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/update.py b/tests/wpt/tests/tools/manifest/update.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/update.py rename to tests/wpt/tests/tools/manifest/update.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/utils.py b/tests/wpt/tests/tools/manifest/utils.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/utils.py rename to tests/wpt/tests/tools/manifest/utils.py diff --git a/tests/wpt/web-platform-tests/tools/manifest/vcs.py b/tests/wpt/tests/tools/manifest/vcs.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/manifest/vcs.py rename to tests/wpt/tests/tools/manifest/vcs.py diff --git a/tests/wpt/web-platform-tests/tools/mypy.ini b/tests/wpt/tests/tools/mypy.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/mypy.ini rename to tests/wpt/tests/tools/mypy.ini diff --git a/tests/wpt/web-platform-tests/tools/pytest.ini b/tests/wpt/tests/tools/pytest.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/pytest.ini rename to tests/wpt/tests/tools/pytest.ini diff --git a/tests/wpt/web-platform-tests/tools/requirements_flake8.txt b/tests/wpt/tests/tools/requirements_flake8.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/requirements_flake8.txt rename to tests/wpt/tests/tools/requirements_flake8.txt diff --git a/tests/wpt/web-platform-tests/tools/requirements_mypy.txt b/tests/wpt/tests/tools/requirements_mypy.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/requirements_mypy.txt rename to tests/wpt/tests/tools/requirements_mypy.txt diff --git a/tests/wpt/web-platform-tests/tools/requirements_pytest.txt b/tests/wpt/tests/tools/requirements_pytest.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/requirements_pytest.txt rename to tests/wpt/tests/tools/requirements_pytest.txt diff --git a/tests/wpt/web-platform-tests/tools/requirements_tests.txt b/tests/wpt/tests/tools/requirements_tests.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/requirements_tests.txt rename to tests/wpt/tests/tools/requirements_tests.txt diff --git a/tests/wpt/web-platform-tests/tools/runner/css/bootstrap-theme.min.css b/tests/wpt/tests/tools/runner/css/bootstrap-theme.min.css similarity index 100% rename from tests/wpt/web-platform-tests/tools/runner/css/bootstrap-theme.min.css rename to tests/wpt/tests/tools/runner/css/bootstrap-theme.min.css diff --git a/tests/wpt/web-platform-tests/tools/runner/css/bootstrap.min.css b/tests/wpt/tests/tools/runner/css/bootstrap.min.css similarity index 100% rename from tests/wpt/web-platform-tests/tools/runner/css/bootstrap.min.css rename to tests/wpt/tests/tools/runner/css/bootstrap.min.css diff --git a/tests/wpt/web-platform-tests/tools/runner/fonts/glyphicons-halflings-regular.eot b/tests/wpt/tests/tools/runner/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from tests/wpt/web-platform-tests/tools/runner/fonts/glyphicons-halflings-regular.eot rename to tests/wpt/tests/tools/runner/fonts/glyphicons-halflings-regular.eot diff --git a/tests/wpt/web-platform-tests/tools/runner/fonts/glyphicons-halflings-regular.svg b/tests/wpt/tests/tools/runner/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/runner/fonts/glyphicons-halflings-regular.svg rename to tests/wpt/tests/tools/runner/fonts/glyphicons-halflings-regular.svg diff --git a/tests/wpt/web-platform-tests/tools/runner/fonts/glyphicons-halflings-regular.ttf b/tests/wpt/tests/tools/runner/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from tests/wpt/web-platform-tests/tools/runner/fonts/glyphicons-halflings-regular.ttf rename to tests/wpt/tests/tools/runner/fonts/glyphicons-halflings-regular.ttf diff --git a/tests/wpt/web-platform-tests/tools/runner/fonts/glyphicons-halflings-regular.woff b/tests/wpt/tests/tools/runner/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from tests/wpt/web-platform-tests/tools/runner/fonts/glyphicons-halflings-regular.woff rename to tests/wpt/tests/tools/runner/fonts/glyphicons-halflings-regular.woff diff --git a/tests/wpt/web-platform-tests/tools/runner/index.html b/tests/wpt/tests/tools/runner/index.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/runner/index.html rename to tests/wpt/tests/tools/runner/index.html diff --git a/tests/wpt/web-platform-tests/tools/runner/report.css b/tests/wpt/tests/tools/runner/report.css similarity index 100% rename from tests/wpt/web-platform-tests/tools/runner/report.css rename to tests/wpt/tests/tools/runner/report.css diff --git a/tests/wpt/web-platform-tests/tools/runner/report.py b/tests/wpt/tests/tools/runner/report.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/runner/report.py rename to tests/wpt/tests/tools/runner/report.py diff --git a/tests/wpt/web-platform-tests/tools/runner/runner.css b/tests/wpt/tests/tools/runner/runner.css similarity index 100% rename from tests/wpt/web-platform-tests/tools/runner/runner.css rename to tests/wpt/tests/tools/runner/runner.css diff --git a/tests/wpt/web-platform-tests/tools/runner/runner.js b/tests/wpt/tests/tools/runner/runner.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/runner/runner.js rename to tests/wpt/tests/tools/runner/runner.js diff --git a/tests/wpt/web-platform-tests/tools/runner/update_manifest.py b/tests/wpt/tests/tools/runner/update_manifest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/runner/update_manifest.py rename to tests/wpt/tests/tools/runner/update_manifest.py diff --git a/tests/wpt/web-platform-tests/tools/serve/__init__.py b/tests/wpt/tests/tools/serve/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/serve/__init__.py rename to tests/wpt/tests/tools/serve/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/serve/commands.json b/tests/wpt/tests/tools/serve/commands.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/serve/commands.json rename to tests/wpt/tests/tools/serve/commands.json diff --git a/tests/wpt/web-platform-tests/tools/serve/serve.py b/tests/wpt/tests/tools/serve/serve.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/serve/serve.py rename to tests/wpt/tests/tools/serve/serve.py diff --git a/tests/wpt/web-platform-tests/tools/serve/test_functional.py b/tests/wpt/tests/tools/serve/test_functional.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/serve/test_functional.py rename to tests/wpt/tests/tools/serve/test_functional.py diff --git a/tests/wpt/web-platform-tests/tools/serve/test_serve.py b/tests/wpt/tests/tools/serve/test_serve.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/serve/test_serve.py rename to tests/wpt/tests/tools/serve/test_serve.py diff --git a/tests/wpt/web-platform-tests/tools/serve/wave.py b/tests/wpt/tests/tools/serve/wave.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/serve/wave.py rename to tests/wpt/tests/tools/serve/wave.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/.gitignore b/tests/wpt/tests/tools/third_party/atomicwrites/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/.gitignore rename to tests/wpt/tests/tools/third_party/atomicwrites/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/.travis.yml b/tests/wpt/tests/tools/third_party/atomicwrites/.travis.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/.travis.yml rename to tests/wpt/tests/tools/third_party/atomicwrites/.travis.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/CONTRIBUTING.rst b/tests/wpt/tests/tools/third_party/atomicwrites/CONTRIBUTING.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/CONTRIBUTING.rst rename to tests/wpt/tests/tools/third_party/atomicwrites/CONTRIBUTING.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/LICENSE b/tests/wpt/tests/tools/third_party/atomicwrites/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/LICENSE rename to tests/wpt/tests/tools/third_party/atomicwrites/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/MANIFEST.in b/tests/wpt/tests/tools/third_party/atomicwrites/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/MANIFEST.in rename to tests/wpt/tests/tools/third_party/atomicwrites/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/Makefile b/tests/wpt/tests/tools/third_party/atomicwrites/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/Makefile rename to tests/wpt/tests/tools/third_party/atomicwrites/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/README.rst b/tests/wpt/tests/tools/third_party/atomicwrites/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/README.rst rename to tests/wpt/tests/tools/third_party/atomicwrites/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/appveyor.yml b/tests/wpt/tests/tools/third_party/atomicwrites/appveyor.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/appveyor.yml rename to tests/wpt/tests/tools/third_party/atomicwrites/appveyor.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/atomicwrites/__init__.py b/tests/wpt/tests/tools/third_party/atomicwrites/atomicwrites/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/atomicwrites/__init__.py rename to tests/wpt/tests/tools/third_party/atomicwrites/atomicwrites/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/docs/Makefile b/tests/wpt/tests/tools/third_party/atomicwrites/docs/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/docs/Makefile rename to tests/wpt/tests/tools/third_party/atomicwrites/docs/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/docs/conf.py b/tests/wpt/tests/tools/third_party/atomicwrites/docs/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/docs/conf.py rename to tests/wpt/tests/tools/third_party/atomicwrites/docs/conf.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/docs/index.rst b/tests/wpt/tests/tools/third_party/atomicwrites/docs/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/docs/index.rst rename to tests/wpt/tests/tools/third_party/atomicwrites/docs/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/docs/make.bat b/tests/wpt/tests/tools/third_party/atomicwrites/docs/make.bat similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/docs/make.bat rename to tests/wpt/tests/tools/third_party/atomicwrites/docs/make.bat diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/setup.cfg b/tests/wpt/tests/tools/third_party/atomicwrites/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/setup.cfg rename to tests/wpt/tests/tools/third_party/atomicwrites/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/setup.py b/tests/wpt/tests/tools/third_party/atomicwrites/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/setup.py rename to tests/wpt/tests/tools/third_party/atomicwrites/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/atomicwrites/tox.ini b/tests/wpt/tests/tools/third_party/atomicwrites/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/atomicwrites/tox.ini rename to tests/wpt/tests/tools/third_party/atomicwrites/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/.github/CODE_OF_CONDUCT.md b/tests/wpt/tests/tools/third_party/attrs/.github/CODE_OF_CONDUCT.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/.github/CODE_OF_CONDUCT.md rename to tests/wpt/tests/tools/third_party/attrs/.github/CODE_OF_CONDUCT.md diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/.github/CONTRIBUTING.md b/tests/wpt/tests/tools/third_party/attrs/.github/CONTRIBUTING.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/.github/CONTRIBUTING.md rename to tests/wpt/tests/tools/third_party/attrs/.github/CONTRIBUTING.md diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/.github/FUNDING.yml b/tests/wpt/tests/tools/third_party/attrs/.github/FUNDING.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/.github/FUNDING.yml rename to tests/wpt/tests/tools/third_party/attrs/.github/FUNDING.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/.github/PULL_REQUEST_TEMPLATE.md b/tests/wpt/tests/tools/third_party/attrs/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/.github/PULL_REQUEST_TEMPLATE.md rename to tests/wpt/tests/tools/third_party/attrs/.github/PULL_REQUEST_TEMPLATE.md diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/.github/SECURITY.md b/tests/wpt/tests/tools/third_party/attrs/.github/SECURITY.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/.github/SECURITY.md rename to tests/wpt/tests/tools/third_party/attrs/.github/SECURITY.md diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/.github/workflows/main.yml b/tests/wpt/tests/tools/third_party/attrs/.github/workflows/main.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/.github/workflows/main.yml rename to tests/wpt/tests/tools/third_party/attrs/.github/workflows/main.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/.gitignore b/tests/wpt/tests/tools/third_party/attrs/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/.gitignore rename to tests/wpt/tests/tools/third_party/attrs/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/.pre-commit-config.yaml b/tests/wpt/tests/tools/third_party/attrs/.pre-commit-config.yaml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/.pre-commit-config.yaml rename to tests/wpt/tests/tools/third_party/attrs/.pre-commit-config.yaml diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/.readthedocs.yml b/tests/wpt/tests/tools/third_party/attrs/.readthedocs.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/.readthedocs.yml rename to tests/wpt/tests/tools/third_party/attrs/.readthedocs.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/AUTHORS.rst b/tests/wpt/tests/tools/third_party/attrs/AUTHORS.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/AUTHORS.rst rename to tests/wpt/tests/tools/third_party/attrs/AUTHORS.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/CHANGELOG.rst b/tests/wpt/tests/tools/third_party/attrs/CHANGELOG.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/CHANGELOG.rst rename to tests/wpt/tests/tools/third_party/attrs/CHANGELOG.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/LICENSE b/tests/wpt/tests/tools/third_party/attrs/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/LICENSE rename to tests/wpt/tests/tools/third_party/attrs/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/MANIFEST.in b/tests/wpt/tests/tools/third_party/attrs/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/MANIFEST.in rename to tests/wpt/tests/tools/third_party/attrs/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/README.rst b/tests/wpt/tests/tools/third_party/attrs/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/README.rst rename to tests/wpt/tests/tools/third_party/attrs/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/changelog.d/.gitignore b/tests/wpt/tests/tools/third_party/attrs/changelog.d/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/changelog.d/.gitignore rename to tests/wpt/tests/tools/third_party/attrs/changelog.d/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/changelog.d/towncrier_template.rst b/tests/wpt/tests/tools/third_party/attrs/changelog.d/towncrier_template.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/changelog.d/towncrier_template.rst rename to tests/wpt/tests/tools/third_party/attrs/changelog.d/towncrier_template.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/conftest.py b/tests/wpt/tests/tools/third_party/attrs/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/conftest.py rename to tests/wpt/tests/tools/third_party/attrs/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/Makefile b/tests/wpt/tests/tools/third_party/attrs/docs/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/Makefile rename to tests/wpt/tests/tools/third_party/attrs/docs/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/_static/attrs_logo.png b/tests/wpt/tests/tools/third_party/attrs/docs/_static/attrs_logo.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/_static/attrs_logo.png rename to tests/wpt/tests/tools/third_party/attrs/docs/_static/attrs_logo.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/_static/attrs_logo.svg b/tests/wpt/tests/tools/third_party/attrs/docs/_static/attrs_logo.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/_static/attrs_logo.svg rename to tests/wpt/tests/tools/third_party/attrs/docs/_static/attrs_logo.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/_static/attrs_logo_white.png b/tests/wpt/tests/tools/third_party/attrs/docs/_static/attrs_logo_white.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/_static/attrs_logo_white.png rename to tests/wpt/tests/tools/third_party/attrs/docs/_static/attrs_logo_white.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/_static/attrs_logo_white.svg b/tests/wpt/tests/tools/third_party/attrs/docs/_static/attrs_logo_white.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/_static/attrs_logo_white.svg rename to tests/wpt/tests/tools/third_party/attrs/docs/_static/attrs_logo_white.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/api.rst b/tests/wpt/tests/tools/third_party/attrs/docs/api.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/api.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/api.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/changelog.rst b/tests/wpt/tests/tools/third_party/attrs/docs/changelog.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/changelog.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/changelog.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/comparison.rst b/tests/wpt/tests/tools/third_party/attrs/docs/comparison.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/comparison.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/comparison.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/conf.py b/tests/wpt/tests/tools/third_party/attrs/docs/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/conf.py rename to tests/wpt/tests/tools/third_party/attrs/docs/conf.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/docutils.conf b/tests/wpt/tests/tools/third_party/attrs/docs/docutils.conf similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/docutils.conf rename to tests/wpt/tests/tools/third_party/attrs/docs/docutils.conf diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/examples.rst b/tests/wpt/tests/tools/third_party/attrs/docs/examples.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/examples.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/examples.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/extending.rst b/tests/wpt/tests/tools/third_party/attrs/docs/extending.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/extending.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/extending.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/glossary.rst b/tests/wpt/tests/tools/third_party/attrs/docs/glossary.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/glossary.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/glossary.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/hashing.rst b/tests/wpt/tests/tools/third_party/attrs/docs/hashing.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/hashing.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/hashing.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/how-does-it-work.rst b/tests/wpt/tests/tools/third_party/attrs/docs/how-does-it-work.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/how-does-it-work.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/how-does-it-work.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/index.rst b/tests/wpt/tests/tools/third_party/attrs/docs/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/index.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/init.rst b/tests/wpt/tests/tools/third_party/attrs/docs/init.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/init.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/init.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/license.rst b/tests/wpt/tests/tools/third_party/attrs/docs/license.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/license.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/license.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/names.rst b/tests/wpt/tests/tools/third_party/attrs/docs/names.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/names.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/names.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/overview.rst b/tests/wpt/tests/tools/third_party/attrs/docs/overview.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/overview.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/overview.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/python-2.rst b/tests/wpt/tests/tools/third_party/attrs/docs/python-2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/python-2.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/python-2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/types.rst b/tests/wpt/tests/tools/third_party/attrs/docs/types.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/types.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/types.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/docs/why.rst b/tests/wpt/tests/tools/third_party/attrs/docs/why.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/docs/why.rst rename to tests/wpt/tests/tools/third_party/attrs/docs/why.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/mypy.ini b/tests/wpt/tests/tools/third_party/attrs/mypy.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/mypy.ini rename to tests/wpt/tests/tools/third_party/attrs/mypy.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/pyproject.toml b/tests/wpt/tests/tools/third_party/attrs/pyproject.toml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/pyproject.toml rename to tests/wpt/tests/tools/third_party/attrs/pyproject.toml diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/setup.py b/tests/wpt/tests/tools/third_party/attrs/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/setup.py rename to tests/wpt/tests/tools/third_party/attrs/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/__init__.py b/tests/wpt/tests/tools/third_party/attrs/src/attr/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/__init__.py rename to tests/wpt/tests/tools/third_party/attrs/src/attr/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/__init__.pyi b/tests/wpt/tests/tools/third_party/attrs/src/attr/__init__.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/__init__.pyi rename to tests/wpt/tests/tools/third_party/attrs/src/attr/__init__.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_cmp.py b/tests/wpt/tests/tools/third_party/attrs/src/attr/_cmp.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_cmp.py rename to tests/wpt/tests/tools/third_party/attrs/src/attr/_cmp.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_cmp.pyi b/tests/wpt/tests/tools/third_party/attrs/src/attr/_cmp.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_cmp.pyi rename to tests/wpt/tests/tools/third_party/attrs/src/attr/_cmp.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_compat.py b/tests/wpt/tests/tools/third_party/attrs/src/attr/_compat.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_compat.py rename to tests/wpt/tests/tools/third_party/attrs/src/attr/_compat.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_config.py b/tests/wpt/tests/tools/third_party/attrs/src/attr/_config.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_config.py rename to tests/wpt/tests/tools/third_party/attrs/src/attr/_config.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_funcs.py b/tests/wpt/tests/tools/third_party/attrs/src/attr/_funcs.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_funcs.py rename to tests/wpt/tests/tools/third_party/attrs/src/attr/_funcs.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_make.py b/tests/wpt/tests/tools/third_party/attrs/src/attr/_make.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_make.py rename to tests/wpt/tests/tools/third_party/attrs/src/attr/_make.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_next_gen.py b/tests/wpt/tests/tools/third_party/attrs/src/attr/_next_gen.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_next_gen.py rename to tests/wpt/tests/tools/third_party/attrs/src/attr/_next_gen.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_version_info.py b/tests/wpt/tests/tools/third_party/attrs/src/attr/_version_info.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_version_info.py rename to tests/wpt/tests/tools/third_party/attrs/src/attr/_version_info.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_version_info.pyi b/tests/wpt/tests/tools/third_party/attrs/src/attr/_version_info.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/_version_info.pyi rename to tests/wpt/tests/tools/third_party/attrs/src/attr/_version_info.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/converters.py b/tests/wpt/tests/tools/third_party/attrs/src/attr/converters.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/converters.py rename to tests/wpt/tests/tools/third_party/attrs/src/attr/converters.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/converters.pyi b/tests/wpt/tests/tools/third_party/attrs/src/attr/converters.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/converters.pyi rename to tests/wpt/tests/tools/third_party/attrs/src/attr/converters.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/exceptions.py b/tests/wpt/tests/tools/third_party/attrs/src/attr/exceptions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/exceptions.py rename to tests/wpt/tests/tools/third_party/attrs/src/attr/exceptions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/exceptions.pyi b/tests/wpt/tests/tools/third_party/attrs/src/attr/exceptions.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/exceptions.pyi rename to tests/wpt/tests/tools/third_party/attrs/src/attr/exceptions.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/filters.py b/tests/wpt/tests/tools/third_party/attrs/src/attr/filters.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/filters.py rename to tests/wpt/tests/tools/third_party/attrs/src/attr/filters.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/filters.pyi b/tests/wpt/tests/tools/third_party/attrs/src/attr/filters.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/filters.pyi rename to tests/wpt/tests/tools/third_party/attrs/src/attr/filters.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/py.typed b/tests/wpt/tests/tools/third_party/attrs/src/attr/py.typed similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/py.typed rename to tests/wpt/tests/tools/third_party/attrs/src/attr/py.typed diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/setters.py b/tests/wpt/tests/tools/third_party/attrs/src/attr/setters.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/setters.py rename to tests/wpt/tests/tools/third_party/attrs/src/attr/setters.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/setters.pyi b/tests/wpt/tests/tools/third_party/attrs/src/attr/setters.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/setters.pyi rename to tests/wpt/tests/tools/third_party/attrs/src/attr/setters.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/validators.py b/tests/wpt/tests/tools/third_party/attrs/src/attr/validators.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/validators.py rename to tests/wpt/tests/tools/third_party/attrs/src/attr/validators.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/validators.pyi b/tests/wpt/tests/tools/third_party/attrs/src/attr/validators.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attr/validators.pyi rename to tests/wpt/tests/tools/third_party/attrs/src/attr/validators.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/__init__.py b/tests/wpt/tests/tools/third_party/attrs/src/attrs/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/__init__.py rename to tests/wpt/tests/tools/third_party/attrs/src/attrs/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/__init__.pyi b/tests/wpt/tests/tools/third_party/attrs/src/attrs/__init__.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/__init__.pyi rename to tests/wpt/tests/tools/third_party/attrs/src/attrs/__init__.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/converters.py b/tests/wpt/tests/tools/third_party/attrs/src/attrs/converters.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/converters.py rename to tests/wpt/tests/tools/third_party/attrs/src/attrs/converters.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/exceptions.py b/tests/wpt/tests/tools/third_party/attrs/src/attrs/exceptions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/exceptions.py rename to tests/wpt/tests/tools/third_party/attrs/src/attrs/exceptions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/filters.py b/tests/wpt/tests/tools/third_party/attrs/src/attrs/filters.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/filters.py rename to tests/wpt/tests/tools/third_party/attrs/src/attrs/filters.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/py.typed b/tests/wpt/tests/tools/third_party/attrs/src/attrs/py.typed similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/py.typed rename to tests/wpt/tests/tools/third_party/attrs/src/attrs/py.typed diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/setters.py b/tests/wpt/tests/tools/third_party/attrs/src/attrs/setters.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/setters.py rename to tests/wpt/tests/tools/third_party/attrs/src/attrs/setters.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/validators.py b/tests/wpt/tests/tools/third_party/attrs/src/attrs/validators.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/src/attrs/validators.py rename to tests/wpt/tests/tools/third_party/attrs/src/attrs/validators.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/__init__.py b/tests/wpt/tests/tools/third_party/attrs/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/__init__.py rename to tests/wpt/tests/tools/third_party/attrs/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/attr_import_star.py b/tests/wpt/tests/tools/third_party/attrs/tests/attr_import_star.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/attr_import_star.py rename to tests/wpt/tests/tools/third_party/attrs/tests/attr_import_star.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/dataclass_transform_example.py b/tests/wpt/tests/tools/third_party/attrs/tests/dataclass_transform_example.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/dataclass_transform_example.py rename to tests/wpt/tests/tools/third_party/attrs/tests/dataclass_transform_example.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/strategies.py b/tests/wpt/tests/tools/third_party/attrs/tests/strategies.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/strategies.py rename to tests/wpt/tests/tools/third_party/attrs/tests/strategies.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_3rd_party.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_3rd_party.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_3rd_party.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_3rd_party.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_annotations.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_annotations.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_annotations.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_annotations.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_cmp.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_cmp.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_cmp.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_cmp.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_compat.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_compat.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_compat.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_compat.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_config.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_config.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_config.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_config.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_converters.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_converters.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_converters.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_converters.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_dunders.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_dunders.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_dunders.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_dunders.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_filters.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_filters.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_filters.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_filters.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_funcs.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_funcs.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_funcs.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_funcs.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_functional.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_functional.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_functional.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_functional.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_hooks.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_hooks.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_hooks.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_hooks.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_import.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_import.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_import.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_import.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_init_subclass.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_init_subclass.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_init_subclass.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_init_subclass.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_make.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_make.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_make.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_make.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_mypy.yml b/tests/wpt/tests/tools/third_party/attrs/tests/test_mypy.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_mypy.yml rename to tests/wpt/tests/tools/third_party/attrs/tests/test_mypy.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_next_gen.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_next_gen.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_next_gen.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_next_gen.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_pattern_matching.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_pattern_matching.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_pattern_matching.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_pattern_matching.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_pyright.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_pyright.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_pyright.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_pyright.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_setattr.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_setattr.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_setattr.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_setattr.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_slots.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_slots.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_slots.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_slots.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_validators.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_validators.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_validators.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_validators.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_version_info.py b/tests/wpt/tests/tools/third_party/attrs/tests/test_version_info.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/test_version_info.py rename to tests/wpt/tests/tools/third_party/attrs/tests/test_version_info.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/typing_example.py b/tests/wpt/tests/tools/third_party/attrs/tests/typing_example.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/typing_example.py rename to tests/wpt/tests/tools/third_party/attrs/tests/typing_example.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tests/utils.py b/tests/wpt/tests/tools/third_party/attrs/tests/utils.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tests/utils.py rename to tests/wpt/tests/tools/third_party/attrs/tests/utils.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/attrs/tox.ini b/tests/wpt/tests/tools/third_party/attrs/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/attrs/tox.ini rename to tests/wpt/tests/tools/third_party/attrs/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/LICENSE b/tests/wpt/tests/tools/third_party/certifi/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/LICENSE rename to tests/wpt/tests/tools/third_party/certifi/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/MANIFEST.in b/tests/wpt/tests/tools/third_party/certifi/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/MANIFEST.in rename to tests/wpt/tests/tools/third_party/certifi/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/PKG-INFO b/tests/wpt/tests/tools/third_party/certifi/PKG-INFO similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/PKG-INFO rename to tests/wpt/tests/tools/third_party/certifi/PKG-INFO diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/README.rst b/tests/wpt/tests/tools/third_party/certifi/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/README.rst rename to tests/wpt/tests/tools/third_party/certifi/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/certifi.egg-info/PKG-INFO b/tests/wpt/tests/tools/third_party/certifi/certifi.egg-info/PKG-INFO similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/certifi.egg-info/PKG-INFO rename to tests/wpt/tests/tools/third_party/certifi/certifi.egg-info/PKG-INFO diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/certifi.egg-info/SOURCES.txt b/tests/wpt/tests/tools/third_party/certifi/certifi.egg-info/SOURCES.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/certifi.egg-info/SOURCES.txt rename to tests/wpt/tests/tools/third_party/certifi/certifi.egg-info/SOURCES.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/certifi.egg-info/dependency_links.txt b/tests/wpt/tests/tools/third_party/certifi/certifi.egg-info/dependency_links.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/certifi.egg-info/dependency_links.txt rename to tests/wpt/tests/tools/third_party/certifi/certifi.egg-info/dependency_links.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/certifi.egg-info/not-zip-safe b/tests/wpt/tests/tools/third_party/certifi/certifi.egg-info/not-zip-safe similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/certifi.egg-info/not-zip-safe rename to tests/wpt/tests/tools/third_party/certifi/certifi.egg-info/not-zip-safe diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/certifi.egg-info/top_level.txt b/tests/wpt/tests/tools/third_party/certifi/certifi.egg-info/top_level.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/certifi.egg-info/top_level.txt rename to tests/wpt/tests/tools/third_party/certifi/certifi.egg-info/top_level.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/certifi/__init__.py b/tests/wpt/tests/tools/third_party/certifi/certifi/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/certifi/__init__.py rename to tests/wpt/tests/tools/third_party/certifi/certifi/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/certifi/__main__.py b/tests/wpt/tests/tools/third_party/certifi/certifi/__main__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/certifi/__main__.py rename to tests/wpt/tests/tools/third_party/certifi/certifi/__main__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/certifi/cacert.pem b/tests/wpt/tests/tools/third_party/certifi/certifi/cacert.pem similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/certifi/cacert.pem rename to tests/wpt/tests/tools/third_party/certifi/certifi/cacert.pem diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/certifi/core.py b/tests/wpt/tests/tools/third_party/certifi/certifi/core.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/certifi/core.py rename to tests/wpt/tests/tools/third_party/certifi/certifi/core.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/setup.cfg b/tests/wpt/tests/tools/third_party/certifi/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/setup.cfg rename to tests/wpt/tests/tools/third_party/certifi/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/certifi/setup.py b/tests/wpt/tests/tools/third_party/certifi/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/certifi/setup.py rename to tests/wpt/tests/tools/third_party/certifi/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/.coveragerc b/tests/wpt/tests/tools/third_party/funcsigs/.coveragerc similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/.coveragerc rename to tests/wpt/tests/tools/third_party/funcsigs/.coveragerc diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/.gitignore b/tests/wpt/tests/tools/third_party/funcsigs/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/.gitignore rename to tests/wpt/tests/tools/third_party/funcsigs/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/.travis.yml b/tests/wpt/tests/tools/third_party/funcsigs/.travis.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/.travis.yml rename to tests/wpt/tests/tools/third_party/funcsigs/.travis.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/CHANGELOG b/tests/wpt/tests/tools/third_party/funcsigs/CHANGELOG similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/CHANGELOG rename to tests/wpt/tests/tools/third_party/funcsigs/CHANGELOG diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/LICENSE b/tests/wpt/tests/tools/third_party/funcsigs/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/LICENSE rename to tests/wpt/tests/tools/third_party/funcsigs/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/MANIFEST.in b/tests/wpt/tests/tools/third_party/funcsigs/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/MANIFEST.in rename to tests/wpt/tests/tools/third_party/funcsigs/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/Makefile b/tests/wpt/tests/tools/third_party/funcsigs/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/Makefile rename to tests/wpt/tests/tools/third_party/funcsigs/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/README.rst b/tests/wpt/tests/tools/third_party/funcsigs/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/README.rst rename to tests/wpt/tests/tools/third_party/funcsigs/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/docs/Makefile b/tests/wpt/tests/tools/third_party/funcsigs/docs/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/docs/Makefile rename to tests/wpt/tests/tools/third_party/funcsigs/docs/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/docs/_templates/page.html b/tests/wpt/tests/tools/third_party/funcsigs/docs/_templates/page.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/docs/_templates/page.html rename to tests/wpt/tests/tools/third_party/funcsigs/docs/_templates/page.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/docs/conf.py b/tests/wpt/tests/tools/third_party/funcsigs/docs/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/docs/conf.py rename to tests/wpt/tests/tools/third_party/funcsigs/docs/conf.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/docs/index.rst b/tests/wpt/tests/tools/third_party/funcsigs/docs/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/docs/index.rst rename to tests/wpt/tests/tools/third_party/funcsigs/docs/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/__init__.py b/tests/wpt/tests/tools/third_party/funcsigs/funcsigs/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/__init__.py rename to tests/wpt/tests/tools/third_party/funcsigs/funcsigs/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/version.py b/tests/wpt/tests/tools/third_party/funcsigs/funcsigs/version.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/funcsigs/version.py rename to tests/wpt/tests/tools/third_party/funcsigs/funcsigs/version.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/requirements/development.txt b/tests/wpt/tests/tools/third_party/funcsigs/requirements/development.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/requirements/development.txt rename to tests/wpt/tests/tools/third_party/funcsigs/requirements/development.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/setup.cfg b/tests/wpt/tests/tools/third_party/funcsigs/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/setup.cfg rename to tests/wpt/tests/tools/third_party/funcsigs/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/setup.py b/tests/wpt/tests/tools/third_party/funcsigs/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/setup.py rename to tests/wpt/tests/tools/third_party/funcsigs/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/__init__.py b/tests/wpt/tests/tools/third_party/funcsigs/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/__init__.py rename to tests/wpt/tests/tools/third_party/funcsigs/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_formatannotation.py b/tests/wpt/tests/tools/third_party/funcsigs/tests/test_formatannotation.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_formatannotation.py rename to tests/wpt/tests/tools/third_party/funcsigs/tests/test_formatannotation.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_funcsigs.py b/tests/wpt/tests/tools/third_party/funcsigs/tests/test_funcsigs.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_funcsigs.py rename to tests/wpt/tests/tools/third_party/funcsigs/tests/test_funcsigs.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_inspect.py b/tests/wpt/tests/tools/third_party/funcsigs/tests/test_inspect.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/tests/test_inspect.py rename to tests/wpt/tests/tools/third_party/funcsigs/tests/test_inspect.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/funcsigs/tox.ini b/tests/wpt/tests/tools/third_party/funcsigs/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/funcsigs/tox.ini rename to tests/wpt/tests/tools/third_party/funcsigs/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/.coveragerc b/tests/wpt/tests/tools/third_party/h2/.coveragerc similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/.coveragerc rename to tests/wpt/tests/tools/third_party/h2/.coveragerc diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/CONTRIBUTORS.rst b/tests/wpt/tests/tools/third_party/h2/CONTRIBUTORS.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/CONTRIBUTORS.rst rename to tests/wpt/tests/tools/third_party/h2/CONTRIBUTORS.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/HISTORY.rst b/tests/wpt/tests/tools/third_party/h2/HISTORY.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/HISTORY.rst rename to tests/wpt/tests/tools/third_party/h2/HISTORY.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/LICENSE b/tests/wpt/tests/tools/third_party/h2/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/LICENSE rename to tests/wpt/tests/tools/third_party/h2/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/MANIFEST.in b/tests/wpt/tests/tools/third_party/h2/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/MANIFEST.in rename to tests/wpt/tests/tools/third_party/h2/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/Makefile b/tests/wpt/tests/tools/third_party/h2/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/Makefile rename to tests/wpt/tests/tools/third_party/h2/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/README.rst b/tests/wpt/tests/tools/third_party/h2/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/README.rst rename to tests/wpt/tests/tools/third_party/h2/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/Makefile b/tests/wpt/tests/tools/third_party/h2/docs/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/Makefile rename to tests/wpt/tests/tools/third_party/h2/docs/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/make.bat b/tests/wpt/tests/tools/third_party/h2/docs/make.bat similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/make.bat rename to tests/wpt/tests/tools/third_party/h2/docs/make.bat diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/_static/.keep b/tests/wpt/tests/tools/third_party/h2/docs/source/_static/.keep similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/_static/.keep rename to tests/wpt/tests/tools/third_party/h2/docs/source/_static/.keep diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/_static/h2.connection.H2ConnectionStateMachine.dot.png b/tests/wpt/tests/tools/third_party/h2/docs/source/_static/h2.connection.H2ConnectionStateMachine.dot.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/_static/h2.connection.H2ConnectionStateMachine.dot.png rename to tests/wpt/tests/tools/third_party/h2/docs/source/_static/h2.connection.H2ConnectionStateMachine.dot.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/_static/h2.stream.H2StreamStateMachine.dot.png b/tests/wpt/tests/tools/third_party/h2/docs/source/_static/h2.stream.H2StreamStateMachine.dot.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/_static/h2.stream.H2StreamStateMachine.dot.png rename to tests/wpt/tests/tools/third_party/h2/docs/source/_static/h2.stream.H2StreamStateMachine.dot.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/advanced-usage.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/advanced-usage.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/advanced-usage.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/advanced-usage.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/api.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/api.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/api.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/api.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/asyncio-example.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/asyncio-example.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/asyncio-example.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/asyncio-example.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/basic-usage.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/basic-usage.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/basic-usage.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/basic-usage.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/conf.py b/tests/wpt/tests/tools/third_party/h2/docs/source/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/conf.py rename to tests/wpt/tests/tools/third_party/h2/docs/source/conf.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/contributors.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/contributors.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/contributors.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/contributors.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/curio-example.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/curio-example.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/curio-example.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/curio-example.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/eventlet-example.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/eventlet-example.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/eventlet-example.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/eventlet-example.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/examples.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/examples.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/examples.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/examples.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/index.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/index.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/installation.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/installation.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/installation.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/installation.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/low-level.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/low-level.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/low-level.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/low-level.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/negotiating-http2.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/negotiating-http2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/negotiating-http2.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/negotiating-http2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/release-notes.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/release-notes.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/release-notes.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/release-notes.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/release-process.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/release-process.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/release-process.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/release-process.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/testimonials.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/testimonials.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/testimonials.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/testimonials.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/tornado-example.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/tornado-example.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/tornado-example.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/tornado-example.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/twisted-example.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/twisted-example.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/twisted-example.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/twisted-example.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/twisted-head-example.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/twisted-head-example.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/twisted-head-example.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/twisted-head-example.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/twisted-post-example.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/twisted-post-example.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/twisted-post-example.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/twisted-post-example.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/wsgi-example.rst b/tests/wpt/tests/tools/third_party/h2/docs/source/wsgi-example.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/docs/source/wsgi-example.rst rename to tests/wpt/tests/tools/third_party/h2/docs/source/wsgi-example.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/asyncio-server.py b/tests/wpt/tests/tools/third_party/h2/examples/asyncio/asyncio-server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/asyncio-server.py rename to tests/wpt/tests/tools/third_party/h2/examples/asyncio/asyncio-server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/cert.crt b/tests/wpt/tests/tools/third_party/h2/examples/asyncio/cert.crt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/cert.crt rename to tests/wpt/tests/tools/third_party/h2/examples/asyncio/cert.crt diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/cert.key b/tests/wpt/tests/tools/third_party/h2/examples/asyncio/cert.key similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/cert.key rename to tests/wpt/tests/tools/third_party/h2/examples/asyncio/cert.key diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/wsgi-server.py b/tests/wpt/tests/tools/third_party/h2/examples/asyncio/wsgi-server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/asyncio/wsgi-server.py rename to tests/wpt/tests/tools/third_party/h2/examples/asyncio/wsgi-server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/curio/curio-server.py b/tests/wpt/tests/tools/third_party/h2/examples/curio/curio-server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/curio/curio-server.py rename to tests/wpt/tests/tools/third_party/h2/examples/curio/curio-server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/curio/localhost.crt.pem b/tests/wpt/tests/tools/third_party/h2/examples/curio/localhost.crt.pem similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/curio/localhost.crt.pem rename to tests/wpt/tests/tools/third_party/h2/examples/curio/localhost.crt.pem diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/curio/localhost.key b/tests/wpt/tests/tools/third_party/h2/examples/curio/localhost.key similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/curio/localhost.key rename to tests/wpt/tests/tools/third_party/h2/examples/curio/localhost.key diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/eventlet/eventlet-server.py b/tests/wpt/tests/tools/third_party/h2/examples/eventlet/eventlet-server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/eventlet/eventlet-server.py rename to tests/wpt/tests/tools/third_party/h2/examples/eventlet/eventlet-server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/eventlet/server.crt b/tests/wpt/tests/tools/third_party/h2/examples/eventlet/server.crt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/eventlet/server.crt rename to tests/wpt/tests/tools/third_party/h2/examples/eventlet/server.crt diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/eventlet/server.key b/tests/wpt/tests/tools/third_party/h2/examples/eventlet/server.key similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/eventlet/server.key rename to tests/wpt/tests/tools/third_party/h2/examples/eventlet/server.key diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/client_https_setup_fragment.py b/tests/wpt/tests/tools/third_party/h2/examples/fragments/client_https_setup_fragment.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/client_https_setup_fragment.py rename to tests/wpt/tests/tools/third_party/h2/examples/fragments/client_https_setup_fragment.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/client_upgrade_fragment.py b/tests/wpt/tests/tools/third_party/h2/examples/fragments/client_upgrade_fragment.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/client_upgrade_fragment.py rename to tests/wpt/tests/tools/third_party/h2/examples/fragments/client_upgrade_fragment.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/server_https_setup_fragment.py b/tests/wpt/tests/tools/third_party/h2/examples/fragments/server_https_setup_fragment.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/server_https_setup_fragment.py rename to tests/wpt/tests/tools/third_party/h2/examples/fragments/server_https_setup_fragment.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/server_upgrade_fragment.py b/tests/wpt/tests/tools/third_party/h2/examples/fragments/server_upgrade_fragment.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/fragments/server_upgrade_fragment.py rename to tests/wpt/tests/tools/third_party/h2/examples/fragments/server_upgrade_fragment.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/tornado/server.crt b/tests/wpt/tests/tools/third_party/h2/examples/tornado/server.crt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/tornado/server.crt rename to tests/wpt/tests/tools/third_party/h2/examples/tornado/server.crt diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/tornado/server.key b/tests/wpt/tests/tools/third_party/h2/examples/tornado/server.key similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/tornado/server.key rename to tests/wpt/tests/tools/third_party/h2/examples/tornado/server.key diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/tornado/tornado-server.py b/tests/wpt/tests/tools/third_party/h2/examples/tornado/tornado-server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/tornado/tornado-server.py rename to tests/wpt/tests/tools/third_party/h2/examples/tornado/tornado-server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/head_request.py b/tests/wpt/tests/tools/third_party/h2/examples/twisted/head_request.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/head_request.py rename to tests/wpt/tests/tools/third_party/h2/examples/twisted/head_request.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/post_request.py b/tests/wpt/tests/tools/third_party/h2/examples/twisted/post_request.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/post_request.py rename to tests/wpt/tests/tools/third_party/h2/examples/twisted/post_request.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/server.crt b/tests/wpt/tests/tools/third_party/h2/examples/twisted/server.crt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/server.crt rename to tests/wpt/tests/tools/third_party/h2/examples/twisted/server.crt diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/server.csr b/tests/wpt/tests/tools/third_party/h2/examples/twisted/server.csr similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/server.csr rename to tests/wpt/tests/tools/third_party/h2/examples/twisted/server.csr diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/server.key b/tests/wpt/tests/tools/third_party/h2/examples/twisted/server.key similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/server.key rename to tests/wpt/tests/tools/third_party/h2/examples/twisted/server.key diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/twisted-server.py b/tests/wpt/tests/tools/third_party/h2/examples/twisted/twisted-server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/examples/twisted/twisted-server.py rename to tests/wpt/tests/tools/third_party/h2/examples/twisted/twisted-server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/__init__.py b/tests/wpt/tests/tools/third_party/h2/h2/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/h2/__init__.py rename to tests/wpt/tests/tools/third_party/h2/h2/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/config.py b/tests/wpt/tests/tools/third_party/h2/h2/config.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/h2/config.py rename to tests/wpt/tests/tools/third_party/h2/h2/config.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/connection.py b/tests/wpt/tests/tools/third_party/h2/h2/connection.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/h2/connection.py rename to tests/wpt/tests/tools/third_party/h2/h2/connection.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/errors.py b/tests/wpt/tests/tools/third_party/h2/h2/errors.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/h2/errors.py rename to tests/wpt/tests/tools/third_party/h2/h2/errors.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/events.py b/tests/wpt/tests/tools/third_party/h2/h2/events.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/h2/events.py rename to tests/wpt/tests/tools/third_party/h2/h2/events.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/exceptions.py b/tests/wpt/tests/tools/third_party/h2/h2/exceptions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/h2/exceptions.py rename to tests/wpt/tests/tools/third_party/h2/h2/exceptions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/frame_buffer.py b/tests/wpt/tests/tools/third_party/h2/h2/frame_buffer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/h2/frame_buffer.py rename to tests/wpt/tests/tools/third_party/h2/h2/frame_buffer.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/settings.py b/tests/wpt/tests/tools/third_party/h2/h2/settings.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/h2/settings.py rename to tests/wpt/tests/tools/third_party/h2/h2/settings.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/stream.py b/tests/wpt/tests/tools/third_party/h2/h2/stream.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/h2/stream.py rename to tests/wpt/tests/tools/third_party/h2/h2/stream.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/utilities.py b/tests/wpt/tests/tools/third_party/h2/h2/utilities.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/h2/utilities.py rename to tests/wpt/tests/tools/third_party/h2/h2/utilities.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/h2/windows.py b/tests/wpt/tests/tools/third_party/h2/h2/windows.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/h2/windows.py rename to tests/wpt/tests/tools/third_party/h2/h2/windows.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/setup.cfg b/tests/wpt/tests/tools/third_party/h2/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/setup.cfg rename to tests/wpt/tests/tools/third_party/h2/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/setup.py b/tests/wpt/tests/tools/third_party/h2/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/setup.py rename to tests/wpt/tests/tools/third_party/h2/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/conftest.py b/tests/wpt/tests/tools/third_party/h2/test/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/conftest.py rename to tests/wpt/tests/tools/third_party/h2/test/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/coroutine_tests.py b/tests/wpt/tests/tools/third_party/h2/test/coroutine_tests.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/coroutine_tests.py rename to tests/wpt/tests/tools/third_party/h2/test/coroutine_tests.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/helpers.py b/tests/wpt/tests/tools/third_party/h2/test/helpers.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/helpers.py rename to tests/wpt/tests/tools/third_party/h2/test/helpers.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_basic_logic.py b/tests/wpt/tests/tools/third_party/h2/test/test_basic_logic.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_basic_logic.py rename to tests/wpt/tests/tools/third_party/h2/test/test_basic_logic.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_closed_streams.py b/tests/wpt/tests/tools/third_party/h2/test/test_closed_streams.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_closed_streams.py rename to tests/wpt/tests/tools/third_party/h2/test/test_closed_streams.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_complex_logic.py b/tests/wpt/tests/tools/third_party/h2/test/test_complex_logic.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_complex_logic.py rename to tests/wpt/tests/tools/third_party/h2/test/test_complex_logic.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_config.py b/tests/wpt/tests/tools/third_party/h2/test/test_config.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_config.py rename to tests/wpt/tests/tools/third_party/h2/test/test_config.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_events.py b/tests/wpt/tests/tools/third_party/h2/test/test_events.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_events.py rename to tests/wpt/tests/tools/third_party/h2/test/test_events.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_exceptions.py b/tests/wpt/tests/tools/third_party/h2/test/test_exceptions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_exceptions.py rename to tests/wpt/tests/tools/third_party/h2/test/test_exceptions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_flow_control_window.py b/tests/wpt/tests/tools/third_party/h2/test/test_flow_control_window.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_flow_control_window.py rename to tests/wpt/tests/tools/third_party/h2/test/test_flow_control_window.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_h2_upgrade.py b/tests/wpt/tests/tools/third_party/h2/test/test_h2_upgrade.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_h2_upgrade.py rename to tests/wpt/tests/tools/third_party/h2/test/test_h2_upgrade.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_head_request.py b/tests/wpt/tests/tools/third_party/h2/test/test_head_request.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_head_request.py rename to tests/wpt/tests/tools/third_party/h2/test/test_head_request.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_header_indexing.py b/tests/wpt/tests/tools/third_party/h2/test/test_header_indexing.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_header_indexing.py rename to tests/wpt/tests/tools/third_party/h2/test/test_header_indexing.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_informational_responses.py b/tests/wpt/tests/tools/third_party/h2/test/test_informational_responses.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_informational_responses.py rename to tests/wpt/tests/tools/third_party/h2/test/test_informational_responses.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_interacting_stacks.py b/tests/wpt/tests/tools/third_party/h2/test/test_interacting_stacks.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_interacting_stacks.py rename to tests/wpt/tests/tools/third_party/h2/test/test_interacting_stacks.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_invalid_content_lengths.py b/tests/wpt/tests/tools/third_party/h2/test/test_invalid_content_lengths.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_invalid_content_lengths.py rename to tests/wpt/tests/tools/third_party/h2/test/test_invalid_content_lengths.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_invalid_frame_sequences.py b/tests/wpt/tests/tools/third_party/h2/test/test_invalid_frame_sequences.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_invalid_frame_sequences.py rename to tests/wpt/tests/tools/third_party/h2/test/test_invalid_frame_sequences.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_invalid_headers.py b/tests/wpt/tests/tools/third_party/h2/test/test_invalid_headers.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_invalid_headers.py rename to tests/wpt/tests/tools/third_party/h2/test/test_invalid_headers.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_priority.py b/tests/wpt/tests/tools/third_party/h2/test/test_priority.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_priority.py rename to tests/wpt/tests/tools/third_party/h2/test/test_priority.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_related_events.py b/tests/wpt/tests/tools/third_party/h2/test/test_related_events.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_related_events.py rename to tests/wpt/tests/tools/third_party/h2/test/test_related_events.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_rfc7838.py b/tests/wpt/tests/tools/third_party/h2/test/test_rfc7838.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_rfc7838.py rename to tests/wpt/tests/tools/third_party/h2/test/test_rfc7838.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_settings.py b/tests/wpt/tests/tools/third_party/h2/test/test_settings.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_settings.py rename to tests/wpt/tests/tools/third_party/h2/test/test_settings.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_state_machines.py b/tests/wpt/tests/tools/third_party/h2/test/test_state_machines.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_state_machines.py rename to tests/wpt/tests/tools/third_party/h2/test/test_state_machines.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_stream_reset.py b/tests/wpt/tests/tools/third_party/h2/test/test_stream_reset.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_stream_reset.py rename to tests/wpt/tests/tools/third_party/h2/test/test_stream_reset.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test/test_utility_functions.py b/tests/wpt/tests/tools/third_party/h2/test/test_utility_functions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test/test_utility_functions.py rename to tests/wpt/tests/tools/third_party/h2/test/test_utility_functions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/test_requirements.txt b/tests/wpt/tests/tools/third_party/h2/test_requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/test_requirements.txt rename to tests/wpt/tests/tools/third_party/h2/test_requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/tox.ini b/tests/wpt/tests/tools/third_party/h2/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/tox.ini rename to tests/wpt/tests/tools/third_party/h2/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/utils/backport.sh b/tests/wpt/tests/tools/third_party/h2/utils/backport.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/utils/backport.sh rename to tests/wpt/tests/tools/third_party/h2/utils/backport.sh diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/visualizer/NOTICES.visualizer b/tests/wpt/tests/tools/third_party/h2/visualizer/NOTICES.visualizer similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/visualizer/NOTICES.visualizer rename to tests/wpt/tests/tools/third_party/h2/visualizer/NOTICES.visualizer diff --git a/tests/wpt/web-platform-tests/tools/third_party/h2/visualizer/visualize.py b/tests/wpt/tests/tools/third_party/h2/visualizer/visualize.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/h2/visualizer/visualize.py rename to tests/wpt/tests/tools/third_party/h2/visualizer/visualize.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/CONTRIBUTORS.rst b/tests/wpt/tests/tools/third_party/hpack/CONTRIBUTORS.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/CONTRIBUTORS.rst rename to tests/wpt/tests/tools/third_party/hpack/CONTRIBUTORS.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/HISTORY.rst b/tests/wpt/tests/tools/third_party/hpack/HISTORY.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/HISTORY.rst rename to tests/wpt/tests/tools/third_party/hpack/HISTORY.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/LICENSE b/tests/wpt/tests/tools/third_party/hpack/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/LICENSE rename to tests/wpt/tests/tools/third_party/hpack/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/MANIFEST.in b/tests/wpt/tests/tools/third_party/hpack/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/MANIFEST.in rename to tests/wpt/tests/tools/third_party/hpack/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/PKG-INFO b/tests/wpt/tests/tools/third_party/hpack/PKG-INFO similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/PKG-INFO rename to tests/wpt/tests/tools/third_party/hpack/PKG-INFO diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/README.rst b/tests/wpt/tests/tools/third_party/hpack/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/README.rst rename to tests/wpt/tests/tools/third_party/hpack/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/hpack.egg-info/PKG-INFO b/tests/wpt/tests/tools/third_party/hpack/hpack.egg-info/PKG-INFO similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/hpack.egg-info/PKG-INFO rename to tests/wpt/tests/tools/third_party/hpack/hpack.egg-info/PKG-INFO diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/hpack.egg-info/SOURCES.txt b/tests/wpt/tests/tools/third_party/hpack/hpack.egg-info/SOURCES.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/hpack.egg-info/SOURCES.txt rename to tests/wpt/tests/tools/third_party/hpack/hpack.egg-info/SOURCES.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/hpack.egg-info/dependency_links.txt b/tests/wpt/tests/tools/third_party/hpack/hpack.egg-info/dependency_links.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/hpack.egg-info/dependency_links.txt rename to tests/wpt/tests/tools/third_party/hpack/hpack.egg-info/dependency_links.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/hpack.egg-info/top_level.txt b/tests/wpt/tests/tools/third_party/hpack/hpack.egg-info/top_level.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/hpack.egg-info/top_level.txt rename to tests/wpt/tests/tools/third_party/hpack/hpack.egg-info/top_level.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/__init__.py b/tests/wpt/tests/tools/third_party/hpack/hpack/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/__init__.py rename to tests/wpt/tests/tools/third_party/hpack/hpack/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/compat.py b/tests/wpt/tests/tools/third_party/hpack/hpack/compat.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/compat.py rename to tests/wpt/tests/tools/third_party/hpack/hpack/compat.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/exceptions.py b/tests/wpt/tests/tools/third_party/hpack/hpack/exceptions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/exceptions.py rename to tests/wpt/tests/tools/third_party/hpack/hpack/exceptions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/hpack.py b/tests/wpt/tests/tools/third_party/hpack/hpack/hpack.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/hpack.py rename to tests/wpt/tests/tools/third_party/hpack/hpack/hpack.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/huffman.py b/tests/wpt/tests/tools/third_party/hpack/hpack/huffman.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/huffman.py rename to tests/wpt/tests/tools/third_party/hpack/hpack/huffman.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/huffman_constants.py b/tests/wpt/tests/tools/third_party/hpack/hpack/huffman_constants.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/huffman_constants.py rename to tests/wpt/tests/tools/third_party/hpack/hpack/huffman_constants.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/huffman_table.py b/tests/wpt/tests/tools/third_party/hpack/hpack/huffman_table.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/huffman_table.py rename to tests/wpt/tests/tools/third_party/hpack/hpack/huffman_table.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/struct.py b/tests/wpt/tests/tools/third_party/hpack/hpack/struct.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/struct.py rename to tests/wpt/tests/tools/third_party/hpack/hpack/struct.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/table.py b/tests/wpt/tests/tools/third_party/hpack/hpack/table.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/hpack/table.py rename to tests/wpt/tests/tools/third_party/hpack/hpack/table.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/setup.cfg b/tests/wpt/tests/tools/third_party/hpack/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/setup.cfg rename to tests/wpt/tests/tools/third_party/hpack/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/setup.py b/tests/wpt/tests/tools/third_party/hpack/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/setup.py rename to tests/wpt/tests/tools/third_party/hpack/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/test/test_encode_decode.py b/tests/wpt/tests/tools/third_party/hpack/test/test_encode_decode.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/test/test_encode_decode.py rename to tests/wpt/tests/tools/third_party/hpack/test/test_encode_decode.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/test/test_hpack.py b/tests/wpt/tests/tools/third_party/hpack/test/test_hpack.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/test/test_hpack.py rename to tests/wpt/tests/tools/third_party/hpack/test/test_hpack.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/test/test_hpack_integration.py b/tests/wpt/tests/tools/third_party/hpack/test/test_hpack_integration.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/test/test_hpack_integration.py rename to tests/wpt/tests/tools/third_party/hpack/test/test_hpack_integration.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/test/test_huffman.py b/tests/wpt/tests/tools/third_party/hpack/test/test_huffman.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/test/test_huffman.py rename to tests/wpt/tests/tools/third_party/hpack/test/test_huffman.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/test/test_struct.py b/tests/wpt/tests/tools/third_party/hpack/test/test_struct.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/test/test_struct.py rename to tests/wpt/tests/tools/third_party/hpack/test/test_struct.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hpack/test/test_table.py b/tests/wpt/tests/tools/third_party/hpack/test/test_table.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hpack/test/test_table.py rename to tests/wpt/tests/tools/third_party/hpack/test/test_table.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/.appveyor.yml b/tests/wpt/tests/tools/third_party/html5lib/.appveyor.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/.appveyor.yml rename to tests/wpt/tests/tools/third_party/html5lib/.appveyor.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/.coveragerc b/tests/wpt/tests/tools/third_party/html5lib/.coveragerc similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/.coveragerc rename to tests/wpt/tests/tools/third_party/html5lib/.coveragerc diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/.gitignore b/tests/wpt/tests/tools/third_party/html5lib/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/.gitignore rename to tests/wpt/tests/tools/third_party/html5lib/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/.gitmodules b/tests/wpt/tests/tools/third_party/html5lib/.gitmodules similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/.gitmodules rename to tests/wpt/tests/tools/third_party/html5lib/.gitmodules diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/.prospector.yaml b/tests/wpt/tests/tools/third_party/html5lib/.prospector.yaml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/.prospector.yaml rename to tests/wpt/tests/tools/third_party/html5lib/.prospector.yaml diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/.pylintrc b/tests/wpt/tests/tools/third_party/html5lib/.pylintrc similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/.pylintrc rename to tests/wpt/tests/tools/third_party/html5lib/.pylintrc diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/.pytest.expect b/tests/wpt/tests/tools/third_party/html5lib/.pytest.expect similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/.pytest.expect rename to tests/wpt/tests/tools/third_party/html5lib/.pytest.expect diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/.travis.yml b/tests/wpt/tests/tools/third_party/html5lib/.travis.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/.travis.yml rename to tests/wpt/tests/tools/third_party/html5lib/.travis.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/AUTHORS.rst b/tests/wpt/tests/tools/third_party/html5lib/AUTHORS.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/AUTHORS.rst rename to tests/wpt/tests/tools/third_party/html5lib/AUTHORS.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/CHANGES.rst b/tests/wpt/tests/tools/third_party/html5lib/CHANGES.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/CHANGES.rst rename to tests/wpt/tests/tools/third_party/html5lib/CHANGES.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/CONTRIBUTING.rst b/tests/wpt/tests/tools/third_party/html5lib/CONTRIBUTING.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/CONTRIBUTING.rst rename to tests/wpt/tests/tools/third_party/html5lib/CONTRIBUTING.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/LICENSE b/tests/wpt/tests/tools/third_party/html5lib/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/LICENSE rename to tests/wpt/tests/tools/third_party/html5lib/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/MANIFEST.in b/tests/wpt/tests/tools/third_party/html5lib/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/MANIFEST.in rename to tests/wpt/tests/tools/third_party/html5lib/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/README.rst b/tests/wpt/tests/tools/third_party/html5lib/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/README.rst rename to tests/wpt/tests/tools/third_party/html5lib/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/bench_html.py b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/bench_html.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/bench_html.py rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/bench_html.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/bench_wpt.py b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/bench_wpt.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/bench_wpt.py rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/bench_wpt.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/README.md b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/README.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/README.md rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/README.md diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/html.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/html.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/html.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/html.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/LICENSE.md b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/LICENSE.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/LICENSE.md rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/LICENSE.md diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/README.md b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/README.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/README.md rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/README.md diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/001.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/001.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/001.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/001.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/background-origin-007-ref.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/background-origin-007-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/background-origin-007-ref.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/background-origin-007-ref.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/background_shorthand_css_relative_url.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/background_shorthand_css_relative_url.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/background_shorthand_css_relative_url.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/background_shorthand_css_relative_url.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/beforeunload-on-history-back-1.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/beforeunload-on-history-back-1.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/beforeunload-on-history-back-1.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/beforeunload-on-history-back-1.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/euckr-encode-form.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/euckr-encode-form.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/euckr-encode-form.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/euckr-encode-form.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/frame-ancestors-self-allow.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/frame-ancestors-self-allow.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/frame-ancestors-self-allow.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/frame-ancestors-self-allow.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/grouping-dl.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/grouping-dl.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/grouping-dl.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/grouping-dl.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/heavy-styling-005.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/heavy-styling-005.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/heavy-styling-005.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/heavy-styling-005.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/htb-ltr-ltr.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/htb-ltr-ltr.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/htb-ltr-ltr.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/htb-ltr-ltr.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/idbindex_get8.htm b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/idbindex_get8.htm similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/idbindex_get8.htm rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/idbindex_get8.htm diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/idlharness.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/idlharness.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/idlharness.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/idlharness.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/li-type-unsupported-ref.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/li-type-unsupported-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/li-type-unsupported-ref.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/li-type-unsupported-ref.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/moz-css21-float-page-break-inside-avoid-6.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/moz-css21-float-page-break-inside-avoid-6.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/moz-css21-float-page-break-inside-avoid-6.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/moz-css21-float-page-break-inside-avoid-6.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/shape-outside-content-box-002.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/shape-outside-content-box-002.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/shape-outside-content-box-002.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/shape-outside-content-box-002.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/worker-constructor.https.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/worker-constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/random/worker-constructor.https.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/random/worker-constructor.https.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/2d.composite.image.destination-over.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/2d.composite.image.destination-over.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/2d.composite.image.destination-over.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/2d.composite.image.destination-over.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/align-content-wrap-002.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/align-content-wrap-002.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/align-content-wrap-002.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/align-content-wrap-002.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/big5_chars_extra.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/big5_chars_extra.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/big5_chars_extra.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/big5_chars_extra.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/fetch.http.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/fetch.http.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/fetch.http.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/fetch.http.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/filter-turbulence-invalid-001.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/filter-turbulence-invalid-001.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/filter-turbulence-invalid-001.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/filter-turbulence-invalid-001.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/grid-auto-fill-rows-001.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/grid-auto-fill-rows-001.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/grid-auto-fill-rows-001.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/grid-auto-fill-rows-001.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/image-orientation-from-image-content-images-ref.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/image-orientation-from-image-content-images-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/image-orientation-from-image-content-images-ref.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/image-orientation-from-image-content-images-ref.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/masonry-item-placement-006.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/masonry-item-placement-006.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/masonry-item-placement-006.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/masonry-item-placement-006.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/moz-css21-table-page-break-inside-avoid-2.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/moz-css21-table-page-break-inside-avoid-2.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/moz-css21-table-page-break-inside-avoid-2.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/moz-css21-table-page-break-inside-avoid-2.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/position-sticky-table-th-bottom-ref.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/position-sticky-table-th-bottom-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/position-sticky-table-th-bottom-ref.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/position-sticky-table-th-bottom-ref.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/pre-float-001.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/pre-float-001.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/pre-float-001.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/pre-float-001.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/resize-004.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/resize-004.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/resize-004.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/resize-004.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/test-plan.src.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/test-plan.src.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/test-plan.src.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/test-plan.src.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/toBlob.png.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/toBlob.png.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/toBlob.png.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/toBlob.png.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/will-change-abspos-cb-001.html b/tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/will-change-abspos-cb-001.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/will-change-abspos-cb-001.html rename to tests/wpt/tests/tools/third_party/html5lib/benchmarks/data/wpt/weighted/will-change-abspos-cb-001.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/debug-info.py b/tests/wpt/tests/tools/third_party/html5lib/debug-info.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/debug-info.py rename to tests/wpt/tests/tools/third_party/html5lib/debug-info.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/Makefile b/tests/wpt/tests/tools/third_party/html5lib/doc/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/Makefile rename to tests/wpt/tests/tools/third_party/html5lib/doc/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/changes.rst b/tests/wpt/tests/tools/third_party/html5lib/doc/changes.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/changes.rst rename to tests/wpt/tests/tools/third_party/html5lib/doc/changes.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/conf.py b/tests/wpt/tests/tools/third_party/html5lib/doc/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/conf.py rename to tests/wpt/tests/tools/third_party/html5lib/doc/conf.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/html5lib.filters.rst b/tests/wpt/tests/tools/third_party/html5lib/doc/html5lib.filters.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/html5lib.filters.rst rename to tests/wpt/tests/tools/third_party/html5lib/doc/html5lib.filters.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/html5lib.rst b/tests/wpt/tests/tools/third_party/html5lib/doc/html5lib.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/html5lib.rst rename to tests/wpt/tests/tools/third_party/html5lib/doc/html5lib.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/html5lib.treeadapters.rst b/tests/wpt/tests/tools/third_party/html5lib/doc/html5lib.treeadapters.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/html5lib.treeadapters.rst rename to tests/wpt/tests/tools/third_party/html5lib/doc/html5lib.treeadapters.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/html5lib.treebuilders.rst b/tests/wpt/tests/tools/third_party/html5lib/doc/html5lib.treebuilders.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/html5lib.treebuilders.rst rename to tests/wpt/tests/tools/third_party/html5lib/doc/html5lib.treebuilders.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/html5lib.treewalkers.rst b/tests/wpt/tests/tools/third_party/html5lib/doc/html5lib.treewalkers.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/html5lib.treewalkers.rst rename to tests/wpt/tests/tools/third_party/html5lib/doc/html5lib.treewalkers.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/index.rst b/tests/wpt/tests/tools/third_party/html5lib/doc/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/index.rst rename to tests/wpt/tests/tools/third_party/html5lib/doc/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/license.rst b/tests/wpt/tests/tools/third_party/html5lib/doc/license.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/license.rst rename to tests/wpt/tests/tools/third_party/html5lib/doc/license.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/make.bat b/tests/wpt/tests/tools/third_party/html5lib/doc/make.bat similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/make.bat rename to tests/wpt/tests/tools/third_party/html5lib/doc/make.bat diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/modules.rst b/tests/wpt/tests/tools/third_party/html5lib/doc/modules.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/modules.rst rename to tests/wpt/tests/tools/third_party/html5lib/doc/modules.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/movingparts.rst b/tests/wpt/tests/tools/third_party/html5lib/doc/movingparts.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/doc/movingparts.rst rename to tests/wpt/tests/tools/third_party/html5lib/doc/movingparts.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/flake8-run.sh b/tests/wpt/tests/tools/third_party/html5lib/flake8-run.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/flake8-run.sh rename to tests/wpt/tests/tools/third_party/html5lib/flake8-run.sh diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/__init__.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/__init__.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/_ihatexml.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/_ihatexml.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/_ihatexml.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/_ihatexml.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/_inputstream.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/_inputstream.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/_inputstream.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/_inputstream.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/_tokenizer.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/_tokenizer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/_tokenizer.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/_tokenizer.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/_trie/__init__.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/_trie/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/_trie/__init__.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/_trie/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/_trie/_base.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/_trie/_base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/_trie/_base.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/_trie/_base.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/_trie/py.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/_trie/py.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/_trie/py.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/_trie/py.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/_utils.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/_utils.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/_utils.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/_utils.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/constants.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/constants.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/constants.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/constants.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/__init__.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/__init__.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/alphabeticalattributes.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/alphabeticalattributes.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/alphabeticalattributes.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/alphabeticalattributes.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/base.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/base.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/base.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/inject_meta_charset.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/inject_meta_charset.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/inject_meta_charset.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/inject_meta_charset.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/lint.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/lint.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/lint.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/lint.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/optionaltags.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/optionaltags.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/optionaltags.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/optionaltags.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/sanitizer.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/sanitizer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/sanitizer.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/sanitizer.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/whitespace.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/whitespace.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/filters/whitespace.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/filters/whitespace.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/html5parser.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/html5parser.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/html5parser.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/html5parser.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/serializer.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/serializer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/serializer.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/serializer.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/__init__.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/__init__.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/conftest.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/conftest.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/sanitizer-testdata/tests1.dat b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/sanitizer-testdata/tests1.dat similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/sanitizer-testdata/tests1.dat rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/sanitizer-testdata/tests1.dat diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/sanitizer.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/sanitizer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/sanitizer.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/sanitizer.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/core.test b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/core.test similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/core.test rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/core.test diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/injectmeta.test b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/injectmeta.test similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/injectmeta.test rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/injectmeta.test diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/optionaltags.test b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/optionaltags.test similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/optionaltags.test rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/optionaltags.test diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/options.test b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/options.test similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/options.test rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/options.test diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/whitespace.test b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/whitespace.test similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/whitespace.test rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/serializer-testdata/whitespace.test diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/support.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/support.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/support.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/support.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_alphabeticalattributes.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_alphabeticalattributes.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_alphabeticalattributes.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_alphabeticalattributes.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_encoding.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_encoding.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_encoding.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_encoding.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_meta.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_meta.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_meta.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_meta.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_optionaltags_filter.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_optionaltags_filter.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_optionaltags_filter.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_optionaltags_filter.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_parser2.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_parser2.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_parser2.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_parser2.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_sanitizer.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_sanitizer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_sanitizer.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_sanitizer.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_serializer.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_serializer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_serializer.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_serializer.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_stream.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_stream.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_stream.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_stream.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_tokenizer2.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_tokenizer2.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_tokenizer2.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_tokenizer2.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_treeadapters.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_treeadapters.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_treeadapters.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_treeadapters.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_treewalkers.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_treewalkers.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_treewalkers.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_treewalkers.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_whitespace_filter.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_whitespace_filter.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/test_whitespace_filter.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/test_whitespace_filter.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/tokenizer.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/tokenizer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/tokenizer.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/tokenizer.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/tokenizertotree.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/tokenizertotree.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/tokenizertotree.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/tokenizertotree.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/tree_construction.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/tree_construction.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/tree_construction.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/tree_construction.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/us-ascii.html b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/us-ascii.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/us-ascii.html rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/us-ascii.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/utf-8-bom.html b/tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/utf-8-bom.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/tests/utf-8-bom.html rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/tests/utf-8-bom.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treeadapters/__init__.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/treeadapters/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treeadapters/__init__.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/treeadapters/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treeadapters/genshi.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/treeadapters/genshi.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treeadapters/genshi.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/treeadapters/genshi.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treeadapters/sax.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/treeadapters/sax.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treeadapters/sax.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/treeadapters/sax.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treebuilders/__init__.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/treebuilders/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treebuilders/__init__.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/treebuilders/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treebuilders/base.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/treebuilders/base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treebuilders/base.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/treebuilders/base.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/treebuilders/dom.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treebuilders/etree.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/treebuilders/etree.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treebuilders/etree.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/treebuilders/etree.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treebuilders/etree_lxml.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/treebuilders/etree_lxml.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treebuilders/etree_lxml.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/treebuilders/etree_lxml.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treewalkers/__init__.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/treewalkers/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treewalkers/__init__.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/treewalkers/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treewalkers/base.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/treewalkers/base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treewalkers/base.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/treewalkers/base.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treewalkers/dom.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/treewalkers/dom.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treewalkers/dom.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/treewalkers/dom.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treewalkers/etree.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/treewalkers/etree.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treewalkers/etree.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/treewalkers/etree.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treewalkers/etree_lxml.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/treewalkers/etree_lxml.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treewalkers/etree_lxml.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/treewalkers/etree_lxml.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treewalkers/genshi.py b/tests/wpt/tests/tools/third_party/html5lib/html5lib/treewalkers/genshi.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/html5lib/treewalkers/genshi.py rename to tests/wpt/tests/tools/third_party/html5lib/html5lib/treewalkers/genshi.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/parse.py b/tests/wpt/tests/tools/third_party/html5lib/parse.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/parse.py rename to tests/wpt/tests/tools/third_party/html5lib/parse.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/pytest.ini b/tests/wpt/tests/tools/third_party/html5lib/pytest.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/pytest.ini rename to tests/wpt/tests/tools/third_party/html5lib/pytest.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/requirements-install.sh b/tests/wpt/tests/tools/third_party/html5lib/requirements-install.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/requirements-install.sh rename to tests/wpt/tests/tools/third_party/html5lib/requirements-install.sh diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/requirements-optional.txt b/tests/wpt/tests/tools/third_party/html5lib/requirements-optional.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/requirements-optional.txt rename to tests/wpt/tests/tools/third_party/html5lib/requirements-optional.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/requirements-test.txt b/tests/wpt/tests/tools/third_party/html5lib/requirements-test.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/requirements-test.txt rename to tests/wpt/tests/tools/third_party/html5lib/requirements-test.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/requirements.txt b/tests/wpt/tests/tools/third_party/html5lib/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/requirements.txt rename to tests/wpt/tests/tools/third_party/html5lib/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/setup.cfg b/tests/wpt/tests/tools/third_party/html5lib/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/setup.cfg rename to tests/wpt/tests/tools/third_party/html5lib/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/setup.py b/tests/wpt/tests/tools/third_party/html5lib/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/setup.py rename to tests/wpt/tests/tools/third_party/html5lib/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/tox.ini b/tests/wpt/tests/tools/third_party/html5lib/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/tox.ini rename to tests/wpt/tests/tools/third_party/html5lib/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/html5lib/utils/entities.py b/tests/wpt/tests/tools/third_party/html5lib/utils/entities.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/html5lib/utils/entities.py rename to tests/wpt/tests/tools/third_party/html5lib/utils/entities.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/CONTRIBUTORS.rst b/tests/wpt/tests/tools/third_party/hyperframe/CONTRIBUTORS.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/CONTRIBUTORS.rst rename to tests/wpt/tests/tools/third_party/hyperframe/CONTRIBUTORS.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/HISTORY.rst b/tests/wpt/tests/tools/third_party/hyperframe/HISTORY.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/HISTORY.rst rename to tests/wpt/tests/tools/third_party/hyperframe/HISTORY.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/LICENSE b/tests/wpt/tests/tools/third_party/hyperframe/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/LICENSE rename to tests/wpt/tests/tools/third_party/hyperframe/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/MANIFEST.in b/tests/wpt/tests/tools/third_party/hyperframe/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/MANIFEST.in rename to tests/wpt/tests/tools/third_party/hyperframe/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/PKG-INFO b/tests/wpt/tests/tools/third_party/hyperframe/PKG-INFO similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/PKG-INFO rename to tests/wpt/tests/tools/third_party/hyperframe/PKG-INFO diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/README.rst b/tests/wpt/tests/tools/third_party/hyperframe/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/README.rst rename to tests/wpt/tests/tools/third_party/hyperframe/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe.egg-info/PKG-INFO b/tests/wpt/tests/tools/third_party/hyperframe/hyperframe.egg-info/PKG-INFO similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe.egg-info/PKG-INFO rename to tests/wpt/tests/tools/third_party/hyperframe/hyperframe.egg-info/PKG-INFO diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe.egg-info/SOURCES.txt b/tests/wpt/tests/tools/third_party/hyperframe/hyperframe.egg-info/SOURCES.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe.egg-info/SOURCES.txt rename to tests/wpt/tests/tools/third_party/hyperframe/hyperframe.egg-info/SOURCES.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe.egg-info/dependency_links.txt b/tests/wpt/tests/tools/third_party/hyperframe/hyperframe.egg-info/dependency_links.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe.egg-info/dependency_links.txt rename to tests/wpt/tests/tools/third_party/hyperframe/hyperframe.egg-info/dependency_links.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe.egg-info/top_level.txt b/tests/wpt/tests/tools/third_party/hyperframe/hyperframe.egg-info/top_level.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe.egg-info/top_level.txt rename to tests/wpt/tests/tools/third_party/hyperframe/hyperframe.egg-info/top_level.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/__init__.py b/tests/wpt/tests/tools/third_party/hyperframe/hyperframe/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/__init__.py rename to tests/wpt/tests/tools/third_party/hyperframe/hyperframe/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/exceptions.py b/tests/wpt/tests/tools/third_party/hyperframe/hyperframe/exceptions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/exceptions.py rename to tests/wpt/tests/tools/third_party/hyperframe/hyperframe/exceptions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/flags.py b/tests/wpt/tests/tools/third_party/hyperframe/hyperframe/flags.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/flags.py rename to tests/wpt/tests/tools/third_party/hyperframe/hyperframe/flags.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/frame.py b/tests/wpt/tests/tools/third_party/hyperframe/hyperframe/frame.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/hyperframe/frame.py rename to tests/wpt/tests/tools/third_party/hyperframe/hyperframe/frame.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/setup.cfg b/tests/wpt/tests/tools/third_party/hyperframe/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/setup.cfg rename to tests/wpt/tests/tools/third_party/hyperframe/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/setup.py b/tests/wpt/tests/tools/third_party/hyperframe/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/setup.py rename to tests/wpt/tests/tools/third_party/hyperframe/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/test/test_flags.py b/tests/wpt/tests/tools/third_party/hyperframe/test/test_flags.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/test/test_flags.py rename to tests/wpt/tests/tools/third_party/hyperframe/test/test_flags.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/hyperframe/test/test_frames.py b/tests/wpt/tests/tools/third_party/hyperframe/test/test_frames.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/hyperframe/test/test_frames.py rename to tests/wpt/tests/tools/third_party/hyperframe/test/test_frames.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.github/workflows/main.yml b/tests/wpt/tests/tools/third_party/importlib_metadata/.github/workflows/main.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.github/workflows/main.yml rename to tests/wpt/tests/tools/third_party/importlib_metadata/.github/workflows/main.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.gitignore b/tests/wpt/tests/tools/third_party/importlib_metadata/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.gitignore rename to tests/wpt/tests/tools/third_party/importlib_metadata/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.readthedocs.yml b/tests/wpt/tests/tools/third_party/importlib_metadata/.readthedocs.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/.readthedocs.yml rename to tests/wpt/tests/tools/third_party/importlib_metadata/.readthedocs.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/LICENSE b/tests/wpt/tests/tools/third_party/importlib_metadata/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/LICENSE rename to tests/wpt/tests/tools/third_party/importlib_metadata/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/MANIFEST.in b/tests/wpt/tests/tools/third_party/importlib_metadata/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/MANIFEST.in rename to tests/wpt/tests/tools/third_party/importlib_metadata/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/README.rst b/tests/wpt/tests/tools/third_party/importlib_metadata/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/README.rst rename to tests/wpt/tests/tools/third_party/importlib_metadata/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/codecov.yml b/tests/wpt/tests/tools/third_party/importlib_metadata/codecov.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/codecov.yml rename to tests/wpt/tests/tools/third_party/importlib_metadata/codecov.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/coverage.ini b/tests/wpt/tests/tools/third_party/importlib_metadata/coverage.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/coverage.ini rename to tests/wpt/tests/tools/third_party/importlib_metadata/coverage.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/coverplug.py b/tests/wpt/tests/tools/third_party/importlib_metadata/coverplug.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/coverplug.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/coverplug.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/__init__.py b/tests/wpt/tests/tools/third_party/importlib_metadata/docs/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/__init__.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/docs/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/changelog.rst b/tests/wpt/tests/tools/third_party/importlib_metadata/docs/changelog.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/changelog.rst rename to tests/wpt/tests/tools/third_party/importlib_metadata/docs/changelog.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/conf.py b/tests/wpt/tests/tools/third_party/importlib_metadata/docs/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/conf.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/docs/conf.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/index.rst b/tests/wpt/tests/tools/third_party/importlib_metadata/docs/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/index.rst rename to tests/wpt/tests/tools/third_party/importlib_metadata/docs/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/using.rst b/tests/wpt/tests/tools/third_party/importlib_metadata/docs/using.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/docs/using.rst rename to tests/wpt/tests/tools/third_party/importlib_metadata/docs/using.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/importlib_metadata/__init__.py b/tests/wpt/tests/tools/third_party/importlib_metadata/importlib_metadata/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/importlib_metadata/__init__.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/importlib_metadata/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/importlib_metadata/_compat.py b/tests/wpt/tests/tools/third_party/importlib_metadata/importlib_metadata/_compat.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/importlib_metadata/_compat.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/importlib_metadata/_compat.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/prepare/example/example/__init__.py b/tests/wpt/tests/tools/third_party/importlib_metadata/prepare/example/example/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/prepare/example/example/__init__.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/prepare/example/example/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/prepare/example/setup.py b/tests/wpt/tests/tools/third_party/importlib_metadata/prepare/example/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/prepare/example/setup.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/prepare/example/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/pyproject.toml b/tests/wpt/tests/tools/third_party/importlib_metadata/pyproject.toml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/pyproject.toml rename to tests/wpt/tests/tools/third_party/importlib_metadata/pyproject.toml diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/setup.cfg b/tests/wpt/tests/tools/third_party/importlib_metadata/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/setup.cfg rename to tests/wpt/tests/tools/third_party/importlib_metadata/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/setup.py b/tests/wpt/tests/tools/third_party/importlib_metadata/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/setup.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/__init__.py b/tests/wpt/tests/tools/third_party/importlib_metadata/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/__init__.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/__init__.py b/tests/wpt/tests/tools/third_party/importlib_metadata/tests/data/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/__init__.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/tests/data/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/example-21.12-py3-none-any.whl b/tests/wpt/tests/tools/third_party/importlib_metadata/tests/data/example-21.12-py3-none-any.whl similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/example-21.12-py3-none-any.whl rename to tests/wpt/tests/tools/third_party/importlib_metadata/tests/data/example-21.12-py3-none-any.whl diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/example-21.12-py3.6.egg b/tests/wpt/tests/tools/third_party/importlib_metadata/tests/data/example-21.12-py3.6.egg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/data/example-21.12-py3.6.egg rename to tests/wpt/tests/tools/third_party/importlib_metadata/tests/data/example-21.12-py3.6.egg diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/fixtures.py b/tests/wpt/tests/tools/third_party/importlib_metadata/tests/fixtures.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/fixtures.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/tests/fixtures.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/py39compat.py b/tests/wpt/tests/tools/third_party/importlib_metadata/tests/py39compat.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/py39compat.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/tests/py39compat.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_api.py b/tests/wpt/tests/tools/third_party/importlib_metadata/tests/test_api.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_api.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/tests/test_api.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_integration.py b/tests/wpt/tests/tools/third_party/importlib_metadata/tests/test_integration.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_integration.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/tests/test_integration.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_main.py b/tests/wpt/tests/tools/third_party/importlib_metadata/tests/test_main.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_main.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/tests/test_main.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_zip.py b/tests/wpt/tests/tools/third_party/importlib_metadata/tests/test_zip.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tests/test_zip.py rename to tests/wpt/tests/tools/third_party/importlib_metadata/tests/test_zip.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tox.ini b/tests/wpt/tests/tools/third_party/importlib_metadata/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/importlib_metadata/tox.ini rename to tests/wpt/tests/tools/third_party/importlib_metadata/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/.gitignore b/tests/wpt/tests/tools/third_party/iniconfig/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/.gitignore rename to tests/wpt/tests/tools/third_party/iniconfig/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/.hgignore b/tests/wpt/tests/tools/third_party/iniconfig/.hgignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/.hgignore rename to tests/wpt/tests/tools/third_party/iniconfig/.hgignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/.landscape.yml b/tests/wpt/tests/tools/third_party/iniconfig/.landscape.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/.landscape.yml rename to tests/wpt/tests/tools/third_party/iniconfig/.landscape.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/.travis.yml b/tests/wpt/tests/tools/third_party/iniconfig/.travis.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/.travis.yml rename to tests/wpt/tests/tools/third_party/iniconfig/.travis.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/CHANGELOG b/tests/wpt/tests/tools/third_party/iniconfig/CHANGELOG similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/CHANGELOG rename to tests/wpt/tests/tools/third_party/iniconfig/CHANGELOG diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/LICENSE b/tests/wpt/tests/tools/third_party/iniconfig/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/LICENSE rename to tests/wpt/tests/tools/third_party/iniconfig/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/MANIFEST.in b/tests/wpt/tests/tools/third_party/iniconfig/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/MANIFEST.in rename to tests/wpt/tests/tools/third_party/iniconfig/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/README.txt b/tests/wpt/tests/tools/third_party/iniconfig/README.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/README.txt rename to tests/wpt/tests/tools/third_party/iniconfig/README.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/example.ini b/tests/wpt/tests/tools/third_party/iniconfig/example.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/example.ini rename to tests/wpt/tests/tools/third_party/iniconfig/example.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/pyproject.toml b/tests/wpt/tests/tools/third_party/iniconfig/pyproject.toml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/pyproject.toml rename to tests/wpt/tests/tools/third_party/iniconfig/pyproject.toml diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/setup.cfg b/tests/wpt/tests/tools/third_party/iniconfig/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/setup.cfg rename to tests/wpt/tests/tools/third_party/iniconfig/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/setup.py b/tests/wpt/tests/tools/third_party/iniconfig/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/setup.py rename to tests/wpt/tests/tools/third_party/iniconfig/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/src/iniconfig/__init__.py b/tests/wpt/tests/tools/third_party/iniconfig/src/iniconfig/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/src/iniconfig/__init__.py rename to tests/wpt/tests/tools/third_party/iniconfig/src/iniconfig/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/src/iniconfig/__init__.pyi b/tests/wpt/tests/tools/third_party/iniconfig/src/iniconfig/__init__.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/src/iniconfig/__init__.pyi rename to tests/wpt/tests/tools/third_party/iniconfig/src/iniconfig/__init__.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/src/iniconfig/py.typed b/tests/wpt/tests/tools/third_party/iniconfig/src/iniconfig/py.typed similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/src/iniconfig/py.typed rename to tests/wpt/tests/tools/third_party/iniconfig/src/iniconfig/py.typed diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/testing/conftest.py b/tests/wpt/tests/tools/third_party/iniconfig/testing/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/testing/conftest.py rename to tests/wpt/tests/tools/third_party/iniconfig/testing/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/testing/test_iniconfig.py b/tests/wpt/tests/tools/third_party/iniconfig/testing/test_iniconfig.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/testing/test_iniconfig.py rename to tests/wpt/tests/tools/third_party/iniconfig/testing/test_iniconfig.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/iniconfig/tox.ini b/tests/wpt/tests/tools/third_party/iniconfig/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/iniconfig/tox.ini rename to tests/wpt/tests/tools/third_party/iniconfig/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/.gitattributes b/tests/wpt/tests/tools/third_party/more-itertools/.gitattributes similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/.gitattributes rename to tests/wpt/tests/tools/third_party/more-itertools/.gitattributes diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/.gitignore b/tests/wpt/tests/tools/third_party/more-itertools/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/.gitignore rename to tests/wpt/tests/tools/third_party/more-itertools/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/.travis.yml b/tests/wpt/tests/tools/third_party/more-itertools/.travis.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/.travis.yml rename to tests/wpt/tests/tools/third_party/more-itertools/.travis.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/LICENSE b/tests/wpt/tests/tools/third_party/more-itertools/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/LICENSE rename to tests/wpt/tests/tools/third_party/more-itertools/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/MANIFEST.in b/tests/wpt/tests/tools/third_party/more-itertools/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/MANIFEST.in rename to tests/wpt/tests/tools/third_party/more-itertools/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/README.rst b/tests/wpt/tests/tools/third_party/more-itertools/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/README.rst rename to tests/wpt/tests/tools/third_party/more-itertools/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/Makefile b/tests/wpt/tests/tools/third_party/more-itertools/docs/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/Makefile rename to tests/wpt/tests/tools/third_party/more-itertools/docs/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/api.rst b/tests/wpt/tests/tools/third_party/more-itertools/docs/api.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/api.rst rename to tests/wpt/tests/tools/third_party/more-itertools/docs/api.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/conf.py b/tests/wpt/tests/tools/third_party/more-itertools/docs/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/conf.py rename to tests/wpt/tests/tools/third_party/more-itertools/docs/conf.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/index.rst b/tests/wpt/tests/tools/third_party/more-itertools/docs/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/index.rst rename to tests/wpt/tests/tools/third_party/more-itertools/docs/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/license.rst b/tests/wpt/tests/tools/third_party/more-itertools/docs/license.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/license.rst rename to tests/wpt/tests/tools/third_party/more-itertools/docs/license.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/make.bat b/tests/wpt/tests/tools/third_party/more-itertools/docs/make.bat similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/make.bat rename to tests/wpt/tests/tools/third_party/more-itertools/docs/make.bat diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/testing.rst b/tests/wpt/tests/tools/third_party/more-itertools/docs/testing.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/testing.rst rename to tests/wpt/tests/tools/third_party/more-itertools/docs/testing.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/versions.rst b/tests/wpt/tests/tools/third_party/more-itertools/docs/versions.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/docs/versions.rst rename to tests/wpt/tests/tools/third_party/more-itertools/docs/versions.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/more_itertools/__init__.py b/tests/wpt/tests/tools/third_party/more-itertools/more_itertools/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/more_itertools/__init__.py rename to tests/wpt/tests/tools/third_party/more-itertools/more_itertools/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/more_itertools/more.py b/tests/wpt/tests/tools/third_party/more-itertools/more_itertools/more.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/more_itertools/more.py rename to tests/wpt/tests/tools/third_party/more-itertools/more_itertools/more.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/more_itertools/recipes.py b/tests/wpt/tests/tools/third_party/more-itertools/more_itertools/recipes.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/more_itertools/recipes.py rename to tests/wpt/tests/tools/third_party/more-itertools/more_itertools/recipes.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/more_itertools/tests/__init__.py b/tests/wpt/tests/tools/third_party/more-itertools/more_itertools/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/more_itertools/tests/__init__.py rename to tests/wpt/tests/tools/third_party/more-itertools/more_itertools/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/more_itertools/tests/test_more.py b/tests/wpt/tests/tools/third_party/more-itertools/more_itertools/tests/test_more.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/more_itertools/tests/test_more.py rename to tests/wpt/tests/tools/third_party/more-itertools/more_itertools/tests/test_more.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/more_itertools/tests/test_recipes.py b/tests/wpt/tests/tools/third_party/more-itertools/more_itertools/tests/test_recipes.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/more_itertools/tests/test_recipes.py rename to tests/wpt/tests/tools/third_party/more-itertools/more_itertools/tests/test_recipes.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/setup.cfg b/tests/wpt/tests/tools/third_party/more-itertools/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/setup.cfg rename to tests/wpt/tests/tools/third_party/more-itertools/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/setup.py b/tests/wpt/tests/tools/third_party/more-itertools/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/setup.py rename to tests/wpt/tests/tools/third_party/more-itertools/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/more-itertools/tox.ini b/tests/wpt/tests/tools/third_party/more-itertools/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/more-itertools/tox.ini rename to tests/wpt/tests/tools/third_party/more-itertools/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.coveragerc b/tests/wpt/tests/tools/third_party/packaging/.coveragerc similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/.coveragerc rename to tests/wpt/tests/tools/third_party/packaging/.coveragerc diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.flake8 b/tests/wpt/tests/tools/third_party/packaging/.flake8 similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/.flake8 rename to tests/wpt/tests/tools/third_party/packaging/.flake8 diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/docs.yml b/tests/wpt/tests/tools/third_party/packaging/.github/workflows/docs.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/docs.yml rename to tests/wpt/tests/tools/third_party/packaging/.github/workflows/docs.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/lint.yml b/tests/wpt/tests/tools/third_party/packaging/.github/workflows/lint.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/lint.yml rename to tests/wpt/tests/tools/third_party/packaging/.github/workflows/lint.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/test.yml b/tests/wpt/tests/tools/third_party/packaging/.github/workflows/test.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/.github/workflows/test.yml rename to tests/wpt/tests/tools/third_party/packaging/.github/workflows/test.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.gitignore b/tests/wpt/tests/tools/third_party/packaging/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/.gitignore rename to tests/wpt/tests/tools/third_party/packaging/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.pre-commit-config.yaml b/tests/wpt/tests/tools/third_party/packaging/.pre-commit-config.yaml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/.pre-commit-config.yaml rename to tests/wpt/tests/tools/third_party/packaging/.pre-commit-config.yaml diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/.readthedocs.yml b/tests/wpt/tests/tools/third_party/packaging/.readthedocs.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/.readthedocs.yml rename to tests/wpt/tests/tools/third_party/packaging/.readthedocs.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/CHANGELOG.rst b/tests/wpt/tests/tools/third_party/packaging/CHANGELOG.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/CHANGELOG.rst rename to tests/wpt/tests/tools/third_party/packaging/CHANGELOG.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/CONTRIBUTING.rst b/tests/wpt/tests/tools/third_party/packaging/CONTRIBUTING.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/CONTRIBUTING.rst rename to tests/wpt/tests/tools/third_party/packaging/CONTRIBUTING.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE b/tests/wpt/tests/tools/third_party/packaging/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE rename to tests/wpt/tests/tools/third_party/packaging/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE.APACHE b/tests/wpt/tests/tools/third_party/packaging/LICENSE.APACHE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE.APACHE rename to tests/wpt/tests/tools/third_party/packaging/LICENSE.APACHE diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE.BSD b/tests/wpt/tests/tools/third_party/packaging/LICENSE.BSD similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/LICENSE.BSD rename to tests/wpt/tests/tools/third_party/packaging/LICENSE.BSD diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/MANIFEST.in b/tests/wpt/tests/tools/third_party/packaging/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/MANIFEST.in rename to tests/wpt/tests/tools/third_party/packaging/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/README.rst b/tests/wpt/tests/tools/third_party/packaging/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/README.rst rename to tests/wpt/tests/tools/third_party/packaging/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/Makefile b/tests/wpt/tests/tools/third_party/packaging/docs/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/Makefile rename to tests/wpt/tests/tools/third_party/packaging/docs/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/_static/.empty b/tests/wpt/tests/tools/third_party/packaging/docs/_static/.empty similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/_static/.empty rename to tests/wpt/tests/tools/third_party/packaging/docs/_static/.empty diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/changelog.rst b/tests/wpt/tests/tools/third_party/packaging/docs/changelog.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/changelog.rst rename to tests/wpt/tests/tools/third_party/packaging/docs/changelog.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/conf.py b/tests/wpt/tests/tools/third_party/packaging/docs/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/conf.py rename to tests/wpt/tests/tools/third_party/packaging/docs/conf.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/getting-started.rst b/tests/wpt/tests/tools/third_party/packaging/docs/development/getting-started.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/getting-started.rst rename to tests/wpt/tests/tools/third_party/packaging/docs/development/getting-started.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/index.rst b/tests/wpt/tests/tools/third_party/packaging/docs/development/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/index.rst rename to tests/wpt/tests/tools/third_party/packaging/docs/development/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/release-process.rst b/tests/wpt/tests/tools/third_party/packaging/docs/development/release-process.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/release-process.rst rename to tests/wpt/tests/tools/third_party/packaging/docs/development/release-process.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/reviewing-patches.rst b/tests/wpt/tests/tools/third_party/packaging/docs/development/reviewing-patches.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/reviewing-patches.rst rename to tests/wpt/tests/tools/third_party/packaging/docs/development/reviewing-patches.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/submitting-patches.rst b/tests/wpt/tests/tools/third_party/packaging/docs/development/submitting-patches.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/development/submitting-patches.rst rename to tests/wpt/tests/tools/third_party/packaging/docs/development/submitting-patches.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/index.rst b/tests/wpt/tests/tools/third_party/packaging/docs/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/index.rst rename to tests/wpt/tests/tools/third_party/packaging/docs/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/markers.rst b/tests/wpt/tests/tools/third_party/packaging/docs/markers.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/markers.rst rename to tests/wpt/tests/tools/third_party/packaging/docs/markers.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/requirements.rst b/tests/wpt/tests/tools/third_party/packaging/docs/requirements.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/requirements.rst rename to tests/wpt/tests/tools/third_party/packaging/docs/requirements.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/requirements.txt b/tests/wpt/tests/tools/third_party/packaging/docs/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/requirements.txt rename to tests/wpt/tests/tools/third_party/packaging/docs/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/security.rst b/tests/wpt/tests/tools/third_party/packaging/docs/security.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/security.rst rename to tests/wpt/tests/tools/third_party/packaging/docs/security.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/specifiers.rst b/tests/wpt/tests/tools/third_party/packaging/docs/specifiers.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/specifiers.rst rename to tests/wpt/tests/tools/third_party/packaging/docs/specifiers.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/tags.rst b/tests/wpt/tests/tools/third_party/packaging/docs/tags.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/tags.rst rename to tests/wpt/tests/tools/third_party/packaging/docs/tags.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/utils.rst b/tests/wpt/tests/tools/third_party/packaging/docs/utils.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/utils.rst rename to tests/wpt/tests/tools/third_party/packaging/docs/utils.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/docs/version.rst b/tests/wpt/tests/tools/third_party/packaging/docs/version.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/docs/version.rst rename to tests/wpt/tests/tools/third_party/packaging/docs/version.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/mypy.ini b/tests/wpt/tests/tools/third_party/packaging/mypy.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/mypy.ini rename to tests/wpt/tests/tools/third_party/packaging/mypy.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/noxfile.py b/tests/wpt/tests/tools/third_party/packaging/noxfile.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/noxfile.py rename to tests/wpt/tests/tools/third_party/packaging/noxfile.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/__about__.py b/tests/wpt/tests/tools/third_party/packaging/packaging/__about__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/__about__.py rename to tests/wpt/tests/tools/third_party/packaging/packaging/__about__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/__init__.py b/tests/wpt/tests/tools/third_party/packaging/packaging/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/__init__.py rename to tests/wpt/tests/tools/third_party/packaging/packaging/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_manylinux.py b/tests/wpt/tests/tools/third_party/packaging/packaging/_manylinux.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_manylinux.py rename to tests/wpt/tests/tools/third_party/packaging/packaging/_manylinux.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_musllinux.py b/tests/wpt/tests/tools/third_party/packaging/packaging/_musllinux.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_musllinux.py rename to tests/wpt/tests/tools/third_party/packaging/packaging/_musllinux.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_structures.py b/tests/wpt/tests/tools/third_party/packaging/packaging/_structures.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/_structures.py rename to tests/wpt/tests/tools/third_party/packaging/packaging/_structures.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/markers.py b/tests/wpt/tests/tools/third_party/packaging/packaging/markers.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/markers.py rename to tests/wpt/tests/tools/third_party/packaging/packaging/markers.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/py.typed b/tests/wpt/tests/tools/third_party/packaging/packaging/py.typed similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/py.typed rename to tests/wpt/tests/tools/third_party/packaging/packaging/py.typed diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/requirements.py b/tests/wpt/tests/tools/third_party/packaging/packaging/requirements.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/requirements.py rename to tests/wpt/tests/tools/third_party/packaging/packaging/requirements.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/specifiers.py b/tests/wpt/tests/tools/third_party/packaging/packaging/specifiers.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/specifiers.py rename to tests/wpt/tests/tools/third_party/packaging/packaging/specifiers.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/tags.py b/tests/wpt/tests/tools/third_party/packaging/packaging/tags.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/tags.py rename to tests/wpt/tests/tools/third_party/packaging/packaging/tags.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/utils.py b/tests/wpt/tests/tools/third_party/packaging/packaging/utils.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/utils.py rename to tests/wpt/tests/tools/third_party/packaging/packaging/utils.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/version.py b/tests/wpt/tests/tools/third_party/packaging/packaging/version.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/packaging/version.py rename to tests/wpt/tests/tools/third_party/packaging/packaging/version.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/pyproject.toml b/tests/wpt/tests/tools/third_party/packaging/pyproject.toml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/pyproject.toml rename to tests/wpt/tests/tools/third_party/packaging/pyproject.toml diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/setup.cfg b/tests/wpt/tests/tools/third_party/packaging/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/setup.cfg rename to tests/wpt/tests/tools/third_party/packaging/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/setup.py b/tests/wpt/tests/tools/third_party/packaging/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/setup.py rename to tests/wpt/tests/tools/third_party/packaging/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/__init__.py b/tests/wpt/tests/tools/third_party/packaging/tasks/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/__init__.py rename to tests/wpt/tests/tools/third_party/packaging/tasks/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/check.py b/tests/wpt/tests/tools/third_party/packaging/tasks/check.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/check.py rename to tests/wpt/tests/tools/third_party/packaging/tasks/check.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/paths.py b/tests/wpt/tests/tools/third_party/packaging/tasks/paths.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/paths.py rename to tests/wpt/tests/tools/third_party/packaging/tasks/paths.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/requirements.txt b/tests/wpt/tests/tools/third_party/packaging/tasks/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tasks/requirements.txt rename to tests/wpt/tests/tools/third_party/packaging/tasks/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/__init__.py b/tests/wpt/tests/tools/third_party/packaging/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/__init__.py rename to tests/wpt/tests/tools/third_party/packaging/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world.c b/tests/wpt/tests/tools/third_party/packaging/tests/hello-world.c similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/hello-world.c rename to tests/wpt/tests/tools/third_party/packaging/tests/hello-world.c diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/build.sh b/tests/wpt/tests/tools/third_party/packaging/tests/manylinux/build.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/build.sh rename to tests/wpt/tests/tools/third_party/packaging/tests/manylinux/build.sh diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-armv7l-armel b/tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-armv7l-armel similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-armv7l-armel rename to tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-armv7l-armel diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-armv7l-armhf b/tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-armv7l-armhf similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-armv7l-armhf rename to tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-armv7l-armhf diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-invalid-class b/tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-invalid-class similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-invalid-class rename to tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-invalid-class diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-invalid-data b/tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-invalid-data similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-invalid-data rename to tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-invalid-data diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-invalid-magic b/tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-invalid-magic similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-invalid-magic rename to tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-invalid-magic diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-s390x-s390x b/tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-s390x-s390x similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-s390x-s390x rename to tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-s390x-s390x diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-too-short b/tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-too-short similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-too-short rename to tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-too-short diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-x86_64-amd64 b/tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-x86_64-amd64 similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-x86_64-amd64 rename to tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-x86_64-amd64 diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-x86_64-i386 b/tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-x86_64-i386 similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-x86_64-i386 rename to tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-x86_64-i386 diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-x86_64-x32 b/tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-x86_64-x32 similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/manylinux/hello-world-x86_64-x32 rename to tests/wpt/tests/tools/third_party/packaging/tests/manylinux/hello-world-x86_64-x32 diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/musllinux/build.sh b/tests/wpt/tests/tools/third_party/packaging/tests/musllinux/build.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/musllinux/build.sh rename to tests/wpt/tests/tools/third_party/packaging/tests/musllinux/build.sh diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/musllinux/glibc-x86_64 b/tests/wpt/tests/tools/third_party/packaging/tests/musllinux/glibc-x86_64 similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/musllinux/glibc-x86_64 rename to tests/wpt/tests/tools/third_party/packaging/tests/musllinux/glibc-x86_64 diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/musllinux/musl-aarch64 b/tests/wpt/tests/tools/third_party/packaging/tests/musllinux/musl-aarch64 similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/musllinux/musl-aarch64 rename to tests/wpt/tests/tools/third_party/packaging/tests/musllinux/musl-aarch64 diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/musllinux/musl-i386 b/tests/wpt/tests/tools/third_party/packaging/tests/musllinux/musl-i386 similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/musllinux/musl-i386 rename to tests/wpt/tests/tools/third_party/packaging/tests/musllinux/musl-i386 diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/musllinux/musl-x86_64 b/tests/wpt/tests/tools/third_party/packaging/tests/musllinux/musl-x86_64 similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/musllinux/musl-x86_64 rename to tests/wpt/tests/tools/third_party/packaging/tests/musllinux/musl-x86_64 diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_manylinux.py b/tests/wpt/tests/tools/third_party/packaging/tests/test_manylinux.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_manylinux.py rename to tests/wpt/tests/tools/third_party/packaging/tests/test_manylinux.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_markers.py b/tests/wpt/tests/tools/third_party/packaging/tests/test_markers.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_markers.py rename to tests/wpt/tests/tools/third_party/packaging/tests/test_markers.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_musllinux.py b/tests/wpt/tests/tools/third_party/packaging/tests/test_musllinux.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_musllinux.py rename to tests/wpt/tests/tools/third_party/packaging/tests/test_musllinux.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_requirements.py b/tests/wpt/tests/tools/third_party/packaging/tests/test_requirements.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_requirements.py rename to tests/wpt/tests/tools/third_party/packaging/tests/test_requirements.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_specifiers.py b/tests/wpt/tests/tools/third_party/packaging/tests/test_specifiers.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_specifiers.py rename to tests/wpt/tests/tools/third_party/packaging/tests/test_specifiers.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_structures.py b/tests/wpt/tests/tools/third_party/packaging/tests/test_structures.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_structures.py rename to tests/wpt/tests/tools/third_party/packaging/tests/test_structures.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_tags.py b/tests/wpt/tests/tools/third_party/packaging/tests/test_tags.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_tags.py rename to tests/wpt/tests/tools/third_party/packaging/tests/test_tags.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_utils.py b/tests/wpt/tests/tools/third_party/packaging/tests/test_utils.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_utils.py rename to tests/wpt/tests/tools/third_party/packaging/tests/test_utils.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_version.py b/tests/wpt/tests/tools/third_party/packaging/tests/test_version.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/packaging/tests/test_version.py rename to tests/wpt/tests/tools/third_party/packaging/tests/test_version.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/.gitignore b/tests/wpt/tests/tools/third_party/pathlib2/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/.gitignore rename to tests/wpt/tests/tools/third_party/pathlib2/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/.travis.yml b/tests/wpt/tests/tools/third_party/pathlib2/.travis.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/.travis.yml rename to tests/wpt/tests/tools/third_party/pathlib2/.travis.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/CHANGELOG.rst b/tests/wpt/tests/tools/third_party/pathlib2/CHANGELOG.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/CHANGELOG.rst rename to tests/wpt/tests/tools/third_party/pathlib2/CHANGELOG.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/LICENSE.rst b/tests/wpt/tests/tools/third_party/pathlib2/LICENSE.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/LICENSE.rst rename to tests/wpt/tests/tools/third_party/pathlib2/LICENSE.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/MANIFEST.in b/tests/wpt/tests/tools/third_party/pathlib2/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/MANIFEST.in rename to tests/wpt/tests/tools/third_party/pathlib2/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/README.rst b/tests/wpt/tests/tools/third_party/pathlib2/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/README.rst rename to tests/wpt/tests/tools/third_party/pathlib2/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/VERSION b/tests/wpt/tests/tools/third_party/pathlib2/VERSION similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/VERSION rename to tests/wpt/tests/tools/third_party/pathlib2/VERSION diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/appveyor.yml b/tests/wpt/tests/tools/third_party/pathlib2/appveyor.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/appveyor.yml rename to tests/wpt/tests/tools/third_party/pathlib2/appveyor.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/appveyor/install.ps1 b/tests/wpt/tests/tools/third_party/pathlib2/appveyor/install.ps1 similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/appveyor/install.ps1 rename to tests/wpt/tests/tools/third_party/pathlib2/appveyor/install.ps1 diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/codecov.yml b/tests/wpt/tests/tools/third_party/pathlib2/codecov.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/codecov.yml rename to tests/wpt/tests/tools/third_party/pathlib2/codecov.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/pathlib2/__init__.py b/tests/wpt/tests/tools/third_party/pathlib2/pathlib2/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/pathlib2/__init__.py rename to tests/wpt/tests/tools/third_party/pathlib2/pathlib2/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/requirements.txt b/tests/wpt/tests/tools/third_party/pathlib2/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/requirements.txt rename to tests/wpt/tests/tools/third_party/pathlib2/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/setup.cfg b/tests/wpt/tests/tools/third_party/pathlib2/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/setup.cfg rename to tests/wpt/tests/tools/third_party/pathlib2/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/setup.py b/tests/wpt/tests/tools/third_party/pathlib2/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/setup.py rename to tests/wpt/tests/tools/third_party/pathlib2/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pathlib2/tests/test_pathlib2.py b/tests/wpt/tests/tools/third_party/pathlib2/tests/test_pathlib2.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pathlib2/tests/test_pathlib2.py rename to tests/wpt/tests/tools/third_party/pathlib2/tests/test_pathlib2.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pdf_js/LICENSE b/tests/wpt/tests/tools/third_party/pdf_js/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pdf_js/LICENSE rename to tests/wpt/tests/tools/third_party/pdf_js/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/pdf_js/pdf.js b/tests/wpt/tests/tools/third_party/pdf_js/pdf.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pdf_js/pdf.js rename to tests/wpt/tests/tools/third_party/pdf_js/pdf.js diff --git a/tests/wpt/web-platform-tests/tools/third_party/pdf_js/pdf.worker.js b/tests/wpt/tests/tools/third_party/pdf_js/pdf.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pdf_js/pdf.worker.js rename to tests/wpt/tests/tools/third_party/pdf_js/pdf.worker.js diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/.coveragerc b/tests/wpt/tests/tools/third_party/pluggy/.coveragerc similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/.coveragerc rename to tests/wpt/tests/tools/third_party/pluggy/.coveragerc diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/.github/workflows/main.yml b/tests/wpt/tests/tools/third_party/pluggy/.github/workflows/main.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/.github/workflows/main.yml rename to tests/wpt/tests/tools/third_party/pluggy/.github/workflows/main.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/.gitignore b/tests/wpt/tests/tools/third_party/pluggy/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/.gitignore rename to tests/wpt/tests/tools/third_party/pluggy/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/.pre-commit-config.yaml b/tests/wpt/tests/tools/third_party/pluggy/.pre-commit-config.yaml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/.pre-commit-config.yaml rename to tests/wpt/tests/tools/third_party/pluggy/.pre-commit-config.yaml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/CHANGELOG.rst b/tests/wpt/tests/tools/third_party/pluggy/CHANGELOG.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/CHANGELOG.rst rename to tests/wpt/tests/tools/third_party/pluggy/CHANGELOG.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/LICENSE b/tests/wpt/tests/tools/third_party/pluggy/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/LICENSE rename to tests/wpt/tests/tools/third_party/pluggy/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/MANIFEST.in b/tests/wpt/tests/tools/third_party/pluggy/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/MANIFEST.in rename to tests/wpt/tests/tools/third_party/pluggy/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/README.rst b/tests/wpt/tests/tools/third_party/pluggy/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/README.rst rename to tests/wpt/tests/tools/third_party/pluggy/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/RELEASING.rst b/tests/wpt/tests/tools/third_party/pluggy/RELEASING.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/RELEASING.rst rename to tests/wpt/tests/tools/third_party/pluggy/RELEASING.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/changelog/README.rst b/tests/wpt/tests/tools/third_party/pluggy/changelog/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/changelog/README.rst rename to tests/wpt/tests/tools/third_party/pluggy/changelog/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/changelog/_template.rst b/tests/wpt/tests/tools/third_party/pluggy/changelog/_template.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/changelog/_template.rst rename to tests/wpt/tests/tools/third_party/pluggy/changelog/_template.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/codecov.yml b/tests/wpt/tests/tools/third_party/pluggy/codecov.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/codecov.yml rename to tests/wpt/tests/tools/third_party/pluggy/codecov.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/_static/img/plug.png b/tests/wpt/tests/tools/third_party/pluggy/docs/_static/img/plug.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/_static/img/plug.png rename to tests/wpt/tests/tools/third_party/pluggy/docs/_static/img/plug.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/api_reference.rst b/tests/wpt/tests/tools/third_party/pluggy/docs/api_reference.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/api_reference.rst rename to tests/wpt/tests/tools/third_party/pluggy/docs/api_reference.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/changelog.rst b/tests/wpt/tests/tools/third_party/pluggy/docs/changelog.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/changelog.rst rename to tests/wpt/tests/tools/third_party/pluggy/docs/changelog.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/conf.py b/tests/wpt/tests/tools/third_party/pluggy/docs/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/conf.py rename to tests/wpt/tests/tools/third_party/pluggy/docs/conf.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample-spam/eggsample_spam.py b/tests/wpt/tests/tools/third_party/pluggy/docs/examples/eggsample-spam/eggsample_spam.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample-spam/eggsample_spam.py rename to tests/wpt/tests/tools/third_party/pluggy/docs/examples/eggsample-spam/eggsample_spam.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample-spam/setup.py b/tests/wpt/tests/tools/third_party/pluggy/docs/examples/eggsample-spam/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample-spam/setup.py rename to tests/wpt/tests/tools/third_party/pluggy/docs/examples/eggsample-spam/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/__init__.py b/tests/wpt/tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/__init__.py rename to tests/wpt/tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/hookspecs.py b/tests/wpt/tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/hookspecs.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/hookspecs.py rename to tests/wpt/tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/hookspecs.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/host.py b/tests/wpt/tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/host.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/host.py rename to tests/wpt/tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/host.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/lib.py b/tests/wpt/tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/lib.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/lib.py rename to tests/wpt/tests/tools/third_party/pluggy/docs/examples/eggsample/eggsample/lib.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/setup.py b/tests/wpt/tests/tools/third_party/pluggy/docs/examples/eggsample/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/eggsample/setup.py rename to tests/wpt/tests/tools/third_party/pluggy/docs/examples/eggsample/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/toy-example.py b/tests/wpt/tests/tools/third_party/pluggy/docs/examples/toy-example.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/examples/toy-example.py rename to tests/wpt/tests/tools/third_party/pluggy/docs/examples/toy-example.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/index.rst b/tests/wpt/tests/tools/third_party/pluggy/docs/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/docs/index.rst rename to tests/wpt/tests/tools/third_party/pluggy/docs/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/pyproject.toml b/tests/wpt/tests/tools/third_party/pluggy/pyproject.toml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/pyproject.toml rename to tests/wpt/tests/tools/third_party/pluggy/pyproject.toml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/scripts/release.py b/tests/wpt/tests/tools/third_party/pluggy/scripts/release.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/scripts/release.py rename to tests/wpt/tests/tools/third_party/pluggy/scripts/release.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/scripts/upload-coverage.sh b/tests/wpt/tests/tools/third_party/pluggy/scripts/upload-coverage.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/scripts/upload-coverage.sh rename to tests/wpt/tests/tools/third_party/pluggy/scripts/upload-coverage.sh diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/setup.cfg b/tests/wpt/tests/tools/third_party/pluggy/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/setup.cfg rename to tests/wpt/tests/tools/third_party/pluggy/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/setup.py b/tests/wpt/tests/tools/third_party/pluggy/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/setup.py rename to tests/wpt/tests/tools/third_party/pluggy/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/__init__.py b/tests/wpt/tests/tools/third_party/pluggy/src/pluggy/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/__init__.py rename to tests/wpt/tests/tools/third_party/pluggy/src/pluggy/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/_callers.py b/tests/wpt/tests/tools/third_party/pluggy/src/pluggy/_callers.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/_callers.py rename to tests/wpt/tests/tools/third_party/pluggy/src/pluggy/_callers.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/_hooks.py b/tests/wpt/tests/tools/third_party/pluggy/src/pluggy/_hooks.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/_hooks.py rename to tests/wpt/tests/tools/third_party/pluggy/src/pluggy/_hooks.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/_manager.py b/tests/wpt/tests/tools/third_party/pluggy/src/pluggy/_manager.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/_manager.py rename to tests/wpt/tests/tools/third_party/pluggy/src/pluggy/_manager.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/_result.py b/tests/wpt/tests/tools/third_party/pluggy/src/pluggy/_result.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/_result.py rename to tests/wpt/tests/tools/third_party/pluggy/src/pluggy/_result.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/_tracing.py b/tests/wpt/tests/tools/third_party/pluggy/src/pluggy/_tracing.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/src/pluggy/_tracing.py rename to tests/wpt/tests/tools/third_party/pluggy/src/pluggy/_tracing.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/benchmark.py b/tests/wpt/tests/tools/third_party/pluggy/testing/benchmark.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/benchmark.py rename to tests/wpt/tests/tools/third_party/pluggy/testing/benchmark.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/conftest.py b/tests/wpt/tests/tools/third_party/pluggy/testing/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/conftest.py rename to tests/wpt/tests/tools/third_party/pluggy/testing/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_details.py b/tests/wpt/tests/tools/third_party/pluggy/testing/test_details.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_details.py rename to tests/wpt/tests/tools/third_party/pluggy/testing/test_details.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_helpers.py b/tests/wpt/tests/tools/third_party/pluggy/testing/test_helpers.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_helpers.py rename to tests/wpt/tests/tools/third_party/pluggy/testing/test_helpers.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_hookcaller.py b/tests/wpt/tests/tools/third_party/pluggy/testing/test_hookcaller.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_hookcaller.py rename to tests/wpt/tests/tools/third_party/pluggy/testing/test_hookcaller.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_invocations.py b/tests/wpt/tests/tools/third_party/pluggy/testing/test_invocations.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_invocations.py rename to tests/wpt/tests/tools/third_party/pluggy/testing/test_invocations.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_multicall.py b/tests/wpt/tests/tools/third_party/pluggy/testing/test_multicall.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_multicall.py rename to tests/wpt/tests/tools/third_party/pluggy/testing/test_multicall.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_pluginmanager.py b/tests/wpt/tests/tools/third_party/pluggy/testing/test_pluginmanager.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_pluginmanager.py rename to tests/wpt/tests/tools/third_party/pluggy/testing/test_pluginmanager.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_tracer.py b/tests/wpt/tests/tools/third_party/pluggy/testing/test_tracer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/testing/test_tracer.py rename to tests/wpt/tests/tools/third_party/pluggy/testing/test_tracer.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pluggy/tox.ini b/tests/wpt/tests/tools/third_party/pluggy/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pluggy/tox.ini rename to tests/wpt/tests/tools/third_party/pluggy/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/.flake8 b/tests/wpt/tests/tools/third_party/py/.flake8 similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/.flake8 rename to tests/wpt/tests/tools/third_party/py/.flake8 diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/.gitattributes b/tests/wpt/tests/tools/third_party/py/.gitattributes similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/.gitattributes rename to tests/wpt/tests/tools/third_party/py/.gitattributes diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/.github/workflows/main.yml b/tests/wpt/tests/tools/third_party/py/.github/workflows/main.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/.github/workflows/main.yml rename to tests/wpt/tests/tools/third_party/py/.github/workflows/main.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/.gitignore b/tests/wpt/tests/tools/third_party/py/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/.gitignore rename to tests/wpt/tests/tools/third_party/py/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/AUTHORS b/tests/wpt/tests/tools/third_party/py/AUTHORS similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/AUTHORS rename to tests/wpt/tests/tools/third_party/py/AUTHORS diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/CHANGELOG.rst b/tests/wpt/tests/tools/third_party/py/CHANGELOG.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/CHANGELOG.rst rename to tests/wpt/tests/tools/third_party/py/CHANGELOG.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/LICENSE b/tests/wpt/tests/tools/third_party/py/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/LICENSE rename to tests/wpt/tests/tools/third_party/py/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/MANIFEST.in b/tests/wpt/tests/tools/third_party/py/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/MANIFEST.in rename to tests/wpt/tests/tools/third_party/py/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/README.rst b/tests/wpt/tests/tools/third_party/py/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/README.rst rename to tests/wpt/tests/tools/third_party/py/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/RELEASING.rst b/tests/wpt/tests/tools/third_party/py/RELEASING.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/RELEASING.rst rename to tests/wpt/tests/tools/third_party/py/RELEASING.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/bench/localpath.py b/tests/wpt/tests/tools/third_party/py/bench/localpath.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/bench/localpath.py rename to tests/wpt/tests/tools/third_party/py/bench/localpath.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/codecov.yml b/tests/wpt/tests/tools/third_party/py/codecov.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/codecov.yml rename to tests/wpt/tests/tools/third_party/py/codecov.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/conftest.py b/tests/wpt/tests/tools/third_party/py/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/conftest.py rename to tests/wpt/tests/tools/third_party/py/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/Makefile b/tests/wpt/tests/tools/third_party/py/doc/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/Makefile rename to tests/wpt/tests/tools/third_party/py/doc/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/_templates/layout.html b/tests/wpt/tests/tools/third_party/py/doc/_templates/layout.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/_templates/layout.html rename to tests/wpt/tests/tools/third_party/py/doc/_templates/layout.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-0.9.0.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-0.9.0.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-0.9.0.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-0.9.0.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-0.9.2.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-0.9.2.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-0.9.2.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-0.9.2.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.0.0.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-1.0.0.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.0.0.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-1.0.0.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.0.1.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-1.0.1.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.0.1.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-1.0.1.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.0.2.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-1.0.2.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.0.2.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-1.0.2.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.1.0.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-1.1.0.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.1.0.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-1.1.0.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.1.1.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-1.1.1.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.1.1.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-1.1.1.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.2.0.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-1.2.0.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.2.0.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-1.2.0.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.2.1.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-1.2.1.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.2.1.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-1.2.1.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.3.0.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-1.3.0.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.3.0.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-1.3.0.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.3.1.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-1.3.1.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.3.1.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-1.3.1.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.3.2.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-1.3.2.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.3.2.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-1.3.2.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.3.3.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-1.3.3.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.3.3.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-1.3.3.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.3.4.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-1.3.4.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.3.4.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-1.3.4.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.4.0.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-1.4.0.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.4.0.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-1.4.0.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.4.1.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/release-1.4.1.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/release-1.4.1.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/release-1.4.1.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/releases.txt b/tests/wpt/tests/tools/third_party/py/doc/announce/releases.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/announce/releases.txt rename to tests/wpt/tests/tools/third_party/py/doc/announce/releases.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/changelog.txt b/tests/wpt/tests/tools/third_party/py/doc/changelog.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/changelog.txt rename to tests/wpt/tests/tools/third_party/py/doc/changelog.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/code.txt b/tests/wpt/tests/tools/third_party/py/doc/code.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/code.txt rename to tests/wpt/tests/tools/third_party/py/doc/code.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/conf.py b/tests/wpt/tests/tools/third_party/py/doc/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/conf.py rename to tests/wpt/tests/tools/third_party/py/doc/conf.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/download.html b/tests/wpt/tests/tools/third_party/py/doc/download.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/download.html rename to tests/wpt/tests/tools/third_party/py/doc/download.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/example/genhtml.py b/tests/wpt/tests/tools/third_party/py/doc/example/genhtml.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/example/genhtml.py rename to tests/wpt/tests/tools/third_party/py/doc/example/genhtml.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/example/genhtmlcss.py b/tests/wpt/tests/tools/third_party/py/doc/example/genhtmlcss.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/example/genhtmlcss.py rename to tests/wpt/tests/tools/third_party/py/doc/example/genhtmlcss.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/example/genxml.py b/tests/wpt/tests/tools/third_party/py/doc/example/genxml.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/example/genxml.py rename to tests/wpt/tests/tools/third_party/py/doc/example/genxml.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/faq.txt b/tests/wpt/tests/tools/third_party/py/doc/faq.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/faq.txt rename to tests/wpt/tests/tools/third_party/py/doc/faq.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/img/pylib.png b/tests/wpt/tests/tools/third_party/py/doc/img/pylib.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/img/pylib.png rename to tests/wpt/tests/tools/third_party/py/doc/img/pylib.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/index.txt b/tests/wpt/tests/tools/third_party/py/doc/index.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/index.txt rename to tests/wpt/tests/tools/third_party/py/doc/index.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/install.txt b/tests/wpt/tests/tools/third_party/py/doc/install.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/install.txt rename to tests/wpt/tests/tools/third_party/py/doc/install.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/io.txt b/tests/wpt/tests/tools/third_party/py/doc/io.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/io.txt rename to tests/wpt/tests/tools/third_party/py/doc/io.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/links.inc b/tests/wpt/tests/tools/third_party/py/doc/links.inc similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/links.inc rename to tests/wpt/tests/tools/third_party/py/doc/links.inc diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/log.txt b/tests/wpt/tests/tools/third_party/py/doc/log.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/log.txt rename to tests/wpt/tests/tools/third_party/py/doc/log.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/misc.txt b/tests/wpt/tests/tools/third_party/py/doc/misc.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/misc.txt rename to tests/wpt/tests/tools/third_party/py/doc/misc.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/path.txt b/tests/wpt/tests/tools/third_party/py/doc/path.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/path.txt rename to tests/wpt/tests/tools/third_party/py/doc/path.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/style.css b/tests/wpt/tests/tools/third_party/py/doc/style.css similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/style.css rename to tests/wpt/tests/tools/third_party/py/doc/style.css diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/doc/xml.txt b/tests/wpt/tests/tools/third_party/py/doc/xml.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/doc/xml.txt rename to tests/wpt/tests/tools/third_party/py/doc/xml.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/__init__.py b/tests/wpt/tests/tools/third_party/py/py/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/__init__.py rename to tests/wpt/tests/tools/third_party/py/py/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/__init__.pyi b/tests/wpt/tests/tools/third_party/py/py/__init__.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/__init__.pyi rename to tests/wpt/tests/tools/third_party/py/py/__init__.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/__metainfo.py b/tests/wpt/tests/tools/third_party/py/py/__metainfo.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/__metainfo.py rename to tests/wpt/tests/tools/third_party/py/py/__metainfo.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_builtin.py b/tests/wpt/tests/tools/third_party/py/py/_builtin.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_builtin.py rename to tests/wpt/tests/tools/third_party/py/py/_builtin.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_code/__init__.py b/tests/wpt/tests/tools/third_party/py/py/_code/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_code/__init__.py rename to tests/wpt/tests/tools/third_party/py/py/_code/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_code/_assertionnew.py b/tests/wpt/tests/tools/third_party/py/py/_code/_assertionnew.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_code/_assertionnew.py rename to tests/wpt/tests/tools/third_party/py/py/_code/_assertionnew.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_code/_assertionold.py b/tests/wpt/tests/tools/third_party/py/py/_code/_assertionold.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_code/_assertionold.py rename to tests/wpt/tests/tools/third_party/py/py/_code/_assertionold.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_code/_py2traceback.py b/tests/wpt/tests/tools/third_party/py/py/_code/_py2traceback.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_code/_py2traceback.py rename to tests/wpt/tests/tools/third_party/py/py/_code/_py2traceback.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_code/assertion.py b/tests/wpt/tests/tools/third_party/py/py/_code/assertion.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_code/assertion.py rename to tests/wpt/tests/tools/third_party/py/py/_code/assertion.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_code/code.py b/tests/wpt/tests/tools/third_party/py/py/_code/code.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_code/code.py rename to tests/wpt/tests/tools/third_party/py/py/_code/code.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_code/source.py b/tests/wpt/tests/tools/third_party/py/py/_code/source.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_code/source.py rename to tests/wpt/tests/tools/third_party/py/py/_code/source.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_error.py b/tests/wpt/tests/tools/third_party/py/py/_error.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_error.py rename to tests/wpt/tests/tools/third_party/py/py/_error.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_io/__init__.py b/tests/wpt/tests/tools/third_party/py/py/_io/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_io/__init__.py rename to tests/wpt/tests/tools/third_party/py/py/_io/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_io/capture.py b/tests/wpt/tests/tools/third_party/py/py/_io/capture.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_io/capture.py rename to tests/wpt/tests/tools/third_party/py/py/_io/capture.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_io/saferepr.py b/tests/wpt/tests/tools/third_party/py/py/_io/saferepr.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_io/saferepr.py rename to tests/wpt/tests/tools/third_party/py/py/_io/saferepr.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_io/terminalwriter.py b/tests/wpt/tests/tools/third_party/py/py/_io/terminalwriter.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_io/terminalwriter.py rename to tests/wpt/tests/tools/third_party/py/py/_io/terminalwriter.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_log/__init__.py b/tests/wpt/tests/tools/third_party/py/py/_log/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_log/__init__.py rename to tests/wpt/tests/tools/third_party/py/py/_log/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_log/log.py b/tests/wpt/tests/tools/third_party/py/py/_log/log.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_log/log.py rename to tests/wpt/tests/tools/third_party/py/py/_log/log.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_log/warning.py b/tests/wpt/tests/tools/third_party/py/py/_log/warning.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_log/warning.py rename to tests/wpt/tests/tools/third_party/py/py/_log/warning.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_path/__init__.py b/tests/wpt/tests/tools/third_party/py/py/_path/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_path/__init__.py rename to tests/wpt/tests/tools/third_party/py/py/_path/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_path/cacheutil.py b/tests/wpt/tests/tools/third_party/py/py/_path/cacheutil.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_path/cacheutil.py rename to tests/wpt/tests/tools/third_party/py/py/_path/cacheutil.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_path/common.py b/tests/wpt/tests/tools/third_party/py/py/_path/common.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_path/common.py rename to tests/wpt/tests/tools/third_party/py/py/_path/common.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_path/local.py b/tests/wpt/tests/tools/third_party/py/py/_path/local.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_path/local.py rename to tests/wpt/tests/tools/third_party/py/py/_path/local.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_path/svnurl.py b/tests/wpt/tests/tools/third_party/py/py/_path/svnurl.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_path/svnurl.py rename to tests/wpt/tests/tools/third_party/py/py/_path/svnurl.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_path/svnwc.py b/tests/wpt/tests/tools/third_party/py/py/_path/svnwc.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_path/svnwc.py rename to tests/wpt/tests/tools/third_party/py/py/_path/svnwc.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_process/__init__.py b/tests/wpt/tests/tools/third_party/py/py/_process/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_process/__init__.py rename to tests/wpt/tests/tools/third_party/py/py/_process/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_process/cmdexec.py b/tests/wpt/tests/tools/third_party/py/py/_process/cmdexec.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_process/cmdexec.py rename to tests/wpt/tests/tools/third_party/py/py/_process/cmdexec.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_process/forkedfunc.py b/tests/wpt/tests/tools/third_party/py/py/_process/forkedfunc.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_process/forkedfunc.py rename to tests/wpt/tests/tools/third_party/py/py/_process/forkedfunc.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_process/killproc.py b/tests/wpt/tests/tools/third_party/py/py/_process/killproc.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_process/killproc.py rename to tests/wpt/tests/tools/third_party/py/py/_process/killproc.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_std.py b/tests/wpt/tests/tools/third_party/py/py/_std.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_std.py rename to tests/wpt/tests/tools/third_party/py/py/_std.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/__init__.py b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/__init__.py rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/INSTALLER b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/INSTALLER similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/INSTALLER rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/INSTALLER diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/LICENSE b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/LICENSE rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/METADATA b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/METADATA similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/METADATA rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/METADATA diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/RECORD b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/RECORD similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/RECORD rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/RECORD diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/REQUESTED b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/REQUESTED similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/REQUESTED rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/REQUESTED diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/WHEEL b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/WHEEL similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/WHEEL rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/WHEEL diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/top_level.txt b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/top_level.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/top_level.txt rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg-2.0.0.dist-info/top_level.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg/__init__.py b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg/__init__.py rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg/version.py b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg/version.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/apipkg/version.py rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/apipkg/version.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/INSTALLER b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/INSTALLER similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/INSTALLER rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/INSTALLER diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/LICENSE b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/LICENSE rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/METADATA b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/METADATA similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/METADATA rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/METADATA diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/RECORD b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/RECORD similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/RECORD rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/RECORD diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/REQUESTED b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/REQUESTED similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/REQUESTED rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/REQUESTED diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/WHEEL b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/WHEEL similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/WHEEL rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/WHEEL diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/top_level.txt b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/top_level.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/top_level.txt rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig-1.1.1.dist-info/top_level.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig/__init__.py b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig/__init__.py rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig/__init__.pyi b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig/__init__.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig/__init__.pyi rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig/__init__.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig/py.typed b/tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig/py.typed similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_vendored_packages/iniconfig/py.typed rename to tests/wpt/tests/tools/third_party/py/py/_vendored_packages/iniconfig/py.typed diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/_xmlgen.py b/tests/wpt/tests/tools/third_party/py/py/_xmlgen.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/_xmlgen.py rename to tests/wpt/tests/tools/third_party/py/py/_xmlgen.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/error.pyi b/tests/wpt/tests/tools/third_party/py/py/error.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/error.pyi rename to tests/wpt/tests/tools/third_party/py/py/error.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/iniconfig.pyi b/tests/wpt/tests/tools/third_party/py/py/iniconfig.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/iniconfig.pyi rename to tests/wpt/tests/tools/third_party/py/py/iniconfig.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/io.pyi b/tests/wpt/tests/tools/third_party/py/py/io.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/io.pyi rename to tests/wpt/tests/tools/third_party/py/py/io.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/path.pyi b/tests/wpt/tests/tools/third_party/py/py/path.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/path.pyi rename to tests/wpt/tests/tools/third_party/py/py/path.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/py.typed b/tests/wpt/tests/tools/third_party/py/py/py.typed similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/py.typed rename to tests/wpt/tests/tools/third_party/py/py/py.typed diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/test.py b/tests/wpt/tests/tools/third_party/py/py/test.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/test.py rename to tests/wpt/tests/tools/third_party/py/py/test.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/py/xml.pyi b/tests/wpt/tests/tools/third_party/py/py/xml.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/py/xml.pyi rename to tests/wpt/tests/tools/third_party/py/py/xml.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/pyproject.toml b/tests/wpt/tests/tools/third_party/py/pyproject.toml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/pyproject.toml rename to tests/wpt/tests/tools/third_party/py/pyproject.toml diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/setup.cfg b/tests/wpt/tests/tools/third_party/py/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/setup.cfg rename to tests/wpt/tests/tools/third_party/py/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/setup.py b/tests/wpt/tests/tools/third_party/py/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/setup.py rename to tests/wpt/tests/tools/third_party/py/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/tasks/__init__.py b/tests/wpt/tests/tools/third_party/py/tasks/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/tasks/__init__.py rename to tests/wpt/tests/tools/third_party/py/tasks/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/tasks/vendoring.py b/tests/wpt/tests/tools/third_party/py/tasks/vendoring.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/tasks/vendoring.py rename to tests/wpt/tests/tools/third_party/py/tasks/vendoring.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/code/test_assertion.py b/tests/wpt/tests/tools/third_party/py/testing/code/test_assertion.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/code/test_assertion.py rename to tests/wpt/tests/tools/third_party/py/testing/code/test_assertion.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/code/test_code.py b/tests/wpt/tests/tools/third_party/py/testing/code/test_code.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/code/test_code.py rename to tests/wpt/tests/tools/third_party/py/testing/code/test_code.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/code/test_excinfo.py b/tests/wpt/tests/tools/third_party/py/testing/code/test_excinfo.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/code/test_excinfo.py rename to tests/wpt/tests/tools/third_party/py/testing/code/test_excinfo.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/code/test_source.py b/tests/wpt/tests/tools/third_party/py/testing/code/test_source.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/code/test_source.py rename to tests/wpt/tests/tools/third_party/py/testing/code/test_source.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/conftest.py b/tests/wpt/tests/tools/third_party/py/testing/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/conftest.py rename to tests/wpt/tests/tools/third_party/py/testing/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/io_/__init__.py b/tests/wpt/tests/tools/third_party/py/testing/io_/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/io_/__init__.py rename to tests/wpt/tests/tools/third_party/py/testing/io_/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/io_/test_capture.py b/tests/wpt/tests/tools/third_party/py/testing/io_/test_capture.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/io_/test_capture.py rename to tests/wpt/tests/tools/third_party/py/testing/io_/test_capture.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/io_/test_saferepr.py b/tests/wpt/tests/tools/third_party/py/testing/io_/test_saferepr.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/io_/test_saferepr.py rename to tests/wpt/tests/tools/third_party/py/testing/io_/test_saferepr.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/io_/test_terminalwriter.py b/tests/wpt/tests/tools/third_party/py/testing/io_/test_terminalwriter.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/io_/test_terminalwriter.py rename to tests/wpt/tests/tools/third_party/py/testing/io_/test_terminalwriter.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/io_/test_terminalwriter_linewidth.py b/tests/wpt/tests/tools/third_party/py/testing/io_/test_terminalwriter_linewidth.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/io_/test_terminalwriter_linewidth.py rename to tests/wpt/tests/tools/third_party/py/testing/io_/test_terminalwriter_linewidth.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/log/__init__.py b/tests/wpt/tests/tools/third_party/py/testing/log/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/log/__init__.py rename to tests/wpt/tests/tools/third_party/py/testing/log/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/log/test_log.py b/tests/wpt/tests/tools/third_party/py/testing/log/test_log.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/log/test_log.py rename to tests/wpt/tests/tools/third_party/py/testing/log/test_log.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/log/test_warning.py b/tests/wpt/tests/tools/third_party/py/testing/log/test_warning.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/log/test_warning.py rename to tests/wpt/tests/tools/third_party/py/testing/log/test_warning.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/path/common.py b/tests/wpt/tests/tools/third_party/py/testing/path/common.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/path/common.py rename to tests/wpt/tests/tools/third_party/py/testing/path/common.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/path/conftest.py b/tests/wpt/tests/tools/third_party/py/testing/path/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/path/conftest.py rename to tests/wpt/tests/tools/third_party/py/testing/path/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/path/repotest.dump b/tests/wpt/tests/tools/third_party/py/testing/path/repotest.dump similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/path/repotest.dump rename to tests/wpt/tests/tools/third_party/py/testing/path/repotest.dump diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/path/svntestbase.py b/tests/wpt/tests/tools/third_party/py/testing/path/svntestbase.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/path/svntestbase.py rename to tests/wpt/tests/tools/third_party/py/testing/path/svntestbase.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/path/test_cacheutil.py b/tests/wpt/tests/tools/third_party/py/testing/path/test_cacheutil.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/path/test_cacheutil.py rename to tests/wpt/tests/tools/third_party/py/testing/path/test_cacheutil.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/path/test_local.py b/tests/wpt/tests/tools/third_party/py/testing/path/test_local.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/path/test_local.py rename to tests/wpt/tests/tools/third_party/py/testing/path/test_local.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/path/test_svnauth.py b/tests/wpt/tests/tools/third_party/py/testing/path/test_svnauth.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/path/test_svnauth.py rename to tests/wpt/tests/tools/third_party/py/testing/path/test_svnauth.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/path/test_svnurl.py b/tests/wpt/tests/tools/third_party/py/testing/path/test_svnurl.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/path/test_svnurl.py rename to tests/wpt/tests/tools/third_party/py/testing/path/test_svnurl.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/path/test_svnwc.py b/tests/wpt/tests/tools/third_party/py/testing/path/test_svnwc.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/path/test_svnwc.py rename to tests/wpt/tests/tools/third_party/py/testing/path/test_svnwc.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/process/__init__.py b/tests/wpt/tests/tools/third_party/py/testing/process/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/process/__init__.py rename to tests/wpt/tests/tools/third_party/py/testing/process/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/process/test_cmdexec.py b/tests/wpt/tests/tools/third_party/py/testing/process/test_cmdexec.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/process/test_cmdexec.py rename to tests/wpt/tests/tools/third_party/py/testing/process/test_cmdexec.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/process/test_forkedfunc.py b/tests/wpt/tests/tools/third_party/py/testing/process/test_forkedfunc.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/process/test_forkedfunc.py rename to tests/wpt/tests/tools/third_party/py/testing/process/test_forkedfunc.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/process/test_killproc.py b/tests/wpt/tests/tools/third_party/py/testing/process/test_killproc.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/process/test_killproc.py rename to tests/wpt/tests/tools/third_party/py/testing/process/test_killproc.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/root/__init__.py b/tests/wpt/tests/tools/third_party/py/testing/root/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/root/__init__.py rename to tests/wpt/tests/tools/third_party/py/testing/root/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/root/test_builtin.py b/tests/wpt/tests/tools/third_party/py/testing/root/test_builtin.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/root/test_builtin.py rename to tests/wpt/tests/tools/third_party/py/testing/root/test_builtin.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/root/test_error.py b/tests/wpt/tests/tools/third_party/py/testing/root/test_error.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/root/test_error.py rename to tests/wpt/tests/tools/third_party/py/testing/root/test_error.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/root/test_py_imports.py b/tests/wpt/tests/tools/third_party/py/testing/root/test_py_imports.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/root/test_py_imports.py rename to tests/wpt/tests/tools/third_party/py/testing/root/test_py_imports.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/root/test_std.py b/tests/wpt/tests/tools/third_party/py/testing/root/test_std.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/root/test_std.py rename to tests/wpt/tests/tools/third_party/py/testing/root/test_std.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/testing/root/test_xmlgen.py b/tests/wpt/tests/tools/third_party/py/testing/root/test_xmlgen.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/testing/root/test_xmlgen.py rename to tests/wpt/tests/tools/third_party/py/testing/root/test_xmlgen.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/py/tox.ini b/tests/wpt/tests/tools/third_party/py/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/py/tox.ini rename to tests/wpt/tests/tools/third_party/py/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/CHANGELOG.rst b/tests/wpt/tests/tools/third_party/pytest-asyncio/CHANGELOG.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/CHANGELOG.rst rename to tests/wpt/tests/tools/third_party/pytest-asyncio/CHANGELOG.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/LICENSE b/tests/wpt/tests/tools/third_party/pytest-asyncio/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/LICENSE rename to tests/wpt/tests/tools/third_party/pytest-asyncio/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/MANIFEST.in b/tests/wpt/tests/tools/third_party/pytest-asyncio/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/MANIFEST.in rename to tests/wpt/tests/tools/third_party/pytest-asyncio/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/Makefile b/tests/wpt/tests/tools/third_party/pytest-asyncio/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/Makefile rename to tests/wpt/tests/tools/third_party/pytest-asyncio/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/PKG-INFO b/tests/wpt/tests/tools/third_party/pytest-asyncio/PKG-INFO similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/PKG-INFO rename to tests/wpt/tests/tools/third_party/pytest-asyncio/PKG-INFO diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/README.rst b/tests/wpt/tests/tools/third_party/pytest-asyncio/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/README.rst rename to tests/wpt/tests/tools/third_party/pytest-asyncio/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/dependencies/default/constraints.txt b/tests/wpt/tests/tools/third_party/pytest-asyncio/dependencies/default/constraints.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/dependencies/default/constraints.txt rename to tests/wpt/tests/tools/third_party/pytest-asyncio/dependencies/default/constraints.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/dependencies/default/requirements.txt b/tests/wpt/tests/tools/third_party/pytest-asyncio/dependencies/default/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/dependencies/default/requirements.txt rename to tests/wpt/tests/tools/third_party/pytest-asyncio/dependencies/default/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/dependencies/pytest-min/constraints.txt b/tests/wpt/tests/tools/third_party/pytest-asyncio/dependencies/pytest-min/constraints.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/dependencies/pytest-min/constraints.txt rename to tests/wpt/tests/tools/third_party/pytest-asyncio/dependencies/pytest-min/constraints.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/dependencies/pytest-min/requirements.txt b/tests/wpt/tests/tools/third_party/pytest-asyncio/dependencies/pytest-min/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/dependencies/pytest-min/requirements.txt rename to tests/wpt/tests/tools/third_party/pytest-asyncio/dependencies/pytest-min/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pyproject.toml b/tests/wpt/tests/tools/third_party/pytest-asyncio/pyproject.toml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pyproject.toml rename to tests/wpt/tests/tools/third_party/pytest-asyncio/pyproject.toml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/PKG-INFO b/tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/PKG-INFO similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/PKG-INFO rename to tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/PKG-INFO diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/SOURCES.txt b/tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/SOURCES.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/SOURCES.txt rename to tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/SOURCES.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/dependency_links.txt b/tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/dependency_links.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/dependency_links.txt rename to tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/dependency_links.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/entry_points.txt b/tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/entry_points.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/entry_points.txt rename to tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/entry_points.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/requires.txt b/tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/requires.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/requires.txt rename to tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/requires.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/top_level.txt b/tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/top_level.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/top_level.txt rename to tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio.egg-info/top_level.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio/__init__.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio/__init__.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio/_version.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio/_version.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio/_version.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio/_version.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio/plugin.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio/plugin.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio/plugin.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio/plugin.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio/py.typed b/tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio/py.typed similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/pytest_asyncio/py.typed rename to tests/wpt/tests/tools/third_party/pytest-asyncio/pytest_asyncio/py.typed diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/setup.cfg b/tests/wpt/tests/tools/third_party/pytest-asyncio/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/setup.cfg rename to tests/wpt/tests/tools/third_party/pytest-asyncio/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/async_fixtures/__init__.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/async_fixtures/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/async_fixtures/__init__.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/async_fixtures/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_fixtures.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_fixtures.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_fixtures.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_fixtures.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_fixtures_scope.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_fixtures_scope.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_fixtures_scope.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_fixtures_scope.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_fixtures_with_finalizer.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_fixtures_with_finalizer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_fixtures_with_finalizer.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_fixtures_with_finalizer.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_gen_fixtures.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_gen_fixtures.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_gen_fixtures.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_async_gen_fixtures.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_nested.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_nested.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_nested.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_nested.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_parametrized_loop.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_parametrized_loop.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_parametrized_loop.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/async_fixtures/test_parametrized_loop.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/conftest.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/conftest.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/hypothesis/test_base.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/hypothesis/test_base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/hypothesis/test_base.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/hypothesis/test_base.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/hypothesis/test_inherited_test.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/hypothesis/test_inherited_test.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/hypothesis/test_inherited_test.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/hypothesis/test_inherited_test.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/loop_fixture_scope/conftest.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/loop_fixture_scope/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/loop_fixture_scope/conftest.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/loop_fixture_scope/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/loop_fixture_scope/test_loop_fixture_scope.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/loop_fixture_scope/test_loop_fixture_scope.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/loop_fixture_scope/test_loop_fixture_scope.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/loop_fixture_scope/test_loop_fixture_scope.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/markers/test_class_marker.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/markers/test_class_marker.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/markers/test_class_marker.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/markers/test_class_marker.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/markers/test_module_marker.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/markers/test_module_marker.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/markers/test_module_marker.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/markers/test_module_marker.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/modes/test_auto_mode.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/modes/test_auto_mode.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/modes/test_auto_mode.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/modes/test_auto_mode.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/modes/test_legacy_mode.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/modes/test_legacy_mode.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/modes/test_legacy_mode.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/modes/test_legacy_mode.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/modes/test_strict_mode.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/modes/test_strict_mode.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/modes/test_strict_mode.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/modes/test_strict_mode.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/multiloop/conftest.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/multiloop/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/multiloop/conftest.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/multiloop/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/multiloop/test_alternative_loops.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/multiloop/test_alternative_loops.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/multiloop/test_alternative_loops.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/multiloop/test_alternative_loops.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/respect_event_loop_policy/conftest.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/respect_event_loop_policy/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/respect_event_loop_policy/conftest.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/respect_event_loop_policy/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/respect_event_loop_policy/test_respects_event_loop_policy.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/respect_event_loop_policy/test_respects_event_loop_policy.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/respect_event_loop_policy/test_respects_event_loop_policy.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/respect_event_loop_policy/test_respects_event_loop_policy.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/test_asyncio_fixture.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/test_asyncio_fixture.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/test_asyncio_fixture.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/test_asyncio_fixture.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/test_dependent_fixtures.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/test_dependent_fixtures.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/test_dependent_fixtures.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/test_dependent_fixtures.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/test_event_loop_scope.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/test_event_loop_scope.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/test_event_loop_scope.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/test_event_loop_scope.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/test_flaky_integration.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/test_flaky_integration.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/test_flaky_integration.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/test_flaky_integration.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/test_simple.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/test_simple.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/test_simple.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/test_simple.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/test_subprocess.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/test_subprocess.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/test_subprocess.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/test_subprocess.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/trio/test_fixtures.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tests/trio/test_fixtures.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tests/trio/test_fixtures.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tests/trio/test_fixtures.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tools/get-version.py b/tests/wpt/tests/tools/third_party/pytest-asyncio/tools/get-version.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tools/get-version.py rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tools/get-version.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tox.ini b/tests/wpt/tests/tools/third_party/pytest-asyncio/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest-asyncio/tox.ini rename to tests/wpt/tests/tools/third_party/pytest-asyncio/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.coveragerc b/tests/wpt/tests/tools/third_party/pytest/.coveragerc similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.coveragerc rename to tests/wpt/tests/tools/third_party/pytest/.coveragerc diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.gitattributes b/tests/wpt/tests/tools/third_party/pytest/.gitattributes similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.gitattributes rename to tests/wpt/tests/tools/third_party/pytest/.gitattributes diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.gitblameignore b/tests/wpt/tests/tools/third_party/pytest/.gitblameignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.gitblameignore rename to tests/wpt/tests/tools/third_party/pytest/.gitblameignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/FUNDING.yml b/tests/wpt/tests/tools/third_party/pytest/.github/FUNDING.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.github/FUNDING.yml rename to tests/wpt/tests/tools/third_party/pytest/.github/FUNDING.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE/1_bug_report.md b/tests/wpt/tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE/1_bug_report.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE/1_bug_report.md rename to tests/wpt/tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE/1_bug_report.md diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE/2_feature_request.md b/tests/wpt/tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE/2_feature_request.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE/2_feature_request.md rename to tests/wpt/tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE/2_feature_request.md diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE/config.yml b/tests/wpt/tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE/config.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE/config.yml rename to tests/wpt/tests/tools/third_party/pytest/.github/ISSUE_TEMPLATE/config.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/PULL_REQUEST_TEMPLATE.md b/tests/wpt/tests/tools/third_party/pytest/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.github/PULL_REQUEST_TEMPLATE.md rename to tests/wpt/tests/tools/third_party/pytest/.github/PULL_REQUEST_TEMPLATE.md diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/config.yml b/tests/wpt/tests/tools/third_party/pytest/.github/config.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.github/config.yml rename to tests/wpt/tests/tools/third_party/pytest/.github/config.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/dependabot.yml b/tests/wpt/tests/tools/third_party/pytest/.github/dependabot.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.github/dependabot.yml rename to tests/wpt/tests/tools/third_party/pytest/.github/dependabot.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/labels.toml b/tests/wpt/tests/tools/third_party/pytest/.github/labels.toml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.github/labels.toml rename to tests/wpt/tests/tools/third_party/pytest/.github/labels.toml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/workflows/main.yml b/tests/wpt/tests/tools/third_party/pytest/.github/workflows/main.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.github/workflows/main.yml rename to tests/wpt/tests/tools/third_party/pytest/.github/workflows/main.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/workflows/prepare-release-pr.yml b/tests/wpt/tests/tools/third_party/pytest/.github/workflows/prepare-release-pr.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.github/workflows/prepare-release-pr.yml rename to tests/wpt/tests/tools/third_party/pytest/.github/workflows/prepare-release-pr.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.github/workflows/update-plugin-list.yml b/tests/wpt/tests/tools/third_party/pytest/.github/workflows/update-plugin-list.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.github/workflows/update-plugin-list.yml rename to tests/wpt/tests/tools/third_party/pytest/.github/workflows/update-plugin-list.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.gitignore b/tests/wpt/tests/tools/third_party/pytest/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.gitignore rename to tests/wpt/tests/tools/third_party/pytest/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.pre-commit-config.yaml b/tests/wpt/tests/tools/third_party/pytest/.pre-commit-config.yaml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.pre-commit-config.yaml rename to tests/wpt/tests/tools/third_party/pytest/.pre-commit-config.yaml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/.readthedocs.yml b/tests/wpt/tests/tools/third_party/pytest/.readthedocs.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/.readthedocs.yml rename to tests/wpt/tests/tools/third_party/pytest/.readthedocs.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/AUTHORS b/tests/wpt/tests/tools/third_party/pytest/AUTHORS similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/AUTHORS rename to tests/wpt/tests/tools/third_party/pytest/AUTHORS diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/CHANGELOG.rst b/tests/wpt/tests/tools/third_party/pytest/CHANGELOG.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/CHANGELOG.rst rename to tests/wpt/tests/tools/third_party/pytest/CHANGELOG.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/CITATION b/tests/wpt/tests/tools/third_party/pytest/CITATION similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/CITATION rename to tests/wpt/tests/tools/third_party/pytest/CITATION diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/CODE_OF_CONDUCT.md b/tests/wpt/tests/tools/third_party/pytest/CODE_OF_CONDUCT.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/CODE_OF_CONDUCT.md rename to tests/wpt/tests/tools/third_party/pytest/CODE_OF_CONDUCT.md diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/CONTRIBUTING.rst b/tests/wpt/tests/tools/third_party/pytest/CONTRIBUTING.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/CONTRIBUTING.rst rename to tests/wpt/tests/tools/third_party/pytest/CONTRIBUTING.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/LICENSE b/tests/wpt/tests/tools/third_party/pytest/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/LICENSE rename to tests/wpt/tests/tools/third_party/pytest/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/OPENCOLLECTIVE.rst b/tests/wpt/tests/tools/third_party/pytest/OPENCOLLECTIVE.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/OPENCOLLECTIVE.rst rename to tests/wpt/tests/tools/third_party/pytest/OPENCOLLECTIVE.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/README.rst b/tests/wpt/tests/tools/third_party/pytest/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/README.rst rename to tests/wpt/tests/tools/third_party/pytest/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/RELEASING.rst b/tests/wpt/tests/tools/third_party/pytest/RELEASING.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/RELEASING.rst rename to tests/wpt/tests/tools/third_party/pytest/RELEASING.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/TIDELIFT.rst b/tests/wpt/tests/tools/third_party/pytest/TIDELIFT.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/TIDELIFT.rst rename to tests/wpt/tests/tools/third_party/pytest/TIDELIFT.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/bench.py b/tests/wpt/tests/tools/third_party/pytest/bench/bench.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/bench/bench.py rename to tests/wpt/tests/tools/third_party/pytest/bench/bench.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/bench_argcomplete.py b/tests/wpt/tests/tools/third_party/pytest/bench/bench_argcomplete.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/bench/bench_argcomplete.py rename to tests/wpt/tests/tools/third_party/pytest/bench/bench_argcomplete.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/empty.py b/tests/wpt/tests/tools/third_party/pytest/bench/empty.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/bench/empty.py rename to tests/wpt/tests/tools/third_party/pytest/bench/empty.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/manyparam.py b/tests/wpt/tests/tools/third_party/pytest/bench/manyparam.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/bench/manyparam.py rename to tests/wpt/tests/tools/third_party/pytest/bench/manyparam.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/skip.py b/tests/wpt/tests/tools/third_party/pytest/bench/skip.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/bench/skip.py rename to tests/wpt/tests/tools/third_party/pytest/bench/skip.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/unit_test.py b/tests/wpt/tests/tools/third_party/pytest/bench/unit_test.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/bench/unit_test.py rename to tests/wpt/tests/tools/third_party/pytest/bench/unit_test.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/bench/xunit.py b/tests/wpt/tests/tools/third_party/pytest/bench/xunit.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/bench/xunit.py rename to tests/wpt/tests/tools/third_party/pytest/bench/xunit.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/changelog/README.rst b/tests/wpt/tests/tools/third_party/pytest/changelog/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/changelog/README.rst rename to tests/wpt/tests/tools/third_party/pytest/changelog/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/changelog/_template.rst b/tests/wpt/tests/tools/third_party/pytest/changelog/_template.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/changelog/_template.rst rename to tests/wpt/tests/tools/third_party/pytest/changelog/_template.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/codecov.yml b/tests/wpt/tests/tools/third_party/pytest/codecov.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/codecov.yml rename to tests/wpt/tests/tools/third_party/pytest/codecov.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/Makefile b/tests/wpt/tests/tools/third_party/pytest/doc/en/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/Makefile rename to tests/wpt/tests/tools/third_party/pytest/doc/en/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_templates/globaltoc.html b/tests/wpt/tests/tools/third_party/pytest/doc/en/_templates/globaltoc.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_templates/globaltoc.html rename to tests/wpt/tests/tools/third_party/pytest/doc/en/_templates/globaltoc.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_templates/layout.html b/tests/wpt/tests/tools/third_party/pytest/doc/en/_templates/layout.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_templates/layout.html rename to tests/wpt/tests/tools/third_party/pytest/doc/en/_templates/layout.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_templates/links.html b/tests/wpt/tests/tools/third_party/pytest/doc/en/_templates/links.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_templates/links.html rename to tests/wpt/tests/tools/third_party/pytest/doc/en/_templates/links.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_templates/relations.html b/tests/wpt/tests/tools/third_party/pytest/doc/en/_templates/relations.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_templates/relations.html rename to tests/wpt/tests/tools/third_party/pytest/doc/en/_templates/relations.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_templates/sidebarintro.html b/tests/wpt/tests/tools/third_party/pytest/doc/en/_templates/sidebarintro.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_templates/sidebarintro.html rename to tests/wpt/tests/tools/third_party/pytest/doc/en/_templates/sidebarintro.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_templates/slim_searchbox.html b/tests/wpt/tests/tools/third_party/pytest/doc/en/_templates/slim_searchbox.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/_templates/slim_searchbox.html rename to tests/wpt/tests/tools/third_party/pytest/doc/en/_templates/slim_searchbox.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/adopt.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/adopt.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/adopt.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/adopt.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/index.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/index.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.0.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.0.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.0.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.0.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.0.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.0.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.0.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.0.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.0.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.0.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.0.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.0.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.0.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.0.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.0.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.0.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.1.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.1.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.1.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.1.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.1.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.1.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.1.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.1.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.1.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.1.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.1.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.1.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.1.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.1.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.1.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.1.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.2.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.2.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.2.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.2.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.2.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.2.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.2.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.2.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.2.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.2.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.2.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.2.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.2.4.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.2.4.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.2.4.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.2.4.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.3.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.3.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.3.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.3.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.3.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.3.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.3.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.3.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.3.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.3.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.3.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.3.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.3.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.3.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.3.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.3.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.3.4.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.3.4.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.3.4.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.3.4.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.3.5.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.3.5.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.3.5.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.3.5.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.4.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.4.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.4.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.4.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.4.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.4.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.4.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.4.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.4.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.4.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.4.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.4.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.5.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.5.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.5.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.5.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.5.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.5.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.5.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.5.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.5.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.5.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.5.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.5.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.6.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.6.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.6.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.6.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.6.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.6.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.6.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.6.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.6.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.6.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.6.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.6.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.6.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.6.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.6.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.6.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.7.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.7.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.7.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.7.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.7.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.7.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.7.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.7.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.7.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.7.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.7.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.7.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.8.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.8.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.8.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.8.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.8.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.8.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.8.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.8.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.8.4.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.8.4.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.8.4.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.8.4.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.8.5.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.8.5.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.8.5.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.8.5.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.8.6.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.8.6.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.8.6.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.8.6.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.8.7.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.8.7.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.8.7.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.8.7.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.9.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.9.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.9.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.9.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.9.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.9.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.9.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.9.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.9.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.9.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-2.9.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-2.9.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.4.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.4.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.4.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.4.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.5.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.5.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.5.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.5.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.6.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.6.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.6.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.6.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.7.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.7.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.0.7.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.0.7.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.1.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.1.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.1.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.1.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.1.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.1.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.1.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.1.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.1.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.1.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.1.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.1.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.1.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.1.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.1.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.1.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.10.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.10.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.10.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.10.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.10.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.10.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.10.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.10.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.2.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.2.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.2.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.2.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.2.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.2.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.2.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.2.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.2.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.2.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.2.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.2.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.2.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.2.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.2.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.2.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.2.4.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.2.4.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.2.4.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.2.4.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.2.5.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.2.5.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.2.5.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.2.5.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.3.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.3.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.3.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.3.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.3.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.3.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.3.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.3.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.3.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.3.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.3.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.3.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.4.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.4.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.4.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.4.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.4.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.4.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.4.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.4.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.4.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.4.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.4.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.4.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.5.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.5.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.5.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.5.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.5.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.5.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.5.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.5.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.6.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.6.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.6.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.6.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.6.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.6.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.6.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.6.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.4.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.6.4.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.6.4.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.6.4.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.7.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.7.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.7.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.7.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.7.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.7.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.7.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.7.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.4.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.7.4.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.7.4.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.7.4.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.8.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.8.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.8.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.8.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.8.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.8.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.8.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.9.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.9.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.9.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.9.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.9.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.9.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.9.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-3.9.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-3.9.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.0.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.0.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.0.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.0.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.0.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.0.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.0.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.1.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.1.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.1.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.1.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.1.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.1.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.1.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.1.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.2.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.2.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.2.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.2.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.2.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.2.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.2.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.2.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.3.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.3.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.3.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.3.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.3.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.3.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.3.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.3.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.4.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.4.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.4.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.4.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.4.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.4.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.4.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.5.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.5.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.5.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.5.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.4.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.4.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.4.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.4.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.5.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.5.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.5.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.5.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.6.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.6.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.6.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.6.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.7.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.7.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.7.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.7.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.8.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.8.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.8.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.8.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.9.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.9.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-4.6.9.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-4.6.9.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.0.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.0.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.0.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.0.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.0.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.0.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.0.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.0.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.1.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.1.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.1.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.1.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.1.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.1.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.1.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.1.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.1.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.1.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.1.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.1.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.1.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.1.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.1.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.1.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.2.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.2.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.2.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.2.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.2.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.2.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.2.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.2.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.2.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.2.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.2.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.2.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.2.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.2.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.2.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.2.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.2.4.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.2.4.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.2.4.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.2.4.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.3.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.3.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.3.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.3.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.3.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.3.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.3.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.3.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.3.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.3.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.3.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.3.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.3.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.3.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.3.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.3.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.3.4.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.3.4.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.3.4.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.3.4.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.3.5.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.3.5.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.3.5.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.3.5.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.4.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.4.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.4.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.4.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.4.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.4.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.4.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.4.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.4.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.4.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.4.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.4.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.4.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.4.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-5.4.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-5.4.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.0.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.0.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.0.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.0.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.0.0rc1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.0.0rc1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.0.0rc1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.0.0rc1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.0.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.0.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.0.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.0.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.0.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.0.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.0.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.0.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.1.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.1.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.1.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.1.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.1.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.1.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.1.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.1.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.1.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.1.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.1.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.1.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.2.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.2.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.2.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.2.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.2.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.2.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.2.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.2.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.2.2.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.2.2.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.2.2.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.2.2.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.2.3.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.2.3.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.2.3.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.2.3.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.2.4.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.2.4.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.2.4.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.2.4.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.2.5.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.2.5.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-6.2.5.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-6.2.5.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-7.0.0.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-7.0.0.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-7.0.0.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-7.0.0.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-7.0.0rc1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-7.0.0rc1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-7.0.0rc1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-7.0.0rc1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-7.0.1.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-7.0.1.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/release-7.0.1.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/release-7.0.1.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/sprint2016.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/announce/sprint2016.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/announce/sprint2016.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/announce/sprint2016.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/backwards-compatibility.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/backwards-compatibility.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/backwards-compatibility.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/backwards-compatibility.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/builtin.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/builtin.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/builtin.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/builtin.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/changelog.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/changelog.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/changelog.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/changelog.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/conf.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/conf.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/conf.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/conftest.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/contact.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/contact.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/contact.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/contact.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/contents.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/contents.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/contents.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/contents.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/contributing.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/contributing.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/contributing.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/contributing.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/deprecations.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/deprecations.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/deprecations.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/deprecations.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/development_guide.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/development_guide.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/development_guide.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/development_guide.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/failure_demo.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/assertion/failure_demo.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/failure_demo.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/assertion/failure_demo.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/conftest.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/test_hello_world.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/test_hello_world.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/test_hello_world.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/assertion/global_testmodule_config/test_hello_world.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/test_failures.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/assertion/test_failures.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/test_failures.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/assertion/test_failures.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/test_setup_flow_example.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/assertion/test_setup_flow_example.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/assertion/test_setup_flow_example.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/assertion/test_setup_flow_example.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/attic.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/attic.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/attic.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/attic.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/conftest.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/fixture_availability.svg b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/fixture_availability.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/fixture_availability.svg rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/fixture_availability.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/fixture_availability_plugins.svg b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/fixture_availability_plugins.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/fixture_availability_plugins.svg rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/fixture_availability_plugins.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse.svg b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse.svg rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_flat.svg b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_flat.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_flat.svg rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_flat.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_multiple_scopes.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_multiple_scopes.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_multiple_scopes.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_multiple_scopes.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_multiple_scopes.svg b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_multiple_scopes.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_multiple_scopes.svg rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_multiple_scopes.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_temp_effects.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_temp_effects.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_temp_effects.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_temp_effects.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_temp_effects.svg b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_temp_effects.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_temp_effects.svg rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_autouse_temp_effects.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies.svg b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies.svg rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies_flat.svg b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies_flat.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies_flat.svg rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies_flat.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies_unclear.svg b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies_unclear.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies_unclear.svg rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_dependencies_unclear.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_scope.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_scope.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_scope.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_scope.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_scope.svg b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_scope.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_scope.svg rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_order_scope.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_request_different_scope.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_request_different_scope.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_request_different_scope.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_request_different_scope.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_request_different_scope.svg b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_request_different_scope.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_request_different_scope.svg rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/fixtures/test_fixtures_request_different_scope.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/index.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/index.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/markers.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/markers.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/markers.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/markers.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/multipython.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/multipython.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/multipython.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/multipython.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/nonpython.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/nonpython.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython/__init__.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/nonpython/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/nonpython/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython/conftest.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/nonpython/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/nonpython/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython/test_simple.yaml b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/nonpython/test_simple.yaml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/nonpython/test_simple.yaml rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/nonpython/test_simple.yaml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/parametrize.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/parametrize.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/parametrize.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/parametrize.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/pythoncollection.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/pythoncollection.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/pythoncollection.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/pythoncollection.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/pythoncollection.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/pythoncollection.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/pythoncollection.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/pythoncollection.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/reportingdemo.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/reportingdemo.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/reportingdemo.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/reportingdemo.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/simple.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/simple.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/simple.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/simple.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/special.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/special.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/special.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/special.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/xfail_demo.py b/tests/wpt/tests/tools/third_party/pytest/doc/en/example/xfail_demo.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/example/xfail_demo.py rename to tests/wpt/tests/tools/third_party/pytest/doc/en/example/xfail_demo.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/explanation/anatomy.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/explanation/anatomy.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/explanation/anatomy.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/explanation/anatomy.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/explanation/fixtures.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/explanation/fixtures.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/explanation/fixtures.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/explanation/fixtures.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/explanation/flaky.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/explanation/flaky.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/explanation/flaky.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/explanation/flaky.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/explanation/goodpractices.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/explanation/goodpractices.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/explanation/goodpractices.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/explanation/goodpractices.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/explanation/index.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/explanation/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/explanation/index.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/explanation/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/explanation/pythonpath.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/explanation/pythonpath.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/explanation/pythonpath.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/explanation/pythonpath.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/funcarg_compare.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/funcarg_compare.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/funcarg_compare.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/funcarg_compare.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/funcargs.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/funcargs.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/funcargs.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/funcargs.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/getting-started.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/getting-started.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/getting-started.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/getting-started.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/historical-notes.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/historical-notes.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/historical-notes.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/historical-notes.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/history.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/history.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/history.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/history.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/assert.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/assert.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/assert.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/assert.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/bash-completion.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/bash-completion.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/bash-completion.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/bash-completion.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/cache.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/cache.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/cache.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/cache.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/capture-stdout-stderr.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/capture-stdout-stderr.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/capture-stdout-stderr.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/capture-stdout-stderr.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/capture-warnings.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/capture-warnings.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/capture-warnings.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/capture-warnings.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/doctest.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/doctest.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/doctest.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/doctest.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/existingtestsuite.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/existingtestsuite.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/existingtestsuite.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/existingtestsuite.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/failures.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/failures.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/failures.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/failures.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/fixtures.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/fixtures.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/fixtures.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/fixtures.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/index.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/index.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/logging.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/logging.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/logging.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/logging.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/mark.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/mark.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/mark.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/mark.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/monkeypatch.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/monkeypatch.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/monkeypatch.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/monkeypatch.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/nose.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/nose.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/nose.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/nose.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/output.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/output.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/output.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/output.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/parametrize.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/parametrize.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/parametrize.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/parametrize.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/plugins.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/plugins.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/plugins.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/plugins.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/skipping.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/skipping.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/skipping.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/skipping.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/tmp_path.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/tmp_path.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/tmp_path.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/tmp_path.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/unittest.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/unittest.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/unittest.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/unittest.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/usage.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/usage.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/usage.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/usage.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/writing_hook_functions.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/writing_hook_functions.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/writing_hook_functions.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/writing_hook_functions.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/writing_plugins.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/writing_plugins.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/writing_plugins.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/writing_plugins.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/xunit_setup.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/xunit_setup.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/how-to/xunit_setup.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/how-to/xunit_setup.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/cramer2.png b/tests/wpt/tests/tools/third_party/pytest/doc/en/img/cramer2.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/cramer2.png rename to tests/wpt/tests/tools/third_party/pytest/doc/en/img/cramer2.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/favicon.png b/tests/wpt/tests/tools/third_party/pytest/doc/en/img/favicon.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/favicon.png rename to tests/wpt/tests/tools/third_party/pytest/doc/en/img/favicon.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/freiburg2.jpg b/tests/wpt/tests/tools/third_party/pytest/doc/en/img/freiburg2.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/freiburg2.jpg rename to tests/wpt/tests/tools/third_party/pytest/doc/en/img/freiburg2.jpg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/gaynor3.png b/tests/wpt/tests/tools/third_party/pytest/doc/en/img/gaynor3.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/gaynor3.png rename to tests/wpt/tests/tools/third_party/pytest/doc/en/img/gaynor3.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/keleshev.png b/tests/wpt/tests/tools/third_party/pytest/doc/en/img/keleshev.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/keleshev.png rename to tests/wpt/tests/tools/third_party/pytest/doc/en/img/keleshev.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/pullrequest.png b/tests/wpt/tests/tools/third_party/pytest/doc/en/img/pullrequest.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/pullrequest.png rename to tests/wpt/tests/tools/third_party/pytest/doc/en/img/pullrequest.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/pylib.png b/tests/wpt/tests/tools/third_party/pytest/doc/en/img/pylib.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/pylib.png rename to tests/wpt/tests/tools/third_party/pytest/doc/en/img/pylib.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/pytest1.png b/tests/wpt/tests/tools/third_party/pytest/doc/en/img/pytest1.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/pytest1.png rename to tests/wpt/tests/tools/third_party/pytest/doc/en/img/pytest1.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/pytest_logo_curves.svg b/tests/wpt/tests/tools/third_party/pytest/doc/en/img/pytest_logo_curves.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/pytest_logo_curves.svg rename to tests/wpt/tests/tools/third_party/pytest/doc/en/img/pytest_logo_curves.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/theuni.png b/tests/wpt/tests/tools/third_party/pytest/doc/en/img/theuni.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/img/theuni.png rename to tests/wpt/tests/tools/third_party/pytest/doc/en/img/theuni.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/index.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/index.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/license.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/license.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/license.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/license.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/naming20.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/naming20.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/naming20.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/naming20.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/proposals/parametrize_with_fixtures.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/proposals/parametrize_with_fixtures.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/proposals/parametrize_with_fixtures.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/proposals/parametrize_with_fixtures.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/py27-py34-deprecation.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/py27-py34-deprecation.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/py27-py34-deprecation.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/py27-py34-deprecation.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/pytest.ini b/tests/wpt/tests/tools/third_party/pytest/doc/en/pytest.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/pytest.ini rename to tests/wpt/tests/tools/third_party/pytest/doc/en/pytest.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/recwarn.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/recwarn.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/recwarn.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/recwarn.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference/customize.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/reference/customize.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference/customize.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/reference/customize.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference/exit-codes.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/reference/exit-codes.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference/exit-codes.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/reference/exit-codes.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference/fixtures.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/reference/fixtures.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference/fixtures.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/reference/fixtures.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference/index.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/reference/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference/index.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/reference/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference/plugin_list.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/reference/plugin_list.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference/plugin_list.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/reference/plugin_list.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference/reference.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/reference/reference.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/reference/reference.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/reference/reference.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/requirements.txt b/tests/wpt/tests/tools/third_party/pytest/doc/en/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/requirements.txt rename to tests/wpt/tests/tools/third_party/pytest/doc/en/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/sponsor.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/sponsor.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/sponsor.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/sponsor.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/talks.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/talks.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/talks.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/talks.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/tidelift.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/tidelift.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/tidelift.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/tidelift.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/yieldfixture.rst b/tests/wpt/tests/tools/third_party/pytest/doc/en/yieldfixture.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/doc/en/yieldfixture.rst rename to tests/wpt/tests/tools/third_party/pytest/doc/en/yieldfixture.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/extra/get_issues.py b/tests/wpt/tests/tools/third_party/pytest/extra/get_issues.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/extra/get_issues.py rename to tests/wpt/tests/tools/third_party/pytest/extra/get_issues.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/extra/setup-py.test/setup.py b/tests/wpt/tests/tools/third_party/pytest/extra/setup-py.test/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/extra/setup-py.test/setup.py rename to tests/wpt/tests/tools/third_party/pytest/extra/setup-py.test/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/pyproject.toml b/tests/wpt/tests/tools/third_party/pytest/pyproject.toml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/pyproject.toml rename to tests/wpt/tests/tools/third_party/pytest/pyproject.toml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/prepare-release-pr.py b/tests/wpt/tests/tools/third_party/pytest/scripts/prepare-release-pr.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/prepare-release-pr.py rename to tests/wpt/tests/tools/third_party/pytest/scripts/prepare-release-pr.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/publish-gh-release-notes.py b/tests/wpt/tests/tools/third_party/pytest/scripts/publish-gh-release-notes.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/publish-gh-release-notes.py rename to tests/wpt/tests/tools/third_party/pytest/scripts/publish-gh-release-notes.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.major.rst b/tests/wpt/tests/tools/third_party/pytest/scripts/release.major.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.major.rst rename to tests/wpt/tests/tools/third_party/pytest/scripts/release.major.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.minor.rst b/tests/wpt/tests/tools/third_party/pytest/scripts/release.minor.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.minor.rst rename to tests/wpt/tests/tools/third_party/pytest/scripts/release.minor.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.patch.rst b/tests/wpt/tests/tools/third_party/pytest/scripts/release.patch.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.patch.rst rename to tests/wpt/tests/tools/third_party/pytest/scripts/release.patch.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.pre.rst b/tests/wpt/tests/tools/third_party/pytest/scripts/release.pre.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.pre.rst rename to tests/wpt/tests/tools/third_party/pytest/scripts/release.pre.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.py b/tests/wpt/tests/tools/third_party/pytest/scripts/release.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/release.py rename to tests/wpt/tests/tools/third_party/pytest/scripts/release.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/towncrier-draft-to-file.py b/tests/wpt/tests/tools/third_party/pytest/scripts/towncrier-draft-to-file.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/towncrier-draft-to-file.py rename to tests/wpt/tests/tools/third_party/pytest/scripts/towncrier-draft-to-file.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/update-plugin-list.py b/tests/wpt/tests/tools/third_party/pytest/scripts/update-plugin-list.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/scripts/update-plugin-list.py rename to tests/wpt/tests/tools/third_party/pytest/scripts/update-plugin-list.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/setup.cfg b/tests/wpt/tests/tools/third_party/pytest/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/setup.cfg rename to tests/wpt/tests/tools/third_party/pytest/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/setup.py b/tests/wpt/tests/tools/third_party/pytest/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/setup.py rename to tests/wpt/tests/tools/third_party/pytest/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/__init__.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_argcomplete.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/_argcomplete.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_argcomplete.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/_argcomplete.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/__init__.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/_code/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/_code/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/code.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/_code/code.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/code.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/_code/code.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/source.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/_code/source.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_code/source.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/_code/source.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/__init__.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/_io/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/_io/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/saferepr.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/_io/saferepr.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/saferepr.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/_io/saferepr.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/terminalwriter.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/_io/terminalwriter.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/terminalwriter.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/_io/terminalwriter.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/wcwidth.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/_io/wcwidth.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_io/wcwidth.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/_io/wcwidth.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_version.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/_version.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/_version.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/_version.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/__init__.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/assertion/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/assertion/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/rewrite.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/assertion/rewrite.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/rewrite.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/assertion/rewrite.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/truncate.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/assertion/truncate.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/truncate.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/assertion/truncate.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/util.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/assertion/util.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/assertion/util.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/assertion/util.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/cacheprovider.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/cacheprovider.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/cacheprovider.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/cacheprovider.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/capture.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/capture.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/capture.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/capture.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/compat.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/compat.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/compat.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/compat.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/__init__.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/config/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/config/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/argparsing.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/config/argparsing.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/argparsing.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/config/argparsing.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/compat.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/config/compat.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/compat.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/config/compat.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/exceptions.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/config/exceptions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/exceptions.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/config/exceptions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/findpaths.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/config/findpaths.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/config/findpaths.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/config/findpaths.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/debugging.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/debugging.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/debugging.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/debugging.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/deprecated.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/deprecated.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/deprecated.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/deprecated.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/doctest.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/doctest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/doctest.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/doctest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/faulthandler.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/faulthandler.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/faulthandler.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/faulthandler.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/fixtures.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/fixtures.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/fixtures.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/fixtures.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/freeze_support.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/freeze_support.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/freeze_support.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/freeze_support.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/helpconfig.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/helpconfig.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/helpconfig.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/helpconfig.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/hookspec.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/hookspec.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/hookspec.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/hookspec.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/junitxml.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/junitxml.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/junitxml.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/junitxml.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/legacypath.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/legacypath.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/legacypath.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/legacypath.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/logging.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/logging.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/logging.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/logging.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/main.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/main.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/main.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/main.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/__init__.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/mark/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/mark/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/expression.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/mark/expression.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/expression.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/mark/expression.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/structures.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/mark/structures.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/mark/structures.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/mark/structures.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/monkeypatch.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/monkeypatch.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/monkeypatch.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/monkeypatch.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/nodes.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/nodes.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/nodes.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/nodes.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/nose.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/nose.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/nose.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/nose.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/outcomes.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/outcomes.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/outcomes.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/outcomes.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pastebin.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/pastebin.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pastebin.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/pastebin.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pathlib.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/pathlib.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pathlib.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/pathlib.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/py.typed b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/py.typed similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/py.typed rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/py.typed diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pytester.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/pytester.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pytester.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/pytester.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pytester_assertions.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/pytester_assertions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/pytester_assertions.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/pytester_assertions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/python.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/python.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/python.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/python.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/python_api.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/python_api.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/python_api.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/python_api.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/python_path.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/python_path.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/python_path.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/python_path.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/recwarn.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/recwarn.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/recwarn.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/recwarn.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/reports.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/reports.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/reports.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/reports.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/runner.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/runner.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/runner.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/runner.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/scope.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/scope.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/scope.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/scope.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/setuponly.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/setuponly.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/setuponly.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/setuponly.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/setupplan.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/setupplan.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/setupplan.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/setupplan.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/skipping.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/skipping.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/skipping.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/skipping.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/stash.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/stash.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/stash.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/stash.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/stepwise.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/stepwise.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/stepwise.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/stepwise.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/terminal.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/terminal.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/terminal.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/terminal.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/threadexception.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/threadexception.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/threadexception.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/threadexception.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/timing.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/timing.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/timing.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/timing.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/tmpdir.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/tmpdir.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/tmpdir.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/tmpdir.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/unittest.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/unittest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/unittest.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/unittest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/unraisableexception.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/unraisableexception.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/unraisableexception.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/unraisableexception.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/warning_types.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/warning_types.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/warning_types.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/warning_types.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/warnings.py b/tests/wpt/tests/tools/third_party/pytest/src/_pytest/warnings.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/_pytest/warnings.py rename to tests/wpt/tests/tools/third_party/pytest/src/_pytest/warnings.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/pytest/__init__.py b/tests/wpt/tests/tools/third_party/pytest/src/pytest/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/pytest/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/src/pytest/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/pytest/__main__.py b/tests/wpt/tests/tools/third_party/pytest/src/pytest/__main__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/pytest/__main__.py rename to tests/wpt/tests/tools/third_party/pytest/src/pytest/__main__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/pytest/collect.py b/tests/wpt/tests/tools/third_party/pytest/src/pytest/collect.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/pytest/collect.py rename to tests/wpt/tests/tools/third_party/pytest/src/pytest/collect.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/src/pytest/py.typed b/tests/wpt/tests/tools/third_party/pytest/src/pytest/py.typed similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/src/pytest/py.typed rename to tests/wpt/tests/tools/third_party/pytest/src/pytest/py.typed diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/acceptance_test.py b/tests/wpt/tests/tools/third_party/pytest/testing/acceptance_test.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/acceptance_test.py rename to tests/wpt/tests/tools/third_party/pytest/testing/acceptance_test.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_code.py b/tests/wpt/tests/tools/third_party/pytest/testing/code/test_code.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_code.py rename to tests/wpt/tests/tools/third_party/pytest/testing/code/test_code.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_excinfo.py b/tests/wpt/tests/tools/third_party/pytest/testing/code/test_excinfo.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_excinfo.py rename to tests/wpt/tests/tools/third_party/pytest/testing/code/test_excinfo.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_source.py b/tests/wpt/tests/tools/third_party/pytest/testing/code/test_source.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/code/test_source.py rename to tests/wpt/tests/tools/third_party/pytest/testing/code/test_source.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/conftest.py b/tests/wpt/tests/tools/third_party/pytest/testing/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/deprecated_test.py b/tests/wpt/tests/tools/third_party/pytest/testing/deprecated_test.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/deprecated_test.py rename to tests/wpt/tests/tools/third_party/pytest/testing/deprecated_test.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/README.rst b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/README.rst rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/__init__.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/acceptance/fixture_mock_integration.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/acceptance/fixture_mock_integration.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/acceptance/fixture_mock_integration.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/acceptance/fixture_mock_integration.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/pytest.ini b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/pytest.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/pytest.ini rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/pytest.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/__init__.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/test_foo.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/test_foo.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/test_foo.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/collect_init_tests/tests/test_foo.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/__init__.pyi b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/__init__.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/__init__.pyi rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/__init__.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/conftest.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/__init__.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/test_foo.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/test_foo.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/test_foo.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/collect/package_init_given_as_arg/pkg/test_foo.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/__init__.pyi b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/__init__.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/__init__.pyi rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/__init__.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/conftest.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/test_foo.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/test_foo.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/test_foo.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/config/collect_pytest_prefix/test_foo.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/conftest_usageerror/__init__.pyi b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/conftest_usageerror/__init__.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/conftest_usageerror/__init__.pyi rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/conftest_usageerror/__init__.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/conftest_usageerror/conftest.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/conftest_usageerror/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/conftest_usageerror/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/conftest_usageerror/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_field_comparison_off.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_field_comparison_off.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_field_comparison_off.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_field_comparison_off.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_verbose.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_verbose.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_verbose.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_dataclasses_verbose.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_recursive_dataclasses.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_recursive_dataclasses.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_recursive_dataclasses.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_recursive_dataclasses.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_two_different_dataclasses.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_two_different_dataclasses.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_two_different_dataclasses.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/dataclasses/test_compare_two_different_dataclasses.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/doctest/main_py/__main__.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/doctest/main_py/__main__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/doctest/main_py/__main__.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/doctest/main_py/__main__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/doctest/main_py/test_normal_module.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/doctest/main_py/test_normal_module.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/doctest/main_py/test_normal_module.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/doctest/main_py/test_normal_module.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/__init__.pyi b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/__init__.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/__init__.pyi rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/__init__.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/conftest.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/__init__.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/test_foo.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/test_foo.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/test_foo.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/custom_item/foo/test_foo.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/__init__.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/__init__.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_detect_recursive_dependency_error.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_detect_recursive_dependency_error.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_detect_recursive_dependency_error.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_detect_recursive_dependency_error.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/__init__.pyi b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/__init__.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/__init__.pyi rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/__init__.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/__init__.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/__init__.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/__init__.pyi b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/__init__.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/__init__.pyi rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/__init__.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/test_fixture_named_request.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/test_fixture_named_request.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/test_fixture_named_request.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/test_fixture_named_request.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/test_getfixturevalue_dynamic.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/test_getfixturevalue_dynamic.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/fixtures/test_getfixturevalue_dynamic.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/fixtures/test_getfixturevalue_dynamic.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/__init__.pyi b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/__init__.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/__init__.pyi rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/__init__.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/conftest.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/test_hello.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/test_hello.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/test_hello.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/issue88_initial_file_multinodes/test_hello.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue_519.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/issue_519.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/issue_519.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/issue_519.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/junit-10.xsd b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/junit-10.xsd similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/junit-10.xsd rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/junit-10.xsd diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/__init__.pyi b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/__init__.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/__init__.pyi rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/__init__.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/conftest.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/conftest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/test_marks_as_keywords.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/test_marks_as_keywords.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/test_marks_as_keywords.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/marks/marks_considered_keywords/test_marks_as_keywords.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/.gitignore b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/.gitignore rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/generate_folders.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/generate_folders.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/generate_folders.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/generate_folders.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/template_test.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/template_test.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/template_test.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/perf_examples/collect_stats/template_test.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/pytest.ini b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/pytest.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/pytest.ini rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/pytest.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/tmpdir/tmp_path_fixture.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/tmpdir/tmp_path_fixture.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/tmpdir/tmp_path_fixture.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/tmpdir/tmp_path_fixture.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_parametrized_fixture_error_message.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/unittest/test_parametrized_fixture_error_message.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_parametrized_fixture_error_message.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/unittest/test_parametrized_fixture_error_message.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_class.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_class.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_class.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_class.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_module.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_module.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_module.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/unittest/test_setup_skip_module.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_unittest_asyncio.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/unittest/test_unittest_asyncio.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_unittest_asyncio.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/unittest/test_unittest_asyncio.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_unittest_asynctest.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/unittest/test_unittest_asynctest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_unittest_asynctest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/unittest/test_unittest_asynctest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_unittest_plain_async.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/unittest/test_unittest_plain_async.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/unittest/test_unittest_plain_async.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/unittest/test_unittest_plain_async.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message_summary/test_1.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message_summary/test_1.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message_summary/test_1.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message_summary/test_1.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message_summary/test_2.py b/tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message_summary/test_2.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message_summary/test_2.py rename to tests/wpt/tests/tools/third_party/pytest/testing/example_scripts/warnings/test_group_warnings_by_message_summary/test_2.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/examples/test_issue519.py b/tests/wpt/tests/tools/third_party/pytest/testing/examples/test_issue519.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/examples/test_issue519.py rename to tests/wpt/tests/tools/third_party/pytest/testing/examples/test_issue519.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/.gitignore b/tests/wpt/tests/tools/third_party/pytest/testing/freeze/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/.gitignore rename to tests/wpt/tests/tools/third_party/pytest/testing/freeze/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/create_executable.py b/tests/wpt/tests/tools/third_party/pytest/testing/freeze/create_executable.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/create_executable.py rename to tests/wpt/tests/tools/third_party/pytest/testing/freeze/create_executable.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/runtests_script.py b/tests/wpt/tests/tools/third_party/pytest/testing/freeze/runtests_script.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/runtests_script.py rename to tests/wpt/tests/tools/third_party/pytest/testing/freeze/runtests_script.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/tests/test_doctest.txt b/tests/wpt/tests/tools/third_party/pytest/testing/freeze/tests/test_doctest.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/tests/test_doctest.txt rename to tests/wpt/tests/tools/third_party/pytest/testing/freeze/tests/test_doctest.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/tests/test_trivial.py b/tests/wpt/tests/tools/third_party/pytest/testing/freeze/tests/test_trivial.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/tests/test_trivial.py rename to tests/wpt/tests/tools/third_party/pytest/testing/freeze/tests/test_trivial.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/tox_run.py b/tests/wpt/tests/tools/third_party/pytest/testing/freeze/tox_run.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/freeze/tox_run.py rename to tests/wpt/tests/tools/third_party/pytest/testing/freeze/tox_run.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/io/test_saferepr.py b/tests/wpt/tests/tools/third_party/pytest/testing/io/test_saferepr.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/io/test_saferepr.py rename to tests/wpt/tests/tools/third_party/pytest/testing/io/test_saferepr.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/io/test_terminalwriter.py b/tests/wpt/tests/tools/third_party/pytest/testing/io/test_terminalwriter.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/io/test_terminalwriter.py rename to tests/wpt/tests/tools/third_party/pytest/testing/io/test_terminalwriter.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/io/test_wcwidth.py b/tests/wpt/tests/tools/third_party/pytest/testing/io/test_wcwidth.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/io/test_wcwidth.py rename to tests/wpt/tests/tools/third_party/pytest/testing/io/test_wcwidth.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_fixture.py b/tests/wpt/tests/tools/third_party/pytest/testing/logging/test_fixture.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_fixture.py rename to tests/wpt/tests/tools/third_party/pytest/testing/logging/test_fixture.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_formatter.py b/tests/wpt/tests/tools/third_party/pytest/testing/logging/test_formatter.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_formatter.py rename to tests/wpt/tests/tools/third_party/pytest/testing/logging/test_formatter.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_reporting.py b/tests/wpt/tests/tools/third_party/pytest/testing/logging/test_reporting.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/logging/test_reporting.py rename to tests/wpt/tests/tools/third_party/pytest/testing/logging/test_reporting.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/.gitignore b/tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/.gitignore rename to tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/README.rst b/tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/README.rst rename to tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/bdd_wallet.feature b/tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/bdd_wallet.feature similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/bdd_wallet.feature rename to tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/bdd_wallet.feature diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/bdd_wallet.py b/tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/bdd_wallet.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/bdd_wallet.py rename to tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/bdd_wallet.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/django_settings.py b/tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/django_settings.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/django_settings.py rename to tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/django_settings.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/pytest.ini b/tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/pytest.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/pytest.ini rename to tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/pytest.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/pytest_anyio_integration.py b/tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/pytest_anyio_integration.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/pytest_anyio_integration.py rename to tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/pytest_anyio_integration.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/pytest_asyncio_integration.py b/tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/pytest_asyncio_integration.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/pytest_asyncio_integration.py rename to tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/pytest_asyncio_integration.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/pytest_mock_integration.py b/tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/pytest_mock_integration.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/pytest_mock_integration.py rename to tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/pytest_mock_integration.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/pytest_trio_integration.py b/tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/pytest_trio_integration.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/pytest_trio_integration.py rename to tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/pytest_trio_integration.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/pytest_twisted_integration.py b/tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/pytest_twisted_integration.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/pytest_twisted_integration.py rename to tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/pytest_twisted_integration.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/requirements.txt b/tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/requirements.txt rename to tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/simple_integration.py b/tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/simple_integration.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/plugins_integration/simple_integration.py rename to tests/wpt/tests/tools/third_party/pytest/testing/plugins_integration/simple_integration.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/approx.py b/tests/wpt/tests/tools/third_party/pytest/testing/python/approx.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/approx.py rename to tests/wpt/tests/tools/third_party/pytest/testing/python/approx.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/collect.py b/tests/wpt/tests/tools/third_party/pytest/testing/python/collect.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/collect.py rename to tests/wpt/tests/tools/third_party/pytest/testing/python/collect.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/fixtures.py b/tests/wpt/tests/tools/third_party/pytest/testing/python/fixtures.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/fixtures.py rename to tests/wpt/tests/tools/third_party/pytest/testing/python/fixtures.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/integration.py b/tests/wpt/tests/tools/third_party/pytest/testing/python/integration.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/integration.py rename to tests/wpt/tests/tools/third_party/pytest/testing/python/integration.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/metafunc.py b/tests/wpt/tests/tools/third_party/pytest/testing/python/metafunc.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/metafunc.py rename to tests/wpt/tests/tools/third_party/pytest/testing/python/metafunc.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/raises.py b/tests/wpt/tests/tools/third_party/pytest/testing/python/raises.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/raises.py rename to tests/wpt/tests/tools/third_party/pytest/testing/python/raises.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/show_fixtures_per_test.py b/tests/wpt/tests/tools/third_party/pytest/testing/python/show_fixtures_per_test.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/python/show_fixtures_per_test.py rename to tests/wpt/tests/tools/third_party/pytest/testing/python/show_fixtures_per_test.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_argcomplete.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_argcomplete.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_argcomplete.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_argcomplete.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_assertion.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_assertion.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_assertion.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_assertion.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_assertrewrite.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_assertrewrite.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_assertrewrite.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_assertrewrite.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_cacheprovider.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_cacheprovider.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_cacheprovider.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_cacheprovider.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_capture.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_capture.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_capture.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_capture.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_collection.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_collection.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_collection.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_collection.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_compat.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_compat.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_compat.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_compat.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_config.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_config.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_config.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_config.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_conftest.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_conftest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_debugging.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_debugging.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_debugging.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_debugging.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_doctest.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_doctest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_doctest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_doctest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_entry_points.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_entry_points.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_entry_points.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_entry_points.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_error_diffs.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_error_diffs.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_error_diffs.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_error_diffs.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_faulthandler.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_faulthandler.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_faulthandler.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_faulthandler.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_findpaths.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_findpaths.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_findpaths.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_findpaths.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_helpconfig.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_helpconfig.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_helpconfig.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_helpconfig.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_junitxml.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_junitxml.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_junitxml.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_junitxml.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_legacypath.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_legacypath.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_legacypath.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_legacypath.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_link_resolve.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_link_resolve.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_link_resolve.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_link_resolve.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_main.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_main.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_main.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_main.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_mark.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_mark.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_mark.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_mark.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_mark_expression.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_mark_expression.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_mark_expression.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_mark_expression.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_meta.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_meta.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_meta.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_meta.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_monkeypatch.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_monkeypatch.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_monkeypatch.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_monkeypatch.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_nodes.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_nodes.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_nodes.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_nodes.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_nose.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_nose.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_nose.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_nose.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_parseopt.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_parseopt.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_parseopt.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_parseopt.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pastebin.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_pastebin.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pastebin.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_pastebin.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pathlib.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_pathlib.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pathlib.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_pathlib.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pluginmanager.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_pluginmanager.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pluginmanager.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_pluginmanager.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pytester.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_pytester.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_pytester.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_pytester.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_python_path.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_python_path.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_python_path.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_python_path.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_recwarn.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_recwarn.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_recwarn.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_recwarn.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_reports.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_reports.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_reports.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_reports.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_runner.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_runner.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_runner.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_runner.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_runner_xunit.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_runner_xunit.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_runner_xunit.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_runner_xunit.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_scope.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_scope.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_scope.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_scope.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_session.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_session.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_session.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_session.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_setuponly.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_setuponly.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_setuponly.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_setuponly.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_setupplan.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_setupplan.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_setupplan.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_setupplan.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_skipping.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_skipping.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_skipping.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_skipping.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_stash.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_stash.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_stash.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_stash.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_stepwise.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_stepwise.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_stepwise.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_stepwise.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_terminal.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_terminal.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_terminal.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_terminal.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_threadexception.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_threadexception.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_threadexception.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_threadexception.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_tmpdir.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_tmpdir.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_tmpdir.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_tmpdir.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_unittest.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_unittest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_unittest.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_unittest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_unraisableexception.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_unraisableexception.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_unraisableexception.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_unraisableexception.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_warning_types.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_warning_types.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_warning_types.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_warning_types.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_warnings.py b/tests/wpt/tests/tools/third_party/pytest/testing/test_warnings.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/test_warnings.py rename to tests/wpt/tests/tools/third_party/pytest/testing/test_warnings.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/testing/typing_checks.py b/tests/wpt/tests/tools/third_party/pytest/testing/typing_checks.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/testing/typing_checks.py rename to tests/wpt/tests/tools/third_party/pytest/testing/typing_checks.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pytest/tox.ini b/tests/wpt/tests/tools/third_party/pytest/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pytest/tox.ini rename to tests/wpt/tests/tools/third_party/pytest/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/.gitignore b/tests/wpt/tests/tools/third_party/pywebsocket3/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/.gitignore rename to tests/wpt/tests/tools/third_party/pywebsocket3/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/.travis.yml b/tests/wpt/tests/tools/third_party/pywebsocket3/.travis.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/.travis.yml rename to tests/wpt/tests/tools/third_party/pywebsocket3/.travis.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/CONTRIBUTING b/tests/wpt/tests/tools/third_party/pywebsocket3/CONTRIBUTING similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/CONTRIBUTING rename to tests/wpt/tests/tools/third_party/pywebsocket3/CONTRIBUTING diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/LICENSE b/tests/wpt/tests/tools/third_party/pywebsocket3/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/LICENSE rename to tests/wpt/tests/tools/third_party/pywebsocket3/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/MANIFEST.in b/tests/wpt/tests/tools/third_party/pywebsocket3/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/MANIFEST.in rename to tests/wpt/tests/tools/third_party/pywebsocket3/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/README.md b/tests/wpt/tests/tools/third_party/pywebsocket3/README.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/README.md rename to tests/wpt/tests/tools/third_party/pywebsocket3/README.md diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/abort_handshake_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/example/abort_handshake_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/abort_handshake_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/abort_handshake_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/abort_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/example/abort_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/abort_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/abort_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/arraybuffer_benchmark.html b/tests/wpt/tests/tools/third_party/pywebsocket3/example/arraybuffer_benchmark.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/arraybuffer_benchmark.html rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/arraybuffer_benchmark.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/bench_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/example/bench_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/bench_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/bench_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark.html b/tests/wpt/tests/tools/third_party/pywebsocket3/example/benchmark.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark.html rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/benchmark.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark.js b/tests/wpt/tests/tools/third_party/pywebsocket3/example/benchmark.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark.js rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/benchmark.js diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark_helper_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/example/benchmark_helper_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark_helper_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/benchmark_helper_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/cgi-bin/hi.py b/tests/wpt/tests/tools/third_party/pywebsocket3/example/cgi-bin/hi.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/cgi-bin/hi.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/cgi-bin/hi.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/close_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/example/close_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/close_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/close_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/console.html b/tests/wpt/tests/tools/third_party/pywebsocket3/example/console.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/console.html rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/console.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/cookie_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/example/cookie_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/cookie_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/cookie_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_client.py b/tests/wpt/tests/tools/third_party/pywebsocket3/example/echo_client.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_client.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/echo_client.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_noext_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/example/echo_noext_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_noext_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/echo_noext_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/example/echo_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/echo_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/handler_map.txt b/tests/wpt/tests/tools/third_party/pywebsocket3/example/handler_map.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/handler_map.txt rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/handler_map.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/hsts_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/example/hsts_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/hsts_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/hsts_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/internal_error_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/example/internal_error_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/internal_error_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/internal_error_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/origin_check_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/example/origin_check_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/origin_check_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/origin_check_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/performance_test_iframe.html b/tests/wpt/tests/tools/third_party/pywebsocket3/example/performance_test_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/performance_test_iframe.html rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/performance_test_iframe.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/performance_test_iframe.js b/tests/wpt/tests/tools/third_party/pywebsocket3/example/performance_test_iframe.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/performance_test_iframe.js rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/performance_test_iframe.js diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/special_headers.cgi b/tests/wpt/tests/tools/third_party/pywebsocket3/example/special_headers.cgi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/special_headers.cgi rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/special_headers.cgi diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util.js b/tests/wpt/tests/tools/third_party/pywebsocket3/example/util.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util.js rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/util.js diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util_main.js b/tests/wpt/tests/tools/third_party/pywebsocket3/example/util_main.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util_main.js rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/util_main.js diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util_worker.js b/tests/wpt/tests/tools/third_party/pywebsocket3/example/util_worker.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util_worker.js rename to tests/wpt/tests/tools/third_party/pywebsocket3/example/util_worker.js diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/__init__.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/__init__.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/_stream_exceptions.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/_stream_exceptions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/_stream_exceptions.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/_stream_exceptions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/common.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/common.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/common.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/common.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/dispatch.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/dispatch.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/dispatch.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/dispatch.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/extensions.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/extensions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/extensions.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/extensions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/fast_masking.i b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/fast_masking.i similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/fast_masking.i rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/fast_masking.i diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/__init__.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/__init__.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/base.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/base.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/base.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/hybi.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/hybi.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/hybi.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/hybi.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/http_header_util.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/http_header_util.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/http_header_util.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/http_header_util.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/memorizingfile.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/memorizingfile.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/memorizingfile.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/memorizingfile.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/msgutil.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/msgutil.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/msgutil.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/msgutil.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/request_handler.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/request_handler.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/request_handler.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/request_handler.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/server_util.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/server_util.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/server_util.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/server_util.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/standalone.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/standalone.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/standalone.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/standalone.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/stream.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/stream.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/stream.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/stream.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/util.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/util.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/util.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/util.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/websocket_server.py b/tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/websocket_server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/websocket_server.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/mod_pywebsocket/websocket_server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/setup.py b/tests/wpt/tests/tools/third_party/pywebsocket3/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/setup.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/__init__.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/__init__.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/cacert.pem b/tests/wpt/tests/tools/third_party/pywebsocket3/test/cert/cacert.pem similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/cacert.pem rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/cert/cacert.pem diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/cert.pem b/tests/wpt/tests/tools/third_party/pywebsocket3/test/cert/cert.pem similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/cert.pem rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/cert/cert.pem diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/client_cert.p12 b/tests/wpt/tests/tools/third_party/pywebsocket3/test/cert/client_cert.p12 similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/client_cert.p12 rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/cert/client_cert.p12 diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/key.pem b/tests/wpt/tests/tools/third_party/pywebsocket3/test/cert/key.pem similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/key.pem rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/cert/key.pem diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/client_for_testing.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/client_for_testing.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/client_for_testing.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/client_for_testing.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/mock.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/mock.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/mock.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/mock.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/run_all.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/run_all.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/run_all.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/run_all.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/set_sys_path.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/set_sys_path.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/set_sys_path.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/set_sys_path.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_dispatch.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/test_dispatch.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_dispatch.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/test_dispatch.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_endtoend.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/test_endtoend.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_endtoend.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/test_endtoend.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_extensions.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/test_extensions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_extensions.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/test_extensions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_handshake.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/test_handshake.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_handshake.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/test_handshake.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_handshake_hybi.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/test_handshake_hybi.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_handshake_hybi.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/test_handshake_hybi.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_http_header_util.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/test_http_header_util.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_http_header_util.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/test_http_header_util.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_memorizingfile.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/test_memorizingfile.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_memorizingfile.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/test_memorizingfile.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_mock.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/test_mock.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_mock.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/test_mock.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_msgutil.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/test_msgutil.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_msgutil.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/test_msgutil.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_stream.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/test_stream.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_stream.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/test_stream.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_util.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/test_util.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_util.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/test_util.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/README b/tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/README similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/README rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/README diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/abort_by_user_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/abort_by_user_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/abort_by_user_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/abort_by_user_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/blank_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/blank_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/blank_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/blank_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/origin_check_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/origin_check_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/origin_check_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/origin_check_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/exception_in_transfer_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/exception_in_transfer_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/exception_in_transfer_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/exception_in_transfer_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/no_wsh_at_the_end.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/no_wsh_at_the_end.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/no_wsh_at_the_end.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/no_wsh_at_the_end.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/non_callable_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/non_callable_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/non_callable_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/non_callable_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/plain_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/plain_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/plain_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/plain_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/wrong_handshake_sig_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/wrong_handshake_sig_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/wrong_handshake_sig_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/wrong_handshake_sig_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/wrong_transfer_sig_wsh.py b/tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/wrong_transfer_sig_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/wrong_transfer_sig_wsh.py rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/wrong_transfer_sig_wsh.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/hello.pl b/tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/hello.pl similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/hello.pl rename to tests/wpt/tests/tools/third_party/pywebsocket3/test/testdata/hello.pl diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/CHANGES b/tests/wpt/tests/tools/third_party/six/CHANGES similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/CHANGES rename to tests/wpt/tests/tools/third_party/six/CHANGES diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/LICENSE b/tests/wpt/tests/tools/third_party/six/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/LICENSE rename to tests/wpt/tests/tools/third_party/six/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/MANIFEST.in b/tests/wpt/tests/tools/third_party/six/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/MANIFEST.in rename to tests/wpt/tests/tools/third_party/six/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/README.rst b/tests/wpt/tests/tools/third_party/six/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/README.rst rename to tests/wpt/tests/tools/third_party/six/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/documentation/Makefile b/tests/wpt/tests/tools/third_party/six/documentation/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/documentation/Makefile rename to tests/wpt/tests/tools/third_party/six/documentation/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/documentation/conf.py b/tests/wpt/tests/tools/third_party/six/documentation/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/documentation/conf.py rename to tests/wpt/tests/tools/third_party/six/documentation/conf.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/documentation/index.rst b/tests/wpt/tests/tools/third_party/six/documentation/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/documentation/index.rst rename to tests/wpt/tests/tools/third_party/six/documentation/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/setup.cfg b/tests/wpt/tests/tools/third_party/six/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/setup.cfg rename to tests/wpt/tests/tools/third_party/six/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/setup.py b/tests/wpt/tests/tools/third_party/six/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/setup.py rename to tests/wpt/tests/tools/third_party/six/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/six-1.15.0.dist-info/INSTALLER b/tests/wpt/tests/tools/third_party/six/six-1.15.0.dist-info/INSTALLER similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/six-1.15.0.dist-info/INSTALLER rename to tests/wpt/tests/tools/third_party/six/six-1.15.0.dist-info/INSTALLER diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/six-1.15.0.dist-info/LICENSE b/tests/wpt/tests/tools/third_party/six/six-1.15.0.dist-info/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/six-1.15.0.dist-info/LICENSE rename to tests/wpt/tests/tools/third_party/six/six-1.15.0.dist-info/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/six-1.15.0.dist-info/METADATA b/tests/wpt/tests/tools/third_party/six/six-1.15.0.dist-info/METADATA similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/six-1.15.0.dist-info/METADATA rename to tests/wpt/tests/tools/third_party/six/six-1.15.0.dist-info/METADATA diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/six-1.15.0.dist-info/RECORD b/tests/wpt/tests/tools/third_party/six/six-1.15.0.dist-info/RECORD similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/six-1.15.0.dist-info/RECORD rename to tests/wpt/tests/tools/third_party/six/six-1.15.0.dist-info/RECORD diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/six-1.15.0.dist-info/WHEEL b/tests/wpt/tests/tools/third_party/six/six-1.15.0.dist-info/WHEEL similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/six-1.15.0.dist-info/WHEEL rename to tests/wpt/tests/tools/third_party/six/six-1.15.0.dist-info/WHEEL diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/six-1.15.0.dist-info/top_level.txt b/tests/wpt/tests/tools/third_party/six/six-1.15.0.dist-info/top_level.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/six-1.15.0.dist-info/top_level.txt rename to tests/wpt/tests/tools/third_party/six/six-1.15.0.dist-info/top_level.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/six.py b/tests/wpt/tests/tools/third_party/six/six.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/six.py rename to tests/wpt/tests/tools/third_party/six/six.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/six/test_six.py b/tests/wpt/tests/tools/third_party/six/test_six.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/six/test_six.py rename to tests/wpt/tests/tools/third_party/six/test_six.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/tooltool/tooltool.py b/tests/wpt/tests/tools/third_party/tooltool/tooltool.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/tooltool/tooltool.py rename to tests/wpt/tests/tools/third_party/tooltool/tooltool.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/typing_extensions/LICENSE b/tests/wpt/tests/tools/third_party/typing_extensions/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/typing_extensions/LICENSE rename to tests/wpt/tests/tools/third_party/typing_extensions/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/typing_extensions/PKG-INFO b/tests/wpt/tests/tools/third_party/typing_extensions/PKG-INFO similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/typing_extensions/PKG-INFO rename to tests/wpt/tests/tools/third_party/typing_extensions/PKG-INFO diff --git a/tests/wpt/web-platform-tests/tools/third_party/typing_extensions/pyproject.toml b/tests/wpt/tests/tools/third_party/typing_extensions/pyproject.toml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/typing_extensions/pyproject.toml rename to tests/wpt/tests/tools/third_party/typing_extensions/pyproject.toml diff --git a/tests/wpt/web-platform-tests/tools/third_party/typing_extensions/src/typing_extensions.py b/tests/wpt/tests/tools/third_party/typing_extensions/src/typing_extensions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/typing_extensions/src/typing_extensions.py rename to tests/wpt/tests/tools/third_party/typing_extensions/src/typing_extensions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/webencodings/PKG-INFO b/tests/wpt/tests/tools/third_party/webencodings/PKG-INFO similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/webencodings/PKG-INFO rename to tests/wpt/tests/tools/third_party/webencodings/PKG-INFO diff --git a/tests/wpt/web-platform-tests/tools/third_party/webencodings/README.rst b/tests/wpt/tests/tools/third_party/webencodings/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/webencodings/README.rst rename to tests/wpt/tests/tools/third_party/webencodings/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/webencodings/setup.cfg b/tests/wpt/tests/tools/third_party/webencodings/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/webencodings/setup.cfg rename to tests/wpt/tests/tools/third_party/webencodings/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/webencodings/setup.py b/tests/wpt/tests/tools/third_party/webencodings/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/webencodings/setup.py rename to tests/wpt/tests/tools/third_party/webencodings/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings.egg-info/PKG-INFO b/tests/wpt/tests/tools/third_party/webencodings/webencodings.egg-info/PKG-INFO similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings.egg-info/PKG-INFO rename to tests/wpt/tests/tools/third_party/webencodings/webencodings.egg-info/PKG-INFO diff --git a/tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings.egg-info/SOURCES.txt b/tests/wpt/tests/tools/third_party/webencodings/webencodings.egg-info/SOURCES.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings.egg-info/SOURCES.txt rename to tests/wpt/tests/tools/third_party/webencodings/webencodings.egg-info/SOURCES.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings.egg-info/dependency_links.txt b/tests/wpt/tests/tools/third_party/webencodings/webencodings.egg-info/dependency_links.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings.egg-info/dependency_links.txt rename to tests/wpt/tests/tools/third_party/webencodings/webencodings.egg-info/dependency_links.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings.egg-info/top_level.txt b/tests/wpt/tests/tools/third_party/webencodings/webencodings.egg-info/top_level.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings.egg-info/top_level.txt rename to tests/wpt/tests/tools/third_party/webencodings/webencodings.egg-info/top_level.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings/__init__.py b/tests/wpt/tests/tools/third_party/webencodings/webencodings/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings/__init__.py rename to tests/wpt/tests/tools/third_party/webencodings/webencodings/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings/labels.py b/tests/wpt/tests/tools/third_party/webencodings/webencodings/labels.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings/labels.py rename to tests/wpt/tests/tools/third_party/webencodings/webencodings/labels.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings/mklabels.py b/tests/wpt/tests/tools/third_party/webencodings/webencodings/mklabels.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings/mklabels.py rename to tests/wpt/tests/tools/third_party/webencodings/webencodings/mklabels.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings/tests.py b/tests/wpt/tests/tools/third_party/webencodings/webencodings/tests.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings/tests.py rename to tests/wpt/tests/tools/third_party/webencodings/webencodings/tests.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings/x_user_defined.py b/tests/wpt/tests/tools/third_party/webencodings/webencodings/x_user_defined.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/webencodings/webencodings/x_user_defined.py rename to tests/wpt/tests/tools/third_party/webencodings/webencodings/x_user_defined.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/.appveyor.yml b/tests/wpt/tests/tools/third_party/websockets/.appveyor.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/.appveyor.yml rename to tests/wpt/tests/tools/third_party/websockets/.appveyor.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/.circleci/config.yml b/tests/wpt/tests/tools/third_party/websockets/.circleci/config.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/.circleci/config.yml rename to tests/wpt/tests/tools/third_party/websockets/.circleci/config.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/.github/FUNDING.yml b/tests/wpt/tests/tools/third_party/websockets/.github/FUNDING.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/.github/FUNDING.yml rename to tests/wpt/tests/tools/third_party/websockets/.github/FUNDING.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/.gitignore b/tests/wpt/tests/tools/third_party/websockets/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/.gitignore rename to tests/wpt/tests/tools/third_party/websockets/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/.readthedocs.yml b/tests/wpt/tests/tools/third_party/websockets/.readthedocs.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/.readthedocs.yml rename to tests/wpt/tests/tools/third_party/websockets/.readthedocs.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/.travis.yml b/tests/wpt/tests/tools/third_party/websockets/.travis.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/.travis.yml rename to tests/wpt/tests/tools/third_party/websockets/.travis.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/CODE_OF_CONDUCT.md b/tests/wpt/tests/tools/third_party/websockets/CODE_OF_CONDUCT.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/CODE_OF_CONDUCT.md rename to tests/wpt/tests/tools/third_party/websockets/CODE_OF_CONDUCT.md diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/LICENSE b/tests/wpt/tests/tools/third_party/websockets/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/LICENSE rename to tests/wpt/tests/tools/third_party/websockets/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/MANIFEST.in b/tests/wpt/tests/tools/third_party/websockets/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/MANIFEST.in rename to tests/wpt/tests/tools/third_party/websockets/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/Makefile b/tests/wpt/tests/tools/third_party/websockets/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/Makefile rename to tests/wpt/tests/tools/third_party/websockets/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/README.rst b/tests/wpt/tests/tools/third_party/websockets/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/README.rst rename to tests/wpt/tests/tools/third_party/websockets/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/compliance/README.rst b/tests/wpt/tests/tools/third_party/websockets/compliance/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/compliance/README.rst rename to tests/wpt/tests/tools/third_party/websockets/compliance/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/compliance/fuzzingclient.json b/tests/wpt/tests/tools/third_party/websockets/compliance/fuzzingclient.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/compliance/fuzzingclient.json rename to tests/wpt/tests/tools/third_party/websockets/compliance/fuzzingclient.json diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/compliance/fuzzingserver.json b/tests/wpt/tests/tools/third_party/websockets/compliance/fuzzingserver.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/compliance/fuzzingserver.json rename to tests/wpt/tests/tools/third_party/websockets/compliance/fuzzingserver.json diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/compliance/test_client.py b/tests/wpt/tests/tools/third_party/websockets/compliance/test_client.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/compliance/test_client.py rename to tests/wpt/tests/tools/third_party/websockets/compliance/test_client.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/compliance/test_server.py b/tests/wpt/tests/tools/third_party/websockets/compliance/test_server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/compliance/test_server.py rename to tests/wpt/tests/tools/third_party/websockets/compliance/test_server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/Makefile b/tests/wpt/tests/tools/third_party/websockets/docs/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/Makefile rename to tests/wpt/tests/tools/third_party/websockets/docs/Makefile diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/_static/tidelift.png b/tests/wpt/tests/tools/third_party/websockets/docs/_static/tidelift.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/_static/tidelift.png rename to tests/wpt/tests/tools/third_party/websockets/docs/_static/tidelift.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/_static/websockets.svg b/tests/wpt/tests/tools/third_party/websockets/docs/_static/websockets.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/_static/websockets.svg rename to tests/wpt/tests/tools/third_party/websockets/docs/_static/websockets.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/api.rst b/tests/wpt/tests/tools/third_party/websockets/docs/api.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/api.rst rename to tests/wpt/tests/tools/third_party/websockets/docs/api.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/changelog.rst b/tests/wpt/tests/tools/third_party/websockets/docs/changelog.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/changelog.rst rename to tests/wpt/tests/tools/third_party/websockets/docs/changelog.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/cheatsheet.rst b/tests/wpt/tests/tools/third_party/websockets/docs/cheatsheet.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/cheatsheet.rst rename to tests/wpt/tests/tools/third_party/websockets/docs/cheatsheet.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/conf.py b/tests/wpt/tests/tools/third_party/websockets/docs/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/conf.py rename to tests/wpt/tests/tools/third_party/websockets/docs/conf.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/contributing.rst b/tests/wpt/tests/tools/third_party/websockets/docs/contributing.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/contributing.rst rename to tests/wpt/tests/tools/third_party/websockets/docs/contributing.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/deployment.rst b/tests/wpt/tests/tools/third_party/websockets/docs/deployment.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/deployment.rst rename to tests/wpt/tests/tools/third_party/websockets/docs/deployment.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/design.rst b/tests/wpt/tests/tools/third_party/websockets/docs/design.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/design.rst rename to tests/wpt/tests/tools/third_party/websockets/docs/design.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/extensions.rst b/tests/wpt/tests/tools/third_party/websockets/docs/extensions.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/extensions.rst rename to tests/wpt/tests/tools/third_party/websockets/docs/extensions.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/faq.rst b/tests/wpt/tests/tools/third_party/websockets/docs/faq.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/faq.rst rename to tests/wpt/tests/tools/third_party/websockets/docs/faq.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/index.rst b/tests/wpt/tests/tools/third_party/websockets/docs/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/index.rst rename to tests/wpt/tests/tools/third_party/websockets/docs/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/intro.rst b/tests/wpt/tests/tools/third_party/websockets/docs/intro.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/intro.rst rename to tests/wpt/tests/tools/third_party/websockets/docs/intro.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/license.rst b/tests/wpt/tests/tools/third_party/websockets/docs/license.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/license.rst rename to tests/wpt/tests/tools/third_party/websockets/docs/license.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/lifecycle.graffle b/tests/wpt/tests/tools/third_party/websockets/docs/lifecycle.graffle similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/lifecycle.graffle rename to tests/wpt/tests/tools/third_party/websockets/docs/lifecycle.graffle diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/lifecycle.svg b/tests/wpt/tests/tools/third_party/websockets/docs/lifecycle.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/lifecycle.svg rename to tests/wpt/tests/tools/third_party/websockets/docs/lifecycle.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/limitations.rst b/tests/wpt/tests/tools/third_party/websockets/docs/limitations.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/limitations.rst rename to tests/wpt/tests/tools/third_party/websockets/docs/limitations.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/protocol.graffle b/tests/wpt/tests/tools/third_party/websockets/docs/protocol.graffle similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/protocol.graffle rename to tests/wpt/tests/tools/third_party/websockets/docs/protocol.graffle diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/protocol.svg b/tests/wpt/tests/tools/third_party/websockets/docs/protocol.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/protocol.svg rename to tests/wpt/tests/tools/third_party/websockets/docs/protocol.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/requirements.txt b/tests/wpt/tests/tools/third_party/websockets/docs/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/requirements.txt rename to tests/wpt/tests/tools/third_party/websockets/docs/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/security.rst b/tests/wpt/tests/tools/third_party/websockets/docs/security.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/security.rst rename to tests/wpt/tests/tools/third_party/websockets/docs/security.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/spelling_wordlist.txt b/tests/wpt/tests/tools/third_party/websockets/docs/spelling_wordlist.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/spelling_wordlist.txt rename to tests/wpt/tests/tools/third_party/websockets/docs/spelling_wordlist.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/docs/tidelift.rst b/tests/wpt/tests/tools/third_party/websockets/docs/tidelift.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/docs/tidelift.rst rename to tests/wpt/tests/tools/third_party/websockets/docs/tidelift.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/basic_auth_client.py b/tests/wpt/tests/tools/third_party/websockets/example/basic_auth_client.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/basic_auth_client.py rename to tests/wpt/tests/tools/third_party/websockets/example/basic_auth_client.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/basic_auth_server.py b/tests/wpt/tests/tools/third_party/websockets/example/basic_auth_server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/basic_auth_server.py rename to tests/wpt/tests/tools/third_party/websockets/example/basic_auth_server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/client.py b/tests/wpt/tests/tools/third_party/websockets/example/client.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/client.py rename to tests/wpt/tests/tools/third_party/websockets/example/client.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/counter.html b/tests/wpt/tests/tools/third_party/websockets/example/counter.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/counter.html rename to tests/wpt/tests/tools/third_party/websockets/example/counter.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/counter.py b/tests/wpt/tests/tools/third_party/websockets/example/counter.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/counter.py rename to tests/wpt/tests/tools/third_party/websockets/example/counter.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/echo.py b/tests/wpt/tests/tools/third_party/websockets/example/echo.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/echo.py rename to tests/wpt/tests/tools/third_party/websockets/example/echo.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/health_check_server.py b/tests/wpt/tests/tools/third_party/websockets/example/health_check_server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/health_check_server.py rename to tests/wpt/tests/tools/third_party/websockets/example/health_check_server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/hello.py b/tests/wpt/tests/tools/third_party/websockets/example/hello.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/hello.py rename to tests/wpt/tests/tools/third_party/websockets/example/hello.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/localhost.pem b/tests/wpt/tests/tools/third_party/websockets/example/localhost.pem similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/localhost.pem rename to tests/wpt/tests/tools/third_party/websockets/example/localhost.pem diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/secure_client.py b/tests/wpt/tests/tools/third_party/websockets/example/secure_client.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/secure_client.py rename to tests/wpt/tests/tools/third_party/websockets/example/secure_client.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/secure_server.py b/tests/wpt/tests/tools/third_party/websockets/example/secure_server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/secure_server.py rename to tests/wpt/tests/tools/third_party/websockets/example/secure_server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/server.py b/tests/wpt/tests/tools/third_party/websockets/example/server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/server.py rename to tests/wpt/tests/tools/third_party/websockets/example/server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/show_time.html b/tests/wpt/tests/tools/third_party/websockets/example/show_time.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/show_time.html rename to tests/wpt/tests/tools/third_party/websockets/example/show_time.html diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/show_time.py b/tests/wpt/tests/tools/third_party/websockets/example/show_time.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/show_time.py rename to tests/wpt/tests/tools/third_party/websockets/example/show_time.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/shutdown.py b/tests/wpt/tests/tools/third_party/websockets/example/shutdown.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/shutdown.py rename to tests/wpt/tests/tools/third_party/websockets/example/shutdown.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/unix_client.py b/tests/wpt/tests/tools/third_party/websockets/example/unix_client.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/unix_client.py rename to tests/wpt/tests/tools/third_party/websockets/example/unix_client.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/example/unix_server.py b/tests/wpt/tests/tools/third_party/websockets/example/unix_server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/example/unix_server.py rename to tests/wpt/tests/tools/third_party/websockets/example/unix_server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/logo/horizontal.svg b/tests/wpt/tests/tools/third_party/websockets/logo/horizontal.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/logo/horizontal.svg rename to tests/wpt/tests/tools/third_party/websockets/logo/horizontal.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/logo/icon.svg b/tests/wpt/tests/tools/third_party/websockets/logo/icon.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/logo/icon.svg rename to tests/wpt/tests/tools/third_party/websockets/logo/icon.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/logo/old.svg b/tests/wpt/tests/tools/third_party/websockets/logo/old.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/logo/old.svg rename to tests/wpt/tests/tools/third_party/websockets/logo/old.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/logo/tidelift.png b/tests/wpt/tests/tools/third_party/websockets/logo/tidelift.png similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/logo/tidelift.png rename to tests/wpt/tests/tools/third_party/websockets/logo/tidelift.png diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/logo/vertical.svg b/tests/wpt/tests/tools/third_party/websockets/logo/vertical.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/logo/vertical.svg rename to tests/wpt/tests/tools/third_party/websockets/logo/vertical.svg diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/performance/mem_client.py b/tests/wpt/tests/tools/third_party/websockets/performance/mem_client.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/performance/mem_client.py rename to tests/wpt/tests/tools/third_party/websockets/performance/mem_client.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/performance/mem_server.py b/tests/wpt/tests/tools/third_party/websockets/performance/mem_server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/performance/mem_server.py rename to tests/wpt/tests/tools/third_party/websockets/performance/mem_server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/setup.cfg b/tests/wpt/tests/tools/third_party/websockets/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/setup.cfg rename to tests/wpt/tests/tools/third_party/websockets/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/setup.py b/tests/wpt/tests/tools/third_party/websockets/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/setup.py rename to tests/wpt/tests/tools/third_party/websockets/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/__init__.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/__init__.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/__main__.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/__main__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/__main__.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/__main__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/auth.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/auth.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/auth.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/auth.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/client.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/client.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/client.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/client.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/exceptions.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/exceptions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/exceptions.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/exceptions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/extensions/__init__.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/extensions/__init__.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/extensions/base.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/extensions/base.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/base.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/extensions/permessage_deflate.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/permessage_deflate.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/extensions/permessage_deflate.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/permessage_deflate.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/framing.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/framing.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/framing.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/framing.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/handshake.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/handshake.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/handshake.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/handshake.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/headers.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/headers.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/headers.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/headers.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/http.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/http.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/http.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/http.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/protocol.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/protocol.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/protocol.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/protocol.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/py.typed b/tests/wpt/tests/tools/third_party/websockets/src/websockets/py.typed similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/py.typed rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/py.typed diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/server.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/server.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/speedups.c b/tests/wpt/tests/tools/third_party/websockets/src/websockets/speedups.c similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/speedups.c rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/speedups.c diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/speedups.pyi b/tests/wpt/tests/tools/third_party/websockets/src/websockets/speedups.pyi similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/speedups.pyi rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/speedups.pyi diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/typing.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/typing.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/typing.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/typing.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/uri.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/uri.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/uri.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/uri.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/utils.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/utils.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/utils.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/utils.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/version.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/version.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/src/websockets/version.py rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/version.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/__init__.py b/tests/wpt/tests/tools/third_party/websockets/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/__init__.py rename to tests/wpt/tests/tools/third_party/websockets/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/extensions/__init__.py b/tests/wpt/tests/tools/third_party/websockets/tests/extensions/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/extensions/__init__.py rename to tests/wpt/tests/tools/third_party/websockets/tests/extensions/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/extensions/test_base.py b/tests/wpt/tests/tools/third_party/websockets/tests/extensions/test_base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/extensions/test_base.py rename to tests/wpt/tests/tools/third_party/websockets/tests/extensions/test_base.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/extensions/test_permessage_deflate.py b/tests/wpt/tests/tools/third_party/websockets/tests/extensions/test_permessage_deflate.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/extensions/test_permessage_deflate.py rename to tests/wpt/tests/tools/third_party/websockets/tests/extensions/test_permessage_deflate.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_auth.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_auth.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_auth.py rename to tests/wpt/tests/tools/third_party/websockets/tests/test_auth.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_client_server.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_client_server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_client_server.py rename to tests/wpt/tests/tools/third_party/websockets/tests/test_client_server.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_exceptions.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_exceptions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_exceptions.py rename to tests/wpt/tests/tools/third_party/websockets/tests/test_exceptions.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_exports.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_exports.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_exports.py rename to tests/wpt/tests/tools/third_party/websockets/tests/test_exports.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_framing.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_framing.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_framing.py rename to tests/wpt/tests/tools/third_party/websockets/tests/test_framing.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_handshake.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_handshake.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_handshake.py rename to tests/wpt/tests/tools/third_party/websockets/tests/test_handshake.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_headers.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_headers.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_headers.py rename to tests/wpt/tests/tools/third_party/websockets/tests/test_headers.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_http.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_http.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_http.py rename to tests/wpt/tests/tools/third_party/websockets/tests/test_http.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_localhost.cnf b/tests/wpt/tests/tools/third_party/websockets/tests/test_localhost.cnf similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_localhost.cnf rename to tests/wpt/tests/tools/third_party/websockets/tests/test_localhost.cnf diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_localhost.pem b/tests/wpt/tests/tools/third_party/websockets/tests/test_localhost.pem similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_localhost.pem rename to tests/wpt/tests/tools/third_party/websockets/tests/test_localhost.pem diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_protocol.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_protocol.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_protocol.py rename to tests/wpt/tests/tools/third_party/websockets/tests/test_protocol.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_uri.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_uri.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_uri.py rename to tests/wpt/tests/tools/third_party/websockets/tests/test_uri.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_utils.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_utils.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/test_utils.py rename to tests/wpt/tests/tools/third_party/websockets/tests/test_utils.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tests/utils.py b/tests/wpt/tests/tools/third_party/websockets/tests/utils.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tests/utils.py rename to tests/wpt/tests/tools/third_party/websockets/tests/utils.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/websockets/tox.ini b/tests/wpt/tests/tools/third_party/websockets/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/websockets/tox.ini rename to tests/wpt/tests/tools/third_party/websockets/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/.flake8 b/tests/wpt/tests/tools/third_party/zipp/.flake8 similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/.flake8 rename to tests/wpt/tests/tools/third_party/zipp/.flake8 diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/.pre-commit-config.yaml b/tests/wpt/tests/tools/third_party/zipp/.pre-commit-config.yaml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/.pre-commit-config.yaml rename to tests/wpt/tests/tools/third_party/zipp/.pre-commit-config.yaml diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/.readthedocs.yml b/tests/wpt/tests/tools/third_party/zipp/.readthedocs.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/.readthedocs.yml rename to tests/wpt/tests/tools/third_party/zipp/.readthedocs.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/.travis.yml b/tests/wpt/tests/tools/third_party/zipp/.travis.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/.travis.yml rename to tests/wpt/tests/tools/third_party/zipp/.travis.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/CHANGES.rst b/tests/wpt/tests/tools/third_party/zipp/CHANGES.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/CHANGES.rst rename to tests/wpt/tests/tools/third_party/zipp/CHANGES.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/LICENSE b/tests/wpt/tests/tools/third_party/zipp/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/LICENSE rename to tests/wpt/tests/tools/third_party/zipp/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/PKG-INFO b/tests/wpt/tests/tools/third_party/zipp/PKG-INFO similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/PKG-INFO rename to tests/wpt/tests/tools/third_party/zipp/PKG-INFO diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/README.rst b/tests/wpt/tests/tools/third_party/zipp/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/README.rst rename to tests/wpt/tests/tools/third_party/zipp/README.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/appveyor.yml b/tests/wpt/tests/tools/third_party/zipp/appveyor.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/appveyor.yml rename to tests/wpt/tests/tools/third_party/zipp/appveyor.yml diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/conftest.py b/tests/wpt/tests/tools/third_party/zipp/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/conftest.py rename to tests/wpt/tests/tools/third_party/zipp/conftest.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/docs/conf.py b/tests/wpt/tests/tools/third_party/zipp/docs/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/docs/conf.py rename to tests/wpt/tests/tools/third_party/zipp/docs/conf.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/docs/history.rst b/tests/wpt/tests/tools/third_party/zipp/docs/history.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/docs/history.rst rename to tests/wpt/tests/tools/third_party/zipp/docs/history.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/docs/index.rst b/tests/wpt/tests/tools/third_party/zipp/docs/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/docs/index.rst rename to tests/wpt/tests/tools/third_party/zipp/docs/index.rst diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/pyproject.toml b/tests/wpt/tests/tools/third_party/zipp/pyproject.toml similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/pyproject.toml rename to tests/wpt/tests/tools/third_party/zipp/pyproject.toml diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/setup.cfg b/tests/wpt/tests/tools/third_party/zipp/setup.cfg similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/setup.cfg rename to tests/wpt/tests/tools/third_party/zipp/setup.cfg diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/setup.py b/tests/wpt/tests/tools/third_party/zipp/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/setup.py rename to tests/wpt/tests/tools/third_party/zipp/setup.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/skeleton.md b/tests/wpt/tests/tools/third_party/zipp/skeleton.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/skeleton.md rename to tests/wpt/tests/tools/third_party/zipp/skeleton.md diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/test_zipp.py b/tests/wpt/tests/tools/third_party/zipp/test_zipp.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/test_zipp.py rename to tests/wpt/tests/tools/third_party/zipp/test_zipp.py diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/tox.ini b/tests/wpt/tests/tools/third_party/zipp/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/tox.ini rename to tests/wpt/tests/tools/third_party/zipp/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/PKG-INFO b/tests/wpt/tests/tools/third_party/zipp/zipp.egg-info/PKG-INFO similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/PKG-INFO rename to tests/wpt/tests/tools/third_party/zipp/zipp.egg-info/PKG-INFO diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/SOURCES.txt b/tests/wpt/tests/tools/third_party/zipp/zipp.egg-info/SOURCES.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/SOURCES.txt rename to tests/wpt/tests/tools/third_party/zipp/zipp.egg-info/SOURCES.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/dependency_links.txt b/tests/wpt/tests/tools/third_party/zipp/zipp.egg-info/dependency_links.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/dependency_links.txt rename to tests/wpt/tests/tools/third_party/zipp/zipp.egg-info/dependency_links.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/requires.txt b/tests/wpt/tests/tools/third_party/zipp/zipp.egg-info/requires.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/requires.txt rename to tests/wpt/tests/tools/third_party/zipp/zipp.egg-info/requires.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/top_level.txt b/tests/wpt/tests/tools/third_party/zipp/zipp.egg-info/top_level.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/top_level.txt rename to tests/wpt/tests/tools/third_party/zipp/zipp.egg-info/top_level.txt diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.py b/tests/wpt/tests/tools/third_party/zipp/zipp.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.py rename to tests/wpt/tests/tools/third_party/zipp/zipp.py diff --git a/tests/wpt/web-platform-tests/tools/tox.ini b/tests/wpt/tests/tools/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/tox.ini rename to tests/wpt/tests/tools/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/wave/.gitignore b/tests/wpt/tests/tools/wave/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/.gitignore rename to tests/wpt/tests/tools/wave/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/wave/__init__.py b/tests/wpt/tests/tools/wave/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/__init__.py rename to tests/wpt/tests/tools/wave/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wave/config.default.json b/tests/wpt/tests/tools/wave/config.default.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/config.default.json rename to tests/wpt/tests/tools/wave/config.default.json diff --git a/tests/wpt/web-platform-tests/tools/wave/configuration_loader.py b/tests/wpt/tests/tools/wave/configuration_loader.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/configuration_loader.py rename to tests/wpt/tests/tools/wave/configuration_loader.py diff --git a/tests/wpt/web-platform-tests/tools/wave/data/__init__.py b/tests/wpt/tests/tools/wave/data/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/data/__init__.py rename to tests/wpt/tests/tools/wave/data/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wave/data/client.py b/tests/wpt/tests/tools/wave/data/client.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/data/client.py rename to tests/wpt/tests/tools/wave/data/client.py diff --git a/tests/wpt/web-platform-tests/tools/wave/data/device.py b/tests/wpt/tests/tools/wave/data/device.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/data/device.py rename to tests/wpt/tests/tools/wave/data/device.py diff --git a/tests/wpt/web-platform-tests/tools/wave/data/event_listener.py b/tests/wpt/tests/tools/wave/data/event_listener.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/data/event_listener.py rename to tests/wpt/tests/tools/wave/data/event_listener.py diff --git a/tests/wpt/web-platform-tests/tools/wave/data/exceptions/__init__.py b/tests/wpt/tests/tools/wave/data/exceptions/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/data/exceptions/__init__.py rename to tests/wpt/tests/tools/wave/data/exceptions/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wave/data/exceptions/duplicate_exception.py b/tests/wpt/tests/tools/wave/data/exceptions/duplicate_exception.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/data/exceptions/duplicate_exception.py rename to tests/wpt/tests/tools/wave/data/exceptions/duplicate_exception.py diff --git a/tests/wpt/web-platform-tests/tools/wave/data/exceptions/invalid_data_exception.py b/tests/wpt/tests/tools/wave/data/exceptions/invalid_data_exception.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/data/exceptions/invalid_data_exception.py rename to tests/wpt/tests/tools/wave/data/exceptions/invalid_data_exception.py diff --git a/tests/wpt/web-platform-tests/tools/wave/data/exceptions/not_found_exception.py b/tests/wpt/tests/tools/wave/data/exceptions/not_found_exception.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/data/exceptions/not_found_exception.py rename to tests/wpt/tests/tools/wave/data/exceptions/not_found_exception.py diff --git a/tests/wpt/web-platform-tests/tools/wave/data/exceptions/permission_denied_exception.py b/tests/wpt/tests/tools/wave/data/exceptions/permission_denied_exception.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/data/exceptions/permission_denied_exception.py rename to tests/wpt/tests/tools/wave/data/exceptions/permission_denied_exception.py diff --git a/tests/wpt/web-platform-tests/tools/wave/data/http_polling_client.py b/tests/wpt/tests/tools/wave/data/http_polling_client.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/data/http_polling_client.py rename to tests/wpt/tests/tools/wave/data/http_polling_client.py diff --git a/tests/wpt/web-platform-tests/tools/wave/data/http_polling_event_listener.py b/tests/wpt/tests/tools/wave/data/http_polling_event_listener.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/data/http_polling_event_listener.py rename to tests/wpt/tests/tools/wave/data/http_polling_event_listener.py diff --git a/tests/wpt/web-platform-tests/tools/wave/data/session.py b/tests/wpt/tests/tools/wave/data/session.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/data/session.py rename to tests/wpt/tests/tools/wave/data/session.py diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/README.md b/tests/wpt/tests/tools/wave/docs/README.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/README.md rename to tests/wpt/tests/tools/wave/docs/README.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/config.md b/tests/wpt/tests/tools/wave/docs/config.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/config.md rename to tests/wpt/tests/tools/wave/docs/config.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/configuration_page_bottom.jpg b/tests/wpt/tests/tools/wave/docs/res/configuration_page_bottom.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/configuration_page_bottom.jpg rename to tests/wpt/tests/tools/wave/docs/res/configuration_page_bottom.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/configuration_page_exclude_add_malfunctioning.jpg b/tests/wpt/tests/tools/wave/docs/res/configuration_page_exclude_add_malfunctioning.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/configuration_page_exclude_add_malfunctioning.jpg rename to tests/wpt/tests/tools/wave/docs/res/configuration_page_exclude_add_malfunctioning.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/configuration_page_exclude_add_prev_excluded.jpg b/tests/wpt/tests/tools/wave/docs/res/configuration_page_exclude_add_prev_excluded.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/configuration_page_exclude_add_prev_excluded.jpg rename to tests/wpt/tests/tools/wave/docs/res/configuration_page_exclude_add_prev_excluded.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/configuration_page_exclude_add_raw.jpg b/tests/wpt/tests/tools/wave/docs/res/configuration_page_exclude_add_raw.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/configuration_page_exclude_add_raw.jpg rename to tests/wpt/tests/tools/wave/docs/res/configuration_page_exclude_add_raw.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/configuration_page_top.jpg b/tests/wpt/tests/tools/wave/docs/res/configuration_page_top.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/configuration_page_top.jpg rename to tests/wpt/tests/tools/wave/docs/res/configuration_page_top.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/landing_page.jpg b/tests/wpt/tests/tools/wave/docs/res/landing_page.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/landing_page.jpg rename to tests/wpt/tests/tools/wave/docs/res/landing_page.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/overview_page_sessions.jpg b/tests/wpt/tests/tools/wave/docs/res/overview_page_sessions.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/overview_page_sessions.jpg rename to tests/wpt/tests/tools/wave/docs/res/overview_page_sessions.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/overview_page_sessions_filtered.jpg b/tests/wpt/tests/tools/wave/docs/res/overview_page_sessions_filtered.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/overview_page_sessions_filtered.jpg rename to tests/wpt/tests/tools/wave/docs/res/overview_page_sessions_filtered.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/overview_page_sessions_pinned_recent.jpg b/tests/wpt/tests/tools/wave/docs/res/overview_page_sessions_pinned_recent.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/overview_page_sessions_pinned_recent.jpg rename to tests/wpt/tests/tools/wave/docs/res/overview_page_sessions_pinned_recent.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/overview_page_top.jpg b/tests/wpt/tests/tools/wave/docs/res/overview_page_top.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/overview_page_top.jpg rename to tests/wpt/tests/tools/wave/docs/res/overview_page_top.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/results_page_api_results.jpg b/tests/wpt/tests/tools/wave/docs/res/results_page_api_results.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/results_page_api_results.jpg rename to tests/wpt/tests/tools/wave/docs/res/results_page_api_results.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/results_page_api_results_export.jpg b/tests/wpt/tests/tools/wave/docs/res/results_page_api_results_export.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/results_page_api_results_export.jpg rename to tests/wpt/tests/tools/wave/docs/res/results_page_api_results_export.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/results_page_bottom.jpg b/tests/wpt/tests/tools/wave/docs/res/results_page_bottom.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/results_page_bottom.jpg rename to tests/wpt/tests/tools/wave/docs/res/results_page_bottom.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/results_page_last_timed_out.jpg b/tests/wpt/tests/tools/wave/docs/res/results_page_last_timed_out.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/results_page_last_timed_out.jpg rename to tests/wpt/tests/tools/wave/docs/res/results_page_last_timed_out.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/results_page_malfunctioning_list.jpg b/tests/wpt/tests/tools/wave/docs/res/results_page_malfunctioning_list.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/results_page_malfunctioning_list.jpg rename to tests/wpt/tests/tools/wave/docs/res/results_page_malfunctioning_list.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/res/results_page_top.jpg b/tests/wpt/tests/tools/wave/docs/res/results_page_top.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/res/results_page_top.jpg rename to tests/wpt/tests/tools/wave/docs/res/results_page_top.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/README.md b/tests/wpt/tests/tools/wave/docs/rest-api/README.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/README.md rename to tests/wpt/tests/tools/wave/docs/rest-api/README.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/create.md b/tests/wpt/tests/tools/wave/docs/rest-api/devices-api/create.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/create.md rename to tests/wpt/tests/tools/wave/docs/rest-api/devices-api/create.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/event-types.md b/tests/wpt/tests/tools/wave/docs/rest-api/devices-api/event-types.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/event-types.md rename to tests/wpt/tests/tools/wave/docs/rest-api/devices-api/event-types.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/read-device.md b/tests/wpt/tests/tools/wave/docs/rest-api/devices-api/read-device.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/read-device.md rename to tests/wpt/tests/tools/wave/docs/rest-api/devices-api/read-device.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/read-devices.md b/tests/wpt/tests/tools/wave/docs/rest-api/devices-api/read-devices.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/read-devices.md rename to tests/wpt/tests/tools/wave/docs/rest-api/devices-api/read-devices.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/register-global.md b/tests/wpt/tests/tools/wave/docs/rest-api/devices-api/register-global.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/register-global.md rename to tests/wpt/tests/tools/wave/docs/rest-api/devices-api/register-global.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/register.md b/tests/wpt/tests/tools/wave/docs/rest-api/devices-api/register.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/register.md rename to tests/wpt/tests/tools/wave/docs/rest-api/devices-api/register.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/send-event.md b/tests/wpt/tests/tools/wave/docs/rest-api/devices-api/send-event.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/send-event.md rename to tests/wpt/tests/tools/wave/docs/rest-api/devices-api/send-event.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/send-global-event.md b/tests/wpt/tests/tools/wave/docs/rest-api/devices-api/send-global-event.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/devices-api/send-global-event.md rename to tests/wpt/tests/tools/wave/docs/rest-api/devices-api/send-global-event.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/general-api/status.md b/tests/wpt/tests/tools/wave/docs/rest-api/general-api/status.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/general-api/status.md rename to tests/wpt/tests/tools/wave/docs/rest-api/general-api/status.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/guides/README.md b/tests/wpt/tests/tools/wave/docs/rest-api/guides/README.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/guides/README.md rename to tests/wpt/tests/tools/wave/docs/rest-api/guides/README.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/guides/session-events.md b/tests/wpt/tests/tools/wave/docs/rest-api/guides/session-events.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/guides/session-events.md rename to tests/wpt/tests/tools/wave/docs/rest-api/guides/session-events.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/guides/session-start-devices-api.md b/tests/wpt/tests/tools/wave/docs/rest-api/guides/session-start-devices-api.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/guides/session-start-devices-api.md rename to tests/wpt/tests/tools/wave/docs/rest-api/guides/session-start-devices-api.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/results-api/config.md b/tests/wpt/tests/tools/wave/docs/rest-api/results-api/config.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/results-api/config.md rename to tests/wpt/tests/tools/wave/docs/rest-api/results-api/config.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/results-api/create.md b/tests/wpt/tests/tools/wave/docs/rest-api/results-api/create.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/results-api/create.md rename to tests/wpt/tests/tools/wave/docs/rest-api/results-api/create.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/results-api/download.md b/tests/wpt/tests/tools/wave/docs/rest-api/results-api/download.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/results-api/download.md rename to tests/wpt/tests/tools/wave/docs/rest-api/results-api/download.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/results-api/import.md b/tests/wpt/tests/tools/wave/docs/rest-api/results-api/import.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/results-api/import.md rename to tests/wpt/tests/tools/wave/docs/rest-api/results-api/import.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/results-api/read-compact.md b/tests/wpt/tests/tools/wave/docs/rest-api/results-api/read-compact.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/results-api/read-compact.md rename to tests/wpt/tests/tools/wave/docs/rest-api/results-api/read-compact.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/results-api/read.md b/tests/wpt/tests/tools/wave/docs/rest-api/results-api/read.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/results-api/read.md rename to tests/wpt/tests/tools/wave/docs/rest-api/results-api/read.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/results-api/view.md b/tests/wpt/tests/tools/wave/docs/rest-api/results-api/view.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/results-api/view.md rename to tests/wpt/tests/tools/wave/docs/rest-api/results-api/view.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/control.md b/tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/control.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/control.md rename to tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/control.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/create.md b/tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/create.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/create.md rename to tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/create.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/delete.md b/tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/delete.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/delete.md rename to tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/delete.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/event-types.md b/tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/event-types.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/event-types.md rename to tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/event-types.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/events.md b/tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/events.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/events.md rename to tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/events.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/find.md b/tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/find.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/find.md rename to tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/find.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/labels.md b/tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/labels.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/labels.md rename to tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/labels.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/read-public.md b/tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/read-public.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/read-public.md rename to tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/read-public.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/read.md b/tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/read.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/read.md rename to tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/read.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/read_sessions.md b/tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/read_sessions.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/read_sessions.md rename to tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/read_sessions.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/status.md b/tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/status.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/status.md rename to tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/status.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/update.md b/tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/update.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/sessions-api/update.md rename to tests/wpt/tests/tools/wave/docs/rest-api/sessions-api/update.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/tests-api/read-all.md b/tests/wpt/tests/tools/wave/docs/rest-api/tests-api/read-all.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/tests-api/read-all.md rename to tests/wpt/tests/tools/wave/docs/rest-api/tests-api/read-all.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/tests-api/read-available-apis.md b/tests/wpt/tests/tools/wave/docs/rest-api/tests-api/read-available-apis.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/tests-api/read-available-apis.md rename to tests/wpt/tests/tools/wave/docs/rest-api/tests-api/read-available-apis.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/tests-api/read-last-completed.md b/tests/wpt/tests/tools/wave/docs/rest-api/tests-api/read-last-completed.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/tests-api/read-last-completed.md rename to tests/wpt/tests/tools/wave/docs/rest-api/tests-api/read-last-completed.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/tests-api/read-malfunctioning.md b/tests/wpt/tests/tools/wave/docs/rest-api/tests-api/read-malfunctioning.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/tests-api/read-malfunctioning.md rename to tests/wpt/tests/tools/wave/docs/rest-api/tests-api/read-malfunctioning.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/tests-api/read-next.md b/tests/wpt/tests/tools/wave/docs/rest-api/tests-api/read-next.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/tests-api/read-next.md rename to tests/wpt/tests/tools/wave/docs/rest-api/tests-api/read-next.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/tests-api/read-session.md b/tests/wpt/tests/tools/wave/docs/rest-api/tests-api/read-session.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/tests-api/read-session.md rename to tests/wpt/tests/tools/wave/docs/rest-api/tests-api/read-session.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/rest-api/tests-api/update-malfunctioning.md b/tests/wpt/tests/tools/wave/docs/rest-api/tests-api/update-malfunctioning.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/rest-api/tests-api/update-malfunctioning.md rename to tests/wpt/tests/tools/wave/docs/rest-api/tests-api/update-malfunctioning.md diff --git a/tests/wpt/web-platform-tests/tools/wave/docs/usage/usage.md b/tests/wpt/tests/tools/wave/docs/usage/usage.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/docs/usage/usage.md rename to tests/wpt/tests/tools/wave/docs/usage/usage.md diff --git a/tests/wpt/web-platform-tests/tools/wave/export/css/bulma.min.css b/tests/wpt/tests/tools/wave/export/css/bulma.min.css similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/export/css/bulma.min.css rename to tests/wpt/tests/tools/wave/export/css/bulma.min.css diff --git a/tests/wpt/web-platform-tests/tools/wave/export/css/result.css b/tests/wpt/tests/tools/wave/export/css/result.css similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/export/css/result.css rename to tests/wpt/tests/tools/wave/export/css/result.css diff --git a/tests/wpt/web-platform-tests/tools/wave/export/index.html b/tests/wpt/tests/tools/wave/export/index.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/export/index.html rename to tests/wpt/tests/tools/wave/export/index.html diff --git a/tests/wpt/web-platform-tests/tools/wave/export/lib/ui.js b/tests/wpt/tests/tools/wave/export/lib/ui.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/export/lib/ui.js rename to tests/wpt/tests/tools/wave/export/lib/ui.js diff --git a/tests/wpt/web-platform-tests/tools/wave/export/lib/utils.js b/tests/wpt/tests/tools/wave/export/lib/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/export/lib/utils.js rename to tests/wpt/tests/tools/wave/export/lib/utils.js diff --git a/tests/wpt/web-platform-tests/tools/wave/export/res/wavelogo_2016.jpg b/tests/wpt/tests/tools/wave/export/res/wavelogo_2016.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/export/res/wavelogo_2016.jpg rename to tests/wpt/tests/tools/wave/export/res/wavelogo_2016.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/network/__init__.py b/tests/wpt/tests/tools/wave/network/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/network/__init__.py rename to tests/wpt/tests/tools/wave/network/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wave/network/api/__init__.py b/tests/wpt/tests/tools/wave/network/api/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/network/api/__init__.py rename to tests/wpt/tests/tools/wave/network/api/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wave/network/api/api_handler.py b/tests/wpt/tests/tools/wave/network/api/api_handler.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/network/api/api_handler.py rename to tests/wpt/tests/tools/wave/network/api/api_handler.py diff --git a/tests/wpt/web-platform-tests/tools/wave/network/api/devices_api_handler.py b/tests/wpt/tests/tools/wave/network/api/devices_api_handler.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/network/api/devices_api_handler.py rename to tests/wpt/tests/tools/wave/network/api/devices_api_handler.py diff --git a/tests/wpt/web-platform-tests/tools/wave/network/api/general_api_handler.py b/tests/wpt/tests/tools/wave/network/api/general_api_handler.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/network/api/general_api_handler.py rename to tests/wpt/tests/tools/wave/network/api/general_api_handler.py diff --git a/tests/wpt/web-platform-tests/tools/wave/network/api/results_api_handler.py b/tests/wpt/tests/tools/wave/network/api/results_api_handler.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/network/api/results_api_handler.py rename to tests/wpt/tests/tools/wave/network/api/results_api_handler.py diff --git a/tests/wpt/web-platform-tests/tools/wave/network/api/sessions_api_handler.py b/tests/wpt/tests/tools/wave/network/api/sessions_api_handler.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/network/api/sessions_api_handler.py rename to tests/wpt/tests/tools/wave/network/api/sessions_api_handler.py diff --git a/tests/wpt/web-platform-tests/tools/wave/network/api/tests_api_handler.py b/tests/wpt/tests/tools/wave/network/api/tests_api_handler.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/network/api/tests_api_handler.py rename to tests/wpt/tests/tools/wave/network/api/tests_api_handler.py diff --git a/tests/wpt/web-platform-tests/tools/wave/network/http_handler.py b/tests/wpt/tests/tools/wave/network/http_handler.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/network/http_handler.py rename to tests/wpt/tests/tools/wave/network/http_handler.py diff --git a/tests/wpt/web-platform-tests/tools/wave/network/static_handler.py b/tests/wpt/tests/tools/wave/network/static_handler.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/network/static_handler.py rename to tests/wpt/tests/tools/wave/network/static_handler.py diff --git a/tests/wpt/web-platform-tests/tools/wave/package-lock.json b/tests/wpt/tests/tools/wave/package-lock.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/package-lock.json rename to tests/wpt/tests/tools/wave/package-lock.json diff --git a/tests/wpt/web-platform-tests/tools/wave/package.json b/tests/wpt/tests/tools/wave/package.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/package.json rename to tests/wpt/tests/tools/wave/package.json diff --git a/tests/wpt/web-platform-tests/tools/wave/requirements.txt b/tests/wpt/tests/tools/wave/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/requirements.txt rename to tests/wpt/tests/tools/wave/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/wave/resources/testharnessreport.js b/tests/wpt/tests/tools/wave/resources/testharnessreport.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/resources/testharnessreport.js rename to tests/wpt/tests/tools/wave/resources/testharnessreport.js diff --git a/tests/wpt/web-platform-tests/tools/wave/test/WAVE Local.postman_environment.json b/tests/wpt/tests/tools/wave/test/WAVE Local.postman_environment.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/test/WAVE Local.postman_environment.json rename to tests/wpt/tests/tools/wave/test/WAVE Local.postman_environment.json diff --git a/tests/wpt/web-platform-tests/tools/wave/test/WAVE Server REST API Tests.postman_collection.json b/tests/wpt/tests/tools/wave/test/WAVE Server REST API Tests.postman_collection.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/test/WAVE Server REST API Tests.postman_collection.json rename to tests/wpt/tests/tools/wave/test/WAVE Server REST API Tests.postman_collection.json diff --git a/tests/wpt/web-platform-tests/tools/wave/testing/__init__.py b/tests/wpt/tests/tools/wave/testing/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/testing/__init__.py rename to tests/wpt/tests/tools/wave/testing/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wave/testing/devices_manager.py b/tests/wpt/tests/tools/wave/testing/devices_manager.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/testing/devices_manager.py rename to tests/wpt/tests/tools/wave/testing/devices_manager.py diff --git a/tests/wpt/web-platform-tests/tools/wave/testing/event_dispatcher.py b/tests/wpt/tests/tools/wave/testing/event_dispatcher.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/testing/event_dispatcher.py rename to tests/wpt/tests/tools/wave/testing/event_dispatcher.py diff --git a/tests/wpt/web-platform-tests/tools/wave/testing/results_manager.py b/tests/wpt/tests/tools/wave/testing/results_manager.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/testing/results_manager.py rename to tests/wpt/tests/tools/wave/testing/results_manager.py diff --git a/tests/wpt/web-platform-tests/tools/wave/testing/sessions_manager.py b/tests/wpt/tests/tools/wave/testing/sessions_manager.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/testing/sessions_manager.py rename to tests/wpt/tests/tools/wave/testing/sessions_manager.py diff --git a/tests/wpt/web-platform-tests/tools/wave/testing/test_loader.py b/tests/wpt/tests/tools/wave/testing/test_loader.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/testing/test_loader.py rename to tests/wpt/tests/tools/wave/testing/test_loader.py diff --git a/tests/wpt/web-platform-tests/tools/wave/testing/tests_manager.py b/tests/wpt/tests/tools/wave/testing/tests_manager.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/testing/tests_manager.py rename to tests/wpt/tests/tools/wave/testing/tests_manager.py diff --git a/tests/wpt/web-platform-tests/tools/wave/testing/wpt_report.py b/tests/wpt/tests/tools/wave/testing/wpt_report.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/testing/wpt_report.py rename to tests/wpt/tests/tools/wave/testing/wpt_report.py diff --git a/tests/wpt/web-platform-tests/tools/wave/tests/WAVE Local.postman_environment.json b/tests/wpt/tests/tools/wave/tests/WAVE Local.postman_environment.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/tests/WAVE Local.postman_environment.json rename to tests/wpt/tests/tools/wave/tests/WAVE Local.postman_environment.json diff --git a/tests/wpt/web-platform-tests/tools/wave/tests/WAVE Server REST API Tests.postman_collection.json b/tests/wpt/tests/tools/wave/tests/WAVE Server REST API Tests.postman_collection.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/tests/WAVE Server REST API Tests.postman_collection.json rename to tests/wpt/tests/tools/wave/tests/WAVE Server REST API Tests.postman_collection.json diff --git a/tests/wpt/web-platform-tests/tools/wave/tests/__init__.py b/tests/wpt/tests/tools/wave/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/tests/__init__.py rename to tests/wpt/tests/tools/wave/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wave/tests/config.json b/tests/wpt/tests/tools/wave/tests/config.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/tests/config.json rename to tests/wpt/tests/tools/wave/tests/config.json diff --git a/tests/wpt/web-platform-tests/tools/wave/tests/test_wave.py b/tests/wpt/tests/tools/wave/tests/test_wave.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/tests/test_wave.py rename to tests/wpt/tests/tools/wave/tests/test_wave.py diff --git a/tests/wpt/web-platform-tests/tools/wave/tox.ini b/tests/wpt/tests/tools/wave/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/tox.ini rename to tests/wpt/tests/tools/wave/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/wave/utils/__init__.py b/tests/wpt/tests/tools/wave/utils/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/utils/__init__.py rename to tests/wpt/tests/tools/wave/utils/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wave/utils/deserializer.py b/tests/wpt/tests/tools/wave/utils/deserializer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/utils/deserializer.py rename to tests/wpt/tests/tools/wave/utils/deserializer.py diff --git a/tests/wpt/web-platform-tests/tools/wave/utils/serializer.py b/tests/wpt/tests/tools/wave/utils/serializer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/utils/serializer.py rename to tests/wpt/tests/tools/wave/utils/serializer.py diff --git a/tests/wpt/web-platform-tests/tools/wave/utils/user_agent_parser.py b/tests/wpt/tests/tools/wave/utils/user_agent_parser.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/utils/user_agent_parser.py rename to tests/wpt/tests/tools/wave/utils/user_agent_parser.py diff --git a/tests/wpt/web-platform-tests/tools/wave/wave_server.py b/tests/wpt/tests/tools/wave/wave_server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/wave_server.py rename to tests/wpt/tests/tools/wave/wave_server.py diff --git a/tests/wpt/web-platform-tests/tools/wave/www/comparison.html b/tests/wpt/tests/tools/wave/www/comparison.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/comparison.html rename to tests/wpt/tests/tools/wave/www/comparison.html diff --git a/tests/wpt/web-platform-tests/tools/wave/www/configuration.html b/tests/wpt/tests/tools/wave/www/configuration.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/configuration.html rename to tests/wpt/tests/tools/wave/www/configuration.html diff --git a/tests/wpt/web-platform-tests/tools/wave/www/css/bulma-0.7.5/bulma.css b/tests/wpt/tests/tools/wave/www/css/bulma-0.7.5/bulma.css similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/css/bulma-0.7.5/bulma.css rename to tests/wpt/tests/tools/wave/www/css/bulma-0.7.5/bulma.css diff --git a/tests/wpt/web-platform-tests/tools/wave/www/css/bulma-0.7.5/bulma.css.map b/tests/wpt/tests/tools/wave/www/css/bulma-0.7.5/bulma.css.map similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/css/bulma-0.7.5/bulma.css.map rename to tests/wpt/tests/tools/wave/www/css/bulma-0.7.5/bulma.css.map diff --git a/tests/wpt/web-platform-tests/tools/wave/www/css/bulma-0.7.5/bulma.min.css b/tests/wpt/tests/tools/wave/www/css/bulma-0.7.5/bulma.min.css similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/css/bulma-0.7.5/bulma.min.css rename to tests/wpt/tests/tools/wave/www/css/bulma-0.7.5/bulma.min.css diff --git a/tests/wpt/web-platform-tests/tools/wave/www/css/fontawesome-5.7.2.min.css b/tests/wpt/tests/tools/wave/www/css/fontawesome-5.7.2.min.css similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/css/fontawesome-5.7.2.min.css rename to tests/wpt/tests/tools/wave/www/css/fontawesome-5.7.2.min.css diff --git a/tests/wpt/web-platform-tests/tools/wave/www/css/fontawesome.min.css b/tests/wpt/tests/tools/wave/www/css/fontawesome.min.css similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/css/fontawesome.min.css rename to tests/wpt/tests/tools/wave/www/css/fontawesome.min.css diff --git a/tests/wpt/web-platform-tests/tools/wave/www/css/main.css b/tests/wpt/tests/tools/wave/www/css/main.css similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/css/main.css rename to tests/wpt/tests/tools/wave/www/css/main.css diff --git a/tests/wpt/web-platform-tests/tools/wave/www/css/result.css b/tests/wpt/tests/tools/wave/www/css/result.css similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/css/result.css rename to tests/wpt/tests/tools/wave/www/css/result.css diff --git a/tests/wpt/web-platform-tests/tools/wave/www/css/style.css b/tests/wpt/tests/tools/wave/www/css/style.css similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/css/style.css rename to tests/wpt/tests/tools/wave/www/css/style.css diff --git a/tests/wpt/web-platform-tests/tools/wave/www/favicon.ico b/tests/wpt/tests/tools/wave/www/favicon.ico similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/favicon.ico rename to tests/wpt/tests/tools/wave/www/favicon.ico diff --git a/tests/wpt/web-platform-tests/tools/wave/www/finish.html b/tests/wpt/tests/tools/wave/www/finish.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/finish.html rename to tests/wpt/tests/tools/wave/www/finish.html diff --git a/tests/wpt/web-platform-tests/tools/wave/www/index.html b/tests/wpt/tests/tools/wave/www/index.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/index.html rename to tests/wpt/tests/tools/wave/www/index.html diff --git a/tests/wpt/web-platform-tests/tools/wave/www/lib/davidshimjs/LICENSE b/tests/wpt/tests/tools/wave/www/lib/davidshimjs/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/lib/davidshimjs/LICENSE rename to tests/wpt/tests/tools/wave/www/lib/davidshimjs/LICENSE diff --git a/tests/wpt/web-platform-tests/tools/wave/www/lib/davidshimjs/qrcode.js b/tests/wpt/tests/tools/wave/www/lib/davidshimjs/qrcode.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/lib/davidshimjs/qrcode.js rename to tests/wpt/tests/tools/wave/www/lib/davidshimjs/qrcode.js diff --git a/tests/wpt/web-platform-tests/tools/wave/www/lib/jszip.min.js b/tests/wpt/tests/tools/wave/www/lib/jszip.min.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/lib/jszip.min.js rename to tests/wpt/tests/tools/wave/www/lib/jszip.min.js diff --git a/tests/wpt/web-platform-tests/tools/wave/www/lib/keycodes.js b/tests/wpt/tests/tools/wave/www/lib/keycodes.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/lib/keycodes.js rename to tests/wpt/tests/tools/wave/www/lib/keycodes.js diff --git a/tests/wpt/web-platform-tests/tools/wave/www/lib/qrcode.js b/tests/wpt/tests/tools/wave/www/lib/qrcode.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/lib/qrcode.js rename to tests/wpt/tests/tools/wave/www/lib/qrcode.js diff --git a/tests/wpt/web-platform-tests/tools/wave/www/lib/query-parser.js b/tests/wpt/tests/tools/wave/www/lib/query-parser.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/lib/query-parser.js rename to tests/wpt/tests/tools/wave/www/lib/query-parser.js diff --git a/tests/wpt/web-platform-tests/tools/wave/www/lib/screen-console.js b/tests/wpt/tests/tools/wave/www/lib/screen-console.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/lib/screen-console.js rename to tests/wpt/tests/tools/wave/www/lib/screen-console.js diff --git a/tests/wpt/web-platform-tests/tools/wave/www/lib/ui.js b/tests/wpt/tests/tools/wave/www/lib/ui.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/lib/ui.js rename to tests/wpt/tests/tools/wave/www/lib/ui.js diff --git a/tests/wpt/web-platform-tests/tools/wave/www/lib/utils.js b/tests/wpt/tests/tools/wave/www/lib/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/lib/utils.js rename to tests/wpt/tests/tools/wave/www/lib/utils.js diff --git a/tests/wpt/web-platform-tests/tools/wave/www/lib/wave-service.js b/tests/wpt/tests/tools/wave/www/lib/wave-service.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/lib/wave-service.js rename to tests/wpt/tests/tools/wave/www/lib/wave-service.js diff --git a/tests/wpt/web-platform-tests/tools/wave/www/newsession.html b/tests/wpt/tests/tools/wave/www/newsession.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/newsession.html rename to tests/wpt/tests/tools/wave/www/newsession.html diff --git a/tests/wpt/web-platform-tests/tools/wave/www/next.html b/tests/wpt/tests/tools/wave/www/next.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/next.html rename to tests/wpt/tests/tools/wave/www/next.html diff --git a/tests/wpt/web-platform-tests/tools/wave/www/overview.html b/tests/wpt/tests/tools/wave/www/overview.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/overview.html rename to tests/wpt/tests/tools/wave/www/overview.html diff --git a/tests/wpt/web-platform-tests/tools/wave/www/pause.html b/tests/wpt/tests/tools/wave/www/pause.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/pause.html rename to tests/wpt/tests/tools/wave/www/pause.html diff --git a/tests/wpt/web-platform-tests/tools/wave/www/res/spinner-solid.svg b/tests/wpt/tests/tools/wave/www/res/spinner-solid.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/res/spinner-solid.svg rename to tests/wpt/tests/tools/wave/www/res/spinner-solid.svg diff --git a/tests/wpt/web-platform-tests/tools/wave/www/res/wavelogo_2016.jpg b/tests/wpt/tests/tools/wave/www/res/wavelogo_2016.jpg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/res/wavelogo_2016.jpg rename to tests/wpt/tests/tools/wave/www/res/wavelogo_2016.jpg diff --git a/tests/wpt/web-platform-tests/tools/wave/www/results.html b/tests/wpt/tests/tools/wave/www/results.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/results.html rename to tests/wpt/tests/tools/wave/www/results.html diff --git a/tests/wpt/web-platform-tests/tools/wave/www/submitresult.html b/tests/wpt/tests/tools/wave/www/submitresult.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/submitresult.html rename to tests/wpt/tests/tools/wave/www/submitresult.html diff --git a/tests/wpt/web-platform-tests/tools/wave/www/test.html b/tests/wpt/tests/tools/wave/www/test.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/test.html rename to tests/wpt/tests/tools/wave/www/test.html diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-brands-400.eot b/tests/wpt/tests/tools/wave/www/webfonts/fa-brands-400.eot similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-brands-400.eot rename to tests/wpt/tests/tools/wave/www/webfonts/fa-brands-400.eot diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-brands-400.svg b/tests/wpt/tests/tools/wave/www/webfonts/fa-brands-400.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-brands-400.svg rename to tests/wpt/tests/tools/wave/www/webfonts/fa-brands-400.svg diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-brands-400.ttf b/tests/wpt/tests/tools/wave/www/webfonts/fa-brands-400.ttf similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-brands-400.ttf rename to tests/wpt/tests/tools/wave/www/webfonts/fa-brands-400.ttf diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-brands-400.woff b/tests/wpt/tests/tools/wave/www/webfonts/fa-brands-400.woff similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-brands-400.woff rename to tests/wpt/tests/tools/wave/www/webfonts/fa-brands-400.woff diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-brands-400.woff2 b/tests/wpt/tests/tools/wave/www/webfonts/fa-brands-400.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-brands-400.woff2 rename to tests/wpt/tests/tools/wave/www/webfonts/fa-brands-400.woff2 diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-regular-400.eot b/tests/wpt/tests/tools/wave/www/webfonts/fa-regular-400.eot similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-regular-400.eot rename to tests/wpt/tests/tools/wave/www/webfonts/fa-regular-400.eot diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-regular-400.svg b/tests/wpt/tests/tools/wave/www/webfonts/fa-regular-400.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-regular-400.svg rename to tests/wpt/tests/tools/wave/www/webfonts/fa-regular-400.svg diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-regular-400.ttf b/tests/wpt/tests/tools/wave/www/webfonts/fa-regular-400.ttf similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-regular-400.ttf rename to tests/wpt/tests/tools/wave/www/webfonts/fa-regular-400.ttf diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-regular-400.woff b/tests/wpt/tests/tools/wave/www/webfonts/fa-regular-400.woff similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-regular-400.woff rename to tests/wpt/tests/tools/wave/www/webfonts/fa-regular-400.woff diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-regular-400.woff2 b/tests/wpt/tests/tools/wave/www/webfonts/fa-regular-400.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-regular-400.woff2 rename to tests/wpt/tests/tools/wave/www/webfonts/fa-regular-400.woff2 diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-solid-900.eot b/tests/wpt/tests/tools/wave/www/webfonts/fa-solid-900.eot similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-solid-900.eot rename to tests/wpt/tests/tools/wave/www/webfonts/fa-solid-900.eot diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-solid-900.svg b/tests/wpt/tests/tools/wave/www/webfonts/fa-solid-900.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-solid-900.svg rename to tests/wpt/tests/tools/wave/www/webfonts/fa-solid-900.svg diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-solid-900.ttf b/tests/wpt/tests/tools/wave/www/webfonts/fa-solid-900.ttf similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-solid-900.ttf rename to tests/wpt/tests/tools/wave/www/webfonts/fa-solid-900.ttf diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-solid-900.woff b/tests/wpt/tests/tools/wave/www/webfonts/fa-solid-900.woff similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-solid-900.woff rename to tests/wpt/tests/tools/wave/www/webfonts/fa-solid-900.woff diff --git a/tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-solid-900.woff2 b/tests/wpt/tests/tools/wave/www/webfonts/fa-solid-900.woff2 similarity index 100% rename from tests/wpt/web-platform-tests/tools/wave/www/webfonts/fa-solid-900.woff2 rename to tests/wpt/tests/tools/wave/www/webfonts/fa-solid-900.woff2 diff --git a/tests/wpt/web-platform-tests/tools/webdriver/.gitignore b/tests/wpt/tests/tools/webdriver/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/.gitignore rename to tests/wpt/tests/tools/webdriver/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/webdriver/README.md b/tests/wpt/tests/tools/webdriver/README.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/README.md rename to tests/wpt/tests/tools/webdriver/README.md diff --git a/tests/wpt/web-platform-tests/tools/webdriver/setup.py b/tests/wpt/tests/tools/webdriver/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/setup.py rename to tests/wpt/tests/tools/webdriver/setup.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/__init__.py b/tests/wpt/tests/tools/webdriver/webdriver/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/__init__.py rename to tests/wpt/tests/tools/webdriver/webdriver/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/__init__.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/__init__.py rename to tests/wpt/tests/tools/webdriver/webdriver/bidi/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/client.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/client.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/client.py rename to tests/wpt/tests/tools/webdriver/webdriver/bidi/client.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/error.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/error.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/error.py rename to tests/wpt/tests/tools/webdriver/webdriver/bidi/error.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/__init__.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/__init__.py rename to tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/_module.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/_module.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/_module.py rename to tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/_module.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/browsing_context.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/browsing_context.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/browsing_context.py rename to tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/browsing_context.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/input.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/input.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/input.py rename to tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/input.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/script.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/script.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/script.py rename to tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/script.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/session.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/session.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/modules/session.py rename to tests/wpt/tests/tools/webdriver/webdriver/bidi/modules/session.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/transport.py b/tests/wpt/tests/tools/webdriver/webdriver/bidi/transport.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/bidi/transport.py rename to tests/wpt/tests/tools/webdriver/webdriver/bidi/transport.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py b/tests/wpt/tests/tools/webdriver/webdriver/client.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py rename to tests/wpt/tests/tools/webdriver/webdriver/client.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/error.py b/tests/wpt/tests/tools/webdriver/webdriver/error.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/error.py rename to tests/wpt/tests/tools/webdriver/webdriver/error.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/protocol.py b/tests/wpt/tests/tools/webdriver/webdriver/protocol.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/protocol.py rename to tests/wpt/tests/tools/webdriver/webdriver/protocol.py diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py b/tests/wpt/tests/tools/webdriver/webdriver/transport.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py rename to tests/wpt/tests/tools/webdriver/webdriver/transport.py diff --git a/tests/wpt/web-platform-tests/tools/webtransport/META.yml b/tests/wpt/tests/tools/webtransport/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/tools/webtransport/META.yml rename to tests/wpt/tests/tools/webtransport/META.yml diff --git a/tests/wpt/web-platform-tests/tools/webtransport/README.md b/tests/wpt/tests/tools/webtransport/README.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/webtransport/README.md rename to tests/wpt/tests/tools/webtransport/README.md diff --git a/tests/wpt/web-platform-tests/tools/webtransport/__init__.py b/tests/wpt/tests/tools/webtransport/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webtransport/__init__.py rename to tests/wpt/tests/tools/webtransport/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/webtransport/h3/__init__.py b/tests/wpt/tests/tools/webtransport/h3/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webtransport/h3/__init__.py rename to tests/wpt/tests/tools/webtransport/h3/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/webtransport/h3/capsule.py b/tests/wpt/tests/tools/webtransport/h3/capsule.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webtransport/h3/capsule.py rename to tests/wpt/tests/tools/webtransport/h3/capsule.py diff --git a/tests/wpt/web-platform-tests/tools/webtransport/h3/handler.py b/tests/wpt/tests/tools/webtransport/h3/handler.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webtransport/h3/handler.py rename to tests/wpt/tests/tools/webtransport/h3/handler.py diff --git a/tests/wpt/web-platform-tests/tools/webtransport/h3/test_capsule.py b/tests/wpt/tests/tools/webtransport/h3/test_capsule.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webtransport/h3/test_capsule.py rename to tests/wpt/tests/tools/webtransport/h3/test_capsule.py diff --git a/tests/wpt/web-platform-tests/tools/webtransport/h3/webtransport_h3_server.py b/tests/wpt/tests/tools/webtransport/h3/webtransport_h3_server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/webtransport/h3/webtransport_h3_server.py rename to tests/wpt/tests/tools/webtransport/h3/webtransport_h3_server.py diff --git a/tests/wpt/web-platform-tests/tools/webtransport/requirements.txt b/tests/wpt/tests/tools/webtransport/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/webtransport/requirements.txt rename to tests/wpt/tests/tools/webtransport/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/wpt/__init__.py b/tests/wpt/tests/tools/wpt/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/__init__.py rename to tests/wpt/tests/tools/wpt/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/android.py b/tests/wpt/tests/tools/wpt/android.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/android.py rename to tests/wpt/tests/tools/wpt/android.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/browser.py b/tests/wpt/tests/tools/wpt/browser.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/browser.py rename to tests/wpt/tests/tools/wpt/browser.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/commands.json b/tests/wpt/tests/tools/wpt/commands.json similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/commands.json rename to tests/wpt/tests/tools/wpt/commands.json diff --git a/tests/wpt/web-platform-tests/tools/wpt/create.py b/tests/wpt/tests/tools/wpt/create.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/create.py rename to tests/wpt/tests/tools/wpt/create.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/install.py b/tests/wpt/tests/tools/wpt/install.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/install.py rename to tests/wpt/tests/tools/wpt/install.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/markdown.py b/tests/wpt/tests/tools/wpt/markdown.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/markdown.py rename to tests/wpt/tests/tools/wpt/markdown.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/paths b/tests/wpt/tests/tools/wpt/paths similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/paths rename to tests/wpt/tests/tools/wpt/paths diff --git a/tests/wpt/web-platform-tests/tools/wpt/requirements.txt b/tests/wpt/tests/tools/wpt/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/requirements.txt rename to tests/wpt/tests/tools/wpt/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/wpt/requirements_install.txt b/tests/wpt/tests/tools/wpt/requirements_install.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/requirements_install.txt rename to tests/wpt/tests/tools/wpt/requirements_install.txt diff --git a/tests/wpt/web-platform-tests/tools/wpt/revlist.py b/tests/wpt/tests/tools/wpt/revlist.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/revlist.py rename to tests/wpt/tests/tools/wpt/revlist.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/run.py b/tests/wpt/tests/tools/wpt/run.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/run.py rename to tests/wpt/tests/tools/wpt/run.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/testfiles.py b/tests/wpt/tests/tools/wpt/testfiles.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/testfiles.py rename to tests/wpt/tests/tools/wpt/testfiles.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/__init__.py b/tests/wpt/tests/tools/wpt/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/__init__.py rename to tests/wpt/tests/tools/wpt/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/latest_mozilla_central.txt b/tests/wpt/tests/tools/wpt/tests/latest_mozilla_central.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/latest_mozilla_central.txt rename to tests/wpt/tests/tools/wpt/tests/latest_mozilla_central.txt diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2018-05-17.html b/tests/wpt/tests/tools/wpt/tests/safari-downloads/2018-05-17.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2018-05-17.html rename to tests/wpt/tests/tools/wpt/tests/safari-downloads/2018-05-17.html diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2018-09-19.html b/tests/wpt/tests/tools/wpt/tests/safari-downloads/2018-09-19.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2018-09-19.html rename to tests/wpt/tests/tools/wpt/tests/safari-downloads/2018-09-19.html diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2020-06-04.html b/tests/wpt/tests/tools/wpt/tests/safari-downloads/2020-06-04.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2020-06-04.html rename to tests/wpt/tests/tools/wpt/tests/safari-downloads/2020-06-04.html diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2020-07-16.html b/tests/wpt/tests/tools/wpt/tests/safari-downloads/2020-07-16.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2020-07-16.html rename to tests/wpt/tests/tools/wpt/tests/safari-downloads/2020-07-16.html diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2020-11-14.html b/tests/wpt/tests/tools/wpt/tests/safari-downloads/2020-11-14.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2020-11-14.html rename to tests/wpt/tests/tools/wpt/tests/safari-downloads/2020-11-14.html diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2021-06-08.html b/tests/wpt/tests/tools/wpt/tests/safari-downloads/2021-06-08.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2021-06-08.html rename to tests/wpt/tests/tools/wpt/tests/safari-downloads/2021-06-08.html diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2021-10-28.html b/tests/wpt/tests/tools/wpt/tests/safari-downloads/2021-10-28.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2021-10-28.html rename to tests/wpt/tests/tools/wpt/tests/safari-downloads/2021-10-28.html diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2022-05-29.html b/tests/wpt/tests/tools/wpt/tests/safari-downloads/2022-05-29.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2022-05-29.html rename to tests/wpt/tests/tools/wpt/tests/safari-downloads/2022-05-29.html diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2022-06-22.html b/tests/wpt/tests/tools/wpt/tests/safari-downloads/2022-06-22.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2022-06-22.html rename to tests/wpt/tests/tools/wpt/tests/safari-downloads/2022-06-22.html diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2022-07-05.html b/tests/wpt/tests/tools/wpt/tests/safari-downloads/2022-07-05.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2022-07-05.html rename to tests/wpt/tests/tools/wpt/tests/safari-downloads/2022-07-05.html diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2022-07-07.html b/tests/wpt/tests/tools/wpt/tests/safari-downloads/2022-07-07.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2022-07-07.html rename to tests/wpt/tests/tools/wpt/tests/safari-downloads/2022-07-07.html diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2022-08-25.html b/tests/wpt/tests/tools/wpt/tests/safari-downloads/2022-08-25.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/safari-downloads/2022-08-25.html rename to tests/wpt/tests/tools/wpt/tests/safari-downloads/2022-08-25.html diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_browser.py b/tests/wpt/tests/tools/wpt/tests/test_browser.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/test_browser.py rename to tests/wpt/tests/tools/wpt/tests/test_browser.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_install.py b/tests/wpt/tests/tools/wpt/tests/test_install.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/test_install.py rename to tests/wpt/tests/tools/wpt/tests/test_install.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_markdown.py b/tests/wpt/tests/tools/wpt/tests/test_markdown.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/test_markdown.py rename to tests/wpt/tests/tools/wpt/tests/test_markdown.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_revlist.py b/tests/wpt/tests/tools/wpt/tests/test_revlist.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/test_revlist.py rename to tests/wpt/tests/tools/wpt/tests/test_revlist.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_run.py b/tests/wpt/tests/tools/wpt/tests/test_run.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/test_run.py rename to tests/wpt/tests/tools/wpt/tests/test_run.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_testfiles.py b/tests/wpt/tests/tools/wpt/tests/test_testfiles.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/test_testfiles.py rename to tests/wpt/tests/tools/wpt/tests/test_testfiles.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_update_expectations.py b/tests/wpt/tests/tools/wpt/tests/test_update_expectations.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/test_update_expectations.py rename to tests/wpt/tests/tools/wpt/tests/test_update_expectations.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py b/tests/wpt/tests/tools/wpt/tests/test_wpt.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py rename to tests/wpt/tests/tools/wpt/tests/test_wpt.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/tox.ini b/tests/wpt/tests/tools/wpt/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/tox.ini rename to tests/wpt/tests/tools/wpt/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/wpt/update.py b/tests/wpt/tests/tools/wpt/update.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/update.py rename to tests/wpt/tests/tools/wpt/update.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/utils.py b/tests/wpt/tests/tools/wpt/utils.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/utils.py rename to tests/wpt/tests/tools/wpt/utils.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/virtualenv.py b/tests/wpt/tests/tools/wpt/virtualenv.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/virtualenv.py rename to tests/wpt/tests/tools/wpt/virtualenv.py diff --git a/tests/wpt/web-platform-tests/tools/wpt/wpt.py b/tests/wpt/tests/tools/wpt/wpt.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wpt/wpt.py rename to tests/wpt/tests/tools/wpt/wpt.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/.gitignore b/tests/wpt/tests/tools/wptrunner/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/.gitignore rename to tests/wpt/tests/tools/wptrunner/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/MANIFEST.in b/tests/wpt/tests/tools/wptrunner/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/MANIFEST.in rename to tests/wpt/tests/tools/wptrunner/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/README.rst b/tests/wpt/tests/tools/wptrunner/README.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/README.rst rename to tests/wpt/tests/tools/wptrunner/README.rst diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/docs/architecture.svg b/tests/wpt/tests/tools/wptrunner/docs/architecture.svg similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/docs/architecture.svg rename to tests/wpt/tests/tools/wptrunner/docs/architecture.svg diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/docs/commands.rst b/tests/wpt/tests/tools/wptrunner/docs/commands.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/docs/commands.rst rename to tests/wpt/tests/tools/wptrunner/docs/commands.rst diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/docs/design.rst b/tests/wpt/tests/tools/wptrunner/docs/design.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/docs/design.rst rename to tests/wpt/tests/tools/wptrunner/docs/design.rst diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/docs/expectation.rst b/tests/wpt/tests/tools/wptrunner/docs/expectation.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/docs/expectation.rst rename to tests/wpt/tests/tools/wptrunner/docs/expectation.rst diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/docs/internals.rst b/tests/wpt/tests/tools/wptrunner/docs/internals.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/docs/internals.rst rename to tests/wpt/tests/tools/wptrunner/docs/internals.rst diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt b/tests/wpt/tests/tools/wptrunner/requirements.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt rename to tests/wpt/tests/tools/wptrunner/requirements.txt diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chromium.txt b/tests/wpt/tests/tools/wptrunner/requirements_chromium.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/requirements_chromium.txt rename to tests/wpt/tests/tools/wptrunner/requirements_chromium.txt diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge.txt b/tests/wpt/tests/tools/wptrunner/requirements_edge.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge.txt rename to tests/wpt/tests/tools/wptrunner/requirements_edge.txt diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt b/tests/wpt/tests/tools/wptrunner/requirements_firefox.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt rename to tests/wpt/tests/tools/wptrunner/requirements_firefox.txt diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_ie.txt b/tests/wpt/tests/tools/wptrunner/requirements_ie.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/requirements_ie.txt rename to tests/wpt/tests/tools/wptrunner/requirements_ie.txt diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_opera.txt b/tests/wpt/tests/tools/wptrunner/requirements_opera.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/requirements_opera.txt rename to tests/wpt/tests/tools/wptrunner/requirements_opera.txt diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_safari.txt b/tests/wpt/tests/tools/wptrunner/requirements_safari.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/requirements_safari.txt rename to tests/wpt/tests/tools/wptrunner/requirements_safari.txt diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_sauce.txt b/tests/wpt/tests/tools/wptrunner/requirements_sauce.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/requirements_sauce.txt rename to tests/wpt/tests/tools/wptrunner/requirements_sauce.txt diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/setup.py b/tests/wpt/tests/tools/wptrunner/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/setup.py rename to tests/wpt/tests/tools/wptrunner/setup.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/tox.ini b/tests/wpt/tests/tools/wptrunner/tox.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/tox.ini rename to tests/wpt/tests/tools/wptrunner/tox.ini diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner.default.ini b/tests/wpt/tests/tools/wptrunner/wptrunner.default.ini similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner.default.ini rename to tests/wpt/tests/tools/wptrunner/wptrunner.default.ini diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/__init__.py b/tests/wpt/tests/tools/wptrunner/wptrunner/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/__init__.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/__init__.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/__init__.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/android_weblayer.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/android_weblayer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/android_weblayer.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/android_weblayer.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/android_webview.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/android_webview.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/android_webview.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/android_webview.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/base.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/base.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/base.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_android.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_android.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_android.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_android.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_ios.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_ios.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_ios.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_ios.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chromium.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chromium.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chromium.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chromium.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/content_shell.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/content_shell.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/content_shell.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/content_shell.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edge.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/edge.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edge.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/edge.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edge_webdriver.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/edge_webdriver.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edge_webdriver.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/edge_webdriver.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edgechromium.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/edgechromium.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edgechromium.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/edgechromium.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/epiphany.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/epiphany.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/epiphany.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/epiphany.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/ie.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/ie.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/ie.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/ie.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/opera.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/opera.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/opera.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/opera.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/safari.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/safari.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/safari.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/safari.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/sauce.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/sauce.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/sauce.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/sauce.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/sauce_setup/edge-prerun.bat b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/sauce_setup/edge-prerun.bat similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/sauce_setup/edge-prerun.bat rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/sauce_setup/edge-prerun.bat diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/sauce_setup/safari-prerun.sh b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/sauce_setup/safari-prerun.sh similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/sauce_setup/safari-prerun.sh rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/sauce_setup/safari-prerun.sh diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servo.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/servo.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servo.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/servo.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/servodriver.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/servodriver.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/webkit.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/webkit.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/webkit.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/webkit.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/wktr.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/wktr.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/wktr.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/browsers/wktr.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/config.py b/tests/wpt/tests/tools/wptrunner/wptrunner/config.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/config.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/config.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py b/tests/wpt/tests/tools/wptrunner/wptrunner/environment.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/environment.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/__init__.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/__init__.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/actions.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/actions.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/actions.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/actions.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/base.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorchrome.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorchrome.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executormarionette.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/executormarionette.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorselenium.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorselenium.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorselenium.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorservo.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservo.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorservo.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorservodriver.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorservodriver.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwktr.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwktr.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwktr.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwktr.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/process.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/process.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/process.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/process.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/protocol.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/protocol.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/pytestrunner/__init__.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/pytestrunner/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/pytestrunner/__init__.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/pytestrunner/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/reftest.js b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/reftest.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/reftest.js rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/reftest.js diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/runner.js b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/runner.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/runner.js rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/runner.js diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/test-wait.js b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/test-wait.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/test-wait.js rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/test-wait.js diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_servodriver.js b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/testharness_servodriver.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_servodriver.js rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/testharness_servodriver.js diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_webdriver_resume.js b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/testharness_webdriver_resume.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_webdriver_resume.js rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/testharness_webdriver_resume.js diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/window-loaded.js b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/window-loaded.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/window-loaded.js rename to tests/wpt/tests/tools/wptrunner/wptrunner/executors/window-loaded.js diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/expected.py b/tests/wpt/tests/tools/wptrunner/wptrunner/expected.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/expected.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/expected.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/expectedtree.py b/tests/wpt/tests/tools/wptrunner/wptrunner/expectedtree.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/expectedtree.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/expectedtree.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/font.py b/tests/wpt/tests/tools/wptrunner/wptrunner/font.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/font.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/font.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/__init__.py b/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/__init__.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/formatters/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/chromium.py b/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/chromium.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/chromium.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/formatters/chromium.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/tests/__init__.py b/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/tests/__init__.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/formatters/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py b/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/wptreport.py b/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/wptreport.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/wptreport.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/formatters/wptreport.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/wptscreenshot.py b/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/wptscreenshot.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/wptscreenshot.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/formatters/wptscreenshot.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/instruments.py b/tests/wpt/tests/tools/wptrunner/wptrunner/instruments.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/instruments.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/instruments.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestexpected.py b/tests/wpt/tests/tools/wptrunner/wptrunner/manifestexpected.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestexpected.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/manifestexpected.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestinclude.py b/tests/wpt/tests/tools/wptrunner/wptrunner/manifestinclude.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestinclude.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/manifestinclude.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestupdate.py b/tests/wpt/tests/tools/wptrunner/wptrunner/manifestupdate.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/manifestupdate.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/manifestupdate.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py b/tests/wpt/tests/tools/wptrunner/wptrunner/metadata.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/metadata.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/mpcontext.py b/tests/wpt/tests/tools/wptrunner/wptrunner/mpcontext.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/mpcontext.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/mpcontext.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/print_pdf_runner.html b/tests/wpt/tests/tools/wptrunner/wptrunner/print_pdf_runner.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/print_pdf_runner.html rename to tests/wpt/tests/tools/wptrunner/wptrunner/print_pdf_runner.html diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/products.py b/tests/wpt/tests/tools/wptrunner/wptrunner/products.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/products.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/products.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/stability.py b/tests/wpt/tests/tools/wptrunner/wptrunner/stability.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/stability.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/stability.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-extra.js b/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-extra.js rename to tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-vendor.js b/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-vendor.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-vendor.js rename to tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-vendor.js diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharness_runner.html b/tests/wpt/tests/tools/wptrunner/wptrunner/testharness_runner.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharness_runner.html rename to tests/wpt/tests/tools/wptrunner/wptrunner/testharness_runner.html diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-content-shell.js b/tests/wpt/tests/tools/wptrunner/wptrunner/testharnessreport-content-shell.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-content-shell.js rename to tests/wpt/tests/tools/wptrunner/wptrunner/testharnessreport-content-shell.js diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-servo.js b/tests/wpt/tests/tools/wptrunner/wptrunner/testharnessreport-servo.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-servo.js rename to tests/wpt/tests/tools/wptrunner/wptrunner/testharnessreport-servo.js diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-servodriver.js b/tests/wpt/tests/tools/wptrunner/wptrunner/testharnessreport-servodriver.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-servodriver.js rename to tests/wpt/tests/tools/wptrunner/wptrunner/testharnessreport-servodriver.js diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-wktr.js b/tests/wpt/tests/tools/wptrunner/wptrunner/testharnessreport-wktr.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-wktr.js rename to tests/wpt/tests/tools/wptrunner/wptrunner/testharnessreport-wktr.js diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport.js b/tests/wpt/tests/tools/wptrunner/wptrunner/testharnessreport.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport.js rename to tests/wpt/tests/tools/wptrunner/wptrunner/testharnessreport.js diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py b/tests/wpt/tests/tools/wptrunner/wptrunner/testloader.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/testloader.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py b/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/__init__.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/__init__.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/base.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/base.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/base.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/browsers/__init__.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/browsers/__init__.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/browsers/test_sauce.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_sauce.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/browsers/test_sauce.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_sauce.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/browsers/test_webkitgtk.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_webkitgtk.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/browsers/test_webkitgtk.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_webkitgtk.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_executors.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_executors.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_executors.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_executors.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_expectedtree.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_expectedtree.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_expectedtree.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_expectedtree.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_formatters.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_formatters.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_formatters.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_formatters.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_manifestexpected.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_manifestexpected.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_manifestexpected.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_manifestexpected.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_metadata.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_metadata.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_metadata.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_metadata.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_products.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_products.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_products.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_products.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_stability.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_stability.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_stability.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_stability.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_testloader.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_testloader.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_testloader.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_testloader.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_update.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_update.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_update.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_update.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_wpttest.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_wpttest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_wpttest.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_wpttest.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/__init__.py b/tests/wpt/tests/tools/wptrunner/wptrunner/update/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/__init__.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/update/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/base.py b/tests/wpt/tests/tools/wptrunner/wptrunner/update/base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/base.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/update/base.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/metadata.py b/tests/wpt/tests/tools/wptrunner/wptrunner/update/metadata.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/metadata.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/update/metadata.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/state.py b/tests/wpt/tests/tools/wptrunner/wptrunner/update/state.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/state.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/update/state.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/sync.py b/tests/wpt/tests/tools/wptrunner/wptrunner/update/sync.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/sync.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/update/sync.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/tree.py b/tests/wpt/tests/tools/wptrunner/wptrunner/update/tree.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/tree.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/update/tree.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/update.py b/tests/wpt/tests/tools/wptrunner/wptrunner/update/update.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/update.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/update/update.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/vcs.py b/tests/wpt/tests/tools/wptrunner/wptrunner/vcs.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/vcs.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/vcs.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptlogging.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptlogging.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptlogging.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptlogging.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/__init__.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/__init__.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/backends/__init__.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/backends/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/backends/__init__.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/backends/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/backends/base.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/backends/base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/backends/base.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/backends/base.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/backends/conditional.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/backends/conditional.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/backends/conditional.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/backends/conditional.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/backends/static.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/backends/static.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/backends/static.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/backends/static.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/node.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/node.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/node.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/node.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/parser.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/parser.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/parser.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/parser.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/serializer.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/serializer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/serializer.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/serializer.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/tests/__init__.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/tests/__init__.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_conditional.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_conditional.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_conditional.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_conditional.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_parser.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_parser.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_parser.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_parser.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_serializer.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_serializer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_serializer.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_serializer.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_static.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_static.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_static.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_static.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_tokenizer.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_tokenizer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_tokenizer.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/tests/test_tokenizer.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wpttest.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wpttest.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wpttest.py rename to tests/wpt/tests/tools/wptrunner/wptrunner/wpttest.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/.coveragerc b/tests/wpt/tests/tools/wptserve/.coveragerc similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/.coveragerc rename to tests/wpt/tests/tools/wptserve/.coveragerc diff --git a/tests/wpt/web-platform-tests/tools/wptserve/.gitignore b/tests/wpt/tests/tools/wptserve/.gitignore similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/.gitignore rename to tests/wpt/tests/tools/wptserve/.gitignore diff --git a/tests/wpt/web-platform-tests/tools/wptserve/MANIFEST.in b/tests/wpt/tests/tools/wptserve/MANIFEST.in similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/MANIFEST.in rename to tests/wpt/tests/tools/wptserve/MANIFEST.in diff --git a/tests/wpt/web-platform-tests/tools/wptserve/README.md b/tests/wpt/tests/tools/wptserve/README.md similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/README.md rename to tests/wpt/tests/tools/wptserve/README.md diff --git a/tests/wpt/web-platform-tests/tools/wptserve/docs/Makefile b/tests/wpt/tests/tools/wptserve/docs/Makefile similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/docs/Makefile rename to tests/wpt/tests/tools/wptserve/docs/Makefile diff --git a/tests/wpt/web-platform-tests/tools/wptserve/docs/conf.py b/tests/wpt/tests/tools/wptserve/docs/conf.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/docs/conf.py rename to tests/wpt/tests/tools/wptserve/docs/conf.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/docs/handlers.rst b/tests/wpt/tests/tools/wptserve/docs/handlers.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/docs/handlers.rst rename to tests/wpt/tests/tools/wptserve/docs/handlers.rst diff --git a/tests/wpt/web-platform-tests/tools/wptserve/docs/index.rst b/tests/wpt/tests/tools/wptserve/docs/index.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/docs/index.rst rename to tests/wpt/tests/tools/wptserve/docs/index.rst diff --git a/tests/wpt/web-platform-tests/tools/wptserve/docs/introduction.rst b/tests/wpt/tests/tools/wptserve/docs/introduction.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/docs/introduction.rst rename to tests/wpt/tests/tools/wptserve/docs/introduction.rst diff --git a/tests/wpt/web-platform-tests/tools/wptserve/docs/make.bat b/tests/wpt/tests/tools/wptserve/docs/make.bat similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/docs/make.bat rename to tests/wpt/tests/tools/wptserve/docs/make.bat diff --git a/tests/wpt/web-platform-tests/tools/wptserve/docs/pipes.rst b/tests/wpt/tests/tools/wptserve/docs/pipes.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/docs/pipes.rst rename to tests/wpt/tests/tools/wptserve/docs/pipes.rst diff --git a/tests/wpt/web-platform-tests/tools/wptserve/docs/request.rst b/tests/wpt/tests/tools/wptserve/docs/request.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/docs/request.rst rename to tests/wpt/tests/tools/wptserve/docs/request.rst diff --git a/tests/wpt/web-platform-tests/tools/wptserve/docs/response.rst b/tests/wpt/tests/tools/wptserve/docs/response.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/docs/response.rst rename to tests/wpt/tests/tools/wptserve/docs/response.rst diff --git a/tests/wpt/web-platform-tests/tools/wptserve/docs/router.rst b/tests/wpt/tests/tools/wptserve/docs/router.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/docs/router.rst rename to tests/wpt/tests/tools/wptserve/docs/router.rst diff --git a/tests/wpt/web-platform-tests/tools/wptserve/docs/server.rst b/tests/wpt/tests/tools/wptserve/docs/server.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/docs/server.rst rename to tests/wpt/tests/tools/wptserve/docs/server.rst diff --git a/tests/wpt/web-platform-tests/tools/wptserve/docs/stash.rst b/tests/wpt/tests/tools/wptserve/docs/stash.rst similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/docs/stash.rst rename to tests/wpt/tests/tools/wptserve/docs/stash.rst diff --git a/tests/wpt/web-platform-tests/tools/wptserve/setup.py b/tests/wpt/tests/tools/wptserve/setup.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/setup.py rename to tests/wpt/tests/tools/wptserve/setup.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/__init__.py b/tests/wpt/tests/tools/wptserve/tests/functional/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/__init__.py rename to tests/wpt/tests/tools/wptserve/tests/functional/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/base.py b/tests/wpt/tests/tools/wptserve/tests/functional/base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/base.py rename to tests/wpt/tests/tools/wptserve/tests/functional/base.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/__init__.py b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/__init__.py rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/bar.any.worker.js b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/bar.any.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/bar.any.worker.js rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/bar.any.worker.js diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/document.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/document.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/document.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/document.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/foo.any.html b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/foo.any.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/foo.any.html rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/foo.any.html diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/foo.any.serviceworker.html b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/foo.any.serviceworker.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/foo.any.serviceworker.html rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/foo.any.serviceworker.html diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/foo.any.sharedworker.html b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/foo.any.sharedworker.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/foo.any.sharedworker.html rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/foo.any.sharedworker.html diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/foo.any.worker.html b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/foo.any.worker.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/foo.any.worker.html rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/foo.any.worker.html diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/foo.window.html b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/foo.window.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/foo.window.html rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/foo.window.html diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/foo.worker.html b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/foo.worker.html similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/foo.worker.html rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/foo.worker.html diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/invalid.py b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/invalid.py rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/invalid.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/no_main.py b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/no_main.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/no_main.py rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/no_main.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub.sub.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub.sub.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub.sub.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub.sub.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_file_hash.sub.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_file_hash.sub.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_file_hash.sub.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_file_hash.sub.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_file_hash_subject.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_file_hash_subject.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_file_hash_subject.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_file_hash_subject.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_file_hash_unrecognized.sub.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_file_hash_unrecognized.sub.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_file_hash_unrecognized.sub.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_file_hash_unrecognized.sub.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_header_or_default.sub.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_header_or_default.sub.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_header_or_default.sub.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_header_or_default.sub.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_headers.sub.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_headers.sub.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_headers.sub.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_headers.sub.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_headers.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_headers.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_headers.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_headers.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_location.sub.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_location.sub.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_location.sub.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_location.sub.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_params.sub.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_params.sub.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_params.sub.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_params.sub.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_params.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_params.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_params.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_params.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_url_base.sub.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_url_base.sub.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_url_base.sub.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_url_base.sub.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_uuid.sub.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_uuid.sub.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_uuid.sub.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_uuid.sub.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_var.sub.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_var.sub.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/sub_var.sub.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/sub_var.sub.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/subdir/__init__.py b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/subdir/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/subdir/__init__.py rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/subdir/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/subdir/example_module.py b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/subdir/example_module.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/subdir/example_module.py rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/subdir/example_module.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/subdir/file.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/subdir/file.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/subdir/file.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/subdir/file.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/subdir/import_handler.py b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/subdir/import_handler.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/subdir/import_handler.py rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/subdir/import_handler.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/subdir/sub_path.sub.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/subdir/sub_path.sub.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/subdir/sub_path.sub.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/subdir/sub_path.sub.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/test.asis b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/test.asis similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/test.asis rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/test.asis diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/test_h2_data.py b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/test_h2_data.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/test_h2_data.py rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/test_h2_data.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/test_h2_headers.py b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/test_h2_headers.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/test_h2_headers.py rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/test_h2_headers.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/test_h2_headers_data.py b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/test_h2_headers_data.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/test_h2_headers_data.py rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/test_h2_headers_data.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/test_string.py b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/test_string.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/test_string.py rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/test_string.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/test_tuple_2.py b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/test_tuple_2.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/test_tuple_2.py rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/test_tuple_2.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/test_tuple_3.py b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/test_tuple_3.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/test_tuple_3.py rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/test_tuple_3.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/with_headers.txt b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/with_headers.txt similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/with_headers.txt rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/with_headers.txt diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/with_headers.txt.sub.headers b/tests/wpt/tests/tools/wptserve/tests/functional/docroot/with_headers.txt.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/docroot/with_headers.txt.sub.headers rename to tests/wpt/tests/tools/wptserve/tests/functional/docroot/with_headers.txt.sub.headers diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_cookies.py b/tests/wpt/tests/tools/wptserve/tests/functional/test_cookies.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_cookies.py rename to tests/wpt/tests/tools/wptserve/tests/functional/test_cookies.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_handlers.py b/tests/wpt/tests/tools/wptserve/tests/functional/test_handlers.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_handlers.py rename to tests/wpt/tests/tools/wptserve/tests/functional/test_handlers.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_input_file.py b/tests/wpt/tests/tools/wptserve/tests/functional/test_input_file.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_input_file.py rename to tests/wpt/tests/tools/wptserve/tests/functional/test_input_file.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_pipes.py b/tests/wpt/tests/tools/wptserve/tests/functional/test_pipes.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_pipes.py rename to tests/wpt/tests/tools/wptserve/tests/functional/test_pipes.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_request.py b/tests/wpt/tests/tools/wptserve/tests/functional/test_request.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_request.py rename to tests/wpt/tests/tools/wptserve/tests/functional/test_request.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_response.py b/tests/wpt/tests/tools/wptserve/tests/functional/test_response.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_response.py rename to tests/wpt/tests/tools/wptserve/tests/functional/test_response.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_server.py b/tests/wpt/tests/tools/wptserve/tests/functional/test_server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_server.py rename to tests/wpt/tests/tools/wptserve/tests/functional/test_server.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_stash.py b/tests/wpt/tests/tools/wptserve/tests/functional/test_stash.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_stash.py rename to tests/wpt/tests/tools/wptserve/tests/functional/test_stash.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/test_config.py b/tests/wpt/tests/tools/wptserve/tests/test_config.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/test_config.py rename to tests/wpt/tests/tools/wptserve/tests/test_config.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/test_replacement_tokenizer.py b/tests/wpt/tests/tools/wptserve/tests/test_replacement_tokenizer.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/test_replacement_tokenizer.py rename to tests/wpt/tests/tools/wptserve/tests/test_replacement_tokenizer.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/test_request.py b/tests/wpt/tests/tools/wptserve/tests/test_request.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/test_request.py rename to tests/wpt/tests/tools/wptserve/tests/test_request.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/test_response.py b/tests/wpt/tests/tools/wptserve/tests/test_response.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/test_response.py rename to tests/wpt/tests/tools/wptserve/tests/test_response.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/test_stash.py b/tests/wpt/tests/tools/wptserve/tests/test_stash.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/tests/test_stash.py rename to tests/wpt/tests/tools/wptserve/tests/test_stash.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/__init__.py b/tests/wpt/tests/tools/wptserve/wptserve/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/__init__.py rename to tests/wpt/tests/tools/wptserve/wptserve/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/config.py b/tests/wpt/tests/tools/wptserve/wptserve/config.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/config.py rename to tests/wpt/tests/tools/wptserve/wptserve/config.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/constants.py b/tests/wpt/tests/tools/wptserve/wptserve/constants.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/constants.py rename to tests/wpt/tests/tools/wptserve/wptserve/constants.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/handlers.py b/tests/wpt/tests/tools/wptserve/wptserve/handlers.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/handlers.py rename to tests/wpt/tests/tools/wptserve/wptserve/handlers.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/logger.py b/tests/wpt/tests/tools/wptserve/wptserve/logger.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/logger.py rename to tests/wpt/tests/tools/wptserve/wptserve/logger.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/pipes.py b/tests/wpt/tests/tools/wptserve/wptserve/pipes.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/pipes.py rename to tests/wpt/tests/tools/wptserve/wptserve/pipes.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/ranges.py b/tests/wpt/tests/tools/wptserve/wptserve/ranges.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/ranges.py rename to tests/wpt/tests/tools/wptserve/wptserve/ranges.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/request.py b/tests/wpt/tests/tools/wptserve/wptserve/request.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/request.py rename to tests/wpt/tests/tools/wptserve/wptserve/request.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/response.py b/tests/wpt/tests/tools/wptserve/wptserve/response.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/response.py rename to tests/wpt/tests/tools/wptserve/wptserve/response.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/router.py b/tests/wpt/tests/tools/wptserve/wptserve/router.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/router.py rename to tests/wpt/tests/tools/wptserve/wptserve/router.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/routes.py b/tests/wpt/tests/tools/wptserve/wptserve/routes.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/routes.py rename to tests/wpt/tests/tools/wptserve/wptserve/routes.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py b/tests/wpt/tests/tools/wptserve/wptserve/server.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py rename to tests/wpt/tests/tools/wptserve/wptserve/server.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/__init__.py b/tests/wpt/tests/tools/wptserve/wptserve/sslutils/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/__init__.py rename to tests/wpt/tests/tools/wptserve/wptserve/sslutils/__init__.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/base.py b/tests/wpt/tests/tools/wptserve/wptserve/sslutils/base.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/base.py rename to tests/wpt/tests/tools/wptserve/wptserve/sslutils/base.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/openssl.py b/tests/wpt/tests/tools/wptserve/wptserve/sslutils/openssl.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/openssl.py rename to tests/wpt/tests/tools/wptserve/wptserve/sslutils/openssl.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/pregenerated.py b/tests/wpt/tests/tools/wptserve/wptserve/sslutils/pregenerated.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/pregenerated.py rename to tests/wpt/tests/tools/wptserve/wptserve/sslutils/pregenerated.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/stash.py b/tests/wpt/tests/tools/wptserve/wptserve/stash.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/stash.py rename to tests/wpt/tests/tools/wptserve/wptserve/stash.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/utils.py b/tests/wpt/tests/tools/wptserve/wptserve/utils.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/utils.py rename to tests/wpt/tests/tools/wptserve/wptserve/utils.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/wptserve.py b/tests/wpt/tests/tools/wptserve/wptserve/wptserve.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/wptserve.py rename to tests/wpt/tests/tools/wptserve/wptserve/wptserve.py diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/ws_h2_handshake.py b/tests/wpt/tests/tools/wptserve/wptserve/ws_h2_handshake.py similarity index 100% rename from tests/wpt/web-platform-tests/tools/wptserve/wptserve/ws_h2_handshake.py rename to tests/wpt/tests/tools/wptserve/wptserve/ws_h2_handshake.py diff --git a/tests/wpt/web-platform-tests/top-level-storage-access-api/README.md b/tests/wpt/tests/top-level-storage-access-api/README.md similarity index 100% rename from tests/wpt/web-platform-tests/top-level-storage-access-api/README.md rename to tests/wpt/tests/top-level-storage-access-api/README.md diff --git a/tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/requestStorageAccessFor-insecure.sub.window.js b/tests/wpt/tests/top-level-storage-access-api/tentative/requestStorageAccessFor-insecure.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/requestStorageAccessFor-insecure.sub.window.js rename to tests/wpt/tests/top-level-storage-access-api/tentative/requestStorageAccessFor-insecure.sub.window.js diff --git a/tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/requestStorageAccessFor.sub.https.window.js b/tests/wpt/tests/top-level-storage-access-api/tentative/requestStorageAccessFor.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/requestStorageAccessFor.sub.https.window.js rename to tests/wpt/tests/top-level-storage-access-api/tentative/requestStorageAccessFor.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/resources/permissions-iframe.https.html b/tests/wpt/tests/top-level-storage-access-api/tentative/resources/permissions-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/resources/permissions-iframe.https.html rename to tests/wpt/tests/top-level-storage-access-api/tentative/resources/permissions-iframe.https.html diff --git a/tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/resources/requestStorageAccessFor-iframe.html b/tests/wpt/tests/top-level-storage-access-api/tentative/resources/requestStorageAccessFor-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/resources/requestStorageAccessFor-iframe.html rename to tests/wpt/tests/top-level-storage-access-api/tentative/resources/requestStorageAccessFor-iframe.html diff --git a/tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/resources/requestStorageAccessFor-iframe.https.html b/tests/wpt/tests/top-level-storage-access-api/tentative/resources/requestStorageAccessFor-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/resources/requestStorageAccessFor-iframe.https.html rename to tests/wpt/tests/top-level-storage-access-api/tentative/resources/requestStorageAccessFor-iframe.https.html diff --git a/tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/top-level-storage-access-permission.sub.https.window.js b/tests/wpt/tests/top-level-storage-access-api/tentative/top-level-storage-access-permission.sub.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/top-level-storage-access-api/tentative/top-level-storage-access-permission.sub.https.window.js rename to tests/wpt/tests/top-level-storage-access-api/tentative/top-level-storage-access-permission.sub.https.window.js diff --git a/tests/wpt/web-platform-tests/touch-events/META.yml b/tests/wpt/tests/touch-events/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/touch-events/META.yml rename to tests/wpt/tests/touch-events/META.yml diff --git a/tests/wpt/web-platform-tests/touch-events/expose-legacy-touch-event-apis.html b/tests/wpt/tests/touch-events/expose-legacy-touch-event-apis.html similarity index 100% rename from tests/wpt/web-platform-tests/touch-events/expose-legacy-touch-event-apis.html rename to tests/wpt/tests/touch-events/expose-legacy-touch-event-apis.html diff --git a/tests/wpt/web-platform-tests/touch-events/historical.html b/tests/wpt/tests/touch-events/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/touch-events/historical.html rename to tests/wpt/tests/touch-events/historical.html diff --git a/tests/wpt/web-platform-tests/touch-events/idlharness.window.js b/tests/wpt/tests/touch-events/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/touch-events/idlharness.window.js rename to tests/wpt/tests/touch-events/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/touch-events/multi-touch-interactions.html b/tests/wpt/tests/touch-events/multi-touch-interactions.html similarity index 100% rename from tests/wpt/web-platform-tests/touch-events/multi-touch-interactions.html rename to tests/wpt/tests/touch-events/multi-touch-interactions.html diff --git a/tests/wpt/web-platform-tests/touch-events/multi-touch-interactions.js b/tests/wpt/tests/touch-events/multi-touch-interactions.js similarity index 100% rename from tests/wpt/web-platform-tests/touch-events/multi-touch-interactions.js rename to tests/wpt/tests/touch-events/multi-touch-interactions.js diff --git a/tests/wpt/web-platform-tests/touch-events/multi-touch-interfaces.html b/tests/wpt/tests/touch-events/multi-touch-interfaces.html similarity index 100% rename from tests/wpt/web-platform-tests/touch-events/multi-touch-interfaces.html rename to tests/wpt/tests/touch-events/multi-touch-interfaces.html diff --git a/tests/wpt/web-platform-tests/touch-events/single-touch-vertical-rl.html b/tests/wpt/tests/touch-events/single-touch-vertical-rl.html similarity index 100% rename from tests/wpt/web-platform-tests/touch-events/single-touch-vertical-rl.html rename to tests/wpt/tests/touch-events/single-touch-vertical-rl.html diff --git a/tests/wpt/web-platform-tests/touch-events/single-touch.html b/tests/wpt/tests/touch-events/single-touch.html similarity index 100% rename from tests/wpt/web-platform-tests/touch-events/single-touch.html rename to tests/wpt/tests/touch-events/single-touch.html diff --git a/tests/wpt/web-platform-tests/touch-events/support/touch.js b/tests/wpt/tests/touch-events/support/touch.js similarity index 100% rename from tests/wpt/web-platform-tests/touch-events/support/touch.js rename to tests/wpt/tests/touch-events/support/touch.js diff --git a/tests/wpt/web-platform-tests/touch-events/touch-globaleventhandler-interface.html b/tests/wpt/tests/touch-events/touch-globaleventhandler-interface.html similarity index 100% rename from tests/wpt/web-platform-tests/touch-events/touch-globaleventhandler-interface.html rename to tests/wpt/tests/touch-events/touch-globaleventhandler-interface.html diff --git a/tests/wpt/web-platform-tests/touch-events/touch-retargeting-manual.html b/tests/wpt/tests/touch-events/touch-retargeting-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/touch-events/touch-retargeting-manual.html rename to tests/wpt/tests/touch-events/touch-retargeting-manual.html diff --git a/tests/wpt/web-platform-tests/touch-events/touch-touchevent-constructor.html b/tests/wpt/tests/touch-events/touch-touchevent-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/touch-events/touch-touchevent-constructor.html rename to tests/wpt/tests/touch-events/touch-touchevent-constructor.html diff --git a/tests/wpt/web-platform-tests/trust-tokens/end-to-end/README.txt b/tests/wpt/tests/trust-tokens/end-to-end/README.txt similarity index 100% rename from tests/wpt/web-platform-tests/trust-tokens/end-to-end/README.txt rename to tests/wpt/tests/trust-tokens/end-to-end/README.txt diff --git a/tests/wpt/web-platform-tests/trust-tokens/end-to-end/has-trust-token-with-no-top-frame.tentative.https.html b/tests/wpt/tests/trust-tokens/end-to-end/has-trust-token-with-no-top-frame.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/trust-tokens/end-to-end/has-trust-token-with-no-top-frame.tentative.https.html rename to tests/wpt/tests/trust-tokens/end-to-end/has-trust-token-with-no-top-frame.tentative.https.html diff --git a/tests/wpt/web-platform-tests/trust-tokens/trust-token-parameter-validation-xhr.tentative.https.html b/tests/wpt/tests/trust-tokens/trust-token-parameter-validation-xhr.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/trust-tokens/trust-token-parameter-validation-xhr.tentative.https.html rename to tests/wpt/tests/trust-tokens/trust-token-parameter-validation-xhr.tentative.https.html diff --git a/tests/wpt/web-platform-tests/trust-tokens/trust-token-parameter-validation.tentative.https.html b/tests/wpt/tests/trust-tokens/trust-token-parameter-validation.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/trust-tokens/trust-token-parameter-validation.tentative.https.html rename to tests/wpt/tests/trust-tokens/trust-token-parameter-validation.tentative.https.html diff --git a/tests/wpt/web-platform-tests/trusted-types/DOMParser-parseFromString-regression.tentative.html b/tests/wpt/tests/trusted-types/DOMParser-parseFromString-regression.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/DOMParser-parseFromString-regression.tentative.html rename to tests/wpt/tests/trusted-types/DOMParser-parseFromString-regression.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/DOMParser-parseFromString.tentative.html b/tests/wpt/tests/trusted-types/DOMParser-parseFromString.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/DOMParser-parseFromString.tentative.html rename to tests/wpt/tests/trusted-types/DOMParser-parseFromString.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/DOMWindowTimers-setTimeout-setInterval.tentative.html b/tests/wpt/tests/trusted-types/DOMWindowTimers-setTimeout-setInterval.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/DOMWindowTimers-setTimeout-setInterval.tentative.html rename to tests/wpt/tests/trusted-types/DOMWindowTimers-setTimeout-setInterval.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/Document-execCommand.tentative.html b/tests/wpt/tests/trusted-types/Document-execCommand.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/Document-execCommand.tentative.html rename to tests/wpt/tests/trusted-types/Document-execCommand.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/Document-write.tentative.html b/tests/wpt/tests/trusted-types/Document-write.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/Document-write.tentative.html rename to tests/wpt/tests/trusted-types/Document-write.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/Element-insertAdjacentHTML.tentative.html b/tests/wpt/tests/trusted-types/Element-insertAdjacentHTML.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/Element-insertAdjacentHTML.tentative.html rename to tests/wpt/tests/trusted-types/Element-insertAdjacentHTML.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/Element-insertAdjacentText.tentative.html b/tests/wpt/tests/trusted-types/Element-insertAdjacentText.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/Element-insertAdjacentText.tentative.html rename to tests/wpt/tests/trusted-types/Element-insertAdjacentText.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/Element-outerHTML.tentative.html b/tests/wpt/tests/trusted-types/Element-outerHTML.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/Element-outerHTML.tentative.html rename to tests/wpt/tests/trusted-types/Element-outerHTML.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/Element-setAttribute.tentative.html b/tests/wpt/tests/trusted-types/Element-setAttribute.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/Element-setAttribute.tentative.html rename to tests/wpt/tests/trusted-types/Element-setAttribute.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/Element-setAttributeNS.tentative.html b/tests/wpt/tests/trusted-types/Element-setAttributeNS.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/Element-setAttributeNS.tentative.html rename to tests/wpt/tests/trusted-types/Element-setAttributeNS.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/GlobalEventHandlers-onclick.tentative.html b/tests/wpt/tests/trusted-types/GlobalEventHandlers-onclick.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/GlobalEventHandlers-onclick.tentative.html rename to tests/wpt/tests/trusted-types/GlobalEventHandlers-onclick.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/HTMLElement-generic.tentative.html b/tests/wpt/tests/trusted-types/HTMLElement-generic.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/HTMLElement-generic.tentative.html rename to tests/wpt/tests/trusted-types/HTMLElement-generic.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/HTMLScriptElement-in-xhtml-document.tentative.https.xhtml b/tests/wpt/tests/trusted-types/HTMLScriptElement-in-xhtml-document.tentative.https.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/HTMLScriptElement-in-xhtml-document.tentative.https.xhtml rename to tests/wpt/tests/trusted-types/HTMLScriptElement-in-xhtml-document.tentative.https.xhtml diff --git a/tests/wpt/web-platform-tests/trusted-types/HTMLScriptElement-internal-slot.tentative.html b/tests/wpt/tests/trusted-types/HTMLScriptElement-internal-slot.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/HTMLScriptElement-internal-slot.tentative.html rename to tests/wpt/tests/trusted-types/HTMLScriptElement-internal-slot.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/META.yml b/tests/wpt/tests/trusted-types/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/META.yml rename to tests/wpt/tests/trusted-types/META.yml diff --git a/tests/wpt/web-platform-tests/trusted-types/Node-multiple-arguments.tentative.html b/tests/wpt/tests/trusted-types/Node-multiple-arguments.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/Node-multiple-arguments.tentative.html rename to tests/wpt/tests/trusted-types/Node-multiple-arguments.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/Range-createContextualFragment.tentative.html b/tests/wpt/tests/trusted-types/Range-createContextualFragment.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/Range-createContextualFragment.tentative.html rename to tests/wpt/tests/trusted-types/Range-createContextualFragment.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedType-AttributeNodes.tentative.html b/tests/wpt/tests/trusted-types/TrustedType-AttributeNodes.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedType-AttributeNodes.tentative.html rename to tests/wpt/tests/trusted-types/TrustedType-AttributeNodes.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicy-CSP-no-name.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicy-CSP-no-name.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicy-CSP-no-name.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicy-CSP-no-name.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicy-CSP-wildcard.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicy-CSP-wildcard.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicy-CSP-wildcard.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicy-CSP-wildcard.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicy-createXXX.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicy-createXXX.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicy-createXXX.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicy-createXXX.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-blocking.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-blocking.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-blocking.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-blocking.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-constants.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-constants.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-constants.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-constants.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-createXYZTests.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-createXYZTests.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-createXYZTests.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-createXYZTests.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-noNamesGiven.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-noNamesGiven.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-noNamesGiven.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-noNamesGiven.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-none-skip.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-none-skip.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-none-skip.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-none-skip.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-none.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-none.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-none.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-none.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-wildcard.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-wildcard.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-wildcard.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-wildcard.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-nameTests.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-nameTests.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-nameTests.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-nameTests.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-unenforced.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-unenforced.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-unenforced.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-unenforced.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-defaultPolicy.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-defaultPolicy.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-defaultPolicy.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-defaultPolicy.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-getAttributeType-namespace.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-getAttributeType-namespace.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-getAttributeType-namespace.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-getAttributeType-namespace.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-getPropertyType.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-getPropertyType.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-getPropertyType.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-getPropertyType.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-isXXX.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-isXXX.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-isXXX.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-isXXX.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-metadata.tentative.html b/tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-metadata.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-metadata.tentative.html rename to tests/wpt/tests/trusted-types/TrustedTypePolicyFactory-metadata.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/Window-TrustedTypes.tentative.html b/tests/wpt/tests/trusted-types/Window-TrustedTypes.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/Window-TrustedTypes.tentative.html rename to tests/wpt/tests/trusted-types/Window-TrustedTypes.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/WorkerGlobalScope-eval.html b/tests/wpt/tests/trusted-types/WorkerGlobalScope-eval.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/WorkerGlobalScope-eval.html rename to tests/wpt/tests/trusted-types/WorkerGlobalScope-eval.html diff --git a/tests/wpt/web-platform-tests/trusted-types/WorkerGlobalScope-importScripts.html b/tests/wpt/tests/trusted-types/WorkerGlobalScope-importScripts.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/WorkerGlobalScope-importScripts.html rename to tests/wpt/tests/trusted-types/WorkerGlobalScope-importScripts.html diff --git a/tests/wpt/web-platform-tests/trusted-types/block-Document-execCommand.tentative.html b/tests/wpt/tests/trusted-types/block-Document-execCommand.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/block-Document-execCommand.tentative.html rename to tests/wpt/tests/trusted-types/block-Document-execCommand.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/block-Node-multiple-arguments.tentative.html b/tests/wpt/tests/trusted-types/block-Node-multiple-arguments.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/block-Node-multiple-arguments.tentative.html rename to tests/wpt/tests/trusted-types/block-Node-multiple-arguments.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html b/tests/wpt/tests/trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html rename to tests/wpt/tests/trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html b/tests/wpt/tests/trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html rename to tests/wpt/tests/trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Document-write.tentative.html b/tests/wpt/tests/trusted-types/block-string-assignment-to-Document-write.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Document-write.tentative.html rename to tests/wpt/tests/trusted-types/block-string-assignment-to-Document-write.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-insertAdjacentHTML.tentative.html b/tests/wpt/tests/trusted-types/block-string-assignment-to-Element-insertAdjacentHTML.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-insertAdjacentHTML.tentative.html rename to tests/wpt/tests/trusted-types/block-string-assignment-to-Element-insertAdjacentHTML.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-outerHTML.tentative.html b/tests/wpt/tests/trusted-types/block-string-assignment-to-Element-outerHTML.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-outerHTML.tentative.html rename to tests/wpt/tests/trusted-types/block-string-assignment-to-Element-outerHTML.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-setAttribute.tentative.html b/tests/wpt/tests/trusted-types/block-string-assignment-to-Element-setAttribute.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-setAttribute.tentative.html rename to tests/wpt/tests/trusted-types/block-string-assignment-to-Element-setAttribute.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html b/tests/wpt/tests/trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html rename to tests/wpt/tests/trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html b/tests/wpt/tests/trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html rename to tests/wpt/tests/trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Range-createContextualFragment.tentative.html b/tests/wpt/tests/trusted-types/block-string-assignment-to-Range-createContextualFragment.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Range-createContextualFragment.tentative.html rename to tests/wpt/tests/trusted-types/block-string-assignment-to-Range-createContextualFragment.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-attribute-via-attribute-node.tentative.html b/tests/wpt/tests/trusted-types/block-string-assignment-to-attribute-via-attribute-node.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-attribute-via-attribute-node.tentative.html rename to tests/wpt/tests/trusted-types/block-string-assignment-to-attribute-via-attribute-node.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/block-text-node-insertion-into-script-element.tentative.html b/tests/wpt/tests/trusted-types/block-text-node-insertion-into-script-element.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/block-text-node-insertion-into-script-element.tentative.html rename to tests/wpt/tests/trusted-types/block-text-node-insertion-into-script-element.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/csp-block-eval.tentative.html b/tests/wpt/tests/trusted-types/csp-block-eval.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/csp-block-eval.tentative.html rename to tests/wpt/tests/trusted-types/csp-block-eval.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/default-policy-callback-arguments.tentative.html b/tests/wpt/tests/trusted-types/default-policy-callback-arguments.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/default-policy-callback-arguments.tentative.html rename to tests/wpt/tests/trusted-types/default-policy-callback-arguments.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/default-policy-report-only.tentative.html b/tests/wpt/tests/trusted-types/default-policy-report-only.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/default-policy-report-only.tentative.html rename to tests/wpt/tests/trusted-types/default-policy-report-only.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/default-policy-report-only.tentative.html.headers b/tests/wpt/tests/trusted-types/default-policy-report-only.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/default-policy-report-only.tentative.html.headers rename to tests/wpt/tests/trusted-types/default-policy-report-only.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/default-policy.tentative.html b/tests/wpt/tests/trusted-types/default-policy.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/default-policy.tentative.html rename to tests/wpt/tests/trusted-types/default-policy.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/default-policy.tentative.html.headers b/tests/wpt/tests/trusted-types/default-policy.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/default-policy.tentative.html.headers rename to tests/wpt/tests/trusted-types/default-policy.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/empty-default-policy-report-only.tentative.html b/tests/wpt/tests/trusted-types/empty-default-policy-report-only.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/empty-default-policy-report-only.tentative.html rename to tests/wpt/tests/trusted-types/empty-default-policy-report-only.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/empty-default-policy-report-only.tentative.html.headers b/tests/wpt/tests/trusted-types/empty-default-policy-report-only.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/empty-default-policy-report-only.tentative.html.headers rename to tests/wpt/tests/trusted-types/empty-default-policy-report-only.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/empty-default-policy.tentative.html b/tests/wpt/tests/trusted-types/empty-default-policy.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/empty-default-policy.tentative.html rename to tests/wpt/tests/trusted-types/empty-default-policy.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/empty-default-policy.tentative.html.headers b/tests/wpt/tests/trusted-types/empty-default-policy.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/empty-default-policy.tentative.html.headers rename to tests/wpt/tests/trusted-types/empty-default-policy.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/eval-csp-no-tt.tentative.html b/tests/wpt/tests/trusted-types/eval-csp-no-tt.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/eval-csp-no-tt.tentative.html rename to tests/wpt/tests/trusted-types/eval-csp-no-tt.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/eval-csp-tt-default-policy.tentative.html b/tests/wpt/tests/trusted-types/eval-csp-tt-default-policy.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/eval-csp-tt-default-policy.tentative.html rename to tests/wpt/tests/trusted-types/eval-csp-tt-default-policy.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/eval-csp-tt-no-default-policy.tentative.html b/tests/wpt/tests/trusted-types/eval-csp-tt-no-default-policy.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/eval-csp-tt-no-default-policy.tentative.html rename to tests/wpt/tests/trusted-types/eval-csp-tt-no-default-policy.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/eval-function-constructor.tentative.html b/tests/wpt/tests/trusted-types/eval-function-constructor.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/eval-function-constructor.tentative.html rename to tests/wpt/tests/trusted-types/eval-function-constructor.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/eval-no-csp-no-tt-default-policy.tentative.html b/tests/wpt/tests/trusted-types/eval-no-csp-no-tt-default-policy.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/eval-no-csp-no-tt-default-policy.tentative.html rename to tests/wpt/tests/trusted-types/eval-no-csp-no-tt-default-policy.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/eval-no-csp-no-tt.tentative.html b/tests/wpt/tests/trusted-types/eval-no-csp-no-tt.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/eval-no-csp-no-tt.tentative.html rename to tests/wpt/tests/trusted-types/eval-no-csp-no-tt.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/eval-with-permissive-csp.tentative.html b/tests/wpt/tests/trusted-types/eval-with-permissive-csp.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/eval-with-permissive-csp.tentative.html rename to tests/wpt/tests/trusted-types/eval-with-permissive-csp.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/idlharness.tentative.window.js b/tests/wpt/tests/trusted-types/idlharness.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/idlharness.tentative.window.js rename to tests/wpt/tests/trusted-types/idlharness.tentative.window.js diff --git a/tests/wpt/web-platform-tests/trusted-types/no-require-trusted-types-for-report-only.tentative.html b/tests/wpt/tests/trusted-types/no-require-trusted-types-for-report-only.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/no-require-trusted-types-for-report-only.tentative.html rename to tests/wpt/tests/trusted-types/no-require-trusted-types-for-report-only.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/no-require-trusted-types-for-report-only.tentative.html.headers b/tests/wpt/tests/trusted-types/no-require-trusted-types-for-report-only.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/no-require-trusted-types-for-report-only.tentative.html.headers rename to tests/wpt/tests/trusted-types/no-require-trusted-types-for-report-only.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/no-require-trusted-types-for.tentative.html b/tests/wpt/tests/trusted-types/no-require-trusted-types-for.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/no-require-trusted-types-for.tentative.html rename to tests/wpt/tests/trusted-types/no-require-trusted-types-for.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/require-trusted-types-for-report-only.tentative.html b/tests/wpt/tests/trusted-types/require-trusted-types-for-report-only.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/require-trusted-types-for-report-only.tentative.html rename to tests/wpt/tests/trusted-types/require-trusted-types-for-report-only.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/require-trusted-types-for-report-only.tentative.html.headers b/tests/wpt/tests/trusted-types/require-trusted-types-for-report-only.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/require-trusted-types-for-report-only.tentative.html.headers rename to tests/wpt/tests/trusted-types/require-trusted-types-for-report-only.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/require-trusted-types-for.tentative.html b/tests/wpt/tests/trusted-types/require-trusted-types-for.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/require-trusted-types-for.tentative.html rename to tests/wpt/tests/trusted-types/require-trusted-types-for.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/support/HTMLScriptElement-internal-slot-support.html b/tests/wpt/tests/trusted-types/support/HTMLScriptElement-internal-slot-support.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/support/HTMLScriptElement-internal-slot-support.html rename to tests/wpt/tests/trusted-types/support/HTMLScriptElement-internal-slot-support.html diff --git a/tests/wpt/web-platform-tests/trusted-types/support/HTMLScriptElement-internal-slot-support.js b/tests/wpt/tests/trusted-types/support/HTMLScriptElement-internal-slot-support.js similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/support/HTMLScriptElement-internal-slot-support.js rename to tests/wpt/tests/trusted-types/support/HTMLScriptElement-internal-slot-support.js diff --git a/tests/wpt/web-platform-tests/trusted-types/support/WorkerGlobalScope-eval.https.js b/tests/wpt/tests/trusted-types/support/WorkerGlobalScope-eval.https.js similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/support/WorkerGlobalScope-eval.https.js rename to tests/wpt/tests/trusted-types/support/WorkerGlobalScope-eval.https.js diff --git a/tests/wpt/web-platform-tests/trusted-types/support/WorkerGlobalScope-eval.https.js.headers b/tests/wpt/tests/trusted-types/support/WorkerGlobalScope-eval.https.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/support/WorkerGlobalScope-eval.https.js.headers rename to tests/wpt/tests/trusted-types/support/WorkerGlobalScope-eval.https.js.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/support/WorkerGlobalScope-importScripts.https.js b/tests/wpt/tests/trusted-types/support/WorkerGlobalScope-importScripts.https.js similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/support/WorkerGlobalScope-importScripts.https.js rename to tests/wpt/tests/trusted-types/support/WorkerGlobalScope-importScripts.https.js diff --git a/tests/wpt/web-platform-tests/trusted-types/support/WorkerGlobalScope-importScripts.https.js.headers b/tests/wpt/tests/trusted-types/support/WorkerGlobalScope-importScripts.https.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/support/WorkerGlobalScope-importScripts.https.js.headers rename to tests/wpt/tests/trusted-types/support/WorkerGlobalScope-importScripts.https.js.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/support/frame-without-trusted-types.html b/tests/wpt/tests/trusted-types/support/frame-without-trusted-types.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/support/frame-without-trusted-types.html rename to tests/wpt/tests/trusted-types/support/frame-without-trusted-types.html diff --git a/tests/wpt/web-platform-tests/trusted-types/support/helper.sub.js b/tests/wpt/tests/trusted-types/support/helper.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/support/helper.sub.js rename to tests/wpt/tests/trusted-types/support/helper.sub.js diff --git a/tests/wpt/web-platform-tests/trusted-types/support/navigation-report-only-support.html b/tests/wpt/tests/trusted-types/support/navigation-report-only-support.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/support/navigation-report-only-support.html rename to tests/wpt/tests/trusted-types/support/navigation-report-only-support.html diff --git a/tests/wpt/web-platform-tests/trusted-types/support/navigation-report-only-support.html.headers b/tests/wpt/tests/trusted-types/support/navigation-report-only-support.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/support/navigation-report-only-support.html.headers rename to tests/wpt/tests/trusted-types/support/navigation-report-only-support.html.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/support/navigation-support.html b/tests/wpt/tests/trusted-types/support/navigation-support.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/support/navigation-support.html rename to tests/wpt/tests/trusted-types/support/navigation-support.html diff --git a/tests/wpt/web-platform-tests/trusted-types/support/navigation-support.html.headers b/tests/wpt/tests/trusted-types/support/navigation-support.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/support/navigation-support.html.headers rename to tests/wpt/tests/trusted-types/support/navigation-support.html.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/support/set-inner-html.js b/tests/wpt/tests/trusted-types/support/set-inner-html.js similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/support/set-inner-html.js rename to tests/wpt/tests/trusted-types/support/set-inner-html.js diff --git a/tests/wpt/web-platform-tests/trusted-types/support/worker.js b/tests/wpt/tests/trusted-types/support/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/support/worker.js rename to tests/wpt/tests/trusted-types/support/worker.js diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-createHTMLDocument.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-createHTMLDocument.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-createHTMLDocument.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-createHTMLDocument.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-duplicate-names-list-report-only.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-duplicate-names-list-report-only.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-duplicate-names-list-report-only.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-duplicate-names-list-report-only.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-duplicate-names-list-report-only.tentative.html.headers b/tests/wpt/tests/trusted-types/trusted-types-duplicate-names-list-report-only.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-duplicate-names-list-report-only.tentative.html.headers rename to tests/wpt/tests/trusted-types/trusted-types-duplicate-names-list-report-only.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-duplicate-names-list.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-duplicate-names-list.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-duplicate-names-list.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-duplicate-names-list.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-duplicate-names-without-enforcement.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-duplicate-names-without-enforcement.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-duplicate-names-without-enforcement.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-duplicate-names-without-enforcement.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-duplicate-names.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-duplicate-names.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-duplicate-names.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-duplicate-names.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html.headers b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html.headers rename to tests/wpt/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html.headers b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html.headers rename to tests/wpt/tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-eval-reporting.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.html.headers b/tests/wpt/tests/trusted-types/trusted-types-eval-reporting.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.html.headers rename to tests/wpt/tests/trusted-types/trusted-types-eval-reporting.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-event-handlers.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-event-handlers.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-event-handlers.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-event-handlers.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-from-literal.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-from-literal.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-from-literal.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-from-literal.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-navigation.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-navigation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-navigation.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-navigation.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-report-only.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-report-only.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-report-only.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-report-only.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-report-only.tentative.html.headers b/tests/wpt/tests/trusted-types/trusted-types-report-only.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-report-only.tentative.html.headers rename to tests/wpt/tests/trusted-types/trusted-types-report-only.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting-check-report.html b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting-check-report.html rename to tests/wpt/tests/trusted-types/trusted-types-reporting-check-report.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting-check-report.html.sub.headers b/tests/wpt/tests/trusted-types/trusted-types-reporting-check-report.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting-check-report.html.sub.headers rename to tests/wpt/tests/trusted-types/trusted-types-reporting-check-report.html.sub.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-reporting.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-reporting.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting.tentative.html.headers b/tests/wpt/tests/trusted-types/trusted-types-reporting.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-reporting.tentative.html.headers rename to tests/wpt/tests/trusted-types/trusted-types-reporting.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-source-file-path.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-source-file-path.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-source-file-path.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-source-file-path.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-svg-script.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-svg-script.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-svg-script.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-svg-script.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-tojson.tentative.html b/tests/wpt/tests/trusted-types/trusted-types-tojson.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/trusted-types-tojson.tentative.html rename to tests/wpt/tests/trusted-types/trusted-types-tojson.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/tt-block-eval.tentative.html b/tests/wpt/tests/trusted-types/tt-block-eval.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/tt-block-eval.tentative.html rename to tests/wpt/tests/trusted-types/tt-block-eval.tentative.html diff --git a/tests/wpt/web-platform-tests/trusted-types/worker-constructor.https.html b/tests/wpt/tests/trusted-types/worker-constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/trusted-types/worker-constructor.https.html rename to tests/wpt/tests/trusted-types/worker-constructor.https.html diff --git a/tests/wpt/web-platform-tests/ua-client-hints/META.yml b/tests/wpt/tests/ua-client-hints/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/ua-client-hints/META.yml rename to tests/wpt/tests/ua-client-hints/META.yml diff --git a/tests/wpt/web-platform-tests/ua-client-hints/idlharness.https.any.js b/tests/wpt/tests/ua-client-hints/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/ua-client-hints/idlharness.https.any.js rename to tests/wpt/tests/ua-client-hints/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/ua-client-hints/useragentdata.https.any.js b/tests/wpt/tests/ua-client-hints/useragentdata.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/ua-client-hints/useragentdata.https.any.js rename to tests/wpt/tests/ua-client-hints/useragentdata.https.any.js diff --git a/tests/wpt/web-platform-tests/uievents/META.yml b/tests/wpt/tests/uievents/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/uievents/META.yml rename to tests/wpt/tests/uievents/META.yml diff --git a/tests/wpt/web-platform-tests/uievents/README.md b/tests/wpt/tests/uievents/README.md similarity index 100% rename from tests/wpt/web-platform-tests/uievents/README.md rename to tests/wpt/tests/uievents/README.md diff --git a/tests/wpt/web-platform-tests/uievents/click/auxclick_event.html b/tests/wpt/tests/uievents/click/auxclick_event.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/click/auxclick_event.html rename to tests/wpt/tests/uievents/click/auxclick_event.html diff --git a/tests/wpt/web-platform-tests/uievents/click/click_event_target_child_parent.html b/tests/wpt/tests/uievents/click/click_event_target_child_parent.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/click/click_event_target_child_parent.html rename to tests/wpt/tests/uievents/click/click_event_target_child_parent.html diff --git a/tests/wpt/web-platform-tests/uievents/click/click_event_target_siblings.html b/tests/wpt/tests/uievents/click/click_event_target_siblings.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/click/click_event_target_siblings.html rename to tests/wpt/tests/uievents/click/click_event_target_siblings.html diff --git a/tests/wpt/web-platform-tests/uievents/click/click_events_on_input.html b/tests/wpt/tests/uievents/click/click_events_on_input.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/click/click_events_on_input.html rename to tests/wpt/tests/uievents/click/click_events_on_input.html diff --git a/tests/wpt/web-platform-tests/uievents/click/contextmenu_event.html b/tests/wpt/tests/uievents/click/contextmenu_event.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/click/contextmenu_event.html rename to tests/wpt/tests/uievents/click/contextmenu_event.html diff --git a/tests/wpt/web-platform-tests/uievents/click/dblclick_event_mouse.html b/tests/wpt/tests/uievents/click/dblclick_event_mouse.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/click/dblclick_event_mouse.html rename to tests/wpt/tests/uievents/click/dblclick_event_mouse.html diff --git a/tests/wpt/web-platform-tests/uievents/constructors/README.md b/tests/wpt/tests/uievents/constructors/README.md similarity index 100% rename from tests/wpt/web-platform-tests/uievents/constructors/README.md rename to tests/wpt/tests/uievents/constructors/README.md diff --git a/tests/wpt/web-platform-tests/uievents/constructors/inputevent-constructor.html b/tests/wpt/tests/uievents/constructors/inputevent-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/constructors/inputevent-constructor.html rename to tests/wpt/tests/uievents/constructors/inputevent-constructor.html diff --git a/tests/wpt/web-platform-tests/uievents/hierarchy/README.md b/tests/wpt/tests/uievents/hierarchy/README.md similarity index 100% rename from tests/wpt/web-platform-tests/uievents/hierarchy/README.md rename to tests/wpt/tests/uievents/hierarchy/README.md diff --git a/tests/wpt/web-platform-tests/uievents/historical.html b/tests/wpt/tests/uievents/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/historical.html rename to tests/wpt/tests/uievents/historical.html diff --git a/tests/wpt/web-platform-tests/uievents/idlharness.window.js b/tests/wpt/tests/uievents/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/uievents/idlharness.window.js rename to tests/wpt/tests/uievents/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/uievents/interface/README.md b/tests/wpt/tests/uievents/interface/README.md similarity index 100% rename from tests/wpt/web-platform-tests/uievents/interface/README.md rename to tests/wpt/tests/uievents/interface/README.md diff --git a/tests/wpt/web-platform-tests/uievents/interface/click-event-manual.htm b/tests/wpt/tests/uievents/interface/click-event-manual.htm similarity index 100% rename from tests/wpt/web-platform-tests/uievents/interface/click-event-manual.htm rename to tests/wpt/tests/uievents/interface/click-event-manual.htm diff --git a/tests/wpt/web-platform-tests/uievents/interface/click-event.htm b/tests/wpt/tests/uievents/interface/click-event.htm similarity index 100% rename from tests/wpt/web-platform-tests/uievents/interface/click-event.htm rename to tests/wpt/tests/uievents/interface/click-event.htm diff --git a/tests/wpt/web-platform-tests/uievents/interface/dblclick-event-manual.htm b/tests/wpt/tests/uievents/interface/dblclick-event-manual.htm similarity index 100% rename from tests/wpt/web-platform-tests/uievents/interface/dblclick-event-manual.htm rename to tests/wpt/tests/uievents/interface/dblclick-event-manual.htm diff --git a/tests/wpt/web-platform-tests/uievents/interface/keyboard-accesskey-click-event.html b/tests/wpt/tests/uievents/interface/keyboard-accesskey-click-event.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/interface/keyboard-accesskey-click-event.html rename to tests/wpt/tests/uievents/interface/keyboard-accesskey-click-event.html diff --git a/tests/wpt/web-platform-tests/uievents/interface/keyboard-click-event.html b/tests/wpt/tests/uievents/interface/keyboard-click-event.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/interface/keyboard-click-event.html rename to tests/wpt/tests/uievents/interface/keyboard-click-event.html diff --git a/tests/wpt/web-platform-tests/uievents/keyboard/README.md b/tests/wpt/tests/uievents/keyboard/README.md similarity index 100% rename from tests/wpt/web-platform-tests/uievents/keyboard/README.md rename to tests/wpt/tests/uievents/keyboard/README.md diff --git a/tests/wpt/web-platform-tests/uievents/keyboard/key-101en-us-manual.html b/tests/wpt/tests/uievents/keyboard/key-101en-us-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/keyboard/key-101en-us-manual.html rename to tests/wpt/tests/uievents/keyboard/key-101en-us-manual.html diff --git a/tests/wpt/web-platform-tests/uievents/keyboard/key-102fr-fr-manual.html b/tests/wpt/tests/uievents/keyboard/key-102fr-fr-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/keyboard/key-102fr-fr-manual.html rename to tests/wpt/tests/uievents/keyboard/key-102fr-fr-manual.html diff --git a/tests/wpt/web-platform-tests/uievents/keyboard/key.css b/tests/wpt/tests/uievents/keyboard/key.css similarity index 100% rename from tests/wpt/web-platform-tests/uievents/keyboard/key.css rename to tests/wpt/tests/uievents/keyboard/key.css diff --git a/tests/wpt/web-platform-tests/uievents/keyboard/key.js b/tests/wpt/tests/uievents/keyboard/key.js similarity index 100% rename from tests/wpt/web-platform-tests/uievents/keyboard/key.js rename to tests/wpt/tests/uievents/keyboard/key.js diff --git a/tests/wpt/web-platform-tests/uievents/keyboard/modifier-keys-combinations.html b/tests/wpt/tests/uievents/keyboard/modifier-keys-combinations.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/keyboard/modifier-keys-combinations.html rename to tests/wpt/tests/uievents/keyboard/modifier-keys-combinations.html diff --git a/tests/wpt/web-platform-tests/uievents/keyboard/modifier-keys.html b/tests/wpt/tests/uievents/keyboard/modifier-keys.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/keyboard/modifier-keys.html rename to tests/wpt/tests/uievents/keyboard/modifier-keys.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/Status.html b/tests/wpt/tests/uievents/legacy-domevents-tests/Status.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/Status.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/Status.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/approved/ProcessingInstruction.DOMCharacterDataModified.html b/tests/wpt/tests/uievents/legacy-domevents-tests/approved/ProcessingInstruction.DOMCharacterDataModified.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/approved/ProcessingInstruction.DOMCharacterDataModified.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/approved/ProcessingInstruction.DOMCharacterDataModified.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/approved/dispatchEvent.click.checkbox.html b/tests/wpt/tests/uievents/legacy-domevents-tests/approved/dispatchEvent.click.checkbox.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/approved/dispatchEvent.click.checkbox.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/approved/dispatchEvent.click.checkbox.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/approved/domnodeinserted.html b/tests/wpt/tests/uievents/legacy-domevents-tests/approved/domnodeinserted.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/approved/domnodeinserted.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/approved/domnodeinserted.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/approved/stopImmediatePropagation.effect.html b/tests/wpt/tests/uievents/legacy-domevents-tests/approved/stopImmediatePropagation.effect.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/approved/stopImmediatePropagation.effect.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/approved/stopImmediatePropagation.effect.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/approved/stopPropagation.deferred.effect.html b/tests/wpt/tests/uievents/legacy-domevents-tests/approved/stopPropagation.deferred.effect.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/approved/stopPropagation.deferred.effect.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/approved/stopPropagation.deferred.effect.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/approved/support/ProcessingInstruction.DOMCharacterDataModified.xml b/tests/wpt/tests/uievents/legacy-domevents-tests/approved/support/ProcessingInstruction.DOMCharacterDataModified.xml similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/approved/support/ProcessingInstruction.DOMCharacterDataModified.xml rename to tests/wpt/tests/uievents/legacy-domevents-tests/approved/support/ProcessingInstruction.DOMCharacterDataModified.xml diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/CompositionEvent.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/CompositionEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/CompositionEvent.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/CompositionEvent.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.attrChange.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.attrChange.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.attrChange.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.attrChange.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.attrName.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.attrName.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.attrName.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.attrName.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.newValue.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.newValue.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.newValue.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.newValue.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.prevValue.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.prevValue.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.prevValue.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.prevValue.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.relatedNode.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.relatedNode.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.relatedNode.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMAttrModified.relatedNode.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMCharacterDataModified.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMCharacterDataModified.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMCharacterDataModified.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMCharacterDataModified.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMNodeInserted.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMNodeInserted.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMNodeInserted.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMNodeInserted.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMNodeRemoved.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMNodeRemoved.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMNodeRemoved.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMNodeRemoved.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMSubtreeModified.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMSubtreeModified.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMSubtreeModified.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/DOMSubtreeModified.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.defaultPrevented.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.defaultPrevented.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.defaultPrevented.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.defaultPrevented.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.eventPhase.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.eventPhase.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.eventPhase.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.eventPhase.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.stopPropagation.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.stopPropagation.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.stopPropagation.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/Event.stopPropagation.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.key.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.key.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.key.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.key.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.location.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.location.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.location.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.location.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.modifiers.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.modifiers.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.modifiers.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/KeyboardEvent.modifiers.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.button.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.button.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.button.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.button.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.image.map.area.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.image.map.area.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.image.map.area.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.image.map.area.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.preventDefault.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.preventDefault.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.preventDefault.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MouseEvent.preventDefault.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.hasFeature.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.hasFeature.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.hasFeature.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.hasFeature.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.initMutationEvent.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.initMutationEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.initMutationEvent.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.initMutationEvent.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.relatedNode.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.relatedNode.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.relatedNode.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/MutationEvent.relatedNode.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.fail.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.fail.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.fail.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.fail.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.xml b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.xml similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.xml rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.xml diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.hasFeature.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.hasFeature.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.hasFeature.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.hasFeature.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.initTextEvent.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.initTextEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.initTextEvent.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.initTextEvent.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.IME.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.IME.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.IME.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.IME.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.drop.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.drop.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.drop.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.drop.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.keyboard.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.keyboard.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.keyboard.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.keyboard.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.paste.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.paste.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.paste.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.paste.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.script.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.script.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.script.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/TextEvent.inputMode.script.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/UIEvent.load.stylesheet.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/UIEvent.load.stylesheet.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/UIEvent.load.stylesheet.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/UIEvent.load.stylesheet.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.Capture.Bubble.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.Capture.Bubble.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.Capture.Bubble.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.Capture.Bubble.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.ctrlKey.zoom.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.ctrlKey.zoom.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.ctrlKey.zoom.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.ctrlKey.zoom.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.deltaMode.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.deltaMode.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.deltaMode.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.deltaMode.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.hasFeature.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.hasFeature.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.hasFeature.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.hasFeature.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.initWheelEvent.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.initWheelEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.initWheelEvent.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.initWheelEvent.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.preventDefault.scroll.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.preventDefault.scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.preventDefault.scroll.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/WheelEvent.preventDefault.scroll.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/abort.img.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/abort.img.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/abort.img.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/abort.img.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/abort.testresult.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/abort.testresult.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/abort.testresult.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/abort.testresult.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/blur.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/blur.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/blur.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/blur.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.data.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.data.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.data.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.data.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.keydown.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.keydown.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.keydown.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.keydown.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.preventDefault.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.preventDefault.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.preventDefault.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/compositionstart.preventDefault.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/dispatchEvent.click.checkbox.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/dispatchEvent.click.checkbox.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/dispatchEvent.click.checkbox.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/dispatchEvent.click.checkbox.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/error.image.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/error.image.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/error.image.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/error.image.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusin.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusin.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusin.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusin.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusin.relatedTarget.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusin.relatedTarget.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusin.relatedTarget.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusin.relatedTarget.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusout.relatedTarget.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusout.relatedTarget.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusout.relatedTarget.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/focusout.relatedTarget.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/hasFeature.Events.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/hasFeature.Events.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/hasFeature.Events.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/hasFeature.Events.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/hasFeature.feature.string.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/hasFeature.feature.string.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/hasFeature.feature.string.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/hasFeature.feature.string.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/load.image.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/load.image.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/load.image.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/load.image.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseenter.ctrlKey.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseenter.ctrlKey.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseenter.ctrlKey.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseenter.ctrlKey.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseenter.relatedTarget.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseenter.relatedTarget.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseenter.relatedTarget.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseenter.relatedTarget.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseleave.relatedTarget.html b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseleave.relatedTarget.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseleave.relatedTarget.html rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/mouseleave.relatedTarget.html diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/16kb.js b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/16kb.js similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/16kb.js rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/16kb.js diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/InvalidBitMap.png b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/InvalidBitMap.png similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/InvalidBitMap.png rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/InvalidBitMap.png diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/iepreview.png b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/iepreview.png similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/iepreview.png rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/iepreview.png diff --git a/tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/style01.css b/tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/style01.css similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/style01.css rename to tests/wpt/tests/uievents/legacy-domevents-tests/submissions/Microsoft/support/style01.css diff --git a/tests/wpt/web-platform-tests/uievents/legacy/Event-subclasses-init.html b/tests/wpt/tests/uievents/legacy/Event-subclasses-init.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/legacy/Event-subclasses-init.html rename to tests/wpt/tests/uievents/legacy/Event-subclasses-init.html diff --git a/tests/wpt/web-platform-tests/uievents/mouse/attributes.html b/tests/wpt/tests/uievents/mouse/attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/mouse/attributes.html rename to tests/wpt/tests/uievents/mouse/attributes.html diff --git a/tests/wpt/web-platform-tests/uievents/mouse/cancel-mousedown-in-subframe.html b/tests/wpt/tests/uievents/mouse/cancel-mousedown-in-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/mouse/cancel-mousedown-in-subframe.html rename to tests/wpt/tests/uievents/mouse/cancel-mousedown-in-subframe.html diff --git a/tests/wpt/web-platform-tests/uievents/mouse/layout_change_should_fire_mouseover.html b/tests/wpt/tests/uievents/mouse/layout_change_should_fire_mouseover.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/mouse/layout_change_should_fire_mouseover.html rename to tests/wpt/tests/uievents/mouse/layout_change_should_fire_mouseover.html diff --git a/tests/wpt/web-platform-tests/uievents/mouse/mouse_buttons_back_forward.html b/tests/wpt/tests/uievents/mouse/mouse_buttons_back_forward.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/mouse/mouse_buttons_back_forward.html rename to tests/wpt/tests/uievents/mouse/mouse_buttons_back_forward.html diff --git a/tests/wpt/web-platform-tests/uievents/mouse/mouseenter-mouseleave-on-drag.html b/tests/wpt/tests/uievents/mouse/mouseenter-mouseleave-on-drag.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/mouse/mouseenter-mouseleave-on-drag.html rename to tests/wpt/tests/uievents/mouse/mouseenter-mouseleave-on-drag.html diff --git a/tests/wpt/web-platform-tests/uievents/mouse/mouseevent_move_button.html b/tests/wpt/tests/uievents/mouse/mouseevent_move_button.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/mouse/mouseevent_move_button.html rename to tests/wpt/tests/uievents/mouse/mouseevent_move_button.html diff --git a/tests/wpt/web-platform-tests/uievents/mouse/mousemove_prevent_default_action.tentative.html b/tests/wpt/tests/uievents/mouse/mousemove_prevent_default_action.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/mouse/mousemove_prevent_default_action.tentative.html rename to tests/wpt/tests/uievents/mouse/mousemove_prevent_default_action.tentative.html diff --git a/tests/wpt/web-platform-tests/uievents/mouse/resources/mouse-event-reporter-subframe.html b/tests/wpt/tests/uievents/mouse/resources/mouse-event-reporter-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/mouse/resources/mouse-event-reporter-subframe.html rename to tests/wpt/tests/uievents/mouse/resources/mouse-event-reporter-subframe.html diff --git a/tests/wpt/web-platform-tests/uievents/mouse/resources/utils.js b/tests/wpt/tests/uievents/mouse/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/uievents/mouse/resources/utils.js rename to tests/wpt/tests/uievents/mouse/resources/utils.js diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/README.md b/tests/wpt/tests/uievents/order-of-events/README.md similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/README.md rename to tests/wpt/tests/uievents/order-of-events/README.md diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/focus-events/focus-automated-blink-webkit.html b/tests/wpt/tests/uievents/order-of-events/focus-events/focus-automated-blink-webkit.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/focus-events/focus-automated-blink-webkit.html rename to tests/wpt/tests/uievents/order-of-events/focus-events/focus-automated-blink-webkit.html diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/focus-events/focus-contained.html b/tests/wpt/tests/uievents/order-of-events/focus-events/focus-contained.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/focus-events/focus-contained.html rename to tests/wpt/tests/uievents/order-of-events/focus-events/focus-contained.html diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/focus-events/focus-management-expectations.html b/tests/wpt/tests/uievents/order-of-events/focus-events/focus-management-expectations.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/focus-events/focus-management-expectations.html rename to tests/wpt/tests/uievents/order-of-events/focus-events/focus-management-expectations.html diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/focus-events/focus.html b/tests/wpt/tests/uievents/order-of-events/focus-events/focus.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/focus-events/focus.html rename to tests/wpt/tests/uievents/order-of-events/focus-events/focus.html diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/focus-events/legacy-manual.html b/tests/wpt/tests/uievents/order-of-events/focus-events/legacy-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/focus-events/legacy-manual.html rename to tests/wpt/tests/uievents/order-of-events/focus-events/legacy-manual.html diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-cancel.html b/tests/wpt/tests/uievents/order-of-events/mouse-events/click-cancel.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-cancel.html rename to tests/wpt/tests/uievents/order-of-events/mouse-events/click-cancel.html diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-body.html b/tests/wpt/tests/uievents/order-of-events/mouse-events/click-on-body.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-body.html rename to tests/wpt/tests/uievents/order-of-events/mouse-events/click-on-body.html diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-div.html b/tests/wpt/tests/uievents/order-of-events/mouse-events/click-on-div.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-div.html rename to tests/wpt/tests/uievents/order-of-events/mouse-events/click-on-div.html diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-html.html b/tests/wpt/tests/uievents/order-of-events/mouse-events/click-on-html.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-on-html.html rename to tests/wpt/tests/uievents/order-of-events/mouse-events/click-on-html.html diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-order.html b/tests/wpt/tests/uievents/order-of-events/mouse-events/click-order.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/click-order.html rename to tests/wpt/tests/uievents/order-of-events/mouse-events/click-order.html diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mouseevents-mousemove.htm b/tests/wpt/tests/uievents/order-of-events/mouse-events/mouseevents-mousemove.htm similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mouseevents-mousemove.htm rename to tests/wpt/tests/uievents/order-of-events/mouse-events/mouseevents-mousemove.htm diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-across.html b/tests/wpt/tests/uievents/order-of-events/mouse-events/mousemove-across.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-across.html rename to tests/wpt/tests/uievents/order-of-events/mouse-events/mousemove-across.html diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-between.html b/tests/wpt/tests/uievents/order-of-events/mouse-events/mousemove-between.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mousemove-between.html rename to tests/wpt/tests/uievents/order-of-events/mouse-events/mousemove-between.html diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mouseover-out.html b/tests/wpt/tests/uievents/order-of-events/mouse-events/mouseover-out.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/mouseover-out.html rename to tests/wpt/tests/uievents/order-of-events/mouse-events/mouseover-out.html diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/wheel-basic.html b/tests/wpt/tests/uievents/order-of-events/mouse-events/wheel-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/wheel-basic.html rename to tests/wpt/tests/uievents/order-of-events/mouse-events/wheel-basic.html diff --git a/tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/wheel-scrolling.html b/tests/wpt/tests/uievents/order-of-events/mouse-events/wheel-scrolling.html similarity index 100% rename from tests/wpt/web-platform-tests/uievents/order-of-events/mouse-events/wheel-scrolling.html rename to tests/wpt/tests/uievents/order-of-events/mouse-events/wheel-scrolling.html diff --git a/tests/wpt/web-platform-tests/uievents/resources/eventrecorder.js b/tests/wpt/tests/uievents/resources/eventrecorder.js similarity index 100% rename from tests/wpt/web-platform-tests/uievents/resources/eventrecorder.js rename to tests/wpt/tests/uievents/resources/eventrecorder.js diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/META.yml b/tests/wpt/tests/upgrade-insecure-requests/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/META.yml rename to tests/wpt/tests/upgrade-insecure-requests/META.yml diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/README.md b/tests/wpt/tests/upgrade-insecure-requests/README.md similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/README.md rename to tests/wpt/tests/upgrade-insecure-requests/README.md diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-import.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-import.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-import.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-import.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-import.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-import.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-import.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-import.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-import.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-import.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-import.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-import.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-import.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/worker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/worker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/worker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/worker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-classic.http-rp/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html.headers b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/fetch.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/fetch.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/fetch.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/fetch.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/websocket.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/websocket.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/websocket.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/websocket.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/worker-classic.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/worker-classic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/worker-classic.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/worker-classic.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/worker-module.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/worker-module.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/worker-module.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/worker-module.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/xhr.https.html b/tests/wpt/tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/xhr.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/xhr.https.html rename to tests/wpt/tests/upgrade-insecure-requests/gen/worker-module.http-rp/upgrade/xhr.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/generic/test-case.sub.js b/tests/wpt/tests/upgrade-insecure-requests/generic/test-case.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/generic/test-case.sub.js rename to tests/wpt/tests/upgrade-insecure-requests/generic/test-case.sub.js diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade.sub.https.html b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade.sub.https.html rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade.sub.https.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/basic-link-no-upgrade.sub.html b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/basic-link-no-upgrade.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/basic-link-no-upgrade.sub.html rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/basic-link-no-upgrade.sub.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/basic-link-no-upgrade.sub.html.headers b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/basic-link-no-upgrade.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/basic-link-no-upgrade.sub.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/basic-link-no-upgrade.sub.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/basic-link-upgrade.sub.html b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/basic-link-upgrade.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/basic-link-upgrade.sub.html rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/basic-link-upgrade.sub.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/basic-link-upgrade.sub.html.headers b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/basic-link-upgrade.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/basic-link-upgrade.sub.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/basic-link-upgrade.sub.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-link-upgrade.sub.html b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-link-upgrade.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-link-upgrade.sub.html rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-link-upgrade.sub.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-link-upgrade.sub.html.headers b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-link-upgrade.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-link-upgrade.sub.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-link-upgrade.sub.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-no-upgrade-1.sub.html b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-no-upgrade-1.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-no-upgrade-1.sub.html rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-no-upgrade-1.sub.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-no-upgrade-1.sub.html.headers b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-no-upgrade-1.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-no-upgrade-1.sub.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-no-upgrade-1.sub.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-no-upgrade-2.sub.html b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-no-upgrade-2.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-no-upgrade-2.sub.html rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-no-upgrade-2.sub.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-1.sub.html b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-1.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-1.sub.html rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-1.sub.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-1.sub.html.headers b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-1.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-1.sub.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-1.sub.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-2.sub.html b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-2.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-2.sub.html rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-2.sub.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-2.sub.html.headers b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-2.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-2.sub.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-2.sub.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-meta.sub.html b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-meta.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-meta.sub.html rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/iframe-top-navigation-upgrade-meta.sub.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/resources/click-on-link.sub.html b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/resources/click-on-link.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/resources/click-on-link.sub.html rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/resources/click-on-link.sub.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/resources/dummy.html b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/resources/dummy.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/resources/dummy.html rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/resources/dummy.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/resources/navigate-top-frame-upgrade.sub.html b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/resources/navigate-top-frame-upgrade.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/resources/navigate-top-frame-upgrade.sub.html rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/resources/navigate-top-frame-upgrade.sub.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/resources/navigate-top-frame-upgrade.sub.html.headers b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/resources/navigate-top-frame-upgrade.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/resources/navigate-top-frame-upgrade.sub.html.headers rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/resources/navigate-top-frame-upgrade.sub.html.headers diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/resources/navigate-top-frame.sub.html b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/resources/navigate-top-frame.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/resources/navigate-top-frame.sub.html rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/resources/navigate-top-frame.sub.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/resources/post-message-to-opener.sub.html b/tests/wpt/tests/upgrade-insecure-requests/link-upgrade/resources/post-message-to-opener.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/link-upgrade/resources/post-message-to-opener.sub.html rename to tests/wpt/tests/upgrade-insecure-requests/link-upgrade/resources/post-message-to-opener.sub.html diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/spec.src.json b/tests/wpt/tests/upgrade-insecure-requests/spec.src.json similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/spec.src.json rename to tests/wpt/tests/upgrade-insecure-requests/spec.src.json diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/redirect-cors.py b/tests/wpt/tests/upgrade-insecure-requests/support/redirect-cors.py similarity index 100% rename from tests/wpt/web-platform-tests/upgrade-insecure-requests/support/redirect-cors.py rename to tests/wpt/tests/upgrade-insecure-requests/support/redirect-cors.py diff --git a/tests/wpt/web-platform-tests/url/IdnaTestV2.window.js b/tests/wpt/tests/url/IdnaTestV2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/url/IdnaTestV2.window.js rename to tests/wpt/tests/url/IdnaTestV2.window.js diff --git a/tests/wpt/web-platform-tests/url/META.yml b/tests/wpt/tests/url/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/url/META.yml rename to tests/wpt/tests/url/META.yml diff --git a/tests/wpt/web-platform-tests/url/README.md b/tests/wpt/tests/url/README.md similarity index 100% rename from tests/wpt/web-platform-tests/url/README.md rename to tests/wpt/tests/url/README.md diff --git a/tests/wpt/web-platform-tests/url/a-element-origin-xhtml.xhtml b/tests/wpt/tests/url/a-element-origin-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/url/a-element-origin-xhtml.xhtml rename to tests/wpt/tests/url/a-element-origin-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/url/a-element-origin.html b/tests/wpt/tests/url/a-element-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/url/a-element-origin.html rename to tests/wpt/tests/url/a-element-origin.html diff --git a/tests/wpt/web-platform-tests/url/a-element-xhtml.xhtml b/tests/wpt/tests/url/a-element-xhtml.xhtml similarity index 100% rename from tests/wpt/web-platform-tests/url/a-element-xhtml.xhtml rename to tests/wpt/tests/url/a-element-xhtml.xhtml diff --git a/tests/wpt/web-platform-tests/url/a-element.html b/tests/wpt/tests/url/a-element.html similarity index 100% rename from tests/wpt/web-platform-tests/url/a-element.html rename to tests/wpt/tests/url/a-element.html diff --git a/tests/wpt/web-platform-tests/url/data-uri-fragment.html b/tests/wpt/tests/url/data-uri-fragment.html similarity index 100% rename from tests/wpt/web-platform-tests/url/data-uri-fragment.html rename to tests/wpt/tests/url/data-uri-fragment.html diff --git a/tests/wpt/web-platform-tests/url/failure.html b/tests/wpt/tests/url/failure.html similarity index 100% rename from tests/wpt/web-platform-tests/url/failure.html rename to tests/wpt/tests/url/failure.html diff --git a/tests/wpt/web-platform-tests/url/historical.any.js b/tests/wpt/tests/url/historical.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/historical.any.js rename to tests/wpt/tests/url/historical.any.js diff --git a/tests/wpt/web-platform-tests/url/idlharness-shadowrealm.window.js b/tests/wpt/tests/url/idlharness-shadowrealm.window.js similarity index 100% rename from tests/wpt/web-platform-tests/url/idlharness-shadowrealm.window.js rename to tests/wpt/tests/url/idlharness-shadowrealm.window.js diff --git a/tests/wpt/web-platform-tests/url/idlharness.any.js b/tests/wpt/tests/url/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/idlharness.any.js rename to tests/wpt/tests/url/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/url/javascript-urls.window.js b/tests/wpt/tests/url/javascript-urls.window.js similarity index 100% rename from tests/wpt/web-platform-tests/url/javascript-urls.window.js rename to tests/wpt/tests/url/javascript-urls.window.js diff --git a/tests/wpt/web-platform-tests/url/percent-encoding.window.js b/tests/wpt/tests/url/percent-encoding.window.js similarity index 100% rename from tests/wpt/web-platform-tests/url/percent-encoding.window.js rename to tests/wpt/tests/url/percent-encoding.window.js diff --git a/tests/wpt/web-platform-tests/url/resources/IdnaTestV2.json b/tests/wpt/tests/url/resources/IdnaTestV2.json similarity index 100% rename from tests/wpt/web-platform-tests/url/resources/IdnaTestV2.json rename to tests/wpt/tests/url/resources/IdnaTestV2.json diff --git a/tests/wpt/web-platform-tests/url/resources/a-element-origin.js b/tests/wpt/tests/url/resources/a-element-origin.js similarity index 100% rename from tests/wpt/web-platform-tests/url/resources/a-element-origin.js rename to tests/wpt/tests/url/resources/a-element-origin.js diff --git a/tests/wpt/web-platform-tests/url/resources/a-element.js b/tests/wpt/tests/url/resources/a-element.js similarity index 100% rename from tests/wpt/web-platform-tests/url/resources/a-element.js rename to tests/wpt/tests/url/resources/a-element.js diff --git a/tests/wpt/web-platform-tests/url/resources/percent-encoding.json b/tests/wpt/tests/url/resources/percent-encoding.json similarity index 100% rename from tests/wpt/web-platform-tests/url/resources/percent-encoding.json rename to tests/wpt/tests/url/resources/percent-encoding.json diff --git a/tests/wpt/web-platform-tests/url/resources/percent-encoding.py b/tests/wpt/tests/url/resources/percent-encoding.py similarity index 100% rename from tests/wpt/web-platform-tests/url/resources/percent-encoding.py rename to tests/wpt/tests/url/resources/percent-encoding.py diff --git a/tests/wpt/web-platform-tests/url/resources/setters_tests.json b/tests/wpt/tests/url/resources/setters_tests.json similarity index 100% rename from tests/wpt/web-platform-tests/url/resources/setters_tests.json rename to tests/wpt/tests/url/resources/setters_tests.json diff --git a/tests/wpt/web-platform-tests/url/resources/toascii.json b/tests/wpt/tests/url/resources/toascii.json similarity index 100% rename from tests/wpt/web-platform-tests/url/resources/toascii.json rename to tests/wpt/tests/url/resources/toascii.json diff --git a/tests/wpt/web-platform-tests/url/resources/urltestdata.json b/tests/wpt/tests/url/resources/urltestdata.json similarity index 100% rename from tests/wpt/web-platform-tests/url/resources/urltestdata.json rename to tests/wpt/tests/url/resources/urltestdata.json diff --git a/tests/wpt/web-platform-tests/url/toascii.window.js b/tests/wpt/tests/url/toascii.window.js similarity index 100% rename from tests/wpt/web-platform-tests/url/toascii.window.js rename to tests/wpt/tests/url/toascii.window.js diff --git a/tests/wpt/web-platform-tests/url/tools/IdnaTestV2-parser.py b/tests/wpt/tests/url/tools/IdnaTestV2-parser.py similarity index 100% rename from tests/wpt/web-platform-tests/url/tools/IdnaTestV2-parser.py rename to tests/wpt/tests/url/tools/IdnaTestV2-parser.py diff --git a/tests/wpt/web-platform-tests/url/url-constructor.any.js b/tests/wpt/tests/url/url-constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/url-constructor.any.js rename to tests/wpt/tests/url/url-constructor.any.js diff --git a/tests/wpt/web-platform-tests/url/url-origin.any.js b/tests/wpt/tests/url/url-origin.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/url-origin.any.js rename to tests/wpt/tests/url/url-origin.any.js diff --git a/tests/wpt/web-platform-tests/url/url-searchparams.any.js b/tests/wpt/tests/url/url-searchparams.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/url-searchparams.any.js rename to tests/wpt/tests/url/url-searchparams.any.js diff --git a/tests/wpt/web-platform-tests/url/url-setters-a-area.window.js b/tests/wpt/tests/url/url-setters-a-area.window.js similarity index 100% rename from tests/wpt/web-platform-tests/url/url-setters-a-area.window.js rename to tests/wpt/tests/url/url-setters-a-area.window.js diff --git a/tests/wpt/web-platform-tests/url/url-setters-stripping.any.js b/tests/wpt/tests/url/url-setters-stripping.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/url-setters-stripping.any.js rename to tests/wpt/tests/url/url-setters-stripping.any.js diff --git a/tests/wpt/web-platform-tests/url/url-setters.any.js b/tests/wpt/tests/url/url-setters.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/url-setters.any.js rename to tests/wpt/tests/url/url-setters.any.js diff --git a/tests/wpt/web-platform-tests/url/url-statics-canparse.any.js b/tests/wpt/tests/url/url-statics-canparse.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/url-statics-canparse.any.js rename to tests/wpt/tests/url/url-statics-canparse.any.js diff --git a/tests/wpt/web-platform-tests/url/url-tojson.any.js b/tests/wpt/tests/url/url-tojson.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/url-tojson.any.js rename to tests/wpt/tests/url/url-tojson.any.js diff --git a/tests/wpt/web-platform-tests/url/urlencoded-parser.any.js b/tests/wpt/tests/url/urlencoded-parser.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/urlencoded-parser.any.js rename to tests/wpt/tests/url/urlencoded-parser.any.js diff --git a/tests/wpt/web-platform-tests/url/urlsearchparams-append.any.js b/tests/wpt/tests/url/urlsearchparams-append.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/urlsearchparams-append.any.js rename to tests/wpt/tests/url/urlsearchparams-append.any.js diff --git a/tests/wpt/web-platform-tests/url/urlsearchparams-constructor.any.js b/tests/wpt/tests/url/urlsearchparams-constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/urlsearchparams-constructor.any.js rename to tests/wpt/tests/url/urlsearchparams-constructor.any.js diff --git a/tests/wpt/web-platform-tests/url/urlsearchparams-delete.any.js b/tests/wpt/tests/url/urlsearchparams-delete.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/urlsearchparams-delete.any.js rename to tests/wpt/tests/url/urlsearchparams-delete.any.js diff --git a/tests/wpt/web-platform-tests/url/urlsearchparams-foreach.any.js b/tests/wpt/tests/url/urlsearchparams-foreach.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/urlsearchparams-foreach.any.js rename to tests/wpt/tests/url/urlsearchparams-foreach.any.js diff --git a/tests/wpt/web-platform-tests/url/urlsearchparams-get.any.js b/tests/wpt/tests/url/urlsearchparams-get.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/urlsearchparams-get.any.js rename to tests/wpt/tests/url/urlsearchparams-get.any.js diff --git a/tests/wpt/web-platform-tests/url/urlsearchparams-getall.any.js b/tests/wpt/tests/url/urlsearchparams-getall.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/urlsearchparams-getall.any.js rename to tests/wpt/tests/url/urlsearchparams-getall.any.js diff --git a/tests/wpt/web-platform-tests/url/urlsearchparams-has.any.js b/tests/wpt/tests/url/urlsearchparams-has.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/urlsearchparams-has.any.js rename to tests/wpt/tests/url/urlsearchparams-has.any.js diff --git a/tests/wpt/web-platform-tests/url/urlsearchparams-set.any.js b/tests/wpt/tests/url/urlsearchparams-set.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/urlsearchparams-set.any.js rename to tests/wpt/tests/url/urlsearchparams-set.any.js diff --git a/tests/wpt/web-platform-tests/url/urlsearchparams-size.any.js b/tests/wpt/tests/url/urlsearchparams-size.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/urlsearchparams-size.any.js rename to tests/wpt/tests/url/urlsearchparams-size.any.js diff --git a/tests/wpt/web-platform-tests/url/urlsearchparams-sort.any.js b/tests/wpt/tests/url/urlsearchparams-sort.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/urlsearchparams-sort.any.js rename to tests/wpt/tests/url/urlsearchparams-sort.any.js diff --git a/tests/wpt/web-platform-tests/url/urlsearchparams-stringifier.any.js b/tests/wpt/tests/url/urlsearchparams-stringifier.any.js similarity index 100% rename from tests/wpt/web-platform-tests/url/urlsearchparams-stringifier.any.js rename to tests/wpt/tests/url/urlsearchparams-stringifier.any.js diff --git a/tests/wpt/web-platform-tests/urlpattern/resources/urlpattern-compare-test-data.json b/tests/wpt/tests/urlpattern/resources/urlpattern-compare-test-data.json similarity index 100% rename from tests/wpt/web-platform-tests/urlpattern/resources/urlpattern-compare-test-data.json rename to tests/wpt/tests/urlpattern/resources/urlpattern-compare-test-data.json diff --git a/tests/wpt/web-platform-tests/urlpattern/resources/urlpattern-compare-tests.js b/tests/wpt/tests/urlpattern/resources/urlpattern-compare-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/urlpattern/resources/urlpattern-compare-tests.js rename to tests/wpt/tests/urlpattern/resources/urlpattern-compare-tests.js diff --git a/tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntestdata.json b/tests/wpt/tests/urlpattern/resources/urlpatterntestdata.json similarity index 100% rename from tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntestdata.json rename to tests/wpt/tests/urlpattern/resources/urlpatterntestdata.json diff --git a/tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntests.js b/tests/wpt/tests/urlpattern/resources/urlpatterntests.js similarity index 100% rename from tests/wpt/web-platform-tests/urlpattern/resources/urlpatterntests.js rename to tests/wpt/tests/urlpattern/resources/urlpatterntests.js diff --git a/tests/wpt/web-platform-tests/urlpattern/urlpattern-compare.any.js b/tests/wpt/tests/urlpattern/urlpattern-compare.any.js similarity index 100% rename from tests/wpt/web-platform-tests/urlpattern/urlpattern-compare.any.js rename to tests/wpt/tests/urlpattern/urlpattern-compare.any.js diff --git a/tests/wpt/web-platform-tests/urlpattern/urlpattern-compare.https.any.js b/tests/wpt/tests/urlpattern/urlpattern-compare.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/urlpattern/urlpattern-compare.https.any.js rename to tests/wpt/tests/urlpattern/urlpattern-compare.https.any.js diff --git a/tests/wpt/web-platform-tests/urlpattern/urlpattern.any.js b/tests/wpt/tests/urlpattern/urlpattern.any.js similarity index 100% rename from tests/wpt/web-platform-tests/urlpattern/urlpattern.any.js rename to tests/wpt/tests/urlpattern/urlpattern.any.js diff --git a/tests/wpt/web-platform-tests/urlpattern/urlpattern.https.any.js b/tests/wpt/tests/urlpattern/urlpattern.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/urlpattern/urlpattern.https.any.js rename to tests/wpt/tests/urlpattern/urlpattern.https.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/META.yml b/tests/wpt/tests/user-timing/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/META.yml rename to tests/wpt/tests/user-timing/META.yml diff --git a/tests/wpt/web-platform-tests/user-timing/buffered-flag.any.js b/tests/wpt/tests/user-timing/buffered-flag.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/buffered-flag.any.js rename to tests/wpt/tests/user-timing/buffered-flag.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/case-sensitivity.any.js b/tests/wpt/tests/user-timing/case-sensitivity.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/case-sensitivity.any.js rename to tests/wpt/tests/user-timing/case-sensitivity.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/clearMarks.html b/tests/wpt/tests/user-timing/clearMarks.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/clearMarks.html rename to tests/wpt/tests/user-timing/clearMarks.html diff --git a/tests/wpt/web-platform-tests/user-timing/clearMeasures.html b/tests/wpt/tests/user-timing/clearMeasures.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/clearMeasures.html rename to tests/wpt/tests/user-timing/clearMeasures.html diff --git a/tests/wpt/web-platform-tests/user-timing/clear_all_marks.any.js b/tests/wpt/tests/user-timing/clear_all_marks.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/clear_all_marks.any.js rename to tests/wpt/tests/user-timing/clear_all_marks.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/clear_all_measures.any.js b/tests/wpt/tests/user-timing/clear_all_measures.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/clear_all_measures.any.js rename to tests/wpt/tests/user-timing/clear_all_measures.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/clear_non_existent_mark.any.js b/tests/wpt/tests/user-timing/clear_non_existent_mark.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/clear_non_existent_mark.any.js rename to tests/wpt/tests/user-timing/clear_non_existent_mark.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/clear_non_existent_measure.any.js b/tests/wpt/tests/user-timing/clear_non_existent_measure.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/clear_non_existent_measure.any.js rename to tests/wpt/tests/user-timing/clear_non_existent_measure.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/clear_one_mark.any.js b/tests/wpt/tests/user-timing/clear_one_mark.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/clear_one_mark.any.js rename to tests/wpt/tests/user-timing/clear_one_mark.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/clear_one_measure.any.js b/tests/wpt/tests/user-timing/clear_one_measure.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/clear_one_measure.any.js rename to tests/wpt/tests/user-timing/clear_one_measure.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/entry_type.any.js b/tests/wpt/tests/user-timing/entry_type.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/entry_type.any.js rename to tests/wpt/tests/user-timing/entry_type.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/idlharness-shadowrealm.window.js b/tests/wpt/tests/user-timing/idlharness-shadowrealm.window.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/idlharness-shadowrealm.window.js rename to tests/wpt/tests/user-timing/idlharness-shadowrealm.window.js diff --git a/tests/wpt/web-platform-tests/user-timing/idlharness.any.js b/tests/wpt/tests/user-timing/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/idlharness.any.js rename to tests/wpt/tests/user-timing/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/invoke_with_timing_attributes.html b/tests/wpt/tests/user-timing/invoke_with_timing_attributes.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/invoke_with_timing_attributes.html rename to tests/wpt/tests/user-timing/invoke_with_timing_attributes.html diff --git a/tests/wpt/web-platform-tests/user-timing/invoke_with_timing_attributes.worker.js b/tests/wpt/tests/user-timing/invoke_with_timing_attributes.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/invoke_with_timing_attributes.worker.js rename to tests/wpt/tests/user-timing/invoke_with_timing_attributes.worker.js diff --git a/tests/wpt/web-platform-tests/user-timing/invoke_without_parameter.html b/tests/wpt/tests/user-timing/invoke_without_parameter.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/invoke_without_parameter.html rename to tests/wpt/tests/user-timing/invoke_without_parameter.html diff --git a/tests/wpt/web-platform-tests/user-timing/mark-entry-constructor.any.js b/tests/wpt/tests/user-timing/mark-entry-constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/mark-entry-constructor.any.js rename to tests/wpt/tests/user-timing/mark-entry-constructor.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/mark-errors.any.js b/tests/wpt/tests/user-timing/mark-errors.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/mark-errors.any.js rename to tests/wpt/tests/user-timing/mark-errors.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/mark-l3.any.js b/tests/wpt/tests/user-timing/mark-l3.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/mark-l3.any.js rename to tests/wpt/tests/user-timing/mark-l3.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/mark-measure-feature-detection.html b/tests/wpt/tests/user-timing/mark-measure-feature-detection.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/mark-measure-feature-detection.html rename to tests/wpt/tests/user-timing/mark-measure-feature-detection.html diff --git a/tests/wpt/web-platform-tests/user-timing/mark-measure-return-objects.any.js b/tests/wpt/tests/user-timing/mark-measure-return-objects.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/mark-measure-return-objects.any.js rename to tests/wpt/tests/user-timing/mark-measure-return-objects.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/mark.any.js b/tests/wpt/tests/user-timing/mark.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/mark.any.js rename to tests/wpt/tests/user-timing/mark.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/mark.html b/tests/wpt/tests/user-timing/mark.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/mark.html rename to tests/wpt/tests/user-timing/mark.html diff --git a/tests/wpt/web-platform-tests/user-timing/mark_exceptions.html b/tests/wpt/tests/user-timing/mark_exceptions.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/mark_exceptions.html rename to tests/wpt/tests/user-timing/mark_exceptions.html diff --git a/tests/wpt/web-platform-tests/user-timing/measure-exceptions.html b/tests/wpt/tests/user-timing/measure-exceptions.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/measure-exceptions.html rename to tests/wpt/tests/user-timing/measure-exceptions.html diff --git a/tests/wpt/web-platform-tests/user-timing/measure-l3.any.js b/tests/wpt/tests/user-timing/measure-l3.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/measure-l3.any.js rename to tests/wpt/tests/user-timing/measure-l3.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/measure-with-dict.any.js b/tests/wpt/tests/user-timing/measure-with-dict.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/measure-with-dict.any.js rename to tests/wpt/tests/user-timing/measure-with-dict.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/measure.html b/tests/wpt/tests/user-timing/measure.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/measure.html rename to tests/wpt/tests/user-timing/measure.html diff --git a/tests/wpt/web-platform-tests/user-timing/measure_associated_with_navigation_timing.html b/tests/wpt/tests/user-timing/measure_associated_with_navigation_timing.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/measure_associated_with_navigation_timing.html rename to tests/wpt/tests/user-timing/measure_associated_with_navigation_timing.html diff --git a/tests/wpt/web-platform-tests/user-timing/measure_exception.html b/tests/wpt/tests/user-timing/measure_exception.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/measure_exception.html rename to tests/wpt/tests/user-timing/measure_exception.html diff --git a/tests/wpt/web-platform-tests/user-timing/measure_exceptions_navigation_timing.html b/tests/wpt/tests/user-timing/measure_exceptions_navigation_timing.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/measure_exceptions_navigation_timing.html rename to tests/wpt/tests/user-timing/measure_exceptions_navigation_timing.html diff --git a/tests/wpt/web-platform-tests/user-timing/measure_navigation_timing.html b/tests/wpt/tests/user-timing/measure_navigation_timing.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/measure_navigation_timing.html rename to tests/wpt/tests/user-timing/measure_navigation_timing.html diff --git a/tests/wpt/web-platform-tests/user-timing/measure_syntax_err.any.js b/tests/wpt/tests/user-timing/measure_syntax_err.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/measure_syntax_err.any.js rename to tests/wpt/tests/user-timing/measure_syntax_err.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/measures.html b/tests/wpt/tests/user-timing/measures.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/measures.html rename to tests/wpt/tests/user-timing/measures.html diff --git a/tests/wpt/web-platform-tests/user-timing/performance-measure-invalid.worker.js b/tests/wpt/tests/user-timing/performance-measure-invalid.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/performance-measure-invalid.worker.js rename to tests/wpt/tests/user-timing/performance-measure-invalid.worker.js diff --git a/tests/wpt/web-platform-tests/user-timing/resources/user-timing-helper.js b/tests/wpt/tests/user-timing/resources/user-timing-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/resources/user-timing-helper.js rename to tests/wpt/tests/user-timing/resources/user-timing-helper.js diff --git a/tests/wpt/web-platform-tests/user-timing/resources/webperftestharness.js b/tests/wpt/tests/user-timing/resources/webperftestharness.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/resources/webperftestharness.js rename to tests/wpt/tests/user-timing/resources/webperftestharness.js diff --git a/tests/wpt/web-platform-tests/user-timing/resources/webperftestharnessextension.js b/tests/wpt/tests/user-timing/resources/webperftestharnessextension.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/resources/webperftestharnessextension.js rename to tests/wpt/tests/user-timing/resources/webperftestharnessextension.js diff --git a/tests/wpt/web-platform-tests/user-timing/structured-serialize-detail.any.js b/tests/wpt/tests/user-timing/structured-serialize-detail.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/structured-serialize-detail.any.js rename to tests/wpt/tests/user-timing/structured-serialize-detail.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/supported-usertiming-types.any.js b/tests/wpt/tests/user-timing/supported-usertiming-types.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/supported-usertiming-types.any.js rename to tests/wpt/tests/user-timing/supported-usertiming-types.any.js diff --git a/tests/wpt/web-platform-tests/user-timing/user-timing-tojson.html b/tests/wpt/tests/user-timing/user-timing-tojson.html similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/user-timing-tojson.html rename to tests/wpt/tests/user-timing/user-timing-tojson.html diff --git a/tests/wpt/web-platform-tests/user-timing/user_timing_exists.any.js b/tests/wpt/tests/user-timing/user_timing_exists.any.js similarity index 100% rename from tests/wpt/web-platform-tests/user-timing/user_timing_exists.any.js rename to tests/wpt/tests/user-timing/user_timing_exists.any.js diff --git a/tests/wpt/web-platform-tests/vibration/META.yml b/tests/wpt/tests/vibration/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/vibration/META.yml rename to tests/wpt/tests/vibration/META.yml diff --git a/tests/wpt/web-platform-tests/vibration/api-is-present.html b/tests/wpt/tests/vibration/api-is-present.html similarity index 100% rename from tests/wpt/web-platform-tests/vibration/api-is-present.html rename to tests/wpt/tests/vibration/api-is-present.html diff --git a/tests/wpt/web-platform-tests/vibration/cancel-when-hidden-manual.html b/tests/wpt/tests/vibration/cancel-when-hidden-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/vibration/cancel-when-hidden-manual.html rename to tests/wpt/tests/vibration/cancel-when-hidden-manual.html diff --git a/tests/wpt/web-platform-tests/vibration/cancel-with-0-manual.html b/tests/wpt/tests/vibration/cancel-with-0-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/vibration/cancel-with-0-manual.html rename to tests/wpt/tests/vibration/cancel-with-0-manual.html diff --git a/tests/wpt/web-platform-tests/vibration/cancel-with-array-0-manual.html b/tests/wpt/tests/vibration/cancel-with-array-0-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/vibration/cancel-with-array-0-manual.html rename to tests/wpt/tests/vibration/cancel-with-array-0-manual.html diff --git a/tests/wpt/web-platform-tests/vibration/cancel-with-empty-array-manual.html b/tests/wpt/tests/vibration/cancel-with-empty-array-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/vibration/cancel-with-empty-array-manual.html rename to tests/wpt/tests/vibration/cancel-with-empty-array-manual.html diff --git a/tests/wpt/web-platform-tests/vibration/cancel-with-new-manual.html b/tests/wpt/tests/vibration/cancel-with-new-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/vibration/cancel-with-new-manual.html rename to tests/wpt/tests/vibration/cancel-with-new-manual.html diff --git a/tests/wpt/web-platform-tests/vibration/idlharness.window.js b/tests/wpt/tests/vibration/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/vibration/idlharness.window.js rename to tests/wpt/tests/vibration/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/vibration/invalid-values.html b/tests/wpt/tests/vibration/invalid-values.html similarity index 100% rename from tests/wpt/web-platform-tests/vibration/invalid-values.html rename to tests/wpt/tests/vibration/invalid-values.html diff --git a/tests/wpt/web-platform-tests/vibration/pattern-array-extra-manual.html b/tests/wpt/tests/vibration/pattern-array-extra-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/vibration/pattern-array-extra-manual.html rename to tests/wpt/tests/vibration/pattern-array-extra-manual.html diff --git a/tests/wpt/web-platform-tests/vibration/pattern-array-manual.html b/tests/wpt/tests/vibration/pattern-array-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/vibration/pattern-array-manual.html rename to tests/wpt/tests/vibration/pattern-array-manual.html diff --git a/tests/wpt/web-platform-tests/vibration/pattern-array-with-0-manual.html b/tests/wpt/tests/vibration/pattern-array-with-0-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/vibration/pattern-array-with-0-manual.html rename to tests/wpt/tests/vibration/pattern-array-with-0-manual.html diff --git a/tests/wpt/web-platform-tests/vibration/silent-ignore.html b/tests/wpt/tests/vibration/silent-ignore.html similarity index 100% rename from tests/wpt/web-platform-tests/vibration/silent-ignore.html rename to tests/wpt/tests/vibration/silent-ignore.html diff --git a/tests/wpt/web-platform-tests/vibration/simple-array-manual.html b/tests/wpt/tests/vibration/simple-array-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/vibration/simple-array-manual.html rename to tests/wpt/tests/vibration/simple-array-manual.html diff --git a/tests/wpt/web-platform-tests/vibration/simple-scalar-manual.html b/tests/wpt/tests/vibration/simple-scalar-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/vibration/simple-scalar-manual.html rename to tests/wpt/tests/vibration/simple-scalar-manual.html diff --git a/tests/wpt/web-platform-tests/video-rvfc/META.yml b/tests/wpt/tests/video-rvfc/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/video-rvfc/META.yml rename to tests/wpt/tests/video-rvfc/META.yml diff --git a/tests/wpt/web-platform-tests/video-rvfc/README.md b/tests/wpt/tests/video-rvfc/README.md similarity index 100% rename from tests/wpt/web-platform-tests/video-rvfc/README.md rename to tests/wpt/tests/video-rvfc/README.md diff --git a/tests/wpt/web-platform-tests/video-rvfc/idlharness.window.js b/tests/wpt/tests/video-rvfc/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/video-rvfc/idlharness.window.js rename to tests/wpt/tests/video-rvfc/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-before-xr-session.https.html b/tests/wpt/tests/video-rvfc/request-video-frame-callback-before-xr-session.https.html similarity index 100% rename from tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-before-xr-session.https.html rename to tests/wpt/tests/video-rvfc/request-video-frame-callback-before-xr-session.https.html diff --git a/tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-dom.html b/tests/wpt/tests/video-rvfc/request-video-frame-callback-dom.html similarity index 100% rename from tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-dom.html rename to tests/wpt/tests/video-rvfc/request-video-frame-callback-dom.html diff --git a/tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-during-xr-session.https.html b/tests/wpt/tests/video-rvfc/request-video-frame-callback-during-xr-session.https.html similarity index 100% rename from tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-during-xr-session.https.html rename to tests/wpt/tests/video-rvfc/request-video-frame-callback-during-xr-session.https.html diff --git a/tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-parallel.html b/tests/wpt/tests/video-rvfc/request-video-frame-callback-parallel.html similarity index 100% rename from tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-parallel.html rename to tests/wpt/tests/video-rvfc/request-video-frame-callback-parallel.html diff --git a/tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-repeating.html b/tests/wpt/tests/video-rvfc/request-video-frame-callback-repeating.html similarity index 100% rename from tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-repeating.html rename to tests/wpt/tests/video-rvfc/request-video-frame-callback-repeating.html diff --git a/tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-webrtc.https.html b/tests/wpt/tests/video-rvfc/request-video-frame-callback-webrtc.https.html similarity index 100% rename from tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback-webrtc.https.html rename to tests/wpt/tests/video-rvfc/request-video-frame-callback-webrtc.https.html diff --git a/tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback.html b/tests/wpt/tests/video-rvfc/request-video-frame-callback.html similarity index 100% rename from tests/wpt/web-platform-tests/video-rvfc/request-video-frame-callback.html rename to tests/wpt/tests/video-rvfc/request-video-frame-callback.html diff --git a/tests/wpt/web-platform-tests/virtual-keyboard/META.yml b/tests/wpt/tests/virtual-keyboard/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/virtual-keyboard/META.yml rename to tests/wpt/tests/virtual-keyboard/META.yml diff --git a/tests/wpt/web-platform-tests/virtual-keyboard/README.md b/tests/wpt/tests/virtual-keyboard/README.md similarity index 100% rename from tests/wpt/web-platform-tests/virtual-keyboard/README.md rename to tests/wpt/tests/virtual-keyboard/README.md diff --git a/tests/wpt/web-platform-tests/virtual-keyboard/idlharness.https.window.js b/tests/wpt/tests/virtual-keyboard/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/virtual-keyboard/idlharness.https.window.js rename to tests/wpt/tests/virtual-keyboard/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/virtual-keyboard/virtual-keyboard-css-env-manual.html b/tests/wpt/tests/virtual-keyboard/virtual-keyboard-css-env-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/virtual-keyboard/virtual-keyboard-css-env-manual.html rename to tests/wpt/tests/virtual-keyboard/virtual-keyboard-css-env-manual.html diff --git a/tests/wpt/web-platform-tests/virtual-keyboard/virtual-keyboard-policy.html b/tests/wpt/tests/virtual-keyboard/virtual-keyboard-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/virtual-keyboard/virtual-keyboard-policy.html rename to tests/wpt/tests/virtual-keyboard/virtual-keyboard-policy.html diff --git a/tests/wpt/web-platform-tests/virtual-keyboard/virtual-keyboard-show-hide-manual.html b/tests/wpt/tests/virtual-keyboard/virtual-keyboard-show-hide-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/virtual-keyboard/virtual-keyboard-show-hide-manual.html rename to tests/wpt/tests/virtual-keyboard/virtual-keyboard-show-hide-manual.html diff --git a/tests/wpt/web-platform-tests/virtual-keyboard/virtual-keyboard-type.https.html b/tests/wpt/tests/virtual-keyboard/virtual-keyboard-type.https.html similarity index 100% rename from tests/wpt/web-platform-tests/virtual-keyboard/virtual-keyboard-type.https.html rename to tests/wpt/tests/virtual-keyboard/virtual-keyboard-type.https.html diff --git a/tests/wpt/web-platform-tests/virtual-keyboard/vk_support.js b/tests/wpt/tests/virtual-keyboard/vk_support.js similarity index 100% rename from tests/wpt/web-platform-tests/virtual-keyboard/vk_support.js rename to tests/wpt/tests/virtual-keyboard/vk_support.js diff --git a/tests/wpt/web-platform-tests/visual-viewport/META.yml b/tests/wpt/tests/visual-viewport/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/META.yml rename to tests/wpt/tests/visual-viewport/META.yml diff --git a/tests/wpt/web-platform-tests/visual-viewport/helper-resize-event-on-load-overflowing-page.html b/tests/wpt/tests/visual-viewport/helper-resize-event-on-load-overflowing-page.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/helper-resize-event-on-load-overflowing-page.html rename to tests/wpt/tests/visual-viewport/helper-resize-event-on-load-overflowing-page.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/page-and-offset-in-iframe.html b/tests/wpt/tests/visual-viewport/page-and-offset-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/page-and-offset-in-iframe.html rename to tests/wpt/tests/visual-viewport/page-and-offset-in-iframe.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/resize-event-order.html b/tests/wpt/tests/visual-viewport/resize-event-order.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/resize-event-order.html rename to tests/wpt/tests/visual-viewport/resize-event-order.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/scroll-event-order.html b/tests/wpt/tests/visual-viewport/scroll-event-order.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/scroll-event-order.html rename to tests/wpt/tests/visual-viewport/scroll-event-order.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-attribute-event-handlers-manual.html b/tests/wpt/tests/visual-viewport/viewport-attribute-event-handlers-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-attribute-event-handlers-manual.html rename to tests/wpt/tests/visual-viewport/viewport-attribute-event-handlers-manual.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-dimensions-custom-scrollbars-manual.html b/tests/wpt/tests/visual-viewport/viewport-dimensions-custom-scrollbars-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-dimensions-custom-scrollbars-manual.html rename to tests/wpt/tests/visual-viewport/viewport-dimensions-custom-scrollbars-manual.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-dimensions-scrollbars-manual.html b/tests/wpt/tests/visual-viewport/viewport-dimensions-scrollbars-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-dimensions-scrollbars-manual.html rename to tests/wpt/tests/visual-viewport/viewport-dimensions-scrollbars-manual.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-no-resize-event-on-overflow-recalc.html b/tests/wpt/tests/visual-viewport/viewport-no-resize-event-on-overflow-recalc.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-no-resize-event-on-overflow-recalc.html rename to tests/wpt/tests/visual-viewport/viewport-no-resize-event-on-overflow-recalc.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-offset-manual.html b/tests/wpt/tests/visual-viewport/viewport-offset-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-offset-manual.html rename to tests/wpt/tests/visual-viewport/viewport-offset-manual.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-page-manual.html b/tests/wpt/tests/visual-viewport/viewport-page-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-page-manual.html rename to tests/wpt/tests/visual-viewport/viewport-page-manual.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-read-size-causes-layout.html b/tests/wpt/tests/visual-viewport/viewport-read-size-causes-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-read-size-causes-layout.html rename to tests/wpt/tests/visual-viewport/viewport-read-size-causes-layout.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-read-size-in-iframe-causes-layout.html b/tests/wpt/tests/visual-viewport/viewport-read-size-in-iframe-causes-layout.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-read-size-in-iframe-causes-layout.html rename to tests/wpt/tests/visual-viewport/viewport-read-size-in-iframe-causes-layout.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-manual.html b/tests/wpt/tests/visual-viewport/viewport-resize-event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-manual.html rename to tests/wpt/tests/visual-viewport/viewport-resize-event-manual.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-on-iframe-show.html b/tests/wpt/tests/visual-viewport/viewport-resize-event-on-iframe-show.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-on-iframe-show.html rename to tests/wpt/tests/visual-viewport/viewport-resize-event-on-iframe-show.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-on-iframe-size-change.html b/tests/wpt/tests/visual-viewport/viewport-resize-event-on-iframe-size-change.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-on-iframe-size-change.html rename to tests/wpt/tests/visual-viewport/viewport-resize-event-on-iframe-size-change.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-on-load-overflowing-page.html b/tests/wpt/tests/visual-viewport/viewport-resize-event-on-load-overflowing-page.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-on-load-overflowing-page.html rename to tests/wpt/tests/visual-viewport/viewport-resize-event-on-load-overflowing-page.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-scale-iframe-manual.html b/tests/wpt/tests/visual-viewport/viewport-scale-iframe-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-scale-iframe-manual.html rename to tests/wpt/tests/visual-viewport/viewport-scale-iframe-manual.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-scale-manual.html b/tests/wpt/tests/visual-viewport/viewport-scale-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-scale-manual.html rename to tests/wpt/tests/visual-viewport/viewport-scale-manual.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-scroll-event-manual.html b/tests/wpt/tests/visual-viewport/viewport-scroll-event-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-scroll-event-manual.html rename to tests/wpt/tests/visual-viewport/viewport-scroll-event-manual.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-scrollbars-cause-resize.html b/tests/wpt/tests/visual-viewport/viewport-scrollbars-cause-resize.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-scrollbars-cause-resize.html rename to tests/wpt/tests/visual-viewport/viewport-scrollbars-cause-resize.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-segments.tentative.html b/tests/wpt/tests/visual-viewport/viewport-segments.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-segments.tentative.html rename to tests/wpt/tests/visual-viewport/viewport-segments.tentative.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-type.html b/tests/wpt/tests/visual-viewport/viewport-type.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-type.html rename to tests/wpt/tests/visual-viewport/viewport-type.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scale-iframe.html b/tests/wpt/tests/visual-viewport/viewport-unscaled-scale-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scale-iframe.html rename to tests/wpt/tests/visual-viewport/viewport-unscaled-scale-iframe.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scale.html b/tests/wpt/tests/visual-viewport/viewport-unscaled-scale.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scale.html rename to tests/wpt/tests/visual-viewport/viewport-unscaled-scale.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scroll-iframe.html b/tests/wpt/tests/visual-viewport/viewport-unscaled-scroll-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scroll-iframe.html rename to tests/wpt/tests/visual-viewport/viewport-unscaled-scroll-iframe.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scroll.html b/tests/wpt/tests/visual-viewport/viewport-unscaled-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-scroll.html rename to tests/wpt/tests/visual-viewport/viewport-unscaled-scroll.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-size-iframe.html b/tests/wpt/tests/visual-viewport/viewport-unscaled-size-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-size-iframe.html rename to tests/wpt/tests/visual-viewport/viewport-unscaled-size-iframe.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-size.html b/tests/wpt/tests/visual-viewport/viewport-unscaled-size.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-unscaled-size.html rename to tests/wpt/tests/visual-viewport/viewport-unscaled-size.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-url-bar-changes-height-manual.html b/tests/wpt/tests/visual-viewport/viewport-url-bar-changes-height-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport-url-bar-changes-height-manual.html rename to tests/wpt/tests/visual-viewport/viewport-url-bar-changes-height-manual.html diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport_support.js b/tests/wpt/tests/visual-viewport/viewport_support.js similarity index 100% rename from tests/wpt/web-platform-tests/visual-viewport/viewport_support.js rename to tests/wpt/tests/visual-viewport/viewport_support.js diff --git a/tests/wpt/web-platform-tests/wai-aria/META.yml b/tests/wpt/tests/wai-aria/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/META.yml rename to tests/wpt/tests/wai-aria/META.yml diff --git a/tests/wpt/web-platform-tests/wai-aria/idlharness.window.js b/tests/wpt/tests/wai-aria/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/idlharness.window.js rename to tests/wpt/tests/wai-aria/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/README.md b/tests/wpt/tests/wai-aria/manual/README.md similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/README.md rename to tests/wpt/tests/wai-aria/manual/README.md diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/alertdialog_modal_false-manual.html b/tests/wpt/tests/wai-aria/manual/alertdialog_modal_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/alertdialog_modal_false-manual.html rename to tests/wpt/tests/wai-aria/manual/alertdialog_modal_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/alertdialog_modal_true-manual.html b/tests/wpt/tests/wai-aria/manual/alertdialog_modal_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/alertdialog_modal_true-manual.html rename to tests/wpt/tests/wai-aria/manual/alertdialog_modal_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/application_activedescendant-manual.html b/tests/wpt/tests/wai-aria/manual/application_activedescendant-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/application_activedescendant-manual.html rename to tests/wpt/tests/wai-aria/manual/application_activedescendant-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/application_activedescendant_value_changes-manual.html b/tests/wpt/tests/wai-aria/manual/application_activedescendant_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/application_activedescendant_value_changes-manual.html rename to tests/wpt/tests/wai-aria/manual/application_activedescendant_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_not_declared-manual.html b/tests/wpt/tests/wai-aria/manual/aria-current_not_declared-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/aria-current_not_declared-manual.html rename to tests/wpt/tests/wai-aria/manual/aria-current_not_declared-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_changes-manual.html b/tests/wpt/tests/wai-aria/manual/aria-current_with_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_changes-manual.html rename to tests/wpt/tests/wai-aria/manual/aria-current_with_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_date-manual.html b/tests/wpt/tests/wai-aria/manual/aria-current_with_value_date-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_date-manual.html rename to tests/wpt/tests/wai-aria/manual/aria-current_with_value_date-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_location-manual.html b/tests/wpt/tests/wai-aria/manual/aria-current_with_value_location-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_location-manual.html rename to tests/wpt/tests/wai-aria/manual/aria-current_with_value_location-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_page-manual.html b/tests/wpt/tests/wai-aria/manual/aria-current_with_value_page-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_page-manual.html rename to tests/wpt/tests/wai-aria/manual/aria-current_with_value_page-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_step-manual.html b/tests/wpt/tests/wai-aria/manual/aria-current_with_value_step-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_step-manual.html rename to tests/wpt/tests/wai-aria/manual/aria-current_with_value_step-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_time-manual.html b/tests/wpt/tests/wai-aria/manual/aria-current_with_value_time-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_time-manual.html rename to tests/wpt/tests/wai-aria/manual/aria-current_with_value_time-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_true-manual.html b/tests/wpt/tests/wai-aria/manual/aria-current_with_value_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_true-manual.html rename to tests/wpt/tests/wai-aria/manual/aria-current_with_value_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/aria-current_with_value_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/aria-current_with_value_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/aria-current_with_value_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/aria-details_pointing_to_details_element-manual.html b/tests/wpt/tests/wai-aria/manual/aria-details_pointing_to_details_element-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/aria-details_pointing_to_details_element-manual.html rename to tests/wpt/tests/wai-aria/manual/aria-details_pointing_to_details_element-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/aria-details_pointing_to_div_element-manual.html b/tests/wpt/tests/wai-aria/manual/aria-details_pointing_to_div_element-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/aria-details_pointing_to_div_element-manual.html rename to tests/wpt/tests/wai-aria/manual/aria-details_pointing_to_div_element-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/article_in_feed_posinset_and_setsize-manual.html b/tests/wpt/tests/wai-aria/manual/article_in_feed_posinset_and_setsize-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/article_in_feed_posinset_and_setsize-manual.html rename to tests/wpt/tests/wai-aria/manual/article_in_feed_posinset_and_setsize-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/article_in_feed_setsize_-1-manual.html b/tests/wpt/tests/wai-aria/manual/article_in_feed_setsize_-1-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/article_in_feed_setsize_-1-manual.html rename to tests/wpt/tests/wai-aria/manual/article_in_feed_setsize_-1-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/article_not_in_feed_posinset_and_setsize-manual.html b/tests/wpt/tests/wai-aria/manual/article_not_in_feed_posinset_and_setsize-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/article_not_in_feed_posinset_and_setsize-manual.html rename to tests/wpt/tests/wai-aria/manual/article_not_in_feed_posinset_and_setsize-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_dialog-manual.html b/tests/wpt/tests/wai-aria/manual/button_haspopup_dialog-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_dialog-manual.html rename to tests/wpt/tests/wai-aria/manual/button_haspopup_dialog-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_emptystring-manual.html b/tests/wpt/tests/wai-aria/manual/button_haspopup_emptystring-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_emptystring-manual.html rename to tests/wpt/tests/wai-aria/manual/button_haspopup_emptystring-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_false-manual.html b/tests/wpt/tests/wai-aria/manual/button_haspopup_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_false-manual.html rename to tests/wpt/tests/wai-aria/manual/button_haspopup_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_foo-manual.html b/tests/wpt/tests/wai-aria/manual/button_haspopup_foo-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_foo-manual.html rename to tests/wpt/tests/wai-aria/manual/button_haspopup_foo-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_grid-manual.html b/tests/wpt/tests/wai-aria/manual/button_haspopup_grid-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_grid-manual.html rename to tests/wpt/tests/wai-aria/manual/button_haspopup_grid-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_listbox-manual.html b/tests/wpt/tests/wai-aria/manual/button_haspopup_listbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_listbox-manual.html rename to tests/wpt/tests/wai-aria/manual/button_haspopup_listbox-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_menu-manual.html b/tests/wpt/tests/wai-aria/manual/button_haspopup_menu-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_menu-manual.html rename to tests/wpt/tests/wai-aria/manual/button_haspopup_menu-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_tree-manual.html b/tests/wpt/tests/wai-aria/manual/button_haspopup_tree-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_tree-manual.html rename to tests/wpt/tests/wai-aria/manual/button_haspopup_tree-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_true-manual.html b/tests/wpt/tests/wai-aria/manual/button_haspopup_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_true-manual.html rename to tests/wpt/tests/wai-aria/manual/button_haspopup_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/button_haspopup_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/button_haspopup_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/button_haspopup_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/button_roledescription_empty-manual.html b/tests/wpt/tests/wai-aria/manual/button_roledescription_empty-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/button_roledescription_empty-manual.html rename to tests/wpt/tests/wai-aria/manual/button_roledescription_empty-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/button_roledescription_valid-manual.html b/tests/wpt/tests/wai-aria/manual/button_roledescription_valid-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/button_roledescription_valid-manual.html rename to tests/wpt/tests/wai-aria/manual/button_roledescription_valid-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/button_roledescription_whitespace_only-manual.html b/tests/wpt/tests/wai-aria/manual/button_roledescription_whitespace_only-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/button_roledescription_whitespace_only-manual.html rename to tests/wpt/tests/wai-aria/manual/button_roledescription_whitespace_only-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/cell-manual.html b/tests/wpt/tests/wai-aria/manual/cell-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/cell-manual.html rename to tests/wpt/tests/wai-aria/manual/cell-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_div-manual.html b/tests/wpt/tests/wai-aria/manual/cell_aria-colspan_2_on_div-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_div-manual.html rename to tests/wpt/tests/wai-aria/manual/cell_aria-colspan_2_on_div-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3-manual.html b/tests/wpt/tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3-manual.html rename to tests/wpt/tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html b/tests/wpt/tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html rename to tests/wpt/tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html b/tests/wpt/tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html rename to tests/wpt/tests/wai-aria/manual/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html b/tests/wpt/tests/wai-aria/manual/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html rename to tests/wpt/tests/wai-aria/manual/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_div-manual.html b/tests/wpt/tests/wai-aria/manual/cell_aria-rowspan_2_on_div-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_div-manual.html rename to tests/wpt/tests/wai-aria/manual/cell_aria-rowspan_2_on_div-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html b/tests/wpt/tests/wai-aria/manual/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html rename to tests/wpt/tests/wai-aria/manual/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html b/tests/wpt/tests/wai-aria/manual/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html rename to tests/wpt/tests/wai-aria/manual/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html b/tests/wpt/tests/wai-aria/manual/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html rename to tests/wpt/tests/wai-aria/manual/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/cell_colindex_4-manual.html b/tests/wpt/tests/wai-aria/manual/cell_colindex_4-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/cell_colindex_4-manual.html rename to tests/wpt/tests/wai-aria/manual/cell_colindex_4-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/cell_rowindex_4-manual.html b/tests/wpt/tests/wai-aria/manual/cell_rowindex_4-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/cell_rowindex_4-manual.html rename to tests/wpt/tests/wai-aria/manual/cell_rowindex_4-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/checkbox_readonly_false-manual.html b/tests/wpt/tests/wai-aria/manual/checkbox_readonly_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/checkbox_readonly_false-manual.html rename to tests/wpt/tests/wai-aria/manual/checkbox_readonly_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/checkbox_readonly_true-manual.html b/tests/wpt/tests/wai-aria/manual/checkbox_readonly_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/checkbox_readonly_true-manual.html rename to tests/wpt/tests/wai-aria/manual/checkbox_readonly_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/checkbox_readonly_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/checkbox_readonly_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/checkbox_readonly_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/checkbox_readonly_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_div-manual.html b/tests/wpt/tests/wai-aria/manual/columnheader_aria-colspan_2_on_div-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_div-manual.html rename to tests/wpt/tests/wai-aria/manual/columnheader_aria-colspan_2_on_div-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html b/tests/wpt/tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html rename to tests/wpt/tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html b/tests/wpt/tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html rename to tests/wpt/tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html b/tests/wpt/tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html rename to tests/wpt/tests/wai-aria/manual/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_div-manual.html b/tests/wpt/tests/wai-aria/manual/columnheader_aria-rowspan_2_on_div-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_div-manual.html rename to tests/wpt/tests/wai-aria/manual/columnheader_aria-rowspan_2_on_div-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html b/tests/wpt/tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html rename to tests/wpt/tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html b/tests/wpt/tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html rename to tests/wpt/tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html b/tests/wpt/tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html rename to tests/wpt/tests/wai-aria/manual/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_colindex_4-manual.html b/tests/wpt/tests/wai-aria/manual/columnheader_colindex_4-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/columnheader_colindex_4-manual.html rename to tests/wpt/tests/wai-aria/manual/columnheader_colindex_4-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_rowindex_4-manual.html b/tests/wpt/tests/wai-aria/manual/columnheader_rowindex_4-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/columnheader_rowindex_4-manual.html rename to tests/wpt/tests/wai-aria/manual/columnheader_rowindex_4-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_selected_false_not_automatically_propagated-manual.html b/tests/wpt/tests/wai-aria/manual/columnheader_selected_false_not_automatically_propagated-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/columnheader_selected_false_not_automatically_propagated-manual.html rename to tests/wpt/tests/wai-aria/manual/columnheader_selected_false_not_automatically_propagated-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/columnheader_selected_true_not_automatically_propagated-manual.html b/tests/wpt/tests/wai-aria/manual/columnheader_selected_true_not_automatically_propagated-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/columnheader_selected_true_not_automatically_propagated-manual.html rename to tests/wpt/tests/wai-aria/manual/columnheader_selected_true_not_automatically_propagated-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_controls_an_invalid_id-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_controls_an_invalid_id-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_controls_an_invalid_id-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_controls_an_invalid_id-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_dialog-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_haspopup_dialog-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_dialog-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_haspopup_dialog-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_false-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_haspopup_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_false-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_haspopup_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_grid-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_haspopup_grid-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_grid-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_haspopup_grid-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_listbox-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_haspopup_listbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_listbox-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_haspopup_listbox-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_menu-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_haspopup_menu-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_menu-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_haspopup_menu-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_tree-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_haspopup_tree-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_tree-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_haspopup_tree-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_true-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_haspopup_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_true-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_haspopup_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_haspopup_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_haspopup_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_haspopup_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_orientation_horizontal-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_orientation_horizontal-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_orientation_horizontal-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_orientation_horizontal-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_orientation_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_orientation_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_orientation_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_orientation_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_orientation_vertical-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_orientation_vertical-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_orientation_vertical-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_orientation_vertical-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_readonly_false-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_readonly_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_readonly_false-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_readonly_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_readonly_true-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_readonly_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_readonly_true-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_readonly_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/combobox_readonly_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/combobox_readonly_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/combobox_readonly_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/combobox_readonly_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/dialog_modal_false-manual.html b/tests/wpt/tests/wai-aria/manual/dialog_modal_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/dialog_modal_false-manual.html rename to tests/wpt/tests/wai-aria/manual/dialog_modal_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/dialog_modal_true-manual.html b/tests/wpt/tests/wai-aria/manual/dialog_modal_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/dialog_modal_true-manual.html rename to tests/wpt/tests/wai-aria/manual/dialog_modal_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/dialog_modal_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/dialog_modal_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/dialog_modal_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/dialog_modal_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/div_element_without_role_roledescription_valid-manual.html b/tests/wpt/tests/wai-aria/manual/div_element_without_role_roledescription_valid-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/div_element_without_role_roledescription_valid-manual.html rename to tests/wpt/tests/wai-aria/manual/div_element_without_role_roledescription_valid-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/errormessage_object_in_invalid_state-manual.html b/tests/wpt/tests/wai-aria/manual/errormessage_object_in_invalid_state-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/errormessage_object_in_invalid_state-manual.html rename to tests/wpt/tests/wai-aria/manual/errormessage_object_in_invalid_state-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/errormessage_object_in_valid_state-manual.html b/tests/wpt/tests/wai-aria/manual/errormessage_object_in_valid_state-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/errormessage_object_in_valid_state-manual.html rename to tests/wpt/tests/wai-aria/manual/errormessage_object_in_valid_state-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/feed-manual.html b/tests/wpt/tests/wai-aria/manual/feed-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/feed-manual.html rename to tests/wpt/tests/wai-aria/manual/feed-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/figure-manual.html b/tests/wpt/tests/wai-aria/manual/figure-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/figure-manual.html rename to tests/wpt/tests/wai-aria/manual/figure-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_aria-readonly_false_automatically_propagated-manual.html b/tests/wpt/tests/wai-aria/manual/grid_aria-readonly_false_automatically_propagated-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_aria-readonly_false_automatically_propagated-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_aria-readonly_false_automatically_propagated-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_aria-readonly_true_automatically_propagated-manual.html b/tests/wpt/tests/wai-aria/manual/grid_aria-readonly_true_automatically_propagated-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_aria-readonly_true_automatically_propagated-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_aria-readonly_true_automatically_propagated-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_busy_false-manual.html b/tests/wpt/tests/wai-aria/manual/grid_busy_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_busy_false-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_busy_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_busy_true-manual.html b/tests/wpt/tests/wai-aria/manual/grid_busy_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_busy_true-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_busy_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_busy_value_changes-manual.html b/tests/wpt/tests/wai-aria/manual/grid_busy_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_busy_value_changes-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_busy_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_colcount_8-manual.html b/tests/wpt/tests/wai-aria/manual/grid_colcount_8-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_colcount_8-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_colcount_8-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_readonly_false-manual.html b/tests/wpt/tests/wai-aria/manual/grid_columnheader_readonly_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_readonly_false-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_columnheader_readonly_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_readonly_true-manual.html b/tests/wpt/tests/wai-aria/manual/grid_columnheader_readonly_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_readonly_true-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_columnheader_readonly_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_readonly_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/grid_columnheader_readonly_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_readonly_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_columnheader_readonly_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_required_false-manual.html b/tests/wpt/tests/wai-aria/manual/grid_columnheader_required_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_required_false-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_columnheader_required_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_required_true-manual.html b/tests/wpt/tests/wai-aria/manual/grid_columnheader_required_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_required_true-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_columnheader_required_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_required_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/grid_columnheader_required_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_columnheader_required_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_columnheader_required_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_rowcount_3-manual.html b/tests/wpt/tests/wai-aria/manual/grid_rowcount_3-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_rowcount_3-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_rowcount_3-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_readonly_false-manual.html b/tests/wpt/tests/wai-aria/manual/grid_rowheader_readonly_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_readonly_false-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_rowheader_readonly_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_readonly_true-manual.html b/tests/wpt/tests/wai-aria/manual/grid_rowheader_readonly_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_readonly_true-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_rowheader_readonly_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_readonly_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/grid_rowheader_readonly_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_readonly_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_rowheader_readonly_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_required_false-manual.html b/tests/wpt/tests/wai-aria/manual/grid_rowheader_required_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_required_false-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_rowheader_required_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_required_true-manual.html b/tests/wpt/tests/wai-aria/manual/grid_rowheader_required_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_required_true-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_rowheader_required_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_required_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/grid_rowheader_required_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/grid_rowheader_required_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/grid_rowheader_required_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/gridcell_aria-colspan_2_on_div-manual.html b/tests/wpt/tests/wai-aria/manual/gridcell_aria-colspan_2_on_div-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/gridcell_aria-colspan_2_on_div-manual.html rename to tests/wpt/tests/wai-aria/manual/gridcell_aria-colspan_2_on_div-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/gridcell_aria-rowspan_2_on_div-manual.html b/tests/wpt/tests/wai-aria/manual/gridcell_aria-rowspan_2_on_div-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/gridcell_aria-rowspan_2_on_div-manual.html rename to tests/wpt/tests/wai-aria/manual/gridcell_aria-rowspan_2_on_div-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/gridcell_colindex_4-manual.html b/tests/wpt/tests/wai-aria/manual/gridcell_colindex_4-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/gridcell_colindex_4-manual.html rename to tests/wpt/tests/wai-aria/manual/gridcell_colindex_4-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/gridcell_rowindex_4-manual.html b/tests/wpt/tests/wai-aria/manual/gridcell_rowindex_4-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/gridcell_rowindex_4-manual.html rename to tests/wpt/tests/wai-aria/manual/gridcell_rowindex_4-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/group_hidden_undefined_element_not_rendered-manual.html b/tests/wpt/tests/wai-aria/manual/group_hidden_undefined_element_not_rendered-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/group_hidden_undefined_element_not_rendered-manual.html rename to tests/wpt/tests/wai-aria/manual/group_hidden_undefined_element_not_rendered-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/group_hidden_undefined_element_rendered-manual.html b/tests/wpt/tests/wai-aria/manual/group_hidden_undefined_element_rendered-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/group_hidden_undefined_element_rendered-manual.html rename to tests/wpt/tests/wai-aria/manual/group_hidden_undefined_element_rendered-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/heading_level_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/heading_level_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/heading_level_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/heading_level_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/keyshortcuts_multiple_shortcuts-manual.html b/tests/wpt/tests/wai-aria/manual/keyshortcuts_multiple_shortcuts-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/keyshortcuts_multiple_shortcuts-manual.html rename to tests/wpt/tests/wai-aria/manual/keyshortcuts_multiple_shortcuts-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/keyshortcuts_one_shortcut-manual.html b/tests/wpt/tests/wai-aria/manual/keyshortcuts_one_shortcut-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/keyshortcuts_one_shortcut-manual.html rename to tests/wpt/tests/wai-aria/manual/keyshortcuts_one_shortcut-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/listbox_busy_false-manual.html b/tests/wpt/tests/wai-aria/manual/listbox_busy_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/listbox_busy_false-manual.html rename to tests/wpt/tests/wai-aria/manual/listbox_busy_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/listbox_busy_true-manual.html b/tests/wpt/tests/wai-aria/manual/listbox_busy_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/listbox_busy_true-manual.html rename to tests/wpt/tests/wai-aria/manual/listbox_busy_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/listbox_orientation_horizontal-manual.html b/tests/wpt/tests/wai-aria/manual/listbox_orientation_horizontal-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/listbox_orientation_horizontal-manual.html rename to tests/wpt/tests/wai-aria/manual/listbox_orientation_horizontal-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/listbox_orientation_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/listbox_orientation_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/listbox_orientation_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/listbox_orientation_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/listbox_orientation_vertical-manual.html b/tests/wpt/tests/wai-aria/manual/listbox_orientation_vertical-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/listbox_orientation_vertical-manual.html rename to tests/wpt/tests/wai-aria/manual/listbox_orientation_vertical-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/listbox_readonly_false-manual.html b/tests/wpt/tests/wai-aria/manual/listbox_readonly_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/listbox_readonly_false-manual.html rename to tests/wpt/tests/wai-aria/manual/listbox_readonly_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/listbox_readonly_true-manual.html b/tests/wpt/tests/wai-aria/manual/listbox_readonly_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/listbox_readonly_true-manual.html rename to tests/wpt/tests/wai-aria/manual/listbox_readonly_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/listbox_readonly_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/listbox_readonly_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/listbox_readonly_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/listbox_readonly_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/listitem_setsize_-1-manual.html b/tests/wpt/tests/wai-aria/manual/listitem_setsize_-1-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/listitem_setsize_-1-manual.html rename to tests/wpt/tests/wai-aria/manual/listitem_setsize_-1-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menu_orientation_horizontal-manual.html b/tests/wpt/tests/wai-aria/manual/menu_orientation_horizontal-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menu_orientation_horizontal-manual.html rename to tests/wpt/tests/wai-aria/manual/menu_orientation_horizontal-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menu_orientation_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/menu_orientation_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menu_orientation_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/menu_orientation_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menu_orientation_vertical-manual.html b/tests/wpt/tests/wai-aria/manual/menu_orientation_vertical-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menu_orientation_vertical-manual.html rename to tests/wpt/tests/wai-aria/manual/menu_orientation_vertical-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menubar_busy_false-manual.html b/tests/wpt/tests/wai-aria/manual/menubar_busy_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menubar_busy_false-manual.html rename to tests/wpt/tests/wai-aria/manual/menubar_busy_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menubar_busy_true-manual.html b/tests/wpt/tests/wai-aria/manual/menubar_busy_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menubar_busy_true-manual.html rename to tests/wpt/tests/wai-aria/manual/menubar_busy_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menubar_orientation_horizontal-manual.html b/tests/wpt/tests/wai-aria/manual/menubar_orientation_horizontal-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menubar_orientation_horizontal-manual.html rename to tests/wpt/tests/wai-aria/manual/menubar_orientation_horizontal-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menubar_orientation_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/menubar_orientation_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menubar_orientation_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/menubar_orientation_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menubar_orientation_vertical-manual.html b/tests/wpt/tests/wai-aria/manual/menubar_orientation_vertical-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menubar_orientation_vertical-manual.html rename to tests/wpt/tests/wai-aria/manual/menubar_orientation_vertical-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitem_expanded_false-manual.html b/tests/wpt/tests/wai-aria/manual/menuitem_expanded_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitem_expanded_false-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitem_expanded_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitem_expanded_true-manual.html b/tests/wpt/tests/wai-aria/manual/menuitem_expanded_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitem_expanded_true-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitem_expanded_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitem_posinset_and_setsize-manual.html b/tests/wpt/tests/wai-aria/manual/menuitem_posinset_and_setsize-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitem_posinset_and_setsize-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitem_posinset_and_setsize-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_expanded_false-manual.html b/tests/wpt/tests/wai-aria/manual/menuitemcheckbox_expanded_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_expanded_false-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitemcheckbox_expanded_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_expanded_true-manual.html b/tests/wpt/tests/wai-aria/manual/menuitemcheckbox_expanded_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_expanded_true-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitemcheckbox_expanded_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_posinset_and_setsize-manual.html b/tests/wpt/tests/wai-aria/manual/menuitemcheckbox_posinset_and_setsize-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_posinset_and_setsize-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitemcheckbox_posinset_and_setsize-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_readonly_false-manual.html b/tests/wpt/tests/wai-aria/manual/menuitemcheckbox_readonly_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_readonly_false-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitemcheckbox_readonly_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_readonly_true-manual.html b/tests/wpt/tests/wai-aria/manual/menuitemcheckbox_readonly_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_readonly_true-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitemcheckbox_readonly_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_readonly_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/menuitemcheckbox_readonly_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitemcheckbox_readonly_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitemcheckbox_readonly_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_expanded_false-manual.html b/tests/wpt/tests/wai-aria/manual/menuitemradio_expanded_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_expanded_false-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitemradio_expanded_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_expanded_true-manual.html b/tests/wpt/tests/wai-aria/manual/menuitemradio_expanded_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_expanded_true-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitemradio_expanded_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_posinset_and_setsize-manual.html b/tests/wpt/tests/wai-aria/manual/menuitemradio_posinset_and_setsize-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_posinset_and_setsize-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitemradio_posinset_and_setsize-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_readonly_false-manual.html b/tests/wpt/tests/wai-aria/manual/menuitemradio_readonly_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_readonly_false-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitemradio_readonly_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_readonly_true-manual.html b/tests/wpt/tests/wai-aria/manual/menuitemradio_readonly_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_readonly_true-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitemradio_readonly_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_readonly_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/menuitemradio_readonly_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/menuitemradio_readonly_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/menuitemradio_readonly_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/none-manual.html b/tests/wpt/tests/wai-aria/manual/none-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/none-manual.html rename to tests/wpt/tests/wai-aria/manual/none-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/option_selected_false-manual.html b/tests/wpt/tests/wai-aria/manual/option_selected_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/option_selected_false-manual.html rename to tests/wpt/tests/wai-aria/manual/option_selected_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/option_selected_true-manual.html b/tests/wpt/tests/wai-aria/manual/option_selected_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/option_selected_true-manual.html rename to tests/wpt/tests/wai-aria/manual/option_selected_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/option_selected_undefined-manual.html b/tests/wpt/tests/wai-aria/manual/option_selected_undefined-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/option_selected_undefined-manual.html rename to tests/wpt/tests/wai-aria/manual/option_selected_undefined-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/option_selected_value_changes-manual.html b/tests/wpt/tests/wai-aria/manual/option_selected_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/option_selected_value_changes-manual.html rename to tests/wpt/tests/wai-aria/manual/option_selected_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_orientation_horizontal-manual.html b/tests/wpt/tests/wai-aria/manual/radiogroup_orientation_horizontal-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_orientation_horizontal-manual.html rename to tests/wpt/tests/wai-aria/manual/radiogroup_orientation_horizontal-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_orientation_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/radiogroup_orientation_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_orientation_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/radiogroup_orientation_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_orientation_vertical-manual.html b/tests/wpt/tests/wai-aria/manual/radiogroup_orientation_vertical-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_orientation_vertical-manual.html rename to tests/wpt/tests/wai-aria/manual/radiogroup_orientation_vertical-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_readonly_false-manual.html b/tests/wpt/tests/wai-aria/manual/radiogroup_readonly_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_readonly_false-manual.html rename to tests/wpt/tests/wai-aria/manual/radiogroup_readonly_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_readonly_true-manual.html b/tests/wpt/tests/wai-aria/manual/radiogroup_readonly_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_readonly_true-manual.html rename to tests/wpt/tests/wai-aria/manual/radiogroup_readonly_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_readonly_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/radiogroup_readonly_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/radiogroup_readonly_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/radiogroup_readonly_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/region_with_name-manual.html b/tests/wpt/tests/wai-aria/manual/region_with_name-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/region_with_name-manual.html rename to tests/wpt/tests/wai-aria/manual/region_with_name-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/region_without_name-manual.html b/tests/wpt/tests/wai-aria/manual/region_without_name-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/region_without_name-manual.html rename to tests/wpt/tests/wai-aria/manual/region_without_name-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/row_colindex_4-manual.html b/tests/wpt/tests/wai-aria/manual/row_colindex_4-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/row_colindex_4-manual.html rename to tests/wpt/tests/wai-aria/manual/row_colindex_4-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/row_rowindex_4-manual.html b/tests/wpt/tests/wai-aria/manual/row_rowindex_4-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/row_rowindex_4-manual.html rename to tests/wpt/tests/wai-aria/manual/row_rowindex_4-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/rowheader_aria-colspan_2_on_div-manual.html b/tests/wpt/tests/wai-aria/manual/rowheader_aria-colspan_2_on_div-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/rowheader_aria-colspan_2_on_div-manual.html rename to tests/wpt/tests/wai-aria/manual/rowheader_aria-colspan_2_on_div-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/rowheader_aria-rowspan_2_on_div-manual.html b/tests/wpt/tests/wai-aria/manual/rowheader_aria-rowspan_2_on_div-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/rowheader_aria-rowspan_2_on_div-manual.html rename to tests/wpt/tests/wai-aria/manual/rowheader_aria-rowspan_2_on_div-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/rowheader_colindex_4-manual.html b/tests/wpt/tests/wai-aria/manual/rowheader_colindex_4-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/rowheader_colindex_4-manual.html rename to tests/wpt/tests/wai-aria/manual/rowheader_colindex_4-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/rowheader_rowindex_4-manual.html b/tests/wpt/tests/wai-aria/manual/rowheader_rowindex_4-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/rowheader_rowindex_4-manual.html rename to tests/wpt/tests/wai-aria/manual/rowheader_rowindex_4-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/rowheader_selected_false_not_automatically_propagated-manual.html b/tests/wpt/tests/wai-aria/manual/rowheader_selected_false_not_automatically_propagated-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/rowheader_selected_false_not_automatically_propagated-manual.html rename to tests/wpt/tests/wai-aria/manual/rowheader_selected_false_not_automatically_propagated-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/rowheader_selected_true_not_automatically_propagated-manual.html b/tests/wpt/tests/wai-aria/manual/rowheader_selected_true_not_automatically_propagated-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/rowheader_selected_true_not_automatically_propagated-manual.html rename to tests/wpt/tests/wai-aria/manual/rowheader_selected_true_not_automatically_propagated-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/scrollbar_all_values_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/scrollbar_all_values_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/scrollbar_all_values_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/scrollbar_all_values_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/scrollbar_only_valuenow_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/scrollbar_only_valuenow_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/scrollbar_only_valuenow_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/scrollbar_only_valuenow_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/scrollbar_orientation_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/scrollbar_orientation_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/scrollbar_orientation_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/scrollbar_orientation_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_activedescendant-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_activedescendant-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_activedescendant-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_activedescendant-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_activedescendant_value_changes-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_activedescendant_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_activedescendant_value_changes-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_activedescendant_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_both-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_autocomplete_both-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_both-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_autocomplete_both-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_inline-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_autocomplete_inline-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_inline-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_autocomplete_inline-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_list-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_autocomplete_list-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_list-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_autocomplete_list-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_none-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_autocomplete_none-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_none-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_autocomplete_none-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_autocomplete_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_autocomplete_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_autocomplete_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_multiline_false-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_multiline_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_multiline_false-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_multiline_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_multiline_true-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_multiline_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_multiline_true-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_multiline_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_multiline_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_multiline_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_multiline_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_multiline_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_placeholder-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_placeholder-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_placeholder-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_placeholder-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_readonly_false-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_readonly_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_readonly_false-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_readonly_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_readonly_true-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_readonly_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_readonly_true-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_readonly_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_readonly_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_readonly_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_readonly_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_readonly_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_required_false-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_required_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_required_false-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_required_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_required_true-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_required_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_required_true-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_required_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/searchbox_required_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/searchbox_required_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/searchbox_required_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/searchbox_required_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/separator_focusable_all_values_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/separator_focusable_all_values_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/separator_focusable_all_values_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/separator_focusable_all_values_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/separator_focusable_only_valuenow_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/separator_focusable_only_valuenow_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/separator_focusable_only_valuenow_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/separator_focusable_only_valuenow_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/separator_focusable_valuetext-manual.html b/tests/wpt/tests/wai-aria/manual/separator_focusable_valuetext-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/separator_focusable_valuetext-manual.html rename to tests/wpt/tests/wai-aria/manual/separator_focusable_valuetext-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/separator_orientation_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/separator_orientation_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/separator_orientation_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/separator_orientation_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/separator_unfocusable_all_values_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/separator_unfocusable_all_values_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/separator_unfocusable_all_values_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/separator_unfocusable_all_values_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/separator_unfocusable_valuetext-manual.html b/tests/wpt/tests/wai-aria/manual/separator_unfocusable_valuetext-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/separator_unfocusable_valuetext-manual.html rename to tests/wpt/tests/wai-aria/manual/separator_unfocusable_valuetext-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/slider_all_values_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/slider_all_values_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/slider_all_values_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/slider_all_values_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/slider_only_valuenow_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/slider_only_valuenow_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/slider_only_valuenow_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/slider_only_valuenow_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/slider_orientation_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/slider_orientation_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/slider_orientation_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/slider_orientation_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/slider_readonly_false-manual.html b/tests/wpt/tests/wai-aria/manual/slider_readonly_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/slider_readonly_false-manual.html rename to tests/wpt/tests/wai-aria/manual/slider_readonly_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/slider_readonly_true-manual.html b/tests/wpt/tests/wai-aria/manual/slider_readonly_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/slider_readonly_true-manual.html rename to tests/wpt/tests/wai-aria/manual/slider_readonly_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/slider_readonly_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/slider_readonly_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/slider_readonly_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/slider_readonly_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_all_values_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/spinbutton_all_values_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_all_values_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/spinbutton_all_values_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_only_aria-valuenow_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/spinbutton_only_aria-valuenow_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_only_aria-valuenow_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/spinbutton_only_aria-valuenow_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_readonly_false-manual.html b/tests/wpt/tests/wai-aria/manual/spinbutton_readonly_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_readonly_false-manual.html rename to tests/wpt/tests/wai-aria/manual/spinbutton_readonly_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_readonly_true-manual.html b/tests/wpt/tests/wai-aria/manual/spinbutton_readonly_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_readonly_true-manual.html rename to tests/wpt/tests/wai-aria/manual/spinbutton_readonly_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_readonly_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/spinbutton_readonly_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/spinbutton_readonly_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/spinbutton_readonly_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_false-manual.html b/tests/wpt/tests/wai-aria/manual/switch_checked_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_false-manual.html rename to tests/wpt/tests/wai-aria/manual/switch_checked_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_mixed-manual.html b/tests/wpt/tests/wai-aria/manual/switch_checked_mixed-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_mixed-manual.html rename to tests/wpt/tests/wai-aria/manual/switch_checked_mixed-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_true-manual.html b/tests/wpt/tests/wai-aria/manual/switch_checked_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_true-manual.html rename to tests/wpt/tests/wai-aria/manual/switch_checked_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_undefined-manual.html b/tests/wpt/tests/wai-aria/manual/switch_checked_undefined-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_undefined-manual.html rename to tests/wpt/tests/wai-aria/manual/switch_checked_undefined-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_value_changes-manual.html b/tests/wpt/tests/wai-aria/manual/switch_checked_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/switch_checked_value_changes-manual.html rename to tests/wpt/tests/wai-aria/manual/switch_checked_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/switch_readonly_false-manual.html b/tests/wpt/tests/wai-aria/manual/switch_readonly_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/switch_readonly_false-manual.html rename to tests/wpt/tests/wai-aria/manual/switch_readonly_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/switch_readonly_true-manual.html b/tests/wpt/tests/wai-aria/manual/switch_readonly_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/switch_readonly_true-manual.html rename to tests/wpt/tests/wai-aria/manual/switch_readonly_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/switch_readonly_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/switch_readonly_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/switch_readonly_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/switch_readonly_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/tab_posinset_and_setsize-manual.html b/tests/wpt/tests/wai-aria/manual/tab_posinset_and_setsize-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/tab_posinset_and_setsize-manual.html rename to tests/wpt/tests/wai-aria/manual/tab_posinset_and_setsize-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/table_colcount_-1-manual.html b/tests/wpt/tests/wai-aria/manual/table_colcount_-1-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/table_colcount_-1-manual.html rename to tests/wpt/tests/wai-aria/manual/table_colcount_-1-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/table_colcount_8-manual.html b/tests/wpt/tests/wai-aria/manual/table_colcount_8-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/table_colcount_8-manual.html rename to tests/wpt/tests/wai-aria/manual/table_colcount_8-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/table_rowcount_-1-manual.html b/tests/wpt/tests/wai-aria/manual/table_rowcount_-1-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/table_rowcount_-1-manual.html rename to tests/wpt/tests/wai-aria/manual/table_rowcount_-1-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/table_rowcount_3-manual.html b/tests/wpt/tests/wai-aria/manual/table_rowcount_3-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/table_rowcount_3-manual.html rename to tests/wpt/tests/wai-aria/manual/table_rowcount_3-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/tablist_orientation_horizontal-manual.html b/tests/wpt/tests/wai-aria/manual/tablist_orientation_horizontal-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/tablist_orientation_horizontal-manual.html rename to tests/wpt/tests/wai-aria/manual/tablist_orientation_horizontal-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/tablist_orientation_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/tablist_orientation_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/tablist_orientation_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/tablist_orientation_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/tablist_orientation_vertical-manual.html b/tests/wpt/tests/wai-aria/manual/tablist_orientation_vertical-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/tablist_orientation_vertical-manual.html rename to tests/wpt/tests/wai-aria/manual/tablist_orientation_vertical-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/term_role-manual.html b/tests/wpt/tests/wai-aria/manual/term_role-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/term_role-manual.html rename to tests/wpt/tests/wai-aria/manual/term_role-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/textbox_placeholder-manual.html b/tests/wpt/tests/wai-aria/manual/textbox_placeholder-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/textbox_placeholder-manual.html rename to tests/wpt/tests/wai-aria/manual/textbox_placeholder-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/toolbar_orientation_horizontal-manual.html b/tests/wpt/tests/wai-aria/manual/toolbar_orientation_horizontal-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/toolbar_orientation_horizontal-manual.html rename to tests/wpt/tests/wai-aria/manual/toolbar_orientation_horizontal-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/toolbar_orientation_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/toolbar_orientation_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/toolbar_orientation_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/toolbar_orientation_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/toolbar_orientation_vertical-manual.html b/tests/wpt/tests/wai-aria/manual/toolbar_orientation_vertical-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/toolbar_orientation_vertical-manual.html rename to tests/wpt/tests/wai-aria/manual/toolbar_orientation_vertical-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/tree_orientation_horizontal-manual.html b/tests/wpt/tests/wai-aria/manual/tree_orientation_horizontal-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/tree_orientation_horizontal-manual.html rename to tests/wpt/tests/wai-aria/manual/tree_orientation_horizontal-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/tree_orientation_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/tree_orientation_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/tree_orientation_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/tree_orientation_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/tree_orientation_vertical-manual.html b/tests/wpt/tests/wai-aria/manual/tree_orientation_vertical-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/tree_orientation_vertical-manual.html rename to tests/wpt/tests/wai-aria/manual/tree_orientation_vertical-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/treegrid_colcount_8-manual.html b/tests/wpt/tests/wai-aria/manual/treegrid_colcount_8-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/treegrid_colcount_8-manual.html rename to tests/wpt/tests/wai-aria/manual/treegrid_colcount_8-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/treegrid_orientation_horizontal-manual.html b/tests/wpt/tests/wai-aria/manual/treegrid_orientation_horizontal-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/treegrid_orientation_horizontal-manual.html rename to tests/wpt/tests/wai-aria/manual/treegrid_orientation_horizontal-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/treegrid_orientation_unspecified-manual.html b/tests/wpt/tests/wai-aria/manual/treegrid_orientation_unspecified-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/treegrid_orientation_unspecified-manual.html rename to tests/wpt/tests/wai-aria/manual/treegrid_orientation_unspecified-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/treegrid_orientation_vertical-manual.html b/tests/wpt/tests/wai-aria/manual/treegrid_orientation_vertical-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/treegrid_orientation_vertical-manual.html rename to tests/wpt/tests/wai-aria/manual/treegrid_orientation_vertical-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/treegrid_rowcount_3-manual.html b/tests/wpt/tests/wai-aria/manual/treegrid_rowcount_3-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/treegrid_rowcount_3-manual.html rename to tests/wpt/tests/wai-aria/manual/treegrid_rowcount_3-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_false-manual.html b/tests/wpt/tests/wai-aria/manual/treeitem_selected_false-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_false-manual.html rename to tests/wpt/tests/wai-aria/manual/treeitem_selected_false-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_true-manual.html b/tests/wpt/tests/wai-aria/manual/treeitem_selected_true-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_true-manual.html rename to tests/wpt/tests/wai-aria/manual/treeitem_selected_true-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_undefined-manual.html b/tests/wpt/tests/wai-aria/manual/treeitem_selected_undefined-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_undefined-manual.html rename to tests/wpt/tests/wai-aria/manual/treeitem_selected_undefined-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_value_changes-manual.html b/tests/wpt/tests/wai-aria/manual/treeitem_selected_value_changes-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/manual/treeitem_selected_value_changes-manual.html rename to tests/wpt/tests/wai-aria/manual/treeitem_selected_value_changes-manual.html diff --git a/tests/wpt/web-platform-tests/wai-aria/role/ReadMe.md b/tests/wpt/tests/wai-aria/role/ReadMe.md similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/role/ReadMe.md rename to tests/wpt/tests/wai-aria/role/ReadMe.md diff --git a/tests/wpt/web-platform-tests/wai-aria/role/abstract-roles.html b/tests/wpt/tests/wai-aria/role/abstract-roles.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/role/abstract-roles.html rename to tests/wpt/tests/wai-aria/role/abstract-roles.html diff --git a/tests/wpt/web-platform-tests/wai-aria/role/basic.html b/tests/wpt/tests/wai-aria/role/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/role/basic.html rename to tests/wpt/tests/wai-aria/role/basic.html diff --git a/tests/wpt/web-platform-tests/wai-aria/role/fallback-roles.html b/tests/wpt/tests/wai-aria/role/fallback-roles.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/role/fallback-roles.html rename to tests/wpt/tests/wai-aria/role/fallback-roles.html diff --git a/tests/wpt/web-platform-tests/wai-aria/role/form-roles.html b/tests/wpt/tests/wai-aria/role/form-roles.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/role/form-roles.html rename to tests/wpt/tests/wai-aria/role/form-roles.html diff --git a/tests/wpt/web-platform-tests/wai-aria/role/invalid-roles.html b/tests/wpt/tests/wai-aria/role/invalid-roles.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/role/invalid-roles.html rename to tests/wpt/tests/wai-aria/role/invalid-roles.html diff --git a/tests/wpt/web-platform-tests/wai-aria/role/list-roles.html b/tests/wpt/tests/wai-aria/role/list-roles.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/role/list-roles.html rename to tests/wpt/tests/wai-aria/role/list-roles.html diff --git a/tests/wpt/web-platform-tests/wai-aria/role/region-roles.html b/tests/wpt/tests/wai-aria/role/region-roles.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/role/region-roles.html rename to tests/wpt/tests/wai-aria/role/region-roles.html diff --git a/tests/wpt/web-platform-tests/wai-aria/role/role_none_conflict_resolution.html b/tests/wpt/tests/wai-aria/role/role_none_conflict_resolution.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/role/role_none_conflict_resolution.html rename to tests/wpt/tests/wai-aria/role/role_none_conflict_resolution.html diff --git a/tests/wpt/web-platform-tests/wai-aria/role/roles.html b/tests/wpt/tests/wai-aria/role/roles.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/role/roles.html rename to tests/wpt/tests/wai-aria/role/roles.html diff --git a/tests/wpt/web-platform-tests/wai-aria/role/synonym-roles.html b/tests/wpt/tests/wai-aria/role/synonym-roles.html similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/role/synonym-roles.html rename to tests/wpt/tests/wai-aria/role/synonym-roles.html diff --git a/tests/wpt/web-platform-tests/wai-aria/scripts/ATTAcomm.js b/tests/wpt/tests/wai-aria/scripts/ATTAcomm.js similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/scripts/ATTAcomm.js rename to tests/wpt/tests/wai-aria/scripts/ATTAcomm.js diff --git a/tests/wpt/web-platform-tests/wai-aria/scripts/aria-utils.js b/tests/wpt/tests/wai-aria/scripts/aria-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/scripts/aria-utils.js rename to tests/wpt/tests/wai-aria/scripts/aria-utils.js diff --git a/tests/wpt/web-platform-tests/wai-aria/scripts/manual.css b/tests/wpt/tests/wai-aria/scripts/manual.css similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/scripts/manual.css rename to tests/wpt/tests/wai-aria/scripts/manual.css diff --git a/tests/wpt/web-platform-tests/wai-aria/tools/convert_wiki.pl b/tests/wpt/tests/wai-aria/tools/convert_wiki.pl similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/tools/convert_wiki.pl rename to tests/wpt/tests/wai-aria/tools/convert_wiki.pl diff --git a/tests/wpt/web-platform-tests/wai-aria/tools/make_tests.pl b/tests/wpt/tests/wai-aria/tools/make_tests.pl similarity index 100% rename from tests/wpt/web-platform-tests/wai-aria/tools/make_tests.pl rename to tests/wpt/tests/wai-aria/tools/make_tests.pl diff --git a/tests/wpt/web-platform-tests/wasm/META.yml b/tests/wpt/tests/wasm/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/wasm/META.yml rename to tests/wpt/tests/wasm/META.yml diff --git a/tests/wpt/web-platform-tests/wasm/compile_worker.js b/tests/wpt/tests/wasm/compile_worker.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/compile_worker.js rename to tests/wpt/tests/wasm/compile_worker.js diff --git a/tests/wpt/web-platform-tests/wasm/create_multiple_memory.worker.js b/tests/wpt/tests/wasm/create_multiple_memory.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/create_multiple_memory.worker.js rename to tests/wpt/tests/wasm/create_multiple_memory.worker.js diff --git a/tests/wpt/web-platform-tests/wasm/incrementer.wasm b/tests/wpt/tests/wasm/incrementer.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/incrementer.wasm rename to tests/wpt/tests/wasm/incrementer.wasm diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/META.yml b/tests/wpt/tests/wasm/jsapi/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/META.yml rename to tests/wpt/tests/wasm/jsapi/META.yml diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/assertions.js b/tests/wpt/tests/wasm/jsapi/assertions.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/assertions.js rename to tests/wpt/tests/wasm/jsapi/assertions.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/bad-imports.js b/tests/wpt/tests/wasm/jsapi/bad-imports.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/bad-imports.js rename to tests/wpt/tests/wasm/jsapi/bad-imports.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/constructor/compile.any.js b/tests/wpt/tests/wasm/jsapi/constructor/compile.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/constructor/compile.any.js rename to tests/wpt/tests/wasm/jsapi/constructor/compile.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/constructor/instantiate-bad-imports.any.js b/tests/wpt/tests/wasm/jsapi/constructor/instantiate-bad-imports.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/constructor/instantiate-bad-imports.any.js rename to tests/wpt/tests/wasm/jsapi/constructor/instantiate-bad-imports.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/constructor/instantiate.any.js b/tests/wpt/tests/wasm/jsapi/constructor/instantiate.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/constructor/instantiate.any.js rename to tests/wpt/tests/wasm/jsapi/constructor/instantiate.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/constructor/multi-value.any.js b/tests/wpt/tests/wasm/jsapi/constructor/multi-value.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/constructor/multi-value.any.js rename to tests/wpt/tests/wasm/jsapi/constructor/multi-value.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/constructor/toStringTag.any.js b/tests/wpt/tests/wasm/jsapi/constructor/toStringTag.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/constructor/toStringTag.any.js rename to tests/wpt/tests/wasm/jsapi/constructor/toStringTag.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/constructor/validate.any.js b/tests/wpt/tests/wasm/jsapi/constructor/validate.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/constructor/validate.any.js rename to tests/wpt/tests/wasm/jsapi/constructor/validate.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/error-interfaces-no-symbol-tostringtag.js b/tests/wpt/tests/wasm/jsapi/error-interfaces-no-symbol-tostringtag.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/error-interfaces-no-symbol-tostringtag.js rename to tests/wpt/tests/wasm/jsapi/error-interfaces-no-symbol-tostringtag.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/exception/basic.tentative.any.js b/tests/wpt/tests/wasm/jsapi/exception/basic.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/exception/basic.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/exception/basic.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/exception/constructor.tentative.any.js b/tests/wpt/tests/wasm/jsapi/exception/constructor.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/exception/constructor.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/exception/constructor.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/exception/getArg.tentative.any.js b/tests/wpt/tests/wasm/jsapi/exception/getArg.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/exception/getArg.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/exception/getArg.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/exception/identity.tentative.any.js b/tests/wpt/tests/wasm/jsapi/exception/identity.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/exception/identity.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/exception/identity.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/exception/is.tentative.any.js b/tests/wpt/tests/wasm/jsapi/exception/is.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/exception/is.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/exception/is.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/exception/toString.tentative.any.js b/tests/wpt/tests/wasm/jsapi/exception/toString.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/exception/toString.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/exception/toString.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/function/call.tentative.any.js b/tests/wpt/tests/wasm/jsapi/function/call.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/function/call.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/function/call.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/function/constructor.tentative.any.js b/tests/wpt/tests/wasm/jsapi/function/constructor.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/function/constructor.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/function/constructor.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/function/table.tentative.any.js b/tests/wpt/tests/wasm/jsapi/function/table.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/function/table.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/function/table.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/function/type.tentative.any.js b/tests/wpt/tests/wasm/jsapi/function/type.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/function/type.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/function/type.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/entry-different-function-realm.html b/tests/wpt/tests/wasm/jsapi/functions/entry-different-function-realm.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/entry-different-function-realm.html rename to tests/wpt/tests/wasm/jsapi/functions/entry-different-function-realm.html diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/entry.html b/tests/wpt/tests/wasm/jsapi/functions/entry.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/entry.html rename to tests/wpt/tests/wasm/jsapi/functions/entry.html diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/helper.js b/tests/wpt/tests/wasm/jsapi/functions/helper.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/helper.js rename to tests/wpt/tests/wasm/jsapi/functions/helper.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/incumbent.html b/tests/wpt/tests/wasm/jsapi/functions/incumbent.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/incumbent.html rename to tests/wpt/tests/wasm/jsapi/functions/incumbent.html diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/README.md b/tests/wpt/tests/wasm/jsapi/functions/resources/README.md similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/README.md rename to tests/wpt/tests/wasm/jsapi/functions/resources/README.md diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/current/current.html b/tests/wpt/tests/wasm/jsapi/functions/resources/current/current.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/current/current.html rename to tests/wpt/tests/wasm/jsapi/functions/resources/current/current.html diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/current/resources/window-to-open.html b/tests/wpt/tests/wasm/jsapi/functions/resources/current/resources/window-to-open.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/current/resources/window-to-open.html rename to tests/wpt/tests/wasm/jsapi/functions/resources/current/resources/window-to-open.html diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/entry-incumbent.html b/tests/wpt/tests/wasm/jsapi/functions/resources/entry-incumbent.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/entry-incumbent.html rename to tests/wpt/tests/wasm/jsapi/functions/resources/entry-incumbent.html diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/function/function.html b/tests/wpt/tests/wasm/jsapi/functions/resources/function/function.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/function/function.html rename to tests/wpt/tests/wasm/jsapi/functions/resources/function/function.html diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/function/resources/window-to-open.html b/tests/wpt/tests/wasm/jsapi/functions/resources/function/resources/window-to-open.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/function/resources/window-to-open.html rename to tests/wpt/tests/wasm/jsapi/functions/resources/function/resources/window-to-open.html diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/incumbent-incumbent.html b/tests/wpt/tests/wasm/jsapi/functions/resources/incumbent-incumbent.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/incumbent-incumbent.html rename to tests/wpt/tests/wasm/jsapi/functions/resources/incumbent-incumbent.html diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/relevant/relevant.html b/tests/wpt/tests/wasm/jsapi/functions/resources/relevant/relevant.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/relevant/relevant.html rename to tests/wpt/tests/wasm/jsapi/functions/resources/relevant/relevant.html diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/relevant/resources/window-to-open.html b/tests/wpt/tests/wasm/jsapi/functions/resources/relevant/resources/window-to-open.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/relevant/resources/window-to-open.html rename to tests/wpt/tests/wasm/jsapi/functions/resources/relevant/resources/window-to-open.html diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/resources/window-to-open.html b/tests/wpt/tests/wasm/jsapi/functions/resources/resources/window-to-open.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/resources/window-to-open.html rename to tests/wpt/tests/wasm/jsapi/functions/resources/resources/window-to-open.html diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/window-to-open.html b/tests/wpt/tests/wasm/jsapi/functions/resources/window-to-open.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/functions/resources/window-to-open.html rename to tests/wpt/tests/wasm/jsapi/functions/resources/window-to-open.html diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/global/constructor.any.js b/tests/wpt/tests/wasm/jsapi/global/constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/global/constructor.any.js rename to tests/wpt/tests/wasm/jsapi/global/constructor.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/global/toString.any.js b/tests/wpt/tests/wasm/jsapi/global/toString.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/global/toString.any.js rename to tests/wpt/tests/wasm/jsapi/global/toString.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/global/type.tentative.any.js b/tests/wpt/tests/wasm/jsapi/global/type.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/global/type.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/global/type.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/global/value-get-set.any.js b/tests/wpt/tests/wasm/jsapi/global/value-get-set.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/global/value-get-set.any.js rename to tests/wpt/tests/wasm/jsapi/global/value-get-set.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/global/valueOf.any.js b/tests/wpt/tests/wasm/jsapi/global/valueOf.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/global/valueOf.any.js rename to tests/wpt/tests/wasm/jsapi/global/valueOf.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/idlharness.any.js b/tests/wpt/tests/wasm/jsapi/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/idlharness.any.js rename to tests/wpt/tests/wasm/jsapi/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/instance/constructor-bad-imports.any.js b/tests/wpt/tests/wasm/jsapi/instance/constructor-bad-imports.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/instance/constructor-bad-imports.any.js rename to tests/wpt/tests/wasm/jsapi/instance/constructor-bad-imports.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/instance/constructor-caching.any.js b/tests/wpt/tests/wasm/jsapi/instance/constructor-caching.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/instance/constructor-caching.any.js rename to tests/wpt/tests/wasm/jsapi/instance/constructor-caching.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/instance/constructor.any.js b/tests/wpt/tests/wasm/jsapi/instance/constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/instance/constructor.any.js rename to tests/wpt/tests/wasm/jsapi/instance/constructor.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/instance/exports.any.js b/tests/wpt/tests/wasm/jsapi/instance/exports.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/instance/exports.any.js rename to tests/wpt/tests/wasm/jsapi/instance/exports.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/instance/toString.any.js b/tests/wpt/tests/wasm/jsapi/instance/toString.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/instance/toString.any.js rename to tests/wpt/tests/wasm/jsapi/instance/toString.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/instanceTestFactory.js b/tests/wpt/tests/wasm/jsapi/instanceTestFactory.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/instanceTestFactory.js rename to tests/wpt/tests/wasm/jsapi/instanceTestFactory.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/interface.any.js b/tests/wpt/tests/wasm/jsapi/interface.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/interface.any.js rename to tests/wpt/tests/wasm/jsapi/interface.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/memory/assertions.js b/tests/wpt/tests/wasm/jsapi/memory/assertions.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/memory/assertions.js rename to tests/wpt/tests/wasm/jsapi/memory/assertions.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/memory/buffer.any.js b/tests/wpt/tests/wasm/jsapi/memory/buffer.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/memory/buffer.any.js rename to tests/wpt/tests/wasm/jsapi/memory/buffer.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/memory/constructor-shared.tentative.any.js b/tests/wpt/tests/wasm/jsapi/memory/constructor-shared.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/memory/constructor-shared.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/memory/constructor-shared.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/memory/constructor-types.tentative.any.js b/tests/wpt/tests/wasm/jsapi/memory/constructor-types.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/memory/constructor-types.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/memory/constructor-types.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/memory/constructor.any.js b/tests/wpt/tests/wasm/jsapi/memory/constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/memory/constructor.any.js rename to tests/wpt/tests/wasm/jsapi/memory/constructor.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/memory/grow.any.js b/tests/wpt/tests/wasm/jsapi/memory/grow.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/memory/grow.any.js rename to tests/wpt/tests/wasm/jsapi/memory/grow.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/memory/toString.any.js b/tests/wpt/tests/wasm/jsapi/memory/toString.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/memory/toString.any.js rename to tests/wpt/tests/wasm/jsapi/memory/toString.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/memory/type.tentative.any.js b/tests/wpt/tests/wasm/jsapi/memory/type.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/memory/type.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/memory/type.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/module/constructor.any.js b/tests/wpt/tests/wasm/jsapi/module/constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/module/constructor.any.js rename to tests/wpt/tests/wasm/jsapi/module/constructor.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/module/customSections.any.js b/tests/wpt/tests/wasm/jsapi/module/customSections.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/module/customSections.any.js rename to tests/wpt/tests/wasm/jsapi/module/customSections.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/module/exports.any.js b/tests/wpt/tests/wasm/jsapi/module/exports.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/module/exports.any.js rename to tests/wpt/tests/wasm/jsapi/module/exports.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/module/imports.any.js b/tests/wpt/tests/wasm/jsapi/module/imports.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/module/imports.any.js rename to tests/wpt/tests/wasm/jsapi/module/imports.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/module/toString.any.js b/tests/wpt/tests/wasm/jsapi/module/toString.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/module/toString.any.js rename to tests/wpt/tests/wasm/jsapi/module/toString.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/proto-from-ctor-realm.html b/tests/wpt/tests/wasm/jsapi/proto-from-ctor-realm.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/proto-from-ctor-realm.html rename to tests/wpt/tests/wasm/jsapi/proto-from-ctor-realm.html diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/prototypes.any.js b/tests/wpt/tests/wasm/jsapi/prototypes.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/prototypes.any.js rename to tests/wpt/tests/wasm/jsapi/prototypes.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/assertions.js b/tests/wpt/tests/wasm/jsapi/table/assertions.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/table/assertions.js rename to tests/wpt/tests/wasm/jsapi/table/assertions.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor-types.tentative.any.js b/tests/wpt/tests/wasm/jsapi/table/constructor-types.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/table/constructor-types.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/table/constructor-types.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor.any.js b/tests/wpt/tests/wasm/jsapi/table/constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/table/constructor.any.js rename to tests/wpt/tests/wasm/jsapi/table/constructor.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/get-set.any.js b/tests/wpt/tests/wasm/jsapi/table/get-set.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/table/get-set.any.js rename to tests/wpt/tests/wasm/jsapi/table/get-set.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/grow.any.js b/tests/wpt/tests/wasm/jsapi/table/grow.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/table/grow.any.js rename to tests/wpt/tests/wasm/jsapi/table/grow.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/length.any.js b/tests/wpt/tests/wasm/jsapi/table/length.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/table/length.any.js rename to tests/wpt/tests/wasm/jsapi/table/length.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/toString.any.js b/tests/wpt/tests/wasm/jsapi/table/toString.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/table/toString.any.js rename to tests/wpt/tests/wasm/jsapi/table/toString.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/type.tentative.any.js b/tests/wpt/tests/wasm/jsapi/table/type.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/table/type.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/table/type.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/tag/constructor.tentative.any.js b/tests/wpt/tests/wasm/jsapi/tag/constructor.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/tag/constructor.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/tag/constructor.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/tag/toString.tentative.any.js b/tests/wpt/tests/wasm/jsapi/tag/toString.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/tag/toString.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/tag/toString.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/tag/type.tentative.any.js b/tests/wpt/tests/wasm/jsapi/tag/type.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/tag/type.tentative.any.js rename to tests/wpt/tests/wasm/jsapi/tag/type.tentative.any.js diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/wasm-module-builder.js b/tests/wpt/tests/wasm/jsapi/wasm-module-builder.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/jsapi/wasm-module-builder.js rename to tests/wpt/tests/wasm/jsapi/wasm-module-builder.js diff --git a/tests/wpt/web-platform-tests/wasm/resources/load_wasm.js b/tests/wpt/tests/wasm/resources/load_wasm.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/resources/load_wasm.js rename to tests/wpt/tests/wasm/resources/load_wasm.js diff --git a/tests/wpt/web-platform-tests/wasm/serialization/arraybuffer/transfer.window.js b/tests/wpt/tests/wasm/serialization/arraybuffer/transfer.window.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/arraybuffer/transfer.window.js rename to tests/wpt/tests/wasm/serialization/arraybuffer/transfer.window.js diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/broadcastchannel-success-and-failure.html b/tests/wpt/tests/wasm/serialization/module/broadcastchannel-success-and-failure.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/broadcastchannel-success-and-failure.html rename to tests/wpt/tests/wasm/serialization/module/broadcastchannel-success-and-failure.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/broadcastchannel-success.html b/tests/wpt/tests/wasm/serialization/module/broadcastchannel-success.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/broadcastchannel-success.html rename to tests/wpt/tests/wasm/serialization/module/broadcastchannel-success.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/cross-origin-module-sharing-fails.html b/tests/wpt/tests/wasm/serialization/module/cross-origin-module-sharing-fails.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/cross-origin-module-sharing-fails.html rename to tests/wpt/tests/wasm/serialization/module/cross-origin-module-sharing-fails.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/identity-not-preserved.html b/tests/wpt/tests/wasm/serialization/module/identity-not-preserved.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/identity-not-preserved.html rename to tests/wpt/tests/wasm/serialization/module/identity-not-preserved.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/incrementer.wasm b/tests/wpt/tests/wasm/serialization/module/incrementer.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/incrementer.wasm rename to tests/wpt/tests/wasm/serialization/module/incrementer.wasm diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/nested-worker-success.any.js b/tests/wpt/tests/wasm/serialization/module/nested-worker-success.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/nested-worker-success.any.js rename to tests/wpt/tests/wasm/serialization/module/nested-worker-success.any.js diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/no-transferring.html b/tests/wpt/tests/wasm/serialization/module/no-transferring.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/no-transferring.html rename to tests/wpt/tests/wasm/serialization/module/no-transferring.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/blank.html b/tests/wpt/tests/wasm/serialization/module/resources/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/blank.html rename to tests/wpt/tests/wasm/serialization/module/resources/blank.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/broadcastchannel-iframe.html b/tests/wpt/tests/wasm/serialization/module/resources/broadcastchannel-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/broadcastchannel-iframe.html rename to tests/wpt/tests/wasm/serialization/module/resources/broadcastchannel-iframe.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/broadcastchannel-sharedworker.js b/tests/wpt/tests/wasm/serialization/module/resources/broadcastchannel-sharedworker.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/broadcastchannel-sharedworker.js rename to tests/wpt/tests/wasm/serialization/module/resources/broadcastchannel-sharedworker.js diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/broadcastchannel-worker.js b/tests/wpt/tests/wasm/serialization/module/resources/broadcastchannel-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/broadcastchannel-worker.js rename to tests/wpt/tests/wasm/serialization/module/resources/broadcastchannel-worker.js diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/create-empty-wasm-module.js b/tests/wpt/tests/wasm/serialization/module/resources/create-empty-wasm-module.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/create-empty-wasm-module.js rename to tests/wpt/tests/wasm/serialization/module/resources/create-empty-wasm-module.js diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/echo-iframe.html b/tests/wpt/tests/wasm/serialization/module/resources/echo-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/echo-iframe.html rename to tests/wpt/tests/wasm/serialization/module/resources/echo-iframe.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/echo-worker.js b/tests/wpt/tests/wasm/serialization/module/resources/echo-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/echo-worker.js rename to tests/wpt/tests/wasm/serialization/module/resources/echo-worker.js diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/incrementer-iframe-domain.sub.html b/tests/wpt/tests/wasm/serialization/module/resources/incrementer-iframe-domain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/incrementer-iframe-domain.sub.html rename to tests/wpt/tests/wasm/serialization/module/resources/incrementer-iframe-domain.sub.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/incrementer-iframe-failure.html b/tests/wpt/tests/wasm/serialization/module/resources/incrementer-iframe-failure.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/incrementer-iframe-failure.html rename to tests/wpt/tests/wasm/serialization/module/resources/incrementer-iframe-failure.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/incrementer-iframe.html b/tests/wpt/tests/wasm/serialization/module/resources/incrementer-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/incrementer-iframe.html rename to tests/wpt/tests/wasm/serialization/module/resources/incrementer-iframe.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/incrementer-popup.html b/tests/wpt/tests/wasm/serialization/module/resources/incrementer-popup.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/incrementer-popup.html rename to tests/wpt/tests/wasm/serialization/module/resources/incrementer-popup.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/incrementer-worker-with-channel.js b/tests/wpt/tests/wasm/serialization/module/resources/incrementer-worker-with-channel.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/incrementer-worker-with-channel.js rename to tests/wpt/tests/wasm/serialization/module/resources/incrementer-worker-with-channel.js diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/incrementer-worker.js b/tests/wpt/tests/wasm/serialization/module/resources/incrementer-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/incrementer-worker.js rename to tests/wpt/tests/wasm/serialization/module/resources/incrementer-worker.js diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/incrementer.wasm b/tests/wpt/tests/wasm/serialization/module/resources/incrementer.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/incrementer.wasm rename to tests/wpt/tests/wasm/serialization/module/resources/incrementer.wasm diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/nested-iframe-1.html b/tests/wpt/tests/wasm/serialization/module/resources/nested-iframe-1.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/nested-iframe-1.html rename to tests/wpt/tests/wasm/serialization/module/resources/nested-iframe-1.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/nested-iframe-2.html b/tests/wpt/tests/wasm/serialization/module/resources/nested-iframe-2.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/nested-iframe-2.html rename to tests/wpt/tests/wasm/serialization/module/resources/nested-iframe-2.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/nested-iframe-3.html b/tests/wpt/tests/wasm/serialization/module/resources/nested-iframe-3.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/nested-iframe-3.html rename to tests/wpt/tests/wasm/serialization/module/resources/nested-iframe-3.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/nested-iframe-4-incrementer.html b/tests/wpt/tests/wasm/serialization/module/resources/nested-iframe-4-incrementer.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/nested-iframe-4-incrementer.html rename to tests/wpt/tests/wasm/serialization/module/resources/nested-iframe-4-incrementer.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/serviceworker-failure.js b/tests/wpt/tests/wasm/serialization/module/resources/serviceworker-failure.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/serviceworker-failure.js rename to tests/wpt/tests/wasm/serialization/module/resources/serviceworker-failure.js diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/sharedworker-failure.js b/tests/wpt/tests/wasm/serialization/module/resources/sharedworker-failure.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/sharedworker-failure.js rename to tests/wpt/tests/wasm/serialization/module/resources/sharedworker-failure.js diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/resources/test-incrementer.js b/tests/wpt/tests/wasm/serialization/module/resources/test-incrementer.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/resources/test-incrementer.js rename to tests/wpt/tests/wasm/serialization/module/resources/test-incrementer.js diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/serialization-via-history.html b/tests/wpt/tests/wasm/serialization/module/serialization-via-history.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/serialization-via-history.html rename to tests/wpt/tests/wasm/serialization/module/serialization-via-history.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/serialization-via-idb.any.js b/tests/wpt/tests/wasm/serialization/module/serialization-via-idb.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/serialization-via-idb.any.js rename to tests/wpt/tests/wasm/serialization/module/serialization-via-idb.any.js diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/serialization-via-notifications-api.any.js b/tests/wpt/tests/wasm/serialization/module/serialization-via-notifications-api.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/serialization-via-notifications-api.any.js rename to tests/wpt/tests/wasm/serialization/module/serialization-via-notifications-api.any.js diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/share-module-cross-origin-fails.sub.html b/tests/wpt/tests/wasm/serialization/module/share-module-cross-origin-fails.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/share-module-cross-origin-fails.sub.html rename to tests/wpt/tests/wasm/serialization/module/share-module-cross-origin-fails.sub.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/window-domain-success.sub.html b/tests/wpt/tests/wasm/serialization/module/window-domain-success.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/window-domain-success.sub.html rename to tests/wpt/tests/wasm/serialization/module/window-domain-success.sub.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/window-messagechannel-success.html b/tests/wpt/tests/wasm/serialization/module/window-messagechannel-success.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/window-messagechannel-success.html rename to tests/wpt/tests/wasm/serialization/module/window-messagechannel-success.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/window-serviceworker-failure.https.html b/tests/wpt/tests/wasm/serialization/module/window-serviceworker-failure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/window-serviceworker-failure.https.html rename to tests/wpt/tests/wasm/serialization/module/window-serviceworker-failure.https.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/window-sharedworker-failure.html b/tests/wpt/tests/wasm/serialization/module/window-sharedworker-failure.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/window-sharedworker-failure.html rename to tests/wpt/tests/wasm/serialization/module/window-sharedworker-failure.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/window-similar-but-cross-origin-success.sub.html b/tests/wpt/tests/wasm/serialization/module/window-similar-but-cross-origin-success.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/window-similar-but-cross-origin-success.sub.html rename to tests/wpt/tests/wasm/serialization/module/window-similar-but-cross-origin-success.sub.html diff --git a/tests/wpt/web-platform-tests/wasm/serialization/module/window-simple-success.html b/tests/wpt/tests/wasm/serialization/module/window-simple-success.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/serialization/module/window-simple-success.html rename to tests/wpt/tests/wasm/serialization/module/window-simple-success.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/META.yml b/tests/wpt/tests/wasm/webapi/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/META.yml rename to tests/wpt/tests/wasm/webapi/META.yml diff --git a/tests/wpt/web-platform-tests/wasm/webapi/abort.any.js b/tests/wpt/tests/wasm/webapi/abort.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/abort.any.js rename to tests/wpt/tests/wasm/webapi/abort.any.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/body.any.js b/tests/wpt/tests/wasm/webapi/body.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/body.any.js rename to tests/wpt/tests/wasm/webapi/body.any.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/contenttype.any.js b/tests/wpt/tests/wasm/webapi/contenttype.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/contenttype.any.js rename to tests/wpt/tests/wasm/webapi/contenttype.any.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/empty-body.any.js b/tests/wpt/tests/wasm/webapi/empty-body.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/empty-body.any.js rename to tests/wpt/tests/wasm/webapi/empty-body.any.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/execute-start.tentative.html b/tests/wpt/tests/wasm/webapi/esm-integration/execute-start.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/execute-start.tentative.html rename to tests/wpt/tests/wasm/webapi/esm-integration/execute-start.tentative.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/exported-names.tentative.html b/tests/wpt/tests/wasm/webapi/esm-integration/exported-names.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/exported-names.tentative.html rename to tests/wpt/tests/wasm/webapi/esm-integration/exported-names.tentative.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/invalid-bytecode.tentative.html b/tests/wpt/tests/wasm/webapi/esm-integration/invalid-bytecode.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/invalid-bytecode.tentative.html rename to tests/wpt/tests/wasm/webapi/esm-integration/invalid-bytecode.tentative.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/js-wasm-cycle-errors.tentative.html b/tests/wpt/tests/wasm/webapi/esm-integration/js-wasm-cycle-errors.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/js-wasm-cycle-errors.tentative.html rename to tests/wpt/tests/wasm/webapi/esm-integration/js-wasm-cycle-errors.tentative.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/js-wasm-cycle.tentative.html b/tests/wpt/tests/wasm/webapi/esm-integration/js-wasm-cycle.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/js-wasm-cycle.tentative.html rename to tests/wpt/tests/wasm/webapi/esm-integration/js-wasm-cycle.tentative.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/module-parse-error.tentative.html b/tests/wpt/tests/wasm/webapi/esm-integration/module-parse-error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/module-parse-error.tentative.html rename to tests/wpt/tests/wasm/webapi/esm-integration/module-parse-error.tentative.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resolve-export.js b/tests/wpt/tests/wasm/webapi/esm-integration/resolve-export.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resolve-export.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resolve-export.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resolve-export.tentative.html b/tests/wpt/tests/wasm/webapi/esm-integration/resolve-export.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resolve-export.tentative.html rename to tests/wpt/tests/wasm/webapi/esm-integration/resolve-export.tentative.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/execute-start.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/execute-start.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/execute-start.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/execute-start.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/exported-names.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/exported-names.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/exported-names.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/exported-names.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/invalid-bytecode.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/invalid-bytecode.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/invalid-bytecode.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/invalid-bytecode.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/invalid-module.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/invalid-module.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/invalid-module.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/invalid-module.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-function-error.js b/tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-function-error.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-function-error.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-function-error.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-function-error.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-function-error.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-function-error.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-function-error.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-global.js b/tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-global.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-global.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-global.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-global.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-global.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-global.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-global.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-memory.js b/tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-memory.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-memory.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-memory.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-memory.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-memory.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-memory.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-memory.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-table.js b/tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-table.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-table.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-table.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-table.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-table.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-table.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-table.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-value.js b/tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-value.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-value.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-value.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-value.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-value.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-value.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle-value.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle.js b/tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/js-wasm-cycle.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/js-wasm-cycle.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/log.js b/tests/wpt/tests/wasm/webapi/esm-integration/resources/log.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/log.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/log.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/resolve-export.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/resolve-export.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/resolve-export.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/resolve-export.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-export-i64-global.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-export-i64-global.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-export-i64-global.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-export-i64-global.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-export-to-wasm.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-export-to-wasm.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-export-to-wasm.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-export-to-wasm.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-error-from-wasm.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-error-from-wasm.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-error-from-wasm.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-error-from-wasm.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-from-wasm.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-from-wasm.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-from-wasm.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-from-wasm.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-func.js b/tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-func.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-func.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-func.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-func.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-func.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-func.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-func.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-global.js b/tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-global.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-global.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-global.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-global.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-global.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-global.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-global.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-memory.js b/tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-memory.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-memory.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-memory.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-memory.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-memory.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-memory.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-memory.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-table.js b/tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-table.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-table.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-table.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-table.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-table.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-import-table.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-import-table.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-js-cycle.js b/tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-js-cycle.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-js-cycle.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-js-cycle.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-js-cycle.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-js-cycle.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/wasm-js-cycle.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/wasm-js-cycle.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/worker-helper.js b/tests/wpt/tests/wasm/webapi/esm-integration/resources/worker-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/worker-helper.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/worker-helper.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/worker.js b/tests/wpt/tests/wasm/webapi/esm-integration/resources/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/worker.js rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/worker.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/worker.wasm b/tests/wpt/tests/wasm/webapi/esm-integration/resources/worker.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/resources/worker.wasm rename to tests/wpt/tests/wasm/webapi/esm-integration/resources/worker.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/wasm-import-wasm-export.tentative.html b/tests/wpt/tests/wasm/webapi/esm-integration/wasm-import-wasm-export.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/wasm-import-wasm-export.tentative.html rename to tests/wpt/tests/wasm/webapi/esm-integration/wasm-import-wasm-export.tentative.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/wasm-import.tentative.html b/tests/wpt/tests/wasm/webapi/esm-integration/wasm-import.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/wasm-import.tentative.html rename to tests/wpt/tests/wasm/webapi/esm-integration/wasm-import.tentative.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/wasm-js-cycle.tentative.html b/tests/wpt/tests/wasm/webapi/esm-integration/wasm-js-cycle.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/wasm-js-cycle.tentative.html rename to tests/wpt/tests/wasm/webapi/esm-integration/wasm-js-cycle.tentative.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/wasm-to-wasm-link-error.tentative.html b/tests/wpt/tests/wasm/webapi/esm-integration/wasm-to-wasm-link-error.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/wasm-to-wasm-link-error.tentative.html rename to tests/wpt/tests/wasm/webapi/esm-integration/wasm-to-wasm-link-error.tentative.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/worker-import.tentative.html b/tests/wpt/tests/wasm/webapi/esm-integration/worker-import.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/worker-import.tentative.html rename to tests/wpt/tests/wasm/webapi/esm-integration/worker-import.tentative.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/esm-integration/worker.tentative.html b/tests/wpt/tests/wasm/webapi/esm-integration/worker.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/esm-integration/worker.tentative.html rename to tests/wpt/tests/wasm/webapi/esm-integration/worker.tentative.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/historical.any.js b/tests/wpt/tests/wasm/webapi/historical.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/historical.any.js rename to tests/wpt/tests/wasm/webapi/historical.any.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/idlharness.any.js b/tests/wpt/tests/wasm/webapi/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/idlharness.any.js rename to tests/wpt/tests/wasm/webapi/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/instantiateStreaming-bad-imports.any.js b/tests/wpt/tests/wasm/webapi/instantiateStreaming-bad-imports.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/instantiateStreaming-bad-imports.any.js rename to tests/wpt/tests/wasm/webapi/instantiateStreaming-bad-imports.any.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/instantiateStreaming.any.js b/tests/wpt/tests/wasm/webapi/instantiateStreaming.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/instantiateStreaming.any.js rename to tests/wpt/tests/wasm/webapi/instantiateStreaming.any.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/invalid-args.any.js b/tests/wpt/tests/wasm/webapi/invalid-args.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/invalid-args.any.js rename to tests/wpt/tests/wasm/webapi/invalid-args.any.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/invalid-code.any.js b/tests/wpt/tests/wasm/webapi/invalid-code.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/invalid-code.any.js rename to tests/wpt/tests/wasm/webapi/invalid-code.any.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/modified-contenttype.any.js b/tests/wpt/tests/wasm/webapi/modified-contenttype.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/modified-contenttype.any.js rename to tests/wpt/tests/wasm/webapi/modified-contenttype.any.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/origin.sub.any.js b/tests/wpt/tests/wasm/webapi/origin.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/origin.sub.any.js rename to tests/wpt/tests/wasm/webapi/origin.sub.any.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/rejected-arg.any.js b/tests/wpt/tests/wasm/webapi/rejected-arg.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/rejected-arg.any.js rename to tests/wpt/tests/wasm/webapi/rejected-arg.any.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/resources/incrementer.no_mime_type.wasm b/tests/wpt/tests/wasm/webapi/resources/incrementer.no_mime_type.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/resources/incrementer.no_mime_type.wasm rename to tests/wpt/tests/wasm/webapi/resources/incrementer.no_mime_type.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/resources/incrementer.wasm b/tests/wpt/tests/wasm/webapi/resources/incrementer.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/resources/incrementer.wasm rename to tests/wpt/tests/wasm/webapi/resources/incrementer.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/resources/incrementer.wasm.headers b/tests/wpt/tests/wasm/webapi/resources/incrementer.wasm.headers similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/resources/incrementer.wasm.headers rename to tests/wpt/tests/wasm/webapi/resources/incrementer.wasm.headers diff --git a/tests/wpt/web-platform-tests/wasm/webapi/resources/incrementer.wrong_mime_type.wasm b/tests/wpt/tests/wasm/webapi/resources/incrementer.wrong_mime_type.wasm similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/resources/incrementer.wrong_mime_type.wasm rename to tests/wpt/tests/wasm/webapi/resources/incrementer.wrong_mime_type.wasm diff --git a/tests/wpt/web-platform-tests/wasm/webapi/resources/incrementer.wrong_mime_type.wasm.headers b/tests/wpt/tests/wasm/webapi/resources/incrementer.wrong_mime_type.wasm.headers similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/resources/incrementer.wrong_mime_type.wasm.headers rename to tests/wpt/tests/wasm/webapi/resources/incrementer.wrong_mime_type.wasm.headers diff --git a/tests/wpt/web-platform-tests/wasm/webapi/status.any.js b/tests/wpt/tests/wasm/webapi/status.any.js similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/status.any.js rename to tests/wpt/tests/wasm/webapi/status.any.js diff --git a/tests/wpt/web-platform-tests/wasm/webapi/status.py b/tests/wpt/tests/wasm/webapi/status.py similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/status.py rename to tests/wpt/tests/wasm/webapi/status.py diff --git a/tests/wpt/web-platform-tests/wasm/webapi/wasm_stream_compile_test.html b/tests/wpt/tests/wasm/webapi/wasm_stream_compile_test.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/wasm_stream_compile_test.html rename to tests/wpt/tests/wasm/webapi/wasm_stream_compile_test.html diff --git a/tests/wpt/web-platform-tests/wasm/webapi/wasm_stream_instantiate_test.html b/tests/wpt/tests/wasm/webapi/wasm_stream_instantiate_test.html similarity index 100% rename from tests/wpt/web-platform-tests/wasm/webapi/wasm_stream_instantiate_test.html rename to tests/wpt/tests/wasm/webapi/wasm_stream_instantiate_test.html diff --git a/tests/wpt/web-platform-tests/web-animations/META.yml b/tests/wpt/tests/web-animations/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/META.yml rename to tests/wpt/tests/web-animations/META.yml diff --git a/tests/wpt/web-platform-tests/web-animations/README.md b/tests/wpt/tests/web-animations/README.md similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/README.md rename to tests/wpt/tests/web-animations/README.md diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001.html b/tests/wpt/tests/web-animations/animation-model/animation-types/accumulation-per-property-001.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001.html rename to tests/wpt/tests/web-animations/animation-model/animation-types/accumulation-per-property-001.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002.html b/tests/wpt/tests/web-animations/animation-model/animation-types/accumulation-per-property-002.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002.html rename to tests/wpt/tests/web-animations/animation-model/animation-types/accumulation-per-property-002.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001.html b/tests/wpt/tests/web-animations/animation-model/animation-types/addition-per-property-001.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001.html rename to tests/wpt/tests/web-animations/animation-model/animation-types/addition-per-property-001.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002.html b/tests/wpt/tests/web-animations/animation-model/animation-types/addition-per-property-002.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002.html rename to tests/wpt/tests/web-animations/animation-model/animation-types/addition-per-property-002.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/discrete.html b/tests/wpt/tests/web-animations/animation-model/animation-types/discrete.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/discrete.html rename to tests/wpt/tests/web-animations/animation-model/animation-types/discrete.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/display.tentative.html b/tests/wpt/tests/web-animations/animation-model/animation-types/display.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/display.tentative.html rename to tests/wpt/tests/web-animations/animation-model/animation-types/display.tentative.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001.html b/tests/wpt/tests/web-animations/animation-model/animation-types/interpolation-per-property-001.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001.html rename to tests/wpt/tests/web-animations/animation-model/animation-types/interpolation-per-property-001.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002.html b/tests/wpt/tests/web-animations/animation-model/animation-types/interpolation-per-property-002.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002.html rename to tests/wpt/tests/web-animations/animation-model/animation-types/interpolation-per-property-002.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/property-list.js b/tests/wpt/tests/web-animations/animation-model/animation-types/property-list.js similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/property-list.js rename to tests/wpt/tests/web-animations/animation-model/animation-types/property-list.js diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/property-types.js b/tests/wpt/tests/web-animations/animation-model/animation-types/property-types.js similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/property-types.js rename to tests/wpt/tests/web-animations/animation-model/animation-types/property-types.js diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/property-utils.js b/tests/wpt/tests/web-animations/animation-model/animation-types/property-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/property-utils.js rename to tests/wpt/tests/web-animations/animation-model/animation-types/property-utils.js diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/visibility.html b/tests/wpt/tests/web-animations/animation-model/animation-types/visibility.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/visibility.html rename to tests/wpt/tests/web-animations/animation-model/animation-types/visibility.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/combining-effects/applying-interpolated-transform.html b/tests/wpt/tests/web-animations/animation-model/combining-effects/applying-interpolated-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/combining-effects/applying-interpolated-transform.html rename to tests/wpt/tests/web-animations/animation-model/combining-effects/applying-interpolated-transform.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/combining-effects/applying-the-composited-result.html b/tests/wpt/tests/web-animations/animation-model/combining-effects/applying-the-composited-result.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/combining-effects/applying-the-composited-result.html rename to tests/wpt/tests/web-animations/animation-model/combining-effects/applying-the-composited-result.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/combining-effects/effect-composition.html b/tests/wpt/tests/web-animations/animation-model/combining-effects/effect-composition.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/combining-effects/effect-composition.html rename to tests/wpt/tests/web-animations/animation-model/combining-effects/effect-composition.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/computed-keyframes-shorthands.html b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/computed-keyframes-shorthands.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/computed-keyframes-shorthands.html rename to tests/wpt/tests/web-animations/animation-model/keyframe-effects/computed-keyframes-shorthands.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-in-removed-iframe-crash.html b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-in-removed-iframe-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-in-removed-iframe-crash.html rename to tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-in-removed-iframe-crash.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-on-marquee-parent-crash.html b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-on-marquee-parent-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-on-marquee-parent-crash.html rename to tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-on-marquee-parent-crash.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-context-filling.html b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-context-filling.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-context-filling.html rename to tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-context-filling.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-context.html b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-context.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-context.html rename to tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-context.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-interval-distance.html b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-interval-distance.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-interval-distance.html rename to tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-interval-distance.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-iteration-composite-operation.html b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-iteration-composite-operation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-iteration-composite-operation.html rename to tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-iteration-composite-operation.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-overlapping-keyframes.html b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-overlapping-keyframes.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-overlapping-keyframes.html rename to tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-overlapping-keyframes.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-replaced-animations.html b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-replaced-animations.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-replaced-animations.html rename to tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-replaced-animations.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-transformed-distance.html b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-transformed-distance.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/effect-value-transformed-distance.html rename to tests/wpt/tests/web-animations/animation-model/keyframe-effects/effect-value-transformed-distance.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/keyframe-exceptions.html b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/keyframe-exceptions.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/keyframe-exceptions.html rename to tests/wpt/tests/web-animations/animation-model/keyframe-effects/keyframe-exceptions.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/transform-and-opacity-on-inline-001-ref.html b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/transform-and-opacity-on-inline-001-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/transform-and-opacity-on-inline-001-ref.html rename to tests/wpt/tests/web-animations/animation-model/keyframe-effects/transform-and-opacity-on-inline-001-ref.html diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/transform-and-opacity-on-inline-001.html b/tests/wpt/tests/web-animations/animation-model/keyframe-effects/transform-and-opacity-on-inline-001.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/animation-model/keyframe-effects/transform-and-opacity-on-inline-001.html rename to tests/wpt/tests/web-animations/animation-model/keyframe-effects/transform-and-opacity-on-inline-001.html diff --git a/tests/wpt/web-platform-tests/web-animations/crashtests/get-computed-timing-crash.html b/tests/wpt/tests/web-animations/crashtests/get-computed-timing-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/crashtests/get-computed-timing-crash.html rename to tests/wpt/tests/web-animations/crashtests/get-computed-timing-crash.html diff --git a/tests/wpt/web-platform-tests/web-animations/crashtests/infinite-active-duration.html b/tests/wpt/tests/web-animations/crashtests/infinite-active-duration.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/crashtests/infinite-active-duration.html rename to tests/wpt/tests/web-animations/crashtests/infinite-active-duration.html diff --git a/tests/wpt/web-platform-tests/web-animations/crashtests/partially-overlapping-animations-one-not-current-001.html b/tests/wpt/tests/web-animations/crashtests/partially-overlapping-animations-one-not-current-001.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/crashtests/partially-overlapping-animations-one-not-current-001.html rename to tests/wpt/tests/web-animations/crashtests/partially-overlapping-animations-one-not-current-001.html diff --git a/tests/wpt/web-platform-tests/web-animations/crashtests/reparent-animating-element-001.html b/tests/wpt/tests/web-animations/crashtests/reparent-animating-element-001.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/crashtests/reparent-animating-element-001.html rename to tests/wpt/tests/web-animations/crashtests/reparent-animating-element-001.html diff --git a/tests/wpt/web-platform-tests/web-animations/crashtests/reparent-animating-element-002.html b/tests/wpt/tests/web-animations/crashtests/reparent-animating-element-002.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/crashtests/reparent-animating-element-002.html rename to tests/wpt/tests/web-animations/crashtests/reparent-animating-element-002.html diff --git a/tests/wpt/web-platform-tests/web-animations/idlharness.window.js b/tests/wpt/tests/web-animations/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/idlharness.window.js rename to tests/wpt/tests/web-animations/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/animate-no-browsing-context.html b/tests/wpt/tests/web-animations/interfaces/Animatable/animate-no-browsing-context.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/animate-no-browsing-context.html rename to tests/wpt/tests/web-animations/interfaces/Animatable/animate-no-browsing-context.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/animate.html b/tests/wpt/tests/web-animations/interfaces/Animatable/animate.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/animate.html rename to tests/wpt/tests/web-animations/interfaces/Animatable/animate.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations-iframe.html b/tests/wpt/tests/web-animations/interfaces/Animatable/getAnimations-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations-iframe.html rename to tests/wpt/tests/web-animations/interfaces/Animatable/getAnimations-iframe.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations.html b/tests/wpt/tests/web-animations/interfaces/Animatable/getAnimations.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations.html rename to tests/wpt/tests/web-animations/interfaces/Animatable/getAnimations.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/cancel.html b/tests/wpt/tests/web-animations/interfaces/Animation/cancel.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/cancel.html rename to tests/wpt/tests/web-animations/interfaces/Animation/cancel.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/commitStyles-crash.html b/tests/wpt/tests/web-animations/interfaces/Animation/commitStyles-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/commitStyles-crash.html rename to tests/wpt/tests/web-animations/interfaces/Animation/commitStyles-crash.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/commitStyles-svg-crash.html b/tests/wpt/tests/web-animations/interfaces/Animation/commitStyles-svg-crash.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/commitStyles-svg-crash.html rename to tests/wpt/tests/web-animations/interfaces/Animation/commitStyles-svg-crash.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/commitStyles.html b/tests/wpt/tests/web-animations/interfaces/Animation/commitStyles.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/commitStyles.html rename to tests/wpt/tests/web-animations/interfaces/Animation/commitStyles.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/constructor.html b/tests/wpt/tests/web-animations/interfaces/Animation/constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/constructor.html rename to tests/wpt/tests/web-animations/interfaces/Animation/constructor.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/effect.html b/tests/wpt/tests/web-animations/interfaces/Animation/effect.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/effect.html rename to tests/wpt/tests/web-animations/interfaces/Animation/effect.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/finished.html b/tests/wpt/tests/web-animations/interfaces/Animation/finished.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/finished.html rename to tests/wpt/tests/web-animations/interfaces/Animation/finished.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/id.html b/tests/wpt/tests/web-animations/interfaces/Animation/id.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/id.html rename to tests/wpt/tests/web-animations/interfaces/Animation/id.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/oncancel.html b/tests/wpt/tests/web-animations/interfaces/Animation/oncancel.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/oncancel.html rename to tests/wpt/tests/web-animations/interfaces/Animation/oncancel.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/onfinish.html b/tests/wpt/tests/web-animations/interfaces/Animation/onfinish.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/onfinish.html rename to tests/wpt/tests/web-animations/interfaces/Animation/onfinish.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/onremove.html b/tests/wpt/tests/web-animations/interfaces/Animation/onremove.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/onremove.html rename to tests/wpt/tests/web-animations/interfaces/Animation/onremove.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/pause.html b/tests/wpt/tests/web-animations/interfaces/Animation/pause.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/pause.html rename to tests/wpt/tests/web-animations/interfaces/Animation/pause.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/pending.html b/tests/wpt/tests/web-animations/interfaces/Animation/pending.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/pending.html rename to tests/wpt/tests/web-animations/interfaces/Animation/pending.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/persist.html b/tests/wpt/tests/web-animations/interfaces/Animation/persist.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/persist.html rename to tests/wpt/tests/web-animations/interfaces/Animation/persist.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/play.html b/tests/wpt/tests/web-animations/interfaces/Animation/play.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/play.html rename to tests/wpt/tests/web-animations/interfaces/Animation/play.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/ready.html b/tests/wpt/tests/web-animations/interfaces/Animation/ready.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/ready.html rename to tests/wpt/tests/web-animations/interfaces/Animation/ready.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/startTime.html b/tests/wpt/tests/web-animations/interfaces/Animation/startTime.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/startTime.html rename to tests/wpt/tests/web-animations/interfaces/Animation/startTime.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/style-change-events.html b/tests/wpt/tests/web-animations/interfaces/Animation/style-change-events.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Animation/style-change-events.html rename to tests/wpt/tests/web-animations/interfaces/Animation/style-change-events.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/getComputedTiming.html b/tests/wpt/tests/web-animations/interfaces/AnimationEffect/getComputedTiming.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/getComputedTiming.html rename to tests/wpt/tests/web-animations/interfaces/AnimationEffect/getComputedTiming.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/updateTiming.html b/tests/wpt/tests/web-animations/interfaces/AnimationEffect/updateTiming.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/updateTiming.html rename to tests/wpt/tests/web-animations/interfaces/AnimationEffect/updateTiming.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationPlaybackEvent/constructor.html b/tests/wpt/tests/web-animations/interfaces/AnimationPlaybackEvent/constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/AnimationPlaybackEvent/constructor.html rename to tests/wpt/tests/web-animations/interfaces/AnimationPlaybackEvent/constructor.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Document/timeline.html b/tests/wpt/tests/web-animations/interfaces/Document/timeline.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/Document/timeline.html rename to tests/wpt/tests/web-animations/interfaces/Document/timeline.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/DocumentOrShadowRoot/getAnimations.html b/tests/wpt/tests/web-animations/interfaces/DocumentOrShadowRoot/getAnimations.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/DocumentOrShadowRoot/getAnimations.html rename to tests/wpt/tests/web-animations/interfaces/DocumentOrShadowRoot/getAnimations.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/DocumentTimeline/constructor.html b/tests/wpt/tests/web-animations/interfaces/DocumentTimeline/constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/DocumentTimeline/constructor.html rename to tests/wpt/tests/web-animations/interfaces/DocumentTimeline/constructor.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/DocumentTimeline/style-change-events.html b/tests/wpt/tests/web-animations/interfaces/DocumentTimeline/style-change-events.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/DocumentTimeline/style-change-events.html rename to tests/wpt/tests/web-animations/interfaces/DocumentTimeline/style-change-events.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/composite.html b/tests/wpt/tests/web-animations/interfaces/KeyframeEffect/composite.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/composite.html rename to tests/wpt/tests/web-animations/interfaces/KeyframeEffect/composite.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/constructor.html b/tests/wpt/tests/web-animations/interfaces/KeyframeEffect/constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/constructor.html rename to tests/wpt/tests/web-animations/interfaces/KeyframeEffect/constructor.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/copy-constructor.html b/tests/wpt/tests/web-animations/interfaces/KeyframeEffect/copy-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/copy-constructor.html rename to tests/wpt/tests/web-animations/interfaces/KeyframeEffect/copy-constructor.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/getKeyframes.html b/tests/wpt/tests/web-animations/interfaces/KeyframeEffect/getKeyframes.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/getKeyframes.html rename to tests/wpt/tests/web-animations/interfaces/KeyframeEffect/getKeyframes.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/iterationComposite.html b/tests/wpt/tests/web-animations/interfaces/KeyframeEffect/iterationComposite.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/iterationComposite.html rename to tests/wpt/tests/web-animations/interfaces/KeyframeEffect/iterationComposite.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-001.html b/tests/wpt/tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-001.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-001.html rename to tests/wpt/tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-001.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-002.html b/tests/wpt/tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-002.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-002.html rename to tests/wpt/tests/web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-002.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/setKeyframes.html b/tests/wpt/tests/web-animations/interfaces/KeyframeEffect/setKeyframes.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/setKeyframes.html rename to tests/wpt/tests/web-animations/interfaces/KeyframeEffect/setKeyframes.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/style-change-events.html b/tests/wpt/tests/web-animations/interfaces/KeyframeEffect/style-change-events.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/style-change-events.html rename to tests/wpt/tests/web-animations/interfaces/KeyframeEffect/style-change-events.html diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/target.html b/tests/wpt/tests/web-animations/interfaces/KeyframeEffect/target.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/target.html rename to tests/wpt/tests/web-animations/interfaces/KeyframeEffect/target.html diff --git a/tests/wpt/web-platform-tests/web-animations/resources/easing-tests.js b/tests/wpt/tests/web-animations/resources/easing-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/resources/easing-tests.js rename to tests/wpt/tests/web-animations/resources/easing-tests.js diff --git a/tests/wpt/web-platform-tests/web-animations/resources/effect-tests.js b/tests/wpt/tests/web-animations/resources/effect-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/resources/effect-tests.js rename to tests/wpt/tests/web-animations/resources/effect-tests.js diff --git a/tests/wpt/web-platform-tests/web-animations/resources/keyframe-tests.js b/tests/wpt/tests/web-animations/resources/keyframe-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/resources/keyframe-tests.js rename to tests/wpt/tests/web-animations/resources/keyframe-tests.js diff --git a/tests/wpt/web-platform-tests/web-animations/resources/keyframe-utils.js b/tests/wpt/tests/web-animations/resources/keyframe-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/resources/keyframe-utils.js rename to tests/wpt/tests/web-animations/resources/keyframe-utils.js diff --git a/tests/wpt/web-platform-tests/web-animations/resources/timing-override.js b/tests/wpt/tests/web-animations/resources/timing-override.js similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/resources/timing-override.js rename to tests/wpt/tests/web-animations/resources/timing-override.js diff --git a/tests/wpt/web-platform-tests/web-animations/resources/timing-tests.js b/tests/wpt/tests/web-animations/resources/timing-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/resources/timing-tests.js rename to tests/wpt/tests/web-animations/resources/timing-tests.js diff --git a/tests/wpt/web-platform-tests/web-animations/resources/timing-utils.js b/tests/wpt/tests/web-animations/resources/timing-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/resources/timing-utils.js rename to tests/wpt/tests/web-animations/resources/timing-utils.js diff --git a/tests/wpt/web-platform-tests/web-animations/resources/xhr-doc.py b/tests/wpt/tests/web-animations/resources/xhr-doc.py similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/resources/xhr-doc.py rename to tests/wpt/tests/web-animations/resources/xhr-doc.py diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/assorted-lengths.html b/tests/wpt/tests/web-animations/responsive/assorted-lengths.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/assorted-lengths.html rename to tests/wpt/tests/web-animations/responsive/assorted-lengths.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/backgroundPosition.html b/tests/wpt/tests/web-animations/responsive/backgroundPosition.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/backgroundPosition.html rename to tests/wpt/tests/web-animations/responsive/backgroundPosition.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/backgroundSize.html b/tests/wpt/tests/web-animations/responsive/backgroundSize.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/backgroundSize.html rename to tests/wpt/tests/web-animations/responsive/backgroundSize.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/baselineShift.html b/tests/wpt/tests/web-animations/responsive/baselineShift.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/baselineShift.html rename to tests/wpt/tests/web-animations/responsive/baselineShift.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/borderImageWidth.html b/tests/wpt/tests/web-animations/responsive/borderImageWidth.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/borderImageWidth.html rename to tests/wpt/tests/web-animations/responsive/borderImageWidth.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/borderRadius.html b/tests/wpt/tests/web-animations/responsive/borderRadius.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/borderRadius.html rename to tests/wpt/tests/web-animations/responsive/borderRadius.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/borderWidth.html b/tests/wpt/tests/web-animations/responsive/borderWidth.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/borderWidth.html rename to tests/wpt/tests/web-animations/responsive/borderWidth.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/boxShadow.html b/tests/wpt/tests/web-animations/responsive/boxShadow.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/boxShadow.html rename to tests/wpt/tests/web-animations/responsive/boxShadow.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/clip.html b/tests/wpt/tests/web-animations/responsive/clip.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/clip.html rename to tests/wpt/tests/web-animations/responsive/clip.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/columnCount.html b/tests/wpt/tests/web-animations/responsive/columnCount.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/columnCount.html rename to tests/wpt/tests/web-animations/responsive/columnCount.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/columnGap.html b/tests/wpt/tests/web-animations/responsive/columnGap.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/columnGap.html rename to tests/wpt/tests/web-animations/responsive/columnGap.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/d.html b/tests/wpt/tests/web-animations/responsive/d.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/d.html rename to tests/wpt/tests/web-animations/responsive/d.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/font-size-adjust.html b/tests/wpt/tests/web-animations/responsive/font-size-adjust.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/font-size-adjust.html rename to tests/wpt/tests/web-animations/responsive/font-size-adjust.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/fontSize.html b/tests/wpt/tests/web-animations/responsive/fontSize.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/fontSize.html rename to tests/wpt/tests/web-animations/responsive/fontSize.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/fontWeight.html b/tests/wpt/tests/web-animations/responsive/fontWeight.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/fontWeight.html rename to tests/wpt/tests/web-animations/responsive/fontWeight.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/lineHeight.html b/tests/wpt/tests/web-animations/responsive/lineHeight.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/lineHeight.html rename to tests/wpt/tests/web-animations/responsive/lineHeight.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/minHeight.html b/tests/wpt/tests/web-animations/responsive/minHeight.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/minHeight.html rename to tests/wpt/tests/web-animations/responsive/minHeight.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/offset-path.html b/tests/wpt/tests/web-animations/responsive/offset-path.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/offset-path.html rename to tests/wpt/tests/web-animations/responsive/offset-path.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/offsetDistance.html b/tests/wpt/tests/web-animations/responsive/offsetDistance.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/offsetDistance.html rename to tests/wpt/tests/web-animations/responsive/offsetDistance.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/offsetRotate.html b/tests/wpt/tests/web-animations/responsive/offsetRotate.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/offsetRotate.html rename to tests/wpt/tests/web-animations/responsive/offsetRotate.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/opacity.html b/tests/wpt/tests/web-animations/responsive/opacity.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/opacity.html rename to tests/wpt/tests/web-animations/responsive/opacity.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/perspective.html b/tests/wpt/tests/web-animations/responsive/perspective.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/perspective.html rename to tests/wpt/tests/web-animations/responsive/perspective.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/resources/block.html b/tests/wpt/tests/web-animations/responsive/resources/block.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/resources/block.html rename to tests/wpt/tests/web-animations/responsive/resources/block.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/rotate.html b/tests/wpt/tests/web-animations/responsive/rotate.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/rotate.html rename to tests/wpt/tests/web-animations/responsive/rotate.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/rowGap.html b/tests/wpt/tests/web-animations/responsive/rowGap.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/rowGap.html rename to tests/wpt/tests/web-animations/responsive/rowGap.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/shapeMargin.html b/tests/wpt/tests/web-animations/responsive/shapeMargin.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/shapeMargin.html rename to tests/wpt/tests/web-animations/responsive/shapeMargin.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/shapeOutside.html b/tests/wpt/tests/web-animations/responsive/shapeOutside.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/shapeOutside.html rename to tests/wpt/tests/web-animations/responsive/shapeOutside.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/strokeDasharray.html b/tests/wpt/tests/web-animations/responsive/strokeDasharray.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/strokeDasharray.html rename to tests/wpt/tests/web-animations/responsive/strokeDasharray.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/text-size-adjust.html b/tests/wpt/tests/web-animations/responsive/text-size-adjust.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/text-size-adjust.html rename to tests/wpt/tests/web-animations/responsive/text-size-adjust.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/textIndent.html b/tests/wpt/tests/web-animations/responsive/textIndent.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/textIndent.html rename to tests/wpt/tests/web-animations/responsive/textIndent.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/to-color-change.html b/tests/wpt/tests/web-animations/responsive/to-color-change.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/to-color-change.html rename to tests/wpt/tests/web-animations/responsive/to-color-change.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/to-inherited-change.html b/tests/wpt/tests/web-animations/responsive/to-inherited-change.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/to-inherited-change.html rename to tests/wpt/tests/web-animations/responsive/to-inherited-change.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/to-style-change.html b/tests/wpt/tests/web-animations/responsive/to-style-change.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/to-style-change.html rename to tests/wpt/tests/web-animations/responsive/to-style-change.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/toggle-animated-iframe-visibility-ref.html b/tests/wpt/tests/web-animations/responsive/toggle-animated-iframe-visibility-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/toggle-animated-iframe-visibility-ref.html rename to tests/wpt/tests/web-animations/responsive/toggle-animated-iframe-visibility-ref.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/toggle-animated-iframe-visibility.html b/tests/wpt/tests/web-animations/responsive/toggle-animated-iframe-visibility.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/toggle-animated-iframe-visibility.html rename to tests/wpt/tests/web-animations/responsive/toggle-animated-iframe-visibility.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/transform.html b/tests/wpt/tests/web-animations/responsive/transform.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/transform.html rename to tests/wpt/tests/web-animations/responsive/transform.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/translate.html b/tests/wpt/tests/web-animations/responsive/translate.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/translate.html rename to tests/wpt/tests/web-animations/responsive/translate.html diff --git a/tests/wpt/web-platform-tests/web-animations/responsive/verticalAlign.html b/tests/wpt/tests/web-animations/responsive/verticalAlign.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/responsive/verticalAlign.html rename to tests/wpt/tests/web-animations/responsive/verticalAlign.html diff --git a/tests/wpt/web-platform-tests/web-animations/testcommon.js b/tests/wpt/tests/web-animations/testcommon.js similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/testcommon.js rename to tests/wpt/tests/web-animations/testcommon.js diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animation-effects/active-time.html b/tests/wpt/tests/web-animations/timing-model/animation-effects/active-time.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animation-effects/active-time.html rename to tests/wpt/tests/web-animations/timing-model/animation-effects/active-time.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animation-effects/current-iteration.html b/tests/wpt/tests/web-animations/timing-model/animation-effects/current-iteration.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animation-effects/current-iteration.html rename to tests/wpt/tests/web-animations/timing-model/animation-effects/current-iteration.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animation-effects/local-time.html b/tests/wpt/tests/web-animations/timing-model/animation-effects/local-time.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animation-effects/local-time.html rename to tests/wpt/tests/web-animations/timing-model/animation-effects/local-time.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animation-effects/phases-and-states.html b/tests/wpt/tests/web-animations/timing-model/animation-effects/phases-and-states.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animation-effects/phases-and-states.html rename to tests/wpt/tests/web-animations/timing-model/animation-effects/phases-and-states.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animation-effects/simple-iteration-progress.html b/tests/wpt/tests/web-animations/timing-model/animation-effects/simple-iteration-progress.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animation-effects/simple-iteration-progress.html rename to tests/wpt/tests/web-animations/timing-model/animation-effects/simple-iteration-progress.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/canceling-an-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/canceling-an-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/canceling-an-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/canceling-an-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/document-timeline-animation-ref.html b/tests/wpt/tests/web-animations/timing-model/animations/document-timeline-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/document-timeline-animation-ref.html rename to tests/wpt/tests/web-animations/timing-model/animations/document-timeline-animation-ref.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/document-timeline-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/document-timeline-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/document-timeline-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/document-timeline-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/finishing-an-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/finishing-an-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/finishing-an-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/finishing-an-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/infinite-duration-animation-ref.html b/tests/wpt/tests/web-animations/timing-model/animations/infinite-duration-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/infinite-duration-animation-ref.html rename to tests/wpt/tests/web-animations/timing-model/animations/infinite-duration-animation-ref.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/infinite-duration-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/infinite-duration-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/infinite-duration-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/infinite-duration-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/pausing-an-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/pausing-an-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/pausing-an-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/pausing-an-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/play-states.html b/tests/wpt/tests/web-animations/timing-model/animations/play-states.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/play-states.html rename to tests/wpt/tests/web-animations/timing-model/animations/play-states.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/playing-an-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/playing-an-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/playing-an-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/playing-an-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/reverse-running-animation-ref.html b/tests/wpt/tests/web-animations/timing-model/animations/reverse-running-animation-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/reverse-running-animation-ref.html rename to tests/wpt/tests/web-animations/timing-model/animations/reverse-running-animation-ref.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/reverse-running-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/reverse-running-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/reverse-running-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/reverse-running-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/reversing-an-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/reversing-an-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/reversing-an-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/reversing-an-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/seamlessly-updating-the-playback-rate-of-an-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/seamlessly-updating-the-playback-rate-of-an-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/seamlessly-updating-the-playback-rate-of-an-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/seamlessly-updating-the-playback-rate-of-an-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-current-time-of-an-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/setting-the-current-time-of-an-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-current-time-of-an-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/setting-the-current-time-of-an-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-playback-rate-of-an-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/setting-the-playback-rate-of-an-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-playback-rate-of-an-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/setting-the-playback-rate-of-an-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-start-time-of-an-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/setting-the-start-time-of-an-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-start-time-of-an-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/setting-the-start-time-of-an-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-target-effect-of-an-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/setting-the-target-effect-of-an-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-target-effect-of-an-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/setting-the-target-effect-of-an-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-timeline-of-an-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/setting-the-timeline-of-an-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-timeline-of-an-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/setting-the-timeline-of-an-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/sync-start-times-ref.html b/tests/wpt/tests/web-animations/timing-model/animations/sync-start-times-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/sync-start-times-ref.html rename to tests/wpt/tests/web-animations/timing-model/animations/sync-start-times-ref.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/sync-start-times.html b/tests/wpt/tests/web-animations/timing-model/animations/sync-start-times.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/sync-start-times.html rename to tests/wpt/tests/web-animations/timing-model/animations/sync-start-times.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/the-current-time-of-an-animation.html b/tests/wpt/tests/web-animations/timing-model/animations/the-current-time-of-an-animation.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/the-current-time-of-an-animation.html rename to tests/wpt/tests/web-animations/timing-model/animations/the-current-time-of-an-animation.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-fast-ref.html b/tests/wpt/tests/web-animations/timing-model/animations/update-playback-rate-fast-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-fast-ref.html rename to tests/wpt/tests/web-animations/timing-model/animations/update-playback-rate-fast-ref.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-fast.html b/tests/wpt/tests/web-animations/timing-model/animations/update-playback-rate-fast.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-fast.html rename to tests/wpt/tests/web-animations/timing-model/animations/update-playback-rate-fast.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-zero-ref.html b/tests/wpt/tests/web-animations/timing-model/animations/update-playback-rate-zero-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-zero-ref.html rename to tests/wpt/tests/web-animations/timing-model/animations/update-playback-rate-zero-ref.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-zero.html b/tests/wpt/tests/web-animations/timing-model/animations/update-playback-rate-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/update-playback-rate-zero.html rename to tests/wpt/tests/web-animations/timing-model/animations/update-playback-rate-zero.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/updating-the-finished-state.html b/tests/wpt/tests/web-animations/timing-model/animations/updating-the-finished-state.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/animations/updating-the-finished-state.html rename to tests/wpt/tests/web-animations/timing-model/animations/updating-the-finished-state.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/time-transformations/transformed-progress.html b/tests/wpt/tests/web-animations/timing-model/time-transformations/transformed-progress.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/time-transformations/transformed-progress.html rename to tests/wpt/tests/web-animations/timing-model/time-transformations/transformed-progress.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/timelines/document-timelines.html b/tests/wpt/tests/web-animations/timing-model/timelines/document-timelines.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/timelines/document-timelines.html rename to tests/wpt/tests/web-animations/timing-model/timelines/document-timelines.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/timelines/resources/target-frame.html b/tests/wpt/tests/web-animations/timing-model/timelines/resources/target-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/timelines/resources/target-frame.html rename to tests/wpt/tests/web-animations/timing-model/timelines/resources/target-frame.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/timelines/resources/timeline-frame.html b/tests/wpt/tests/web-animations/timing-model/timelines/resources/timeline-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/timelines/resources/timeline-frame.html rename to tests/wpt/tests/web-animations/timing-model/timelines/resources/timeline-frame.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/timelines/sibling-iframe-timeline.html b/tests/wpt/tests/web-animations/timing-model/timelines/sibling-iframe-timeline.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/timelines/sibling-iframe-timeline.html rename to tests/wpt/tests/web-animations/timing-model/timelines/sibling-iframe-timeline.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/timelines/timelines.html b/tests/wpt/tests/web-animations/timing-model/timelines/timelines.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/timelines/timelines.html rename to tests/wpt/tests/web-animations/timing-model/timelines/timelines.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/timelines/update-and-send-events-replacement.html b/tests/wpt/tests/web-animations/timing-model/timelines/update-and-send-events-replacement.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/timelines/update-and-send-events-replacement.html rename to tests/wpt/tests/web-animations/timing-model/timelines/update-and-send-events-replacement.html diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/timelines/update-and-send-events.html b/tests/wpt/tests/web-animations/timing-model/timelines/update-and-send-events.html similarity index 100% rename from tests/wpt/web-platform-tests/web-animations/timing-model/timelines/update-and-send-events.html rename to tests/wpt/tests/web-animations/timing-model/timelines/update-and-send-events.html diff --git a/tests/wpt/web-platform-tests/web-bundle/META.yml b/tests/wpt/tests/web-bundle/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/META.yml rename to tests/wpt/tests/web-bundle/META.yml diff --git a/tests/wpt/web-platform-tests/web-bundle/README.md b/tests/wpt/tests/web-bundle/README.md similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/README.md rename to tests/wpt/tests/web-bundle/README.md diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/check-accept-header-and-return-bundle.py b/tests/wpt/tests/web-bundle/resources/check-accept-header-and-return-bundle.py similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/check-accept-header-and-return-bundle.py rename to tests/wpt/tests/web-bundle/resources/check-accept-header-and-return-bundle.py diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/check-cookie-and-return-bundle.py b/tests/wpt/tests/web-bundle/resources/check-cookie-and-return-bundle.py similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/check-cookie-and-return-bundle.py rename to tests/wpt/tests/web-bundle/resources/check-cookie-and-return-bundle.py diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/check-sec-fetch-dest-header-and-return-bundle.py b/tests/wpt/tests/web-bundle/resources/check-sec-fetch-dest-header-and-return-bundle.py similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/check-sec-fetch-dest-header-and-return-bundle.py rename to tests/wpt/tests/web-bundle/resources/check-sec-fetch-dest-header-and-return-bundle.py diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/corp.har b/tests/wpt/tests/web-bundle/resources/corp.har similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/corp.har rename to tests/wpt/tests/web-bundle/resources/corp.har diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/cross-origin-no-cors.har b/tests/wpt/tests/web-bundle/resources/cross-origin-no-cors.har similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/cross-origin-no-cors.har rename to tests/wpt/tests/web-bundle/resources/cross-origin-no-cors.har diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/cross-origin.har b/tests/wpt/tests/web-bundle/resources/cross-origin.har similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/cross-origin.har rename to tests/wpt/tests/web-bundle/resources/cross-origin.har diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/classic_script.js b/tests/wpt/tests/web-bundle/resources/dynamic1/classic_script.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/classic_script.js rename to tests/wpt/tests/web-bundle/resources/dynamic1/classic_script.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource1.js b/tests/wpt/tests/web-bundle/resources/dynamic1/resource1.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource1.js rename to tests/wpt/tests/web-bundle/resources/dynamic1/resource1.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource2.js b/tests/wpt/tests/web-bundle/resources/dynamic1/resource2.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource2.js rename to tests/wpt/tests/web-bundle/resources/dynamic1/resource2.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource3.js b/tests/wpt/tests/web-bundle/resources/dynamic1/resource3.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource3.js rename to tests/wpt/tests/web-bundle/resources/dynamic1/resource3.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource4.js b/tests/wpt/tests/web-bundle/resources/dynamic1/resource4.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/resource4.js rename to tests/wpt/tests/web-bundle/resources/dynamic1/resource4.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/classic_script.js b/tests/wpt/tests/web-bundle/resources/dynamic2/classic_script.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/classic_script.js rename to tests/wpt/tests/web-bundle/resources/dynamic2/classic_script.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource1.js b/tests/wpt/tests/web-bundle/resources/dynamic2/resource1.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource1.js rename to tests/wpt/tests/web-bundle/resources/dynamic2/resource1.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource2.js b/tests/wpt/tests/web-bundle/resources/dynamic2/resource2.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource2.js rename to tests/wpt/tests/web-bundle/resources/dynamic2/resource2.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource3.js b/tests/wpt/tests/web-bundle/resources/dynamic2/resource3.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource3.js rename to tests/wpt/tests/web-bundle/resources/dynamic2/resource3.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource4.js b/tests/wpt/tests/web-bundle/resources/dynamic2/resource4.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/resource4.js rename to tests/wpt/tests/web-bundle/resources/dynamic2/resource4.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh b/tests/wpt/tests/web-bundle/resources/generate-test-wbns.sh similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh rename to tests/wpt/tests/web-bundle/resources/generate-test-wbns.sh diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/location/location.html b/tests/wpt/tests/web-bundle/resources/location/location.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/location/location.html rename to tests/wpt/tests/web-bundle/resources/location/location.html diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/location/location.js b/tests/wpt/tests/web-bundle/resources/location/location.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/location/location.js rename to tests/wpt/tests/web-bundle/resources/location/location.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/nested/nested-sub.wbn b/tests/wpt/tests/web-bundle/resources/nested/nested-sub.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/nested/nested-sub.wbn rename to tests/wpt/tests/web-bundle/resources/nested/nested-sub.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/nested/resource.js b/tests/wpt/tests/web-bundle/resources/nested/resource.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/nested/resource.js rename to tests/wpt/tests/web-bundle/resources/nested/resource.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/non-utf8-query-encoding.har b/tests/wpt/tests/web-bundle/resources/non-utf8-query-encoding.har similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/non-utf8-query-encoding.har rename to tests/wpt/tests/web-bundle/resources/non-utf8-query-encoding.har diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/path-restriction/other/resource.js b/tests/wpt/tests/web-bundle/resources/path-restriction/other/resource.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/path-restriction/other/resource.js rename to tests/wpt/tests/web-bundle/resources/path-restriction/other/resource.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/path-restriction/resource.js b/tests/wpt/tests/web-bundle/resources/path-restriction/resource.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/path-restriction/resource.js rename to tests/wpt/tests/web-bundle/resources/path-restriction/resource.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/path-restriction/wbn-resource.js b/tests/wpt/tests/web-bundle/resources/path-restriction/wbn-resource.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/path-restriction/wbn-resource.js rename to tests/wpt/tests/web-bundle/resources/path-restriction/wbn-resource.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/path-restriction/wbn/resource.js b/tests/wpt/tests/web-bundle/resources/path-restriction/wbn/resource.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/path-restriction/wbn/resource.js rename to tests/wpt/tests/web-bundle/resources/path-restriction/wbn/resource.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/path-restriction/wbn/sub/resource.js b/tests/wpt/tests/web-bundle/resources/path-restriction/wbn/sub/resource.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/path-restriction/wbn/sub/resource.js rename to tests/wpt/tests/web-bundle/resources/path-restriction/wbn/sub/resource.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/path-restriction/wbn1/resource.js b/tests/wpt/tests/web-bundle/resources/path-restriction/wbn1/resource.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/path-restriction/wbn1/resource.js rename to tests/wpt/tests/web-bundle/resources/path-restriction/wbn1/resource.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/relative-url.har b/tests/wpt/tests/web-bundle/resources/relative-url.har similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/relative-url.har rename to tests/wpt/tests/web-bundle/resources/relative-url.har diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/simple-cross-origin.har b/tests/wpt/tests/web-bundle/resources/simple-cross-origin.har similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/simple-cross-origin.har rename to tests/wpt/tests/web-bundle/resources/simple-cross-origin.har diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/static-element/out-of-scope/script.js b/tests/wpt/tests/web-bundle/resources/static-element/out-of-scope/script.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/static-element/out-of-scope/script.js rename to tests/wpt/tests/web-bundle/resources/static-element/out-of-scope/script.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/static-element/resources/script.js b/tests/wpt/tests/web-bundle/resources/static-element/resources/script.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/static-element/resources/script.js rename to tests/wpt/tests/web-bundle/resources/static-element/resources/script.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/static-element/resources/style-imported-from-file.css b/tests/wpt/tests/web-bundle/resources/static-element/resources/style-imported-from-file.css similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/static-element/resources/style-imported-from-file.css rename to tests/wpt/tests/web-bundle/resources/static-element/resources/style-imported-from-file.css diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/static-element/resources/style-imported-from-tag.css b/tests/wpt/tests/web-bundle/resources/static-element/resources/style-imported-from-tag.css similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/static-element/resources/style-imported-from-tag.css rename to tests/wpt/tests/web-bundle/resources/static-element/resources/style-imported-from-tag.css diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/static-element/resources/style.css b/tests/wpt/tests/web-bundle/resources/static-element/resources/style.css similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/static-element/resources/style.css rename to tests/wpt/tests/web-bundle/resources/static-element/resources/style.css diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/static-element/scopes/script.js b/tests/wpt/tests/web-bundle/resources/static-element/scopes/script.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/static-element/scopes/script.js rename to tests/wpt/tests/web-bundle/resources/static-element/scopes/script.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/static-element/scopes/style-imported-from-file.css b/tests/wpt/tests/web-bundle/resources/static-element/scopes/style-imported-from-file.css similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/static-element/scopes/style-imported-from-file.css rename to tests/wpt/tests/web-bundle/resources/static-element/scopes/style-imported-from-file.css diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/static-element/scopes/style-imported-from-tag.css b/tests/wpt/tests/web-bundle/resources/static-element/scopes/style-imported-from-tag.css similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/static-element/scopes/style-imported-from-tag.css rename to tests/wpt/tests/web-bundle/resources/static-element/scopes/style-imported-from-tag.css diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/static-element/scopes/style.css b/tests/wpt/tests/web-bundle/resources/static-element/scopes/style.css similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/static-element/scopes/style.css rename to tests/wpt/tests/web-bundle/resources/static-element/scopes/style.css diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/subresource/fail.png b/tests/wpt/tests/web-bundle/resources/subresource/fail.png similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/subresource/fail.png rename to tests/wpt/tests/web-bundle/resources/subresource/fail.png diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/subresource/pass.png b/tests/wpt/tests/web-bundle/resources/subresource/pass.png similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/subresource/pass.png rename to tests/wpt/tests/web-bundle/resources/subresource/pass.png diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/subresource/root.js b/tests/wpt/tests/web-bundle/resources/subresource/root.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/subresource/root.js rename to tests/wpt/tests/web-bundle/resources/subresource/root.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/subresource/submodule.js b/tests/wpt/tests/web-bundle/resources/subresource/submodule.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/subresource/submodule.js rename to tests/wpt/tests/web-bundle/resources/subresource/submodule.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/test-helpers.js b/tests/wpt/tests/web-bundle/resources/test-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/test-helpers.js rename to tests/wpt/tests/web-bundle/resources/test-helpers.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/uuid-in-package.har b/tests/wpt/tests/web-bundle/resources/uuid-in-package.har similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/uuid-in-package.har rename to tests/wpt/tests/web-bundle/resources/uuid-in-package.har diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/__dir__.headers b/tests/wpt/tests/web-bundle/resources/wbn/__dir__.headers similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/__dir__.headers rename to tests/wpt/tests/web-bundle/resources/wbn/__dir__.headers diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/__dir__.sub.headers b/tests/wpt/tests/web-bundle/resources/wbn/cors/__dir__.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/__dir__.sub.headers rename to tests/wpt/tests/web-bundle/resources/wbn/cors/__dir__.sub.headers diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/corp.wbn b/tests/wpt/tests/web-bundle/resources/wbn/cors/corp.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/corp.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/cors/corp.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/cross-origin-b2.wbn b/tests/wpt/tests/web-bundle/resources/wbn/cors/cross-origin-b2.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/cross-origin-b2.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/cors/cross-origin-b2.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/cross-origin.wbn b/tests/wpt/tests/web-bundle/resources/wbn/cors/cross-origin.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/cors/cross-origin.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/cors/cross-origin.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic/__dir__.headers b/tests/wpt/tests/web-bundle/resources/wbn/dynamic/__dir__.headers similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic/__dir__.headers rename to tests/wpt/tests/web-bundle/resources/wbn/dynamic/__dir__.headers diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic/classic_script.js b/tests/wpt/tests/web-bundle/resources/wbn/dynamic/classic_script.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic/classic_script.js rename to tests/wpt/tests/web-bundle/resources/wbn/dynamic/classic_script.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic/resource1.js b/tests/wpt/tests/web-bundle/resources/wbn/dynamic/resource1.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic/resource1.js rename to tests/wpt/tests/web-bundle/resources/wbn/dynamic/resource1.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic/resource2.js b/tests/wpt/tests/web-bundle/resources/wbn/dynamic/resource2.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic/resource2.js rename to tests/wpt/tests/web-bundle/resources/wbn/dynamic/resource2.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic/resource3.js b/tests/wpt/tests/web-bundle/resources/wbn/dynamic/resource3.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic/resource3.js rename to tests/wpt/tests/web-bundle/resources/wbn/dynamic/resource3.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic/resource4.js b/tests/wpt/tests/web-bundle/resources/wbn/dynamic/resource4.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic/resource4.js rename to tests/wpt/tests/web-bundle/resources/wbn/dynamic/resource4.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1-crossorigin.wbn b/tests/wpt/tests/web-bundle/resources/wbn/dynamic1-crossorigin.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1-crossorigin.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/dynamic1-crossorigin.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1.wbn b/tests/wpt/tests/web-bundle/resources/wbn/dynamic1.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/dynamic1.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic2.wbn b/tests/wpt/tests/web-bundle/resources/wbn/dynamic2.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic2.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/dynamic2.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/location.wbn b/tests/wpt/tests/web-bundle/resources/wbn/location.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/location.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/location.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/nested-main.wbn b/tests/wpt/tests/web-bundle/resources/wbn/nested-main.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/nested-main.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/nested-main.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/no-cors/__dir__.headers b/tests/wpt/tests/web-bundle/resources/wbn/no-cors/__dir__.headers similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/no-cors/__dir__.headers rename to tests/wpt/tests/web-bundle/resources/wbn/no-cors/__dir__.headers diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/no-cors/cross-origin-b2.wbn b/tests/wpt/tests/web-bundle/resources/wbn/no-cors/cross-origin-b2.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/no-cors/cross-origin-b2.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/no-cors/cross-origin-b2.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/no-cors/cross-origin.wbn b/tests/wpt/tests/web-bundle/resources/wbn/no-cors/cross-origin.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/no-cors/cross-origin.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/no-cors/cross-origin.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/non-utf8-query-encoding.wbn b/tests/wpt/tests/web-bundle/resources/wbn/non-utf8-query-encoding.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/non-utf8-query-encoding.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/non-utf8-query-encoding.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/path-restriction.wbn b/tests/wpt/tests/web-bundle/resources/wbn/path-restriction.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/path-restriction.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/path-restriction.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/relative-url.wbn b/tests/wpt/tests/web-bundle/resources/wbn/relative-url.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/relative-url.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/relative-url.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/relative-url.wbn.sub.headers b/tests/wpt/tests/web-bundle/resources/wbn/relative-url.wbn.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/relative-url.wbn.sub.headers rename to tests/wpt/tests/web-bundle/resources/wbn/relative-url.wbn.sub.headers diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/simple-cross-origin.wbn b/tests/wpt/tests/web-bundle/resources/wbn/simple-cross-origin.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/simple-cross-origin.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/simple-cross-origin.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element.wbn b/tests/wpt/tests/web-bundle/resources/wbn/static-element.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/static-element.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/out-of-scope/script.js b/tests/wpt/tests/web-bundle/resources/wbn/static-element/out-of-scope/script.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/out-of-scope/script.js rename to tests/wpt/tests/web-bundle/resources/wbn/static-element/out-of-scope/script.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/resources/script.js b/tests/wpt/tests/web-bundle/resources/wbn/static-element/resources/script.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/resources/script.js rename to tests/wpt/tests/web-bundle/resources/wbn/static-element/resources/script.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/resources/style-imported-from-file.css b/tests/wpt/tests/web-bundle/resources/wbn/static-element/resources/style-imported-from-file.css similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/resources/style-imported-from-file.css rename to tests/wpt/tests/web-bundle/resources/wbn/static-element/resources/style-imported-from-file.css diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/resources/style-imported-from-tag.css b/tests/wpt/tests/web-bundle/resources/wbn/static-element/resources/style-imported-from-tag.css similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/resources/style-imported-from-tag.css rename to tests/wpt/tests/web-bundle/resources/wbn/static-element/resources/style-imported-from-tag.css diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/resources/style.css b/tests/wpt/tests/web-bundle/resources/wbn/static-element/resources/style.css similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/resources/style.css rename to tests/wpt/tests/web-bundle/resources/wbn/static-element/resources/style.css diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/scopes/script.js b/tests/wpt/tests/web-bundle/resources/wbn/static-element/scopes/script.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/scopes/script.js rename to tests/wpt/tests/web-bundle/resources/wbn/static-element/scopes/script.js diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/scopes/style-imported-from-file.css b/tests/wpt/tests/web-bundle/resources/wbn/static-element/scopes/style-imported-from-file.css similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/scopes/style-imported-from-file.css rename to tests/wpt/tests/web-bundle/resources/wbn/static-element/scopes/style-imported-from-file.css diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/scopes/style-imported-from-tag.css b/tests/wpt/tests/web-bundle/resources/wbn/static-element/scopes/style-imported-from-tag.css similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/scopes/style-imported-from-tag.css rename to tests/wpt/tests/web-bundle/resources/wbn/static-element/scopes/style-imported-from-tag.css diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/scopes/style.css b/tests/wpt/tests/web-bundle/resources/wbn/static-element/scopes/style.css similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/static-element/scopes/style.css rename to tests/wpt/tests/web-bundle/resources/wbn/static-element/scopes/style.css diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/subresource.wbn b/tests/wpt/tests/web-bundle/resources/wbn/subresource.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/subresource.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/subresource.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/uuid-in-package.wbn b/tests/wpt/tests/web-bundle/resources/wbn/uuid-in-package.wbn similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/resources/wbn/uuid-in-package.wbn rename to tests/wpt/tests/web-bundle/resources/wbn/uuid-in-package.wbn diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/accept-header.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/accept-header.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/accept-header.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/accept-header.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/coep.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/coep.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/coep.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/coep.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/coep.https.tentative.html.headers b/tests/wpt/tests/web-bundle/subresource-loading/coep.https.tentative.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/coep.https.tentative.html.headers rename to tests/wpt/tests/web-bundle/subresource-loading/coep.https.tentative.html.headers diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/corp.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/corp.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/corp.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/corp.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/credentials.https.tentative.sub.html b/tests/wpt/tests/web-bundle/subresource-loading/credentials.https.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/credentials.https.tentative.sub.html rename to tests/wpt/tests/web-bundle/subresource-loading/credentials.https.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/csp-allowed.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/csp-allowed.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/csp-allowed.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/csp-allowed.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/csp-blocked.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/csp-blocked.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/csp-blocked.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/csp-blocked.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/csp-blocked.https.tentative.html.sub.headers b/tests/wpt/tests/web-bundle/subresource-loading/csp-blocked.https.tentative.html.sub.headers similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/csp-blocked.https.tentative.html.sub.headers rename to tests/wpt/tests/web-bundle/subresource-loading/csp-blocked.https.tentative.html.sub.headers diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/csp-blockes-bundle.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/csp-blockes-bundle.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/csp-blockes-bundle.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/csp-blockes-bundle.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/element-removal.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/element-removal.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/element-removal.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/element-removal.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/invalid-json.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/invalid-json.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/invalid-json.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/invalid-json.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/nested-bundle.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/nested-bundle.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/nested-bundle.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/nested-bundle.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/network-error.https.tentative.sub.html b/tests/wpt/tests/web-bundle/subresource-loading/network-error.https.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/network-error.https.tentative.sub.html rename to tests/wpt/tests/web-bundle/subresource-loading/network-error.https.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/not-found.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/not-found.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/not-found.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/not-found.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/path-restriction.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/path-restriction.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/path-restriction.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/path-restriction.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/relative-url-in-web-bundle-cors.https.tentative.sub.html b/tests/wpt/tests/web-bundle/subresource-loading/relative-url-in-web-bundle-cors.https.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/relative-url-in-web-bundle-cors.https.tentative.sub.html rename to tests/wpt/tests/web-bundle/subresource-loading/relative-url-in-web-bundle-cors.https.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/relative-url-in-web-bundle.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/relative-url-in-web-bundle.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/relative-url-in-web-bundle.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/relative-url-in-web-bundle.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/relative-url-resources.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/relative-url-resources.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/relative-url-resources.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/relative-url-resources.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/relative-url-scopes.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/relative-url-scopes.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/relative-url-scopes.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/relative-url-scopes.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/relative-url-static-element.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/relative-url-static-element.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/relative-url-static-element.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/relative-url-static-element.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/relative-url-with-base.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/relative-url-with-base.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/relative-url-with-base.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/relative-url-with-base.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/request-destination.https.tentative.sub.html b/tests/wpt/tests/web-bundle/subresource-loading/request-destination.https.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/request-destination.https.tentative.sub.html rename to tests/wpt/tests/web-bundle/subresource-loading/request-destination.https.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/resource-timing-attributes-consistent.https.tentative.sub.html b/tests/wpt/tests/web-bundle/subresource-loading/resource-timing-attributes-consistent.https.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/resource-timing-attributes-consistent.https.tentative.sub.html rename to tests/wpt/tests/web-bundle/subresource-loading/resource-timing-attributes-consistent.https.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/resource-timing.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/resource-timing.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/resource-timing.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/resource-timing.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/resources/check-cookie-and-return-bundle.py b/tests/wpt/tests/web-bundle/subresource-loading/resources/check-cookie-and-return-bundle.py similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/resources/check-cookie-and-return-bundle.py rename to tests/wpt/tests/web-bundle/subresource-loading/resources/check-cookie-and-return-bundle.py diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/resources/service-worker-controlled-iframe.html b/tests/wpt/tests/web-bundle/subresource-loading/resources/service-worker-controlled-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/resources/service-worker-controlled-iframe.html rename to tests/wpt/tests/web-bundle/subresource-loading/resources/service-worker-controlled-iframe.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/resources/service-worker-for-request-monitor.js b/tests/wpt/tests/web-bundle/subresource-loading/resources/service-worker-for-request-monitor.js similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/resources/service-worker-for-request-monitor.js rename to tests/wpt/tests/web-bundle/subresource-loading/resources/service-worker-for-request-monitor.js diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/reuse-web-bundle-resource.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/reuse-web-bundle-resource.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/reuse-web-bundle-resource.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/reuse-web-bundle-resource.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/service-worker-controlled.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/service-worker-controlled.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/service-worker-controlled.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/service-worker-controlled.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/static-element-with-base.https.tentative.sub.html b/tests/wpt/tests/web-bundle/subresource-loading/static-element-with-base.https.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/static-element-with-base.https.tentative.sub.html rename to tests/wpt/tests/web-bundle/subresource-loading/static-element-with-base.https.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/static-element.https.tentative.sub.html b/tests/wpt/tests/web-bundle/subresource-loading/static-element.https.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/static-element.https.tentative.sub.html rename to tests/wpt/tests/web-bundle/subresource-loading/static-element.https.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-load.https.tentative.sub.html b/tests/wpt/tests/web-bundle/subresource-loading/subresource-load.https.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-load.https.tentative.sub.html rename to tests/wpt/tests/web-bundle/subresource-loading/subresource-load.https.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/supports-webbundle.https.tentative.html b/tests/wpt/tests/web-bundle/subresource-loading/supports-webbundle.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-bundle/subresource-loading/supports-webbundle.https.tentative.html rename to tests/wpt/tests/web-bundle/subresource-loading/supports-webbundle.https.tentative.html diff --git a/tests/wpt/web-platform-tests/web-locks/META.yml b/tests/wpt/tests/web-locks/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/META.yml rename to tests/wpt/tests/web-locks/META.yml diff --git a/tests/wpt/web-platform-tests/web-locks/README.md b/tests/wpt/tests/web-locks/README.md similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/README.md rename to tests/wpt/tests/web-locks/README.md diff --git a/tests/wpt/web-platform-tests/web-locks/acquire.tentative.https.any.js b/tests/wpt/tests/web-locks/acquire.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/acquire.tentative.https.any.js rename to tests/wpt/tests/web-locks/acquire.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/bfcache/abort.tentative.https.html b/tests/wpt/tests/web-locks/bfcache/abort.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/bfcache/abort.tentative.https.html rename to tests/wpt/tests/web-locks/bfcache/abort.tentative.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/bfcache/held.tentative.https.html b/tests/wpt/tests/web-locks/bfcache/held.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/bfcache/held.tentative.https.html rename to tests/wpt/tests/web-locks/bfcache/held.tentative.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/bfcache/helpers.js b/tests/wpt/tests/web-locks/bfcache/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/bfcache/helpers.js rename to tests/wpt/tests/web-locks/bfcache/helpers.js diff --git a/tests/wpt/web-platform-tests/web-locks/bfcache/release-across-thread.tentative.https.html b/tests/wpt/tests/web-locks/bfcache/release-across-thread.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/bfcache/release-across-thread.tentative.https.html rename to tests/wpt/tests/web-locks/bfcache/release-across-thread.tentative.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/bfcache/release.tentative.https.html b/tests/wpt/tests/web-locks/bfcache/release.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/bfcache/release.tentative.https.html rename to tests/wpt/tests/web-locks/bfcache/release.tentative.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/bfcache/sharedworker-multiple.tentative.https.html b/tests/wpt/tests/web-locks/bfcache/sharedworker-multiple.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/bfcache/sharedworker-multiple.tentative.https.html rename to tests/wpt/tests/web-locks/bfcache/sharedworker-multiple.tentative.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/clientids.tentative.https.html b/tests/wpt/tests/web-locks/clientids.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/clientids.tentative.https.html rename to tests/wpt/tests/web-locks/clientids.tentative.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/crashtests/after-worker-termination.https.html b/tests/wpt/tests/web-locks/crashtests/after-worker-termination.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/crashtests/after-worker-termination.https.html rename to tests/wpt/tests/web-locks/crashtests/after-worker-termination.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/crashtests/iframe-append-2.https.html b/tests/wpt/tests/web-locks/crashtests/iframe-append-2.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/crashtests/iframe-append-2.https.html rename to tests/wpt/tests/web-locks/crashtests/iframe-append-2.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/crashtests/iframe-append.https.html b/tests/wpt/tests/web-locks/crashtests/iframe-append.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/crashtests/iframe-append.https.html rename to tests/wpt/tests/web-locks/crashtests/iframe-append.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/crashtests/settle-after-steal.https.html b/tests/wpt/tests/web-locks/crashtests/settle-after-steal.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/crashtests/settle-after-steal.https.html rename to tests/wpt/tests/web-locks/crashtests/settle-after-steal.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/crashtests/worker-termination.https.html b/tests/wpt/tests/web-locks/crashtests/worker-termination.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/crashtests/worker-termination.https.html rename to tests/wpt/tests/web-locks/crashtests/worker-termination.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/frames.tentative.https.html b/tests/wpt/tests/web-locks/frames.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/frames.tentative.https.html rename to tests/wpt/tests/web-locks/frames.tentative.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/held.tentative.https.any.js b/tests/wpt/tests/web-locks/held.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/held.tentative.https.any.js rename to tests/wpt/tests/web-locks/held.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/idlharness.tentative.https.any.js b/tests/wpt/tests/web-locks/idlharness.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/idlharness.tentative.https.any.js rename to tests/wpt/tests/web-locks/idlharness.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/ifAvailable.tentative.https.any.js b/tests/wpt/tests/web-locks/ifAvailable.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/ifAvailable.tentative.https.any.js rename to tests/wpt/tests/web-locks/ifAvailable.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/lock-attributes.tentative.https.any.js b/tests/wpt/tests/web-locks/lock-attributes.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/lock-attributes.tentative.https.any.js rename to tests/wpt/tests/web-locks/lock-attributes.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/mode-exclusive.tentative.https.any.js b/tests/wpt/tests/web-locks/mode-exclusive.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/mode-exclusive.tentative.https.any.js rename to tests/wpt/tests/web-locks/mode-exclusive.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/mode-mixed.tentative.https.any.js b/tests/wpt/tests/web-locks/mode-mixed.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/mode-mixed.tentative.https.any.js rename to tests/wpt/tests/web-locks/mode-mixed.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/mode-shared.tentative.https.any.js b/tests/wpt/tests/web-locks/mode-shared.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/mode-shared.tentative.https.any.js rename to tests/wpt/tests/web-locks/mode-shared.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/non-fully-active.tentative.https.html b/tests/wpt/tests/web-locks/non-fully-active.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/non-fully-active.tentative.https.html rename to tests/wpt/tests/web-locks/non-fully-active.tentative.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/non-secure-context.tentative.any.js b/tests/wpt/tests/web-locks/non-secure-context.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/non-secure-context.tentative.any.js rename to tests/wpt/tests/web-locks/non-secure-context.tentative.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/opaque-origin.tentative.https.html b/tests/wpt/tests/web-locks/opaque-origin.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/opaque-origin.tentative.https.html rename to tests/wpt/tests/web-locks/opaque-origin.tentative.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/partitioned-web-locks.tentative.https.html b/tests/wpt/tests/web-locks/partitioned-web-locks.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/partitioned-web-locks.tentative.https.html rename to tests/wpt/tests/web-locks/partitioned-web-locks.tentative.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/query-empty.tentative.https.any.js b/tests/wpt/tests/web-locks/query-empty.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/query-empty.tentative.https.any.js rename to tests/wpt/tests/web-locks/query-empty.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/query-ordering.tentative.https.html b/tests/wpt/tests/web-locks/query-ordering.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/query-ordering.tentative.https.html rename to tests/wpt/tests/web-locks/query-ordering.tentative.https.html diff --git a/tests/wpt/web-platform-tests/web-locks/query.tentative.https.any.js b/tests/wpt/tests/web-locks/query.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/query.tentative.https.any.js rename to tests/wpt/tests/web-locks/query.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/resource-names.tentative.https.any.js b/tests/wpt/tests/web-locks/resource-names.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/resource-names.tentative.https.any.js rename to tests/wpt/tests/web-locks/resource-names.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/resources/helpers.js b/tests/wpt/tests/web-locks/resources/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/resources/helpers.js rename to tests/wpt/tests/web-locks/resources/helpers.js diff --git a/tests/wpt/web-platform-tests/web-locks/resources/iframe-parent.html b/tests/wpt/tests/web-locks/resources/iframe-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/resources/iframe-parent.html rename to tests/wpt/tests/web-locks/resources/iframe-parent.html diff --git a/tests/wpt/web-platform-tests/web-locks/resources/iframe.html b/tests/wpt/tests/web-locks/resources/iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/resources/iframe.html rename to tests/wpt/tests/web-locks/resources/iframe.html diff --git a/tests/wpt/web-platform-tests/web-locks/resources/parentworker.js b/tests/wpt/tests/web-locks/resources/parentworker.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/resources/parentworker.js rename to tests/wpt/tests/web-locks/resources/parentworker.js diff --git a/tests/wpt/web-platform-tests/web-locks/resources/partitioned-parent.html b/tests/wpt/tests/web-locks/resources/partitioned-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/resources/partitioned-parent.html rename to tests/wpt/tests/web-locks/resources/partitioned-parent.html diff --git a/tests/wpt/web-platform-tests/web-locks/resources/service-worker.js b/tests/wpt/tests/web-locks/resources/service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/resources/service-worker.js rename to tests/wpt/tests/web-locks/resources/service-worker.js diff --git a/tests/wpt/web-platform-tests/web-locks/resources/sw-controlled-iframe.html b/tests/wpt/tests/web-locks/resources/sw-controlled-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/resources/sw-controlled-iframe.html rename to tests/wpt/tests/web-locks/resources/sw-controlled-iframe.html diff --git a/tests/wpt/web-platform-tests/web-locks/resources/worker.js b/tests/wpt/tests/web-locks/resources/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/resources/worker.js rename to tests/wpt/tests/web-locks/resources/worker.js diff --git a/tests/wpt/web-platform-tests/web-locks/secure-context.tentative.https.any.js b/tests/wpt/tests/web-locks/secure-context.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/secure-context.tentative.https.any.js rename to tests/wpt/tests/web-locks/secure-context.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/signal.tentative.https.any.js b/tests/wpt/tests/web-locks/signal.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/signal.tentative.https.any.js rename to tests/wpt/tests/web-locks/signal.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/steal.tentative.https.any.js b/tests/wpt/tests/web-locks/steal.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/steal.tentative.https.any.js rename to tests/wpt/tests/web-locks/steal.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/storage-buckets.tentative.https.any.js b/tests/wpt/tests/web-locks/storage-buckets.tentative.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/storage-buckets.tentative.https.any.js rename to tests/wpt/tests/web-locks/storage-buckets.tentative.https.any.js diff --git a/tests/wpt/web-platform-tests/web-locks/workers.tentative.https.html b/tests/wpt/tests/web-locks/workers.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-locks/workers.tentative.https.html rename to tests/wpt/tests/web-locks/workers.tentative.https.html diff --git a/tests/wpt/web-platform-tests/web-nfc/META.yml b/tests/wpt/tests/web-nfc/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/META.yml rename to tests/wpt/tests/web-nfc/META.yml diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFMessage_constructor.https.window.js b/tests/wpt/tests/web-nfc/NDEFMessage_constructor.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/NDEFMessage_constructor.https.window.js rename to tests/wpt/tests/web-nfc/NDEFMessage_constructor.https.window.js diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFMessage_recursion-limit.https.window.js b/tests/wpt/tests/web-nfc/NDEFMessage_recursion-limit.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/NDEFMessage_recursion-limit.https.window.js rename to tests/wpt/tests/web-nfc/NDEFMessage_recursion-limit.https.window.js diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFReader-make-read-only-document-hidden-manual.https.html b/tests/wpt/tests/web-nfc/NDEFReader-make-read-only-document-hidden-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/NDEFReader-make-read-only-document-hidden-manual.https.html rename to tests/wpt/tests/web-nfc/NDEFReader-make-read-only-document-hidden-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFReader-read-document-hidden-manual.https.html b/tests/wpt/tests/web-nfc/NDEFReader-read-document-hidden-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/NDEFReader-read-document-hidden-manual.https.html rename to tests/wpt/tests/web-nfc/NDEFReader-read-document-hidden-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFReader-write-document-hidden-manual.https.html b/tests/wpt/tests/web-nfc/NDEFReader-write-document-hidden-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/NDEFReader-write-document-hidden-manual.https.html rename to tests/wpt/tests/web-nfc/NDEFReader-write-document-hidden-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFReader_make-read-only.https.window.js b/tests/wpt/tests/web-nfc/NDEFReader_make-read-only.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/NDEFReader_make-read-only.https.window.js rename to tests/wpt/tests/web-nfc/NDEFReader_make-read-only.https.window.js diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan.https.html b/tests/wpt/tests/web-nfc/NDEFReader_scan.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan.https.html rename to tests/wpt/tests/web-nfc/NDEFReader_scan.https.html diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan_iframe.https.html b/tests/wpt/tests/web-nfc/NDEFReader_scan_iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan_iframe.https.html rename to tests/wpt/tests/web-nfc/NDEFReader_scan_iframe.https.html diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFReader_write.https.html b/tests/wpt/tests/web-nfc/NDEFReader_write.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/NDEFReader_write.https.html rename to tests/wpt/tests/web-nfc/NDEFReader_write.https.html diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFReadingEvent_constructor.https.window.js b/tests/wpt/tests/web-nfc/NDEFReadingEvent_constructor.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/NDEFReadingEvent_constructor.https.window.js rename to tests/wpt/tests/web-nfc/NDEFReadingEvent_constructor.https.window.js diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.window.js b/tests/wpt/tests/web-nfc/NDEFRecord_constructor.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.window.js rename to tests/wpt/tests/web-nfc/NDEFRecord_constructor.https.window.js diff --git a/tests/wpt/web-platform-tests/web-nfc/README.md b/tests/wpt/tests/web-nfc/README.md similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/README.md rename to tests/wpt/tests/web-nfc/README.md diff --git a/tests/wpt/web-platform-tests/web-nfc/idlharness.https.window.js b/tests/wpt/tests/web-nfc/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/idlharness.https.window.js rename to tests/wpt/tests/web-nfc/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/web-nfc/nfc-prompt-manual.https.html b/tests/wpt/tests/web-nfc/nfc-prompt-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/nfc-prompt-manual.https.html rename to tests/wpt/tests/web-nfc/nfc-prompt-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-nfc/nfc_insecure_context.html b/tests/wpt/tests/web-nfc/nfc_insecure_context.html similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/nfc_insecure_context.html rename to tests/wpt/tests/web-nfc/nfc_insecure_context.html diff --git a/tests/wpt/web-platform-tests/web-nfc/nfc_permission.https.window.js b/tests/wpt/tests/web-nfc/nfc_permission.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/nfc_permission.https.window.js rename to tests/wpt/tests/web-nfc/nfc_permission.https.window.js diff --git a/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js b/tests/wpt/tests/web-nfc/resources/nfc-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js rename to tests/wpt/tests/web-nfc/resources/nfc-helpers.js diff --git a/tests/wpt/web-platform-tests/web-nfc/resources/support-iframe.html b/tests/wpt/tests/web-nfc/resources/support-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/web-nfc/resources/support-iframe.html rename to tests/wpt/tests/web-nfc/resources/support-iframe.html diff --git a/tests/wpt/web-platform-tests/web-otp/META.yml b/tests/wpt/tests/web-otp/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/web-otp/META.yml rename to tests/wpt/tests/web-otp/META.yml diff --git a/tests/wpt/web-platform-tests/web-otp/idlharness.https.window.js b/tests/wpt/tests/web-otp/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/web-otp/idlharness.https.window.js rename to tests/wpt/tests/web-otp/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/web-share/META.yml b/tests/wpt/tests/web-share/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/web-share/META.yml rename to tests/wpt/tests/web-share/META.yml diff --git a/tests/wpt/web-platform-tests/web-share/canShare-files.https.html b/tests/wpt/tests/web-share/canShare-files.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/canShare-files.https.html rename to tests/wpt/tests/web-share/canShare-files.https.html diff --git a/tests/wpt/web-platform-tests/web-share/canShare-insecure.http.html b/tests/wpt/tests/web-share/canShare-insecure.http.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/canShare-insecure.http.html rename to tests/wpt/tests/web-share/canShare-insecure.http.html diff --git a/tests/wpt/web-platform-tests/web-share/canShare.https.html b/tests/wpt/tests/web-share/canShare.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/canShare.https.html rename to tests/wpt/tests/web-share/canShare.https.html diff --git a/tests/wpt/web-platform-tests/web-share/disabled-by-permissions-policy-cross-origin.https.sub.html b/tests/wpt/tests/web-share/disabled-by-permissions-policy-cross-origin.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/disabled-by-permissions-policy-cross-origin.https.sub.html rename to tests/wpt/tests/web-share/disabled-by-permissions-policy-cross-origin.https.sub.html diff --git a/tests/wpt/web-platform-tests/web-share/disabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/web-share/disabled-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/disabled-by-permissions-policy.https.sub.html rename to tests/wpt/tests/web-share/disabled-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/web-share/disabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/web-share/disabled-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/web-share/disabled-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/web-share/disabled-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/web-share/feature-policy-listed.tentative.html b/tests/wpt/tests/web-share/feature-policy-listed.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/feature-policy-listed.tentative.html rename to tests/wpt/tests/web-share/feature-policy-listed.tentative.html diff --git a/tests/wpt/web-platform-tests/web-share/idlharness.https.window.js b/tests/wpt/tests/web-share/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/web-share/idlharness.https.window.js rename to tests/wpt/tests/web-share/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/web-share/resources/blank.html b/tests/wpt/tests/web-share/resources/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/resources/blank.html rename to tests/wpt/tests/web-share/resources/blank.html diff --git a/tests/wpt/web-platform-tests/web-share/resources/manual-helper.js b/tests/wpt/tests/web-share/resources/manual-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/web-share/resources/manual-helper.js rename to tests/wpt/tests/web-share/resources/manual-helper.js diff --git a/tests/wpt/web-platform-tests/web-share/resources/post-message.html b/tests/wpt/tests/web-share/resources/post-message.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/resources/post-message.html rename to tests/wpt/tests/web-share/resources/post-message.html diff --git a/tests/wpt/web-platform-tests/web-share/share-cancel-manual.https.html b/tests/wpt/tests/web-share/share-cancel-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-cancel-manual.https.html rename to tests/wpt/tests/web-share/share-cancel-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-consume-activation.https.html b/tests/wpt/tests/web-share/share-consume-activation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-consume-activation.https.html rename to tests/wpt/tests/web-share/share-consume-activation.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-empty.https.html b/tests/wpt/tests/web-share/share-empty.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-empty.https.html rename to tests/wpt/tests/web-share/share-empty.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-extra-argument-manual.https.html b/tests/wpt/tests/web-share/share-extra-argument-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-extra-argument-manual.https.html rename to tests/wpt/tests/web-share/share-extra-argument-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-extra-field-manual.https.html b/tests/wpt/tests/web-share/share-extra-field-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-extra-field-manual.https.html rename to tests/wpt/tests/web-share/share-extra-field-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-files-manual.https.html b/tests/wpt/tests/web-share/share-files-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-files-manual.https.html rename to tests/wpt/tests/web-share/share-files-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-image-manual.tentative.https.html b/tests/wpt/tests/web-share/share-image-manual.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-image-manual.tentative.https.html rename to tests/wpt/tests/web-share/share-image-manual.tentative.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-non-string-manual.https.html b/tests/wpt/tests/web-share/share-non-string-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-non-string-manual.https.html rename to tests/wpt/tests/web-share/share-non-string-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-null-manual.https.html b/tests/wpt/tests/web-share/share-null-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-null-manual.https.html rename to tests/wpt/tests/web-share/share-null-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-securecontext.http.html b/tests/wpt/tests/web-share/share-securecontext.http.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-securecontext.http.html rename to tests/wpt/tests/web-share/share-securecontext.http.html diff --git a/tests/wpt/web-platform-tests/web-share/share-sharePromise-internal-slot.https.html b/tests/wpt/tests/web-share/share-sharePromise-internal-slot.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-sharePromise-internal-slot.https.html rename to tests/wpt/tests/web-share/share-sharePromise-internal-slot.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-simple-manual.https.html b/tests/wpt/tests/web-share/share-simple-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-simple-manual.https.html rename to tests/wpt/tests/web-share/share-simple-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-unicode-strings-manual.https.html b/tests/wpt/tests/web-share/share-unicode-strings-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-unicode-strings-manual.https.html rename to tests/wpt/tests/web-share/share-unicode-strings-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-unicode-strings-nonutf8-manual.https.html b/tests/wpt/tests/web-share/share-unicode-strings-nonutf8-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-unicode-strings-nonutf8-manual.https.html rename to tests/wpt/tests/web-share/share-unicode-strings-nonutf8-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-url-empty-manual.https.html b/tests/wpt/tests/web-share/share-url-empty-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-url-empty-manual.https.html rename to tests/wpt/tests/web-share/share-url-empty-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-url-encoding-manual.https.html b/tests/wpt/tests/web-share/share-url-encoding-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-url-encoding-manual.https.html rename to tests/wpt/tests/web-share/share-url-encoding-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-url-invalid.https.html b/tests/wpt/tests/web-share/share-url-invalid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-url-invalid.https.html rename to tests/wpt/tests/web-share/share-url-invalid.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-url-noscheme-manual.https.html b/tests/wpt/tests/web-share/share-url-noscheme-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-url-noscheme-manual.https.html rename to tests/wpt/tests/web-share/share-url-noscheme-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-url-pathonly-manual.https.html b/tests/wpt/tests/web-share/share-url-pathonly-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-url-pathonly-manual.https.html rename to tests/wpt/tests/web-share/share-url-pathonly-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-url-relative-manual.https.html b/tests/wpt/tests/web-share/share-url-relative-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-url-relative-manual.https.html rename to tests/wpt/tests/web-share/share-url-relative-manual.https.html diff --git a/tests/wpt/web-platform-tests/web-share/share-without-user-gesture.https.html b/tests/wpt/tests/web-share/share-without-user-gesture.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/share-without-user-gesture.https.html rename to tests/wpt/tests/web-share/share-without-user-gesture.https.html diff --git a/tests/wpt/web-platform-tests/web-share/test-fully-active.https.html b/tests/wpt/tests/web-share/test-fully-active.https.html similarity index 100% rename from tests/wpt/web-platform-tests/web-share/test-fully-active.https.html rename to tests/wpt/tests/web-share/test-fully-active.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/META.yml b/tests/wpt/tests/webaudio/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/META.yml rename to tests/wpt/tests/webaudio/META.yml diff --git a/tests/wpt/web-platform-tests/webaudio/README.md b/tests/wpt/tests/webaudio/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/README.md rename to tests/wpt/tests/webaudio/README.md diff --git a/tests/wpt/web-platform-tests/webaudio/historical.html b/tests/wpt/tests/webaudio/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/historical.html rename to tests/wpt/tests/webaudio/historical.html diff --git a/tests/wpt/web-platform-tests/webaudio/idlharness.https.window.js b/tests/wpt/tests/webaudio/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/idlharness.https.window.js rename to tests/wpt/tests/webaudio/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/webaudio/js/buffer-loader.js b/tests/wpt/tests/webaudio/js/buffer-loader.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/js/buffer-loader.js rename to tests/wpt/tests/webaudio/js/buffer-loader.js diff --git a/tests/wpt/web-platform-tests/webaudio/js/helpers.js b/tests/wpt/tests/webaudio/js/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/js/helpers.js rename to tests/wpt/tests/webaudio/js/helpers.js diff --git a/tests/wpt/web-platform-tests/webaudio/js/worklet-recorder.js b/tests/wpt/tests/webaudio/js/worklet-recorder.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/js/worklet-recorder.js rename to tests/wpt/tests/webaudio/js/worklet-recorder.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/4ch-440.wav b/tests/wpt/tests/webaudio/resources/4ch-440.wav similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/4ch-440.wav rename to tests/wpt/tests/webaudio/resources/4ch-440.wav diff --git a/tests/wpt/web-platform-tests/webaudio/resources/audio-param.js b/tests/wpt/tests/webaudio/resources/audio-param.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/audio-param.js rename to tests/wpt/tests/webaudio/resources/audio-param.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/audiobuffersource-testing.js b/tests/wpt/tests/webaudio/resources/audiobuffersource-testing.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/audiobuffersource-testing.js rename to tests/wpt/tests/webaudio/resources/audiobuffersource-testing.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/audionodeoptions.js b/tests/wpt/tests/webaudio/resources/audionodeoptions.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/audionodeoptions.js rename to tests/wpt/tests/webaudio/resources/audionodeoptions.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/audioparam-testing.js b/tests/wpt/tests/webaudio/resources/audioparam-testing.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/audioparam-testing.js rename to tests/wpt/tests/webaudio/resources/audioparam-testing.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/audit-util.js b/tests/wpt/tests/webaudio/resources/audit-util.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/audit-util.js rename to tests/wpt/tests/webaudio/resources/audit-util.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/audit.js b/tests/wpt/tests/webaudio/resources/audit.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/audit.js rename to tests/wpt/tests/webaudio/resources/audit.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/biquad-filters.js b/tests/wpt/tests/webaudio/resources/biquad-filters.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/biquad-filters.js rename to tests/wpt/tests/webaudio/resources/biquad-filters.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/biquad-testing.js b/tests/wpt/tests/webaudio/resources/biquad-testing.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/biquad-testing.js rename to tests/wpt/tests/webaudio/resources/biquad-testing.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/convolution-testing.js b/tests/wpt/tests/webaudio/resources/convolution-testing.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/convolution-testing.js rename to tests/wpt/tests/webaudio/resources/convolution-testing.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/delay-testing.js b/tests/wpt/tests/webaudio/resources/delay-testing.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/delay-testing.js rename to tests/wpt/tests/webaudio/resources/delay-testing.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/distance-model-testing.js b/tests/wpt/tests/webaudio/resources/distance-model-testing.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/distance-model-testing.js rename to tests/wpt/tests/webaudio/resources/distance-model-testing.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/merger-testing.js b/tests/wpt/tests/webaudio/resources/merger-testing.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/merger-testing.js rename to tests/wpt/tests/webaudio/resources/merger-testing.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/mix-testing.js b/tests/wpt/tests/webaudio/resources/mix-testing.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/mix-testing.js rename to tests/wpt/tests/webaudio/resources/mix-testing.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/mixing-rules.js b/tests/wpt/tests/webaudio/resources/mixing-rules.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/mixing-rules.js rename to tests/wpt/tests/webaudio/resources/mixing-rules.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/note-grain-on-testing.js b/tests/wpt/tests/webaudio/resources/note-grain-on-testing.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/note-grain-on-testing.js rename to tests/wpt/tests/webaudio/resources/note-grain-on-testing.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/panner-formulas.js b/tests/wpt/tests/webaudio/resources/panner-formulas.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/panner-formulas.js rename to tests/wpt/tests/webaudio/resources/panner-formulas.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/panner-model-testing.js b/tests/wpt/tests/webaudio/resources/panner-model-testing.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/panner-model-testing.js rename to tests/wpt/tests/webaudio/resources/panner-model-testing.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/sin_440Hz_-6dBFS_1s.wav b/tests/wpt/tests/webaudio/resources/sin_440Hz_-6dBFS_1s.wav similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/sin_440Hz_-6dBFS_1s.wav rename to tests/wpt/tests/webaudio/resources/sin_440Hz_-6dBFS_1s.wav diff --git a/tests/wpt/web-platform-tests/webaudio/resources/start-stop-exceptions.js b/tests/wpt/tests/webaudio/resources/start-stop-exceptions.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/start-stop-exceptions.js rename to tests/wpt/tests/webaudio/resources/start-stop-exceptions.js diff --git a/tests/wpt/web-platform-tests/webaudio/resources/stereopanner-testing.js b/tests/wpt/tests/webaudio/resources/stereopanner-testing.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/resources/stereopanner-testing.js rename to tests/wpt/tests/webaudio/resources/stereopanner-testing.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/cycle-without-delay.html b/tests/wpt/tests/webaudio/the-audio-api/processing-model/cycle-without-delay.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/cycle-without-delay.html rename to tests/wpt/tests/webaudio/the-audio-api/processing-model/cycle-without-delay.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/delay-time-clamping.html b/tests/wpt/tests/webaudio/the-audio-api/processing-model/delay-time-clamping.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/delay-time-clamping.html rename to tests/wpt/tests/webaudio/the-audio-api/processing-model/delay-time-clamping.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/feedback-delay-time.html b/tests/wpt/tests/webaudio/the-audio-api/processing-model/feedback-delay-time.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/feedback-delay-time.html rename to tests/wpt/tests/webaudio/the-audio-api/processing-model/feedback-delay-time.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/ctor-analyser.html b/tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/ctor-analyser.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/ctor-analyser.html rename to tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/ctor-analyser.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-basic.html b/tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-basic.html rename to tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-basic.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html b/tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html rename to tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-sizing.html b/tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-sizing.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-sizing.html rename to tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-sizing.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-gain.html b/tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-gain.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-gain.html rename to tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-gain.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-minimum.html b/tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-minimum.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-minimum.html rename to tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-minimum.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-output.html b/tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-output.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-output.html rename to tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-output.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-scale.html b/tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-scale.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-scale.html rename to tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/test-analyser-scale.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/test-analysernode.html b/tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/test-analysernode.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/test-analysernode.html rename to tests/wpt/tests/webaudio/the-audio-api/the-analysernode-interface/test-analysernode.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/acquire-the-content.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/acquire-the-content.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/acquire-the-content.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/acquire-the-content.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-copy-channel.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-copy-channel.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-copy-channel.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-copy-channel.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-getChannelData.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-getChannelData.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-getChannelData.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-getChannelData.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-reuse.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-reuse.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-reuse.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-reuse.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/crashtests/copyFromChannel-bufferOffset-1.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/crashtests/copyFromChannel-bufferOffset-1.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/crashtests/copyFromChannel-bufferOffset-1.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/crashtests/copyFromChannel-bufferOffset-1.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/crashtests/copyToChannel-bufferOffset-1.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/crashtests/copyToChannel-bufferOffset-1.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/crashtests/copyToChannel-bufferOffset-1.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/crashtests/copyToChannel-bufferOffset-1.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/ctor-audiobuffer.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/ctor-audiobuffer.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/ctor-audiobuffer.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffer-interface/ctor-audiobuffer.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/active-processing.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/active-processing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/active-processing.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/active-processing.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-basic.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-basic.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-basic.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-channels.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-channels.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-channels.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-channels.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-duration-loop.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-duration-loop.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-duration-loop.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-duration-loop.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-ended.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-ended.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-ended.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-ended.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-grain.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-grain.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-grain.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-grain.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-null.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-null.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-null.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-null.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-one-sample-loop.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-one-sample-loop.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-one-sample-loop.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-one-sample-loop.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-playbackrate-zero.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-playbackrate-zero.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-playbackrate-zero.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-playbackrate-zero.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-start.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-start.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-start.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-start.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiosource-onended.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiosource-onended.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiosource-onended.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiosource-onended.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiosource-time-limits.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiosource-time-limits.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiosource-time-limits.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiosource-time-limits.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/buffer-resampling.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/buffer-resampling.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/buffer-resampling.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/buffer-resampling.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/ctor-audiobuffersource.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/ctor-audiobuffersource.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/ctor-audiobuffersource.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/ctor-audiobuffersource.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/note-grain-on-play.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/note-grain-on-play.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/note-grain-on-play.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/note-grain-on-play.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/note-grain-on-timing.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/note-grain-on-timing.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/note-grain-on-timing.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/note-grain-on-timing.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/resources/audiobuffersource-multi-channels-expected.wav b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/resources/audiobuffersource-multi-channels-expected.wav similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/resources/audiobuffersource-multi-channels-expected.wav rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/resources/audiobuffersource-multi-channels-expected.wav diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sample-accurate-scheduling.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sample-accurate-scheduling.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sample-accurate-scheduling.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sample-accurate-scheduling.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-scheduling.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-scheduling.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-scheduling.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-scheduling.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-detached-execution-context.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-detached-execution-context.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-detached-execution-context.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-detached-execution-context.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-getoutputtimestamp-cross-realm.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-getoutputtimestamp-cross-realm.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-getoutputtimestamp-cross-realm.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-getoutputtimestamp-cross-realm.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-getoutputtimestamp.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-getoutputtimestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-getoutputtimestamp.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-getoutputtimestamp.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-constructor.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-constructor.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-constructor.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-setsinkid.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-setsinkid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-setsinkid.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-setsinkid.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-state-change.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-state-change.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-state-change.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-sinkid-state-change.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-state-change-after-close.http.window.js b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-state-change-after-close.http.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-state-change-after-close.http.window.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-state-change-after-close.http.window.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume-close.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume-close.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume-close.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume-close.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/constructor-allowed-to-start.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/constructor-allowed-to-start.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/constructor-allowed-to-start.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/constructor-allowed-to-start.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/crashtests/currentTime-after-discard.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/crashtests/currentTime-after-discard.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/crashtests/currentTime-after-discard.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/crashtests/currentTime-after-discard.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/processing-after-resume.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/processing-after-resume.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/processing-after-resume.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/processing-after-resume.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/promise-methods-after-discard.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/promise-methods-after-discard.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/promise-methods-after-discard.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/promise-methods-after-discard.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/resources/not-fully-active-helper.sub.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/resources/not-fully-active-helper.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/resources/not-fully-active-helper.sub.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/resources/not-fully-active-helper.sub.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/suspend-after-construct.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/suspend-after-construct.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/suspend-after-construct.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/suspend-after-construct.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/suspend-with-navigation.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/suspend-with-navigation.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/suspend-with-navigation.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/suspend-with-navigation.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiodestinationnode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-audiodestinationnode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiodestinationnode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-audiodestinationnode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiolistener-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-audiolistener-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiolistener-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-audiolistener-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-channel-rules.html b/tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode-channel-rules.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-channel-rules.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode-channel-rules.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-method-chaining.html b/tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-method-chaining.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-method-chaining.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-method-chaining.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-order.html b/tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-order.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-order.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-order.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-return-value.html b/tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-return-value.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-return-value.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode-connect-return-value.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-disconnect-audioparam.html b/tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode-disconnect-audioparam.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-disconnect-audioparam.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode-disconnect-audioparam.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-disconnect.html b/tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode-disconnect.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-disconnect.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode-disconnect.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-iframe.window.js b/tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode-iframe.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode-iframe.window.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode-iframe.window.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode.html b/tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/audionode.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/audionode.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/channel-mode-interp-basic.html b/tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/channel-mode-interp-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/channel-mode-interp-basic.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/channel-mode-interp-basic.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/different-contexts.html b/tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/different-contexts.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audionode-interface/different-contexts.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audionode-interface/different-contexts.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/adding-events.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/adding-events.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/adding-events.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/adding-events.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-cancel-and-hold.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-cancel-and-hold.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-cancel-and-hold.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-cancel-and-hold.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-close.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-close.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-close.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-close.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-connect-audioratesignal.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-connect-audioratesignal.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-connect-audioratesignal.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-connect-audioratesignal.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-exceptional-values.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-exceptional-values.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-exceptional-values.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-exceptional-values.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-exponentialRampToValueAtTime.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-exponentialRampToValueAtTime.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-exponentialRampToValueAtTime.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-exponentialRampToValueAtTime.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-large-endtime.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-large-endtime.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-large-endtime.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-large-endtime.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-linearRampToValueAtTime.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-linearRampToValueAtTime.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-linearRampToValueAtTime.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-linearRampToValueAtTime.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-method-chaining.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-method-chaining.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-method-chaining.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-method-chaining.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-nominal-range.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-nominal-range.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-nominal-range.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-nominal-range.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setTargetAtTime.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setTargetAtTime.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setTargetAtTime.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setTargetAtTime.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueAtTime.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueAtTime.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueAtTime.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueAtTime.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurve-exceptions.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurve-exceptions.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurve-exceptions.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurve-exceptions.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurveAtTime.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurveAtTime.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurveAtTime.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurveAtTime.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-summingjunction.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-summingjunction.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-summingjunction.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-summingjunction.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/automation-rate-testing.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/automation-rate-testing.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/automation-rate-testing.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/automation-rate-testing.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/automation-rate.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/automation-rate.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/automation-rate.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/automation-rate.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/cancel-scheduled-values.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/cancel-scheduled-values.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/cancel-scheduled-values.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/cancel-scheduled-values.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/event-insertion.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/event-insertion.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/event-insertion.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/event-insertion.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-audiobuffersource-connections.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-audiobuffersource-connections.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-audiobuffersource-connections.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-audiobuffersource-connections.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-audioworklet-connections.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-audioworklet-connections.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-audioworklet-connections.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-audioworklet-connections.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-audioworklet.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-audioworklet.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-audioworklet.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-audioworklet.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-biquad-connection.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-biquad-connection.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-biquad-connection.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-biquad-connection.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-biquad.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-biquad.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-biquad.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-biquad.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-connections.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-connections.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-connections.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-connections.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-constant-source.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-constant-source.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-constant-source.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-constant-source.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-delay-connections.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-delay-connections.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-delay-connections.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-delay-connections.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-delay.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-delay.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-delay.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-delay.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-dynamics-compressor-connections.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-dynamics-compressor-connections.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-dynamics-compressor-connections.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-dynamics-compressor-connections.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-gain.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-gain.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-gain.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-gain.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-oscillator-connections.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-oscillator-connections.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-oscillator-connections.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-oscillator-connections.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-oscillator.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-oscillator.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-oscillator.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-oscillator.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-panner-connections.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-panner-connections.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-panner-connections.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-panner-connections.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-panner.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-panner.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-panner.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-panner.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-stereo-panner.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-stereo-panner.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-stereo-panner.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-stereo-panner.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/nan-param.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/nan-param.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/nan-param.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/nan-param.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-exponentialRampToValueAtTime.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-exponentialRampToValueAtTime.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-exponentialRampToValueAtTime.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-exponentialRampToValueAtTime.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-linearRampToValueAtTime.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-linearRampToValueAtTime.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-linearRampToValueAtTime.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-linearRampToValueAtTime.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-setTargetAtTime.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-setTargetAtTime.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-setTargetAtTime.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-setTargetAtTime.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-setValueAtTime.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-setValueAtTime.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-setValueAtTime.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-setValueAtTime.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-setValueCurveAtTime.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-setValueCurveAtTime.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-setValueCurveAtTime.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-setValueCurveAtTime.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-test.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-test.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-test.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/retrospective-test.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/set-target-conv.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/set-target-conv.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/set-target-conv.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/set-target-conv.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/setValueAtTime-within-block.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/setValueAtTime-within-block.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/setValueAtTime-within-block.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/setValueAtTime-within-block.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioprocessingevent-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-audioprocessingevent-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioprocessingevent-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-audioprocessingevent-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-addmodule-resolution.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-addmodule-resolution.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-addmodule-resolution.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-addmodule-resolution.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam-iterable.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam-iterable.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam-iterable.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam-iterable.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam-size.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam-size.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam-size.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam-size.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-audioparam.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-denormals.https.window.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-denormals.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-denormals.https.window.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-denormals.https.window.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-messageport.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-messageport.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-messageport.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-messageport.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-postmessage-sharedarraybuffer.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-postmessage-sharedarraybuffer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-postmessage-sharedarraybuffer.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-postmessage-sharedarraybuffer.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-postmessage-sharedarraybuffer.https.html.headers b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-postmessage-sharedarraybuffer.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-postmessage-sharedarraybuffer.https.html.headers rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-postmessage-sharedarraybuffer.https.html.headers diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-registerprocessor-called-on-globalthis.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-registerprocessor-called-on-globalthis.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-registerprocessor-called-on-globalthis.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-registerprocessor-called-on-globalthis.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-registerprocessor-dynamic.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-registerprocessor-dynamic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-registerprocessor-dynamic.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-registerprocessor-dynamic.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-suspend.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-suspend.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-suspend.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-suspend.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-throw-onmessage.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-throw-onmessage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-throw-onmessage.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-throw-onmessage.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletglobalscope-sample-rate.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletglobalscope-sample-rate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletglobalscope-sample-rate.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletglobalscope-sample-rate.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletglobalscope-timing-info.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletglobalscope-timing-info.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletglobalscope-timing-info.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletglobalscope-timing-info.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-automatic-pull.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-automatic-pull.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-automatic-pull.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-automatic-pull.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-channel-count.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-channel-count.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-channel-count.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-channel-count.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-construction.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-construction.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-construction.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-construction.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-constructor-options.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-constructor-options.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-constructor-options.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-constructor-options.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-disconnected-input.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-disconnected-input.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-disconnected-input.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-disconnected-input.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-onerror.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-onerror.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-onerror.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-onerror.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-output-channel-count.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-output-channel-count.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-output-channel-count.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-output-channel-count.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-options.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-options.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-options.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-options.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-param-getter-overridden.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-param-getter-overridden.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-param-getter-overridden.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-param-getter-overridden.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-process-frozen-array.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-process-frozen-array.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-process-frozen-array.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-process-frozen-array.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-process-zero-outputs.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-process-zero-outputs.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-process-zero-outputs.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-process-zero-outputs.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-promises.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-promises.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-promises.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletprocessor-promises.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/baseaudiocontext-audioworklet.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/baseaudiocontext-audioworklet.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/baseaudiocontext-audioworklet.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/baseaudiocontext-audioworklet.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/process-getter.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/process-getter.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/process-getter.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/process-getter.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/process-parameters.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/process-parameters.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/process-parameters.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/process-parameters.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processor-construction-port.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processor-construction-port.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processor-construction-port.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processor-construction-port.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/active-processing.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/active-processing.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/active-processing.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/active-processing.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/add-offset.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/add-offset.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/add-offset.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/add-offset.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/array-check-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/array-check-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/array-check-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/array-check-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/channel-count-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/channel-count-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/channel-count-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/channel-count-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-new-after-new.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-new-after-new.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-new-after-new.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-new-after-new.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-new-after-super.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-new-after-super.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-new-after-super.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-new-after-super.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-singleton.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-singleton.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-singleton.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-singleton.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-super-after-new.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-super-after-new.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-super-after-new.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/construction-port-super-after-new.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/denormal-test-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/denormal-test-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/denormal-test-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/denormal-test-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/dummy-processor-globalthis.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/dummy-processor-globalthis.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/dummy-processor-globalthis.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/dummy-processor-globalthis.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/dummy-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/dummy-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/dummy-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/dummy-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/dynamic-register-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/dynamic-register-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/dynamic-register-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/dynamic-register-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/error-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/error-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/error-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/error-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/gain-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/gain-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/gain-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/gain-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/input-count-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/input-count-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/input-count-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/input-count-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/input-length-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/input-length-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/input-length-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/input-length-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/invalid-param-array-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/invalid-param-array-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/invalid-param-array-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/invalid-param-array-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/one-pole-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/one-pole-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/one-pole-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/one-pole-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/option-test-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/option-test-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/option-test-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/option-test-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/param-size-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/param-size-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/param-size-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/param-size-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/port-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/port-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/port-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/port-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/process-getter-test-instance-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/process-getter-test-instance-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/process-getter-test-instance-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/process-getter-test-instance-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/process-getter-test-prototype-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/process-getter-test-prototype-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/process-getter-test-prototype-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/process-getter-test-prototype-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/process-parameter-test-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/process-parameter-test-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/process-parameter-test-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/process-parameter-test-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/promise-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/promise-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/promise-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/promise-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/sharedarraybuffer-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/sharedarraybuffer-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/sharedarraybuffer-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/sharedarraybuffer-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/timing-info-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/timing-info-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/timing-info-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/timing-info-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/zero-output-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/zero-output-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/zero-output-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/zero-output-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/zero-outputs-check-processor.js b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/zero-outputs-check-processor.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/processors/zero-outputs-check-processor.js rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/processors/zero-outputs-check-processor.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/simple-input-output.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/simple-input-output.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/simple-input-output.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/simple-input-output.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/suspended-context-messageport.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/suspended-context-messageport.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/suspended-context-messageport.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-audioworklet-interface/suspended-context-messageport.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-allpass.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-allpass.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-allpass.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-allpass.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-automation.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-automation.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-automation.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-automation.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-bandpass.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-bandpass.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-bandpass.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-bandpass.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-basic.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-basic.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-basic.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-getFrequencyResponse.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-getFrequencyResponse.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-getFrequencyResponse.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-getFrequencyResponse.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-highpass.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-highpass.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-highpass.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-highpass.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-highshelf.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-highshelf.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-highshelf.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-highshelf.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-lowpass.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-lowpass.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-lowpass.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-lowpass.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-lowshelf.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-lowshelf.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-lowshelf.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-lowshelf.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-notch.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-notch.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-notch.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-notch.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-peaking.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-peaking.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-peaking.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-peaking.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-tail.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-tail.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-tail.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-tail.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquadfilternode-basic.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquadfilternode-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquadfilternode-basic.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquadfilternode-basic.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/ctor-biquadfilter.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/ctor-biquadfilter.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/ctor-biquadfilter.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/ctor-biquadfilter.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/no-dezippering.html b/tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/no-dezippering.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/no-dezippering.html rename to tests/wpt/tests/webaudio/the-audio-api/the-biquadfilternode-interface/no-dezippering.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelmergernode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-channelmergernode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelmergernode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-channelmergernode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelmergernode-interface/active-processing.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-channelmergernode-interface/active-processing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelmergernode-interface/active-processing.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-channelmergernode-interface/active-processing.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-basic.html b/tests/wpt/tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-basic.html rename to tests/wpt/tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-basic.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-disconnect.html b/tests/wpt/tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-disconnect.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-disconnect.html rename to tests/wpt/tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-disconnect.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-input-non-default.html b/tests/wpt/tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-input-non-default.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-input-non-default.html rename to tests/wpt/tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-input-non-default.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-input.html b/tests/wpt/tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-input.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-input.html rename to tests/wpt/tests/webaudio/the-audio-api/the-channelmergernode-interface/audiochannelmerger-input.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelmergernode-interface/ctor-channelmerger.html b/tests/wpt/tests/webaudio/the-audio-api/the-channelmergernode-interface/ctor-channelmerger.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelmergernode-interface/ctor-channelmerger.html rename to tests/wpt/tests/webaudio/the-audio-api/the-channelmergernode-interface/ctor-channelmerger.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelsplitternode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-channelsplitternode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelsplitternode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-channelsplitternode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelsplitternode-interface/audiochannelsplitter.html b/tests/wpt/tests/webaudio/the-audio-api/the-channelsplitternode-interface/audiochannelsplitter.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelsplitternode-interface/audiochannelsplitter.html rename to tests/wpt/tests/webaudio/the-audio-api/the-channelsplitternode-interface/audiochannelsplitter.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelsplitternode-interface/ctor-channelsplitter.html b/tests/wpt/tests/webaudio/the-audio-api/the-channelsplitternode-interface/ctor-channelsplitter.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-channelsplitternode-interface/ctor-channelsplitter.html rename to tests/wpt/tests/webaudio/the-audio-api/the-channelsplitternode-interface/ctor-channelsplitter.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-constantsourcenode-interface/constant-source-basic.html b/tests/wpt/tests/webaudio/the-audio-api/the-constantsourcenode-interface/constant-source-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-constantsourcenode-interface/constant-source-basic.html rename to tests/wpt/tests/webaudio/the-audio-api/the-constantsourcenode-interface/constant-source-basic.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-constantsourcenode-interface/constant-source-onended.html b/tests/wpt/tests/webaudio/the-audio-api/the-constantsourcenode-interface/constant-source-onended.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-constantsourcenode-interface/constant-source-onended.html rename to tests/wpt/tests/webaudio/the-audio-api/the-constantsourcenode-interface/constant-source-onended.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-constantsourcenode-interface/constant-source-output.html b/tests/wpt/tests/webaudio/the-audio-api/the-constantsourcenode-interface/constant-source-output.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-constantsourcenode-interface/constant-source-output.html rename to tests/wpt/tests/webaudio/the-audio-api/the-constantsourcenode-interface/constant-source-output.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-constantsourcenode-interface/ctor-constantsource.html b/tests/wpt/tests/webaudio/the-audio-api/the-constantsourcenode-interface/ctor-constantsource.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-constantsourcenode-interface/ctor-constantsource.html rename to tests/wpt/tests/webaudio/the-audio-api/the-constantsourcenode-interface/ctor-constantsource.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-constantsourcenode-interface/test-constantsourcenode.html b/tests/wpt/tests/webaudio/the-audio-api/the-constantsourcenode-interface/test-constantsourcenode.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-constantsourcenode-interface/test-constantsourcenode.html rename to tests/wpt/tests/webaudio/the-audio-api/the-constantsourcenode-interface/test-constantsourcenode.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/active-processing.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/active-processing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/active-processing.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/active-processing.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolution-mono-mono.html b/tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolution-mono-mono.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolution-mono-mono.html rename to tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolution-mono-mono.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-cascade.html b/tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-cascade.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-cascade.html rename to tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-cascade.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-channels.html b/tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-channels.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-channels.html rename to tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-channels.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-response-1-chan.html b/tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-response-1-chan.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-response-1-chan.html rename to tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-response-1-chan.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-response-2-chan.html b/tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-response-2-chan.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-response-2-chan.html rename to tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-response-2-chan.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-response-4-chan.html b/tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-response-4-chan.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-response-4-chan.html rename to tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-response-4-chan.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-setBuffer-already-has-value.html b/tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-setBuffer-already-has-value.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-setBuffer-already-has-value.html rename to tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-setBuffer-already-has-value.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-setBuffer-null.html b/tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-setBuffer-null.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-setBuffer-null.html rename to tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-setBuffer-null.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-upmixing-1-channel-response.html b/tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-upmixing-1-channel-response.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-upmixing-1-channel-response.html rename to tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/convolver-upmixing-1-channel-response.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/ctor-convolver.html b/tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/ctor-convolver.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/ctor-convolver.html rename to tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/ctor-convolver.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/realtime-conv.html b/tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/realtime-conv.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/realtime-conv.html rename to tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/realtime-conv.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/transferred-buffer-output.html b/tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/transferred-buffer-output.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/transferred-buffer-output.html rename to tests/wpt/tests/webaudio/the-audio-api/the-convolvernode-interface/transferred-buffer-output.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/ctor-delay.html b/tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/ctor-delay.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/ctor-delay.html rename to tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/ctor-delay.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delay-test.html b/tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delay-test.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delay-test.html rename to tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delay-test.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-channel-count-1.html b/tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-channel-count-1.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-channel-count-1.html rename to tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-channel-count-1.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-max-default-delay.html b/tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-max-default-delay.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-max-default-delay.html rename to tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-max-default-delay.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-max-nondefault-delay.html b/tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-max-nondefault-delay.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-max-nondefault-delay.html rename to tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-max-nondefault-delay.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-maxdelay.html b/tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-maxdelay.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-maxdelay.html rename to tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-maxdelay.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-maxdelaylimit.html b/tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-maxdelaylimit.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-maxdelaylimit.html rename to tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-maxdelaylimit.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-scheduling.html b/tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-scheduling.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-scheduling.html rename to tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delaynode-scheduling.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delaynode.html b/tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delaynode.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delaynode.html rename to tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/delaynode.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/maxdelay-rounding.html b/tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/maxdelay-rounding.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/maxdelay-rounding.html rename to tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/maxdelay-rounding.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/no-dezippering.html b/tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/no-dezippering.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/no-dezippering.html rename to tests/wpt/tests/webaudio/the-audio-api/the-delaynode-interface/no-dezippering.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-destinationnode-interface/destination.html b/tests/wpt/tests/webaudio/the-audio-api/the-destinationnode-interface/destination.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-destinationnode-interface/destination.html rename to tests/wpt/tests/webaudio/the-audio-api/the-destinationnode-interface/destination.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-dynamicscompressornode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-dynamicscompressornode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-dynamicscompressornode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-dynamicscompressornode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-dynamicscompressornode-interface/ctor-dynamicscompressor.html b/tests/wpt/tests/webaudio/the-audio-api/the-dynamicscompressornode-interface/ctor-dynamicscompressor.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-dynamicscompressornode-interface/ctor-dynamicscompressor.html rename to tests/wpt/tests/webaudio/the-audio-api/the-dynamicscompressornode-interface/ctor-dynamicscompressor.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-dynamicscompressornode-interface/dynamicscompressor-basic.html b/tests/wpt/tests/webaudio/the-audio-api/the-dynamicscompressornode-interface/dynamicscompressor-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-dynamicscompressornode-interface/dynamicscompressor-basic.html rename to tests/wpt/tests/webaudio/the-audio-api/the-dynamicscompressornode-interface/dynamicscompressor-basic.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-gainnode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-gainnode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-gainnode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-gainnode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-gainnode-interface/ctor-gain.html b/tests/wpt/tests/webaudio/the-audio-api/the-gainnode-interface/ctor-gain.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-gainnode-interface/ctor-gain.html rename to tests/wpt/tests/webaudio/the-audio-api/the-gainnode-interface/ctor-gain.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-gainnode-interface/gain-basic.html b/tests/wpt/tests/webaudio/the-audio-api/the-gainnode-interface/gain-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-gainnode-interface/gain-basic.html rename to tests/wpt/tests/webaudio/the-audio-api/the-gainnode-interface/gain-basic.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-gainnode-interface/gain.html b/tests/wpt/tests/webaudio/the-audio-api/the-gainnode-interface/gain.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-gainnode-interface/gain.html rename to tests/wpt/tests/webaudio/the-audio-api/the-gainnode-interface/gain.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-gainnode-interface/no-dezippering.html b/tests/wpt/tests/webaudio/the-audio-api/the-gainnode-interface/no-dezippering.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-gainnode-interface/no-dezippering.html rename to tests/wpt/tests/webaudio/the-audio-api/the-gainnode-interface/no-dezippering.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-iirfilternode-interface/ctor-iirfilter.html b/tests/wpt/tests/webaudio/the-audio-api/the-iirfilternode-interface/ctor-iirfilter.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-iirfilternode-interface/ctor-iirfilter.html rename to tests/wpt/tests/webaudio/the-audio-api/the-iirfilternode-interface/ctor-iirfilter.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-iirfilternode-interface/iirfilter-basic.html b/tests/wpt/tests/webaudio/the-audio-api/the-iirfilternode-interface/iirfilter-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-iirfilternode-interface/iirfilter-basic.html rename to tests/wpt/tests/webaudio/the-audio-api/the-iirfilternode-interface/iirfilter-basic.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-iirfilternode-interface/iirfilter-getFrequencyResponse.html b/tests/wpt/tests/webaudio/the-audio-api/the-iirfilternode-interface/iirfilter-getFrequencyResponse.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-iirfilternode-interface/iirfilter-getFrequencyResponse.html rename to tests/wpt/tests/webaudio/the-audio-api/the-iirfilternode-interface/iirfilter-getFrequencyResponse.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-iirfilternode-interface/iirfilter.html b/tests/wpt/tests/webaudio/the-audio-api/the-iirfilternode-interface/iirfilter.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-iirfilternode-interface/iirfilter.html rename to tests/wpt/tests/webaudio/the-audio-api/the-iirfilternode-interface/iirfilter.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-iirfilternode-interface/test-iirfilternode.html b/tests/wpt/tests/webaudio/the-audio-api/the-iirfilternode-interface/test-iirfilternode.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-iirfilternode-interface/test-iirfilternode.html rename to tests/wpt/tests/webaudio/the-audio-api/the-iirfilternode-interface/test-iirfilternode.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/cors-check.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/cors-check.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/cors-check.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/cors-check.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html b/tests/wpt/tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html rename to tests/wpt/tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/no-cors.https.html b/tests/wpt/tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/no-cors.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/no-cors.https.html rename to tests/wpt/tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/no-cors.https.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediastreamaudiodestinationnode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-mediastreamaudiodestinationnode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediastreamaudiodestinationnode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-mediastreamaudiodestinationnode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediastreamaudiodestinationnode-interface/ctor-mediastreamaudiodestination.html b/tests/wpt/tests/webaudio/the-audio-api/the-mediastreamaudiodestinationnode-interface/ctor-mediastreamaudiodestination.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediastreamaudiodestinationnode-interface/ctor-mediastreamaudiodestination.html rename to tests/wpt/tests/webaudio/the-audio-api/the-mediastreamaudiodestinationnode-interface/ctor-mediastreamaudiodestination.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediastreamaudiosourcenode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-mediastreamaudiosourcenode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediastreamaudiosourcenode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-mediastreamaudiosourcenode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediastreamaudiosourcenode-interface/mediastreamaudiosourcenode-ctor.html b/tests/wpt/tests/webaudio/the-audio-api/the-mediastreamaudiosourcenode-interface/mediastreamaudiosourcenode-ctor.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediastreamaudiosourcenode-interface/mediastreamaudiosourcenode-ctor.html rename to tests/wpt/tests/webaudio/the-audio-api/the-mediastreamaudiosourcenode-interface/mediastreamaudiosourcenode-ctor.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediastreamaudiosourcenode-interface/mediastreamaudiosourcenode-routing.html b/tests/wpt/tests/webaudio/the-audio-api/the-mediastreamaudiosourcenode-interface/mediastreamaudiosourcenode-routing.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-mediastreamaudiosourcenode-interface/mediastreamaudiosourcenode-routing.html rename to tests/wpt/tests/webaudio/the-audio-api/the-mediastreamaudiosourcenode-interface/mediastreamaudiosourcenode-routing.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/ctor-offlineaudiocontext.html b/tests/wpt/tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/ctor-offlineaudiocontext.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/ctor-offlineaudiocontext.html rename to tests/wpt/tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/ctor-offlineaudiocontext.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/current-time-block-size.html b/tests/wpt/tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/current-time-block-size.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/current-time-block-size.html rename to tests/wpt/tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/current-time-block-size.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/offlineaudiocontext-detached-execution-context.html b/tests/wpt/tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/offlineaudiocontext-detached-execution-context.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/offlineaudiocontext-detached-execution-context.html rename to tests/wpt/tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/offlineaudiocontext-detached-execution-context.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/startrendering-after-discard.html b/tests/wpt/tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/startrendering-after-discard.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/startrendering-after-discard.html rename to tests/wpt/tests/webaudio/the-audio-api/the-offlineaudiocontext-interface/startrendering-after-discard.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-oscillatornode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-oscillatornode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-oscillatornode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-oscillatornode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-oscillatornode-interface/ctor-oscillator.html b/tests/wpt/tests/webaudio/the-audio-api/the-oscillatornode-interface/ctor-oscillator.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-oscillatornode-interface/ctor-oscillator.html rename to tests/wpt/tests/webaudio/the-audio-api/the-oscillatornode-interface/ctor-oscillator.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-oscillatornode-interface/detune-limiting.html b/tests/wpt/tests/webaudio/the-audio-api/the-oscillatornode-interface/detune-limiting.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-oscillatornode-interface/detune-limiting.html rename to tests/wpt/tests/webaudio/the-audio-api/the-oscillatornode-interface/detune-limiting.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-oscillatornode-interface/detune-overflow.html b/tests/wpt/tests/webaudio/the-audio-api/the-oscillatornode-interface/detune-overflow.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-oscillatornode-interface/detune-overflow.html rename to tests/wpt/tests/webaudio/the-audio-api/the-oscillatornode-interface/detune-overflow.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-oscillatornode-interface/osc-basic-waveform.html b/tests/wpt/tests/webaudio/the-audio-api/the-oscillatornode-interface/osc-basic-waveform.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-oscillatornode-interface/osc-basic-waveform.html rename to tests/wpt/tests/webaudio/the-audio-api/the-oscillatornode-interface/osc-basic-waveform.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/automation-changes.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/automation-changes.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/automation-changes.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/automation-changes.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/ctor-panner.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/ctor-panner.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/ctor-panner.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/ctor-panner.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/distance-exponential.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/distance-exponential.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/distance-exponential.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/distance-exponential.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/distance-inverse.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/distance-inverse.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/distance-inverse.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/distance-inverse.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/distance-linear.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/distance-linear.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/distance-linear.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/distance-linear.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-automation-basic.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-automation-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-automation-basic.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-automation-basic.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-automation-equalpower-stereo.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-automation-equalpower-stereo.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-automation-equalpower-stereo.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-automation-equalpower-stereo.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-automation-position.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-automation-position.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-automation-position.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-automation-position.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-azimuth.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-azimuth.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-azimuth.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-azimuth.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-distance-clamping.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-distance-clamping.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-distance-clamping.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-distance-clamping.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-equalpower-stereo.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-equalpower-stereo.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-equalpower-stereo.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-equalpower-stereo.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-equalpower.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-equalpower.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-equalpower.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-equalpower.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-rolloff-clamping.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-rolloff-clamping.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/panner-rolloff-clamping.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/panner-rolloff-clamping.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/pannernode-basic.window.js b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/pannernode-basic.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/pannernode-basic.window.js rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/pannernode-basic.window.js diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/pannernode-setposition-throws.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/pannernode-setposition-throws.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/pannernode-setposition-throws.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/pannernode-setposition-throws.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/test-pannernode-automation.html b/tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/test-pannernode-automation.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-pannernode-interface/test-pannernode-automation.html rename to tests/wpt/tests/webaudio/the-audio-api/the-pannernode-interface/test-pannernode-automation.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-periodicwave-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-periodicwave-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-periodicwave-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-periodicwave-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-periodicwave-interface/createPeriodicWaveInfiniteValuesThrows.html b/tests/wpt/tests/webaudio/the-audio-api/the-periodicwave-interface/createPeriodicWaveInfiniteValuesThrows.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-periodicwave-interface/createPeriodicWaveInfiniteValuesThrows.html rename to tests/wpt/tests/webaudio/the-audio-api/the-periodicwave-interface/createPeriodicWaveInfiniteValuesThrows.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-periodicwave-interface/periodicWave.html b/tests/wpt/tests/webaudio/the-audio-api/the-periodicwave-interface/periodicWave.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-periodicwave-interface/periodicWave.html rename to tests/wpt/tests/webaudio/the-audio-api/the-periodicwave-interface/periodicWave.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-scriptprocessornode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-scriptprocessornode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-scriptprocessornode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-scriptprocessornode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-scriptprocessornode-interface/simple-input-output.html b/tests/wpt/tests/webaudio/the-audio-api/the-scriptprocessornode-interface/simple-input-output.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-scriptprocessornode-interface/simple-input-output.html rename to tests/wpt/tests/webaudio/the-audio-api/the-scriptprocessornode-interface/simple-input-output.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-stereopanner-interface/ctor-stereopanner.html b/tests/wpt/tests/webaudio/the-audio-api/the-stereopanner-interface/ctor-stereopanner.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-stereopanner-interface/ctor-stereopanner.html rename to tests/wpt/tests/webaudio/the-audio-api/the-stereopanner-interface/ctor-stereopanner.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-stereopanner-interface/no-dezippering.html b/tests/wpt/tests/webaudio/the-audio-api/the-stereopanner-interface/no-dezippering.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-stereopanner-interface/no-dezippering.html rename to tests/wpt/tests/webaudio/the-audio-api/the-stereopanner-interface/no-dezippering.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-stereopanner-interface/stereopannernode-basic.html b/tests/wpt/tests/webaudio/the-audio-api/the-stereopanner-interface/stereopannernode-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-stereopanner-interface/stereopannernode-basic.html rename to tests/wpt/tests/webaudio/the-audio-api/the-stereopanner-interface/stereopannernode-basic.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-stereopanner-interface/stereopannernode-panning.html b/tests/wpt/tests/webaudio/the-audio-api/the-stereopanner-interface/stereopannernode-panning.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-stereopanner-interface/stereopannernode-panning.html rename to tests/wpt/tests/webaudio/the-audio-api/the-stereopanner-interface/stereopannernode-panning.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/.gitkeep b/tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/.gitkeep similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/.gitkeep rename to tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/.gitkeep diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/ctor-waveshaper.html b/tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/ctor-waveshaper.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/ctor-waveshaper.html rename to tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/ctor-waveshaper.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/curve-tests.html b/tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/curve-tests.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/curve-tests.html rename to tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/curve-tests.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/silent-inputs.html b/tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/silent-inputs.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/silent-inputs.html rename to tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/silent-inputs.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-copy-curve.html b/tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-copy-curve.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-copy-curve.html rename to tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-copy-curve.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-limits.html b/tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-limits.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-limits.html rename to tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-limits.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-simple.html b/tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-simple.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-simple.html rename to tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper-simple.html diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper.html b/tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper.html similarity index 100% rename from tests/wpt/web-platform-tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper.html rename to tests/wpt/tests/webaudio/the-audio-api/the-waveshapernode-interface/waveshaper.html diff --git a/tests/wpt/web-platform-tests/webauthn/META.yml b/tests/wpt/tests/webauthn/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/META.yml rename to tests/wpt/tests/webauthn/META.yml diff --git a/tests/wpt/web-platform-tests/webauthn/conditional-mediation.https.html b/tests/wpt/tests/webauthn/conditional-mediation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/conditional-mediation.https.html rename to tests/wpt/tests/webauthn/conditional-mediation.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-abort.https.html b/tests/wpt/tests/webauthn/createcredential-abort.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-abort.https.html rename to tests/wpt/tests/webauthn/createcredential-abort.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-attachment.https.html b/tests/wpt/tests/webauthn/createcredential-attachment.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-attachment.https.html rename to tests/wpt/tests/webauthn/createcredential-attachment.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-authnrselection.https.html b/tests/wpt/tests/webauthn/createcredential-badargs-authnrselection.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-badargs-authnrselection.https.html rename to tests/wpt/tests/webauthn/createcredential-badargs-authnrselection.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-challenge.https.html b/tests/wpt/tests/webauthn/createcredential-badargs-challenge.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-badargs-challenge.https.html rename to tests/wpt/tests/webauthn/createcredential-badargs-challenge.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-rp.https.html b/tests/wpt/tests/webauthn/createcredential-badargs-rp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-badargs-rp.https.html rename to tests/wpt/tests/webauthn/createcredential-badargs-rp.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-user.https.html b/tests/wpt/tests/webauthn/createcredential-badargs-user.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-badargs-user.https.html rename to tests/wpt/tests/webauthn/createcredential-badargs-user.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-excludecredentials.https.html b/tests/wpt/tests/webauthn/createcredential-excludecredentials.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-excludecredentials.https.html rename to tests/wpt/tests/webauthn/createcredential-excludecredentials.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-extensions.https.html b/tests/wpt/tests/webauthn/createcredential-extensions.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-extensions.https.html rename to tests/wpt/tests/webauthn/createcredential-extensions.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-getpublickey.https.html b/tests/wpt/tests/webauthn/createcredential-getpublickey.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-getpublickey.https.html rename to tests/wpt/tests/webauthn/createcredential-getpublickey.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-large-blob-not-supported.https.html b/tests/wpt/tests/webauthn/createcredential-large-blob-not-supported.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-large-blob-not-supported.https.html rename to tests/wpt/tests/webauthn/createcredential-large-blob-not-supported.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-large-blob-supported.https.html b/tests/wpt/tests/webauthn/createcredential-large-blob-supported.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-large-blob-supported.https.html rename to tests/wpt/tests/webauthn/createcredential-large-blob-supported.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-minpinlength.https.html b/tests/wpt/tests/webauthn/createcredential-minpinlength.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-minpinlength.https.html rename to tests/wpt/tests/webauthn/createcredential-minpinlength.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-passing.https.html b/tests/wpt/tests/webauthn/createcredential-passing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-passing.https.html rename to tests/wpt/tests/webauthn/createcredential-passing.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-prf.https.html b/tests/wpt/tests/webauthn/createcredential-prf.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-prf.https.html rename to tests/wpt/tests/webauthn/createcredential-prf.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-pubkeycredparams.https.html b/tests/wpt/tests/webauthn/createcredential-pubkeycredparams.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-pubkeycredparams.https.html rename to tests/wpt/tests/webauthn/createcredential-pubkeycredparams.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-resident-key.https.html b/tests/wpt/tests/webauthn/createcredential-resident-key.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-resident-key.https.html rename to tests/wpt/tests/webauthn/createcredential-resident-key.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-timeout.https.html b/tests/wpt/tests/webauthn/createcredential-timeout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/createcredential-timeout.https.html rename to tests/wpt/tests/webauthn/createcredential-timeout.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/credblob-not-supported.https.html b/tests/wpt/tests/webauthn/credblob-not-supported.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/credblob-not-supported.https.html rename to tests/wpt/tests/webauthn/credblob-not-supported.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/credblob-supported.https.html b/tests/wpt/tests/webauthn/credblob-supported.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/credblob-supported.https.html rename to tests/wpt/tests/webauthn/credblob-supported.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-abort.https.html b/tests/wpt/tests/webauthn/getcredential-abort.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/getcredential-abort.https.html rename to tests/wpt/tests/webauthn/getcredential-abort.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-attachment.https.html b/tests/wpt/tests/webauthn/getcredential-attachment.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/getcredential-attachment.https.html rename to tests/wpt/tests/webauthn/getcredential-attachment.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-badargs-rpid.https.html b/tests/wpt/tests/webauthn/getcredential-badargs-rpid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/getcredential-badargs-rpid.https.html rename to tests/wpt/tests/webauthn/getcredential-badargs-rpid.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-badargs-userverification.https.html b/tests/wpt/tests/webauthn/getcredential-badargs-userverification.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/getcredential-badargs-userverification.https.html rename to tests/wpt/tests/webauthn/getcredential-badargs-userverification.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-extensions.https.html b/tests/wpt/tests/webauthn/getcredential-extensions.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/getcredential-extensions.https.html rename to tests/wpt/tests/webauthn/getcredential-extensions.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-large-blob-not-supported.https.html b/tests/wpt/tests/webauthn/getcredential-large-blob-not-supported.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/getcredential-large-blob-not-supported.https.html rename to tests/wpt/tests/webauthn/getcredential-large-blob-not-supported.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-large-blob-supported.https.html b/tests/wpt/tests/webauthn/getcredential-large-blob-supported.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/getcredential-large-blob-supported.https.html rename to tests/wpt/tests/webauthn/getcredential-large-blob-supported.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-passing.https.html b/tests/wpt/tests/webauthn/getcredential-passing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/getcredential-passing.https.html rename to tests/wpt/tests/webauthn/getcredential-passing.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-prf.https.html b/tests/wpt/tests/webauthn/getcredential-prf.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/getcredential-prf.https.html rename to tests/wpt/tests/webauthn/getcredential-prf.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-rk-passing.https.html b/tests/wpt/tests/webauthn/getcredential-rk-passing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/getcredential-rk-passing.https.html rename to tests/wpt/tests/webauthn/getcredential-rk-passing.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-timeout.https.html b/tests/wpt/tests/webauthn/getcredential-timeout.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/getcredential-timeout.https.html rename to tests/wpt/tests/webauthn/getcredential-timeout.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/helpers.js b/tests/wpt/tests/webauthn/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/helpers.js rename to tests/wpt/tests/webauthn/helpers.js diff --git a/tests/wpt/web-platform-tests/webauthn/idlharness-manual.https.window.js b/tests/wpt/tests/webauthn/idlharness-manual.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/idlharness-manual.https.window.js rename to tests/wpt/tests/webauthn/idlharness-manual.https.window.js diff --git a/tests/wpt/web-platform-tests/webauthn/idlharness.https.window.js b/tests/wpt/tests/webauthn/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/idlharness.https.window.js rename to tests/wpt/tests/webauthn/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/webauthn/public-key-credential-to-json.https.window.js b/tests/wpt/tests/webauthn/public-key-credential-to-json.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/public-key-credential-to-json.https.window.js rename to tests/wpt/tests/webauthn/public-key-credential-to-json.https.window.js diff --git a/tests/wpt/web-platform-tests/webauthn/remote-desktop-client-override.tentative.https.html b/tests/wpt/tests/webauthn/remote-desktop-client-override.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/remote-desktop-client-override.tentative.https.html rename to tests/wpt/tests/webauthn/remote-desktop-client-override.tentative.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/resources/common-inputs.js b/tests/wpt/tests/webauthn/resources/common-inputs.js similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/resources/common-inputs.js rename to tests/wpt/tests/webauthn/resources/common-inputs.js diff --git a/tests/wpt/web-platform-tests/webauthn/resources/utils.js b/tests/wpt/tests/webauthn/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/resources/utils.js rename to tests/wpt/tests/webauthn/resources/utils.js diff --git a/tests/wpt/web-platform-tests/webauthn/securecontext.http.html b/tests/wpt/tests/webauthn/securecontext.http.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/securecontext.http.html rename to tests/wpt/tests/webauthn/securecontext.http.html diff --git a/tests/wpt/web-platform-tests/webauthn/securecontext.https.html b/tests/wpt/tests/webauthn/securecontext.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/securecontext.https.html rename to tests/wpt/tests/webauthn/securecontext.https.html diff --git a/tests/wpt/web-platform-tests/webauthn/webauthn-testdriver-basic.https.html b/tests/wpt/tests/webauthn/webauthn-testdriver-basic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webauthn/webauthn-testdriver-basic.https.html rename to tests/wpt/tests/webauthn/webauthn-testdriver-basic.https.html diff --git a/tests/wpt/web-platform-tests/webcodecs/META.yml b/tests/wpt/tests/webcodecs/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/META.yml rename to tests/wpt/tests/webcodecs/META.yml diff --git a/tests/wpt/web-platform-tests/webcodecs/README.md b/tests/wpt/tests/webcodecs/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/README.md rename to tests/wpt/tests/webcodecs/README.md diff --git a/tests/wpt/web-platform-tests/webcodecs/audio-data-serialization.any.js b/tests/wpt/tests/webcodecs/audio-data-serialization.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/audio-data-serialization.any.js rename to tests/wpt/tests/webcodecs/audio-data-serialization.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/audio-data.any.js b/tests/wpt/tests/webcodecs/audio-data.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/audio-data.any.js rename to tests/wpt/tests/webcodecs/audio-data.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/audio-data.crossOriginIsolated.https.any.js b/tests/wpt/tests/webcodecs/audio-data.crossOriginIsolated.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/audio-data.crossOriginIsolated.https.any.js rename to tests/wpt/tests/webcodecs/audio-data.crossOriginIsolated.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/audio-data.crossOriginIsolated.https.any.js.headers b/tests/wpt/tests/webcodecs/audio-data.crossOriginIsolated.https.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/audio-data.crossOriginIsolated.https.any.js.headers rename to tests/wpt/tests/webcodecs/audio-data.crossOriginIsolated.https.any.js.headers diff --git a/tests/wpt/web-platform-tests/webcodecs/audio-decoder.crossOriginIsolated.https.any.js b/tests/wpt/tests/webcodecs/audio-decoder.crossOriginIsolated.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/audio-decoder.crossOriginIsolated.https.any.js rename to tests/wpt/tests/webcodecs/audio-decoder.crossOriginIsolated.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/audio-decoder.crossOriginIsolated.https.any.js.headers b/tests/wpt/tests/webcodecs/audio-decoder.crossOriginIsolated.https.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/audio-decoder.crossOriginIsolated.https.any.js.headers rename to tests/wpt/tests/webcodecs/audio-decoder.crossOriginIsolated.https.any.js.headers diff --git a/tests/wpt/web-platform-tests/webcodecs/audio-decoder.https.any.js b/tests/wpt/tests/webcodecs/audio-decoder.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/audio-decoder.https.any.js rename to tests/wpt/tests/webcodecs/audio-decoder.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/audio-encoder-codec-specific.https.any.js b/tests/wpt/tests/webcodecs/audio-encoder-codec-specific.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/audio-encoder-codec-specific.https.any.js rename to tests/wpt/tests/webcodecs/audio-encoder-codec-specific.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/audio-encoder-config.https.any.js b/tests/wpt/tests/webcodecs/audio-encoder-config.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/audio-encoder-config.https.any.js rename to tests/wpt/tests/webcodecs/audio-encoder-config.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/audio-encoder.https.any.js b/tests/wpt/tests/webcodecs/audio-encoder.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/audio-encoder.https.any.js rename to tests/wpt/tests/webcodecs/audio-encoder.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/audioDecoder-codec-specific.https.any.js b/tests/wpt/tests/webcodecs/audioDecoder-codec-specific.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/audioDecoder-codec-specific.https.any.js rename to tests/wpt/tests/webcodecs/audioDecoder-codec-specific.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/av1.mp4 b/tests/wpt/tests/webcodecs/av1.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/av1.mp4 rename to tests/wpt/tests/webcodecs/av1.mp4 diff --git a/tests/wpt/web-platform-tests/webcodecs/chunk-serialization.any.js b/tests/wpt/tests/webcodecs/chunk-serialization.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/chunk-serialization.any.js rename to tests/wpt/tests/webcodecs/chunk-serialization.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/encoded-audio-chunk.any.js b/tests/wpt/tests/webcodecs/encoded-audio-chunk.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/encoded-audio-chunk.any.js rename to tests/wpt/tests/webcodecs/encoded-audio-chunk.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/encoded-audio-chunk.crossOriginIsolated.https.any.js b/tests/wpt/tests/webcodecs/encoded-audio-chunk.crossOriginIsolated.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/encoded-audio-chunk.crossOriginIsolated.https.any.js rename to tests/wpt/tests/webcodecs/encoded-audio-chunk.crossOriginIsolated.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/encoded-audio-chunk.crossOriginIsolated.https.any.js.headers b/tests/wpt/tests/webcodecs/encoded-audio-chunk.crossOriginIsolated.https.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/encoded-audio-chunk.crossOriginIsolated.https.any.js.headers rename to tests/wpt/tests/webcodecs/encoded-audio-chunk.crossOriginIsolated.https.any.js.headers diff --git a/tests/wpt/web-platform-tests/webcodecs/encoded-video-chunk.any.js b/tests/wpt/tests/webcodecs/encoded-video-chunk.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/encoded-video-chunk.any.js rename to tests/wpt/tests/webcodecs/encoded-video-chunk.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/encoded-video-chunk.crossOriginIsolated.https.any.js b/tests/wpt/tests/webcodecs/encoded-video-chunk.crossOriginIsolated.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/encoded-video-chunk.crossOriginIsolated.https.any.js rename to tests/wpt/tests/webcodecs/encoded-video-chunk.crossOriginIsolated.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/encoded-video-chunk.crossOriginIsolated.https.any.js.headers b/tests/wpt/tests/webcodecs/encoded-video-chunk.crossOriginIsolated.https.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/encoded-video-chunk.crossOriginIsolated.https.any.js.headers rename to tests/wpt/tests/webcodecs/encoded-video-chunk.crossOriginIsolated.https.any.js.headers diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors-flip.avif b/tests/wpt/tests/webcodecs/four-colors-flip.avif similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/four-colors-flip.avif rename to tests/wpt/tests/webcodecs/four-colors-flip.avif diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors-flip.gif b/tests/wpt/tests/webcodecs/four-colors-flip.gif similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/four-colors-flip.gif rename to tests/wpt/tests/webcodecs/four-colors-flip.gif diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors-full-range-bt2020-pq-444-10bpc.avif b/tests/wpt/tests/webcodecs/four-colors-full-range-bt2020-pq-444-10bpc.avif similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/four-colors-full-range-bt2020-pq-444-10bpc.avif rename to tests/wpt/tests/webcodecs/four-colors-full-range-bt2020-pq-444-10bpc.avif diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors-limited-range-420-8bpc.avif b/tests/wpt/tests/webcodecs/four-colors-limited-range-420-8bpc.avif similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/four-colors-limited-range-420-8bpc.avif rename to tests/wpt/tests/webcodecs/four-colors-limited-range-420-8bpc.avif diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors-limited-range-420-8bpc.jpg b/tests/wpt/tests/webcodecs/four-colors-limited-range-420-8bpc.jpg similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/four-colors-limited-range-420-8bpc.jpg rename to tests/wpt/tests/webcodecs/four-colors-limited-range-420-8bpc.jpg diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors-limited-range-420-8bpc.webp b/tests/wpt/tests/webcodecs/four-colors-limited-range-420-8bpc.webp similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/four-colors-limited-range-420-8bpc.webp rename to tests/wpt/tests/webcodecs/four-colors-limited-range-420-8bpc.webp diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors-limited-range-422-8bpc.avif b/tests/wpt/tests/webcodecs/four-colors-limited-range-422-8bpc.avif similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/four-colors-limited-range-422-8bpc.avif rename to tests/wpt/tests/webcodecs/four-colors-limited-range-422-8bpc.avif diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors-limited-range-444-8bpc.avif b/tests/wpt/tests/webcodecs/four-colors-limited-range-444-8bpc.avif similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/four-colors-limited-range-444-8bpc.avif rename to tests/wpt/tests/webcodecs/four-colors-limited-range-444-8bpc.avif diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors.avif b/tests/wpt/tests/webcodecs/four-colors.avif similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/four-colors.avif rename to tests/wpt/tests/webcodecs/four-colors.avif diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors.gif b/tests/wpt/tests/webcodecs/four-colors.gif similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/four-colors.gif rename to tests/wpt/tests/webcodecs/four-colors.gif diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors.jpg b/tests/wpt/tests/webcodecs/four-colors.jpg similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/four-colors.jpg rename to tests/wpt/tests/webcodecs/four-colors.jpg diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors.mp4 b/tests/wpt/tests/webcodecs/four-colors.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/four-colors.mp4 rename to tests/wpt/tests/webcodecs/four-colors.mp4 diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors.png b/tests/wpt/tests/webcodecs/four-colors.png similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/four-colors.png rename to tests/wpt/tests/webcodecs/four-colors.png diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors.webp b/tests/wpt/tests/webcodecs/four-colors.webp similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/four-colors.webp rename to tests/wpt/tests/webcodecs/four-colors.webp diff --git a/tests/wpt/web-platform-tests/webcodecs/full-cycle-test.https.any.js b/tests/wpt/tests/webcodecs/full-cycle-test.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/full-cycle-test.https.any.js rename to tests/wpt/tests/webcodecs/full-cycle-test.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/h264.annexb b/tests/wpt/tests/webcodecs/h264.annexb similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/h264.annexb rename to tests/wpt/tests/webcodecs/h264.annexb diff --git a/tests/wpt/web-platform-tests/webcodecs/h264.mp4 b/tests/wpt/tests/webcodecs/h264.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/h264.mp4 rename to tests/wpt/tests/webcodecs/h264.mp4 diff --git a/tests/wpt/web-platform-tests/webcodecs/idlharness.https.any.js b/tests/wpt/tests/webcodecs/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/idlharness.https.any.js rename to tests/wpt/tests/webcodecs/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/image-decoder-disconnect-readable-stream-crash.https.html b/tests/wpt/tests/webcodecs/image-decoder-disconnect-readable-stream-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/image-decoder-disconnect-readable-stream-crash.https.html rename to tests/wpt/tests/webcodecs/image-decoder-disconnect-readable-stream-crash.https.html diff --git a/tests/wpt/web-platform-tests/webcodecs/image-decoder-image-orientation-none.https.html b/tests/wpt/tests/webcodecs/image-decoder-image-orientation-none.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/image-decoder-image-orientation-none.https.html rename to tests/wpt/tests/webcodecs/image-decoder-image-orientation-none.https.html diff --git a/tests/wpt/web-platform-tests/webcodecs/image-decoder-utils.js b/tests/wpt/tests/webcodecs/image-decoder-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/image-decoder-utils.js rename to tests/wpt/tests/webcodecs/image-decoder-utils.js diff --git a/tests/wpt/web-platform-tests/webcodecs/image-decoder.crossOriginIsolated.https.any.js b/tests/wpt/tests/webcodecs/image-decoder.crossOriginIsolated.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/image-decoder.crossOriginIsolated.https.any.js rename to tests/wpt/tests/webcodecs/image-decoder.crossOriginIsolated.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/image-decoder.crossOriginIsolated.https.any.js.headers b/tests/wpt/tests/webcodecs/image-decoder.crossOriginIsolated.https.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/image-decoder.crossOriginIsolated.https.any.js.headers rename to tests/wpt/tests/webcodecs/image-decoder.crossOriginIsolated.https.any.js.headers diff --git a/tests/wpt/web-platform-tests/webcodecs/image-decoder.https.any.js b/tests/wpt/tests/webcodecs/image-decoder.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/image-decoder.https.any.js rename to tests/wpt/tests/webcodecs/image-decoder.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/pattern.png b/tests/wpt/tests/webcodecs/pattern.png similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/pattern.png rename to tests/wpt/tests/webcodecs/pattern.png diff --git a/tests/wpt/web-platform-tests/webcodecs/per-frame-qp-encoding.https.any.js b/tests/wpt/tests/webcodecs/per-frame-qp-encoding.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/per-frame-qp-encoding.https.any.js rename to tests/wpt/tests/webcodecs/per-frame-qp-encoding.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/reconfiguring-encoder.https.any.js b/tests/wpt/tests/webcodecs/reconfiguring-encoder.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/reconfiguring-encoder.https.any.js rename to tests/wpt/tests/webcodecs/reconfiguring-encoder.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/sfx-aac.mp4 b/tests/wpt/tests/webcodecs/sfx-aac.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/sfx-aac.mp4 rename to tests/wpt/tests/webcodecs/sfx-aac.mp4 diff --git a/tests/wpt/web-platform-tests/webcodecs/sfx-alaw.wav b/tests/wpt/tests/webcodecs/sfx-alaw.wav similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/sfx-alaw.wav rename to tests/wpt/tests/webcodecs/sfx-alaw.wav diff --git a/tests/wpt/web-platform-tests/webcodecs/sfx-mulaw.wav b/tests/wpt/tests/webcodecs/sfx-mulaw.wav similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/sfx-mulaw.wav rename to tests/wpt/tests/webcodecs/sfx-mulaw.wav diff --git a/tests/wpt/web-platform-tests/webcodecs/sfx-opus.ogg b/tests/wpt/tests/webcodecs/sfx-opus.ogg similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/sfx-opus.ogg rename to tests/wpt/tests/webcodecs/sfx-opus.ogg diff --git a/tests/wpt/web-platform-tests/webcodecs/sfx.adts b/tests/wpt/tests/webcodecs/sfx.adts similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/sfx.adts rename to tests/wpt/tests/webcodecs/sfx.adts diff --git a/tests/wpt/web-platform-tests/webcodecs/sfx.mp3 b/tests/wpt/tests/webcodecs/sfx.mp3 similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/sfx.mp3 rename to tests/wpt/tests/webcodecs/sfx.mp3 diff --git a/tests/wpt/web-platform-tests/webcodecs/temporal-svc-encoding.https.any.js b/tests/wpt/tests/webcodecs/temporal-svc-encoding.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/temporal-svc-encoding.https.any.js rename to tests/wpt/tests/webcodecs/temporal-svc-encoding.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/utils.js b/tests/wpt/tests/webcodecs/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/utils.js rename to tests/wpt/tests/webcodecs/utils.js diff --git a/tests/wpt/web-platform-tests/webcodecs/video-decoder.crossOriginIsolated.https.any.js b/tests/wpt/tests/webcodecs/video-decoder.crossOriginIsolated.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/video-decoder.crossOriginIsolated.https.any.js rename to tests/wpt/tests/webcodecs/video-decoder.crossOriginIsolated.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/video-decoder.crossOriginIsolated.https.any.js.headers b/tests/wpt/tests/webcodecs/video-decoder.crossOriginIsolated.https.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/video-decoder.crossOriginIsolated.https.any.js.headers rename to tests/wpt/tests/webcodecs/video-decoder.crossOriginIsolated.https.any.js.headers diff --git a/tests/wpt/web-platform-tests/webcodecs/video-decoder.https.any.js b/tests/wpt/tests/webcodecs/video-decoder.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/video-decoder.https.any.js rename to tests/wpt/tests/webcodecs/video-decoder.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/video-encoder-config.https.any.js b/tests/wpt/tests/webcodecs/video-encoder-config.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/video-encoder-config.https.any.js rename to tests/wpt/tests/webcodecs/video-encoder-config.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/video-encoder-utils.js b/tests/wpt/tests/webcodecs/video-encoder-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/video-encoder-utils.js rename to tests/wpt/tests/webcodecs/video-encoder-utils.js diff --git a/tests/wpt/web-platform-tests/webcodecs/video-encoder.https.any.js b/tests/wpt/tests/webcodecs/video-encoder.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/video-encoder.https.any.js rename to tests/wpt/tests/webcodecs/video-encoder.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/video-frame-serialization.any.js b/tests/wpt/tests/webcodecs/video-frame-serialization.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/video-frame-serialization.any.js rename to tests/wpt/tests/webcodecs/video-frame-serialization.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/videoColorSpace.any.js b/tests/wpt/tests/webcodecs/videoColorSpace.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoColorSpace.any.js rename to tests/wpt/tests/webcodecs/videoColorSpace.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/videoDecoder-codec-specific.https.any.js b/tests/wpt/tests/webcodecs/videoDecoder-codec-specific.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoDecoder-codec-specific.https.any.js rename to tests/wpt/tests/webcodecs/videoDecoder-codec-specific.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-alpha.any.js b/tests/wpt/tests/webcodecs/videoFrame-alpha.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-alpha.any.js rename to tests/wpt/tests/webcodecs/videoFrame-alpha.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-canvasImageSource.html b/tests/wpt/tests/webcodecs/videoFrame-canvasImageSource.html similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-canvasImageSource.html rename to tests/wpt/tests/webcodecs/videoFrame-canvasImageSource.html diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-construction.any.js b/tests/wpt/tests/webcodecs/videoFrame-construction.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-construction.any.js rename to tests/wpt/tests/webcodecs/videoFrame-construction.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-construction.crossOriginIsolated.https.any.js b/tests/wpt/tests/webcodecs/videoFrame-construction.crossOriginIsolated.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-construction.crossOriginIsolated.https.any.js rename to tests/wpt/tests/webcodecs/videoFrame-construction.crossOriginIsolated.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-construction.crossOriginIsolated.https.any.js.headers b/tests/wpt/tests/webcodecs/videoFrame-construction.crossOriginIsolated.https.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-construction.crossOriginIsolated.https.any.js.headers rename to tests/wpt/tests/webcodecs/videoFrame-construction.crossOriginIsolated.https.any.js.headers diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-construction.crossOriginSource.sub.html b/tests/wpt/tests/webcodecs/videoFrame-construction.crossOriginSource.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-construction.crossOriginSource.sub.html rename to tests/wpt/tests/webcodecs/videoFrame-construction.crossOriginSource.sub.html diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-construction.window.js b/tests/wpt/tests/webcodecs/videoFrame-construction.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-construction.window.js rename to tests/wpt/tests/webcodecs/videoFrame-construction.window.js diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-copyTo.any.js b/tests/wpt/tests/webcodecs/videoFrame-copyTo.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-copyTo.any.js rename to tests/wpt/tests/webcodecs/videoFrame-copyTo.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-copyTo.crossOriginIsolated.https.any.js b/tests/wpt/tests/webcodecs/videoFrame-copyTo.crossOriginIsolated.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-copyTo.crossOriginIsolated.https.any.js rename to tests/wpt/tests/webcodecs/videoFrame-copyTo.crossOriginIsolated.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-copyTo.crossOriginIsolated.https.any.js.headers b/tests/wpt/tests/webcodecs/videoFrame-copyTo.crossOriginIsolated.https.any.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-copyTo.crossOriginIsolated.https.any.js.headers rename to tests/wpt/tests/webcodecs/videoFrame-copyTo.crossOriginIsolated.https.any.js.headers diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-createImageBitmap.any.js b/tests/wpt/tests/webcodecs/videoFrame-createImageBitmap.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-createImageBitmap.any.js rename to tests/wpt/tests/webcodecs/videoFrame-createImageBitmap.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-createImageBitmap.https.any.js b/tests/wpt/tests/webcodecs/videoFrame-createImageBitmap.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-createImageBitmap.https.any.js rename to tests/wpt/tests/webcodecs/videoFrame-createImageBitmap.https.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-drawImage.any.js b/tests/wpt/tests/webcodecs/videoFrame-drawImage.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-drawImage.any.js rename to tests/wpt/tests/webcodecs/videoFrame-drawImage.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-serialization.crossAgentCluster.helper.html b/tests/wpt/tests/webcodecs/videoFrame-serialization.crossAgentCluster.helper.html similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-serialization.crossAgentCluster.helper.html rename to tests/wpt/tests/webcodecs/videoFrame-serialization.crossAgentCluster.helper.html diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-serialization.crossAgentCluster.https.html b/tests/wpt/tests/webcodecs/videoFrame-serialization.crossAgentCluster.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-serialization.crossAgentCluster.https.html rename to tests/wpt/tests/webcodecs/videoFrame-serialization.crossAgentCluster.https.html diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-serialization.crossAgentCluster.serviceworker.js b/tests/wpt/tests/webcodecs/videoFrame-serialization.crossAgentCluster.serviceworker.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-serialization.crossAgentCluster.serviceworker.js rename to tests/wpt/tests/webcodecs/videoFrame-serialization.crossAgentCluster.serviceworker.js diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-texImage.any.js b/tests/wpt/tests/webcodecs/videoFrame-texImage.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-texImage.any.js rename to tests/wpt/tests/webcodecs/videoFrame-texImage.any.js diff --git a/tests/wpt/web-platform-tests/webcodecs/videoFrame-utils.js b/tests/wpt/tests/webcodecs/videoFrame-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/videoFrame-utils.js rename to tests/wpt/tests/webcodecs/videoFrame-utils.js diff --git a/tests/wpt/web-platform-tests/webcodecs/vp8.webm b/tests/wpt/tests/webcodecs/vp8.webm similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/vp8.webm rename to tests/wpt/tests/webcodecs/vp8.webm diff --git a/tests/wpt/web-platform-tests/webcodecs/vp9.mp4 b/tests/wpt/tests/webcodecs/vp9.mp4 similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/vp9.mp4 rename to tests/wpt/tests/webcodecs/vp9.mp4 diff --git a/tests/wpt/web-platform-tests/webcodecs/webgl-test-utils.js b/tests/wpt/tests/webcodecs/webgl-test-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/webcodecs/webgl-test-utils.js rename to tests/wpt/tests/webcodecs/webgl-test-utils.js diff --git a/tests/wpt/web-platform-tests/webdriver/META.yml b/tests/wpt/tests/webdriver/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/META.yml rename to tests/wpt/tests/webdriver/META.yml diff --git a/tests/wpt/web-platform-tests/webdriver/README.md b/tests/wpt/tests/webdriver/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/README.md rename to tests/wpt/tests/webdriver/README.md diff --git a/tests/wpt/web-platform-tests/webdriver/tests/__init__.py b/tests/wpt/tests/webdriver/tests/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/__init__.py rename to tests/wpt/tests/webdriver/tests/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/capture_screenshot/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/capture_screenshot/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/capture_screenshot/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/capture_screenshot/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/capture_screenshot/capture_screenshot.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/capture_screenshot/capture_screenshot.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/capture_screenshot/capture_screenshot.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/capture_screenshot/capture_screenshot.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/capture_screenshot/frame.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/capture_screenshot/frame.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/capture_screenshot/frame.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/capture_screenshot/frame.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/capture_screenshot/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/capture_screenshot/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/capture_screenshot/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/capture_screenshot/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/classic_interop/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/classic_interop/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/classic_interop/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/classic_interop/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/classic_interop/window_handle.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/classic_interop/window_handle.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/classic_interop/window_handle.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/classic_interop/window_handle.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/close/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/close/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/close/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/close/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/close/close.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/close/close.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/close/close.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/close/close.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/close/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/close/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/close/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/close/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/context_created/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_created/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/context_created/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_created/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/context_created/context_created.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_created/context_created.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/context_created/context_created.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/context_created/context_created.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/create/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/create/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/create/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/create/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/create/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/create/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/create/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/create/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/create/reference_context.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/create/reference_context.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/create/reference_context.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/create/reference_context.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/create/type.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/create/type.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/create/type.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/create/type.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/dom_content_loaded/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/dom_content_loaded/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/dom_content_loaded/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/dom_content_loaded/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/dom_content_loaded/dom_content_loaded.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/dom_content_loaded/dom_content_loaded.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/dom_content_loaded/dom_content_loaded.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/dom_content_loaded/dom_content_loaded.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/get_tree/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/get_tree/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/get_tree/frames.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/frames.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/get_tree/frames.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/frames.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/get_tree/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/get_tree/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/get_tree/max_depth.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/max_depth.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/get_tree/max_depth.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/max_depth.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/get_tree/root.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/root.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/get_tree/root.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/get_tree/root.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/load/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/load/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/load/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/load/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/load/load.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/load/load.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/load/load.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/load/load.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/about_blank.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/about_blank.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/about_blank.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/about_blank.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/data_url.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/data_url.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/data_url.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/data_url.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/error.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/error.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/error.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/error.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/frame.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/frame.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/frame.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/frame.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/hash.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/hash.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/hash.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/hash.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/image.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/image.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/image.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/image.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/navigate.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/navigate.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/navigate.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/navigate.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/support/black_dot.png b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/support/black_dot.png similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/support/black_dot.png rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/support/black_dot.png diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/support/empty.html b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/support/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/support/empty.html rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/support/empty.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/support/empty.js b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/support/empty.js similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/support/empty.js rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/support/empty.js diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/support/empty.svg b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/support/empty.svg similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/support/empty.svg rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/support/empty.svg diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/support/other.html b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/support/other.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/support/other.html rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/support/other.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/support/other.svg b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/support/other.svg similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/support/other.svg rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/support/other.svg diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/support/red_dot.png b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/support/red_dot.png similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/support/red_dot.png rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/support/red_dot.png diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/wait.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/wait.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/navigate/wait.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigate/wait.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/background.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/background.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/background.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/background.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/context.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/context.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/context.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/context.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/margin.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/margin.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/margin.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/margin.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/orientation.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/orientation.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/orientation.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/orientation.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/page.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/page.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/page.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/page.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/page_ranges.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/page_ranges.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/page_ranges.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/page_ranges.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/scale.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/scale.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/scale.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/scale.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/shrink_to_fit.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/shrink_to_fit.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/print/shrink_to_fit.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/shrink_to_fit.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/reload/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/reload/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/reload/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/browsing_context/reload/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/errors/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/errors/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/errors/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/errors/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/errors/errors.py b/tests/wpt/tests/webdriver/tests/bidi/errors/errors.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/errors/errors.py rename to tests/wpt/tests/webdriver/tests/bidi/errors/errors.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/input/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/input/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/conftest.py b/tests/wpt/tests/webdriver/tests/bidi/input/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/conftest.py rename to tests/wpt/tests/webdriver/tests/bidi/input/conftest.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/key.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/key.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/key.py rename to tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/key.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/key_events.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/key_events.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/key_events.py rename to tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/key_events.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/key_modifier.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/key_modifier.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/key_modifier.py rename to tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/key_modifier.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse.py rename to tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_modifier.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_modifier.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_modifier.py rename to tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_modifier.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_multiclick.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_multiclick.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_multiclick.py rename to tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_multiclick.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/pointer_origin.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_origin.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/pointer_origin.py rename to tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_origin.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/pointer_pen.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_pen.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/pointer_pen.py rename to tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_pen.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/pointer_touch.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_touch.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/pointer_touch.py rename to tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_touch.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/wheel.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/wheel.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/perform_actions/wheel.py rename to tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/wheel.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/release_actions/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/input/release_actions/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/release_actions/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/input/release_actions/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/release_actions/context.py b/tests/wpt/tests/webdriver/tests/bidi/input/release_actions/context.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/release_actions/context.py rename to tests/wpt/tests/webdriver/tests/bidi/input/release_actions/context.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/release_actions/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/input/release_actions/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/release_actions/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/input/release_actions/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/release_actions/release.py b/tests/wpt/tests/webdriver/tests/bidi/input/release_actions/release.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/release_actions/release.py rename to tests/wpt/tests/webdriver/tests/bidi/input/release_actions/release.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/input/release_actions/sequence.py b/tests/wpt/tests/webdriver/tests/bidi/input/release_actions/sequence.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/input/release_actions/sequence.py rename to tests/wpt/tests/webdriver/tests/bidi/input/release_actions/sequence.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/log/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/log/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/log/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/log/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/log/entry_added/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/log/entry_added/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/console.py b/tests/wpt/tests/webdriver/tests/bidi/log/entry_added/console.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/console.py rename to tests/wpt/tests/webdriver/tests/bidi/log/entry_added/console.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/console_args.py b/tests/wpt/tests/webdriver/tests/bidi/log/entry_added/console_args.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/console_args.py rename to tests/wpt/tests/webdriver/tests/bidi/log/entry_added/console_args.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/event_buffer.py b/tests/wpt/tests/webdriver/tests/bidi/log/entry_added/event_buffer.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/event_buffer.py rename to tests/wpt/tests/webdriver/tests/bidi/log/entry_added/event_buffer.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/javascript.py b/tests/wpt/tests/webdriver/tests/bidi/log/entry_added/javascript.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/javascript.py rename to tests/wpt/tests/webdriver/tests/bidi/log/entry_added/javascript.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/realm.py b/tests/wpt/tests/webdriver/tests/bidi/log/entry_added/realm.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/realm.py rename to tests/wpt/tests/webdriver/tests/bidi/log/entry_added/realm.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/stacktrace.py b/tests/wpt/tests/webdriver/tests/bidi/log/entry_added/stacktrace.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/stacktrace.py rename to tests/wpt/tests/webdriver/tests/bidi/log/entry_added/stacktrace.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/subscription.py b/tests/wpt/tests/webdriver/tests/bidi/log/entry_added/subscription.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/log/entry_added/subscription.py rename to tests/wpt/tests/webdriver/tests/bidi/log/entry_added/subscription.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/network/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/before_request_sent/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/before_request_sent/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py b/tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py rename to tests/wpt/tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/combined/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/network/combined/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/combined/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/network/combined/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/combined/network_events.py b/tests/wpt/tests/webdriver/tests/bidi/network/combined/network_events.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/combined/network_events.py rename to tests/wpt/tests/webdriver/tests/bidi/network/combined/network_events.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/conftest.py b/tests/wpt/tests/webdriver/tests/bidi/network/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/conftest.py rename to tests/wpt/tests/webdriver/tests/bidi/network/conftest.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_completed/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_completed/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/network/response_completed/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_completed/response_completed.py b/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_completed/response_completed.py rename to tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_completed/response_completed_cached.py b/tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed_cached.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_completed/response_completed_cached.py rename to tests/wpt/tests/webdriver/tests/bidi/network/response_completed/response_completed_cached.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_started/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/network/response_started/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_started/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/network/response_started/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_started/response_started.py b/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_started/response_started.py rename to tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_started/response_started_cached.py b/tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started_cached.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_started/response_started_cached.py rename to tests/wpt/tests/webdriver/tests/bidi/network/response_started/response_started_cached.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/support/empty.html b/tests/wpt/tests/webdriver/tests/bidi/network/support/empty.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/support/empty.html rename to tests/wpt/tests/webdriver/tests/bidi/network/support/empty.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/support/empty.js b/tests/wpt/tests/webdriver/tests/bidi/network/support/empty.js similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/support/empty.js rename to tests/wpt/tests/webdriver/tests/bidi/network/support/empty.js diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/support/empty.png b/tests/wpt/tests/webdriver/tests/bidi/network/support/empty.png similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/support/empty.png rename to tests/wpt/tests/webdriver/tests/bidi/network/support/empty.png diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/support/empty.svg b/tests/wpt/tests/webdriver/tests/bidi/network/support/empty.svg similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/support/empty.svg rename to tests/wpt/tests/webdriver/tests/bidi/network/support/empty.svg diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/support/empty.txt b/tests/wpt/tests/webdriver/tests/bidi/network/support/empty.txt similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/support/empty.txt rename to tests/wpt/tests/webdriver/tests/bidi/network/support/empty.txt diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/support/redirect_http_equiv.html b/tests/wpt/tests/webdriver/tests/bidi/network/support/redirect_http_equiv.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/support/redirect_http_equiv.html rename to tests/wpt/tests/webdriver/tests/bidi/network/support/redirect_http_equiv.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/support/redirected.html b/tests/wpt/tests/webdriver/tests/bidi/network/support/redirected.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/network/support/redirected.html rename to tests/wpt/tests/webdriver/tests/bidi/network/support/redirected.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/script/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/script/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/add_preload_script/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/script/add_preload_script/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/add_preload_script/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/script/add_preload_script/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/add_preload_script/add_preload_script.py b/tests/wpt/tests/webdriver/tests/bidi/script/add_preload_script/add_preload_script.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/add_preload_script/add_preload_script.py rename to tests/wpt/tests/webdriver/tests/bidi/script/add_preload_script/add_preload_script.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/add_preload_script/arguments.py b/tests/wpt/tests/webdriver/tests/bidi/script/add_preload_script/arguments.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/add_preload_script/arguments.py rename to tests/wpt/tests/webdriver/tests/bidi/script/add_preload_script/arguments.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/add_preload_script/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/script/add_preload_script/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/add_preload_script/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/script/add_preload_script/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/add_preload_script/sandbox.py b/tests/wpt/tests/webdriver/tests/bidi/script/add_preload_script/sandbox.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/add_preload_script/sandbox.py rename to tests/wpt/tests/webdriver/tests/bidi/script/add_preload_script/sandbox.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/arguments.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/arguments.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/arguments.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/arguments.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/await_promise.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/await_promise.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/await_promise.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/await_promise.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/exception_details.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/exception_details.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/exception_details.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/exception_details.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/function_declaration.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/function_declaration.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/function_declaration.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/function_declaration.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/internal_id.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/internal_id.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/internal_id.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/internal_id.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/invalid_tentative.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/invalid_tentative.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/invalid_tentative.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/invalid_tentative.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/realm.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/realm.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/realm.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/realm.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/result.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/result.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/result.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/result.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/result_node.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/result_node.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/result_node.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/result_node.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/result_ownership.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/result_ownership.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/result_ownership.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/result_ownership.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/sandbox.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/sandbox.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/sandbox.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/sandbox.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/strict_mode.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/strict_mode.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/strict_mode.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/strict_mode.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/this.py b/tests/wpt/tests/webdriver/tests/bidi/script/call_function/this.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/call_function/this.py rename to tests/wpt/tests/webdriver/tests/bidi/script/call_function/this.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/classic_interop/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/script/classic_interop/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/classic_interop/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/script/classic_interop/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/classic_interop/node_shared_id.py b/tests/wpt/tests/webdriver/tests/bidi/script/classic_interop/node_shared_id.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/classic_interop/node_shared_id.py rename to tests/wpt/tests/webdriver/tests/bidi/script/classic_interop/node_shared_id.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/conftest.py b/tests/wpt/tests/webdriver/tests/bidi/script/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/conftest.py rename to tests/wpt/tests/webdriver/tests/bidi/script/conftest.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/disown/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/script/disown/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/disown/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/script/disown/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/disown/handles.py b/tests/wpt/tests/webdriver/tests/bidi/script/disown/handles.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/disown/handles.py rename to tests/wpt/tests/webdriver/tests/bidi/script/disown/handles.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/disown/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/script/disown/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/disown/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/script/disown/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/disown/invalid_tentative.py b/tests/wpt/tests/webdriver/tests/bidi/script/disown/invalid_tentative.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/disown/invalid_tentative.py rename to tests/wpt/tests/webdriver/tests/bidi/script/disown/invalid_tentative.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/disown/target.py b/tests/wpt/tests/webdriver/tests/bidi/script/disown/target.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/disown/target.py rename to tests/wpt/tests/webdriver/tests/bidi/script/disown/target.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/script/evaluate/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/script/evaluate/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/await_promise.py b/tests/wpt/tests/webdriver/tests/bidi/script/evaluate/await_promise.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/await_promise.py rename to tests/wpt/tests/webdriver/tests/bidi/script/evaluate/await_promise.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/evaluate.py b/tests/wpt/tests/webdriver/tests/bidi/script/evaluate/evaluate.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/evaluate.py rename to tests/wpt/tests/webdriver/tests/bidi/script/evaluate/evaluate.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/exception_details.py b/tests/wpt/tests/webdriver/tests/bidi/script/evaluate/exception_details.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/exception_details.py rename to tests/wpt/tests/webdriver/tests/bidi/script/evaluate/exception_details.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/internal_id.py b/tests/wpt/tests/webdriver/tests/bidi/script/evaluate/internal_id.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/internal_id.py rename to tests/wpt/tests/webdriver/tests/bidi/script/evaluate/internal_id.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/script/evaluate/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/script/evaluate/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/invalid_tentative.py b/tests/wpt/tests/webdriver/tests/bidi/script/evaluate/invalid_tentative.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/invalid_tentative.py rename to tests/wpt/tests/webdriver/tests/bidi/script/evaluate/invalid_tentative.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/result.py b/tests/wpt/tests/webdriver/tests/bidi/script/evaluate/result.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/result.py rename to tests/wpt/tests/webdriver/tests/bidi/script/evaluate/result.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/result_node.py b/tests/wpt/tests/webdriver/tests/bidi/script/evaluate/result_node.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/result_node.py rename to tests/wpt/tests/webdriver/tests/bidi/script/evaluate/result_node.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/result_ownership.py b/tests/wpt/tests/webdriver/tests/bidi/script/evaluate/result_ownership.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/result_ownership.py rename to tests/wpt/tests/webdriver/tests/bidi/script/evaluate/result_ownership.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/sandbox.py b/tests/wpt/tests/webdriver/tests/bidi/script/evaluate/sandbox.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/sandbox.py rename to tests/wpt/tests/webdriver/tests/bidi/script/evaluate/sandbox.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/strict_mode.py b/tests/wpt/tests/webdriver/tests/bidi/script/evaluate/strict_mode.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/evaluate/strict_mode.py rename to tests/wpt/tests/webdriver/tests/bidi/script/evaluate/strict_mode.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/get_realms/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/script/get_realms/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/get_realms/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/script/get_realms/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/get_realms/context.py b/tests/wpt/tests/webdriver/tests/bidi/script/get_realms/context.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/get_realms/context.py rename to tests/wpt/tests/webdriver/tests/bidi/script/get_realms/context.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/get_realms/get_realms.py b/tests/wpt/tests/webdriver/tests/bidi/script/get_realms/get_realms.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/get_realms/get_realms.py rename to tests/wpt/tests/webdriver/tests/bidi/script/get_realms/get_realms.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/get_realms/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/script/get_realms/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/get_realms/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/script/get_realms/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/get_realms/sandbox.py b/tests/wpt/tests/webdriver/tests/bidi/script/get_realms/sandbox.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/get_realms/sandbox.py rename to tests/wpt/tests/webdriver/tests/bidi/script/get_realms/sandbox.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/get_realms/type.py b/tests/wpt/tests/webdriver/tests/bidi/script/get_realms/type.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/get_realms/type.py rename to tests/wpt/tests/webdriver/tests/bidi/script/get_realms/type.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/message/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/script/message/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/message/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/script/message/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/message/message.py b/tests/wpt/tests/webdriver/tests/bidi/script/message/message.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/message/message.py rename to tests/wpt/tests/webdriver/tests/bidi/script/message/message.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/remove_preload_script/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/script/remove_preload_script/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/remove_preload_script/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/script/remove_preload_script/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/remove_preload_script/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/script/remove_preload_script/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/remove_preload_script/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/script/remove_preload_script/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/remove_preload_script/remove_preload_script.py b/tests/wpt/tests/webdriver/tests/bidi/script/remove_preload_script/remove_preload_script.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/remove_preload_script/remove_preload_script.py rename to tests/wpt/tests/webdriver/tests/bidi/script/remove_preload_script/remove_preload_script.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/script/remove_preload_script/sandbox.py b/tests/wpt/tests/webdriver/tests/bidi/script/remove_preload_script/sandbox.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/script/remove_preload_script/sandbox.py rename to tests/wpt/tests/webdriver/tests/bidi/script/remove_preload_script/sandbox.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/session/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/session/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/session/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/session/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/session/new/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/session/new/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/session/new/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/session/new/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/session/new/connect.py b/tests/wpt/tests/webdriver/tests/bidi/session/new/connect.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/session/new/connect.py rename to tests/wpt/tests/webdriver/tests/bidi/session/new/connect.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/session/status/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/session/status/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/session/status/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/session/status/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/session/status/status.py b/tests/wpt/tests/webdriver/tests/bidi/session/status/status.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/session/status/status.py rename to tests/wpt/tests/webdriver/tests/bidi/session/status/status.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/session/subscribe/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/session/subscribe/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/session/subscribe/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/session/subscribe/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/session/subscribe/contexts.py b/tests/wpt/tests/webdriver/tests/bidi/session/subscribe/contexts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/session/subscribe/contexts.py rename to tests/wpt/tests/webdriver/tests/bidi/session/subscribe/contexts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/session/subscribe/events.py b/tests/wpt/tests/webdriver/tests/bidi/session/subscribe/events.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/session/subscribe/events.py rename to tests/wpt/tests/webdriver/tests/bidi/session/subscribe/events.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/session/subscribe/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/session/subscribe/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/session/subscribe/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/session/subscribe/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/session/unsubscribe/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/session/unsubscribe/__init__.py rename to tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/session/unsubscribe/contexts.py b/tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/contexts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/session/unsubscribe/contexts.py rename to tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/contexts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/session/unsubscribe/events.py b/tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/events.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/session/unsubscribe/events.py rename to tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/events.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/session/unsubscribe/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/invalid.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/bidi/session/unsubscribe/invalid.py rename to tests/wpt/tests/webdriver/tests/bidi/session/unsubscribe/invalid.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/accept_alert/__init__.py b/tests/wpt/tests/webdriver/tests/classic/accept_alert/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/accept_alert/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/accept_alert/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/accept_alert/accept.py b/tests/wpt/tests/webdriver/tests/classic/accept_alert/accept.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/accept_alert/accept.py rename to tests/wpt/tests/webdriver/tests/classic/accept_alert/accept.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/add_cookie/__init__.py b/tests/wpt/tests/webdriver/tests/classic/add_cookie/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/add_cookie/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/add_cookie/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/add_cookie/add.py b/tests/wpt/tests/webdriver/tests/classic/add_cookie/add.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/add_cookie/add.py rename to tests/wpt/tests/webdriver/tests/classic/add_cookie/add.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/add_cookie/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/add_cookie/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/add_cookie/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/add_cookie/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/back/__init__.py b/tests/wpt/tests/webdriver/tests/classic/back/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/back/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/back/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/back/back.py b/tests/wpt/tests/webdriver/tests/classic/back/back.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/back/back.py rename to tests/wpt/tests/webdriver/tests/classic/back/back.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/back/conftest.py b/tests/wpt/tests/webdriver/tests/classic/back/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/back/conftest.py rename to tests/wpt/tests/webdriver/tests/classic/back/conftest.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/back/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/back/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/back/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/back/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/close_window/__init__.py b/tests/wpt/tests/webdriver/tests/classic/close_window/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/close_window/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/close_window/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/close_window/close.py b/tests/wpt/tests/webdriver/tests/classic/close_window/close.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/close_window/close.py rename to tests/wpt/tests/webdriver/tests/classic/close_window/close.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/close_window/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/close_window/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/close_window/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/close_window/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/delete_all_cookies/__init__.py b/tests/wpt/tests/webdriver/tests/classic/delete_all_cookies/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/delete_all_cookies/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/delete_all_cookies/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/delete_all_cookies/delete.py b/tests/wpt/tests/webdriver/tests/classic/delete_all_cookies/delete.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/delete_all_cookies/delete.py rename to tests/wpt/tests/webdriver/tests/classic/delete_all_cookies/delete.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/delete_all_cookies/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/delete_all_cookies/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/delete_all_cookies/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/delete_all_cookies/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/delete_cookie/__init__.py b/tests/wpt/tests/webdriver/tests/classic/delete_cookie/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/delete_cookie/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/delete_cookie/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/delete_cookie/delete.py b/tests/wpt/tests/webdriver/tests/classic/delete_cookie/delete.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/delete_cookie/delete.py rename to tests/wpt/tests/webdriver/tests/classic/delete_cookie/delete.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/delete_cookie/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/delete_cookie/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/delete_cookie/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/delete_cookie/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/delete_session/__init__.py b/tests/wpt/tests/webdriver/tests/classic/delete_session/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/delete_session/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/delete_session/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/delete_session/delete.py b/tests/wpt/tests/webdriver/tests/classic/delete_session/delete.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/delete_session/delete.py rename to tests/wpt/tests/webdriver/tests/classic/delete_session/delete.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/dismiss_alert/__init__.py b/tests/wpt/tests/webdriver/tests/classic/dismiss_alert/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/dismiss_alert/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/dismiss_alert/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/dismiss_alert/dismiss.py b/tests/wpt/tests/webdriver/tests/classic/dismiss_alert/dismiss.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/dismiss_alert/dismiss.py rename to tests/wpt/tests/webdriver/tests/classic/dismiss_alert/dismiss.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_clear/__init__.py b/tests/wpt/tests/webdriver/tests/classic/element_clear/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_clear/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/element_clear/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_clear/clear.py b/tests/wpt/tests/webdriver/tests/classic/element_clear/clear.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_clear/clear.py rename to tests/wpt/tests/webdriver/tests/classic/element_clear/clear.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_clear/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/element_clear/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_clear/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/element_clear/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/__init__.py b/tests/wpt/tests/webdriver/tests/classic/element_click/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/element_click/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/bubbling.py b/tests/wpt/tests/webdriver/tests/classic/element_click/bubbling.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/bubbling.py rename to tests/wpt/tests/webdriver/tests/classic/element_click/bubbling.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/center_point.py b/tests/wpt/tests/webdriver/tests/classic/element_click/center_point.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/center_point.py rename to tests/wpt/tests/webdriver/tests/classic/element_click/center_point.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/click.py b/tests/wpt/tests/webdriver/tests/classic/element_click/click.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/click.py rename to tests/wpt/tests/webdriver/tests/classic/element_click/click.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/events.py b/tests/wpt/tests/webdriver/tests/classic/element_click/events.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/events.py rename to tests/wpt/tests/webdriver/tests/classic/element_click/events.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/file_upload.py b/tests/wpt/tests/webdriver/tests/classic/element_click/file_upload.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/file_upload.py rename to tests/wpt/tests/webdriver/tests/classic/element_click/file_upload.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/interactability.py b/tests/wpt/tests/webdriver/tests/classic/element_click/interactability.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/interactability.py rename to tests/wpt/tests/webdriver/tests/classic/element_click/interactability.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/navigate.py b/tests/wpt/tests/webdriver/tests/classic/element_click/navigate.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/navigate.py rename to tests/wpt/tests/webdriver/tests/classic/element_click/navigate.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/scroll_into_view.py b/tests/wpt/tests/webdriver/tests/classic/element_click/scroll_into_view.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/scroll_into_view.py rename to tests/wpt/tests/webdriver/tests/classic/element_click/scroll_into_view.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/select.py b/tests/wpt/tests/webdriver/tests/classic/element_click/select.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/select.py rename to tests/wpt/tests/webdriver/tests/classic/element_click/select.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/shadow_dom.py b/tests/wpt/tests/webdriver/tests/classic/element_click/shadow_dom.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/shadow_dom.py rename to tests/wpt/tests/webdriver/tests/classic/element_click/shadow_dom.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/support/input.html b/tests/wpt/tests/webdriver/tests/classic/element_click/support/input.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/support/input.html rename to tests/wpt/tests/webdriver/tests/classic/element_click/support/input.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/support/test_click_wdspec.html b/tests/wpt/tests/webdriver/tests/classic/element_click/support/test_click_wdspec.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/support/test_click_wdspec.html rename to tests/wpt/tests/webdriver/tests/classic/element_click/support/test_click_wdspec.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/element_click/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_click/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/element_click/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/__init__.py b/tests/wpt/tests/webdriver/tests/classic/element_send_keys/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/element_send_keys/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/conftest.py b/tests/wpt/tests/webdriver/tests/classic/element_send_keys/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/conftest.py rename to tests/wpt/tests/webdriver/tests/classic/element_send_keys/conftest.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/content_editable.py b/tests/wpt/tests/webdriver/tests/classic/element_send_keys/content_editable.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/content_editable.py rename to tests/wpt/tests/webdriver/tests/classic/element_send_keys/content_editable.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/events.py b/tests/wpt/tests/webdriver/tests/classic/element_send_keys/events.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/events.py rename to tests/wpt/tests/webdriver/tests/classic/element_send_keys/events.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/file_upload.py b/tests/wpt/tests/webdriver/tests/classic/element_send_keys/file_upload.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/file_upload.py rename to tests/wpt/tests/webdriver/tests/classic/element_send_keys/file_upload.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/form_controls.py b/tests/wpt/tests/webdriver/tests/classic/element_send_keys/form_controls.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/form_controls.py rename to tests/wpt/tests/webdriver/tests/classic/element_send_keys/form_controls.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/interactability.py b/tests/wpt/tests/webdriver/tests/classic/element_send_keys/interactability.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/interactability.py rename to tests/wpt/tests/webdriver/tests/classic/element_send_keys/interactability.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/scroll_into_view.py b/tests/wpt/tests/webdriver/tests/classic/element_send_keys/scroll_into_view.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/scroll_into_view.py rename to tests/wpt/tests/webdriver/tests/classic/element_send_keys/scroll_into_view.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/send_keys.py b/tests/wpt/tests/webdriver/tests/classic/element_send_keys/send_keys.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/send_keys.py rename to tests/wpt/tests/webdriver/tests/classic/element_send_keys/send_keys.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/element_send_keys/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/element_send_keys/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/element_send_keys/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/__init__.py b/tests/wpt/tests/webdriver/tests/classic/execute_async_script/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/execute_async_script/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/arguments.py b/tests/wpt/tests/webdriver/tests/classic/execute_async_script/arguments.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/arguments.py rename to tests/wpt/tests/webdriver/tests/classic/execute_async_script/arguments.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/collections.py b/tests/wpt/tests/webdriver/tests/classic/execute_async_script/collections.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/collections.py rename to tests/wpt/tests/webdriver/tests/classic/execute_async_script/collections.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/cyclic.py b/tests/wpt/tests/webdriver/tests/classic/execute_async_script/cyclic.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/cyclic.py rename to tests/wpt/tests/webdriver/tests/classic/execute_async_script/cyclic.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/execute_async.py b/tests/wpt/tests/webdriver/tests/classic/execute_async_script/execute_async.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/execute_async.py rename to tests/wpt/tests/webdriver/tests/classic/execute_async_script/execute_async.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/node.py b/tests/wpt/tests/webdriver/tests/classic/execute_async_script/node.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/node.py rename to tests/wpt/tests/webdriver/tests/classic/execute_async_script/node.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/objects.py b/tests/wpt/tests/webdriver/tests/classic/execute_async_script/objects.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/objects.py rename to tests/wpt/tests/webdriver/tests/classic/execute_async_script/objects.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/promise.py b/tests/wpt/tests/webdriver/tests/classic/execute_async_script/promise.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/promise.py rename to tests/wpt/tests/webdriver/tests/classic/execute_async_script/promise.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/properties.py b/tests/wpt/tests/webdriver/tests/classic/execute_async_script/properties.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/properties.py rename to tests/wpt/tests/webdriver/tests/classic/execute_async_script/properties.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/execute_async_script/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_async_script/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/execute_async_script/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/__init__.py b/tests/wpt/tests/webdriver/tests/classic/execute_script/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/execute_script/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/arguments.py b/tests/wpt/tests/webdriver/tests/classic/execute_script/arguments.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/arguments.py rename to tests/wpt/tests/webdriver/tests/classic/execute_script/arguments.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/collections.py b/tests/wpt/tests/webdriver/tests/classic/execute_script/collections.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/collections.py rename to tests/wpt/tests/webdriver/tests/classic/execute_script/collections.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/cyclic.py b/tests/wpt/tests/webdriver/tests/classic/execute_script/cyclic.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/cyclic.py rename to tests/wpt/tests/webdriver/tests/classic/execute_script/cyclic.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/execute.py b/tests/wpt/tests/webdriver/tests/classic/execute_script/execute.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/execute.py rename to tests/wpt/tests/webdriver/tests/classic/execute_script/execute.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/json_serialize_windowproxy.py b/tests/wpt/tests/webdriver/tests/classic/execute_script/json_serialize_windowproxy.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/json_serialize_windowproxy.py rename to tests/wpt/tests/webdriver/tests/classic/execute_script/json_serialize_windowproxy.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/node.py b/tests/wpt/tests/webdriver/tests/classic/execute_script/node.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/node.py rename to tests/wpt/tests/webdriver/tests/classic/execute_script/node.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/objects.py b/tests/wpt/tests/webdriver/tests/classic/execute_script/objects.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/objects.py rename to tests/wpt/tests/webdriver/tests/classic/execute_script/objects.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/promise.py b/tests/wpt/tests/webdriver/tests/classic/execute_script/promise.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/promise.py rename to tests/wpt/tests/webdriver/tests/classic/execute_script/promise.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/properties.py b/tests/wpt/tests/webdriver/tests/classic/execute_script/properties.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/properties.py rename to tests/wpt/tests/webdriver/tests/classic/execute_script/properties.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/execute_script/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/execute_script/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/execute_script/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_element/__init__.py b/tests/wpt/tests/webdriver/tests/classic/find_element/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_element/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/find_element/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_element/find.py b/tests/wpt/tests/webdriver/tests/classic/find_element/find.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_element/find.py rename to tests/wpt/tests/webdriver/tests/classic/find_element/find.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_element/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/find_element/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_element/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/find_element/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_element_from_element/__init__.py b/tests/wpt/tests/webdriver/tests/classic/find_element_from_element/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_element_from_element/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/find_element_from_element/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_element_from_element/find.py b/tests/wpt/tests/webdriver/tests/classic/find_element_from_element/find.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_element_from_element/find.py rename to tests/wpt/tests/webdriver/tests/classic/find_element_from_element/find.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_element_from_element/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/find_element_from_element/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_element_from_element/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/find_element_from_element/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_element_from_shadow_root/__init__.py b/tests/wpt/tests/webdriver/tests/classic/find_element_from_shadow_root/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_element_from_shadow_root/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/find_element_from_shadow_root/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_element_from_shadow_root/find.py b/tests/wpt/tests/webdriver/tests/classic/find_element_from_shadow_root/find.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_element_from_shadow_root/find.py rename to tests/wpt/tests/webdriver/tests/classic/find_element_from_shadow_root/find.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_element_from_shadow_root/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/find_element_from_shadow_root/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_element_from_shadow_root/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/find_element_from_shadow_root/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements/__init__.py b/tests/wpt/tests/webdriver/tests/classic/find_elements/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/find_elements/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements/find.py b/tests/wpt/tests/webdriver/tests/classic/find_elements/find.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements/find.py rename to tests/wpt/tests/webdriver/tests/classic/find_elements/find.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/find_elements/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/find_elements/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements_from_element/__init__.py b/tests/wpt/tests/webdriver/tests/classic/find_elements_from_element/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements_from_element/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/find_elements_from_element/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements_from_element/find.py b/tests/wpt/tests/webdriver/tests/classic/find_elements_from_element/find.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements_from_element/find.py rename to tests/wpt/tests/webdriver/tests/classic/find_elements_from_element/find.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements_from_element/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/find_elements_from_element/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements_from_element/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/find_elements_from_element/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements_from_shadow_root/__init__.py b/tests/wpt/tests/webdriver/tests/classic/find_elements_from_shadow_root/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements_from_shadow_root/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/find_elements_from_shadow_root/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements_from_shadow_root/find.py b/tests/wpt/tests/webdriver/tests/classic/find_elements_from_shadow_root/find.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements_from_shadow_root/find.py rename to tests/wpt/tests/webdriver/tests/classic/find_elements_from_shadow_root/find.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements_from_shadow_root/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/find_elements_from_shadow_root/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/find_elements_from_shadow_root/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/find_elements_from_shadow_root/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/forward/__init__.py b/tests/wpt/tests/webdriver/tests/classic/forward/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/forward/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/forward/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/forward/conftest.py b/tests/wpt/tests/webdriver/tests/classic/forward/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/forward/conftest.py rename to tests/wpt/tests/webdriver/tests/classic/forward/conftest.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/forward/forward.py b/tests/wpt/tests/webdriver/tests/classic/forward/forward.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/forward/forward.py rename to tests/wpt/tests/webdriver/tests/classic/forward/forward.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/forward/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/forward/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/forward/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/forward/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/fullscreen_window/__init__.py b/tests/wpt/tests/webdriver/tests/classic/fullscreen_window/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/fullscreen_window/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/fullscreen_window/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/fullscreen_window/fullscreen.py b/tests/wpt/tests/webdriver/tests/classic/fullscreen_window/fullscreen.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/fullscreen_window/fullscreen.py rename to tests/wpt/tests/webdriver/tests/classic/fullscreen_window/fullscreen.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/fullscreen_window/stress.py b/tests/wpt/tests/webdriver/tests/classic/fullscreen_window/stress.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/fullscreen_window/stress.py rename to tests/wpt/tests/webdriver/tests/classic/fullscreen_window/stress.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/fullscreen_window/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/fullscreen_window/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/fullscreen_window/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/fullscreen_window/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_active_element/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_active_element/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_active_element/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_active_element/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_active_element/get.py b/tests/wpt/tests/webdriver/tests/classic/get_active_element/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_active_element/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_active_element/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_active_element/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_active_element/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_active_element/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_active_element/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_alert_text/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_alert_text/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_alert_text/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_alert_text/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_alert_text/get.py b/tests/wpt/tests/webdriver/tests/classic/get_alert_text/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_alert_text/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_alert_text/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_computed_label/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_computed_label/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_computed_label/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_computed_label/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_computed_label/get.py b/tests/wpt/tests/webdriver/tests/classic/get_computed_label/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_computed_label/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_computed_label/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_computed_role/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_computed_role/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_computed_role/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_computed_role/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_computed_role/get.py b/tests/wpt/tests/webdriver/tests/classic/get_computed_role/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_computed_role/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_computed_role/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_current_url/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_current_url/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_current_url/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_current_url/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_current_url/file.py b/tests/wpt/tests/webdriver/tests/classic/get_current_url/file.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_current_url/file.py rename to tests/wpt/tests/webdriver/tests/classic/get_current_url/file.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_current_url/get.py b/tests/wpt/tests/webdriver/tests/classic/get_current_url/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_current_url/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_current_url/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_current_url/iframe.py b/tests/wpt/tests/webdriver/tests/classic/get_current_url/iframe.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_current_url/iframe.py rename to tests/wpt/tests/webdriver/tests/classic/get_current_url/iframe.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_current_url/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_current_url/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_current_url/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_current_url/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_attribute/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_element_attribute/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_attribute/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_attribute/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_attribute/get.py b/tests/wpt/tests/webdriver/tests/classic/get_element_attribute/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_attribute/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_attribute/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_attribute/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_element_attribute/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_attribute/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_attribute/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_css_value/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_element_css_value/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_css_value/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_css_value/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_css_value/get.py b/tests/wpt/tests/webdriver/tests/classic/get_element_css_value/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_css_value/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_css_value/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_css_value/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_element_css_value/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_css_value/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_css_value/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_property/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_element_property/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_property/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_property/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_property/get.py b/tests/wpt/tests/webdriver/tests/classic/get_element_property/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_property/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_property/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_property/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_element_property/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_property/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_property/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_rect/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_element_rect/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_rect/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_rect/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_rect/get.py b/tests/wpt/tests/webdriver/tests/classic/get_element_rect/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_rect/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_rect/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_rect/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_element_rect/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_rect/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_rect/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_shadow_root/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_element_shadow_root/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_shadow_root/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_shadow_root/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_shadow_root/get.py b/tests/wpt/tests/webdriver/tests/classic/get_element_shadow_root/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_shadow_root/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_shadow_root/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_shadow_root/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_element_shadow_root/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_shadow_root/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_shadow_root/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_tag_name/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_element_tag_name/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_tag_name/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_tag_name/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_tag_name/get.py b/tests/wpt/tests/webdriver/tests/classic/get_element_tag_name/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_tag_name/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_tag_name/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_tag_name/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_element_tag_name/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_tag_name/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_tag_name/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_text/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_element_text/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_text/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_text/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_text/get.py b/tests/wpt/tests/webdriver/tests/classic/get_element_text/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_text/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_text/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_text/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_element_text/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_element_text/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_element_text/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_named_cookie/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_named_cookie/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_named_cookie/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_named_cookie/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_named_cookie/get.py b/tests/wpt/tests/webdriver/tests/classic/get_named_cookie/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_named_cookie/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_named_cookie/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_named_cookie/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_named_cookie/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_named_cookie/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_named_cookie/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_page_source/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_page_source/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_page_source/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_page_source/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_page_source/source.py b/tests/wpt/tests/webdriver/tests/classic/get_page_source/source.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_page_source/source.py rename to tests/wpt/tests/webdriver/tests/classic/get_page_source/source.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_page_source/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_page_source/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_page_source/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_page_source/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_timeouts/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_timeouts/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_timeouts/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_timeouts/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_timeouts/get.py b/tests/wpt/tests/webdriver/tests/classic/get_timeouts/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_timeouts/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_timeouts/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_title/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_title/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_title/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_title/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_title/get.py b/tests/wpt/tests/webdriver/tests/classic/get_title/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_title/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_title/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_title/iframe.py b/tests/wpt/tests/webdriver/tests/classic/get_title/iframe.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_title/iframe.py rename to tests/wpt/tests/webdriver/tests/classic/get_title/iframe.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_title/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_title/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_title/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_title/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_handle/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_window_handle/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_handle/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_window_handle/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_handle/get.py b/tests/wpt/tests/webdriver/tests/classic/get_window_handle/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_handle/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_window_handle/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_handle/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_window_handle/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_handle/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_window_handle/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_handles/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_window_handles/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_handles/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_window_handles/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_handles/get.py b/tests/wpt/tests/webdriver/tests/classic/get_window_handles/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_handles/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_window_handles/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_handles/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_window_handles/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_handles/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_window_handles/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_rect/__init__.py b/tests/wpt/tests/webdriver/tests/classic/get_window_rect/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_rect/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/get_window_rect/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_rect/get.py b/tests/wpt/tests/webdriver/tests/classic/get_window_rect/get.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_rect/get.py rename to tests/wpt/tests/webdriver/tests/classic/get_window_rect/get.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_rect/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/get_window_rect/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/get_window_rect/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/get_window_rect/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/idlharness.window.js b/tests/wpt/tests/webdriver/tests/classic/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/idlharness.window.js rename to tests/wpt/tests/webdriver/tests/classic/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/interface/interface.py b/tests/wpt/tests/webdriver/tests/classic/interface/interface.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/interface/interface.py rename to tests/wpt/tests/webdriver/tests/classic/interface/interface.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/is_element_enabled/__init__.py b/tests/wpt/tests/webdriver/tests/classic/is_element_enabled/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/is_element_enabled/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/is_element_enabled/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/is_element_enabled/enabled.py b/tests/wpt/tests/webdriver/tests/classic/is_element_enabled/enabled.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/is_element_enabled/enabled.py rename to tests/wpt/tests/webdriver/tests/classic/is_element_enabled/enabled.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/is_element_enabled/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/is_element_enabled/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/is_element_enabled/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/is_element_enabled/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/is_element_selected/__init__.py b/tests/wpt/tests/webdriver/tests/classic/is_element_selected/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/is_element_selected/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/is_element_selected/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/is_element_selected/selected.py b/tests/wpt/tests/webdriver/tests/classic/is_element_selected/selected.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/is_element_selected/selected.py rename to tests/wpt/tests/webdriver/tests/classic/is_element_selected/selected.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/is_element_selected/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/is_element_selected/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/is_element_selected/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/is_element_selected/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/maximize_window/__init__.py b/tests/wpt/tests/webdriver/tests/classic/maximize_window/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/maximize_window/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/maximize_window/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/maximize_window/maximize.py b/tests/wpt/tests/webdriver/tests/classic/maximize_window/maximize.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/maximize_window/maximize.py rename to tests/wpt/tests/webdriver/tests/classic/maximize_window/maximize.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/maximize_window/stress.py b/tests/wpt/tests/webdriver/tests/classic/maximize_window/stress.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/maximize_window/stress.py rename to tests/wpt/tests/webdriver/tests/classic/maximize_window/stress.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/maximize_window/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/maximize_window/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/maximize_window/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/maximize_window/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/minimize_window/__init__.py b/tests/wpt/tests/webdriver/tests/classic/minimize_window/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/minimize_window/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/minimize_window/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/minimize_window/minimize.py b/tests/wpt/tests/webdriver/tests/classic/minimize_window/minimize.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/minimize_window/minimize.py rename to tests/wpt/tests/webdriver/tests/classic/minimize_window/minimize.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/minimize_window/stress.py b/tests/wpt/tests/webdriver/tests/classic/minimize_window/stress.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/minimize_window/stress.py rename to tests/wpt/tests/webdriver/tests/classic/minimize_window/stress.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/minimize_window/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/minimize_window/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/minimize_window/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/minimize_window/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/navigate_to/__init__.py b/tests/wpt/tests/webdriver/tests/classic/navigate_to/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/navigate_to/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/navigate_to/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/navigate_to/file.py b/tests/wpt/tests/webdriver/tests/classic/navigate_to/file.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/navigate_to/file.py rename to tests/wpt/tests/webdriver/tests/classic/navigate_to/file.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/navigate_to/navigate.py b/tests/wpt/tests/webdriver/tests/classic/navigate_to/navigate.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/navigate_to/navigate.py rename to tests/wpt/tests/webdriver/tests/classic/navigate_to/navigate.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/navigate_to/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/navigate_to/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/navigate_to/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/navigate_to/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/__init__.py b/tests/wpt/tests/webdriver/tests/classic/new_session/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/new_session/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/conftest.py b/tests/wpt/tests/webdriver/tests/classic/new_session/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/conftest.py rename to tests/wpt/tests/webdriver/tests/classic/new_session/conftest.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/create_alwaysMatch.py b/tests/wpt/tests/webdriver/tests/classic/new_session/create_alwaysMatch.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/create_alwaysMatch.py rename to tests/wpt/tests/webdriver/tests/classic/new_session/create_alwaysMatch.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/create_firstMatch.py b/tests/wpt/tests/webdriver/tests/classic/new_session/create_firstMatch.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/create_firstMatch.py rename to tests/wpt/tests/webdriver/tests/classic/new_session/create_firstMatch.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/default_values.py b/tests/wpt/tests/webdriver/tests/classic/new_session/default_values.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/default_values.py rename to tests/wpt/tests/webdriver/tests/classic/new_session/default_values.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/invalid_capabilities.py b/tests/wpt/tests/webdriver/tests/classic/new_session/invalid_capabilities.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/invalid_capabilities.py rename to tests/wpt/tests/webdriver/tests/classic/new_session/invalid_capabilities.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/merge.py b/tests/wpt/tests/webdriver/tests/classic/new_session/merge.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/merge.py rename to tests/wpt/tests/webdriver/tests/classic/new_session/merge.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/page_load_strategy.py b/tests/wpt/tests/webdriver/tests/classic/new_session/page_load_strategy.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/page_load_strategy.py rename to tests/wpt/tests/webdriver/tests/classic/new_session/page_load_strategy.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/platform_name.py b/tests/wpt/tests/webdriver/tests/classic/new_session/platform_name.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/platform_name.py rename to tests/wpt/tests/webdriver/tests/classic/new_session/platform_name.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/response.py b/tests/wpt/tests/webdriver/tests/classic/new_session/response.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/response.py rename to tests/wpt/tests/webdriver/tests/classic/new_session/response.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/support/__init__.py b/tests/wpt/tests/webdriver/tests/classic/new_session/support/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/support/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/new_session/support/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/support/create.py b/tests/wpt/tests/webdriver/tests/classic/new_session/support/create.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/support/create.py rename to tests/wpt/tests/webdriver/tests/classic/new_session/support/create.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/timeouts.py b/tests/wpt/tests/webdriver/tests/classic/new_session/timeouts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/timeouts.py rename to tests/wpt/tests/webdriver/tests/classic/new_session/timeouts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/websocket_url.py b/tests/wpt/tests/webdriver/tests/classic/new_session/websocket_url.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_session/websocket_url.py rename to tests/wpt/tests/webdriver/tests/classic/new_session/websocket_url.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_window/__init__.py b/tests/wpt/tests/webdriver/tests/classic/new_window/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_window/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/new_window/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_window/new.py b/tests/wpt/tests/webdriver/tests/classic/new_window/new.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_window/new.py rename to tests/wpt/tests/webdriver/tests/classic/new_window/new.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_window/new_tab.py b/tests/wpt/tests/webdriver/tests/classic/new_window/new_tab.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_window/new_tab.py rename to tests/wpt/tests/webdriver/tests/classic/new_window/new_tab.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_window/new_window.py b/tests/wpt/tests/webdriver/tests/classic/new_window/new_window.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_window/new_window.py rename to tests/wpt/tests/webdriver/tests/classic/new_window/new_window.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/new_window/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/new_window/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/new_window/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/new_window/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/__init__.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/conftest.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/conftest.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/conftest.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/key.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/key.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/key.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/key.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/key_events.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/key_events.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/key_events.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/key_events.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/key_modifiers.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/key_modifiers.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/key_modifiers.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/key_modifiers.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/key_shortcuts.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/key_shortcuts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/key_shortcuts.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/key_shortcuts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/key_special_keys.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/key_special_keys.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/key_special_keys.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/key_special_keys.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/none.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/none.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/none.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/none.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_contextmenu.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_contextmenu.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_contextmenu.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_contextmenu.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_dblclick.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_dblclick.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_dblclick.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_dblclick.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_modifier_click.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_modifier_click.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_modifier_click.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_modifier_click.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_mouse.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_mouse.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_mouse.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_mouse.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_origin.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_origin.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_origin.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_origin.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_pause_dblclick.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_pause_dblclick.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_pause_dblclick.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_pause_dblclick.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_pen.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_pen.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_pen.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_pen.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_touch.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_touch.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_touch.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_touch.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_tripleclick.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_tripleclick.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/pointer_tripleclick.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_tripleclick.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/sequence.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/sequence.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/sequence.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/sequence.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/support/__init__.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/support/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/support/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/support/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/support/mouse.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/support/mouse.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/support/mouse.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/support/mouse.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/support/refine.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/support/refine.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/support/refine.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/support/refine.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/validity.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/validity.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/validity.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/validity.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/wheel.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/wheel.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/perform_actions/wheel.py rename to tests/wpt/tests/webdriver/tests/classic/perform_actions/wheel.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/permissions/__init__.py b/tests/wpt/tests/webdriver/tests/classic/permissions/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/permissions/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/permissions/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/permissions/set.py b/tests/wpt/tests/webdriver/tests/classic/permissions/set.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/permissions/set.py rename to tests/wpt/tests/webdriver/tests/classic/permissions/set.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/print/__init__.py b/tests/wpt/tests/webdriver/tests/classic/print/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/print/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/print/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/print/background.py b/tests/wpt/tests/webdriver/tests/classic/print/background.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/print/background.py rename to tests/wpt/tests/webdriver/tests/classic/print/background.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/print/orientation.py b/tests/wpt/tests/webdriver/tests/classic/print/orientation.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/print/orientation.py rename to tests/wpt/tests/webdriver/tests/classic/print/orientation.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/print/printcmd.py b/tests/wpt/tests/webdriver/tests/classic/print/printcmd.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/print/printcmd.py rename to tests/wpt/tests/webdriver/tests/classic/print/printcmd.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/print/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/print/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/print/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/print/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/refresh/__init__.py b/tests/wpt/tests/webdriver/tests/classic/refresh/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/refresh/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/refresh/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/refresh/refresh.py b/tests/wpt/tests/webdriver/tests/classic/refresh/refresh.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/refresh/refresh.py rename to tests/wpt/tests/webdriver/tests/classic/refresh/refresh.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/refresh/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/refresh/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/refresh/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/refresh/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/release_actions/__init__.py b/tests/wpt/tests/webdriver/tests/classic/release_actions/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/release_actions/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/release_actions/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/release_actions/conftest.py b/tests/wpt/tests/webdriver/tests/classic/release_actions/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/release_actions/conftest.py rename to tests/wpt/tests/webdriver/tests/classic/release_actions/conftest.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/release_actions/release.py b/tests/wpt/tests/webdriver/tests/classic/release_actions/release.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/release_actions/release.py rename to tests/wpt/tests/webdriver/tests/classic/release_actions/release.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/release_actions/sequence.py b/tests/wpt/tests/webdriver/tests/classic/release_actions/sequence.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/release_actions/sequence.py rename to tests/wpt/tests/webdriver/tests/classic/release_actions/sequence.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/release_actions/support/__init__.py b/tests/wpt/tests/webdriver/tests/classic/release_actions/support/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/release_actions/support/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/release_actions/support/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/release_actions/support/refine.py b/tests/wpt/tests/webdriver/tests/classic/release_actions/support/refine.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/release_actions/support/refine.py rename to tests/wpt/tests/webdriver/tests/classic/release_actions/support/refine.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/send_alert_text/__init__.py b/tests/wpt/tests/webdriver/tests/classic/send_alert_text/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/send_alert_text/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/send_alert_text/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/send_alert_text/conftest.py b/tests/wpt/tests/webdriver/tests/classic/send_alert_text/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/send_alert_text/conftest.py rename to tests/wpt/tests/webdriver/tests/classic/send_alert_text/conftest.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/send_alert_text/send.py b/tests/wpt/tests/webdriver/tests/classic/send_alert_text/send.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/send_alert_text/send.py rename to tests/wpt/tests/webdriver/tests/classic/send_alert_text/send.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/set_timeouts/__init__.py b/tests/wpt/tests/webdriver/tests/classic/set_timeouts/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/set_timeouts/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/set_timeouts/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/set_timeouts/set.py b/tests/wpt/tests/webdriver/tests/classic/set_timeouts/set.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/set_timeouts/set.py rename to tests/wpt/tests/webdriver/tests/classic/set_timeouts/set.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/set_timeouts/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/set_timeouts/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/set_timeouts/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/set_timeouts/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/set_window_rect/__init__.py b/tests/wpt/tests/webdriver/tests/classic/set_window_rect/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/set_window_rect/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/set_window_rect/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/set_window_rect/set.py b/tests/wpt/tests/webdriver/tests/classic/set_window_rect/set.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/set_window_rect/set.py rename to tests/wpt/tests/webdriver/tests/classic/set_window_rect/set.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/set_window_rect/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/set_window_rect/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/set_window_rect/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/set_window_rect/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/status/__init__.py b/tests/wpt/tests/webdriver/tests/classic/status/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/status/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/status/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/status/status.py b/tests/wpt/tests/webdriver/tests/classic/status/status.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/status/status.py rename to tests/wpt/tests/webdriver/tests/classic/status/status.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_frame/__init__.py b/tests/wpt/tests/webdriver/tests/classic/switch_to_frame/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_frame/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/switch_to_frame/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_frame/cross_origin.py b/tests/wpt/tests/webdriver/tests/classic/switch_to_frame/cross_origin.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_frame/cross_origin.py rename to tests/wpt/tests/webdriver/tests/classic/switch_to_frame/cross_origin.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_frame/switch.py b/tests/wpt/tests/webdriver/tests/classic/switch_to_frame/switch.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_frame/switch.py rename to tests/wpt/tests/webdriver/tests/classic/switch_to_frame/switch.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_frame/switch_number.py b/tests/wpt/tests/webdriver/tests/classic/switch_to_frame/switch_number.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_frame/switch_number.py rename to tests/wpt/tests/webdriver/tests/classic/switch_to_frame/switch_number.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_frame/switch_webelement.py b/tests/wpt/tests/webdriver/tests/classic/switch_to_frame/switch_webelement.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_frame/switch_webelement.py rename to tests/wpt/tests/webdriver/tests/classic/switch_to_frame/switch_webelement.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_parent_frame/__init__.py b/tests/wpt/tests/webdriver/tests/classic/switch_to_parent_frame/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_parent_frame/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/switch_to_parent_frame/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_parent_frame/switch.py b/tests/wpt/tests/webdriver/tests/classic/switch_to_parent_frame/switch.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_parent_frame/switch.py rename to tests/wpt/tests/webdriver/tests/classic/switch_to_parent_frame/switch.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_window/__init__.py b/tests/wpt/tests/webdriver/tests/classic/switch_to_window/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_window/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/switch_to_window/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_window/alerts.py b/tests/wpt/tests/webdriver/tests/classic/switch_to_window/alerts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_window/alerts.py rename to tests/wpt/tests/webdriver/tests/classic/switch_to_window/alerts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_window/switch.py b/tests/wpt/tests/webdriver/tests/classic/switch_to_window/switch.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/switch_to_window/switch.py rename to tests/wpt/tests/webdriver/tests/classic/switch_to_window/switch.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/take_element_screenshot/__init__.py b/tests/wpt/tests/webdriver/tests/classic/take_element_screenshot/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/take_element_screenshot/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/take_element_screenshot/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/take_element_screenshot/iframe.py b/tests/wpt/tests/webdriver/tests/classic/take_element_screenshot/iframe.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/take_element_screenshot/iframe.py rename to tests/wpt/tests/webdriver/tests/classic/take_element_screenshot/iframe.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/take_element_screenshot/screenshot.py b/tests/wpt/tests/webdriver/tests/classic/take_element_screenshot/screenshot.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/take_element_screenshot/screenshot.py rename to tests/wpt/tests/webdriver/tests/classic/take_element_screenshot/screenshot.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/take_element_screenshot/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/take_element_screenshot/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/take_element_screenshot/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/take_element_screenshot/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/take_screenshot/__init__.py b/tests/wpt/tests/webdriver/tests/classic/take_screenshot/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/take_screenshot/__init__.py rename to tests/wpt/tests/webdriver/tests/classic/take_screenshot/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/take_screenshot/iframe.py b/tests/wpt/tests/webdriver/tests/classic/take_screenshot/iframe.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/take_screenshot/iframe.py rename to tests/wpt/tests/webdriver/tests/classic/take_screenshot/iframe.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/take_screenshot/screenshot.py b/tests/wpt/tests/webdriver/tests/classic/take_screenshot/screenshot.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/take_screenshot/screenshot.py rename to tests/wpt/tests/webdriver/tests/classic/take_screenshot/screenshot.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/classic/take_screenshot/user_prompts.py b/tests/wpt/tests/webdriver/tests/classic/take_screenshot/user_prompts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/classic/take_screenshot/user_prompts.py rename to tests/wpt/tests/webdriver/tests/classic/take_screenshot/user_prompts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/conftest.py b/tests/wpt/tests/webdriver/tests/conftest.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/conftest.py rename to tests/wpt/tests/webdriver/tests/conftest.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/__init__.py b/tests/wpt/tests/webdriver/tests/support/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/__init__.py rename to tests/wpt/tests/webdriver/tests/support/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/asserts.py b/tests/wpt/tests/webdriver/tests/support/asserts.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/asserts.py rename to tests/wpt/tests/webdriver/tests/support/asserts.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/defaults.py b/tests/wpt/tests/webdriver/tests/support/defaults.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/defaults.py rename to tests/wpt/tests/webdriver/tests/support/defaults.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py b/tests/wpt/tests/webdriver/tests/support/fixtures.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py rename to tests/wpt/tests/webdriver/tests/support/fixtures.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures_bidi.py b/tests/wpt/tests/webdriver/tests/support/fixtures_bidi.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/fixtures_bidi.py rename to tests/wpt/tests/webdriver/tests/support/fixtures_bidi.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures_http.py b/tests/wpt/tests/webdriver/tests/support/fixtures_http.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/fixtures_http.py rename to tests/wpt/tests/webdriver/tests/support/fixtures_http.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/helpers.py b/tests/wpt/tests/webdriver/tests/support/helpers.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/helpers.py rename to tests/wpt/tests/webdriver/tests/support/helpers.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/html/deleteframe.html b/tests/wpt/tests/webdriver/tests/support/html/deleteframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/html/deleteframe.html rename to tests/wpt/tests/webdriver/tests/support/html/deleteframe.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/html/frames.html b/tests/wpt/tests/webdriver/tests/support/html/frames.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/html/frames.html rename to tests/wpt/tests/webdriver/tests/support/html/frames.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/html/frames_no_bfcache.html b/tests/wpt/tests/webdriver/tests/support/html/frames_no_bfcache.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/html/frames_no_bfcache.html rename to tests/wpt/tests/webdriver/tests/support/html/frames_no_bfcache.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/html/meta-utf8-after-1024-bytes.html b/tests/wpt/tests/webdriver/tests/support/html/meta-utf8-after-1024-bytes.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/html/meta-utf8-after-1024-bytes.html rename to tests/wpt/tests/webdriver/tests/support/html/meta-utf8-after-1024-bytes.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/html/render.html b/tests/wpt/tests/webdriver/tests/support/html/render.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/html/render.html rename to tests/wpt/tests/webdriver/tests/support/html/render.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/html/subframe.html b/tests/wpt/tests/webdriver/tests/support/html/subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/html/subframe.html rename to tests/wpt/tests/webdriver/tests/support/html/subframe.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/html/test_actions.html b/tests/wpt/tests/webdriver/tests/support/html/test_actions.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/html/test_actions.html rename to tests/wpt/tests/webdriver/tests/support/html/test_actions.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/html/test_actions_pointer.html b/tests/wpt/tests/webdriver/tests/support/html/test_actions_pointer.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/html/test_actions_pointer.html rename to tests/wpt/tests/webdriver/tests/support/html/test_actions_pointer.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/html/test_actions_scroll.html b/tests/wpt/tests/webdriver/tests/support/html/test_actions_scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/html/test_actions_scroll.html rename to tests/wpt/tests/webdriver/tests/support/html/test_actions_scroll.html diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/http_handlers/__init__.py b/tests/wpt/tests/webdriver/tests/support/http_handlers/__init__.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/http_handlers/__init__.py rename to tests/wpt/tests/webdriver/tests/support/http_handlers/__init__.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/http_handlers/authentication.py b/tests/wpt/tests/webdriver/tests/support/http_handlers/authentication.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/http_handlers/authentication.py rename to tests/wpt/tests/webdriver/tests/support/http_handlers/authentication.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/http_handlers/cached.py b/tests/wpt/tests/webdriver/tests/support/http_handlers/cached.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/http_handlers/cached.py rename to tests/wpt/tests/webdriver/tests/support/http_handlers/cached.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/http_handlers/headers.py b/tests/wpt/tests/webdriver/tests/support/http_handlers/headers.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/http_handlers/headers.py rename to tests/wpt/tests/webdriver/tests/support/http_handlers/headers.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/http_handlers/must-revalidate.py b/tests/wpt/tests/webdriver/tests/support/http_handlers/must-revalidate.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/http_handlers/must-revalidate.py rename to tests/wpt/tests/webdriver/tests/support/http_handlers/must-revalidate.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/http_handlers/redirect.py b/tests/wpt/tests/webdriver/tests/support/http_handlers/redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/http_handlers/redirect.py rename to tests/wpt/tests/webdriver/tests/support/http_handlers/redirect.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/http_handlers/status.py b/tests/wpt/tests/webdriver/tests/support/http_handlers/status.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/http_handlers/status.py rename to tests/wpt/tests/webdriver/tests/support/http_handlers/status.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/http_request.py b/tests/wpt/tests/webdriver/tests/support/http_request.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/http_request.py rename to tests/wpt/tests/webdriver/tests/support/http_request.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/image.py b/tests/wpt/tests/webdriver/tests/support/image.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/image.py rename to tests/wpt/tests/webdriver/tests/support/image.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/inline.py b/tests/wpt/tests/webdriver/tests/support/inline.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/inline.py rename to tests/wpt/tests/webdriver/tests/support/inline.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/keys.py b/tests/wpt/tests/webdriver/tests/support/keys.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/keys.py rename to tests/wpt/tests/webdriver/tests/support/keys.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/screenshot.py b/tests/wpt/tests/webdriver/tests/support/screenshot.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/screenshot.py rename to tests/wpt/tests/webdriver/tests/support/screenshot.py diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/sync.py b/tests/wpt/tests/webdriver/tests/support/sync.py similarity index 100% rename from tests/wpt/web-platform-tests/webdriver/tests/support/sync.py rename to tests/wpt/tests/webdriver/tests/support/sync.py diff --git a/tests/wpt/web-platform-tests/webgl/META.yml b/tests/wpt/tests/webgl/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webgl/META.yml rename to tests/wpt/tests/webgl/META.yml diff --git a/tests/wpt/web-platform-tests/webgl/bufferSubData.html b/tests/wpt/tests/webgl/bufferSubData.html similarity index 100% rename from tests/wpt/web-platform-tests/webgl/bufferSubData.html rename to tests/wpt/tests/webgl/bufferSubData.html diff --git a/tests/wpt/web-platform-tests/webgl/common.js b/tests/wpt/tests/webgl/common.js similarity index 100% rename from tests/wpt/web-platform-tests/webgl/common.js rename to tests/wpt/tests/webgl/common.js diff --git a/tests/wpt/web-platform-tests/webgl/compressedTexImage2D.html b/tests/wpt/tests/webgl/compressedTexImage2D.html similarity index 100% rename from tests/wpt/web-platform-tests/webgl/compressedTexImage2D.html rename to tests/wpt/tests/webgl/compressedTexImage2D.html diff --git a/tests/wpt/web-platform-tests/webgl/compressedTexSubImage2D.html b/tests/wpt/tests/webgl/compressedTexSubImage2D.html similarity index 100% rename from tests/wpt/web-platform-tests/webgl/compressedTexSubImage2D.html rename to tests/wpt/tests/webgl/compressedTexSubImage2D.html diff --git a/tests/wpt/web-platform-tests/webgl/idlharness.any.js b/tests/wpt/tests/webgl/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webgl/idlharness.any.js rename to tests/wpt/tests/webgl/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/webgl/texImage2D.html b/tests/wpt/tests/webgl/texImage2D.html similarity index 100% rename from tests/wpt/web-platform-tests/webgl/texImage2D.html rename to tests/wpt/tests/webgl/texImage2D.html diff --git a/tests/wpt/web-platform-tests/webgl/texSubImage2D.html b/tests/wpt/tests/webgl/texSubImage2D.html similarity index 100% rename from tests/wpt/web-platform-tests/webgl/texSubImage2D.html rename to tests/wpt/tests/webgl/texSubImage2D.html diff --git a/tests/wpt/web-platform-tests/webgl/uniformMatrixNfv.html b/tests/wpt/tests/webgl/uniformMatrixNfv.html similarity index 100% rename from tests/wpt/web-platform-tests/webgl/uniformMatrixNfv.html rename to tests/wpt/tests/webgl/uniformMatrixNfv.html diff --git a/tests/wpt/web-platform-tests/webgpu/LICENSE.txt b/tests/wpt/tests/webgpu/LICENSE.txt similarity index 100% rename from tests/wpt/web-platform-tests/webgpu/LICENSE.txt rename to tests/wpt/tests/webgpu/LICENSE.txt diff --git a/tests/wpt/web-platform-tests/webgpu/META.yml b/tests/wpt/tests/webgpu/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webgpu/META.yml rename to tests/wpt/tests/webgpu/META.yml diff --git a/tests/wpt/web-platform-tests/webgpu/README.md b/tests/wpt/tests/webgpu/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webgpu/README.md rename to tests/wpt/tests/webgpu/README.md diff --git a/tests/wpt/web-platform-tests/webhid/META.yml b/tests/wpt/tests/webhid/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webhid/META.yml rename to tests/wpt/tests/webhid/META.yml diff --git a/tests/wpt/web-platform-tests/webhid/idlharness.https.window.js b/tests/wpt/tests/webhid/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webhid/idlharness.https.window.js rename to tests/wpt/tests/webhid/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/webhid/resources/automation.js b/tests/wpt/tests/webhid/resources/automation.js similarity index 100% rename from tests/wpt/web-platform-tests/webhid/resources/automation.js rename to tests/wpt/tests/webhid/resources/automation.js diff --git a/tests/wpt/web-platform-tests/webhid/resources/common.js b/tests/wpt/tests/webhid/resources/common.js similarity index 100% rename from tests/wpt/web-platform-tests/webhid/resources/common.js rename to tests/wpt/tests/webhid/resources/common.js diff --git a/tests/wpt/web-platform-tests/webhid/unload-iframe.https.window.js b/tests/wpt/tests/webhid/unload-iframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webhid/unload-iframe.https.window.js rename to tests/wpt/tests/webhid/unload-iframe.https.window.js diff --git a/tests/wpt/web-platform-tests/webidl/META.yml b/tests/wpt/tests/webidl/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webidl/META.yml rename to tests/wpt/tests/webidl/META.yml diff --git a/tests/wpt/web-platform-tests/webidl/README.md b/tests/wpt/tests/webidl/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webidl/README.md rename to tests/wpt/tests/webidl/README.md diff --git a/tests/wpt/web-platform-tests/webidl/current-realm.html b/tests/wpt/tests/webidl/current-realm.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/current-realm.html rename to tests/wpt/tests/webidl/current-realm.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/allow-resizable.html b/tests/wpt/tests/webidl/ecmascript-binding/allow-resizable.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/allow-resizable.html rename to tests/wpt/tests/webidl/ecmascript-binding/allow-resizable.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/attributes-accessors-unique-function-objects.html b/tests/wpt/tests/webidl/ecmascript-binding/attributes-accessors-unique-function-objects.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/attributes-accessors-unique-function-objects.html rename to tests/wpt/tests/webidl/ecmascript-binding/attributes-accessors-unique-function-objects.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/builtin-function-properties.any.js b/tests/wpt/tests/webidl/ecmascript-binding/builtin-function-properties.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/builtin-function-properties.any.js rename to tests/wpt/tests/webidl/ecmascript-binding/builtin-function-properties.any.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/class-string-interface.any.js b/tests/wpt/tests/webidl/ecmascript-binding/class-string-interface.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/class-string-interface.any.js rename to tests/wpt/tests/webidl/ecmascript-binding/class-string-interface.any.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/class-string-iterator-prototype-object.any.js b/tests/wpt/tests/webidl/ecmascript-binding/class-string-iterator-prototype-object.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/class-string-iterator-prototype-object.any.js rename to tests/wpt/tests/webidl/ecmascript-binding/class-string-iterator-prototype-object.any.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/class-string-named-properties-object.window.js b/tests/wpt/tests/webidl/ecmascript-binding/class-string-named-properties-object.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/class-string-named-properties-object.window.js rename to tests/wpt/tests/webidl/ecmascript-binding/class-string-named-properties-object.window.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/constructors.html b/tests/wpt/tests/webidl/ecmascript-binding/constructors.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/constructors.html rename to tests/wpt/tests/webidl/ecmascript-binding/constructors.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/default-iterator-object.html b/tests/wpt/tests/webidl/ecmascript-binding/default-iterator-object.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/default-iterator-object.html rename to tests/wpt/tests/webidl/ecmascript-binding/default-iterator-object.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/default-toJSON-cross-realm.html b/tests/wpt/tests/webidl/ecmascript-binding/default-toJSON-cross-realm.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/default-toJSON-cross-realm.html rename to tests/wpt/tests/webidl/ecmascript-binding/default-toJSON-cross-realm.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/es-exceptions/DOMException-constants.any.js b/tests/wpt/tests/webidl/ecmascript-binding/es-exceptions/DOMException-constants.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/es-exceptions/DOMException-constants.any.js rename to tests/wpt/tests/webidl/ecmascript-binding/es-exceptions/DOMException-constants.any.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-and-prototype.any.js b/tests/wpt/tests/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-and-prototype.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-and-prototype.any.js rename to tests/wpt/tests/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-and-prototype.any.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-behavior.any.js b/tests/wpt/tests/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-behavior.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-behavior.any.js rename to tests/wpt/tests/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-behavior.any.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/es-exceptions/DOMException-custom-bindings.any.js b/tests/wpt/tests/webidl/ecmascript-binding/es-exceptions/DOMException-custom-bindings.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/es-exceptions/DOMException-custom-bindings.any.js rename to tests/wpt/tests/webidl/ecmascript-binding/es-exceptions/DOMException-custom-bindings.any.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/es-exceptions/exceptions.html b/tests/wpt/tests/webidl/ecmascript-binding/es-exceptions/exceptions.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/es-exceptions/exceptions.html rename to tests/wpt/tests/webidl/ecmascript-binding/es-exceptions/exceptions.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/global-immutable-prototype.any.js b/tests/wpt/tests/webidl/ecmascript-binding/global-immutable-prototype.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/global-immutable-prototype.any.js rename to tests/wpt/tests/webidl/ecmascript-binding/global-immutable-prototype.any.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/global-object-implicit-this-value-cross-realm.html b/tests/wpt/tests/webidl/ecmascript-binding/global-object-implicit-this-value-cross-realm.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/global-object-implicit-this-value-cross-realm.html rename to tests/wpt/tests/webidl/ecmascript-binding/global-object-implicit-this-value-cross-realm.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/global-object-implicit-this-value.any.js b/tests/wpt/tests/webidl/ecmascript-binding/global-object-implicit-this-value.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/global-object-implicit-this-value.any.js rename to tests/wpt/tests/webidl/ecmascript-binding/global-object-implicit-this-value.any.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/has-instance.html b/tests/wpt/tests/webidl/ecmascript-binding/has-instance.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/has-instance.html rename to tests/wpt/tests/webidl/ecmascript-binding/has-instance.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/interface-object-set-receiver.html b/tests/wpt/tests/webidl/ecmascript-binding/interface-object-set-receiver.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/interface-object-set-receiver.html rename to tests/wpt/tests/webidl/ecmascript-binding/interface-object-set-receiver.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/interface-object.html b/tests/wpt/tests/webidl/ecmascript-binding/interface-object.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/interface-object.html rename to tests/wpt/tests/webidl/ecmascript-binding/interface-object.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/interface-prototype-constructor-set-receiver.html b/tests/wpt/tests/webidl/ecmascript-binding/interface-prototype-constructor-set-receiver.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/interface-prototype-constructor-set-receiver.html rename to tests/wpt/tests/webidl/ecmascript-binding/interface-prototype-constructor-set-receiver.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/interface-prototype-object.html b/tests/wpt/tests/webidl/ecmascript-binding/interface-prototype-object.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/interface-prototype-object.html rename to tests/wpt/tests/webidl/ecmascript-binding/interface-prototype-object.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/invalid-this-value-cross-realm.html b/tests/wpt/tests/webidl/ecmascript-binding/invalid-this-value-cross-realm.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/invalid-this-value-cross-realm.html rename to tests/wpt/tests/webidl/ecmascript-binding/invalid-this-value-cross-realm.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/iterator-invalidation-foreach.html b/tests/wpt/tests/webidl/ecmascript-binding/iterator-invalidation-foreach.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/iterator-invalidation-foreach.html rename to tests/wpt/tests/webidl/ecmascript-binding/iterator-invalidation-foreach.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/iterator-prototype-object.html b/tests/wpt/tests/webidl/ecmascript-binding/iterator-prototype-object.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/iterator-prototype-object.html rename to tests/wpt/tests/webidl/ecmascript-binding/iterator-prototype-object.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/legacy-callback-interface-object.html b/tests/wpt/tests/webidl/ecmascript-binding/legacy-callback-interface-object.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/legacy-callback-interface-object.html rename to tests/wpt/tests/webidl/ecmascript-binding/legacy-callback-interface-object.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/legacy-factor-function-subclass.window.js b/tests/wpt/tests/webidl/ecmascript-binding/legacy-factor-function-subclass.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/legacy-factor-function-subclass.window.js rename to tests/wpt/tests/webidl/ecmascript-binding/legacy-factor-function-subclass.window.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/legacy-platform-object/DefineOwnProperty.html b/tests/wpt/tests/webidl/ecmascript-binding/legacy-platform-object/DefineOwnProperty.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/legacy-platform-object/DefineOwnProperty.html rename to tests/wpt/tests/webidl/ecmascript-binding/legacy-platform-object/DefineOwnProperty.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/legacy-platform-object/GetOwnProperty.html b/tests/wpt/tests/webidl/ecmascript-binding/legacy-platform-object/GetOwnProperty.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/legacy-platform-object/GetOwnProperty.html rename to tests/wpt/tests/webidl/ecmascript-binding/legacy-platform-object/GetOwnProperty.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/legacy-platform-object/OwnPropertyKeys.html b/tests/wpt/tests/webidl/ecmascript-binding/legacy-platform-object/OwnPropertyKeys.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/legacy-platform-object/OwnPropertyKeys.html rename to tests/wpt/tests/webidl/ecmascript-binding/legacy-platform-object/OwnPropertyKeys.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/legacy-platform-object/Set.html b/tests/wpt/tests/webidl/ecmascript-binding/legacy-platform-object/Set.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/legacy-platform-object/Set.html rename to tests/wpt/tests/webidl/ecmascript-binding/legacy-platform-object/Set.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/legacy-platform-object/helper.js b/tests/wpt/tests/webidl/ecmascript-binding/legacy-platform-object/helper.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/legacy-platform-object/helper.js rename to tests/wpt/tests/webidl/ecmascript-binding/legacy-platform-object/helper.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/no-regexp-special-casing.any.js b/tests/wpt/tests/webidl/ecmascript-binding/no-regexp-special-casing.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/no-regexp-special-casing.any.js rename to tests/wpt/tests/webidl/ecmascript-binding/no-regexp-special-casing.any.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/observable-array-no-leak-of-internals.window.js b/tests/wpt/tests/webidl/ecmascript-binding/observable-array-no-leak-of-internals.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/observable-array-no-leak-of-internals.window.js rename to tests/wpt/tests/webidl/ecmascript-binding/observable-array-no-leak-of-internals.window.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/observable-array-ownkeys.window.js b/tests/wpt/tests/webidl/ecmascript-binding/observable-array-ownkeys.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/observable-array-ownkeys.window.js rename to tests/wpt/tests/webidl/ecmascript-binding/observable-array-ownkeys.window.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/put-forwards.html b/tests/wpt/tests/webidl/ecmascript-binding/put-forwards.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/put-forwards.html rename to tests/wpt/tests/webidl/ecmascript-binding/put-forwards.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/sequence-conversion.html b/tests/wpt/tests/webidl/ecmascript-binding/sequence-conversion.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/sequence-conversion.html rename to tests/wpt/tests/webidl/ecmascript-binding/sequence-conversion.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/support/constructors-support.html b/tests/wpt/tests/webidl/ecmascript-binding/support/constructors-support.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/support/constructors-support.html rename to tests/wpt/tests/webidl/ecmascript-binding/support/constructors-support.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/support/create-realm.js b/tests/wpt/tests/webidl/ecmascript-binding/support/create-realm.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/support/create-realm.js rename to tests/wpt/tests/webidl/ecmascript-binding/support/create-realm.js diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/support/dummy-iframe.html b/tests/wpt/tests/webidl/ecmascript-binding/support/dummy-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/support/dummy-iframe.html rename to tests/wpt/tests/webidl/ecmascript-binding/support/dummy-iframe.html diff --git a/tests/wpt/web-platform-tests/webidl/ecmascript-binding/window-named-properties-object.html b/tests/wpt/tests/webidl/ecmascript-binding/window-named-properties-object.html similarity index 100% rename from tests/wpt/web-platform-tests/webidl/ecmascript-binding/window-named-properties-object.html rename to tests/wpt/tests/webidl/ecmascript-binding/window-named-properties-object.html diff --git a/tests/wpt/web-platform-tests/webidl/idlharness-shadowrealm.window.js b/tests/wpt/tests/webidl/idlharness-shadowrealm.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/idlharness-shadowrealm.window.js rename to tests/wpt/tests/webidl/idlharness-shadowrealm.window.js diff --git a/tests/wpt/web-platform-tests/webidl/idlharness.any.js b/tests/wpt/tests/webidl/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webidl/idlharness.any.js rename to tests/wpt/tests/webidl/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_Blob.any.js b/tests/wpt/tests/webmessaging/Channel_postMessage_Blob.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_Blob.any.js rename to tests/wpt/tests/webmessaging/Channel_postMessage_Blob.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_DataCloneErr.any.js b/tests/wpt/tests/webmessaging/Channel_postMessage_DataCloneErr.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_DataCloneErr.any.js rename to tests/wpt/tests/webmessaging/Channel_postMessage_DataCloneErr.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_clone_port.any.js b/tests/wpt/tests/webmessaging/Channel_postMessage_clone_port.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_clone_port.any.js rename to tests/wpt/tests/webmessaging/Channel_postMessage_clone_port.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_clone_port_error.any.js b/tests/wpt/tests/webmessaging/Channel_postMessage_clone_port_error.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_clone_port_error.any.js rename to tests/wpt/tests/webmessaging/Channel_postMessage_clone_port_error.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_event_properties.any.js b/tests/wpt/tests/webmessaging/Channel_postMessage_event_properties.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_event_properties.any.js rename to tests/wpt/tests/webmessaging/Channel_postMessage_event_properties.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_ports_readonly_array.any.js b/tests/wpt/tests/webmessaging/Channel_postMessage_ports_readonly_array.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_ports_readonly_array.any.js rename to tests/wpt/tests/webmessaging/Channel_postMessage_ports_readonly_array.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_target_source.any.js b/tests/wpt/tests/webmessaging/Channel_postMessage_target_source.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_target_source.any.js rename to tests/wpt/tests/webmessaging/Channel_postMessage_target_source.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_transfer_xsite_incoming_messages.window.js b/tests/wpt/tests/webmessaging/Channel_postMessage_transfer_xsite_incoming_messages.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_transfer_xsite_incoming_messages.window.js rename to tests/wpt/tests/webmessaging/Channel_postMessage_transfer_xsite_incoming_messages.window.js diff --git a/tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_with_transfer_entangled.any.js b/tests/wpt/tests/webmessaging/Channel_postMessage_with_transfer_entangled.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_with_transfer_entangled.any.js rename to tests/wpt/tests/webmessaging/Channel_postMessage_with_transfer_entangled.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_with_transfer_incoming_messages.any.js b/tests/wpt/tests/webmessaging/Channel_postMessage_with_transfer_incoming_messages.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_with_transfer_incoming_messages.any.js rename to tests/wpt/tests/webmessaging/Channel_postMessage_with_transfer_incoming_messages.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_with_transfer_outgoing_messages.any.js b/tests/wpt/tests/webmessaging/Channel_postMessage_with_transfer_outgoing_messages.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/Channel_postMessage_with_transfer_outgoing_messages.any.js rename to tests/wpt/tests/webmessaging/Channel_postMessage_with_transfer_outgoing_messages.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/META.yml b/tests/wpt/tests/webmessaging/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/META.yml rename to tests/wpt/tests/webmessaging/META.yml diff --git a/tests/wpt/web-platform-tests/webmessaging/MessageEvent-trusted.any.js b/tests/wpt/tests/webmessaging/MessageEvent-trusted.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/MessageEvent-trusted.any.js rename to tests/wpt/tests/webmessaging/MessageEvent-trusted.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/MessageEvent-trusted.window.js b/tests/wpt/tests/webmessaging/MessageEvent-trusted.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/MessageEvent-trusted.window.js rename to tests/wpt/tests/webmessaging/MessageEvent-trusted.window.js diff --git a/tests/wpt/web-platform-tests/webmessaging/MessageEvent.any.js b/tests/wpt/tests/webmessaging/MessageEvent.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/MessageEvent.any.js rename to tests/wpt/tests/webmessaging/MessageEvent.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/MessageEvent_onmessage_postMessage_infinite_loop.html b/tests/wpt/tests/webmessaging/MessageEvent_onmessage_postMessage_infinite_loop.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/MessageEvent_onmessage_postMessage_infinite_loop.html rename to tests/wpt/tests/webmessaging/MessageEvent_onmessage_postMessage_infinite_loop.html diff --git a/tests/wpt/web-platform-tests/webmessaging/MessageEvent_properties.htm b/tests/wpt/tests/webmessaging/MessageEvent_properties.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/MessageEvent_properties.htm rename to tests/wpt/tests/webmessaging/MessageEvent_properties.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/MessagePort_initial_disabled.any.js b/tests/wpt/tests/webmessaging/MessagePort_initial_disabled.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/MessagePort_initial_disabled.any.js rename to tests/wpt/tests/webmessaging/MessagePort_initial_disabled.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/MessagePort_onmessage_start.any.js b/tests/wpt/tests/webmessaging/MessagePort_onmessage_start.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/MessagePort_onmessage_start.any.js rename to tests/wpt/tests/webmessaging/MessagePort_onmessage_start.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/README.md b/tests/wpt/tests/webmessaging/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/README.md rename to tests/wpt/tests/webmessaging/README.md diff --git a/tests/wpt/web-platform-tests/webmessaging/Transferred_objects_unusable.sub.htm b/tests/wpt/tests/webmessaging/Transferred_objects_unusable.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/Transferred_objects_unusable.sub.htm rename to tests/wpt/tests/webmessaging/Transferred_objects_unusable.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/basics.any.js b/tests/wpt/tests/webmessaging/broadcastchannel/basics.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/basics.any.js rename to tests/wpt/tests/webmessaging/broadcastchannel/basics.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/blobs.html b/tests/wpt/tests/webmessaging/broadcastchannel/blobs.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/blobs.html rename to tests/wpt/tests/webmessaging/broadcastchannel/blobs.html diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/cross-origin.html b/tests/wpt/tests/webmessaging/broadcastchannel/cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/cross-origin.html rename to tests/wpt/tests/webmessaging/broadcastchannel/cross-origin.html diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/cross-partition.https.tentative.html b/tests/wpt/tests/webmessaging/broadcastchannel/cross-partition.https.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/cross-partition.https.tentative.html rename to tests/wpt/tests/webmessaging/broadcastchannel/cross-partition.https.tentative.html diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/detached-iframe.html b/tests/wpt/tests/webmessaging/broadcastchannel/detached-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/detached-iframe.html rename to tests/wpt/tests/webmessaging/broadcastchannel/detached-iframe.html diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/interface.any.js b/tests/wpt/tests/webmessaging/broadcastchannel/interface.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/interface.any.js rename to tests/wpt/tests/webmessaging/broadcastchannel/interface.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/opaque-origin.html b/tests/wpt/tests/webmessaging/broadcastchannel/opaque-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/opaque-origin.html rename to tests/wpt/tests/webmessaging/broadcastchannel/opaque-origin.html diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/ordering.html b/tests/wpt/tests/webmessaging/broadcastchannel/ordering.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/ordering.html rename to tests/wpt/tests/webmessaging/broadcastchannel/ordering.html diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/origin.window.js b/tests/wpt/tests/webmessaging/broadcastchannel/origin.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/origin.window.js rename to tests/wpt/tests/webmessaging/broadcastchannel/origin.window.js diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/cross-origin.html b/tests/wpt/tests/webmessaging/broadcastchannel/resources/cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/cross-origin.html rename to tests/wpt/tests/webmessaging/broadcastchannel/resources/cross-origin.html diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/ordering.html b/tests/wpt/tests/webmessaging/broadcastchannel/resources/ordering.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/ordering.html rename to tests/wpt/tests/webmessaging/broadcastchannel/resources/ordering.html diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/origin.html b/tests/wpt/tests/webmessaging/broadcastchannel/resources/origin.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/origin.html rename to tests/wpt/tests/webmessaging/broadcastchannel/resources/origin.html diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/sandboxed.html b/tests/wpt/tests/webmessaging/broadcastchannel/resources/sandboxed.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/sandboxed.html rename to tests/wpt/tests/webmessaging/broadcastchannel/resources/sandboxed.html diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/service-worker.js b/tests/wpt/tests/webmessaging/broadcastchannel/resources/service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/service-worker.js rename to tests/wpt/tests/webmessaging/broadcastchannel/resources/service-worker.js diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/worker.js b/tests/wpt/tests/webmessaging/broadcastchannel/resources/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/resources/worker.js rename to tests/wpt/tests/webmessaging/broadcastchannel/resources/worker.js diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/sandbox.html b/tests/wpt/tests/webmessaging/broadcastchannel/sandbox.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/sandbox.html rename to tests/wpt/tests/webmessaging/broadcastchannel/sandbox.html diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/service-worker.https.html b/tests/wpt/tests/webmessaging/broadcastchannel/service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/service-worker.https.html rename to tests/wpt/tests/webmessaging/broadcastchannel/service-worker.https.html diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/workers.html b/tests/wpt/tests/webmessaging/broadcastchannel/workers.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/broadcastchannel/workers.html rename to tests/wpt/tests/webmessaging/broadcastchannel/workers.html diff --git a/tests/wpt/web-platform-tests/webmessaging/event.data.sub.htm b/tests/wpt/tests/webmessaging/event.data.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/event.data.sub.htm rename to tests/wpt/tests/webmessaging/event.data.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/event.origin.sub.htm b/tests/wpt/tests/webmessaging/event.origin.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/event.origin.sub.htm rename to tests/wpt/tests/webmessaging/event.origin.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/event.ports.sub.htm b/tests/wpt/tests/webmessaging/event.ports.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/event.ports.sub.htm rename to tests/wpt/tests/webmessaging/event.ports.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/event.source.htm b/tests/wpt/tests/webmessaging/event.source.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/event.source.htm rename to tests/wpt/tests/webmessaging/event.source.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/event.source.xorigin.sub.htm b/tests/wpt/tests/webmessaging/event.source.xorigin.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/event.source.xorigin.sub.htm rename to tests/wpt/tests/webmessaging/event.source.xorigin.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/message-channels/basics.any.js b/tests/wpt/tests/webmessaging/message-channels/basics.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/message-channels/basics.any.js rename to tests/wpt/tests/webmessaging/message-channels/basics.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/message-channels/close.any.js b/tests/wpt/tests/webmessaging/message-channels/close.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/message-channels/close.any.js rename to tests/wpt/tests/webmessaging/message-channels/close.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/message-channels/cross-document.html b/tests/wpt/tests/webmessaging/message-channels/cross-document.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/message-channels/cross-document.html rename to tests/wpt/tests/webmessaging/message-channels/cross-document.html diff --git a/tests/wpt/web-platform-tests/webmessaging/message-channels/detached-iframe.window.js b/tests/wpt/tests/webmessaging/message-channels/detached-iframe.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/message-channels/detached-iframe.window.js rename to tests/wpt/tests/webmessaging/message-channels/detached-iframe.window.js diff --git a/tests/wpt/web-platform-tests/webmessaging/message-channels/dictionary-transferrable.any.js b/tests/wpt/tests/webmessaging/message-channels/dictionary-transferrable.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/message-channels/dictionary-transferrable.any.js rename to tests/wpt/tests/webmessaging/message-channels/dictionary-transferrable.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/message-channels/implied-start.any.js b/tests/wpt/tests/webmessaging/message-channels/implied-start.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/message-channels/implied-start.any.js rename to tests/wpt/tests/webmessaging/message-channels/implied-start.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/message-channels/no-start.any.js b/tests/wpt/tests/webmessaging/message-channels/no-start.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/message-channels/no-start.any.js rename to tests/wpt/tests/webmessaging/message-channels/no-start.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/message-channels/resources/cross-document-1.html b/tests/wpt/tests/webmessaging/message-channels/resources/cross-document-1.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/message-channels/resources/cross-document-1.html rename to tests/wpt/tests/webmessaging/message-channels/resources/cross-document-1.html diff --git a/tests/wpt/web-platform-tests/webmessaging/message-channels/resources/cross-document-2.html b/tests/wpt/tests/webmessaging/message-channels/resources/cross-document-2.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/message-channels/resources/cross-document-2.html rename to tests/wpt/tests/webmessaging/message-channels/resources/cross-document-2.html diff --git a/tests/wpt/web-platform-tests/webmessaging/message-channels/user-activation.tentative.any.js b/tests/wpt/tests/webmessaging/message-channels/user-activation.tentative.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/message-channels/user-activation.tentative.any.js rename to tests/wpt/tests/webmessaging/message-channels/user-activation.tentative.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/message-channels/worker-post-after-close.any.js b/tests/wpt/tests/webmessaging/message-channels/worker-post-after-close.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/message-channels/worker-post-after-close.any.js rename to tests/wpt/tests/webmessaging/message-channels/worker-post-after-close.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/message-channels/worker.any.js b/tests/wpt/tests/webmessaging/message-channels/worker.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/message-channels/worker.any.js rename to tests/wpt/tests/webmessaging/message-channels/worker.any.js diff --git a/tests/wpt/web-platform-tests/webmessaging/messageerror.html b/tests/wpt/tests/webmessaging/messageerror.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/messageerror.html rename to tests/wpt/tests/webmessaging/messageerror.html diff --git a/tests/wpt/web-platform-tests/webmessaging/multi-globals/broadcastchannel-current.sub.html b/tests/wpt/tests/webmessaging/multi-globals/broadcastchannel-current.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/multi-globals/broadcastchannel-current.sub.html rename to tests/wpt/tests/webmessaging/multi-globals/broadcastchannel-current.sub.html diff --git a/tests/wpt/web-platform-tests/webmessaging/multi-globals/broadcastchannel-incumbent.sub.html b/tests/wpt/tests/webmessaging/multi-globals/broadcastchannel-incumbent.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/multi-globals/broadcastchannel-incumbent.sub.html rename to tests/wpt/tests/webmessaging/multi-globals/broadcastchannel-incumbent.sub.html diff --git a/tests/wpt/web-platform-tests/webmessaging/multi-globals/messageport-current.html b/tests/wpt/tests/webmessaging/multi-globals/messageport-current.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/multi-globals/messageport-current.html rename to tests/wpt/tests/webmessaging/multi-globals/messageport-current.html diff --git a/tests/wpt/web-platform-tests/webmessaging/multi-globals/messageport-incumbent.html b/tests/wpt/tests/webmessaging/multi-globals/messageport-incumbent.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/multi-globals/messageport-incumbent.html rename to tests/wpt/tests/webmessaging/multi-globals/messageport-incumbent.html diff --git a/tests/wpt/web-platform-tests/webmessaging/multi-globals/support/current-document-domain.sub.html b/tests/wpt/tests/webmessaging/multi-globals/support/current-document-domain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/multi-globals/support/current-document-domain.sub.html rename to tests/wpt/tests/webmessaging/multi-globals/support/current-document-domain.sub.html diff --git a/tests/wpt/web-platform-tests/webmessaging/multi-globals/support/current.html b/tests/wpt/tests/webmessaging/multi-globals/support/current.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/multi-globals/support/current.html rename to tests/wpt/tests/webmessaging/multi-globals/support/current.html diff --git a/tests/wpt/web-platform-tests/webmessaging/multi-globals/support/incumbent-document-domain.sub.html b/tests/wpt/tests/webmessaging/multi-globals/support/incumbent-document-domain.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/multi-globals/support/incumbent-document-domain.sub.html rename to tests/wpt/tests/webmessaging/multi-globals/support/incumbent-document-domain.sub.html diff --git a/tests/wpt/web-platform-tests/webmessaging/multi-globals/support/incumbent.html b/tests/wpt/tests/webmessaging/multi-globals/support/incumbent.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/multi-globals/support/incumbent.html rename to tests/wpt/tests/webmessaging/multi-globals/support/incumbent.html diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_ArrayBuffer.sub.htm b/tests/wpt/tests/webmessaging/postMessage_ArrayBuffer.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_ArrayBuffer.sub.htm rename to tests/wpt/tests/webmessaging/postMessage_ArrayBuffer.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_CryptoKey_insecure.sub.html b/tests/wpt/tests/webmessaging/postMessage_CryptoKey_insecure.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_CryptoKey_insecure.sub.html rename to tests/wpt/tests/webmessaging/postMessage_CryptoKey_insecure.sub.html diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_Date.sub.htm b/tests/wpt/tests/webmessaging/postMessage_Date.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_Date.sub.htm rename to tests/wpt/tests/webmessaging/postMessage_Date.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_Document.htm b/tests/wpt/tests/webmessaging/postMessage_Document.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_Document.htm rename to tests/wpt/tests/webmessaging/postMessage_Document.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_Function.htm b/tests/wpt/tests/webmessaging/postMessage_Function.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_Function.htm rename to tests/wpt/tests/webmessaging/postMessage_Function.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_MessagePorts_sorigin.htm b/tests/wpt/tests/webmessaging/postMessage_MessagePorts_sorigin.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_MessagePorts_sorigin.htm rename to tests/wpt/tests/webmessaging/postMessage_MessagePorts_sorigin.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_MessagePorts_xorigin.sub.htm b/tests/wpt/tests/webmessaging/postMessage_MessagePorts_xorigin.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_MessagePorts_xorigin.sub.htm rename to tests/wpt/tests/webmessaging/postMessage_MessagePorts_xorigin.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_MessagePorts_xsite.sub.window.js b/tests/wpt/tests/webmessaging/postMessage_MessagePorts_xsite.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_MessagePorts_xsite.sub.window.js rename to tests/wpt/tests/webmessaging/postMessage_MessagePorts_xsite.sub.window.js diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_arrays.sub.htm b/tests/wpt/tests/webmessaging/postMessage_arrays.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_arrays.sub.htm rename to tests/wpt/tests/webmessaging/postMessage_arrays.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_asterisk_xorigin.sub.htm b/tests/wpt/tests/webmessaging/postMessage_asterisk_xorigin.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_asterisk_xorigin.sub.htm rename to tests/wpt/tests/webmessaging/postMessage_asterisk_xorigin.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_cross_domain_image_transfer_2d.sub.htm b/tests/wpt/tests/webmessaging/postMessage_cross_domain_image_transfer_2d.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_cross_domain_image_transfer_2d.sub.htm rename to tests/wpt/tests/webmessaging/postMessage_cross_domain_image_transfer_2d.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_crosssite.sub.htm b/tests/wpt/tests/webmessaging/postMessage_crosssite.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_crosssite.sub.htm rename to tests/wpt/tests/webmessaging/postMessage_crosssite.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_dup_transfer_objects.htm b/tests/wpt/tests/webmessaging/postMessage_dup_transfer_objects.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_dup_transfer_objects.htm rename to tests/wpt/tests/webmessaging/postMessage_dup_transfer_objects.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_invalid_targetOrigin.htm b/tests/wpt/tests/webmessaging/postMessage_invalid_targetOrigin.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_invalid_targetOrigin.htm rename to tests/wpt/tests/webmessaging/postMessage_invalid_targetOrigin.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_objects.sub.htm b/tests/wpt/tests/webmessaging/postMessage_objects.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_objects.sub.htm rename to tests/wpt/tests/webmessaging/postMessage_objects.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_origin_mismatch.sub.htm b/tests/wpt/tests/webmessaging/postMessage_origin_mismatch.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_origin_mismatch.sub.htm rename to tests/wpt/tests/webmessaging/postMessage_origin_mismatch.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_origin_mismatch_xorigin.sub.htm b/tests/wpt/tests/webmessaging/postMessage_origin_mismatch_xorigin.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_origin_mismatch_xorigin.sub.htm rename to tests/wpt/tests/webmessaging/postMessage_origin_mismatch_xorigin.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_solidus_sorigin.htm b/tests/wpt/tests/webmessaging/postMessage_solidus_sorigin.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_solidus_sorigin.htm rename to tests/wpt/tests/webmessaging/postMessage_solidus_sorigin.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_solidus_xorigin.sub.htm b/tests/wpt/tests/webmessaging/postMessage_solidus_xorigin.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/postMessage_solidus_xorigin.sub.htm rename to tests/wpt/tests/webmessaging/postMessage_solidus_xorigin.sub.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/resources/post-cryptokey-to-opener.html b/tests/wpt/tests/webmessaging/resources/post-cryptokey-to-opener.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/resources/post-cryptokey-to-opener.html rename to tests/wpt/tests/webmessaging/resources/post-cryptokey-to-opener.html diff --git a/tests/wpt/web-platform-tests/webmessaging/resources/transfer-arraybuffer-to-parent.html b/tests/wpt/tests/webmessaging/resources/transfer-arraybuffer-to-parent.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/resources/transfer-arraybuffer-to-parent.html rename to tests/wpt/tests/webmessaging/resources/transfer-arraybuffer-to-parent.html diff --git a/tests/wpt/web-platform-tests/webmessaging/support/ChildWindowPostMessage.htm b/tests/wpt/tests/webmessaging/support/ChildWindowPostMessage.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/support/ChildWindowPostMessage.htm rename to tests/wpt/tests/webmessaging/support/ChildWindowPostMessage.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/support/MessageEvent-trusted-worker.js b/tests/wpt/tests/webmessaging/support/MessageEvent-trusted-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/support/MessageEvent-trusted-worker.js rename to tests/wpt/tests/webmessaging/support/MessageEvent-trusted-worker.js diff --git a/tests/wpt/web-platform-tests/webmessaging/support/compare.js b/tests/wpt/tests/webmessaging/support/compare.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/support/compare.js rename to tests/wpt/tests/webmessaging/support/compare.js diff --git a/tests/wpt/web-platform-tests/webmessaging/support/cross-domain-image-receive.htm b/tests/wpt/tests/webmessaging/support/cross-domain-image-receive.htm similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/support/cross-domain-image-receive.htm rename to tests/wpt/tests/webmessaging/support/cross-domain-image-receive.htm diff --git a/tests/wpt/web-platform-tests/webmessaging/with-options/broken-origin.html b/tests/wpt/tests/webmessaging/with-options/broken-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-options/broken-origin.html rename to tests/wpt/tests/webmessaging/with-options/broken-origin.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-options/host-specific-origin.html b/tests/wpt/tests/webmessaging/with-options/host-specific-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-options/host-specific-origin.html rename to tests/wpt/tests/webmessaging/with-options/host-specific-origin.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-options/message-channel-transferable.html b/tests/wpt/tests/webmessaging/with-options/message-channel-transferable.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-options/message-channel-transferable.html rename to tests/wpt/tests/webmessaging/with-options/message-channel-transferable.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-options/no-target-origin.html b/tests/wpt/tests/webmessaging/with-options/no-target-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-options/no-target-origin.html rename to tests/wpt/tests/webmessaging/with-options/no-target-origin.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-options/null-transfer.html b/tests/wpt/tests/webmessaging/with-options/null-transfer.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-options/null-transfer.html rename to tests/wpt/tests/webmessaging/with-options/null-transfer.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-options/one-arg.html b/tests/wpt/tests/webmessaging/with-options/one-arg.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-options/one-arg.html rename to tests/wpt/tests/webmessaging/with-options/one-arg.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-options/slash-origin.html b/tests/wpt/tests/webmessaging/with-options/slash-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-options/slash-origin.html rename to tests/wpt/tests/webmessaging/with-options/slash-origin.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-options/undefined-transferable.html b/tests/wpt/tests/webmessaging/with-options/undefined-transferable.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-options/undefined-transferable.html rename to tests/wpt/tests/webmessaging/with-options/undefined-transferable.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-options/unknown-parameter.html b/tests/wpt/tests/webmessaging/with-options/unknown-parameter.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-options/unknown-parameter.html rename to tests/wpt/tests/webmessaging/with-options/unknown-parameter.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/001.html b/tests/wpt/tests/webmessaging/with-ports/001.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/001.html rename to tests/wpt/tests/webmessaging/with-ports/001.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/002.html b/tests/wpt/tests/webmessaging/with-ports/002.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/002.html rename to tests/wpt/tests/webmessaging/with-ports/002.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/003.html b/tests/wpt/tests/webmessaging/with-ports/003.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/003.html rename to tests/wpt/tests/webmessaging/with-ports/003.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/004.html b/tests/wpt/tests/webmessaging/with-ports/004.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/004.html rename to tests/wpt/tests/webmessaging/with-ports/004.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/005.html b/tests/wpt/tests/webmessaging/with-ports/005.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/005.html rename to tests/wpt/tests/webmessaging/with-ports/005.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/006.html b/tests/wpt/tests/webmessaging/with-ports/006.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/006.html rename to tests/wpt/tests/webmessaging/with-ports/006.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/007.html b/tests/wpt/tests/webmessaging/with-ports/007.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/007.html rename to tests/wpt/tests/webmessaging/with-ports/007.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/010.html b/tests/wpt/tests/webmessaging/with-ports/010.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/010.html rename to tests/wpt/tests/webmessaging/with-ports/010.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/011.html b/tests/wpt/tests/webmessaging/with-ports/011.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/011.html rename to tests/wpt/tests/webmessaging/with-ports/011.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/012.html b/tests/wpt/tests/webmessaging/with-ports/012.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/012.html rename to tests/wpt/tests/webmessaging/with-ports/012.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/013.html b/tests/wpt/tests/webmessaging/with-ports/013.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/013.html rename to tests/wpt/tests/webmessaging/with-ports/013.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/014.html b/tests/wpt/tests/webmessaging/with-ports/014.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/014.html rename to tests/wpt/tests/webmessaging/with-ports/014.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/015.html b/tests/wpt/tests/webmessaging/with-ports/015.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/015.html rename to tests/wpt/tests/webmessaging/with-ports/015.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/016.html b/tests/wpt/tests/webmessaging/with-ports/016.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/016.html rename to tests/wpt/tests/webmessaging/with-ports/016.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/017.html b/tests/wpt/tests/webmessaging/with-ports/017.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/017.html rename to tests/wpt/tests/webmessaging/with-ports/017.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/018.html b/tests/wpt/tests/webmessaging/with-ports/018.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/018.html rename to tests/wpt/tests/webmessaging/with-ports/018.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/019.html b/tests/wpt/tests/webmessaging/with-ports/019.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/019.html rename to tests/wpt/tests/webmessaging/with-ports/019.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/020.html b/tests/wpt/tests/webmessaging/with-ports/020.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/020.html rename to tests/wpt/tests/webmessaging/with-ports/020.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/021.html b/tests/wpt/tests/webmessaging/with-ports/021.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/021.html rename to tests/wpt/tests/webmessaging/with-ports/021.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/023.html b/tests/wpt/tests/webmessaging/with-ports/023.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/023.html rename to tests/wpt/tests/webmessaging/with-ports/023.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/024.html b/tests/wpt/tests/webmessaging/with-ports/024.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/024.html rename to tests/wpt/tests/webmessaging/with-ports/024.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/025.html b/tests/wpt/tests/webmessaging/with-ports/025.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/025.html rename to tests/wpt/tests/webmessaging/with-ports/025.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/026.html b/tests/wpt/tests/webmessaging/with-ports/026.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/026.html rename to tests/wpt/tests/webmessaging/with-ports/026.html diff --git a/tests/wpt/web-platform-tests/webmessaging/with-ports/027.html b/tests/wpt/tests/webmessaging/with-ports/027.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/with-ports/027.html rename to tests/wpt/tests/webmessaging/with-ports/027.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/001.html b/tests/wpt/tests/webmessaging/without-ports/001.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/001.html rename to tests/wpt/tests/webmessaging/without-ports/001.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/002.html b/tests/wpt/tests/webmessaging/without-ports/002.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/002.html rename to tests/wpt/tests/webmessaging/without-ports/002.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/003.html b/tests/wpt/tests/webmessaging/without-ports/003.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/003.html rename to tests/wpt/tests/webmessaging/without-ports/003.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/004.html b/tests/wpt/tests/webmessaging/without-ports/004.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/004.html rename to tests/wpt/tests/webmessaging/without-ports/004.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/005.html b/tests/wpt/tests/webmessaging/without-ports/005.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/005.html rename to tests/wpt/tests/webmessaging/without-ports/005.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/006.html b/tests/wpt/tests/webmessaging/without-ports/006.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/006.html rename to tests/wpt/tests/webmessaging/without-ports/006.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/007.html b/tests/wpt/tests/webmessaging/without-ports/007.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/007.html rename to tests/wpt/tests/webmessaging/without-ports/007.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/009.html b/tests/wpt/tests/webmessaging/without-ports/009.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/009.html rename to tests/wpt/tests/webmessaging/without-ports/009.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/010.html b/tests/wpt/tests/webmessaging/without-ports/010.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/010.html rename to tests/wpt/tests/webmessaging/without-ports/010.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/011.html b/tests/wpt/tests/webmessaging/without-ports/011.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/011.html rename to tests/wpt/tests/webmessaging/without-ports/011.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/012.html b/tests/wpt/tests/webmessaging/without-ports/012.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/012.html rename to tests/wpt/tests/webmessaging/without-ports/012.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/013.html b/tests/wpt/tests/webmessaging/without-ports/013.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/013.html rename to tests/wpt/tests/webmessaging/without-ports/013.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/014.html b/tests/wpt/tests/webmessaging/without-ports/014.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/014.html rename to tests/wpt/tests/webmessaging/without-ports/014.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/015.html b/tests/wpt/tests/webmessaging/without-ports/015.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/015.html rename to tests/wpt/tests/webmessaging/without-ports/015.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/016.html b/tests/wpt/tests/webmessaging/without-ports/016.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/016.html rename to tests/wpt/tests/webmessaging/without-ports/016.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/017.html b/tests/wpt/tests/webmessaging/without-ports/017.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/017.html rename to tests/wpt/tests/webmessaging/without-ports/017.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/018.html b/tests/wpt/tests/webmessaging/without-ports/018.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/018.html rename to tests/wpt/tests/webmessaging/without-ports/018.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/019-1.html b/tests/wpt/tests/webmessaging/without-ports/019-1.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/019-1.html rename to tests/wpt/tests/webmessaging/without-ports/019-1.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/019.html b/tests/wpt/tests/webmessaging/without-ports/019.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/019.html rename to tests/wpt/tests/webmessaging/without-ports/019.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/020-1.html b/tests/wpt/tests/webmessaging/without-ports/020-1.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/020-1.html rename to tests/wpt/tests/webmessaging/without-ports/020-1.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/020.html b/tests/wpt/tests/webmessaging/without-ports/020.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/020.html rename to tests/wpt/tests/webmessaging/without-ports/020.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/021.html b/tests/wpt/tests/webmessaging/without-ports/021.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/021.html rename to tests/wpt/tests/webmessaging/without-ports/021.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/023.html b/tests/wpt/tests/webmessaging/without-ports/023.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/023.html rename to tests/wpt/tests/webmessaging/without-ports/023.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/024.html b/tests/wpt/tests/webmessaging/without-ports/024.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/024.html rename to tests/wpt/tests/webmessaging/without-ports/024.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/025-1.js b/tests/wpt/tests/webmessaging/without-ports/025-1.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/025-1.js rename to tests/wpt/tests/webmessaging/without-ports/025-1.js diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/025.html b/tests/wpt/tests/webmessaging/without-ports/025.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/025.html rename to tests/wpt/tests/webmessaging/without-ports/025.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/026.html b/tests/wpt/tests/webmessaging/without-ports/026.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/026.html rename to tests/wpt/tests/webmessaging/without-ports/026.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/027.html b/tests/wpt/tests/webmessaging/without-ports/027.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/027.html rename to tests/wpt/tests/webmessaging/without-ports/027.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/028.html b/tests/wpt/tests/webmessaging/without-ports/028.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/028.html rename to tests/wpt/tests/webmessaging/without-ports/028.html diff --git a/tests/wpt/web-platform-tests/webmessaging/without-ports/029.html b/tests/wpt/tests/webmessaging/without-ports/029.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/without-ports/029.html rename to tests/wpt/tests/webmessaging/without-ports/029.html diff --git a/tests/wpt/web-platform-tests/webmessaging/worker_postMessage_user_activation.js b/tests/wpt/tests/webmessaging/worker_postMessage_user_activation.js similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/worker_postMessage_user_activation.js rename to tests/wpt/tests/webmessaging/worker_postMessage_user_activation.js diff --git a/tests/wpt/web-platform-tests/webmessaging/worker_postMessage_user_activation.tentative.html b/tests/wpt/tests/webmessaging/worker_postMessage_user_activation.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/webmessaging/worker_postMessage_user_activation.tentative.html rename to tests/wpt/tests/webmessaging/worker_postMessage_user_activation.tentative.html diff --git a/tests/wpt/web-platform-tests/webmidi/META.yml b/tests/wpt/tests/webmidi/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webmidi/META.yml rename to tests/wpt/tests/webmidi/META.yml diff --git a/tests/wpt/web-platform-tests/webmidi/idlharness.https.window.js b/tests/wpt/tests/webmidi/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webmidi/idlharness.https.window.js rename to tests/wpt/tests/webmidi/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/webnn/META.yml b/tests/wpt/tests/webnn/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webnn/META.yml rename to tests/wpt/tests/webnn/META.yml diff --git a/tests/wpt/web-platform-tests/webnn/batch_normalization.https.any.js b/tests/wpt/tests/webnn/batch_normalization.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/batch_normalization.https.any.js rename to tests/wpt/tests/webnn/batch_normalization.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/clamp.https.any.js b/tests/wpt/tests/webnn/clamp.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/clamp.https.any.js rename to tests/wpt/tests/webnn/clamp.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/concat.https.any.js b/tests/wpt/tests/webnn/concat.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/concat.https.any.js rename to tests/wpt/tests/webnn/concat.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/conv2d.https.any.js b/tests/wpt/tests/webnn/conv2d.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/conv2d.https.any.js rename to tests/wpt/tests/webnn/conv2d.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/conv_transpose2d.https.any.js b/tests/wpt/tests/webnn/conv_transpose2d.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/conv_transpose2d.https.any.js rename to tests/wpt/tests/webnn/conv_transpose2d.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/elementwise_binary.https.any.js b/tests/wpt/tests/webnn/elementwise_binary.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/elementwise_binary.https.any.js rename to tests/wpt/tests/webnn/elementwise_binary.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/elementwise_unary.https.any.js b/tests/wpt/tests/webnn/elementwise_unary.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/elementwise_unary.https.any.js rename to tests/wpt/tests/webnn/elementwise_unary.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/elu.https.any.js b/tests/wpt/tests/webnn/elu.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/elu.https.any.js rename to tests/wpt/tests/webnn/elu.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/gemm.https.any.js b/tests/wpt/tests/webnn/gemm.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/gemm.https.any.js rename to tests/wpt/tests/webnn/gemm.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/hard_sigmoid.https.any.js b/tests/wpt/tests/webnn/hard_sigmoid.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/hard_sigmoid.https.any.js rename to tests/wpt/tests/webnn/hard_sigmoid.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/hard_swish.https.any.js b/tests/wpt/tests/webnn/hard_swish.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/hard_swish.https.any.js rename to tests/wpt/tests/webnn/hard_swish.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/idlharness.https.any.js b/tests/wpt/tests/webnn/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/idlharness.https.any.js rename to tests/wpt/tests/webnn/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/leaky_relu.https.any.js b/tests/wpt/tests/webnn/leaky_relu.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/leaky_relu.https.any.js rename to tests/wpt/tests/webnn/leaky_relu.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/linear.https.any.js b/tests/wpt/tests/webnn/linear.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/linear.https.any.js rename to tests/wpt/tests/webnn/linear.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/matmul.https.any.js b/tests/wpt/tests/webnn/matmul.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/matmul.https.any.js rename to tests/wpt/tests/webnn/matmul.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/pad.https.any.js b/tests/wpt/tests/webnn/pad.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/pad.https.any.js rename to tests/wpt/tests/webnn/pad.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/pooling.https.any.js b/tests/wpt/tests/webnn/pooling.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/pooling.https.any.js rename to tests/wpt/tests/webnn/pooling.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/prelu.https.any.js b/tests/wpt/tests/webnn/prelu.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/prelu.https.any.js rename to tests/wpt/tests/webnn/prelu.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/reduction.https.any.js b/tests/wpt/tests/webnn/reduction.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/reduction.https.any.js rename to tests/wpt/tests/webnn/reduction.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/relu.https.any.js b/tests/wpt/tests/webnn/relu.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/relu.https.any.js rename to tests/wpt/tests/webnn/relu.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/reshape.https.any.js b/tests/wpt/tests/webnn/reshape.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/reshape.https.any.js rename to tests/wpt/tests/webnn/reshape.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/abs.json b/tests/wpt/tests/webnn/resources/test_data/abs.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/abs.json rename to tests/wpt/tests/webnn/resources/test_data/abs.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/add.json b/tests/wpt/tests/webnn/resources/test_data/add.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/add.json rename to tests/wpt/tests/webnn/resources/test_data/add.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/average_pool2d.json b/tests/wpt/tests/webnn/resources/test_data/average_pool2d.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/average_pool2d.json rename to tests/wpt/tests/webnn/resources/test_data/average_pool2d.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/batch_normalization.json b/tests/wpt/tests/webnn/resources/test_data/batch_normalization.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/batch_normalization.json rename to tests/wpt/tests/webnn/resources/test_data/batch_normalization.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/ceil.json b/tests/wpt/tests/webnn/resources/test_data/ceil.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/ceil.json rename to tests/wpt/tests/webnn/resources/test_data/ceil.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/clamp.json b/tests/wpt/tests/webnn/resources/test_data/clamp.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/clamp.json rename to tests/wpt/tests/webnn/resources/test_data/clamp.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/concat.json b/tests/wpt/tests/webnn/resources/test_data/concat.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/concat.json rename to tests/wpt/tests/webnn/resources/test_data/concat.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/conv2d.json b/tests/wpt/tests/webnn/resources/test_data/conv2d.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/conv2d.json rename to tests/wpt/tests/webnn/resources/test_data/conv2d.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/conv_transpose2d.json b/tests/wpt/tests/webnn/resources/test_data/conv_transpose2d.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/conv_transpose2d.json rename to tests/wpt/tests/webnn/resources/test_data/conv_transpose2d.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/cos.json b/tests/wpt/tests/webnn/resources/test_data/cos.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/cos.json rename to tests/wpt/tests/webnn/resources/test_data/cos.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/div.json b/tests/wpt/tests/webnn/resources/test_data/div.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/div.json rename to tests/wpt/tests/webnn/resources/test_data/div.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/elu.json b/tests/wpt/tests/webnn/resources/test_data/elu.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/elu.json rename to tests/wpt/tests/webnn/resources/test_data/elu.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/exp.json b/tests/wpt/tests/webnn/resources/test_data/exp.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/exp.json rename to tests/wpt/tests/webnn/resources/test_data/exp.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/floor.json b/tests/wpt/tests/webnn/resources/test_data/floor.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/floor.json rename to tests/wpt/tests/webnn/resources/test_data/floor.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/gemm.json b/tests/wpt/tests/webnn/resources/test_data/gemm.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/gemm.json rename to tests/wpt/tests/webnn/resources/test_data/gemm.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/hard_sigmoid.json b/tests/wpt/tests/webnn/resources/test_data/hard_sigmoid.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/hard_sigmoid.json rename to tests/wpt/tests/webnn/resources/test_data/hard_sigmoid.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/hard_swish.json b/tests/wpt/tests/webnn/resources/test_data/hard_swish.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/hard_swish.json rename to tests/wpt/tests/webnn/resources/test_data/hard_swish.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/leaky_relu.json b/tests/wpt/tests/webnn/resources/test_data/leaky_relu.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/leaky_relu.json rename to tests/wpt/tests/webnn/resources/test_data/leaky_relu.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/linear.json b/tests/wpt/tests/webnn/resources/test_data/linear.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/linear.json rename to tests/wpt/tests/webnn/resources/test_data/linear.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/log.json b/tests/wpt/tests/webnn/resources/test_data/log.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/log.json rename to tests/wpt/tests/webnn/resources/test_data/log.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/matmul.json b/tests/wpt/tests/webnn/resources/test_data/matmul.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/matmul.json rename to tests/wpt/tests/webnn/resources/test_data/matmul.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/max.json b/tests/wpt/tests/webnn/resources/test_data/max.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/max.json rename to tests/wpt/tests/webnn/resources/test_data/max.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/max_pool2d.json b/tests/wpt/tests/webnn/resources/test_data/max_pool2d.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/max_pool2d.json rename to tests/wpt/tests/webnn/resources/test_data/max_pool2d.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/min.json b/tests/wpt/tests/webnn/resources/test_data/min.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/min.json rename to tests/wpt/tests/webnn/resources/test_data/min.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/mul.json b/tests/wpt/tests/webnn/resources/test_data/mul.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/mul.json rename to tests/wpt/tests/webnn/resources/test_data/mul.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/neg.json b/tests/wpt/tests/webnn/resources/test_data/neg.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/neg.json rename to tests/wpt/tests/webnn/resources/test_data/neg.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/pad.json b/tests/wpt/tests/webnn/resources/test_data/pad.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/pad.json rename to tests/wpt/tests/webnn/resources/test_data/pad.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/pow.json b/tests/wpt/tests/webnn/resources/test_data/pow.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/pow.json rename to tests/wpt/tests/webnn/resources/test_data/pow.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/prelu.json b/tests/wpt/tests/webnn/resources/test_data/prelu.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/prelu.json rename to tests/wpt/tests/webnn/resources/test_data/prelu.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_l1.json b/tests/wpt/tests/webnn/resources/test_data/reduce_l1.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_l1.json rename to tests/wpt/tests/webnn/resources/test_data/reduce_l1.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_l2.json b/tests/wpt/tests/webnn/resources/test_data/reduce_l2.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_l2.json rename to tests/wpt/tests/webnn/resources/test_data/reduce_l2.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_log_sum.json b/tests/wpt/tests/webnn/resources/test_data/reduce_log_sum.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_log_sum.json rename to tests/wpt/tests/webnn/resources/test_data/reduce_log_sum.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_log_sum_exp.json b/tests/wpt/tests/webnn/resources/test_data/reduce_log_sum_exp.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_log_sum_exp.json rename to tests/wpt/tests/webnn/resources/test_data/reduce_log_sum_exp.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_max.json b/tests/wpt/tests/webnn/resources/test_data/reduce_max.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_max.json rename to tests/wpt/tests/webnn/resources/test_data/reduce_max.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_mean.json b/tests/wpt/tests/webnn/resources/test_data/reduce_mean.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_mean.json rename to tests/wpt/tests/webnn/resources/test_data/reduce_mean.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_min.json b/tests/wpt/tests/webnn/resources/test_data/reduce_min.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_min.json rename to tests/wpt/tests/webnn/resources/test_data/reduce_min.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_product.json b/tests/wpt/tests/webnn/resources/test_data/reduce_product.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_product.json rename to tests/wpt/tests/webnn/resources/test_data/reduce_product.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_sum.json b/tests/wpt/tests/webnn/resources/test_data/reduce_sum.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_sum.json rename to tests/wpt/tests/webnn/resources/test_data/reduce_sum.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_sum_square.json b/tests/wpt/tests/webnn/resources/test_data/reduce_sum_square.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/reduce_sum_square.json rename to tests/wpt/tests/webnn/resources/test_data/reduce_sum_square.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/relu.json b/tests/wpt/tests/webnn/resources/test_data/relu.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/relu.json rename to tests/wpt/tests/webnn/resources/test_data/relu.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/reshape.json b/tests/wpt/tests/webnn/resources/test_data/reshape.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/reshape.json rename to tests/wpt/tests/webnn/resources/test_data/reshape.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/sigmoid.json b/tests/wpt/tests/webnn/resources/test_data/sigmoid.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/sigmoid.json rename to tests/wpt/tests/webnn/resources/test_data/sigmoid.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/sin.json b/tests/wpt/tests/webnn/resources/test_data/sin.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/sin.json rename to tests/wpt/tests/webnn/resources/test_data/sin.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/slice.json b/tests/wpt/tests/webnn/resources/test_data/slice.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/slice.json rename to tests/wpt/tests/webnn/resources/test_data/slice.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/softmax.json b/tests/wpt/tests/webnn/resources/test_data/softmax.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/softmax.json rename to tests/wpt/tests/webnn/resources/test_data/softmax.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/softsign.json b/tests/wpt/tests/webnn/resources/test_data/softsign.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/softsign.json rename to tests/wpt/tests/webnn/resources/test_data/softsign.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/split.json b/tests/wpt/tests/webnn/resources/test_data/split.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/split.json rename to tests/wpt/tests/webnn/resources/test_data/split.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/squeeze.json b/tests/wpt/tests/webnn/resources/test_data/squeeze.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/squeeze.json rename to tests/wpt/tests/webnn/resources/test_data/squeeze.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/sub.json b/tests/wpt/tests/webnn/resources/test_data/sub.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/sub.json rename to tests/wpt/tests/webnn/resources/test_data/sub.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/tan.json b/tests/wpt/tests/webnn/resources/test_data/tan.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/tan.json rename to tests/wpt/tests/webnn/resources/test_data/tan.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/tanh.json b/tests/wpt/tests/webnn/resources/test_data/tanh.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/tanh.json rename to tests/wpt/tests/webnn/resources/test_data/tanh.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/test_data/transpose.json b/tests/wpt/tests/webnn/resources/test_data/transpose.json similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/test_data/transpose.json rename to tests/wpt/tests/webnn/resources/test_data/transpose.json diff --git a/tests/wpt/web-platform-tests/webnn/resources/utils.js b/tests/wpt/tests/webnn/resources/utils.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/resources/utils.js rename to tests/wpt/tests/webnn/resources/utils.js diff --git a/tests/wpt/web-platform-tests/webnn/sigmoid.https.any.js b/tests/wpt/tests/webnn/sigmoid.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/sigmoid.https.any.js rename to tests/wpt/tests/webnn/sigmoid.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/slice.https.any.js b/tests/wpt/tests/webnn/slice.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/slice.https.any.js rename to tests/wpt/tests/webnn/slice.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/softmax.https.any.js b/tests/wpt/tests/webnn/softmax.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/softmax.https.any.js rename to tests/wpt/tests/webnn/softmax.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/softsign.https.any.js b/tests/wpt/tests/webnn/softsign.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/softsign.https.any.js rename to tests/wpt/tests/webnn/softsign.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/split.https.any.js b/tests/wpt/tests/webnn/split.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/split.https.any.js rename to tests/wpt/tests/webnn/split.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/squeeze.https.any.js b/tests/wpt/tests/webnn/squeeze.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/squeeze.https.any.js rename to tests/wpt/tests/webnn/squeeze.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/tanh.https.any.js b/tests/wpt/tests/webnn/tanh.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/tanh.https.any.js rename to tests/wpt/tests/webnn/tanh.https.any.js diff --git a/tests/wpt/web-platform-tests/webnn/transpose.https.any.js b/tests/wpt/tests/webnn/transpose.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webnn/transpose.https.any.js rename to tests/wpt/tests/webnn/transpose.https.any.js diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/META.yml b/tests/wpt/tests/webrtc-encoded-transform/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/META.yml rename to tests/wpt/tests/webrtc-encoded-transform/META.yml diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCEncodedAudioFrame-clone.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedAudioFrame-clone.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCEncodedAudioFrame-clone.https.html rename to tests/wpt/tests/webrtc-encoded-transform/RTCEncodedAudioFrame-clone.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCEncodedAudioFrame-serviceworker-failure.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedAudioFrame-serviceworker-failure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCEncodedAudioFrame-serviceworker-failure.https.html rename to tests/wpt/tests/webrtc-encoded-transform/RTCEncodedAudioFrame-serviceworker-failure.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCEncodedVideoFrame-clone.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedVideoFrame-clone.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCEncodedVideoFrame-clone.https.html rename to tests/wpt/tests/webrtc-encoded-transform/RTCEncodedVideoFrame-clone.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCEncodedVideoFrame-serviceworker-failure.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedVideoFrame-serviceworker-failure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCEncodedVideoFrame-serviceworker-failure.https.html rename to tests/wpt/tests/webrtc-encoded-transform/RTCEncodedVideoFrame-serviceworker-failure.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-audio.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-audio.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-audio.https.html rename to tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-audio.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-errors.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-errors.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-errors.https.html rename to tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-errors.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-simulcast.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-simulcast.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-simulcast.https.html rename to tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-simulcast.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-video-frames.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-video-frames.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-video-frames.https.html rename to tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-video-frames.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-video.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-video.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-video.https.html rename to tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-video.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-worker.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-worker.https.html rename to tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-worker.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams.js b/tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams.js rename to tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams.js diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-sender-worker-single-frame.js b/tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-sender-worker-single-frame.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-sender-worker-single-frame.js rename to tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-sender-worker-single-frame.js diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-worker-transform.js b/tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-worker-transform.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/RTCPeerConnection-worker-transform.js rename to tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-worker-transform.js diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/codec-specific-metadata.https.html b/tests/wpt/tests/webrtc-encoded-transform/codec-specific-metadata.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/codec-specific-metadata.https.html rename to tests/wpt/tests/webrtc-encoded-transform/codec-specific-metadata.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/helper.js b/tests/wpt/tests/webrtc-encoded-transform/helper.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/helper.js rename to tests/wpt/tests/webrtc-encoded-transform/helper.js diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/idlharness.https.window.js b/tests/wpt/tests/webrtc-encoded-transform/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/idlharness.https.window.js rename to tests/wpt/tests/webrtc-encoded-transform/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/resources/blank.html b/tests/wpt/tests/webrtc-encoded-transform/resources/blank.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/resources/blank.html rename to tests/wpt/tests/webrtc-encoded-transform/resources/blank.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/resources/serviceworker-failure.js b/tests/wpt/tests/webrtc-encoded-transform/resources/serviceworker-failure.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/resources/serviceworker-failure.js rename to tests/wpt/tests/webrtc-encoded-transform/resources/serviceworker-failure.js diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/routines.js b/tests/wpt/tests/webrtc-encoded-transform/routines.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/routines.js rename to tests/wpt/tests/webrtc-encoded-transform/routines.js diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/script-audio-transform-worker.js b/tests/wpt/tests/webrtc-encoded-transform/script-audio-transform-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/script-audio-transform-worker.js rename to tests/wpt/tests/webrtc-encoded-transform/script-audio-transform-worker.js diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/script-audio-transform.https.html b/tests/wpt/tests/webrtc-encoded-transform/script-audio-transform.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/script-audio-transform.https.html rename to tests/wpt/tests/webrtc-encoded-transform/script-audio-transform.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/script-change-transform-worker.js b/tests/wpt/tests/webrtc-encoded-transform/script-change-transform-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/script-change-transform-worker.js rename to tests/wpt/tests/webrtc-encoded-transform/script-change-transform-worker.js diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/script-change-transform.https.html b/tests/wpt/tests/webrtc-encoded-transform/script-change-transform.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/script-change-transform.https.html rename to tests/wpt/tests/webrtc-encoded-transform/script-change-transform.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/script-late-transform.https.html b/tests/wpt/tests/webrtc-encoded-transform/script-late-transform.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/script-late-transform.https.html rename to tests/wpt/tests/webrtc-encoded-transform/script-late-transform.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/script-metadata-transform-worker.js b/tests/wpt/tests/webrtc-encoded-transform/script-metadata-transform-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/script-metadata-transform-worker.js rename to tests/wpt/tests/webrtc-encoded-transform/script-metadata-transform-worker.js diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/script-metadata-transform.https.html b/tests/wpt/tests/webrtc-encoded-transform/script-metadata-transform.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/script-metadata-transform.https.html rename to tests/wpt/tests/webrtc-encoded-transform/script-metadata-transform.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/script-transform-worker.js b/tests/wpt/tests/webrtc-encoded-transform/script-transform-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/script-transform-worker.js rename to tests/wpt/tests/webrtc-encoded-transform/script-transform-worker.js diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/script-transform.https.html b/tests/wpt/tests/webrtc-encoded-transform/script-transform.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/script-transform.https.html rename to tests/wpt/tests/webrtc-encoded-transform/script-transform.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/script-write-twice-transform-worker.js b/tests/wpt/tests/webrtc-encoded-transform/script-write-twice-transform-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/script-write-twice-transform-worker.js rename to tests/wpt/tests/webrtc-encoded-transform/script-write-twice-transform-worker.js diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/script-write-twice-transform.https.html b/tests/wpt/tests/webrtc-encoded-transform/script-write-twice-transform.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/script-write-twice-transform.https.html rename to tests/wpt/tests/webrtc-encoded-transform/script-write-twice-transform.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/set-metadata.https.html b/tests/wpt/tests/webrtc-encoded-transform/set-metadata.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/set-metadata.https.html rename to tests/wpt/tests/webrtc-encoded-transform/set-metadata.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/sframe-keys.https.html b/tests/wpt/tests/webrtc-encoded-transform/sframe-keys.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/sframe-keys.https.html rename to tests/wpt/tests/webrtc-encoded-transform/sframe-keys.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/sframe-transform-buffer-source.html b/tests/wpt/tests/webrtc-encoded-transform/sframe-transform-buffer-source.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/sframe-transform-buffer-source.html rename to tests/wpt/tests/webrtc-encoded-transform/sframe-transform-buffer-source.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/sframe-transform-in-worker.https.html b/tests/wpt/tests/webrtc-encoded-transform/sframe-transform-in-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/sframe-transform-in-worker.https.html rename to tests/wpt/tests/webrtc-encoded-transform/sframe-transform-in-worker.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/sframe-transform-readable.html b/tests/wpt/tests/webrtc-encoded-transform/sframe-transform-readable.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/sframe-transform-readable.html rename to tests/wpt/tests/webrtc-encoded-transform/sframe-transform-readable.html diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/sframe-transform-worker.js b/tests/wpt/tests/webrtc-encoded-transform/sframe-transform-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/sframe-transform-worker.js rename to tests/wpt/tests/webrtc-encoded-transform/sframe-transform-worker.js diff --git a/tests/wpt/web-platform-tests/webrtc-encoded-transform/sframe-transform.html b/tests/wpt/tests/webrtc-encoded-transform/sframe-transform.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-encoded-transform/sframe-transform.html rename to tests/wpt/tests/webrtc-encoded-transform/sframe-transform.html diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/META.yml b/tests/wpt/tests/webrtc-extensions/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/META.yml rename to tests/wpt/tests/webrtc-extensions/META.yml diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/RTCOAuthCredential.html b/tests/wpt/tests/webrtc-extensions/RTCOAuthCredential.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/RTCOAuthCredential.html rename to tests/wpt/tests/webrtc-extensions/RTCOAuthCredential.html diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpParameters-adaptivePtime.html b/tests/wpt/tests/webrtc-extensions/RTCRtpParameters-adaptivePtime.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpParameters-adaptivePtime.html rename to tests/wpt/tests/webrtc-extensions/RTCRtpParameters-adaptivePtime.html diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpParameters-codec.html b/tests/wpt/tests/webrtc-extensions/RTCRtpParameters-codec.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpParameters-codec.html rename to tests/wpt/tests/webrtc-extensions/RTCRtpParameters-codec.html diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpParameters-maxFramerate.html b/tests/wpt/tests/webrtc-extensions/RTCRtpParameters-maxFramerate.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpParameters-maxFramerate.html rename to tests/wpt/tests/webrtc-extensions/RTCRtpParameters-maxFramerate.html diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpReceiver-jitterBufferTarget-stats.html b/tests/wpt/tests/webrtc-extensions/RTCRtpReceiver-jitterBufferTarget-stats.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpReceiver-jitterBufferTarget-stats.html rename to tests/wpt/tests/webrtc-extensions/RTCRtpReceiver-jitterBufferTarget-stats.html diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpReceiver-jitterBufferTarget.html b/tests/wpt/tests/webrtc-extensions/RTCRtpReceiver-jitterBufferTarget.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpReceiver-jitterBufferTarget.html rename to tests/wpt/tests/webrtc-extensions/RTCRtpReceiver-jitterBufferTarget.html diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpSynchronizationSource-captureTimestamp.html b/tests/wpt/tests/webrtc-extensions/RTCRtpSynchronizationSource-captureTimestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpSynchronizationSource-captureTimestamp.html rename to tests/wpt/tests/webrtc-extensions/RTCRtpSynchronizationSource-captureTimestamp.html diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpSynchronizationSource-helper.js b/tests/wpt/tests/webrtc-extensions/RTCRtpSynchronizationSource-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpSynchronizationSource-helper.js rename to tests/wpt/tests/webrtc-extensions/RTCRtpSynchronizationSource-helper.js diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpSynchronizationSource-senderCaptureTimeOffset.html b/tests/wpt/tests/webrtc-extensions/RTCRtpSynchronizationSource-senderCaptureTimeOffset.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpSynchronizationSource-senderCaptureTimeOffset.html rename to tests/wpt/tests/webrtc-extensions/RTCRtpSynchronizationSource-senderCaptureTimeOffset.html diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpTransceiver-headerExtensionControl.html b/tests/wpt/tests/webrtc-extensions/RTCRtpTransceiver-headerExtensionControl.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpTransceiver-headerExtensionControl.html rename to tests/wpt/tests/webrtc-extensions/RTCRtpTransceiver-headerExtensionControl.html diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.https.html b/tests/wpt/tests/webrtc-extensions/transfer-datachannel-service-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.https.html rename to tests/wpt/tests/webrtc-extensions/transfer-datachannel-service-worker.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.js b/tests/wpt/tests/webrtc-extensions/transfer-datachannel-service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.js rename to tests/wpt/tests/webrtc-extensions/transfer-datachannel-service-worker.js diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/transfer-datachannel-worker.js b/tests/wpt/tests/webrtc-extensions/transfer-datachannel-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/transfer-datachannel-worker.js rename to tests/wpt/tests/webrtc-extensions/transfer-datachannel-worker.js diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/transfer-datachannel.html b/tests/wpt/tests/webrtc-extensions/transfer-datachannel.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-extensions/transfer-datachannel.html rename to tests/wpt/tests/webrtc-extensions/transfer-datachannel.html diff --git a/tests/wpt/web-platform-tests/webrtc-ice/META.yml b/tests/wpt/tests/webrtc-ice/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-ice/META.yml rename to tests/wpt/tests/webrtc-ice/META.yml diff --git a/tests/wpt/web-platform-tests/webrtc-ice/RTCIceTransport-extension-helper.js b/tests/wpt/tests/webrtc-ice/RTCIceTransport-extension-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-ice/RTCIceTransport-extension-helper.js rename to tests/wpt/tests/webrtc-ice/RTCIceTransport-extension-helper.js diff --git a/tests/wpt/web-platform-tests/webrtc-ice/RTCIceTransport-extension.https.html b/tests/wpt/tests/webrtc-ice/RTCIceTransport-extension.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-ice/RTCIceTransport-extension.https.html rename to tests/wpt/tests/webrtc-ice/RTCIceTransport-extension.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-identity/META.yml b/tests/wpt/tests/webrtc-identity/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-identity/META.yml rename to tests/wpt/tests/webrtc-identity/META.yml diff --git a/tests/wpt/web-platform-tests/webrtc-identity/RTCPeerConnection-constructor.html b/tests/wpt/tests/webrtc-identity/RTCPeerConnection-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-identity/RTCPeerConnection-constructor.html rename to tests/wpt/tests/webrtc-identity/RTCPeerConnection-constructor.html diff --git a/tests/wpt/web-platform-tests/webrtc-identity/RTCPeerConnection-getIdentityAssertion.sub.https.html b/tests/wpt/tests/webrtc-identity/RTCPeerConnection-getIdentityAssertion.sub.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-identity/RTCPeerConnection-getIdentityAssertion.sub.https.html rename to tests/wpt/tests/webrtc-identity/RTCPeerConnection-getIdentityAssertion.sub.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-identity/RTCPeerConnection-peerIdentity.https.html b/tests/wpt/tests/webrtc-identity/RTCPeerConnection-peerIdentity.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-identity/RTCPeerConnection-peerIdentity.https.html rename to tests/wpt/tests/webrtc-identity/RTCPeerConnection-peerIdentity.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-identity/identity-helper.sub.js b/tests/wpt/tests/webrtc-identity/identity-helper.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-identity/identity-helper.sub.js rename to tests/wpt/tests/webrtc-identity/identity-helper.sub.js diff --git a/tests/wpt/web-platform-tests/webrtc-identity/idlharness.https.window.js b/tests/wpt/tests/webrtc-identity/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-identity/idlharness.https.window.js rename to tests/wpt/tests/webrtc-identity/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/webrtc-priority/META.yml b/tests/wpt/tests/webrtc-priority/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-priority/META.yml rename to tests/wpt/tests/webrtc-priority/META.yml diff --git a/tests/wpt/web-platform-tests/webrtc-priority/RTCPeerConnection-ondatachannel.html b/tests/wpt/tests/webrtc-priority/RTCPeerConnection-ondatachannel.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-priority/RTCPeerConnection-ondatachannel.html rename to tests/wpt/tests/webrtc-priority/RTCPeerConnection-ondatachannel.html diff --git a/tests/wpt/web-platform-tests/webrtc-priority/RTCRtpParameters-encodings.html b/tests/wpt/tests/webrtc-priority/RTCRtpParameters-encodings.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-priority/RTCRtpParameters-encodings.html rename to tests/wpt/tests/webrtc-priority/RTCRtpParameters-encodings.html diff --git a/tests/wpt/web-platform-tests/webrtc-stats/META.yml b/tests/wpt/tests/webrtc-stats/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-stats/META.yml rename to tests/wpt/tests/webrtc-stats/META.yml diff --git a/tests/wpt/web-platform-tests/webrtc-stats/README.md b/tests/wpt/tests/webrtc-stats/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-stats/README.md rename to tests/wpt/tests/webrtc-stats/README.md diff --git a/tests/wpt/web-platform-tests/webrtc-stats/getStats-remote-candidate-address.html b/tests/wpt/tests/webrtc-stats/getStats-remote-candidate-address.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-stats/getStats-remote-candidate-address.html rename to tests/wpt/tests/webrtc-stats/getStats-remote-candidate-address.html diff --git a/tests/wpt/web-platform-tests/webrtc-stats/hardware-capability-stats.https.html b/tests/wpt/tests/webrtc-stats/hardware-capability-stats.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-stats/hardware-capability-stats.https.html rename to tests/wpt/tests/webrtc-stats/hardware-capability-stats.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-stats/idlharness.window.js b/tests/wpt/tests/webrtc-stats/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-stats/idlharness.window.js rename to tests/wpt/tests/webrtc-stats/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/webrtc-stats/outbound-rtp.https.html b/tests/wpt/tests/webrtc-stats/outbound-rtp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-stats/outbound-rtp.https.html rename to tests/wpt/tests/webrtc-stats/outbound-rtp.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-stats/rtp-stats-creation.html b/tests/wpt/tests/webrtc-stats/rtp-stats-creation.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-stats/rtp-stats-creation.html rename to tests/wpt/tests/webrtc-stats/rtp-stats-creation.html diff --git a/tests/wpt/web-platform-tests/webrtc-stats/supported-stats.https.html b/tests/wpt/tests/webrtc-stats/supported-stats.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-stats/supported-stats.https.html rename to tests/wpt/tests/webrtc-stats/supported-stats.https.html diff --git a/tests/wpt/web-platform-tests/webrtc-svc/META.yml b/tests/wpt/tests/webrtc-svc/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-svc/META.yml rename to tests/wpt/tests/webrtc-svc/META.yml diff --git a/tests/wpt/web-platform-tests/webrtc-svc/RTCRtpParameters-scalability-av1.html b/tests/wpt/tests/webrtc-svc/RTCRtpParameters-scalability-av1.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-svc/RTCRtpParameters-scalability-av1.html rename to tests/wpt/tests/webrtc-svc/RTCRtpParameters-scalability-av1.html diff --git a/tests/wpt/web-platform-tests/webrtc-svc/RTCRtpParameters-scalability-h264.html b/tests/wpt/tests/webrtc-svc/RTCRtpParameters-scalability-h264.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-svc/RTCRtpParameters-scalability-h264.html rename to tests/wpt/tests/webrtc-svc/RTCRtpParameters-scalability-h264.html diff --git a/tests/wpt/web-platform-tests/webrtc-svc/RTCRtpParameters-scalability-vp8.html b/tests/wpt/tests/webrtc-svc/RTCRtpParameters-scalability-vp8.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-svc/RTCRtpParameters-scalability-vp8.html rename to tests/wpt/tests/webrtc-svc/RTCRtpParameters-scalability-vp8.html diff --git a/tests/wpt/web-platform-tests/webrtc-svc/RTCRtpParameters-scalability-vp9.html b/tests/wpt/tests/webrtc-svc/RTCRtpParameters-scalability-vp9.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-svc/RTCRtpParameters-scalability-vp9.html rename to tests/wpt/tests/webrtc-svc/RTCRtpParameters-scalability-vp9.html diff --git a/tests/wpt/web-platform-tests/webrtc-svc/RTCRtpParameters-scalability.html b/tests/wpt/tests/webrtc-svc/RTCRtpParameters-scalability.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-svc/RTCRtpParameters-scalability.html rename to tests/wpt/tests/webrtc-svc/RTCRtpParameters-scalability.html diff --git a/tests/wpt/web-platform-tests/webrtc-svc/svc-helper.js b/tests/wpt/tests/webrtc-svc/svc-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc-svc/svc-helper.js rename to tests/wpt/tests/webrtc-svc/svc-helper.js diff --git a/tests/wpt/web-platform-tests/webrtc/META.yml b/tests/wpt/tests/webrtc/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/META.yml rename to tests/wpt/tests/webrtc/META.yml diff --git a/tests/wpt/web-platform-tests/webrtc/README.md b/tests/wpt/tests/webrtc/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/README.md rename to tests/wpt/tests/webrtc/README.md diff --git a/tests/wpt/web-platform-tests/webrtc/RTCCertificate-postMessage.html b/tests/wpt/tests/webrtc/RTCCertificate-postMessage.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCCertificate-postMessage.html rename to tests/wpt/tests/webrtc/RTCCertificate-postMessage.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCCertificate.html b/tests/wpt/tests/webrtc/RTCCertificate.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCCertificate.html rename to tests/wpt/tests/webrtc/RTCCertificate.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCConfiguration-bundlePolicy.html b/tests/wpt/tests/webrtc/RTCConfiguration-bundlePolicy.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCConfiguration-bundlePolicy.html rename to tests/wpt/tests/webrtc/RTCConfiguration-bundlePolicy.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCConfiguration-helper.js b/tests/wpt/tests/webrtc/RTCConfiguration-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCConfiguration-helper.js rename to tests/wpt/tests/webrtc/RTCConfiguration-helper.js diff --git a/tests/wpt/web-platform-tests/webrtc/RTCConfiguration-iceCandidatePoolSize.html b/tests/wpt/tests/webrtc/RTCConfiguration-iceCandidatePoolSize.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCConfiguration-iceCandidatePoolSize.html rename to tests/wpt/tests/webrtc/RTCConfiguration-iceCandidatePoolSize.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCConfiguration-iceServers.html b/tests/wpt/tests/webrtc/RTCConfiguration-iceServers.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCConfiguration-iceServers.html rename to tests/wpt/tests/webrtc/RTCConfiguration-iceServers.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCConfiguration-iceTransportPolicy.html b/tests/wpt/tests/webrtc/RTCConfiguration-iceTransportPolicy.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCConfiguration-iceTransportPolicy.html rename to tests/wpt/tests/webrtc/RTCConfiguration-iceTransportPolicy.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCConfiguration-rtcpMuxPolicy.html b/tests/wpt/tests/webrtc/RTCConfiguration-rtcpMuxPolicy.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCConfiguration-rtcpMuxPolicy.html rename to tests/wpt/tests/webrtc/RTCConfiguration-rtcpMuxPolicy.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-helper.js b/tests/wpt/tests/webrtc/RTCDTMFSender-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-helper.js rename to tests/wpt/tests/webrtc/RTCDTMFSender-helper.js diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-insertDTMF.https.html b/tests/wpt/tests/webrtc/RTCDTMFSender-insertDTMF.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-insertDTMF.https.html rename to tests/wpt/tests/webrtc/RTCDTMFSender-insertDTMF.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-ontonechange-long.https.html b/tests/wpt/tests/webrtc/RTCDTMFSender-ontonechange-long.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-ontonechange-long.https.html rename to tests/wpt/tests/webrtc/RTCDTMFSender-ontonechange-long.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-ontonechange.https.html b/tests/wpt/tests/webrtc/RTCDTMFSender-ontonechange.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-ontonechange.https.html rename to tests/wpt/tests/webrtc/RTCDTMFSender-ontonechange.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDataChannel-binaryType.window.js b/tests/wpt/tests/webrtc/RTCDataChannel-binaryType.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCDataChannel-binaryType.window.js rename to tests/wpt/tests/webrtc/RTCDataChannel-binaryType.window.js diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDataChannel-bufferedAmount.html b/tests/wpt/tests/webrtc/RTCDataChannel-bufferedAmount.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCDataChannel-bufferedAmount.html rename to tests/wpt/tests/webrtc/RTCDataChannel-bufferedAmount.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDataChannel-close.html b/tests/wpt/tests/webrtc/RTCDataChannel-close.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCDataChannel-close.html rename to tests/wpt/tests/webrtc/RTCDataChannel-close.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDataChannel-iceRestart.html b/tests/wpt/tests/webrtc/RTCDataChannel-iceRestart.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCDataChannel-iceRestart.html rename to tests/wpt/tests/webrtc/RTCDataChannel-iceRestart.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDataChannel-id.html b/tests/wpt/tests/webrtc/RTCDataChannel-id.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCDataChannel-id.html rename to tests/wpt/tests/webrtc/RTCDataChannel-id.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDataChannel-send-blob-order.html b/tests/wpt/tests/webrtc/RTCDataChannel-send-blob-order.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCDataChannel-send-blob-order.html rename to tests/wpt/tests/webrtc/RTCDataChannel-send-blob-order.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDataChannel-send.html b/tests/wpt/tests/webrtc/RTCDataChannel-send.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCDataChannel-send.html rename to tests/wpt/tests/webrtc/RTCDataChannel-send.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDataChannelEvent-constructor.html b/tests/wpt/tests/webrtc/RTCDataChannelEvent-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCDataChannelEvent-constructor.html rename to tests/wpt/tests/webrtc/RTCDataChannelEvent-constructor.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDtlsTransport-getRemoteCertificates.html b/tests/wpt/tests/webrtc/RTCDtlsTransport-getRemoteCertificates.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCDtlsTransport-getRemoteCertificates.html rename to tests/wpt/tests/webrtc/RTCDtlsTransport-getRemoteCertificates.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDtlsTransport-state.html b/tests/wpt/tests/webrtc/RTCDtlsTransport-state.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCDtlsTransport-state.html rename to tests/wpt/tests/webrtc/RTCDtlsTransport-state.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCError.html b/tests/wpt/tests/webrtc/RTCError.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCError.html rename to tests/wpt/tests/webrtc/RTCError.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCIceCandidate-constructor.html b/tests/wpt/tests/webrtc/RTCIceCandidate-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCIceCandidate-constructor.html rename to tests/wpt/tests/webrtc/RTCIceCandidate-constructor.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCIceConnectionState-candidate-pair.https.html b/tests/wpt/tests/webrtc/RTCIceConnectionState-candidate-pair.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCIceConnectionState-candidate-pair.https.html rename to tests/wpt/tests/webrtc/RTCIceConnectionState-candidate-pair.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCIceTransport.html b/tests/wpt/tests/webrtc/RTCIceTransport.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCIceTransport.html rename to tests/wpt/tests/webrtc/RTCIceTransport.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-GC.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-GC.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-GC.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-GC.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-SLD-SRD-timing.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-SLD-SRD-timing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-SLD-SRD-timing.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-SLD-SRD-timing.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-add-track-no-deadlock.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-add-track-no-deadlock.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-add-track-no-deadlock.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-add-track-no-deadlock.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup.html b/tests/wpt/tests/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-timing.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-addIceCandidate-timing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-timing.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-addIceCandidate-timing.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate.html b/tests/wpt/tests/webrtc/RTCPeerConnection-addIceCandidate.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-addIceCandidate.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-addTrack.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-addTrack.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-addTrack.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-addTrack.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-addTransceiver.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-addTransceiver.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-addTransceiver.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-addTransceiver.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-canTrickleIceCandidates.html b/tests/wpt/tests/webrtc/RTCPeerConnection-canTrickleIceCandidates.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-canTrickleIceCandidates.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-canTrickleIceCandidates.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-candidate-in-sdp.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-candidate-in-sdp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-candidate-in-sdp.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-candidate-in-sdp.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-capture-video.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-capture-video.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-capture-video.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-capture-video.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-connectionState.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-connectionState.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-connectionState.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-connectionState.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-constructor.html b/tests/wpt/tests/webrtc/RTCPeerConnection-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-constructor.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-constructor.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-createAnswer.html b/tests/wpt/tests/webrtc/RTCPeerConnection-createAnswer.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-createAnswer.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-createAnswer.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-createDataChannel.html b/tests/wpt/tests/webrtc/RTCPeerConnection-createDataChannel.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-createDataChannel.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-createDataChannel.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-createOffer.html b/tests/wpt/tests/webrtc/RTCPeerConnection-createOffer.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-createOffer.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-createOffer.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-description-attributes-timing.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-description-attributes-timing.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-description-attributes-timing.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-description-attributes-timing.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-explicit-rollback-iceGatheringState.html b/tests/wpt/tests/webrtc/RTCPeerConnection-explicit-rollback-iceGatheringState.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-explicit-rollback-iceGatheringState.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-explicit-rollback-iceGatheringState.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-generateCertificate.html b/tests/wpt/tests/webrtc/RTCPeerConnection-generateCertificate.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-generateCertificate.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-generateCertificate.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getStats.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-getStats.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getStats.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-getStats.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getTransceivers.html b/tests/wpt/tests/webrtc/RTCPeerConnection-getTransceivers.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getTransceivers.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-getTransceivers.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper-test.html b/tests/wpt/tests/webrtc/RTCPeerConnection-helper-test.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper-test.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-helper-test.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js b/tests/wpt/tests/webrtc/RTCPeerConnection-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js rename to tests/wpt/tests/webrtc/RTCPeerConnection-helper.js diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState-disconnected.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-iceConnectionState-disconnected.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState-disconnected.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-iceConnectionState-disconnected.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-iceConnectionState.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-iceConnectionState.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-iceGatheringState.html b/tests/wpt/tests/webrtc/RTCPeerConnection-iceGatheringState.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-iceGatheringState.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-iceGatheringState.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-mandatory-getStats.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-mandatory-getStats.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-mandatory-getStats.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-mandatory-getStats.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-ondatachannel.html b/tests/wpt/tests/webrtc/RTCPeerConnection-ondatachannel.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-ondatachannel.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-ondatachannel.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onicecandidateerror.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-onicecandidateerror.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onicecandidateerror.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-onicecandidateerror.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded.html b/tests/wpt/tests/webrtc/RTCPeerConnection-onnegotiationneeded.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-onnegotiationneeded.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-ontrack.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-ontrack.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-ontrack.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-ontrack.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-operations.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-operations.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-operations.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-operations.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-helper.js b/tests/wpt/tests/webrtc/RTCPeerConnection-perfect-negotiation-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-helper.js rename to tests/wpt/tests/webrtc/RTCPeerConnection-perfect-negotiation-helper.js diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-perfect-negotiation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-perfect-negotiation.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-plan-b-is-not-supported.html b/tests/wpt/tests/webrtc/RTCPeerConnection-plan-b-is-not-supported.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-plan-b-is-not-supported.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-plan-b-is-not-supported.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-relay-canvas.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-relay-canvas.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-relay-canvas.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-relay-canvas.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-remote-track-mute.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-remote-track-mute.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-remote-track-mute.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-remote-track-mute.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-removeTrack.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-removeTrack.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-removeTrack.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-removeTrack.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-restartIce-onnegotiationneeded.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-restartIce-onnegotiationneeded.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-restartIce-onnegotiationneeded.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-restartIce-onnegotiationneeded.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-restartIce.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-restartIce.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-restartIce.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-restartIce.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setDescription-transceiver.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setDescription-transceiver.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setDescription-transceiver.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setDescription-transceiver.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-answer.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setLocalDescription-answer.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-answer.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setLocalDescription-answer.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-offer.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setLocalDescription-offer.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-offer.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setLocalDescription-offer.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-parameterless.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setLocalDescription-parameterless.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-parameterless.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setLocalDescription-parameterless.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-pranswer.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setLocalDescription-pranswer.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-pranswer.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setLocalDescription-pranswer.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-rollback.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setLocalDescription-rollback.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription-rollback.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setLocalDescription-rollback.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setLocalDescription.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setLocalDescription.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setLocalDescription.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-answer.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-answer.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-answer.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-answer.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-nomsid.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-nomsid.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-nomsid.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-nomsid.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-offer.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-offer.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-offer.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-offer.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-pranswer.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-pranswer.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-pranswer.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-pranswer.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-replaceTrack.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-replaceTrack.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-replaceTrack.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-replaceTrack.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-rollback.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-rollback.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-rollback.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-rollback.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-simulcast.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-simulcast.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-simulcast.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-simulcast.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription.html b/tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-setRemoteDescription.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-transceivers.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-transceivers.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-transceivers.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-transceivers.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-transport-stats.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-transport-stats.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-transport-stats.https.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-transport-stats.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-videoDetectorTest.html b/tests/wpt/tests/webrtc/RTCPeerConnection-videoDetectorTest.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-videoDetectorTest.html rename to tests/wpt/tests/webrtc/RTCPeerConnection-videoDetectorTest.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnectionIceErrorEvent.html b/tests/wpt/tests/webrtc/RTCPeerConnectionIceErrorEvent.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnectionIceErrorEvent.html rename to tests/wpt/tests/webrtc/RTCPeerConnectionIceErrorEvent.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnectionIceEvent-constructor.html b/tests/wpt/tests/webrtc/RTCPeerConnectionIceEvent-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCPeerConnectionIceEvent-constructor.html rename to tests/wpt/tests/webrtc/RTCPeerConnectionIceEvent-constructor.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpCapabilities-helper.js b/tests/wpt/tests/webrtc/RTCRtpCapabilities-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpCapabilities-helper.js rename to tests/wpt/tests/webrtc/RTCRtpCapabilities-helper.js diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpParameters-codecs.html b/tests/wpt/tests/webrtc/RTCRtpParameters-codecs.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpParameters-codecs.html rename to tests/wpt/tests/webrtc/RTCRtpParameters-codecs.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpParameters-encodings.html b/tests/wpt/tests/webrtc/RTCRtpParameters-encodings.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpParameters-encodings.html rename to tests/wpt/tests/webrtc/RTCRtpParameters-encodings.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpParameters-headerExtensions.html b/tests/wpt/tests/webrtc/RTCRtpParameters-headerExtensions.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpParameters-headerExtensions.html rename to tests/wpt/tests/webrtc/RTCRtpParameters-headerExtensions.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpParameters-helper.js b/tests/wpt/tests/webrtc/RTCRtpParameters-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpParameters-helper.js rename to tests/wpt/tests/webrtc/RTCRtpParameters-helper.js diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpParameters-rtcp.html b/tests/wpt/tests/webrtc/RTCRtpParameters-rtcp.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpParameters-rtcp.html rename to tests/wpt/tests/webrtc/RTCRtpParameters-rtcp.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpParameters-transactionId.html b/tests/wpt/tests/webrtc/RTCRtpParameters-transactionId.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpParameters-transactionId.html rename to tests/wpt/tests/webrtc/RTCRtpParameters-transactionId.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getCapabilities.html b/tests/wpt/tests/webrtc/RTCRtpReceiver-getCapabilities.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getCapabilities.html rename to tests/wpt/tests/webrtc/RTCRtpReceiver-getCapabilities.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getContributingSources.https.html b/tests/wpt/tests/webrtc/RTCRtpReceiver-getContributingSources.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getContributingSources.https.html rename to tests/wpt/tests/webrtc/RTCRtpReceiver-getContributingSources.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getParameters.html b/tests/wpt/tests/webrtc/RTCRtpReceiver-getParameters.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getParameters.html rename to tests/wpt/tests/webrtc/RTCRtpReceiver-getParameters.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getStats.https.html b/tests/wpt/tests/webrtc/RTCRtpReceiver-getStats.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getStats.https.html rename to tests/wpt/tests/webrtc/RTCRtpReceiver-getStats.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html b/tests/wpt/tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html rename to tests/wpt/tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-encode-same-track-twice.https.html b/tests/wpt/tests/webrtc/RTCRtpSender-encode-same-track-twice.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpSender-encode-same-track-twice.https.html rename to tests/wpt/tests/webrtc/RTCRtpSender-encode-same-track-twice.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-getCapabilities.html b/tests/wpt/tests/webrtc/RTCRtpSender-getCapabilities.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpSender-getCapabilities.html rename to tests/wpt/tests/webrtc/RTCRtpSender-getCapabilities.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-getStats.https.html b/tests/wpt/tests/webrtc/RTCRtpSender-getStats.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpSender-getStats.https.html rename to tests/wpt/tests/webrtc/RTCRtpSender-getStats.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-replaceTrack.https.html b/tests/wpt/tests/webrtc/RTCRtpSender-replaceTrack.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpSender-replaceTrack.https.html rename to tests/wpt/tests/webrtc/RTCRtpSender-replaceTrack.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-setParameters.html b/tests/wpt/tests/webrtc/RTCRtpSender-setParameters.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpSender-setParameters.html rename to tests/wpt/tests/webrtc/RTCRtpSender-setParameters.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-setStreams.https.html b/tests/wpt/tests/webrtc/RTCRtpSender-setStreams.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpSender-setStreams.https.html rename to tests/wpt/tests/webrtc/RTCRtpSender-setStreams.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-transport.https.html b/tests/wpt/tests/webrtc/RTCRtpSender-transport.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpSender-transport.https.html rename to tests/wpt/tests/webrtc/RTCRtpSender-transport.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpSender.https.html b/tests/wpt/tests/webrtc/RTCRtpSender.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpSender.https.html rename to tests/wpt/tests/webrtc/RTCRtpSender.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver-direction.html b/tests/wpt/tests/webrtc/RTCRtpTransceiver-direction.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver-direction.html rename to tests/wpt/tests/webrtc/RTCRtpTransceiver-direction.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver-setCodecPreferences.html b/tests/wpt/tests/webrtc/RTCRtpTransceiver-setCodecPreferences.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver-setCodecPreferences.html rename to tests/wpt/tests/webrtc/RTCRtpTransceiver-setCodecPreferences.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver-stop.html b/tests/wpt/tests/webrtc/RTCRtpTransceiver-stop.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver-stop.html rename to tests/wpt/tests/webrtc/RTCRtpTransceiver-stop.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver-stopping.https.html b/tests/wpt/tests/webrtc/RTCRtpTransceiver-stopping.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver-stopping.https.html rename to tests/wpt/tests/webrtc/RTCRtpTransceiver-stopping.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html b/tests/wpt/tests/webrtc/RTCRtpTransceiver.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html rename to tests/wpt/tests/webrtc/RTCRtpTransceiver.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-constructor.html b/tests/wpt/tests/webrtc/RTCSctpTransport-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-constructor.html rename to tests/wpt/tests/webrtc/RTCSctpTransport-constructor.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-events.html b/tests/wpt/tests/webrtc/RTCSctpTransport-events.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-events.html rename to tests/wpt/tests/webrtc/RTCSctpTransport-events.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-maxChannels.html b/tests/wpt/tests/webrtc/RTCSctpTransport-maxChannels.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-maxChannels.html rename to tests/wpt/tests/webrtc/RTCSctpTransport-maxChannels.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-maxMessageSize.html b/tests/wpt/tests/webrtc/RTCSctpTransport-maxMessageSize.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-maxMessageSize.html rename to tests/wpt/tests/webrtc/RTCSctpTransport-maxMessageSize.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCStats-helper.js b/tests/wpt/tests/webrtc/RTCStats-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCStats-helper.js rename to tests/wpt/tests/webrtc/RTCStats-helper.js diff --git a/tests/wpt/web-platform-tests/webrtc/RTCTrackEvent-constructor.html b/tests/wpt/tests/webrtc/RTCTrackEvent-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCTrackEvent-constructor.html rename to tests/wpt/tests/webrtc/RTCTrackEvent-constructor.html diff --git a/tests/wpt/web-platform-tests/webrtc/RTCTrackEvent-fire.html b/tests/wpt/tests/webrtc/RTCTrackEvent-fire.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RTCTrackEvent-fire.html rename to tests/wpt/tests/webrtc/RTCTrackEvent-fire.html diff --git a/tests/wpt/web-platform-tests/webrtc/RollbackEvents.https.html b/tests/wpt/tests/webrtc/RollbackEvents.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/RollbackEvents.https.html rename to tests/wpt/tests/webrtc/RollbackEvents.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/back-forward-cache-with-closed-webrtc-connection-ccns.https.tentative.window.js b/tests/wpt/tests/webrtc/back-forward-cache-with-closed-webrtc-connection-ccns.https.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/back-forward-cache-with-closed-webrtc-connection-ccns.https.tentative.window.js rename to tests/wpt/tests/webrtc/back-forward-cache-with-closed-webrtc-connection-ccns.https.tentative.window.js diff --git a/tests/wpt/web-platform-tests/webrtc/back-forward-cache-with-closed-webrtc-connection.https.window.js b/tests/wpt/tests/webrtc/back-forward-cache-with-closed-webrtc-connection.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/back-forward-cache-with-closed-webrtc-connection.https.window.js rename to tests/wpt/tests/webrtc/back-forward-cache-with-closed-webrtc-connection.https.window.js diff --git a/tests/wpt/web-platform-tests/webrtc/back-forward-cache-with-open-webrtc-connection-ccns.https.tentative.window.js b/tests/wpt/tests/webrtc/back-forward-cache-with-open-webrtc-connection-ccns.https.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/back-forward-cache-with-open-webrtc-connection-ccns.https.tentative.window.js rename to tests/wpt/tests/webrtc/back-forward-cache-with-open-webrtc-connection-ccns.https.tentative.window.js diff --git a/tests/wpt/web-platform-tests/webrtc/back-forward-cache-with-open-webrtc-connection.https.window.js b/tests/wpt/tests/webrtc/back-forward-cache-with-open-webrtc-connection.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/back-forward-cache-with-open-webrtc-connection.https.window.js rename to tests/wpt/tests/webrtc/back-forward-cache-with-open-webrtc-connection.https.window.js diff --git a/tests/wpt/web-platform-tests/webrtc/coverage/RTCDTMFSender.txt b/tests/wpt/tests/webrtc/coverage/RTCDTMFSender.txt similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/coverage/RTCDTMFSender.txt rename to tests/wpt/tests/webrtc/coverage/RTCDTMFSender.txt diff --git a/tests/wpt/web-platform-tests/webrtc/coverage/identity.txt b/tests/wpt/tests/webrtc/coverage/identity.txt similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/coverage/identity.txt rename to tests/wpt/tests/webrtc/coverage/identity.txt diff --git a/tests/wpt/web-platform-tests/webrtc/coverage/set-session-description.txt b/tests/wpt/tests/webrtc/coverage/set-session-description.txt similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/coverage/set-session-description.txt rename to tests/wpt/tests/webrtc/coverage/set-session-description.txt diff --git a/tests/wpt/web-platform-tests/webrtc/dictionary-helper.js b/tests/wpt/tests/webrtc/dictionary-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/dictionary-helper.js rename to tests/wpt/tests/webrtc/dictionary-helper.js diff --git a/tests/wpt/web-platform-tests/webrtc/getstats.html b/tests/wpt/tests/webrtc/getstats.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/getstats.html rename to tests/wpt/tests/webrtc/getstats.html diff --git a/tests/wpt/web-platform-tests/webrtc/historical.html b/tests/wpt/tests/webrtc/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/historical.html rename to tests/wpt/tests/webrtc/historical.html diff --git a/tests/wpt/web-platform-tests/webrtc/idlharness.https.window.js b/tests/wpt/tests/webrtc/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/idlharness.https.window.js rename to tests/wpt/tests/webrtc/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/webrtc/legacy/README.txt b/tests/wpt/tests/webrtc/legacy/README.txt similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/legacy/README.txt rename to tests/wpt/tests/webrtc/legacy/README.txt diff --git a/tests/wpt/web-platform-tests/webrtc/legacy/RTCPeerConnection-createOffer-offerToReceive.html b/tests/wpt/tests/webrtc/legacy/RTCPeerConnection-createOffer-offerToReceive.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/legacy/RTCPeerConnection-createOffer-offerToReceive.html rename to tests/wpt/tests/webrtc/legacy/RTCPeerConnection-createOffer-offerToReceive.html diff --git a/tests/wpt/web-platform-tests/webrtc/legacy/RTCRtpTransceiver-with-OfferToReceive-options.https.html b/tests/wpt/tests/webrtc/legacy/RTCRtpTransceiver-with-OfferToReceive-options.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/legacy/RTCRtpTransceiver-with-OfferToReceive-options.https.html rename to tests/wpt/tests/webrtc/legacy/RTCRtpTransceiver-with-OfferToReceive-options.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/legacy/onaddstream.https.html b/tests/wpt/tests/webrtc/legacy/onaddstream.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/legacy/onaddstream.https.html rename to tests/wpt/tests/webrtc/legacy/onaddstream.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/no-media-call.html b/tests/wpt/tests/webrtc/no-media-call.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/no-media-call.html rename to tests/wpt/tests/webrtc/no-media-call.html diff --git a/tests/wpt/web-platform-tests/webrtc/promises-call.html b/tests/wpt/tests/webrtc/promises-call.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/promises-call.html rename to tests/wpt/tests/webrtc/promises-call.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/README.txt b/tests/wpt/tests/webrtc/protocol/README.txt similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/README.txt rename to tests/wpt/tests/webrtc/protocol/README.txt diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/RTCPeerConnection-payloadTypes.html b/tests/wpt/tests/webrtc/protocol/RTCPeerConnection-payloadTypes.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/RTCPeerConnection-payloadTypes.html rename to tests/wpt/tests/webrtc/protocol/RTCPeerConnection-payloadTypes.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/bundle.https.html b/tests/wpt/tests/webrtc/protocol/bundle.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/bundle.https.html rename to tests/wpt/tests/webrtc/protocol/bundle.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/candidate-exchange.https.html b/tests/wpt/tests/webrtc/protocol/candidate-exchange.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/candidate-exchange.https.html rename to tests/wpt/tests/webrtc/protocol/candidate-exchange.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/crypto-suite.https.html b/tests/wpt/tests/webrtc/protocol/crypto-suite.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/crypto-suite.https.html rename to tests/wpt/tests/webrtc/protocol/crypto-suite.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/dtls-certificates.html b/tests/wpt/tests/webrtc/protocol/dtls-certificates.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/dtls-certificates.html rename to tests/wpt/tests/webrtc/protocol/dtls-certificates.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/dtls-fingerprint-validation.html b/tests/wpt/tests/webrtc/protocol/dtls-fingerprint-validation.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/dtls-fingerprint-validation.html rename to tests/wpt/tests/webrtc/protocol/dtls-fingerprint-validation.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/dtls-setup.https.html b/tests/wpt/tests/webrtc/protocol/dtls-setup.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/dtls-setup.https.html rename to tests/wpt/tests/webrtc/protocol/dtls-setup.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/h264-profile-levels.https.html b/tests/wpt/tests/webrtc/protocol/h264-profile-levels.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/h264-profile-levels.https.html rename to tests/wpt/tests/webrtc/protocol/h264-profile-levels.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/handover-datachannel.html b/tests/wpt/tests/webrtc/protocol/handover-datachannel.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/handover-datachannel.html rename to tests/wpt/tests/webrtc/protocol/handover-datachannel.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/handover.html b/tests/wpt/tests/webrtc/protocol/handover.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/handover.html rename to tests/wpt/tests/webrtc/protocol/handover.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/ice-state.https.html b/tests/wpt/tests/webrtc/protocol/ice-state.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/ice-state.https.html rename to tests/wpt/tests/webrtc/protocol/ice-state.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/ice-ufragpwd.html b/tests/wpt/tests/webrtc/protocol/ice-ufragpwd.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/ice-ufragpwd.html rename to tests/wpt/tests/webrtc/protocol/ice-ufragpwd.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/jsep-initial-offer.https.html b/tests/wpt/tests/webrtc/protocol/jsep-initial-offer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/jsep-initial-offer.https.html rename to tests/wpt/tests/webrtc/protocol/jsep-initial-offer.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/missing-fields.html b/tests/wpt/tests/webrtc/protocol/missing-fields.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/missing-fields.html rename to tests/wpt/tests/webrtc/protocol/missing-fields.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/msid-generate.html b/tests/wpt/tests/webrtc/protocol/msid-generate.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/msid-generate.html rename to tests/wpt/tests/webrtc/protocol/msid-generate.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/msid-parse.html b/tests/wpt/tests/webrtc/protocol/msid-parse.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/msid-parse.html rename to tests/wpt/tests/webrtc/protocol/msid-parse.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/rtp-clockrate.html b/tests/wpt/tests/webrtc/protocol/rtp-clockrate.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/rtp-clockrate.html rename to tests/wpt/tests/webrtc/protocol/rtp-clockrate.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/rtp-demuxing.html b/tests/wpt/tests/webrtc/protocol/rtp-demuxing.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/rtp-demuxing.html rename to tests/wpt/tests/webrtc/protocol/rtp-demuxing.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/rtp-extension-support.html b/tests/wpt/tests/webrtc/protocol/rtp-extension-support.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/rtp-extension-support.html rename to tests/wpt/tests/webrtc/protocol/rtp-extension-support.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/rtp-headerextensions.html b/tests/wpt/tests/webrtc/protocol/rtp-headerextensions.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/rtp-headerextensions.html rename to tests/wpt/tests/webrtc/protocol/rtp-headerextensions.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/rtp-payloadtypes.html b/tests/wpt/tests/webrtc/protocol/rtp-payloadtypes.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/rtp-payloadtypes.html rename to tests/wpt/tests/webrtc/protocol/rtp-payloadtypes.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/rtx-codecs.https.html b/tests/wpt/tests/webrtc/protocol/rtx-codecs.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/rtx-codecs.https.html rename to tests/wpt/tests/webrtc/protocol/rtx-codecs.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/sctp-format.html b/tests/wpt/tests/webrtc/protocol/sctp-format.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/sctp-format.html rename to tests/wpt/tests/webrtc/protocol/sctp-format.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/sdes-dont-dont-dont.html b/tests/wpt/tests/webrtc/protocol/sdes-dont-dont-dont.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/sdes-dont-dont-dont.html rename to tests/wpt/tests/webrtc/protocol/sdes-dont-dont-dont.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/simulcast-answer.html b/tests/wpt/tests/webrtc/protocol/simulcast-answer.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/simulcast-answer.html rename to tests/wpt/tests/webrtc/protocol/simulcast-answer.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/simulcast-offer.html b/tests/wpt/tests/webrtc/protocol/simulcast-offer.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/simulcast-offer.html rename to tests/wpt/tests/webrtc/protocol/simulcast-offer.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/split.https.html b/tests/wpt/tests/webrtc/protocol/split.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/split.https.html rename to tests/wpt/tests/webrtc/protocol/split.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/unknown-mediatypes.html b/tests/wpt/tests/webrtc/protocol/unknown-mediatypes.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/unknown-mediatypes.html rename to tests/wpt/tests/webrtc/protocol/unknown-mediatypes.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/video-codecs.https.html b/tests/wpt/tests/webrtc/protocol/video-codecs.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/video-codecs.https.html rename to tests/wpt/tests/webrtc/protocol/video-codecs.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/vp8-fmtp.html b/tests/wpt/tests/webrtc/protocol/vp8-fmtp.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/protocol/vp8-fmtp.html rename to tests/wpt/tests/webrtc/protocol/vp8-fmtp.html diff --git a/tests/wpt/web-platform-tests/webrtc/receiver-track-live.https.html b/tests/wpt/tests/webrtc/receiver-track-live.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/receiver-track-live.https.html rename to tests/wpt/tests/webrtc/receiver-track-live.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/recvonly-transceiver-can-become-sendrecv.https.html b/tests/wpt/tests/webrtc/recvonly-transceiver-can-become-sendrecv.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/recvonly-transceiver-can-become-sendrecv.https.html rename to tests/wpt/tests/webrtc/recvonly-transceiver-can-become-sendrecv.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/resources/RTCCertificate-postMessage-iframe.html b/tests/wpt/tests/webrtc/resources/RTCCertificate-postMessage-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/resources/RTCCertificate-postMessage-iframe.html rename to tests/wpt/tests/webrtc/resources/RTCCertificate-postMessage-iframe.html diff --git a/tests/wpt/web-platform-tests/webrtc/resources/webrtc-test-helpers.sub.js b/tests/wpt/tests/webrtc/resources/webrtc-test-helpers.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/resources/webrtc-test-helpers.sub.js rename to tests/wpt/tests/webrtc/resources/webrtc-test-helpers.sub.js diff --git a/tests/wpt/web-platform-tests/webrtc/simplecall-no-ssrcs.https.html b/tests/wpt/tests/webrtc/simplecall-no-ssrcs.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/simplecall-no-ssrcs.https.html rename to tests/wpt/tests/webrtc/simplecall-no-ssrcs.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/simplecall.https.html b/tests/wpt/tests/webrtc/simplecall.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/simplecall.https.html rename to tests/wpt/tests/webrtc/simplecall.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/simulcast/basic.https.html b/tests/wpt/tests/webrtc/simulcast/basic.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/simulcast/basic.https.html rename to tests/wpt/tests/webrtc/simulcast/basic.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/simulcast/getStats.https.html b/tests/wpt/tests/webrtc/simulcast/getStats.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/simulcast/getStats.https.html rename to tests/wpt/tests/webrtc/simulcast/getStats.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/simulcast/h264.https.html b/tests/wpt/tests/webrtc/simulcast/h264.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/simulcast/h264.https.html rename to tests/wpt/tests/webrtc/simulcast/h264.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/simulcast/negotiation-encodings.https.html b/tests/wpt/tests/webrtc/simulcast/negotiation-encodings.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/simulcast/negotiation-encodings.https.html rename to tests/wpt/tests/webrtc/simulcast/negotiation-encodings.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/simulcast/rid-manipulation.html b/tests/wpt/tests/webrtc/simulcast/rid-manipulation.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/simulcast/rid-manipulation.html rename to tests/wpt/tests/webrtc/simulcast/rid-manipulation.html diff --git a/tests/wpt/web-platform-tests/webrtc/simulcast/setParameters-active.https.html b/tests/wpt/tests/webrtc/simulcast/setParameters-active.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/simulcast/setParameters-active.https.html rename to tests/wpt/tests/webrtc/simulcast/setParameters-active.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/simulcast/setParameters-encodings.https.html b/tests/wpt/tests/webrtc/simulcast/setParameters-encodings.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/simulcast/setParameters-encodings.https.html rename to tests/wpt/tests/webrtc/simulcast/setParameters-encodings.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/simulcast/simulcast.js b/tests/wpt/tests/webrtc/simulcast/simulcast.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/simulcast/simulcast.js rename to tests/wpt/tests/webrtc/simulcast/simulcast.js diff --git a/tests/wpt/web-platform-tests/webrtc/simulcast/vp8.https.html b/tests/wpt/tests/webrtc/simulcast/vp8.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/simulcast/vp8.https.html rename to tests/wpt/tests/webrtc/simulcast/vp8.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/simulcast/vp9-scalability-mode.https.html b/tests/wpt/tests/webrtc/simulcast/vp9-scalability-mode.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/simulcast/vp9-scalability-mode.https.html rename to tests/wpt/tests/webrtc/simulcast/vp9-scalability-mode.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/simulcast/vp9.https.html b/tests/wpt/tests/webrtc/simulcast/vp9.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/simulcast/vp9.https.html rename to tests/wpt/tests/webrtc/simulcast/vp9.https.html diff --git a/tests/wpt/web-platform-tests/webrtc/third_party/README.md b/tests/wpt/tests/webrtc/third_party/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/third_party/README.md rename to tests/wpt/tests/webrtc/third_party/README.md diff --git a/tests/wpt/web-platform-tests/webrtc/third_party/sdp/LICENSE b/tests/wpt/tests/webrtc/third_party/sdp/LICENSE similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/third_party/sdp/LICENSE rename to tests/wpt/tests/webrtc/third_party/sdp/LICENSE diff --git a/tests/wpt/web-platform-tests/webrtc/third_party/sdp/sdp.js b/tests/wpt/tests/webrtc/third_party/sdp/sdp.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/third_party/sdp/sdp.js rename to tests/wpt/tests/webrtc/third_party/sdp/sdp.js diff --git a/tests/wpt/web-platform-tests/webrtc/toJSON.html b/tests/wpt/tests/webrtc/toJSON.html similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/toJSON.html rename to tests/wpt/tests/webrtc/toJSON.html diff --git a/tests/wpt/web-platform-tests/webrtc/tools/.eslintrc.js b/tests/wpt/tests/webrtc/tools/.eslintrc.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/tools/.eslintrc.js rename to tests/wpt/tests/webrtc/tools/.eslintrc.js diff --git a/tests/wpt/web-platform-tests/webrtc/tools/README.md b/tests/wpt/tests/webrtc/tools/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/tools/README.md rename to tests/wpt/tests/webrtc/tools/README.md diff --git a/tests/wpt/web-platform-tests/webrtc/tools/codemod-peerconnection-addcleanup b/tests/wpt/tests/webrtc/tools/codemod-peerconnection-addcleanup similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/tools/codemod-peerconnection-addcleanup rename to tests/wpt/tests/webrtc/tools/codemod-peerconnection-addcleanup diff --git a/tests/wpt/web-platform-tests/webrtc/tools/html-codemod.js b/tests/wpt/tests/webrtc/tools/html-codemod.js similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/tools/html-codemod.js rename to tests/wpt/tests/webrtc/tools/html-codemod.js diff --git a/tests/wpt/web-platform-tests/webrtc/tools/package.json b/tests/wpt/tests/webrtc/tools/package.json similarity index 100% rename from tests/wpt/web-platform-tests/webrtc/tools/package.json rename to tests/wpt/tests/webrtc/tools/package.json diff --git a/tests/wpt/web-platform-tests/websockets/Close-1000-reason.any.js b/tests/wpt/tests/websockets/Close-1000-reason.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-1000-reason.any.js rename to tests/wpt/tests/websockets/Close-1000-reason.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-1000-verify-code.any.js b/tests/wpt/tests/websockets/Close-1000-verify-code.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-1000-verify-code.any.js rename to tests/wpt/tests/websockets/Close-1000-verify-code.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-1000.any.js b/tests/wpt/tests/websockets/Close-1000.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-1000.any.js rename to tests/wpt/tests/websockets/Close-1000.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-1005-verify-code.any.js b/tests/wpt/tests/websockets/Close-1005-verify-code.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-1005-verify-code.any.js rename to tests/wpt/tests/websockets/Close-1005-verify-code.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-1005.any.js b/tests/wpt/tests/websockets/Close-1005.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-1005.any.js rename to tests/wpt/tests/websockets/Close-1005.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-2999-reason.any.js b/tests/wpt/tests/websockets/Close-2999-reason.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-2999-reason.any.js rename to tests/wpt/tests/websockets/Close-2999-reason.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-3000-reason.any.js b/tests/wpt/tests/websockets/Close-3000-reason.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-3000-reason.any.js rename to tests/wpt/tests/websockets/Close-3000-reason.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-3000-verify-code.any.js b/tests/wpt/tests/websockets/Close-3000-verify-code.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-3000-verify-code.any.js rename to tests/wpt/tests/websockets/Close-3000-verify-code.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-4999-reason.any.js b/tests/wpt/tests/websockets/Close-4999-reason.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-4999-reason.any.js rename to tests/wpt/tests/websockets/Close-4999-reason.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-Reason-124Bytes.any.js b/tests/wpt/tests/websockets/Close-Reason-124Bytes.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-Reason-124Bytes.any.js rename to tests/wpt/tests/websockets/Close-Reason-124Bytes.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-delayed.any.js b/tests/wpt/tests/websockets/Close-delayed.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-delayed.any.js rename to tests/wpt/tests/websockets/Close-delayed.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-onlyReason.any.js b/tests/wpt/tests/websockets/Close-onlyReason.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-onlyReason.any.js rename to tests/wpt/tests/websockets/Close-onlyReason.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-readyState-Closed.any.js b/tests/wpt/tests/websockets/Close-readyState-Closed.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-readyState-Closed.any.js rename to tests/wpt/tests/websockets/Close-readyState-Closed.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-readyState-Closing.any.js b/tests/wpt/tests/websockets/Close-readyState-Closing.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-readyState-Closing.any.js rename to tests/wpt/tests/websockets/Close-readyState-Closing.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.js b/tests/wpt/tests/websockets/Close-reason-unpaired-surrogates.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.js rename to tests/wpt/tests/websockets/Close-reason-unpaired-surrogates.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-server-initiated-close.any.js b/tests/wpt/tests/websockets/Close-server-initiated-close.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-server-initiated-close.any.js rename to tests/wpt/tests/websockets/Close-server-initiated-close.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Close-undefined.any.js b/tests/wpt/tests/websockets/Close-undefined.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Close-undefined.any.js rename to tests/wpt/tests/websockets/Close-undefined.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-asciiSep-protocol-string.any.js b/tests/wpt/tests/websockets/Create-asciiSep-protocol-string.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-asciiSep-protocol-string.any.js rename to tests/wpt/tests/websockets/Create-asciiSep-protocol-string.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-blocked-port.any.js b/tests/wpt/tests/websockets/Create-blocked-port.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-blocked-port.any.js rename to tests/wpt/tests/websockets/Create-blocked-port.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-extensions-empty.any.js b/tests/wpt/tests/websockets/Create-extensions-empty.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-extensions-empty.any.js rename to tests/wpt/tests/websockets/Create-extensions-empty.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-http-urls.any.js b/tests/wpt/tests/websockets/Create-http-urls.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-http-urls.any.js rename to tests/wpt/tests/websockets/Create-http-urls.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-invalid-urls.any.js b/tests/wpt/tests/websockets/Create-invalid-urls.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-invalid-urls.any.js rename to tests/wpt/tests/websockets/Create-invalid-urls.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-non-absolute-url.any.js b/tests/wpt/tests/websockets/Create-non-absolute-url.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-non-absolute-url.any.js rename to tests/wpt/tests/websockets/Create-non-absolute-url.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-nonAscii-protocol-string.any.js b/tests/wpt/tests/websockets/Create-nonAscii-protocol-string.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-nonAscii-protocol-string.any.js rename to tests/wpt/tests/websockets/Create-nonAscii-protocol-string.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-on-worker-shutdown.any.js b/tests/wpt/tests/websockets/Create-on-worker-shutdown.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-on-worker-shutdown.any.js rename to tests/wpt/tests/websockets/Create-on-worker-shutdown.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-protocol-with-space.any.js b/tests/wpt/tests/websockets/Create-protocol-with-space.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-protocol-with-space.any.js rename to tests/wpt/tests/websockets/Create-protocol-with-space.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-protocols-repeated-case-insensitive.any.js b/tests/wpt/tests/websockets/Create-protocols-repeated-case-insensitive.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-protocols-repeated-case-insensitive.any.js rename to tests/wpt/tests/websockets/Create-protocols-repeated-case-insensitive.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-protocols-repeated.any.js b/tests/wpt/tests/websockets/Create-protocols-repeated.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-protocols-repeated.any.js rename to tests/wpt/tests/websockets/Create-protocols-repeated.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-url-with-space.any.js b/tests/wpt/tests/websockets/Create-url-with-space.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-url-with-space.any.js rename to tests/wpt/tests/websockets/Create-url-with-space.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-url-with-windows-1252-encoding.html b/tests/wpt/tests/websockets/Create-url-with-windows-1252-encoding.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-url-with-windows-1252-encoding.html rename to tests/wpt/tests/websockets/Create-url-with-windows-1252-encoding.html diff --git a/tests/wpt/web-platform-tests/websockets/Create-valid-url-array-protocols.any.js b/tests/wpt/tests/websockets/Create-valid-url-array-protocols.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-valid-url-array-protocols.any.js rename to tests/wpt/tests/websockets/Create-valid-url-array-protocols.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-valid-url-binaryType-blob.any.js b/tests/wpt/tests/websockets/Create-valid-url-binaryType-blob.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-valid-url-binaryType-blob.any.js rename to tests/wpt/tests/websockets/Create-valid-url-binaryType-blob.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol-empty.any.js b/tests/wpt/tests/websockets/Create-valid-url-protocol-empty.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol-empty.any.js rename to tests/wpt/tests/websockets/Create-valid-url-protocol-empty.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol-setCorrectly.any.js b/tests/wpt/tests/websockets/Create-valid-url-protocol-setCorrectly.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol-setCorrectly.any.js rename to tests/wpt/tests/websockets/Create-valid-url-protocol-setCorrectly.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol-string.any.js b/tests/wpt/tests/websockets/Create-valid-url-protocol-string.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol-string.any.js rename to tests/wpt/tests/websockets/Create-valid-url-protocol-string.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol.any.js b/tests/wpt/tests/websockets/Create-valid-url-protocol.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol.any.js rename to tests/wpt/tests/websockets/Create-valid-url-protocol.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Create-valid-url.any.js b/tests/wpt/tests/websockets/Create-valid-url.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Create-valid-url.any.js rename to tests/wpt/tests/websockets/Create-valid-url.any.js diff --git a/tests/wpt/web-platform-tests/websockets/META.yml b/tests/wpt/tests/websockets/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/websockets/META.yml rename to tests/wpt/tests/websockets/META.yml diff --git a/tests/wpt/web-platform-tests/websockets/README.md b/tests/wpt/tests/websockets/README.md similarity index 100% rename from tests/wpt/web-platform-tests/websockets/README.md rename to tests/wpt/tests/websockets/README.md diff --git a/tests/wpt/web-platform-tests/websockets/Send-0byte-data.any.js b/tests/wpt/tests/websockets/Send-0byte-data.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-0byte-data.any.js rename to tests/wpt/tests/websockets/Send-0byte-data.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-65K-data.any.js b/tests/wpt/tests/websockets/Send-65K-data.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-65K-data.any.js rename to tests/wpt/tests/websockets/Send-65K-data.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-before-open.any.js b/tests/wpt/tests/websockets/Send-before-open.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-before-open.any.js rename to tests/wpt/tests/websockets/Send-before-open.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-65K-arraybuffer.any.js b/tests/wpt/tests/websockets/Send-binary-65K-arraybuffer.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-binary-65K-arraybuffer.any.js rename to tests/wpt/tests/websockets/Send-binary-65K-arraybuffer.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybuffer.any.js b/tests/wpt/tests/websockets/Send-binary-arraybuffer.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-binary-arraybuffer.any.js rename to tests/wpt/tests/websockets/Send-binary-arraybuffer.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-float32.any.js b/tests/wpt/tests/websockets/Send-binary-arraybufferview-float32.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-float32.any.js rename to tests/wpt/tests/websockets/Send-binary-arraybufferview-float32.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-float64.any.js b/tests/wpt/tests/websockets/Send-binary-arraybufferview-float64.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-float64.any.js rename to tests/wpt/tests/websockets/Send-binary-arraybufferview-float64.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-int16-offset.any.js b/tests/wpt/tests/websockets/Send-binary-arraybufferview-int16-offset.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-int16-offset.any.js rename to tests/wpt/tests/websockets/Send-binary-arraybufferview-int16-offset.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-int32.any.js b/tests/wpt/tests/websockets/Send-binary-arraybufferview-int32.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-int32.any.js rename to tests/wpt/tests/websockets/Send-binary-arraybufferview-int32.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-int8.any.js b/tests/wpt/tests/websockets/Send-binary-arraybufferview-int8.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-int8.any.js rename to tests/wpt/tests/websockets/Send-binary-arraybufferview-int8.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-uint16-offset-length.any.js b/tests/wpt/tests/websockets/Send-binary-arraybufferview-uint16-offset-length.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-uint16-offset-length.any.js rename to tests/wpt/tests/websockets/Send-binary-arraybufferview-uint16-offset-length.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-uint32-offset.any.js b/tests/wpt/tests/websockets/Send-binary-arraybufferview-uint32-offset.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-uint32-offset.any.js rename to tests/wpt/tests/websockets/Send-binary-arraybufferview-uint32-offset.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-uint8-offset-length.any.js b/tests/wpt/tests/websockets/Send-binary-arraybufferview-uint8-offset-length.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-uint8-offset-length.any.js rename to tests/wpt/tests/websockets/Send-binary-arraybufferview-uint8-offset-length.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-uint8-offset.any.js b/tests/wpt/tests/websockets/Send-binary-arraybufferview-uint8-offset.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-uint8-offset.any.js rename to tests/wpt/tests/websockets/Send-binary-arraybufferview-uint8-offset.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-blob.any.js b/tests/wpt/tests/websockets/Send-binary-blob.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-binary-blob.any.js rename to tests/wpt/tests/websockets/Send-binary-blob.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-data.any.js b/tests/wpt/tests/websockets/Send-data.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-data.any.js rename to tests/wpt/tests/websockets/Send-data.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-data.worker.js b/tests/wpt/tests/websockets/Send-data.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-data.worker.js rename to tests/wpt/tests/websockets/Send-data.worker.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-null.any.js b/tests/wpt/tests/websockets/Send-null.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-null.any.js rename to tests/wpt/tests/websockets/Send-null.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-paired-surrogates.any.js b/tests/wpt/tests/websockets/Send-paired-surrogates.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-paired-surrogates.any.js rename to tests/wpt/tests/websockets/Send-paired-surrogates.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-unicode-data.any.js b/tests/wpt/tests/websockets/Send-unicode-data.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-unicode-data.any.js rename to tests/wpt/tests/websockets/Send-unicode-data.any.js diff --git a/tests/wpt/web-platform-tests/websockets/Send-unpaired-surrogates.any.js b/tests/wpt/tests/websockets/Send-unpaired-surrogates.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/Send-unpaired-surrogates.any.js rename to tests/wpt/tests/websockets/Send-unpaired-surrogates.any.js diff --git a/tests/wpt/web-platform-tests/websockets/back-forward-cache-with-closed-websocket-connection-ccns.tentative.window.js b/tests/wpt/tests/websockets/back-forward-cache-with-closed-websocket-connection-ccns.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/back-forward-cache-with-closed-websocket-connection-ccns.tentative.window.js rename to tests/wpt/tests/websockets/back-forward-cache-with-closed-websocket-connection-ccns.tentative.window.js diff --git a/tests/wpt/web-platform-tests/websockets/back-forward-cache-with-closed-websocket-connection.window.js b/tests/wpt/tests/websockets/back-forward-cache-with-closed-websocket-connection.window.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/back-forward-cache-with-closed-websocket-connection.window.js rename to tests/wpt/tests/websockets/back-forward-cache-with-closed-websocket-connection.window.js diff --git a/tests/wpt/web-platform-tests/websockets/back-forward-cache-with-open-websocket-connection-ccns.tentative.window.js b/tests/wpt/tests/websockets/back-forward-cache-with-open-websocket-connection-ccns.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/back-forward-cache-with-open-websocket-connection-ccns.tentative.window.js rename to tests/wpt/tests/websockets/back-forward-cache-with-open-websocket-connection-ccns.tentative.window.js diff --git a/tests/wpt/web-platform-tests/websockets/back-forward-cache-with-open-websocket-connection.window.js b/tests/wpt/tests/websockets/back-forward-cache-with-open-websocket-connection.window.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/back-forward-cache-with-open-websocket-connection.window.js rename to tests/wpt/tests/websockets/back-forward-cache-with-open-websocket-connection.window.js diff --git a/tests/wpt/web-platform-tests/websockets/basic-auth.any.js b/tests/wpt/tests/websockets/basic-auth.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/basic-auth.any.js rename to tests/wpt/tests/websockets/basic-auth.any.js diff --git a/tests/wpt/web-platform-tests/websockets/binary/001.html b/tests/wpt/tests/websockets/binary/001.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/binary/001.html rename to tests/wpt/tests/websockets/binary/001.html diff --git a/tests/wpt/web-platform-tests/websockets/binary/002.html b/tests/wpt/tests/websockets/binary/002.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/binary/002.html rename to tests/wpt/tests/websockets/binary/002.html diff --git a/tests/wpt/web-platform-tests/websockets/binary/004.html b/tests/wpt/tests/websockets/binary/004.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/binary/004.html rename to tests/wpt/tests/websockets/binary/004.html diff --git a/tests/wpt/web-platform-tests/websockets/binary/005.html b/tests/wpt/tests/websockets/binary/005.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/binary/005.html rename to tests/wpt/tests/websockets/binary/005.html diff --git a/tests/wpt/web-platform-tests/websockets/binaryType-wrong-value.any.js b/tests/wpt/tests/websockets/binaryType-wrong-value.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/binaryType-wrong-value.any.js rename to tests/wpt/tests/websockets/binaryType-wrong-value.any.js diff --git a/tests/wpt/web-platform-tests/websockets/bufferedAmount-unchanged-by-sync-xhr.any.js b/tests/wpt/tests/websockets/bufferedAmount-unchanged-by-sync-xhr.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/bufferedAmount-unchanged-by-sync-xhr.any.js rename to tests/wpt/tests/websockets/bufferedAmount-unchanged-by-sync-xhr.any.js diff --git a/tests/wpt/web-platform-tests/websockets/close-invalid.any.js b/tests/wpt/tests/websockets/close-invalid.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/close-invalid.any.js rename to tests/wpt/tests/websockets/close-invalid.any.js diff --git a/tests/wpt/web-platform-tests/websockets/closing-handshake/002.html b/tests/wpt/tests/websockets/closing-handshake/002.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/closing-handshake/002.html rename to tests/wpt/tests/websockets/closing-handshake/002.html diff --git a/tests/wpt/web-platform-tests/websockets/closing-handshake/003.html b/tests/wpt/tests/websockets/closing-handshake/003.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/closing-handshake/003.html rename to tests/wpt/tests/websockets/closing-handshake/003.html diff --git a/tests/wpt/web-platform-tests/websockets/closing-handshake/004.html b/tests/wpt/tests/websockets/closing-handshake/004.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/closing-handshake/004.html rename to tests/wpt/tests/websockets/closing-handshake/004.html diff --git a/tests/wpt/web-platform-tests/websockets/constants.sub.js b/tests/wpt/tests/websockets/constants.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constants.sub.js rename to tests/wpt/tests/websockets/constants.sub.js diff --git a/tests/wpt/web-platform-tests/websockets/constructor.any.js b/tests/wpt/tests/websockets/constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor.any.js rename to tests/wpt/tests/websockets/constructor.any.js diff --git a/tests/wpt/web-platform-tests/websockets/constructor/001.html b/tests/wpt/tests/websockets/constructor/001.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/001.html rename to tests/wpt/tests/websockets/constructor/001.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/004.html b/tests/wpt/tests/websockets/constructor/004.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/004.html rename to tests/wpt/tests/websockets/constructor/004.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/005.html b/tests/wpt/tests/websockets/constructor/005.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/005.html rename to tests/wpt/tests/websockets/constructor/005.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/006.html b/tests/wpt/tests/websockets/constructor/006.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/006.html rename to tests/wpt/tests/websockets/constructor/006.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/007.html b/tests/wpt/tests/websockets/constructor/007.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/007.html rename to tests/wpt/tests/websockets/constructor/007.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/008.html b/tests/wpt/tests/websockets/constructor/008.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/008.html rename to tests/wpt/tests/websockets/constructor/008.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/009.html b/tests/wpt/tests/websockets/constructor/009.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/009.html rename to tests/wpt/tests/websockets/constructor/009.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/010.html b/tests/wpt/tests/websockets/constructor/010.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/010.html rename to tests/wpt/tests/websockets/constructor/010.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/011.html b/tests/wpt/tests/websockets/constructor/011.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/011.html rename to tests/wpt/tests/websockets/constructor/011.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/012.html b/tests/wpt/tests/websockets/constructor/012.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/012.html rename to tests/wpt/tests/websockets/constructor/012.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/013.html b/tests/wpt/tests/websockets/constructor/013.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/013.html rename to tests/wpt/tests/websockets/constructor/013.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/014.html b/tests/wpt/tests/websockets/constructor/014.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/014.html rename to tests/wpt/tests/websockets/constructor/014.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/016.html b/tests/wpt/tests/websockets/constructor/016.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/016.html rename to tests/wpt/tests/websockets/constructor/016.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/017.html b/tests/wpt/tests/websockets/constructor/017.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/017.html rename to tests/wpt/tests/websockets/constructor/017.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/018.html b/tests/wpt/tests/websockets/constructor/018.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/018.html rename to tests/wpt/tests/websockets/constructor/018.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/019.html b/tests/wpt/tests/websockets/constructor/019.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/019.html rename to tests/wpt/tests/websockets/constructor/019.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/020.html b/tests/wpt/tests/websockets/constructor/020.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/020.html rename to tests/wpt/tests/websockets/constructor/020.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/021.html b/tests/wpt/tests/websockets/constructor/021.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/021.html rename to tests/wpt/tests/websockets/constructor/021.html diff --git a/tests/wpt/web-platform-tests/websockets/constructor/022.html b/tests/wpt/tests/websockets/constructor/022.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/constructor/022.html rename to tests/wpt/tests/websockets/constructor/022.html diff --git a/tests/wpt/web-platform-tests/websockets/cookies/001.html b/tests/wpt/tests/websockets/cookies/001.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/cookies/001.html rename to tests/wpt/tests/websockets/cookies/001.html diff --git a/tests/wpt/web-platform-tests/websockets/cookies/002.html b/tests/wpt/tests/websockets/cookies/002.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/cookies/002.html rename to tests/wpt/tests/websockets/cookies/002.html diff --git a/tests/wpt/web-platform-tests/websockets/cookies/003.html b/tests/wpt/tests/websockets/cookies/003.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/cookies/003.html rename to tests/wpt/tests/websockets/cookies/003.html diff --git a/tests/wpt/web-platform-tests/websockets/cookies/004.html b/tests/wpt/tests/websockets/cookies/004.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/cookies/004.html rename to tests/wpt/tests/websockets/cookies/004.html diff --git a/tests/wpt/web-platform-tests/websockets/cookies/005.html b/tests/wpt/tests/websockets/cookies/005.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/cookies/005.html rename to tests/wpt/tests/websockets/cookies/005.html diff --git a/tests/wpt/web-platform-tests/websockets/cookies/006.html b/tests/wpt/tests/websockets/cookies/006.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/cookies/006.html rename to tests/wpt/tests/websockets/cookies/006.html diff --git a/tests/wpt/web-platform-tests/websockets/cookies/007.html b/tests/wpt/tests/websockets/cookies/007.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/cookies/007.html rename to tests/wpt/tests/websockets/cookies/007.html diff --git a/tests/wpt/web-platform-tests/websockets/cookies/support/set-cookie.py b/tests/wpt/tests/websockets/cookies/support/set-cookie.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/cookies/support/set-cookie.py rename to tests/wpt/tests/websockets/cookies/support/set-cookie.py diff --git a/tests/wpt/web-platform-tests/websockets/cookies/support/websocket-cookies-helper.sub.js b/tests/wpt/tests/websockets/cookies/support/websocket-cookies-helper.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/cookies/support/websocket-cookies-helper.sub.js rename to tests/wpt/tests/websockets/cookies/support/websocket-cookies-helper.sub.js diff --git a/tests/wpt/web-platform-tests/websockets/cookies/third-party-cookie-accepted.https.html b/tests/wpt/tests/websockets/cookies/third-party-cookie-accepted.https.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/cookies/third-party-cookie-accepted.https.html rename to tests/wpt/tests/websockets/cookies/third-party-cookie-accepted.https.html diff --git a/tests/wpt/web-platform-tests/websockets/eventhandlers.any.js b/tests/wpt/tests/websockets/eventhandlers.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/eventhandlers.any.js rename to tests/wpt/tests/websockets/eventhandlers.any.js diff --git a/tests/wpt/web-platform-tests/websockets/extended-payload-length.html b/tests/wpt/tests/websockets/extended-payload-length.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/extended-payload-length.html rename to tests/wpt/tests/websockets/extended-payload-length.html diff --git a/tests/wpt/web-platform-tests/websockets/handlers/basic_auth_wsh.py b/tests/wpt/tests/websockets/handlers/basic_auth_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/basic_auth_wsh.py rename to tests/wpt/tests/websockets/handlers/basic_auth_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/delayed-passive-close_wsh.py b/tests/wpt/tests/websockets/handlers/delayed-passive-close_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/delayed-passive-close_wsh.py rename to tests/wpt/tests/websockets/handlers/delayed-passive-close_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/echo-cookie_wsh.py b/tests/wpt/tests/websockets/handlers/echo-cookie_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/echo-cookie_wsh.py rename to tests/wpt/tests/websockets/handlers/echo-cookie_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/echo-query_v13_wsh.py b/tests/wpt/tests/websockets/handlers/echo-query_v13_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/echo-query_v13_wsh.py rename to tests/wpt/tests/websockets/handlers/echo-query_v13_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/echo-query_wsh.py b/tests/wpt/tests/websockets/handlers/echo-query_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/echo-query_wsh.py rename to tests/wpt/tests/websockets/handlers/echo-query_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/echo_close_data_wsh.py b/tests/wpt/tests/websockets/handlers/echo_close_data_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/echo_close_data_wsh.py rename to tests/wpt/tests/websockets/handlers/echo_close_data_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/echo_exit_wsh.py b/tests/wpt/tests/websockets/handlers/echo_exit_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/echo_exit_wsh.py rename to tests/wpt/tests/websockets/handlers/echo_exit_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/echo_raw_wsh.py b/tests/wpt/tests/websockets/handlers/echo_raw_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/echo_raw_wsh.py rename to tests/wpt/tests/websockets/handlers/echo_raw_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/echo_wsh.py b/tests/wpt/tests/websockets/handlers/echo_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/echo_wsh.py rename to tests/wpt/tests/websockets/handlers/echo_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/empty-message_wsh.py b/tests/wpt/tests/websockets/handlers/empty-message_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/empty-message_wsh.py rename to tests/wpt/tests/websockets/handlers/empty-message_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/handshake_no_extensions_wsh.py b/tests/wpt/tests/websockets/handlers/handshake_no_extensions_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/handshake_no_extensions_wsh.py rename to tests/wpt/tests/websockets/handlers/handshake_no_extensions_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/handshake_no_protocol_wsh.py b/tests/wpt/tests/websockets/handlers/handshake_no_protocol_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/handshake_no_protocol_wsh.py rename to tests/wpt/tests/websockets/handlers/handshake_no_protocol_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/handshake_protocol_wsh.py b/tests/wpt/tests/websockets/handlers/handshake_protocol_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/handshake_protocol_wsh.py rename to tests/wpt/tests/websockets/handlers/handshake_protocol_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/handshake_sleep_2_wsh.py b/tests/wpt/tests/websockets/handlers/handshake_sleep_2_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/handshake_sleep_2_wsh.py rename to tests/wpt/tests/websockets/handlers/handshake_sleep_2_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/invalid_wsh.py b/tests/wpt/tests/websockets/handlers/invalid_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/invalid_wsh.py rename to tests/wpt/tests/websockets/handlers/invalid_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/msg_channel_wsh.py b/tests/wpt/tests/websockets/handlers/msg_channel_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/msg_channel_wsh.py rename to tests/wpt/tests/websockets/handlers/msg_channel_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/origin_wsh.py b/tests/wpt/tests/websockets/handlers/origin_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/origin_wsh.py rename to tests/wpt/tests/websockets/handlers/origin_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/protocol_array_wsh.py b/tests/wpt/tests/websockets/handlers/protocol_array_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/protocol_array_wsh.py rename to tests/wpt/tests/websockets/handlers/protocol_array_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/protocol_wsh.py b/tests/wpt/tests/websockets/handlers/protocol_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/protocol_wsh.py rename to tests/wpt/tests/websockets/handlers/protocol_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/receive-backpressure_wsh.py b/tests/wpt/tests/websockets/handlers/receive-backpressure_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/receive-backpressure_wsh.py rename to tests/wpt/tests/websockets/handlers/receive-backpressure_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/receive-many-with-backpressure_wsh.py b/tests/wpt/tests/websockets/handlers/receive-many-with-backpressure_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/receive-many-with-backpressure_wsh.py rename to tests/wpt/tests/websockets/handlers/receive-many-with-backpressure_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/referrer_wsh.py b/tests/wpt/tests/websockets/handlers/referrer_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/referrer_wsh.py rename to tests/wpt/tests/websockets/handlers/referrer_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/send-backpressure_wsh.py b/tests/wpt/tests/websockets/handlers/send-backpressure_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/send-backpressure_wsh.py rename to tests/wpt/tests/websockets/handlers/send-backpressure_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/set-cookie-secure_wsh.py b/tests/wpt/tests/websockets/handlers/set-cookie-secure_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/set-cookie-secure_wsh.py rename to tests/wpt/tests/websockets/handlers/set-cookie-secure_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/set-cookie_http_wsh.py b/tests/wpt/tests/websockets/handlers/set-cookie_http_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/set-cookie_http_wsh.py rename to tests/wpt/tests/websockets/handlers/set-cookie_http_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/set-cookie_wsh.py b/tests/wpt/tests/websockets/handlers/set-cookie_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/set-cookie_wsh.py rename to tests/wpt/tests/websockets/handlers/set-cookie_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/set-cookies-samesite_wsh.py b/tests/wpt/tests/websockets/handlers/set-cookies-samesite_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/set-cookies-samesite_wsh.py rename to tests/wpt/tests/websockets/handlers/set-cookies-samesite_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/simple_handshake_wsh.py b/tests/wpt/tests/websockets/handlers/simple_handshake_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/simple_handshake_wsh.py rename to tests/wpt/tests/websockets/handlers/simple_handshake_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/sleep_10_v13_wsh.py b/tests/wpt/tests/websockets/handlers/sleep_10_v13_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/sleep_10_v13_wsh.py rename to tests/wpt/tests/websockets/handlers/sleep_10_v13_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/stash_responder_blocking_wsh.py b/tests/wpt/tests/websockets/handlers/stash_responder_blocking_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/stash_responder_blocking_wsh.py rename to tests/wpt/tests/websockets/handlers/stash_responder_blocking_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/stash_responder_wsh.py b/tests/wpt/tests/websockets/handlers/stash_responder_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/stash_responder_wsh.py rename to tests/wpt/tests/websockets/handlers/stash_responder_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/handlers/wrong_accept_key_wsh.py b/tests/wpt/tests/websockets/handlers/wrong_accept_key_wsh.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/handlers/wrong_accept_key_wsh.py rename to tests/wpt/tests/websockets/handlers/wrong_accept_key_wsh.py diff --git a/tests/wpt/web-platform-tests/websockets/idlharness.any.js b/tests/wpt/tests/websockets/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/idlharness.any.js rename to tests/wpt/tests/websockets/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/CloseEvent/clean-close.html b/tests/wpt/tests/websockets/interfaces/CloseEvent/clean-close.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/CloseEvent/clean-close.html rename to tests/wpt/tests/websockets/interfaces/CloseEvent/clean-close.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/CloseEvent/constructor.html b/tests/wpt/tests/websockets/interfaces/CloseEvent/constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/CloseEvent/constructor.html rename to tests/wpt/tests/websockets/interfaces/CloseEvent/constructor.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/CloseEvent/historical.html b/tests/wpt/tests/websockets/interfaces/CloseEvent/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/CloseEvent/historical.html rename to tests/wpt/tests/websockets/interfaces/CloseEvent/historical.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html b/tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html b/tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html b/tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html b/tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-deleting.html b/tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-deleting.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-deleting.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-deleting.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html b/tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html b/tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html b/tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html b/tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html b/tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/close/close-basic.html b/tests/wpt/tests/websockets/interfaces/WebSocket/close/close-basic.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/close/close-basic.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/close/close-basic.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/close/close-connecting.html b/tests/wpt/tests/websockets/interfaces/WebSocket/close/close-connecting.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/close/close-connecting.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/close/close-connecting.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/close/close-multiple.html b/tests/wpt/tests/websockets/interfaces/WebSocket/close/close-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/close/close-multiple.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/close/close-multiple.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/close/close-nested.html b/tests/wpt/tests/websockets/interfaces/WebSocket/close/close-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/close/close-nested.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/close/close-nested.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/close/close-replace.html b/tests/wpt/tests/websockets/interfaces/WebSocket/close/close-replace.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/close/close-replace.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/close/close-replace.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/close/close-return.html b/tests/wpt/tests/websockets/interfaces/WebSocket/close/close-return.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/close/close-return.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/close/close-return.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/constants/001.html b/tests/wpt/tests/websockets/interfaces/WebSocket/constants/001.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/constants/001.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/constants/001.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/constants/002.html b/tests/wpt/tests/websockets/interfaces/WebSocket/constants/002.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/constants/002.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/constants/002.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/constants/003.html b/tests/wpt/tests/websockets/interfaces/WebSocket/constants/003.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/constants/003.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/constants/003.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/constants/004.html b/tests/wpt/tests/websockets/interfaces/WebSocket/constants/004.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/constants/004.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/constants/004.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/constants/005.html b/tests/wpt/tests/websockets/interfaces/WebSocket/constants/005.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/constants/005.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/constants/005.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/constants/006.html b/tests/wpt/tests/websockets/interfaces/WebSocket/constants/006.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/constants/006.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/constants/006.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/001.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/001.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/001.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/001.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/002.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/002.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/002.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/002.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/003.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/003.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/003.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/003.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/004.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/004.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/004.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/004.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/006.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/006.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/006.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/006.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/007.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/007.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/007.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/007.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/008.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/008.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/008.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/008.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/009.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/009.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/009.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/009.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/010.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/010.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/010.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/010.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/011.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/011.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/011.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/011.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/012.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/012.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/012.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/012.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/013.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/013.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/013.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/013.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/014.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/014.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/014.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/014.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/015.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/015.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/015.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/015.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/016.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/016.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/016.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/016.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/017.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/017.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/017.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/017.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/018.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/018.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/018.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/018.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/019.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/019.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/019.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/019.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/020.html b/tests/wpt/tests/websockets/interfaces/WebSocket/events/020.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/020.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/events/020.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/extensions/001.html b/tests/wpt/tests/websockets/interfaces/WebSocket/extensions/001.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/extensions/001.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/extensions/001.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html b/tests/wpt/tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/001.html b/tests/wpt/tests/websockets/interfaces/WebSocket/readyState/001.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/001.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/readyState/001.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/002.html b/tests/wpt/tests/websockets/interfaces/WebSocket/readyState/002.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/002.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/readyState/002.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/003.html b/tests/wpt/tests/websockets/interfaces/WebSocket/readyState/003.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/003.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/readyState/003.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/004.html b/tests/wpt/tests/websockets/interfaces/WebSocket/readyState/004.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/004.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/readyState/004.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/005.html b/tests/wpt/tests/websockets/interfaces/WebSocket/readyState/005.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/005.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/readyState/005.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/006.html b/tests/wpt/tests/websockets/interfaces/WebSocket/readyState/006.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/006.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/readyState/006.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/007.html b/tests/wpt/tests/websockets/interfaces/WebSocket/readyState/007.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/007.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/readyState/007.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/008.html b/tests/wpt/tests/websockets/interfaces/WebSocket/readyState/008.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/readyState/008.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/readyState/008.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/001.html b/tests/wpt/tests/websockets/interfaces/WebSocket/send/001.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/001.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/send/001.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/002.html b/tests/wpt/tests/websockets/interfaces/WebSocket/send/002.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/002.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/send/002.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/003.html b/tests/wpt/tests/websockets/interfaces/WebSocket/send/003.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/003.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/send/003.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/004.html b/tests/wpt/tests/websockets/interfaces/WebSocket/send/004.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/004.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/send/004.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/005.html b/tests/wpt/tests/websockets/interfaces/WebSocket/send/005.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/005.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/send/005.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/006.html b/tests/wpt/tests/websockets/interfaces/WebSocket/send/006.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/006.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/send/006.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/007.html b/tests/wpt/tests/websockets/interfaces/WebSocket/send/007.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/007.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/send/007.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/008.html b/tests/wpt/tests/websockets/interfaces/WebSocket/send/008.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/008.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/send/008.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/009.html b/tests/wpt/tests/websockets/interfaces/WebSocket/send/009.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/009.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/send/009.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/010.html b/tests/wpt/tests/websockets/interfaces/WebSocket/send/010.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/010.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/send/010.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/011.html b/tests/wpt/tests/websockets/interfaces/WebSocket/send/011.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/011.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/send/011.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/012.html b/tests/wpt/tests/websockets/interfaces/WebSocket/send/012.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/send/012.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/send/012.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/url/001.html b/tests/wpt/tests/websockets/interfaces/WebSocket/url/001.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/url/001.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/url/001.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/url/002.html b/tests/wpt/tests/websockets/interfaces/WebSocket/url/002.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/url/002.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/url/002.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/url/003.html b/tests/wpt/tests/websockets/interfaces/WebSocket/url/003.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/url/003.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/url/003.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/url/004.html b/tests/wpt/tests/websockets/interfaces/WebSocket/url/004.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/url/004.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/url/004.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/url/005.html b/tests/wpt/tests/websockets/interfaces/WebSocket/url/005.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/url/005.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/url/005.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/url/006.html b/tests/wpt/tests/websockets/interfaces/WebSocket/url/006.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/url/006.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/url/006.html diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/url/resolve.html b/tests/wpt/tests/websockets/interfaces/WebSocket/url/resolve.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/url/resolve.html rename to tests/wpt/tests/websockets/interfaces/WebSocket/url/resolve.html diff --git a/tests/wpt/web-platform-tests/websockets/keeping-connection-open/001.html b/tests/wpt/tests/websockets/keeping-connection-open/001.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/keeping-connection-open/001.html rename to tests/wpt/tests/websockets/keeping-connection-open/001.html diff --git a/tests/wpt/web-platform-tests/websockets/multi-globals/message-received.html b/tests/wpt/tests/websockets/multi-globals/message-received.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/multi-globals/message-received.html rename to tests/wpt/tests/websockets/multi-globals/message-received.html diff --git a/tests/wpt/web-platform-tests/websockets/multi-globals/support/incumbent.sub.html b/tests/wpt/tests/websockets/multi-globals/support/incumbent.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/multi-globals/support/incumbent.sub.html rename to tests/wpt/tests/websockets/multi-globals/support/incumbent.sub.html diff --git a/tests/wpt/web-platform-tests/websockets/multi-globals/support/relevant.html b/tests/wpt/tests/websockets/multi-globals/support/relevant.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/multi-globals/support/relevant.html rename to tests/wpt/tests/websockets/multi-globals/support/relevant.html diff --git a/tests/wpt/web-platform-tests/websockets/multi-globals/url-parsing/current/current.html b/tests/wpt/tests/websockets/multi-globals/url-parsing/current/current.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/multi-globals/url-parsing/current/current.html rename to tests/wpt/tests/websockets/multi-globals/url-parsing/current/current.html diff --git a/tests/wpt/web-platform-tests/websockets/multi-globals/url-parsing/incumbent/incumbent.html b/tests/wpt/tests/websockets/multi-globals/url-parsing/incumbent/incumbent.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/multi-globals/url-parsing/incumbent/incumbent.html rename to tests/wpt/tests/websockets/multi-globals/url-parsing/incumbent/incumbent.html diff --git a/tests/wpt/web-platform-tests/websockets/multi-globals/url-parsing/url-parsing.html b/tests/wpt/tests/websockets/multi-globals/url-parsing/url-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/multi-globals/url-parsing/url-parsing.html rename to tests/wpt/tests/websockets/multi-globals/url-parsing/url-parsing.html diff --git a/tests/wpt/web-platform-tests/websockets/opening-handshake/001.html b/tests/wpt/tests/websockets/opening-handshake/001.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/opening-handshake/001.html rename to tests/wpt/tests/websockets/opening-handshake/001.html diff --git a/tests/wpt/web-platform-tests/websockets/opening-handshake/002.html b/tests/wpt/tests/websockets/opening-handshake/002.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/opening-handshake/002.html rename to tests/wpt/tests/websockets/opening-handshake/002.html diff --git a/tests/wpt/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker.js b/tests/wpt/tests/websockets/opening-handshake/003-sets-origin.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker.js rename to tests/wpt/tests/websockets/opening-handshake/003-sets-origin.worker.js diff --git a/tests/wpt/web-platform-tests/websockets/opening-handshake/003.html b/tests/wpt/tests/websockets/opening-handshake/003.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/opening-handshake/003.html rename to tests/wpt/tests/websockets/opening-handshake/003.html diff --git a/tests/wpt/web-platform-tests/websockets/opening-handshake/005.html b/tests/wpt/tests/websockets/opening-handshake/005.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/opening-handshake/005.html rename to tests/wpt/tests/websockets/opening-handshake/005.html diff --git a/tests/wpt/web-platform-tests/websockets/referrer.any.js b/tests/wpt/tests/websockets/referrer.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/referrer.any.js rename to tests/wpt/tests/websockets/referrer.any.js diff --git a/tests/wpt/web-platform-tests/websockets/remove-own-iframe-during-onerror.window.js b/tests/wpt/tests/websockets/remove-own-iframe-during-onerror.window.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/remove-own-iframe-during-onerror.window.js rename to tests/wpt/tests/websockets/remove-own-iframe-during-onerror.window.js diff --git a/tests/wpt/web-platform-tests/websockets/resources/websockets-test-helpers.sub.js b/tests/wpt/tests/websockets/resources/websockets-test-helpers.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/resources/websockets-test-helpers.sub.js rename to tests/wpt/tests/websockets/resources/websockets-test-helpers.sub.js diff --git a/tests/wpt/web-platform-tests/websockets/security/001.html b/tests/wpt/tests/websockets/security/001.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/security/001.html rename to tests/wpt/tests/websockets/security/001.html diff --git a/tests/wpt/web-platform-tests/websockets/security/002.html b/tests/wpt/tests/websockets/security/002.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/security/002.html rename to tests/wpt/tests/websockets/security/002.html diff --git a/tests/wpt/web-platform-tests/websockets/security/check.py b/tests/wpt/tests/websockets/security/check.py similarity index 100% rename from tests/wpt/web-platform-tests/websockets/security/check.py rename to tests/wpt/tests/websockets/security/check.py diff --git a/tests/wpt/web-platform-tests/websockets/send-many-64K-messages-with-backpressure.any.js b/tests/wpt/tests/websockets/send-many-64K-messages-with-backpressure.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/send-many-64K-messages-with-backpressure.any.js rename to tests/wpt/tests/websockets/send-many-64K-messages-with-backpressure.any.js diff --git a/tests/wpt/web-platform-tests/websockets/stream/tentative/README.md b/tests/wpt/tests/websockets/stream/tentative/README.md similarity index 100% rename from tests/wpt/web-platform-tests/websockets/stream/tentative/README.md rename to tests/wpt/tests/websockets/stream/tentative/README.md diff --git a/tests/wpt/web-platform-tests/websockets/stream/tentative/abort.any.js b/tests/wpt/tests/websockets/stream/tentative/abort.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/stream/tentative/abort.any.js rename to tests/wpt/tests/websockets/stream/tentative/abort.any.js diff --git a/tests/wpt/web-platform-tests/websockets/stream/tentative/backpressure-receive.any.js b/tests/wpt/tests/websockets/stream/tentative/backpressure-receive.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/stream/tentative/backpressure-receive.any.js rename to tests/wpt/tests/websockets/stream/tentative/backpressure-receive.any.js diff --git a/tests/wpt/web-platform-tests/websockets/stream/tentative/backpressure-send.any.js b/tests/wpt/tests/websockets/stream/tentative/backpressure-send.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/stream/tentative/backpressure-send.any.js rename to tests/wpt/tests/websockets/stream/tentative/backpressure-send.any.js diff --git a/tests/wpt/web-platform-tests/websockets/stream/tentative/close.any.js b/tests/wpt/tests/websockets/stream/tentative/close.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/stream/tentative/close.any.js rename to tests/wpt/tests/websockets/stream/tentative/close.any.js diff --git a/tests/wpt/web-platform-tests/websockets/stream/tentative/constructor.any.js b/tests/wpt/tests/websockets/stream/tentative/constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/stream/tentative/constructor.any.js rename to tests/wpt/tests/websockets/stream/tentative/constructor.any.js diff --git a/tests/wpt/web-platform-tests/websockets/stream/tentative/resources/url-constants.js b/tests/wpt/tests/websockets/stream/tentative/resources/url-constants.js similarity index 100% rename from tests/wpt/web-platform-tests/websockets/stream/tentative/resources/url-constants.js rename to tests/wpt/tests/websockets/stream/tentative/resources/url-constants.js diff --git a/tests/wpt/web-platform-tests/websockets/unload-a-document/001-1.html b/tests/wpt/tests/websockets/unload-a-document/001-1.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/unload-a-document/001-1.html rename to tests/wpt/tests/websockets/unload-a-document/001-1.html diff --git a/tests/wpt/web-platform-tests/websockets/unload-a-document/001-2.html b/tests/wpt/tests/websockets/unload-a-document/001-2.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/unload-a-document/001-2.html rename to tests/wpt/tests/websockets/unload-a-document/001-2.html diff --git a/tests/wpt/web-platform-tests/websockets/unload-a-document/001.html b/tests/wpt/tests/websockets/unload-a-document/001.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/unload-a-document/001.html rename to tests/wpt/tests/websockets/unload-a-document/001.html diff --git a/tests/wpt/web-platform-tests/websockets/unload-a-document/002-1.html b/tests/wpt/tests/websockets/unload-a-document/002-1.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/unload-a-document/002-1.html rename to tests/wpt/tests/websockets/unload-a-document/002-1.html diff --git a/tests/wpt/web-platform-tests/websockets/unload-a-document/002-2.html b/tests/wpt/tests/websockets/unload-a-document/002-2.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/unload-a-document/002-2.html rename to tests/wpt/tests/websockets/unload-a-document/002-2.html diff --git a/tests/wpt/web-platform-tests/websockets/unload-a-document/002.html b/tests/wpt/tests/websockets/unload-a-document/002.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/unload-a-document/002.html rename to tests/wpt/tests/websockets/unload-a-document/002.html diff --git a/tests/wpt/web-platform-tests/websockets/unload-a-document/003.html b/tests/wpt/tests/websockets/unload-a-document/003.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/unload-a-document/003.html rename to tests/wpt/tests/websockets/unload-a-document/003.html diff --git a/tests/wpt/web-platform-tests/websockets/unload-a-document/004.html b/tests/wpt/tests/websockets/unload-a-document/004.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/unload-a-document/004.html rename to tests/wpt/tests/websockets/unload-a-document/004.html diff --git a/tests/wpt/web-platform-tests/websockets/unload-a-document/005-1.html b/tests/wpt/tests/websockets/unload-a-document/005-1.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/unload-a-document/005-1.html rename to tests/wpt/tests/websockets/unload-a-document/005-1.html diff --git a/tests/wpt/web-platform-tests/websockets/unload-a-document/005.html b/tests/wpt/tests/websockets/unload-a-document/005.html similarity index 100% rename from tests/wpt/web-platform-tests/websockets/unload-a-document/005.html rename to tests/wpt/tests/websockets/unload-a-document/005.html diff --git a/tests/wpt/web-platform-tests/webstorage/META.yml b/tests/wpt/tests/webstorage/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/META.yml rename to tests/wpt/tests/webstorage/META.yml diff --git a/tests/wpt/web-platform-tests/webstorage/README.md b/tests/wpt/tests/webstorage/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/README.md rename to tests/wpt/tests/webstorage/README.md diff --git a/tests/wpt/web-platform-tests/webstorage/defineProperty.window.js b/tests/wpt/tests/webstorage/defineProperty.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/defineProperty.window.js rename to tests/wpt/tests/webstorage/defineProperty.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/document-domain.html b/tests/wpt/tests/webstorage/document-domain.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/document-domain.html rename to tests/wpt/tests/webstorage/document-domain.html diff --git a/tests/wpt/web-platform-tests/webstorage/eventTestHarness.js b/tests/wpt/tests/webstorage/eventTestHarness.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/eventTestHarness.js rename to tests/wpt/tests/webstorage/eventTestHarness.js diff --git a/tests/wpt/web-platform-tests/webstorage/event_basic.html b/tests/wpt/tests/webstorage/event_basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_basic.html rename to tests/wpt/tests/webstorage/event_basic.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_basic.js b/tests/wpt/tests/webstorage/event_basic.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_basic.js rename to tests/wpt/tests/webstorage/event_basic.js diff --git a/tests/wpt/web-platform-tests/webstorage/event_body_attribute.html b/tests/wpt/tests/webstorage/event_body_attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_body_attribute.html rename to tests/wpt/tests/webstorage/event_body_attribute.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_body_attribute.js b/tests/wpt/tests/webstorage/event_body_attribute.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_body_attribute.js rename to tests/wpt/tests/webstorage/event_body_attribute.js diff --git a/tests/wpt/web-platform-tests/webstorage/event_case_sensitive.html b/tests/wpt/tests/webstorage/event_case_sensitive.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_case_sensitive.html rename to tests/wpt/tests/webstorage/event_case_sensitive.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_case_sensitive.js b/tests/wpt/tests/webstorage/event_case_sensitive.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_case_sensitive.js rename to tests/wpt/tests/webstorage/event_case_sensitive.js diff --git a/tests/wpt/web-platform-tests/webstorage/event_constructor.window.js b/tests/wpt/tests/webstorage/event_constructor.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_constructor.window.js rename to tests/wpt/tests/webstorage/event_constructor.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/event_initstorageevent.window.js b/tests/wpt/tests/webstorage/event_initstorageevent.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_initstorageevent.window.js rename to tests/wpt/tests/webstorage/event_initstorageevent.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/event_local_key.html b/tests/wpt/tests/webstorage/event_local_key.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_local_key.html rename to tests/wpt/tests/webstorage/event_local_key.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_local_newvalue.html b/tests/wpt/tests/webstorage/event_local_newvalue.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_local_newvalue.html rename to tests/wpt/tests/webstorage/event_local_newvalue.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_local_oldvalue.html b/tests/wpt/tests/webstorage/event_local_oldvalue.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_local_oldvalue.html rename to tests/wpt/tests/webstorage/event_local_oldvalue.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_local_removeitem.html b/tests/wpt/tests/webstorage/event_local_removeitem.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_local_removeitem.html rename to tests/wpt/tests/webstorage/event_local_removeitem.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_local_storagearea.html b/tests/wpt/tests/webstorage/event_local_storagearea.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_local_storagearea.html rename to tests/wpt/tests/webstorage/event_local_storagearea.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_local_url.html b/tests/wpt/tests/webstorage/event_local_url.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_local_url.html rename to tests/wpt/tests/webstorage/event_local_url.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_no_duplicates.html b/tests/wpt/tests/webstorage/event_no_duplicates.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_no_duplicates.html rename to tests/wpt/tests/webstorage/event_no_duplicates.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_session_key.html b/tests/wpt/tests/webstorage/event_session_key.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_session_key.html rename to tests/wpt/tests/webstorage/event_session_key.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_session_newvalue.html b/tests/wpt/tests/webstorage/event_session_newvalue.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_session_newvalue.html rename to tests/wpt/tests/webstorage/event_session_newvalue.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_session_oldvalue.html b/tests/wpt/tests/webstorage/event_session_oldvalue.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_session_oldvalue.html rename to tests/wpt/tests/webstorage/event_session_oldvalue.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_session_removeitem.html b/tests/wpt/tests/webstorage/event_session_removeitem.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_session_removeitem.html rename to tests/wpt/tests/webstorage/event_session_removeitem.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_session_storagearea.html b/tests/wpt/tests/webstorage/event_session_storagearea.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_session_storagearea.html rename to tests/wpt/tests/webstorage/event_session_storagearea.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_session_url.html b/tests/wpt/tests/webstorage/event_session_url.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_session_url.html rename to tests/wpt/tests/webstorage/event_session_url.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_setattribute.html b/tests/wpt/tests/webstorage/event_setattribute.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_setattribute.html rename to tests/wpt/tests/webstorage/event_setattribute.html diff --git a/tests/wpt/web-platform-tests/webstorage/event_setattribute.js b/tests/wpt/tests/webstorage/event_setattribute.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/event_setattribute.js rename to tests/wpt/tests/webstorage/event_setattribute.js diff --git a/tests/wpt/web-platform-tests/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html b/tests/wpt/tests/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html rename to tests/wpt/tests/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html diff --git a/tests/wpt/web-platform-tests/webstorage/localstorage-basic-partitioned.tentative.sub.html b/tests/wpt/tests/webstorage/localstorage-basic-partitioned.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/localstorage-basic-partitioned.tentative.sub.html rename to tests/wpt/tests/webstorage/localstorage-basic-partitioned.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/webstorage/localstorage-cross-origin-iframe.tentative.https.window.js b/tests/wpt/tests/webstorage/localstorage-cross-origin-iframe.tentative.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/localstorage-cross-origin-iframe.tentative.https.window.js rename to tests/wpt/tests/webstorage/localstorage-cross-origin-iframe.tentative.https.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/missing_arguments.window.js b/tests/wpt/tests/webstorage/missing_arguments.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/missing_arguments.window.js rename to tests/wpt/tests/webstorage/missing_arguments.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/resources/event_basic.html b/tests/wpt/tests/webstorage/resources/event_basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/event_basic.html rename to tests/wpt/tests/webstorage/resources/event_basic.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/event_body_handler.html b/tests/wpt/tests/webstorage/resources/event_body_handler.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/event_body_handler.html rename to tests/wpt/tests/webstorage/resources/event_body_handler.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/event_setattribute_handler.html b/tests/wpt/tests/webstorage/resources/event_setattribute_handler.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/event_setattribute_handler.html rename to tests/wpt/tests/webstorage/resources/event_setattribute_handler.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/local_change_item_iframe.html b/tests/wpt/tests/webstorage/resources/local_change_item_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/local_change_item_iframe.html rename to tests/wpt/tests/webstorage/resources/local_change_item_iframe.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/local_set_item_clear_iframe.html b/tests/wpt/tests/webstorage/resources/local_set_item_clear_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/local_set_item_clear_iframe.html rename to tests/wpt/tests/webstorage/resources/local_set_item_clear_iframe.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/local_set_item_iframe.html b/tests/wpt/tests/webstorage/resources/local_set_item_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/local_set_item_iframe.html rename to tests/wpt/tests/webstorage/resources/local_set_item_iframe.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/local_set_item_remove_iframe.html b/tests/wpt/tests/webstorage/resources/local_set_item_remove_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/local_set_item_remove_iframe.html rename to tests/wpt/tests/webstorage/resources/local_set_item_remove_iframe.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/localstorage-about-blank-partitioned-iframe.html b/tests/wpt/tests/webstorage/resources/localstorage-about-blank-partitioned-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/localstorage-about-blank-partitioned-iframe.html rename to tests/wpt/tests/webstorage/resources/localstorage-about-blank-partitioned-iframe.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/localstorage-about-blank-partitioned-win-open.html b/tests/wpt/tests/webstorage/resources/localstorage-about-blank-partitioned-win-open.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/localstorage-about-blank-partitioned-win-open.html rename to tests/wpt/tests/webstorage/resources/localstorage-about-blank-partitioned-win-open.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/partitioning-utils.js b/tests/wpt/tests/webstorage/resources/partitioning-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/partitioning-utils.js rename to tests/wpt/tests/webstorage/resources/partitioning-utils.js diff --git a/tests/wpt/web-platform-tests/webstorage/resources/sessionStorage-about-blank-partitioned-iframe.html b/tests/wpt/tests/webstorage/resources/sessionStorage-about-blank-partitioned-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/sessionStorage-about-blank-partitioned-iframe.html rename to tests/wpt/tests/webstorage/resources/sessionStorage-about-blank-partitioned-iframe.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/session_change_item_iframe.html b/tests/wpt/tests/webstorage/resources/session_change_item_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/session_change_item_iframe.html rename to tests/wpt/tests/webstorage/resources/session_change_item_iframe.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/session_set_item_clear_iframe.html b/tests/wpt/tests/webstorage/resources/session_set_item_clear_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/session_set_item_clear_iframe.html rename to tests/wpt/tests/webstorage/resources/session_set_item_clear_iframe.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/session_set_item_iframe.html b/tests/wpt/tests/webstorage/resources/session_set_item_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/session_set_item_iframe.html rename to tests/wpt/tests/webstorage/resources/session_set_item_iframe.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/session_set_item_remove_iframe.html b/tests/wpt/tests/webstorage/resources/session_set_item_remove_iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/session_set_item_remove_iframe.html rename to tests/wpt/tests/webstorage/resources/session_set_item_remove_iframe.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/storage_local_window_open_second.html b/tests/wpt/tests/webstorage/resources/storage_local_window_open_second.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/storage_local_window_open_second.html rename to tests/wpt/tests/webstorage/resources/storage_local_window_open_second.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/storage_session_window_noopener_second.html b/tests/wpt/tests/webstorage/resources/storage_session_window_noopener_second.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/storage_session_window_noopener_second.html rename to tests/wpt/tests/webstorage/resources/storage_session_window_noopener_second.html diff --git a/tests/wpt/web-platform-tests/webstorage/resources/storage_session_window_open_second.html b/tests/wpt/tests/webstorage/resources/storage_session_window_open_second.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/resources/storage_session_window_open_second.html rename to tests/wpt/tests/webstorage/resources/storage_session_window_open_second.html diff --git a/tests/wpt/web-platform-tests/webstorage/sessionStorage-basic-partitioned.tentative.sub.html b/tests/wpt/tests/webstorage/sessionStorage-basic-partitioned.tentative.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/sessionStorage-basic-partitioned.tentative.sub.html rename to tests/wpt/tests/webstorage/sessionStorage-basic-partitioned.tentative.sub.html diff --git a/tests/wpt/web-platform-tests/webstorage/set.window.js b/tests/wpt/tests/webstorage/set.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/set.window.js rename to tests/wpt/tests/webstorage/set.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_builtins.window.js b/tests/wpt/tests/webstorage/storage_builtins.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_builtins.window.js rename to tests/wpt/tests/webstorage/storage_builtins.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_clear.window.js b/tests/wpt/tests/webstorage/storage_clear.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_clear.window.js rename to tests/wpt/tests/webstorage/storage_clear.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_enumerate.window.js b/tests/wpt/tests/webstorage/storage_enumerate.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_enumerate.window.js rename to tests/wpt/tests/webstorage/storage_enumerate.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_functions_not_overwritten.window.js b/tests/wpt/tests/webstorage/storage_functions_not_overwritten.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_functions_not_overwritten.window.js rename to tests/wpt/tests/webstorage/storage_functions_not_overwritten.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_getitem.window.js b/tests/wpt/tests/webstorage/storage_getitem.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_getitem.window.js rename to tests/wpt/tests/webstorage/storage_getitem.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_in.window.js b/tests/wpt/tests/webstorage/storage_in.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_in.window.js rename to tests/wpt/tests/webstorage/storage_in.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_indexing.window.js b/tests/wpt/tests/webstorage/storage_indexing.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_indexing.window.js rename to tests/wpt/tests/webstorage/storage_indexing.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_key.window.js b/tests/wpt/tests/webstorage/storage_key.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_key.window.js rename to tests/wpt/tests/webstorage/storage_key.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_key_empty_string.window.js b/tests/wpt/tests/webstorage/storage_key_empty_string.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_key_empty_string.window.js rename to tests/wpt/tests/webstorage/storage_key_empty_string.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_length.window.js b/tests/wpt/tests/webstorage/storage_length.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_length.window.js rename to tests/wpt/tests/webstorage/storage_length.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_local-manual.html b/tests/wpt/tests/webstorage/storage_local-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_local-manual.html rename to tests/wpt/tests/webstorage/storage_local-manual.html diff --git a/tests/wpt/web-platform-tests/webstorage/storage_local_setitem_quotaexceedederr.window.js b/tests/wpt/tests/webstorage/storage_local_setitem_quotaexceedederr.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_local_setitem_quotaexceedederr.window.js rename to tests/wpt/tests/webstorage/storage_local_setitem_quotaexceedederr.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_local_window_open.window.js b/tests/wpt/tests/webstorage/storage_local_window_open.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_local_window_open.window.js rename to tests/wpt/tests/webstorage/storage_local_window_open.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_removeitem.window.js b/tests/wpt/tests/webstorage/storage_removeitem.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_removeitem.window.js rename to tests/wpt/tests/webstorage/storage_removeitem.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_session-manual.html b/tests/wpt/tests/webstorage/storage_session-manual.html similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_session-manual.html rename to tests/wpt/tests/webstorage/storage_session-manual.html diff --git a/tests/wpt/web-platform-tests/webstorage/storage_session_setitem_quotaexceedederr.window.js b/tests/wpt/tests/webstorage/storage_session_setitem_quotaexceedederr.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_session_setitem_quotaexceedederr.window.js rename to tests/wpt/tests/webstorage/storage_session_setitem_quotaexceedederr.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_session_window_noopener.window.js b/tests/wpt/tests/webstorage/storage_session_window_noopener.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_session_window_noopener.window.js rename to tests/wpt/tests/webstorage/storage_session_window_noopener.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_session_window_open.window.js b/tests/wpt/tests/webstorage/storage_session_window_open.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_session_window_open.window.js rename to tests/wpt/tests/webstorage/storage_session_window_open.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_session_window_reopen.window.js b/tests/wpt/tests/webstorage/storage_session_window_reopen.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_session_window_reopen.window.js rename to tests/wpt/tests/webstorage/storage_session_window_reopen.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_set_value_enumerate.window.js b/tests/wpt/tests/webstorage/storage_set_value_enumerate.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_set_value_enumerate.window.js rename to tests/wpt/tests/webstorage/storage_set_value_enumerate.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_setitem.window.js b/tests/wpt/tests/webstorage/storage_setitem.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_setitem.window.js rename to tests/wpt/tests/webstorage/storage_setitem.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_string_conversion.window.js b/tests/wpt/tests/webstorage/storage_string_conversion.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_string_conversion.window.js rename to tests/wpt/tests/webstorage/storage_string_conversion.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/storage_supported_property_names.window.js b/tests/wpt/tests/webstorage/storage_supported_property_names.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/storage_supported_property_names.window.js rename to tests/wpt/tests/webstorage/storage_supported_property_names.window.js diff --git a/tests/wpt/web-platform-tests/webstorage/symbol-props.window.js b/tests/wpt/tests/webstorage/symbol-props.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webstorage/symbol-props.window.js rename to tests/wpt/tests/webstorage/symbol-props.window.js diff --git a/tests/wpt/web-platform-tests/webtransport/META.yml b/tests/wpt/tests/webtransport/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/META.yml rename to tests/wpt/tests/webtransport/META.yml diff --git a/tests/wpt/web-platform-tests/webtransport/README.md b/tests/wpt/tests/webtransport/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/README.md rename to tests/wpt/tests/webtransport/README.md diff --git a/tests/wpt/web-platform-tests/webtransport/back-forward-cache-with-closed-webtransport-connection-ccns.https.tentative.window.js b/tests/wpt/tests/webtransport/back-forward-cache-with-closed-webtransport-connection-ccns.https.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/back-forward-cache-with-closed-webtransport-connection-ccns.https.tentative.window.js rename to tests/wpt/tests/webtransport/back-forward-cache-with-closed-webtransport-connection-ccns.https.tentative.window.js diff --git a/tests/wpt/web-platform-tests/webtransport/back-forward-cache-with-closed-webtransport-connection.https.window.js b/tests/wpt/tests/webtransport/back-forward-cache-with-closed-webtransport-connection.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/back-forward-cache-with-closed-webtransport-connection.https.window.js rename to tests/wpt/tests/webtransport/back-forward-cache-with-closed-webtransport-connection.https.window.js diff --git a/tests/wpt/web-platform-tests/webtransport/back-forward-cache-with-open-webtransport-connection-ccns.https.tentative.window.js b/tests/wpt/tests/webtransport/back-forward-cache-with-open-webtransport-connection-ccns.https.tentative.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/back-forward-cache-with-open-webtransport-connection-ccns.https.tentative.window.js rename to tests/wpt/tests/webtransport/back-forward-cache-with-open-webtransport-connection-ccns.https.tentative.window.js diff --git a/tests/wpt/web-platform-tests/webtransport/back-forward-cache-with-open-webtransport-connection.https.window.js b/tests/wpt/tests/webtransport/back-forward-cache-with-open-webtransport-connection.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/back-forward-cache-with-open-webtransport-connection.https.window.js rename to tests/wpt/tests/webtransport/back-forward-cache-with-open-webtransport-connection.https.window.js diff --git a/tests/wpt/web-platform-tests/webtransport/bidirectional-cancel-crash.https.html b/tests/wpt/tests/webtransport/bidirectional-cancel-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/bidirectional-cancel-crash.https.html rename to tests/wpt/tests/webtransport/bidirectional-cancel-crash.https.html diff --git a/tests/wpt/web-platform-tests/webtransport/close.https.any.js b/tests/wpt/tests/webtransport/close.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/close.https.any.js rename to tests/wpt/tests/webtransport/close.https.any.js diff --git a/tests/wpt/web-platform-tests/webtransport/connect.https.any.js b/tests/wpt/tests/webtransport/connect.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/connect.https.any.js rename to tests/wpt/tests/webtransport/connect.https.any.js diff --git a/tests/wpt/web-platform-tests/webtransport/constructor.https.any.js b/tests/wpt/tests/webtransport/constructor.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/constructor.https.any.js rename to tests/wpt/tests/webtransport/constructor.https.any.js diff --git a/tests/wpt/web-platform-tests/webtransport/csp-fail.https.window.js b/tests/wpt/tests/webtransport/csp-fail.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/csp-fail.https.window.js rename to tests/wpt/tests/webtransport/csp-fail.https.window.js diff --git a/tests/wpt/web-platform-tests/webtransport/csp-pass.https.window.js b/tests/wpt/tests/webtransport/csp-pass.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/csp-pass.https.window.js rename to tests/wpt/tests/webtransport/csp-pass.https.window.js diff --git a/tests/wpt/web-platform-tests/webtransport/datagram-cancel-crash.https.window.js b/tests/wpt/tests/webtransport/datagram-cancel-crash.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/datagram-cancel-crash.https.window.js rename to tests/wpt/tests/webtransport/datagram-cancel-crash.https.window.js diff --git a/tests/wpt/web-platform-tests/webtransport/datagrams.https.any.js b/tests/wpt/tests/webtransport/datagrams.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/datagrams.https.any.js rename to tests/wpt/tests/webtransport/datagrams.https.any.js diff --git a/tests/wpt/web-platform-tests/webtransport/echo-large-bidirectional-streams.https.html b/tests/wpt/tests/webtransport/echo-large-bidirectional-streams.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/echo-large-bidirectional-streams.https.html rename to tests/wpt/tests/webtransport/echo-large-bidirectional-streams.https.html diff --git a/tests/wpt/web-platform-tests/webtransport/handlers/abort-stream-from-server.py b/tests/wpt/tests/webtransport/handlers/abort-stream-from-server.py similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/handlers/abort-stream-from-server.py rename to tests/wpt/tests/webtransport/handlers/abort-stream-from-server.py diff --git a/tests/wpt/web-platform-tests/webtransport/handlers/client-close.py b/tests/wpt/tests/webtransport/handlers/client-close.py similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/handlers/client-close.py rename to tests/wpt/tests/webtransport/handlers/client-close.py diff --git a/tests/wpt/web-platform-tests/webtransport/handlers/custom-response.py b/tests/wpt/tests/webtransport/handlers/custom-response.py similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/handlers/custom-response.py rename to tests/wpt/tests/webtransport/handlers/custom-response.py diff --git a/tests/wpt/web-platform-tests/webtransport/handlers/echo-request-headers.py b/tests/wpt/tests/webtransport/handlers/echo-request-headers.py similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/handlers/echo-request-headers.py rename to tests/wpt/tests/webtransport/handlers/echo-request-headers.py diff --git a/tests/wpt/web-platform-tests/webtransport/handlers/echo.py b/tests/wpt/tests/webtransport/handlers/echo.py similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/handlers/echo.py rename to tests/wpt/tests/webtransport/handlers/echo.py diff --git a/tests/wpt/web-platform-tests/webtransport/handlers/echo_datagram_length.py b/tests/wpt/tests/webtransport/handlers/echo_datagram_length.py similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/handlers/echo_datagram_length.py rename to tests/wpt/tests/webtransport/handlers/echo_datagram_length.py diff --git a/tests/wpt/web-platform-tests/webtransport/handlers/query.py b/tests/wpt/tests/webtransport/handlers/query.py similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/handlers/query.py rename to tests/wpt/tests/webtransport/handlers/query.py diff --git a/tests/wpt/web-platform-tests/webtransport/handlers/server-close.py b/tests/wpt/tests/webtransport/handlers/server-close.py similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/handlers/server-close.py rename to tests/wpt/tests/webtransport/handlers/server-close.py diff --git a/tests/wpt/web-platform-tests/webtransport/handlers/server-connection-close.py b/tests/wpt/tests/webtransport/handlers/server-connection-close.py similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/handlers/server-connection-close.py rename to tests/wpt/tests/webtransport/handlers/server-connection-close.py diff --git a/tests/wpt/web-platform-tests/webtransport/idlharness.https.any.js b/tests/wpt/tests/webtransport/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/idlharness.https.any.js rename to tests/wpt/tests/webtransport/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/webtransport/in-removed-iframe.https.html b/tests/wpt/tests/webtransport/in-removed-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/in-removed-iframe.https.html rename to tests/wpt/tests/webtransport/in-removed-iframe.https.html diff --git a/tests/wpt/web-platform-tests/webtransport/resources/webtransport-test-helpers.sub.js b/tests/wpt/tests/webtransport/resources/webtransport-test-helpers.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/resources/webtransport-test-helpers.sub.js rename to tests/wpt/tests/webtransport/resources/webtransport-test-helpers.sub.js diff --git a/tests/wpt/web-platform-tests/webtransport/server-certificate-hashes.https.any.js b/tests/wpt/tests/webtransport/server-certificate-hashes.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/server-certificate-hashes.https.any.js rename to tests/wpt/tests/webtransport/server-certificate-hashes.https.any.js diff --git a/tests/wpt/web-platform-tests/webtransport/streams-close.https.any.js b/tests/wpt/tests/webtransport/streams-close.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/streams-close.https.any.js rename to tests/wpt/tests/webtransport/streams-close.https.any.js diff --git a/tests/wpt/web-platform-tests/webtransport/streams-echo.https.any.js b/tests/wpt/tests/webtransport/streams-echo.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webtransport/streams-echo.https.any.js rename to tests/wpt/tests/webtransport/streams-echo.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/META.yml b/tests/wpt/tests/webusb/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webusb/META.yml rename to tests/wpt/tests/webusb/META.yml diff --git a/tests/wpt/web-platform-tests/webusb/README.md b/tests/wpt/tests/webusb/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webusb/README.md rename to tests/wpt/tests/webusb/README.md diff --git a/tests/wpt/web-platform-tests/webusb/getDevices/reject_opaque_origin.https.html b/tests/wpt/tests/webusb/getDevices/reject_opaque_origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/getDevices/reject_opaque_origin.https.html rename to tests/wpt/tests/webusb/getDevices/reject_opaque_origin.https.html diff --git a/tests/wpt/web-platform-tests/webusb/getDevices/reject_opaque_origin.https.html.headers b/tests/wpt/tests/webusb/getDevices/reject_opaque_origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/webusb/getDevices/reject_opaque_origin.https.html.headers rename to tests/wpt/tests/webusb/getDevices/reject_opaque_origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/webusb/getDevices/sandboxed_iframe.https.window.js b/tests/wpt/tests/webusb/getDevices/sandboxed_iframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/getDevices/sandboxed_iframe.https.window.js rename to tests/wpt/tests/webusb/getDevices/sandboxed_iframe.https.window.js diff --git a/tests/wpt/web-platform-tests/webusb/idlharness.https.any.js b/tests/wpt/tests/webusb/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/idlharness.https.any.js rename to tests/wpt/tests/webusb/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/insecure-context.any.js b/tests/wpt/tests/webusb/insecure-context.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/insecure-context.any.js rename to tests/wpt/tests/webusb/insecure-context.any.js diff --git a/tests/wpt/web-platform-tests/webusb/protected-interface-classes.https.any.js b/tests/wpt/tests/webusb/protected-interface-classes.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/protected-interface-classes.https.any.js rename to tests/wpt/tests/webusb/protected-interface-classes.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/requestDevice/reject_opaque_origin.https.html b/tests/wpt/tests/webusb/requestDevice/reject_opaque_origin.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/requestDevice/reject_opaque_origin.https.html rename to tests/wpt/tests/webusb/requestDevice/reject_opaque_origin.https.html diff --git a/tests/wpt/web-platform-tests/webusb/requestDevice/reject_opaque_origin.https.html.headers b/tests/wpt/tests/webusb/requestDevice/reject_opaque_origin.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/webusb/requestDevice/reject_opaque_origin.https.html.headers rename to tests/wpt/tests/webusb/requestDevice/reject_opaque_origin.https.html.headers diff --git a/tests/wpt/web-platform-tests/webusb/requestDevice/sandboxed_iframe.https.window.js b/tests/wpt/tests/webusb/requestDevice/sandboxed_iframe.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/requestDevice/sandboxed_iframe.https.window.js rename to tests/wpt/tests/webusb/requestDevice/sandboxed_iframe.https.window.js diff --git a/tests/wpt/web-platform-tests/webusb/resources/fake-devices.js b/tests/wpt/tests/webusb/resources/fake-devices.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/resources/fake-devices.js rename to tests/wpt/tests/webusb/resources/fake-devices.js diff --git a/tests/wpt/web-platform-tests/webusb/resources/manual.js b/tests/wpt/tests/webusb/resources/manual.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/resources/manual.js rename to tests/wpt/tests/webusb/resources/manual.js diff --git a/tests/wpt/web-platform-tests/webusb/resources/open-in-iframe.html b/tests/wpt/tests/webusb/resources/open-in-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/resources/open-in-iframe.html rename to tests/wpt/tests/webusb/resources/open-in-iframe.html diff --git a/tests/wpt/web-platform-tests/webusb/resources/open-in-worker.js b/tests/wpt/tests/webusb/resources/open-in-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/resources/open-in-worker.js rename to tests/wpt/tests/webusb/resources/open-in-worker.js diff --git a/tests/wpt/web-platform-tests/webusb/resources/usb-allowed-by-permissions-policy-worker.js b/tests/wpt/tests/webusb/resources/usb-allowed-by-permissions-policy-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/resources/usb-allowed-by-permissions-policy-worker.js rename to tests/wpt/tests/webusb/resources/usb-allowed-by-permissions-policy-worker.js diff --git a/tests/wpt/web-platform-tests/webusb/resources/usb-disabled-by-permissions-policy-worker.js b/tests/wpt/tests/webusb/resources/usb-disabled-by-permissions-policy-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/resources/usb-disabled-by-permissions-policy-worker.js rename to tests/wpt/tests/webusb/resources/usb-disabled-by-permissions-policy-worker.js diff --git a/tests/wpt/web-platform-tests/webusb/resources/usb-helpers.js b/tests/wpt/tests/webusb/resources/usb-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/resources/usb-helpers.js rename to tests/wpt/tests/webusb/resources/usb-helpers.js diff --git a/tests/wpt/web-platform-tests/webusb/usb-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/tests/webusb/usb-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usb-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html rename to tests/wpt/tests/webusb/usb-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html diff --git a/tests/wpt/web-platform-tests/webusb/usb-allowed-by-permissions-policy-attribute.https.sub.html b/tests/wpt/tests/webusb/usb-allowed-by-permissions-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usb-allowed-by-permissions-policy-attribute.https.sub.html rename to tests/wpt/tests/webusb/usb-allowed-by-permissions-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/webusb/usb-allowed-by-permissions-policy.https.sub.html b/tests/wpt/tests/webusb/usb-allowed-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usb-allowed-by-permissions-policy.https.sub.html rename to tests/wpt/tests/webusb/usb-allowed-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/webusb/usb-allowed-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/webusb/usb-allowed-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usb-allowed-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/webusb/usb-allowed-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/webusb/usb-default-permissions-policy.https.sub.html b/tests/wpt/tests/webusb/usb-default-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usb-default-permissions-policy.https.sub.html rename to tests/wpt/tests/webusb/usb-default-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/webusb/usb-disabled-by-permissions-policy.https.sub.html b/tests/wpt/tests/webusb/usb-disabled-by-permissions-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usb-disabled-by-permissions-policy.https.sub.html rename to tests/wpt/tests/webusb/usb-disabled-by-permissions-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/webusb/usb-disabled-by-permissions-policy.https.sub.html.headers b/tests/wpt/tests/webusb/usb-disabled-by-permissions-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usb-disabled-by-permissions-policy.https.sub.html.headers rename to tests/wpt/tests/webusb/usb-disabled-by-permissions-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/webusb/usb-garbage-collection.https.window.js b/tests/wpt/tests/webusb/usb-garbage-collection.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usb-garbage-collection.https.window.js rename to tests/wpt/tests/webusb/usb-garbage-collection.https.window.js diff --git a/tests/wpt/web-platform-tests/webusb/usb-supported-by-permissions-policy.html b/tests/wpt/tests/webusb/usb-supported-by-permissions-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usb-supported-by-permissions-policy.html rename to tests/wpt/tests/webusb/usb-supported-by-permissions-policy.html diff --git a/tests/wpt/web-platform-tests/webusb/usb.https.any.js b/tests/wpt/tests/webusb/usb.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usb.https.any.js rename to tests/wpt/tests/webusb/usb.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/usb.https.window.js b/tests/wpt/tests/webusb/usb.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usb.https.window.js rename to tests/wpt/tests/webusb/usb.https.window.js diff --git a/tests/wpt/web-platform-tests/webusb/usb.serviceworker.https.html b/tests/wpt/tests/webusb/usb.serviceworker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usb.serviceworker.https.html rename to tests/wpt/tests/webusb/usb.serviceworker.https.html diff --git a/tests/wpt/web-platform-tests/webusb/usb.serviceworker.js b/tests/wpt/tests/webusb/usb.serviceworker.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usb.serviceworker.js rename to tests/wpt/tests/webusb/usb.serviceworker.js diff --git a/tests/wpt/web-platform-tests/webusb/usbAlternateInterface.https.any.js b/tests/wpt/tests/webusb/usbAlternateInterface.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbAlternateInterface.https.any.js rename to tests/wpt/tests/webusb/usbAlternateInterface.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/usbConfiguration.https.any.js b/tests/wpt/tests/webusb/usbConfiguration.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbConfiguration.https.any.js rename to tests/wpt/tests/webusb/usbConfiguration.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/usbConnectionEvent.https.any.js b/tests/wpt/tests/webusb/usbConnectionEvent.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbConnectionEvent.https.any.js rename to tests/wpt/tests/webusb/usbConnectionEvent.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/usbDevice-iframe.https.html b/tests/wpt/tests/webusb/usbDevice-iframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbDevice-iframe.https.html rename to tests/wpt/tests/webusb/usbDevice-iframe.https.html diff --git a/tests/wpt/web-platform-tests/webusb/usbDevice-same-objecct.https.any.js b/tests/wpt/tests/webusb/usbDevice-same-objecct.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbDevice-same-objecct.https.any.js rename to tests/wpt/tests/webusb/usbDevice-same-objecct.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/usbDevice-worker.https.html b/tests/wpt/tests/webusb/usbDevice-worker.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbDevice-worker.https.html rename to tests/wpt/tests/webusb/usbDevice-worker.https.html diff --git a/tests/wpt/web-platform-tests/webusb/usbDevice.https.any.js b/tests/wpt/tests/webusb/usbDevice.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbDevice.https.any.js rename to tests/wpt/tests/webusb/usbDevice.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/usbDevice_claimInterface-manual.https.html b/tests/wpt/tests/webusb/usbDevice_claimInterface-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbDevice_claimInterface-manual.https.html rename to tests/wpt/tests/webusb/usbDevice_claimInterface-manual.https.html diff --git a/tests/wpt/web-platform-tests/webusb/usbDevice_controlTransferIn-manual.https.html b/tests/wpt/tests/webusb/usbDevice_controlTransferIn-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbDevice_controlTransferIn-manual.https.html rename to tests/wpt/tests/webusb/usbDevice_controlTransferIn-manual.https.html diff --git a/tests/wpt/web-platform-tests/webusb/usbDevice_forget-manual.https.html b/tests/wpt/tests/webusb/usbDevice_forget-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbDevice_forget-manual.https.html rename to tests/wpt/tests/webusb/usbDevice_forget-manual.https.html diff --git a/tests/wpt/web-platform-tests/webusb/usbDevice_reset-manual.https.html b/tests/wpt/tests/webusb/usbDevice_reset-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbDevice_reset-manual.https.html rename to tests/wpt/tests/webusb/usbDevice_reset-manual.https.html diff --git a/tests/wpt/web-platform-tests/webusb/usbDevice_transferIn-manual.https.html b/tests/wpt/tests/webusb/usbDevice_transferIn-manual.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbDevice_transferIn-manual.https.html rename to tests/wpt/tests/webusb/usbDevice_transferIn-manual.https.html diff --git a/tests/wpt/web-platform-tests/webusb/usbEndpoint.https.any.js b/tests/wpt/tests/webusb/usbEndpoint.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbEndpoint.https.any.js rename to tests/wpt/tests/webusb/usbEndpoint.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/usbInTransferResult.https.any.js b/tests/wpt/tests/webusb/usbInTransferResult.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbInTransferResult.https.any.js rename to tests/wpt/tests/webusb/usbInTransferResult.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/usbInterface.https.any.js b/tests/wpt/tests/webusb/usbInterface.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbInterface.https.any.js rename to tests/wpt/tests/webusb/usbInterface.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/usbIsochronousInTransferPacket.https.any.js b/tests/wpt/tests/webusb/usbIsochronousInTransferPacket.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbIsochronousInTransferPacket.https.any.js rename to tests/wpt/tests/webusb/usbIsochronousInTransferPacket.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/usbIsochronousInTransferResult.https.any.js b/tests/wpt/tests/webusb/usbIsochronousInTransferResult.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbIsochronousInTransferResult.https.any.js rename to tests/wpt/tests/webusb/usbIsochronousInTransferResult.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/usbIsochronousOutTransferPacket.https.any.js b/tests/wpt/tests/webusb/usbIsochronousOutTransferPacket.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbIsochronousOutTransferPacket.https.any.js rename to tests/wpt/tests/webusb/usbIsochronousOutTransferPacket.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/usbIsochronousOutTransferResult.https.any.js b/tests/wpt/tests/webusb/usbIsochronousOutTransferResult.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbIsochronousOutTransferResult.https.any.js rename to tests/wpt/tests/webusb/usbIsochronousOutTransferResult.https.any.js diff --git a/tests/wpt/web-platform-tests/webusb/usbOutTransferResult.https.any.js b/tests/wpt/tests/webusb/usbOutTransferResult.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/webusb/usbOutTransferResult.https.any.js rename to tests/wpt/tests/webusb/usbOutTransferResult.https.any.js diff --git a/tests/wpt/web-platform-tests/webvr/META.yml b/tests/wpt/tests/webvr/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webvr/META.yml rename to tests/wpt/tests/webvr/META.yml diff --git a/tests/wpt/web-platform-tests/webvr/idlharness.https.html b/tests/wpt/tests/webvr/idlharness.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webvr/idlharness.https.html rename to tests/wpt/tests/webvr/idlharness.https.html diff --git a/tests/wpt/web-platform-tests/webvr/webvr-disabled-by-feature-policy.https.sub.html b/tests/wpt/tests/webvr/webvr-disabled-by-feature-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webvr/webvr-disabled-by-feature-policy.https.sub.html rename to tests/wpt/tests/webvr/webvr-disabled-by-feature-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/webvr/webvr-disabled-by-feature-policy.https.sub.html.headers b/tests/wpt/tests/webvr/webvr-disabled-by-feature-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/webvr/webvr-disabled-by-feature-policy.https.sub.html.headers rename to tests/wpt/tests/webvr/webvr-disabled-by-feature-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/webvr/webvr-enabled-by-feature-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/tests/webvr/webvr-enabled-by-feature-policy-attribute-redirect-on-load.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webvr/webvr-enabled-by-feature-policy-attribute-redirect-on-load.https.sub.html rename to tests/wpt/tests/webvr/webvr-enabled-by-feature-policy-attribute-redirect-on-load.https.sub.html diff --git a/tests/wpt/web-platform-tests/webvr/webvr-enabled-by-feature-policy-attribute.https.sub.html b/tests/wpt/tests/webvr/webvr-enabled-by-feature-policy-attribute.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webvr/webvr-enabled-by-feature-policy-attribute.https.sub.html rename to tests/wpt/tests/webvr/webvr-enabled-by-feature-policy-attribute.https.sub.html diff --git a/tests/wpt/web-platform-tests/webvr/webvr-enabled-by-feature-policy.https.sub.html b/tests/wpt/tests/webvr/webvr-enabled-by-feature-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webvr/webvr-enabled-by-feature-policy.https.sub.html rename to tests/wpt/tests/webvr/webvr-enabled-by-feature-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/webvr/webvr-enabled-by-feature-policy.https.sub.html.headers b/tests/wpt/tests/webvr/webvr-enabled-by-feature-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/webvr/webvr-enabled-by-feature-policy.https.sub.html.headers rename to tests/wpt/tests/webvr/webvr-enabled-by-feature-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/webvr/webvr-enabled-on-self-origin-by-feature-policy.https.sub.html b/tests/wpt/tests/webvr/webvr-enabled-on-self-origin-by-feature-policy.https.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webvr/webvr-enabled-on-self-origin-by-feature-policy.https.sub.html rename to tests/wpt/tests/webvr/webvr-enabled-on-self-origin-by-feature-policy.https.sub.html diff --git a/tests/wpt/web-platform-tests/webvr/webvr-enabled-on-self-origin-by-feature-policy.https.sub.html.headers b/tests/wpt/tests/webvr/webvr-enabled-on-self-origin-by-feature-policy.https.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/webvr/webvr-enabled-on-self-origin-by-feature-policy.https.sub.html.headers rename to tests/wpt/tests/webvr/webvr-enabled-on-self-origin-by-feature-policy.https.sub.html.headers diff --git a/tests/wpt/web-platform-tests/webvr/webvr-supported-by-feature-policy.html b/tests/wpt/tests/webvr/webvr-supported-by-feature-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/webvr/webvr-supported-by-feature-policy.html rename to tests/wpt/tests/webvr/webvr-supported-by-feature-policy.html diff --git a/tests/wpt/web-platform-tests/webvtt/META.yml b/tests/wpt/tests/webvtt/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/META.yml rename to tests/wpt/tests/webvtt/META.yml diff --git a/tests/wpt/web-platform-tests/webvtt/README.md b/tests/wpt/tests/webvtt/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/README.md rename to tests/wpt/tests/webvtt/README.md diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/align.html b/tests/wpt/tests/webvtt/api/VTTCue/align.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/align.html rename to tests/wpt/tests/webvtt/api/VTTCue/align.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/categories.json b/tests/wpt/tests/webvtt/api/VTTCue/categories.json similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/categories.json rename to tests/wpt/tests/webvtt/api/VTTCue/categories.json diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/common.js b/tests/wpt/tests/webvtt/api/VTTCue/common.js similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/common.js rename to tests/wpt/tests/webvtt/api/VTTCue/common.js diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/constructor-exceptions.html b/tests/wpt/tests/webvtt/api/VTTCue/constructor-exceptions.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/constructor-exceptions.html rename to tests/wpt/tests/webvtt/api/VTTCue/constructor-exceptions.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/constructor.html b/tests/wpt/tests/webvtt/api/VTTCue/constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/constructor.html rename to tests/wpt/tests/webvtt/api/VTTCue/constructor.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/getCueAsHTML.html b/tests/wpt/tests/webvtt/api/VTTCue/getCueAsHTML.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/getCueAsHTML.html rename to tests/wpt/tests/webvtt/api/VTTCue/getCueAsHTML.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/line.html b/tests/wpt/tests/webvtt/api/VTTCue/line.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/line.html rename to tests/wpt/tests/webvtt/api/VTTCue/line.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/lineAlign.html b/tests/wpt/tests/webvtt/api/VTTCue/lineAlign.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/lineAlign.html rename to tests/wpt/tests/webvtt/api/VTTCue/lineAlign.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/position.html b/tests/wpt/tests/webvtt/api/VTTCue/position.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/position.html rename to tests/wpt/tests/webvtt/api/VTTCue/position.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/positionAlign.html b/tests/wpt/tests/webvtt/api/VTTCue/positionAlign.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/positionAlign.html rename to tests/wpt/tests/webvtt/api/VTTCue/positionAlign.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/region.html b/tests/wpt/tests/webvtt/api/VTTCue/region.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/region.html rename to tests/wpt/tests/webvtt/api/VTTCue/region.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/size.html b/tests/wpt/tests/webvtt/api/VTTCue/size.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/size.html rename to tests/wpt/tests/webvtt/api/VTTCue/size.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/snapToLines.html b/tests/wpt/tests/webvtt/api/VTTCue/snapToLines.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/snapToLines.html rename to tests/wpt/tests/webvtt/api/VTTCue/snapToLines.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/text.html b/tests/wpt/tests/webvtt/api/VTTCue/text.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/text.html rename to tests/wpt/tests/webvtt/api/VTTCue/text.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTCue/vertical.html b/tests/wpt/tests/webvtt/api/VTTCue/vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTCue/vertical.html rename to tests/wpt/tests/webvtt/api/VTTCue/vertical.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTRegion/constructor.html b/tests/wpt/tests/webvtt/api/VTTRegion/constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTRegion/constructor.html rename to tests/wpt/tests/webvtt/api/VTTRegion/constructor.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTRegion/id.html b/tests/wpt/tests/webvtt/api/VTTRegion/id.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTRegion/id.html rename to tests/wpt/tests/webvtt/api/VTTRegion/id.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTRegion/lines.html b/tests/wpt/tests/webvtt/api/VTTRegion/lines.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTRegion/lines.html rename to tests/wpt/tests/webvtt/api/VTTRegion/lines.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTRegion/non-visible-cue-with-region.html b/tests/wpt/tests/webvtt/api/VTTRegion/non-visible-cue-with-region.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTRegion/non-visible-cue-with-region.html rename to tests/wpt/tests/webvtt/api/VTTRegion/non-visible-cue-with-region.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTRegion/regionAnchorX.html b/tests/wpt/tests/webvtt/api/VTTRegion/regionAnchorX.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTRegion/regionAnchorX.html rename to tests/wpt/tests/webvtt/api/VTTRegion/regionAnchorX.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTRegion/regionAnchorY.html b/tests/wpt/tests/webvtt/api/VTTRegion/regionAnchorY.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTRegion/regionAnchorY.html rename to tests/wpt/tests/webvtt/api/VTTRegion/regionAnchorY.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTRegion/scroll.html b/tests/wpt/tests/webvtt/api/VTTRegion/scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTRegion/scroll.html rename to tests/wpt/tests/webvtt/api/VTTRegion/scroll.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTRegion/viewportAnchorX.html b/tests/wpt/tests/webvtt/api/VTTRegion/viewportAnchorX.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTRegion/viewportAnchorX.html rename to tests/wpt/tests/webvtt/api/VTTRegion/viewportAnchorX.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTRegion/viewportAnchorY.html b/tests/wpt/tests/webvtt/api/VTTRegion/viewportAnchorY.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTRegion/viewportAnchorY.html rename to tests/wpt/tests/webvtt/api/VTTRegion/viewportAnchorY.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/VTTRegion/width.html b/tests/wpt/tests/webvtt/api/VTTRegion/width.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/VTTRegion/width.html rename to tests/wpt/tests/webvtt/api/VTTRegion/width.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/categories.json b/tests/wpt/tests/webvtt/api/categories.json similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/categories.json rename to tests/wpt/tests/webvtt/api/categories.json diff --git a/tests/wpt/web-platform-tests/webvtt/api/historical.html b/tests/wpt/tests/webvtt/api/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/historical.html rename to tests/wpt/tests/webvtt/api/historical.html diff --git a/tests/wpt/web-platform-tests/webvtt/api/idlharness.window.js b/tests/wpt/tests/webvtt/api/idlharness.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/api/idlharness.window.js rename to tests/wpt/tests/webvtt/api/idlharness.window.js diff --git a/tests/wpt/web-platform-tests/webvtt/categories.json b/tests/wpt/tests/webvtt/categories.json similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/categories.json rename to tests/wpt/tests/webvtt/categories.json diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/README.md b/tests/wpt/tests/webvtt/parsing/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/README.md rename to tests/wpt/tests/webvtt/parsing/README.md diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/categories.json b/tests/wpt/tests/webvtt/parsing/categories.json similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/categories.json rename to tests/wpt/tests/webvtt/parsing/categories.json diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/buildtests.py b/tests/wpt/tests/webvtt/parsing/cue-text-parsing/buildtests.py similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/buildtests.py rename to tests/wpt/tests/webvtt/parsing/cue-text-parsing/buildtests.py diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/common.js b/tests/wpt/tests/webvtt/parsing/cue-text-parsing/common.js similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/common.js rename to tests/wpt/tests/webvtt/parsing/cue-text-parsing/common.js diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/dat/entities.dat b/tests/wpt/tests/webvtt/parsing/cue-text-parsing/dat/entities.dat similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/dat/entities.dat rename to tests/wpt/tests/webvtt/parsing/cue-text-parsing/dat/entities.dat diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/dat/tags.dat b/tests/wpt/tests/webvtt/parsing/cue-text-parsing/dat/tags.dat similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/dat/tags.dat rename to tests/wpt/tests/webvtt/parsing/cue-text-parsing/dat/tags.dat diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/dat/text.dat b/tests/wpt/tests/webvtt/parsing/cue-text-parsing/dat/text.dat similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/dat/text.dat rename to tests/wpt/tests/webvtt/parsing/cue-text-parsing/dat/text.dat diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/dat/timestamps.dat b/tests/wpt/tests/webvtt/parsing/cue-text-parsing/dat/timestamps.dat similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/dat/timestamps.dat rename to tests/wpt/tests/webvtt/parsing/cue-text-parsing/dat/timestamps.dat diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/dat/tree-building.dat b/tests/wpt/tests/webvtt/parsing/cue-text-parsing/dat/tree-building.dat similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/dat/tree-building.dat rename to tests/wpt/tests/webvtt/parsing/cue-text-parsing/dat/tree-building.dat diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/tests/entities.html b/tests/wpt/tests/webvtt/parsing/cue-text-parsing/tests/entities.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/tests/entities.html rename to tests/wpt/tests/webvtt/parsing/cue-text-parsing/tests/entities.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/tests/tags.html b/tests/wpt/tests/webvtt/parsing/cue-text-parsing/tests/tags.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/tests/tags.html rename to tests/wpt/tests/webvtt/parsing/cue-text-parsing/tests/tags.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/tests/text.html b/tests/wpt/tests/webvtt/parsing/cue-text-parsing/tests/text.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/tests/text.html rename to tests/wpt/tests/webvtt/parsing/cue-text-parsing/tests/text.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/tests/timestamps.html b/tests/wpt/tests/webvtt/parsing/cue-text-parsing/tests/timestamps.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/tests/timestamps.html rename to tests/wpt/tests/webvtt/parsing/cue-text-parsing/tests/timestamps.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/tests/tree-building.html b/tests/wpt/tests/webvtt/parsing/cue-text-parsing/tests/tree-building.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/cue-text-parsing/tests/tree-building.html rename to tests/wpt/tests/webvtt/parsing/cue-text-parsing/tests/tree-building.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/README.md b/tests/wpt/tests/webvtt/parsing/file-parsing/README.md similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/README.md rename to tests/wpt/tests/webvtt/parsing/file-parsing/README.md diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/categories.json b/tests/wpt/tests/webvtt/parsing/file-parsing/categories.json similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/categories.json rename to tests/wpt/tests/webvtt/parsing/file-parsing/categories.json diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/signature-invalid.html b/tests/wpt/tests/webvtt/parsing/file-parsing/signature-invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/signature-invalid.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/signature-invalid.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/arrows.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/arrows.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/arrows.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/arrows.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/comment-in-cue-text.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/comment-in-cue-text.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/comment-in-cue-text.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/comment-in-cue-text.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/empty.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/support/empty.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/empty.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/empty.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/header-garbage.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/header-garbage.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/header-garbage.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/header-garbage.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/header-space.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/header-space.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/header-space.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/header-space.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/header-tab.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/header-tab.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/header-tab.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/header-tab.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/header-timings.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/header-timings.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/header-timings.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/header-timings.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/ids.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/ids.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/ids.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/ids.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/newlines.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/newlines.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/newlines.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/newlines.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/nulls.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/nulls.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/nulls.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/nulls.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/regions-id.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/regions-id.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/regions-id.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/regions-id.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/regions-lines.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/regions-lines.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/regions-lines.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/regions-lines.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/regions-old.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/regions-old.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/regions-old.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/regions-old.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/regions-regionanchor.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/regions-regionanchor.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/regions-regionanchor.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/regions-regionanchor.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/regions-scroll.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/regions-scroll.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/regions-scroll.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/regions-scroll.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/regions-viewportanchor.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/regions-viewportanchor.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/regions-viewportanchor.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/regions-viewportanchor.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/settings-align.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/settings-align.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/settings-align.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/settings-align.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/settings-line.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/settings-line.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/settings-line.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/settings-line.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/settings-multiple.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/settings-multiple.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/settings-multiple.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/settings-multiple.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/settings-position.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/settings-position.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/settings-position.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/settings-position.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/settings-region.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/settings-region.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/settings-region.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/settings-region.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/settings-size.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/settings-size.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/settings-size.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/settings-size.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/settings-vertical.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/settings-vertical.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/settings-vertical.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/settings-vertical.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-bom.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-bom.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-bom.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-bom.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-formfeed.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-formfeed.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-formfeed.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-formfeed.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-invalid-whitespace.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-invalid-whitespace.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-invalid-whitespace.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-invalid-whitespace.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-invalid.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-invalid.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-invalid.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-invalid.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-lowercase.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-lowercase.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-lowercase.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-lowercase.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-missing-whitespace.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-missing-whitespace.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-missing-whitespace.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-missing-whitespace.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-missing.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-missing.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-missing.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-missing.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-no-newline.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-no-newline.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-no-newline.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-no-newline.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-null.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-null.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-null.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-null.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-partial.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-partial.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-partial.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-partial.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-space-no-newline.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-space-no-newline.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-space-no-newline.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-space-no-newline.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-space.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-space.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-space.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-space.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-tab-no-newline.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-tab-no-newline.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-tab-no-newline.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-tab-no-newline.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-tab.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-tab.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-tab.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-tab.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-timings.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-timings.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-timings.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-timings.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-two-boms.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-two-boms.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-two-boms.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-two-boms.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-websrt.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-websrt.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/signature-websrt.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/signature-websrt.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/stylesheets.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/stylesheets.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/stylesheets.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/stylesheets.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/timings-60.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/timings-60.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/timings-60.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/timings-60.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/timings-eof.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/timings-eof.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/timings-eof.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/timings-eof.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/timings-garbage.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/timings-garbage.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/timings-garbage.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/timings-garbage.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/timings-negative.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/timings-negative.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/timings-negative.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/timings-negative.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/timings-omitted-hours.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/timings-omitted-hours.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/timings-omitted-hours.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/timings-omitted-hours.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/timings-too-long.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/timings-too-long.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/timings-too-long.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/timings-too-long.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/timings-too-short.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/timings-too-short.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/timings-too-short.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/timings-too-short.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/whitespace-chars.test b/tests/wpt/tests/webvtt/parsing/file-parsing/support/whitespace-chars.test similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/support/whitespace-chars.test rename to tests/wpt/tests/webvtt/parsing/file-parsing/support/whitespace-chars.test diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/arrows.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/arrows.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/arrows.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/arrows.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/categories.json b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/categories.json similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/categories.json rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/categories.json diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/comment-in-cue-text.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/comment-in-cue-text.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/comment-in-cue-text.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/comment-in-cue-text.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/header-garbage.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/header-garbage.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/header-garbage.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/header-garbage.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/header-regions.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/header-regions.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/header-regions.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/header-regions.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/header-space.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/header-space.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/header-space.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/header-space.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/header-tab.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/header-tab.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/header-tab.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/header-tab.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/header-timings.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/header-timings.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/header-timings.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/header-timings.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/ids.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/ids.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/ids.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/ids.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/newlines.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/newlines.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/newlines.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/newlines.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/nulls.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/nulls.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/nulls.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/nulls.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/regions-edge-case.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/regions-edge-case.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/regions-edge-case.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/regions-edge-case.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/regions-id.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/regions-id.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/regions-id.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/regions-id.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/regions-lines.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/regions-lines.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/regions-lines.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/regions-lines.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/regions-old.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/regions-old.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/regions-old.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/regions-old.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/regions-regionanchor.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/regions-regionanchor.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/regions-regionanchor.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/regions-regionanchor.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/regions-scroll.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/regions-scroll.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/regions-scroll.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/regions-scroll.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/regions-viewportanchor.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/regions-viewportanchor.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/regions-viewportanchor.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/regions-viewportanchor.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/settings-align.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/settings-align.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/settings-align.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/settings-align.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/settings-line.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/settings-line.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/settings-line.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/settings-line.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/settings-multiple.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/settings-multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/settings-multiple.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/settings-multiple.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/settings-position.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/settings-position.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/settings-position.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/settings-position.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/settings-region.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/settings-region.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/settings-region.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/settings-region.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/settings-size.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/settings-size.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/settings-size.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/settings-size.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/settings-vertical.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/settings-vertical.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/settings-vertical.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/settings-vertical.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/signature-bom.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/signature-bom.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/signature-bom.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/signature-bom.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/signature-no-newline.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/signature-no-newline.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/signature-no-newline.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/signature-no-newline.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/signature-space-no-newline.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/signature-space-no-newline.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/signature-space-no-newline.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/signature-space-no-newline.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/signature-space.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/signature-space.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/signature-space.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/signature-space.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/signature-tab-no-newline.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/signature-tab-no-newline.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/signature-tab-no-newline.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/signature-tab-no-newline.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/signature-tab.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/signature-tab.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/signature-tab.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/signature-tab.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/signature-timings.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/signature-timings.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/signature-timings.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/signature-timings.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/stylesheets.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/stylesheets.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/stylesheets.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/stylesheets.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/arrows.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/arrows.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/arrows.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/arrows.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/comment-in-cue-text.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/comment-in-cue-text.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/comment-in-cue-text.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/comment-in-cue-text.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/header-garbage.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/header-garbage.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/header-garbage.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/header-garbage.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/header-regions.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/header-regions.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/header-regions.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/header-regions.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/header-space.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/header-space.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/header-space.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/header-space.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/header-tab.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/header-tab.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/header-tab.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/header-tab.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/header-timings.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/header-timings.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/header-timings.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/header-timings.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/ids.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/ids.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/ids.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/ids.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/newlines.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/newlines.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/newlines.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/newlines.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/nulls.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/nulls.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/nulls.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/nulls.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/regions-edge-case.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/regions-edge-case.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/regions-edge-case.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/regions-edge-case.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/regions-id.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/regions-id.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/regions-id.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/regions-id.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/regions-lines.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/regions-lines.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/regions-lines.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/regions-lines.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/regions-old.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/regions-old.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/regions-old.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/regions-old.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/regions-regionanchor.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/regions-regionanchor.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/regions-regionanchor.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/regions-regionanchor.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/regions-scroll.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/regions-scroll.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/regions-scroll.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/regions-scroll.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/regions-viewportanchor.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/regions-viewportanchor.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/regions-viewportanchor.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/regions-viewportanchor.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/settings-align.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/settings-align.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/settings-align.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/settings-align.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/settings-line.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/settings-line.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/settings-line.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/settings-line.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/settings-multiple.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/settings-multiple.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/settings-multiple.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/settings-multiple.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/settings-position.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/settings-position.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/settings-position.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/settings-position.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/settings-region.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/settings-region.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/settings-region.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/settings-region.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/settings-size.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/settings-size.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/settings-size.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/settings-size.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/settings-vertical.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/settings-vertical.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/settings-vertical.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/settings-vertical.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/signature-bom.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/signature-bom.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/signature-bom.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/signature-bom.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/signature-no-newline.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/signature-no-newline.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/signature-no-newline.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/signature-no-newline.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/signature-space-no-newline.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/signature-space-no-newline.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/signature-space-no-newline.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/signature-space-no-newline.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/signature-space.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/signature-space.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/signature-space.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/signature-space.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/signature-tab-no-newline.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/signature-tab-no-newline.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/signature-tab-no-newline.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/signature-tab-no-newline.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/signature-tab.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/signature-tab.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/signature-tab.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/signature-tab.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/signature-timings.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/signature-timings.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/signature-timings.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/signature-timings.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/stylesheets.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/stylesheets.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/stylesheets.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/stylesheets.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/timings-60.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/timings-60.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/timings-60.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/timings-60.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/timings-eof.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/timings-eof.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/timings-eof.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/timings-eof.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/timings-garbage.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/timings-garbage.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/timings-garbage.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/timings-garbage.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/timings-negative.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/timings-negative.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/timings-negative.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/timings-negative.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/timings-omitted-hours.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/timings-omitted-hours.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/timings-omitted-hours.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/timings-omitted-hours.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/timings-too-long.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/timings-too-long.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/timings-too-long.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/timings-too-long.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/timings-too-short.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/timings-too-short.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/timings-too-short.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/timings-too-short.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/whitespace-chars.vtt b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/whitespace-chars.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/support/whitespace-chars.vtt rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/support/whitespace-chars.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/timings-60.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/timings-60.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/timings-60.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/timings-60.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/timings-eof.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/timings-eof.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/timings-eof.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/timings-eof.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/timings-garbage.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/timings-garbage.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/timings-garbage.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/timings-garbage.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/timings-negative.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/timings-negative.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/timings-negative.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/timings-negative.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/timings-omitted-hours.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/timings-omitted-hours.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/timings-omitted-hours.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/timings-omitted-hours.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/timings-too-long.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/timings-too-long.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/timings-too-long.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/timings-too-long.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/timings-too-short.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/timings-too-short.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/timings-too-short.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/timings-too-short.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/whitespace-chars.html b/tests/wpt/tests/webvtt/parsing/file-parsing/tests/whitespace-chars.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tests/whitespace-chars.html rename to tests/wpt/tests/webvtt/parsing/file-parsing/tests/whitespace-chars.html diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tools/build.py b/tests/wpt/tests/webvtt/parsing/file-parsing/tools/build.py similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tools/build.py rename to tests/wpt/tests/webvtt/parsing/file-parsing/tools/build.py diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tools/parser.py b/tests/wpt/tests/webvtt/parsing/file-parsing/tools/parser.py similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tools/parser.py rename to tests/wpt/tests/webvtt/parsing/file-parsing/tools/parser.py diff --git a/tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tools/spec_report.py b/tests/wpt/tests/webvtt/parsing/file-parsing/tools/spec_report.py similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/parsing/file-parsing/tools/spec_report.py rename to tests/wpt/tests/webvtt/parsing/file-parsing/tools/spec_report.py diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_up-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_up-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_up-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_up-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_up.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_up.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_up.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_up.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_tracks.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_tracks.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_tracks.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/2_tracks.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/3_tracks.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/3_tracks.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/3_tracks.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/3_tracks.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_50-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_50-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_50-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_50-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_50.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_50.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_50.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_50.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50_size_gt_maximum_size-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50_size_gt_maximum_size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50_size_gt_maximum_size-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50_size_gt_maximum_size-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50_size_gt_maximum_size.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50_size_gt_maximum_size.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50_size_gt_maximum_size.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_gt_50_size_gt_maximum_size.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50_size_gt_maximum_size-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50_size_gt_maximum_size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50_size_gt_maximum_size-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50_size_gt_maximum_size-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50_size_gt_maximum_size.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50_size_gt_maximum_size.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50_size_gt_maximum_size.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_position_lt_50_size_gt_maximum_size.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_center_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_center_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_end-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_end-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_end-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_end-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_end.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_end.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_end.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_end.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_end_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_end_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_end_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_end_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_end_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_end_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_end_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_end_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_start-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_start-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_start-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_start-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_start.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_start.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_start.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_start.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_start_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_start_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_start_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_start_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_start_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_start_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/align_start_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/align_start_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/background.png b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/background.png similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/background.png rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/background.png diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/basic-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/basic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/basic-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/basic-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/basic.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/basic.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/basic.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/start_alignment-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/start_alignment-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/start_alignment-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/start_alignment-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/start_alignment.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/start_alignment.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/start_alignment.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/start_alignment.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_LF_u05D0-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_LF_u05D0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_LF_u05D0-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_LF_u05D0-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_LF_u05D0.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_LF_u05D0.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_LF_u05D0.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_LF_u05D0.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2028_u05D0-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2028_u05D0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2028_u05D0-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2028_u05D0-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2028_u05D0.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2028_u05D0.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2028_u05D0.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2028_u05D0.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2029_u05D0-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2029_u05D0-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2029_u05D0-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2029_u05D0-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2029_u05D0.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2029_u05D0.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2029_u05D0.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2029_u05D0.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_lr-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_lr-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_lr-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_lr-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_lr.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_lr.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_lr.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_lr.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_rl-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_rl-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_rl-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_rl-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_rl.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_rl.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_rl.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/bidi/vertical_rl.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/cue_too_long-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/cue_too_long-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/cue_too_long-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/cue_too_long-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/cue_too_long.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/cue_too_long.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/cue_too_long.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/cue_too_long.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/decode_escaped_entities-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/decode_escaped_entities-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/decode_escaped_entities-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/decode_escaped_entities-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/decode_escaped_entities.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/decode_escaped_entities.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/decode_escaped_entities.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/decode_escaped_entities.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text_while_paused-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text_while_paused-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text_while_paused-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text_while_paused-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text_while_paused.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text_while_paused.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text_while_paused.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text_while_paused.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_cascade_priority-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_cascade_priority-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_cascade_priority-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_cascade_priority-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_cascade_priority.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_cascade_priority.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_cascade_priority.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_cascade_priority.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_cascade_priority_layer.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_cascade_priority_layer.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_cascade_priority_layer.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_cascade_priority_layer.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_imports_blocked-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_imports_blocked-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_imports_blocked-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_imports_blocked-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_imports_blocked.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_imports_blocked.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_imports_blocked.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_imports_blocked.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_invalid_format-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_invalid_format-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_invalid_format-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_invalid_format-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_invalid_format.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_invalid_format.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_invalid_format.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_invalid_format.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries_resized-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries_resized-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries_resized-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries_resized-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries_resized.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries_resized.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries_resized.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_media_queries_resized.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_multiple_tracks-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_multiple_tracks-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_multiple_tracks-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_multiple_tracks-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_multiple_tracks.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_multiple_tracks.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_multiple_tracks.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_multiple_tracks.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_selectors-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_selectors-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_selectors-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_selectors-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_selectors.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_selectors.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_selectors.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_selectors.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_urls-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_urls-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_urls-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_urls-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_urls.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_urls.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_urls.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/embedded_style_urls.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/enable_controls_reposition-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/enable_controls_reposition-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/enable_controls_reposition-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/enable_controls_reposition-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/enable_controls_reposition.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/enable_controls_reposition.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/enable_controls_reposition.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/enable_controls_reposition.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely_all_cues_have_same_timestamp-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely_all_cues_have_same_timestamp-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely_all_cues_have_same_timestamp-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely_all_cues_have_same_timestamp-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely_all_cues_have_same_timestamp.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely_all_cues_have_same_timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely_all_cues_have_same_timestamp.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely_all_cues_have_same_timestamp.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/media_404_omit_subtitles-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/media_404_omit_subtitles-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/media_404_omit_subtitles-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/media_404_omit_subtitles-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/media_404_omit_subtitles.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/media_404_omit_subtitles.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/media_404_omit_subtitles.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/media_404_omit_subtitles.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/media_height_19-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/media_height_19-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/media_height_19-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/media_height_19-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/media_height_19.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/media_height_19.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/media_height_19.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/media_height_19.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/non-standard-pseudo-elements-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/non-standard-pseudo-elements-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/non-standard-pseudo-elements-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/non-standard-pseudo-elements-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/non-standard-pseudo-elements.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/non-standard-pseudo-elements.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/non-standard-pseudo-elements.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/non-standard-pseudo-elements.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/single_quote-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/single_quote-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/single_quote-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/single_quote-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/single_quote.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/single_quote.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/single_quote.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/single_quote.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/size_90-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/size_90-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/size_90-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/size_90-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/size_90.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/size_90.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/size_90.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/size_90.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/size_99-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/size_99-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/size_99-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/size_99-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/size_99.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/size_99.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/size_99.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/size_99.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/support/9_cues_overlapping_completely.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/support/9_cues_overlapping_completely.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/support/9_cues_overlapping_completely.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/support/9_cues_overlapping_completely.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/support/9_cues_overlapping_completely_all_cues_have_same_timestamp.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/support/9_cues_overlapping_completely_all_cues_have_same_timestamp.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/support/9_cues_overlapping_completely_all_cues_have_same_timestamp.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/support/9_cues_overlapping_completely_all_cues_have_same_timestamp.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/support/single_quote.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/support/single_quote.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/support/single_quote.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/support/single_quote.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/support/size_90.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/support/size_90.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/support/size_90.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/support/size_90.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/support/size_99.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/support/size_99.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/support/size_99.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/support/size_99.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/support/test.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/support/test.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/evil/support/test.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/evil/support/test.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_-2_wrapped_cue_grow_upwards-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_-2_wrapped_cue_grow_upwards-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_-2_wrapped_cue_grow_upwards-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_-2_wrapped_cue_grow_upwards-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_-2_wrapped_cue_grow_upwards.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_-2_wrapped_cue_grow_upwards.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_-2_wrapped_cue_grow_upwards.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_-2_wrapped_cue_grow_upwards.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_0_is_top-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_0_is_top-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_0_is_top-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_0_is_top-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_0_is_top.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_0_is_top.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_0_is_top.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_0_is_top.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_1_wrapped_cue_grow_downwards-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_1_wrapped_cue_grow_downwards-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_1_wrapped_cue_grow_downwards-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_1_wrapped_cue_grow_downwards-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_1_wrapped_cue_grow_downwards.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_1_wrapped_cue_grow_downwards.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_1_wrapped_cue_grow_downwards.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_1_wrapped_cue_grow_downwards.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_50_percent-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_50_percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_50_percent-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_50_percent-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_50_percent.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_50_percent.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_50_percent.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_50_percent.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap_move_up-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap_move_up-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap_move_up-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap_move_up-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap_move_up.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap_move_up.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap_move_up.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap_move_up.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap_move_up-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap_move_up-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap_move_up-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap_move_up-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap_move_up.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap_move_up.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap_move_up.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap_move_up.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/media/background.gif b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/media/background.gif similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/media/background.gif rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/media/background.gif diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/media_height400_with_controls-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/media_height400_with_controls-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/media_height400_with_controls-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/media_height400_with_controls-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/media_height400_with_controls.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/media_height400_with_controls.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/media_height400_with_controls.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/media_height400_with_controls.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/media_with_controls-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/media_with_controls-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/media_with_controls-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/media_with_controls-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/media_with_controls.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/media_with_controls.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/media_with_controls.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/media_with_controls.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-1.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-1.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-1.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-1.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-ref-1.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-ref-1.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-ref-1.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-ref-1.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/one_line_cue_plus_wrapped_cue-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/one_line_cue_plus_wrapped_cue-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/one_line_cue_plus_wrapped_cue-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/one_line_cue_plus_wrapped_cue-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/one_line_cue_plus_wrapped_cue.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/one_line_cue_plus_wrapped_cue.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/one_line_cue_plus_wrapped_cue.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/one_line_cue_plus_wrapped_cue.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/basic-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/basic-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/basic-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/basic-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/basic.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/basic.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/basic.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/basic.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_x_50_percent-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_x_50_percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_x_50_percent-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_x_50_percent-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_x_50_percent.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_x_50_percent.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_x_50_percent.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_x_50_percent.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_y_50_percent-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_y_50_percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_y_50_percent-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_y_50_percent-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_y_50_percent.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_y_50_percent.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_y_50_percent.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/regionanchor_y_50_percent.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/scroll_up-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/scroll_up-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/scroll_up-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/scroll_up-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/scroll_up.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/scroll_up.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/scroll_up.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/scroll_up.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/single_line_top_left-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/single_line_top_left-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/single_line_top_left-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/single_line_top_left-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/single_line_top_left.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/single_line_top_left.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/single_line_top_left.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/single_line_top_left.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/basic.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/basic.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/basic.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/basic.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/regionanchor_x_50_percent.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/regionanchor_x_50_percent.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/regionanchor_x_50_percent.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/regionanchor_x_50_percent.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/regionanchor_y_50_percent.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/regionanchor_y_50_percent.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/regionanchor_y_50_percent.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/regionanchor_y_50_percent.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/scroll_up.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/scroll_up.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/scroll_up.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/scroll_up.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/single_line_top_left.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/single_line_top_left.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/single_line_top_left.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/single_line_top_left.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/viewportanchor_x_50_percent.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/viewportanchor_x_50_percent.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/viewportanchor_x_50_percent.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/viewportanchor_x_50_percent.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/viewportanchor_y_50_percent.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/viewportanchor_y_50_percent.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/viewportanchor_y_50_percent.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/viewportanchor_y_50_percent.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/width_50_percent.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/width_50_percent.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/width_50_percent.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/width_50_percent.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_x_50_percent-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_x_50_percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_x_50_percent-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_x_50_percent-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_x_50_percent.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_x_50_percent.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_x_50_percent.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_x_50_percent.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_y_50_percent-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_y_50_percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_y_50_percent-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_y_50_percent-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_y_50_percent.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_y_50_percent.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_y_50_percent.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/viewportanchor_y_50_percent.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/width_50_percent-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/width_50_percent-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/width_50_percent-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/width_50_percent-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/width_50_percent.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/width_50_percent.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/width_50_percent.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/regions/width_50_percent.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/repaint-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/repaint-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/repaint-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/repaint-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/repaint.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/repaint.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/repaint.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/repaint.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region/font_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region/font_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region/font_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region/font_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region/font_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region/font_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region/font_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region/font_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region/support/test.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region/support/test.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region/support/test.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region/support/test.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region_function/font_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region_function/font_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region_function/font_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region_function/font_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region_function/font_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region_function/font_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region_function/font_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region_function/font_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region_function/support/test.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region_function/support/test.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region_function/support/test.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue-region_function/support/test.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline_underline_line-through-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline_underline_line-through-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline_underline_line-through-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline_underline_line-through-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline_underline_line-through.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline_underline_line-through.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline_underline_line-through.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline_underline_line-through.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_underline-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_underline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_underline-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_underline-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_underline.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_underline.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_underline.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_underline.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-shadow-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-shadow-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-shadow-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-shadow.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-shadow.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-shadow.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_ruby-position-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_ruby-position-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_ruby-position-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_ruby-position-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_ruby-position.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_ruby-position.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_ruby-position.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_ruby-position.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_text-combine-upright-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_text-combine-upright-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_text-combine-upright-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_text-combine-upright-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_text-combine-upright.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_text-combine-upright.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_text-combine-upright.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/vertical_text-combine-upright.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_nowrap_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_nowrap_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_nowrap_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_nowrap_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_nowrap_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_nowrap_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_nowrap_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_nowrap_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_namespace-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_namespace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_namespace-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_namespace-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_namespace.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_namespace.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_namespace.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_nowrap-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_nowrap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_nowrap-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_nowrap-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_nowrap.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_nowrap.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_nowrap.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_nowrap.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-wrap_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-wrap_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-wrap_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-wrap_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-wrap_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-wrap_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-wrap_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-wrap_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_vertical_text-combine-upright-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_vertical_text-combine-upright-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_vertical_text-combine-upright-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_vertical_text-combine-upright-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_vertical_text-combine-upright.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_vertical_text-combine-upright.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_vertical_text-combine-upright.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_vertical_text-combine-upright.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_nowrap-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_nowrap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_nowrap-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_nowrap-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_nowrap.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_nowrap.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_nowrap.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_nowrap.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-wrap_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-wrap_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-wrap_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-wrap_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-wrap_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-wrap_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-wrap_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-wrap_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/cue_func_selector_single_colon-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/cue_func_selector_single_colon-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/cue_func_selector_single_colon-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/cue_func_selector_single_colon-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/cue_func_selector_single_colon.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/cue_func_selector_single_colon.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/cue_func_selector_single_colon.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/cue_func_selector_single_colon.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/inherit_values_from_media_element-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/inherit_values_from_media_element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/inherit_values_from_media_element-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/inherit_values_from_media_element-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/inherit_values_from_media_element.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/inherit_values_from_media_element.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/inherit_values_from_media_element.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/inherit_values_from_media_element.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_namespace-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_namespace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_namespace-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_namespace-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_namespace.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_namespace.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_namespace.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_nowrap-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_nowrap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_nowrap-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_nowrap-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_nowrap.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_nowrap.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_nowrap.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_nowrap.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-wrap_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-wrap_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-wrap_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-wrap_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-wrap_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-wrap_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-wrap_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-wrap_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_allowed_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_allowed_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_allowed_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_allowed_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_allowed_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_allowed_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_allowed_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_allowed_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/type_selector_root-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/type_selector_root-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/type_selector_root-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/type_selector_root-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/type_selector_root.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/type_selector_root.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/type_selector_root.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/type_selector_root.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_namespace-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_namespace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_namespace-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_namespace-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_namespace.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_namespace.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_namespace.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_nowrap-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_nowrap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_nowrap-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_nowrap-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_nowrap.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_nowrap.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_nowrap.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_nowrap.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-wrap_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-wrap_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-wrap_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-wrap_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-wrap_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-wrap_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-wrap_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-wrap_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_nowrap-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_nowrap-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_nowrap-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_nowrap-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_nowrap.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_nowrap.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_nowrap.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_nowrap.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-wrap_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-wrap_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-wrap_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-wrap_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-wrap_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-wrap_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-wrap_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-wrap_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/underline_object_default_font-style-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/underline_object_default_font-style-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/underline_object_default_font-style-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/underline_object_default_font-style-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/underline_object_default_font-style.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/underline_object_default_font-style.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/underline_object_default_font-style.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/underline_object_default_font-style.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/size_50-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/size_50-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/size_50-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/size_50-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/size_50.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/size_50.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/size_50.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/size_50.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/snap-to-line-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/snap-to-line-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/snap-to-line-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/snap-to-line-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/snap-to-line.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/snap-to-line.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/snap-to-line.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/snap-to-line.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_completely_move_up.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_completely_move_up.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_completely_move_up.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_completely_move_up.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_partially_move_down.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_partially_move_down.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_partially_move_down.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_partially_move_down.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_partially_move_up.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_partially_move_up.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_partially_move_up.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_partially_move_up.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_center.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_center.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_center.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_center.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_long.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_long.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_long.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_long.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_50.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_50.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_50.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_50.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_gt_50.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_gt_50.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_gt_50.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_gt_50.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_gt_50_size_gt_maximum_size.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_gt_50_size_gt_maximum_size.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_gt_50_size_gt_maximum_size.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_gt_50_size_gt_maximum_size.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_lt_50.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_lt_50.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_lt_50.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_lt_50.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_lt_50_size_gt_maximum_size.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_lt_50_size_gt_maximum_size.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_lt_50_size_gt_maximum_size.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_center_position_lt_50_size_gt_maximum_size.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_end.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_end.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_end.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_end.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_end_long.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_end_long.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_end_long.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_end_long.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_start.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_start.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_start.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_start.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_start_long.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_start_long.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/align_start_long.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/align_start_long.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_ruby.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_ruby.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_ruby.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_ruby.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_text-combine-upright.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_text-combine-upright.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_text-combine-upright.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_text-combine-upright.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_vertical_lr.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_vertical_lr.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_vertical_lr.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_vertical_lr.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_vertical_rl-oneline.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_vertical_rl-oneline.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_vertical_rl-oneline.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_vertical_rl-oneline.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_vertical_rl.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_vertical_rl.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_vertical_rl.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bidi_vertical_rl.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bold_long.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bold_long.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bold_long.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bold_long.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bold_with_2_timestamps.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bold_with_2_timestamps.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bold_with_2_timestamps.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bold_with_2_timestamps.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bold_with_timestamp.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bold_with_timestamp.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/bold_with_timestamp.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/bold_with_timestamp.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/class_long.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/class_long.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/class_long.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/class_long.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/class_text-combine-upright.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/class_text-combine-upright.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/class_text-combine-upright.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/class_text-combine-upright.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/class_with_2_timestamps.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/class_with_2_timestamps.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/class_with_2_timestamps.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/class_with_2_timestamps.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/class_with_timestamp.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/class_with_timestamp.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/class_with_timestamp.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/class_with_timestamp.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/cue_with_id.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/cue_with_id.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/cue_with_id.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/cue_with_id.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/decode_escaped_entities.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/decode_escaped_entities.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/decode_escaped_entities.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/decode_escaped_entities.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_cascade_priority.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_cascade_priority.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_cascade_priority.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_cascade_priority.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_cascade_priority_layer.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_cascade_priority_layer.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_cascade_priority_layer.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_cascade_priority_layer.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_imports_blocked.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_imports_blocked.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_imports_blocked.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_imports_blocked.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_invalid_format.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_invalid_format.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_invalid_format.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_invalid_format.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries-iframe-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries-iframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries-iframe-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries-iframe-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries-iframe.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries-iframe.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries-iframe.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries_resized-iframe-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries_resized-iframe-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries_resized-iframe-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries_resized-iframe-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries_resized-iframe.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries_resized-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries_resized-iframe.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_media_queries_resized-iframe.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_multiple_tracks1.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_multiple_tracks1.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_multiple_tracks1.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_multiple_tracks1.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_multiple_tracks2.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_multiple_tracks2.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_multiple_tracks2.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_multiple_tracks2.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_selectors.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_selectors.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_selectors.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_selectors.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_urls.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_urls.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_urls.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_urls.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_without_style.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_without_style.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_without_style.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/embedded_style_without_style.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/foo.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/foo.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/foo.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/foo.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/foo_c_bar.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/foo_c_bar.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/foo_c_bar.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/foo_c_bar.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/foo_space_space_bar_LF_baz.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/foo_space_space_bar_LF_baz.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/foo_space_space_bar_LF_baz.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/foo_space_space_bar_LF_baz.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/imported_style.css b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/imported_style.css similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/imported_style.css rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/imported_style.css diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/italic_long.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/italic_long.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/italic_long.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/italic_long.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/italic_with_2_timestamps.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/italic_with_2_timestamps.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/italic_with_2_timestamps.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/italic_with_2_timestamps.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/italic_with_timestamp.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/italic_with_timestamp.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/italic_with_timestamp.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/italic_with_timestamp.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_-2_long.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_-2_long.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_-2_long.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_-2_long.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_0.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_0.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_0.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_0.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_1_long.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_1_long.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_1_long.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_1_long.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_50_percent.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_50_percent.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_50_percent.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_50_percent.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_integer_and_percent_overlap.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_integer_and_percent_overlap.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_integer_and_percent_overlap.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_integer_and_percent_overlap.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_integer_and_percent_overlap_move_up.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_integer_and_percent_overlap_move_up.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_integer_and_percent_overlap_move_up.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_integer_and_percent_overlap_move_up.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_percent_and_integer_overlap.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_percent_and_integer_overlap.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_percent_and_integer_overlap.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_percent_and_integer_overlap.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_percent_and_integer_overlap_move_up.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_percent_and_integer_overlap_move_up.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/line_percent_and_integer_overlap_move_up.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/line_percent_and_integer_overlap_move_up.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/one_line_cue_plus_wrapped_cue.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/one_line_cue_plus_wrapped_cue.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/one_line_cue_plus_wrapped_cue.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/one_line_cue_plus_wrapped_cue.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/size_50.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/size_50.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/size_50.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/size_50.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/snap-to-line.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/snap-to-line.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/snap-to-line.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/snap-to-line.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/start_alignment.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/start_alignment.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/start_alignment.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/start_alignment.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_bold.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_bold.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_bold.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_bold.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_bold_with_class.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_bold_with_class.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_bold_with_class.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_bold_with_class.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_class.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_class.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_class.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_class.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_class_with_class.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_class_with_class.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_class_with_class.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_class_with_class.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_italic.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_italic.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_italic.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_italic.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_italic_with_class.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_italic_with_class.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_italic_with_class.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_italic_with_class.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_long.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_long.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_long.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_long.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_two_voices.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_two_voices.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_two_voices.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_two_voices.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_underline.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_underline.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_underline.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_underline.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_underline_with_class.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_underline_with_class.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_underline_with_class.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_underline_with_class.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_voice.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_voice.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_voice.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_voice.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_voice_with_class.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_voice_with_class.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/test_voice_with_class.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/test_voice_with_class.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/too_many_cues.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/too_many_cues.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/too_many_cues.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/too_many_cues.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/too_many_cues_wrapped.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/too_many_cues_wrapped.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/too_many_cues_wrapped.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/too_many_cues_wrapped.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/u002E_LF_u05D0.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/u002E_LF_u05D0.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/u002E_LF_u05D0.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/u002E_LF_u05D0.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/u002E_u2028_u05D0.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/u002E_u2028_u05D0.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/u002E_u2028_u05D0.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/u002E_u2028_u05D0.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/u002E_u2029_u05D0.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/u002E_u2029_u05D0.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/u002E_u2029_u05D0.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/u002E_u2029_u05D0.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/u0041_first.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/u0041_first.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/u0041_first.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/u0041_first.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/u05D0_first.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/u05D0_first.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/u05D0_first.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/u05D0_first.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/u0628_first.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/u0628_first.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/u0628_first.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/u0628_first.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/u06E9_no_strong_dir.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/u06E9_no_strong_dir.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/u06E9_no_strong_dir.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/u06E9_no_strong_dir.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/underline_long.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/underline_long.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/underline_long.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/underline_long.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/underline_with_2_timestamps.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/underline_with_2_timestamps.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/underline_with_2_timestamps.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/underline_with_2_timestamps.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/underline_with_timestamp.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/underline_with_timestamp.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/underline_with_timestamp.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/underline_with_timestamp.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/very_long_cue.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/very_long_cue.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/very_long_cue.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/very_long_cue.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/voice_long.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/voice_long.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/voice_long.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/voice_long.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/voice_with_2_timestamps.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/voice_with_2_timestamps.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/voice_with_2_timestamps.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/voice_with_2_timestamps.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/voice_with_timestamp.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/voice_with_timestamp.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/voice_with_timestamp.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/voice_with_timestamp.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/white-spaces.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/white-spaces.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/white-spaces.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/white-spaces.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/white-spaces_long.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/white-spaces_long.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/white-spaces_long.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/white-spaces_long.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/white-spaces_long_size_20.vtt b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/white-spaces_long_size_20.vtt similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/support/white-spaces_long_size_20.vtt rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/support/white-spaces_long_size_20.vtt diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped-ref.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped-ref.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped-ref.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped-ref.html diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped.html b/tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped.html similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped.html rename to tests/wpt/tests/webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped.html diff --git a/tests/wpt/web-platform-tests/webvtt/tools/categorize_results.py b/tests/wpt/tests/webvtt/tools/categorize_results.py similarity index 100% rename from tests/wpt/web-platform-tests/webvtt/tools/categorize_results.py rename to tests/wpt/tests/webvtt/tools/categorize_results.py diff --git a/tests/wpt/web-platform-tests/webxr/META.yml b/tests/wpt/tests/webxr/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webxr/META.yml rename to tests/wpt/tests/webxr/META.yml diff --git a/tests/wpt/web-platform-tests/webxr/anchors/META.yml b/tests/wpt/tests/webxr/anchors/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webxr/anchors/META.yml rename to tests/wpt/tests/webxr/anchors/META.yml diff --git a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_create_move.https.html b/tests/wpt/tests/webxr/anchors/ar_anchor_freefloating_create_move.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_create_move.https.html rename to tests/wpt/tests/webxr/anchors/ar_anchor_freefloating_create_move.https.html diff --git a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html b/tests/wpt/tests/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html rename to tests/wpt/tests/webxr/anchors/ar_anchor_freefloating_delay_creation.https.html diff --git a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_failure.https.html b/tests/wpt/tests/webxr/anchors/ar_anchor_freefloating_failure.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_failure.https.html rename to tests/wpt/tests/webxr/anchors/ar_anchor_freefloating_failure.https.html diff --git a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html b/tests/wpt/tests/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html rename to tests/wpt/tests/webxr/anchors/ar_anchor_freefloating_pause_resume_stop.https.html diff --git a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_getAnchors.https.html b/tests/wpt/tests/webxr/anchors/ar_anchor_getAnchors.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_getAnchors.https.html rename to tests/wpt/tests/webxr/anchors/ar_anchor_getAnchors.https.html diff --git a/tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_states.https.html b/tests/wpt/tests/webxr/anchors/ar_anchor_states.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/anchors/ar_anchor_states.https.html rename to tests/wpt/tests/webxr/anchors/ar_anchor_states.https.html diff --git a/tests/wpt/web-platform-tests/webxr/anchors/idlharness.https.window.js b/tests/wpt/tests/webxr/anchors/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/anchors/idlharness.https.window.js rename to tests/wpt/tests/webxr/anchors/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/webxr/ar-module/META.yml b/tests/wpt/tests/webxr/ar-module/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webxr/ar-module/META.yml rename to tests/wpt/tests/webxr/ar-module/META.yml diff --git a/tests/wpt/web-platform-tests/webxr/ar-module/idlharness.https.window.js b/tests/wpt/tests/webxr/ar-module/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/ar-module/idlharness.https.window.js rename to tests/wpt/tests/webxr/ar-module/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/webxr/ar-module/xrDevice_isSessionSupported_immersive-ar.https.html b/tests/wpt/tests/webxr/ar-module/xrDevice_isSessionSupported_immersive-ar.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/ar-module/xrDevice_isSessionSupported_immersive-ar.https.html rename to tests/wpt/tests/webxr/ar-module/xrDevice_isSessionSupported_immersive-ar.https.html diff --git a/tests/wpt/web-platform-tests/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html b/tests/wpt/tests/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html rename to tests/wpt/tests/webxr/ar-module/xrDevice_requestSession_immersive-ar.https.html diff --git a/tests/wpt/web-platform-tests/webxr/ar-module/xrSession_environmentBlendMode.https.html b/tests/wpt/tests/webxr/ar-module/xrSession_environmentBlendMode.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/ar-module/xrSession_environmentBlendMode.https.html rename to tests/wpt/tests/webxr/ar-module/xrSession_environmentBlendMode.https.html diff --git a/tests/wpt/web-platform-tests/webxr/ar-module/xrSession_interactionMode.https.html b/tests/wpt/tests/webxr/ar-module/xrSession_interactionMode.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/ar-module/xrSession_interactionMode.https.html rename to tests/wpt/tests/webxr/ar-module/xrSession_interactionMode.https.html diff --git a/tests/wpt/web-platform-tests/webxr/camera-access/xrCamera_resolution.https.html b/tests/wpt/tests/webxr/camera-access/xrCamera_resolution.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/camera-access/xrCamera_resolution.https.html rename to tests/wpt/tests/webxr/camera-access/xrCamera_resolution.https.html diff --git a/tests/wpt/web-platform-tests/webxr/depth-sensing/cpu/depth_sensing_cpu_dataUnavailable.https.html b/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_dataUnavailable.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/depth-sensing/cpu/depth_sensing_cpu_dataUnavailable.https.html rename to tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_dataUnavailable.https.html diff --git a/tests/wpt/web-platform-tests/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html b/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html rename to tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html diff --git a/tests/wpt/web-platform-tests/webxr/depth-sensing/cpu/depth_sensing_cpu_incorrectUsage.https.html b/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_incorrectUsage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/depth-sensing/cpu/depth_sensing_cpu_incorrectUsage.https.html rename to tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_incorrectUsage.https.html diff --git a/tests/wpt/web-platform-tests/webxr/depth-sensing/cpu/depth_sensing_cpu_luminance_alpha_dataValid.https.html b/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_luminance_alpha_dataValid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/depth-sensing/cpu/depth_sensing_cpu_luminance_alpha_dataValid.https.html rename to tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_luminance_alpha_dataValid.https.html diff --git a/tests/wpt/web-platform-tests/webxr/depth-sensing/cpu/depth_sensing_cpu_staleView.https.html b/tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_staleView.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/depth-sensing/cpu/depth_sensing_cpu_staleView.https.html rename to tests/wpt/tests/webxr/depth-sensing/cpu/depth_sensing_cpu_staleView.https.html diff --git a/tests/wpt/web-platform-tests/webxr/depth-sensing/dataUnavailableTests.js b/tests/wpt/tests/webxr/depth-sensing/dataUnavailableTests.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/depth-sensing/dataUnavailableTests.js rename to tests/wpt/tests/webxr/depth-sensing/dataUnavailableTests.js diff --git a/tests/wpt/web-platform-tests/webxr/depth-sensing/depth_sensing_notEnabled.https.html b/tests/wpt/tests/webxr/depth-sensing/depth_sensing_notEnabled.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/depth-sensing/depth_sensing_notEnabled.https.html rename to tests/wpt/tests/webxr/depth-sensing/depth_sensing_notEnabled.https.html diff --git a/tests/wpt/web-platform-tests/webxr/depth-sensing/gpu/depth_sensing_gpu_dataUnavailable.https.html b/tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_dataUnavailable.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/depth-sensing/gpu/depth_sensing_gpu_dataUnavailable.https.html rename to tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_dataUnavailable.https.html diff --git a/tests/wpt/web-platform-tests/webxr/depth-sensing/gpu/depth_sensing_gpu_inactiveFrame.https.html b/tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_inactiveFrame.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/depth-sensing/gpu/depth_sensing_gpu_inactiveFrame.https.html rename to tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_inactiveFrame.https.html diff --git a/tests/wpt/web-platform-tests/webxr/depth-sensing/gpu/depth_sensing_gpu_incorrectUsage.https.html b/tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_incorrectUsage.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/depth-sensing/gpu/depth_sensing_gpu_incorrectUsage.https.html rename to tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_incorrectUsage.https.html diff --git a/tests/wpt/web-platform-tests/webxr/depth-sensing/gpu/depth_sensing_gpu_staleView.https.html b/tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_staleView.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/depth-sensing/gpu/depth_sensing_gpu_staleView.https.html rename to tests/wpt/tests/webxr/depth-sensing/gpu/depth_sensing_gpu_staleView.https.html diff --git a/tests/wpt/web-platform-tests/webxr/depth-sensing/inactiveFrameTests.js b/tests/wpt/tests/webxr/depth-sensing/inactiveFrameTests.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/depth-sensing/inactiveFrameTests.js rename to tests/wpt/tests/webxr/depth-sensing/inactiveFrameTests.js diff --git a/tests/wpt/web-platform-tests/webxr/depth-sensing/staleViewsTests.js b/tests/wpt/tests/webxr/depth-sensing/staleViewsTests.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/depth-sensing/staleViewsTests.js rename to tests/wpt/tests/webxr/depth-sensing/staleViewsTests.js diff --git a/tests/wpt/web-platform-tests/webxr/dom-overlay/META.yml b/tests/wpt/tests/webxr/dom-overlay/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webxr/dom-overlay/META.yml rename to tests/wpt/tests/webxr/dom-overlay/META.yml diff --git a/tests/wpt/web-platform-tests/webxr/dom-overlay/ar_dom_overlay.https.html b/tests/wpt/tests/webxr/dom-overlay/ar_dom_overlay.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/dom-overlay/ar_dom_overlay.https.html rename to tests/wpt/tests/webxr/dom-overlay/ar_dom_overlay.https.html diff --git a/tests/wpt/web-platform-tests/webxr/dom-overlay/ar_dom_overlay_hit_test.https.html b/tests/wpt/tests/webxr/dom-overlay/ar_dom_overlay_hit_test.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/dom-overlay/ar_dom_overlay_hit_test.https.html rename to tests/wpt/tests/webxr/dom-overlay/ar_dom_overlay_hit_test.https.html diff --git a/tests/wpt/web-platform-tests/webxr/dom-overlay/idlharness.https.window.js b/tests/wpt/tests/webxr/dom-overlay/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/dom-overlay/idlharness.https.window.js rename to tests/wpt/tests/webxr/dom-overlay/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/webxr/dom-overlay/nested_fullscreen.https.html b/tests/wpt/tests/webxr/dom-overlay/nested_fullscreen.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/dom-overlay/nested_fullscreen.https.html rename to tests/wpt/tests/webxr/dom-overlay/nested_fullscreen.https.html diff --git a/tests/wpt/web-platform-tests/webxr/events_input_source_recreation.https.html b/tests/wpt/tests/webxr/events_input_source_recreation.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/events_input_source_recreation.https.html rename to tests/wpt/tests/webxr/events_input_source_recreation.https.html diff --git a/tests/wpt/web-platform-tests/webxr/events_input_sources_change.https.html b/tests/wpt/tests/webxr/events_input_sources_change.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/events_input_sources_change.https.html rename to tests/wpt/tests/webxr/events_input_sources_change.https.html diff --git a/tests/wpt/web-platform-tests/webxr/events_referenceSpace_reset_immersive.https.html b/tests/wpt/tests/webxr/events_referenceSpace_reset_immersive.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/events_referenceSpace_reset_immersive.https.html rename to tests/wpt/tests/webxr/events_referenceSpace_reset_immersive.https.html diff --git a/tests/wpt/web-platform-tests/webxr/events_referenceSpace_reset_inline.https.html b/tests/wpt/tests/webxr/events_referenceSpace_reset_inline.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/events_referenceSpace_reset_inline.https.html rename to tests/wpt/tests/webxr/events_referenceSpace_reset_inline.https.html diff --git a/tests/wpt/web-platform-tests/webxr/events_session_select.https.html b/tests/wpt/tests/webxr/events_session_select.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/events_session_select.https.html rename to tests/wpt/tests/webxr/events_session_select.https.html diff --git a/tests/wpt/web-platform-tests/webxr/events_session_select_subframe.https.html b/tests/wpt/tests/webxr/events_session_select_subframe.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/events_session_select_subframe.https.html rename to tests/wpt/tests/webxr/events_session_select_subframe.https.html diff --git a/tests/wpt/web-platform-tests/webxr/events_session_squeeze.https.html b/tests/wpt/tests/webxr/events_session_squeeze.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/events_session_squeeze.https.html rename to tests/wpt/tests/webxr/events_session_squeeze.https.html diff --git a/tests/wpt/web-platform-tests/webxr/exclusive_requestFrame_nolayer.https.html b/tests/wpt/tests/webxr/exclusive_requestFrame_nolayer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/exclusive_requestFrame_nolayer.https.html rename to tests/wpt/tests/webxr/exclusive_requestFrame_nolayer.https.html diff --git a/tests/wpt/web-platform-tests/webxr/gamepads-module/META.yml b/tests/wpt/tests/webxr/gamepads-module/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webxr/gamepads-module/META.yml rename to tests/wpt/tests/webxr/gamepads-module/META.yml diff --git a/tests/wpt/web-platform-tests/webxr/gamepads-module/idlharness.https.window.js b/tests/wpt/tests/webxr/gamepads-module/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/gamepads-module/idlharness.https.window.js rename to tests/wpt/tests/webxr/gamepads-module/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html b/tests/wpt/tests/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html rename to tests/wpt/tests/webxr/gamepads-module/xrInputSource_gamepad_disconnect.https.html diff --git a/tests/wpt/web-platform-tests/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html b/tests/wpt/tests/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html rename to tests/wpt/tests/webxr/gamepads-module/xrInputSource_gamepad_input_registered.https.html diff --git a/tests/wpt/web-platform-tests/webxr/getInputPose_handedness.https.html b/tests/wpt/tests/webxr/getInputPose_handedness.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/getInputPose_handedness.https.html rename to tests/wpt/tests/webxr/getInputPose_handedness.https.html diff --git a/tests/wpt/web-platform-tests/webxr/getInputPose_pointer.https.html b/tests/wpt/tests/webxr/getInputPose_pointer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/getInputPose_pointer.https.html rename to tests/wpt/tests/webxr/getInputPose_pointer.https.html diff --git a/tests/wpt/web-platform-tests/webxr/getViewerPose_emulatedPosition.https.html b/tests/wpt/tests/webxr/getViewerPose_emulatedPosition.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/getViewerPose_emulatedPosition.https.html rename to tests/wpt/tests/webxr/getViewerPose_emulatedPosition.https.html diff --git a/tests/wpt/web-platform-tests/webxr/hand-input/META.yml b/tests/wpt/tests/webxr/hand-input/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webxr/hand-input/META.yml rename to tests/wpt/tests/webxr/hand-input/META.yml diff --git a/tests/wpt/web-platform-tests/webxr/hand-input/idlharness.https.window.js b/tests/wpt/tests/webxr/hand-input/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/hand-input/idlharness.https.window.js rename to tests/wpt/tests/webxr/hand-input/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/META.yml b/tests/wpt/tests/webxr/hit-test/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webxr/hit-test/META.yml rename to tests/wpt/tests/webxr/hit-test/META.yml diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_source_cancel.https.html b/tests/wpt/tests/webxr/hit-test/ar_hittest_source_cancel.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_source_cancel.https.html rename to tests/wpt/tests/webxr/hit-test/ar_hittest_source_cancel.https.html diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_inputSources.https.html b/tests/wpt/tests/webxr/hit-test/ar_hittest_subscription_inputSources.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_inputSources.https.html rename to tests/wpt/tests/webxr/hit-test/ar_hittest_subscription_inputSources.https.html diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html b/tests/wpt/tests/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html rename to tests/wpt/tests/webxr/hit-test/ar_hittest_subscription_refSpaces.https.html diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_states_regular.https.html b/tests/wpt/tests/webxr/hit-test/ar_hittest_subscription_states_regular.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_states_regular.https.html rename to tests/wpt/tests/webxr/hit-test/ar_hittest_subscription_states_regular.https.html diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_states_transient.https.html b/tests/wpt/tests/webxr/hit-test/ar_hittest_subscription_states_transient.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_states_transient.https.html rename to tests/wpt/tests/webxr/hit-test/ar_hittest_subscription_states_transient.https.html diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html b/tests/wpt/tests/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html rename to tests/wpt/tests/webxr/hit-test/ar_hittest_subscription_transientInputSources.https.html diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_unlocalizable.https.html b/tests/wpt/tests/webxr/hit-test/ar_hittest_subscription_unlocalizable.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/hit-test/ar_hittest_subscription_unlocalizable.https.html rename to tests/wpt/tests/webxr/hit-test/ar_hittest_subscription_unlocalizable.https.html diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/idlharness.https.html b/tests/wpt/tests/webxr/hit-test/idlharness.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/hit-test/idlharness.https.html rename to tests/wpt/tests/webxr/hit-test/idlharness.https.html diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/xrRay_constructor.https.html b/tests/wpt/tests/webxr/hit-test/xrRay_constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/hit-test/xrRay_constructor.https.html rename to tests/wpt/tests/webxr/hit-test/xrRay_constructor.https.html diff --git a/tests/wpt/web-platform-tests/webxr/hit-test/xrRay_matrix.https.html b/tests/wpt/tests/webxr/hit-test/xrRay_matrix.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/hit-test/xrRay_matrix.https.html rename to tests/wpt/tests/webxr/hit-test/xrRay_matrix.https.html diff --git a/tests/wpt/web-platform-tests/webxr/idlharness.https.window.js b/tests/wpt/tests/webxr/idlharness.https.window.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/idlharness.https.window.js rename to tests/wpt/tests/webxr/idlharness.https.window.js diff --git a/tests/wpt/web-platform-tests/webxr/layers/META.yml b/tests/wpt/tests/webxr/layers/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/webxr/layers/META.yml rename to tests/wpt/tests/webxr/layers/META.yml diff --git a/tests/wpt/web-platform-tests/webxr/layers/xrSession_updateRenderState.https.html b/tests/wpt/tests/webxr/layers/xrSession_updateRenderState.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/layers/xrSession_updateRenderState.https.html rename to tests/wpt/tests/webxr/layers/xrSession_updateRenderState.https.html diff --git a/tests/wpt/web-platform-tests/webxr/layers/xrWebGLBinding_constructor.https.html b/tests/wpt/tests/webxr/layers/xrWebGLBinding_constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/layers/xrWebGLBinding_constructor.https.html rename to tests/wpt/tests/webxr/layers/xrWebGLBinding_constructor.https.html diff --git a/tests/wpt/web-platform-tests/webxr/light-estimation/xrFrame_getLightEstimate_oldSession.https.html b/tests/wpt/tests/webxr/light-estimation/xrFrame_getLightEstimate_oldSession.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/light-estimation/xrFrame_getLightEstimate_oldSession.https.html rename to tests/wpt/tests/webxr/light-estimation/xrFrame_getLightEstimate_oldSession.https.html diff --git a/tests/wpt/web-platform-tests/webxr/light-estimation/xrFrame_getLightEstimate_staleFrame.https.html b/tests/wpt/tests/webxr/light-estimation/xrFrame_getLightEstimate_staleFrame.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/light-estimation/xrFrame_getLightEstimate_staleFrame.https.html rename to tests/wpt/tests/webxr/light-estimation/xrFrame_getLightEstimate_staleFrame.https.html diff --git a/tests/wpt/web-platform-tests/webxr/light-estimation/xrFrame_getLightEstimate_valid.https.html b/tests/wpt/tests/webxr/light-estimation/xrFrame_getLightEstimate_valid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/light-estimation/xrFrame_getLightEstimate_valid.https.html rename to tests/wpt/tests/webxr/light-estimation/xrFrame_getLightEstimate_valid.https.html diff --git a/tests/wpt/web-platform-tests/webxr/light-estimation/xrSession_getLightProbe_ended.https.html b/tests/wpt/tests/webxr/light-estimation/xrSession_getLightProbe_ended.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/light-estimation/xrSession_getLightProbe_ended.https.html rename to tests/wpt/tests/webxr/light-estimation/xrSession_getLightProbe_ended.https.html diff --git a/tests/wpt/web-platform-tests/webxr/light-estimation/xrSession_getLightProbe_notEnabled.https.html b/tests/wpt/tests/webxr/light-estimation/xrSession_getLightProbe_notEnabled.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/light-estimation/xrSession_getLightProbe_notEnabled.https.html rename to tests/wpt/tests/webxr/light-estimation/xrSession_getLightProbe_notEnabled.https.html diff --git a/tests/wpt/web-platform-tests/webxr/light-estimation/xrSession_getLightProbe_valid.https.html b/tests/wpt/tests/webxr/light-estimation/xrSession_getLightProbe_valid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/light-estimation/xrSession_getLightProbe_valid.https.html rename to tests/wpt/tests/webxr/light-estimation/xrSession_getLightProbe_valid.https.html diff --git a/tests/wpt/web-platform-tests/webxr/light-estimation/xrWebGLBinding_getReflectionCubeMap.https.html b/tests/wpt/tests/webxr/light-estimation/xrWebGLBinding_getReflectionCubeMap.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/light-estimation/xrWebGLBinding_getReflectionCubeMap.https.html rename to tests/wpt/tests/webxr/light-estimation/xrWebGLBinding_getReflectionCubeMap.https.html diff --git a/tests/wpt/web-platform-tests/webxr/navigator_xr_sameObject.https.html b/tests/wpt/tests/webxr/navigator_xr_sameObject.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/navigator_xr_sameObject.https.html rename to tests/wpt/tests/webxr/navigator_xr_sameObject.https.html diff --git a/tests/wpt/web-platform-tests/webxr/render_state_update.https.html b/tests/wpt/tests/webxr/render_state_update.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/render_state_update.https.html rename to tests/wpt/tests/webxr/render_state_update.https.html diff --git a/tests/wpt/web-platform-tests/webxr/render_state_vertical_fov_immersive.https.html b/tests/wpt/tests/webxr/render_state_vertical_fov_immersive.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/render_state_vertical_fov_immersive.https.html rename to tests/wpt/tests/webxr/render_state_vertical_fov_immersive.https.html diff --git a/tests/wpt/web-platform-tests/webxr/render_state_vertical_fov_inline.https.html b/tests/wpt/tests/webxr/render_state_vertical_fov_inline.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/render_state_vertical_fov_inline.https.html rename to tests/wpt/tests/webxr/render_state_vertical_fov_inline.https.html diff --git a/tests/wpt/web-platform-tests/webxr/resources/webxr_check.html b/tests/wpt/tests/webxr/resources/webxr_check.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/resources/webxr_check.html rename to tests/wpt/tests/webxr/resources/webxr_check.html diff --git a/tests/wpt/web-platform-tests/webxr/resources/webxr_math_utils.js b/tests/wpt/tests/webxr/resources/webxr_math_utils.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/resources/webxr_math_utils.js rename to tests/wpt/tests/webxr/resources/webxr_math_utils.js diff --git a/tests/wpt/web-platform-tests/webxr/resources/webxr_test_asserts.js b/tests/wpt/tests/webxr/resources/webxr_test_asserts.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/resources/webxr_test_asserts.js rename to tests/wpt/tests/webxr/resources/webxr_test_asserts.js diff --git a/tests/wpt/web-platform-tests/webxr/resources/webxr_test_constants.js b/tests/wpt/tests/webxr/resources/webxr_test_constants.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/resources/webxr_test_constants.js rename to tests/wpt/tests/webxr/resources/webxr_test_constants.js diff --git a/tests/wpt/web-platform-tests/webxr/resources/webxr_test_constants_fake_depth.js b/tests/wpt/tests/webxr/resources/webxr_test_constants_fake_depth.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/resources/webxr_test_constants_fake_depth.js rename to tests/wpt/tests/webxr/resources/webxr_test_constants_fake_depth.js diff --git a/tests/wpt/web-platform-tests/webxr/resources/webxr_test_constants_fake_world.js b/tests/wpt/tests/webxr/resources/webxr_test_constants_fake_world.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/resources/webxr_test_constants_fake_world.js rename to tests/wpt/tests/webxr/resources/webxr_test_constants_fake_world.js diff --git a/tests/wpt/web-platform-tests/webxr/resources/webxr_util.js b/tests/wpt/tests/webxr/resources/webxr_util.js similarity index 100% rename from tests/wpt/web-platform-tests/webxr/resources/webxr_util.js rename to tests/wpt/tests/webxr/resources/webxr_util.js diff --git a/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_create_xrcompatible.https.html b/tests/wpt/tests/webxr/webGLCanvasContext_create_xrcompatible.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/webGLCanvasContext_create_xrcompatible.https.html rename to tests/wpt/tests/webxr/webGLCanvasContext_create_xrcompatible.https.html diff --git a/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_makecompatible_contextlost.https.html b/tests/wpt/tests/webxr/webGLCanvasContext_makecompatible_contextlost.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/webGLCanvasContext_makecompatible_contextlost.https.html rename to tests/wpt/tests/webxr/webGLCanvasContext_makecompatible_contextlost.https.html diff --git a/tests/wpt/web-platform-tests/webxr/webGLCanvasContext_makecompatible_reentrant.https.html b/tests/wpt/tests/webxr/webGLCanvasContext_makecompatible_reentrant.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/webGLCanvasContext_makecompatible_reentrant.https.html rename to tests/wpt/tests/webxr/webGLCanvasContext_makecompatible_reentrant.https.html diff --git a/tests/wpt/web-platform-tests/webxr/webxr-supported-by-feature-policy.html b/tests/wpt/tests/webxr/webxr-supported-by-feature-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/webxr-supported-by-feature-policy.html rename to tests/wpt/tests/webxr/webxr-supported-by-feature-policy.html diff --git a/tests/wpt/web-platform-tests/webxr/webxr_availability.http.sub.html b/tests/wpt/tests/webxr/webxr_availability.http.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/webxr_availability.http.sub.html rename to tests/wpt/tests/webxr/webxr_availability.http.sub.html diff --git a/tests/wpt/web-platform-tests/webxr/webxr_permissions_policy.https.html b/tests/wpt/tests/webxr/webxr_permissions_policy.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/webxr_permissions_policy.https.html rename to tests/wpt/tests/webxr/webxr_permissions_policy.https.html diff --git a/tests/wpt/web-platform-tests/webxr/webxr_permissions_policy.https.html.headers b/tests/wpt/tests/webxr/webxr_permissions_policy.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/webxr/webxr_permissions_policy.https.html.headers rename to tests/wpt/tests/webxr/webxr_permissions_policy.https.html.headers diff --git a/tests/wpt/web-platform-tests/webxr/xrBoundedReferenceSpace_updates.https.html b/tests/wpt/tests/webxr/xrBoundedReferenceSpace_updates.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrBoundedReferenceSpace_updates.https.html rename to tests/wpt/tests/webxr/xrBoundedReferenceSpace_updates.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrDevice_disconnect_ends.https.html b/tests/wpt/tests/webxr/xrDevice_disconnect_ends.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrDevice_disconnect_ends.https.html rename to tests/wpt/tests/webxr/xrDevice_disconnect_ends.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrDevice_isSessionSupported_immersive.https.html b/tests/wpt/tests/webxr/xrDevice_isSessionSupported_immersive.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrDevice_isSessionSupported_immersive.https.html rename to tests/wpt/tests/webxr/xrDevice_isSessionSupported_immersive.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrDevice_isSessionSupported_immersive_unsupported.https.html b/tests/wpt/tests/webxr/xrDevice_isSessionSupported_immersive_unsupported.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrDevice_isSessionSupported_immersive_unsupported.https.html rename to tests/wpt/tests/webxr/xrDevice_isSessionSupported_immersive_unsupported.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrDevice_isSessionSupported_inline.https.html b/tests/wpt/tests/webxr/xrDevice_isSessionSupported_inline.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrDevice_isSessionSupported_inline.https.html rename to tests/wpt/tests/webxr/xrDevice_isSessionSupported_inline.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_immersive.https.html b/tests/wpt/tests/webxr/xrDevice_requestSession_immersive.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_immersive.https.html rename to tests/wpt/tests/webxr/xrDevice_requestSession_immersive.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_immersive_no_gesture.https.html b/tests/wpt/tests/webxr/xrDevice_requestSession_immersive_no_gesture.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_immersive_no_gesture.https.html rename to tests/wpt/tests/webxr/xrDevice_requestSession_immersive_no_gesture.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_immersive_unsupported.https.html b/tests/wpt/tests/webxr/xrDevice_requestSession_immersive_unsupported.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_immersive_unsupported.https.html rename to tests/wpt/tests/webxr/xrDevice_requestSession_immersive_unsupported.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_no_mode.https.html b/tests/wpt/tests/webxr/xrDevice_requestSession_no_mode.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_no_mode.https.html rename to tests/wpt/tests/webxr/xrDevice_requestSession_no_mode.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_non_immersive_no_gesture.https.html b/tests/wpt/tests/webxr/xrDevice_requestSession_non_immersive_no_gesture.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_non_immersive_no_gesture.https.html rename to tests/wpt/tests/webxr/xrDevice_requestSession_non_immersive_no_gesture.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_optionalFeatures.https.html b/tests/wpt/tests/webxr/xrDevice_requestSession_optionalFeatures.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_optionalFeatures.https.html rename to tests/wpt/tests/webxr/xrDevice_requestSession_optionalFeatures.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_requiredFeatures_unknown.https.html b/tests/wpt/tests/webxr/xrDevice_requestSession_requiredFeatures_unknown.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrDevice_requestSession_requiredFeatures_unknown.https.html rename to tests/wpt/tests/webxr/xrDevice_requestSession_requiredFeatures_unknown.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrFrame_getPose.https.html b/tests/wpt/tests/webxr/xrFrame_getPose.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrFrame_getPose.https.html rename to tests/wpt/tests/webxr/xrFrame_getPose.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrFrame_getViewerPose_getPose.https.html b/tests/wpt/tests/webxr/xrFrame_getViewerPose_getPose.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrFrame_getViewerPose_getPose.https.html rename to tests/wpt/tests/webxr/xrFrame_getViewerPose_getPose.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrFrame_getViewerPose_getPose_identities.https.html b/tests/wpt/tests/webxr/xrFrame_getViewerPose_getPose_identities.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrFrame_getViewerPose_getPose_identities.https.html rename to tests/wpt/tests/webxr/xrFrame_getViewerPose_getPose_identities.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrFrame_lifetime.https.html b/tests/wpt/tests/webxr/xrFrame_lifetime.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrFrame_lifetime.https.html rename to tests/wpt/tests/webxr/xrFrame_lifetime.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrFrame_session_sameObject.https.html b/tests/wpt/tests/webxr/xrFrame_session_sameObject.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrFrame_session_sameObject.https.html rename to tests/wpt/tests/webxr/xrFrame_session_sameObject.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrInputSource_add_remove.https.html b/tests/wpt/tests/webxr/xrInputSource_add_remove.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrInputSource_add_remove.https.html rename to tests/wpt/tests/webxr/xrInputSource_add_remove.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrInputSource_emulatedPosition.https.html b/tests/wpt/tests/webxr/xrInputSource_emulatedPosition.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrInputSource_emulatedPosition.https.html rename to tests/wpt/tests/webxr/xrInputSource_emulatedPosition.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrInputSource_getPose_targetRay_grip.https.html b/tests/wpt/tests/webxr/xrInputSource_getPose_targetRay_grip.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrInputSource_getPose_targetRay_grip.https.html rename to tests/wpt/tests/webxr/xrInputSource_getPose_targetRay_grip.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrInputSource_profiles.https.html b/tests/wpt/tests/webxr/xrInputSource_profiles.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrInputSource_profiles.https.html rename to tests/wpt/tests/webxr/xrInputSource_profiles.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrInputSource_sameObject.https.html b/tests/wpt/tests/webxr/xrInputSource_sameObject.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrInputSource_sameObject.https.html rename to tests/wpt/tests/webxr/xrInputSource_sameObject.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrPose_transform_sameObject.https.html b/tests/wpt/tests/webxr/xrPose_transform_sameObject.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrPose_transform_sameObject.https.html rename to tests/wpt/tests/webxr/xrPose_transform_sameObject.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html b/tests/wpt/tests/webxr/xrReferenceSpace_originOffset.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html rename to tests/wpt/tests/webxr/xrReferenceSpace_originOffset.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html b/tests/wpt/tests/webxr/xrReferenceSpace_originOffsetBounded.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html rename to tests/wpt/tests/webxr/xrReferenceSpace_originOffsetBounded.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset_viewer.https.html b/tests/wpt/tests/webxr/xrReferenceSpace_originOffset_viewer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset_viewer.https.html rename to tests/wpt/tests/webxr/xrReferenceSpace_originOffset_viewer.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_relationships.https.html b/tests/wpt/tests/webxr/xrReferenceSpace_relationships.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrReferenceSpace_relationships.https.html rename to tests/wpt/tests/webxr/xrReferenceSpace_relationships.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrRigidTransform_constructor.https.html b/tests/wpt/tests/webxr/xrRigidTransform_constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrRigidTransform_constructor.https.html rename to tests/wpt/tests/webxr/xrRigidTransform_constructor.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrRigidTransform_inverse.https.html b/tests/wpt/tests/webxr/xrRigidTransform_inverse.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrRigidTransform_inverse.https.html rename to tests/wpt/tests/webxr/xrRigidTransform_inverse.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrRigidTransform_matrix.https.html b/tests/wpt/tests/webxr/xrRigidTransform_matrix.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrRigidTransform_matrix.https.html rename to tests/wpt/tests/webxr/xrRigidTransform_matrix.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrRigidTransform_sameObject.https.html b/tests/wpt/tests/webxr/xrRigidTransform_sameObject.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrRigidTransform_sameObject.https.html rename to tests/wpt/tests/webxr/xrRigidTransform_sameObject.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_cancelAnimationFrame.https.html b/tests/wpt/tests/webxr/xrSession_cancelAnimationFrame.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_cancelAnimationFrame.https.html rename to tests/wpt/tests/webxr/xrSession_cancelAnimationFrame.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html b/tests/wpt/tests/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html rename to tests/wpt/tests/webxr/xrSession_cancelAnimationFrame_invalidhandle.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_enabledFeatures.https.html b/tests/wpt/tests/webxr/xrSession_enabledFeatures.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_enabledFeatures.https.html rename to tests/wpt/tests/webxr/xrSession_enabledFeatures.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_end.https.html b/tests/wpt/tests/webxr/xrSession_end.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_end.https.html rename to tests/wpt/tests/webxr/xrSession_end.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_features_deviceSupport.https.html b/tests/wpt/tests/webxr/xrSession_features_deviceSupport.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_features_deviceSupport.https.html rename to tests/wpt/tests/webxr/xrSession_features_deviceSupport.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_input_events_end.https.html b/tests/wpt/tests/webxr/xrSession_input_events_end.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_input_events_end.https.html rename to tests/wpt/tests/webxr/xrSession_input_events_end.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_prevent_multiple_exclusive.https.html b/tests/wpt/tests/webxr/xrSession_prevent_multiple_exclusive.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_prevent_multiple_exclusive.https.html rename to tests/wpt/tests/webxr/xrSession_prevent_multiple_exclusive.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_callback_calls.https.html b/tests/wpt/tests/webxr/xrSession_requestAnimationFrame_callback_calls.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_callback_calls.https.html rename to tests/wpt/tests/webxr/xrSession_requestAnimationFrame_callback_calls.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_data_valid.https.html b/tests/wpt/tests/webxr/xrSession_requestAnimationFrame_data_valid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_data_valid.https.html rename to tests/wpt/tests/webxr/xrSession_requestAnimationFrame_data_valid.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html b/tests/wpt/tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html rename to tests/wpt/tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_timestamp.https.html b/tests/wpt/tests/webxr/xrSession_requestAnimationFrame_timestamp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_timestamp.https.html rename to tests/wpt/tests/webxr/xrSession_requestAnimationFrame_timestamp.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html b/tests/wpt/tests/webxr/xrSession_requestReferenceSpace.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html rename to tests/wpt/tests/webxr/xrSession_requestReferenceSpace.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace_features.https.html b/tests/wpt/tests/webxr/xrSession_requestReferenceSpace_features.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace_features.https.html rename to tests/wpt/tests/webxr/xrSession_requestReferenceSpace_features.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestSessionDuringEnd.https.html b/tests/wpt/tests/webxr/xrSession_requestSessionDuringEnd.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_requestSessionDuringEnd.https.html rename to tests/wpt/tests/webxr/xrSession_requestSessionDuringEnd.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_sameObject.https.html b/tests/wpt/tests/webxr/xrSession_sameObject.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_sameObject.https.html rename to tests/wpt/tests/webxr/xrSession_sameObject.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_viewer_availability.https.html b/tests/wpt/tests/webxr/xrSession_viewer_availability.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_viewer_availability.https.html rename to tests/wpt/tests/webxr/xrSession_viewer_availability.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_viewer_referenceSpace.https.html b/tests/wpt/tests/webxr/xrSession_viewer_referenceSpace.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_viewer_referenceSpace.https.html rename to tests/wpt/tests/webxr/xrSession_viewer_referenceSpace.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_visibilityState.https.html b/tests/wpt/tests/webxr/xrSession_visibilityState.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrSession_visibilityState.https.html rename to tests/wpt/tests/webxr/xrSession_visibilityState.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html b/tests/wpt/tests/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html rename to tests/wpt/tests/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrView_eyes.https.html b/tests/wpt/tests/webxr/xrView_eyes.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrView_eyes.https.html rename to tests/wpt/tests/webxr/xrView_eyes.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrView_match.https.html b/tests/wpt/tests/webxr/xrView_match.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrView_match.https.html rename to tests/wpt/tests/webxr/xrView_match.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrView_oneframeupdate.https.html b/tests/wpt/tests/webxr/xrView_oneframeupdate.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrView_oneframeupdate.https.html rename to tests/wpt/tests/webxr/xrView_oneframeupdate.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrView_sameObject.https.html b/tests/wpt/tests/webxr/xrView_sameObject.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrView_sameObject.https.html rename to tests/wpt/tests/webxr/xrView_sameObject.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrViewerPose_secondaryViews.https.html b/tests/wpt/tests/webxr/xrViewerPose_secondaryViews.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrViewerPose_secondaryViews.https.html rename to tests/wpt/tests/webxr/xrViewerPose_secondaryViews.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrViewerPose_views_sameObject.https.html b/tests/wpt/tests/webxr/xrViewerPose_views_sameObject.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrViewerPose_views_sameObject.https.html rename to tests/wpt/tests/webxr/xrViewerPose_views_sameObject.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrViewport_valid.https.html b/tests/wpt/tests/webxr/xrViewport_valid.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrViewport_valid.https.html rename to tests/wpt/tests/webxr/xrViewport_valid.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_constructor.https.html b/tests/wpt/tests/webxr/xrWebGLLayer_constructor.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrWebGLLayer_constructor.https.html rename to tests/wpt/tests/webxr/xrWebGLLayer_constructor.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_draw.https.html b/tests/wpt/tests/webxr/xrWebGLLayer_framebuffer_draw.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_draw.https.html rename to tests/wpt/tests/webxr/xrWebGLLayer_framebuffer_draw.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_sameObject.https.html b/tests/wpt/tests/webxr/xrWebGLLayer_framebuffer_sameObject.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_sameObject.https.html rename to tests/wpt/tests/webxr/xrWebGLLayer_framebuffer_sameObject.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_scale.https.html b/tests/wpt/tests/webxr/xrWebGLLayer_framebuffer_scale.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer_scale.https.html rename to tests/wpt/tests/webxr/xrWebGLLayer_framebuffer_scale.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_opaque_framebuffer.https.html b/tests/wpt/tests/webxr/xrWebGLLayer_opaque_framebuffer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrWebGLLayer_opaque_framebuffer.https.html rename to tests/wpt/tests/webxr/xrWebGLLayer_opaque_framebuffer.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html b/tests/wpt/tests/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html rename to tests/wpt/tests/webxr/xrWebGLLayer_opaque_framebuffer_stencil.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_viewports.https.html b/tests/wpt/tests/webxr/xrWebGLLayer_viewports.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xrWebGLLayer_viewports.https.html rename to tests/wpt/tests/webxr/xrWebGLLayer_viewports.https.html diff --git a/tests/wpt/web-platform-tests/webxr/xr_viewport_scale.https.html b/tests/wpt/tests/webxr/xr_viewport_scale.https.html similarity index 100% rename from tests/wpt/web-platform-tests/webxr/xr_viewport_scale.https.html rename to tests/wpt/tests/webxr/xr_viewport_scale.https.html diff --git a/tests/wpt/web-platform-tests/window-management/META.yml b/tests/wpt/tests/window-management/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/window-management/META.yml rename to tests/wpt/tests/window-management/META.yml diff --git a/tests/wpt/web-platform-tests/window-management/README.md b/tests/wpt/tests/window-management/README.md similarity index 100% rename from tests/wpt/web-platform-tests/window-management/README.md rename to tests/wpt/tests/window-management/README.md diff --git a/tests/wpt/web-platform-tests/window-management/multi-screen-fullscreen-companion.tentative.https.html b/tests/wpt/tests/window-management/multi-screen-fullscreen-companion.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/window-management/multi-screen-fullscreen-companion.tentative.https.html rename to tests/wpt/tests/window-management/multi-screen-fullscreen-companion.tentative.https.html diff --git a/tests/wpt/web-platform-tests/window-management/multi-screen-fullscreen-enter.tentative.https.html b/tests/wpt/tests/window-management/multi-screen-fullscreen-enter.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/window-management/multi-screen-fullscreen-enter.tentative.https.html rename to tests/wpt/tests/window-management/multi-screen-fullscreen-enter.tentative.https.html diff --git a/tests/wpt/web-platform-tests/window-management/multi-screen-fullscreen-move.tentative.https.html b/tests/wpt/tests/window-management/multi-screen-fullscreen-move.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/window-management/multi-screen-fullscreen-move.tentative.https.html rename to tests/wpt/tests/window-management/multi-screen-fullscreen-move.tentative.https.html diff --git a/tests/wpt/web-platform-tests/window-management/multi-screen-window-open.tentative.https.html b/tests/wpt/tests/window-management/multi-screen-window-open.tentative.https.html similarity index 100% rename from tests/wpt/web-platform-tests/window-management/multi-screen-window-open.tentative.https.html rename to tests/wpt/tests/window-management/multi-screen-window-open.tentative.https.html diff --git a/tests/wpt/web-platform-tests/window-management/resources/helpers.js b/tests/wpt/tests/window-management/resources/helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/window-management/resources/helpers.js rename to tests/wpt/tests/window-management/resources/helpers.js diff --git a/tests/wpt/web-platform-tests/workers/META.yml b/tests/wpt/tests/workers/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/workers/META.yml rename to tests/wpt/tests/workers/META.yml diff --git a/tests/wpt/web-platform-tests/workers/README.md b/tests/wpt/tests/workers/README.md similarity index 100% rename from tests/wpt/web-platform-tests/workers/README.md rename to tests/wpt/tests/workers/README.md diff --git a/tests/wpt/web-platform-tests/workers/SharedWorker-MessageEvent-source.any.js b/tests/wpt/tests/workers/SharedWorker-MessageEvent-source.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/SharedWorker-MessageEvent-source.any.js rename to tests/wpt/tests/workers/SharedWorker-MessageEvent-source.any.js diff --git a/tests/wpt/web-platform-tests/workers/SharedWorker-constructor.html b/tests/wpt/tests/workers/SharedWorker-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/SharedWorker-constructor.html rename to tests/wpt/tests/workers/SharedWorker-constructor.html diff --git a/tests/wpt/web-platform-tests/workers/SharedWorker-detach-frame-in-error-event.html b/tests/wpt/tests/workers/SharedWorker-detach-frame-in-error-event.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/SharedWorker-detach-frame-in-error-event.html rename to tests/wpt/tests/workers/SharedWorker-detach-frame-in-error-event.html diff --git a/tests/wpt/web-platform-tests/workers/SharedWorker-exception-propagation.html b/tests/wpt/tests/workers/SharedWorker-exception-propagation.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/SharedWorker-exception-propagation.html rename to tests/wpt/tests/workers/SharedWorker-exception-propagation.html diff --git a/tests/wpt/web-platform-tests/workers/SharedWorker-exception.html b/tests/wpt/tests/workers/SharedWorker-exception.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/SharedWorker-exception.html rename to tests/wpt/tests/workers/SharedWorker-exception.html diff --git a/tests/wpt/web-platform-tests/workers/SharedWorker-replace-EventHandler.any.js b/tests/wpt/tests/workers/SharedWorker-replace-EventHandler.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/SharedWorker-replace-EventHandler.any.js rename to tests/wpt/tests/workers/SharedWorker-replace-EventHandler.any.js diff --git a/tests/wpt/web-platform-tests/workers/SharedWorker-script-error.html b/tests/wpt/tests/workers/SharedWorker-script-error.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/SharedWorker-script-error.html rename to tests/wpt/tests/workers/SharedWorker-script-error.html diff --git a/tests/wpt/web-platform-tests/workers/SharedWorker-simple.html b/tests/wpt/tests/workers/SharedWorker-simple.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/SharedWorker-simple.html rename to tests/wpt/tests/workers/SharedWorker-simple.html diff --git a/tests/wpt/web-platform-tests/workers/SharedWorkerPerformanceNow.html b/tests/wpt/tests/workers/SharedWorkerPerformanceNow.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/SharedWorkerPerformanceNow.html rename to tests/wpt/tests/workers/SharedWorkerPerformanceNow.html diff --git a/tests/wpt/web-platform-tests/workers/SharedWorker_blobUrl.html b/tests/wpt/tests/workers/SharedWorker_blobUrl.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/SharedWorker_blobUrl.html rename to tests/wpt/tests/workers/SharedWorker_blobUrl.html diff --git a/tests/wpt/web-platform-tests/workers/SharedWorker_dataUrl.html b/tests/wpt/tests/workers/SharedWorker_dataUrl.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/SharedWorker_dataUrl.html rename to tests/wpt/tests/workers/SharedWorker_dataUrl.html diff --git a/tests/wpt/web-platform-tests/workers/Worker-base64.any.js b/tests/wpt/tests/workers/Worker-base64.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-base64.any.js rename to tests/wpt/tests/workers/Worker-base64.any.js diff --git a/tests/wpt/web-platform-tests/workers/Worker-call.worker.js b/tests/wpt/tests/workers/Worker-call.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-call.worker.js rename to tests/wpt/tests/workers/Worker-call.worker.js diff --git a/tests/wpt/web-platform-tests/workers/Worker-constructor-proto.any.js b/tests/wpt/tests/workers/Worker-constructor-proto.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-constructor-proto.any.js rename to tests/wpt/tests/workers/Worker-constructor-proto.any.js diff --git a/tests/wpt/web-platform-tests/workers/Worker-custom-event.any.js b/tests/wpt/tests/workers/Worker-custom-event.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-custom-event.any.js rename to tests/wpt/tests/workers/Worker-custom-event.any.js diff --git a/tests/wpt/web-platform-tests/workers/Worker-formdata.any.js b/tests/wpt/tests/workers/Worker-formdata.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-formdata.any.js rename to tests/wpt/tests/workers/Worker-formdata.any.js diff --git a/tests/wpt/web-platform-tests/workers/Worker-location.sub.any.js b/tests/wpt/tests/workers/Worker-location.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-location.sub.any.js rename to tests/wpt/tests/workers/Worker-location.sub.any.js diff --git a/tests/wpt/web-platform-tests/workers/Worker-messageport.html b/tests/wpt/tests/workers/Worker-messageport.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-messageport.html rename to tests/wpt/tests/workers/Worker-messageport.html diff --git a/tests/wpt/web-platform-tests/workers/Worker-multi-port.html b/tests/wpt/tests/workers/Worker-multi-port.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-multi-port.html rename to tests/wpt/tests/workers/Worker-multi-port.html diff --git a/tests/wpt/web-platform-tests/workers/Worker-nested-importScripts-error.html b/tests/wpt/tests/workers/Worker-nested-importScripts-error.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-nested-importScripts-error.html rename to tests/wpt/tests/workers/Worker-nested-importScripts-error.html diff --git a/tests/wpt/web-platform-tests/workers/Worker-replace-event-handler.any.js b/tests/wpt/tests/workers/Worker-replace-event-handler.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-replace-event-handler.any.js rename to tests/wpt/tests/workers/Worker-replace-event-handler.any.js diff --git a/tests/wpt/web-platform-tests/workers/Worker-replace-global-constructor.any.js b/tests/wpt/tests/workers/Worker-replace-global-constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-replace-global-constructor.any.js rename to tests/wpt/tests/workers/Worker-replace-global-constructor.any.js diff --git a/tests/wpt/web-platform-tests/workers/Worker-replace-self.any.js b/tests/wpt/tests/workers/Worker-replace-self.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-replace-self.any.js rename to tests/wpt/tests/workers/Worker-replace-self.any.js diff --git a/tests/wpt/web-platform-tests/workers/Worker-simultaneous-errors.html b/tests/wpt/tests/workers/Worker-simultaneous-errors.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-simultaneous-errors.html rename to tests/wpt/tests/workers/Worker-simultaneous-errors.html diff --git a/tests/wpt/web-platform-tests/workers/Worker-structure-message.html b/tests/wpt/tests/workers/Worker-structure-message.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-structure-message.html rename to tests/wpt/tests/workers/Worker-structure-message.html diff --git a/tests/wpt/web-platform-tests/workers/Worker-terminate-forever-during-evaluation.html b/tests/wpt/tests/workers/Worker-terminate-forever-during-evaluation.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-terminate-forever-during-evaluation.html rename to tests/wpt/tests/workers/Worker-terminate-forever-during-evaluation.html diff --git a/tests/wpt/web-platform-tests/workers/Worker-terminate-forever.html b/tests/wpt/tests/workers/Worker-terminate-forever.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-terminate-forever.html rename to tests/wpt/tests/workers/Worker-terminate-forever.html diff --git a/tests/wpt/web-platform-tests/workers/Worker-termination-with-port-messages.html b/tests/wpt/tests/workers/Worker-termination-with-port-messages.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-termination-with-port-messages.html rename to tests/wpt/tests/workers/Worker-termination-with-port-messages.html diff --git a/tests/wpt/web-platform-tests/workers/Worker-timeout-cancel-order.html b/tests/wpt/tests/workers/Worker-timeout-cancel-order.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-timeout-cancel-order.html rename to tests/wpt/tests/workers/Worker-timeout-cancel-order.html diff --git a/tests/wpt/web-platform-tests/workers/Worker-timeout-decreasing-order.html b/tests/wpt/tests/workers/Worker-timeout-decreasing-order.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-timeout-decreasing-order.html rename to tests/wpt/tests/workers/Worker-timeout-decreasing-order.html diff --git a/tests/wpt/web-platform-tests/workers/Worker-timeout-increasing-order.html b/tests/wpt/tests/workers/Worker-timeout-increasing-order.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker-timeout-increasing-order.html rename to tests/wpt/tests/workers/Worker-timeout-increasing-order.html diff --git a/tests/wpt/web-platform-tests/workers/WorkerGlobalScope-close.html b/tests/wpt/tests/workers/WorkerGlobalScope-close.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerGlobalScope-close.html rename to tests/wpt/tests/workers/WorkerGlobalScope-close.html diff --git a/tests/wpt/web-platform-tests/workers/WorkerGlobalScope_ErrorEvent_colno.htm b/tests/wpt/tests/workers/WorkerGlobalScope_ErrorEvent_colno.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerGlobalScope_ErrorEvent_colno.htm rename to tests/wpt/tests/workers/WorkerGlobalScope_ErrorEvent_colno.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerGlobalScope_ErrorEvent_filename.htm b/tests/wpt/tests/workers/WorkerGlobalScope_ErrorEvent_filename.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerGlobalScope_ErrorEvent_filename.htm rename to tests/wpt/tests/workers/WorkerGlobalScope_ErrorEvent_filename.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerGlobalScope_ErrorEvent_lineno.htm b/tests/wpt/tests/workers/WorkerGlobalScope_ErrorEvent_lineno.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerGlobalScope_ErrorEvent_lineno.htm rename to tests/wpt/tests/workers/WorkerGlobalScope_ErrorEvent_lineno.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerGlobalScope_ErrorEvent_message.htm b/tests/wpt/tests/workers/WorkerGlobalScope_ErrorEvent_message.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerGlobalScope_ErrorEvent_message.htm rename to tests/wpt/tests/workers/WorkerGlobalScope_ErrorEvent_message.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerGlobalScope_importScripts.htm b/tests/wpt/tests/workers/WorkerGlobalScope_importScripts.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerGlobalScope_importScripts.htm rename to tests/wpt/tests/workers/WorkerGlobalScope_importScripts.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerGlobalScope_importScripts_NetworkErr.htm b/tests/wpt/tests/workers/WorkerGlobalScope_importScripts_NetworkErr.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerGlobalScope_importScripts_NetworkErr.htm rename to tests/wpt/tests/workers/WorkerGlobalScope_importScripts_NetworkErr.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerGlobalScope_importScripts_NosniffErr.htm b/tests/wpt/tests/workers/WorkerGlobalScope_importScripts_NosniffErr.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerGlobalScope_importScripts_NosniffErr.htm rename to tests/wpt/tests/workers/WorkerGlobalScope_importScripts_NosniffErr.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerGlobalScope_requestAnimationFrame.tentative.worker.js b/tests/wpt/tests/workers/WorkerGlobalScope_requestAnimationFrame.tentative.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerGlobalScope_requestAnimationFrame.tentative.worker.js rename to tests/wpt/tests/workers/WorkerGlobalScope_requestAnimationFrame.tentative.worker.js diff --git a/tests/wpt/web-platform-tests/workers/WorkerGlobalScope_setInterval.htm b/tests/wpt/tests/workers/WorkerGlobalScope_setInterval.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerGlobalScope_setInterval.htm rename to tests/wpt/tests/workers/WorkerGlobalScope_setInterval.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerGlobalScope_setTimeout.htm b/tests/wpt/tests/workers/WorkerGlobalScope_setTimeout.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerGlobalScope_setTimeout.htm rename to tests/wpt/tests/workers/WorkerGlobalScope_setTimeout.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation-origin.sub.window.js b/tests/wpt/tests/workers/WorkerLocation-origin.sub.window.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation-origin.sub.window.js rename to tests/wpt/tests/workers/WorkerLocation-origin.sub.window.js diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation.htm b/tests/wpt/tests/workers/WorkerLocation.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation.htm rename to tests/wpt/tests/workers/WorkerLocation.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation_hash.htm b/tests/wpt/tests/workers/WorkerLocation_hash.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation_hash.htm rename to tests/wpt/tests/workers/WorkerLocation_hash.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation_hash_encoding.htm b/tests/wpt/tests/workers/WorkerLocation_hash_encoding.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation_hash_encoding.htm rename to tests/wpt/tests/workers/WorkerLocation_hash_encoding.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation_hash_nonexist.htm b/tests/wpt/tests/workers/WorkerLocation_hash_nonexist.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation_hash_nonexist.htm rename to tests/wpt/tests/workers/WorkerLocation_hash_nonexist.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation_host.htm b/tests/wpt/tests/workers/WorkerLocation_host.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation_host.htm rename to tests/wpt/tests/workers/WorkerLocation_host.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation_hostname.htm b/tests/wpt/tests/workers/WorkerLocation_hostname.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation_hostname.htm rename to tests/wpt/tests/workers/WorkerLocation_hostname.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation_href.htm b/tests/wpt/tests/workers/WorkerLocation_href.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation_href.htm rename to tests/wpt/tests/workers/WorkerLocation_href.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation_pathname.htm b/tests/wpt/tests/workers/WorkerLocation_pathname.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation_pathname.htm rename to tests/wpt/tests/workers/WorkerLocation_pathname.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation_port.htm b/tests/wpt/tests/workers/WorkerLocation_port.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation_port.htm rename to tests/wpt/tests/workers/WorkerLocation_port.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation_protocol.htm b/tests/wpt/tests/workers/WorkerLocation_protocol.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation_protocol.htm rename to tests/wpt/tests/workers/WorkerLocation_protocol.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation_search.htm b/tests/wpt/tests/workers/WorkerLocation_search.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation_search.htm rename to tests/wpt/tests/workers/WorkerLocation_search.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation_search_empty.htm b/tests/wpt/tests/workers/WorkerLocation_search_empty.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation_search_empty.htm rename to tests/wpt/tests/workers/WorkerLocation_search_empty.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation_search_fragment.htm b/tests/wpt/tests/workers/WorkerLocation_search_fragment.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation_search_fragment.htm rename to tests/wpt/tests/workers/WorkerLocation_search_fragment.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerLocation_search_nonexist.htm b/tests/wpt/tests/workers/WorkerLocation_search_nonexist.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerLocation_search_nonexist.htm rename to tests/wpt/tests/workers/WorkerLocation_search_nonexist.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerNavigator-hardware-concurrency.any.js b/tests/wpt/tests/workers/WorkerNavigator-hardware-concurrency.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerNavigator-hardware-concurrency.any.js rename to tests/wpt/tests/workers/WorkerNavigator-hardware-concurrency.any.js diff --git a/tests/wpt/web-platform-tests/workers/WorkerNavigator.any.js b/tests/wpt/tests/workers/WorkerNavigator.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerNavigator.any.js rename to tests/wpt/tests/workers/WorkerNavigator.any.js diff --git a/tests/wpt/web-platform-tests/workers/WorkerNavigator_appName.htm b/tests/wpt/tests/workers/WorkerNavigator_appName.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerNavigator_appName.htm rename to tests/wpt/tests/workers/WorkerNavigator_appName.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerNavigator_appVersion.htm b/tests/wpt/tests/workers/WorkerNavigator_appVersion.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerNavigator_appVersion.htm rename to tests/wpt/tests/workers/WorkerNavigator_appVersion.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerNavigator_onLine.htm b/tests/wpt/tests/workers/WorkerNavigator_onLine.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerNavigator_onLine.htm rename to tests/wpt/tests/workers/WorkerNavigator_onLine.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerNavigator_platform.htm b/tests/wpt/tests/workers/WorkerNavigator_platform.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerNavigator_platform.htm rename to tests/wpt/tests/workers/WorkerNavigator_platform.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerNavigator_userAgent.htm b/tests/wpt/tests/workers/WorkerNavigator_userAgent.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerNavigator_userAgent.htm rename to tests/wpt/tests/workers/WorkerNavigator_userAgent.htm diff --git a/tests/wpt/web-platform-tests/workers/WorkerNavigator_userAgentData.http.html b/tests/wpt/tests/workers/WorkerNavigator_userAgentData.http.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerNavigator_userAgentData.http.html rename to tests/wpt/tests/workers/WorkerNavigator_userAgentData.http.html diff --git a/tests/wpt/web-platform-tests/workers/WorkerNavigator_userAgentData.https.html b/tests/wpt/tests/workers/WorkerNavigator_userAgentData.https.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerNavigator_userAgentData.https.html rename to tests/wpt/tests/workers/WorkerNavigator_userAgentData.https.html diff --git a/tests/wpt/web-platform-tests/workers/WorkerPerformanceNow.html b/tests/wpt/tests/workers/WorkerPerformanceNow.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/WorkerPerformanceNow.html rename to tests/wpt/tests/workers/WorkerPerformanceNow.html diff --git a/tests/wpt/web-platform-tests/workers/Worker_ErrorEvent_bubbles_cancelable.htm b/tests/wpt/tests/workers/Worker_ErrorEvent_bubbles_cancelable.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker_ErrorEvent_bubbles_cancelable.htm rename to tests/wpt/tests/workers/Worker_ErrorEvent_bubbles_cancelable.htm diff --git a/tests/wpt/web-platform-tests/workers/Worker_ErrorEvent_error.htm b/tests/wpt/tests/workers/Worker_ErrorEvent_error.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker_ErrorEvent_error.htm rename to tests/wpt/tests/workers/Worker_ErrorEvent_error.htm diff --git a/tests/wpt/web-platform-tests/workers/Worker_ErrorEvent_filename.htm b/tests/wpt/tests/workers/Worker_ErrorEvent_filename.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker_ErrorEvent_filename.htm rename to tests/wpt/tests/workers/Worker_ErrorEvent_filename.htm diff --git a/tests/wpt/web-platform-tests/workers/Worker_ErrorEvent_lineno.htm b/tests/wpt/tests/workers/Worker_ErrorEvent_lineno.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker_ErrorEvent_lineno.htm rename to tests/wpt/tests/workers/Worker_ErrorEvent_lineno.htm diff --git a/tests/wpt/web-platform-tests/workers/Worker_ErrorEvent_message.htm b/tests/wpt/tests/workers/Worker_ErrorEvent_message.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker_ErrorEvent_message.htm rename to tests/wpt/tests/workers/Worker_ErrorEvent_message.htm diff --git a/tests/wpt/web-platform-tests/workers/Worker_ErrorEvent_type.htm b/tests/wpt/tests/workers/Worker_ErrorEvent_type.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker_ErrorEvent_type.htm rename to tests/wpt/tests/workers/Worker_ErrorEvent_type.htm diff --git a/tests/wpt/web-platform-tests/workers/Worker_NosniffErr.htm b/tests/wpt/tests/workers/Worker_NosniffErr.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker_NosniffErr.htm rename to tests/wpt/tests/workers/Worker_NosniffErr.htm diff --git a/tests/wpt/web-platform-tests/workers/Worker_basic.htm b/tests/wpt/tests/workers/Worker_basic.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker_basic.htm rename to tests/wpt/tests/workers/Worker_basic.htm diff --git a/tests/wpt/web-platform-tests/workers/Worker_cross_origin_security_err.htm b/tests/wpt/tests/workers/Worker_cross_origin_security_err.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker_cross_origin_security_err.htm rename to tests/wpt/tests/workers/Worker_cross_origin_security_err.htm diff --git a/tests/wpt/web-platform-tests/workers/Worker_dispatchEvent_ErrorEvent.htm b/tests/wpt/tests/workers/Worker_dispatchEvent_ErrorEvent.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker_dispatchEvent_ErrorEvent.htm rename to tests/wpt/tests/workers/Worker_dispatchEvent_ErrorEvent.htm diff --git a/tests/wpt/web-platform-tests/workers/Worker_script_mimetype.htm b/tests/wpt/tests/workers/Worker_script_mimetype.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker_script_mimetype.htm rename to tests/wpt/tests/workers/Worker_script_mimetype.htm diff --git a/tests/wpt/web-platform-tests/workers/Worker_terminate_event_queue.htm b/tests/wpt/tests/workers/Worker_terminate_event_queue.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/Worker_terminate_event_queue.htm rename to tests/wpt/tests/workers/Worker_terminate_event_queue.htm diff --git a/tests/wpt/web-platform-tests/workers/abrupt-completion.html b/tests/wpt/tests/workers/abrupt-completion.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/abrupt-completion.html rename to tests/wpt/tests/workers/abrupt-completion.html diff --git a/tests/wpt/web-platform-tests/workers/baseurl/alpha/import-in-moduleworker.html b/tests/wpt/tests/workers/baseurl/alpha/import-in-moduleworker.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/alpha/import-in-moduleworker.html rename to tests/wpt/tests/workers/baseurl/alpha/import-in-moduleworker.html diff --git a/tests/wpt/web-platform-tests/workers/baseurl/alpha/importScripts-in-sharedworker.html b/tests/wpt/tests/workers/baseurl/alpha/importScripts-in-sharedworker.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/alpha/importScripts-in-sharedworker.html rename to tests/wpt/tests/workers/baseurl/alpha/importScripts-in-sharedworker.html diff --git a/tests/wpt/web-platform-tests/workers/baseurl/alpha/importScripts-in-worker.html b/tests/wpt/tests/workers/baseurl/alpha/importScripts-in-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/alpha/importScripts-in-worker.html rename to tests/wpt/tests/workers/baseurl/alpha/importScripts-in-worker.html diff --git a/tests/wpt/web-platform-tests/workers/baseurl/alpha/sharedworker-in-worker.html b/tests/wpt/tests/workers/baseurl/alpha/sharedworker-in-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/alpha/sharedworker-in-worker.html rename to tests/wpt/tests/workers/baseurl/alpha/sharedworker-in-worker.html diff --git a/tests/wpt/web-platform-tests/workers/baseurl/alpha/worker-in-worker.html b/tests/wpt/tests/workers/baseurl/alpha/worker-in-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/alpha/worker-in-worker.html rename to tests/wpt/tests/workers/baseurl/alpha/worker-in-worker.html diff --git a/tests/wpt/web-platform-tests/workers/baseurl/alpha/xhr-in-moduleworker.html b/tests/wpt/tests/workers/baseurl/alpha/xhr-in-moduleworker.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/alpha/xhr-in-moduleworker.html rename to tests/wpt/tests/workers/baseurl/alpha/xhr-in-moduleworker.html diff --git a/tests/wpt/web-platform-tests/workers/baseurl/alpha/xhr-in-sharedworker.html b/tests/wpt/tests/workers/baseurl/alpha/xhr-in-sharedworker.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/alpha/xhr-in-sharedworker.html rename to tests/wpt/tests/workers/baseurl/alpha/xhr-in-sharedworker.html diff --git a/tests/wpt/web-platform-tests/workers/baseurl/alpha/xhr-in-worker.html b/tests/wpt/tests/workers/baseurl/alpha/xhr-in-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/alpha/xhr-in-worker.html rename to tests/wpt/tests/workers/baseurl/alpha/xhr-in-worker.html diff --git a/tests/wpt/web-platform-tests/workers/baseurl/beta/import.py b/tests/wpt/tests/workers/baseurl/beta/import.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/beta/import.py rename to tests/wpt/tests/workers/baseurl/beta/import.py diff --git a/tests/wpt/web-platform-tests/workers/baseurl/beta/importScripts.py b/tests/wpt/tests/workers/baseurl/beta/importScripts.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/beta/importScripts.py rename to tests/wpt/tests/workers/baseurl/beta/importScripts.py diff --git a/tests/wpt/web-platform-tests/workers/baseurl/beta/script.js b/tests/wpt/tests/workers/baseurl/beta/script.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/beta/script.js rename to tests/wpt/tests/workers/baseurl/beta/script.js diff --git a/tests/wpt/web-platform-tests/workers/baseurl/beta/sharedworker.py b/tests/wpt/tests/workers/baseurl/beta/sharedworker.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/beta/sharedworker.py rename to tests/wpt/tests/workers/baseurl/beta/sharedworker.py diff --git a/tests/wpt/web-platform-tests/workers/baseurl/beta/subsharedworker.js b/tests/wpt/tests/workers/baseurl/beta/subsharedworker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/beta/subsharedworker.js rename to tests/wpt/tests/workers/baseurl/beta/subsharedworker.js diff --git a/tests/wpt/web-platform-tests/workers/baseurl/beta/subworker.js b/tests/wpt/tests/workers/baseurl/beta/subworker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/beta/subworker.js rename to tests/wpt/tests/workers/baseurl/beta/subworker.js diff --git a/tests/wpt/web-platform-tests/workers/baseurl/beta/test.txt b/tests/wpt/tests/workers/baseurl/beta/test.txt similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/beta/test.txt rename to tests/wpt/tests/workers/baseurl/beta/test.txt diff --git a/tests/wpt/web-platform-tests/workers/baseurl/beta/worker.py b/tests/wpt/tests/workers/baseurl/beta/worker.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/beta/worker.py rename to tests/wpt/tests/workers/baseurl/beta/worker.py diff --git a/tests/wpt/web-platform-tests/workers/baseurl/beta/xhr-worker.py b/tests/wpt/tests/workers/baseurl/beta/xhr-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/beta/xhr-worker.py rename to tests/wpt/tests/workers/baseurl/beta/xhr-worker.py diff --git a/tests/wpt/web-platform-tests/workers/baseurl/beta/xhr.py b/tests/wpt/tests/workers/baseurl/beta/xhr.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/beta/xhr.py rename to tests/wpt/tests/workers/baseurl/beta/xhr.py diff --git a/tests/wpt/web-platform-tests/workers/baseurl/gamma/import.js b/tests/wpt/tests/workers/baseurl/gamma/import.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/gamma/import.js rename to tests/wpt/tests/workers/baseurl/gamma/import.js diff --git a/tests/wpt/web-platform-tests/workers/baseurl/gamma/importScripts.js b/tests/wpt/tests/workers/baseurl/gamma/importScripts.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/gamma/importScripts.js rename to tests/wpt/tests/workers/baseurl/gamma/importScripts.js diff --git a/tests/wpt/web-platform-tests/workers/baseurl/gamma/script-module.js b/tests/wpt/tests/workers/baseurl/gamma/script-module.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/gamma/script-module.js rename to tests/wpt/tests/workers/baseurl/gamma/script-module.js diff --git a/tests/wpt/web-platform-tests/workers/baseurl/gamma/script.js b/tests/wpt/tests/workers/baseurl/gamma/script.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/gamma/script.js rename to tests/wpt/tests/workers/baseurl/gamma/script.js diff --git a/tests/wpt/web-platform-tests/workers/baseurl/gamma/sharedworker.js b/tests/wpt/tests/workers/baseurl/gamma/sharedworker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/gamma/sharedworker.js rename to tests/wpt/tests/workers/baseurl/gamma/sharedworker.js diff --git a/tests/wpt/web-platform-tests/workers/baseurl/gamma/subsharedworker.js b/tests/wpt/tests/workers/baseurl/gamma/subsharedworker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/gamma/subsharedworker.js rename to tests/wpt/tests/workers/baseurl/gamma/subsharedworker.js diff --git a/tests/wpt/web-platform-tests/workers/baseurl/gamma/subworker.js b/tests/wpt/tests/workers/baseurl/gamma/subworker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/gamma/subworker.js rename to tests/wpt/tests/workers/baseurl/gamma/subworker.js diff --git a/tests/wpt/web-platform-tests/workers/baseurl/gamma/test.txt b/tests/wpt/tests/workers/baseurl/gamma/test.txt similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/gamma/test.txt rename to tests/wpt/tests/workers/baseurl/gamma/test.txt diff --git a/tests/wpt/web-platform-tests/workers/baseurl/gamma/worker.js b/tests/wpt/tests/workers/baseurl/gamma/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/gamma/worker.js rename to tests/wpt/tests/workers/baseurl/gamma/worker.js diff --git a/tests/wpt/web-platform-tests/workers/baseurl/gamma/xhr-worker.js b/tests/wpt/tests/workers/baseurl/gamma/xhr-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/gamma/xhr-worker.js rename to tests/wpt/tests/workers/baseurl/gamma/xhr-worker.js diff --git a/tests/wpt/web-platform-tests/workers/baseurl/gamma/xhr.js b/tests/wpt/tests/workers/baseurl/gamma/xhr.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/baseurl/gamma/xhr.js rename to tests/wpt/tests/workers/baseurl/gamma/xhr.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/1 b/tests/wpt/tests/workers/constructors/SharedWorker/1 similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/1 rename to tests/wpt/tests/workers/constructors/SharedWorker/1 diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/1.headers b/tests/wpt/tests/workers/constructors/SharedWorker/1.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/1.headers rename to tests/wpt/tests/workers/constructors/SharedWorker/1.headers diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/Infinity b/tests/wpt/tests/workers/constructors/SharedWorker/Infinity similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/Infinity rename to tests/wpt/tests/workers/constructors/SharedWorker/Infinity diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/Infinity-arguments.html b/tests/wpt/tests/workers/constructors/SharedWorker/Infinity-arguments.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/Infinity-arguments.html rename to tests/wpt/tests/workers/constructors/SharedWorker/Infinity-arguments.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/Infinity.headers b/tests/wpt/tests/workers/constructors/SharedWorker/Infinity.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/Infinity.headers rename to tests/wpt/tests/workers/constructors/SharedWorker/Infinity.headers diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/NaN b/tests/wpt/tests/workers/constructors/SharedWorker/NaN similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/NaN rename to tests/wpt/tests/workers/constructors/SharedWorker/NaN diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/NaN-arguments.html b/tests/wpt/tests/workers/constructors/SharedWorker/NaN-arguments.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/NaN-arguments.html rename to tests/wpt/tests/workers/constructors/SharedWorker/NaN-arguments.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/NaN.headers b/tests/wpt/tests/workers/constructors/SharedWorker/NaN.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/NaN.headers rename to tests/wpt/tests/workers/constructors/SharedWorker/NaN.headers diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/SharedWorker-constructor.html b/tests/wpt/tests/workers/constructors/SharedWorker/SharedWorker-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/SharedWorker-constructor.html rename to tests/wpt/tests/workers/constructors/SharedWorker/SharedWorker-constructor.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/URLMismatchError.htm b/tests/wpt/tests/workers/constructors/SharedWorker/URLMismatchError.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/URLMismatchError.htm rename to tests/wpt/tests/workers/constructors/SharedWorker/URLMismatchError.htm diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/connect-event.html b/tests/wpt/tests/workers/constructors/SharedWorker/connect-event.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/connect-event.html rename to tests/wpt/tests/workers/constructors/SharedWorker/connect-event.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/connect-event.js b/tests/wpt/tests/workers/constructors/SharedWorker/connect-event.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/connect-event.js rename to tests/wpt/tests/workers/constructors/SharedWorker/connect-event.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/dummy-name.html b/tests/wpt/tests/workers/constructors/SharedWorker/dummy-name.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/dummy-name.html rename to tests/wpt/tests/workers/constructors/SharedWorker/dummy-name.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/dummy-shared-worker.html b/tests/wpt/tests/workers/constructors/SharedWorker/dummy-shared-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/dummy-shared-worker.html rename to tests/wpt/tests/workers/constructors/SharedWorker/dummy-shared-worker.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/dummy-shared-worker.js b/tests/wpt/tests/workers/constructors/SharedWorker/dummy-shared-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/dummy-shared-worker.js rename to tests/wpt/tests/workers/constructors/SharedWorker/dummy-shared-worker.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/empty-name.html b/tests/wpt/tests/workers/constructors/SharedWorker/empty-name.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/empty-name.html rename to tests/wpt/tests/workers/constructors/SharedWorker/empty-name.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/empty.js b/tests/wpt/tests/workers/constructors/SharedWorker/empty.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/empty.js rename to tests/wpt/tests/workers/constructors/SharedWorker/empty.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/global-members.html b/tests/wpt/tests/workers/constructors/SharedWorker/global-members.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/global-members.html rename to tests/wpt/tests/workers/constructors/SharedWorker/global-members.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/global-members.js b/tests/wpt/tests/workers/constructors/SharedWorker/global-members.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/global-members.js rename to tests/wpt/tests/workers/constructors/SharedWorker/global-members.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/interface-objects.html b/tests/wpt/tests/workers/constructors/SharedWorker/interface-objects.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/interface-objects.html rename to tests/wpt/tests/workers/constructors/SharedWorker/interface-objects.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/interface-objects.js b/tests/wpt/tests/workers/constructors/SharedWorker/interface-objects.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/interface-objects.js rename to tests/wpt/tests/workers/constructors/SharedWorker/interface-objects.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/name.html b/tests/wpt/tests/workers/constructors/SharedWorker/name.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/name.html rename to tests/wpt/tests/workers/constructors/SharedWorker/name.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/name.js b/tests/wpt/tests/workers/constructors/SharedWorker/name.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/name.js rename to tests/wpt/tests/workers/constructors/SharedWorker/name.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/no-arguments-ctor.html b/tests/wpt/tests/workers/constructors/SharedWorker/no-arguments-ctor.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/no-arguments-ctor.html rename to tests/wpt/tests/workers/constructors/SharedWorker/no-arguments-ctor.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/null b/tests/wpt/tests/workers/constructors/SharedWorker/null similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/null rename to tests/wpt/tests/workers/constructors/SharedWorker/null diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/null-arguments.html b/tests/wpt/tests/workers/constructors/SharedWorker/null-arguments.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/null-arguments.html rename to tests/wpt/tests/workers/constructors/SharedWorker/null-arguments.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/null.headers b/tests/wpt/tests/workers/constructors/SharedWorker/null.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/null.headers rename to tests/wpt/tests/workers/constructors/SharedWorker/null.headers diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/number-arguments.html b/tests/wpt/tests/workers/constructors/SharedWorker/number-arguments.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/number-arguments.html rename to tests/wpt/tests/workers/constructors/SharedWorker/number-arguments.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/port-onmessage.html b/tests/wpt/tests/workers/constructors/SharedWorker/port-onmessage.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/port-onmessage.html rename to tests/wpt/tests/workers/constructors/SharedWorker/port-onmessage.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/port-onmessage.js b/tests/wpt/tests/workers/constructors/SharedWorker/port-onmessage.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/port-onmessage.js rename to tests/wpt/tests/workers/constructors/SharedWorker/port-onmessage.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/port-properties.html b/tests/wpt/tests/workers/constructors/SharedWorker/port-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/port-properties.html rename to tests/wpt/tests/workers/constructors/SharedWorker/port-properties.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/port-readonly.html b/tests/wpt/tests/workers/constructors/SharedWorker/port-readonly.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/port-readonly.html rename to tests/wpt/tests/workers/constructors/SharedWorker/port-readonly.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/same-origin.html b/tests/wpt/tests/workers/constructors/SharedWorker/same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/same-origin.html rename to tests/wpt/tests/workers/constructors/SharedWorker/same-origin.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/setting-port-members.html b/tests/wpt/tests/workers/constructors/SharedWorker/setting-port-members.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/setting-port-members.html rename to tests/wpt/tests/workers/constructors/SharedWorker/setting-port-members.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/shared-worker.js b/tests/wpt/tests/workers/constructors/SharedWorker/shared-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/shared-worker.js rename to tests/wpt/tests/workers/constructors/SharedWorker/shared-worker.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/undefined b/tests/wpt/tests/workers/constructors/SharedWorker/undefined similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/undefined rename to tests/wpt/tests/workers/constructors/SharedWorker/undefined diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/undefined-arguments.html b/tests/wpt/tests/workers/constructors/SharedWorker/undefined-arguments.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/undefined-arguments.html rename to tests/wpt/tests/workers/constructors/SharedWorker/undefined-arguments.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/undefined.headers b/tests/wpt/tests/workers/constructors/SharedWorker/undefined.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/undefined.headers rename to tests/wpt/tests/workers/constructors/SharedWorker/undefined.headers diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/unexpected-global-properties.html b/tests/wpt/tests/workers/constructors/SharedWorker/unexpected-global-properties.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/unexpected-global-properties.html rename to tests/wpt/tests/workers/constructors/SharedWorker/unexpected-global-properties.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/unexpected-global-properties.js b/tests/wpt/tests/workers/constructors/SharedWorker/unexpected-global-properties.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/unexpected-global-properties.js rename to tests/wpt/tests/workers/constructors/SharedWorker/unexpected-global-properties.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/SharedWorker/unresolvable-url.html b/tests/wpt/tests/workers/constructors/SharedWorker/unresolvable-url.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/SharedWorker/unresolvable-url.html rename to tests/wpt/tests/workers/constructors/SharedWorker/unresolvable-url.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/1 b/tests/wpt/tests/workers/constructors/Worker/1 similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/1 rename to tests/wpt/tests/workers/constructors/Worker/1 diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/1.headers b/tests/wpt/tests/workers/constructors/Worker/1.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/1.headers rename to tests/wpt/tests/workers/constructors/Worker/1.headers diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/AbstractWorker.onerror.html b/tests/wpt/tests/workers/constructors/Worker/AbstractWorker.onerror.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/AbstractWorker.onerror.html rename to tests/wpt/tests/workers/constructors/Worker/AbstractWorker.onerror.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/AbstractWorker.onerror.js b/tests/wpt/tests/workers/constructors/Worker/AbstractWorker.onerror.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/AbstractWorker.onerror.js rename to tests/wpt/tests/workers/constructors/Worker/AbstractWorker.onerror.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/Blob-url.html b/tests/wpt/tests/workers/constructors/Worker/Blob-url.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/Blob-url.html rename to tests/wpt/tests/workers/constructors/Worker/Blob-url.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/DedicatedWorkerGlobalScope-members.worker.js b/tests/wpt/tests/workers/constructors/Worker/DedicatedWorkerGlobalScope-members.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/DedicatedWorkerGlobalScope-members.worker.js rename to tests/wpt/tests/workers/constructors/Worker/DedicatedWorkerGlobalScope-members.worker.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/Worker-constructor.html b/tests/wpt/tests/workers/constructors/Worker/Worker-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/Worker-constructor.html rename to tests/wpt/tests/workers/constructors/Worker/Worker-constructor.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/ctor-1.html b/tests/wpt/tests/workers/constructors/Worker/ctor-1.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/ctor-1.html rename to tests/wpt/tests/workers/constructors/Worker/ctor-1.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/ctor-null.html b/tests/wpt/tests/workers/constructors/Worker/ctor-null.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/ctor-null.html rename to tests/wpt/tests/workers/constructors/Worker/ctor-null.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/ctor-undefined.html b/tests/wpt/tests/workers/constructors/Worker/ctor-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/ctor-undefined.html rename to tests/wpt/tests/workers/constructors/Worker/ctor-undefined.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/expected-self-properties.worker.js b/tests/wpt/tests/workers/constructors/Worker/expected-self-properties.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/expected-self-properties.worker.js rename to tests/wpt/tests/workers/constructors/Worker/expected-self-properties.worker.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/null b/tests/wpt/tests/workers/constructors/Worker/null similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/null rename to tests/wpt/tests/workers/constructors/Worker/null diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/null.headers b/tests/wpt/tests/workers/constructors/Worker/null.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/null.headers rename to tests/wpt/tests/workers/constructors/Worker/null.headers diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/same-origin.html b/tests/wpt/tests/workers/constructors/Worker/same-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/same-origin.html rename to tests/wpt/tests/workers/constructors/Worker/same-origin.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/sample_worker/worker.js b/tests/wpt/tests/workers/constructors/Worker/sample_worker/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/sample_worker/worker.js rename to tests/wpt/tests/workers/constructors/Worker/sample_worker/worker.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/terminate.html b/tests/wpt/tests/workers/constructors/Worker/terminate.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/terminate.html rename to tests/wpt/tests/workers/constructors/Worker/terminate.html diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/terminate.js b/tests/wpt/tests/workers/constructors/Worker/terminate.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/terminate.js rename to tests/wpt/tests/workers/constructors/Worker/terminate.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/undefined b/tests/wpt/tests/workers/constructors/Worker/undefined similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/undefined rename to tests/wpt/tests/workers/constructors/Worker/undefined diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/undefined.headers b/tests/wpt/tests/workers/constructors/Worker/undefined.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/undefined.headers rename to tests/wpt/tests/workers/constructors/Worker/undefined.headers diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/unexpected-self-properties.worker.js b/tests/wpt/tests/workers/constructors/Worker/unexpected-self-properties.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/unexpected-self-properties.worker.js rename to tests/wpt/tests/workers/constructors/Worker/unexpected-self-properties.worker.js diff --git a/tests/wpt/web-platform-tests/workers/constructors/Worker/use-base-url.html b/tests/wpt/tests/workers/constructors/Worker/use-base-url.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/constructors/Worker/use-base-url.html rename to tests/wpt/tests/workers/constructors/Worker/use-base-url.html diff --git a/tests/wpt/web-platform-tests/workers/data-url-shared-window.html b/tests/wpt/tests/workers/data-url-shared-window.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/data-url-shared-window.html rename to tests/wpt/tests/workers/data-url-shared-window.html diff --git a/tests/wpt/web-platform-tests/workers/data-url-shared.html b/tests/wpt/tests/workers/data-url-shared.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/data-url-shared.html rename to tests/wpt/tests/workers/data-url-shared.html diff --git a/tests/wpt/web-platform-tests/workers/data-url.html b/tests/wpt/tests/workers/data-url.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/data-url.html rename to tests/wpt/tests/workers/data-url.html diff --git a/tests/wpt/web-platform-tests/workers/dedicated-worker-from-blob-url.window.js b/tests/wpt/tests/workers/dedicated-worker-from-blob-url.window.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/dedicated-worker-from-blob-url.window.js rename to tests/wpt/tests/workers/dedicated-worker-from-blob-url.window.js diff --git a/tests/wpt/web-platform-tests/workers/dedicated-worker-in-data-url-context.window.js b/tests/wpt/tests/workers/dedicated-worker-in-data-url-context.window.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/dedicated-worker-in-data-url-context.window.js rename to tests/wpt/tests/workers/dedicated-worker-in-data-url-context.window.js diff --git a/tests/wpt/web-platform-tests/workers/dedicated-worker-parse-error-failure.html b/tests/wpt/tests/workers/dedicated-worker-parse-error-failure.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/dedicated-worker-parse-error-failure.html rename to tests/wpt/tests/workers/dedicated-worker-parse-error-failure.html diff --git a/tests/wpt/web-platform-tests/workers/examples/fetch_tests_from_worker.html b/tests/wpt/tests/workers/examples/fetch_tests_from_worker.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/examples/fetch_tests_from_worker.html rename to tests/wpt/tests/workers/examples/fetch_tests_from_worker.html diff --git a/tests/wpt/web-platform-tests/workers/examples/fetch_tests_from_worker.js b/tests/wpt/tests/workers/examples/fetch_tests_from_worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/examples/fetch_tests_from_worker.js rename to tests/wpt/tests/workers/examples/fetch_tests_from_worker.js diff --git a/tests/wpt/web-platform-tests/workers/examples/general.any.js b/tests/wpt/tests/workers/examples/general.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/examples/general.any.js rename to tests/wpt/tests/workers/examples/general.any.js diff --git a/tests/wpt/web-platform-tests/workers/examples/general.worker.js b/tests/wpt/tests/workers/examples/general.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/examples/general.worker.js rename to tests/wpt/tests/workers/examples/general.worker.js diff --git a/tests/wpt/web-platform-tests/workers/examples/onconnect.any.js b/tests/wpt/tests/workers/examples/onconnect.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/examples/onconnect.any.js rename to tests/wpt/tests/workers/examples/onconnect.any.js diff --git a/tests/wpt/web-platform-tests/workers/importscripts_mime.any.js b/tests/wpt/tests/workers/importscripts_mime.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/importscripts_mime.any.js rename to tests/wpt/tests/workers/importscripts_mime.any.js diff --git a/tests/wpt/web-platform-tests/workers/importscripts_mime_local.any.js b/tests/wpt/tests/workers/importscripts_mime_local.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/importscripts_mime_local.any.js rename to tests/wpt/tests/workers/importscripts_mime_local.any.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/EventTarget.worker.js b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/EventTarget.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/EventTarget.worker.js rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/EventTarget.worker.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/onmessage.worker.js b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/onmessage.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/onmessage.worker.js rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/onmessage.worker.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.html b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.html rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.js b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.js rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/imagedata-cloned-canvas-in-array.html b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/imagedata-cloned-canvas-in-array.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/imagedata-cloned-canvas-in-array.html rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/imagedata-cloned-canvas-in-array.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/imagedata-cloned-canvas-in-array.js b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/imagedata-cloned-canvas-in-array.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/imagedata-cloned-canvas-in-array.js rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/imagedata-cloned-canvas-in-array.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.html b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.html rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.js b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.js rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/return-value.worker.js b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/return-value.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/return-value.worker.js rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/return-value.worker.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-dictionary.html b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-dictionary.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-dictionary.html rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-dictionary.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-dictionary.js b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-dictionary.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-dictionary.js rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-dictionary.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null-in-array.html b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null-in-array.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null-in-array.html rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null-in-array.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null-in-array.js b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null-in-array.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null-in-array.js rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null-in-array.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.html b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.html rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.js b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.js rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-undefined.html b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-undefined.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-undefined.html rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-undefined.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-undefined.js b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-undefined.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-undefined.js rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-undefined.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/setting-postMessage.html b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/setting-postMessage.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/setting-postMessage.html rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/setting-postMessage.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/setting-postMessage.js b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/setting-postMessage.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/setting-postMessage.js rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/setting-postMessage.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-imagedata.html b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-imagedata.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-imagedata.html rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-imagedata.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-imagedata.js b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-imagedata.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-imagedata.js rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-imagedata.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-message.html b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-message.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-message.html rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-message.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-message.js b/tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-message.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-message.js rename to tests/wpt/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-message.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/SharedWorkerGlobalScope/name/getting.html b/tests/wpt/tests/workers/interfaces/SharedWorkerGlobalScope/name/getting.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/SharedWorkerGlobalScope/name/getting.html rename to tests/wpt/tests/workers/interfaces/SharedWorkerGlobalScope/name/getting.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/SharedWorkerGlobalScope/name/getting.js b/tests/wpt/tests/workers/interfaces/SharedWorkerGlobalScope/name/getting.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/SharedWorkerGlobalScope/name/getting.js rename to tests/wpt/tests/workers/interfaces/SharedWorkerGlobalScope/name/getting.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/SharedWorkerGlobalScope/name/setting.html b/tests/wpt/tests/workers/interfaces/SharedWorkerGlobalScope/name/setting.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/SharedWorkerGlobalScope/name/setting.html rename to tests/wpt/tests/workers/interfaces/SharedWorkerGlobalScope/name/setting.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/SharedWorkerGlobalScope/name/setting.js b/tests/wpt/tests/workers/interfaces/SharedWorkerGlobalScope/name/setting.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/SharedWorkerGlobalScope/name/setting.js rename to tests/wpt/tests/workers/interfaces/SharedWorkerGlobalScope/name/setting.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/SharedWorkerGlobalScope/onconnect.html b/tests/wpt/tests/workers/interfaces/SharedWorkerGlobalScope/onconnect.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/SharedWorkerGlobalScope/onconnect.html rename to tests/wpt/tests/workers/interfaces/SharedWorkerGlobalScope/onconnect.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/SharedWorkerGlobalScope/onconnect.js b/tests/wpt/tests/workers/interfaces/SharedWorkerGlobalScope/onconnect.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/SharedWorkerGlobalScope/onconnect.js rename to tests/wpt/tests/workers/interfaces/SharedWorkerGlobalScope/onconnect.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/incoming-message.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/incoming-message.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/incoming-message.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/incoming-message.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/incoming-message.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/incoming-message.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/incoming-message.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/incoming-message.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/sending-messages.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/sending-messages.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/sending-messages.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/sending-messages.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/sending-messages.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/sending-messages.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/sending-messages.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/sending-messages.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/setInterval.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/setInterval.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/setInterval.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/setInterval.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/setInterval.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/setInterval.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/setInterval.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/setInterval.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/setTimeout.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/setTimeout.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/setTimeout.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/setTimeout.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/setTimeout.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/setTimeout.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/close/setTimeout.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/close/setTimeout.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/helper-redirect.py b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/helper-redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/helper-redirect.py rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/helper-redirect.py diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/members.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/members.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/members.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/members.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/members.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/members.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/members.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/members.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/post-location-members.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/post-location-members.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/post-location-members.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/post-location-members.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect-module.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/redirect-module.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect-module.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/redirect-module.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect-sharedworker.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/redirect-sharedworker.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect-sharedworker.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/redirect-sharedworker.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/redirect.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/redirect.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/redirect.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/returns-same-object.any.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/returns-same-object.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/returns-same-object.any.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/returns-same-object.any.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/setting-members.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/setting-members.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/setting-members.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/setting-members.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/setting-members.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/setting-members.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/setting-members.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/setting-members.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/worker-separate-file.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/worker-separate-file.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/worker-separate-file.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/location/worker-separate-file.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/handled.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/handled.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/handled.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/handled.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/handled.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/handled.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/handled.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/handled.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-helper.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/message-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-helper.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/message-helper.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/not-handled.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/not-handled.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/not-handled.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/not-handled.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/not-handled.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/not-handled.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/not-handled.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/not-handled.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.html b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.html rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/throw.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/throw.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/throw.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/onerror/throw.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/self.any.js b/tests/wpt/tests/workers/interfaces/WorkerGlobalScope/self.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/self.any.js rename to tests/wpt/tests/workers/interfaces/WorkerGlobalScope/self.any.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/001.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/001.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/001.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/001.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/001.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/001.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/001.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/001.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/002.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/002.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/002.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/002.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/002.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/002.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/002.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/002.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/003.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/003.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/003.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/003.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/003.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/003.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/003.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/003.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/004.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/004.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/004.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/004.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/004.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/004.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/004.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/004.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/005.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/005.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/005.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/005.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/005.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/005.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/WindowTimers/005.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/WindowTimers/005.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/001.worker.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/001.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/001.worker.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/001.worker.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/002.worker.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/002.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/002.worker.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/002.worker.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/003.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/003.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/003.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/003.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/003.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/003.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/003.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/003.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/004.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/004.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/004.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/004.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/004.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/004.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/004.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/004.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/005.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/005.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/005.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/005.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/005.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/005.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/005.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/005.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/006.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/006.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/006.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/006.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/006.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/006.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/006.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/006.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/007.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/007.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/007.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/007.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/007.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/007.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/007.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/007.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/008.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/008.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/008.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/008.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/008.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/008.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/008.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/008.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/009.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/009.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/009.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/009.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/009.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/009.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/009.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/009.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/010.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/010.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/010.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/010.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/010.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/010.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/010.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/010.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/011.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/011.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/011.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/011.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/011.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/011.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/011.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/011.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/012.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/012.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/012.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/012.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/012.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/012.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/012.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/012.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/1 b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/1 similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/1 rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/1 diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/1.headers b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/1.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/1.headers rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/1.headers diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/blob-url.worker.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/blob-url.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/blob-url.worker.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/blob-url.worker.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/catch.sub.any.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/null b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/null similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/null rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/null diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/null.headers b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/null.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/null.headers rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/null.headers diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/report-error-cross-origin.sub.any.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-helper.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/report-error-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-helper.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/report-error-helper.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/report-error-redirect-to-cross-origin.sub.any.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/report-error-same-origin.sub.any.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-cross-origin.sub.any.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-redirect-to-cross-origin.sub.any.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/report-error-setTimeout-same-origin.sub.any.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/undefined b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/undefined similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/undefined rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/undefined diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/undefined.headers b/tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/undefined.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/importScripts/undefined.headers rename to tests/wpt/tests/workers/interfaces/WorkerUtils/importScripts/undefined.headers diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/002.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/002.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/002.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/002.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/002.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/002.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/002.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/002.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/003.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/003.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/003.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/003.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/003.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/003.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/003.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/003.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/004.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/004.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/004.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/004.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/004.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/004.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/004.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/004.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/005.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/005.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/005.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/005.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/005.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/005.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/005.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/005.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/006.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/006.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/006.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/006.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/006.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/006.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/006.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/006.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/007.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/007.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/007.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/007.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/007.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/007.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/007.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/007.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/008.worker.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/008.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/008.worker.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/008.worker.js diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/language.html b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/language.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/language.html rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/language.html diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/language.js b/tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/language.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/interfaces/WorkerUtils/navigator/language.js rename to tests/wpt/tests/workers/interfaces/WorkerUtils/navigator/language.js diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-blob-url.any.js b/tests/wpt/tests/workers/modules/dedicated-worker-import-blob-url.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-blob-url.any.js rename to tests/wpt/tests/workers/modules/dedicated-worker-import-blob-url.any.js diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-csp.html b/tests/wpt/tests/workers/modules/dedicated-worker-import-csp.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-csp.html rename to tests/wpt/tests/workers/modules/dedicated-worker-import-csp.html diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-data-url-cross-origin.html b/tests/wpt/tests/workers/modules/dedicated-worker-import-data-url-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-data-url-cross-origin.html rename to tests/wpt/tests/workers/modules/dedicated-worker-import-data-url-cross-origin.html diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-data-url.any.js b/tests/wpt/tests/workers/modules/dedicated-worker-import-data-url.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-data-url.any.js rename to tests/wpt/tests/workers/modules/dedicated-worker-import-data-url.any.js diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-failure.html b/tests/wpt/tests/workers/modules/dedicated-worker-import-failure.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-failure.html rename to tests/wpt/tests/workers/modules/dedicated-worker-import-failure.html diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-meta.html b/tests/wpt/tests/workers/modules/dedicated-worker-import-meta.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-meta.html rename to tests/wpt/tests/workers/modules/dedicated-worker-import-meta.html diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-referrer.html b/tests/wpt/tests/workers/modules/dedicated-worker-import-referrer.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-referrer.html rename to tests/wpt/tests/workers/modules/dedicated-worker-import-referrer.html diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import.any.js b/tests/wpt/tests/workers/modules/dedicated-worker-import.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import.any.js rename to tests/wpt/tests/workers/modules/dedicated-worker-import.any.js diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-options-credentials.html b/tests/wpt/tests/workers/modules/dedicated-worker-options-credentials.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/dedicated-worker-options-credentials.html rename to tests/wpt/tests/workers/modules/dedicated-worker-options-credentials.html diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-options-credentials.html.headers b/tests/wpt/tests/workers/modules/dedicated-worker-options-credentials.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/dedicated-worker-options-credentials.html.headers rename to tests/wpt/tests/workers/modules/dedicated-worker-options-credentials.html.headers diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-options-type.html b/tests/wpt/tests/workers/modules/dedicated-worker-options-type.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/dedicated-worker-options-type.html rename to tests/wpt/tests/workers/modules/dedicated-worker-options-type.html diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-parse-error-failure.html b/tests/wpt/tests/workers/modules/dedicated-worker-parse-error-failure.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/dedicated-worker-parse-error-failure.html rename to tests/wpt/tests/workers/modules/dedicated-worker-parse-error-failure.html diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-and-then-static-import-worker.js b/tests/wpt/tests/workers/modules/resources/dynamic-import-and-then-static-import-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-and-then-static-import-worker.js rename to tests/wpt/tests/workers/modules/resources/dynamic-import-and-then-static-import-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-data-url-block-cross-origin.js b/tests/wpt/tests/workers/modules/resources/dynamic-import-data-url-block-cross-origin.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-data-url-block-cross-origin.js rename to tests/wpt/tests/workers/modules/resources/dynamic-import-data-url-block-cross-origin.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-given-url-worker.js b/tests/wpt/tests/workers/modules/resources/dynamic-import-given-url-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-given-url-worker.js rename to tests/wpt/tests/workers/modules/resources/dynamic-import-given-url-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-remote-origin-credentials-checker-worker.sub.js b/tests/wpt/tests/workers/modules/resources/dynamic-import-remote-origin-credentials-checker-worker.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-remote-origin-credentials-checker-worker.sub.js rename to tests/wpt/tests/workers/modules/resources/dynamic-import-remote-origin-credentials-checker-worker.sub.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-remote-origin-referrer-checker-worker.sub.js b/tests/wpt/tests/workers/modules/resources/dynamic-import-remote-origin-referrer-checker-worker.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-remote-origin-referrer-checker-worker.sub.js rename to tests/wpt/tests/workers/modules/resources/dynamic-import-remote-origin-referrer-checker-worker.sub.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-remote-origin-script-worker.sub.js b/tests/wpt/tests/workers/modules/resources/dynamic-import-remote-origin-script-worker.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-remote-origin-script-worker.sub.js rename to tests/wpt/tests/workers/modules/resources/dynamic-import-remote-origin-script-worker.sub.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-same-origin-credentials-checker-worker.js b/tests/wpt/tests/workers/modules/resources/dynamic-import-same-origin-credentials-checker-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-same-origin-credentials-checker-worker.js rename to tests/wpt/tests/workers/modules/resources/dynamic-import-same-origin-credentials-checker-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-same-origin-referrer-checker-worker.js b/tests/wpt/tests/workers/modules/resources/dynamic-import-same-origin-referrer-checker-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-same-origin-referrer-checker-worker.js rename to tests/wpt/tests/workers/modules/resources/dynamic-import-same-origin-referrer-checker-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-script-block-cross-origin.js b/tests/wpt/tests/workers/modules/resources/dynamic-import-script-block-cross-origin.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-script-block-cross-origin.js rename to tests/wpt/tests/workers/modules/resources/dynamic-import-script-block-cross-origin.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-worker.js b/tests/wpt/tests/workers/modules/resources/dynamic-import-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-worker.js rename to tests/wpt/tests/workers/modules/resources/dynamic-import-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/empty-worker.js b/tests/wpt/tests/workers/modules/resources/empty-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/empty-worker.js rename to tests/wpt/tests/workers/modules/resources/empty-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/eval-dynamic-import-worker.js b/tests/wpt/tests/workers/modules/resources/eval-dynamic-import-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/eval-dynamic-import-worker.js rename to tests/wpt/tests/workers/modules/resources/eval-dynamic-import-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/export-block-cross-origin.js b/tests/wpt/tests/workers/modules/resources/export-block-cross-origin.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/export-block-cross-origin.js rename to tests/wpt/tests/workers/modules/resources/export-block-cross-origin.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/export-credentials.py b/tests/wpt/tests/workers/modules/resources/export-credentials.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/export-credentials.py rename to tests/wpt/tests/workers/modules/resources/export-credentials.py diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/export-on-dynamic-import-script.js b/tests/wpt/tests/workers/modules/resources/export-on-dynamic-import-script.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/export-on-dynamic-import-script.js rename to tests/wpt/tests/workers/modules/resources/export-on-dynamic-import-script.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/export-on-dynamic-import-script.js.headers b/tests/wpt/tests/workers/modules/resources/export-on-dynamic-import-script.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/export-on-dynamic-import-script.js.headers rename to tests/wpt/tests/workers/modules/resources/export-on-dynamic-import-script.js.headers diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/export-on-load-script.js b/tests/wpt/tests/workers/modules/resources/export-on-load-script.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/export-on-load-script.js rename to tests/wpt/tests/workers/modules/resources/export-on-load-script.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/export-on-load-script.js.headers b/tests/wpt/tests/workers/modules/resources/export-on-load-script.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/export-on-load-script.js.headers rename to tests/wpt/tests/workers/modules/resources/export-on-load-script.js.headers diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/export-on-load-script.py b/tests/wpt/tests/workers/modules/resources/export-on-load-script.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/export-on-load-script.py rename to tests/wpt/tests/workers/modules/resources/export-on-load-script.py diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/export-on-static-import-script.js b/tests/wpt/tests/workers/modules/resources/export-on-static-import-script.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/export-on-static-import-script.js rename to tests/wpt/tests/workers/modules/resources/export-on-static-import-script.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/export-on-static-import-script.js.headers b/tests/wpt/tests/workers/modules/resources/export-on-static-import-script.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/export-on-static-import-script.js.headers rename to tests/wpt/tests/workers/modules/resources/export-on-static-import-script.js.headers diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/export-referrer-checker.py b/tests/wpt/tests/workers/modules/resources/export-referrer-checker.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/export-referrer-checker.py rename to tests/wpt/tests/workers/modules/resources/export-referrer-checker.py diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/import-meta-url-export.js b/tests/wpt/tests/workers/modules/resources/import-meta-url-export.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/import-meta-url-export.js rename to tests/wpt/tests/workers/modules/resources/import-meta-url-export.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/import-meta-url-worker.js b/tests/wpt/tests/workers/modules/resources/import-meta-url-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/import-meta-url-worker.js rename to tests/wpt/tests/workers/modules/resources/import-meta-url-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/import-scripts-worker.js b/tests/wpt/tests/workers/modules/resources/import-scripts-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/import-scripts-worker.js rename to tests/wpt/tests/workers/modules/resources/import-scripts-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/import-test-cases.js b/tests/wpt/tests/workers/modules/resources/import-test-cases.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/import-test-cases.js rename to tests/wpt/tests/workers/modules/resources/import-test-cases.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/nested-dynamic-import-worker.js b/tests/wpt/tests/workers/modules/resources/nested-dynamic-import-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/nested-dynamic-import-worker.js rename to tests/wpt/tests/workers/modules/resources/nested-dynamic-import-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/nested-static-import-worker.js b/tests/wpt/tests/workers/modules/resources/nested-static-import-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/nested-static-import-worker.js rename to tests/wpt/tests/workers/modules/resources/nested-static-import-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/new-shared-worker-window.html b/tests/wpt/tests/workers/modules/resources/new-shared-worker-window.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/new-shared-worker-window.html rename to tests/wpt/tests/workers/modules/resources/new-shared-worker-window.html diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/new-worker-window.html b/tests/wpt/tests/workers/modules/resources/new-worker-window.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/new-worker-window.html rename to tests/wpt/tests/workers/modules/resources/new-worker-window.html diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/post-message-on-load-worker.js b/tests/wpt/tests/workers/modules/resources/post-message-on-load-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/post-message-on-load-worker.js rename to tests/wpt/tests/workers/modules/resources/post-message-on-load-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/postmessage-credentials.py b/tests/wpt/tests/workers/modules/resources/postmessage-credentials.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/postmessage-credentials.py rename to tests/wpt/tests/workers/modules/resources/postmessage-credentials.py diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/postmessage-referrer-checker.py b/tests/wpt/tests/workers/modules/resources/postmessage-referrer-checker.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/postmessage-referrer-checker.py rename to tests/wpt/tests/workers/modules/resources/postmessage-referrer-checker.py diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/redirect.py b/tests/wpt/tests/workers/modules/resources/redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/redirect.py rename to tests/wpt/tests/workers/modules/resources/redirect.py diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/static-import-and-then-dynamic-import-worker.js b/tests/wpt/tests/workers/modules/resources/static-import-and-then-dynamic-import-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/static-import-and-then-dynamic-import-worker.js rename to tests/wpt/tests/workers/modules/resources/static-import-and-then-dynamic-import-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/static-import-data-url-block-cross-origin.js b/tests/wpt/tests/workers/modules/resources/static-import-data-url-block-cross-origin.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/static-import-data-url-block-cross-origin.js rename to tests/wpt/tests/workers/modules/resources/static-import-data-url-block-cross-origin.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/static-import-non-existent-script-worker.js b/tests/wpt/tests/workers/modules/resources/static-import-non-existent-script-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/static-import-non-existent-script-worker.js rename to tests/wpt/tests/workers/modules/resources/static-import-non-existent-script-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/static-import-redirect-worker.js b/tests/wpt/tests/workers/modules/resources/static-import-redirect-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/static-import-redirect-worker.js rename to tests/wpt/tests/workers/modules/resources/static-import-redirect-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/static-import-remote-origin-credentials-checker-worker.sub.js b/tests/wpt/tests/workers/modules/resources/static-import-remote-origin-credentials-checker-worker.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/static-import-remote-origin-credentials-checker-worker.sub.js rename to tests/wpt/tests/workers/modules/resources/static-import-remote-origin-credentials-checker-worker.sub.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/static-import-remote-origin-referrer-checker-worker.sub.js b/tests/wpt/tests/workers/modules/resources/static-import-remote-origin-referrer-checker-worker.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/static-import-remote-origin-referrer-checker-worker.sub.js rename to tests/wpt/tests/workers/modules/resources/static-import-remote-origin-referrer-checker-worker.sub.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/static-import-remote-origin-script-worker.sub.js b/tests/wpt/tests/workers/modules/resources/static-import-remote-origin-script-worker.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/static-import-remote-origin-script-worker.sub.js rename to tests/wpt/tests/workers/modules/resources/static-import-remote-origin-script-worker.sub.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/static-import-same-origin-credentials-checker-worker.js b/tests/wpt/tests/workers/modules/resources/static-import-same-origin-credentials-checker-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/static-import-same-origin-credentials-checker-worker.js rename to tests/wpt/tests/workers/modules/resources/static-import-same-origin-credentials-checker-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/static-import-same-origin-referrer-checker-worker.js b/tests/wpt/tests/workers/modules/resources/static-import-same-origin-referrer-checker-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/static-import-same-origin-referrer-checker-worker.js rename to tests/wpt/tests/workers/modules/resources/static-import-same-origin-referrer-checker-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/static-import-script-block-cross-origin.js b/tests/wpt/tests/workers/modules/resources/static-import-script-block-cross-origin.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/static-import-script-block-cross-origin.js rename to tests/wpt/tests/workers/modules/resources/static-import-script-block-cross-origin.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/static-import-syntax-error.js b/tests/wpt/tests/workers/modules/resources/static-import-syntax-error.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/static-import-syntax-error.js rename to tests/wpt/tests/workers/modules/resources/static-import-syntax-error.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/static-import-worker.js b/tests/wpt/tests/workers/modules/resources/static-import-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/static-import-worker.js rename to tests/wpt/tests/workers/modules/resources/static-import-worker.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/syntax-error.js b/tests/wpt/tests/workers/modules/resources/syntax-error.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/syntax-error.js rename to tests/wpt/tests/workers/modules/resources/syntax-error.js diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/throw.js b/tests/wpt/tests/workers/modules/resources/throw.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/resources/throw.js rename to tests/wpt/tests/workers/modules/resources/throw.js diff --git a/tests/wpt/web-platform-tests/workers/modules/shared-worker-import-blob-url.window.js b/tests/wpt/tests/workers/modules/shared-worker-import-blob-url.window.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/shared-worker-import-blob-url.window.js rename to tests/wpt/tests/workers/modules/shared-worker-import-blob-url.window.js diff --git a/tests/wpt/web-platform-tests/workers/modules/shared-worker-import-csp.html b/tests/wpt/tests/workers/modules/shared-worker-import-csp.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/shared-worker-import-csp.html rename to tests/wpt/tests/workers/modules/shared-worker-import-csp.html diff --git a/tests/wpt/web-platform-tests/workers/modules/shared-worker-import-data-url-cross-origin.html b/tests/wpt/tests/workers/modules/shared-worker-import-data-url-cross-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/shared-worker-import-data-url-cross-origin.html rename to tests/wpt/tests/workers/modules/shared-worker-import-data-url-cross-origin.html diff --git a/tests/wpt/web-platform-tests/workers/modules/shared-worker-import-data-url.window.js b/tests/wpt/tests/workers/modules/shared-worker-import-data-url.window.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/shared-worker-import-data-url.window.js rename to tests/wpt/tests/workers/modules/shared-worker-import-data-url.window.js diff --git a/tests/wpt/web-platform-tests/workers/modules/shared-worker-import-failure.html b/tests/wpt/tests/workers/modules/shared-worker-import-failure.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/shared-worker-import-failure.html rename to tests/wpt/tests/workers/modules/shared-worker-import-failure.html diff --git a/tests/wpt/web-platform-tests/workers/modules/shared-worker-import-meta.html b/tests/wpt/tests/workers/modules/shared-worker-import-meta.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/shared-worker-import-meta.html rename to tests/wpt/tests/workers/modules/shared-worker-import-meta.html diff --git a/tests/wpt/web-platform-tests/workers/modules/shared-worker-import-referrer.html b/tests/wpt/tests/workers/modules/shared-worker-import-referrer.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/shared-worker-import-referrer.html rename to tests/wpt/tests/workers/modules/shared-worker-import-referrer.html diff --git a/tests/wpt/web-platform-tests/workers/modules/shared-worker-import.window.js b/tests/wpt/tests/workers/modules/shared-worker-import.window.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/shared-worker-import.window.js rename to tests/wpt/tests/workers/modules/shared-worker-import.window.js diff --git a/tests/wpt/web-platform-tests/workers/modules/shared-worker-options-credentials.html b/tests/wpt/tests/workers/modules/shared-worker-options-credentials.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/shared-worker-options-credentials.html rename to tests/wpt/tests/workers/modules/shared-worker-options-credentials.html diff --git a/tests/wpt/web-platform-tests/workers/modules/shared-worker-options-credentials.html.headers b/tests/wpt/tests/workers/modules/shared-worker-options-credentials.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/shared-worker-options-credentials.html.headers rename to tests/wpt/tests/workers/modules/shared-worker-options-credentials.html.headers diff --git a/tests/wpt/web-platform-tests/workers/modules/shared-worker-options-type.html b/tests/wpt/tests/workers/modules/shared-worker-options-type.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/shared-worker-options-type.html rename to tests/wpt/tests/workers/modules/shared-worker-options-type.html diff --git a/tests/wpt/web-platform-tests/workers/modules/shared-worker-parse-error-failure.html b/tests/wpt/tests/workers/modules/shared-worker-parse-error-failure.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/modules/shared-worker-parse-error-failure.html rename to tests/wpt/tests/workers/modules/shared-worker-parse-error-failure.html diff --git a/tests/wpt/web-platform-tests/workers/multi-globals/current/current.html b/tests/wpt/tests/workers/multi-globals/current/current.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/multi-globals/current/current.html rename to tests/wpt/tests/workers/multi-globals/current/current.html diff --git a/tests/wpt/web-platform-tests/workers/multi-globals/current/worker.js b/tests/wpt/tests/workers/multi-globals/current/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/multi-globals/current/worker.js rename to tests/wpt/tests/workers/multi-globals/current/worker.js diff --git a/tests/wpt/web-platform-tests/workers/multi-globals/incumbent/incumbent.html b/tests/wpt/tests/workers/multi-globals/incumbent/incumbent.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/multi-globals/incumbent/incumbent.html rename to tests/wpt/tests/workers/multi-globals/incumbent/incumbent.html diff --git a/tests/wpt/web-platform-tests/workers/multi-globals/incumbent/worker.js b/tests/wpt/tests/workers/multi-globals/incumbent/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/multi-globals/incumbent/worker.js rename to tests/wpt/tests/workers/multi-globals/incumbent/worker.js diff --git a/tests/wpt/web-platform-tests/workers/multi-globals/url-parsing.html b/tests/wpt/tests/workers/multi-globals/url-parsing.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/multi-globals/url-parsing.html rename to tests/wpt/tests/workers/multi-globals/url-parsing.html diff --git a/tests/wpt/web-platform-tests/workers/multi-globals/worker.js b/tests/wpt/tests/workers/multi-globals/worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/multi-globals/worker.js rename to tests/wpt/tests/workers/multi-globals/worker.js diff --git a/tests/wpt/web-platform-tests/workers/name-property.html b/tests/wpt/tests/workers/name-property.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/name-property.html rename to tests/wpt/tests/workers/name-property.html diff --git a/tests/wpt/web-platform-tests/workers/nested_worker.worker.js b/tests/wpt/tests/workers/nested_worker.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/nested_worker.worker.js rename to tests/wpt/tests/workers/nested_worker.worker.js diff --git a/tests/wpt/web-platform-tests/workers/nested_worker_close_from_parent_worker.html b/tests/wpt/tests/workers/nested_worker_close_from_parent_worker.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/nested_worker_close_from_parent_worker.html rename to tests/wpt/tests/workers/nested_worker_close_from_parent_worker.html diff --git a/tests/wpt/web-platform-tests/workers/nested_worker_close_self.worker.js b/tests/wpt/tests/workers/nested_worker_close_self.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/nested_worker_close_self.worker.js rename to tests/wpt/tests/workers/nested_worker_close_self.worker.js diff --git a/tests/wpt/web-platform-tests/workers/nested_worker_importScripts.worker.js b/tests/wpt/tests/workers/nested_worker_importScripts.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/nested_worker_importScripts.worker.js rename to tests/wpt/tests/workers/nested_worker_importScripts.worker.js diff --git a/tests/wpt/web-platform-tests/workers/nested_worker_sync_xhr.worker.js b/tests/wpt/tests/workers/nested_worker_sync_xhr.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/nested_worker_sync_xhr.worker.js rename to tests/wpt/tests/workers/nested_worker_sync_xhr.worker.js diff --git a/tests/wpt/web-platform-tests/workers/nested_worker_terminate_from_document.html b/tests/wpt/tests/workers/nested_worker_terminate_from_document.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/nested_worker_terminate_from_document.html rename to tests/wpt/tests/workers/nested_worker_terminate_from_document.html diff --git a/tests/wpt/web-platform-tests/workers/non-automated/infinite-nested.html b/tests/wpt/tests/workers/non-automated/infinite-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/non-automated/infinite-nested.html rename to tests/wpt/tests/workers/non-automated/infinite-nested.html diff --git a/tests/wpt/web-platform-tests/workers/non-automated/infinite-nested.js b/tests/wpt/tests/workers/non-automated/infinite-nested.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/non-automated/infinite-nested.js rename to tests/wpt/tests/workers/non-automated/infinite-nested.js diff --git a/tests/wpt/web-platform-tests/workers/non-automated/infinite-sibling-and-nested.html b/tests/wpt/tests/workers/non-automated/infinite-sibling-and-nested.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/non-automated/infinite-sibling-and-nested.html rename to tests/wpt/tests/workers/non-automated/infinite-sibling-and-nested.html diff --git a/tests/wpt/web-platform-tests/workers/non-automated/infinite-sibling-and-nested.js b/tests/wpt/tests/workers/non-automated/infinite-sibling-and-nested.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/non-automated/infinite-sibling-and-nested.js rename to tests/wpt/tests/workers/non-automated/infinite-sibling-and-nested.js diff --git a/tests/wpt/web-platform-tests/workers/non-automated/infinite-sibling.html b/tests/wpt/tests/workers/non-automated/infinite-sibling.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/non-automated/infinite-sibling.html rename to tests/wpt/tests/workers/non-automated/infinite-sibling.html diff --git a/tests/wpt/web-platform-tests/workers/non-automated/infinite-sibling.js b/tests/wpt/tests/workers/non-automated/infinite-sibling.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/non-automated/infinite-sibling.js rename to tests/wpt/tests/workers/non-automated/infinite-sibling.js diff --git a/tests/wpt/web-platform-tests/workers/non-automated/navigator-onLine.html b/tests/wpt/tests/workers/non-automated/navigator-onLine.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/non-automated/navigator-onLine.html rename to tests/wpt/tests/workers/non-automated/navigator-onLine.html diff --git a/tests/wpt/web-platform-tests/workers/non-automated/navigator-onLine.js b/tests/wpt/tests/workers/non-automated/navigator-onLine.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/non-automated/navigator-onLine.js rename to tests/wpt/tests/workers/non-automated/navigator-onLine.js diff --git a/tests/wpt/web-platform-tests/workers/non-automated/post-a-1.js b/tests/wpt/tests/workers/non-automated/post-a-1.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/non-automated/post-a-1.js rename to tests/wpt/tests/workers/non-automated/post-a-1.js diff --git a/tests/wpt/web-platform-tests/workers/opaque-origin.html b/tests/wpt/tests/workers/opaque-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/opaque-origin.html rename to tests/wpt/tests/workers/opaque-origin.html diff --git a/tests/wpt/web-platform-tests/workers/postMessage_DataCloneErr.htm b/tests/wpt/tests/workers/postMessage_DataCloneErr.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/postMessage_DataCloneErr.htm rename to tests/wpt/tests/workers/postMessage_DataCloneErr.htm diff --git a/tests/wpt/web-platform-tests/workers/postMessage_block.https.html b/tests/wpt/tests/workers/postMessage_block.https.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/postMessage_block.https.html rename to tests/wpt/tests/workers/postMessage_block.https.html diff --git a/tests/wpt/web-platform-tests/workers/postMessage_block.https.html.headers b/tests/wpt/tests/workers/postMessage_block.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/postMessage_block.https.html.headers rename to tests/wpt/tests/workers/postMessage_block.https.html.headers diff --git a/tests/wpt/web-platform-tests/workers/postMessage_clone_port.htm b/tests/wpt/tests/workers/postMessage_clone_port.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/postMessage_clone_port.htm rename to tests/wpt/tests/workers/postMessage_clone_port.htm diff --git a/tests/wpt/web-platform-tests/workers/postMessage_clone_port_error.htm b/tests/wpt/tests/workers/postMessage_clone_port_error.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/postMessage_clone_port_error.htm rename to tests/wpt/tests/workers/postMessage_clone_port_error.htm diff --git a/tests/wpt/web-platform-tests/workers/postMessage_event_properties.htm b/tests/wpt/tests/workers/postMessage_event_properties.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/postMessage_event_properties.htm rename to tests/wpt/tests/workers/postMessage_event_properties.htm diff --git a/tests/wpt/web-platform-tests/workers/postMessage_ports_readonly_array.htm b/tests/wpt/tests/workers/postMessage_ports_readonly_array.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/postMessage_ports_readonly_array.htm rename to tests/wpt/tests/workers/postMessage_ports_readonly_array.htm diff --git a/tests/wpt/web-platform-tests/workers/postMessage_target_source.htm b/tests/wpt/tests/workers/postMessage_target_source.htm similarity index 100% rename from tests/wpt/web-platform-tests/workers/postMessage_target_source.htm rename to tests/wpt/tests/workers/postMessage_target_source.htm diff --git a/tests/wpt/web-platform-tests/workers/same-origin-check.sub.html b/tests/wpt/tests/workers/same-origin-check.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/same-origin-check.sub.html rename to tests/wpt/tests/workers/same-origin-check.sub.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/encodings/001.html b/tests/wpt/tests/workers/semantics/encodings/001.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/encodings/001.html rename to tests/wpt/tests/workers/semantics/encodings/001.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/encodings/001.js b/tests/wpt/tests/workers/semantics/encodings/001.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/encodings/001.js rename to tests/wpt/tests/workers/semantics/encodings/001.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/encodings/001.js.headers b/tests/wpt/tests/workers/semantics/encodings/001.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/encodings/001.js.headers rename to tests/wpt/tests/workers/semantics/encodings/001.js.headers diff --git a/tests/wpt/web-platform-tests/workers/semantics/encodings/002.html b/tests/wpt/tests/workers/semantics/encodings/002.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/encodings/002.html rename to tests/wpt/tests/workers/semantics/encodings/002.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/encodings/002.js b/tests/wpt/tests/workers/semantics/encodings/002.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/encodings/002.js rename to tests/wpt/tests/workers/semantics/encodings/002.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/encodings/002.js.headers b/tests/wpt/tests/workers/semantics/encodings/002.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/encodings/002.js.headers rename to tests/wpt/tests/workers/semantics/encodings/002.js.headers diff --git a/tests/wpt/web-platform-tests/workers/semantics/encodings/003-1.py b/tests/wpt/tests/workers/semantics/encodings/003-1.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/encodings/003-1.py rename to tests/wpt/tests/workers/semantics/encodings/003-1.py diff --git a/tests/wpt/web-platform-tests/workers/semantics/encodings/003.html b/tests/wpt/tests/workers/semantics/encodings/003.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/encodings/003.html rename to tests/wpt/tests/workers/semantics/encodings/003.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/encodings/003.js b/tests/wpt/tests/workers/semantics/encodings/003.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/encodings/003.js rename to tests/wpt/tests/workers/semantics/encodings/003.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/encodings/004.html b/tests/wpt/tests/workers/semantics/encodings/004.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/encodings/004.html rename to tests/wpt/tests/workers/semantics/encodings/004.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/encodings/004.js b/tests/wpt/tests/workers/semantics/encodings/004.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/encodings/004.js rename to tests/wpt/tests/workers/semantics/encodings/004.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/encodings/004.worker.js b/tests/wpt/tests/workers/semantics/encodings/004.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/encodings/004.worker.js rename to tests/wpt/tests/workers/semantics/encodings/004.worker.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/interface-objects/001.worker.js b/tests/wpt/tests/workers/semantics/interface-objects/001.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/interface-objects/001.worker.js rename to tests/wpt/tests/workers/semantics/interface-objects/001.worker.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/interface-objects/002.worker.js b/tests/wpt/tests/workers/semantics/interface-objects/002.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/interface-objects/002.worker.js rename to tests/wpt/tests/workers/semantics/interface-objects/002.worker.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/interface-objects/003.any.js b/tests/wpt/tests/workers/semantics/interface-objects/003.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/interface-objects/003.any.js rename to tests/wpt/tests/workers/semantics/interface-objects/003.any.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/interface-objects/004.any.js b/tests/wpt/tests/workers/semantics/interface-objects/004.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/interface-objects/004.any.js rename to tests/wpt/tests/workers/semantics/interface-objects/004.any.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/multiple-workers/001.html b/tests/wpt/tests/workers/semantics/multiple-workers/001.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/multiple-workers/001.html rename to tests/wpt/tests/workers/semantics/multiple-workers/001.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/multiple-workers/001.js b/tests/wpt/tests/workers/semantics/multiple-workers/001.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/multiple-workers/001.js rename to tests/wpt/tests/workers/semantics/multiple-workers/001.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/multiple-workers/002.html b/tests/wpt/tests/workers/semantics/multiple-workers/002.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/multiple-workers/002.html rename to tests/wpt/tests/workers/semantics/multiple-workers/002.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/multiple-workers/002.js b/tests/wpt/tests/workers/semantics/multiple-workers/002.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/multiple-workers/002.js rename to tests/wpt/tests/workers/semantics/multiple-workers/002.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/multiple-workers/003.html b/tests/wpt/tests/workers/semantics/multiple-workers/003.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/multiple-workers/003.html rename to tests/wpt/tests/workers/semantics/multiple-workers/003.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/multiple-workers/003.js b/tests/wpt/tests/workers/semantics/multiple-workers/003.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/multiple-workers/003.js rename to tests/wpt/tests/workers/semantics/multiple-workers/003.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/multiple-workers/004-1.html b/tests/wpt/tests/workers/semantics/multiple-workers/004-1.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/multiple-workers/004-1.html rename to tests/wpt/tests/workers/semantics/multiple-workers/004-1.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/multiple-workers/004-2.js b/tests/wpt/tests/workers/semantics/multiple-workers/004-2.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/multiple-workers/004-2.js rename to tests/wpt/tests/workers/semantics/multiple-workers/004-2.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/multiple-workers/004.html b/tests/wpt/tests/workers/semantics/multiple-workers/004.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/multiple-workers/004.html rename to tests/wpt/tests/workers/semantics/multiple-workers/004.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/multiple-workers/008-1.html b/tests/wpt/tests/workers/semantics/multiple-workers/008-1.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/multiple-workers/008-1.html rename to tests/wpt/tests/workers/semantics/multiple-workers/008-1.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/multiple-workers/008.html b/tests/wpt/tests/workers/semantics/multiple-workers/008.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/multiple-workers/008.html rename to tests/wpt/tests/workers/semantics/multiple-workers/008.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/multiple-workers/008.js b/tests/wpt/tests/workers/semantics/multiple-workers/008.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/multiple-workers/008.js rename to tests/wpt/tests/workers/semantics/multiple-workers/008.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/multiple-workers/exposure.any.js b/tests/wpt/tests/workers/semantics/multiple-workers/exposure.any.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/multiple-workers/exposure.any.js rename to tests/wpt/tests/workers/semantics/multiple-workers/exposure.any.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/navigation/001-1.html b/tests/wpt/tests/workers/semantics/navigation/001-1.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/navigation/001-1.html rename to tests/wpt/tests/workers/semantics/navigation/001-1.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/navigation/001-1.js b/tests/wpt/tests/workers/semantics/navigation/001-1.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/navigation/001-1.js rename to tests/wpt/tests/workers/semantics/navigation/001-1.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/navigation/001.html b/tests/wpt/tests/workers/semantics/navigation/001.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/navigation/001.html rename to tests/wpt/tests/workers/semantics/navigation/001.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/navigation/002.html b/tests/wpt/tests/workers/semantics/navigation/002.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/navigation/002.html rename to tests/wpt/tests/workers/semantics/navigation/002.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/reporting-errors/001.html b/tests/wpt/tests/workers/semantics/reporting-errors/001.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/reporting-errors/001.html rename to tests/wpt/tests/workers/semantics/reporting-errors/001.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/reporting-errors/001.js b/tests/wpt/tests/workers/semantics/reporting-errors/001.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/reporting-errors/001.js rename to tests/wpt/tests/workers/semantics/reporting-errors/001.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/reporting-errors/002.html b/tests/wpt/tests/workers/semantics/reporting-errors/002.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/reporting-errors/002.html rename to tests/wpt/tests/workers/semantics/reporting-errors/002.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/reporting-errors/002.js b/tests/wpt/tests/workers/semantics/reporting-errors/002.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/reporting-errors/002.js rename to tests/wpt/tests/workers/semantics/reporting-errors/002.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/reporting-errors/003.html b/tests/wpt/tests/workers/semantics/reporting-errors/003.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/reporting-errors/003.html rename to tests/wpt/tests/workers/semantics/reporting-errors/003.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/reporting-errors/003.js b/tests/wpt/tests/workers/semantics/reporting-errors/003.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/reporting-errors/003.js rename to tests/wpt/tests/workers/semantics/reporting-errors/003.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/reporting-errors/004-1.html b/tests/wpt/tests/workers/semantics/reporting-errors/004-1.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/reporting-errors/004-1.html rename to tests/wpt/tests/workers/semantics/reporting-errors/004-1.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/reporting-errors/004.html b/tests/wpt/tests/workers/semantics/reporting-errors/004.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/reporting-errors/004.html rename to tests/wpt/tests/workers/semantics/reporting-errors/004.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/reporting-errors/004.js b/tests/wpt/tests/workers/semantics/reporting-errors/004.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/reporting-errors/004.js rename to tests/wpt/tests/workers/semantics/reporting-errors/004.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/run-a-worker/001.html b/tests/wpt/tests/workers/semantics/run-a-worker/001.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/run-a-worker/001.html rename to tests/wpt/tests/workers/semantics/run-a-worker/001.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/run-a-worker/001.js b/tests/wpt/tests/workers/semantics/run-a-worker/001.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/run-a-worker/001.js rename to tests/wpt/tests/workers/semantics/run-a-worker/001.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/run-a-worker/002.html b/tests/wpt/tests/workers/semantics/run-a-worker/002.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/run-a-worker/002.html rename to tests/wpt/tests/workers/semantics/run-a-worker/002.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/run-a-worker/002.js b/tests/wpt/tests/workers/semantics/run-a-worker/002.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/run-a-worker/002.js rename to tests/wpt/tests/workers/semantics/run-a-worker/002.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/run-a-worker/003.html b/tests/wpt/tests/workers/semantics/run-a-worker/003.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/run-a-worker/003.html rename to tests/wpt/tests/workers/semantics/run-a-worker/003.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/structured-clone/dedicated.html b/tests/wpt/tests/workers/semantics/structured-clone/dedicated.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/structured-clone/dedicated.html rename to tests/wpt/tests/workers/semantics/structured-clone/dedicated.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/structured-clone/shared.html b/tests/wpt/tests/workers/semantics/structured-clone/shared.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/structured-clone/shared.html rename to tests/wpt/tests/workers/semantics/structured-clone/shared.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/xhr/001-1.xml b/tests/wpt/tests/workers/semantics/xhr/001-1.xml similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/xhr/001-1.xml rename to tests/wpt/tests/workers/semantics/xhr/001-1.xml diff --git a/tests/wpt/web-platform-tests/workers/semantics/xhr/001.html b/tests/wpt/tests/workers/semantics/xhr/001.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/xhr/001.html rename to tests/wpt/tests/workers/semantics/xhr/001.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/xhr/001.js b/tests/wpt/tests/workers/semantics/xhr/001.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/xhr/001.js rename to tests/wpt/tests/workers/semantics/xhr/001.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/xhr/002.html b/tests/wpt/tests/workers/semantics/xhr/002.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/xhr/002.html rename to tests/wpt/tests/workers/semantics/xhr/002.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/xhr/002.js b/tests/wpt/tests/workers/semantics/xhr/002.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/xhr/002.js rename to tests/wpt/tests/workers/semantics/xhr/002.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/xhr/003.html b/tests/wpt/tests/workers/semantics/xhr/003.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/xhr/003.html rename to tests/wpt/tests/workers/semantics/xhr/003.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/xhr/003.js b/tests/wpt/tests/workers/semantics/xhr/003.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/xhr/003.js rename to tests/wpt/tests/workers/semantics/xhr/003.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/xhr/004.html b/tests/wpt/tests/workers/semantics/xhr/004.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/xhr/004.html rename to tests/wpt/tests/workers/semantics/xhr/004.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/xhr/004.js b/tests/wpt/tests/workers/semantics/xhr/004.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/xhr/004.js rename to tests/wpt/tests/workers/semantics/xhr/004.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/xhr/005.html b/tests/wpt/tests/workers/semantics/xhr/005.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/xhr/005.html rename to tests/wpt/tests/workers/semantics/xhr/005.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/xhr/006.html b/tests/wpt/tests/workers/semantics/xhr/006.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/xhr/006.html rename to tests/wpt/tests/workers/semantics/xhr/006.html diff --git a/tests/wpt/web-platform-tests/workers/semantics/xhr/support/001-1.xml b/tests/wpt/tests/workers/semantics/xhr/support/001-1.xml similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/xhr/support/001-1.xml rename to tests/wpt/tests/workers/semantics/xhr/support/001-1.xml diff --git a/tests/wpt/web-platform-tests/workers/semantics/xhr/support/005-1.js b/tests/wpt/tests/workers/semantics/xhr/support/005-1.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/xhr/support/005-1.js rename to tests/wpt/tests/workers/semantics/xhr/support/005-1.js diff --git a/tests/wpt/web-platform-tests/workers/semantics/xhr/support/006-1.js b/tests/wpt/tests/workers/semantics/xhr/support/006-1.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/semantics/xhr/support/006-1.js rename to tests/wpt/tests/workers/semantics/xhr/support/006-1.js diff --git a/tests/wpt/web-platform-tests/workers/shared-worker-from-blob-url.window.js b/tests/wpt/tests/workers/shared-worker-from-blob-url.window.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/shared-worker-from-blob-url.window.js rename to tests/wpt/tests/workers/shared-worker-from-blob-url.window.js diff --git a/tests/wpt/web-platform-tests/workers/shared-worker-in-data-url-context.window.js b/tests/wpt/tests/workers/shared-worker-in-data-url-context.window.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/shared-worker-in-data-url-context.window.js rename to tests/wpt/tests/workers/shared-worker-in-data-url-context.window.js diff --git a/tests/wpt/web-platform-tests/workers/shared-worker-name-via-options.html b/tests/wpt/tests/workers/shared-worker-name-via-options.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/shared-worker-name-via-options.html rename to tests/wpt/tests/workers/shared-worker-name-via-options.html diff --git a/tests/wpt/web-platform-tests/workers/shared-worker-options-mismatch.html b/tests/wpt/tests/workers/shared-worker-options-mismatch.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/shared-worker-options-mismatch.html rename to tests/wpt/tests/workers/shared-worker-options-mismatch.html diff --git a/tests/wpt/web-platform-tests/workers/shared-worker-parse-error-failure.html b/tests/wpt/tests/workers/shared-worker-parse-error-failure.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/shared-worker-parse-error-failure.html rename to tests/wpt/tests/workers/shared-worker-parse-error-failure.html diff --git a/tests/wpt/web-platform-tests/workers/shared-worker-partitioned.tentative.html b/tests/wpt/tests/workers/shared-worker-partitioned.tentative.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/shared-worker-partitioned.tentative.html rename to tests/wpt/tests/workers/shared-worker-partitioned.tentative.html diff --git a/tests/wpt/web-platform-tests/workers/support/ErrorEvent-error.js b/tests/wpt/tests/workers/support/ErrorEvent-error.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/ErrorEvent-error.js rename to tests/wpt/tests/workers/support/ErrorEvent-error.js diff --git a/tests/wpt/web-platform-tests/workers/support/ErrorEvent.js b/tests/wpt/tests/workers/support/ErrorEvent.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/ErrorEvent.js rename to tests/wpt/tests/workers/support/ErrorEvent.js diff --git a/tests/wpt/web-platform-tests/workers/support/ImportScripts.js b/tests/wpt/tests/workers/support/ImportScripts.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/ImportScripts.js rename to tests/wpt/tests/workers/support/ImportScripts.js diff --git a/tests/wpt/web-platform-tests/workers/support/ImportScriptsNetworkErr.js b/tests/wpt/tests/workers/support/ImportScriptsNetworkErr.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/ImportScriptsNetworkErr.js rename to tests/wpt/tests/workers/support/ImportScriptsNetworkErr.js diff --git a/tests/wpt/web-platform-tests/workers/support/ImportScriptsNosniffErr.js b/tests/wpt/tests/workers/support/ImportScriptsNosniffErr.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/ImportScriptsNosniffErr.js rename to tests/wpt/tests/workers/support/ImportScriptsNosniffErr.js diff --git a/tests/wpt/web-platform-tests/workers/support/SharedWorker-common.js b/tests/wpt/tests/workers/support/SharedWorker-common.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/SharedWorker-common.js rename to tests/wpt/tests/workers/support/SharedWorker-common.js diff --git a/tests/wpt/web-platform-tests/workers/support/SharedWorker-create-common.js b/tests/wpt/tests/workers/support/SharedWorker-create-common.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/SharedWorker-create-common.js rename to tests/wpt/tests/workers/support/SharedWorker-create-common.js diff --git a/tests/wpt/web-platform-tests/workers/support/SharedWorker-script-error.js b/tests/wpt/tests/workers/support/SharedWorker-script-error.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/SharedWorker-script-error.js rename to tests/wpt/tests/workers/support/SharedWorker-script-error.js diff --git a/tests/wpt/web-platform-tests/workers/support/Timer.js b/tests/wpt/tests/workers/support/Timer.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Timer.js rename to tests/wpt/tests/workers/support/Timer.js diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-common.js b/tests/wpt/tests/workers/support/Worker-common.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Worker-common.js rename to tests/wpt/tests/workers/support/Worker-common.js diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-create-common.js b/tests/wpt/tests/workers/support/Worker-create-common.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Worker-create-common.js rename to tests/wpt/tests/workers/support/Worker-create-common.js diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-messageport.js b/tests/wpt/tests/workers/support/Worker-messageport.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Worker-messageport.js rename to tests/wpt/tests/workers/support/Worker-messageport.js diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-run-forever-during-dynamic-import.js b/tests/wpt/tests/workers/support/Worker-run-forever-during-dynamic-import.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Worker-run-forever-during-dynamic-import.js rename to tests/wpt/tests/workers/support/Worker-run-forever-during-dynamic-import.js diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-run-forever-during-importScripts.js b/tests/wpt/tests/workers/support/Worker-run-forever-during-importScripts.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Worker-run-forever-during-importScripts.js rename to tests/wpt/tests/workers/support/Worker-run-forever-during-importScripts.js diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-run-forever-during-nested-importScripts.js b/tests/wpt/tests/workers/support/Worker-run-forever-during-nested-importScripts.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Worker-run-forever-during-nested-importScripts.js rename to tests/wpt/tests/workers/support/Worker-run-forever-during-nested-importScripts.js diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-run-forever-during-top-level-await.js b/tests/wpt/tests/workers/support/Worker-run-forever-during-top-level-await.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Worker-run-forever-during-top-level-await.js rename to tests/wpt/tests/workers/support/Worker-run-forever-during-top-level-await.js diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-run-forever.js b/tests/wpt/tests/workers/support/Worker-run-forever.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Worker-run-forever.js rename to tests/wpt/tests/workers/support/Worker-run-forever.js diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-structure-message.js b/tests/wpt/tests/workers/support/Worker-structure-message.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Worker-structure-message.js rename to tests/wpt/tests/workers/support/Worker-structure-message.js diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-termination-with-port-messages.js b/tests/wpt/tests/workers/support/Worker-termination-with-port-messages.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Worker-termination-with-port-messages.js rename to tests/wpt/tests/workers/support/Worker-termination-with-port-messages.js diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-thread-multi-port.js b/tests/wpt/tests/workers/support/Worker-thread-multi-port.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Worker-thread-multi-port.js rename to tests/wpt/tests/workers/support/Worker-thread-multi-port.js diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-timeout-cancel-order.js b/tests/wpt/tests/workers/support/Worker-timeout-cancel-order.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Worker-timeout-cancel-order.js rename to tests/wpt/tests/workers/support/Worker-timeout-cancel-order.js diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-timeout-decreasing-order.js b/tests/wpt/tests/workers/support/Worker-timeout-decreasing-order.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Worker-timeout-decreasing-order.js rename to tests/wpt/tests/workers/support/Worker-timeout-decreasing-order.js diff --git a/tests/wpt/web-platform-tests/workers/support/Worker-timeout-increasing-order.js b/tests/wpt/tests/workers/support/Worker-timeout-increasing-order.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/Worker-timeout-increasing-order.js rename to tests/wpt/tests/workers/support/Worker-timeout-increasing-order.js diff --git a/tests/wpt/web-platform-tests/workers/support/WorkerBasic.js b/tests/wpt/tests/workers/support/WorkerBasic.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/WorkerBasic.js rename to tests/wpt/tests/workers/support/WorkerBasic.js diff --git a/tests/wpt/web-platform-tests/workers/support/WorkerClose.js b/tests/wpt/tests/workers/support/WorkerClose.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/WorkerClose.js rename to tests/wpt/tests/workers/support/WorkerClose.js diff --git a/tests/wpt/web-platform-tests/workers/support/WorkerDataCloneErr.js b/tests/wpt/tests/workers/support/WorkerDataCloneErr.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/WorkerDataCloneErr.js rename to tests/wpt/tests/workers/support/WorkerDataCloneErr.js diff --git a/tests/wpt/web-platform-tests/workers/support/WorkerFetchURL.js b/tests/wpt/tests/workers/support/WorkerFetchURL.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/WorkerFetchURL.js rename to tests/wpt/tests/workers/support/WorkerFetchURL.js diff --git a/tests/wpt/web-platform-tests/workers/support/WorkerGlobalScope-close.js b/tests/wpt/tests/workers/support/WorkerGlobalScope-close.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/WorkerGlobalScope-close.js rename to tests/wpt/tests/workers/support/WorkerGlobalScope-close.js diff --git a/tests/wpt/web-platform-tests/workers/support/WorkerLocation-origin.html b/tests/wpt/tests/workers/support/WorkerLocation-origin.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/WorkerLocation-origin.html rename to tests/wpt/tests/workers/support/WorkerLocation-origin.html diff --git a/tests/wpt/web-platform-tests/workers/support/WorkerLocation.js b/tests/wpt/tests/workers/support/WorkerLocation.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/WorkerLocation.js rename to tests/wpt/tests/workers/support/WorkerLocation.js diff --git a/tests/wpt/web-platform-tests/workers/support/WorkerNavigator.js b/tests/wpt/tests/workers/support/WorkerNavigator.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/WorkerNavigator.js rename to tests/wpt/tests/workers/support/WorkerNavigator.js diff --git a/tests/wpt/web-platform-tests/workers/support/WorkerSendingPerformanceNow.js b/tests/wpt/tests/workers/support/WorkerSendingPerformanceNow.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/WorkerSendingPerformanceNow.js rename to tests/wpt/tests/workers/support/WorkerSendingPerformanceNow.js diff --git a/tests/wpt/web-platform-tests/workers/support/WorkerTerminate.js b/tests/wpt/tests/workers/support/WorkerTerminate.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/WorkerTerminate.js rename to tests/wpt/tests/workers/support/WorkerTerminate.js diff --git a/tests/wpt/web-platform-tests/workers/support/WorkerText.txt b/tests/wpt/tests/workers/support/WorkerText.txt similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/WorkerText.txt rename to tests/wpt/tests/workers/support/WorkerText.txt diff --git a/tests/wpt/web-platform-tests/workers/support/abrupt-completion.js b/tests/wpt/tests/workers/support/abrupt-completion.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/abrupt-completion.js rename to tests/wpt/tests/workers/support/abrupt-completion.js diff --git a/tests/wpt/web-platform-tests/workers/support/check-error-arguments.js b/tests/wpt/tests/workers/support/check-error-arguments.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/check-error-arguments.js rename to tests/wpt/tests/workers/support/check-error-arguments.js diff --git a/tests/wpt/web-platform-tests/workers/support/empty-worker.js b/tests/wpt/tests/workers/support/empty-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/empty-worker.js rename to tests/wpt/tests/workers/support/empty-worker.js diff --git a/tests/wpt/web-platform-tests/workers/support/iframe-sw-shared-name.html b/tests/wpt/tests/workers/support/iframe-sw-shared-name.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/iframe-sw-shared-name.html rename to tests/wpt/tests/workers/support/iframe-sw-shared-name.html diff --git a/tests/wpt/web-platform-tests/workers/support/iframe_sw_dataUrl.html b/tests/wpt/tests/workers/support/iframe_sw_dataUrl.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/iframe_sw_dataUrl.html rename to tests/wpt/tests/workers/support/iframe_sw_dataUrl.html diff --git a/tests/wpt/web-platform-tests/workers/support/importScripts-1.js b/tests/wpt/tests/workers/support/importScripts-1.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/importScripts-1.js rename to tests/wpt/tests/workers/support/importScripts-1.js diff --git a/tests/wpt/web-platform-tests/workers/support/importScripts-2.js b/tests/wpt/tests/workers/support/importScripts-2.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/importScripts-2.js rename to tests/wpt/tests/workers/support/importScripts-2.js diff --git a/tests/wpt/web-platform-tests/workers/support/importScripts-3.js b/tests/wpt/tests/workers/support/importScripts-3.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/importScripts-3.js rename to tests/wpt/tests/workers/support/importScripts-3.js diff --git a/tests/wpt/web-platform-tests/workers/support/imported_script.py b/tests/wpt/tests/workers/support/imported_script.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/imported_script.py rename to tests/wpt/tests/workers/support/imported_script.py diff --git a/tests/wpt/web-platform-tests/workers/support/invalidScript.js b/tests/wpt/tests/workers/support/invalidScript.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/invalidScript.js rename to tests/wpt/tests/workers/support/invalidScript.js diff --git a/tests/wpt/web-platform-tests/workers/support/name-as-accidental-global.js b/tests/wpt/tests/workers/support/name-as-accidental-global.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/name-as-accidental-global.js rename to tests/wpt/tests/workers/support/name-as-accidental-global.js diff --git a/tests/wpt/web-platform-tests/workers/support/name.js b/tests/wpt/tests/workers/support/name.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/name.js rename to tests/wpt/tests/workers/support/name.js diff --git a/tests/wpt/web-platform-tests/workers/support/nosiniff-error-worker.py b/tests/wpt/tests/workers/support/nosiniff-error-worker.py similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/nosiniff-error-worker.py rename to tests/wpt/tests/workers/support/nosiniff-error-worker.py diff --git a/tests/wpt/web-platform-tests/workers/support/parent_of_nested_worker.js b/tests/wpt/tests/workers/support/parent_of_nested_worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/parent_of_nested_worker.js rename to tests/wpt/tests/workers/support/parent_of_nested_worker.js diff --git a/tests/wpt/web-platform-tests/workers/support/post-message-on-load-worker.js b/tests/wpt/tests/workers/support/post-message-on-load-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/post-message-on-load-worker.js rename to tests/wpt/tests/workers/support/post-message-on-load-worker.js diff --git a/tests/wpt/web-platform-tests/workers/support/postMessage_block_worker.js b/tests/wpt/tests/workers/support/postMessage_block_worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/postMessage_block_worker.js rename to tests/wpt/tests/workers/support/postMessage_block_worker.js diff --git a/tests/wpt/web-platform-tests/workers/support/postMessage_block_worker.js.headers b/tests/wpt/tests/workers/support/postMessage_block_worker.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/postMessage_block_worker.js.headers rename to tests/wpt/tests/workers/support/postMessage_block_worker.js.headers diff --git a/tests/wpt/web-platform-tests/workers/support/sandboxed-tests.html b/tests/wpt/tests/workers/support/sandboxed-tests.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/sandboxed-tests.html rename to tests/wpt/tests/workers/support/sandboxed-tests.html diff --git a/tests/wpt/web-platform-tests/workers/support/shared-name.js b/tests/wpt/tests/workers/support/shared-name.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/shared-name.js rename to tests/wpt/tests/workers/support/shared-name.js diff --git a/tests/wpt/web-platform-tests/workers/support/sync_xhr.js b/tests/wpt/tests/workers/support/sync_xhr.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/sync_xhr.js rename to tests/wpt/tests/workers/support/sync_xhr.js diff --git a/tests/wpt/web-platform-tests/workers/support/sync_xhr_target.xml b/tests/wpt/tests/workers/support/sync_xhr_target.xml similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/sync_xhr_target.xml rename to tests/wpt/tests/workers/support/sync_xhr_target.xml diff --git a/tests/wpt/web-platform-tests/workers/support/throw-on-message-Worker.js b/tests/wpt/tests/workers/support/throw-on-message-Worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/throw-on-message-Worker.js rename to tests/wpt/tests/workers/support/throw-on-message-Worker.js diff --git a/tests/wpt/web-platform-tests/workers/support/window-sw-shared-name.html b/tests/wpt/tests/workers/support/window-sw-shared-name.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/window-sw-shared-name.html rename to tests/wpt/tests/workers/support/window-sw-shared-name.html diff --git a/tests/wpt/web-platform-tests/workers/support/worker-request-animation-frame.js b/tests/wpt/tests/workers/support/worker-request-animation-frame.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/support/worker-request-animation-frame.js rename to tests/wpt/tests/workers/support/worker-request-animation-frame.js diff --git a/tests/wpt/web-platform-tests/workers/worker-performance.worker.js b/tests/wpt/tests/workers/worker-performance.worker.js similarity index 100% rename from tests/wpt/web-platform-tests/workers/worker-performance.worker.js rename to tests/wpt/tests/workers/worker-performance.worker.js diff --git a/tests/wpt/web-platform-tests/workers/worker-request-animation-frame.html b/tests/wpt/tests/workers/worker-request-animation-frame.html similarity index 100% rename from tests/wpt/web-platform-tests/workers/worker-request-animation-frame.html rename to tests/wpt/tests/workers/worker-request-animation-frame.html diff --git a/tests/wpt/web-platform-tests/worklets/META.yml b/tests/wpt/tests/worklets/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/worklets/META.yml rename to tests/wpt/tests/worklets/META.yml diff --git a/tests/wpt/web-platform-tests/worklets/README.md b/tests/wpt/tests/worklets/README.md similarity index 100% rename from tests/wpt/web-platform-tests/worklets/README.md rename to tests/wpt/tests/worklets/README.md diff --git a/tests/wpt/web-platform-tests/worklets/animation-worklet-credentials.https.html b/tests/wpt/tests/worklets/animation-worklet-credentials.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/animation-worklet-credentials.https.html rename to tests/wpt/tests/worklets/animation-worklet-credentials.https.html diff --git a/tests/wpt/web-platform-tests/worklets/animation-worklet-csp.https.html b/tests/wpt/tests/worklets/animation-worklet-csp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/animation-worklet-csp.https.html rename to tests/wpt/tests/worklets/animation-worklet-csp.https.html diff --git a/tests/wpt/web-platform-tests/worklets/animation-worklet-import.https.html b/tests/wpt/tests/worklets/animation-worklet-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/animation-worklet-import.https.html rename to tests/wpt/tests/worklets/animation-worklet-import.https.html diff --git a/tests/wpt/web-platform-tests/worklets/animation-worklet-referrer.https.html b/tests/wpt/tests/worklets/animation-worklet-referrer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/animation-worklet-referrer.https.html rename to tests/wpt/tests/worklets/animation-worklet-referrer.https.html diff --git a/tests/wpt/web-platform-tests/worklets/animation-worklet-service-worker-interception.https.html b/tests/wpt/tests/worklets/animation-worklet-service-worker-interception.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/animation-worklet-service-worker-interception.https.html rename to tests/wpt/tests/worklets/animation-worklet-service-worker-interception.https.html diff --git a/tests/wpt/web-platform-tests/worklets/audio-worklet-credentials.https.html b/tests/wpt/tests/worklets/audio-worklet-credentials.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/audio-worklet-credentials.https.html rename to tests/wpt/tests/worklets/audio-worklet-credentials.https.html diff --git a/tests/wpt/web-platform-tests/worklets/audio-worklet-csp.https.html b/tests/wpt/tests/worklets/audio-worklet-csp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/audio-worklet-csp.https.html rename to tests/wpt/tests/worklets/audio-worklet-csp.https.html diff --git a/tests/wpt/web-platform-tests/worklets/audio-worklet-import.https.html b/tests/wpt/tests/worklets/audio-worklet-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/audio-worklet-import.https.html rename to tests/wpt/tests/worklets/audio-worklet-import.https.html diff --git a/tests/wpt/web-platform-tests/worklets/audio-worklet-referrer.https.html b/tests/wpt/tests/worklets/audio-worklet-referrer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/audio-worklet-referrer.https.html rename to tests/wpt/tests/worklets/audio-worklet-referrer.https.html diff --git a/tests/wpt/web-platform-tests/worklets/audio-worklet-service-worker-interception.https.html b/tests/wpt/tests/worklets/audio-worklet-service-worker-interception.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/audio-worklet-service-worker-interception.https.html rename to tests/wpt/tests/worklets/audio-worklet-service-worker-interception.https.html diff --git a/tests/wpt/web-platform-tests/worklets/idlharness.https.any.js b/tests/wpt/tests/worklets/idlharness.https.any.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/idlharness.https.any.js rename to tests/wpt/tests/worklets/idlharness.https.any.js diff --git a/tests/wpt/web-platform-tests/worklets/layout-worklet-credentials.https.html b/tests/wpt/tests/worklets/layout-worklet-credentials.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/layout-worklet-credentials.https.html rename to tests/wpt/tests/worklets/layout-worklet-credentials.https.html diff --git a/tests/wpt/web-platform-tests/worklets/layout-worklet-csp.https.html b/tests/wpt/tests/worklets/layout-worklet-csp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/layout-worklet-csp.https.html rename to tests/wpt/tests/worklets/layout-worklet-csp.https.html diff --git a/tests/wpt/web-platform-tests/worklets/layout-worklet-import.https.html b/tests/wpt/tests/worklets/layout-worklet-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/layout-worklet-import.https.html rename to tests/wpt/tests/worklets/layout-worklet-import.https.html diff --git a/tests/wpt/web-platform-tests/worklets/layout-worklet-referrer.https.html b/tests/wpt/tests/worklets/layout-worklet-referrer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/layout-worklet-referrer.https.html rename to tests/wpt/tests/worklets/layout-worklet-referrer.https.html diff --git a/tests/wpt/web-platform-tests/worklets/layout-worklet-service-worker-interception.https.html b/tests/wpt/tests/worklets/layout-worklet-service-worker-interception.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/layout-worklet-service-worker-interception.https.html rename to tests/wpt/tests/worklets/layout-worklet-service-worker-interception.https.html diff --git a/tests/wpt/web-platform-tests/worklets/paint-worklet-credentials.https.html b/tests/wpt/tests/worklets/paint-worklet-credentials.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/paint-worklet-credentials.https.html rename to tests/wpt/tests/worklets/paint-worklet-credentials.https.html diff --git a/tests/wpt/web-platform-tests/worklets/paint-worklet-csp.https.html b/tests/wpt/tests/worklets/paint-worklet-csp.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/paint-worklet-csp.https.html rename to tests/wpt/tests/worklets/paint-worklet-csp.https.html diff --git a/tests/wpt/web-platform-tests/worklets/paint-worklet-import.https.html b/tests/wpt/tests/worklets/paint-worklet-import.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/paint-worklet-import.https.html rename to tests/wpt/tests/worklets/paint-worklet-import.https.html diff --git a/tests/wpt/web-platform-tests/worklets/paint-worklet-referrer.https.html b/tests/wpt/tests/worklets/paint-worklet-referrer.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/paint-worklet-referrer.https.html rename to tests/wpt/tests/worklets/paint-worklet-referrer.https.html diff --git a/tests/wpt/web-platform-tests/worklets/paint-worklet-service-worker-interception.https.html b/tests/wpt/tests/worklets/paint-worklet-service-worker-interception.https.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/paint-worklet-service-worker-interception.https.html rename to tests/wpt/tests/worklets/paint-worklet-service-worker-interception.https.html diff --git a/tests/wpt/web-platform-tests/worklets/resources/addmodule-window.html b/tests/wpt/tests/worklets/resources/addmodule-window.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/addmodule-window.html rename to tests/wpt/tests/worklets/resources/addmodule-window.html diff --git a/tests/wpt/web-platform-tests/worklets/resources/credentials-tests.js b/tests/wpt/tests/worklets/resources/credentials-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/credentials-tests.js rename to tests/wpt/tests/worklets/resources/credentials-tests.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/credentials.py b/tests/wpt/tests/worklets/resources/credentials.py similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/credentials.py rename to tests/wpt/tests/worklets/resources/credentials.py diff --git a/tests/wpt/web-platform-tests/worklets/resources/csp-tests.js b/tests/wpt/tests/worklets/resources/csp-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/csp-tests.js rename to tests/wpt/tests/worklets/resources/csp-tests.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/empty-worklet-script-with-cors-header.js b/tests/wpt/tests/worklets/resources/empty-worklet-script-with-cors-header.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/empty-worklet-script-with-cors-header.js rename to tests/wpt/tests/worklets/resources/empty-worklet-script-with-cors-header.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/empty-worklet-script-with-cors-header.js.headers b/tests/wpt/tests/worklets/resources/empty-worklet-script-with-cors-header.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/empty-worklet-script-with-cors-header.js.headers rename to tests/wpt/tests/worklets/resources/empty-worklet-script-with-cors-header.js.headers diff --git a/tests/wpt/web-platform-tests/worklets/resources/empty-worklet-script.js b/tests/wpt/tests/worklets/resources/empty-worklet-script.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/empty-worklet-script.js rename to tests/wpt/tests/worklets/resources/empty-worklet-script.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-cyclic-worklet-script.js b/tests/wpt/tests/worklets/resources/import-cyclic-worklet-script.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-cyclic-worklet-script.js rename to tests/wpt/tests/worklets/resources/import-cyclic-worklet-script.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-empty-worklet-script-with-cors-header.js b/tests/wpt/tests/worklets/resources/import-empty-worklet-script-with-cors-header.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-empty-worklet-script-with-cors-header.js rename to tests/wpt/tests/worklets/resources/import-empty-worklet-script-with-cors-header.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-empty-worklet-script-with-cors-header.js.headers b/tests/wpt/tests/worklets/resources/import-empty-worklet-script-with-cors-header.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-empty-worklet-script-with-cors-header.js.headers rename to tests/wpt/tests/worklets/resources/import-empty-worklet-script-with-cors-header.js.headers diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-insecure-origin-empty-worklet-script.sub.js b/tests/wpt/tests/worklets/resources/import-insecure-origin-empty-worklet-script.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-insecure-origin-empty-worklet-script.sub.js rename to tests/wpt/tests/worklets/resources/import-insecure-origin-empty-worklet-script.sub.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-insecure-origin-redirected-empty-worklet-script.sub.js b/tests/wpt/tests/worklets/resources/import-insecure-origin-redirected-empty-worklet-script.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-insecure-origin-redirected-empty-worklet-script.sub.js rename to tests/wpt/tests/worklets/resources/import-insecure-origin-redirected-empty-worklet-script.sub.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-nested-internal-worklet-script.js b/tests/wpt/tests/worklets/resources/import-nested-internal-worklet-script.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-nested-internal-worklet-script.js rename to tests/wpt/tests/worklets/resources/import-nested-internal-worklet-script.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-nested-worklet-script.js b/tests/wpt/tests/worklets/resources/import-nested-worklet-script.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-nested-worklet-script.js rename to tests/wpt/tests/worklets/resources/import-nested-worklet-script.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-non-existent-worklet-script.js b/tests/wpt/tests/worklets/resources/import-non-existent-worklet-script.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-non-existent-worklet-script.js rename to tests/wpt/tests/worklets/resources/import-non-existent-worklet-script.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-referrer-checker-worklet-script.sub.js b/tests/wpt/tests/worklets/resources/import-referrer-checker-worklet-script.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-referrer-checker-worklet-script.sub.js rename to tests/wpt/tests/worklets/resources/import-referrer-checker-worklet-script.sub.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-referrer-checker-worklet-script.sub.js.headers b/tests/wpt/tests/worklets/resources/import-referrer-checker-worklet-script.sub.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-referrer-checker-worklet-script.sub.js.headers rename to tests/wpt/tests/worklets/resources/import-referrer-checker-worklet-script.sub.js.headers diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-remote-origin-empty-worklet-script.sub.js b/tests/wpt/tests/worklets/resources/import-remote-origin-empty-worklet-script.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-remote-origin-empty-worklet-script.sub.js rename to tests/wpt/tests/worklets/resources/import-remote-origin-empty-worklet-script.sub.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-remote-origin-redirected-empty-worklet-script.sub.js b/tests/wpt/tests/worklets/resources/import-remote-origin-redirected-empty-worklet-script.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-remote-origin-redirected-empty-worklet-script.sub.js rename to tests/wpt/tests/worklets/resources/import-remote-origin-redirected-empty-worklet-script.sub.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-remote-origin-referrer-checker-worklet-script.sub.js b/tests/wpt/tests/worklets/resources/import-remote-origin-referrer-checker-worklet-script.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-remote-origin-referrer-checker-worklet-script.sub.js rename to tests/wpt/tests/worklets/resources/import-remote-origin-referrer-checker-worklet-script.sub.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-remote-origin-referrer-checker-worklet-script.sub.js.headers b/tests/wpt/tests/worklets/resources/import-remote-origin-referrer-checker-worklet-script.sub.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-remote-origin-referrer-checker-worklet-script.sub.js.headers rename to tests/wpt/tests/worklets/resources/import-remote-origin-referrer-checker-worklet-script.sub.js.headers diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-same-origin-referrer-checker-worklet-script-from-remote-origin.sub.js b/tests/wpt/tests/worklets/resources/import-same-origin-referrer-checker-worklet-script-from-remote-origin.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-same-origin-referrer-checker-worklet-script-from-remote-origin.sub.js rename to tests/wpt/tests/worklets/resources/import-same-origin-referrer-checker-worklet-script-from-remote-origin.sub.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-same-origin-referrer-checker-worklet-script-from-remote-origin.sub.js.headers b/tests/wpt/tests/worklets/resources/import-same-origin-referrer-checker-worklet-script-from-remote-origin.sub.js.headers similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-same-origin-referrer-checker-worklet-script-from-remote-origin.sub.js.headers rename to tests/wpt/tests/worklets/resources/import-same-origin-referrer-checker-worklet-script-from-remote-origin.sub.js.headers diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-syntax-error-worklet-script.js b/tests/wpt/tests/worklets/resources/import-syntax-error-worklet-script.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-syntax-error-worklet-script.js rename to tests/wpt/tests/worklets/resources/import-syntax-error-worklet-script.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/import-tests.js b/tests/wpt/tests/worklets/resources/import-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/import-tests.js rename to tests/wpt/tests/worklets/resources/import-tests.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/referrer-checker.py b/tests/wpt/tests/worklets/resources/referrer-checker.py similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/referrer-checker.py rename to tests/wpt/tests/worklets/resources/referrer-checker.py diff --git a/tests/wpt/web-platform-tests/worklets/resources/referrer-tests.js b/tests/wpt/tests/worklets/resources/referrer-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/referrer-tests.js rename to tests/wpt/tests/worklets/resources/referrer-tests.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/referrer-window.html b/tests/wpt/tests/worklets/resources/referrer-window.html similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/referrer-window.html rename to tests/wpt/tests/worklets/resources/referrer-window.html diff --git a/tests/wpt/web-platform-tests/worklets/resources/service-worker-interception-tests.js b/tests/wpt/tests/worklets/resources/service-worker-interception-tests.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/service-worker-interception-tests.js rename to tests/wpt/tests/worklets/resources/service-worker-interception-tests.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/service-worker.js b/tests/wpt/tests/worklets/resources/service-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/service-worker.js rename to tests/wpt/tests/worklets/resources/service-worker.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/set-cookie.py b/tests/wpt/tests/worklets/resources/set-cookie.py similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/set-cookie.py rename to tests/wpt/tests/worklets/resources/set-cookie.py diff --git a/tests/wpt/web-platform-tests/worklets/resources/syntax-error-worklet-script.js b/tests/wpt/tests/worklets/resources/syntax-error-worklet-script.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/syntax-error-worklet-script.js rename to tests/wpt/tests/worklets/resources/syntax-error-worklet-script.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/throwing-worklet-script.js b/tests/wpt/tests/worklets/resources/throwing-worklet-script.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/throwing-worklet-script.js rename to tests/wpt/tests/worklets/resources/throwing-worklet-script.js diff --git a/tests/wpt/web-platform-tests/worklets/resources/worklet-test-utils.js b/tests/wpt/tests/worklets/resources/worklet-test-utils.js similarity index 100% rename from tests/wpt/web-platform-tests/worklets/resources/worklet-test-utils.js rename to tests/wpt/tests/worklets/resources/worklet-test-utils.js diff --git a/tests/wpt/web-platform-tests/wpt b/tests/wpt/tests/wpt similarity index 100% rename from tests/wpt/web-platform-tests/wpt rename to tests/wpt/tests/wpt diff --git a/tests/wpt/web-platform-tests/wpt.py b/tests/wpt/tests/wpt.py similarity index 100% rename from tests/wpt/web-platform-tests/wpt.py rename to tests/wpt/tests/wpt.py diff --git a/tests/wpt/web-platform-tests/x-frame-options/META.yml b/tests/wpt/tests/x-frame-options/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/x-frame-options/META.yml rename to tests/wpt/tests/x-frame-options/META.yml diff --git a/tests/wpt/web-platform-tests/x-frame-options/README.md b/tests/wpt/tests/x-frame-options/README.md similarity index 100% rename from tests/wpt/web-platform-tests/x-frame-options/README.md rename to tests/wpt/tests/x-frame-options/README.md diff --git a/tests/wpt/web-platform-tests/x-frame-options/deny.html b/tests/wpt/tests/x-frame-options/deny.html similarity index 100% rename from tests/wpt/web-platform-tests/x-frame-options/deny.html rename to tests/wpt/tests/x-frame-options/deny.html diff --git a/tests/wpt/web-platform-tests/x-frame-options/get-decode-split.html b/tests/wpt/tests/x-frame-options/get-decode-split.html similarity index 100% rename from tests/wpt/web-platform-tests/x-frame-options/get-decode-split.html rename to tests/wpt/tests/x-frame-options/get-decode-split.html diff --git a/tests/wpt/web-platform-tests/x-frame-options/invalid.html b/tests/wpt/tests/x-frame-options/invalid.html similarity index 100% rename from tests/wpt/web-platform-tests/x-frame-options/invalid.html rename to tests/wpt/tests/x-frame-options/invalid.html diff --git a/tests/wpt/web-platform-tests/x-frame-options/multiple.html b/tests/wpt/tests/x-frame-options/multiple.html similarity index 100% rename from tests/wpt/web-platform-tests/x-frame-options/multiple.html rename to tests/wpt/tests/x-frame-options/multiple.html diff --git a/tests/wpt/web-platform-tests/x-frame-options/redirect.html b/tests/wpt/tests/x-frame-options/redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/x-frame-options/redirect.html rename to tests/wpt/tests/x-frame-options/redirect.html diff --git a/tests/wpt/web-platform-tests/x-frame-options/sameorigin.sub.html b/tests/wpt/tests/x-frame-options/sameorigin.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/x-frame-options/sameorigin.sub.html rename to tests/wpt/tests/x-frame-options/sameorigin.sub.html diff --git a/tests/wpt/web-platform-tests/x-frame-options/support/helper.sub.js b/tests/wpt/tests/x-frame-options/support/helper.sub.js similarity index 100% rename from tests/wpt/web-platform-tests/x-frame-options/support/helper.sub.js rename to tests/wpt/tests/x-frame-options/support/helper.sub.js diff --git a/tests/wpt/web-platform-tests/x-frame-options/support/nested.py b/tests/wpt/tests/x-frame-options/support/nested.py similarity index 100% rename from tests/wpt/web-platform-tests/x-frame-options/support/nested.py rename to tests/wpt/tests/x-frame-options/support/nested.py diff --git a/tests/wpt/web-platform-tests/x-frame-options/support/redirect.py b/tests/wpt/tests/x-frame-options/support/redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/x-frame-options/support/redirect.py rename to tests/wpt/tests/x-frame-options/support/redirect.py diff --git a/tests/wpt/web-platform-tests/x-frame-options/support/xfo.py b/tests/wpt/tests/x-frame-options/support/xfo.py similarity index 100% rename from tests/wpt/web-platform-tests/x-frame-options/support/xfo.py rename to tests/wpt/tests/x-frame-options/support/xfo.py diff --git a/tests/wpt/web-platform-tests/xhr/META.yml b/tests/wpt/tests/xhr/META.yml similarity index 100% rename from tests/wpt/web-platform-tests/xhr/META.yml rename to tests/wpt/tests/xhr/META.yml diff --git a/tests/wpt/web-platform-tests/xhr/README.md b/tests/wpt/tests/xhr/README.md similarity index 100% rename from tests/wpt/web-platform-tests/xhr/README.md rename to tests/wpt/tests/xhr/README.md diff --git a/tests/wpt/web-platform-tests/xhr/XMLHttpRequest-withCredentials.any.js b/tests/wpt/tests/xhr/XMLHttpRequest-withCredentials.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/XMLHttpRequest-withCredentials.any.js rename to tests/wpt/tests/xhr/XMLHttpRequest-withCredentials.any.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-after-receive.any.js b/tests/wpt/tests/xhr/abort-after-receive.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-after-receive.any.js rename to tests/wpt/tests/xhr/abort-after-receive.any.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-after-send.any.js b/tests/wpt/tests/xhr/abort-after-send.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-after-send.any.js rename to tests/wpt/tests/xhr/abort-after-send.any.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-after-stop.window.js b/tests/wpt/tests/xhr/abort-after-stop.window.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-after-stop.window.js rename to tests/wpt/tests/xhr/abort-after-stop.window.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-after-timeout.any.js b/tests/wpt/tests/xhr/abort-after-timeout.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-after-timeout.any.js rename to tests/wpt/tests/xhr/abort-after-timeout.any.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-during-done.window.js b/tests/wpt/tests/xhr/abort-during-done.window.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-during-done.window.js rename to tests/wpt/tests/xhr/abort-during-done.window.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-during-headers-received.window.js b/tests/wpt/tests/xhr/abort-during-headers-received.window.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-during-headers-received.window.js rename to tests/wpt/tests/xhr/abort-during-headers-received.window.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-during-loading.window.js b/tests/wpt/tests/xhr/abort-during-loading.window.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-during-loading.window.js rename to tests/wpt/tests/xhr/abort-during-loading.window.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-during-open.any.js b/tests/wpt/tests/xhr/abort-during-open.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-during-open.any.js rename to tests/wpt/tests/xhr/abort-during-open.any.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-during-readystatechange.any.js b/tests/wpt/tests/xhr/abort-during-readystatechange.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-during-readystatechange.any.js rename to tests/wpt/tests/xhr/abort-during-readystatechange.any.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-during-unsent.any.js b/tests/wpt/tests/xhr/abort-during-unsent.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-during-unsent.any.js rename to tests/wpt/tests/xhr/abort-during-unsent.any.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-during-upload.any.js b/tests/wpt/tests/xhr/abort-during-upload.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-during-upload.any.js rename to tests/wpt/tests/xhr/abort-during-upload.any.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-event-abort.any.js b/tests/wpt/tests/xhr/abort-event-abort.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-event-abort.any.js rename to tests/wpt/tests/xhr/abort-event-abort.any.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-event-listeners.any.js b/tests/wpt/tests/xhr/abort-event-listeners.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-event-listeners.any.js rename to tests/wpt/tests/xhr/abort-event-listeners.any.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-event-loadend.any.js b/tests/wpt/tests/xhr/abort-event-loadend.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-event-loadend.any.js rename to tests/wpt/tests/xhr/abort-event-loadend.any.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-event-order.htm b/tests/wpt/tests/xhr/abort-event-order.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-event-order.htm rename to tests/wpt/tests/xhr/abort-event-order.htm diff --git a/tests/wpt/web-platform-tests/xhr/abort-upload-event-abort.any.js b/tests/wpt/tests/xhr/abort-upload-event-abort.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-upload-event-abort.any.js rename to tests/wpt/tests/xhr/abort-upload-event-abort.any.js diff --git a/tests/wpt/web-platform-tests/xhr/abort-upload-event-loadend.any.js b/tests/wpt/tests/xhr/abort-upload-event-loadend.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/abort-upload-event-loadend.any.js rename to tests/wpt/tests/xhr/abort-upload-event-loadend.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any.js b/tests/wpt/tests/xhr/access-control-and-redirects-async-same-origin.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.any.js rename to tests/wpt/tests/xhr/access-control-and-redirects-async-same-origin.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-and-redirects-async.any.js b/tests/wpt/tests/xhr/access-control-and-redirects-async.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-and-redirects-async.any.js rename to tests/wpt/tests/xhr/access-control-and-redirects-async.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-and-redirects.any.js b/tests/wpt/tests/xhr/access-control-and-redirects.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-and-redirects.any.js rename to tests/wpt/tests/xhr/access-control-and-redirects.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header-data-url.htm b/tests/wpt/tests/xhr/access-control-basic-allow-access-control-origin-header-data-url.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header-data-url.htm rename to tests/wpt/tests/xhr/access-control-basic-allow-access-control-origin-header-data-url.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any.js b/tests/wpt/tests/xhr/access-control-basic-allow-access-control-origin-header.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.any.js rename to tests/wpt/tests/xhr/access-control-basic-allow-access-control-origin-header.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-allow-async.any.js b/tests/wpt/tests/xhr/access-control-basic-allow-async.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-allow-async.any.js rename to tests/wpt/tests/xhr/access-control-basic-allow-async.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any.js b/tests/wpt/tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any.js rename to tests/wpt/tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any.js b/tests/wpt/tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any.js rename to tests/wpt/tests/xhr/access-control-basic-allow-non-cors-safelisted-method.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any.js b/tests/wpt/tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any.js rename to tests/wpt/tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any.js b/tests/wpt/tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any.js rename to tests/wpt/tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any.js b/tests/wpt/tests/xhr/access-control-basic-allow-preflight-cache-timeout.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.any.js rename to tests/wpt/tests/xhr/access-control-basic-allow-preflight-cache-timeout.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any.js b/tests/wpt/tests/xhr/access-control-basic-allow-preflight-cache.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.any.js rename to tests/wpt/tests/xhr/access-control-basic-allow-preflight-cache.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-allow-star.any.js b/tests/wpt/tests/xhr/access-control-basic-allow-star.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-allow-star.any.js rename to tests/wpt/tests/xhr/access-control-basic-allow-star.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-allow.any.js b/tests/wpt/tests/xhr/access-control-basic-allow.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-allow.any.js rename to tests/wpt/tests/xhr/access-control-basic-allow.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers.htm b/tests/wpt/tests/xhr/access-control-basic-cors-safelisted-request-headers.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers.htm rename to tests/wpt/tests/xhr/access-control-basic-cors-safelisted-request-headers.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-cors-safelisted-response-headers.htm b/tests/wpt/tests/xhr/access-control-basic-cors-safelisted-response-headers.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-cors-safelisted-response-headers.htm rename to tests/wpt/tests/xhr/access-control-basic-cors-safelisted-response-headers.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-denied.htm b/tests/wpt/tests/xhr/access-control-basic-denied.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-denied.htm rename to tests/wpt/tests/xhr/access-control-basic-denied.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-get-fail-non-simple.htm b/tests/wpt/tests/xhr/access-control-basic-get-fail-non-simple.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-get-fail-non-simple.htm rename to tests/wpt/tests/xhr/access-control-basic-get-fail-non-simple.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-non-cors-safelisted-content-type.htm b/tests/wpt/tests/xhr/access-control-basic-non-cors-safelisted-content-type.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-non-cors-safelisted-content-type.htm rename to tests/wpt/tests/xhr/access-control-basic-non-cors-safelisted-content-type.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-post-success-no-content-type.htm b/tests/wpt/tests/xhr/access-control-basic-post-success-no-content-type.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-post-success-no-content-type.htm rename to tests/wpt/tests/xhr/access-control-basic-post-success-no-content-type.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm b/tests/wpt/tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm rename to tests/wpt/tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-preflight-denied.htm b/tests/wpt/tests/xhr/access-control-basic-preflight-denied.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-basic-preflight-denied.htm rename to tests/wpt/tests/xhr/access-control-basic-preflight-denied.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-expose-headers-on-redirect.html b/tests/wpt/tests/xhr/access-control-expose-headers-on-redirect.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-expose-headers-on-redirect.html rename to tests/wpt/tests/xhr/access-control-expose-headers-on-redirect.html diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-async-header-denied.htm b/tests/wpt/tests/xhr/access-control-preflight-async-header-denied.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-async-header-denied.htm rename to tests/wpt/tests/xhr/access-control-preflight-async-header-denied.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-async-method-denied.htm b/tests/wpt/tests/xhr/access-control-preflight-async-method-denied.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-async-method-denied.htm rename to tests/wpt/tests/xhr/access-control-preflight-async-method-denied.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-async-not-supported.htm b/tests/wpt/tests/xhr/access-control-preflight-async-not-supported.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-async-not-supported.htm rename to tests/wpt/tests/xhr/access-control-preflight-async-not-supported.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-credential-async.htm b/tests/wpt/tests/xhr/access-control-preflight-credential-async.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-credential-async.htm rename to tests/wpt/tests/xhr/access-control-preflight-credential-async.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-credential-sync.htm b/tests/wpt/tests/xhr/access-control-preflight-credential-sync.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-credential-sync.htm rename to tests/wpt/tests/xhr/access-control-preflight-credential-sync.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-headers-async.htm b/tests/wpt/tests/xhr/access-control-preflight-headers-async.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-headers-async.htm rename to tests/wpt/tests/xhr/access-control-preflight-headers-async.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-headers-sync.htm b/tests/wpt/tests/xhr/access-control-preflight-headers-sync.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-headers-sync.htm rename to tests/wpt/tests/xhr/access-control-preflight-headers-sync.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-request-allow-headers-returns-star.any.js b/tests/wpt/tests/xhr/access-control-preflight-request-allow-headers-returns-star.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-request-allow-headers-returns-star.any.js rename to tests/wpt/tests/xhr/access-control-preflight-request-allow-headers-returns-star.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-request-header-lowercase.htm b/tests/wpt/tests/xhr/access-control-preflight-request-header-lowercase.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-request-header-lowercase.htm rename to tests/wpt/tests/xhr/access-control-preflight-request-header-lowercase.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-request-header-returns-origin.any.js b/tests/wpt/tests/xhr/access-control-preflight-request-header-returns-origin.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-request-header-returns-origin.any.js rename to tests/wpt/tests/xhr/access-control-preflight-request-header-returns-origin.any.js diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-request-header-sorted.htm b/tests/wpt/tests/xhr/access-control-preflight-request-header-sorted.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-request-header-sorted.htm rename to tests/wpt/tests/xhr/access-control-preflight-request-header-sorted.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-request-headers-origin.htm b/tests/wpt/tests/xhr/access-control-preflight-request-headers-origin.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-request-headers-origin.htm rename to tests/wpt/tests/xhr/access-control-preflight-request-headers-origin.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-request-invalid-status-301.htm b/tests/wpt/tests/xhr/access-control-preflight-request-invalid-status-301.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-request-invalid-status-301.htm rename to tests/wpt/tests/xhr/access-control-preflight-request-invalid-status-301.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-request-invalid-status-400.htm b/tests/wpt/tests/xhr/access-control-preflight-request-invalid-status-400.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-request-invalid-status-400.htm rename to tests/wpt/tests/xhr/access-control-preflight-request-invalid-status-400.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-request-invalid-status-501.htm b/tests/wpt/tests/xhr/access-control-preflight-request-invalid-status-501.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-request-invalid-status-501.htm rename to tests/wpt/tests/xhr/access-control-preflight-request-invalid-status-501.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-request-must-not-contain-cookie.htm b/tests/wpt/tests/xhr/access-control-preflight-request-must-not-contain-cookie.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-request-must-not-contain-cookie.htm rename to tests/wpt/tests/xhr/access-control-preflight-request-must-not-contain-cookie.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-header-denied.htm b/tests/wpt/tests/xhr/access-control-preflight-sync-header-denied.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-header-denied.htm rename to tests/wpt/tests/xhr/access-control-preflight-sync-header-denied.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-method-denied.htm b/tests/wpt/tests/xhr/access-control-preflight-sync-method-denied.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-method-denied.htm rename to tests/wpt/tests/xhr/access-control-preflight-sync-method-denied.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-not-supported.htm b/tests/wpt/tests/xhr/access-control-preflight-sync-not-supported.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-not-supported.htm rename to tests/wpt/tests/xhr/access-control-preflight-sync-not-supported.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-recursive-failed-request.htm b/tests/wpt/tests/xhr/access-control-recursive-failed-request.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-recursive-failed-request.htm rename to tests/wpt/tests/xhr/access-control-recursive-failed-request.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-response-with-body-sync.htm b/tests/wpt/tests/xhr/access-control-response-with-body-sync.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-response-with-body-sync.htm rename to tests/wpt/tests/xhr/access-control-response-with-body-sync.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-response-with-body.htm b/tests/wpt/tests/xhr/access-control-response-with-body.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-response-with-body.htm rename to tests/wpt/tests/xhr/access-control-response-with-body.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-response-with-exposed-headers.htm b/tests/wpt/tests/xhr/access-control-response-with-exposed-headers.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-response-with-exposed-headers.htm rename to tests/wpt/tests/xhr/access-control-response-with-exposed-headers.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-sandboxed-iframe-allow-origin-null.htm b/tests/wpt/tests/xhr/access-control-sandboxed-iframe-allow-origin-null.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-sandboxed-iframe-allow-origin-null.htm rename to tests/wpt/tests/xhr/access-control-sandboxed-iframe-allow-origin-null.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-sandboxed-iframe-allow.htm b/tests/wpt/tests/xhr/access-control-sandboxed-iframe-allow.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-sandboxed-iframe-allow.htm rename to tests/wpt/tests/xhr/access-control-sandboxed-iframe-allow.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-sandboxed-iframe-denied-without-wildcard.htm b/tests/wpt/tests/xhr/access-control-sandboxed-iframe-denied-without-wildcard.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-sandboxed-iframe-denied-without-wildcard.htm rename to tests/wpt/tests/xhr/access-control-sandboxed-iframe-denied-without-wildcard.htm diff --git a/tests/wpt/web-platform-tests/xhr/access-control-sandboxed-iframe-denied.htm b/tests/wpt/tests/xhr/access-control-sandboxed-iframe-denied.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/access-control-sandboxed-iframe-denied.htm rename to tests/wpt/tests/xhr/access-control-sandboxed-iframe-denied.htm diff --git a/tests/wpt/web-platform-tests/xhr/allow-lists-starting-with-comma.htm b/tests/wpt/tests/xhr/allow-lists-starting-with-comma.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/allow-lists-starting-with-comma.htm rename to tests/wpt/tests/xhr/allow-lists-starting-with-comma.htm diff --git a/tests/wpt/web-platform-tests/xhr/anonymous-mode-unsupported.htm b/tests/wpt/tests/xhr/anonymous-mode-unsupported.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/anonymous-mode-unsupported.htm rename to tests/wpt/tests/xhr/anonymous-mode-unsupported.htm diff --git a/tests/wpt/web-platform-tests/xhr/close-worker-with-xhr-in-progress.html b/tests/wpt/tests/xhr/close-worker-with-xhr-in-progress.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/close-worker-with-xhr-in-progress.html rename to tests/wpt/tests/xhr/close-worker-with-xhr-in-progress.html diff --git a/tests/wpt/web-platform-tests/xhr/content-type-unmodified.any.js b/tests/wpt/tests/xhr/content-type-unmodified.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/content-type-unmodified.any.js rename to tests/wpt/tests/xhr/content-type-unmodified.any.js diff --git a/tests/wpt/web-platform-tests/xhr/cookies.http.html b/tests/wpt/tests/xhr/cookies.http.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/cookies.http.html rename to tests/wpt/tests/xhr/cookies.http.html diff --git a/tests/wpt/web-platform-tests/xhr/cors-expose-star.sub.any.js b/tests/wpt/tests/xhr/cors-expose-star.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/cors-expose-star.sub.any.js rename to tests/wpt/tests/xhr/cors-expose-star.sub.any.js diff --git a/tests/wpt/web-platform-tests/xhr/cors-upload.any.js b/tests/wpt/tests/xhr/cors-upload.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/cors-upload.any.js rename to tests/wpt/tests/xhr/cors-upload.any.js diff --git a/tests/wpt/web-platform-tests/xhr/data-uri.htm b/tests/wpt/tests/xhr/data-uri.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/data-uri.htm rename to tests/wpt/tests/xhr/data-uri.htm diff --git a/tests/wpt/web-platform-tests/xhr/event-abort.any.js b/tests/wpt/tests/xhr/event-abort.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/event-abort.any.js rename to tests/wpt/tests/xhr/event-abort.any.js diff --git a/tests/wpt/web-platform-tests/xhr/event-error-order.sub.html b/tests/wpt/tests/xhr/event-error-order.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/event-error-order.sub.html rename to tests/wpt/tests/xhr/event-error-order.sub.html diff --git a/tests/wpt/web-platform-tests/xhr/event-error.sub.any.js b/tests/wpt/tests/xhr/event-error.sub.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/event-error.sub.any.js rename to tests/wpt/tests/xhr/event-error.sub.any.js diff --git a/tests/wpt/web-platform-tests/xhr/event-load.any.js b/tests/wpt/tests/xhr/event-load.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/event-load.any.js rename to tests/wpt/tests/xhr/event-load.any.js diff --git a/tests/wpt/web-platform-tests/xhr/event-loadend.any.js b/tests/wpt/tests/xhr/event-loadend.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/event-loadend.any.js rename to tests/wpt/tests/xhr/event-loadend.any.js diff --git a/tests/wpt/web-platform-tests/xhr/event-loadstart-upload.any.js b/tests/wpt/tests/xhr/event-loadstart-upload.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/event-loadstart-upload.any.js rename to tests/wpt/tests/xhr/event-loadstart-upload.any.js diff --git a/tests/wpt/web-platform-tests/xhr/event-loadstart.any.js b/tests/wpt/tests/xhr/event-loadstart.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/event-loadstart.any.js rename to tests/wpt/tests/xhr/event-loadstart.any.js diff --git a/tests/wpt/web-platform-tests/xhr/event-progress.any.js b/tests/wpt/tests/xhr/event-progress.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/event-progress.any.js rename to tests/wpt/tests/xhr/event-progress.any.js diff --git a/tests/wpt/web-platform-tests/xhr/event-readystate-sync-open.any.js b/tests/wpt/tests/xhr/event-readystate-sync-open.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/event-readystate-sync-open.any.js rename to tests/wpt/tests/xhr/event-readystate-sync-open.any.js diff --git a/tests/wpt/web-platform-tests/xhr/event-readystatechange-loaded.any.js b/tests/wpt/tests/xhr/event-readystatechange-loaded.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/event-readystatechange-loaded.any.js rename to tests/wpt/tests/xhr/event-readystatechange-loaded.any.js diff --git a/tests/wpt/web-platform-tests/xhr/event-timeout-order.any.js b/tests/wpt/tests/xhr/event-timeout-order.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/event-timeout-order.any.js rename to tests/wpt/tests/xhr/event-timeout-order.any.js diff --git a/tests/wpt/web-platform-tests/xhr/event-timeout.any.js b/tests/wpt/tests/xhr/event-timeout.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/event-timeout.any.js rename to tests/wpt/tests/xhr/event-timeout.any.js diff --git a/tests/wpt/web-platform-tests/xhr/event-upload-progress-crossorigin.any.js b/tests/wpt/tests/xhr/event-upload-progress-crossorigin.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/event-upload-progress-crossorigin.any.js rename to tests/wpt/tests/xhr/event-upload-progress-crossorigin.any.js diff --git a/tests/wpt/web-platform-tests/xhr/event-upload-progress.any.js b/tests/wpt/tests/xhr/event-upload-progress.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/event-upload-progress.any.js rename to tests/wpt/tests/xhr/event-upload-progress.any.js diff --git a/tests/wpt/web-platform-tests/xhr/firing-events-http-content-length.html b/tests/wpt/tests/xhr/firing-events-http-content-length.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/firing-events-http-content-length.html rename to tests/wpt/tests/xhr/firing-events-http-content-length.html diff --git a/tests/wpt/web-platform-tests/xhr/firing-events-http-no-content-length.html b/tests/wpt/tests/xhr/firing-events-http-no-content-length.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/firing-events-http-no-content-length.html rename to tests/wpt/tests/xhr/firing-events-http-no-content-length.html diff --git a/tests/wpt/web-platform-tests/xhr/folder.txt b/tests/wpt/tests/xhr/folder.txt similarity index 100% rename from tests/wpt/web-platform-tests/xhr/folder.txt rename to tests/wpt/tests/xhr/folder.txt diff --git a/tests/wpt/web-platform-tests/xhr/formdata.html b/tests/wpt/tests/xhr/formdata.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata.html rename to tests/wpt/tests/xhr/formdata.html diff --git a/tests/wpt/web-platform-tests/xhr/formdata/append-formelement.html b/tests/wpt/tests/xhr/formdata/append-formelement.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/append-formelement.html rename to tests/wpt/tests/xhr/formdata/append-formelement.html diff --git a/tests/wpt/web-platform-tests/xhr/formdata/append.any.js b/tests/wpt/tests/xhr/formdata/append.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/append.any.js rename to tests/wpt/tests/xhr/formdata/append.any.js diff --git a/tests/wpt/web-platform-tests/xhr/formdata/constructor-formelement.html b/tests/wpt/tests/xhr/formdata/constructor-formelement.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/constructor-formelement.html rename to tests/wpt/tests/xhr/formdata/constructor-formelement.html diff --git a/tests/wpt/web-platform-tests/xhr/formdata/constructor-submitter.html b/tests/wpt/tests/xhr/formdata/constructor-submitter.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/constructor-submitter.html rename to tests/wpt/tests/xhr/formdata/constructor-submitter.html diff --git a/tests/wpt/web-platform-tests/xhr/formdata/constructor.any.js b/tests/wpt/tests/xhr/formdata/constructor.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/constructor.any.js rename to tests/wpt/tests/xhr/formdata/constructor.any.js diff --git a/tests/wpt/web-platform-tests/xhr/formdata/delete-formelement.html b/tests/wpt/tests/xhr/formdata/delete-formelement.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/delete-formelement.html rename to tests/wpt/tests/xhr/formdata/delete-formelement.html diff --git a/tests/wpt/web-platform-tests/xhr/formdata/delete.any.js b/tests/wpt/tests/xhr/formdata/delete.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/delete.any.js rename to tests/wpt/tests/xhr/formdata/delete.any.js diff --git a/tests/wpt/web-platform-tests/xhr/formdata/foreach.any.js b/tests/wpt/tests/xhr/formdata/foreach.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/foreach.any.js rename to tests/wpt/tests/xhr/formdata/foreach.any.js diff --git a/tests/wpt/web-platform-tests/xhr/formdata/get-formelement.html b/tests/wpt/tests/xhr/formdata/get-formelement.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/get-formelement.html rename to tests/wpt/tests/xhr/formdata/get-formelement.html diff --git a/tests/wpt/web-platform-tests/xhr/formdata/get.any.js b/tests/wpt/tests/xhr/formdata/get.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/get.any.js rename to tests/wpt/tests/xhr/formdata/get.any.js diff --git a/tests/wpt/web-platform-tests/xhr/formdata/has-formelement.html b/tests/wpt/tests/xhr/formdata/has-formelement.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/has-formelement.html rename to tests/wpt/tests/xhr/formdata/has-formelement.html diff --git a/tests/wpt/web-platform-tests/xhr/formdata/has.any.js b/tests/wpt/tests/xhr/formdata/has.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/has.any.js rename to tests/wpt/tests/xhr/formdata/has.any.js diff --git a/tests/wpt/web-platform-tests/xhr/formdata/iteration.any.js b/tests/wpt/tests/xhr/formdata/iteration.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/iteration.any.js rename to tests/wpt/tests/xhr/formdata/iteration.any.js diff --git a/tests/wpt/web-platform-tests/xhr/formdata/set-blob.any.js b/tests/wpt/tests/xhr/formdata/set-blob.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/set-blob.any.js rename to tests/wpt/tests/xhr/formdata/set-blob.any.js diff --git a/tests/wpt/web-platform-tests/xhr/formdata/set-formelement.html b/tests/wpt/tests/xhr/formdata/set-formelement.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/set-formelement.html rename to tests/wpt/tests/xhr/formdata/set-formelement.html diff --git a/tests/wpt/web-platform-tests/xhr/formdata/set.any.js b/tests/wpt/tests/xhr/formdata/set.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/formdata/set.any.js rename to tests/wpt/tests/xhr/formdata/set.any.js diff --git a/tests/wpt/web-platform-tests/xhr/getallresponseheaders-cookies.htm b/tests/wpt/tests/xhr/getallresponseheaders-cookies.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/getallresponseheaders-cookies.htm rename to tests/wpt/tests/xhr/getallresponseheaders-cookies.htm diff --git a/tests/wpt/web-platform-tests/xhr/getallresponseheaders-status.htm b/tests/wpt/tests/xhr/getallresponseheaders-status.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/getallresponseheaders-status.htm rename to tests/wpt/tests/xhr/getallresponseheaders-status.htm diff --git a/tests/wpt/web-platform-tests/xhr/getallresponseheaders.htm b/tests/wpt/tests/xhr/getallresponseheaders.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/getallresponseheaders.htm rename to tests/wpt/tests/xhr/getallresponseheaders.htm diff --git a/tests/wpt/web-platform-tests/xhr/getresponseheader-case-insensitive.htm b/tests/wpt/tests/xhr/getresponseheader-case-insensitive.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/getresponseheader-case-insensitive.htm rename to tests/wpt/tests/xhr/getresponseheader-case-insensitive.htm diff --git a/tests/wpt/web-platform-tests/xhr/getresponseheader-chunked-trailer.htm b/tests/wpt/tests/xhr/getresponseheader-chunked-trailer.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/getresponseheader-chunked-trailer.htm rename to tests/wpt/tests/xhr/getresponseheader-chunked-trailer.htm diff --git a/tests/wpt/web-platform-tests/xhr/getresponseheader-cookies-and-more.htm b/tests/wpt/tests/xhr/getresponseheader-cookies-and-more.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/getresponseheader-cookies-and-more.htm rename to tests/wpt/tests/xhr/getresponseheader-cookies-and-more.htm diff --git a/tests/wpt/web-platform-tests/xhr/getresponseheader-error-state.htm b/tests/wpt/tests/xhr/getresponseheader-error-state.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/getresponseheader-error-state.htm rename to tests/wpt/tests/xhr/getresponseheader-error-state.htm diff --git a/tests/wpt/web-platform-tests/xhr/getresponseheader-server-date.htm b/tests/wpt/tests/xhr/getresponseheader-server-date.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/getresponseheader-server-date.htm rename to tests/wpt/tests/xhr/getresponseheader-server-date.htm diff --git a/tests/wpt/web-platform-tests/xhr/getresponseheader-special-characters.htm b/tests/wpt/tests/xhr/getresponseheader-special-characters.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/getresponseheader-special-characters.htm rename to tests/wpt/tests/xhr/getresponseheader-special-characters.htm diff --git a/tests/wpt/web-platform-tests/xhr/getresponseheader-unsent-opened-state.htm b/tests/wpt/tests/xhr/getresponseheader-unsent-opened-state.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/getresponseheader-unsent-opened-state.htm rename to tests/wpt/tests/xhr/getresponseheader-unsent-opened-state.htm diff --git a/tests/wpt/web-platform-tests/xhr/getresponseheader.any.js b/tests/wpt/tests/xhr/getresponseheader.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/getresponseheader.any.js rename to tests/wpt/tests/xhr/getresponseheader.any.js diff --git a/tests/wpt/web-platform-tests/xhr/header-user-agent-async.htm b/tests/wpt/tests/xhr/header-user-agent-async.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/header-user-agent-async.htm rename to tests/wpt/tests/xhr/header-user-agent-async.htm diff --git a/tests/wpt/web-platform-tests/xhr/header-user-agent-sync.htm b/tests/wpt/tests/xhr/header-user-agent-sync.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/header-user-agent-sync.htm rename to tests/wpt/tests/xhr/header-user-agent-sync.htm diff --git a/tests/wpt/web-platform-tests/xhr/headers-normalize-response.htm b/tests/wpt/tests/xhr/headers-normalize-response.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/headers-normalize-response.htm rename to tests/wpt/tests/xhr/headers-normalize-response.htm diff --git a/tests/wpt/web-platform-tests/xhr/historical.html b/tests/wpt/tests/xhr/historical.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/historical.html rename to tests/wpt/tests/xhr/historical.html diff --git a/tests/wpt/web-platform-tests/xhr/idlharness.any.js b/tests/wpt/tests/xhr/idlharness.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/idlharness.any.js rename to tests/wpt/tests/xhr/idlharness.any.js diff --git a/tests/wpt/web-platform-tests/xhr/json.any.js b/tests/wpt/tests/xhr/json.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/json.any.js rename to tests/wpt/tests/xhr/json.any.js diff --git a/tests/wpt/web-platform-tests/xhr/loadstart-and-state.html b/tests/wpt/tests/xhr/loadstart-and-state.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/loadstart-and-state.html rename to tests/wpt/tests/xhr/loadstart-and-state.html diff --git a/tests/wpt/web-platform-tests/xhr/open-after-abort.htm b/tests/wpt/tests/xhr/open-after-abort.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-after-abort.htm rename to tests/wpt/tests/xhr/open-after-abort.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-after-setrequestheader.htm b/tests/wpt/tests/xhr/open-after-setrequestheader.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-after-setrequestheader.htm rename to tests/wpt/tests/xhr/open-after-setrequestheader.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-after-stop.window.js b/tests/wpt/tests/xhr/open-after-stop.window.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-after-stop.window.js rename to tests/wpt/tests/xhr/open-after-stop.window.js diff --git a/tests/wpt/web-platform-tests/xhr/open-during-abort-event.htm b/tests/wpt/tests/xhr/open-during-abort-event.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-during-abort-event.htm rename to tests/wpt/tests/xhr/open-during-abort-event.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-during-abort-processing.htm b/tests/wpt/tests/xhr/open-during-abort-processing.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-during-abort-processing.htm rename to tests/wpt/tests/xhr/open-during-abort-processing.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-during-abort.htm b/tests/wpt/tests/xhr/open-during-abort.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-during-abort.htm rename to tests/wpt/tests/xhr/open-during-abort.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-method-bogus.htm b/tests/wpt/tests/xhr/open-method-bogus.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-method-bogus.htm rename to tests/wpt/tests/xhr/open-method-bogus.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-method-case-insensitive.htm b/tests/wpt/tests/xhr/open-method-case-insensitive.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-method-case-insensitive.htm rename to tests/wpt/tests/xhr/open-method-case-insensitive.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-method-case-sensitive.htm b/tests/wpt/tests/xhr/open-method-case-sensitive.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-method-case-sensitive.htm rename to tests/wpt/tests/xhr/open-method-case-sensitive.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-method-insecure.htm b/tests/wpt/tests/xhr/open-method-insecure.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-method-insecure.htm rename to tests/wpt/tests/xhr/open-method-insecure.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-method-responsetype-set-sync.htm b/tests/wpt/tests/xhr/open-method-responsetype-set-sync.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-method-responsetype-set-sync.htm rename to tests/wpt/tests/xhr/open-method-responsetype-set-sync.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-open-send.htm b/tests/wpt/tests/xhr/open-open-send.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-open-send.htm rename to tests/wpt/tests/xhr/open-open-send.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-open-sync-send.htm b/tests/wpt/tests/xhr/open-open-sync-send.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-open-sync-send.htm rename to tests/wpt/tests/xhr/open-open-sync-send.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-parameters-toString.htm b/tests/wpt/tests/xhr/open-parameters-toString.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-parameters-toString.htm rename to tests/wpt/tests/xhr/open-parameters-toString.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-referer.htm b/tests/wpt/tests/xhr/open-referer.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-referer.htm rename to tests/wpt/tests/xhr/open-referer.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-send-during-abort.htm b/tests/wpt/tests/xhr/open-send-during-abort.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-send-during-abort.htm rename to tests/wpt/tests/xhr/open-send-during-abort.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-send-open.htm b/tests/wpt/tests/xhr/open-send-open.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-send-open.htm rename to tests/wpt/tests/xhr/open-send-open.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-sync-open-send.htm b/tests/wpt/tests/xhr/open-sync-open-send.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-sync-open-send.htm rename to tests/wpt/tests/xhr/open-sync-open-send.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-about-blank-window.htm b/tests/wpt/tests/xhr/open-url-about-blank-window.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-about-blank-window.htm rename to tests/wpt/tests/xhr/open-url-about-blank-window.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-base-inserted-after-open.htm b/tests/wpt/tests/xhr/open-url-base-inserted-after-open.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-base-inserted-after-open.htm rename to tests/wpt/tests/xhr/open-url-base-inserted-after-open.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-base-inserted.htm b/tests/wpt/tests/xhr/open-url-base-inserted.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-base-inserted.htm rename to tests/wpt/tests/xhr/open-url-base-inserted.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-base.htm b/tests/wpt/tests/xhr/open-url-base.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-base.htm rename to tests/wpt/tests/xhr/open-url-base.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-encoding.htm b/tests/wpt/tests/xhr/open-url-encoding.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-encoding.htm rename to tests/wpt/tests/xhr/open-url-encoding.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-fragment.htm b/tests/wpt/tests/xhr/open-url-fragment.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-fragment.htm rename to tests/wpt/tests/xhr/open-url-fragment.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-javascript-window-2.htm b/tests/wpt/tests/xhr/open-url-javascript-window-2.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-javascript-window-2.htm rename to tests/wpt/tests/xhr/open-url-javascript-window-2.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-javascript-window.htm b/tests/wpt/tests/xhr/open-url-javascript-window.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-javascript-window.htm rename to tests/wpt/tests/xhr/open-url-javascript-window.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-multi-window-2.htm b/tests/wpt/tests/xhr/open-url-multi-window-2.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-multi-window-2.htm rename to tests/wpt/tests/xhr/open-url-multi-window-2.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-multi-window-3.htm b/tests/wpt/tests/xhr/open-url-multi-window-3.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-multi-window-3.htm rename to tests/wpt/tests/xhr/open-url-multi-window-3.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-multi-window-4.htm b/tests/wpt/tests/xhr/open-url-multi-window-4.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-multi-window-4.htm rename to tests/wpt/tests/xhr/open-url-multi-window-4.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-multi-window-5.htm b/tests/wpt/tests/xhr/open-url-multi-window-5.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-multi-window-5.htm rename to tests/wpt/tests/xhr/open-url-multi-window-5.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-multi-window-6.htm b/tests/wpt/tests/xhr/open-url-multi-window-6.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-multi-window-6.htm rename to tests/wpt/tests/xhr/open-url-multi-window-6.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-multi-window.htm b/tests/wpt/tests/xhr/open-url-multi-window.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-multi-window.htm rename to tests/wpt/tests/xhr/open-url-multi-window.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-redirected-sharedworker-origin.htm b/tests/wpt/tests/xhr/open-url-redirected-sharedworker-origin.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-redirected-sharedworker-origin.htm rename to tests/wpt/tests/xhr/open-url-redirected-sharedworker-origin.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-redirected-worker-origin.htm b/tests/wpt/tests/xhr/open-url-redirected-worker-origin.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-redirected-worker-origin.htm rename to tests/wpt/tests/xhr/open-url-redirected-worker-origin.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-worker-origin.htm b/tests/wpt/tests/xhr/open-url-worker-origin.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-worker-origin.htm rename to tests/wpt/tests/xhr/open-url-worker-origin.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-url-worker-simple.htm b/tests/wpt/tests/xhr/open-url-worker-simple.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-url-worker-simple.htm rename to tests/wpt/tests/xhr/open-url-worker-simple.htm diff --git a/tests/wpt/web-platform-tests/xhr/open-user-password-non-same-origin.htm b/tests/wpt/tests/xhr/open-user-password-non-same-origin.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/open-user-password-non-same-origin.htm rename to tests/wpt/tests/xhr/open-user-password-non-same-origin.htm diff --git a/tests/wpt/web-platform-tests/xhr/over-1-meg.any.js b/tests/wpt/tests/xhr/over-1-meg.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/over-1-meg.any.js rename to tests/wpt/tests/xhr/over-1-meg.any.js diff --git a/tests/wpt/web-platform-tests/xhr/overridemimetype-blob.html b/tests/wpt/tests/xhr/overridemimetype-blob.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/overridemimetype-blob.html rename to tests/wpt/tests/xhr/overridemimetype-blob.html diff --git a/tests/wpt/web-platform-tests/xhr/overridemimetype-done-state.any.js b/tests/wpt/tests/xhr/overridemimetype-done-state.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/overridemimetype-done-state.any.js rename to tests/wpt/tests/xhr/overridemimetype-done-state.any.js diff --git a/tests/wpt/web-platform-tests/xhr/overridemimetype-edge-cases.window.js b/tests/wpt/tests/xhr/overridemimetype-edge-cases.window.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/overridemimetype-edge-cases.window.js rename to tests/wpt/tests/xhr/overridemimetype-edge-cases.window.js diff --git a/tests/wpt/web-platform-tests/xhr/overridemimetype-headers-received-state-force-shiftjis.htm b/tests/wpt/tests/xhr/overridemimetype-headers-received-state-force-shiftjis.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/overridemimetype-headers-received-state-force-shiftjis.htm rename to tests/wpt/tests/xhr/overridemimetype-headers-received-state-force-shiftjis.htm diff --git a/tests/wpt/web-platform-tests/xhr/overridemimetype-invalid-mime-type.htm b/tests/wpt/tests/xhr/overridemimetype-invalid-mime-type.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/overridemimetype-invalid-mime-type.htm rename to tests/wpt/tests/xhr/overridemimetype-invalid-mime-type.htm diff --git a/tests/wpt/web-platform-tests/xhr/overridemimetype-loading-state.htm b/tests/wpt/tests/xhr/overridemimetype-loading-state.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/overridemimetype-loading-state.htm rename to tests/wpt/tests/xhr/overridemimetype-loading-state.htm diff --git a/tests/wpt/web-platform-tests/xhr/overridemimetype-open-state-force-utf-8.htm b/tests/wpt/tests/xhr/overridemimetype-open-state-force-utf-8.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/overridemimetype-open-state-force-utf-8.htm rename to tests/wpt/tests/xhr/overridemimetype-open-state-force-utf-8.htm diff --git a/tests/wpt/web-platform-tests/xhr/overridemimetype-open-state-force-xml.htm b/tests/wpt/tests/xhr/overridemimetype-open-state-force-xml.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/overridemimetype-open-state-force-xml.htm rename to tests/wpt/tests/xhr/overridemimetype-open-state-force-xml.htm diff --git a/tests/wpt/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.js b/tests/wpt/tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.js rename to tests/wpt/tests/xhr/overridemimetype-unsent-state-force-shiftjis.any.js diff --git a/tests/wpt/web-platform-tests/xhr/preserve-ua-header-on-redirect.htm b/tests/wpt/tests/xhr/preserve-ua-header-on-redirect.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/preserve-ua-header-on-redirect.htm rename to tests/wpt/tests/xhr/preserve-ua-header-on-redirect.htm diff --git a/tests/wpt/web-platform-tests/xhr/progress-events-response-data-gzip.htm b/tests/wpt/tests/xhr/progress-events-response-data-gzip.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/progress-events-response-data-gzip.htm rename to tests/wpt/tests/xhr/progress-events-response-data-gzip.htm diff --git a/tests/wpt/web-platform-tests/xhr/progressevent-constructor.html b/tests/wpt/tests/xhr/progressevent-constructor.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/progressevent-constructor.html rename to tests/wpt/tests/xhr/progressevent-constructor.html diff --git a/tests/wpt/web-platform-tests/xhr/progressevent-interface.html b/tests/wpt/tests/xhr/progressevent-interface.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/progressevent-interface.html rename to tests/wpt/tests/xhr/progressevent-interface.html diff --git a/tests/wpt/web-platform-tests/xhr/request-content-length.any.js b/tests/wpt/tests/xhr/request-content-length.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/request-content-length.any.js rename to tests/wpt/tests/xhr/request-content-length.any.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/accept-language.py b/tests/wpt/tests/xhr/resources/accept-language.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/accept-language.py rename to tests/wpt/tests/xhr/resources/accept-language.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/accept.py b/tests/wpt/tests/xhr/resources/accept.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/accept.py rename to tests/wpt/tests/xhr/resources/accept.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-allow-lists.py b/tests/wpt/tests/xhr/resources/access-control-allow-lists.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-allow-lists.py rename to tests/wpt/tests/xhr/resources/access-control-allow-lists.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-allow-with-body.py b/tests/wpt/tests/xhr/resources/access-control-allow-with-body.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-allow-with-body.py rename to tests/wpt/tests/xhr/resources/access-control-allow-with-body.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-auth-basic.py b/tests/wpt/tests/xhr/resources/access-control-auth-basic.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-auth-basic.py rename to tests/wpt/tests/xhr/resources/access-control-auth-basic.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-allow-no-credentials.py b/tests/wpt/tests/xhr/resources/access-control-basic-allow-no-credentials.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-basic-allow-no-credentials.py rename to tests/wpt/tests/xhr/resources/access-control-basic-allow-no-credentials.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-allow-star.py b/tests/wpt/tests/xhr/resources/access-control-basic-allow-star.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-basic-allow-star.py rename to tests/wpt/tests/xhr/resources/access-control-basic-allow-star.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-allow.py b/tests/wpt/tests/xhr/resources/access-control-basic-allow.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-basic-allow.py rename to tests/wpt/tests/xhr/resources/access-control-basic-allow.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-cors-safelisted-request-headers.py b/tests/wpt/tests/xhr/resources/access-control-basic-cors-safelisted-request-headers.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-basic-cors-safelisted-request-headers.py rename to tests/wpt/tests/xhr/resources/access-control-basic-cors-safelisted-request-headers.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-cors-safelisted-response-headers.py b/tests/wpt/tests/xhr/resources/access-control-basic-cors-safelisted-response-headers.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-basic-cors-safelisted-response-headers.py rename to tests/wpt/tests/xhr/resources/access-control-basic-cors-safelisted-response-headers.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-denied.py b/tests/wpt/tests/xhr/resources/access-control-basic-denied.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-basic-denied.py rename to tests/wpt/tests/xhr/resources/access-control-basic-denied.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-options-not-supported.py b/tests/wpt/tests/xhr/resources/access-control-basic-options-not-supported.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-basic-options-not-supported.py rename to tests/wpt/tests/xhr/resources/access-control-basic-options-not-supported.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-preflight-cache-invalidation.py b/tests/wpt/tests/xhr/resources/access-control-basic-preflight-cache-invalidation.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-basic-preflight-cache-invalidation.py rename to tests/wpt/tests/xhr/resources/access-control-basic-preflight-cache-invalidation.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-preflight-cache-timeout.py b/tests/wpt/tests/xhr/resources/access-control-basic-preflight-cache-timeout.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-basic-preflight-cache-timeout.py rename to tests/wpt/tests/xhr/resources/access-control-basic-preflight-cache-timeout.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-preflight-cache.py b/tests/wpt/tests/xhr/resources/access-control-basic-preflight-cache.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-basic-preflight-cache.py rename to tests/wpt/tests/xhr/resources/access-control-basic-preflight-cache.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-put-allow.py b/tests/wpt/tests/xhr/resources/access-control-basic-put-allow.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-basic-put-allow.py rename to tests/wpt/tests/xhr/resources/access-control-basic-put-allow.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-cookie.py b/tests/wpt/tests/xhr/resources/access-control-cookie.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-cookie.py rename to tests/wpt/tests/xhr/resources/access-control-cookie.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-origin-header.py b/tests/wpt/tests/xhr/resources/access-control-origin-header.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-origin-header.py rename to tests/wpt/tests/xhr/resources/access-control-origin-header.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-denied.py b/tests/wpt/tests/xhr/resources/access-control-preflight-denied.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-denied.py rename to tests/wpt/tests/xhr/resources/access-control-preflight-denied.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-request-allow-headers-returns-star.py b/tests/wpt/tests/xhr/resources/access-control-preflight-request-allow-headers-returns-star.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-request-allow-headers-returns-star.py rename to tests/wpt/tests/xhr/resources/access-control-preflight-request-allow-headers-returns-star.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-request-header-lowercase.py b/tests/wpt/tests/xhr/resources/access-control-preflight-request-header-lowercase.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-request-header-lowercase.py rename to tests/wpt/tests/xhr/resources/access-control-preflight-request-header-lowercase.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-request-header-returns-origin.py b/tests/wpt/tests/xhr/resources/access-control-preflight-request-header-returns-origin.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-request-header-returns-origin.py rename to tests/wpt/tests/xhr/resources/access-control-preflight-request-header-returns-origin.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-request-header-sorted.py b/tests/wpt/tests/xhr/resources/access-control-preflight-request-header-sorted.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-request-header-sorted.py rename to tests/wpt/tests/xhr/resources/access-control-preflight-request-header-sorted.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-request-headers-origin.py b/tests/wpt/tests/xhr/resources/access-control-preflight-request-headers-origin.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-request-headers-origin.py rename to tests/wpt/tests/xhr/resources/access-control-preflight-request-headers-origin.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-request-invalid-status.py b/tests/wpt/tests/xhr/resources/access-control-preflight-request-invalid-status.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-request-invalid-status.py rename to tests/wpt/tests/xhr/resources/access-control-preflight-request-invalid-status.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-request-must-not-contain-cookie.py b/tests/wpt/tests/xhr/resources/access-control-preflight-request-must-not-contain-cookie.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-request-must-not-contain-cookie.py rename to tests/wpt/tests/xhr/resources/access-control-preflight-request-must-not-contain-cookie.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-sandboxed-iframe.html b/tests/wpt/tests/xhr/resources/access-control-sandboxed-iframe.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/access-control-sandboxed-iframe.html rename to tests/wpt/tests/xhr/resources/access-control-sandboxed-iframe.html diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth1/auth.py b/tests/wpt/tests/xhr/resources/auth1/auth.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/auth1/auth.py rename to tests/wpt/tests/xhr/resources/auth1/auth.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth10/auth.py b/tests/wpt/tests/xhr/resources/auth10/auth.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/auth10/auth.py rename to tests/wpt/tests/xhr/resources/auth10/auth.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth11/auth.py b/tests/wpt/tests/xhr/resources/auth11/auth.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/auth11/auth.py rename to tests/wpt/tests/xhr/resources/auth11/auth.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth2/auth.py b/tests/wpt/tests/xhr/resources/auth2/auth.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/auth2/auth.py rename to tests/wpt/tests/xhr/resources/auth2/auth.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth2/corsenabled.py b/tests/wpt/tests/xhr/resources/auth2/corsenabled.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/auth2/corsenabled.py rename to tests/wpt/tests/xhr/resources/auth2/corsenabled.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth3/auth.py b/tests/wpt/tests/xhr/resources/auth3/auth.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/auth3/auth.py rename to tests/wpt/tests/xhr/resources/auth3/auth.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth4/auth.py b/tests/wpt/tests/xhr/resources/auth4/auth.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/auth4/auth.py rename to tests/wpt/tests/xhr/resources/auth4/auth.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth5/auth.py b/tests/wpt/tests/xhr/resources/auth5/auth.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/auth5/auth.py rename to tests/wpt/tests/xhr/resources/auth5/auth.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth6/auth.py b/tests/wpt/tests/xhr/resources/auth6/auth.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/auth6/auth.py rename to tests/wpt/tests/xhr/resources/auth6/auth.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth7/corsenabled.py b/tests/wpt/tests/xhr/resources/auth7/corsenabled.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/auth7/corsenabled.py rename to tests/wpt/tests/xhr/resources/auth7/corsenabled.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth8/corsenabled-no-authorize.py b/tests/wpt/tests/xhr/resources/auth8/corsenabled-no-authorize.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/auth8/corsenabled-no-authorize.py rename to tests/wpt/tests/xhr/resources/auth8/corsenabled-no-authorize.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth9/auth.py b/tests/wpt/tests/xhr/resources/auth9/auth.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/auth9/auth.py rename to tests/wpt/tests/xhr/resources/auth9/auth.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/authentication.py b/tests/wpt/tests/xhr/resources/authentication.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/authentication.py rename to tests/wpt/tests/xhr/resources/authentication.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/bad-chunk-encoding.py b/tests/wpt/tests/xhr/resources/bad-chunk-encoding.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/bad-chunk-encoding.py rename to tests/wpt/tests/xhr/resources/bad-chunk-encoding.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/base.xml b/tests/wpt/tests/xhr/resources/base.xml similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/base.xml rename to tests/wpt/tests/xhr/resources/base.xml diff --git a/tests/wpt/web-platform-tests/xhr/resources/chunked.py b/tests/wpt/tests/xhr/resources/chunked.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/chunked.py rename to tests/wpt/tests/xhr/resources/chunked.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/conditional.py b/tests/wpt/tests/xhr/resources/conditional.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/conditional.py rename to tests/wpt/tests/xhr/resources/conditional.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/content.py b/tests/wpt/tests/xhr/resources/content.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/content.py rename to tests/wpt/tests/xhr/resources/content.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/corsenabled.py b/tests/wpt/tests/xhr/resources/corsenabled.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/corsenabled.py rename to tests/wpt/tests/xhr/resources/corsenabled.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/delay.py b/tests/wpt/tests/xhr/resources/delay.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/delay.py rename to tests/wpt/tests/xhr/resources/delay.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/echo-content-cors.py b/tests/wpt/tests/xhr/resources/echo-content-cors.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/echo-content-cors.py rename to tests/wpt/tests/xhr/resources/echo-content-cors.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/echo-content-type.py b/tests/wpt/tests/xhr/resources/echo-content-type.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/echo-content-type.py rename to tests/wpt/tests/xhr/resources/echo-content-type.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/echo-headers.py b/tests/wpt/tests/xhr/resources/echo-headers.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/echo-headers.py rename to tests/wpt/tests/xhr/resources/echo-headers.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/echo-method.py b/tests/wpt/tests/xhr/resources/echo-method.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/echo-method.py rename to tests/wpt/tests/xhr/resources/echo-method.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/empty-div-utf8-html.py b/tests/wpt/tests/xhr/resources/empty-div-utf8-html.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/empty-div-utf8-html.py rename to tests/wpt/tests/xhr/resources/empty-div-utf8-html.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/folder.txt b/tests/wpt/tests/xhr/resources/folder.txt similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/folder.txt rename to tests/wpt/tests/xhr/resources/folder.txt diff --git a/tests/wpt/web-platform-tests/xhr/resources/form.py b/tests/wpt/tests/xhr/resources/form.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/form.py rename to tests/wpt/tests/xhr/resources/form.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/get-set-cookie.py b/tests/wpt/tests/xhr/resources/get-set-cookie.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/get-set-cookie.py rename to tests/wpt/tests/xhr/resources/get-set-cookie.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/gzip.py b/tests/wpt/tests/xhr/resources/gzip.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/gzip.py rename to tests/wpt/tests/xhr/resources/gzip.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/header-content-length-twice.asis b/tests/wpt/tests/xhr/resources/header-content-length-twice.asis similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/header-content-length-twice.asis rename to tests/wpt/tests/xhr/resources/header-content-length-twice.asis diff --git a/tests/wpt/web-platform-tests/xhr/resources/header-content-length.asis b/tests/wpt/tests/xhr/resources/header-content-length.asis similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/header-content-length.asis rename to tests/wpt/tests/xhr/resources/header-content-length.asis diff --git a/tests/wpt/web-platform-tests/xhr/resources/header-user-agent.py b/tests/wpt/tests/xhr/resources/header-user-agent.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/header-user-agent.py rename to tests/wpt/tests/xhr/resources/header-user-agent.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/headers-basic.asis b/tests/wpt/tests/xhr/resources/headers-basic.asis similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/headers-basic.asis rename to tests/wpt/tests/xhr/resources/headers-basic.asis diff --git a/tests/wpt/web-platform-tests/xhr/resources/headers-double-empty.asis b/tests/wpt/tests/xhr/resources/headers-double-empty.asis similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/headers-double-empty.asis rename to tests/wpt/tests/xhr/resources/headers-double-empty.asis diff --git a/tests/wpt/web-platform-tests/xhr/resources/headers-some-are-empty.asis b/tests/wpt/tests/xhr/resources/headers-some-are-empty.asis similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/headers-some-are-empty.asis rename to tests/wpt/tests/xhr/resources/headers-some-are-empty.asis diff --git a/tests/wpt/web-platform-tests/xhr/resources/headers-www-authenticate.asis b/tests/wpt/tests/xhr/resources/headers-www-authenticate.asis similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/headers-www-authenticate.asis rename to tests/wpt/tests/xhr/resources/headers-www-authenticate.asis diff --git a/tests/wpt/web-platform-tests/xhr/resources/headers.asis b/tests/wpt/tests/xhr/resources/headers.asis similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/headers.asis rename to tests/wpt/tests/xhr/resources/headers.asis diff --git a/tests/wpt/web-platform-tests/xhr/resources/headers.py b/tests/wpt/tests/xhr/resources/headers.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/headers.py rename to tests/wpt/tests/xhr/resources/headers.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/image.gif b/tests/wpt/tests/xhr/resources/image.gif similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/image.gif rename to tests/wpt/tests/xhr/resources/image.gif diff --git a/tests/wpt/web-platform-tests/xhr/resources/img-utf8-html.py b/tests/wpt/tests/xhr/resources/img-utf8-html.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/img-utf8-html.py rename to tests/wpt/tests/xhr/resources/img-utf8-html.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/img.jpg b/tests/wpt/tests/xhr/resources/img.jpg similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/img.jpg rename to tests/wpt/tests/xhr/resources/img.jpg diff --git a/tests/wpt/web-platform-tests/xhr/resources/infinite-redirects.py b/tests/wpt/tests/xhr/resources/infinite-redirects.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/infinite-redirects.py rename to tests/wpt/tests/xhr/resources/infinite-redirects.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/init.htm b/tests/wpt/tests/xhr/resources/init.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/init.htm rename to tests/wpt/tests/xhr/resources/init.htm diff --git a/tests/wpt/web-platform-tests/xhr/resources/inspect-headers.py b/tests/wpt/tests/xhr/resources/inspect-headers.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/inspect-headers.py rename to tests/wpt/tests/xhr/resources/inspect-headers.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/invalid-utf8-html.py b/tests/wpt/tests/xhr/resources/invalid-utf8-html.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/invalid-utf8-html.py rename to tests/wpt/tests/xhr/resources/invalid-utf8-html.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/last-modified.py b/tests/wpt/tests/xhr/resources/last-modified.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/last-modified.py rename to tests/wpt/tests/xhr/resources/last-modified.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/no-custom-header-on-preflight.py b/tests/wpt/tests/xhr/resources/no-custom-header-on-preflight.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/no-custom-header-on-preflight.py rename to tests/wpt/tests/xhr/resources/no-custom-header-on-preflight.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/nocors/folder.txt b/tests/wpt/tests/xhr/resources/nocors/folder.txt similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/nocors/folder.txt rename to tests/wpt/tests/xhr/resources/nocors/folder.txt diff --git a/tests/wpt/web-platform-tests/xhr/resources/over-1-meg.txt b/tests/wpt/tests/xhr/resources/over-1-meg.txt similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/over-1-meg.txt rename to tests/wpt/tests/xhr/resources/over-1-meg.txt diff --git a/tests/wpt/web-platform-tests/xhr/resources/parse-headers.py b/tests/wpt/tests/xhr/resources/parse-headers.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/parse-headers.py rename to tests/wpt/tests/xhr/resources/parse-headers.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/pass.txt b/tests/wpt/tests/xhr/resources/pass.txt similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/pass.txt rename to tests/wpt/tests/xhr/resources/pass.txt diff --git a/tests/wpt/web-platform-tests/xhr/resources/redirect-cors.py b/tests/wpt/tests/xhr/resources/redirect-cors.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/redirect-cors.py rename to tests/wpt/tests/xhr/resources/redirect-cors.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/redirect.py b/tests/wpt/tests/xhr/resources/redirect.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/redirect.py rename to tests/wpt/tests/xhr/resources/redirect.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/requri.py b/tests/wpt/tests/xhr/resources/requri.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/requri.py rename to tests/wpt/tests/xhr/resources/requri.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/reset-token.py b/tests/wpt/tests/xhr/resources/reset-token.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/reset-token.py rename to tests/wpt/tests/xhr/resources/reset-token.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/responseType-document-in-worker.js b/tests/wpt/tests/xhr/resources/responseType-document-in-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/responseType-document-in-worker.js rename to tests/wpt/tests/xhr/resources/responseType-document-in-worker.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/responseXML-unavailable-in-worker.js b/tests/wpt/tests/xhr/resources/responseXML-unavailable-in-worker.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/responseXML-unavailable-in-worker.js rename to tests/wpt/tests/xhr/resources/responseXML-unavailable-in-worker.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-1.htm b/tests/wpt/tests/xhr/resources/send-after-setting-document-domain-window-1.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-1.htm rename to tests/wpt/tests/xhr/resources/send-after-setting-document-domain-window-1.htm diff --git a/tests/wpt/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-2.htm b/tests/wpt/tests/xhr/resources/send-after-setting-document-domain-window-2.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-2.htm rename to tests/wpt/tests/xhr/resources/send-after-setting-document-domain-window-2.htm diff --git a/tests/wpt/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-helper.js b/tests/wpt/tests/xhr/resources/send-after-setting-document-domain-window-helper.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-helper.js rename to tests/wpt/tests/xhr/resources/send-after-setting-document-domain-window-helper.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/shift-jis-html.py b/tests/wpt/tests/xhr/resources/shift-jis-html.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/shift-jis-html.py rename to tests/wpt/tests/xhr/resources/shift-jis-html.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/status.py b/tests/wpt/tests/xhr/resources/status.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/status.py rename to tests/wpt/tests/xhr/resources/status.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/top.txt b/tests/wpt/tests/xhr/resources/top.txt similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/top.txt rename to tests/wpt/tests/xhr/resources/top.txt diff --git a/tests/wpt/web-platform-tests/xhr/resources/trickle.py b/tests/wpt/tests/xhr/resources/trickle.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/trickle.py rename to tests/wpt/tests/xhr/resources/trickle.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/upload.py b/tests/wpt/tests/xhr/resources/upload.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/upload.py rename to tests/wpt/tests/xhr/resources/upload.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/utf16-bom.json b/tests/wpt/tests/xhr/resources/utf16-bom.json similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/utf16-bom.json rename to tests/wpt/tests/xhr/resources/utf16-bom.json diff --git a/tests/wpt/web-platform-tests/xhr/resources/utf16.txt b/tests/wpt/tests/xhr/resources/utf16.txt similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/utf16.txt rename to tests/wpt/tests/xhr/resources/utf16.txt diff --git a/tests/wpt/web-platform-tests/xhr/resources/well-formed.xml b/tests/wpt/tests/xhr/resources/well-formed.xml similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/well-formed.xml rename to tests/wpt/tests/xhr/resources/well-formed.xml diff --git a/tests/wpt/web-platform-tests/xhr/resources/win-1252-html.py b/tests/wpt/tests/xhr/resources/win-1252-html.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/win-1252-html.py rename to tests/wpt/tests/xhr/resources/win-1252-html.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/win-1252-xml.py b/tests/wpt/tests/xhr/resources/win-1252-xml.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/win-1252-xml.py rename to tests/wpt/tests/xhr/resources/win-1252-xml.py diff --git a/tests/wpt/web-platform-tests/xhr/resources/workerxhr-origin-referrer.js b/tests/wpt/tests/xhr/resources/workerxhr-origin-referrer.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/workerxhr-origin-referrer.js rename to tests/wpt/tests/xhr/resources/workerxhr-origin-referrer.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/workerxhr-simple.js b/tests/wpt/tests/xhr/resources/workerxhr-simple.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/workerxhr-simple.js rename to tests/wpt/tests/xhr/resources/workerxhr-simple.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-event-order.js b/tests/wpt/tests/xhr/resources/xmlhttprequest-event-order.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-event-order.js rename to tests/wpt/tests/xhr/resources/xmlhttprequest-event-order.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-aborted.js b/tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-aborted.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-aborted.js rename to tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-aborted.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-abortedonmain.js b/tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-abortedonmain.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-abortedonmain.js rename to tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-abortedonmain.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-overrides.js b/tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-overrides.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-overrides.js rename to tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-overrides.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-overridesexpires.js b/tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-overridesexpires.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-overridesexpires.js rename to tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-overridesexpires.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-runner.js b/tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-runner.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-runner.js rename to tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-runner.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-simple.js b/tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-simple.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-simple.js rename to tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-simple.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-synconmain.js b/tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-synconmain.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-synconmain.js rename to tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-synconmain.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-synconworker.js b/tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-synconworker.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-synconworker.js rename to tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-synconworker.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-twice.js b/tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-twice.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout-twice.js rename to tests/wpt/tests/xhr/resources/xmlhttprequest-timeout-twice.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout.js b/tests/wpt/tests/xhr/resources/xmlhttprequest-timeout.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/xmlhttprequest-timeout.js rename to tests/wpt/tests/xhr/resources/xmlhttprequest-timeout.js diff --git a/tests/wpt/web-platform-tests/xhr/resources/zlib.py b/tests/wpt/tests/xhr/resources/zlib.py similarity index 100% rename from tests/wpt/web-platform-tests/xhr/resources/zlib.py rename to tests/wpt/tests/xhr/resources/zlib.py diff --git a/tests/wpt/web-platform-tests/xhr/response-body-errors.any.js b/tests/wpt/tests/xhr/response-body-errors.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/response-body-errors.any.js rename to tests/wpt/tests/xhr/response-body-errors.any.js diff --git a/tests/wpt/web-platform-tests/xhr/response-data-arraybuffer.htm b/tests/wpt/tests/xhr/response-data-arraybuffer.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/response-data-arraybuffer.htm rename to tests/wpt/tests/xhr/response-data-arraybuffer.htm diff --git a/tests/wpt/web-platform-tests/xhr/response-data-blob.htm b/tests/wpt/tests/xhr/response-data-blob.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/response-data-blob.htm rename to tests/wpt/tests/xhr/response-data-blob.htm diff --git a/tests/wpt/web-platform-tests/xhr/response-data-deflate.htm b/tests/wpt/tests/xhr/response-data-deflate.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/response-data-deflate.htm rename to tests/wpt/tests/xhr/response-data-deflate.htm diff --git a/tests/wpt/web-platform-tests/xhr/response-data-gzip.htm b/tests/wpt/tests/xhr/response-data-gzip.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/response-data-gzip.htm rename to tests/wpt/tests/xhr/response-data-gzip.htm diff --git a/tests/wpt/web-platform-tests/xhr/response-data-progress.htm b/tests/wpt/tests/xhr/response-data-progress.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/response-data-progress.htm rename to tests/wpt/tests/xhr/response-data-progress.htm diff --git a/tests/wpt/web-platform-tests/xhr/response-invalid-responsetype.htm b/tests/wpt/tests/xhr/response-invalid-responsetype.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/response-invalid-responsetype.htm rename to tests/wpt/tests/xhr/response-invalid-responsetype.htm diff --git a/tests/wpt/web-platform-tests/xhr/response-json.htm b/tests/wpt/tests/xhr/response-json.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/response-json.htm rename to tests/wpt/tests/xhr/response-json.htm diff --git a/tests/wpt/web-platform-tests/xhr/response-method.htm b/tests/wpt/tests/xhr/response-method.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/response-method.htm rename to tests/wpt/tests/xhr/response-method.htm diff --git a/tests/wpt/web-platform-tests/xhr/responseText-status.html b/tests/wpt/tests/xhr/responseText-status.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/responseText-status.html rename to tests/wpt/tests/xhr/responseText-status.html diff --git a/tests/wpt/web-platform-tests/xhr/responseType-document-in-worker.html b/tests/wpt/tests/xhr/responseType-document-in-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/responseType-document-in-worker.html rename to tests/wpt/tests/xhr/responseType-document-in-worker.html diff --git a/tests/wpt/web-platform-tests/xhr/responseXML-unavailable-in-worker.html b/tests/wpt/tests/xhr/responseXML-unavailable-in-worker.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/responseXML-unavailable-in-worker.html rename to tests/wpt/tests/xhr/responseXML-unavailable-in-worker.html diff --git a/tests/wpt/web-platform-tests/xhr/responsedocument-decoding.htm b/tests/wpt/tests/xhr/responsedocument-decoding.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/responsedocument-decoding.htm rename to tests/wpt/tests/xhr/responsedocument-decoding.htm diff --git a/tests/wpt/web-platform-tests/xhr/responsetext-decoding.htm b/tests/wpt/tests/xhr/responsetext-decoding.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/responsetext-decoding.htm rename to tests/wpt/tests/xhr/responsetext-decoding.htm diff --git a/tests/wpt/web-platform-tests/xhr/responsetype.any.js b/tests/wpt/tests/xhr/responsetype.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/responsetype.any.js rename to tests/wpt/tests/xhr/responsetype.any.js diff --git a/tests/wpt/web-platform-tests/xhr/responseurl.html b/tests/wpt/tests/xhr/responseurl.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/responseurl.html rename to tests/wpt/tests/xhr/responseurl.html diff --git a/tests/wpt/web-platform-tests/xhr/responsexml-basic.htm b/tests/wpt/tests/xhr/responsexml-basic.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/responsexml-basic.htm rename to tests/wpt/tests/xhr/responsexml-basic.htm diff --git a/tests/wpt/web-platform-tests/xhr/responsexml-document-properties.htm b/tests/wpt/tests/xhr/responsexml-document-properties.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/responsexml-document-properties.htm rename to tests/wpt/tests/xhr/responsexml-document-properties.htm diff --git a/tests/wpt/web-platform-tests/xhr/responsexml-get-twice.htm b/tests/wpt/tests/xhr/responsexml-get-twice.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/responsexml-get-twice.htm rename to tests/wpt/tests/xhr/responsexml-get-twice.htm diff --git a/tests/wpt/web-platform-tests/xhr/responsexml-media-type.htm b/tests/wpt/tests/xhr/responsexml-media-type.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/responsexml-media-type.htm rename to tests/wpt/tests/xhr/responsexml-media-type.htm diff --git a/tests/wpt/web-platform-tests/xhr/responsexml-non-document-types.htm b/tests/wpt/tests/xhr/responsexml-non-document-types.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/responsexml-non-document-types.htm rename to tests/wpt/tests/xhr/responsexml-non-document-types.htm diff --git a/tests/wpt/web-platform-tests/xhr/responsexml-non-well-formed.htm b/tests/wpt/tests/xhr/responsexml-non-well-formed.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/responsexml-non-well-formed.htm rename to tests/wpt/tests/xhr/responsexml-non-well-formed.htm diff --git a/tests/wpt/web-platform-tests/xhr/security-consideration.sub.html b/tests/wpt/tests/xhr/security-consideration.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/security-consideration.sub.html rename to tests/wpt/tests/xhr/security-consideration.sub.html diff --git a/tests/wpt/web-platform-tests/xhr/send-accept-language.htm b/tests/wpt/tests/xhr/send-accept-language.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-accept-language.htm rename to tests/wpt/tests/xhr/send-accept-language.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-accept.htm b/tests/wpt/tests/xhr/send-accept.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-accept.htm rename to tests/wpt/tests/xhr/send-accept.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-after-setting-document-domain.htm b/tests/wpt/tests/xhr/send-after-setting-document-domain.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-after-setting-document-domain.htm rename to tests/wpt/tests/xhr/send-after-setting-document-domain.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-authentication-basic-cors-not-enabled.htm b/tests/wpt/tests/xhr/send-authentication-basic-cors-not-enabled.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-authentication-basic-cors-not-enabled.htm rename to tests/wpt/tests/xhr/send-authentication-basic-cors-not-enabled.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-authentication-basic-cors.htm b/tests/wpt/tests/xhr/send-authentication-basic-cors.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-authentication-basic-cors.htm rename to tests/wpt/tests/xhr/send-authentication-basic-cors.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-authentication-basic-repeat-no-args.htm b/tests/wpt/tests/xhr/send-authentication-basic-repeat-no-args.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-authentication-basic-repeat-no-args.htm rename to tests/wpt/tests/xhr/send-authentication-basic-repeat-no-args.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-authentication-basic-setrequestheader-and-arguments.htm b/tests/wpt/tests/xhr/send-authentication-basic-setrequestheader-and-arguments.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-authentication-basic-setrequestheader-and-arguments.htm rename to tests/wpt/tests/xhr/send-authentication-basic-setrequestheader-and-arguments.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-authentication-basic-setrequestheader-existing-session.htm b/tests/wpt/tests/xhr/send-authentication-basic-setrequestheader-existing-session.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-authentication-basic-setrequestheader-existing-session.htm rename to tests/wpt/tests/xhr/send-authentication-basic-setrequestheader-existing-session.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-authentication-basic-setrequestheader.htm b/tests/wpt/tests/xhr/send-authentication-basic-setrequestheader.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-authentication-basic-setrequestheader.htm rename to tests/wpt/tests/xhr/send-authentication-basic-setrequestheader.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-authentication-basic.htm b/tests/wpt/tests/xhr/send-authentication-basic.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-authentication-basic.htm rename to tests/wpt/tests/xhr/send-authentication-basic.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-authentication-competing-names-passwords.htm b/tests/wpt/tests/xhr/send-authentication-competing-names-passwords.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-authentication-competing-names-passwords.htm rename to tests/wpt/tests/xhr/send-authentication-competing-names-passwords.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-authentication-cors-basic-setrequestheader.htm b/tests/wpt/tests/xhr/send-authentication-cors-basic-setrequestheader.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-authentication-cors-basic-setrequestheader.htm rename to tests/wpt/tests/xhr/send-authentication-cors-basic-setrequestheader.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-authentication-cors-setrequestheader-no-cred.htm b/tests/wpt/tests/xhr/send-authentication-cors-setrequestheader-no-cred.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-authentication-cors-setrequestheader-no-cred.htm rename to tests/wpt/tests/xhr/send-authentication-cors-setrequestheader-no-cred.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-authentication-existing-session-manual.htm b/tests/wpt/tests/xhr/send-authentication-existing-session-manual.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-authentication-existing-session-manual.htm rename to tests/wpt/tests/xhr/send-authentication-existing-session-manual.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-authentication-prompt-2-manual.htm b/tests/wpt/tests/xhr/send-authentication-prompt-2-manual.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-authentication-prompt-2-manual.htm rename to tests/wpt/tests/xhr/send-authentication-prompt-2-manual.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-authentication-prompt-manual.htm b/tests/wpt/tests/xhr/send-authentication-prompt-manual.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-authentication-prompt-manual.htm rename to tests/wpt/tests/xhr/send-authentication-prompt-manual.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-blob-with-no-mime-type.html b/tests/wpt/tests/xhr/send-blob-with-no-mime-type.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-blob-with-no-mime-type.html rename to tests/wpt/tests/xhr/send-blob-with-no-mime-type.html diff --git a/tests/wpt/web-platform-tests/xhr/send-conditional-cors.htm b/tests/wpt/tests/xhr/send-conditional-cors.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-conditional-cors.htm rename to tests/wpt/tests/xhr/send-conditional-cors.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-conditional.htm b/tests/wpt/tests/xhr/send-conditional.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-conditional.htm rename to tests/wpt/tests/xhr/send-conditional.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-content-type-charset.htm b/tests/wpt/tests/xhr/send-content-type-charset.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-content-type-charset.htm rename to tests/wpt/tests/xhr/send-content-type-charset.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-content-type-string.htm b/tests/wpt/tests/xhr/send-content-type-string.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-content-type-string.htm rename to tests/wpt/tests/xhr/send-content-type-string.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-data-arraybuffer.any.js b/tests/wpt/tests/xhr/send-data-arraybuffer.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-data-arraybuffer.any.js rename to tests/wpt/tests/xhr/send-data-arraybuffer.any.js diff --git a/tests/wpt/web-platform-tests/xhr/send-data-arraybufferview.any.js b/tests/wpt/tests/xhr/send-data-arraybufferview.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-data-arraybufferview.any.js rename to tests/wpt/tests/xhr/send-data-arraybufferview.any.js diff --git a/tests/wpt/web-platform-tests/xhr/send-data-blob.htm b/tests/wpt/tests/xhr/send-data-blob.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-data-blob.htm rename to tests/wpt/tests/xhr/send-data-blob.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-data-es-object.any.js b/tests/wpt/tests/xhr/send-data-es-object.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-data-es-object.any.js rename to tests/wpt/tests/xhr/send-data-es-object.any.js diff --git a/tests/wpt/web-platform-tests/xhr/send-data-formdata.any.js b/tests/wpt/tests/xhr/send-data-formdata.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-data-formdata.any.js rename to tests/wpt/tests/xhr/send-data-formdata.any.js diff --git a/tests/wpt/web-platform-tests/xhr/send-data-sharedarraybuffer.any.js b/tests/wpt/tests/xhr/send-data-sharedarraybuffer.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-data-sharedarraybuffer.any.js rename to tests/wpt/tests/xhr/send-data-sharedarraybuffer.any.js diff --git a/tests/wpt/web-platform-tests/xhr/send-data-string-invalid-unicode.any.js b/tests/wpt/tests/xhr/send-data-string-invalid-unicode.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-data-string-invalid-unicode.any.js rename to tests/wpt/tests/xhr/send-data-string-invalid-unicode.any.js diff --git a/tests/wpt/web-platform-tests/xhr/send-data-unexpected-tostring.htm b/tests/wpt/tests/xhr/send-data-unexpected-tostring.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-data-unexpected-tostring.htm rename to tests/wpt/tests/xhr/send-data-unexpected-tostring.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-entity-body-basic.htm b/tests/wpt/tests/xhr/send-entity-body-basic.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-entity-body-basic.htm rename to tests/wpt/tests/xhr/send-entity-body-basic.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-entity-body-document-bogus.htm b/tests/wpt/tests/xhr/send-entity-body-document-bogus.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-entity-body-document-bogus.htm rename to tests/wpt/tests/xhr/send-entity-body-document-bogus.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-entity-body-document.htm b/tests/wpt/tests/xhr/send-entity-body-document.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-entity-body-document.htm rename to tests/wpt/tests/xhr/send-entity-body-document.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-entity-body-empty.htm b/tests/wpt/tests/xhr/send-entity-body-empty.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-entity-body-empty.htm rename to tests/wpt/tests/xhr/send-entity-body-empty.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-entity-body-get-head-async.htm b/tests/wpt/tests/xhr/send-entity-body-get-head-async.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-entity-body-get-head-async.htm rename to tests/wpt/tests/xhr/send-entity-body-get-head-async.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-entity-body-get-head.htm b/tests/wpt/tests/xhr/send-entity-body-get-head.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-entity-body-get-head.htm rename to tests/wpt/tests/xhr/send-entity-body-get-head.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-entity-body-none.htm b/tests/wpt/tests/xhr/send-entity-body-none.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-entity-body-none.htm rename to tests/wpt/tests/xhr/send-entity-body-none.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-network-error-async-events.sub.htm b/tests/wpt/tests/xhr/send-network-error-async-events.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-network-error-async-events.sub.htm rename to tests/wpt/tests/xhr/send-network-error-async-events.sub.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-network-error-sync-events.sub.htm b/tests/wpt/tests/xhr/send-network-error-sync-events.sub.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-network-error-sync-events.sub.htm rename to tests/wpt/tests/xhr/send-network-error-sync-events.sub.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-no-response-event-loadend.htm b/tests/wpt/tests/xhr/send-no-response-event-loadend.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-no-response-event-loadend.htm rename to tests/wpt/tests/xhr/send-no-response-event-loadend.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-no-response-event-loadstart.htm b/tests/wpt/tests/xhr/send-no-response-event-loadstart.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-no-response-event-loadstart.htm rename to tests/wpt/tests/xhr/send-no-response-event-loadstart.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-no-response-event-order.htm b/tests/wpt/tests/xhr/send-no-response-event-order.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-no-response-event-order.htm rename to tests/wpt/tests/xhr/send-no-response-event-order.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-non-same-origin.htm b/tests/wpt/tests/xhr/send-non-same-origin.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-non-same-origin.htm rename to tests/wpt/tests/xhr/send-non-same-origin.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-receive-utf16.htm b/tests/wpt/tests/xhr/send-receive-utf16.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-receive-utf16.htm rename to tests/wpt/tests/xhr/send-receive-utf16.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-redirect-bogus-sync.htm b/tests/wpt/tests/xhr/send-redirect-bogus-sync.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-redirect-bogus-sync.htm rename to tests/wpt/tests/xhr/send-redirect-bogus-sync.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-redirect-bogus.htm b/tests/wpt/tests/xhr/send-redirect-bogus.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-redirect-bogus.htm rename to tests/wpt/tests/xhr/send-redirect-bogus.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-redirect-infinite-sync.htm b/tests/wpt/tests/xhr/send-redirect-infinite-sync.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-redirect-infinite-sync.htm rename to tests/wpt/tests/xhr/send-redirect-infinite-sync.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-redirect-infinite.htm b/tests/wpt/tests/xhr/send-redirect-infinite.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-redirect-infinite.htm rename to tests/wpt/tests/xhr/send-redirect-infinite.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-redirect-no-location.htm b/tests/wpt/tests/xhr/send-redirect-no-location.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-redirect-no-location.htm rename to tests/wpt/tests/xhr/send-redirect-no-location.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-redirect-post-upload.htm b/tests/wpt/tests/xhr/send-redirect-post-upload.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-redirect-post-upload.htm rename to tests/wpt/tests/xhr/send-redirect-post-upload.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-redirect-to-cors.htm b/tests/wpt/tests/xhr/send-redirect-to-cors.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-redirect-to-cors.htm rename to tests/wpt/tests/xhr/send-redirect-to-cors.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-redirect-to-non-cors.htm b/tests/wpt/tests/xhr/send-redirect-to-non-cors.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-redirect-to-non-cors.htm rename to tests/wpt/tests/xhr/send-redirect-to-non-cors.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-redirect.htm b/tests/wpt/tests/xhr/send-redirect.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-redirect.htm rename to tests/wpt/tests/xhr/send-redirect.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-response-event-order.htm b/tests/wpt/tests/xhr/send-response-event-order.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-response-event-order.htm rename to tests/wpt/tests/xhr/send-response-event-order.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-response-upload-event-loadend.htm b/tests/wpt/tests/xhr/send-response-upload-event-loadend.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-response-upload-event-loadend.htm rename to tests/wpt/tests/xhr/send-response-upload-event-loadend.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-response-upload-event-loadstart.htm b/tests/wpt/tests/xhr/send-response-upload-event-loadstart.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-response-upload-event-loadstart.htm rename to tests/wpt/tests/xhr/send-response-upload-event-loadstart.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-response-upload-event-progress.htm b/tests/wpt/tests/xhr/send-response-upload-event-progress.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-response-upload-event-progress.htm rename to tests/wpt/tests/xhr/send-response-upload-event-progress.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-send.any.js b/tests/wpt/tests/xhr/send-send.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-send.any.js rename to tests/wpt/tests/xhr/send-send.any.js diff --git a/tests/wpt/web-platform-tests/xhr/send-sync-blocks-async.htm b/tests/wpt/tests/xhr/send-sync-blocks-async.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-sync-blocks-async.htm rename to tests/wpt/tests/xhr/send-sync-blocks-async.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-sync-no-response-event-load.htm b/tests/wpt/tests/xhr/send-sync-no-response-event-load.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-sync-no-response-event-load.htm rename to tests/wpt/tests/xhr/send-sync-no-response-event-load.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-sync-no-response-event-loadend.htm b/tests/wpt/tests/xhr/send-sync-no-response-event-loadend.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-sync-no-response-event-loadend.htm rename to tests/wpt/tests/xhr/send-sync-no-response-event-loadend.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-sync-no-response-event-order.htm b/tests/wpt/tests/xhr/send-sync-no-response-event-order.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-sync-no-response-event-order.htm rename to tests/wpt/tests/xhr/send-sync-no-response-event-order.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-sync-response-event-order.htm b/tests/wpt/tests/xhr/send-sync-response-event-order.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-sync-response-event-order.htm rename to tests/wpt/tests/xhr/send-sync-response-event-order.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-sync-timeout.htm b/tests/wpt/tests/xhr/send-sync-timeout.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-sync-timeout.htm rename to tests/wpt/tests/xhr/send-sync-timeout.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-timeout-events.htm b/tests/wpt/tests/xhr/send-timeout-events.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-timeout-events.htm rename to tests/wpt/tests/xhr/send-timeout-events.htm diff --git a/tests/wpt/web-platform-tests/xhr/send-usp.any.js b/tests/wpt/tests/xhr/send-usp.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/send-usp.any.js rename to tests/wpt/tests/xhr/send-usp.any.js diff --git a/tests/wpt/web-platform-tests/xhr/setrequestheader-after-send.htm b/tests/wpt/tests/xhr/setrequestheader-after-send.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/setrequestheader-after-send.htm rename to tests/wpt/tests/xhr/setrequestheader-after-send.htm diff --git a/tests/wpt/web-platform-tests/xhr/setrequestheader-allow-empty-value.htm b/tests/wpt/tests/xhr/setrequestheader-allow-empty-value.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/setrequestheader-allow-empty-value.htm rename to tests/wpt/tests/xhr/setrequestheader-allow-empty-value.htm diff --git a/tests/wpt/web-platform-tests/xhr/setrequestheader-allow-whitespace-in-value.htm b/tests/wpt/tests/xhr/setrequestheader-allow-whitespace-in-value.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/setrequestheader-allow-whitespace-in-value.htm rename to tests/wpt/tests/xhr/setrequestheader-allow-whitespace-in-value.htm diff --git a/tests/wpt/web-platform-tests/xhr/setrequestheader-before-open.htm b/tests/wpt/tests/xhr/setrequestheader-before-open.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/setrequestheader-before-open.htm rename to tests/wpt/tests/xhr/setrequestheader-before-open.htm diff --git a/tests/wpt/web-platform-tests/xhr/setrequestheader-bogus-name.htm b/tests/wpt/tests/xhr/setrequestheader-bogus-name.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/setrequestheader-bogus-name.htm rename to tests/wpt/tests/xhr/setrequestheader-bogus-name.htm diff --git a/tests/wpt/web-platform-tests/xhr/setrequestheader-bogus-value.htm b/tests/wpt/tests/xhr/setrequestheader-bogus-value.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/setrequestheader-bogus-value.htm rename to tests/wpt/tests/xhr/setrequestheader-bogus-value.htm diff --git a/tests/wpt/web-platform-tests/xhr/setrequestheader-case-insensitive.htm b/tests/wpt/tests/xhr/setrequestheader-case-insensitive.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/setrequestheader-case-insensitive.htm rename to tests/wpt/tests/xhr/setrequestheader-case-insensitive.htm diff --git a/tests/wpt/web-platform-tests/xhr/setrequestheader-combining.window.js b/tests/wpt/tests/xhr/setrequestheader-combining.window.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/setrequestheader-combining.window.js rename to tests/wpt/tests/xhr/setrequestheader-combining.window.js diff --git a/tests/wpt/web-platform-tests/xhr/setrequestheader-content-type.htm b/tests/wpt/tests/xhr/setrequestheader-content-type.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/setrequestheader-content-type.htm rename to tests/wpt/tests/xhr/setrequestheader-content-type.htm diff --git a/tests/wpt/web-platform-tests/xhr/setrequestheader-header-allowed.htm b/tests/wpt/tests/xhr/setrequestheader-header-allowed.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/setrequestheader-header-allowed.htm rename to tests/wpt/tests/xhr/setrequestheader-header-allowed.htm diff --git a/tests/wpt/web-platform-tests/xhr/setrequestheader-header-forbidden.htm b/tests/wpt/tests/xhr/setrequestheader-header-forbidden.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/setrequestheader-header-forbidden.htm rename to tests/wpt/tests/xhr/setrequestheader-header-forbidden.htm diff --git a/tests/wpt/web-platform-tests/xhr/setrequestheader-open-setrequestheader.htm b/tests/wpt/tests/xhr/setrequestheader-open-setrequestheader.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/setrequestheader-open-setrequestheader.htm rename to tests/wpt/tests/xhr/setrequestheader-open-setrequestheader.htm diff --git a/tests/wpt/web-platform-tests/xhr/status-async.htm b/tests/wpt/tests/xhr/status-async.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/status-async.htm rename to tests/wpt/tests/xhr/status-async.htm diff --git a/tests/wpt/web-platform-tests/xhr/status-basic.htm b/tests/wpt/tests/xhr/status-basic.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/status-basic.htm rename to tests/wpt/tests/xhr/status-basic.htm diff --git a/tests/wpt/web-platform-tests/xhr/status-error.htm b/tests/wpt/tests/xhr/status-error.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/status-error.htm rename to tests/wpt/tests/xhr/status-error.htm diff --git a/tests/wpt/web-platform-tests/xhr/status.h2.window.js b/tests/wpt/tests/xhr/status.h2.window.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/status.h2.window.js rename to tests/wpt/tests/xhr/status.h2.window.js diff --git a/tests/wpt/web-platform-tests/xhr/sync-no-progress.any.js b/tests/wpt/tests/xhr/sync-no-progress.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/sync-no-progress.any.js rename to tests/wpt/tests/xhr/sync-no-progress.any.js diff --git a/tests/wpt/web-platform-tests/xhr/sync-no-timeout.any.js b/tests/wpt/tests/xhr/sync-no-timeout.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/sync-no-timeout.any.js rename to tests/wpt/tests/xhr/sync-no-timeout.any.js diff --git a/tests/wpt/web-platform-tests/xhr/sync-xhr-and-window-onload.html b/tests/wpt/tests/xhr/sync-xhr-and-window-onload.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/sync-xhr-and-window-onload.html rename to tests/wpt/tests/xhr/sync-xhr-and-window-onload.html diff --git a/tests/wpt/web-platform-tests/xhr/sync-xhr-supported-by-feature-policy.html b/tests/wpt/tests/xhr/sync-xhr-supported-by-feature-policy.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/sync-xhr-supported-by-feature-policy.html rename to tests/wpt/tests/xhr/sync-xhr-supported-by-feature-policy.html diff --git a/tests/wpt/web-platform-tests/xhr/template-element.html b/tests/wpt/tests/xhr/template-element.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/template-element.html rename to tests/wpt/tests/xhr/template-element.html diff --git a/tests/wpt/web-platform-tests/xhr/thrown-error-in-events.html b/tests/wpt/tests/xhr/thrown-error-in-events.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/thrown-error-in-events.html rename to tests/wpt/tests/xhr/thrown-error-in-events.html diff --git a/tests/wpt/web-platform-tests/xhr/timeout-cors-async.htm b/tests/wpt/tests/xhr/timeout-cors-async.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/timeout-cors-async.htm rename to tests/wpt/tests/xhr/timeout-cors-async.htm diff --git a/tests/wpt/web-platform-tests/xhr/timeout-multiple-fetches.html b/tests/wpt/tests/xhr/timeout-multiple-fetches.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/timeout-multiple-fetches.html rename to tests/wpt/tests/xhr/timeout-multiple-fetches.html diff --git a/tests/wpt/web-platform-tests/xhr/timeout-sync.htm b/tests/wpt/tests/xhr/timeout-sync.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/timeout-sync.htm rename to tests/wpt/tests/xhr/timeout-sync.htm diff --git a/tests/wpt/web-platform-tests/xhr/xhr-authorization-redirect.any.js b/tests/wpt/tests/xhr/xhr-authorization-redirect.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xhr-authorization-redirect.any.js rename to tests/wpt/tests/xhr/xhr-authorization-redirect.any.js diff --git a/tests/wpt/web-platform-tests/xhr/xhr-timeout-longtask.any.js b/tests/wpt/tests/xhr/xhr-timeout-longtask.any.js similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xhr-timeout-longtask.any.js rename to tests/wpt/tests/xhr/xhr-timeout-longtask.any.js diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-basic.htm b/tests/wpt/tests/xhr/xmlhttprequest-basic.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-basic.htm rename to tests/wpt/tests/xhr/xmlhttprequest-basic.htm diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-eventtarget.htm b/tests/wpt/tests/xhr/xmlhttprequest-eventtarget.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-eventtarget.htm rename to tests/wpt/tests/xhr/xmlhttprequest-eventtarget.htm diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-network-error-sync.htm b/tests/wpt/tests/xhr/xmlhttprequest-network-error-sync.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-network-error-sync.htm rename to tests/wpt/tests/xhr/xmlhttprequest-network-error-sync.htm diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-network-error.htm b/tests/wpt/tests/xhr/xmlhttprequest-network-error.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-network-error.htm rename to tests/wpt/tests/xhr/xmlhttprequest-network-error.htm diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-sync-block-defer-scripts-subframe.html b/tests/wpt/tests/xhr/xmlhttprequest-sync-block-defer-scripts-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-sync-block-defer-scripts-subframe.html rename to tests/wpt/tests/xhr/xmlhttprequest-sync-block-defer-scripts-subframe.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-sync-block-defer-scripts.html b/tests/wpt/tests/xhr/xmlhttprequest-sync-block-defer-scripts.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-sync-block-defer-scripts.html rename to tests/wpt/tests/xhr/xmlhttprequest-sync-block-defer-scripts.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-sync-block-scripts.html b/tests/wpt/tests/xhr/xmlhttprequest-sync-block-scripts.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-sync-block-scripts.html rename to tests/wpt/tests/xhr/xmlhttprequest-sync-block-scripts.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-sync-default-feature-policy.sub.html b/tests/wpt/tests/xhr/xmlhttprequest-sync-default-feature-policy.sub.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-sync-default-feature-policy.sub.html rename to tests/wpt/tests/xhr/xmlhttprequest-sync-default-feature-policy.sub.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-sync-not-hang-scriptloader-subframe.html b/tests/wpt/tests/xhr/xmlhttprequest-sync-not-hang-scriptloader-subframe.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-sync-not-hang-scriptloader-subframe.html rename to tests/wpt/tests/xhr/xmlhttprequest-sync-not-hang-scriptloader-subframe.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-sync-not-hang-scriptloader.html b/tests/wpt/tests/xhr/xmlhttprequest-sync-not-hang-scriptloader.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-sync-not-hang-scriptloader.html rename to tests/wpt/tests/xhr/xmlhttprequest-sync-not-hang-scriptloader.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-aborted.html b/tests/wpt/tests/xhr/xmlhttprequest-timeout-aborted.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-aborted.html rename to tests/wpt/tests/xhr/xmlhttprequest-timeout-aborted.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-abortedonmain.html b/tests/wpt/tests/xhr/xmlhttprequest-timeout-abortedonmain.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-abortedonmain.html rename to tests/wpt/tests/xhr/xmlhttprequest-timeout-abortedonmain.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-overrides.html b/tests/wpt/tests/xhr/xmlhttprequest-timeout-overrides.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-overrides.html rename to tests/wpt/tests/xhr/xmlhttprequest-timeout-overrides.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-overridesexpires.html b/tests/wpt/tests/xhr/xmlhttprequest-timeout-overridesexpires.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-overridesexpires.html rename to tests/wpt/tests/xhr/xmlhttprequest-timeout-overridesexpires.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-reused.html b/tests/wpt/tests/xhr/xmlhttprequest-timeout-reused.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-reused.html rename to tests/wpt/tests/xhr/xmlhttprequest-timeout-reused.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-simple.html b/tests/wpt/tests/xhr/xmlhttprequest-timeout-simple.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-simple.html rename to tests/wpt/tests/xhr/xmlhttprequest-timeout-simple.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-synconmain.html b/tests/wpt/tests/xhr/xmlhttprequest-timeout-synconmain.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-synconmain.html rename to tests/wpt/tests/xhr/xmlhttprequest-timeout-synconmain.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-twice.html b/tests/wpt/tests/xhr/xmlhttprequest-timeout-twice.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-twice.html rename to tests/wpt/tests/xhr/xmlhttprequest-timeout-twice.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-worker-aborted.html b/tests/wpt/tests/xhr/xmlhttprequest-timeout-worker-aborted.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-worker-aborted.html rename to tests/wpt/tests/xhr/xmlhttprequest-timeout-worker-aborted.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-worker-overrides.html b/tests/wpt/tests/xhr/xmlhttprequest-timeout-worker-overrides.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-worker-overrides.html rename to tests/wpt/tests/xhr/xmlhttprequest-timeout-worker-overrides.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-worker-overridesexpires.html b/tests/wpt/tests/xhr/xmlhttprequest-timeout-worker-overridesexpires.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-worker-overridesexpires.html rename to tests/wpt/tests/xhr/xmlhttprequest-timeout-worker-overridesexpires.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-worker-simple.html b/tests/wpt/tests/xhr/xmlhttprequest-timeout-worker-simple.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-worker-simple.html rename to tests/wpt/tests/xhr/xmlhttprequest-timeout-worker-simple.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-worker-synconworker.html b/tests/wpt/tests/xhr/xmlhttprequest-timeout-worker-synconworker.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-worker-synconworker.html rename to tests/wpt/tests/xhr/xmlhttprequest-timeout-worker-synconworker.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-worker-twice.html b/tests/wpt/tests/xhr/xmlhttprequest-timeout-worker-twice.html similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-timeout-worker-twice.html rename to tests/wpt/tests/xhr/xmlhttprequest-timeout-worker-twice.html diff --git a/tests/wpt/web-platform-tests/xhr/xmlhttprequest-unsent.htm b/tests/wpt/tests/xhr/xmlhttprequest-unsent.htm similarity index 100% rename from tests/wpt/web-platform-tests/xhr/xmlhttprequest-unsent.htm rename to tests/wpt/tests/xhr/xmlhttprequest-unsent.htm